@qwen-code/qwen-code 0.21.9 → 0.21.10-nightly.20260812.a64d1291d2

package/chunks/{chunk-P4ZEZSJZ.js → chunk-WBLEKO7Y.js}

@@ -17,7 +17,7 @@ import {
 } from "./chunk-OCPBI7J5.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-I5VM3SKY.js";
+} from "./chunk-EV3LZGGK.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -50,6 +50,7 @@ import {
   LOAD_REPLAY_PAGE_SIZE_META_KEY,
   LOAD_REPLAY_VERSION,
   MID_TURN_QUEUE_DRAIN_METHOD,
+  MID_TURN_RECONCILIATION_RING_SIZE,
   PROMPT_CANCEL_METHOD,
   REQUESTED_SESSION_ID_META_KEY,
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
@@ -57,7 +58,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-M2PNLYGY.js";
+} from "./chunk-W5UC37EE.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -79,7 +80,7 @@ import {
   SessionShellDisabledError,
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-LP2QGNSP.js";
+} from "./chunk-624NHDGB.js";
 import {
   canonicalizeWorkspace,
   translateAndCheckAbsoluteWorkspacePath
@@ -104,6 +105,7 @@ import {
 } from "./chunk-UDXSXLER.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
+  SESSION_TRANSCRIPT_MAX_LIMIT,
   ShellExecutionService,
   TrustGateError,
   WORKSPACE_CONTENT_MTIME_MS_METADATA_KEY,
@@ -113,7 +115,7 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-XX7QFP34.js";
+} from "./chunk-NX2E4GYA.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
@@ -2414,34 +2416,36 @@ var BridgeClient = class {
     const entry = this.resolveEntry(sessionId);
     if (!entry) return { messages: [], hasQueuedPrompt: false };
     const drained = entry.midTurnMessageQueue.splice(0);
-    const messages = drained.map((item) => item.text);
-    const hasQueuedPrompt = entry.pendingPromptList.some(
-      (prompt) => prompt.state === "queued" && !prompt.abortController.signal.aborted
-    );
     if (drained.length > 0) {
-      const byOriginator = /* @__PURE__ */ new Map();
       for (const item of drained) {
-        const group = byOriginator.get(item.originatorClientId);
-        if (group) group.push(item);
-        else byOriginator.set(item.originatorClientId, [item]);
-      }
-      for (const [originatorClientId, items] of byOriginator) {
-        const texts = items.map((item) => item.text);
-        const published = entry.events.publish({
-          type: MID_TURN_MESSAGE_INJECTED_EVENT,
-          ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
-          data: {
-            sessionId: entry.sessionId,
-            messages: texts,
-            messageIds: items.map((item) => item.messageId)
-          },
-          ...originatorClientId ? { originatorClientId } : {}
-        });
-        writeStderrLine(
-          published ? `[mid-turn] session=${entry.sessionId} drained=${texts.length}${originatorClientId ? ` originator=${originatorClientId}` : ""} injected into running turn` : `[mid-turn] session=${entry.sessionId} drained=${texts.length} echo frame dropped (bus closed); browser may resend next turn`
+        entry.settledMidTurnMessageIds.push(item.messageId);
+      }
+      if (entry.settledMidTurnMessageIds.length > MID_TURN_RECONCILIATION_RING_SIZE) {
+        entry.settledMidTurnMessageIds.splice(
+          0,
+          entry.settledMidTurnMessageIds.length - MID_TURN_RECONCILIATION_RING_SIZE
         );
       }
     }
+    const echoed = drained.filter((item) => !item.queueOnly);
+    const messages = drained.map((item) => item.text);
+    const hasQueuedPrompt = entry.pendingPromptList.some(
+      (prompt) => prompt.state === "queued" && !prompt.abortController.signal.aborted
+    );
+    if (echoed.length > 0) {
+      const published = entry.events.publish({
+        type: MID_TURN_MESSAGE_INJECTED_EVENT,
+        ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
+        data: {
+          sessionId: entry.sessionId,
+          messages: echoed.map((item) => item.text),
+          messageIds: echoed.map((item) => item.messageId)
+        }
+      });
+      writeStderrLine(
+        published ? `[mid-turn] session=${entry.sessionId} drained=${messages.length} echoed=${echoed.length} injected into running turn` : `[mid-turn] session=${entry.sessionId} drained=${messages.length} echoed=${echoed.length} echo frame dropped (bus closed); reconciliation required`
+      );
+    }
     return { messages, hasQueuedPrompt };
   }
   async handleExternalToolGuardPrepare(params) {
@@ -6385,6 +6389,7 @@ var SESSION_GENERATION_TIMEOUT_MS = 65e3;
 var GENERATION_STREAM_QUEUE_CAPACITY = 128;
 var SESSION_BTW_TIMEOUT_MS = 6e4;
 var SESSION_TRANSCRIPT_TIMEOUT_MS = 6e4;
+var MAX_EMPTY_TRANSCRIPT_PAGES = 20;
 var SHELL_COMMAND_TIMEOUT_MS = 12e4;
 var MAX_SHELL_OUTPUT_FOR_HISTORY = 1e4;
 var MAX_MID_TURN_QUEUE_DEPTH = 20;
@@ -8035,7 +8040,7 @@ function createAcpSessionBridge(opts) {
           `ACP session close channel unavailable for ${entry.sessionId}`
         );
       }
-      return;
+      return false;
     }
     try {
       const closeRequest = entry.connection.extMethod(
@@ -8047,7 +8052,7 @@ function createAcpSessionBridge(opts) {
         }
       );
       const observedCloseRequest = opts2?.timeoutMs ? withTimeout(closeRequest, opts2.timeoutMs, label) : closeRequest;
-      await Promise.race([
+      const response = await Promise.race([
         opts2?.throwOnFailure === true ? observedCloseRequest : withTimeout(
           observedCloseRequest,
           initTimeoutMs,
@@ -8055,6 +8060,7 @@ function createAcpSessionBridge(opts) {
         ),
         getTransportClosedReject(entry)
       ]);
+      return response["closed"] === true;
     } catch (err) {
       writeStderrLine(
         `qwen serve: ${label} ACP session close notification failed for session ${JSON.stringify(entry.sessionId)}: ${String(
@@ -8064,6 +8070,7 @@ function createAcpSessionBridge(opts) {
       if (opts2?.throwOnFailure === true) {
         throw err;
       }
+      return false;
     }
   }, "notifyAgentSessionClose");
   const broadcastWorkspaceEvent = /* @__PURE__ */ __name((envelope, skipSessionId) => {
@@ -8236,6 +8243,8 @@ function createAcpSessionBridge(opts) {
       pendingAgentNotificationCount: 0,
       pendingPromptList: [],
       midTurnMessageQueue: [],
+      settledMidTurnMessageIds: [],
+      promotedMidTurnMessageIds: [],
       modelChangeQueue: Promise.resolve(),
       approvalModeQueue: Promise.resolve(),
       modelPublishGeneration: 0,
@@ -8486,11 +8495,26 @@ function createAcpSessionBridge(opts) {
     for (let attempt = 0; attempt < 2; attempt++) {
       try {
         const lastEventId = entry.events.lastEventId;
-        const page = await requestSessionTranscriptPage({
-          sessionId: entry.sessionId,
-          direction: "backward",
-          limit: historyPageSize
-        });
+        const seenCursors = /* @__PURE__ */ new Set();
+        let emptyPageCount = 0;
+        let cursor;
+        let page;
+        do {
+          page = await requestSessionTranscriptPage({
+            sessionId: entry.sessionId,
+            ...cursor ? { cursor } : { direction: "backward" },
+            limit: historyPageSize
+          });
+          const nextCursor = page.nextCursor;
+          if (page.events.length === 0 && page.hasMore && (nextCursor === void 0 || seenCursors.has(nextCursor))) {
+            throw new Error("Transcript cursor did not advance");
+          }
+          if (page.events.length === 0 && page.hasMore && ++emptyPageCount >= MAX_EMPTY_TRANSCRIPT_PAGES) {
+            throw new Error("Transcript empty-page limit exceeded");
+          }
+          cursor = nextCursor;
+          if (cursor !== void 0) seenCursors.add(cursor);
+        } while (page.events.length === 0 && page.hasMore && cursor !== void 0 && page.partial !== true && page.replayError === void 0);
         if (byId.get(entry.sessionId) === entry && !entry.promptActive && entry.events.lastEventId === lastEventId) {
           return {
             compactedReplay: page.events,
@@ -8559,20 +8583,34 @@ function createAcpSessionBridge(opts) {
       );
     }
     const historyReplay = action === "load" ? req.historyReplay ?? "stream" : "stream";
+    const historyPageSize = action === "load" && historyReplay === "response" ? req.historyPageSize : void 0;
+    if (historyPageSize !== void 0 && (!Number.isSafeInteger(historyPageSize) || historyPageSize < 1 || historyPageSize > SESSION_TRANSCRIPT_MAX_LIMIT)) {
+      throw new Error(
+        `Invalid historyPageSize; expected 1..${SESSION_TRANSCRIPT_MAX_LIMIT}`
+      );
+    }
     const hideInheritedHistory = action === "load" && req.hideInheritedHistory === true;
     const existing = byId.get(req.sessionId);
     if (existing) {
       if (isClosingOrAuthorizingClose(existing)) {
         throw new SessionNotFoundError(
           req.sessionId,
-          "The session is closing; retry after close completes"
+          "The session is closing; retry after close completes",
+          "session_closing"
         );
       }
-      const replayFields = action === "load" && req.historyPageSize !== void 0 ? await refreshedReplayFieldsFor(existing, req.historyPageSize) : replayFieldsFor(existing, action);
+      const replayFields = historyPageSize !== void 0 ? await refreshedReplayFieldsFor(existing, historyPageSize) : replayFieldsFor(existing, action);
       const historyAnchorRecordId = action === "load" ? await resolveHistoryAnchorRecordId(existing, replayFields) : void 0;
-      if (byId.get(req.sessionId) !== existing || isClosingOrAuthorizingClose(existing)) {
+      if (byId.get(req.sessionId) !== existing) {
         throw new SessionNotFoundError(req.sessionId);
       }
+      if (isClosingOrAuthorizingClose(existing)) {
+        throw new SessionNotFoundError(
+          req.sessionId,
+          "The session is closing; retry after close completes",
+          "session_closing"
+        );
+      }
       existing.attachCount++;
       const clientId = registerClient(existing, req.clientId);
       recordAttachRef(existing, clientId);
@@ -8601,7 +8639,7 @@ function createAcpSessionBridge(opts) {
     }
     const inFlight = inFlightRestores.get(req.sessionId);
     if (inFlight) {
-      if (inFlight.lifecycle.phase === "abandoned" || action !== inFlight.action || historyReplay !== inFlight.historyReplay || hideInheritedHistory !== inFlight.hideInheritedHistory) {
+      if (inFlight.lifecycle.phase === "abandoned" || action !== inFlight.action || historyReplay !== inFlight.historyReplay || historyPageSize !== inFlight.historyPageSize || hideInheritedHistory !== inFlight.hideInheritedHistory) {
         const abandoned = inFlight.lifecycle.phase === "abandoned";
         throw new RestoreInProgressError(
           req.sessionId,
@@ -8834,8 +8872,8 @@ function createAcpSessionBridge(opts) {
                   ...sessionSourceRequestMeta(req.sourceType, req.sourceId),
                   ...historyReplay === "response" ? {
                     [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE,
-                    ...req.historyPageSize !== void 0 ? {
-                      [LOAD_REPLAY_PAGE_SIZE_META_KEY]: req.historyPageSize
+                    ...historyPageSize !== void 0 ? {
+                      [LOAD_REPLAY_PAGE_SIZE_META_KEY]: historyPageSize
                     } : {}
                   } : {},
                   ...hideInheritedHistory ? { [LOAD_REPLAY_HIDE_INHERITED_META_KEY]: true } : {}
@@ -8950,7 +8988,8 @@ function createAcpSessionBridge(opts) {
         if (isClosingOrAuthorizingClose(racedEntry)) {
           throw new SessionNotFoundError(
             req.sessionId,
-            "The session is closing; retry after close completes"
+            "The session is closing; retry after close completes",
+            "session_closing"
           );
         }
         racedEntry.attachCount += 1 + coalesceState.count;
@@ -9033,7 +9072,7 @@ function createAcpSessionBridge(opts) {
         await ci.client.seedSessionUpdates(entry, replayUpdates, {
           ingestArtifacts: restoredArtifactSnapshot === void 0 || artifactRestoreFailed
         });
-        if (req.historyPageSize !== void 0 && entry.events.snapshotReplay()?.compactedTurns.some((event) => event.type === "history_truncated")) {
+        if (historyPageSize !== void 0 && entry.events.snapshotReplay()?.compactedTurns.some((event) => event.type === "history_truncated")) {
           entry.restoreHistoryHasMore = true;
         }
         ci.client.drainEarlyEvents(entry.sessionId, entry);
@@ -9117,6 +9156,7 @@ function createAcpSessionBridge(opts) {
     inFlightRestores.set(req.sessionId, {
       action,
       historyReplay,
+      ...historyPageSize !== void 0 ? { historyPageSize } : {},
       hideInheritedHistory,
       publicPromise: promise,
       settlementPromise,
@@ -9138,7 +9178,8 @@ function createAcpSessionBridge(opts) {
     if (entry.closing) {
       throw new SessionNotFoundError(
         sessionId,
-        "The session is already closing"
+        "The session is already closing",
+        "session_closing"
       );
     }
     let originatorClientId;
@@ -9161,15 +9202,21 @@ function createAcpSessionBridge(opts) {
         `qwen serve: closeSession channelInfoForEntry returned undefined for session ${JSON.stringify(sessionId)} \u2014 channel cleanup skipped (entry's channel already torn down)`
       );
     }
+    let agentSessionClosed = false;
     try {
       permissionMediator.forgetSession(sessionId);
       entry.pendingPermissionIds.clear();
       entry.pendingInteractions.clear();
-      await notifyAgentSessionClose(entry, ci, "closeSession", {
-        throwOnFailure: true,
-        requireFlush: closeOpts?.requireAgentClose === true,
-        ...closeOpts?.agentCloseTimeoutMs !== void 0 ? { timeoutMs: closeOpts.agentCloseTimeoutMs } : {}
-      });
+      agentSessionClosed = await notifyAgentSessionClose(
+        entry,
+        ci,
+        "closeSession",
+        {
+          throwOnFailure: true,
+          requireFlush: closeOpts?.requireAgentClose === true,
+          ...closeOpts?.agentCloseTimeoutMs !== void 0 ? { timeoutMs: closeOpts.agentCloseTimeoutMs } : {}
+        }
+      );
     } catch (error) {
       if (isDefinitiveAcpRequestError(error)) {
         entry.closing = false;
@@ -9223,16 +9270,18 @@ function createAcpSessionBridge(opts) {
     } catch {
     }
     entry.events.close();
-    try {
-      await telemetry.withSpan(
-        "session.close.cancel_active_prompt",
-        {
-          "qwen-code.daemon.bridge.operation": "session.close.cancel_active_prompt",
-          "session.id": sessionId
-        },
-        async () => await entry.connection.cancel({ sessionId })
-      );
-    } catch {
+    if (!agentSessionClosed) {
+      try {
+        await telemetry.withSpan(
+          "session.close.cancel_active_prompt",
+          {
+            "qwen-code.daemon.bridge.operation": "session.close.cancel_active_prompt",
+            "session.id": sessionId
+          },
+          async () => await entry.connection.cancel({ sessionId })
+        );
+      } catch {
+      }
     }
     if (ci && hasNoChannelWork(ci)) {
       await reapPendingEmptyChannel(ci);
@@ -9243,6 +9292,36 @@ function createAcpSessionBridge(opts) {
   }
   __name(closeSessionImpl, "closeSessionImpl");
   startSessionReaper();
+  const rememberMidTurnId = /* @__PURE__ */ __name((ring, messageId) => {
+    ring.push(messageId);
+    if (ring.length > MID_TURN_RECONCILIATION_RING_SIZE) {
+      ring.splice(0, ring.length - MID_TURN_RECONCILIATION_RING_SIZE);
+    }
+  }, "rememberMidTurnId");
+  const promoteMidTurnMessage = /* @__PURE__ */ __name((entry, messageId, text, originatorClientId) => {
+    void bridgeApi.sendPrompt(
+      entry.sessionId,
+      {
+        sessionId: entry.sessionId,
+        prompt: [{ type: "text", text }]
+      },
+      void 0,
+      {
+        promptId: messageId,
+        promotedMidTurn: { originatorClientId },
+        // Record the id only once sendPrompt owns its FIFO slot: an
+        // admission failure must not land the id in the reconciliation
+        // ring, or retries would be acked for a message that never runs.
+        onPromptAdmitted: /* @__PURE__ */ __name(() => {
+          rememberMidTurnId(entry.promotedMidTurnMessageIds, messageId);
+        }, "onPromptAdmitted")
+      }
+    ).catch((error) => {
+      writeStderrLine(
+        `[mid-turn] session=${JSON.stringify(entry.sessionId)} failed to run promoted message ${JSON.stringify(messageId)}: ${JSON.stringify(error instanceof Error ? error.message : String(error))}`
+      );
+    });
+  }, "promoteMidTurnMessage");
   const bridgeApi = {
     setLiveScreenContextCaptureHandler(handler) {
       liveScreenContextCaptureHandler = handler;
@@ -9389,7 +9468,8 @@ function createAcpSessionBridge(opts) {
           if (isClosingOrAuthorizingClose(existing)) {
             throw new SessionNotFoundError(
               existing.sessionId,
-              "The session is closing; retry after close completes"
+              "The session is closing; retry after close completes",
+              "session_closing"
             );
           }
           existing.attachCount++;
@@ -9549,14 +9629,14 @@ function createAcpSessionBridge(opts) {
         return Promise.reject(
           new SessionNotFoundError(
             sessionId,
-            "The session is closing; retry after close completes"
+            "The session is closing; retry after close completes",
+            "session_closing"
           )
         );
       }
-      const originatorClientId = resolveTrustedClientId(
-        entry,
-        context?.clientId
-      );
+      const promotedMidTurn = context?.promotedMidTurn;
+      const isPromotedMidTurn = promotedMidTurn !== void 0;
+      const originatorClientId = promotedMidTurn ? promotedMidTurn.originatorClientId : resolveTrustedClientId(entry, context?.clientId);
       const modelPrompt = context?.modelPrompt;
       if (modelPrompt !== void 0 && !isValidTrustedModelPrompt(modelPrompt)) {
         throw new TypeError(
@@ -9566,7 +9646,7 @@ function createAcpSessionBridge(opts) {
       if (signal?.aborted) {
         throw new DOMException("Prompt aborted", "AbortError");
       }
-      if (entry.pendingPromptCount >= maxPendingPromptsPerSession) {
+      if (!isPromotedMidTurn && entry.pendingPromptCount >= maxPendingPromptsPerSession) {
         throw new PromptQueueFullError(
           maxPendingPromptsPerSession,
           entry.pendingPromptCount,
@@ -9604,6 +9684,7 @@ function createAcpSessionBridge(opts) {
         promptId,
         queuedAt,
         ...originatorClientId !== void 0 ? { originatorClientId } : {},
+        ...isPromotedMidTurn ? { promotedMidTurn: true } : {},
         text: extractPromptText(req.prompt),
         abortController: pendingAbort,
         state: isQueued ? "queued" : "running"
@@ -9697,9 +9778,11 @@ function createAcpSessionBridge(opts) {
             }
             throw new DOMException("Prompt aborted", "AbortError");
           }
-          if (pendingEntry.state === "queued") {
-            delete entry.todoStopGuardAwaitingQueuedPromptOwnerPromptId;
-            pendingEntry.state = "running";
+          if (pendingEntry.state === "queued" || isPromotedMidTurn) {
+            if (pendingEntry.state === "queued") {
+              delete entry.todoStopGuardAwaitingQueuedPromptOwnerPromptId;
+              pendingEntry.state = "running";
+            }
             entry.events.publish({
               type: "pending_prompt_started",
               promptId: pendingEntry.promptId,
@@ -9915,12 +9998,26 @@ function createAcpSessionBridge(opts) {
             }
           }
         }
+        const shouldSettleMidTurnQueue = entry.pendingPromptCount === 1 && !entry.closing && byId.get(entry.sessionId) === entry;
+        const undrainedMessages = shouldSettleMidTurnQueue ? entry.midTurnMessageQueue.splice(0) : [];
         releasePromptSlot();
-        if (entry.pendingPromptCount === 0 && entry.midTurnMessageQueue.length > 0) {
-          writeStderrLine(
-            `[mid-turn] session=${entry.sessionId} dropped ${entry.midTurnMessageQueue.length} undrained message(s) at idle; browser resends next turn`
+        for (const message of undrainedMessages) {
+          if (message.queueOnly) {
+            try {
+              message.onSettledWithoutDrain?.();
+            } catch (error) {
+              writeStderrLine(
+                `[mid-turn] session=${JSON.stringify(entry.sessionId)} failed to hand undrained queue-only message ${JSON.stringify(message.messageId)} back to its caller: ${JSON.stringify(error instanceof Error ? error.message : String(error))}`
+              );
+            }
+            continue;
+          }
+          promoteMidTurnMessage(
+            entry,
+            message.messageId,
+            message.text,
+            message.originatorClientId
           );
-          entry.midTurnMessageQueue.length = 0;
         }
         void maybeCloseIdleSession(entry, "prompt_settled");
       }).catch(() => {
@@ -11192,7 +11289,7 @@ function createAcpSessionBridge(opts) {
       }
       return { removed: true };
     },
-    enqueueMidTurnMessage(sessionId, message, context) {
+    enqueueMidTurnMessage(sessionId, message, context, requestedMessageId, options) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
       const originatorClientId = resolveTrustedClientId(
@@ -11200,43 +11297,139 @@ function createAcpSessionBridge(opts) {
         context?.clientId
       );
       const trimmed = message.trim();
-      if (trimmed.length === 0 || entry.pendingPromptCount === 0) {
+      if (trimmed.length === 0) {
         writeStderrLine(
-          `[mid-turn] session=${entry.sessionId} rejected: ${trimmed.length === 0 ? "empty message" : "session idle"}; browser keeps it for next turn`
+          `[mid-turn] session=${entry.sessionId} rejected: empty`
         );
         return { accepted: false };
       }
+      if (requestedMessageId !== void 0) {
+        const existing = entry.midTurnMessageQueue.find(
+          (queued) => queued.messageId === requestedMessageId
+        );
+        if (existing) {
+          if (existing.text === trimmed) {
+            return { accepted: true, messageId: requestedMessageId };
+          }
+          writeStderrLine(
+            `[mid-turn] session=${JSON.stringify(entry.sessionId)} rejected id ${JSON.stringify(requestedMessageId)}: text mismatch`
+          );
+          return { accepted: false };
+        }
+        const promoted = entry.pendingPromptList.find(
+          (pending) => pending.promptId === requestedMessageId
+        );
+        if (promoted) {
+          if (promoted.text === trimmed) {
+            return { accepted: true, messageId: requestedMessageId };
+          }
+          writeStderrLine(
+            `[mid-turn] session=${JSON.stringify(entry.sessionId)} rejected promoted id ${JSON.stringify(requestedMessageId)}: text mismatch`
+          );
+          return { accepted: false };
+        }
+        if (entry.settledMidTurnMessageIds.includes(requestedMessageId)) {
+          return { accepted: true, messageId: requestedMessageId };
+        }
+        if (entry.promotedMidTurnMessageIds.includes(requestedMessageId)) {
+          return { accepted: true, messageId: requestedMessageId };
+        }
+      }
+      if (isClosingOrAuthorizingClose(entry)) {
+        writeStderrLine(
+          `[mid-turn] session=${JSON.stringify(entry.sessionId)} rejected: session closing`
+        );
+        return { accepted: false };
+      }
+      const messageId = requestedMessageId ?? randomUUID2();
+      if (entry.pendingPromptCount === 0) {
+        if (options?.queueOnly) {
+          writeStderrLine(
+            `[mid-turn] session=${JSON.stringify(entry.sessionId)} rejected id ${JSON.stringify(messageId)}: session idle`
+          );
+          return { accepted: false };
+        }
+        promoteMidTurnMessage(entry, messageId, trimmed, originatorClientId);
+        return { accepted: true, messageId };
+      }
       if (entry.midTurnMessageQueue.length >= MAX_MID_TURN_QUEUE_DEPTH) {
         writeStderrLine(
-          `[mid-turn] session=${entry.sessionId} rejected: queue full (depth ${entry.midTurnMessageQueue.length} >= ${MAX_MID_TURN_QUEUE_DEPTH}); browser keeps it for next turn`
+          `[mid-turn] session=${entry.sessionId} rejected: queue full (depth ${entry.midTurnMessageQueue.length} >= ${MAX_MID_TURN_QUEUE_DEPTH})`
         );
         return { accepted: false };
       }
-      const messageId = randomUUID2();
-      entry.midTurnMessageQueue.push({
+      const queuedMessage = {
         messageId,
         text: trimmed,
-        originatorClientId
-      });
+        originatorClientId,
+        ...options?.queueOnly ? {
+          queueOnly: true,
+          onSettledWithoutDrain: options.onSettledWithoutDrain
+        } : {}
+      };
+      entry.midTurnMessageQueue.push(queuedMessage);
+      if (originatorClientId) {
+        try {
+          entry.events.publish({
+            type: "pending_prompt_added",
+            promptId: messageId,
+            data: {
+              sessionId,
+              promptId: messageId,
+              text: trimmed,
+              queuedAt: Date.now()
+            },
+            originatorClientId
+          });
+        } catch {
+        }
+      }
       return { accepted: true, messageId };
     },
     removeMidTurnMessage(sessionId, messageId, context) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
-      const originatorClientId = resolveTrustedClientId(
-        entry,
-        context?.clientId
-      );
+      resolveTrustedClientId(entry, context?.clientId);
       const index = entry.midTurnMessageQueue.findIndex(
-        (message) => message.messageId === messageId && message.originatorClientId === originatorClientId
+        (message) => message.messageId === messageId
       );
       if (index === -1) {
+        const isPromoted = entry.pendingPromptList.some(
+          (pending) => pending.promptId === messageId && pending.promotedMidTurn === true
+        );
+        if (!isPromoted) {
+          writeStderrLine(
+            `[mid-turn] session=${JSON.stringify(entry.sessionId)} remove missed messageId=${JSON.stringify(messageId)} (already drained or completed)`
+          );
+          return { removed: false };
+        }
+        const promoted = bridgeApi.removePendingPrompt(
+          sessionId,
+          messageId,
+          context
+        );
+        if (promoted.removed) {
+          rememberMidTurnId(entry.settledMidTurnMessageIds, messageId);
+          return promoted;
+        }
         writeStderrLine(
-          `[mid-turn] session=${JSON.stringify(entry.sessionId)} remove missed messageId=${JSON.stringify(messageId)} (already drained or originator mismatch)`
+          `[mid-turn] session=${JSON.stringify(entry.sessionId)} remove missed messageId=${JSON.stringify(messageId)} (already drained or completed)`
         );
         return { removed: false };
       }
-      entry.midTurnMessageQueue.splice(index, 1);
+      const [removed] = entry.midTurnMessageQueue.splice(index, 1);
+      rememberMidTurnId(entry.settledMidTurnMessageIds, messageId);
+      if (removed) {
+        try {
+          entry.events.publish({
+            type: "pending_prompt_completed",
+            promptId: messageId,
+            data: { sessionId, promptId: messageId, state: "removed" },
+            ...removed.originatorClientId ? { originatorClientId: removed.originatorClientId } : {}
+          });
+        } catch {
+        }
+      }
       return { removed: true };
     },
     async enqueueBackgroundNotification(sessionId, notification) {
@@ -11266,6 +11459,22 @@ function createAcpSessionBridge(opts) {
         void maybeCloseIdleSession(entry, "agent_notification_settled");
       }
     },
+    getMidTurnMessages(sessionId, context) {
+      const entry = byId.get(sessionId);
+      if (!entry) throw new SessionNotFoundError(sessionId);
+      resolveTrustedClientId(entry, context?.clientId);
+      return {
+        // Anonymous enqueues (live steering) stay off the shared surface:
+        // their delegation text is not a user message other attached clients
+        // should restore into their queue views.
+        messages: entry.midTurnMessageQueue.filter((message) => message.originatorClientId !== void 0).map((message) => ({
+          messageId: message.messageId,
+          text: message.text
+        })),
+        settledMessageIds: [...entry.settledMidTurnMessageIds],
+        promotedMessageIds: [...entry.promotedMidTurnMessageIds]
+      };
+    },
     async generateSessionBtw(sessionId, question, signal, _context) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
@@ -11506,7 +11715,11 @@ function createAcpSessionBridge(opts) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
       if (isClosingOrAuthorizingClose(entry)) {
-        throw new SessionNotFoundError(sessionId, "The session is closing");
+        throw new SessionNotFoundError(
+          sessionId,
+          "The session is closing; retry after close completes",
+          "session_closing"
+        );
       }
       const info = channelInfoForEntry(entry);
       if (!info || info.isDying) throw new SessionNotFoundError(sessionId);

package/chunks/{chunk-OGDIJKHK.js → chunk-WDNJKDCV.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   registerCleanup
-} from "./chunk-PNBBJOCP.js";
+} from "./chunk-ZKVJ7KFA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";