@blade-hq/agent-client 2610.0.0-beta.26 → 2610.0.0-beta.28

package/README.md

@@ -82,10 +82,12 @@ new BladeClient({
   baseUrl: "https://blade.example.com", // 后端地址；同域部署可传 ""
   token: "sk-blade-xxx",                // 可选：PAT。不传则用 cookie 或 login()
   tokenStorage: "local",                // 可选：login() 的令牌存哪（"local" 默认 / "memory"）
-  streamTokens: false,                   // 可选：只接收完成态内容，不订阅逐 token 增量
 })
 ```
 
+SDK 会固定订阅普通聊天所需的完整实时事件。产品内置 Web 的精简/开发者展示模式不属于
+公共 SDK 契约，也没有对应的构造参数或 Socket.IO 字段。
+
 > **`baseUrl` 填哪个地址？** 必须是 Blade Agent 后端的地址（形如 `http://<主机>:8020`），只要域名和端口、不带路径。
 > 注意别填成你平时打开的 Blade OS 地址（同主机的 `:80`）—— 那是另一套接口，SDK 连不上。
 

package/dist/blade-client.d.ts

@@ -23,8 +23,6 @@ export interface BladeClientOptions {
     tokenStorage?: TokenStorageMode;
     fetchImpl?: typeof fetch;
     onRefreshSuccess?: () => void | Promise<void>;
-    /** 是否订阅逐 token 增量，默认 true。关闭后仍接收完整消息和语义事件。 */
-    streamTokens?: boolean;
 }
 export declare class BladeClient {
     private refreshPromise;

package/dist/index.js

@@ -352,8 +352,7 @@ var HeadlessResource = class {
       socket.on("system:error", onSystemError);
       socket.emit("session:subscribe", {
         session_id,
-        event_format: "raw",
-        stream_tokens: this.client.options.streamTokens !== false
+        event_format: "raw"
       });
       socket.emit(
         "chat:send",
@@ -473,6 +472,7 @@ var SessionInfo = type({
   "disable_tools?": "string[]",
   "runtime_type?": "string | null",
   "daemon_id?": "string | null",
+  "agent_runtime_id?": "string | null",
   "workspace_path?": "string | null",
   "match?": "unknown"
 });
@@ -1027,12 +1027,14 @@ function toolStatusFromResult(result) {
 var BUILTIN_CONTEXT_TITLES = {
   "agent-instructions": "\u9879\u76EE\u8BF4\u660E",
   "skill-catalog": "\u53EF\u7528\u80FD\u529B",
-  "runtime-context": "\u5F53\u524D\u5DE5\u4F5C\u73AF\u5883"
+  "runtime-context": "\u5F53\u524D\u5DE5\u4F5C\u73AF\u5883",
+  "workspace-context": "\u5F53\u524D\u5DE5\u4F5C\u533A\u73AF\u5883"
 };
 var BUILTIN_CONTEXT_DETAILS = {
   "agent-instructions": "\u8FD9\u4E9B\u8BF4\u660E\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u7406\u89E3\u5F53\u524D\u9879\u76EE\u548C\u5DE5\u4F5C\u8981\u6C42\u3002",
   "skill-catalog": "\u8FD9\u4E9B\u80FD\u529B\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u9009\u62E9\u5408\u9002\u7684\u65B9\u5F0F\u5B8C\u6210\u4EFB\u52A1\u3002",
-  "runtime-context": "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u4E86\u89E3\u5F53\u524D\u6587\u4EF6\u5939\u548C\u8FD0\u884C\u6761\u4EF6\u3002"
+  "runtime-context": "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u4E86\u89E3\u5F53\u524D\u6587\u4EF6\u5939\u548C\u8FD0\u884C\u6761\u4EF6\u3002",
+  "workspace-context": "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u4E86\u89E3\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u3001\u6587\u4EF6\u548C\u8FD0\u884C\u73AF\u5883\u3002"
 };
 function nonEmptyString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
@@ -1060,7 +1062,7 @@ function contextProjectionData(fields) {
 function getContextDisplayState(context) {
   const title = BUILTIN_CONTEXT_TITLES[context.context_kind] ?? nonEmptyString(context.display_title) ?? "\u5BF9\u8BDD\u80CC\u666F";
   const isRemoved = context.context_action === "removed";
-  const summary = nonEmptyString(context.display_summary) ?? (isRemoved ? "\u5DF2\u505C\u6B62\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD" : context.context_action === "retained" ? "\u7EE7\u7EED\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD" : context.context_kind === "agent-instructions" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5BF9\u8BDD\u4F7F\u7528\u7684\u9879\u76EE\u8BF4\u660E" : context.context_kind === "skill-catalog" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u53EF\u7528\u80FD\u529B" : context.context_kind === "runtime-context" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5DE5\u4F5C\u73AF\u5883" : "\u5DF2\u66F4\u65B0\u672C\u6B21\u5BF9\u8BDD\u80CC\u666F");
+  const summary = nonEmptyString(context.display_summary) ?? (isRemoved ? "\u5DF2\u505C\u6B62\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD" : context.context_action === "retained" ? "\u7EE7\u7EED\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD" : context.context_kind === "agent-instructions" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5BF9\u8BDD\u4F7F\u7528\u7684\u9879\u76EE\u8BF4\u660E" : context.context_kind === "skill-catalog" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u53EF\u7528\u80FD\u529B" : context.context_kind === "runtime-context" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5DE5\u4F5C\u73AF\u5883" : context.context_kind === "workspace-context" ? "\u5DF2\u66F4\u65B0\u672C\u6B21\u5DE5\u4F5C\u533A\u73AF\u5883" : "\u5DF2\u66F4\u65B0\u672C\u6B21\u5BF9\u8BDD\u80CC\u666F");
   const detail = isRemoved ? `${title}\u5DF2\u4E0D\u518D\u7528\u4E8E\u540E\u7EED\u5BF9\u8BDD\u3002` : BUILTIN_CONTEXT_DETAILS[context.context_kind] ?? "\u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5E2E\u52A9\u667A\u80FD\u4F53\u7406\u89E3\u5F53\u524D\u4EFB\u52A1\u3002";
   return { title, summary, detail, isRemoved };
 }
@@ -1074,6 +1076,7 @@ function buildContextTurn(entry, sequence) {
     return null;
   }
   const display = isRecord2(entry.data.display) ? entry.data.display : {};
+  const message = isRecord2(entry.message) ? entry.message : {};
   const context = contextProjectionData({
     context_kind: typeof entry.source.kind === "string" ? entry.source.kind : null,
     context_key: typeof entry.source.key === "string" ? entry.source.key : null,
@@ -1100,6 +1103,7 @@ function buildContextTurn(entry, sequence) {
     model: null,
     usage: null,
     duration_ms: 0,
+    context_content: Object.hasOwn(message, "content") ? message.content : null,
     ...context
   };
 }
@@ -1563,7 +1567,10 @@ var ClientProjectionBuilder = class {
         );
       }
     }
-    if (state.toolCalls.length === 0) {
+    const isNativeProviderResponse = typeof payload.provider === "string" && payload.provider !== "";
+    if (state.toolCalls.length === 0 || isNativeProviderResponse && state.toolCalls.every(
+      (toolCall) => toolCall.status !== "pending" && toolCall.status !== "awaiting_answer"
+    )) {
       return this.finalize(loopId, "completed");
     }
     return this.syncPatch(state);
@@ -1577,7 +1584,8 @@ var ClientProjectionBuilder = class {
     const durationMs = typeof rawDuration === "number" && rawDuration >= 0 ? Math.round(rawDuration) : null;
     const sl = sourceLoopFor(state.loopId, this.loopDescriptions);
     applyToolResult(state, toolCallId, content, status, durationMs, sl);
-    if (this.shouldFinalizeAfterToolResults(state)) {
+    const isNativeProviderResult = typeof payload.provider === "string" && payload.provider !== "";
+    if (!isNativeProviderResult && this.shouldFinalizeAfterToolResults(state)) {
       return this.finalize(loopId, "completed");
     }
     return this.syncPatch(state);
@@ -1618,6 +1626,11 @@ var ClientProjectionBuilder = class {
     const toolName = String(payload.tool_name ?? "");
     const displayName = this.displayNameResolver(toolName);
     upsertToolCall(state, toolCallId, toolName, displayName, "");
+    const relatedToolCallId = String(payload.related_tool_call_id ?? "");
+    if (relatedToolCallId && relatedToolCallId !== toolCallId) {
+      const related = state.toolCalls.find((toolCall) => toolCall.id === relatedToolCallId);
+      if (related) related.status = "awaiting_answer";
+    }
     return this.syncPatch(state);
   }
   onChildPause(state, loopId, payload) {
@@ -1874,6 +1887,7 @@ function projectHistory(entries) {
   const latestAssistantByLoop = /* @__PURE__ */ new Map();
   const pendingChildPauses = /* @__PURE__ */ new Map();
   const answeredToolCallIds = /* @__PURE__ */ new Set();
+  const nativeToolTurns = /* @__PURE__ */ new Set();
   let latestRootMessage = null;
   let latestRootAssistant = null;
   let sequence = 0;
@@ -1933,10 +1947,27 @@ function projectHistory(entries) {
         duration_ms: numberOrZero(message._duration_ms),
         started_at: typeof entry.timestamp === "string" ? entry.timestamp : void 0
       };
+      const isNativeToolEntry = role === "assistant" && Array.isArray(message.tool_calls) && message.tool_calls.some(
+        (toolCall) => isRecord4(toolCall) && typeof toolCall.provider === "string"
+      );
+      const previousTurn = turns[turns.length - 1];
+      if (role === "assistant" && previousTurn?.role === "assistant" && previousTurn.loop_id === loopId && nativeToolTurns.has(previousTurn)) {
+        previousTurn.blocks.push(...turn.blocks);
+        previousTurn.tool_calls.push(...turn.tool_calls);
+        previousTurn.status = turn.status;
+        previousTurn.model = turn.model ?? previousTurn.model;
+        previousTurn.usage = turn.usage ?? previousTurn.usage;
+        previousTurn.duration_ms = turn.duration_ms || previousTurn.duration_ms;
+        if (turn.started_at) previousTurn.started_at = turn.started_at;
+        if (loopId === "root") latestRootMessage = previousTurn;
+        latestAssistantByLoop.set(loopId, previousTurn);
+        continue;
+      }
       if (loopId === "root" && (role === "user" || role === "assistant")) {
         latestRootMessage = turn;
       }
       turns.push(turn);
+      if (isNativeToolEntry) nativeToolTurns.add(turn);
       if (role === "assistant") latestAssistantByLoop.set(loopId, turn);
       if (loopId === "root") {
         if (role === "assistant") latestRootAssistant = turn;
@@ -1945,6 +1976,21 @@ function projectHistory(entries) {
       for (const toolCall of toolCalls) toolOwners.set(toolCall.id, turn);
       continue;
     }
+    if (kind === "tool_result") {
+      const data = entry.data ?? {};
+      const toolCallId = String(data.tool_call_id ?? "");
+      const owner = toolOwners.get(toolCallId) ?? findLatestAssistant(turns, loopId);
+      if (owner && toolCallId) {
+        const rawContent = data.content;
+        const content = typeof rawContent === "string" ? rawContent : Array.isArray(rawContent) ? rawContent : String(rawContent ?? "");
+        const status = data.is_error === true ? "error" : inferToolStatus(typeof content === "string" ? content : JSON.stringify(content));
+        setToolCallStatus(owner, toolCallId, status, content, null);
+        if (!owner.blocks.some((block) => block.type === "tool_result" && block.tool_call_id === toolCallId)) {
+          owner.blocks.push({ type: "tool_result", content, tool_call_id: toolCallId });
+        }
+      }
+      continue;
+    }
     if (kind === "mode_change") {
       turns.push(markerTurn(id, ++sequence, loopId, "mode_change", entry.data ?? {}));
     } else if (kind === "workspace_change") {
@@ -2193,7 +2239,8 @@ function toCreateSessionPayload(request) {
     solution_snapshot_session_id: request.solution_snapshot_session_id ?? null,
     compaction_ratio: request.compaction_ratio ?? null,
     ...request.runtime_type ? { runtime_type: request.runtime_type } : {},
-    ...request.daemon_id ? { daemon_id: request.daemon_id } : {}
+    ...request.daemon_id ? { daemon_id: request.daemon_id } : {},
+    ...request.agent_runtime_id ? { agent_runtime_id: request.agent_runtime_id } : {}
   };
 }
 var builtinSolutionIds = /* @__PURE__ */ new Set([
@@ -3516,6 +3563,7 @@ var AgentSession = class _AgentSession {
   replayQueue = Promise.resolve();
   pendingReplayMessage = null;
   pendingReplayMode;
+  pendingReplayKbIds;
   recentChatEndAt = 0;
   disposed = false;
   getAppContext = null;
@@ -3540,7 +3588,6 @@ var AgentSession = class _AgentSession {
     const session = new _AgentSession(
       sessionId,
       {
-        streamTokens: false,
         emitEvent: readonlyError,
         emitWithAck: async () => readonlyError(),
         ensureConnected: readonlyError,
@@ -3685,6 +3732,7 @@ var AgentSession = class _AgentSession {
     if (!options.replayDecision) {
       this.pendingReplayMessage = content;
       this.pendingReplayMode = options.mode;
+      this.pendingReplayKbIds = options.kbIds;
     }
     const payload = {
       session_id: this.sessionId,
@@ -3732,6 +3780,7 @@ var AgentSession = class _AgentSession {
   rollbackOptimisticSend(optimisticTurnId, askUserAnswer, optimisticAskAnswer, previousAskAnswer, message) {
     this.pendingReplayMessage = null;
     this.pendingReplayMode = void 0;
+    this.pendingReplayKbIds = void 0;
     this.update((current) => {
       let next = optimisticTurnId ? withTurns(
         current,
@@ -3913,7 +3962,7 @@ var AgentSession = class _AgentSession {
   _handleTurnEvents(events) {
     if (!events.length) return;
     const terminalChatEndStatus = extractTerminalChatEndStatus(events);
-    if (!terminalChatEndStatus && hasChatRunEvent2(events)) {
+    if (!terminalChatEndStatus && hasChatRunEvent2(events) && this.state.status !== "waiting_for_input") {
       this.markRunningIfIdle();
     }
     if (this.state.turns.length) {
@@ -3985,8 +4034,10 @@ var AgentSession = class _AgentSession {
   _handleReplayMismatch(data) {
     const message = this.pendingReplayMessage ?? data.actual_message ?? "";
     const mode = this.pendingReplayMode;
+    const kbIds = this.pendingReplayKbIds;
     this.pendingReplayMessage = null;
     this.pendingReplayMode = void 0;
+    this.pendingReplayKbIds = void 0;
     const respond = (decision) => {
       void this.runtime.emitWithAck(
         "chat:send",
@@ -3994,7 +4045,8 @@ var AgentSession = class _AgentSession {
           session_id: this.sessionId,
           message,
           mode,
-          replay_decision: decision
+          replay_decision: decision,
+          kb_ids: kbIds && kbIds.length > 0 ? kbIds : void 0
         },
         3e4
       ).then((response) => {
@@ -4273,8 +4325,7 @@ var AgentSession = class _AgentSession {
       {
         session_id: this.sessionId,
         event_format: "raw",
-        resume: true,
-        stream_tokens: this.runtime.streamTokens
+        resume: true
       },
       5e3
     ).then((response) => {
@@ -4411,7 +4462,6 @@ var SessionHub = class {
   }
   runtimeFor() {
     return {
-      streamTokens: this.client.options?.streamTokens !== false,
       emitEvent: (event, data) => {
         ;
         this.client.socket().emit(event, data);
@@ -4651,7 +4701,7 @@ function resolveAuthToken(options) {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "2610.0.0-beta.26" : "1.1.1";
+var SDK_VERSION = true ? "2610.0.0-beta.28" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {