chatccc 0.2.103 → 0.2.107

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

@@ -0,0 +1,120 @@
+// =============================================================================
+// claude-session-meta-store.ts — Claude 会话 sessionId → meta 持久化映射
+// =============================================================================
+// 背景：切换到直接调用 Claude CLI 后，不再有 SDK 的 getSessionInfo 可用。
+// ChatCCC 必须自己维护 sessionId → { cwd, model } 映射。
+//
+// 存储：
+//   文件 state/claude-session-meta.json，结构：
+//     { "<sessionId>": { "cwd": "...", "model": "..." } }
+//
+// API 设计：
+//   set(sid, partial) → 部分合并写入；只更新非空字段，不会清空其他字段
+// =============================================================================
+
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+
+import { USER_DATA_DIR } from "../config.ts";
+
+export const CLAUDE_SESSION_META_FILE = join(
+  USER_DATA_DIR,
+  "state",
+  "claude-session-meta.json",
+);
+
+export interface ClaudeSessionMeta {
+  cwd: string;
+  model?: string;
+}
+
+export interface ClaudeSessionMetaStore {
+  get(sessionId: string): Promise<ClaudeSessionMeta | undefined>;
+  set(sessionId: string, partial: Partial<ClaudeSessionMeta>): Promise<void>;
+}
+
+interface RawEntry {
+  cwd?: string;
+  model?: string;
+}
+
+function isNonEmptyString(v: unknown): v is string {
+  return typeof v === "string" && v.length > 0;
+}
+
+function parseEntry(raw: unknown): RawEntry | null {
+  if (typeof raw === "string" && raw.length > 0) {
+    return { cwd: raw };
+  }
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    const obj = raw as Record<string, unknown>;
+    const out: RawEntry = {};
+    if (isNonEmptyString(obj.cwd)) out.cwd = obj.cwd;
+    if (isNonEmptyString(obj.model)) out.model = obj.model;
+    return out;
+  }
+  return null;
+}
+
+export function createClaudeSessionMetaStore(
+  filePath: string = CLAUDE_SESSION_META_FILE,
+): ClaudeSessionMetaStore {
+  let cache: Record<string, RawEntry> | null = null;
+
+  async function load(): Promise<Record<string, RawEntry>> {
+    if (cache) return cache;
+    try {
+      const raw = await readFile(filePath, "utf-8");
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        const out: Record<string, RawEntry> = {};
+        for (const [k, v] of Object.entries(parsed as Record<string, unknown>)) {
+          const entry = parseEntry(v);
+          if (entry) out[k] = entry;
+        }
+        cache = out;
+        return out;
+      }
+    } catch {
+      // 文件不存在 / JSON 损坏 → 视为空映射
+    }
+    cache = {};
+    return cache;
+  }
+
+  return {
+    async get(sessionId: string): Promise<ClaudeSessionMeta | undefined> {
+      const map = await load();
+      const entry = map[sessionId];
+      if (!entry || !isNonEmptyString(entry.cwd)) return undefined;
+      return entry.model
+        ? { cwd: entry.cwd, model: entry.model }
+        : { cwd: entry.cwd };
+    },
+
+    async set(
+      sessionId: string,
+      partial: Partial<ClaudeSessionMeta>,
+    ): Promise<void> {
+      const map = await load();
+      const existing = map[sessionId] ?? {};
+      const merged: RawEntry = { ...existing };
+      if (isNonEmptyString(partial.cwd)) merged.cwd = partial.cwd;
+      if (isNonEmptyString(partial.model)) merged.model = partial.model;
+
+      if (existing.cwd === merged.cwd && existing.model === merged.model) return;
+
+      map[sessionId] = merged;
+      try {
+        await mkdir(dirname(filePath), { recursive: true });
+        await writeFile(filePath, JSON.stringify(map, null, 2), "utf-8");
+      } catch (err) {
+        console.error(
+          `[claude-session-meta] failed to persist ${filePath}: ${(err as Error).message}`,
+        );
+      }
+    },
+  };
+}
+
+export const defaultClaudeSessionMetaStore = createClaudeSessionMetaStore();

package/src/cards.ts

@@ -131,7 +131,6 @@ export function buildHelpCard(
     "发送 **/new cursor** 创建新 Cursor 会话",
     "发送 **/new codex** 创建新 Codex 会话",
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
-    "发送 **/claude** 查看或切换 Claude API 模式（官方/第三方）",
   ].join("\n");
   return JSON.stringify({
     config: { wide_screen_mode: true },
@@ -463,33 +462,3 @@ export function buildModelCard(
   });
 }
 
-/** Claude API 模式切换卡片（/claude 命令） */
-export function buildClaudeCard(
-  currentMode: "official" | "thirdparty",
-  missingFields: string[],
-): string {
-  const modeLabel = currentMode === "thirdparty" ? "第三方 API（自定义网关）" : "官方 API（Anthropic 直连）";
-  const modeDesc = currentMode === "thirdparty"
-    ? "使用第三方兼容网关，需配置 API Key 和 Base URL。"
-    : "直连 Anthropic 官方 API，使用系统环境变量中的 ANTHROPIC_API_KEY。";
-  const lines = [`**当前模式:** ${modeLabel}`, "", modeDesc];
-
-  if (missingFields.length > 0) {
-    lines.push("", `**切换失败:** 以下必填项未配置: ${missingFields.map(f => `\`${f}\``).join(", ")}`);
-  }
-
-  const buttons: ButtonDef[] = [
-    { text: "/claude official", value: JSON.stringify({ cmd: "/claude official" }), type: currentMode === "official" ? "default" : "primary" },
-    { text: "/claude 3rd", value: JSON.stringify({ cmd: "/claude 3rd" }), type: currentMode === "thirdparty" ? "default" : "primary" },
-  ];
-
-  return JSON.stringify({
-    config: { wide_screen_mode: true },
-    header: { template: "blue", title: { content: "Claude API 模式", tag: "plain_text" } },
-    elements: [
-      { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
-      { tag: "hr" },
-      buildButtons(buttons),
-    ],
-  });
-}

package/src/config.ts

@@ -65,10 +65,10 @@ export interface ClaudeConfig {
   model: string;
   subagentModel: string;
   effort: string;
+  /** Anthropic API Key（选填，留空则使用 Claude CLI 默认认证） */
   apiKey: string;
+  /** Anthropic 兼容 API Base URL（选填，留空则使用默认端点） */
   baseUrl: string;
-  /** 是否使用第三方 API（非 Anthropic 官方）；为 true 时 baseUrl 必须配置 */
-  useThirdPartyApi: boolean;
 }
 
 export interface CursorConfig {
@@ -324,7 +324,7 @@ function loadConfig(): AppConfig {
     port: 18080,
     gitTimeoutSeconds: 180,
     allowInterrupt: false,
-    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "", useThirdPartyApi: false },
+    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "" },
     cursor: { enabled: false, defaultAgent: false, path: "", model: "claude-opus-4-7-max" },
     codex: { enabled: false, defaultAgent: false, path: "", model: "", effort: "" },
   };
@@ -466,9 +466,8 @@ function loadConfig(): AppConfig {
       model: normalizeOptionalConfigField(claude.model, { label: "claude.model" }),
       subagentModel: normalizeOptionalConfigField(claude.subagentModel, { label: "claude.subagentModel" }),
       effort: normalizeOptionalConfigField(claude.effort, { label: "claude.effort" }),
-      apiKey: claude.apiKey ?? "",
-      baseUrl: claude.baseUrl ?? "",
-      useThirdPartyApi: typeof claude.useThirdPartyApi === "boolean" ? claude.useThirdPartyApi : false,
+      apiKey: normalizeOptionalConfigField(claude.apiKey, { label: "claude.apiKey" }),
+      baseUrl: normalizeOptionalConfigField(claude.baseUrl, { label: "claude.baseUrl" }),
     },
     cursor: {
       enabled: cursorEnabled,
@@ -496,12 +495,6 @@ function loadConfig(): AppConfig {
  */
 export const config: AppConfig = loadConfig();
 
-// 注：历史上这里曾把 config.claude.apiKey / baseUrl 写入 process.env 以便
-// @anthropic-ai/claude-agent-sdk 子进程读取，但这会污染主进程的环境变量。
-// 现在改为：在 ClaudeAdapter 构造时把这两个值传进去，由 adapter 在调用 SDK
-// 时通过 SDK 的 `Options.env` 字段（仅作用于子进程）传递，主进程 env 保持
-// 干净。详见 src/adapters/claude-adapter.ts buildSdkEnv()。
-
 // ---------------------------------------------------------------------------
 // Re-exported config values
 // ---------------------------------------------------------------------------
@@ -528,12 +521,8 @@ export const LOCAL_RELAY_URL = `ws://127.0.0.1:${CHATCCC_PORT}`;
 export let CLAUDE_MODEL = config.claude.model;
 export let CLAUDE_SUBAGENT_MODEL = config.claude.subagentModel;
 export let CLAUDE_EFFORT = config.claude.effort;
-/** Anthropic 兼容网关的 API key（仅经 SDK 子进程 env 传递，从不写入主进程 process.env） */
 export let CLAUDE_API_KEY = config.claude.apiKey;
-/** Anthropic 兼容网关的 base URL（仅经 SDK 子进程 env 传递，从不写入主进程 process.env） */
 export let CLAUDE_BASE_URL = config.claude.baseUrl;
-/** 是否使用第三方 API（非 Anthropic 官方） */
-export let CLAUDE_USE_THIRD_PARTY_API = config.claude.useThirdPartyApi;
 
 /** 返回当前生效的 Claude 模型（per-session 覆盖由 session.ts 管理，此处仅返回全局配置） */
 export function getEffectiveClaudeModel(): string {
@@ -613,7 +602,6 @@ export function applyLoadedConfig(next: AppConfig): void {
   CLAUDE_EFFORT = next.claude.effort;
   CLAUDE_API_KEY = next.claude.apiKey;
   CLAUDE_BASE_URL = next.claude.baseUrl;
-  CLAUDE_USE_THIRD_PARTY_API = next.claude.useThirdPartyApi;
   GIT_TIMEOUT_SECONDS = next.gitTimeoutSeconds;
   GIT_TIMEOUT_MS = GIT_TIMEOUT_SECONDS * 1000;
   ALLOW_INTERRUPT = next.allowInterrupt;

package/src/orchestrator.ts

@@ -16,9 +16,6 @@ import {
   CLAUDE_EFFORT,
   CLAUDE_MODEL,
   CLAUDE_SUBAGENT_MODEL,
-  CLAUDE_API_KEY,
-  CLAUDE_BASE_URL,
-  CLAUDE_USE_THIRD_PARTY_API,
   CONFIG_FILE,
   GIT_TIMEOUT_MS,
   PROJECT_ROOT,
@@ -46,7 +43,6 @@ import {
   buildSessionsCard,
   buildQueuedCard,
   buildQueueFullCard,
-  buildClaudeCard,
 } from "./cards.ts";
 import {
   formatGitResult,
@@ -390,7 +386,6 @@ export async function handleCommand(
           `**工作目录:** \`${cwd}\`\n\n` +
           `直接在这里发消息即可与 ${toolLabel} 对话。\n\n` +
           `发送 **/cd** 切换新建会话的默认目录。\n` +
-          `发送 **/claude** 查看或切换 Claude API 模式（官方/第三方）。\n` +
           `发送 **/model** 查看或切换当前会话的模型。\n` +
           `发送 **/new** 创建新会话，**/newh** 重置当前会话（沿用工作目录）。\n` +
           `发送 **/sessions** 查看所有会话状态。\n` +
@@ -1086,72 +1081,6 @@ export async function handleCommand(
       return;
     }
 
-    // /claude — 查看/切换 Claude API 模式（官方 vs 第三方）
-    if (textLower === "/claude" || textLower === "/claude official" || textLower === "/claude 3rd") {
-      logTrace(tid, "BRANCH", { cmd: "/claude", arg: text.slice(8).trim() || "(none)" });
-
-      if (textLower === "/claude official") {
-        // 切换到官方模式：设置 useThirdPartyApi=false，清空 apiKey 和 baseUrl
-        try {
-          const raw = readFileSync(CONFIG_FILE, "utf-8");
-          const cfg = JSON.parse(raw);
-          cfg.claude = cfg.claude || {};
-          cfg.claude.useThirdPartyApi = false;
-          cfg.claude.apiKey = "";
-          cfg.claude.baseUrl = "";
-          writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
-          reloadConfigFromDisk();
-          logTrace(tid, "DONE", { outcome: "claude_official" });
-          const card = buildClaudeCard("official", []);
-          await platform.sendRawCard(chatId, card);
-        } catch (err) {
-          logTrace(tid, "DONE", { outcome: "claude_official_fail", error: (err as Error).message });
-          await platform.sendText(chatId, `切换失败: ${(err as Error).message}`).catch(() => {});
-        }
-        return;
-      }
-
-      if (textLower === "/claude 3rd") {
-        // 切换到第三方模式：检查 apiKey 和 baseUrl 是否已配置
-        const missing: string[] = [];
-        if (!CLAUDE_API_KEY.trim()) missing.push("API Key");
-        if (!CLAUDE_BASE_URL.trim()) missing.push("Base URL");
-
-        if (missing.length > 0) {
-          logTrace(tid, "DONE", { outcome: "claude_3rd_missing", missing });
-          const card = buildClaudeCard(
-            CLAUDE_USE_THIRD_PARTY_API ? "thirdparty" : "official",
-            missing,
-          );
-          await platform.sendRawCard(chatId, card);
-          return;
-        }
-
-        try {
-          const raw = readFileSync(CONFIG_FILE, "utf-8");
-          const cfg = JSON.parse(raw);
-          cfg.claude = cfg.claude || {};
-          cfg.claude.useThirdPartyApi = true;
-          writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
-          reloadConfigFromDisk();
-          logTrace(tid, "DONE", { outcome: "claude_3rd" });
-          const card = buildClaudeCard("thirdparty", []);
-          await platform.sendRawCard(chatId, card);
-        } catch (err) {
-          logTrace(tid, "DONE", { outcome: "claude_3rd_fail", error: (err as Error).message });
-          await platform.sendText(chatId, `切换失败: ${(err as Error).message}`).catch(() => {});
-        }
-        return;
-      }
-
-      // /claude — 显示当前模式和切换按钮
-      const currentMode: "official" | "thirdparty" = CLAUDE_USE_THIRD_PARTY_API ? "thirdparty" : "official";
-      const card = buildClaudeCard(currentMode, []);
-      await platform.sendRawCard(chatId, card);
-      logTrace(tid, "DONE", { outcome: "claude_query", mode: currentMode });
-      return;
-    }
-
     // /git <args>：在「当前会话工作目录」执行 git 命令
     if (textLower.startsWith("/git ") || textLower === "/git") {
       const args = text === "/git" ? "" : text.slice(5).trim();
@@ -1283,69 +1212,6 @@ export async function handleCommand(
     return;
   }
 
-  // 无会话上下文 → 检查是否是 /claude 查询
-  if (textLower === "/claude" || textLower === "/claude official" || textLower === "/claude 3rd") {
-    logTrace(tid, "BRANCH", { cmd: "/claude", arg: text.slice(8).trim() || "(none)", noSession: true });
-
-    if (textLower === "/claude official") {
-      try {
-        const raw = readFileSync(CONFIG_FILE, "utf-8");
-        const cfg = JSON.parse(raw);
-        cfg.claude = cfg.claude || {};
-        cfg.claude.useThirdPartyApi = false;
-        cfg.claude.apiKey = "";
-        cfg.claude.baseUrl = "";
-        writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
-        reloadConfigFromDisk();
-        logTrace(tid, "DONE", { outcome: "claude_official" });
-        const card = buildClaudeCard("official", []);
-        await platform.sendRawCard(chatId, card);
-      } catch (err) {
-        logTrace(tid, "DONE", { outcome: "claude_official_fail", error: (err as Error).message });
-        await platform.sendText(chatId, `切换失败: ${(err as Error).message}`).catch(() => {});
-      }
-      return;
-    }
-
-    if (textLower === "/claude 3rd") {
-      const missing: string[] = [];
-      if (!CLAUDE_API_KEY.trim()) missing.push("API Key");
-      if (!CLAUDE_BASE_URL.trim()) missing.push("Base URL");
-
-      if (missing.length > 0) {
-        logTrace(tid, "DONE", { outcome: "claude_3rd_missing", missing });
-        const card = buildClaudeCard(
-          CLAUDE_USE_THIRD_PARTY_API ? "thirdparty" : "official",
-          missing,
-        );
-        await platform.sendRawCard(chatId, card);
-        return;
-      }
-
-      try {
-        const raw = readFileSync(CONFIG_FILE, "utf-8");
-        const cfg = JSON.parse(raw);
-        cfg.claude = cfg.claude || {};
-        cfg.claude.useThirdPartyApi = true;
-        writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
-        reloadConfigFromDisk();
-        logTrace(tid, "DONE", { outcome: "claude_3rd" });
-        const card = buildClaudeCard("thirdparty", []);
-        await platform.sendRawCard(chatId, card);
-      } catch (err) {
-        logTrace(tid, "DONE", { outcome: "claude_3rd_fail", error: (err as Error).message });
-        await platform.sendText(chatId, `切换失败: ${(err as Error).message}`).catch(() => {});
-      }
-      return;
-    }
-
-    const currentMode: "official" | "thirdparty" = CLAUDE_USE_THIRD_PARTY_API ? "thirdparty" : "official";
-    const card = buildClaudeCard(currentMode, []);
-    await platform.sendRawCard(chatId, card);
-    logTrace(tid, "DONE", { outcome: "claude_query", mode: currentMode });
-    return;
-  }
-
   // 无会话上下文 → 检查是否是 /model 查询
   if (textLower === "/model") {
     const defaultTool = resolveDefaultAgentTool();

package/src/session.ts

@@ -363,9 +363,9 @@ export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter
       model: effectiveModel,
       subagentModel: CLAUDE_SUBAGENT_MODEL,
       effort: CLAUDE_EFFORT,
-      isEmpty: isAnthropicConfigEmpty,
       apiKey: CLAUDE_API_KEY,
       baseUrl: CLAUDE_BASE_URL,
+      isEmpty: isAnthropicConfigEmpty,
     });
   }
   adapterCache.set(cacheKey, adapter);