jinzd-ai-cli 0.4.190 → 0.4.193

package/dist/index.js

@@ -15,11 +15,12 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-JATZIZJV.js";
+} from "./chunk-MI23I43Y.js";
 import {
   ToolExecutor,
   ToolRegistry,
   askUserContext,
+  cleanupRejectedTeeFile,
   estimateTokens,
   googleSearchContext,
   initTheme,
@@ -34,10 +35,10 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-5CLH6XAW.js";
+} from "./chunk-SI5EO3NJ.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-NV6W7TZW.js";
+import "./chunk-7PX3ZX4G.js";
 import {
   SessionManager,
   getContentText
@@ -54,10 +55,18 @@ import {
   getConfigDirUsage,
   listRecentCrashes,
   writeCrashLog
-} from "./chunk-UVW3WLSV.js";
+} from "./chunk-PO3ZY3PN.js";
+import {
+  ProviderRegistry
+} from "./chunk-BGXQGCEO.js";
+import {
+  getStatsSnapshot,
+  getTopFailingTools,
+  getTopUsedTools,
+  installFlushOnExit
+} from "./chunk-SHI5UFUH.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
-  ProviderRegistry,
   TEE_FINAL_USER_NUDGE,
   TOOL_CALL_REMINDER,
   ThinkTagFilter,
@@ -65,24 +74,15 @@ import {
   buildRoundBudgetHint,
   buildWriteRoundReminder,
   consumeToolCallStream,
-  detectMetaNarration,
-  detectPseudoToolCalls,
+  evaluateTeeContent,
   extractWrittenFilePaths,
-  looksLikeDocumentBody,
   runAgentLoop,
-  stripPseudoToolCalls,
-  stripToolCallReminder
-} from "./chunk-IQ7JE43O.js";
-import {
-  getStatsSnapshot,
-  getTopFailingTools,
-  getTopUsedTools,
-  installFlushOnExit
-} from "./chunk-KHS7RSGR.js";
-import "./chunk-HIU2SH4V.js";
+  stripToolCallReminder,
+  teeStreamErrorSummary
+} from "./chunk-JOR572WG.js";
 import {
   ConfigManager
-} from "./chunk-X4J2DZB5.js";
+} from "./chunk-VQT27CZK.js";
 import {
   AuthError,
   ProviderError,
@@ -109,7 +109,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-4KMDKDAK.js";
+} from "./chunk-P3PTUSP4.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -138,7 +138,7 @@ import { program } from "commander";
 
 // src/repl/repl.ts
 import * as readline from "readline";
-import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
 import { join as join4, resolve as resolve2, extname as extname2, dirname as dirname3, basename as basename2 } from "path";
 import chalk4 from "chalk";
 
@@ -1824,7 +1824,7 @@ No tools match "${filter}".
           const { join: join5 } = await import("path");
           const { existsSync: existsSync5 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-EXOEHQSF.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-4QBBHLU4.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-LEU54VQQ.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-NKYHL3VZ.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -2885,7 +2885,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-7ZUNEUEX.js");
+          const { executeTests } = await import("./run-tests-IL4342SV.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -6813,10 +6813,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
               genUsage = teeResult.usage;
               teeTokShown = teeResult.tokensShown;
             } catch (teeErr) {
-              try {
-                unlinkSync2(saveToFile);
-              } catch {
-              }
+              cleanupRejectedTeeFile(saveToFile);
               const errMsg = teeErr instanceof Error ? teeErr.message : String(teeErr);
               process.stdout.write(theme.error(
                 `
@@ -6827,113 +6824,69 @@ Tip: You can continue the conversation by asking the AI to proceed.`
               ));
               const errorResults = toolCalls.map((tc) => ({
                 callId: tc.id,
-                content: tc.name === "save_last_response" ? `[save_last_response failed] streaming was interrupted: ${errMsg}. ${saveToFile} was NOT saved. Retry \u2014 and consider producing a more compact output (split very large reports across multiple save_last_response calls if the previous attempt timed out).` : `[skipped: save_last_response failed]`,
+                content: tc.name === "save_last_response" ? teeStreamErrorSummary(saveToFile, errMsg) : `[skipped: save_last_response failed]`,
                 isError: tc.name === "save_last_response"
               }));
-              const newMsgs2 = provider.buildToolResultMessages(toolCalls, errorResults, reasoningContent);
-              extraMessages.push(...newMsgs2);
+              const newMsgs = provider.buildToolResultMessages(toolCalls, errorResults, reasoningContent);
+              extraMessages.push(...newMsgs);
               return "continue";
             }
-            const metaMatch = detectMetaNarration(genContent);
-            if (metaMatch) {
-              try {
-                unlinkSync2(saveToFile);
-              } catch {
-              }
+            if (genUsage) accumulateUsage(usage, genUsage);
+            const verdict = evaluateTeeContent(genContent, saveToFile, lastResponseStore.content);
+            if (verdict.kind === "reject") {
+              cleanupRejectedTeeFile(saveToFile);
+              const label = verdict.reason === "meta-narration" ? "meta-narration / leaked reasoning, not document body" : "pseudo-tool-call markup with no usable document body";
               process.stdout.write(theme.error(
                 `
-  \u2717 Rejected save: response was meta-narration / leaked reasoning, not document body (matched: ${metaMatch})
+  \u2717 Rejected save: response was ${label} (matched: ${verdict.matched})
   ${saveToFile} was deleted; asking model to retry.
 
 `
               ));
               const errorResults = toolCalls.map((tc) => ({
                 callId: tc.id,
-                content: tc.name === "save_last_response" ? `[save_last_response REJECTED] Your output was internal reasoning / meta-narration about the task (e.g. "Let me re-read\u2026", "the user is asking me to\u2026") instead of the requested document body. ${saveToFile} was NOT saved.
-
-This fresh stream has NO tools. Produce ONLY the document body: start with a markdown heading like "# \u5BA1\u8BA1\u62A5\u544A" / "# Audit Report" and write the full content. Do NOT narrate that you will produce the document \u2014 produce it.` : `[skipped: save_last_response was rejected and other parallel calls are abandoned]`,
+                content: tc.name === "save_last_response" ? verdict.summary : `[skipped: save_last_response was rejected and other parallel calls are abandoned]`,
                 isError: tc.name === "save_last_response"
               }));
-              const newMsgs2 = provider.buildToolResultMessages(toolCalls, errorResults, reasoningContent);
-              extraMessages.push(...newMsgs2);
-              if (genUsage) accumulateUsage(usage, genUsage);
+              extraMessages.push(...provider.buildToolResultMessages(toolCalls, errorResults, reasoningContent));
               return "continue";
             }
-            const pseudoMatch = detectPseudoToolCalls(genContent);
-            if (pseudoMatch) {
-              const cleaned = stripPseudoToolCalls(genContent);
-              if (looksLikeDocumentBody(cleaned)) {
-                try {
-                  writeFileSync2(saveToFile, cleaned, "utf-8");
-                  process.stdout.write(theme.warning(
-                    `
-  \u26A0 Salvaged save: stripped pseudo-tool-call markup (matched: ${pseudoMatch})
-  ${saveToFile} now contains the cleaned document (${cleaned.length} chars; was ${genContent.length}).
-
-`
-                  ));
-                  lastResponseStore.content = cleaned;
-                  if (genUsage) accumulateUsage(usage, genUsage);
-                  session.addMessage({ role: "assistant", content: cleaned, timestamp: /* @__PURE__ */ new Date() });
-                  this.events.emit("message.after", { content: cleaned });
-                  const lines2 = cleaned.split("\n").length;
-                  const bytes2 = Buffer.byteLength(cleaned, "utf-8");
-                  const okResults = toolCalls.map((tc) => ({
-                    callId: tc.id,
-                    content: tc.name === "save_last_response" ? `File saved (with cleanup): ${saveToFile} (${lines2} lines, ${bytes2} bytes; pseudo-tool-call markup was stripped before save)` : `[skipped: file already saved by tee streaming]`,
-                    isError: false
-                  }));
-                  const newMsgs3 = provider.buildToolResultMessages(toolCalls, okResults, reasoningContent);
-                  extraMessages.push(...newMsgs3);
-                  if (usage.inputTokens > 0 || usage.outputTokens > 0) {
-                    this.addSessionUsage(usage, effectiveModel);
-                    session.addTokenUsage(usage);
-                    if (teeShowTokens && !teeTokShown) {
-                      this.renderer.renderUsage(usage, this.sessionTokenUsage);
-                    }
-                  }
-                  return "stop";
-                } catch (writeErr) {
-                  process.stderr.write(`[tee] salvage write failed: ${writeErr.message ?? writeErr}
-`);
-                }
-              }
+            if (verdict.kind === "salvaged" || verdict.kind === "fallback") {
               try {
-                unlinkSync2(saveToFile);
-              } catch {
-              }
-              process.stdout.write(theme.error(
-                `
-  \u2717 Rejected save: response was pseudo-tool-call markup with no usable document body (matched: ${pseudoMatch})
-  ${saveToFile} was deleted; asking model to retry.
+                writeFileSync2(saveToFile, verdict.content, "utf-8");
+                const banner = verdict.kind === "fallback" ? `
+  \u26A0 Fallback save: fresh stream had no usable body (matched: ${verdict.matched})
+  ${saveToFile} now holds the response you previously saw (${verdict.content.length} chars).
 
-`
-              ));
-              const errorResults = toolCalls.map((tc) => ({
-                callId: tc.id,
-                content: tc.name === "save_last_response" ? `[save_last_response REJECTED] Your output was tool-call XML/JSON with no document body. ${saveToFile} was NOT saved.
+` : `
+  \u26A0 Salvaged save: stripped pseudo-tool-call markup (matched: ${verdict.matched})
+  ${saveToFile} now contains the cleaned document (${verdict.content.length} chars; was ${genContent.length}).
 
-This fresh stream has NO tools \u2014 output is captured verbatim. STOP emitting <tool_call>, <function_calls>, <invoke>, <think>, or JSON tool blocks. Produce the document body NOW: start with a markdown heading like "# \u5BA1\u8BA1\u62A5\u544A" and write the full report.` : `[skipped: save_last_response was rejected and other parallel calls are abandoned]`,
-                isError: tc.name === "save_last_response"
-              }));
-              const newMsgs2 = provider.buildToolResultMessages(toolCalls, errorResults, reasoningContent);
-              extraMessages.push(...newMsgs2);
-              if (genUsage) accumulateUsage(usage, genUsage);
-              return "continue";
+`;
+                process.stdout.write(theme.warning(banner));
+              } catch (writeErr) {
+                cleanupRejectedTeeFile(saveToFile);
+                process.stderr.write(`[tee] salvage write failed: ${writeErr.message ?? writeErr}
+`);
+                const errorResults = toolCalls.map((tc) => ({
+                  callId: tc.id,
+                  content: tc.name === "save_last_response" ? `[save_last_response failed] could not write the cleaned document to ${saveToFile}: ${writeErr.message ?? writeErr}. Retry.` : `[skipped: save_last_response failed]`,
+                  isError: tc.name === "save_last_response"
+                }));
+                extraMessages.push(...provider.buildToolResultMessages(toolCalls, errorResults, reasoningContent));
+                return "continue";
+              }
             }
-            lastResponseStore.content = genContent;
-            if (genUsage) accumulateUsage(usage, genUsage);
-            session.addMessage({ role: "assistant", content: genContent, timestamp: /* @__PURE__ */ new Date() });
-            this.events.emit("message.after", { content: genContent });
-            const lines = genContent.split("\n").length;
-            const bytes = Buffer.byteLength(genContent, "utf-8");
-            const syntheticResults = toolCalls.map((tc) => ({
+            const finalContent = verdict.content;
+            lastResponseStore.content = finalContent;
+            session.addMessage({ role: "assistant", content: finalContent, timestamp: /* @__PURE__ */ new Date() });
+            this.events.emit("message.after", { content: finalContent });
+            const okResults = toolCalls.map((tc) => ({
               callId: tc.id,
-              content: tc.name === "save_last_response" ? `File saved: ${saveToFile} (${lines} lines, ${bytes} bytes)` : `[skipped: file already saved by tee streaming]`,
+              content: tc.name === "save_last_response" ? verdict.summary : `[skipped: file already saved by tee streaming]`,
               isError: false
             }));
-            const newMsgs = provider.buildToolResultMessages(toolCalls, syntheticResults, reasoningContent);
-            extraMessages.push(...newMsgs);
+            extraMessages.push(...provider.buildToolResultMessages(toolCalls, okResults, reasoningContent));
             if (usage.inputTokens > 0 || usage.outputTokens > 0) {
               this.addSessionUsage(usage, effectiveModel);
               session.addTokenUsage(usage);
@@ -7256,7 +7209,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-WMLZOLD5.js");
+  const { startWebServer } = await import("./server-KE7X3BHW.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | logout-all <name> | migrate <name>)").action(async (action, username) => {
@@ -7423,16 +7376,16 @@ program.command("sessions").description("List recent conversation sessions").opt
   console.log(footer + "\n");
 });
 program.command("usage").description("Show token + cost usage grouped by provider/model (cross-session)").option("--days <n>", "Only the last N days (inclusive of today)").option("--month <ym>", "Only a specific month, format YYYY-MM (e.g. 2026-06)").option("--json", "Output as JSON (for scripting)").action(async (options) => {
-  const { runUsageCli } = await import("./usage-5LMWDGZ4.js");
+  const { runUsageCli } = await import("./usage-CG7PJ3AB.js");
   await runUsageCli(options);
 });
 program.command("doctor").description("Health check: API keys, config, MCP, recent crashes, tool usage, disk usage").option("--json", "Output as JSON (for scripting)").option("--reset-stats", "Reset accumulated tool usage statistics").action(async (options) => {
-  const { runDoctorCli } = await import("./doctor-cli-EUOCY7VN.js");
+  const { runDoctorCli } = await import("./doctor-cli-4RKSIH7N.js");
   await runDoctorCli({ json: !!options.json, resetStats: !!options.resetStats });
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-HF5RWUBL.js");
+    const batch = await import("./batch-M6367YB4.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7475,7 +7428,7 @@ program.command("batch <action> [arg] [arg2]").description("Anthropic Message Ba
   }
 });
 program.command("mcp-serve").description("Start an MCP server over STDIO, exposing aicli's built-in tools to Claude Desktop / Cursor / other MCP clients").option("--allow-destructive", "Allow bash / run_interactive / task_create (always destructive in MCP mode)").option("--allow-outside-cwd", "Allow tool path arguments to escape the sandbox root \u2014 disabled by default").option("--tools <list>", "Comma-separated whitelist of tools to expose (default: all eligible tools)").option("--cwd <path>", "Working directory AND sandbox root (default: current directory)").action(async (options) => {
-  const { startMcpServer } = await import("./server-YMCGJOXV.js");
+  const { startMcpServer } = await import("./server-Y7TCCIGA.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7484,7 +7437,7 @@ program.command("mcp-serve").description("Start an MCP server over STDIO, exposi
   });
 });
 program.command("ci").description("Headless PR review (code + security) \u2014 reads git/gh diff, optionally posts to PR. Designed for GitHub Actions.").option("--pr <num>", "PR number; diff fetched via `gh pr diff <num>`", (v) => parseInt(v, 10)).option("--base <ref>", "Base ref for `git diff <ref>...HEAD` (ignored when --pr set)").option("--post", "Post review as a PR comment (requires gh CLI + GH_TOKEN, needs --pr)").option("--no-update", "Always create a new comment instead of updating the previous aicli review").option("--skip-code", "Skip the code review section").option("--skip-security", "Skip the security review section").option("--detailed", "Use the detailed code-review prompt").option("--max-diff <n>", "Max diff chars sent to the model (default 30000)", (v) => parseInt(v, 10)).option("--provider <id>", "Override provider (default: config.defaultProvider)").option("--model <id>", "Override model").option("--dry-run", "Print result to stdout instead of posting (overrides --post)").action(async (options) => {
-  const { runCi } = await import("./ci-X24WFUDF.js");
+  const { runCi } = await import("./ci-4MJ4EGKQ.js");
   const result = await runCi({
     pr: options.pr,
     base: options.base,
@@ -7630,7 +7583,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-YW3KLBZM.js");
+  const { startHub } = await import("./hub-XMUI5HMK.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-OTZE5CEN.js → run-tests-4QWMA4ZF.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-ZN5IEPSS.js";
+} from "./chunk-IFETB4PY.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-7ZUNEUEX.js → run-tests-IL4342SV.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-NV6W7TZW.js";
-import "./chunk-4KMDKDAK.js";
+} from "./chunk-7PX3ZX4G.js";
+import "./chunk-P3PTUSP4.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-WMLZOLD5.js → server-KE7X3BHW.js}

@@ -19,12 +19,13 @@ import {
   loadDevState,
   persistToolRound,
   setupProxy
-} from "./chunk-JATZIZJV.js";
+} from "./chunk-MI23I43Y.js";
 import {
   ToolExecutor,
   ToolRegistry,
   askUserContext,
   checkPermission,
+  cleanupRejectedTeeFile,
   estimateTokens,
   googleSearchContext,
   groupCallsByPhase,
@@ -37,10 +38,10 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-5CLH6XAW.js";
+} from "./chunk-SI5EO3NJ.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-NV6W7TZW.js";
+import "./chunk-7PX3ZX4G.js";
 import {
   SessionManager,
   getContentText
@@ -49,29 +50,27 @@ import {
   computeCost,
   formatCost
 } from "./chunk-V37XOYOE.js";
+import {
+  ProviderRegistry
+} from "./chunk-BGXQGCEO.js";
+import {
+  runTool
+} from "./chunk-SHI5UFUH.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
-  ProviderRegistry,
   TEE_FINAL_USER_NUDGE,
   TOOL_CALL_REMINDER,
   buildRoundBudgetHint,
   consumeToolCallStream,
-  detectMetaNarration,
-  detectPseudoToolCalls,
-  looksLikeDocumentBody,
+  evaluateTeeContent,
+  getDangerLevel,
   runAgentLoop,
-  stripPseudoToolCalls,
-  stripToolCallReminder
-} from "./chunk-IQ7JE43O.js";
-import {
-  runTool
-} from "./chunk-KHS7RSGR.js";
-import {
-  getDangerLevel
-} from "./chunk-HIU2SH4V.js";
+  stripToolCallReminder,
+  teeStreamErrorSummary
+} from "./chunk-JOR572WG.js";
 import {
   ConfigManager
-} from "./chunk-X4J2DZB5.js";
+} from "./chunk-VQT27CZK.js";
 import "./chunk-TZQHYZKT.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -91,7 +90,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-4KMDKDAK.js";
+} from "./chunk-P3PTUSP4.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -514,9 +513,23 @@ function loadMemoryContent(configDir) {
 }
 
 // src/web/session-handler.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, appendFileSync, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream, unlinkSync } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3, appendFileSync, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream } from "fs";
 import { join as join2, resolve, dirname } from "path";
 import { execSync } from "child_process";
+function lastAssistantText(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const m = messages[i];
+    if (!m || m.role !== "assistant") continue;
+    const c = m.content;
+    if (typeof c === "string") return c;
+    if (Array.isArray(c)) {
+      const text = c.filter((p) => p && p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
+      if (text) return text;
+    }
+    return void 0;
+  }
+  return void 0;
+}
 var SessionHandler = class _SessionHandler {
   ws;
   config;
@@ -1326,53 +1339,18 @@ ${summaryContent}`,
       await new Promise((resolve3, reject) => {
         fileStream.end((err) => err ? reject(err) : resolve3());
       });
-      const metaMatch = detectMetaNarration(fullContent);
-      if (metaMatch) {
-        try {
-          unlinkSync(saveToFile);
-        } catch {
-        }
+      const verdict = evaluateTeeContent(fullContent, saveToFile, lastAssistantText(apiMessages));
+      if (verdict.kind === "reject") {
+        cleanupRejectedTeeFile(saveToFile);
         isError = true;
-        summary = `[save_last_response REJECTED] Your output was internal reasoning / meta-narration (e.g. "Let me re-read\u2026", "the user is asking me to\u2026") instead of the requested document body (matched: ${metaMatch}). ${saveToFile} was NOT saved.
-
-This fresh stream has NO tools. Produce ONLY the document body: start with a markdown heading and write the full content. Do NOT narrate that you will produce the document \u2014 produce it.`;
-        if (teeUsage) {
-          roundUsage.inputTokens += teeUsage.inputTokens;
-          roundUsage.outputTokens += teeUsage.outputTokens;
-          roundUsage.cacheCreationTokens += teeUsage.cacheCreationTokens ?? 0;
-          roundUsage.cacheReadTokens += teeUsage.cacheReadTokens ?? 0;
-        }
-        this.send({
-          type: "tool_call_result",
-          callId: call.id,
-          toolName: call.name,
-          content: summary,
-          isError: true
-        });
-        return { content: "", summary, isError: true };
-      }
-      const pseudoMatch = detectPseudoToolCalls(fullContent);
-      if (pseudoMatch) {
-        const cleaned = stripPseudoToolCalls(fullContent);
-        if (looksLikeDocumentBody(cleaned)) {
-          writeFileSync(saveToFile, cleaned, "utf-8");
-          fullContent = cleaned;
-          const lines = cleaned.split("\n").length;
-          const bytes = Buffer.byteLength(cleaned, "utf-8");
-          summary = `File saved (with cleanup): ${saveToFile} (${lines} lines, ${bytes} bytes; pseudo-tool-call markup matching ${pseudoMatch} was stripped before save)`;
-          undoStack.push(saveToFile, `save_last_response: ${saveToFile}`);
-        } else {
-          try {
-            unlinkSync(saveToFile);
-          } catch {
-          }
-          isError = true;
-          summary = `[save_last_response REJECTED] Your output was tool-call markup with no usable document body (matched: ${pseudoMatch}). ${saveToFile} was NOT saved. This fresh stream has NO tools \u2014 output is captured verbatim. STOP emitting <tool_call>, <function_calls>, <invoke>, <think>, or JSON tool blocks. Produce the document body NOW: start with a markdown heading and write the full content.`;
-        }
+        summary = verdict.summary;
+        fullContent = "";
       } else {
-        const lines = fullContent.split("\n").length;
-        const bytes = Buffer.byteLength(fullContent, "utf-8");
-        summary = `File saved: ${saveToFile} (${lines} lines, ${bytes} bytes)`;
+        if (verdict.kind === "salvaged" || verdict.kind === "fallback") {
+          writeFileSync(saveToFile, verdict.content, "utf-8");
+          fullContent = verdict.content;
+        }
+        summary = verdict.summary;
         undoStack.push(saveToFile, `save_last_response: ${saveToFile}`);
       }
       if (teeUsage) {
@@ -1388,13 +1366,10 @@ This fresh stream has NO tools. Produce ONLY the document body: start with a mar
         } catch {
         }
       }
-      try {
-        unlinkSync(saveToFile);
-      } catch {
-      }
+      cleanupRejectedTeeFile(saveToFile);
       isError = true;
       const msg = err instanceof Error ? err.message : String(err);
-      summary = `[save_last_response failed] streaming was interrupted: ${msg}. ${saveToFile} (partial) was deleted. Retry \u2014 and consider producing a more compact output (split very large reports across multiple save_last_response calls if the previous attempt timed out).`;
+      summary = teeStreamErrorSummary(saveToFile, msg);
     }
     this.send({
       type: "tool_call_result",
@@ -2437,7 +2412,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-7ZUNEUEX.js");
+          const { executeTests } = await import("./run-tests-IL4342SV.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{server-YMCGJOXV.js → server-Y7TCCIGA.js}

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 import {
   ToolRegistry
-} from "./chunk-5CLH6XAW.js";
+} from "./chunk-SI5EO3NJ.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-NV6W7TZW.js";
+import "./chunk-7PX3ZX4G.js";
 import {
   runTool
-} from "./chunk-KHS7RSGR.js";
+} from "./chunk-SHI5UFUH.js";
 import {
   getDangerLevel,
   schemaToJsonSchema
-} from "./chunk-HIU2SH4V.js";
+} from "./chunk-JOR572WG.js";
 import "./chunk-TZQHYZKT.js";
 import {
   VERSION
-} from "./chunk-4KMDKDAK.js";
+} from "./chunk-P3PTUSP4.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-TB4W4Y4T.js";
 import "./chunk-KHYD3WXE.js";