chatccc 0.2.139 → 0.2.140

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.

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.139",
+  "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/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 {

package/src/orchestrator.ts

@@ -1235,11 +1235,10 @@ export async function handleCommand(
         text,
         platform,
         chatId,
-        msgTimestamp,
-        descriptionTool,
-        tid,
-        false,
-      );
+        msgTimestamp,
+        descriptionTool,
+        tid,
+      );
       logTrace(tid, "DONE", { outcome: "resume_done", sessionId });
       console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
     } catch (err) {
@@ -1435,11 +1434,10 @@ export async function handleCommand(
         text,
         platform,
         newChatId,
-        msgTimestamp,
-        tool,
-        tid,
-        false,
-      );
+        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

@@ -1013,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);
@@ -1344,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
@@ -1419,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(
                     "",