@qwen-code/qwen-code 0.23.1-preview.2 → 0.23.2-nightly.20260909.2e212144d3

package/chunks/{chunk-P5Z7VD23.js → chunk-3O77M472.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   listCommand
-} from "./chunk-SHK2SIR5.js";
+} from "./chunk-QA2B26PL.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-YLFICBYK.js";
+} from "./chunk-SYKPMH2X.js";
 import {
   CUSTOM_SANDBOX_IMAGE_ENV_VAR
-} from "./chunk-22QOQKG4.js";
+} from "./chunk-5WBA3DEF.js";
 import {
   isOwnInterfaceAddress
 } from "./chunk-24FVUD5P.js";
 import {
   serveCommand
-} from "./chunk-L36LLVA5.js";
+} from "./chunk-EYCW6UF2.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
@@ -58,12 +58,12 @@ import {
 } from "./chunk-Y53DG2HA.js";
 import {
   CLI_VERSION
-} from "./chunk-TDHVOZ65.js";
+} from "./chunk-LOBKNYPR.js";
 import {
   collectProviderModelsForProtocol,
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-I7UNCY24.js";
+} from "./chunk-6GAYNM3F.js";
 import {
   resolveSkillSettings
 } from "./chunk-HWVUSYSN.js";
@@ -81,19 +81,20 @@ import {
   registerPermissionRelay,
   registerSessionCleanup,
   registerToolCallDispatch,
+  resolveChannelLocale,
   selectFirstModel,
   sessionsPath
-} from "./chunk-3RMVM33U.js";
+} from "./chunk-EDSU3VUG.js";
 import {
   getExtensionManager,
   requestChoicePluginNonInteractive,
   requestConsentNonInteractive,
   requestConsentOrFail,
   resolveExtensionCommandScope
-} from "./chunk-2C3XDBGL.js";
+} from "./chunk-6S7YYUUH.js";
 import {
   parseChannelConfig
-} from "./chunk-BNWIX6BM.js";
+} from "./chunk-JFAGT5YG.js";
 import {
   findCliEntryPath
 } from "./chunk-V6WHFGST.js";
@@ -103,7 +104,7 @@ import {
   clearAccount,
   loadAccount,
   saveAccount
-} from "./chunk-LTCI6ZOJ.js";
+} from "./chunk-JYGIJA4W.js";
 import {
   canonicalizeWorkspace
 } from "./chunk-6PLDPT2C.js";
@@ -121,7 +122,7 @@ import {
 import {
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-5V4B3EWA.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,53 +160,51 @@ import {
   isChannelProactiveDeliveryError,
   sanitizeLogText,
   sanitizePromptText
-} from "./chunk-65GHQ4FX.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-C55CR5I4.js";
+} from "./chunk-OVTPETDL.js";
 import {
   loadSettings
-} from "./chunk-RUMSY4ES.js";
+} from "./chunk-Y7YHAY32.js";
 import {
   detectSystemLanguage,
   getCurrentLanguage,
   initializeI18n,
+  resolveLanguage,
   resolveLanguageSetting,
   t
-} from "./chunk-LD53HMPV.js";
+} from "./chunk-CRZBDVP2.js";
 import {
   isFileSourcedEnvKey,
   loadEnvironment
-} from "./chunk-4OCYWXKF.js";
+} from "./chunk-43EUMPKQ.js";
 import {
   resolveAcpChannelFallback,
   scrubAndReportInheritedLoaderEnv
-} from "./chunk-NUQFUXOG.js";
+} from "./chunk-QTNCGZHQ.js";
 import {
   readPackageUpSync
 } from "./chunk-2EAZ43JQ.js";
 import {
   getCliVersion
-} from "./chunk-SHX2HIE7.js";
+} from "./chunk-ATBLEXXV.js";
 import {
   getPackageJson
 } from "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-GEV66YGE.js";
+} from "./chunk-D6AGS266.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -223,7 +226,7 @@ import {
   removeChannelMemoryEntries,
   removePeerController,
   updateChannelMemoryEntry
-} from "./chunk-TXAEXF2B.js";
+} from "./chunk-ZEFWBG2C.js";
 import {
   hideBin,
   yargs_default
@@ -242,6 +245,7 @@ import {
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   ExtensionManager,
   FileDiscoveryService,
+  GOAL_CHECKPOINT_TIMEOUT_SECONDS_CAP,
   GOAL_TOKEN_BUDGET_CAP,
   MAX_SUBAGENT_DEPTH_LIMIT,
   REVIEW_BUILTIN_SUBAGENT_TYPE,
@@ -263,7 +267,7 @@ import {
   sanitizeFilenameComponent,
   unquoteCStylePath,
   updateSetting
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-BDAVT6K2.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -275,8 +279,12 @@ import {
   resolveBundleDir
 } from "./chunk-TRWQQBVH.js";
 import {
+  describeSessionKind,
   listLiveSessions
-} from "./chunk-B44JBZBB.js";
+} from "./chunk-F4SAL7WM.js";
+import {
+  isSameProcess
+} from "./chunk-CH2YDT6X.js";
 import {
   APPROVAL_MODES
 } from "./chunk-JX6XHPTX.js";
@@ -287,13 +295,13 @@ import {
 } from "./chunk-CLKE4IY3.js";
 import {
   BUILT_IN_OUTPUT_STYLES
-} from "./chunk-OFB36ZBA.js";
+} from "./chunk-2HYOOFDS.js";
 import {
   addDaemonRequestAttribute
 } from "./chunk-7OCIQNKX.js";
 import {
   parseLineTolerant
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-FRS3P7MQ.js";
 import {
   getAllMemoryFilenames,
   setMemoryFilename
@@ -302,7 +310,7 @@ import {
   DEFAULT_QWEN_EMBEDDING_MODEL,
   VERTEX_ADC_HINT,
   hasVertexProjectConfigured
-} from "./chunk-PLUAIHZO.js";
+} from "./chunk-EOLGAQ25.js";
 import {
   atomicWriteFileSync
 } from "./chunk-XFFRI3WM.js";
@@ -1651,6 +1659,30 @@ function validateGoalTokenBudget(value) {
   return value;
 }
 __name(validateGoalTokenBudget, "validateGoalTokenBudget");
+function validateGoalCheckpointTimeoutSeconds(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    throw new Error(
+      `model.goalCheckpointTimeoutSeconds must be a finite number; got ${String(value)}.`
+    );
+  }
+  if (!Number.isInteger(value)) {
+    throw new Error(
+      `model.goalCheckpointTimeoutSeconds must be an integer number of seconds; got ${value}.`
+    );
+  }
+  if (value < 1) {
+    throw new Error(
+      `model.goalCheckpointTimeoutSeconds must be at least 1; got ${value}. Unset it to use the default.`
+    );
+  }
+  if (value > GOAL_CHECKPOINT_TIMEOUT_SECONDS_CAP) {
+    throw new Error(
+      `model.goalCheckpointTimeoutSeconds ${value} exceeds the supported ceiling (${GOAL_CHECKPOINT_TIMEOUT_SECONDS_CAP}s, the default stream lifetime cap, past which the stream guard rather than this setting ends the call). This ceiling is fixed; raising QWEN_STREAM_MAX_LIFETIME_MS does not lift it.`
+    );
+  }
+  return value;
+}
+__name(validateGoalCheckpointTimeoutSeconds, "validateGoalCheckpointTimeoutSeconds");
 var MAX_TOOL_CALLS = 1e6;
 function validateMaxToolCalls(value) {
   if (value === -1) return -1;
@@ -2943,6 +2975,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);
@@ -2954,6 +2990,10 @@ async function writeServiceInfoOrExit(channels, cleanup) {
       );
       process.exit(1);
     }
+    if (isUnverifiablePidfileError(err)) {
+      writeStderrLine(`Error: ${err.message}`);
+      process.exit(1);
+    }
     throw err;
   }
 }
@@ -3028,6 +3068,9 @@ function createBridgeRecovery(options) {
   let recoverySourceBridge;
   const attachDisconnectHandler = /* @__PURE__ */ __name((failedBridge) => {
     failedBridge.on("disconnected", () => {
+      for (const channel of channels.values()) {
+        channel.onBridgeDisconnected();
+      }
       if (isShuttingDown() || failedBridge !== getBridge()) return;
       if (recoveryTask) {
         if (failedBridge !== recoverySourceBridge) recoveryRequested = true;
@@ -3134,7 +3177,7 @@ function checkDuplicateInstance() {
   }
 }
 __name(checkDuplicateInstance, "checkDuplicateInstance");
-async function startSingle(name, proxy, cronEnabled) {
+async function startSingle(name, proxy, cronEnabled, locale, displayLanguage) {
   checkDuplicateInstance();
   const channelsConfig = loadChannelsConfig();
   await loadChannelsFromExtensions();
@@ -3180,8 +3223,10 @@ async function startSingle(name, proxy, cronEnabled) {
   const loopController = loopStore ? createChannelLoopController(loopStore) : void 0;
   const channels = /* @__PURE__ */ new Map();
   const channel = await createChannel(name, config2, bridge, {
+    locale,
     router,
     proxy,
+    ...displayLanguage ? { displayLanguage } : {},
     ...channelMemoryOptions(() => bridge, config2.cwd),
     ...loopController ? { loopController } : {},
     bridgeRecovery: bridgeReadiness.current
@@ -3269,7 +3314,7 @@ async function startSingle(name, proxy, cronEnabled) {
   });
 }
 __name(startSingle, "startSingle");
-async function startAll(proxy, cronEnabled) {
+async function startAll(proxy, cronEnabled, locale, displayLanguage) {
   checkDuplicateInstance();
   const channelsConfig = loadChannelsConfig();
   await loadChannelsFromExtensions();
@@ -3320,8 +3365,10 @@ async function startAll(proxy, cronEnabled) {
     channels.set(
       name,
       await createChannel(name, config2, bridge, {
+        locale,
         router,
         proxy,
+        ...displayLanguage ? { displayLanguage } : {},
         ...channelMemoryOptions(() => bridge, config2.cwd),
         ...loopController ? { loopController } : {},
         bridgeRecovery: bridgeReadiness.current
@@ -3443,16 +3490,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);
+      await startSingle(argv.name, proxy, cronEnabled, locale, displayLanguage);
     } else {
-      await startAll(proxy, cronEnabled);
+      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",
@@ -3467,7 +3545,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-LCUELM6E.js");
+        const sdk = await import("./daemon-U2456K5H.js");
         const client = new sdk.DaemonClient({
           baseUrl: argv["daemon-url"],
           ...token ? { token } : {}
@@ -3499,25 +3577,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")
@@ -3653,7 +3740,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-LCUELM6E.js");
+        const sdk = await import("./daemon-U2456K5H.js");
         const client = new sdk.DaemonClient({
           baseUrl: argv["daemon-url"],
           ...token ? { token } : {}
@@ -3764,7 +3851,7 @@ var reloadCommand = {
     const token = resolveToken(argv.token);
     let sdk;
     try {
-      sdk = await import("./daemon-LCUELM6E.js");
+      sdk = await import("./daemon-U2456K5H.js");
     } catch (err) {
       writeStderrLine(
         `[Channel] Failed to load daemon SDK: ${safeChannelCommandErrorMessage(err)}`
@@ -3844,7 +3931,7 @@ var setCommand2 = {
     const selection = names[0] === "all" ? { mode: "all" } : { mode: "names", names };
     let sdk;
     try {
-      sdk = await import("./daemon-LCUELM6E.js");
+      sdk = await import("./daemon-U2456K5H.js");
     } catch (error) {
       writeStderrLine(
         `[Channel] Failed to load daemon SDK: ${safeChannelCommandErrorMessage(error)}`
@@ -3898,6 +3985,7 @@ var SESSION_ATTACHMENTS_FEATURE = "session_attachments";
 var SESSION_BTW_FEATURE = "session_btw";
 var SESSION_PERMISSION_VOTE_FEATURE = "session_permission_vote";
 var SESSION_WORKTREE_PERSISTENCE_FEATURE = "session_worktree_persistence_v1";
+var SESSION_WORKTREE_RESET_FEATURE = "session_worktree_reset_v1";
 var MAX_ACTIVE_WEBHOOK_TASKS = 16;
 var WORKER_CHANNEL_DISCONNECT_DRAIN_MS = CHANNEL_WORKER_STOP_GRACE_MS - CHANNEL_WORKER_KILL_GRACE_MS;
 var WORKER_STARTUP_ROLLBACK_DRAIN_MS = 1500;
@@ -3932,6 +4020,13 @@ function createDaemonSessionFactory({
       // (dingtalk/feishu) is derivable from the name via the channel config.
       ...req.sourceId ? { sourceId: req.sourceId } : {}
     };
+    if (req.worktreeReset) {
+      return await DaemonSessionClient.resetWorktree(
+        client,
+        req.worktreeReset.sessionId,
+        daemonReq
+      );
+    }
     if (req.sessionId) {
       return await DaemonSessionClient.resume(
         client,
@@ -3984,6 +4079,9 @@ function createDaemonChannelBridgeFacade(bridge, opts) {
   if (bridge.listSessions) {
     facade.listSessions = bridge.listSessions.bind(bridge);
   }
+  if (bridge.resetWorktreeSession) {
+    facade.resetWorktreeSession = bridge.resetWorktreeSession.bind(bridge);
+  }
   if (bridge.registerChannelLoopToolHandler) {
     facade.registerChannelLoopToolHandler = bridge.registerChannelLoopToolHandler.bind(bridge);
   }
@@ -3991,7 +4089,7 @@ function createDaemonChannelBridgeFacade(bridge, opts) {
 }
 __name(createDaemonChannelBridgeFacade, "createDaemonChannelBridgeFacade");
 async function loadDaemonSdk() {
-  return await import("./daemon-LCUELM6E.js");
+  return await import("./daemon-U2456K5H.js");
 }
 __name(loadDaemonSdk, "loadDaemonSdk");
 function selectedChannelNames(channelsConfig, selection) {
@@ -4148,6 +4246,12 @@ async function runChannelDaemonWorker(opts) {
     void 0,
     settings.merged.proxy
   );
+  const locale = resolveChannelLocale(settings.merged.general?.language);
+  const displayLanguage = resolveLanguage(
+    resolveLanguageSetting(
+      settings.merged.general?.language
+    )
+  );
   const channelsConfig = loadChannelsConfig(daemonWorkspace, settings);
   const names = selectedChannelNames(channelsConfig, opts.selection);
   const parsed = await abortableStartup(
@@ -4197,6 +4301,9 @@ async function runChannelDaemonWorker(opts) {
     sessionWorktreePersistence: capabilities.features.includes(
       SESSION_WORKTREE_PERSISTENCE_FEATURE
     ),
+    sessionWorktreeReset: capabilities.features.includes(
+      SESSION_WORKTREE_RESET_FEATURE
+    ),
     ...opts.promptAuthorization ? { promptAuthorization: opts.promptAuthorization } : {},
     deleteSessionData: /* @__PURE__ */ __name(async (sessionId) => {
       const workspaceClient = client.workspaceByCwd?.(daemonWorkspace);
@@ -4256,7 +4363,9 @@ async function runChannelDaemonWorker(opts) {
         name,
         await abortableStartup(
           createChannel(name, config2, bridgeFacade, {
+            locale,
             ...proxy ? { proxy } : {},
+            ...displayLanguage ? { displayLanguage } : {},
             router: createdRouter,
             stateDir: daemonChannelStateDir(daemonWorkspace, name),
             channelMemory: {
@@ -4310,7 +4419,7 @@ async function runChannelDaemonWorker(opts) {
           `[Channel] Failed to connect "${safeName}": ${safeMessage}`
         );
         try {
-          channel.disconnect();
+          await channel.disconnect();
         } catch {
         }
         connectFailureCount += 1;
@@ -6648,6 +6757,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(
@@ -6681,12 +6791,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;
     }
@@ -6728,20 +6843,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) {
@@ -6774,7 +6893,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,
@@ -6788,15 +6908,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 {
@@ -7062,11 +7189,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);
@@ -39135,6 +39263,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,
@@ -39310,14 +39448,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
@@ -39325,7 +39464,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,
@@ -39334,7 +39473,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(
@@ -39574,6 +39715,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,
@@ -39881,8 +40033,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(
@@ -39971,7 +40140,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`
               );
             }
           }
@@ -40077,7 +40246,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(
@@ -43417,6 +43602,7 @@ var listCommand4 = {
 // packages/cli/src/commands/sessions/ps.ts
 init_esbuild_shims();
 var NAME_COL = 22;
+var KIND_COL = 10;
 var PID_COL = 9;
 var AGE_COL = 10;
 function sanitize3(value) {
@@ -43441,13 +43627,21 @@ function formatAge(ms) {
 __name(formatAge, "formatAge");
 function outputHuman2(records, now) {
   writeStdoutLine(
-    padDisplay3("NAME", NAME_COL) + padDisplay3("PID", PID_COL) + padDisplay3("AGE", AGE_COL) + "DIRECTORY"
+    padDisplay3("NAME", NAME_COL) + padDisplay3("KIND", KIND_COL) + padDisplay3("PID", PID_COL) + padDisplay3("AGE", AGE_COL) + "DIRECTORY"
   );
   for (const record of records) {
     writeStdoutLine(
       padDisplay3(
         truncateToWidth(sanitize3(record.name), NAME_COL - 2),
         NAME_COL
+      ) + // Truncated for the same reason NAME is: a newer build may write
+      // a longer kind than any this one knows, and one over-wide cell
+      // would misalign every column after it. Not sanitized — unlike
+      // NAME and DIRECTORY, the read guard already bounds `kind` to
+      // lowercase ASCII, digits and dashes.
+      padDisplay3(
+        truncateToWidth(describeSessionKind(record.kind), KIND_COL - 2),
+        KIND_COL
       ) + padDisplay3(String(record.pid), PID_COL) + padDisplay3(formatAge(now - record.startedAt), AGE_COL) + sanitize3(record.cwd)
     );
   }
@@ -43463,7 +43657,7 @@ async function handlePs(argv) {
     return;
   }
   if (records.length === 0) {
-    writeStdoutLine("No other interactive Qwen Code sessions are running.");
+    writeStdoutLine("No Qwen Code sessions are registered right now.");
     return;
   }
   outputHuman2(records, now);
@@ -43471,7 +43665,7 @@ async function handlePs(argv) {
 __name(handlePs, "handlePs");
 var psCommand = {
   command: "ps",
-  describe: "List interactive Qwen Code sessions running right now",
+  describe: "List Qwen Code sessions running right now",
   builder: /* @__PURE__ */ __name((yargs) => yargs.option("json", {
     type: "boolean",
     describe: "Output as JSON Lines",
@@ -43509,10 +43703,10 @@ var updateCommand3 = {
       stdioHelpers,
       { updateEventEmitter }
     ] = await Promise.all([
-      import("./settings-LO6J5SAZ.js"),
-      import("./updateCheck-3MYFMM35.js"),
-      import("./installationInfo-IRPQEYRF.js"),
-      import("./standalone-update-CWDIKJRP.js"),
+      import("./settings-Y47SPE3X.js"),
+      import("./updateCheck-ARTHAJT2.js"),
+      import("./installationInfo-QEQEPB3G.js"),
+      import("./standalone-update-Y2OZPLNJ.js"),
       import("./stdioHelpers-AY6XCDY2.js"),
       import("./updateEventEmitter-5MKC7BLQ.js")
     ]);
@@ -44059,6 +44253,16 @@ function resolveGoalTokenBudget(settings) {
   }
 }
 __name(resolveGoalTokenBudget, "resolveGoalTokenBudget");
+function resolveGoalCheckpointTimeoutSeconds(settings) {
+  const fromSettings = settings.model?.goalCheckpointTimeoutSeconds;
+  if (fromSettings === void 0) return void 0;
+  try {
+    return validateGoalCheckpointTimeoutSeconds(fromSettings);
+  } catch (err) {
+    throw new Error(`settings.json: ${err.message}`);
+  }
+}
+__name(resolveGoalCheckpointTimeoutSeconds, "resolveGoalCheckpointTimeoutSeconds");
 function resolveMaxToolCalls(argv, settings) {
   if (argv.maxToolCalls !== void 0 && argv.maxToolCalls !== null) {
     try {
@@ -44606,7 +44810,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-B646HBDW.js");
+      const { getTerminalImageRenderSupport } = await import("./terminal-image-renderer-WH2WV5ES.js");
       return getTerminalImageRenderSupport();
     } : void 0,
     disabledSkillLevels: bareMode || safeMode || !Array.isArray(settings.skills?.disabledLevels) ? void 0 : settings.skills.disabledLevels.filter(isSkillLevel),
@@ -44673,6 +44877,7 @@ async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtens
     sessionTokenLimit: settings.model?.sessionTokenLimit ?? -1,
     maxSessionTurns: argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
     goalTokenBudget: resolveGoalTokenBudget(settings),
+    goalCheckpointTimeoutSeconds: resolveGoalCheckpointTimeoutSeconds(settings),
     maxWallTimeSeconds: resolveMaxWallTimeSeconds(argv, settings),
     maxToolCalls: resolveMaxToolCalls(argv, settings),
     // Undefined flows through to Config's default (5) and clamp logic.
@@ -44763,7 +44968,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,