fix: prevent Scribe from staging runtime state files#232
Merged
bradygaster merged 2 commits intodevfrom Mar 7, 2026
Merged
Conversation
The squad-main-guard workflow correctly blocks .squad/ files from protected branches. However, Scribe's commit step (git add .squad/) stages runtime state files (orchestration-log/, log/, decisions/inbox/, sessions/) on feature branches. When PRs target main, the guard catches them — causing CI failures users didn't cause. Fix (defense in depth): - Update Scribe commit instruction in squad.agent.md to unstage runtime state paths after git add (git reset HEAD on forbidden paths) - Add .squad/decisions/inbox/ and .squad/sessions/ to .gitignore entries in init.ts (orchestration-log/ and log/ were already covered) - Update init test to verify all four runtime state paths are gitignored Closes #228 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
bradygaster
added a commit
that referenced
this pull request
Mar 7, 2026
Session: 2026-03-07T01-13-00Z-phase2-complete Requested by: Brady Changes: - Merged 3 inbox decisions (Kobayashi PR merges, Keaton community PRs, Fenster template fix) - Logged orchestration results for all 3 agents (Kobayashi, Keaton, Hockney) - Logged Phase 2 session completion - Appended Phase 2 results to agent history files (cross-agent updates) - Deduplicated: No duplicate decisions found; all 3 inbox items were new. Merges completed: - PR #232: Scribe runtime state fix (86598f4) - PR #212: Version stamp preservation (0fedcce) - PR #230: CLI wire-up squad link + squad init --mode remote (6d0bd56) - PR #217: TUI /init no-args flow fix (20970f9) - PR #219: Fork contribution workflow docs (157b8c0) Test results: 130/134 test files passing. 12 pre-existing failures in consult, REPL, status, acceptance modes. Core CLI solid.
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.
Closes #228
Problem
The \squad-main-guard\ workflow correctly blocks all .squad/\ files from protected branches. However, Scribe's commit step (\git add .squad/) stages runtime state files on feature branches. When PRs target main, the guard catches them — causing CI failures users didn't cause.
Fix (defense in depth)
Why defense in depth
Working as Fenster (Core Dev)