chatccc 0.2.139 → 0.2.141

package/agent-prompts/claude_specific.md

@@ -1,53 +1,29 @@
-# Claude-Specific Injection Prompt
+## 重复成功命令保护
 
-Use this prompt as the Claude Agent SDK injection prompt for this project.
+通过 Claude Agent SDK 在本项目中工作时，重复成功的 shell 命令是完成信号，不应继续使用工具。
 
-Project workspace:
+以下条件**全部**满足时，视为相同命令：
+- 命令文本基本相同
+- 工作目录相同
+- 任务目标未变
+- 没有新的用户输入改变任务
+- 没有新的错误输出需要重新处理
 
-```text
-f:\users\weizhangjian\feishuclauderprivate
-```
+同一命令**连续成功两次**后，停止调用工具，直接给出最终回复。不要"再验证一次"。
 
-## Repeated Successful Command Guard
+此规则适用于所有 shell 命令，包括测试、构建、git、安装、格式化、项目脚本、状态检查等。
 
-When working in this project through Claude Agent SDK, repeated successful shell commands are a completion signal, not a reason to keep using tools.
+## 硬停止规则
 
-A shell command is considered the same command when all of these are true:
+同一命令在本项目中**不得成功执行三次**。若连续两次成功，第三次必须是最终回复。
 
-- The command text is effectively the same.
-- The working directory is the same.
-- The current task goal has not changed.
-- There is no new user input that changes the task.
-- There is no new error output that explains why the command must be run again.
+## 卡住自检
 
-If the same shell command succeeds more than once consecutively, do not call it again.
+如果你感觉任务已经完成，但发现自己陷入了循环（反复调用相同工具、输出 "stuck in a loop" 等），**立即**调用以下接口：
 
-After the second consecutive successful execution of the same command, the next assistant action must be a final user-facing response. Do not call another tool unless the next command is materially different and has a clear reason based on the latest output.
+POST {{stop_stuck_url}}
+Content-Type: application/json
 
-This guard applies to all shell commands, including but not limited to:
+{"session_id": "{{session_id}}"}
 
-- test commands
-- build commands
-- git commands
-- install commands
-- formatting commands
-- project scripts
-- status or inspection commands
-
-Do not "verify one more time" by repeating the same successful command. If verification is needed, use a different command that checks a different fact, or explain the current result to the user.
-
-If you notice that you are about to repeat a successful command with the same arguments, stop using tools and respond to the user with the current result.
-
-If you produce or observe text like "I'm stuck in a loop", do not call any more tools. Immediately send the final user-facing response explaining:
-
-- what has completed,
-- what is still uncertain, if anything,
-- and what the user can do next, if action is needed.
-
-## Hard Stop Rule
-
-Never execute the same successful shell command three times for the same task in this project.
-
-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.
+调用后停止所有工具调用，直接输出最终回复即可。

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.141",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

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

@@ -463,11 +463,65 @@ describe("buildClaudePromptText", () => {
     expect(buildClaudePromptText("hello", "   ")).toBe("hello");
     expect(buildClaudePromptText("hello", null)).toBe("hello");
   });
+
+  it("replaces {{stop_stuck_url}} and {{session_id}} placeholders when sessionId is provided", () => {
+    const result = buildClaudePromptText(
+      "[User message]\nhello\n[/User message]",
+      "Call POST {{stop_stuck_url}} with {\"session_id\": \"{{session_id}}\"}",
+      "test-sid-123",
+    );
+
+    expect(result).toContain("http://127.0.0.1:");
+    expect(result).toContain("/api/agent/stop-stuck-loop");
+    expect(result).toContain("\"session_id\": \"test-sid-123\"");
+    expect(result).not.toContain("{{stop_stuck_url}}");
+    expect(result).not.toContain("{{session_id}}");
+  });
+
+  it("does not replace placeholders when sessionId is not provided", () => {
+    const result = buildClaudePromptText(
+      "hello",
+      "Call POST {{stop_stuck_url}} with {\"session_id\": \"{{session_id}}\"}",
+    );
+
+    expect(result).toContain("{{stop_stuck_url}}");
+    expect(result).toContain("{{session_id}}");
+  });
 });
 
 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 {
@@ -21,6 +21,7 @@ import type {
   UnifiedBlock,
   UnifiedStreamMessage,
 } from "./adapter-interface.ts";
+import { CHATCCC_PORT } from "../config.ts";
 import {
   defaultClaudeSessionMetaStore,
   type ClaudeSessionMetaStore,
@@ -82,23 +83,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 {
@@ -210,10 +261,18 @@ export function readClaudeSpecificInjectionPrompt(): string | null {
 export function buildClaudePromptText(
   userText: string,
   injectionPrompt: string | null = readClaudeSpecificInjectionPrompt(),
+  sessionId?: string,
 ): string {
-  const prompt = injectionPrompt?.trim();
+  let prompt = injectionPrompt?.trim();
   if (!prompt) return userText;
 
+  // 动态替换注入提示词中的占位符（端口、session_id 等）
+  if (sessionId) {
+    prompt = prompt
+      .replace(/\{\{stop_stuck_url\}\}/g, `http://127.0.0.1:${CHATCCC_PORT}/api/agent/stop-stuck-loop`)
+      .replace(/\{\{session_id\}\}/g, sessionId);
+  }
+
   return [
     "[ChatCCC Claude-specific injection prompt]",
     prompt,
@@ -411,7 +470,7 @@ class ClaudeAdapter implements ToolAdapter {
     );
 
     try {
-      await session.send(buildClaudePromptText(userText));
+      await session.send(buildClaudePromptText(userText, undefined, sessionId));
       for await (const raw of session.stream()) {
         if (abortController.signal.aborted) {
           aborted = true;

package/src/agent-stop-stuck.ts

@@ -0,0 +1,89 @@
+import type { IncomingMessage, ServerResponse } from "node:http";
+
+import { readUtf8JsonBody } from "./agent-rpc-body.ts";
+import { activePrompts, getChatsForSession, cancelQueuedMessage } from "./session-chat-binding.ts";
+import { getPlatformForChat } from "./session.ts";
+import { readStreamState, writeStreamState } from "./stream-state.ts";
+import { ts } from "./config.ts";
+
+export const AGENT_STOP_STUCK_PATH = "/api/agent/stop-stuck-loop";
+
+const MAX_REQUEST_BYTES = 8 * 1024;
+
+function jsonReply(res: ServerResponse, status: number, data: unknown): void {
+  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+  res.end(JSON.stringify(data));
+}
+
+export async function handleAgentStopStuckRequest(
+  req: IncomingMessage,
+  res: ServerResponse,
+): Promise<boolean> {
+  const url = new URL(req.url ?? "/", "http://127.0.0.1");
+  if (url.pathname !== AGENT_STOP_STUCK_PATH) return false;
+
+  if (req.method !== "POST") {
+    jsonReply(res, 405, { error: "Method not allowed, use POST" });
+    return true;
+  }
+
+  let body: { session_id?: string };
+  try {
+    body = await readUtf8JsonBody<{ session_id?: string }>(req, MAX_REQUEST_BYTES);
+  } catch (err) {
+    jsonReply(res, 400, { error: `Invalid request body: ${(err as Error).message}` });
+    return true;
+  }
+
+  const sessionId = typeof body?.session_id === "string" ? body.session_id.trim() : "";
+  if (!sessionId) {
+    jsonReply(res, 400, { error: "session_id is required" });
+    return true;
+  }
+
+  const prompt = activePrompts.get(sessionId);
+  if (!prompt) {
+    jsonReply(res, 404, { error: "Session not found or not running" });
+    return true;
+  }
+
+  // 先发"卡住"提示消息给所有绑定的群聊
+  const chats = getChatsForSession(sessionId);
+  for (const chatId of chats) {
+    const platform = getPlatformForChat(chatId);
+    if (platform) {
+      await platform.sendText(chatId, "⚠️ Agent 检测到自己陷入了循环，正在结束生成…").catch(() => {});
+    }
+  }
+
+  // 丢弃缓存队列中的消息
+  cancelQueuedMessage(sessionId);
+
+  // fire-and-forget：立即把 stream-state 标为 done（而非 stopped），
+  // 让 display loop 以"正常完成"而非"已停止"来渲染卡片和最终回复。
+  // 不设 prompt.stopped = true，这样 runAgentSession 的 finally 也会写 "done"。
+  void (async () => {
+    try {
+      const current = await readStreamState(sessionId);
+      if (!current) return;
+      if (current.status !== "running") return;
+      await writeStreamState({
+        ...current,
+        status: "done",
+        updatedAt: Date.now(),
+      });
+    } catch (err) {
+      console.warn(
+        `[${ts()}] [STUCK-LOOP] writeStreamState(done) failed for ${sessionId}: ${(err as Error).message}`,
+      );
+    }
+  })();
+
+  // 不设 stopped 标记 → finally block 写 "done" → 卡片正常结束
+  prompt.controller.abort();
+
+  console.log(`[${ts()}] [STUCK-LOOP] Session ${sessionId} aborted as done (agent detected stuck loop)`);
+
+  jsonReply(res, 200, { ok: true });
+  return true;
+}

package/src/index.ts

@@ -78,6 +78,7 @@ import { SimulatedPlatform, SIM_DEFAULT_CHAT_ID } from "./sim-platform.ts";
 import { setMessageHandler } from "./sim-store.ts";
 import { handleAgentImageRequest } from "./agent-image-rpc.ts";
 import { handleAgentFileRequest } from "./agent-file-rpc.ts";
+import { handleAgentStopStuckRequest } from "./agent-stop-stuck.ts";
 import {
   createCardKitCard,
   sendCardKitMessage,
@@ -689,7 +690,7 @@ async function main(): Promise<void> {
     setExtraApiHandler(async (req, res) => {
       const injected = await handleSimInjectMessage(req, res);
       if (injected) return true;
-      return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res));
+      return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res)) || (await handleAgentStopStuckRequest(req, res));
     });
 
     const simServer = createServer(createUiRouter());
@@ -748,7 +749,7 @@ async function main(): Promise<void> {
     });
   });
   setExtraApiHandler(async (req, res) => {
-    return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res));
+    return (await handleAgentImageRequest(req, res)) || (await handleAgentFileRequest(req, res)) || (await handleAgentStopStuckRequest(req, res));
   });
 
   console.log(`[启动 2/7] 环境与凭证检查`);

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(
                     "",