@yushaw/sanqian-chat 0.3.0 → 0.3.3

package/dist/renderer/index.d.mts

@@ -87,8 +87,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>;
@@ -96,9 +106,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;
@@ -107,6 +120,7 @@ interface MessageBlock {
     toolArgsRaw?: string;
     toolCallId?: string;
     toolStatus?: ToolCallStatus;
+    actionRequired?: string;
     isIntermediate?: boolean;
     fromSubagent?: boolean;
 }
@@ -536,6 +550,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;
@@ -1741,4 +1768,4 @@ declare function ensureChatBaseStyles(): void;
  */
 declare function ensureFullChatStyles(): void;
 
-export { AddResourceButton, type AddResourceButtonProps, type AlertAction, AlertBanner, type AlertBannerProps, type AlertConfig, type AlertType, AttachButton, type AttachButtonProps, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, AttachedResourceTags, type AttachedResourceTagsProps, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, ChatInput, type ChatInputHandle, type ChatInputProps, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfig, type ChatUiConfigSerializable, type ChatUiStrings, CompactChat, type CompactChatController, type CompactChatHistoryConfig, type CompactChatProps, type CompactChatStateSnapshot, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationChangeMeta, type ConversationDetail, type ConversationInfo, type ConversationSwitchOptions, FloatingChat, type FloatingChatProps, type FloatingWindowConfig, HistoryList, type HistoryListProps, HistoryModal, type HistoryModalProps, HitlCard, type HitlCardProps, type HitlInterruptData, I18nProvider, type I18nProviderProps, IntermediateSteps, type IntermediateStepsProps, type LinkClickEvent, type LinkHandlerConfig, type Locale, MarkdownRenderer, type MarkdownRendererProps, type MessageBlock, MessageBubble, type MessageBubbleProps, MessageList, type MessageListProps, type MessageRole, ModeToggleButton, type ModeToggleButtonProps, PanelControls, type PanelControlsProps, PanelHeaderButtons, PanelResizer, Resizer, type ResizerProps, type ResolvedTheme, ResourceChip, ResourceChipList, type ResourceChipListProps, type ResourceChipProps, ResourcePicker, type ResourcePickerItem, type ResourcePickerProps, type ResourcePickerState, SanqianChat, SanqianChatMessage, type SanqianChatMessageProps, type SanqianChatProps, SanqianMessageList, type SanqianMessageListHandle, type SanqianMessageListProps, type SdkAdapterConfig, type SendMessage, type SendMessageOptions, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, StreamingTimeline, type StreamingTimelineProps, type ThemeMode, ThemeProvider, type ThemeProviderProps, ThinkingSection, type ThinkingSectionProps, ToolArgumentsDisplay, type ToolArgumentsDisplayProps, type ToolCall, type ToolCallStatus, type Translations, type UseAttachStateReturn, type UseChatCapabilities, type UseChatOptions, type UseChatPanelReturn, type UseChatReturn, type UseConnectionOptions, type UseConnectionReturn, type UseConversationsOptions, type UseConversationsReturn, type UseFocusPersistenceOptions, type UseResourcePickerOptions, type UseResourcePickerReturn, type WindowPosition, createChatAdapter, createIpcAdapter, createSdkAdapter, ensureChatBaseStyles, ensureFullChatStyles, getTranslations, resolveChatStrings, useAttachState, useChat, useChatPanel, useChatStyles, useConnection, useConversations, useFocusPersistence, useI18n, useIpcUiConfig, useResolvedUiConfig, useResourcePicker, useStandaloneI18n, useStandaloneTheme, useTheme, useWindowDragLock };
+export { AddResourceButton, type AddResourceButtonProps, type AlertAction, AlertBanner, type AlertBannerProps, type AlertConfig, type AlertType, AttachButton, type AttachButtonProps, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, AttachedResourceTags, type AttachedResourceTagsProps, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, ChatInput, type ChatInputHandle, type ChatInputProps, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfig, type ChatUiConfigSerializable, type ChatUiStrings, CompactChat, type CompactChatController, type CompactChatHistoryConfig, type CompactChatProps, type CompactChatStateSnapshot, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationChangeMeta, type ConversationDetail, type ConversationInfo, type ConversationSwitchOptions, FloatingChat, type FloatingChatProps, type FloatingWindowConfig, HistoryList, type HistoryListProps, HistoryModal, type HistoryModalProps, HitlCard, type HitlCardProps, type HitlInterruptData, I18nProvider, type I18nProviderProps, IntermediateSteps, type IntermediateStepsProps, type LinkClickEvent, type LinkHandlerConfig, type Locale, MarkdownRenderer, type MarkdownRendererProps, type MessageBlock, MessageBubble, type MessageBubbleProps, MessageList, type MessageListProps, type MessageRole, ModeToggleButton, type ModeToggleButtonProps, PanelControls, type PanelControlsProps, PanelHeaderButtons, PanelResizer, Resizer, type ResizerProps, type ResolvedTheme, ResourceChip, ResourceChipList, type ResourceChipListProps, type ResourceChipProps, ResourcePicker, type ResourcePickerItem, type ResourcePickerProps, type ResourcePickerState, SanqianChat, SanqianChatMessage, type SanqianChatMessageProps, type SanqianChatProps, SanqianMessageList, type SanqianMessageListHandle, type SanqianMessageListProps, type SdkAdapterConfig, type SendMessage, type SendMessageOptions, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, StreamingTimeline, type StreamingTimelineProps, type ThemeMode, ThemeProvider, type ThemeProviderProps, ThinkingSection, type ThinkingSectionProps, ToolArgumentsDisplay, type ToolArgumentsDisplayProps, type ToolCall, type ToolCallStatus, type ToolExecutionMetadata, type Translations, type UseAttachStateReturn, type UseChatCapabilities, type UseChatOptions, type UseChatPanelReturn, type UseChatReturn, type UseConnectionOptions, type UseConnectionReturn, type UseConversationsOptions, type UseConversationsReturn, type UseFocusPersistenceOptions, type UseResourcePickerOptions, type UseResourcePickerReturn, type WindowPosition, createChatAdapter, createIpcAdapter, createSdkAdapter, ensureChatBaseStyles, ensureFullChatStyles, getTranslations, resolveChatStrings, useAttachState, useChat, useChatPanel, useChatStyles, useConnection, useConversations, useFocusPersistence, useI18n, useIpcUiConfig, useResolvedUiConfig, useResourcePicker, useStandaloneI18n, useStandaloneTheme, useTheme, useWindowDragLock };

package/dist/renderer/index.d.ts

@@ -87,8 +87,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>;
@@ -96,9 +106,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;
@@ -107,6 +120,7 @@ interface MessageBlock {
     toolArgsRaw?: string;
     toolCallId?: string;
     toolStatus?: ToolCallStatus;
+    actionRequired?: string;
     isIntermediate?: boolean;
     fromSubagent?: boolean;
 }
@@ -536,6 +550,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;
@@ -1741,4 +1768,4 @@ declare function ensureChatBaseStyles(): void;
  */
 declare function ensureFullChatStyles(): void;
 
-export { AddResourceButton, type AddResourceButtonProps, type AlertAction, AlertBanner, type AlertBannerProps, type AlertConfig, type AlertType, AttachButton, type AttachButtonProps, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, AttachedResourceTags, type AttachedResourceTagsProps, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, ChatInput, type ChatInputHandle, type ChatInputProps, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfig, type ChatUiConfigSerializable, type ChatUiStrings, CompactChat, type CompactChatController, type CompactChatHistoryConfig, type CompactChatProps, type CompactChatStateSnapshot, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationChangeMeta, type ConversationDetail, type ConversationInfo, type ConversationSwitchOptions, FloatingChat, type FloatingChatProps, type FloatingWindowConfig, HistoryList, type HistoryListProps, HistoryModal, type HistoryModalProps, HitlCard, type HitlCardProps, type HitlInterruptData, I18nProvider, type I18nProviderProps, IntermediateSteps, type IntermediateStepsProps, type LinkClickEvent, type LinkHandlerConfig, type Locale, MarkdownRenderer, type MarkdownRendererProps, type MessageBlock, MessageBubble, type MessageBubbleProps, MessageList, type MessageListProps, type MessageRole, ModeToggleButton, type ModeToggleButtonProps, PanelControls, type PanelControlsProps, PanelHeaderButtons, PanelResizer, Resizer, type ResizerProps, type ResolvedTheme, ResourceChip, ResourceChipList, type ResourceChipListProps, type ResourceChipProps, ResourcePicker, type ResourcePickerItem, type ResourcePickerProps, type ResourcePickerState, SanqianChat, SanqianChatMessage, type SanqianChatMessageProps, type SanqianChatProps, SanqianMessageList, type SanqianMessageListHandle, type SanqianMessageListProps, type SdkAdapterConfig, type SendMessage, type SendMessageOptions, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, StreamingTimeline, type StreamingTimelineProps, type ThemeMode, ThemeProvider, type ThemeProviderProps, ThinkingSection, type ThinkingSectionProps, ToolArgumentsDisplay, type ToolArgumentsDisplayProps, type ToolCall, type ToolCallStatus, type Translations, type UseAttachStateReturn, type UseChatCapabilities, type UseChatOptions, type UseChatPanelReturn, type UseChatReturn, type UseConnectionOptions, type UseConnectionReturn, type UseConversationsOptions, type UseConversationsReturn, type UseFocusPersistenceOptions, type UseResourcePickerOptions, type UseResourcePickerReturn, type WindowPosition, createChatAdapter, createIpcAdapter, createSdkAdapter, ensureChatBaseStyles, ensureFullChatStyles, getTranslations, resolveChatStrings, useAttachState, useChat, useChatPanel, useChatStyles, useConnection, useConversations, useFocusPersistence, useI18n, useIpcUiConfig, useResolvedUiConfig, useResourcePicker, useStandaloneI18n, useStandaloneTheme, useTheme, useWindowDragLock };
+export { AddResourceButton, type AddResourceButtonProps, type AlertAction, AlertBanner, type AlertBannerProps, type AlertConfig, type AlertType, AttachButton, type AttachButtonProps, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, AttachedResourceTags, type AttachedResourceTagsProps, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, ChatInput, type ChatInputHandle, type ChatInputProps, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfig, type ChatUiConfigSerializable, type ChatUiStrings, CompactChat, type CompactChatController, type CompactChatHistoryConfig, type CompactChatProps, type CompactChatStateSnapshot, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationChangeMeta, type ConversationDetail, type ConversationInfo, type ConversationSwitchOptions, FloatingChat, type FloatingChatProps, type FloatingWindowConfig, HistoryList, type HistoryListProps, HistoryModal, type HistoryModalProps, HitlCard, type HitlCardProps, type HitlInterruptData, I18nProvider, type I18nProviderProps, IntermediateSteps, type IntermediateStepsProps, type LinkClickEvent, type LinkHandlerConfig, type Locale, MarkdownRenderer, type MarkdownRendererProps, type MessageBlock, MessageBubble, type MessageBubbleProps, MessageList, type MessageListProps, type MessageRole, ModeToggleButton, type ModeToggleButtonProps, PanelControls, type PanelControlsProps, PanelHeaderButtons, PanelResizer, Resizer, type ResizerProps, type ResolvedTheme, ResourceChip, ResourceChipList, type ResourceChipListProps, type ResourceChipProps, ResourcePicker, type ResourcePickerItem, type ResourcePickerProps, type ResourcePickerState, SanqianChat, SanqianChatMessage, type SanqianChatMessageProps, type SanqianChatProps, SanqianMessageList, type SanqianMessageListHandle, type SanqianMessageListProps, type SdkAdapterConfig, type SendMessage, type SendMessageOptions, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, StreamingTimeline, type StreamingTimelineProps, type ThemeMode, ThemeProvider, type ThemeProviderProps, ThinkingSection, type ThinkingSectionProps, ToolArgumentsDisplay, type ToolArgumentsDisplayProps, type ToolCall, type ToolCallStatus, type ToolExecutionMetadata, type Translations, type UseAttachStateReturn, type UseChatCapabilities, type UseChatOptions, type UseChatPanelReturn, type UseChatReturn, type UseConnectionOptions, type UseConnectionReturn, type UseConversationsOptions, type UseConversationsReturn, type UseFocusPersistenceOptions, type UseResourcePickerOptions, type UseResourcePickerReturn, type WindowPosition, createChatAdapter, createIpcAdapter, createSdkAdapter, ensureChatBaseStyles, ensureFullChatStyles, getTranslations, resolveChatStrings, useAttachState, useChat, useChatPanel, useChatStyles, useConnection, useConversations, useFocusPersistence, useI18n, useIpcUiConfig, useResolvedUiConfig, useResourcePicker, useStandaloneI18n, useStandaloneTheme, useTheme, useWindowDragLock };

package/dist/renderer/index.js

@@ -88,6 +88,68 @@ module.exports = __toCommonJS(renderer_exports);
 
 // src/renderer/hooks/useChat.ts
 var import_react = require("react");
+
+// 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";
+}
+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 +170,36 @@ 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 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 getToolExecutionMetadata(event) {
+  return {
+    commandExitCode: readToolExecutionNumber(event.command_exit_code),
+    durationMs: readToolExecutionNumber(event.duration_ms),
+    sandboxed: readToolExecutionBoolean(event.sandboxed),
+    timedOut: readToolExecutionBoolean(event.timed_out),
+    truncated: readToolExecutionBoolean(event.truncated),
+    stdoutPath: readToolExecutionString(event.stdout_path),
+    stderrPath: readToolExecutionString(event.stderr_path),
+    presentation: readToolExecutionString(event.presentation)
+  };
+}
 function cloneBlocks(blocks) {
   return blocks?.map((block) => ({
     ...block,
@@ -251,7 +343,19 @@ 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 toolExecutionMetadata = getToolExecutionMetadata(event);
+      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,
+        ...toolExecutionMetadata
+      } : toolCall);
       const hasRunning = toolCalls.some((toolCall) => toolCall.status === "running");
       const blocks = cloneBlocks(assistant.blocks) || [];
       const toolBlockIndex = blocks.findIndex(
@@ -260,17 +364,23 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
       if (toolBlockIndex !== -1) {
         blocks[toolBlockIndex] = {
           ...blocks[toolBlockIndex],
-          toolStatus: "completed"
+          toolStatus,
+          actionRequired: event.action_required,
+          ...toolExecutionMetadata
         };
       }
-      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,
+          actionRequired: event.action_required,
+          isIntermediate: true,
+          ...toolExecutionMetadata
+        });
+      }
       snapshot[assistantIndex] = {
         ...assistant,
         toolCalls,
@@ -393,16 +503,18 @@ function useChat(options) {
   }, [conversationId]);
   (0, import_react.useEffect)(() => {
     isMountedRef.current = true;
+    const streamContexts = streamContextsRef.current;
+    const conversationStreamTokens = conversationStreamTokensRef.current;
     return () => {
       isMountedRef.current = false;
       cancelRef.current?.();
-      streamContextsRef.current.forEach((context) => {
+      streamContexts.forEach((context) => {
         context.suppressed = true;
         context.terminal = true;
         context.cancel?.();
       });
-      streamContextsRef.current.clear();
-      conversationStreamTokensRef.current.clear();
+      streamContexts.clear();
+      conversationStreamTokens.clear();
       if (typewriterIntervalRef.current) clearTimeout(typewriterIntervalRef.current);
     };
   }, []);
@@ -992,24 +1104,46 @@ 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 toolExecutionMetadata = getToolExecutionMetadata(event);
         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] = {
+            ...currentBlocksRef.current[blockIdx],
+            toolStatus,
+            actionRequired: event.action_required,
+            ...toolExecutionMetadata
+          };
+        }
+        if (resultContent) {
+          currentBlocksRef.current.push({
+            type: "tool_result",
+            content: resultContent,
+            timestamp: Date.now(),
+            toolName,
+            toolCallId: toolId,
+            actionRequired: event.action_required,
+            isIntermediate: true,
+            ...toolExecutionMetadata
+          });
+        }
         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,
+              ...toolExecutionMetadata
+            } : t
           );
           const hasRunning = updatedCalls.some((tc) => tc.status === "running");
           const updated = [...prev];
@@ -1919,7 +2053,9 @@ function useConnection(options) {
   const [errorCode, setErrorCode] = (0, import_react4.useState)();
   const isMountedRef = (0, import_react4.useRef)(true);
   const onStatusChangeRef = (0, import_react4.useRef)(onStatusChange);
-  onStatusChangeRef.current = onStatusChange;
+  (0, import_react4.useEffect)(() => {
+    onStatusChangeRef.current = onStatusChange;
+  }, [onStatusChange]);
   const reconnectAttemptsRef = (0, import_react4.useRef)(0);
   (0, import_react4.useEffect)(() => {
     isMountedRef.current = true;
@@ -6366,6 +6502,27 @@ function useWindowDragLock(active) {
 }
 
 // src/core/history.ts
+function readToolExecutionNumber2(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function readToolExecutionBoolean2(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function readToolExecutionString2(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+function readToolExecutionMetadata(tc) {
+  return {
+    commandExitCode: readToolExecutionNumber2(tc.command_exit_code ?? tc.commandExitCode),
+    durationMs: readToolExecutionNumber2(tc.duration_ms ?? tc.durationMs),
+    sandboxed: readToolExecutionBoolean2(tc.sandboxed),
+    timedOut: readToolExecutionBoolean2(tc.timed_out ?? tc.timedOut),
+    truncated: readToolExecutionBoolean2(tc.truncated),
+    stdoutPath: readToolExecutionString2(tc.stdout_path ?? tc.stdoutPath),
+    stderrPath: readToolExecutionString2(tc.stderr_path ?? tc.stderrPath),
+    presentation: readToolExecutionString2(tc.presentation)
+  };
+}
 function safeParseArgs(value) {
   if (!value) return void 0;
   if (typeof value === "object") return value;
@@ -6395,12 +6552,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);
 }
@@ -6468,6 +6639,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]);
@@ -6483,15 +6658,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;
@@ -6524,6 +6703,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 +6720,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) {
@@ -6546,7 +6741,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;
             }
@@ -6579,6 +6783,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 +7388,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;
@@ -7929,8 +8159,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 +8197,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 +8619,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: "",
@@ -8397,6 +8634,7 @@ function buildFallbackBlocksFromToolCalls(toolCalls) {
       toolArgs: toolCall.args,
       toolCallId: toolCall.id,
       toolStatus,
+      actionRequired: toolCall.actionRequired,
       isIntermediate: true
     });
     const resultContent = normalizeToolResult(toolCall.result);
@@ -8407,6 +8645,7 @@ function buildFallbackBlocksFromToolCalls(toolCalls) {
         timestamp: timestamp++,
         toolName: toolCall.name,
         toolCallId: toolCall.id,
+        actionRequired: toolCall.actionRequired,
         isIntermediate: true
       });
     }
@@ -8927,9 +9166,13 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
   const riskLevel = interrupt.risk_level || "medium";
   const riskStyle = riskColors[riskLevel];
   const onSubmitRef = (0, import_react24.useRef)(onSubmit);
-  onSubmitRef.current = onSubmit;
   const onCancelRef = (0, import_react24.useRef)(onCancel);
-  onCancelRef.current = onCancel;
+  (0, import_react24.useEffect)(() => {
+    onSubmitRef.current = onSubmit;
+  }, [onSubmit]);
+  (0, import_react24.useEffect)(() => {
+    onCancelRef.current = onCancel;
+  }, [onCancel]);
   (0, import_react24.useEffect)(() => {
     if (isUserInput) {
       if (!interrupt.options || interrupt.options.length === 0) {