@qwen-code/qwen-code 0.22.0 → 0.22.2-nightly.20260828.7357136dd1

package/chunks/{dist-J6P3C52Z.js → dist-LVZCXVPF.js}

@@ -11,7 +11,7 @@ import {
   sanitizePromptText,
   sanitizeSenderName,
   truncateCodePoints
-} from "./chunk-AW27A43Y.js";
+} from "./chunk-ICURCKIU.js";
 import "./chunk-IW6RQPQB.js";
 import "./chunk-CQ35AJ4Z.js";
 import {
@@ -31,6 +31,7 @@ init_esbuild_shims();
 
 // packages/channels/qqbot/dist/QQChannel.js
 init_esbuild_shims();
+import { AsyncLocalStorage } from "node:async_hooks";
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, renameSync, unlinkSync } from "node:fs";
 import { join as join2 } from "node:path";
 
@@ -403,6 +404,8 @@ var QQChannel = class _QQChannel extends ChannelBase {
   chatTypeMap = /* @__PURE__ */ new Map();
   /** Track the latest user messageId per chatId for proper reply (msg_id). */
   replyMsgId = /* @__PURE__ */ new Map();
+  replyContextByMessageId = /* @__PURE__ */ new Map();
+  inboundReplyContext = new AsyncLocalStorage();
   /** msg_seq counter per user messageId, for multi-block streaming. */
   msgSeqMap = /* @__PURE__ */ new Map();
   /** Periodic cleanup timer for expired replyMsgId entries. */
@@ -469,6 +472,21 @@ var QQChannel = class _QQChannel extends ChannelBase {
   _reconnectId = 0;
   blockStreaming = false;
   flushedSessions = /* @__PURE__ */ new Set();
+  /**
+   * Sessions with a prompt turn currently in flight, tracked via
+   * onPromptStart/onPromptEnd.
+   *
+   * This is the discriminator the cron textChunk handler uses to tell
+   * "prompt-response chunk" from "cron/non-prompt chunk". streamState
+   * cannot serve that role (#6094): it is never populated when
+   * blockStreaming is 'on' (onResponseChunk early-returns), so prompt
+   * chunks leak into cronBuffer; and a residual entry from a finished
+   * turn's unsettled flush silently blocks cron delivery. This set is
+   * reliable because ChannelBase always brackets a prompt turn with
+   * onPromptStart and onPromptEnd (onPromptEnd runs in the prompt path's
+   * finally, even on error/cancel), independent of streaming config.
+   */
+  activePromptSessions = /* @__PURE__ */ new Set();
   qqStatePath;
   /**
    * Path to the global sessions.json managed by start.ts.
@@ -523,7 +541,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
       }
       if (!wasInCronFlow)
         return;
-      if (this.streamState.has(sessionId))
+      if (this.activePromptSessions.has(sessionId))
         return;
       let entry = this.cronBuffer.get(sessionId);
       if (!entry) {
@@ -548,7 +566,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
         if (toFlush) {
           const target = this.router.getTarget(sessionId);
           if (target) {
-            this.sendMessage(target.chatId, toFlush).then(() => {
+            this.sendMessageWithReplyContext(target.chatId, toFlush).then(() => {
               if (!entry.buffer && this.cronBuffer.get(sessionId) === entry)
                 this.cronBuffer.delete(sessionId);
             }).catch((err) => {
@@ -578,7 +596,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
                   this.cronBuffer.delete(sessionId);
                   return;
                 }
-                this.sendMessage(retryTarget.chatId, toFlush).then(() => {
+                this.sendMessageWithReplyContext(retryTarget.chatId, toFlush).then(() => {
                   entry.pendingRetry = "";
                   if (!entry.buffer && this.cronBuffer.get(sessionId) === entry)
                     this.cronBuffer.delete(sessionId);
@@ -612,7 +630,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
                       this.cronBuffer.delete(sessionId);
                       return;
                     }
-                    this.sendMessage(retryTarget2.chatId, toFlush).then(() => {
+                    this.sendMessageWithReplyContext(retryTarget2.chatId, toFlush).then(() => {
                       entry.pendingRetry = "";
                       if (!entry.buffer && this.cronBuffer.get(sessionId) === entry)
                         this.cronBuffer.delete(sessionId);
@@ -743,7 +761,26 @@ var QQChannel = class _QQChannel extends ChannelBase {
       }
     }
   }
+  async handleInbound(envelope) {
+    const context = envelope.messageId ? this.replyContextByMessageId.get(envelope.messageId) : void 0;
+    if (!context || context.chatId !== envelope.chatId) {
+      await super.handleInbound(envelope);
+      return;
+    }
+    await this.inboundReplyContext.run(context, () => super.handleInbound(envelope));
+  }
   async sendMessage(chatId, text) {
+    const inboundContext = this.inboundReplyContext.getStore();
+    const latest = this.replyMsgId.get(chatId);
+    const replyContext = inboundContext?.chatId === chatId ? inboundContext : latest ? { chatId, ...latest } : void 0;
+    await this.sendMessageWithReplyContext(chatId, text, replyContext);
+  }
+  async sendResponseMessage(chatId, text, sessionId) {
+    const messageId = this.getResponseMessageId(sessionId);
+    const replyContext = messageId ? this.replyContextByMessageId.get(messageId) : void 0;
+    await this.sendMessageWithReplyContext(chatId, text, replyContext);
+  }
+  async sendMessageWithReplyContext(chatId, text, replyContext) {
     if (text.trim() === "<noreply>") {
       process.stderr.write(`[QQ:${this.name}] <noreply> skipped for ${sanitizeLogText(chatId, 64)}
 `);
@@ -752,13 +789,12 @@ var QQChannel = class _QQChannel extends ChannelBase {
     const route = await this.resolveRoute(chatId);
     if (!route)
       return;
-    const entry = this.replyMsgId.get(chatId);
+    const entry = replyContext?.chatId === chatId ? replyContext : void 0;
     const msgId = entry && Date.now() - entry.timestamp < _QQChannel.REPLY_MSG_ID_TTL_MS ? entry.msgId : void 0;
     if (entry && !msgId) {
       process.stderr.write(`[QQ:${this.name}] replyMsgId entry expired for ${sanitizeLogText(chatId, 64)}, reply context expired, sending without msg_id
 `);
-      this.msgSeqMap.delete(entry.msgId);
-      this.replyMsgId.delete(chatId);
+      this.deleteReplyContext(entry);
       this.saveQQState();
     }
     if (!msgId && this.groupActiveMsgEnabled.get(chatId) === false) {
@@ -976,6 +1012,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
     this.detachCronHandler();
     this.chatTypeMap.clear();
     this.replyMsgId.clear();
+    this.replyContextByMessageId.clear();
     this.msgSeqMap.clear();
     this.botOpenIdByGroup.clear();
     this.warnedSenderOpenIds.clear();
@@ -995,23 +1032,36 @@ var QQChannel = class _QQChannel extends ChannelBase {
     this.flushingSessions.clear();
     this.pendingStreamDelete.clear();
     this.flushedSessions.clear();
+    this.activePromptSessions.clear();
   }
   /**
-   * QQ Bot API V2 does not provide a typing indicator endpoint.
-   * ChannelBase calls these hooks to signal prompt start/end;
-   * they are intentionally no-ops for this channel.
+   * QQ Bot API V2 does not provide a typing indicator endpoint, but these
+   * hooks still maintain activePromptSessions — the cron textChunk
+   * discriminator (see activePromptSessions). ChannelBase always pairs the
+   * two calls per prompt turn (onPromptEnd runs in the prompt path's
+   * finally, even on error/cancel).
    */
-  onPromptStart(_chatId, _sessionId, _messageId) {
+  onPromptStart(_chatId, sessionId, _messageId) {
+    this.activePromptSessions.add(sessionId);
   }
-  onPromptEnd(_chatId, _sessionId, _messageId) {
+  onPromptEnd(_chatId, sessionId, _messageId) {
+    this.activePromptSessions.delete(sessionId);
   }
   // ── Streaming (idle-flush with per-session buffers) ────────────
-  onResponseChunk(chatId, chunk, sessionId) {
+  onResponseChunk(chatId, chunk, sessionId, segment) {
     if (this.blockStreaming)
       return;
     let state = this.streamState.get(sessionId);
     if (!state) {
-      state = { chatId, buffer: chunk, timer: null, retryCount: 0 };
+      const messageId = segment?.messageId ?? this.getResponseMessageId(sessionId);
+      const replyContext = messageId ? this.replyContextByMessageId.get(messageId) : void 0;
+      state = {
+        chatId,
+        buffer: chunk,
+        timer: null,
+        retryCount: 0,
+        ...replyContext ? { replyContext } : {}
+      };
       this.streamState.set(sessionId, state);
     } else {
       state.buffer += chunk;
@@ -1071,7 +1121,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
    */
   flushAndTrack(sessionId, buffer, state, logLabel) {
     this.flushingSessions.add(sessionId);
-    this.sendMessage(state.chatId, buffer).then(() => {
+    this.sendMessageWithReplyContext(state.chatId, buffer, state.replyContext).then(() => {
       const current = this.streamState.get(sessionId);
       if (current !== state)
         return;
@@ -1218,6 +1268,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
     this.flushingSessions.delete(sessionId);
     this.pendingStreamDelete.delete(sessionId);
     this.flushedSessions.delete(sessionId);
+    this.activePromptSessions.delete(sessionId);
     super.onSessionDied(sessionId);
   }
   // ── State Persistence (cross-server context continuation) ──────
@@ -1341,7 +1392,7 @@ var QQChannel = class _QQChannel extends ChannelBase {
           if (v === null || typeof v !== "object")
             return false;
           const o = v;
-          return typeof o["msgId"] === "string" && o["msgId"].length <= 128 && typeof o["timestamp"] === "number" && Number.isFinite(o["timestamp"]) && o["timestamp"] <= Date.now() + _QQChannel.REPLY_MSG_ID_TTL_MS;
+          return typeof o["msgId"] === "string" && o["msgId"].length <= 128 && typeof o["timestamp"] === "number" && Number.isFinite(o["timestamp"]) && o["timestamp"] >= Date.now() - _QQChannel.REPLY_MSG_ID_TTL_MS && o["timestamp"] <= Date.now() + _QQChannel.REPLY_MSG_ID_TTL_MS;
         }).map(([k, v]) => [
           k,
           typeof v === "string" ? { msgId: v, timestamp: Date.now() } : v
@@ -1351,6 +1402,10 @@ var QQChannel = class _QQChannel extends ChannelBase {
 `);
         }
       }
+      this.replyContextByMessageId = new Map(Array.from(this.replyMsgId, ([chatId, entry]) => [
+        entry.msgId,
+        { chatId, ...entry }
+      ]));
       if (raw.msgSeqMap) {
         const arr = raw.msgSeqMap;
         const totalRaw = Array.isArray(arr) ? arr.length : 0;
@@ -1360,6 +1415,11 @@ var QQChannel = class _QQChannel extends ChannelBase {
 `);
         }
       }
+      for (const msgId of this.msgSeqMap.keys()) {
+        if (!this.replyContextByMessageId.has(msgId)) {
+          this.msgSeqMap.delete(msgId);
+        }
+      }
       if (raw.groupActiveMsgEnabled) {
         const arr = raw.groupActiveMsgEnabled;
         const totalRaw = Array.isArray(arr) ? arr.length : 0;
@@ -1459,18 +1519,19 @@ var QQChannel = class _QQChannel extends ChannelBase {
     }
   }
   // ── ReplyMsgId helpers ────────────────────────────────────────
-  /**
-   * Set replyMsgId for a chat, cleaning up the previous entry's msgSeqMap
-   * to prevent orphaned entries accumulating over time.
-   */
   setReplyMsgId(chatId, msgId) {
-    const oldEntry = this.replyMsgId.get(chatId);
-    if (oldEntry && oldEntry.msgId !== msgId) {
-      this.msgSeqMap.delete(oldEntry.msgId);
-    }
-    this.replyMsgId.set(chatId, { msgId, timestamp: Date.now() });
+    const timestamp = Date.now();
+    this.replyMsgId.set(chatId, { msgId, timestamp });
+    this.replyContextByMessageId.set(msgId, { chatId, msgId, timestamp });
     this.saveQQState();
   }
+  deleteReplyContext(context) {
+    this.replyContextByMessageId.delete(context.msgId);
+    this.msgSeqMap.delete(context.msgId);
+    if (this.replyMsgId.get(context.chatId)?.msgId === context.msgId) {
+      this.replyMsgId.delete(context.chatId);
+    }
+  }
   /**
    * Start periodic cleanup of expired replyMsgId entries.
    * Evicts entries older than 5 minutes every 60 seconds, and cascades
@@ -1481,6 +1542,12 @@ var QQChannel = class _QQChannel extends ChannelBase {
     this.replyMsgIdCleanupTimer = setInterval(() => {
       const cutoff = Date.now() - _QQChannel.REPLY_MSG_ID_TTL_MS;
       let dirty = false;
+      for (const context of this.replyContextByMessageId.values()) {
+        if (context.timestamp < cutoff) {
+          this.deleteReplyContext(context);
+          dirty = true;
+        }
+      }
       for (const [chatId, entry] of this.replyMsgId) {
         if (entry.timestamp < cutoff) {
           this.msgSeqMap.delete(entry.msgId);
@@ -2267,6 +2334,12 @@ var QQChannel = class _QQChannel extends ChannelBase {
     if (replyEntry)
       this.msgSeqMap.delete(replyEntry.msgId);
     this.replyMsgId.delete(groupId);
+    for (const context of this.replyContextByMessageId.values()) {
+      if (context.chatId === groupId) {
+        this.replyContextByMessageId.delete(context.msgId);
+        this.msgSeqMap.delete(context.msgId);
+      }
+    }
     this.botOpenIdByGroup.delete(groupId);
     this._lastKeywordNoMatchLog.delete(groupId);
     let cleanedCron = 0;

package/chunks/{dist-LZO24N3E.js → dist-N6W6E753.js}

@@ -3,7 +3,7 @@
 import {
   ChannelBase,
   isTerminalTaskLifecycleType
-} from "./chunk-AW27A43Y.js";
+} from "./chunk-ICURCKIU.js";
 import "./chunk-IW6RQPQB.js";
 import {
   require_abort_controller,
@@ -9737,20 +9737,21 @@ var TelegramChannel = class extends ChannelBase {
       const photo = msg.photo[msg.photo.length - 1];
       if (!photo)
         return;
-      try {
-        const file = await ctx.api.getFile(photo.file_id);
-        const fileUrl = this.getFileUrl(file.file_path);
-        const resp = await fetch(fileUrl);
-        if (!resp.ok)
-          throw new Error(`HTTP ${resp.status}`);
-        const buf = Buffer.from(await resp.arrayBuffer());
-        envelope.imageBase64 = buf.toString("base64");
-        envelope.imageMimeType = "image/jpeg";
-      } catch (err) {
-        process.stderr.write(`[Telegram:${this.name}] Failed to download photo: ${err instanceof Error ? err.message : err}
+      this.prepareThenHandleInbound(envelope, async () => {
+        try {
+          const file = await ctx.api.getFile(photo.file_id);
+          const fileUrl = this.getFileUrl(file.file_path);
+          const resp = await fetch(fileUrl);
+          if (!resp.ok)
+            throw new Error(`HTTP ${resp.status}`);
+          const buf = Buffer.from(await resp.arrayBuffer());
+          envelope.imageBase64 = buf.toString("base64");
+          envelope.imageMimeType = "image/jpeg";
+        } catch (err) {
+          process.stderr.write(`[Telegram:${this.name}] Failed to download photo: ${err instanceof Error ? err.message : err}
 `);
-      }
-      this.handleInbound(envelope).catch((err) => {
+        }
+      }).catch((err) => {
         process.stderr.write(`[Telegram:${this.name}] Error handling message: ${err}
 `);
         ctx.reply("Sorry, something went wrong processing your message.").catch(() => {
@@ -9762,34 +9763,35 @@ var TelegramChannel = class extends ChannelBase {
       const doc = msg.document;
       const fileName = doc.file_name || `file_${Date.now()}`;
       const envelope = this.buildEnvelope(msg, msg.caption || `(file: ${fileName})`, msg.caption_entities);
-      try {
-        const file = await ctx.api.getFile(doc.file_id);
-        const fileUrl = this.getFileUrl(file.file_path);
-        const resp = await fetch(fileUrl);
-        if (!resp.ok)
-          throw new Error(`HTTP ${resp.status}`);
-        const buf = Buffer.from(await resp.arrayBuffer());
-        const dir = join(tmpdir(), "channel-files", randomUUID());
-        mkdirSync(dir, { recursive: true });
-        const filePath = join(dir, basename(fileName) || `file_${Date.now()}`);
-        writeFileSync(filePath, buf);
-        envelope.text = msg.caption || "";
-        envelope.attachments = [
-          {
-            type: "file",
-            filePath,
-            mimeType: doc.mime_type || "application/octet-stream",
-            fileName
-          }
-        ];
-      } catch (err) {
-        process.stderr.write(`[Telegram:${this.name}] Failed to download document: ${err instanceof Error ? err.message : err}
+      this.prepareThenHandleInbound(envelope, async () => {
+        try {
+          const file = await ctx.api.getFile(doc.file_id);
+          const fileUrl = this.getFileUrl(file.file_path);
+          const resp = await fetch(fileUrl);
+          if (!resp.ok)
+            throw new Error(`HTTP ${resp.status}`);
+          const buf = Buffer.from(await resp.arrayBuffer());
+          const dir = join(tmpdir(), "channel-files", randomUUID());
+          mkdirSync(dir, { recursive: true });
+          const filePath = join(dir, basename(fileName) || `file_${Date.now()}`);
+          writeFileSync(filePath, buf);
+          envelope.text = msg.caption || "";
+          envelope.attachments = [
+            {
+              type: "file",
+              filePath,
+              mimeType: doc.mime_type || "application/octet-stream",
+              fileName
+            }
+          ];
+        } catch (err) {
+          process.stderr.write(`[Telegram:${this.name}] Failed to download document: ${err instanceof Error ? err.message : err}
 `);
-        envelope.text = (msg.caption || "") + `
+          envelope.text = (msg.caption || "") + `
 
 (User sent a file "${fileName}" but download failed)`;
-      }
-      this.handleInbound(envelope).catch((err) => {
+        }
+      }).catch((err) => {
         process.stderr.write(`[Telegram:${this.name}] Error handling message: ${err}
 `);
         ctx.reply("Sorry, something went wrong processing your message.").catch(() => {
@@ -9801,34 +9803,35 @@ var TelegramChannel = class extends ChannelBase {
       const voice = msg.voice;
       const fileName = `voice_${Date.now()}.ogg`;
       const envelope = this.buildEnvelope(msg, msg.caption || "(voice message)", msg.caption_entities);
-      try {
-        const file = await ctx.api.getFile(voice.file_id);
-        const fileUrl = this.getFileUrl(file.file_path);
-        const resp = await fetch(fileUrl);
-        if (!resp.ok)
-          throw new Error(`HTTP ${resp.status}`);
-        const buf = Buffer.from(await resp.arrayBuffer());
-        const dir = join(tmpdir(), "channel-files", randomUUID());
-        mkdirSync(dir, { recursive: true });
-        const filePath = join(dir, fileName);
-        writeFileSync(filePath, buf);
-        envelope.text = msg.caption || "";
-        envelope.attachments = [
-          {
-            type: "audio",
-            filePath,
-            mimeType: voice.mime_type || "audio/ogg",
-            fileName
-          }
-        ];
-      } catch (err) {
-        process.stderr.write(`[Telegram:${this.name}] Failed to download voice message: ${err instanceof Error ? err.message : err}
+      this.prepareThenHandleInbound(envelope, async () => {
+        try {
+          const file = await ctx.api.getFile(voice.file_id);
+          const fileUrl = this.getFileUrl(file.file_path);
+          const resp = await fetch(fileUrl);
+          if (!resp.ok)
+            throw new Error(`HTTP ${resp.status}`);
+          const buf = Buffer.from(await resp.arrayBuffer());
+          const dir = join(tmpdir(), "channel-files", randomUUID());
+          mkdirSync(dir, { recursive: true });
+          const filePath = join(dir, fileName);
+          writeFileSync(filePath, buf);
+          envelope.text = msg.caption || "";
+          envelope.attachments = [
+            {
+              type: "audio",
+              filePath,
+              mimeType: voice.mime_type || "audio/ogg",
+              fileName
+            }
+          ];
+        } catch (err) {
+          process.stderr.write(`[Telegram:${this.name}] Failed to download voice message: ${err instanceof Error ? err.message : err}
 `);
-        envelope.text = (msg.caption || "") + `
+          envelope.text = (msg.caption || "") + `
 
 (User sent a voice message but download failed)`;
-      }
-      this.handleInbound(envelope).catch((err) => {
+        }
+      }).catch((err) => {
         process.stderr.write(`[Telegram:${this.name}] Error handling message: ${err}
 `);
         ctx.reply("Sorry, something went wrong processing your message.").catch(() => {
@@ -9913,6 +9916,10 @@ var TelegramChannel = class extends ChannelBase {
     const route = envelope.threadId === void 0 ? {} : { threadId: envelope.threadId };
     await this.inboundRoute.run(route, () => super.handleInbound(envelope));
   }
+  async prepareThenHandleInbound(envelope, prepare) {
+    const route = envelope.threadId === void 0 ? {} : { threadId: envelope.threadId };
+    await this.inboundRoute.run(route, () => super.prepareThenHandleInbound(envelope, prepare));
+  }
   async sendMessage(chatId, text) {
     await this.sendTelegramMessage(chatId, text, this.inboundRoute.getStore()?.threadId);
   }