@nk070281sjv/cli 2.3.26 → 2.3.30

package/dist/index.js

@@ -30775,7 +30775,7 @@ ${hint}
 }
 
 // src/lib/version.ts
-var CLI_VERSION = true ? "2.3.26" : createRequire(import.meta.url)("../../package.json").version;
+var CLI_VERSION = true ? "2.3.30" : createRequire(import.meta.url)("../../package.json").version;
 
 // src/lib/deps.ts
 init_src();
@@ -35280,6 +35280,7 @@ function validateReviewer(value, path2, errors) {
   stringValue(obj.model, `${path2}.model`, errors);
   stringValue(obj.promptPath, `${path2}.promptPath`, errors);
   stringValue(obj.reviewPath, `${path2}.reviewPath`, errors);
+  stringValue(obj.promptId, `${path2}.promptId`, errors);
 }
 function validatePipelineArtifactRef(value, path2, errors) {
   const obj = object(value, path2, errors);
@@ -37417,6 +37418,7 @@ function extractVendorSessionId(events) {
 
 // src/lib/agent-orchestrator/review-orchestrator.ts
 import { existsSync as existsSync22, statSync as statSync5, readFileSync as readFileSync16 } from "node:fs";
+import { createHash as createHash2 } from "node:crypto";
 import { join as join27 } from "node:path";
 
 // src/lib/agent-orchestrator/artifact-writer.ts
@@ -37957,6 +37959,7 @@ function isRecord(value) {
 
 // src/lib/agent-orchestrator/prompt-writer.ts
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "node:fs/promises";
+import { createHash } from "node:crypto";
 import { dirname as dirname11, join as join26, relative as relative3 } from "node:path";
 async function writePromptSnapshots(input) {
   const promptsDir = join26(input.context.roundDir, "prompts");
@@ -37973,9 +37976,10 @@ async function writePromptSnapshots(input) {
     }
     const promptPath = `prompts/${reviewer.persona}-${reviewer.instance_index}.md`;
     const reviewPath = `reviews/${reviewer.persona}-${reviewer.instance_index}.md`;
+    const promptId = reviewerPromptId(input.context, reviewer, promptPath);
     await writeFile3(
       join26(input.context.roundDir, promptPath),
-      await reviewerPrompt(input.context, reviewer, promptPath, reviewPath, sharedReviewerPrefix),
+      await reviewerPrompt(input.context, reviewer, promptPath, reviewPath, sharedReviewerPrefix, promptId),
       "utf-8"
     );
     reviewers.push({
@@ -37983,7 +37987,8 @@ async function writePromptSnapshots(input) {
       instance: reviewer.instance_index,
       model: reviewer.model,
       promptPath,
-      reviewPath
+      reviewPath,
+      promptId
     });
   }
   const pipeline = {
@@ -38017,7 +38022,7 @@ async function writePipelinePrompt(input, stage, artifactPath) {
     artifactPath
   };
 }
-async function reviewerPrompt(context, reviewer, promptPath, reviewPath, sharedPrefix) {
+async function reviewerPrompt(context, reviewer, promptPath, reviewPath, sharedPrefix, promptId) {
   const personaPath = reviewerPersonaPath(context, reviewer);
   const personaContent = await readTextFile(personaPath);
   return [
@@ -38027,6 +38032,7 @@ async function reviewerPrompt(context, reviewer, promptPath, reviewPath, sharedP
     `Reviewer id: ${reviewer.persona}-${reviewer.instance_index}`,
     `Agent identity: ${reviewer.name}`,
     `Model alias and resolved model: ${reviewer.model}`,
+    `OCR prompt id: ${promptId}`,
     "",
     "## Reviewer Persona",
     "",
@@ -38041,8 +38047,9 @@ async function reviewerPrompt(context, reviewer, promptPath, reviewPath, sharedP
     "- Persona focus areas are for detecting issues only; this output contract overrides any persona request to propose fixes or broad guidance.",
     "",
     "Output contract:",
-    `- Return review markdown through stdout for ${reviewPath}.`,
-    "- Return only one fenced ```ocr-json block and no prose outside it.",
+    `- Return the review artifact through stdout for ${reviewPath}.`,
+    "- Return exactly one fenced ```ocr-json block and no prose outside it.",
+    `- The ocr-json block must include top-level "prompt_id": "${promptId}".`,
     "- Include maximum 5 findings, sorted by severity and production impact.",
     "- No introductions, no progress narration, no endpoint tables, no code snippets, no broad summaries.",
     "- Include critical, high, and medium findings. Include low only when it has concrete runtime/user impact. Exclude info/style/theoretical-only items.",
@@ -38052,10 +38059,11 @@ async function reviewerPrompt(context, reviewer, promptPath, reviewPath, sharedP
     "- Do not claim skipped agents ran.",
     "",
     "Required ocr-json schema:",
-    "- Output exactly this compact JSON shape inside the fenced block:",
+    "- Output exactly this compact JSON shape inside a fenced ```ocr-json block:",
     "",
-    "```json",
+    "```ocr-json",
     "{",
+    `  "prompt_id": "${promptId}",`,
     '  "findings": [',
     "    {",
     '      "sev": "high",',
@@ -38081,6 +38089,18 @@ async function reviewerPrompt(context, reviewer, promptPath, reviewPath, sharedP
     ""
   ].join("\n");
 }
+function reviewerPromptId(context, reviewer, promptPath) {
+  const input = [
+    context.sessionId,
+    String(context.round),
+    reviewer.persona,
+    String(reviewer.instance_index),
+    reviewer.name,
+    reviewer.model,
+    promptPath
+  ].join("\n");
+  return `ocr-prompt:${createHash("sha256").update(input).digest("hex").slice(0, 24)}`;
+}
 async function reviewerSharedPrefix(context) {
   const sections = [
     "# OCR Reviewer Shared Context",
@@ -38184,7 +38204,7 @@ function pipelinePrompt(context, stage, agent, promptPath, artifactPath) {
       "- Do not translate JSON field names, enum values, file paths, code identifiers, stack traces, commands, or model names.",
       "- Do not add new findings, remove findings, change severity/category/verdict, or change counts."
     ] : stage === "aggregation" ? [
-      "- Return only one fenced ```ocr-json block and no prose outside it.",
+      "- Return exactly one fenced ```ocr-json block and no prose outside it.",
       "- Keep the output compact: at most 8 findings and at most 12 dropped entries.",
       "- Do not include code snippets, long quotes, markdown tables, or reviewer narrative.",
       "- Read the original reviewer files, but aggregate only their structured findings and concrete evidence."
@@ -38219,7 +38239,7 @@ function schemaHint(stage) {
       "  - Keep low only when duplicated by 2+ reviewers or when it has concrete production/runtime impact.",
       "  - Drop info, style, theoretical-only, and future-extensibility-only items.",
       "",
-      "```json",
+      "```ocr-json",
       "{",
       '  "findings": [',
       "    {",
@@ -38261,7 +38281,7 @@ function schemaHint(stage) {
       "- Verify claims against the actual code before confirming. Do not trust reviewer text without code evidence.",
       "- Put every aggregation finding into exactly one of `confirmed`, `downgraded`, or `rejected`.",
       "",
-      "```json",
+      "```ocr-json",
       "{",
       '  "confirmed": [',
       "    {",
@@ -38303,7 +38323,7 @@ function schemaHint(stage) {
     "- Write developer-facing findings from validation results, not from unvalidated reviewer claims.",
     "- Include only confirmed and downgraded issues that a developer can act on.",
     "",
-    "```json",
+    "```ocr-json",
     "{",
     '  "verdict": "REQUEST CHANGES",',
     '  "synthesis_counts": {',
@@ -38432,7 +38452,48 @@ async function runReviewerPhase(input) {
   } finally {
     clearInterval(progressTimer);
   }
-  const failed = results.find((result) => result.exitCode !== 0);
+  const byId = new Map(input.resolvedTeam.reviewers.map((reviewer) => [
+    `${reviewer.type}-${reviewer.instance}`,
+    reviewer
+  ]));
+  const sortedResults = sortResults(results, requests);
+  const reviewerArtifacts = /* @__PURE__ */ new Map();
+  const artifactStatuses = [];
+  let failed = sortedResults.find((result) => result.exitCode !== 0);
+  let validationFailure;
+  for (const result of sortedResults) {
+    const reviewer = byId.get(result.id);
+    if (!reviewer) continue;
+    if (result.exitCode !== 0) {
+      artifactStatuses.push({
+        id: result.id,
+        exit_code: result.exitCode,
+        artifact_written: false
+      });
+      continue;
+    }
+    const validated = normalizeReviewerArtifact(processOutput(result), reviewer.promptId);
+    if (!validated.ok) {
+      validationFailure ??= { result, errors: validated.errors };
+      artifactStatuses.push({
+        id: result.id,
+        exit_code: 1,
+        artifact_written: false,
+        validation_errors: validated.errors
+      });
+      continue;
+    }
+    reviewerArtifacts.set(reviewer.reviewPath, validated.artifact);
+    artifactStatuses.push({
+      id: result.id,
+      exit_code: result.exitCode,
+      artifact_written: true,
+      artifact_path: join27(input.context.roundDir, reviewer.reviewPath)
+    });
+  }
+  for (const [reviewPath, artifact] of reviewerArtifacts) {
+    await writeRoundArtifact(input.context.roundDir, reviewPath, artifact);
+  }
   if (failed) {
     const failedRequest = requests.find((request) => request.id === failed.id);
     const diagnostic = buildFailureDiagnostic(failed, failedRequest);
@@ -38451,9 +38512,11 @@ async function runReviewerPhase(input) {
           diagnostic,
           stderr: failed.stderr,
           stdout_excerpt: excerpt(failed.stdout),
-          results: sortResults(results, requests).map((result) => ({
-            id: result.id,
-            exit_code: result.exitCode
+          artifact_statuses: artifactStatuses,
+          results: artifactStatuses.map((status) => ({
+            id: status.id,
+            exit_code: status.exit_code,
+            artifact_written: status.artifact_written
           }))
         },
         null,
@@ -38474,71 +38537,54 @@ async function runReviewerPhase(input) {
         ...diagnostic.stderr_excerpt ? [`stderr: ${diagnostic.stderr_excerpt}`] : [],
         ...diagnostic.stdout_excerpt ? [`stdout: ${diagnostic.stdout_excerpt}`] : []
       ],
-      results: sortResults(results, requests)
+      results: sortedResults
     };
   }
-  const byId = new Map(input.resolvedTeam.reviewers.map((reviewer) => [
-    `${reviewer.type}-${reviewer.instance}`,
-    reviewer
-  ]));
-  const reviewerArtifacts = /* @__PURE__ */ new Map();
-  for (const result of sortResults(results, requests)) {
-    const reviewer = byId.get(result.id);
-    if (!reviewer) continue;
-    const validated = normalizeReviewerArtifact(processOutput(result));
-    if (!validated.ok) {
-      const failedResult = { ...result, exitCode: 1 };
-      await writeRoundArtifact(
-        input.context.roundDir,
-        "failure-summary.json",
-        JSON.stringify(
-          {
-            schema_version: 1,
-            phase: "reviews",
-            failed_id: result.id,
-            exit_code: 1,
-            model: requests.find((request) => request.id === result.id)?.model,
-            prompt_path: requests.find((request) => request.id === result.id)?.promptPath,
-            cwd: requests.find((request) => request.id === result.id)?.cwd,
-            diagnostic: {
-              summary: "Reviewer output did not contain a valid compact ocr-json artifact. OCR refused to pass prose, plan-mode text, or malformed JSON into aggregation.",
-              hint: "Inspect the saved reviewer prompt and process log. The reviewer must return exactly one fenced ```ocr-json block with structured findings.",
-              stdout_excerpt: excerpt(processOutput(result))
-            },
-            stderr: result.stderr,
-            stdout_excerpt: excerpt(result.stdout),
-            validation_errors: validated.errors,
-            results: sortResults(
-              results.map((item) => item.id === result.id ? failedResult : item),
-              requests
-            ).map((item) => ({
-              id: item.id,
-              exit_code: item.exitCode
-            }))
+  if (validationFailure) {
+    const failedResult = { ...validationFailure.result, exitCode: 1 };
+    const failureResults = sortedResults.map((item) => item.id === failedResult.id ? failedResult : item);
+    await writeRoundArtifact(
+      input.context.roundDir,
+      "failure-summary.json",
+      JSON.stringify(
+        {
+          schema_version: 1,
+          phase: "reviews",
+          failed_id: validationFailure.result.id,
+          exit_code: 1,
+          model: requests.find((request) => request.id === validationFailure.result.id)?.model,
+          prompt_path: requests.find((request) => request.id === validationFailure.result.id)?.promptPath,
+          cwd: requests.find((request) => request.id === validationFailure.result.id)?.cwd,
+          diagnostic: {
+            summary: "Reviewer output did not contain a valid compact ocr-json artifact. OCR refused to pass prose, plan-mode text, or malformed JSON into aggregation.",
+            hint: "Inspect the saved reviewer prompt and process log. The reviewer must return exactly one fenced ```ocr-json block with structured findings.",
+            stdout_excerpt: excerpt(processOutput(validationFailure.result))
           },
-          null,
-          2
-        )
-      );
-      return {
-        ok: false,
-        failedId: result.id,
-        errors: [
-          `Reviewer ${result.id} produced invalid ocr-json output.`,
-          ...validated.errors
-        ],
-        results: sortResults(
-          results.map((item) => item.id === result.id ? failedResult : item),
-          requests
-        )
-      };
-    }
-    reviewerArtifacts.set(reviewer.reviewPath, validated.artifact);
-  }
-  for (const [reviewPath, artifact] of reviewerArtifacts) {
-    await writeRoundArtifact(input.context.roundDir, reviewPath, artifact);
+          stderr: validationFailure.result.stderr,
+          stdout_excerpt: excerpt(validationFailure.result.stdout),
+          validation_errors: validationFailure.errors,
+          artifact_statuses: artifactStatuses,
+          results: artifactStatuses.map((status) => ({
+            id: status.id,
+            exit_code: status.exit_code,
+            artifact_written: status.artifact_written
+          }))
+        },
+        null,
+        2
+      )
+    );
+    return {
+      ok: false,
+      failedId: validationFailure.result.id,
+      errors: [
+        `Reviewer ${validationFailure.result.id} produced invalid ocr-json output.`,
+        ...validationFailure.errors
+      ],
+      results: failureResults
+    };
   }
-  return { ok: true, results: sortResults(results, requests) };
+  return { ok: true, results: sortedResults };
 }
 async function runOpenCodeProcessAgentReview(input) {
   const runner = input.runner ?? new OpenCodeProcessRunner();
@@ -38939,6 +38985,7 @@ function isNonEmptyFile(path2) {
 }
 async function writeProcessStartLog(roundDir, request) {
   const metaPath = `process-logs/${request.id}.meta.json`;
+  const promptMeta = readPromptMeta(request.promptPath);
   await writeRoundArtifact(
     roundDir,
     metaPath,
@@ -38949,6 +38996,7 @@ async function writeProcessStartLog(roundDir, request) {
         phase: request.phase,
         model: request.model,
         prompt_path: request.promptPath,
+        ...promptMeta,
         status: "running",
         started_at: (/* @__PURE__ */ new Date()).toISOString()
       },
@@ -38966,6 +39014,7 @@ async function writeProcessLogs(roundDir, request, result) {
   const absoluteMetaPath = join27(roundDir, metaPath);
   const startedAt = readStartedAt(absoluteMetaPath) ?? (/* @__PURE__ */ new Date()).toISOString();
   const completedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const promptMeta = readPromptMeta(request.promptPath);
   await writeRoundArtifact(roundDir, stdoutPath, result.stdout);
   await writeRoundArtifact(roundDir, stderrPath, result.stderr);
   await writeRoundArtifact(
@@ -38978,6 +39027,7 @@ async function writeProcessLogs(roundDir, request, result) {
         phase: request.phase,
         model: request.model,
         prompt_path: request.promptPath,
+        ...promptMeta,
         status: result.exitCode === 0 ? "completed" : "failed",
         started_at: startedAt,
         completed_at: completedAt,
@@ -38994,6 +39044,16 @@ async function writeProcessLogs(roundDir, request, result) {
   );
   return { stdout: stdoutPath, stderr: stderrPath, meta: metaPath };
 }
+function readPromptMeta(promptPath) {
+  if (!existsSync22(promptPath)) return {};
+  const prompt = readFileSync16(promptPath, "utf-8");
+  const bytes = Buffer.byteLength(prompt, "utf-8");
+  return {
+    prompt_sha256: createHash2("sha256").update(prompt).digest("hex"),
+    prompt_bytes: bytes,
+    prompt_delivery: prompt.length <= DEFAULT_PROMPT_ARGV_LIMIT ? "inline" : "file"
+  };
+}
 function readStartedAt(path2) {
   if (!existsSync22(path2)) return void 0;
   try {
@@ -39007,21 +39067,24 @@ function readStartedAt(path2) {
 function processOutput(result) {
   return result.outputText ?? result.stdout;
 }
-function normalizeReviewerArtifact(markdown) {
+function normalizeReviewerArtifact(markdown, expectedPromptId) {
   const extracted = extractOcrJsonBlock(markdown);
   if (!extracted.ok) return extracted;
-  const validationErrors = validateReviewerJson(extracted.value);
+  const validationErrors = validateReviewerJson(extracted.value, expectedPromptId);
   if (validationErrors.length > 0) return { ok: false, errors: validationErrors };
   const fence = extractOcrJsonFence(markdown);
   if (!fence) return { ok: false, errors: ["Expected exactly one fenced ```ocr-json block."] };
   return { ok: true, artifact: `${fence}
 ` };
 }
-function validateReviewerJson(value) {
+function validateReviewerJson(value, expectedPromptId) {
   const errors = [];
   if (!isRecord2(value)) {
     return ["Reviewer ocr-json must be an object."];
   }
+  if (value.prompt_id !== expectedPromptId) {
+    errors.push(`Reviewer ocr-json prompt_id must equal ${expectedPromptId}.`);
+  }
   if (!Array.isArray(value.findings)) {
     errors.push("Reviewer ocr-json findings must be an array.");
     return errors;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nk070281sjv/cli",
-  "version": "2.3.26",
+  "version": "2.3.30",
   "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.26",
+    "@nk070281sjv/agents": "2.3.30",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "commander": "^13.0.0",