@qwen-code/qwen-code 0.23.3 → 0.23.4-dev.codemode-responses.20260914.87437db784

package/chunks/{chunk-3KQBQ6FM.js → chunk-63WKMKVD.js}

@@ -20,7 +20,7 @@ import {
 import {
   channelFactoryForwardsChildEnv,
   defaultSpawnChannelFactory
-} from "./chunk-IUVIBDKU.js";
+} from "./chunk-2YMRRI2C.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -30,7 +30,7 @@ import {
   SessionRestoreTimeoutError,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-HGEUHUEV.js";
+} from "./chunk-54B2LTKP.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_CLOSE_TIMEOUT_MS,
@@ -53,6 +53,7 @@ import {
   DAEMON_PERMISSION_CANCEL_REASON_META_KEY,
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   DAEMON_RESTORE_ASK_USER_QUESTION_META_KEY,
+  DAEMON_SUBMITTED_PROMPT_META_KEY,
   DAEMON_SUPPRESS_RESTORE_ASK_USER_QUESTION_META_KEY,
   DAEMON_SUPPRESS_WORKTREE_CONTEXT_RESTORE_META_KEY,
   LOAD_REPLAY_BULK_MODE,
@@ -68,6 +69,8 @@ import {
   REQUESTED_SESSION_ID_META_KEY,
   SESSION_INITIALIZATION_DEADLINE_META_KEY,
   SESSION_INITIALIZATION_TIMEOUT_ERROR_KIND,
+  SESSION_MODEL_PERSIST_DEFAULT_META_KEY,
+  SUBMITTED_PROMPT_META_KEY,
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
   TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
   WORKTREE_MCP_DEFER_META_KEY,
@@ -75,7 +78,7 @@ import {
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt,
   sessionCloseDrainBudgetMs
-} from "./chunk-PSPAM24S.js";
+} from "./chunk-TBSCTWKF.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -101,6 +104,10 @@ import {
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
 } from "./chunk-FAWTMDX7.js";
+import {
+  canonicalizeWorkspace,
+  translateAndCheckAbsoluteWorkspacePath
+} from "./chunk-6PLDPT2C.js";
 import {
   CHANNEL_DELIVERY_ERROR_CODES,
   LIVE_TASK_TOOL_NAMES,
@@ -118,10 +125,6 @@ import {
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IJOS26LH.js";
-import {
-  canonicalizeWorkspace,
-  translateAndCheckAbsoluteWorkspacePath
-} from "./chunk-6PLDPT2C.js";
 import {
   PRIVATE_CONVERSATIONS_RUNTIME_ENABLE,
   PRIVATE_CONVERSATIONS_RUNTIME_ENV
@@ -136,7 +139,7 @@ import {
   isOfficeDocumentExtension,
   isRecordableDerivedChild,
   pathHasSkippedDirectoryComponent
-} from "./chunk-ZKYR7QS4.js";
+} from "./chunk-EDB556X7.js";
 import {
   SESSION_PR_LIST_LIMIT,
   SESSION_PR_URL_MAX_LENGTH,
@@ -148,24 +151,31 @@ import {
   canonicalSessionPrUrl,
   normalizeTurnResultError,
   toSessionPrInfo
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-CFSBWJBB.js";
 import {
   isUnverifiableIdentityError,
   openNoFollow
-} from "./chunk-6HUXPLB5.js";
+} from "./chunk-HEOH7JZY.js";
 import {
   PUBLISHED_CONTENT_SHA256_METADATA_KEY,
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   WORKSPACE_CONTENT_MTIME_MS_METADATA_KEY,
   WORKSPACE_CONTENT_SHA256_METADATA_KEY,
   WORKSPACE_CONTENT_SIZE_BYTES_METADATA_KEY,
+  deleteArtifactSnapshot,
+  getWebPreviewSnapshotId,
   isAdoptableContentFingerprintKey,
   isPrototypeMetadataKey,
   isReservedWorkspaceMetadataKey,
   metadataBudgetBytes,
   normalizeSnapshotPayload,
+  retainArtifactSnapshot,
   stableSessionArtifactId
-} from "./chunk-E4UEO3XM.js";
+} from "./chunk-ME4JBHSB.js";
+import {
+  MAX_CRON_TASK_ROUTING_ID_LENGTH,
+  isValidCronTaskRoutingId
+} from "./chunk-3LMDSCLU.js";
 import {
   SessionSourceError,
   validateSessionSourceInput
@@ -176,7 +186,7 @@ import {
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-ZW2EUO2A.js";
+} from "./chunk-L6DIANLD.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
@@ -184,7 +194,10 @@ import {
 } from "./chunk-5ETULJLP.js";
 import {
   getSpecificMimeType
-} from "./chunk-J6MB5ZHZ.js";
+} from "./chunk-QZW6WRB7.js";
+import {
+  Storage
+} from "./chunk-ZAFYHRVY.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -4062,10 +4075,24 @@ var BridgeClient = class {
       );
     }
     const model = params["model"];
+    const groupId = params["groupId"];
+    if (model !== void 0 && !isValidCronTaskRoutingId(model)) {
+      throw RequestError.invalidParams(
+        void 0,
+        `\`model\` must be a non-empty string of at most ${MAX_CRON_TASK_ROUTING_ID_LENGTH} characters without control characters`
+      );
+    }
+    if (groupId !== void 0 && (!isScheduledTaskRunSource(source) || !isValidCronTaskRoutingId(groupId))) {
+      throw RequestError.invalidParams(
+        void 0,
+        `\`groupId\` must be a non-empty string of at most ${MAX_CRON_TASK_ROUTING_ID_LENGTH} characters without control characters and is only supported for scheduled-task runs`
+      );
+    }
     const result = await this.onCreateSubSession({
       prompt,
       completion,
-      ...typeof model === "string" && model.length > 0 && model.length <= 128 ? { model } : {},
+      ...typeof model === "string" ? { model } : {},
+      ...typeof groupId === "string" ? { groupId } : {},
       ...typeof name === "string" && name.length > 0 ? { name } : {},
       ...source,
       callerSessionId
@@ -5263,6 +5290,7 @@ var SessionArtifactStore = class {
   }
   sessionId;
   workspaceCwd;
+  runtimeBaseDir;
   maxArtifacts;
   persistence;
   artifacts = /* @__PURE__ */ new Map();
@@ -5277,11 +5305,14 @@ var SessionArtifactStore = class {
   tombstonedClientIds = /* @__PURE__ */ new Map();
   stickyEphemeralIds = /* @__PURE__ */ new Set();
   markerArtifacts = /* @__PURE__ */ new Map();
+  // Failed removals or partial restores can leave ownership without a live record.
+  pendingSnapshotRemovals = /* @__PURE__ */ new Set();
   lastRestoreWarnings = [];
   lastRestoreWarningDetails = [];
   constructor(options) {
     this.sessionId = options.sessionId;
     this.workspaceCwd = options.workspaceCwd;
+    this.runtimeBaseDir = options.runtimeBaseDir ?? Storage.getRuntimeBaseDir();
     this.maxArtifacts = options.maxArtifacts ?? 200;
     this.persistence = options.persistence;
   }
@@ -5369,6 +5400,11 @@ var SessionArtifactStore = class {
         }
       }
       const changes = [];
+      let rollbackArtifacts = [];
+      const rollback = /* @__PURE__ */ __name(async () => {
+        this.restoreState(before);
+        await this.reclaimSnapshotFiles(rollbackArtifacts);
+      }, "rollback");
       try {
         for (const normalized of coalesceByIdentity(normalizedResults)) {
           const artifact = this.applyStickyEphemeralOverride(normalized);
@@ -5439,6 +5475,23 @@ var SessionArtifactStore = class {
         const createdIds = new Set(
           changes.filter((change) => change.action === "created").map((change) => change.artifactId)
         );
+        rollbackArtifacts = changes.flatMap(
+          (change) => change.action !== "removed" && change.artifact ? [change.artifact] : []
+        );
+        for (const artifact of rollbackArtifacts) {
+          try {
+            await retainArtifactSnapshot(
+              artifact,
+              this.runtimeBaseDir,
+              this.sessionId
+            );
+          } catch (error) {
+            if (validationStrict || persistenceStrict) throw error;
+            warnings.push(
+              `artifact ${artifact.id} kept without retaining its snapshot: ${error instanceof Error ? error.message : String(error)}`
+            );
+          }
+        }
         const overflowRemoved = await this.evictOverflow(
           createdIds,
           changes,
@@ -5458,7 +5511,7 @@ var SessionArtifactStore = class {
           try {
             persistenceWarnings = await this.persistChanges(changes, true);
           } catch (error) {
-            this.restoreState(before);
+            await rollback();
             const artifactIds = changes.filter(shouldCommitBeforeDurablePersistence).map((change) => change.artifactId);
             const warning = "artifact durable removal not persisted; live changes rolled back";
             writeStderrLine(
@@ -5498,9 +5551,15 @@ var SessionArtifactStore = class {
           )
         );
         stripDurableTombstoneMarkers(changes);
+        await this.reclaimSnapshotFiles([
+          ...changes.filter(
+            (change) => change.action === "removed" && change.reason === "eviction"
+          ).map((change) => change.artifact),
+          ...overflowRemoved.droppedArtifacts
+        ]);
       } catch (error) {
         if (validationStrict || persistenceStrict || error instanceof SessionArtifactAuthorizationError) {
-          this.restoreState(before);
+          await rollback();
         }
         throw error;
       }
@@ -5595,6 +5654,7 @@ var SessionArtifactStore = class {
       }
       const warnings = needsDurableTombstone ? [] : await this.persistChanges(changes, false);
       stripDurableTombstoneMarkers(changes);
+      await this.reclaimSnapshotFiles([removeChange.artifact]);
       const warningDetails = detailsForPersistenceWarnings(
         warnings,
         changes,
@@ -5662,7 +5722,7 @@ var SessionArtifactStore = class {
           let normalized = await this.normalizeInput(
             input,
             ++this.receivedSeq,
-            artifact.storage === "published" && !isFileArtifactUrl(artifact.url),
+            artifact.storage === "published" && (!isFileArtifactUrl(artifact.url) || Boolean(getWebPreviewSnapshotId(artifact))),
             {
               metadataBudget: "persisted",
               workspaceExpected: workspaceExpectedFromArtifact(artifact),
@@ -5705,6 +5765,17 @@ var SessionArtifactStore = class {
             durableTombstoneRequired: retention !== "ephemeral" ? true : void 0,
             insertSeq: ++this.insertSeq
           };
+          try {
+            await retainArtifactSnapshot(
+              stored,
+              this.runtimeBaseDir,
+              this.sessionId
+            );
+          } catch (error) {
+            warnings.push(
+              `restored artifact ${stored.id} without retaining its snapshot: ${error instanceof Error ? error.message : String(error)}`
+            );
+          }
           this.artifacts.set(stored.id, stored);
           restoredCount++;
         } catch (error) {
@@ -5740,10 +5811,37 @@ var SessionArtifactStore = class {
           insertSeq: ++this.insertSeq
         });
       }
+      if (!warnings.some(isArtifactSnapshotCompletenessWarning)) {
+        this.pendingSnapshotRemovals.clear();
+      }
       const evicted = await this.evictOverflow(/* @__PURE__ */ new Set(), []);
       if (evicted.removed.length > 0) {
         warnings.push("restored artifact list pruned to live limit");
-        warnings.push(...await this.persistChanges(evicted.removed, false));
+        const persistenceWarnings = await this.persistChanges(
+          evicted.removed,
+          false
+        );
+        warnings.push(...persistenceWarnings);
+        if (persistenceWarnings.length === 0) {
+          await this.reclaimSnapshotFiles(
+            evicted.removed.map((change) => change.artifact)
+          );
+        }
+      }
+      const restoredIds = /* @__PURE__ */ new Set([
+        ...snapshot.artifacts.map((artifact) => artifact.id),
+        ...preservedLiveEphemeralArtifacts.map((artifact) => artifact.id)
+      ]);
+      const discarded = [...previousState.artifacts.values()].filter(
+        (artifact) => !restoredIds.has(artifact.id)
+      );
+      if (warnings.some(isArtifactSnapshotCompletenessWarning)) {
+        for (const artifact of previousState.artifacts.values()) {
+          const id = getWebPreviewSnapshotId(artifact);
+          if (id) this.pendingSnapshotRemovals.add(id);
+        }
+      } else {
+        await this.reclaimSnapshotFiles(discarded);
       }
       this.setLastRestoreWarnings(warnings);
       return warnings;
@@ -5766,6 +5864,7 @@ var SessionArtifactStore = class {
         this.persistenceSeq = sequence;
         this.durableEventsSinceSnapshot = 0;
         this.consecutiveSnapshotFailures = 0;
+        this.pendingSnapshotRemovals.clear();
         return [];
       } catch (error) {
         writeStderrLine(
@@ -5789,7 +5888,7 @@ var SessionArtifactStore = class {
       const normalized = await this.normalizeInput(
         input,
         ++this.receivedSeq,
-        artifact.storage === "published" && !isFileArtifactUrl(artifact.url),
+        artifact.storage === "published" && (!isFileArtifactUrl(artifact.url) || Boolean(getWebPreviewSnapshotId(artifact))),
         {
           metadataBudget: "persisted",
           workspaceExpected: workspaceExpectedFromArtifact(artifact),
@@ -5840,6 +5939,7 @@ var SessionArtifactStore = class {
       tombstonedClientIds: new Map(this.tombstonedClientIds),
       stickyEphemeralIds: new Set(this.stickyEphemeralIds),
       markerArtifacts: new Map(this.markerArtifacts),
+      pendingSnapshotRemovals: new Set(this.pendingSnapshotRemovals),
       lastRestoreWarnings: [...this.lastRestoreWarnings],
       lastRestoreWarningDetails: [...this.lastRestoreWarningDetails]
     };
@@ -5870,6 +5970,10 @@ var SessionArtifactStore = class {
     for (const [id, artifact] of state.markerArtifacts) {
       this.markerArtifacts.set(id, artifact);
     }
+    this.pendingSnapshotRemovals.clear();
+    for (const id of state.pendingSnapshotRemovals) {
+      this.pendingSnapshotRemovals.add(id);
+    }
     this.setLastRestoreWarnings(state.lastRestoreWarnings);
     this.lastRestoreWarningDetails = [...state.lastRestoreWarningDetails];
   }
@@ -5914,6 +6018,8 @@ var SessionArtifactStore = class {
       await this.persistence.recordEvent(payload);
       this.persistenceSeq = sequence;
       for (const change of durableChanges) {
+        const snapshotId = change.artifact && getWebPreviewSnapshotId(change.artifact);
+        if (snapshotId) this.pendingSnapshotRemovals.delete(snapshotId);
         if (change.action === "removed") continue;
         const stored = this.artifacts.get(change.artifactId);
         if (!stored) continue;
@@ -5958,6 +6064,7 @@ var SessionArtifactStore = class {
       this.persistenceSeq = sequence;
       this.durableEventsSinceSnapshot = 0;
       this.consecutiveSnapshotFailures = 0;
+      this.pendingSnapshotRemovals.clear();
     } catch (error) {
       this.consecutiveSnapshotFailures = Math.min(
         this.consecutiveSnapshotFailures + 1,
@@ -6015,6 +6122,8 @@ var SessionArtifactStore = class {
     for (const change of changes) {
       if (change.action === "removed") {
         removalNotPersisted = true;
+        const snapshotId = change.artifact && getWebPreviewSnapshotId(change.artifact);
+        if (snapshotId) this.pendingSnapshotRemovals.add(snapshotId);
         if (change.reason === "explicit") {
           this.rememberTombstone(change);
           this.stickyEphemeralIds.delete(change.artifactId);
@@ -6588,10 +6697,29 @@ var SessionArtifactStore = class {
       );
     }
   }
+  async reclaimSnapshotFiles(artifacts) {
+    for (const artifact of artifacts) {
+      if (!artifact) continue;
+      const id = getWebPreviewSnapshotId(artifact);
+      if (!id || this.pendingSnapshotRemovals.has(id) || [...this.artifacts.values()].some(
+        (kept) => getWebPreviewSnapshotId(kept) === id
+      ))
+        continue;
+      try {
+        await deleteArtifactSnapshot(
+          artifact,
+          this.runtimeBaseDir,
+          this.sessionId
+        );
+      } catch {
+      }
+    }
+  }
   async evictOverflow(createdIds, changes, strict = false) {
     const removed = [];
+    const droppedArtifacts = [];
     if (this.artifacts.size <= this.maxArtifacts) {
-      return { removed, droppedCreated: 0 };
+      return { removed, droppedCreated: 0, droppedArtifacts };
     }
     const createdInThisBatch = new Set(createdIds);
     const candidates = Array.from(this.artifacts.values()).filter(
@@ -6634,12 +6762,13 @@ var SessionArtifactStore = class {
       }
       this.artifacts.delete(artifact.id);
       droppedCreated++;
+      droppedArtifacts.push(toPublicArtifact(artifact));
       writeStderrLine(
         `[artifacts] session=${this.sessionId} action=dropped reason="max artifacts exceeded" artifactId=${artifact.id}`
       );
       removePriorChange(changes, artifact.id);
     }
-    return { removed, droppedCreated };
+    return { removed, droppedCreated, droppedArtifacts };
   }
 };
 function coalesceByIdentity(artifacts) {
@@ -8462,6 +8591,11 @@ function broadcastTurnComplete(entry, sessionId, promptResult, promptId, origina
       assistantRecordUuid: rawBranchPoint["assistantRecordUuid"],
       checkpointUuid: rawBranchPoint["checkpointUuid"]
     } : void 0;
+    const rawPromptCancelled = meta?.["qwen.promptCancelled"] && typeof meta["qwen.promptCancelled"] === "object" ? meta["qwen.promptCancelled"] : void 0;
+    const promptCancelled = promptResult.stopReason === "cancelled" && typeof rawPromptCancelled?.["cancelledAt"] === "number" && Number.isFinite(rawPromptCancelled["cancelledAt"]) && typeof rawPromptCancelled["elapsedMs"] === "number" && Number.isFinite(rawPromptCancelled["elapsedMs"]) && rawPromptCancelled["elapsedMs"] >= 0 ? {
+      cancelledAt: rawPromptCancelled["cancelledAt"],
+      elapsedMs: rawPromptCancelled["elapsedMs"]
+    } : void 0;
     const published = entry.events.publish({
       type: "turn_complete",
       ...promptId ? { promptId } : {},
@@ -8469,7 +8603,8 @@ function broadcastTurnComplete(entry, sessionId, promptResult, promptId, origina
         sessionId,
         stopReason: promptResult.stopReason ?? "end_turn",
         ...promptId ? { promptId } : {},
-        ...branchPoint ? { branchPoint } : {}
+        ...branchPoint ? { branchPoint } : {},
+        ...promptCancelled ? { promptCancelled } : {}
       },
       ...originatorClientId ? { originatorClientId } : {}
     });
@@ -10315,6 +10450,7 @@ function createAcpSessionBridge(opts) {
                     [PRIVATE_PARENT_CAPABILITY_META_KEY]: privateParentCapability
                   },
                   clientCapabilities: {
+                    _meta: { "qwen.goalProposals": true },
                     fs: {
                       readTextFile: delegateReadTextFileToClient,
                       writeTextFile: true
@@ -10900,11 +11036,20 @@ function createAcpSessionBridge(opts) {
       entry.modelRoundtripInFlight = true;
       let succeeded = false;
       try {
+        const persistDefault = !isScheduledTaskRunSource({
+          sourceType: entry.sourceType,
+          sourceId: entry.sourceId
+        });
         const result = await Promise.race([
           withTimeout(
             conn.unstable_setSessionModel({
               sessionId: entry.sessionId,
-              modelId
+              modelId,
+              ...!persistDefault ? {
+                _meta: {
+                  [SESSION_MODEL_PERSIST_DEFAULT_META_KEY]: false
+                }
+              } : {}
             }),
             timeoutMs,
             "setSessionModel"
@@ -10912,7 +11057,7 @@ function createAcpSessionBridge(opts) {
           transportClosed
         ]);
         publishModelSwitched(entry, modelId, originatorClientId);
-        if (!isReservedStandaloneSessionSourceType(entry.sourceType)) {
+        if (persistDefault && !isReservedStandaloneSessionSourceType(entry.sourceType)) {
           broadcastWorkspaceEvent({
             type: "settings_changed",
             data: {
@@ -11491,8 +11636,8 @@ function createAcpSessionBridge(opts) {
       return response["closed"] === true;
     } catch (err) {
       writeStderrLine(
-        `qwen serve: ${label} ACP session close notification failed for session ${JSON.stringify(entry.sessionId)}: ${String(
-          err instanceof Error ? err.message : err
+        `qwen serve: ${label} ACP session close notification failed for session ${JSON.stringify(entry.sessionId)}: ${extractErrorMessage(
+          err
         )}`
       );
       if (opts2?.throwOnFailure === true) {
@@ -11696,6 +11841,7 @@ function createAcpSessionBridge(opts) {
       artifacts: new SessionArtifactStore({
         sessionId,
         workspaceCwd,
+        runtimeBaseDir: opts.artifactSnapshotRuntimeBaseDir,
         persistence: createSessionArtifactPersistence(ci.connection, sessionId)
       }),
       artifactWorkspaceCwd: workspaceCwd,
@@ -11714,6 +11860,7 @@ function createAcpSessionBridge(opts) {
       cwdChangeQueue: Promise.resolve(),
       promptQueue: Promise.resolve(),
       pendingPromptCount: 0,
+      cancelGeneration: 0,
       pendingAgentNotificationCount: 0,
       ...opts.promptLedger ? { promptLedger: opts.promptLedger } : {},
       pendingPromptList: [],
@@ -14045,9 +14192,18 @@ function createAcpSessionBridge(opts) {
                   delete meta[DAEMON_RESTORE_ASK_USER_QUESTION_META_KEY];
                   delete meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
                   delete meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+                  delete meta[SUBMITTED_PROMPT_META_KEY];
+                  delete meta[DAEMON_SUBMITTED_PROMPT_META_KEY];
+                  if (typeof context?.submittedPrompt === "string" && !isPromotedMidTurn && context?.channelPrompt !== true) {
+                    meta[DAEMON_SUBMITTED_PROMPT_META_KEY] = context.submittedPrompt;
+                  }
                   delete meta[DAEMON_MODEL_PROMPT_META_KEY];
                   delete meta[DAEMON_ATTACHMENT_REFERENCES_META_KEY];
                   delete meta[CHANNEL_PROMPT_META_KEY];
+                  delete meta["qwen.goalProposalApproval"];
+                  if (originatorClientId !== void 0 && entry.clientIds.has(originatorClientId) && !context?.channelPrompt && !isContinue && !isRestoreAskUserQuestion) {
+                    meta["qwen.goalProposalApproval"] = true;
+                  }
                   if (isRetry) {
                     meta[DAEMON_RETRY_META_KEY] = true;
                   }
@@ -14262,6 +14418,7 @@ function createAcpSessionBridge(opts) {
         entry,
         context?.clientId
       );
+      entry.cancelGeneration += 1;
       const runningPrompt = entry.pendingPromptList.find(
         (pending) => pending.state === "running" && !pending.terminalPublished
       );
@@ -14628,7 +14785,7 @@ function createAcpSessionBridge(opts) {
               }
             } catch (cleanupErr) {
               writeStderrLine(
-                `qwen serve: branchSession live-state close for ${result.newSessionId} failed: ${cleanupErr instanceof Error ? cleanupErr.message : cleanupErr}`
+                `qwen serve: branchSession live-state close for ${result.newSessionId} failed: ${extractErrorMessage(cleanupErr)}`
               );
             }
             throw restoreErr;
@@ -14834,6 +14991,7 @@ function createAcpSessionBridge(opts) {
         const artifacts = new SessionArtifactStore({
           sessionId,
           workspaceCwd: expectation.child.canonicalPath,
+          runtimeBaseDir: opts.artifactSnapshotRuntimeBaseDir,
           persistence: createSessionArtifactPersistence(
             entry.connection,
             sessionId
@@ -15617,12 +15775,16 @@ function createAcpSessionBridge(opts) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
       resolveTrustedClientId(entry, context?.clientId);
+      const cancelGeneration = entry.cancelGeneration;
       const decision = await requestSessionStatus(sessionId, SERVE_CONTROL_EXT_METHODS.sessionContinue);
       if (!decision.accepted) {
         return decision;
       }
       const liveEntry = byId.get(sessionId);
       if (!liveEntry) throw new SessionNotFoundError(sessionId);
+      if (liveEntry !== entry || liveEntry.cancelGeneration !== cancelGeneration || isClosingOrAuthorizingClose(liveEntry) || liveEntry.pendingPromptCount > 0 || liveEntry.promptActive || liveEntry.goalTurnActive) {
+        return { accepted: false, interruption: decision.interruption };
+      }
       const lastEventId = liveEntry.events.lastEventId;
       const eventEpoch = liveEntry.events.epoch;
       const promptId = context?.promptId;
@@ -16294,7 +16456,7 @@ function createAcpSessionBridge(opts) {
           writeStderrLine(
             `[mid-turn] session=${JSON.stringify(entry.sessionId)} rejected id ${JSON.stringify(messageId)}: session idle`
           );
-          return { accepted: false };
+          return { accepted: false, reason: "session_idle" };
         }
         promoteMidTurnMessage(
           entry,

package/chunks/{chunk-YBUMTY7B.js → chunk-66N6C4EH.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   delay
-} from "./chunk-HNLMYDQE.js";
+} from "./chunk-FMLBBXHB.js";
 import {
   isTlsVerificationDisabled
 } from "./chunk-EWJTAP3Y.js";

package/chunks/{chunk-MLQNSPRZ.js → chunk-6MLDTOHU.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   t
-} from "./chunk-VZUCTJ2P.js";
+} from "./chunk-I6YJZGHS.js";
 import {
   SessionReferenceService,
   readManyFiles
-} from "./chunk-BZM5U74J.js";
+} from "./chunk-BS7ON54G.js";
 import {
   emptyMcpResourceText,
   formatMcpResourceContents,
@@ -15,10 +15,13 @@ import {
 import {
   SessionService,
   stripTerminalControlSequences
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-CFSBWJBB.js";
+import {
+  qualifySkillName
+} from "./chunk-NJ2OFVUX.js";
 import {
   shouldRunVisionBridge
-} from "./chunk-HBU7EKY4.js";
+} from "./chunk-NRUKL236.js";
 import {
   Storage,
   getErrorMessage,
@@ -63,6 +66,10 @@ init_esbuild_shims();
 // packages/cli/src/ui/utils/suggestions.ts
 init_esbuild_shims();
 var MAX_SUGGESTIONS_TO_SHOW = 8;
+function normalizeDescription(description) {
+  return description.replace(/\s+/g, " ").trim();
+}
+__name(normalizeDescription, "normalizeDescription");
 
 // packages/cli/src/utils/extension-mention.ts
 init_esbuild_shims();
@@ -113,7 +120,9 @@ function buildExtensionContextText(extension) {
   }
   const capabilities = [];
   if (extension.skills && extension.skills.length > 0) {
-    const skillNames = extension.skills.map((s) => sanitizeDisplayText(s.name) || s.name).join(", ");
+    const skillNames = extension.skills.map(
+      (s) => sanitizeDisplayText(qualifySkillName(extension.name, s.name)) || s.name
+    ).join(", ");
     capabilities.push(`- Skills: ${skillNames} (invoke via /<skill-name>)`);
   }
   if (extension.mcpServers && Object.keys(extension.mcpServers).length > 0) {
@@ -985,6 +994,7 @@ export {
   matchMcpServerPrefix,
   buildMcpResourceRef,
   MAX_SUGGESTIONS_TO_SHOW,
+  normalizeDescription,
   EXTENSION_CONTEXT_BUDGET,
   parseExtensionRef,
   matchExtensionByRef,

package/chunks/{chunk-SBRX4BDI.js → chunk-6NKDU7YL.js}

@@ -13,7 +13,7 @@ import {
 import {
   isUnverifiableIdentityError,
   openNoFollow
-} from "./chunk-6HUXPLB5.js";
+} from "./chunk-HEOH7JZY.js";
 import {
   require_proper_lockfile
 } from "./chunk-MLXTMF7H.js";
@@ -585,7 +585,7 @@ var WorkspaceRegistrationStore = class {
     return removed;
   }
   async update(mutate) {
-    const { atomicWriteFile } = await import("./deferred-core-runtime-JK5IXL5K.js");
+    const { atomicWriteFile } = await import("./deferred-core-runtime-V42EMU27.js");
     return withInProcessLock(this.filePath, async () => {
       const lock = await acquireFileLock(this.filePath);
       let committed = false;