chatccc 0.2.111 → 0.2.113

package/package.json

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

package/src/adapters/claude-adapter.ts

@@ -8,8 +8,9 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { createInterface } from "node:readline";
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { join, dirname } from "node:path";
 import { homedir } from "node:os";
+import { createRequire } from "node:module";
 
 import type {
   ToolAdapter,
@@ -19,7 +20,6 @@ import type {
   SessionInfo,
   ToolPromptOptions,
 } from "./adapter-interface.ts";
-import { PROJECT_ROOT } from "../config.ts";
 import { killProcessTree } from "./proc-tree-kill.ts";
 import {
   defaultClaudeSessionMetaStore,
@@ -30,13 +30,48 @@ import {
 // 常量
 // ---------------------------------------------------------------------------
 
-const CLAUDE_EXE = join(
-  PROJECT_ROOT,
-  "node_modules",
-  "@anthropic-ai",
-  "claude-agent-sdk-win32-x64",
-  "claude.exe",
-);
+/** 根据当前平台动态解析 claude-agent-sdk 二进制路径 */
+function resolveClaudeBinary(): string {
+  const platform = process.platform; // 'win32', 'linux', 'darwin'
+  const arch = process.arch;         // 'x64', 'arm64'
+
+  // 通过 Node 模块解析找到 SDK 主包目录，确保测试和生产环境一致
+  const _require = createRequire(import.meta.url);
+  const sdkMainDir = dirname(_require.resolve("@anthropic-ai/claude-agent-sdk"));
+
+  // 读取 manifest.json 获取各平台二进制文件名
+  let platforms: Record<string, { binary: string }> | null = null;
+  try {
+    const manifest = JSON.parse(
+      readFileSync(join(sdkMainDir, "manifest.json"), "utf-8"),
+    ) as { platforms?: Record<string, { binary: string }> };
+    platforms = manifest.platforms ?? null;
+  } catch { /* manifest 缺失时用默认规则推断 */ }
+
+  // Linux 上需区分 musl / glibc，先检测 musl 变体
+  const candidates: string[] = [];
+  if (platform === "linux") {
+    candidates.push(`${platform}-${arch}-musl`, `${platform}-${arch}`);
+  } else {
+    candidates.push(`${platform}-${arch}`);
+  }
+
+  for (const triple of candidates) {
+    const binaryName = platforms?.[triple]?.binary
+      ?? (platform === "win32" ? "claude.exe" : "claude");
+    const pkgDir = join(sdkMainDir, "..", `claude-agent-sdk-${triple}`);
+    if (!existsSync(pkgDir)) continue;
+    const exePath = join(pkgDir, binaryName);
+    if (existsSync(exePath)) return exePath;
+  }
+
+  throw new Error(
+    `No Claude CLI binary found for platform ${platform}-${arch}. ` +
+    `Tried: ${candidates.map((c) => `@anthropic-ai/claude-agent-sdk-${c}`).join(", ")}`,
+  );
+}
+
+const CLAUDE_EXE = resolveClaudeBinary();
 
 // ---------------------------------------------------------------------------
 // 类型别名（CLI JSONL 消息格式，与旧 SDK 消息格式兼容）

package/src/agent-file-rpc.ts

@@ -3,7 +3,7 @@ import { extname, isAbsolute, resolve } from "node:path";
 import { stat } from "node:fs/promises";
 
 import { getTenantAccessToken, sendFileReply, sendTextReply } from "./feishu-platform.ts";
-import { ts } from "./config.ts";
+import { ts, resolveDefaultAgentTool } from "./config.ts";
 import { readUtf8JsonBody } from "./agent-rpc-body.ts";
 import { getAdapterForTool } from "./session.ts";
 import { getChatsForSession } from "./session-chat-binding.ts";
@@ -77,7 +77,7 @@ export async function handleAgentFileRequest(
   try {
     const { getSessionTool } = await import("./session.ts");
     const tool = await getSessionTool(sessionId);
-    const adapter = getAdapterForTool(tool ?? "claude");
+    const adapter = getAdapterForTool(tool ?? resolveDefaultAgentTool());
     const info = await adapter.getSessionInfo(sessionId);
     if (!info?.cwd) {
       jsonReply(res, 400, { ok: false, error: "Cannot determine cwd for session" });

package/src/agent-image-rpc.ts

@@ -3,7 +3,7 @@ import { extname, isAbsolute, resolve } from "node:path";
 import { stat } from "node:fs/promises";
 
 import { getTenantAccessToken, sendImageReply, sendTextReply } from "./feishu-platform.ts";
-import { ts } from "./config.ts";
+import { ts, resolveDefaultAgentTool } from "./config.ts";
 import { readUtf8JsonBody } from "./agent-rpc-body.ts";
 import { getAdapterForTool } from "./session.ts";
 import { getChatsForSession } from "./session-chat-binding.ts";
@@ -73,7 +73,7 @@ export async function handleAgentImageRequest(
   try {
     const { getSessionTool } = await import("./session.ts");
     const tool = await getSessionTool(sessionId);
-    const adapter = getAdapterForTool(tool ?? "claude");
+    const adapter = getAdapterForTool(tool ?? resolveDefaultAgentTool());
     const info = await adapter.getSessionInfo(sessionId);
     if (!info?.cwd) {
       jsonReply(res, 400, { ok: false, error: "Cannot determine cwd for session" });

package/src/feishu-api.ts

@@ -14,6 +14,8 @@ import {
   CURSOR_SESSION_PREFIX,
   CODEX_SESSION_PREFIX,
   ts,
+  resolveDefaultAgentTool,
+  toolDisplayName,
 } from "./config.ts";
 import { applyPrivacy } from "./privacy.ts";
 import { buildHelpCard } from "./cards.ts";
@@ -950,7 +952,10 @@ export async function sendRestartCard(token: string): Promise<void> {
 
     console.log(`[${ts()}] [RESTART] Latest active chat: ${latestChatId} (mtime=${new Date(latestTime).toISOString()})`);
 
-    const restartCard = buildHelpCard("", { greeting: "Bot 已启动完成，可以继续使用。" });
+    const restartCard = buildHelpCard("", {
+      greeting: "Bot 已启动完成，可以继续使用。",
+      defaultToolLabel: toolDisplayName(resolveDefaultAgentTool()),
+    });
     await fetch(`${BASE_URL}/im/v1/messages?receive_id_type=chat_id`, {
       method: "POST",
       headers: {