@blade-hq/agent-client 1.2.1-alpha.4 → 1.2.1-beta.10

package/README.md

@@ -182,7 +182,7 @@ const unsubscribe = chat.subscribe(() => rerender(chat.getState()))
 ### 动作
 
 ```ts
-await chat.send("你好")                          // 发消息（字符串或多模态内容）
+const accepted = await chat.send("你好")         // 服务端接受后为 true；拒绝时为 false
 await chat.send("换个方案", { mode: "planning" }) // 指定模式/模型等选项
 chat.append("补充：预算不超过 5 万")              // 智能体运行中追加说明
 await chat.stop()                                // 停止当前回复
@@ -389,6 +389,6 @@ function Message({ message }: { message: ChatMessage }) {
 - **会话状态机**：`SessionHub`、`SessionState`、`SendOptions`、`ConnectionStatus`、`AskUserAnswerData`、`AgentLoopInfo`、`ActiveCompactionState`、`createInitialSessionState`、`AgentSessionEventName`
 - **页面协作**：`EmbeddedChat`、`EmbeddedChatOptions`、`CommandHandler`、`CommandEnvelope`、`InboundAction`、`InboundEnvelope`、`isCommandEnvelope`、`isInboundEnvelope`
 - **消息与投影协议**：`MessageContent`、`MessageContentPart`、`TextContentPart`、`ImageUrlContentPart`、`FileContentPart`、`ToolCallInfo`、`ToolBridgeContent`、`CompactionInfo`、`MemoryRefInfo`、`ArchivedFileInfo`、`ArchivedToolCallInfo`、`TurnProjection`、`ContentBlock`、`PatchEnvelope`、`MemoryRef`、`buildMessageContent`、`normalizeMessageContent`、`isHiddenInternalMessage`、`transformSlashCommand`、`extractTextAttachments`、`ParsedTextAttachment`、`ParsedTextContext`
-- **Solution / 任务协议**：`Solution`、`SolutionAppField`、`SolutionAppState`、`SolutionAppUiConfig`、`SolutionRef`、`PublishedSolutionRef`、`ExistingSolutionRef`、`PreparedSolution`、`PreparedSolutionAsset`、`LayoutType`、`BizRole`、`TaskStatus`、`BackgroundTask`
+- **Solution / 任务协议**：`Solution`、`SolutionAppField`、`SolutionAppState`、`SolutionAppUiConfig`、`SolutionRef`、`PublishedSolutionRef`、`ExistingSolutionRef`、`PreparedSolution`、`PreparedSolutionAsset`、`LayoutType`、`BizRole`、`TaskStatus`、`BackgroundTask`、`BackgroundTaskStopResult`
 - **Headless**：`HeadlessResource`、`RunOptions`、`RunResult`、`RunTrace`
 - **低层通道（apps/web 等高级集成）**：`createSocket`、`CreateSocketOptions`、`TypedSocket`、`AsrAudioPayload`、`ClientProjectionBuilder`、`RawEvent`

package/dist/index.d.ts

@@ -31,7 +31,7 @@ export type { ModeId, PrimarySkillParallelMode, PrimarySkillSnapshot, SessionDet
 export { LayoutType } from "./schemas/solution";
 export type { BizRole, Solution, SolutionAppField, SolutionAppState, SolutionAppUiConfig, } from "./schemas/solution";
 export { Task, TaskStatus } from "./schemas/task";
-export type { BackgroundTask } from "./schemas/background";
+export type { BackgroundTask, BackgroundTaskStopResult } from "./schemas/background";
 export { ClientProjectionBuilder } from "./shared/projection";
 export type { RawEvent } from "./shared/projection";
 export { createSocket } from "./socket";

package/dist/index.js

@@ -45,8 +45,8 @@ async function loginWithPopup(client, options = {}) {
   authorizeUrl.searchParams.set("client_origin", clientOrigin);
   authorizeUrl.searchParams.set("state", state);
   const popup = window.open(
-    authorizeUrl.toString(),
-    "blade-sdk-login",
+    "about:blank",
+    `blade-sdk-login-${state}`,
     `popup=yes,width=${width},height=${height},left=${left},top=${top}`
   );
   if (!popup) {
@@ -69,6 +69,7 @@ async function loginWithPopup(client, options = {}) {
     };
     const onMessage = (event) => {
       if (event.origin !== expectedOrigin) return;
+      if (event.source !== popup) return;
       if (!isAuthCallbackMessage(event.data)) return;
       if (event.data.state !== state) return;
       const message = event.data;
@@ -107,6 +108,7 @@ async function loginWithPopup(client, options = {}) {
       settle(() => reject(new Error("\u767B\u5F55\u8D85\u65F6\uFF0C\u8BF7\u91CD\u8BD5\u3002")));
     }, timeoutMs);
     window.addEventListener("message", onMessage);
+    popup.location.replace(authorizeUrl.toString());
   });
 }
 
@@ -319,13 +321,22 @@ var HeadlessResource = class {
       socket.on("chat:end", onChatEnd);
       socket.on("system:error", onSystemError);
       socket.emit("session:subscribe", { session_id, event_format: "raw" });
-      socket.emit("chat:send", {
-        session_id,
-        message: prompt,
-        headless: true,
-        output_schema: options.schema ?? null,
-        model: options.model ?? null
-      });
+      socket.emit(
+        "chat:send",
+        {
+          session_id,
+          message: prompt,
+          headless: true,
+          output_schema: options.schema ?? null,
+          model: options.model ?? null
+        },
+        (response) => {
+          if (response.status === "accepted") return;
+          rejectAfterChatEnd(
+            new HeadlessError(response.message ?? "headless run was not accepted", response)
+          );
+        }
+      );
     });
   }
 };
@@ -905,6 +916,7 @@ var ClientProjectionBuilder = class {
   pendingChildPauses = /* @__PURE__ */ new Map();
   pendingMemoryRefs = /* @__PURE__ */ new Map();
   activeCompactions = /* @__PURE__ */ new Map();
+  failedCompactions = /* @__PURE__ */ new Map();
   seq = 0;
   syntheticCounter = 0;
   displayNameResolver;
@@ -968,6 +980,12 @@ var ClientProjectionBuilder = class {
       return null;
     }
     switch (event.type) {
+      case "llm:stream:reset":
+        state.blocks = [];
+        state.toolCalls = [];
+        state.usage = null;
+        state.responseDone = false;
+        return this.syncPatch(state);
       case "llm:thinking:delta":
         return this.onDelta(state, "thinking", "", String(payload.content ?? ""));
       case "llm:content:delta":
@@ -1004,6 +1022,7 @@ var ClientProjectionBuilder = class {
     this.pendingChildPauses.clear();
     this.pendingMemoryRefs.clear();
     this.activeCompactions.clear();
+    this.failedCompactions.clear();
     this.seq = 0;
     this.syntheticCounter = 0;
   }
@@ -1476,7 +1495,7 @@ var ClientProjectionBuilder = class {
   onCompaction(eventType, loopId, payload) {
     const compactionId = String(payload.compaction_id ?? "");
     if (!compactionId) return null;
-    const current = {
+    let current = {
       ...this.activeCompactions.get(compactionId) ?? {},
       ...payload,
       loop_id: loopId
@@ -1486,6 +1505,7 @@ var ClientProjectionBuilder = class {
       case "compaction:start":
         status = "streaming";
         this.activeCompactions.set(compactionId, current);
+        this.failedCompactions.delete(compactionId);
         break;
       case "compaction:end":
         status = "completed";
@@ -1498,11 +1518,17 @@ var ClientProjectionBuilder = class {
       case "compaction:error":
         status = "failed";
         this.activeCompactions.delete(compactionId);
+        this.failedCompactions.set(compactionId, { ...current });
         break;
       default:
         status = "streaming";
         this.activeCompactions.set(compactionId, current);
     }
+    const failed = this.failedCompactions.get(compactionId);
+    if (failed && status !== "failed") {
+      current = { ...failed, ...current };
+      status = "failed";
+    }
     const turn = buildCompactionTurn(this.nextSeq(), compactionId, loopId, status, current);
     return [{ kind: "upsert", turn }];
   }
@@ -3037,6 +3063,11 @@ function extractTerminalChatEndStatus(events) {
   }
   return null;
 }
+function hasChatRunEvent(events) {
+  return events.some(
+    (event) => event.type !== "session:post_chat_followup" && !event.type.startsWith("compaction:")
+  );
+}
 function isUiMetaLike(value) {
   return isRecord5(value) && ("resourceHTML" in value || "resourceUri" in value || "resourceURI" in value);
 }
@@ -3059,6 +3090,7 @@ var AgentSession = class _AgentSession {
   disposed = false;
   getAppContext = null;
   sendPending = false;
+  manualCompactionPending = false;
   deliveredCommandKeys = /* @__PURE__ */ new Set();
   deliveredToolPreviews = /* @__PURE__ */ new Map();
   oomNotifiedKeys = /* @__PURE__ */ new Set();
@@ -3153,22 +3185,26 @@ var AgentSession = class _AgentSession {
   /** 发送一条消息。字符串或多模态内容均可。 */
   async send(content, options = {}) {
     this.runtime.ensureConnected();
-    if (this.state.isStreaming || this.sendPending) {
-      this.update((s) => addErrorMessage(s, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002"));
-      return;
+    if (this.state.isStreaming || this.state.activeCompaction || this.sendPending || this.manualCompactionPending) {
+      this.update(
+        (s) => addErrorMessage(s, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\u6216\u5BF9\u8BDD\u6B63\u5728\u6574\u7406\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002")
+      );
+      return false;
     }
     this.sendPending = true;
     try {
-      await this.sendUnlocked(content, options);
+      return await this.sendUnlocked(content, options);
     } finally {
       this.sendPending = false;
     }
   }
   async sendUnlocked(content, options) {
     await this.ensureIdleBeforeSend();
-    if (this.state.isStreaming) {
-      this.update((s) => addErrorMessage(s, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002"));
-      return;
+    if (this.state.isStreaming || this.state.activeCompaction || this.manualCompactionPending) {
+      this.update(
+        (s) => addErrorMessage(s, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\u6216\u5BF9\u8BDD\u6B63\u5728\u6574\u7406\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002")
+      );
+      return false;
     }
     let appContext;
     if (this.getAppContext) {
@@ -3189,19 +3225,28 @@ var AgentSession = class _AgentSession {
       } catch (error) {
         const message = error instanceof Error && error.message ? `\u8BFB\u53D6\u5E94\u7528\u4E0A\u4E0B\u6587\u5931\u8D25\uFF1A${error.message}` : "\u8BFB\u53D6\u5E94\u7528\u4E0A\u4E0B\u6587\u5931\u8D25\uFF0C\u6D88\u606F\u672A\u53D1\u9001";
         this.update((s) => addErrorMessage(s, message));
-        return;
+        return false;
       }
     }
     const askUserAnswer = options.askUserAnswer;
+    let optimisticTurnId = null;
+    let optimisticAskAnswer;
+    let previousAskAnswer;
     if (!(askUserAnswer && typeof askUserAnswer.tool_call_id === "string")) {
-      this.update((s) => addUserMessage(s, content));
+      this.update((state) => {
+        const next = addUserMessage(state, content);
+        optimisticTurnId = next.turns.at(-1)?.turn_id ?? null;
+        return next;
+      });
     }
     this.update((s) => ({ ...s, isStreaming: true }));
     if (askUserAnswer && typeof askUserAnswer.tool_call_id === "string") {
       const { tool_call_id, ...rest } = askUserAnswer;
+      previousAskAnswer = this.state.askAnswers[tool_call_id];
+      optimisticAskAnswer = rest;
       this.update((s) => ({
         ...s,
-        askAnswers: { ...s.askAnswers, [tool_call_id]: rest }
+        askAnswers: { ...s.askAnswers, [tool_call_id]: optimisticAskAnswer }
       }));
     }
     if (!options.replayDecision) {
@@ -3222,15 +3267,54 @@ var AgentSession = class _AgentSession {
     try {
       await this.ensureJoined();
     } catch (error) {
-      this.update(
-        (s) => addErrorMessage(
-          { ...s, isStreaming: false, status: "failed" },
-          error instanceof Error && error.message ? error.message : "\u4F1A\u8BDD\u8BA2\u9605\u5931\u8D25\uFF0C\u6D88\u606F\u672A\u53D1\u9001"
-        )
+      this.rollbackOptimisticSend(
+        optimisticTurnId,
+        askUserAnswer,
+        optimisticAskAnswer,
+        previousAskAnswer,
+        error instanceof Error && error.message ? error.message : "\u4F1A\u8BDD\u8BA2\u9605\u5931\u8D25\uFF0C\u6D88\u606F\u672A\u53D1\u9001"
       );
-      return;
+      return false;
+    }
+    try {
+      const response = await this.runtime.emitWithAck("chat:send", payload, 3e4);
+      if (response?.status !== "accepted") {
+        throw new Error(
+          typeof response?.message === "string" ? response.message : "\u6D88\u606F\u672A\u88AB\u670D\u52A1\u7AEF\u63A5\u53D7"
+        );
+      }
+      return true;
+    } catch (error) {
+      this.rollbackOptimisticSend(
+        optimisticTurnId,
+        askUserAnswer,
+        optimisticAskAnswer,
+        previousAskAnswer,
+        error instanceof Error && error.message ? error.message : "\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5"
+      );
+      return false;
     }
-    this.runtime.emitEvent("chat:send", payload);
+  }
+  rollbackOptimisticSend(optimisticTurnId, askUserAnswer, optimisticAskAnswer, previousAskAnswer, message) {
+    this.pendingReplayMessage = null;
+    this.pendingReplayMode = void 0;
+    this.update((current) => {
+      let next = optimisticTurnId ? withTurns(
+        current,
+        current.turns.filter((turn) => turn.turn_id !== optimisticTurnId)
+      ) : current;
+      const toolCallId = askUserAnswer && typeof askUserAnswer.tool_call_id === "string" ? askUserAnswer.tool_call_id : null;
+      if (toolCallId && next.askAnswers[toolCallId] === optimisticAskAnswer) {
+        const askAnswers = { ...next.askAnswers };
+        if (previousAskAnswer === void 0) {
+          delete askAnswers[toolCallId];
+        } else {
+          askAnswers[toolCallId] = previousAskAnswer;
+        }
+        next = { ...next, askAnswers };
+      }
+      return addErrorMessage({ ...next, isStreaming: false }, message);
+    });
   }
   /** 智能体运行期间追加补充说明（不打断当前回复）。 */
   append(text) {
@@ -3244,7 +3328,28 @@ var AgentSession = class _AgentSession {
   }
   /** 手动触发上下文压缩。 */
   compact() {
-    return this.runtime.emitWithAck("chat:compact", { session_id: this.sessionId }, 3e4).then((response) => response ?? {});
+    if (this.state.isStreaming || this.state.activeCompaction || this.manualCompactionPending) {
+      return Promise.resolve({
+        status: "error",
+        message: "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\u6216\u5BF9\u8BDD\u6B63\u5728\u6574\u7406\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002"
+      });
+    }
+    this.manualCompactionPending = true;
+    this.update((state) => ({
+      ...state,
+      activeCompaction: {
+        turn_id: "pending-manual-compaction",
+        compaction_id: "pending-manual-compaction",
+        status: "streaming",
+        trigger: "manual"
+      }
+    }));
+    return this.runtime.emitWithAck("chat:compact", { session_id: this.sessionId }, 3e4).then((response) => response ?? {}).finally(() => {
+      this.manualCompactionPending = false;
+      if (this.state.activeCompaction?.compaction_id === "pending-manual-compaction") {
+        this.update((state) => ({ ...state, activeCompaction: null }));
+      }
+    });
   }
   /**
    * 把一段业务数据作为附件放进聊天输入框（比如地图上选中的点位）。
@@ -3334,10 +3439,7 @@ var AgentSession = class _AgentSession {
   _handleTurnEvents(events) {
     if (!events.length) return;
     const terminalChatEndStatus = extractTerminalChatEndStatus(events);
-    const followupOnly = events.every(
-      (event) => event.type === "session:post_chat_followup"
-    );
-    if (!terminalChatEndStatus && !followupOnly) {
+    if (!terminalChatEndStatus && hasChatRunEvent(events)) {
       this.markRunningIfIdle();
     }
     if (this.state.turns.length) {
@@ -3411,11 +3513,30 @@ var AgentSession = class _AgentSession {
     this.pendingReplayMessage = null;
     this.pendingReplayMode = void 0;
     const respond = (decision) => {
-      this.runtime.emitEvent("chat:send", {
-        session_id: this.sessionId,
-        message,
-        mode,
-        replay_decision: decision
+      void this.runtime.emitWithAck(
+        "chat:send",
+        {
+          session_id: this.sessionId,
+          message,
+          mode,
+          replay_decision: decision
+        },
+        3e4
+      ).then((response) => {
+        if (response?.status === "accepted") return;
+        this.update(
+          (state) => addErrorMessage(
+            { ...state, isStreaming: false },
+            typeof response?.message === "string" ? response.message : "\u6D88\u606F\u672A\u88AB\u670D\u52A1\u7AEF\u63A5\u53D7"
+          )
+        );
+      }).catch((error) => {
+        this.update(
+          (state) => addErrorMessage(
+            { ...state, isStreaming: false },
+            error instanceof Error && error.message ? error.message : "\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5"
+          )
+        );
       });
     };
     const handled = this.emitter.emitFirst("replayMismatch", {
@@ -3697,6 +3818,18 @@ var AgentSession = class _AgentSession {
 };
 
 // src/session/hub.ts
+var BACKGROUND_STATUSES = [
+  "starting",
+  "running",
+  "cancelling",
+  "succeeded",
+  "failed",
+  "cancelled",
+  "lost"
+];
+function normalizeBackgroundStatus(value) {
+  return BACKGROUND_STATUSES.includes(value) ? value : "running";
+}
 var SessionHub = class {
   client;
   sessions = /* @__PURE__ */ new Map();
@@ -3951,7 +4084,11 @@ var SessionHub = class {
               id: taskId,
               command: typeof task.command === "string" ? task.command : "",
               description: typeof task.description === "string" ? task.description : void 0,
-              status: task.status === "running" || task.status === "failed" ? task.status : "done",
+              // Pass the server's status through unchanged. Collapsing it here
+              // made subscribers see a successful-looking "done" for tasks the
+              // REST API correctly reported as cancelled or lost.
+              status: normalizeBackgroundStatus(task.status),
+              failureReason: typeof task.failure_reason === "string" ? task.failure_reason : void 0,
               exitCode: typeof task.exit_code === "number" || task.exit_code === null ? task.exit_code : void 0,
               elapsedSeconds: typeof task.elapsed_seconds === "number" ? task.elapsed_seconds : 0,
               output: Array.isArray(task.output_preview) && task.output_preview.length > 0 ? task.output_preview.join("\n") : void 0
@@ -3994,7 +4131,7 @@ function resolveAuthToken(options) {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "1.2.1-alpha.4" : "1.1.1";
+var SDK_VERSION = true ? "1.2.1-beta.10" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {
@@ -4342,12 +4479,31 @@ function resolveTokenOption(tokenOption) {
   const token = typeof tokenOption === "function" ? tokenOption() : tokenOption;
   return token ? token : null;
 }
+var SANDBOX_ONLY_HOST = "host.docker.internal";
 function normalizeBaseUrl(baseUrl) {
   const normalized = baseUrl.trim().replace(/\/+$/, "");
-  if (normalized || typeof window === "undefined") {
+  if (typeof window === "undefined") {
     return normalized;
   }
-  return window.location.origin;
+  if (!normalized) {
+    return window.location.origin;
+  }
+  assertBrowserReachable(normalized);
+  return normalized;
+}
+function assertBrowserReachable(baseUrl) {
+  let hostname;
+  try {
+    hostname = new URL(baseUrl, window.location.href).hostname;
+  } catch {
+    return;
+  }
+  if (hostname !== SANDBOX_ONLY_HOST) {
+    return;
+  }
+  throw new Error(
+    `Blade Agent \u5730\u5740 ${baseUrl} \u53EA\u6709\u6C99\u76D2\u5185\u90E8\u89E3\u6790\u5F97\u5230\uFF0C\u6D4F\u89C8\u5668\u6253\u4E0D\u5F00\u3002\u8BF7\u628A\u5B83\u6539\u6210\u7528\u6237\u6D4F\u89C8\u5668\u80FD\u8BBF\u95EE\u7684\u5730\u5740\uFF08\u901A\u5E38\u662F\u8BBF\u95EE\u8FD9\u4E2A\u5E94\u7528\u65F6\u7528\u7684\u4E3B\u673A\u540D + Blade Server \u7AEF\u53E3\uFF09\u3002`
+  );
 }
 function isFormData(value) {
   return typeof FormData !== "undefined" && value instanceof FormData;