chatccc 0.2.3 → 0.2.5

package/src/cards.ts

@@ -42,35 +42,37 @@ export function truncateContent(text: string, maxLines = 20, maxChars = 8000): s
   return displayText;
 }
 
+const TOOL_EMOJI_MAP: Record<string, string> = {
+  Read: "\u{1F4D6}",          // 📖
+  Write: "\u{270D}\u{FE0F}",  // ✍️
+  Edit: "\u{270F}\u{FE0F}",   // ✏️
+  Grep: "\u{1F50E}",          // 🔎
+  Glob: "\u{1F4C2}",          // 📂
+  Bash: "\u{1F5A5}\u{FE0F}",  // 🖥️
+  WebSearch: "\u{1F310}",     // 🌐
+  WebFetch: "\u{1F4E5}",      // 📥
+  TodoWrite: "\u{2705}",      // ✅
+  Agent: "\u{1F916}",         // 🤖
+  NotebookEdit: "\u{1F4D3}",  // 📓
+  AskUserQuestion: "\u{2753}",// ❓
+};
+
 export function getToolEmoji(name: string): string {
-  const n = name.toLowerCase();
-  if (n.includes("read") || n.includes("cat")) return "\u{1F4D6}";        // 📖
-  if (n.includes("write")) return "\u{270D}\u{FE0F}";                    // ✍️
-  if (n.includes("edit")) return "\u{270F}\u{FE0F}";                     // ✏️
-  if (n.includes("grep") || n.includes("search")) return "\u{1F50E}";    // 🔎
-  if (n.includes("glob") || n.includes("find") || n.includes("ls")) return "\u{1F4C2}"; // 📂
-  if (n.includes("bash") || n.includes("shell") || n.includes("exec")) return "\u{1F5A5}\u{FE0F}"; // 🖥️
-  if (n.includes("websearch") || n.includes("web_search")) return "\u{1F310}"; // 🌐
-  if (n.includes("webfetch") || n.includes("web_fetch") || n.includes("fetch")) return "\u{1F4E5}"; // 📥
-  if (n.includes("todo") || n.includes("task")) return "\u{2705}";       // ✅
-  if (n.includes("agent")) return "\u{1F916}";                           // 🤖
-  if (n.includes("notebook")) return "\u{1F4D3}";                        // 📓
-  if (n.includes("ask") || n.includes("question")) return "\u{2753}";    // ❓
-  return "\u{1F527}";                                                     // 🔧
+  return TOOL_EMOJI_MAP[name] ?? "\u{1F527}"; // 🔧
 }
 
 // ---------------------------------------------------------------------------
 // Card builders
 // ---------------------------------------------------------------------------
 
-// CardKit schema 2.0 思考卡片（带停止按钮，支持打字机流式更新）
-export function buildThinkingCardV2(
-  thinkingText: string,
+// CardKit schema 2.0 进度卡片（带停止按钮，支持流式更新）
+export function buildProgressCard(
+  text: string,
   opts: { showStop?: boolean; headerTitle?: string; headerTemplate?: string } = {}
 ): string {
-  const { showStop = true, headerTitle = "思考中...", headerTemplate = "blue" } = opts;
+  const { showStop = true, headerTitle = "生成中...", headerTemplate = "blue" } = opts;
   const elements: object[] = [
-    { tag: "markdown", content: truncateContent(thinkingText), element_id: "main_content" },
+    { tag: "markdown", content: truncateContent(text), element_id: "main_content" },
   ];
   if (showStop) {
     elements.push({ tag: "hr" });

package/src/config.ts

@@ -62,6 +62,9 @@ export const CLAUDE_MODEL = process.env.CHATCCC_ANTHROPIC_MODEL?.trim() || "defa
 
 export const CLAUDE_EFFORT = process.env.CHATCCC_ANTHROPIC_EFFORT?.trim() || "default";
 
+/** AI 工具选择：claude | cursor | codex（未设置时默认 claude） */
+export const AI_TOOL = process.env.CHATCCC_AI_TOOL?.trim().toLowerCase() || "claude";
+
 // 新建会话的默认工作路径（/cd 命令设置，持久化到本地文件）
 // 该路径仅影响通过 /new 新建的 Claude 会话，不影响已有会话的 resume。
 export const DEFAULT_CWD_FILE = join(PROJECT_ROOT, ".claude", "working_dir.txt");
@@ -224,4 +227,4 @@ export function explainMissingFeishuCredentialsAndExit(): never {
   process.exit(1);
 }
 
-export const SESSION_DESC_PREFIX = "Claude Session:";
+export let SESSION_DESC_PREFIX: string = "Claude Session:";

package/src/index.ts

@@ -13,7 +13,7 @@
  * session ID, resumes the session via SDK, sends the user's text, and
  * streams the response to the session's jsonl file.
  *
- * Buttons: thinking cards have a 停止 button; help messages have /new and /restart buttons.
+ * Buttons: progress cards have a 停止 button; help messages have /new and /restart buttons.
  *
  * Usage:
  *   npm run dev
@@ -22,7 +22,6 @@
  */
 
 import { spawn } from "node:child_process";
-import { getSessionInfo } from "@anthropic-ai/claude-agent-sdk";
 import { readdir, stat } from "node:fs/promises";
 import { resolve, dirname, basename } from "node:path";
 
@@ -67,7 +66,7 @@ import {
   verifyAllPermissions,
   reportPermissionResults,
 } from "./feishu-api.ts";
-import { buildHelpCard, buildStatusCard, buildThinkingCardV2, buildCdContent, buildSessionsCard } from "./cards.ts";
+import { buildHelpCard, buildStatusCard, buildProgressCard, buildCdContent, buildSessionsCard } from "./cards.ts";
 import { updateCardKitCard } from "./cardkit.ts";
 import {
   MAX_PROCESSED,
@@ -79,6 +78,8 @@ import {
   resetState,
   resumeAndPrompt,
   sessionInfoMap,
+  initAdapter,
+  getAdapter,
 } from "./session.ts";
 
 // ---------------------------------------------------------------------------
@@ -190,7 +191,7 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
       const chatInfo = await getChatInfo(cdToken, chatId);
       const sid = extractSessionId(chatInfo.description);
       if (sid) {
-        const info = await getSessionInfo(sid);
+        const info = await getAdapter().getSessionInfo(sid);
         sessionCwd = info?.cwd;
       }
     } catch { /* 非会话群或获取失败，不显示 */ }
@@ -420,9 +421,9 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
             await new Promise(r => setTimeout(r, 20));
           }
           const cardId = existing.cardId;
-          const thinking = existing.accumulatedThinking;
-          const interruptedCard = buildThinkingCardV2(
-            thinking || "新问题已提交，当前回复已中断。",
+          const currentContent = existing.accumulatedContent;
+          const interruptedCard = buildProgressCard(
+            currentContent || "新问题已提交，当前回复已中断。",
             { showStop: false, headerTitle: "已中断", headerTemplate: "yellow" }
           );
           let nextSeq = existing.sequence + 1;
@@ -648,6 +649,7 @@ async function main(): Promise<void> {
   });
 
   if (USE_LOCAL) {
+    initAdapter();
     console.log(`\n[启动 6/7] 本地区 relay 模式：正在连接 ${LOCAL_RELAY_URL} …`);
     console.log("  若失败：请先在 SDK 模式下启动主进程，或确认本机中继已在该地址监听。");
     let localRelayOpened = false;
@@ -693,12 +695,13 @@ async function main(): Promise<void> {
     });
   } else {
     resetState();
+    initAdapter();
 
     const wsClient = new WSClient({
       appId: APP_ID,
       appSecret: APP_SECRET,
-      onReady: () => resetState(),
-      onReconnected: () => resetState(),
+      onReady: () => { resetState(); initAdapter(); },
+      onReconnected: () => { resetState(); initAdapter(); },
     });
 
     console.log(`\n[启动 6/7] 飞书长连接：正在通过 SDK 建立 WebSocket …`);