@nk070281sjv/cli 2.3.30 → 2.3.31

package/dist/index.js

@@ -30775,7 +30775,7 @@ ${hint}
 }
 
 // src/lib/version.ts
-var CLI_VERSION = true ? "2.3.30" : createRequire(import.meta.url)("../../package.json").version;
+var CLI_VERSION = true ? "2.3.31" : createRequire(import.meta.url)("../../package.json").version;
 
 // src/lib/deps.ts
 init_src();
@@ -37994,7 +37994,7 @@ async function writePromptSnapshots(input) {
   const pipeline = {
     aggregation: await writePipelinePrompt(input, "aggregation", "aggregation.md"),
     validation: await writePipelinePrompt(input, "validation", "validation.md"),
-    synthesis: await writePipelinePrompt(input, "synthesis", "final.md"),
+    synthesis: await writePipelinePrompt(input, "synthesis", "synthesis.md"),
     translation_uk: await writePipelinePrompt(input, "translation_uk", "final.uk.md")
   };
   const resolvedTeam = {
@@ -38199,22 +38199,25 @@ function pipelinePrompt(context, stage, agent, promptPath, artifactPath) {
     "Output contract:",
     `- Return markdown through stdout for ${artifactPath}.`,
     ...stage === "translation_uk" ? [
-      "- Translate the complete final review to Ukrainian.",
-      "- Preserve markdown structure, headings, bullets, code spans, file paths, line numbers, and the fenced ```ocr-json block exactly as data.",
-      "- Do not translate JSON field names, enum values, file paths, code identifiers, stack traces, commands, or model names.",
+      "- Translate the complete human final review to Ukrainian.",
+      "- Return only readable Ukrainian Markdown for a developer.",
+      "- Do not include ```ocr-json, JSON, analysis notes, verification notes, or progress narration.",
+      "- Preserve markdown structure, headings, bullets, code spans, file paths, line numbers, commands, and model names.",
       "- Do not add new findings, remove findings, change severity/category/verdict, or change counts."
     ] : stage === "aggregation" ? [
       "- 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."
-    ] : ["- Include exactly one fenced ```ocr-json block."],
+    ] : ["- Return exactly one fenced ```ocr-json block and no prose outside it."],
     "- Do not write files directly.",
     "",
     ...stage === "translation_uk" ? [
       "Translation contract:",
-      "- The output must be a Ukrainian-language version of final.md.",
-      "- Keep the original ocr-json block valid JSON and semantically identical.",
+      "- The output must be a Ukrainian-language version of final.md for humans.",
+      "- Start with the translated top-level heading.",
+      "- Do not wrap the answer in a markdown code fence.",
+      "- Do not include JSON or machine-readable metadata.",
       ""
     ] : ["Required ocr-json schema:", schemaHint(stage), ""],
     "Forbidden behavior:",
@@ -38225,7 +38228,7 @@ function pipelinePrompt(context, stage, agent, promptPath, artifactPath) {
 }
 function schemaHint(stage) {
   if (stage === "translation_uk") {
-    return "No new schema. Preserve the existing final.md ocr-json block exactly.";
+    return "No machine schema. Produce human-readable Ukrainian Markdown only.";
   }
   if (stage === "aggregation") {
     return [
@@ -38771,21 +38774,38 @@ async function runPipelineStages(input) {
         results
       };
     }
-    await writeRoundArtifact(input.context.roundDir, ref.artifactPath, processOutput(result));
-    const validationErrors = validateStageArtifact(input.context.roundDir, stage, ref.artifactPath);
-    if (validationErrors.length > 0) {
+    const normalizedArtifact = normalizeStageArtifact(processOutput(result));
+    if (!normalizedArtifact.ok) {
       await journal.endInstance(agentSessionId, {
         exitCode: 1,
-        note: validationErrors.join("\n")
+        note: normalizedArtifact.errors.join("\n")
       });
-      await writePipelineFailure(input.context.roundDir, stage, result, results, validationErrors);
+      await writePipelineFailure(input.context.roundDir, stage, result, results, normalizedArtifact.errors);
       return {
         ok: false,
         failedStage: stage,
-        errors: validationErrors,
+        errors: normalizedArtifact.errors,
         results
       };
     }
+    await writeRoundArtifact(input.context.roundDir, ref.artifactPath, normalizedArtifact.artifact);
+    const validation = validateStageArtifact(input.context.roundDir, stage, ref.artifactPath);
+    if (!validation.ok) {
+      await journal.endInstance(agentSessionId, {
+        exitCode: 1,
+        note: validation.errors.join("\n")
+      });
+      await writePipelineFailure(input.context.roundDir, stage, result, results, validation.errors);
+      return {
+        ok: false,
+        failedStage: stage,
+        errors: validation.errors,
+        results
+      };
+    }
+    if (stage === "synthesis") {
+      await writeRoundArtifact(input.context.roundDir, "final.md", renderHumanFinalReview(validation.value));
+    }
     await journal.endInstance(agentSessionId, { exitCode: 0 });
   }
   return { ok: true, results };
@@ -38880,15 +38900,8 @@ async function runUkrainianTranslation(input) {
     });
     return result;
   }
-  const sourceFinalMarkdown = readFileSync16(finalPath, "utf-8");
-  const translatedMarkdown = normalizeUkrainianTranslationOutput(
-    sourceFinalMarkdown,
-    processOutput(result)
-  );
-  const translationErrors = validateUkrainianTranslationOutput(
-    sourceFinalMarkdown,
-    translatedMarkdown
-  );
+  const translatedMarkdown = normalizeHumanMarkdownOutput(processOutput(result));
+  const translationErrors = validateUkrainianTranslationOutput(translatedMarkdown);
   if (translationErrors.length > 0) {
     await patchProcessMeta(input.context.roundDir, logPaths.meta, {
       status: "failed",
@@ -38908,7 +38921,7 @@ async function runUkrainianTranslation(input) {
           failed_id: request.id,
           exit_code: 1,
           diagnostic: {
-            summary: "Ukrainian translation output did not preserve the final review ocr-json block."
+            summary: "Ukrainian translation output was not a readable human Markdown final review."
           },
           validation_errors: translationErrors,
           stdout_excerpt: excerpt(result.stdout)
@@ -38946,23 +38959,21 @@ async function patchProcessMeta(roundDir, metaPath, patch) {
   }
   await writeRoundArtifact(roundDir, metaPath, JSON.stringify({ ...current, ...patch }, null, 2));
 }
-function validateUkrainianTranslationOutput(sourceMarkdown, translatedMarkdown) {
-  const sourceJson = extractOcrJsonBlock(sourceMarkdown);
-  if (!sourceJson.ok) return sourceJson.errors.map((error) => `source final.md: ${error}`);
-  const translatedJson = extractOcrJsonBlock(translatedMarkdown);
-  if (!translatedJson.ok) return translatedJson.errors.map((error) => `final.uk.md: ${error}`);
-  if (JSON.stringify(sourceJson.value) !== JSON.stringify(translatedJson.value)) {
-    return ["final.uk.md ocr-json block must be identical to final.md ocr-json block."];
+function validateUkrainianTranslationOutput(translatedMarkdown) {
+  const errors = [];
+  if (!translatedMarkdown.trim()) errors.push("final.uk.md must not be empty.");
+  if (/```ocr-json/i.test(translatedMarkdown) || /^\s*[{[]/.test(translatedMarkdown)) {
+    errors.push("final.uk.md must be human Markdown without JSON or ocr-json blocks.");
+  }
+  if (!translatedMarkdown.trimStart().startsWith("#")) {
+    errors.push("final.uk.md must start with a Markdown heading.");
   }
-  return [];
+  return errors;
 }
-function normalizeUkrainianTranslationOutput(sourceMarkdown, translatedMarkdown) {
-  const sourceBlock = extractOcrJsonFence(sourceMarkdown);
-  if (!sourceBlock) return translatedMarkdown;
-  const translatedWithoutJson = translatedMarkdown.replace(/```ocr-json[\s\S]*?```/g, "").trimEnd();
-  return `${translatedWithoutJson}
-
-${sourceBlock}
+function normalizeHumanMarkdownOutput(markdown) {
+  const trimmed = markdown.trim();
+  const fenced3 = trimmed.match(/^```(?:markdown|md)?\s*([\s\S]*?)```$/i);
+  return `${(fenced3?.[1] ?? trimmed).trimEnd()}
 `;
 }
 function extractOcrJsonFence(markdown) {
@@ -38976,9 +38987,54 @@ function sortResults(results, requests) {
 function validateStageArtifact(roundDir, stage, artifactPath) {
   const markdown = readFileSync16(join27(roundDir, artifactPath), "utf-8");
   const extracted = extractOcrJsonBlock(markdown);
-  if (!extracted.ok) return extracted.errors;
+  if (!extracted.ok) return extracted;
   const validated = stage === "aggregation" ? validateAggregationJson(extracted.value) : stage === "validation" ? validateValidationJson(extracted.value) : validateSynthesisJson(extracted.value);
-  return validated.ok ? [] : validated.errors;
+  return validated;
+}
+function normalizeStageArtifact(markdown) {
+  const extracted = extractOcrJsonBlock(markdown);
+  if (!extracted.ok) return extracted;
+  const fence = extractOcrJsonFence(markdown);
+  if (!fence) return { ok: false, errors: ["Expected exactly one fenced ```ocr-json block."] };
+  return { ok: true, artifact: `${fence}
+` };
+}
+function renderHumanFinalReview(synthesis) {
+  const grouped = {
+    blocker: synthesis.findings.filter((finding) => finding.category === "blocker"),
+    should_fix: synthesis.findings.filter((finding) => finding.category === "should_fix"),
+    suggestion: synthesis.findings.filter((finding) => finding.category === "suggestion"),
+    style: synthesis.findings.filter((finding) => finding.category === "style")
+  };
+  return [
+    "# OCR Final Review",
+    "",
+    `**Verdict:** ${synthesis.verdict}`,
+    "",
+    `**Counts:** ${synthesis.synthesis_counts.blockers} blocker(s), ${synthesis.synthesis_counts.should_fix} should-fix item(s), ${synthesis.synthesis_counts.suggestions} suggestion(s).`,
+    "",
+    ...renderFindingSection("Blockers", grouped.blocker),
+    ...renderFindingSection("Should Fix", grouped.should_fix),
+    ...renderFindingSection("Suggestions", grouped.suggestion),
+    ...renderFindingSection("Style", grouped.style)
+  ].join("\n").trimEnd() + "\n";
+}
+function renderFindingSection(title, findings) {
+  if (findings.length === 0) return [`## ${title}`, "", "None.", ""];
+  return [
+    `## ${title}`,
+    "",
+    ...findings.flatMap((finding, index) => [
+      `### ${index + 1}. ${finding.title}`,
+      "",
+      `- **Severity:** ${finding.severity}`,
+      `- **Location:** ${finding.file_path ?? "n/a"}${finding.line_start ? `:${finding.line_start}` : ""}${finding.line_end && finding.line_end !== finding.line_start ? `-${finding.line_end}` : ""}`,
+      `- **Issue:** ${finding.summary}`,
+      ...finding.flagged_by?.length ? [`- **Flagged by:** ${finding.flagged_by.join(", ")}`] : [],
+      ...finding.validation_source ? [`- **Validation:** ${finding.validation_source}`] : [],
+      ""
+    ])
+  ];
 }
 function isNonEmptyFile(path2) {
   return existsSync22(path2) && statSync5(path2).isFile() && statSync5(path2).size > 0;

package/package.json

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