@qwen-code/qwen-code 0.23.1-preview.2 → 0.23.1

package/chunks/{chunk-2C3XDBGL.js → chunk-EEKU6COG.js}

@@ -5,20 +5,20 @@ import {
 } from "./chunk-57OAHC2Y.js";
 import {
   loadSettings
-} from "./chunk-RUMSY4ES.js";
+} from "./chunk-66JBCTJF.js";
 import {
   getCurrentLanguage,
   t
-} from "./chunk-LD53HMPV.js";
+} from "./chunk-CRZBDVP2.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-GEV66YGE.js";
+} from "./chunk-3VDLQUR2.js";
 import {
   ExtensionManager,
   getExtensionDescription,
   getExtensionDisplayName,
   require_prompts
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";

package/chunks/{chunk-AX23QSX3.js → chunk-EHTKOO6W.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG
-} from "./chunk-Z6KFLEG7.js";
+} from "./chunk-PSPAM24S.js";
 import {
   SessionNotFoundError
-} from "./chunk-F47DITLZ.js";
+} from "./chunk-FAWTMDX7.js";
 import {
   ChannelWorkerStartupError
-} from "./chunk-KAZWXVI3.js";
+} from "./chunk-CABDNUJ4.js";
 import {
   ChannelWebhookEnqueueError
 } from "./chunk-STUJ7IMZ.js";
@@ -17,7 +17,7 @@ import {
 } from "./chunk-RKFGE7JH.js";
 import {
   CHANNEL_LOOP_MCP_SERVER_NAME
-} from "./chunk-65GHQ4FX.js";
+} from "./chunk-XVTCSVBK.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-XNC2TCUO.js → chunk-ENZDGHGJ.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   t
-} from "./chunk-LD53HMPV.js";
+} from "./chunk-CRZBDVP2.js";
 import {
   SessionReferenceService,
   readManyFiles
-} from "./chunk-TXAEXF2B.js";
+} from "./chunk-ZU2T5JIS.js";
 import {
   emptyMcpResourceText,
   formatMcpResourceContents,
@@ -15,10 +15,10 @@ import {
 import {
   SessionService,
   stripTerminalControlSequences
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   shouldRunVisionBridge
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   Storage,
   getErrorMessage,

package/chunks/{chunk-733KQL63.js → chunk-EOET4H7C.js}

@@ -3,7 +3,7 @@
 import {
   getUserSettingsPath,
   v1ToV2Migration
-} from "./chunk-RUMSY4ES.js";
+} from "./chunk-66JBCTJF.js";
 import {
   getSystemDefaultsPath,
   getSystemSettingsPath
@@ -13,7 +13,7 @@ import {
   TrustLevel,
   getExplicitTrustLevel,
   getTrustedFoldersPath
-} from "./chunk-GEV66YGE.js";
+} from "./chunk-3VDLQUR2.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -22,7 +22,7 @@ import {
 } from "./chunk-MR3PXB6E.js";
 import {
   ideContextStore
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-37SOBIA3.js → chunk-ERXNTINK.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   t
-} from "./chunk-LD53HMPV.js";
+} from "./chunk-CRZBDVP2.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-F47DITLZ.js → chunk-FAWTMDX7.js}

@@ -473,6 +473,19 @@ var CdWhilePromptActiveError = class extends Error {
     this.sessionId = sessionId;
   }
 };
+var SessionResetPendingError = class extends Error {
+  static {
+    __name(this, "SessionResetPendingError");
+  }
+  sessionId;
+  constructor(sessionId) {
+    super(
+      `Session ${sessionId} is mid worktree reset; prompt admission is closed until the reset completes`
+    );
+    this.name = "SessionResetPendingError";
+    this.sessionId = sessionId;
+  }
+};
 var McpAuthenticationInProgressError = class extends Error {
   static {
     __name(this, "McpAuthenticationInProgressError");
@@ -519,6 +532,7 @@ export {
   InvalidRewindTargetError,
   BranchWhilePromptActiveError,
   CdWhilePromptActiveError,
+  SessionResetPendingError,
   McpAuthenticationInProgressError
 };
 /**

package/chunks/{chunk-5JLQWQK6.js → chunk-FV4DM2M4.js}

@@ -17,7 +17,7 @@ import {
   isPrivateProvenanceEnvKey,
   publishPendingCompileCache,
   reportRejectedLoaderKeys
-} from "./chunk-NUQFUXOG.js";
+} from "./chunk-QTNCGZHQ.js";
 import {
   buildTrustPrecedenceRules,
   require_strip_json_comments,
@@ -29,7 +29,7 @@ import {
 import {
   require_main,
   resolveEnvVarsInObject
-} from "./chunk-3K65MUKD.js";
+} from "./chunk-65I7S4Z3.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-UTVIIA7N.js → chunk-FW4E4QPG.js}

@@ -6,7 +6,7 @@ import {
   getNestedProperty,
   getPersistScopeForModelSelection,
   restoreSettingsFromBackup
-} from "./chunk-RUMSY4ES.js";
+} from "./chunk-66JBCTJF.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-REDVV5NC.js → chunk-FWRRUITH.js}

@@ -2,12 +2,12 @@
 "use strict";
 import {
   buildPermissionSettings
-} from "./chunk-75UQFGFE.js";
+} from "./chunk-CHVU543W.js";
 import {
   resolveVoiceStreamConfig,
   resolveVoiceTranscriptionConfig,
   transcribeVoiceAudio
-} from "./chunk-Z6DDPSGJ.js";
+} from "./chunk-GNY7B3CA.js";
 import {
   getVoiceSettingsScope,
   isSelectableVoiceModel,
@@ -16,7 +16,7 @@ import {
   readVoiceMode,
   readVoiceModel,
   resolveVoiceTransport
-} from "./chunk-JOV46WGX.js";
+} from "./chunk-NB3NDQQK.js";
 import {
   MCP_RESTART_SERVER_DEADLINE_MS
 } from "./chunk-OCPBI7J5.js";
@@ -47,19 +47,19 @@ import {
   WorkspaceInitPathEscapeError,
   WorkspaceInitRaceError,
   WorkspaceInitSymlinkError
-} from "./chunk-F47DITLZ.js";
+} from "./chunk-FAWTMDX7.js";
 import {
   getPersistScopeForModelSelection,
   loadSettings
-} from "./chunk-RUMSY4ES.js";
+} from "./chunk-66JBCTJF.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-GEV66YGE.js";
+} from "./chunk-3VDLQUR2.js";
 import {
   ModelsConfig,
   SkillManager,
   require_yauzl
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   Storage,
   createDebugLogger

package/chunks/{chunk-5V4B3EWA.js → chunk-GM44O6F7.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-M5GB774H.js";
 import {
   sanitizeLogText
-} from "./chunk-65GHQ4FX.js";
+} from "./chunk-XVTCSVBK.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";

package/chunks/{chunk-Z6DDPSGJ.js → chunk-GNY7B3CA.js}

@@ -5,7 +5,7 @@ import {
   isTranscribableVoiceModel,
   readVoiceLanguage,
   resolveVoiceTransport
-} from "./chunk-JOV46WGX.js";
+} from "./chunk-NB3NDQQK.js";
 import {
   resolvePath
 } from "./chunk-Y53DG2HA.js";

package/chunks/{chunk-ERMAXPXA.js → chunk-HIXUUCGY.js}

@@ -8,6 +8,7 @@ import {
   isWithinRoot
 } from "./chunk-J6MB5ZHZ.js";
 import {
+  atomicWriteFile,
   atomicWriteJSON
 } from "./chunk-XFFRI3WM.js";
 import {
@@ -171,11 +172,17 @@ async function addWorktreeSessionMarkerExclude(worktreePath) {
       existing = await fs2.readFile(excludePath, "utf8");
     } catch {
     }
-    const rule = WORKTREE_SESSION_FILE;
-    if (!existing.split(/\r?\n/).includes(rule)) {
-      const sep = existing.length === 0 || existing.endsWith("\n") ? "" : "\n";
-      await fs2.writeFile(excludePath, `${existing}${sep}${rule}
-`, "utf8");
+    const rules = [WORKTREE_SESSION_FILE, `${WORKTREE_SESSION_FILE}.*.tmp`];
+    let next = existing;
+    for (const rule of rules) {
+      if (!next.split(/\r?\n/).includes(rule)) {
+        const sep = next.length === 0 || next.endsWith("\n") ? "" : "\n";
+        next = `${next}${sep}${rule}
+`;
+      }
+    }
+    if (next !== existing) {
+      await fs2.writeFile(excludePath, next, "utf8");
     }
   } catch {
   }
@@ -190,15 +197,32 @@ async function writeWorktreeSessionMarker(worktreePath, sessionId) {
   await addWorktreeSessionMarkerExclude(worktreePath);
 }
 __name(writeWorktreeSessionMarker, "writeWorktreeSessionMarker");
-async function createWorktreeSessionMarkerExclusive(worktreePath, sessionId) {
-  if (sessionId.length === 0 || Buffer.byteLength(sessionId, "utf8") > WORKTREE_SESSION_MARKER_MAX_BYTES || sessionId.trim() !== sessionId) {
-    throw new Error("Invalid worktree session marker owner");
+var WorktreeMarkerCommittedError = class extends Error {
+  static {
+    __name(this, "WorktreeMarkerCommittedError");
   }
+  committedOwner;
+  constructor(committedOwner, options) {
+    super(
+      `Worktree session marker committed for ${committedOwner}; the post-commit close failed`,
+      options
+    );
+    this.name = "WorktreeMarkerCommittedError";
+    this.committedOwner = committedOwner;
+  }
+};
+async function createWorktreeSessionMarkerExclusive(worktreePath, sessionId) {
+  assertValidWorktreeSessionMarkerOwner(sessionId);
   const markerPath = path2.join(worktreePath, WORKTREE_SESSION_FILE);
+  const stagedPath = `${markerPath}.${randomBytes(6).toString("hex")}.tmp`;
   const flags = nodeFs.constants.O_WRONLY | nodeFs.constants.O_CREAT | nodeFs.constants.O_EXCL | (nodeFs.constants.O_NOFOLLOW ?? 0);
-  const handle = await fs2.open(markerPath, flags, 384);
+  const handle = await fs2.open(stagedPath, flags, 384);
+  let stagedDev = 0;
+  let stagedIno = 0;
   try {
     const before = await handle.stat();
+    stagedDev = before.dev;
+    stagedIno = before.ino;
     if (!before.isFile() || before.nlink !== 1 || before.ino === 0) {
       throw new Error("Worktree session marker has an unsafe identity");
     }
@@ -206,17 +230,43 @@ async function createWorktreeSessionMarkerExclusive(worktreePath, sessionId) {
     await handle.sync();
     const [after, pathStats] = await Promise.all([
       handle.stat(),
-      fs2.lstat(markerPath)
+      fs2.lstat(stagedPath)
     ]);
     if (!after.isFile() || after.nlink !== 1 || after.size > WORKTREE_SESSION_MARKER_MAX_BYTES || after.dev !== before.dev || after.ino !== before.ino || pathStats.dev !== after.dev || pathStats.ino !== after.ino) {
       throw new Error("Worktree session marker identity changed");
     }
-  } finally {
+    await fs2.link(stagedPath, markerPath);
+  } catch (error) {
+    await handle.close().catch(() => {
+    });
+    if (stagedIno !== 0) {
+      try {
+        const current = await fs2.lstat(stagedPath);
+        if (current.dev === stagedDev && current.ino === stagedIno) {
+          await fs2.unlink(stagedPath);
+        }
+      } catch {
+      }
+    }
+    throw error;
+  }
+  try {
+    await fs2.unlink(stagedPath);
     await handle.close();
+  } catch (error) {
+    await handle.close().catch(() => {
+    });
+    throw new WorktreeMarkerCommittedError(sessionId, { cause: error });
   }
   await addWorktreeSessionMarkerExclude(worktreePath);
 }
 __name(createWorktreeSessionMarkerExclusive, "createWorktreeSessionMarkerExclusive");
+function assertValidWorktreeSessionMarkerOwner(sessionId) {
+  if (sessionId.length === 0 || Buffer.byteLength(sessionId, "utf8") > WORKTREE_SESSION_MARKER_MAX_BYTES || sessionId.trim() !== sessionId) {
+    throw new Error("Invalid worktree session marker owner");
+  }
+}
+__name(assertValidWorktreeSessionMarkerOwner, "assertValidWorktreeSessionMarkerOwner");
 async function readWorktreeSessionMarkerStrict(worktreePath) {
   const markerPath = path2.join(worktreePath, WORKTREE_SESSION_FILE);
   let handle;
@@ -267,7 +317,13 @@ async function readWorktreeSessionMarkerStrict(worktreePath) {
     if (sessionId.length === 0 || sessionId !== raw || Buffer.byteLength(sessionId, "utf8") > WORKTREE_SESSION_MARKER_MAX_BYTES) {
       return { state: "invalid", reason: "invalid marker owner" };
     }
-    return { state: "valid", sessionId };
+    return {
+      state: "valid",
+      sessionId,
+      uid: process.geteuid === void 0 ? null : after.uid,
+      dev: after.dev,
+      ino: after.ino
+    };
   } catch (error) {
     if (isNodeError(error) && error.code === "ENOENT") {
       return observedMarker ? { state: "invalid", reason: "marker disappeared during read" } : { state: "missing" };
@@ -282,6 +338,122 @@ async function readWorktreeSessionMarkerStrict(worktreePath) {
   }
 }
 __name(readWorktreeSessionMarkerStrict, "readWorktreeSessionMarkerStrict");
+function readWorktreeSessionMarkerStrictSync(worktreePath) {
+  const markerPath = path2.join(worktreePath, WORKTREE_SESSION_FILE);
+  let fd;
+  let observedMarker = false;
+  try {
+    const flags = nodeFs.constants.O_RDONLY | (nodeFs.constants.O_NOFOLLOW ?? 0) | (nodeFs.constants.O_NONBLOCK ?? 0);
+    const before = nodeFs.lstatSync(markerPath);
+    observedMarker = true;
+    if (before.isSymbolicLink() || !before.isFile() || before.nlink !== 1) {
+      return { state: "invalid", reason: "unsafe marker file type" };
+    }
+    if (before.ino === 0 || before.size > WORKTREE_SESSION_MARKER_MAX_BYTES) {
+      return { state: "invalid", reason: "unsafe marker size or identity" };
+    }
+    fd = nodeFs.openSync(markerPath, flags);
+    const opened = nodeFs.fstatSync(fd);
+    if (!opened.isFile() || opened.nlink !== 1 || opened.dev !== before.dev || opened.ino !== before.ino) {
+      return {
+        state: "invalid",
+        reason: "marker identity changed before read"
+      };
+    }
+    const markerBuffer = Buffer.alloc(WORKTREE_SESSION_MARKER_MAX_BYTES + 1);
+    let bytesRead = 0;
+    while (bytesRead < markerBuffer.length) {
+      const chunk = nodeFs.readSync(
+        fd,
+        markerBuffer,
+        bytesRead,
+        markerBuffer.length - bytesRead,
+        bytesRead
+      );
+      if (chunk === 0) break;
+      bytesRead += chunk;
+    }
+    if (bytesRead > WORKTREE_SESSION_MARKER_MAX_BYTES) {
+      return { state: "invalid", reason: "unsafe marker size or identity" };
+    }
+    const raw = markerBuffer.subarray(0, bytesRead).toString("utf8");
+    const after = nodeFs.fstatSync(fd);
+    const pathStats = nodeFs.lstatSync(markerPath);
+    if (!after.isFile() || after.nlink !== 1 || after.size !== bytesRead || after.size > WORKTREE_SESSION_MARKER_MAX_BYTES || after.dev !== opened.dev || after.ino !== opened.ino || !pathStats.isFile() || pathStats.nlink !== 1 || pathStats.dev !== after.dev || pathStats.ino !== after.ino) {
+      return {
+        state: "invalid",
+        reason: "marker identity changed during read"
+      };
+    }
+    const sessionId = raw.trim();
+    if (sessionId.length === 0 || sessionId !== raw || Buffer.byteLength(sessionId, "utf8") > WORKTREE_SESSION_MARKER_MAX_BYTES) {
+      return { state: "invalid", reason: "invalid marker owner" };
+    }
+    return {
+      state: "valid",
+      sessionId,
+      uid: process.geteuid === void 0 ? null : after.uid,
+      dev: after.dev,
+      ino: after.ino
+    };
+  } catch (error) {
+    if (isNodeError(error) && error.code === "ENOENT") {
+      return observedMarker ? { state: "invalid", reason: "marker disappeared during read" } : { state: "missing" };
+    }
+    return {
+      state: "invalid",
+      reason: error instanceof Error ? error.message : String(error)
+    };
+  } finally {
+    if (fd !== void 0) {
+      try {
+        nodeFs.closeSync(fd);
+      } catch {
+      }
+    }
+  }
+}
+__name(readWorktreeSessionMarkerStrictSync, "readWorktreeSessionMarkerStrictSync");
+async function transferWorktreeSessionMarkerOwner(worktreePath, expectedOwner, newOwner) {
+  assertValidWorktreeSessionMarkerOwner(newOwner);
+  if (expectedOwner !== null) {
+    assertValidWorktreeSessionMarkerOwner(expectedOwner);
+    if (expectedOwner === newOwner) {
+      throw new Error("Worktree marker transfer needs a distinct new owner");
+    }
+  }
+  const opening = await readWorktreeSessionMarkerStrict(worktreePath);
+  if (opening.state === "invalid") {
+    throw new Error(`Worktree marker is invalid: ${opening.reason}`);
+  }
+  if (opening.state === "missing") {
+    if (expectedOwner !== null) {
+      throw new Error("Worktree marker owner does not match the expectation");
+    }
+    await createWorktreeSessionMarkerExclusive(worktreePath, newOwner);
+    return;
+  }
+  if (opening.sessionId !== expectedOwner) {
+    throw new Error("Worktree marker owner does not match the expectation");
+  }
+  const euid = process.geteuid?.();
+  if (euid !== void 0 && opening.uid !== null && opening.uid !== euid) {
+    throw new Error("Worktree marker is owned by a different uid");
+  }
+  const markerPath = path2.join(worktreePath, WORKTREE_SESSION_FILE);
+  await atomicWriteFile(markerPath, newOwner, {
+    mode: 384,
+    noFollow: true,
+    assertCanCommit: /* @__PURE__ */ __name(() => {
+      const current = readWorktreeSessionMarkerStrictSync(worktreePath);
+      if (current.state !== "valid" || current.sessionId !== opening.sessionId || current.dev !== opening.dev || current.ino !== opening.ino || current.uid !== opening.uid) {
+        throw new Error("Worktree marker changed during ownership transfer");
+      }
+    }, "assertCanCommit")
+  });
+  await addWorktreeSessionMarkerExclude(worktreePath);
+}
+__name(transferWorktreeSessionMarkerOwner, "transferWorktreeSessionMarkerOwner");
 async function readWorktreeSessionMarker(worktreePath) {
   const markerPath = path2.join(worktreePath, WORKTREE_SESSION_FILE);
   try {
@@ -1826,9 +1998,12 @@ export {
   clearRuntimeStatus,
   loadSimpleGit,
   worktreeBranchForSlug,
+  WORKTREE_SESSION_FILE,
   writeWorktreeSessionMarker,
+  WorktreeMarkerCommittedError,
   createWorktreeSessionMarkerExclusive,
   readWorktreeSessionMarkerStrict,
+  transferWorktreeSessionMarkerOwner,
   readWorktreeSessionMarker,
   AGENT_WORKTREE_SLUG_PATTERN,
   generateAgentWorktreeSlug,

package/chunks/{chunk-EJNYBDYC.js → chunk-HNLMYDQE.js}

@@ -8,7 +8,7 @@ import {
   isQuotaExhaustedError,
   isQwenQuotaExceededError,
   isRateLimitError
-} from "./chunk-W4LL5RZO.js";
+} from "./chunk-4ALNJDHL.js";
 import {
   createDebugLogger,
   getErrorStatus

package/chunks/{chunk-XX4MBBFW.js → chunk-HUX2DOTF.js}

@@ -2,17 +2,17 @@
 "use strict";
 import {
   t
-} from "./chunk-LD53HMPV.js";
+} from "./chunk-CRZBDVP2.js";
 import {
   computeThresholds,
   estimateContextTextTokens,
   formatContextFileDisplayPath,
   getMainSessionBaseSystemPrompt
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   DiscoveredMCPTool,
   uiTelemetryService
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-FPGTNKCP.js";

package/chunks/{chunk-RCUWMVN3.js → chunk-HZ2HUXX7.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-FETY36NQ.js";
 import {
   WorkspaceDrainingError
-} from "./chunk-F47DITLZ.js";
+} from "./chunk-FAWTMDX7.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-RD3VPM4E.js → chunk-IKG2YVRZ.js}

@@ -3,11 +3,11 @@
 import {
   TURN_INTERRUPTION_HISTORY_TAIL_COUNT,
   detectTurnInterruption
-} from "./chunk-TXAEXF2B.js";
+} from "./chunk-ZU2T5JIS.js";
 import {
   SessionService,
   buildApiHistoryFromConversation
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-IMWCUWQT.js → chunk-J3TJH52D.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   CHANNEL_STARTUP_PROFILE_VERSION
-} from "./chunk-Z6KFLEG7.js";
+} from "./chunk-PSPAM24S.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";