fix: eliminate PR contamination from broad git staging (#777)#783
Merged
tamirdresher merged 1 commit intodevfrom Apr 4, 2026
Merged
fix: eliminate PR contamination from broad git staging (#777)#783tamirdresher merged 1 commit intodevfrom
tamirdresher merged 1 commit intodevfrom
Conversation
Contributor
🛫 PR Readiness Check
|
| Status | Check | Details |
|---|---|---|
| ✅ | Single commit | 1 commit — clean history |
| ✅ | Not in draft | Ready for review |
| ✅ | Branch up to date | Up to date with dev |
| ❌ | Copilot review | No Copilot review yet — it may still be processing |
| ✅ | Changeset present | No source files changed — changeset not required |
| ✅ | Scope clean | No .squad/ or docs/proposals/ files |
| ✅ | No merge conflicts | No merge conflicts |
| ✅ | Copilot threads resolved | All 6 Copilot thread(s) resolved |
| ❌ | CI passing | 5 check(s) still running |
This check runs automatically on every push. Fix any ❌ items and push again.
See CONTRIBUTING.md and PR Requirements for details.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to eliminate pull request “contamination” by removing broad git add patterns from Squad templates/skills and by preventing unintended template mirroring from running implicitly.
Changes:
- Replaces broad staging commands (
git add .,git add -A,git add .squad/) with more targeted staging guidance in templates and Copilot skills. - Updates Scribe-related templates to discourage staging the entire
.squad/directory. - Adds an “explicit invocation” guard to
scripts/sync-templates.mjs(requires--syncorSQUAD_SYNC_TEMPLATES=1).
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
scripts/sync-templates.mjs |
Adds a guard intended to prevent accidental template sync runs. |
.squad-templates/issue-lifecycle.md |
Replaces git add . guidance with explicit-file staging guidance. |
.squad-templates/scribe-charter.md |
Replaces git add .squad/ with a narrower (but still glob-based) staging command. |
.squad-templates/squad.agent.md |
Updates the Scribe commit step to avoid git add .squad/ (still uses glob examples). |
.github/agents/squad.agent.md |
Mirrors the same Scribe commit-step guidance for the live agent file. |
.copilot/skills/git-workflow/SKILL.md |
Replaces git add -A with explicit-file staging guidance. |
.copilot/skills/windows-compatibility/SKILL.md |
Introduces a new skill doc with Windows-safe patterns and updated staging guidance. |
4d5b0d1 to
543798e
Compare
- Replace `git add .` with explicit file staging in issue-lifecycle template - Scope Scribe's `git add .squad/` to only files Scribe modifies - Fix git-workflow and windows-compatibility skills - Gate template sync behind explicit flag - Fix live .github/agents/squad.agent.md copy Closes #777 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
543798e to
e9487c6
Compare
tamirdresher
approved these changes
Apr 4, 2026
Collaborator
tamirdresher
left a comment
There was a problem hiding this comment.
LGTM. Critical fix for agent coordination — replaces all broad git add with explicit staging across 18 files. Good Windows compat guidance.
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
Eliminates all broad \git add\ patterns that cause PR file contamination when multiple agents work concurrently.
Changes
Pattern
All broad staging commands (\git add ., \git add -A, \git add .squad/) replaced with explicit file lists targeting only files the agent actually modified.
Closes #777