@qwen-code/qwen-code 0.21.1 → 0.21.2

package/chunks/{chunk-ZURDMIDR.js → chunk-44F4LBWZ.js}

@@ -17,7 +17,7 @@ import {
 } from "./chunk-OCPBI7J5.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-KAMYKP7E.js";
+} from "./chunk-XUGZYLDH.js";
 import {
   BridgeChannelClosedError,
   BridgeTimeoutError,
@@ -26,12 +26,13 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-FTD6DP4T.js";
+} from "./chunk-GURGAJTX.js";
 import {
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
   DAEMON_CHANNEL_DELIVERY_META_KEY,
   LOAD_REPLAY_BULK_MODE,
+  LOAD_REPLAY_HIDE_INHERITED_META_KEY,
   LOAD_REPLAY_META_KEY,
   LOAD_REPLAY_MODE_META_KEY,
   LOAD_REPLAY_PAGE_SIZE_META_KEY,
@@ -39,8 +40,9 @@ import {
   MID_TURN_QUEUE_DRAIN_METHOD,
   PROMPT_CANCEL_METHOD,
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
-  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD
-} from "./chunk-XZC5VLBZ.js";
+  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
+  WORKTREE_MCP_DEFER_META_KEY
+} from "./chunk-CPZAH673.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -87,16 +89,16 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-X5WNMMIA.js";
+} from "./chunk-54YCNSK5.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-75MIQ3LV.js";
+} from "./chunk-Z3S5EMOW.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
   PRIVATE_PARENT_CAPABILITY_META_KEY
-} from "./chunk-PT722TDT.js";
+} from "./chunk-DUNI4EBW.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -740,6 +742,7 @@ __name(mergeTranscriptUpdateMeta, "mergeTranscriptUpdateMeta");
 
 // packages/acp-bridge/src/session-source.ts
 init_esbuild_shims();
+var SESSION_SOURCE_META_KEY = "qwen.session.source";
 var SESSION_SOURCE_TYPE_PATTERN = /^[a-z][a-z0-9_-]{0,63}$/;
 var MAX_SESSION_SOURCE_ID_LENGTH = 256;
 function parseSessionSource(sourceType, sourceId) {
@@ -5424,6 +5427,15 @@ function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 __name(isRecord3, "isRecord");
+function sessionSourceRequestMeta(sourceType, sourceId) {
+  return sourceType ? {
+    [SESSION_SOURCE_META_KEY]: {
+      sourceType,
+      ...sourceId !== void 0 ? { sourceId } : {}
+    }
+  } : {};
+}
+__name(sessionSourceRequestMeta, "sessionSourceRequestMeta");
 function isDefinitiveAcpRequestError(error) {
   if (error instanceof RequestError) return true;
   if (!isRecord3(error)) return false;
@@ -6670,12 +6682,20 @@ function createAcpSessionBridge(opts) {
             "qwen-code.daemon.acp_channel.id": ci.id
           },
           async () => {
+            const request = telemetry.injectPromptContext({
+              cwd: boundWorkspace,
+              mcpServers: [],
+              ...sourceType ? { _meta: sessionSourceRequestMeta(sourceType, sourceId) } : {}
+            });
             const response = await withTimeout(
               ci.connection.newSession(
-                telemetry.injectPromptContext({
-                  cwd: boundWorkspace,
-                  mcpServers: []
-                })
+                worktree ? {
+                  ...request,
+                  _meta: {
+                    ...isRecord3(request._meta) ? request._meta : {},
+                    [WORKTREE_MCP_DEFER_META_KEY]: true
+                  }
+                } : request
               ),
               initTimeoutMs,
               "newSession"
@@ -7449,6 +7469,7 @@ function createAcpSessionBridge(opts) {
     const entry = {
       sessionId,
       workspaceCwd,
+      effectiveCwd: workspaceCwd,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...options.parentSessionId ? { parentSessionId: options.parentSessionId } : {},
       ...options.sourceType ? { sourceType: options.sourceType } : {},
@@ -7465,6 +7486,7 @@ function createAcpSessionBridge(opts) {
       }),
       recordingDegraded: false,
       closing: false,
+      cwdChangeQueue: Promise.resolve(),
       promptQueue: Promise.resolve(),
       pendingPromptCount: 0,
       pendingPromptList: [],
@@ -7782,6 +7804,7 @@ function createAcpSessionBridge(opts) {
       );
     }
     const historyReplay = action === "load" ? req.historyReplay ?? "stream" : "stream";
+    const hideInheritedHistory = action === "load" && req.hideInheritedHistory === true;
     const existing = byId.get(req.sessionId);
     if (existing) {
       if (existing.closing) {
@@ -7819,7 +7842,7 @@ function createAcpSessionBridge(opts) {
     }
     const inFlight = inFlightRestores.get(req.sessionId);
     if (inFlight) {
-      if (action !== inFlight.action || historyReplay !== inFlight.historyReplay) {
+      if (action !== inFlight.action || historyReplay !== inFlight.historyReplay || hideInheritedHistory !== inFlight.hideInheritedHistory) {
         throw new RestoreInProgressError(
           req.sessionId,
           inFlight.action,
@@ -7901,11 +7924,20 @@ function createAcpSessionBridge(opts) {
                 // intentionally has no `mcpServers` field for the
                 // same reason.
                 mcpServers: [],
-                ...historyReplay === "response" ? {
+                ...historyReplay === "response" || hideInheritedHistory || req.sourceType ? {
                   _meta: {
-                    [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE,
-                    ...req.historyPageSize !== void 0 ? {
-                      [LOAD_REPLAY_PAGE_SIZE_META_KEY]: req.historyPageSize
+                    ...sessionSourceRequestMeta(
+                      req.sourceType,
+                      req.sourceId
+                    ),
+                    ...historyReplay === "response" ? {
+                      [LOAD_REPLAY_MODE_META_KEY]: LOAD_REPLAY_BULK_MODE,
+                      ...req.historyPageSize !== void 0 ? {
+                        [LOAD_REPLAY_PAGE_SIZE_META_KEY]: req.historyPageSize
+                      } : {}
+                    } : {},
+                    ...hideInheritedHistory ? {
+                      [LOAD_REPLAY_HIDE_INHERITED_META_KEY]: true
                     } : {}
                   }
                 } : {}
@@ -7921,7 +7953,13 @@ function createAcpSessionBridge(opts) {
               ci.connection.unstable_resumeSession({
                 sessionId: req.sessionId,
                 cwd: workspaceKey,
-                mcpServers: []
+                mcpServers: [],
+                ...req.sourceType ? {
+                  _meta: sessionSourceRequestMeta(
+                    req.sourceType,
+                    req.sourceId
+                  )
+                } : {}
               }),
               initTimeoutMs,
               "resumeSession"
@@ -8099,6 +8137,7 @@ function createAcpSessionBridge(opts) {
     inFlightRestores.set(req.sessionId, {
       action,
       historyReplay,
+      hideInheritedHistory,
       promise,
       coalesceState
     });
@@ -8977,12 +9016,18 @@ function createAcpSessionBridge(opts) {
       if (shuttingDown) throw new Error("AcpSessionBridge is shutting down");
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
+      const source = parseSessionSource(req.sourceType, req.sourceId);
+      if ("error" in source) {
+        throw new InvalidSessionMetadataError("sourceType", source.error);
+      }
+      const isSideTask = source.sourceType === "side_task";
       let originatorClientId;
       if (context?.clientId !== void 0) {
         originatorClientId = resolveTrustedClientId(entry, context.clientId);
       }
-      const branchResult = entry.promptQueue.then(async () => {
-        if (entry.promptActive) {
+      const concurrentSideTask = isSideTask && entry.promptActive;
+      const branchResult = (concurrentSideTask ? Promise.resolve() : entry.promptQueue).then(async () => {
+        if (entry.promptActive && !isSideTask) {
           throw new BranchWhilePromptActiveError(sessionId);
         }
         if (byId.size + inFlightSpawns.size + inFlightRestores.size >= maxSessions) {
@@ -9002,13 +9047,16 @@ function createAcpSessionBridge(opts) {
         try {
           const ci = await ensureChannel();
           const result = await withTimeout(
-            ci.connection.extMethod(SERVE_CONTROL_EXT_METHODS.sessionBranch, {
-              sessionId,
-              cwd: boundWorkspace,
-              name: req.name
-            }),
+            ci.connection.extMethod(
+              isSideTask ? SERVE_CONTROL_EXT_METHODS.sessionSideTask : SERVE_CONTROL_EXT_METHODS.sessionBranch,
+              {
+                sessionId,
+                cwd: boundWorkspace,
+                name: req.name
+              }
+            ),
             initTimeoutMs,
-            "branchSession"
+            isSideTask ? "createSideTaskSession" : "branchSession"
           );
           if (!result || typeof result.newSessionId !== "string") {
             throw new Error(
@@ -9019,12 +9067,18 @@ function createAcpSessionBridge(opts) {
           const branchDisplayName = typeof rawBranchName === "string" ? rawBranchName : result.newSessionId.slice(0, 8);
           let restored;
           try {
+            const hideInheritedHistory = req.replayInheritedHistory === false;
             restored = await restoreSession(
               "load",
               {
                 sessionId: result.newSessionId,
                 workspaceCwd: boundWorkspace,
-                clientId: context?.clientId
+                clientId: context?.clientId,
+                ...hideInheritedHistory ? {
+                  historyReplay: "response",
+                  hideInheritedHistory: true
+                } : {},
+                ...source
               },
               {
                 skipFreshSessionAdmission: true
@@ -9049,35 +9103,80 @@ function createAcpSessionBridge(opts) {
           }
           const newEntry = byId.get(result.newSessionId);
           if (newEntry) newEntry.displayName = branchDisplayName;
-          const eventData = {
-            sourceSessionId: sessionId,
-            newSessionId: result.newSessionId,
-            displayName: branchDisplayName
-          };
-          const branchEnvelope = {
-            type: "session_branched",
-            data: eventData,
-            ...originatorClientId ? { originatorClientId } : {}
-          };
-          newEntry?.events.publish(branchEnvelope);
+          let sourcePersisted;
+          if (newEntry?.sourceType) {
+            try {
+              const sourceResult = await withTimeout(
+                newEntry.connection.extMethod(
+                  SERVE_CONTROL_EXT_METHODS.sessionSource,
+                  {
+                    sessionId: newEntry.sessionId,
+                    sourceType: newEntry.sourceType,
+                    ...newEntry.sourceId !== void 0 ? { sourceId: newEntry.sourceId } : {}
+                  }
+                ),
+                initTimeoutMs,
+                "sessionSource"
+              );
+              sourcePersisted = sourceResult?.persisted === true;
+            } catch (error) {
+              sourcePersisted = false;
+              writeStderrLine(
+                `qwen serve: source metadata for branched session ${result.newSessionId} was not persisted: ${error instanceof Error ? error.message : String(error)}`
+              );
+            }
+          }
+          if (!isSideTask) {
+            const eventData = {
+              sourceSessionId: sessionId,
+              newSessionId: result.newSessionId,
+              displayName: branchDisplayName
+            };
+            const branchEnvelope = {
+              type: "session_branched",
+              data: eventData,
+              ...originatorClientId ? { originatorClientId } : {}
+            };
+            newEntry?.events.publish(branchEnvelope);
+          }
           return {
             ...restored,
             displayName: branchDisplayName,
             forkedFrom: {
               sessionId,
               displayName: entry.displayName ?? sessionId.slice(0, 8)
-            }
+            },
+            ...sourcePersisted !== void 0 ? { sourcePersisted } : {}
           };
         } finally {
           releaseAdmissionOnce();
         }
       });
-      entry.promptQueue = branchResult.then(
-        () => void 0,
-        () => void 0
-      );
+      if (!concurrentSideTask) {
+        entry.promptQueue = branchResult.then(
+          () => void 0,
+          () => void 0
+        );
+      }
       return branchResult;
     },
+    async createSideTaskSession(sessionId, req, context) {
+      const result = await this.branchSession(
+        sessionId,
+        {
+          name: req.name,
+          sourceType: "side_task",
+          sourceId: sessionId,
+          replayInheritedHistory: false
+        },
+        context
+      );
+      const { forkedFrom: _forkedFrom, ...sideTask } = result;
+      return {
+        ...sideTask,
+        parentSessionId: sessionId
+      };
+    },
     async changeSessionCwd(sessionId, req, context) {
       if (shuttingDown) throw new Error("AcpSessionBridge is shutting down");
       const entry = byId.get(sessionId);
@@ -9105,6 +9204,7 @@ function createAcpSessionBridge(opts) {
             `changeSessionCwd: unexpected response shape from agent: ${JSON.stringify(raw)}`
           );
         }
+        entry.effectiveCwd = extResult.newCwd;
         if (extResult.previousCwd !== extResult.newCwd) {
           entry.events.publish({
             type: "session_cwd_changed",
@@ -9122,6 +9222,10 @@ function createAcpSessionBridge(opts) {
         () => void 0,
         () => void 0
       );
+      entry.cwdChangeQueue = cdPromise.then(
+        () => void 0,
+        () => void 0
+      );
       const result = await withTimeout(
         cdPromise,
         Math.max(initTimeoutMs, 3e4),
@@ -9623,44 +9727,79 @@ function createAcpSessionBridge(opts) {
     },
     async refreshExtensionsForAllSessions(data) {
       const sessions = Array.from(byId.values());
+      const bootstrapRefreshConnections = /* @__PURE__ */ new Set();
+      const refreshSession = /* @__PURE__ */ __name(async (entry, refreshBootstrap) => {
+        let inFlight = inFlightExtensionRefreshes.get(entry.sessionId);
+        if (!inFlight || inFlight.connection !== entry.connection || refreshBootstrap && !inFlight.refreshBootstrap) {
+          const promise = (async () => {
+            await entry.connection.extMethod(
+              SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh,
+              {
+                sessionId: entry.sessionId,
+                ...refreshBootstrap ? {} : { refreshBootstrap: false }
+              }
+            );
+          })();
+          inFlight = {
+            connection: entry.connection,
+            promise,
+            refreshBootstrap
+          };
+          inFlightExtensionRefreshes.set(entry.sessionId, inFlight);
+          const clear = /* @__PURE__ */ __name(() => {
+            if (inFlightExtensionRefreshes.get(entry.sessionId) === inFlight) {
+              inFlightExtensionRefreshes.delete(entry.sessionId);
+            }
+          }, "clear");
+          void promise.then(clear, clear);
+        }
+        await Promise.race([
+          withTimeout(
+            inFlight.promise,
+            3e4,
+            SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh
+          ),
+          getTransportClosedReject(entry)
+        ]);
+      }, "refreshSession");
       const results = await Promise.all(
         sessions.map(async (entry) => {
           const info = channelInfoForEntry(entry);
           if (!info || info.isDying) {
-            return { refreshed: 0, failed: 0 };
+            return {
+              refreshed: 0,
+              failed: 0,
+              entry,
+              refreshBootstrap: false
+            };
           }
+          const refreshBootstrap = !bootstrapRefreshConnections.has(
+            entry.connection
+          );
+          bootstrapRefreshConnections.add(entry.connection);
           try {
-            let inFlight = inFlightExtensionRefreshes.get(entry.sessionId);
-            if (!inFlight || inFlight.connection !== entry.connection) {
-              const promise = (async () => {
-                await entry.connection.extMethod(
-                  SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh,
-                  { sessionId: entry.sessionId }
-                );
-              })();
-              inFlight = { connection: entry.connection, promise };
-              inFlightExtensionRefreshes.set(entry.sessionId, inFlight);
-              const clear = /* @__PURE__ */ __name(() => {
-                if (inFlightExtensionRefreshes.get(entry.sessionId) === inFlight) {
-                  inFlightExtensionRefreshes.delete(entry.sessionId);
-                }
-              }, "clear");
-              void promise.then(clear, clear);
-            }
-            await Promise.race([
-              withTimeout(
-                inFlight.promise,
-                3e4,
-                SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh
-              ),
-              getTransportClosedReject(entry)
-            ]);
-            return { refreshed: 1, failed: 0 };
+            await refreshSession(entry, refreshBootstrap);
+            return { refreshed: 1, failed: 0, entry, refreshBootstrap };
           } catch (err) {
             writeServeDebugLine(
               `refreshExtensions: session ${entry.sessionId} failed: ${err instanceof Error ? err.message : String(err)}`
             );
-            return { refreshed: 0, failed: 1 };
+            return { refreshed: 0, failed: 1, entry, refreshBootstrap };
+          }
+        })
+      );
+      await Promise.all(
+        results.filter((result) => result.failed > 0 && result.refreshBootstrap).map(async (failedBootstrap) => {
+          const retry = results.find(
+            (result) => result.refreshed > 0 && result.entry.connection === failedBootstrap.entry.connection
+          );
+          if (!retry) return;
+          try {
+            await refreshSession(retry.entry, true);
+          } catch (err) {
+            writeServeDebugLine(
+              `refreshExtensions: bootstrap retry via session ${retry.entry.sessionId} failed: ${err instanceof Error ? err.message : String(err)}`
+            );
           }
         })
       );
@@ -10097,7 +10236,24 @@ function createAcpSessionBridge(opts) {
       if (signal?.aborted) {
         return { exitCode: null, output: "", aborted: true };
       }
-      const cwd = entry.workspaceCwd;
+      let abortResolve;
+      const onAbort = /* @__PURE__ */ __name(() => abortResolve?.(), "onAbort");
+      try {
+        await Promise.race([
+          entry.cwdChangeQueue,
+          new Promise((resolve2) => {
+            abortResolve = resolve2;
+            if (signal?.aborted) return resolve2();
+            signal?.addEventListener("abort", onAbort, { once: true });
+          })
+        ]);
+      } finally {
+        signal?.removeEventListener("abort", onAbort);
+      }
+      if (signal?.aborted) {
+        return { exitCode: null, output: "", aborted: true };
+      }
+      const cwd = entry.effectiveCwd;
       entry.events.publish({
         type: "user_shell_command",
         data: { sessionId, command, cwd },
@@ -10840,6 +10996,7 @@ var createHttpAcpBridge = createAcpSessionBridge;
 export {
   SessionArtifactValidationError,
   SessionArtifactAuthorizationError,
+  SESSION_SOURCE_META_KEY,
   parseSessionSource,
   extractErrorMessage,
   extractErrorCode,

package/chunks/{chunk-GKX7E4CO.js → chunk-45IOTAUS.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   themeManager
-} from "./chunk-GATT5TKW.js";
+} from "./chunk-IGTHU3T4.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-6QIGFD5W.js → chunk-4KP2F2TE.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   createDebugLogger
-} from "./chunk-UHUSJ6X7.js";
+} from "./chunk-E2BHWIDT.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";