@yushaw/sanqian-chat 0.2.23 → 0.2.25

package/dist/core/index.d.mts

@@ -496,6 +496,9 @@ interface LinkHandlerConfig {
 
 /** Stream event callback */
 type StreamEvent = {
+    /** Internal stream identifier (set by IPC adapter for precise routing) */
+    stream_id?: string;
+} & ({
     type: 'start';
     run_id: string;
     conversationId?: string;
@@ -543,7 +546,7 @@ type StreamEvent = {
 } | {
     type: 'cancelled';
     run_id?: string;
-};
+});
 /** Message to send */
 interface SendMessage {
     role: 'user' | 'assistant';
@@ -578,7 +581,7 @@ interface ChatAdapter {
     }): Promise<{
         cancel: () => void;
     }>;
-    sendHitlResponse?(response: HitlResponse, runId?: string): void;
+    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): void;
     /** List available context providers */
     listResourceProviders?(): Promise<ContextProviderInfo[]>;
     /** Get resource list from a provider with search/pagination */

package/dist/core/index.d.ts

@@ -496,6 +496,9 @@ interface LinkHandlerConfig {
 
 /** Stream event callback */
 type StreamEvent = {
+    /** Internal stream identifier (set by IPC adapter for precise routing) */
+    stream_id?: string;
+} & ({
     type: 'start';
     run_id: string;
     conversationId?: string;
@@ -543,7 +546,7 @@ type StreamEvent = {
 } | {
     type: 'cancelled';
     run_id?: string;
-};
+});
 /** Message to send */
 interface SendMessage {
     role: 'user' | 'assistant';
@@ -578,7 +581,7 @@ interface ChatAdapter {
     }): Promise<{
         cancel: () => void;
     }>;
-    sendHitlResponse?(response: HitlResponse, runId?: string): void;
+    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): void;
     /** List available context providers */
     listResourceProviders?(): Promise<ContextProviderInfo[]>;
     /** Get resource list from a provider with search/pagination */

package/dist/core/index.js

@@ -581,8 +581,10 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
           default: {
             const evt = event;
             if (evt.type === "interrupt") {
-              currentRunId = evt.run_id || null;
-              setCurrentRunId(evt.run_id || null);
+              if (evt.run_id) {
+                currentRunId = evt.run_id;
+                setCurrentRunId(evt.run_id);
+              }
               onEvent({
                 type: "interrupt",
                 interrupt_type: evt.interrupt_type || "",

package/dist/core/index.mjs

@@ -542,8 +542,10 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
           default: {
             const evt = event;
             if (evt.type === "interrupt") {
-              currentRunId = evt.run_id || null;
-              setCurrentRunId(evt.run_id || null);
+              if (evt.run_id) {
+                currentRunId = evt.run_id;
+                setCurrentRunId(evt.run_id);
+              }
               onEvent({
                 type: "interrupt",
                 interrupt_type: evt.interrupt_type || "",

package/dist/main/index.d.mts

@@ -715,6 +715,7 @@ declare class FloatingWindow {
     private stateSaveTimer;
     private activeStreams;
     private reconnectAcquired;
+    private resolveHitlRunId;
     /**
      * Get SDK instance from either getClient or getSdk
      */
@@ -920,6 +921,10 @@ declare class ChatPanel {
     private scheduleSaveState;
     private saveState;
     private getSdk;
+    /**
+     * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+     */
+    private resolveHitlRunId;
     /**
      * Setup session resource event forwarding from SDK to renderer
      * Called when SDK becomes available (on connect)

package/dist/main/index.d.ts

@@ -715,6 +715,7 @@ declare class FloatingWindow {
     private stateSaveTimer;
     private activeStreams;
     private reconnectAcquired;
+    private resolveHitlRunId;
     /**
      * Get SDK instance from either getClient or getSdk
      */
@@ -920,6 +921,10 @@ declare class ChatPanel {
     private scheduleSaveState;
     private saveState;
     private getSdk;
+    /**
+     * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+     */
+    private resolveHitlRunId;
     /**
      * Setup session resource event forwarding from SDK to renderer
      * Called when SDK becomes available (on connect)

package/dist/main/index.js

@@ -399,6 +399,17 @@ var FloatingWindow = class _FloatingWindow {
       import_electron.app.whenReady().then(() => this.registerShortcut());
     }
   }
+  resolveHitlRunId(runId) {
+    if (runId) return runId;
+    const streams = Array.from(this.activeStreams.values());
+    for (let i = streams.length - 1; i >= 0; i -= 1) {
+      const stream = streams[i];
+      if (stream && stream.runId && !stream.cancelled) {
+        return stream.runId;
+      }
+    }
+    return null;
+  }
   /**
    * Get SDK instance from either getClient or getSdk
    */
@@ -639,7 +650,7 @@ var FloatingWindow = class _FloatingWindow {
         webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "error", error: "SDK or agent not ready" } });
         return;
       }
-      const streamState = { cancelled: false, runId: null };
+      const streamState = { cancelled: false, runId: null, cancelSignalSent: false };
       activeInstance?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -650,7 +661,24 @@ var FloatingWindow = class _FloatingWindow {
           { conversationId, persistHistory: true }
         );
         for await (const evt of stream) {
-          if (streamState.cancelled) break;
+          const evtWithRunId = evt;
+          if (evtWithRunId.run_id && !streamState.runId) {
+            streamState.runId = evtWithRunId.run_id;
+          }
+          if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
+            try {
+              sdk.cancelRun(streamState.runId);
+              streamState.cancelSignalSent = true;
+            } catch (e) {
+              console.warn("[FloatingWindow] Failed to cancel run:", e);
+            }
+          }
+          if (streamState.cancelled) {
+            if (streamState.cancelSignalSent) {
+              break;
+            }
+            continue;
+          }
           if (activeInstance?.options.devMode) {
             console.log("[FloatingWindow] SDK event:", evt.type, JSON.stringify(evt).slice(0, 200));
           }
@@ -702,24 +730,27 @@ var FloatingWindow = class _FloatingWindow {
       const stream = activeInstance?.activeStreams.get(params.streamId);
       if (stream) {
         stream.cancelled = true;
-        if (stream.runId) {
+        if (stream.runId && !stream.cancelSignalSent) {
           const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
           if (sdk) {
             try {
               sdk.cancelRun(stream.runId);
+              stream.cancelSignalSent = true;
             } catch (e) {
               console.warn("[FloatingWindow] Failed to cancel run:", e);
             }
           }
         }
-        activeInstance?.activeStreams.delete(params.streamId);
       }
       return { success: true };
     });
     import_electron.ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
-      if (sdk && params.runId) {
-        sdk.sendHitlResponse(params.runId, params.response);
+      const runId = activeInstance?.resolveHitlRunId(params.runId) ?? null;
+      if (sdk && runId) {
+        sdk.sendHitlResponse(runId, params.response);
+      } else if (activeInstance?.options.devMode) {
+        console.warn("[FloatingWindow] HITL response dropped: missing runId");
       }
       return { success: true };
     });
@@ -1668,6 +1699,20 @@ var ChatPanel = class {
     const client = this.config.getClient();
     return client;
   }
+  /**
+   * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+   */
+  resolveHitlRunId(runId) {
+    if (runId) return runId;
+    const streams = Array.from(this.activeStreams.values());
+    for (let i = streams.length - 1; i >= 0; i -= 1) {
+      const stream = streams[i];
+      if (stream && stream.runId && !stream.cancelled) {
+        return stream.runId;
+      }
+    }
+    return null;
+  }
   /**
    * Setup session resource event forwarding from SDK to renderer
    * Called when SDK becomes available (on connect)
@@ -1729,7 +1774,7 @@ var ChatPanel = class {
         webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "error", error: "SDK or agent not ready" } });
         return;
       }
-      const streamState = { cancelled: false, runId: null };
+      const streamState = { cancelled: false, runId: null, cancelSignalSent: false };
       activeInstance2?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -1745,7 +1790,24 @@ var ChatPanel = class {
           sessionResources: sessionResources?.length ? sessionResources : void 0
         });
         for await (const evt of stream) {
-          if (streamState.cancelled) break;
+          const evtWithRunId = evt;
+          if (evtWithRunId.run_id && !streamState.runId) {
+            streamState.runId = evtWithRunId.run_id;
+          }
+          if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
+            try {
+              sdk.cancelRun(streamState.runId);
+              streamState.cancelSignalSent = true;
+            } catch (e) {
+              console.warn("[ChatPanel] Failed to cancel run:", e);
+            }
+          }
+          if (streamState.cancelled) {
+            if (streamState.cancelSignalSent) {
+              break;
+            }
+            continue;
+          }
           if (activeInstance2?.config.devMode) {
             console.log("[ChatPanel] SDK event:", evt.type, JSON.stringify(evt).slice(0, 200));
           }
@@ -1797,24 +1859,27 @@ var ChatPanel = class {
       const stream = activeInstance2?.activeStreams.get(params.streamId);
       if (stream) {
         stream.cancelled = true;
-        if (stream.runId) {
+        if (stream.runId && !stream.cancelSignalSent) {
           const sdk = activeInstance2?.getSdk();
           if (sdk) {
             try {
               sdk.cancelRun(stream.runId);
+              stream.cancelSignalSent = true;
             } catch (e) {
               console.warn("[ChatPanel] Failed to cancel run:", e);
             }
           }
         }
-        activeInstance2?.activeStreams.delete(params.streamId);
       }
       return { success: true };
     });
     import_electron2.ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance2?.getSdk();
-      if (sdk && params.runId) {
-        sdk.sendHitlResponse(params.runId, params.response);
+      const runId = activeInstance2?.resolveHitlRunId(params.runId) ?? null;
+      if (sdk && runId) {
+        sdk.sendHitlResponse(runId, params.response);
+      } else if (activeInstance2?.config.devMode) {
+        console.warn("[ChatPanel] HITL response dropped: missing runId");
       }
       return { success: true };
     });

package/dist/main/index.mjs

@@ -368,6 +368,17 @@ var FloatingWindow = class _FloatingWindow {
       app.whenReady().then(() => this.registerShortcut());
     }
   }
+  resolveHitlRunId(runId) {
+    if (runId) return runId;
+    const streams = Array.from(this.activeStreams.values());
+    for (let i = streams.length - 1; i >= 0; i -= 1) {
+      const stream = streams[i];
+      if (stream && stream.runId && !stream.cancelled) {
+        return stream.runId;
+      }
+    }
+    return null;
+  }
   /**
    * Get SDK instance from either getClient or getSdk
    */
@@ -608,7 +619,7 @@ var FloatingWindow = class _FloatingWindow {
         webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "error", error: "SDK or agent not ready" } });
         return;
       }
-      const streamState = { cancelled: false, runId: null };
+      const streamState = { cancelled: false, runId: null, cancelSignalSent: false };
       activeInstance?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -619,7 +630,24 @@ var FloatingWindow = class _FloatingWindow {
           { conversationId, persistHistory: true }
         );
         for await (const evt of stream) {
-          if (streamState.cancelled) break;
+          const evtWithRunId = evt;
+          if (evtWithRunId.run_id && !streamState.runId) {
+            streamState.runId = evtWithRunId.run_id;
+          }
+          if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
+            try {
+              sdk.cancelRun(streamState.runId);
+              streamState.cancelSignalSent = true;
+            } catch (e) {
+              console.warn("[FloatingWindow] Failed to cancel run:", e);
+            }
+          }
+          if (streamState.cancelled) {
+            if (streamState.cancelSignalSent) {
+              break;
+            }
+            continue;
+          }
           if (activeInstance?.options.devMode) {
             console.log("[FloatingWindow] SDK event:", evt.type, JSON.stringify(evt).slice(0, 200));
           }
@@ -671,24 +699,27 @@ var FloatingWindow = class _FloatingWindow {
       const stream = activeInstance?.activeStreams.get(params.streamId);
       if (stream) {
         stream.cancelled = true;
-        if (stream.runId) {
+        if (stream.runId && !stream.cancelSignalSent) {
           const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
           if (sdk) {
             try {
               sdk.cancelRun(stream.runId);
+              stream.cancelSignalSent = true;
             } catch (e) {
               console.warn("[FloatingWindow] Failed to cancel run:", e);
             }
           }
         }
-        activeInstance?.activeStreams.delete(params.streamId);
       }
       return { success: true };
     });
     ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
-      if (sdk && params.runId) {
-        sdk.sendHitlResponse(params.runId, params.response);
+      const runId = activeInstance?.resolveHitlRunId(params.runId) ?? null;
+      if (sdk && runId) {
+        sdk.sendHitlResponse(runId, params.response);
+      } else if (activeInstance?.options.devMode) {
+        console.warn("[FloatingWindow] HITL response dropped: missing runId");
       }
       return { success: true };
     });
@@ -1643,6 +1674,20 @@ var ChatPanel = class {
     const client = this.config.getClient();
     return client;
   }
+  /**
+   * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+   */
+  resolveHitlRunId(runId) {
+    if (runId) return runId;
+    const streams = Array.from(this.activeStreams.values());
+    for (let i = streams.length - 1; i >= 0; i -= 1) {
+      const stream = streams[i];
+      if (stream && stream.runId && !stream.cancelled) {
+        return stream.runId;
+      }
+    }
+    return null;
+  }
   /**
    * Setup session resource event forwarding from SDK to renderer
    * Called when SDK becomes available (on connect)
@@ -1704,7 +1749,7 @@ var ChatPanel = class {
         webContents.send("sanqian-chat:streamEvent", { streamId, event: { type: "error", error: "SDK or agent not ready" } });
         return;
       }
-      const streamState = { cancelled: false, runId: null };
+      const streamState = { cancelled: false, runId: null, cancelSignalSent: false };
       activeInstance2?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -1720,7 +1765,24 @@ var ChatPanel = class {
           sessionResources: sessionResources?.length ? sessionResources : void 0
         });
         for await (const evt of stream) {
-          if (streamState.cancelled) break;
+          const evtWithRunId = evt;
+          if (evtWithRunId.run_id && !streamState.runId) {
+            streamState.runId = evtWithRunId.run_id;
+          }
+          if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
+            try {
+              sdk.cancelRun(streamState.runId);
+              streamState.cancelSignalSent = true;
+            } catch (e) {
+              console.warn("[ChatPanel] Failed to cancel run:", e);
+            }
+          }
+          if (streamState.cancelled) {
+            if (streamState.cancelSignalSent) {
+              break;
+            }
+            continue;
+          }
           if (activeInstance2?.config.devMode) {
             console.log("[ChatPanel] SDK event:", evt.type, JSON.stringify(evt).slice(0, 200));
           }
@@ -1772,24 +1834,27 @@ var ChatPanel = class {
       const stream = activeInstance2?.activeStreams.get(params.streamId);
       if (stream) {
         stream.cancelled = true;
-        if (stream.runId) {
+        if (stream.runId && !stream.cancelSignalSent) {
           const sdk = activeInstance2?.getSdk();
           if (sdk) {
             try {
               sdk.cancelRun(stream.runId);
+              stream.cancelSignalSent = true;
             } catch (e) {
               console.warn("[ChatPanel] Failed to cancel run:", e);
             }
           }
         }
-        activeInstance2?.activeStreams.delete(params.streamId);
       }
       return { success: true };
     });
     ipcMain2.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance2?.getSdk();
-      if (sdk && params.runId) {
-        sdk.sendHitlResponse(params.runId, params.response);
+      const runId = activeInstance2?.resolveHitlRunId(params.runId) ?? null;
+      if (sdk && runId) {
+        sdk.sendHitlResponse(runId, params.response);
+      } else if (activeInstance2?.config.devMode) {
+        console.warn("[ChatPanel] HITL response dropped: missing runId");
       }
       return { success: true };
     });

package/dist/preload/factories.d.mts

@@ -176,6 +176,7 @@ interface SanqianChatAPI {
     sendHitlResponse(params: {
         response: HitlResponse;
         runId?: string;
+        streamId?: string;
     }): Promise<{
         success: boolean;
     }>;

package/dist/preload/factories.d.ts

@@ -176,6 +176,7 @@ interface SanqianChatAPI {
     sendHitlResponse(params: {
         response: HitlResponse;
         runId?: string;
+        streamId?: string;
     }): Promise<{
         success: boolean;
     }>;

package/dist/renderer/index.d.mts

@@ -499,6 +499,9 @@ interface LinkHandlerConfig {
 
 /** Stream event callback */
 type StreamEvent = {
+    /** Internal stream identifier (set by IPC adapter for precise routing) */
+    stream_id?: string;
+} & ({
     type: 'start';
     run_id: string;
     conversationId?: string;
@@ -546,7 +549,7 @@ type StreamEvent = {
 } | {
     type: 'cancelled';
     run_id?: string;
-};
+});
 /** Message to send */
 interface SendMessage {
     role: 'user' | 'assistant';
@@ -581,7 +584,7 @@ interface ChatAdapter {
     }): Promise<{
         cancel: () => void;
     }>;
-    sendHitlResponse?(response: HitlResponse, runId?: string): void;
+    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): void;
     /** List available context providers */
     listResourceProviders?(): Promise<ContextProviderInfo[]>;
     /** Get resource list from a provider with search/pagination */

package/dist/renderer/index.d.ts

@@ -499,6 +499,9 @@ interface LinkHandlerConfig {
 
 /** Stream event callback */
 type StreamEvent = {
+    /** Internal stream identifier (set by IPC adapter for precise routing) */
+    stream_id?: string;
+} & ({
     type: 'start';
     run_id: string;
     conversationId?: string;
@@ -546,7 +549,7 @@ type StreamEvent = {
 } | {
     type: 'cancelled';
     run_id?: string;
-};
+});
 /** Message to send */
 interface SendMessage {
     role: 'user' | 'assistant';
@@ -581,7 +584,7 @@ interface ChatAdapter {
     }): Promise<{
         cancel: () => void;
     }>;
-    sendHitlResponse?(response: HitlResponse, runId?: string): void;
+    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): void;
     /** List available context providers */
     listResourceProviders?(): Promise<ContextProviderInfo[]>;
     /** Get resource list from a provider with search/pagination */

package/dist/renderer/index.js

@@ -122,6 +122,7 @@ function useChat(options) {
   const messagesRef = (0, import_react.useRef)(messages);
   const conversationIdRef = (0, import_react.useRef)(conversationId);
   const currentRunIdRef = (0, import_react.useRef)(null);
+  const pendingInterruptStreamIdRef = (0, import_react.useRef)(null);
   const currentAgentIdRef = (0, import_react.useRef)(null);
   const pendingCancelRef = (0, import_react.useRef)(false);
   const pendingCancelTimeoutRef = (0, import_react.useRef)(null);
@@ -573,6 +574,7 @@ function useChat(options) {
         setIsStreaming(false);
         setIsLoading(false);
         currentRunIdRef.current = null;
+        pendingInterruptStreamIdRef.current = null;
         suppressStreamRef.current = false;
         clearPendingCancel();
         break;
@@ -609,6 +611,7 @@ function useChat(options) {
         setIsLoading(false);
         setPendingInterrupt(null);
         currentRunIdRef.current = null;
+        pendingInterruptStreamIdRef.current = null;
         suppressStreamRef.current = false;
         clearPendingCancel();
         break;
@@ -636,13 +639,19 @@ function useChat(options) {
         setIsStreaming(false);
         setIsLoading(false);
         currentRunIdRef.current = null;
+        pendingInterruptStreamIdRef.current = null;
         suppressStreamRef.current = false;
         clearPendingCancel();
         break;
       }
       case "interrupt": {
         flushTypewriter();
-        currentRunIdRef.current = event.run_id ?? null;
+        if (event.run_id) {
+          currentRunIdRef.current = event.run_id;
+        }
+        if (event.stream_id) {
+          pendingInterruptStreamIdRef.current = event.stream_id;
+        }
         const payload = event.interrupt_payload;
         if (payload) {
           setPendingInterrupt(payload);
@@ -665,6 +674,7 @@ function useChat(options) {
     }
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     const userMessage = {
       id: crypto.randomUUID(),
       role: "user",
@@ -784,6 +794,7 @@ function useChat(options) {
     });
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     if (!shouldDelayCancel) {
       clearPendingCancel();
       suppressStreamRef.current = false;
@@ -800,6 +811,7 @@ function useChat(options) {
     setIsStreaming(false);
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     clearPendingCancel();
     suppressStreamRef.current = false;
   }, [clearPendingCancel, resetStreamBuffers]);
@@ -837,23 +849,31 @@ function useChat(options) {
     setPendingInterrupt(null);
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     clearPendingCancel();
   }, [clearPendingCancel, resetStreamBuffers]);
   const sendHitlResponse = (0, import_react.useCallback)((response) => {
-    adapter.sendHitlResponse?.(response, currentRunIdRef.current ?? void 0);
+    adapter.sendHitlResponse?.(
+      response,
+      currentRunIdRef.current ?? void 0,
+      pendingInterruptStreamIdRef.current ?? void 0
+    );
   }, [adapter]);
   const approveHitl = (0, import_react.useCallback)((remember = false) => {
     sendHitlResponse({ approved: true, remember });
     setPendingInterrupt(null);
+    pendingInterruptStreamIdRef.current = null;
   }, [sendHitlResponse]);
   const rejectHitl = (0, import_react.useCallback)((remember = false) => {
     sendHitlResponse({ approved: false, remember });
     setPendingInterrupt(null);
+    pendingInterruptStreamIdRef.current = null;
     setIsLoading(false);
   }, [sendHitlResponse]);
   const submitHitlInput = (0, import_react.useCallback)((response) => {
     sendHitlResponse(response);
     setPendingInterrupt(null);
+    pendingInterruptStreamIdRef.current = null;
     if (response.cancelled || response.timed_out) setIsLoading(false);
   }, [sendHitlResponse]);
   const removeSessionResource = (0, import_react.useCallback)((fullId) => {
@@ -5963,13 +5983,19 @@ function createIpcAdapter() {
     async chatStream(messages, conversationId, onEvent, options) {
       const streamId = crypto.randomUUID();
       streamCallbacks.set(streamId, (event) => {
-        if (event.type === "start" || event.type === "interrupt") {
+        if (event.type === "start") {
           currentRunId = event.run_id || null;
         }
+        if (event.type === "interrupt") {
+          const interruptRunId = event.run_id;
+          if (interruptRunId) {
+            currentRunId = interruptRunId;
+          }
+        }
         if (event.type === "done" || event.type === "cancelled" || event.type === "error") {
           currentRunId = null;
         }
-        onEvent(event);
+        onEvent({ ...event, stream_id: streamId });
       });
       try {
         await api.stream({
@@ -5991,8 +6017,12 @@ function createIpcAdapter() {
         throw e;
       }
     },
-    sendHitlResponse(response, runId) {
-      api.sendHitlResponse({ response, runId: runId || currentRunId || void 0 });
+    sendHitlResponse(response, runId, streamId) {
+      api.sendHitlResponse({
+        response,
+        runId: runId || currentRunId || void 0,
+        streamId: streamId || void 0
+      });
     },
     cleanup() {
       streamEventCleanup?.();
@@ -6366,8 +6396,10 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
           default: {
             const evt = event;
             if (evt.type === "interrupt") {
-              currentRunId = evt.run_id || null;
-              setCurrentRunId(evt.run_id || null);
+              if (evt.run_id) {
+                currentRunId = evt.run_id;
+                setCurrentRunId(evt.run_id);
+              }
               onEvent({
                 type: "interrupt",
                 interrupt_type: evt.interrupt_type || "",
@@ -8018,6 +8050,23 @@ var defaultStrings = {
   approvalRequest: "Approval Request",
   inputRequest: "Input Request"
 };
+var defaultZhStrings = {
+  approve: "\u6279\u51C6",
+  reject: "\u62D2\u7EDD",
+  submit: "\u63D0\u4EA4",
+  cancel: "\u53D6\u6D88",
+  rememberChoice: "\u8BB0\u4F4F\u672C\u6B21\u9009\u62E9",
+  requiredField: "\u6B64\u9879\u5FC5\u586B",
+  timeoutIn: "\u8D85\u65F6\u5269\u4F59",
+  seconds: "\u79D2",
+  executeTool: "\u6267\u884C",
+  toolLabel: "\u5DE5\u5177",
+  argsLabel: "\u53C2\u6570",
+  defaultPrefix: "\u9ED8\u8BA4",
+  enterResponse: "\u8BF7\u8F93\u5165\u4F60\u7684\u56DE\u590D...",
+  approvalRequest: "\u9700\u8981\u5BA1\u6279",
+  inputRequest: "\u9700\u8981\u8F93\u5165"
+};
 var riskColors = {
   low: {
     bg: "bg-blue-500/10",
@@ -8047,9 +8096,37 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
   isDarkMode = false,
   strings = {}
 }) {
-  const t = { ...defaultStrings, ...strings };
+  const mergedStrings = { ...defaultStrings, ...strings };
   const isApproval = interrupt.type === "approval_request";
   const isUserInput = interrupt.type === "user_input_request";
+  const cjkRegex = /[\u3400-\u9fff]/;
+  const hasCjkContent = cjkRegex.test(
+    [
+      interrupt.question || "",
+      interrupt.context || "",
+      interrupt.reason || "",
+      interrupt.tool || "",
+      ...interrupt.options || []
+    ].join(" ")
+  );
+  const t = hasCjkContent ? {
+    ...mergedStrings,
+    approve: mergedStrings.approve === defaultStrings.approve ? defaultZhStrings.approve : mergedStrings.approve,
+    reject: mergedStrings.reject === defaultStrings.reject ? defaultZhStrings.reject : mergedStrings.reject,
+    submit: mergedStrings.submit === defaultStrings.submit ? defaultZhStrings.submit : mergedStrings.submit,
+    cancel: mergedStrings.cancel === defaultStrings.cancel ? defaultZhStrings.cancel : mergedStrings.cancel,
+    rememberChoice: mergedStrings.rememberChoice === defaultStrings.rememberChoice ? defaultZhStrings.rememberChoice : mergedStrings.rememberChoice,
+    requiredField: mergedStrings.requiredField === defaultStrings.requiredField ? defaultZhStrings.requiredField : mergedStrings.requiredField,
+    timeoutIn: mergedStrings.timeoutIn === defaultStrings.timeoutIn ? defaultZhStrings.timeoutIn : mergedStrings.timeoutIn,
+    seconds: mergedStrings.seconds === defaultStrings.seconds ? defaultZhStrings.seconds : mergedStrings.seconds,
+    executeTool: mergedStrings.executeTool === defaultStrings.executeTool ? defaultZhStrings.executeTool : mergedStrings.executeTool,
+    toolLabel: mergedStrings.toolLabel === defaultStrings.toolLabel ? defaultZhStrings.toolLabel : mergedStrings.toolLabel,
+    argsLabel: mergedStrings.argsLabel === defaultStrings.argsLabel ? defaultZhStrings.argsLabel : mergedStrings.argsLabel,
+    defaultPrefix: mergedStrings.defaultPrefix === defaultStrings.defaultPrefix ? defaultZhStrings.defaultPrefix : mergedStrings.defaultPrefix,
+    enterResponse: mergedStrings.enterResponse === defaultStrings.enterResponse ? defaultZhStrings.enterResponse : mergedStrings.enterResponse,
+    approvalRequest: mergedStrings.approvalRequest === defaultStrings.approvalRequest ? defaultZhStrings.approvalRequest : mergedStrings.approvalRequest,
+    inputRequest: mergedStrings.inputRequest === defaultStrings.inputRequest ? defaultZhStrings.inputRequest : mergedStrings.inputRequest
+  } : mergedStrings;
   const [answer, setAnswer] = (0, import_react24.useState)(interrupt.default || "");
   const [selectedIndices, setSelectedIndices] = (0, import_react24.useState)([]);
   const [isComposing, setIsComposing] = (0, import_react24.useState)(false);
@@ -8130,15 +8207,70 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
     }
   };
   const cardBg = isDarkMode ? "bg-zinc-800" : "bg-white";
-  const cardBorder = isDarkMode ? "border-zinc-700" : "border-zinc-200";
+  const cardBorder = isDarkMode ? "border-zinc-600" : "border-zinc-300";
   const textPrimary = isDarkMode ? "text-zinc-100" : "text-zinc-900";
   const textSecondary = isDarkMode ? "text-zinc-400" : "text-zinc-500";
   const inputBg = isDarkMode ? "bg-zinc-900" : "bg-zinc-50";
   const inputBorder = isDarkMode ? "border-zinc-600" : "border-zinc-300";
+  const optionControlStyle = {
+    accentColor: "var(--chat-accent, #2563eb)",
+    width: "1.125rem",
+    height: "1.125rem",
+    margin: 0,
+    flexShrink: 0
+  };
+  const cardStyle = {
+    background: isDarkMode ? "rgba(24, 24, 27, 0.98)" : "#ffffff",
+    borderColor: isDarkMode ? "rgba(212, 212, 216, 0.2)" : "rgba(63, 63, 70, 0.22)",
+    boxShadow: isDarkMode ? "0 12px 30px rgba(0, 0, 0, 0.4)" : "0 10px 24px rgba(15, 23, 42, 0.14)"
+  };
+  const questionStyle = {
+    fontSize: "1rem",
+    lineHeight: 1.55,
+    letterSpacing: "0.01em"
+  };
+  const questionIconStyle = {
+    background: isDarkMode ? "rgba(59, 130, 246, 0.26)" : "rgba(59, 130, 246, 0.16)",
+    color: isDarkMode ? "#dbeafe" : "#1d4ed8"
+  };
+  const cancelButtonClass = isDarkMode ? "flex-1 rounded-lg border border-zinc-500 bg-zinc-700/80 px-3 py-2 text-sm font-semibold text-zinc-100 transition-colors hover:bg-zinc-600" : "flex-1 rounded-lg border border-zinc-300 bg-zinc-100 px-3 py-2 text-sm font-semibold text-zinc-900 transition-colors hover:bg-zinc-200";
+  const isSubmitDisabled = isUserInput && interrupt.required && !answer.trim() && (!interrupt.options || selectedIndices.length === 0);
+  const submitButtonClass = `flex-1 rounded-lg border px-3 py-2 text-sm font-semibold transition-colors ${isSubmitDisabled ? "cursor-not-allowed" : "hover:brightness-105"}`;
+  const cancelButtonStyle = isDarkMode ? {
+    background: "rgba(63, 63, 70, 0.82)",
+    color: "#f4f4f5",
+    borderColor: "rgba(161, 161, 170, 0.6)"
+  } : {
+    background: "#f4f4f5",
+    color: "#18181b",
+    borderColor: "rgba(113, 113, 122, 0.45)"
+  };
+  const submitButtonStyle = isSubmitDisabled ? isDarkMode ? {
+    background: "rgba(82, 82, 91, 0.72)",
+    color: "#d4d4d8",
+    borderColor: "rgba(161, 161, 170, 0.35)",
+    boxShadow: "none"
+  } : {
+    background: "rgba(228, 228, 231, 0.98)",
+    color: "#52525b",
+    borderColor: "rgba(161, 161, 170, 0.42)",
+    boxShadow: "none"
+  } : isApproval && riskLevel === "high" ? {
+    background: "#dc2626",
+    color: "#ffffff",
+    borderColor: "rgba(220, 38, 38, 0.9)",
+    boxShadow: "0 2px 8px rgba(220, 38, 38, 0.35)"
+  } : {
+    background: "var(--chat-accent, #2563eb)",
+    color: "#ffffff",
+    borderColor: "transparent",
+    boxShadow: "0 2px 10px rgba(37, 99, 235, 0.3)"
+  };
   return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
     "div",
     {
       className: `rounded-xl border ${cardBorder} ${cardBg} p-3 shadow-sm`,
+      style: cardStyle,
       role: "dialog",
       "aria-modal": "true",
       "aria-label": isApproval ? t.approvalRequest : t.inputRequest,
@@ -8153,7 +8285,7 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
                 /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: "capitalize", children: riskLevel })
               ]
             }
-          ) : /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: "text-lg", children: "?" }) }),
+          ) : /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: "inline-flex h-7 w-7 items-center justify-center rounded-full text-base font-semibold", style: questionIconStyle, children: "?" }) }),
           timeLeft !== null && timeLeft > 0 && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("span", { className: `text-xs ${textSecondary} whitespace-nowrap`, children: [
             t.timeoutIn,
             " ",
@@ -8162,7 +8294,7 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
           ] })
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "space-y-2", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { className: `text-sm font-medium ${textPrimary} break-words`, children: isApproval ? interrupt.reason || `${t.executeTool} ${interrupt.tool}?` : interrupt.question }),
+          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { className: `text-sm font-semibold ${textPrimary} break-words`, style: questionStyle, children: isApproval ? interrupt.reason || `${t.executeTool} ${interrupt.tool}?` : interrupt.question }),
           isUserInput && interrupt.context && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: `text-xs ${textSecondary} rounded p-2 ${inputBg} break-words`, children: interrupt.context }),
           isApproval && interrupt.tool && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: `text-xs ${textSecondary} rounded p-2 ${inputBg} space-y-1`, children: [
             /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { children: [
@@ -8182,26 +8314,31 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
               /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("code", { className: "text-[10px]", children: JSON.stringify(interrupt.args, null, 0) })
             ] })
           ] }),
-          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "space-y-1.5", children: interrupt.options.map((option, index) => /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
-            "label",
-            {
-              className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${selectedIndices.includes(index) ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
-              children: [
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-                  "input",
-                  {
-                    type: interrupt.multi_select ? "checkbox" : "radio",
-                    name: "hitl-options",
-                    checked: selectedIndices.includes(index),
-                    onChange: () => handleOptionToggle(index),
-                    className: "shrink-0"
-                  }
-                ),
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: `text-sm ${textPrimary} break-words`, children: option })
-              ]
-            },
-            index
-          )) }),
+          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "space-y-1.5", children: interrupt.options.map((option, index) => {
+            const isSelected = selectedIndices.includes(index);
+            const optionStyle = isSelected ? isDarkMode ? { borderColor: "rgba(96, 165, 250, 0.75)", background: "rgba(59, 130, 246, 0.24)" } : { borderColor: "rgba(37, 99, 235, 0.36)", background: "rgba(239, 246, 255, 0.98)" } : isDarkMode ? { borderColor: "rgba(113, 113, 122, 0.6)", background: "rgba(9, 9, 11, 0.84)" } : { borderColor: "rgba(113, 113, 122, 0.34)", background: "rgba(250, 250, 250, 0.96)" };
+            return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+              "label",
+              {
+                className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${isSelected ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
+                style: optionStyle,
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                    "input",
+                    {
+                      type: interrupt.multi_select ? "checkbox" : "radio",
+                      name: "hitl-options",
+                      checked: isSelected,
+                      onChange: () => handleOptionToggle(index),
+                      style: optionControlStyle
+                    }
+                  ),
+                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: `text-sm ${textPrimary} break-words ${isSelected ? "font-semibold" : "font-medium"}`, children: option })
+                ]
+              },
+              index
+            );
+          }) }),
           isUserInput && (!interrupt.options || interrupt.options.length === 0) && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { children: [
             /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
               "input",
@@ -8244,8 +8381,8 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
             "button",
             {
               onClick: handleCancel,
-              style: { color: isDarkMode ? "#f4f4f5" : "#18181b" },
-              className: "flex-1 rounded-lg border border-zinc-600 px-3 py-2 text-sm font-medium transition-colors hover:bg-zinc-700",
+              className: cancelButtonClass,
+              style: cancelButtonStyle,
               children: isApproval ? t.reject : t.cancel
             }
           ),
@@ -8253,8 +8390,9 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
             "button",
             {
               onClick: handleSubmit,
-              disabled: isUserInput && interrupt.required && !answer.trim() && (!interrupt.options || selectedIndices.length === 0),
-              className: `flex-1 rounded-lg px-3 py-2 text-sm font-medium ${isApproval && riskLevel === "high" ? "bg-red-500 hover:bg-red-600" : "bg-blue-500 hover:bg-blue-600"} text-white transition-colors disabled:cursor-not-allowed disabled:opacity-40`,
+              disabled: isSubmitDisabled,
+              className: submitButtonClass,
+              style: submitButtonStyle,
               children: isApproval ? t.approve : t.submit
             }
           )

package/dist/renderer/index.mjs

@@ -34,6 +34,7 @@ function useChat(options) {
   const messagesRef = useRef(messages);
   const conversationIdRef = useRef(conversationId);
   const currentRunIdRef = useRef(null);
+  const pendingInterruptStreamIdRef = useRef(null);
   const currentAgentIdRef = useRef(null);
   const pendingCancelRef = useRef(false);
   const pendingCancelTimeoutRef = useRef(null);
@@ -485,6 +486,7 @@ function useChat(options) {
         setIsStreaming(false);
         setIsLoading(false);
         currentRunIdRef.current = null;
+        pendingInterruptStreamIdRef.current = null;
         suppressStreamRef.current = false;
         clearPendingCancel();
         break;
@@ -521,6 +523,7 @@ function useChat(options) {
         setIsLoading(false);
         setPendingInterrupt(null);
         currentRunIdRef.current = null;
+        pendingInterruptStreamIdRef.current = null;
         suppressStreamRef.current = false;
         clearPendingCancel();
         break;
@@ -548,13 +551,19 @@ function useChat(options) {
         setIsStreaming(false);
         setIsLoading(false);
         currentRunIdRef.current = null;
+        pendingInterruptStreamIdRef.current = null;
         suppressStreamRef.current = false;
         clearPendingCancel();
         break;
       }
       case "interrupt": {
         flushTypewriter();
-        currentRunIdRef.current = event.run_id ?? null;
+        if (event.run_id) {
+          currentRunIdRef.current = event.run_id;
+        }
+        if (event.stream_id) {
+          pendingInterruptStreamIdRef.current = event.stream_id;
+        }
         const payload = event.interrupt_payload;
         if (payload) {
           setPendingInterrupt(payload);
@@ -577,6 +586,7 @@ function useChat(options) {
     }
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     const userMessage = {
       id: crypto.randomUUID(),
       role: "user",
@@ -696,6 +706,7 @@ function useChat(options) {
     });
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     if (!shouldDelayCancel) {
       clearPendingCancel();
       suppressStreamRef.current = false;
@@ -712,6 +723,7 @@ function useChat(options) {
     setIsStreaming(false);
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     clearPendingCancel();
     suppressStreamRef.current = false;
   }, [clearPendingCancel, resetStreamBuffers]);
@@ -749,23 +761,31 @@ function useChat(options) {
     setPendingInterrupt(null);
     resetStreamBuffers();
     currentRunIdRef.current = null;
+    pendingInterruptStreamIdRef.current = null;
     clearPendingCancel();
   }, [clearPendingCancel, resetStreamBuffers]);
   const sendHitlResponse = useCallback((response) => {
-    adapter.sendHitlResponse?.(response, currentRunIdRef.current ?? void 0);
+    adapter.sendHitlResponse?.(
+      response,
+      currentRunIdRef.current ?? void 0,
+      pendingInterruptStreamIdRef.current ?? void 0
+    );
   }, [adapter]);
   const approveHitl = useCallback((remember = false) => {
     sendHitlResponse({ approved: true, remember });
     setPendingInterrupt(null);
+    pendingInterruptStreamIdRef.current = null;
   }, [sendHitlResponse]);
   const rejectHitl = useCallback((remember = false) => {
     sendHitlResponse({ approved: false, remember });
     setPendingInterrupt(null);
+    pendingInterruptStreamIdRef.current = null;
     setIsLoading(false);
   }, [sendHitlResponse]);
   const submitHitlInput = useCallback((response) => {
     sendHitlResponse(response);
     setPendingInterrupt(null);
+    pendingInterruptStreamIdRef.current = null;
     if (response.cancelled || response.timed_out) setIsLoading(false);
   }, [sendHitlResponse]);
   const removeSessionResource = useCallback((fullId) => {
@@ -5875,13 +5895,19 @@ function createIpcAdapter() {
     async chatStream(messages, conversationId, onEvent, options) {
       const streamId = crypto.randomUUID();
       streamCallbacks.set(streamId, (event) => {
-        if (event.type === "start" || event.type === "interrupt") {
+        if (event.type === "start") {
           currentRunId = event.run_id || null;
         }
+        if (event.type === "interrupt") {
+          const interruptRunId = event.run_id;
+          if (interruptRunId) {
+            currentRunId = interruptRunId;
+          }
+        }
         if (event.type === "done" || event.type === "cancelled" || event.type === "error") {
           currentRunId = null;
         }
-        onEvent(event);
+        onEvent({ ...event, stream_id: streamId });
       });
       try {
         await api.stream({
@@ -5903,8 +5929,12 @@ function createIpcAdapter() {
         throw e;
       }
     },
-    sendHitlResponse(response, runId) {
-      api.sendHitlResponse({ response, runId: runId || currentRunId || void 0 });
+    sendHitlResponse(response, runId, streamId) {
+      api.sendHitlResponse({
+        response,
+        runId: runId || currentRunId || void 0,
+        streamId: streamId || void 0
+      });
     },
     cleanup() {
       streamEventCleanup?.();
@@ -6278,8 +6308,10 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
           default: {
             const evt = event;
             if (evt.type === "interrupt") {
-              currentRunId = evt.run_id || null;
-              setCurrentRunId(evt.run_id || null);
+              if (evt.run_id) {
+                currentRunId = evt.run_id;
+                setCurrentRunId(evt.run_id);
+              }
               onEvent({
                 type: "interrupt",
                 interrupt_type: evt.interrupt_type || "",
@@ -7946,6 +7978,23 @@ var defaultStrings = {
   approvalRequest: "Approval Request",
   inputRequest: "Input Request"
 };
+var defaultZhStrings = {
+  approve: "\u6279\u51C6",
+  reject: "\u62D2\u7EDD",
+  submit: "\u63D0\u4EA4",
+  cancel: "\u53D6\u6D88",
+  rememberChoice: "\u8BB0\u4F4F\u672C\u6B21\u9009\u62E9",
+  requiredField: "\u6B64\u9879\u5FC5\u586B",
+  timeoutIn: "\u8D85\u65F6\u5269\u4F59",
+  seconds: "\u79D2",
+  executeTool: "\u6267\u884C",
+  toolLabel: "\u5DE5\u5177",
+  argsLabel: "\u53C2\u6570",
+  defaultPrefix: "\u9ED8\u8BA4",
+  enterResponse: "\u8BF7\u8F93\u5165\u4F60\u7684\u56DE\u590D...",
+  approvalRequest: "\u9700\u8981\u5BA1\u6279",
+  inputRequest: "\u9700\u8981\u8F93\u5165"
+};
 var riskColors = {
   low: {
     bg: "bg-blue-500/10",
@@ -7975,9 +8024,37 @@ var HitlCard = memo8(function HitlCard2({
   isDarkMode = false,
   strings = {}
 }) {
-  const t = { ...defaultStrings, ...strings };
+  const mergedStrings = { ...defaultStrings, ...strings };
   const isApproval = interrupt.type === "approval_request";
   const isUserInput = interrupt.type === "user_input_request";
+  const cjkRegex = /[\u3400-\u9fff]/;
+  const hasCjkContent = cjkRegex.test(
+    [
+      interrupt.question || "",
+      interrupt.context || "",
+      interrupt.reason || "",
+      interrupt.tool || "",
+      ...interrupt.options || []
+    ].join(" ")
+  );
+  const t = hasCjkContent ? {
+    ...mergedStrings,
+    approve: mergedStrings.approve === defaultStrings.approve ? defaultZhStrings.approve : mergedStrings.approve,
+    reject: mergedStrings.reject === defaultStrings.reject ? defaultZhStrings.reject : mergedStrings.reject,
+    submit: mergedStrings.submit === defaultStrings.submit ? defaultZhStrings.submit : mergedStrings.submit,
+    cancel: mergedStrings.cancel === defaultStrings.cancel ? defaultZhStrings.cancel : mergedStrings.cancel,
+    rememberChoice: mergedStrings.rememberChoice === defaultStrings.rememberChoice ? defaultZhStrings.rememberChoice : mergedStrings.rememberChoice,
+    requiredField: mergedStrings.requiredField === defaultStrings.requiredField ? defaultZhStrings.requiredField : mergedStrings.requiredField,
+    timeoutIn: mergedStrings.timeoutIn === defaultStrings.timeoutIn ? defaultZhStrings.timeoutIn : mergedStrings.timeoutIn,
+    seconds: mergedStrings.seconds === defaultStrings.seconds ? defaultZhStrings.seconds : mergedStrings.seconds,
+    executeTool: mergedStrings.executeTool === defaultStrings.executeTool ? defaultZhStrings.executeTool : mergedStrings.executeTool,
+    toolLabel: mergedStrings.toolLabel === defaultStrings.toolLabel ? defaultZhStrings.toolLabel : mergedStrings.toolLabel,
+    argsLabel: mergedStrings.argsLabel === defaultStrings.argsLabel ? defaultZhStrings.argsLabel : mergedStrings.argsLabel,
+    defaultPrefix: mergedStrings.defaultPrefix === defaultStrings.defaultPrefix ? defaultZhStrings.defaultPrefix : mergedStrings.defaultPrefix,
+    enterResponse: mergedStrings.enterResponse === defaultStrings.enterResponse ? defaultZhStrings.enterResponse : mergedStrings.enterResponse,
+    approvalRequest: mergedStrings.approvalRequest === defaultStrings.approvalRequest ? defaultZhStrings.approvalRequest : mergedStrings.approvalRequest,
+    inputRequest: mergedStrings.inputRequest === defaultStrings.inputRequest ? defaultZhStrings.inputRequest : mergedStrings.inputRequest
+  } : mergedStrings;
   const [answer, setAnswer] = useState15(interrupt.default || "");
   const [selectedIndices, setSelectedIndices] = useState15([]);
   const [isComposing, setIsComposing] = useState15(false);
@@ -8058,15 +8135,70 @@ var HitlCard = memo8(function HitlCard2({
     }
   };
   const cardBg = isDarkMode ? "bg-zinc-800" : "bg-white";
-  const cardBorder = isDarkMode ? "border-zinc-700" : "border-zinc-200";
+  const cardBorder = isDarkMode ? "border-zinc-600" : "border-zinc-300";
   const textPrimary = isDarkMode ? "text-zinc-100" : "text-zinc-900";
   const textSecondary = isDarkMode ? "text-zinc-400" : "text-zinc-500";
   const inputBg = isDarkMode ? "bg-zinc-900" : "bg-zinc-50";
   const inputBorder = isDarkMode ? "border-zinc-600" : "border-zinc-300";
+  const optionControlStyle = {
+    accentColor: "var(--chat-accent, #2563eb)",
+    width: "1.125rem",
+    height: "1.125rem",
+    margin: 0,
+    flexShrink: 0
+  };
+  const cardStyle = {
+    background: isDarkMode ? "rgba(24, 24, 27, 0.98)" : "#ffffff",
+    borderColor: isDarkMode ? "rgba(212, 212, 216, 0.2)" : "rgba(63, 63, 70, 0.22)",
+    boxShadow: isDarkMode ? "0 12px 30px rgba(0, 0, 0, 0.4)" : "0 10px 24px rgba(15, 23, 42, 0.14)"
+  };
+  const questionStyle = {
+    fontSize: "1rem",
+    lineHeight: 1.55,
+    letterSpacing: "0.01em"
+  };
+  const questionIconStyle = {
+    background: isDarkMode ? "rgba(59, 130, 246, 0.26)" : "rgba(59, 130, 246, 0.16)",
+    color: isDarkMode ? "#dbeafe" : "#1d4ed8"
+  };
+  const cancelButtonClass = isDarkMode ? "flex-1 rounded-lg border border-zinc-500 bg-zinc-700/80 px-3 py-2 text-sm font-semibold text-zinc-100 transition-colors hover:bg-zinc-600" : "flex-1 rounded-lg border border-zinc-300 bg-zinc-100 px-3 py-2 text-sm font-semibold text-zinc-900 transition-colors hover:bg-zinc-200";
+  const isSubmitDisabled = isUserInput && interrupt.required && !answer.trim() && (!interrupt.options || selectedIndices.length === 0);
+  const submitButtonClass = `flex-1 rounded-lg border px-3 py-2 text-sm font-semibold transition-colors ${isSubmitDisabled ? "cursor-not-allowed" : "hover:brightness-105"}`;
+  const cancelButtonStyle = isDarkMode ? {
+    background: "rgba(63, 63, 70, 0.82)",
+    color: "#f4f4f5",
+    borderColor: "rgba(161, 161, 170, 0.6)"
+  } : {
+    background: "#f4f4f5",
+    color: "#18181b",
+    borderColor: "rgba(113, 113, 122, 0.45)"
+  };
+  const submitButtonStyle = isSubmitDisabled ? isDarkMode ? {
+    background: "rgba(82, 82, 91, 0.72)",
+    color: "#d4d4d8",
+    borderColor: "rgba(161, 161, 170, 0.35)",
+    boxShadow: "none"
+  } : {
+    background: "rgba(228, 228, 231, 0.98)",
+    color: "#52525b",
+    borderColor: "rgba(161, 161, 170, 0.42)",
+    boxShadow: "none"
+  } : isApproval && riskLevel === "high" ? {
+    background: "#dc2626",
+    color: "#ffffff",
+    borderColor: "rgba(220, 38, 38, 0.9)",
+    boxShadow: "0 2px 8px rgba(220, 38, 38, 0.35)"
+  } : {
+    background: "var(--chat-accent, #2563eb)",
+    color: "#ffffff",
+    borderColor: "transparent",
+    boxShadow: "0 2px 10px rgba(37, 99, 235, 0.3)"
+  };
   return /* @__PURE__ */ jsxs6(
     "div",
     {
       className: `rounded-xl border ${cardBorder} ${cardBg} p-3 shadow-sm`,
+      style: cardStyle,
       role: "dialog",
       "aria-modal": "true",
       "aria-label": isApproval ? t.approvalRequest : t.inputRequest,
@@ -8081,7 +8213,7 @@ var HitlCard = memo8(function HitlCard2({
                 /* @__PURE__ */ jsx12("span", { className: "capitalize", children: riskLevel })
               ]
             }
-          ) : /* @__PURE__ */ jsx12("span", { className: "text-lg", children: "?" }) }),
+          ) : /* @__PURE__ */ jsx12("span", { className: "inline-flex h-7 w-7 items-center justify-center rounded-full text-base font-semibold", style: questionIconStyle, children: "?" }) }),
           timeLeft !== null && timeLeft > 0 && /* @__PURE__ */ jsxs6("span", { className: `text-xs ${textSecondary} whitespace-nowrap`, children: [
             t.timeoutIn,
             " ",
@@ -8090,7 +8222,7 @@ var HitlCard = memo8(function HitlCard2({
           ] })
         ] }),
         /* @__PURE__ */ jsxs6("div", { className: "space-y-2", children: [
-          /* @__PURE__ */ jsx12("p", { className: `text-sm font-medium ${textPrimary} break-words`, children: isApproval ? interrupt.reason || `${t.executeTool} ${interrupt.tool}?` : interrupt.question }),
+          /* @__PURE__ */ jsx12("p", { className: `text-sm font-semibold ${textPrimary} break-words`, style: questionStyle, children: isApproval ? interrupt.reason || `${t.executeTool} ${interrupt.tool}?` : interrupt.question }),
           isUserInput && interrupt.context && /* @__PURE__ */ jsx12("div", { className: `text-xs ${textSecondary} rounded p-2 ${inputBg} break-words`, children: interrupt.context }),
           isApproval && interrupt.tool && /* @__PURE__ */ jsxs6("div", { className: `text-xs ${textSecondary} rounded p-2 ${inputBg} space-y-1`, children: [
             /* @__PURE__ */ jsxs6("div", { children: [
@@ -8110,26 +8242,31 @@ var HitlCard = memo8(function HitlCard2({
               /* @__PURE__ */ jsx12("code", { className: "text-[10px]", children: JSON.stringify(interrupt.args, null, 0) })
             ] })
           ] }),
-          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ jsx12("div", { className: "space-y-1.5", children: interrupt.options.map((option, index) => /* @__PURE__ */ jsxs6(
-            "label",
-            {
-              className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${selectedIndices.includes(index) ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
-              children: [
-                /* @__PURE__ */ jsx12(
-                  "input",
-                  {
-                    type: interrupt.multi_select ? "checkbox" : "radio",
-                    name: "hitl-options",
-                    checked: selectedIndices.includes(index),
-                    onChange: () => handleOptionToggle(index),
-                    className: "shrink-0"
-                  }
-                ),
-                /* @__PURE__ */ jsx12("span", { className: `text-sm ${textPrimary} break-words`, children: option })
-              ]
-            },
-            index
-          )) }),
+          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ jsx12("div", { className: "space-y-1.5", children: interrupt.options.map((option, index) => {
+            const isSelected = selectedIndices.includes(index);
+            const optionStyle = isSelected ? isDarkMode ? { borderColor: "rgba(96, 165, 250, 0.75)", background: "rgba(59, 130, 246, 0.24)" } : { borderColor: "rgba(37, 99, 235, 0.36)", background: "rgba(239, 246, 255, 0.98)" } : isDarkMode ? { borderColor: "rgba(113, 113, 122, 0.6)", background: "rgba(9, 9, 11, 0.84)" } : { borderColor: "rgba(113, 113, 122, 0.34)", background: "rgba(250, 250, 250, 0.96)" };
+            return /* @__PURE__ */ jsxs6(
+              "label",
+              {
+                className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${isSelected ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
+                style: optionStyle,
+                children: [
+                  /* @__PURE__ */ jsx12(
+                    "input",
+                    {
+                      type: interrupt.multi_select ? "checkbox" : "radio",
+                      name: "hitl-options",
+                      checked: isSelected,
+                      onChange: () => handleOptionToggle(index),
+                      style: optionControlStyle
+                    }
+                  ),
+                  /* @__PURE__ */ jsx12("span", { className: `text-sm ${textPrimary} break-words ${isSelected ? "font-semibold" : "font-medium"}`, children: option })
+                ]
+              },
+              index
+            );
+          }) }),
           isUserInput && (!interrupt.options || interrupt.options.length === 0) && /* @__PURE__ */ jsxs6("div", { children: [
             /* @__PURE__ */ jsx12(
               "input",
@@ -8172,8 +8309,8 @@ var HitlCard = memo8(function HitlCard2({
             "button",
             {
               onClick: handleCancel,
-              style: { color: isDarkMode ? "#f4f4f5" : "#18181b" },
-              className: "flex-1 rounded-lg border border-zinc-600 px-3 py-2 text-sm font-medium transition-colors hover:bg-zinc-700",
+              className: cancelButtonClass,
+              style: cancelButtonStyle,
               children: isApproval ? t.reject : t.cancel
             }
           ),
@@ -8181,8 +8318,9 @@ var HitlCard = memo8(function HitlCard2({
             "button",
             {
               onClick: handleSubmit,
-              disabled: isUserInput && interrupt.required && !answer.trim() && (!interrupt.options || selectedIndices.length === 0),
-              className: `flex-1 rounded-lg px-3 py-2 text-sm font-medium ${isApproval && riskLevel === "high" ? "bg-red-500 hover:bg-red-600" : "bg-blue-500 hover:bg-blue-600"} text-white transition-colors disabled:cursor-not-allowed disabled:opacity-40`,
+              disabled: isSubmitDisabled,
+              className: submitButtonClass,
+              style: submitButtonStyle,
               children: isApproval ? t.approve : t.submit
             }
           )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yushaw/sanqian-chat",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "Floating chat window SDK for Sanqian AI Assistant",
   "main": "./dist/main/index.js",
   "types": "./dist/main/index.d.ts",