fix: prevent claim prompts from tracking main - #4285
Merged
Conversation
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
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
plan-task,claim-issue,claim-issue-gitlab,claim-issue-jira) told agents to rungit worktree add -b <branch> <path> origin/main, which makes the new branch inheritmainas its git upstream. A later config-derived push (as used by/do:pr-style flows) could then land straight onmaininstead of opening a PR — the exact CoS agent worktree branches track refs/heads/main, so /do:pr's config-derived push lands on main #4172 failure mode, but on the prompt path rather than the code path.--no-trackto those fourgit worktree addcommands. Each prompt's latergit push -u origin <branch>step still sets the correct upstream, so untracked is the right shape.dependency-updatesis deliberately left alone — it branches from a PR's own head, where inheriting that branch as upstream is correct.PROMPT_VERSIONSfor all four touched prompts, preserves each pre-change body inPREVIOUS_DEFAULT_PROMPTSso installs holding the old default auto-upgrade instead of being flagged customized, and regenerates the integrity snapshot.worktree addcommand in these four prompts carries--no-track, plus a companion test confirmingdependency-updatesstill tracks its PR head.Closes #4185.
Test plan
cd server && NODE_ENV=test npx vitest run taskPromptDefaults— 37/37 passingserversuite run under heavy concurrent-worktree CPU contention showed unrelatedTest timed out in 10000msflakes in a different, non-overlapping set of files on each run (peerSync/privacy/sprites/universeBuilder on one run, imessageSync and others on another) — consistent with resource-contention flakiness, not a regression from this change