@sagentlab/navarch-runtime 0.1.87 → 0.1.88

package/README.md

@@ -751,7 +751,7 @@ cli.cts
                   into Docker when NAVARCH_SANDBOX_MODE=docker
                4. selectAdapter(config.agentType) (adapters/index.cts) picks one AgentAdapter
                   (adapters/types.cts) by NAVARCH_AGENT, then .run(...):
-                    - claudeCodeAdapter (adapters/claude.cts) — `claude -p --mcp-config <path> < prompt`
+                    - claudeCodeAdapter (adapters/claude.cts) — `claude -p --mcp-config <path> --output-format stream-json --verbose < prompt`
                     - codexAdapter      (adapters/codex.cts)  — `codex exec - --json -c mcp_servers.*=... < prompt`
                     - geminiAdapter     (adapters/gemini.cts) — `gemini --output-format stream-json < prompt`
                     - openCodeAdapter   (adapters/opencode.cts) — `opencode run --format json < prompt`
@@ -871,16 +871,17 @@ Claude Code headless → PR opens on GitHub → complete lands with evidence;
 secrets absent from disk after exit"):
 
 - Actually running `claude -p` headless and confirming its real
-  `--output-format json` shape (WP-13). `adapters/claude.cts` now appends
-  `--output-format json` by default and best-effort parses stdout as a single
-  JSON result object shaped like `{ type, subtype, is_error, result,
+  result shape (WP-13). `adapters/claude.cts` appends
+  `--output-format stream-json --verbose` by default, so the uploaded
+  transcript records every message and tool call, and best-effort parses the
+  last `type: "result"` record on stdout as a JSON result object shaped like `{ type, subtype, is_error, result,
   session_id, total_cost_usd, usage: { input_tokens, output_tokens,
   cache_creation_input_tokens, cache_read_input_tokens } }` (see
   `exit-conditions.cts#parseClaudeJsonResult` for the exact assumption and
   fallback behavior). Unit tests (`tests/adapter.test.cts`,
   `tests/exit-conditions.test.cts`) cover the parsing and arg-construction
-  logic against fixed JSON strings; what's untested offline is whether a real
-  `claude -p --output-format json` invocation actually produces this shape.
+  logic against fixed JSON strings recorded from Claude Code 2.1; a future
+  CLI release could still change this shape.
   If it doesn't, parsing degrades to `null` and `tokensIn`/`tokensOut`/
   `costUsd` fall back to 0 (session.cts's existing default) — never a thrown
   error — but cost/spend data silently goes missing until the shape is

package/dist/adapters/claude.cjs

@@ -13,7 +13,7 @@ function hasFlag(args, flag) {
 }
 /**
  * Headless Claude Code adapter (project-plan.md §3.9 / implementation-plan.md
- * WP-07): `claude -p --mcp-config platform-mcp.json --output-format json`
+ * WP-07): `claude -p --mcp-config platform-mcp.json --output-format stream-json --verbose`
  * with the context bundle on stdin (`claude -p` reads its prompt from stdin
  * when none is given; Linux rejects any single argv string over 128 KiB, so
  * an argv prompt failed `spawn E2BIG` before Claude started). Returns raw stdout/stderr/exit signals (plus
@@ -25,11 +25,10 @@ function hasFlag(args, flag) {
  * (adapters/types.cts) — see adapters/codex.cts for the Codex CLI sibling
  * session.cts picks between via NAVARCH_AGENT (config.cts's `agentType`).
  *
- * NEEDS LIVE VERIFICATION (WP-13): `--output-format json` is assumed to make
- * `claude -p` print a single JSON result object with a `usage` block, per
- * Claude Code's documented headless-mode output. This cannot be confirmed
- * without a real `claude` binary in this offline build environment. If the
- * real shape differs, parseClaudeJsonResult() returns null and
+ * `--output-format stream-json` prints one JSON record per line and ends with
+ * the same result object (`type: "result"`, `usage`, `total_cost_usd`) that
+ * `--output-format json` prints alone; parseClaudeJsonResult() reads that
+ * last record. If the real shape differs, parseClaudeJsonResult() returns null and
  * tokensIn/tokensOut/costUsd fall back to 0 (session.cts's existing
  * default) rather than throwing -- see runtime/README.md.
  */
@@ -135,9 +134,14 @@ async function runClaudeAttempt(options, automaticFallback) {
     // Only append the default when the caller hasn't already asked for a
     // specific --output-format (extraArgs wins so an operator can opt back
     // into plain-text output, e.g. while diagnosing a live-verification
-    // mismatch, without an adapter code change).
-    if (!options.extraArgs.includes("--output-format")) {
-        args.push("--output-format", "json");
+    // mismatch, without an adapter code change). stream-json records every
+    // message and tool call, which the task transcript viewer renders; plain
+    // `json` printed only the final result. Claude Code requires --verbose for
+    // stream-json under --print, and its last record is the same result object.
+    if (!hasFlag(options.extraArgs, "--output-format")) {
+        args.push("--output-format", "stream-json");
+        if (!hasFlag(options.extraArgs, "--verbose"))
+            args.push("--verbose");
     }
     args.push(...options.extraArgs);
     // Project/task policy is appended after machine-wide extra arguments so a
@@ -157,7 +161,7 @@ async function runClaudeAttempt(options, automaticFallback) {
     const raw = runOptions.dockerExec ? await runViaDocker(runOptions, args) : await runOnHost(runOptions, args);
     return attachUsage(raw);
 }
-/** Parses stdout for `claude -p --output-format json` usage and folds it onto the raw result (best-effort; leaves tokensIn/tokensOut/costUsd unset when parsing fails). */
+/** Parses the final `claude -p --output-format stream-json` result record for usage and folds it onto the raw result (best-effort; leaves tokensIn/tokensOut/costUsd unset when parsing fails). */
 function attachUsage(result) {
     const parsed = (0, exit_conditions_cjs_1.parseClaudeJsonResult)(result.stdout);
     if (!parsed)

package/dist/exit-conditions.cjs

@@ -24,8 +24,9 @@ function agentAuthFailureReport(detail) {
         "Log the coding agent in again on this machine (`claude /login` or `codex login`), then resume the agent.";
 }
 /**
- * Best-effort parse of `claude -p --output-format json` stdout into the
- * assumed result shape above. Tries the whole trimmed stdout first (the
+ * Best-effort parse of `claude -p --output-format json` (or `stream-json`,
+ * whose last result record has the same shape) stdout into the assumed
+ * result shape above. Tries the whole trimmed stdout first (the
  * expected case); if that fails, tries each non-empty line that looks like a
  * JSON object, in case a warning/log line preceded the result (last such
  * line wins, since the final result is expected last). Returns null rather
@@ -39,6 +40,9 @@ function parseClaudeJsonResult(stdout) {
     const isUsableResult = (value) => typeof value === "object" &&
         value !== null &&
         !Array.isArray(value) &&
+        // stream-json output interleaves typed message/tool records with the
+        // final `type: "result"` record; only that record carries the outcome.
+        (!("type" in value) || value.type === "result") &&
         (!("result" in value) || typeof value.result === "string") &&
         ("result" in value || "usage" in value || "cost_usd" in value || "total_cost_usd" in value);
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.87",
+  "version": "0.1.88",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",