chatccc 0.2.143 → 0.2.144

package/agent-prompts/claude_specific.md

@@ -26,4 +26,8 @@ Content-Type: application/json
 
 {"session_id": "{{session_id}}", "final_reply": "<你给用户的最终回复，总结已完成的工作和结果>"}
 
-调用后停止所有工具调用，直接输出最终回复即可。
+调用后停止所有工具调用，直接输出最终回复即可。
+
+## 计划/问答模式权限规则
+
+如果用户消息以 `/plan` 或 `/ask` 开头，说明当前处于只读模式。**遇到任何需要用户同意的权限请求时，不要向用户申请权限，立即调用 stop-stuck-loop 接口提前结束本轮会话。**

package/agent-prompts/codex_specific.md

@@ -0,0 +1,3 @@
+## 计划/问答模式权限规则
+
+如果用户消息以 `/plan` 或 `/ask` 开头，说明当前处于只读模式。**遇到任何需要用户同意的权限请求时，不要向用户申请权限，立即调用 stop-stuck-loop 接口提前结束本轮会话。**

package/agent-prompts/cursor_specific.md

@@ -0,0 +1,3 @@
+## 计划/问答模式权限规则
+
+如果用户消息以 `/plan` 或 `/ask` 开头，说明当前处于只读模式。**遇到任何需要用户同意的权限请求时，不要向用户申请权限，立即调用 stop-stuck-loop 接口提前结束本轮会话。**

package/package.json

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

package/src/adapters/adapter-interface.ts

@@ -169,4 +169,25 @@ export interface ToolAdapter {
    * 对于流式结束后自动关闭的适配器（如 Claude SDK），此为 no-op。
    */
   closeSession(sessionId: string): Promise<void>;
+}
+
+// ---------------------------------------------------------------------------
+// parseUserCommand — 从包装后的 userText 中提取原始用户消息并判断模式
+// ---------------------------------------------------------------------------
+
+export interface UserCommand {
+  /** 原始用户消息（去除包装） */
+  original: string;
+  /** 检测到的模式：plan / ask / null（普通消息） */
+  mode: "plan" | "ask" | null;
+}
+
+/** 从 [User message]...[/User message] 包装中提取原始消息并识别 /plan /ask 前缀 */
+export function parseUserCommand(userText: string): UserCommand {
+  const match = userText.match(/\[User message\]\n(.*?)\n\[\/User message\]/s);
+  if (!match) return { original: "", mode: null };
+  const original = match[1].trimStart();
+  if (original.startsWith("/plan")) return { original, mode: "plan" };
+  if (original.startsWith("/ask")) return { original, mode: "ask" };
+  return { original, mode: null };
 }

package/src/adapters/claude-adapter.ts

@@ -21,6 +21,7 @@ import type {
   UnifiedBlock,
   UnifiedStreamMessage,
 } from "./adapter-interface.ts";
+import { parseUserCommand } from "./adapter-interface.ts";
 import { CHATCCC_PORT } from "../config.ts";
 import {
   defaultClaudeSessionMetaStore,
@@ -303,6 +304,7 @@ function buildSdkOptions(args: {
   baseUrl?: string;
   maxTurn: number;
   abortController?: AbortController;
+  userText: string;
 }): ClaudeSdkSessionOptions {
   const {
     cwd,
@@ -314,16 +316,30 @@ function buildSdkOptions(args: {
     baseUrl,
     maxTurn,
     abortController,
+    userText,
   } = args;
 
+  const cmd = parseUserCommand(userText);
+  const limited = cmd.mode !== null;
+
   const options: ClaudeSdkSessionOptions = {
     cwd,
     abortController,
     settingSources: ["user", "project", "local"] as SettingSource[],
-    permissionMode: "bypassPermissions",
+    permissionMode: limited ? "default" : "bypassPermissions",
     autoCompactEnabled: true,
     maxTurns: maxTurn,
     skills: "all",
+    ...(limited ? {
+      settings: {
+        permissions: {
+          allow: [
+            "Read",
+            `Bash(curl -s -X POST http://127.0.0.1:${CHATCCC_PORT}/api/agent/stop-stuck-loop *)`,
+          ],
+        },
+      },
+    } : {}),
     stderr: (data) => {
       const trimmed = data.trim();
       if (!trimmed) return;
@@ -332,7 +348,10 @@ function buildSdkOptions(args: {
     },
   };
 
-  options.allowDangerouslySkipPermissions = true;
+  if (!limited) {
+    options.allowDangerouslySkipPermissions = true;
+  }
+
   if (!isEmpty(model)) {
     options.model = model;
   }
@@ -417,6 +436,7 @@ class ClaudeAdapter implements ToolAdapter {
         baseUrl: this.baseUrl,
         maxTurn: this.maxTurn,
         abortController,
+        userText: "",
       })),
     );
 
@@ -466,6 +486,7 @@ class ClaudeAdapter implements ToolAdapter {
         baseUrl: this.baseUrl,
         maxTurn: this.maxTurn,
         abortController,
+        userText,
       })),
     );
 

package/src/adapters/codex-adapter.ts

@@ -22,6 +22,7 @@ import type {
   CreateSessionResult,
   SessionInfo,
 } from "./adapter-interface.ts";
+import { parseUserCommand } from "./adapter-interface.ts";
 import {
   defaultCodexSessionMetaStore,
   type CodexSessionMetaStore,
@@ -287,9 +288,13 @@ class CodexAdapter implements ToolAdapter {
 
     // 首次 prompt: codex exec 创建新线程
     // 后续 prompt: codex exec resume 恢复已有线程（resume 不接受 -C，cwd 继承自原线程）
+    const cmd = parseUserCommand(userText);
+    const baseArgs = cmd.mode
+      ? ["exec", "--json", "--sandbox", "read-only", "--skip-git-repo-check"]
+      : CODEX_BASE_ARGS;
     const args = isFirstPrompt
-      ? [...CODEX_BASE_ARGS, "-C", cwd, "-"]
-      : [...CODEX_BASE_ARGS, "resume", threadId, "-"];
+      ? [...baseArgs, "-C", cwd, "-"]
+      : [...baseArgs, "resume", threadId, "-"];
 
     const proc = spawnCodex(args, cwd, buildCodexPromptText(userText), this.modelOverride);
     if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });

package/src/adapters/cursor-adapter.ts

@@ -19,6 +19,7 @@ import type {
   CreateSessionResult,
   SessionInfo,
 } from "./adapter-interface.ts";
+import { parseUserCommand } from "./adapter-interface.ts";
 import { CURSOR_AGENT_COMMAND, CURSOR_AGENT_ARGS } from "../config.ts";
 import {
   defaultCursorSessionMetaStore,
@@ -298,8 +299,17 @@ function spawnAgent(
   cwd?: string,
   stdinText?: string,
   modelOverride?: string,
+  mode?: "plan" | "ask",
 ): ChildProcess {
-  let allArgs = [...CURSOR_AGENT_ARGS, ...extraArgs];
+  let allArgs: string[];
+  if (mode) {
+    // plan/ask 模式：移除 --force/--yolo，添加 --mode plan/ask
+    allArgs = CURSOR_AGENT_ARGS.filter(a => a !== "--force" && a !== "--yolo");
+    allArgs.push("--mode", mode);
+    allArgs.push(...extraArgs);
+  } else {
+    allArgs = [...CURSOR_AGENT_ARGS, ...extraArgs];
+  }
   if (modelOverride) {
     // 替换全局 --model 为 per-session override
     const modelIdx = allArgs.findIndex((a, i) => a === "--model" && i + 1 < allArgs.length);
@@ -407,7 +417,14 @@ class CursorAdapter implements ToolAdapter {
     options?: ToolPromptOptions,
   ): AsyncIterable<UnifiedStreamMessage> {
     console.log(`[Cursor debug] prompt start: sessionId=${sessionId}, cwd=${cwd}, userTextLen=${userText.length}`);
-    const proc = spawnAgent(["--resume", sessionId], cwd, buildCursorPromptText(userText), this.modelOverride);
+    const cmd = parseUserCommand(userText);
+    const proc = spawnAgent(
+      ["--resume", sessionId],
+      cwd,
+      buildCursorPromptText(userText),
+      this.modelOverride,
+      cmd.mode ?? undefined,
+    );
     this.activeProcs.add(proc);
     if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
 

package/src/feishu-api.ts

@@ -737,7 +737,6 @@ export async function sendImageReply(
 function feishuFileType(ext: string): string {
   const map: Record<string, string> = {
     ".mp4": "mp4",
-    ".mp3": "opus", ".wav": "opus", ".ogg": "opus", ".aac": "opus", ".m4a": "opus",
     ".pdf": "pdf", ".doc": "doc", ".docx": "doc",
     ".xls": "xls", ".xlsx": "xls", ".csv": "xls",
     ".ppt": "ppt", ".pptx": "ppt",
@@ -825,10 +824,6 @@ export async function sendFileReply(
   try {
     const fileKey = await uploadMessageFile(token, filePath);
     const fileName = filePath.split(/[\\/]/).pop() || "file";
-    const ext = extname(filePath).toLowerCase();
-    // 视频/音频用 msg_type: "media"，文档用 "file"
-    const isMedia = [".mp3", ".wav", ".ogg", ".aac", ".m4a"].includes(ext);
-    const msgType = isMedia ? "media" : "file";
     const resp = await fetch(`${BASE_URL}/im/v1/messages?receive_id_type=chat_id`, {
       method: "POST",
       headers: {
@@ -837,16 +832,16 @@ export async function sendFileReply(
       },
       body: JSON.stringify({
         receive_id: chatId,
-        msg_type: msgType,
+        msg_type: "file",
         content: JSON.stringify({ file_key: fileKey }),
       }),
     });
     const data = (await resp.json().catch(() => ({}))) as { code?: number; msg?: string; data?: { message_id?: string } };
     if (data.code !== 0) {
-      console.error(`[${ts()}] [SEND] ${msgType} FAIL: chatId=${chatId} path=${filePath} code=${data.code} msg="${data.msg ?? ""}"`);
+      console.error(`[${ts()}] [SEND] file FAIL: chatId=${chatId} path=${filePath} code=${data.code} msg="${data.msg ?? ""}"`);
       throw new Error(`[${data.code}] ${data.msg ?? "send file failed"}`);
     }
-    console.log(`[${ts()}] [SEND] ${msgType} OK: chatId=${chatId} name=${fileName} msgId=${data.data?.message_id ?? "N/A"}`);
+    console.log(`[${ts()}] [SEND] file OK: chatId=${chatId} name=${fileName} msgId=${data.data?.message_id ?? "N/A"}`);
     return true;
   } catch (err) {
     if (!(err instanceof Error && err.message.startsWith("["))) {

package/src/session.ts

@@ -1165,11 +1165,22 @@ export async function runAgentSession(
     // 运行中并更新旧卡片，而不是新建卡片。
     const finalStatus = (wasAbnormalExit || wasResourceStuck) ? "error" : wasStopped ? "stopped" : "done";
     const finalReply = pickFinalReply(state).trim();
+
+    // stop-stuck-loop 接口可能在 fire-and-forget 中已写入带 final_reply 的
+    // stream state，finally 不应覆盖它。
+    let finalReplyToWrite = finalReply;
+    try {
+      const existing = await readStreamState(sessionId);
+      if (existing && existing.finalReply.length > finalReply.length) {
+        finalReplyToWrite = existing.finalReply;
+      }
+    } catch {}
+
     await writeStreamState({
       sessionId,
       status: finalStatus,
       accumulatedContent: state.accumulatedContent,
-      finalReply,
+      finalReply: finalReplyToWrite,
       chunkCount: state.chunkCount,
       turnCount: nextTurnCount,
       contextTokens: existingInfo?.lastContextTokens ?? 0,