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

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) => {
@@ -4131,7 +4179,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.13" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {