jinzd-ai-cli 0.4.180 → 0.4.182

package/dist/index.js

@@ -18,7 +18,7 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-FQHEXIYP.js";
+} from "./chunk-C6UJBTZO.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -37,10 +37,10 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-7WFMYFHC.js";
+} from "./chunk-XI7EUUL7.js";
 import "./chunk-HDSKW7Q3.js";
 import "./chunk-ZWVIDFGY.js";
-import "./chunk-H7TXZO6D.js";
+import "./chunk-QUYLXQRU.js";
 import {
   SessionManager,
   getContentText
@@ -49,15 +49,25 @@ import {
   getConfigDirUsage,
   listRecentCrashes,
   writeCrashLog
-} from "./chunk-ZUUXMR6Z.js";
+} from "./chunk-4NPR3MFZ.js";
 import {
+  BudgetWarner,
   CONTENT_ONLY_STREAM_REMINDER,
+  ContextPressureMonitor,
+  EmptyResponseGuard,
+  FreeRoundTracker,
   HALLUCINATION_CORRECTION_MESSAGE,
   ProviderRegistry,
   TEE_FINAL_USER_NUDGE,
   TOOL_CALL_REMINDER,
+  ThinkTagFilter,
+  accumulateUsage,
   buildPhantomCorrectionMessage,
+  buildRoundBudgetHint,
+  buildRoundsExhaustedPrompt,
+  buildUserStopMessage,
   buildWriteRoundReminder,
+  consumeToolCallStream,
   detectMetaNarration,
   detectPseudoToolCalls,
   detectsHallucinatedFileOp,
@@ -67,18 +77,19 @@ import {
   hadPreviousWriteToolCalls,
   looksLikeDocumentBody,
   stripPseudoToolCalls,
-  stripToolCallReminder
-} from "./chunk-2TWARH5X.js";
+  stripToolCallReminder,
+  summarizeRecentTools
+} from "./chunk-5LK7H45B.js";
 import {
   getStatsSnapshot,
   getTopFailingTools,
   getTopUsedTools,
   installFlushOnExit
-} from "./chunk-WY2DDJTH.js";
+} from "./chunk-LWZ6P73G.js";
 import "./chunk-HIU2SH4V.js";
 import {
   ConfigManager
-} from "./chunk-2UGK2RXK.js";
+} from "./chunk-YDIR3MXD.js";
 import {
   AuthError,
   ProviderError,
@@ -105,7 +116,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-KRU4DFRH.js";
+} from "./chunk-ISO5KVEJ.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -208,13 +219,6 @@ function isInterruptedSession(messages) {
 import chalk from "chalk";
 import { createWriteStream, mkdirSync } from "fs";
 import { dirname } from "path";
-function partialTagTail(s, tag) {
-  const max = Math.min(s.length, tag.length - 1);
-  for (let k = max; k > 0; k--) {
-    if (s.endsWith(tag.slice(0, k))) return k;
-  }
-  return 0;
-}
 function fmtContextWindow(tokens) {
   if (tokens >= 1e6) return `${Math.round(tokens / 1e5) / 10}M`;
   if (tokens >= 1e3) return `${Math.round(tokens / 1024)}K`;
@@ -495,48 +499,15 @@ var Renderer = class {
     }
     let fullContent = "";
     let usage;
-    let inThinking = false;
-    let thinkBuf = "";
-    const emitText = (raw) => {
-      thinkBuf += raw;
-      let out = "";
-      while (thinkBuf.length > 0) {
-        if (!inThinking) {
-          const open = thinkBuf.indexOf("<think>");
-          if (open === -1) {
-            const keep = partialTagTail(thinkBuf, "<think>");
-            out += thinkBuf.slice(0, thinkBuf.length - keep);
-            thinkBuf = thinkBuf.slice(thinkBuf.length - keep);
-            break;
-          }
-          out += thinkBuf.slice(0, open);
-          thinkBuf = thinkBuf.slice(open + "<think>".length);
-          inThinking = true;
-        } else {
-          const close = thinkBuf.indexOf("</think>");
-          if (close === -1) {
-            const keep = partialTagTail(thinkBuf, "</think>");
-            thinkBuf = thinkBuf.slice(thinkBuf.length - keep);
-            break;
-          }
-          thinkBuf = thinkBuf.slice(close + "</think>".length);
-          inThinking = false;
-        }
-      }
-      if (out) {
-        process.stdout.write(out);
-        if (fileStream) fileStream.write(out);
-        fullContent += out;
-      }
-    };
-    const flushTail = () => {
-      if (!inThinking && thinkBuf) {
-        process.stdout.write(thinkBuf);
-        if (fileStream) fileStream.write(thinkBuf);
-        fullContent += thinkBuf;
-        thinkBuf = "";
-      }
+    const thinkFilter = new ThinkTagFilter();
+    const writeVisible = (visible) => {
+      if (!visible) return;
+      process.stdout.write(visible);
+      if (fileStream) fileStream.write(visible);
+      fullContent += visible;
     };
+    const emitText = (raw) => writeVisible(thinkFilter.push(raw));
+    const flushTail = () => writeVisible(thinkFilter.flush());
     let interrupted = false;
     let streamErr = null;
     try {
@@ -1016,6 +987,61 @@ function copyToClipboard(text) {
     }
   }
 }
+var SESSION_PAGE_SIZE = 20;
+function oneLinePreview(s, max) {
+  const flat = s.replace(/\s+/g, " ").trim();
+  return flat.length > max ? flat.slice(0, max - 1) + "\u2026" : flat;
+}
+function renderTranscriptMessage(msg, renderer) {
+  if (msg.role === "user") {
+    const text = getContentText(msg.content);
+    console.log(theme.success("You: ") + (text.includes("\n") ? "\n" + text : text));
+    console.log();
+  } else if (msg.role === "assistant") {
+    const text = getContentText(msg.content);
+    if (msg.toolCalls && msg.toolCalls.length > 0) {
+      if (text.trim()) {
+        console.log(theme.dim(`Assistant: ${oneLinePreview(text, 100)}`));
+      }
+      for (const tc of msg.toolCalls) {
+        console.log(theme.dim(`  \u2699 ${tc.name} ${oneLinePreview(JSON.stringify(tc.arguments ?? {}), 80)}`));
+      }
+    } else if (text.trim()) {
+      renderer.renderResponse(text);
+      console.log();
+    }
+  } else if (msg.role === "tool") {
+    const preview = oneLinePreview(getContentText(msg.content), 80);
+    const paint = msg.isError ? theme.error : theme.dim;
+    console.log(paint(`    \u2192 ${msg.toolName ?? "tool"}: ${preview}`));
+  }
+}
+function renderTranscriptPage(messages, renderer, requestedPage) {
+  const total = messages.length;
+  if (total === 0) {
+    renderer.printInfo("Session has no messages yet.");
+    return;
+  }
+  const totalPages = Math.max(1, Math.ceil(total / SESSION_PAGE_SIZE));
+  let page = requestedPage === void 0 || !Number.isFinite(requestedPage) ? totalPages : requestedPage;
+  if (page < 1) page = 1;
+  if (page > totalPages) page = totalPages;
+  const start = (page - 1) * SESSION_PAGE_SIZE;
+  const slice = messages.slice(start, start + SESSION_PAGE_SIZE);
+  console.log();
+  console.log(theme.info(`  \u2500\u2500 Transcript page ${page}/${totalPages} (messages ${start + 1}\u2013${start + slice.length} of ${total}) \u2500\u2500`));
+  console.log();
+  for (const msg of slice) {
+    renderTranscriptMessage(msg, renderer);
+  }
+  const hints = [];
+  if (page > 1) hints.push(`/session page ${page - 1} = earlier`);
+  if (page < totalPages) hints.push(`/session page ${page + 1} = later`);
+  if (hints.length > 0) {
+    console.log(theme.dim(`  \u2500\u2500 ${hints.join(" \xB7 ")} \u2500\u2500`));
+  }
+  console.log();
+}
 var CommandRegistry = class {
   commands = /* @__PURE__ */ new Map();
   register(command) {
@@ -1089,7 +1115,7 @@ function createDefaultCommands() {
             rows: [
               ["/clear", "Clear conversation history"],
               ["/compact [instruction]", "Summarize & compress history"],
-              ["/session new|list|load <id>", "Manage saved sessions"],
+              ["/session new|list|load|show|page|remove", "Manage saved sessions (show = transcript + continue)"],
               ["/checkpoint [save|restore|delete] <name>", "Session checkpoints"],
               ["/fork [checkpoint]", "Fork session from checkpoint or current"],
               ["/branch [list|new|switch|delete|rename|diff|cherry-pick]", "Conversation branches"],
@@ -1363,8 +1389,8 @@ No commands match "${filter}".
     {
       name: "session",
       description: "Session management",
-      usage: "/session new|list|load <id>",
-      execute(args, ctx) {
+      usage: "/session new|list|load <id>|show <id> [page]|page <n>|remove <id>",
+      async execute(args, ctx) {
         const sub = args[0];
         if (sub === "new") {
           const provider = ctx.getCurrentProvider();
@@ -1391,10 +1417,10 @@ No commands match "${filter}".
               s.title ?? "(untitled)"
             ])
           );
-        } else if (sub === "load") {
+        } else if (sub === "load" || sub === "show") {
           const id = args[1];
           if (!id) {
-            ctx.renderer.renderError("Usage: /session load <id>");
+            ctx.renderer.renderError(`Usage: /session ${sub} <id>${sub === "show" ? " [page]" : ""}`);
             return;
           }
           const sessions = ctx.sessions.listSessions();
@@ -1416,8 +1442,70 @@ No commands match "${filter}".
           ctx.renderer.printSuccess(
             `Loaded session ${match.id.slice(0, 8)}: ${match.title ?? "(untitled)"}`
           );
+          if (sub === "show") {
+            const pageArg = args[2] !== void 0 ? Number.parseInt(args[2], 10) : void 0;
+            const cur = ctx.sessions.current;
+            if (cur) renderTranscriptPage(cur.messages, ctx.renderer, pageArg);
+          }
+        } else if (sub === "page") {
+          const cur = ctx.sessions.current;
+          if (!cur) {
+            ctx.renderer.renderError("No active session. Use /session show <id> first.");
+            return;
+          }
+          const n = Number.parseInt(args[1] ?? "", 10);
+          if (Number.isNaN(n)) {
+            ctx.renderer.renderError("Usage: /session page <n>");
+            return;
+          }
+          renderTranscriptPage(cur.messages, ctx.renderer, n);
+        } else if (sub === "remove" || sub === "delete") {
+          const id = args[1];
+          if (!id) {
+            ctx.renderer.renderError("Usage: /session remove <id>");
+            return;
+          }
+          const sessions = ctx.sessions.listSessions();
+          const matches2 = sessions.filter((s) => s.id.startsWith(id));
+          if (matches2.length === 0) {
+            ctx.renderer.renderError(`Session '${id}' not found.`);
+            return;
+          }
+          if (matches2.length > 1) {
+            ctx.renderer.renderError(`Ambiguous prefix '${id}' matches ${matches2.length} sessions \u2014 be more specific:`);
+            for (const m of matches2.slice(0, 10)) {
+              console.log(theme.dim(`    ${m.id.slice(0, 12)}  ${String(m.messageCount).padStart(4)} msgs  ${m.updated.toLocaleDateString()}  ${m.title ?? "(untitled)"}`));
+            }
+            return;
+          }
+          const match = matches2[0];
+          const isCurrent = ctx.sessions.current?.id === match.id;
+          console.log();
+          console.log(theme.warning("  About to permanently delete session (no undo):"));
+          console.log(`    ${theme.info(match.id.slice(0, 12))}  ${match.provider}/${match.model}  ${match.messageCount} messages  ${match.updated.toLocaleDateString()}`);
+          console.log(`    ${match.title ?? "(untitled)"}${isCurrent ? theme.warning("   \u2190 current session") : ""}`);
+          console.log();
+          const choice = await ctx.select("Delete this session?", [
+            { label: "No \u2014 keep it", value: "no" },
+            { label: "Yes \u2014 delete permanently", value: "yes", hint: "unlinks the history file" }
+          ]);
+          if (choice !== "yes") {
+            ctx.renderer.printInfo("Cancelled \u2014 session kept.");
+            return;
+          }
+          if (!ctx.sessions.deleteSession(match.id)) {
+            ctx.renderer.renderError("Delete failed \u2014 session file not found on disk.");
+            return;
+          }
+          ctx.renderer.printSuccess(`Deleted session ${match.id.slice(0, 8)}: ${match.title ?? "(untitled)"}`);
+          if (isCurrent) {
+            ctx.sessions.createSession(ctx.getCurrentProvider(), ctx.getCurrentModel());
+            ctx.resetSessionTokenUsage();
+            ctx.clearDevState();
+            ctx.renderer.printInfo("Current session was deleted \u2014 started a fresh session.");
+          }
         } else {
-          ctx.renderer.renderError("Usage: /session new|list|load <id>");
+          ctx.renderer.renderError("Usage: /session new|list|load <id>|show <id> [page]|page <n>|remove <id>");
         }
       }
     },
@@ -1786,7 +1874,7 @@ No tools match "${filter}".
           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-FGPUBYCX.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-JI7VPTMJ.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-IFM7FXEV.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -2847,7 +2935,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-QFTKAWW6.js");
+          const { executeTests } = await import("./run-tests-GFOHEIWM.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -4694,17 +4782,8 @@ ${content}
   parts.push(...imageParts);
   return { parts, hasImage: imageParts.length > 0, refs };
 }
-var FREE_ROUND_TOOLS = /* @__PURE__ */ new Set(["write_todos"]);
-var MAX_CONSECUTIVE_FREE_ROUNDS = 3;
 var MAX_REPEATED_TOOL_CALLS = 2;
 var DEFAULT_AUTO_PAUSE_INTERVAL = 50;
-function partialTagTail2(s, tag) {
-  const max = Math.min(s.length, tag.length - 1);
-  for (let k = max; k > 0; k--) {
-    if (s.endsWith(tag.slice(0, k))) return k;
-  }
-  return 0;
-}
 function fmtTokens(n) {
   if (n >= 1e6) return `${Math.round(n / 1e5) / 10}M`;
   if (n >= 1e3) return `${Math.round(n / 1024)}K`;
@@ -6407,14 +6486,12 @@ Session '${this.resumeSessionId}' not found.
   /**
    * 消费流式工具调用事件生成器，实时渲染文本内容和工具名称，
    * 累积完整工具调用参数后返回结构化结果。
+   *
+   * v0.4.181: 累积与决策（<think> 折叠 / 截断 JSON 修复 / done 守卫 /
+   * index 键累积）委托给 core/agent-loop 的统一消费器（与 Web 端同一实现），
+   * 此处只保留终端呈现（spinner / theme 渲染）。
    */
   async consumeToolStream(stream, spinner) {
-    const textParts = [];
-    const toolCallAccumulators = /* @__PURE__ */ new Map();
-    let usage;
-    let rawContent;
-    let reasoningContent;
-    let finishReason;
     let spinnerStopped = false;
     const stopSpinner = () => {
       if (!spinnerStopped) {
@@ -6422,135 +6499,36 @@ Session '${this.resumeSessionId}' not found.
         spinnerStopped = true;
       }
     };
-    let inThink = false;
-    let thinkShown = false;
-    let thinkBuf = "";
-    const emitText = (raw) => {
-      thinkBuf += raw;
-      let out = "";
-      while (thinkBuf.length > 0) {
-        if (!inThink) {
-          const open = thinkBuf.indexOf("<think>");
-          if (open === -1) {
-            const keep = partialTagTail2(thinkBuf, "<think>");
-            out += thinkBuf.slice(0, thinkBuf.length - keep);
-            thinkBuf = thinkBuf.slice(thinkBuf.length - keep);
-            break;
-          }
-          out += thinkBuf.slice(0, open);
-          thinkBuf = thinkBuf.slice(open + "<think>".length);
-          inThink = true;
-          thinkShown = true;
-        } else {
-          const close = thinkBuf.indexOf("</think>");
-          if (close === -1) {
-            const keep = partialTagTail2(thinkBuf, "</think>");
-            thinkBuf = thinkBuf.slice(thinkBuf.length - keep);
-            break;
-          }
-          thinkBuf = thinkBuf.slice(close + "</think>".length);
-          inThink = false;
-        }
-      }
-      if (out) {
-        process.stdout.write(out);
-        textParts.push(out);
-      }
-    };
-    try {
-      for await (const event of stream) {
-        switch (event.type) {
-          case "text_delta":
-            stopSpinner();
-            emitText(event.delta);
-            break;
-          case "thinking_start":
-            stopSpinner();
-            process.stdout.write(theme.dim("<think>"));
-            break;
-          case "thinking_delta":
-            break;
-          case "thinking_end":
-            process.stdout.write(theme.dim("</think>"));
-            break;
-          case "tool_call_start":
-            stopSpinner();
-            process.stdout.write(
-              theme.dim(`
-\u2699 Streaming: `) + theme.toolCall(event.name) + theme.dim("...\n")
-            );
-            toolCallAccumulators.set(event.index, {
-              id: event.id,
-              name: event.name,
-              arguments: ""
-            });
-            break;
-          case "tool_call_delta": {
-            const acc = toolCallAccumulators.get(event.index);
-            if (acc) {
-              acc.arguments += event.argumentsDelta;
-            }
-            break;
-          }
-          case "tool_call_end":
-            break;
-          case "done":
-            if (event.usage) usage = event.usage;
-            if (event.rawContent) rawContent = event.rawContent;
-            if (event.reasoningContent) reasoningContent = event.reasoningContent;
-            if (event.finishReason) finishReason = event.finishReason;
-            break;
-        }
-      }
-    } catch (err) {
-      if (err instanceof Error && (err.name === "AbortError" || err.message.includes("aborted"))) {
+    const result = await consumeToolCallStream(stream, {
+      onText: (visible) => {
         stopSpinner();
-        process.stdout.write(theme.dim("\n[interrupted]\n"));
-        return {
-          textContent: textParts.join(""),
-          toolCalls: [],
-          usage,
-          rawContent,
-          reasoningContent,
-          finishReason
-        };
-      }
-      throw err;
-    }
-    if (!inThink && thinkBuf) {
-      process.stdout.write(thinkBuf);
-      textParts.push(thinkBuf);
-      thinkBuf = "";
-    }
-    const toolCalls = [];
-    for (const [, acc] of toolCallAccumulators) {
-      let parsedArgs;
-      try {
-        parsedArgs = JSON.parse(acc.arguments || "{}");
-      } catch {
-        const truncated = acc.arguments.trimEnd();
-        const lastComma = truncated.lastIndexOf(",");
-        const fixed = lastComma > 0 ? truncated.slice(0, lastComma) + "}" : truncated.slice(0, truncated.indexOf("{") + 1) + "}";
-        try {
-          parsedArgs = JSON.parse(fixed);
-        } catch {
-          parsedArgs = {};
-        }
+        process.stdout.write(visible);
+      },
+      onThinkingStart: () => {
+        stopSpinner();
+        process.stdout.write(theme.dim("<think>"));
+      },
+      // thinking_delta 内容折叠，不显示详情（与现有行为一致）
+      onThinkingEnd: () => {
+        process.stdout.write(theme.dim("</think>"));
+      },
+      onToolCallStart: (_index, _id, name) => {
+        stopSpinner();
+        process.stdout.write(
+          theme.dim(`
+\u2699 Streaming: `) + theme.toolCall(name) + theme.dim("...\n")
+        );
+      },
+      onWarn: (message) => {
+        process.stderr.write(`[warn] ${message}
+`);
       }
-      toolCalls.push({
-        id: acc.id,
-        name: acc.name,
-        arguments: parsedArgs
-      });
+    });
+    if (result.aborted) {
+      stopSpinner();
+      process.stdout.write(theme.dim("\n[interrupted]\n"));
     }
-    return {
-      textContent: textParts.join(""),
-      toolCalls,
-      usage,
-      rawContent,
-      reasoningContent,
-      finishReason
-    };
+    return result;
   }
   async handleChatWithTools(provider, messages, modelOverride) {
     const session = this.sessions.current;
@@ -6592,25 +6570,7 @@ Session '${this.resumeSessionId}' not found.
     const autoPauseIntervalRaw = this.config.get("autoPauseInterval");
     const autoPauseInterval = typeof autoPauseIntervalRaw === "number" ? autoPauseIntervalRaw : DEFAULT_AUTO_PAUSE_INTERVAL;
     const { stable: toolStable, volatile: toolVolatile } = this.buildCurrentSystemPrompt();
-    const pauseHint = autoPauseInterval > 0 ? `
-- Every ${autoPauseInterval} rounds the user will be asked whether to continue \u2014 use this as a natural checkpoint to report progress.` : "";
-    const roundBudgetHint = this.planMode ? `
-
-[Tool Round Budget \u2014 Plan Mode]
-You have a maximum of ${maxToolRounds} tool call rounds. You are in READ-ONLY Plan Mode:
-- Only use: read_file, list_dir, grep_files, glob_files, ask_user, write_todos
-- Do NOT attempt to call bash, write_file, edit_file \u2014 they are disabled
-- Do NOT write shell commands or code blocks as a substitute for tool calls
-- Do NOT read the same file more than once
-- Call write_todos ONCE to present your plan, then give a text summary
-- If the user asks you to execute anything, respond: "Please type /plan execute to switch to execute mode."${pauseHint}` : `
-
-[Tool Round Budget]
-You have a maximum of ${maxToolRounds} tool call rounds for this task. Plan efficiently:
-- Prefer batch operations (e.g. global find-and-replace) over repetitive single edits.
-- Do NOT read the same file more than once \u2014 use the content from previous reads.
-- Prioritize the most critical tasks first in case rounds run out.
-- When remaining rounds are low, focus on completing the current task and summarizing.${pauseHint}`;
+    const roundBudgetHint = buildRoundBudgetHint({ maxToolRounds, autoPauseInterval, planMode: this.planMode });
     const systemPrompt = toolStable + TOOL_CALL_REMINDER + roundBudgetHint + (mcpBudgetNote ? `
 
 ${mcpBudgetNote}` : "");
@@ -6620,22 +6580,15 @@ ${mcpBudgetNote}` : "");
     const spinner = this.renderer.showSpinner("Thinking...");
     const roundUsage = { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
     const supportsStreamingTools = useStreaming && typeof provider.chatWithToolsStream === "function";
-    let consecutiveFreeRounds = 0;
     let lastToolCallSignature = "";
     let repeatedToolCallCount = 0;
-    let emptyResponseRetries = 0;
-    let warnedCtx80 = false;
     const roundToolHistory = [];
+    const budgetWarner = new BudgetWarner(maxToolRounds);
+    const emptyGuard = new EmptyResponseGuard();
+    const ctxMonitor = new ContextPressureMonitor();
+    const freeRounds = new FreeRoundTracker();
     this.setupInterjectionListener();
     try {
-      const warnNoteAt = Math.max(10, Math.floor(maxToolRounds * 0.2));
-      const warnLowAt = Math.max(5, Math.floor(maxToolRounds * 0.1));
-      const warnCriticalAt = Math.max(3, Math.floor(maxToolRounds * 0.05));
-      const warnLowEff = Math.min(warnLowAt, warnNoteAt - 1);
-      const warnCriticalEff = Math.min(warnCriticalAt, warnLowEff - 1);
-      let warnedNote = false;
-      let warnedLow = false;
-      let warnedCritical = false;
       for (let round = 0; round < maxToolRounds; round++) {
         this.toolExecutor.setRoundInfo(round + 1, maxToolRounds);
         if (this.toolExecutor.pendingSlashCommand) {
@@ -6652,29 +6605,14 @@ ${mcpBudgetNote}` : "");
 `));
           extraMessages.push({ role: "user", content: cmd });
         }
-        const roundsLeft = maxToolRounds - round;
-        if (!warnedCritical && roundsLeft <= warnCriticalEff) {
-          warnedCritical = true;
-          extraMessages.push({
-            role: "user",
-            content: `\u{1F6A8} Critical budget: Only ${roundsLeft} rounds left! Wrap up NOW \u2014 complete the current operation and give a final summary. Do NOT start new tasks.`
-          });
-          process.stdout.write(theme.error(`  \u{1F6A8} Critical: ${roundsLeft} rounds remaining
-`));
-        } else if (!warnedLow && roundsLeft <= warnLowEff) {
-          warnedLow = true;
-          extraMessages.push({
-            role: "user",
-            content: `\u26A0\uFE0F Budget warning: Only ${roundsLeft} tool rounds remaining. Prioritize completing the most critical task. Use efficient approaches (batch edits, fewer reads). If you cannot finish everything, summarize what's done and what remains.`
-          });
-          process.stdout.write(theme.warning(`  \u26A0\uFE0F Low budget: ${roundsLeft} rounds remaining
+        const budgetWarning = budgetWarner.check(maxToolRounds - round);
+        if (budgetWarning) {
+          extraMessages.push({ role: "user", content: budgetWarning.injectMessage });
+          if (budgetWarning.displayMessage) {
+            const paint = budgetWarning.level === "critical" ? theme.error : theme.warning;
+            process.stdout.write(paint(`  ${budgetWarning.displayMessage}
 `));
-        } else if (!warnedNote && roundsLeft <= warnNoteAt) {
-          warnedNote = true;
-          extraMessages.push({
-            role: "user",
-            content: `\u{1F4CA} Budget note: ${roundsLeft} tool rounds remaining out of ${maxToolRounds}. Plan your remaining work efficiently \u2014 use batch operations (e.g., replaceAll) when possible.`
-          });
+          }
         }
         if (this._userInterjection) {
           const msg = this._userInterjection;
@@ -6686,13 +6624,13 @@ ${mcpBudgetNote}` : "");
         const ctxWindow = this.getContextWindowSize();
         if (ctxWindow > 0) {
           const reqTokens = this.estimateRequestTokens(systemPrompt, extraMessages);
-          const reqRatio = reqTokens / ctxWindow;
-          if (reqRatio >= 0.95) {
+          const pressure = ctxMonitor.check(reqTokens, ctxWindow);
+          if (pressure.action === "abort") {
             spinner.stop();
             process.stderr.write(
               theme.error(
                 `
-\u26A0 Context at ${Math.round(reqRatio * 100)}% of ${fmtTokens(ctxWindow)} \u2014 aborting agentic loop before API rejection.
+\u26A0 Context at ${Math.round(pressure.ratio * 100)}% of ${fmtTokens(ctxWindow)} \u2014 aborting agentic loop before API rejection.
 `
               )
             );
@@ -6712,20 +6650,16 @@ ${mcpBudgetNote}` : "");
               }
             }
             return;
-          } else if (reqRatio >= 0.8 && !warnedCtx80) {
-            warnedCtx80 = true;
+          } else if (pressure.action === "warn") {
             spinner.stop();
             process.stdout.write(
               theme.warning(
                 `
-\u26A0 Context at ${Math.round(reqRatio * 100)}% of ${fmtTokens(ctxWindow)} \u2014 asking AI to wrap up.
+\u26A0 Context at ${Math.round(pressure.ratio * 100)}% of ${fmtTokens(ctxWindow)} \u2014 asking AI to wrap up.
 `
               )
             );
-            extraMessages.push({
-              role: "user",
-              content: `\u26A0\uFE0F Context pressure: ~${Math.round(reqRatio * 100)}% of the ${fmtTokens(ctxWindow)} context window is used. Avoid reading more files or running broad scans. Finish the current critical step, then produce a final summary. Every unnecessary tool call now risks breaking the conversation.`
-            });
+            extraMessages.push({ role: "user", content: pressure.injectMessage });
             spinner.start(`Thinking... (round ${round + 1}/${maxToolRounds})`);
           }
         }
@@ -6797,12 +6731,7 @@ ${mcpBudgetNote}` : "");
             (p, m) => p.chatWithTools({ ...chatRequest, model: m }, toolDefs)
           );
         }
-        if (result.usage) {
-          roundUsage.inputTokens += result.usage.inputTokens;
-          roundUsage.outputTokens += result.usage.outputTokens;
-          roundUsage.cacheCreationTokens += result.usage.cacheCreationTokens ?? 0;
-          roundUsage.cacheReadTokens += result.usage.cacheReadTokens ?? 0;
-        }
+        accumulateUsage(roundUsage, result.usage);
         if ("content" in result) {
           const hasWriteTools = toolDefs.some((t) => t.name === "write_file" || t.name === "edit_file");
           const alreadyWrote = hadPreviousWriteToolCalls(extraMessages);
@@ -6831,32 +6760,25 @@ ${mcpBudgetNote}` : "");
           }
           if (!result.content || result.content.trim() === "") {
             const fr = "finishReason" in result ? result.finishReason : void 0;
-            const reasonLabel = fr === "length" ? "output limit reached (finish_reason=length)" : fr === "content_filter" ? "content blocked (finish_reason=content_filter)" : fr ? `empty response (finish_reason=${fr})` : "empty response";
-            if (emptyResponseRetries === 0 && round < maxToolRounds - 1) {
-              emptyResponseRetries++;
+            const decision = emptyGuard.onEmpty(round < maxToolRounds - 1, fr);
+            if (decision.action === "nudge") {
               spinner.stop();
               if (alreadyRendered) process.stdout.write("\n");
-              process.stderr.write(
-                theme.warning(`\u26A0 ${reasonLabel} \u2014 nudging AI to continue...
-`)
-              );
-              extraMessages.push({
-                role: "user",
-                content: "Your previous response was empty \u2014 no text and no tool calls. This usually means the context window is nearly full. Please either: (1) continue the task by calling the next tool you need, or (2) give a concise final text summary of what has been accomplished so far and what remains. Do NOT repeat earlier long outputs."
-              });
+              process.stderr.write(theme.warning(`${decision.displayMessage}
+`));
+              extraMessages.push({ role: "user", content: decision.injectMessage });
               spinner.start(`Retrying... (round ${round + 2}/${maxToolRounds})`);
               continue;
             }
             spinner.stop();
             if (alreadyRendered) process.stdout.write("\n");
-            const frHint = fr === "length" ? "Output token limit hit \u2014 try /compact to reduce context, raise maxTokens, or /model to switch." : fr === "content_filter" ? "Content was blocked by the provider filter." : "Context window may be exhausted or max_tokens too low.";
             process.stderr.write(
               theme.error(`
-\u26A0 AI returned empty responses twice in a row. Stopping agentic loop.
+${decision.displayMessage}
 `)
             );
             process.stderr.write(
-              theme.dim(`  ${frHint}
+              theme.dim(`  ${decision.hint}
   Try: /compact, /clear, or /model to switch.
 
 `)
@@ -6870,7 +6792,7 @@ ${mcpBudgetNote}` : "");
             }
             return;
           }
-          emptyResponseRetries = 0;
+          emptyGuard.onNonEmpty();
           spinner.stop();
           const finalContent = result.content;
           if (!alreadyRendered) {
@@ -7181,14 +7103,8 @@ ${systemPromptVolatile}` : systemPrompt;
             });
           }
         }
-        const allFree = result.toolCalls.every((tc) => FREE_ROUND_TOOLS.has(tc.name));
-        if (allFree) {
-          consecutiveFreeRounds++;
-          if (consecutiveFreeRounds <= MAX_CONSECUTIVE_FREE_ROUNDS) {
-            round--;
-          }
-        } else {
-          consecutiveFreeRounds = 0;
+        if (freeRounds.apply(result.toolCalls.map((tc) => tc.name))) {
+          round--;
         }
         const currentSignature = result.toolCalls.map((tc) => `${tc.name}:${JSON.stringify(tc.arguments)}`).join("|");
         if (currentSignature === lastToolCallSignature) {
@@ -7226,15 +7142,8 @@ ${systemPromptVolatile}` : systemPrompt;
           process.stdout.write("\n");
           process.stdout.write(theme.warning(`\u23F8  Auto-pause: ${effectiveRound}/${maxToolRounds} rounds used, ${remaining} remaining
 `));
-          const recentHistory = roundToolHistory.slice(-autoPauseInterval);
-          if (recentHistory.length > 0) {
-            const toolCounts = /* @__PURE__ */ new Map();
-            for (const rh of recentHistory) {
-              for (const t of rh.tools) {
-                toolCounts.set(t, (toolCounts.get(t) || 0) + 1);
-              }
-            }
-            const summary = [...toolCounts.entries()].sort((a, b) => b[1] - a[1]).map(([name, count]) => count > 1 ? `${name}\xD7${count}` : name).join(", ");
+          const summary = summarizeRecentTools(roundToolHistory, autoPauseInterval);
+          if (summary) {
             process.stdout.write(theme.dim(`  Tools used: ${summary}
 `));
           }
@@ -7253,10 +7162,7 @@ ${systemPromptVolatile}` : systemPrompt;
           this.setupInterjectionListener();
           if (pauseResponse === "n" || pauseResponse === "N" || pauseResponse === "\x1B") {
             process.stdout.write(theme.warning("\u26A1 Stopped by user at auto-pause checkpoint\n"));
-            extraMessages.push({
-              role: "user",
-              content: `The user has stopped the task at round ${effectiveRound}/${maxToolRounds}. Do not call any more tools. Summarize what has been completed and what remains.`
-            });
+            extraMessages.push({ role: "user", content: buildUserStopMessage(effectiveRound, maxToolRounds) });
             break;
           } else if (pauseResponse && pauseResponse !== "y" && pauseResponse !== "Y" && pauseResponse !== "") {
             process.stdout.write(theme.warning(`\u26A1 Redirect: "${pauseResponse}"
@@ -7276,13 +7182,7 @@ ${systemPromptVolatile}` : systemPrompt;
         spinner.start("Generating summary...");
         const summaryExtra = [
           ...extraMessages,
-          {
-            role: "user",
-            content: `You have used all ${maxToolRounds} tool call rounds. Do not call any more tools. Summarize in text:
-1. What work has been completed so far
-2. What tasks remain unfinished
-3. What the user can do next (e.g. send another request to continue)`
-          }
+          { role: "user", content: buildRoundsExhaustedPrompt(maxToolRounds) }
         ];
         const summaryResult = await provider.chatWithTools(
           {
@@ -7633,7 +7533,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-KT6GRCM7.js");
+  const { startWebServer } = await import("./server-2CBNRT2W.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) => {
@@ -7800,12 +7700,12 @@ program.command("sessions").description("List recent conversation sessions").opt
   console.log(footer + "\n");
 });
 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-C54OKMG2.js");
+  const { runDoctorCli } = await import("./doctor-cli-KSB3MLFV.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-OJJI6TKB.js");
+    const batch = await import("./batch-ZBKVDSMZ.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7848,7 +7748,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-I6Y5TP2Z.js");
+  const { startMcpServer } = await import("./server-TXA5VTOS.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7857,7 +7757,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-EBN6VQ2Z.js");
+  const { runCi } = await import("./ci-6WGF6ID6.js");
   const result = await runCi({
     pr: options.pr,
     base: options.base,
@@ -8002,7 +7902,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-YVNTGDKW.js");
+  const { startHub } = await import("./hub-DGEYFJPP.js");
   await startHub(
     {
       topic: topic ?? "",