@qwen-code/qwen-code 0.20.1-preview.7215 → 0.20.1

package/chunks/{chunk-EVSTCA7S.js → chunk-R7MPKABX.js}

@@ -20,9 +20,6 @@ import {
   MID_TURN_QUEUE_DRAIN_METHOD,
   TODO_STOP_GUARD_QUEUE_RELEASE_METHOD
 } from "./chunk-QR6U5QPP.js";
-import {
-  defaultSpawnChannelFactory
-} from "./chunk-6GUTHAN7.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -34,6 +31,7 @@ import {
   InvalidSessionScopeError,
   MCP_RESTART_SERVER_DEADLINE_MS,
   PermissionForbiddenError,
+  PromptDeadlineExceededError,
   PromptQueueFullError,
   RestoreInProgressError,
   SessionBusyError,
@@ -43,7 +41,10 @@ import {
   SessionShellDisabledError,
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-X6YQWCIJ.js";
+} from "./chunk-UH3WSE5L.js";
+import {
+  defaultSpawnChannelFactory
+} from "./chunk-JHFVJQRO.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -52,15 +53,16 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-WXAXH7IJ.js";
-import {
-  canonicalizeWorkspace
-} from "./chunk-W7FJ3N32.js";
+} from "./chunk-BWQRDISK.js";
 import {
   ClientSideConnection,
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-UDXSXLER.js";
+import {
+  canonicalizeWorkspace,
+  translateAndCheckAbsoluteWorkspacePath
+} from "./chunk-2RFKHEXL.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   ShellExecutionService,
@@ -72,11 +74,11 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-6OH6A5EX.js";
+} from "./chunk-GEB2CGUV.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-ONWW74X6.js";
+} from "./chunk-5G2SK2OO.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -5040,6 +5042,12 @@ function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 __name(isRecord3, "isRecord");
+function isDefinitiveAcpRequestError(error) {
+  if (error instanceof RequestError) return true;
+  if (!isRecord3(error)) return false;
+  return typeof error["code"] === "number" && Number.isInteger(error["code"]) && typeof error["message"] === "string";
+}
+__name(isDefinitiveAcpRequestError, "isDefinitiveAcpRequestError");
 function getCanonicalModelId(response, fallback) {
   if (!isRecord3(response) || !isRecord3(response["_meta"])) return fallback;
   const modelSwitch = response["_meta"]["qwenModelSwitch"];
@@ -5399,6 +5407,57 @@ function broadcastTurnError(entry, sessionId, err, promptId, originatorClientId)
   }
 }
 __name(broadcastTurnError, "broadcastTurnError");
+function publishPromptTerminal(entry, pendingEntry, terminal) {
+  if (pendingEntry.terminalPublished) {
+    writeStderrLine(
+      `publishPromptTerminal: suppressed duplicate ${terminal.kind} terminal for prompt ${pendingEntry.promptId} (session ${entry.sessionId})`
+    );
+    return;
+  }
+  pendingEntry.terminalPublished = true;
+  const originatorClientId = pendingEntry.originatorClientId;
+  if (terminal.kind === "complete") {
+    broadcastTurnComplete(
+      entry,
+      entry.sessionId,
+      terminal.result,
+      pendingEntry.promptId,
+      originatorClientId
+    );
+  } else if (terminal.kind === "cancelled") {
+    broadcastTurnComplete(
+      entry,
+      entry.sessionId,
+      { stopReason: "cancelled" },
+      pendingEntry.promptId,
+      originatorClientId
+    );
+  } else {
+    broadcastTurnError(
+      entry,
+      entry.sessionId,
+      terminal.err,
+      pendingEntry.promptId,
+      originatorClientId
+    );
+  }
+}
+__name(publishPromptTerminal, "publishPromptTerminal");
+function flushPromptTerminals(entry, code, message) {
+  for (const pending of [...entry.pendingPromptList]) {
+    publishPromptTerminal(entry, pending, {
+      kind: "error",
+      err: { code, message }
+    });
+    try {
+      pending.abortController.abort(
+        new DOMException("Prompt aborted", "AbortError")
+      );
+    } catch {
+    }
+  }
+}
+__name(flushPromptTerminals, "flushPromptTerminals");
 function hasControlCharacter2(value) {
   for (let i = 0; i < value.length; i += 1) {
     const code = value.charCodeAt(i);
@@ -5558,6 +5617,18 @@ function createAcpSessionBridge(opts) {
     lastActivityTimestamp = Date.now();
   }
   __name(touchActivity, "touchActivity");
+  function settleActivePromptState(entry, promptId) {
+    if (entry.activePromptId !== promptId) return;
+    delete entry.activePromptId;
+    delete entry.activePromptOriginatorClientId;
+    if (entry.promptActive) {
+      entry.promptActive = false;
+      activePromptCounter--;
+      entry.sessionLastSeenAt = Date.now();
+      touchActivity();
+    }
+  }
+  __name(settleActivePromptState, "settleActivePromptState");
   function resolvePositiveFiniteMs(raw, fallback) {
     if (raw === void 0) return fallback;
     return raw > 0 && Number.isFinite(raw) ? Math.min(raw, 2147483647) : 0;
@@ -5674,7 +5745,7 @@ function createAcpSessionBridge(opts) {
       if (shuttingDown) return;
       const now = Date.now();
       for (const [id, entry] of byId) {
-        if (entry.promptActive) continue;
+        if (entry.pendingPromptCount > 0) continue;
         if (entry.events.subscriberCount > 0) continue;
         const lastActive = entry.sessionLastSeenAt ?? Date.parse(entry.createdAt);
         const idle = now - lastActive;
@@ -5731,7 +5802,8 @@ function createAcpSessionBridge(opts) {
       pendingInteractionCount: entry.pendingInteractions.size,
       hasTurnError: entry.turnError !== void 0,
       ...entry.turnError !== void 0 ? { turnError: entry.turnError } : {},
-      pendingInteractions: [...entry.pendingInteractions.values()]
+      pendingInteractions: [...entry.pendingInteractions.values()],
+      ...entry.worktree ? { worktree: entry.worktree } : {}
     };
   }, "toSessionSummary");
   const permissionConsensusQuorum = opts.permissionConsensusQuorum;
@@ -5793,13 +5865,30 @@ function createAcpSessionBridge(opts) {
       entry.clientIds.set(clientId, count - 1);
     }
   }, "unregisterClient");
+  const recordAttachRef = /* @__PURE__ */ __name((entry, clientId) => {
+    entry.attachRefs.set(clientId, (entry.attachRefs.get(clientId) ?? 0) + 1);
+  }, "recordAttachRef");
+  const releaseAttachRef = /* @__PURE__ */ __name((entry, clientId) => {
+    const refs = entry.attachRefs.get(clientId);
+    if (refs === void 0 || refs <= 0) return false;
+    if (refs === 1) {
+      entry.attachRefs.delete(clientId);
+    } else {
+      entry.attachRefs.set(clientId, refs - 1);
+    }
+    return true;
+  }, "releaseAttachRef");
   const rollbackAttachRegistration = /* @__PURE__ */ __name(async (entry, clientId, attachCountDelta = 1) => {
-    entry.attachCount = Math.max(0, entry.attachCount - attachCountDelta);
+    const released = releaseAttachRef(entry, clientId) ? 1 : 0;
+    entry.attachCount = Math.max(
+      0,
+      entry.attachCount - (released + (attachCountDelta - 1))
+    );
     unregisterClient(entry, clientId);
     if (entry.spawnOwnerWantedKill && entry.attachCount === 0 && entry.events.subscriberCount === 0) {
       await bridgeApi.killSession(entry.sessionId).catch(() => {
       });
-    } else if (entry.clientIds.size === 0 && entry.events.subscriberCount === 0 && !entry.promptActive) {
+    } else if (entry.clientIds.size === 0 && entry.events.subscriberCount === 0 && entry.pendingPromptCount === 0) {
       await closeSessionImpl(entry.sessionId, void 0, {
         reason: "last_client_detached"
       }).catch((err) => {
@@ -5968,6 +6057,11 @@ function createAcpSessionBridge(opts) {
           const sessEntry = byId.get(sid);
           if (!sessEntry) continue;
           cancelPendingForSession(sid);
+          flushPromptTerminals(
+            sessEntry,
+            "channel_closed",
+            "agent channel exited before the prompt completed"
+          );
           try {
             sessEntry.events.publish({
               type: "session_died",
@@ -6062,7 +6156,7 @@ function createAcpSessionBridge(opts) {
     }
   }
   __name(ensureChannel, "ensureChannel");
-  async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId) {
+  async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId, worktree) {
     const channelPath = channelInfo && !channelInfo.isDying ? "reused" : inFlightChannelSpawn ? "joined" : "spawned_on_request";
     const ci = await telemetry.withSpan(
       "channel.wait",
@@ -6123,7 +6217,7 @@ function createAcpSessionBridge(opts) {
         newSessionResp.sessionId,
         boundWorkspace,
         void 0,
-        { parentSessionId, sourceType, sourceId }
+        { parentSessionId, sourceType, sourceId, worktree }
       );
       initializedSessionId = entry.sessionId;
       sessionRegistered = true;
@@ -6237,7 +6331,8 @@ function createAcpSessionBridge(opts) {
         ...entry.sourceType ? { sourceType: entry.sourceType } : {},
         ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
         ...entry.sourceType ? { sourcePersisted: sourcePersisted === true } : {},
-        ...entry.parentSessionId ? { parentSessionPersisted: parentSessionPersisted === true } : {}
+        ...entry.parentSessionId ? { parentSessionPersisted: parentSessionPersisted === true } : {},
+        ...entry.worktree ? { worktree: entry.worktree } : {}
       };
     } finally {
       ci.sessionSpawnsInFlight = Math.max(0, ci.sessionSpawnsInFlight - 1);
@@ -6447,10 +6542,11 @@ function createAcpSessionBridge(opts) {
     }
     return entry.transportClosedReject;
   }, "getTransportClosedReject");
-  const resolveWorkspaceKey = /* @__PURE__ */ __name((workspaceCwd) => {
-    if (!path3.isAbsolute(workspaceCwd)) {
+  const resolveWorkspaceKey = /* @__PURE__ */ __name((rawWorkspaceCwd) => {
+    const workspaceCwd = translateAndCheckAbsoluteWorkspacePath(rawWorkspaceCwd);
+    if (workspaceCwd === null) {
       throw new Error(
-        `workspaceCwd must be an absolute path; got "${workspaceCwd}"`
+        `workspaceCwd must be an absolute path; got "${rawWorkspaceCwd}"`
       );
     }
     const workspaceKey = workspaceCwd === boundWorkspace ? boundWorkspace : canonicalizeWorkspace(workspaceCwd);
@@ -6689,12 +6785,18 @@ function createAcpSessionBridge(opts) {
       return;
     }
     try {
+      const closeRequest = entry.connection.extMethod(
+        SERVE_CONTROL_EXT_METHODS.sessionClose,
+        {
+          sessionId: entry.sessionId,
+          drainTimeoutMs: Math.max(1, Math.floor(initTimeoutMs * 0.8)),
+          ...opts2?.requireFlush === true ? { requireFlush: true } : {}
+        }
+      );
+      const observedCloseRequest = opts2?.timeoutMs ? withTimeout(closeRequest, opts2.timeoutMs, label) : closeRequest;
       await Promise.race([
-        withTimeout(
-          entry.connection.extMethod(SERVE_CONTROL_EXT_METHODS.sessionClose, {
-            sessionId: entry.sessionId,
-            ...opts2?.requireFlush === true ? { requireFlush: true } : {}
-          }),
+        opts2?.throwOnFailure === true ? observedCloseRequest : withTimeout(
+          observedCloseRequest,
           initTimeoutMs,
           SERVE_CONTROL_EXT_METHODS.sessionClose
         ),
@@ -6850,6 +6952,7 @@ function createAcpSessionBridge(opts) {
       ...options.parentSessionId ? { parentSessionId: options.parentSessionId } : {},
       ...options.sourceType ? { sourceType: options.sourceType } : {},
       ...options.sourceId !== void 0 ? { sourceId: options.sourceId } : {},
+      ...options.worktree ? { worktree: options.worktree } : {},
       channel: ci.channel,
       connection: ci.connection,
       events,
@@ -6859,6 +6962,7 @@ function createAcpSessionBridge(opts) {
         persistence: createSessionArtifactPersistence(ci.connection, sessionId)
       }),
       recordingDegraded: false,
+      closing: false,
       promptQueue: Promise.resolve(),
       pendingPromptCount: 0,
       pendingPromptList: [],
@@ -6872,6 +6976,7 @@ function createAcpSessionBridge(opts) {
       clientIds: /* @__PURE__ */ new Map(),
       clientLastSeenAt: /* @__PURE__ */ new Map(),
       attachCount: 0,
+      attachRefs: /* @__PURE__ */ new Map(),
       spawnOwnerWantedKill: false,
       promptActive: false,
       retryAllowed: false
@@ -7074,8 +7179,15 @@ function createAcpSessionBridge(opts) {
     const historyReplay = action === "load" ? req.historyReplay ?? "stream" : "stream";
     const existing = byId.get(req.sessionId);
     if (existing) {
+      if (existing.closing) {
+        throw new SessionNotFoundError(
+          req.sessionId,
+          "The session is closing; retry after close completes"
+        );
+      }
       existing.attachCount++;
       const clientId = registerClient(existing, req.clientId);
+      recordAttachRef(existing, clientId);
       if (req.approvalMode) {
         await applyApprovalModeForAttach(existing, req.approvalMode, clientId);
       }
@@ -7120,6 +7232,7 @@ function createAcpSessionBridge(opts) {
         );
       }
       const clientId = registerClient(entry, req.clientId);
+      recordAttachRef(entry, clientId);
       if (req.approvalMode) {
         await applyApprovalModeForAttach(entry, req.approvalMode, clientId);
       }
@@ -7241,6 +7354,7 @@ function createAcpSessionBridge(opts) {
         restoreEvents.close();
         racedEntry.attachCount += 1 + coalesceState.count;
         const clientId2 = registerClient(racedEntry, req.clientId);
+        recordAttachRef(racedEntry, clientId2);
         if (req.approvalMode) {
           try {
             await applyApprovalMode(
@@ -7387,10 +7501,17 @@ function createAcpSessionBridge(opts) {
   async function closeSessionImpl(sessionId, context, closeOpts) {
     const entry = byId.get(sessionId);
     if (!entry) throw new SessionNotFoundError(sessionId);
+    if (entry.closing) {
+      throw new SessionNotFoundError(
+        sessionId,
+        "The session is already closing"
+      );
+    }
     let originatorClientId;
     if (context?.clientId !== void 0) {
       originatorClientId = resolveTrustedClientId(entry, context.clientId);
     }
+    entry.closing = true;
     const reason = closeOpts?.reason ?? "client_close";
     writeStderrLine(
       `qwen serve: closing session ${JSON.stringify(sessionId)} (reason: ${reason})` + (originatorClientId ? ` by client ${JSON.stringify(originatorClientId)}` : "")
@@ -7400,26 +7521,37 @@ function createAcpSessionBridge(opts) {
       "session.id": sessionId,
       "session.close.reason": reason
     });
-    if (defaultEntry === entry) defaultEntry = void 0;
     const ci = channelInfoForEntry(entry);
     if (!ci) {
       writeStderrLine(
         `qwen serve: closeSession channelInfoForEntry returned undefined for session ${JSON.stringify(sessionId)} \u2014 channel cleanup skipped (entry's channel already torn down)`
       );
     }
-    const requireAgentClose = closeOpts?.requireAgentClose === true;
-    if (requireAgentClose) {
+    try {
+      permissionMediator.forgetSession(sessionId);
+      entry.pendingPermissionIds.clear();
+      entry.pendingInteractions.clear();
       await notifyAgentSessionClose(entry, ci, "closeSession", {
         throwOnFailure: true,
-        requireFlush: true
+        requireFlush: closeOpts?.requireAgentClose === true
       });
+    } catch (error) {
+      if (isDefinitiveAcpRequestError(error)) {
+        entry.closing = false;
+      } else if (ci) {
+        await killChannelWithLog(
+          ci,
+          `recover unknown close outcome for session ${JSON.stringify(sessionId)}`
+        );
+      } else {
+        entry.closing = false;
+      }
+      throw error;
     }
+    if (defaultEntry === entry) defaultEntry = void 0;
     if (ci && ci.channel === entry.channel) {
       ci.sessionIds.delete(sessionId);
     }
-    permissionMediator.forgetSession(sessionId);
-    entry.pendingPermissionIds.clear();
-    entry.pendingInteractions.clear();
     if (entry.promptActive) {
       entry.promptActive = false;
       activePromptCounter--;
@@ -7434,6 +7566,11 @@ function createAcpSessionBridge(opts) {
       reason
     });
     ci?.client.markSessionClosed(sessionId);
+    flushPromptTerminals(
+      entry,
+      "session_closed",
+      "session closed before the prompt completed"
+    );
     try {
       entry.events.publish({
         type: "session_closed",
@@ -7451,9 +7588,6 @@ function createAcpSessionBridge(opts) {
     } catch {
     }
     entry.events.close();
-    if (!requireAgentClose) {
-      await notifyAgentSessionClose(entry, ci, "closeSession");
-    }
     try {
       await telemetry.withSpan(
         "session.close.cancel_active_prompt",
@@ -7568,8 +7702,15 @@ function createAcpSessionBridge(opts) {
       if (effectiveScope === "single") {
         const existing = defaultEntry;
         if (existing) {
+          if (existing.closing) {
+            throw new SessionNotFoundError(
+              existing.sessionId,
+              "The session is closing; retry after close completes"
+            );
+          }
           existing.attachCount++;
           const clientId = registerClient(existing, req.clientId);
+          recordAttachRef(existing, clientId);
           if (req.modelServiceId) {
             await applyModelServiceId(
               existing,
@@ -7609,6 +7750,7 @@ function createAcpSessionBridge(opts) {
             );
           }
           const clientId = registerClient(attachedEntry, req.clientId);
+          recordAttachRef(attachedEntry, clientId);
           if (req.modelServiceId) {
             await applyModelServiceId(
               attachedEntry,
@@ -7654,7 +7796,8 @@ function createAcpSessionBridge(opts) {
         releaseAdmissionOnce,
         req.parentSessionId,
         source.sourceType,
-        source.sourceId
+        source.sourceId,
+        req.worktree
       );
       const tracker = effectiveScope === "single" ? workspaceKey : `${workspaceKey}#${randomUUID2()}`;
       inFlightSpawns.set(tracker, promise);
@@ -7676,6 +7819,14 @@ function createAcpSessionBridge(opts) {
       const queuedAt = Date.now();
       const entry = byId.get(sessionId);
       if (!entry) return Promise.reject(new SessionNotFoundError(sessionId));
+      if (entry.closing) {
+        return Promise.reject(
+          new SessionNotFoundError(
+            sessionId,
+            "The session is closing; retry after close completes"
+          )
+        );
+      }
       const originatorClientId = resolveTrustedClientId(
         entry,
         context?.clientId
@@ -7720,6 +7871,37 @@ function createAcpSessionBridge(opts) {
         state: isQueued ? "queued" : "running"
       };
       entry.pendingPromptList.push(pendingEntry);
+      const deadlineMs = context?.deadlineMs;
+      const hasDeadline = typeof deadlineMs === "number" && Number.isFinite(deadlineMs) && deadlineMs > 0;
+      let deadlineReject;
+      let deadlinePromise;
+      let deadlineTimer;
+      if (hasDeadline) {
+        deadlinePromise = new Promise((_resolve, reject) => {
+          deadlineReject = reject;
+        });
+        deadlinePromise.catch(() => {
+        });
+        const onDeadline = /* @__PURE__ */ __name(() => {
+          if (pendingEntry.terminalPublished) return;
+          const deadlineErr = new PromptDeadlineExceededError(deadlineMs);
+          writeStderrLine(
+            `sendPrompt: prompt ${promptId} exceeded ${deadlineMs}ms deadline for session ${sessionId}; agent may still be executing`
+          );
+          publishPromptTerminal(entry, pendingEntry, {
+            kind: "error",
+            err: {
+              code: "prompt_deadline_exceeded",
+              message: deadlineErr.message
+            }
+          });
+          settleActivePromptState(entry, pendingEntry.promptId);
+          deadlineReject?.(deadlineErr);
+          pendingAbort.abort(deadlineErr);
+        }, "onDeadline");
+        deadlineTimer = setTimeout(onDeadline, deadlineMs);
+        deadlineTimer.unref();
+      }
       if (isQueued) {
         pendingAbort.signal.addEventListener(
           "abort",
@@ -7837,35 +8019,17 @@ function createAcpSessionBridge(opts) {
                     );
                   }
                 } catch (echoErr) {
-                  delete entry.activePromptId;
-                  delete entry.activePromptOriginatorClientId;
-                  if (entry.promptActive) {
-                    entry.promptActive = false;
-                    activePromptCounter--;
-                    touchActivity();
-                  }
+                  settleActivePromptState(entry, pendingEntry.promptId);
                   throw echoErr;
                 }
                 const promptPromise = entry.connection.prompt(promptRequest).finally(() => {
-                  if (entry.promptActive) {
-                    entry.promptActive = false;
-                    activePromptCounter--;
-                    entry.sessionLastSeenAt = Date.now();
-                    touchActivity();
-                  }
-                  delete entry.activePromptId;
-                  delete entry.activePromptOriginatorClientId;
-                  if (entry.clientIds.size === 0 && entry.events.subscriberCount === 0 && byId.has(sessionId)) {
-                    void closeSessionImpl(sessionId, void 0, {
-                      reason: "last_client_detached"
-                    }).catch((err) => {
-                      writeStderrLine(
-                        `qwen serve: deferred close-on-prompt-complete failed for ${JSON.stringify(sessionId)}: ${err instanceof Error ? err.stack ?? err.message : String(err)}`
-                      );
-                    });
-                  }
+                  settleActivePromptState(entry, pendingEntry.promptId);
                 });
-                const racedPromise = Promise.race([
+                const racedPromise = deadlinePromise ? Promise.race([
+                  promptPromise,
+                  getTransportClosedReject(entry),
+                  deadlinePromise
+                ]) : Promise.race([
                   promptPromise,
                   getTransportClosedReject(entry)
                 ]);
@@ -7873,6 +8037,9 @@ function createAcpSessionBridge(opts) {
                   () => {
                   },
                   (err) => {
+                    if (err instanceof PromptDeadlineExceededError) {
+                      return;
+                    }
                     if (err instanceof DOMException && err.name === "AbortError" && pendingEntry.state === "queued") {
                       writeStderrLine(
                         `sendPrompt: queued prompt removed before agent forward for session ${sessionId}`
@@ -7935,23 +8102,17 @@ function createAcpSessionBridge(opts) {
       );
       result.then(
         (promptResult) => {
-          broadcastTurnComplete(
-            entry,
-            sessionId,
-            promptResult,
-            pendingEntry.promptId,
-            originatorClientId
-          );
+          publishPromptTerminal(entry, pendingEntry, {
+            kind: "complete",
+            result: promptResult
+          });
         },
         (err) => {
-          if (err instanceof DOMException && err.name === "AbortError") return;
-          broadcastTurnError(
-            entry,
-            sessionId,
-            err,
-            pendingEntry.promptId,
-            originatorClientId
-          );
+          if (err instanceof DOMException && err.name === "AbortError") {
+            publishPromptTerminal(entry, pendingEntry, { kind: "cancelled" });
+            return;
+          }
+          publishPromptTerminal(entry, pendingEntry, { kind: "error", err });
         }
       );
       entry.promptQueue = result.then(
@@ -7959,6 +8120,7 @@ function createAcpSessionBridge(opts) {
         () => void 0
       );
       result.finally(() => {
+        if (deadlineTimer !== void 0) clearTimeout(deadlineTimer);
         const listIdx = entry.pendingPromptList.indexOf(pendingEntry);
         if (listIdx !== -1) {
           entry.pendingPromptList.splice(listIdx, 1);
@@ -7985,6 +8147,15 @@ function createAcpSessionBridge(opts) {
           );
           entry.midTurnMessageQueue.length = 0;
         }
+        if (entry.clientIds.size === 0 && entry.events.subscriberCount === 0 && entry.pendingPromptCount === 0 && byId.get(sessionId) === entry) {
+          void closeSessionImpl(sessionId, void 0, {
+            reason: "last_client_detached"
+          }).catch((err) => {
+            writeStderrLine(
+              `qwen serve: deferred close-on-prompt-complete failed for ${JSON.stringify(sessionId)}: ${err instanceof Error ? err.stack ?? err.message : String(err)}`
+            );
+          });
+        }
       }).catch(() => {
       });
       return result;
@@ -8260,7 +8431,8 @@ function createAcpSessionBridge(opts) {
           SERVE_CONTROL_EXT_METHODS.sessionCd,
           {
             sessionId,
-            path: req.path
+            path: req.path,
+            ...req.allowedRoots ? { allowedRoots: req.allowedRoots } : {}
           }
         );
         const extResult = raw;
@@ -8296,6 +8468,12 @@ function createAcpSessionBridge(opts) {
       );
       return { sessionId, ...result };
     },
+    setSessionWorktree(sessionId, worktree) {
+      const entry = byId.get(sessionId);
+      if (entry) {
+        entry.worktree = worktree;
+      }
+    },
     async closeSession(sessionId, context, closeOpts) {
       return closeSessionImpl(sessionId, context, closeOpts);
     },
@@ -9126,6 +9304,9 @@ function createAcpSessionBridge(opts) {
         });
       } catch {
       }
+      if (target.state === "queued") {
+        publishPromptTerminal(entry, target, { kind: "cancelled" });
+      }
       return { removed: true };
     },
     enqueueMidTurnMessage(sessionId, message, context) {
@@ -9373,6 +9554,9 @@ function createAcpSessionBridge(opts) {
     async rewindSession(sessionId, req, context) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
+      if (entry.closing) {
+        throw new SessionNotFoundError(sessionId, "The session is closing");
+      }
       const info = channelInfoForEntry(entry);
       if (!info || info.isDying) throw new SessionNotFoundError(sessionId);
       const originatorClientId = resolveTrustedClientId(
@@ -9684,9 +9868,41 @@ function createAcpSessionBridge(opts) {
         entry.spawnOwnerWantedKill = true;
         return false;
       }
+      if (entry.closing) {
+        const closingChannel = channelInfoForEntry(entry);
+        if (!closingChannel) return false;
+        await killChannelWithLog(
+          closingChannel,
+          `force kill closing session ${JSON.stringify(sessionId)}`
+        );
+        return true;
+      }
+      entry.closing = true;
+      const ci = channelInfoForEntry(entry);
+      if (!ci) {
+        writeStderrLine(
+          `qwen serve: killSession channelInfoForEntry returned undefined for session ${JSON.stringify(sessionId)} \u2014 channel cleanup skipped (entry's channel already torn down)`
+        );
+      }
       permissionMediator.forgetSession(sessionId);
       entry.pendingPermissionIds.clear();
       entry.pendingInteractions.clear();
+      try {
+        await notifyAgentSessionClose(entry, ci, "killSession", {
+          throwOnFailure: true,
+          timeoutMs: initTimeoutMs
+        });
+      } catch (error) {
+        if (ci) {
+          await killChannelWithLog(
+            ci,
+            `force kill session ${JSON.stringify(sessionId)}`
+          );
+          return true;
+        }
+        entry.closing = false;
+        throw error;
+      }
       if (entry.promptActive) {
         entry.promptActive = false;
         activePromptCounter--;
@@ -9701,17 +9917,15 @@ function createAcpSessionBridge(opts) {
         workspaceCwd: entry.workspaceCwd,
         reason: "killed"
       });
-      const ci = channelInfoForEntry(entry);
-      if (!ci) {
-        writeStderrLine(
-          `qwen serve: killSession channelInfoForEntry returned undefined for session ${JSON.stringify(sessionId)} \u2014 channel cleanup skipped (entry's channel already torn down)`
-        );
-      }
       if (ci && ci.channel === entry.channel) {
         ci.sessionIds.delete(sessionId);
       }
-      await notifyAgentSessionClose(entry, ci, "killSession");
       ci?.client.markSessionClosed(sessionId);
+      flushPromptTerminals(
+        entry,
+        "session_killed",
+        "session killed before the prompt completed"
+      );
       try {
         entry.events.publish({
           type: "session_died",
@@ -9731,12 +9945,14 @@ function createAcpSessionBridge(opts) {
     async detachClient(sessionId, clientId) {
       const entry = byId.get(sessionId);
       if (!entry) return;
-      if (entry.attachCount > 0) entry.attachCount--;
+      if (clientId !== void 0 && releaseAttachRef(entry, clientId)) {
+        if (entry.attachCount > 0) entry.attachCount--;
+      }
       unregisterClient(entry, clientId);
       if (entry.spawnOwnerWantedKill && entry.attachCount === 0 && entry.events.subscriberCount === 0) {
         await this.killSession(sessionId).catch(() => {
         });
-      } else if (entry.clientIds.size === 0 && entry.events.subscriberCount === 0 && !entry.promptActive) {
+      } else if (entry.clientIds.size === 0 && entry.events.subscriberCount === 0 && entry.pendingPromptCount === 0) {
         await closeSessionImpl(sessionId, void 0, {
           reason: "last_client_detached"
         }).catch((err) => {
@@ -9800,6 +10016,11 @@ function createAcpSessionBridge(opts) {
             workspaceCwd: e.workspaceCwd,
             reason: shutdownReason
           });
+          flushPromptTerminals(
+            e,
+            "daemon_shutdown",
+            "daemon shut down before the prompt completed"
+          );
           try {
             e.events.publish({
               type: "session_died",