chatccc 0.2.137 → 0.2.138

package/config.sample.json

@@ -18,7 +18,7 @@
     "effort": "",
     "apiKey": "",
     "baseUrl": "",
-    "maxTurn": 20
+    "maxTurn": 0
   },
   "cursor": {
     "enabled": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.137",
+  "version": "0.2.138",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@ai-sdk/openai-compatible": "^2.0.47",
-    "@anthropic-ai/claude-agent-sdk": "0.3.153",
+    "@anthropic-ai/claude-agent-sdk": "0.2.133",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@openilink/openilink-sdk-node": "^0.6.0",
     "ai": "^6.0.184",

package/src/__tests__/config-reload.test.ts

@@ -8,10 +8,11 @@ import {
   APP_ID,
   APP_SECRET,
   CHATCCC_PORT,
-  CLAUDE_API_KEY,
-  CLAUDE_BASE_URL,
-  CLAUDE_EFFORT,
-  CLAUDE_MODEL,
+  CLAUDE_API_KEY,
+  CLAUDE_BASE_URL,
+  CLAUDE_EFFORT,
+  CLAUDE_MAX_TURN,
+  CLAUDE_MODEL,
   CLAUDE_SUBAGENT_MODEL,
   CURSOR_AGENT_ARGS,
   CURSOR_AGENT_COMMAND,
@@ -81,7 +82,7 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
     expect(APP_SECRET).toBe("NEW_APP_SECRET");
   });
 
-  it("更新 Claude 配置（model / subagentModel / effort / apiKey / baseUrl）", () => {
+  it("更新 Claude 配置（model / subagentModel / effort / maxTurn / apiKey / baseUrl）", () => {
     applyLoadedConfig({
       ...structuredClone(baseAppConfig),
       claude: {
@@ -89,17 +90,18 @@ describe("applyLoadedConfig — 刷新 export let 常量", () => {
         defaultAgent: true,
         model: "claude-sonnet-4-6",
         subagentModel: "claude-haiku-4-5-20251001",
-        effort: "high",
-        apiKey: "sk-test",
-        baseUrl: "https://api.example.com",
-        maxTurn: 0,
-      },
-    });
-
-    expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");
-    expect(CLAUDE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
-    expect(CLAUDE_EFFORT).toBe("high");
-    expect(CLAUDE_API_KEY).toBe("sk-test");
+        effort: "high",
+        apiKey: "sk-test",
+        baseUrl: "https://api.example.com",
+        maxTurn: 7,
+      },
+    });
+
+    expect(CLAUDE_MODEL).toBe("claude-sonnet-4-6");
+    expect(CLAUDE_SUBAGENT_MODEL).toBe("claude-haiku-4-5-20251001");
+    expect(CLAUDE_EFFORT).toBe("high");
+    expect(CLAUDE_MAX_TURN).toBe(7);
+    expect(CLAUDE_API_KEY).toBe("sk-test");
     expect(CLAUDE_BASE_URL).toBe("https://api.example.com");
   });
 

package/src/adapters/claude-adapter.ts

@@ -5,9 +5,12 @@ import { fileURLToPath } from "node:url";
 
 import {
   getSessionInfo as sdkGetSessionInfo,
-  query,
-  type Options as ClaudeSdkOptions,
+  unstable_v2_createSession,
+  unstable_v2_resumeSession,
   type SDKMessage,
+  type SDKSession,
+  type SDKSessionOptions,
+  type EffortLevel,
 } from "@anthropic-ai/claude-agent-sdk";
 
 import type {
@@ -220,6 +223,17 @@ export function buildClaudePromptText(
   ].join("\n");
 }
 
+type ClaudeSdkSessionOptions = Omit<SDKSessionOptions, "model"> & {
+  model?: string;
+  abortController?: AbortController;
+  autoCompactEnabled?: boolean;
+  effort?: EffortLevel | number;
+  maxTurns?: number;
+  mcpServers?: Record<string, unknown>;
+  skills?: "all";
+  stderr?: (data: string) => void;
+};
+
 function buildSdkOptions(args: {
   cwd: string;
   model: string;
@@ -230,9 +244,8 @@ function buildSdkOptions(args: {
   baseUrl?: string;
   maxTurn: number;
   planMode?: boolean;
-  resume?: string;
   abortController?: AbortController;
-}): ClaudeSdkOptions {
+}): ClaudeSdkSessionOptions {
   const {
     cwd,
     model,
@@ -243,17 +256,16 @@ function buildSdkOptions(args: {
     baseUrl,
     maxTurn,
     planMode,
-    resume,
     abortController,
   } = args;
 
-  const options: ClaudeSdkOptions = {
+  const options: ClaudeSdkSessionOptions = {
     cwd,
     abortController,
     settingSources: ["user", "project", "local"] as SettingSource[],
     permissionMode: planMode ? "plan" : "bypassPermissions",
+    autoCompactEnabled: true,
     maxTurns: maxTurn,
-    maxBudgetUsd: 999999999,
     skills: "all",
     stderr: (data) => {
       const trimmed = data.trim();
@@ -270,10 +282,7 @@ function buildSdkOptions(args: {
     options.model = model;
   }
   if (!isEmpty(effort)) {
-    options.effort = effort as ClaudeSdkOptions["effort"];
-  }
-  if (resume) {
-    options.resume = resume;
+    options.effort = effort as ClaudeSdkSessionOptions["effort"];
   }
 
   const env = buildSdkEnv(subagentModel, apiKey, baseUrl);
@@ -283,7 +292,7 @@ function buildSdkOptions(args: {
 
   const mcpServers = readMcpServersConfig();
   if (mcpServers) {
-    options.mcpServers = mcpServers as ClaudeSdkOptions["mcpServers"];
+    options.mcpServers = mcpServers;
   }
 
   return options;
@@ -307,6 +316,14 @@ function bridgeAbortSignal(
   return () => signal.removeEventListener("abort", onAbort);
 }
 
+function closeSdkSession(session: SDKSession): void {
+  session.close();
+}
+
+function toSdkSessionOptions(options: ClaudeSdkSessionOptions): SDKSessionOptions {
+  return options as SDKSessionOptions;
+}
+
 class ClaudeAdapter implements ToolAdapter {
   readonly displayName = "Claude Code";
   readonly sessionDescPrefix = "Claude Code Session:";
@@ -334,9 +351,8 @@ class ClaudeAdapter implements ToolAdapter {
     logMcpConfig();
     const abortController = new AbortController();
     let sessionId: string | undefined;
-    const stream = query({
-      prompt: "ok",
-      options: buildSdkOptions({
+    const session = unstable_v2_createSession(
+      toSdkSessionOptions(buildSdkOptions({
         cwd,
         model: this.model,
         effort: this.effort,
@@ -346,11 +362,12 @@ class ClaudeAdapter implements ToolAdapter {
         baseUrl: this.baseUrl,
         maxTurn: this.maxTurn,
         abortController,
-      }),
-    });
+      })),
+    );
 
     try {
-      for await (const raw of stream) {
+      await session.send("ok");
+      for await (const raw of session.stream()) {
         const msg = toMessageLike(raw);
         if (msg.session_id && !sessionId) {
           sessionId = msg.session_id;
@@ -363,7 +380,7 @@ class ClaudeAdapter implements ToolAdapter {
         }
       }
     } finally {
-      stream.close();
+      closeSdkSession(session);
     }
 
     if (sessionId) return { sessionId };
@@ -382,9 +399,9 @@ class ClaudeAdapter implements ToolAdapter {
     if (abortController.signal.aborted) return;
     let aborted = false;
 
-    const stream = query({
-      prompt: buildClaudePromptText(userText),
-      options: buildSdkOptions({
+    const session = unstable_v2_resumeSession(
+      sessionId,
+      toSdkSessionOptions(buildSdkOptions({
         cwd,
         model: this.model,
         effort: this.effort,
@@ -394,13 +411,13 @@ class ClaudeAdapter implements ToolAdapter {
         baseUrl: this.baseUrl,
         maxTurn: this.maxTurn,
         planMode: options?.planMode,
-        resume: sessionId,
         abortController,
-      }),
-    });
+      })),
+    );
 
     try {
-      for await (const raw of stream) {
+      await session.send(buildClaudePromptText(userText));
+      for await (const raw of session.stream()) {
         if (abortController.signal.aborted) {
           aborted = true;
           break;
@@ -423,8 +440,8 @@ class ClaudeAdapter implements ToolAdapter {
       removeAbortListener?.();
       if (aborted || abortController.signal.aborted) {
         abortController.abort();
-        stream.close();
       }
+      closeSdkSession(session);
     }
   }
 

package/src/config.ts

@@ -605,8 +605,9 @@ export function applyLoadedConfig(next: AppConfig): void {
   ILINK_REUSE_TOKEN_ON_START = next.platforms.ilink.reuseTokenOnStart ?? true;
   CLAUDE_MODEL = next.claude.model;
   CLAUDE_SUBAGENT_MODEL = next.claude.subagentModel;
-  CLAUDE_EFFORT = next.claude.effort;
-  CLAUDE_API_KEY = next.claude.apiKey;
+  CLAUDE_EFFORT = next.claude.effort;
+  CLAUDE_MAX_TURN = next.claude.maxTurn;
+  CLAUDE_API_KEY = next.claude.apiKey;
   CLAUDE_BASE_URL = next.claude.baseUrl;
   GIT_TIMEOUT_SECONDS = next.gitTimeoutSeconds;
   GIT_TIMEOUT_MS = GIT_TIMEOUT_SECONDS * 1000;