fleet/fleetd
3
0
Fork 0
Code Issues 73 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

CB-559: drop .claude/settings.local.json from the default parity overlay #29

Closed
agent wants to merge 0 commits from worker/parity-overlay-settings-5fb711-1 into main
pull from: worker/parity-overlay-settings-5fb711-1
merge into: fleet:main
Conversation 1 Commits - Files Changed -
agent commented 2026-08-14 20:57:34 +02:00
Member
Copy Link
Copy Source

The parity overlay default copied .claude/settings.local.json (alongside the env files) from primary to worker worktree. That file pre-approves tools a worker must never hold and enables MCP servers by name. Its grants are currently INERT because GitWorktrees.isolateToolSurface neutralizes every worktree's .mcp.json to an empty server map, so defence in depth. An operator who explicitly lists it in parityOverlay: keeps it; only the default changes.

Tests: added parityOverlayDefaultsToEnvFilesOnly and parityOverlayExplicitListIsPreservedVerbatim (BridgedConfigTest), updated worktreeAcquireRunsParityOverlayWithProfileDefaults (WorktreeSessionManagerTest).

mvn clean install: Tests run: 637, Failures: 0, Errors: 0.

The parity overlay default copied `.claude/settings.local.json` (alongside the env files) from primary to worker worktree. That file pre-approves tools a worker must never hold and enables MCP servers by name. Its grants are currently INERT because GitWorktrees.isolateToolSurface neutralizes every worktree's .mcp.json to an empty server map, so defence in depth. An operator who explicitly lists it in `parityOverlay:` keeps it; only the default changes. Tests: added parityOverlayDefaultsToEnvFilesOnly and parityOverlayExplicitListIsPreservedVerbatim (BridgedConfigTest), updated worktreeAcquireRunsParityOverlayWithProfileDefaults (WorktreeSessionManagerTest). mvn clean install: Tests run: 637, Failures: 0, Errors: 0.
agent added 1 commit 2026-08-14 20:57:35 +02:00
CB-559: drop .claude/settings.local.json from the default parity overlay
CI / build (pull_request) Successful in 54s
Details
CI / contract (pull_request) Successful in 1m7s
Details
b414a74c26
ltms commented 2026-08-15 07:11:06 +02:00
Owner
Copy Link
Copy Source

Closing as landed. Verified with git cherry main <branch>: every commit's content is present in main. The branch tip is not an ancestor only because the commit was rebased before merge, so the SHA differs while the patch is identical. No code is lost. Verified 2026-08-15.

Closing as **landed**. Verified with `git cherry main <branch>`: every commit's content is present in `main`. The branch tip is not an ancestor only because the commit was rebased before merge, so the SHA differs while the patch is identical. No code is lost. Verified 2026-08-15.
ltms closed this pull request 2026-08-15 07:11:07 +02:00
Some checks are pending
CI / build (pull_request) Successful in 54s
Details
CI / contract (pull_request) Successful in 1m7s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
blocked
Cannot start until something else lands. The body says what.
 needs-live-proof
Merged and green, but never shown working on the running daemon. Not the same as done.
 ready-to-delegate
Scope, files and acceptance criteria are written. A worker can be briefed from the body alone.
 silent-default
A feature that compiles, passes tests, and ships turned off. Nine recurrences and counting.
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
agent kevin ltms
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: fleet/fleetd#29
Delete Branch "worker/parity-overlay-settings-5fb711-1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?