@nk070281sjv/cli 2.3.8 → 2.3.11

package/dist/index.js

@@ -30779,7 +30779,7 @@ ${hint}
 }
 
 // src/lib/version.ts
-var CLI_VERSION = true ? "2.3.8" : createRequire(import.meta.url)("../../package.json").version;
+var CLI_VERSION = true ? "2.3.11" : createRequire(import.meta.url)("../../package.json").version;
 
 // src/lib/deps.ts
 init_src();
@@ -38025,12 +38025,121 @@ function pipelinePrompt(context, stage, agent, promptPath, artifactPath) {
 }
 function schemaHint(stage) {
   if (stage === "aggregation") {
-    return "- AggregationJson: findings[] and dropped[].";
+    return [
+      "AggregationJson:",
+      "- Output exactly this JSON shape inside one fenced ```ocr-json block.",
+      "- Do not rename fields. Do not use markdown tables inside the JSON block.",
+      "",
+      "```json",
+      "{",
+      '  "findings": [',
+      "    {",
+      '      "id": "agg-1",',
+      '      "title": "Short finding title",',
+      '      "source_findings": ["architect-1:finding-or-heading"],',
+      '      "signal": "keep",',
+      '      "severity": "high",',
+      '      "root_cause": "Why this issue exists.",',
+      '      "affected_behavior": "What user/system behavior is affected.",',
+      '      "fix_direction": "Concrete direction for the fix."',
+      "    }",
+      "  ],",
+      '  "dropped": [',
+      "    {",
+      '      "source_findings": ["performance-1:finding-or-heading"],',
+      '      "reason": "Why this reviewer finding is noise or duplicate."',
+      "    }",
+      "  ]",
+      "}",
+      "```",
+      "",
+      '- `signal` must be one of: "keep", "merge", "needs_validation", "likely_noise", "false_positive_candidate".',
+      '- `severity` must be one of: "critical", "high", "medium", "low", "info".',
+      "- `source_findings` must always be an array of non-empty strings, even for one source."
+    ].join("\n");
   }
   if (stage === "validation") {
-    return "- ValidationJson: confirmed[], downgraded[], rejected[].";
+    return [
+      "ValidationJson:",
+      "- Output exactly this JSON shape inside one fenced ```ocr-json block.",
+      "- Do not rename fields. Do not use markdown tables inside the JSON block.",
+      "",
+      "```json",
+      "{",
+      '  "confirmed": [',
+      "    {",
+      '      "finding_id": "agg-1",',
+      '      "checked_files": ["src/main/java/example/File.java"],',
+      '      "result": "confirmed",',
+      '      "final_category": "blocker",',
+      '      "reason": "Code evidence confirms the issue."',
+      "    }",
+      "  ],",
+      '  "downgraded": [',
+      "    {",
+      '      "finding_id": "agg-2",',
+      '      "checked_files": ["src/main/java/example/File.java"],',
+      '      "result": "downgraded",',
+      '      "final_category": "suggestion",',
+      '      "reason": "Issue is real but lower impact."',
+      "    }",
+      "  ],",
+      '  "rejected": [',
+      "    {",
+      '      "finding_id": "agg-3",',
+      '      "checked_files": ["src/main/java/example/File.java"],',
+      '      "result": "rejected",',
+      '      "reason": "Code evidence disproves the issue."',
+      "    }",
+      "  ]",
+      "}",
+      "```",
+      "",
+      '- `final_category` must be one of: "blocker", "should_fix", "suggestion", "style".',
+      "- `checked_files` must always be an array of non-empty strings."
+    ].join("\n");
   }
-  return "- SynthesisJson: verdict, synthesis_counts, findings[], reviewers[].";
+  return [
+    "SynthesisJson:",
+    "- Output exactly this JSON shape inside one fenced ```ocr-json block.",
+    "- Do not rename fields. Do not use markdown tables inside the JSON block.",
+    "",
+    "```json",
+    "{",
+    '  "verdict": "REQUEST CHANGES",',
+    '  "synthesis_counts": {',
+    '    "blockers": 1,',
+    '    "should_fix": 1,',
+    '    "suggestions": 0',
+    "  },",
+    '  "findings": [',
+    "    {",
+    '      "title": "Short final finding title",',
+    '      "category": "blocker",',
+    '      "severity": "high",',
+    '      "summary": "Developer-facing explanation.",',
+    '      "file_path": "src/main/java/example/File.java",',
+    '      "line_start": 42,',
+    '      "line_end": 45,',
+    '      "flagged_by": ["agg-1"],',
+    '      "validation_source": "confirmed"',
+    "    }",
+    "  ],",
+    '  "reviewers": [',
+    "    {",
+    '      "type": "architect",',
+    '      "instance": 1,',
+    '      "findings": ["architect-1:finding-or-heading"]',
+    "    }",
+    "  ]",
+    "}",
+    "```",
+    "",
+    '- `verdict` must be one of: "APPROVE", "REQUEST CHANGES", "NEEDS DISCUSSION".',
+    '- `category` must be one of: "blocker", "should_fix", "suggestion", "style".',
+    '- `severity` must be one of: "critical", "high", "medium", "low", "info".',
+    "- `synthesis_counts` must exactly match the categories in `findings`."
+  ].join("\n");
 }
 
 // src/lib/agent-orchestrator/review-orchestrator.ts
@@ -38646,7 +38755,9 @@ var runAgentsSubcommand = new Command("run-agents").description("Run OCR review
         console.log(`Progress: ocr review watch --session-id ${sessionId}`);
         console.log(`Status: ocr review status --session-id ${sessionId}`);
         console.log(`Artifacts: ${sessionDir}`);
-        return;
+        console.log("Monitoring background review until it finishes. If OpenCode stops waiting, the background review continues.");
+        const exitCode = await waitForDetachedRun(sessionDir, round);
+        process.exit(exitCode);
       }
       writeRunMeta(sessionDir, round, {
         status: "running",
@@ -38887,6 +38998,78 @@ function renderRunAgentsProgress(event) {
     console.error(source_default.green("OCR pipeline complete."));
   }
 }
+async function waitForDetachedRun(sessionDir, round) {
+  let lastLine2 = "";
+  let stderrOffset = 0;
+  while (true) {
+    const stderrLogPath = join28(
+      sessionDir,
+      "rounds",
+      `round-${round}`,
+      "process-logs",
+      "run-agents-worker.stderr.log"
+    );
+    const flushed = flushNewLogText(stderrLogPath, stderrOffset, process.stderr);
+    stderrOffset = flushed.offset;
+    const snapshot = readDetachedSnapshot(sessionDir, round);
+    const line = formatDetachedProgress(snapshot);
+    if (line !== lastLine2) {
+      console.log(line);
+      lastLine2 = line;
+    }
+    if (snapshot.status === "completed") {
+      console.log(source_default.green(`OCR review complete: ${join28(sessionDir, "rounds", `round-${round}`, "final.md")}`));
+      return 0;
+    }
+    if (snapshot.status === "failed") {
+      console.error(source_default.red("OCR review failed. Inspect worker stderr and failure-summary.json if present."));
+      return 1;
+    }
+    if (snapshot.pid && !snapshot.live && snapshot.status !== "completed") {
+      console.error(source_default.red("OCR background worker is not running and did not mark the review complete."));
+      return 1;
+    }
+    await new Promise((resolve4) => setTimeout(resolve4, 15e3));
+  }
+}
+function flushNewLogText(path2, offset, stream) {
+  if (!existsSync23(path2)) return { offset };
+  const text = readFileSync17(path2, "utf-8");
+  if (text.length <= offset) return { offset: text.length };
+  stream.write(text.slice(offset));
+  return { offset: text.length };
+}
+function readDetachedSnapshot(sessionDir, round) {
+  const roundDir = join28(sessionDir, "rounds", `round-${round}`);
+  const runMeta = readJson(join28(roundDir, "run-meta.json"));
+  const processLogsDir = join28(roundDir, "process-logs");
+  const metas = existsSync23(processLogsDir) ? readdirMetaFiles(processLogsDir).map((path2) => readJson(path2)).filter(isRecord3) : [];
+  const reviewers = metas.filter((meta) => meta.phase === "reviews");
+  const pid = typeof runMeta?.pid === "number" ? runMeta.pid : void 0;
+  return {
+    status: String(runMeta?.status ?? "unknown"),
+    pid,
+    live: pid ? isPidLive(pid) : void 0,
+    completedReviews: reviewers.filter((meta) => meta.status === "completed").length,
+    totalReviews: reviewers.length,
+    runningReviews: reviewers.filter((meta) => meta.status === "running").map((meta) => String(meta.id)).sort(),
+    pipeline: Object.fromEntries(
+      ["aggregation", "validation", "synthesis"].map((phase) => [
+        phase,
+        String(metas.find((meta) => meta.id === phase)?.status ?? "pending")
+      ])
+    )
+  };
+}
+function formatDetachedProgress(snapshot) {
+  const running = snapshot.runningReviews.length > 0 ? snapshot.runningReviews.join(", ") : "none";
+  return [
+    `OCR background status: ${snapshot.status}${snapshot.pid ? ` pid=${snapshot.pid} live=${snapshot.live ? "yes" : "no"}` : ""}`,
+    `reviews ${snapshot.completedReviews}/${snapshot.totalReviews || "?"} complete`,
+    `running: ${running}`,
+    `pipeline: aggregation=${snapshot.pipeline.aggregation}, validation=${snapshot.pipeline.validation}, synthesis=${snapshot.pipeline.synthesis}`
+  ].join(" | ");
+}
 var CONTROL_PROMPT = "Resume this OCR review: run `ocr state status --json` and act on `next_action`, continuing forward from `current_phase` without redoing completed phases.";
 var reviewCommand = new Command("review").description("Run or resume an OCR review").option("--resume <workflow-id>", "Resume a prior review by its workflow session id").action(async (options) => {
   if (!options.resume) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nk070281sjv/cli",
-  "version": "2.3.8",
+  "version": "2.3.11",
   "description": "CLI for Open Code Review - Multi-environment setup and progress tracking",
   "type": "module",
   "bin": {
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.2.0",
-    "@nk070281sjv/agents": "2.3.8",
+    "@nk070281sjv/agents": "2.3.11",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "commander": "^13.0.0",