@qwen-code/qwen-code 0.18.2 → 0.18.3-nightly.20260621.6b2f800ab

package/chunks/{chunk-25FFAMED.js → chunk-NLCTUNOS.js}

@@ -18,24 +18,28 @@ import {
   DEFAULT_QWEN_MODEL,
   MAINLINE_CODER_MODEL
 } from "./chunk-OFEVLU4C.js";
+import {
+  Mutex
+} from "./chunk-OMX7CUOE.js";
 import {
   isAnyAutoMemPath
-} from "./chunk-IQHSD7K5.js";
+} from "./chunk-FH4P6RQA.js";
 import {
   InstallationManager
-} from "./chunk-LYRSMKLS.js";
+} from "./chunk-CTHZVIMD.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-RTTAC5VW.js";
+} from "./chunk-VKILGMZQ.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-ZNUMXPNK.js";
+} from "./chunk-GOMVJKBL.js";
 import {
-  atomicWriteFile
-} from "./chunk-LXYWINWF.js";
+  atomicWriteFile,
+  atomicWriteFileSync
+} from "./chunk-LTN3VYMZ.js";
 import {
   DEFAULT_OPENAI_BASE_URL,
   convertSchema,
@@ -43,7 +47,7 @@ import {
   runtimeDiagnostics,
   safeJsonParse,
   tokenLimit
-} from "./chunk-LYSND7KR.js";
+} from "./chunk-G4BUMVEY.js";
 import {
   FinishReason,
   GenerateContentResponse
@@ -58,6 +62,7 @@ import {
   getErrorMessage,
   getErrorStatus,
   getErrorType,
+  isAbortError,
   isNodeError,
   isSubpaths,
   makeRelative,
@@ -65,7 +70,7 @@ import {
   setShellTracePropagation,
   shortenPath,
   unescapePath
-} from "./chunk-HA2UEYZP.js";
+} from "./chunk-WE6TNQJU.js";
 import {
   require_dist
 } from "./chunk-ZERZSAZL.js";
@@ -9473,10 +9478,10 @@ var require_lib2 = __commonJS({
     exports.analyse = analyse;
     var detectFile = /* @__PURE__ */ __name((filepath, opts = {}) => new Promise((resolve2, reject) => {
       let fd;
-      const fs8 = (0, node_1.default)();
+      const fs9 = (0, node_1.default)();
       const handler = /* @__PURE__ */ __name((err, buffer) => {
         if (fd) {
-          fs8.closeSync(fd);
+          fs9.closeSync(fd);
         }
         if (err) {
           reject(err);
@@ -9485,26 +9490,26 @@ var require_lib2 = __commonJS({
         }
       }, "handler");
       if (opts && opts.sampleSize) {
-        fd = fs8.openSync(filepath, "r");
+        fd = fs9.openSync(filepath, "r");
         const sample = Buffer.allocUnsafe(opts.sampleSize);
-        fs8.read(fd, sample, 0, opts.sampleSize, opts.offset, (err) => {
+        fs9.read(fd, sample, 0, opts.sampleSize, opts.offset, (err) => {
           handler(err, sample);
         });
         return;
       }
-      fs8.readFile(filepath, handler);
+      fs9.readFile(filepath, handler);
     }), "detectFile");
     exports.detectFile = detectFile;
     var detectFileSync = /* @__PURE__ */ __name((filepath, opts = {}) => {
-      const fs8 = (0, node_1.default)();
+      const fs9 = (0, node_1.default)();
       if (opts && opts.sampleSize) {
-        const fd = fs8.openSync(filepath, "r");
+        const fd = fs9.openSync(filepath, "r");
         const sample = Buffer.allocUnsafe(opts.sampleSize);
-        fs8.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
-        fs8.closeSync(fd);
+        fs9.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
+        fs9.closeSync(fd);
         return (0, exports.detect)(sample);
       }
-      return (0, exports.detect)(fs8.readFileSync(filepath));
+      return (0, exports.detect)(fs9.readFileSync(filepath));
     }, "detectFileSync");
     exports.detectFileSync = detectFileSync;
     exports.default = {
@@ -15731,14 +15736,14 @@ var require_tls_helpers = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.CIPHER_SUITES = void 0;
     exports.getDefaultRootsData = getDefaultRootsData;
-    var fs8 = __require("fs");
+    var fs9 = __require("fs");
     exports.CIPHER_SUITES = process.env.GRPC_SSL_CIPHER_SUITES;
     var DEFAULT_ROOTS_FILE_PATH = process.env.GRPC_DEFAULT_SSL_ROOTS_FILE_PATH;
     var defaultRootsData = null;
     function getDefaultRootsData() {
       if (DEFAULT_ROOTS_FILE_PATH) {
         if (defaultRootsData === null) {
-          defaultRootsData = fs8.readFileSync(DEFAULT_ROOTS_FILE_PATH);
+          defaultRootsData = fs9.readFileSync(DEFAULT_ROOTS_FILE_PATH);
         }
         return defaultRootsData;
       }
@@ -15772,19 +15777,19 @@ var require_uri_parser = __commonJS({
     }
     __name(parseUri, "parseUri");
     var NUMBER_REGEX = /^\d+$/;
-    function splitHostPort(path8) {
-      if (path8.startsWith("[")) {
-        const hostEnd = path8.indexOf("]");
+    function splitHostPort(path11) {
+      if (path11.startsWith("[")) {
+        const hostEnd = path11.indexOf("]");
         if (hostEnd === -1) {
           return null;
         }
-        const host = path8.substring(1, hostEnd);
+        const host = path11.substring(1, hostEnd);
         if (host.indexOf(":") === -1) {
           return null;
         }
-        if (path8.length > hostEnd + 1) {
-          if (path8[hostEnd + 1] === ":") {
-            const portString = path8.substring(hostEnd + 2);
+        if (path11.length > hostEnd + 1) {
+          if (path11[hostEnd + 1] === ":") {
+            const portString = path11.substring(hostEnd + 2);
             if (NUMBER_REGEX.test(portString)) {
               return {
                 host,
@@ -15802,7 +15807,7 @@ var require_uri_parser = __commonJS({
           };
         }
       } else {
-        const splitPath = path8.split(":");
+        const splitPath = path11.split(":");
         if (splitPath.length === 2) {
           if (NUMBER_REGEX.test(splitPath[1])) {
             return {
@@ -15814,7 +15819,7 @@ var require_uri_parser = __commonJS({
           }
         } else {
           return {
-            host: path8
+            host: path11
           };
         }
       }
@@ -18933,14 +18938,14 @@ var require_client_interceptors = __commonJS({
       }
     };
     exports.InterceptingCall = InterceptingCall;
-    function getCall(channel, path8, options) {
+    function getCall(channel, path11, options) {
       var _a, _b;
       const deadline = (_a = options.deadline) !== null && _a !== void 0 ? _a : Infinity;
       const host = options.host;
       const parent = (_b = options.parent) !== null && _b !== void 0 ? _b : null;
       const propagateFlags = options.propagate_flags;
       const credentials = options.credentials;
-      const call = channel.createCall(path8, deadline, host, parent, propagateFlags);
+      const call = channel.createCall(path11, deadline, host, parent, propagateFlags);
       if (credentials) {
         call.setCredentials(credentials);
       }
@@ -19531,9 +19536,9 @@ var require_make_client = __commonJS({
       return ServiceClientImpl;
     }
     __name(makeClientConstructor, "makeClientConstructor");
-    function partial(fn, path8, serialize, deserialize) {
+    function partial(fn, path11, serialize, deserialize) {
       return function(...args) {
-        return fn.call(this, path8, serialize, deserialize, ...args);
+        return fn.call(this, path11, serialize, deserialize, ...args);
       };
     }
     __name(partial, "partial");
@@ -20050,17 +20055,17 @@ var require_fs = __commonJS({
   "node_modules/@protobufjs/fetch/util/fs.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var fs8 = null;
+    var fs9 = null;
     try {
-      fs8 = __require(
+      fs9 = __require(
         /* webpackIgnore: true */
         "fs"
       );
-      if (!fs8 || !fs8.readFile || !fs8.readFileSync)
-        fs8 = null;
+      if (!fs9 || !fs9.readFile || !fs9.readFileSync)
+        fs9 = null;
     } catch (e) {
     }
-    module.exports = fs8;
+    module.exports = fs9;
   }
 });
 
@@ -20071,7 +20076,7 @@ var require_fetch = __commonJS({
     init_esbuild_shims();
     module.exports = fetch;
     var asPromise = require_aspromise();
-    var fs8 = require_fs();
+    var fs9 = require_fs();
     function fetch(filename, options, callback) {
       if (typeof options === "function") {
         callback = options;
@@ -20080,8 +20085,8 @@ var require_fetch = __commonJS({
         options = {};
       if (!callback)
         return asPromise(fetch, this, filename, options);
-      if (!options.xhr && fs8 && fs8.readFile)
-        return fs8.readFile(filename, /* @__PURE__ */ __name(function fetchReadFileCallback(err, contents) {
+      if (!options.xhr && fs9 && fs9.readFile)
+        return fs9.readFile(filename, /* @__PURE__ */ __name(function fetchReadFileCallback(err, contents) {
           return err && typeof XMLHttpRequest !== "undefined" ? fetch.xhr(filename, options, callback) : err ? callback(err) : callback(null, options.binary ? contents : contents.toString("utf8"));
         }, "fetchReadFileCallback"));
       return fetch.xhr(filename, options, callback);
@@ -20121,15 +20126,15 @@ var require_path = __commonJS({
   "node_modules/@protobufjs/path/index.js"(exports) {
     "use strict";
     init_esbuild_shims();
-    var path8 = exports;
+    var path11 = exports;
     var isAbsolute3 = (
       /**
        * Tests if the specified path is absolute.
        * @param {string} path Path to test
        * @returns {boolean} `true` if path is absolute
        */
-      path8.isAbsolute = /* @__PURE__ */ __name(function isAbsolute4(path9) {
-        return /^(?:\/|\w+:)/.test(path9);
+      path11.isAbsolute = /* @__PURE__ */ __name(function isAbsolute4(path12) {
+        return /^(?:\/|\w+:)/.test(path12);
       }, "isAbsolute")
     );
     var normalize3 = (
@@ -20138,9 +20143,9 @@ var require_path = __commonJS({
        * @param {string} path Path to normalize
        * @returns {string} Normalized path
        */
-      path8.normalize = /* @__PURE__ */ __name(function normalize4(path9) {
-        path9 = path9.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-        var parts = path9.split("/"), absolute = isAbsolute3(path9), prefix = "";
+      path11.normalize = /* @__PURE__ */ __name(function normalize4(path12) {
+        path12 = path12.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
+        var parts = path12.split("/"), absolute = isAbsolute3(path12), prefix = "";
         if (absolute)
           prefix = parts.shift() + "/";
         for (var i = 0; i < parts.length; ) {
@@ -20159,7 +20164,7 @@ var require_path = __commonJS({
         return prefix + parts.join("/");
       }, "normalize")
     );
-    path8.resolve = /* @__PURE__ */ __name(function resolve2(originPath, includePath, alreadyNormalized) {
+    path11.resolve = /* @__PURE__ */ __name(function resolve2(originPath, includePath, alreadyNormalized) {
       if (!alreadyNormalized)
         includePath = normalize3(includePath);
       if (isAbsolute3(includePath))
@@ -20188,17 +20193,17 @@ var require_fs2 = __commonJS({
   "node_modules/protobufjs/src/util/fs.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var fs8 = null;
+    var fs9 = null;
     try {
-      fs8 = __require(
+      fs9 = __require(
         /* webpackIgnore: true */
         "fs"
       );
-      if (!fs8 || !fs8.readFile || !fs8.readFileSync)
-        fs8 = null;
+      if (!fs9 || !fs9.readFile || !fs9.readFileSync)
+        fs9 = null;
     } catch (e) {
     }
-    module.exports = fs8;
+    module.exports = fs9;
   }
 });
 
@@ -20349,18 +20354,18 @@ var require_namespace = __commonJS({
       object.onRemove(this);
       return clearCache(this);
     }, "remove");
-    Namespace.prototype.define = /* @__PURE__ */ __name(function define(path8, json) {
-      if (util.isString(path8))
-        path8 = path8.split(".");
-      else if (!Array.isArray(path8))
+    Namespace.prototype.define = /* @__PURE__ */ __name(function define(path11, json) {
+      if (util.isString(path11))
+        path11 = path11.split(".");
+      else if (!Array.isArray(path11))
         throw TypeError("illegal path");
-      if (path8 && path8.length && path8[0] === "")
+      if (path11 && path11.length && path11[0] === "")
         throw Error("path must be relative");
-      if (path8.length > util.recursionLimit)
+      if (path11.length > util.recursionLimit)
         throw Error("max depth exceeded");
       var ptr = this;
-      while (path8.length > 0) {
-        var part = path8.shift();
+      while (path11.length > 0) {
+        var part = path11.shift();
         if (ptr.nested && ptr.nested[part]) {
           ptr = ptr.nested[part];
           if (!(ptr instanceof Namespace))
@@ -20395,26 +20400,26 @@ var require_namespace = __commonJS({
       });
       return this;
     }, "_resolveFeaturesRecursive");
-    Namespace.prototype.lookup = /* @__PURE__ */ __name(function lookup(path8, filterTypes, parentAlreadyChecked) {
+    Namespace.prototype.lookup = /* @__PURE__ */ __name(function lookup(path11, filterTypes, parentAlreadyChecked) {
       if (typeof filterTypes === "boolean") {
         parentAlreadyChecked = filterTypes;
         filterTypes = void 0;
       } else if (filterTypes && !Array.isArray(filterTypes))
         filterTypes = [filterTypes];
-      if (util.isString(path8) && path8.length) {
-        if (path8 === ".")
+      if (util.isString(path11) && path11.length) {
+        if (path11 === ".")
           return this.root;
-        path8 = path8.split(".");
-      } else if (!path8.length)
+        path11 = path11.split(".");
+      } else if (!path11.length)
         return this;
-      var flatPath = path8.join(".");
-      if (path8[0] === "")
-        return this.root.lookup(path8.slice(1), filterTypes);
+      var flatPath = path11.join(".");
+      if (path11[0] === "")
+        return this.root.lookup(path11.slice(1), filterTypes);
       var found = this.root._fullyQualifiedObjects && this.root._fullyQualifiedObjects["." + flatPath];
       if (found && (!filterTypes || filterTypes.indexOf(found.constructor) > -1)) {
         return found;
       }
-      found = this._lookupImpl(path8, flatPath);
+      found = this._lookupImpl(path11, flatPath);
       if (found && (!filterTypes || filterTypes.indexOf(found.constructor) > -1)) {
         return found;
       }
@@ -20422,7 +20427,7 @@ var require_namespace = __commonJS({
         return null;
       var current = this;
       while (current.parent) {
-        found = current.parent._lookupImpl(path8, flatPath);
+        found = current.parent._lookupImpl(path11, flatPath);
         if (found && (!filterTypes || filterTypes.indexOf(found.constructor) > -1)) {
           return found;
         }
@@ -20430,22 +20435,22 @@ var require_namespace = __commonJS({
       }
       return null;
     }, "lookup");
-    Namespace.prototype._lookupImpl = /* @__PURE__ */ __name(function lookup(path8, flatPath) {
+    Namespace.prototype._lookupImpl = /* @__PURE__ */ __name(function lookup(path11, flatPath) {
       if (Object.prototype.hasOwnProperty.call(this._lookupCache, flatPath)) {
         return this._lookupCache[flatPath];
       }
-      var found = this.get(path8[0]);
+      var found = this.get(path11[0]);
       var exact = null;
       if (found) {
-        if (path8.length === 1) {
+        if (path11.length === 1) {
           exact = found;
         } else if (found instanceof Namespace) {
-          path8 = path8.slice(1);
-          exact = found._lookupImpl(path8, path8.join("."));
+          path11 = path11.slice(1);
+          exact = found._lookupImpl(path11, path11.join("."));
         }
       } else {
         for (var i = 0; i < this.nestedArray.length; ++i)
-          if (this._nestedArray[i] instanceof Namespace && (found = this._nestedArray[i]._lookupImpl(path8, flatPath))) {
+          if (this._nestedArray[i] instanceof Namespace && (found = this._nestedArray[i]._lookupImpl(path11, flatPath))) {
             exact = found;
             break;
           }
@@ -20453,28 +20458,28 @@ var require_namespace = __commonJS({
       this._lookupCache[flatPath] = exact;
       return exact;
     }, "lookup");
-    Namespace.prototype.lookupType = /* @__PURE__ */ __name(function lookupType(path8) {
-      var found = this.lookup(path8, [Type]);
+    Namespace.prototype.lookupType = /* @__PURE__ */ __name(function lookupType(path11) {
+      var found = this.lookup(path11, [Type]);
       if (!found)
-        throw Error("no such type: " + path8);
+        throw Error("no such type: " + path11);
       return found;
     }, "lookupType");
-    Namespace.prototype.lookupEnum = /* @__PURE__ */ __name(function lookupEnum(path8) {
-      var found = this.lookup(path8, [Enum]);
+    Namespace.prototype.lookupEnum = /* @__PURE__ */ __name(function lookupEnum(path11) {
+      var found = this.lookup(path11, [Enum]);
       if (!found)
-        throw Error("no such Enum '" + path8 + "' in " + this);
+        throw Error("no such Enum '" + path11 + "' in " + this);
       return found;
     }, "lookupEnum");
-    Namespace.prototype.lookupTypeOrEnum = /* @__PURE__ */ __name(function lookupTypeOrEnum(path8) {
-      var found = this.lookup(path8, [Type, Enum]);
+    Namespace.prototype.lookupTypeOrEnum = /* @__PURE__ */ __name(function lookupTypeOrEnum(path11) {
+      var found = this.lookup(path11, [Type, Enum]);
       if (!found)
-        throw Error("no such Type or Enum '" + path8 + "' in " + this);
+        throw Error("no such Type or Enum '" + path11 + "' in " + this);
       return found;
     }, "lookupTypeOrEnum");
-    Namespace.prototype.lookupService = /* @__PURE__ */ __name(function lookupService(path8) {
-      var found = this.lookup(path8, [Service]);
+    Namespace.prototype.lookupService = /* @__PURE__ */ __name(function lookupService(path11) {
+      var found = this.lookup(path11, [Service]);
       if (!found)
-        throw Error("no such Service '" + path8 + "' in " + this);
+        throw Error("no such Service '" + path11 + "' in " + this);
       return found;
     }, "lookupService");
     Namespace._configure = function(Type_, Service_, Enum_) {
@@ -21917,13 +21922,13 @@ var require_util = __commonJS({
       Object.defineProperty(object, "$type", { value: enm, enumerable: false });
       return enm;
     }, "decorateEnum");
-    util.setProperty = /* @__PURE__ */ __name(function setProperty(dst, path8, value, ifNotSet) {
-      function setProp(dst2, path9, value2) {
-        var part = path9.shift();
+    util.setProperty = /* @__PURE__ */ __name(function setProperty(dst, path11, value, ifNotSet) {
+      function setProp(dst2, path12, value2) {
+        var part = path12.shift();
         if (util.isUnsafeProperty(part))
           return dst2;
-        if (path9.length > 0) {
-          dst2[part] = setProp(dst2[part] || {}, path9, value2);
+        if (path12.length > 0) {
+          dst2[part] = setProp(dst2[part] || {}, path12, value2);
         } else {
           var prevValue = dst2[part];
           if (prevValue && ifNotSet)
@@ -21937,12 +21942,12 @@ var require_util = __commonJS({
       __name(setProp, "setProp");
       if (typeof dst !== "object")
         throw TypeError("dst must be an object");
-      if (!path8)
+      if (!path11)
         throw TypeError("path must be specified");
-      path8 = path8.split(".");
-      if (path8.length > util.recursionLimit)
+      path11 = path11.split(".");
+      if (path11.length > util.recursionLimit)
         throw Error("max depth exceeded");
-      return setProp(dst, path8, value);
+      return setProp(dst, path11, value);
     }, "setProperty");
     Object.defineProperty(util, "decorateRoot", {
       get: /* @__PURE__ */ __name(function() {
@@ -22497,12 +22502,12 @@ var require_object = __commonJS({
        */
       fullName: {
         get: /* @__PURE__ */ __name(function() {
-          var path8 = [this.name], ptr = this.parent;
+          var path11 = [this.name], ptr = this.parent;
           while (ptr) {
-            path8.unshift(ptr.name);
+            path11.unshift(ptr.name);
             ptr = ptr.parent;
           }
-          return path8.join(".");
+          return path11.join(".");
         }, "get")
       }
     });
@@ -26606,19 +26611,19 @@ var require_util2 = __commonJS({
     init_esbuild_shims();
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.addCommonProtos = exports.loadProtosWithOptionsSync = exports.loadProtosWithOptions = void 0;
-    var fs8 = __require("fs");
-    var path8 = __require("path");
+    var fs9 = __require("fs");
+    var path11 = __require("path");
     var Protobuf = require_protobufjs();
     function addIncludePathResolver(root, includePaths) {
       const originalResolvePath = root.resolvePath;
       root.resolvePath = (origin, target) => {
-        if (path8.isAbsolute(target)) {
+        if (path11.isAbsolute(target)) {
           return target;
         }
         for (const directory of includePaths) {
-          const fullPath = path8.join(directory, target);
+          const fullPath = path11.join(directory, target);
           try {
-            fs8.accessSync(fullPath, fs8.constants.R_OK);
+            fs9.accessSync(fullPath, fs9.constants.R_OK);
             return fullPath;
           } catch (err) {
             continue;
@@ -31818,9 +31823,9 @@ var require_server_call = __commonJS({
       static {
         __name(this, "ServerUnaryCallImpl");
       }
-      constructor(path8, call, metadata, request4) {
+      constructor(path11, call, metadata, request4) {
         super();
-        this.path = path8;
+        this.path = path11;
         this.call = call;
         this.metadata = metadata;
         this.request = request4;
@@ -31847,9 +31852,9 @@ var require_server_call = __commonJS({
       static {
         __name(this, "ServerReadableStreamImpl");
       }
-      constructor(path8, call, metadata) {
+      constructor(path11, call, metadata) {
         super({ objectMode: true });
-        this.path = path8;
+        this.path = path11;
         this.call = call;
         this.metadata = metadata;
         this.cancelled = false;
@@ -31878,9 +31883,9 @@ var require_server_call = __commonJS({
       static {
         __name(this, "ServerWritableStreamImpl");
       }
-      constructor(path8, call, metadata, request4) {
+      constructor(path11, call, metadata, request4) {
         super({ objectMode: true });
-        this.path = path8;
+        this.path = path11;
         this.call = call;
         this.metadata = metadata;
         this.request = request4;
@@ -31931,9 +31936,9 @@ var require_server_call = __commonJS({
       static {
         __name(this, "ServerDuplexStreamImpl");
       }
-      constructor(path8, call, metadata) {
+      constructor(path11, call, metadata) {
         super({ objectMode: true });
-        this.path = path8;
+        this.path = path11;
         this.call = call;
         this.metadata = metadata;
         this.pendingStatus = {
@@ -33851,11 +33856,11 @@ var require_server = __commonJS({
           }
           return true;
         }
-        _retrieveHandler(path8) {
-          serverCallTrace("Received call to method " + path8 + " at address " + this.serverAddressString);
-          const handler = this.handlers.get(path8);
+        _retrieveHandler(path11) {
+          serverCallTrace("Received call to method " + path11 + " at address " + this.serverAddressString);
+          const handler = this.handlers.get(path11);
           if (handler === void 0) {
-            serverCallTrace("No handler registered for method " + path8 + ". Sending UNIMPLEMENTED status.");
+            serverCallTrace("No handler registered for method " + path11 + ". Sending UNIMPLEMENTED status.");
             return null;
           }
           return handler;
@@ -33877,10 +33882,10 @@ var require_server = __commonJS({
             channelzSessionInfo === null || channelzSessionInfo === void 0 ? void 0 : channelzSessionInfo.streamTracker.addCallFailed();
             return;
           }
-          const path8 = headers[HTTP2_HEADER_PATH];
-          const handler = this._retrieveHandler(path8);
+          const path11 = headers[HTTP2_HEADER_PATH];
+          const handler = this._retrieveHandler(path11);
           if (!handler) {
-            this._respondWithError(getUnimplementedStatusResponse(path8), stream, channelzSessionInfo);
+            this._respondWithError(getUnimplementedStatusResponse(path11), stream, channelzSessionInfo);
             return;
           }
           const callEventTracker = {
@@ -33928,10 +33933,10 @@ var require_server = __commonJS({
           if (this._verifyContentType(stream, headers) !== true) {
             return;
           }
-          const path8 = headers[HTTP2_HEADER_PATH];
-          const handler = this._retrieveHandler(path8);
+          const path11 = headers[HTTP2_HEADER_PATH];
+          const handler = this._retrieveHandler(path11);
           if (!handler) {
-            this._respondWithError(getUnimplementedStatusResponse(path8), stream, null);
+            this._respondWithError(getUnimplementedStatusResponse(path11), stream, null);
             return;
           }
           const call = (0, server_interceptors_1.getServerInterceptingCall)([...extraInterceptors, ...this.interceptors], stream, headers, null, handler, this.options);
@@ -35006,7 +35011,7 @@ var require_certificate_provider = __commonJS({
     init_esbuild_shims();
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FileWatcherCertificateProvider = void 0;
-    var fs8 = __require("fs");
+    var fs9 = __require("fs");
     var logging = require_logging();
     var constants_1 = require_constants2();
     var util_1 = __require("util");
@@ -35015,7 +35020,7 @@ var require_certificate_provider = __commonJS({
       logging.trace(constants_1.LogVerbosity.DEBUG, TRACER_NAME, text);
     }
     __name(trace2, "trace");
-    var readFilePromise = (0, util_1.promisify)(fs8.readFile);
+    var readFilePromise = (0, util_1.promisify)(fs9.readFile);
     var FileWatcherCertificateProvider = class {
       static {
         __name(this, "FileWatcherCertificateProvider");
@@ -35267,13 +35272,13 @@ var require_resolver_uds = __commonJS({
         this.listener = listener;
         this.hasReturnedResult = false;
         this.endpoints = [];
-        let path8;
+        let path11;
         if (target.authority === "") {
-          path8 = "/" + target.path;
+          path11 = "/" + target.path;
         } else {
-          path8 = target.path;
+          path11 = target.path;
         }
-        this.endpoints = [{ addresses: [{ path: path8 }] }];
+        this.endpoints = [{ addresses: [{ path: path11 }] }];
       }
       updateResolution() {
         if (!this.hasReturnedResult) {
@@ -35337,12 +35342,12 @@ var require_resolver_ip = __commonJS({
           return;
         }
         const pathList = target.path.split(",");
-        for (const path8 of pathList) {
-          const hostPort = (0, uri_parser_1.splitHostPort)(path8);
+        for (const path11 of pathList) {
+          const hostPort = (0, uri_parser_1.splitHostPort)(path11);
           if (hostPort === null) {
             this.error = {
               code: constants_1.Status.UNAVAILABLE,
-              details: `Failed to parse ${target.scheme} address ${path8}`,
+              details: `Failed to parse ${target.scheme} address ${path11}`,
               metadata: new metadata_1.Metadata()
             };
             return;
@@ -35350,7 +35355,7 @@ var require_resolver_ip = __commonJS({
           if (target.scheme === IPV4_SCHEME && !(0, net_1.isIPv4)(hostPort.host) || target.scheme === IPV6_SCHEME && !(0, net_1.isIPv6)(hostPort.host)) {
             this.error = {
               code: constants_1.Status.UNAVAILABLE,
-              details: `Failed to parse ${target.scheme} address ${path8}`,
+              details: `Failed to parse ${target.scheme} address ${path11}`,
               metadata: new metadata_1.Metadata()
             };
             return;
@@ -36258,10 +36263,10 @@ var require_create_service_client_constructor = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createServiceClientConstructor = void 0;
     var grpc = require_src6();
-    function createServiceClientConstructor(path8, name) {
+    function createServiceClientConstructor(path11, name) {
       const serviceDefinition = {
         export: {
-          path: path8,
+          path: path11,
           requestStream: false,
           responseStream: false,
           requestSerialize: /* @__PURE__ */ __name((arg) => {
@@ -36891,7 +36896,7 @@ function appendRootPathToUrlIfNeeded(url) {
     return void 0;
   }
 }
-function appendResourcePathToUrl(url, path8) {
+function appendResourcePathToUrl(url, path11) {
   try {
     new URL(url);
   } catch {
@@ -36901,11 +36906,11 @@ function appendResourcePathToUrl(url, path8) {
   if (!url.endsWith("/")) {
     url = url + "/";
   }
-  url += path8;
+  url += path11;
   try {
     new URL(url);
   } catch {
-    diag.warn(`Configuration: Provided URL appended with '${path8}' is not a valid URL, using 'undefined' instead of '${url}'`);
+    diag.warn(`Configuration: Provided URL appended with '${path11}' is not a valid URL, using 'undefined' instead of '${url}'`);
     return void 0;
   }
   return url;
@@ -37014,8 +37019,8 @@ var require_otlp_grpc_env_configuration = __commonJS({
     var core_1 = require_src3();
     var grpc_exporter_transport_1 = require_grpc_exporter_transport();
     var node_http_1 = (init_index_node_http(), __toCommonJS(index_node_http_exports));
-    var fs8 = __require("fs");
-    var path8 = __require("path");
+    var fs9 = __require("fs");
+    var path11 = __require("path");
     var api_1 = (init_esm(), __toCommonJS(esm_exports));
     function fallbackIfNullishOrBlank(signalSpecific, nonSignalSpecific) {
       if (signalSpecific != null && signalSpecific !== "") {
@@ -37069,7 +37074,7 @@ var require_otlp_grpc_env_configuration = __commonJS({
       const filePath = fallbackIfNullishOrBlank(signalSpecificPath, nonSignalSpecificPath);
       if (filePath != null) {
         try {
-          return fs8.readFileSync(path8.resolve(process.cwd(), filePath));
+          return fs9.readFileSync(path11.resolve(process.cwd(), filePath));
         } catch {
           api_1.diag.warn(warningMessage);
           return void 0;
@@ -54609,19 +54614,19 @@ var require_module_details_from_path = __commonJS({
           basedir += segments[i] + sep;
         }
       }
-      var path8 = "";
+      var path11 = "";
       var lastSegmentIndex = segments.length - 1;
       for (var i2 = index + offset; i2 <= lastSegmentIndex; i2++) {
         if (i2 === lastSegmentIndex) {
-          path8 += segments[i2];
+          path11 += segments[i2];
         } else {
-          path8 += segments[i2] + sep;
+          path11 += segments[i2] + sep;
         }
       }
       return {
         name,
         basedir,
-        path: path8
+        path: path11
       };
     };
   }
@@ -54733,8 +54738,8 @@ var require_path_parse = __commonJS({
 var require_node_modules_paths = __commonJS({
   "node_modules/resolve/lib/node-modules-paths.js"(exports, module) {
     init_esbuild_shims();
-    var path8 = __require("path");
-    var parse = path8.parse || require_path_parse();
+    var path11 = __require("path");
+    var parse = path11.parse || require_path_parse();
     var getNodeModulesDirs = /* @__PURE__ */ __name(function getNodeModulesDirs2(absoluteStart, modules) {
       var prefix = "/";
       if (/^([A-Za-z]:)/.test(absoluteStart)) {
@@ -54750,7 +54755,7 @@ var require_node_modules_paths = __commonJS({
       }
       return paths.reduce(function(dirs, aPath) {
         return dirs.concat(modules.map(function(moduleDir) {
-          return path8.resolve(prefix, aPath, moduleDir);
+          return path11.resolve(prefix, aPath, moduleDir);
         }));
       }, []);
     }, "getNodeModulesDirs");
@@ -55021,23 +55026,23 @@ var require_is_core_module = __commonJS({
 var require_async = __commonJS({
   "node_modules/resolve/lib/async.js"(exports, module) {
     init_esbuild_shims();
-    var fs8 = __require("fs");
+    var fs9 = __require("fs");
     var getHomedir = require_homedir();
-    var path8 = __require("path");
+    var path11 = __require("path");
     var caller = require_caller();
     var nodeModulesPaths = require_node_modules_paths();
     var normalizeOptions = require_normalize_options();
     var isCore = require_is_core_module();
-    var realpathFS = process.platform !== "win32" && fs8.realpath && typeof fs8.realpath.native === "function" ? fs8.realpath.native : fs8.realpath;
+    var realpathFS = process.platform !== "win32" && fs9.realpath && typeof fs9.realpath.native === "function" ? fs9.realpath.native : fs9.realpath;
     var homedir3 = getHomedir();
     var defaultPaths = /* @__PURE__ */ __name(function() {
       return [
-        path8.join(homedir3, ".node_modules"),
-        path8.join(homedir3, ".node_libraries")
+        path11.join(homedir3, ".node_modules"),
+        path11.join(homedir3, ".node_libraries")
       ];
     }, "defaultPaths");
     var defaultIsFile = /* @__PURE__ */ __name(function isFile(file, cb) {
-      fs8.stat(file, function(err, stat) {
+      fs9.stat(file, function(err, stat) {
         if (!err) {
           return cb(null, stat.isFile() || stat.isFIFO());
         }
@@ -55046,7 +55051,7 @@ var require_async = __commonJS({
       });
     }, "isFile");
     var defaultIsDir = /* @__PURE__ */ __name(function isDirectory(dir, cb) {
-      fs8.stat(dir, function(err, stat) {
+      fs9.stat(dir, function(err, stat) {
         if (!err) {
           return cb(null, stat.isDirectory());
         }
@@ -55083,7 +55088,7 @@ var require_async = __commonJS({
     var getPackageCandidates = /* @__PURE__ */ __name(function getPackageCandidates2(x, start, opts) {
       var dirs = nodeModulesPaths(start, opts, x);
       for (var i = 0; i < dirs.length; i++) {
-        dirs[i] = path8.join(dirs[i], x);
+        dirs[i] = path11.join(dirs[i], x);
       }
       return dirs;
     }, "getPackageCandidates");
@@ -55103,7 +55108,7 @@ var require_async = __commonJS({
       opts = normalizeOptions(x, opts);
       var isFile = opts.isFile || defaultIsFile;
       var isDirectory = opts.isDirectory || defaultIsDir;
-      var readFile = opts.readFile || fs8.readFile;
+      var readFile = opts.readFile || fs9.readFile;
       var realpath = opts.realpath || defaultRealpath;
       var readPackage = opts.readPackage || defaultReadPackage;
       if (opts.readFile && opts.readPackage) {
@@ -55115,10 +55120,10 @@ var require_async = __commonJS({
       var packageIterator = opts.packageIterator;
       var extensions = opts.extensions || [".js"];
       var includeCoreModules = opts.includeCoreModules !== false;
-      var basedir = opts.basedir || path8.dirname(caller());
+      var basedir = opts.basedir || path11.dirname(caller());
       var parent = opts.filename || basedir;
       opts.paths = opts.paths || defaultPaths();
-      var absoluteStart = path8.resolve(basedir);
+      var absoluteStart = path11.resolve(basedir);
       maybeRealpath(
         realpath,
         absoluteStart,
@@ -55131,7 +55136,7 @@ var require_async = __commonJS({
       var res;
       function init(basedir2) {
         if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
-          res = path8.resolve(basedir2, x);
+          res = path11.resolve(basedir2, x);
           if (x === "." || x === ".." || x.slice(-1) === "/") res += "/";
           if (/\/$/.test(x) && res === basedir2) {
             loadAsDirectory(res, opts.package, onfile);
@@ -55191,17 +55196,17 @@ var require_async = __commonJS({
           var file = x3 + exts2[0];
           var pkg = loadPackage;
           if (pkg) onpkg(null, pkg);
-          else loadpkg(path8.dirname(file), onpkg);
+          else loadpkg(path11.dirname(file), onpkg);
           function onpkg(err2, pkg_, dir) {
             pkg = pkg_;
             if (err2) return cb2(err2);
             if (dir && pkg && opts.pathFilter) {
-              var rfile = path8.relative(dir, file);
+              var rfile = path11.relative(dir, file);
               var rel = rfile.slice(0, rfile.length - exts2[0].length);
               var r = opts.pathFilter(pkg, x3, rel);
               if (r) return load(
                 [""].concat(extensions.slice()),
-                path8.resolve(dir, r),
+                path11.resolve(dir, r),
                 pkg
               );
             }
@@ -55225,10 +55230,10 @@ var require_async = __commonJS({
         }
         if (/[/\\]node_modules[/\\]*$/.test(dir)) return cb2(null);
         maybeRealpath(realpath, dir, opts, function(unwrapErr, pkgdir) {
-          if (unwrapErr) return loadpkg(path8.dirname(dir), cb2);
-          var pkgfile = path8.join(pkgdir, "package.json");
+          if (unwrapErr) return loadpkg(path11.dirname(dir), cb2);
+          var pkgfile = path11.join(pkgdir, "package.json");
           isFile(pkgfile, function(err2, ex) {
-            if (!ex) return loadpkg(path8.dirname(dir), cb2);
+            if (!ex) return loadpkg(path11.dirname(dir), cb2);
             readPackage(readFile, pkgfile, function(err3, pkgParam) {
               if (err3) cb2(err3);
               var pkg = pkgParam;
@@ -55250,10 +55255,10 @@ var require_async = __commonJS({
         }
         maybeRealpath(realpath, x2, opts, function(unwrapErr, pkgdir) {
           if (unwrapErr) return cb2(unwrapErr);
-          var pkgfile = path8.join(pkgdir, "package.json");
+          var pkgfile = path11.join(pkgdir, "package.json");
           isFile(pkgfile, function(err2, ex) {
             if (err2) return cb2(err2);
-            if (!ex) return loadAsFile(path8.join(x2, "index"), fpkg, cb2);
+            if (!ex) return loadAsFile(path11.join(x2, "index"), fpkg, cb2);
             readPackage(readFile, pkgfile, function(err3, pkgParam) {
               if (err3) return cb2(err3);
               var pkg = pkgParam;
@@ -55269,20 +55274,20 @@ var require_async = __commonJS({
                 if (pkg.main === "." || pkg.main === "./") {
                   pkg.main = "index";
                 }
-                loadAsFile(path8.resolve(x2, pkg.main), pkg, function(err4, m, pkg2) {
+                loadAsFile(path11.resolve(x2, pkg.main), pkg, function(err4, m, pkg2) {
                   if (err4) return cb2(err4);
                   if (m) return cb2(null, m, pkg2);
-                  if (!pkg2) return loadAsFile(path8.join(x2, "index"), pkg2, cb2);
-                  var dir = path8.resolve(x2, pkg2.main);
+                  if (!pkg2) return loadAsFile(path11.join(x2, "index"), pkg2, cb2);
+                  var dir = path11.resolve(x2, pkg2.main);
                   loadAsDirectory(dir, pkg2, function(err5, n, pkg3) {
                     if (err5) return cb2(err5);
                     if (n) return cb2(null, n, pkg3);
-                    loadAsFile(path8.join(x2, "index"), pkg3, cb2);
+                    loadAsFile(path11.join(x2, "index"), pkg3, cb2);
                   });
                 });
                 return;
               }
-              loadAsFile(path8.join(x2, "/index"), pkg, cb2);
+              loadAsFile(path11.join(x2, "/index"), pkg, cb2);
             });
           });
         });
@@ -55291,7 +55296,7 @@ var require_async = __commonJS({
       function processDirs(cb2, dirs) {
         if (dirs.length === 0) return cb2(null, void 0);
         var dir = dirs[0];
-        isDirectory(path8.dirname(dir), isdir);
+        isDirectory(path11.dirname(dir), isdir);
         function isdir(err2, isdir2) {
           if (err2) return cb2(err2);
           if (!isdir2) return processDirs(cb2, dirs.slice(1));
@@ -55528,23 +55533,23 @@ var require_sync = __commonJS({
   "node_modules/resolve/lib/sync.js"(exports, module) {
     init_esbuild_shims();
     var isCore = require_is_core_module();
-    var fs8 = __require("fs");
-    var path8 = __require("path");
+    var fs9 = __require("fs");
+    var path11 = __require("path");
     var getHomedir = require_homedir();
     var caller = require_caller();
     var nodeModulesPaths = require_node_modules_paths();
     var normalizeOptions = require_normalize_options();
-    var realpathFS = process.platform !== "win32" && fs8.realpathSync && typeof fs8.realpathSync.native === "function" ? fs8.realpathSync.native : fs8.realpathSync;
+    var realpathFS = process.platform !== "win32" && fs9.realpathSync && typeof fs9.realpathSync.native === "function" ? fs9.realpathSync.native : fs9.realpathSync;
     var homedir3 = getHomedir();
     var defaultPaths = /* @__PURE__ */ __name(function() {
       return [
-        path8.join(homedir3, ".node_modules"),
-        path8.join(homedir3, ".node_libraries")
+        path11.join(homedir3, ".node_modules"),
+        path11.join(homedir3, ".node_libraries")
       ];
     }, "defaultPaths");
     var defaultIsFile = /* @__PURE__ */ __name(function isFile(file) {
       try {
-        var stat = fs8.statSync(file, { throwIfNoEntry: false });
+        var stat = fs9.statSync(file, { throwIfNoEntry: false });
       } catch (e) {
         if (e && (e.code === "ENOENT" || e.code === "ENOTDIR")) return false;
         throw e;
@@ -55553,7 +55558,7 @@ var require_sync = __commonJS({
     }, "isFile");
     var defaultIsDir = /* @__PURE__ */ __name(function isDirectory(dir) {
       try {
-        var stat = fs8.statSync(dir, { throwIfNoEntry: false });
+        var stat = fs9.statSync(dir, { throwIfNoEntry: false });
       } catch (e) {
         if (e && (e.code === "ENOENT" || e.code === "ENOTDIR")) return false;
         throw e;
@@ -55587,7 +55592,7 @@ var require_sync = __commonJS({
     var getPackageCandidates = /* @__PURE__ */ __name(function getPackageCandidates2(x, start, opts) {
       var dirs = nodeModulesPaths(start, opts, x);
       for (var i = 0; i < dirs.length; i++) {
-        dirs[i] = path8.join(dirs[i], x);
+        dirs[i] = path11.join(dirs[i], x);
       }
       return dirs;
     }, "getPackageCandidates");
@@ -55597,7 +55602,7 @@ var require_sync = __commonJS({
       }
       var opts = normalizeOptions(x, options);
       var isFile = opts.isFile || defaultIsFile;
-      var readFileSync = opts.readFileSync || fs8.readFileSync;
+      var readFileSync = opts.readFileSync || fs9.readFileSync;
       var isDirectory = opts.isDirectory || defaultIsDir;
       var realpathSync = opts.realpathSync || defaultRealpathSync;
       var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
@@ -55607,12 +55612,12 @@ var require_sync = __commonJS({
       var packageIterator = opts.packageIterator;
       var extensions = opts.extensions || [".js"];
       var includeCoreModules = opts.includeCoreModules !== false;
-      var basedir = opts.basedir || path8.dirname(caller());
+      var basedir = opts.basedir || path11.dirname(caller());
       var parent = opts.filename || basedir;
       opts.paths = opts.paths || defaultPaths();
-      var absoluteStart = maybeRealpathSync(realpathSync, path8.resolve(basedir), opts);
+      var absoluteStart = maybeRealpathSync(realpathSync, path11.resolve(basedir), opts);
       if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
-        var res = path8.resolve(absoluteStart, x);
+        var res = path11.resolve(absoluteStart, x);
         if (x === "." || x === ".." || x.slice(-1) === "/") res += "/";
         var m = loadAsFileSync(res) || loadAsDirectorySync(res);
         if (m) return maybeRealpathSync(realpathSync, m, opts);
@@ -55626,12 +55631,12 @@ var require_sync = __commonJS({
       err.code = "MODULE_NOT_FOUND";
       throw err;
       function loadAsFileSync(x2) {
-        var pkg = loadpkg(path8.dirname(x2));
+        var pkg = loadpkg(path11.dirname(x2));
         if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
-          var rfile = path8.relative(pkg.dir, x2);
+          var rfile = path11.relative(pkg.dir, x2);
           var r = opts.pathFilter(pkg.pkg, x2, rfile);
           if (r) {
-            x2 = path8.resolve(pkg.dir, r);
+            x2 = path11.resolve(pkg.dir, r);
           }
         }
         if (isFile(x2)) {
@@ -55651,9 +55656,9 @@ var require_sync = __commonJS({
           return;
         }
         if (/[/\\]node_modules[/\\]*$/.test(dir)) return;
-        var pkgfile = path8.join(maybeRealpathSync(realpathSync, dir, opts), "package.json");
+        var pkgfile = path11.join(maybeRealpathSync(realpathSync, dir, opts), "package.json");
         if (!isFile(pkgfile)) {
-          return loadpkg(path8.dirname(dir));
+          return loadpkg(path11.dirname(dir));
         }
         var pkg = readPackageSync(readFileSync, pkgfile);
         if (pkg && opts.packageFilter) {
@@ -55667,7 +55672,7 @@ var require_sync = __commonJS({
       }
       __name(loadpkg, "loadpkg");
       function loadAsDirectorySync(x2) {
-        var pkgfile = path8.join(maybeRealpathSync(realpathSync, x2, opts), "/package.json");
+        var pkgfile = path11.join(maybeRealpathSync(realpathSync, x2, opts), "/package.json");
         if (isFile(pkgfile)) {
           try {
             var pkg = readPackageSync(readFileSync, pkgfile);
@@ -55690,15 +55695,15 @@ var require_sync = __commonJS({
               pkg.main = "index";
             }
             try {
-              var m2 = loadAsFileSync(path8.resolve(x2, pkg.main));
+              var m2 = loadAsFileSync(path11.resolve(x2, pkg.main));
               if (m2) return m2;
-              var n2 = loadAsDirectorySync(path8.resolve(x2, pkg.main));
+              var n2 = loadAsDirectorySync(path11.resolve(x2, pkg.main));
               if (n2) return n2;
             } catch (e) {
             }
           }
         }
-        return loadAsFileSync(path8.join(x2, "/index"));
+        return loadAsFileSync(path11.join(x2, "/index"));
       }
       __name(loadAsDirectorySync, "loadAsDirectorySync");
       function loadNodeModulesSync(x2, start) {
@@ -55708,7 +55713,7 @@ var require_sync = __commonJS({
         var dirs = packageIterator ? packageIterator(x2, start, thunk, opts) : thunk();
         for (var i = 0; i < dirs.length; i++) {
           var dir = dirs[i];
-          if (isDirectory(path8.dirname(dir))) {
+          if (isDirectory(path11.dirname(dir))) {
             var m2 = loadAsFileSync(dir);
             if (m2) return m2;
             var n2 = loadAsDirectorySync(dir);
@@ -55802,7 +55807,7 @@ var require_require_in_the_middle = __commonJS({
   "node_modules/require-in-the-middle/index.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var path8 = __require("path");
+    var path11 = __require("path");
     var Module = __require("module");
     var debug = require_src()("require-in-the-middle");
     var moduleDetailsFromPath = require_module_details_from_path();
@@ -55980,7 +55985,7 @@ var require_require_in_the_middle = __commonJS({
           }
           moduleName = filename;
         } else if (hasWhitelist === true && modules.includes(filename)) {
-          const parsedPath = path8.parse(filename);
+          const parsedPath = path11.parse(filename);
           moduleName = parsedPath.name;
           basedir = parsedPath.dir;
         } else {
@@ -56018,7 +56023,7 @@ var require_require_in_the_middle = __commonJS({
             }
             if (res !== filename) {
               if (internals === true) {
-                moduleName = moduleName + path8.sep + path8.relative(basedir, filename);
+                moduleName = moduleName + path11.sep + path11.relative(basedir, filename);
                 debug("preparing to process require of internal file: %s", moduleName);
               } else {
                 debug("ignoring require of non-main module file: %s", res);
@@ -56056,8 +56061,8 @@ var require_require_in_the_middle = __commonJS({
       }
     };
     function resolveModuleName(stat) {
-      const normalizedPath = path8.sep !== "/" ? stat.path.split(path8.sep).join("/") : stat.path;
-      return path8.posix.join(stat.name, normalizedPath).replace(normalize3, "");
+      const normalizedPath = path11.sep !== "/" ? stat.path.split(path11.sep).join("/") : stat.path;
+      return path11.posix.join(stat.name, normalizedPath).replace(normalize3, "");
     }
     __name(resolveModuleName, "resolveModuleName");
   }
@@ -56151,7 +56156,7 @@ var require_RequireInTheMiddleSingleton = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.RequireInTheMiddleSingleton = void 0;
     var require_in_the_middle_1 = require_require_in_the_middle();
-    var path8 = __require("path");
+    var path11 = __require("path");
     var ModuleNameTrie_1 = require_ModuleNameTrie();
     var isMocha = [
       "afterEach",
@@ -56218,7 +56223,7 @@ var require_RequireInTheMiddleSingleton = __commonJS({
     };
     exports.RequireInTheMiddleSingleton = RequireInTheMiddleSingleton;
     function normalizePathSeparators(moduleNameOrPath) {
-      return path8.sep !== ModuleNameTrie_1.ModuleNameSeparator ? moduleNameOrPath.split(path8.sep).join(ModuleNameTrie_1.ModuleNameSeparator) : moduleNameOrPath;
+      return path11.sep !== ModuleNameTrie_1.ModuleNameSeparator ? moduleNameOrPath.split(path11.sep).join(ModuleNameTrie_1.ModuleNameSeparator) : moduleNameOrPath;
     }
     __name(normalizePathSeparators, "normalizePathSeparators");
   }
@@ -56284,7 +56289,7 @@ var require_register = __commonJS({
 var require_import_in_the_middle = __commonJS({
   "node_modules/import-in-the-middle/index.js"(exports, module) {
     init_esbuild_shims();
-    var path8 = __require("path");
+    var path11 = __require("path");
     var parse = require_module_details_from_path();
     var { fileURLToPath } = __require("url");
     var { MessageChannel } = __require("worker_threads");
@@ -56385,7 +56390,7 @@ var require_import_in_the_middle = __commonJS({
             if (moduleName === name) {
               if (baseDir) {
                 if (internals) {
-                  name = name + path8.sep + path8.relative(baseDir, fileURLToPath(filename));
+                  name = name + path11.sep + path11.relative(baseDir, fileURLToPath(filename));
                 } else {
                   if (!getExperimentalPatchInternals() && !baseDir.endsWith(specifiers.get(filename))) continue;
                 }
@@ -56467,7 +56472,7 @@ var require_instrumentation2 = __commonJS({
     init_esbuild_shims();
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.InstrumentationBase = void 0;
-    var path8 = __require("path");
+    var path11 = __require("path");
     var util_1 = __require("util");
     var semver_1 = require_semver();
     var shimmer_1 = require_shimmer();
@@ -56568,7 +56573,7 @@ var require_instrumentation2 = __commonJS({
       }
       _extractPackageVersion(baseDir) {
         try {
-          const json = (0, fs_1.readFileSync)(path8.join(baseDir, "package.json"), {
+          const json = (0, fs_1.readFileSync)(path11.join(baseDir, "package.json"), {
             encoding: "utf8"
           });
           const version = JSON.parse(json).version;
@@ -56610,7 +56615,7 @@ var require_instrumentation2 = __commonJS({
           return exports2;
         }
         const files = module2.files ?? [];
-        const normalizedName = path8.normalize(name);
+        const normalizedName = path11.normalize(name);
         const supportedFileInstrumentations = files.filter((f) => f.name === normalizedName).filter((f) => isSupported(f.supportedVersions, version, module2.includePrerelease));
         return supportedFileInstrumentations.reduce((patchedExports, file) => {
           file.moduleExports = patchedExports;
@@ -56656,8 +56661,8 @@ var require_instrumentation2 = __commonJS({
         this._warnOnPreloadedModules();
         for (const module2 of this._modules) {
           const hookFn = /* @__PURE__ */ __name((exports2, name, baseDir) => {
-            if (!baseDir && path8.isAbsolute(name)) {
-              const parsedPath = path8.parse(name);
+            if (!baseDir && path11.isAbsolute(name)) {
+              const parsedPath = path11.parse(name);
               name = parsedPath.name;
               baseDir = parsedPath.dir;
             }
@@ -56666,7 +56671,7 @@ var require_instrumentation2 = __commonJS({
           const onRequire = /* @__PURE__ */ __name((exports2, name, baseDir) => {
             return this._onRequire(module2, exports2, name, baseDir);
           }, "onRequire");
-          const hook = path8.isAbsolute(module2.name) ? new require_in_the_middle_1.Hook([module2.name], { internals: true }, onRequire) : this._requireInTheMiddleSingleton.register(module2.name, onRequire);
+          const hook = path11.isAbsolute(module2.name) ? new require_in_the_middle_1.Hook([module2.name], { internals: true }, onRequire) : this._requireInTheMiddleSingleton.register(module2.name, onRequire);
           this._hooks.push(hook);
           const esmHook = new import_in_the_middle_1.Hook([module2.name], { internals: false }, hookFn);
           this._hooks.push(esmHook);
@@ -59029,12 +59034,12 @@ var require_utils10 = __commonJS({
       const reqUrlObject = requestUrl || {};
       const protocol = reqUrlObject.protocol || fallbackProtocol;
       const port = (reqUrlObject.port || "").toString();
-      const path8 = reqUrlObject.path || "/";
+      const path11 = reqUrlObject.path || "/";
       let host = reqUrlObject.host || reqUrlObject.hostname || headers.host || "localhost";
       if (host.indexOf(":") === -1 && port && port !== "80" && port !== "443") {
         host += `:${port}`;
       }
-      return `${protocol}//${host}${path8}`;
+      return `${protocol}//${host}${path11}`;
     }, "getAbsoluteUrl");
     exports.getAbsoluteUrl = getAbsoluteUrl;
     var parseResponseStatus = /* @__PURE__ */ __name((kind, statusCode) => {
@@ -60693,8 +60698,8 @@ var require_src31 = __commonJS({
 // packages/core/src/tools/read-file.ts
 init_esbuild_shims();
 import os4 from "node:os";
-import path7 from "node:path";
-import fs7 from "node:fs/promises";
+import path10 from "node:path";
+import fs8 from "node:fs/promises";
 
 // packages/core/src/utils/fileUtils.ts
 init_esbuild_shims();
@@ -61124,12 +61129,12 @@ var Mime = class {
     }
     return this;
   }
-  getType(path8) {
-    if (typeof path8 !== "string")
+  getType(path11) {
+    if (typeof path11 !== "string")
       return null;
-    const last = path8.replace(/^.*[/\\]/s, "").toLowerCase();
+    const last = path11.replace(/^.*[/\\]/s, "").toLowerCase();
     const ext = last.replace(/^.*\./s, "").toLowerCase();
-    const hasPath = last.length < path8.length;
+    const hasPath = last.length < path11.length;
     const hasDot = ext.length < last.length - 1;
     if (!hasDot && hasPath)
       return null;
@@ -61391,7 +61396,6 @@ var BINARY_EXTENSIONS = [
     ...PYTHON_EXCLUDES
   ]),
   // Additional binary extensions not in the main patterns
-  ".dat",
   ".obj",
   ".o",
   ".a",
@@ -63646,7 +63650,7 @@ import { Buffer as Buffer2 } from "buffer";
 import * as https2 from "https";
 import * as os3 from "node:os";
 import fs6 from "node:fs";
-import path6 from "node:path";
+import path7 from "node:path";
 
 // packages/core/src/telemetry/sanitize.ts
 init_esbuild_shims();
@@ -63913,18 +63917,16 @@ async function persistAndTruncateToolResult(callId, toolName, content, config) {
       `Session tool result budget exhausted (${budgetUsed} + ${byteSize} > ${MAX_SESSION_BYTES}), skipping disk persistence`
     );
     return {
-      content: buildStub(
-        content,
-        byteSize,
-        "(session disk budget exhausted)"
-      ),
+      content: buildStub(content, byteSize, "(session disk budget exhausted)"),
       bytesWritten: 0
     };
   }
   config.trackToolResultBytes(byteSize);
   const safeCallId = path4.basename(callId).replace(/\x00/g, "_");
   if (!safeCallId || safeCallId === "." || safeCallId === "..") {
-    debugLogger3.warn(`Invalid callId for disk persistence: ${JSON.stringify(callId)}`);
+    debugLogger3.warn(
+      `Invalid callId for disk persistence: ${JSON.stringify(callId)}`
+    );
     config.trackToolResultBytes(-byteSize);
     return {
       content: buildStub(content, byteSize, "(invalid callId)"),
@@ -63948,10 +63950,7 @@ async function persistAndTruncateToolResult(callId, toolName, content, config) {
     };
   } catch (error) {
     config.trackToolResultBytes(-byteSize);
-    debugLogger3.warn(
-      `Failed to persist tool result to ${outputFile}:`,
-      error
-    );
+    debugLogger3.warn(`Failed to persist tool result to ${outputFile}:`, error);
     try {
       const fallback = await truncateAndSaveToFile(
         content,
@@ -63992,8 +63991,65 @@ ${preview}`;
 }
 __name(buildStub, "buildStub");
 
+// packages/core/src/tools/mcp-status.ts
+init_esbuild_shims();
+var MCPServerStatus = /* @__PURE__ */ ((MCPServerStatus2) => {
+  MCPServerStatus2["DISCONNECTED"] = "disconnected";
+  MCPServerStatus2["CONNECTING"] = "connecting";
+  MCPServerStatus2["CONNECTED"] = "connected";
+  return MCPServerStatus2;
+})(MCPServerStatus || {});
+var serverStatuses = /* @__PURE__ */ new Map();
+var statusChangeListeners = [];
+function addMCPStatusChangeListener(listener) {
+  statusChangeListeners.push(listener);
+}
+__name(addMCPStatusChangeListener, "addMCPStatusChangeListener");
+function removeMCPStatusChangeListener(listener) {
+  const index = statusChangeListeners.indexOf(listener);
+  if (index !== -1) {
+    statusChangeListeners.splice(index, 1);
+  }
+}
+__name(removeMCPStatusChangeListener, "removeMCPStatusChangeListener");
+function updateMCPServerStatus(serverName, status) {
+  serverStatuses.set(serverName, status);
+  for (const listener of [...statusChangeListeners]) {
+    listener(serverName, status);
+  }
+}
+__name(updateMCPServerStatus, "updateMCPServerStatus");
+function removeMCPServerStatus(serverName) {
+  if (!serverStatuses.has(serverName)) {
+    return;
+  }
+  serverStatuses.delete(serverName);
+  for (const listener of [...statusChangeListeners]) {
+    listener(serverName, void 0);
+  }
+}
+__name(removeMCPServerStatus, "removeMCPServerStatus");
+function getMCPServerStatus(serverName) {
+  return serverStatuses.get(serverName) || "disconnected" /* DISCONNECTED */;
+}
+__name(getMCPServerStatus, "getMCPServerStatus");
+function getAllMCPServerStatuses() {
+  return new Map(serverStatuses);
+}
+__name(getAllMCPServerStatuses, "getAllMCPServerStatuses");
+
 // packages/core/src/tools/mcp-tool.ts
 var debugLogger4 = createDebugLogger("MCP_TOOL");
+var MCP_CONNECTION_ERROR_PATTERNS = [
+  /ECONNREFUSED/i,
+  /ENOTFOUND/i,
+  /ECONNRESET/i,
+  /ETIMEDOUT/i,
+  /connection (closed|lost)/i,
+  /not connected/i,
+  /disconnected/i,
+  /transport closed/i
+];
 var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends BaseToolInvocation {
   constructor(mcpTool, serverName, serverToolName, displayName, trust, params = {}, cliConfig, mcpClient, mcpTimeout, annotations, retryCount = 0) {
     super(params);
@@ -64087,6 +64143,9 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
   }
   async handleReconnectOnError(error, signal, updateOutput) {
     debugLogger4.error(`MCP server error '${this.serverName}': ${error}`);
+    if (!this.shouldAttemptReconnect(error)) {
+      throw error;
+    }
     if (this.retryCount < _DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES) {
       debugLogger4.info(
         `Reconnection attempt ${this.retryCount + 1}/${_DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES} for MCP server '${this.serverName}'`
@@ -64115,6 +64174,18 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
     }
     throw error;
   }
+  shouldAttemptReconnect(error) {
+    if (isAbortError(error)) {
+      return false;
+    }
+    if (getMCPServerStatus(this.serverName) === "disconnected" /* DISCONNECTED */) {
+      return true;
+    }
+    const message = getErrorMessage(error);
+    return MCP_CONNECTION_ERROR_PATTERNS.some(
+      (pattern) => pattern.test(message)
+    );
+  }
   async execute(signal, updateOutput) {
     if (this.mcpClient) {
       return this.executeWithDirectClient(signal, updateOutput);
@@ -64838,6 +64909,9 @@ var LoopType = /* @__PURE__ */ ((LoopType2) => {
   LoopType2["REPETITIVE_THOUGHTS"] = "repetitive_thoughts";
   LoopType2["READ_FILE_LOOP"] = "read_file_loop";
   LoopType2["ACTION_STAGNATION"] = "action_stagnation";
+  LoopType2["GLOBAL_TOOL_CALL_DUPLICATE"] = "global_tool_call_duplicate";
+  LoopType2["ALTERNATING_TOOL_CALL_PATTERN"] = "alternating_tool_call_pattern";
+  LoopType2["TURN_TOOL_CALL_CAP"] = "turn_tool_call_cap";
   return LoopType2;
 })(LoopType || {});
 var LoopDetectedEvent = class {
@@ -65398,6 +65472,7 @@ var PromptSuggestionEvent = class {
   outcome;
   prompt_id;
   accept_method;
+  accept_source;
   time_to_accept_ms;
   time_to_ignore_ms;
   time_to_first_keystroke_ms;
@@ -65411,6 +65486,7 @@ var PromptSuggestionEvent = class {
     this.outcome = params.outcome;
     this.prompt_id = params.prompt_id ?? "user_intent";
     this.accept_method = params.accept_method;
+    this.accept_source = params.accept_source;
     this.time_to_accept_ms = params.time_to_accept_ms;
     this.time_to_ignore_ms = params.time_to_ignore_ms;
     this.time_to_first_keystroke_ms = params.time_to_first_keystroke_ms;
@@ -65706,8 +65782,9 @@ function convertGeminiToolParametersToOpenAI(parameters) {
           result[key] = value;
         }
       } else if (key === "minLength" || key === "maxLength" || key === "minItems" || key === "maxItems") {
-        if (typeof value === "string" && !isNaN(Number(value))) {
-          result[key] = parseInt(value, 10);
+        const numberValue = typeof value === "string" ? Number(value) : NaN;
+        if (typeof value === "string" && value.trim() !== "" && Number.isInteger(numberValue)) {
+          result[key] = numberValue;
         } else {
           result[key] = value;
         }
@@ -65951,6 +66028,14 @@ function processContent(content, messages, requestContext) {
             accumulatedSplitMedia.push(...mediaParts);
           }
         }
+        if (requestContext.toolResultContentFormat === "string" && Array.isArray(toolMessage.content)) {
+          const toolContent = toolMessage.content;
+          if (toolContent.every(
+            (cp) => cp?.type === "text"
+          )) {
+            toolMessage.content = toolContent.map((cp) => cp.text).join("\n");
+          }
+        }
         messages.push(toolMessage);
       }
     }
@@ -66316,7 +66401,7 @@ function convertOpenAIResponseToGemini(openaiResponse, requestContext) {
     let finalCompletionTokens = completionTokens;
     if (totalTokens > 0 && promptTokens === 0 && completionTokens === 0) {
       finalPromptTokens = Math.round(totalTokens * 0.7);
-      finalCompletionTokens = Math.round(totalTokens * 0.3);
+      finalCompletionTokens = totalTokens - finalPromptTokens;
     }
     response.usageMetadata = {
       promptTokenCount: finalPromptTokens,
@@ -66448,7 +66533,7 @@ function convertOpenAIChunkToGemini(chunk, requestContext) {
     let finalCompletionTokens = completionTokens;
     if (totalTokens > 0 && promptTokens === 0 && completionTokens === 0) {
       finalPromptTokens = Math.round(totalTokens * 0.7);
-      finalCompletionTokens = Math.round(totalTokens * 0.3);
+      finalCompletionTokens = totalTokens - finalPromptTokens;
     }
     response.usageMetadata = {
       promptTokenCount: finalPromptTokens,
@@ -66953,13 +67038,20 @@ init_esbuild_shims();
 var import_core3 = __toESM(require_src3(), 1);
 var import_sdk_metrics = __toESM(require_src9(), 1);
 import * as fs5 from "node:fs";
+import * as path6 from "node:path";
 var FileExporter = class {
   static {
     __name(this, "FileExporter");
   }
   writeStream;
   constructor(filePath) {
+    try {
+      fs5.mkdirSync(path6.dirname(filePath), { recursive: true });
+    } catch {
+    }
     this.writeStream = fs5.createWriteStream(filePath, { flags: "a" });
+    this.writeStream.on("error", () => {
+    });
   }
   serialize(data) {
     return safeJsonStringify(data, 2) + "\n";
@@ -68424,13 +68516,13 @@ __name(createSessionRootContext, "createSessionRootContext");
 
 // packages/core/src/telemetry/sdk.ts
 function createTelemetryDiagLogger() {
-  const debugLogger13 = createDebugLogger("OTEL");
+  const debugLogger15 = createDebugLogger("OTEL");
   return {
-    error: /* @__PURE__ */ __name((message, ...args) => debugLogger13.error(message, ...args), "error"),
-    warn: /* @__PURE__ */ __name((message, ...args) => debugLogger13.warn(message, ...args), "warn"),
-    info: /* @__PURE__ */ __name((message, ...args) => debugLogger13.info(message, ...args), "info"),
-    debug: /* @__PURE__ */ __name((message, ...args) => debugLogger13.debug(message, ...args), "debug"),
-    verbose: /* @__PURE__ */ __name((message, ...args) => debugLogger13.debug(message, ...args), "verbose")
+    error: /* @__PURE__ */ __name((message, ...args) => debugLogger15.error(message, ...args), "error"),
+    warn: /* @__PURE__ */ __name((message, ...args) => debugLogger15.warn(message, ...args), "warn"),
+    info: /* @__PURE__ */ __name((message, ...args) => debugLogger15.info(message, ...args), "info"),
+    debug: /* @__PURE__ */ __name((message, ...args) => debugLogger15.debug(message, ...args), "debug"),
+    verbose: /* @__PURE__ */ __name((message, ...args) => debugLogger15.debug(message, ...args), "verbose")
   };
 }
 __name(createTelemetryDiagLogger, "createTelemetryDiagLogger");
@@ -68533,7 +68625,7 @@ function initializeTelemetry(config) {
   if (telemetryInitialized || !config.getTelemetryEnabled()) {
     return;
   }
-  const debugLogger13 = createDebugLogger("OTEL");
+  const debugLogger15 = createDebugLogger("OTEL");
   const userAttrs = config.getTelemetryResourceAttributes() ?? {};
   const userServiceName = userAttrs["service.name"];
   const {
@@ -68582,7 +68674,7 @@ function initializeTelemetry(config) {
       const metricsUrl = validateUrl(
         config.getTelemetryOtlpMetricsEndpoint() ?? (parsedEndpoint ? resolveHttpOtlpUrl(parsedEndpoint, "metrics") : void 0)
       );
-      debugLogger13.debug(
+      debugLogger15.debug(
         `OTLP HTTP endpoints: traces=${tracesUrl ?? "none"}, logs=${logsUrl ?? "none"}, metrics=${metricsUrl ?? "none"}`
       );
       if (tracesUrl) {
@@ -68607,7 +68699,7 @@ function initializeTelemetry(config) {
             // trade-off, since falling back to stderr would re-introduce the
             // TUI pollution this injection was added to prevent.
             ...config.isInteractive() && {
-              diagnosticsSink: /* @__PURE__ */ __name((message) => debugLogger13.warn(message), "diagnosticsSink")
+              diagnosticsSink: /* @__PURE__ */ __name((message) => debugLogger15.warn(message), "diagnosticsSink")
             }
           }
         );
@@ -68622,7 +68714,7 @@ function initializeTelemetry(config) {
       if (!parsedEndpoint) {
         const warning = 'Per-signal OTLP endpoints are only supported with HTTP protocol. Set otlpProtocol to "http" or provide a base otlpEndpoint for gRPC. Telemetry SDK startup was skipped because no supported gRPC endpoint was configured.';
         diag.warn(warning);
-        debugLogger13.warn(warning);
+        debugLogger15.warn(warning);
         return;
       } else {
         spanExporter = new import_exporter_trace_otlp_grpc.OTLPTraceExporter({
@@ -68671,25 +68763,25 @@ function initializeTelemetry(config) {
     config.getTelemetryOtlpLogsEndpoint(),
     config.getTelemetryOtlpMetricsEndpoint()
   ].map(normalizeOtlpPrefix).filter((u) => !!u);
-  const matchesOtlpPrefix = /* @__PURE__ */ __name((origin, path8) => {
+  const matchesOtlpPrefix = /* @__PURE__ */ __name((origin, path11) => {
     for (const prefix of otlpUrlPrefixes) {
       if (origin !== prefix.origin) continue;
       if (prefix.pathname === "") return true;
-      if (!path8.startsWith(prefix.pathname)) continue;
-      const next = path8.charAt(prefix.pathname.length);
+      if (!path11.startsWith(prefix.pathname)) continue;
+      const next = path11.charAt(prefix.pathname.length);
       if (next === "" || next === "/" || next === "?" || next === "#") {
         return true;
       }
     }
     return false;
   }, "matchesOtlpPrefix");
-  const stripPathSuffix = /* @__PURE__ */ __name((path8) => {
-    const qIdx = path8.indexOf("?");
-    const fIdx = path8.indexOf("#");
-    let cut = path8.length;
+  const stripPathSuffix = /* @__PURE__ */ __name((path11) => {
+    const qIdx = path11.indexOf("?");
+    const fIdx = path11.indexOf("#");
+    let cut = path11.length;
     if (qIdx !== -1) cut = Math.min(cut, qIdx);
     if (fIdx !== -1) cut = Math.min(cut, fIdx);
-    return path8.slice(0, cut);
+    return path11.slice(0, cut);
   }, "stripPathSuffix");
   const textMapPropagator = config.getOutboundCorrelationPropagateTraceContext() ? void 0 : NOOP_PROPAGATOR;
   sdk = new import_sdk_node.NodeSDK({
@@ -68725,8 +68817,8 @@ function initializeTelemetry(config) {
           } catch {
             return false;
           }
-          const path8 = typeof req.path === "string" ? stripPathSuffix(req.path) : "";
-          return matchesOtlpPrefix(origin, path8);
+          const path11 = typeof req.path === "string" ? stripPathSuffix(req.path) : "";
+          return matchesOtlpPrefix(origin, path11);
         }, "ignoreOutgoingRequestHook")
       }),
       // Modern fetch (`globalThis.fetch` / undici) is the HTTP layer used by
@@ -68736,15 +68828,15 @@ function initializeTelemetry(config) {
       new import_instrumentation_undici.UndiciInstrumentation({
         ignoreRequestHook: /* @__PURE__ */ __name((request4) => {
           if (otlpUrlPrefixes.length === 0) return false;
-          const path8 = typeof request4.path === "string" ? stripPathSuffix(request4.path) : "";
-          return matchesOtlpPrefix(request4.origin, path8);
+          const path11 = typeof request4.path === "string" ? stripPathSuffix(request4.path) : "";
+          return matchesOtlpPrefix(request4.origin, path11);
         }, "ignoreRequestHook")
       })
     ]
   });
   try {
     sdk.start();
-    debugLogger13.debug("OpenTelemetry SDK started successfully.");
+    debugLogger15.debug("OpenTelemetry SDK started successfully.");
     telemetryInitialized = true;
     activeMetricReader = metricReader;
     const sessionId = config.getSessionId();
@@ -68754,7 +68846,7 @@ function initializeTelemetry(config) {
     );
     initializeMetrics(config);
   } catch (error) {
-    debugLogger13.error("Error starting OpenTelemetry SDK:", error);
+    debugLogger15.error("Error starting OpenTelemetry SDK:", error);
   }
 }
 __name(initializeTelemetry, "initializeTelemetry");
@@ -68776,7 +68868,7 @@ async function shutdownTelemetry() {
   }
   endInteractionSpan("cancelled");
   const currentSdk = sdk;
-  const debugLogger13 = createDebugLogger("OTEL");
+  const debugLogger15 = createDebugLogger("OTEL");
   telemetryShutdownPromise = (async () => {
     let timer;
     let timedOut = false;
@@ -68784,7 +68876,7 @@ async function shutdownTelemetry() {
       const sdkShutdown = Promise.resolve(currentSdk.shutdown());
       sdkShutdown.catch((err) => {
         if (timedOut) {
-          debugLogger13.warn(
+          debugLogger15.warn(
             "SDK shutdown rejected after timeout:",
             err instanceof Error ? err.message : err
           );
@@ -68802,14 +68894,14 @@ async function shutdownTelemetry() {
       if (result === "timeout") {
         const msg = `Telemetry shutdown timed out after ${SHUTDOWN_TIMEOUT_MS}ms.`;
         diag.warn(msg);
-        debugLogger13.warn(msg);
+        debugLogger15.warn(msg);
       } else {
-        debugLogger13.debug("OpenTelemetry SDK shut down successfully.");
+        debugLogger15.debug("OpenTelemetry SDK shut down successfully.");
       }
     } catch (error) {
       clearTimeout(timer);
       diag.error("Error shutting down SDK:", error);
-      debugLogger13.error("Error shutting down SDK:", error);
+      debugLogger15.error("Error shutting down SDK:", error);
     } finally {
       telemetryInitialized = false;
       sdk = void 0;
@@ -69775,6 +69867,7 @@ var LoggingContentGenerator = class {
     this.config = config;
     this.modalities = generatorConfig.modalities;
     this.splitToolMedia = generatorConfig.splitToolMedia;
+    this.toolResultContentFormat = generatorConfig.toolResultContentFormat;
     this.generatorAuthType = generatorConfig.authType;
     if (generatorConfig.enableOpenAILogging) {
       this.openaiLogger = new OpenAILogger(
@@ -69791,6 +69884,7 @@ var LoggingContentGenerator = class {
   schemaCompliance;
   modalities;
   splitToolMedia;
+  toolResultContentFormat;
   generatorAuthType;
   getWrapped() {
     return this.wrapped;
@@ -70257,6 +70351,7 @@ var LoggingContentGenerator = class {
       // --openai-logging fallback reconstruction reflects the same split as the
       // request actually sent. Opt out via generationConfig.splitToolMedia = false.
       splitToolMedia: this.splitToolMedia ?? true,
+      toolResultContentFormat: this.toolResultContentFormat ?? "parts",
       startTime: 0
     };
   }
@@ -70630,7 +70725,7 @@ var MODALITY_PATTERNS = [
   // -------------------
   // Moonshot / Kimi
   // -------------------
-  [/^kimi-k2\.5/, { image: true, video: true }],
+  [/^kimi-k2\./, { image: true, video: true }],
   [/^kimi-/, {}],
   // -------------------
   // ByteDance Doubao — Seed-series and *-vision / *-vl models accept image
@@ -70689,7 +70784,8 @@ var MODEL_GENERATION_CONFIG_FIELDS = [
   "customHeaders",
   "extra_body",
   "modalities",
-  "splitToolMedia"
+  "splitToolMedia",
+  "toolResultContentFormat"
 ];
 var CREDENTIAL_FIELDS = [
   "model",
@@ -71589,11 +71685,11 @@ var ModelsConfig = class _ModelsConfig {
    * 4. If no default is available, leave the generationConfig incomplete and let
    *    resolveContentGeneratorConfigWithSources throw exceptions as expected.
    */
-  syncAfterAuthRefresh(authType, modelId) {
+  syncAfterAuthRefresh(authType, modelId, providerBaseUrlOverride) {
     this.strictModelProviderSelection = false;
     const previousAuthType = this.currentAuthType;
     this.currentAuthType = authType;
-    const providerBaseUrl = this.generationConfigSources["baseUrl"]?.kind === "modelProviders" ? this._generationConfig.baseUrl : void 0;
+    const providerBaseUrl = providerBaseUrlOverride ?? (this.generationConfigSources["baseUrl"]?.kind === "modelProviders" ? this._generationConfig.baseUrl : void 0);
     const resolved = modelId ? this.modelRegistry.getModel(authType, modelId, providerBaseUrl) ?? this.modelRegistry.getModel(authType, modelId) : void 0;
     if (resolved) {
       const hasBeenApplied = this.generationConfigSources["baseUrl"]?.kind === "modelProviders";
@@ -71879,12 +71975,12 @@ var AuthType = /* @__PURE__ */ ((AuthType2) => {
   AuthType2["USE_ANTHROPIC"] = "anthropic";
   return AuthType2;
 })(AuthType || {});
-function setSource(sources, path8, source) {
-  sources[path8] = source;
+function setSource(sources, path11, source) {
+  sources[path11] = source;
 }
 __name(setSource, "setSource");
-function getSeedSource(seed, path8) {
-  return seed?.[path8];
+function getSeedSource(seed, path11) {
+  return seed?.[path11];
 }
 __name(getSeedSource, "getSeedSource");
 function resolveContentGeneratorConfigWithSources(config, authType, generationConfig, seedSources, options) {
@@ -71905,7 +72001,7 @@ function resolveContentGeneratorConfigWithSources(config, authType, generationCo
       detail: "Config.getProxy()"
     });
   }
-  const seedOrUnknown = /* @__PURE__ */ __name((path8) => getSeedSource(seedSources, path8) ?? { kind: "unknown" }, "seedOrUnknown");
+  const seedOrUnknown = /* @__PURE__ */ __name((path11) => getSeedSource(seedSources, path11) ?? { kind: "unknown" }, "seedOrUnknown");
   for (const field of PROVIDER_SOURCED_FIELDS) {
     if (generationConfig && field in generationConfig && !sources[field]) {
       setSource(sources, field, seedOrUnknown(field));
@@ -72004,11 +72100,11 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   let baseGenerator;
   try {
     if (authType === "openai" /* USE_OPENAI */) {
-      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-7CA63X5G.js");
+      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-2CHXJZ4A.js");
       baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
     } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-KK433U33.js");
-      const { QwenContentGenerator } = await import("./qwenContentGenerator-4WJTJXFZ.js");
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-WZ54YZ4J.js");
+      const { QwenContentGenerator } = await import("./qwenContentGenerator-ZXEKDN2J.js");
       try {
         const qwenClient = await getQwenOauthClient(
           config,
@@ -72026,10 +72122,10 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
         throw new Error(error instanceof Error ? error.message : String(error));
       }
     } else if (authType === "anthropic" /* USE_ANTHROPIC */) {
-      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-KLBHYGH6.js");
+      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-5S4OMMNL.js");
       baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
     } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
-      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-A6JHLUHK.js");
+      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-RJA7BIHQ.js");
       baseGenerator = createGeminiContentGenerator(generatorConfig, config);
     } else {
       throw new Error(
@@ -72202,9 +72298,9 @@ var QwenLogger = class _QwenLogger {
   readSourceInfo() {
     try {
       const globalDir = Storage.getGlobalQwenDir();
-      const sourceJsonPath = path6.join(globalDir, "source.json");
-      const legacyPath = path6.join(os3.homedir(), ".qwen", "source.json");
-      const candidates = path6.normalize(sourceJsonPath) !== path6.normalize(legacyPath) ? [sourceJsonPath, legacyPath] : [sourceJsonPath];
+      const sourceJsonPath = path7.join(globalDir, "source.json");
+      const legacyPath = path7.join(os3.homedir(), ".qwen", "source.json");
+      const candidates = path7.normalize(sourceJsonPath) !== path7.normalize(legacyPath) ? [sourceJsonPath, legacyPath] : [sourceJsonPath];
       for (const candidate of candidates) {
         if (fs6.existsSync(candidate)) {
           const sourceJsonContent = fs6.readFileSync(candidate, "utf8");
@@ -72837,7 +72933,7 @@ var QwenLogger = class _QwenLogger {
   getProxyAgent() {
     const proxyUrl = this.config?.getProxy();
     if (!proxyUrl) return void 0;
-    if (proxyUrl.startsWith("http")) {
+    if (/^https?:\/\//i.test(proxyUrl)) {
       return new import_https_proxy_agent.HttpsProxyAgent(proxyUrl);
     } else {
       throw new Error("Unsupported proxy type");
@@ -72870,6 +72966,632 @@ var QwenLogger = class _QwenLogger {
   }
 };
 
+// packages/core/src/services/tokenUsageService.ts
+init_esbuild_shims();
+import path9 from "node:path";
+import { randomUUID } from "node:crypto";
+
+// packages/core/src/utils/jsonl-utils.ts
+init_esbuild_shims();
+import fs7 from "node:fs";
+import path8 from "node:path";
+import readline from "node:readline";
+import { finished } from "node:stream/promises";
+var debugLogger12 = createDebugLogger("JSONL");
+var fileLocks = /* @__PURE__ */ new Map();
+function getFileLock(filePath) {
+  if (!fileLocks.has(filePath)) {
+    fileLocks.set(filePath, new Mutex());
+  }
+  return fileLocks.get(filePath);
+}
+__name(getFileLock, "getFileLock");
+function _recoverObjectsFromLine(line) {
+  const out = [];
+  let depth = 0;
+  let inString = false;
+  let escape = false;
+  let start = -1;
+  for (let i = 0; i < line.length; i++) {
+    const c = line[i];
+    if (escape) {
+      escape = false;
+      continue;
+    }
+    if (inString) {
+      if (c === "\\") escape = true;
+      else if (c === '"') inString = false;
+      continue;
+    }
+    if (c === '"') {
+      inString = true;
+      continue;
+    }
+    if (c === "{") {
+      if (depth === 0) start = i;
+      depth++;
+    } else if (c === "}") {
+      depth--;
+      if (depth === 0 && start >= 0) {
+        const fragment = line.slice(start, i + 1);
+        try {
+          out.push(JSON.parse(fragment));
+        } catch {
+        }
+        start = -1;
+      } else if (depth < 0) {
+        depth = 0;
+        start = -1;
+      }
+    }
+  }
+  return out;
+}
+__name(_recoverObjectsFromLine, "_recoverObjectsFromLine");
+function parseLineTolerant(line, filePath) {
+  try {
+    const parsed = JSON.parse(line);
+    if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return [parsed];
+    }
+    debugLogger12.warn(`Skipping non-object JSONL value in ${filePath}`);
+    return [];
+  } catch {
+    const fragments = _recoverObjectsFromLine(line);
+    if (fragments.length === 0) {
+      debugLogger12.warn(`Failed to parse line in ${filePath}`);
+    } else {
+      debugLogger12.warn(
+        `Recovered ${fragments.length} record(s) from malformed line in ${filePath}`
+      );
+    }
+    return fragments;
+  }
+}
+__name(parseLineTolerant, "parseLineTolerant");
+async function closeLineReader(rl, fileStream) {
+  rl?.close();
+  if (!fileStream || fileStream.closed) {
+    return;
+  }
+  const closed = finished(fileStream, { cleanup: true }).catch(() => void 0);
+  if (!fileStream.destroyed) {
+    fileStream.destroy();
+  }
+  await closed;
+}
+__name(closeLineReader, "closeLineReader");
+async function readLines(filePath, count) {
+  let fileStream;
+  let rl;
+  try {
+    fileStream = fs7.createReadStream(filePath);
+    rl = readline.createInterface({
+      input: fileStream,
+      crlfDelay: Infinity
+    });
+    const results = [];
+    for await (const line of rl) {
+      if (results.length >= count) break;
+      const trimmed = line.trim();
+      if (trimmed.length === 0) continue;
+      for (const obj of parseLineTolerant(trimmed, filePath)) {
+        if (results.length >= count) break;
+        results.push(obj);
+      }
+    }
+    return results;
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      debugLogger12.error(
+        `Error reading first ${count} lines from ${filePath}:`,
+        error
+      );
+    }
+    return [];
+  } finally {
+    await closeLineReader(rl, fileStream);
+  }
+}
+__name(readLines, "readLines");
+async function read(filePath, options = {}) {
+  let fileStream;
+  let rl;
+  try {
+    fileStream = fs7.createReadStream(filePath);
+    rl = readline.createInterface({
+      input: fileStream,
+      crlfDelay: Infinity
+    });
+    const results = [];
+    for await (const line of rl) {
+      const trimmed = line.trim();
+      if (trimmed.length === 0) continue;
+      for (const obj of parseLineTolerant(trimmed, filePath)) {
+        results.push(obj);
+      }
+    }
+    return results;
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      debugLogger12.error(`Error reading ${filePath}:`, error);
+      if (options.throwOnNonEnoentError) {
+        throw error;
+      }
+    }
+    return [];
+  } finally {
+    await closeLineReader(rl, fileStream);
+  }
+}
+__name(read, "read");
+var ensuredDirs = /* @__PURE__ */ new Set();
+function _resetEnsuredDirsCacheForTest() {
+  ensuredDirs.clear();
+}
+__name(_resetEnsuredDirsCacheForTest, "_resetEnsuredDirsCacheForTest");
+async function writeLine(filePath, data) {
+  const lock = getFileLock(filePath);
+  await lock.runExclusive(async () => {
+    const line = `${JSON.stringify(data)}
+`;
+    const dir = path8.dirname(filePath);
+    if (!ensuredDirs.has(dir)) {
+      await fs7.promises.mkdir(dir, { recursive: true });
+      ensuredDirs.add(dir);
+    }
+    await fs7.promises.appendFile(filePath, Buffer.from(line, "utf8"), {
+      flush: true
+    });
+  });
+}
+__name(writeLine, "writeLine");
+function writeLineSync(filePath, data) {
+  const line = `${JSON.stringify(data)}
+`;
+  const dir = path8.dirname(filePath);
+  if (!fs7.existsSync(dir)) {
+    fs7.mkdirSync(dir, { recursive: true });
+  }
+  fs7.appendFileSync(filePath, Buffer.from(line, "utf8"), { flush: true });
+}
+__name(writeLineSync, "writeLineSync");
+function write(filePath, data) {
+  const lines = data.map((item) => JSON.stringify(item)).join("\n");
+  const dir = path8.dirname(filePath);
+  if (!fs7.existsSync(dir)) {
+    fs7.mkdirSync(dir, { recursive: true });
+  }
+  atomicWriteFileSync(filePath, `${lines}
+`, { encoding: "utf8" });
+}
+__name(write, "write");
+async function countLines(filePath) {
+  let fileStream;
+  let rl;
+  try {
+    fileStream = fs7.createReadStream(filePath);
+    rl = readline.createInterface({
+      input: fileStream,
+      crlfDelay: Infinity
+    });
+    let count = 0;
+    for await (const line of rl) {
+      if (line.trim().length > 0) {
+        count++;
+      }
+    }
+    return count;
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      debugLogger12.error(`Error counting lines in ${filePath}:`, error);
+    }
+    return 0;
+  } finally {
+    await closeLineReader(rl, fileStream);
+  }
+}
+__name(countLines, "countLines");
+function exists(filePath) {
+  try {
+    const stats = fs7.statSync(filePath);
+    return stats.isFile() && stats.size > 0;
+  } catch {
+    return false;
+  }
+}
+__name(exists, "exists");
+
+// packages/core/src/services/tokenUsageService.ts
+var debugLogger13 = createDebugLogger("TOKEN_USAGE");
+var USAGE_DIR_NAME = "usage";
+var FILE_PREFIX = "token-usage-";
+var FILE_EXTENSION = ".jsonl";
+var SCHEMA_VERSION = 1;
+var UNKNOWN_AUTH_TYPE = "unknown";
+function createEmptyTotals() {
+  return {
+    requests: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    cachedTokens: 0,
+    thoughtsTokens: 0,
+    totalTokens: 0,
+    apiDurationMs: 0
+  };
+}
+__name(createEmptyTotals, "createEmptyTotals");
+function addRecordToTotals(totals, record) {
+  totals.requests += 1;
+  totals.inputTokens += record.inputTokens;
+  totals.outputTokens += record.outputTokens;
+  totals.cachedTokens += record.cachedTokens;
+  totals.thoughtsTokens += record.thoughtsTokens;
+  totals.totalTokens += record.totalTokens;
+  totals.apiDurationMs += record.apiDurationMs;
+}
+__name(addRecordToTotals, "addRecordToTotals");
+function getLocalDateParts(date) {
+  const year = date.getFullYear();
+  const monthNumber = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return {
+    date: `${year}-${monthNumber}-${day}`,
+    month: `${year}-${monthNumber}`
+  };
+}
+__name(getLocalDateParts, "getLocalDateParts");
+function currentPeriodValue(period) {
+  const parts = getLocalDateParts(/* @__PURE__ */ new Date());
+  return period === "day" ? parts.date : parts.month;
+}
+__name(currentPeriodValue, "currentPeriodValue");
+function isValidDay(value) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+  if (!match) {
+    return false;
+  }
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  if (month < 1 || month > 12 || day < 1) {
+    return false;
+  }
+  const daysInMonth = [
+    31,
+    isLeapYear(year) ? 29 : 28,
+    31,
+    30,
+    31,
+    30,
+    31,
+    31,
+    30,
+    31,
+    30,
+    31
+  ];
+  return day <= daysInMonth[month - 1];
+}
+__name(isValidDay, "isValidDay");
+function isValidMonth(value) {
+  const match = /^(\d{4})-(\d{2})$/.exec(value);
+  if (!match) {
+    return false;
+  }
+  const month = Number(match[2]);
+  return month >= 1 && month <= 12;
+}
+__name(isValidMonth, "isValidMonth");
+function isLeapYear(year) {
+  return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+}
+__name(isLeapYear, "isLeapYear");
+function normalizePeriodValue(period, value) {
+  const normalized = value?.trim() || currentPeriodValue(period);
+  const isValid = period === "day" ? isValidDay(normalized) : isValidMonth(normalized);
+  if (!isValid) {
+    throw new Error(
+      `Invalid ${period} value "${normalized}". Expected ${period === "day" ? "YYYY-MM-DD" : "YYYY-MM"}.`
+    );
+  }
+  return normalized;
+}
+__name(normalizePeriodValue, "normalizePeriodValue");
+function usageDir() {
+  return path9.join(Storage.getRuntimeBaseDir(), USAGE_DIR_NAME);
+}
+__name(usageDir, "usageDir");
+function getTokenUsageFilePath(month) {
+  if (!isValidMonth(month)) {
+    throw new Error(`Invalid month value "${month}". Expected YYYY-MM.`);
+  }
+  return path9.join(usageDir(), `${FILE_PREFIX}${month}${FILE_EXTENSION}`);
+}
+__name(getTokenUsageFilePath, "getTokenUsageFilePath");
+function toNonNegativeInteger(value) {
+  if (!Number.isFinite(value) || value === void 0 || value <= 0) {
+    return 0;
+  }
+  return Math.trunc(value);
+}
+__name(toNonNegativeInteger, "toNonNegativeInteger");
+function calculateInputTokens(event) {
+  const inputTokens = toNonNegativeInteger(event.input_token_count);
+  if (inputTokens > 0) {
+    return inputTokens;
+  }
+  return toNonNegativeInteger(event.cached_content_token_count);
+}
+__name(calculateInputTokens, "calculateInputTokens");
+function calculateTotalTokens(event) {
+  const total = toNonNegativeInteger(event.total_token_count);
+  if (total > 0) {
+    return total;
+  }
+  return calculateInputTokens(event) + toNonNegativeInteger(event.output_token_count) + toNonNegativeInteger(event.thoughts_token_count);
+}
+__name(calculateTotalTokens, "calculateTotalTokens");
+function apiResponseEventToTokenUsageRecord(config, event) {
+  const timestamp = event["event.timestamp"] || (/* @__PURE__ */ new Date()).toISOString();
+  const date = new Date(timestamp);
+  const localParts = getLocalDateParts(
+    Number.isNaN(date.getTime()) ? /* @__PURE__ */ new Date() : date
+  );
+  return {
+    schemaVersion: SCHEMA_VERSION,
+    id: randomUUID(),
+    timestamp,
+    localDate: localParts.date,
+    localMonth: localParts.month,
+    sessionId: config.getSessionId(),
+    model: event.model || "unknown",
+    authType: event.auth_type || UNKNOWN_AUTH_TYPE,
+    source: event.subagent_name || MAIN_SOURCE,
+    inputTokens: calculateInputTokens(event),
+    outputTokens: toNonNegativeInteger(event.output_token_count),
+    cachedTokens: toNonNegativeInteger(event.cached_content_token_count),
+    thoughtsTokens: toNonNegativeInteger(event.thoughts_token_count),
+    totalTokens: calculateTotalTokens(event),
+    apiDurationMs: toNonNegativeInteger(event.duration_ms)
+  };
+}
+__name(apiResponseEventToTokenUsageRecord, "apiResponseEventToTokenUsageRecord");
+function isTokenUsageRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const record = value;
+  return typeof record.id === "string" && typeof record.sessionId === "string" && typeof record.schemaVersion === "number" && Number.isInteger(record.schemaVersion) && record.schemaVersion > 0 && record.schemaVersion <= SCHEMA_VERSION && typeof record.timestamp === "string" && typeof record.localDate === "string" && typeof record.localMonth === "string" && typeof record.model === "string" && typeof record.authType === "string" && typeof record.source === "string" && typeof record.inputTokens === "number" && typeof record.outputTokens === "number" && typeof record.cachedTokens === "number" && typeof record.thoughtsTokens === "number" && typeof record.totalTokens === "number" && typeof record.apiDurationMs === "number";
+}
+__name(isTokenUsageRecord, "isTokenUsageRecord");
+async function readRecordsForMonth(month) {
+  const filePath = getTokenUsageFilePath(month);
+  const records = await read(filePath, {
+    throwOnNonEnoentError: true
+  });
+  const valid = [];
+  let dropped = 0;
+  for (const record of records) {
+    if (isTokenUsageRecord(record)) {
+      valid.push(record);
+    } else {
+      dropped++;
+    }
+  }
+  if (dropped > 0) {
+    debugLogger13.warn(
+      `Dropped ${dropped}/${records.length} invalid record(s) from ${filePath}`
+    );
+  }
+  return valid;
+}
+__name(readRecordsForMonth, "readRecordsForMonth");
+function summarizeRecords(period, value, records) {
+  const totals = createEmptyTotals();
+  const byModel = /* @__PURE__ */ new Map();
+  const byAuthType = /* @__PURE__ */ new Map();
+  const byModelAndAuthType = /* @__PURE__ */ new Map();
+  const bySource = /* @__PURE__ */ new Map();
+  const getGroup = /* @__PURE__ */ __name((map, key, fields) => {
+    let group = map.get(key);
+    if (!group) {
+      group = {
+        key,
+        ...fields,
+        ...createEmptyTotals()
+      };
+      map.set(key, group);
+    }
+    return group;
+  }, "getGroup");
+  for (const record of records) {
+    addRecordToTotals(totals, record);
+    addRecordToTotals(
+      getGroup(byModel, record.model, { model: record.model }),
+      record
+    );
+    addRecordToTotals(
+      getGroup(byAuthType, record.authType, { authType: record.authType }),
+      record
+    );
+    addRecordToTotals(
+      getGroup(byModelAndAuthType, `${record.model}|${record.authType}`, {
+        model: record.model,
+        authType: record.authType
+      }),
+      record
+    );
+    addRecordToTotals(
+      getGroup(bySource, record.source, { source: record.source }),
+      record
+    );
+  }
+  const sortGroups = /* @__PURE__ */ __name((groups) => [...groups].sort((a, b) => {
+    if (b.totalTokens !== a.totalTokens) {
+      return b.totalTokens - a.totalTokens;
+    }
+    return a.key.localeCompare(b.key);
+  }), "sortGroups");
+  return {
+    period,
+    value,
+    generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    totals,
+    byModel: sortGroups(byModel.values()),
+    byAuthType: sortGroups(byAuthType.values()),
+    byModelAndAuthType: sortGroups(byModelAndAuthType.values()),
+    bySource: sortGroups(bySource.values())
+  };
+}
+__name(summarizeRecords, "summarizeRecords");
+async function recordTokenUsageFromApiResponse(config, event) {
+  const record = apiResponseEventToTokenUsageRecord(config, event);
+  await writeLine(getTokenUsageFilePath(record.localMonth), record);
+}
+__name(recordTokenUsageFromApiResponse, "recordTokenUsageFromApiResponse");
+var lastLoggedTimeByCode = /* @__PURE__ */ new Map();
+var suppressedCountByCode = /* @__PURE__ */ new Map();
+var TOKEN_USAGE_FAILURE_LOG_COOLDOWN_MS = 6e4;
+var _now = /* @__PURE__ */ __name(() => Date.now(), "_now");
+function logTokenUsageWriteFailure(error) {
+  debugLogger13.warn("Failed to record token usage:", error);
+  const code = error.code;
+  if (code && code !== "ENOENT") {
+    const now = _now();
+    const lastTime = lastLoggedTimeByCode.get(code) ?? 0;
+    if (now - lastTime > TOKEN_USAGE_FAILURE_LOG_COOLDOWN_MS) {
+      lastLoggedTimeByCode.set(code, now);
+      const suppressedCount = suppressedCountByCode.get(code) ?? 0;
+      suppressedCountByCode.delete(code);
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(
+        `[token-usage] Write failed (${code}):`,
+        suppressedCount > 0 ? `${message} (${suppressedCount} similar suppressed since last log)` : message
+      );
+    } else {
+      suppressedCountByCode.set(
+        code,
+        (suppressedCountByCode.get(code) ?? 0) + 1
+      );
+    }
+  }
+}
+__name(logTokenUsageWriteFailure, "logTokenUsageWriteFailure");
+function recordTokenUsageFromApiResponseBestEffort(config, event) {
+  try {
+    const record = apiResponseEventToTokenUsageRecord(config, event);
+    void writeLine(getTokenUsageFilePath(record.localMonth), record).catch(logTokenUsageWriteFailure);
+  } catch (error) {
+    logTokenUsageWriteFailure(error);
+  }
+}
+__name(recordTokenUsageFromApiResponseBestEffort, "recordTokenUsageFromApiResponseBestEffort");
+async function queryTokenUsage(query) {
+  const value = normalizePeriodValue(query.period, query.value);
+  const month = query.period === "day" ? value.slice(0, 7) : value;
+  const records = (await readRecordsForMonth(month)).filter(
+    (record) => query.period === "day" ? record.localDate === value : record.localMonth === value
+  );
+  return summarizeRecords(query.period, value, records);
+}
+__name(queryTokenUsage, "queryTokenUsage");
+function csvEscape(value) {
+  const stringValue = value === void 0 ? "" : String(value);
+  const trimmed = stringValue.trimStart();
+  const sanitized = /^[=+\-@]/.test(trimmed) || /^[\t\r\n]/.test(stringValue) ? `'${stringValue}` : stringValue;
+  if (/[",\n\r]/.test(sanitized)) {
+    return `"${sanitized.replace(/"/g, '""')}"`;
+  }
+  return sanitized;
+}
+__name(csvEscape, "csvEscape");
+function groupRows(period, value, groupType, groups) {
+  return groups.map((group) => [
+    period,
+    value,
+    groupType,
+    group.key,
+    group.model ?? "",
+    group.authType ?? "",
+    group.source ?? "",
+    String(group.requests),
+    String(group.inputTokens),
+    String(group.outputTokens),
+    String(group.cachedTokens),
+    String(group.thoughtsTokens),
+    String(group.totalTokens),
+    String(group.apiDurationMs)
+  ]);
+}
+__name(groupRows, "groupRows");
+function formatTokenUsageSummaryAsCsv(summary) {
+  const header = [
+    "period",
+    "value",
+    "group_type",
+    "group_key",
+    "model",
+    "auth_type",
+    "source",
+    "requests",
+    "input_tokens",
+    "output_tokens",
+    "cached_tokens",
+    "thoughts_tokens",
+    "total_tokens",
+    "api_duration_ms"
+  ];
+  const rows = [
+    [
+      summary.period,
+      summary.value,
+      "total",
+      "total",
+      "",
+      "",
+      "",
+      String(summary.totals.requests),
+      String(summary.totals.inputTokens),
+      String(summary.totals.outputTokens),
+      String(summary.totals.cachedTokens),
+      String(summary.totals.thoughtsTokens),
+      String(summary.totals.totalTokens),
+      String(summary.totals.apiDurationMs)
+    ],
+    ...groupRows(summary.period, summary.value, "model", summary.byModel),
+    ...groupRows(
+      summary.period,
+      summary.value,
+      "auth_type",
+      summary.byAuthType
+    ),
+    ...groupRows(
+      summary.period,
+      summary.value,
+      "model_auth_type",
+      summary.byModelAndAuthType
+    ),
+    ...groupRows(summary.period, summary.value, "source", summary.bySource)
+  ];
+  return [
+    header.join(","),
+    ...rows.map((row) => row.map(csvEscape).join(","))
+  ].join("\n");
+}
+__name(formatTokenUsageSummaryAsCsv, "formatTokenUsageSummaryAsCsv");
+function formatTokenUsageSummaryAsJson(summary) {
+  return `${JSON.stringify(summary, null, 2)}
+`;
+}
+__name(formatTokenUsageSummaryAsJson, "formatTokenUsageSummaryAsJson");
+async function exportTokenUsageSummary(options) {
+  const summary = await queryTokenUsage(options);
+  return options.format === "json" ? formatTokenUsageSummaryAsJson(summary) : `${formatTokenUsageSummaryAsCsv(summary)}
+`;
+}
+__name(exportTokenUsageSummary, "exportTokenUsageSummary");
+
 // packages/core/src/telemetry/loggers.ts
 var shouldLogUserPrompts = /* @__PURE__ */ __name((config) => config.getTelemetryLogPromptsEnabled(), "shouldLogUserPrompts");
 function getCommonAttributes(config) {
@@ -73168,6 +73890,9 @@ function logApiResponse(config, event) {
   };
   uiTelemetryService.addEvent(uiEvent, config.getSessionId());
   if (!isInternalPromptId(event.prompt_id)) {
+    if (config.getUsageStatisticsEnabled()) {
+      recordTokenUsageFromApiResponseBestEffort(config, event);
+    }
     config.getChatRecordingService()?.recordUiTelemetryEvent(uiEvent);
   }
   QwenLogger.getInstance(config)?.logApiResponseEvent(event);
@@ -73665,6 +74390,9 @@ function logPromptSuggestion(config, event) {
   if (event.accept_method) {
     attributes["accept_method"] = event.accept_method;
   }
+  if (event.accept_source) {
+    attributes["accept_source"] = event.accept_source;
+  }
   if (event.time_to_accept_ms !== void 0) {
     attributes["time_to_accept_ms"] = event.time_to_accept_ms;
   }
@@ -73822,7 +74550,7 @@ function memoryFreshnessNote(mtimeMs) {
 __name(memoryFreshnessNote, "memoryFreshnessNote");
 
 // packages/core/src/tools/read-file.ts
-var debugLogger12 = createDebugLogger("READ_FILE_CACHE");
+var debugLogger14 = createDebugLogger("READ_FILE_CACHE");
 var ReadFileToolInvocation = class extends BaseToolInvocation {
   constructor(config, params) {
     super(params);
@@ -73858,13 +74586,13 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
    * so that external file reads require user confirmation.
    */
   async getDefaultPermission() {
-    const filePath = path7.resolve(this.params.file_path);
+    const filePath = path10.resolve(this.params.file_path);
     const workspaceContext = this.config.getWorkspaceContext();
     const allowedRoots = [
       this.config.storage.getProjectTempDir(),
       // Background subagent transcripts live under <projectDir>/subagents/ and
       // are advertised to the model as polling targets via read_file.
-      path7.join(this.config.storage.getProjectDir(), "subagents"),
+      path10.join(this.config.storage.getProjectDir(), "subagents"),
       Storage.getGlobalTempDir(),
       os4.tmpdir(),
       ...this.config.storage.getUserSkillsDirs(),
@@ -73880,7 +74608,7 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
     return "ask";
   }
   async execute() {
-    const absPath = path7.resolve(this.params.file_path);
+    const absPath = path10.resolve(this.params.file_path);
     const projectRoot = this.config.getTargetDir();
     const isAutoMem = isAnyAutoMemPath(absPath, projectRoot);
     const cacheEnabled = !this.config.getFileReadCacheDisabled();
@@ -73889,9 +74617,9 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
     const isFullRead = this.params.offset === void 0 && this.params.limit === void 0 && this.params.pages === void 0;
     let stats;
     try {
-      stats = await fs7.stat(absPath);
+      stats = await fs8.stat(absPath);
     } catch (err) {
-      debugLogger12.debug("stat-failed", {
+      debugLogger14.debug("stat-failed", {
         path: absPath,
         code: err.code
       });
@@ -73901,10 +74629,10 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
       if (status.state === "fresh" && status.entry.lastReadAt !== void 0 && status.entry.lastReadWasFull && status.entry.lastReadCacheable && // Only quote-back if that read is still in history (issue
       // #4239: idle microcompaction flips this off when it blanks it).
       status.entry.readResidentInHistory && (status.entry.lastWriteAt === void 0 || status.entry.lastReadAt > status.entry.lastWriteAt)) {
-        debugLogger12.debug("hit", { path: absPath });
+        debugLogger14.debug("hit", { path: absPath });
         return this.unchangedResult(absPath);
       }
-      debugLogger12.debug("miss", { path: absPath, state: status.state });
+      debugLogger14.debug("miss", { path: absPath, state: status.state });
     }
     const result = await processSingleFileContent(
       this.params.file_path,
@@ -73945,7 +74673,7 @@ ${result.llmContent}`;
     }
     if (typeof llmContent === "string" && isAutoMem) {
       try {
-        const memStat = stats ?? await fs7.stat(absPath);
+        const memStat = stats ?? await fs8.stat(absPath);
         const note = memoryFreshnessNote(memStat.mtimeMs);
         if (note) {
           llmContent = note + llmContent;
@@ -73965,7 +74693,7 @@ ${result.llmContent}`;
         "read" /* READ */,
         lines,
         mimetype,
-        path7.extname(this.params.file_path),
+        path10.extname(this.params.file_path),
         programming_language
       )
     );
@@ -74056,7 +74784,7 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
     if (!filePath) {
       return "The 'file_path' parameter must be non-empty.";
     }
-    if (!path7.isAbsolute(filePath)) {
+    if (!path10.isAbsolute(filePath)) {
       return `File path must be absolute, but was relative: ${filePath}. You must provide an absolute path.`;
     }
     if (params.offset !== void 0 && params.offset < 0) {
@@ -74069,7 +74797,7 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
       const pages = params.pages.trim();
       params.pages = pages.length > 0 ? pages : void 0;
     }
-    const ext = path7.extname(filePath).toLowerCase();
+    const ext = path10.extname(filePath).toLowerCase();
     if ((params.offset !== void 0 || params.limit !== void 0) && ext === ".ipynb") {
       return "offset and limit are not supported for Jupyter notebook (.ipynb) files. Notebooks are always read in full with structured cell output.";
     }
@@ -74230,6 +74958,24 @@ export {
   refreshSessionContext,
   shutdownTelemetry,
   forceFlushMetrics,
+  _recoverObjectsFromLine,
+  parseLineTolerant,
+  readLines,
+  read,
+  _resetEnsuredDirsCacheForTest,
+  writeLine,
+  writeLineSync,
+  write,
+  countLines,
+  exists,
+  getTokenUsageFilePath,
+  apiResponseEventToTokenUsageRecord,
+  recordTokenUsageFromApiResponse,
+  recordTokenUsageFromApiResponseBestEffort,
+  queryTokenUsage,
+  formatTokenUsageSummaryAsCsv,
+  formatTokenUsageSummaryAsJson,
+  exportTokenUsageSummary,
   logStartSession,
   logUserPrompt,
   logUserRetry,
@@ -74280,6 +75026,13 @@ export {
   truncateLlmContent,
   isAlreadyTruncated,
   persistAndTruncateToolResult,
+  MCPServerStatus,
+  addMCPStatusChangeListener,
+  removeMCPStatusChangeListener,
+  updateMCPServerStatus,
+  removeMCPServerStatus,
+  getMCPServerStatus,
+  getAllMCPServerStatuses,
   DiscoveredMCPTool,
   generateValidName,
   StartSessionEvent,