@yushaw/sanqian-chat 0.2.33 → 0.2.36

package/dist/core/index.d.mts

@@ -553,6 +553,14 @@ interface SendMessage {
     role: 'user' | 'assistant';
     content: string;
 }
+/**
+ * HITL response outcome.
+ *
+ * Keep `void` for backwards compatibility with legacy/custom adapters that
+ * predate boolean acknowledgement semantics. A future major release can remove
+ * `void` after a deprecation window.
+ */
+type HitlResponseOutcome = boolean | void | Promise<boolean | void>;
 /** Chat adapter interface */
 interface ChatAdapter {
     connect(): Promise<void>;
@@ -582,7 +590,7 @@ interface ChatAdapter {
     }): Promise<{
         cancel: () => void;
     }>;
-    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): void;
+    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): HitlResponseOutcome;
     /** List available context providers */
     listResourceProviders?(): Promise<ContextProviderInfo[]>;
     /** Get resource list from a provider with search/pagination */
@@ -690,4 +698,4 @@ declare function parseToolCalls(toolCalls: unknown): ToolCall[] | undefined;
  */
 declare function mergeConsecutiveAssistantMessages(rawMessages: ApiMessage[]): ChatMessage[];
 
-export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };
+export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type HitlResponseOutcome, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };

package/dist/core/index.d.ts

@@ -553,6 +553,14 @@ interface SendMessage {
     role: 'user' | 'assistant';
     content: string;
 }
+/**
+ * HITL response outcome.
+ *
+ * Keep `void` for backwards compatibility with legacy/custom adapters that
+ * predate boolean acknowledgement semantics. A future major release can remove
+ * `void` after a deprecation window.
+ */
+type HitlResponseOutcome = boolean | void | Promise<boolean | void>;
 /** Chat adapter interface */
 interface ChatAdapter {
     connect(): Promise<void>;
@@ -582,7 +590,7 @@ interface ChatAdapter {
     }): Promise<{
         cancel: () => void;
     }>;
-    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): void;
+    sendHitlResponse?(response: HitlResponse, runId?: string, streamId?: string): HitlResponseOutcome;
     /** List available context providers */
     listResourceProviders?(): Promise<ContextProviderInfo[]>;
     /** Get resource list from a provider with search/pagination */
@@ -690,4 +698,4 @@ declare function parseToolCalls(toolCalls: unknown): ToolCall[] | undefined;
  */
 declare function mergeConsecutiveAssistantMessages(rawMessages: ApiMessage[]): ChatMessage[];
 
-export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };
+export { type ApiMessage, type AttachConfig, type AttachPosition, type AttachState, type AttachedResource, type AttachmentMenuItem, type AttachmentMenuItemType, type ChatAdapter, type ChatAdapterConfig, type ChatFontSize, type ChatMessage, type ChatPanelConfig, type ChatPanelMode, type ChatPanelPosition, type ChatThemeMode, type ChatUiConfigSerializable, type ChatUiStrings, type ConnectionErrorCode, type ConnectionStatus, type ContextProviderInfo, type ConversationDetail, type ConversationInfo, type FloatingWindowConfig, type HitlInterruptData, type HitlResponseOutcome, type LinkClickEvent, type LinkHandlerConfig, type Locale, type MessageBlock, type MessageRole, type ResourcePickerItem, type ResourcePickerState, type SdkAdapterConfig, type SendMessage, type SessionResource, type SessionResourceEvent, type StoredSessionResource, type StreamEvent, type ToolCall, type ToolCallStatus, type WindowPosition, createChatAdapter, createSdkAdapter, mergeConsecutiveAssistantMessages, parseToolCalls };

package/dist/core/index.js

@@ -313,7 +313,7 @@ function createChatAdapter(config) {
   let sdkPromise = null;
   let connectionStatus = "disconnected";
   const connectionListeners = /* @__PURE__ */ new Set();
-  let currentRunId = null;
+  const streamRunIds = /* @__PURE__ */ new Map();
   let reconnectAcquired = false;
   const updateStatus = (status, error, errorCode) => {
     connectionStatus = status;
@@ -462,16 +462,20 @@ function createChatAdapter(config) {
           sessionResources: options?.sessionResources
         }
       );
+      const streamId = `stream-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
       return processStreamEvents(stream, onEvent, sdk, (id) => {
-        currentRunId = id;
-      });
+        if (id) streamRunIds.set(streamId, id);
+        else streamRunIds.delete(streamId);
+      }, streamId);
     },
-    sendHitlResponse(response, runId) {
-      if (!sdkInstance) return;
-      const id = runId || currentRunId;
+    sendHitlResponse(response, runId, streamId) {
+      if (!sdkInstance) return false;
+      const id = runId || (streamId ? streamRunIds.get(streamId) : void 0) || streamRunIds.values().next().value || null;
       if (id) {
         sdkInstance.sendHitlResponse(id, response);
+        return true;
       }
+      return false;
     },
     // Session Resources (delegated to shared helper)
     ...createSessionResourceMethods(() => sdkInstance)
@@ -513,14 +517,18 @@ function createSessionResourceMethods(getSdk) {
     async removeSessionResource(fullId) {
       const sdk = getSdk();
       if (!sdk) return;
-      await sdk.removeSessionResource?.(fullId);
+      await sdk.removeResource?.(fullId);
     }
   };
 }
-function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
+function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
   const controller = new AbortController();
   const signal = controller.signal;
   let currentRunId = null;
+  const forward = (event) => {
+    if (streamId) event.stream_id = streamId;
+    onEvent(event);
+  };
   (async () => {
     try {
       for await (const event of stream) {
@@ -530,22 +538,22 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
             if (event.run_id) {
               currentRunId = event.run_id;
               setCurrentRunId(event.run_id);
-              onEvent({ type: "start", run_id: event.run_id, conversationId: event.conversationId });
+              forward({ type: "start", run_id: event.run_id, conversationId: event.conversationId });
             }
             break;
           case "text":
-            onEvent({ type: "text", content: event.content || "" });
+            forward({ type: "text", content: event.content || "" });
             break;
           case "thinking":
-            onEvent({ type: "thinking", content: event.content || "" });
+            forward({ type: "thinking", content: event.content || "" });
             break;
           case "tool_call":
             if (event.tool_call) {
-              onEvent({ type: "tool_call", tool_call: event.tool_call });
+              forward({ type: "tool_call", tool_call: event.tool_call });
             }
             break;
           case "tool_args_chunk":
-            onEvent({
+            forward({
               type: "tool_args_chunk",
               tool_call_id: event.tool_call_id || "",
               tool_name: event.tool_name,
@@ -553,7 +561,7 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
             });
             break;
           case "tool_args":
-            onEvent({
+            forward({
               type: "tool_args",
               tool_call_id: event.tool_call_id || "",
               tool_name: event.tool_name,
@@ -561,20 +569,20 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
             });
             break;
           case "tool_result":
-            onEvent({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
+            forward({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
             break;
           case "done":
-            onEvent({ type: "done", conversationId: event.conversationId || "", title: event.title });
+            forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;
             setCurrentRunId(null);
             break;
           case "cancelled":
-            onEvent({ type: "cancelled", run_id: event.run_id });
+            forward({ type: "cancelled", run_id: event.run_id });
             currentRunId = null;
             setCurrentRunId(null);
             break;
           case "error":
-            onEvent({ type: "error", error: event.error || "Unknown error" });
+            forward({ type: "error", error: event.error || "Unknown error" });
             currentRunId = null;
             setCurrentRunId(null);
             break;
@@ -585,7 +593,7 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
                 currentRunId = evt.run_id;
                 setCurrentRunId(evt.run_id);
               }
-              onEvent({
+              forward({
                 type: "interrupt",
                 interrupt_type: evt.interrupt_type || "",
                 interrupt_payload: evt.interrupt_payload,
@@ -598,7 +606,7 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
       }
     } catch (e) {
       if (!signal.aborted) {
-        onEvent({ type: "error", error: e instanceof Error ? e.message : "Stream error" });
+        forward({ type: "error", error: e instanceof Error ? e.message : "Stream error" });
       }
     }
   })();
@@ -613,13 +621,14 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
           console.warn("[chat adapter] Failed to cancel run:", e);
         }
       }
+      setCurrentRunId(null);
     }
   };
 }
 function createSdkAdapter(config) {
   let connectionStatus = "disconnected";
   const connectionListeners = /* @__PURE__ */ new Set();
-  let currentRunId = null;
+  const streamRunIds = /* @__PURE__ */ new Map();
   const updateStatus = (status, error, errorCode) => {
     connectionStatus = status;
     connectionListeners.forEach((cb) => cb(status, error, errorCode));
@@ -732,17 +741,21 @@ function createSdkAdapter(config) {
           sessionResources: options?.sessionResources
         }
       );
+      const streamId = `stream-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
       return processStreamEvents(stream, onEvent, sdk, (id) => {
-        currentRunId = id;
-      });
+        if (id) streamRunIds.set(streamId, id);
+        else streamRunIds.delete(streamId);
+      }, streamId);
     },
-    sendHitlResponse(response, runId) {
+    sendHitlResponse(response, runId, streamId) {
       const sdk = config.getSdk();
-      if (!sdk) return;
-      const id = runId || currentRunId;
+      if (!sdk) return false;
+      const id = runId || (streamId ? streamRunIds.get(streamId) : void 0) || streamRunIds.values().next().value || null;
       if (id) {
         sdk.sendHitlResponse(id, response);
+        return true;
       }
+      return false;
     },
     // Session Resources (delegated to shared helper)
     ...createSessionResourceMethods(config.getSdk)

package/dist/core/index.mjs

@@ -274,7 +274,7 @@ function createChatAdapter(config) {
   let sdkPromise = null;
   let connectionStatus = "disconnected";
   const connectionListeners = /* @__PURE__ */ new Set();
-  let currentRunId = null;
+  const streamRunIds = /* @__PURE__ */ new Map();
   let reconnectAcquired = false;
   const updateStatus = (status, error, errorCode) => {
     connectionStatus = status;
@@ -423,16 +423,20 @@ function createChatAdapter(config) {
           sessionResources: options?.sessionResources
         }
       );
+      const streamId = `stream-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
       return processStreamEvents(stream, onEvent, sdk, (id) => {
-        currentRunId = id;
-      });
+        if (id) streamRunIds.set(streamId, id);
+        else streamRunIds.delete(streamId);
+      }, streamId);
     },
-    sendHitlResponse(response, runId) {
-      if (!sdkInstance) return;
-      const id = runId || currentRunId;
+    sendHitlResponse(response, runId, streamId) {
+      if (!sdkInstance) return false;
+      const id = runId || (streamId ? streamRunIds.get(streamId) : void 0) || streamRunIds.values().next().value || null;
       if (id) {
         sdkInstance.sendHitlResponse(id, response);
+        return true;
       }
+      return false;
     },
     // Session Resources (delegated to shared helper)
     ...createSessionResourceMethods(() => sdkInstance)
@@ -474,14 +478,18 @@ function createSessionResourceMethods(getSdk) {
     async removeSessionResource(fullId) {
       const sdk = getSdk();
       if (!sdk) return;
-      await sdk.removeSessionResource?.(fullId);
+      await sdk.removeResource?.(fullId);
     }
   };
 }
-function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
+function processStreamEvents(stream, onEvent, sdk, setCurrentRunId, streamId) {
   const controller = new AbortController();
   const signal = controller.signal;
   let currentRunId = null;
+  const forward = (event) => {
+    if (streamId) event.stream_id = streamId;
+    onEvent(event);
+  };
   (async () => {
     try {
       for await (const event of stream) {
@@ -491,22 +499,22 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
             if (event.run_id) {
               currentRunId = event.run_id;
               setCurrentRunId(event.run_id);
-              onEvent({ type: "start", run_id: event.run_id, conversationId: event.conversationId });
+              forward({ type: "start", run_id: event.run_id, conversationId: event.conversationId });
             }
             break;
           case "text":
-            onEvent({ type: "text", content: event.content || "" });
+            forward({ type: "text", content: event.content || "" });
             break;
           case "thinking":
-            onEvent({ type: "thinking", content: event.content || "" });
+            forward({ type: "thinking", content: event.content || "" });
             break;
           case "tool_call":
             if (event.tool_call) {
-              onEvent({ type: "tool_call", tool_call: event.tool_call });
+              forward({ type: "tool_call", tool_call: event.tool_call });
             }
             break;
           case "tool_args_chunk":
-            onEvent({
+            forward({
               type: "tool_args_chunk",
               tool_call_id: event.tool_call_id || "",
               tool_name: event.tool_name,
@@ -514,7 +522,7 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
             });
             break;
           case "tool_args":
-            onEvent({
+            forward({
               type: "tool_args",
               tool_call_id: event.tool_call_id || "",
               tool_name: event.tool_name,
@@ -522,20 +530,20 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
             });
             break;
           case "tool_result":
-            onEvent({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
+            forward({ type: "tool_result", tool_call_id: event.tool_call_id || "", result: event.result });
             break;
           case "done":
-            onEvent({ type: "done", conversationId: event.conversationId || "", title: event.title });
+            forward({ type: "done", conversationId: event.conversationId || "", title: event.title });
             currentRunId = null;
             setCurrentRunId(null);
             break;
           case "cancelled":
-            onEvent({ type: "cancelled", run_id: event.run_id });
+            forward({ type: "cancelled", run_id: event.run_id });
             currentRunId = null;
             setCurrentRunId(null);
             break;
           case "error":
-            onEvent({ type: "error", error: event.error || "Unknown error" });
+            forward({ type: "error", error: event.error || "Unknown error" });
             currentRunId = null;
             setCurrentRunId(null);
             break;
@@ -546,7 +554,7 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
                 currentRunId = evt.run_id;
                 setCurrentRunId(evt.run_id);
               }
-              onEvent({
+              forward({
                 type: "interrupt",
                 interrupt_type: evt.interrupt_type || "",
                 interrupt_payload: evt.interrupt_payload,
@@ -559,7 +567,7 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
       }
     } catch (e) {
       if (!signal.aborted) {
-        onEvent({ type: "error", error: e instanceof Error ? e.message : "Stream error" });
+        forward({ type: "error", error: e instanceof Error ? e.message : "Stream error" });
       }
     }
   })();
@@ -574,13 +582,14 @@ function processStreamEvents(stream, onEvent, sdk, setCurrentRunId) {
           console.warn("[chat adapter] Failed to cancel run:", e);
         }
       }
+      setCurrentRunId(null);
     }
   };
 }
 function createSdkAdapter(config) {
   let connectionStatus = "disconnected";
   const connectionListeners = /* @__PURE__ */ new Set();
-  let currentRunId = null;
+  const streamRunIds = /* @__PURE__ */ new Map();
   const updateStatus = (status, error, errorCode) => {
     connectionStatus = status;
     connectionListeners.forEach((cb) => cb(status, error, errorCode));
@@ -693,17 +702,21 @@ function createSdkAdapter(config) {
           sessionResources: options?.sessionResources
         }
       );
+      const streamId = `stream-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
       return processStreamEvents(stream, onEvent, sdk, (id) => {
-        currentRunId = id;
-      });
+        if (id) streamRunIds.set(streamId, id);
+        else streamRunIds.delete(streamId);
+      }, streamId);
     },
-    sendHitlResponse(response, runId) {
+    sendHitlResponse(response, runId, streamId) {
       const sdk = config.getSdk();
-      if (!sdk) return;
-      const id = runId || currentRunId;
+      if (!sdk) return false;
+      const id = runId || (streamId ? streamRunIds.get(streamId) : void 0) || streamRunIds.values().next().value || null;
       if (id) {
         sdk.sendHitlResponse(id, response);
+        return true;
       }
+      return false;
     },
     // Session Resources (delegated to shared helper)
     ...createSessionResourceMethods(config.getSdk)

package/dist/main/index.d.mts

@@ -715,8 +715,12 @@ declare class FloatingWindow {
     private savedState;
     private stateSaveTimer;
     private activeStreams;
+    private runOwnerByRunId;
     private reconnectAcquired;
     private resolveHitlRunId;
+    private rememberRunOwner;
+    private forgetRunOwner;
+    private waitForOwnedStreamRunId;
     /**
      * Get SDK instance from either getClient or getSdk
      */
@@ -790,6 +794,7 @@ declare class ChatPanel {
     private registeredShortcuts;
     private stateSaveTimer;
     private activeStreams;
+    private runOwnerByRunId;
     private sessionResourceCleanup;
     constructor(config: ChatPanelConfig);
     private hostResizeHandler;
@@ -927,6 +932,9 @@ declare class ChatPanel {
      * Priority: explicit runId -> streamId-bound runId -> single active stream fallback.
      */
     private resolveHitlRunId;
+    private rememberRunOwner;
+    private forgetRunOwner;
+    private waitForOwnedStreamRunId;
     /**
      * Setup session resource event forwarding from SDK to renderer
      * Called when SDK becomes available (on connect)

package/dist/main/index.d.ts

@@ -715,8 +715,12 @@ declare class FloatingWindow {
     private savedState;
     private stateSaveTimer;
     private activeStreams;
+    private runOwnerByRunId;
     private reconnectAcquired;
     private resolveHitlRunId;
+    private rememberRunOwner;
+    private forgetRunOwner;
+    private waitForOwnedStreamRunId;
     /**
      * Get SDK instance from either getClient or getSdk
      */
@@ -790,6 +794,7 @@ declare class ChatPanel {
     private registeredShortcuts;
     private stateSaveTimer;
     private activeStreams;
+    private runOwnerByRunId;
     private sessionResourceCleanup;
     constructor(config: ChatPanelConfig);
     private hostResizeHandler;
@@ -927,6 +932,9 @@ declare class ChatPanel {
      * Priority: explicit runId -> streamId-bound runId -> single active stream fallback.
      */
     private resolveHitlRunId;
+    private rememberRunOwner;
+    private forgetRunOwner;
+    private waitForOwnedStreamRunId;
     /**
      * Setup session resource event forwarding from SDK to renderer
      * Called when SDK becomes available (on connect)