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

package/README.md

@@ -518,6 +518,9 @@ groupMessagesByLoop(messages)          // 按主/子智能体分组（智能体
 contentPreview(message.content, 80)    // 截断预览
 ```
 
+错误消息在普通聊天界面展示前用 `chatErrorForDisplay(message)` 转成稳定的业务文案，
+避免把内部路径或传输诊断暴露给用户；仅开发者界面显式传入第二个参数 `true` 保留原文。
+
 一个完整的渲染示例：
 
 ```tsx

package/dist/index.d.ts

@@ -28,7 +28,7 @@ export type { ModelCatalog, ModelOption } from "./resources/models";
 export type { SessionsResource } from "./resources/sessions";
 export type { CreateSessionRequest, AppCliAttachment, AppCliDefinition, FileEntry, ImportSessionOptions, PaginatedSessionsResult, GlobalSearchConversationResult, GlobalSearchFileResult, GlobalSearchResult, GlobalSearchResultItem, ResultFeedback, ResultFeedbackReason, SessionContextStats, SessionHistory, ShareLinkResult, UploadFileEntry, UploadFilesOptions, } from "./resources/sessions";
 export type { ArchivedFileInfo, ArchivedToolCallInfo, ChatMessage, CompactionInfo, FileContentPart, ImageUrlContentPart, MemoryRefInfo, MessageContent, MessageContentPart, TextContentPart, ToolBridgeContent, ToolCallInfo, } from "./schemas/message";
-export { buildMessageContent, contentPreview, extractTextAttachments, getFileParts, getImageParts, getTextContent, groupMessagesByLoop, isHiddenInternalMessage, normalizeMessageContent, transformSlashCommand, } from "./schemas/message-utils";
+export { buildMessageContent, chatErrorForDisplay, contentPreview, extractTextAttachments, getFileParts, getImageParts, getTextContent, groupMessagesByLoop, isHiddenInternalMessage, normalizeMessageContent, transformSlashCommand, } from "./schemas/message-utils";
 export { contextProjectionData, getContextDisplayState, } from "./schemas/context";
 export type { ContextAction, ContextDisplayState, ContextProjectionData, ContextProjectionFields, ContextSourceInfo, } from "./schemas/context";
 export type { ParsedTextAttachment, ParsedTextContext, SkillMentionAvailability, } from "./schemas/message-utils";

package/dist/index.js

@@ -1187,7 +1187,8 @@ function completedResponseText(content) {
   ).filter((part) => part.type === "text").map((part) => String(part.text ?? "")).join("");
 }
 function replaceTextContent(state, content) {
-  if (state.blocks.some((block) => block.type === "text")) return;
+  const currentContent = state.blocks.filter((block) => block.type === "text").map((block) => String(block.content ?? "")).join("");
+  if (currentContent === content) return;
   const replacement = { type: "text", content };
   const blocks = [];
   let inserted = false;
@@ -1207,6 +1208,31 @@ function replaceTextContent(state, content) {
   }
   state.blocks = blocks;
 }
+function applyResponseBlockOrder(state, value) {
+  if (!Array.isArray(value)) return false;
+  const ordered = [];
+  for (const item of value) {
+    if (typeof item !== "object" || item === null || Array.isArray(item)) continue;
+    const block = item;
+    if (block.type === "text" || block.type === "thinking") {
+      const content = String(block[block.type] ?? "");
+      if (content) ordered.push({ type: block.type, content });
+      continue;
+    }
+    if (block.type !== "tool_call") continue;
+    const toolCallId = String(block.id ?? "");
+    const toolBlock = state.blocks.find(
+      (candidate) => candidate.type === "tool_use" && candidate.tool_call_id === toolCallId
+    );
+    if (toolBlock) ordered.push(toolBlock);
+  }
+  if (ordered.length === 0 && value.length > 0) return false;
+  const unrelatedBlocks = state.blocks.filter(
+    (block) => block.type !== "text" && block.type !== "thinking" && block.type !== "tool_use"
+  );
+  state.blocks = [...ordered, ...unrelatedBlocks];
+  return true;
+}
 var ClientProjectionBuilder = class {
   activeTurns = /* @__PURE__ */ new Map();
   lastTurnIds = /* @__PURE__ */ new Map();
@@ -1591,9 +1617,6 @@ var ClientProjectionBuilder = class {
     if (typeof payload.usage === "object" && payload.usage !== null) {
       state.usage = { ...payload.usage };
     }
-    if ("content" in payload) {
-      replaceTextContent(state, completedResponseText(payload.content));
-    }
     const toolCalls = payload.tool_calls;
     if (Array.isArray(toolCalls)) {
       for (const raw of toolCalls) {
@@ -1611,6 +1634,9 @@ var ClientProjectionBuilder = class {
         );
       }
     }
+    if (!applyResponseBlockOrder(state, payload.response_blocks) && "content" in payload) {
+      replaceTextContent(state, completedResponseText(payload.content));
+    }
     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"
@@ -2210,6 +2236,7 @@ function buildBlocks(message, toolCalls) {
   const displayContent = message.role === "user" ? message._display_content : void 0;
   const stored = message._blocks;
   const blocks = [];
+  const storedToolCallIds = /* @__PURE__ */ new Set();
   if (displayContent !== void 0) {
     blocks.push({ type: "text", content: displayContent });
   } else if (Array.isArray(stored)) {
@@ -2218,15 +2245,31 @@ function buildBlocks(message, toolCalls) {
       const type3 = String(raw.type ?? "");
       if (type3 === "thinking") blocks.push({ type: type3, content: raw.thinking ?? raw.content ?? "" });
       if (type3 === "text") blocks.push({ type: type3, content: raw.text ?? raw.content ?? "" });
+      if (type3 === "tool_call") {
+        const toolCallId = String(raw.id ?? "");
+        const toolCall = toolCalls.find((candidate) => candidate.id === toolCallId);
+        if (!toolCall) continue;
+        storedToolCallIds.add(toolCallId);
+        blocks.push({
+          type: "tool_use",
+          content: toolCall.arguments,
+          tool_call_id: toolCall.id,
+          tool_name: toolCall.tool_name,
+          display_name: toolCall.display_name
+        });
+      }
     }
   } else if (message.content !== void 0 && message.content !== "") {
     blocks.push({ type: "text", content: message.content });
   }
   for (const toolCall of toolCalls) {
+    if (storedToolCallIds.has(toolCall.id)) continue;
     blocks.push({
       type: "tool_use",
-      content: { name: toolCall.tool_name, arguments: toolCall.arguments },
-      tool_call_id: toolCall.id
+      content: toolCall.arguments,
+      tool_call_id: toolCall.id,
+      tool_name: toolCall.tool_name,
+      display_name: toolCall.display_name
     });
   }
   return blocks;
@@ -2898,6 +2941,36 @@ var LEGACY_FORK_CONTEXT_MARKERS = [
   "\u53EF\u901A\u8FC7 `read_file` \u8BFB\u53D6\u3002",
   "# \u4F60\u7684\u4EFB\u52A1"
 ];
+var INTERNAL_CHAT_ERROR_PATTERNS = [
+  /\b(?:ENOENT|EACCES|EPERM)\b/i,
+  /\[(?:Errno -?\d+|WinError \d+)\]/i,
+  /\b(?:ECONNRESET|ECONNREFUSED|ETIMEDOUT|EHOSTUNREACH|ENETUNREACH|ENOTFOUND|EAI_AGAIN)\b/i,
+  /\b(?:Connection refused|Connection reset by peer|All connection attempts failed|getaddrinfo failed)\b/i,
+  /(?:^|[\s("'`])\/(?:root|home|Users|tmp|var|opt|etc)\//,
+  /[A-Za-z]:\\(?:Users|Windows|Program Files|AppData)\\/i,
+  /(?:^|\n)Traceback \(most recent call last\):/,
+  /(?:^|\n)\s*at\s+\S+(?:\s+\(|:\d+:\d+)/,
+  /(?:^|\n)File "[^"]+", line \d+/
+];
+var SAFE_CHAT_ERROR_PREFIXES = [
+  "\u6C99\u76D2\u8FD0\u884C\u73AF\u5883\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
+  "\u6A21\u578B\u670D\u52A1\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u68C0\u67E5\u6A21\u578B\u914D\u7F6E\u540E\u91CD\u8BD5\u3002"
+];
+var GENERIC_CHAT_ERROR = "\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\u3002";
+function chatErrorForDisplay(message, developer = false) {
+  const normalized = message.trim();
+  if (!developer) {
+    const safePrefix = SAFE_CHAT_ERROR_PREFIXES.find((prefix) => normalized.startsWith(prefix));
+    if (safePrefix) return safePrefix;
+  }
+  if (!developer && /no source matches this model/i.test(normalized)) {
+    return "\u5F53\u524D\u6A21\u578B\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u6216\u91CD\u65B0\u9009\u62E9\u6A21\u578B\u3002";
+  }
+  if (!developer && INTERNAL_CHAT_ERROR_PATTERNS.some((pattern) => pattern.test(normalized))) {
+    return GENERIC_CHAT_ERROR;
+  }
+  return normalized || GENERIC_CHAT_ERROR;
+}
 function normalizeMessageContent(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) return content;
@@ -4745,7 +4818,7 @@ function resolveAuthToken(options) {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "2610.0.0-beta.29" : "1.1.1";
+var SDK_VERSION = true ? "2610.0.0-beta.30" : "1.1.1";
 
 // src/socket.ts
 function withSdkIdentity(auth) {
@@ -5342,6 +5415,7 @@ export {
   acceptedPostChatFollowupCompletesLatestRun,
   buildMessageContent,
   canToggleComputer,
+  chatErrorForDisplay,
   computerState,
   connectEmbedded,
   contentPreview,