chatccc 0.2.52 → 0.2.53

package/src/im-skills.ts

@@ -1,109 +1,109 @@
-import { readdir, readFile, mkdir, writeFile } from "node:fs/promises";
-import { join, dirname } from "node:path";
-
-import { PROJECT_ROOT } from "./config.ts";
-
-export const DEFAULT_IM_SKILLS_DIR = join(PROJECT_ROOT, "im-skills");
-
-export interface ImSkillVariableMap {
-  [key: string]: string | undefined;
-}
-
-export interface BuildImSkillsPromptInput {
-  skillsDir?: string;
-  variables: ImSkillVariableMap;
-}
-
-interface ImSkillDoc {
-  name: string;
-  content: string;
-}
-
-function renderTemplate(template: string, variables: ImSkillVariableMap): string {
-  return template.replace(/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g, (_match, key: string) => {
-    return variables[key] ?? "";
-  });
-}
-
-async function loadSkillDocs(skillsDir: string): Promise<ImSkillDoc[]> {
-  let entries;
-  try {
-    entries = await readdir(skillsDir, { withFileTypes: true });
-  } catch {
-    return [];
-  }
-
-  const docs = await Promise.all(
-    entries
-      .filter((entry) => entry.isDirectory())
-      .sort((a, b) => a.name.localeCompare(b.name))
-      .map(async (entry): Promise<ImSkillDoc | null> => {
-        const skillPath = join(skillsDir, entry.name, "skill.md");
-        try {
-          const content = await readFile(skillPath, "utf-8");
-          return { name: entry.name, content };
-        } catch {
-          return null;
-        }
-      }),
-  );
-  return docs.filter((doc): doc is ImSkillDoc => doc !== null);
-}
-
-export async function buildImSkillsPrompt(input: BuildImSkillsPromptInput): Promise<string> {
-  const skillsDir = input.skillsDir ?? DEFAULT_IM_SKILLS_DIR;
-  const docs = await loadSkillDocs(skillsDir);
-  return docs
-    .map((doc) => {
-      const rendered = renderTemplate(doc.content, input.variables).trim();
-      return [
-        `[ChatCCC IM skill: ${doc.name}]`,
-        rendered,
-        `[/ChatCCC IM skill: ${doc.name}]`,
-      ].join("\n");
-    })
-    .join("\n\n");
-}
-
-/**
- * 渲染技能目录下的子文档（skill.md 除外）并写入 outputDir。
- * 返回写入的文件路径列表。通常在会话初始化时调用，写入的文档供 Agent 按需读取。
- */
-export async function exportSkillSubDocs(
-  input: BuildImSkillsPromptInput,
-  outputDir: string,
-): Promise<string[]> {
-  const skillsDir = input.skillsDir ?? DEFAULT_IM_SKILLS_DIR;
-  const files: string[] = [];
-
-  let entries;
-  try {
-    entries = await readdir(skillsDir, { withFileTypes: true });
-  } catch {
-    return files;
-  }
-
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    const skillPath = join(skillsDir, entry.name);
-
-    let subFiles;
-    try {
-      subFiles = await readdir(skillPath);
-    } catch {
-      continue;
-    }
-
-    for (const sf of subFiles) {
-      if (sf === "skill.md" || !sf.endsWith(".md")) continue;
-      const content = await readFile(join(skillPath, sf), "utf-8");
-      const rendered = renderTemplate(content, input.variables);
-      const outPath = join(outputDir, entry.name, sf);
-      await mkdir(dirname(outPath), { recursive: true });
-      await writeFile(outPath, rendered, "utf-8");
-      files.push(outPath);
-    }
-  }
-
-  return files;
-}
+import { readdir, readFile, mkdir, writeFile } from "node:fs/promises";
+import { join, dirname } from "node:path";
+
+import { PROJECT_ROOT } from "./config.ts";
+
+export const DEFAULT_IM_SKILLS_DIR = join(PROJECT_ROOT, "im-skills");
+
+export interface ImSkillVariableMap {
+  [key: string]: string | undefined;
+}
+
+export interface BuildImSkillsPromptInput {
+  skillsDir?: string;
+  variables: ImSkillVariableMap;
+}
+
+interface ImSkillDoc {
+  name: string;
+  content: string;
+}
+
+function renderTemplate(template: string, variables: ImSkillVariableMap): string {
+  return template.replace(/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g, (_match, key: string) => {
+    return variables[key] ?? "";
+  });
+}
+
+async function loadSkillDocs(skillsDir: string): Promise<ImSkillDoc[]> {
+  let entries;
+  try {
+    entries = await readdir(skillsDir, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+
+  const docs = await Promise.all(
+    entries
+      .filter((entry) => entry.isDirectory())
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map(async (entry): Promise<ImSkillDoc | null> => {
+        const skillPath = join(skillsDir, entry.name, "skill.md");
+        try {
+          const content = await readFile(skillPath, "utf-8");
+          return { name: entry.name, content };
+        } catch {
+          return null;
+        }
+      }),
+  );
+  return docs.filter((doc): doc is ImSkillDoc => doc !== null);
+}
+
+export async function buildImSkillsPrompt(input: BuildImSkillsPromptInput): Promise<string> {
+  const skillsDir = input.skillsDir ?? DEFAULT_IM_SKILLS_DIR;
+  const docs = await loadSkillDocs(skillsDir);
+  return docs
+    .map((doc) => {
+      const rendered = renderTemplate(doc.content, input.variables).trim();
+      return [
+        `[ChatCCC IM skill: ${doc.name}]`,
+        rendered,
+        `[/ChatCCC IM skill: ${doc.name}]`,
+      ].join("\n");
+    })
+    .join("\n\n");
+}
+
+/**
+ * 渲染技能目录下的子文档（skill.md 除外）并写入 outputDir。
+ * 返回写入的文件路径列表。通常在会话初始化时调用，写入的文档供 Agent 按需读取。
+ */
+export async function exportSkillSubDocs(
+  input: BuildImSkillsPromptInput,
+  outputDir: string,
+): Promise<string[]> {
+  const skillsDir = input.skillsDir ?? DEFAULT_IM_SKILLS_DIR;
+  const files: string[] = [];
+
+  let entries;
+  try {
+    entries = await readdir(skillsDir, { withFileTypes: true });
+  } catch {
+    return files;
+  }
+
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const skillPath = join(skillsDir, entry.name);
+
+    let subFiles;
+    try {
+      subFiles = await readdir(skillPath);
+    } catch {
+      continue;
+    }
+
+    for (const sf of subFiles) {
+      if (sf === "skill.md" || !sf.endsWith(".md")) continue;
+      const content = await readFile(join(skillPath, sf), "utf-8");
+      const rendered = renderTemplate(content, input.variables);
+      const outPath = join(outputDir, entry.name, sf);
+      await mkdir(dirname(outPath), { recursive: true });
+      await writeFile(outPath, rendered, "utf-8");
+      files.push(outPath);
+    }
+  }
+
+  return files;
+}

package/src/platform-adapter.ts

@@ -1,61 +1,61 @@
-/**
- * platform-adapter.ts — IM 平台适配器接口
- *
- * 独立于 orchestrator.ts，避免 orchestrator ↔ session 循环依赖。
- * 每个方法内部自行管理认证，消费者不感知 token 等认证细节。
- */
-
-export interface PlatformAdapter {
-  /** 平台标识，用于区分不同平台的行为（如 wechat、feishu 等） */
-  kind?: string;
-
-  /** 发送纯文本回复 */
-  sendText(chatId: string, text: string): Promise<boolean>;
-
-  /** 发送卡片回复（标题 + 内容 + 颜色模板） */
-  sendCard(
-    chatId: string,
-    title: string,
-    content: string,
-    template: string,
-  ): Promise<boolean>;
-
-  /** 发送原始卡片 JSON */
-  sendRawCard(chatId: string, cardJson: string): Promise<boolean>;
-
-  /** 创建群聊，返回新群 ID */
-  createGroup(name: string, userIds: string[]): Promise<string>;
-
-  /** 更新群名称和描述 */
-  updateChatInfo(
-    chatId: string,
-    name: string,
-    description: string,
-  ): Promise<void>;
-
-  /** 获取群信息 */
-  getChatInfo(chatId: string): Promise<{ name: string; description: string }>;
-
-  /** 解散群聊 */
-  disbandChat(chatId: string): Promise<void>;
-
-  /** 设置群头像 */
-  setChatAvatar(chatId: string, tool: string, status: string): Promise<void>;
-
-  /** 从群描述中提取 session 信息 */
-  extractSessionInfo(
-    description: string,
-  ): { sessionId: string; tool: string } | null;
-
-  // ---- 进度展示（display loop 使用） ----
-  // 不同平台能力不同：飞书用 CardKit 实时卡片，微信降级为纯文本。
-
-  /** 创建进度展示实体，返回唯一标识；不支持进度展示的平台返回 null */
-  cardCreate(cardJson: string): Promise<string | null>;
-
-  /** 将进度展示发送到指定会话，返回 message_id */
-  cardSend(chatId: string, cardId: string): Promise<string>;
-
-  /** 更新已发送的进度展示，sequence 保证有序 */
-  cardUpdate(cardId: string, cardJson: string, sequence: number): Promise<void>;
+/**
+ * platform-adapter.ts — IM 平台适配器接口
+ *
+ * 独立于 orchestrator.ts，避免 orchestrator ↔ session 循环依赖。
+ * 每个方法内部自行管理认证，消费者不感知 token 等认证细节。
+ */
+
+export interface PlatformAdapter {
+  /** 平台标识，用于区分不同平台的行为（如 wechat、feishu 等） */
+  kind?: string;
+
+  /** 发送纯文本回复 */
+  sendText(chatId: string, text: string): Promise<boolean>;
+
+  /** 发送卡片回复（标题 + 内容 + 颜色模板） */
+  sendCard(
+    chatId: string,
+    title: string,
+    content: string,
+    template: string,
+  ): Promise<boolean>;
+
+  /** 发送原始卡片 JSON */
+  sendRawCard(chatId: string, cardJson: string): Promise<boolean>;
+
+  /** 创建群聊，返回新群 ID */
+  createGroup(name: string, userIds: string[]): Promise<string>;
+
+  /** 更新群名称和描述 */
+  updateChatInfo(
+    chatId: string,
+    name: string,
+    description: string,
+  ): Promise<void>;
+
+  /** 获取群信息 */
+  getChatInfo(chatId: string): Promise<{ name: string; description: string }>;
+
+  /** 解散群聊 */
+  disbandChat(chatId: string): Promise<void>;
+
+  /** 设置群头像 */
+  setChatAvatar(chatId: string, tool: string, status: string): Promise<void>;
+
+  /** 从群描述中提取 session 信息 */
+  extractSessionInfo(
+    description: string,
+  ): { sessionId: string; tool: string } | null;
+
+  // ---- 进度展示（display loop 使用） ----
+  // 不同平台能力不同：飞书用 CardKit 实时卡片，微信降级为纯文本。
+
+  /** 创建进度展示实体，返回唯一标识；不支持进度展示的平台返回 null */
+  cardCreate(cardJson: string): Promise<string | null>;
+
+  /** 将进度展示发送到指定会话，返回 message_id */
+  cardSend(chatId: string, cardId: string): Promise<string>;
+
+  /** 更新已发送的进度展示，sequence 保证有序 */
+  cardUpdate(cardId: string, cardJson: string, sequence: number): Promise<void>;
 }

package/src/session-chat-binding.ts

@@ -110,7 +110,12 @@ export interface DisplayCardState {
   lastSentContent: string;
   streamErrorNotified: boolean;
   /** 卡片轮转时记录的基线，轮转后只展示增量 */
-  rotationBaseline?: string;
+  rotationAccLen?: number;
+  rotationFinalReply?: string;
+  /** WeChat delta: 上次发送时 accumulatedContent 的长度 */
+  lastSentAccLen?: number;
+  /** WeChat delta: 上次发送时的 finalReply */
+  lastSentFinalReply?: string;
 }
 
 export const displayCards = new Map<string, DisplayCardState>();

package/src/session.ts

@@ -917,14 +917,17 @@ export function ensureDisplayLoop(sessionId: string): void {
         if (isTerminal) {
           if (isWechat) {
             // WeChat: 没有卡片需要终结，用 delta 逻辑发剩余内容，避免重发已推送的部分
-            const rawFull = state.accumulatedContent + state.finalReply;
-            const prevRaw = display?.lastSentContent ?? "";
-            let remaining: string;
-            if (prevRaw && rawFull.startsWith(prevRaw)) {
-              remaining = rawFull.slice(prevRaw.length).trim();
+            // 分开追踪 accumulatedContent 和 finalReply，而非拼接后对比
+            const prevAccLen = display?.lastSentAccLen ?? 0;
+            const prevFinalReply = display?.lastSentFinalReply ?? "";
+            const accDelta = state.accumulatedContent.slice(prevAccLen);
+            let replyDelta: string;
+            if (prevFinalReply && state.finalReply.startsWith(prevFinalReply)) {
+              replyDelta = state.finalReply.slice(prevFinalReply.length);
             } else {
-              remaining = rawFull.trim();
+              replyDelta = state.finalReply;
             }
+            const remaining = (accDelta + replyDelta).trim();
             const tail = "━━━ 回答结束 ━━━";
             const finalMsg = remaining ? remaining + "\n" + tail : tail;
             await p.sendText(chatId, finalMsg).catch(() => {});
@@ -966,21 +969,29 @@ export function ensureDisplayLoop(sessionId: string): void {
             const d = displayCards.get(chatId);
             if (!d || d.cardBusy) return;
 
-            const rawFull = state.accumulatedContent + state.finalReply;
-            const prevRaw = d.lastSentContent;
-            let delta: string;
-            if (prevRaw && rawFull.startsWith(prevRaw)) {
-              delta = rawFull.slice(prevRaw.length).trim();
+            // 分开追踪 accumulatedContent 和 finalReply 的已发送位置。
+            // 如果只用 rawFull.startsWith(prevRaw)，当新的 tool_use/tool_result
+            // 插入到 accumulatedContent 中间时，rawFull 不再以 prevRaw 开头，
+            // 会回退到发送完整内容 → 产生大量重复。
+            const prevAccLen = d.lastSentAccLen ?? 0;
+            const prevFinalReply = d.lastSentFinalReply ?? "";
+            const accDelta = state.accumulatedContent.slice(prevAccLen);
+            let replyDelta: string;
+            if (prevFinalReply && state.finalReply.startsWith(prevFinalReply)) {
+              replyDelta = state.finalReply.slice(prevFinalReply.length);
             } else {
-              delta = rawFull.trim();
+              replyDelta = state.finalReply;
             }
+            const delta = (accDelta + replyDelta).trim();
             if (!delta) return;
 
             d.cardBusy = true;
             try {
               const ok = await p.sendText(chatId, delta);
               if (ok) {
-                d.lastSentContent = rawFull;
+                d.lastSentAccLen = state.accumulatedContent.length;
+                d.lastSentFinalReply = state.finalReply;
+                d.lastSentContent = delta;
               } else {
                 // 发送失败（限流等），不更新光标，下次合并重试
                 return;
@@ -1026,8 +1037,10 @@ export function ensureDisplayLoop(sessionId: string): void {
                     display.cardId = newCardId;
                     display.sequence = 1;
                     display.cardCreatedAt = Date.now();
-                    // 记录基线：新卡片只展示轮转后新增的内容，不重复旧卡已有内容
-                    display.rotationBaseline = state.accumulatedContent + state.finalReply;
+                    // 记录基线：分开追踪 accumulatedContent 长度和 finalReply，
+                    // 避免 tool 内容中间插入时前缀匹配失败 → 回退发完整内容
+                    display.rotationAccLen = state.accumulatedContent.length;
+                    display.rotationFinalReply = state.finalReply;
                     display.lastSentContent = "";
                     display.streamErrorNotified = false;
                   }
@@ -1039,27 +1052,19 @@ export function ensureDisplayLoop(sessionId: string): void {
                 return;
               }
 
-              // 轮转后：只展示增量（从 baseline 之后的新内容）
-              if (display.rotationBaseline) {
-                const fullRaw = state.accumulatedContent + state.finalReply;
-                if (!fullRaw.startsWith(display.rotationBaseline)) {
-                  // baseline 失效（极端情况），回退到完整内容
-                  display.rotationBaseline = undefined;
-                  dotCount = (dotCount % 9) + 1;
-                  const fallback = fullRaw + "\n" + "。".repeat(dotCount);
-                  display.lastSentContent = fallback;
-                  const fbCard = buildProgressCard(truncateContent(fallback), { showStop: true, headerTitle: "生成中..." });
-                  display.cardBusy = true;
-                  try {
-                    await p.cardUpdate(display.cardId, fbCard, display.sequence + 1);
-                    display.sequence++;
-                  } finally {
-                    display.cardBusy = false;
-                  }
-                  return;
+              // 轮转后：分开追踪 accumulatedContent 和 finalReply 增量，
+              // 避免 tool 内容插入中间时前缀匹配失败
+              if (display.rotationAccLen !== undefined) {
+                const accDelta = state.accumulatedContent.slice(display.rotationAccLen);
+                const rotReply = display.rotationFinalReply ?? "";
+                let replyDelta: string;
+                if (rotReply && state.finalReply.startsWith(rotReply)) {
+                  replyDelta = state.finalReply.slice(rotReply.length);
+                } else {
+                  replyDelta = state.finalReply;
                 }
-                const delta = fullRaw.slice(display.rotationBaseline.length).trim();
-                if (delta === display.lastSentContent) return;
+                const delta = (accDelta + replyDelta).trim();
+                if (!delta || delta === display.lastSentContent) return;
                 display.lastSentContent = delta;
                 const deltaCard = buildProgressCard(truncateContent(delta) || "处理中...", { showStop: true, headerTitle: "生成中..." });
                 display.cardBusy = true;