@qwen-code/qwen-code 0.19.12 → 0.20.0-nightly.20260721.cda0e0348

package/chunks/{chunk-W4UN42YP.js → chunk-R3VZNHRX.js}

@@ -22,7 +22,7 @@ import {
 } from "./chunk-QR6U5QPP.js";
 import {
   defaultSpawnChannelFactory
-} from "./chunk-PUKUUASO.js";
+} from "./chunk-DMRO4GU2.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -52,7 +52,7 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceExtensionsStatus,
   createIdleWorkspaceHooksStatus
-} from "./chunk-64GC5EMF.js";
+} from "./chunk-DZZIOIVF.js";
 import {
   canonicalizeWorkspace
 } from "./chunk-W7FJ3N32.js";
@@ -72,11 +72,11 @@ import {
   metadataBudgetBytes,
   normalizeSnapshotPayload,
   stableSessionArtifactId
-} from "./chunk-GCY7QTCE.js";
+} from "./chunk-NO6XTCYT.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY
-} from "./chunk-CPU6I5YV.js";
+} from "./chunk-P64HXIC5.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -137,7 +137,10 @@ var TurnBoundaryCompactionEngine = class {
   truncatedTurns = 0;
   slots = [];
   toolSlotIndex = /* @__PURE__ */ new Map();
-  textSlotIndex = /* @__PURE__ */ new Map();
+  textSlotIndex = {
+    text: /* @__PURE__ */ new Map(),
+    thought: /* @__PURE__ */ new Map()
+  };
   constructor(opts = {}) {
     this.maxReplayBytes = normalizeCompactedReplayMaxBytes(opts.maxReplayBytes);
     this.onReplayWindowEviction = opts.onReplayWindowEviction;
@@ -183,7 +186,7 @@ var TurnBoundaryCompactionEngine = class {
     this.liveJournal = [];
     this.slots = [];
     this.toolSlotIndex.clear();
-    this.textSlotIndex.clear();
+    this.clearTextSlotIndex();
   }
   seedReplayEvents(events) {
     if (this.closed) return;
@@ -214,7 +217,7 @@ var TurnBoundaryCompactionEngine = class {
     this.liveJournal = [];
     this.slots = [];
     this.toolSlotIndex.clear();
-    this.textSlotIndex.clear();
+    this.clearTextSlotIndex();
   }
   close() {
     if (this.closed) return;
@@ -223,7 +226,7 @@ var TurnBoundaryCompactionEngine = class {
     this.liveJournal = [];
     this.slots = [];
     this.toolSlotIndex.clear();
-    this.textSlotIndex.clear();
+    this.clearTextSlotIndex();
   }
   classifySessionUpdate(event) {
     const data = event.data;
@@ -268,8 +271,8 @@ var TurnBoundaryCompactionEngine = class {
             data?.update?._meta
           );
           if (toolParent) {
-            this.textSlotIndex.delete(`text::${toolParent}`);
-            this.textSlotIndex.delete(`thought::${toolParent}`);
+            this.textSlotIndex.text.delete(toolParent);
+            this.textSlotIndex.thought.delete(toolParent);
           }
         }
         break;
@@ -295,9 +298,12 @@ var TurnBoundaryCompactionEngine = class {
     const text = data?.update?.content?.text ?? "";
     const meta = data?.update?._meta;
     const parentToolCallId = extractParentToolCallIdFromMeta(meta);
+    const sourceRecordIds = extractSourceRecordIdsFromMeta(meta);
     if (parentToolCallId != null) {
-      const slotKey = `${kind}::${parentToolCallId}`;
-      const existingIdx = this.textSlotIndex.get(slotKey);
+      const entries = this.textSlotIndex[kind].get(parentToolCallId) ?? [];
+      const existingIdx = entries.find(
+        (entry) => stringArraysEqual(entry.sourceRecordIds, sourceRecordIds)
+      )?.index;
       if (existingIdx !== void 0) {
         const slot = this.slots[existingIdx];
         slot.chunks.push(text);
@@ -305,11 +311,13 @@ var TurnBoundaryCompactionEngine = class {
         slot.lastMeta = meta ?? slot.lastMeta;
         slot.lastEnvelopeMeta = event._meta ?? slot.lastEnvelopeMeta;
       } else {
-        this.textSlotIndex.set(slotKey, this.slots.length);
+        entries.push({ sourceRecordIds, index: this.slots.length });
+        this.textSlotIndex[kind].set(parentToolCallId, entries);
         this.slots.push({
           kind,
           parentToolCallId,
           chunks: [text],
+          sourceRecordIds,
           lastEventId: event.id ?? 0,
           lastMeta: meta,
           lastEnvelopeMeta: event._meta
@@ -317,7 +325,7 @@ var TurnBoundaryCompactionEngine = class {
       }
     } else {
       const lastSlot = this.slots[this.slots.length - 1];
-      if (lastSlot && lastSlot.kind === kind && lastSlot.parentToolCallId == null) {
+      if (lastSlot && lastSlot.kind === kind && lastSlot.parentToolCallId == null && stringArraysEqual(lastSlot.sourceRecordIds, sourceRecordIds)) {
         lastSlot.chunks.push(text);
         if (event.id !== void 0) lastSlot.lastEventId = event.id;
         lastSlot.lastMeta = meta ?? lastSlot.lastMeta;
@@ -327,6 +335,7 @@ var TurnBoundaryCompactionEngine = class {
           kind,
           parentToolCallId: void 0,
           chunks: [text],
+          sourceRecordIds,
           lastEventId: event.id ?? 0,
           lastMeta: meta,
           lastEnvelopeMeta: event._meta
@@ -364,7 +373,7 @@ var TurnBoundaryCompactionEngine = class {
     this.liveJournal = [];
     this.slots = [];
     this.toolSlotIndex.clear();
-    this.textSlotIndex.clear();
+    this.clearTextSlotIndex();
   }
   recordLastEventId(event) {
     if (event.id !== void 0) {
@@ -448,6 +457,10 @@ var TurnBoundaryCompactionEngine = class {
     this.truncatedEvents = 0;
     this.truncatedTurns = 0;
   }
+  clearTextSlotIndex() {
+    this.textSlotIndex.text.clear();
+    this.textSlotIndex.thought.clear();
+  }
 };
 function makeMergedSessionUpdateEvent(sessionUpdate, text, eventId, meta, envelopeMeta) {
   return {
@@ -487,6 +500,24 @@ function extractParentToolCallIdFromMeta(meta) {
   return void 0;
 }
 __name(extractParentToolCallIdFromMeta, "extractParentToolCallIdFromMeta");
+function extractSourceRecordIdsFromMeta(meta) {
+  if (typeof meta !== "object" || meta === null) return void 0;
+  const transcript = meta["qwenTranscript"];
+  if (typeof transcript !== "object" || transcript === null) return void 0;
+  const ids = transcript["sourceRecordIds"];
+  if (!Array.isArray(ids)) return void 0;
+  const normalized = [
+    ...new Set(ids.filter((id) => typeof id === "string"))
+  ];
+  return normalized.length > 0 ? normalized : void 0;
+}
+__name(extractSourceRecordIdsFromMeta, "extractSourceRecordIdsFromMeta");
+function stringArraysEqual(left, right) {
+  if (left === right) return true;
+  if (!left || !right || left.length !== right.length) return false;
+  return left.every((value, index) => value === right[index]);
+}
+__name(stringArraysEqual, "stringArraysEqual");
 function hasTodoStopGuardDiscreteMeta(meta) {
   return typeof meta === "object" && meta !== null && meta["qwenDiscreteMessage"] === true && meta["source"] === "todo_stop_guard";
 }
@@ -502,6 +533,11 @@ function mergeToolCallEvent(existing, incoming) {
       merged[key] = value;
     }
   }
+  const updateMeta = mergeTranscriptUpdateMeta(
+    existingUpdate["_meta"],
+    incomingUpdate["_meta"]
+  );
+  if (updateMeta !== void 0) merged["_meta"] = updateMeta;
   merged["sessionUpdate"] = "tool_call";
   const mergedMeta = existing._meta || incoming._meta ? { ...existing._meta ?? {}, ...incoming._meta ?? {} } : void 0;
   return {
@@ -517,6 +553,23 @@ function mergeToolCallEvent(existing, incoming) {
   };
 }
 __name(mergeToolCallEvent, "mergeToolCallEvent");
+function mergeTranscriptUpdateMeta(existing, incoming) {
+  const existingRecord = typeof existing === "object" && existing !== null ? existing : void 0;
+  const incomingRecord = typeof incoming === "object" && incoming !== null ? incoming : void 0;
+  if (!existingRecord && !incomingRecord) return void 0;
+  const sourceRecordIds = [
+    .../* @__PURE__ */ new Set([
+      ...extractSourceRecordIdsFromMeta(existingRecord) ?? [],
+      ...extractSourceRecordIdsFromMeta(incomingRecord) ?? []
+    ])
+  ];
+  return {
+    ...existingRecord ?? {},
+    ...incomingRecord ?? {},
+    ...sourceRecordIds.length > 0 ? { qwenTranscript: { sourceRecordIds } } : {}
+  };
+}
+__name(mergeTranscriptUpdateMeta, "mergeTranscriptUpdateMeta");
 
 // packages/acp-bridge/src/session-source.ts
 init_esbuild_shims();
@@ -5678,7 +5731,8 @@ function createAcpSessionBridge(opts) {
       pendingInteractionCount: entry.pendingInteractions.size,
       hasTurnError: entry.turnError !== void 0,
       ...entry.turnError !== void 0 ? { turnError: entry.turnError } : {},
-      pendingInteractions: [...entry.pendingInteractions.values()]
+      pendingInteractions: [...entry.pendingInteractions.values()],
+      ...entry.worktree ? { worktree: entry.worktree } : {}
     };
   }, "toSessionSummary");
   const permissionConsensusQuorum = opts.permissionConsensusQuorum;
@@ -6009,7 +6063,7 @@ function createAcpSessionBridge(opts) {
     }
   }
   __name(ensureChannel, "ensureChannel");
-  async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId) {
+  async function doSpawn(modelServiceId, effectiveScope, approvalMode, requestedClientId, onSessionRegistered, parentSessionId, sourceType, sourceId, worktree) {
     const channelPath = channelInfo && !channelInfo.isDying ? "reused" : inFlightChannelSpawn ? "joined" : "spawned_on_request";
     const ci = await telemetry.withSpan(
       "channel.wait",
@@ -6070,7 +6124,7 @@ function createAcpSessionBridge(opts) {
         newSessionResp.sessionId,
         boundWorkspace,
         void 0,
-        { parentSessionId, sourceType, sourceId }
+        { parentSessionId, sourceType, sourceId, worktree }
       );
       initializedSessionId = entry.sessionId;
       sessionRegistered = true;
@@ -6184,7 +6238,8 @@ function createAcpSessionBridge(opts) {
         ...entry.sourceType ? { sourceType: entry.sourceType } : {},
         ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
         ...entry.sourceType ? { sourcePersisted: sourcePersisted === true } : {},
-        ...entry.parentSessionId ? { parentSessionPersisted: parentSessionPersisted === true } : {}
+        ...entry.parentSessionId ? { parentSessionPersisted: parentSessionPersisted === true } : {},
+        ...entry.worktree ? { worktree: entry.worktree } : {}
       };
     } finally {
       ci.sessionSpawnsInFlight = Math.max(0, ci.sessionSpawnsInFlight - 1);
@@ -6797,6 +6852,7 @@ function createAcpSessionBridge(opts) {
       ...options.parentSessionId ? { parentSessionId: options.parentSessionId } : {},
       ...options.sourceType ? { sourceType: options.sourceType } : {},
       ...options.sourceId !== void 0 ? { sourceId: options.sourceId } : {},
+      ...options.worktree ? { worktree: options.worktree } : {},
       channel: ci.channel,
       connection: ci.connection,
       events,
@@ -7601,7 +7657,8 @@ function createAcpSessionBridge(opts) {
         releaseAdmissionOnce,
         req.parentSessionId,
         source.sourceType,
-        source.sourceId
+        source.sourceId,
+        req.worktree
       );
       const tracker = effectiveScope === "single" ? workspaceKey : `${workspaceKey}#${randomUUID2()}`;
       inFlightSpawns.set(tracker, promise);
@@ -8207,7 +8264,8 @@ function createAcpSessionBridge(opts) {
           SERVE_CONTROL_EXT_METHODS.sessionCd,
           {
             sessionId,
-            path: req.path
+            path: req.path,
+            ...req.allowedRoots ? { allowedRoots: req.allowedRoots } : {}
           }
         );
         const extResult = raw;
@@ -8243,6 +8301,12 @@ function createAcpSessionBridge(opts) {
       );
       return { sessionId, ...result };
     },
+    setSessionWorktree(sessionId, worktree) {
+      const entry = byId.get(sessionId);
+      if (entry) {
+        entry.worktree = worktree;
+      }
+    },
     async closeSession(sessionId, context, closeOpts) {
       return closeSessionImpl(sessionId, context, closeOpts);
     },