Repository navigation
fix: require configured git identity in worker briefs - #264
Merged
Merged
Conversation
Ship and scout scaffolds now tell the worker to commit only with the repository's configured git identity and never override the author or committer, so a worker cannot leak an agent identity into a delivered commit. Secondmate charters are unchanged because they do not instruct commits.
Rendered rule line (ship scaffolds, Rule 8):
8. Commit only with the repository's configured git identity: never override the author or committer via `git -c user.name=`/`user.email`, `--author`, `GIT_AUTHOR_*`/`GIT_COMMITTER_*` environment variables, or an agent name as author or co-author.
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.
Intent
Add one rule line to the ship-brief scaffold generated by bin/fm-brief.sh, in the Rules section shared by every ship delivery mode: commit only with the repository's configured git identity, and never override the author or committer (no
git -c user.name=.../user.email, no--author, noGIT_AUTHOR_*/GIT_COMMITTER_*environment variables, no agent names as authors or co-authors). Reason: a worker commit in insourcedata/superfk-aceh PR 980 (b4e98eb9) carried author firstmate-crewmate firstmate-crewmate@local; nothing in firstmate sets that identity, the worker overrode it. AGENTS.md already forbids agent co-authors; make the identity rule explicit to workers. Keep it one concise line fitting the scaffold style; do not restructure the brief. Update any test that pins scaffold text or rule numbering. Scout and secondmate scaffolds stay unchanged unless they also tell workers to commit, in which case they get the same line. Acceptance: each ship mode (no-mistakes, direct-PR, local-only) brief contains the rule once; scout/secondmate unchanged except as above; existing bin/ checks pass and the PR body shows the rendered rule line.What Changed
git -c user.name=/user.email,--author,GIT_AUTHOR_*/GIT_COMMITTER_*environment variables, or an agent name as author or co-author.Risk Assessment
✅ Low: The change adds the required identity rule to the shared ship scaffold and commit-capable scout scaffold, leaves secondmate output unchanged, and introduces no unrelated behavior.
Testing
Selected behavioral checks and live CLI generation passed. Output comparisons confirmed only the intended rule was added, with secondmate output unchanged. Evidence includes generated Markdown and CLI transcripts; no GUI surface applies. PR-body publication and broad regression remain with their assigned outer phases.
Evidence: Live CLI transcript and base-output comparisons
Evidence: Generated ship brief with rendered identity rule
Pipeline
Updates from git push no-mistakes
✅ **intent** - passed
✅ No issues found.
✅ **Rebase** - passed
✅ No issues found.
✅ **Review** - passed
✅ No issues found.
✅ **Test** - passed
✅ No issues found.
Ran seven selected executable-interface checks fromtests/fm-brief.test.sh, covering ship modes, mode validation, delivery flags, orchestration, identity rules, scout and secondmate generation.Ranpython3 .phase-test/drive.pyto invoke base and target scaffold CLIs in an isolated worktree-local FM_HOME across seven configurations, compare generated outputs, and retry existing tasks.Saved generated briefs and CLI evidence; removed disposable drivers and data; verifiedgit status --shortwas empty.✅ **Document** - passed
✅ No issues found.
✅ **Lint** - passed
✅ No issues found.
✅ **Push** - passed
✅ No issues found.