@qwen-code/qwen-code 0.21.10 → 0.21.11-preview.0

package/chunks/{chunk-Y4R47ZUH.js → chunk-3WOZVMGJ.js}

@@ -405,18 +405,18 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   try {
     if (authType === "openai" /* USE_OPENAI */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-TQANPEVZ.js");
+        const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-NSPCP4FY.js");
         return createOpenAIContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-BJ6PQKE6.js");
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-D6L2W25Z.js");
       try {
         const qwenClient = await getQwenOauthClient(
           config,
           isInitialAuth ? { requireCachedCredentials: true } : void 0
         );
         loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-          const { QwenContentGenerator } = await import("./qwenContentGenerator-BKCPHHXU.js");
+          const { QwenContentGenerator } = await import("./qwenContentGenerator-BBTNTOMB.js");
           return new QwenContentGenerator(qwenClient, generatorConfig, config);
         }, "loadBaseGenerator");
       } catch (error) {
@@ -432,7 +432,7 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
       }, "loadBaseGenerator");
     } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createGeminiContentGenerator } = await import("./geminiContentGenerator-HCWZOUX3.js");
+        const { createGeminiContentGenerator } = await import("./geminiContentGenerator-VHSPCS6F.js");
         return createGeminiContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else {
@@ -448,7 +448,7 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
       try {
         const [baseGenerator, { LoggingContentGenerator }] = await Promise.all([
           loadBaseGenerator(),
-          import("./loggingContentGenerator-6NTFBM7Q.js")
+          import("./loggingContentGenerator-MOOIBKKR.js")
         ]);
         return new LoggingContentGenerator(
           baseGenerator,

package/chunks/{chunk-A7XMDZRI.js → chunk-4P66JPNV.js}

@@ -8,10 +8,10 @@ import {
   initializeI18n,
   resolveLanguageSetting,
   t
-} from "./chunk-UEOKWYGY.js";
+} from "./chunk-KHLBIO6M.js";
 import {
   IdeClient
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   AuthEvent,
   IdeConnectionEvent,

package/chunks/{chunk-OONWZLFK.js → chunk-5BRSWOSC.js}

@@ -3,17 +3,17 @@
 import {
   getGitVersion,
   getNpmVersion
-} from "./chunk-VSFKIRRW.js";
+} from "./chunk-B7SQOICP.js";
 import {
   buildEnvStatusFromEnv,
   snapshotProcessEnv
-} from "./chunk-P3BJLFSZ.js";
+} from "./chunk-MTE6R5HF.js";
 import {
   mapDomainErrorToErrorKind
 } from "./chunk-DA4HRSBW.js";
 import {
   canUseRipgrep
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-5MZCSWI4.js → chunk-5C7FDVHB.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   formatHistoryGapNotice
-} from "./chunk-ZRBMO3C7.js";
+} from "./chunk-2Z6PYTOK.js";
 import {
   sanitizeTerminalText
 } from "./chunk-4NFY2S7N.js";
@@ -19,7 +19,7 @@ import {
   setGoalTerminalObserver,
   setLastGoalTerminal,
   unregisterGoalHook
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   projectUserTranscriptForDisplay
 } from "./chunk-QUI267ZP.js";
@@ -2931,7 +2931,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./deferred-core-runtime-67GJXHXS.js");
+    const { getGitRepoName } = await import("./deferred-core-runtime-BFB6YRTZ.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;

package/chunks/{chunk-NV65ZUVM.js → chunk-6CONQTS2.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   BaseJsonOutputAdapter
-} from "./chunk-O3EU6GMH.js";
+} from "./chunk-UO2N5QWP.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-VWKER4ZH.js → chunk-6S4NCX23.js}

@@ -11,11 +11,11 @@ import {
 } from "./chunk-DA4HRSBW.js";
 import {
   loadSettings
-} from "./chunk-ABVRJU3D.js";
+} from "./chunk-SVY7G3WS.js";
 import {
   SkillManager,
   isSafeModeEnv
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   writeStderrLine
 } from "./chunk-KGJGEEVR.js";

package/chunks/{chunk-AAE6SR4Q.js → chunk-6WIKTX4C.js}

@@ -64,7 +64,7 @@ async function runExitCleanup(options = {}) {
 }
 __name(runExitCleanup, "runExitCleanup");
 async function cleanupCheckpoints() {
-  const { Storage } = await import("./deferred-core-runtime-67GJXHXS.js");
+  const { Storage } = await import("./deferred-core-runtime-BFB6YRTZ.js");
   const storage = new Storage(process.cwd());
   const tempDir = storage.getProjectTempDir();
   const checkpointsDir = join(tempDir, "checkpoints");

package/chunks/{chunk-NDU63YLI.js → chunk-7C7RTJPC.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   t
-} from "./chunk-UEOKWYGY.js";
+} from "./chunk-KHLBIO6M.js";
 import {
   SessionReferenceService,
   SessionService,
   readManyFiles,
   stripTerminalControlSequences
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   emptyMcpResourceText,
   formatMcpResourceContents,

package/chunks/{chunk-KONVMRK7.js → chunk-7OFX3YZW.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   runExitCleanup
-} from "./chunk-AAE6SR4Q.js";
+} from "./chunk-6WIKTX4C.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-D27I6YJT.js → chunk-7S4DYMFG.js}

@@ -3,16 +3,16 @@
 import {
   settleChatRecording,
   subscribeToHeadlessChatRecordingFailures
-} from "./chunk-26CXSA6V.js";
+} from "./chunk-FYTHSJDQ.js";
 import {
   JsonOutputAdapter
-} from "./chunk-NV65ZUVM.js";
+} from "./chunk-6CONQTS2.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-O3EU6GMH.js";
+} from "./chunk-UO2N5QWP.js";
 import {
   handleAtCommand
-} from "./chunk-NDU63YLI.js";
+} from "./chunk-7C7RTJPC.js";
 import {
   buildInitialSystemReminders,
   buildSystemMessage,
@@ -24,11 +24,11 @@ import {
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-MIKXJYZB.js";
+} from "./chunk-VBU76UYP.js";
 import {
   RunBudgetEnforcer,
   cleanupReviewWorktreeLeases
-} from "./chunk-7GTMV7UE.js";
+} from "./chunk-ZUIOLZ4V.js";
 import {
   AlreadyReportedError,
   handleBudgetExceededError,
@@ -36,10 +36,10 @@ import {
   handleError,
   handleMaxTurnsExceededError,
   handleToolError
-} from "./chunk-DCZEPFB4.js";
+} from "./chunk-FTO3P6PZ.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-2PLNY5TN.js";
+} from "./chunk-I7XTOGIS.js";
 import {
   PLAN_MODE_ENTRY_SIBLING_SKIP_MESSAGE,
   buildSessionRecoveryPlanFromApiHistory,
@@ -56,7 +56,7 @@ import {
   parseAndFormatApiError,
   partitionByConcurrencySafety,
   restoreWorktreeContext
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -93,7 +93,7 @@ import {
 } from "./chunk-OIVKILPI.js";
 import {
   registerCleanup
-} from "./chunk-AAE6SR4Q.js";
+} from "./chunk-6WIKTX4C.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-NRLFZWCT.js → chunk-7WUUNAJP.js}

@@ -7,7 +7,7 @@ import {
 import {
   loadSettings,
   saveSettings
-} from "./chunk-ABVRJU3D.js";
+} from "./chunk-SVY7G3WS.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-F6WDTQ3M.js → chunk-A6PSUNCY.js}

@@ -2,12 +2,12 @@
 "use strict";
 import {
   t
-} from "./chunk-UEOKWYGY.js";
+} from "./chunk-KHLBIO6M.js";
 import {
   computeThresholds,
   getCoreSystemPrompt,
   resolveInteractionMode
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   buildSkillLlmContent
 } from "./chunk-K623ENWT.js";

package/chunks/{chunk-AQAJJMRR.js → chunk-AJ6LQ5A6.js}

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

package/chunks/{chunk-VSFKIRRW.js → chunk-B7SQOICP.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   getCliVersion
-} from "./chunk-AEL7KN2O.js";
+} from "./chunk-RKCPPZV6.js";
 import {
   IdeClient,
   formatMemoryUsage
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   createDebugLogger
 } from "./chunk-OIVKILPI.js";
@@ -25,7 +25,7 @@ import { execFile } from "node:child_process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "4356c1ce22";
+var GIT_COMMIT_INFO = "3d99a89b57";
 
 // packages/cli/src/utils/systemInfo.ts
 var debugLogger = createDebugLogger("STATUS");

package/chunks/{chunk-Y3OVRWRY.js → chunk-BCZ2TTSH.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   parseRule
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-YF5MALI4.js → chunk-BO2VRKY2.js}

@@ -23,11 +23,11 @@ import {
 } from "./chunk-BKHCW2BI.js";
 import {
   loadSettings
-} from "./chunk-ABVRJU3D.js";
+} from "./chunk-SVY7G3WS.js";
 import {
   MCP_BUDGET_WARN_FRACTION,
   sleepInhibitor
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -421,7 +421,7 @@ var serveCommand = {
     }
     const externalToolGuardToken = process.env[EXTERNAL_TOOL_GUARD_TOKEN_ENV] ?? "";
     delete process.env[EXTERNAL_TOOL_GUARD_TOKEN_ENV];
-    const { runQwenServe } = await import("./run-qwen-serve-BCKBCAMX.js");
+    const { runQwenServe } = await import("./run-qwen-serve-7BDTKCFP.js");
     try {
       const localControlToken = argv["local-control"] ? randomBytes(32).toString("base64url") : void 0;
       const localControlPairing = localControlToken ? localControlUrls(

package/chunks/{chunk-QG3FFJYU.js → chunk-CQGGDOR5.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   getEffectiveSupportedModes
-} from "./chunk-YWPSGJFI.js";
+} from "./chunk-HDHLWOG5.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-4MKXUHXY.js → chunk-DCGYLIYO.js}

@@ -2,12 +2,12 @@
 "use strict";
 import {
   appEvents
-} from "./chunk-7GTMV7UE.js";
+} from "./chunk-ZUIOLZ4V.js";
 import {
   assembleMcpServers,
   getPendingGatedMcpServers,
   getPromptableMcpServers
-} from "./chunk-KID7K6H2.js";
+} from "./chunk-HOUK5CR2.js";
 import {
   getMCPServerStatus
 } from "./chunk-YGT2AUJ7.js";

package/chunks/{chunk-IBUGFUXC.js → chunk-DVQECPGW.js}

@@ -2,20 +2,20 @@
 "use strict";
 import {
   appEvents
-} from "./chunk-7GTMV7UE.js";
+} from "./chunk-ZUIOLZ4V.js";
 import {
   CUSTOM_SANDBOX_IMAGE_ENV_VAR,
   HOST_UPDATE_RELAUNCH_ENV_VAR,
   SKIP_UPDATE_CHECK_ENV_VAR,
   requestUpdateOnExit
-} from "./chunk-KONVMRK7.js";
+} from "./chunk-7OFX3YZW.js";
 import {
   loadUndici
 } from "./chunk-3Z43GZUQ.js";
 import {
   IdeClient,
   getAllProviderBaseUrls
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   detectRuntime,
   getOrCreateSharedDispatcher,
@@ -231,11 +231,11 @@ function startPostRenderPrefetches(config, settings, options = {}) {
         { updateEventEmitter },
         { t }
       ] = await Promise.all([
-        import("./updateCheck-LOS5GYFC.js"),
-        import("./handleAutoUpdate-NHFSGYTF.js"),
-        import("./installationInfo-XXB75T7O.js"),
+        import("./updateCheck-4QDI7CUZ.js"),
+        import("./handleAutoUpdate-2F3RWBIT.js"),
+        import("./installationInfo-JCUKPGDB.js"),
         import("./updateEventEmitter-5MKC7BLQ.js"),
-        import("./i18n-Q27KKNDL.js")
+        import("./i18n-BPEDXABF.js")
       ]);
       const updateCheckSkippedMessage = /* @__PURE__ */ __name((error) => t("Update check skipped ({{reason}}) \u2014 run /update to retry.", {
         reason: describeUpdateCheckFailure(error)
@@ -308,7 +308,7 @@ ${t(
         state: "connecting"
       });
       try {
-        const { connectIdeForStartup } = await import("./initializer-Y5DJLT43.js");
+        const { connectIdeForStartup } = await import("./initializer-QRD7X25L.js");
         await withTimeout(
           connectIdeForStartup(config),
           "ide_connect",
@@ -332,7 +332,7 @@ ${t(
   }
   if (config.isInteractive()) {
     runDeferredTask("background_housekeeping", async () => {
-      const { startBackgroundHousekeeping } = await import("./scheduler-K3D5Z655.js");
+      const { startBackgroundHousekeeping } = await import("./scheduler-MUKPARY5.js");
       startBackgroundHousekeeping(config, settings);
     });
   }

package/chunks/{chunk-F24A2JBM.js → chunk-E2XBEWAK.js}

@@ -17,7 +17,7 @@ import {
 } from "./chunk-OCPBI7J5.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-I5VM3SKY.js";
+} from "./chunk-EV3LZGGK.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -105,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,
@@ -114,7 +115,7 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-EI3NWELG.js";
+} from "./chunk-O3VWAZLP.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
@@ -8039,7 +8040,7 @@ function createAcpSessionBridge(opts) {
           `ACP session close channel unavailable for ${entry.sessionId}`
         );
       }
-      return;
+      return false;
     }
     try {
       const closeRequest = entry.connection.extMethod(
@@ -8051,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,
@@ -8059,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(
@@ -8068,6 +8070,7 @@ function createAcpSessionBridge(opts) {
       if (opts2?.throwOnFailure === true) {
         throw err;
       }
+      return false;
     }
   }, "notifyAgentSessionClose");
   const broadcastWorkspaceEvent = /* @__PURE__ */ __name((envelope, skipSessionId) => {
@@ -8580,6 +8583,12 @@ 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) {
@@ -8590,7 +8599,7 @@ function createAcpSessionBridge(opts) {
           "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) {
         throw new SessionNotFoundError(req.sessionId);
@@ -8630,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,
@@ -8863,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 } : {}
@@ -9063,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);
@@ -9147,6 +9156,7 @@ function createAcpSessionBridge(opts) {
     inFlightRestores.set(req.sessionId, {
       action,
       historyReplay,
+      ...historyPageSize !== void 0 ? { historyPageSize } : {},
       hideInheritedHistory,
       publicPromise: promise,
       settlementPromise,
@@ -9192,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;
@@ -9254,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);