@yushaw/sanqian-chat 0.3.0 → 0.3.3

package/dist/core/index.d.mts

@@ -84,8 +84,18 @@ type MessageRole = 'user' | 'assistant' | 'system' | 'tool';
 type ToolCallStatus = 'pending' | 'running' | 'completed' | 'error' | 'cancelled';
 type ConnectionStatus = 'disconnected' | 'connecting' | 'connected' | 'reconnecting' | 'error';
 type ConnectionErrorCode = 'NOT_FOUND' | 'CONNECTION_FAILED' | 'WEBSOCKET_ERROR' | 'AUTH_ERROR' | 'TIMEOUT' | 'UNKNOWN';
+interface ToolExecutionMetadata {
+    commandExitCode?: number;
+    durationMs?: number;
+    sandboxed?: boolean;
+    timedOut?: boolean;
+    truncated?: boolean;
+    stdoutPath?: string;
+    stderrPath?: string;
+    presentation?: string;
+}
 /** Tool call for UI rendering (extended from SDK) */
-interface ToolCall {
+interface ToolCall extends ToolExecutionMetadata {
     id?: string;
     name: string;
     args?: Record<string, unknown>;
@@ -93,9 +103,12 @@ interface ToolCall {
     status?: ToolCallStatus;
     result?: unknown;
     error?: string;
+    actionRequired?: string;
+    settingsTab?: string;
+    settingsSubTab?: string;
 }
 /** Message block for structured rendering */
-interface MessageBlock {
+interface MessageBlock extends ToolExecutionMetadata {
     type: 'thinking' | 'text' | 'tool_call' | 'tool_result';
     content: string;
     timestamp: number;
@@ -104,6 +117,7 @@ interface MessageBlock {
     toolArgsRaw?: string;
     toolCallId?: string;
     toolStatus?: ToolCallStatus;
+    actionRequired?: string;
     isIntermediate?: boolean;
     fromSubagent?: boolean;
 }
@@ -533,6 +547,19 @@ 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;
+    command_exit_code?: number;
+    duration_ms?: number;
+    sandboxed?: boolean;
+    timed_out?: boolean;
+    truncated?: boolean;
+    stdout_path?: string;
+    stderr_path?: string;
+    presentation?: string;
 } | {
     type: 'done';
     conversationId: string;
@@ -699,4 +726,4 @@ declare function parseToolCalls(toolCalls: unknown): ToolCall[] | undefined;
  */
 declare function mergeConsecutiveAssistantMessages(rawMessages: ApiMessage[]): ChatMessage[];
 
-export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type HitlResponseOutcome, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };
+export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type HitlResponseOutcome, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type ToolExecutionMetadata, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };

package/dist/core/index.d.ts

@@ -84,8 +84,18 @@ type MessageRole = 'user' | 'assistant' | 'system' | 'tool';
 type ToolCallStatus = 'pending' | 'running' | 'completed' | 'error' | 'cancelled';
 type ConnectionStatus = 'disconnected' | 'connecting' | 'connected' | 'reconnecting' | 'error';
 type ConnectionErrorCode = 'NOT_FOUND' | 'CONNECTION_FAILED' | 'WEBSOCKET_ERROR' | 'AUTH_ERROR' | 'TIMEOUT' | 'UNKNOWN';
+interface ToolExecutionMetadata {
+    commandExitCode?: number;
+    durationMs?: number;
+    sandboxed?: boolean;
+    timedOut?: boolean;
+    truncated?: boolean;
+    stdoutPath?: string;
+    stderrPath?: string;
+    presentation?: string;
+}
 /** Tool call for UI rendering (extended from SDK) */
-interface ToolCall {
+interface ToolCall extends ToolExecutionMetadata {
     id?: string;
     name: string;
     args?: Record<string, unknown>;
@@ -93,9 +103,12 @@ interface ToolCall {
     status?: ToolCallStatus;
     result?: unknown;
     error?: string;
+    actionRequired?: string;
+    settingsTab?: string;
+    settingsSubTab?: string;
 }
 /** Message block for structured rendering */
-interface MessageBlock {
+interface MessageBlock extends ToolExecutionMetadata {
     type: 'thinking' | 'text' | 'tool_call' | 'tool_result';
     content: string;
     timestamp: number;
@@ -104,6 +117,7 @@ interface MessageBlock {
     toolArgsRaw?: string;
     toolCallId?: string;
     toolStatus?: ToolCallStatus;
+    actionRequired?: string;
     isIntermediate?: boolean;
     fromSubagent?: boolean;
 }
@@ -533,6 +547,19 @@ 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;
+    command_exit_code?: number;
+    duration_ms?: number;
+    sandboxed?: boolean;
+    timed_out?: boolean;
+    truncated?: boolean;
+    stdout_path?: string;
+    stderr_path?: string;
+    presentation?: string;
 } | {
     type: 'done';
     conversationId: string;
@@ -699,4 +726,4 @@ declare function parseToolCalls(toolCalls: unknown): ToolCall[] | undefined;
  */
 declare function mergeConsecutiveAssistantMessages(rawMessages: ApiMessage[]): ChatMessage[];
 
-export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type HitlResponseOutcome, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };
+export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type HitlResponseOutcome, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type ToolExecutionMetadata, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };

package/dist/core/index.js

@@ -37,7 +37,77 @@ __export(core_exports, {
 });
 module.exports = __toCommonJS(core_exports);
 
+// src/core/tool-status.ts
+var BLOCKING_ACTION_REQUIRED = /* @__PURE__ */ new Set(["install_git_bash"]);
+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" && BLOCKING_ACTION_REQUIRED.has(options.actionRequired)) {
+    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 readToolExecutionNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function readToolExecutionBoolean(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function readToolExecutionString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+function readToolExecutionMetadata(tc) {
+  return {
+    commandExitCode: readToolExecutionNumber(tc.command_exit_code ?? tc.commandExitCode),
+    durationMs: readToolExecutionNumber(tc.duration_ms ?? tc.durationMs),
+    sandboxed: readToolExecutionBoolean(tc.sandboxed),
+    timedOut: readToolExecutionBoolean(tc.timed_out ?? tc.timedOut),
+    truncated: readToolExecutionBoolean(tc.truncated),
+    stdoutPath: readToolExecutionString(tc.stdout_path ?? tc.stdoutPath),
+    stderrPath: readToolExecutionString(tc.stderr_path ?? tc.stderrPath),
+    presentation: readToolExecutionString(tc.presentation)
+  };
+}
 function safeParseArgs(value) {
   if (!value) return void 0;
   if (typeof value === "object") return value;
@@ -67,12 +137,26 @@ 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"
+      }),
+      ...readToolExecutionMetadata(tc)
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -140,6 +224,10 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
       const consecutiveAssistantMsgs = [msg];
       const toolMessages = [];
       let j = i + 1;
+      const hasDeclaredToolCalls = (message) => {
+        const calls = parseToolCalls(message.toolCalls || message.tool_calls);
+        return Boolean(calls && calls.length > 0);
+      };
       while (j < rawMessages.length) {
         if (rawMessages[j].role === "assistant") {
           consecutiveAssistantMsgs.push(rawMessages[j]);
@@ -155,15 +243,19 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
       let blockTime = Date.now();
       let fallbackToolCalls;
       let lastEffectiveToolCalls;
+      const groupHasDeclaredToolCalls = consecutiveAssistantMsgs.some(hasDeclaredToolCalls);
       for (let k = 0; k < consecutiveAssistantMsgs.length; k++) {
         const assistantMsg = consecutiveAssistantMsgs[k];
         const msgToolCalls = parseToolCalls(assistantMsg.toolCalls || assistantMsg.tool_calls);
         const isLastAssistant = k === consecutiveAssistantMsgs.length - 1;
-        const fallbackCalls = isLastAssistant && toolMessages.length > 0 ? toolMessages.map((toolMessage, idx) => ({
+        const fallbackCalls = !groupHasDeclaredToolCalls && isLastAssistant && toolMessages.length > 0 ? toolMessages.map((toolMessage, idx) => ({
           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 +288,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 +305,18 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolName: tc.name,
               toolArgs: tc.args,
               toolCallId: tc.id,
-              toolStatus: "completed",
-              isIntermediate: true
+              toolStatus,
+              actionRequired: tc.actionRequired,
+              isIntermediate: true,
+              commandExitCode: tc.commandExitCode,
+              durationMs: tc.durationMs,
+              sandboxed: tc.sandboxed,
+              timedOut: tc.timedOut,
+              truncated: tc.truncated,
+              stdoutPath: tc.stdoutPath,
+              stderrPath: tc.stderrPath,
+              presentation: tc.presentation
             });
-            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) {
@@ -218,7 +326,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
                 timestamp: blockTime++,
                 toolName: tc.name,
                 toolCallId: tc.id || toolResultId,
-                isIntermediate: true
+                actionRequired: tc.actionRequired,
+                isIntermediate: true,
+                commandExitCode: tc.commandExitCode,
+                durationMs: tc.durationMs,
+                sandboxed: tc.sandboxed,
+                timedOut: tc.timedOut,
+                truncated: tc.truncated,
+                stdoutPath: tc.stdoutPath,
+                stderrPath: tc.stderrPath,
+                presentation: tc.presentation
               });
               tc.result = resultContent;
             }
@@ -251,6 +368,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 +692,28 @@ 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,
+              command_exit_code: toolResultEvent.command_exit_code,
+              duration_ms: toolResultEvent.duration_ms,
+              sandboxed: toolResultEvent.sandboxed,
+              timed_out: toolResultEvent.timed_out,
+              truncated: toolResultEvent.truncated,
+              stdout_path: toolResultEvent.stdout_path,
+              stderr_path: toolResultEvent.stderr_path,
+              presentation: toolResultEvent.presentation
+            });
             break;
+          }
           case "done":
             forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;

package/dist/core/index.mjs

@@ -1,4 +1,74 @@
+// src/core/tool-status.ts
+var BLOCKING_ACTION_REQUIRED = /* @__PURE__ */ new Set(["install_git_bash"]);
+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" && BLOCKING_ACTION_REQUIRED.has(options.actionRequired)) {
+    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 readToolExecutionNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function readToolExecutionBoolean(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function readToolExecutionString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+function readToolExecutionMetadata(tc) {
+  return {
+    commandExitCode: readToolExecutionNumber(tc.command_exit_code ?? tc.commandExitCode),
+    durationMs: readToolExecutionNumber(tc.duration_ms ?? tc.durationMs),
+    sandboxed: readToolExecutionBoolean(tc.sandboxed),
+    timedOut: readToolExecutionBoolean(tc.timed_out ?? tc.timedOut),
+    truncated: readToolExecutionBoolean(tc.truncated),
+    stdoutPath: readToolExecutionString(tc.stdout_path ?? tc.stdoutPath),
+    stderrPath: readToolExecutionString(tc.stderr_path ?? tc.stderrPath),
+    presentation: readToolExecutionString(tc.presentation)
+  };
+}
 function safeParseArgs(value) {
   if (!value) return void 0;
   if (typeof value === "object") return value;
@@ -28,12 +98,26 @@ 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"
+      }),
+      ...readToolExecutionMetadata(tc)
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -101,6 +185,10 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
       const consecutiveAssistantMsgs = [msg];
       const toolMessages = [];
       let j = i + 1;
+      const hasDeclaredToolCalls = (message) => {
+        const calls = parseToolCalls(message.toolCalls || message.tool_calls);
+        return Boolean(calls && calls.length > 0);
+      };
       while (j < rawMessages.length) {
         if (rawMessages[j].role === "assistant") {
           consecutiveAssistantMsgs.push(rawMessages[j]);
@@ -116,15 +204,19 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
       let blockTime = Date.now();
       let fallbackToolCalls;
       let lastEffectiveToolCalls;
+      const groupHasDeclaredToolCalls = consecutiveAssistantMsgs.some(hasDeclaredToolCalls);
       for (let k = 0; k < consecutiveAssistantMsgs.length; k++) {
         const assistantMsg = consecutiveAssistantMsgs[k];
         const msgToolCalls = parseToolCalls(assistantMsg.toolCalls || assistantMsg.tool_calls);
         const isLastAssistant = k === consecutiveAssistantMsgs.length - 1;
-        const fallbackCalls = isLastAssistant && toolMessages.length > 0 ? toolMessages.map((toolMessage, idx) => ({
+        const fallbackCalls = !groupHasDeclaredToolCalls && isLastAssistant && toolMessages.length > 0 ? toolMessages.map((toolMessage, idx) => ({
           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 +249,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 +266,18 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolName: tc.name,
               toolArgs: tc.args,
               toolCallId: tc.id,
-              toolStatus: "completed",
-              isIntermediate: true
+              toolStatus,
+              actionRequired: tc.actionRequired,
+              isIntermediate: true,
+              commandExitCode: tc.commandExitCode,
+              durationMs: tc.durationMs,
+              sandboxed: tc.sandboxed,
+              timedOut: tc.timedOut,
+              truncated: tc.truncated,
+              stdoutPath: tc.stdoutPath,
+              stderrPath: tc.stderrPath,
+              presentation: tc.presentation
             });
-            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) {
@@ -179,7 +287,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
                 timestamp: blockTime++,
                 toolName: tc.name,
                 toolCallId: tc.id || toolResultId,
-                isIntermediate: true
+                actionRequired: tc.actionRequired,
+                isIntermediate: true,
+                commandExitCode: tc.commandExitCode,
+                durationMs: tc.durationMs,
+                sandboxed: tc.sandboxed,
+                timedOut: tc.timedOut,
+                truncated: tc.truncated,
+                stdoutPath: tc.stdoutPath,
+                stderrPath: tc.stderrPath,
+                presentation: tc.presentation
               });
               tc.result = resultContent;
             }
@@ -212,6 +329,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 +653,28 @@ 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,
+              command_exit_code: toolResultEvent.command_exit_code,
+              duration_ms: toolResultEvent.duration_ms,
+              sandboxed: toolResultEvent.sandboxed,
+              timed_out: toolResultEvent.timed_out,
+              truncated: toolResultEvent.truncated,
+              stdout_path: toolResultEvent.stdout_path,
+              stderr_path: toolResultEvent.stderr_path,
+              presentation: toolResultEvent.presentation
+            });
             break;
+          }
           case "done":
             forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;

package/dist/main/index.js

@@ -617,7 +617,27 @@ 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,
+                command_exit_code: evt.command_exit_code,
+                duration_ms: evt.duration_ms,
+                sandboxed: evt.sandboxed,
+                timed_out: evt.timed_out,
+                truncated: evt.truncated,
+                stdout_path: evt.stdout_path,
+                stderr_path: evt.stderr_path,
+                presentation: evt.presentation
+              }
+            });
             break;
           case "done":
             sawTerminalEvent = true;

package/dist/main/index.mjs

@@ -586,7 +586,27 @@ 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,
+                command_exit_code: evt.command_exit_code,
+                duration_ms: evt.duration_ms,
+                sandboxed: evt.sandboxed,
+                timed_out: evt.timed_out,
+                truncated: evt.truncated,
+                stdout_path: evt.stdout_path,
+                stderr_path: evt.stderr_path,
+                presentation: evt.presentation
+              }
+            });
             break;
           case "done":
             sawTerminalEvent = true;