Skip to content

fix: sync main into develop for clean release#205

Merged
tomymaritano merged 2 commits into
developfrom
fix/sync-main-for-release
Apr 23, 2026
Merged

fix: sync main into develop for clean release#205
tomymaritano merged 2 commits into
developfrom
fix/sync-main-for-release

Conversation

@tomymaritano

Copy link
Copy Markdown
Collaborator

Summary

Merges main into develop to resolve all conflicts so PR #202 (release) can merge cleanly.

All 5 conflicts resolved keeping develop's version (which has all review fixes from PRs #199-#204).

Test plan

  • pnpm typecheck — 17/17 pass

🤖 Generated with Claude Code

tomymaritano and others added 2 commits April 23, 2026 16:00
## 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>
…ease

# Conflicts:
#	apps/desktop/src/main/index.ts
#	apps/desktop/src/renderer/components/UpdateBanner.tsx
#	apps/desktop/src/renderer/pages/settings/sections/PluginsSection.tsx
#	apps/desktop/src/renderer/pages/settings/sections/Section.module.css
#	apps/desktop/src/renderer/ui/patterns/Modal.tsx
@vercel

vercel Bot commented Apr 23, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
readide Error Error Apr 23, 2026 8:25pm

Request Review

@coderabbitai

coderabbitai Bot commented Apr 23, 2026

Copy link
Copy Markdown

Warning

Rate limit exceeded

@tomymaritano has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 44 minutes and 58 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 44 minutes and 58 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 4cb9ede7-a8a7-48c1-b45f-9a1aaec58f09

📥 Commits

Reviewing files that changed from the base of the PR and between b0700b4 and 66d5422.

📒 Files selected for processing (2)
  • apps/desktop/src/renderer/components/NoteEditor.tsx
  • apps/web/tsconfig.json
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/sync-main-for-release

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions Bot enabled auto-merge (squash) April 23, 2026 20:24
@tomymaritano tomymaritano merged commit b5d2733 into develop Apr 23, 2026
14 of 15 checks passed
@tomymaritano tomymaritano deleted the fix/sync-main-for-release branch April 23, 2026 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant