chatccc 0.2.77 → 0.2.79

package/package.json

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

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

@@ -581,7 +581,7 @@ describe("createClaudeAdapter — sessionOpts 形状", () => {
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
       autoCompactEnabled: true,
-      settingSources: ["project", "local"],
+      settingSources: ["user", "project", "local"],
     });
   });
 
@@ -856,7 +856,7 @@ describe("createClaudeAdapter — env 注入", () => {
     expect(opts.env.CLAUDE_CODE_EFFORT_LEVEL).toBeUndefined();
   });
 
-  it("第三方 API 配置时仍然加载 CLAUDE.md（settingSources 始终为 project+local）", async () => {
+  it("第三方 API 配置时仍然加载 CLAUDE.md（settingSources 包含 user+project+local）", async () => {
     setupMockCreateSession();
     const adapter = createClaudeAdapter({
       model: "",
@@ -869,7 +869,7 @@ describe("createClaudeAdapter — env 注入", () => {
     await adapter.createSession("/cwd");
 
     const opts = sdk.unstable_v2_createSession.mock.calls[0][0];
-    expect(opts.settingSources).toEqual(["project", "local"]);
+    expect(opts.settingSources).toEqual(["user", "project", "local"]);
   });
 
   it("不修改主进程 process.env（永不污染）", async () => {

package/src/adapters/claude-adapter.ts

@@ -117,10 +117,12 @@ function buildSdkEnv(
 function resolveSettingSources(
   _apiKey: string | undefined,
   _baseUrl: string | undefined,
-): Array<"project" | "local"> {
+): Array<"user" | "project" | "local"> {
   // CLAUDE.md / CLAUDE.local.md 是 Agent 指令文件，与 API 来源无关，
   // 无论使用官方 Anthropic 还是第三方网关都应加载。
-  return ["project", "local"];
+  // 包含 "user" 以使 ~/.claude/settings.json 中的配置（如 mcpServers）生效；
+  // buildSdkEnv() 会删除可能冲突的 env 变量，确保网关配置不被覆盖。
+  return ["user", "project", "local"];
 }
 
 // ---------------------------------------------------------------------------

package/src/session-chat-binding.ts

@@ -100,6 +100,25 @@ export function pickDisplayChat(sessionId: string): string | undefined {
   return chats?.has(candidate) ? candidate : undefined;
 }
 
+// ---------------------------------------------------------------------------
+// queuePreservedChat: 队列消费时保留 display loop 目标 chat
+// 队列消息来自其他群时，不应把 display loop 重定向到该群
+// ---------------------------------------------------------------------------
+
+const queuePreservedChatMap = new Map<string, string>();
+
+/** 队列消费前保存当前 display chat，消费完后自动清除（一次性） */
+export function setQueuePreservedChat(sessionId: string, chatId: string): void {
+  queuePreservedChatMap.set(sessionId, chatId);
+}
+
+/** 获取并清除队列保存的 display chat，没有则返回 undefined */
+export function consumeQueuePreservedChat(sessionId: string): string | undefined {
+  const chat = queuePreservedChatMap.get(sessionId);
+  queuePreservedChatMap.delete(sessionId);
+  return chat;
+}
+
 // ---------------------------------------------------------------------------
 // displayCards: chatId → 展示卡片状态（display loop 用）
 // ---------------------------------------------------------------------------

package/src/session.ts

@@ -53,6 +53,8 @@ import {
   dequeueMessage,
   consumeQueuedMessage,
   cancelQueuedMessage,
+  setQueuePreservedChat,
+  consumeQueuePreservedChat,
 } from "./session-chat-binding.ts";
 
 // ---------------------------------------------------------------------------
@@ -680,8 +682,9 @@ export async function runAgentSession(
   const tid = traceId ?? "";
 
   // 记录用户最后发送消息的群（display loop 只推送到该群）
+  // 如果是从队列消费且队列消息来自其他群，保留原来的 display chat
   recordChatPlatform(_chatId, platform);
-  recordLastActiveChat(sessionId, _chatId);
+  recordLastActiveChat(sessionId, consumeQueuePreservedChat(sessionId) ?? _chatId);
 
   // 并发检查：同一 session 只能有一个活跃 prompt
   if (activePrompts.has(sessionId)) {
@@ -859,12 +862,27 @@ export async function runAgentSession(
     activePrompts.delete(sessionId);
 
     // 消费队列中的缓存消息（异步，不阻塞后续清理）
-    const queued = dequeueMessage(sessionId);
-    if (queued) {
-      console.log(`[${ts()}] [QUEUE] Consuming queued message for session ${sessionId}: "${queued.text.slice(0, 50)}"`);
-      setImmediate(() => {
-        consumeQueuedMessage(platform, queued);
-      });
+    // 用户 /stop 后应丢弃队列消息，避免用户停止后又自动开始新轮
+    if (wasStopped) {
+      const discarded = dequeueMessage(sessionId);
+      if (discarded) {
+        console.log(`[${ts()}] [QUEUE] Discarding queued message for stopped session ${sessionId}`);
+      }
+    } else {
+      const queued = dequeueMessage(sessionId);
+      if (queued) {
+        // 队列消息可能来自其他群，保存当前 display chat 避免 display loop 被
+        // 错误重定向（runAgentSession 会 consumeQueuePreservedChat 并在存在时
+        // 用保存的 chat 替代 queued.chatId 作为 display 目标）
+        const preservedChat = getLastActiveChat(sessionId);
+        if (preservedChat && preservedChat !== queued.chatId) {
+          setQueuePreservedChat(sessionId, preservedChat);
+        }
+        console.log(`[${ts()}] [QUEUE] Consuming queued message for session ${sessionId}: "${queued.text.slice(0, 50)}"`);
+        setImmediate(() => {
+          consumeQueuedMessage(platform, queued);
+        });
+      }
     }
 
     // 写最终状态