chatccc 0.2.60 → 0.2.61

package/config.sample.json

@@ -10,14 +10,14 @@
   "port": 18080,
   "gitTimeoutSeconds": 180,
   "allowInterrupt": false,
-  "claude": {
-    "enabled": false,
-    "defaultAgent": true,
-    "model": "claude-sonnet-4-6",
-    "subagentModel": "",
-    "effort": "",
-    "apiKey": "",
-    "baseUrl": ""
+  "claude": {
+    "enabled": false,
+    "defaultAgent": true,
+    "model": "",
+    "subagentModel": "",
+    "effort": "",
+    "apiKey": "",
+    "baseUrl": ""
   },
   "cursor": {
     "enabled": false,

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "chatccc",
-  "version": "0.2.60",
-  "description": "Feishu bot bridge for Claude Code",
-  "license": "Apache-2.0",
-  "type": "module",
-  "main": "./src/index.ts",
-  "bin": {
-    "chatccc": "bin/chatccc.mjs"
-  },
-  "files": [
-    "src/",
-    "bin/",
-    "demo/ilink_echo_probe.ts",
-    "im-skills/",
-    "images/img_readme_*.jpg",
-    "images/img_readme_*.png",
-    "images/avatars/status_*.png",
-    "images/avatars/badges/",
-    "package.json",
-    "README.md",
-    "config.sample.json"
-  ],
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "chatccc": "tsx src/index.ts",
-    "start": "tsx src/index.ts",
-    "demo:bot-test": "tsx demo/bot_test.ts",
-    "demo:bot-test:local": "tsx demo/bot_test.ts --local",
-    "demo:create-group": "tsx src/index.ts",
-    "demo:create-group:local": "tsx src/index.ts --local",
-    "demo:permission-check": "tsx demo/permission_check.ts",
-    "demo:claude-hi": "tsx demo/claude_say_hi.ts",
-    "demo:codex-hi": "tsx demo/codex_say_hi.ts",
-    "demo:ilink-echo": "tsx demo/ilink_echo_probe.ts",
-    "test": "vitest run",
-    "test:watch": "vitest"
-  },
-  "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.2.133",
-    "@larksuiteoapi/node-sdk": "^1.59.0",
-    "@openilink/openilink-sdk-node": "^0.6.0",
-    "nodemailer": "^8.0.7",
-    "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.34.5",
-    "tsx": "^4.0.0",
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.18.1",
-    "typescript": "^5.0.0",
-    "vitest": "^4.1.5"
-  },
-  "engines": {
-    "node": ">=20"
-  }
-}
+{
+  "name": "chatccc",
+  "version": "0.2.61",
+  "description": "Feishu bot bridge for Claude Code",
+  "license": "Apache-2.0",
+  "type": "module",
+  "main": "./src/index.ts",
+  "bin": {
+    "chatccc": "bin/chatccc.mjs"
+  },
+  "files": [
+    "src/",
+    "bin/",
+    "demo/ilink_echo_probe.ts",
+    "im-skills/",
+    "images/img_readme_*.jpg",
+    "images/img_readme_*.png",
+    "images/avatars/status_*.png",
+    "images/avatars/badges/",
+    "package.json",
+    "README.md",
+    "config.sample.json"
+  ],
+  "scripts": {
+    "dev": "tsx src/index.ts",
+    "chatccc": "tsx src/index.ts",
+    "start": "tsx src/index.ts",
+    "demo:bot-test": "tsx demo/bot_test.ts",
+    "demo:bot-test:local": "tsx demo/bot_test.ts --local",
+    "demo:create-group": "tsx src/index.ts",
+    "demo:create-group:local": "tsx src/index.ts --local",
+    "demo:permission-check": "tsx demo/permission_check.ts",
+    "demo:claude-hi": "tsx demo/claude_say_hi.ts",
+    "demo:codex-hi": "tsx demo/codex_say_hi.ts",
+    "demo:ilink-echo": "tsx demo/ilink_echo_probe.ts",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "dependencies": {
+    "@anthropic-ai/claude-agent-sdk": "0.2.133",
+    "@larksuiteoapi/node-sdk": "^1.59.0",
+    "@openilink/openilink-sdk-node": "^0.6.0",
+    "nodemailer": "^8.0.7",
+    "qrcode-terminal": "^0.12.0",
+    "sharp": "^0.34.5",
+    "tsx": "^4.0.0",
+    "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.18.1",
+    "typescript": "^5.0.0",
+    "vitest": "^4.1.5"
+  },
+  "engines": {
+    "node": ">=20"
+  }
+}

package/src/__tests__/wechat-platform.test.ts

@@ -1,18 +1,19 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import { buildHelpCard } from "../cards.ts";
-import {
-  _flushPendingClawFinalTextForTest,
-  _resetWechatClawStateForTest,
-  createWechatAdapter,
-} from "../wechat-platform.ts";
-
-describe("createWechatAdapter", () => {
-  beforeEach(() => {
-    _resetWechatClawStateForTest();
-  });
-
-  it("degrades raw cards to plain text messages", async () => {
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { buildHelpCard } from "../cards.ts";
+import {
+  _resetWechatClawStateForTest,
+  _setWxMinSendIntervalMsForTest,
+  createWechatAdapter,
+} from "../wechat-platform.ts";
+
+describe("createWechatAdapter", () => {
+  beforeEach(() => {
+    _resetWechatClawStateForTest();
+    _setWxMinSendIntervalMsForTest(0); // 测试中禁用发送间隔限制
+  });
+
+  it("degrades raw cards to plain text messages", async () => {
     const wire = {
       push: vi.fn(async (_chatId: string, _text: string) => "msg-id"),
       sendText: vi.fn(
@@ -38,7 +39,7 @@ describe("createWechatAdapter", () => {
     expect(log).toHaveBeenCalledWith("[WECHAT] sendRawCard degraded to text");
   });
 
-  it("reports unsent non-final messages after the claw limit", async () => {
+  it("appends claw suffix on 9th non-final message and blocks further non-final messages", async () => {
     const wire = {
       push: vi.fn(async (_chatId: string, _text: string) => "msg-id"),
       sendText: vi.fn(
@@ -52,48 +53,59 @@ describe("createWechatAdapter", () => {
       log,
     });
 
-    for (let i = 0; i < 10; i++) {
+    // 前8条正常发送
+    for (let i = 0; i < 8; i++) {
       await expect(platform.sendText("wx-chat-limit", `chunk ${i}`)).resolves.toBe(true);
     }
 
-    await expect(platform.sendText("wx-chat-limit", "chunk 10")).resolves.toBe(false);
+    // 第9条非最终消息：应附加 claw 后缀
+    await expect(platform.sendText("wx-chat-limit", "chunk 8")).resolves.toBe(true);
+
+    // 第10条起非最终消息被阻止
+    await expect(platform.sendText("wx-chat-limit", "chunk 9")).resolves.toBe(false);
+
+    expect(wire.push).toHaveBeenCalledTimes(9);
+    // 验证第9条附带了 claw 后缀
+    const ninthCall = wire.push.mock.calls[8];
+    expect(ninthCall[1]).toContain("chunk 8");
+    expect(ninthCall[1]).toContain("由于微信claw机制限制，不再发送过程，稍后把最终结果发送给你");
+    expect(log).toHaveBeenCalledWith(
+      "[WECHAT] sendText skipped (claw limit): chatId=wx-chat-limit count=10",
+    );
+  });
+
+  it("allows final messages through after the 9th message claw limit", async () => {
+    const wire = {
+      push: vi.fn(async (_chatId: string, _text: string) => "msg-id"),
+      sendText: vi.fn(
+        async (_chatId: string, _text: string, _contextToken?: string) =>
+          "msg-id",
+      ),
+    };
+    const log = vi.fn();
+    const platform = createWechatAdapter({
+      getWire: () => wire,
+      log,
+    });
+    const chatId = "wx-chat-final-allow";
+    const finalText = "done\n━━━ 回答结束 ━━━";
+
+    // 前8条正常发送
+    for (let i = 0; i < 8; i++) {
+      await expect(platform.sendText(chatId, `chunk ${i}`)).resolves.toBe(true);
+    }
+
+    // 第9条非最终消息带后缀
+    await expect(platform.sendText(chatId, "chunk 8")).resolves.toBe(true);
+
+    // 第10条：最终消息应允许发送（不被阻止也不被 queuing）
+    await expect(platform.sendText(chatId, finalText)).resolves.toBe(true);
+
     expect(wire.push).toHaveBeenCalledTimes(10);
+    const lastCall = wire.push.mock.calls[9];
+    expect(lastCall[1]).toBe(finalText);
     expect(log).toHaveBeenCalledWith(
-      "[WECHAT] sendText skipped (claw limit): chatId=wx-chat-limit count=11",
-    );
-  });
-
-  it("queues final messages after the claw limit until the user wakes the chat", async () => {
-    const wire = {
-      push: vi.fn(async (_chatId: string, _text: string) => "msg-id"),
-      sendText: vi.fn(
-        async (_chatId: string, _text: string, _contextToken?: string) =>
-          "msg-id",
-      ),
-    };
-    const log = vi.fn();
-    const platform = createWechatAdapter({
-      getWire: () => wire,
-      log,
-    });
-    const chatId = "wx-chat-final-limit";
-    const finalText = "done\n━━━ 回答结束 ━━━";
-
-    for (let i = 0; i < 10; i++) {
-      await expect(platform.sendText(chatId, `chunk ${i}`)).resolves.toBe(true);
-    }
-
-    await expect(platform.sendText(chatId, finalText)).resolves.toBe(true);
-    expect(wire.push).toHaveBeenCalledTimes(10);
-    expect(log).toHaveBeenCalledWith(
-      `[WECHAT] final queued (claw limit): chatId=${chatId} count=11 len=${finalText.length}`,
-    );
-
-    await expect(_flushPendingClawFinalTextForTest(chatId, wire, log)).resolves.toBe(true);
-    expect(wire.push).toHaveBeenCalledTimes(11);
-    expect(wire.push).toHaveBeenLastCalledWith(chatId, finalText);
-    expect(log).toHaveBeenCalledWith(
-      `[WECHAT] pending final sent after claw wake: chatId=${chatId} len=${finalText.length}`,
-    );
-  });
-});
+      expect.stringContaining("[WECHAT] sendText OK"),
+    );
+  });
+});

package/src/session.ts

@@ -30,6 +30,13 @@ import { createCursorAdapter } from "./adapters/cursor-adapter.ts";
 import { createCodexAdapter } from "./adapters/codex-adapter.ts";
 import { buildImSkillsPrompt, exportSkillSubDocs } from "./im-skills.ts";
 import type { PlatformAdapter } from "./platform-adapter.ts";
+
+// 微信显示循环压缩：头5 + ... + 尾5，避免在最后一步 sendText 中压缩指令回复
+function compressWechatDisplayText(text: string): string {
+  const lines = text.split("\n");
+  if (lines.length <= 10) return text;
+  return [...lines.slice(0, 5), "...", ...lines.slice(-5)].join("\n");
+}
 import { readStreamState, writeStreamState, createEmptyStreamState, fixStaleStreamStates } from "./stream-state.ts";
 import {
   bindChatToSession,
@@ -1015,7 +1022,7 @@ export function ensureDisplayLoop(sessionId: string): void {
 
             d.cardBusy = true;
             try {
-              const ok = await p.sendText(chatId, delta);
+              const ok = await p.sendText(chatId, compressWechatDisplayText(delta));
               if (ok) {
                 d.lastSentAccLen = state.accumulatedContent.length;
                 d.lastSentFinalReply = state.finalReply;

package/src/wechat-platform.ts

@@ -66,14 +66,20 @@ export function getIlinkWire(): OpenIlinkWire | null {
 const contextTokenMap = new Map<string, string>();
 /** chatId → 用户未回复时已连发消息数 */
 const consecutiveSendCount = new Map<string, number>();
-/** chatId → claw 限制后等待用户唤醒再补发的最终消息 */
-const pendingClawFinalText = new Map<string, string>();
+/** chatId → 上一次 sendText 成功的时间戳 */
+const lastSendTimeMap = new Map<string, number>();
 const textCardMap = new Map<string, { chatId?: string; text: string; lastSentText: string; lastSentAt: number }>();
 let textCardSeq = 0;
 let platformLog: (msg: string) => void = () => {};
 
 const TEXT_CARD_UPDATE_INTERVAL_MS = 30_000;
 
+/** 微信连发间隔阈值：第5条起限制 ≥ 此值（默认10秒），测试可覆写 */
+let wxMinSendIntervalMs = 10_000;
+export function _setWxMinSendIntervalMsForTest(ms: number): void {
+  wxMinSendIntervalMs = ms;
+}
+
 type WechatWireSender = Pick<OpenIlinkWire, "sendText" | "push">;
 
 export interface WechatAdapterOptions {
@@ -89,7 +95,7 @@ function isFinalReplyText(text: string): boolean {
   return text.includes("━━━ 回答结束 ━━━");
 }
 
-function compressGeneratingText(text: string): string {
+export function compressGeneratingText(text: string): string {
   const lines = text.split("\n");
   if (lines.length <= 10) return text;
   return [...lines.slice(0, 5), "...", ...lines.slice(-5)].join("\n");
@@ -104,38 +110,10 @@ async function sendWechatTextRaw(wire: WechatWireSender, chatId: string, text: s
   }
 }
 
-async function flushPendingClawFinalText(
-  chatId: string,
-  wire: WechatWireSender | null,
-  log: (msg: string) => void,
-): Promise<boolean> {
-  const text = pendingClawFinalText.get(chatId);
-  if (!text || !wire) return false;
-
-  try {
-    await sendWechatTextRaw(wire, chatId, text);
-    pendingClawFinalText.delete(chatId);
-    consecutiveSendCount.set(chatId, 1);
-    log(`[WECHAT] pending final sent after claw wake: chatId=${chatId} len=${text.length}`);
-    return true;
-  } catch (err) {
-    log(`[WECHAT] pending final send failed: ${(err as Error).message}`);
-    return false;
-  }
-}
-
 export function _resetWechatClawStateForTest(): void {
   consecutiveSendCount.clear();
-  pendingClawFinalText.clear();
   contextTokenMap.clear();
-}
-
-export async function _flushPendingClawFinalTextForTest(
-  chatId: string,
-  wire: WechatWireSender | null,
-  log: (msg: string) => void = () => {},
-): Promise<boolean> {
-  return flushPendingClawFinalText(chatId, wire, log);
+  lastSendTimeMap.clear();
 }
 
 // ---------------------------------------------------------------------------
@@ -206,29 +184,31 @@ export function createWechatAdapter(
 
       const isFinal = isFinalReplyText(text);
 
-      // 第10条且非最终消息：附加 claw 限制提示
-      if (count === 10 && !isFinal) {
-        text = text + "\n━━ 后台工作中，由于微信claw机制限制，请唤醒我才能继续发送消息";
+      // 第9条且非最终消息：附加 claw 限制提示，此后禁止继续发送生成消息
+      if (count === 9 && !isFinal) {
+        text = text + "\n---由于微信claw机制限制，不再发送过程，稍后把最终结果发送给你---";
+      }
+
+      // 超过9条后不允许发送非最终消息（生成消息），最终结果消息仍然允许
+      if (count > 9 && !isFinal) {
+        log(`[WECHAT] sendText skipped (claw limit): chatId=${chatId} count=${count}`);
+        return false;
       }
 
-      // 超过10条后不再直接发送。微信端 claw 可能会静默丢弃，即使 iLink 返回 OK。
-      if (count > 10) {
-        if (isFinal) {
-          pendingClawFinalText.set(chatId, text);
-          log(`[WECHAT] final queued (claw limit): chatId=${chatId} count=${count} len=${text.length}`);
-          return true;
-        } else {
-          log(`[WECHAT] sendText skipped (claw limit): chatId=${chatId} count=${count}`);
-          return false;
+      // 第5条起限制发送间隔 ≥ 10 秒（前4条保持原有 3s 显示循环节奏）
+      if (count > 4) {
+        const lastSentAt = lastSendTimeMap.get(chatId) ?? 0;
+        const elapsed = Date.now() - lastSentAt;
+        if (elapsed < wxMinSendIntervalMs) {
+          await new Promise((r) => setTimeout(r, wxMinSendIntervalMs - elapsed));
         }
       }
 
       try {
-        // 最后一步：非最终回复压缩行数（最多11行：头5 + ... + 尾5）
-        const sendText = isFinal ? text : compressGeneratingText(text);
-        await sendWechatTextRaw(wire, chatId, sendText);
-        const preview = sendText.length > 60 ? sendText.slice(0, 60) + "..." : sendText;
-        log(`[WECHAT] sendText OK: chatId=${chatId} len=${sendText.length} count=${count} text="${preview}"`);
+        await sendWechatTextRaw(wire, chatId, text);
+        lastSendTimeMap.set(chatId, Date.now());
+        const preview = text.length > 60 ? text.slice(0, 60) + "..." : text;
+        log(`[WECHAT] sendText OK: chatId=${chatId} len=${text.length} count=${count} text="${preview}"`);
         return true;
       } catch (err) {
         log(`[WECHAT] sendText failed: ${(err as Error).message}`);
@@ -621,12 +601,6 @@ async function handleWechatMessage(
   // 用户回复，重置 claw 连发计数
   consecutiveSendCount.set(chatId, 0);
 
-  // 如果上一轮最终消息因 claw 被暂存，这次用户消息只作为唤醒使用。
-  if (pendingClawFinalText.has(chatId)) {
-    await flushPendingClawFinalText(chatId, ilinkWire, platformLog);
-    return;
-  }
-
   // WeChat 中所有会话都视为 p2p，/new 复用 p2p 路径（等同飞书 /newh 效果）
   // 不 await：避免长 prompt 阻塞后续消息处理（如 /cd、/stop 等命令）
   handler(fullText, chatId, chatId, msgTimestamp, "p2p").catch((err) => {