Skip to content

fix: rename template copies to prevent CLI instruction merging (#613)#624

Merged
bradygaster merged 11 commits intodevfrom
squad/614-rename-template-copies
Mar 26, 2026
Merged

fix: rename template copies to prevent CLI instruction merging (#613)#624
bradygaster merged 11 commits intodevfrom
squad/614-rename-template-copies

Conversation

@bradygaster
Copy link
Copy Markdown
Owner

@bradygaster bradygaster commented Mar 25, 2026

Summary

Fixes part of #613 — Copilot CLI 1.0.11 discovers ALL *.agent.md\ files from cwd to git root and merges them into the coordinator prompt. Squad had 3 template copies being discovered, causing 4x instruction duplication that diluted routing constraints.

Changes

Template Renames

  • \ emplates/squad.agent.md\ → \ emplates/squad.agent.md.template\
  • \packages/squad-cli/templates/squad.agent.md\ → \packages/squad-cli/templates/squad.agent.md.template\
  • \packages/squad-sdk/templates/squad.agent.md\ → \packages/squad-sdk/templates/squad.agent.md.template\

Code Updates

  • \scripts/sync-templates.mjs\ — writes to .template\ filenames
  • \packages/squad-sdk/src/config/init.ts\ — reads from .template\
  • \packages/squad-cli/src/cli/core/templates.ts\ — template manifest updated
  • \packages/squad-cli/src/cli/core/upgrade.ts\ — reads from .template\
  • \packages/squad-sdk/src/sharing/consult.ts\ — reads from .template\

Unchanged (by design)

  • .github/agents/squad.agent.md\ — the ONE copy that SHOULD be discovered
  • .squad-templates/squad.agent.md\ — canonical source for sync script

Safety Verification

✅ \squad init\ still reads from .template\ and writes as .md\ to user projects
✅ Build passes clean
✅ Zero new test failures (4 pre-existing on dev)
✅ Zero stale references to old paths
✅ FIDO reviewed and approved

Impact

Before: CLI discovers 5 *.agent.md\ files → 4x prompt duplication
After: CLI discovers 2 *.agent.md\ files → no duplication

Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com

Copilot AI added 7 commits March 23, 2026 17:23
chore(.squad): session wrap-up — inbox merge, logs, history updates
8772397 
Merged 12 decision inbox entries into decisions.md. Logged mega-session
covering release recovery, docs fix, 10 PR merges, discussion triage,
and release hardening. Updated agent histories with session learnings.

Deleted inbox files after merge:
- booster-ci-audit.md, booster-ci-cleanup.md
- copilot-directive-2026-03-23T09-56.md, copilot-directive-2026-03-23T10-08.md
- copilot-directive-no-npx.md
- eecom-version-cmd.md
- pao-discussion-triage-2026-03-23.md, pao-npx-purge.md, pao-readme-slim.md
- pao-v090-blog.md
- surgeon-v090-changelog.md, surgeon-v091-retrospective.md

Updated files:
- .squad/decisions.md (12 decision entries merged)
- .squad/identity/now.md (current state updated)
- .squad/log/2026-03-23T22-00-00Z-mega-session-wrapup.md (new)
- .squad/agents/flight/history.md (issue filing patterns, governance directives)
- .squad/agents/eecom/history.md (CLI version subcommand pattern)
- .squad/agents/booster/history.md (CI audit and preflight patterns)
- .squad/agents/surgeon/history.md (release governance rules, retrospective)
- .squad/agents/pao/history.md (discussion triage patterns, Teams MCP urgency)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Merge branch 'dev' of https://github.com/bradygaster/squad into dev
baca6ca
Merge branch 'dev' of https://github.com/bradygaster/squad into dev
b5da6ae
docs: add v0.9.0 and v0.9.1 releases to What's New
66645d2 
- v0.9.1 (Current Release): Bug fixes and hardening
  - Shell agent name extraction with multi-pattern fallback
  - Init scaffolding for typed casting files
  - Personal squad global mode support
  - Release CI/docs hardening
  - Doctor command improvements

- v0.9.0 (Major Feature): 6 major features + stability fixes
  - Personal Squad Governance Layer (isolated developer workspaces)
  - Worktree Spawning & Distributed Work (parallel agent orchestration)
  - Machine Capability Discovery (auto-detect tools/models/hardware)
  - Cooperative Rate Limiting (predictive circuit breaker + economy mode)
  - Telemetry & Infrastructure (auto-wire, KEDA, session recovery)
  - Docs, Stability & Distribution (Astro enhancements, npm-only)

- v0.8.2: Renamed from 'Current Release' to historic entry

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
chore(squad): triage session — 14 issues triaged, 10 PRs reviewed
cd63313 
- Flight triaged 14 untriaged GitHub issues, created prioritized work plan
- FIDO reviewed 10 open PRs, identified 3 duplicate/overlap pairs
- Merged 2 decisions from inbox to decisions.md
- Updated Flight and FIDO agent history with team updates
- Orchestration logs: 2026-03-25T15-23-flight.md, 2026-03-25T15-23-fido.md
- Session log: 2026-03-25T15-23-triage-session.md

Work session priority established:
- #610 → PAO (broken link, 5 min fix, unblocks #611)
- #590 → EECOM (getPersonalSquadRoot bug, P0)
- #592, #611 → Flight review
- #588 → Procedures (model list update)

PR deduplication: 10 PRs consolidate to 7
- Merge: #607, #603, #606
- Close as duplicates: #605, #604, #602

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
chore(squad): log work session — triage, fixes, research
78a0bb1 
Round 1 outcomes:
- PAO: #610 docs link already resolved
- EECOM: #590 personal squad path fix (getPersonalSquadRoot)
- Procedures: #588 model catalog updated to current platform
- Flight: #612 community issue filed on routing regression
- CAPCOM: CLI platform research — identified 8 releases (1.0.4→1.0.11) with 3 high-impact changes
- GNC: Squad codebase research — routing regression caused by v0.9.0 prompt saturation + missing name param

Round 2: Code review & quality gate
- FIDO: Found same bug in shell/index.ts, enforced revision
- CONTROL: Full sweep of #590 fix, awaiting FIDO re-review

Merged decisions:
1. Personal squad path canonicalization (personal-squad/)
2. Model catalog refresh (claude-sonnet-4.6, gpt-5.3-codex defaults)
3. CLI platform analysis (monorepo discovery, idle hiding, hook injection)
4. Squad regression analysis (prompt saturation, workstream replacement, missing name param)

Logs created:
- 6 orchestration logs (one per agent)
- 1 session synthesis log with research synthesis
- 4 agent history updates (team update annotations)

All inbox decision files merged and deleted.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Merge: VS Code routing enforcement fix proposal (#613)
673ac4d 
- Merged procedures-vscode-routing-fix.md from inbox to decisions.md
- Cleared decision inbox after merge
- Logged session finalization work

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@bradygaster
Copy link
Copy Markdown
Owner Author

bradygaster commented Mar 26, 2026

🔍 Squad Team Review

Reviewed by: Flight (Lead) — Pass 3 of consensus ceremony
Merge Order Position: #3 of 3 (Phase 1)
Team Consensus: 5/5 AGREE

Review Summary

This PR renames template copies to prevent CLI instruction merging conflicts. It's a critical infrastructure change that improves template organization and prevents cross-contamination during templating operations. Must be merged after #620 and #627.

Dependencies

Depends on #620, #627 — merge those first

Merge Plan

This PR is part of the team-agreed merge sequence:

  1. fix: getPersonalSquadRoot() returns correct personal-squad path (#590) #620 — getPersonalSquadRoot() fix
  2. fix: add count-based fallback to archiveDecisions() (#626) #627 — archiveDecisions() fallback
  3. fix: rename template copies to prevent CLI instruction merging (#613) #624 — rename templates (infra) ← YOU ARE HERE

POST MERGE: Run
ode scripts/sync-templates.mjs + delete orphan old-name files

✅ Verdict: APPROVED for merge in sequence

This was referenced Mar 26, 2026
Merged
Merged
Merged
Merged
Merged
Copilot AI added 4 commits March 25, 2026 23:32
Merge branch 'dev' of https://github.com/bradygaster/squad into dev
4820961
Merge branch 'dev' of https://github.com/bradygaster/squad into dev
0b1b08c
fix: rename template copies to prevent CLI instruction merging (#613)
d8e1874 
Copilot CLI 1.0.11 discovers all *.agent.md files from cwd to git root
and merges them into the coordinator prompt. Squad had 3 template copies
that were being discovered and merged, causing 4x instruction duplication.

Renamed template copies to .agent.md.template so only the active copy
at .github/agents/squad.agent.md is discovered by the CLI.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
scribe: Record spawn manifest session — template rename completion
69f1dd5 
Orchestration logs:
- CONTROL: Template rename (3 copies squad.agent.md → .agent.md.template)
- FIDO: QA approval of template rename work
- Coordinator: 3 PRs opened (#624, #620, #619)

Session log: Spawn manifest execution summary
- Template duplication risk eliminated
- Zero stale references found
- Build + test: zero new failures
- All work ready for merge coordination

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@bradygaster bradygaster force-pushed the squad/614-rename-template-copies branch from 08ddf22 to 69f1dd5 Compare March 26, 2026 06:33
@bradygaster bradygaster merged commit c10abb6 into dev Mar 26, 2026
3 checks passed
@bradygaster bradygaster deleted the squad/614-rename-template-copies branch March 26, 2026 06:33
This was referenced Mar 26, 2026
Closed
Closed
chrislomonico pushed a commit to clomonico/squad that referenced this pull request Mar 26, 2026
@bradygaster
fix: first-run UX — suppress SQLite warning, deduplicate init messagi…
ceb599b 
…ng (bradygaster#624, bradygaster#625) (bradygaster#629)

* fix: suppress ExperimentalWarning in SDK subprocesses (bradygaster#624)

Add NODE_NO_WARNINGS=1 env var as first executable line in cli-entry.ts.
This propagates to child processes spawned by the Copilot SDK, preventing
SQLite ExperimentalWarning from leaking into the terminal via subprocess
stderr forwarding.

The existing process.emitWarning override is kept as belt-and-suspenders
for the main process.

Closes bradygaster#624

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix: remove redundant 'squad init' messaging in first-run experience (bradygaster#625)

- Remove duplicate init guidance from firstRunElement empty-roster branch
  (banner already handles this case)
- Reword banner to prioritize /init (in-shell path) over exit-and-run
- firstRunElement now only renders for roster-present first-run onboarding

Closes bradygaster#625

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* test: add tests for bradygaster#624 and bradygaster#625 first-run fixes

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@bradygaster