chatccc 0.2.128 → 0.2.129

package/README.md

@@ -310,6 +310,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.128",
+  "version": "0.2.129",
   "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

@@ -281,16 +281,17 @@ function buildCliArgs(
   isEmpty: (value: string) => boolean,
   mcpConfigJson: string | null,
   extraArgs: string[],
+  planMode?: boolean,
 ): string[] {
   const args = [
     "-p",
     "--output-format", "stream-json",
     "--verbose",
     "--setting-sources", "user,project,local",
-    "--permission-mode", "bypassPermissions",
-    "--dangerously-skip-permissions",
+    "--permission-mode", planMode ? "plan" : "bypassPermissions",
     "--settings", "{\"maxTurns\":999999999,\"maxBudget\":999999999}",
   ];
+  if (!planMode) args.push("--dangerously-skip-permissions");
 
   if (!isEmpty(model)) args.push("--model", model);
   if (!isEmpty(effort)) args.push("--effort", effort);
@@ -465,6 +466,7 @@ class ClaudeAdapter implements ToolAdapter {
     const args = buildCliArgs(
       this.model, this.effort, this.isEmpty, mcpConfigJson,
       ["--resume", sessionId, "--input-format", "stream-json", "--replay-user-messages"],
+      options?.planMode,
     );
 
     const proc = spawnCli(args, cwd, env, true);

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

@@ -832,8 +832,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 +849,7 @@ export async function runAgentSession(
   msgTimestamp: number,
   tool: string,
   traceId?: string,
+  planMode?: boolean,
 ): Promise<void> {
   const tid = traceId ?? "";
 
@@ -1106,6 +1108,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);