@qwen-code/qwen-code 0.18.4 → 0.18.5-nightly.20260622.6bc3f853e

package/cli.js

@@ -96,7 +96,7 @@ import {
   updateOutputLanguageFile,
   validateCustomTheme,
   writeOutputLanguageAndRegisterPath
-} from "./chunks/chunk-GBTJHKQ6.js";
+} from "./chunks/chunk-7Z2O7IBO.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -109,7 +109,7 @@ import {
   formatContextUsageText,
   isTerminalGoalStatusKind,
   require_react
-} from "./chunks/chunk-5RVEAAD2.js";
+} from "./chunks/chunk-QBUR6J4B.js";
 import {
   SUPPORTED_LANGUAGES,
   clearScreen,
@@ -125,7 +125,7 @@ import {
   ta,
   writeStderrLine,
   writeStdoutLine
-} from "./chunks/chunk-SZWDOOGV.js";
+} from "./chunks/chunk-EJ6NFQ2L.js";
 import {
   ALIBABA_PROVIDERS,
   ALL_PROVIDERS,
@@ -221,7 +221,6 @@ import {
   escapeShellArg,
   evaluateAutoMode,
   evaluatePermissionFlow,
-  execCommand,
   executeToolCall,
   extract,
   fetchGitDiff,
@@ -275,7 +274,6 @@ import {
   isApproveOutcome,
   isBareMode,
   isBinary,
-  isCommandAvailable,
   isDenialFallbackReason,
   isEditorAvailable,
   isGatedMcpScope,
@@ -300,6 +298,7 @@ import {
   parse,
   parseAndFormatApiError,
   parseInstallSource,
+  parsePositiveIntegerEnv,
   parseRule,
   partToString,
   persistPermissionOutcome,
@@ -318,6 +317,7 @@ import {
   require_shell_quote,
   require_toml,
   resolveBaseUrl,
+  resolveBranchName,
   resolveBundleDir,
   resolveMetadataKey,
   resolveModelConfig,
@@ -345,40 +345,41 @@ import {
   unregisterGoalHook,
   updateSetting,
   watch,
+  watchRepoBranch,
   worktreeBranchForSlug,
   writeRuntimeStatus,
   writeWorktreeSession,
   writeWorktreeSessionMarker
-} from "./chunks/chunk-32SSXBMG.js";
+} from "./chunks/chunk-CXZV4Q4J.js";
 import {
   external_exports
 } from "./chunks/chunk-K5PGHDBN.js";
-import "./chunks/chunk-7GX7XYZU.js";
+import "./chunks/chunk-XU7BKR3B.js";
 import {
   runSideQuery
-} from "./chunks/chunk-7OCZ77KA.js";
-import "./chunks/chunk-2ES3D3TW.js";
+} from "./chunks/chunk-2O3NAOJG.js";
+import "./chunks/chunk-XGU3ETVO.js";
 import "./chunks/chunk-2MPVVENX.js";
 import "./chunks/chunk-ZTQ26VBE.js";
-import "./chunks/chunk-4HMWGHPP.js";
-import "./chunks/chunk-4TW2JM5Q.js";
+import "./chunks/chunk-C6MI2ASN.js";
+import "./chunks/chunk-LF6BKGZT.js";
 import {
   require_graceful_fs
-} from "./chunks/chunk-M5VYHAHT.js";
+} from "./chunks/chunk-26ZYKTYZ.js";
 import "./chunks/chunk-MLZQVCF3.js";
 import "./chunks/chunk-LD2XBG6Z.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
-} from "./chunks/chunk-JIJBNW4A.js";
+} from "./chunks/chunk-ID533GA3.js";
 import {
   HOOKS_CONFIG_FIELDS,
   HookEventName,
   createHookOutput,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunks/chunk-E5SRTXRG.js";
+} from "./chunks/chunk-KGV3F6UF.js";
 import "./chunks/chunk-77WXWU44.js";
-import "./chunks/chunk-WWU2KUSR.js";
+import "./chunks/chunk-AE6RQU6F.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -434,7 +435,7 @@ import {
   stripRuntimeSnapshotPrefix,
   uiTelemetryService,
   withInteractionSpan
-} from "./chunks/chunk-6Z2MVJIJ.js";
+} from "./chunks/chunk-GM3LTU6K.js";
 import "./chunks/chunk-3PJXIDKI.js";
 import "./chunks/chunk-UWCTAVOD.js";
 import {
@@ -447,38 +448,38 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunks/chunk-FPZF3BNV.js";
-import "./chunks/chunk-VWPDSQZY.js";
-import "./chunks/chunk-AQDPHFDZ.js";
+} from "./chunks/chunk-FH4P6RQA.js";
+import "./chunks/chunk-CTHZVIMD.js";
+import "./chunks/chunk-VKILGMZQ.js";
 import {
   SchemaValidator,
   ToolConfirmationOutcome,
   ToolDisplayNames,
   ToolNames
-} from "./chunks/chunk-JJHY7NAD.js";
+} from "./chunks/chunk-GOMVJKBL.js";
 import {
   clearCachedCredentialFile,
   openBrowserSecurely,
   qwenOAuth2Events,
   shouldLaunchBrowser
-} from "./chunks/chunk-DZCZZPCY.js";
-import "./chunks/chunk-F6FP3URI.js";
+} from "./chunks/chunk-MSJ2MXJ6.js";
+import "./chunks/chunk-ATLUHLZE.js";
 import "./chunks/chunk-64WXLC72.js";
 import {
   atomicWriteFile,
   atomicWriteFileSync
-} from "./chunks/chunk-N5QHMPZU.js";
+} from "./chunks/chunk-LTN3VYMZ.js";
 import {
   detectRuntime,
   getOrCreateSharedDispatcher,
   getUnsupportedImageFormatWarning,
   isSupportedImageMimeType,
   redactProxyCredentials
-} from "./chunks/chunk-HU3RKEK2.js";
+} from "./chunks/chunk-42HGOMED.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
-} from "./chunks/chunk-PTGKSUUJ.js";
+} from "./chunks/chunk-G4BUMVEY.js";
 import {
   FinishReason
 } from "./chunks/chunk-55ZMG67I.js";
@@ -505,7 +506,7 @@ import {
   tildeifyPath,
   unescapePath,
   updateSymlink
-} from "./chunks/chunk-IKOWINH4.js";
+} from "./chunks/chunk-WE6TNQJU.js";
 import "./chunks/chunk-ZERZSAZL.js";
 import "./chunks/chunk-QN5NZ3UQ.js";
 import "./chunks/chunk-BR4QREVK.js";
@@ -10996,15 +10997,15 @@ var require_route = __commonJS({
     }
     __name(link2, "link");
     function wrapConversion(toModel, graph) {
-      const path64 = [graph[toModel].parent, toModel];
+      const path63 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path64.unshift(graph[cur].parent);
+        path63.unshift(graph[cur].parent);
         fn = link2(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path64;
+      fn.conversion = path63;
       return fn;
     }
     __name(wrapConversion, "wrapConversion");
@@ -11702,11 +11703,11 @@ var require_command_exists = __commonJS({
     init_esbuild_shims();
     var exec8 = __require("child_process").exec;
     var execSync6 = __require("child_process").execSync;
-    var fs57 = __require("fs");
-    var path64 = __require("path");
-    var access3 = fs57.access;
-    var accessSync2 = fs57.accessSync;
-    var constants5 = fs57.constants || fs57;
+    var fs56 = __require("fs");
+    var path63 = __require("path");
+    var access3 = fs56.access;
+    var accessSync2 = fs56.accessSync;
+    var constants5 = fs56.constants || fs56;
     var isUsingWindows = process.platform == "win32";
     var fileNotExists = /* @__PURE__ */ __name(function(commandName, callback) {
       access3(
@@ -11807,8 +11808,8 @@ var require_command_exists = __commonJS({
       cleanInput = /* @__PURE__ */ __name(function(s) {
         var isPathName = /[\\]/.test(s);
         if (isPathName) {
-          var dirname21 = '"' + path64.dirname(s) + '"';
-          var basename15 = '"' + path64.basename(s) + '"';
+          var dirname21 = '"' + path63.dirname(s) + '"';
+          var basename15 = '"' + path63.basename(s) + '"';
           return dirname21 + ":" + basename15;
         }
         return '"' + s + '"';
@@ -12728,14 +12729,14 @@ var require_util2 = __commonJS({
         }
         const port = url.port != null ? url.port : url.protocol === "https:" ? 443 : 80;
         let origin = url.origin != null ? url.origin : `${url.protocol || ""}//${url.hostname || ""}:${port}`;
-        let path64 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
+        let path63 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path64 && path64[0] !== "/") {
-          path64 = `/${path64}`;
+        if (path63 && path63[0] !== "/") {
+          path63 = `/${path63}`;
         }
-        return new URL(`${origin}${path64}`);
+        return new URL(`${origin}${path63}`);
       }
       if (!isHttpOrHttpsPrefixed(url.origin || url.protocol)) {
         throw new InvalidArgumentError("Invalid URL protocol: the URL must start with `http:` or `https:`.");
@@ -13220,39 +13221,39 @@ var require_diagnostics = __commonJS({
       });
       diagnosticsChannel.channel("undici:client:sendHeaders").subscribe((evt) => {
         const {
-          request: { method, path: path64, origin }
+          request: { method, path: path63, origin }
         } = evt;
-        debuglog("sending request to %s %s/%s", method, origin, path64);
+        debuglog("sending request to %s %s/%s", method, origin, path63);
       });
       diagnosticsChannel.channel("undici:request:headers").subscribe((evt) => {
         const {
-          request: { method, path: path64, origin },
+          request: { method, path: path63, origin },
           response: { statusCode }
         } = evt;
         debuglog(
           "received response to %s %s/%s - HTTP %d",
           method,
           origin,
-          path64,
+          path63,
           statusCode
         );
       });
       diagnosticsChannel.channel("undici:request:trailers").subscribe((evt) => {
         const {
-          request: { method, path: path64, origin }
+          request: { method, path: path63, origin }
         } = evt;
-        debuglog("trailers received from %s %s/%s", method, origin, path64);
+        debuglog("trailers received from %s %s/%s", method, origin, path63);
       });
       diagnosticsChannel.channel("undici:request:error").subscribe((evt) => {
         const {
-          request: { method, path: path64, origin },
+          request: { method, path: path63, origin },
           error
         } = evt;
         debuglog(
           "request to %s %s/%s errored - %s",
           method,
           origin,
-          path64,
+          path63,
           error.message
         );
       });
@@ -13301,9 +13302,9 @@ var require_diagnostics = __commonJS({
         });
         diagnosticsChannel.channel("undici:client:sendHeaders").subscribe((evt) => {
           const {
-            request: { method, path: path64, origin }
+            request: { method, path: path63, origin }
           } = evt;
-          debuglog("sending request to %s %s/%s", method, origin, path64);
+          debuglog("sending request to %s %s/%s", method, origin, path63);
         });
       }
       diagnosticsChannel.channel("undici:websocket:open").subscribe((evt) => {
@@ -13370,7 +13371,7 @@ var require_request = __commonJS({
         __name(this, "Request");
       }
       constructor(origin, {
-        path: path64,
+        path: path63,
         method,
         body,
         headers,
@@ -13385,11 +13386,11 @@ var require_request = __commonJS({
         expectContinue,
         servername
       }, handler) {
-        if (typeof path64 !== "string") {
+        if (typeof path63 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path64[0] !== "/" && !(path64.startsWith("http://") || path64.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path63[0] !== "/" && !(path63.startsWith("http://") || path63.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path64)) {
+        } else if (invalidPathRegex.test(path63)) {
           throw new InvalidArgumentError("invalid request path");
         }
         if (typeof method !== "string") {
@@ -13452,7 +13453,7 @@ var require_request = __commonJS({
         this.completed = false;
         this.aborted = false;
         this.upgrade = upgrade || null;
-        this.path = query ? buildURL(path64, query) : path64;
+        this.path = query ? buildURL(path63, query) : path63;
         this.origin = origin;
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
         this.blocking = blocking == null ? false : blocking;
@@ -18131,7 +18132,7 @@ var require_client_h1 = __commonJS({
     }
     __name(shouldSendContentLength, "shouldSendContentLength");
     function writeH1(client, request) {
-      const { method, path: path64, host, upgrade, blocking, reset } = request;
+      const { method, path: path63, host, upgrade, blocking, reset } = request;
       let { body, headers, contentLength } = request;
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH" || method === "QUERY" || method === "PROPFIND" || method === "PROPPATCH";
       if (util.isFormDataLike(body)) {
@@ -18197,7 +18198,7 @@ var require_client_h1 = __commonJS({
       if (blocking) {
         socket[kBlocking] = true;
       }
-      let header = `${method} ${path64} HTTP/1.1\r
+      let header = `${method} ${path63} HTTP/1.1\r
 `;
       if (typeof host === "string") {
         header += `host: ${host}\r
@@ -18741,7 +18742,7 @@ var require_client_h2 = __commonJS({
     __name(shouldSendContentLength, "shouldSendContentLength");
     function writeH2(client, request) {
       const session2 = client[kHTTP2Session];
-      const { method, path: path64, host, upgrade, expectContinue, signal, headers: reqHeaders } = request;
+      const { method, path: path63, host, upgrade, expectContinue, signal, headers: reqHeaders } = request;
       let { body } = request;
       if (upgrade) {
         util.errorRequest(client, request, new Error("Upgrade not supported for H2"));
@@ -18808,7 +18809,7 @@ var require_client_h2 = __commonJS({
         });
         return true;
       }
-      headers[HTTP2_HEADER_PATH] = path64;
+      headers[HTTP2_HEADER_PATH] = path63;
       headers[HTTP2_HEADER_SCHEME] = "https";
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
       if (body && typeof body.read === "function") {
@@ -19176,9 +19177,9 @@ var require_redirect_handler = __commonJS({
           return this.handler.onHeaders(statusCode, headers, resume, statusText);
         }
         const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
-        const path64 = search ? `${pathname}${search}` : pathname;
+        const path63 = search ? `${pathname}${search}` : pathname;
         this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-        this.opts.path = path64;
+        this.opts.path = path63;
         this.opts.origin = origin;
         this.opts.maxRedirections = 0;
         this.opts.query = null;
@@ -20465,10 +20466,10 @@ var require_proxy_agent = __commonJS({
         };
         const {
           origin,
-          path: path64 = "/",
+          path: path63 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path64;
+        opts.path = origin + path63;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL2(origin);
           headers.host = host;
@@ -22470,21 +22471,21 @@ var require_mock_utils = __commonJS({
       return true;
     }
     __name(matchHeaders, "matchHeaders");
-    function safeUrl(path64) {
-      if (typeof path64 !== "string") {
-        return path64;
+    function safeUrl(path63) {
+      if (typeof path63 !== "string") {
+        return path63;
       }
-      const pathSegments = path64.split("?");
+      const pathSegments = path63.split("?");
       if (pathSegments.length !== 2) {
-        return path64;
+        return path63;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
     __name(safeUrl, "safeUrl");
-    function matchKey(mockDispatch2, { path: path64, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path64);
+    function matchKey(mockDispatch2, { path: path63, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path63);
       const methodMatch = matchValue(mockDispatch2.method, method);
       const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
       const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -22508,7 +22509,7 @@ var require_mock_utils = __commonJS({
     function getMockDispatch(mockDispatches, key) {
       const basePath = key.query ? buildURL(key.path, key.query) : key.path;
       const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath;
-      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path64 }) => matchValue(safeUrl(path64), resolvedPath));
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path63 }) => matchValue(safeUrl(path63), resolvedPath));
       if (matchedMockDispatches.length === 0) {
         throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
       }
@@ -22549,9 +22550,9 @@ var require_mock_utils = __commonJS({
     }
     __name(deleteMockDispatch, "deleteMockDispatch");
     function buildKey(opts) {
-      const { path: path64, method, body, headers, query } = opts;
+      const { path: path63, method, body, headers, query } = opts;
       return {
-        path: path64,
+        path: path63,
         method,
         body,
         headers,
@@ -23047,10 +23048,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path64, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
+          ({ method, path: path63, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path64,
+            Path: path63,
             "Status code": statusCode,
             Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
             Invocations: timesInvoked,
@@ -28049,9 +28050,9 @@ var require_util7 = __commonJS({
       }
     }
     __name(validateCookieValue, "validateCookieValue");
-    function validateCookiePath(path64) {
-      for (let i = 0; i < path64.length; ++i) {
-        const code = path64.charCodeAt(i);
+    function validateCookiePath(path63) {
+      for (let i = 0; i < path63.length; ++i) {
+        const code = path63.charCodeAt(i);
         if (code < 32 || // exclude CTLs (0-31)
         code === 127 || // DEL
         code === 59) {
@@ -30731,11 +30732,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path64 = opts.path;
+          let path63 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path64 = `/${path64}`;
+            path63 = `/${path63}`;
           }
-          url = new URL(util.parseOrigin(url).origin + path64);
+          url = new URL(util.parseOrigin(url).origin + path63);
         } else {
           if (!opts) {
             opts = typeof url === "object" ? url : {};
@@ -34500,9 +34501,9 @@ var require_utils2 = __commonJS({
   "node_modules/rc/lib/utils.js"(exports) {
     "use strict";
     init_esbuild_shims();
-    var fs57 = __require("fs");
+    var fs56 = __require("fs");
     var ini2 = require_ini();
-    var path64 = __require("path");
+    var path63 = __require("path");
     var stripJsonComments7 = require_strip_json_comments2();
     var parse4 = exports.parse = function(content) {
       if (/^\s*{/.test(content))
@@ -34516,10 +34517,10 @@ var require_utils2 = __commonJS({
       for (var i in args)
         if ("string" !== typeof args[i])
           return;
-      var file2 = path64.join.apply(null, args);
+      var file2 = path63.join.apply(null, args);
       var content;
       try {
-        return fs57.readFileSync(file2, "utf-8");
+        return fs56.readFileSync(file2, "utf-8");
       } catch (err) {
         return;
       }
@@ -34554,15 +34555,15 @@ var require_utils2 = __commonJS({
       return obj;
     };
     var find = exports.find = function() {
-      var rel = path64.join.apply(null, [].slice.call(arguments));
+      var rel = path63.join.apply(null, [].slice.call(arguments));
       function find2(start, rel2) {
-        var file2 = path64.join(start, rel2);
+        var file2 = path63.join(start, rel2);
         try {
-          fs57.statSync(file2);
+          fs56.statSync(file2);
           return file2;
         } catch (err) {
-          if (path64.dirname(start) !== start)
-            return find2(path64.dirname(start), rel2);
+          if (path63.dirname(start) !== start)
+            return find2(path63.dirname(start), rel2);
         }
       }
       __name(find2, "find");
@@ -34968,54 +34969,54 @@ var require_polyfills = __commonJS({
     }
     var chdir;
     module.exports = patch;
-    function patch(fs57) {
+    function patch(fs56) {
       if (constants5.hasOwnProperty("O_SYMLINK") && process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
-        patchLchmod(fs57);
-      }
-      if (!fs57.lutimes) {
-        patchLutimes(fs57);
-      }
-      fs57.chown = chownFix(fs57.chown);
-      fs57.fchown = chownFix(fs57.fchown);
-      fs57.lchown = chownFix(fs57.lchown);
-      fs57.chmod = chmodFix(fs57.chmod);
-      fs57.fchmod = chmodFix(fs57.fchmod);
-      fs57.lchmod = chmodFix(fs57.lchmod);
-      fs57.chownSync = chownFixSync(fs57.chownSync);
-      fs57.fchownSync = chownFixSync(fs57.fchownSync);
-      fs57.lchownSync = chownFixSync(fs57.lchownSync);
-      fs57.chmodSync = chmodFixSync(fs57.chmodSync);
-      fs57.fchmodSync = chmodFixSync(fs57.fchmodSync);
-      fs57.lchmodSync = chmodFixSync(fs57.lchmodSync);
-      fs57.stat = statFix(fs57.stat);
-      fs57.fstat = statFix(fs57.fstat);
-      fs57.lstat = statFix(fs57.lstat);
-      fs57.statSync = statFixSync(fs57.statSync);
-      fs57.fstatSync = statFixSync(fs57.fstatSync);
-      fs57.lstatSync = statFixSync(fs57.lstatSync);
-      if (fs57.chmod && !fs57.lchmod) {
-        fs57.lchmod = function(path64, mode, cb) {
+        patchLchmod(fs56);
+      }
+      if (!fs56.lutimes) {
+        patchLutimes(fs56);
+      }
+      fs56.chown = chownFix(fs56.chown);
+      fs56.fchown = chownFix(fs56.fchown);
+      fs56.lchown = chownFix(fs56.lchown);
+      fs56.chmod = chmodFix(fs56.chmod);
+      fs56.fchmod = chmodFix(fs56.fchmod);
+      fs56.lchmod = chmodFix(fs56.lchmod);
+      fs56.chownSync = chownFixSync(fs56.chownSync);
+      fs56.fchownSync = chownFixSync(fs56.fchownSync);
+      fs56.lchownSync = chownFixSync(fs56.lchownSync);
+      fs56.chmodSync = chmodFixSync(fs56.chmodSync);
+      fs56.fchmodSync = chmodFixSync(fs56.fchmodSync);
+      fs56.lchmodSync = chmodFixSync(fs56.lchmodSync);
+      fs56.stat = statFix(fs56.stat);
+      fs56.fstat = statFix(fs56.fstat);
+      fs56.lstat = statFix(fs56.lstat);
+      fs56.statSync = statFixSync(fs56.statSync);
+      fs56.fstatSync = statFixSync(fs56.fstatSync);
+      fs56.lstatSync = statFixSync(fs56.lstatSync);
+      if (fs56.chmod && !fs56.lchmod) {
+        fs56.lchmod = function(path63, mode, cb) {
           if (cb) process.nextTick(cb);
         };
-        fs57.lchmodSync = function() {
+        fs56.lchmodSync = function() {
         };
       }
-      if (fs57.chown && !fs57.lchown) {
-        fs57.lchown = function(path64, uid, gid, cb) {
+      if (fs56.chown && !fs56.lchown) {
+        fs56.lchown = function(path63, uid, gid, cb) {
           if (cb) process.nextTick(cb);
         };
-        fs57.lchownSync = function() {
+        fs56.lchownSync = function() {
         };
       }
       if (platform6 === "win32") {
-        fs57.rename = typeof fs57.rename !== "function" ? fs57.rename : function(fs$rename) {
+        fs56.rename = typeof fs56.rename !== "function" ? fs56.rename : function(fs$rename) {
           function rename3(from, to, cb) {
             var start = Date.now();
             var backoff = 0;
             fs$rename(from, to, /* @__PURE__ */ __name(function CB(er) {
               if (er && (er.code === "EACCES" || er.code === "EPERM") && Date.now() - start < 6e4) {
                 setTimeout(function() {
-                  fs57.stat(to, function(stater, st) {
+                  fs56.stat(to, function(stater, st) {
                     if (stater && stater.code === "ENOENT")
                       fs$rename(from, to, CB);
                     else
@@ -35032,9 +35033,9 @@ var require_polyfills = __commonJS({
           __name(rename3, "rename");
           if (Object.setPrototypeOf) Object.setPrototypeOf(rename3, fs$rename);
           return rename3;
-        }(fs57.rename);
+        }(fs56.rename);
       }
-      fs57.read = typeof fs57.read !== "function" ? fs57.read : function(fs$read) {
+      fs56.read = typeof fs56.read !== "function" ? fs56.read : function(fs$read) {
         function read2(fd, buffer, offset, length, position, callback_) {
           var callback;
           if (callback_ && typeof callback_ === "function") {
@@ -35042,23 +35043,23 @@ var require_polyfills = __commonJS({
             callback = /* @__PURE__ */ __name(function(er, _, __) {
               if (er && er.code === "EAGAIN" && eagCounter < 10) {
                 eagCounter++;
-                return fs$read.call(fs57, fd, buffer, offset, length, position, callback);
+                return fs$read.call(fs56, fd, buffer, offset, length, position, callback);
               }
               callback_.apply(this, arguments);
             }, "callback");
           }
-          return fs$read.call(fs57, fd, buffer, offset, length, position, callback);
+          return fs$read.call(fs56, fd, buffer, offset, length, position, callback);
         }
         __name(read2, "read");
         if (Object.setPrototypeOf) Object.setPrototypeOf(read2, fs$read);
         return read2;
-      }(fs57.read);
-      fs57.readSync = typeof fs57.readSync !== "function" ? fs57.readSync : /* @__PURE__ */ function(fs$readSync) {
+      }(fs56.read);
+      fs56.readSync = typeof fs56.readSync !== "function" ? fs56.readSync : /* @__PURE__ */ function(fs$readSync) {
         return function(fd, buffer, offset, length, position) {
           var eagCounter = 0;
           while (true) {
             try {
-              return fs$readSync.call(fs57, fd, buffer, offset, length, position);
+              return fs$readSync.call(fs56, fd, buffer, offset, length, position);
             } catch (er) {
               if (er.code === "EAGAIN" && eagCounter < 10) {
                 eagCounter++;
@@ -35068,11 +35069,11 @@ var require_polyfills = __commonJS({
             }
           }
         };
-      }(fs57.readSync);
-      function patchLchmod(fs58) {
-        fs58.lchmod = function(path64, mode, callback) {
-          fs58.open(
-            path64,
+      }(fs56.readSync);
+      function patchLchmod(fs57) {
+        fs57.lchmod = function(path63, mode, callback) {
+          fs57.open(
+            path63,
             constants5.O_WRONLY | constants5.O_SYMLINK,
             mode,
             function(err, fd) {
@@ -35080,74 +35081,74 @@ var require_polyfills = __commonJS({
                 if (callback) callback(err);
                 return;
               }
-              fs58.fchmod(fd, mode, function(err2) {
-                fs58.close(fd, function(err22) {
+              fs57.fchmod(fd, mode, function(err2) {
+                fs57.close(fd, function(err22) {
                   if (callback) callback(err2 || err22);
                 });
               });
             }
           );
         };
-        fs58.lchmodSync = function(path64, mode) {
-          var fd = fs58.openSync(path64, constants5.O_WRONLY | constants5.O_SYMLINK, mode);
+        fs57.lchmodSync = function(path63, mode) {
+          var fd = fs57.openSync(path63, constants5.O_WRONLY | constants5.O_SYMLINK, mode);
           var threw = true;
           var ret;
           try {
-            ret = fs58.fchmodSync(fd, mode);
+            ret = fs57.fchmodSync(fd, mode);
             threw = false;
           } finally {
             if (threw) {
               try {
-                fs58.closeSync(fd);
+                fs57.closeSync(fd);
               } catch (er) {
               }
             } else {
-              fs58.closeSync(fd);
+              fs57.closeSync(fd);
             }
           }
           return ret;
         };
       }
       __name(patchLchmod, "patchLchmod");
-      function patchLutimes(fs58) {
-        if (constants5.hasOwnProperty("O_SYMLINK") && fs58.futimes) {
-          fs58.lutimes = function(path64, at, mt, cb) {
-            fs58.open(path64, constants5.O_SYMLINK, function(er, fd) {
+      function patchLutimes(fs57) {
+        if (constants5.hasOwnProperty("O_SYMLINK") && fs57.futimes) {
+          fs57.lutimes = function(path63, at, mt, cb) {
+            fs57.open(path63, constants5.O_SYMLINK, function(er, fd) {
               if (er) {
                 if (cb) cb(er);
                 return;
               }
-              fs58.futimes(fd, at, mt, function(er2) {
-                fs58.close(fd, function(er22) {
+              fs57.futimes(fd, at, mt, function(er2) {
+                fs57.close(fd, function(er22) {
                   if (cb) cb(er2 || er22);
                 });
               });
             });
           };
-          fs58.lutimesSync = function(path64, at, mt) {
-            var fd = fs58.openSync(path64, constants5.O_SYMLINK);
+          fs57.lutimesSync = function(path63, at, mt) {
+            var fd = fs57.openSync(path63, constants5.O_SYMLINK);
             var ret;
             var threw = true;
             try {
-              ret = fs58.futimesSync(fd, at, mt);
+              ret = fs57.futimesSync(fd, at, mt);
               threw = false;
             } finally {
               if (threw) {
                 try {
-                  fs58.closeSync(fd);
+                  fs57.closeSync(fd);
                 } catch (er) {
                 }
               } else {
-                fs58.closeSync(fd);
+                fs57.closeSync(fd);
               }
             }
             return ret;
           };
-        } else if (fs58.futimes) {
-          fs58.lutimes = function(_a2, _b2, _c2, cb) {
+        } else if (fs57.futimes) {
+          fs57.lutimes = function(_a2, _b2, _c2, cb) {
             if (cb) process.nextTick(cb);
           };
-          fs58.lutimesSync = function() {
+          fs57.lutimesSync = function() {
           };
         }
       }
@@ -35155,7 +35156,7 @@ var require_polyfills = __commonJS({
       function chmodFix(orig) {
         if (!orig) return orig;
         return function(target, mode, cb) {
-          return orig.call(fs57, target, mode, function(er) {
+          return orig.call(fs56, target, mode, function(er) {
             if (chownErOk(er)) er = null;
             if (cb) cb.apply(this, arguments);
           });
@@ -35166,7 +35167,7 @@ var require_polyfills = __commonJS({
         if (!orig) return orig;
         return function(target, mode) {
           try {
-            return orig.call(fs57, target, mode);
+            return orig.call(fs56, target, mode);
           } catch (er) {
             if (!chownErOk(er)) throw er;
           }
@@ -35176,7 +35177,7 @@ var require_polyfills = __commonJS({
       function chownFix(orig) {
         if (!orig) return orig;
         return function(target, uid, gid, cb) {
-          return orig.call(fs57, target, uid, gid, function(er) {
+          return orig.call(fs56, target, uid, gid, function(er) {
             if (chownErOk(er)) er = null;
             if (cb) cb.apply(this, arguments);
           });
@@ -35187,7 +35188,7 @@ var require_polyfills = __commonJS({
         if (!orig) return orig;
         return function(target, uid, gid) {
           try {
-            return orig.call(fs57, target, uid, gid);
+            return orig.call(fs56, target, uid, gid);
           } catch (er) {
             if (!chownErOk(er)) throw er;
           }
@@ -35209,14 +35210,14 @@ var require_polyfills = __commonJS({
             if (cb) cb.apply(this, arguments);
           }
           __name(callback, "callback");
-          return options ? orig.call(fs57, target, options, callback) : orig.call(fs57, target, callback);
+          return options ? orig.call(fs56, target, options, callback) : orig.call(fs56, target, callback);
         };
       }
       __name(statFix, "statFix");
       function statFixSync(orig) {
         if (!orig) return orig;
         return function(target, options) {
-          var stats = options ? orig.call(fs57, target, options) : orig.call(fs57, target);
+          var stats = options ? orig.call(fs56, target, options) : orig.call(fs56, target);
           if (stats) {
             if (stats.uid < 0) stats.uid += 4294967296;
             if (stats.gid < 0) stats.gid += 4294967296;
@@ -35249,16 +35250,16 @@ var require_legacy_streams = __commonJS({
     init_esbuild_shims();
     var Stream2 = __require("stream").Stream;
     module.exports = legacy;
-    function legacy(fs57) {
+    function legacy(fs56) {
       return {
         ReadStream,
         WriteStream
       };
-      function ReadStream(path64, options) {
-        if (!(this instanceof ReadStream)) return new ReadStream(path64, options);
+      function ReadStream(path63, options) {
+        if (!(this instanceof ReadStream)) return new ReadStream(path63, options);
         Stream2.call(this);
         var self2 = this;
-        this.path = path64;
+        this.path = path63;
         this.fd = null;
         this.readable = true;
         this.paused = false;
@@ -35292,7 +35293,7 @@ var require_legacy_streams = __commonJS({
           });
           return;
         }
-        fs57.open(this.path, this.flags, this.mode, function(err, fd) {
+        fs56.open(this.path, this.flags, this.mode, function(err, fd) {
           if (err) {
             self2.emit("error", err);
             self2.readable = false;
@@ -35304,10 +35305,10 @@ var require_legacy_streams = __commonJS({
         });
       }
       __name(ReadStream, "ReadStream");
-      function WriteStream(path64, options) {
-        if (!(this instanceof WriteStream)) return new WriteStream(path64, options);
+      function WriteStream(path63, options) {
+        if (!(this instanceof WriteStream)) return new WriteStream(path63, options);
         Stream2.call(this);
-        this.path = path64;
+        this.path = path63;
         this.fd = null;
         this.writable = true;
         this.flags = "w";
@@ -35332,7 +35333,7 @@ var require_legacy_streams = __commonJS({
         this.busy = false;
         this._queue = [];
         if (this.fd === null) {
-          this._open = fs57.open;
+          this._open = fs56.open;
           this._queue.push([this._open, this.path, this.flags, this.mode, void 0]);
           this.flush();
         }
@@ -35372,7 +35373,7 @@ var require_clone = __commonJS({
 var require_graceful_fs2 = __commonJS({
   "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs/graceful-fs.js"(exports, module) {
     init_esbuild_shims();
-    var fs57 = __require("fs");
+    var fs56 = __require("fs");
     var polyfills = require_polyfills();
     var legacy = require_legacy_streams();
     var clone = require_clone();
@@ -35406,12 +35407,12 @@ var require_graceful_fs2 = __commonJS({
         m = "GFS4: " + m.split(/\n/).join("\nGFS4: ");
         console.error(m);
       }, "debug");
-    if (!fs57[gracefulQueue]) {
+    if (!fs56[gracefulQueue]) {
       queue = globalThis[gracefulQueue] || [];
-      publishQueue(fs57, queue);
-      fs57.close = function(fs$close) {
+      publishQueue(fs56, queue);
+      fs56.close = function(fs$close) {
         function close(fd, cb) {
-          return fs$close.call(fs57, fd, function(err) {
+          return fs$close.call(fs56, fd, function(err) {
             if (!err) {
               resetQueue();
             }
@@ -35424,49 +35425,49 @@ var require_graceful_fs2 = __commonJS({
           value: fs$close
         });
         return close;
-      }(fs57.close);
-      fs57.closeSync = function(fs$closeSync) {
-        function closeSync2(fd) {
-          fs$closeSync.apply(fs57, arguments);
+      }(fs56.close);
+      fs56.closeSync = function(fs$closeSync) {
+        function closeSync3(fd) {
+          fs$closeSync.apply(fs56, arguments);
           resetQueue();
         }
-        __name(closeSync2, "closeSync");
-        Object.defineProperty(closeSync2, previousSymbol, {
+        __name(closeSync3, "closeSync");
+        Object.defineProperty(closeSync3, previousSymbol, {
           value: fs$closeSync
         });
-        return closeSync2;
-      }(fs57.closeSync);
+        return closeSync3;
+      }(fs56.closeSync);
       if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) {
         process.on("exit", function() {
-          debug(fs57[gracefulQueue]);
-          __require("assert").equal(fs57[gracefulQueue].length, 0);
+          debug(fs56[gracefulQueue]);
+          __require("assert").equal(fs56[gracefulQueue].length, 0);
         });
       }
     }
     var queue;
     if (!globalThis[gracefulQueue]) {
-      publishQueue(globalThis, fs57[gracefulQueue]);
-    }
-    module.exports = patch(clone(fs57));
-    if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs57.__patched) {
-      module.exports = patch(fs57);
-      fs57.__patched = true;
-    }
-    function patch(fs58) {
-      polyfills(fs58);
-      fs58.gracefulify = patch;
-      fs58.createReadStream = createReadStream2;
-      fs58.createWriteStream = createWriteStream4;
-      var fs$readFile = fs58.readFile;
-      fs58.readFile = readFile4;
-      function readFile4(path64, options, cb) {
+      publishQueue(globalThis, fs56[gracefulQueue]);
+    }
+    module.exports = patch(clone(fs56));
+    if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs56.__patched) {
+      module.exports = patch(fs56);
+      fs56.__patched = true;
+    }
+    function patch(fs57) {
+      polyfills(fs57);
+      fs57.gracefulify = patch;
+      fs57.createReadStream = createReadStream2;
+      fs57.createWriteStream = createWriteStream4;
+      var fs$readFile = fs57.readFile;
+      fs57.readFile = readFile4;
+      function readFile4(path63, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
-        return go$readFile(path64, options, cb);
-        function go$readFile(path65, options2, cb2, startTime) {
-          return fs$readFile(path65, options2, function(err) {
+        return go$readFile(path63, options, cb);
+        function go$readFile(path64, options2, cb2, startTime) {
+          return fs$readFile(path64, options2, function(err) {
             if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
-              enqueue([go$readFile, [path65, options2, cb2], err, startTime || Date.now(), Date.now()]);
+              enqueue([go$readFile, [path64, options2, cb2], err, startTime || Date.now(), Date.now()]);
             else {
               if (typeof cb2 === "function")
                 cb2.apply(this, arguments);
@@ -35476,16 +35477,16 @@ var require_graceful_fs2 = __commonJS({
         __name(go$readFile, "go$readFile");
       }
       __name(readFile4, "readFile");
-      var fs$writeFile = fs58.writeFile;
-      fs58.writeFile = writeFile8;
-      function writeFile8(path64, data, options, cb) {
+      var fs$writeFile = fs57.writeFile;
+      fs57.writeFile = writeFile8;
+      function writeFile8(path63, data, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
-        return go$writeFile(path64, data, options, cb);
-        function go$writeFile(path65, data2, options2, cb2, startTime) {
-          return fs$writeFile(path65, data2, options2, function(err) {
+        return go$writeFile(path63, data, options, cb);
+        function go$writeFile(path64, data2, options2, cb2, startTime) {
+          return fs$writeFile(path64, data2, options2, function(err) {
             if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
-              enqueue([go$writeFile, [path65, data2, options2, cb2], err, startTime || Date.now(), Date.now()]);
+              enqueue([go$writeFile, [path64, data2, options2, cb2], err, startTime || Date.now(), Date.now()]);
             else {
               if (typeof cb2 === "function")
                 cb2.apply(this, arguments);
@@ -35495,17 +35496,17 @@ var require_graceful_fs2 = __commonJS({
         __name(go$writeFile, "go$writeFile");
       }
       __name(writeFile8, "writeFile");
-      var fs$appendFile = fs58.appendFile;
+      var fs$appendFile = fs57.appendFile;
       if (fs$appendFile)
-        fs58.appendFile = appendFile;
-      function appendFile(path64, data, options, cb) {
+        fs57.appendFile = appendFile;
+      function appendFile(path63, data, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
-        return go$appendFile(path64, data, options, cb);
-        function go$appendFile(path65, data2, options2, cb2, startTime) {
-          return fs$appendFile(path65, data2, options2, function(err) {
+        return go$appendFile(path63, data, options, cb);
+        function go$appendFile(path64, data2, options2, cb2, startTime) {
+          return fs$appendFile(path64, data2, options2, function(err) {
             if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
-              enqueue([go$appendFile, [path65, data2, options2, cb2], err, startTime || Date.now(), Date.now()]);
+              enqueue([go$appendFile, [path64, data2, options2, cb2], err, startTime || Date.now(), Date.now()]);
             else {
               if (typeof cb2 === "function")
                 cb2.apply(this, arguments);
@@ -35515,9 +35516,9 @@ var require_graceful_fs2 = __commonJS({
         __name(go$appendFile, "go$appendFile");
       }
       __name(appendFile, "appendFile");
-      var fs$copyFile = fs58.copyFile;
+      var fs$copyFile = fs57.copyFile;
       if (fs$copyFile)
-        fs58.copyFile = copyFile;
+        fs57.copyFile = copyFile;
       function copyFile(src, dest, flags, cb) {
         if (typeof flags === "function") {
           cb = flags;
@@ -35537,34 +35538,34 @@ var require_graceful_fs2 = __commonJS({
         __name(go$copyFile, "go$copyFile");
       }
       __name(copyFile, "copyFile");
-      var fs$readdir = fs58.readdir;
-      fs58.readdir = readdir4;
+      var fs$readdir = fs57.readdir;
+      fs57.readdir = readdir4;
       var noReaddirOptionVersions = /^v[0-5]\./;
-      function readdir4(path64, options, cb) {
+      function readdir4(path63, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
-        var go$readdir = noReaddirOptionVersions.test(process.version) ? /* @__PURE__ */ __name(function go$readdir2(path65, options2, cb2, startTime) {
-          return fs$readdir(path65, fs$readdirCallback(
-            path65,
+        var go$readdir = noReaddirOptionVersions.test(process.version) ? /* @__PURE__ */ __name(function go$readdir2(path64, options2, cb2, startTime) {
+          return fs$readdir(path64, fs$readdirCallback(
+            path64,
             options2,
             cb2,
             startTime
           ));
-        }, "go$readdir") : /* @__PURE__ */ __name(function go$readdir2(path65, options2, cb2, startTime) {
-          return fs$readdir(path65, options2, fs$readdirCallback(
-            path65,
+        }, "go$readdir") : /* @__PURE__ */ __name(function go$readdir2(path64, options2, cb2, startTime) {
+          return fs$readdir(path64, options2, fs$readdirCallback(
+            path64,
             options2,
             cb2,
             startTime
           ));
         }, "go$readdir");
-        return go$readdir(path64, options, cb);
-        function fs$readdirCallback(path65, options2, cb2, startTime) {
+        return go$readdir(path63, options, cb);
+        function fs$readdirCallback(path64, options2, cb2, startTime) {
           return function(err, files) {
             if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
               enqueue([
                 go$readdir,
-                [path65, options2, cb2],
+                [path64, options2, cb2],
                 err,
                 startTime || Date.now(),
                 Date.now()
@@ -35581,21 +35582,21 @@ var require_graceful_fs2 = __commonJS({
       }
       __name(readdir4, "readdir");
       if (process.version.substr(0, 4) === "v0.8") {
-        var legStreams = legacy(fs58);
+        var legStreams = legacy(fs57);
         ReadStream = legStreams.ReadStream;
         WriteStream = legStreams.WriteStream;
       }
-      var fs$ReadStream = fs58.ReadStream;
+      var fs$ReadStream = fs57.ReadStream;
       if (fs$ReadStream) {
         ReadStream.prototype = Object.create(fs$ReadStream.prototype);
         ReadStream.prototype.open = ReadStream$open;
       }
-      var fs$WriteStream = fs58.WriteStream;
+      var fs$WriteStream = fs57.WriteStream;
       if (fs$WriteStream) {
         WriteStream.prototype = Object.create(fs$WriteStream.prototype);
         WriteStream.prototype.open = WriteStream$open;
       }
-      Object.defineProperty(fs58, "ReadStream", {
+      Object.defineProperty(fs57, "ReadStream", {
         get: /* @__PURE__ */ __name(function() {
           return ReadStream;
         }, "get"),
@@ -35605,7 +35606,7 @@ var require_graceful_fs2 = __commonJS({
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(fs58, "WriteStream", {
+      Object.defineProperty(fs57, "WriteStream", {
         get: /* @__PURE__ */ __name(function() {
           return WriteStream;
         }, "get"),
@@ -35616,7 +35617,7 @@ var require_graceful_fs2 = __commonJS({
         configurable: true
       });
       var FileReadStream = ReadStream;
-      Object.defineProperty(fs58, "FileReadStream", {
+      Object.defineProperty(fs57, "FileReadStream", {
         get: /* @__PURE__ */ __name(function() {
           return FileReadStream;
         }, "get"),
@@ -35627,7 +35628,7 @@ var require_graceful_fs2 = __commonJS({
         configurable: true
       });
       var FileWriteStream = WriteStream;
-      Object.defineProperty(fs58, "FileWriteStream", {
+      Object.defineProperty(fs57, "FileWriteStream", {
         get: /* @__PURE__ */ __name(function() {
           return FileWriteStream;
         }, "get"),
@@ -35637,7 +35638,7 @@ var require_graceful_fs2 = __commonJS({
         enumerable: true,
         configurable: true
       });
-      function ReadStream(path64, options) {
+      function ReadStream(path63, options) {
         if (this instanceof ReadStream)
           return fs$ReadStream.apply(this, arguments), this;
         else
@@ -35659,7 +35660,7 @@ var require_graceful_fs2 = __commonJS({
         });
       }
       __name(ReadStream$open, "ReadStream$open");
-      function WriteStream(path64, options) {
+      function WriteStream(path63, options) {
         if (this instanceof WriteStream)
           return fs$WriteStream.apply(this, arguments), this;
         else
@@ -35679,24 +35680,24 @@ var require_graceful_fs2 = __commonJS({
         });
       }
       __name(WriteStream$open, "WriteStream$open");
-      function createReadStream2(path64, options) {
-        return new fs58.ReadStream(path64, options);
+      function createReadStream2(path63, options) {
+        return new fs57.ReadStream(path63, options);
       }
       __name(createReadStream2, "createReadStream");
-      function createWriteStream4(path64, options) {
-        return new fs58.WriteStream(path64, options);
+      function createWriteStream4(path63, options) {
+        return new fs57.WriteStream(path63, options);
       }
       __name(createWriteStream4, "createWriteStream");
-      var fs$open = fs58.open;
-      fs58.open = open4;
-      function open4(path64, flags, mode, cb) {
+      var fs$open = fs57.open;
+      fs57.open = open4;
+      function open4(path63, flags, mode, cb) {
         if (typeof mode === "function")
           cb = mode, mode = null;
-        return go$open(path64, flags, mode, cb);
-        function go$open(path65, flags2, mode2, cb2, startTime) {
-          return fs$open(path65, flags2, mode2, function(err, fd) {
+        return go$open(path63, flags, mode, cb);
+        function go$open(path64, flags2, mode2, cb2, startTime) {
+          return fs$open(path64, flags2, mode2, function(err, fd) {
             if (err && (err.code === "EMFILE" || err.code === "ENFILE"))
-              enqueue([go$open, [path65, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]);
+              enqueue([go$open, [path64, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]);
             else {
               if (typeof cb2 === "function")
                 cb2.apply(this, arguments);
@@ -35706,22 +35707,22 @@ var require_graceful_fs2 = __commonJS({
         __name(go$open, "go$open");
       }
       __name(open4, "open");
-      return fs58;
+      return fs57;
     }
     __name(patch, "patch");
     function enqueue(elem) {
       debug("ENQUEUE", elem[0].name, elem[1]);
-      fs57[gracefulQueue].push(elem);
+      fs56[gracefulQueue].push(elem);
       retry();
     }
     __name(enqueue, "enqueue");
     var retryTimer;
     function resetQueue() {
       var now = Date.now();
-      for (var i = 0; i < fs57[gracefulQueue].length; ++i) {
-        if (fs57[gracefulQueue][i].length > 2) {
-          fs57[gracefulQueue][i][3] = now;
-          fs57[gracefulQueue][i][4] = now;
+      for (var i = 0; i < fs56[gracefulQueue].length; ++i) {
+        if (fs56[gracefulQueue][i].length > 2) {
+          fs56[gracefulQueue][i][3] = now;
+          fs56[gracefulQueue][i][4] = now;
         }
       }
       retry();
@@ -35730,9 +35731,9 @@ var require_graceful_fs2 = __commonJS({
     function retry() {
       clearTimeout(retryTimer);
       retryTimer = void 0;
-      if (fs57[gracefulQueue].length === 0)
+      if (fs56[gracefulQueue].length === 0)
         return;
-      var elem = fs57[gracefulQueue].shift();
+      var elem = fs56[gracefulQueue].shift();
       var fn = elem[0];
       var args = elem[1];
       var err = elem[2];
@@ -35754,7 +35755,7 @@ var require_graceful_fs2 = __commonJS({
           debug("RETRY", fn.name, args);
           fn.apply(null, args.concat([startTime]));
         } else {
-          fs57[gracefulQueue].push(elem);
+          fs56[gracefulQueue].push(elem);
         }
       }
       if (retryTimer === void 0) {
@@ -36091,8 +36092,8 @@ var require_config_chain = __commonJS({
   "node_modules/config-chain/index.js"(exports, module) {
     init_esbuild_shims();
     var ProtoList = require_proto_list();
-    var path64 = __require("path");
-    var fs57 = __require("fs");
+    var path63 = __require("path");
+    var fs56 = __require("fs");
     var ini2 = require_ini2();
     var EE = __require("events").EventEmitter;
     var url = __require("url");
@@ -36106,15 +36107,15 @@ var require_config_chain = __commonJS({
       return conf;
     };
     var find = exports.find = function() {
-      var rel = path64.join.apply(null, [].slice.call(arguments));
+      var rel = path63.join.apply(null, [].slice.call(arguments));
       function find2(start, rel2) {
-        var file = path64.join(start, rel2);
+        var file = path63.join(start, rel2);
         try {
-          fs57.statSync(file);
+          fs56.statSync(file);
           return file;
         } catch (err) {
-          if (path64.dirname(start) !== start)
-            return find2(path64.dirname(start), rel2);
+          if (path63.dirname(start) !== start)
+            return find2(path63.dirname(start), rel2);
         }
       }
       __name(find2, "find");
@@ -36146,10 +36147,10 @@ var require_config_chain = __commonJS({
       var args = [].slice.call(arguments).filter(function(arg) {
         return arg != null;
       });
-      var file = path64.join.apply(null, args);
+      var file = path63.join.apply(null, args);
       var content;
       try {
-        content = fs57.readFileSync(file, "utf-8");
+        content = fs56.readFileSync(file, "utf-8");
       } catch (err) {
         return;
       }
@@ -36243,7 +36244,7 @@ var require_config_chain = __commonJS({
         data = ini2.stringify(data);
       }
       this._saving++;
-      fs57.writeFile(target.path, data, "utf8", function(er) {
+      fs56.writeFile(target.path, data, "utf8", function(er) {
         this._saving--;
         if (er) {
           if (cb) return cb(er);
@@ -36262,7 +36263,7 @@ var require_config_chain = __commonJS({
       this.sources[name] = { path: file, type };
       this.push(marker);
       this._await();
-      fs57.readFile(file, "utf8", function(er, data) {
+      fs56.readFile(file, "utf8", function(er, data) {
         if (er) this.emit("error", er);
         this.addString(data, file, type, marker);
       }.bind(this));
@@ -36416,8 +36417,8 @@ var require_util10 = __commonJS({
   "node_modules/@pnpm/npm-conf/lib/util.js"(exports) {
     "use strict";
     init_esbuild_shims();
-    var fs57 = __require("fs");
-    var path64 = __require("path");
+    var fs56 = __require("fs");
+    var path63 = __require("path");
     var { envReplace } = require_dist2();
     var parseKey = /* @__PURE__ */ __name((key) => {
       if (typeof key !== "string") {
@@ -36430,7 +36431,7 @@ var require_util10 = __commonJS({
         return field;
       }
       const typeList = [].concat(types[key]);
-      const isPath = typeList.indexOf(path64) !== -1;
+      const isPath = typeList.indexOf(path63) !== -1;
       const isBool = typeList.indexOf(Boolean) !== -1;
       const isString2 = typeList.indexOf(String) !== -1;
       const isNumber = typeList.indexOf(Number) !== -1;
@@ -36464,9 +36465,9 @@ var require_util10 = __commonJS({
       if (isPath) {
         const regex2 = process.platform === "win32" ? /^~(\/|\\)/ : /^~\//;
         if (regex2.test(field) && process.env.HOME) {
-          field = path64.resolve(process.env.HOME, field.substr(2));
+          field = path63.resolve(process.env.HOME, field.substr(2));
         }
-        field = path64.resolve(field);
+        field = path63.resolve(field);
       }
       if (isNumber && !isNaN(field)) {
         field = Number(field);
@@ -36474,10 +36475,10 @@ var require_util10 = __commonJS({
       return field;
     }, "parseField");
     var findPrefix = /* @__PURE__ */ __name((name) => {
-      name = path64.resolve(name);
+      name = path63.resolve(name);
       let walkedUp = false;
-      while (path64.basename(name) === "node_modules") {
-        name = path64.dirname(name);
+      while (path63.basename(name) === "node_modules") {
+        name = path63.dirname(name);
         walkedUp = true;
       }
       if (walkedUp) {
@@ -36489,11 +36490,11 @@ var require_util10 = __commonJS({
           return original;
         }
         try {
-          const files = fs57.readdirSync(name2);
+          const files = fs56.readdirSync(name2);
           if (files.includes("node_modules") || files.includes("package.json") || files.includes("package.json5") || files.includes("package.yaml") || files.includes("pnpm-workspace.yaml")) {
             return name2;
           }
-          const dirname21 = path64.dirname(name2);
+          const dirname21 = path63.dirname(name2);
           if (dirname21 === name2) {
             return original;
           }
@@ -36522,7 +36523,7 @@ var require_types = __commonJS({
   "node_modules/@pnpm/npm-conf/lib/types.js"(exports) {
     "use strict";
     init_esbuild_shims();
-    var path64 = __require("path");
+    var path63 = __require("path");
     var Stream2 = __require("stream").Stream;
     var url = __require("url");
     var Umask = /* @__PURE__ */ __name(() => {
@@ -36540,8 +36541,8 @@ var require_types = __commonJS({
       "bin-links": Boolean,
       browser: [null, String],
       ca: [null, String, Array],
-      cafile: path64,
-      cache: path64,
+      cafile: path63,
+      cache: path63,
       "cache-lock-stale": Number,
       "cache-lock-retries": Number,
       "cache-lock-wait": Number,
@@ -36565,7 +36566,7 @@ var require_types = __commonJS({
       "git-tag-version": Boolean,
       "commit-hooks": Boolean,
       global: Boolean,
-      globalconfig: path64,
+      globalconfig: path63,
       "global-style": Boolean,
       group: [Number, String],
       "https-proxy": [null, url],
@@ -36575,7 +36576,7 @@ var require_types = __commonJS({
       "if-present": Boolean,
       "ignore-prepublish": Boolean,
       "ignore-scripts": Boolean,
-      "init-module": path64,
+      "init-module": path63,
       "init-author-name": String,
       "init-author-email": String,
       "init-author-url": ["", url],
@@ -36608,7 +36609,7 @@ var require_types = __commonJS({
       parseable: Boolean,
       "prefer-offline": Boolean,
       "prefer-online": Boolean,
-      prefix: path64,
+      prefix: path63,
       production: Boolean,
       progress: Boolean,
       proxy: [null, false, url],
@@ -36641,12 +36642,12 @@ var require_types = __commonJS({
       "strict-ssl": Boolean,
       tag: String,
       timing: Boolean,
-      tmp: path64,
+      tmp: path63,
       unicode: Boolean,
       "unsafe-perm": Boolean,
       usage: Boolean,
       user: [Number, String],
-      userconfig: path64,
+      userconfig: path63,
       umask: Umask,
       version: Boolean,
       "tag-version-prefix": String,
@@ -36663,8 +36664,8 @@ var require_conf = __commonJS({
     "use strict";
     init_esbuild_shims();
     var { readCAFileSync } = require_dist();
-    var fs57 = __require("fs");
-    var path64 = __require("path");
+    var fs56 = __require("fs");
+    var path63 = __require("path");
     var { ConfigChain } = require_config_chain();
     var envKeyToSetting = require_envKeyToSetting();
     var util = require_util10();
@@ -36701,7 +36702,7 @@ var require_conf = __commonJS({
         this.push(marker);
         this._await();
         try {
-          const contents = fs57.readFileSync(file, "utf8");
+          const contents = fs56.readFileSync(file, "utf8");
           this.addString(contents, file, "ini", marker);
         } catch (error) {
           if (error.code === "ENOENT") {
@@ -36745,7 +36746,7 @@ var require_conf = __commonJS({
             this.set("prefix", prefix);
           }, "set"),
           get: /* @__PURE__ */ __name(() => {
-            return path64.resolve(this.get("prefix"));
+            return path63.resolve(this.get("prefix"));
           }, "get")
         });
         let p;
@@ -36759,7 +36760,7 @@ var require_conf = __commonJS({
           }, "get")
         });
         if (Object.prototype.hasOwnProperty.call(cli, "prefix")) {
-          p = path64.resolve(cli.prefix);
+          p = path63.resolve(cli.prefix);
         } else {
           try {
             const prefix = util.findPrefix(process.cwd());
@@ -36790,9 +36791,9 @@ var require_conf = __commonJS({
           defConf.user = Number(process.env.SUDO_UID);
           return;
         }
-        const prefix = path64.resolve(this.get("prefix"));
+        const prefix = path63.resolve(this.get("prefix"));
         try {
-          const stats = fs57.statSync(prefix);
+          const stats = fs56.statSync(prefix);
           defConf.user = stats.uid;
         } catch (error) {
           if (error.code === "ENOENT") {
@@ -36829,7 +36830,7 @@ var require_defaults = __commonJS({
     "use strict";
     init_esbuild_shims();
     var os34 = __require("os");
-    var path64 = __require("path");
+    var path63 = __require("path");
     var temp = os34.tmpdir();
     var uidOrPid = process.getuid ? process.getuid() : process.pid;
     var hasUnicode = /* @__PURE__ */ __name(() => true, "hasUnicode");
@@ -36845,11 +36846,11 @@ var require_defaults = __commonJS({
     if (home) {
       process.env.HOME = home;
     } else {
-      home = path64.resolve(temp, "npm-" + uidOrPid);
+      home = path63.resolve(temp, "npm-" + uidOrPid);
     }
     var cacheExtra = process.platform === "win32" ? "npm-cache" : ".npm";
     var cacheRoot = process.platform === "win32" && process.env.APPDATA || home;
-    var cache3 = path64.resolve(cacheRoot, cacheExtra);
+    var cache3 = path63.resolve(cacheRoot, cacheExtra);
     var defaults;
     var globalPrefix;
     Object.defineProperty(exports, "defaults", {
@@ -36858,11 +36859,11 @@ var require_defaults = __commonJS({
         if (process.env.PREFIX) {
           globalPrefix = process.env.PREFIX;
         } else if (process.platform === "win32") {
-          globalPrefix = path64.dirname(process.execPath);
+          globalPrefix = path63.dirname(process.execPath);
         } else {
-          globalPrefix = path64.dirname(path64.dirname(process.execPath));
+          globalPrefix = path63.dirname(path63.dirname(process.execPath));
           if (process.env.DESTDIR) {
-            globalPrefix = path64.join(process.env.DESTDIR, globalPrefix);
+            globalPrefix = path63.join(process.env.DESTDIR, globalPrefix);
           }
         }
         defaults = {
@@ -36900,7 +36901,7 @@ var require_defaults = __commonJS({
           "git-tag-version": true,
           "commit-hooks": true,
           global: false,
-          globalconfig: path64.resolve(globalPrefix, "etc", "npmrc"),
+          globalconfig: path63.resolve(globalPrefix, "etc", "npmrc"),
           "global-style": false,
           group: process.platform === "win32" ? 0 : process.env.SUDO_GID || process.getgid && process.getgid(),
           "ham-it-up": false,
@@ -36908,7 +36909,7 @@ var require_defaults = __commonJS({
           "if-present": false,
           "ignore-prepublish": false,
           "ignore-scripts": false,
-          "init-module": path64.resolve(home, ".npm-init.js"),
+          "init-module": path63.resolve(home, ".npm-init.js"),
           "init-author-name": "",
           "init-author-email": "",
           "init-author-url": "",
@@ -36979,7 +36980,7 @@ var require_defaults = __commonJS({
           "unsafe-perm": process.platform === "win32" || process.platform === "cygwin" || !(process.getuid && process.setuid && process.getgid && process.setgid) || process.getuid() !== 0,
           usage: false,
           user: process.platform === "win32" ? 0 : "nobody",
-          userconfig: path64.resolve(home, ".npmrc"),
+          userconfig: path63.resolve(home, ".npmrc"),
           umask: process.umask ? process.umask() : umask.fromString("022"),
           version: false,
           versions: false,
@@ -36997,7 +36998,7 @@ var require_npm_conf = __commonJS({
   "node_modules/@pnpm/npm-conf/index.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var path64 = __require("path");
+    var path63 = __require("path");
     var Conf = require_conf();
     var _defaults = require_defaults();
     module.exports = (opts, types, defaults) => {
@@ -37014,12 +37015,12 @@ var require_npm_conf = __commonJS({
           failedToLoadBuiltInConfig = true;
         }
         if (npmPath) {
-          warnings.push(conf.addFile(path64.resolve(path64.dirname(npmPath), "..", "npmrc"), "builtin"));
+          warnings.push(conf.addFile(path63.resolve(path63.dirname(npmPath), "..", "npmrc"), "builtin"));
         }
       }
       conf.addEnv();
       conf.loadPrefix();
-      const projectConf = path64.resolve(conf.localPrefix, ".npmrc");
+      const projectConf = path63.resolve(conf.localPrefix, ".npmrc");
       const userConf = conf.get("userconfig");
       if (!conf.get("global") && projectConf !== userConf) {
         warnings.push(conf.addFile(projectConf, "project"));
@@ -37027,14 +37028,14 @@ var require_npm_conf = __commonJS({
         conf.add({}, "project");
       }
       if (conf.get("workspace-prefix") && conf.get("workspace-prefix") !== projectConf) {
-        const workspaceConf = path64.resolve(conf.get("workspace-prefix"), ".npmrc");
+        const workspaceConf = path63.resolve(conf.get("workspace-prefix"), ".npmrc");
         warnings.push(conf.addFile(workspaceConf, "workspace"));
       }
       warnings.push(conf.addFile(conf.get("userconfig"), "user"));
       if (conf.get("prefix")) {
-        const etc = path64.resolve(conf.get("prefix"), "etc");
-        conf.root.globalconfig = path64.resolve(etc, "npmrc");
-        conf.root.globalignorefile = path64.resolve(etc, "npmignore");
+        const etc = path63.resolve(conf.get("prefix"), "etc");
+        conf.root.globalconfig = path63.resolve(etc, "npmrc");
+        conf.root.globalignorefile = path63.resolve(etc, "npmignore");
       }
       warnings.push(conf.addFile(conf.get("globalconfig"), "global"));
       conf.loadUser();
@@ -37122,8 +37123,8 @@ var require_registry_auth_token = __commonJS({
       return { token, type: "Basic" };
     }
     __name(getLegacyAuthInfo, "getLegacyAuthInfo");
-    function normalizePath2(path64) {
-      return path64[path64.length - 1] === "/" ? path64 : path64 + "/";
+    function normalizePath2(path63) {
+      return path63[path63.length - 1] === "/" ? path63 : path63 + "/";
     }
     __name(normalizePath2, "normalizePath");
     function getAuthInfoForUrl(regUrl, npmrc) {
@@ -44516,8 +44517,8 @@ var cleanupYogaNode = /* @__PURE__ */ __name((node) => {
 var currentUpdatePriority = import_constants.NoEventPriority;
 var currentRootNode;
 async function loadPackageJson() {
-  const fs57 = await import("node:fs");
-  const content = fs57.readFileSync(new URL("../package.json", import.meta.url), "utf8");
+  const fs56 = await import("node:fs");
+  const content = fs56.readFileSync(new URL("../package.json", import.meta.url), "utf8");
   const parsedContent = JSON.parse(content);
   return {
     name: parsedContent?.name,
@@ -47204,8 +47205,8 @@ function Text({ color: color2, backgroundColor, dimColor = false, bold = false,
 __name(Text, "Text");
 
 // node_modules/ink/build/components/ErrorOverview.js
-var cleanupPath = /* @__PURE__ */ __name((path64) => {
-  return path64?.replace(`file://${cwd()}/`, "");
+var cleanupPath = /* @__PURE__ */ __name((path63) => {
+  return path63?.replace(`file://${cwd()}/`, "");
 }, "cleanupPath");
 var stackUtils = new import_stack_utils.default({
   cwd: cwd(),
@@ -49262,7 +49263,7 @@ var measure_element_default = measureElement;
 var import_react237 = __toESM(require_react(), 1);
 import dns from "node:dns";
 import os33 from "node:os";
-import path63, { basename as basename14 } from "node:path";
+import path62, { basename as basename14 } from "node:path";
 import v83 from "node:v8";
 
 // packages/cli/src/config/auth.ts
@@ -51657,11 +51658,11 @@ var parser = new YargsParser({
   resolve: resolve3,
   // TODO: figure  out a  way to combine ESM and CJS coverage, such  that
   // we can exercise all the lines below:
-  require: /* @__PURE__ */ __name((path64) => {
+  require: /* @__PURE__ */ __name((path63) => {
     if (typeof __require !== "undefined") {
-      return __require(path64);
-    } else if (path64.match(/\.json$/)) {
-      return JSON.parse(readFileSync2(path64, "utf8"));
+      return __require(path63);
+    } else if (path63.match(/\.json$/)) {
+      return JSON.parse(readFileSync2(path63, "utf8"));
     } else {
       throw Error("only .json config files are supported in ESM");
     }
@@ -53077,13 +53078,13 @@ function usage(yargs, shim3) {
   };
   self2.stringifiedValues = /* @__PURE__ */ __name(function stringifiedValues(values, separator) {
     let string = "";
-    const sep5 = separator || ", ";
+    const sep6 = separator || ", ";
     const array = [].concat(values);
     if (!values || !array.length)
       return string;
     array.forEach((value) => {
       if (string.length)
-        string += sep5;
+        string += sep6;
       string += JSON.stringify(value);
     });
     return string;
@@ -55497,29 +55498,29 @@ init_esbuild_shims();
 import { access, cp, mkdir, readdir, writeFile as writeFile2 } from "node:fs/promises";
 import { join as join4, basename as basename3 } from "node:path";
 var EXAMPLES_PATH = join4(resolveBundleDir(import.meta.url), "examples");
-async function pathExists(path64) {
+async function pathExists(path63) {
   try {
-    await access(path64);
+    await access(path63);
     return true;
   } catch (_e) {
     return false;
   }
 }
 __name(pathExists, "pathExists");
-async function createDirectory(path64) {
-  if (await pathExists(path64)) {
-    throw new Error(`Path already exists: ${path64}`);
+async function createDirectory(path63) {
+  if (await pathExists(path63)) {
+    throw new Error(`Path already exists: ${path63}`);
   }
-  await mkdir(path64, { recursive: true });
+  await mkdir(path63, { recursive: true });
 }
 __name(createDirectory, "createDirectory");
-async function copyDirectory(template, path64) {
-  await createDirectory(path64);
+async function copyDirectory(template, path63) {
+  await createDirectory(path63);
   const examplePath = join4(EXAMPLES_PATH, template);
   const entries = await readdir(examplePath, { withFileTypes: true });
   for (const entry of entries) {
     const srcPath = join4(examplePath, entry.name);
-    const destPath = join4(path64, entry.name);
+    const destPath = join4(path63, entry.name);
     await cp(srcPath, destPath, { recursive: true });
   }
 }
@@ -57034,9 +57035,9 @@ function ensureBuiltins() {
   if (!builtinsPromise) {
     builtinsPromise = (async () => {
       const labelled = [
-        { name: "telegram", promise: import("./chunks/dist-QUSDBLAK.js") },
+        { name: "telegram", promise: import("./chunks/dist-GKRNVFBH.js") },
         { name: "weixin", promise: import("./chunks/dist-BD27IA3L.js") },
-        { name: "dingtalk", promise: import("./chunks/dist-OLC6NBSB.js") },
+        { name: "dingtalk", promise: import("./chunks/dist-DZ6AJDX4.js") },
         { name: "feishu", promise: import("./chunks/dist-KIYB7DQW.js") },
         { name: "qqbot", promise: import("./chunks/dist-QFFZWACU.js") }
       ];
@@ -57958,6 +57959,7 @@ var buildRemovalNotice = /* @__PURE__ */ __name(() => [
   `                     ${t("China: https://coding.dashscope.aliyuncs.com/v1")}`,
   `                     ${t("International: https://coding-intl.dashscope.aliyuncs.com/v1")}`,
   `  ${cyan(t("OpenRouter"))}    \u2192  ${t("set OPENROUTER_API_KEY and OPENAI_BASE_URL=https://openrouter.ai/api/v1")}`,
+  `  ${cyan(t("Requesty"))}      \u2192  ${t("set REQUESTY_API_KEY and OPENAI_BASE_URL=https://router.requesty.ai/v1")}`,
   `  ${cyan(t("Qwen OAuth"))}    \u2192  ${t("run qwen interactively and use /auth; OAuth cannot be configured with env vars alone")}`,
   `  ${cyan(t("Scripted"))}      \u2192  ${t("edit ~/.qwen/settings.json, or run qwen interactively once")}`,
   "",
@@ -57971,6 +57973,7 @@ var legacySubcommands = [
   "status",
   "coding-plan",
   "openrouter",
+  "requesty",
   "api-key",
   "qwen-oauth"
 ];
@@ -58008,15 +58011,15 @@ function gh(...args) {
   return execFileSync2("gh", args, { encoding: "utf8" }).replace(/\r\n/g, "\n").trim();
 }
 __name(gh, "gh");
-function ghApi(path64, jq) {
-  const args = ["api", path64];
+function ghApi(path63, jq) {
+  const args = ["api", path63];
   if (jq) args.push("--jq", jq);
   const out = gh(...args);
   return out ? JSON.parse(out) : null;
 }
 __name(ghApi, "ghApi");
-function ghApiAll(path64) {
-  const out = gh("api", "--paginate", path64);
+function ghApiAll(path63) {
+  const out = gh("api", "--paginate", path63);
   if (!out) return [];
   const parsed = JSON.parse(out);
   return Array.isArray(parsed) ? parsed : [];
@@ -58405,8 +58408,8 @@ var prContextCommand = {
 init_esbuild_shims();
 import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync6 } from "node:fs";
 import { dirname as dirname7 } from "node:path";
-function showFile(baseRef, path64) {
-  return gitOpt("show", `${baseRef}:${path64}`);
+function showFile(baseRef, path63) {
+  return gitOpt("show", `${baseRef}:${path63}`);
 }
 __name(showFile, "showFile");
 function extractCodeReviewSection(content) {
@@ -59514,7 +59517,7 @@ var serveCommand = {
         process.exit(1);
       }
     }
-    const { runQwenServe } = await import("./chunks/serve-J6VG37OX.js");
+    const { runQwenServe } = await import("./chunks/serve-ZIP2GDFY.js");
     try {
       const handle = await runQwenServe({
         port: argv.port,
@@ -64019,6 +64022,11 @@ __name(detectTerminalThemeAsync, "detectTerminalThemeAsync");
 var debugLogger6 = createDebugLogger("THEME_MANAGER");
 var DEFAULT_THEME = QwenDark;
 var AUTO_THEME_NAME = "auto";
+function isPathWithinDirectory(parent, child) {
+  const relativePath = path12.relative(parent, child);
+  return relativePath === "" || !relativePath.startsWith(`..${path12.sep}`) && relativePath !== ".." && !path12.isAbsolute(relativePath);
+}
+__name(isPathWithinDirectory, "isPathWithinDirectory");
 var ThemeManager = class {
   static {
     __name(this, "ThemeManager");
@@ -64243,7 +64251,7 @@ var ThemeManager = class {
         return this.customThemes.get(canonicalPath);
       }
       const homeDir = path12.resolve(os8.homedir());
-      if (!canonicalPath.startsWith(homeDir)) {
+      if (!isPathWithinDirectory(homeDir, canonicalPath)) {
         debugLogger6.warn(
           `Theme file at "${themePath}" is outside your home directory. Only load themes from trusted sources.`
         );
@@ -70277,6 +70285,14 @@ function validateExtractedPaths(resolvedDest) {
   }
 }
 __name(validateExtractedPaths, "validateExtractedPaths");
+function isSafeTarEntryPath(entryPath) {
+  if (entryPath.length === 0) return false;
+  if (path18.posix.isAbsolute(entryPath) || path18.win32.isAbsolute(entryPath)) {
+    return false;
+  }
+  return !entryPath.split(/[\\/]+/).includes("..");
+}
+__name(isSafeTarEntryPath, "isSafeTarEntryPath");
 async function extractArchive(archivePath, destDir, target) {
   fs16.mkdirSync(destDir, { recursive: true });
   if (target.startsWith("win")) {
@@ -70305,7 +70321,7 @@ async function extractArchive(archivePath, destDir, target) {
       cwd: destDir,
       preservePaths: false,
       filter: /* @__PURE__ */ __name((p, entry) => {
-        if (p.startsWith("/") || p.includes("..")) return false;
+        if (!isSafeTarEntryPath(p)) return false;
         if ("type" in entry && entry.type === "SymbolicLink" && "linkpath" in entry) {
           const linkTarget = path18.resolve(
             resolvedDest,
@@ -70795,7 +70811,7 @@ function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
     const realPath = fs17.realpathSync(cliPath).replace(/\\/g, "/");
     const normalizedProjectRoot = projectRoot?.replace(/\\/g, "/");
     const isGit = isGitRepository(process.cwd());
-    if (isGit && normalizedProjectRoot && realPath.startsWith(normalizedProjectRoot) && !realPath.includes("/node_modules/")) {
+    if (isGit && normalizedProjectRoot && isSamePathOrInside(realPath, normalizedProjectRoot) && !realPath.includes("/node_modules/")) {
       return {
         packageManager: "unknown" /* UNKNOWN */,
         // Not managed by a package manager in this sense
@@ -70871,7 +70887,7 @@ function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
         updateMessage: isAutoUpdateEnabled ? "Installed with bun. Attempting to automatically update now..." : `Please run ${updateCommand4} to update`
       };
     }
-    if (normalizedProjectRoot && realPath.startsWith(`${normalizedProjectRoot}/node_modules`)) {
+    if (normalizedProjectRoot && isSamePathOrInside(realPath, `${normalizedProjectRoot}/node_modules`)) {
       let pm = "npm" /* NPM */;
       if (fs17.existsSync(path19.join(projectRoot, "yarn.lock"))) {
         pm = "yarn" /* YARN */;
@@ -70913,6 +70929,19 @@ function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
   }
 }
 __name(getInstallationInfo, "getInstallationInfo");
+function stripTrailingSlashes(value) {
+  return value.replace(/\/+$/, "") || "/";
+}
+__name(stripTrailingSlashes, "stripTrailingSlashes");
+function isSamePathOrInside(candidate, parent) {
+  const normalizedCandidate = stripTrailingSlashes(candidate);
+  const normalizedParent = stripTrailingSlashes(parent);
+  if (normalizedParent === "/") {
+    return normalizedCandidate === "/" || normalizedCandidate.startsWith("/");
+  }
+  return normalizedCandidate === normalizedParent || normalizedCandidate.startsWith(`${normalizedParent}/`);
+}
+__name(isSamePathOrInside, "isSamePathOrInside");
 function getStandaloneInstallInfo(realPath, isAutoUpdateEnabled) {
   const installDir = standaloneInstallDirForCliPath(realPath);
   if (!installDir || !isStandaloneInstallDir(installDir)) {
@@ -71329,6 +71358,13 @@ __name(formatCoreDiagnostics, "formatCoreDiagnostics");
 var CPU_PROFILE_USAGE_HINT = "/doctor cpu-profile [--duration <seconds>]";
 var DEFAULT_CPU_PROFILE_DURATION_SEC = 30;
 var MAX_CPU_PROFILE_DURATION_SEC = 300;
+function parseCpuProfileDuration(raw) {
+  if (!raw || !/^\d+$/.test(raw)) {
+    return NaN;
+  }
+  return Number(raw);
+}
+__name(parseCpuProfileDuration, "parseCpuProfileDuration");
 async function cpuProfileDoctorAction(context, args = "") {
   const executionMode = context.executionMode ?? "interactive";
   const abortSignal = context.abortSignal;
@@ -71338,7 +71374,7 @@ async function cpuProfileDoctorAction(context, args = "") {
   const durationIdx = tokens.indexOf("--duration");
   if (durationIdx !== -1) {
     const rawVal = tokens[durationIdx + 1];
-    const val = rawVal ? parseInt(rawVal, 10) : NaN;
+    const val = parseCpuProfileDuration(rawVal);
     if (!Number.isFinite(val) || val < 1 || val > MAX_CPU_PROFILE_DURATION_SEC) {
       const errorMsg = `${t("Duration must be between 1 and {max} seconds", { max: String(MAX_CPU_PROFILE_DURATION_SEC) })}. ${t("Usage")}: ${CPU_PROFILE_USAGE_HINT}`;
       if (executionMode === "interactive") {
@@ -72710,7 +72746,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd5) {
-    const { getGitRepoName } = await import("./chunks/src-LNADIG5P.js");
+    const { getGitRepoName } = await import("./chunks/src-UKOPSYDK.js");
     gitRepo = getGitRepoName(cwd5);
   }
   let model;
@@ -73304,10 +73340,10 @@ function formatToolCall(message) {
           lines.push(createCodeBlock(contentData.text, language));
         }
       } else if (item.type === "diff") {
-        const path64 = item["path"];
+        const path63 = item["path"];
         const diffText = item["newText"];
         lines.push(`
-*Diff for \`${sanitizeText(path64)}\`:*`);
+*Diff for \`${sanitizeText(path63)}\`:*`);
         lines.push(createCodeBlock(diffText, "diff"));
       }
     }
@@ -73344,8 +73380,8 @@ function buildFence(value) {
   return "`".repeat(fenceLength);
 }
 __name(buildFence, "buildFence");
-function getLanguageFromPath(path64) {
-  const ext = path64.split(".").pop()?.toLowerCase();
+function getLanguageFromPath(path63) {
+  const ext = path63.split(".").pop()?.toLowerCase();
   switch (ext) {
     case "ts":
     case "tsx":
@@ -76940,8 +76976,8 @@ __name(parseAcpModelOption, "parseAcpModelOption");
 // packages/cli/src/ui/commands/modelCommand.ts
 var MAIN_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders and ensure the required environment variables are set. In interactive mode, run /auth to configure or switch providers, or run /model without arguments to choose from configured models.";
 var FAST_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders and ensure the required environment variables are set. In interactive mode, run /auth to configure or switch providers, or run /model --fast without a model to choose from configured models.";
-function persistSetting(settings, path64, value) {
-  settings.setValue(getPersistScopeForModelSelection(settings), path64, value);
+function persistSetting(settings, path63, value) {
+  settings.setValue(getPersistScopeForModelSelection(settings), path63, value);
 }
 __name(persistSetting, "persistSetting");
 async function switchMainModel(config, settings, currentAuthType, modelArg) {
@@ -82632,32 +82668,10 @@ async function fireUserPromptExpansionHook(config, commandName, commandArgs, con
   };
 }
 __name(fireUserPromptExpansionHook, "fireUserPromptExpansionHook");
-var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController, config, settings) => {
-  const trimmed = rawQuery.trim();
-  if (!trimmed.startsWith("/")) {
-    return { type: "no_command" };
-  }
-  const isAcpMode = config.getExperimentalZedIntegration();
-  const isInteractive = config.isInteractive();
-  const executionMode = isAcpMode ? "acp" : isInteractive ? "interactive" : "non_interactive";
-  const allLoaders = [
-    new McpPromptLoader(config),
-    new BuiltinCommandLoader(config),
-    new BundledSkillLoader(config),
-    new SkillCommandLoader(config),
-    new FileCommandLoader(config)
-  ];
-  const disabledSlashCommandsRaw = config.getDisabledSlashCommands();
-  const disabledNameSet = /* @__PURE__ */ new Set();
-  for (const name of disabledSlashCommandsRaw) {
-    const trimmed2 = name.trim();
-    if (trimmed2) disabledNameSet.add(trimmed2.toLowerCase());
+async function registerModelInvocableCommands(commandService, config, executionMode, settings) {
+  if (!settings) {
+    return;
   }
-  const isDisabled = /* @__PURE__ */ __name((cmd) => disabledNameSet.has(cmd.name.toLowerCase()) || (cmd.altNames ?? []).some((a) => disabledNameSet.has(a.toLowerCase())), "isDisabled");
-  const commandService = await CommandService.create(
-    allLoaders,
-    abortController.signal
-  );
   config.setModelInvocableCommandsProvider(
     () => commandService.getModelInvocableCommands().map((cmd) => ({
       name: cmd.name,
@@ -82665,27 +82679,28 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
     }))
   );
   config.setModelInvocableCommandsExecutor(
-    async (name, args2 = "") => {
+    async (name, args = "") => {
       const commands = commandService.getModelInvocableCommands();
       const cmd = commands.find((c) => c.name === name);
       if (!cmd?.action) return null;
       const minimalContext = {
         executionMode,
         invocation: {
-          raw: args2 ? `/${name} ${args2}` : `/${name}`,
+          raw: args ? `/${name} ${args}` : `/${name}`,
           name,
-          args: args2
+          args
         },
         services: { config, settings, logger: null }
       };
-      const result2 = await cmd.action(minimalContext, args2);
-      if (!result2 || result2.type !== "submit_prompt") return null;
+      const result = await cmd.action(minimalContext, args);
+      if (!result || result.type !== "submit_prompt") return null;
+      const hookSignal = new AbortController().signal;
       const hookResult = await fireUserPromptExpansionHook(
         config,
         name,
-        args2,
-        result2.content,
-        abortController.signal
+        args,
+        result.content,
+        hookSignal
       );
       if (hookResult.blockedResult) {
         return hookResult.blockedResult.type === "message" ? { error: hookResult.blockedResult.content } : null;
@@ -82700,7 +82715,48 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
       return null;
     }
   );
-  const allCommands = commandService.getCommands();
+  const skillManager = typeof config.getSkillManager === "function" ? config.getSkillManager() : null;
+  await skillManager?.notifyConfigChanged();
+}
+__name(registerModelInvocableCommands, "registerModelInvocableCommands");
+var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController, config, settings) => {
+  const trimmed = rawQuery.trim();
+  if (!trimmed.startsWith("/")) {
+    return { type: "no_command" };
+  }
+  const isAcpMode = config.getExperimentalZedIntegration();
+  const isInteractive = config.isInteractive();
+  const executionMode = isAcpMode ? "acp" : isInteractive ? "interactive" : "non_interactive";
+  const allLoaders = [
+    new McpPromptLoader(config),
+    new BuiltinCommandLoader(config),
+    new BundledSkillLoader(config),
+    new SkillCommandLoader(config),
+    new FileCommandLoader(config)
+  ];
+  const disabledSlashCommandsRaw = config.getDisabledSlashCommands();
+  const disabledNameSet = /* @__PURE__ */ new Set();
+  for (const name of disabledSlashCommandsRaw) {
+    const trimmed2 = name.trim();
+    if (trimmed2) disabledNameSet.add(trimmed2.toLowerCase());
+  }
+  const isDisabled = /* @__PURE__ */ __name((cmd) => disabledNameSet.has(cmd.name.toLowerCase()) || (cmd.altNames ?? []).some((a) => disabledNameSet.has(a.toLowerCase())), "isDisabled");
+  const allCommandService = await CommandService.create(
+    allLoaders,
+    abortController.signal
+  );
+  const commandService = disabledNameSet.size > 0 ? await CommandService.create(
+    allLoaders,
+    abortController.signal,
+    disabledNameSet
+  ) : allCommandService;
+  await registerModelInvocableCommands(
+    commandService,
+    config,
+    executionMode,
+    settings
+  );
+  const allCommands = allCommandService.getCommands();
   const filteredCommands = commandService.getCommandsForMode(executionMode).filter((cmd) => !isDisabled(cmd));
   const { commandToExecute, args } = parseSlashCommand(
     rawQuery,
@@ -82794,7 +82850,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
   }
   return handleCommandResult(result, outputHistoryItems);
 }, "handleSlashCommand");
-var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mode = "acp") => {
+var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mode = "acp", settings) => {
   try {
     const loaders = [
       new McpPromptLoader(config),
@@ -82809,6 +82865,12 @@ var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mo
       abortSignal,
       disabledSlashCommands.length > 0 ? new Set(disabledSlashCommands) : void 0
     );
+    await registerModelInvocableCommands(
+      commandService,
+      config,
+      mode,
+      settings
+    );
     return commandService.getCommandsForMode(mode);
   } catch (error) {
     debugLogger28.error("Error loading available commands:", error);
@@ -84302,6 +84364,24 @@ var StreamJsonOutputAdapter = class extends BaseJsonOutputAdapter {
 init_esbuild_shims();
 import * as fs28 from "node:fs/promises";
 import * as path35 from "node:path";
+
+// packages/cli/src/ui/hooks/mcpResourceRef.ts
+init_esbuild_shims();
+function matchMcpServerPrefix(input, serverNames) {
+  let serverName = null;
+  for (const name of serverNames) {
+    if (input.startsWith(`${name}:`) && (serverName === null || name.length > serverName.length)) {
+      serverName = name;
+    }
+  }
+  if (serverName === null) return null;
+  return { serverName, rest: input.slice(serverName.length + 1) };
+}
+__name(matchMcpServerPrefix, "matchMcpServerPrefix");
+
+// packages/cli/src/ui/hooks/atCommandProcessor.ts
+var MAX_MCP_RESOURCE_TEXT_CHARS = 1e5;
+var MAX_MCP_RESOURCE_BLOB_CHARS = 8e6;
 function parseAllAtCommands(query) {
   const parts = [];
   let currentIndex = 0;
@@ -84355,6 +84435,12 @@ function parseAllAtCommands(query) {
   );
 }
 __name(parseAllAtCommands, "parseAllAtCommands");
+function parseMcpResourceRef(pathName, mcpServerNames) {
+  const match = matchMcpServerPrefix(pathName, mcpServerNames);
+  if (!match || !match.rest) return null;
+  return { serverName: match.serverName, uri: match.rest };
+}
+__name(parseMcpResourceRef, "parseMcpResourceRef");
 async function resolveAtCommandQuery({
   query,
   config,
@@ -84379,6 +84465,8 @@ async function resolveAtCommandQuery({
     qwen: [],
     both: []
   };
+  const mcpServerNames = new Set(Object.keys(config.getMcpServers() || {}));
+  const mcpResourceRefs = [];
   for (const atPathPart of atPathCommandParts) {
     const originalAtPath = atPathPart.content;
     if (originalAtPath === "@") {
@@ -84388,10 +84476,16 @@ async function resolveAtCommandQuery({
       continue;
     }
     const pathName = originalAtPath.substring(1);
+    const resourceRef = parseMcpResourceRef(pathName, mcpServerNames);
+    if (resourceRef) {
+      mcpResourceRefs.push({ originalAtPath, ...resourceRef });
+      atPathToResolvedSpecMap.set(originalAtPath, pathName);
+      continue;
+    }
     const workspaceContext = config.getWorkspaceContext();
     const projectTempDir = Storage.getGlobalTempDir();
     const absolutePathName = path35.isAbsolute(pathName) ? pathName : path35.resolve(workspaceContext.getDirectories()[0] || "", pathName);
-    if (!absolutePathName.startsWith(projectTempDir) && !workspaceContext.isPathWithinWorkspace(pathName)) {
+    if (!isSubpath(projectTempDir, absolutePathName) && !workspaceContext.isPathWithinWorkspace(pathName)) {
       onDebugMessage(
         `Path ${pathName} is not in the workspace and will be skipped.`
       );
@@ -84489,7 +84583,97 @@ async function resolveAtCommandQuery({
 ${messages.join("\n")}`;
     onDebugMessage(message);
   }
-  if (pathSpecsToRead.length === 0) {
+  const resourceReads = await Promise.allSettled(
+    mcpResourceRefs.map(
+      (ref) => config.getToolRegistry().readMcpResource(ref.serverName, ref.uri, { signal })
+    )
+  );
+  const resourceParts = [];
+  const resourceDisplays = [];
+  const resourceLabels = [];
+  for (let i = 0; i < mcpResourceRefs.length; i++) {
+    const ref = mcpResourceRefs[i];
+    const label = `${ref.serverName}:${ref.uri}`;
+    const callId = `client-mcp-resource-${userMessageTimestamp}-${i}`;
+    const outcome = resourceReads[i];
+    if (outcome.status === "rejected") {
+      onDebugMessage(
+        `Failed to read MCP resource ${label}: ${getErrorMessage(outcome.reason)}`
+      );
+      resourceDisplays.push({
+        callId,
+        name: "Read MCP Resource",
+        description: `Read resource ${label}`,
+        status: "Error" /* Error */,
+        resultDisplay: `Failed to read resource ${label}: ${getErrorMessage(outcome.reason)}`,
+        confirmationDetails: void 0
+      });
+      continue;
+    }
+    const contentParts = [];
+    let textChars = 0;
+    let blobChars = 0;
+    let blobCount = 0;
+    let truncated = false;
+    for (const content of outcome.value.contents ?? []) {
+      if ("text" in content && typeof content.text === "string") {
+        const remaining = MAX_MCP_RESOURCE_TEXT_CHARS - textChars;
+        if (remaining <= 0) {
+          truncated = content.text.length > 0 || truncated;
+          continue;
+        }
+        const text = content.text.length > remaining ? content.text.slice(0, remaining) : content.text;
+        if (text.length < content.text.length) {
+          truncated = true;
+        }
+        if (text.length > 0) {
+          contentParts.push({ text });
+          textChars += text.length;
+        }
+      } else if ("blob" in content && typeof content.blob === "string") {
+        if (blobChars + content.blob.length > MAX_MCP_RESOURCE_BLOB_CHARS) {
+          truncated = true;
+          continue;
+        }
+        blobChars += content.blob.length;
+        contentParts.push({
+          inlineData: {
+            mimeType: typeof content.mimeType === "string" ? content.mimeType : "application/octet-stream",
+            data: content.blob
+          }
+        });
+        blobCount += 1;
+      }
+    }
+    if (contentParts.length > 0) {
+      resourceParts.push({
+        text: `
+--- Content from MCP resource ${label} ---
+`
+      });
+      resourceParts.push(...contentParts);
+      resourceParts.push({ text: `
+--- End of MCP resource ${label} ---
+` });
+    }
+    resourceLabels.push(label);
+    const summary = [];
+    if (textChars > 0) {
+      summary.push(`${textChars} chars`);
+    }
+    if (blobCount > 0) {
+      summary.push(`${blobCount} attachment${blobCount === 1 ? "" : "s"}`);
+    }
+    resourceDisplays.push({
+      callId,
+      name: "Read MCP Resource",
+      description: `Read resource ${label}`,
+      status: "Success" /* Success */,
+      resultDisplay: summary.length > 0 ? `Injected ${summary.join(" + ")}${truncated ? " (truncated)" : ""}` : truncated ? "(content too large \u2014 skipped)" : "(no readable content)",
+      confirmationDetails: void 0
+    });
+  }
+  if (pathSpecsToRead.length === 0 && mcpResourceRefs.length === 0) {
     onDebugMessage("No valid file paths found in @ commands to read.");
     if (initialQueryText === "@" && query.trim() === "@") {
       return { processedQuery: [{ text: query }], shouldProceed: true };
@@ -84501,69 +84685,70 @@ ${messages.join("\n")}`;
       shouldProceed: true
     };
   }
-  try {
-    const result = await readManyFiles(config, {
-      paths: pathSpecsToRead,
-      signal
-    });
-    const parts = Array.isArray(result.contentParts) ? result.contentParts : [result.contentParts];
-    const toolCallDisplays = result.files.map(
-      (file, index) => ({
+  const fileParts = [];
+  let fileDisplays = [];
+  if (pathSpecsToRead.length > 0) {
+    try {
+      const result = await readManyFiles(config, {
+        paths: pathSpecsToRead,
+        signal
+      });
+      const parts = Array.isArray(result.contentParts) ? result.contentParts : [result.contentParts];
+      fileDisplays = result.files.map((file, index) => ({
         callId: `client-read-${userMessageTimestamp}-${index}`,
         name: file.isDirectory ? "Read Directory" : "Read File",
         description: file.isDirectory ? `Read directory ${path35.basename(file.filePath)}` : `Read file ${path35.basename(file.filePath)}`,
         status: file.error ? "Error" /* Error */ : "Success" /* Success */,
         resultDisplay: file.error ? `Failed to read ${path35.basename(file.filePath)}: ${file.error}` : void 0,
         confirmationDetails: void 0
-      })
-    );
-    const processedQueryParts = [{ text: initialQueryText }];
-    if (parts.length > 0 && !result.error) {
-      for (const part of parts) {
-        if (typeof part === "string") {
-          processedQueryParts.push({ text: part });
-        } else {
-          processedQueryParts.push(part);
+      }));
+      if (parts.length > 0 && !result.error) {
+        for (const part of parts) {
+          fileParts.push(typeof part === "string" ? { text: part } : part);
         }
+      } else {
+        onDebugMessage("readManyFiles returned no content or empty content.");
       }
-    } else {
-      onDebugMessage("readManyFiles returned no content or empty content.");
+    } catch (error) {
+      const errorToolCallDisplay = {
+        callId: `client-read-${userMessageTimestamp}`,
+        name: "Read File(s)",
+        description: "Error attempting to read files",
+        status: "Error" /* Error */,
+        resultDisplay: `Error reading files (${contentLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
+        confirmationDetails: void 0
+      };
+      const errorMessage2 = typeof errorToolCallDisplay.resultDisplay === "string" ? errorToolCallDisplay.resultDisplay : void 0;
+      const labelsOnError = [...contentLabelsForDisplay, ...resourceLabels];
+      return {
+        processedQuery: null,
+        shouldProceed: false,
+        toolDisplays: [...resourceDisplays, errorToolCallDisplay],
+        filesRead: labelsOnError,
+        recording: {
+          filesRead: labelsOnError,
+          status: "error",
+          message: errorMessage2
+        }
+      };
     }
-    const processedResult = {
-      processedQuery: processedQueryParts,
-      shouldProceed: true,
-      toolDisplays: toolCallDisplays,
-      filesRead: contentLabelsForDisplay
-    };
-    return {
-      ...processedResult,
-      recording: {
-        filesRead: contentLabelsForDisplay,
-        status: "success"
-      }
-    };
-  } catch (error) {
-    const errorToolCallDisplay = {
-      callId: `client-read-${userMessageTimestamp}`,
-      name: "Read File(s)",
-      description: "Error attempting to read files",
-      status: "Error" /* Error */,
-      resultDisplay: `Error reading files (${contentLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
-      confirmationDetails: void 0
-    };
-    const errorMessage2 = typeof errorToolCallDisplay.resultDisplay === "string" ? errorToolCallDisplay.resultDisplay : void 0;
-    return {
-      processedQuery: null,
-      shouldProceed: false,
-      toolDisplays: [errorToolCallDisplay],
-      filesRead: contentLabelsForDisplay,
-      recording: {
-        filesRead: contentLabelsForDisplay,
-        status: "error",
-        message: errorMessage2
-      }
-    };
   }
+  const processedQueryParts = [
+    { text: initialQueryText },
+    ...fileParts,
+    ...resourceParts
+  ];
+  const allLabels = [...contentLabelsForDisplay, ...resourceLabels];
+  return {
+    processedQuery: processedQueryParts,
+    shouldProceed: true,
+    toolDisplays: [...fileDisplays, ...resourceDisplays],
+    filesRead: allLabels,
+    recording: {
+      filesRead: allLabels,
+      status: "success"
+    }
+  };
 }
 __name(resolveAtCommandQuery, "resolveAtCommandQuery");
 async function handleAtCommand(params) {
@@ -84612,15 +84797,21 @@ var LOOP_TYPE_LABELS = {
   ["alternating_tool_call_pattern" /* ALTERNATING_TOOL_CALL_PATTERN */]: "the model alternated between the same two tool calls in a repeating pattern",
   ["turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */]: "the model exceeded the maximum number of tool calls allowed in a single turn"
 };
-function emitLoopDetectedMessage(config, loopType) {
-  if (config.getOutputFormat() !== "text" /* TEXT */) {
-    return;
-  }
+function formatLoopDetectedMessage(loopType) {
   const reason = loopType ? LOOP_TYPE_LABELS[loopType] : void 0;
   const detail = reason ? ` (${loopType}: ${reason})` : "";
   const hint = loopType === "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */ ? " This is an always-on per-turn tool-call cap and cannot be disabled via `model.skipLoopDetection`." : " Set the `model.skipLoopDetection` setting to true to disable.";
-  process.stderr.write(`Loop detection halted the run${detail}.${hint}
+  return `Loop detection halted the run${detail}.${hint}`;
+}
+__name(formatLoopDetectedMessage, "formatLoopDetectedMessage");
+function emitLoopDetectedMessage(config, loopType) {
+  const message = formatLoopDetectedMessage(loopType);
+  if (config.getOutputFormat() !== "text" /* TEXT */) {
+    return message;
+  }
+  process.stderr.write(`${message}
 `);
+  return message;
 }
 __name(emitLoopDetectedMessage, "emitLoopDetectedMessage");
 async function emitNonInteractiveFinalMessage(params) {
@@ -84967,6 +85158,8 @@ ${text}
       let structuredSubmission = void 0;
       let plainTextPreview = "";
       const PLAIN_TEXT_PREVIEW_LIMIT = 200;
+      let loopDetected = false;
+      let loopDetectedMessage = formatLoopDetectedMessage(void 0);
       const emitStructuredSuccess = /* @__PURE__ */ __name(async () => {
         registry2.abortAll();
         const holdbackDeadline = Date.now() + STRUCTURED_SHUTDOWN_HOLDBACK_MS;
@@ -84989,6 +85182,27 @@ ${text}
         });
         return 0;
       }, "emitStructuredSuccess");
+      const emitLoopDetectedResult = /* @__PURE__ */ __name(() => {
+        registry2.abortAll();
+        flushQueuedNotificationsToSdk(localQueue);
+        finalizeOneShotMonitors();
+        if (outputFormat === "text" /* TEXT */) {
+          return 1;
+        }
+        const metrics = uiTelemetryService.getMetrics();
+        const usage3 = computeUsageFromMetrics(metrics);
+        const stats = outputFormat === "json" /* JSON */ ? uiTelemetryService.getMetrics() : void 0;
+        adapter.emitResult({
+          isError: true,
+          durationMs: Date.now() - startTime,
+          apiDurationMs: totalApiDurationMs,
+          numTurns: turnCount,
+          errorMessage: loopDetectedMessage,
+          usage: usage3,
+          stats
+        });
+        return 1;
+      }, "emitLoopDetectedResult");
       const handledProviderToolCallIds = geminiClient.getHistoryFunctionResponseIds();
       const processToolCallBatch = /* @__PURE__ */ __name(async (batchRequests, setModelOverride) => {
         const toolResponseParts = [];
@@ -85185,7 +85399,13 @@ ${text}
             plainTextPreview += String(event.value).slice(0, remaining);
           }
           if (event.type === "loop_detected" /* LoopDetected */) {
-            emitLoopDetectedMessage(config, event.value?.loopType);
+            if (!loopDetected) {
+              loopDetectedMessage = emitLoopDetectedMessage(
+                config,
+                event.value?.loopType
+              );
+            }
+            loopDetected = true;
           }
           if (outputFormat === "text" /* TEXT */ && event.type === "error" /* Error */) {
             const errorText = parseAndFormatApiError(
@@ -85199,6 +85419,9 @@ ${text}
         }
         adapter.finalizeAssistantMessage();
         totalApiDurationMs += Date.now() - apiStartTime;
+        if (loopDetected) {
+          return emitLoopDetectedResult();
+        }
         if (toolCallRequests.length > 0) {
           const toolResponseParts = await processToolCallBatch(
             toolCallRequests,
@@ -85310,7 +85533,13 @@ ${text}
                   itemToolCallRequests.push(event.value);
                 }
                 if (event.type === "loop_detected" /* LoopDetected */) {
-                  emitLoopDetectedMessage(config, event.value?.loopType);
+                  if (!loopDetected) {
+                    loopDetectedMessage = emitLoopDetectedMessage(
+                      config,
+                      event.value?.loopType
+                    );
+                  }
+                  loopDetected = true;
                 }
                 if (outputFormat === "text" /* TEXT */ && event.type === "error" /* Error */) {
                   const errorText = parseAndFormatApiError(
@@ -85324,6 +85553,9 @@ ${text}
               }
               adapter.finalizeAssistantMessage();
               totalApiDurationMs += Date.now() - itemApiStartTime;
+              if (loopDetected) {
+                return;
+              }
               if (itemToolCallRequests.length > 0) {
                 const itemToolResponseParts = await processToolCallBatch(
                   itemToolCallRequests,
@@ -85345,6 +85577,7 @@ ${text}
             if (drainPromise) return drainPromise;
             const p = (async () => {
               while (localQueue.length > 0) {
+                if (loopDetected) return;
                 if (structuredSubmission !== void 0) return;
                 await drainBatch();
               }
@@ -85375,6 +85608,12 @@ ${text}
                 once: true
               });
               const checkCronDone = /* @__PURE__ */ __name(() => {
+                if (loopDetected) {
+                  abortController.signal.removeEventListener("abort", onAbort);
+                  scheduler.stop();
+                  resolve23();
+                  return;
+                }
                 if (structuredSubmission !== void 0) {
                   abortController.signal.removeEventListener("abort", onAbort);
                   scheduler.stop();
@@ -85413,6 +85652,7 @@ ${text}
             }
             captureMonitorTurnsInLocalQueue = false;
             await drainLocalQueue();
+            if (loopDetected) return emitLoopDetectedResult();
             if (structuredSubmission !== void 0) break;
             if (!registry2.hasUnfinalizedTasks() && localQueue.length === 0)
               break;
@@ -85999,7 +86239,7 @@ var SystemController = class extends BaseController {
       throw new Error("Request aborted");
     }
     try {
-      const mod = await import("./chunks/contextCommand-POQ6GYN3.js");
+      const mod = await import("./chunks/contextCommand-WBVNKL2C.js");
       if (signal.aborted) {
         throw new Error("Request aborted");
       }
@@ -90925,6 +91165,13 @@ function isSafeOscScheme(url) {
   return SAFE_OSC8_SCHEMES.has(match[1].toLowerCase());
 }
 __name(isSafeOscScheme, "isSafeOscScheme");
+function shouldForceHyperlinks(value) {
+  if (value.length === 0) return true;
+  const trimmed = value.trim();
+  if (!/^[+-]?\d+$/.test(trimmed)) return false;
+  return Number(trimmed) !== 0;
+}
+__name(shouldForceHyperlinks, "shouldForceHyperlinks");
 function parseVersion(versionString) {
   if (!versionString) return { major: 0, minor: 0, patch: 0 };
   if (/^\d{3,4}$/.test(versionString)) {
@@ -90945,8 +91192,7 @@ function supportsHyperlinks(stream = process.stdout) {
   if (!stream || !stream.isTTY) return false;
   const force = env5["FORCE_HYPERLINK"];
   if (force !== void 0) {
-    if (force.length === 0) return true;
-    return parseInt(force, 10) !== 0;
+    return shouldForceHyperlinks(force);
   }
   if (env5["CI"]) return false;
   if (env5["TEAMCITY_VERSION"]) return false;
@@ -107433,8 +107679,8 @@ function SettingsDialog({
               }
             } else if (item.type === "number" || item.type === "string") {
               const isSubDialogSetting = item.value === "ui.theme" || item.value === "general.preferredEditor" || item.value === "fastModel";
-              const path64 = item.value.split(".");
-              const currentValue = getNestedValue(pendingSettings, path64);
+              const path63 = item.value.split(".");
+              const currentValue = getNestedValue(pendingSettings, path63);
               const defaultValue2 = getDefaultValue(item.value);
               if (currentValue !== void 0 && currentValue !== null) {
                 displayValue = String(currentValue);
@@ -111005,11 +111251,11 @@ function buildModelSelectionKey(authType, modelId, baseUrl) {
 }
 __name(buildModelSelectionKey, "buildModelSelectionKey");
 function parseModelSelectionKey(key) {
-  const sep5 = "::";
-  const idx = key.indexOf(sep5);
+  const sep6 = "::";
+  const idx = key.indexOf(sep6);
   if (idx < 0) return { authType: "", modelId: key };
   const authType = key.slice(0, idx);
-  const rest = key.slice(idx + sep5.length);
+  const rest = key.slice(idx + sep6.length);
   const nullIdx = rest.indexOf("\0");
   if (nullIdx >= 0) {
     return {
@@ -116307,6 +116553,14 @@ var ServerDetailStep = /* @__PURE__ */ __name(({
           ] })
         ] }) })
       ] }),
+      !server.isDisabled && server.promptCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { width: LABEL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.primary, children: t("Prompts:") }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { children: server.promptCount }) })
+      ] }),
+      !server.isDisabled && server.resourceCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { width: LABEL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.text.primary, children: t("Resources:") }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { children: server.resourceCount }) })
+      ] }),
       server.errorMessage && /* @__PURE__ */ (0, import_jsx_runtime113.jsxs)(Box_default, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { width: LABEL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.status.error, children: t("Error:") }) }),
         /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime113.jsx)(Text, { color: theme.status.error, wrap: "wrap", children: server.errorMessage }) })
@@ -116727,6 +116981,7 @@ var McpServerActionsView = /* @__PURE__ */ __name(({
     const serverPrompts = (promptRegistry?.getAllPrompts() || []).filter(
       (p) => "serverName" in p && p.serverName === serverName
     );
+    const serverResources = config.getResourceRegistry()?.getResourcesByServer(serverName) || [];
     let source = "user";
     if (serverConfig.extensionName) {
       source = "extension";
@@ -116752,6 +117007,7 @@ var McpServerActionsView = /* @__PURE__ */ __name(({
       toolCount: serverTools.length,
       invalidToolCount: serverTools.filter((x) => !x.name || !x.description).length,
       promptCount: serverPrompts.length,
+      resourceCount: serverResources.length,
       isDisabled: config.isMcpServerDisabled(serverName),
       hasOAuthTokens,
       // Needs (re-)authentication: a 401 during connect, or OAuth declared
@@ -118853,6 +119109,7 @@ var MCPManagementDialog = /* @__PURE__ */ __name(({
     const mcpServers = config.getMcpServers() || {};
     const toolRegistry = config.getToolRegistry();
     const promptRegistry = config.getPromptRegistry();
+    const resourceRegistry = config.getResourceRegistry();
     const serverInfos = [];
     for (const [name, serverConfig] of Object.entries(mcpServers)) {
       const status = getMCPServerStatus(name);
@@ -118864,6 +119121,7 @@ var MCPManagementDialog = /* @__PURE__ */ __name(({
       const serverPrompts = allPrompts.filter(
         (p) => "serverName" in p && p.serverName === name
       );
+      const serverResources = resourceRegistry?.getResourcesByServer(name) || [];
       let source = "user";
       if (serverConfig.extensionName) {
         source = "extension";
@@ -118894,6 +119152,7 @@ var MCPManagementDialog = /* @__PURE__ */ __name(({
         toolCount: serverTools.length,
         invalidToolCount,
         promptCount: serverPrompts.length,
+        resourceCount: serverResources.length,
         isDisabled,
         hasOAuthTokens,
         requiresAuth
@@ -122335,21 +122594,43 @@ function SessionPreview(props) {
     metaParts.push(gitBranch);
   }
   const metaLine = metaParts.join(" \xB7 ");
-  return /* @__PURE__ */ (0, import_jsx_runtime143.jsxs)(Box_default, { flexDirection: "column", width: boxWidth, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { bold: true, color: theme.text.primary, children: sessionTitle ?? t("Session Preview") }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }),
-    error ? /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.status.error, children: error }) }) : !data ? /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.text.secondary, children: t("Loading session preview...") }) }) : /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { flexDirection: "column", children: items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(
-      HistoryItemDisplayComponent,
+  const header = /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { bold: true, color: theme.text.primary, children: sessionTitle ?? t("Session Preview") }) }, "header");
+  const topSeparator = /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }, "top-separator");
+  const footerSeparator = /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }, "footer-separator");
+  const meta = metaLine ? /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.text.secondary, children: metaLine }) }, "meta") : null;
+  const footer = /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.text.secondary, children: t("Enter to resume \xB7 Esc to back") }) }, "footer");
+  if (data && !error) {
+    return /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { flexDirection: "column", width: boxWidth, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(
+      Static,
       {
-        item,
-        terminalWidth: boxWidth,
-        isPending: false
+        items: [
+          header,
+          topSeparator,
+          ...items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(
+            HistoryItemDisplayComponent,
+            {
+              item,
+              terminalWidth: boxWidth,
+              isPending: false
+            },
+            item.id
+          )),
+          footerSeparator,
+          ...meta ? [meta] : [],
+          footer
+        ],
+        children: (item) => item
       },
-      item.id
-    )) }),
-    /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }),
-    metaLine && /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.text.secondary, children: metaLine }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.text.secondary, children: t("Enter to resume \xB7 Esc to back") }) })
+      sessionId
+    ) });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime143.jsxs)(Box_default, { flexDirection: "column", width: boxWidth, children: [
+    header,
+    topSeparator,
+    error ? /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.status.error, children: error }) }) : /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime143.jsx)(Text, { color: theme.text.secondary, children: t("Loading session preview...") }) }),
+    footerSeparator,
+    meta,
+    footer
   ] });
 }
 __name(SessionPreview, "SessionPreview");
@@ -123438,7 +123719,7 @@ function FileRow({
 }) {
   const pointer = selected ? "\u203A " : "  ";
   const tag = file.isDeleted ? t(" (deleted)") : file.isUntracked ? t(" (untracked)") : file.oversized ? t(" (oversized \u2014 diff omitted)") : file.isNewFile ? t(" (new)") : file.truncated ? t(" (truncated)") : "";
-  const path64 = truncatePathStart(file.displayPath, maxPathChars);
+  const path63 = truncatePathStart(file.displayPath, maxPathChars);
   return /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(Box_default, { flexDirection: "row", children: [
     /* @__PURE__ */ (0, import_jsx_runtime146.jsxs)(
       Text,
@@ -123447,7 +123728,7 @@ function FileRow({
         bold: selected,
         children: [
           pointer,
-          path64
+          path63
         ]
       }
     ),
@@ -123512,11 +123793,11 @@ function FileDetail({
   ] });
 }
 __name(FileDetail, "FileDetail");
-function truncatePathStart(path64, maxChars) {
+function truncatePathStart(path63, maxChars) {
   if (maxChars <= 0) return "";
-  if (path64.length <= maxChars) return path64;
-  if (maxChars <= 1) return path64.slice(-maxChars);
-  return "\u2026" + path64.slice(-(maxChars - 1));
+  if (path63.length <= maxChars) return path63;
+  if (maxChars <= 1) return path63.slice(-maxChars);
+  return "\u2026" + path63.slice(-(maxChars - 1));
 }
 __name(truncatePathStart, "truncatePathStart");
 function useVisibleWindow(total, selectedIndex, windowSize) {
@@ -123533,18 +123814,18 @@ __name(useVisibleWindow, "useVisibleWindow");
 function currentToFiles(result, hunks) {
   if (!result) return [];
   const out = [];
-  for (const [path64, s] of result.perFileStats) {
-    out.push(perFileToUnified(path64, s, hunks));
+  for (const [path63, s] of result.perFileStats) {
+    out.push(perFileToUnified(path63, s, hunks));
   }
   out.sort((a, b) => a.path.localeCompare(b.path));
   return out;
 }
 __name(currentToFiles, "currentToFiles");
-function perFileToUnified(path64, s, hunks) {
-  const fileHunks = hunks.get(path64);
+function perFileToUnified(path63, s, hunks) {
+  const fileHunks = hunks.get(path63);
   return {
-    path: path64,
-    displayPath: sanitizeFilenameForDisplay(path64),
+    path: path63,
+    displayPath: sanitizeFilenameForDisplay(path63),
     added: s.added ?? 0,
     removed: s.isUntracked ? 0 : s.removed ?? 0,
     isBinary: !!s.isBinary,
@@ -126391,6 +126672,27 @@ var import_react163 = __toESM(require_react(), 1);
 // packages/cli/src/ui/hooks/useAtCompletion.ts
 init_esbuild_shims();
 var import_react161 = __toESM(require_react(), 1);
+function getMcpResourceSuggestions(config, pattern) {
+  if (!config) return null;
+  if (config.isTrustedFolder?.() === false) return null;
+  const mcpServers = config.getMcpServers?.() || {};
+  const match = matchMcpServerPrefix(pattern, Object.keys(mcpServers));
+  if (!match) return null;
+  const serverName = match.serverName;
+  const partialUri = match.rest;
+  const resources = config.getResourceRegistry?.()?.getResourcesByServer(serverName) ?? [];
+  const matches = resources.filter((r) => r.uri.includes(partialUri)).sort((a, b) => {
+    const aPrefix = a.uri.startsWith(partialUri) ? 0 : 1;
+    const bPrefix = b.uri.startsWith(partialUri) ? 0 : 1;
+    return aPrefix - bPrefix || a.uri.localeCompare(b.uri);
+  });
+  return matches.slice(0, MAX_SUGGESTIONS_TO_SHOW * 3).map((r) => ({
+    label: `${serverName}:${r.uri}`,
+    value: `${serverName}:${r.uri}`,
+    isDirectory: false
+  }));
+}
+__name(getMcpResourceSuggestions, "getMcpResourceSuggestions");
 var initialState = {
   status: "idle" /* IDLE */,
   suggestions: [],
@@ -126517,7 +126819,21 @@ function useAtCompletion(props) {
       }
     }, "initialize");
     const search = /* @__PURE__ */ __name(async () => {
-      if (!fileSearch.current || state2.pattern === null) {
+      if (state2.pattern === null) {
+        return;
+      }
+      const resourceSuggestions = getMcpResourceSuggestions(
+        config,
+        state2.pattern
+      );
+      if (resourceSuggestions !== null) {
+        if (slowSearchTimer.current) {
+          clearTimeout(slowSearchTimer.current);
+        }
+        dispatch({ type: "SEARCH_SUCCESS", payload: resourceSuggestions });
+        return;
+      }
+      if (!fileSearch.current) {
         return;
       }
       if (slowSearchTimer.current) {
@@ -128354,7 +128670,7 @@ var BaseTextInput = /* @__PURE__ */ __name(({
         borderColor: resolvedBorderColor,
         children: [
           resolvedPrefix,
-          /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime156.jsxs)(Text, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", backgroundColor: theme.background.primary, children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime156.jsxs)(Text, { children: [
             import_chalk9.default.inverse(placeholder.slice(0, 1)),
             /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(Text, { color: theme.text.secondary, children: placeholder.slice(1) })
           ] }) : /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(Text, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, idx) => {
@@ -133132,6 +133448,31 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       })();
     };
   }, [config, reloadCommands]);
+  (0, import_react199.useEffect)(() => {
+    if (!config) {
+      return;
+    }
+    let timer = null;
+    const listener = /* @__PURE__ */ __name((_serverName, status) => {
+      if (status !== "connected" /* CONNECTED */) {
+        return;
+      }
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(() => {
+        timer = null;
+        reloadCommands();
+      }, 250);
+    }, "listener");
+    addMCPStatusChangeListener(listener);
+    return () => {
+      removeMCPStatusChangeListener(listener);
+      if (timer) {
+        clearTimeout(timer);
+      }
+    };
+  }, [config, reloadCommands]);
   (0, import_react199.useEffect)(() => {
     if (!isConfigInitialized) {
       return;
@@ -133731,7 +134072,7 @@ function useDoublePress(onDoublePress, onPending) {
 __name(useDoublePress, "useDoublePress");
 
 // packages/cli/src/ui/AppContainer.tsx
-import * as fs52 from "node:fs";
+import * as fs51 from "node:fs";
 import { basename as basename12 } from "node:path";
 
 // packages/cli/src/utils/windowTitle.ts
@@ -139213,12 +139554,12 @@ var disallowedKeys = /* @__PURE__ */ new Set([
   "constructor"
 ]);
 var digits = new Set("0123456789");
-function getPathSegments(path64) {
+function getPathSegments(path63) {
   const parts = [];
   let currentSegment = "";
   let currentPart = "start";
   let isIgnoring = false;
-  for (const character of path64) {
+  for (const character of path63) {
     switch (character) {
       case "\\": {
         if (currentPart === "index") {
@@ -139343,11 +139684,11 @@ function assertNotStringIndex(object, key) {
   }
 }
 __name(assertNotStringIndex, "assertNotStringIndex");
-function getProperty(object, path64, value) {
-  if (!isObject(object) || typeof path64 !== "string") {
+function getProperty(object, path63, value) {
+  if (!isObject(object) || typeof path63 !== "string") {
     return value === void 0 ? object : value;
   }
-  const pathArray = getPathSegments(path64);
+  const pathArray = getPathSegments(path63);
   if (pathArray.length === 0) {
     return value;
   }
@@ -139368,12 +139709,12 @@ function getProperty(object, path64, value) {
   return object === void 0 ? value : object;
 }
 __name(getProperty, "getProperty");
-function setProperty(object, path64, value) {
-  if (!isObject(object) || typeof path64 !== "string") {
+function setProperty(object, path63, value) {
+  if (!isObject(object) || typeof path63 !== "string") {
     return object;
   }
   const root = object;
-  const pathArray = getPathSegments(path64);
+  const pathArray = getPathSegments(path63);
   for (let index = 0; index < pathArray.length; index++) {
     const key = pathArray[index];
     assertNotStringIndex(object, key);
@@ -139387,11 +139728,11 @@ function setProperty(object, path64, value) {
   return root;
 }
 __name(setProperty, "setProperty");
-function deleteProperty(object, path64) {
-  if (!isObject(object) || typeof path64 !== "string") {
+function deleteProperty(object, path63) {
+  if (!isObject(object) || typeof path63 !== "string") {
     return false;
   }
-  const pathArray = getPathSegments(path64);
+  const pathArray = getPathSegments(path63);
   for (let index = 0; index < pathArray.length; index++) {
     const key = pathArray[index];
     assertNotStringIndex(object, key);
@@ -139406,11 +139747,11 @@ function deleteProperty(object, path64) {
   }
 }
 __name(deleteProperty, "deleteProperty");
-function hasProperty(object, path64) {
-  if (!isObject(object) || typeof path64 !== "string") {
+function hasProperty(object, path63) {
+  if (!isObject(object) || typeof path63 !== "string") {
     return false;
   }
-  const pathArray = getPathSegments(path64);
+  const pathArray = getPathSegments(path63);
   if (pathArray.length === 0) {
     return false;
   }
@@ -142166,60 +142507,33 @@ __name(useMessageQueue, "useMessageQueue");
 // packages/cli/src/ui/hooks/useGitBranchName.ts
 init_esbuild_shims();
 var import_react217 = __toESM(require_react(), 1);
-import fs50 from "node:fs";
-import fsPromises2 from "node:fs/promises";
-import path57 from "node:path";
 function useGitBranchName(cwd5) {
   const [branchName, setBranchName] = (0, import_react217.useState)(void 0);
   (0, import_react217.useEffect)(() => {
     let cancelled = false;
-    const fetchWithGuard = /* @__PURE__ */ __name(async () => {
-      try {
-        if (!isCommandAvailable("git").available) {
-          return;
-        }
-        const { stdout } = await execCommand(
-          "git",
-          ["rev-parse", "--abbrev-ref", "HEAD"],
-          { cwd: cwd5 }
-        );
-        if (cancelled) return;
-        const branch = stdout.toString().trim();
-        if (branch && branch !== "HEAD") {
-          setBranchName(branch);
-        } else {
-          const { stdout: hashStdout } = await execCommand(
-            "git",
-            ["rev-parse", "--short", "HEAD"],
-            { cwd: cwd5 }
-          );
-          if (!cancelled) {
-            setBranchName(hashStdout.toString().trim());
-          }
-        }
-      } catch {
-        if (!cancelled) setBranchName(void 0);
-      }
-    }, "fetchWithGuard");
-    fetchWithGuard();
-    const gitLogsHeadPath = path57.join(cwd5, ".git", "logs", "HEAD");
-    let watcher;
-    const setupWatcher = /* @__PURE__ */ __name(async () => {
-      try {
-        await fsPromises2.access(gitLogsHeadPath, fs50.constants.F_OK);
-        if (cancelled) return;
-        watcher = fs50.watch(gitLogsHeadPath, (eventType) => {
-          if (eventType === "change" || eventType === "rename") {
-            if (!cancelled) fetchWithGuard();
-          }
+    let dispose;
+    const refresh = /* @__PURE__ */ __name(async () => {
+      const name = await resolveBranchName(cwd5);
+      if (!cancelled) setBranchName(name);
+    }, "refresh");
+    const init = /* @__PURE__ */ __name(async () => {
+      await refresh();
+      if (cancelled) return;
+      const disposer = await watchRepoBranch(cwd5, () => {
+        void refresh().catch(() => {
         });
-      } catch (_watchError) {
+      });
+      if (cancelled) {
+        disposer();
+      } else {
+        dispose = disposer;
       }
-    }, "setupWatcher");
-    setupWatcher();
+    }, "init");
+    void init().catch(() => {
+    });
     return () => {
       cancelled = true;
-      watcher?.close();
+      dispose?.();
     };
   }, [cwd5]);
   return branchName;
@@ -142229,9 +142543,9 @@ __name(useGitBranchName, "useGitBranchName");
 // packages/cli/src/ui/hooks/useWorktreeSession.ts
 init_esbuild_shims();
 var import_react218 = __toESM(require_react(), 1);
-import fs51 from "node:fs";
-import fsPromises3 from "node:fs/promises";
-import path58 from "node:path";
+import fs50 from "node:fs";
+import fsPromises2 from "node:fs/promises";
+import path57 from "node:path";
 function useWorktreeSession(config) {
   const [session2, setSession] = (0, import_react218.useState)(null);
   (0, import_react218.useEffect)(() => {
@@ -142247,14 +142561,14 @@ function useWorktreeSession(config) {
     }, "safeLoad");
     void safeLoad();
     const filePath = config.getSessionService().getWorktreeSessionPath(config.getSessionId());
-    const dirPath = path58.dirname(filePath);
-    const fileName = path58.basename(filePath);
+    const dirPath = path57.dirname(filePath);
+    const fileName = path57.basename(filePath);
     let watcher;
     const setupWatcher = /* @__PURE__ */ __name(async () => {
       try {
-        await fsPromises3.mkdir(dirPath, { recursive: true });
+        await fsPromises2.mkdir(dirPath, { recursive: true });
         if (cancelled) return;
-        watcher = fs51.watch(dirPath, (_eventType, filename) => {
+        watcher = fs50.watch(dirPath, (_eventType, filename) => {
           if (filename === null || filename.toString() === fileName) {
             void safeLoad();
           }
@@ -143608,7 +143922,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
   const isValidPath = (0, import_react234.useCallback)((filePath) => {
     try {
-      return fs52.existsSync(filePath) && fs52.statSync(filePath).isFile();
+      return fs51.existsSync(filePath) && fs51.statSync(filePath).isFile();
     } catch (_e) {
       return false;
     }
@@ -145961,8 +146275,8 @@ init_esbuild_shims();
 var import_shell_quote = __toESM(require_shell_quote(), 1);
 import { exec as exec7, execSync as execSync5, spawn as spawn8 } from "node:child_process";
 import os30 from "node:os";
-import path60 from "node:path";
-import fs53 from "node:fs";
+import path59 from "node:path";
+import fs52 from "node:fs";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 import { promisify as promisify8 } from "node:util";
 import { randomBytes } from "node:crypto";
@@ -145983,10 +146297,10 @@ __name(parseSandboxImageName, "parseSandboxImageName");
 
 // packages/cli/src/utils/sandbox-path.ts
 init_esbuild_shims();
-import path59 from "node:path";
+import path58 from "node:path";
 function isContainerPathWithinWorkdir(containerWorkdir, containerPath) {
   const normalize5 = /* @__PURE__ */ __name((value) => {
-    const normalized = path59.posix.normalize(value.replace(/\\/g, "/")).replace(/\/+$/, "").toLowerCase();
+    const normalized = path58.posix.normalize(value.replace(/\\/g, "/")).replace(/\/+$/, "").toLowerCase();
     return normalized || "/";
   }, "normalize");
   const normalizedWorkdir = normalize5(containerWorkdir);
@@ -146030,10 +146344,10 @@ function getContainerPath(hostPath) {
 }
 __name(getContainerPath, "getContainerPath");
 function ensureDirectoryAndGetRealPath(dir) {
-  if (!fs53.existsSync(dir)) {
-    fs53.mkdirSync(dir, { recursive: true });
+  if (!fs52.existsSync(dir)) {
+    fs52.mkdirSync(dir, { recursive: true });
   }
-  return fs53.realpathSync(dir);
+  return fs52.realpathSync(dir);
 }
 __name(ensureDirectoryAndGetRealPath, "ensureDirectoryAndGetRealPath");
 var LOCAL_DEV_SANDBOX_IMAGE_NAME = "qwen-code-sandbox";
@@ -146104,11 +146418,11 @@ function entrypoint(workdir, cliArgs) {
   if (pythonPathSuffix) {
     shellCmds.push(`export PYTHONPATH="$PYTHONPATH${pythonPathSuffix}";`);
   }
-  const projectSandboxBashrc = path60.join(
+  const projectSandboxBashrc = path59.join(
     SETTINGS_DIRECTORY_NAME,
     "sandbox.bashrc"
   );
-  if (fs53.existsSync(projectSandboxBashrc)) {
+  if (fs52.existsSync(projectSandboxBashrc)) {
     shellCmds.push(`source ${getContainerPath(projectSandboxBashrc)};`);
   }
   ports().forEach(
@@ -146134,12 +146448,12 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
       new URL(`sandbox-macos-${profile}.sb`, import.meta.url)
     );
     if (!BUILTIN_SEATBELT_PROFILES.includes(profile)) {
-      profileFile = path60.join(
+      profileFile = path59.join(
         SETTINGS_DIRECTORY_NAME,
         `sandbox-macos-${profile}.sb`
       );
     }
-    if (!fs53.existsSync(profileFile)) {
+    if (!fs52.existsSync(profileFile)) {
       throw new FatalSandboxError(
         `Missing macos seatbelt profile file '${profileFile}'`
       );
@@ -146151,30 +146465,30 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     ].join(" ");
     const qwenDir = Storage.getGlobalQwenDir();
     const runtimeDir = Storage.getRuntimeBaseDir();
-    fs53.mkdirSync(qwenDir, { recursive: true });
-    fs53.mkdirSync(runtimeDir, { recursive: true });
+    fs52.mkdirSync(qwenDir, { recursive: true });
+    fs52.mkdirSync(runtimeDir, { recursive: true });
     const args2 = [
       "-D",
-      `TARGET_DIR=${fs53.realpathSync(process.cwd())}`,
+      `TARGET_DIR=${fs52.realpathSync(process.cwd())}`,
       "-D",
-      `TMP_DIR=${fs53.realpathSync(os30.tmpdir())}`,
+      `TMP_DIR=${fs52.realpathSync(os30.tmpdir())}`,
       "-D",
-      `HOME_DIR=${fs53.realpathSync(os30.homedir())}`,
+      `HOME_DIR=${fs52.realpathSync(os30.homedir())}`,
       "-D",
-      `CACHE_DIR=${fs53.realpathSync(execSync5(`getconf DARWIN_USER_CACHE_DIR`).toString().trim())}`,
+      `CACHE_DIR=${fs52.realpathSync(execSync5(`getconf DARWIN_USER_CACHE_DIR`).toString().trim())}`,
       "-D",
-      `QWEN_DIR=${fs53.realpathSync(qwenDir)}`,
+      `QWEN_DIR=${fs52.realpathSync(qwenDir)}`,
       "-D",
-      `RUNTIME_DIR=${fs53.realpathSync(runtimeDir)}`
+      `RUNTIME_DIR=${fs52.realpathSync(runtimeDir)}`
     ];
     const MAX_INCLUDE_DIRS = 5;
-    const targetDir = fs53.realpathSync(cliConfig?.getTargetDir() || "");
+    const targetDir = fs52.realpathSync(cliConfig?.getTargetDir() || "");
     const includedDirs = [];
     if (cliConfig) {
       const workspaceContext = cliConfig.getWorkspaceContext();
       const directories = workspaceContext.getDirectories();
       for (const dir of directories) {
-        const realDir = fs53.realpathSync(dir);
+        const realDir = fs52.realpathSync(dir);
         if (realDir !== targetDir) {
           includedDirs.push(realDir);
         }
@@ -146256,14 +146570,14 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     });
   }
   writeStderrLine(`hopping into sandbox (command: ${config.command}) ...`);
-  const gcPath = fs53.realpathSync(process.argv[1]);
-  const projectSandboxDockerfile = path60.join(
+  const gcPath = fs52.realpathSync(process.argv[1]);
+  const projectSandboxDockerfile = path59.join(
     SETTINGS_DIRECTORY_NAME,
     "sandbox.Dockerfile"
   );
-  const isCustomProjectSandbox = fs53.existsSync(projectSandboxDockerfile);
+  const isCustomProjectSandbox = fs52.existsSync(projectSandboxDockerfile);
   const image2 = config.image;
-  const workdir = path60.resolve(process.cwd());
+  const workdir = path59.resolve(process.cwd());
   const containerWorkdir = getContainerPath(workdir);
   if (process.env["BUILD_SANDBOX"]) {
     if (!gcPath.includes("qwen-code/packages/")) {
@@ -146274,13 +146588,13 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
       writeStderrLine("building sandbox ...");
       const gcRoot = gcPath.split("/packages/")[0];
       let buildArgs = "";
-      const projectSandboxDockerfile2 = path60.join(
+      const projectSandboxDockerfile2 = path59.join(
         SETTINGS_DIRECTORY_NAME,
         "sandbox.Dockerfile"
       );
       if (isCustomProjectSandbox) {
         writeStderrLine(`using ${projectSandboxDockerfile2} for sandbox`);
-        buildArgs += `-f ${path60.resolve(projectSandboxDockerfile2)} -i ${image2}`;
+        buildArgs += `-f ${path59.resolve(projectSandboxDockerfile2)} -i ${image2}`;
       }
       execSync5(
         `cd ${gcRoot} && node scripts/build_sandbox.js -s ${buildArgs}`,
@@ -146356,8 +146670,8 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     args.push("--env", `QWEN_RUNTIME_DIR=${runtimeBaseDirContainerPath}`);
   }
   args.push("--volume", `${os30.tmpdir()}:${getContainerPath(os30.tmpdir())}`);
-  const gcloudConfigDir = path60.join(os30.homedir(), ".config", "gcloud");
-  if (fs53.existsSync(gcloudConfigDir)) {
+  const gcloudConfigDir = path59.join(os30.homedir(), ".config", "gcloud");
+  if (fs52.existsSync(gcloudConfigDir)) {
     args.push(
       "--volume",
       `${gcloudConfigDir}:${getContainerPath(gcloudConfigDir)}:ro`
@@ -146365,7 +146679,7 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   }
   if (process.env["GOOGLE_APPLICATION_CREDENTIALS"]) {
     const adcFile = process.env["GOOGLE_APPLICATION_CREDENTIALS"];
-    if (fs53.existsSync(adcFile)) {
+    if (fs52.existsSync(adcFile)) {
       args.push("--volume", `${adcFile}:${getContainerPath(adcFile)}:ro`);
       args.push(
         "--env",
@@ -146378,12 +146692,12 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
       if (mount.trim()) {
         const { from, to, opts } = parseSandboxMountSpec(mount);
         mount = `${from}:${to}:${opts}`;
-        if (!path60.isAbsolute(from)) {
+        if (!path59.isAbsolute(from)) {
           throw new FatalSandboxError(
             `Path '${from}' listed in SANDBOX_MOUNTS must be absolute`
           );
         }
-        if (!fs53.existsSync(from)) {
+        if (!fs52.existsSync(from)) {
           throw new FatalSandboxError(
             `Missing mount path '${from}' listed in SANDBOX_MOUNTS`
           );
@@ -146529,12 +146843,12 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
     getContainerPath(workdir),
     getContainerPath(virtualEnv)
   )) {
-    const sandboxVenvPath = path60.resolve(
+    const sandboxVenvPath = path59.resolve(
       SETTINGS_DIRECTORY_NAME,
       "sandbox.venv"
     );
-    if (!fs53.existsSync(sandboxVenvPath)) {
-      fs53.mkdirSync(sandboxVenvPath, { recursive: true });
+    if (!fs52.existsSync(sandboxVenvPath)) {
+      fs52.mkdirSync(sandboxVenvPath, { recursive: true });
     }
     args.push("--volume", `${sandboxVenvPath}:${getContainerPath(virtualEnv)}`);
     args.push("--env", `VIRTUAL_ENV=${getContainerPath(virtualEnv)}`);
@@ -146563,8 +146877,8 @@ async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs = []) {
   }
   args.push("--env", `SANDBOX=${containerName}`);
   if (config.command === "podman") {
-    const emptyAuthFilePath = path60.join(os30.tmpdir(), "empty_auth.json");
-    fs53.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
+    const emptyAuthFilePath = path59.join(os30.tmpdir(), "empty_auth.json");
+    fs52.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
     args.push("--authfile", emptyAuthFilePath);
   }
   let userFlag = "";
@@ -146763,17 +147077,17 @@ __name(ensureSandboxImageIsPresent, "ensureSandboxImageIsPresent");
 
 // packages/cli/src/utils/startupWarnings.ts
 init_esbuild_shims();
-import fs54 from "node:fs/promises";
+import fs53 from "node:fs/promises";
 import os31 from "node:os";
 import { join as pathJoin } from "node:path";
 var warningsFilePath = pathJoin(os31.tmpdir(), "qwen-code-warnings.txt");
 async function getStartupWarnings() {
   try {
-    await fs54.access(warningsFilePath);
-    const warningsContent = await fs54.readFile(warningsFilePath, "utf-8");
+    await fs53.access(warningsFilePath);
+    const warningsContent = await fs53.readFile(warningsFilePath, "utf-8");
     const warnings = warningsContent.split("\n").filter((line) => line.trim() !== "");
     try {
-      await fs54.unlink(warningsFilePath);
+      await fs53.unlink(warningsFilePath);
     } catch {
       warnings.push("Warning: Could not delete temporary warnings file.");
     }
@@ -146789,16 +147103,16 @@ __name(getStartupWarnings, "getStartupWarnings");
 
 // packages/cli/src/utils/userStartupWarnings.ts
 init_esbuild_shims();
-import fs55 from "node:fs/promises";
+import fs54 from "node:fs/promises";
 import * as os32 from "node:os";
-import path61 from "node:path";
+import path60 from "node:path";
 var homeDirectoryCheck = {
   id: "home-directory",
   check: /* @__PURE__ */ __name(async (options) => {
     try {
       const [workspaceRealPath, homeRealPath] = await Promise.all([
-        fs55.realpath(options.workspaceRoot),
-        fs55.realpath(os32.homedir())
+        fs54.realpath(options.workspaceRoot),
+        fs54.realpath(os32.homedir())
       ]);
       if (workspaceRealPath === homeRealPath) {
         return "You are running Qwen Code in your home directory. It is recommended to run in a project-specific directory.";
@@ -146813,9 +147127,9 @@ var rootDirectoryCheck = {
   id: "root-directory",
   check: /* @__PURE__ */ __name(async (options) => {
     try {
-      const workspaceRealPath = await fs55.realpath(options.workspaceRoot);
+      const workspaceRealPath = await fs54.realpath(options.workspaceRoot);
       const errorMessage2 = "Warning: You are running Qwen Code in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
-      if (path61.dirname(workspaceRealPath) === workspaceRealPath) {
+      if (path60.dirname(workspaceRealPath) === workspaceRealPath) {
         return errorMessage2;
       }
       return null;
@@ -147669,7 +147983,16 @@ var DualOutputBridge = class {
 
 // packages/cli/src/remoteInput/RemoteInputWatcher.ts
 init_esbuild_shims();
-import { createReadStream, watchFile, unwatchFile, statSync as statSync6 } from "node:fs";
+import { createHash as createHash2 } from "node:crypto";
+import {
+  closeSync as closeSync2,
+  createReadStream,
+  openSync as openSync3,
+  readSync as readSync2,
+  statSync as statSync6,
+  unwatchFile,
+  watchFile
+} from "node:fs";
 import { createInterface as createInterface2 } from "node:readline";
 var debugLogger78 = createDebugLogger("REMOTE_INPUT");
 var RemoteInputWatcher = class {
@@ -147682,6 +148005,7 @@ var RemoteInputWatcher = class {
   processing = false;
   active = true;
   bytesRead = 0;
+  consumedPrefixHash = null;
   reading = false;
   filePath;
   retryTimer = null;
@@ -147721,8 +148045,10 @@ var RemoteInputWatcher = class {
     try {
       const stat4 = statSync6(this.filePath);
       this.bytesRead = stat4.size;
+      this.consumedPrefixHash = this.hashFilePrefix(this.bytesRead);
     } catch {
       this.bytesRead = 0;
+      this.consumedPrefixHash = null;
     }
     watchFile(this.filePath, { interval: this.pollIntervalMs }, () => {
       if (!this.active) return;
@@ -147748,7 +148074,21 @@ var RemoteInputWatcher = class {
     } catch {
       return Promise.resolve();
     }
+    if (currentSize < this.bytesRead) {
+      debugLogger78.debug(
+        "RemoteInput: input file shrank, resetting read offset"
+      );
+      this.bytesRead = 0;
+      this.consumedPrefixHash = null;
+    } else if (this.hasConsumedPrefixChanged()) {
+      debugLogger78.debug(
+        "RemoteInput: input file prefix changed, resetting read offset"
+      );
+      this.bytesRead = 0;
+      this.consumedPrefixHash = null;
+    }
     if (currentSize <= this.bytesRead) return Promise.resolve();
+    const nextConsumedPrefixHash = this.hashFilePrefix(currentSize);
     this.reading = true;
     const stream = createReadStream(this.filePath, {
       start: this.bytesRead,
@@ -147784,12 +148124,61 @@ var RemoteInputWatcher = class {
     return new Promise((resolve23) => {
       rl.on("close", () => {
         this.bytesRead = currentSize;
+        if (nextConsumedPrefixHash !== null) {
+          this.consumedPrefixHash = nextConsumedPrefixHash;
+        }
         this.reading = false;
         this.processQueue();
         resolve23();
       });
     });
   }
+  hasConsumedPrefixChanged() {
+    if (this.bytesRead === 0) {
+      return false;
+    }
+    if (this.consumedPrefixHash === null) {
+      debugLogger78.warn(
+        "RemoteInput: missing consumed prefix hash, resetting read offset"
+      );
+      return true;
+    }
+    const currentHash = this.hashFilePrefix(this.bytesRead);
+    if (currentHash === null) {
+      debugLogger78.warn(
+        "RemoteInput: failed to hash consumed prefix, resetting read offset"
+      );
+      return true;
+    }
+    return currentHash !== this.consumedPrefixHash;
+  }
+  hashFilePrefix(size) {
+    if (size <= 0) return null;
+    let fd = null;
+    try {
+      fd = openSync3(this.filePath, "r");
+      const hash = createHash2("sha256");
+      const buffer = Buffer.allocUnsafe(Math.min(64 * 1024, size));
+      let remaining = size;
+      let position = 0;
+      while (remaining > 0) {
+        const bytesToRead = Math.min(buffer.length, remaining);
+        const bytesRead = readSync2(fd, buffer, 0, bytesToRead, position);
+        if (bytesRead <= 0) return null;
+        hash.update(buffer.subarray(0, bytesRead));
+        remaining -= bytesRead;
+        position += bytesRead;
+      }
+      return hash.digest("base64");
+    } catch (err) {
+      debugLogger78.warn("RemoteInput: failed to hash file prefix:", err);
+      return null;
+    } finally {
+      if (fd !== null) {
+        closeSync2(fd);
+      }
+    }
+  }
   async processQueue() {
     if (this.processing || !this.submitFn || this.queue.length === 0) return;
     this.processing = true;
@@ -148129,8 +148518,8 @@ var AcpFileSystemService = class {
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable as Readable2, Writable as Writable2 } from "node:stream";
 import { pipeline as pipeline2 } from "node:stream/promises";
-import * as fs56 from "node:fs/promises";
-import * as path62 from "node:path";
+import * as fs55 from "node:fs/promises";
+import * as path61 from "node:path";
 import { createGunzip } from "node:zlib";
 
 // packages/cli/src/acp-integration/session/Session.ts
@@ -149067,8 +149456,13 @@ function isUserPromptRecord(record) {
   ) ?? false;
 }
 __name(isUserPromptRecord, "isUserPromptRecord");
-async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.timeout(1e4)) {
-  const slashCommands = await getAvailableCommands(config, abortSignal, "acp");
+async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.timeout(1e4), settings) {
+  const slashCommands = await getAvailableCommands(
+    config,
+    abortSignal,
+    "acp",
+    settings
+  );
   const availableCommands = slashCommands.map((cmd) => {
     const acceptsInput = cmd.acceptsInput ?? (cmd.kind !== "built-in" /* BUILT_IN */ || cmd.completion != null || cmd.argumentHint != null || cmd.subCommands != null && cmd.subCommands.length > 0);
     return {
@@ -150832,7 +151226,11 @@ ${this.pendingWorktreeNotice}
   }
   async sendAvailableCommandsUpdate() {
     try {
-      const { availableCommands, availableSkills, availableSkillDetails } = await buildAvailableCommandsSnapshot(this.config);
+      const { availableCommands, availableSkills, availableSkillDetails } = await buildAvailableCommandsSnapshot(
+        this.config,
+        void 0,
+        this.settings
+      );
       const update = {
         sessionUpdate: "available_commands_update",
         availableCommands,
@@ -151100,11 +151498,10 @@ ${this.pendingWorktreeNotice}
       }
     }, "appendSkippedAfter");
     const runBounded = /* @__PURE__ */ __name(async (calls, runAbortSignal, onStopAfterPermissionCancel, shouldSkipUnstarted) => {
-      const parsed = parseInt(
-        process.env["QWEN_CODE_MAX_TOOL_CONCURRENCY"] || "",
+      const maxConcurrency = parsePositiveIntegerEnv(
+        process.env["QWEN_CODE_MAX_TOOL_CONCURRENCY"],
         10
       );
-      const maxConcurrency = Number.isFinite(parsed) && parsed >= 1 ? parsed : 10;
       const results = new Array(calls.length);
       const executing = /* @__PURE__ */ new Set();
       for (let i = 0; i < calls.length; i++) {
@@ -152322,7 +152719,7 @@ function readRequiredString(value, fieldName) {
 }
 __name(readRequiredString, "readRequiredString");
 function validateSkillSlug(slug) {
-  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path62.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
+  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path61.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
 }
@@ -152791,7 +153188,7 @@ async function downloadGitHubSkillDirectoryFromApi(githubUrl, directoryPath, rel
     const name = readRequiredString(record["name"], "github.name");
     const itemPath = readRequiredString(record["path"], "github.path");
     const type = readRequiredString(record["type"], "github.type");
-    const relativePath = relativeRoot ? path62.posix.join(relativeRoot, name) : name;
+    const relativePath = relativeRoot ? path61.posix.join(relativeRoot, name) : name;
     if (type === "dir") {
       files.push(
         ...await downloadGitHubSkillDirectoryFromApi(
@@ -152851,10 +153248,10 @@ __name(downloadGitHubSkillDirectory, "downloadGitHubSkillDirectory");
 async function downloadSkill(sourceUrl) {
   assertAllowedSkillSourceUrl(sourceUrl);
   const githubUrl = parseGitHubBlobSkillUrl(sourceUrl);
-  if (!githubUrl || path62.posix.basename(githubUrl.filePath) !== "SKILL.md") {
+  if (!githubUrl || path61.posix.basename(githubUrl.filePath) !== "SKILL.md") {
     return downloadSingleSkillFile(sourceUrl);
   }
-  const skillDirectory = path62.posix.dirname(githubUrl.filePath);
+  const skillDirectory = path61.posix.dirname(githubUrl.filePath);
   const files = await downloadGitHubSkillDirectory(githubUrl, skillDirectory);
   const skillFile = files.find((file) => file.relativePath === "SKILL.md");
   if (!skillFile) {
@@ -152870,9 +153267,9 @@ async function downloadSkill(sourceUrl) {
 }
 __name(downloadSkill, "downloadSkill");
 function resolveSkillInstallPath(skillDir, relativePath) {
-  const root = path62.resolve(skillDir);
-  const target = path62.resolve(skillDir, relativePath);
-  if (target !== root && !target.startsWith(root + path62.sep)) {
+  const root = path61.resolve(skillDir);
+  const target = path61.resolve(skillDir, relativePath);
+  if (target !== root && !target.startsWith(root + path61.sep)) {
     throw RequestError.invalidParams(
       void 0,
       `Invalid skill file path: ${relativePath}`
@@ -152882,9 +153279,9 @@ function resolveSkillInstallPath(skillDir, relativePath) {
 }
 __name(resolveSkillInstallPath, "resolveSkillInstallPath");
 function resolveManagedSkillDir(skillsBaseDir, slug) {
-  const root = path62.resolve(skillsBaseDir);
-  const skillDir = path62.resolve(skillsBaseDir, slug);
-  if (!skillDir.startsWith(root + path62.sep)) {
+  const root = path61.resolve(skillsBaseDir);
+  const skillDir = path61.resolve(skillsBaseDir, slug);
+  if (!skillDir.startsWith(root + path61.sep)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
   return skillDir;
@@ -153582,14 +153979,14 @@ function readScopeSettings(settings, scope) {
 __name(readScopeSettings, "readScopeSettings");
 async function resolvePreferredMemoryFile2(dir, fallbackFilename) {
   for (const filename of getAllGeminiMdFilenames()) {
-    const filePath = path62.join(dir, filename);
+    const filePath = path61.join(dir, filename);
     try {
-      await fs56.access(filePath);
+      await fs55.access(filePath);
       return filePath;
     } catch {
     }
   }
-  return path62.join(dir, fallbackFilename);
+  return path61.join(dir, fallbackFilename);
 }
 __name(resolvePreferredMemoryFile2, "resolvePreferredMemoryFile");
 async function resolveQwenMemoryPaths(params) {
@@ -153905,7 +154302,7 @@ var QwenAgent = class {
   async initialize(args) {
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.18.4";
+    const version = "0.18.5-nightly.20260622.6bc3f853e";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -155441,9 +155838,9 @@ var QwenAgent = class {
       );
     }
     const download = await downloadSkill(request.sourceUrl);
-    const skillsBaseDir = path62.join(Storage.getGlobalQwenDir(), "skills");
+    const skillsBaseDir = path61.join(Storage.getGlobalQwenDir(), "skills");
     const skillDir = resolveManagedSkillDir(skillsBaseDir, request.slug);
-    const skillFile = path62.join(skillDir, "SKILL.md");
+    const skillFile = path61.join(skillDir, "SKILL.md");
     const parsed = skillManager.parseSkillContent(
       download.skillContent,
       skillFile,
@@ -155457,19 +155854,19 @@ var QwenAgent = class {
     }
     const stagingDir = `${skillDir}.installing-${process.pid}-${Date.now()}`;
     try {
-      await fs56.rm(stagingDir, { recursive: true, force: true });
+      await fs55.rm(stagingDir, { recursive: true, force: true });
       for (const file of download.files) {
         const targetPath = resolveSkillInstallPath(
           stagingDir,
           file.relativePath
         );
-        await fs56.mkdir(path62.dirname(targetPath), { recursive: true });
-        await fs56.writeFile(targetPath, file.content);
+        await fs55.mkdir(path61.dirname(targetPath), { recursive: true });
+        await fs55.writeFile(targetPath, file.content);
       }
-      await fs56.rm(skillDir, { recursive: true, force: true });
-      await fs56.rename(stagingDir, skillDir);
+      await fs55.rm(skillDir, { recursive: true, force: true });
+      await fs55.rename(stagingDir, skillDir);
     } catch (error) {
-      await fs56.rm(stagingDir, { recursive: true, force: true }).catch(() => {
+      await fs55.rm(stagingDir, { recursive: true, force: true }).catch(() => {
       });
       throw error;
     }
@@ -155502,17 +155899,17 @@ var QwenAgent = class {
         `Skill name "${parsed.name}" does not match requested slug "${request.slug}"`
       );
     }
-    const resolvedSkillDir = path62.resolve(skillDir);
-    const resolvedSkillFile = path62.resolve(skillFile);
-    const globalDir = path62.resolve(Storage.getGlobalQwenDir());
-    const isDedicatedSkillDir = resolvedSkillFile === path62.join(resolvedSkillDir, "SKILL.md");
-    if (!isDedicatedSkillDir || resolvedSkillDir === path62.parse(resolvedSkillDir).root || resolvedSkillDir === globalDir) {
+    const resolvedSkillDir = path61.resolve(skillDir);
+    const resolvedSkillFile = path61.resolve(skillFile);
+    const globalDir = path61.resolve(Storage.getGlobalQwenDir());
+    const isDedicatedSkillDir = resolvedSkillFile === path61.join(resolvedSkillDir, "SKILL.md");
+    if (!isDedicatedSkillDir || resolvedSkillDir === path61.parse(resolvedSkillDir).root || resolvedSkillDir === globalDir) {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to delete unexpected skill directory: ${skillDir}`
       );
     }
-    await fs56.rm(skillDir, { recursive: true, force: true });
+    await fs55.rm(skillDir, { recursive: true, force: true });
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -155522,11 +155919,11 @@ var QwenAgent = class {
   async readManagedSkillFile(slug, scope, skillManager, cwd5) {
     if (scope === "global") {
       const qwenSkillDir = resolveManagedSkillDir(
-        path62.join(Storage.getGlobalQwenDir(), "skills"),
+        path61.join(Storage.getGlobalQwenDir(), "skills"),
         slug
       );
-      const qwenSkillFile = path62.join(qwenSkillDir, "SKILL.md");
-      const qwenContent = await fs56.readFile(qwenSkillFile, "utf8").catch(() => void 0);
+      const qwenSkillFile = path61.join(qwenSkillDir, "SKILL.md");
+      const qwenContent = await fs55.readFile(qwenSkillFile, "utf8").catch(() => void 0);
       if (qwenContent !== void 0) {
         return {
           skillDir: qwenSkillDir,
@@ -155554,34 +155951,34 @@ var QwenAgent = class {
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     }
-    const content = await fs56.readFile(skillFile, "utf8").catch(() => {
+    const content = await fs55.readFile(skillFile, "utf8").catch(() => {
       throw RequestError.invalidParams(
         void 0,
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     });
     return {
-      skillDir: path62.dirname(skillFile),
+      skillDir: path61.dirname(skillFile),
       skillFile,
       content
     };
   }
   async findProjectSkillFileFromCwd(slug, cwd5, skillManager) {
-    const projectRoot = path62.resolve(cwd5);
+    const projectRoot = path61.resolve(cwd5);
     for (const configDir of PROJECT_SKILL_DIRS) {
-      const baseDir = path62.join(projectRoot, configDir, SKILLS_DIR);
+      const baseDir = path61.join(projectRoot, configDir, SKILLS_DIR);
       const skills = await skillManager.loadSkillsFromDir(baseDir, "project");
       const skill = skills.find((candidate) => candidate.name === slug);
       const skillFile = skill?.filePath;
       if (!skillFile) continue;
-      const content = await fs56.readFile(skillFile, "utf8").catch(() => {
+      const content = await fs55.readFile(skillFile, "utf8").catch(() => {
         throw RequestError.invalidParams(
           void 0,
           `Project skill not found: ${slug}`
         );
       });
       return {
-        skillDir: path62.dirname(skillFile),
+        skillDir: path61.dirname(skillFile),
         skillFile,
         content
       };
@@ -155612,13 +156009,13 @@ var QwenAgent = class {
     }
     const nextContent = setSkillFrontmatterEnabled(content, request.enabled);
     skillManager.parseSkillContent(nextContent, skillFile, level);
-    if (path62.basename(skillFile) !== "SKILL.md") {
+    if (path61.basename(skillFile) !== "SKILL.md") {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to write to unexpected skill file: ${skillFile}`
       );
     }
-    await fs56.writeFile(skillFile, nextContent, "utf8");
+    await fs55.writeFile(skillFile, nextContent, "utf8");
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -157897,7 +158294,7 @@ ${finalArgs[promptIndex + 1]}`;
     const resolveIfPath = /* @__PURE__ */ __name((v) => {
       if (typeof v !== "string" || v.length === 0) return v;
       if (looksLikeInlineJson(v)) return v;
-      return path63.resolve(launchCwdForPaths, v);
+      return path62.resolve(launchCwdForPaths, v);
     }, "resolveIfPath");
     argv.mcpConfig = resolveIfPath(argv.mcpConfig);
     argv.openaiLoggingDir = resolveIfPath(argv.openaiLoggingDir);
@@ -157906,15 +158303,15 @@ ${finalArgs[promptIndex + 1]}`;
     argv.telemetryOutfile = resolveIfPath(argv.telemetryOutfile);
     if (Array.isArray(argv.includeDirectories)) {
       argv.includeDirectories = argv.includeDirectories.map(
-        (d) => typeof d === "string" && d.length > 0 ? path63.resolve(launchCwdForPaths, d) : d
+        (d) => typeof d === "string" && d.length > 0 ? path62.resolve(launchCwdForPaths, d) : d
       );
     }
     if (typeof argv.jsonSchema === "string") {
       const trimmedSchema = argv.jsonSchema.trim();
       if (trimmedSchema.startsWith("@")) {
         const rel = trimmedSchema.slice(1);
-        if (rel.length > 0 && !path63.isAbsolute(rel)) {
-          argv.jsonSchema = "@" + path63.resolve(launchCwdForPaths, rel);
+        if (rel.length > 0 && !path62.isAbsolute(rel)) {
+          argv.jsonSchema = "@" + path62.resolve(launchCwdForPaths, rel);
         }
       }
     }
@@ -158076,7 +158473,7 @@ ${finalArgs[promptIndex + 1]}`;
       process.exit(0);
     }
     if (config.isInteractive()) {
-      void import("./chunks/scheduler-NTVF45LR.js").then((m) => m.startBackgroundHousekeeping(config, settings)).catch((err) => {
+      void import("./chunks/scheduler-M3742P2I.js").then((m) => m.startBackgroundHousekeeping(config, settings)).catch((err) => {
         debugLogger84.warn("failed to start background housekeeping:", err);
       });
     }