chatccc 0.2.93 → 0.2.94

package/src/builtin/index.ts

@@ -1,167 +1,167 @@
-/**
- * builtin/index.ts — ChatCCC 内置 Agent 核心 API
- *
- * ChatSession 是程序化入口，既可以被 CLI 调用，也可以被其他模块（如 ToolAdapter）调用。
- */
-
-import { streamText } from "ai";
-
-// ---------------------------------------------------------------------------
-// 系统提示词 — 编译期冻结常量
-// ---------------------------------------------------------------------------
-
-const SYSTEM_PROMPT = [
-  "你是 ChatCCC 内置 AI 编程助手，运行在终端环境中。",
-  "",
-  "## 基本规则",
-  "- 用中文回复，但代码、命令、文件名保持原文",
-  "- 优先给出直接可用的方案，而非长篇解释",
-  "- 如果用户的问题涉及代码，直接给出代码并说明用法",
-  "- 保持简洁，一次聚焦一个问题",
-].join("\n");
-
-// ---------------------------------------------------------------------------
-// 类型定义
-// ---------------------------------------------------------------------------
-
-export interface ChatSessionConfig {
-  /** DeepSeek API 兼容的服务地址，默认 https://api.deepseek.com/v1 */
-  baseURL?: string;
-  /** API Key（优先用 DEEPSEEK_API_KEY 环境变量） */
-  apiKey?: string;
-  /** 模型名称，默认 deepseek-chat */
-  model?: string;
-}
-
-export interface ChatSessionOptions {
-  /** 会话工作目录 */
-  cwd?: string;
-  /** 自定义系统提示词（会拼接到默认提示词之后） */
-  systemPrompt?: string;
-}
-
-/**
- * 流式响应事件
- */
-export type ChatEvent =
-  | { type: "text"; text: string; accumulated: string }
-  | { type: "done"; text: string }
-  | { type: "error"; message: string };
-
-// ---------------------------------------------------------------------------
-// ChatSession
-// ---------------------------------------------------------------------------
-
-/** 消息角色 */
-type MessageRole = "system" | "user" | "assistant" | "tool";
-
-/** 内部消息类型 */
-interface ChatMessage {
-  role: MessageRole;
-  content: string;
-}
-
-export class ChatSession {
-  private model: any;
-  private messages: ChatMessage[];
-
-  constructor(
-    config: ChatSessionConfig = {},
-    options: ChatSessionOptions = {},
-  ) {
-    const apiKey = config.apiKey ?? process.env.DEEPSEEK_API_KEY;
-    if (!apiKey) {
-      throw new Error(
-        "DEEPSEEK_API_KEY 未设置。请设置环境变量 DEEPSEEK_API_KEY 或传入 apiKey",
-      );
-    }
-
-    const baseURL = config.baseURL ?? "https://api.deepseek.com/v1";
-    const modelId = config.model ?? "deepseek-chat";
-
-    // 动态 import 以支持 ESM 包在 CJS 环境下的加载（tsx 处理）
-    const { createOpenAICompatible } = require("@ai-sdk/openai-compatible");
-    const provider = createOpenAICompatible({
-      name: "deepseek",
-      baseURL,
-      apiKey,
-    });
-    this.model = provider(modelId);
-
-    // 构建系统提示词
-    const systemContent = [SYSTEM_PROMPT];
-    if (options?.systemPrompt) {
-      systemContent.push("", options.systemPrompt);
-    }
-    if (options?.cwd) {
-      systemContent.push("", `当前工作目录: ${options.cwd}`);
-    }
-
-    this.messages = [{ role: "system", content: systemContent.join("\n") }];
-  }
-
-  /**
-   * 发送用户消息，返回异步可迭代的文本流。
-   *
-   * 使用方式：
-   * ```typescript
-   * const session = new ChatSession();
-   * for await (const event of session.chat("帮我看看 package.json")) {
-   *   if (event.type === "text") process.stdout.write(event.text);
-   * }
-   * console.log("完成");
-   * ```
-   */
-  async *chat(
-    userMessage: string,
-    signal?: AbortSignal,
-  ): AsyncIterable<ChatEvent> {
-    this.messages.push({ role: "user", content: userMessage });
-
-    let fullText = "";
-
-    try {
-      const result = streamText({
-        model: this.model,
-        messages: this.messages as any,
-        abortSignal: signal,
-      });
-
-      for await (const chunk of result.textStream) {
-        fullText += chunk;
-        yield { type: "text", text: chunk, accumulated: fullText };
-      }
-
-      this.messages.push({ role: "assistant", content: fullText });
-      yield { type: "done", text: fullText };
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      if ((err as Error).name === "AbortError" || signal?.aborted) {
-        // 被中断时，不保存不完整的助手消息
-        if (fullText) {
-          this.messages.push({ role: "assistant", content: fullText + "\n[已中断]" });
-        }
-        yield { type: "done", text: fullText };
-        return;
-      }
-      yield { type: "error", message };
-      throw err;
-    }
-  }
-
-  /** 返回当前的会话历史（只读） */
-  get history(): ReadonlyArray<ChatMessage> {
-    return this.messages;
-  }
-
-  /** 返回当前轮数（不含 system 消息） */
-  get turnCount(): number {
-    return this.messages.length - 1;
-  }
-
-  /** 清空会话历史，保留 system 消息 */
-  reset(): void {
-    const system = this.messages[0];
-    this.messages = [system];
-  }
+/**
+ * builtin/index.ts — ChatCCC 内置 Agent 核心 API
+ *
+ * ChatSession 是程序化入口，既可以被 CLI 调用，也可以被其他模块（如 ToolAdapter）调用。
+ */
+
+import { streamText } from "ai";
+
+// ---------------------------------------------------------------------------
+// 系统提示词 — 编译期冻结常量
+// ---------------------------------------------------------------------------
+
+const SYSTEM_PROMPT = [
+  "你是 ChatCCC 内置 AI 编程助手，运行在终端环境中。",
+  "",
+  "## 基本规则",
+  "- 用中文回复，但代码、命令、文件名保持原文",
+  "- 优先给出直接可用的方案，而非长篇解释",
+  "- 如果用户的问题涉及代码，直接给出代码并说明用法",
+  "- 保持简洁，一次聚焦一个问题",
+].join("\n");
+
+// ---------------------------------------------------------------------------
+// 类型定义
+// ---------------------------------------------------------------------------
+
+export interface ChatSessionConfig {
+  /** DeepSeek API 兼容的服务地址，默认 https://api.deepseek.com/v1 */
+  baseURL?: string;
+  /** API Key（优先用 DEEPSEEK_API_KEY 环境变量） */
+  apiKey?: string;
+  /** 模型名称，默认 deepseek-chat */
+  model?: string;
+}
+
+export interface ChatSessionOptions {
+  /** 会话工作目录 */
+  cwd?: string;
+  /** 自定义系统提示词（会拼接到默认提示词之后） */
+  systemPrompt?: string;
+}
+
+/**
+ * 流式响应事件
+ */
+export type ChatEvent =
+  | { type: "text"; text: string; accumulated: string }
+  | { type: "done"; text: string }
+  | { type: "error"; message: string };
+
+// ---------------------------------------------------------------------------
+// ChatSession
+// ---------------------------------------------------------------------------
+
+/** 消息角色 */
+type MessageRole = "system" | "user" | "assistant" | "tool";
+
+/** 内部消息类型 */
+interface ChatMessage {
+  role: MessageRole;
+  content: string;
+}
+
+export class ChatSession {
+  private model: any;
+  private messages: ChatMessage[];
+
+  constructor(
+    config: ChatSessionConfig = {},
+    options: ChatSessionOptions = {},
+  ) {
+    const apiKey = config.apiKey ?? process.env.DEEPSEEK_API_KEY;
+    if (!apiKey) {
+      throw new Error(
+        "DEEPSEEK_API_KEY 未设置。请设置环境变量 DEEPSEEK_API_KEY 或传入 apiKey",
+      );
+    }
+
+    const baseURL = config.baseURL ?? "https://api.deepseek.com/v1";
+    const modelId = config.model ?? "deepseek-chat";
+
+    // 动态 import 以支持 ESM 包在 CJS 环境下的加载（tsx 处理）
+    const { createOpenAICompatible } = require("@ai-sdk/openai-compatible");
+    const provider = createOpenAICompatible({
+      name: "deepseek",
+      baseURL,
+      apiKey,
+    });
+    this.model = provider(modelId);
+
+    // 构建系统提示词
+    const systemContent = [SYSTEM_PROMPT];
+    if (options?.systemPrompt) {
+      systemContent.push("", options.systemPrompt);
+    }
+    if (options?.cwd) {
+      systemContent.push("", `当前工作目录: ${options.cwd}`);
+    }
+
+    this.messages = [{ role: "system", content: systemContent.join("\n") }];
+  }
+
+  /**
+   * 发送用户消息，返回异步可迭代的文本流。
+   *
+   * 使用方式：
+   * ```typescript
+   * const session = new ChatSession();
+   * for await (const event of session.chat("帮我看看 package.json")) {
+   *   if (event.type === "text") process.stdout.write(event.text);
+   * }
+   * console.log("完成");
+   * ```
+   */
+  async *chat(
+    userMessage: string,
+    signal?: AbortSignal,
+  ): AsyncIterable<ChatEvent> {
+    this.messages.push({ role: "user", content: userMessage });
+
+    let fullText = "";
+
+    try {
+      const result = streamText({
+        model: this.model,
+        messages: this.messages as any,
+        abortSignal: signal,
+      });
+
+      for await (const chunk of result.textStream) {
+        fullText += chunk;
+        yield { type: "text", text: chunk, accumulated: fullText };
+      }
+
+      this.messages.push({ role: "assistant", content: fullText });
+      yield { type: "done", text: fullText };
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      if ((err as Error).name === "AbortError" || signal?.aborted) {
+        // 被中断时，不保存不完整的助手消息
+        if (fullText) {
+          this.messages.push({ role: "assistant", content: fullText + "\n[已中断]" });
+        }
+        yield { type: "done", text: fullText };
+        return;
+      }
+      yield { type: "error", message };
+      throw err;
+    }
+  }
+
+  /** 返回当前的会话历史（只读） */
+  get history(): ReadonlyArray<ChatMessage> {
+    return this.messages;
+  }
+
+  /** 返回当前轮数（不含 system 消息） */
+  get turnCount(): number {
+    return this.messages.length - 1;
+  }
+
+  /** 清空会话历史，保留 system 消息 */
+  reset(): void {
+    const system = this.messages[0];
+    this.messages = [system];
+  }
 }

package/src/session.ts

@@ -37,7 +37,14 @@ function compressWechatDisplayText(text: string): string {
   if (lines.length <= 10) return text;
   return [...lines.slice(0, 5), "...", ...lines.slice(-5)].join("\n");
 }
-import { readStreamState, writeStreamState, createEmptyStreamState, fixStaleStreamStates } from "./stream-state.ts";
+import {
+  readStreamState,
+  writeStreamState,
+  createEmptyStreamState,
+  fixStaleStreamStates,
+  isFinalReplySentForTurn,
+  markFinalReplySent,
+} from "./stream-state.ts";
 import { addCardToTurn, finalizeTurnCards, markCardDone } from "./turn-cards.ts";
 import {
   bindChatToSession,
@@ -59,6 +66,18 @@ import {
   consumeQueuePreservedChat,
 } from "./session-chat-binding.ts";
 
+async function sendFinalReplyTextOnce(
+  platform: PlatformAdapter,
+  chatId: string,
+  sessionId: string,
+  turnCount: number,
+  text: string,
+): Promise<boolean> {
+  const sent = await platform.sendText(chatId, text).then((ok) => ok !== false).catch(() => false);
+  if (sent) await markFinalReplySent(sessionId, turnCount);
+  return sent;
+}
+
 // ---------------------------------------------------------------------------
 // Shared state (imported by index.ts)
 // ---------------------------------------------------------------------------
@@ -809,27 +828,39 @@ export async function runAgentSession(
       if (display && pp) {
         // 统一 display loop 被 cardBusy 挡住或尚未 tick → 现在终结卡片
         while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
-        const nextSeq = display.sequence + 1;
-        const headerTitle = prevState.status === "stopped" ? "已停止" : "完成";
-        const headerTemplate = prevState.status === "stopped" ? "red" : undefined;
-        const cardContent = truncateContent(prevState.accumulatedContent + prevState.finalReply) || " ";
-        const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
-        await pp.cardUpdate(display.cardId, doneCard, nextSeq).catch(() => {});
-        displayCards.delete(displayChatId);
-
-        // 持久化：标记上一轮所有卡片为终态
-        const finalStatus = prevState.status === "stopped" ? "stopped" : "done";
-        finalizeTurnCards(sessionId, prevState.turnCount, finalStatus).catch(() => {});
 
-        if (prevState.finalReply) {
-          await pp.sendText(displayChatId, prevState.finalReply).catch(() => {});
+        // 竞态防护：等待期间统一 display loop 的 tick 可能也已读到同一个
+        // terminal state，发送了 finalReply 并删除/替换了 displayCards 条目。
+        // 通过引用比较检测——若统一 loop 已处理则只补持久化和头像，不重复发。
+        if (displayCards.get(displayChatId) !== display) {
+          const finalStatus = prevState.status === "stopped" ? "stopped" : "done";
+          finalizeTurnCards(sessionId, prevState.turnCount, finalStatus).catch(() => {});
+          pp.setChatAvatar(displayChatId, prevState.tool, "idle").catch(() => {});
+        } else {
+          const nextSeq = display.sequence + 1;
+          const headerTitle = prevState.status === "stopped" ? "已停止" : "完成";
+          const headerTemplate = prevState.status === "stopped" ? "red" : undefined;
+          const cardContent = truncateContent(prevState.accumulatedContent + prevState.finalReply) || " ";
+          const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
+          await pp.cardUpdate(display.cardId, doneCard, nextSeq).catch(() => {});
+          // cardUpdate IO 期间统一 loop 可能也已处理此 display → 删前检查引用
+          const stillOursAfterUpdate = displayCards.get(displayChatId) === display;
+          displayCards.delete(displayChatId);
+
+          // 持久化：标记上一轮所有卡片为终态
+          const finalStatus = prevState.status === "stopped" ? "stopped" : "done";
+          finalizeTurnCards(sessionId, prevState.turnCount, finalStatus).catch(() => {});
+
+          if (prevState.finalReply && stillOursAfterUpdate && !isFinalReplySentForTurn(prevState)) {
+            await sendFinalReplyTextOnce(pp, displayChatId, sessionId, prevState.turnCount, prevState.finalReply);
+          }
+          pp.setChatAvatar(displayChatId, prevState.tool, "idle").catch(() => {});
         }
-        pp.setChatAvatar(displayChatId, prevState.tool, "idle").catch(() => {});
-      } else if (pp && prevState.finalReply) {
+      } else if (pp && prevState.finalReply && !isFinalReplySentForTurn(prevState)) {
         // 无 display 记录但上一轮有 finalReply（极快轮次），至少发送
         const finalStatus = prevState.status === "stopped" ? "stopped" : "done";
         finalizeTurnCards(sessionId, prevState.turnCount, finalStatus).catch(() => {});
-        await pp.sendText(displayChatId, prevState.finalReply).catch(() => {});
+        await sendFinalReplyTextOnce(pp, displayChatId, sessionId, prevState.turnCount, prevState.finalReply);
       }
       // else: displayCards 无记录且无 finalReply → 无需处理
     }
@@ -1092,9 +1123,18 @@ export function startUnifiedDisplayLoop(): void {
                 replyDelta = state.finalReply;
               }
               const remaining = (accDelta + replyDelta).trim();
+
+              // 若 session 仍在 activePrompts 中，说明 runAgentSession 的 finally
+              // 还没执行，当前 stream state 可能是 stopSession fire-and-forget
+              // 写入的，finalReply 滞后于内存态。跳过发送，等 finally 落盘后
+              // 下一次 tick 再处理，避免发送过期内容或与后续发送重复。
+              if (activePrompts.has(sessionId)) continue;
+
               const tail = "━━━ 回答结束 ━━━";
               const finalMsg = remaining ? remaining + "\n" + tail : tail;
-              await p.sendText(chatId, finalMsg).catch(() => {});
+              if (!isFinalReplySentForTurn(state)) {
+                await sendFinalReplyTextOnce(p, chatId, sessionId, state.turnCount, finalMsg);
+              }
               displayCards.delete(chatId);
             } else {
               // 发送最终结果（卡片平台）
@@ -1105,11 +1145,24 @@ export function startUnifiedDisplayLoop(): void {
               const cardContent = truncateContent(state.accumulatedContent + state.finalReply) || " ";
               const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
               await p.cardUpdate(display.cardId, doneCard, nextSeq).catch(() => {});
+
+              // 若 session 仍在 activePrompts 中，说明 runAgentSession 的 finally
+              // 还没执行，当前 stream state 可能是 stopSession fire-and-forget
+              // 写入的，finalReply 滞后于内存态。卡片已更新为终态外观，但不发送
+              // 文本、不删除 display 条目，留给 finally 落盘后的下一次 tick 处理。
+              if (activePrompts.has(sessionId)) {
+                display.lastSentAccLen = state.accumulatedContent.length;
+                display.lastSentFinalReply = state.finalReply;
+                continue;
+              }
+
               const finalSt = state.status === "stopped" ? "stopped" : "done";
               finalizeTurnCards(sessionId, state.turnCount, finalSt).catch(() => {});
               displayCards.delete(chatId);
               if (state.finalReply) {
-                await p.sendText(chatId, state.finalReply).catch(() => {});
+                if (!isFinalReplySentForTurn(state)) {
+                  await sendFinalReplyTextOnce(p, chatId, sessionId, state.turnCount, state.finalReply);
+                }
               } else if (state.accumulatedContent.trim()) {
                 const short = truncateContent(state.accumulatedContent, 30, 4000);
                 await p.sendText(chatId, `[生成过程]\n${short}`).catch(() => {});
@@ -1165,7 +1218,7 @@ export function startUnifiedDisplayLoop(): void {
                 try {
                   const oldSeqBase = display.sequence;
                   const oldContent = state.accumulatedContent + state.finalReply;
-                  const oldCard = buildProgressCard(truncateContent(oldContent) || " ", { showStop: false, headerTitle: "完成" });
+                  const oldCard = buildProgressCard(truncateContent(oldContent) || " ", { showStop: false, headerTitle: "生成中（上轮）" });
                   await p.cardUpdate(display.cardId, oldCard, oldSeqBase + 1).catch(() => {});
                   markCardDone(sessionId, display.turnCount, display.cardId).catch(() => {});
                   const newCardId = await p.cardCreate(buildProgressCard(

package/src/stream-state.ts

@@ -14,6 +14,9 @@ export interface StreamState {
   status: "running" | "done" | "stopped" | "error";
   accumulatedContent: string;
   finalReply: string;
+  /** The turn whose terminal text reply has already been delivered to IM. */
+  finalReplySentTurn?: number;
+  finalReplySentAt?: number;
   chunkCount: number;
   turnCount: number;
   contextTokens: number;
@@ -97,6 +100,22 @@ export async function writeStreamState(state: StreamState): Promise<void> {
   }
 }
 
+export function isFinalReplySentForTurn(state: Pick<StreamState, "turnCount" | "finalReplySentTurn">): boolean {
+  return state.finalReplySentTurn === state.turnCount;
+}
+
+export async function markFinalReplySent(sessionId: string, turnCount: number, sentAt = Date.now()): Promise<void> {
+  const state = await readStreamState(sessionId);
+  if (!state) return;
+  if (state.turnCount !== turnCount) return;
+  if (state.status === "running") return;
+
+  state.finalReplySentTurn = turnCount;
+  state.finalReplySentAt = sentAt;
+  state.updatedAt = Date.now();
+  await writeStreamState(state);
+}
+
 export function createEmptyStreamState(sessionId: string, cwd: string, tool: string, turnCount: number): StreamState {
   return {
     sessionId,
@@ -138,4 +157,4 @@ export async function fixStaleStreamStates(): Promise<void> {
   } catch (err) {
     console.error(`[${ts()}] [STREAM-STATE] fixStaleStreamStates failed: ${(err as Error).message}`);
   }
-}
+}