fix(rules): supersede #4710 with md004 fix on top (Copilot P0)#4711
Merged
Conversation
…row forced-#6 exception (addresses PR #4709 P2 thread) Codex P2 review on PR #4709 flagged a contradiction between three statements in .claude/rules/claim-acquire-before-worktree-work.md: 1. The new 2026-05-23 "Non-deterministic under same conditions" paragraph authorizes single-retry-after-orphan-cleanup 2. The existing "no working mitigation today" line said no mitigation exists at all 3. The composite operational discipline step 7 said ABANDON when sub-case 4 is hit Operational ambiguity: some agents would retry, others would abort. Reconciliation makes the policy unambiguous: - Default = ABANDON when sub-case 4 fires (preserved as authoritative in the composite discipline; preserved in the sub-case 4 mitigation block reframed as "no STRUCTURAL mitigation today") - Narrow exception = single-retry-after-orphan-cleanup, AUTHORIZED ONLY at forced-#6 decomposition per holding-without-named-dependency counter, for sub-case 4 specifically (not sub-case 3), one retry only, and ABANDON applies absolutely if retry also fails - The exception does NOT generalize to brief-ack #1-#5 (other pre-empt artifact shapes are available there; default ABANDON is correct) - The exception does NOT generalize to sub-case 3 (pack-dir contention has no analogous timing-dependence evidence) Both edits cross-reference each other so future-Otto reading either location sees the full policy. Co-Authored-By: Claude <noreply@anthropic.com>
…rses as nested list (MD004/ul-style) Copilot P0 review on PR #4710 flagged line 402 of .claude/rules/claim-acquire-before-worktree-work.md where the continuation of the parenthetical "(rm -rf <wt-path>" began with "+ git branch -D <branch>)". Per markdownlint MD004/ul-style guidance in .github/copilot-instructions.md, a continuation line starting with "+ " inside an indented paragraph parses as a nested unordered list item and can fail CI. Fix: reword the two-command sequence to use prose connectives ("run X then Y") instead of the "+" infix operator. Preserves semantics: still a sequenced two-command cleanup. Co-Authored-By: Claude <noreply@anthropic.com>
5 tasks
There was a problem hiding this comment.
Pull request overview
Updates .claude/rules/claim-acquire-before-worktree-work.md to reconcile the documented retry/abandon policy for saturation “sub-case 4” while also addressing a markdownlint MD004 (ul-style) failure mode caused by a continuation line starting with +.
Changes:
- Reframes sub-case 4 mitigation as “default = ABANDON” with a clearly scoped forced-#6-only single-retry exception.
- Rewords the orphan-cleanup parenthetical to use “then …” instead of
+ …at line start, avoiding MD004 nested-list parsing.
This was referenced May 23, 2026
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.
Supersedes #4710 — carries its commit + an md004 fix on top.
Copilot P0 review on PR #4710 flagged that the new "Narrow exception" paragraph in
.claude/rules/claim-acquire-before-worktree-work.md:402had a continuation line beginning with `+ \`git branch -D \``. Per markdownlint MD004/ul-style guidance, `+` at line start inside an indented paragraph parses as a nested unordered list item and can fail CI.What this PR contains
608d775f7from fix(rules): reconcile sub-case 4 retry policy (addresses #4709 P2) #4710 (sub-case 4 retry policy reconciliation; default ABANDON + narrow forced-Round 30 — threat-model elevation (nation-state + supply-chain) #6 exception)8e4123038on top — rewords the parenthetical from `(rm -rf + git branch -D )` to `(run rm -rf then git branch -D )` to avoid MD004 trigger; semantics preserved (still a sequenced two-command cleanup)Closing #4710
#4710 will be closed once this PR lands — it's not redundant in terms of policy intent (this PR contains its commit), only in terms of the PR-as-mergeable-unit.
Test plan
🤖 Generated with Claude Code