@pourkit/cli 0.0.0-next-20260714055657 → 0.0.0-next-20260714073403

package/dist/cli.js

@@ -3772,7 +3772,7 @@ function validatePrdPlanWorkspace(options) {
     );
   }
   const children = [];
-  const CHILD_REF_PATTERN2 = /^\s*(I-0*\d+)\s*$/i;
+  const CHILD_REF_PATTERN = /^\s*(I-0*\d+)\s*$/i;
   const BLOCKED_BY_SECTION_REGEX2 = /## Blocked by\s*\n([\s\S]*?)(?=\n## |$)/i;
   const PARENT_SECTION_REGEX2 = /## Parent\s*\n([\s\S]*?)(?=\n## |$)/i;
   for (const childFile of childFiles) {
@@ -3810,7 +3810,7 @@ function validatePrdPlanWorkspace(options) {
         if (!line) continue;
         for (const part of line.split(",")) {
           const trimmed = part.trim();
-          const match = trimmed.match(CHILD_REF_PATTERN2);
+          const match = trimmed.match(CHILD_REF_PATTERN);
           if (match) {
             blockedByRefs.push(match[1].toUpperCase());
           }
@@ -8815,7 +8815,7 @@ import { isAbsolute as isAbsolute8, join as join22, relative as relative3, resol
 import { readFile as readFile5, readdir as readdir2 } from "fs/promises";
 import { join as join19 } from "path";
 var CHILD_FILE_PATTERN = /^I-0*(\d+)-.+\.md$/i;
-var CHILD_REF_PATTERN = /^\s*(?:[-*]|\d+[.)])?\s*(I-0*\d+)\s*$/i;
+var CHILD_REF_REGEX = /\bI-0*(\d+)\b/gi;
 var BLOCKED_BY_SECTION_REGEX = /## Blocked by\s*\n([\s\S]*?)(?=\n## |$)/i;
 var PARENT_SECTION_REGEX = /## Parent\s*\n([\s\S]*?)(?=\n## |$)/i;
 function escapeRegExp2(value) {
@@ -8840,19 +8840,10 @@ function parseChildRefsFromBody(body) {
   const section = body.match(BLOCKED_BY_SECTION_REGEX)?.[1];
   if (!section) return [];
   const refs = [];
-  for (const rawLine of section.split("\n")) {
-    const line = rawLine.trim();
-    if (!line) continue;
-    const parts = line.split(",");
-    for (const part of parts) {
-      const trimmed = part.trim();
-      const match = trimmed.match(CHILD_REF_PATTERN);
-      if (match) {
-        refs.push(match[1].toUpperCase());
-      }
-    }
+  for (const match of section.matchAll(CHILD_REF_REGEX)) {
+    refs.push(`I-${match[1].padStart(2, "0")}`);
   }
-  return refs;
+  return Array.from(new Set(refs));
 }
 function extractTitleBody(content) {
   const firstLine = content.split("\n")[0];
@@ -11859,6 +11850,29 @@ async function claimReadyPrdChild(options) {
     }
   };
 }
+async function releaseClaimedPrdChild(options) {
+  const result = await runBdJson({
+    repoRoot: options.repoRoot,
+    args: ["update", options.childId, "--status", "open", "--json"],
+    logger: options.logger
+  });
+  const child = findReadyClaim(result);
+  if (!child?.id) {
+    return {
+      ok: false,
+      childId: options.childId,
+      reason: `bd update ${options.childId} --status open returned no child.`
+    };
+  }
+  return {
+    ok: true,
+    child: {
+      id: child.id,
+      title: child.title,
+      metadata: child.metadata
+    }
+  };
+}
 function findReadyClaim(value) {
   if (!value) return void 0;
   if (Array.isArray(value)) return value.find((entry) => Boolean(entry.id));
@@ -13051,6 +13065,32 @@ async function reconcileBlockedBeadsIssueProjection(options) {
   }
   return refreshed;
 }
+async function releaseSkippedBlockedBeadsChildren(options) {
+  for (const child of options.children) {
+    let result;
+    try {
+      result = await releaseClaimedPrdChild({
+        repoRoot: options.repoRoot,
+        childId: child.id,
+        logger: options.logger
+      });
+    } catch (error) {
+      logCoordinatorStep(
+        options.logger,
+        "warn",
+        `Failed to release skipped Beads child ${child.id}: ${error instanceof Error ? error.message : String(error)}`
+      );
+      continue;
+    }
+    if (!result.ok) {
+      logCoordinatorStep(
+        options.logger,
+        "warn",
+        `Failed to release skipped Beads child ${child.id}: ${result.reason}`
+      );
+    }
+  }
+}
 function extractIssueFromQueueError(error) {
   if (!error || typeof error !== "object" || !("issue" in error)) {
     return void 0;
@@ -14267,6 +14307,7 @@ async function launchBeadsQueueDrain(options, prdRef, startReceipt, targetName,
   const executionProvider = options.executionProvider;
   const logger = options.logger;
   const processedResults = [];
+  const skippedBlockedBeadsChildren = [];
   const originalGuidance = readPrdRun(options.repoRoot, prdRef).record?.repairGuidance;
   logCoordinatorStep(
     logger,
@@ -14365,33 +14406,42 @@ async function launchBeadsQueueDrain(options, prdRef, startReceipt, targetName,
           prdRef,
           logger
         });
-        logCoordinatorStep(
-          logger,
-          "info",
-          `Running GitHub Issue #${issue.number} from Beads child ${contextResult.beads.childId}.`
-        );
-        const runResult = await runClaimedPrdIssueCommand({
-          targetName,
-          config: options.config,
-          issueProvider,
-          prProvider,
-          executionProvider,
-          force: false,
-          logger,
-          repoRoot: options.repoRoot,
-          issue,
-          queueRunContext: {
-            prdRef,
-            prdBranch: startReceipt.prdBranch,
-            beadsChild: contextResult.beads
-          }
-        });
-        processedResults.push({
-          beadsChildId: contextResult.beads.childId,
-          issueNumber: runResult.selected.number,
-          noOp: runResult.runResult.noOp,
-          publicationStatus: runResult.runResult.publicationStatus
-        });
+        if (issue.labels.includes(options.config.labels.blocked)) {
+          logCoordinatorStep(
+            logger,
+            "info",
+            `Skipping Beads child ${contextResult.beads.childId} because GitHub Issue #${issue.number} remains labeled ${options.config.labels.blocked}.`
+          );
+          skippedBlockedBeadsChildren.push(readResult.child);
+        } else {
+          logCoordinatorStep(
+            logger,
+            "info",
+            `Running GitHub Issue #${issue.number} from Beads child ${contextResult.beads.childId}.`
+          );
+          const runResult = await runClaimedPrdIssueCommand({
+            targetName,
+            config: options.config,
+            issueProvider,
+            prProvider,
+            executionProvider,
+            force: false,
+            logger,
+            repoRoot: options.repoRoot,
+            issue,
+            queueRunContext: {
+              prdRef,
+              prdBranch: startReceipt.prdBranch,
+              beadsChild: contextResult.beads
+            }
+          });
+          processedResults.push({
+            beadsChildId: contextResult.beads.childId,
+            issueNumber: runResult.selected.number,
+            noOp: runResult.runResult.noOp,
+            publicationStatus: runResult.runResult.publicationStatus
+          });
+        }
       } catch (error) {
         const msg = error instanceof Error ? error.message : String(error);
         const repair = buildQueueIssueRunRepairMetadata(
@@ -14469,30 +14519,52 @@ async function launchBeadsQueueDrain(options, prdRef, startReceipt, targetName,
         prdRef,
         logger
       });
-      const runResult = await runClaimedPrdIssueCommand({
-        targetName,
-        config: options.config,
-        issueProvider,
-        prProvider,
-        executionProvider,
-        force: false,
-        logger,
-        repoRoot: options.repoRoot,
-        issue: fetchedIssue,
-        queueRunContext: {
-          prdRef,
-          prdBranch: startReceipt.prdBranch,
-          ...resumeBeadsContext ? { beadsChild: resumeBeadsContext } : {}
+      if (fetchedIssue.labels.includes(options.config.labels.blocked)) {
+        logCoordinatorStep(
+          logger,
+          "info",
+          `Skipping resume issue #${fetchedIssue.number} because it remains labeled ${options.config.labels.blocked}; selecting another Beads-ready child.`
+        );
+        if (resumeBeadsContext) {
+          skippedBlockedBeadsChildren.push({
+            id: resumeBeadsContext.childId,
+            title: fetchedIssue.title,
+            metadata: {
+              pourkit: {
+                prdRef,
+                childRef: resumeBeadsContext.childRef,
+                githubIssueNumber: resumeIssueNumber
+              }
+            }
+          });
         }
-      });
-      processedResults.push({
-        beadsChildId: resumeIssue?.beadsChildId ?? "resumed",
-        issueNumber: runResult.selected.number,
-        noOp: runResult.runResult.noOp,
-        publicationStatus: runResult.runResult.publicationStatus
-      });
-      startReceipt.queueDrainedAt = (/* @__PURE__ */ new Date()).toISOString();
-      startReceipt.queueProcessedCount = processedResults.length;
+        resumeIssueNumber = void 0;
+      } else {
+        const runResult = await runClaimedPrdIssueCommand({
+          targetName,
+          config: options.config,
+          issueProvider,
+          prProvider,
+          executionProvider,
+          force: false,
+          logger,
+          repoRoot: options.repoRoot,
+          issue: fetchedIssue,
+          queueRunContext: {
+            prdRef,
+            prdBranch: startReceipt.prdBranch,
+            ...resumeBeadsContext ? { beadsChild: resumeBeadsContext } : {}
+          }
+        });
+        processedResults.push({
+          beadsChildId: resumeIssue?.beadsChildId ?? "resumed",
+          issueNumber: runResult.selected.number,
+          noOp: runResult.runResult.noOp,
+          publicationStatus: runResult.runResult.publicationStatus
+        });
+        startReceipt.queueDrainedAt = (/* @__PURE__ */ new Date()).toISOString();
+        startReceipt.queueProcessedCount = processedResults.length;
+      }
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
       const repair = buildQueueIssueRunRepairMetadata(
@@ -14528,143 +14600,160 @@ async function launchBeadsQueueDrain(options, prdRef, startReceipt, targetName,
     }
   }
   let beadsClaimAttempted = false;
-  while (true) {
-    const claimResult = await claimReadyPrdChild({
-      repoRoot: options.repoRoot,
-      prdRef,
-      logger
-    });
-    if (!claimResult.ok) {
-      if (claimResult.reason === "no-ready-child") {
-        logCoordinatorStep(
-          logger,
-          "info",
-          `Beads-backed PRD queue drain for ${prdRef} found no additional ready child work.`
-        );
-        break;
-      }
-      return buildLaunchBlockedOutcome(
-        options.repoRoot,
-        prdRef,
-        buildPrdRunRepairGuidance({
-          blockedGate: "queue",
-          blockedStage: "queue-drain",
-          failureCode: "beads-claim-failed",
-          humanReadableReason: `Beads claim failed for PRD ${prdRef} epic ${claimResult.epicId}.`,
-          repairability: "operator-action",
-          nextAction: "inspect-and-retry",
-          nextRecommendedCommand: `pourkit prd-run status ${prdRef}`,
-          diagnostics: [`Beads claim error for epic ${claimResult.epicId}.`]
-        }),
-        plan,
-        startOutcome,
-        targetName,
-        startReceipt
-      );
-    }
-    beadsClaimAttempted = true;
-    logCoordinatorStep(
-      logger,
-      "info",
-      `Claimed Beads child ${claimResult.child.id} for ${prdRef}; mapping to GitHub Issue context.`
-    );
-    const contextResult = await buildIssueContextFromBeadsChild({
-      child: claimResult.child,
-      issueProvider,
-      expectedPrdRef: prdRef
-    });
-    if (!contextResult.ok) {
-      return buildLaunchBlockedOutcome(
-        options.repoRoot,
-        prdRef,
-        buildPrdRunRepairGuidance({
-          blockedGate: "queue",
-          blockedStage: "queue-drain",
-          failureCode: "beads-context-mapping-failed",
-          humanReadableReason: `Failed to map Beads child ${claimResult.child.id} to Issue context: ${contextResult.reason}`,
-          repairability: "operator-action",
-          nextAction: "inspect-and-retry",
-          nextRecommendedCommand: `pourkit prd-run status ${prdRef}`,
-          diagnostics: [contextResult.reason],
-          issue: claimedBeadsChildRepairIssue(claimResult.child)
-        }),
-        plan,
-        startOutcome,
-        targetName,
-        startReceipt
-      );
-    }
-    try {
-      const issue = await reconcileBlockedBeadsIssueProjection({
-        issue: contextResult.issue,
-        issueProvider,
-        config: options.config,
+  try {
+    while (true) {
+      const claimResult = await claimReadyPrdChild({
+        repoRoot: options.repoRoot,
         prdRef,
         logger
       });
+      if (!claimResult.ok) {
+        if (claimResult.reason === "no-ready-child") {
+          logCoordinatorStep(
+            logger,
+            "info",
+            `Beads-backed PRD queue drain for ${prdRef} found no additional ready child work.`
+          );
+          break;
+        }
+        return buildLaunchBlockedOutcome(
+          options.repoRoot,
+          prdRef,
+          buildPrdRunRepairGuidance({
+            blockedGate: "queue",
+            blockedStage: "queue-drain",
+            failureCode: "beads-claim-failed",
+            humanReadableReason: `Beads claim failed for PRD ${prdRef} epic ${claimResult.epicId}.`,
+            repairability: "operator-action",
+            nextAction: "inspect-and-retry",
+            nextRecommendedCommand: `pourkit prd-run status ${prdRef}`,
+            diagnostics: [`Beads claim error for epic ${claimResult.epicId}.`]
+          }),
+          plan,
+          startOutcome,
+          targetName,
+          startReceipt
+        );
+      }
       logCoordinatorStep(
         logger,
         "info",
-        `Running GitHub Issue #${issue.number} from Beads child ${contextResult.beads.childId}.`
+        `Claimed Beads child ${claimResult.child.id} for ${prdRef}; mapping to GitHub Issue context.`
       );
-      const runResult = await runClaimedPrdIssueCommand({
-        targetName,
-        config: options.config,
+      const contextResult = await buildIssueContextFromBeadsChild({
+        child: claimResult.child,
         issueProvider,
-        prProvider,
-        executionProvider,
-        force: false,
-        logger,
-        repoRoot: options.repoRoot,
-        issue,
-        queueRunContext: {
+        expectedPrdRef: prdRef
+      });
+      if (!contextResult.ok) {
+        return buildLaunchBlockedOutcome(
+          options.repoRoot,
           prdRef,
-          prdBranch: startReceipt.prdBranch,
-          beadsChild: contextResult.beads
+          buildPrdRunRepairGuidance({
+            blockedGate: "queue",
+            blockedStage: "queue-drain",
+            failureCode: "beads-context-mapping-failed",
+            humanReadableReason: `Failed to map Beads child ${claimResult.child.id} to Issue context: ${contextResult.reason}`,
+            repairability: "operator-action",
+            nextAction: "inspect-and-retry",
+            nextRecommendedCommand: `pourkit prd-run status ${prdRef}`,
+            diagnostics: [contextResult.reason],
+            issue: claimedBeadsChildRepairIssue(claimResult.child)
+          }),
+          plan,
+          startOutcome,
+          targetName,
+          startReceipt
+        );
+      }
+      try {
+        const issue = await reconcileBlockedBeadsIssueProjection({
+          issue: contextResult.issue,
+          issueProvider,
+          config: options.config,
+          prdRef,
+          logger
+        });
+        if (issue.labels.includes(options.config.labels.blocked)) {
+          logCoordinatorStep(
+            logger,
+            "info",
+            `Skipping Beads child ${contextResult.beads.childId} because GitHub Issue #${issue.number} remains labeled ${options.config.labels.blocked}.`
+          );
+          skippedBlockedBeadsChildren.push(claimResult.child);
+          continue;
         }
-      });
-      processedResults.push({
-        beadsChildId: claimResult.child.id,
-        issueNumber: runResult.selected.number,
-        noOp: runResult.runResult.noOp,
-        publicationStatus: runResult.runResult.publicationStatus
-      });
-    } catch (error) {
-      const msg = error instanceof Error ? error.message : String(error);
-      const repair = buildQueueIssueRunRepairMetadata(
-        msg,
-        "beads-issue-run-failed",
-        prdRef
-      );
-      const beadsChildClosed = msg.startsWith(
-        "Projection failure after Beads close"
-      );
-      return buildLaunchBlockedOutcome(
-        options.repoRoot,
-        prdRef,
-        buildPrdRunRepairGuidance({
-          blockedGate: "queue",
-          blockedStage: "queue-drain",
-          failureCode: repair.failureCode,
-          humanReadableReason: msg,
-          repairability: repair.repairability,
-          nextAction: repair.nextAction,
-          nextRecommendedCommand: repair.nextRecommendedCommand,
-          diagnostics: [msg],
-          issue: {
-            number: contextResult.issue.number,
-            title: contextResult.issue.title,
-            beadsChildId: contextResult.beads.childId,
-            beadsChildRef: contextResult.beads.childRef,
-            beadsChildClosed
+        beadsClaimAttempted = true;
+        logCoordinatorStep(
+          logger,
+          "info",
+          `Running GitHub Issue #${issue.number} from Beads child ${contextResult.beads.childId}.`
+        );
+        const runResult = await runClaimedPrdIssueCommand({
+          targetName,
+          config: options.config,
+          issueProvider,
+          prProvider,
+          executionProvider,
+          force: false,
+          logger,
+          repoRoot: options.repoRoot,
+          issue,
+          queueRunContext: {
+            prdRef,
+            prdBranch: startReceipt.prdBranch,
+            beadsChild: contextResult.beads
           }
-        }),
-        plan,
-        startOutcome,
-        targetName,
-        startReceipt
-      );
+        });
+        processedResults.push({
+          beadsChildId: claimResult.child.id,
+          issueNumber: runResult.selected.number,
+          noOp: runResult.runResult.noOp,
+          publicationStatus: runResult.runResult.publicationStatus
+        });
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        const repair = buildQueueIssueRunRepairMetadata(
+          msg,
+          "beads-issue-run-failed",
+          prdRef
+        );
+        const beadsChildClosed = msg.startsWith(
+          "Projection failure after Beads close"
+        );
+        return buildLaunchBlockedOutcome(
+          options.repoRoot,
+          prdRef,
+          buildPrdRunRepairGuidance({
+            blockedGate: "queue",
+            blockedStage: "queue-drain",
+            failureCode: repair.failureCode,
+            humanReadableReason: msg,
+            repairability: repair.repairability,
+            nextAction: repair.nextAction,
+            nextRecommendedCommand: repair.nextRecommendedCommand,
+            diagnostics: [msg],
+            issue: {
+              number: contextResult.issue.number,
+              title: contextResult.issue.title,
+              beadsChildId: contextResult.beads.childId,
+              beadsChildRef: contextResult.beads.childRef,
+              beadsChildClosed
+            }
+          }),
+          plan,
+          startOutcome,
+          targetName,
+          startReceipt
+        );
+      }
     }
+  } finally {
+    await releaseSkippedBlockedBeadsChildren({
+      repoRoot: options.repoRoot,
+      children: skippedBlockedBeadsChildren,
+      logger
+    });
   }
   if (processedResults.length === 0 && !beadsClaimAttempted) {
     const diagnostics = [
@@ -21450,11 +21539,11 @@ function createCliProgram(version) {
   return program;
 }
 async function resolveCliVersion() {
-  if (isPackageVersion("0.0.0-next-20260714055657")) {
-    return "0.0.0-next-20260714055657";
+  if (isPackageVersion("0.0.0-next-20260714073403")) {
+    return "0.0.0-next-20260714073403";
   }
-  if (isReleaseVersion("0.0.0-next-20260714055657")) {
-    return "0.0.0-next-20260714055657";
+  if (isReleaseVersion("0.0.0-next-20260714073403")) {
+    return "0.0.0-next-20260714073403";
   }
   try {
     const root = repoRoot();