[meta] Orchestrator: de-dup open PRs at planner dispatch

[OriginalGary]

Problem

The orchestrator dispatches planner for an issue without first checking whether an open PR already references that issue. This produces duplicate PR pairs targeting the same issue:

Issue	PR A	PR B
platform#114	platform#115 (older)	platform#124 (closed as dup)
platform#87	platform#119 (older)	platform#126 (closed as dup)
platform#90	platform#123 (broader)	platform#104 (closed as dup)
platform#111	platform#112 (combined)	platform#120 (closed as dup)

All four pairs surfaced in the 2026-04-26 complexity-cut review.

Proposed fix

Before dispatching planner for issue #N:

1. Query gh pr list --repo <r> --state open --search "#N in:body,title" to detect any existing open PR that references the issue.
2. If one exists:
   • Skip planner dispatch entirely, OR
   • Reroute to plan-reviewer with the existing PR as input (validate the in-flight plan instead of authoring a new one).
3. Document the dispatch decision in the run report so duplicates can be audited downstream.

Stage label

stage:triaged — needs planner.

Source

Surfaced by manual complexity-cut review on 2026-04-26.

[OriginalGary]

Goal — Add a de-duplication check to the git-workflow Step 0 (and the kilo-code orchestrator-mode.md) so that before any agent dispatches planner/architect work for a GitHub issue, it first queries for open PRs already referencing that issue and skips or re-routes rather than opening a duplicate.

Approach — This repo is instruction files, not running code. The orchestrator/planner dispatch lives in two places:

1. Step 0 of every tool's git-workflow file — the point where agents confirm an issue exists before starting work.
2. kilo-code/.kilocode/rules/orchestrator-mode.md — the explicit orchestrator dispatch model.

The fix inserts a hard rule immediately after the "Issue exists" check in Step 0: before proceeding, query gh pr list --state open --search "#<N>" --json number,title,url for the issue number and halt or reroute if an open PR is found. This is the correct insertion point because the agent already holds the issue number and is about to begin work.

Files changed (one logical change applied independently to each tool's format):

• claude-code/.claude/skills/git-workflow/SKILL.md
• kilo-code/.kilocode/skills/git-workflow/SKILL.md
• github-copilot/.github/skills/git-workflow/SKILL.md
• augment-code/.augment/rules/git-workflow.md
• cline/.clinerules/git-workflow.md
• cursor/.cursor/rules/git-workflow.mdc
• windsurf/.windsurf/rules/git-workflow.md
• roo-code/.roo/rules/git-workflow.md
• kilo-code/.kilocode/rules/orchestrator-mode.md
• agents-md/AGENTS.md

Canonical insertion text (adapted per tool format):

Before beginning any work, after confirming the issue number, check for open PRs that already address it:
gh pr list --state open --search "#<N> in:body,title" --json number,title,url
If one or more open PRs are returned: do not open a new PR — a duplicate is already in flight. Reroute to plan-reviewer with the existing PR as input, or halt and report the existing PR URL. Never open a second PR for the same issue unless the first is explicitly closed.

Subtasks (one commit each): update each of the 10 files listed above.

Tools — gh pr list (de-duplication query at dispatch time), git worktree (branch per task), desloppify scan (score gate), python scripts/check-unicode-integrity.py (instruction file integrity), semgrep --config semgrep-no-animal-violence.yaml (speciesist language check).

Test plan — The behavior under test is: an agent following Step 0 of git-workflow MUST halt before dispatching planner work when an open PR already references the target issue.

Tests encode the following behavioral rules:

• test_dedup_rule_present_in_all_tool_files — For each of the 10 changed files, assert the dedup rule text is present. Behaviour: the rule exists. Mutation kill: deleting the block from any file makes this test fail.
• test_dedup_rule_contains_gh_pr_list_command — Assert the gh pr list --state open command is present in all git-workflow files. Behaviour: the check is executable. Mutation kill: removing the command string fails the test.
• test_dedup_rule_contains_halt_instruction — Assert each file contains language directing the agent not to open a new PR when one already exists. Behaviour: the no-duplicate instruction is explicit. Mutation kill: softening to "consider not opening" fails the test.
• test_dedup_rule_contains_reroute_option — Assert each applicable file mentions rerouting to plan-reviewer with the existing PR. Behaviour: the reroute path is documented. Mutation kill: removing the reroute sentence fails the test.
• test_orchestrator_mode_contains_open_pr_check — Assert kilo-code/.kilocode/rules/orchestrator-mode.md Process Enforcement section contains the open PR hard rule. Behaviour: orchestrator-level enforcement exists. Mutation kill: removing from orchestrator-mode.md only fails this test.
• test_unicode_integrity_all_changed_files — Run check-unicode-integrity.py against all 10 changed files. Behaviour: no hidden Unicode characters. Mutation kill: injecting a zero-width character fails this test.
• test_no_speciesist_language_introduced — Run semgrep --config semgrep-no-animal-violence.yaml on all changed files. Behaviour: no new language violations. Mutation kill: adding a prohibited idiom fails the test.

Implementation: tests in scripts/tests/test_dedup_rule.py using pathlib to assert text presence. Run with python -m pytest scripts/tests/test_dedup_rule.py.

Success criteria —

1. All 10 files contain the dedup check at the correct location (Step 0, after "Issue exists" confirmation).
2. python -m pytest scripts/tests/test_dedup_rule.py passes (7 tests green).
3. python scripts/check-unicode-integrity.py exits 0 for all changed files.
4. desloppify scan --path . score is equal to or higher than the pre-change baseline.
5. CI integrity check (integrity-check.yml) passes on the PR branch.
6. No speciesist language introduced (NAV check passes).
7. The kilo-code orchestrator-mode.md Process Enforcement section explicitly lists the open-PR hard rule.

Rollback — All changes are additive text insertions in markdown files. Rolling back is a plain git revert of the squash commit. No database migrations, no config changes, no dependencies added. The duplicate-PR problem resumes on rollback, which is acceptable — it is not data-destructive.

[OriginalGary]

Review-plan

Verdict: approved

---

1. Completeness

The plan fully addresses the issue's acceptance criteria. Issue #47 asks for a guard at planner dispatch time that detects open PRs referencing the target issue and halts/reroutes. The plan inserts exactly that guard — after the "Issue exists" confirmation in Step 0 of every git-workflow file — for all 10 instruction surfaces: eight tool-specific git-workflow files, orchestrator-mode.md, and AGENTS.md. Both branches of the original issue's proposed fix (halt OR reroute to plan-reviewer) are covered.

2. Scope

No scope creep. The change is purely additive text insertion in markdown instruction files. No code is modified, no dependencies are added, no schemas change. Rollback is a plain git revert.

3. Edge cases

• Multiple open PRs for the same issue — the --search "#<N> in:body,title" query returns a list; the instruction covers "one or more" open PRs.
• No search results — implicit pass-through (proceed normally) is correct.
• Draft PRs — --state open correctly captures drafts, which are still duplicate risk.
• Reroute vs. halt ambiguity — both options are documented explicitly, letting the agent choose by context.

4. Plausibility

Mechanically simple additive text insertions. All 10 files confirmed to have a Step 0 section with a clear insertion point. The canonical wording adapts naturally to the windsurf condensed format. Realistic in one session.

5. Reuse

Uses the existing scripts/check-unicode-integrity.py and scripts/tests/ directory. No duplication introduced.

6. Test plan adequacy

All seven tests encode domain rules, would fail on breakage, and are mutation-resistant:

• test_dedup_rule_present_in_all_tool_files — block exists in each file; deleting from any file fails this test.
• test_dedup_rule_contains_gh_pr_list_command — executable command present; removing it fails.
• test_dedup_rule_contains_halt_instruction — "do not open a new PR" directive present; softening it fails.
• test_dedup_rule_contains_reroute_option — reroute path documented; removing it fails.
• test_orchestrator_mode_contains_open_pr_check — orchestrator-mode.md Process Enforcement section has the open-PR hard rule; removing only from that file fails only this test.
• test_unicode_integrity_all_changed_files — injecting a zero-width character into any changed file fails.
• test_no_speciesist_language_introduced — adding a prohibited idiom fails.

Test plan adequacy: satisfied.