chatccc 0.2.137 → 0.2.139

package/README.md

@@ -311,12 +311,6 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `/sessions` | 查看所有会话状态 |
 | `/git <子命令>` | 在当前会话工作目录执行 `git ...` 并回传输出 |
 | `/restart` | 重启机器人进程 |
-| `/plan [内容]` | 以 plan 模式传递给 Agent，**不跳过权限检查**（无 `--dangerously-skip-permissions`） |
-| `/ask [内容]` | 以 plan 模式传递给 Agent，**不跳过权限检查**（同 `/plan`） |
-
-> **`/plan` 与 `/ask`**：这两个指令不会被 ChatCCC 当作内置命令处理，而是把用户原话（含指令前缀）完整传给 Agent。与普通消息的区别是：调用时不添加 `--dangerously-skip-permissions`，改为 `--permission-mode plan`，Agent 会先在权限沙盒内运行，遇到命令执行等操作时需要确认。适合需要安全审查的任务场景。
->
-> **群名**：`/plan` / `/ask` 消息如果是群内第一条消息，也会触发群名更新。为美观起见，群名会自动去除 `/plan` 或 `/ask` 前缀。
 
 > **模型切换**：`/model` 查看可选模型清单，`/model <名称>` 模糊匹配切换，`/model clear` 恢复默认。当前仅 Claude Code 支持模型切换（需同时填写 `claude.model` 和 `claude.subagentModel`），Cursor / Codex 切换正在开发中。
 

package/agent-prompts/claude_specific.md

@@ -50,6 +50,4 @@ Never execute the same successful shell command three times for the same task in
 
 If the same command has already succeeded twice in a row, the next assistant action must be a final response to the user, not another tool call.
 
-Successful repeated command execution is a terminal condition. Prefer a concise final response over further tool calls.
-
-如果计划写好了等待你的审阅，将计划文件通过当前聊天软件发给用户
+Successful repeated command execution is a terminal condition. Prefer a concise final response over further tool calls.

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.139",
   "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/adapter-interface.ts

@@ -128,8 +128,6 @@ export interface ToolPromptOptions {
   onProcessStart?: (info: ToolProcessInfo) => void;
   /** Called when the adapter leaves the prompt process scope normally or by abort. */
   onProcessExit?: (info: ToolProcessInfo) => void;
-  /** 是否为 /plan 或 /ask 模式：不开启 dangerous skip permissions */
-  planMode?: boolean;
 }
 
 // ---------------------------------------------------------------------------

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;
@@ -229,10 +243,8 @@ function buildSdkOptions(args: {
   apiKey?: string;
   baseUrl?: string;
   maxTurn: number;
-  planMode?: boolean;
-  resume?: string;
   abortController?: AbortController;
-}): ClaudeSdkOptions {
+}): ClaudeSdkSessionOptions {
   const {
     cwd,
     model,
@@ -242,18 +254,16 @@ function buildSdkOptions(args: {
     apiKey,
     baseUrl,
     maxTurn,
-    planMode,
-    resume,
     abortController,
   } = args;
 
-  const options: ClaudeSdkOptions = {
+  const options: ClaudeSdkSessionOptions = {
     cwd,
     abortController,
     settingSources: ["user", "project", "local"] as SettingSource[],
-    permissionMode: planMode ? "plan" : "bypassPermissions",
+    permissionMode: "bypassPermissions",
+    autoCompactEnabled: true,
     maxTurns: maxTurn,
-    maxBudgetUsd: 999999999,
     skills: "all",
     stderr: (data) => {
       const trimmed = data.trim();
@@ -263,17 +273,12 @@ function buildSdkOptions(args: {
     },
   };
 
-  if (!planMode) {
-    options.allowDangerouslySkipPermissions = true;
-  }
+  options.allowDangerouslySkipPermissions = true;
   if (!isEmpty(model)) {
     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 +288,7 @@ function buildSdkOptions(args: {
 
   const mcpServers = readMcpServersConfig();
   if (mcpServers) {
-    options.mcpServers = mcpServers as ClaudeSdkOptions["mcpServers"];
+    options.mcpServers = mcpServers;
   }
 
   return options;
@@ -307,6 +312,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 +347,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 +358,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 +376,7 @@ class ClaudeAdapter implements ToolAdapter {
         }
       }
     } finally {
-      stream.close();
+      closeSdkSession(session);
     }
 
     if (sessionId) return { sessionId };
@@ -382,9 +395,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,
@@ -393,14 +406,13 @@ class ClaudeAdapter implements ToolAdapter {
         apiKey: this.apiKey,
         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 +435,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;

package/src/orchestrator.ts

@@ -94,21 +94,6 @@ export function sessionChatName(left: string, cwd: string): string {
   return `${left}-${cwdDisplayName(cwd)}`;
 }
 
-/** 判断用户消息是否以 /plan 或 /ask 开头（忽略大小写和尾部空格） */
-function isPlanOrAsk(text: string): boolean {
-  const t = text.toLowerCase().trim();
-  return t === "/plan" || t.startsWith("/plan ") || t === "/ask" || t.startsWith("/ask ");
-}
-
-/** 剥离 /plan 或 /ask 前缀，用于群名等展示场景 */
-function stripPlanOrAskPrefix(text: string): string {
-  if (isPlanOrAsk(text)) {
-    const match = text.match(/^\/(?:plan|ask)\s*(.*)/i);
-    return (match?.[1] ?? "").trim() || text.trim();
-  }
-  return text;
-}
-
 /** 模型模糊匹配：精确匹配优先，否则找子串匹配（模型名越短越优先） */
 function findModelMatch(input: string, models: string[]): string | null {
   if (models.length === 0) return null;
@@ -134,7 +119,7 @@ function shouldSendWechatProcessingAck(
   chatType: string,
   text: string,
 ): boolean {
-  return platform.kind === "wechat" && chatType === "p2p" && (!textLower.startsWith("/") || isPlanOrAsk(text));
+  return platform.kind === "wechat" && chatType === "p2p" && !textLower.startsWith("/");
 }
 
 function isNonWechatP2p(platform: PlatformAdapter, chatType: string): boolean {
@@ -616,10 +601,10 @@ export async function handleCommand(
     if (
       chatType !== "p2p" &&
       isUntitledSessionChatName(chatInfo!.name) &&
-      (!textLower.startsWith("/") || isPlanOrAsk(text))
+      !textLower.startsWith("/")
     ) {
       const MAX_PREFIX = 10;
-      const prefix = stripPlanOrAskPrefix(text).slice(0, MAX_PREFIX);
+      const prefix = text.slice(0, MAX_PREFIX);
       const adapter = getAdapterForTool(descriptionTool, sessionId);
       const info = await adapter
         .getSessionInfo(sessionId)
@@ -651,7 +636,7 @@ export async function handleCommand(
     if (
       chatType === "p2p" &&
       platform.kind === "wechat" &&
-      (!textLower.startsWith("/") || isPlanOrAsk(text))
+      !textLower.startsWith("/")
     ) {
       try {
         const reg = await loadSessionRegistryForBinding();
@@ -1253,7 +1238,7 @@ export async function handleCommand(
         msgTimestamp,
         descriptionTool,
         tid,
-        isPlanOrAsk(text),
+        false,
       );
       logTrace(tid, "DONE", { outcome: "resume_done", sessionId });
       console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
@@ -1328,7 +1313,7 @@ export async function handleCommand(
   }
 
   // 飞书私聊普通消息：不再绑定私聊本身，而是自动创建会话群并把私聊内容作为首轮 prompt。
-  if (isNonWechatP2p(platform, chatType) && (!textLower.startsWith("/") || isPlanOrAsk(text))) {
+  if (isNonWechatP2p(platform, chatType) && !textLower.startsWith("/")) {
     const tool = resolveDefaultAgentTool();
     const toolLabel = toolDisplayName(tool);
     logTrace(tid, "BRANCH", { cmd: "auto_new_from_p2p", tool });
@@ -1369,7 +1354,7 @@ export async function handleCommand(
     }
 
     const cwd = sessionCwd;
-    const initialName = sessionChatName(stripPlanOrAskPrefix(text).slice(0, 10) || "新会话", cwd);
+    const initialName = sessionChatName(text.slice(0, 10) || "新会话", cwd);
     let newChatId: string;
     try {
       newChatId = await platform.createGroup(initialName, [openId]);
@@ -1453,7 +1438,7 @@ export async function handleCommand(
         msgTimestamp,
         tool,
         tid,
-        isPlanOrAsk(text),
+        false,
       );
       console.log(`[${ts()}] [AUTO-P2P 5/5] First prompt sent → OK`);
       logTrace(tid, "DONE", { outcome: "auto_new_p2p_prompt_done", newChatId, sessionId, tool });

package/src/session.ts

@@ -834,9 +834,8 @@ export async function resumeAndPrompt(
   msgTimestamp: number,
   tool: string,
   traceId?: string,
-  planMode?: boolean,
 ): Promise<void> {
-  return runAgentSession(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId, planMode);
+  return runAgentSession(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId);
 }
 
 // ---------------------------------------------------------------------------
@@ -851,7 +850,6 @@ export async function runAgentSession(
   msgTimestamp: number,
   tool: string,
   traceId?: string,
-  planMode?: boolean,
 ): Promise<void> {
   const tid = traceId ?? "";
 
@@ -1110,7 +1108,6 @@ export async function runAgentSession(
         clearPromptProcessMonitor(sessionId);
         if (exitInfo.pid !== undefined) unregisterProcess(exitInfo.pid);
       },
-      planMode,
     })) {
       for (const block of unifiedMsg.blocks) {
         accumulateBlockContent(block, state, toolCallMap);