@yushaw/sanqian-chat 0.2.25 → 0.2.27

package/dist/main/index.d.mts

@@ -922,7 +922,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

@@ -922,7 +922,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,32 @@ 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;
+}
+
+// src/main/FloatingWindow.ts
 var ipcHandlersRegistered = false;
 var activeInstance = null;
 var setActiveInstance = (instance) => {
@@ -399,16 +425,8 @@ 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;
+  resolveHitlRunId(params) {
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Get SDK instance from either getClient or getSdk
@@ -746,7 +764,7 @@ var FloatingWindow = class _FloatingWindow {
     });
     import_electron.ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
-      const runId = activeInstance?.resolveHitlRunId(params.runId) ?? null;
+      const runId = activeInstance?.resolveHitlRunId({ runId: params.runId, streamId: params.streamId }) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
       } else if (activeInstance?.options.devMode) {
@@ -1700,18 +1718,11 @@ 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;
-      }
-    }
-    return null;
+  resolveHitlRunId(params) {
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Setup session resource event forwarding from SDK to renderer
@@ -1875,7 +1886,7 @@ var ChatPanel = class {
     });
     import_electron2.ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance2?.getSdk();
-      const runId = activeInstance2?.resolveHitlRunId(params.runId) ?? null;
+      const runId = activeInstance2?.resolveHitlRunId({ runId: params.runId, streamId: params.streamId }) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
       } else if (activeInstance2?.config.devMode) {

package/dist/main/index.mjs

@@ -335,6 +335,32 @@ 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;
+}
+
+// src/main/FloatingWindow.ts
 var ipcHandlersRegistered = false;
 var activeInstance = null;
 var setActiveInstance = (instance) => {
@@ -368,16 +394,8 @@ 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;
+  resolveHitlRunId(params) {
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Get SDK instance from either getClient or getSdk
@@ -715,7 +733,7 @@ var FloatingWindow = class _FloatingWindow {
     });
     ipcMain.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance ? _FloatingWindow.getSdkFromOptions(activeInstance.options) : null;
-      const runId = activeInstance?.resolveHitlRunId(params.runId) ?? null;
+      const runId = activeInstance?.resolveHitlRunId({ runId: params.runId, streamId: params.streamId }) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
       } else if (activeInstance?.options.devMode) {
@@ -1675,18 +1693,11 @@ 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;
-      }
-    }
-    return null;
+  resolveHitlRunId(params) {
+    return resolveHitlRunIdFromStreams(params, this.activeStreams);
   }
   /**
    * Setup session resource event forwarding from SDK to renderer
@@ -1850,7 +1861,7 @@ var ChatPanel = class {
     });
     ipcMain2.handle("sanqian-chat:hitlResponse", (_, params) => {
       const sdk = activeInstance2?.getSdk();
-      const runId = activeInstance2?.resolveHitlRunId(params.runId) ?? null;
+      const runId = activeInstance2?.resolveHitlRunId({ runId: params.runId, streamId: params.streamId }) ?? null;
       if (sdk && runId) {
         sdk.sendHitlResponse(runId, params.response);
       } else if (activeInstance2?.config.devMode) {

package/dist/renderer/index.js

@@ -853,11 +853,13 @@ function useChat(options) {
     clearPendingCancel();
   }, [clearPendingCancel, resetStreamBuffers]);
   const sendHitlResponse = (0, import_react.useCallback)((response) => {
-    adapter.sendHitlResponse?.(
-      response,
-      currentRunIdRef.current ?? void 0,
-      pendingInterruptStreamIdRef.current ?? void 0
-    );
+    const runId = currentRunIdRef.current ?? void 0;
+    const streamId = pendingInterruptStreamIdRef.current ?? void 0;
+    if (streamId) {
+      adapter.sendHitlResponse?.(response, runId, streamId);
+      return;
+    }
+    adapter.sendHitlResponse?.(response, runId);
   }, [adapter]);
   const approveHitl = (0, import_react.useCallback)((remember = false) => {
     sendHitlResponse({ approved: true, remember });

package/dist/renderer/index.mjs

@@ -765,11 +765,13 @@ function useChat(options) {
     clearPendingCancel();
   }, [clearPendingCancel, resetStreamBuffers]);
   const sendHitlResponse = useCallback((response) => {
-    adapter.sendHitlResponse?.(
-      response,
-      currentRunIdRef.current ?? void 0,
-      pendingInterruptStreamIdRef.current ?? void 0
-    );
+    const runId = currentRunIdRef.current ?? void 0;
+    const streamId = pendingInterruptStreamIdRef.current ?? void 0;
+    if (streamId) {
+      adapter.sendHitlResponse?.(response, runId, streamId);
+      return;
+    }
+    adapter.sendHitlResponse?.(response, runId);
   }, [adapter]);
   const approveHitl = useCallback((remember = false) => {
     sendHitlResponse({ approved: true, remember });

package/package.json

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