Skip to content

fix(pr): keep .context phase artifacts out of PR diffs#326

Merged
drn merged 2 commits into
masterfrom
argus/2026-06-24-172135-pr-skill
Jun 26, 2026
Merged

fix(pr): keep .context phase artifacts out of PR diffs#326
drn merged 2 commits into
masterfrom
argus/2026-06-24-172135-pr-skill

Conversation

@drn

@drn drn commented Jun 26, 2026

Copy link
Copy Markdown
Owner

The phase protocol wrote ship-{ts}.md (and other phase artifacts) to .context/phases/ and assumed that directory was gitignored. In repos that do not gitignore .context/, git add -A / git add . swept the artifact into the PR commit — reviewers flagged it, costing an extra review + force-push cycle.

  • phase-protocol.md: phase artifacts are agent-local scratch; never git add/commit them into a PR. Stage explicitly or gitignore .context/. Archive section carries the same reminder.
  • pr/SKILL.md: mirror the rule at the ship-{ts}.md step and inline at the Step 1 / Step 4b commit paths (stage specific files, not git add -A).

Co-Authored-By: Claude noreply@anthropic.com

drn and others added 2 commits June 25, 2026 21:33
The phase protocol wrote ship-{ts}.md (and other phase artifacts) to
.context/phases/ and assumed that directory was gitignored. In repos
that do not gitignore .context/, `git add -A`/`git add .` swept the
artifact into the PR commit — reviewers flagged it, costing an extra
review + force-push cycle.

- phase-protocol.md: replace the "per-worktree and gitignored" assumption
  with an explicit rule — never git add/commit phase artifacts; stage only
  the real change; gitignore .context/ if a repo needs it tracked.
- pr/SKILL.md: mirror the rule at the ship-{ts}.md step, tied to the
  commit steps, with "never git add -A/git add ." guidance.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
…it steps

- phase-protocol.md: reword the gitignore fallback to drop the contradictory
  "genuinely needs .context/ tracked" phrasing (W2); add a "never commit"
  reminder to the Archive section, which was a latent leak path (W1).
- pr/SKILL.md: fix the same wording, correct "above" → "below" cross-ref,
  and add inline "stage specific files, not git add -A" notes to Step 1 and
  Step 4b so the commit paths are self-contained (I1, I2).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@drn
drn merged commit 48a2fda into master Jun 26, 2026
1 check passed
@drn
drn deleted the argus/2026-06-24-172135-pr-skill branch June 29, 2026 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant