@blade-hq/agent-client 1.2.1-beta.12 → 1.2.1-beta.14

package/dist/index.js

@@ -56,9 +56,14 @@ async function loginWithPopup(client, options = {}) {
   return new Promise((resolve, reject) => {
     const timeoutMs = options.timeoutMs ?? 5 * 60 * 1e3;
     let settled = false;
+    let closeTimer;
+    const stopCloseWatch = () => {
+      globalThis.clearInterval(closeWatcher);
+      if (closeTimer !== void 0) globalThis.clearTimeout(closeTimer);
+    };
     const cleanup = () => {
       window.removeEventListener("message", onMessage);
-      globalThis.clearInterval(closeWatcher);
+      stopCloseWatch();
       globalThis.clearTimeout(timeoutHandle);
     };
     const settle = (fn) => {
@@ -73,6 +78,7 @@ async function loginWithPopup(client, options = {}) {
       if (!isAuthCallbackMessage(event.data)) return;
       if (event.data.state !== state) return;
       const message = event.data;
+      stopCloseWatch();
       try {
         popup.close();
       } catch {
@@ -98,11 +104,10 @@ async function loginWithPopup(client, options = {}) {
       });
     };
     const closeWatcher = globalThis.setInterval(() => {
-      if (popup.closed && !settled) {
-        globalThis.setTimeout(() => {
-          settle(() => reject(new Error("\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u672A\u5B8C\u6210\u6388\u6743\u3002")));
-        }, 400);
-      }
+      if (!popup.closed || settled || closeTimer !== void 0) return;
+      closeTimer = globalThis.setTimeout(() => {
+        settle(() => reject(new Error("\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u672A\u5B8C\u6210\u6388\u6743\u3002")));
+      }, 400);
     }, 500);
     const timeoutHandle = globalThis.setTimeout(() => {
       settle(() => reject(new Error("\u767B\u5F55\u8D85\u65F6\uFF0C\u8BF7\u91CD\u8BD5\u3002")));
@@ -1611,7 +1616,9 @@ function projectHistory(entries) {
   const toolOwners = /* @__PURE__ */ new Map();
   const latestAssistantByLoop = /* @__PURE__ */ new Map();
   const pendingChildPauses = /* @__PURE__ */ new Map();
+  const answeredToolCallIds = /* @__PURE__ */ new Set();
   let latestRootMessage = null;
+  let latestRootAssistant = null;
   let sequence = 0;
   for (const entry of entries) {
     const kind = String(entry.kind ?? "");
@@ -1670,6 +1677,10 @@ function projectHistory(entries) {
       }
       turns.push(turn);
       if (role === "assistant") latestAssistantByLoop.set(loopId, turn);
+      if (loopId === "root") {
+        if (role === "assistant") latestRootAssistant = turn;
+        else if (role === "user") latestRootAssistant = null;
+      }
       for (const toolCall of toolCalls) toolOwners.set(toolCall.id, turn);
       continue;
     }
@@ -1764,6 +1775,7 @@ function projectHistory(entries) {
     } else if (kind === "ask_user_answer") {
       const data = entry.data ?? {};
       const toolCallId = String(data.tool_call_id ?? "");
+      if (toolCallId) answeredToolCallIds.add(toolCallId);
       const pending = pendingChildPauses.get(toolCallId);
       if (pending) {
         setToolCallStatus(latestAssistantByLoop.get(pending.childLoopId), toolCallId, "done", null, null);
@@ -1790,8 +1802,44 @@ function projectHistory(entries) {
       );
     }
   }
+  const rootAssistant = latestRootAssistant;
+  if (rootAssistant) {
+    for (const toolCall of rootAssistant.tool_calls) {
+      if (answeredToolCallIds.has(toolCall.id)) continue;
+      if (toolCall.tool_name.split(":").pop() !== "AskUserQuestion") continue;
+      if (toolCall.status === "error" || toolCall.status === "cancelled") continue;
+      const pauseArguments = parseToolArguments(toolCall.arguments);
+      if (typeof toolCall.result === "string") {
+        const resultArguments = parseToolArguments(toolCall.result);
+        if (Array.isArray(resultArguments.questions)) {
+          pauseArguments.questions = resultArguments.questions;
+        }
+      }
+      applyAskUserPauseToTurn(
+        rootAssistant,
+        {
+          name: toolCall.tool_name,
+          tool_call_id: toolCall.id,
+          arguments: pauseArguments
+        },
+        toolCall.id,
+        "",
+        "",
+        (name) => name
+      );
+    }
+  }
   return turns;
 }
+function parseToolArguments(value) {
+  if (!value) return {};
+  try {
+    const parsed = JSON.parse(value);
+    return isRecord3(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
 function buildToolCalls(value) {
   if (!Array.isArray(value)) return [];
   return value.filter(isRecord3).map((raw) => {
@@ -3118,7 +3166,7 @@ var AgentSession = class _AgentSession {
         countFiles: async () => readonlyError(),
         downloadFile: async () => readonlyError(),
         attachAppCli: async () => readonlyError(),
-        onDispose: () => void 0
+        onDispose: () => true
       },
       "connected"
     );
@@ -3376,15 +3424,18 @@ var AgentSession = class _AgentSession {
   downloadFile(filePath, downloadName) {
     return this.runtime.downloadFile(this.sessionId, filePath, downloadName);
   }
-  /** 释放订阅与监听器。之后该实例不再接收任何事件。 */
+  /**
+   * 归还一份持有。同一个会话被多处 connect 时按引用计数释放：只有最后
+   * 一份归还才真正断开订阅与监听器，之前的归还不影响仍在使用的一方。
+   */
   dispose() {
     if (this.disposed) return;
+    if (!this.runtime.onDispose(this)) return;
     this.disposed = true;
     this.cancelPatchFlush();
     this.listeners.clear();
     this.emitter.clear();
     this.commands.clear();
-    this.runtime.onDispose(this);
   }
   get isDisposed() {
     return this.disposed;
@@ -3834,6 +3885,8 @@ var SessionHub = class {
   client;
   sessions = /* @__PURE__ */ new Map();
   bootstrapPending = /* @__PURE__ */ new Map();
+  /** 每个会话当前有多少方持有（connect 一次 +1，dispose 一次 -1）。 */
+  holdCounts = /* @__PURE__ */ new Map();
   connection = "disconnected";
   connectionListeners = /* @__PURE__ */ new Set();
   bound = false;
@@ -3852,22 +3905,30 @@ var SessionHub = class {
       this.connectionListeners.delete(listener);
     };
   }
-  /** 取得（或复用）一个会话的 AgentSession，并完成历史加载 + 房间订阅。 */
+  /**
+   * 取得（或复用）一个会话的 AgentSession，并完成历史加载 + 房间订阅。
+   *
+   * 每次调用都算一份持有，调用方用完必须 `dispose()` 归还。复用同一实例时
+   * 只有最后一份归还才退订房间——否则 StrictMode 双跑、路由抖动这类"连两次
+   * 只释放一次"的场景会把仍在用的会话退订掉，之后所有 turn/chat 事件静默丢失。
+   */
   async connect(sessionId) {
     const existing = this.sessions.get(sessionId);
     if (existing && !existing.isDisposed) {
+      this.hold(sessionId);
       return this.bootstrapPending.get(sessionId) ?? existing;
     }
     this.ensureBound();
     const session = new AgentSession(sessionId, this.runtimeFor(), this.connection);
     this.sessions.set(sessionId, session);
+    this.hold(sessionId);
     this.ensureConnected();
     const bootstrap = session._bootstrap().then(() => session);
     this.bootstrapPending.set(sessionId, bootstrap);
     try {
       return await bootstrap;
     } catch (error) {
-      session.dispose();
+      this.forceRelease(session);
       throw error;
     } finally {
       if (this.bootstrapPending.get(sessionId) === bootstrap) {
@@ -3898,7 +3959,7 @@ var SessionHub = class {
   disposeAll() {
     this.bootstrapPending.clear();
     for (const session of [...this.sessions.values()]) {
-      session.dispose();
+      this.forceRelease(session);
     }
   }
   /**
@@ -3935,15 +3996,36 @@ var SessionHub = class {
       countFiles: (sessionId, dirPath) => this.client.sessions.countFiles(sessionId, dirPath),
       downloadFile: (sessionId, filePath, downloadName) => this.client.sessions.downloadFile(sessionId, filePath, downloadName),
       attachAppCli: (sessionId, definition) => this.client.sessions.attachAppCli(sessionId, definition),
-      onDispose: (session) => {
-        if (this.sessions.get(session.sessionId) === session) {
-          this.sessions.delete(session.sessionId);
-        }
-        ;
-        this.client.socket().emit("session:unsubscribe", { session_id: session.sessionId });
-      }
+      onDispose: (session) => this.release(session)
     };
   }
+  /** 记一份持有。 */
+  hold(sessionId) {
+    this.holdCounts.set(sessionId, (this.holdCounts.get(sessionId) ?? 0) + 1);
+  }
+  /**
+   * 归还一份持有；还剩别的持有者时返回 false，让 AgentSession 保持可用。
+   * 归零才退订房间并从路由表移除。
+   */
+  release(session) {
+    const remaining = (this.holdCounts.get(session.sessionId) ?? 0) - 1;
+    if (remaining > 0) {
+      this.holdCounts.set(session.sessionId, remaining);
+      return false;
+    }
+    this.holdCounts.delete(session.sessionId);
+    if (this.sessions.get(session.sessionId) === session) {
+      this.sessions.delete(session.sessionId);
+    }
+    ;
+    this.client.socket().emit("session:unsubscribe", { session_id: session.sessionId });
+    return true;
+  }
+  /** 不管还有几方持有都立即释放（启动失败、切换身份）。 */
+  forceRelease(session) {
+    this.holdCounts.delete(session.sessionId);
+    session.dispose();
+  }
   ensureConnected() {
     const socket = this.client.socket();
     if (socket.connected || socket.active) return;
@@ -4131,7 +4213,7 @@ function resolveAuthToken(options) {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "1.2.1-beta.12" : "1.1.1";
+var SDK_VERSION = true ? "1.2.1-beta.14" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {