@pourkit/cli 0.0.0-next-20260613201753 → 0.0.0-next-20260614002607

package/dist/cli.js

@@ -425,8 +425,7 @@ var ReviewRefactorLoopStrategySchema = z.object({
   prdRun: z.object({
     mode: PrdRunModeSchema.optional(),
     // Uses promptTemplate (canonical StageAgentConfig field), not prompt as Issue contract may suggest
-    finalReview: StageAgentConfigSchema,
-    reconciliation: StageAgentConfigSchema.optional()
+    finalReview: StageAgentConfigSchema
   }).strict().optional()
 }).strict();
 var TargetSerenaConfigSchema = z.object({
@@ -661,6 +660,11 @@ function parseConfig(raw) {
         `targets[${i}].strategy.conflictResolution has been removed; use targets[${i}].strategy.failureResolution`
       );
     }
+    if (strategy && typeof strategy === "object" && strategy.prdRun && typeof strategy.prdRun === "object" && "reconciliation" in strategy.prdRun) {
+      throw new Error(
+        `targets[${i}].strategy.prdRun.reconciliation has been removed; PRD Run no longer invokes Architect reconciliation.`
+      );
+    }
   }
   if (config.sandbox && typeof config.sandbox === "object") {
     assertKnownKeys(config.sandbox, "sandbox", [
@@ -719,8 +723,7 @@ function parseConfig(raw) {
         ...t.strategy.prdRun ? {
           prdRun: {
             ...t.strategy.prdRun.mode ? { mode: t.strategy.prdRun.mode } : {},
-            finalReview: t.strategy.prdRun.finalReview,
-            ...t.strategy.prdRun.reconciliation ? { reconciliation: t.strategy.prdRun.reconciliation } : {}
+            finalReview: t.strategy.prdRun.finalReview
           }
         } : {}
       }
@@ -3270,7 +3273,7 @@ function validateFinalReviewAgentOutputs(options) {
   return { ok: true, artifact, retouch };
 }
 function isRetouchScopePath(path9) {
-  if (path9.startsWith(".pourkit/architecture/") || path9 === ".pourkit/CONTEXT.md" || path9.startsWith(".pourkit/docs/adr/") || /^\.pourkit\/prd-runs\/[^/]+\.json$/.test(path9)) {
+  if (path9.startsWith(".pourkit/plans/") || path9 === ".pourkit/CONTEXT.md" || path9.startsWith(".pourkit/docs/") || /^\.pourkit\/prd-runs\/[^/]+\.json$/.test(path9)) {
     return false;
   }
   return true;
@@ -8012,6 +8015,7 @@ var PrdRunRecordSchema = z2.object({
     "starting",
     "running",
     "drained",
+    "completed_prd_branch",
     "waiting_for_integration",
     "finalizing",
     "final_reviewed",
@@ -8094,7 +8098,7 @@ function readPrdRun(repoRoot2, prdRef) {
   }
   try {
     const raw = JSON.parse(readFileSync15(recordPath, "utf-8"));
-    const parsed = PrdRunRecordSchema.parse(raw);
+    const parsed = normalizeLegacyPrdRunRecord(PrdRunRecordSchema.parse(raw));
     return { record: parsed, diagnostics: [] };
   } catch (error) {
     try {
@@ -8131,8 +8135,8 @@ function listPrdRuns(repoRoot2) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
     const recordPath = join16(stateDir, entry.name);
     try {
-      const record = PrdRunRecordSchema.parse(
-        JSON.parse(readFileSync15(recordPath, "utf-8"))
+      const record = normalizeLegacyPrdRunRecord(
+        PrdRunRecordSchema.parse(JSON.parse(readFileSync15(recordPath, "utf-8")))
       );
       records.push(record);
     } catch (error) {
@@ -8154,6 +8158,16 @@ function writePrdRunRecord(repoRoot2, record) {
     "utf-8"
   );
 }
+function normalizeLegacyPrdRunRecord(record) {
+  if (record.status !== "waiting_for_integration") return record;
+  return {
+    ...record,
+    status: "completed_prd_branch",
+    blockedGate: void 0,
+    blockedReason: void 0,
+    offendingPaths: void 0
+  };
+}
 var LocalPrdRunRecordSchema = z2.object({
   prdId: z2.string().regex(
     /^PRD-\d{4}$/,
@@ -8547,6 +8561,7 @@ async function runLocalIssue(prdId, issueId, builder, repoRoot2) {
 
 // prd-run/local-queue-loop.ts
 var CHILD_CLEANUP_LABELS = ["agent-in-progress", "pr-open-awaiting-merge"];
+var LOCAL_ISSUE_ID_REGEX = /^I-(\d+)$/i;
 function getIssueArtifactPath2(repoRoot2, prdId, issueId) {
   return join19(
     repoRoot2,
@@ -8575,6 +8590,16 @@ function writeIssueArtifact(repoRoot2, prdId, issue) {
     "utf-8"
   );
 }
+function compareLocalIssueIds(a, b) {
+  const aMatch = a.match(LOCAL_ISSUE_ID_REGEX);
+  const bMatch = b.match(LOCAL_ISSUE_ID_REGEX);
+  if (aMatch && bMatch) {
+    const aNumber = Number.parseInt(aMatch[1], 10);
+    const bNumber = Number.parseInt(bMatch[1], 10);
+    if (aNumber !== bNumber) return aNumber - bNumber;
+  }
+  return a.localeCompare(b);
+}
 async function reconcileLocalBlockedIssues(prdId, repoRoot2) {
   const root = repoRoot2 ?? process.cwd();
   const issuesResult = await resolveLocalIssueArtifacts(prdId, root);
@@ -8650,7 +8675,9 @@ async function runLocalQueueLoop(prdId, repoRoot2, issueProvider) {
       }
       break;
     }
-    const issue = runnable[0];
+    const issue = [...runnable].sort(
+      (a, b) => compareLocalIssueIds(a.id, b.id)
+    )[0];
     const runResult = await runLocalIssue(prdId, issue.id, void 0, root);
     if (!runResult.ok) {
       return {
@@ -8778,6 +8805,18 @@ var TYPE_PRIORITY = {
   "type:polish": 4,
   "type:refactor": 5
 };
+var CHILD_ISSUE_TITLE_REGEX = /\bI-(\d+)\b/i;
+var PRD_TITLE_REGEX = /\bPRD-(\d+)\b/i;
+function parseChildIssueOrder(value) {
+  const match = value.match(CHILD_ISSUE_TITLE_REGEX);
+  if (!match) return null;
+  return Number.parseInt(match[1], 10);
+}
+function parsePrdOrder(value) {
+  const match = value.match(PRD_TITLE_REGEX);
+  if (!match) return null;
+  return Number.parseInt(match[1], 10);
+}
 function selectIssue(candidates, options = {}) {
   const blockedLabel = options.blockedLabel ?? "blocked";
   const agentInProgressLabel = options.agentInProgressLabel ?? "agent-in-progress";
@@ -8817,6 +8856,13 @@ function selectIssue(candidates, options = {}) {
     };
   }
   valid2.sort((a, b) => {
+    const aChildOrder = parseChildIssueOrder(a.issue.title);
+    const bChildOrder = parseChildIssueOrder(b.issue.title);
+    const aPrdOrder = parsePrdOrder(a.issue.title);
+    const bPrdOrder = parsePrdOrder(b.issue.title);
+    if (aChildOrder !== null && bChildOrder !== null && aPrdOrder !== null && aPrdOrder === bPrdOrder) {
+      if (aChildOrder !== bChildOrder) return aChildOrder - bChildOrder;
+    }
     if (a.priority !== b.priority) return a.priority - b.priority;
     const ageCmp = a.issue.createdAt.localeCompare(b.issue.createdAt);
     if (ageCmp !== 0) return ageCmp;
@@ -9210,7 +9256,7 @@ function planLaunchResume(record) {
   return pipe(
     record,
     Match.value,
-    Match.when({ status: "waiting_for_integration" }, () => ({
+    Match.when({ status: "completed_prd_branch" }, () => ({
       attempted: [],
       skipped: ["start", "queue"],
       resumed: []
@@ -9377,7 +9423,7 @@ async function runPrdRunLaunchCommand(options) {
       offendingPaths: []
     };
   }
-  if (existingRecord.record?.status === "waiting_for_integration" || existingRecord.record?.status === "complete" || existingRecord.record?.status === "completed_local_branch") {
+  if (existingRecord.record?.status === "completed_prd_branch" || existingRecord.record?.status === "complete" || existingRecord.record?.status === "completed_local_branch") {
     return {
       prdRef,
       status: existingRecord.record.status,
@@ -9385,7 +9431,12 @@ async function runPrdRunLaunchCommand(options) {
       skipped,
       resumed,
       diagnostics: [
-        `PRD Run ${prdRef} is already in status "${existingRecord.record.status}".`
+        `PRD Run ${prdRef} is already in status "${existingRecord.record.status}".`,
+        ...existingRecord.record.status === "completed_prd_branch" ? [
+          buildCompletedPrdBranchHint(
+            existingRecord.record.prdBranch ?? prdRef
+          )
+        ] : []
       ],
       prdBranch: existingRecord.record.prdBranch
     };
@@ -9467,7 +9518,7 @@ async function runPrdRunLaunchCommand(options) {
   }
   writePrdRunRecord(options.repoRoot, {
     prdRef,
-    status: "waiting_for_integration",
+    status: "completed_prd_branch",
     updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     targetName: currentRecord?.targetName ?? options.targetName,
     prdBranch: currentRecord?.prdBranch,
@@ -9476,14 +9527,15 @@ async function runPrdRunLaunchCommand(options) {
   });
   return {
     prdRef,
-    status: "waiting_for_integration",
+    status: "completed_prd_branch",
     attempted,
     skipped,
     resumed,
     diagnostics: [
-      `Integration Gate is not implemented. PRD Run is waiting for manual integration back to ${currentRecord?.start?.startBaseBranch ?? "(missing startBaseBranch)"}.`
+      buildCompletedPrdBranchHint(currentRecord?.prdBranch ?? prdRef)
     ],
-    start: startResult
+    start: startResult,
+    prdBranch: currentRecord?.prdBranch ?? prdRef
   };
 }
 async function runPrdRunStartCommand(options) {
@@ -10383,7 +10435,14 @@ async function ensurePrdBranchPublished(repoRoot2, prdRef, startBaseCommit) {
 function runPrdRunStatusCommand(options) {
   const prdRef = normalizePrdRunRef(options.prdRef);
   const { record, diagnostics } = readPrdRun(options.repoRoot, prdRef);
-  return { prdRef, record, diagnostics };
+  return {
+    prdRef,
+    record,
+    diagnostics: record?.status === "completed_prd_branch" ? [
+      ...diagnostics,
+      buildCompletedPrdBranchHint(record.prdBranch ?? prdRef)
+    ] : diagnostics
+  };
 }
 function runPrdRunListCommand(options) {
   return listPrdRuns(options.repoRoot);
@@ -10412,6 +10471,9 @@ function coercePrdRunRecordBlockedGate(gate) {
       return "branch-state";
   }
 }
+function buildCompletedPrdBranchHint(prdBranch) {
+  return `PRD Run completed on branch ${prdBranch}. Next: checkout ${prdBranch} for human review, or use release promotion workflow when ready.`;
+}
 function buildBlockedDiagnostics(failure) {
   return failure.diagnostics ?? [
     failure.reason,
@@ -14481,11 +14543,11 @@ function createCliProgram(version) {
   return program;
 }
 async function resolveCliVersion() {
-  if (isPackageVersion("0.0.0-next-20260613201753")) {
-    return "0.0.0-next-20260613201753";
+  if (isPackageVersion("0.0.0-next-20260614002607")) {
+    return "0.0.0-next-20260614002607";
   }
-  if (isReleaseVersion("0.0.0-next-20260613201753")) {
-    return "0.0.0-next-20260613201753";
+  if (isReleaseVersion("0.0.0-next-20260614002607")) {
+    return "0.0.0-next-20260614002607";
   }
   try {
     const root = repoRoot();