jinzd-ai-cli 0.4.59 → 0.4.61

package/dist/{chunk-NXSYL5OP.js → chunk-2WGVM2J2.js}

@@ -6,8 +6,9 @@ import {
   ProviderError,
   ProviderNotFoundError,
   RateLimitError,
-  schemaToJsonSchema
-} from "./chunk-7RX7675B.js";
+  schemaToJsonSchema,
+  truncateForPersist
+} from "./chunk-2ZCD5F4X.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -20,7 +21,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-YJCJBUOG.js";
+} from "./chunk-GA74LZ62.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
@@ -309,9 +310,12 @@ var BaseProvider = class {
   /**
    * 将 Message[] 转换为 OpenAI API 格式的消息数组。
    * content 为 string 时直接传递；为 MessageContentPart[] 时保留数组格式（vision 请求）。
+   *
+   * 自动跳过 role='tool' 和带 toolCalls 的 assistant 消息——
+   * 这些是 v0.4.60+ 持久化的工具历史，由 _extraMessages 机制单独注入。
    */
   normalizeMessages(messages) {
-    return messages.map((m) => ({ role: m.role, content: m.content }));
+    return messages.filter((m) => m.role !== "tool" && !m.toolCalls).map((m) => ({ role: m.role, content: m.content }));
   }
 };
 
@@ -475,7 +479,7 @@ var ClaudeProvider = class extends BaseProvider {
   }
   async chat(request) {
     try {
-      const messages = request.messages.filter((m) => m.role !== "system").map((m) => ({
+      const messages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
         role: m.role,
         content: this.contentToClaudeParts(m.content)
       }));
@@ -500,7 +504,7 @@ var ClaudeProvider = class extends BaseProvider {
   }
   async *chatStream(request) {
     try {
-      const messages = request.messages.filter((m) => m.role !== "system").map((m) => ({
+      const messages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
         role: m.role,
         content: this.contentToClaudeParts(m.content)
       }));
@@ -557,7 +561,7 @@ var ClaudeProvider = class extends BaseProvider {
           }
         }))
       );
-      const baseMessages = request.messages.filter((m) => m.role !== "system").map((m) => ({ role: m.role, content: this.contentToClaudeParts(m.content) }));
+      const baseMessages = request.messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({ role: m.role, content: this.contentToClaudeParts(m.content) }));
       const extraMessages = request._extraMessages ?? [];
       const allMessages = [...baseMessages, ...extraMessages];
       const { thinking, temperature } = this.buildThinkingParams(request);
@@ -869,7 +873,7 @@ var GeminiProvider = class extends BaseProvider {
     return parts.length > 0 ? parts : [{ text: "" }];
   }
   toGeminiHistory(messages) {
-    return messages.filter((m) => m.role !== "system").map((m) => ({
+    return messages.filter((m) => m.role !== "system" && m.role !== "tool" && !m.toolCalls).map((m) => ({
       role: m.role === "assistant" ? "model" : "user",
       parts: this.contentToGeminiParts(m.content)
     }));
@@ -2521,10 +2525,19 @@ var Session = class _Session {
         messageIndex: c.messageIndex,
         timestamp: c.timestamp.toISOString()
       })),
-      messages: this.messages.map((m) => ({
-        ...m,
-        timestamp: m.timestamp.toISOString()
-      }))
+      messages: this.messages.map((m) => {
+        const out = {
+          role: m.role,
+          content: m.content,
+          timestamp: m.timestamp.toISOString()
+        };
+        if (m.toolCalls) out.toolCalls = m.toolCalls;
+        if (m.reasoningContent !== void 0) out.reasoningContent = m.reasoningContent;
+        if (m.toolCallId) out.toolCallId = m.toolCallId;
+        if (m.toolName) out.toolName = m.toolName;
+        if (m.isError !== void 0) out.isError = m.isError;
+        return out;
+      })
     };
   }
   /**
@@ -2594,11 +2607,17 @@ var Session = class _Session {
     }
     session.messages = d.messages.map((m) => {
       const ts = new Date(m.timestamp);
-      return {
+      const msg = {
         role: m.role ?? "user",
-        content: m.content,
+        content: Array.isArray(m.content) ? m.content : String(m.content ?? ""),
         timestamp: isNaN(ts.getTime()) ? /* @__PURE__ */ new Date() : ts
       };
+      if (Array.isArray(m.toolCalls)) msg.toolCalls = m.toolCalls;
+      if (typeof m.reasoningContent === "string") msg.reasoningContent = m.reasoningContent;
+      if (typeof m.toolCallId === "string") msg.toolCallId = m.toolCallId;
+      if (typeof m.toolName === "string") msg.toolName = m.toolName;
+      if (typeof m.isError === "boolean") msg.isError = m.isError;
+      return msg;
     });
     return session;
   }
@@ -3667,6 +3686,89 @@ function formatCost(amount) {
   return `$${amount.toFixed(2)}`;
 }
 
+// src/session/tool-history.ts
+function persistToolRound(session, toolCalls, toolResults, opts) {
+  session.addMessage({
+    role: "assistant",
+    content: opts?.assistantContent ?? "",
+    toolCalls,
+    reasoningContent: opts?.reasoningContent,
+    timestamp: /* @__PURE__ */ new Date()
+  });
+  for (let i = 0; i < toolCalls.length; i++) {
+    const tc = toolCalls[i];
+    const tr = toolResults[i];
+    if (!tr) continue;
+    session.addMessage({
+      role: "tool",
+      content: truncateForPersist(tr.content),
+      toolCallId: tr.callId,
+      toolName: tc.name,
+      isError: tr.isError,
+      timestamp: /* @__PURE__ */ new Date()
+    });
+  }
+}
+function isToolMessage(m) {
+  return m.role === "tool" || !!(m.toolCalls && m.toolCalls.length > 0);
+}
+function extractToolHistory(messages) {
+  const baseMessages = [];
+  const toolHistory = [];
+  for (const m of messages) {
+    if (isToolMessage(m)) {
+      toolHistory.push(m);
+    } else {
+      baseMessages.push(m);
+    }
+  }
+  return { baseMessages, toolHistory };
+}
+function rebuildExtraMessages(provider, toolHistory) {
+  if (toolHistory.length === 0) return [];
+  const result = [];
+  let i = 0;
+  while (i < toolHistory.length) {
+    const msg = toolHistory[i];
+    if (msg.role === "assistant" && msg.toolCalls && msg.toolCalls.length > 0) {
+      const toolCalls = msg.toolCalls;
+      const toolResults = [];
+      let j = i + 1;
+      while (j < toolHistory.length && toolHistory[j].role === "tool") {
+        const tm = toolHistory[j];
+        toolResults.push({
+          callId: tm.toolCallId ?? "",
+          content: typeof tm.content === "string" ? tm.content : getContentText(tm.content),
+          isError: tm.isError ?? false
+        });
+        j++;
+      }
+      result.push(
+        ...provider.buildToolResultMessages(toolCalls, toolResults, msg.reasoningContent)
+      );
+      i = j;
+    } else {
+      result.push({
+        role: msg.role,
+        content: typeof msg.content === "string" ? msg.content : getContentText(msg.content)
+      });
+      i++;
+    }
+  }
+  return result;
+}
+
+// src/core/token-estimator.ts
+var CJK_REGEX = /[\u2E80-\u9FFF\uA000-\uA4FF\uAC00-\uD7FF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF]/g;
+function estimateTokens(text) {
+  if (!text) return 0;
+  const cjkMatches = text.match(CJK_REGEX);
+  const cjkCount = cjkMatches ? cjkMatches.length : 0;
+  const nonCjkCount = text.length - cjkCount;
+  const tokens = cjkCount * 1.5 + nonCjkCount * 0.25;
+  return Math.ceil(tokens) + 4;
+}
+
 // src/repl/dev-state.ts
 import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync3, unlinkSync as unlinkSync2, mkdirSync as mkdirSync4 } from "fs";
 import { join as join5 } from "path";
@@ -3777,6 +3879,10 @@ export {
   computeCost,
   formatCost,
   parseSimpleYaml,
+  persistToolRound,
+  extractToolHistory,
+  rebuildExtraMessages,
+  estimateTokens,
   SNAPSHOT_PROMPT,
   sessionHasMeaningfulContent,
   saveDevState,

package/dist/{chunk-7RX7675B.js → chunk-2ZCD5F4X.js}

@@ -10,7 +10,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-YJCJBUOG.js";
+} from "./chunk-GA74LZ62.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";
@@ -1098,6 +1098,20 @@ function snapToLineBoundary(content, target, direction) {
     return target;
   }
 }
+var PERSIST_MAX_CHARS = 8192;
+function truncateForPersist(content, maxChars = PERSIST_MAX_CHARS) {
+  if (content.length <= maxChars) return content;
+  const headSize = Math.floor(maxChars * 0.7);
+  const tailSize = Math.floor(maxChars * 0.2);
+  const head = content.slice(0, headSize);
+  const tail = content.slice(-tailSize);
+  const omitted = content.length - headSize - tailSize;
+  return `${head}
+
+[... ${omitted} chars omitted for storage ...]
+
+${tail}`;
+}
 function truncateOutput(content, toolName, maxChars) {
   const limit = maxChars ?? activeMaxChars;
   if (content.length <= limit) return content;
@@ -4208,6 +4222,7 @@ export {
   checkPermission,
   setMaxOutputCap,
   setContextWindow,
+  truncateForPersist,
   truncateOutput,
   ToolExecutor,
   lastResponseStore,

package/dist/{chunk-YJCJBUOG.js → chunk-GA74LZ62.js}

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

package/dist/{chunk-F5WLEWN2.js → chunk-QUD2AVHH.js}

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

package/dist/{hub-3BY5W4VE.js → hub-WA2DZCSQ.js}

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

package/dist/index.js

@@ -13,6 +13,8 @@ import {
   clearDevState,
   computeCost,
   detectsHallucinatedFileOp,
+  estimateTokens,
+  extractToolHistory,
   extractWrittenFilePaths,
   findPhantomClaims,
   formatCost,
@@ -24,10 +26,12 @@ import {
   hadPreviousWriteToolCalls,
   loadDevState,
   parseSimpleYaml,
+  persistToolRound,
+  rebuildExtraMessages,
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-NXSYL5OP.js";
+} from "./chunk-2WGVM2J2.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -41,7 +45,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-7RX7675B.js";
+} from "./chunk-2ZCD5F4X.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -66,7 +70,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-YJCJBUOG.js";
+} from "./chunk-GA74LZ62.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -2161,7 +2165,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-IW6GHAVV.js");
+          const { executeTests } = await import("./run-tests-CT4PRGGP.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -4396,7 +4400,7 @@ Session '${this.resumeSessionId}' not found.
    * 混合 CJK / ASCII 文本平均约 2.5 字符 = 1 token（与 renderer.ts 中的估算公式一致）。
    */
   estimateTokens(text) {
-    return Math.ceil(text.length / 2.5);
+    return estimateTokens(text);
   }
   /**
    * 估算当前对话的总 token 消耗（system prompt + 所有 session messages）。
@@ -4415,6 +4419,11 @@ Session '${this.resumeSessionId}' not found.
             if (part.type === "text" && part.text) total += this.estimateTokens(part.text);
           }
         }
+        if (msg.toolCalls) {
+          for (const tc of msg.toolCalls) {
+            total += this.estimateTokens(JSON.stringify(tc.arguments));
+          }
+        }
       }
     }
     return total;
@@ -4869,8 +4878,9 @@ Session '${this.resumeSessionId}' not found.
     if (this.blockedTools) {
       toolDefs = toolDefs.filter((t) => !this.blockedTools.has(t.name));
     }
-    const apiMessages = [...messages];
-    const extraMessages = [];
+    const { baseMessages: cleanMessages, toolHistory } = extractToolHistory(messages);
+    const apiMessages = [...cleanMessages];
+    const extraMessages = toolHistory.length > 0 ? rebuildExtraMessages(provider, toolHistory) : [];
     const maxToolRounds = this.maxToolRoundsOverride ?? this.config.get("maxToolRounds") ?? DEFAULT_MAX_TOOL_ROUNDS;
     const autoPauseIntervalRaw = this.config.get("autoPauseInterval");
     const autoPauseInterval = typeof autoPauseIntervalRaw === "number" ? autoPauseIntervalRaw : DEFAULT_AUTO_PAUSE_INTERVAL;
@@ -5260,6 +5270,11 @@ You have a maximum of ${maxToolRounds} tool call rounds for this task. Plan effi
         const reasoningContent = "reasoningContent" in result ? result.reasoningContent : void 0;
         const newMsgs = provider.buildToolResultMessages(result.toolCalls, toolResults, reasoningContent);
         extraMessages.push(...newMsgs);
+        const streamedContent = "content" in result ? result.content : void 0;
+        persistToolRound(session, result.toolCalls, toolResults, {
+          assistantContent: streamedContent,
+          reasoningContent
+        });
         const thisRoundHadWrite = result.toolCalls.some(
           (tc) => tc.name === "write_file" || tc.name === "edit_file"
         );
@@ -5695,7 +5710,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-J7PNU32E.js");
+  const { startWebServer } = await import("./server-YJWIPDF2.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> | migrate <name>)").action(async (action, username) => {
@@ -5928,7 +5943,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-3BY5W4VE.js");
+  const { startHub } = await import("./hub-WA2DZCSQ.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-OT3MSOUF.js → run-tests-672N6ZKM.js}

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

package/dist/{run-tests-IW6GHAVV.js → run-tests-CT4PRGGP.js}

@@ -2,7 +2,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-YJCJBUOG.js";
+} from "./chunk-GA74LZ62.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-J7PNU32E.js → server-YJWIPDF2.js}

@@ -9,6 +9,8 @@ import {
   TOOL_CALL_REMINDER,
   computeCost,
   detectsHallucinatedFileOp,
+  estimateTokens,
+  extractToolHistory,
   formatCost,
   formatGitContextForPrompt,
   getContentText,
@@ -16,8 +18,10 @@ import {
   getGitRoot,
   hadPreviousWriteToolCalls,
   loadDevState,
+  persistToolRound,
+  rebuildExtraMessages,
   setupProxy
-} from "./chunk-NXSYL5OP.js";
+} from "./chunk-2WGVM2J2.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -36,7 +40,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-7RX7675B.js";
+} from "./chunk-2ZCD5F4X.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -56,7 +60,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-YJCJBUOG.js";
+} from "./chunk-GA74LZ62.js";
 
 // src/web/server.ts
 import express from "express";
@@ -654,7 +658,7 @@ var SessionHandler = class _SessionHandler {
   }
   /** 粗略估算文本 token 数（2.5 chars/token）*/
   estTokens(text) {
-    return Math.ceil(text.length / 2.5);
+    return estimateTokens(text);
   }
   /**
    * 估算当前 agentic 请求总 token 数（session messages + extraMessages + system prompt）。
@@ -675,6 +679,11 @@ var SessionHandler = class _SessionHandler {
             }
           }
         }
+        if (msg.toolCalls) {
+          for (const tc of msg.toolCalls) {
+            total += this.estTokens(JSON.stringify(tc.arguments));
+          }
+        }
       }
     }
     if (extraMessages.length > 0) {
@@ -814,8 +823,9 @@ var SessionHandler = class _SessionHandler {
   }
   async handleChatWithTools(provider, messages, toolDefs) {
     const session = this.sessions.current;
-    const apiMessages = [...messages];
-    const extraMessages = [];
+    const { baseMessages: cleanMessages, toolHistory } = extractToolHistory(messages);
+    const apiMessages = [...cleanMessages];
+    const extraMessages = toolHistory.length > 0 ? rebuildExtraMessages(provider, toolHistory) : [];
     const maxToolRounds = this.config.get("maxToolRounds") ?? DEFAULT_MAX_TOOL_ROUNDS;
     const autoPauseIntervalRaw = this.config.get("autoPauseInterval");
     const autoPauseInterval = typeof autoPauseIntervalRaw === "number" ? autoPauseIntervalRaw : 50;
@@ -1020,6 +1030,10 @@ Details: ${errMsg.split("\n")[0]}
           const reasoningContent = result.reasoningContent;
           const newMsgs = provider.buildToolResultMessages(result.toolCalls, toolResults, reasoningContent);
           extraMessages.push(...newMsgs);
+          persistToolRound(session, result.toolCalls, toolResults, {
+            assistantContent: result.content,
+            reasoningContent
+          });
           const allFree = result.toolCalls.every((tc) => FREE_ROUND_TOOLS.has(tc.name));
           if (allFree) {
             consecutiveFreeRounds++;
@@ -1915,7 +1929,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-IW6GHAVV.js");
+          const { executeTests } = await import("./run-tests-CT4PRGGP.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2432,11 +2446,18 @@ Add .md files to create commands.` });
   sendSessionMessages() {
     const session = this.sessions.current;
     if (!session) return;
-    const messages = session.messages.map((m) => ({
-      role: m.role,
-      content: getContentText(m.content),
-      timestamp: m.timestamp?.toISOString()
-    }));
+    const messages = session.messages.map((m) => {
+      const out = {
+        role: m.role,
+        content: getContentText(m.content),
+        timestamp: m.timestamp?.toISOString()
+      };
+      if (m.toolCalls) out.toolCalls = m.toolCalls;
+      if (m.toolCallId) out.toolCallId = m.toolCallId;
+      if (m.toolName) out.toolName = m.toolName;
+      if (m.isError !== void 0) out.isError = m.isError;
+      return out;
+    });
     this.send({
       type: "session_messages",
       sessionId: session.id,

package/dist/{task-orchestrator-I5YCZ72U.js → task-orchestrator-W66JWWKF.js}

@@ -4,11 +4,11 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-7RX7675B.js";
+} from "./chunk-2ZCD5F4X.js";
 import "./chunk-4BKXL7SM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-YJCJBUOG.js";
+} from "./chunk-GA74LZ62.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/dist/web/client/app.js

@@ -717,6 +717,49 @@ function escapeHtml(str) {
   return div.innerHTML;
 }
 
+/**
+ * Create a static tool-call card for session history view.
+ * Groups an assistant tool-call message with its subsequent tool results.
+ * Unlike live tool cards, these have no timer — just the final state.
+ *
+ * @param {Object} assistantMsg - The assistant message with toolCalls array
+ * @param {Object[]} resultMsgs - Subsequent tool-result messages
+ */
+function createHistoryToolCards(assistantMsg, resultMsgs) {
+  const toolCalls = assistantMsg.toolCalls || [];
+  for (let i = 0; i < toolCalls.length; i++) {
+    const tc = toolCalls[i];
+    const rm = resultMsgs[i]; // may be undefined if results are missing
+    const isError = rm ? rm.isError : false;
+    const resultContent = rm ? rm.content : '';
+
+    const el = document.createElement('details');
+    el.className = 'tool-card tool-border-safe my-1';
+
+    const statusIcon = rm ? (isError ? '✗' : '✓') : '?';
+    const statusClass = rm ? (isError ? 'text-error' : 'text-success') : 'opacity-50';
+    const badgeClass = isError ? 'badge-error' : 'badge-info';
+    const levelIcon = isError ? '⚠' : '⚙';
+
+    const argsHtml = tc.arguments ? formatToolArgs(tc.arguments) : '';
+    const truncResult = resultContent.length > 500
+      ? resultContent.slice(0, 500) + '...'
+      : resultContent;
+
+    el.innerHTML = `
+      <summary class="flex items-center gap-2 w-full cursor-pointer select-none py-1">
+        <span class="badge ${badgeClass} badge-sm gap-1">${levelIcon} ${escapeHtml(tc.name)}</span>
+        <span class="tool-result-badge text-xs ml-auto ${statusClass}">${statusIcon}</span>
+      </summary>
+      <div class="tool-details-body pt-1">
+        ${argsHtml ? `<div class="tool-args w-full">${argsHtml}</div>` : ''}
+        ${rm ? `<div class="tool-result-content mt-2 pt-2 border-t border-base-content/10 w-full ${isError ? 'text-error' : 'text-success'}">${statusIcon} ${escapeHtml(truncResult)}</div>` : ''}
+      </div>
+    `;
+    messagesEl.appendChild(el);
+  }
+}
+
 function scrollToBottom() {
   requestAnimationFrame(() => {
     chatArea.scrollTop = chatArea.scrollHeight;
@@ -1074,6 +1117,56 @@ function updateBatchBar() {
  * write it into the tab's `messagesHtml` cache; the live DOM is left
  * untouched so the active tab's content never flashes wrong data.
  */
+
+/**
+ * Render a messages array into the live DOM (messagesEl).
+ * Handles user, assistant (text), assistant (toolCalls), and tool result messages.
+ * Groups consecutive assistant+toolCalls with subsequent tool results into cards.
+ */
+function renderMessagesArray(messages) {
+  let i = 0;
+  while (i < messages.length) {
+    const m = messages[i];
+    if (m.role === 'user') {
+      addUserMessage(m.content);
+      i++;
+    } else if (m.role === 'assistant' && m.toolCalls && m.toolCalls.length > 0) {
+      // Assistant message with tool calls — collect subsequent tool results
+      const resultMsgs = [];
+      let j = i + 1;
+      while (j < messages.length && messages[j].role === 'tool') {
+        resultMsgs.push(messages[j]);
+        j++;
+      }
+      // If the assistant also had text content, render it first
+      if (m.content && m.content.trim()) {
+        const el = createAssistantMessage();
+        renderMarkdown(el, m.content);
+      }
+      createHistoryToolCards(m, resultMsgs);
+      i = j;
+    } else if (m.role === 'tool') {
+      // Orphan tool result (no preceding assistant+toolCalls) — render as info card
+      const statusIcon = m.isError ? '✗' : '✓';
+      const statusClass = m.isError ? 'text-error' : 'text-success';
+      const el = document.createElement('div');
+      el.className = `tool-card tool-border-safe my-1 p-2 ${statusClass}`;
+      const toolLabel = m.toolName ? escapeHtml(m.toolName) : 'tool';
+      const truncContent = m.content && m.content.length > 300
+        ? m.content.slice(0, 300) + '...' : (m.content || '');
+      el.innerHTML = `<span class="badge badge-info badge-sm">${toolLabel}</span> ${statusIcon} ${escapeHtml(truncContent)}`;
+      messagesEl.appendChild(el);
+      i++;
+    } else if (m.role === 'assistant') {
+      const el = createAssistantMessage();
+      renderMarkdown(el, m.content);
+      i++;
+    } else {
+      // system or unknown — skip
+      i++;
+    }
+  }
+}
 function renderSessionMessages(msg) {
   // Back-compat: if called with a bare array (legacy), treat as active-tab apply
   const messages = Array.isArray(msg) ? msg : msg.messages;
@@ -1096,14 +1189,7 @@ function renderSessionMessages(msg) {
     // Active tab: paint directly into the live DOM (preserves any in-flight
     // streaming helpers that rely on messagesEl)
     messagesEl.innerHTML = '';
-    for (const m of messages) {
-      if (m.role === 'user') {
-        addUserMessage(m.content);
-      } else if (m.role === 'assistant') {
-        const el = createAssistantMessage();
-        renderMarkdown(el, m.content);
-      }
-    }
+    renderMessagesArray(messages);
     scrollToBottom();
     // Snapshot into cache so subsequent tab-snapshots see the latest content
     sessionTabs[targetIdx].messagesHtml = messagesEl.innerHTML;
@@ -1136,14 +1222,7 @@ function buildMessagesHtmlOffDom(messages) {
     currentAssistantContent = '';
     currentThinkingEl = null;
     currentThinkingContent = '';
-    for (const m of messages) {
-      if (m.role === 'user') {
-        addUserMessage(m.content);
-      } else if (m.role === 'assistant') {
-        const el = createAssistantMessage();
-        renderMarkdown(el, m.content);
-      }
-    }
+    renderMessagesArray(messages);
     return messagesEl.innerHTML;
   } finally {
     messagesEl.innerHTML = savedHtml;

package/package.json

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