@qwen-code/qwen-code 0.19.11-nightly.20260718.767a32484 → 0.19.11

package/chunks/{chunk-KEVDWH3U.js → chunk-574PTLMU.js}

@@ -4,10 +4,9 @@ import {
   LOAD_REPLAY_BULK_MODE,
   LOAD_REPLAY_META_KEY,
   LOAD_REPLAY_MODE_META_KEY,
-  LOAD_REPLAY_PAGE_SIZE_META_KEY,
   LOAD_REPLAY_VERSION,
   MID_TURN_QUEUE_DRAIN_METHOD
-} from "./chunk-T3W4SDRB.js";
+} from "./chunk-PZL23GTM.js";
 import {
   DEFAULT_RING_SIZE,
   EVENT_SCHEMA_VERSION,
@@ -37,10 +36,10 @@ import {
   SessionShellDisabledError,
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-X6YQWCIJ.js";
+} from "./chunk-L4Y55KIS.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-O2K6BLPZ.js";
+} from "./chunk-3AYLDB6B.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -49,7 +48,7 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-URP6O2PP.js";
+} from "./chunk-VFX7EZIR.js";
 import {
   canonicalizeWorkspace
 } from "./chunk-W7FJ3N32.js";
@@ -69,11 +68,11 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-3YJZ6WNY.js";
+} from "./chunk-NJOFRXTM.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-66IT3EY2.js";
+} from "./chunk-MQOVXZAF.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -101,23 +100,6 @@ var LATEST_WINS_UPDATES = /* @__PURE__ */ new Set([
   "current_mode_update"
 ]);
 var REPLAY_SEGMENT_COMPACT_THRESHOLD = 64;
-function replayRecordId(event) {
-  if (event.type !== "session_update") return void 0;
-  const data = event.data;
-  if (!data || typeof data !== "object" || Array.isArray(data))
-    return void 0;
-  const update = data["update"];
-  if (!update || typeof update !== "object" || Array.isArray(update)) {
-    return void 0;
-  }
-  const meta = update["_meta"];
-  if (!meta || typeof meta !== "object" || Array.isArray(meta)) {
-    return void 0;
-  }
-  const recordId = meta["qwen.session.recordId"];
-  return typeof recordId === "string" ? recordId : void 0;
-}
-__name(replayRecordId, "replayRecordId");
 var TurnBoundaryCompactionEngine = class {
   static {
     __name(this, "TurnBoundaryCompactionEngine");
@@ -185,29 +167,11 @@ var TurnBoundaryCompactionEngine = class {
   seedReplayEvents(events) {
     if (this.closed) return;
     this.resetReplayWindow();
-    let recordEvents = [];
-    let recordId;
-    const flushRecord = /* @__PURE__ */ __name(() => {
-      this.addReplaySegment(recordEvents, 0);
-      recordEvents = [];
-      recordId = void 0;
-    }, "flushRecord");
     for (const event of events) {
       this.recordLastEventId(event);
       if (TRANSIENT_TYPES.has(event.type)) continue;
-      const nextRecordId = replayRecordId(event);
-      if (nextRecordId === void 0) {
-        flushRecord();
-        this.addReplaySegment([event], 0);
-        continue;
-      }
-      if (recordId !== void 0 && recordId !== nextRecordId) {
-        flushRecord();
-      }
-      recordId = nextRecordId;
-      recordEvents.push(event);
+      this.addReplaySegment([event], 0);
     }
-    flushRecord();
     this.liveJournal = [];
     this.slots = [];
     this.toolSlotIndex.clear();
@@ -603,8 +567,8 @@ var MultiClientPermissionMediator = class {
    * an identical line (the unanimity condition is the NORMAL
    * operating mode for M=2, not a rare edge); a busy session with
    * many tool calls would produce dozens of duplicate stderr lines
-   * within seconds. One emit per mediator (= per bridge/runtime lifetime
-   * since each bridge constructs one) is enough to make the
+   * within seconds. One emit per mediator (= per daemon lifetime
+   * since the bridge constructs one) is enough to make the
    * configuration visible without spam.
    */
   unanimityBreadcrumbEmitted = false;
@@ -663,7 +627,6 @@ var MultiClientPermissionMediator = class {
       const pending = {
         requestId: record.requestId,
         sessionId: record.sessionId,
-        promptId: record.promptId,
         policy,
         originatorClientId: record.originatorClientId,
         allowedOptionIds: record.allowedOptionIds,
@@ -737,7 +700,6 @@ var MultiClientPermissionMediator = class {
         const optionId = prior.resolution.kind === "option" ? prior.resolution.optionId : CANCEL_VOTE_SENTINEL;
         this.safeEmit(prior.sessionId, {
           type: "permission_already_resolved",
-          ...prior.promptId ? { promptId: prior.promptId } : {},
           data: {
             requestId: prior.requestId,
             sessionId: prior.sessionId,
@@ -903,7 +865,6 @@ var MultiClientPermissionMediator = class {
     );
     this.safeEmit(pending.sessionId, {
       type: "permission_partial_vote",
-      ...pending.promptId ? { promptId: pending.promptId } : {},
       data: {
         requestId: pending.requestId,
         sessionId: pending.sessionId,
@@ -977,7 +938,6 @@ var MultiClientPermissionMediator = class {
     );
     this.safeEmit(pending.sessionId, {
       type: "permission_forbidden",
-      ...pending.promptId ? { promptId: pending.promptId } : {},
       data: {
         requestId: pending.requestId,
         sessionId: pending.sessionId,
@@ -1100,7 +1060,6 @@ var MultiClientPermissionMediator = class {
     this.pending.delete(pending.requestId);
     this.safeEmit(pending.sessionId, {
       type: "permission_resolved",
-      ...pending.promptId ? { promptId: pending.promptId } : {},
       data: {
         requestId: pending.requestId,
         outcome: this.toAcpOutcome(resolution),
@@ -1124,7 +1083,6 @@ var MultiClientPermissionMediator = class {
     this.rememberResolved({
       requestId: pending.requestId,
       sessionId: pending.sessionId,
-      promptId: pending.promptId,
       resolution,
       resolverClientId
     });
@@ -1223,7 +1181,6 @@ var MultiClientPermissionMediator = class {
     return {
       requestId: pending.requestId,
       sessionId: pending.sessionId,
-      ...pending.promptId ? { promptId: pending.promptId } : {},
       originatorClientId: pending.originatorClientId,
       allowedOptionIds: pending.allowedOptionIds,
       issuedAtMs: pending.issuedAtMs
@@ -1495,7 +1452,6 @@ var BridgeClient = class {
     }
     const published = entry.events.publish({
       type: "permission_request",
-      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: {
         requestId,
         sessionId: entry.sessionId,
@@ -1523,7 +1479,6 @@ var BridgeClient = class {
       const record = {
         requestId,
         sessionId: entry.sessionId,
-        promptId: entry.activePromptId,
         originatorClientId: entry.activePromptOriginatorClientId,
         allowedOptionIds,
         issuedAtMs: Date.now()
@@ -1557,21 +1512,13 @@ var BridgeClient = class {
     } catch {
     }
     if (entry && prepared.artifacts.length > 0) {
-      await this.upsertAndPublishArtifacts(
-        entry,
-        prepared.artifacts,
-        {
-          trustedPublisher: prepared.trustedPublisher
-        },
-        prepared.turn
-      );
+      await this.upsertAndPublishArtifacts(entry, prepared.artifacts, {
+        trustedPublisher: prepared.trustedPublisher
+      });
     }
   }
   prepareSessionUpdateFrames(params, entry) {
-    const turn = {
-      ...entry?.activePromptId ? { promptId: entry.activePromptId } : {},
-      ...entry?.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
-    };
+    const originator = entry?.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {};
     const frames = [];
     const a2ui = extractA2uiToolUpdate(params);
     if (a2ui) {
@@ -1590,7 +1537,7 @@ var BridgeClient = class {
               _meta: { serverTimestamp: Date.now(), source: "a2ui-bridge" }
             }
           },
-          ...turn
+          ...originator
         });
       }
       params = a2ui.sanitizedParams;
@@ -1608,14 +1555,13 @@ var BridgeClient = class {
     frames.push({
       type: "session_update",
       data: publishParams,
-      ...turn,
+      ...originator,
       ...serverTimestamp !== void 0 ? { _meta: { serverTimestamp } } : {}
     });
     return {
       frames,
       artifacts,
-      trustedPublisher: isTrustedArtifactToolUpdate(params, updateMeta),
-      turn
+      trustedPublisher: isTrustedArtifactToolUpdate(params, updateMeta)
     };
   }
   async seedSessionUpdates(entry, updates, options = {}) {
@@ -1630,21 +1576,15 @@ var BridgeClient = class {
       if (options.ingestArtifacts !== false && prepared.artifacts.length > 0) {
         artifactBatches.push({
           artifacts: prepared.artifacts,
-          trustedPublisher: prepared.trustedPublisher,
-          turn: prepared.turn
+          trustedPublisher: prepared.trustedPublisher
         });
       }
     }
     entry.events.seedReplayEvents(frames);
     for (const batch of artifactBatches) {
-      await this.upsertAndPublishArtifacts(
-        entry,
-        batch.artifacts,
-        {
-          trustedPublisher: batch.trustedPublisher
-        },
-        batch.turn
-      );
+      await this.upsertAndPublishArtifacts(entry, batch.artifacts, {
+        trustedPublisher: batch.trustedPublisher
+      });
     }
   }
   /**
@@ -1767,7 +1707,6 @@ var BridgeClient = class {
       for (const [originatorClientId, texts] of byOriginator) {
         const published = entry.events.publish({
           type: MID_TURN_MESSAGE_INJECTED_EVENT,
-          ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
           data: { sessionId: entry.sessionId, messages: texts },
           ...originatorClientId ? { originatorClientId } : {}
         });
@@ -2019,7 +1958,7 @@ var BridgeClient = class {
       const { v: _v2, sessionId: _sid2, ...rest2 } = params;
       void _v2;
       void _sid2;
-      this.publishExtNotification(sessionId2, "terminal_sequence", rest2, true);
+      this.publishExtNotification(sessionId2, "terminal_sequence", rest2);
       return;
     }
     if (method === "qwen/notify/session/artifact-event") {
@@ -2082,16 +2021,12 @@ var BridgeClient = class {
         toolCallId
       })
     );
-    const turn = {
-      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
-      ...entry.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
-    };
-    await this.upsertAndPublishArtifacts(entry, artifacts, void 0, turn);
+    await this.upsertAndPublishArtifacts(entry, artifacts);
   }
-  async upsertAndPublishArtifacts(entry, artifacts, options, turn = {}) {
+  async upsertAndPublishArtifacts(entry, artifacts, options) {
     try {
       const result = await entry.artifacts.upsertMany(artifacts, options);
-      this.publishArtifactChanges(entry, result.changes, turn);
+      this.publishArtifactChanges(entry, result.changes);
     } catch (error) {
       writeStderrLine(
         `[artifacts] session=${entry.sessionId} action=dropped reason=${JSON.stringify(
@@ -2100,21 +2035,20 @@ var BridgeClient = class {
       );
     }
   }
-  publishArtifactChanges(entry, changes, turn) {
+  publishArtifactChanges(entry, changes) {
     for (const change of changes) {
       entry.events.publish({
         type: "artifact_changed",
         data: { sessionId: entry.sessionId, change },
-        ...turn
+        ...entry.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
       });
     }
   }
-  publishExtNotification(sessionId, type, data, turnScoped = false) {
+  publishExtNotification(sessionId, type, data) {
     const entry = this.resolveEntry(sessionId);
     const frame = {
       type,
       data,
-      ...turnScoped && entry?.activePromptId ? { promptId: entry.activePromptId } : {},
       ...entry?.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
     };
     if (entry) {
@@ -2159,7 +2093,6 @@ var BridgeClient = class {
     } else {
       entry.events.publish({
         type: "model_switched",
-        ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
         data: { sessionId, modelId: currentModelId },
         ...entry.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
       });
@@ -2213,7 +2146,6 @@ var BridgeClient = class {
     } else {
       entry.events.publish({
         type: "approval_mode_changed",
-        ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
         data: {
           sessionId,
           previous: "default",
@@ -2231,7 +2163,6 @@ var BridgeClient = class {
     }
     entry.events.publish({
       type: "session_update",
-      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: {
         sessionId,
         update: {
@@ -4868,14 +4799,6 @@ function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 __name(isRecord2, "isRecord");
-function getCanonicalModelId(response, fallback) {
-  if (!isRecord2(response) || !isRecord2(response["_meta"])) return fallback;
-  const modelSwitch = response["_meta"]["qwenModelSwitch"];
-  if (!isRecord2(modelSwitch)) return fallback;
-  const modelId = modelSwitch["modelId"];
-  return typeof modelId === "string" ? modelId : fallback;
-}
-__name(getCanonicalModelId, "getCanonicalModelId");
 function isBulkReplayUpdate(value) {
   if (!isRecord2(value)) return false;
   const updateType = value["sessionUpdate"];
@@ -4921,12 +4844,6 @@ function extractLoadReplayResponse(state) {
       `Invalid qwen.session.loadReplay replayError (version=${LOAD_REPLAY_VERSION}, replayError=${describeLoadReplayValue(replayError)})`
     );
   }
-  const hasMore = replay["hasMore"];
-  if (hasMore !== void 0 && typeof hasMore !== "boolean") {
-    throw new Error(
-      `Invalid qwen.session.loadReplay hasMore (version=${LOAD_REPLAY_VERSION}, hasMore=${describeLoadReplayValue(hasMore)})`
-    );
-  }
   const invalidUpdateIndex = rawUpdates.findIndex(
     (update) => !isBulkReplayUpdate(update)
   );
@@ -4949,8 +4866,7 @@ function extractLoadReplayResponse(state) {
     state: cleanState,
     updates: rawUpdates,
     ...partial === true ? { partial: true } : {},
-    ...typeof replayError === "string" ? { replayError } : {},
-    ...hasMore === true ? { hasMore: true } : {}
+    ...typeof replayError === "string" ? { replayError } : {}
   };
 }
 __name(extractLoadReplayResponse, "extractLoadReplayResponse");
@@ -5074,7 +4990,7 @@ function pickUserInputEchoMeta(meta) {
   return Array.isArray(inputAnnotations) ? { inputAnnotations } : {};
 }
 __name(pickUserInputEchoMeta, "pickUserInputEchoMeta");
-function echoPromptToSessionBus(entry, req, promptId, originatorClientId) {
+function echoPromptToSessionBus(entry, req, originatorClientId) {
   const prompt = req.prompt;
   if (!Array.isArray(prompt) || prompt.length === 0) return;
   const serverTimestamp = Date.now();
@@ -5085,7 +5001,6 @@ function echoPromptToSessionBus(entry, req, promptId, originatorClientId) {
     try {
       entry.events.publish({
         type: "session_update",
-        promptId,
         data: {
           sessionId: req.sessionId,
           update: {
@@ -5110,11 +5025,10 @@ function echoPromptToSessionBus(entry, req, promptId, originatorClientId) {
   }
 }
 __name(echoPromptToSessionBus, "echoPromptToSessionBus");
-function broadcastPromptCancelled(entry, sessionId, promptId, originatorClientId, reason) {
+function broadcastPromptCancelled(entry, sessionId, originatorClientId, reason) {
   try {
     entry.events.publish({
       type: "prompt_cancelled",
-      ...promptId ? { promptId } : {},
       data: { sessionId, ...reason ? { reason } : {} },
       ...originatorClientId ? { originatorClientId } : {}
     });
@@ -5122,7 +5036,7 @@ function broadcastPromptCancelled(entry, sessionId, promptId, originatorClientId
   }
 }
 __name(broadcastPromptCancelled, "broadcastPromptCancelled");
-function broadcastPromptCancelledOnce(entry, sessionId, promptId, originatorClientId, reason) {
+function broadcastPromptCancelledOnce(entry, sessionId, originatorClientId, reason) {
   if (entry.cancelBroadcast) {
     writeStderrLine(
       `broadcastPromptCancelledOnce: suppressed duplicate cancel for session ${sessionId} (latch already set)`
@@ -5130,20 +5044,13 @@ function broadcastPromptCancelledOnce(entry, sessionId, promptId, originatorClie
     return;
   }
   entry.cancelBroadcast = true;
-  broadcastPromptCancelled(
-    entry,
-    sessionId,
-    promptId,
-    originatorClientId,
-    reason
-  );
+  broadcastPromptCancelled(entry, sessionId, originatorClientId, reason);
 }
 __name(broadcastPromptCancelledOnce, "broadcastPromptCancelledOnce");
 function broadcastTurnComplete(entry, sessionId, promptResult, promptId, originatorClientId) {
   try {
     entry.events.publish({
       type: "turn_complete",
-      ...promptId ? { promptId } : {},
       data: {
         sessionId,
         stopReason: promptResult.stopReason ?? "end_turn",
@@ -5213,7 +5120,6 @@ function broadcastTurnError(entry, sessionId, err, promptId, originatorClientId)
   try {
     entry.events.publish({
       type: "turn_error",
-      ...promptId ? { promptId } : {},
       data: {
         sessionId,
         message,
@@ -5649,13 +5555,11 @@ function createAcpSessionBridge(opts) {
     if (channelInfo && !channelInfo.isDying) return channelInfo;
     if (inFlightChannelSpawn) return await inFlightChannelSpawn;
     const promise = (async () => {
-      const acpChannelId = randomUUID2();
       const channel = await telemetry.withSpan(
         "channel.spawn",
         {
           "qwen-code.daemon.bridge.operation": "channel.spawn",
-          "qwen-code.daemon.channel.reused": false,
-          "qwen-code.daemon.acp_channel.id": acpChannelId
+          "qwen-code.daemon.channel.reused": false
         },
         async () => await channelFactory(boundWorkspace, childEnvOverrides)
       );
@@ -5741,7 +5645,6 @@ function createAcpSessionBridge(opts) {
       );
       const connection = new ClientSideConnection(() => client, channel.stream);
       const info = {
-        id: acpChannelId,
         channel,
         connection,
         client,
@@ -5831,8 +5734,7 @@ function createAcpSessionBridge(opts) {
         await telemetry.withSpan(
           "channel.initialize",
           {
-            "qwen-code.daemon.bridge.operation": "channel.initialize",
-            "qwen-code.daemon.acp_channel.id": acpChannelId
+            "qwen-code.daemon.bridge.operation": "channel.initialize"
           },
           async () => await withTimeout(
             connection.initialize({
@@ -5872,15 +5774,7 @@ function createAcpSessionBridge(opts) {
   }
   __name(ensureChannel, "ensureChannel");
   async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId) {
-    const channelPath = channelInfo && !channelInfo.isDying ? "reused" : inFlightChannelSpawn ? "joined" : "spawned_on_request";
-    const ci = await telemetry.withSpan(
-      "channel.wait",
-      {
-        "qwen-code.daemon.bridge.operation": "channel.wait",
-        "qwen-code.daemon.channel.path": channelPath
-      },
-      ensureChannel
-    );
+    const ci = await ensureChannel();
     ci.sessionSpawnsInFlight++;
     let sessionRegistered = false;
     let sessionRemovedDuringInitialization = false;
@@ -5892,27 +5786,16 @@ function createAcpSessionBridge(opts) {
           "session.new",
           {
             "qwen-code.daemon.bridge.operation": "session.new",
-            "qwen-code.daemon.session_scope": effectiveScope,
-            "qwen-code.daemon.channel.path": channelPath,
-            "qwen-code.daemon.acp_channel.id": ci.id
+            "qwen-code.daemon.session_scope": effectiveScope
           },
-          async () => {
-            const response = await withTimeout(
-              ci.connection.newSession(
-                telemetry.injectPromptContext({
-                  cwd: boundWorkspace,
-                  mcpServers: []
-                })
-              ),
-              initTimeoutMs,
-              "newSession"
-            );
-            telemetry.event("session.new.completed", {
-              "session.id": response.sessionId,
-              "qwen-code.daemon.acp_channel.id": ci.id
-            });
-            return response;
-          }
+          async () => await withTimeout(
+            ci.connection.newSession({
+              cwd: boundWorkspace,
+              mcpServers: []
+            }),
+            initTimeoutMs,
+            "newSession"
+          )
         );
       } catch (err) {
         if (hasNoChannelWork(ci, { ignoreCurrentSessionSpawn: true })) {
@@ -6076,7 +5959,7 @@ function createAcpSessionBridge(opts) {
       entry.modelRoundtripInFlight = true;
       let succeeded = false;
       try {
-        const result = await Promise.race([
+        await Promise.race([
           withTimeout(
             conn.unstable_setSessionModel({
               sessionId: entry.sessionId,
@@ -6092,7 +5975,7 @@ function createAcpSessionBridge(opts) {
           type: "settings_changed",
           data: {
             key: "model.name",
-            value: getCanonicalModelId(result, modelId)
+            value: modelId
           },
           ...originatorClientId ? { originatorClientId } : {}
         });
@@ -6574,7 +6457,6 @@ function createAcpSessionBridge(opts) {
     entry.modelPublishGeneration++;
     entry.events.publish({
       type: "model_switched",
-      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: { sessionId: entry.sessionId, modelId },
       ...originatorClientId ? { originatorClientId } : {}
     });
@@ -6584,7 +6466,6 @@ function createAcpSessionBridge(opts) {
     entry.approvalModePublishGeneration++;
     entry.events.publish({
       type: "approval_mode_changed",
-      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: {
         sessionId: entry.sessionId,
         previous: payload.previous,
@@ -6833,8 +6714,7 @@ function createAcpSessionBridge(opts) {
         compactedReplay: snapshot.compactedTurns,
         liveJournal: snapshot.liveJournal,
         lastEventId: snapshot.lastEventId,
-        ...replayStatus,
-        ...entry.restoreHistoryHasMore === true ? { historyHasMore: true } : {}
+        ...replayStatus
       };
     }
     return { lastEventId: snapshot.lastEventId, ...replayStatus };
@@ -6972,7 +6852,6 @@ function createAcpSessionBridge(opts) {
       let replayUpdates = [];
       let replayPartial;
       let replayError;
-      let replayHasMore;
       try {
         if (action === "load") {
           state = await Promise.race([
@@ -6988,10 +6867,7 @@ function createAcpSessionBridge(opts) {
                 mcpServers: [],
                 ...historyReplay === "response" ? {
                   _meta: {
-                    [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE,
-                    ...req.historyPageSize !== void 0 ? {
-                      [LOAD_REPLAY_PAGE_SIZE_META_KEY]: req.historyPageSize
-                    } : {}
+                    [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE
                   }
                 } : {}
               }),
@@ -7020,7 +6896,6 @@ function createAcpSessionBridge(opts) {
           replayUpdates = extracted.updates;
           replayPartial = extracted.partial;
           replayError = extracted.replayError;
-          replayHasMore = extracted.hasMore === true ? true : void 0;
         }
       } catch (err) {
         restoreEvents.close();
@@ -7105,9 +6980,6 @@ function createAcpSessionBridge(opts) {
       if (replayError !== void 0) {
         entry.restoreReplayError = replayError;
       }
-      if (replayHasMore === true) {
-        entry.restoreHistoryHasMore = true;
-      }
       seedSnapshotCaches(entry, publicState);
       const artifactRestoreWarnings = await entry.artifacts.restore(
         restoredArtifactSnapshot
@@ -7126,9 +6998,6 @@ 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")) {
-          entry.restoreHistoryHasMore = true;
-        }
         ci.client.drainEarlyEvents(entry.sessionId, entry);
       }
       const clientId = registerClient(entry, req.clientId);
@@ -7532,7 +7401,6 @@ function createAcpSessionBridge(opts) {
       if (isQueued) {
         entry.events.publish({
           type: "pending_prompt_added",
-          promptId: pendingEntry.promptId,
           data: {
             sessionId,
             promptId: pendingEntry.promptId,
@@ -7553,7 +7421,6 @@ function createAcpSessionBridge(opts) {
             pendingEntry.state = "running";
             entry.events.publish({
               type: "pending_prompt_started",
-              promptId: pendingEntry.promptId,
               data: {
                 sessionId,
                 promptId: pendingEntry.promptId,
@@ -7606,7 +7473,6 @@ function createAcpSessionBridge(opts) {
                   return copy;
                 })();
                 entry.promptActive = true;
-                entry.activePromptId = pendingEntry.promptId;
                 delete entry.turnError;
                 activePromptCounter++;
                 entry.sessionLastSeenAt = Date.now();
@@ -7622,12 +7488,10 @@ function createAcpSessionBridge(opts) {
                     echoPromptToSessionBus(
                       entry,
                       promptRequest,
-                      pendingEntry.promptId,
                       originatorClientId
                     );
                   }
                 } catch (echoErr) {
-                  delete entry.activePromptId;
                   delete entry.activePromptOriginatorClientId;
                   if (entry.promptActive) {
                     entry.promptActive = false;
@@ -7643,7 +7507,6 @@ function createAcpSessionBridge(opts) {
                     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, {
@@ -7675,7 +7538,6 @@ function createAcpSessionBridge(opts) {
                     broadcastPromptCancelledOnce(
                       entry,
                       sessionId,
-                      pendingEntry.promptId,
                       originatorClientId,
                       "forward_failed"
                     );
@@ -7693,7 +7555,6 @@ function createAcpSessionBridge(opts) {
                   broadcastPromptCancelledOnce(
                     entry,
                     sessionId,
-                    pendingEntry.promptId,
                     originatorClientId
                   );
                   cancelPendingForSession(sessionId);
@@ -7756,7 +7617,6 @@ function createAcpSessionBridge(opts) {
             try {
               entry.events.publish({
                 type: "pending_prompt_completed",
-                promptId: pendingEntry.promptId,
                 data: {
                   sessionId,
                   promptId: pendingEntry.promptId,
@@ -7790,12 +7650,7 @@ function createAcpSessionBridge(opts) {
         entry,
         context?.clientId
       );
-      broadcastPromptCancelledOnce(
-        entry,
-        sessionId,
-        entry.activePromptId,
-        cancelOriginatorClientId
-      );
+      broadcastPromptCancelledOnce(entry, sessionId, cancelOriginatorClientId);
       cancelPendingForSession(sessionId);
       const notif = req ? { ...req, sessionId } : { sessionId };
       telemetry.metrics?.cancelled();
@@ -8676,7 +8531,7 @@ function createAcpSessionBridge(opts) {
             type: "settings_changed",
             data: {
               key: "model.name",
-              value: getCanonicalModelId(result, req.modelId)
+              value: req.modelId
             },
             ...originatorClientId ? { originatorClientId } : {}
           });
@@ -8904,7 +8759,6 @@ function createAcpSessionBridge(opts) {
       try {
         entry.events.publish({
           type: "pending_prompt_completed",
-          promptId,
           data: { sessionId, promptId, state: "removed" },
           ...target.originatorClientId ? { originatorClientId: target.originatorClientId } : {}
         });
@@ -9621,17 +9475,11 @@ function createAcpSessionBridge(opts) {
     },
     async preheat() {
       if (shuttingDown) return;
-      await telemetry.withSpan(
-        "channel.preheat",
-        { "qwen-code.daemon.bridge.operation": "channel.preheat" },
-        async () => {
-          const ci = await ensureChannel();
-          const idleMs = resolvedChannelIdleTimeoutMs();
-          if (idleMs > 0 && hasNoChannelWork(ci)) {
-            await startIdleTimer(ci);
-          }
-        }
-      );
+      const ci = await ensureChannel();
+      const idleMs = resolvedChannelIdleTimeoutMs();
+      if (idleMs > 0 && hasNoChannelWork(ci)) {
+        await startIdleTimer(ci);
+      }
     }
   };
   return bridgeApi;