@qwen-code/qwen-code 0.22.0 → 0.22.1

package/chunks/{chunk-ZS5BHEPD.js → chunk-I32QCIK7.js}

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

package/chunks/{chunk-7IV52LTO.js → chunk-I6VVOZDK.js}

@@ -4,10 +4,10 @@ import {
   getRateLimitErrorDetails,
   isQwenQuotaExceededError,
   isRateLimitError
-} from "./chunk-LI4YHTQK.js";
+} from "./chunk-EB4VDXNI.js";
 import {
   isAbortError
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-2NNTE2ED.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-X7V3N6YH.js → chunk-I6YW3T3W.js}

@@ -19,7 +19,7 @@ import {
 } from "./chunk-OCPBI7J5.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-VMJL7RH6.js";
+} from "./chunk-GZJUCMH4.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -29,7 +29,7 @@ import {
   SessionRestoreTimeoutError,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-URN2JIAQ.js";
+} from "./chunk-CITGRGCM.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_CLOSE_TIMEOUT_MS,
@@ -41,6 +41,8 @@ import {
   ACTIVE_WORK_MAX_SNAPSHOT_SESSIONS,
   ACTIVE_WORK_NOTIFICATION_METHOD,
   ACTIVE_WORK_STALE_INTERVALS,
+  CHANNEL_LIVENESS_META_KEY,
+  CHANNEL_LIVENESS_VERSION,
   CHANNEL_PROMPT_META_KEY,
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
@@ -68,7 +70,7 @@ import {
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt,
   sessionCloseDrainBudgetMs
-} from "./chunk-LURJYO2T.js";
+} from "./chunk-OZ6KS6KW.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -122,7 +124,7 @@ import {
   isOfficeDocumentExtension,
   isRecordableDerivedChild,
   pathHasSkippedDirectoryComponent
-} from "./chunk-TBVSALA3.js";
+} from "./chunk-SKNVVYIJ.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   SESSION_PR_LIST_LIMIT,
@@ -140,19 +142,22 @@ import {
   normalizeSnapshotPayload,
   normalizeTurnResultError,
   stableSessionArtifactId
-} from "./chunk-T6XLJRQY.js";
+} from "./chunk-XYX474JQ.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-BVE5EMIG.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-2UZJWSVD.js";
+} from "./chunk-ILPXSKGQ.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
   PRIVATE_PARENT_CAPABILITY_META_KEY
-} from "./chunk-FDD2IUEL.js";
+} from "./chunk-UX3IFLJM.js";
 import {
   getSpecificMimeType
-} from "./chunk-IWOWEENB.js";
+} from "./chunk-WBT3STGU.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -162,7 +167,7 @@ import {
 
 // packages/acp-bridge/src/bridge.ts
 init_esbuild_shims();
-import { randomBytes, randomUUID as randomUUID2 } from "node:crypto";
+import { randomBytes, randomUUID as randomUUID3 } from "node:crypto";
 import * as path4 from "node:path";
 import { inspect } from "node:util";
 
@@ -1200,6 +1205,127 @@ function parseSessionSource(sourceType, sourceId) {
 }
 __name(parseSessionSource, "parseSessionSource");
 
+// packages/acp-bridge/src/channel-liveness.ts
+init_esbuild_shims();
+import { performance as performance2 } from "node:perf_hooks";
+var CHANNEL_LIVENESS_INTERVAL_MS = 15e3;
+var CHANNEL_LIVENESS_PROBE_TIMEOUT_MS = 1e4;
+var CHANNEL_LIVENESS_FAILURE_THRESHOLD = 2;
+var CHANNEL_LIVENESS_TIMER_LATE_TOLERANCE_MS = 1e3;
+var CHANNEL_LIVENESS_TIMEOUT_CODE = "acp_channel_liveness_timeout";
+var CHANNEL_LIVENESS_PROTOCOL_ERROR_CODE = "acp_channel_liveness_protocol_error";
+var ChannelLivenessFailure = class extends Error {
+  constructor(code) {
+    super(
+      code === CHANNEL_LIVENESS_TIMEOUT_CODE ? "ACP channel failed consecutive liveness probes" : "ACP channel returned an invalid liveness response"
+    );
+    this.code = code;
+    this.name = "ChannelLivenessFailure";
+  }
+  static {
+    __name(this, "ChannelLivenessFailure");
+  }
+};
+function isValidResponse(response, nonce) {
+  return typeof response === "object" && response !== null && !Array.isArray(response) && response["v"] === CHANNEL_LIVENESS_VERSION && response["nonce"] === nonce;
+}
+__name(isValidResponse, "isValidResponse");
+function startChannelLivenessMonitor(options) {
+  const now = options.now ?? (() => performance2.now());
+  let stopped = false;
+  let timer;
+  let consecutiveTimeouts = 0;
+  let nextNonce = 0;
+  let resolveStopped;
+  const stoppedOutcome = new Promise((resolve2) => {
+    resolveStopped = resolve2;
+  });
+  const isActive = /* @__PURE__ */ __name(() => !stopped && options.isActive(), "isActive");
+  const stop = /* @__PURE__ */ __name(() => {
+    stopped = true;
+    if (timer !== void 0) {
+      clearTimeout(timer);
+      timer = void 0;
+    }
+    resolveStopped({ kind: "stopped" });
+  }, "stop");
+  const fail = /* @__PURE__ */ __name((error) => {
+    if (!isActive()) return;
+    stop();
+    options.onFailure(error);
+  }, "fail");
+  const timerWasLate = /* @__PURE__ */ __name((expectedAt) => now() > expectedAt + CHANNEL_LIVENESS_TIMER_LATE_TOLERANCE_MS, "timerWasLate");
+  const runProbe = /* @__PURE__ */ __name(async () => {
+    if (!isActive()) return;
+    const nonce = nextNonce;
+    nextNonce = nonce === Number.MAX_SAFE_INTEGER ? 0 : Math.max(0, nonce + 1);
+    const response = Promise.resolve().then(() => options.probe(nonce)).then(
+      (value) => ({ kind: "response", response: value }),
+      () => ({ kind: "rejected" })
+    );
+    let outcome;
+    while (true) {
+      const expectedAt = now() + CHANNEL_LIVENESS_PROBE_TIMEOUT_MS;
+      const timeout = new Promise((resolve2) => {
+        timer = setTimeout(() => {
+          timer = void 0;
+          resolve2(
+            timerWasLate(expectedAt) ? { kind: "local_delay" } : { kind: "timeout" }
+          );
+        }, CHANNEL_LIVENESS_PROBE_TIMEOUT_MS);
+        timer.unref();
+      });
+      outcome = await Promise.race([response, timeout, stoppedOutcome]);
+      if (timer !== void 0) {
+        clearTimeout(timer);
+        timer = void 0;
+      }
+      if (outcome.kind === "stopped" || !isActive()) return;
+      if (outcome.kind !== "local_delay") break;
+      consecutiveTimeouts = 0;
+    }
+    if (outcome.kind === "response") {
+      if (!isValidResponse(outcome.response, nonce)) {
+        fail(new ChannelLivenessFailure(CHANNEL_LIVENESS_PROTOCOL_ERROR_CODE));
+        return;
+      }
+      consecutiveTimeouts = 0;
+      schedule(CHANNEL_LIVENESS_INTERVAL_MS);
+      return;
+    }
+    if (outcome.kind === "rejected") {
+      await Promise.resolve();
+      fail(new ChannelLivenessFailure(CHANNEL_LIVENESS_PROTOCOL_ERROR_CODE));
+      return;
+    }
+    consecutiveTimeouts++;
+    if (consecutiveTimeouts >= CHANNEL_LIVENESS_FAILURE_THRESHOLD) {
+      fail(new ChannelLivenessFailure(CHANNEL_LIVENESS_TIMEOUT_CODE));
+      return;
+    }
+    void runProbe();
+  }, "runProbe");
+  function schedule(delayMs) {
+    if (!isActive()) return;
+    const expectedAt = now() + delayMs;
+    timer = setTimeout(() => {
+      timer = void 0;
+      if (!isActive()) return;
+      if (timerWasLate(expectedAt)) {
+        consecutiveTimeouts = 0;
+        schedule(CHANNEL_LIVENESS_INTERVAL_MS);
+        return;
+      }
+      void runProbe();
+    }, delayMs);
+    timer.unref();
+  }
+  __name(schedule, "schedule");
+  schedule(CHANNEL_LIVENESS_INTERVAL_MS);
+  return { stop };
+}
+__name(startChannelLivenessMonitor, "startChannelLivenessMonitor");
+
 // packages/acp-bridge/src/channel-startup-profile.ts
 init_esbuild_shims();
 var MAX_PROFILE_DURATION_MS = 6e5;
@@ -1304,6 +1430,7 @@ __name(getChannelStartupProfileAttributes, "getChannelStartupProfileAttributes")
 
 // packages/acp-bridge/src/sessionAttachments.ts
 init_esbuild_shims();
+import { randomUUID } from "node:crypto";
 import { promises as fs, statSync } from "node:fs";
 import { tmpdir } from "node:os";
 import * as path from "node:path";
@@ -1717,9 +1844,11 @@ var SessionAttachmentStore = class {
     if (!directory) return;
     await fs.rm(directory, { recursive: true, force: true });
   }
-  async delete() {
+  async delete(options = {}) {
+    options.assertCanCommit?.();
     this.closing = true;
     await this.waitForCopy();
+    options.assertCanCommit?.();
     if (!this.closed) {
       this.closed = true;
       this.pendingItems = 0;
@@ -1727,7 +1856,20 @@ var SessionAttachmentStore = class {
       this.resolvePendingDrainWaiters();
     }
     const directory = this.persistentDirectory ?? await this.directoryPromise?.catch(() => void 0);
-    if (directory) await fs.rm(directory, { recursive: true, force: true });
+    if (directory) {
+      options.assertCanCommit?.();
+      const tombstone = path.join(
+        path.dirname(directory),
+        `.${path.basename(directory)}.deleting-${randomUUID()}`
+      );
+      try {
+        await fs.rename(directory, tombstone);
+      } catch (error) {
+        if (error.code === "ENOENT") return;
+        throw error;
+      }
+      await fs.rm(tombstone, { recursive: true, force: true });
+    }
   }
   assertStored(reference) {
     const id = reference.attachmentId;
@@ -1829,7 +1971,7 @@ __name(writeStderrLine, "writeStderrLine");
 
 // packages/acp-bridge/src/bridgeClient.ts
 init_esbuild_shims();
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import { promises as fs2 } from "node:fs";
 import * as path2 from "node:path";
 
@@ -1962,10 +2104,11 @@ var MultiClientPermissionMediator = class {
       this.safeAudit(
         () => this.deps.audit.recordRequested(record, policy, votersAtIssue)
       );
+      const unresolvedWithoutDecision = timeoutMs > 0 ? `voter cancellation, session cancellation, or permissionTimeoutMs (${timeoutMs}ms)` : "voter or session cancellation because permissionTimeoutMs is disabled";
       if (policy === "consensus" && votersAtIssue.size === 0) {
         try {
           process.stderr.write(
-            `permissionMediator: consensus request ${record.requestId} for session ${record.sessionId} issued with empty votersAtIssue; can only resolve via permissionTimeoutMs (${timeoutMs}ms)
+            `permissionMediator: consensus request ${record.requestId} for session ${record.sessionId} issued with empty votersAtIssue; can only resolve via ${unresolvedWithoutDecision}
 `
           );
         } catch {
@@ -1975,7 +2118,7 @@ var MultiClientPermissionMediator = class {
         this.unanimityBreadcrumbEmitted = true;
         try {
           process.stderr.write(
-            `permissionMediator: consensus request ${record.requestId} for session ${record.sessionId} requires unanimity (votersAtIssue.size=${votersAtIssue.size}, default quorum=floor(M/2)+1=${votersAtIssue.size}); split votes will only resolve via permissionTimeoutMs (${timeoutMs}ms). This breadcrumb fires once per mediator lifetime; subsequent unanimity-required requests are silent.
+            `permissionMediator: consensus request ${record.requestId} for session ${record.sessionId} requires unanimity (votersAtIssue.size=${votersAtIssue.size}, default quorum=floor(M/2)+1=${votersAtIssue.size}); split votes will only resolve via ${unresolvedWithoutDecision}. This breadcrumb fires once per mediator lifetime; subsequent unanimity-required requests are silent.
 `
           );
         } catch {
@@ -2786,13 +2929,9 @@ var MAX_EARLY_EVENT_SESSIONS = 64;
 var MAX_EARLY_EVENTS_PER_SESSION = 32;
 var MAX_SUGGESTION_LENGTH = 500;
 var EARLY_EVENT_TTL_MS = 6e4;
-var KNOWN_APPROVAL_MODES = /* @__PURE__ */ new Set([
-  "plan",
-  "default",
-  "auto-edit",
-  "auto",
-  "yolo"
-]);
+var KNOWN_APPROVAL_MODES = new Set(
+  APPROVAL_MODES
+);
 function describeStatKind(stats) {
   if (stats.isDirectory()) return "directory";
   if (stats.isSymbolicLink()) return "symlink";
@@ -2864,7 +3003,7 @@ var BridgeClient = class {
       options.map((o) => String(o.optionId ?? ""))
     );
     allowedOptionIds.delete("");
-    const requestId = randomUUID();
+    const requestId = randomUUID2();
     if (allowedOptionIds.has(CANCEL_VOTE_SENTINEL)) {
       throw new CancelSentinelCollisionError(requestId, CANCEL_VOTE_SENTINEL);
     }
@@ -4262,7 +4401,7 @@ var BridgeClient = class {
       } catch {
       }
     }
-    const tmp = `${realTarget}.${process.pid}.${Date.now()}.${randomUUID()}.tmp`;
+    const tmp = `${realTarget}.${process.pid}.${Date.now()}.${randomUUID2()}.tmp`;
     let preserveMode;
     try {
       const targetStat = await fs2.stat(realTarget);
@@ -8088,7 +8227,7 @@ 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_PERMISSION_TIMEOUT_MS = 0;
 var DEFAULT_MAX_PENDING_PER_SESSION = 64;
 var DEFAULT_SESSION_REAP_INTERVAL_MS = 6e4;
 var DEFAULT_SESSION_IDLE_TIMEOUT_MS = 30 * 6e4;
@@ -8150,7 +8289,7 @@ function createAcpSessionBridge(opts) {
       );
     }
   }, "releaseFreshSessionReservation");
-  const sessionCatalogGeneration = randomUUID2();
+  const sessionCatalogGeneration = randomUUID3();
   let sessionCatalogRevision = 0;
   const getSessionCatalogVersion = /* @__PURE__ */ __name(() => ({
     generation: sessionCatalogGeneration,
@@ -8363,7 +8502,7 @@ function createAcpSessionBridge(opts) {
         return true;
       }
       const holds = response["holds"];
-      if (Array.isArray(holds)) {
+      if (Array.isArray(holds) && holds.length <= ACTIVE_WORK_MAX_SESSION_HOLDS) {
         const adopted = /* @__PURE__ */ new Map();
         for (const hold of holds) {
           if (typeof hold !== "object" || hold === null) continue;
@@ -8452,6 +8591,7 @@ function createAcpSessionBridge(opts) {
   __name(channelUnavailableReject, "channelUnavailableReject");
   async function killChannelWithLog(ci, context) {
     ci.isDying = true;
+    ci.channelLiveness?.stop();
     await ci.channel.kill().catch((err) => {
       writeStderrLine(
         `qwen serve: channel kill failed${context ? ` (${context})` : ""}: ${String(err)}`
@@ -8552,6 +8692,7 @@ function createAcpSessionBridge(opts) {
     if (!channelShouldReapWhenIdle(ci) || !hasNoChannelWork(ci)) return;
     ci.emptyReapPending = false;
     ci.isDying = true;
+    ci.channelLiveness?.stop();
     await ci.channel.kill().catch(() => {
     });
   }
@@ -8746,7 +8887,7 @@ function createAcpSessionBridge(opts) {
     return limits;
   }, "journalSessionLimits");
   const unregisterJournalGrowthSessionLimits = journalGrowthPolicy !== void 0 && opts.registerJournalGrowthSessionLimits !== void 0 ? opts.registerJournalGrowthSessionLimits(journalSessionLimits) : void 0;
-  const createClientId = /* @__PURE__ */ __name(() => `client_${randomUUID2()}`, "createClientId");
+  const createClientId = /* @__PURE__ */ __name(() => `client_${randomUUID3()}`, "createClientId");
   const registerClient = /* @__PURE__ */ __name((entry, requestedClientId) => {
     if (requestedClientId && entry.clientIds.has(requestedClientId)) {
       entry.clientIds.set(
@@ -8805,7 +8946,7 @@ function createAcpSessionBridge(opts) {
     if (inFlightChannelSpawn) return await inFlightChannelSpawn;
     const promise = (async () => {
       const privateParentCapability = randomBytes(32).toString("base64url");
-      const acpChannelId = randomUUID2();
+      const acpChannelId = randomUUID3();
       const channel = await telemetry.withSpan(
         "channel.spawn",
         {
@@ -8991,6 +9132,7 @@ function createAcpSessionBridge(opts) {
         info.transportFailed = true;
         info.transportFailureCode = safeTransportFailureCode(error);
         info.isDying = true;
+        info.channelLiveness?.stop();
         clearInFlightExtensionRefreshes(info.connection);
       }, "markTransportFailed");
       void channel.transportFailed?.then(
@@ -9004,6 +9146,7 @@ function createAcpSessionBridge(opts) {
         );
       }
       void channel.exited.then((exitInfo) => {
+        info.channelLiveness?.stop();
         clearInFlightExtensionRefreshes(info.connection);
         if (channelInfo === info) cancelIdleTimer();
         if (info.workspaceMcpDiscoveryTimer) {
@@ -9087,6 +9230,7 @@ function createAcpSessionBridge(opts) {
           sessEntry.events.close();
         }
       });
+      let channelLivenessNegotiated = false;
       try {
         await telemetry.withSpan(
           "channel.initialize",
@@ -9108,6 +9252,9 @@ function createAcpSessionBridge(opts) {
                     [CHANNEL_STARTUP_PROFILE_META_KEY]: {
                       v: CHANNEL_STARTUP_PROFILE_VERSION
                     },
+                    [CHANNEL_LIVENESS_META_KEY]: {
+                      v: CHANNEL_LIVENESS_VERSION
+                    },
                     [PRIVATE_PARENT_CAPABILITY_META_KEY]: privateParentCapability
                   },
                   clientCapabilities: {
@@ -9144,6 +9291,8 @@ function createAcpSessionBridge(opts) {
                 seq: 0
               };
             }
+            const channelLivenessCapability = isRecord3(response._meta) ? response._meta[CHANNEL_LIVENESS_META_KEY] : void 0;
+            channelLivenessNegotiated = isRecord3(channelLivenessCapability) && channelLivenessCapability["v"] === CHANNEL_LIVENESS_VERSION;
             try {
               const attributes = getChannelStartupProfileAttributes(
                 response,
@@ -9177,6 +9326,33 @@ function createAcpSessionBridge(opts) {
       }
       channelInfo = info;
       info.handshakeComplete = true;
+      if (channelLivenessNegotiated) {
+        const failChannelLiveness = /* @__PURE__ */ __name((error) => {
+          if (info.isDying || !aliveChannels.has(info)) return;
+          markTransportFailed(error);
+          telemetry.event("channel.liveness_failed", {
+            "qwen-code.daemon.acp_channel.id": info.id,
+            "qwen-code.daemon.channel.session_count": info.sessionIds.size,
+            "qwen-code.daemon.channel.transport_error_code": error.code
+          });
+          writeStderrLine(
+            `qwen serve: channel liveness failed (${error.code}); killing channel`
+          );
+          if (info.channel.transportGuard) {
+            info.channel.transportGuard.fail(error);
+          } else {
+            void killChannelWithLog(info, "channel liveness failure");
+          }
+        }, "failChannelLiveness");
+        info.channelLiveness = startChannelLivenessMonitor({
+          probe: /* @__PURE__ */ __name((nonce) => info.connection.extMethod(SERVE_STATUS_EXT_METHODS.channelPing, {
+            v: CHANNEL_LIVENESS_VERSION,
+            nonce
+          }), "probe"),
+          onFailure: failChannelLiveness,
+          isActive: /* @__PURE__ */ __name(() => channelInfo === info && aliveChannels.has(info) && !info.isDying && !shuttingDown, "isActive")
+        });
+      }
       telemetry.metrics?.channelLifecycle("spawn");
       return info;
     })();
@@ -9258,6 +9434,7 @@ function createAcpSessionBridge(opts) {
       } catch (err) {
         if (hasNoChannelWork(ci, { ignoreCurrentSessionSpawn: true })) {
           ci.isDying = true;
+          ci.channelLiveness?.stop();
           await ci.channel.kill().catch(() => {
           });
         } else {
@@ -10517,7 +10694,7 @@ function createAcpSessionBridge(opts) {
   const maybeFireRestoreAskUserQuestionPrompt = /* @__PURE__ */ __name((entry, restoreAskUserQuestionHint, requestedClientId, registeredClientId, options) => {
     if (opts.restoreAskUserQuestion !== true || restoreAskUserQuestionHint !== true || // Nobody can answer the re-hung question without an attached client;
     // internal restores (boot rehydrate, keepalive, sub-session resume)
-    // pass no clientId and must not fabricate a 5-minute permission wait.
+    // pass no clientId and must not fabricate an unbounded permission wait.
     requestedClientId === void 0 || options.suppressRestorePrompt === true || // Admission-time busy check: pendingPromptCount flips synchronously
     // when a prompt is accepted, before the queue callback sets
     // promptActive; Goal turns never set promptActive at all.
@@ -11788,7 +11965,7 @@ function createAcpSessionBridge(opts) {
         req.branch,
         req.sessionId
       );
-      const tracker = effectiveScope === "single" ? workspaceKey : `${workspaceKey}#${randomUUID2()}`;
+      const tracker = effectiveScope === "single" ? workspaceKey : `${workspaceKey}#${randomUUID3()}`;
       inFlightSpawns.set(tracker, promise);
       try {
         return await promise;
@@ -11850,7 +12027,7 @@ function createAcpSessionBridge(opts) {
         promptSlotReleased = true;
         entry.pendingPromptCount = Math.max(0, entry.pendingPromptCount - 1);
       }, "releasePromptSlot");
-      const promptId = context?.promptId ?? randomUUID2();
+      const promptId = context?.promptId ?? randomUUID3();
       const invocationContext = Object.freeze({
         version: 1,
         sessionId,
@@ -13587,7 +13764,7 @@ function createAcpSessionBridge(opts) {
       const info = channelInfoForEntry(entry);
       if (!info || info.isDying) throw new SessionNotFoundError(sessionId);
       resolveTrustedClientId(entry, context?.clientId);
-      const requestId = randomUUID2();
+      const requestId = randomUUID3();
       const queue = new GenerationStreamQueue(
         GENERATION_STREAM_QUEUE_CAPACITY
       );
@@ -13739,9 +13916,9 @@ function createAcpSessionBridge(opts) {
       resolveTrustedClientId(entry, context?.clientId);
       return await entry.attachments.remove(attachmentId);
     },
-    async deleteSessionAttachments(sessionId) {
+    async deleteSessionAttachments(sessionId, options) {
       const store = byId.get(sessionId)?.attachments ?? new SessionAttachmentStore(opts.sessionAttachmentsRoot, sessionId);
-      await store.delete();
+      await store.delete(options);
     },
     removePendingPrompt(sessionId, promptId, context) {
       const entry = byId.get(sessionId);
@@ -13853,7 +14030,7 @@ function createAcpSessionBridge(opts) {
           return { accepted: false };
         }
       }
-      const messageId = requestedMessageId ?? randomUUID2();
+      const messageId = requestedMessageId ?? randomUUID3();
       if (entry.pendingPromptCount === 0 && entry.goalTurnActive !== true) {
         if (options?.queueOnly || options?.rejectIfIdle) {
           writeStderrLine(
@@ -14500,7 +14677,7 @@ function createAcpSessionBridge(opts) {
       ]);
     },
     generateWorkspaceContent(prompt, signal, _originatorClientId) {
-      const requestId = randomUUID2();
+      const requestId = randomUUID3();
       const queue = new GenerationStreamQueue(
         GENERATION_STREAM_QUEUE_CAPACITY
       );
@@ -14786,6 +14963,7 @@ function createAcpSessionBridge(opts) {
         });
       }
       for (const info of channels) {
+        info.channelLiveness?.stop();
         try {
           info.channel.killSync();
         } catch {
@@ -14808,7 +14986,10 @@ function createAcpSessionBridge(opts) {
         stopSessionReaper();
         const entries = Array.from(byId.values());
         const channels = Array.from(aliveChannels);
-        for (const ci of channels) ci.isDying = true;
+        for (const ci of channels) {
+          ci.isDying = true;
+          ci.channelLiveness?.stop();
+        }
         for (const e of entries) {
           permissionMediator.forgetSession(e.sessionId);
           e.pendingPermissionIds.clear();