chatccc 0.2.239 → 0.2.240

package/README.md

@@ -210,9 +210,11 @@ chatccc
 
 Claude Code、Cursor 和 Codex 需要对应的本地工具；CCC Agent 内置于 ChatCCC，开箱即用，**模型接入不限于 DeepSeek**——它走 OpenAI 兼容协议，任意兼容端点都可以直接替换（详见下文 CCC Agent）。
 
-#### CCC Agent
-
-CCC Agent 是 ChatCCC 内置的编程 Agent，不需要额外安装 CLI，开箱即用。在首次配置向导或 Web 管理页中启用后，填写 API Key、Base URL 和模型即可使用；它可以设为 `/new` 的默认 Agent，也可以通过 `/new ccc` 显式创建会话。
+#### CCC Agent
+
+CCC Agent 是 ChatCCC 内置的编程 Agent，不需要额外安装 CLI，开箱即用。在首次配置向导或 Web 管理页中启用后，填写 API Key、Base URL 和模型即可使用；它可以设为 `/new` 的默认 Agent，也可以通过 `/new ccc` 显式创建会话。
+
+ChatCCC 会把 `ccc.DEEPSEEK_API_KEY`、`ccc.DEEPSEEK_BASE_URL`、模型和 effort 显式传给内置 Agent；这些配置不会回退读取 `~/.deepccc/config.json`，因此用户无需安装或配置独立的 `deepccc` 包。API Key 为空时 CCC Agent 会自动保持禁用。
 
 **API 支持不限于 DeepSeek。** CCC Agent 底层使用 OpenAI 兼容协议（`@ai-sdk/openai-compatible`），DeepSeek 只是出厂默认端点。`ccc.DEEPSEEK_API_KEY` / `ccc.DEEPSEEK_BASE_URL` 可以指向**任意 OpenAI 兼容服务**，例如：
 

package/package.json

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

package/src/__tests__/config.test.ts

@@ -15,8 +15,23 @@ import {
   autoDetectCursorPath,
   normalizeOptionalConfigField,
   parseGitTimeoutSeconds,
-  readToolCliPath,
-} from "../config-utils.ts";
+  readToolCliPath,
+  resolveCccEnabled,
+} from "../config-utils.ts";
+
+describe("resolveCccEnabled", () => {
+  it("never enables CCC Agent without a ChatCCC API key", () => {
+    expect(resolveCccEnabled(true, "")).toBe(false);
+    expect(resolveCccEnabled(true, "   ")).toBe(false);
+    expect(resolveCccEnabled(undefined, undefined)).toBe(false);
+  });
+
+  it("respects the explicit enabled flag when a ChatCCC API key exists", () => {
+    expect(resolveCccEnabled(undefined, "sk-chatccc")).toBe(true);
+    expect(resolveCccEnabled(true, "sk-chatccc")).toBe(true);
+    expect(resolveCccEnabled(false, "sk-chatccc")).toBe(false);
+  });
+});
 
 describe("parseGitTimeoutSeconds", () => {
   it("returns default when raw is undefined", () => {

package/src/__tests__/session-ccc-config.test.ts

@@ -0,0 +1,45 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const createCccAdapterMock = vi.hoisted(() => vi.fn(() => ({
+  displayName: "CCC Agent",
+  sessionDescPrefix: "CCC Session:",
+  createSession: vi.fn(),
+  prompt: vi.fn(),
+  getSessionInfo: vi.fn(),
+  closeSession: vi.fn(),
+})));
+
+vi.mock("../adapters/ccc-adapter.ts", () => ({
+  createCccAdapter: createCccAdapterMock,
+}));
+
+import { config } from "../config.ts";
+import { _clearAdapterCacheForTest, getAdapterForTool } from "../session.ts";
+
+describe("CCC Agent ChatCCC configuration", () => {
+  const original = { ...config.ccc };
+
+  afterEach(() => {
+    Object.assign(config.ccc, original);
+    _clearAdapterCacheForTest();
+    createCccAdapterMock.mockClear();
+  });
+
+  it("injects ChatCCC credentials and endpoint instead of relying on ~/.deepccc", () => {
+    Object.assign(config.ccc, {
+      DEEPSEEK_API_KEY: "chatccc-api-key",
+      DEEPSEEK_BASE_URL: "https://chatccc.example.com/v1",
+      model: "chatccc-model",
+      effort: "high",
+    });
+
+    getAdapterForTool("ccc");
+
+    expect(createCccAdapterMock).toHaveBeenCalledWith({
+      apiKey: "chatccc-api-key",
+      baseURL: "https://chatccc.example.com/v1",
+      model: "chatccc-model",
+      effort: "high",
+    });
+  });
+});

package/src/adapters/ccc-adapter.ts

@@ -42,8 +42,12 @@ function toChatSessionOptions(
 }
 
 export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
+  if (!options.apiKey?.trim()) {
+    throw new Error("ChatCCC 未配置 CCC Agent API Key。请先填写 ccc.DEEPSEEK_API_KEY 后再启用 CCC Agent。");
+  }
+
   const chatConfig: ChatSessionConfig = {
-    ...(options.apiKey !== undefined ? { apiKey: options.apiKey } : {}),
+    apiKey: options.apiKey,
     ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
     ...(options.model !== undefined ? { model: options.model } : {}),
     ...(options.effort !== undefined ? { effort: options.effort } : {}),

package/src/config-utils.ts

@@ -20,7 +20,7 @@ import { join } from "node:path";
  * - `value` 去除空白后等于 `"default"`（不区分大小写）→ 视作 `""` 并 warn。
  * - 其余情况原样返回（不裁剪两端空白，留给具体调用方决定）。
  */
-export function normalizeOptionalConfigField(
+export function normalizeOptionalConfigField(
   value: unknown,
   options: { label: string; fallback?: string },
 ): string {
@@ -33,8 +33,18 @@ export function normalizeOptionalConfigField(
     );
     return "";
   }
-  return value;
-}
+  return value;
+}
+
+/**
+ * CCC Agent requires credentials owned by ChatCCC. An explicit enabled=true
+ * must not make the agent selectable when that credential is absent.
+ */
+export function resolveCccEnabled(rawEnabled: unknown, apiKey: unknown): boolean {
+  const hasApiKey = typeof apiKey === "string" && apiKey.trim().length > 0;
+  if (!hasApiKey) return false;
+  return typeof rawEnabled === "boolean" ? rawEnabled : true;
+}
 
 // ---------------------------------------------------------------------------
 // /git 超时配置相关

package/src/config.ts

@@ -11,9 +11,10 @@ import {
   anthropicConfigDisplay,
   autoDetectCodexPath,
   autoDetectCursorPath,
-  normalizeOptionalConfigField,
-  readToolCliPath,
-} from "./config-utils.ts";
+  normalizeOptionalConfigField,
+  readToolCliPath,
+  resolveCccEnabled,
+} from "./config-utils.ts";
 
 // 重新导出 config-utils 中的纯函数/常量，保持对外 API 不变
 // （历史上这些符号都从 ./config.ts 导入；新代码可直接从 ./config-utils.ts 导入以避免触发本文件的副作用）
@@ -22,10 +23,11 @@ export {
   MIN_GIT_TIMEOUT_SECONDS,
   MAX_GIT_TIMEOUT_SECONDS,
   parseGitTimeoutSeconds,
-  normalizeOptionalConfigField,
-  isAnthropicConfigEmpty,
-  anthropicConfigDisplay,
-} from "./config-utils.ts";
+  normalizeOptionalConfigField,
+  isAnthropicConfigEmpty,
+  anthropicConfigDisplay,
+  resolveCccEnabled,
+} from "./config-utils.ts";
 export type { ParsedGitTimeout } from "./config-utils.ts";
 
 // ---------------------------------------------------------------------------
@@ -595,13 +597,10 @@ function loadConfig(): AppConfig {
     );
   // 旧版 ccc 配置没有 enabled。只用 API Key 推断启用，避免 sample 中自带的
   // 默认 Base URL / model 让升级用户在未配置凭证时意外启用 CCC Agent。
-  const cccNonEmpty = (): boolean =>
-    Boolean(typeof cccRaw.DEEPSEEK_API_KEY === "string" && cccRaw.DEEPSEEK_API_KEY.trim());
-
-  const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
-  const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
-  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
-  const cccEnabled = resolveEnabled(cccRaw.enabled, cccNonEmpty);
+  const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
+  const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
+  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
+  const cccEnabled = resolveCccEnabled(cccRaw.enabled, cccRaw.DEEPSEEK_API_KEY);
   const chromeDevtoolsPort = Number(chromeDevtoolsRaw.port);
   const explicitDefaultTool: AgentTool | null =
     typeof claude.defaultAgent === "boolean" && claude.defaultAgent && claudeEnabled ? "claude" :

package/src/session.ts

@@ -707,11 +707,13 @@ export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter
       effort: effectiveEffort || undefined,
       fastMode: effectiveFastMode,
     });
-  } else if (tool === "ccc") {
-    adapter = createCccAdapter({
-      model: effectiveModel || undefined,
-      effort: effectiveEffort || undefined,
-    });
+  } else if (tool === "ccc") {
+    adapter = createCccAdapter({
+      apiKey: config.ccc.DEEPSEEK_API_KEY,
+      baseURL: config.ccc.DEEPSEEK_BASE_URL,
+      model: effectiveModel || undefined,
+      effort: effectiveEffort || undefined,
+    });
   } else {
     adapter = createClaudeAdapter({
       model: effectiveModel,