chatccc 0.2.138 → 0.2.140

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

@@ -1,13 +1,3 @@
-# Claude-Specific Injection Prompt
-
-Use this prompt as the Claude Agent SDK injection prompt for this project.
-
-Project workspace:
-
-```text
-f:\users\weizhangjian\feishuclauderprivate
-```
-
 ## Repeated Successful Command Guard
 
 When working in this project through Claude Agent SDK, repeated successful shell commands are a completion signal, not a reason to keep using tools.
@@ -50,6 +40,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/agent-prompts/codex_specific.md

@@ -1 +0,0 @@
-如果计划写好了等待你的审阅，将计划文件通过当前聊天软件发给用户

package/agent-prompts/cursor_specific.md

@@ -1 +0,0 @@
-如果计划写好了等待你的审阅，将计划文件通过当前聊天软件发给用户

package/package.json

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

package/src/__tests__/claude-adapter.test.ts

@@ -467,7 +467,37 @@ describe("buildClaudePromptText", () => {
 
 describe("buildSdkEnv", () => {
   it("returns undefined when no SDK env override is configured", () => {
-    expect(buildSdkEnv("", "  ", undefined)).toBeUndefined();
+    const originalPath = process.env.PATH;
+    try {
+      process.env.PATH = process.platform === "win32"
+        ? "C:\\Program Files\\Git\\usr\\bin;C:\\Windows\\System32"
+        : "/usr/bin:/bin";
+      expect(buildSdkEnv("", "  ", undefined)).toBeUndefined();
+    } finally {
+      process.env.PATH = originalPath;
+    }
+  });
+
+  it("prefers Git Bash before WindowsApps for Claude SDK subprocesses on Windows", () => {
+    if (process.platform !== "win32") return;
+    const originalPath = process.env.PATH;
+    try {
+      process.env.PATH = [
+        "C:\\Users\\weizhangjian\\AppData\\Local\\Microsoft\\WindowsApps",
+        "C:\\Program Files\\Git\\usr\\bin",
+        "%PATH%",
+        "C:\\Windows\\System32",
+      ].join(";");
+
+      const env = buildSdkEnv("", "", "");
+
+      expect(env).toBeDefined();
+      const parts = env!.PATH!.split(";");
+      expect(parts[0]).toBe("C:\\Program Files\\Git\\usr\\bin");
+      expect(parts).not.toContain("%PATH%");
+    } finally {
+      process.env.PATH = originalPath;
+    }
   });
 
   it("sets requested SDK env overrides and removes conflicting Claude auth/model vars", () => {

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

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { delimiter, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import {
@@ -82,23 +82,73 @@ export function buildSdkEnv(
   const apiKeyTrim = (apiKey ?? "").trim();
   const baseUrlTrim = (baseUrl ?? "").trim();
 
-  if (!subagentModelTrim && !apiKeyTrim && !baseUrlTrim) return undefined;
-
   const env: Record<string, string | undefined> = { ...process.env };
-  delete env.ANTHROPIC_AUTH_TOKEN;
-  delete env.CLAUDE_CODE_OAUTH_TOKEN;
-  delete env.ANTHROPIC_MODEL;
-  delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  delete env.CLAUDE_CODE_EFFORT_LEVEL;
-  delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+  let mutated = preferGitBashOnWindows(env);
+
+  if (subagentModelTrim || apiKeyTrim || baseUrlTrim) {
+    delete env.ANTHROPIC_AUTH_TOKEN;
+    delete env.CLAUDE_CODE_OAUTH_TOKEN;
+    delete env.ANTHROPIC_MODEL;
+    delete env.ANTHROPIC_DEFAULT_OPUS_MODEL;
+    delete env.ANTHROPIC_DEFAULT_SONNET_MODEL;
+    delete env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
+    delete env.CLAUDE_CODE_EFFORT_LEVEL;
+    delete env.CLAUDE_CODE_SUBAGENT_MODEL;
+    mutated = true;
+  }
 
   if (subagentModelTrim) env.CLAUDE_CODE_SUBAGENT_MODEL = subagentModelTrim;
   if (apiKeyTrim) env.ANTHROPIC_API_KEY = apiKeyTrim;
   if (baseUrlTrim) env.ANTHROPIC_BASE_URL = baseUrlTrim;
 
-  return env;
+  return mutated ? env : undefined;
+}
+
+function preferGitBashOnWindows(env: Record<string, string | undefined>): boolean {
+  if (process.platform !== "win32") return false;
+
+  const pathKey = Object.keys(env).find((key) => key.toLowerCase() === "path") ?? "PATH";
+  const rawPath = env[pathKey];
+  if (!rawPath) return false;
+
+  const parts = rawPath.split(delimiter).filter((part) => part && part !== "%PATH%");
+  const preferred = findPreferredGitBashPath(parts);
+  if (!preferred) {
+    const nextPath = parts.join(delimiter);
+    if (nextPath !== rawPath) {
+      env[pathKey] = nextPath;
+      return true;
+    }
+    return false;
+  }
+
+  const preferredLower = preferred.toLowerCase();
+  const reordered = [
+    preferred,
+    ...parts.filter((part) => part.toLowerCase() !== preferredLower),
+  ];
+  const nextPath = reordered.join(delimiter);
+  if (nextPath === rawPath) return false;
+  env[pathKey] = nextPath;
+  return true;
+}
+
+function findPreferredGitBashPath(pathParts: string[]): string | undefined {
+  const programFilesGit = join(
+    process.env.ProgramFiles ?? "C:\\Program Files",
+    "Git",
+    "usr",
+    "bin",
+  );
+  if (existsSync(join(programFilesGit, "bash.exe"))) return programFilesGit;
+
+  return pathParts.find((part) => {
+    if (!/(\\|\/)(Git)(\\|\/)usr(\\|\/)bin$/i.test(part) &&
+        !/(\\|\/)Fork(\\|\/)gitInstance(\\|\/)[^\\/]+(\\|\/)bin$/i.test(part)) {
+      return false;
+    }
+    return existsSync(join(part, "bash.exe"));
+  });
 }
 
 function readMcpServersConfig(): Record<string, unknown> | undefined {
@@ -243,7 +293,6 @@ function buildSdkOptions(args: {
   apiKey?: string;
   baseUrl?: string;
   maxTurn: number;
-  planMode?: boolean;
   abortController?: AbortController;
 }): ClaudeSdkSessionOptions {
   const {
@@ -255,7 +304,6 @@ function buildSdkOptions(args: {
     apiKey,
     baseUrl,
     maxTurn,
-    planMode,
     abortController,
   } = args;
 
@@ -263,7 +311,7 @@ function buildSdkOptions(args: {
     cwd,
     abortController,
     settingSources: ["user", "project", "local"] as SettingSource[],
-    permissionMode: planMode ? "plan" : "bypassPermissions",
+    permissionMode: "bypassPermissions",
     autoCompactEnabled: true,
     maxTurns: maxTurn,
     skills: "all",
@@ -275,9 +323,7 @@ function buildSdkOptions(args: {
     },
   };
 
-  if (!planMode) {
-    options.allowDangerouslySkipPermissions = true;
-  }
+  options.allowDangerouslySkipPermissions = true;
   if (!isEmpty(model)) {
     options.model = model;
   }
@@ -410,7 +456,6 @@ class ClaudeAdapter implements ToolAdapter {
         apiKey: this.apiKey,
         baseUrl: this.baseUrl,
         maxTurn: this.maxTurn,
-        planMode: options?.planMode,
         abortController,
       })),
     );

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();
@@ -1250,11 +1235,10 @@ export async function handleCommand(
         text,
         platform,
         chatId,
-        msgTimestamp,
-        descriptionTool,
-        tid,
-        isPlanOrAsk(text),
-      );
+        msgTimestamp,
+        descriptionTool,
+        tid,
+      );
       logTrace(tid, "DONE", { outcome: "resume_done", sessionId });
       console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
     } catch (err) {
@@ -1328,7 +1312,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 +1353,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]);
@@ -1450,11 +1434,10 @@ export async function handleCommand(
         text,
         platform,
         newChatId,
-        msgTimestamp,
-        tool,
-        tid,
-        isPlanOrAsk(text),
-      );
+        msgTimestamp,
+        tool,
+        tid,
+      );
       console.log(`[${ts()}] [AUTO-P2P 5/5] First prompt sent → OK`);
       logTrace(tid, "DONE", { outcome: "auto_new_p2p_prompt_done", newChatId, sessionId, tool });
     } catch (err) {

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 ?? "";
 
@@ -1015,7 +1013,9 @@ export async function runAgentSession(
           const { title: headerTitle, template: headerTemplate } = formatTerminalHeader(prevState.status);
           const cardContent = truncateContent(prevState.accumulatedContent + prevState.finalReply) || " ";
           const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
-          await pp.cardUpdate(display.cardId, doneCard, nextSeq).catch(() => {});
+          await pp.cardUpdate(display.cardId, doneCard, nextSeq).catch(err => {
+            console.error(`[${ts()}] [DISPLAY] prevState final cardUpdate failed: ${(err as Error).message}`);
+          });
           // cardUpdate IO 期间统一 loop 可能也已处理此 display → 删前检查引用
           const stillOursAfterUpdate = displayCards.get(displayChatId) === display;
           displayCards.delete(displayChatId);
@@ -1110,7 +1110,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);
@@ -1347,7 +1346,9 @@ export function startUnifiedDisplayLoop(): void {
               const { title: headerTitle, template: headerTemplate } = formatTerminalHeader(state.status);
               const cardContent = truncateContent(state.accumulatedContent + state.finalReply) || " ";
               const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
-              await p.cardUpdate(display.cardId, doneCard, nextSeq).catch(() => {});
+              await p.cardUpdate(display.cardId, doneCard, nextSeq).catch(err => {
+                console.error(`[${ts()}] [DISPLAY] terminal cardUpdate failed: ${(err as Error).message}`);
+              });
 
               // 若 session 仍在 activePrompts 中，说明 runAgentSession 的 finally
               // 还没执行，当前 stream state 可能是 stopSession fire-and-forget
@@ -1422,7 +1423,9 @@ export function startUnifiedDisplayLoop(): void {
                   const oldSeqBase = display.sequence;
                   const oldContent = state.accumulatedContent + state.finalReply;
                   const oldCard = buildProgressCard(truncateContent(oldContent) || " ", { showStop: false, headerTitle: "生成中（上轮）" });
-                  await p.cardUpdate(display.cardId, oldCard, oldSeqBase + 1).catch(() => {});
+                  await p.cardUpdate(display.cardId, oldCard, oldSeqBase + 1).catch(err => {
+                    console.error(`[${ts()}] [DISPLAY] rotation old cardUpdate failed: ${(err as Error).message}`);
+                  });
                   markCardDone(sessionId, display.turnCount, display.cardId).catch(() => {});
                   const newCardId = await p.cardCreate(buildProgressCard(
                     "",