@qwen-code/qwen-code 0.21.12-preview.5 → 0.21.13

package/chunks/{chunk-DLDVO2NY.js → chunk-LJQAUZMR.js}

@@ -6,7 +6,7 @@ import {
   EventBus,
   logEventSizingFailed,
   serializedBridgeEventByteLength
-} from "./chunk-JVY7FHUZ.js";
+} from "./chunk-7U5G6JXI.js";
 import {
   JOURNAL_GROWTH_HARD_CAP_BYTES,
   normalizeCompactedReplayMaxBytes,
@@ -19,7 +19,7 @@ import {
 } from "./chunk-OCPBI7J5.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-2U3UCXZ3.js";
+} from "./chunk-NHDR76JX.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -29,7 +29,7 @@ import {
   SessionRestoreTimeoutError,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-NHZF4VCD.js";
+} from "./chunk-QNQAPSN2.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_CLOSE_TIMEOUT_MS,
@@ -41,6 +41,7 @@ import {
   ACTIVE_WORK_MAX_SNAPSHOT_SESSIONS,
   ACTIVE_WORK_NOTIFICATION_METHOD,
   ACTIVE_WORK_STALE_INTERVALS,
+  CHANNEL_PROMPT_META_KEY,
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
   DAEMON_CHANNEL_DELIVERY_META_KEY,
@@ -61,8 +62,9 @@ import {
   TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
-  isValidTrustedModelPrompt
-} from "./chunk-UFHPAMAV.js";
+  isValidTrustedModelPrompt,
+  sessionCloseDrainBudgetMs
+} from "./chunk-S5DWMTHO.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -101,7 +103,7 @@ import {
   EXTERNAL_TOOL_GUARD_READY_META_KEY,
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
   isValidExternalToolGuardDenialReason
-} from "./chunk-BKHCW2BI.js";
+} from "./chunk-3VUENPWF.js";
 import {
   ClientSideConnection,
   PROTOCOL_VERSION,
@@ -119,16 +121,16 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-T7YMWGFY.js";
+} from "./chunk-4S5337WV.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-U5C2GIN2.js";
+} from "./chunk-TIGA2IVL.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
   PRIVATE_PARENT_CAPABILITY_META_KEY
-} from "./chunk-UAAWNTOC.js";
+} from "./chunk-RVOJ2FBP.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -297,6 +299,19 @@ var TurnBoundaryCompactionEngine = class {
         this.makeHistoryTruncatedEvent(compactedTurns.length)
       );
     }
+    return {
+      compactedTurns,
+      liveJournal: this.liveJournalSnapshot(liveReplayMode),
+      lastEventId: this.lastEventId
+    };
+  }
+  /**
+   * Snapshot of only the in-flight live journal — the events ingested
+   * since the last turn boundary (a boundary folds its turn into the
+   * replay window and resets the journal). Cheaper than `snapshot()`:
+   * no replay-window flatten.
+   */
+  liveJournalSnapshot(liveReplayMode = "full") {
     const journal = liveReplayMode === "summary" ? this.summaryJournal : this.fullJournal;
     const journalRecordId = liveReplayMode === "summary" ? this.summaryRecordId : this.activeRecordId;
     const liveJournal = journal.entries.map(
@@ -323,11 +338,7 @@ var TurnBoundaryCompactionEngine = class {
         }
       });
     }
-    return {
-      compactedTurns,
-      liveJournal,
-      lastEventId: this.lastEventId
-    };
+    return liveJournal;
   }
   seed(snapshot) {
     if (this.closed) return;
@@ -594,7 +605,7 @@ var TurnBoundaryCompactionEngine = class {
         const slot = this.slots[existingIdx];
         slot.chunks.push(text);
         if (event.id !== void 0) slot.lastEventId = event.id;
-        slot.lastMeta = meta ?? slot.lastMeta;
+        slot.lastMeta = mergeTranscriptUpdateMeta(slot.lastMeta, meta);
         slot.lastEnvelopeMeta = event._meta ?? slot.lastEnvelopeMeta;
         slot.lastTurn = captureTurnFields(event, slot.lastTurn);
         slot.lastSessionId = captureSessionId(event) ?? slot.lastSessionId;
@@ -618,7 +629,7 @@ var TurnBoundaryCompactionEngine = class {
       if (lastSlot && lastSlot.kind === kind && lastSlot.parentToolCallId == null && stringArraysEqual(lastSlot.sourceRecordIds, sourceRecordIds)) {
         lastSlot.chunks.push(text);
         if (event.id !== void 0) lastSlot.lastEventId = event.id;
-        lastSlot.lastMeta = meta ?? lastSlot.lastMeta;
+        lastSlot.lastMeta = mergeTranscriptUpdateMeta(lastSlot.lastMeta, meta);
         lastSlot.lastEnvelopeMeta = event._meta ?? lastSlot.lastEnvelopeMeta;
         lastSlot.lastTurn = captureTurnFields(event, lastSlot.lastTurn);
         lastSlot.lastSessionId = captureSessionId(event) ?? lastSlot.lastSessionId;
@@ -1043,13 +1054,26 @@ function mergeTranscriptUpdateMeta(existing, incoming) {
       ...extractSourceRecordIdsFromMeta(incomingRecord) ?? []
     ])
   ];
+  const existingTranscript = extractTranscriptMeta(existingRecord);
+  const incomingTranscript = extractTranscriptMeta(incomingRecord);
   return {
     ...existingRecord ?? {},
     ...incomingRecord ?? {},
-    ...sourceRecordIds.length > 0 ? { qwenTranscript: { sourceRecordIds } } : {}
+    ...existingTranscript || incomingTranscript || sourceRecordIds.length > 0 ? {
+      qwenTranscript: {
+        ...existingTranscript ?? {},
+        ...incomingTranscript ?? {},
+        ...sourceRecordIds.length > 0 ? { sourceRecordIds } : {}
+      }
+    } : {}
   };
 }
 __name(mergeTranscriptUpdateMeta, "mergeTranscriptUpdateMeta");
+function extractTranscriptMeta(meta) {
+  const transcript = meta?.["qwenTranscript"];
+  return typeof transcript === "object" && transcript !== null ? transcript : void 0;
+}
+__name(extractTranscriptMeta, "extractTranscriptMeta");
 
 // packages/acp-bridge/src/journalGrowthPolicy.ts
 init_esbuild_shims();
@@ -2622,12 +2646,13 @@ var BridgeClient = class {
     const toolCallId = params["toolCallId"];
     const toolName = params["toolName"];
     const args = params["arguments"];
-    if (typeof sessionId !== "string" || sessionId.length === 0 || typeof promptId !== "string" || promptId.length === 0 || typeof toolCallId !== "string" || toolCallId.length === 0 || typeof toolName !== "string" || toolName.length === 0 || !isRecord2(args)) {
+    if (typeof sessionId !== "string" || sessionId.length === 0 || promptId !== void 0 && (typeof promptId !== "string" || promptId.length === 0) || typeof toolCallId !== "string" || toolCallId.length === 0 || typeof toolName !== "string" || toolName.length === 0 || !isRecord2(args)) {
       throw RequestError.invalidParams(
         void 0,
         "Invalid external tool guard request"
       );
     }
+    const promptScoped = promptId !== void 0;
     if (!this.ownsSession(sessionId)) {
       throw RequestError.invalidParams(
         void 0,
@@ -2635,21 +2660,26 @@ var BridgeClient = class {
       );
     }
     const entry = this.resolveEntry(sessionId);
-    if (!entry || !entry.promptActive || entry.activePromptId !== promptId) {
+    if (!entry || promptScoped && (!entry.promptActive || entry.activePromptId !== promptId)) {
       throw RequestError.invalidParams(
         void 0,
         "External tool guard prompt is not the active prompt"
       );
     }
+    const invocationCwd = params["invocationCwd"];
     const decision = await this.externalToolGuard({
       sessionId: entry.sessionId,
-      promptId: entry.activePromptId,
+      ...promptScoped ? { promptId } : {},
       toolCallId,
       toolName,
-      arguments: args
+      arguments: args,
+      effectiveCwd: entry.effectiveCwd,
+      // Forwarded verbatim and explicitly untrusted: the host policy decides
+      // whether it can establish this scope from state it owns.
+      ...typeof invocationCwd === "string" && invocationCwd.length > 0 ? { invocationCwd } : {}
     });
     const currentEntry = this.resolveEntry(sessionId);
-    if (!this.ownsSession(sessionId) || currentEntry !== entry || !currentEntry.promptActive || currentEntry.activePromptId !== promptId) {
+    if (!this.ownsSession(sessionId) || currentEntry !== entry || promptScoped && (!currentEntry.promptActive || currentEntry.activePromptId !== promptId)) {
       throw RequestError.invalidParams(
         void 0,
         "External tool guard prompt is no longer active"
@@ -6660,18 +6690,27 @@ function broadcastPromptCancelledOnce(entry, sessionId, promptId, originatorClie
   );
 }
 __name(broadcastPromptCancelledOnce, "broadcastPromptCancelledOnce");
-function broadcastTurnComplete(entry, sessionId, promptResult, promptId, originatorClientId) {
+function broadcastTurnComplete(entry, sessionId, promptResult, promptId, originatorClientId, mutateTurnState) {
   try {
-    entry.events.publish({
+    const meta = promptResult["_meta"] && typeof promptResult["_meta"] === "object" ? promptResult["_meta"] : void 0;
+    const rawBranchPoint = meta?.["qwen.branchPoint"] && typeof meta["qwen.branchPoint"] === "object" ? meta["qwen.branchPoint"] : void 0;
+    const branchPoint = promptResult.stopReason === "end_turn" && typeof rawBranchPoint?.["assistantRecordUuid"] === "string" && CHAT_RECORD_UUID_RE.test(rawBranchPoint["assistantRecordUuid"]) && typeof rawBranchPoint["checkpointUuid"] === "string" && CHAT_RECORD_UUID_RE.test(rawBranchPoint["checkpointUuid"]) ? {
+      assistantRecordUuid: rawBranchPoint["assistantRecordUuid"],
+      checkpointUuid: rawBranchPoint["checkpointUuid"]
+    } : void 0;
+    const published = entry.events.publish({
       type: "turn_complete",
       ...promptId ? { promptId } : {},
       data: {
         sessionId,
         stopReason: promptResult.stopReason ?? "end_turn",
-        ...promptId ? { promptId } : {}
+        ...promptId ? { promptId } : {},
+        ...branchPoint ? { branchPoint } : {}
       },
       ...originatorClientId ? { originatorClientId } : {}
     });
+    if (mutateTurnState && published !== void 0)
+      entry.turnErrorEvent = void 0;
   } catch {
   }
 }
@@ -6703,6 +6742,14 @@ function extractJsonRpcErrorDetail(data) {
   return void 0;
 }
 __name(extractJsonRpcErrorDetail, "extractJsonRpcErrorDetail");
+function extractJsonRpcErrorField(err, field) {
+  if (typeof err !== "object" || err === null) return void 0;
+  const data = err.data;
+  if (typeof data !== "object" || data === null) return void 0;
+  const value = data[field];
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+__name(extractJsonRpcErrorField, "extractJsonRpcErrorField");
 function extractErrorCode(err) {
   if (typeof err !== "object" || err === null || !("code" in err))
     return void 0;
@@ -6712,14 +6759,79 @@ function extractErrorCode(err) {
   return void 0;
 }
 __name(extractErrorCode, "extractErrorCode");
+var REFRESH_APPEND_BOOKKEEPING_EVENT_TYPES = /* @__PURE__ */ new Set([
+  "pending_prompt_added",
+  "pending_prompt_completed",
+  "prompt_cancelled",
+  "model_switched",
+  "model_switch_failed",
+  "approval_mode_changed",
+  "language_changed",
+  "session_metadata_updated",
+  "session_cwd_changed",
+  "artifact_changed",
+  "settings_changed",
+  "extensions_changed",
+  "mcp_server_changed",
+  "mcp_server_added",
+  "mcp_server_removed",
+  "user_shell_command",
+  "user_shell_result",
+  // Workspace-level fan-out (workspace service, git watcher, memory /
+  // agent CRUD, device-flow registry) reaches every session bus via
+  // `publishWorkspaceEvent` while idle. The `auth_device_flow_*` members
+  // mirror the closed `DeviceFlowEventEmission` union — audit that union
+  // when it grows.
+  "tool_toggled",
+  "workspace_initialized",
+  "mcp_server_restarted",
+  "mcp_server_restart_refused",
+  "settings_reloaded",
+  "trust_change_requested",
+  "memory_changed",
+  "agent_changed",
+  "git_status_changed",
+  "git_branch_changed",
+  "github_setup_completed",
+  "auth_device_flow_started",
+  "auth_device_flow_throttled",
+  "auth_device_flow_authorized",
+  "auth_device_flow_failed",
+  "auth_device_flow_cancelled"
+]);
+function isIdleBookkeepingSessionUpdate(event) {
+  if (event.type !== "session_update") return false;
+  const data = event.data;
+  if (!data || typeof data !== "object" || Array.isArray(data)) return false;
+  const update = data["update"];
+  if (!update || typeof update !== "object" || Array.isArray(update))
+    return false;
+  const updateRecord = update;
+  const subtype = updateRecord["sessionUpdate"];
+  if (subtype === "available_commands_update" || subtype === "current_mode_update") {
+    return true;
+  }
+  const meta = updateRecord["_meta"];
+  if (!meta || typeof meta !== "object" || Array.isArray(meta)) return false;
+  return meta["source"] === "user-shell";
+}
+__name(isIdleBookkeepingSessionUpdate, "isIdleBookkeepingSessionUpdate");
+function isRefreshAppendTurnContent(event) {
+  if (event.type === "history_truncated") return false;
+  if (REFRESH_APPEND_BOOKKEEPING_EVENT_TYPES.has(event.type)) return false;
+  return !isIdleBookkeepingSessionUpdate(event);
+}
+__name(isRefreshAppendTurnContent, "isRefreshAppendTurnContent");
 function classifyTurnErrorKind(message) {
   return message.trim().toLowerCase() === "terminated" ? "model_stream_interrupted" : void 0;
 }
 __name(classifyTurnErrorKind, "classifyTurnErrorKind");
 function broadcastTurnError(entry, sessionId, err, promptId, originatorClientId, mutateTurnState) {
   const message = extractErrorMessage(err);
-  const code = extractErrorCode(err);
-  const errorKind = classifyTurnErrorKind(message);
+  const structuredErrorKind = extractJsonRpcErrorField(err, "errorKind");
+  const errorKind = structuredErrorKind ?? classifyTurnErrorKind(message);
+  const code = structuredErrorKind !== void 0 ? extractJsonRpcErrorField(err, "code") ?? extractErrorCode(err) : extractErrorCode(err);
+  const loopType = extractJsonRpcErrorField(err, "loopType");
   if (errorKind) {
     writeServeDebugLine(
       `turn_error classified session=${JSON.stringify(sessionId)} message=${JSON.stringify(message)} errorKind=${JSON.stringify(errorKind)}` + (code ? ` code=${JSON.stringify(code)}` : "") + (promptId ? ` promptId=${JSON.stringify(promptId)}` : "")
@@ -6734,7 +6846,7 @@ function broadcastTurnError(entry, sessionId, err, promptId, originatorClientId,
     };
   }
   try {
-    entry.events.publish({
+    const published = entry.events.publish({
       type: "turn_error",
       ...promptId ? { promptId } : {},
       data: {
@@ -6742,10 +6854,14 @@ function broadcastTurnError(entry, sessionId, err, promptId, originatorClientId,
         message,
         ...code ? { code } : {},
         ...errorKind ? { errorKind } : {},
+        ...loopType ? { loopType } : {},
         ...promptId ? { promptId } : {}
       },
       ...originatorClientId ? { originatorClientId } : {}
     });
+    if (mutateTurnState) {
+      entry.turnErrorEvent = published;
+    }
   } catch {
   }
 }
@@ -6759,13 +6875,21 @@ function publishPromptTerminal(entry, pendingEntry, terminal) {
   }
   pendingEntry.terminalPublished = true;
   const originatorClientId = pendingEntry.originatorClientId;
+  const mutateTurnState = pendingEntry.state === "running";
+  if (!mutateTurnState && entry.turnErrorEvent) {
+    const journal = entry.events.liveJournalSnapshot() ?? [];
+    if (journal.some(isRefreshAppendTurnContent)) {
+      entry.turnErrorEvent = void 0;
+    }
+  }
   if (terminal.kind === "complete") {
     broadcastTurnComplete(
       entry,
       entry.sessionId,
       terminal.result,
       pendingEntry.promptId,
-      originatorClientId
+      originatorClientId,
+      mutateTurnState
     );
   } else if (terminal.kind === "cancelled") {
     broadcastTurnComplete(
@@ -6773,7 +6897,8 @@ function publishPromptTerminal(entry, pendingEntry, terminal) {
       entry.sessionId,
       { stopReason: "cancelled" },
       pendingEntry.promptId,
-      originatorClientId
+      originatorClientId,
+      mutateTurnState
     );
   } else {
     broadcastTurnError(
@@ -6782,13 +6907,7 @@ function publishPromptTerminal(entry, pendingEntry, terminal) {
       terminal.err,
       pendingEntry.promptId,
       originatorClientId,
-      // Only a running prompt's failure is the active turn's failure. The
-      // `state === 'running'` gate (not `activePromptId`) is deliberate:
-      // on the normal settle path `settleActivePromptState` runs in
-      // `promptPromise.finally` BEFORE the terminal is published, so
-      // `activePromptId` is already cleared when a genuine active failure
-      // lands here.
-      pendingEntry.state === "running"
+      mutateTurnState
     );
   }
 }
@@ -6851,6 +6970,7 @@ var MAX_SHELL_OUTPUT_FOR_HISTORY = 1e4;
 var MAX_MID_TURN_QUEUE_DEPTH = 20;
 var DEFAULT_MAX_SESSIONS = 32;
 var DEFAULT_MAX_PENDING_PROMPTS_PER_SESSION = 5;
+var CHAT_RECORD_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var MAX_EVENT_RING_SIZE = 1e6;
 var DEFAULT_PERMISSION_TIMEOUT_MS = 5 * 60 * 1e3;
 var DEFAULT_MAX_PENDING_PER_SESSION = 64;
@@ -7046,6 +7166,12 @@ function createAcpSessionBridge(opts) {
     if (entryHasLocalWork(entry)) return false;
     const owner = channelInfoForEntry(entry);
     if (owner?.pendingRestoreIds.has(entry.sessionId)) return false;
+    const capability = owner?.activeWork;
+    if (capability && !owner.isQuarantined && !owner.restoreSettlementOverdue && ACTIVE_WORK_HOLD_CATEGORIES.some(
+      (category) => !capability.categories.includes(category)
+    )) {
+      return false;
+    }
     return !childReportsHeldWork(entry);
   }
   __name(entryIsAutoCloseCandidate, "entryIsAutoCloseCandidate");
@@ -7054,12 +7180,15 @@ function createAcpSessionBridge(opts) {
   }
   __name(isClosingOrAuthorizingClose, "isClosingOrAuthorizingClose");
   async function maybeCloseIdleSession(entry, reason) {
-    if (!entryIsAutoCloseCandidate(entry)) return;
-    if (entry.spawnOwnerWantedKill && entry.attachCount === 0) {
+    if (byId.get(entry.sessionId) === entry && !isClosingOrAuthorizingClose(entry) && entry.spawnOwnerWantedKill && entry.attachCount === 0) {
+      writeStderrLine(
+        `qwen serve: completing deferred kill of session ${JSON.stringify(entry.sessionId)} (${reason})`
+      );
       await bridgeApi.killSession(entry.sessionId).catch(() => {
       });
       return;
     }
+    if (!entryIsAutoCloseCandidate(entry)) return;
     if (entry.clientIds.size > 0) return;
     await closeIfChildUnheld(entry, {
       trigger: reason,
@@ -7096,7 +7225,10 @@ function createAcpSessionBridge(opts) {
       const response = await withTimeout(
         entry.connection.extMethod(SERVE_CONTROL_EXT_METHODS.sessionClose, {
           sessionId: entry.sessionId,
-          [ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM]: true
+          [ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM]: true,
+          drainTimeoutMs: sessionCloseDrainBudgetMs(
+            ACTIVE_WORK_CLOSE_TIMEOUT_MS
+          )
         }),
         ACTIVE_WORK_CLOSE_TIMEOUT_MS,
         SERVE_CONTROL_EXT_METHODS.sessionClose
@@ -7833,7 +7965,8 @@ function createAcpSessionBridge(opts) {
                   _meta: {
                     [ACTIVE_WORK_HEARTBEAT_META_KEY]: {
                       v: ACTIVE_WORK_HEARTBEAT_VERSION,
-                      intervalMs: ACTIVE_WORK_HEARTBEAT_INTERVAL_MS
+                      intervalMs: ACTIVE_WORK_HEARTBEAT_INTERVAL_MS,
+                      categories: [...ACTIVE_WORK_HOLD_CATEGORIES]
                     },
                     [CHANNEL_STARTUP_PROFILE_META_KEY]: {
                       v: CHANNEL_STARTUP_PROFILE_VERSION
@@ -8625,7 +8758,9 @@ function createAcpSessionBridge(opts) {
         SERVE_CONTROL_EXT_METHODS.sessionClose,
         {
           sessionId: entry.sessionId,
-          drainTimeoutMs: Math.max(1, Math.floor(initTimeoutMs * 0.8)),
+          drainTimeoutMs: sessionCloseDrainBudgetMs(
+            opts2?.timeoutMs ?? initTimeoutMs
+          ),
           ...opts2?.requireFlush === true ? { requireFlush: true } : {}
         }
       );
@@ -9124,8 +9259,19 @@ function createAcpSessionBridge(opts) {
           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.epoch === eventEpoch && entry.events.lastEventId === lastEventId) {
+          let compactedReplay = page.events;
+          const turnErrorEvent = entry.turnErrorEvent;
+          if (turnErrorEvent) {
+            const journal = entry.events.liveJournalSnapshot() ?? [];
+            const hasNewerTurnContent = journal.some(
+              isRefreshAppendTurnContent
+            );
+            if (!hasNewerTurnContent) {
+              compactedReplay = [...page.events, turnErrorEvent];
+            }
+          }
           return {
-            compactedReplay: page.events,
+            compactedReplay,
             liveJournal: [],
             lastEventId,
             eventEpoch,
@@ -9415,7 +9561,7 @@ function createAcpSessionBridge(opts) {
                 SERVE_CONTROL_EXT_METHODS.sessionClose,
                 {
                   sessionId: req.sessionId,
-                  drainTimeoutMs: Math.max(1, Math.floor(initTimeoutMs * 0.8))
+                  drainTimeoutMs: sessionCloseDrainBudgetMs(initTimeoutMs)
                 }
               ),
               initTimeoutMs,
@@ -10548,6 +10694,7 @@ function createAcpSessionBridge(opts) {
                   delete meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
                   delete meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
                   delete meta[DAEMON_MODEL_PROMPT_META_KEY];
+                  delete meta[CHANNEL_PROMPT_META_KEY];
                   if (isRetry) {
                     meta[DAEMON_RETRY_META_KEY] = true;
                   }
@@ -10563,6 +10710,9 @@ function createAcpSessionBridge(opts) {
                   if (modelPrompt !== void 0) {
                     meta[DAEMON_MODEL_PROMPT_META_KEY] = modelPrompt;
                   }
+                  if (context?.channelPrompt === true) {
+                    meta[CHANNEL_PROMPT_META_KEY] = true;
+                  }
                   meta[INVOCATION_CONTEXT_META_KEY] = invocationContext;
                   if (Object.keys(meta).length > 0) {
                     copy._meta = meta;
@@ -10575,6 +10725,7 @@ function createAcpSessionBridge(opts) {
                 entry.activePromptId = pendingEntry.promptId;
                 delete entry.cancelBroadcastWithoutPrompt;
                 delete entry.turnError;
+                delete entry.turnErrorEvent;
                 activePromptCounter++;
                 entry.sessionLastSeenAt = Date.now();
                 touchActivity();
@@ -10622,6 +10773,10 @@ function createAcpSessionBridge(opts) {
                       );
                       return;
                     }
+                    if (extractJsonRpcErrorField(err, "errorKind")) {
+                      cancelPendingForSession(sessionId);
+                      return;
+                    }
                     writeStderrLine(
                       `sendPrompt: forward failed for session ${sessionId}: ${extractErrorMessage(err)}`
                     );
@@ -10919,53 +11074,68 @@ function createAcpSessionBridge(opts) {
       if (shuttingDown) throw new Error("AcpSessionBridge is shutting down");
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
+      if (isClosingOrAuthorizingClose(entry)) {
+        throw new SessionNotFoundError(sessionId, "The session is closing");
+      }
       const source = parseSessionSource(req.sourceType, req.sourceId);
       if ("error" in source) {
         throw new InvalidSessionMetadataError("sourceType", source.error);
       }
       const isSideTask = source.sourceType === "side_task";
-      let originatorClientId;
+      const restoreBranch = isSideTask || req.atRecordId === void 0;
       if (context?.clientId !== void 0) {
-        originatorClientId = resolveTrustedClientId(entry, context.clientId);
+        resolveTrustedClientId(entry, context.clientId);
       }
       const concurrentSideTask = isSideTask && entry.promptActive;
+      if (!isSideTask && (entry.pendingPromptCount > 0 || entry.promptActive)) {
+        throw new BranchWhilePromptActiveError(sessionId);
+      }
       const branchResult = (concurrentSideTask ? Promise.resolve() : entry.promptQueue).then(async () => {
-        if (entry.promptActive && !isSideTask) {
-          throw new BranchWhilePromptActiveError(sessionId);
+        if (isClosingOrAuthorizingClose(entry) || byId.get(sessionId) !== entry) {
+          throw new SessionNotFoundError(sessionId, "The session is closing");
         }
         assertFreshSessionsAvailable();
-        if (byId.size + inFlightSpawns.size + inFlightRestores.size >= maxSessions) {
-          throw new SessionLimitExceededError(maxSessions);
+        let admission;
+        if (restoreBranch) {
+          if (byId.size + inFlightSpawns.size + inFlightRestores.size >= maxSessions) {
+            throw new SessionLimitExceededError(maxSessions);
+          }
+          admission = reserveFreshSession({
+            operation: "branch",
+            workspaceCwd: boundWorkspace,
+            sourceSessionId: sessionId
+          });
         }
-        const admission = reserveFreshSession({
-          operation: "branch",
-          workspaceCwd: boundWorkspace,
-          sourceSessionId: sessionId
-        });
         let admissionReleased = false;
         const releaseAdmissionOnce = /* @__PURE__ */ __name(() => {
-          if (admissionReleased) return;
+          if (admissionReleased || !admission) return;
           admissionReleased = true;
           releaseFreshSessionReservation(admission);
         }, "releaseAdmissionOnce");
         try {
-          assertLivePromptEntry(sessionId, entry);
-          const ci = channelInfoForEntry(entry);
-          const result = await withTimeout(
-            Promise.race([
-              ci.connection.extMethod(
-                isSideTask ? SERVE_CONTROL_EXT_METHODS.sessionSideTask : SERVE_CONTROL_EXT_METHODS.sessionBranch,
-                {
-                  sessionId,
-                  cwd: boundWorkspace,
-                  name: req.name
-                }
-              ),
-              getTransportClosedReject(entry)
-            ]),
-            initTimeoutMs,
-            isSideTask ? "createSideTaskSession" : "branchSession"
+          const mutation = entry.connection.extMethod(
+            isSideTask ? SERVE_CONTROL_EXT_METHODS.sessionSideTask : SERVE_CONTROL_EXT_METHODS.sessionBranch,
+            {
+              sessionId,
+              cwd: boundWorkspace,
+              name: req.name,
+              ...req.atRecordId !== void 0 ? { atRecordId: req.atRecordId } : {}
+            }
           );
+          let result;
+          try {
+            result = await Promise.race([
+              mutation,
+              getTransportClosedReject(entry)
+            ]);
+          } catch (err) {
+            const data = err?.data;
+            if (!isSideTask && data && typeof data === "object" && data.errorKind === "session_busy") {
+              const msg = err?.message ?? "Branch failed";
+              throw new SessionBusyError(sessionId, msg);
+            }
+            throw err;
+          }
           if (!result || typeof result.newSessionId !== "string") {
             throw new Error(
               `branchSession: agent returned invalid response: ${JSON.stringify(result)}`
@@ -10973,6 +11143,17 @@ function createAcpSessionBridge(opts) {
           }
           const rawBranchName = result.displayName ?? result.title;
           const branchDisplayName = typeof rawBranchName === "string" ? rawBranchName : result.newSessionId.slice(0, 8);
+          if (!restoreBranch) {
+            return {
+              sessionId: result.newSessionId,
+              displayName: branchDisplayName,
+              forkedFrom: {
+                sessionId,
+                displayName: entry.displayName ?? sessionId.slice(0, 8)
+              }
+            };
+          }
+          const ci = await ensureChannel();
           let restored;
           try {
             const hideInheritedHistory = req.replayInheritedHistory === false;
@@ -10995,7 +11176,7 @@ function createAcpSessionBridge(opts) {
             releaseAdmissionOnce();
           } catch (restoreErr) {
             writeStderrLine(
-              `qwen serve: branchSession load failed for ${result.newSessionId}, attempting cleanup...`
+              `qwen serve: branchSession load failed for ${result.newSessionId}; closing partial live state while preserving the committed session...`
             );
             try {
               if (!ci.isDying) {
@@ -11005,7 +11186,8 @@ function createAcpSessionBridge(opts) {
                       SERVE_CONTROL_EXT_METHODS.sessionClose,
                       {
                         sessionId: result.newSessionId,
-                        cwd: boundWorkspace
+                        cwd: boundWorkspace,
+                        drainTimeoutMs: sessionCloseDrainBudgetMs(initTimeoutMs)
                       }
                     ),
                     channelUnavailableReject(
@@ -11019,7 +11201,7 @@ function createAcpSessionBridge(opts) {
               }
             } catch (cleanupErr) {
               writeStderrLine(
-                `qwen serve: branchSession cleanup of ${result.newSessionId} failed: ${cleanupErr instanceof Error ? cleanupErr.message : cleanupErr}`
+                `qwen serve: branchSession live-state close for ${result.newSessionId} failed: ${cleanupErr instanceof Error ? cleanupErr.message : cleanupErr}`
               );
             }
             throw restoreErr;
@@ -11049,19 +11231,6 @@ function createAcpSessionBridge(opts) {
               );
             }
           }
-          if (!isSideTask) {
-            const eventData = {
-              sourceSessionId: sessionId,
-              newSessionId: result.newSessionId,
-              displayName: branchDisplayName
-            };
-            const branchEnvelope = {
-              type: "session_branched",
-              data: eventData,
-              ...originatorClientId ? { originatorClientId } : {}
-            };
-            newEntry?.events.publish(branchEnvelope);
-          }
           return {
             ...restored,
             displayName: branchDisplayName,
@@ -11094,7 +11263,8 @@ function createAcpSessionBridge(opts) {
         },
         context
       );
-      const { forkedFrom: _forkedFrom, ...sideTask } = result;
+      const restoredResult = result;
+      const { forkedFrom: _forkedFrom, ...sideTask } = restoredResult;
       return {
         ...sideTask,
         parentSessionId: sessionId
@@ -12509,10 +12679,19 @@ function createAcpSessionBridge(opts) {
         entry,
         context?.clientId
       );
-      let response;
-      try {
-        response = await Promise.race([
-          withTimeout(
+      if (entry.pendingPromptCount > 0 || entry.promptActive) {
+        throw new SessionBusyError(
+          sessionId,
+          "Cannot rewind while a prompt is running"
+        );
+      }
+      const rewindResult = entry.promptQueue.then(async () => {
+        if (entry.closing) {
+          throw new SessionNotFoundError(sessionId, "The session is closing");
+        }
+        let response;
+        try {
+          response = await Promise.race([
             entry.connection.extMethod(
               SERVE_CONTROL_EXT_METHODS.sessionRewind,
               {
@@ -12521,92 +12700,95 @@ function createAcpSessionBridge(opts) {
                 rewindFiles: req.rewindFiles !== false
               }
             ),
-            initTimeoutMs,
-            SERVE_CONTROL_EXT_METHODS.sessionRewind
-          ),
-          getTransportClosedReject(entry)
-        ]);
-      } catch (err) {
-        const data = err?.data;
-        if (data && typeof data === "object" && "errorKind" in data) {
-          const kind = data.errorKind;
-          const msg = err?.message ?? "Rewind failed";
-          if (kind === "session_busy") {
-            throw new SessionBusyError(sessionId, msg);
-          }
-          if (kind === "invalid_rewind_target") {
-            throw new InvalidRewindTargetError(sessionId, msg);
+            getTransportClosedReject(entry)
+          ]);
+        } catch (err) {
+          const data = err?.data;
+          if (data && typeof data === "object" && "errorKind" in data) {
+            const kind = data.errorKind;
+            const msg = err?.message ?? "Rewind failed";
+            if (kind === "session_busy") {
+              throw new SessionBusyError(sessionId, msg);
+            }
+            if (kind === "invalid_rewind_target") {
+              throw new InvalidRewindTargetError(sessionId, msg);
+            }
           }
+          throw err;
         }
-        throw err;
-      }
-      const targetTurnIndex = response["targetTurnIndex"] ?? 0;
-      const filesChanged = response["filesChanged"] ?? [];
-      const filesFailed = response["filesFailed"] ?? [];
-      const artifactSnapshot = restoredArtifactSnapshotFromState(
-        response
-      );
-      const artifactSnapshotUnavailable = artifactSnapshotUnavailableReason(
-        response
-      );
-      const beforeArtifacts = (await entry.artifacts.list()).artifacts;
-      const shouldRestoreArtifactSnapshot = artifactSnapshot !== void 0 && artifactSnapshotUnavailable === void 0;
-      const artifactRestoreWarnings = artifactSnapshotUnavailable !== void 0 ? [
-        `artifact snapshot rebuild unavailable during rewind: ${artifactSnapshotUnavailable}`
-      ] : shouldRestoreArtifactSnapshot ? await entry.artifacts.restore(artifactSnapshot, {
-        preserveLiveEphemeral: true
-      }) : [];
-      const artifactRestoreFailed = artifactRestoreWarnings.some(
-        isArtifactRestoreFailureWarning
-      );
-      const shouldRecordArtifactSnapshot = shouldRestoreArtifactSnapshot && !artifactRestoreFailed;
-      const artifactSnapshotWarnings = shouldRecordArtifactSnapshot ? await entry.artifacts.recordSnapshot() : [];
-      const artifactWarnings = [
-        ...artifactRestoreWarnings,
-        ...artifactSnapshotWarnings
-      ];
-      for (const warning of artifactRestoreWarnings) {
-        writeStderrLine(
-          `[artifacts] session=${entry.sessionId} action=rewind_restore_warning warning=${JSON.stringify(
-            warning
-          )}`
+        const targetTurnIndex = response["targetTurnIndex"] ?? 0;
+        const filesChanged = response["filesChanged"] ?? [];
+        const filesFailed = response["filesFailed"] ?? [];
+        const artifactSnapshot = restoredArtifactSnapshotFromState(
+          response
         );
-      }
-      for (const warning of artifactSnapshotWarnings) {
-        writeStderrLine(
-          `[artifacts] session=${entry.sessionId} action=rewind_snapshot_warning warning=${JSON.stringify(
-            warning
-          )}`
+        const artifactSnapshotUnavailable = artifactSnapshotUnavailableReason(
+          response
         );
-      }
-      const afterArtifacts = (await entry.artifacts.list()).artifacts;
-      publishArtifactChanges(
-        entry,
-        artifactReseedChanges(beforeArtifacts, afterArtifacts),
-        originatorClientId
+        const beforeArtifacts = (await entry.artifacts.list()).artifacts;
+        const shouldRestoreArtifactSnapshot = artifactSnapshot !== void 0 && artifactSnapshotUnavailable === void 0;
+        const artifactRestoreWarnings = artifactSnapshotUnavailable !== void 0 ? [
+          `artifact snapshot rebuild unavailable during rewind: ${artifactSnapshotUnavailable}`
+        ] : shouldRestoreArtifactSnapshot ? await entry.artifacts.restore(artifactSnapshot, {
+          preserveLiveEphemeral: true
+        }) : [];
+        const artifactRestoreFailed = artifactRestoreWarnings.some(
+          isArtifactRestoreFailureWarning
+        );
+        const shouldRecordArtifactSnapshot = shouldRestoreArtifactSnapshot && !artifactRestoreFailed;
+        const artifactSnapshotWarnings = shouldRecordArtifactSnapshot ? await entry.artifacts.recordSnapshot() : [];
+        const artifactWarnings = [
+          ...artifactRestoreWarnings,
+          ...artifactSnapshotWarnings
+        ];
+        for (const warning of artifactRestoreWarnings) {
+          writeStderrLine(
+            `[artifacts] session=${entry.sessionId} action=rewind_restore_warning warning=${JSON.stringify(
+              warning
+            )}`
+          );
+        }
+        for (const warning of artifactSnapshotWarnings) {
+          writeStderrLine(
+            `[artifacts] session=${entry.sessionId} action=rewind_snapshot_warning warning=${JSON.stringify(
+              warning
+            )}`
+          );
+        }
+        const afterArtifacts = (await entry.artifacts.list()).artifacts;
+        publishArtifactChanges(
+          entry,
+          artifactReseedChanges(beforeArtifacts, afterArtifacts),
+          originatorClientId
+        );
+        try {
+          entry.events.publish({
+            type: "session_rewound",
+            data: {
+              sessionId,
+              promptId: req.promptId,
+              targetTurnIndex,
+              filesChanged,
+              filesFailed,
+              ...artifactWarnings.length > 0 ? { warnings: artifactWarnings } : {}
+            },
+            ...originatorClientId ? { originatorClientId } : {}
+          });
+        } catch {
+        }
+        return {
+          rewound: filesFailed.length === 0,
+          targetTurnIndex,
+          filesChanged,
+          filesFailed,
+          ...artifactWarnings.length > 0 ? { warnings: artifactWarnings } : {}
+        };
+      });
+      entry.promptQueue = rewindResult.then(
+        () => void 0,
+        () => void 0
       );
-      try {
-        entry.events.publish({
-          type: "session_rewound",
-          data: {
-            sessionId,
-            promptId: req.promptId,
-            targetTurnIndex,
-            filesChanged,
-            filesFailed,
-            ...artifactWarnings.length > 0 ? { warnings: artifactWarnings } : {}
-          },
-          ...originatorClientId ? { originatorClientId } : {}
-        });
-      } catch {
-      }
-      return {
-        rewound: filesFailed.length === 0,
-        targetTurnIndex,
-        filesChanged,
-        filesFailed,
-        ...artifactWarnings.length > 0 ? { warnings: artifactWarnings } : {}
-      };
+      return rewindResult;
     },
     async manageMcpServer(serverName, action, originatorClientId) {
       const info = await ensureChannel();
@@ -12934,6 +13116,10 @@ function createAcpSessionBridge(opts) {
           timeoutMs: initTimeoutMs
         });
       } catch (error) {
+        if (isDefinitiveAcpRequestError(error)) {
+          entry.closing = false;
+          return false;
+        }
         if (ci) {
           await killChannelWithLog(
             ci,