@@ -4,6 +4,7 @@ import {
   detectOutputFormat,
   mcpWebSearchPath,
   type FlagsDef,
+  type McpConnectedClient,
 } from "bailian-cli-core";
 import { createSpinner, emitResult } from "bailian-cli-runtime";
 import { rethrowWithWebSearchActivateHint } from "./web-activate-hint.ts";
@@ -66,13 +67,18 @@ export default defineCommand({
         return;
       }
 
+      let client: McpConnectedClient | undefined;
       try {
-        const client = ctx.client.mcp(mcpWebSearchPath());
+        client = ctx.client.mcp(mcpWebSearchPath());
         await client.initialize();
         const tools = await client.listTools();
         emitResult({ tools }, format);
       } catch (error) {
         rethrowWithWebSearchActivateHint(error);
+      } finally {
+        // The SDK transport keeps a live SSE stream / pending sockets open;
+        // without closing it the process never exits after emitting results.
+        client?.close?.();
       }
       return;
     }
@@ -152,6 +158,9 @@ export default defineCommand({
     } catch (error) {
       spinner.stop("Failed.");
       rethrowWithWebSearchActivateHint(error);
+    } finally {
+      // Close on both paths: an open transport stream keeps the process alive.
+      client.close?.();
     }
   },
 });
@@ -418,6 +418,67 @@ describe.skipIf(!isBailianE2EMediaEnabled() || !isDashScopeE2EReady())(
       expect(data.audio_url?.length ?? 0).toBeGreaterThan(0);
       expect(data.voice).toBe("温柔女声");
     }, 180_000);
+
+    test("【auto】image edit 真实经 MCP(bailian_image_edit) 内联本地图并落地", async () => {
+      // Self-contained chain: generate a source image first (local path exercises
+      // the auto-mode base64 data-URI inlining against the live server).
+      const outDir = makeE2eOutputDir("aigc-auto-live-image-edit");
+      const generated = await runCommandE2e(AUTO_ROUTES, [
+        "image",
+        "generate",
+        "--model",
+        "auto",
+        "--prompt",
+        "一个红色圆点，白底",
+        "--out-dir",
+        outDir,
+        "--out-prefix",
+        "e2e-auto-edit-src",
+        "--output",
+        "json",
+      ]);
+      expect(generated.exitCode, generated.stderr).toBe(0);
+      const sourceImage = parseStdoutJson<{ saved?: string[] }>(generated.stdout).saved?.[0];
+      expect(sourceImage).toBeDefined();
+
+      const { stdout, stderr, exitCode } = await runCommandE2e(AUTO_ROUTES, [
+        "image",
+        "edit",
+        "--model",
+        "auto",
+        "--image",
+        sourceImage!,
+        "--prompt",
+        "把红色圆点改成蓝色圆点",
+        "--out-dir",
+        outDir,
+        "--out-prefix",
+        "e2e-auto-edit-out",
+        "--output",
+        "json",
+      ]);
+      expect(exitCode, stderr).toBe(0);
+      const data = parseStdoutJson<{ saved?: string[]; total?: number }>(stdout);
+      expect(data.saved?.length ?? 0).toBeGreaterThan(0);
+      expect(data.saved?.[0]).toContain("e2e-auto-edit-out");
+    }, 600_000);
+
+    test("【auto】speech recognize 真实经 MCP(bailian_speech_to_text) 转写公网音频", async () => {
+      // The live MCP ASR server only transcribes public http(s) URLs now:
+      // data-URI input returns an empty transcript without error, so the live
+      // case feeds the official sample audio instead of a local file.
+      const { stdout, stderr, exitCode } = await runCommandE2e(AUTO_ROUTES, [
+        "speech",
+        "recognize",
+        "--model",
+        "auto",
+        "--url",
+        "https://dashscope.oss-cn-beijing.aliyuncs.com/samples/audio/paraformer/hello_world_female2.wav",
+      ]);
+      expect(exitCode, stderr).toBe(0);
+      // The auto ASR branch emits bare transcript lines on stdout.
+      expect(stdout).toContain("hello world");
+    }, 300_000);
   },
 );
 
 
@@ -437,4 +437,22 @@ describe.skipIf(!isDashScopeE2EReady())("e2e: mcp (live)", () => {
     expect(data.tools?.length ?? 0).toBeGreaterThan(0);
     expect(data.tools?.some((t) => t.name === "bailian_web_search")).toBe(true);
   }, 60_000);
+
+  test("mcp call 真实调用内置 WebSearch 工具并原样返回 content", async () => {
+    const { stdout, stderr, exitCode } = await runCommandE2e(MCP_ROUTES, [
+      "mcp",
+      "call",
+      "--target",
+      "WebSearch.bailian_web_search",
+      "--query",
+      "阿里云百炼",
+      "--output",
+      "json",
+    ]);
+    expect(exitCode, stderr).toBe(0);
+    const data = parseStdoutJson<{ content?: Array<{ type?: string; text?: string }> }>(stdout);
+    expect(data.content?.length ?? 0).toBeGreaterThan(0);
+    expect(data.content?.[0]?.type).toBe("text");
+    expect((data.content?.[0]?.text ?? "").length).toBeGreaterThan(0);
+  }, 120_000);
 });
@@ -92,4 +92,19 @@ describe.skipIf(!isDashScopeE2EReady())("e2e: search web", () => {
     expect(pages.length).toBeGreaterThan(0);
     expect(pages[0]?.url).toBeDefined();
   }, 120_000);
+
+  test("--list-tools 真实拉取 WebSearch MCP 工具列表并正常退出", async () => {
+    // The --list-tools branch opens its own MCP session; a leaked transport
+    // would hang the subprocess, so a clean exit is part of the contract.
+    const { stdout, stderr, exitCode } = await runCommandE2e(SEARCH_WEB_ROUTES, [
+      "search",
+      "web",
+      "--list-tools",
+      "--output",
+      "json",
+    ]);
+    expect(exitCode, stderr).toBe(0);
+    const data = parseStdoutJson<{ tools?: Array<{ name?: string }> }>(stdout);
+    expect(data.tools?.some((tool) => tool.name === "bailian_web_search")).toBe(true);
+  }, 60_000);
 });
@@ -88,9 +88,14 @@ export interface SdkMcpAdapterOptions {
  * Translate an SDK/transport error into the CLI error contract.
  *
  * - `BailianError` (already ours, produced by the fetch interceptor) passes through.
- * - `McpError`: RequestTimeout → TIMEOUT, ConnectionClosed → NETWORK, otherwise a
- *   server-side JSON-RPC error → GENERAL with the `MCP error (code): message` shape
- *   (message passed through verbatim per AGENTS.md §3).
+ * - `McpError`: SDK-local failures only — the protocol timer (`Request timed
+ *   out` / `Maximum total timeout exceeded`, carrying its payload in `data`) →
+ *   TIMEOUT, and the transport-close rejection (`Connection closed`) → NETWORK.
+ *   A server-side JSON-RPC error reusing those codes (-32000 / -32001) carries
+ *   the server's own message, so it falls through to GENERAL with the
+ *   `MCP error (code): message` shape (message passed through verbatim per
+ *   AGENTS.md §3) — the exit code must not mislead callers into retrying a
+ *   business error as a network/timeout failure.
  * - `StreamableHTTPError` (HTTP status in `.code`) → GENERAL with the
  *   `MCP request failed: <status>` shape so the fallback detectors still match.
  * - `SseError` (classic SSE): when the fetch interceptor captured the failing
@@ -107,10 +112,10 @@ export function mapSdkError(error: unknown, sseGetFailure?: SseGetFailure): unkn
 
   if (error instanceof McpError) {
     const raw = rawMcpMessage(error);
-    if (error.code === ErrorCode.RequestTimeout) {
+    if (error.code === ErrorCode.RequestTimeout && isLocalTimeoutSignature(error, raw)) {
       return new BailianError(raw || "MCP request timed out.", ExitCode.TIMEOUT);
     }
-    if (error.code === ErrorCode.ConnectionClosed) {
+    if (error.code === ErrorCode.ConnectionClosed && raw === LOCAL_CLOSE_MESSAGE) {
       return new BailianError(raw || "MCP connection closed.", ExitCode.NETWORK);
     }
     return new BailianError(`MCP error (${error.code}): ${raw}`, ExitCode.GENERAL);
@@ -149,6 +154,24 @@ function rawMcpMessage(error: McpError): string {
   return error.message.startsWith(prefix) ? error.message.slice(prefix.length) : error.message;
 }
 
+/** Fixed message of the SDK's transport-close rejection of pending requests. */
+const LOCAL_CLOSE_MESSAGE = "Connection closed";
+
+/**
+ * True when a `RequestTimeout` McpError came from the SDK's own request timer,
+ * not from a server JSON-RPC error response reusing code -32001. The protocol
+ * timer attaches its payload as `data` (`{ timeout }` / `{ maxTotalTimeout, … }`);
+ * the fixed timer messages are matched as a fallback so the contract survives
+ * SDK builds that drop the payload.
+ */
+function isLocalTimeoutSignature(error: McpError, raw: string): boolean {
+  const data = error.data as Record<string, unknown> | undefined;
+  if (data && (typeof data.timeout === "number" || typeof data.maxTotalTimeout === "number")) {
+    return true;
+  }
+  return raw === "Request timed out" || raw === "Maximum total timeout exceeded";
+}
+
 /**
  * Server-side failure of a classic SSE stream GET, captured by the fetch
  * interceptor before `eventsource` discards the body (it only reports
@@ -286,13 +309,11 @@ export class SdkMcpAdapter implements McpConnectedClient {
     const client = await this.requireClient();
     try {
       const result = await client.listTools(undefined, this.requestOptions());
-      return result.tools.map((tool) => ({
-        name: tool.name,
-        ...(tool.description !== undefined ? { description: tool.description } : {}),
-        ...(tool.inputSchema !== undefined
-          ? { inputSchema: tool.inputSchema as Record<string, unknown> }
-          : {}),
-      }));
+      // Returned verbatim (the SDK-validated Tool objects): callers such as
+      // `bl mcp tools --output json` keep every standard field the server
+      // declares (outputSchema / annotations / title / `_meta`, …), matching
+      // the old hand-rolled client's passthrough.
+      return result.tools as McpTool[];
     } catch (error) {
       throw this.mapTransportError(error);
     }
 
@@ -21,8 +21,18 @@ import { SdkMcpAdapter } from "./mcp-sdk.ts";
 
 export interface McpTool {
   name: string;
+  /** Human-readable tool title, when the server declares one. */
+  title?: string;
   description?: string;
   inputSchema?: Record<string, unknown>;
+  /** JSON Schema for the tool output, when the server declares one. */
+  outputSchema?: Record<string, unknown>;
+  /** Server-provided behavioral hints (readOnlyHint, destructiveHint, …). */
+  annotations?: Record<string, unknown>;
+  /** Reserved extension slot, carried verbatim. */
+  _meta?: Record<string, unknown>;
+  /** Further standard fields the SDK validation retains. */
+  [key: string]: unknown;
 }
 
 /**
 
@@ -148,6 +148,35 @@ test("mapSdkError：超时/连接关闭映射 ExitCode；服务端 JSON-RPC 错
   expect(mapSdkError(typeError)).toBe(typeError);
 });
 
+test("mapSdkError：服务端 JSON-RPC 错复用 -32000/-32001 仍按 GENERAL 透传，本地计时器错才判 TIMEOUT/NETWORK", () => {
+  // Server-authored messages on the locally-interpreted codes must stay GENERAL
+  // (exit 1) so callers do not retry business errors as network/timeout.
+  const serverClosed = mapSdkError(new McpError(-32000, "session expired"));
+  expect(serverClosed).toBeInstanceOf(BailianError);
+  expect((serverClosed as BailianError).exitCode).toBe(ExitCode.GENERAL);
+  expect((serverClosed as BailianError).message).toBe("MCP error (-32000): session expired");
+
+  const serverTimeout = mapSdkError(new McpError(-32001, "tool execution timed out"));
+  expect((serverTimeout as BailianError).exitCode).toBe(ExitCode.GENERAL);
+  expect((serverTimeout as BailianError).message).toBe(
+    "MCP error (-32001): tool execution timed out",
+  );
+
+  // The SDK protocol timer attaches its payload as `data` — local signature.
+  const timer = mapSdkError(
+    McpError.fromError(ErrorCode.RequestTimeout, "Request timed out", { timeout: 5000 }),
+  );
+  expect((timer as BailianError).exitCode).toBe(ExitCode.TIMEOUT);
+
+  const maxTotal = mapSdkError(
+    McpError.fromError(ErrorCode.RequestTimeout, "Maximum total timeout exceeded", {
+      maxTotalTimeout: 1000,
+      totalElapsed: 1200,
+    }),
+  );
+  expect((maxTotal as BailianError).exitCode).toBe(ExitCode.TIMEOUT);
+});
+
 test("mapSdkError：SseError 结合捕获的 SSE GET 失败重建文案契约；无捕获时原样返回", () => {
   const sseError = new SseError(404, "Non-200 status code (404)", {} as never);
   const failure: SseGetFailure = {
@@ -354,8 +383,12 @@ test("SdkMcpAdapter：listTools 与 callTool 结果映射回 McpTool / McpToolRe
           tools: [
             {
               name: "bailian_image_gen",
+              title: "图片生成",
               description: "生成图片",
               inputSchema: { type: "object", properties: {}, required: ["prompt"] },
+              outputSchema: { type: "object", properties: {} },
+              annotations: { readOnlyHint: true },
+              _meta: { "biz/source": "probe" },
             },
           ],
         }),
@@ -368,6 +401,9 @@ test("SdkMcpAdapter：listTools 与 callTool 结果映射回 McpTool / McpToolRe
             { type: "text", text: JSON.stringify({ results: ["https://x/y.png"] }) },
             { type: "image", data: "AAAA", mimeType: "image/png" },
           ],
+          // The listed tool declares an outputSchema, so the SDK client
+          // validates that the call result carries structuredContent.
+          structuredContent: { results: ["https://x/y.png"] },
           isError: false,
         }),
       );
@@ -388,8 +424,12 @@ test("SdkMcpAdapter：listTools 与 callTool 结果映射回 McpTool / McpToolRe
     expect(tools).toEqual([
       {
         name: "bailian_image_gen",
+        title: "图片生成",
         description: "生成图片",
         inputSchema: { type: "object", properties: {}, required: ["prompt"] },
+        outputSchema: { type: "object", properties: {} },
+        annotations: { readOnlyHint: true },
+        _meta: { "biz/source": "probe" },
       },
     ]);