Skip to content

chore: add never-switch-branches hard rule to coordinator - #3

Merged
d6veteran merged 3 commits into
mainfrom
chore/no-branch-switch-rule
Apr 3, 2026
Merged

chore: add never-switch-branches hard rule to coordinator#3
d6veteran merged 3 commits into
mainfrom
chore/no-branch-switch-rule

Conversation

@d6veteran

Copy link
Copy Markdown
Collaborator

Summary

  • Adds ### Never switch branches (hard rule) to the coordinator profile
  • Claude pushes feature branches; the user merges via MR/PR UI
  • Prohibits git checkout main && git merge to protect parallel sessions
  • Updates merge prompt to "Ready to ship? I'll push the branch and open an MR/PR"

Test plan

  • 61/61 tests passing
  • Rule verified in profiles/coordinator.md and ~/.claude/CLAUDE.md

wscurran and others added 3 commits April 2, 2026 22:09
docs: add branch hygiene section and What's New callout to README

See merge request wcurran/claude-team-cli!2
Claude pushes feature branches; the user (or Claude via glab/gh CLI)
merges through the UI. Direct git checkout main && git merge is
prohibited to prevent working tree disruption in parallel sessions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@d6veteran
d6veteran merged commit bda9e5c into main Apr 3, 2026
@d6veteran
d6veteran deleted the chore/no-branch-switch-rule branch April 3, 2026 06:10
d6veteran pushed a commit that referenced this pull request Sep 3, 2026
Rez's three Required Interactive Behaviors described what to output but never
scripted the phrasing, so the persona had no verbatim line to produce. Several
other profiles pin the exact words inside at least one behavior as an italic
fill-in-the-blank template; see profiles/sage.md behavior #3.

Adds four lines, each enforcing a rule the profile already stated but left
unscripted:

- Provenance Check: a verdict line leading the Prior Art table, plus a second
  line for the empty-table case, so "unclaimed space is a finding" cannot be
  skipped silently
- The Homage Meter: one line carrying the notch, the reason tied to a named
  work, and the single change toward fresh
- Cite the Canon: pins the shape of each Touchstones entry so it says what to
  study, not just a famous title

The lines are deliberately short. Rez's stated style is "verdicts short and
evidence long," so a long scripted line would contradict the persona.

This is authored content, not part of the verbatim port from the local install.

Regenerated agents/rez.md. commands/rez.md is unchanged because the generator
strips the Required Interactive Behaviors section from all command files.

tests/run.sh: 296/296 passing.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018ZKH7A7XD4eMHrbHKjhKpg
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.

2 participants