@yushaw/sanqian-chat 0.3.1 → 0.3.3

package/dist/renderer/index.js

@@ -90,6 +90,7 @@ module.exports = __toCommonJS(renderer_exports);
 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()) {
@@ -112,7 +113,7 @@ function normalizeToolExecutionStatus(status) {
   }
 }
 function deriveToolExecutionStatus(options) {
-  if (typeof options.actionRequired === "string" && options.actionRequired.length > 0) {
+  if (typeof options.actionRequired === "string" && BLOCKING_ACTION_REQUIRED.has(options.actionRequired)) {
     return "error";
   }
   if (options.error === true) {
@@ -178,6 +179,27 @@ function getToolResultStatus(event) {
     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,
@@ -323,6 +345,7 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
     case "tool_result": {
       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,
@@ -330,7 +353,8 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
         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
+        settingsSubTab: event.settings_sub_tab,
+        ...toolExecutionMetadata
       } : toolCall);
       const hasRunning = toolCalls.some((toolCall) => toolCall.status === "running");
       const blocks = cloneBlocks(assistant.blocks) || [];
@@ -340,7 +364,9 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
       if (toolBlockIndex !== -1) {
         blocks[toolBlockIndex] = {
           ...blocks[toolBlockIndex],
-          toolStatus
+          toolStatus,
+          actionRequired: event.action_required,
+          ...toolExecutionMetadata
         };
       }
       if (resultContent) {
@@ -350,7 +376,9 @@ function updateDetachedSnapshotForEvent(streamContext, event) {
           timestamp: Date.now(),
           toolName: toolBlockIndex !== -1 ? blocks[toolBlockIndex].toolName : void 0,
           toolCallId: event.tool_call_id,
-          isIntermediate: true
+          actionRequired: event.action_required,
+          isIntermediate: true,
+          ...toolExecutionMetadata
         });
       }
       snapshot[assistantIndex] = {
@@ -475,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);
     };
   }, []);
@@ -1076,9 +1106,17 @@ function useChat(options) {
         const toolId = event.tool_call_id;
         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 = toolStatus;
+        if (blockIdx !== -1) {
+          currentBlocksRef.current[blockIdx] = {
+            ...currentBlocksRef.current[blockIdx],
+            toolStatus,
+            actionRequired: event.action_required,
+            ...toolExecutionMetadata
+          };
+        }
         if (resultContent) {
           currentBlocksRef.current.push({
             type: "tool_result",
@@ -1086,7 +1124,9 @@ function useChat(options) {
             timestamp: Date.now(),
             toolName,
             toolCallId: toolId,
-            isIntermediate: true
+            actionRequired: event.action_required,
+            isIntermediate: true,
+            ...toolExecutionMetadata
           });
         }
         setMessages((prev) => {
@@ -1101,7 +1141,8 @@ function useChat(options) {
               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
+              settingsSubTab: event.settings_sub_tab,
+              ...toolExecutionMetadata
             } : t
           );
           const hasRunning = updatedCalls.some((tc) => tc.status === "running");
@@ -2012,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;
@@ -6459,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;
@@ -6506,7 +6570,8 @@ function parseToolCalls(toolCalls) {
         actionRequired,
         error: tc.error,
         fallback: "completed"
-      })
+      }),
+      ...readToolExecutionMetadata(tc)
     };
   }).filter((tc) => tc.name || tc.id);
 }
@@ -6574,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]);
@@ -6589,11 +6658,12 @@ 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,
@@ -6651,7 +6721,16 @@ function mergeConsecutiveAssistantMessages(rawMessages) {
               toolArgs: tc.args,
               toolCallId: tc.id,
               toolStatus,
-              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
             });
             const resultContent = tc.result ?? toolResult?.content;
             const toolResultId = toolResult?.tool_call_id || void 0;
@@ -6662,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;
             }
@@ -7310,7 +7398,15 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
               status: toolResultEvent.status,
               action_required: toolResultEvent.action_required,
               settings_tab: toolResultEvent.settings_tab,
-              settings_sub_tab: toolResultEvent.settings_sub_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;
           }
@@ -8538,6 +8634,7 @@ function buildFallbackBlocksFromToolCalls(toolCalls) {
       toolArgs: toolCall.args,
       toolCallId: toolCall.id,
       toolStatus,
+      actionRequired: toolCall.actionRequired,
       isIntermediate: true
     });
     const resultContent = normalizeToolResult(toolCall.result);
@@ -8548,6 +8645,7 @@ function buildFallbackBlocksFromToolCalls(toolCalls) {
         timestamp: timestamp++,
         toolName: toolCall.name,
         toolCallId: toolCall.id,
+        actionRequired: toolCall.actionRequired,
         isIntermediate: true
       });
     }
@@ -9068,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) {