jinzd-ai-cli 0.4.114 → 0.4.115

package/dist/{auth-VBV7HTLQ.js → auth-7KK5BOCA.js}

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
 import {
   AuthManager,
+  TOKEN_EXPIRY_MS,
   __resetLoginAttemptsForTests
-} from "./chunk-5UPFMM2A.js";
+} from "./chunk-O7NM4WTS.js";
 import "./chunk-PDX44BCA.js";
 export {
   AuthManager,
+  TOKEN_EXPIRY_MS,
   __resetLoginAttemptsForTests
 };

package/dist/{batch-Q5NQCXKN.js → batch-SHNIUSW2.js}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   ConfigManager
-} from "./chunk-CP6PALA4.js";
+} from "./chunk-UZLNS3QG.js";
 import "./chunk-2ZD3YTVM.js";
-import "./chunk-UF62SHR7.js";
+import "./chunk-OHUHYWBR.js";
 import "./chunk-PDX44BCA.js";
 
 // src/cli/batch.ts

package/dist/{chunk-E24HT62E.js → chunk-FMPWML3F.js}

@@ -2,7 +2,7 @@
 import {
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-TJGRPTJS.js";
 import {
   AuthError,
   ProviderError,
@@ -18,7 +18,7 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   VERSION
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import {
   redactJson
 } from "./chunk-7ZJN4KLV.js";
@@ -72,10 +72,20 @@ var ClaudeProvider = class extends BaseProvider {
     ]
   };
   async initialize(apiKey, options) {
-    this.client = new Anthropic({
+    const clientOptions = {
       apiKey,
       baseURL: options?.baseUrl
-    });
+    };
+    const proxyUrl = options?.proxy;
+    try {
+      const { Agent, ProxyAgent, fetch: undiciFetch } = await import("undici");
+      const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
+      const STREAM_HEADERS_TIMEOUT = 5 * 60 * 1e3;
+      const dispatcher = proxyUrl ? new ProxyAgent({ uri: proxyUrl, bodyTimeout: STREAM_BODY_TIMEOUT, headersTimeout: STREAM_HEADERS_TIMEOUT }) : new Agent({ bodyTimeout: STREAM_BODY_TIMEOUT, headersTimeout: STREAM_HEADERS_TIMEOUT });
+      clientOptions.fetch = ((url, init) => undiciFetch(url, { ...init, dispatcher }));
+    } catch {
+    }
+    this.client = new Anthropic(clientOptions);
   }
   /**
    * 将内部 MessageContentPart[] 格式转换为 Anthropic SDK 期望的 ContentBlockParam[]。
@@ -932,13 +942,20 @@ var OpenAICompatibleProvider = class extends BaseProvider {
       timeout: this.defaultTimeout
     };
     const proxyUrl = options?.proxy;
-    if (proxyUrl) {
-      try {
-        const { ProxyAgent, fetch: undiciFetch } = await import("undici");
-        const agent = new ProxyAgent({ uri: proxyUrl });
-        clientOptions.fetch = ((url, init) => undiciFetch(url, { ...init, dispatcher: agent }));
-      } catch {
-      }
+    try {
+      const { Agent, ProxyAgent, fetch: undiciFetch } = await import("undici");
+      const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
+      const STREAM_HEADERS_TIMEOUT = 5 * 60 * 1e3;
+      const dispatcher = proxyUrl ? new ProxyAgent({
+        uri: proxyUrl,
+        bodyTimeout: STREAM_BODY_TIMEOUT,
+        headersTimeout: STREAM_HEADERS_TIMEOUT
+      }) : new Agent({
+        bodyTimeout: STREAM_BODY_TIMEOUT,
+        headersTimeout: STREAM_HEADERS_TIMEOUT
+      });
+      clientOptions.fetch = ((url, init) => undiciFetch(url, { ...init, dispatcher }));
+    } catch {
     }
     this.client = new OpenAI(clientOptions);
   }
@@ -1854,6 +1871,40 @@ function peelMetaNarration(content) {
   }
   return out.trim();
 }
+var META_NARRATION_HARD_MARKERS = [
+  /\[⚠️\s*CONTENT GENERATION MODE\]/,
+  /CONTENT_ONLY_STREAM_REMINDER\b/,
+  /<system-reminder>/i
+];
+var META_NARRATION_HEURISTICS = [
+  /\bthe user (?:is asking me|wants me|is requesting|expects me)\b/i,
+  /\blet me (?:re-?read|re-?consider|reconsider|think about|carefully (?:re-?read|consider))\b/i,
+  /\bI'?m (?:in (?:a )?content-only|in CONTENT-ONLY|currently in)\b/i,
+  /\bI think (?:there might be|I should|I cannot|the (?:user|best)|maybe)\b/i,
+  /\bWait,?\s+let me\b/i,
+  /\bActually,?\s+I\b/i,
+  /\bI need to be honest with the user\b/i,
+  /\bI(?:'m| am) in a special mode\b/i,
+  /\bGiven that I cannot\b/i
+];
+function detectMetaNarration(content) {
+  if (!content) return null;
+  const head = content.slice(0, 2e3);
+  for (const re of META_NARRATION_HARD_MARKERS) {
+    if (re.test(head)) return re.source;
+  }
+  if (/^#{1,3}\s+\S/m.test(head)) return null;
+  let hits = 0;
+  let firstMatch = "";
+  for (const re of META_NARRATION_HEURISTICS) {
+    if (re.test(head)) {
+      hits++;
+      if (!firstMatch) firstMatch = re.source;
+      if (hits >= 2) return `meta-narration:${firstMatch}`;
+    }
+  }
+  return null;
+}
 function looksLikeDocumentBody(content) {
   if (!content || content.length < 200) return false;
   if (/^#{1,6}\s+\S/m.test(content)) return true;
@@ -4156,6 +4207,7 @@ export {
   buildPhantomCorrectionMessage,
   detectPseudoToolCalls,
   stripPseudoToolCalls,
+  detectMetaNarration,
   looksLikeDocumentBody,
   stripToolCallReminder,
   TEE_FINAL_USER_NUDGE,

package/dist/{chunk-W45U3KQE.js → chunk-KQZU2VS5.js}

@@ -6,7 +6,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.114";
+var VERSION = "0.4.115";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-5UPFMM2A.js → chunk-O7NM4WTS.js}

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
 // src/web/auth.ts
-import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, copyFileSync } from "fs";
+import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, copyFileSync, renameSync, unlinkSync } from "fs";
 import { join } from "path";
 import { createHmac, randomBytes, timingSafeEqual, pbkdf2Sync } from "crypto";
 var USERS_FILE = "users.json";
 var TOKEN_EXPIRY_HOURS = 24;
+var TOKEN_EXPIRY_MS = TOKEN_EXPIRY_HOURS * 3600 * 1e3;
 var USERS_DIR = "users";
 var LOGIN_MAX_FAILS = 5;
 var LOGIN_LOCKOUT_MS = 15 * 60 * 1e3;
@@ -252,7 +253,17 @@ var AuthManager = class {
   }
   saveDB(db) {
     mkdirSync(this.baseDir, { recursive: true });
-    writeFileSync(this.usersFile, JSON.stringify(db, null, 2), "utf-8");
+    const tmp = `${this.usersFile}.tmp`;
+    try {
+      writeFileSync(tmp, JSON.stringify(db, null, 2), "utf-8");
+      renameSync(tmp, this.usersFile);
+    } catch (err) {
+      try {
+        unlinkSync(tmp);
+      } catch {
+      }
+      throw err;
+    }
   }
   /** Legacy hash — kept only for migrating old users (v0.2.x) */
   hashPasswordLegacy(password, salt) {
@@ -278,6 +289,7 @@ var AuthManager = class {
 };
 
 export {
+  TOKEN_EXPIRY_MS,
   __resetLoginAttemptsForTests,
   AuthManager
 };

package/dist/{chunk-UF62SHR7.js → chunk-OHUHYWBR.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/core/constants.ts
-var VERSION = "0.4.114";
+var VERSION = "0.4.115";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-2WAF7FOX.js → chunk-PEMNYHIS.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   TEST_TIMEOUT
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 
 // src/tools/builtin/run-tests.ts
 import { execSync, spawnSync } from "child_process";

package/dist/{chunk-XXKWSBRC.js → chunk-TJGRPTJS.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-3BICTI5M.js";
 import {
   runTestsTool
-} from "./chunk-2WAF7FOX.js";
+} from "./chunk-PEMNYHIS.js";
 import {
   EnvLoader,
   NetworkError,
@@ -18,7 +18,7 @@ import {
   SUBAGENT_ALLOWED_TOOLS,
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -372,7 +372,7 @@ Important rules:
       }
       updateCwdFromCommand(command, effectiveCwd);
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
-      const result = IS_WINDOWS && Buffer.isBuffer(stdout) ? stdout.toString("utf-8") : stdout;
+      const result = Buffer.isBuffer(stdout) ? stdout.toString("utf-8") : String(stdout ?? "");
       return result || "(command completed with no output)";
     } catch (err) {
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);

package/dist/{chunk-CP6PALA4.js → chunk-UZLNS3QG.js}

@@ -8,7 +8,7 @@ import {
   CONFIG_FILE_NAME,
   HISTORY_DIR_NAME,
   PLUGINS_DIR_NAME
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";

package/dist/{constants-YEBRZDBP.js → constants-Y6LRE5TI.js}

@@ -36,7 +36,7 @@ import {
   TEST_TIMEOUT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import "./chunk-PDX44BCA.js";
 export {
   AGENTIC_BEHAVIOR_GUIDELINE,

package/dist/electron-server.js

@@ -36,7 +36,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-W45U3KQE.js";
+} from "./chunk-KQZU2VS5.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -604,10 +604,20 @@ var ClaudeProvider = class extends BaseProvider {
     ]
   };
   async initialize(apiKey, options) {
-    this.client = new Anthropic({
+    const clientOptions = {
       apiKey,
       baseURL: options?.baseUrl
-    });
+    };
+    const proxyUrl = options?.proxy;
+    try {
+      const { Agent, ProxyAgent, fetch: undiciFetch } = await import("undici");
+      const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
+      const STREAM_HEADERS_TIMEOUT = 5 * 60 * 1e3;
+      const dispatcher = proxyUrl ? new ProxyAgent({ uri: proxyUrl, bodyTimeout: STREAM_BODY_TIMEOUT, headersTimeout: STREAM_HEADERS_TIMEOUT }) : new Agent({ bodyTimeout: STREAM_BODY_TIMEOUT, headersTimeout: STREAM_HEADERS_TIMEOUT });
+      clientOptions.fetch = ((url, init) => undiciFetch(url, { ...init, dispatcher }));
+    } catch {
+    }
+    this.client = new Anthropic(clientOptions);
   }
   /**
    * 将内部 MessageContentPart[] 格式转换为 Anthropic SDK 期望的 ContentBlockParam[]。
@@ -1464,13 +1474,20 @@ var OpenAICompatibleProvider = class extends BaseProvider {
       timeout: this.defaultTimeout
     };
     const proxyUrl = options?.proxy;
-    if (proxyUrl) {
-      try {
-        const { ProxyAgent, fetch: undiciFetch } = await import("undici");
-        const agent = new ProxyAgent({ uri: proxyUrl });
-        clientOptions.fetch = ((url, init) => undiciFetch(url, { ...init, dispatcher: agent }));
-      } catch {
-      }
+    try {
+      const { Agent, ProxyAgent, fetch: undiciFetch } = await import("undici");
+      const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
+      const STREAM_HEADERS_TIMEOUT = 5 * 60 * 1e3;
+      const dispatcher = proxyUrl ? new ProxyAgent({
+        uri: proxyUrl,
+        bodyTimeout: STREAM_BODY_TIMEOUT,
+        headersTimeout: STREAM_HEADERS_TIMEOUT
+      }) : new Agent({
+        bodyTimeout: STREAM_BODY_TIMEOUT,
+        headersTimeout: STREAM_HEADERS_TIMEOUT
+      });
+      clientOptions.fetch = ((url, init) => undiciFetch(url, { ...init, dispatcher }));
+    } catch {
     }
     this.client = new OpenAI(clientOptions);
   }
@@ -2268,6 +2285,40 @@ function peelMetaNarration(content) {
   }
   return out.trim();
 }
+var META_NARRATION_HARD_MARKERS = [
+  /\[⚠️\s*CONTENT GENERATION MODE\]/,
+  /CONTENT_ONLY_STREAM_REMINDER\b/,
+  /<system-reminder>/i
+];
+var META_NARRATION_HEURISTICS = [
+  /\bthe user (?:is asking me|wants me|is requesting|expects me)\b/i,
+  /\blet me (?:re-?read|re-?consider|reconsider|think about|carefully (?:re-?read|consider))\b/i,
+  /\bI'?m (?:in (?:a )?content-only|in CONTENT-ONLY|currently in)\b/i,
+  /\bI think (?:there might be|I should|I cannot|the (?:user|best)|maybe)\b/i,
+  /\bWait,?\s+let me\b/i,
+  /\bActually,?\s+I\b/i,
+  /\bI need to be honest with the user\b/i,
+  /\bI(?:'m| am) in a special mode\b/i,
+  /\bGiven that I cannot\b/i
+];
+function detectMetaNarration(content) {
+  if (!content) return null;
+  const head = content.slice(0, 2e3);
+  for (const re of META_NARRATION_HARD_MARKERS) {
+    if (re.test(head)) return re.source;
+  }
+  if (/^#{1,3}\s+\S/m.test(head)) return null;
+  let hits = 0;
+  let firstMatch = "";
+  for (const re of META_NARRATION_HEURISTICS) {
+    if (re.test(head)) {
+      hits++;
+      if (!firstMatch) firstMatch = re.source;
+      if (hits >= 2) return `meta-narration:${firstMatch}`;
+    }
+  }
+  return null;
+}
 function looksLikeDocumentBody(content) {
   if (!content || content.length < 200) return false;
   if (/^#{1,6}\s+\S/m.test(content)) return true;
@@ -3885,7 +3936,7 @@ Important rules:
       }
       updateCwdFromCommand(command, effectiveCwd);
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
-      const result = IS_WINDOWS && Buffer.isBuffer(stdout) ? stdout.toString("utf-8") : stdout;
+      const result = Buffer.isBuffer(stdout) ? stdout.toString("utf-8") : String(stdout ?? "");
       return result || "(command completed with no output)";
     } catch (err) {
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
@@ -10842,6 +10893,31 @@ ${summaryResult.content}`,
       await new Promise((resolve7, reject) => {
         fileStream.end((err) => err ? reject(err) : resolve7());
       });
+      const metaMatch = detectMetaNarration(fullContent);
+      if (metaMatch) {
+        try {
+          unlinkSync4(saveToFile);
+        } catch {
+        }
+        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,
+          result: summary,
+          isError: true,
+          endTime: Date.now()
+        });
+        return { content: "", summary, isError: true };
+      }
       const pseudoMatch = detectPseudoToolCalls(fullContent);
       if (pseudoMatch) {
         const cleaned = stripPseudoToolCalls(fullContent);
@@ -10879,9 +10955,13 @@ ${summaryResult.content}`,
         } catch {
         }
       }
+      try {
+        unlinkSync4(saveToFile);
+      } catch {
+      }
       isError = true;
       const msg = err instanceof Error ? err.message : String(err);
-      summary = `[save_last_response failed] ${msg}`;
+      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).`;
     }
     this.send({
       type: "tool_call_result",
@@ -11960,7 +12040,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-OB4CWKKX.js");
+          const { executeTests } = await import("./run-tests-7VYL7OVA.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -12944,11 +13024,12 @@ async function setupProxy(configProxy) {
 }
 
 // src/web/auth.ts
-import { existsSync as existsSync21, readFileSync as readFileSync14, writeFileSync as writeFileSync9, mkdirSync as mkdirSync10, readdirSync as readdirSync10, copyFileSync } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync14, writeFileSync as writeFileSync9, mkdirSync as mkdirSync10, readdirSync as readdirSync10, copyFileSync, renameSync as renameSync2, unlinkSync as unlinkSync5 } from "fs";
 import { join as join14 } from "path";
 import { createHmac, randomBytes, timingSafeEqual, pbkdf2Sync } from "crypto";
 var USERS_FILE = "users.json";
 var TOKEN_EXPIRY_HOURS = 24;
+var TOKEN_EXPIRY_MS = TOKEN_EXPIRY_HOURS * 3600 * 1e3;
 var USERS_DIR = "users";
 var LOGIN_MAX_FAILS = 5;
 var LOGIN_LOCKOUT_MS = 15 * 60 * 1e3;
@@ -13192,7 +13273,17 @@ var AuthManager = class {
   }
   saveDB(db) {
     mkdirSync10(this.baseDir, { recursive: true });
-    writeFileSync9(this.usersFile, JSON.stringify(db, null, 2), "utf-8");
+    const tmp = `${this.usersFile}.tmp`;
+    try {
+      writeFileSync9(tmp, JSON.stringify(db, null, 2), "utf-8");
+      renameSync2(tmp, this.usersFile);
+    } catch (err) {
+      try {
+        unlinkSync5(tmp);
+      } catch {
+      }
+      throw err;
+    }
   }
   /** Legacy hash — kept only for migrating old users (v0.2.x) */
   hashPasswordLegacy(password, salt) {
@@ -13406,7 +13497,7 @@ async function startWebServer(options = {}) {
     }
     const token = authManager.login(username, password);
     console.log(`   \u2713 User registered via API: ${username}${firstRun ? " (first-run)" : ""}`);
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: 7 * 24 * 3600 * 1e3 });
+    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
     res.json({ success: true, username });
   });
   app.post("/api/auth/login", (req, res) => {
@@ -13420,7 +13511,7 @@ async function startWebServer(options = {}) {
       res.status(401).json({ error: "Invalid username or password" });
       return;
     }
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: 7 * 24 * 3600 * 1e3 });
+    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
     res.json({ success: true, username });
   });
   app.post("/api/auth/logout", (_req, res) => {

package/dist/{hub-DGJC2RRF.js → hub-E3WMJGYK.js}

@@ -386,7 +386,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-32YQ6HB2.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-24IGVXYP.js");
   const orchestrator = new TaskOrchestrator(config, providers, configManager);
   let interrupted = false;
   const onSigint = () => {

package/dist/index.js

@@ -14,6 +14,7 @@ import {
   buildWriteRoundReminder,
   clearDevState,
   computeCost,
+  detectMetaNarration,
   detectPseudoToolCalls,
   detectsHallucinatedFileOp,
   extractWrittenFilePaths,
@@ -31,10 +32,10 @@ import {
   setupProxy,
   stripPseudoToolCalls,
   stripToolCallReminder
-} from "./chunk-E24HT62E.js";
+} from "./chunk-FMPWML3F.js";
 import {
   ConfigManager
-} from "./chunk-CP6PALA4.js";
+} from "./chunk-UZLNS3QG.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -53,10 +54,10 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-TJGRPTJS.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-PEMNYHIS.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -79,7 +80,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -411,6 +412,7 @@ var Renderer = class {
       buf = "";
     };
     let interrupted = false;
+    let streamErr = null;
     try {
       for await (const chunk of stream) {
         if (options?.signal?.aborted) {
@@ -435,41 +437,51 @@ var Renderer = class {
         interrupted = true;
         if (!inThinking) flushBuf();
       } else {
-        throw err;
+        streamErr = err;
       }
     }
     if (interrupted) {
       process.stdout.write(theme.dim(" [interrupted]\n"));
     }
     let tokensShown = false;
-    if (options?.showTokens) {
-      process.stdout.write("\n");
-      if (usage) {
-        const sessionTotal = options.sessionTotal;
-        const updatedTotal = sessionTotal ? { inputTokens: sessionTotal.inputTokens + usage.inputTokens, outputTokens: sessionTotal.outputTokens + usage.outputTokens } : void 0;
-        this.renderUsage(usage, updatedTotal);
-        tokensShown = true;
-      } else if (fullContent.length > 0) {
-        const est = Math.ceil(fullContent.length / 2.5);
-        process.stdout.write(theme.dim(`\u{1F4CA} ~${est.toLocaleString()} output tokens (estimated)
+    if (!streamErr) {
+      if (options?.showTokens) {
+        process.stdout.write("\n");
+        if (usage) {
+          const sessionTotal = options.sessionTotal;
+          const updatedTotal = sessionTotal ? { inputTokens: sessionTotal.inputTokens + usage.inputTokens, outputTokens: sessionTotal.outputTokens + usage.outputTokens } : void 0;
+          this.renderUsage(usage, updatedTotal);
+          tokensShown = true;
+        } else if (fullContent.length > 0) {
+          const est = Math.ceil(fullContent.length / 2.5);
+          process.stdout.write(theme.dim(`\u{1F4CA} ~${est.toLocaleString()} output tokens (estimated)
 
 `));
-        tokensShown = true;
+          tokensShown = true;
+        } else {
+          process.stdout.write("\n");
+        }
       } else {
-        process.stdout.write("\n");
+        process.stdout.write("\n\n");
       }
     } else {
-      process.stdout.write("\n\n");
+      process.stdout.write("\n");
     }
     if (fileStream) {
-      await new Promise((resolve3, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve3());
-      });
-      const kb = (Buffer.byteLength(fullContent, "utf-8") / 1024).toFixed(1);
-      process.stdout.write(theme.success(`  \u2705 Saved: ${options.saveToFile} (${kb} KB)
+      try {
+        await new Promise((resolve3) => {
+          fileStream.end(() => resolve3());
+        });
+      } catch {
+      }
+      if (!streamErr) {
+        const kb = (Buffer.byteLength(fullContent, "utf-8") / 1024).toFixed(1);
+        process.stdout.write(theme.success(`  \u2705 Saved: ${options.saveToFile} (${kb} KB)
 
 `));
+      }
     }
+    if (streamErr) throw streamErr;
     return { content: fullContent, usage, tokensShown };
   }
   renderResponse(content) {
@@ -1600,7 +1612,7 @@ ${text}
           const { join: join6 } = await import("path");
           const { existsSync: existsSync6 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-7KIP4X2V.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-YEBRZDBP.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-Y6LRE5TI.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-IFM7FXEV.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -2650,7 +2662,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-7WN5Q7YV.js");
+          const { executeTests } = await import("./run-tests-TWE7TJ4T.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -6260,10 +6272,71 @@ ${mcpBudgetNote}` : "");
                 _extraMessages: teeExtraMessages
               });
               const teeShowTokens = this.shouldShowTokens();
-              const { content: genContent, usage: genUsage, tokensShown: teeTokShown } = await this.renderer.renderStream(
-                genStream,
-                { saveToFile, showTokens: teeShowTokens, sessionTotal: teeShowTokens ? { ...this.sessionTokenUsage } : void 0, signal: teeAc.signal }
-              );
+              let genContent;
+              let genUsage;
+              let teeTokShown = false;
+              try {
+                const teeResult = await this.renderer.renderStream(
+                  genStream,
+                  { saveToFile, showTokens: teeShowTokens, sessionTotal: teeShowTokens ? { ...this.sessionTokenUsage } : void 0, signal: teeAc.signal }
+                );
+                genContent = teeResult.content;
+                genUsage = teeResult.usage;
+                teeTokShown = teeResult.tokensShown;
+              } catch (teeErr) {
+                try {
+                  unlinkSync2(saveToFile);
+                } catch {
+                }
+                const errMsg = teeErr instanceof Error ? teeErr.message : String(teeErr);
+                process.stdout.write(theme.error(
+                  `
+  \u2717 tee stream failed: ${errMsg}
+  ${saveToFile} (partial) was deleted. Asking model to retry.
+
+`
+                ));
+                const errorResults = result.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]`,
+                  isError: tc.name === "save_last_response"
+                }));
+                const reasoningContent3 = "reasoningContent" in result ? result.reasoningContent : void 0;
+                const newMsgs3 = provider.buildToolResultMessages(result.toolCalls, errorResults, reasoningContent3);
+                extraMessages.push(...newMsgs3);
+                continue;
+              }
+              const metaMatch = detectMetaNarration(genContent);
+              if (metaMatch) {
+                try {
+                  unlinkSync2(saveToFile);
+                } catch {
+                }
+                process.stdout.write(theme.error(
+                  `
+  \u2717 Rejected save: response was meta-narration / leaked reasoning, not document body (matched: ${metaMatch})
+  ${saveToFile} was deleted; asking model to retry.
+
+`
+                ));
+                const errorResults = result.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]`,
+                  isError: tc.name === "save_last_response"
+                }));
+                const reasoningContent3 = "reasoningContent" in result ? result.reasoningContent : void 0;
+                const newMsgs3 = provider.buildToolResultMessages(result.toolCalls, errorResults, reasoningContent3);
+                extraMessages.push(...newMsgs3);
+                if (genUsage) {
+                  roundUsage.inputTokens += genUsage.inputTokens;
+                  roundUsage.outputTokens += genUsage.outputTokens;
+                  roundUsage.cacheCreationTokens += genUsage.cacheCreationTokens ?? 0;
+                  roundUsage.cacheReadTokens += genUsage.cacheReadTokens ?? 0;
+                }
+                continue;
+              }
               const pseudoMatch = detectPseudoToolCalls(genContent);
               if (pseudoMatch) {
                 const cleaned = stripPseudoToolCalls(genContent);
@@ -6882,11 +6955,11 @@ 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-AKG7HG36.js");
+  const { startWebServer } = await import("./server-RODHACCH.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) => {
-  const { AuthManager } = await import("./auth-VBV7HTLQ.js");
+  const { AuthManager } = await import("./auth-7KK5BOCA.js");
   const config = new ConfigManager();
   const auth = new AuthManager(config.getConfigDir());
   if (!action || action === "list") {
@@ -7018,7 +7091,7 @@ program.command("sessions").description("List recent conversation sessions").act
 });
 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-Q5NQCXKN.js");
+    const batch = await import("./batch-SHNIUSW2.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7061,7 +7134,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-NQ5J6FAL.js");
+  const { startMcpServer } = await import("./server-3P5BYK74.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7188,7 +7261,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-DGJC2RRF.js");
+  const { startHub } = await import("./hub-E3WMJGYK.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-OB4CWKKX.js → run-tests-7VYL7OVA.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-W45U3KQE.js";
+} from "./chunk-KQZU2VS5.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   executeTests,

package/dist/{run-tests-7WN5Q7YV.js → run-tests-TWE7TJ4T.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-2WAF7FOX.js";
-import "./chunk-UF62SHR7.js";
+} from "./chunk-PEMNYHIS.js";
+import "./chunk-OHUHYWBR.js";
 import "./chunk-PDX44BCA.js";
 export {
   executeTests,

package/dist/{server-NQ5J6FAL.js → server-3P5BYK74.js}

@@ -3,14 +3,14 @@ import {
   ToolRegistry,
   getDangerLevel,
   schemaToJsonSchema
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-TJGRPTJS.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-PEMNYHIS.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   VERSION
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-7ZJN4KLV.js";
 import "./chunk-KHYD3WXE.js";

package/dist/{server-AKG7HG36.js → server-RODHACCH.js}

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import {
-  AuthManager
-} from "./chunk-5UPFMM2A.js";
+  AuthManager,
+  TOKEN_EXPIRY_MS
+} from "./chunk-O7NM4WTS.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   HALLUCINATION_CORRECTION_MESSAGE,
@@ -13,6 +14,7 @@ import {
   TOOL_CALL_REMINDER,
   autoTrimSessionIfNeeded,
   computeCost,
+  detectMetaNarration,
   detectPseudoToolCalls,
   detectsHallucinatedFileOp,
   formatCost,
@@ -24,10 +26,10 @@ import {
   setupProxy,
   stripPseudoToolCalls,
   stripToolCallReminder
-} from "./chunk-E24HT62E.js";
+} from "./chunk-FMPWML3F.js";
 import {
   ConfigManager
-} from "./chunk-CP6PALA4.js";
+} from "./chunk-UZLNS3QG.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -45,10 +47,10 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-TJGRPTJS.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-PEMNYHIS.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -68,7 +70,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -1294,6 +1296,31 @@ ${summaryResult.content}`,
       await new Promise((resolve3, reject) => {
         fileStream.end((err) => err ? reject(err) : resolve3());
       });
+      const metaMatch = detectMetaNarration(fullContent);
+      if (metaMatch) {
+        try {
+          unlinkSync(saveToFile);
+        } catch {
+        }
+        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,
+          result: summary,
+          isError: true,
+          endTime: Date.now()
+        });
+        return { content: "", summary, isError: true };
+      }
       const pseudoMatch = detectPseudoToolCalls(fullContent);
       if (pseudoMatch) {
         const cleaned = stripPseudoToolCalls(fullContent);
@@ -1331,9 +1358,13 @@ ${summaryResult.content}`,
         } catch {
         }
       }
+      try {
+        unlinkSync(saveToFile);
+      } catch {
+      }
       isError = true;
       const msg = err instanceof Error ? err.message : String(err);
-      summary = `[save_last_response failed] ${msg}`;
+      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).`;
     }
     this.send({
       type: "tool_call_result",
@@ -2412,7 +2443,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-7WN5Q7YV.js");
+          const { executeTests } = await import("./run-tests-TWE7TJ4T.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3573,7 +3604,7 @@ async function startWebServer(options = {}) {
     }
     const token = authManager.login(username, password);
     console.log(`   \u2713 User registered via API: ${username}${firstRun ? " (first-run)" : ""}`);
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: 7 * 24 * 3600 * 1e3 });
+    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
     res.json({ success: true, username });
   });
   app.post("/api/auth/login", (req, res) => {
@@ -3587,7 +3618,7 @@ async function startWebServer(options = {}) {
       res.status(401).json({ error: "Invalid username or password" });
       return;
     }
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: 7 * 24 * 3600 * 1e3 });
+    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
     res.json({ success: true, username });
   });
   app.post("/api/auth/logout", (_req, res) => {

package/dist/{task-orchestrator-32YQ6HB2.js → task-orchestrator-24IGVXYP.js}

@@ -4,14 +4,14 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-TJGRPTJS.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-PEMNYHIS.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-OHUHYWBR.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-7ZJN4KLV.js";
 import "./chunk-KHYD3WXE.js";

package/dist/web/client/style.css

@@ -845,132 +845,132 @@ button, a, .session-item, .file-tree-row, .template-item, .tool-item, .mcp-serve
 @media (display-mode: standalone) {
   .navbar { padding-top: env(safe-area-inset-top, 0px); }
 }
-
-/* ── Session Replay (B1) ───────────────────────────── */
-.replay-step {
-  border-left: 3px solid hsl(var(--b3));
-  padding: 0.5rem 0.6rem;
-  background: hsl(var(--b1));
-  border-radius: 0 0.35rem 0.35rem 0;
-  font-size: 0.85rem;
-}
-.replay-step.role-user { border-left-color: #3b82f6; }
-.replay-step.role-assistant { border-left-color: #10b981; }
-.replay-step.role-tool { border-left-color: #f59e0b; }
-.replay-step.role-tool.error { border-left-color: #ef4444; }
-.replay-step-header {
-  display: flex;
-  gap: 0.5rem;
-  align-items: center;
-  font-size: 0.72rem;
-  opacity: 0.75;
-  margin-bottom: 0.25rem;
-}
-.replay-step-header .role-tag {
-  font-weight: 600;
-  padding: 0 0.35rem;
-  border-radius: 0.25rem;
-  background: hsl(var(--b3));
-}
-.replay-step-body {
-  white-space: pre-wrap;
-  word-break: break-word;
-  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
-  font-size: 0.78rem;
-  max-height: 18rem;
-  overflow-y: auto;
-}
-.replay-step-body.text-body {
-  font-family: inherit;
-  font-size: 0.85rem;
-}
-.replay-tool-block {
-  margin-top: 0.3rem;
-  padding: 0.4rem;
-  background: hsl(var(--b2));
-  border-radius: 0.3rem;
-  font-size: 0.78rem;
-}
-.replay-tool-block .tool-name {
-  font-weight: 600;
-  color: #f59e0b;
-}
-.replay-tool-block pre {
-  margin: 0.2rem 0 0;
-  white-space: pre-wrap;
-  word-break: break-word;
-  font-size: 0.72rem;
-  max-height: 12rem;
-  overflow-y: auto;
-}
-
-/* ── B2 Branch picker (sidebar) ─────────────────────────── */
-.branch-item {
-  display: flex;
-  align-items: center;
-  gap: 0.35rem;
-  padding: 0.35rem 0.5rem;
-  border-radius: 0.35rem;
-  cursor: pointer;
-  border: 1px solid transparent;
-  transition: background 0.1s, border-color 0.1s;
-  font-size: 0.78rem;
-  line-height: 1.25;
-  position: relative;
-}
-.branch-item:hover {
-  background: rgba(128, 128, 128, 0.12);
-}
-.branch-item.active {
-  background: rgba(34, 197, 94, 0.12);
-  border-color: rgba(34, 197, 94, 0.45);
-}
-.branch-item .branch-marker {
-  flex-shrink: 0;
-  width: 0.8rem;
-  color: rgb(34, 197, 94);
-}
-.branch-item .branch-title {
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.branch-item .branch-id {
-  flex-shrink: 0;
-  opacity: 0.5;
-  font-family: ui-monospace, SFMono-Regular, monospace;
-  font-size: 0.7rem;
-}
-.branch-item .branch-count {
-  flex-shrink: 0;
-  opacity: 0.55;
-  font-size: 0.7rem;
-}
-.branch-item .branch-actions {
-  display: none;
-  gap: 0.15rem;
-  flex-shrink: 0;
-}
-.branch-item:hover .branch-actions {
-  display: flex;
-}
-.branch-item .branch-actions button {
-  background: transparent;
-  border: none;
-  padding: 0 0.2rem;
-  font-size: 0.72rem;
-  cursor: pointer;
-  opacity: 0.7;
-}
-.branch-item .branch-actions button:hover {
-  opacity: 1;
-}
-.branch-item .branch-indent {
-  flex-shrink: 0;
-  color: rgba(128, 128, 128, 0.5);
-  font-family: ui-monospace, SFMono-Regular, monospace;
-  font-size: 0.72rem;
-  white-space: pre;
-}
+
+/* ── Session Replay (B1) ───────────────────────────── */
+.replay-step {
+  border-left: 3px solid hsl(var(--b3));
+  padding: 0.5rem 0.6rem;
+  background: hsl(var(--b1));
+  border-radius: 0 0.35rem 0.35rem 0;
+  font-size: 0.85rem;
+}
+.replay-step.role-user { border-left-color: #3b82f6; }
+.replay-step.role-assistant { border-left-color: #10b981; }
+.replay-step.role-tool { border-left-color: #f59e0b; }
+.replay-step.role-tool.error { border-left-color: #ef4444; }
+.replay-step-header {
+  display: flex;
+  gap: 0.5rem;
+  align-items: center;
+  font-size: 0.72rem;
+  opacity: 0.75;
+  margin-bottom: 0.25rem;
+}
+.replay-step-header .role-tag {
+  font-weight: 600;
+  padding: 0 0.35rem;
+  border-radius: 0.25rem;
+  background: hsl(var(--b3));
+}
+.replay-step-body {
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+  font-size: 0.78rem;
+  max-height: 18rem;
+  overflow-y: auto;
+}
+.replay-step-body.text-body {
+  font-family: inherit;
+  font-size: 0.85rem;
+}
+.replay-tool-block {
+  margin-top: 0.3rem;
+  padding: 0.4rem;
+  background: hsl(var(--b2));
+  border-radius: 0.3rem;
+  font-size: 0.78rem;
+}
+.replay-tool-block .tool-name {
+  font-weight: 600;
+  color: #f59e0b;
+}
+.replay-tool-block pre {
+  margin: 0.2rem 0 0;
+  white-space: pre-wrap;
+  word-break: break-word;
+  font-size: 0.72rem;
+  max-height: 12rem;
+  overflow-y: auto;
+}
+
+/* ── B2 Branch picker (sidebar) ─────────────────────────── */
+.branch-item {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  padding: 0.35rem 0.5rem;
+  border-radius: 0.35rem;
+  cursor: pointer;
+  border: 1px solid transparent;
+  transition: background 0.1s, border-color 0.1s;
+  font-size: 0.78rem;
+  line-height: 1.25;
+  position: relative;
+}
+.branch-item:hover {
+  background: rgba(128, 128, 128, 0.12);
+}
+.branch-item.active {
+  background: rgba(34, 197, 94, 0.12);
+  border-color: rgba(34, 197, 94, 0.45);
+}
+.branch-item .branch-marker {
+  flex-shrink: 0;
+  width: 0.8rem;
+  color: rgb(34, 197, 94);
+}
+.branch-item .branch-title {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.branch-item .branch-id {
+  flex-shrink: 0;
+  opacity: 0.5;
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  font-size: 0.7rem;
+}
+.branch-item .branch-count {
+  flex-shrink: 0;
+  opacity: 0.55;
+  font-size: 0.7rem;
+}
+.branch-item .branch-actions {
+  display: none;
+  gap: 0.15rem;
+  flex-shrink: 0;
+}
+.branch-item:hover .branch-actions {
+  display: flex;
+}
+.branch-item .branch-actions button {
+  background: transparent;
+  border: none;
+  padding: 0 0.2rem;
+  font-size: 0.72rem;
+  cursor: pointer;
+  opacity: 0.7;
+}
+.branch-item .branch-actions button:hover {
+  opacity: 1;
+}
+.branch-item .branch-indent {
+  flex-shrink: 0;
+  color: rgba(128, 128, 128, 0.5);
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  font-size: 0.72rem;
+  white-space: pre;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinzd-ai-cli",
-  "version": "0.4.114",
+  "version": "0.4.115",
   "description": "Cross-platform REPL-style AI CLI with multi-provider support",
   "type": "module",
   "main": "./dist/index.js",