chatccc 0.2.108 → 0.2.110

package/package.json

@@ -1,63 +1,63 @@
-{
-  "name": "chatccc",
-  "version": "0.2.108",
-  "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/",
-    "scripts/postinstall-sharp-check.mjs",
-    "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",
-    "postinstall": "node scripts/postinstall-sharp-check.mjs"
-  },
-  "dependencies": {
-    "@ai-sdk/openai-compatible": "^2.0.47",
-    "@anthropic-ai/claude-agent-sdk": "0.2.133",
-    "@larksuiteoapi/node-sdk": "^1.59.0",
-    "@openilink/openilink-sdk-node": "^0.6.0",
-    "ai": "^6.0.184",
-    "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": "^3.2.4"
-  },
-  "engines": {
-    "node": ">=20"
-  }
-}
+{
+  "name": "chatccc",
+  "version": "0.2.110",
+  "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/",
+    "scripts/postinstall-sharp-check.mjs",
+    "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",
+    "postinstall": "node scripts/postinstall-sharp-check.mjs"
+  },
+  "dependencies": {
+    "@ai-sdk/openai-compatible": "^2.0.47",
+    "@anthropic-ai/claude-agent-sdk": "0.2.133",
+    "@larksuiteoapi/node-sdk": "^1.59.0",
+    "@openilink/openilink-sdk-node": "^0.6.0",
+    "ai": "^6.0.184",
+    "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": "^3.2.4"
+  },
+  "engines": {
+    "node": ">=20"
+  }
+}

package/src/index.ts

@@ -660,8 +660,11 @@ async function startWechatSupervisor(): Promise<void> {
   console.log("\n[WX] 启动微信 iLink 平台...");
 
   const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
+  const MAX_QR_RETRIES = 3;
+  let qrTimeoutCount = 0;
 
   while (!wechatSignal.stopped) {
+    let isQrTimeout = false;
     try {
       await startWechatPlatform(
         (text, chatId, openId, msgTimestamp, chatType, traceId) =>
@@ -669,14 +672,31 @@ async function startWechatSupervisor(): Promise<void> {
         wechatSignal,
         ILINK_REUSE_TOKEN_ON_START,
       );
+      // 登录成功后重置计数
+      qrTimeoutCount = 0;
     } catch (err) {
-      console.error(
-        `[WX] 微信 iLink 崩溃: ${(err as Error).message}`,
-      );
+      const msg = (err as Error).message ?? "";
+      isQrTimeout = msg.includes("QR 登录超时");
+      if (isQrTimeout) {
+        qrTimeoutCount++;
+        console.error(
+          `[WX] QR 登录超时 (${qrTimeoutCount}/${MAX_QR_RETRIES}): ${msg}`,
+        );
+        if (qrTimeoutCount >= MAX_QR_RETRIES) {
+          console.error(
+            `[WX] 已连续 ${MAX_QR_RETRIES} 次 QR 登录超时，放弃重试。如需重新尝试请重启 ChatCCC。`,
+          );
+          break;
+        }
+      } else {
+        console.error(`[WX] 微信 iLink 崩溃: ${msg}`);
+      }
     }
     if (wechatSignal.stopped) break;
-    console.log("[WX] 5 秒后重试...");
-    await sleep(5000);
+    const delaySeconds = isQrTimeout ? 300 : 30;
+    const delayDesc = isQrTimeout ? "5 分钟" : "30 秒";
+    console.log(`[WX] ${delayDesc}后重试...`);
+    await sleep(delaySeconds * 1000);
   }
   console.log("[WX] 微信 iLink 平台已停止。");
 }

package/src/orchestrator.ts

@@ -286,6 +286,12 @@ export async function handleCommand(
       const content = buildCdContent(targetDir, withStats, isUpdate, sessionCwd);
       await platform.sendCard(chatId, "新会话工作路径", content, "blue");
       logTrace(tid, "DONE", { outcome: "cd_path", targetDir, isUpdate });
+
+      // 微信模式下，若用户没有活跃会话，自动创建新会话
+      if (platform.kind === "wechat" && !sessionInfoMap.has(chatId)) {
+        logTrace(tid, "BRANCH", { cmd: "/new", trigger: "auto_after_cd" });
+        await handleCommand(platform, "/new", chatId, openId, msgTimestamp, chatType, traceId);
+      }
     }
     return;
   }

package/src/wechat-platform.ts

@@ -429,23 +429,34 @@ export async function startWechatPlatform(
     }
   }
 
-  // 请求新 QR
-  platformLog("启动微信 iLink QR 登录...");
+  // 请求新 QR（5 分钟内未扫码则放弃本轮，由 supervisor 稍后重试）
+  const QR_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
+  platformLog("启动微信 iLink QR 登录（5 分钟内未扫码将自动重试）...");
   ilinkWire = new OpenIlinkWire("", {
     base_url: saved.baseUrl,
   });
 
-  const loginResult = await ilinkWire.loginWithQr({
-    on_qrcode: (content) => {
-      printScanMaterial(content);
-    },
-    on_scanned: () => {
-      platformLog("QR 已扫描，请在微信中确认登录。");
-    },
-    on_expired: (attempt, maxAttempts) => {
-      platformLog(`QR 已过期，正在刷新 (${attempt}/${maxAttempts})。`);
-    },
-  });
+  let qrExpiredCount = 0;
+  const loginResult = await Promise.race([
+    ilinkWire.loginWithQr({
+      on_qrcode: (content) => {
+        printScanMaterial(content);
+      },
+      on_scanned: () => {
+        platformLog("QR 已扫描，请在微信中确认登录。");
+      },
+      on_expired: (attempt, maxAttempts) => {
+        qrExpiredCount++;
+        platformLog(`QR 已过期，正在刷新 (${attempt}/${maxAttempts})。`);
+      },
+    }),
+    new Promise<never>((_, reject) =>
+      setTimeout(
+        () => reject(new Error(`QR 登录超时（${QR_LOGIN_TIMEOUT_MS / 60000} 分钟内未扫码，已刷新 ${qrExpiredCount} 次）`)),
+        QR_LOGIN_TIMEOUT_MS,
+      ),
+    ),
+  ]);
 
   if (!loginResult.connected) {
     throw new Error(`微信 iLink QR 登录失败: ${loginResult.message}`);