@yushaw/sanqian-chat 0.2.25 → 0.2.30

package/dist/core/index.d.mts

@@ -74,7 +74,8 @@ interface ChatUiConfigSerializable {
     /** Font size scale: small (13px), normal (14px), large (16px), extra-large (18px) */
     fontSize?: ChatFontSize;
     accentColor?: string;
-    locale?: Locale;
+    /** Supports Locale plus BCP-47 variants (e.g. zh-CN, en-US) */
+    locale?: Locale | string;
     strings?: Partial<ChatUiStrings>;
     alwaysOnTop?: boolean;
 }

package/dist/core/index.d.ts

@@ -74,7 +74,8 @@ interface ChatUiConfigSerializable {
     /** Font size scale: small (13px), normal (14px), large (16px), extra-large (18px) */
     fontSize?: ChatFontSize;
     accentColor?: string;
-    locale?: Locale;
+    /** Supports Locale plus BCP-47 variants (e.g. zh-CN, en-US) */
+    locale?: Locale | string;
     strings?: Partial<ChatUiStrings>;
     alwaysOnTop?: boolean;
 }

package/dist/main/index.d.mts

@@ -507,7 +507,8 @@ interface ChatUiConfigSerializable {
     /** Font size scale: small (13px), normal (14px), large (16px), extra-large (18px) */
     fontSize?: ChatFontSize;
     accentColor?: string;
-    locale?: Locale;
+    /** Supports Locale plus BCP-47 variants (e.g. zh-CN, en-US) */
+    locale?: Locale | string;
     strings?: Partial<ChatUiStrings>;
     alwaysOnTop?: boolean;
 }
@@ -922,7 +923,8 @@ declare class ChatPanel {
     private saveState;
     private getSdk;
     /**
-     * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+     * Resolve HITL runId with deterministic binding for concurrent streams.
+     * Priority: explicit runId -> streamId-bound runId -> single active stream fallback.
      */
     private resolveHitlRunId;
     /**

package/dist/main/index.d.ts

@@ -507,7 +507,8 @@ interface ChatUiConfigSerializable {
     /** Font size scale: small (13px), normal (14px), large (16px), extra-large (18px) */
     fontSize?: ChatFontSize;
     accentColor?: string;
-    locale?: Locale;
+    /** Supports Locale plus BCP-47 variants (e.g. zh-CN, en-US) */
+    locale?: Locale | string;
     strings?: Partial<ChatUiStrings>;
     alwaysOnTop?: boolean;
 }
@@ -922,7 +923,8 @@ declare class ChatPanel {
     private saveState;
     private getSdk;
     /**
-     * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+     * Resolve HITL runId with deterministic binding for concurrent streams.
+     * Priority: explicit runId -> streamId-bound runId -> single active stream fallback.
      */
     private resolveHitlRunId;
     /**

package/dist/main/index.js

@@ -366,6 +366,65 @@ var import_electron = require("electron");
 var import_fs = __toESM(require("fs"));
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
+
+// src/main/hitl.ts
+function resolveHitlRunIdFromStreams(params, activeStreams) {
+  if (params.runId) {
+    return params.runId;
+  }
+  if (params.streamId) {
+    const stream = activeStreams.get(params.streamId);
+    if (!stream || stream.cancelled) {
+      return null;
+    }
+    return stream.runId ?? null;
+  }
+  const activeRunIds = /* @__PURE__ */ new Set();
+  for (const stream of activeStreams.values()) {
+    if (stream.cancelled || !stream.runId) continue;
+    activeRunIds.add(stream.runId);
+    if (activeRunIds.size > 1) {
+      return null;
+    }
+  }
+  const first = activeRunIds.values().next();
+  return first.done ? null : first.value;
+}
+function resolveOwnedHitlRunIdFromStreams(params, activeStreams, senderWebContentsId) {
+  if (params.streamId) {
+    const stream = activeStreams.get(params.streamId);
+    if (!stream || stream.cancelled) {
+      return null;
+    }
+    if (stream.ownerWebContentsId !== senderWebContentsId) {
+      return null;
+    }
+    return stream.runId ?? null;
+  }
+  if (params.runId) {
+    for (const stream of activeStreams.values()) {
+      if (stream.cancelled || !stream.runId) continue;
+      if (stream.ownerWebContentsId !== senderWebContentsId) continue;
+      if (stream.runId === params.runId) {
+        return params.runId;
+      }
+    }
+    return null;
+  }
+  const activeRunIds = /* @__PURE__ */ new Set();
+  for (const stream of activeStreams.values()) {
+    if (stream.cancelled || !stream.runId) continue;
+    if (stream.ownerWebContentsId !== senderWebContentsId) continue;
+    activeRunIds.add(stream.runId);
+    if (activeRunIds.size > 1) {
+      return null;
+    }
+  }
+  const first = activeRunIds.values().next();
+  return first.done ? null : first.value;
+}
+
+// src/main/FloatingWindow.ts
 var ipcHandlersRegistered = false;
 var activeInstance = null;
 var setActiveInstance = (instance) => {
@@ -399,16 +458,11 @@ 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;
-      }
+  resolveHitlRunId(params, senderWebContentsId) {
+    if (typeof senderWebContentsId === "number") {
+      return resolveOwnedHitlRunIdFromStreams(params, this.activeStreams, senderWebContentsId);
     }
-    return null;
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Get SDK instance from either getClient or getSdk
@@ -650,7 +704,13 @@ 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, cancelSignalSent: false };
+      const streamState = {
+        cancelled: false,
+        runId: null,
+        cancelSignalSent: false,
+        pendingHitlResponse: null,
+        ownerWebContentsId: webContents.id
+      };
       activeInstance?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -665,6 +725,14 @@ var FloatingWindow = class _FloatingWindow {
           if (evtWithRunId.run_id && !streamState.runId) {
             streamState.runId = evtWithRunId.run_id;
           }
+          if (streamState.pendingHitlResponse && streamState.runId) {
+            try {
+              sdk.sendHitlResponse(streamState.runId, streamState.pendingHitlResponse);
+              streamState.pendingHitlResponse = null;
+            } catch (e) {
+              console.warn("[FloatingWindow] Failed to flush queued HITL response:", e);
+            }
+          }
           if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
             try {
               sdk.cancelRun(streamState.runId);
@@ -726,31 +794,50 @@ var FloatingWindow = class _FloatingWindow {
         activeInstance?.activeStreams.delete(streamId);
       }
     });
-    import_electron.ipcMain.handle("sanqian-chat:cancelStream", (_, params) => {
+    import_electron.ipcMain.handle("sanqian-chat:cancelStream", (event, params) => {
       const stream = activeInstance?.activeStreams.get(params.streamId);
-      if (stream) {
-        stream.cancelled = true;
-        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);
-            }
+      if (!stream) {
+        return { success: false, error: "stream_not_found" };
+      }
+      if (stream.ownerWebContentsId !== event.sender.id) {
+        console.warn("[FloatingWindow] Rejecting cancelStream from non-owner sender");
+        return { success: false, error: "stream_not_owned_by_sender" };
+      }
+      stream.cancelled = true;
+      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);
           }
         }
       }
       return { success: true };
     });
-    import_electron.ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
+    import_electron.ipcMain.handle("sanqian-chat:hitlResponse", (event, params) => {
       const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
-      const runId = activeInstance?.resolveHitlRunId(params.runId) ?? null;
+      const senderWebContentsId = event.sender.id;
+      const runId = activeInstance?.resolveHitlRunId(
+        { runId: params.runId, streamId: params.streamId },
+        senderWebContentsId
+      ) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
+      } else if (params.streamId) {
+        const stream = activeInstance?.activeStreams.get(params.streamId);
+        if (stream && !stream.cancelled && stream.ownerWebContentsId === senderWebContentsId) {
+          stream.pendingHitlResponse = params.response;
+          if (activeInstance?.options.devMode) {
+            console.warn("[FloatingWindow] Queued HITL response while waiting for runId");
+          }
+        } else {
+          console.warn("[FloatingWindow] HITL response dropped: stream not found/cancelled/not-owned");
+        }
       } else if (activeInstance?.options.devMode) {
-        console.warn("[FloatingWindow] HITL response dropped: missing runId");
+        console.warn("[FloatingWindow] HITL response dropped: missing or unauthorized runId");
       }
       return { success: true };
     });
@@ -1700,18 +1787,14 @@ var ChatPanel = class {
     return client;
   }
   /**
-   * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+   * Resolve HITL runId with deterministic binding for concurrent streams.
+   * Priority: explicit runId -> streamId-bound runId -> single active stream fallback.
    */
-  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;
-      }
+  resolveHitlRunId(params, senderWebContentsId) {
+    if (typeof senderWebContentsId === "number") {
+      return resolveOwnedHitlRunIdFromStreams(params, this.activeStreams, senderWebContentsId);
     }
-    return null;
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Setup session resource event forwarding from SDK to renderer
@@ -1774,7 +1857,13 @@ 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, cancelSignalSent: false };
+      const streamState = {
+        cancelled: false,
+        runId: null,
+        cancelSignalSent: false,
+        pendingHitlResponse: null,
+        ownerWebContentsId: webContents.id
+      };
       activeInstance2?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -1794,6 +1883,14 @@ var ChatPanel = class {
           if (evtWithRunId.run_id && !streamState.runId) {
             streamState.runId = evtWithRunId.run_id;
           }
+          if (streamState.pendingHitlResponse && streamState.runId) {
+            try {
+              sdk.sendHitlResponse(streamState.runId, streamState.pendingHitlResponse);
+              streamState.pendingHitlResponse = null;
+            } catch (e) {
+              console.warn("[ChatPanel] Failed to flush queued HITL response:", e);
+            }
+          }
           if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
             try {
               sdk.cancelRun(streamState.runId);
@@ -1855,31 +1952,50 @@ var ChatPanel = class {
         activeInstance2?.activeStreams.delete(streamId);
       }
     });
-    import_electron2.ipcMain.handle("sanqian-chat:cancelStream", (_, params) => {
+    import_electron2.ipcMain.handle("sanqian-chat:cancelStream", (event, params) => {
       const stream = activeInstance2?.activeStreams.get(params.streamId);
-      if (stream) {
-        stream.cancelled = true;
-        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);
-            }
+      if (!stream) {
+        return { success: false, error: "stream_not_found" };
+      }
+      if (stream.ownerWebContentsId !== event.sender.id) {
+        console.warn("[ChatPanel] Rejecting cancelStream from non-owner sender");
+        return { success: false, error: "stream_not_owned_by_sender" };
+      }
+      stream.cancelled = true;
+      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);
           }
         }
       }
       return { success: true };
     });
-    import_electron2.ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
+    import_electron2.ipcMain.handle("sanqian-chat:hitlResponse", (event, params) => {
       const sdk = activeInstance2?.getSdk();
-      const runId = activeInstance2?.resolveHitlRunId(params.runId) ?? null;
+      const senderWebContentsId = event.sender.id;
+      const runId = activeInstance2?.resolveHitlRunId(
+        { runId: params.runId, streamId: params.streamId },
+        senderWebContentsId
+      ) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
+      } else if (params.streamId) {
+        const stream = activeInstance2?.activeStreams.get(params.streamId);
+        if (stream && !stream.cancelled && stream.ownerWebContentsId === senderWebContentsId) {
+          stream.pendingHitlResponse = params.response;
+          if (activeInstance2?.config.devMode) {
+            console.warn("[ChatPanel] Queued HITL response while waiting for runId");
+          }
+        } else {
+          console.warn("[ChatPanel] HITL response dropped: stream not found/cancelled/not-owned");
+        }
       } else if (activeInstance2?.config.devMode) {
-        console.warn("[ChatPanel] HITL response dropped: missing runId");
+        console.warn("[ChatPanel] HITL response dropped: missing or unauthorized runId");
       }
       return { success: true };
     });

package/dist/main/index.mjs

@@ -335,6 +335,65 @@ import { BrowserWindow, globalShortcut, screen, ipcMain, app } from "electron";
 import fs from "fs";
 import os from "os";
 import path from "path";
+
+// src/main/hitl.ts
+function resolveHitlRunIdFromStreams(params, activeStreams) {
+  if (params.runId) {
+    return params.runId;
+  }
+  if (params.streamId) {
+    const stream = activeStreams.get(params.streamId);
+    if (!stream || stream.cancelled) {
+      return null;
+    }
+    return stream.runId ?? null;
+  }
+  const activeRunIds = /* @__PURE__ */ new Set();
+  for (const stream of activeStreams.values()) {
+    if (stream.cancelled || !stream.runId) continue;
+    activeRunIds.add(stream.runId);
+    if (activeRunIds.size > 1) {
+      return null;
+    }
+  }
+  const first = activeRunIds.values().next();
+  return first.done ? null : first.value;
+}
+function resolveOwnedHitlRunIdFromStreams(params, activeStreams, senderWebContentsId) {
+  if (params.streamId) {
+    const stream = activeStreams.get(params.streamId);
+    if (!stream || stream.cancelled) {
+      return null;
+    }
+    if (stream.ownerWebContentsId !== senderWebContentsId) {
+      return null;
+    }
+    return stream.runId ?? null;
+  }
+  if (params.runId) {
+    for (const stream of activeStreams.values()) {
+      if (stream.cancelled || !stream.runId) continue;
+      if (stream.ownerWebContentsId !== senderWebContentsId) continue;
+      if (stream.runId === params.runId) {
+        return params.runId;
+      }
+    }
+    return null;
+  }
+  const activeRunIds = /* @__PURE__ */ new Set();
+  for (const stream of activeStreams.values()) {
+    if (stream.cancelled || !stream.runId) continue;
+    if (stream.ownerWebContentsId !== senderWebContentsId) continue;
+    activeRunIds.add(stream.runId);
+    if (activeRunIds.size > 1) {
+      return null;
+    }
+  }
+  const first = activeRunIds.values().next();
+  return first.done ? null : first.value;
+}
+
+// src/main/FloatingWindow.ts
 var ipcHandlersRegistered = false;
 var activeInstance = null;
 var setActiveInstance = (instance) => {
@@ -368,16 +427,11 @@ 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;
-      }
+  resolveHitlRunId(params, senderWebContentsId) {
+    if (typeof senderWebContentsId === "number") {
+      return resolveOwnedHitlRunIdFromStreams(params, this.activeStreams, senderWebContentsId);
     }
-    return null;
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Get SDK instance from either getClient or getSdk
@@ -619,7 +673,13 @@ 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, cancelSignalSent: false };
+      const streamState = {
+        cancelled: false,
+        runId: null,
+        cancelSignalSent: false,
+        pendingHitlResponse: null,
+        ownerWebContentsId: webContents.id
+      };
       activeInstance?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -634,6 +694,14 @@ var FloatingWindow = class _FloatingWindow {
           if (evtWithRunId.run_id && !streamState.runId) {
             streamState.runId = evtWithRunId.run_id;
           }
+          if (streamState.pendingHitlResponse && streamState.runId) {
+            try {
+              sdk.sendHitlResponse(streamState.runId, streamState.pendingHitlResponse);
+              streamState.pendingHitlResponse = null;
+            } catch (e) {
+              console.warn("[FloatingWindow] Failed to flush queued HITL response:", e);
+            }
+          }
           if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
             try {
               sdk.cancelRun(streamState.runId);
@@ -695,31 +763,50 @@ var FloatingWindow = class _FloatingWindow {
         activeInstance?.activeStreams.delete(streamId);
       }
     });
-    ipcMain.handle("sanqian-chat:cancelStream", (_, params) => {
+    ipcMain.handle("sanqian-chat:cancelStream", (event, params) => {
       const stream = activeInstance?.activeStreams.get(params.streamId);
-      if (stream) {
-        stream.cancelled = true;
-        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);
-            }
+      if (!stream) {
+        return { success: false, error: "stream_not_found" };
+      }
+      if (stream.ownerWebContentsId !== event.sender.id) {
+        console.warn("[FloatingWindow] Rejecting cancelStream from non-owner sender");
+        return { success: false, error: "stream_not_owned_by_sender" };
+      }
+      stream.cancelled = true;
+      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);
           }
         }
       }
       return { success: true };
     });
-    ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
+    ipcMain.handle("sanqian-chat:hitlResponse", (event, params) => {
       const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
-      const runId = activeInstance?.resolveHitlRunId(params.runId) ?? null;
+      const senderWebContentsId = event.sender.id;
+      const runId = activeInstance?.resolveHitlRunId(
+        { runId: params.runId, streamId: params.streamId },
+        senderWebContentsId
+      ) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
+      } else if (params.streamId) {
+        const stream = activeInstance?.activeStreams.get(params.streamId);
+        if (stream && !stream.cancelled && stream.ownerWebContentsId === senderWebContentsId) {
+          stream.pendingHitlResponse = params.response;
+          if (activeInstance?.options.devMode) {
+            console.warn("[FloatingWindow] Queued HITL response while waiting for runId");
+          }
+        } else {
+          console.warn("[FloatingWindow] HITL response dropped: stream not found/cancelled/not-owned");
+        }
       } else if (activeInstance?.options.devMode) {
-        console.warn("[FloatingWindow] HITL response dropped: missing runId");
+        console.warn("[FloatingWindow] HITL response dropped: missing or unauthorized runId");
       }
       return { success: true };
     });
@@ -1675,18 +1762,14 @@ var ChatPanel = class {
     return client;
   }
   /**
-   * Resolve HITL runId. Prefer explicit runId from renderer; fallback to latest active stream runId.
+   * Resolve HITL runId with deterministic binding for concurrent streams.
+   * Priority: explicit runId -> streamId-bound runId -> single active stream fallback.
    */
-  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;
-      }
+  resolveHitlRunId(params, senderWebContentsId) {
+    if (typeof senderWebContentsId === "number") {
+      return resolveOwnedHitlRunIdFromStreams(params, this.activeStreams, senderWebContentsId);
     }
-    return null;
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Setup session resource event forwarding from SDK to renderer
@@ -1749,7 +1832,13 @@ 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, cancelSignalSent: false };
+      const streamState = {
+        cancelled: false,
+        runId: null,
+        cancelSignalSent: false,
+        pendingHitlResponse: null,
+        ownerWebContentsId: webContents.id
+      };
       activeInstance2?.activeStreams.set(streamId, streamState);
       try {
         await sdk.ensureReady();
@@ -1769,6 +1858,14 @@ var ChatPanel = class {
           if (evtWithRunId.run_id && !streamState.runId) {
             streamState.runId = evtWithRunId.run_id;
           }
+          if (streamState.pendingHitlResponse && streamState.runId) {
+            try {
+              sdk.sendHitlResponse(streamState.runId, streamState.pendingHitlResponse);
+              streamState.pendingHitlResponse = null;
+            } catch (e) {
+              console.warn("[ChatPanel] Failed to flush queued HITL response:", e);
+            }
+          }
           if (streamState.cancelled && streamState.runId && !streamState.cancelSignalSent) {
             try {
               sdk.cancelRun(streamState.runId);
@@ -1830,31 +1927,50 @@ var ChatPanel = class {
         activeInstance2?.activeStreams.delete(streamId);
       }
     });
-    ipcMain2.handle("sanqian-chat:cancelStream", (_, params) => {
+    ipcMain2.handle("sanqian-chat:cancelStream", (event, params) => {
       const stream = activeInstance2?.activeStreams.get(params.streamId);
-      if (stream) {
-        stream.cancelled = true;
-        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);
-            }
+      if (!stream) {
+        return { success: false, error: "stream_not_found" };
+      }
+      if (stream.ownerWebContentsId !== event.sender.id) {
+        console.warn("[ChatPanel] Rejecting cancelStream from non-owner sender");
+        return { success: false, error: "stream_not_owned_by_sender" };
+      }
+      stream.cancelled = true;
+      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);
           }
         }
       }
       return { success: true };
     });
-    ipcMain2.handle("sanqian-chat:hitlResponse", (_, params) => {
+    ipcMain2.handle("sanqian-chat:hitlResponse", (event, params) => {
       const sdk = activeInstance2?.getSdk();
-      const runId = activeInstance2?.resolveHitlRunId(params.runId) ?? null;
+      const senderWebContentsId = event.sender.id;
+      const runId = activeInstance2?.resolveHitlRunId(
+        { runId: params.runId, streamId: params.streamId },
+        senderWebContentsId
+      ) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
+      } else if (params.streamId) {
+        const stream = activeInstance2?.activeStreams.get(params.streamId);
+        if (stream && !stream.cancelled && stream.ownerWebContentsId === senderWebContentsId) {
+          stream.pendingHitlResponse = params.response;
+          if (activeInstance2?.config.devMode) {
+            console.warn("[ChatPanel] Queued HITL response while waiting for runId");
+          }
+        } else {
+          console.warn("[ChatPanel] HITL response dropped: stream not found/cancelled/not-owned");
+        }
       } else if (activeInstance2?.config.devMode) {
-        console.warn("[ChatPanel] HITL response dropped: missing runId");
+        console.warn("[ChatPanel] HITL response dropped: missing or unauthorized runId");
       }
       return { success: true };
     });