@yushaw/sanqian-chat 0.3.0 → 0.3.1

package/dist/core/index.d.mts

@@ -93,6 +93,9 @@ interface ToolCall {
     status?: ToolCallStatus;
     result?: unknown;
     error?: string;
+    actionRequired?: string;
+    settingsTab?: string;
+    settingsSubTab?: string;
 }
 /** Message block for structured rendering */
 interface MessageBlock {
@@ -533,6 +536,11 @@ type StreamEvent = {
     type: 'tool_result';
     tool_call_id: string;
     result: unknown;
+    error?: string;
+    status?: 'pending' | 'running' | 'completed' | 'error' | 'cancelled';
+    action_required?: string;
+    settings_tab?: string;
+    settings_sub_tab?: string;
 } | {
     type: 'done';
     conversationId: string;

package/dist/core/index.d.ts

@@ -93,6 +93,9 @@ interface ToolCall {
     status?: ToolCallStatus;
     result?: unknown;
     error?: string;
+    actionRequired?: string;
+    settingsTab?: string;
+    settingsSubTab?: string;
 }
 /** Message block for structured rendering */
 interface MessageBlock {
@@ -533,6 +536,11 @@ type StreamEvent = {
     type: 'tool_result';
     tool_call_id: string;
     result: unknown;
+    error?: string;
+    status?: 'pending' | 'running' | 'completed' | 'error' | 'cancelled';
+    action_required?: string;
+    settings_tab?: string;
+    settings_sub_tab?: string;
 } | {
     type: 'done';
     conversationId: string;

package/dist/core/index.js

@@ -37,6 +37,54 @@ __export(core_exports, {
 });
 module.exports = __toCommonJS(core_exports);
 
+// src/core/tool-status.ts
+function normalizeToolExecutionStatus(status) {
+  if (typeof status !== "string") return void 0;
+  switch (status.trim().toLowerCase()) {
+    case "success":
+    case "completed":
+    case "ok":
+      return "completed";
+    case "error":
+    case "failed":
+      return "error";
+    case "cancelled":
+    case "canceled":
+      return "cancelled";
+    case "running":
+      return "running";
+    case "pending":
+      return "pending";
+    default:
+      return void 0;
+  }
+}
+function deriveToolExecutionStatus(options) {
+  if (typeof options.actionRequired === "string" && options.actionRequired.length > 0) {
+    return "error";
+  }
+  if (options.error === true) {
+    return "error";
+  }
+  if (typeof options.error === "string" && options.error.trim().length > 0) {
+    return "error";
+  }
+  const normalizedStatus = normalizeToolExecutionStatus(options.status);
+  if (normalizedStatus) {
+    return normalizedStatus;
+  }
+  if (options.result !== void 0 && options.result !== null) {
+    if (typeof options.result === "string") {
+      const normalizedResult = options.result.trimStart();
+      if (normalizedResult.startsWith("\u274C") || normalizedResult.startsWith("Error:")) {
+        return "error";
+      }
+    }
+    return "completed";
+  }
+  return options.fallback ?? "running";
+}
+
 // src/core/history.ts
 function safeParseArgs(value) {
   if (!value) return void 0;
@@ -67,12 +115,25 @@ function parseToolCalls(toolCalls) {
     const rawArgs = fn?.arguments ?? tc.args ?? tc.arguments;
     const args = safeParseArgs(rawArgs);
     const id = tc.id || tc.tool_call_id || tc.call_id;
+    const actionRequired = tc.action_required || tc.actionRequired;
+    const settingsTab = tc.settings_tab || tc.settingsTab;
+    const settingsSubTab = tc.settings_sub_tab || tc.settingsSubTab;
     return {
       id,
       name,
       args,
-      status: "completed",
-      result: tc.result
+      result: tc.result,
+      error: typeof tc.error === "string" ? tc.error : void 0,
+      actionRequired,
+      settingsTab,
+      settingsSubTab,
+      status: deriveToolExecutionStatus({
+        status: tc.status,
+        result: tc.result,
+        actionRequired,
+        error: tc.error,
+        fallback: "completed"
+      })
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -163,7 +224,10 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           id: (toolMessage.tool_call_id || void 0) ?? `tool-${idx}`,
           name: "",
           args: void 0,
-          status: "completed",
+          status: deriveToolExecutionStatus({
+            result: toolMessage.content,
+            fallback: "completed"
+          }),
           result: toolMessage.content
         })) : void 0;
         const effectiveToolCalls = msgToolCalls && msgToolCalls.length > 0 ? msgToolCalls : fallbackCalls;
@@ -196,6 +260,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           const toolResultBlocks = [];
           for (const tc of effectiveToolCalls) {
             const toolIndex = effectiveToolCalls.indexOf(tc);
+            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
+            const toolResultByIndex = toolMessages[toolIndex];
+            const toolResult = toolResultById || toolResultByIndex;
+            const toolStatus = deriveToolExecutionStatus({
+              status: tc.status,
+              result: tc.result ?? toolResult?.content,
+              actionRequired: tc.actionRequired,
+              error: tc.error,
+              fallback: "completed"
+            });
             blocks.push({
               type: "tool_call",
               content: "",
@@ -203,12 +277,9 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolName: tc.name,
               toolArgs: tc.args,
               toolCallId: tc.id,
-              toolStatus: "completed",
+              toolStatus,
               isIntermediate: true
             });
-            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
-            const toolResultByIndex = toolMessages[toolIndex];
-            const toolResult = toolResultById || toolResultByIndex;
             const resultContent = tc.result ?? toolResult?.content;
             const toolResultId = toolResult?.tool_call_id || void 0;
             if (resultContent) {
@@ -251,6 +322,13 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           );
           if (matchingToolCall) {
             matchingToolCall.result = toolMsg.content;
+            matchingToolCall.status = deriveToolExecutionStatus({
+              status: matchingToolCall.status,
+              result: toolMsg.content,
+              actionRequired: matchingToolCall.actionRequired,
+              error: matchingToolCall.error,
+              fallback: "completed"
+            });
           }
         }
         const thinkingParts = consecutiveAssistantMsgs.map((m) => m.thinking).filter((t) => t && t.trim());
@@ -568,9 +646,20 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
               args: event.args || {}
             });
             break;
-          case "tool_result":
-            forward({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
+          case "tool_result": {
+            const toolResultEvent = event;
+            forward({
+              type: "tool_result",
+              tool_call_id: toolResultEvent.tool_call_id || "",
+              result: toolResultEvent.result,
+              error: toolResultEvent.error,
+              status: toolResultEvent.status,
+              action_required: toolResultEvent.action_required,
+              settings_tab: toolResultEvent.settings_tab,
+              settings_sub_tab: toolResultEvent.settings_sub_tab
+            });
             break;
+          }
           case "done":
             forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;

package/dist/core/index.mjs

@@ -1,3 +1,51 @@
+// src/core/tool-status.ts
+function normalizeToolExecutionStatus(status) {
+  if (typeof status !== "string") return void 0;
+  switch (status.trim().toLowerCase()) {
+    case "success":
+    case "completed":
+    case "ok":
+      return "completed";
+    case "error":
+    case "failed":
+      return "error";
+    case "cancelled":
+    case "canceled":
+      return "cancelled";
+    case "running":
+      return "running";
+    case "pending":
+      return "pending";
+    default:
+      return void 0;
+  }
+}
+function deriveToolExecutionStatus(options) {
+  if (typeof options.actionRequired === "string" && options.actionRequired.length > 0) {
+    return "error";
+  }
+  if (options.error === true) {
+    return "error";
+  }
+  if (typeof options.error === "string" && options.error.trim().length > 0) {
+    return "error";
+  }
+  const normalizedStatus = normalizeToolExecutionStatus(options.status);
+  if (normalizedStatus) {
+    return normalizedStatus;
+  }
+  if (options.result !== void 0 && options.result !== null) {
+    if (typeof options.result === "string") {
+      const normalizedResult = options.result.trimStart();
+      if (normalizedResult.startsWith("\u274C") || normalizedResult.startsWith("Error:")) {
+        return "error";
+      }
+    }
+    return "completed";
+  }
+  return options.fallback ?? "running";
+}
+
 // src/core/history.ts
 function safeParseArgs(value) {
   if (!value) return void 0;
@@ -28,12 +76,25 @@ function parseToolCalls(toolCalls) {
     const rawArgs = fn?.arguments ?? tc.args ?? tc.arguments;
     const args = safeParseArgs(rawArgs);
     const id = tc.id || tc.tool_call_id || tc.call_id;
+    const actionRequired = tc.action_required || tc.actionRequired;
+    const settingsTab = tc.settings_tab || tc.settingsTab;
+    const settingsSubTab = tc.settings_sub_tab || tc.settingsSubTab;
     return {
       id,
       name,
       args,
-      status: "completed",
-      result: tc.result
+      result: tc.result,
+      error: typeof tc.error === "string" ? tc.error : void 0,
+      actionRequired,
+      settingsTab,
+      settingsSubTab,
+      status: deriveToolExecutionStatus({
+        status: tc.status,
+        result: tc.result,
+        actionRequired,
+        error: tc.error,
+        fallback: "completed"
+      })
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -124,7 +185,10 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           id: (toolMessage.tool_call_id || void 0) ?? `tool-${idx}`,
           name: "",
           args: void 0,
-          status: "completed",
+          status: deriveToolExecutionStatus({
+            result: toolMessage.content,
+            fallback: "completed"
+          }),
           result: toolMessage.content
         })) : void 0;
         const effectiveToolCalls = msgToolCalls && msgToolCalls.length > 0 ? msgToolCalls : fallbackCalls;
@@ -157,6 +221,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           const toolResultBlocks = [];
           for (const tc of effectiveToolCalls) {
             const toolIndex = effectiveToolCalls.indexOf(tc);
+            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
+            const toolResultByIndex = toolMessages[toolIndex];
+            const toolResult = toolResultById || toolResultByIndex;
+            const toolStatus = deriveToolExecutionStatus({
+              status: tc.status,
+              result: tc.result ?? toolResult?.content,
+              actionRequired: tc.actionRequired,
+              error: tc.error,
+              fallback: "completed"
+            });
             blocks.push({
               type: "tool_call",
               content: "",
@@ -164,12 +238,9 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolName: tc.name,
               toolArgs: tc.args,
               toolCallId: tc.id,
-              toolStatus: "completed",
+              toolStatus,
               isIntermediate: true
             });
-            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
-            const toolResultByIndex = toolMessages[toolIndex];
-            const toolResult = toolResultById || toolResultByIndex;
             const resultContent = tc.result ?? toolResult?.content;
             const toolResultId = toolResult?.tool_call_id || void 0;
             if (resultContent) {
@@ -212,6 +283,13 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           );
           if (matchingToolCall) {
             matchingToolCall.result = toolMsg.content;
+            matchingToolCall.status = deriveToolExecutionStatus({
+              status: matchingToolCall.status,
+              result: toolMsg.content,
+              actionRequired: matchingToolCall.actionRequired,
+              error: matchingToolCall.error,
+              fallback: "completed"
+            });
           }
         }
         const thinkingParts = consecutiveAssistantMsgs.map((m) => m.thinking).filter((t) => t && t.trim());
@@ -529,9 +607,20 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
               args: event.args || {}
             });
             break;
-          case "tool_result":
-            forward({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
+          case "tool_result": {
+            const toolResultEvent = event;
+            forward({
+              type: "tool_result",
+              tool_call_id: toolResultEvent.tool_call_id || "",
+              result: toolResultEvent.result,
+              error: toolResultEvent.error,
+              status: toolResultEvent.status,
+              action_required: toolResultEvent.action_required,
+              settings_tab: toolResultEvent.settings_tab,
+              settings_sub_tab: toolResultEvent.settings_sub_tab
+            });
             break;
+          }
           case "done":
             forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;

package/dist/main/index.js

@@ -617,7 +617,19 @@ function registerStreamIpcHandlers(ipcMainHandle, ctx) {
             });
             break;
           case "tool_result":
-            webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "tool_result", tool_call_id: evt.tool_call_id, result: evt.result } });
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "tool_result",
+                tool_call_id: evt.tool_call_id,
+                result: evt.result,
+                error: evt.error,
+                status: evt.status,
+                action_required: evt.action_required,
+                settings_tab: evt.settings_tab,
+                settings_sub_tab: evt.settings_sub_tab
+              }
+            });
             break;
           case "done":
             sawTerminalEvent = true;

package/dist/main/index.mjs

@@ -586,7 +586,19 @@ function registerStreamIpcHandlers(ipcMainHandle, ctx) {
             });
             break;
           case "tool_result":
-            webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "tool_result", tool_call_id: evt.tool_call_id, result: evt.result } });
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "tool_result",
+                tool_call_id: evt.tool_call_id,
+                result: evt.result,
+                error: evt.error,
+                status: evt.status,
+                action_required: evt.action_required,
+                settings_tab: evt.settings_tab,
+                settings_sub_tab: evt.settings_sub_tab
+              }
+            });
             break;
           case "done":
             sawTerminalEvent = true;

package/dist/renderer/index.d.mts

@@ -96,6 +96,9 @@ interface ToolCall {
     status?: ToolCallStatus;
     result?: unknown;
     error?: string;
+    actionRequired?: string;
+    settingsTab?: string;
+    settingsSubTab?: string;
 }
 /** Message block for structured rendering */
 interface MessageBlock {
@@ -536,6 +539,11 @@ type StreamEvent = {
     type: 'tool_result';
     tool_call_id: string;
     result: unknown;
+    error?: string;
+    status?: 'pending' | 'running' | 'completed' | 'error' | 'cancelled';
+    action_required?: string;
+    settings_tab?: string;
+    settings_sub_tab?: string;
 } | {
     type: 'done';
     conversationId: string;

package/dist/renderer/index.d.ts

@@ -96,6 +96,9 @@ interface ToolCall {
     status?: ToolCallStatus;
     result?: unknown;
     error?: string;
+    actionRequired?: string;
+    settingsTab?: string;
+    settingsSubTab?: string;
 }
 /** Message block for structured rendering */
 interface MessageBlock {
@@ -536,6 +539,11 @@ type StreamEvent = {
     type: 'tool_result';
     tool_call_id: string;
     result: unknown;
+    error?: string;
+    status?: 'pending' | 'running' | 'completed' | 'error' | 'cancelled';
+    action_required?: string;
+    settings_tab?: string;
+    settings_sub_tab?: string;
 } | {
     type: 'done';
     conversationId: string;

package/dist/renderer/index.js

@@ -88,6 +88,67 @@ module.exports = __toCommonJS(renderer_exports);
 
 // src/renderer/hooks/useChat.ts
 var import_react = require("react");
+
+// src/core/tool-status.ts
+function normalizeToolExecutionStatus(status) {
+  if (typeof status !== "string") return void 0;
+  switch (status.trim().toLowerCase()) {
+    case "success":
+    case "completed":
+    case "ok":
+      return "completed";
+    case "error":
+    case "failed":
+      return "error";
+    case "cancelled":
+    case "canceled":
+      return "cancelled";
+    case "running":
+      return "running";
+    case "pending":
+      return "pending";
+    default:
+      return void 0;
+  }
+}
+function deriveToolExecutionStatus(options) {
+  if (typeof options.actionRequired === "string" && options.actionRequired.length > 0) {
+    return "error";
+  }
+  if (options.error === true) {
+    return "error";
+  }
+  if (typeof options.error === "string" && options.error.trim().length > 0) {
+    return "error";
+  }
+  const normalizedStatus = normalizeToolExecutionStatus(options.status);
+  if (normalizedStatus) {
+    return normalizedStatus;
+  }
+  if (options.result !== void 0 && options.result !== null) {
+    if (typeof options.result === "string") {
+      const normalizedResult = options.result.trimStart();
+      if (normalizedResult.startsWith("\u274C") || normalizedResult.startsWith("Error:")) {
+        return "error";
+      }
+    }
+    return "completed";
+  }
+  return options.fallback ?? "running";
+}
+function formatToolResultContent(result, error) {
+  const value = result ?? error;
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "string") return value;
+  try {
+    const serialized = JSON.stringify(value);
+    return serialized === void 0 ? String(value) : serialized;
+  } catch {
+    return String(value);
+  }
+}
+
+// src/renderer/hooks/useChat.ts
 var TYPEWRITER_DELAYS = { VERY_FAST: 2, FAST: 5, NORMAL: 10, SLOW: 20 };
 var TYPEWRITER_THRESHOLDS = { VERY_FAST: 100, FAST: 50, NORMAL: 20 };
 var MAX_DETACHED_SNAPSHOTS = 30;
@@ -108,6 +169,15 @@ var findLastBlock = (blocks, predicate) => {
   }
   return void 0;
 };
+function getToolResultStatus(event) {
+  return deriveToolExecutionStatus({
+    status: event.status,
+    result: event.result,
+    actionRequired: event.action_required,
+    error: event.error,
+    fallback: "completed"
+  });
+}
 function cloneBlocks(blocks) {
   return blocks?.map((block) => ({
     ...block,
@@ -251,7 +321,17 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
       return true;
     }
     case "tool_result": {
-      const toolCalls = (assistant.toolCalls || []).map((toolCall) => toolCall.id === event.tool_call_id ? { ...toolCall, status: "completed", result: event.result } : toolCall);
+      const toolStatus = getToolResultStatus(event);
+      const resultContent = formatToolResultContent(event.result, event.error);
+      const toolCalls = (assistant.toolCalls || []).map((toolCall) => toolCall.id === event.tool_call_id ? {
+        ...toolCall,
+        status: toolStatus,
+        result: event.result,
+        error: toolStatus === "error" ? typeof event.error === "string" && event.error.trim().length > 0 ? event.error : resultContent : void 0,
+        actionRequired: event.action_required,
+        settingsTab: event.settings_tab,
+        settingsSubTab: event.settings_sub_tab
+      } : toolCall);
       const hasRunning = toolCalls.some((toolCall) => toolCall.status === "running");
       const blocks = cloneBlocks(assistant.blocks) || [];
       const toolBlockIndex = blocks.findIndex(
@@ -260,17 +340,19 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
       if (toolBlockIndex !== -1) {
         blocks[toolBlockIndex] = {
           ...blocks[toolBlockIndex],
-          toolStatus: "completed"
+          toolStatus
         };
       }
-      blocks.push({
-        type: "tool_result",
-        content: typeof event.result === "string" ? event.result : JSON.stringify(event.result),
-        timestamp: Date.now(),
-        toolName: toolBlockIndex !== -1 ? blocks[toolBlockIndex].toolName : void 0,
-        toolCallId: event.tool_call_id,
-        isIntermediate: true
-      });
+      if (resultContent) {
+        blocks.push({
+          type: "tool_result",
+          content: resultContent,
+          timestamp: Date.now(),
+          toolName: toolBlockIndex !== -1 ? blocks[toolBlockIndex].toolName : void 0,
+          toolCallId: event.tool_call_id,
+          isIntermediate: true
+        });
+      }
       snapshot[assistantIndex] = {
         ...assistant,
         toolCalls,
@@ -992,24 +1074,35 @@ function useChat(options) {
       case "tool_result": {
         flushTypewriter();
         const toolId = event.tool_call_id;
-        const result = typeof event.result === "string" ? event.result : JSON.stringify(event.result);
+        const toolStatus = getToolResultStatus(event);
+        const resultContent = formatToolResultContent(event.result, event.error);
         const blockIdx = currentBlocksRef.current.findIndex((b) => b.type === "tool_call" && b.toolCallId === toolId);
         const toolName = blockIdx !== -1 ? currentBlocksRef.current[blockIdx].toolName : void 0;
-        if (blockIdx !== -1) currentBlocksRef.current[blockIdx].toolStatus = "completed";
-        currentBlocksRef.current.push({
-          type: "tool_result",
-          content: result,
-          timestamp: Date.now(),
-          toolName,
-          toolCallId: toolId,
-          isIntermediate: true
-        });
+        if (blockIdx !== -1) currentBlocksRef.current[blockIdx].toolStatus = toolStatus;
+        if (resultContent) {
+          currentBlocksRef.current.push({
+            type: "tool_result",
+            content: resultContent,
+            timestamp: Date.now(),
+            toolName,
+            toolCallId: toolId,
+            isIntermediate: true
+          });
+        }
         setMessages((prev) => {
           const idx = prev.findIndex((m) => m.id === assistantMessageId);
           if (idx === -1) return prev;
           const msg = prev[idx];
           const updatedCalls = (msg.toolCalls || []).map(
-            (t) => t.id === toolId ? { ...t, status: "completed", result: event.result } : t
+            (t) => t.id === toolId ? {
+              ...t,
+              status: toolStatus,
+              result: event.result,
+              error: toolStatus === "error" ? typeof event.error === "string" && event.error.trim().length > 0 ? event.error : resultContent : void 0,
+              actionRequired: event.action_required,
+              settingsTab: event.settings_tab,
+              settingsSubTab: event.settings_sub_tab
+            } : t
           );
           const hasRunning = updatedCalls.some((tc) => tc.status === "running");
           const updated = [...prev];
@@ -6395,12 +6488,25 @@ function parseToolCalls(toolCalls) {
     const rawArgs = fn?.arguments ?? tc.args ?? tc.arguments;
     const args = safeParseArgs(rawArgs);
     const id = tc.id || tc.tool_call_id || tc.call_id;
+    const actionRequired = tc.action_required || tc.actionRequired;
+    const settingsTab = tc.settings_tab || tc.settingsTab;
+    const settingsSubTab = tc.settings_sub_tab || tc.settingsSubTab;
     return {
       id,
       name,
       args,
-      status: "completed",
-      result: tc.result
+      result: tc.result,
+      error: typeof tc.error === "string" ? tc.error : void 0,
+      actionRequired,
+      settingsTab,
+      settingsSubTab,
+      status: deriveToolExecutionStatus({
+        status: tc.status,
+        result: tc.result,
+        actionRequired,
+        error: tc.error,
+        fallback: "completed"
+      })
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -6491,7 +6597,10 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           id: (toolMessage.tool_call_id || void 0) ?? `tool-${idx}`,
           name: "",
           args: void 0,
-          status: "completed",
+          status: deriveToolExecutionStatus({
+            result: toolMessage.content,
+            fallback: "completed"
+          }),
           result: toolMessage.content
         })) : void 0;
         const effectiveToolCalls = msgToolCalls && msgToolCalls.length > 0 ? msgToolCalls : fallbackCalls;
@@ -6524,6 +6633,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           const toolResultBlocks = [];
           for (const tc of effectiveToolCalls) {
             const toolIndex = effectiveToolCalls.indexOf(tc);
+            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
+            const toolResultByIndex = toolMessages[toolIndex];
+            const toolResult = toolResultById || toolResultByIndex;
+            const toolStatus = deriveToolExecutionStatus({
+              status: tc.status,
+              result: tc.result ?? toolResult?.content,
+              actionRequired: tc.actionRequired,
+              error: tc.error,
+              fallback: "completed"
+            });
             blocks.push({
               type: "tool_call",
               content: "",
@@ -6531,12 +6650,9 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolName: tc.name,
               toolArgs: tc.args,
               toolCallId: tc.id,
-              toolStatus: "completed",
+              toolStatus,
               isIntermediate: true
             });
-            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
-            const toolResultByIndex = toolMessages[toolIndex];
-            const toolResult = toolResultById || toolResultByIndex;
             const resultContent = tc.result ?? toolResult?.content;
             const toolResultId = toolResult?.tool_call_id || void 0;
             if (resultContent) {
@@ -6579,6 +6695,13 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           );
           if (matchingToolCall) {
             matchingToolCall.result = toolMsg.content;
+            matchingToolCall.status = deriveToolExecutionStatus({
+              status: matchingToolCall.status,
+              result: toolMsg.content,
+              actionRequired: matchingToolCall.actionRequired,
+              error: matchingToolCall.error,
+              fallback: "completed"
+            });
           }
         }
         const thinkingParts = consecutiveAssistantMsgs.map((m) => m.thinking).filter((t) => t && t.trim());
@@ -7177,9 +7300,20 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
               args: event.args || {}
             });
             break;
-          case "tool_result":
-            forward({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
+          case "tool_result": {
+            const toolResultEvent = event;
+            forward({
+              type: "tool_result",
+              tool_call_id: toolResultEvent.tool_call_id || "",
+              result: toolResultEvent.result,
+              error: toolResultEvent.error,
+              status: toolResultEvent.status,
+              action_required: toolResultEvent.action_required,
+              settings_tab: toolResultEvent.settings_tab,
+              settings_sub_tab: toolResultEvent.settings_sub_tab
+            });
             break;
+          }
           case "done":
             forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;
@@ -7929,8 +8063,8 @@ function ToolCallItem({ toolCall, toolResult }) {
         style: { color: "var(--chat-text)" },
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "font-mono", children: displayName }),
-          toolResult && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
-          !toolResult && toolCall.toolStatus === "error" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-red-500", children: TimelineIcons.error }),
+          toolCall.toolStatus === "completed" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
+          toolCall.toolStatus === "error" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-red-500", children: TimelineIcons.error }),
           hasArgs && !expanded && /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("span", { className: "font-mono", style: { color: "var(--chat-text)", opacity: 0.6, fontSize: "0.75rem" }, children: [
             "(",
             Object.values(toolCall.toolArgs).slice(0, 1).map((v) => typeof v === "string" ? v.length > 18 ? v.slice(0, 18) + "\u2026" : v : "\u2026"),
@@ -7967,7 +8101,8 @@ function StreamingToolCallItem({
         style: { color: "var(--chat-text)" },
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "font-mono", children: displayName }),
-          toolResult && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
+          toolCall.toolStatus === "completed" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
+          toolCall.toolStatus === "error" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "text-red-500", children: TimelineIcons.error }),
           isActive && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: "ml-0.5 text-amber-500 animate-pulse", children: "\u25C6" }),
           hasArgs && !expanded && /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("span", { className: "font-mono", style: { color: "var(--chat-text)", opacity: 0.6, fontSize: "0.75rem" }, children: [
             "(",
@@ -8388,7 +8523,13 @@ function buildFallbackBlocksFromToolCalls(toolCalls) {
   const blocks = [];
   let timestamp = Date.now();
   for (const toolCall of toolCalls) {
-    const toolStatus = toolCall.status || (toolCall.result !== void 0 ? "completed" : "running");
+    const toolStatus = deriveToolExecutionStatus({
+      status: toolCall.status,
+      result: toolCall.result,
+      actionRequired: toolCall.actionRequired,
+      error: toolCall.error,
+      fallback: "running"
+    });
     blocks.push({
       type: "tool_call",
       content: "",

package/dist/renderer/index.mjs

@@ -1,5 +1,66 @@
 // src/renderer/hooks/useChat.ts
 import { useState, useCallback, useRef, useEffect } from "react";
+
+// src/core/tool-status.ts
+function normalizeToolExecutionStatus(status) {
+  if (typeof status !== "string") return void 0;
+  switch (status.trim().toLowerCase()) {
+    case "success":
+    case "completed":
+    case "ok":
+      return "completed";
+    case "error":
+    case "failed":
+      return "error";
+    case "cancelled":
+    case "canceled":
+      return "cancelled";
+    case "running":
+      return "running";
+    case "pending":
+      return "pending";
+    default:
+      return void 0;
+  }
+}
+function deriveToolExecutionStatus(options) {
+  if (typeof options.actionRequired === "string" && options.actionRequired.length > 0) {
+    return "error";
+  }
+  if (options.error === true) {
+    return "error";
+  }
+  if (typeof options.error === "string" && options.error.trim().length > 0) {
+    return "error";
+  }
+  const normalizedStatus = normalizeToolExecutionStatus(options.status);
+  if (normalizedStatus) {
+    return normalizedStatus;
+  }
+  if (options.result !== void 0 && options.result !== null) {
+    if (typeof options.result === "string") {
+      const normalizedResult = options.result.trimStart();
+      if (normalizedResult.startsWith("\u274C") || normalizedResult.startsWith("Error:")) {
+        return "error";
+      }
+    }
+    return "completed";
+  }
+  return options.fallback ?? "running";
+}
+function formatToolResultContent(result, error) {
+  const value = result ?? error;
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "string") return value;
+  try {
+    const serialized = JSON.stringify(value);
+    return serialized === void 0 ? String(value) : serialized;
+  } catch {
+    return String(value);
+  }
+}
+
+// src/renderer/hooks/useChat.ts
 var TYPEWRITER_DELAYS = { VERY_FAST: 2, FAST: 5, NORMAL: 10, SLOW: 20 };
 var TYPEWRITER_THRESHOLDS = { VERY_FAST: 100, FAST: 50, NORMAL: 20 };
 var MAX_DETACHED_SNAPSHOTS = 30;
@@ -20,6 +81,15 @@ var findLastBlock = (blocks, predicate) => {
   }
   return void 0;
 };
+function getToolResultStatus(event) {
+  return deriveToolExecutionStatus({
+    status: event.status,
+    result: event.result,
+    actionRequired: event.action_required,
+    error: event.error,
+    fallback: "completed"
+  });
+}
 function cloneBlocks(blocks) {
   return blocks?.map((block) => ({
     ...block,
@@ -163,7 +233,17 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
       return true;
     }
     case "tool_result": {
-      const toolCalls = (assistant.toolCalls || []).map((toolCall) => toolCall.id === event.tool_call_id ? { ...toolCall, status: "completed", result: event.result } : toolCall);
+      const toolStatus = getToolResultStatus(event);
+      const resultContent = formatToolResultContent(event.result, event.error);
+      const toolCalls = (assistant.toolCalls || []).map((toolCall) => toolCall.id === event.tool_call_id ? {
+        ...toolCall,
+        status: toolStatus,
+        result: event.result,
+        error: toolStatus === "error" ? typeof event.error === "string" && event.error.trim().length > 0 ? event.error : resultContent : void 0,
+        actionRequired: event.action_required,
+        settingsTab: event.settings_tab,
+        settingsSubTab: event.settings_sub_tab
+      } : toolCall);
       const hasRunning = toolCalls.some((toolCall) => toolCall.status === "running");
       const blocks = cloneBlocks(assistant.blocks) || [];
       const toolBlockIndex = blocks.findIndex(
@@ -172,17 +252,19 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
       if (toolBlockIndex !== -1) {
         blocks[toolBlockIndex] = {
           ...blocks[toolBlockIndex],
-          toolStatus: "completed"
+          toolStatus
         };
       }
-      blocks.push({
-        type: "tool_result",
-        content: typeof event.result === "string" ? event.result : JSON.stringify(event.result),
-        timestamp: Date.now(),
-        toolName: toolBlockIndex !== -1 ? blocks[toolBlockIndex].toolName : void 0,
-        toolCallId: event.tool_call_id,
-        isIntermediate: true
-      });
+      if (resultContent) {
+        blocks.push({
+          type: "tool_result",
+          content: resultContent,
+          timestamp: Date.now(),
+          toolName: toolBlockIndex !== -1 ? blocks[toolBlockIndex].toolName : void 0,
+          toolCallId: event.tool_call_id,
+          isIntermediate: true
+        });
+      }
       snapshot[assistantIndex] = {
         ...assistant,
         toolCalls,
@@ -904,24 +986,35 @@ function useChat(options) {
       case "tool_result": {
         flushTypewriter();
         const toolId = event.tool_call_id;
-        const result = typeof event.result === "string" ? event.result : JSON.stringify(event.result);
+        const toolStatus = getToolResultStatus(event);
+        const resultContent = formatToolResultContent(event.result, event.error);
         const blockIdx = currentBlocksRef.current.findIndex((b) => b.type === "tool_call" && b.toolCallId === toolId);
         const toolName = blockIdx !== -1 ? currentBlocksRef.current[blockIdx].toolName : void 0;
-        if (blockIdx !== -1) currentBlocksRef.current[blockIdx].toolStatus = "completed";
-        currentBlocksRef.current.push({
-          type: "tool_result",
-          content: result,
-          timestamp: Date.now(),
-          toolName,
-          toolCallId: toolId,
-          isIntermediate: true
-        });
+        if (blockIdx !== -1) currentBlocksRef.current[blockIdx].toolStatus = toolStatus;
+        if (resultContent) {
+          currentBlocksRef.current.push({
+            type: "tool_result",
+            content: resultContent,
+            timestamp: Date.now(),
+            toolName,
+            toolCallId: toolId,
+            isIntermediate: true
+          });
+        }
         setMessages((prev) => {
           const idx = prev.findIndex((m) => m.id === assistantMessageId);
           if (idx === -1) return prev;
           const msg = prev[idx];
           const updatedCalls = (msg.toolCalls || []).map(
-            (t) => t.id === toolId ? { ...t, status: "completed", result: event.result } : t
+            (t) => t.id === toolId ? {
+              ...t,
+              status: toolStatus,
+              result: event.result,
+              error: toolStatus === "error" ? typeof event.error === "string" && event.error.trim().length > 0 ? event.error : resultContent : void 0,
+              actionRequired: event.action_required,
+              settingsTab: event.settings_tab,
+              settingsSubTab: event.settings_sub_tab
+            } : t
           );
           const hasRunning = updatedCalls.some((tc) => tc.status === "running");
           const updated = [...prev];
@@ -6307,12 +6400,25 @@ function parseToolCalls(toolCalls) {
     const rawArgs = fn?.arguments ?? tc.args ?? tc.arguments;
     const args = safeParseArgs(rawArgs);
     const id = tc.id || tc.tool_call_id || tc.call_id;
+    const actionRequired = tc.action_required || tc.actionRequired;
+    const settingsTab = tc.settings_tab || tc.settingsTab;
+    const settingsSubTab = tc.settings_sub_tab || tc.settingsSubTab;
     return {
       id,
       name,
       args,
-      status: "completed",
-      result: tc.result
+      result: tc.result,
+      error: typeof tc.error === "string" ? tc.error : void 0,
+      actionRequired,
+      settingsTab,
+      settingsSubTab,
+      status: deriveToolExecutionStatus({
+        status: tc.status,
+        result: tc.result,
+        actionRequired,
+        error: tc.error,
+        fallback: "completed"
+      })
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -6403,7 +6509,10 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           id: (toolMessage.tool_call_id || void 0) ?? `tool-${idx}`,
           name: "",
           args: void 0,
-          status: "completed",
+          status: deriveToolExecutionStatus({
+            result: toolMessage.content,
+            fallback: "completed"
+          }),
           result: toolMessage.content
         })) : void 0;
         const effectiveToolCalls = msgToolCalls && msgToolCalls.length > 0 ? msgToolCalls : fallbackCalls;
@@ -6436,6 +6545,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           const toolResultBlocks = [];
           for (const tc of effectiveToolCalls) {
             const toolIndex = effectiveToolCalls.indexOf(tc);
+            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
+            const toolResultByIndex = toolMessages[toolIndex];
+            const toolResult = toolResultById || toolResultByIndex;
+            const toolStatus = deriveToolExecutionStatus({
+              status: tc.status,
+              result: tc.result ?? toolResult?.content,
+              actionRequired: tc.actionRequired,
+              error: tc.error,
+              fallback: "completed"
+            });
             blocks.push({
               type: "tool_call",
               content: "",
@@ -6443,12 +6562,9 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolName: tc.name,
               toolArgs: tc.args,
               toolCallId: tc.id,
-              toolStatus: "completed",
+              toolStatus,
               isIntermediate: true
             });
-            const toolResultById = tc.id ? toolMessages.find((tm) => tm.tool_call_id === tc.id) : void 0;
-            const toolResultByIndex = toolMessages[toolIndex];
-            const toolResult = toolResultById || toolResultByIndex;
             const resultContent = tc.result ?? toolResult?.content;
             const toolResultId = toolResult?.tool_call_id || void 0;
             if (resultContent) {
@@ -6491,6 +6607,13 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
           );
           if (matchingToolCall) {
             matchingToolCall.result = toolMsg.content;
+            matchingToolCall.status = deriveToolExecutionStatus({
+              status: matchingToolCall.status,
+              result: toolMsg.content,
+              actionRequired: matchingToolCall.actionRequired,
+              error: matchingToolCall.error,
+              fallback: "completed"
+            });
           }
         }
         const thinkingParts = consecutiveAssistantMsgs.map((m) => m.thinking).filter((t) => t && t.trim());
@@ -7089,9 +7212,20 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
               args: event.args || {}
             });
             break;
-          case "tool_result":
-            forward({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
+          case "tool_result": {
+            const toolResultEvent = event;
+            forward({
+              type: "tool_result",
+              tool_call_id: toolResultEvent.tool_call_id || "",
+              result: toolResultEvent.result,
+              error: toolResultEvent.error,
+              status: toolResultEvent.status,
+              action_required: toolResultEvent.action_required,
+              settings_tab: toolResultEvent.settings_tab,
+              settings_sub_tab: toolResultEvent.settings_sub_tab
+            });
             break;
+          }
           case "done":
             forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;
@@ -7849,8 +7983,8 @@ function ToolCallItem({ toolCall, toolResult }) {
         style: { color: "var(--chat-text)" },
         children: [
           /* @__PURE__ */ jsx8("span", { className: "font-mono", children: displayName }),
-          toolResult && /* @__PURE__ */ jsx8("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
-          !toolResult && toolCall.toolStatus === "error" && /* @__PURE__ */ jsx8("span", { className: "text-red-500", children: TimelineIcons.error }),
+          toolCall.toolStatus === "completed" && /* @__PURE__ */ jsx8("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
+          toolCall.toolStatus === "error" && /* @__PURE__ */ jsx8("span", { className: "text-red-500", children: TimelineIcons.error }),
           hasArgs && !expanded && /* @__PURE__ */ jsxs3("span", { className: "font-mono", style: { color: "var(--chat-text)", opacity: 0.6, fontSize: "0.75rem" }, children: [
             "(",
             Object.values(toolCall.toolArgs).slice(0, 1).map((v) => typeof v === "string" ? v.length > 18 ? v.slice(0, 18) + "\u2026" : v : "\u2026"),
@@ -7887,7 +8021,8 @@ function StreamingToolCallItem({
         style: { color: "var(--chat-text)" },
         children: [
           /* @__PURE__ */ jsx8("span", { className: "font-mono", children: displayName }),
-          toolResult && /* @__PURE__ */ jsx8("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
+          toolCall.toolStatus === "completed" && /* @__PURE__ */ jsx8("span", { className: "text-green-600 dark:text-green-400", children: TimelineIcons.check }),
+          toolCall.toolStatus === "error" && /* @__PURE__ */ jsx8("span", { className: "text-red-500", children: TimelineIcons.error }),
           isActive && /* @__PURE__ */ jsx8("span", { className: "ml-0.5 text-amber-500 animate-pulse", children: "\u25C6" }),
           hasArgs && !expanded && /* @__PURE__ */ jsxs3("span", { className: "font-mono", style: { color: "var(--chat-text)", opacity: 0.6, fontSize: "0.75rem" }, children: [
             "(",
@@ -8308,7 +8443,13 @@ function buildFallbackBlocksFromToolCalls(toolCalls) {
   const blocks = [];
   let timestamp = Date.now();
   for (const toolCall of toolCalls) {
-    const toolStatus = toolCall.status || (toolCall.result !== void 0 ? "completed" : "running");
+    const toolStatus = deriveToolExecutionStatus({
+      status: toolCall.status,
+      result: toolCall.result,
+      actionRequired: toolCall.actionRequired,
+      error: toolCall.error,
+      fallback: "running"
+    });
     blocks.push({
       type: "tool_call",
       content: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yushaw/sanqian-chat",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Floating chat window SDK for Sanqian AI Assistant",
   "main": "./dist/main/index.js",
   "types": "./dist/main/index.d.ts",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@streamdown/code": "^1.0.3",
-    "@yushaw/sanqian-sdk": "^0.3.26",
+    "@yushaw/sanqian-sdk": "^0.3.28",
     "react-virtuoso": "^4.15.0",
     "rehype-harden": "^1.1.6",
     "remark-gfm": "^4.0.1",