fix: resolve main→develop merge conflicts#203
Merged
Conversation
## Summary Post-merge fixes addressing all review findings from PR #194, plus CI failures and additional improvements. ### Security - Fix YAML frontmatter escaping (backslashes, control chars) — CodeQL critical - Validate plugin IDs with regex + path traversal check - Fix PowerShell path interpolation (separate args) - Add 50MB size limit + tmpDir cleanup in finally for plugin install - HTML-escape table cell content in clipboard export - Validate installFromUrl slug matches manifest.id - HTTPS-only validation in preload for plugin URLs - Enforce minimum 100k PBKDF2 iterations in encryption service ### CI Fixes - Fix mcp-server TS2532 from noUncheckedIndexedAccess - Restructure ESLint: type-aware rules only for src/ files in tsconfig projects (0 errors) - ci.yml: add contents:read permission to label job ### Accessibility - `aria-pressed` on filter pills, `useId()` for modal, conditional toast role - Auto-focus primary button in welcome dialog ### UX - Save indicator no longer flashes on note switch - UpdateBanner shows error messages with retry - SidebarFooter "Synced Xm ago" display - Error toasts on failed plugin install/uninstall - Marketplace API response validation ### Code Quality - Async clipboard handlers, Unicode-safe filenames - CSS camelCase consistency, danger hover tokens via color-mix - Stricter semver regex, .env.example formatting ## Test plan - [x] `pnpm typecheck` — 17/17 pass - [x] `pnpm test` — 16/16 pass - [x] `pnpm lint` — 0 errors 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…licts # Conflicts: # apps/desktop/src/main/index.ts # apps/desktop/src/renderer/ui/patterns/Modal.tsx
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolves merge conflicts between main and develop for the release PR #202:
apps/desktop/src/main/index.ts: Keep develop's cross-plugin overwrite protection (smarter than main's strict equality check)apps/desktop/src/renderer/ui/patterns/Modal.tsx: Keep develop's useId() placement above early return (React hook order fix)🤖 Generated with Claude Code