@yushaw/sanqian-chat 0.2.44 → 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

@@ -575,7 +575,14 @@ function registerStreamIpcHandlers(ipcMainHandle, ctx) {
               (runId, ownerWebContentsId) => ctx.rememberRunOwner(runId, ownerWebContentsId),
               { overwrite: true }
             );
-            webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "start", run_id: startEvt.run_id } });
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "start",
+                run_id: startEvt.run_id,
+                conversationId: startEvt.conversationId
+              }
+            });
             break;
           }
           case "text":
@@ -587,8 +594,42 @@ function registerStreamIpcHandlers(ipcMainHandle, ctx) {
           case "tool_call":
             webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "tool_call", tool_call: evt.tool_call } });
             break;
+          case "tool_args_chunk":
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "tool_args_chunk",
+                tool_call_id: evt.tool_call_id,
+                tool_name: evt.tool_name,
+                chunk: evt.chunk
+              }
+            });
+            break;
+          case "tool_args":
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "tool_args",
+                tool_call_id: evt.tool_call_id,
+                tool_name: evt.tool_name,
+                args: evt.args
+              }
+            });
+            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

@@ -544,7 +544,14 @@ function registerStreamIpcHandlers(ipcMainHandle, ctx) {
               (runId, ownerWebContentsId) => ctx.rememberRunOwner(runId, ownerWebContentsId),
               { overwrite: true }
             );
-            webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "start", run_id: startEvt.run_id } });
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "start",
+                run_id: startEvt.run_id,
+                conversationId: startEvt.conversationId
+              }
+            });
             break;
           }
           case "text":
@@ -556,8 +563,42 @@ function registerStreamIpcHandlers(ipcMainHandle, ctx) {
           case "tool_call":
             webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "tool_call", tool_call: evt.tool_call } });
             break;
+          case "tool_args_chunk":
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "tool_args_chunk",
+                tool_call_id: evt.tool_call_id,
+                tool_name: evt.tool_name,
+                chunk: evt.chunk
+              }
+            });
+            break;
+          case "tool_args":
+            webContents.send("sanqian-chat:streamEvent", {
+              streamId,
+              event: {
+                type: "tool_args",
+                tool_call_id: evt.tool_call_id,
+                tool_name: evt.tool_name,
+                args: evt.args
+              }
+            });
+            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;