chatccc 0.2.72 → 0.2.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.72",
+  "version": "0.2.74",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/im-skills.test.ts

@@ -3,7 +3,12 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { afterEach, describe, expect, it } from "vitest";
 
-import { buildImSkillsPrompt, exportSkillSubDocs } from "../im-skills.ts";
+import {
+  buildImSkillsPrompt,
+  buildImSkillsPromptCached,
+  clearImSkillsPromptCache,
+  exportSkillSubDocs,
+} from "../im-skills.ts";
 
 let tempRoot: string | null = null;
 
@@ -97,4 +102,24 @@ describe("IM skills prompt rendering", () => {
     expect(prompt).toContain("[ChatCCC IM skill: wechat-skill]");
     expect(exported.length).toBeGreaterThanOrEqual(2);
   });
+
+  it("exports cached prompt helpers used by session startup", async () => {
+    tempRoot = await mkdtemp(join(tmpdir(), "chatccc-im-skills-cache-"));
+    const skillDir = join(tempRoot, "feishu-skill");
+    await mkdir(skillDir);
+    await writeFile(join(skillDir, "skill.md"), "cwd={{cwd}}", "utf-8");
+
+    const input = {
+      skillsDir: tempRoot,
+      variables: { cwd: "C:/first", session_id: "sid_cache" },
+    };
+    const first = await buildImSkillsPromptCached(input);
+    await writeFile(join(skillDir, "skill.md"), "cwd={{cwd}} changed", "utf-8");
+    const cached = await buildImSkillsPromptCached(input);
+    clearImSkillsPromptCache("sid_cache");
+    const refreshed = await buildImSkillsPromptCached(input);
+
+    expect(cached).toBe(first);
+    expect(refreshed).toContain("changed");
+  });
 });

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

@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+
+import { buildPlatformStartupPlan } from "../platform-startup.ts";
+
+describe("buildPlatformStartupPlan", () => {
+  it("starts WeChat iLink without requiring Feishu when Feishu is disabled", () => {
+    expect(buildPlatformStartupPlan({ feishuEnabled: false, ilinkEnabled: true })).toEqual({
+      startFeishu: false,
+      startIlink: true,
+    });
+  });
+
+  it("can start both platforms when both are enabled", () => {
+    expect(buildPlatformStartupPlan({ feishuEnabled: true, ilinkEnabled: true })).toEqual({
+      startFeishu: true,
+      startIlink: true,
+    });
+  });
+});

package/src/im-skills.ts

@@ -70,6 +70,37 @@ export async function buildImSkillsPrompt(input: BuildImSkillsPromptInput): Prom
     .join("\n\n");
 }
 
+// ---------------------------------------------------------------------------
+// 会话级缓存：相同 session_id + cwd 的渲染结果完全相同，避免每轮重复读文件+渲染
+// ---------------------------------------------------------------------------
+
+const promptCache = new Map<string, string>();
+
+function promptCacheKey(input: BuildImSkillsPromptInput): string {
+  const names = input.enabledSkillNames
+    ? [...input.enabledSkillNames].sort().join(",")
+    : "*";
+  const { session_id, cwd } = input.variables;
+  return `${input.skillsDir ?? DEFAULT_IM_SKILLS_DIR}|${names}|${session_id}|${cwd}`;
+}
+
+/** 带会话级缓存的 buildImSkillsPrompt。同 session + 同 cwd 时直接返回缓存的渲染结果。 */
+export async function buildImSkillsPromptCached(input: BuildImSkillsPromptInput): Promise<string> {
+  const key = promptCacheKey(input);
+  const cached = promptCache.get(key);
+  if (cached !== undefined) return cached;
+  const result = await buildImSkillsPrompt(input);
+  promptCache.set(key, result);
+  return result;
+}
+
+/** 清除指定会话的缓存（如 /cd 后 cwd 变了，旧 key 不再需要） */
+export function clearImSkillsPromptCache(sessionId: string): void {
+  for (const key of promptCache.keys()) {
+    if (key.includes(`|${sessionId}|`)) promptCache.delete(key);
+  }
+}
+
 /**
  * 渲染技能目录下的子文档（skill.md 除外）并写入 outputDir。
  * 返回写入的文件路径列表。通常在会话初始化时调用，写入的文档供 Agent 按需读取。

package/src/index.ts

@@ -29,6 +29,7 @@ import WebSocket from "ws";
 
 import { appendStartupTrace, attachRelayWebSocket, ensureSingleInstance, freeRelayListenPort, installCrashLogging, waitForPortFree } from "./shared.ts";
 import { createUiRouter, setExtraApiHandler, setReloadConfigHook, startSetupMode } from "./web-ui.ts";
+import { buildPlatformStartupPlan } from "./platform-startup.ts";
 import { makeTraceId, logTrace } from "./trace.ts";
 import {
   CHATCCC_PORT,
@@ -668,6 +669,36 @@ async function startWechatSupervisor(): Promise<void> {
   console.log("[WX] 微信 iLink 平台已停止。");
 }
 
+async function startConfiguredPlatforms(
+  httpServer: Server,
+  options: { failOnFeishuError: boolean },
+): Promise<void> {
+  const plan = buildPlatformStartupPlan({
+    feishuEnabled: FEISHU_ENABLED,
+    ilinkEnabled: ILINK_ENABLED,
+  });
+
+  if (plan.startFeishu) {
+    try {
+      await startBotService({ httpServer, port: CHATCCC_PORT });
+    } catch (err) {
+      if (options.failOnFeishuError) throw err;
+      console.error(`\n[飞书] 启动失败: ${(err as Error).message}`);
+      console.error("[飞书] 微信等其他平台不受影响，将继续启动。\n");
+    }
+  } else {
+    console.log("[飞书] 平台未启用，跳过飞书启动。");
+  }
+
+  if (plan.startIlink) {
+    startWechatSupervisor().catch((err) =>
+      console.error(`[WX] 微信 supervisor 异常退出: ${(err as Error).message}`),
+    );
+  } else {
+    console.log("[WX] 微信 iLink 未启用，跳过微信启动。");
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Main
 // ---------------------------------------------------------------------------
@@ -784,11 +815,11 @@ async function main(): Promise<void> {
             appIdMaskAfterReload: maskAppId(APP_ID),
           });
           try {
-            await startBotService({ httpServer, port: CHATCCC_PORT });
+            await startConfiguredPlatforms(httpServer, { failOnFeishuError: true });
             installShutdownHandlers(httpServer);
             return { ok: true };
           } catch (err) {
-            appendStartupTrace("setup-activate: startBotService failed", {
+            appendStartupTrace("setup-activate: startConfiguredPlatforms failed", {
               message: (err as Error).message,
             });
             return { ok: false, error: (err as Error).message };
@@ -822,19 +853,7 @@ async function main(): Promise<void> {
     process.exit(1);
   });
 
-  if (FEISHU_ENABLED) {
-    try {
-      await startBotService({ httpServer, port: CHATCCC_PORT });
-    } catch (err) {
-      console.error(`\n[飞书] 启动失败: ${(err as Error).message}`);
-      console.error("[飞书] 微信等其他平台不受影响，将继续启动。\n");
-    }
-  }
-
-  // 启动微信 iLink 平台（后台运行，不阻塞飞书）
-  startWechatSupervisor().catch((err) =>
-    console.error(`[WX] 微信 supervisor 异常退出: ${(err as Error).message}`),
-  );
+  await startConfiguredPlatforms(httpServer, { failOnFeishuError: false });
 
   installShutdownHandlers(httpServer);
 }

package/src/platform-startup.ts

@@ -0,0 +1,16 @@
+export interface PlatformStartupPlanInput {
+  feishuEnabled: boolean;
+  ilinkEnabled: boolean;
+}
+
+export interface PlatformStartupPlan {
+  startFeishu: boolean;
+  startIlink: boolean;
+}
+
+export function buildPlatformStartupPlan(input: PlatformStartupPlanInput): PlatformStartupPlan {
+  return {
+    startFeishu: input.feishuEnabled,
+    startIlink: input.ilinkEnabled,
+  };
+}