claudish 7.49.0 → 7.50.0

package/dist/index.js

@@ -729,7 +729,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.49.0";
+var VERSION = "7.50.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -50087,12 +50087,132 @@ function writeStatusFile(sessionPath, manifest, status, opts) {
 var CHANNEL_LINE_BUDGET = 58;
 var init_team_stats = () => {};
 
+// src/team-stream-capture.ts
+function extractAssistantText(event) {
+  if (event.type !== "assistant")
+    return [];
+  const message = event.message;
+  const content = message?.content;
+  if (typeof content === "string") {
+    return content.length > 0 ? [content] : [];
+  }
+  if (!Array.isArray(content))
+    return [];
+  const out = [];
+  for (const raw2 of content) {
+    const block = raw2;
+    if (block?.type !== "text")
+      continue;
+    if (typeof block.text !== "string" || block.text.length === 0)
+      continue;
+    out.push(block.text);
+  }
+  return out;
+}
+function createAssistantTextCapture() {
+  let pending = "";
+  let emittedAny = false;
+  let endsWithNewline = false;
+  let dedupeTail = "";
+  let lastWasMessage = false;
+  const record4 = (text, kind) => {
+    emittedAny = true;
+    lastWasMessage = kind === "message";
+    endsWithNewline = text.endsWith(`
+`);
+    dedupeTail = (dedupeTail + text).slice(-DEDUPE_TAIL_LIMIT);
+  };
+  const messageSeparator = () => {
+    if (!emittedAny)
+      return "";
+    return endsWithNewline ? `
+` : `
+
+`;
+  };
+  const rawSeparator = () => {
+    if (!emittedAny || endsWithNewline)
+      return "";
+    return `
+`;
+  };
+  const consumeLine = (line, terminated) => {
+    if (line.trim().length === 0)
+      return "";
+    const passthrough = () => {
+      const out = `${rawSeparator()}${line}${terminated ? `
+` : ""}`;
+      record4(out, "raw");
+      return out;
+    };
+    let event;
+    try {
+      event = JSON.parse(line);
+    } catch {
+      return passthrough();
+    }
+    if (typeof event.type !== "string" || !STREAM_JSON_EVENT_TYPES.has(event.type)) {
+      return passthrough();
+    }
+    const texts = extractAssistantText(event);
+    if (texts.length > 0) {
+      let out = "";
+      for (const text of texts) {
+        const piece = `${messageSeparator()}${text}`;
+        out += piece;
+        record4(piece, "message");
+      }
+      return out;
+    }
+    if (event.type === "result" && event.is_error === true) {
+      const result = typeof event.result === "string" ? event.result : "";
+      if (result.trim().length > 0 && !dedupeTail.includes(result)) {
+        const out = `${messageSeparator()}${result}`;
+        record4(out, "message");
+        return out;
+      }
+    }
+    return "";
+  };
+  return {
+    write(chunk) {
+      pending += chunk;
+      let out = "";
+      let newlineAt = pending.indexOf(`
+`);
+      while (newlineAt !== -1) {
+        const line = pending.slice(0, newlineAt);
+        pending = pending.slice(newlineAt + 1);
+        out += consumeLine(line, true);
+        newlineAt = pending.indexOf(`
+`);
+      }
+      return out;
+    },
+    end() {
+      let out = pending.length > 0 ? consumeLine(pending, false) : "";
+      pending = "";
+      if (emittedAny && !endsWithNewline && lastWasMessage) {
+        out += `
+`;
+        endsWithNewline = true;
+      }
+      return out;
+    }
+  };
+}
+var DEDUPE_TAIL_LIMIT = 4096, STREAM_JSON_EVENT_TYPES;
+var init_team_stream_capture = __esm(() => {
+  STREAM_JSON_EVENT_TYPES = new Set(["system", "assistant", "user", "result"]);
+});
+
 // src/team-orchestrator.ts
 var exports_team_orchestrator = {};
 __export(exports_team_orchestrator, {
   validateSessionPath: () => validateSessionPath,
   setupSession: () => setupSession,
   runModels: () => runModels,
+  resolveCaptureMode: () => resolveCaptureMode,
   parseJudgeVotes: () => parseJudgeVotes,
   judgeResponses: () => judgeResponses,
   getStatus: () => getStatus,
@@ -50100,6 +50220,7 @@ __export(exports_team_orchestrator, {
   classifyRunOutput: () => classifyRunOutput,
   buildJudgePrompt: () => buildJudgePrompt,
   aggregateVerdict: () => aggregateVerdict,
+  TEAM_CAPTURE_ENV_VAR: () => TEAM_CAPTURE_ENV_VAR,
   STDOUT_TAIL_LIMIT: () => STDOUT_TAIL_LIMIT,
   DEFAULT_MIN_OUTPUT_BYTES: () => DEFAULT_MIN_OUTPUT_BYTES
 });
@@ -50113,8 +50234,21 @@ import {
   writeFileSync as writeFileSync12
 } from "fs";
 import { join as join28, resolve as resolve3 } from "path";
+function resolveCaptureMode(explicit, env = process.env) {
+  if (explicit)
+    return explicit;
+  return env[TEAM_CAPTURE_ENV_VAR]?.trim().toLowerCase() === "print" ? "print" : "stream-json";
+}
 function classifyRunOutput(opts) {
-  const { outputSize, stdoutTail, stderr, minOutputBytes, requirePattern, fullOutput } = opts;
+  const {
+    outputSize,
+    stdoutTail,
+    stderr,
+    minOutputBytes,
+    requirePattern,
+    fullOutput,
+    captureMode = "print"
+  } = opts;
   const apiError = API_ERROR_RE.exec(stdoutTail);
   if (apiError) {
     return {
@@ -50151,9 +50285,10 @@ function classifyRunOutput(opts) {
       re = null;
     }
     if (re && !re.test(haystack)) {
+      const cause = captureMode === "stream-json" ? "Every assistant message this child produced was captured and concatenated, " + "so this is not the print-mode dropout: the model genuinely never emitted the " + "required shape. Re-prompt it, or relax the contract." : "This is the signature of a child that answered and then took one more turn: " + "`claude -p` prints only the FINAL assistant message, so a background task " + "completing (or any late notification) replaces the real answer with an " + "epilogue about it. The answer was generated, it just was not the last thing " + "said \u2014 re-run with the default stream-json capture to keep it.";
       return {
         reason: "shape_mismatch",
-        detail: `Child exited 0 with ${outputSize} B, but the response does not match the ` + `required pattern /${requirePattern}/. This is the signature of a child that ` + "answered and then took one more turn: `claude -p` prints only the FINAL " + "assistant message, so a background task completing (or any late notification) " + "replaces the real answer with an epilogue about it. Check the child's " + "transcript \u2014 the answer was generated, it just was not the last thing said."
+        detail: `Child exited 0 with ${outputSize} B, but the response does not match the ` + `required pattern /${requirePattern}/. ${cause}`
       };
     }
   }
@@ -50269,6 +50404,7 @@ async function runModels(sessionPath, opts = {}) {
   }
   const minOutputBytes = opts.minOutputBytes ?? DEFAULT_MIN_OUTPUT_BYTES;
   const requirePattern = opts.requirePattern;
+  const captureMode = resolveCaptureMode(opts.captureMode);
   mkdirSync12(statsDir(sessionPath), { recursive: true });
   const processes = new Map;
   const runtimes = new Map;
@@ -50285,7 +50421,14 @@ async function runModels(sessionPath, opts = {}) {
     const outputPath = join28(sessionPath, `response-${anonId}.md`);
     const errorLogPath = join28(sessionPath, "errors", `${anonId}.log`);
     const spawnModel = spawnPlan.pinned.get(entry.model) ?? entry.model;
-    const args = ["--model", spawnModel, "-y", "--stdin", "--quiet", ...opts.claudeFlags ?? []];
+    const args = [
+      "--model",
+      spawnModel,
+      "-y",
+      "--stdin",
+      ...captureMode === "stream-json" ? ["--verbose", "--quiet", "--output-format", "stream-json"] : ["--quiet"],
+      ...opts.claudeFlags ?? []
+    ];
     updateModelStatus(anonId, {
       state: "RUNNING",
       startedAt: new Date().toISOString()
@@ -50301,12 +50444,36 @@ async function runModels(sessionPath, opts = {}) {
     });
     let byteCount = 0;
     let stdoutTail = "";
-    proc.stdout?.on("data", (chunk) => {
-      byteCount += chunk.length;
-      stdoutTail = (stdoutTail + chunk.toString()).slice(-STDOUT_TAIL_LIMIT);
-    });
     const outputStream = createWriteStream2(outputPath);
-    proc.stdout?.pipe(outputStream);
+    let flushPartial = () => {};
+    if (captureMode === "print") {
+      proc.stdout?.on("data", (chunk) => {
+        byteCount += chunk.length;
+        stdoutTail = (stdoutTail + chunk.toString()).slice(-STDOUT_TAIL_LIMIT);
+      });
+      proc.stdout?.pipe(outputStream);
+    } else {
+      const capture = createAssistantTextCapture();
+      const absorb = (text) => {
+        if (text.length === 0)
+          return;
+        byteCount += Buffer.byteLength(text);
+        stdoutTail = (stdoutTail + text).slice(-STDOUT_TAIL_LIMIT);
+        outputStream.write(text);
+      };
+      proc.stdout?.on("data", (chunk) => absorb(capture.write(chunk.toString())));
+      flushPartial = () => absorb(capture.end());
+      let captureFinalized = false;
+      const finalizeCapture = () => {
+        if (captureFinalized)
+          return;
+        captureFinalized = true;
+        absorb(capture.end());
+        outputStream.end();
+      };
+      proc.stdout?.on("end", finalizeCapture);
+      proc.stdout?.on("close", finalizeCapture);
+    }
     let stderr = "";
     proc.stderr?.on("data", (chunk) => {
       stderr += chunk.toString();
@@ -50317,7 +50484,8 @@ async function runModels(sessionPath, opts = {}) {
       errorLogPath,
       getStderr: () => stderr,
       getStdoutTail: () => stdoutTail,
-      getByteCount: () => byteCount
+      getByteCount: () => byteCount,
+      flushPartial: () => flushPartial()
     });
     proc.stdin?.write(inputContent);
     proc.stdin?.end();
@@ -50347,7 +50515,8 @@ async function runModels(sessionPath, opts = {}) {
           stderr,
           minOutputBytes,
           requirePattern,
-          fullOutput
+          fullOutput,
+          captureMode
         });
         const failed = crashed || degraded !== null;
         const state = crashed ? "FAILED" : degraded ? "EMPTY" : "COMPLETED";
@@ -50444,10 +50613,11 @@ async function runModels(sessionPath, opts = {}) {
             if (!proc.killed)
               proc.kill("SIGTERM");
             const rt = runtimes.get(id);
+            rt?.flushPartial();
             const stderr = rt?.getStderr() ?? "";
             const stdoutTail = rt?.getStdoutTail() ?? "";
             const bytes2 = rt?.getByteCount() ?? 0;
-            const detail = `Killed by the orchestrator after ${timeoutMs / 1000}s with ${bytes2} B of stdout. ` + "In --quiet print mode the child emits its answer only at the end, so 0 B means " + `"did not finish", not "produced nothing".`;
+            const detail = `Killed by the orchestrator after ${timeoutMs / 1000}s with ${bytes2} B of stdout. ` + "That figure counts the ANSWER, not the wire format, so 0 B means the child had " + `not produced an assistant message yet \u2014 "did not finish", not "produced nothing".`;
             if (rt)
               persistErrorLog(rt.errorLogPath, `TIMEOUT: ${detail}`, stderr, stdoutTail);
             updateModelStatus(id, {
@@ -50659,11 +50829,12 @@ function formatVerdict(verdict, sessionPath) {
   }
   return output;
 }
-var STDOUT_TAIL_LIMIT = 4000, API_ERROR_RE, BG_CEILING_RE, DEFAULT_MIN_OUTPUT_BYTES = 0, SENTINEL_MODELS;
+var TEAM_CAPTURE_ENV_VAR = "CLAUDISH_TEAM_CAPTURE", STDOUT_TAIL_LIMIT = 4000, API_ERROR_RE, BG_CEILING_RE, DEFAULT_MIN_OUTPUT_BYTES = 0, SENTINEL_MODELS;
 var init_team_orchestrator = __esm(() => {
   init_prehydrate();
   init_redact();
   init_team_stats();
+  init_team_stream_capture();
   API_ERROR_RE = /\[API Error:\s*([^\]]{0,300})\]/i;
   BG_CEILING_RE = /Background tasks still running after (\d+)s; terminating/i;
   SENTINEL_MODELS = new Set([
@@ -51189,7 +51360,7 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
         timeout: { type: "number", description: "Per-model timeout in seconds (default: 300)" },
         require_pattern: {
           type: "string",
-          description: "Regex the response MUST match, or the slot is reported FAILED (state EMPTY, " + "reason 'shape_mismatch') instead of succeeded. Strongly recommended whenever " + "your prompt mandates an output shape \u2014 e.g. '```vote' for a voting panel. " + "Exit code 0 is not a success oracle: a child that answers and then takes one " + "more turn (a background Task finishing, a late notification) has its real " + "answer replaced by a short epilogue, because print mode emits only the FINAL " + "assistant message. That lands as a few hundred bytes of plausible prose with " + "exit 0 and no error, and is otherwise indistinguishable from success."
+          description: "Regex the response MUST match, or the slot is reported FAILED (state EMPTY, " + "reason 'shape_mismatch') instead of succeeded. Strongly recommended whenever " + "your prompt mandates an output shape \u2014 e.g. '```vote' for a voting panel. " + "Exit code 0 is not a success oracle: it is 0 on API errors and on a child " + "that simply never followed the format. Answers are no longer LOST to print " + "mode (every assistant message is captured), so a mismatch now means the model " + "did not produce the shape, not that the shape was discarded."
         },
         min_output_bytes: {
           type: "number",
@@ -51771,7 +51942,7 @@ var init_mcp_server = __esm(() => {
     api_error: "retry once, or route via a different provider (or@<model>)",
     background_task_ceiling: "set CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS=0 for children, or forbid background work in the prompt",
     empty_output: "retry once; if it repeats, drop the model",
-    shape_mismatch: "the answer was generated but not captured \u2014 print mode keeps only the FINAL " + "assistant message, so a late background task or notification overwrote it. " + "Retry, and forbid background work in the prompt; do NOT count this slot as a vote"
+    shape_mismatch: "the response does not carry the shape you required. Every assistant message the " + "child emitted was captured, so nothing was lost in transit \u2014 the model did not " + "produce it. Re-prompt with the required format restated; do NOT count this slot " + "as a vote"
   };
   sanitize = sanitizeForReport;
   EVENT_TO_TASK_STATUS = new Map([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.49.0",
+  "version": "7.50.0",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "7.49.0",
-    "@claudish/magmux-darwin-x64": "7.49.0",
-    "@claudish/magmux-linux-arm64": "7.49.0",
-    "@claudish/magmux-linux-x64": "7.49.0"
+    "@claudish/magmux-darwin-arm64": "7.50.0",
+    "@claudish/magmux-darwin-x64": "7.50.0",
+    "@claudish/magmux-linux-arm64": "7.50.0",
+    "@claudish/magmux-linux-x64": "7.50.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",