chatccc 0.2.63 → 0.2.64

package/src/adapters/claude-adapter.ts

@@ -86,33 +86,33 @@ function buildSdkEnv(
   baseUrl: string | undefined,
   subagentModel: string | undefined,
 ): Record<string, string | undefined> | undefined {
-  const apiKeyTrim = (apiKey ?? "").trim();
-  const baseUrlTrim = (baseUrl ?? "").trim();
-  const subagentModelTrim = (subagentModel ?? "").trim();
-  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
-  if (!hasApiOverride) return undefined;
-
-  const env: Record<string, string | undefined> = { ...process.env };
-  // ChatCCC's third-party Claude API config is authoritative when present.
-  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
-  delete env.ANTHROPIC_AUTH_TOKEN;
-  delete env.CLAUDE_CODE_OAUTH_TOKEN;
-  delete env.ANTHROPIC_MODEL;
-  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
-  delete env.CLAUDE_CODE_EFFORT_LEVEL;
-
-  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
-  if (baseUrlTrim) {
-    env.ANTHROPIC_BASE_URL = baseUrlTrim;
-  } else {
-    delete env.ANTHROPIC_BASE_URL;
-  }
-  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
-  return env;
-}
+  const apiKeyTrim = (apiKey ?? "").trim();
+  const baseUrlTrim = (baseUrl ?? "").trim();
+  const subagentModelTrim = (subagentModel ?? "").trim();
+  const hasApiOverride = Boolean(apiKeyTrim || baseUrlTrim);
+  if (!hasApiOverride) return undefined;
+
+  const env: Record<string, string | undefined> = { ...process.env };
+  // ChatCCC's third-party Claude API config is authoritative when present.
+  // Remove Claude Code/user settings env that can silently override gateway/auth/model choice.
+  delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.CLAUDE_CODE_OAUTH_TOKEN;
+  delete env.ANTHROPIC_MODEL;
+  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
+  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
+  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+  delete env.CLAUDE_CODE_EFFORT_LEVEL;
+
+  if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
+  if (baseUrlTrim) {
+    env.ANTHROPIC_BASE_URL = baseUrlTrim;
+  } else {
+    delete env.ANTHROPIC_BASE_URL;
+  }
+  if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
+  return env;
+}
 
 function resolveSettingSources(
   _apiKey: string | undefined,
@@ -291,19 +291,19 @@ class ClaudeAdapter implements ToolAdapter {
       this.baseUrl,
       this.subagentModel,
     );
-    const session = unstable_v2_resumeSession(
-      sessionId,
-      sessionOpts as any,
-    );
-
-    if (signal?.aborted) {
-      session.close();
-      return;
-    }
-    const onAbort = () => { session.close(); };
-    signal?.addEventListener("abort", onAbort, { once: true });
-
-    await session.send(userText);
+    const session = unstable_v2_resumeSession(
+      sessionId,
+      sessionOpts as any,
+    );
+
+    if (signal?.aborted) {
+      session.close();
+      return;
+    }
+    const onAbort = () => { session.close(); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+
+    await session.send(userText);
 
     const stream = session.stream();
 

package/src/agent-file-rpc.ts

@@ -7,6 +7,7 @@ import { ts } from "./config.ts";
 import { readUtf8JsonBody } from "./agent-rpc-body.ts";
 import { getAdapterForTool } from "./session.ts";
 import { getChatsForSession } from "./session-chat-binding.ts";
+import { splitFeishuTargetChats } from "./agent-platform-routing.ts";
 
 export const AGENT_SEND_FILE_PATH = "/api/agent/send-file";
 
@@ -102,11 +103,25 @@ export async function handleAgentFileRequest(
     return true;
   }
 
+  const { getPlatformForChat } = await import("./session.ts");
+  const { targetChatIds, skippedUnsupported } = splitFeishuTargetChats(
+    chatIds,
+    (cid) => getPlatformForChat(cid)?.kind,
+  );
+  if (targetChatIds.length === 0) {
+    jsonReply(res, 409, {
+      ok: false,
+      error: "This endpoint only sends to Feishu chats. The bound chats are WeChat chats; use the WeChat file or video helper script instead.",
+      skippedUnsupported,
+    });
+    return true;
+  }
+
   try {
     const token = await getTenantAccessToken();
     const caption = typeof payload.caption === "string" ? payload.caption.trim() : "";
     let sentCount = 0;
-    for (const cid of chatIds) {
+    for (const cid of targetChatIds) {
       try {
         await sendFileReply(token, cid, filePath);
         if (caption) await sendTextReply(token, cid, caption);
@@ -115,8 +130,8 @@ export async function handleAgentFileRequest(
         console.error(`[${ts()}] [AGENT-FILE] send to ${cid} failed: ${(err as Error).message}`);
       }
     }
-    console.log(`[${ts()}] [AGENT-FILE] sent file to ${sentCount}/${chatIds.length} chats, session=${sessionId} path=${filePath}`);
-    jsonReply(res, 200, { ok: true, sentTo: sentCount, total: chatIds.length });
+    console.log(`[${ts()}] [AGENT-FILE] sent file to ${sentCount}/${targetChatIds.length} Feishu chats, session=${sessionId} path=${filePath} skippedUnsupported=${skippedUnsupported.length}`);
+    jsonReply(res, 200, { ok: true, sentTo: sentCount, total: targetChatIds.length, skippedUnsupported });
   } catch (err) {
     console.error(`[${ts()}] [AGENT-FILE] send failed: ${(err as Error).message}`);
     jsonReply(res, 500, { ok: false, error: (err as Error).message });
@@ -154,4 +169,4 @@ export function buildAgentFileCapabilityPrompt(input: {
     lines.splice(2, 0, `Current working directory: ${input.cwd}`);
   }
   return lines.join("\n");
-}
+}

package/src/agent-image-rpc.ts

@@ -7,6 +7,7 @@ import { ts } from "./config.ts";
 import { readUtf8JsonBody } from "./agent-rpc-body.ts";
 import { getAdapterForTool } from "./session.ts";
 import { getChatsForSession } from "./session-chat-binding.ts";
+import { splitFeishuTargetChats } from "./agent-platform-routing.ts";
 
 export const AGENT_SEND_IMAGE_PATH = "/api/agent/send-image";
 
@@ -99,11 +100,25 @@ export async function handleAgentImageRequest(
     return true;
   }
 
+  const { getPlatformForChat } = await import("./session.ts");
+  const { targetChatIds, skippedUnsupported } = splitFeishuTargetChats(
+    chatIds,
+    (cid) => getPlatformForChat(cid)?.kind,
+  );
+  if (targetChatIds.length === 0) {
+    jsonReply(res, 409, {
+      ok: false,
+      error: "This endpoint only sends to Feishu chats. The bound chats are WeChat chats; use the WeChat image helper script instead.",
+      skippedUnsupported,
+    });
+    return true;
+  }
+
   try {
     const token = await getTenantAccessToken();
     const caption = typeof payload.caption === "string" ? payload.caption.trim() : "";
     let sentCount = 0;
-    for (const cid of chatIds) {
+    for (const cid of targetChatIds) {
       try {
         await sendImageReply(token, cid, imagePath);
         if (caption) await sendTextReply(token, cid, caption);
@@ -112,8 +127,8 @@ export async function handleAgentImageRequest(
         console.error(`[${ts()}] [AGENT-IMAGE] send to ${cid} failed: ${(err as Error).message}`);
       }
     }
-    console.log(`[${ts()}] [AGENT-IMAGE] sent image to ${sentCount}/${chatIds.length} chats, session=${sessionId} path=${imagePath}`);
-    jsonReply(res, 200, { ok: true, sentTo: sentCount, total: chatIds.length });
+    console.log(`[${ts()}] [AGENT-IMAGE] sent image to ${sentCount}/${targetChatIds.length} Feishu chats, session=${sessionId} path=${imagePath} skippedUnsupported=${skippedUnsupported.length}`);
+    jsonReply(res, 200, { ok: true, sentTo: sentCount, total: targetChatIds.length, skippedUnsupported });
   } catch (err) {
     console.error(`[${ts()}] [AGENT-IMAGE] send failed: ${(err as Error).message}`);
     jsonReply(res, 500, { ok: false, error: (err as Error).message });
@@ -150,4 +165,4 @@ export function buildAgentImageCapabilityPrompt(input: {
     lines.splice(2, 0, `Current working directory: ${input.cwd}`);
   }
   return lines.join("\n");
-}
+}

package/src/agent-platform-routing.ts

@@ -0,0 +1,28 @@
+export interface SkippedUnsupportedChat {
+  chatId: string;
+  platformKind: string;
+}
+
+export interface FeishuTargetSplit {
+  targetChatIds: string[];
+  skippedUnsupported: SkippedUnsupportedChat[];
+}
+
+export function splitFeishuTargetChats(
+  chatIds: readonly string[],
+  getPlatformKind: (chatId: string) => string | undefined,
+): FeishuTargetSplit {
+  const targetChatIds: string[] = [];
+  const skippedUnsupported: SkippedUnsupportedChat[] = [];
+
+  for (const chatId of chatIds) {
+    const platformKind = getPlatformKind(chatId);
+    if (platformKind === "wechat") {
+      skippedUnsupported.push({ chatId, platformKind });
+      continue;
+    }
+    targetChatIds.push(chatId);
+  }
+
+  return { targetChatIds, skippedUnsupported };
+}

package/src/config.ts

@@ -5,8 +5,6 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { appendFile, cp, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 
-import { Domain } from "@larksuiteoapi/node-sdk";
-
 import { printServiceDidNotStart } from "./exit-banner.ts";
 import { appendStartupTrace, setupFileLogging } from "./shared.ts";
 import {
@@ -92,25 +90,9 @@ export interface CodexConfig {
   effort: string;
 }
 
-export type FeishuDomain = "feishu" | "lark";
-
 export interface FeishuConfig {
   appId: string;
   appSecret: string;
-  /** "feishu" (默认) → https://open.feishu.cn, "lark" → https://open.larksuite.com */
-  domain?: FeishuDomain;
-}
-
-/** 用户配置的 domain 字符串 → SDK Domain 枚举 */
-export function feishuDomainToSdkDomain(domain?: FeishuDomain): Domain {
-  return domain === "lark" ? Domain.Lark : Domain.Feishu;
-}
-
-/** 用户配置的 domain 字符串 → REST API base URL */
-export function feishuDomainToBaseUrl(domain?: FeishuDomain): string {
-  return domain === "lark"
-    ? "https://open.larksuite.com/open-apis"
-    : "https://open.feishu.cn/open-apis";
 }
 
 export interface PlatformConfig {
@@ -316,7 +298,7 @@ function autofillToolPathsAfterSampleCopy(configFile: string): void {
 
 function loadConfig(): AppConfig {
   const defaults: AppConfig = {
-    feishu: { appId: "", appSecret: "", domain: "feishu" },
+    feishu: { appId: "", appSecret: "" },
     platforms: { feishu: { enabled: true }, ilink: { enabled: true } },
     port: 18080,
     gitTimeoutSeconds: 180,
@@ -376,8 +358,6 @@ function loadConfig(): AppConfig {
   }
 
   const feishu = parsed.feishu ?? { appId: "", appSecret: "" };
-  const feishuDomain: FeishuDomain =
-    (feishu as { domain?: unknown }).domain === "lark" ? "lark" : "feishu";
   const claude = parsed.claude ?? {} as Partial<ClaudeConfig>;
   const cursorRaw = (parsed.cursor ?? {}) as NonNullable<typeof parsed.cursor>;
   const codexRaw = (parsed.codex ?? {}) as NonNullable<typeof parsed.codex>;
@@ -440,7 +420,6 @@ function loadConfig(): AppConfig {
     feishu: {
       appId: feishu.appId ?? "",
       appSecret: feishu.appSecret ?? "",
-      domain: feishuDomain,
     },
     platforms: {
       feishu: {
@@ -518,7 +497,7 @@ export let APP_SECRET = config.feishu.appSecret;
 export let FEISHU_ENABLED = config.platforms.feishu.enabled;
 export let ILINK_ENABLED = config.platforms.ilink.enabled;
 export let ILINK_REUSE_TOKEN_ON_START = config.platforms.ilink.reuseTokenOnStart ?? true;
-export let BASE_URL = feishuDomainToBaseUrl(config.feishu.domain);
+export const BASE_URL = "https://open.feishu.cn/open-apis";
 export const CHATCCC_PORT = config.port;
 
 /** 与 CHATCCC_PORT 一致，供 --local 连接本机中继 */
@@ -597,7 +576,6 @@ export function applyLoadedConfig(next: AppConfig): void {
 
   APP_ID = next.feishu.appId;
   APP_SECRET = next.feishu.appSecret;
-  BASE_URL = feishuDomainToBaseUrl(next.feishu.domain);
   FEISHU_ENABLED = next.platforms.feishu.enabled;
   ILINK_ENABLED = next.platforms.ilink.enabled;
   ILINK_REUSE_TOKEN_ON_START = next.platforms.ilink.reuseTokenOnStart ?? true;

package/src/im-skills.ts

@@ -11,6 +11,7 @@ export interface ImSkillVariableMap {
 
 export interface BuildImSkillsPromptInput {
   skillsDir?: string;
+  enabledSkillNames?: readonly string[];
   variables: ImSkillVariableMap;
 }
 
@@ -52,8 +53,12 @@ async function loadSkillDocs(skillsDir: string): Promise<ImSkillDoc[]> {
 
 export async function buildImSkillsPrompt(input: BuildImSkillsPromptInput): Promise<string> {
   const skillsDir = input.skillsDir ?? DEFAULT_IM_SKILLS_DIR;
+  const enabledSkillNames = input.enabledSkillNames
+    ? new Set(input.enabledSkillNames)
+    : null;
   const docs = await loadSkillDocs(skillsDir);
   return docs
+    .filter((doc) => !enabledSkillNames || enabledSkillNames.has(doc.name))
     .map((doc) => {
       const rendered = renderTemplate(doc.content, input.variables).trim();
       return [
@@ -74,6 +79,9 @@ export async function exportSkillSubDocs(
   outputDir: string,
 ): Promise<string[]> {
   const skillsDir = input.skillsDir ?? DEFAULT_IM_SKILLS_DIR;
+  const enabledSkillNames = input.enabledSkillNames
+    ? new Set(input.enabledSkillNames)
+    : null;
   const files: string[] = [];
 
   let entries;
@@ -85,6 +93,7 @@ export async function exportSkillSubDocs(
 
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
+    if (enabledSkillNames && !enabledSkillNames.has(entry.name)) continue;
     const skillPath = join(skillsDir, entry.name);
 
     let subFiles;

package/src/index.ts

@@ -24,7 +24,7 @@
 
 import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http";
 
-import { WSClient, EventDispatcher, Domain } from "@larksuiteoapi/node-sdk";
+import { WSClient, EventDispatcher } from "@larksuiteoapi/node-sdk";
 import WebSocket from "ws";
 
 import { appendStartupTrace, attachRelayWebSocket, ensureSingleInstance, freeRelayListenPort, installCrashLogging, waitForPortFree } from "./shared.ts";
@@ -50,8 +50,6 @@ import {
   maskAppId,
   resolveDefaultAgentTool,
   toolDisplayName,
-  config,
-  feishuDomainToSdkDomain,
   ts,
 } from "./config.ts";
 import { printServiceDidNotStart, printServiceRunningHint } from "./exit-banner.ts";
@@ -215,7 +213,15 @@ async function formatMessageContent(message: { message_id?: string; message_type
     return `[视频] message_id=${messageId} file_key=${fileKey} file_name=${fileName}`;
   }
 
-  // 其他类型（file, audio, sticker）直接给原始 JSON
+  if (message.message_type === "file") {
+    const fileKey = content.file_key as string | undefined;
+    const fileName = (content.file_name as string) || "download.bin";
+    const messageId = message.message_id;
+    if (!fileKey || !messageId) return contentStr;
+    return `[文件] message_id=${messageId} file_key=${fileKey} file_name=${fileName}`;
+  }
+
+  // 其他类型（audio, sticker 等）直接给原始 JSON
   return contentStr;
 }
 
@@ -405,7 +411,7 @@ async function startBotServiceCore(): Promise<void> {
     console.error(`  接口: POST ${BASE_URL}/auth/v3/tenant_access_token/internal`);
     console.error("  常见原因:");
     console.error(
-      `    - 本机网络无法访问 ${new URL(BASE_URL).hostname}（可尝试：关闭系统/终端代理、检查防火墙；Windows 可管理员运行 netsh winsock reset 后重启）`,
+      "    - 本机网络无法访问 open.feishu.cn（可尝试：关闭系统/终端代理、检查防火墙；Windows 可管理员运行 netsh winsock reset 后重启）",
     );
     console.error("    - App ID / App Secret 与开放平台「凭证与基础信息」不一致");
     console.error("    - 自建应用尚未创建/发布可用版本");
@@ -596,7 +602,6 @@ async function startBotServiceCore(): Promise<void> {
     const wsClient = new WSClient({
       appId: APP_ID,
       appSecret: APP_SECRET,
-      domain: feishuDomainToSdkDomain(config.feishu.domain),
       onReady: async () => {
         await rebuildBindingsFromRegistry().catch((err) =>
           console.error(`[${ts()}] [SDK READY] rebuild bindings failed: ${(err as Error).message}`)

package/src/privacy.ts

@@ -1,68 +1,68 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { USER_DATA_DIR } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// 隐私替换规则
-// ---------------------------------------------------------------------------
-
-interface PrivacyRules {
-  [key: string]: string;
-}
-
-let rules: PrivacyRules | null = null;
-let loaded = false;
-
-function loadRules(): PrivacyRules {
-  const filePath = join(USER_DATA_DIR, "privacy.json");
-  if (!existsSync(filePath)) {
-    return {};
-  }
-  try {
-    const raw = readFileSync(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      console.error(`[PRIVACY] privacy.json 格式错误：应为对象`);
-      return {};
-    }
-    for (const [k, v] of Object.entries(parsed)) {
-      if (typeof v !== "string") {
-        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
-        delete (parsed as Record<string, unknown>)[k];
-      }
-    }
-    return parsed as PrivacyRules;
-  } catch (err) {
-    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
-    return {};
-  }
-}
-
-export function getPrivacyRules(): PrivacyRules {
-  if (!loaded) {
-    rules = loadRules();
-    loaded = true;
-  }
-  return rules!;
-}
-
-/** 重新加载规则（热更新用） */
-export function reloadPrivacyRules(): void {
-  loaded = false;
-  rules = null;
-}
-
-/**
- * 对文本应用隐私替换规则。
- * 若无规则或文本为空，直接返回原文。
- */
-export function applyPrivacy(text: string): string {
-  const r = getPrivacyRules();
-  if (Object.keys(r).length === 0 || !text) return text;
-  let result = text;
-  for (const [from, to] of Object.entries(r)) {
-    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
-    result = result.split(from).join(to);
-  }
-  return result;
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { USER_DATA_DIR } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// 隐私替换规则
+// ---------------------------------------------------------------------------
+
+interface PrivacyRules {
+  [key: string]: string;
+}
+
+let rules: PrivacyRules | null = null;
+let loaded = false;
+
+function loadRules(): PrivacyRules {
+  const filePath = join(USER_DATA_DIR, "privacy.json");
+  if (!existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+      console.error(`[PRIVACY] privacy.json 格式错误：应为对象`);
+      return {};
+    }
+    for (const [k, v] of Object.entries(parsed)) {
+      if (typeof v !== "string") {
+        console.error(`[PRIVACY] privacy.json 值必须为字符串，跳过 "${k}"`);
+        delete (parsed as Record<string, unknown>)[k];
+      }
+    }
+    return parsed as PrivacyRules;
+  } catch (err) {
+    console.error(`[PRIVACY] 读取 privacy.json 失败: ${(err as Error).message}`);
+    return {};
+  }
+}
+
+export function getPrivacyRules(): PrivacyRules {
+  if (!loaded) {
+    rules = loadRules();
+    loaded = true;
+  }
+  return rules!;
+}
+
+/** 重新加载规则（热更新用） */
+export function reloadPrivacyRules(): void {
+  loaded = false;
+  rules = null;
+}
+
+/**
+ * 对文本应用隐私替换规则。
+ * 若无规则或文本为空，直接返回原文。
+ */
+export function applyPrivacy(text: string): string {
+  const r = getPrivacyRules();
+  if (Object.keys(r).length === 0 || !text) return text;
+  let result = text;
+  for (const [from, to] of Object.entries(r)) {
+    // 用 split+join 替代 replaceAll，避免正则特殊字符问题
+    result = result.split(from).join(to);
+  }
+  return result;
 }

package/src/session.ts

@@ -92,6 +92,17 @@ export function _getPlatformForChatForTest(chatId: string): PlatformAdapter | nu
   return platformForChat(chatId);
 }
 
+export function getPlatformForChat(chatId: string): PlatformAdapter | null {
+  return platformForChat(chatId);
+}
+
+function imSkillNamesForPlatform(platform: PlatformAdapter): string[] {
+  if (platform.kind === "wechat") {
+    return ["wechat-image-skill", "wechat-file-skill", "wechat-video-skill"];
+  }
+  return ["feishu-skill"];
+}
+
 export let sessionGen = 0;
 /** @deprecated 使用 activePrompts (session-chat-binding.ts) + displayCards 替代 */
 export const chatSessionMap = new Map<string, {
@@ -722,8 +733,9 @@ export async function runAgentSession(
       wechat_send_file_script: join(wechatFileSkillDir, "send-file.mjs"),
       wechat_send_video_script: join(wechatVideoSkillDir, "send-video.mjs"),
     };
-    var imSkillsPrompt = await buildImSkillsPrompt({ variables: skillVariables });
-    await exportSkillSubDocs({ variables: skillVariables }, imSkillsCacheDir);
+    const enabledSkillNames = imSkillNamesForPlatform(platform);
+    var imSkillsPrompt = await buildImSkillsPrompt({ variables: skillVariables, enabledSkillNames });
+    await exportSkillSubDocs({ variables: skillVariables, enabledSkillNames }, imSkillsCacheDir);
     var userTextWithCapabilities = [
       ...(imSkillsPrompt ? [imSkillsPrompt, ""] : []),
       "[User message]",