@blade-hq/agent-client 2610.0.0-beta.27 → 2610.0.0-beta.29

package/README.md

@@ -289,6 +289,40 @@ const body = { model: defaultServiceModel, messages, stream: true }
 没问题，直接交给浏览器就指向用户自己的机器了。默认形态是后端透传（密钥本来也不该进浏览器），
 浏览器直连只适合这个地址对浏览器同样可达的场景。
 
+### 远程电脑：client.computers
+
+一个会话除了自己的运行时，还可以操作用户接入的其他电脑（`blade daemon connect` 接进来的机器）。
+**默认一台都不能用**，要先为这次会话启动它。
+
+```ts
+const { computers } = await client.computers.list(sessionId)
+// SessionComputerList → { computers: SessionComputer[] }
+// SessionComputer: { id, label, os, arch, home, workspace, allowed_paths,
+//                    online, enabled, is_primary, last_seen_at, ... }
+
+await client.computers.setEnabled(sessionId, computer.id, true)   // 启动
+await client.computers.setEnabled(sessionId, computer.id, false)  // 停用
+```
+
+`online` 和 `enabled` 是**两件独立的事**：前者指那台电脑此刻连着后端，后者指这次会话已经启动了它。
+离线的电脑也能先启动，等它连上就直接可用。`online` 由服务端读心跳时间判定，不做实时探测，
+所以电脑离线时列表照样返回它——你拿得到「它离线了」这个结论。
+
+`is_primary` 表示这次会话本身就跑在这台电脑上。这种电脑恒为可用，也不能停用——
+那是会话自己的工作目录所在。
+
+做电脑选择器时用这几个纯函数，别自己重算状态：
+
+```ts
+import { canToggleComputer, computerState, sortComputers } from "@blade-hq/agent-client"
+
+sortComputers(computers)      // 可用的在前，其次在线的，最后按名字
+computerState(computer)       // ComputerState: "primary" | "enabled" | "offline" | "idle"
+canToggleComputer(computer)   // 主运行时返回 false
+```
+
+`ComputersResource` 是 `client.computers` 的类型。
+
 ## AgentSession
 
 一个会话的实时状态机。**状态归属实例**：同一页面建多个会话互不干扰。

package/dist/blade-client.d.ts

@@ -2,6 +2,7 @@ import { type LoginOptions, type LoginResult, type TokenStorageMode } from "./au
 import { type BladeFetchInit, type HttpMethod } from "./rest";
 import { AuthResource } from "./resources/auth";
 import { HeadlessResource } from "./resources/headless";
+import { ComputersResource } from "./resources/computers";
 import { ModelsResource } from "./resources/models";
 import { SessionsResource } from "./resources/sessions";
 import { SessionHub } from "./session/hub";
@@ -33,6 +34,7 @@ export declare class BladeClient {
     readonly options: BladeClientOptions;
     readonly auth: AuthResource;
     readonly headless: HeadlessResource;
+    readonly computers: ComputersResource;
     readonly models: ModelsResource;
     readonly sessions: SessionsResource;
     /** 实时会话中枢：client.sessions.connect() 内部使用，一般不直接访问。 */

package/dist/index.d.ts

@@ -20,6 +20,9 @@ export type { CommandEnvelope, InboundAction, InboundEnvelope } from "./commands
 export { isCommandEnvelope, isInboundEnvelope } from "./commands/protocol";
 export type { AuthResource, ExchangeCodeParams, ExchangeCodeResult, ProvidersResponse, UserInfo, } from "./resources/auth";
 export type { HeadlessResource } from "./resources/headless";
+export { ComputersResource } from "./resources/computers";
+export { canToggleComputer, computerState, sortComputers, } from "./resources/computers";
+export type { ComputerState, SessionComputer, SessionComputerList, } from "./resources/computers";
 export { ModelsResource } from "./resources/models";
 export type { ModelCatalog, ModelOption } from "./resources/models";
 export type { SessionsResource } from "./resources/sessions";

package/dist/index.js

@@ -424,6 +424,50 @@ function ensureSocketConnected(socket, timeoutMs, detail) {
   });
 }
 
+// src/resources/computers.ts
+function computerState(computer) {
+  if (computer.is_primary) return "primary";
+  if (computer.enabled) return "enabled";
+  return computer.online ? "idle" : "offline";
+}
+function canToggleComputer(computer) {
+  return !computer.is_primary;
+}
+function sortComputers(computers) {
+  return [...computers].sort((a, b) => {
+    if (a.enabled !== b.enabled) return a.enabled ? -1 : 1;
+    if (a.online !== b.online) return a.online ? -1 : 1;
+    return a.label.localeCompare(b.label);
+  });
+}
+var ComputersResource = class {
+  constructor(client) {
+    this.client = client;
+  }
+  client;
+  /**
+   * 列出当前用户的全部电脑，带上"在不在线"和"这次会话能不能用"。
+   * 服务端只查库，电脑离线时同样返回，所以拿得到"它离线了"这个结论。
+   */
+  list(sessionId) {
+    return this.client.json(
+      "GET",
+      `/api/sessions/${encodeURIComponent(sessionId)}/computers`
+    );
+  }
+  /**
+   * 启动或停止一台电脑。只改这次会话的可用范围，不会碰远程机器，
+   * 电脑离线时同样能登记，等它上线就直接可用。
+   */
+  setEnabled(sessionId, computer, enabled) {
+    return this.client.json(
+      "PUT",
+      `/api/sessions/${encodeURIComponent(sessionId)}/computers/${encodeURIComponent(computer)}/enabled`,
+      { enabled }
+    );
+  }
+};
+
 // src/resources/models.ts
 var ModelsResource = class {
   constructor(client) {
@@ -472,6 +516,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"
 });
@@ -1566,7 +1611,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);
@@ -1580,7 +1628,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);
@@ -1621,6 +1670,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) {
@@ -1877,6 +1931,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;
@@ -1936,10 +1991,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;
@@ -1948,6 +2020,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") {
@@ -2196,7 +2283,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([
@@ -3519,6 +3607,7 @@ var AgentSession = class _AgentSession {
   replayQueue = Promise.resolve();
   pendingReplayMessage = null;
   pendingReplayMode;
+  pendingReplayKbIds;
   recentChatEndAt = 0;
   disposed = false;
   getAppContext = null;
@@ -3687,6 +3776,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,
@@ -3697,7 +3787,8 @@ var AgentSession = class _AgentSession {
       thinking_override: options.thinkingOverride,
       whatif: options.whatif,
       replay_decision: options.replayDecision,
-      app_context: appContext
+      app_context: appContext,
+      kb_ids: options.kbIds && options.kbIds.length > 0 ? options.kbIds : void 0
     };
     try {
       await this.ensureJoined();
@@ -3733,6 +3824,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,
@@ -3914,7 +4006,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) {
@@ -3986,8 +4078,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",
@@ -3995,7 +4089,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) => {
@@ -4650,7 +4745,7 @@ function resolveAuthToken(options) {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "2610.0.0-beta.27" : "1.1.1";
+var SDK_VERSION = true ? "2610.0.0-beta.29" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {
@@ -4678,6 +4773,7 @@ var BladeClient = class {
   options;
   auth;
   headless;
+  computers;
   models;
   sessions;
   /** 实时会话中枢：client.sessions.connect() 内部使用，一般不直接访问。 */
@@ -4689,6 +4785,7 @@ var BladeClient = class {
     };
     this.auth = new AuthResource(this);
     this.headless = new HeadlessResource(this);
+    this.computers = new ComputersResource(this);
     this.models = new ModelsResource(this);
     this.sessions = new SessionsResource(this);
     this.hub = new SessionHub(this);
@@ -5229,6 +5326,7 @@ export {
   BladeApiError,
   BladeClient,
   ClientProjectionBuilder,
+  ComputersResource,
   DEFAULT_REPLAY_SPEED,
   EMPTY_PLATFORM_ENDPOINTS,
   LayoutType,
@@ -5243,6 +5341,8 @@ export {
   TaskStatus,
   acceptedPostChatFollowupCompletesLatestRun,
   buildMessageContent,
+  canToggleComputer,
+  computerState,
   connectEmbedded,
   contentPreview,
   contextProjectionData,
@@ -5262,6 +5362,7 @@ export {
   normalizeMessageContent,
   reconcileOptimisticUserTurns,
   resolveServiceUrl,
+  sortComputers,
   toReplaySnapshot,
   transformSlashCommand
 };