chatccc 0.2.133 → 0.2.134

package/README.md

@@ -205,7 +205,7 @@ ChatCCC 只负责把聊天消息转给本地 AI 工具，不捆绑这些 CLI。
 
 #### Claude Code
 
-本机完成 Claude CLI 登录后即可使用。同时支持官方和第三方 Anthropic 兼容 API：使用官方服务无需额外配置，使用第三方 API 则填写 `claude.apiKey` 和 `claude.baseUrl`。`claude.model`、`claude.subagentModel`、`claude.effort`、`claude.apiKey`、`claude.baseUrl` 均为选填；`claude.maxTurn` 控制每次对话的最大轮数（默认 25）。填写后会把对应配置传给 Claude CLI 子进程；留空则以 `~/.claude/settings.json` 为准。
+本机完成 Claude Code 登录后即可使用。ChatCCC 通过 Anthropic Claude Agent SDK 调用 Claude Code 能力，同时支持官方和第三方 Anthropic 兼容 API：使用官方服务无需额外配置，使用第三方 API 则填写 `claude.apiKey` 和 `claude.baseUrl`。`claude.model`、`claude.subagentModel`、`claude.effort`、`claude.apiKey`、`claude.baseUrl` 均为选填；`claude.maxTurn` 控制每次对话的最大轮数（默认 25）。填写后会把对应配置传给 Claude Agent SDK；留空则以 `~/.claude/settings.json` 为准。
 
 #### Cursor Agent CLI
 
@@ -283,9 +283,9 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `*.enabled` | 是否启用对应 AI Agent |
 | `*.defaultAgent` | `/new` 未指定 Agent 时使用哪个工具 |
 | `cursor.path` / `codex.path` | CLI 可执行文件路径；留空时自动探测或使用 PATH |
-| `claude.model` / `claude.subagentModel` / `claude.effort` | 选填；设置后传给 Claude CLI 子进程，留空以 `~/.claude/settings.json` 为准 |
-| `claude.apiKey` / `claude.baseUrl` | 选填；设置后传给 Claude CLI 子进程，留空以 `~/.claude/settings.json` 为准 |
-| `claude.maxTurn` | 选填；Claude CLI 最大对话轮数，默认 25，可在 Web UI 编辑 |
+| `claude.model` / `claude.subagentModel` / `claude.effort` | 选填；设置后传给 Claude Agent SDK，留空以 `~/.claude/settings.json` 为准 |
+| `claude.apiKey` / `claude.baseUrl` | 选填；设置后传给 Claude Agent SDK，留空以 `~/.claude/settings.json` 为准 |
+| `claude.maxTurn` | 选填；Claude 最大对话轮数，默认 25，可在 Web UI 编辑 |
 
 > 当前 ChatCCC 以 `bypassPermissions` 模式运行，会跳过 Agent 操作确认。请只在可信环境中使用。
 

package/agent-prompts/claude_specific.md

@@ -1,6 +1,6 @@
 # Claude-Specific Injection Prompt
 
-Use this prompt as the Claude CLI injection prompt for this project.
+Use this prompt as the Claude Agent SDK injection prompt for this project.
 
 Project workspace:
 
@@ -10,7 +10,7 @@ f:\users\weizhangjian\feishuclauderprivate
 
 ## Repeated Successful Command Guard
 
-When working in this project through Claude CLI, repeated successful shell commands are a completion signal, not a reason to keep using tools.
+When working in this project through Claude Agent SDK, repeated successful shell commands are a completion signal, not a reason to keep using tools.
 
 A shell command is considered the same command when all of these are true:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.133",
+  "version": "0.2.134",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@ai-sdk/openai-compatible": "^2.0.47",
-    "@anthropic-ai/claude-agent-sdk": "^0.3.160",
+    "@anthropic-ai/claude-agent-sdk": "0.3.153",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@openilink/openilink-sdk-node": "^0.6.0",
     "ai": "^6.0.184",

package/src/__tests__/claude-adapter.test.ts

@@ -3,6 +3,7 @@ import {
   normalizeSdkMessage,
   createClaudeAdapter,
   buildClaudePromptText,
+  buildSdkEnv,
 } from "../adapters/claude-adapter.ts";
 import type { UnifiedStreamMessage } from "../adapters/adapter-interface.ts";
 import type {
@@ -463,3 +464,50 @@ describe("buildClaudePromptText", () => {
     expect(buildClaudePromptText("hello", null)).toBe("hello");
   });
 });
+
+describe("buildSdkEnv", () => {
+  it("returns undefined when no SDK env override is configured", () => {
+    expect(buildSdkEnv("", "  ", undefined)).toBeUndefined();
+  });
+
+  it("sets requested SDK env overrides and removes conflicting Claude auth/model vars", () => {
+    const original = {
+      ANTHROPIC_AUTH_TOKEN: process.env.ANTHROPIC_AUTH_TOKEN,
+      CLAUDE_CODE_OAUTH_TOKEN: process.env.CLAUDE_CODE_OAUTH_TOKEN,
+      ANTHROPIC_MODEL: process.env.ANTHROPIC_MODEL,
+      CLAUDE_CODE_EFFORT_LEVEL: process.env.CLAUDE_CODE_EFFORT_LEVEL,
+      CLAUDE_CODE_SUBAGENT_MODEL: process.env.CLAUDE_CODE_SUBAGENT_MODEL,
+    };
+
+    process.env.ANTHROPIC_AUTH_TOKEN = "token";
+    process.env.CLAUDE_CODE_OAUTH_TOKEN = "oauth";
+    process.env.ANTHROPIC_MODEL = "old-model";
+    process.env.CLAUDE_CODE_EFFORT_LEVEL = "old-effort";
+    process.env.CLAUDE_CODE_SUBAGENT_MODEL = "old-subagent";
+
+    try {
+      const env = buildSdkEnv(
+        " claude-haiku-4-5-20251001 ",
+        " sk-test ",
+        " https://api.example.com ",
+      );
+
+      expect(env).toBeDefined();
+      expect(env!.ANTHROPIC_AUTH_TOKEN).toBeUndefined();
+      expect(env!.CLAUDE_CODE_OAUTH_TOKEN).toBeUndefined();
+      expect(env!.ANTHROPIC_MODEL).toBeUndefined();
+      expect(env!.CLAUDE_CODE_EFFORT_LEVEL).toBeUndefined();
+      expect(env!.CLAUDE_CODE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
+      expect(env!.ANTHROPIC_API_KEY).toBe("sk-test");
+      expect(env!.ANTHROPIC_BASE_URL).toBe("https://api.example.com");
+    } finally {
+      for (const [key, value] of Object.entries(original)) {
+        if (value === undefined) {
+          delete process.env[key];
+        } else {
+          process.env[key] = value;
+        }
+      }
+    }
+  });
+});

package/src/__tests__/config-reload.test.ts

@@ -47,9 +47,10 @@ const baseAppConfig: AppConfig = {
     defaultAgent: true,
     model: "initial-model",
     subagentModel: "initial-subagent-model",
-    effort: "initial-effort",
-    apiKey: "",
-    baseUrl: "",
+    effort: "initial-effort",
+    apiKey: "",
+    baseUrl: "",
+    maxTurn: 25,
   },
   cursor: { enabled: true, defaultAgent: false, path: "/initial/cursor", model: "initial-cursor-model" },
   codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", effort: "initial-codex-effort" },
@@ -88,10 +89,11 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
         defaultAgent: true,
         model: "claude-sonnet-4-6",
         subagentModel: "claude-haiku-4-5-20251001",
-        effort: "high",
-        apiKey: "sk-test",
-        baseUrl: "https://api.example.com",
-      },
+        effort: "high",
+        apiKey: "sk-test",
+        baseUrl: "https://api.example.com",
+        maxTurn: 25,
+      },
     });
 
     expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");

package/src/adapters/claude-adapter.ts

@@ -1,538 +1,465 @@
-// =============================================================================
-// claude-adapter.ts — Claude CLI 适配器
-// =============================================================================
-// 通过直接 spawn claude.exe（不再使用 @anthropic-ai/claude-agent-sdk JS API）
-// 以确保 --mcp-config 参数能正确传递给 CLI 子进程，加载用户 MCP 服务器。
-// =============================================================================
-
-import { spawn, type ChildProcess } from "node:child_process";
-import { createInterface } from "node:readline";
-import { existsSync, readFileSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { homedir } from "node:os";
-import { createRequire } from "node:module";
-import { fileURLToPath } from "node:url";
-
-import type {
-  ToolAdapter,
-  UnifiedBlock,
-  UnifiedStreamMessage,
-  CreateSessionResult,
-  SessionInfo,
-  ToolPromptOptions,
-} from "./adapter-interface.ts";
-import { killProcessTree } from "./proc-tree-kill.ts";
-import {
-  defaultClaudeSessionMetaStore,
-  type ClaudeSessionMetaStore,
-} from "./claude-session-meta-store.ts";
-
-// ---------------------------------------------------------------------------
-// 常量
-// ---------------------------------------------------------------------------
-
-/** 根据当前平台动态解析 claude-agent-sdk 二进制路径 */
-function resolveClaudeBinary(): string {
-  const platform = process.platform; // 'win32', 'linux', 'darwin'
-  const arch = process.arch;         // 'x64', 'arm64'
-
-  // 通过 Node 模块解析找到 SDK 主包目录，确保测试和生产环境一致
-  const _require = createRequire(import.meta.url);
-  const sdkMainDir = dirname(_require.resolve("@anthropic-ai/claude-agent-sdk"));
-
-  // 读取 manifest.json 获取各平台二进制文件名
-  let platforms: Record<string, { binary: string }> | null = null;
-  try {
-    const manifest = JSON.parse(
-      readFileSync(join(sdkMainDir, "manifest.json"), "utf-8"),
-    ) as { platforms?: Record<string, { binary: string }> };
-    platforms = manifest.platforms ?? null;
-  } catch { /* manifest 缺失时用默认规则推断 */ }
-
-  // Linux 上需区分 musl / glibc，先检测 musl 变体
-  const candidates: string[] = [];
-  if (platform === "linux") {
-    candidates.push(`${platform}-${arch}-musl`, `${platform}-${arch}`);
-  } else {
-    candidates.push(`${platform}-${arch}`);
-  }
-
-  for (const triple of candidates) {
-    const binaryName = platforms?.[triple]?.binary
-      ?? (platform === "win32" ? "claude.exe" : "claude");
-    const pkgDir = join(sdkMainDir, "..", `claude-agent-sdk-${triple}`);
-    if (!existsSync(pkgDir)) continue;
-    const exePath = join(pkgDir, binaryName);
-    if (existsSync(exePath)) return exePath;
-  }
-
-  throw new Error(
-    `No Claude CLI binary found for platform ${platform}-${arch}. ` +
-    `Tried: ${candidates.map((c) => `@anthropic-ai/claude-agent-sdk-${c}`).join(", ")}`,
-  );
-}
-
-const CLAUDE_EXE = resolveClaudeBinary();
-const PROJECT_ROOT = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
-const CLAUDE_SPECIFIC_PROMPT_PATH = join(
-  PROJECT_ROOT,
-  "agent-prompts",
-  "claude_specific.md",
-);
-
-// ---------------------------------------------------------------------------
-// 类型别名（CLI JSONL 消息格式，与旧 SDK 消息格式兼容）
-// ---------------------------------------------------------------------------
-
-interface SdkContentBlock {
-  type: string;
-  text?: string;
-  thinking?: string;
-  name?: string;
-  input?: unknown;
-  tool_use_id?: string;
-  content?: unknown;
-  is_error?: boolean;
-  query?: string;
-  [key: string]: unknown;
-}
-
-interface SdkMessageLike {
-  type?: string;
-  subtype?: string;
-  message?: { content?: SdkContentBlock[] };
-  compact_metadata?: {
-    trigger?: "manual" | "auto";
-    pre_tokens?: number;
-    post_tokens?: number;
-  };
-  session_id?: string;
-  model?: string;
-  cwd?: string;
-}
-
-// ---------------------------------------------------------------------------
-// ClaudeAdapterOptions
-// ---------------------------------------------------------------------------
-
-export interface ClaudeAdapterOptions {
-  model: string;
-  subagentModel?: string;
-  effort: string;
-  /** Anthropic API Key（选填，留空则不注入环境变量） */
-  apiKey?: string;
-  /** Anthropic 兼容 API Base URL（选填，留空则不注入环境变量） */
-  baseUrl?: string;
-  /** 判断字段是否为"不传给 CLI"的占位（空字符串/全空白） */
-  isEmpty: (value: string) => boolean;
-  /** 注入自定义 meta 持久化 store（测试用）；未提供时使用全局默认实例。 */
-  metaStore?: ClaudeSessionMetaStore;
-  /** Claude CLI maxTurns 设置，默认 25 */
-  maxTurn?: number;
-}
-
-// ---------------------------------------------------------------------------
-// buildCliEnv — 为 CLI 子进程构造 env（仅子进程级别，不污染主进程）
-// ---------------------------------------------------------------------------
-
-function buildCliEnv(
-  subagentModel: string | undefined,
-  apiKey: string | undefined,
-  baseUrl: string | undefined,
-): Record<string, string | undefined> | undefined {
-  const subagentModelTrim = (subagentModel ?? "").trim();
-  const apiKeyTrim = (apiKey ?? "").trim();
-  const baseUrlTrim = (baseUrl ?? "").trim();
-
-  if (!subagentModelTrim && !apiKeyTrim && !baseUrlTrim) return undefined;
-
-  const env: Record<string, string | undefined> = { ...process.env };
-  delete env.ANTHROPIC_AUTH_TOKEN;
-  delete env.CLAUDE_CODE_OAUTH_TOKEN;
-  delete env.ANTHROPIC_MODEL;
-  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  delete env.CLAUDE_CODE_EFFORT_LEVEL;
-
-  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
-  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
-  if (baseUrlTrim) env.ANTHROPIC_BASE_URL = baseUrlTrim;
-
-  return env;
-}
-
-// ---------------------------------------------------------------------------
-// MCP 配置读取
-// ---------------------------------------------------------------------------
-
-function readMcpConfigJson(): string | null {
-  const settingsPath = join(homedir(), ".claude", "settings.json");
-  try {
-    if (!existsSync(settingsPath)) return null;
-    const raw = readFileSync(settingsPath, "utf-8");
-    const settings = JSON.parse(raw);
-    const mcpServers = settings?.mcpServers;
-    if (!mcpServers || Object.keys(mcpServers).length === 0) return null;
-    // CLI 期望 {"mcpServers": {...}} 格式，而非裸 mcpServers 值
-    return JSON.stringify({ mcpServers });
-  } catch {
-    return null;
-  }
-}
-
-// ---------------------------------------------------------------------------
-// 诊断日志
-// ---------------------------------------------------------------------------
-
-function logMcpConfig(): void {
-  const settingsPath = join(homedir(), ".claude", "settings.json");
-  const ts = new Date().toISOString();
-  try {
-    if (!existsSync(settingsPath)) {
-      console.log(`[${ts}] [MCP-DIAG] settings.json not found at ${settingsPath}`);
-      return;
-    }
-    const raw = readFileSync(settingsPath, "utf-8");
-    const settings = JSON.parse(raw);
-    const mcpServers = settings?.mcpServers;
-    if (!mcpServers || Object.keys(mcpServers).length === 0) {
-      console.log(`[${ts}] [MCP-DIAG] No mcpServers configured in settings.json`);
-      return;
-    }
-    console.log(`[${ts}] [MCP-DIAG] mcpServers found: ${JSON.stringify(Object.keys(mcpServers))}`);
-    for (const [name, cfg] of Object.entries(mcpServers) as [string, { type?: string; command?: string; args?: string[] }][]) {
-      console.log(`[${ts}] [MCP-DIAG]   ${name}: type=${cfg.type}, command=${cfg.command}, args=${JSON.stringify(cfg.args)}`);
-    }
-  } catch (err) {
-    console.log(`[${ts}] [MCP-DIAG] Failed to read settings.json: ${(err as Error).message}`);
-  }
-}
-
-// ---------------------------------------------------------------------------
-// normalizeSdkMessage — CLI JSONL 消息 → UnifiedStreamMessage | null
-// （CLI 与 SDK 使用相同 JSONL 格式，导出名保留以兼容现有测试）
-// ---------------------------------------------------------------------------
-
-export function normalizeSdkMessage(msg: SdkMessageLike): UnifiedStreamMessage | null {
-  if (
-    (msg.type === "assistant" || msg.type === "user") &&
-    msg.message?.content
-  ) {
-    const blocks: UnifiedBlock[] = [];
-    for (const block of msg.message.content) {
-      if (block.type === "thinking" && block.thinking) {
-        blocks.push({ type: "thinking", thinking: block.thinking });
-      } else if (block.type === "tool_use") {
-        blocks.push({
-          type: "tool_use",
-          id: (block as { id?: string }).id,
-          name: block.name ?? "unknown",
-          input: block.input,
-        });
-      } else if (block.type === "tool_result") {
-        blocks.push({
-          type: "tool_result",
-          tool_use_id: block.tool_use_id ?? "",
-          content: block.content,
-          is_error: block.is_error,
-        });
-      } else if (block.type === "redacted_thinking") {
-        blocks.push({ type: "redacted_thinking" });
-      } else if (block.type === "search_result") {
-        blocks.push({
-          type: "search_result",
-          query: block.query ?? "",
-        });
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+import {
+  getSessionInfo as sdkGetSessionInfo,
+  query,
+  type Options as ClaudeSdkOptions,
+  type SDKMessage,
+} from "@anthropic-ai/claude-agent-sdk";
+
+import type {
+  CreateSessionResult,
+  SessionInfo,
+  ToolAdapter,
+  ToolPromptOptions,
+  UnifiedBlock,
+  UnifiedStreamMessage,
+} from "./adapter-interface.ts";
+import {
+  defaultClaudeSessionMetaStore,
+  type ClaudeSessionMetaStore,
+} from "./claude-session-meta-store.ts";
+
+const PROJECT_ROOT = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
+const CLAUDE_SPECIFIC_PROMPT_PATH = join(
+  PROJECT_ROOT,
+  "agent-prompts",
+  "claude_specific.md",
+);
+
+type SettingSource = "user" | "project" | "local";
+
+interface SdkContentBlock {
+  type: string;
+  text?: string;
+  thinking?: string;
+  name?: string;
+  input?: unknown;
+  tool_use_id?: string;
+  content?: unknown;
+  is_error?: boolean;
+  query?: string;
+  [key: string]: unknown;
+}
+
+interface SdkMessageLike {
+  type?: string;
+  subtype?: string;
+  message?: { content?: SdkContentBlock[] };
+  compact_metadata?: {
+    trigger?: "manual" | "auto";
+    pre_tokens?: number;
+    post_tokens?: number;
+  };
+  session_id?: string;
+  model?: string;
+  cwd?: string;
+}
+
+export interface ClaudeAdapterOptions {
+  model: string;
+  subagentModel?: string;
+  effort: string;
+  apiKey?: string;
+  baseUrl?: string;
+  isEmpty: (value: string) => boolean;
+  metaStore?: ClaudeSessionMetaStore;
+  maxTurn?: number;
+}
+
+export function buildSdkEnv(
+  subagentModel: string | undefined,
+  apiKey: string | undefined,
+  baseUrl: string | undefined,
+): Record<string, string | undefined> | undefined {
+  const subagentModelTrim = (subagentModel ?? "").trim();
+  const apiKeyTrim = (apiKey ?? "").trim();
+  const baseUrlTrim = (baseUrl ?? "").trim();
+
+  if (!subagentModelTrim && !apiKeyTrim && !baseUrlTrim) return undefined;
+
+  const env: Record<string, string | undefined> = { ...process.env };
+  delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.CLAUDE_CODE_OAUTH_TOKEN;
+  delete env.ANTHROPIC_MODEL;
+  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
+  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
+  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+  delete env.CLAUDE_CODE_EFFORT_LEVEL;
+  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+
+  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
+  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
+  if (baseUrlTrim) env.ANTHROPIC_BASE_URL = baseUrlTrim;
+
+  return env;
+}
+
+function readMcpServersConfig(): Record<string, unknown> | undefined {
+  const settingsPath = join(homedir(), ".claude", "settings.json");
+  try {
+    if (!existsSync(settingsPath)) return undefined;
+    const raw = readFileSync(settingsPath, "utf-8");
+    const settings = JSON.parse(raw) as { mcpServers?: Record<string, unknown> };
+    const mcpServers = settings.mcpServers;
+    if (!mcpServers || Object.keys(mcpServers).length === 0) return undefined;
+    return mcpServers;
+  } catch {
+    return undefined;
+  }
+}
+
+function logMcpConfig(): void {
+  const settingsPath = join(homedir(), ".claude", "settings.json");
+  const ts = new Date().toISOString();
+  try {
+    if (!existsSync(settingsPath)) {
+      console.log(`[${ts}] [MCP-DIAG] settings.json not found at ${settingsPath}`);
+      return;
+    }
+    const raw = readFileSync(settingsPath, "utf-8");
+    const settings = JSON.parse(raw) as { mcpServers?: Record<string, unknown> };
+    const mcpServers = settings.mcpServers;
+    if (!mcpServers || Object.keys(mcpServers).length === 0) {
+      console.log(`[${ts}] [MCP-DIAG] No mcpServers configured in settings.json`);
+      return;
+    }
+    console.log(`[${ts}] [MCP-DIAG] mcpServers found: ${JSON.stringify(Object.keys(mcpServers))}`);
+    for (const [name, cfg] of Object.entries(mcpServers)) {
+      const item = cfg as { type?: string; command?: string; args?: string[] };
+      console.log(`[${ts}] [MCP-DIAG]   ${name}: type=${item.type}, command=${item.command}, args=${JSON.stringify(item.args)}`);
+    }
+  } catch (err) {
+    console.log(`[${ts}] [MCP-DIAG] Failed to read settings.json: ${(err as Error).message}`);
+  }
+}
+
+export function normalizeSdkMessage(msg: SdkMessageLike): UnifiedStreamMessage | null {
+  if (
+    (msg.type === "assistant" || msg.type === "user") &&
+    msg.message?.content
+  ) {
+    const blocks: UnifiedBlock[] = [];
+    for (const block of msg.message.content) {
+      if (block.type === "thinking" && block.thinking) {
+        blocks.push({ type: "thinking", thinking: block.thinking });
+      } else if (block.type === "tool_use") {
+        blocks.push({
+          type: "tool_use",
+          id: (block as { id?: string }).id,
+          name: block.name ?? "unknown",
+          input: block.input,
+        });
+      } else if (block.type === "tool_result") {
+        blocks.push({
+          type: "tool_result",
+          tool_use_id: block.tool_use_id ?? "",
+          content: block.content,
+          is_error: block.is_error,
+        });
+      } else if (block.type === "redacted_thinking") {
+        blocks.push({ type: "redacted_thinking" });
+      } else if (block.type === "search_result") {
+        blocks.push({
+          type: "search_result",
+          query: block.query ?? "",
+        });
       } else if (block.type === "text" && block.text) {
-        // user text is host input, not assistant output. Keep it out of the
-        // final reply if the CLI ever emits it.
         if (msg.type === "user") continue;
         blocks.push({ type: "text", text: block.text });
       }
-    }
-    return { type: msg.type, blocks };
-  }
-
-  if (msg.type === "system" && msg.subtype === "compact_boundary") {
-    const meta = msg.compact_metadata;
-    if (!meta) return null;
-    return {
-      type: "system",
-      blocks: [
-        {
-          type: "compact_boundary",
-          trigger: meta.trigger ?? "auto",
-          pre_tokens: meta.pre_tokens ?? 0,
-          post_tokens: meta.post_tokens,
-        },
-      ],
-    };
-  }
-
-  return null;
-}
-
-// ---------------------------------------------------------------------------
-// CLI spawn helpers
-// ---------------------------------------------------------------------------
-
-function buildCliArgs(
-  model: string,
-  effort: string,
-  isEmpty: (value: string) => boolean,
-  mcpConfigJson: string | null,
-  extraArgs: string[],
-  maxTurn: number,
-  planMode?: boolean,
-): string[] {
-  const args = [
-    "-p",
-    "--output-format", "stream-json",
-    "--verbose",
-    "--setting-sources", "user,project,local",
-    "--permission-mode", planMode ? "plan" : "bypassPermissions",
-    "--settings", `{"maxTurns":${maxTurn},"maxBudget":999999999}`,
-  ];
-  if (!planMode) args.push("--dangerously-skip-permissions");
-
-  if (!isEmpty(model)) args.push("--model", model);
-  if (!isEmpty(effort)) args.push("--effort", effort);
-
-  // extraArgs（如 prompt "ok" 或 --resume <id>）必须在 --mcp-config 之前，
-  // 因为 --mcp-config 接受多个空格分隔的值，会把后续非 flag 参数都当作 MCP 配置
-  args.push(...extraArgs);
-
-  if (mcpConfigJson) args.push("--mcp-config", mcpConfigJson);
-
-  const ts = new Date().toISOString();
-  const safeArgs = args.filter(a => a !== mcpConfigJson);
-  console.log(`[${ts}] [CLAUDE-CLI] spawn: ${CLAUDE_EXE} ${safeArgs.join(" ")}`);
-  if (mcpConfigJson) {
-    console.log(`[${ts}] [CLAUDE-CLI] --mcp-config: ${mcpConfigJson}`);
-  }
-
-  return args;
-}
-
-function spawnCli(
-  args: string[],
-  cwd: string,
-  env: Record<string, string | undefined> | undefined,
-  pipeStdin: boolean,
-): ChildProcess {
-  const proc = spawn(CLAUDE_EXE, args, {
-    cwd,
-    stdio: [pipeStdin ? "pipe" : "ignore", "pipe", "pipe"],
-    windowsHide: true,
-    env: env ?? process.env,
-  });
-
-  const ts = new Date().toISOString();
-  console.log(`[${ts}] [CLAUDE-CLI] spawned, pid=${proc.pid}`);
-
-  let stderr = "";
-  proc.stderr!.on("data", (chunk: Buffer) => { stderr += chunk.toString(); });
-  proc.on("close", (code) => {
-    if (stderr.trim()) {
-      const ts2 = new Date().toISOString();
-      console.log(`[${ts2}] [CLAUDE-STDERR] exit=${code}: ${stderr.trim().slice(0, 2000)}`);
-    }
-  });
-
-  return proc;
-}
-
-async function* readJsonLines(
-  proc: ChildProcess,
-  signal?: AbortSignal,
-): AsyncGenerator<SdkMessageLike> {
-  const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
-  const onAbort = () => { rl.close(); };
-  signal?.addEventListener("abort", onAbort, { once: true });
-  let lineCount = 0;
-  try {
-    for await (const line of rl) {
-      if (signal?.aborted) break;
-      lineCount++;
-      const trimmed = line.trim();
-      if (!trimmed) continue;
-      try {
-        yield JSON.parse(trimmed) as SdkMessageLike;
-      } catch { /* 非 JSON 行静默跳过 */ }
-    }
-  } finally {
-    signal?.removeEventListener("abort", onAbort);
-    rl.close();
-    const ts = new Date().toISOString();
-    console.log(`[${ts}] [CLAUDE-CLI] readJsonLines done: ${lineCount} raw lines`);
-  }
-}
-
-/** 构造 stream-json 格式的 stdin 输入行 */
-function buildStreamJsonInput(text: string): string {
-  return JSON.stringify({
-    type: "user",
-    message: {
-      role: "user",
-      content: [{ type: "text", text }],
-    },
-  }) + "\n";
-}
-
-export function readClaudeSpecificInjectionPrompt(): string | null {
-  try {
-    if (!existsSync(CLAUDE_SPECIFIC_PROMPT_PATH)) return null;
-    const prompt = readFileSync(CLAUDE_SPECIFIC_PROMPT_PATH, "utf-8").trim();
-    return prompt.length > 0 ? prompt : null;
-  } catch {
-    return null;
-  }
-}
-
-export function buildClaudePromptText(
-  userText: string,
-  injectionPrompt: string | null = readClaudeSpecificInjectionPrompt(),
-): string {
-  const prompt = injectionPrompt?.trim();
-  if (!prompt) return userText;
-
-  return [
-    "[ChatCCC Claude-specific injection prompt]",
-    prompt,
-    "[/ChatCCC Claude-specific injection prompt]",
-    "",
-    userText,
-  ].join("\n");
-}
-
-// ---------------------------------------------------------------------------
-// ClaudeAdapter
-// ---------------------------------------------------------------------------
-
-class ClaudeAdapter implements ToolAdapter {
-  readonly displayName = "Claude Code";
-  readonly sessionDescPrefix = "Claude Code Session:";
-  private model: string;
-  private effort: string;
-  private subagentModel: string | undefined;
-  private apiKey: string | undefined;
-  private baseUrl: string | undefined;
-  private isEmpty: (value: string) => boolean;
-  private metaStore: ClaudeSessionMetaStore;
-  private maxTurn: number;
-
-  constructor(options: ClaudeAdapterOptions) {
-    this.model = options.model;
-    this.effort = options.effort;
-    this.subagentModel = options.subagentModel;
-    this.apiKey = options.apiKey;
-    this.baseUrl = options.baseUrl;
-    this.isEmpty = options.isEmpty;
-    this.metaStore = options.metaStore ?? defaultClaudeSessionMetaStore;
-    this.maxTurn = options.maxTurn ?? 25;
-  }
-
-  async createSession(cwd: string): Promise<CreateSessionResult> {
-    logMcpConfig();
-    const mcpConfigJson = readMcpConfigJson();
-    const env = buildCliEnv(this.subagentModel, this.apiKey, this.baseUrl);
-    const args = buildCliArgs(
-      this.model, this.effort, this.isEmpty, mcpConfigJson,
-      ["ok"],
-      this.maxTurn,
-    );
-
-    const proc = spawnCli(args, cwd, env, false);
-
-    for await (const msg of readJsonLines(proc)) {
-      if (msg.session_id) {
-        const sessionId = msg.session_id;
-        await this.metaStore.set(sessionId, { cwd }).catch(() => {});
-        await killProcessTree(proc.pid);
-        const ts = new Date().toISOString();
-        console.log(`[${ts}] [CLAUDE-CLI] createSession: ${sessionId}`);
-        return { sessionId };
-      }
-    }
-
-    await killProcessTree(proc.pid);
-    throw new Error("No session ID in Claude init event");
-  }
-
-  async *prompt(
-    sessionId: string,
-    userText: string,
-    cwd: string,
-    signal?: AbortSignal,
-    options?: ToolPromptOptions,
-  ): AsyncIterable<UnifiedStreamMessage> {
-    const mcpConfigJson = readMcpConfigJson();
-    const env = buildCliEnv(this.subagentModel, this.apiKey, this.baseUrl);
-    const args = buildCliArgs(
-      this.model, this.effort, this.isEmpty, mcpConfigJson,
-      ["--resume", sessionId, "--input-format", "stream-json"],
-      this.maxTurn,
-      options?.planMode,
-    );
-
-    const proc = spawnCli(args, cwd, env, true);
-    if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
-
-    const onAbort = () => { void killProcessTree(proc.pid); };
-    signal?.addEventListener("abort", onAbort, { once: true });
-
-    proc.stdin!.write(buildStreamJsonInput(buildClaudePromptText(userText)));
-    proc.stdin!.end();
-
-    try {
-      for await (const raw of readJsonLines(proc, signal)) {
-        if (signal?.aborted) break;
-
-        if (raw.type === "system" && raw.subtype === "init" && raw.session_id) {
-          const meta: { cwd?: string; model?: string } = {};
-          if (raw.cwd) meta.cwd = raw.cwd;
-          if (raw.model) meta.model = raw.model;
-          if (Object.keys(meta).length > 0) {
-            this.metaStore.set(raw.session_id, meta).catch(() => {});
-          }
-        }
-
-        const normalized = normalizeSdkMessage(raw);
-        if (normalized) yield normalized;
-
-        // result 是流末事件，收到后立即结束进程，防止 CLI 僵死导致 readline 挂起。
-        if (raw.type === "result") {
-          void killProcessTree(proc.pid);
-          break;
-        }
-      }
-    } finally {
-      signal?.removeEventListener("abort", onAbort);
-      await killProcessTree(proc.pid);
-      if (proc.pid !== undefined) options?.onProcessExit?.({ pid: proc.pid });
-    }
-  }
-
-  async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
-    const meta = await this.metaStore.get(sessionId);
-    if (!meta) return { sessionId };
-    return meta.model
-      ? { sessionId, cwd: meta.cwd, model: meta.model }
-      : { sessionId, cwd: meta.cwd };
-  }
-
-  async closeSession(_sessionId: string): Promise<void> {
-    // 子进程由 prompt 的 finally 自动 kill
-  }
-}
-
-// ---------------------------------------------------------------------------
-// 工厂函数
-// ---------------------------------------------------------------------------
-
-export function createClaudeAdapter(
-  options: ClaudeAdapterOptions,
-): ToolAdapter {
-  return new ClaudeAdapter(options);
-}
+    }
+    return { type: msg.type, blocks };
+  }
+
+  if (msg.type === "system" && msg.subtype === "compact_boundary") {
+    const meta = msg.compact_metadata;
+    if (!meta) return null;
+    return {
+      type: "system",
+      blocks: [
+        {
+          type: "compact_boundary",
+          trigger: meta.trigger ?? "auto",
+          pre_tokens: meta.pre_tokens ?? 0,
+          post_tokens: meta.post_tokens,
+        },
+      ],
+    };
+  }
+
+  return null;
+}
+
+export function readClaudeSpecificInjectionPrompt(): string | null {
+  try {
+    if (!existsSync(CLAUDE_SPECIFIC_PROMPT_PATH)) return null;
+    const prompt = readFileSync(CLAUDE_SPECIFIC_PROMPT_PATH, "utf-8").trim();
+    return prompt.length > 0 ? prompt : null;
+  } catch {
+    return null;
+  }
+}
+
+export function buildClaudePromptText(
+  userText: string,
+  injectionPrompt: string | null = readClaudeSpecificInjectionPrompt(),
+): string {
+  const prompt = injectionPrompt?.trim();
+  if (!prompt) return userText;
+
+  return [
+    "[ChatCCC Claude-specific injection prompt]",
+    prompt,
+    "[/ChatCCC Claude-specific injection prompt]",
+    "",
+    userText,
+  ].join("\n");
+}
+
+function buildSdkOptions(args: {
+  cwd: string;
+  model: string;
+  effort: string;
+  isEmpty: (value: string) => boolean;
+  subagentModel?: string;
+  apiKey?: string;
+  baseUrl?: string;
+  maxTurn: number;
+  planMode?: boolean;
+  resume?: string;
+  abortController?: AbortController;
+}): ClaudeSdkOptions {
+  const {
+    cwd,
+    model,
+    effort,
+    isEmpty,
+    subagentModel,
+    apiKey,
+    baseUrl,
+    maxTurn,
+    planMode,
+    resume,
+    abortController,
+  } = args;
+
+  const options: ClaudeSdkOptions = {
+    cwd,
+    abortController,
+    settingSources: ["user", "project", "local"] as SettingSource[],
+    permissionMode: planMode ? "plan" : "bypassPermissions",
+    maxTurns: maxTurn,
+    maxBudgetUsd: 999999999,
+    skills: "all",
+    stderr: (data) => {
+      const trimmed = data.trim();
+      if (!trimmed) return;
+      const ts = new Date().toISOString();
+      console.log(`[${ts}] [CLAUDE-STDERR] ${trimmed.slice(0, 2000)}`);
+    },
+  };
+
+  if (!planMode) {
+    options.allowDangerouslySkipPermissions = true;
+  }
+  if (!isEmpty(model)) {
+    options.model = model;
+  }
+  if (!isEmpty(effort)) {
+    options.effort = effort as ClaudeSdkOptions["effort"];
+  }
+  if (resume) {
+    options.resume = resume;
+  }
+
+  const env = buildSdkEnv(subagentModel, apiKey, baseUrl);
+  if (env) {
+    options.env = env;
+  }
+
+  const mcpServers = readMcpServersConfig();
+  if (mcpServers) {
+    options.mcpServers = mcpServers as ClaudeSdkOptions["mcpServers"];
+  }
+
+  return options;
+}
+
+function toMessageLike(message: SDKMessage): SdkMessageLike {
+  return message as unknown as SdkMessageLike;
+}
+
+function bridgeAbortSignal(
+  signal: AbortSignal | undefined,
+  controller: AbortController,
+): (() => void) | undefined {
+  if (!signal) return undefined;
+  const onAbort = () => controller.abort();
+  if (signal.aborted) {
+    controller.abort();
+    return undefined;
+  }
+  signal.addEventListener("abort", onAbort, { once: true });
+  return () => signal.removeEventListener("abort", onAbort);
+}
+
+class ClaudeAdapter implements ToolAdapter {
+  readonly displayName = "Claude Code";
+  readonly sessionDescPrefix = "Claude Code Session:";
+  private model: string;
+  private effort: string;
+  private subagentModel: string | undefined;
+  private apiKey: string | undefined;
+  private baseUrl: string | undefined;
+  private isEmpty: (value: string) => boolean;
+  private metaStore: ClaudeSessionMetaStore;
+  private maxTurn: number;
+
+  constructor(options: ClaudeAdapterOptions) {
+    this.model = options.model;
+    this.effort = options.effort;
+    this.subagentModel = options.subagentModel;
+    this.apiKey = options.apiKey;
+    this.baseUrl = options.baseUrl;
+    this.isEmpty = options.isEmpty;
+    this.metaStore = options.metaStore ?? defaultClaudeSessionMetaStore;
+    this.maxTurn = options.maxTurn ?? 25;
+  }
+
+  async createSession(cwd: string): Promise<CreateSessionResult> {
+    logMcpConfig();
+    const abortController = new AbortController();
+    const stream = query({
+      prompt: "ok",
+      options: buildSdkOptions({
+        cwd,
+        model: this.model,
+        effort: this.effort,
+        isEmpty: this.isEmpty,
+        subagentModel: this.subagentModel,
+        apiKey: this.apiKey,
+        baseUrl: this.baseUrl,
+        maxTurn: this.maxTurn,
+        abortController,
+      }),
+    });
+
+    try {
+      for await (const raw of stream) {
+        const msg = toMessageLike(raw);
+        if (msg.session_id) {
+          const sessionId = msg.session_id;
+          await this.metaStore.set(sessionId, {
+            cwd: msg.cwd ?? cwd,
+            model: msg.model,
+          }).catch(() => {});
+          const ts = new Date().toISOString();
+          console.log(`[${ts}] [CLAUDE-SDK] createSession: ${sessionId}`);
+          return { sessionId };
+        }
+      }
+    } finally {
+      abortController.abort();
+      stream.close();
+    }
+
+    throw new Error("No session ID in Claude init event");
+  }
+
+  async *prompt(
+    sessionId: string,
+    userText: string,
+    cwd: string,
+    signal?: AbortSignal,
+    options?: ToolPromptOptions,
+  ): AsyncIterable<UnifiedStreamMessage> {
+    const abortController = new AbortController();
+    const removeAbortListener = bridgeAbortSignal(signal, abortController);
+    if (abortController.signal.aborted) return;
+
+    const stream = query({
+      prompt: buildClaudePromptText(userText),
+      options: buildSdkOptions({
+        cwd,
+        model: this.model,
+        effort: this.effort,
+        isEmpty: this.isEmpty,
+        subagentModel: this.subagentModel,
+        apiKey: this.apiKey,
+        baseUrl: this.baseUrl,
+        maxTurn: this.maxTurn,
+        planMode: options?.planMode,
+        resume: sessionId,
+        abortController,
+      }),
+    });
+
+    try {
+      for await (const raw of stream) {
+        if (abortController.signal.aborted) break;
+
+        const msg = toMessageLike(raw);
+        if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
+          const meta: { cwd?: string; model?: string } = {};
+          if (msg.cwd) meta.cwd = msg.cwd;
+          if (msg.model) meta.model = msg.model;
+          if (Object.keys(meta).length > 0) {
+            this.metaStore.set(msg.session_id, meta).catch(() => {});
+          }
+        }
+
+        const normalized = normalizeSdkMessage(msg);
+        if (normalized) yield normalized;
+
+        if (msg.type === "result") {
+          break;
+        }
+      }
+    } finally {
+      removeAbortListener?.();
+      abortController.abort();
+      stream.close();
+    }
+  }
+
+  async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
+    const meta = await this.metaStore.get(sessionId);
+
+    try {
+      const sdkInfo = await sdkGetSessionInfo(
+        sessionId,
+        meta?.cwd ? { dir: meta.cwd } : undefined,
+      );
+      if (sdkInfo) {
+        return {
+          sessionId: sdkInfo.sessionId,
+          cwd: sdkInfo.cwd ?? meta?.cwd,
+          summary: sdkInfo.summary,
+          lastModified: sdkInfo.lastModified,
+          model: meta?.model,
+        };
+      }
+    } catch {
+      // Fall back to the local meta store below.
+    }
+
+    if (!meta) return { sessionId };
+    return meta.model
+      ? { sessionId, cwd: meta.cwd, model: meta.model }
+      : { sessionId, cwd: meta.cwd };
+  }
+
+  async closeSession(_sessionId: string): Promise<void> {
+    // SDK query streams are request scoped and are closed in prompt/createSession.
+  }
+}
+
+export function createClaudeAdapter(
+  options: ClaudeAdapterOptions,
+): ToolAdapter {
+  return new ClaudeAdapter(options);
+}

package/src/adapters/claude-session-meta-store.ts

@@ -1,8 +1,8 @@
 // =============================================================================
 // claude-session-meta-store.ts — Claude 会话 sessionId → meta 持久化映射
 // =============================================================================
-// 背景：切换到直接调用 Claude CLI 后，不再有 SDK 的 getSessionInfo 可用。
-// ChatCCC 必须自己维护 sessionId → { cwd, model } 映射。
+// 背景：Claude Agent SDK 的 getSessionInfo 可能因 cwd / 本地记录缺失而查不到。
+// ChatCCC 额外维护 sessionId → { cwd, model } 映射作为展示与恢复兜底。
 //
 // 存储：
 //   文件 state/claude-session-meta.json，结构：
@@ -117,4 +117,4 @@ export function createClaudeSessionMetaStore(
   };
 }
 
-export const defaultClaudeSessionMetaStore = createClaudeSessionMetaStore();
+export const defaultClaudeSessionMetaStore = createClaudeSessionMetaStore();

package/src/config.ts

@@ -65,11 +65,11 @@ export interface ClaudeConfig {
   model: string;
   subagentModel: string;
   effort: string;
-  /** Anthropic API Key（选填，留空则使用 Claude CLI 默认认证） */
+  /** Anthropic API Key（选填，留空则使用 Claude Code 默认认证） */
   apiKey: string;
   /** Anthropic 兼容 API Base URL（选填，留空则使用默认端点） */
   baseUrl: string;
-  /** Claude CLI maxTurns 设置，默认 25 */
+  /** Claude Agent SDK maxTurns 设置，默认 25 */
   maxTurn: number;
 }
 

package/src/web-ui.ts

@@ -646,7 +646,7 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
             </div>
             <div class="form-group">
               <label>API Key（选填）</label>
-              <input type="password" id="field-CHATCCC_ANTHROPIC_API_KEY" placeholder="留空使用 Claude CLI 默认认证">
+              <input type="password" id="field-CHATCCC_ANTHROPIC_API_KEY" placeholder="留空使用 Claude Code 默认认证">
             </div>
             <div class="form-group">
               <label>Base URL（选填）</label>