@qwen-code/qwen-code 0.19.11 → 0.19.12-preview.0

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

@@ -1,12 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-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 {
   DEFAULT_RING_SIZE,
   EVENT_SCHEMA_VERSION,
@@ -16,6 +9,20 @@ import {
 import {
   normalizeCompactedReplayMaxBytes
 } from "./chunk-COH43MRJ.js";
+import {
+  CHANNEL_STARTUP_PROFILE_META_KEY,
+  CHANNEL_STARTUP_PROFILE_VERSION,
+  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,
+  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD
+} from "./chunk-QR6U5QPP.js";
+import {
+  defaultSpawnChannelFactory
+} from "./chunk-FEZXQXW2.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -36,10 +43,7 @@ import {
   SessionShellDisabledError,
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-L4Y55KIS.js";
-import {
-  defaultSpawnChannelFactory
-} from "./chunk-3AYLDB6B.js";
+} from "./chunk-X6YQWCIJ.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -48,7 +52,7 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-VFX7EZIR.js";
+} from "./chunk-TFV3XVAZ.js";
 import {
   canonicalizeWorkspace
 } from "./chunk-W7FJ3N32.js";
@@ -68,11 +72,11 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-NJOFRXTM.js";
+} from "./chunk-6TDA4EVC.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-MQOVXZAF.js";
+} from "./chunk-YN2I5I42.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -100,6 +104,23 @@ 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");
@@ -167,11 +188,29 @@ 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;
-      this.addReplaySegment([event], 0);
+      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);
     }
+    flushRecord();
     this.liveJournal = [];
     this.slots = [];
     this.toolSlotIndex.clear();
@@ -195,6 +234,10 @@ var TurnBoundaryCompactionEngine = class {
     }
     switch (updateType) {
       case "agent_message_chunk": {
+        if (hasTodoStopGuardDiscreteMeta(data?.update?._meta)) {
+          this.slots.push({ kind: "misc", event });
+          break;
+        }
         this.mergeTextSlot("text", event, data);
         break;
       }
@@ -444,6 +487,10 @@ function extractParentToolCallIdFromMeta(meta) {
   return void 0;
 }
 __name(extractParentToolCallIdFromMeta, "extractParentToolCallIdFromMeta");
+function hasTodoStopGuardDiscreteMeta(meta) {
+  return typeof meta === "object" && meta !== null && meta["qwenDiscreteMessage"] === true && meta["source"] === "todo_stop_guard";
+}
+__name(hasTodoStopGuardDiscreteMeta, "hasTodoStopGuardDiscreteMeta");
 function mergeToolCallEvent(existing, incoming) {
   const existingData = existing.data;
   const incomingData = incoming.data;
@@ -495,6 +542,108 @@ function parseSessionSource(sourceType, sourceId) {
 }
 __name(parseSessionSource, "parseSessionSource");
 
+// packages/acp-bridge/src/channel-startup-profile.ts
+init_esbuild_shims();
+var MAX_PROFILE_DURATION_MS = 6e5;
+var ATTRIBUTE_PREFIX = "qwen-code.daemon.acp_startup";
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+__name(isRecord, "isRecord");
+function readDuration(source, key) {
+  const value = source[key];
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 && value <= MAX_PROFILE_DURATION_MS ? value : void 0;
+}
+__name(readDuration, "readDuration");
+function readDurations(source, keys) {
+  if (!isRecord(source)) {
+    return { values: {}, complete: false };
+  }
+  const values = {};
+  let complete = true;
+  for (const key of keys) {
+    const value = readDuration(source, key);
+    if (value === void 0) {
+      complete = false;
+    } else {
+      values[key] = value;
+    }
+  }
+  return { values, complete };
+}
+__name(readDurations, "readDurations");
+function addDurationAttributes(attributes, group, values) {
+  for (const [key, value] of Object.entries(values)) {
+    if (group === "phase" && key === "unattributedMs") continue;
+    const attributeKey = key.replace(
+      /[A-Z]/g,
+      (letter) => `_${letter.toLowerCase()}`
+    );
+    attributes[`${ATTRIBUTE_PREFIX}.${group}.${attributeKey}`] = value;
+  }
+}
+__name(addDurationAttributes, "addDurationAttributes");
+var PHASE_KEYS = [
+  "processToProfilerReadyMs",
+  "geminiImportMs",
+  "argsParseMs",
+  "settingsLoadMs",
+  "configConstructionMs",
+  "appInitializationMs",
+  "acpImportMs",
+  "bootstrapConfigInitializationMs",
+  "transportSetupMs",
+  "initializeHandlerMs",
+  "unattributedMs"
+];
+var CONFIG_KEYS = [
+  "extensionsInitialMs",
+  "hooksMs",
+  "skillsMs",
+  "extensionsFinalMs",
+  "hierarchicalMemoryMs",
+  "toolRegistryMs",
+  "ripgrepProbeMs",
+  "toolWarmupMs",
+  "otherMs"
+];
+function getChannelStartupProfileAttributes(response, receivedAtEpochMs, initializeTimeoutMs) {
+  if (!isRecord(response) || !isRecord(response["_meta"])) {
+    return void 0;
+  }
+  const profile = response["_meta"][CHANNEL_STARTUP_PROFILE_META_KEY];
+  if (!isRecord(profile) || profile["v"] !== CHANNEL_STARTUP_PROFILE_VERSION) {
+    return void 0;
+  }
+  const phases = readDurations(profile["phases"], PHASE_KEYS);
+  const config = readDurations(profile["config"], CONFIG_KEYS);
+  const processToResponseMs = readDuration(profile, "processToResponseMs");
+  const responseBuiltAtEpochMs = profile["responseBuiltAtEpochMs"];
+  const childComplete = profile["complete"] === true;
+  const validResponseEpoch = typeof responseBuiltAtEpochMs === "number" && Number.isFinite(responseBuiltAtEpochMs) && responseBuiltAtEpochMs >= 0;
+  const effectiveComplete = childComplete && phases.complete && config.complete && processToResponseMs !== void 0 && validResponseEpoch;
+  const attributes = {
+    [`${ATTRIBUTE_PREFIX}.profile.version`]: CHANNEL_STARTUP_PROFILE_VERSION,
+    [`${ATTRIBUTE_PREFIX}.profile.complete`]: effectiveComplete
+  };
+  if (processToResponseMs !== void 0) {
+    attributes[`${ATTRIBUTE_PREFIX}.child.process_to_response_ms`] = processToResponseMs;
+  }
+  if (phases.values["unattributedMs"] !== void 0) {
+    attributes[`${ATTRIBUTE_PREFIX}.child.unattributed_ms`] = phases.values["unattributedMs"];
+  }
+  addDurationAttributes(attributes, "phase", phases.values);
+  addDurationAttributes(attributes, "config", config.values);
+  if (validResponseEpoch) {
+    const transportMs = receivedAtEpochMs - responseBuiltAtEpochMs;
+    if (Number.isFinite(transportMs) && transportMs >= 0 && transportMs <= initializeTimeoutMs) {
+      attributes[`${ATTRIBUTE_PREFIX}.response_transport_ms`] = transportMs;
+    }
+  }
+  return attributes;
+}
+__name(getChannelStartupProfileAttributes, "getChannelStartupProfileAttributes");
+
 // packages/acp-bridge/src/internal/stderrLine.ts
 init_esbuild_shims();
 function writeStderrLine(message) {
@@ -567,8 +716,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 daemon lifetime
-   * since the bridge constructs one) is enough to make the
+   * within seconds. One emit per mediator (= per bridge/runtime lifetime
+   * since each bridge constructs one) is enough to make the
    * configuration visible without spam.
    */
   unanimityBreadcrumbEmitted = false;
@@ -627,6 +776,7 @@ var MultiClientPermissionMediator = class {
       const pending = {
         requestId: record.requestId,
         sessionId: record.sessionId,
+        promptId: record.promptId,
         policy,
         originatorClientId: record.originatorClientId,
         allowedOptionIds: record.allowedOptionIds,
@@ -700,6 +850,7 @@ 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,
@@ -865,6 +1016,7 @@ var MultiClientPermissionMediator = class {
     );
     this.safeEmit(pending.sessionId, {
       type: "permission_partial_vote",
+      ...pending.promptId ? { promptId: pending.promptId } : {},
       data: {
         requestId: pending.requestId,
         sessionId: pending.sessionId,
@@ -938,6 +1090,7 @@ var MultiClientPermissionMediator = class {
     );
     this.safeEmit(pending.sessionId, {
       type: "permission_forbidden",
+      ...pending.promptId ? { promptId: pending.promptId } : {},
       data: {
         requestId: pending.requestId,
         sessionId: pending.sessionId,
@@ -1060,6 +1213,7 @@ 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),
@@ -1083,6 +1237,7 @@ var MultiClientPermissionMediator = class {
     this.rememberResolved({
       requestId: pending.requestId,
       sessionId: pending.sessionId,
+      promptId: pending.promptId,
       resolution,
       resolverClientId
     });
@@ -1181,6 +1336,7 @@ var MultiClientPermissionMediator = class {
     return {
       requestId: pending.requestId,
       sessionId: pending.sessionId,
+      ...pending.promptId ? { promptId: pending.promptId } : {},
       originatorClientId: pending.originatorClientId,
       allowedOptionIds: pending.allowedOptionIds,
       issuedAtMs: pending.issuedAtMs
@@ -1200,10 +1356,10 @@ function isFsErrorShape(err) {
   return err instanceof Error && err.name === "FsError" && typeof err.kind === "string";
 }
 __name(isFsErrorShape, "isFsErrorShape");
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-__name(isRecord, "isRecord");
+__name(isRecord2, "isRecord");
 function pendingInteractionOptions(options) {
   return options.map((option) => ({
     optionId: String(option.optionId ?? ""),
@@ -1214,21 +1370,21 @@ function pendingInteractionOptions(options) {
 __name(pendingInteractionOptions, "pendingInteractionOptions");
 function pendingInteractionFromRequest(requestId, params) {
   const toolCall = params.toolCall;
-  const meta = isRecord(toolCall["_meta"]) ? toolCall["_meta"] : void 0;
+  const meta = isRecord2(toolCall["_meta"]) ? toolCall["_meta"] : void 0;
   const rawInput = toolCall["rawInput"];
   const options = pendingInteractionOptions(
     Array.isArray(params.options) ? params.options : []
   );
   const isUserQuestion = meta?.["qwenInteractionKind"] === "user_question";
   if (isUserQuestion) {
-    const rawQuestions = Array.isArray(meta?.["qwenQuestions"]) ? meta["qwenQuestions"] : isRecord(rawInput) && Array.isArray(rawInput["questions"]) ? rawInput["questions"] : [];
+    const rawQuestions = Array.isArray(meta?.["qwenQuestions"]) ? meta["qwenQuestions"] : isRecord2(rawInput) && Array.isArray(rawInput["questions"]) ? rawInput["questions"] : [];
     return {
       requestId,
       kind: "user_question",
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...typeof toolCall["title"] === "string" ? { title: toolCall["title"] } : {},
       questions: rawQuestions.flatMap(
-        (question, index) => isRecord(question) ? [{ ...question, answerKey: String(index) }] : []
+        (question, index) => isRecord2(question) ? [{ ...question, answerKey: String(index) }] : []
       ),
       options
     };
@@ -1278,7 +1434,7 @@ function extractCappedArtifactInputs(rawArtifacts, limit, sessionId, source, toI
   const artifacts = [];
   for (let index = 0; index < rawArtifacts.length; index++) {
     const artifact = rawArtifacts[index];
-    if (!isRecord(artifact)) {
+    if (!isRecord2(artifact)) {
       writeStderrLine(
         `[artifacts] session=${sessionId} action=dropped reason=malformed source=${source} index=${index}`
       );
@@ -1452,6 +1608,7 @@ var BridgeClient = class {
     }
     const published = entry.events.publish({
       type: "permission_request",
+      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: {
         requestId,
         sessionId: entry.sessionId,
@@ -1479,6 +1636,7 @@ var BridgeClient = class {
       const record = {
         requestId,
         sessionId: entry.sessionId,
+        promptId: entry.activePromptId,
         originatorClientId: entry.activePromptOriginatorClientId,
         allowedOptionIds,
         issuedAtMs: Date.now()
@@ -1512,13 +1670,21 @@ var BridgeClient = class {
     } catch {
     }
     if (entry && prepared.artifacts.length > 0) {
-      await this.upsertAndPublishArtifacts(entry, prepared.artifacts, {
-        trustedPublisher: prepared.trustedPublisher
-      });
+      await this.upsertAndPublishArtifacts(
+        entry,
+        prepared.artifacts,
+        {
+          trustedPublisher: prepared.trustedPublisher
+        },
+        prepared.turn
+      );
     }
   }
   prepareSessionUpdateFrames(params, entry) {
-    const originator = entry?.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {};
+    const turn = {
+      ...entry?.activePromptId ? { promptId: entry.activePromptId } : {},
+      ...entry?.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
+    };
     const frames = [];
     const a2ui = extractA2uiToolUpdate(params);
     if (a2ui) {
@@ -1537,7 +1703,7 @@ var BridgeClient = class {
               _meta: { serverTimestamp: Date.now(), source: "a2ui-bridge" }
             }
           },
-          ...originator
+          ...turn
         });
       }
       params = a2ui.sanitizedParams;
@@ -1555,13 +1721,14 @@ var BridgeClient = class {
     frames.push({
       type: "session_update",
       data: publishParams,
-      ...originator,
+      ...turn,
       ...serverTimestamp !== void 0 ? { _meta: { serverTimestamp } } : {}
     });
     return {
       frames,
       artifacts,
-      trustedPublisher: isTrustedArtifactToolUpdate(params, updateMeta)
+      trustedPublisher: isTrustedArtifactToolUpdate(params, updateMeta),
+      turn
     };
   }
   async seedSessionUpdates(entry, updates, options = {}) {
@@ -1576,15 +1743,21 @@ var BridgeClient = class {
       if (options.ingestArtifacts !== false && prepared.artifacts.length > 0) {
         artifactBatches.push({
           artifacts: prepared.artifacts,
-          trustedPublisher: prepared.trustedPublisher
+          trustedPublisher: prepared.trustedPublisher,
+          turn: prepared.turn
         });
       }
     }
     entry.events.seedReplayEvents(frames);
     for (const batch of artifactBatches) {
-      await this.upsertAndPublishArtifacts(entry, batch.artifacts, {
-        trustedPublisher: batch.trustedPublisher
-      });
+      await this.upsertAndPublishArtifacts(
+        entry,
+        batch.artifacts,
+        {
+          trustedPublisher: batch.trustedPublisher
+        },
+        batch.turn
+      );
     }
   }
   /**
@@ -1692,11 +1865,17 @@ var BridgeClient = class {
       throw RequestError.methodNotFound(method);
     }
     const sessionId = typeof params["sessionId"] === "string" ? params["sessionId"] : void 0;
-    if (!sessionId) return { messages: [] };
+    if (!sessionId) return { messages: [], hasQueuedPrompt: false };
     const entry = this.resolveEntry(sessionId);
-    if (!entry) return { messages: [] };
+    if (!entry) return { messages: [], hasQueuedPrompt: false };
     const drained = entry.midTurnMessageQueue.splice(0);
     const messages = drained.map((item) => item.text);
+    const hasQueuedPrompt = entry.pendingPromptList.some(
+      (prompt) => prompt.state === "queued" && !prompt.abortController.signal.aborted
+    );
+    if (params["todoStopGuardWatchQueuedPrompt"] === true) {
+      entry.todoStopGuardAwaitingQueuedPrompt = hasQueuedPrompt;
+    }
     if (drained.length > 0) {
       const byOriginator = /* @__PURE__ */ new Map();
       for (const item of drained) {
@@ -1707,6 +1886,7 @@ 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 } : {}
         });
@@ -1715,7 +1895,7 @@ var BridgeClient = class {
         );
       }
     }
-    return { messages };
+    return { messages, hasQueuedPrompt };
   }
   /**
    * Reverse tool channel (issue #5626, Phase 2) — answer the child's
@@ -1958,7 +2138,7 @@ var BridgeClient = class {
       const { v: _v2, sessionId: _sid2, ...rest2 } = params;
       void _v2;
       void _sid2;
-      this.publishExtNotification(sessionId2, "terminal_sequence", rest2);
+      this.publishExtNotification(sessionId2, "terminal_sequence", rest2, true);
       return;
     }
     if (method === "qwen/notify/session/artifact-event") {
@@ -2021,12 +2201,16 @@ var BridgeClient = class {
         toolCallId
       })
     );
-    await this.upsertAndPublishArtifacts(entry, artifacts);
+    const turn = {
+      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
+      ...entry.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
+    };
+    await this.upsertAndPublishArtifacts(entry, artifacts, void 0, turn);
   }
-  async upsertAndPublishArtifacts(entry, artifacts, options) {
+  async upsertAndPublishArtifacts(entry, artifacts, options, turn = {}) {
     try {
       const result = await entry.artifacts.upsertMany(artifacts, options);
-      this.publishArtifactChanges(entry, result.changes);
+      this.publishArtifactChanges(entry, result.changes, turn);
     } catch (error) {
       writeStderrLine(
         `[artifacts] session=${entry.sessionId} action=dropped reason=${JSON.stringify(
@@ -2035,20 +2219,21 @@ var BridgeClient = class {
       );
     }
   }
-  publishArtifactChanges(entry, changes) {
+  publishArtifactChanges(entry, changes, turn) {
     for (const change of changes) {
       entry.events.publish({
         type: "artifact_changed",
         data: { sessionId: entry.sessionId, change },
-        ...entry.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
+        ...turn
       });
     }
   }
-  publishExtNotification(sessionId, type, data) {
+  publishExtNotification(sessionId, type, data, turnScoped = false) {
     const entry = this.resolveEntry(sessionId);
     const frame = {
       type,
       data,
+      ...turnScoped && entry?.activePromptId ? { promptId: entry.activePromptId } : {},
       ...entry?.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
     };
     if (entry) {
@@ -2093,6 +2278,7 @@ var BridgeClient = class {
     } else {
       entry.events.publish({
         type: "model_switched",
+        ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
         data: { sessionId, modelId: currentModelId },
         ...entry.activePromptOriginatorClientId ? { originatorClientId: entry.activePromptOriginatorClientId } : {}
       });
@@ -2146,6 +2332,7 @@ var BridgeClient = class {
     } else {
       entry.events.publish({
         type: "approval_mode_changed",
+        ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
         data: {
           sessionId,
           previous: "default",
@@ -2163,6 +2350,7 @@ var BridgeClient = class {
     }
     entry.events.publish({
       type: "session_update",
+      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: {
         sessionId,
         update: {
@@ -4795,12 +4983,20 @@ var KNOWN_SESSION_UPDATE_TYPES = /* @__PURE__ */ new Set([
   "usage_update"
 ]);
 var MAX_BULK_REPLAY_UPDATES = 1e4;
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-__name(isRecord2, "isRecord");
+__name(isRecord3, "isRecord");
+function getCanonicalModelId(response, fallback) {
+  if (!isRecord3(response) || !isRecord3(response["_meta"])) return fallback;
+  const modelSwitch = response["_meta"]["qwenModelSwitch"];
+  if (!isRecord3(modelSwitch)) return fallback;
+  const modelId = modelSwitch["modelId"];
+  return typeof modelId === "string" ? modelId : fallback;
+}
+__name(getCanonicalModelId, "getCanonicalModelId");
 function isBulkReplayUpdate(value) {
-  if (!isRecord2(value)) return false;
+  if (!isRecord3(value)) return false;
   const updateType = value["sessionUpdate"];
   return typeof updateType === "string" && KNOWN_SESSION_UPDATE_TYPES.has(updateType);
 }
@@ -4812,11 +5008,11 @@ function describeLoadReplayValue(value) {
 }
 __name(describeLoadReplayValue, "describeLoadReplayValue");
 function extractLoadReplayResponse(state) {
-  const meta = isRecord2(state._meta) ? state._meta : void 0;
+  const meta = isRecord3(state._meta) ? state._meta : void 0;
   const replay = meta?.[LOAD_REPLAY_META_KEY];
   if (replay === void 0) return { state, updates: [] };
-  if (!isRecord2(replay) || replay["v"] !== LOAD_REPLAY_VERSION) {
-    const version = isRecord2(replay) ? replay["v"] : void 0;
+  if (!isRecord3(replay) || replay["v"] !== LOAD_REPLAY_VERSION) {
+    const version = isRecord3(replay) ? replay["v"] : void 0;
     throw new Error(
       `Invalid qwen.session.loadReplay payload (type=${describeLoadReplayValue(replay)}, version=${JSON.stringify(version)})`
     );
@@ -4844,12 +5040,18 @@ 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)
   );
   if (invalidUpdateIndex !== -1) {
     const invalidUpdate = rawUpdates[invalidUpdateIndex];
-    const discriminator = isRecord2(invalidUpdate) ? invalidUpdate["sessionUpdate"] : void 0;
+    const discriminator = isRecord3(invalidUpdate) ? invalidUpdate["sessionUpdate"] : void 0;
     throw new Error(
       `Invalid qwen.session.loadReplay update at index ${invalidUpdateIndex} (version=${LOAD_REPLAY_VERSION}, count=${rawUpdates.length}, sessionUpdate=${JSON.stringify(discriminator)})`
     );
@@ -4866,7 +5068,8 @@ function extractLoadReplayResponse(state) {
     state: cleanState,
     updates: rawUpdates,
     ...partial === true ? { partial: true } : {},
-    ...typeof replayError === "string" ? { replayError } : {}
+    ...typeof replayError === "string" ? { replayError } : {},
+    ...hasMore === true ? { hasMore: true } : {}
   };
 }
 __name(extractLoadReplayResponse, "extractLoadReplayResponse");
@@ -4990,7 +5193,7 @@ function pickUserInputEchoMeta(meta) {
   return Array.isArray(inputAnnotations) ? { inputAnnotations } : {};
 }
 __name(pickUserInputEchoMeta, "pickUserInputEchoMeta");
-function echoPromptToSessionBus(entry, req, originatorClientId) {
+function echoPromptToSessionBus(entry, req, promptId, originatorClientId) {
   const prompt = req.prompt;
   if (!Array.isArray(prompt) || prompt.length === 0) return;
   const serverTimestamp = Date.now();
@@ -5001,6 +5204,7 @@ function echoPromptToSessionBus(entry, req, originatorClientId) {
     try {
       entry.events.publish({
         type: "session_update",
+        promptId,
         data: {
           sessionId: req.sessionId,
           update: {
@@ -5025,10 +5229,11 @@ function echoPromptToSessionBus(entry, req, originatorClientId) {
   }
 }
 __name(echoPromptToSessionBus, "echoPromptToSessionBus");
-function broadcastPromptCancelled(entry, sessionId, originatorClientId, reason) {
+function broadcastPromptCancelled(entry, sessionId, promptId, originatorClientId, reason) {
   try {
     entry.events.publish({
       type: "prompt_cancelled",
+      ...promptId ? { promptId } : {},
       data: { sessionId, ...reason ? { reason } : {} },
       ...originatorClientId ? { originatorClientId } : {}
     });
@@ -5036,7 +5241,7 @@ function broadcastPromptCancelled(entry, sessionId, originatorClientId, reason)
   }
 }
 __name(broadcastPromptCancelled, "broadcastPromptCancelled");
-function broadcastPromptCancelledOnce(entry, sessionId, originatorClientId, reason) {
+function broadcastPromptCancelledOnce(entry, sessionId, promptId, originatorClientId, reason) {
   if (entry.cancelBroadcast) {
     writeStderrLine(
       `broadcastPromptCancelledOnce: suppressed duplicate cancel for session ${sessionId} (latch already set)`
@@ -5044,13 +5249,20 @@ function broadcastPromptCancelledOnce(entry, sessionId, originatorClientId, reas
     return;
   }
   entry.cancelBroadcast = true;
-  broadcastPromptCancelled(entry, sessionId, originatorClientId, reason);
+  broadcastPromptCancelled(
+    entry,
+    sessionId,
+    promptId,
+    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",
@@ -5120,6 +5332,7 @@ function broadcastTurnError(entry, sessionId, err, promptId, originatorClientId)
   try {
     entry.events.publish({
       type: "turn_error",
+      ...promptId ? { promptId } : {},
       data: {
         sessionId,
         message,
@@ -5555,11 +5768,13 @@ 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.channel.reused": false,
+          "qwen-code.daemon.acp_channel.id": acpChannelId
         },
         async () => await channelFactory(boundWorkspace, childEnvOverrides)
       );
@@ -5645,6 +5860,7 @@ function createAcpSessionBridge(opts) {
       );
       const connection = new ClientSideConnection(() => client, channel.stream);
       const info = {
+        id: acpChannelId,
         channel,
         connection,
         client,
@@ -5734,19 +5950,39 @@ function createAcpSessionBridge(opts) {
         await telemetry.withSpan(
           "channel.initialize",
           {
-            "qwen-code.daemon.bridge.operation": "channel.initialize"
+            "qwen-code.daemon.bridge.operation": "channel.initialize",
+            "qwen-code.daemon.acp_channel.id": acpChannelId
           },
-          async () => await withTimeout(
-            connection.initialize({
-              protocolVersion: PROTOCOL_VERSION,
-              clientCapabilities: {
-                fs: { readTextFile: true, writeTextFile: true }
-              },
-              clientInfo: { name: "qwen-serve-bridge", version: "0" }
-            }),
-            initTimeoutMs,
-            "initialize"
-          )
+          async () => {
+            const response = await withTimeout(
+              connection.initialize({
+                protocolVersion: PROTOCOL_VERSION,
+                _meta: {
+                  [CHANNEL_STARTUP_PROFILE_META_KEY]: {
+                    v: CHANNEL_STARTUP_PROFILE_VERSION
+                  }
+                },
+                clientCapabilities: {
+                  fs: { readTextFile: true, writeTextFile: true }
+                },
+                clientInfo: { name: "qwen-serve-bridge", version: "0" }
+              }),
+              initTimeoutMs,
+              "initialize"
+            );
+            try {
+              const attributes = getChannelStartupProfileAttributes(
+                response,
+                Date.now(),
+                initTimeoutMs
+              );
+              if (attributes && telemetry.setActiveSpanAttributes) {
+                telemetry.setActiveSpanAttributes(attributes);
+              }
+            } catch {
+            }
+            return response;
+          }
         );
       } catch (err) {
         info.isDying = true;
@@ -5774,7 +6010,15 @@ function createAcpSessionBridge(opts) {
   }
   __name(ensureChannel, "ensureChannel");
   async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId) {
-    const ci = await ensureChannel();
+    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
+    );
     ci.sessionSpawnsInFlight++;
     let sessionRegistered = false;
     let sessionRemovedDuringInitialization = false;
@@ -5786,16 +6030,27 @@ function createAcpSessionBridge(opts) {
           "session.new",
           {
             "qwen-code.daemon.bridge.operation": "session.new",
-            "qwen-code.daemon.session_scope": effectiveScope
+            "qwen-code.daemon.session_scope": effectiveScope,
+            "qwen-code.daemon.channel.path": channelPath,
+            "qwen-code.daemon.acp_channel.id": ci.id
           },
-          async () => await withTimeout(
-            ci.connection.newSession({
-              cwd: boundWorkspace,
-              mcpServers: []
-            }),
-            initTimeoutMs,
-            "newSession"
-          )
+          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;
+          }
         );
       } catch (err) {
         if (hasNoChannelWork(ci, { ignoreCurrentSessionSpawn: true })) {
@@ -5959,7 +6214,7 @@ function createAcpSessionBridge(opts) {
       entry.modelRoundtripInFlight = true;
       let succeeded = false;
       try {
-        await Promise.race([
+        const result = await Promise.race([
           withTimeout(
             conn.unstable_setSessionModel({
               sessionId: entry.sessionId,
@@ -5975,7 +6230,7 @@ function createAcpSessionBridge(opts) {
           type: "settings_changed",
           data: {
             key: "model.name",
-            value: modelId
+            value: getCanonicalModelId(result, modelId)
           },
           ...originatorClientId ? { originatorClientId } : {}
         });
@@ -6179,7 +6434,7 @@ function createAcpSessionBridge(opts) {
   const cacheWorkspaceMcpDetails = /* @__PURE__ */ __name(async (info, status) => {
     if (!Array.isArray(status.servers)) return;
     const serverNames = status.servers.flatMap(
-      (server) => isRecord2(server) && typeof server["name"] === "string" && server["mcpStatus"] === "connected" ? [server["name"]] : []
+      (server) => isRecord3(server) && typeof server["name"] === "string" && server["mcpStatus"] === "connected" ? [server["name"]] : []
     );
     const cacheDetail = /* @__PURE__ */ __name(async (serverName, method, cache) => {
       try {
@@ -6457,6 +6712,7 @@ function createAcpSessionBridge(opts) {
     entry.modelPublishGeneration++;
     entry.events.publish({
       type: "model_switched",
+      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: { sessionId: entry.sessionId, modelId },
       ...originatorClientId ? { originatorClientId } : {}
     });
@@ -6466,6 +6722,7 @@ function createAcpSessionBridge(opts) {
     entry.approvalModePublishGeneration++;
     entry.events.publish({
       type: "approval_mode_changed",
+      ...entry.activePromptId ? { promptId: entry.activePromptId } : {},
       data: {
         sessionId: entry.sessionId,
         previous: payload.previous,
@@ -6714,7 +6971,8 @@ function createAcpSessionBridge(opts) {
         compactedReplay: snapshot.compactedTurns,
         liveJournal: snapshot.liveJournal,
         lastEventId: snapshot.lastEventId,
-        ...replayStatus
+        ...replayStatus,
+        ...entry.restoreHistoryHasMore === true ? { historyHasMore: true } : {}
       };
     }
     return { lastEventId: snapshot.lastEventId, ...replayStatus };
@@ -6724,7 +6982,7 @@ function createAcpSessionBridge(opts) {
     const warnings = [];
     const snapshot = normalizeSnapshotPayload(candidate, warnings);
     if (!snapshot) return void 0;
-    const snapshotWarnings = isRecord2(candidate) && Array.isArray(candidate["warnings"]) ? candidate["warnings"].filter(
+    const snapshotWarnings = isRecord3(candidate) && Array.isArray(candidate["warnings"]) ? candidate["warnings"].filter(
       (warning) => typeof warning === "string" && warning.length <= 1e3
     ).slice(-500) : [];
     return {
@@ -6852,6 +7110,7 @@ function createAcpSessionBridge(opts) {
       let replayUpdates = [];
       let replayPartial;
       let replayError;
+      let replayHasMore;
       try {
         if (action === "load") {
           state = await Promise.race([
@@ -6867,7 +7126,10 @@ function createAcpSessionBridge(opts) {
                 mcpServers: [],
                 ...historyReplay === "response" ? {
                   _meta: {
-                    [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE
+                    [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE,
+                    ...req.historyPageSize !== void 0 ? {
+                      [LOAD_REPLAY_PAGE_SIZE_META_KEY]: req.historyPageSize
+                    } : {}
                   }
                 } : {}
               }),
@@ -6896,6 +7158,7 @@ function createAcpSessionBridge(opts) {
           replayUpdates = extracted.updates;
           replayPartial = extracted.partial;
           replayError = extracted.replayError;
+          replayHasMore = extracted.hasMore === true ? true : void 0;
         }
       } catch (err) {
         restoreEvents.close();
@@ -6980,6 +7243,9 @@ 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
@@ -6998,6 +7264,9 @@ 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);
@@ -7399,8 +7668,27 @@ function createAcpSessionBridge(opts) {
       };
       entry.pendingPromptList.push(pendingEntry);
       if (isQueued) {
+        pendingAbort.signal.addEventListener(
+          "abort",
+          () => {
+            if (pendingEntry.state !== "queued") return;
+            if (!entry.todoStopGuardAwaitingQueuedPrompt) return;
+            const hasAnotherQueuedPrompt = entry.pendingPromptList.some(
+              (candidate) => candidate !== pendingEntry && candidate.state === "queued" && !candidate.abortController.signal.aborted
+            );
+            if (hasAnotherQueuedPrompt) return;
+            entry.todoStopGuardAwaitingQueuedPrompt = false;
+            void entry.connection.extMethod(TODO_STOP_GUARD_QUEUE_RELEASE_METHOD, { sessionId }).catch((error) => {
+              writeStderrLine(
+                `qwen serve: Todo Stop Guard queued-prompt release failed for ${JSON.stringify(sessionId)}: ${error instanceof Error ? error.message : String(error)}`
+              );
+            });
+          },
+          { once: true }
+        );
         entry.events.publish({
           type: "pending_prompt_added",
+          promptId: pendingEntry.promptId,
           data: {
             sessionId,
             promptId: pendingEntry.promptId,
@@ -7418,9 +7706,11 @@ function createAcpSessionBridge(opts) {
             throw new DOMException("Prompt aborted", "AbortError");
           }
           if (pendingEntry.state === "queued") {
+            entry.todoStopGuardAwaitingQueuedPrompt = false;
             pendingEntry.state = "running";
             entry.events.publish({
               type: "pending_prompt_started",
+              promptId: pendingEntry.promptId,
               data: {
                 sessionId,
                 promptId: pendingEntry.promptId,
@@ -7473,6 +7763,7 @@ function createAcpSessionBridge(opts) {
                   return copy;
                 })();
                 entry.promptActive = true;
+                entry.activePromptId = pendingEntry.promptId;
                 delete entry.turnError;
                 activePromptCounter++;
                 entry.sessionLastSeenAt = Date.now();
@@ -7488,10 +7779,12 @@ function createAcpSessionBridge(opts) {
                     echoPromptToSessionBus(
                       entry,
                       promptRequest,
+                      pendingEntry.promptId,
                       originatorClientId
                     );
                   }
                 } catch (echoErr) {
+                  delete entry.activePromptId;
                   delete entry.activePromptOriginatorClientId;
                   if (entry.promptActive) {
                     entry.promptActive = false;
@@ -7507,6 +7800,7 @@ 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, {
@@ -7538,6 +7832,7 @@ function createAcpSessionBridge(opts) {
                     broadcastPromptCancelledOnce(
                       entry,
                       sessionId,
+                      pendingEntry.promptId,
                       originatorClientId,
                       "forward_failed"
                     );
@@ -7555,6 +7850,7 @@ function createAcpSessionBridge(opts) {
                   broadcastPromptCancelledOnce(
                     entry,
                     sessionId,
+                    pendingEntry.promptId,
                     originatorClientId
                   );
                   cancelPendingForSession(sessionId);
@@ -7617,6 +7913,7 @@ function createAcpSessionBridge(opts) {
             try {
               entry.events.publish({
                 type: "pending_prompt_completed",
+                promptId: pendingEntry.promptId,
                 data: {
                   sessionId,
                   promptId: pendingEntry.promptId,
@@ -7650,7 +7947,12 @@ function createAcpSessionBridge(opts) {
         entry,
         context?.clientId
       );
-      broadcastPromptCancelledOnce(entry, sessionId, cancelOriginatorClientId);
+      broadcastPromptCancelledOnce(
+        entry,
+        sessionId,
+        entry.activePromptId,
+        cancelOriginatorClientId
+      );
       cancelPendingForSession(sessionId);
       const notif = req ? { ...req, sessionId } : { sessionId };
       telemetry.metrics?.cancelled();
@@ -8385,6 +8687,12 @@ function createAcpSessionBridge(opts) {
         SERVE_CONTROL_EXT_METHODS.sessionGoalClear
       );
     },
+    async getSessionGoal(sessionId) {
+      return requestSessionStatus(
+        sessionId,
+        SERVE_CONTROL_EXT_METHODS.sessionGoalGet
+      );
+    },
     async continueSession(sessionId, context) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
@@ -8531,7 +8839,7 @@ function createAcpSessionBridge(opts) {
             type: "settings_changed",
             data: {
               key: "model.name",
-              value: req.modelId
+              value: getCanonicalModelId(result, req.modelId)
             },
             ...originatorClientId ? { originatorClientId } : {}
           });
@@ -8759,6 +9067,7 @@ function createAcpSessionBridge(opts) {
       try {
         entry.events.publish({
           type: "pending_prompt_completed",
+          promptId,
           data: { sessionId, promptId, state: "removed" },
           ...target.originatorClientId ? { originatorClientId: target.originatorClientId } : {}
         });
@@ -9475,11 +9784,17 @@ function createAcpSessionBridge(opts) {
     },
     async preheat() {
       if (shuttingDown) return;
-      const ci = await ensureChannel();
-      const idleMs = resolvedChannelIdleTimeoutMs();
-      if (idleMs > 0 && hasNoChannelWork(ci)) {
-        await startIdleTimer(ci);
-      }
+      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);
+          }
+        }
+      );
     }
   };
   return bridgeApi;