Skip to content

docs: cross-agent coordination rules (CLAUDE.md + CODEX.md) - #3016

Merged
asim merged 1 commit into
masterfrom
claude/loving-meitner-3Etoi
Jun 24, 2026
Merged

asim merged 1 commit into
masterfrom
claude/loving-meitner-3Etoi

Conversation

@asim

@asim asim commented Jun 24, 2026

Copy link
Copy Markdown
Member

Bakes the Claude Code ↔ Codex coordination model into each agent's instruction file so it runs itself instead of living in chat.

Matching Coordination sections in CLAUDE.md and CODEX.md:

  • Lanes — claude/* vs codex/*; never two agents on one branch.
  • Base PRs on master; don't stack on an in-flight branch (the harness/new: honest conformance timeout + cheaper contract test (fixes for #3006) #3007 orphan lesson, written down so we don't repeat it). Fix open PRs in place.
  • One concern per PR.
  • Cross-review before merge — the other model reviews; mechanical fixes land directly, judgment/scope/positioning goes to the human.
  • @codex dispatch conventions — review reserved; any other instruction starts a task; serial (one at a time); consequential, so dispatch on the human's go-ahead.
  • CI is the gate — build/test/golangci-lint(blocking)/harness.

Docs-only.

🤖 Generated with Claude Code


Generated by Claude Code

Add matching 'Coordination' sections so Claude Code and Codex self-coordinate:
lane/branch ownership (claude/* vs codex/*, never share a branch), base PRs
on master (don't stack on an in-flight branch — the #3007 orphan lesson),
one concern per PR, cross-review before merge, the @codex dispatch
conventions (review reserved, serial, fix-in-place), and CI as the gate.
@chatgpt-codex-connector

Copy link
Copy Markdown

Summary

  • Aligned the CLAUDE.md Coordination section with matching labels and clearer guidance for lanes, master-based PRs, single-concern PRs, cross-review, Codex dispatch, CI gates, and issue-backed backlog work. CLAUDE.mdL140-L150
  • Updated the CODEX.md Coordination section to mirror the same structure and rules from Codex’s perspective, keeping the cross-agent model consistent across both instruction files. CODEX.mdL21-L31
  • Committed the changes on the current branch with commit e2b4bc4 docs: align cross-agent coordination guidance.
  • Created a PR titled docs: align cross-agent coordination guidance.

Testing

  • ✅ git diff --check

View task →

@asim
asim merged commit 9f28cc4 into master Jun 24, 2026
10 checks passed
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