chatccc 0.2.47 → 0.2.49

package/src/session-chat-binding.ts

@@ -1,87 +1,103 @@
-// ---------------------------------------------------------------------------
-// session ↔ chats 双向映射
-// ---------------------------------------------------------------------------
-// sessionChatsMap: sessionId → Set<chatId>
-// 由 session.ts 在初始化时调用 rebuildSessionChatsFromRegistry 重建
-// ---------------------------------------------------------------------------
-
-const sessionChatsMap = new Map<string, Set<string>>();
-
-/** 从 registry 数据重建映射（由 session.ts 调用，避免循环依赖） */
-export function rebuildSessionChatsFromRegistry(registry: Record<string, { chatId: string; sessionId: string }>): void {
-  sessionChatsMap.clear();
-  for (const record of Object.values(registry)) {
-    if (!record.sessionId || !record.chatId) continue;
-    bindChatToSession(record.sessionId, record.chatId);
-  }
-}
-
-export function bindChatToSession(sessionId: string, chatId: string): void {
-  let chats = sessionChatsMap.get(sessionId);
-  if (!chats) {
-    chats = new Set();
-    sessionChatsMap.set(sessionId, chats);
-  }
-  chats.add(chatId);
-}
-
-export function unbindChatFromSession(sessionId: string, chatId: string): void {
-  const chats = sessionChatsMap.get(sessionId);
-  if (chats) {
-    chats.delete(chatId);
-    if (chats.size === 0) sessionChatsMap.delete(sessionId);
-  }
-}
-
-export function getChatsForSession(sessionId: string): string[] {
-  const chats = sessionChatsMap.get(sessionId);
-  return chats ? Array.from(chats) : [];
-}
-
-/** 检查 session 是否还有任何群绑定 */
-export function hasChatsForSession(sessionId: string): boolean {
-  return (sessionChatsMap.get(sessionId)?.size ?? 0) > 0;
-}
-
-/** 检查 sessionId 是否正被其他 chatId 使用（有活跃 prompt） */
-export function isSessionRunning(sessionId: string): boolean {
-  return activePrompts.has(sessionId);
-}
-
-// ---------------------------------------------------------------------------
-// activePrompts: sessionId → 活跃 prompt 控制
-// ---------------------------------------------------------------------------
-
-export interface ActivePrompt {
-  controller: AbortController;
-  stopped: boolean;
-  startTime: number;
-}
-
-export const activePrompts = new Map<string, ActivePrompt>();
-
-// ---------------------------------------------------------------------------
-// displayCards: chatId → 展示卡片状态（display loop 用）
-// ---------------------------------------------------------------------------
-
-export interface DisplayCardState {
-  cardId: string;
-  sequence: number;
-  cardBusy: boolean;
-  cardCreatedAt: number;
-  lastSentContent: string;
-  streamErrorNotified: boolean;
-}
-
-export const displayCards = new Map<string, DisplayCardState>();
-
-/** displayLoops: sessionId → 展示循环的 stop 函数 */
-export const displayLoops = new Map<string, () => void>();
-
-export function resetBindingState(): void {
-  sessionChatsMap.clear();
-  activePrompts.clear();
-  displayCards.clear();
-  for (const stop of displayLoops.values()) stop();
-  displayLoops.clear();
+// ---------------------------------------------------------------------------
+// session ↔ chats 双向映射
+// ---------------------------------------------------------------------------
+// sessionChatsMap: sessionId → Set<chatId>
+// 由 session.ts 在初始化时调用 rebuildSessionChatsFromRegistry 重建
+// ---------------------------------------------------------------------------
+
+const sessionChatsMap = new Map<string, Set<string>>();
+
+/** 从 registry 数据重建映射（由 session.ts 调用，避免循环依赖） */
+export function rebuildSessionChatsFromRegistry(registry: Record<string, { chatId: string; sessionId: string }>): void {
+  sessionChatsMap.clear();
+  for (const record of Object.values(registry)) {
+    if (!record.sessionId || !record.chatId) continue;
+    bindChatToSession(record.sessionId, record.chatId);
+  }
+}
+
+export function bindChatToSession(sessionId: string, chatId: string): void {
+  let chats = sessionChatsMap.get(sessionId);
+  if (!chats) {
+    chats = new Set();
+    sessionChatsMap.set(sessionId, chats);
+  }
+  chats.add(chatId);
+}
+
+export function unbindChatFromSession(sessionId: string, chatId: string): void {
+  const chats = sessionChatsMap.get(sessionId);
+  if (chats) {
+    chats.delete(chatId);
+    if (chats.size === 0) sessionChatsMap.delete(sessionId);
+  }
+}
+
+export function getChatsForSession(sessionId: string): string[] {
+  const chats = sessionChatsMap.get(sessionId);
+  return chats ? Array.from(chats) : [];
+}
+
+/** 检查 session 是否还有任何群绑定 */
+export function hasChatsForSession(sessionId: string): boolean {
+  return (sessionChatsMap.get(sessionId)?.size ?? 0) > 0;
+}
+
+/** 检查 sessionId 是否正被其他 chatId 使用（有活跃 prompt） */
+export function isSessionRunning(sessionId: string): boolean {
+  return activePrompts.has(sessionId);
+}
+
+// ---------------------------------------------------------------------------
+// activePrompts: sessionId → 活跃 prompt 控制
+// ---------------------------------------------------------------------------
+
+export interface ActivePrompt {
+  controller: AbortController;
+  stopped: boolean;
+  startTime: number;
+}
+
+export const activePrompts = new Map<string, ActivePrompt>();
+
+// ---------------------------------------------------------------------------
+// lastActiveChat: sessionId → 用户最后发送消息的 chatId
+// 用于确保 display loop 只推送到用户最近活跃的群
+// ---------------------------------------------------------------------------
+
+const lastActiveChatMap = new Map<string, { chatId: string; timestamp: number }>();
+
+export function recordLastActiveChat(sessionId: string, chatId: string): void {
+  lastActiveChatMap.set(sessionId, { chatId, timestamp: Date.now() });
+}
+
+export function getLastActiveChat(sessionId: string): string | undefined {
+  return lastActiveChatMap.get(sessionId)?.chatId;
+}
+
+// ---------------------------------------------------------------------------
+// displayCards: chatId → 展示卡片状态（display loop 用）
+// ---------------------------------------------------------------------------
+
+export interface DisplayCardState {
+  cardId: string;
+  sequence: number;
+  cardBusy: boolean;
+  cardCreatedAt: number;
+  lastSentContent: string;
+  streamErrorNotified: boolean;
+}
+
+export const displayCards = new Map<string, DisplayCardState>();
+
+/** displayLoops: sessionId → 展示循环的 stop 函数 */
+export const displayLoops = new Map<string, () => void>();
+
+export function resetBindingState(): void {
+  sessionChatsMap.clear();
+  lastActiveChatMap.clear();
+  activePrompts.clear();
+  displayCards.clear();
+  for (const stop of displayLoops.values()) stop();
+  displayLoops.clear();
 }

package/src/session.ts

@@ -43,6 +43,8 @@ import {
   displayCards,
   displayLoops,
   rebuildSessionChatsFromRegistry,
+  recordLastActiveChat,
+  getLastActiveChat,
 } from "./session-chat-binding.ts";
 
 // ---------------------------------------------------------------------------
@@ -245,6 +247,12 @@ export async function recordSessionRegistry(update: SessionRegistryUpdate): Prom
   await saveSessionRegistry(data);
 }
 
+export async function removeSessionRegistryRecord(chatId: string): Promise<void> {
+  const data = await loadSessionRegistry();
+  delete data[chatId];
+  await saveSessionRegistry(data);
+}
+
 export function _setSessionRegistryFileForTest(filePath: string): void {
   sessionRegistryFile = filePath;
 }
@@ -423,6 +431,9 @@ export async function runAgentSession(
 ): Promise<void> {
   const tid = traceId ?? "";
 
+  // 记录用户最后发送消息的群（display loop 只推送到该群）
+  recordLastActiveChat(sessionId, _chatId);
+
   // 并发检查：同一 session 只能有一个活跃 prompt
   if (activePrompts.has(sessionId)) {
     if (tid) logTrace(tid, "BLOCKED", { outcome: "session_busy", sessionId });
@@ -513,9 +524,10 @@ export async function runAgentSession(
   // 启动 display loop
   ensureDisplayLoop(sessionId);
 
-  // 设置所有绑定群头像为 busy
-  for (const cid of getChatsForSession(sessionId)) {
-    setChatAvatar(token, cid, tool, "busy").catch(() => {});
+  // 设置最后活跃群头像为 busy
+  const activeCid = getLastActiveChat(sessionId) ?? getChatsForSession(sessionId)[0];
+  if (activeCid) {
+    setChatAvatar(token, activeCid, tool, "busy").catch(() => {});
   }
 
   const state: AccumulatorState = {
@@ -605,6 +617,8 @@ export async function runAgentSession(
           running: false,
         });
       }
+      const active1 = getLastActiveChat(sessionId) ?? getChatsForSession(sessionId)[0];
+      if (active1) setChatAvatar(token, active1, tool, "idle").catch(() => {});
       console.log(`[${ts()}] Session ${sessionId} stopped (content chunks: ${state.chunkCount})`);
       if (tid) logTrace(tid, "SESSION_END", { sessionId, outcome: "stopped", chunks: state.chunkCount });
     } else {
@@ -619,8 +633,9 @@ export async function runAgentSession(
           startTime: finfo?.startTime ?? now,
           running: false,
         });
-        setChatAvatar(token, cid, tool, "idle").catch(() => {});
       }
+      const active2 = getLastActiveChat(sessionId) ?? getChatsForSession(sessionId)[0];
+      if (active2) setChatAvatar(token, active2, tool, "idle").catch(() => {});
       console.log(`[${ts()}] Session ${sessionId} stream complete (content chunks: ${state.chunkCount})`);
       if (tid) logTrace(tid, "SESSION_END", { sessionId, chunks: state.chunkCount, finalTextLen: finalReply.length });
     }
@@ -628,7 +643,7 @@ export async function runAgentSession(
 }
 
 // ---------------------------------------------------------------------------
-// ensureDisplayLoop — 每个 session 一个 display 循环，读文件更新所有绑定群的卡片
+// ensureDisplayLoop — 每个 session 一个 display 循环，读文件更新最后活跃群的卡片
 // ---------------------------------------------------------------------------
 
 const CARD_ROTATE_MS = 9 * 60 * 1000;
@@ -643,112 +658,116 @@ export function ensureDisplayLoop(sessionId: string): void {
       const state = await readStreamState(sessionId);
       if (!state) return;
 
-      const chats = getChatsForSession(sessionId);
-      if (chats.length === 0) {
-        // 无绑定群，若 session 已结束则停止 loop
+      const chatId = getLastActiveChat(sessionId);
+      if (!chatId) {
+        // 无活跃群，若 session 已结束则停止 loop
         if (state.status !== "running") {
           clearInterval(interval);
           displayLoops.delete(sessionId);
+          // 兜底：lastActiveChatMap 可能因进程重启丢失，从 registry 映射恢复头像
+          const fallbackChat = getChatsForSession(sessionId)[0];
+          if (fallbackChat) {
+            const t = await import("./feishu-platform.ts").then(m => m.getTenantAccessToken());
+            setChatAvatar(t, fallbackChat, state.tool, "idle").catch(() => {});
+          }
         }
         return;
       }
 
       const isTerminal = state.status !== "running";
 
-      for (const chatId of chats) {
-        try {
-          // getTenantAccessToken 有缓存，多次调用开销低
-          const tokenModule = await import("./feishu-platform.ts");
-          const token = await tokenModule.getTenantAccessToken();
-          const display = displayCards.get(chatId);
-
-          if (isTerminal) {
-            // 发送最终结果
-            if (display) {
-              while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
-              const nextSeq = display.sequence + 1;
-              const headerTitle = state.status === "stopped" ? "已停止" : "完成";
-              const headerTemplate = state.status === "stopped" ? "red" : undefined;
-              const cardContent = state.accumulatedContent || " ";
-              const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
-              await updateCardKitCard(token, display.cardId, doneCard, nextSeq).catch(() => {});
-              displayCards.delete(chatId);
-            }
-            if (state.finalReply) {
-              await sendTextReply(token, chatId, state.finalReply).catch(() => {});
-            } else if (!display && state.accumulatedContent.trim()) {
-              const short = truncateContent(state.accumulatedContent, 30, 4000);
-              await sendTextReply(token, chatId, `[生成过程]\n${short}`).catch(() => {});
+      try {
+        // getTenantAccessToken 有缓存，多次调用开销低
+        const tokenModule = await import("./feishu-platform.ts");
+        const token = await tokenModule.getTenantAccessToken();
+        const display = displayCards.get(chatId);
+
+        if (isTerminal) {
+          // 发送最终结果
+          if (display) {
+            while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
+            const nextSeq = display.sequence + 1;
+            const headerTitle = state.status === "stopped" ? "已停止" : "完成";
+            const headerTemplate = state.status === "stopped" ? "red" : undefined;
+            const cardContent = state.accumulatedContent || " ";
+            const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
+            await updateCardKitCard(token, display.cardId, doneCard, nextSeq).catch(() => {});
+            displayCards.delete(chatId);
+          }
+          if (state.finalReply) {
+            await sendTextReply(token, chatId, state.finalReply).catch(() => {});
+          } else if (!display && state.accumulatedContent.trim()) {
+            const short = truncateContent(state.accumulatedContent, 30, 4000);
+            await sendTextReply(token, chatId, `[生成过程]\n${short}`).catch(() => {});
+          }
+          setChatAvatar(token, chatId, state.tool, "idle").catch(() => {});
+        } else {
+          // running: 创建或更新卡片
+          if (!display) {
+            const cardId = await createCardKitCard(token, buildProgressCard("", { showStop: true, headerTitle: "生成中..." })).catch(() => null);
+            if (cardId) {
+              await sendCardKitMessage(token, chatId, cardId).catch(() => null);
+              displayCards.set(chatId, {
+                cardId,
+                sequence: 1,
+                cardBusy: false,
+                cardCreatedAt: Date.now(),
+                lastSentContent: "",
+                streamErrorNotified: false,
+              });
             }
-            setChatAvatar(token, chatId, state.tool, "idle").catch(() => {});
           } else {
-            // running: 创建或更新卡片
-            if (!display) {
-              const cardId = await createCardKitCard(token, buildProgressCard("", { showStop: true, headerTitle: "生成中..." })).catch(() => null);
-              if (cardId) {
-                await sendCardKitMessage(token, chatId, cardId).catch(() => null);
-                displayCards.set(chatId, {
-                  cardId,
-                  sequence: 1,
-                  cardBusy: false,
-                  cardCreatedAt: Date.now(),
-                  lastSentContent: "",
-                  streamErrorNotified: false,
-                });
-              }
-            } else {
-              if (display.cardBusy) continue;
-
-              // 卡片轮转
-              if (Date.now() - display.cardCreatedAt > CARD_ROTATE_MS) {
-                display.cardBusy = true;
-                try {
-                  const oldSeqBase = display.sequence;
-                  const oldDisplayContent = truncateContent(state.accumulatedContent + state.finalReply) || "处理中...";
-                  const oldCard = buildProgressCard(oldDisplayContent, { showStop: false, headerTitle: "生成中...（上轮）" });
-                  await updateCardKitCard(token, display.cardId, oldCard, oldSeqBase + 1).catch(() => {});
-                  const newCardId = await createCardKitCard(token, buildProgressCard("", { showStop: true, headerTitle: "生成中..." }));
-                  if (newCardId) {
-                    await sendCardKitMessage(token, chatId, newCardId);
-                    display.cardId = newCardId;
-                    display.sequence = 1;
-                    display.cardCreatedAt = Date.now();
-                    display.lastSentContent = "";
-                    display.streamErrorNotified = false;
-                  }
-                } catch (err) {
-                  console.error(`[${ts()}] [CARDIKT] rotation FAIL for ${chatId}: ${(err as Error).message}`);
-                } finally {
-                  display.cardBusy = false;
-                }
-                continue;
-              }
+            if (display.cardBusy) return;
 
-              dotCount = (dotCount % 9) + 1;
-              const content = truncateContent(state.accumulatedContent + state.finalReply + "\n" + "。".repeat(dotCount));
-              if (content === display.lastSentContent) continue;
-
-              display.lastSentContent = content;
+            // 卡片轮转
+            if (Date.now() - display.cardCreatedAt > CARD_ROTATE_MS) {
               display.cardBusy = true;
-              const mySeq = display.sequence + 1;
               try {
-                const card = buildProgressCard(content, { showStop: true, headerTitle: "生成中..." });
-                await updateCardKitCard(token, display.cardId, card, mySeq);
-                display.sequence = mySeq;
-              } catch (err) {
-                console.error(`[${ts()}] CardKit update error: chatId=${chatId} ${(err as Error).message}`);
-                if (!display.streamErrorNotified) {
-                  display.streamErrorNotified = true;
-                  sendTextReply(token, chatId, "卡片更新失败，结果将以文本形式发送。").catch(() => {});
+                const oldSeqBase = display.sequence;
+                const oldDisplayContent = truncateContent(state.accumulatedContent + state.finalReply) || "处理中...";
+                const oldCard = buildProgressCard(oldDisplayContent, { showStop: false, headerTitle: "生成中...（上轮）" });
+                await updateCardKitCard(token, display.cardId, oldCard, oldSeqBase + 1).catch(() => {});
+                const newCardId = await createCardKitCard(token, buildProgressCard("", { showStop: true, headerTitle: "生成中..." }));
+                if (newCardId) {
+                  await sendCardKitMessage(token, chatId, newCardId);
+                  display.cardId = newCardId;
+                  display.sequence = 1;
+                  display.cardCreatedAt = Date.now();
+                  display.lastSentContent = "";
+                  display.streamErrorNotified = false;
                 }
+              } catch (err) {
+                console.error(`[${ts()}] [CARDIKT] rotation FAIL for ${chatId}: ${(err as Error).message}`);
               } finally {
                 display.cardBusy = false;
               }
+              return;
+            }
+
+            dotCount = (dotCount % 9) + 1;
+            const content = truncateContent(state.accumulatedContent + state.finalReply + "\n" + "。".repeat(dotCount));
+            if (content === display.lastSentContent) return;
+
+            display.lastSentContent = content;
+            display.cardBusy = true;
+            const mySeq = display.sequence + 1;
+            try {
+              const card = buildProgressCard(content, { showStop: true, headerTitle: "生成中..." });
+              await updateCardKitCard(token, display.cardId, card, mySeq);
+              display.sequence = mySeq;
+            } catch (err) {
+              console.error(`[${ts()}] CardKit update error: chatId=${chatId} ${(err as Error).message}`);
+              if (!display.streamErrorNotified) {
+                display.streamErrorNotified = true;
+                sendTextReply(token, chatId, "卡片更新失败，结果将以文本形式发送。").catch(() => {});
+              }
+            } finally {
+              display.cardBusy = false;
             }
           }
-        } catch (err) {
-          console.error(`[${ts()}] Display loop error for ${chatId}: ${(err as Error).message}`);
         }
+      } catch (err) {
+        console.error(`[${ts()}] Display loop error for ${chatId}: ${(err as Error).message}`);
       }
 
       if (isTerminal) {