@nk070281sjv/cli 2.3.5 → 2.3.7

package/dist/index.js

@@ -30779,7 +30779,7 @@ ${hint}
 }
 
 // src/lib/version.ts
-var CLI_VERSION = true ? "2.3.5" : createRequire(import.meta.url)("../../package.json").version;
+var CLI_VERSION = true ? "2.3.7" : createRequire(import.meta.url)("../../package.json").version;
 
 // src/lib/deps.ts
 init_src();
@@ -31821,9 +31821,9 @@ var NodeFsHandler = class {
     if (this.fsw.closed) {
       return;
     }
-    const dirname12 = sysPath.dirname(file);
+    const dirname13 = sysPath.dirname(file);
     const basename9 = sysPath.basename(file);
-    const parent = this.fsw._getWatchedDir(dirname12);
+    const parent = this.fsw._getWatchedDir(dirname13);
     let prevStats = stats;
     if (parent.has(basename9))
       return;
@@ -31850,7 +31850,7 @@ var NodeFsHandler = class {
             prevStats = newStats2;
           }
         } catch (error) {
-          this.fsw._remove(dirname12, basename9);
+          this.fsw._remove(dirname13, basename9);
         }
       } else if (parent.has(basename9)) {
         const at = newStats.atimeMs;
@@ -37409,6 +37409,10 @@ async function writeRoundArtifact(roundDir, relativePath, content) {
 import { mkdir as mkdir2, readFile, writeFile as writeFile2 } from "node:fs/promises";
 import { existsSync as existsSync21 } from "node:fs";
 import { dirname as dirname10, join as join25 } from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+var execFileAsync = promisify(execFile);
+var GIT_SNAPSHOT_LIMIT = 2e4;
 async function prepareReviewContext(input) {
   const roundDir = join25(input.sessionDir, "rounds", `round-${input.round}`);
   await mkdir2(roundDir, { recursive: true });
@@ -37425,6 +37429,7 @@ async function prepareReviewContext(input) {
     "# Review Context\n\nNo shared review context has been recorded yet.\n"
   );
   const reviewBriefPath = join25(roundDir, "review-brief.md");
+  const gitSnapshot = input.cwd ? await collectGitSnapshot(input.cwd) : void 0;
   await writeFile2(
     reviewBriefPath,
     [
@@ -37434,6 +37439,37 @@ async function prepareReviewContext(input) {
       `Round: ${input.round}`,
       `Discovered standards: ${discoveredStandardsPath}`,
       `Shared context: ${contextPath}`,
+      ...input.cwd ? [`Repository root: ${input.cwd}`] : [],
+      "",
+      "## Scope",
+      "",
+      "Review the current working tree changes. Focus on changed files and the unchanged code needed to validate those changes.",
+      "Do not review generated OCR session artifacts under `.ocr/sessions/` unless they are explicitly part of the requested change.",
+      "",
+      ...gitSnapshot ? [
+        "## Git Status",
+        "",
+        fenced("text", gitSnapshot.status || "No working tree changes reported."),
+        "",
+        "## Changed Files",
+        "",
+        fenced("text", gitSnapshot.changedFiles || "No changed files reported."),
+        "",
+        "## Diff Stat",
+        "",
+        fenced("text", gitSnapshot.diffStat || "No diff stat available."),
+        ""
+      ] : [
+        "## Git Snapshot",
+        "",
+        "No repository snapshot was captured by the CLI.",
+        ""
+      ],
+      "## Reviewer Guidance",
+      "",
+      "- Read this brief first, then inspect relevant changed files and surrounding code as needed.",
+      "- Prefer targeted `git diff -- <path>` and file reads over broad repository scans.",
+      "- Report only findings supported by code evidence and concrete file references.",
       ""
     ].join("\n"),
     "utf-8"
@@ -37478,6 +37514,49 @@ async function prepareReviewContext(input) {
     requirementsExpected: Boolean(requirementsPath)
   };
 }
+async function collectGitSnapshot(cwd) {
+  const [status, cachedFiles, worktreeFiles, diffStat] = await Promise.all([
+    runGit(cwd, ["status", "--short"]),
+    runGit(cwd, ["diff", "--cached", "--name-only"]),
+    runGit(cwd, ["diff", "--name-only", "HEAD"]),
+    runGit(cwd, ["diff", "--stat", "HEAD"])
+  ]);
+  return {
+    status,
+    changedFiles: uniqueLines(`${cachedFiles}
+${worktreeFiles}`),
+    diffStat
+  };
+}
+async function runGit(cwd, args) {
+  try {
+    const { stdout, stderr } = await execFileAsync("git", args, {
+      cwd,
+      maxBuffer: GIT_SNAPSHOT_LIMIT * 2
+    });
+    return truncate(`${stdout}${stderr ? `
+${stderr}` : ""}`.trim());
+  } catch (error) {
+    if (error && typeof error === "object" && "stdout" in error && typeof error.stdout === "string") {
+      return truncate(error.stdout.trim());
+    }
+    return "";
+  }
+}
+function uniqueLines(value) {
+  const lines = value.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  return [...new Set(lines)].join("\n");
+}
+function truncate(value) {
+  if (value.length <= GIT_SNAPSHOT_LIMIT) return value;
+  return `${value.slice(0, GIT_SNAPSHOT_LIMIT)}
+[truncated by OCR CLI]`;
+}
+function fenced(language, value) {
+  return `\`\`\`${language}
+${value}
+\`\`\``;
+}
 async function ensureMarkdownFile(path2, fallbackContent) {
   if (existsSync21(path2)) {
     await readFile(path2, "utf-8");
@@ -37516,6 +37595,9 @@ function buildOpenCodeRunArgs(input) {
   if (input.attachUrl) {
     base.push("--attach", input.attachUrl, "--dir", input.cwd);
   }
+  if (input.pure) {
+    base.push("--pure");
+  }
   const limit = input.promptArgvLimit ?? DEFAULT_PROMPT_ARGV_LIMIT;
   if (input.prompt.length <= limit) {
     return [...base, input.prompt];
@@ -37534,15 +37616,25 @@ function parseOpenCodeJsonEvents(stdout) {
   }
   return events;
 }
+function extractOpenCodeText(events) {
+  return events.map((event) => {
+    if (!isRecord(event)) return "";
+    const part = event.part;
+    if (!isRecord(part) || part.type !== "text") return "";
+    return typeof part.text === "string" ? part.text : "";
+  }).join("").trimStart();
+}
 var OpenCodeProcessRunner = class {
   spawn;
   promptArgvLimit;
   serveReadyTimeoutMs;
+  pure;
   server;
   constructor(options = {}) {
     this.spawn = options.spawn ?? spawnBinary;
     this.promptArgvLimit = options.promptArgvLimit ?? DEFAULT_PROMPT_ARGV_LIMIT;
-    this.serveReadyTimeoutMs = options.serveReadyTimeoutMs ?? 15e3;
+    this.serveReadyTimeoutMs = options.serveReadyTimeoutMs ?? 12e4;
+    this.pure = options.pure ?? true;
   }
   async run(request, signal) {
     const prompt = await readFile2(request.promptPath, "utf-8");
@@ -37555,7 +37647,8 @@ var OpenCodeProcessRunner = class {
         exitCode: -1,
         stdout: "",
         stderr: error instanceof Error ? error.message : "Failed to start OpenCode server.",
-        ndjsonEvents: []
+        ndjsonEvents: [],
+        outputText: ""
       };
     }
     const args = buildOpenCodeRunArgs({
@@ -37565,6 +37658,7 @@ var OpenCodeProcessRunner = class {
       promptPath: request.promptPath,
       cwd: request.cwd,
       attachUrl,
+      pure: this.pure,
       promptArgvLimit: this.promptArgvLimit
     });
     return new Promise((resolve4) => {
@@ -37574,7 +37668,8 @@ var OpenCodeProcessRunner = class {
           exitCode: -1,
           stdout: "",
           stderr: "OpenCode process aborted before spawn.",
-          ndjsonEvents: []
+          ndjsonEvents: [],
+          outputText: ""
         });
         return;
       }
@@ -37604,21 +37699,25 @@ var OpenCodeProcessRunner = class {
         stderr += chunk;
       });
       child.on("error", (err) => {
+        const ndjsonEvents = parseOpenCodeJsonEvents(stdout);
         settle({
           id: request.id,
           exitCode: -1,
           stdout,
           stderr: stderr || err.message,
-          ndjsonEvents: parseOpenCodeJsonEvents(stdout)
+          ndjsonEvents,
+          outputText: extractOpenCodeText(ndjsonEvents)
         });
       });
       child.on("close", (code) => {
+        const ndjsonEvents = parseOpenCodeJsonEvents(stdout);
         settle({
           id: request.id,
           exitCode: code ?? -1,
           stdout,
           stderr,
-          ndjsonEvents: parseOpenCodeJsonEvents(stdout)
+          ndjsonEvents,
+          outputText: extractOpenCodeText(ndjsonEvents)
         });
       });
     });
@@ -37656,7 +37755,14 @@ var OpenCodeProcessRunner = class {
     }
     const child = this.spawn(
       "opencode",
-      ["serve", "--hostname", "127.0.0.1", "--port", "0"],
+      [
+        "serve",
+        "--hostname",
+        "127.0.0.1",
+        "--port",
+        "0",
+        ...this.pure ? ["--pure"] : []
+      ],
       {
         cwd,
         stdio: ["ignore", "pipe", "pipe"]
@@ -37731,10 +37837,13 @@ ${server.stderr}`);
 function parseServeUrl(output) {
   return output.match(/opencode server listening on (https?:\/\/\S+)/)?.[1];
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
 
 // src/lib/agent-orchestrator/prompt-writer.ts
 import { mkdir as mkdir3, writeFile as writeFile3 } from "node:fs/promises";
-import { join as join26, relative as relative3 } from "node:path";
+import { dirname as dirname11, join as join26, relative as relative3 } from "node:path";
 async function writePromptSnapshots(input) {
   const promptsDir = join26(input.context.roundDir, "prompts");
   const reviewsDir = join26(input.context.roundDir, "reviews");
@@ -37803,6 +37912,7 @@ function reviewerPrompt(context, reviewer, promptPath, reviewPath) {
     "Phase: reviews",
     "",
     "Input files to read before reviewing:",
+    `- ${reviewerPersonaPath(context, reviewer)}`,
     `- ${context.discoveredStandardsPath}`,
     `- ${context.contextPath}`,
     `- ${context.reviewBriefPath}`,
@@ -37816,8 +37926,14 @@ function reviewerPrompt(context, reviewer, promptPath, reviewPath) {
     `  - ${relative3(context.roundDir, context.discoveredStandardsPath)}`,
     `  - ${relative3(context.roundDir, context.contextPath)}`,
     `  - ${relative3(context.roundDir, context.reviewBriefPath)}`,
+    `  - ${relative3(context.roundDir, reviewerPersonaPath(context, reviewer))}`,
     ...context.requirementsPath ? [`  - ${relative3(context.roundDir, context.requirementsPath)}`] : [],
     "",
+    "Review focus:",
+    "- Apply the reviewer persona file as your primary review lens.",
+    "- Use the review brief as the source of truth for changed files and scope.",
+    "- Inspect surrounding source code only when needed to validate a finding.",
+    "",
     "Output contract:",
     `- Return review markdown through stdout for ${reviewPath}.`,
     "- Do not write files directly.",
@@ -37832,6 +37948,10 @@ function reviewerPrompt(context, reviewer, promptPath, reviewPath) {
     ""
   ].join("\n");
 }
+function reviewerPersonaPath(context, reviewer) {
+  const ocrDir = dirname11(dirname11(context.sessionDir));
+  return join26(ocrDir, "skills", "references", "reviewers", `${reviewer.persona}.md`);
+}
 function pipelinePrompt(context, stage, agent, promptPath, artifactPath) {
   return [
     `# Pipeline Agent: ${stage}`,
@@ -37889,6 +38009,7 @@ function schemaHint(stage) {
 // src/lib/agent-orchestrator/review-orchestrator.ts
 async function runReviewerPhase(input) {
   const journal = input.journal ?? new NoopAgentLifecycleJournal();
+  const emit = input.emit ?? (() => void 0);
   const controller = new AbortController();
   const reviewerRequests = input.resolvedTeam.reviewers.map((reviewer) => {
     if (!reviewer.model.trim()) {
@@ -37907,6 +38028,18 @@ async function runReviewerPhase(input) {
     };
   });
   const requests = reviewerRequests.map((item) => item.request);
+  const running = new Set(requests.map((request) => request.id));
+  const completed = /* @__PURE__ */ new Set();
+  const progressTimer = setInterval(() => {
+    emit({
+      event: "reviews:progress",
+      phase: "reviews",
+      completed: completed.size,
+      total: requests.length,
+      running: [...running].sort()
+    });
+  }, 3e4);
+  progressTimer.unref?.();
   const promises = reviewerRequests.map(async ({ reviewer, request }) => {
     const agentSessionId = await journal.startInstance({
       workflowId: input.context.sessionId,
@@ -37917,7 +38050,28 @@ async function runReviewerPhase(input) {
       phase: "reviews"
     });
     await journal.beat(agentSessionId);
+    const startLogPaths = await writeProcessStartLog(input.context.roundDir, request);
+    emit({
+      event: "agent:start",
+      phase: "reviews",
+      id: request.id,
+      model: request.model,
+      prompt_path: request.promptPath,
+      meta_log: startLogPaths.meta
+    });
     const result = await input.runner.run(request, controller.signal);
+    const logPaths = await writeProcessLogs(input.context.roundDir, request, result);
+    running.delete(request.id);
+    completed.add(request.id);
+    emit({
+      event: "agent:complete",
+      phase: "reviews",
+      id: request.id,
+      exit_code: result.exitCode,
+      stdout_log: logPaths.stdout,
+      stderr_log: logPaths.stderr,
+      meta_log: logPaths.meta
+    });
     const vendorId = extractVendorSessionId(result.ndjsonEvents);
     if (vendorId) await journal.bindVendorId(agentSessionId, vendorId);
     await journal.endInstance(agentSessionId, {
@@ -37927,15 +38081,19 @@ async function runReviewerPhase(input) {
     return result;
   });
   const results = [];
-  await Promise.all(
-    promises.map(async (promise) => {
-      const result = await promise;
-      results.push(result);
-      if (result.exitCode !== 0) {
-        controller.abort();
-      }
-    })
-  );
+  try {
+    await Promise.all(
+      promises.map(async (promise) => {
+        const result = await promise;
+        results.push(result);
+        if (result.exitCode !== 0) {
+          controller.abort();
+        }
+      })
+    );
+  } finally {
+    clearInterval(progressTimer);
+  }
   const failed = results.find((result) => result.exitCode !== 0);
   if (failed) {
     const failedRequest = requests.find((request) => request.id === failed.id);
@@ -37988,7 +38146,7 @@ async function runReviewerPhase(input) {
   for (const result of sortResults(results, requests)) {
     const reviewer = byId.get(result.id);
     if (!reviewer) continue;
-    await writeRoundArtifact(input.context.roundDir, reviewer.reviewPath, result.stdout);
+    await writeRoundArtifact(input.context.roundDir, reviewer.reviewPath, processOutput(result));
   }
   return { ok: true, results: sortResults(results, requests) };
 }
@@ -38002,7 +38160,8 @@ async function runOpenCodeProcessAgentReview(input) {
       sessionId: input.sessionId,
       sessionDir: input.sessionDir,
       round: input.round,
-      requirements: input.requirements
+      requirements: input.requirements,
+      cwd: input.cwd
     });
     const snapshot = await writePromptSnapshots({
       context,
@@ -38021,7 +38180,8 @@ async function runOpenCodeProcessAgentReview(input) {
       resolvedTeam: snapshot.resolvedTeam,
       cwd: input.cwd,
       runner,
-      journal
+      journal,
+      emit
     });
     if (!reviewerResult.ok) {
       emit({
@@ -38042,7 +38202,8 @@ async function runOpenCodeProcessAgentReview(input) {
       resolvedTeam: snapshot.resolvedTeam,
       cwd: input.cwd,
       runner,
-      journal
+      journal,
+      emit
     });
     if (!pipelineResult.ok) {
       emit({
@@ -38069,6 +38230,7 @@ async function runOpenCodeProcessAgentReview(input) {
 }
 async function runPipelineStages(input) {
   const journal = input.journal ?? new NoopAgentLifecycleJournal();
+  const emit = input.emit ?? (() => void 0);
   const missingReviews = input.resolvedTeam.reviewers.map((reviewer) => reviewer.reviewPath).filter((reviewPath) => !isNonEmptyFile(join27(input.context.roundDir, reviewPath)));
   if (missingReviews.length > 0) {
     return {
@@ -38097,7 +38259,26 @@ async function runPipelineStages(input) {
       cwd: input.cwd,
       phase: stage
     };
+    const startLogPaths = await writeProcessStartLog(input.context.roundDir, request);
+    emit({
+      event: "agent:start",
+      phase: stage,
+      id: request.id,
+      model: request.model,
+      prompt_path: request.promptPath,
+      meta_log: startLogPaths.meta
+    });
     const result = await input.runner.run(request, new AbortController().signal);
+    const logPaths = await writeProcessLogs(input.context.roundDir, request, result);
+    emit({
+      event: "agent:complete",
+      phase: stage,
+      id: request.id,
+      exit_code: result.exitCode,
+      stdout_log: logPaths.stdout,
+      stderr_log: logPaths.stderr,
+      meta_log: logPaths.meta
+    });
     results.push(result);
     const vendorId = extractVendorSessionId(result.ndjsonEvents);
     if (vendorId) await journal.bindVendorId(agentSessionId, vendorId);
@@ -38123,7 +38304,7 @@ async function runPipelineStages(input) {
         results
       };
     }
-    await writeRoundArtifact(input.context.roundDir, ref.artifactPath, result.stdout);
+    await writeRoundArtifact(input.context.roundDir, ref.artifactPath, processOutput(result));
     const validationErrors = validateStageArtifact(input.context.roundDir, stage, ref.artifactPath);
     if (validationErrors.length > 0) {
       await journal.endInstance(agentSessionId, {
@@ -38156,6 +38337,85 @@ function validateStageArtifact(roundDir, stage, artifactPath) {
 function isNonEmptyFile(path2) {
   return existsSync22(path2) && statSync5(path2).isFile() && statSync5(path2).size > 0;
 }
+async function writeProcessStartLog(roundDir, request) {
+  const metaPath = `process-logs/${request.id}.meta.json`;
+  await writeRoundArtifact(
+    roundDir,
+    metaPath,
+    JSON.stringify(
+      {
+        schema_version: 1,
+        id: request.id,
+        phase: request.phase,
+        model: request.model,
+        prompt_path: request.promptPath,
+        status: "running",
+        started_at: (/* @__PURE__ */ new Date()).toISOString()
+      },
+      null,
+      2
+    )
+  );
+  return { meta: metaPath };
+}
+async function writeProcessLogs(roundDir, request, result) {
+  const prefix = `process-logs/${request.id}`;
+  const stdoutPath = `${prefix}.stdout.ndjson`;
+  const stderrPath = `${prefix}.stderr.log`;
+  const metaPath = `${prefix}.meta.json`;
+  const absoluteMetaPath = join27(roundDir, metaPath);
+  const startedAt = readStartedAt(absoluteMetaPath) ?? (/* @__PURE__ */ new Date()).toISOString();
+  const completedAt = (/* @__PURE__ */ new Date()).toISOString();
+  await writeRoundArtifact(roundDir, stdoutPath, result.stdout);
+  await writeRoundArtifact(roundDir, stderrPath, result.stderr);
+  await writeRoundArtifact(
+    roundDir,
+    metaPath,
+    JSON.stringify(
+      {
+        schema_version: 1,
+        id: request.id,
+        phase: request.phase,
+        model: request.model,
+        prompt_path: request.promptPath,
+        status: "completed",
+        started_at: startedAt,
+        completed_at: completedAt,
+        duration_ms: Math.max(0, Date.parse(completedAt) - Date.parse(startedAt)),
+        exit_code: result.exitCode,
+        output_text_bytes: Buffer.byteLength(processOutput(result), "utf-8"),
+        stdout_bytes: Buffer.byteLength(result.stdout, "utf-8"),
+        stderr_bytes: Buffer.byteLength(result.stderr, "utf-8"),
+        opencode_session_ids: extractUniqueSessionIds(result.ndjsonEvents)
+      },
+      null,
+      2
+    )
+  );
+  return { stdout: stdoutPath, stderr: stderrPath, meta: metaPath };
+}
+function readStartedAt(path2) {
+  if (!existsSync22(path2)) return void 0;
+  try {
+    const parsed = JSON.parse(readFileSync16(path2, "utf-8"));
+    if (!isRecord2(parsed)) return void 0;
+    return typeof parsed.started_at === "string" ? parsed.started_at : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function processOutput(result) {
+  return result.outputText ?? result.stdout;
+}
+function extractUniqueSessionIds(events) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const event of events) {
+    if (!isRecord2(event)) continue;
+    const sessionID = event.sessionID;
+    if (typeof sessionID === "string") ids.add(sessionID);
+  }
+  return [...ids];
+}
 async function writePipelineFailure(roundDir, stage, result, results, validationErrors = [], diagnostic = buildFailureDiagnostic(result)) {
   await writeRoundArtifact(
     roundDir,
@@ -38217,11 +38477,11 @@ function buildFailureDiagnostic(result, request) {
 }
 function extractOpenCodeErrorMessage(events) {
   for (const event of events) {
-    if (!isRecord(event) || event.type !== "error") continue;
+    if (!isRecord2(event) || event.type !== "error") continue;
     const error = event.error;
-    if (!isRecord(error)) continue;
+    if (!isRecord2(error)) continue;
     const data = error.data;
-    if (isRecord(data) && typeof data.message === "string") return data.message;
+    if (isRecord2(data) && typeof data.message === "string") return data.message;
     if (typeof error.message === "string") return error.message;
   }
   return void 0;
@@ -38234,7 +38494,7 @@ function excerpt(value, limit = 1200) {
 function stripAnsi2(value) {
   return value.replace(/\u001b\[[0-9;]*m/g, "");
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null;
 }
 
@@ -38624,12 +38884,12 @@ var updateCommand = new Command("update").description("Update OCR assets after p
 
 // src/commands/dashboard.ts
 import { existsSync as existsSync25 } from "node:fs";
-import { join as join30, dirname as dirname11 } from "node:path";
+import { join as join30, dirname as dirname12 } from "node:path";
 import { fileURLToPath } from "node:url";
 init_src();
 init_db();
 var __filename = fileURLToPath(import.meta.url);
-var __dirname = dirname11(__filename);
+var __dirname = dirname12(__filename);
 function resolveServerPath() {
   return join30(__dirname, "dashboard", "server.js");
 }

package/package.json

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