@qwen-code/qwen-code 0.15.12-preview.3 → 0.16.0

package/chunks/{chunk-GJXIKCKL.js → chunk-XP27SJMH.js}

@@ -336,8 +336,8 @@ __name(sanitizeCwd, "sanitizeCwd");
 function isSubpath(parentPath, childPath) {
   const isWindows = os.platform() === "win32";
   const pathModule = isWindows ? path.win32 : path;
-  const relative = pathModule.relative(parentPath, childPath);
-  return !relative.startsWith(`..${pathModule.sep}`) && relative !== ".." && !pathModule.isAbsolute(relative);
+  const relative2 = pathModule.relative(parentPath, childPath);
+  return !relative2.startsWith(`..${pathModule.sep}`) && relative2 !== ".." && !pathModule.isAbsolute(relative2);
 }
 __name(isSubpath, "isSubpath");
 function isSubpaths(parentPath, childPath) {
@@ -443,6 +443,17 @@ var Storage = class _Storage {
     }
     return resolved;
   }
+  /**
+   * Sanitizes a session id for use as a plan filename.
+   *
+   * Plan files are keyed by session id, but the raw id is public SDK input.
+   * Strip directory separators and Windows-invalid filename characters so a
+   * hostile value cannot escape the plans directory.
+   */
+  static sanitizePlanSessionId(sessionId) {
+    const safeName = path2.basename(sessionId.replace(/\\/g, "/")).replace(/^\.+/g, "_").replace(/[<>:"|?*\x00-\x1F]/g, "_");
+    return safeName || "_";
+  }
   static resolveRuntimeBaseDir(dir, cwd) {
     if (!dir) {
       return null;
@@ -531,11 +542,71 @@ var Storage = class _Storage {
   static getGlobalIdeDir() {
     return path2.join(_Storage.getGlobalQwenDir(), IDE_DIR_NAME);
   }
-  static getPlansDir() {
+  /**
+   * Resolves pathToResolve by realpathing its deepest existing ancestor and
+   * appending the not-yet-created remainder.
+   */
+  static resolvePathThroughExistingAncestor(pathToResolve) {
+    let candidate = pathToResolve;
+    while (true) {
+      try {
+        const realCandidate = fs2.realpathSync(candidate);
+        const remainder = path2.relative(candidate, pathToResolve);
+        return path2.join(realCandidate, remainder);
+      } catch (err) {
+        if (err.code !== "ENOENT") {
+          throw err;
+        }
+        const parent = path2.dirname(candidate);
+        if (parent === candidate) {
+          return pathToResolve;
+        }
+        candidate = parent;
+      }
+    }
+  }
+  /**
+   * Checks whether {@link childPath} resides within {@link parentPath},
+   * resolving symbolic links to prevent traversal bypass attacks.
+   */
+  static isPathWithinDirectory(childPath, parentPath) {
+    const realParent = _Storage.resolvePathThroughExistingAncestor(parentPath);
+    const realChild = _Storage.resolvePathThroughExistingAncestor(childPath);
+    const relativePath = path2.relative(realParent, realChild);
+    return relativePath === "" || !relativePath.startsWith("..") && !path2.isAbsolute(relativePath);
+  }
+  static assertPathWithinDirectory(childPath, parentPath, errorMessage) {
+    if (!_Storage.isPathWithinDirectory(childPath, parentPath)) {
+      throw new FatalConfigError(errorMessage);
+    }
+  }
+  static getPlansDir(projectRoot, plansDirectory) {
+    const configuredPlansDirectory = plansDirectory?.trim();
+    if (configuredPlansDirectory) {
+      if (!projectRoot) {
+        throw new FatalConfigError(
+          "projectRoot is required when plansDirectory is configured."
+        );
+      }
+      const resolvedProjectRoot = path2.resolve(projectRoot);
+      const resolvedPlansDirectory = _Storage.resolvePath(
+        configuredPlansDirectory,
+        resolvedProjectRoot
+      );
+      _Storage.assertPathWithinDirectory(
+        resolvedPlansDirectory,
+        resolvedProjectRoot,
+        `plansDirectory must resolve within the project root.`
+      );
+      return resolvedPlansDirectory;
+    }
     return path2.join(_Storage.getGlobalQwenDir(), PLANS_DIR_NAME);
   }
-  static getPlanFilePath(sessionId) {
-    return path2.join(_Storage.getPlansDir(), `${sessionId}.md`);
+  static getPlanFilePath(sessionId, projectRoot, plansDirectory) {
+    return path2.join(
+      _Storage.getPlansDir(projectRoot, plansDirectory),
+      `${_Storage.sanitizePlanSessionId(sessionId)}.md`
+    );
   }
   static getGlobalBinDir() {
     return path2.join(_Storage.getGlobalQwenDir(), BIN_DIR_NAME);

package/chunks/{chunk-TPGOGCWM.js → chunk-YJLGXDQJ.js}

@@ -5,7 +5,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
+} from "./chunk-PVVL5Q3W.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{contextCommand-SVLAZMQL.js → contextCommand-7CPNXBLO.js}

@@ -4,34 +4,32 @@ import {
   collectContextData,
   contextCommand,
   formatContextUsageText
-} from "./chunk-AOJ3BBY7.js";
-import "./chunk-Y6Z2O3WR.js";
-import "./chunk-AJSOD5IR.js";
-import "./chunk-5P5XGNYH.js";
+} from "./chunk-4J63U5QO.js";
+import "./chunk-VMOAQVBP.js";
+import "./chunk-3T4ZT63H.js";
 import "./chunk-K5PGHDBN.js";
 import "./chunk-O4PICXES.js";
 import "./chunk-TW522KN6.js";
 import "./chunk-MLZQVCF3.js";
-import "./chunk-JMZQICAL.js";
-import "./chunk-5QQ5FGTU.js";
-import "./chunk-B7ZL7HUA.js";
+import "./chunk-CAVZVZX6.js";
+import "./chunk-G7YTSRES.js";
+import "./chunk-4AOCVI6J.js";
 import "./chunk-77WXWU44.js";
-import "./chunk-OCC4MZRS.js";
-import "./chunk-CAWKL3UC.js";
-import "./chunk-XLQ4E5PS.js";
-import "./chunk-SYCJMSIJ.js";
+import "./chunk-F23NCRJ2.js";
+import "./chunk-CSWBPY3P.js";
+import "./chunk-WCZWAKFG.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
-import "./chunk-CM2IESUE.js";
-import "./chunk-UXW7MYAW.js";
-import "./chunk-G27O2LD2.js";
+import "./chunk-PR4T27R7.js";
+import "./chunk-MAY32HXD.js";
+import "./chunk-D5NTAHYL.js";
 import "./chunk-T4VD6OJ4.js";
 import "./chunk-RDYWTWEM.js";
-import "./chunk-TPGOGCWM.js";
-import "./chunk-FYMSCRHM.js";
-import "./chunk-SQNQIOD5.js";
-import "./chunk-FKVKVE6N.js";
-import "./chunk-GJXIKCKL.js";
+import "./chunk-YJLGXDQJ.js";
+import "./chunk-PVVL5Q3W.js";
+import "./chunk-GGNTZ2NH.js";
+import "./chunk-KXZ4TJB4.js";
+import "./chunk-XP27SJMH.js";
 import "./chunk-E7E2MFYM.js";
 import "./chunk-ZERZSAZL.js";
 import "./chunk-QN5NZ3UQ.js";

package/chunks/{cron-create-WUTD5ZTH.js → cron-create-IGYXQVG4.js}

@@ -11,8 +11,8 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
-import "./chunk-GJXIKCKL.js";
+} from "./chunk-PVVL5Q3W.js";
+import "./chunk-XP27SJMH.js";
 import "./chunk-QWSRH265.js";
 import {
   init_esbuild_shims
@@ -34,6 +34,17 @@ var CronCreateInvocation = class extends BaseToolInvocation {
   getDescription() {
     return `${this.params.cron}: ${this.params.prompt}`;
   }
+  /**
+   * The scheduled prompt fires against the agent at cron-trigger time
+   * and executes with full tool access. The CronCreateTool's L3 default
+   * must NOT be 'allow', because AUTO mode short-circuits at L4 when
+   * `finalPermission === 'allow'` — the classifier never runs and an
+   * arbitrary scheduled prompt is silently approved. `'ask'` routes
+   * the call through the classifier (or manual approval in DEFAULT).
+   */
+  async getDefaultPermission() {
+    return "ask";
+  }
   async execute() {
     const scheduler = this.config.getCronScheduler();
     const recurring = this.params.recurring !== false;
@@ -108,6 +119,21 @@ var CronCreateTool = class _CronCreateTool extends BaseDeclarativeTool {
   createInvocation(params) {
     return new CronCreateInvocation(this.config, params);
   }
+  /**
+   * Forward the prompt and cadence to the classifier. The scheduled
+   * prompt will be enqueued and executed against the agent at fire-time,
+   * so it must go through the same scrutiny as a direct command. Without
+   * this override the default projection returns `''` and the classifier
+   * sees `cron_create({})` — blind to what the agent will be asked to
+   * do in 8 hours.
+   */
+  toAutoClassifierInput(params) {
+    return {
+      cron: params.cron,
+      prompt: params.prompt,
+      recurring: params.recurring ?? true
+    };
+  }
 };
 export {
   CronCreateTool

package/chunks/{cron-delete-N3UQYCRA.js → cron-delete-ETKIZCWT.js}

@@ -5,8 +5,8 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
-import "./chunk-GJXIKCKL.js";
+} from "./chunk-PVVL5Q3W.js";
+import "./chunk-XP27SJMH.js";
 import "./chunk-QWSRH265.js";
 import {
   init_esbuild_shims

package/chunks/{cron-list-Z6RJJ4YH.js → cron-list-BVCUSWRU.js}

@@ -8,8 +8,8 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
-import "./chunk-GJXIKCKL.js";
+} from "./chunk-PVVL5Q3W.js";
+import "./chunk-XP27SJMH.js";
 import "./chunk-QWSRH265.js";
 import {
   init_esbuild_shims

package/chunks/{de-MNR4SMAI.js → de-V4IE2OOZ.js}

@@ -125,7 +125,7 @@ var de_default = {
   "Compresses the context by replacing it with a summary.": "Komprimiert den Kontext durch Ersetzen mit einer Zusammenfassung.",
   "open full Qwen Code documentation in your browser": "Vollst\xE4ndige Qwen Code Dokumentation im Browser \xF6ffnen",
   "Configuration not available.": "Konfiguration nicht verf\xFCgbar.",
-  "Configure authentication information for login": "Authentifizierungsinformationen f\xFCr die Anmeldung konfigurieren",
+  "Connect an LLM provider": "LLM-Anbieter verbinden",
   "Copy the last result or code snippet to clipboard": "Letztes Ergebnis oder Codeausschnitt in die Zwischenablage kopieren",
   // ============================================================================
   // Commands - Agents
@@ -782,8 +782,8 @@ var de_default = {
   "Continue previous conversation": "Vorheriges Gespr\xE4ch fortsetzen",
   "\u{1F44B} Welcome back! (Last updated: {{timeAgo}})": "\u{1F44B} Willkommen zur\xFCck! (Zuletzt aktualisiert: {{timeAgo}})",
   "\u{1F3AF} Overall Goal:": "\u{1F3AF} Gesamtziel:",
-  "Select Authentication Method": "Authentifizierungsmethode ausw\xE4hlen",
-  "You must select an auth method to proceed. Press Ctrl+C again to exit.": "Sie m\xFCssen eine Authentifizierungsmethode w\xE4hlen, um fortzufahren. Dr\xFCcken Sie erneut Ctrl+C zum Beenden.",
+  "Connect a Provider": "Anbieter verbinden",
+  "You must connect a provider to proceed. Press Ctrl+C again to exit.": "Sie m\xFCssen einen Anbieter verbinden, um fortzufahren. Dr\xFCcken Sie erneut Ctrl+C zum Beenden.",
   "Terms of Services and Privacy Notice": "Nutzungsbedingungen und Datenschutzhinweis",
   "Qwen OAuth": "Qwen OAuth",
   "Discontinued \u2014 switch to Coding Plan or API Key": "Eingestellt \u2014 wechseln Sie zu Coding Plan oder API Key",

package/chunks/{dist-RRYNPBOE.js → dist-4L54HRX2.js}

@@ -11,10 +11,10 @@ import {
   sendMessage,
   sendTyping,
   uploadToCdn
-} from "./chunk-AEJ2DKLP.js";
+} from "./chunk-C6WMLUNB.js";
 import {
   ChannelBase
-} from "./chunk-YHEAJFCI.js";
+} from "./chunk-USE2VQ5P.js";
 import "./chunk-UFC57OYT.js";
 import "./chunk-K5PGHDBN.js";
 import {

package/chunks/{dist-WP4AH3VK.js → dist-BXDUQ2QY.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-KQIKOTQJ.js";
 import {
   ChannelBase
-} from "./chunk-YHEAJFCI.js";
+} from "./chunk-USE2VQ5P.js";
 import "./chunk-UFC57OYT.js";
 import "./chunk-K5PGHDBN.js";
 import {

package/chunks/{dist-M6GFCZ7S.js → dist-MN2PDDPR.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-7RYW5LQV.js";
 import {
   ChannelBase
-} from "./chunk-YHEAJFCI.js";
+} from "./chunk-USE2VQ5P.js";
 import "./chunk-UFC57OYT.js";
 import "./chunk-K5PGHDBN.js";
 import {

package/chunks/{edit-VNAZBIZR.js → edit-CBM5NDVK.js}

@@ -3,7 +3,7 @@
 import {
   StructuredToolError,
   checkPriorRead
-} from "./chunk-CBVB66WY.js";
+} from "./chunk-L5E26RN6.js";
 import {
   CommitAttributionService,
   DEFAULT_DIFF_OPTIONS,
@@ -13,18 +13,17 @@ import {
   getDiffStat,
   needsUtf8Bom,
   safeLiteralReplace
-} from "./chunk-AJSOD5IR.js";
-import "./chunk-5P5XGNYH.js";
+} from "./chunk-3T4ZT63H.js";
 import "./chunk-K5PGHDBN.js";
 import "./chunk-O4PICXES.js";
 import "./chunk-TW522KN6.js";
 import "./chunk-MLZQVCF3.js";
-import "./chunk-JMZQICAL.js";
-import "./chunk-5QQ5FGTU.js";
-import "./chunk-B7ZL7HUA.js";
+import "./chunk-CAVZVZX6.js";
+import "./chunk-G7YTSRES.js";
+import "./chunk-4AOCVI6J.js";
 import "./chunk-77WXWU44.js";
-import "./chunk-OCC4MZRS.js";
-import "./chunk-CAWKL3UC.js";
+import "./chunk-F23NCRJ2.js";
+import "./chunk-CSWBPY3P.js";
 import {
   FileOperationEvent,
   ReadFileTool,
@@ -32,32 +31,31 @@ import {
   getLanguageFromFilePath,
   getSpecificMimeType,
   logFileOperation
-} from "./chunk-XLQ4E5PS.js";
-import "./chunk-SYCJMSIJ.js";
+} from "./chunk-WCZWAKFG.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
 import {
   isAutoMemPath
-} from "./chunk-CM2IESUE.js";
-import "./chunk-UXW7MYAW.js";
-import "./chunk-G27O2LD2.js";
+} from "./chunk-PR4T27R7.js";
+import "./chunk-MAY32HXD.js";
+import "./chunk-D5NTAHYL.js";
 import "./chunk-T4VD6OJ4.js";
 import "./chunk-RDYWTWEM.js";
-import "./chunk-TPGOGCWM.js";
+import "./chunk-YJLGXDQJ.js";
 import {
   BaseDeclarativeTool,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
-import "./chunk-SQNQIOD5.js";
-import "./chunk-FKVKVE6N.js";
+} from "./chunk-PVVL5Q3W.js";
+import "./chunk-GGNTZ2NH.js";
+import "./chunk-KXZ4TJB4.js";
 import {
   createDebugLogger,
   isNodeError,
   makeRelative,
   shortenPath,
   unescapePath
-} from "./chunk-GJXIKCKL.js";
+} from "./chunk-XP27SJMH.js";
 import "./chunk-E7E2MFYM.js";
 import "./chunk-ZERZSAZL.js";
 import "./chunk-QN5NZ3UQ.js";
@@ -884,6 +882,18 @@ Expectation for required parameters:
   createInvocation(params) {
     return new EditToolInvocation(this.config, params);
   }
+  toAutoClassifierInput(params) {
+    const oldStr = params.old_string ?? "";
+    const newStr = params.new_string ?? "";
+    return {
+      file_path: params.file_path,
+      old_string_preview: oldStr.slice(0, 300),
+      new_string_preview: newStr.slice(0, 300),
+      old_string_truncated: oldStr.length > 300,
+      new_string_truncated: newStr.length > 300,
+      lines_changed: (newStr.match(/\n/g)?.length ?? 0) - (oldStr.match(/\n/g)?.length ?? 0)
+    };
+  }
   getModifyContext(_) {
     return {
       getFilePath: /* @__PURE__ */ __name((params) => params.file_path, "getFilePath"),

package/chunks/{en-NRN4QBAT.js → en-HGJ2SPLM.js}

@@ -74,6 +74,7 @@ var en_default = {
   "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
   "for help on Qwen Code": "for help on Qwen Code",
   "show version info": "show version info",
+  "show paths for current session files and logs": "show paths for current session files and logs",
   "submit a bug report": "submit a bug report",
   Status: "Status",
   // ============================================================================
@@ -148,7 +149,7 @@ var en_default = {
   "Compresses the context by replacing it with a summary.": "Compresses the context by replacing it with a summary.",
   "open full Qwen Code documentation in your browser": "open full Qwen Code documentation in your browser",
   "Configuration not available.": "Configuration not available.",
-  "Configure authentication information for login": "Configure authentication information for login",
+  "Connect an LLM provider": "Connect an LLM provider",
   "Copy the last result or code snippet to clipboard": "Copy the last result or code snippet to clipboard",
   "Show working-tree change stats versus HEAD": "Show working-tree change stats versus HEAD",
   "Could not determine current working directory.": "Could not determine current working directory.",
@@ -876,8 +877,8 @@ var en_default = {
   "Continue previous conversation": "Continue previous conversation",
   "\u{1F44B} Welcome back! (Last updated: {{timeAgo}})": "\u{1F44B} Welcome back! (Last updated: {{timeAgo}})",
   "\u{1F3AF} Overall Goal:": "\u{1F3AF} Overall Goal:",
-  "Select Authentication Method": "Select Authentication Method",
-  "You must select an auth method to proceed. Press Ctrl+C again to exit.": "You must select an auth method to proceed. Press Ctrl+C again to exit.",
+  "Connect a Provider": "Connect a Provider",
+  "You must connect a provider to proceed. Press Ctrl+C again to exit.": "You must connect a provider to proceed. Press Ctrl+C again to exit.",
   "Terms of Services and Privacy Notice": "Terms of Services and Privacy Notice",
   "Qwen OAuth": "Qwen OAuth",
   "Discontinued \u2014 switch to Coding Plan or API Key": "Discontinued \u2014 switch to Coding Plan or API Key",
@@ -1456,6 +1457,7 @@ var en_default = {
   "Set up Qwen Code's status line UI": "Set up Qwen Code's status line UI",
   // === Core: added from PR #3328 ===
   "Open the memory manager.": "Open the memory manager.",
+  "Show current process memory diagnostics": "Show current process memory diagnostics",
   "Save a durable memory to the memory system.": "Save a durable memory to the memory system.",
   "Ask a quick side question without affecting the main conversation": "Ask a quick side question without affecting the main conversation",
   "Manage Arena sessions": "Manage Arena sessions",

package/chunks/{enter-worktree-FOF5YZIV.js → enter-worktree-XABKPLO6.js}

@@ -2,40 +2,39 @@
 "use strict";
 import {
   GitWorktreeService,
+  writeWorktreeSession,
   writeWorktreeSessionMarker
-} from "./chunk-AJSOD5IR.js";
-import "./chunk-5P5XGNYH.js";
+} from "./chunk-3T4ZT63H.js";
 import "./chunk-K5PGHDBN.js";
 import "./chunk-O4PICXES.js";
 import "./chunk-TW522KN6.js";
 import "./chunk-MLZQVCF3.js";
-import "./chunk-JMZQICAL.js";
-import "./chunk-5QQ5FGTU.js";
-import "./chunk-B7ZL7HUA.js";
+import "./chunk-CAVZVZX6.js";
+import "./chunk-G7YTSRES.js";
+import "./chunk-4AOCVI6J.js";
 import "./chunk-77WXWU44.js";
-import "./chunk-OCC4MZRS.js";
-import "./chunk-CAWKL3UC.js";
-import "./chunk-XLQ4E5PS.js";
-import "./chunk-SYCJMSIJ.js";
+import "./chunk-F23NCRJ2.js";
+import "./chunk-CSWBPY3P.js";
+import "./chunk-WCZWAKFG.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
-import "./chunk-CM2IESUE.js";
-import "./chunk-UXW7MYAW.js";
-import "./chunk-G27O2LD2.js";
+import "./chunk-PR4T27R7.js";
+import "./chunk-MAY32HXD.js";
+import "./chunk-D5NTAHYL.js";
 import "./chunk-T4VD6OJ4.js";
 import "./chunk-RDYWTWEM.js";
-import "./chunk-TPGOGCWM.js";
+import "./chunk-YJLGXDQJ.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
-import "./chunk-SQNQIOD5.js";
-import "./chunk-FKVKVE6N.js";
+} from "./chunk-PVVL5Q3W.js";
+import "./chunk-GGNTZ2NH.js";
+import "./chunk-KXZ4TJB4.js";
 import {
   createDebugLogger
-} from "./chunk-GJXIKCKL.js";
+} from "./chunk-XP27SJMH.js";
 import "./chunk-E7E2MFYM.js";
 import "./chunk-ZERZSAZL.js";
 import "./chunk-QN5NZ3UQ.js";
@@ -116,6 +115,14 @@ var EnterWorktreeInvocation = class extends BaseToolInvocation {
         `enter_worktree: getCurrentBranch failed at ${projectRoot}: ${error}`
       );
     }
+    let originalHeadCommit = "";
+    try {
+      originalHeadCommit = await service.getCurrentCommitHash();
+    } catch (error) {
+      debugLogger.warn(
+        `enter_worktree: getCurrentCommitHash failed at ${projectRoot}: ${error}`
+      );
+    }
     const result = await service.createUserWorktree(slug, baseBranch);
     if (!result.success || !result.worktree) {
       const reason = result.error ?? "Failed to create worktree.";
@@ -132,6 +139,23 @@ var EnterWorktreeInvocation = class extends BaseToolInvocation {
         `enter_worktree: failed to write session marker at ${result.worktree.path}: ${error}`
       );
     }
+    try {
+      await writeWorktreeSession(
+        this.config.getSessionService().getWorktreeSessionPath(this.config.getSessionId()),
+        {
+          slug,
+          worktreePath: result.worktree.path,
+          worktreeBranch: result.worktree.branch,
+          originalCwd: projectRoot,
+          originalBranch: baseBranch ?? "HEAD",
+          originalHeadCommit
+        }
+      );
+    } catch (error) {
+      debugLogger.warn(
+        `enter_worktree: failed to write WorktreeSession sidecar: ${error}`
+      );
+    }
     const output = {
       worktreePath: result.worktree.path,
       worktreeBranch: result.worktree.branch,

package/chunks/{exit-worktree-Y6QVAO3C.js → exit-worktree-56MN2PCL.js}

@@ -2,42 +2,42 @@
 "use strict";
 import {
   GitWorktreeService,
+  clearWorktreeSession,
+  readWorktreeSession,
   readWorktreeSessionMarker,
   worktreeBranchForSlug
-} from "./chunk-AJSOD5IR.js";
-import "./chunk-5P5XGNYH.js";
+} from "./chunk-3T4ZT63H.js";
 import "./chunk-K5PGHDBN.js";
 import "./chunk-O4PICXES.js";
 import "./chunk-TW522KN6.js";
 import "./chunk-MLZQVCF3.js";
-import "./chunk-JMZQICAL.js";
-import "./chunk-5QQ5FGTU.js";
-import "./chunk-B7ZL7HUA.js";
+import "./chunk-CAVZVZX6.js";
+import "./chunk-G7YTSRES.js";
+import "./chunk-4AOCVI6J.js";
 import "./chunk-77WXWU44.js";
-import "./chunk-OCC4MZRS.js";
-import "./chunk-CAWKL3UC.js";
-import "./chunk-XLQ4E5PS.js";
-import "./chunk-SYCJMSIJ.js";
+import "./chunk-F23NCRJ2.js";
+import "./chunk-CSWBPY3P.js";
+import "./chunk-WCZWAKFG.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
-import "./chunk-CM2IESUE.js";
-import "./chunk-UXW7MYAW.js";
-import "./chunk-G27O2LD2.js";
+import "./chunk-PR4T27R7.js";
+import "./chunk-MAY32HXD.js";
+import "./chunk-D5NTAHYL.js";
 import "./chunk-T4VD6OJ4.js";
 import "./chunk-RDYWTWEM.js";
-import "./chunk-TPGOGCWM.js";
+import "./chunk-YJLGXDQJ.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-FYMSCRHM.js";
-import "./chunk-SQNQIOD5.js";
-import "./chunk-FKVKVE6N.js";
+} from "./chunk-PVVL5Q3W.js";
+import "./chunk-GGNTZ2NH.js";
+import "./chunk-KXZ4TJB4.js";
 import {
   createDebugLogger,
   isNodeError
-} from "./chunk-GJXIKCKL.js";
+} from "./chunk-XP27SJMH.js";
 import "./chunk-E7E2MFYM.js";
 import "./chunk-ZERZSAZL.js";
 import "./chunk-QN5NZ3UQ.js";
@@ -206,6 +206,7 @@ var ExitWorktreeInvocation = class extends BaseToolInvocation {
       return errorResult(result.error ?? "Failed to remove worktree.");
     }
     if (result.branchPreserved) {
+      await this.maybeClearWorktreeSession();
       const output2 = {
         action: "remove",
         worktreePath,
@@ -220,6 +221,7 @@ var ExitWorktreeInvocation = class extends BaseToolInvocation {
     debugLogger.debug(
       `Removed user worktree: ${worktreePath} (branch=${branch})`
     );
+    await this.maybeClearWorktreeSession();
     const output = {
       action: "remove",
       worktreePath,
@@ -231,6 +233,28 @@ var ExitWorktreeInvocation = class extends BaseToolInvocation {
       returnDisplay: `Removed worktree **${this.params.name}** (branch \`${branch}\`)`
     };
   }
+  /**
+   * Clears the WorktreeSession sidecar file iff its `slug` matches the
+   * worktree being exited. We skip the clear when the sidecar names a
+   * different slug because the user might have multiple worktrees on
+   * disk while the sidecar tracks only one — wiping it on every exit
+   * would orphan the currently-tracked worktree from the CLI's view.
+   *
+   * Best-effort: failures are logged, never raised.
+   */
+  async maybeClearWorktreeSession() {
+    try {
+      const sessionPath = this.config.getSessionService().getWorktreeSessionPath(this.config.getSessionId());
+      const existing = await readWorktreeSession(sessionPath);
+      if (existing && existing.slug === this.params.name) {
+        await clearWorktreeSession(sessionPath);
+      }
+    } catch (error) {
+      debugLogger.warn(
+        `exit_worktree: failed to clear WorktreeSession sidecar: ${error}`
+      );
+    }
+  }
 };
 function errorResult(message) {
   return {