@codedrifters/configulator 0.0.397 → 0.0.399

package/lib/index.d.mts

@@ -10671,7 +10671,7 @@ declare const VERSION: {
      *
      * CLI and lib are versioned separately, so this is the CLI version.
      */
-    readonly AWS_CDK_CLI_VERSION: "2.1132.1";
+    readonly AWS_CDK_CLI_VERSION: "2.1133.0";
     /**
      * CDK Version to use for construct projects.
      *
@@ -10694,7 +10694,7 @@ declare const VERSION: {
     /**
      * Version of PNPM to use in workflows at github actions.
      */
-    readonly PNPM_VERSION: "11.16.0";
+    readonly PNPM_VERSION: "11.17.0";
     /**
      * Version of Projen to use.
      */

package/lib/index.d.ts

@@ -10720,7 +10720,7 @@ declare const VERSION: {
      *
      * CLI and lib are versioned separately, so this is the CLI version.
      */
-    readonly AWS_CDK_CLI_VERSION: "2.1132.1";
+    readonly AWS_CDK_CLI_VERSION: "2.1133.0";
     /**
      * CDK Version to use for construct projects.
      *
@@ -10743,7 +10743,7 @@ declare const VERSION: {
     /**
      * Version of PNPM to use in workflows at github actions.
      */
-    readonly PNPM_VERSION: "11.16.0";
+    readonly PNPM_VERSION: "11.17.0";
     /**
      * Version of Projen to use.
      */

package/lib/index.js

@@ -562,6 +562,72 @@ var MCP_TRANSPORT = {
   SSE: "sse"
 };
 
+// src/agent/bundles/claim-verification.ts
+var ISSUE_CLAIM_MARKER_TAG = "<!-- issue-claim -->";
+var CLAIM_MARKER_LIST_JQ = `[.comments[] | select(.body | contains("${ISSUE_CLAIM_MARKER_TAG}")) | {id, createdAt}] | sort_by(.createdAt, .id)`;
+function renderClaimVerificationSection() {
+  return [
+    "## Claim verification",
+    "",
+    "Before you create a branch or write any artifacts, verify you own the",
+    "claim on the issue. This governs the `status:ready` \u2192",
+    "`status:in-progress` transition. In fleet deployments several",
+    "orchestrator runners share one GitHub queue, so a bare label flip does",
+    "not by itself guarantee you are the only session working the issue \u2014",
+    "two runners can scan the queue in the same window and both claim it",
+    "(fleet anti-collision).",
+    "",
+    "### The issue-claim marker",
+    "",
+    "Ownership is recorded by a single claim-marker comment on the issue.",
+    "Whoever claims the issue \u2014 the orchestrator at pick time",
+    "(claim-at-pick), or you, when you claim an unclaimed issue yourself \u2014",
+    "posts exactly one:",
+    "",
+    "```",
+    `${ISSUE_CLAIM_MARKER_TAG} Claimed <ISO-8601 UTC> by <claimant> \u2014 fleet anti-collision.`,
+    "```",
+    "",
+    "The **owner is the earliest** claim marker \u2014 the",
+    `\`${ISSUE_CLAIM_MARKER_TAG}\` comment with the lowest \`createdAt\``,
+    "(tie-broken on the lowest comment id). List the markers in claim order",
+    "with:",
+    "",
+    "```bash",
+    "gh issue view <n> --json comments \\",
+    `  --jq '${CLAIM_MARKER_LIST_JQ}'`,
+    "```",
+    "",
+    "### Verify or claim",
+    "",
+    "1. **Pre-claimed at pick.** If your dispatch brief says the orchestrator",
+    "   already flipped the label (claim-at-pick) and cites the marker it",
+    "   posted, confirm that marker is the **earliest** claim marker on the",
+    "   issue, then proceed. Do **not** re-add `status:ready` and do **not**",
+    "   re-flip the label \u2014 the claim is already yours.",
+    "2. **Unclaimed (`status:ready`).** Claim it yourself: **first** post the",
+    `   \`${ISSUE_CLAIM_MARKER_TAG}\` marker comment, **then** flip`,
+    "   `status:ready` \u2192 `status:in-progress`. Re-read the markers; proceed",
+    "   only if the marker you just posted is the earliest.",
+    "3. **Foreign prior claim \u2192 back off.** If a claim marker from another",
+    "   dispatch is **earlier** than yours \u2014 or the issue is already",
+    "   `status:in-progress` with a foreign marker and your dispatch brief",
+    "   did not claim it for you \u2014 a sibling runner owns the issue. **Back",
+    "   off cleanly and write no artifacts**: no branch, no files, no PR, and",
+    "   no completion or duplicate-output comment. Log",
+    "   `CLAIM_CONFLICT #<n> owner=<earliest-marker-id>` and stop the session.",
+    "",
+    "Backing off on a foreign claim is the analyst-side backstop to the",
+    "orchestrator's claim-at-pick guard: claim-at-pick closes the common",
+    "multi-minute window between the queue scan and the claim, and this",
+    "check absorbs the sub-second residual race where two runners both",
+    "scanned before either flipped the label. If you discover a foreign",
+    "prior claim **mid-execution** \u2014 after you have already begun a phase \u2014",
+    "stop immediately and discard the uncommitted work rather than opening a",
+    "second PR or writing a duplicate artifact for the issue."
+  ];
+}
+
 // src/agent/bundles/project-context.ts
 var PROJECT_CONTEXT_PATH = "docs/src/content/docs/project-context.md";
 var SUBPROJECT_ROLE_GUIDANCE = [
@@ -838,6 +904,10 @@ var agendaAnalystSubAgent = {
     "",
     "---",
     "",
+    ...renderClaimVerificationSection(),
+    "",
+    "---",
+    "",
     "## Phase 1: Draft (`agenda:draft`)",
     "",
     "**Goal:** Produce a well-structured `agenda.md` in the meeting's",
@@ -5249,6 +5319,10 @@ function buildBcmWriterSubAgent(paths, issueDefaults) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Outline (`bcm:outline`)",
       "",
       "**Goal:** Identify the capability (name-as-noun, business object, tier)",
@@ -6138,6 +6212,10 @@ function buildBusinessModelsAnalystSubAgent(paths) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Scan (`business-models:scan`)",
       "",
       "**Goal:** Read upstream industry and profile artifacts to identify",
@@ -7031,6 +7109,10 @@ function buildCompanyProfileAnalystSubAgent(paths, issueDefaults, tier) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Research (`company:research`)",
       "",
       "**Goal:** Gather public sources into a bounded research-notes file.",
@@ -8460,6 +8542,10 @@ function buildCustomerProfileAnalystSubAgent(paths, issueDefaults, tier) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Discover (`customer:discover`)",
       "",
       "**Goal:** Identify and segment the customer archetypes relevant to",
@@ -11073,6 +11159,10 @@ function buildIndustryDiscoveryAnalystSubAgent(paths, issueDefaults) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Discover (`industry:discover`)",
       "",
       "**Goal:** Enumerate candidate industry verticals into a bounded",
@@ -11625,6 +11715,10 @@ function buildMaintenanceAuditSubAgent(paths, tier) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Scan (`maint:scan`)",
       "",
       "**Goal:** Walk the configured doc tree, check every cross-reference",
@@ -12509,6 +12603,10 @@ function buildMeetingAnalystSubAgent(tier) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Extract (`meeting:extract`)",
       "",
       "**Goal:** Read the available meeting inputs (notes, transcript, or both)",
@@ -15366,6 +15464,7 @@ function shellSingleQuote(value) {
 }
 
 // src/agent/bundles/orchestrator.ts
+var REVIEW_IN_FLIGHT_WINDOW_MINUTES = 15;
 function renderDelegationActiveSignalsHelper() {
   return [
     "# delegation_active_signals <pr-number> <head-oid>",
@@ -16293,6 +16392,9 @@ function buildPrSweepScript() {
     "#   - isDraft = true                          \u2192 reason=draft",
     "#   - review:human-required label             \u2192 reason=human-required",
     "#   - review:awaiting-human label             \u2192 reason=awaiting-human",
+    "#   - newest ## Reviewer* comment younger than the review-in-flight",
+    "#     window (a sibling runner's review is already in flight this",
+    "#     cycle)                                   \u2192 reason=review-in-flight",
     "#",
     "# Needs-worker-mode skip rules (PR carries review:needs-worker but is",
     "# not eligible to drain this cycle). A PR with NO review:fixing lease",
@@ -16316,6 +16418,11 @@ function buildPrSweepScript() {
     "",
     "set -uo pipefail",
     "",
+    "# Review-in-flight window in seconds \u2014 a PR whose newest reviewer",
+    "# comment is younger than this is treated as under active review by a",
+    "# sibling runner (fleet anti-collision).",
+    `REVIEW_IN_FLIGHT_WINDOW_SECONDS=${REVIEW_IN_FLIGHT_WINDOW_MINUTES * 60}`,
+    "",
     "# \u2500\u2500 helpers \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
     "",
     "# Resolve the linked issue's priority for a PR so the needs-worker",
@@ -16345,6 +16452,31 @@ function buildPrSweepScript() {
     "  esac",
     "}",
     "",
+    "# Fleet anti-collision: echo the age in",
+    "# whole seconds of a PR's newest `## Reviewer*` comment, or `none` when",
+    "# the PR has no reviewer comment yet (or the read fails). The age is",
+    "# derived from the newest reviewer comment's `updatedAt` (fall back to",
+    "# `createdAt`) so an in-place edit of the sticky `## Reviewer notes`",
+    "# comment counts as fresh activity, and it is computed inside jq",
+    "# (`now - fromdateiso8601`, clamped at 0) so no non-portable `date`",
+    "# parsing is needed. The raw JSON is piped through the caller's jq (not",
+    "# gh's `--jq`), mirroring cmd_review's `gh pr list` handling.",
+    "newest_reviewer_comment_age_seconds() {",
+    '  local pr_num="$1"',
+    "  local json",
+    '  json=$(gh pr view "$pr_num" --json comments 2>/dev/null) || { echo "none"; return; }',
+    '  [[ -z "$json" ]] && { echo "none"; return; }',
+    `  echo "$json" | jq -r '`,
+    "    [ .comments[]?",
+    '      | select(.body | startswith("## Reviewer"))',
+    "      | (.updatedAt // .createdAt)",
+    "      | fromdateiso8601",
+    "    ] as $ts",
+    '    | if ($ts | length) == 0 then "none"',
+    "      else ((now - ($ts | max)) | floor | if . < 0 then 0 else . end) end",
+    `  ' 2>/dev/null || echo "none"`,
+    "}",
+    "",
     ...renderDelegationActiveSignalsHelper(),
     "",
     "# \u2500\u2500 modes \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
@@ -16361,22 +16493,47 @@ function buildPrSweepScript() {
     "    return 0",
     "  fi",
     "",
-    "  # Emit one PR_ELIGIBLE / PR_SKIP line per open PR, sorted by PR",
-    "  # number ascending so the order is deterministic across runs.",
-    `  echo "$prs" | jq -r '`,
+    "  # First pass (jq, no per-PR reads): classify each PR from the labels",
+    "  # and draft flag already in the list JSON, sorted by PR number",
+    "  # ascending so the output order is deterministic across runs. A PR",
+    "  # that clears every cheap label/draft skip rule is a CANDIDATE \u2014 the",
+    "  # review-in-flight check (which needs a per-PR comment read) is",
+    "  # applied per-candidate in the loop below. Emit `kind\\tnumber\\treason`.",
+    "  local rows",
+    `  rows=$(echo "$prs" | jq -r '`,
     "    sort_by(.number) |",
     "    .[] |",
     "    (.labels | map(.name)) as $labels |",
     "    if .isDraft then",
-    '      "PR_SKIP #\\(.number) reason=draft"',
+    '      "SKIP\\t\\(.number)\\tdraft"',
     '    elif ($labels | index("review:human-required")) then',
-    '      "PR_SKIP #\\(.number) reason=human-required"',
+    '      "SKIP\\t\\(.number)\\thuman-required"',
     '    elif ($labels | index("review:awaiting-human")) then',
-    '      "PR_SKIP #\\(.number) reason=awaiting-human"',
+    '      "SKIP\\t\\(.number)\\tawaiting-human"',
     "    else",
-    '      "PR_ELIGIBLE #\\(.number)"',
+    '      "CANDIDATE\\t\\(.number)\\t"',
     "    end",
-    "  '",
+    "  ')",
+    "",
+    "  while IFS=$'\\t' read -r kind pr_num reason; do",
+    '    [[ -z "$pr_num" ]] && continue',
+    '    if [[ "$kind" == "SKIP" ]]; then',
+    '      echo "PR_SKIP #${pr_num} reason=${reason}"',
+    "      continue",
+    "    fi",
+    "    # CANDIDATE \u2014 dispatch the reviewer UNLESS a sibling runner's review",
+    "    # is already in flight, i.e. the newest `## Reviewer*` comment is",
+    "    # younger than the review-in-flight window (fleet anti-collision).",
+    "    local age",
+    '    age=$(newest_reviewer_comment_age_seconds "$pr_num")',
+    "    # `age` is `none` (no reviewer comment / read failed) or a",
+    "    # non-negative integer; only a numeric age inside the window skips.",
+    '    if [[ "$age" =~ ^[0-9]+$ && "$age" -lt "$REVIEW_IN_FLIGHT_WINDOW_SECONDS" ]]; then',
+    '      echo "PR_SKIP #${pr_num} reason=review-in-flight"',
+    "    else",
+    '      echo "PR_ELIGIBLE #${pr_num}"',
+    "    fi",
+    '  done <<< "$rows"',
     "}",
     "",
     "cmd_needs_worker() {",
@@ -16501,7 +16658,7 @@ function buildPrSweepScript() {
 function buildPrSweepProcedure() {
   return {
     name: "pr-sweep.sh",
-    description: "Token-efficient PR enumeration for the orchestrator. In `review` mode (default) it emits one `PR_ELIGIBLE #<n>` or `PR_SKIP #<n> reason=<draft|human-required|awaiting-human>` line per open PR so the orchestrator dispatches `pr-reviewer` per eligible PR. In `needs-worker` mode it lists open PRs carrying the `review:needs-worker` marker and drains them, emitting `PR_DRAIN #<n>` lines ordered highest-priority-first so the orchestrator dispatches `issue-worker` per PR. A PR without the `review:fixing` lease is an idle marker and always drains; a PR that also holds `review:fixing` drains UNLESS a worker is demonstrably active (judged by the shared `delegation_active_signals` helper cmd_lease_reconcile also uses) \u2014 skipping as `reason=no-fixlist` / `reason=reported` / `reason=in-flight`. `NO_NEEDS_WORKER_PRS` when none.",
+    description: "Token-efficient PR enumeration for the orchestrator. In `review` mode (default) it emits one `PR_ELIGIBLE #<n>` or `PR_SKIP #<n> reason=<draft|human-required|awaiting-human|review-in-flight>` line per open PR so the orchestrator dispatches `pr-reviewer` per eligible PR. `review-in-flight` skips a PR whose newest `## Reviewer*` comment is younger than the fleet review-in-flight window, so overlapping runners do not both dispatch a reviewer on the same PR. In `needs-worker` mode it lists open PRs carrying the `review:needs-worker` marker and drains them, emitting `PR_DRAIN #<n>` lines ordered highest-priority-first so the orchestrator dispatches `issue-worker` per PR. A PR without the `review:fixing` lease is an idle marker and always drains; a PR that also holds `review:fixing` drains UNLESS a worker is demonstrably active (judged by the shared `delegation_active_signals` helper cmd_lease_reconcile also uses) \u2014 skipping as `reason=no-fixlist` / `reason=reported` / `reason=in-flight`. `NO_NEEDS_WORKER_PRS` when none.",
     content: buildPrSweepScript()
   };
 }
@@ -16701,6 +16858,7 @@ var orchestratorSubAgent = {
     "PR_SKIP #<n> reason=draft",
     "PR_SKIP #<n> reason=human-required",
     "PR_SKIP #<n> reason=awaiting-human",
+    "PR_SKIP #<n> reason=review-in-flight",
     "```",
     "",
     "Skip rules (PRs that never reach the reviewer in this sweep):",
@@ -16710,6 +16868,12 @@ var orchestratorSubAgent = {
     "  (operator override \u2014 the reviewer's auto-merge path is forbidden)",
     "- Carries the `review:awaiting-human` label \u2192 `reason=awaiting-human`",
     "  (the reviewer already handed off; a human is the next actor)",
+    `- Newest \`## Reviewer*\` comment younger than ${REVIEW_IN_FLIGHT_WINDOW_MINUTES} minutes \u2192`,
+    "  `reason=review-in-flight` (a sibling fleet runner's reviewer is",
+    "  already looking at this PR this cycle \u2014 dispatching a second reviewer",
+    "  would duplicate the review and race on the sticky notes / auto-merge",
+    "  decision). The procedure owns this timing check; do not second-guess",
+    "  it by dispatching a reviewer on a skipped PR.",
     "",
     "If the script emits `NO_OPEN_PRS`, log the empty result and skip",
     "directly to Phase B1.",
@@ -17020,12 +17184,50 @@ var orchestratorSubAgent = {
     "values reflect the override; the global thresholds are documented",
     "in the **Scope gate** section in `CLAUDE.md`.",
     "",
-    "If the scope is `small` or `medium`, continue \u2014 the issue is",
-    "dispatchable. Record the first `PICK` line as the next work item",
-    "and proceed to Phase G:",
+    "If the scope is `small` or `medium`, the issue is dispatchable \u2014",
+    "**claim it at pick** before proceeding to Phase G. Claim-at-pick",
+    "collapses the multi-minute window between this queue scan and the",
+    "dispatched worker's own claim, during which a sibling fleet runner",
+    "scanning the same queue would otherwise see `status:ready` and",
+    "dispatch a second worker on the same issue (fleet",
+    "anti-collision):",
+    "",
+    "1. **Re-read the picked issue's labels** immediately before claiming:",
+    "   ```bash",
+    "   gh issue view <number> --json labels --jq '[.labels[].name]'",
+    "   ```",
+    "   If `status:ready` is **no longer present**, a sibling runner claimed",
+    "   the issue inside your scan window \u2014 do **not** dispatch. Return to",
+    "   the `PICK` list, take the next candidate, and re-run the scope check.",
+    "2. **Post an issue-claim marker, then flip the label.** Post the marker",
+    "   first so ownership carries a server-side timestamp, then claim:",
+    "   ```bash",
+    "   ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)",
+    `   gh issue comment <number> --body "${ISSUE_CLAIM_MARKER_TAG} Claimed $ts by orchestrator claim-at-pick \u2014 fleet anti-collision."`,
+    '   gh issue edit <number> --remove-label "status:ready" --add-label "status:in-progress"',
+    "   ```",
+    "   This `status:ready` \u2192 `status:in-progress` flip is a normal claim",
+    "   transition, **not** a `status:needs-attention` flag, so removing",
+    "   `status:ready` here is correct (contrast the scope-gate large-issue",
+    "   path, which is additive and must keep the base status).",
+    "3. **Confirm you won the race.** Re-list the issue-claim markers in",
+    "   claim order:",
+    "   ```bash",
+    `   gh issue view <number> --json comments --jq '${CLAIM_MARKER_LIST_JQ}'`,
+    "   ```",
+    "   If the **earliest** marker is not the one you just posted (a rare",
+    "   sub-second tie where a sibling claimed first), yield: leave the",
+    "   labels as they are \u2014 the sibling owns the issue \u2014 and take the next",
+    "   `PICK` candidate. Likewise take the next candidate if the flip in",
+    "   step 2 errored.",
+    "",
+    "Record the claimed issue as the next work item and proceed to Phase G",
+    "(the `claim:at-pick` field records that this orchestrator session has",
+    "already flipped the label, so the dispatch brief tells the worker not",
+    "to treat it as a foreign claim):",
     "",
     "```",
-    'NEXT_WORK_ITEM #<number> priority:<level> tier:<n> type:<label> scope:<small|medium> "<title>"',
+    'NEXT_WORK_ITEM #<number> priority:<level> tier:<n> type:<label> scope:<small|medium> claim:at-pick "<title>"',
     "```",
     "",
     "If the scope is `large`, **do not dispatch**. Instead:",
@@ -17070,10 +17272,14 @@ var orchestratorSubAgent = {
     "If output is `NO_READY_ISSUES`, report that the queue is empty,",
     "skip Phase G, and proceed directly to Phase F.",
     "",
-    "**Do NOT claim the issue, create a branch, or start implementation",
-    "yourself.** Phase G hands the issue off to the `issue-worker`",
-    "sub-agent in scheduled mode; the worker performs the actual",
-    "claim \u2192 branch \u2192 implement \u2192 commit \u2192 PR cycle.",
+    "**Claim only the label, and only at pick.** The claim-at-pick step",
+    "above (re-read labels \u2192 post the issue-claim marker \u2192 flip",
+    "`status:ready` \u2192 `status:in-progress`) is the **sole** mutation the",
+    "orchestrator makes to an issue. Do **not** create a branch, edit the",
+    "issue body, or start implementation yourself \u2014 Phase G hands the",
+    "already-claimed issue off to the `issue-worker` sub-agent in scheduled",
+    "mode, and the worker performs the branch \u2192 implement \u2192 commit \u2192 PR",
+    "cycle.",
     "",
     "## Phase G: Delegate Implementation",
     "",
@@ -17091,8 +17297,14 @@ var orchestratorSubAgent = {
     "",
     "Invoke the sub-agent with a single-message brief:",
     "",
-    "> `scheduled mode`: work issue #<number>. Pick this issue from the",
-    "> queue, claim it, route to the appropriate typed agent if one",
+    "> `scheduled mode`: work issue #<number>. This orchestrator session",
+    "> has **already claimed** the issue at pick time (claim-at-pick): it",
+    "> is `status:in-progress` and carries an issue-claim marker",
+    `> (\`${ISSUE_CLAIM_MARKER_TAG}\`) this dispatch posted. Treat that claim`,
+    "> as **yours** \u2014 do not treat the existing `status:in-progress` as a",
+    "> foreign claim, do not re-add `status:ready`, and skip your own claim",
+    "> flip; per your Claim verification step, confirm that marker is the",
+    "> earliest and proceed. Route to the appropriate typed agent if one",
     "> applies, implement the change, run the verification commands,",
     "> commit, push, and open a PR labeled `origin:issue-worker` that",
     "> closes the issue. Do not pause for approval. Return a one-line",
@@ -17101,10 +17313,10 @@ var orchestratorSubAgent = {
     "> `WORKER_FAILED issue:#<n> reason:<short reason>` on failure.",
     "",
     "Substitute `<number>` with the issue number from the",
-    "`NEXT_WORK_ITEM` line in Phase E. The orchestrator is **read-only**",
-    "with respect to the issue and its branch \u2014 never claim the issue,",
-    "create a branch, or push commits in this phase. Implementation is",
-    "the worker's job.",
+    "`NEXT_WORK_ITEM` line in Phase E. The claim-at-pick label flip",
+    "(Phase E) is the **only** mutation the orchestrator makes to the",
+    "issue; in this phase it never creates a branch, edits the issue body,",
+    "or pushes commits. Implementation is the worker's job.",
     "",
     "If the worker's final line is missing, malformed, or indicates an",
     "error, **do not retry** in the same orchestrator session \u2014 log the",
@@ -17131,7 +17343,7 @@ var orchestratorSubAgent = {
     "## Rules",
     "",
     "1. **Never implement code.** You triage, scan, and delegate \u2014 you do not code.",
-    "2. **Never claim issues.** Do not add `status:in-progress` or create branches for issues. Phase G's `issue-worker` delegation is the only path that flips an issue's claim labels.",
+    "2. **Claim at pick, and only the label.** Claim the picked issue yourself in Phase E \u2014 re-read its labels, post an `<!-- issue-claim -->` marker, then flip `status:ready` \u2192 `status:in-progress` \u2014 **before** dispatching in Phase G (claim-at-pick, fleet anti-collision). This closes the double-dispatch window in which a sibling runner would otherwise pick the same still-`status:ready` issue. The flip is a normal claim transition, not a `status:needs-attention` flag, so removing `status:ready` here is correct. The claim-label flip is the **only** mutation you make to an issue: never create branches, write code, edit issue bodies, or push commits \u2014 the `issue-worker` still owns branch \u2192 implement \u2192 commit \u2192 PR.",
     "3. **Always use procedure scripts.** Issue triage queries go through `.claude/procedures/check-blocked.sh`; PR-eligibility filtering (Phase B) goes through `.claude/procedures/pr-sweep.sh review`; the feedback-drain enumeration (Phase B1) goes through `.claude/procedures/pr-sweep.sh needs-worker`. Never iterate raw `gh issue list` / `gh pr list` JSON in-context.",
     "4. **Follow CLAUDE.md conventions** for all git and gh operations.",
     "5. **Priority order:** critical > high > medium > low > trivial, then **funnel tier asc** (lower tier wins ties), then FIFO by issue number.",
@@ -17346,15 +17558,31 @@ var issueWorkerSubAgent = {
     "",
     "**Normal mode:**",
     "",
-    "```bash",
-    'gh issue edit <number> --remove-label "status:ready" --add-label "status:in-progress"',
-    "```",
+    "Follow the **Claim verification** protocol below before you branch \u2014 do",
+    "not blind-flip the label:",
+    "",
+    "- **Dispatched by the orchestrator (claim-at-pick).** Your brief states",
+    "  the issue is already `status:in-progress` with an issue-claim marker",
+    "  this dispatch posted. Confirm that marker is the earliest claim",
+    "  marker on the issue, then proceed \u2014 do **not** re-add `status:ready`",
+    "  or re-flip the label.",
+    "- **Interactive or otherwise unclaimed (`status:ready`).** Claim it",
+    `  yourself: post an \`${ISSUE_CLAIM_MARKER_TAG}\` marker, then flip:`,
+    "  ```bash",
+    "  ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)",
+    `  gh issue comment <number> --body "${ISSUE_CLAIM_MARKER_TAG} Claimed $ts by issue-worker \u2014 fleet anti-collision."`,
+    '  gh issue edit <number> --remove-label "status:ready" --add-label "status:in-progress"',
+    "  ```",
+    "- **Foreign prior claim.** If an earlier issue-claim marker from another",
+    "  dispatch exists, back off without writing artifacts (see below).",
     "",
     "Read the full issue details:",
     "```bash",
     "gh issue view <number>",
     "```",
     "",
+    ...renderClaimVerificationSection(),
+    "",
     "## Phase 3: Set Up",
     "",
     "**Feedback mode:** Do **not** check out the default branch and do **not**",
@@ -17894,9 +18122,10 @@ var ORCHESTRATOR_CONVENTIONS_PREAMBLE = [
   "When running the orchestrator agent (`.claude/agents/orchestrator.md`):",
   "",
   "- The orchestrator runs **one full end-to-end cycle every invocation**: startup \u2192 PR review sweep \u2192 feedback drain \u2192 triage / unblock \u2192 maintenance \u2192 queue scan \u2192 delegate to `issue-worker` \u2192 cleanup",
-  "- The orchestrator **never** implements code, creates branches, or pushes commits \u2014 it routes work to other sub-agents. The merge decision is still owned by the `pr-reviewer` sub-agent; Phase B only chooses which open PRs the reviewer should look at and dispatches one reviewer session per eligible PR (skipping drafts and any PR carrying `review:human-required` or `review:awaiting-human`).",
+  "- The orchestrator **never** implements code, creates branches, or pushes commits \u2014 it routes work to other sub-agents. Its **only** issue mutation is the claim-at-pick label flip (Phase E, see below). The merge decision is still owned by the `pr-reviewer` sub-agent; Phase B only chooses which open PRs the reviewer should look at and dispatches one reviewer session per eligible PR (skipping drafts, any PR carrying `review:human-required` or `review:awaiting-human`, and any PR with a review already in flight).",
+  "- **Fleet anti-collision.** When several orchestrator runners share one GitHub queue, two guards stop duplicate dispatch. **Claim-at-pick:** in Phase E, once the scope gate passes, the orchestrator re-reads the picked issue's labels (skipping to the next candidate if it is no longer `status:ready`), posts an `<!-- issue-claim -->` marker, and flips `status:ready` \u2192 `status:in-progress` itself **before** dispatching in Phase G \u2014 collapsing the window in which a sibling runner would re-pick the same issue. The Phase G dispatch brief tells the worker the label was pre-flipped so it does not treat the claim as foreign. **Review-in-flight:** `pr-sweep.sh review` skips (`reason=review-in-flight`) any PR whose newest `## Reviewer*` comment is younger than the review-in-flight window, so overlapping runners do not both dispatch a reviewer on the same PR. The dispatched `issue-worker` and every phased analyst carry a matching **Claim verification** backstop that verifies claim ownership by issue-claim-marker ordering and backs off without writing artifacts on a foreign prior claim.",
   "- **Phase B produces `review:needs-worker` markers; Phase B1 consumes them.** Phase B's `pr-reviewer` dispatch leaves a durable `review:needs-worker` marker whenever it delegates a fix-list (it cannot spawn the worker in session \u2014 it may run at depth-1). Phase B1 (feedback drain) actively drains that queue every cycle: it dispatches a top-level `issue-worker` per open `review:needs-worker` PR \u2014 highest-priority first, looping until the queue is empty \u2014 to consume the reviewer's fix-list. **Feedback PRs are preferred over fresh issues**, so Phase B1 runs after the review sweep but before the queue scan (Phase E) and fresh delegation (Phase G). A PR that also carries the `review:fixing` lease still drains **unless a worker is demonstrably active** \u2014 the reviewer acquires the lease and applies the marker in one atomic pass and holds the lease across sessions, so the bare lease does not mean a worker is running. The drain judges 'active' with the same `delegation_active_signals` helper the maintenance lease-reconcile uses: it skips only when there is no reviewer fix-list (`reason=no-fixlist`), a worker-report already landed (`reason=reported`), or the branch HEAD advanced past the fix-list (`reason=in-flight`); otherwise the delegated-but-idle PR drains so its FIRST worker gets dispatched.",
-  "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency. PR-eligibility filtering for Phase B uses `.claude/procedures/pr-sweep.sh review`, which emits `PR_ELIGIBLE` / `PR_SKIP` lines; the Phase B1 feedback-drain enumeration uses `.claude/procedures/pr-sweep.sh needs-worker`, which emits `PR_DRAIN` / `PR_SKIP reason=<no-fixlist|reported|in-flight>` lines. The orchestrator never iterates raw `gh pr list` JSON.",
+  "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency. PR-eligibility filtering for Phase B uses `.claude/procedures/pr-sweep.sh review`, which emits `PR_ELIGIBLE` / `PR_SKIP reason=<draft|human-required|awaiting-human|review-in-flight>` lines; the Phase B1 feedback-drain enumeration uses `.claude/procedures/pr-sweep.sh needs-worker`, which emits `PR_DRAIN` / `PR_SKIP reason=<no-fixlist|reported|in-flight>` lines. The orchestrator never iterates raw `gh pr list` JSON.",
   "- The queue scan reads only `priority:*` and `status:*` labels \u2014 type-routing (which typed agent handles a given `type:*` label) is the `issue-worker`'s concern, not the orchestrator's. The orchestrator's funnel-tier sort is a tie-breaker on `priority:*`, not a routing decision.",
   "- Priority order: critical > high > medium > low > trivial, then **funnel tier asc** (lower tier wins ties), then FIFO by issue number. Phase E's queue scan walks each priority bucket in turn (one `gh issue list` call per bucket, **capped at 50 issues per bucket**) and short-circuits on the first bucket whose survivors clear the `Depends on:` filter, so every higher-priority issue is visible even when the global ready backlog is much larger than 50.",
   "- Stale thresholds: 72h for in-progress, 168h for blocked",
@@ -18288,6 +18517,10 @@ function buildPeopleProfileAnalystSubAgent(paths, issueDefaults, tier) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Research (`people:research`)",
       "",
       "**Goal:** Gather public sources into a bounded research-notes file.",
@@ -22410,6 +22643,10 @@ function buildRegulatoryResearchAnalystSubAgent(paths, issueDefaults) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Scan (`regulatory:scan`)",
       "",
       "**Goal:** Enumerate regulations applicable to a given scope \u2014",
@@ -25599,6 +25836,10 @@ function buildRequirementsWriterSubAgent(paths) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## The `req:write` Issue Schema",
       "",
       "This section is the **authoritative schema** for `req:write` issue",
@@ -26235,6 +26476,10 @@ function buildRequirementsAnalystSubAgent(paths, issueDefaults) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Scan (`req:scan`)",
       "",
       "**Goal:** Read source documents, identify where requirements are missing,",
@@ -26823,6 +27068,10 @@ function buildRequirementsReviewerSubAgent(paths, issueDefaults) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase Router",
       "",
       "Before reading any documents, classify the session by reading the",
@@ -28200,6 +28449,10 @@ function buildResearchAnalystSubAgent(paths) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Scope (`research:scope`)",
       "",
       "**Goal:** Turn a natural-language research question into a bounded",
@@ -28939,6 +29192,10 @@ function buildSoftwareProfileAnalystSubAgent(paths, issueDefaults, tier) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Research (`software:research`)",
       "",
       "**Goal:** Gather public sources into a bounded research-notes file.",
@@ -30061,6 +30318,10 @@ function buildStandardsResearchAnalystSubAgent(paths, issueDefaults) {
       "",
       "---",
       "",
+      ...renderClaimVerificationSection(),
+      "",
+      "---",
+      "",
       "## Phase 1: Scope (`standards:scope`)",
       "",
       "**Goal:** Plan the research campaign for a standard \u2014 identify which",
@@ -31905,7 +32166,7 @@ var VERSION = {
    *
    * CLI and lib are versioned separately, so this is the CLI version.
    */
-  AWS_CDK_CLI_VERSION: "2.1132.1",
+  AWS_CDK_CLI_VERSION: "2.1133.0",
   /**
    * CDK Version to use for construct projects.
    *
@@ -31928,7 +32189,7 @@ var VERSION = {
   /**
    * Version of PNPM to use in workflows at github actions.
    */
-  PNPM_VERSION: "11.16.0",
+  PNPM_VERSION: "11.17.0",
   /**
    * Version of Projen to use.
    */