chatccc 0.2.122 → 0.2.124

package/src/__tests__/orchestrator.test.ts

@@ -169,48 +169,6 @@ describe("handleCommand WeChat processing ack", () => {
     expect(platform.sendText).toHaveBeenCalledWith("wx-chat", "生成中...");
   });
 
-  it.each([
-    { tool: "claude" as const, sessionId: "sid-claude", text: "/ask 只回答不要改文件" },
-    { tool: "cursor" as const, sessionId: "sid-cursor", text: "/plan 先给我计划" },
-  ])("passes unsupported mode commands through as raw prompts for $tool", async ({ tool, sessionId, text }) => {
-    const platform = mockPlatform();
-    const prompt = vi.fn(async function* (_sessionId: string, userText: string) {
-      yield {
-        type: "assistant" as const,
-        blocks: [{ type: "text" as const, text: `收到: ${userText}` }],
-      };
-    });
-    _setAdapterForToolForTest(tool, {
-      displayName: tool,
-      sessionDescPrefix: `${tool} Session:`,
-      createSession: vi.fn(async () => ({ sessionId })),
-      prompt,
-      getSessionInfo: async (sessionId: string): Promise<SessionInfo> => ({
-        sessionId,
-        cwd: "F:\\repo",
-      }),
-      closeSession: async () => {},
-    });
-    await recordSessionRegistry({
-      chatId: "wx-chat",
-      sessionId,
-      tool,
-      chatName: "ready-session",
-      running: false,
-    });
-
-    await handleCommand(platform, text, "wx-chat", "wx-user", Date.now(), "p2p");
-
-    expect(platform.sendText).not.toHaveBeenCalledWith("wx-chat", expect.stringContaining("仅在以下 Agent 会话中可用"));
-    expect(prompt).toHaveBeenCalledWith(
-      sessionId,
-      expect.stringContaining(text),
-      "F:\\repo",
-      expect.any(AbortSignal),
-      expect.objectContaining({ permissionMode: undefined }),
-    );
-  });
-
   it("cleans stale Feishu p2p binding, creates a group, and sends the private message as first prompt", async () => {
     const platform = mockPlatform("feishu");
     const prompt = vi.fn(async function* (_sessionId: string, userText: string) {
@@ -219,7 +177,7 @@ describe("handleCommand WeChat processing ack", () => {
         blocks: [{ type: "text" as const, text: `收到: ${userText}` }],
       };
     });
-    _setAdapterForToolForTest("claude", {
+    _setAdapterForToolForTest("cursor", {
       displayName: "Claude",
       sessionDescPrefix: "Claude Session:",
       createSession: vi.fn(async () => ({ sessionId: "sid-feishu-new" })),

package/src/adapters/adapter-interface.ts

@@ -128,13 +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": Claude Code --permission-mode plan（只读/规划）
-   * - "ask":  Cursor Agent --mode ask（只读/问答）
-   * 不传或为 undefined 时使用适配器默认行为（正常编辑模式）。
-   */
-  permissionMode?: "plan" | "ask";
 }
 
 // ---------------------------------------------------------------------------

package/src/adapters/claude-adapter.ts

@@ -274,17 +274,14 @@ function buildCliArgs(
   isEmpty: (value: string) => boolean,
   mcpConfigJson: string | null,
   extraArgs: string[],
-  permissionMode?: "plan" | "ask",
 ): string[] {
-  const permMode = permissionMode === "plan" ? "plan" : permissionMode === "ask" ? "default" : "bypassPermissions";
-  const skipPermissions = permissionMode !== "plan" && permissionMode !== "ask";
   const args = [
     "-p",
     "--output-format", "stream-json",
     "--verbose",
     "--setting-sources", "user,project,local",
-    "--permission-mode", permMode,
-    ...(skipPermissions ? ["--dangerously-skip-permissions"] : []),
+    "--permission-mode", "bypassPermissions",
+    "--dangerously-skip-permissions",
     "--settings", "{\"maxTurns\":0}",
   ];
 
@@ -435,7 +432,6 @@ class ClaudeAdapter implements ToolAdapter {
     const args = buildCliArgs(
       this.model, this.effort, this.isEmpty, mcpConfigJson,
       ["--resume", sessionId, "--input-format", "stream-json", "--replay-user-messages"],
-      options?.permissionMode,
     );
 
     const proc = spawnCli(args, cwd, env, true);

package/src/adapters/cursor-adapter.ts

@@ -261,18 +261,8 @@ function spawnAgent(
   cwd?: string,
   stdinText?: string,
   modelOverride?: string,
-  permissionMode?: "plan" | "ask",
 ): ChildProcess {
   let allArgs = [...CURSOR_AGENT_ARGS, ...extraArgs];
-  if (permissionMode === "ask") {
-    // 替换已有的 --mode 或追加
-    const modeIdx = allArgs.findIndex((a, i) => a === "--mode" && i + 1 < allArgs.length);
-    if (modeIdx >= 0) {
-      allArgs[modeIdx + 1] = "ask";
-    } else {
-      allArgs.push("--mode", "ask");
-    }
-  }
   if (modelOverride) {
     // 替换全局 --model 为 per-session override
     const modelIdx = allArgs.findIndex((a, i) => a === "--model" && i + 1 < allArgs.length);
@@ -380,7 +370,7 @@ 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, userText, this.modelOverride, options?.permissionMode);
+    const proc = spawnAgent(["--resume", sessionId], cwd, userText, this.modelOverride);
     this.activeProcs.add(proc);
     if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
 

package/src/adapters/resource-monitor.ts

@@ -1,141 +1,141 @@
-// =============================================================================
-// resource-monitor.ts — CLI 进程资源监控（CPU + 内存）
-// =============================================================================
-// 对所有 chatccc 启动的 CLI 进程持续监控 CPU 和内存占用。
-// 若连续 3 分钟两项指标均无变化，判定为僵死，发出 "stuck" 事件。
-// =============================================================================
-
-import { exec } from "node:child_process";
-import { EventEmitter } from "node:events";
-
-const CHECK_INTERVAL_MS = 30_000; // 30 秒检查一次
-const STUCK_THRESHOLD = 6; // 连续 6 次无变化 = 3 分钟
-
-interface ProcessSnapshot {
-  cpu: number;
-  memory: number;
-  unchangedCount: number;
-}
-
-interface TrackedProcess {
-  pid: number;
-  sessionId: string;
-  snapshot: ProcessSnapshot;
-}
-
-export const resourceMonitor = new EventEmitter();
-
-const tracked = new Map<number, TrackedProcess>();
-
-let timer: ReturnType<typeof setInterval> | null = null;
-
-function startIfNeeded(): void {
-  if (timer) return;
-  timer = setInterval(checkAll, CHECK_INTERVAL_MS);
-  timer.unref?.();
-}
-
-function stopIfIdle(): void {
-  if (tracked.size > 0) return;
-  if (timer) { clearInterval(timer); timer = null; }
-}
-
-export function registerProcess(pid: number, sessionId: string): void {
-  tracked.set(pid, { pid, sessionId, snapshot: { cpu: -1, memory: -1, unchangedCount: 0 } });
-  startIfNeeded();
-}
-
-export function unregisterProcess(pid: number): void {
-  tracked.delete(pid);
-  stopIfIdle();
-}
-
-// ---------------------------------------------------------------------------
-// 批量查询进程指标（Windows PowerShell）
-// ---------------------------------------------------------------------------
-
-function execPowerShell(script: string, timeoutMs: number): Promise<string> {
-  return new Promise((resolve, reject) => {
-    exec(
-      `powershell -NoProfile -Command "${script}"`,
-      { timeout: timeoutMs, windowsHide: true },
-      (err, stdout) => {
-        if (err) reject(err);
-        else resolve(stdout);
-      },
-    );
-  });
-}
-
-async function getProcessMetrics(pids: number[]): Promise<Map<number, { cpu: number; memory: number }>> {
-  const result = new Map<number, { cpu: number; memory: number }>();
-  if (pids.length === 0) return result;
-
-  const psScript = `Get-Process -Id ${pids.join(",")} -ErrorAction SilentlyContinue | ForEach-Object { "$($_.Id)|$($_.CPU)|$($_.WorkingSet64)" }`;
-
-  try {
-    const stdout = await execPowerShell(psScript, 10_000);
-    for (const line of stdout.trim().split(/\r?\n/)) {
-      const trimmed = line.trim();
-      if (!trimmed) continue;
-      const [idStr, cpuStr, memStr] = trimmed.split("|");
-      const id = parseInt(idStr, 10);
-      const cpu = parseFloat(cpuStr);
-      const memory = parseInt(memStr, 10);
-      if (!isNaN(id) && !isNaN(cpu) && !isNaN(memory)) {
-        result.set(id, { cpu, memory });
-      }
-    }
-  } catch {
-    // PowerShell 查询失败时跳过本轮，下次重试
-  }
-
-  return result;
-}
-
-// ---------------------------------------------------------------------------
-// 定时检查
-// ---------------------------------------------------------------------------
-
-async function checkAll(): Promise<void> {
-  if (tracked.size === 0) return;
-
-  const pids = [...tracked.keys()];
-  const metrics = await getProcessMetrics(pids);
-
-  for (const [pid, tp] of tracked) {
-    const m = metrics.get(pid);
-    if (!m) {
-      // 进程已不存在，停止追踪
-      tracked.delete(pid);
-      continue;
-    }
-
-    const prev = tp.snapshot;
-    const cpuChanged = m.cpu !== prev.cpu;
-    // 内存允许 ±1% 波动，避免正常抖动触发误判
-    const memTolerance = prev.memory > 0 ? Math.max(prev.memory * 0.01, 1024 * 1024) : 1024 * 1024;
-    const memChanged = Math.abs(m.memory - prev.memory) > memTolerance;
-
-    if (!cpuChanged && !memChanged) {
-      tp.snapshot.unchangedCount++;
-      if (tp.snapshot.unchangedCount >= STUCK_THRESHOLD) {
-        const idleMinutes = Math.round(
-          (tp.snapshot.unchangedCount * CHECK_INTERVAL_MS) / 60_000,
-        );
-        resourceMonitor.emit("stuck", {
-          pid: tp.pid,
-          sessionId: tp.sessionId,
-          idleMinutes,
-        });
-        tracked.delete(pid);
-      }
-    } else {
-      tp.snapshot.unchangedCount = 0;
-    }
-    tp.snapshot.cpu = m.cpu;
-    tp.snapshot.memory = m.memory;
-  }
-
-  stopIfIdle();
+// =============================================================================
+// resource-monitor.ts — CLI 进程资源监控（CPU + 内存）
+// =============================================================================
+// 对所有 chatccc 启动的 CLI 进程持续监控 CPU 和内存占用。
+// 若连续 3 分钟两项指标均无变化，判定为僵死，发出 "stuck" 事件。
+// =============================================================================
+
+import { exec } from "node:child_process";
+import { EventEmitter } from "node:events";
+
+const CHECK_INTERVAL_MS = 30_000; // 30 秒检查一次
+const STUCK_THRESHOLD = 6; // 连续 6 次无变化 = 3 分钟
+
+interface ProcessSnapshot {
+  cpu: number;
+  memory: number;
+  unchangedCount: number;
+}
+
+interface TrackedProcess {
+  pid: number;
+  sessionId: string;
+  snapshot: ProcessSnapshot;
+}
+
+export const resourceMonitor = new EventEmitter();
+
+const tracked = new Map<number, TrackedProcess>();
+
+let timer: ReturnType<typeof setInterval> | null = null;
+
+function startIfNeeded(): void {
+  if (timer) return;
+  timer = setInterval(checkAll, CHECK_INTERVAL_MS);
+  timer.unref?.();
+}
+
+function stopIfIdle(): void {
+  if (tracked.size > 0) return;
+  if (timer) { clearInterval(timer); timer = null; }
+}
+
+export function registerProcess(pid: number, sessionId: string): void {
+  tracked.set(pid, { pid, sessionId, snapshot: { cpu: -1, memory: -1, unchangedCount: 0 } });
+  startIfNeeded();
+}
+
+export function unregisterProcess(pid: number): void {
+  tracked.delete(pid);
+  stopIfIdle();
+}
+
+// ---------------------------------------------------------------------------
+// 批量查询进程指标（Windows PowerShell）
+// ---------------------------------------------------------------------------
+
+function execPowerShell(script: string, timeoutMs: number): Promise<string> {
+  return new Promise((resolve, reject) => {
+    exec(
+      `powershell -NoProfile -Command "${script}"`,
+      { timeout: timeoutMs, windowsHide: true },
+      (err, stdout) => {
+        if (err) reject(err);
+        else resolve(stdout);
+      },
+    );
+  });
+}
+
+async function getProcessMetrics(pids: number[]): Promise<Map<number, { cpu: number; memory: number }>> {
+  const result = new Map<number, { cpu: number; memory: number }>();
+  if (pids.length === 0) return result;
+
+  const psScript = `Get-Process -Id ${pids.join(",")} -ErrorAction SilentlyContinue | ForEach-Object { "$($_.Id)|$($_.CPU)|$($_.WorkingSet64)" }`;
+
+  try {
+    const stdout = await execPowerShell(psScript, 10_000);
+    for (const line of stdout.trim().split(/\r?\n/)) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      const [idStr, cpuStr, memStr] = trimmed.split("|");
+      const id = parseInt(idStr, 10);
+      const cpu = parseFloat(cpuStr);
+      const memory = parseInt(memStr, 10);
+      if (!isNaN(id) && !isNaN(cpu) && !isNaN(memory)) {
+        result.set(id, { cpu, memory });
+      }
+    }
+  } catch {
+    // PowerShell 查询失败时跳过本轮，下次重试
+  }
+
+  return result;
+}
+
+// ---------------------------------------------------------------------------
+// 定时检查
+// ---------------------------------------------------------------------------
+
+async function checkAll(): Promise<void> {
+  if (tracked.size === 0) return;
+
+  const pids = [...tracked.keys()];
+  const metrics = await getProcessMetrics(pids);
+
+  for (const [pid, tp] of tracked) {
+    const m = metrics.get(pid);
+    if (!m) {
+      // 进程已不存在，停止追踪
+      tracked.delete(pid);
+      continue;
+    }
+
+    const prev = tp.snapshot;
+    const cpuChanged = m.cpu !== prev.cpu;
+    // 内存允许 ±1% 波动，避免正常抖动触发误判
+    const memTolerance = prev.memory > 0 ? Math.max(prev.memory * 0.01, 1024 * 1024) : 1024 * 1024;
+    const memChanged = Math.abs(m.memory - prev.memory) > memTolerance;
+
+    if (!cpuChanged && !memChanged) {
+      tp.snapshot.unchangedCount++;
+      if (tp.snapshot.unchangedCount >= STUCK_THRESHOLD) {
+        const idleMinutes = Math.round(
+          (tp.snapshot.unchangedCount * CHECK_INTERVAL_MS) / 60_000,
+        );
+        resourceMonitor.emit("stuck", {
+          pid: tp.pid,
+          sessionId: tp.sessionId,
+          idleMinutes,
+        });
+        tracked.delete(pid);
+      }
+    } else {
+      tp.snapshot.unchangedCount = 0;
+    }
+    tp.snapshot.cpu = m.cpu;
+    tp.snapshot.memory = m.memory;
+  }
+
+  stopIfIdle();
 }

package/src/cards.ts

@@ -131,8 +131,6 @@ export function buildHelpCard(
     "发送 **/new cursor** 创建新 Cursor 会话",
     "发送 **/new codex** 创建新 Codex 会话",
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
-    "发送 **/plan <消息>** 在 Claude 会话中以只读规划模式提问",
-    "发送 **/ask <消息>** 在 Cursor 会话中以只读问答模式提问",
   ].join("\n");
   return JSON.stringify({
     config: { wide_screen_mode: true },

package/src/config.ts

@@ -122,24 +122,6 @@ export interface AppConfig {
 export type AgentTool = "claude" | "cursor" | "codex";
 export const AGENT_TOOLS: AgentTool[] = ["claude", "cursor", "codex"];
 
-/**
- * Agent 专属模式指令（内部配置，非用户可配）。
- * 映射每个 Agent 支持的特殊指令及其对应的 CLI 权限模式。
- *
- * - claude: /plan → --permission-mode plan（只读/规划）
- * - cursor: /ask  → --mode ask（只读/问答）
- * - codex:  暂无原生只读模式，不注册任何模式指令
- */
-export const AGENT_MODE_COMMANDS: Record<AgentTool, { command: string; mode: "plan" | "ask"; description: string }[]> = {
-  claude: [
-    { command: "/plan", mode: "plan", description: "以只读规划模式提问（Claude 专属）" },
-  ],
-  cursor: [
-    { command: "/ask", mode: "ask", description: "以只读问答模式提问（Cursor 专属）" },
-  ],
-  codex: [],
-};
-
 /** 获取指定 agent 配置中所有模型相关的值（最多 100 个，去重） */
 export function getAllModelsForTool(tool: AgentTool, cfg: AppConfig = config): string[] {
   const seen = new Set<string>();