@qwen-code/qwen-code 0.23.2-preview.0 → 0.23.2

package/chunks/{chunk-WZ4YULVF.js → chunk-3OAXF3UK.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   listCommand
-} from "./chunk-W673V2H3.js";
+} from "./chunk-46MMBZHI.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-VEQBVJYH.js";
+} from "./chunk-R457KFV7.js";
 import {
   CUSTOM_SANDBOX_IMAGE_ENV_VAR
-} from "./chunk-CG2PDIGD.js";
+} from "./chunk-RM244SCQ.js";
 import {
   isOwnInterfaceAddress
 } from "./chunk-24FVUD5P.js";
 import {
   serveCommand
-} from "./chunk-QLM7D7W3.js";
+} from "./chunk-QFJZAY7W.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
@@ -58,12 +58,12 @@ import {
 } from "./chunk-Y53DG2HA.js";
 import {
   CLI_VERSION
-} from "./chunk-R2266LQ5.js";
+} from "./chunk-4WMGYG3F.js";
 import {
   collectProviderModelsForProtocol,
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-7GZCCHJL.js";
+} from "./chunk-7LTCFO6T.js";
 import {
   resolveSkillSettings
 } from "./chunk-HWVUSYSN.js";
@@ -81,19 +81,20 @@ import {
   registerPermissionRelay,
   registerSessionCleanup,
   registerToolCallDispatch,
+  resolveChannelLocale,
   selectFirstModel,
   sessionsPath
-} from "./chunk-4JKLPTV6.js";
+} from "./chunk-G3ZUMSFS.js";
 import {
   getExtensionManager,
   requestChoicePluginNonInteractive,
   requestConsentNonInteractive,
   requestConsentOrFail,
   resolveExtensionCommandScope
-} from "./chunk-ORREXWOM.js";
+} from "./chunk-TODNHE76.js";
 import {
   parseChannelConfig
-} from "./chunk-UXDVUFKU.js";
+} from "./chunk-ULZECEIP.js";
 import {
   findCliEntryPath
 } from "./chunk-V6WHFGST.js";
@@ -103,7 +104,7 @@ import {
   clearAccount,
   loadAccount,
   saveAccount
-} from "./chunk-45ROPFQY.js";
+} from "./chunk-JYGIJA4W.js";
 import {
   canonicalizeWorkspace
 } from "./chunk-6PLDPT2C.js";
@@ -121,7 +122,7 @@ import {
 import {
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-GM44O6F7.js";
+} from "./chunk-DARWOZY6.js";
 import {
   CHANNEL_DAEMON_WORKER_SENTINEL,
   CHANNEL_WORKER_HEARTBEAT_INTERVAL_MS,
@@ -145,6 +146,10 @@ import {
 import {
   EXTERNAL_TOOL_GUARD_TOKEN_ENV
 } from "./chunk-3VUENPWF.js";
+import {
+  CHANNEL_WORKER_KILL_GRACE_MS,
+  CHANNEL_WORKER_STOP_GRACE_MS
+} from "./chunk-TGNNLRC3.js";
 import {
   AcpBridge,
   ChannelLoopScheduler,
@@ -155,26 +160,23 @@ import {
   isChannelProactiveDeliveryError,
   sanitizeLogText,
   sanitizePromptText
-} from "./chunk-XVTCSVBK.js";
-import {
-  CHANNEL_WORKER_KILL_GRACE_MS,
-  CHANNEL_WORKER_STOP_GRACE_MS
-} from "./chunk-5HBA2Z7V.js";
+} from "./chunk-WDVV3LRM.js";
 import {
+  pidFilePath,
   readServiceInfo,
   removeServiceInfo,
   signalService,
   waitForExit,
   writeServiceInfo
-} from "./chunk-X35VIWWJ.js";
+} from "./chunk-NFXXBWSE.js";
 import {
   assembleMcpServers,
   getPendingGatedMcpServers,
   mcpCommand
-} from "./chunk-W7PXLIZJ.js";
+} from "./chunk-RNAJVXUG.js";
 import {
   loadSettings
-} from "./chunk-Q2F43WTJ.js";
+} from "./chunk-WBU2PIZ5.js";
 import {
   detectSystemLanguage,
   getCurrentLanguage,
@@ -186,7 +188,7 @@ import {
 import {
   isFileSourcedEnvKey,
   loadEnvironment
-} from "./chunk-Y6ZWXM44.js";
+} from "./chunk-5BH2AIEY.js";
 import {
   resolveAcpChannelFallback,
   scrubAndReportInheritedLoaderEnv
@@ -196,13 +198,13 @@ import {
 } from "./chunk-2EAZ43JQ.js";
 import {
   getCliVersion
-} from "./chunk-ISPBBKJN.js";
+} from "./chunk-MV5DTLJV.js";
 import {
   getPackageJson
 } from "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-7RXOEUFF.js";
+} from "./chunk-NX7ZTXFF.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -224,7 +226,7 @@ import {
   removeChannelMemoryEntries,
   removePeerController,
   updateChannelMemoryEntry
-} from "./chunk-BL6B2QS2.js";
+} from "./chunk-GOEVQADN.js";
 import {
   hideBin,
   yargs_default
@@ -265,7 +267,7 @@ import {
   sanitizeFilenameComponent,
   unquoteCStylePath,
   updateSetting
-} from "./chunk-43CI6YWJ.js";
+} from "./chunk-HJ5UJQQL.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -278,7 +280,10 @@ import {
 } from "./chunk-TRWQQBVH.js";
 import {
   listLiveSessions
-} from "./chunk-B44JBZBB.js";
+} from "./chunk-QQK4L3UU.js";
+import {
+  isSameProcess
+} from "./chunk-CH2YDT6X.js";
 import {
   APPROVAL_MODES
 } from "./chunk-JX6XHPTX.js";
@@ -295,7 +300,7 @@ import {
 } from "./chunk-7OCIQNKX.js";
 import {
   parseLineTolerant
-} from "./chunk-OIPUQE3S.js";
+} from "./chunk-F2NYVASI.js";
 import {
   getAllMemoryFilenames,
   setMemoryFilename
@@ -304,7 +309,7 @@ import {
   DEFAULT_QWEN_EMBEDDING_MODEL,
   VERTEX_ADC_HINT,
   hasVertexProjectConfigured
-} from "./chunk-DTB5BXRG.js";
+} from "./chunk-JO77FGNZ.js";
 import {
   atomicWriteFileSync
 } from "./chunk-XFFRI3WM.js";
@@ -2969,6 +2974,10 @@ function channelMemoryOptions(getBridge, cwd) {
   };
 }
 __name(channelMemoryOptions, "channelMemoryOptions");
+function isUnverifiablePidfileError(err) {
+  return err instanceof Error && err.code === "channel_service_conflict";
+}
+__name(isUnverifiablePidfileError, "isUnverifiablePidfileError");
 async function writeServiceInfoOrExit(channels, cleanup) {
   try {
     writeServiceInfo(channels);
@@ -2980,6 +2989,10 @@ async function writeServiceInfoOrExit(channels, cleanup) {
       );
       process.exit(1);
     }
+    if (isUnverifiablePidfileError(err)) {
+      writeStderrLine(`Error: ${err.message}`);
+      process.exit(1);
+    }
     throw err;
   }
 }
@@ -3163,7 +3176,7 @@ function checkDuplicateInstance() {
   }
 }
 __name(checkDuplicateInstance, "checkDuplicateInstance");
-async function startSingle(name, proxy, cronEnabled, displayLanguage) {
+async function startSingle(name, proxy, cronEnabled, locale, displayLanguage) {
   checkDuplicateInstance();
   const channelsConfig = loadChannelsConfig();
   await loadChannelsFromExtensions();
@@ -3209,6 +3222,7 @@ async function startSingle(name, proxy, cronEnabled, displayLanguage) {
   const loopController = loopStore ? createChannelLoopController(loopStore) : void 0;
   const channels = /* @__PURE__ */ new Map();
   const channel = await createChannel(name, config2, bridge, {
+    locale,
     router,
     proxy,
     ...displayLanguage ? { displayLanguage } : {},
@@ -3299,7 +3313,7 @@ async function startSingle(name, proxy, cronEnabled, displayLanguage) {
   });
 }
 __name(startSingle, "startSingle");
-async function startAll(proxy, cronEnabled, displayLanguage) {
+async function startAll(proxy, cronEnabled, locale, displayLanguage) {
   checkDuplicateInstance();
   const channelsConfig = loadChannelsConfig();
   await loadChannelsFromExtensions();
@@ -3350,6 +3364,7 @@ async function startAll(proxy, cronEnabled, displayLanguage) {
     channels.set(
       name,
       await createChannel(name, config2, bridge, {
+        locale,
         router,
         proxy,
         ...displayLanguage ? { displayLanguage } : {},
@@ -3474,21 +3489,47 @@ var startCommand = {
       settings.merged.proxy
     );
     const cronEnabled = isChannelCronEnabled(settings);
+    const locale = resolveChannelLocale(settings.merged.general?.language);
     const displayLanguage = resolveLanguage(
       resolveLanguageSetting(
         settings.merged.general?.language
       )
     );
     if (argv.name) {
-      await startSingle(argv.name, proxy, cronEnabled, displayLanguage);
+      await startSingle(argv.name, proxy, cronEnabled, locale, displayLanguage);
     } else {
-      await startAll(proxy, cronEnabled, displayLanguage);
+      await startAll(proxy, cronEnabled, locale, displayLanguage);
     }
   }, "handler")
 };
 
 // packages/cli/src/commands/channel/stop.ts
 init_esbuild_shims();
+function reportUnstoppableService(info, outcome) {
+  const filePath = pidFilePath();
+  if (outcome === "not-permitted") {
+    writeStderrLine(
+      `Permission denied signalling the service (PID ${info.pid}); it may be owned by another user sharing this home. Stop it as that user \u2014 once the process is gone, the record at ${filePath} is swept on the next read.`
+    );
+    return;
+  }
+  if (info.procStart == null) {
+    writeStderrLine(
+      `Could not stop PID ${info.pid}, and the record carries no process token, so this command cannot confirm it is the channel service. If no channel service is running, delete ${filePath} and start again.`
+    );
+    return;
+  }
+  if (outcome === "sent") {
+    writeStderrLine(
+      `Service is still running after SIGKILL; its record at ${filePath} was left in place.`
+    );
+    return;
+  }
+  writeStderrLine(
+    `Failed to signal the service and could not re-verify its process token; its record at ${filePath} was left in place.`
+  );
+}
+__name(reportUnstoppableService, "reportUnstoppableService");
 var stopCommand = {
   command: "stop",
   describe: "Stop the running channel service",
@@ -3503,7 +3544,7 @@ var stopCommand = {
     if (argv["daemon-url"]) {
       const token = argv.token ?? process.env[QWEN_SERVER_TOKEN_ENV] ?? process.env[QWEN_DAEMON_TOKEN_ENV];
       try {
-        const sdk = await import("./daemon-UI6SQSBV.js");
+        const sdk = await import("./daemon-2CKIAO3I.js");
         const client = new sdk.DaemonClient({
           baseUrl: argv["daemon-url"],
           ...token ? { token } : {}
@@ -3535,25 +3576,34 @@ var stopCommand = {
       process.exit(1);
     }
     writeStdoutLine(`Stopping channel service (PID ${info.pid})...`);
-    if (!signalService(info.pid, "SIGTERM")) {
+    const outcome = signalService(info.pid, "SIGTERM", info.procStart);
+    if (outcome !== "sent") {
+      if (isSameProcess(info.pid, info.procStart)) {
+        reportUnstoppableService(info, outcome);
+        process.exit(1);
+      }
       writeStderrLine(
         "Failed to send signal \u2014 process may have already exited."
       );
-      removeServiceInfo();
+      removeServiceInfo(info);
       process.exit(0);
     }
-    const exited = await waitForExit(info.pid, 5e3);
+    const exited = await waitForExit(info.pid, 5e3, 200, info.procStart);
     if (exited) {
-      removeServiceInfo();
+      removeServiceInfo(info);
       writeStdoutLine("Service stopped.");
     } else {
       writeStderrLine(
         "Service did not exit within 5 seconds. Sending SIGKILL..."
       );
-      signalService(info.pid, "SIGKILL");
-      await waitForExit(info.pid, 2e3);
-      removeServiceInfo();
-      writeStdoutLine("Service killed.");
+      const killOutcome = signalService(info.pid, "SIGKILL", info.procStart);
+      if (await waitForExit(info.pid, 2e3, 200, info.procStart)) {
+        removeServiceInfo(info);
+        writeStdoutLine("Service killed.");
+      } else {
+        reportUnstoppableService(info, killOutcome);
+        process.exit(1);
+      }
     }
     process.exit(0);
   }, "handler")
@@ -3689,7 +3739,7 @@ var statusCommand = {
     if (argv["daemon-url"]) {
       const token = argv.token ?? process.env[QWEN_SERVER_TOKEN_ENV] ?? process.env[QWEN_DAEMON_TOKEN_ENV];
       try {
-        const sdk = await import("./daemon-UI6SQSBV.js");
+        const sdk = await import("./daemon-2CKIAO3I.js");
         const client = new sdk.DaemonClient({
           baseUrl: argv["daemon-url"],
           ...token ? { token } : {}
@@ -3800,7 +3850,7 @@ var reloadCommand = {
     const token = resolveToken(argv.token);
     let sdk;
     try {
-      sdk = await import("./daemon-UI6SQSBV.js");
+      sdk = await import("./daemon-2CKIAO3I.js");
     } catch (err) {
       writeStderrLine(
         `[Channel] Failed to load daemon SDK: ${safeChannelCommandErrorMessage(err)}`
@@ -3880,7 +3930,7 @@ var setCommand2 = {
     const selection = names[0] === "all" ? { mode: "all" } : { mode: "names", names };
     let sdk;
     try {
-      sdk = await import("./daemon-UI6SQSBV.js");
+      sdk = await import("./daemon-2CKIAO3I.js");
     } catch (error) {
       writeStderrLine(
         `[Channel] Failed to load daemon SDK: ${safeChannelCommandErrorMessage(error)}`
@@ -4038,7 +4088,7 @@ function createDaemonChannelBridgeFacade(bridge, opts) {
 }
 __name(createDaemonChannelBridgeFacade, "createDaemonChannelBridgeFacade");
 async function loadDaemonSdk() {
-  return await import("./daemon-UI6SQSBV.js");
+  return await import("./daemon-2CKIAO3I.js");
 }
 __name(loadDaemonSdk, "loadDaemonSdk");
 function selectedChannelNames(channelsConfig, selection) {
@@ -4195,6 +4245,7 @@ async function runChannelDaemonWorker(opts) {
     void 0,
     settings.merged.proxy
   );
+  const locale = resolveChannelLocale(settings.merged.general?.language);
   const displayLanguage = resolveLanguage(
     resolveLanguageSetting(
       settings.merged.general?.language
@@ -4311,6 +4362,7 @@ async function runChannelDaemonWorker(opts) {
         name,
         await abortableStartup(
           createChannel(name, config2, bridgeFacade, {
+            locale,
             ...proxy ? { proxy } : {},
             ...displayLanguage ? { displayLanguage } : {},
             router: createdRouter,
@@ -6704,6 +6756,7 @@ function filterCommandsIn(commonDir, gitDir) {
   }
   const filters = /* @__PURE__ */ new Set();
   const unread = /* @__PURE__ */ new Set();
+  const dangling = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();
   const read = /* @__PURE__ */ __name((file) => {
     const r = spawnSync2(
@@ -6737,12 +6790,17 @@ function filterCommandsIn(commonDir, gitDir) {
   const visit = /* @__PURE__ */ __name((file, depth, via) => {
     let real;
     try {
-      real = realpathSync3(file);
-    } catch {
+      real = realpathSync3.native(file);
+    } catch (e) {
       if (via !== null) {
-        unread.add(
-          `${via} -> ${file} (missing \u2014 git ignores a dangling include; this screen refuses it)`
-        );
+        const code2 = e?.code;
+        if (code2 === "ENOENT") {
+          dangling.add(`${via} -> ${file} (missing \u2014 git ignores it)`);
+        } else {
+          unread.add(
+            `${via} -> ${file} (could not be resolved: ${code2 ?? "unknown"} \u2014 not screened)`
+          );
+        }
       }
       return;
     }
@@ -6784,20 +6842,24 @@ function filterCommandsIn(commonDir, gitDir) {
       }
       let target;
       if (value.startsWith("~/")) {
-        target = join7(process.env["HOME"] || homedir(), value.slice(2));
+        target = `${process.env["HOME"] || homedir()}${sep3}${value.slice(2)}`;
       } else if (value.startsWith("~")) {
         unread.add(
           `${key} -> ${value} (another user's home \u2014 not resolved here)`
         );
         continue;
       } else {
-        target = resolve4(dirname3(file), value);
+        target = isAbsolute3(value) ? value : `${dirname3(file)}${sep3}${value}`;
       }
       visit(target, depth + 1, `${key} (in ${file})`);
     }
   }, "visit");
   for (const candidate of candidates) visit(candidate, 0, null);
-  return { filters: [...filters], unread: [...unread] };
+  return {
+    filters: [...filters],
+    unread: [...unread],
+    dangling: [...dangling]
+  };
 }
 __name(filterCommandsIn, "filterCommandsIn");
 function describeFilterScreen(hits) {
@@ -6830,7 +6892,8 @@ function filterBlankEnv(filterKeys) {
   return env;
 }
 __name(filterBlankEnv, "filterBlankEnv");
-function localFilterCommands(worktree) {
+var UNRESOLVED_REPO = "the repository's git directories could not be resolved (git rev-parse failed) \u2014 not screened";
+function screenForTree(worktree) {
   const discover = /* @__PURE__ */ __name((flag) => {
     const r = spawnSync2("git", ["rev-parse", "--path-format=absolute", flag], {
       cwd: worktree,
@@ -6844,15 +6907,22 @@ function localFilterCommands(worktree) {
   }, "discover");
   const commonDir = discover("--git-common-dir");
   const gitDir = discover("--git-dir");
-  if (commonDir === null || gitDir === null) {
-    return [
-      "the repository's git directories could not be resolved (git rev-parse failed) \u2014 not screened"
-    ];
-  }
-  const screen = filterCommandsIn(commonDir, gitDir);
-  return [...screen.filters, ...screen.unread];
+  if (commonDir === null || gitDir === null) return null;
+  return filterCommandsIn(commonDir, gitDir);
+}
+__name(screenForTree, "screenForTree");
+function localFilterCommands(worktree) {
+  const screen = screenForTree(worktree);
+  if (screen === null) return [UNRESOLVED_REPO];
+  return [...screen.filters, ...screen.unread, ...screen.dangling];
 }
 __name(localFilterCommands, "localFilterCommands");
+function checkoutFilterCommands(worktree) {
+  const screen = screenForTree(worktree);
+  if (screen === null) return [UNRESOLVED_REPO];
+  return [...screen.filters, ...screen.unread];
+}
+__name(checkoutFilterCommands, "checkoutFilterCommands");
 function discardWorktree(cwd, tree) {
   let symlink = false;
   try {
@@ -7118,11 +7188,12 @@ function worktreeResidue(cwd, cap = RESIDUE_PATH_CAP, expectedHeadSha) {
         }
       }
       const screen = filterCommandsIn(commonDir, realpathSync3(gitDir));
-      if (screen.unread.length > 0) {
+      const notReadToTheBottom = [...screen.unread, ...screen.dangling];
+      if (notReadToTheBottom.length > 0) {
         return {
           paths: [],
           total: 0,
-          unmeasured: `the residue measurement would run under repo-local config this screen could not read to the bottom: ${describeFilterScreen(screen.unread)} \u2014 a content filter reached that way would execute on the index refresh, and a filter the screen cannot see it cannot blank; remove the include, or the file it names, if it is not yours`
+          unmeasured: `the residue measurement would run under repo-local config this screen could not read to the bottom: ${describeFilterScreen(notReadToTheBottom)} \u2014 a content filter reached that way would execute on the index refresh, and a filter the screen cannot see it cannot blank; remove the include, or the file it names, if it is not yours`
         };
       }
       filterBlanks = filterBlankEnv(screen.filters);
@@ -39191,6 +39262,16 @@ function classifyProbeRun(exitCode, stdout, probes, stderr = "") {
   });
 }
 __name(classifyProbeRun, "classifyProbeRun");
+var CHECKOUT_INERT = [
+  "-c",
+  "core.hooksPath=/dev/null/no-hooks",
+  "-c",
+  "core.fsmonitor="
+];
+function filterScreenRefusal(hits, rewrite) {
+  return `the repository's local config defines content filter(s), or includes config this screen could not read to the bottom: ${describeFilterScreen(hits.map(inertPath))} \u2014 ${rewrite}`;
+}
+__name(filterScreenRefusal, "filterScreenRefusal");
 function git4(cwd, ...args) {
   const r = spawnSync10("git", args, {
     cwd,
@@ -39366,14 +39447,15 @@ function restoreProbeTreeTracked(probeTree) {
   } catch (e) {
     return e instanceof Error ? e.message : String(e);
   }
-  const inert = [
-    "-c",
-    "core.hooksPath=/dev/null/no-hooks",
-    "-c",
-    "core.fsmonitor="
-  ];
+  const filters = checkoutFilterCommands(probeTree);
+  if (filters.length > 0) {
+    return filterScreenRefusal(
+      filters,
+      "this tree's restore would EXECUTE them"
+    );
+  }
   for (const args of [
-    [...inert, "checkout", "--force", "HEAD", "--", "."],
+    [...CHECKOUT_INERT, "checkout", "--force", "HEAD", "--", "."],
     // `-ffdx`, because `-fd` honors the ignore rules — and those belong to the
     // commit under test, so a plant named to match one of them (a committed
     // `.gitignore` line and a file to match it) survived every restore. The
@@ -39381,7 +39463,7 @@ function restoreProbeTreeTracked(probeTree) {
     // rather than built, and it is the only ignored thing in this tree the
     // probes cannot run without. Everything else ignored — a built `dist`, a
     // planted config — goes.
-    [...inert, "clean", "-ffdx", "-e", "node_modules"]
+    [...CHECKOUT_INERT, "clean", "-ffdx", "-e", "node_modules"]
   ]) {
     const r = spawnSync10("git", args, {
       cwd: probeTree,
@@ -39390,7 +39472,9 @@ function restoreProbeTreeTracked(probeTree) {
     });
     if (r.error) return r.error.message;
     if (r.status !== 0) {
-      return (r.stderr ?? "").toString().trim() || `git ${args[2]} exited ${r.status}`;
+      return (r.stderr ?? "").toString().trim() || // The subcommand, not `args[2]`: that index is a `-c` from the inert
+      // pair, so the message read "git -c exited 1" and named nothing.
+      `git ${args[CHECKOUT_INERT.length]} exited ${r.status}`;
     }
   }
   const bits = spawnSync10(
@@ -39630,6 +39714,17 @@ function runOneHunkProbe(probeTree, hunk, probes, deadlineAt, now = Date.now, de
       detail: "the probe target was relinked through a symlink before the reverse patch applied \u2014 nothing was neutralised"
     };
   }
+  const applyFilters = checkoutFilterCommands(probeTree);
+  if (applyFilters.length > 0) {
+    return {
+      ...meta,
+      verdict: "inconclusive",
+      detail: filterScreenRefusal(
+        applyFilters,
+        "this reverse-apply would EXECUTE them"
+      )
+    };
+  }
   const applied = spawnSync10("git", ["apply", "--reverse", "-"], {
     cwd: probeTree,
     input: hunk.patch,
@@ -39937,8 +40032,25 @@ async function runTestEfficacy(args) {
     let created = false;
     let sweep;
     try {
+      const creationFilters = checkoutFilterCommands(worktree);
+      if (creationFilters.length > 0) {
+        throw new Error(
+          filterScreenRefusal(
+            creationFilters,
+            "creating the probe tree would EXECUTE them"
+          )
+        );
+      }
       sweep = discardWorktree(worktree, probeTree);
-      git4(worktree, "worktree", "add", "--detach", probeTree, headSha);
+      git4(
+        worktree,
+        ...CHECKOUT_INERT,
+        "worktree",
+        "add",
+        "--detach",
+        probeTree,
+        headSha
+      );
       created = true;
     } catch (e) {
       const detail = worktreeCreateFailureDetail(
@@ -40027,7 +40139,7 @@ async function runTestEfficacy(args) {
             );
             if (harnessValidated === null) {
               noteMutants(
-                `the positive control could not be set up (${greenProbes[0]} could not be read in the probe tree), so the harness was NOT validated this run \u2014 read every survivor below as unconfirmed by a control`
+                `the positive control could not be set up (the probe target was relinked, the probe tree could not be restored, or ${greenProbes[0]} could not be read in it), so the harness was NOT validated this run \u2014 read every survivor below as unconfirmed by a control`
               );
             }
           }
@@ -40133,7 +40245,23 @@ async function runTestEfficacy(args) {
           (existsAtBase(probeTree, base, p) ? modified : added).push(p);
         }
         if (modified.length > 0) {
-          git4(probeTree, "checkout", base, "--", ...modified);
+          const revertFilters = checkoutFilterCommands(probeTree);
+          if (revertFilters.length > 0) {
+            throw new Error(
+              filterScreenRefusal(
+                revertFilters,
+                "this revert's checkout would EXECUTE them"
+              )
+            );
+          }
+          git4(
+            probeTree,
+            ...CHECKOUT_INERT,
+            "checkout",
+            base,
+            "--",
+            ...modified
+          );
         }
         for (const p of added) safeRmWithin(probeTree, p);
         const collectable = probes.filter(
@@ -43565,10 +43693,10 @@ var updateCommand3 = {
       stdioHelpers,
       { updateEventEmitter }
     ] = await Promise.all([
-      import("./settings-RKEQQDFC.js"),
-      import("./updateCheck-EIZIO7HI.js"),
-      import("./installationInfo-Y52756EC.js"),
-      import("./standalone-update-E5474IBI.js"),
+      import("./settings-D44YMZFT.js"),
+      import("./updateCheck-CHUYWD6L.js"),
+      import("./installationInfo-LBOL6SBV.js"),
+      import("./standalone-update-QUGHFMCS.js"),
       import("./stdioHelpers-AY6XCDY2.js"),
       import("./updateEventEmitter-5MKC7BLQ.js")
     ]);
@@ -44672,7 +44800,7 @@ async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtens
     disabledSkillNamesProvider: bareMode || safeMode ? void 0 : disabledSkillNamesProvider,
     enabledSkillNamesProvider: bareMode || safeMode ? void 0 : enabledSkillNamesProvider,
     terminalImageRenderSupportProvider: interactive ? async () => {
-      const { getTerminalImageRenderSupport } = await import("./terminal-image-renderer-LUKNCOVM.js");
+      const { getTerminalImageRenderSupport } = await import("./terminal-image-renderer-YNYW5CQG.js");
       return getTerminalImageRenderSupport();
     } : void 0,
     disabledSkillLevels: bareMode || safeMode || !Array.isArray(settings.skills?.disabledLevels) ? void 0 : settings.skills.disabledLevels.filter(isSkillLevel),
@@ -44830,7 +44958,9 @@ async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtens
     memoryAgentTimeoutMinutes: settings.memory?.agentTimeoutMinutes,
     memoryAgentMaxTurns: settings.memory?.agentMaxTurns,
     fastModel: settings.fastModel || void 0,
-    webSearch: bareMode || safeMode ? void 0 : resolveWebSearchSettings(settings),
+    // Bare and safe mode must switch the tool off explicitly: `undefined`
+    // means "derive it" now that WebSearch is opt-out.
+    webSearch: bareMode || safeMode ? { enabled: false } : resolveWebSearchSettings(settings),
     visionModel: settings.visionModel || void 0,
     compactionModel: settings.compactionModel || void 0,
     imageModel: settings.imageModel || void 0,