@qwen-code/qwen-code 0.19.9 → 0.19.10-nightly.20260716.506ce0a1a

package/chunks/{chunk-WQUQVGTF.js → chunk-HGRXW4HQ.js}

@@ -1,8 +1,21 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  MCP_RESTART_SERVER_DEADLINE_MS
-} from "./chunk-OCPBI7J5.js";
+  LOAD_REPLAY_BULK_MODE,
+  LOAD_REPLAY_META_KEY,
+  LOAD_REPLAY_MODE_META_KEY,
+  LOAD_REPLAY_VERSION,
+  MID_TURN_QUEUE_DRAIN_METHOD
+} from "./chunk-PZL23GTM.js";
+import {
+  DEFAULT_RING_SIZE,
+  EVENT_SCHEMA_VERSION,
+  EventBus,
+  serializedBridgeEventByteLength
+} from "./chunk-6RLROE6G.js";
+import {
+  normalizeCompactedReplayMaxBytes
+} from "./chunk-COH43MRJ.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -12,6 +25,7 @@ import {
   InvalidRewindTargetError,
   InvalidSessionMetadataError,
   InvalidSessionScopeError,
+  MCP_RESTART_SERVER_DEADLINE_MS,
   PermissionForbiddenError,
   PromptQueueFullError,
   RestoreInProgressError,
@@ -22,29 +36,10 @@ import {
   SessionShellDisabledError,
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-IAVB3HM3.js";
-import {
-  LOAD_REPLAY_BULK_MODE,
-  LOAD_REPLAY_META_KEY,
-  LOAD_REPLAY_MODE_META_KEY,
-  LOAD_REPLAY_VERSION,
-  MID_TURN_QUEUE_DRAIN_METHOD
-} from "./chunk-PZL23GTM.js";
-import {
-  canonicalizeWorkspace
-} from "./chunk-W7FJ3N32.js";
-import {
-  DEFAULT_RING_SIZE,
-  EVENT_SCHEMA_VERSION,
-  EventBus,
-  serializedBridgeEventByteLength
-} from "./chunk-6RLROE6G.js";
-import {
-  normalizeCompactedReplayMaxBytes
-} from "./chunk-COH43MRJ.js";
+} from "./chunk-L4Y55KIS.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-CLFKOZEK.js";
+} from "./chunk-J4SEAF4X.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -53,7 +48,10 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-VWPVHAMO.js";
+} from "./chunk-XIWQ5QST.js";
+import {
+  canonicalizeWorkspace
+} from "./chunk-W7FJ3N32.js";
 import {
   ClientSideConnection,
   PROTOCOL_VERSION,
@@ -70,11 +68,11 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-NVYTCB5Z.js";
+} from "./chunk-SA6QVLWI.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-3VAGG5T5.js";
+} from "./chunk-YYBZUIPL.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -473,6 +471,30 @@ function mergeToolCallEvent(existing, incoming) {
 }
 __name(mergeToolCallEvent, "mergeToolCallEvent");
 
+// packages/acp-bridge/src/session-source.ts
+init_esbuild_shims();
+var SESSION_SOURCE_TYPE_PATTERN = /^[a-z][a-z0-9_-]{0,63}$/;
+var MAX_SESSION_SOURCE_ID_LENGTH = 256;
+function parseSessionSource(sourceType, sourceId) {
+  if (sourceType === void 0 && sourceId === void 0) return {};
+  if (typeof sourceType !== "string" || !SESSION_SOURCE_TYPE_PATTERN.test(sourceType)) {
+    return {
+      error: "`sourceType` must match [a-z][a-z0-9_-]{0,63} when provided"
+    };
+  }
+  if (sourceId === void 0) return { sourceType };
+  if (typeof sourceId !== "string" || sourceId.length === 0 || sourceId.length > MAX_SESSION_SOURCE_ID_LENGTH || [...sourceId].some((character) => {
+    const code = character.charCodeAt(0);
+    return code <= 31 || code === 127;
+  })) {
+    return {
+      error: `\`sourceId\` must be a non-empty string of at most ${MAX_SESSION_SOURCE_ID_LENGTH} characters without control characters`
+    };
+  }
+  return { sourceType, sourceId };
+}
+__name(parseSessionSource, "parseSessionSource");
+
 // packages/acp-bridge/src/internal/stderrLine.ts
 init_esbuild_shims();
 function writeStderrLine(message) {
@@ -1332,7 +1354,8 @@ function isTrustedArtifactToolUpdate(params, updateMeta) {
 __name(isTrustedArtifactToolUpdate, "isTrustedArtifactToolUpdate");
 function preserveFsErrorOverAcp(err) {
   if (isFsErrorShape(err)) {
-    throw new RequestError(-32603, err.message, {
+    const code = err.kind === "parse_error" ? -32602 : -32603;
+    throw new RequestError(code, err.message, {
       errorKind: err.kind,
       ...err.hint !== void 0 ? { hint: err.hint } : {},
       ...err.status !== void 0 ? { status: err.status } : {}
@@ -1391,7 +1414,7 @@ function sliceLineRange(content, startLine, endLine) {
 }
 __name(sliceLineRange, "sliceLineRange");
 var BridgeClient = class {
-  constructor(resolveEntry, resolvePendingRestoreEvents, mediator, permissionTimeoutMs, maxPendingPerSession, fileSystem, onModelPromoted, onModePromoted, clientMcpSender, ownsSession = () => true, onTokenUsage, onCreateSubSession) {
+  constructor(resolveEntry, resolvePendingRestoreEvents, mediator, permissionTimeoutMs, maxPendingPerSession, fileSystem, onModelPromoted, onModePromoted, clientMcpSender, ownsSession = () => true, onTokenUsage, onCreateSubSession, onGenerationEvent) {
     this.resolveEntry = resolveEntry;
     this.resolvePendingRestoreEvents = resolvePendingRestoreEvents;
     this.mediator = mediator;
@@ -1404,6 +1427,7 @@ var BridgeClient = class {
     this.ownsSession = ownsSession;
     this.onTokenUsage = onTokenUsage;
     this.onCreateSubSession = onCreateSubSession;
+    this.onGenerationEvent = onGenerationEvent;
   }
   static {
     __name(this, "BridgeClient");
@@ -1587,18 +1611,23 @@ var BridgeClient = class {
       return;
     }
     const durationMs = updateMeta?.["durationMs"];
+    const apiErrors = updateMeta?.["apiErrors"];
+    const apiRetries = updateMeta?.["apiRetries"];
     this.onTokenUsage(
       typeof inputTokens === "number" ? inputTokens : 0,
       typeof outputTokens === "number" ? outputTokens : 0,
-      typeof durationMs === "number" ? durationMs : void 0
+      typeof durationMs === "number" ? durationMs : void 0,
+      typeof apiErrors === "number" ? apiErrors : 0,
+      typeof apiRetries === "number" ? apiRetries : 0
     );
   }
   /**
-   * Bounded early-event buffer. Frames are keyed by sessionId; each
-   * entry tracks its `expiresAt` for lazy TTL-based eviction in
-   * `bufferEarlyEvent`. Drained by `drainEarlyEvents` whenever the
-   * bridge registers a session with a matching id. See
-   * MAX_EARLY_EVENT_* constants for capacity bounds.
+   * Bounded early-event buffer. The map is scoped to this BridgeClient and
+   * therefore to one channel; a stale channel cannot seed a fresh channel's
+   * future session. Frames are keyed by sessionId; each entry tracks its
+   * `expiresAt` for lazy TTL-based eviction in `bufferEarlyEvent`. Drained by
+   * `drainEarlyEvents` whenever the bridge registers a session with a matching
+   * id. See MAX_EARLY_EVENT_* constants for capacity bounds.
    */
   earlyEvents = /* @__PURE__ */ new Map();
   /**
@@ -1623,7 +1652,7 @@ var BridgeClient = class {
   /**
    * Allow-list of sessionIds currently being restored via
    * `session/load` / `session/resume`. Bypasses the tombstone check
-   * in `bufferEarlyEvent` so restore-time guardrail events for a
+   * in `bufferEarlyEvent` so restore-time events for a
    * previously-closed id flow through to the future
    * `createSessionEntry -> drainEarlyEvents` call.
    *
@@ -1801,6 +1830,7 @@ var BridgeClient = class {
    * `qwen/notify/session/model-update`,
    * `qwen/notify/session/mode-update`,
    * `qwen/notify/session/title-update` (auto/in-process session titles),
+   * `qwen/notify/session/recording-degraded`,
    * `qwen/notify/session/prompt-suggestion` (followup assist),
    * `qwen/notify/session/artifact-event` (hook artifacts),
    * `qwen/notify/session/terminal-sequence`, and
@@ -1809,6 +1839,51 @@ var BridgeClient = class {
    * forward-compat.
    */
   async extNotification(method, params) {
+    if (method === "qwen/notify/session/generation/event") {
+      const sessionId2 = params["sessionId"];
+      const requestId = params["requestId"];
+      const event = params["event"];
+      if (params["v"] !== 1 || typeof sessionId2 !== "string" || typeof requestId !== "string" || !event || typeof event !== "object" || Array.isArray(event)) {
+        return;
+      }
+      const record = event;
+      if (record["type"] === "started") {
+        const model = record["model"];
+        const modelSource = record["modelSource"];
+        if (typeof model !== "string" || modelSource !== "fast" && modelSource !== "main") {
+          return;
+        }
+        this.onGenerationEvent?.(sessionId2, {
+          type: "started",
+          requestId,
+          model,
+          modelSource
+        });
+        return;
+      }
+      if (record["type"] === "thinking") {
+        this.onGenerationEvent?.(sessionId2, {
+          type: "thinking",
+          requestId
+        });
+        return;
+      }
+      if (record["type"] === "delta") {
+        const seq = record["seq"];
+        const text = record["text"];
+        if (typeof seq !== "number" || !Number.isSafeInteger(seq) || seq < 0 || typeof text !== "string" || text.length === 0) {
+          return;
+        }
+        this.onGenerationEvent?.(sessionId2, {
+          type: "delta",
+          requestId,
+          seq,
+          text
+        });
+        return;
+      }
+      return;
+    }
     if (method === "qwen/notify/session/model-update") {
       this.handleInSessionModelUpdate(params);
       return;
@@ -1837,6 +1912,28 @@ var BridgeClient = class {
       }
       return;
     }
+    if (method === "qwen/notify/session/recording-degraded") {
+      const sessionId2 = params["sessionId"];
+      if (params["v"] !== 1 || typeof sessionId2 !== "string" || sessionId2.length === 0 || params["reason"] !== "write_failed") {
+        writeStderrLine(
+          `[demux] session=${typeof sessionId2 === "string" ? sessionId2 : "<missing>"} type=session_recording_degraded action=dropped reason=malformed`
+        );
+        return;
+      }
+      const entry = this.resolveEntry(sessionId2);
+      if (entry && !this.ownsSession(sessionId2)) {
+        writeStderrLine(
+          `[demux] session=${sessionId2} type=session_recording_degraded action=dropped reason=session_not_owned`
+        );
+        return;
+      }
+      if (entry) entry.recordingDegraded = true;
+      this.publishExtNotification(sessionId2, "session_recording_degraded", {
+        sessionId: sessionId2,
+        reason: "write_failed"
+      });
+      return;
+    }
     if (method === "qwen/notify/session/prompt-suggestion") {
       const sessionId2 = params["sessionId"];
       const suggestion = params["suggestion"];
@@ -2093,7 +2190,7 @@ var BridgeClient = class {
     this.sweepExpiredTombstones(now);
     if (this.tombstonedSessionIds.has(sessionId) && !this.inFlightRestoreIds.has(sessionId)) {
       writeStderrLine(
-        `qwen serve: dropping mcp guardrail extNotification for tombstoned session ${JSON.stringify(sessionId)} (post-close stale event)`
+        `qwen serve: dropping early extNotification for tombstoned session ${JSON.stringify(sessionId)} (post-close stale event)`
       );
       return;
     }
@@ -2102,7 +2199,7 @@ var BridgeClient = class {
     if (!buf) {
       if (this.earlyEvents.size >= MAX_EARLY_EVENT_SESSIONS) {
         writeStderrLine(
-          `qwen serve: dropping mcp guardrail extNotification \u2014 early-event buffer at MAX_EARLY_EVENT_SESSIONS (${MAX_EARLY_EVENT_SESSIONS}); possible session-id fanout abuse`
+          `qwen serve: dropping early extNotification \u2014 early-event buffer at MAX_EARLY_EVENT_SESSIONS (${MAX_EARLY_EVENT_SESSIONS}); possible session-id fanout abuse`
         );
         return;
       }
@@ -2111,7 +2208,7 @@ var BridgeClient = class {
     }
     if (buf.frames.length >= MAX_EARLY_EVENTS_PER_SESSION) {
       writeStderrLine(
-        `qwen serve: dropping mcp guardrail extNotification for session ${JSON.stringify(sessionId)} \u2014 per-session cap (${MAX_EARLY_EVENTS_PER_SESSION}) reached`
+        `qwen serve: dropping early extNotification for session ${JSON.stringify(sessionId)} \u2014 per-session cap (${MAX_EARLY_EVENTS_PER_SESSION}) reached`
       );
       return;
     }
@@ -2145,7 +2242,7 @@ var BridgeClient = class {
    * Mark a sessionId as currently being restored via `session/load` /
    * `session/resume`. While in this set, `bufferEarlyEvent` accepts
    * frames for the id even if it's tombstoned — so restore-time
-   * guardrail events from the freshly-restored child reach
+   * early events from the freshly-restored child reach
    * `drainEarlyEvents` instead of being rejected by the tombstone.
    *
    * Bridge factory calls this BEFORE awaiting the ACP restore call.
@@ -2179,7 +2276,12 @@ var BridgeClient = class {
     this.tombstonedSessionIds.delete(sessionId);
     const buf = this.earlyEvents.get(sessionId);
     if (!buf) return;
-    for (const frame of buf.frames) entry.events.publish(frame);
+    for (const frame of buf.frames) {
+      if (frame.type === "session_recording_degraded") {
+        entry.recordingDegraded = true;
+      }
+      entry.events.publish(frame);
+    }
     this.earlyEvents.delete(sessionId);
   }
   async writeTextFile(params) {
@@ -2246,6 +2348,18 @@ var BridgeClient = class {
     if (typeof params.limit === "number" && params.limit <= 0) {
       return { content: "" };
     }
+    if (typeof params.limit === "number" && params.limit > 0 && !Number.isSafeInteger(params.limit)) {
+      throw RequestError.invalidParams(
+        void 0,
+        `\`limit\` must be a positive integer, got ${params.limit}`
+      );
+    }
+    if (typeof params.line === "number" && params.line > 0 && !Number.isSafeInteger(params.line)) {
+      throw RequestError.invalidParams(
+        void 0,
+        `\`line\` must be a positive integer, got ${params.line}`
+      );
+    }
     const READ_FILE_SIZE_CAP = 100 * 1024 * 1024;
     const stats = await fs.stat(params.path);
     if (!stats.isFile()) {
@@ -2386,6 +2500,77 @@ function extractA2uiToolUpdate(params) {
 }
 __name(extractA2uiToolUpdate, "extractA2uiToolUpdate");
 
+// packages/acp-bridge/src/generation-stream.ts
+init_esbuild_shims();
+var GenerationStreamQueue = class {
+  constructor(capacity) {
+    this.capacity = capacity;
+  }
+  static {
+    __name(this, "GenerationStreamQueue");
+  }
+  values = [];
+  waiter;
+  closed = false;
+  failure;
+  push(value) {
+    if (this.closed) return false;
+    if (this.waiter) {
+      const waiter = this.waiter;
+      this.waiter = void 0;
+      waiter.resolve({ value, done: false });
+      return true;
+    }
+    if (this.values.length >= this.capacity) return false;
+    this.values.push(value);
+    return true;
+  }
+  close() {
+    if (this.closed) return;
+    this.closed = true;
+    this.settleWaiter();
+  }
+  fail(error) {
+    if (this.closed) return;
+    this.failure = error;
+    this.closed = true;
+    this.settleWaiter();
+  }
+  settleWaiter() {
+    if (!this.waiter) return;
+    const waiter = this.waiter;
+    this.waiter = void 0;
+    if (this.failure !== void 0) waiter.reject(this.failure);
+    else waiter.resolve({ value: void 0, done: true });
+  }
+  next() {
+    if (this.values.length > 0) {
+      return Promise.resolve({ value: this.values.shift(), done: false });
+    }
+    if (this.failure !== void 0) return Promise.reject(this.failure);
+    if (this.closed) {
+      return Promise.resolve({ value: void 0, done: true });
+    }
+    if (this.waiter) {
+      return Promise.reject(
+        new Error("GenerationStreamQueue supports only one pending reader")
+      );
+    }
+    return new Promise((resolve2, reject) => {
+      this.waiter = { resolve: resolve2, reject };
+    });
+  }
+  [Symbol.asyncIterator]() {
+    return {
+      next: /* @__PURE__ */ __name(() => this.next(), "next"),
+      return: /* @__PURE__ */ __name(async () => {
+        this.close();
+        return { value: void 0, done: true };
+      }, "return")
+    };
+  }
+};
+
 // packages/acp-bridge/src/sessionArtifacts.ts
 init_esbuild_shims();
 import { createHash } from "node:crypto";
@@ -4799,6 +4984,12 @@ function parseWorkspaceMemoryDreamResult(response) {
   };
 }
 __name(parseWorkspaceMemoryDreamResult, "parseWorkspaceMemoryDreamResult");
+function pickUserInputEchoMeta(meta) {
+  if (!meta || typeof meta !== "object" || Array.isArray(meta)) return {};
+  const inputAnnotations = meta["inputAnnotations"];
+  return Array.isArray(inputAnnotations) ? { inputAnnotations } : {};
+}
+__name(pickUserInputEchoMeta, "pickUserInputEchoMeta");
 function echoPromptToSessionBus(entry, req, originatorClientId) {
   const prompt = req.prompt;
   if (!Array.isArray(prompt) || prompt.length === 0) return;
@@ -4820,7 +5011,11 @@ function echoPromptToSessionBus(entry, req, originatorClientId) {
             // field permitted alongside spec fields, the SDK normalizer
             // reads it from `update._meta`/`data._meta`, and every other
             // agent-emitted session_update carries `_meta` the same way.
-            _meta: { serverTimestamp, source: "bridge-echo" }
+            _meta: {
+              ...pickUserInputEchoMeta(req._meta),
+              serverTimestamp,
+              source: "bridge-echo"
+            }
           }
         },
         ...originatorClientId ? { originatorClientId } : {}
@@ -4971,6 +5166,8 @@ var MCP_OAUTH_TIMEOUT_MS = 6e5;
 var DAEMON_RETRY_META_KEY = "qwen.daemon.retry";
 var DAEMON_CONTINUE_META_KEY = "qwen.daemon.continueLastTurn";
 var SESSION_RECAP_TIMEOUT_MS = 6e4;
+var SESSION_GENERATION_TIMEOUT_MS = 65e3;
+var GENERATION_STREAM_QUEUE_CAPACITY = 128;
 var SESSION_BTW_TIMEOUT_MS = 6e4;
 var SESSION_TRANSCRIPT_TIMEOUT_MS = 6e4;
 var SHELL_COMMAND_TIMEOUT_MS = 12e4;
@@ -5206,6 +5403,8 @@ function createAcpSessionBridge(opts) {
   const aliveChannels = /* @__PURE__ */ new Set();
   let inFlightChannelSpawn;
   const byId = /* @__PURE__ */ new Map();
+  const generationRequests = /* @__PURE__ */ new Map();
+  const inFlightExtensionRefreshes = /* @__PURE__ */ new Map();
   const toSessionSummary = /* @__PURE__ */ __name((entry) => {
     let isWaitingForPermission = false;
     let isWaitingForUserQuestion = false;
@@ -5222,6 +5421,8 @@ function createAcpSessionBridge(opts) {
       createdAt: entry.createdAt,
       displayName: entry.displayName,
       ...entry.parentSessionId ? { parentSessionId: entry.parentSessionId } : {},
+      ...entry.sourceType ? { sourceType: entry.sourceType } : {},
+      ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
       clientCount: entry.clientIds.size,
       hasActivePrompt: entry.promptActive,
       isWaitingForPermission,
@@ -5257,6 +5458,7 @@ function createAcpSessionBridge(opts) {
     }
   );
   let shuttingDown = false;
+  let shutdownPromise;
   const teeServeDebugLine = /* @__PURE__ */ __name((message) => {
     writeServeDebugLine(message);
     if (opts.onDiagnosticLine && isServeDebugLoggingEnabled()) {
@@ -5382,15 +5584,29 @@ function createAcpSessionBridge(opts) {
         // at the session/update fan-in to the daemon host's metrics ring via
         // the telemetry seam. Optional-chained so non-daemon callers (tests,
         // Mode A) that wire no `tokenUsage` metric are a silent no-op.
-        (inputTokens, outputTokens, durationMs) => telemetry.metrics?.tokenUsage?.(
+        (inputTokens, outputTokens, durationMs, apiErrors, apiRetries) => telemetry.metrics?.tokenUsage?.(
           inputTokens,
           outputTokens,
-          durationMs
+          durationMs,
+          apiErrors,
+          apiRetries
         ),
         // `create_sub_session` tool: forward the request/response hook so a child
         // tool can ask the daemon to spawn a sub-session and (for 'first-turn')
         // return its result. Omitted → the method reports daemon-only.
-        opts.onCreateSubSession
+        opts.onCreateSubSession,
+        (sessionId, event) => {
+          const request = generationRequests.get(event.requestId);
+          if (!request || request.sessionId !== sessionId) return;
+          if (request.queue.push(event)) return;
+          request.settled = true;
+          generationRequests.delete(event.requestId);
+          request.queue.fail(new Error("Generation stream consumer too slow"));
+          void request.connection.extMethod(SERVE_CONTROL_EXT_METHODS.sessionGenerationCancel, {
+            sessionId,
+            requestId: event.requestId
+          }).catch(() => void 0);
+        }
       );
       const connection = new ClientSideConnection(() => client, channel.stream);
       const info = {
@@ -5509,7 +5725,7 @@ function createAcpSessionBridge(opts) {
     }
   }
   __name(ensureChannel, "ensureChannel");
-  async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId) {
+  async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId) {
     const ci = await ensureChannel();
     ci.sessionSpawnsInFlight++;
     let sessionRegistered = false;
@@ -5551,7 +5767,7 @@ function createAcpSessionBridge(opts) {
         newSessionResp.sessionId,
         boundWorkspace,
         void 0,
-        { parentSessionId }
+        { parentSessionId, sourceType, sourceId }
       );
       initializedSessionId = entry.sessionId;
       sessionRegistered = true;
@@ -5601,6 +5817,32 @@ function createAcpSessionBridge(opts) {
           );
         }
       }
+      let sourcePersisted;
+      if (entry.sourceType) {
+        try {
+          const sourceResult = await Promise.race([
+            withTimeout(
+              entry.connection.extMethod(
+                SERVE_CONTROL_EXT_METHODS.sessionSource,
+                {
+                  sessionId: entry.sessionId,
+                  sourceType: entry.sourceType,
+                  ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {}
+                }
+              ),
+              initTimeoutMs,
+              "sessionSource"
+            ),
+            getTransportClosedReject(entry)
+          ]);
+          sourcePersisted = sourceResult?.persisted === true;
+        } catch (err) {
+          sourcePersisted = false;
+          writeStderrLine(
+            `qwen serve: source metadata for ${entry.sessionId} was not persisted (${err instanceof Error ? err.message : String(err)}) \u2014 the source is live-only until restart (reported to the caller via sourcePersisted=false)`
+          );
+        }
+      }
       if (modelServiceId) {
         await applyModelServiceId(
           entry,
@@ -5636,6 +5878,9 @@ function createAcpSessionBridge(opts) {
         attached: false,
         clientId,
         createdAt: entry.createdAt,
+        ...entry.sourceType ? { sourceType: entry.sourceType } : {},
+        ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
+        ...entry.sourceType ? { sourcePersisted: sourcePersisted === true } : {},
         ...entry.parentSessionId ? { parentSessionPersisted: parentSessionPersisted === true } : {}
       };
     } finally {
@@ -6117,6 +6362,8 @@ function createAcpSessionBridge(opts) {
       workspaceCwd,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...options.parentSessionId ? { parentSessionId: options.parentSessionId } : {},
+      ...options.sourceType ? { sourceType: options.sourceType } : {},
+      ...options.sourceId !== void 0 ? { sourceId: options.sourceId } : {},
       channel: ci.channel,
       connection: ci.connection,
       events,
@@ -6125,6 +6372,7 @@ function createAcpSessionBridge(opts) {
         workspaceCwd,
         persistence: createSessionArtifactPersistence(ci.connection, sessionId)
       }),
+      recordingDegraded: false,
       promptQueue: Promise.resolve(),
       pendingPromptCount: 0,
       pendingPromptList: [],
@@ -6350,6 +6598,8 @@ function createAcpSessionBridge(opts) {
         attached: true,
         clientId,
         createdAt: existing.createdAt,
+        ...existing.sourceType ? { sourceType: existing.sourceType } : {},
+        ...existing.sourceId !== void 0 ? { sourceId: existing.sourceId } : {},
         // Late attachers get the same ACP state the original restore
         // caller saw; spawn-only sessions don't carry a state payload.
         state: existing.restoreState ?? {},
@@ -6522,6 +6772,8 @@ function createAcpSessionBridge(opts) {
           attached: true,
           clientId: clientId2,
           createdAt: racedEntry.createdAt,
+          ...racedEntry.sourceType ? { sourceType: racedEntry.sourceType } : {},
+          ...racedEntry.sourceId !== void 0 ? { sourceId: racedEntry.sourceId } : {},
           state: racedEntry.restoreState ?? {},
           hasActivePrompt: racedEntry.promptActive,
           ...replayFieldsFor(racedEntry, action)
@@ -6537,7 +6789,9 @@ function createAcpSessionBridge(opts) {
           lifecycleReason: action,
           // Re-seed the persisted parent lineage the caller recovered from the
           // transcript, so a restored sub-session's status reports its parent.
-          ...req.parentSessionId ? { parentSessionId: req.parentSessionId } : {}
+          ...req.parentSessionId ? { parentSessionId: req.parentSessionId } : {},
+          ...req.sourceType ? { sourceType: req.sourceType } : {},
+          ...req.sourceId !== void 0 ? { sourceId: req.sourceId } : {}
         }
       );
       releaseAdmissionOnce();
@@ -6582,6 +6836,8 @@ function createAcpSessionBridge(opts) {
         attached: false,
         clientId,
         createdAt: entry.createdAt,
+        ...entry.sourceType ? { sourceType: entry.sourceType } : {},
+        ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
         state: publicState,
         ...artifactRestoreWarnings.length > 0 ? { artifactWarnings: artifactRestoreWarnings } : {},
         hasActivePrompt: entry.promptActive,
@@ -6802,6 +7058,10 @@ function createAcpSessionBridge(opts) {
         throw new InvalidSessionScopeError(req.sessionScope);
       }
       const effectiveScope = req.sessionScope ?? defaultSessionScope;
+      const source = parseSessionSource(req.sourceType, req.sourceId);
+      if ("error" in source) {
+        throw new InvalidSessionMetadataError("sourceType", source.error);
+      }
       if (req.approvalMode !== void 0 && !KNOWN_APPROVAL_MODES.has(req.approvalMode)) {
         throw new Error(
           `Invalid approvalMode: ${JSON.stringify(req.approvalMode)}`
@@ -6834,6 +7094,8 @@ function createAcpSessionBridge(opts) {
             attached: true,
             clientId,
             createdAt: existing.createdAt,
+            ...existing.sourceType ? { sourceType: existing.sourceType } : {},
+            ...existing.sourceId !== void 0 ? { sourceId: existing.sourceId } : {},
             hasActivePrompt: existing.promptActive
           };
         }
@@ -6892,7 +7154,9 @@ function createAcpSessionBridge(opts) {
         req.approvalMode,
         req.clientId,
         releaseAdmissionOnce,
-        req.parentSessionId
+        req.parentSessionId,
+        source.sourceType,
+        source.sourceId
       );
       const tracker = effectiveScope === "single" ? workspaceKey : `${workspaceKey}#${randomUUID2()}`;
       inFlightSpawns.set(tracker, promise);
@@ -7241,7 +7505,8 @@ function createAcpSessionBridge(opts) {
         data: {
           sessionId: entry.sessionId,
           currentModelId: entry.currentModelId ?? null,
-          currentApprovalMode: entry.currentApprovalMode ?? null
+          currentApprovalMode: entry.currentApprovalMode ?? null,
+          recordingDegraded: entry.recordingDegraded
         }
       }), "snapshotFrame");
       async function* withSnapshot() {
@@ -7535,7 +7800,7 @@ function createAcpSessionBridge(opts) {
               const r = res;
               if (r && r.persisted === false) {
                 writeStderrLine(
-                  `qwen serve: displayName for ${sessionId} was not persisted (recording service unavailable)`
+                  `qwen serve: displayName for ${sessionId} was not persisted`
                 );
               }
             }).catch((err) => {
@@ -7975,12 +8240,26 @@ function createAcpSessionBridge(opts) {
             return { refreshed: 0, failed: 0 };
           }
           try {
-            await Promise.race([
-              withTimeout(
-                entry.connection.extMethod(
+            let inFlight = inFlightExtensionRefreshes.get(entry.sessionId);
+            if (!inFlight || inFlight.connection !== entry.connection) {
+              const promise = (async () => {
+                await entry.connection.extMethod(
                   SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh,
                   { sessionId: entry.sessionId }
-                ),
+                );
+              })();
+              inFlight = { connection: entry.connection, promise };
+              inFlightExtensionRefreshes.set(entry.sessionId, inFlight);
+              const clear = /* @__PURE__ */ __name(() => {
+                if (inFlightExtensionRefreshes.get(entry.sessionId) === inFlight) {
+                  inFlightExtensionRefreshes.delete(entry.sessionId);
+                }
+              }, "clear");
+              void promise.then(clear, clear);
+            }
+            await Promise.race([
+              withTimeout(
+                inFlight.promise,
                 3e4,
                 SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh
               ),
@@ -8169,6 +8448,75 @@ function createAcpSessionBridge(opts) {
         recap: response.recap ?? null
       };
     },
+    generateSessionContent(sessionId, prompt, signal, context) {
+      const entry = byId.get(sessionId);
+      if (!entry) throw new SessionNotFoundError(sessionId);
+      const info = channelInfoForEntry(entry);
+      if (!info || info.isDying) throw new SessionNotFoundError(sessionId);
+      resolveTrustedClientId(entry, context?.clientId);
+      const requestId = randomUUID2();
+      const queue = new GenerationStreamQueue(
+        GENERATION_STREAM_QUEUE_CAPACITY
+      );
+      const request = {
+        sessionId,
+        connection: entry.connection,
+        queue,
+        settled: false
+      };
+      generationRequests.set(requestId, request);
+      const cancel = /* @__PURE__ */ __name(() => {
+        if (request.settled) return;
+        request.settled = true;
+        generationRequests.delete(requestId);
+        queue.close();
+        void entry.connection.extMethod(SERVE_CONTROL_EXT_METHODS.sessionGenerationCancel, {
+          sessionId,
+          requestId
+        }).catch(() => void 0);
+      }, "cancel");
+      signal.addEventListener("abort", cancel, { once: true });
+      if (signal.aborted) {
+        cancel();
+        return queue;
+      }
+      void Promise.race([
+        withTimeout(
+          entry.connection.extMethod(
+            SERVE_CONTROL_EXT_METHODS.sessionGenerationStart,
+            { sessionId, requestId, prompt }
+          ),
+          SESSION_GENERATION_TIMEOUT_MS,
+          SERVE_CONTROL_EXT_METHODS.sessionGenerationStart
+        ),
+        getTransportClosedReject(entry)
+      ]).then((raw) => {
+        if (request.settled) return;
+        const response = raw;
+        const model = response["model"];
+        const modelSource = response["modelSource"];
+        if (typeof model !== "string" || modelSource !== "fast" && modelSource !== "main") {
+          throw new Error("Malformed generation completion");
+        }
+        const accepted = queue.push({
+          type: "done",
+          requestId,
+          model,
+          modelSource,
+          ...typeof response["inputTokens"] === "number" ? { inputTokens: response["inputTokens"] } : {},
+          ...typeof response["outputTokens"] === "number" ? { outputTokens: response["outputTokens"] } : {}
+        });
+        if (accepted) queue.close();
+        else queue.fail(new Error("Generation stream consumer too slow"));
+      }).catch((error) => {
+        if (!request.settled) queue.fail(error);
+      }).finally(() => {
+        request.settled = true;
+        signal.removeEventListener("abort", cancel);
+        generationRequests.delete(requestId);
+      });
+      return queue;
+    },
     getPendingPrompts(sessionId, context) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
@@ -8675,10 +9023,10 @@ function createAcpSessionBridge(opts) {
     },
     async killSession(sessionId, opts2) {
       const entry = byId.get(sessionId);
-      if (!entry) return;
+      if (!entry) return false;
       if (opts2?.requireZeroAttaches && entry.attachCount > 0) {
         entry.spawnOwnerWantedKill = true;
-        return;
+        return false;
       }
       permissionMediator.forgetSession(sessionId);
       entry.pendingPermissionIds.clear();
@@ -8722,6 +9070,7 @@ function createAcpSessionBridge(opts) {
           await startIdleTimer(ci, `killSession "${sessionId}"`);
         }
       }
+      return true;
     },
     async detachClient(sessionId, clientId) {
       const entry = byId.get(sessionId);
@@ -8764,60 +9113,71 @@ function createAcpSessionBridge(opts) {
         }
       }
     },
-    async shutdown() {
-      shuttingDown = true;
-      cancelIdleTimer();
-      stopSessionReaper();
-      const entries = Array.from(byId.values());
-      const channels = Array.from(aliveChannels);
-      for (const ci of channels) ci.isDying = true;
-      for (const e of entries) {
-        permissionMediator.forgetSession(e.sessionId);
-        e.pendingPermissionIds.clear();
-        e.pendingInteractions.clear();
-      }
-      defaultEntry = void 0;
-      byId.clear();
-      for (const e of entries) {
-        telemetry.metrics?.sessionLifecycle("die");
-        emitSessionLifecycle({
-          type: "removed",
-          sessionId: e.sessionId,
-          workspaceCwd: e.workspaceCwd,
-          reason: "daemon_shutdown"
-        });
-        try {
-          e.events.publish({
-            type: "session_died",
-            data: { sessionId: e.sessionId, reason: "daemon_shutdown" }
+    shutdown(options) {
+      if (shutdownPromise) return shutdownPromise;
+      const shutdownReason = options?.reason ?? "daemon_shutdown";
+      let resolveShutdown;
+      let rejectShutdown;
+      shutdownPromise = new Promise((resolve2, reject) => {
+        resolveShutdown = resolve2;
+        rejectShutdown = reject;
+      });
+      void (async () => {
+        shuttingDown = true;
+        cancelIdleTimer();
+        stopSessionReaper();
+        const entries = Array.from(byId.values());
+        const channels = Array.from(aliveChannels);
+        for (const ci of channels) ci.isDying = true;
+        for (const e of entries) {
+          permissionMediator.forgetSession(e.sessionId);
+          e.pendingPermissionIds.clear();
+          e.pendingInteractions.clear();
+        }
+        defaultEntry = void 0;
+        byId.clear();
+        for (const e of entries) {
+          telemetry.metrics?.sessionLifecycle("die");
+          emitSessionLifecycle({
+            type: "removed",
+            sessionId: e.sessionId,
+            workspaceCwd: e.workspaceCwd,
+            reason: shutdownReason
           });
-        } catch {
+          try {
+            e.events.publish({
+              type: "session_died",
+              data: { sessionId: e.sessionId, reason: shutdownReason }
+            });
+          } catch {
+          }
+          e.events.close();
         }
-        e.events.close();
-      }
-      const inFlightSessionAwaits = Array.from(inFlightSpawns.values()).map(
-        (p) => p.then(
-          () => void 0,
-          () => void 0
-        )
-      );
-      const inFlightRestoreAwaits = Array.from(inFlightRestores.values()).map(
-        (restore) => restore.promise.then(
+        const inFlightSessionAwaits = Array.from(inFlightSpawns.values()).map(
+          (p) => p.then(
+            () => void 0,
+            () => void 0
+          )
+        );
+        const inFlightRestoreAwaits = Array.from(inFlightRestores.values()).map(
+          (restore) => restore.promise.then(
+            () => void 0,
+            () => void 0
+          )
+        );
+        const inFlightChannelAwait = inFlightChannelSpawn ? inFlightChannelSpawn.then(
           () => void 0,
           () => void 0
-        )
-      );
-      const inFlightChannelAwait = inFlightChannelSpawn ? inFlightChannelSpawn.then(
-        () => void 0,
-        () => void 0
-      ) : Promise.resolve();
-      await Promise.all([
-        ...channels.map((ci) => ci.channel.kill().catch(() => {
-        })),
-        ...inFlightSessionAwaits,
-        ...inFlightRestoreAwaits,
-        inFlightChannelAwait
-      ]);
+        ) : Promise.resolve();
+        await Promise.all([
+          ...channels.map((ci) => ci.channel.kill().catch(() => {
+          })),
+          ...inFlightSessionAwaits,
+          ...inFlightRestoreAwaits,
+          inFlightChannelAwait
+        ]);
+      })().then(resolveShutdown, rejectShutdown);
+      return shutdownPromise;
     },
     async preheat() {
       if (shuttingDown) return;
@@ -8848,6 +9208,7 @@ var createHttpAcpBridge = createAcpSessionBridge;
 export {
   SessionArtifactValidationError,
   SessionArtifactAuthorizationError,
+  parseSessionSource,
   extractErrorMessage,
   extractErrorCode,
   classifyTurnErrorKind,