chatccc 0.2.244 → 0.2.246

package/deepccc-agent/src/config.ts

@@ -1,84 +1,101 @@
-import { existsSync, mkdirSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
-export interface DeepCccConfig {
-  apiKey: string;
-  baseURL: string;
-  model: string;
-  /** Reasoning effort（none/minimal/low/medium/high/xhigh/max），留空不传 reasoning_effort */
-  effort: string;
-  rawStreamLogs: {
-    enabled: boolean;
-    maxBytesPerTurn: number;
-    retentionDays: number;
-    keepCompleted: boolean;
-  };
-}
-
-export const DEEPCCC_HOME = join(homedir(), ".deepccc");
-export const RAW_STREAM_LOGS_DIR = join(DEEPCCC_HOME, "raw-stream-logs");
-const CONFIG_PATH = join(DEEPCCC_HOME, "config.json");
-
-const DEFAULT_CONFIG: DeepCccConfig = {
-  apiKey: "",
-  baseURL: "https://api.deepseek.com/v1",
-  model: "deepseek-v4-pro",
-  effort: "",
-  rawStreamLogs: {
-    enabled: false,
-    maxBytesPerTurn: 1024 * 1024,
-    retentionDays: 7,
-    keepCompleted: false,
-  },
-};
-
-function readConfigFile(): Partial<DeepCccConfig> {
-  if (!existsSync(CONFIG_PATH)) return {};
-  const raw = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<DeepCccConfig>;
-  return raw && typeof raw === "object" ? raw : {};
-}
-
-function env(name: string): string | undefined {
-  const value = process.env[name]?.trim();
-  return value ? value : undefined;
-}
-
-function boolEnv(name: string): boolean | undefined {
-  const value = env(name)?.toLowerCase();
-  if (value === undefined) return undefined;
-  if (["1", "true", "yes", "on"].includes(value)) return true;
-  if (["0", "false", "no", "off"].includes(value)) return false;
-  return undefined;
-}
-
-function numberEnv(name: string): number | undefined {
-  const value = Number(env(name));
-  return Number.isFinite(value) && value >= 0 ? value : undefined;
-}
-
-function loadConfig(): DeepCccConfig {
-  const file = readConfigFile();
-  const rawLogs: Partial<DeepCccConfig["rawStreamLogs"]> = file.rawStreamLogs && typeof file.rawStreamLogs === "object"
-    ? file.rawStreamLogs
-    : {};
-
-  return {
-    apiKey: env("DEEPCCC_API_KEY") ?? env("DEEPSEEK_API_KEY") ?? file.apiKey ?? DEFAULT_CONFIG.apiKey,
-    baseURL: env("DEEPCCC_BASE_URL") ?? env("DEEPSEEK_BASE_URL") ?? file.baseURL ?? DEFAULT_CONFIG.baseURL,
-    model: env("DEEPCCC_MODEL") ?? env("DEEPSEEK_MODEL") ?? file.model ?? DEFAULT_CONFIG.model,
-    effort: env("DEEPCCC_EFFORT") ?? env("DEEPSEEK_EFFORT") ?? file.effort ?? DEFAULT_CONFIG.effort,
-    rawStreamLogs: {
-      enabled: boolEnv("DEEPCCC_RAW_STREAM_LOGS") ?? rawLogs.enabled ?? DEFAULT_CONFIG.rawStreamLogs.enabled,
-      maxBytesPerTurn: numberEnv("DEEPCCC_RAW_STREAM_MAX_BYTES") ?? rawLogs.maxBytesPerTurn ?? DEFAULT_CONFIG.rawStreamLogs.maxBytesPerTurn,
-      retentionDays: numberEnv("DEEPCCC_RAW_STREAM_RETENTION_DAYS") ?? rawLogs.retentionDays ?? DEFAULT_CONFIG.rawStreamLogs.retentionDays,
-      keepCompleted: boolEnv("DEEPCCC_RAW_STREAM_KEEP_COMPLETED") ?? rawLogs.keepCompleted ?? DEFAULT_CONFIG.rawStreamLogs.keepCompleted,
-    },
-  };
-}
-
-export function ensureConfigDir(): void {
-  mkdirSync(dirname(CONFIG_PATH), { recursive: true });
-}
-
-export const config = loadConfig();
+import { existsSync, mkdirSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+
+export type DeepCccProvider = "openai" | "anthropic";
+
+export interface DeepCccConfig {
+  /** API protocol/provider. Defaults to OpenAI-compatible. */
+  provider: DeepCccProvider;
+  apiKey: string;
+  baseURL: string;
+  model: string;
+  /** Reasoning effort（none/minimal/low/medium/high/xhigh/max），留空不传 reasoning_effort */
+  effort: string;
+  /** 主对话是否使用流式请求；默认开启 */
+  streaming: boolean;
+  rawStreamLogs: {
+    enabled: boolean;
+    maxBytesPerTurn: number;
+    retentionDays: number;
+    keepCompleted: boolean;
+  };
+}
+
+export const DEEPCCC_HOME = join(homedir(), ".deepccc");
+export const RAW_STREAM_LOGS_DIR = join(DEEPCCC_HOME, "raw-stream-logs");
+const CONFIG_PATH = join(DEEPCCC_HOME, "config.json");
+
+const DEFAULT_CONFIG: DeepCccConfig = {
+  provider: "openai",
+  apiKey: "",
+  baseURL: "https://api.deepseek.com/v1",
+  model: "deepseek-v4-pro",
+  effort: "",
+  streaming: true,
+  rawStreamLogs: {
+    enabled: false,
+    maxBytesPerTurn: 1024 * 1024,
+    retentionDays: 7,
+    keepCompleted: false,
+  },
+};
+
+function readConfigFile(): Partial<DeepCccConfig> {
+  if (!existsSync(CONFIG_PATH)) return {};
+  const raw = JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<DeepCccConfig>;
+  return raw && typeof raw === "object" ? raw : {};
+}
+
+function env(name: string): string | undefined {
+  const value = process.env[name]?.trim();
+  return value ? value : undefined;
+}
+
+function boolEnv(name: string): boolean | undefined {
+  const value = env(name)?.toLowerCase();
+  if (value === undefined) return undefined;
+  if (["1", "true", "yes", "on"].includes(value)) return true;
+  if (["0", "false", "no", "off"].includes(value)) return false;
+  return undefined;
+}
+
+function numberEnv(name: string): number | undefined {
+  const value = Number(env(name));
+  return Number.isFinite(value) && value >= 0 ? value : undefined;
+}
+
+export function normalizeDeepCccProvider(value: unknown): DeepCccProvider {
+  if (value === undefined || value === null || String(value).trim() === "") return "openai";
+  const normalized = String(value).trim().toLowerCase();
+  if (normalized === "openai" || normalized === "anthropic") return normalized;
+  throw new Error(`DEEPCCC_PROVIDER/provider must be "openai" or "anthropic", received: ${String(value)}`);
+}
+
+function loadConfig(): DeepCccConfig {
+  const file = readConfigFile();
+  const rawLogs: Partial<DeepCccConfig["rawStreamLogs"]> = file.rawStreamLogs && typeof file.rawStreamLogs === "object"
+    ? file.rawStreamLogs
+    : {};
+
+  return {
+    provider: normalizeDeepCccProvider(env("DEEPCCC_PROVIDER") ?? file.provider ?? DEFAULT_CONFIG.provider),
+    apiKey: env("DEEPCCC_API_KEY") ?? env("DEEPSEEK_API_KEY") ?? file.apiKey ?? DEFAULT_CONFIG.apiKey,
+    baseURL: env("DEEPCCC_BASE_URL") ?? env("DEEPSEEK_BASE_URL") ?? file.baseURL ?? DEFAULT_CONFIG.baseURL,
+    model: env("DEEPCCC_MODEL") ?? env("DEEPSEEK_MODEL") ?? file.model ?? DEFAULT_CONFIG.model,
+    effort: env("DEEPCCC_EFFORT") ?? env("DEEPSEEK_EFFORT") ?? file.effort ?? DEFAULT_CONFIG.effort,
+    streaming: boolEnv("DEEPCCC_STREAMING") ?? file.streaming ?? DEFAULT_CONFIG.streaming,
+    rawStreamLogs: {
+      enabled: boolEnv("DEEPCCC_RAW_STREAM_LOGS") ?? rawLogs.enabled ?? DEFAULT_CONFIG.rawStreamLogs.enabled,
+      maxBytesPerTurn: numberEnv("DEEPCCC_RAW_STREAM_MAX_BYTES") ?? rawLogs.maxBytesPerTurn ?? DEFAULT_CONFIG.rawStreamLogs.maxBytesPerTurn,
+      retentionDays: numberEnv("DEEPCCC_RAW_STREAM_RETENTION_DAYS") ?? rawLogs.retentionDays ?? DEFAULT_CONFIG.rawStreamLogs.retentionDays,
+      keepCompleted: boolEnv("DEEPCCC_RAW_STREAM_KEEP_COMPLETED") ?? rawLogs.keepCompleted ?? DEFAULT_CONFIG.rawStreamLogs.keepCompleted,
+    },
+  };
+}
+
+export function ensureConfigDir(): void {
+  mkdirSync(dirname(CONFIG_PATH), { recursive: true });
+}
+
+export const config = loadConfig();

package/deepccc-agent/src/index.ts

@@ -5,13 +5,19 @@
  */
 
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
+import { createAnthropic } from "@ai-sdk/anthropic";
 import { generateText, isLoopFinished, stepCountIs, streamText, type TextStreamPart } from "ai";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-import { config as appConfig, RAW_STREAM_LOGS_DIR } from "./config.js";
+import {
+  config as appConfig,
+  normalizeDeepCccProvider,
+  RAW_STREAM_LOGS_DIR,
+  type DeepCccProvider,
+} from "./config.js";
 import {
   createRawStreamLog,
   type RawStreamLogHandle,
@@ -176,8 +182,15 @@ function normalizeMaxSteps(value: number | undefined): number | undefined {
   return value;
 }
 
+function normalizeAnthropicBaseURL(baseURL: string): string {
+  const normalized = baseURL.trim().replace(/\/+$/, "");
+  return normalized.endsWith("/v1") ? normalized : `${normalized}/v1`;
+}
+
 export interface ChatSessionConfig {
-  /** OpenAI-compatible service base URL. Defaults to DEEPCCC_BASE_URL/config. */
+  /** API protocol/provider. Defaults to DEEPCCC_PROVIDER/config, then openai. */
+  provider?: DeepCccProvider;
+  /** Provider service base URL. Defaults to DEEPCCC_BASE_URL/config. */
   baseURL?: string;
   /** API key. Defaults to DEEPCCC_API_KEY/config. */
   apiKey?: string;
@@ -254,6 +267,7 @@ interface ChatMessage {
 
 export class ChatSession {
   private model: any;
+  private provider: DeepCccProvider;
   private cwd: string;
   private context: BuiltinContextManager;
   private compactionTimeoutMs: number;
@@ -278,14 +292,24 @@ export class ChatSession {
 
     const baseURL = overrides.baseURL ?? appConfig.baseURL;
     const modelId = overrides.model ?? appConfig.model;
+    this.provider = normalizeDeepCccProvider(overrides.provider ?? appConfig.provider);
     this.effort = (overrides.effort ?? appConfig.effort ?? "").trim();
 
-    const provider = createOpenAICompatible({
-      name: "deepccc",
-      baseURL,
-      apiKey,
-    });
-    this.model = provider(modelId);
+    if (this.provider === "anthropic") {
+      const provider = createAnthropic({
+        baseURL: normalizeAnthropicBaseURL(baseURL),
+        apiKey,
+      });
+      this.model = provider(modelId);
+    } else {
+      const provider = createOpenAICompatible({
+        name: "deepccc",
+        baseURL,
+        apiKey,
+        includeUsage: true,
+      });
+      this.model = provider(modelId);
+    }
     this.cwd = options.cwd ?? process.cwd();
     this.maxSteps = normalizeMaxSteps(options.maxSteps);
     this.compactionTimeoutMs = Math.max(1, options.compactionTimeoutMs ?? DEFAULT_COMPACTION_TIMEOUT_MS);
@@ -383,7 +407,7 @@ export class ChatSession {
       const skills = await scanSkillsDirs(this.skillDirs);
       const system = this.buildSystemPrompt(skills);
       this.systemPrompt = system;
-      const result = streamText({
+      const generationOptions = {
         model: this.model,
         system,
         messages: this.context.buildModelMessages() as any,
@@ -392,10 +416,19 @@ export class ChatSession {
         abortSignal: signal,
         // DeepSeek OpenAI 兼容接口：providerOptions.deepseek.reasoningEffort
         // 由 @ai-sdk/openai-compatible 自动映射为请求体 reasoning_effort 字段
-        ...(this.effort ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } } : {}),
-      });
+        ...(this.provider === "openai" && this.effort
+          ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } }
+          : {}),
+      };
+      let stream: AsyncIterable<TextStreamPart<any>>;
+      if (appConfig.streaming) {
+        const result = streamText(generationOptions);
+        stream = result.fullStream ?? textStreamToFullStream(result.textStream);
+      } else {
+        const result = await generateText(generationOptions);
+        stream = generateResultToFullStream(result);
+      }
 
-      const stream = result.fullStream ?? textStreamToFullStream(result.textStream);
       for await (const part of stream as AsyncIterable<TextStreamPart<any>>) {
         rawLog?.writeLine(safeRawStreamJson(part));
         if (part.type === "text-delta") {
@@ -560,6 +593,35 @@ async function* textStreamToFullStream(stream: AsyncIterable<string>): AsyncIter
   }
 }
 
+async function* generateResultToFullStream(result: any): AsyncIterable<TextStreamPart<any>> {
+  let emittedText = false;
+  for (const step of result.steps ?? []) {
+    for (const call of step.toolCalls ?? []) {
+      yield {
+        type: "tool-call",
+        toolCallId: call.toolCallId,
+        toolName: call.toolName,
+        input: call.input,
+      } as TextStreamPart<any>;
+    }
+    for (const toolResult of step.toolResults ?? []) {
+      yield {
+        type: "tool-result",
+        toolCallId: toolResult.toolCallId,
+        toolName: toolResult.toolName,
+        output: toolResult.output,
+      } as TextStreamPart<any>;
+    }
+    if (step.text) {
+      emittedText = true;
+      yield { type: "text-delta", text: step.text } as TextStreamPart<any>;
+    }
+  }
+  if (!emittedText && result.text) {
+    yield { type: "text-delta", text: result.text } as TextStreamPart<any>;
+  }
+}
+
 function safeJson(value: unknown): string {
   try {
     return JSON.stringify(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.244",
+  "version": "0.2.246",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
@@ -49,6 +49,7 @@
     "postinstall": "node scripts/postinstall-sharp-check.mjs"
   },
   "dependencies": {
+    "@ai-sdk/anthropic": "^3.0.105",
     "@ai-sdk/openai-compatible": "^2.0.47",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@openilink/openilink-sdk-node": "^0.6.0",