[WRONG BRANCH] fix(claude): rebase hand-edit guard after desktop apply

[luvs01]

Motivation

• A field-scoped persistence path for Claude Desktop wrote claudeCode.desktopProfile to disk but did not refresh the in-memory Claude baseline, which could cause later whole-config saves to silently overwrite operator hand-edited security/routing fields under claudeCode.

Description

• Add adoptPersistedClaudeCode(config, persistedClaudeCode) in src/config.ts to mirror the exact committed claudeCode subtree into the long-lived in-memory snapshot and rebase the hand-edit baseline.
• Change persistDesktopProfileField in src/server/management/agent-settings-routes.ts to capture the committed claudeCode returned by mutatePersistedConfig() and call adoptPersistedClaudeCode() only after the durable write succeeds.
• Add a regression test in tests/native-claude-desktop-toggle.test.ts that exercises apply → hand-edit on-disk claudeCode → unrelated saveConfigPreservingClaudeCode() and asserts the hand edit is preserved.

Testing

• node_modules/@oven/bun-linux-x64-baseline/bin/bun test tests/native-claude-desktop-toggle.test.ts was run and the focused test file passed.
• bun run typecheck was run and completed successfully.
• bun run privacy:scan was run and completed successfully.
• Running bun test tests/native-claude-desktop-toggle.test.ts with the environment-provided Bun initially failed due to an environment mismatch (node:zlib export zstdDecompressSync missing), which is an execution-platform issue and not a code regression; the repository-provided baseline Bun binary passed the focused tests, and the broader test run encountered unrelated existing timeouts/auth failures in other integration tests when executing the whole suite.

---

Codex Task

[coderabbitai]

Warning

Review limit reached

@luvs01, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 49 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: a3ecd4ba-9718-4492-ae4b-534be9b600c0

📥 Commits

Reviewing files that changed from the base of the PR and between 121f1ad and b8850f8.

📒 Files selected for processing (3)

• src/config.ts
• src/server/management/agent-settings-routes.ts
• tests/native-claude-desktop-toggle.test.ts

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

✅ Deterministic PR hygiene checks passed.

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b8850f822d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

Preserve pending live Claude settings while rebasing

When a concurrent PUT /api/claude-code has assigned its validated settings to the shared config.claudeCode and yielded at the dynamic import before saving, a Desktop apply can reach this assignment and replace that pending subtree with the disk snapshot. The settings request then resumes, saves the replacement, and returns success even though its changes were discarded. Reconcile the persisted subtree against the existing baseline and live value (or update only desktopProfile while rebasing the baseline) instead of replacing the entire live subtree.

Useful? React with 👍 / 👎.

[github-actions]

⏳ DRAFT

• wrong target branch (main); retarget to dev.

What to do

• Retarget this PR to dev — all contributions go to dev.

Its title has been prefixed with [WRONG BRANCH].
This pull request was already a draft. Its draft status will be preserved after every issue above is resolved.