chatccc 0.2.128 → 0.2.130

package/README.md

@@ -205,7 +205,7 @@ ChatCCC 只负责把聊天消息转给本地 AI 工具，不捆绑这些 CLI。
 
 #### Claude Code
 
-本机完成 Claude CLI 登录后即可使用。同时支持官方和第三方 Anthropic 兼容 API：使用官方服务无需额外配置，使用第三方 API 则填写 `claude.apiKey` 和 `claude.baseUrl`。`claude.model`、`claude.subagentModel`、`claude.apiKey`、`claude.baseUrl` 均为选填；填写后会把对应配置传给 Claude CLI 子进程，覆盖其默认值；留空则一切以 `~/.claude/settings.json` 为准。
+本机完成 Claude CLI 登录后即可使用。同时支持官方和第三方 Anthropic 兼容 API：使用官方服务无需额外配置，使用第三方 API 则填写 `claude.apiKey` 和 `claude.baseUrl`。`claude.model`、`claude.subagentModel`、`claude.effort`、`claude.apiKey`、`claude.baseUrl` 均为选填；`claude.maxTurn` 控制每次对话的最大轮数（默认 25）。填写后会把对应配置传给 Claude CLI 子进程；留空则以 `~/.claude/settings.json` 为准。
 
 #### Cursor Agent CLI
 
@@ -285,6 +285,7 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `cursor.path` / `codex.path` | CLI 可执行文件路径；留空时自动探测或使用 PATH |
 | `claude.model` / `claude.subagentModel` / `claude.effort` | 选填；设置后传给 Claude CLI 子进程，留空以 `~/.claude/settings.json` 为准 |
 | `claude.apiKey` / `claude.baseUrl` | 选填；设置后传给 Claude CLI 子进程，留空以 `~/.claude/settings.json` 为准 |
+| `claude.maxTurn` | 选填；Claude CLI 最大对话轮数，默认 25，可在 Web UI 编辑 |
 
 > 当前 ChatCCC 以 `bypassPermissions` 模式运行，会跳过 Agent 操作确认。请只在可信环境中使用。
 
@@ -310,6 +311,12 @@ 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/config.sample.json

@@ -17,7 +17,8 @@
     "subagentModel": "",
     "effort": "",
     "apiKey": "",
-    "baseUrl": ""
+    "baseUrl": "",
+    "maxTurn": 25
   },
   "cursor": {
     "enabled": false,

package/package.json

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

package/src/adapters/adapter-interface.ts

@@ -128,6 +128,8 @@ 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

@@ -127,6 +127,8 @@ export interface ClaudeAdapterOptions {
   isEmpty: (value: string) => boolean;
   /** 注入自定义 meta 持久化 store（测试用）；未提供时使用全局默认实例。 */
   metaStore?: ClaudeSessionMetaStore;
+  /** Claude CLI maxTurns 设置，默认 25 */
+  maxTurn?: number;
 }
 
 // ---------------------------------------------------------------------------
@@ -281,16 +283,18 @@ function buildCliArgs(
   isEmpty: (value: string) => boolean,
   mcpConfigJson: string | null,
   extraArgs: string[],
+  maxTurn: number,
+  planMode?: boolean,
 ): string[] {
   const args = [
     "-p",
     "--output-format", "stream-json",
     "--verbose",
     "--setting-sources", "user,project,local",
-    "--permission-mode", "bypassPermissions",
-    "--dangerously-skip-permissions",
-    "--settings", "{\"maxTurns\":999999999,\"maxBudget\":999999999}",
+    "--permission-mode", planMode ? "plan" : "bypassPermissions",
+    "--settings", `{"maxTurns":${maxTurn},"maxBudget":999999999}`,
   ];
+  if (!planMode) args.push("--dangerously-skip-permissions");
 
   if (!isEmpty(model)) args.push("--model", model);
   if (!isEmpty(effort)) args.push("--effort", effort);
@@ -416,6 +420,7 @@ class ClaudeAdapter implements ToolAdapter {
   private baseUrl: string | undefined;
   private isEmpty: (value: string) => boolean;
   private metaStore: ClaudeSessionMetaStore;
+  private maxTurn: number;
 
   constructor(options: ClaudeAdapterOptions) {
     this.model = options.model;
@@ -425,6 +430,7 @@ class ClaudeAdapter implements ToolAdapter {
     this.baseUrl = options.baseUrl;
     this.isEmpty = options.isEmpty;
     this.metaStore = options.metaStore ?? defaultClaudeSessionMetaStore;
+    this.maxTurn = options.maxTurn ?? 25;
   }
 
   async createSession(cwd: string): Promise<CreateSessionResult> {
@@ -434,6 +440,7 @@ class ClaudeAdapter implements ToolAdapter {
     const args = buildCliArgs(
       this.model, this.effort, this.isEmpty, mcpConfigJson,
       ["ok"],
+      this.maxTurn,
     );
 
     const proc = spawnCli(args, cwd, env, false);
@@ -465,6 +472,8 @@ class ClaudeAdapter implements ToolAdapter {
     const args = buildCliArgs(
       this.model, this.effort, this.isEmpty, mcpConfigJson,
       ["--resume", sessionId, "--input-format", "stream-json", "--replay-user-messages"],
+      this.maxTurn,
+      options?.planMode,
     );
 
     const proc = spawnCli(args, cwd, env, true);

package/src/config.ts

@@ -69,6 +69,8 @@ export interface ClaudeConfig {
   apiKey: string;
   /** Anthropic 兼容 API Base URL（选填，留空则使用默认端点） */
   baseUrl: string;
+  /** Claude CLI maxTurns 设置，默认 25 */
+  maxTurn: number;
 }
 
 export interface CursorConfig {
@@ -324,7 +326,7 @@ function loadConfig(): AppConfig {
     port: 18080,
     gitTimeoutSeconds: 180,
     allowInterrupt: false,
-    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "" },
+    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "", maxTurn: 25 },
     cursor: { enabled: false, defaultAgent: false, path: "", model: "claude-opus-4-7-max" },
     codex: { enabled: false, defaultAgent: false, path: "", model: "", effort: "" },
   };
@@ -468,6 +470,9 @@ function loadConfig(): AppConfig {
       effort: normalizeOptionalConfigField(claude.effort, { label: "claude.effort" }),
       apiKey: normalizeOptionalConfigField(claude.apiKey, { label: "claude.apiKey" }),
       baseUrl: normalizeOptionalConfigField(claude.baseUrl, { label: "claude.baseUrl" }),
+      maxTurn: typeof (claude as Record<string, unknown>).maxTurn === "number"
+        ? (claude as Record<string, unknown>).maxTurn as number
+        : 25,
     },
     cursor: {
       enabled: cursorEnabled,
@@ -521,6 +526,7 @@ export const LOCAL_RELAY_URL = `ws://127.0.0.1:${CHATCCC_PORT}`;
 export let CLAUDE_MODEL = config.claude.model;
 export let CLAUDE_SUBAGENT_MODEL = config.claude.subagentModel;
 export let CLAUDE_EFFORT = config.claude.effort;
+export let CLAUDE_MAX_TURN = config.claude.maxTurn;
 export let CLAUDE_API_KEY = config.claude.apiKey;
 export let CLAUDE_BASE_URL = config.claude.baseUrl;
 

package/src/orchestrator.ts

@@ -94,6 +94,21 @@ 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;
@@ -117,8 +132,9 @@ function shouldSendWechatProcessingAck(
   platform: PlatformAdapter,
   textLower: string,
   chatType: string,
+  text: string,
 ): boolean {
-  return platform.kind === "wechat" && chatType === "p2p" && !textLower.startsWith("/");
+  return platform.kind === "wechat" && chatType === "p2p" && (!textLower.startsWith("/") || isPlanOrAsk(text));
 }
 
 function isNonWechatP2p(platform: PlatformAdapter, chatType: string): boolean {
@@ -600,10 +616,10 @@ export async function handleCommand(
     if (
       chatType !== "p2p" &&
       isUntitledSessionChatName(chatInfo!.name) &&
-      !textLower.startsWith("/")
+      (!textLower.startsWith("/") || isPlanOrAsk(text))
     ) {
       const MAX_PREFIX = 10;
-      const prefix = text.slice(0, MAX_PREFIX);
+      const prefix = stripPlanOrAskPrefix(text).slice(0, MAX_PREFIX);
       const adapter = getAdapterForTool(descriptionTool, sessionId);
       const info = await adapter
         .getSessionInfo(sessionId)
@@ -635,7 +651,7 @@ export async function handleCommand(
     if (
       chatType === "p2p" &&
       platform.kind === "wechat" &&
-      !textLower.startsWith("/")
+      (!textLower.startsWith("/") || isPlanOrAsk(text))
     ) {
       try {
         const reg = await loadSessionRegistryForBinding();
@@ -1223,7 +1239,7 @@ export async function handleCommand(
       return;
     }
 
-    if (shouldSendWechatProcessingAck(platform, textLower, chatType)) {
+    if (shouldSendWechatProcessingAck(platform, textLower, chatType, text)) {
       await platform.sendText(chatId, "生成中...").catch(() => {});
     }
 
@@ -1237,6 +1253,7 @@ export async function handleCommand(
         msgTimestamp,
         descriptionTool,
         tid,
+        isPlanOrAsk(text),
       );
       logTrace(tid, "DONE", { outcome: "resume_done", sessionId });
       console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
@@ -1311,7 +1328,7 @@ export async function handleCommand(
   }
 
   // 飞书私聊普通消息：不再绑定私聊本身，而是自动创建会话群并把私聊内容作为首轮 prompt。
-  if (isNonWechatP2p(platform, chatType) && !textLower.startsWith("/")) {
+  if (isNonWechatP2p(platform, chatType) && (!textLower.startsWith("/") || isPlanOrAsk(text))) {
     const tool = resolveDefaultAgentTool();
     const toolLabel = toolDisplayName(tool);
     logTrace(tid, "BRANCH", { cmd: "auto_new_from_p2p", tool });
@@ -1352,7 +1369,7 @@ export async function handleCommand(
     }
 
     const cwd = sessionCwd;
-    const initialName = sessionChatName(text.slice(0, 10) || "新会话", cwd);
+    const initialName = sessionChatName(stripPlanOrAskPrefix(text).slice(0, 10) || "新会话", cwd);
     let newChatId: string;
     try {
       newChatId = await platform.createGroup(initialName, [openId]);
@@ -1436,6 +1453,7 @@ export async function handleCommand(
         msgTimestamp,
         tool,
         tid,
+        isPlanOrAsk(text),
       );
       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

@@ -5,6 +5,7 @@ import {
   CLAUDE_API_KEY,
   CLAUDE_BASE_URL,
   CLAUDE_EFFORT,
+  CLAUDE_MAX_TURN,
   CLAUDE_MODEL,
   CLAUDE_SUBAGENT_MODEL,
   CHATCCC_PORT,
@@ -367,6 +368,7 @@ export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter
       apiKey: CLAUDE_API_KEY,
       baseUrl: CLAUDE_BASE_URL,
       isEmpty: isAnthropicConfigEmpty,
+      maxTurn: CLAUDE_MAX_TURN,
     });
   }
   adapterCache.set(cacheKey, adapter);
@@ -832,8 +834,9 @@ export async function resumeAndPrompt(
   msgTimestamp: number,
   tool: string,
   traceId?: string,
+  planMode?: boolean,
 ): Promise<void> {
-  return runAgentSession(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId);
+  return runAgentSession(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId, planMode);
 }
 
 // ---------------------------------------------------------------------------
@@ -848,6 +851,7 @@ export async function runAgentSession(
   msgTimestamp: number,
   tool: string,
   traceId?: string,
+  planMode?: boolean,
 ): Promise<void> {
   const tid = traceId ?? "";
 
@@ -1106,6 +1110,7 @@ export async function runAgentSession(
         clearPromptProcessMonitor(sessionId);
         if (exitInfo.pid !== undefined) unregisterProcess(exitInfo.pid);
       },
+      planMode,
     })) {
       for (const block of unifiedMsg.blocks) {
         accumulateBlockContent(block, state, toolCallMap);

package/src/web-ui.ts

@@ -31,7 +31,7 @@ interface AppConfig {
   platforms?: { feishu?: { enabled?: boolean }; ilink?: { enabled?: boolean } };
   port?: number;
   gitTimeoutSeconds?: number;
-  claude?: { enabled?: boolean; defaultAgent?: boolean; model?: string; subagentModel?: string; effort?: string; apiKey?: string; baseUrl?: string };
+  claude?: { enabled?: boolean; defaultAgent?: boolean; model?: string; subagentModel?: string; effort?: string; apiKey?: string; baseUrl?: string; maxTurn?: number };
   // `command` 是已废弃的旧字段名，保留只读以兼容升级前的 config.json
   cursor?: { enabled?: boolean; defaultAgent?: boolean; path?: string; command?: string; model?: string };
   codex?: { enabled?: boolean; defaultAgent?: boolean; path?: string; command?: string; model?: string; effort?: string };
@@ -319,6 +319,9 @@ export function unflattenConfig(flat: Record<string, unknown>): Record<string, u
     } else if (key === "CHATCCC_ANTHROPIC_BASE_URL") {
       result.claude = result.claude || {};
       (result.claude as Record<string, unknown>).baseUrl = val;
+    } else if (key === "CHATCCC_ANTHROPIC_MAX_TURN") {
+      result.claude = result.claude || {};
+      (result.claude as Record<string, unknown>).maxTurn = parseInt(val as string, 10) || 25;
     } else if (key === "CHATCCC_CLAUDE_ENABLED") {
       result.claude = result.claude || {};
       (result.claude as Record<string, unknown>).enabled = val === true || val === "true";
@@ -785,6 +788,7 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
         <div class="config-row"><span class="key">Effort</span><span class="val" id="cfg-ANTHROPIC_EFFORT">-</span></div>
         <div class="config-row"><span class="key">API Key</span><span class="val" id="cfg-ANTHROPIC_API_KEY">-</span></div>
         <div class="config-row"><span class="key">Base URL</span><span class="val" id="cfg-ANTHROPIC_BASE_URL">-</span></div>
+        <div class="config-row"><span class="key">Max Turns</span><span class="val" id="cfg-ANTHROPIC_MAX_TURN">-</span></div>
         <label class="agent-default-row" style="margin-top:10px"><input type="checkbox" id="dash-default-claude" onchange="setDashboardDefaultAgent('claude', this.checked)"> 设为默认 Agent</label>
         <button class="btn btn-outline" style="margin-top:8px" onclick="editSection('claude')">编辑</button>
       </div>
@@ -851,7 +855,7 @@ let state = {
 var step2InputBound = false;
 
 const AGENT_FIELDS = {
-  claude: ['CHATCCC_ANTHROPIC_MODEL','CHATCCC_ANTHROPIC_SUBAGENT_MODEL','CHATCCC_ANTHROPIC_EFFORT','CHATCCC_ANTHROPIC_API_KEY','CHATCCC_ANTHROPIC_BASE_URL'],
+  claude: ['CHATCCC_ANTHROPIC_MODEL','CHATCCC_ANTHROPIC_SUBAGENT_MODEL','CHATCCC_ANTHROPIC_EFFORT','CHATCCC_ANTHROPIC_API_KEY','CHATCCC_ANTHROPIC_BASE_URL','CHATCCC_ANTHROPIC_MAX_TURN'],
   cursor: ['CHATCCC_CURSOR_PATH','CHATCCC_CURSOR_MODEL'],
   codex: ['CHATCCC_CODEX_PATH','CHATCCC_CODEX_MODEL','CHATCCC_CODEX_EFFORT']
 };
@@ -1087,7 +1091,7 @@ function isAgentEnabled(node, keys) {
   return false;
 }
 
-var CLAUDE_FALLBACK_KEYS = ['model','subagentModel','effort'];
+var CLAUDE_FALLBACK_KEYS = ['model','subagentModel','effort','maxTurn'];
 var CURSOR_FALLBACK_KEYS = ['path','command','model'];
 var CODEX_FALLBACK_KEYS = ['path','command','model','effort'];
 
@@ -1399,6 +1403,7 @@ function updateDashboardUI() {
   document.getElementById('cfg-ANTHROPIC_EFFORT').textContent = (c.claude && c.claude.effort) || '(留空)';
   document.getElementById('cfg-ANTHROPIC_API_KEY').textContent = (c.claude && c.claude.apiKey) ? '***已设置***' : '(留空)';
   document.getElementById('cfg-ANTHROPIC_BASE_URL').textContent = (c.claude && c.claude.baseUrl) || '(留空)';
+  document.getElementById('cfg-ANTHROPIC_MAX_TURN').textContent = (c.claude && c.claude.maxTurn != null) ? String(c.claude.maxTurn) : '25';
   document.getElementById('cfg-CURSOR_PATH').textContent = (c.cursor && (c.cursor.path || c.cursor.command)) || '-';
   document.getElementById('cfg-CURSOR_MODEL').textContent = (c.cursor && c.cursor.model) || '(留空)';
   document.getElementById('cfg-CODEX_PATH').textContent = (c.codex && (c.codex.path || c.codex.command)) || 'codex';
@@ -1459,7 +1464,7 @@ function editSection(section) {
   var labelMap = {
     'CHATCCC_APP_ID': 'App ID', 'CHATCCC_APP_SECRET': 'App Secret',
     'CHATCCC_ANTHROPIC_MODEL': '模型', 'CHATCCC_ANTHROPIC_SUBAGENT_MODEL': 'Subagent 模型', 'CHATCCC_ANTHROPIC_EFFORT': 'Effort',
-    'CHATCCC_ANTHROPIC_API_KEY': 'API Key', 'CHATCCC_ANTHROPIC_BASE_URL': 'Base URL',
+    'CHATCCC_ANTHROPIC_API_KEY': 'API Key', 'CHATCCC_ANTHROPIC_BASE_URL': 'Base URL', 'CHATCCC_ANTHROPIC_MAX_TURN': 'Max Turns',
     'CHATCCC_CURSOR_PATH': 'CLI 路径', 'CHATCCC_CURSOR_MODEL': '模型',
     'CHATCCC_CODEX_PATH': 'CLI 路径', 'CHATCCC_CODEX_MODEL': '模型', 'CHATCCC_CODEX_EFFORT': 'Effort'
   };
@@ -1477,6 +1482,7 @@ function editSection(section) {
         else if (key === 'CHATCCC_ANTHROPIC_EFFORT') val = state.config.claude.effort || '';
         else if (key === 'CHATCCC_ANTHROPIC_API_KEY') val = state.config.claude.apiKey || '';
         else if (key === 'CHATCCC_ANTHROPIC_BASE_URL') val = state.config.claude.baseUrl || '';
+        else if (key === 'CHATCCC_ANTHROPIC_MAX_TURN') val = (state.config.claude.maxTurn != null) ? String(state.config.claude.maxTurn) : '25';
       } else if (section === 'cursor' && state.config.cursor) {
         if (key === 'CHATCCC_CURSOR_PATH') val = state.config.cursor.path || state.config.cursor.command || '';
         else if (key === 'CHATCCC_CURSOR_MODEL') val = state.config.cursor.model || '';