fix(worker): shield planted .claude/settings.json from worker commits (#449)#450
Merged
Conversation
…#449) A getadaptiq worker committed the planted policy file over the target repo's TRACKED .claude/settings.json — the operator's hooks and permissions would have been destroyed on merge (caught at review, PR salvaged). Root cause: plant_worker_settings overwrites the path, and nothing kept the resulting diff out of the worker's add -A. Shield at the git level so no worker cooperation is needed: - tracked file → git update-index --skip-worktree (overwrite invisible to status/diff/add) - untracked → append to info/exclude (worktree-local, resolved via --git-path so linked worktrees hit the right file) Best-effort on non-git dirs (unit fixtures) — the plant still applies. 2 new tests pin both cases end-to-end (real git repos, worker-style add -A stages nothing). 61/61 in worker suites; full suite green (known-bad test_critic_sdk excluded, pre-existing on trunk). Closes #449. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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.
A getadaptiq worker committed the planted policy file over the target
repo's TRACKED .claude/settings.json — the operator's hooks and
permissions would have been destroyed on merge (caught at review,
PR salvaged). Root cause: plant_worker_settings overwrites the path,
and nothing kept the resulting diff out of the worker's add -A.
Shield at the git level so no worker cooperation is needed:
to status/diff/add)
--git-path so linked worktrees hit the right file)
Best-effort on non-git dirs (unit fixtures) — the plant still applies.
2 new tests pin both cases end-to-end (real git repos, worker-style
add -A stages nothing). 61/61 in worker suites; full suite green
(known-bad test_critic_sdk excluded, pre-existing on trunk).
Closes #449.
Co-Authored-By: Claude Fable 5 noreply@anthropic.com