chatccc 0.2.94 → 0.2.96

package/src/builtin/index.ts

@@ -1,167 +1,167 @@
-/**
- * builtin/index.ts — ChatCCC 内置 Agent 核心 API
- *
- * ChatSession 是程序化入口，既可以被 CLI 调用，也可以被其他模块（如 ToolAdapter）调用。
- */
-
-import { streamText } from "ai";
-
-// ---------------------------------------------------------------------------
-// 系统提示词 — 编译期冻结常量
-// ---------------------------------------------------------------------------
-
-const SYSTEM_PROMPT = [
-  "你是 ChatCCC 内置 AI 编程助手，运行在终端环境中。",
-  "",
-  "## 基本规则",
-  "- 用中文回复，但代码、命令、文件名保持原文",
-  "- 优先给出直接可用的方案，而非长篇解释",
-  "- 如果用户的问题涉及代码，直接给出代码并说明用法",
-  "- 保持简洁，一次聚焦一个问题",
-].join("\n");
-
-// ---------------------------------------------------------------------------
-// 类型定义
-// ---------------------------------------------------------------------------
-
-export interface ChatSessionConfig {
-  /** DeepSeek API 兼容的服务地址，默认 https://api.deepseek.com/v1 */
-  baseURL?: string;
-  /** API Key（优先用 DEEPSEEK_API_KEY 环境变量） */
-  apiKey?: string;
-  /** 模型名称，默认 deepseek-chat */
-  model?: string;
-}
-
-export interface ChatSessionOptions {
-  /** 会话工作目录 */
-  cwd?: string;
-  /** 自定义系统提示词（会拼接到默认提示词之后） */
-  systemPrompt?: string;
-}
-
-/**
- * 流式响应事件
- */
-export type ChatEvent =
-  | { type: "text"; text: string; accumulated: string }
-  | { type: "done"; text: string }
-  | { type: "error"; message: string };
-
-// ---------------------------------------------------------------------------
-// ChatSession
-// ---------------------------------------------------------------------------
-
-/** 消息角色 */
-type MessageRole = "system" | "user" | "assistant" | "tool";
-
-/** 内部消息类型 */
-interface ChatMessage {
-  role: MessageRole;
-  content: string;
-}
-
-export class ChatSession {
-  private model: any;
-  private messages: ChatMessage[];
-
-  constructor(
-    config: ChatSessionConfig = {},
-    options: ChatSessionOptions = {},
-  ) {
-    const apiKey = config.apiKey ?? process.env.DEEPSEEK_API_KEY;
-    if (!apiKey) {
-      throw new Error(
-        "DEEPSEEK_API_KEY 未设置。请设置环境变量 DEEPSEEK_API_KEY 或传入 apiKey",
-      );
-    }
-
-    const baseURL = config.baseURL ?? "https://api.deepseek.com/v1";
-    const modelId = config.model ?? "deepseek-chat";
-
-    // 动态 import 以支持 ESM 包在 CJS 环境下的加载（tsx 处理）
-    const { createOpenAICompatible } = require("@ai-sdk/openai-compatible");
-    const provider = createOpenAICompatible({
-      name: "deepseek",
-      baseURL,
-      apiKey,
-    });
-    this.model = provider(modelId);
-
-    // 构建系统提示词
-    const systemContent = [SYSTEM_PROMPT];
-    if (options?.systemPrompt) {
-      systemContent.push("", options.systemPrompt);
-    }
-    if (options?.cwd) {
-      systemContent.push("", `当前工作目录: ${options.cwd}`);
-    }
-
-    this.messages = [{ role: "system", content: systemContent.join("\n") }];
-  }
-
-  /**
-   * 发送用户消息，返回异步可迭代的文本流。
-   *
-   * 使用方式：
-   * ```typescript
-   * const session = new ChatSession();
-   * for await (const event of session.chat("帮我看看 package.json")) {
-   *   if (event.type === "text") process.stdout.write(event.text);
-   * }
-   * console.log("完成");
-   * ```
-   */
-  async *chat(
-    userMessage: string,
-    signal?: AbortSignal,
-  ): AsyncIterable<ChatEvent> {
-    this.messages.push({ role: "user", content: userMessage });
-
-    let fullText = "";
-
-    try {
-      const result = streamText({
-        model: this.model,
-        messages: this.messages as any,
-        abortSignal: signal,
-      });
-
-      for await (const chunk of result.textStream) {
-        fullText += chunk;
-        yield { type: "text", text: chunk, accumulated: fullText };
-      }
-
-      this.messages.push({ role: "assistant", content: fullText });
-      yield { type: "done", text: fullText };
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      if ((err as Error).name === "AbortError" || signal?.aborted) {
-        // 被中断时，不保存不完整的助手消息
-        if (fullText) {
-          this.messages.push({ role: "assistant", content: fullText + "\n[已中断]" });
-        }
-        yield { type: "done", text: fullText };
-        return;
-      }
-      yield { type: "error", message };
-      throw err;
-    }
-  }
-
-  /** 返回当前的会话历史（只读） */
-  get history(): ReadonlyArray<ChatMessage> {
-    return this.messages;
-  }
-
-  /** 返回当前轮数（不含 system 消息） */
-  get turnCount(): number {
-    return this.messages.length - 1;
-  }
-
-  /** 清空会话历史，保留 system 消息 */
-  reset(): void {
-    const system = this.messages[0];
-    this.messages = [system];
-  }
+/**
+ * builtin/index.ts — ChatCCC 内置 Agent 核心 API
+ *
+ * ChatSession 是程序化入口，既可以被 CLI 调用，也可以被其他模块（如 ToolAdapter）调用。
+ */
+
+import { streamText } from "ai";
+
+// ---------------------------------------------------------------------------
+// 系统提示词 — 编译期冻结常量
+// ---------------------------------------------------------------------------
+
+const SYSTEM_PROMPT = [
+  "你是 ChatCCC 内置 AI 编程助手，运行在终端环境中。",
+  "",
+  "## 基本规则",
+  "- 用中文回复，但代码、命令、文件名保持原文",
+  "- 优先给出直接可用的方案，而非长篇解释",
+  "- 如果用户的问题涉及代码，直接给出代码并说明用法",
+  "- 保持简洁，一次聚焦一个问题",
+].join("\n");
+
+// ---------------------------------------------------------------------------
+// 类型定义
+// ---------------------------------------------------------------------------
+
+export interface ChatSessionConfig {
+  /** DeepSeek API 兼容的服务地址，默认 https://api.deepseek.com/v1 */
+  baseURL?: string;
+  /** API Key（优先用 DEEPSEEK_API_KEY 环境变量） */
+  apiKey?: string;
+  /** 模型名称，默认 deepseek-chat */
+  model?: string;
+}
+
+export interface ChatSessionOptions {
+  /** 会话工作目录 */
+  cwd?: string;
+  /** 自定义系统提示词（会拼接到默认提示词之后） */
+  systemPrompt?: string;
+}
+
+/**
+ * 流式响应事件
+ */
+export type ChatEvent =
+  | { type: "text"; text: string; accumulated: string }
+  | { type: "done"; text: string }
+  | { type: "error"; message: string };
+
+// ---------------------------------------------------------------------------
+// ChatSession
+// ---------------------------------------------------------------------------
+
+/** 消息角色 */
+type MessageRole = "system" | "user" | "assistant" | "tool";
+
+/** 内部消息类型 */
+interface ChatMessage {
+  role: MessageRole;
+  content: string;
+}
+
+export class ChatSession {
+  private model: any;
+  private messages: ChatMessage[];
+
+  constructor(
+    config: ChatSessionConfig = {},
+    options: ChatSessionOptions = {},
+  ) {
+    const apiKey = config.apiKey ?? process.env.DEEPSEEK_API_KEY;
+    if (!apiKey) {
+      throw new Error(
+        "DEEPSEEK_API_KEY 未设置。请设置环境变量 DEEPSEEK_API_KEY 或传入 apiKey",
+      );
+    }
+
+    const baseURL = config.baseURL ?? "https://api.deepseek.com/v1";
+    const modelId = config.model ?? "deepseek-chat";
+
+    // 动态 import 以支持 ESM 包在 CJS 环境下的加载（tsx 处理）
+    const { createOpenAICompatible } = require("@ai-sdk/openai-compatible");
+    const provider = createOpenAICompatible({
+      name: "deepseek",
+      baseURL,
+      apiKey,
+    });
+    this.model = provider(modelId);
+
+    // 构建系统提示词
+    const systemContent = [SYSTEM_PROMPT];
+    if (options?.systemPrompt) {
+      systemContent.push("", options.systemPrompt);
+    }
+    if (options?.cwd) {
+      systemContent.push("", `当前工作目录: ${options.cwd}`);
+    }
+
+    this.messages = [{ role: "system", content: systemContent.join("\n") }];
+  }
+
+  /**
+   * 发送用户消息，返回异步可迭代的文本流。
+   *
+   * 使用方式：
+   * ```typescript
+   * const session = new ChatSession();
+   * for await (const event of session.chat("帮我看看 package.json")) {
+   *   if (event.type === "text") process.stdout.write(event.text);
+   * }
+   * console.log("完成");
+   * ```
+   */
+  async *chat(
+    userMessage: string,
+    signal?: AbortSignal,
+  ): AsyncIterable<ChatEvent> {
+    this.messages.push({ role: "user", content: userMessage });
+
+    let fullText = "";
+
+    try {
+      const result = streamText({
+        model: this.model,
+        messages: this.messages as any,
+        abortSignal: signal,
+      });
+
+      for await (const chunk of result.textStream) {
+        fullText += chunk;
+        yield { type: "text", text: chunk, accumulated: fullText };
+      }
+
+      this.messages.push({ role: "assistant", content: fullText });
+      yield { type: "done", text: fullText };
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      if ((err as Error).name === "AbortError" || signal?.aborted) {
+        // 被中断时，不保存不完整的助手消息
+        if (fullText) {
+          this.messages.push({ role: "assistant", content: fullText + "\n[已中断]" });
+        }
+        yield { type: "done", text: fullText };
+        return;
+      }
+      yield { type: "error", message };
+      throw err;
+    }
+  }
+
+  /** 返回当前的会话历史（只读） */
+  get history(): ReadonlyArray<ChatMessage> {
+    return this.messages;
+  }
+
+  /** 返回当前轮数（不含 system 消息） */
+  get turnCount(): number {
+    return this.messages.length - 1;
+  }
+
+  /** 清空会话历史，保留 system 消息 */
+  reset(): void {
+    const system = this.messages[0];
+    this.messages = [system];
+  }
 }

package/src/cards.ts

@@ -407,3 +407,63 @@ export function buildStatusCard(statusText: string, template = "blue"): string {
     ],
   });
 }
+
+export interface ModelSwitchOption {
+  label: string;
+  model: string;
+}
+
+/** 模型切换卡片（/model 命令，飞书专用，含切换按钮） */
+export function buildModelCard(
+  currentModel: string,
+  available: ModelSwitchOption[],
+): string {
+  const currentLine = currentModel
+    ? `**当前模型:** \`${currentModel}\``
+    : "**当前模型:** 未指定";
+  const hasPro = available.some(o => o.label === "pro");
+  const hasFlash = available.some(o => o.label === "flash");
+
+  const lines: string[] = [currentLine];
+  if (available.length > 0) {
+    lines.push("", "**可切换模型:**");
+    for (const opt of available) {
+      lines.push(`- ${opt.label}: \`${opt.model}\``);
+    }
+  } else {
+    lines.push("", "没有可切换的模型。");
+  }
+
+  const buttons: { text: string; value: string; type?: "primary" | "default" | "danger" }[] = [];
+  if (hasPro) {
+    buttons.push({
+      text: "/model pro",
+      value: JSON.stringify({ action: "model_pro" }),
+      type: "primary",
+    });
+  }
+  if (hasFlash) {
+    buttons.push({
+      text: "/model flash",
+      value: JSON.stringify({ action: "model_flash" }),
+      type: "primary",
+    });
+  }
+  if (!hasPro && !hasFlash) {
+    buttons.push({
+      text: "/model clear",
+      value: JSON.stringify({ action: "model_clear" }),
+      type: "default",
+    });
+  }
+
+  return JSON.stringify({
+    config: { wide_screen_mode: true },
+    header: { template: "blue", title: { content: "模型切换", tag: "plain_text" } },
+    elements: [
+      { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
+      { tag: "hr" },
+      buildButtons(buttons),
+    ],
+  });
+}

package/src/config.ts

@@ -511,6 +511,11 @@ export let CLAUDE_API_KEY = config.claude.apiKey;
 /** Anthropic 兼容网关的 base URL（仅经 SDK 子进程 env 传递，从不写入主进程 process.env） */
 export let CLAUDE_BASE_URL = config.claude.baseUrl;
 
+/** 返回当前生效的 Claude 模型（per-session 覆盖由 session.ts 管理，此处仅返回全局配置） */
+export function getEffectiveClaudeModel(): string {
+  return CLAUDE_MODEL;
+}
+
 // ---------------------------------------------------------------------------
 // /git 超时配置（实际值来自 config.json，纯函数与常量见 ./config-utils.ts）
 // ---------------------------------------------------------------------------

package/src/index.ts

@@ -285,7 +285,7 @@ function parseCardAction(data: unknown): CardActionResult | null {
   }
   if (!cmd) return null;
 
-  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", status: "/status", cd: "/cd", sessions: "/sessions", newh: "/newh" };
+  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", status: "/status", cd: "/cd", sessions: "/sessions", newh: "/newh", model_pro: "/model pro", model_flash: "/model flash", model_clear: "/model clear" };
   let text = CMD_MAP[cmd] ?? "";
   if (cmd === "cd" && typeof action.value === "object" && action.value !== null) {
     const path = (action.value as Record<string, string>).path;

package/src/orchestrator.ts

@@ -13,6 +13,7 @@ import { makeTraceId, logTrace } from "./trace.ts";
 import {
   CLAUDE_EFFORT,
   CLAUDE_MODEL,
+  CLAUDE_SUBAGENT_MODEL,
   GIT_TIMEOUT_MS,
   PROJECT_ROOT,
   anthropicConfigDisplay,
@@ -28,6 +29,7 @@ import {
 } from "./config.ts";
 import {
   buildHelpCard,
+  buildModelCard,
   buildStatusCard,
   buildCdContent,
   buildCdCard,
@@ -41,12 +43,14 @@ import {
   runGitCommand,
 } from "./git-command.ts";
 import {
+  clearSessionModelOverride,
   getSessionStatus,
   getAllSessionsStatus,
   initClaudeSession,
   lastMsgTimestamps,
   resumeAndPrompt,
   sessionInfoMap,
+  setSessionModelOverride,
   switchChatBinding,
   recordSessionRegistry,
   getAdapterForTool,
@@ -141,7 +145,7 @@ export async function handleCommand(
         chatInfo.description,
       );
       if (sessionInfoResult) {
-        const adapter = getAdapterForTool(sessionInfoResult.tool);
+        const adapter = getAdapterForTool(sessionInfoResult.tool, sessionInfoResult.sessionId);
         const info = await adapter.getSessionInfo(sessionInfoResult.sessionId);
         sessionCwd = info?.cwd;
       }
@@ -243,6 +247,54 @@ export async function handleCommand(
     return;
   }
 
+  if (textLower === "/model") {
+    logTrace(tid, "BRANCH", { cmd: "/model" });
+
+    const isDeepSeek = CLAUDE_MODEL.toLowerCase().includes("deepseek")
+      || CLAUDE_SUBAGENT_MODEL.toLowerCase().includes("deepseek");
+    if (!isDeepSeek) {
+      const msg = "当前配置不支持模型切换（模型名中未找到 DeepSeek 相关内容）。";
+      await (platform.kind === "wechat"
+        ? platform.sendText(chatId, msg)
+        : platform.sendCard(chatId, "模型切换", msg, "red")
+      ).catch(() => {});
+      logTrace(tid, "DONE", { outcome: "model_unsupported" });
+      return;
+    }
+
+    const findModel = (keyword: string): string | null => {
+      for (const name of [CLAUDE_MODEL.trim(), CLAUDE_SUBAGENT_MODEL.trim()]) {
+        if (!name) continue;
+        const nl = name.toLowerCase();
+        if (nl.includes("deepseek") && nl.includes(keyword)) return name;
+      }
+      return null;
+    };
+
+    const available: { label: string; model: string }[] = [];
+    const pm = findModel("pro");
+    if (pm) available.push({ label: "pro", model: pm });
+    const fm = findModel("flash");
+    if (fm) available.push({ label: "flash", model: fm });
+
+    if (platform.kind === "wechat") {
+      const lines = [CLAUDE_MODEL ? `当前模型: ${CLAUDE_MODEL}` : "当前模型: 未指定"];
+      if (available.length > 0) {
+        lines.push("", "可切换模型:");
+        for (const o of available) lines.push(`  ${o.label}: ${o.model}`);
+        lines.push("", "输入 /model pro 或 /model flash 切换模型");
+      } else {
+        lines.push("", "没有可切换的模型。请在 config.json 的 claude.model 或 claude.subagentModel 中配置含 pro/flash 与 deepseek 关键字的模型名。");
+      }
+      await platform.sendText(chatId, lines.join("\n")).catch(() => {});
+    } else {
+      const card = buildModelCard(CLAUDE_MODEL, available);
+      await platform.sendRawCard(chatId, card);
+    }
+    logTrace(tid, "DONE", { outcome: "model_query" });
+    return;
+  }
+
   if (textLower === "/new" || textLower.startsWith("/new ")) {
     const toolArg = text.slice(5).trim().toLowerCase();
     const tool = toolArg || resolveDefaultAgentTool();
@@ -510,7 +562,7 @@ export async function handleCommand(
     ) {
       const MAX_PREFIX = 10;
       const prefix = text.slice(0, MAX_PREFIX);
-      const adapter = getAdapterForTool(descriptionTool);
+      const adapter = getAdapterForTool(descriptionTool, sessionId);
       const info = await adapter
         .getSessionInfo(sessionId)
         .catch(() => undefined);
@@ -553,7 +605,7 @@ export async function handleCommand(
         ) {
           const MAX_PREFIX = 10;
           const prefix = text.slice(0, MAX_PREFIX);
-          const adapter = getAdapterForTool(descriptionTool!);
+          const adapter = getAdapterForTool(descriptionTool!, sessionId);
           const info = await adapter
             .getSessionInfo(sessionId)
             .catch(() => undefined);
@@ -674,7 +726,7 @@ export async function handleCommand(
 
     if (textLower === "/newh") {
       logTrace(tid, "BRANCH", { cmd: "/newh" });
-      const adapter = getAdapterForTool(descriptionTool);
+      const adapter = getAdapterForTool(descriptionTool, sessionId);
       let cwd: string;
       try {
         const info = await adapter.getSessionInfo(sessionId);
@@ -849,7 +901,7 @@ export async function handleCommand(
         return;
       }
 
-      const targetAdapter = getAdapterForTool(target.tool);
+      const targetAdapter = getAdapterForTool(target.tool, target.sessionId);
       let cwd2: string;
       try {
         const targetInfo = await targetAdapter.getSessionInfo(
@@ -920,6 +972,64 @@ export async function handleCommand(
       return;
     }
 
+    // /model pro、/model flash、/model clear（仅对当前 session 生效）
+    if (textLower === "/model pro" || textLower === "/model flash" || textLower === "/model clear") {
+      const modelArg = textLower === "/model clear" ? "clear" : textLower.slice(7).trim();
+      logTrace(tid, "BRANCH", { cmd: "/model", arg: modelArg, sessionId });
+
+      // 仅 Claude Code 支持模型切换
+      if (descriptionTool !== "claude") {
+        const msg = "模型切换仅支持 Claude Code 会话。";
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "模型切换", msg, "red")
+        ).catch(() => {});
+        logTrace(tid, "DONE", { outcome: "model_wrong_tool", tool: descriptionTool });
+        return;
+      }
+
+      const findModel = (keyword: string): string | null => {
+        for (const name of [CLAUDE_MODEL.trim(), CLAUDE_SUBAGENT_MODEL.trim()]) {
+          if (!name) continue;
+          const nl = name.toLowerCase();
+          if (nl.includes("deepseek") && nl.includes(keyword)) return name;
+        }
+        return null;
+      };
+
+      if (modelArg === "clear") {
+        clearSessionModelOverride(sessionId);
+        const restored = CLAUDE_MODEL.trim() || "(未指定)";
+        const msg = `已清除当前会话的模型覆盖，恢复使用: \`${restored}\``;
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "模型切换", msg, "green")
+        ).catch(() => {});
+        logTrace(tid, "DONE", { outcome: "model_cleared", sessionId });
+        return;
+      }
+
+      const target = findModel(modelArg);
+      if (!target) {
+        const msg = `未找到同时含 "${modelArg}" 和 "deepseek" 关键字的模型。请在 config.json 的 claude.model 或 claude.subagentModel 中配置。`;
+        await (platform.kind === "wechat"
+          ? platform.sendText(chatId, msg)
+          : platform.sendCard(chatId, "模型切换", msg, "red")
+        ).catch(() => {});
+        logTrace(tid, "DONE", { outcome: "model_not_found", arg: modelArg });
+        return;
+      }
+
+      setSessionModelOverride(sessionId, target);
+      const msg = `已切换当前会话模型为 ${modelArg}: \`${target}\``;
+      await (platform.kind === "wechat"
+        ? platform.sendText(chatId, msg)
+        : platform.sendCard(chatId, "模型切换", msg, "green")
+      ).catch(() => {});
+      logTrace(tid, "DONE", { outcome: "model_switched", arg: modelArg, target, sessionId });
+      return;
+    }
+
     // /git <args>：在「当前会话工作目录」执行 git 命令
     if (textLower.startsWith("/git ") || textLower === "/git") {
       const args = text === "/git" ? "" : text.slice(5).trim();
@@ -935,7 +1045,7 @@ export async function handleCommand(
         return;
       }
 
-      const adapter = getAdapterForTool(descriptionTool);
+      const adapter = getAdapterForTool(descriptionTool, sessionId);
       let cwd: string | undefined;
       try {
         const info = await adapter.getSessionInfo(sessionId);

package/src/session-chat-binding.ts

@@ -65,6 +65,12 @@ export interface ActivePrompt {
   controller: AbortController;
   stopped: boolean;
   startTime: number;
+  /** Root PID for the CLI process currently serving this prompt, if the adapter exposes one. */
+  processPid?: number;
+  processMonitor?: ReturnType<typeof setInterval>;
+  /** Set when the watchdog detects that the CLI process disappeared before stream finalization. */
+  abnormalExit?: boolean;
+  abnormalExitNotified?: boolean;
 }
 
 export const activePrompts = new Map<string, ActivePrompt>();
@@ -206,6 +212,9 @@ export function consumeQueuedMessage(platform: PlatformAdapter, msg: QueuedMessa
 export function resetBindingState(): void {
   sessionChatsMap.clear();
   lastActiveChatMap.clear();
+  for (const prompt of activePrompts.values()) {
+    if (prompt.processMonitor) clearInterval(prompt.processMonitor);
+  }
   activePrompts.clear();
   queuedMessages.clear();
   displayCards.clear();