@google/gemini-cli-a2a-server 0.12.0-nightly.20251023.a7faa208 → 0.12.0-nightly.20251027.cb0947c5

package/dist/a2a-server.mjs

@@ -6344,7 +6344,7 @@ var require_diagnostics = __commonJS({
     function write2() {
       logger6.apply(logger6, arguments);
     }
-    function process23(message) {
+    function process25(message) {
       for (var i3 = 0; i3 < modifiers.length; i3++) {
         message = modifiers[i3].apply(modifiers[i3], arguments);
       }
@@ -6371,7 +6371,7 @@ var require_diagnostics = __commonJS({
     function yep(options2) {
       function diagnostics() {
         var args2 = Array.prototype.slice.call(arguments, 0);
-        write2.call(write2, options2, process23(args2, options2));
+        write2.call(write2, options2, process25(args2, options2));
         return true;
       }
       options2.enabled = true;
@@ -6383,7 +6383,7 @@ var require_diagnostics = __commonJS({
     module2.exports = function create3(diagnostics) {
       diagnostics.introduce = introduce;
       diagnostics.enabled = enabled;
-      diagnostics.process = process23;
+      diagnostics.process = process25;
       diagnostics.modify = modify;
       diagnostics.write = write2;
       diagnostics.nope = nope;
@@ -34138,7 +34138,7 @@ var require_express = __commonJS({
   "packages/a2a-server/node_modules/express/lib/express.js"(exports2, module2) {
     "use strict";
     var bodyParser = require_body_parser();
-    var EventEmitter10 = __require("node:events").EventEmitter;
+    var EventEmitter11 = __require("node:events").EventEmitter;
     var mixin = require_merge_descriptors();
     var proto = require_application();
     var Router = require_router();
@@ -34149,7 +34149,7 @@ var require_express = __commonJS({
       var app = function(req2, res2, next) {
         app.handle(req2, res2, next);
       };
-      mixin(app, EventEmitter10.prototype, false);
+      mixin(app, EventEmitter11.prototype, false);
       mixin(app, proto, false);
       app.request = Object.create(req, {
         app: { configurable: true, enumerable: true, writable: true, value: app }
@@ -34609,7 +34609,7 @@ var require_src2 = __commonJS({
 var require_destroy2 = __commonJS({
   "node_modules/destroy/index.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("events").EventEmitter;
+    var EventEmitter11 = __require("events").EventEmitter;
     var ReadStream2 = __require("fs").ReadStream;
     var Stream2 = __require("stream");
     var Zlib2 = __require("zlib");
@@ -34671,7 +34671,7 @@ var require_destroy2 = __commonJS({
       return stream3 instanceof Stream2 && typeof stream3.destroy === "function";
     }
     function isEventEmitter(val) {
-      return val instanceof EventEmitter10;
+      return val instanceof EventEmitter11;
     }
     function isFsReadStream(stream3) {
       return stream3 instanceof ReadStream2;
@@ -45580,7 +45580,7 @@ var require_express3 = __commonJS({
   "node_modules/express/lib/express.js"(exports2, module2) {
     "use strict";
     var bodyParser = require_body_parser2();
-    var EventEmitter10 = __require("events").EventEmitter;
+    var EventEmitter11 = __require("events").EventEmitter;
     var mixin = require_merge_descriptors2();
     var proto = require_application2();
     var Route = require_route3();
@@ -45592,7 +45592,7 @@ var require_express3 = __commonJS({
       var app = function(req2, res2, next) {
         app.handle(req2, res2, next);
       };
-      mixin(app, EventEmitter10.prototype, false);
+      mixin(app, EventEmitter11.prototype, false);
       mixin(app, proto, false);
       app.request = Object.create(req, {
         app: { configurable: true, enumerable: true, writable: true, value: app }
@@ -52323,7 +52323,7 @@ var require_logging_utils = __commonJS({
     exports2.setBackend = setBackend;
     exports2.log = log;
     var node_events_1 = __require("node:events");
-    var process23 = __importStar(__require("node:process"));
+    var process25 = __importStar(__require("node:process"));
     var util4 = __importStar(__require("node:util"));
     var colours_1 = require_colours();
     var LogSeverity;
@@ -52374,7 +52374,7 @@ var require_logging_utils = __commonJS({
         this.cached = /* @__PURE__ */ new Map();
         this.filters = [];
         this.filtersSet = false;
-        let nodeFlag = (_a3 = process23.env[exports2.env.nodeEnables]) !== null && _a3 !== void 0 ? _a3 : "*";
+        let nodeFlag = (_a3 = process25.env[exports2.env.nodeEnables]) !== null && _a3 !== void 0 ? _a3 : "*";
         if (nodeFlag === "all") {
           nodeFlag = "*";
         }
@@ -52414,7 +52414,7 @@ var require_logging_utils = __commonJS({
         return (fields, ...args2) => {
           var _a3;
           const nscolour = `${colours_1.Colours.green}${namespace}${colours_1.Colours.reset}`;
-          const pid = `${colours_1.Colours.yellow}${process23.pid}${colours_1.Colours.reset}`;
+          const pid = `${colours_1.Colours.yellow}${process25.pid}${colours_1.Colours.reset}`;
           let level;
           switch (fields.severity) {
             case LogSeverity.ERROR:
@@ -52462,8 +52462,8 @@ var require_logging_utils = __commonJS({
       }
       setFilters() {
         var _a3;
-        const existingFilters = (_a3 = process23.env["NODE_DEBUG"]) !== null && _a3 !== void 0 ? _a3 : "";
-        process23.env["NODE_DEBUG"] = `${existingFilters}${existingFilters ? "," : ""}${this.filters.join(",")}`;
+        const existingFilters = (_a3 = process25.env["NODE_DEBUG"]) !== null && _a3 !== void 0 ? _a3 : "";
+        process25.env["NODE_DEBUG"] = `${existingFilters}${existingFilters ? "," : ""}${this.filters.join(",")}`;
       }
     };
     function getDebugBackend(debugPkg) {
@@ -52509,7 +52509,7 @@ var require_logging_utils = __commonJS({
       loggerCache.clear();
     }
     function log(namespace, parent) {
-      const enablesFlag = process23.env[exports2.env.nodeEnables];
+      const enablesFlag = process25.env[exports2.env.nodeEnables];
       if (!enablesFlag) {
         return exports2.placeholder;
       }
@@ -57931,7 +57931,7 @@ var require_googleauth = __commonJS({
       NO_ADC_FOUND: "Could not load the default credentials. Browse to https://cloud.google.com/docs/authentication/getting-started for more information.",
       NO_UNIVERSE_DOMAIN_FOUND: "Unable to detect a Universe Domain in the current environment.\nTo learn more about Universe Domain retrieval, visit: \nhttps://cloud.google.com/compute/docs/metadata/predefined-metadata-keys"
     };
-    var GoogleAuth7 = class {
+    var GoogleAuth8 = class {
       // Note:  this properly is only public to satisfy unit tests.
       // https://github.com/Microsoft/TypeScript/issues/5228
       get isGCE() {
@@ -58580,7 +58580,7 @@ var require_googleauth = __commonJS({
         return res.data.signedBlob;
       }
     };
-    exports2.GoogleAuth = GoogleAuth7;
+    exports2.GoogleAuth = GoogleAuth8;
     _GoogleAuth_pendingAuthClient = /* @__PURE__ */ new WeakMap(), _GoogleAuth_instances = /* @__PURE__ */ new WeakSet(), _GoogleAuth_prepareAndCacheClient = async function _GoogleAuth_prepareAndCacheClient2(credential, quotaProjectIdOverride = process.env["GOOGLE_CLOUD_QUOTA_PROJECT"] || null) {
       const projectId = await this.getProjectIdOptional();
       if (quotaProjectIdOverride) {
@@ -58605,7 +58605,7 @@ var require_googleauth = __commonJS({
         return credential;
       }
     };
-    GoogleAuth7.DefaultTransporter = transporters_1.DefaultTransporter;
+    GoogleAuth8.DefaultTransporter = transporters_1.DefaultTransporter;
   }
 });
 
@@ -65173,11 +65173,11 @@ var require_copy = __commonJS({
       if (!destStat) {
         await fs60.mkdir(dest);
       }
-      const promises2 = [];
+      const promises3 = [];
       for await (const item of await fs60.opendir(src)) {
         const srcItem = path64.join(src, item.name);
         const destItem = path64.join(dest, item.name);
-        promises2.push(
+        promises3.push(
           runFilter(srcItem, destItem, opts).then((include) => {
             if (include) {
               return stat2.checkPaths(srcItem, destItem, "copy", opts).then(({ destStat: destStat2 }) => {
@@ -65187,7 +65187,7 @@ var require_copy = __commonJS({
           })
         );
       }
-      await Promise.all(promises2);
+      await Promise.all(promises3);
       if (!destStat) {
         await fs60.chmod(dest, srcStat.mode);
       }
@@ -68639,7 +68639,7 @@ var require_extension = __commonJS({
 var require_websocket = __commonJS({
   "node_modules/ws/lib/websocket.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("events");
+    var EventEmitter11 = __require("events");
     var https3 = __require("https");
     var http6 = __require("http");
     var net3 = __require("net");
@@ -68671,7 +68671,7 @@ var require_websocket = __commonJS({
     var protocolVersions = [8, 13];
     var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
     var subprotocolRegex = /^[!#$%&'*+\-.0-9A-Z^_`|a-z~]+$/;
-    var WebSocket2 = class _WebSocket extends EventEmitter10 {
+    var WebSocket2 = class _WebSocket extends EventEmitter11 {
       /**
        * Create a new `WebSocket`.
        *
@@ -69665,7 +69665,7 @@ var require_subprotocol = __commonJS({
 var require_websocket_server = __commonJS({
   "node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("events");
+    var EventEmitter11 = __require("events");
     var http6 = __require("http");
     var { Duplex: Duplex5 } = __require("stream");
     var { createHash: createHash11 } = __require("crypto");
@@ -69678,7 +69678,7 @@ var require_websocket_server = __commonJS({
     var RUNNING = 0;
     var CLOSING = 1;
     var CLOSED2 = 2;
-    var WebSocketServer2 = class extends EventEmitter10 {
+    var WebSocketServer2 = class extends EventEmitter11 {
       /**
        * Create a `WebSocketServer` instance.
        *
@@ -70088,6 +70088,62 @@ var init_base_token_storage = __esm({
   }
 });
 
+// packages/core/dist/src/utils/events.js
+import { EventEmitter as EventEmitter4 } from "node:events";
+var CoreEvent, CoreEventEmitter, coreEvents;
+var init_events = __esm({
+  "packages/core/dist/src/utils/events.js"() {
+    "use strict";
+    (function(CoreEvent2) {
+      CoreEvent2["UserFeedback"] = "user-feedback";
+    })(CoreEvent || (CoreEvent = {}));
+    CoreEventEmitter = class _CoreEventEmitter extends EventEmitter4 {
+      _feedbackBacklog = [];
+      static MAX_BACKLOG_SIZE = 1e4;
+      constructor() {
+        super();
+      }
+      /**
+       * Sends actionable feedback to the user.
+       * Buffers automatically if the UI hasn't subscribed yet.
+       */
+      emitFeedback(severity, message, error) {
+        const payload = { severity, message, error };
+        if (this.listenerCount(CoreEvent.UserFeedback) === 0) {
+          if (this._feedbackBacklog.length >= _CoreEventEmitter.MAX_BACKLOG_SIZE) {
+            this._feedbackBacklog.shift();
+          }
+          this._feedbackBacklog.push(payload);
+        } else {
+          this.emit(CoreEvent.UserFeedback, payload);
+        }
+      }
+      /**
+       * Flushes buffered messages. Call this immediately after primary UI listener
+       * subscribes.
+       */
+      drainFeedbackBacklog() {
+        const backlog = [...this._feedbackBacklog];
+        this._feedbackBacklog.length = 0;
+        for (const payload of backlog) {
+          this.emit(CoreEvent.UserFeedback, payload);
+        }
+      }
+      on(event, listener) {
+        return super.on(event, listener);
+      }
+      off(event, listener) {
+        return super.off(event, listener);
+      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      emit(event, ...args2) {
+        return super.emit(event, ...args2);
+      }
+    };
+    coreEvents = new CoreEventEmitter();
+  }
+});
+
 // packages/core/dist/src/mcp/token-storage/keychain-token-storage.js
 var keychain_token_storage_exports = {};
 __export(keychain_token_storage_exports, {
@@ -70099,6 +70155,7 @@ var init_keychain_token_storage = __esm({
   "packages/core/dist/src/mcp/token-storage/keychain-token-storage.js"() {
     "use strict";
     init_base_token_storage();
+    init_events();
     KEYCHAIN_TEST_PREFIX = "__keychain_test__";
     KeychainTokenStorage = class extends BaseTokenStorage {
       keychainAvailable = null;
@@ -70114,7 +70171,7 @@ var init_keychain_token_storage = __esm({
           const module2 = await import(moduleName2);
           this.keytarModule = module2.default || module2;
         } catch (error) {
-          console.error(error);
+          coreEvents.emitFeedback("error", "Failed to load 'keytar' module", error);
         }
         return this.keytarModule;
       }
@@ -70187,7 +70244,7 @@ var init_keychain_token_storage = __esm({
           const credentials = await keytar.findCredentials(this.serviceName);
           return credentials.filter((cred) => !cred.account.startsWith(KEYCHAIN_TEST_PREFIX)).map((cred) => cred.account);
         } catch (error) {
-          console.error("Failed to list servers from keychain:", error);
+          coreEvents.emitFeedback("error", "Failed to list servers from keychain", error);
           return [];
         }
       }
@@ -70209,11 +70266,11 @@ var init_keychain_token_storage = __esm({
                 result.set(cred.account, data);
               }
             } catch (error) {
-              console.error(`Failed to parse credentials for ${cred.account}:`, error);
+              coreEvents.emitFeedback("error", `Failed to parse credentials for ${cred.account}`, error);
             }
           }
         } catch (error) {
-          console.error("Failed to get all credentials from keychain:", error);
+          coreEvents.emitFeedback("error", "Failed to get all credentials from keychain", error);
         }
         return result;
       }
@@ -93130,18 +93187,18 @@ var require_base64 = __commonJS({
 var require_eventemitter = __commonJS({
   "node_modules/@protobufjs/eventemitter/index.js"(exports2, module2) {
     "use strict";
-    module2.exports = EventEmitter10;
-    function EventEmitter10() {
+    module2.exports = EventEmitter11;
+    function EventEmitter11() {
       this._listeners = {};
     }
-    EventEmitter10.prototype.on = function on6(evt, fn, ctx) {
+    EventEmitter11.prototype.on = function on6(evt, fn, ctx) {
       (this._listeners[evt] || (this._listeners[evt] = [])).push({
         fn,
         ctx: ctx || this
       });
       return this;
     };
-    EventEmitter10.prototype.off = function off(evt, fn) {
+    EventEmitter11.prototype.off = function off(evt, fn) {
       if (evt === void 0)
         this._listeners = {};
       else {
@@ -93158,7 +93215,7 @@ var require_eventemitter = __commonJS({
       }
       return this;
     };
-    EventEmitter10.prototype.emit = function emit(evt) {
+    EventEmitter11.prototype.emit = function emit(evt) {
       var listeners = this._listeners[evt];
       if (listeners) {
         var args2 = [], i3 = 1;
@@ -95890,7 +95947,7 @@ var require_root = __commonJS({
         }
         return null;
       }
-      function process23(filename2, source) {
+      function process25(filename2, source) {
         try {
           if (util4.isString(source) && source.charAt(0) === "{")
             source = JSON.parse(source);
@@ -95925,12 +95982,12 @@ var require_root = __commonJS({
         self2.files.push(filename2);
         if (filename2 in common2) {
           if (sync2) {
-            process23(filename2, common2[filename2]);
+            process25(filename2, common2[filename2]);
           } else {
             ++queued;
             setTimeout(function() {
               --queued;
-              process23(filename2, common2[filename2]);
+              process25(filename2, common2[filename2]);
             });
           }
           return;
@@ -95944,7 +96001,7 @@ var require_root = __commonJS({
               finish(err2);
             return;
           }
-          process23(filename2, source);
+          process25(filename2, source);
         } else {
           ++queued;
           self2.fetch(filename2, function(err2, source2) {
@@ -95959,7 +96016,7 @@ var require_root = __commonJS({
                 finish(null, self2);
               return;
             }
-            process23(filename2, source2);
+            process25(filename2, source2);
           });
         }
       }
@@ -120331,8 +120388,8 @@ var require_utils12 = __commonJS({
       });
     }
     exports2.callWithTimeout = callWithTimeout;
-    async function PromiseAllSettled(promises2) {
-      return Promise.all(promises2.map(async (p) => {
+    async function PromiseAllSettled(promises3) {
+      return Promise.all(promises3.map(async (p) => {
         try {
           const ret = await p;
           return {
@@ -122684,13 +122741,13 @@ var require_getMachineId_win = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getMachineId = void 0;
-    var process23 = __require("process");
+    var process25 = __require("process");
     var execAsync_1 = require_execAsync();
     var api_1 = (init_esm2(), __toCommonJS(esm_exports5));
     async function getMachineId() {
       const args2 = "QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography /v MachineGuid";
       let command = "%windir%\\System32\\REG.exe";
-      if (process23.arch === "ia32" && "PROCESSOR_ARCHITEW6432" in process23.env) {
+      if (process25.arch === "ia32" && "PROCESSOR_ARCHITEW6432" in process25.env) {
         command = "%windir%\\sysnative\\cmd.exe /c " + command;
       }
       try {
@@ -122729,11 +122786,11 @@ var require_getMachineId = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getMachineId = void 0;
-    var process23 = __require("process");
+    var process25 = __require("process");
     var getMachineIdImpl;
     async function getMachineId() {
       if (!getMachineIdImpl) {
-        switch (process23.platform) {
+        switch (process25.platform) {
           case "darwin":
             getMachineIdImpl = (await Promise.resolve().then(() => __toESM(require_getMachineId_darwin()))).getMachineId;
             break;
@@ -126224,12 +126281,12 @@ var require_BatchLogRecordProcessorBase = __commonJS({
        * */
       _flushAll() {
         return new Promise((resolve13, reject) => {
-          const promises2 = [];
+          const promises3 = [];
           const batchCount = Math.ceil(this._finishedLogRecords.length / this._maxExportBatchSize);
           for (let i3 = 0; i3 < batchCount; i3++) {
-            promises2.push(this._flushOneBatch());
+            promises3.push(this._flushOneBatch());
           }
-          Promise.all(promises2).then(() => {
+          Promise.all(promises3).then(() => {
             resolve13();
           }).catch(reject);
         });
@@ -127291,12 +127348,12 @@ var require_BatchSpanProcessorBase = __commonJS({
        * */
       _flushAll() {
         return new Promise((resolve13, reject) => {
-          const promises2 = [];
+          const promises3 = [];
           const count2 = Math.ceil(this._finishedSpans.length / this._maxExportBatchSize);
           for (let i3 = 0, j = count2; i3 < j; i3++) {
-            promises2.push(this._flushOneBatch());
+            promises3.push(this._flushOneBatch());
           }
-          Promise.all(promises2).then(() => {
+          Promise.all(promises3).then(() => {
             resolve13();
           }).catch(reject);
         });
@@ -127607,12 +127664,12 @@ var require_MultiSpanProcessor = __commonJS({
         this._spanProcessors = _spanProcessors;
       }
       forceFlush() {
-        const promises2 = [];
+        const promises3 = [];
         for (const spanProcessor of this._spanProcessors) {
-          promises2.push(spanProcessor.forceFlush());
+          promises3.push(spanProcessor.forceFlush());
         }
         return new Promise((resolve13) => {
-          Promise.all(promises2).then(() => {
+          Promise.all(promises3).then(() => {
             resolve13();
           }).catch((error) => {
             (0, core_1.globalErrorHandler)(error || new Error("MultiSpanProcessor: forceFlush failed"));
@@ -127631,12 +127688,12 @@ var require_MultiSpanProcessor = __commonJS({
         }
       }
       shutdown() {
-        const promises2 = [];
+        const promises3 = [];
         for (const spanProcessor of this._spanProcessors) {
-          promises2.push(spanProcessor.shutdown());
+          promises3.push(spanProcessor.shutdown());
         }
         return new Promise((resolve13, reject) => {
-          Promise.all(promises2).then(() => {
+          Promise.all(promises3).then(() => {
             resolve13();
           }, reject);
         });
@@ -127691,7 +127748,7 @@ var require_BasicTracerProvider = __commonJS({
       }
       forceFlush() {
         const timeout = this._config.forceFlushTimeoutMillis;
-        const promises2 = this._activeSpanProcessor["_spanProcessors"].map((spanProcessor) => {
+        const promises3 = this._activeSpanProcessor["_spanProcessors"].map((spanProcessor) => {
           return new Promise((resolve13) => {
             let state;
             const timeoutInterval = setTimeout(() => {
@@ -127712,7 +127769,7 @@ var require_BasicTracerProvider = __commonJS({
           });
         });
         return new Promise((resolve13, reject) => {
-          Promise.all(promises2).then((results) => {
+          Promise.all(promises3).then((results) => {
             const errors = results.filter((result) => result !== ForceFlushState.resolved);
             if (errors.length > 0) {
               reject(errors);
@@ -132658,17 +132715,17 @@ var require_sdk = __commonJS({
         }
       }
       shutdown() {
-        const promises2 = [];
+        const promises3 = [];
         if (this._tracerProvider) {
-          promises2.push(this._tracerProvider.shutdown());
+          promises3.push(this._tracerProvider.shutdown());
         }
         if (this._loggerProvider) {
-          promises2.push(this._loggerProvider.shutdown());
+          promises3.push(this._loggerProvider.shutdown());
         }
         if (this._meterProvider) {
-          promises2.push(this._meterProvider.shutdown());
+          promises3.push(this._meterProvider.shutdown());
         }
-        return Promise.all(promises2).then(() => {
+        return Promise.all(promises3).then(() => {
         });
       }
       configureLoggerProviderFromEnv() {
@@ -139548,10 +139605,10 @@ var require_http22 = __commonJS({
     var extend = require_extend();
     var stream_1 = __require("stream");
     var util4 = __require("util");
-    var process23 = __require("process");
+    var process25 = __require("process");
     var common_1 = require_common3();
     var { HTTP2_HEADER_CONTENT_ENCODING, HTTP2_HEADER_CONTENT_TYPE, HTTP2_HEADER_METHOD, HTTP2_HEADER_PATH, HTTP2_HEADER_STATUS } = http22.constants;
-    var DEBUG = !!process23.env.HTTP2_DEBUG;
+    var DEBUG = !!process25.env.HTTP2_DEBUG;
     exports2.sessions = {};
     async function request3(config2) {
       const opts = extend(true, {}, config2);
@@ -210806,15 +210863,15 @@ var require_fd_slicer = __commonJS({
     var Writable6 = stream3.Writable;
     var PassThrough4 = stream3.PassThrough;
     var Pend = require_pend();
-    var EventEmitter10 = __require("events").EventEmitter;
+    var EventEmitter11 = __require("events").EventEmitter;
     exports2.createFromBuffer = createFromBuffer;
     exports2.createFromFd = createFromFd;
     exports2.BufferSlicer = BufferSlicer;
     exports2.FdSlicer = FdSlicer;
-    util4.inherits(FdSlicer, EventEmitter10);
+    util4.inherits(FdSlicer, EventEmitter11);
     function FdSlicer(fd, options2) {
       options2 = options2 || {};
-      EventEmitter10.call(this);
+      EventEmitter11.call(this);
       this.fd = fd;
       this.pend = new Pend();
       this.pend.max = 1;
@@ -210958,9 +211015,9 @@ var require_fd_slicer = __commonJS({
       this.destroyed = true;
       this.context.unref();
     };
-    util4.inherits(BufferSlicer, EventEmitter10);
+    util4.inherits(BufferSlicer, EventEmitter11);
     function BufferSlicer(buffer, options2) {
-      EventEmitter10.call(this);
+      EventEmitter11.call(this);
       options2 = options2 || {};
       this.refCount = 0;
       this.buffer = buffer;
@@ -211370,7 +211427,7 @@ var require_yauzl = __commonJS({
     var fd_slicer = require_fd_slicer();
     var crc32 = require_buffer_crc32();
     var util4 = __require("util");
-    var EventEmitter10 = __require("events").EventEmitter;
+    var EventEmitter11 = __require("events").EventEmitter;
     var Transform4 = __require("stream").Transform;
     var PassThrough4 = __require("stream").PassThrough;
     var Writable6 = __require("stream").Writable;
@@ -211502,10 +211559,10 @@ var require_yauzl = __commonJS({
         callback(new Error("end of central directory record signature not found"));
       });
     }
-    util4.inherits(ZipFile, EventEmitter10);
+    util4.inherits(ZipFile, EventEmitter11);
     function ZipFile(reader, centralDirectoryOffset, fileSize, entryCount, comment, autoClose, lazyEntries, decodeStrings, validateEntrySizes, strictFileNames) {
       var self2 = this;
-      EventEmitter10.call(self2);
+      EventEmitter11.call(self2);
       self2.reader = reader;
       self2.reader.on("error", function(err2) {
         emitError(self2, err2);
@@ -211866,9 +211923,9 @@ var require_yauzl = __commonJS({
       }
       cb();
     };
-    util4.inherits(RandomAccessReader, EventEmitter10);
+    util4.inherits(RandomAccessReader, EventEmitter11);
     function RandomAccessReader() {
-      EventEmitter10.call(this);
+      EventEmitter11.call(this);
       this.refCount = 0;
     }
     RandomAccessReader.prototype.ref = function() {
@@ -212874,7 +212931,7 @@ var require_json_buffer = __commonJS({
 var require_src56 = __commonJS({
   "node_modules/keyv/src/index.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("events");
+    var EventEmitter11 = __require("events");
     var JSONB = require_json_buffer();
     var loadStore = (options2) => {
       const adapters = {
@@ -212904,7 +212961,7 @@ var require_src56 = __commonJS({
       "redis",
       "tiered"
     ];
-    var Keyv2 = class extends EventEmitter10 {
+    var Keyv2 = class extends EventEmitter11 {
       constructor(uri, { emitErrors = true, ...options2 } = {}) {
         super();
         this.opts = {
@@ -212963,9 +213020,9 @@ var require_src56 = __commonJS({
         const isArray2 = Array.isArray(key);
         const keyPrefixed = isArray2 ? this._getKeyPrefixArray(key) : this._getKeyPrefix(key);
         if (isArray2 && store.getMany === void 0) {
-          const promises2 = [];
+          const promises3 = [];
           for (const key2 of keyPrefixed) {
-            promises2.push(
+            promises3.push(
               Promise.resolve().then(() => store.get(key2)).then((data) => typeof data === "string" ? this.opts.deserialize(data) : this.opts.compression ? this.opts.deserialize(data) : data).then((data) => {
                 if (data === void 0 || data === null) {
                   return void 0;
@@ -212977,7 +213034,7 @@ var require_src56 = __commonJS({
               })
             );
           }
-          return Promise.allSettled(promises2).then((values) => {
+          return Promise.allSettled(promises3).then((values) => {
             const data = [];
             for (const value of values) {
               data.push(value.value);
@@ -213033,11 +213090,11 @@ var require_src56 = __commonJS({
         if (Array.isArray(key)) {
           const keyPrefixed2 = this._getKeyPrefixArray(key);
           if (store.deleteMany === void 0) {
-            const promises2 = [];
+            const promises3 = [];
             for (const key2 of keyPrefixed2) {
-              promises2.push(store.delete(key2));
+              promises3.push(store.delete(key2));
             }
-            return Promise.allSettled(promises2).then((values) => values.every((x) => x.value === true));
+            return Promise.allSettled(promises3).then((values) => values.every((x) => x.value === true));
           }
           return Promise.resolve().then(() => store.deleteMany(keyPrefixed2));
         }
@@ -213327,7 +213384,7 @@ var require_agent3 = __commonJS({
   "node_modules/http2-wrapper/source/agent.js"(exports2, module2) {
     "use strict";
     var { URL: URL9 } = __require("url");
-    var EventEmitter10 = __require("events");
+    var EventEmitter11 = __require("events");
     var tls = __require("tls");
     var http22 = __require("http2");
     var QuickLRU = require_quick_lru();
@@ -213425,7 +213482,7 @@ var require_agent3 = __commonJS({
         session.close();
       }
     };
-    var Agent3 = class _Agent extends EventEmitter10 {
+    var Agent3 = class _Agent extends EventEmitter11 {
       constructor({ timeout = 0, maxSessions = Number.POSITIVE_INFINITY, maxEmptySessions = 10, maxCachedTlsSessions = 100 } = {}) {
         super();
         this.sessions = {};
@@ -217122,10 +217179,10 @@ var require_wrap_handler = __commonJS({
 var require_dispatcher = __commonJS({
   "node_modules/undici/lib/dispatcher/dispatcher.js"(exports2, module2) {
     "use strict";
-    var EventEmitter10 = __require("node:events");
+    var EventEmitter11 = __require("node:events");
     var WrapHandler = require_wrap_handler();
     var wrapInterceptor = (dispatch) => (opts, handler) => dispatch(opts, WrapHandler.wrap(handler));
-    var Dispatcher = class extends EventEmitter10 {
+    var Dispatcher = class extends EventEmitter11 {
       dispatch() {
         throw new Error("not implemented");
       }
@@ -228968,9 +229025,9 @@ var require_memory_cache_store = __commonJS({
   "node_modules/undici/lib/cache/memory-cache-store.js"(exports2, module2) {
     "use strict";
     var { Writable: Writable6 } = __require("node:stream");
-    var { EventEmitter: EventEmitter10 } = __require("node:events");
+    var { EventEmitter: EventEmitter11 } = __require("node:events");
     var { assertCacheKey, assertCacheValue } = require_cache2();
-    var MemoryCacheStore = class extends EventEmitter10 {
+    var MemoryCacheStore = class extends EventEmitter11 {
       #maxCount = 1024;
       #maxSize = 104857600;
       // 100MB
@@ -236837,20 +236894,6 @@ var require_undici = __commonJS({
   }
 });
 
-// node_modules/strip-ansi/node_modules/ansi-regex/index.js
-var require_ansi_regex = __commonJS({
-  "node_modules/strip-ansi/node_modules/ansi-regex/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = ({ onlyFirst = false } = {}) => {
-      const pattern = [
-        "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
-        "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
-      ].join("|");
-      return new RegExp(pattern, onlyFirst ? void 0 : "g");
-    };
-  }
-});
-
 // node_modules/chardet/lib/fs/node.js
 var require_node22 = __commonJS({
   "node_modules/chardet/lib/fs/node.js"(exports2, module2) {
@@ -258218,20 +258261,20 @@ var Bucket = class _Bucket extends ServiceObject {
     };
     (async () => {
       try {
-        let promises2 = [];
+        let promises3 = [];
         const limit = (0, import_p_limit.default)(MAX_PARALLEL_LIMIT);
         const filesStream = this.getFilesStream(query);
         for await (const curFile of filesStream) {
-          if (promises2.length >= MAX_QUEUE_SIZE) {
-            await Promise.all(promises2);
-            promises2 = [];
+          if (promises3.length >= MAX_QUEUE_SIZE) {
+            await Promise.all(promises3);
+            promises3 = [];
           }
-          promises2.push(limit(() => deleteFile(curFile)).catch((e2) => {
+          promises3.push(limit(() => deleteFile(curFile)).catch((e2) => {
             filesStream.destroy();
             throw e2;
           }));
         }
-        await Promise.all(promises2);
+        await Promise.all(promises3);
         callback(errors.length > 0 ? errors : null);
       } catch (e2) {
         callback(e2);
@@ -260143,10 +260186,10 @@ var Bucket = class _Bucket extends ServiceObject {
     };
     this.getFiles(options2).then(([files]) => {
       const limit = (0, import_p_limit.default)(MAX_PARALLEL_LIMIT);
-      const promises2 = files.map((file) => {
+      const promises3 = files.map((file) => {
         return limit(() => processFile(file));
       });
-      return Promise.all(promises2);
+      return Promise.all(promises3);
     }).then(() => callback(errors.length > 0 ? errors : null, updatedFiles), (err2) => callback(err2, updatedFiles));
   }
   getId() {
@@ -267244,7 +267287,7 @@ var mtimeFilter = (opt) => {
 // packages/a2a-server/src/persistence/gcs.ts
 var fse = __toESM(require_lib8(), 1);
 import { promises as fsPromises4, createReadStream as createReadStream4 } from "node:fs";
-import { tmpdir as tmpdir3 } from "node:os";
+import { tmpdir as tmpdir4 } from "node:os";
 import { join as join22 } from "node:path";
 
 // packages/a2a-server/src/config/config.ts
@@ -267255,7 +267298,7 @@ import { homedir as homedir5 } from "node:os";
 
 // packages/core/dist/src/config/config.js
 import * as path56 from "node:path";
-import process22 from "node:process";
+import process24 from "node:process";
 
 // node_modules/@google/genai/dist/node/index.mjs
 var import_google_auth_library6 = __toESM(require_src10(), 1);
@@ -284918,12 +284961,7 @@ function shortenPath(filePath, maxLen = 35) {
   if (filePath.length <= maxLen) {
     return filePath;
   }
-  const parsedPath = path10.parse(filePath);
-  const root = parsedPath.root;
-  const separator = path10.sep;
-  const relativePath = filePath.substring(root.length);
-  const segments = relativePath.split(separator).filter((s2) => s2 !== "");
-  if (segments.length <= 1) {
+  const simpleTruncate = () => {
     const keepLen = Math.floor((maxLen - 3) / 2);
     if (keepLen <= 0) {
       return filePath.substring(0, maxLen - 3) + "...";
@@ -284931,29 +284969,134 @@ function shortenPath(filePath, maxLen = 35) {
     const start2 = filePath.substring(0, keepLen);
     const end = filePath.substring(filePath.length - keepLen);
     return `${start2}...${end}`;
+  };
+  const truncateComponent = (component, targetLength, mode) => {
+    if (component.length <= targetLength) {
+      return component;
+    }
+    if (targetLength <= 0) {
+      return "";
+    }
+    if (targetLength <= 3) {
+      if (mode === "end") {
+        return component.slice(-targetLength);
+      }
+      return component.slice(0, targetLength);
+    }
+    if (mode === "start") {
+      return `${component.slice(0, targetLength - 3)}...`;
+    }
+    if (mode === "end") {
+      return `...${component.slice(component.length - (targetLength - 3))}`;
+    }
+    const front = Math.ceil((targetLength - 3) / 2);
+    const back = targetLength - 3 - front;
+    return `${component.slice(0, front)}...${component.slice(component.length - back)}`;
+  };
+  const parsedPath = path10.parse(filePath);
+  const root = parsedPath.root;
+  const separator = path10.sep;
+  const relativePath = filePath.substring(root.length);
+  const segments = relativePath.split(separator).filter((s2) => s2 !== "");
+  if (segments.length <= 1) {
+    return simpleTruncate();
   }
   const firstDir = segments[0];
   const lastSegment = segments[segments.length - 1];
   const startComponent = root + firstDir;
-  const endPartSegments = [];
-  let currentLength = separator.length + lastSegment.length;
-  for (let i3 = segments.length - 2; i3 >= 0; i3--) {
+  const endPartSegments = [lastSegment];
+  let endPartLength = lastSegment.length;
+  for (let i3 = segments.length - 2; i3 > 0; i3--) {
     const segment = segments[i3];
-    const lengthWithSegment = currentLength + separator.length + segment.length;
-    if (lengthWithSegment <= maxLen) {
+    const newLength = startComponent.length + separator.length + 3 + // for "..."
+    separator.length + endPartLength + separator.length + segment.length;
+    if (newLength <= maxLen) {
       endPartSegments.unshift(segment);
-      currentLength = lengthWithSegment;
+      endPartLength += separator.length + segment.length;
     } else {
       break;
     }
   }
-  let result = endPartSegments.join(separator) + separator + lastSegment;
-  if (currentLength > maxLen) {
-    return result;
+  const components = [firstDir, ...endPartSegments];
+  const componentModes = components.map((_, index) => {
+    if (index === 0) {
+      return "start";
+    }
+    if (index === components.length - 1) {
+      return "end";
+    }
+    return "center";
+  });
+  const separatorsCount = endPartSegments.length + 1;
+  const fixedLen = root.length + separatorsCount * separator.length + 3;
+  const availableForComponents = maxLen - fixedLen;
+  const trailingFallback = () => {
+    const ellipsisTail = `...${separator}${lastSegment}`;
+    if (ellipsisTail.length <= maxLen) {
+      return ellipsisTail;
+    }
+    if (root) {
+      const rootEllipsisTail = `${root}...${separator}${lastSegment}`;
+      if (rootEllipsisTail.length <= maxLen) {
+        return rootEllipsisTail;
+      }
+    }
+    if (root && `${root}${lastSegment}`.length <= maxLen) {
+      return `${root}${lastSegment}`;
+    }
+    if (lastSegment.length <= maxLen) {
+      return lastSegment;
+    }
+    return simpleTruncate();
+  };
+  if (availableForComponents <= 0) {
+    return trailingFallback();
   }
-  result = startComponent + separator + result;
+  const minLengths = components.map((component, index) => {
+    if (index === 0) {
+      return Math.min(component.length, 1);
+    }
+    if (index === components.length - 1) {
+      return component.length;
+    }
+    return Math.min(component.length, 1);
+  });
+  const minTotal = minLengths.reduce((sum, len) => sum + len, 0);
+  if (availableForComponents < minTotal) {
+    return trailingFallback();
+  }
+  const budgets = components.map((component) => component.length);
+  let currentTotal = budgets.reduce((sum, len) => sum + len, 0);
+  const pickIndexToReduce = () => {
+    let bestIndex = -1;
+    let bestScore = -Infinity;
+    for (let i3 = 0; i3 < budgets.length; i3++) {
+      if (budgets[i3] <= minLengths[i3]) {
+        continue;
+      }
+      const isLast = i3 === budgets.length - 1;
+      const score = (isLast ? 0 : 1e6) + budgets[i3];
+      if (score > bestScore) {
+        bestScore = score;
+        bestIndex = i3;
+      }
+    }
+    return bestIndex;
+  };
+  while (currentTotal > availableForComponents) {
+    const index = pickIndexToReduce();
+    if (index === -1) {
+      return trailingFallback();
+    }
+    budgets[index]--;
+    currentTotal--;
+  }
+  const truncatedComponents = components.map((component, index) => truncateComponent(component, budgets[index], componentModes[index]));
+  const truncatedFirst = truncatedComponents[0];
+  const truncatedEnd = truncatedComponents.slice(1).join(separator);
+  const result = `${root}${truncatedFirst}${separator}...${separator}${truncatedEnd}`;
   if (result.length > maxLen) {
-    return "..." + result.substring(result.length - maxLen - 3);
+    return trailingFallback();
   }
   return result;
 }
@@ -285502,6 +285645,21 @@ function getUseEncryptedStorageFlag() {
   return process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 }
 async function initOauthClient(authType, config2) {
+  const credentials = await fetchCachedCredentials();
+  if (credentials && credentials.type === "external_account_authorized_user") {
+    const auth2 = new import_google_auth_library8.GoogleAuth({
+      scopes: OAUTH_SCOPE
+    });
+    const byoidClient = await auth2.fromJSON({
+      ...credentials,
+      refresh_token: credentials.refresh_token ?? void 0
+    });
+    const token2 = await byoidClient.getAccessToken();
+    if (token2) {
+      debugLogger.debug("Created BYOID auth client.");
+      return byoidClient;
+    }
+  }
   const client = new import_google_auth_library8.OAuth2Client({
     clientId: OAUTH_CLIENT_ID,
     clientSecret: OAUTH_CLIENT_SECRET,
@@ -285524,16 +285682,25 @@ async function initOauthClient(authType, config2) {
       await cacheCredentials(tokens);
     }
   });
-  if (await loadCachedCredentials(client)) {
-    if (!userAccountManager.getCachedGoogleAccount()) {
-      try {
-        await fetchAndCacheUserInfo(client);
-      } catch (error) {
-        debugLogger.warn("Failed to fetch user info:", getErrorMessage(error));
+  if (credentials) {
+    client.setCredentials(credentials);
+    try {
+      const { token: token2 } = await client.getAccessToken();
+      if (token2) {
+        await client.getTokenInfo(token2);
+        if (!userAccountManager.getCachedGoogleAccount()) {
+          try {
+            await fetchAndCacheUserInfo(client);
+          } catch (error) {
+            debugLogger.warn("Failed to fetch user info:", getErrorMessage(error));
+          }
+        }
+        debugLogger.log("Loaded cached credentials.");
+        return client;
       }
+    } catch (error) {
+      debugLogger.debug(`Cached credentials are not valid:`, getErrorMessage(error));
     }
-    debugLogger.log("Loaded cached credentials.");
-    return client;
   }
   if (authType === AuthType2.CLOUD_SHELL) {
     try {
@@ -285743,15 +285910,10 @@ function getAvailablePort() {
     }
   });
 }
-async function loadCachedCredentials(client) {
+async function fetchCachedCredentials() {
   const useEncryptedStorage = getUseEncryptedStorageFlag();
   if (useEncryptedStorage) {
-    const credentials = await OAuthCredentialStorage.loadCredentials();
-    if (credentials) {
-      client.setCredentials(credentials);
-      return true;
-    }
-    return false;
+    return await OAuthCredentialStorage.loadCredentials();
   }
   const pathsToTry = [
     Storage2.getOAuthCredsPath(),
@@ -285759,19 +285921,13 @@ async function loadCachedCredentials(client) {
   ].filter((p) => !!p);
   for (const keyFile of pathsToTry) {
     try {
-      const creds = await fs22.readFile(keyFile, "utf-8");
-      client.setCredentials(JSON.parse(creds));
-      const { token: token2 } = await client.getAccessToken();
-      if (!token2) {
-        continue;
-      }
-      await client.getTokenInfo(token2);
-      return true;
+      const keyFileString = await fs22.readFile(keyFile, "utf-8");
+      return JSON.parse(keyFileString);
     } catch (error) {
       debugLogger.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error));
     }
   }
-  return false;
+  return null;
 }
 async function cacheCredentials(credentials) {
   const filePath = Storage2.getOAuthCredsPath();
@@ -286349,24 +286505,18 @@ var BaseToolInvocation = class {
         throw new Error(`Tool execution for "${this._toolDisplayName || this._toolName}" denied by policy.`);
       }
       if (decision === "ASK_USER") {
-        const confirmationDetails = {
-          type: "info",
-          title: `Confirm: ${this._toolDisplayName || this._toolName}`,
-          prompt: this.getDescription(),
-          onConfirm: async (outcome) => {
-            if (outcome === ToolConfirmationOutcome.ProceedAlways) {
-              if (this.messageBus && this._toolName) {
-                this.messageBus.publish({
-                  type: MessageBusType.UPDATE_POLICY,
-                  toolName: this._toolName
-                });
-              }
-            }
-          }
-        };
-        return confirmationDetails;
+        return this.getConfirmationDetails(abortSignal);
       }
     }
+    return this.getConfirmationDetails(abortSignal);
+  }
+  /**
+   * Subclasses should override this method to provide custom confirmation UI
+   * when the policy engine's decision is 'ASK_USER'.
+   * The base implementation returns false (no confirmation needed).
+   * Only tools that need confirmation (e.g., write, execute tools) should override this.
+   */
+  async getConfirmationDetails(_abortSignal) {
     return false;
   }
   getMessageBusDecision(abortSignal) {
@@ -286784,7 +286934,7 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
   asFullyQualifiedTool() {
     return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.trust, `${this.serverName}__${this.serverToolName}`, this.cliConfig, this.extensionId);
   }
-  createInvocation(params) {
+  createInvocation(params, _messageBus, _toolName, _displayName) {
     return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, this.displayName, this.trust, params, this.cliConfig);
   }
 };
@@ -286968,90 +287118,6 @@ function getCommonAttributes(config2) {
 
 // packages/core/dist/src/telemetry/types.js
 init_esm();
-var EVENT_CLI_CONFIG = "gemini_cli.config";
-var StartSessionEvent = class {
-  "event.name";
-  "event.timestamp";
-  model;
-  embedding_model;
-  sandbox_enabled;
-  core_tools_enabled;
-  approval_mode;
-  api_key_enabled;
-  vertex_ai_enabled;
-  debug_enabled;
-  mcp_servers;
-  telemetry_enabled;
-  telemetry_log_user_prompts_enabled;
-  file_filtering_respect_git_ignore;
-  mcp_servers_count;
-  mcp_tools_count;
-  mcp_tools;
-  output_format;
-  extensions_count;
-  extension_ids;
-  constructor(config2, toolRegistry) {
-    const generatorConfig = config2.getContentGeneratorConfig();
-    const mcpServers = config2.getMcpServers();
-    let useGemini = false;
-    let useVertex = false;
-    if (generatorConfig && generatorConfig.authType) {
-      useGemini = generatorConfig.authType === AuthType2.USE_GEMINI;
-      useVertex = generatorConfig.authType === AuthType2.USE_VERTEX_AI;
-    }
-    this["event.name"] = "cli_config";
-    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
-    this.model = config2.getModel();
-    this.embedding_model = config2.getEmbeddingModel();
-    this.sandbox_enabled = typeof config2.getSandbox() === "string" || !!config2.getSandbox();
-    this.core_tools_enabled = (config2.getCoreTools() ?? []).join(",");
-    this.approval_mode = config2.getApprovalMode();
-    this.api_key_enabled = useGemini || useVertex;
-    this.vertex_ai_enabled = useVertex;
-    this.debug_enabled = config2.getDebugMode();
-    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(",") : "";
-    this.telemetry_enabled = config2.getTelemetryEnabled();
-    this.telemetry_log_user_prompts_enabled = config2.getTelemetryLogPromptsEnabled();
-    this.file_filtering_respect_git_ignore = config2.getFileFilteringRespectGitIgnore();
-    this.mcp_servers_count = mcpServers ? Object.keys(mcpServers).length : 0;
-    this.output_format = config2.getOutputFormat();
-    const extensions = config2.getExtensions();
-    this.extensions_count = extensions.length;
-    this.extension_ids = extensions.map((e2) => e2.id).join(",");
-    if (toolRegistry) {
-      const mcpTools = toolRegistry.getAllTools().filter((tool) => tool instanceof DiscoveredMCPTool);
-      this.mcp_tools_count = mcpTools.length;
-      this.mcp_tools = mcpTools.map((tool) => tool.name).join(",");
-    }
-  }
-  toOpenTelemetryAttributes(config2) {
-    return {
-      ...getCommonAttributes(config2),
-      "event.name": EVENT_CLI_CONFIG,
-      "event.timestamp": this["event.timestamp"],
-      model: this.model,
-      embedding_model: this.embedding_model,
-      sandbox_enabled: this.sandbox_enabled,
-      core_tools_enabled: this.core_tools_enabled,
-      approval_mode: this.approval_mode,
-      api_key_enabled: this.api_key_enabled,
-      vertex_ai_enabled: this.vertex_ai_enabled,
-      log_user_prompts_enabled: this.telemetry_log_user_prompts_enabled,
-      file_filtering_respect_git_ignore: this.file_filtering_respect_git_ignore,
-      debug_mode: this.debug_enabled,
-      mcp_servers: this.mcp_servers,
-      mcp_servers_count: this.mcp_servers_count,
-      mcp_tools: this.mcp_tools,
-      mcp_tools_count: this.mcp_tools_count,
-      output_format: this.output_format,
-      extensions_count: this.extensions_count,
-      extension_ids: this.extension_ids
-    };
-  }
-  toLogBody() {
-    return "CLI configuration loaded.";
-  }
-};
 var EVENT_TOOL_CALL = "gemini_cli.tool_call";
 var ToolCallEvent = class {
   "event.name";
@@ -287811,6 +287877,7 @@ var REGRESSION_DETECTION = "gemini_cli.performance.regression";
 var REGRESSION_PERCENTAGE_CHANGE = "gemini_cli.performance.regression.percentage_change";
 var BASELINE_COMPARISON = "gemini_cli.performance.baseline.comparison";
 var FLICKER_FRAME_COUNT = "gemini_cli.ui.flicker.count";
+var EXIT_FAIL_COUNT = "gemini_cli.exit.fail.count";
 var baseMetricDefinition = {
   getCommonAttributes
 };
@@ -287892,6 +287959,12 @@ var COUNTER_DEFINITIONS = {
     valueType: ValueType.INT,
     assign: (c4) => flickerFrameCounter = c4,
     attributes: {}
+  },
+  [EXIT_FAIL_COUNT]: {
+    description: "Counts CLI exit failures.",
+    valueType: ValueType.INT,
+    assign: (c4) => exitFailCounter = c4,
+    attributes: {}
   }
 };
 var HISTOGRAM_DEFINITIONS = {
@@ -288094,6 +288167,7 @@ var agentRunCounter;
 var agentDurationHistogram;
 var agentTurnsHistogram;
 var flickerFrameCounter;
+var exitFailCounter;
 var genAiClientTokenUsageHistogram;
 var genAiClientOperationDurationHistogram;
 var startupTimeHistogram;
@@ -288503,8 +288577,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "a7faa208";
-var CLI_VERSION = "0.12.0-nightly.20251023.a7faa208";
+var GIT_COMMIT_INFO = "cb0947c5";
+var CLI_VERSION = "0.12.0-nightly.20251027.cb0947c5";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -288689,6 +288763,36 @@ var ClearcutLogger = class _ClearcutLogger {
       }
     }
   }
+  createBasicLogEvent(eventName, data = []) {
+    const surface = determineSurface();
+    return {
+      console_type: "GEMINI_CLI",
+      application: 102,
+      // GEMINI_CLI
+      event_name: eventName,
+      event_metadata: [
+        [
+          ...data,
+          {
+            gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
+            value: surface
+          },
+          {
+            gemini_cli_key: EventMetadataKey.GEMINI_CLI_VERSION,
+            value: CLI_VERSION
+          },
+          {
+            gemini_cli_key: EventMetadataKey.GEMINI_CLI_GIT_COMMIT_HASH,
+            value: GIT_COMMIT_INFO
+          },
+          {
+            gemini_cli_key: EventMetadataKey.GEMINI_CLI_OS,
+            value: process.platform
+          }
+        ]
+      ]
+    };
+  }
   createLogEvent(eventName, data = []) {
     const email = this.userAccountManager.getCachedGoogleAccount();
     if (eventName !== EventNames.START_SESSION) {
@@ -288696,13 +288800,7 @@ var ClearcutLogger = class _ClearcutLogger {
     }
     const totalAccounts = this.userAccountManager.getLifetimeGoogleAccounts();
     data = this.addDefaultFields(data, totalAccounts);
-    const logEvent = {
-      console_type: "GEMINI_CLI",
-      application: 102,
-      // GEMINI_CLI
-      event_name: eventName,
-      event_metadata: [data]
-    };
+    const logEvent = this.createBasicLogEvent(eventName, data);
     if (email) {
       logEvent.client_email = email;
     } else {
@@ -289243,7 +289341,7 @@ var ClearcutLogger = class _ClearcutLogger {
         value: event.status
       }
     ];
-    this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_INSTALL, data));
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data));
     this.flushToClearcut().catch((error) => {
       debugLogger.debug("Error flushing to Clearcut:", error);
     });
@@ -289263,7 +289361,7 @@ var ClearcutLogger = class _ClearcutLogger {
         value: event.status
       }
     ];
-    this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_UNINSTALL, data));
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data));
     this.flushToClearcut().catch((error) => {
       debugLogger.debug("Error flushing to Clearcut:", error);
     });
@@ -289295,7 +289393,7 @@ var ClearcutLogger = class _ClearcutLogger {
         value: event.status
       }
     ];
-    this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_UPDATE, data));
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data));
     this.flushToClearcut().catch((error) => {
       debugLogger.debug("Error flushing to Clearcut:", error);
     });
@@ -289369,7 +289467,7 @@ var ClearcutLogger = class _ClearcutLogger {
         value: event.setting_scope
       }
     ];
-    this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_ENABLE, data));
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data));
     this.flushToClearcut().catch((error) => {
       debugLogger.debug("Error flushing to Clearcut:", error);
     });
@@ -289399,7 +289497,7 @@ var ClearcutLogger = class _ClearcutLogger {
         value: event.setting_scope
       }
     ];
-    this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_DISABLE, data));
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data));
     this.flushToClearcut().catch((error) => {
       debugLogger.debug("Error flushing to Clearcut:", error);
     });
@@ -289479,7 +289577,6 @@ var ClearcutLogger = class _ClearcutLogger {
    * should exist on all log events.
    */
   addDefaultFields(data, totalAccounts) {
-    const surface = determineSurface();
     const defaultLogMetadata = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
@@ -289493,26 +289590,10 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
         value: `${totalAccounts}`
       },
-      {
-        gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
-        value: surface
-      },
-      {
-        gemini_cli_key: EventMetadataKey.GEMINI_CLI_VERSION,
-        value: CLI_VERSION
-      },
-      {
-        gemini_cli_key: EventMetadataKey.GEMINI_CLI_GIT_COMMIT_HASH,
-        value: GIT_COMMIT_INFO
-      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_PROMPT_ID,
         value: this.promptId
       },
-      {
-        gemini_cli_key: EventMetadataKey.GEMINI_CLI_OS,
-        value: process.platform
-      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_NODE_VERSION,
         value: process.versions.node
@@ -289722,7 +289803,7 @@ var GcpLogExporter = class {
 };
 
 // packages/core/dist/src/telemetry/uiTelemetry.js
-import { EventEmitter as EventEmitter4 } from "node:events";
+import { EventEmitter as EventEmitter5 } from "node:events";
 var createInitialModelMetrics = () => ({
   api: {
     totalRequests: 0,
@@ -289758,7 +289839,7 @@ var createInitialMetrics = () => ({
     totalLinesRemoved: 0
   }
 });
-var UiTelemetryService = class extends EventEmitter4 {
+var UiTelemetryService = class extends EventEmitter5 {
   #metrics = createInitialMetrics();
   #lastPromptTokenCount = 0;
   addEvent(event) {
@@ -290522,17 +290603,6 @@ async function shutdownTelemetry(config2) {
 }
 
 // packages/core/dist/src/telemetry/loggers.js
-function logCliConfiguration(config2, event) {
-  ClearcutLogger.getInstance(config2)?.logStartSessionEvent(event);
-  if (!isTelemetrySdkInitialized())
-    return;
-  const logger6 = import_api_logs.logs.getLogger(SERVICE_NAME);
-  const logRecord = {
-    body: event.toLogBody(),
-    attributes: event.toOpenTelemetryAttributes(config2)
-  };
-  logger6.emit(logRecord);
-}
 function logToolCall(config2, event) {
   const uiEvent = {
     ...event,
@@ -290849,43 +290919,6 @@ function isApiError(error) {
 function isStructuredError(error) {
   return typeof error === "object" && error !== null && "message" in error && typeof error.message === "string";
 }
-function isProQuotaExceededError(error) {
-  const checkMessage = (message) => message.includes("Quota exceeded for quota metric 'Gemini") && message.includes("Pro Requests'");
-  if (typeof error === "string") {
-    return checkMessage(error);
-  }
-  if (isStructuredError(error)) {
-    return checkMessage(error.message);
-  }
-  if (isApiError(error)) {
-    return checkMessage(error.error.message);
-  }
-  if (error && typeof error === "object" && "response" in error) {
-    const gaxiosError = error;
-    if (gaxiosError.response && gaxiosError.response.data) {
-      if (typeof gaxiosError.response.data === "string") {
-        return checkMessage(gaxiosError.response.data);
-      }
-      if (typeof gaxiosError.response.data === "object" && gaxiosError.response.data !== null && "error" in gaxiosError.response.data) {
-        const errorData = gaxiosError.response.data;
-        return checkMessage(errorData.error?.message || "");
-      }
-    }
-  }
-  return false;
-}
-function isGenericQuotaExceededError(error) {
-  if (typeof error === "string") {
-    return error.includes("Quota exceeded for quota metric");
-  }
-  if (isStructuredError(error)) {
-    return error.message.includes("Quota exceeded for quota metric");
-  }
-  if (isApiError(error)) {
-    return error.error.message.includes("Quota exceeded for quota metric");
-  }
-  return false;
-}
 
 // packages/core/dist/src/core/loggingContentGenerator.js
 var LoggingContentGenerator = class {
@@ -290974,6 +291007,58 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
   throw new Error(`Unsupported authType: ${authType}`);
 }
 
+// packages/core/dist/src/core/fakeContentGenerator.js
+import { promises } from "node:fs";
+var FakeContentGenerator = class _FakeContentGenerator {
+  responses;
+  callCounters = {
+    generateContent: 0,
+    generateContentStream: 0,
+    countTokens: 0,
+    embedContent: 0
+  };
+  userTier;
+  constructor(responses) {
+    this.responses = {
+      generateContent: responses.generateContent ?? [],
+      generateContentStream: responses.generateContentStream ?? [],
+      countTokens: responses.countTokens ?? [],
+      embedContent: responses.embedContent ?? []
+    };
+  }
+  static async fromFile(filePath) {
+    const fileContent = await promises.readFile(filePath, "utf-8");
+    const responses = JSON.parse(fileContent);
+    return new _FakeContentGenerator(responses);
+  }
+  getNextResponse(method, request3) {
+    const response = this.responses[method][this.callCounters[method]++];
+    if (!response) {
+      throw new Error(`No more mock responses for ${method}, got request:
+` + safeJsonStringify(request3));
+    }
+    return response;
+  }
+  async generateContent(_request, _userPromptId) {
+    return this.getNextResponse("generateContent", _request);
+  }
+  async generateContentStream(_request, _userPromptId) {
+    const responses = this.getNextResponse("generateContentStream", _request);
+    async function* stream3() {
+      for (const response of responses) {
+        yield response;
+      }
+    }
+    return stream3();
+  }
+  async countTokens(_request) {
+    return this.getNextResponse("countTokens", _request);
+  }
+  async embedContent(_request) {
+    return this.getNextResponse("embedContent", _request);
+  }
+};
+
 // packages/core/dist/src/core/contentGenerator.js
 var AuthType2;
 (function(AuthType3) {
@@ -291007,7 +291092,10 @@ function createContentGeneratorConfig(config2, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, gcConfig, sessionId2) {
-  const version3 = "0.12.0-nightly.20251023.a7faa208";
+  if (gcConfig.fakeResponses) {
+    return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
+  }
+  const version3 = "0.12.0-nightly.20251027.cb0947c5";
   const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -298309,10 +298397,242 @@ var import_shell_quote = __toESM(require_shell_quote(), 1);
 
 // packages/core/dist/src/mcp/google-auth-provider.js
 var import_google_auth_library9 = __toESM(require_src10(), 1);
+
+// packages/core/dist/src/mcp/oauth-utils.js
+var FIVE_MIN_BUFFER_MS = 5 * 60 * 1e3;
+var OAuthUtils = class {
+  /**
+   * Construct well-known OAuth endpoint URLs.
+   * By default, uses standard root-based well-known URLs.
+   * If includePathSuffix is true, appends any path from the base URL to the well-known endpoints.
+   */
+  static buildWellKnownUrls(baseUrl, includePathSuffix = false) {
+    const serverUrl = new URL(baseUrl);
+    const base = `${serverUrl.protocol}//${serverUrl.host}`;
+    if (!includePathSuffix) {
+      return {
+        protectedResource: new URL("/.well-known/oauth-protected-resource", base).toString(),
+        authorizationServer: new URL("/.well-known/oauth-authorization-server", base).toString()
+      };
+    }
+    const pathSuffix = serverUrl.pathname.replace(/\/$/, "");
+    return {
+      protectedResource: new URL(`/.well-known/oauth-protected-resource${pathSuffix}`, base).toString(),
+      authorizationServer: new URL(`/.well-known/oauth-authorization-server${pathSuffix}`, base).toString()
+    };
+  }
+  /**
+   * Fetch OAuth protected resource metadata.
+   *
+   * @param resourceMetadataUrl The protected resource metadata URL
+   * @returns The protected resource metadata or null if not available
+   */
+  static async fetchProtectedResourceMetadata(resourceMetadataUrl) {
+    try {
+      const response = await fetch(resourceMetadataUrl);
+      if (!response.ok) {
+        return null;
+      }
+      return await response.json();
+    } catch (error) {
+      debugLogger.debug(`Failed to fetch protected resource metadata from ${resourceMetadataUrl}: ${getErrorMessage(error)}`);
+      return null;
+    }
+  }
+  /**
+   * Fetch OAuth authorization server metadata.
+   *
+   * @param authServerMetadataUrl The authorization server metadata URL
+   * @returns The authorization server metadata or null if not available
+   */
+  static async fetchAuthorizationServerMetadata(authServerMetadataUrl) {
+    try {
+      const response = await fetch(authServerMetadataUrl);
+      if (!response.ok) {
+        return null;
+      }
+      return await response.json();
+    } catch (error) {
+      debugLogger.debug(`Failed to fetch authorization server metadata from ${authServerMetadataUrl}: ${getErrorMessage(error)}`);
+      return null;
+    }
+  }
+  /**
+   * Convert authorization server metadata to OAuth configuration.
+   *
+   * @param metadata The authorization server metadata
+   * @returns The OAuth configuration
+   */
+  static metadataToOAuthConfig(metadata2) {
+    return {
+      authorizationUrl: metadata2.authorization_endpoint,
+      tokenUrl: metadata2.token_endpoint,
+      scopes: metadata2.scopes_supported || [],
+      registrationUrl: metadata2.registration_endpoint
+    };
+  }
+  /**
+   * Discover Oauth Authorization server metadata given an Auth server URL, by
+   * trying the standard well-known endpoints.
+   *
+   * @param authServerUrl The authorization server URL
+   * @returns The authorization server metadata or null if not found
+   */
+  static async discoverAuthorizationServerMetadata(authServerUrl) {
+    const authServerUrlObj = new URL(authServerUrl);
+    const base = `${authServerUrlObj.protocol}//${authServerUrlObj.host}`;
+    const endpointsToTry = [];
+    if (authServerUrlObj.pathname !== "/") {
+      endpointsToTry.push(new URL(`/.well-known/oauth-authorization-server${authServerUrlObj.pathname}`, base).toString());
+      endpointsToTry.push(new URL(`/.well-known/openid-configuration${authServerUrlObj.pathname}`, base).toString());
+      endpointsToTry.push(new URL(`${authServerUrlObj.pathname}/.well-known/openid-configuration`, base).toString());
+    }
+    endpointsToTry.push(new URL("/.well-known/oauth-authorization-server", base).toString());
+    endpointsToTry.push(new URL("/.well-known/openid-configuration", base).toString());
+    for (const endpoint of endpointsToTry) {
+      const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint);
+      if (authServerMetadata) {
+        return authServerMetadata;
+      }
+    }
+    debugLogger.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
+    return null;
+  }
+  /**
+   * Discover OAuth configuration using the standard well-known endpoints.
+   *
+   * @param serverUrl The base URL of the server
+   * @returns The discovered OAuth configuration or null if not available
+   */
+  static async discoverOAuthConfig(serverUrl) {
+    try {
+      const wellKnownUrls = this.buildWellKnownUrls(serverUrl, false);
+      let resourceMetadata = await this.fetchProtectedResourceMetadata(wellKnownUrls.protectedResource);
+      if (!resourceMetadata) {
+        const url4 = new URL(serverUrl);
+        if (url4.pathname && url4.pathname !== "/") {
+          const pathBasedUrls = this.buildWellKnownUrls(serverUrl, true);
+          resourceMetadata = await this.fetchProtectedResourceMetadata(pathBasedUrls.protectedResource);
+        }
+      }
+      if (resourceMetadata?.authorization_servers?.length) {
+        const authServerUrl = resourceMetadata.authorization_servers[0];
+        const authServerMetadata2 = await this.discoverAuthorizationServerMetadata(authServerUrl);
+        if (authServerMetadata2) {
+          const config2 = this.metadataToOAuthConfig(authServerMetadata2);
+          if (authServerMetadata2.registration_endpoint) {
+            debugLogger.log("Dynamic client registration is supported at:", authServerMetadata2.registration_endpoint);
+          }
+          return config2;
+        }
+      }
+      debugLogger.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
+      const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl);
+      if (authServerMetadata) {
+        const config2 = this.metadataToOAuthConfig(authServerMetadata);
+        if (authServerMetadata.registration_endpoint) {
+          debugLogger.log("Dynamic client registration is supported at:", authServerMetadata.registration_endpoint);
+        }
+        return config2;
+      }
+      return null;
+    } catch (error) {
+      debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
+      return null;
+    }
+  }
+  /**
+   * Parse WWW-Authenticate header to extract OAuth information.
+   *
+   * @param header The WWW-Authenticate header value
+   * @returns The resource metadata URI if found
+   */
+  static parseWWWAuthenticateHeader(header) {
+    const match2 = header.match(/resource_metadata="([^"]+)"/);
+    if (match2) {
+      return match2[1];
+    }
+    return null;
+  }
+  /**
+   * Discover OAuth configuration from WWW-Authenticate header.
+   *
+   * @param wwwAuthenticate The WWW-Authenticate header value
+   * @returns The discovered OAuth configuration or null if not available
+   */
+  static async discoverOAuthFromWWWAuthenticate(wwwAuthenticate) {
+    const resourceMetadataUri = this.parseWWWAuthenticateHeader(wwwAuthenticate);
+    if (!resourceMetadataUri) {
+      return null;
+    }
+    const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
+    if (!resourceMetadata?.authorization_servers?.length) {
+      return null;
+    }
+    const authServerUrl = resourceMetadata.authorization_servers[0];
+    const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
+    if (authServerMetadata) {
+      return this.metadataToOAuthConfig(authServerMetadata);
+    }
+    return null;
+  }
+  /**
+   * Extract base URL from an MCP server URL.
+   *
+   * @param mcpServerUrl The MCP server URL
+   * @returns The base URL
+   */
+  static extractBaseUrl(mcpServerUrl) {
+    const serverUrl = new URL(mcpServerUrl);
+    return `${serverUrl.protocol}//${serverUrl.host}`;
+  }
+  /**
+   * Check if a URL is an SSE endpoint.
+   *
+   * @param url The URL to check
+   * @returns True if the URL appears to be an SSE endpoint
+   */
+  static isSSEEndpoint(url4) {
+    return url4.includes("/sse") || !url4.includes("/mcp");
+  }
+  /**
+   * Build a resource parameter for OAuth requests.
+   *
+   * @param endpointUrl The endpoint URL
+   * @returns The resource parameter value
+   */
+  static buildResourceParameter(endpointUrl) {
+    const url4 = new URL(endpointUrl);
+    return `${url4.protocol}//${url4.host}${url4.pathname}`;
+  }
+  /**
+   * Parses a JWT string to extract its expiry time.
+   * @param idToken The JWT ID token.
+   * @returns The expiry time in **milliseconds**, or undefined if parsing fails.
+   */
+  static parseTokenExpiry(idToken) {
+    try {
+      const payload = JSON.parse(Buffer.from(idToken.split(".")[1], "base64").toString());
+      if (payload && typeof payload.exp === "number") {
+        return payload.exp * 1e3;
+      }
+    } catch (e2) {
+      console.error("Failed to parse ID token for expiry time with error:", e2);
+    }
+    return void 0;
+  }
+};
+
+// packages/core/dist/src/mcp/google-auth-provider.js
+var CLOUD_RUN_HOST_REGEX = /^(.*\.)?run\.app$/;
 var ALLOWED_HOSTS = [/^.+\.googleapis\.com$/, /^(.*\.)?luci\.app$/];
 var GoogleCredentialProvider = class {
   config;
   auth;
+  useIdToken = false;
+  audience;
+  cachedToken;
+  tokenExpiryTime;
   // Properties required by OAuthClientProvider, with no-op values
   redirectUrl = "";
   clientMetadata = {
@@ -298330,15 +298650,22 @@ var GoogleCredentialProvider = class {
       throw new Error("URL must be provided in the config for Google Credentials provider");
     }
     const hostname2 = new URL(url4).hostname;
-    if (!ALLOWED_HOSTS.some((pattern) => pattern.test(hostname2))) {
+    const isRunAppHost = CLOUD_RUN_HOST_REGEX.test(hostname2);
+    if (!this.config?.allow_unscoped_id_tokens_cloud_run && isRunAppHost) {
+      throw new Error(`To enable the Cloud Run MCP Server at ${url4} please set allow_unscoped_id_tokens_cloud_run:true in the MCP Server config.`);
+    }
+    if (this.config?.allow_unscoped_id_tokens_cloud_run && isRunAppHost) {
+      this.useIdToken = true;
+    }
+    this.audience = hostname2;
+    if (!this.useIdToken && !ALLOWED_HOSTS.some((pattern) => pattern.test(hostname2))) {
       throw new Error(`Host "${hostname2}" is not an allowed host for Google Credential provider.`);
     }
-    const scopes = this.config?.oauth?.scopes;
-    if (!scopes || scopes.length === 0) {
-      throw new Error("Scopes must be provided in the oauth config for Google Credentials provider");
+    if (!this.useIdToken && !this.config?.oauth?.scopes) {
+      throw new Error("Scopes must be provided in the oauth config for Google Credentials provider (or enable allow_unscoped_id_tokens_for_cloud_run to use ID tokens for Cloud Run endpoints)");
     }
     this.auth = new import_google_auth_library9.GoogleAuth({
-      scopes
+      scopes: this.config?.oauth?.scopes
     });
   }
   clientInformation() {
@@ -298348,17 +298675,46 @@ var GoogleCredentialProvider = class {
     this._clientInformation = clientInformation;
   }
   async tokens() {
+    if (this.cachedToken && this.tokenExpiryTime && Date.now() < this.tokenExpiryTime - FIVE_MIN_BUFFER_MS) {
+      return this.cachedToken;
+    }
+    this.cachedToken = void 0;
+    this.tokenExpiryTime = void 0;
+    if (this.useIdToken) {
+      try {
+        const idClient = await this.auth.getIdTokenClient(this.audience);
+        const idToken = await idClient.idTokenProvider.fetchIdToken(this.audience);
+        const newToken2 = {
+          access_token: idToken,
+          token_type: "Bearer"
+        };
+        const expiryTime2 = OAuthUtils.parseTokenExpiry(idToken);
+        if (expiryTime2) {
+          this.tokenExpiryTime = expiryTime2;
+          this.cachedToken = newToken2;
+        }
+        return newToken2;
+      } catch (e2) {
+        console.error("Failed to get ID token from Google ADC", e2);
+        return void 0;
+      }
+    }
     const client = await this.auth.getClient();
     const accessTokenResponse = await client.getAccessToken();
     if (!accessTokenResponse.token) {
       console.error("Failed to get access token from Google ADC");
       return void 0;
     }
-    const tokens = {
+    const newToken = {
       access_token: accessTokenResponse.token,
       token_type: "Bearer"
     };
-    return tokens;
+    const expiryTime = client.credentials?.expiry_date;
+    if (expiryTime) {
+      this.tokenExpiryTime = expiryTime;
+      this.cachedToken = newToken;
+    }
+    return newToken;
   }
   saveTokens(_tokens) {
   }
@@ -298373,7 +298729,6 @@ var GoogleCredentialProvider = class {
 
 // packages/core/dist/src/mcp/sa-impersonation-provider.js
 var import_google_auth_library10 = __toESM(require_src10(), 1);
-var fiveMinBufferMs = 5 * 60 * 1e3;
 function createIamApiUrl(targetSA) {
   return `https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/${encodeURIComponent(targetSA)}:generateIdToken`;
 }
@@ -298417,7 +298772,7 @@ var ServiceAccountImpersonationProvider = class {
     this._clientInformation = clientInformation;
   }
   async tokens() {
-    if (this.cachedToken && this.tokenExpiryTime && Date.now() < this.tokenExpiryTime - fiveMinBufferMs) {
+    if (this.cachedToken && this.tokenExpiryTime && Date.now() < this.tokenExpiryTime - FIVE_MIN_BUFFER_MS) {
       return this.cachedToken;
     }
     this.cachedToken = void 0;
@@ -298443,7 +298798,7 @@ var ServiceAccountImpersonationProvider = class {
       console.error("Failed to fetch ID token from Google:", e2);
       return void 0;
     }
-    const expiryTime = this.parseTokenExpiry(idToken);
+    const expiryTime = OAuthUtils.parseTokenExpiry(idToken);
     const newTokens = {
       access_token: idToken,
       token_type: "Bearer"
@@ -298463,22 +298818,6 @@ var ServiceAccountImpersonationProvider = class {
   codeVerifier() {
     return "";
   }
-  /**
-   * Parses a JWT string to extract its expiry time.
-   * @param idToken The JWT ID token.
-   * @returns The expiry time in **milliseconds**, or undefined if parsing fails.
-   */
-  parseTokenExpiry(idToken) {
-    try {
-      const payload = JSON.parse(Buffer.from(idToken.split(".")[1], "base64").toString());
-      if (payload && typeof payload.exp === "number") {
-        return payload.exp * 1e3;
-      }
-    } catch (e2) {
-      console.error("Failed to parse ID token for expiry time with error:", e2);
-    }
-    return void 0;
-  }
 };
 
 // packages/core/dist/src/tools/mcp-client.js
@@ -298615,7 +298954,7 @@ var MCPOAuthTokenStorage = class {
       }
     } catch (error) {
       if (error.code !== "ENOENT") {
-        console.error(`Failed to load MCP OAuth tokens: ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback("error", `Failed to load MCP OAuth tokens: ${getErrorMessage(error)}`, error);
       }
     }
     return tokenMap;
@@ -298638,7 +298977,7 @@ var MCPOAuthTokenStorage = class {
     try {
       await fs25.writeFile(tokenFile, JSON.stringify(tokenArray, null, 2), { mode: 384 });
     } catch (error) {
-      console.error(`Failed to save MCP OAuth token: ${getErrorMessage(error)}`);
+      coreEvents.emitFeedback("error", `Failed to save MCP OAuth token: ${getErrorMessage(error)}`, error);
       throw error;
     }
   }
@@ -298701,7 +299040,7 @@ var MCPOAuthTokenStorage = class {
           });
         }
       } catch (error) {
-        console.error(`Failed to remove MCP OAuth token: ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback("error", `Failed to remove MCP OAuth token: ${getErrorMessage(error)}`, error);
       }
     }
   }
@@ -298730,220 +299069,12 @@ var MCPOAuthTokenStorage = class {
       await fs25.unlink(tokenFile);
     } catch (error) {
       if (error.code !== "ENOENT") {
-        console.error(`Failed to clear MCP OAuth tokens: ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback("error", `Failed to clear MCP OAuth tokens: ${getErrorMessage(error)}`, error);
       }
     }
   }
 };
 
-// packages/core/dist/src/mcp/oauth-utils.js
-var OAuthUtils = class {
-  /**
-   * Construct well-known OAuth endpoint URLs.
-   * By default, uses standard root-based well-known URLs.
-   * If includePathSuffix is true, appends any path from the base URL to the well-known endpoints.
-   */
-  static buildWellKnownUrls(baseUrl, includePathSuffix = false) {
-    const serverUrl = new URL(baseUrl);
-    const base = `${serverUrl.protocol}//${serverUrl.host}`;
-    if (!includePathSuffix) {
-      return {
-        protectedResource: new URL("/.well-known/oauth-protected-resource", base).toString(),
-        authorizationServer: new URL("/.well-known/oauth-authorization-server", base).toString()
-      };
-    }
-    const pathSuffix = serverUrl.pathname.replace(/\/$/, "");
-    return {
-      protectedResource: new URL(`/.well-known/oauth-protected-resource${pathSuffix}`, base).toString(),
-      authorizationServer: new URL(`/.well-known/oauth-authorization-server${pathSuffix}`, base).toString()
-    };
-  }
-  /**
-   * Fetch OAuth protected resource metadata.
-   *
-   * @param resourceMetadataUrl The protected resource metadata URL
-   * @returns The protected resource metadata or null if not available
-   */
-  static async fetchProtectedResourceMetadata(resourceMetadataUrl) {
-    try {
-      const response = await fetch(resourceMetadataUrl);
-      if (!response.ok) {
-        return null;
-      }
-      return await response.json();
-    } catch (error) {
-      debugLogger.debug(`Failed to fetch protected resource metadata from ${resourceMetadataUrl}: ${getErrorMessage(error)}`);
-      return null;
-    }
-  }
-  /**
-   * Fetch OAuth authorization server metadata.
-   *
-   * @param authServerMetadataUrl The authorization server metadata URL
-   * @returns The authorization server metadata or null if not available
-   */
-  static async fetchAuthorizationServerMetadata(authServerMetadataUrl) {
-    try {
-      const response = await fetch(authServerMetadataUrl);
-      if (!response.ok) {
-        return null;
-      }
-      return await response.json();
-    } catch (error) {
-      debugLogger.debug(`Failed to fetch authorization server metadata from ${authServerMetadataUrl}: ${getErrorMessage(error)}`);
-      return null;
-    }
-  }
-  /**
-   * Convert authorization server metadata to OAuth configuration.
-   *
-   * @param metadata The authorization server metadata
-   * @returns The OAuth configuration
-   */
-  static metadataToOAuthConfig(metadata2) {
-    return {
-      authorizationUrl: metadata2.authorization_endpoint,
-      tokenUrl: metadata2.token_endpoint,
-      scopes: metadata2.scopes_supported || [],
-      registrationUrl: metadata2.registration_endpoint
-    };
-  }
-  /**
-   * Discover Oauth Authorization server metadata given an Auth server URL, by
-   * trying the standard well-known endpoints.
-   *
-   * @param authServerUrl The authorization server URL
-   * @returns The authorization server metadata or null if not found
-   */
-  static async discoverAuthorizationServerMetadata(authServerUrl) {
-    const authServerUrlObj = new URL(authServerUrl);
-    const base = `${authServerUrlObj.protocol}//${authServerUrlObj.host}`;
-    const endpointsToTry = [];
-    if (authServerUrlObj.pathname !== "/") {
-      endpointsToTry.push(new URL(`/.well-known/oauth-authorization-server${authServerUrlObj.pathname}`, base).toString());
-      endpointsToTry.push(new URL(`/.well-known/openid-configuration${authServerUrlObj.pathname}`, base).toString());
-      endpointsToTry.push(new URL(`${authServerUrlObj.pathname}/.well-known/openid-configuration`, base).toString());
-    }
-    endpointsToTry.push(new URL("/.well-known/oauth-authorization-server", base).toString());
-    endpointsToTry.push(new URL("/.well-known/openid-configuration", base).toString());
-    for (const endpoint of endpointsToTry) {
-      const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint);
-      if (authServerMetadata) {
-        return authServerMetadata;
-      }
-    }
-    debugLogger.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
-    return null;
-  }
-  /**
-   * Discover OAuth configuration using the standard well-known endpoints.
-   *
-   * @param serverUrl The base URL of the server
-   * @returns The discovered OAuth configuration or null if not available
-   */
-  static async discoverOAuthConfig(serverUrl) {
-    try {
-      const wellKnownUrls = this.buildWellKnownUrls(serverUrl, false);
-      let resourceMetadata = await this.fetchProtectedResourceMetadata(wellKnownUrls.protectedResource);
-      if (!resourceMetadata) {
-        const url4 = new URL(serverUrl);
-        if (url4.pathname && url4.pathname !== "/") {
-          const pathBasedUrls = this.buildWellKnownUrls(serverUrl, true);
-          resourceMetadata = await this.fetchProtectedResourceMetadata(pathBasedUrls.protectedResource);
-        }
-      }
-      if (resourceMetadata?.authorization_servers?.length) {
-        const authServerUrl = resourceMetadata.authorization_servers[0];
-        const authServerMetadata2 = await this.discoverAuthorizationServerMetadata(authServerUrl);
-        if (authServerMetadata2) {
-          const config2 = this.metadataToOAuthConfig(authServerMetadata2);
-          if (authServerMetadata2.registration_endpoint) {
-            debugLogger.log("Dynamic client registration is supported at:", authServerMetadata2.registration_endpoint);
-          }
-          return config2;
-        }
-      }
-      debugLogger.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
-      const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl);
-      if (authServerMetadata) {
-        const config2 = this.metadataToOAuthConfig(authServerMetadata);
-        if (authServerMetadata.registration_endpoint) {
-          debugLogger.log("Dynamic client registration is supported at:", authServerMetadata.registration_endpoint);
-        }
-        return config2;
-      }
-      return null;
-    } catch (error) {
-      debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
-      return null;
-    }
-  }
-  /**
-   * Parse WWW-Authenticate header to extract OAuth information.
-   *
-   * @param header The WWW-Authenticate header value
-   * @returns The resource metadata URI if found
-   */
-  static parseWWWAuthenticateHeader(header) {
-    const match2 = header.match(/resource_metadata="([^"]+)"/);
-    if (match2) {
-      return match2[1];
-    }
-    return null;
-  }
-  /**
-   * Discover OAuth configuration from WWW-Authenticate header.
-   *
-   * @param wwwAuthenticate The WWW-Authenticate header value
-   * @returns The discovered OAuth configuration or null if not available
-   */
-  static async discoverOAuthFromWWWAuthenticate(wwwAuthenticate) {
-    const resourceMetadataUri = this.parseWWWAuthenticateHeader(wwwAuthenticate);
-    if (!resourceMetadataUri) {
-      return null;
-    }
-    const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
-    if (!resourceMetadata?.authorization_servers?.length) {
-      return null;
-    }
-    const authServerUrl = resourceMetadata.authorization_servers[0];
-    const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
-    if (authServerMetadata) {
-      return this.metadataToOAuthConfig(authServerMetadata);
-    }
-    return null;
-  }
-  /**
-   * Extract base URL from an MCP server URL.
-   *
-   * @param mcpServerUrl The MCP server URL
-   * @returns The base URL
-   */
-  static extractBaseUrl(mcpServerUrl) {
-    const serverUrl = new URL(mcpServerUrl);
-    return `${serverUrl.protocol}//${serverUrl.host}`;
-  }
-  /**
-   * Check if a URL is an SSE endpoint.
-   *
-   * @param url The URL to check
-   * @returns True if the URL appears to be an SSE endpoint
-   */
-  static isSSEEndpoint(url4) {
-    return url4.includes("/sse") || !url4.includes("/mcp");
-  }
-  /**
-   * Build a resource parameter for OAuth requests.
-   *
-   * @param endpointUrl The endpoint URL
-   * @returns The resource parameter value
-   */
-  static buildResourceParameter(endpointUrl) {
-    const url4 = new URL(endpointUrl);
-    return `${url4.protocol}//${url4.host}${url4.pathname}`;
-  }
-};
-
 // packages/core/dist/src/mcp/oauth-provider.js
 var OAUTH_DISPLAY_MESSAGE_EVENT = "oauth-display-message";
 var REDIRECT_PORT = 7777;
@@ -299313,7 +299444,7 @@ var MCPOAuthProvider = class {
                 ...config2,
                 authorizationUrl: discoveredConfig.authorizationUrl,
                 tokenUrl: discoveredConfig.tokenUrl,
-                scopes: discoveredConfig.scopes || config2.scopes || [],
+                scopes: config2.scopes || discoveredConfig.scopes || [],
                 // Preserve existing client credentials
                 clientId: config2.clientId,
                 clientSecret: config2.clientSecret
@@ -299331,7 +299462,7 @@ var MCPOAuthProvider = class {
             ...config2,
             authorizationUrl: discoveredConfig.authorizationUrl,
             tokenUrl: discoveredConfig.tokenUrl,
-            scopes: discoveredConfig.scopes || config2.scopes || [],
+            scopes: config2.scopes || discoveredConfig.scopes || [],
             registrationUrl: discoveredConfig.registrationUrl,
             // Preserve existing client credentials
             clientId: config2.clientId,
@@ -300294,7 +300425,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
     this.description = description;
     this.parameterSchema = parameterSchema;
   }
-  createInvocation(params) {
+  createInvocation(params, _messageBus, _toolName, _displayName) {
     return new DiscoveredToolInvocation(this.config, this.name, params);
   }
 };
@@ -300626,7 +300757,7 @@ var LSToolInvocation = class extends BaseToolInvocation {
       }
       const relativePaths = files.map((file) => path18.relative(this.config.getTargetDir(), path18.join(this.params.path, file)));
       const fileDiscovery = this.config.getFileService();
-      const { filteredPaths, gitIgnoredCount, geminiIgnoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
         respectGitIgnore: this.params.file_filtering_options?.respect_git_ignore ?? this.config.getFileFilteringOptions().respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
         respectGeminiIgnore: this.params.file_filtering_options?.respect_gemini_ignore ?? this.config.getFileFilteringOptions().respectGeminiIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore
       });
@@ -300647,7 +300778,7 @@ var LSToolInvocation = class extends BaseToolInvocation {
             modifiedTime: stats2.mtime
           });
         } catch (error) {
-          console.error(`Error accessing ${fullPath}: ${error}`);
+          debugLogger.debug(`Error accessing ${fullPath}: ${error}`);
         }
       }
       entries2.sort((a2, b) => {
@@ -300660,21 +300791,14 @@ var LSToolInvocation = class extends BaseToolInvocation {
       const directoryContent = entries2.map((entry) => `${entry.isDirectory ? "[DIR] " : ""}${entry.name}`).join("\n");
       let resultMessage = `Directory listing for ${this.params.path}:
 ${directoryContent}`;
-      const ignoredMessages = [];
-      if (gitIgnoredCount > 0) {
-        ignoredMessages.push(`${gitIgnoredCount} git-ignored`);
-      }
-      if (geminiIgnoredCount > 0) {
-        ignoredMessages.push(`${geminiIgnoredCount} gemini-ignored`);
-      }
-      if (ignoredMessages.length > 0) {
+      if (ignoredCount > 0) {
         resultMessage += `
 
-(${ignoredMessages.join(", ")})`;
+(${ignoredCount} ignored)`;
       }
       let displayMessage = `Listed ${entries2.length} item(s).`;
-      if (ignoredMessages.length > 0) {
-        displayMessage += ` (${ignoredMessages.join(", ")})`;
+      if (ignoredCount > 0) {
+        displayMessage += ` (${ignoredCount} ignored)`;
       }
       return {
         llmContent: resultMessage,
@@ -300746,6 +300870,7 @@ var LSTool = class _LSTool extends BaseDeclarativeTool {
 
 // packages/core/dist/src/tools/read-file.js
 import path23 from "node:path";
+import process9 from "node:process";
 
 // packages/core/dist/src/utils/fileUtils.js
 import fs28 from "node:fs";
@@ -302094,8 +302219,7 @@ Do NOT use this tool:
 
 ## Parameters
 
-- \`fact\` (string, required): The specific fact or piece of information to remember. This should be a clear, self-contained statement. For example, if the user says "My favorite color is blue", the fact would be "My favorite color is blue".
-`;
+- \`fact\` (string, required): The specific fact or piece of information to remember. This should be a clear, self-contained statement. For example, if the user says "My favorite color is blue", the fact would be "My favorite color is blue".`;
 var DEFAULT_CONTEXT_FILENAME = "GEMINI.md";
 var MEMORY_SECTION_HEADER = "## Gemini Added Memories";
 var currentGeminiMdFilename = DEFAULT_CONTEXT_FILENAME;
@@ -302170,11 +302294,14 @@ ${afterSectionMarker}`.trimEnd() + "\n";
 }
 var MemoryToolInvocation = class _MemoryToolInvocation extends BaseToolInvocation {
   static allowlist = /* @__PURE__ */ new Set();
+  constructor(params, messageBus, toolName, displayName) {
+    super(params, messageBus, toolName, displayName);
+  }
   getDescription() {
     const memoryFilePath = getGlobalMemoryFilePath();
     return `in ${tildeifyPath(memoryFilePath)}`;
   }
-  async shouldConfirmExecute(_abortSignal) {
+  async getConfirmationDetails(_abortSignal) {
     const memoryFilePath = getGlobalMemoryFilePath();
     const allowlistKey = memoryFilePath;
     if (_MemoryToolInvocation.allowlist.has(allowlistKey)) {
@@ -302233,7 +302360,7 @@ var MemoryToolInvocation = class _MemoryToolInvocation extends BaseToolInvocatio
       }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error(`[MemoryTool] Error executing save_memory for fact "${fact}": ${errorMessage}`);
+      console.warn(`[MemoryTool] Error executing save_memory for fact "${fact}": ${errorMessage}`);
       return {
         llmContent: JSON.stringify({
           success: false,
@@ -302250,8 +302377,8 @@ var MemoryToolInvocation = class _MemoryToolInvocation extends BaseToolInvocatio
 };
 var MemoryTool = class _MemoryTool extends BaseDeclarativeTool {
   static Name = MEMORY_TOOL_NAME;
-  constructor() {
-    super(_MemoryTool.Name, "Save Memory", memoryToolDescription, Kind.Think, memoryToolSchemaData.parametersJsonSchema);
+  constructor(messageBus) {
+    super(_MemoryTool.Name, "Save Memory", memoryToolDescription, Kind.Think, memoryToolSchemaData.parametersJsonSchema, true, false, messageBus);
   }
   validateToolParamValues(params) {
     if (params.fact.trim() === "") {
@@ -302259,8 +302386,8 @@ var MemoryTool = class _MemoryTool extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new MemoryToolInvocation(params);
+  createInvocation(params, messageBus, toolName, displayName) {
+    return new MemoryToolInvocation(params, messageBus ?? this.messageBus, toolName ?? this.name, displayName ?? this.displayName);
   }
   static async performAddMemoryEntry(text, memoryFilePath, fsAdapter) {
     try {
@@ -302920,7 +303047,7 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
     super(_ReadFileTool.Name, "ReadFile", `Reads and returns the content of a specified file. If the file is large, the content will be truncated. The tool's response will clearly indicate if truncation has occurred and will provide details on how to read more of the file using the 'offset' and 'limit' parameters. Handles text, images (PNG, JPG, GIF, WEBP, SVG, BMP), and PDF files. For text files, it can read specific line ranges.`, Kind.Read, {
       properties: {
         absolute_path: {
-          description: "The absolute path to the file to read (e.g., '/home/user/project/file.txt'). Relative paths are not supported. You must provide an absolute path.",
+          description: process9.platform === "win32" ? "The absolute path to the file to read (e.g., 'C:\\Users\\project\\file.txt'). Relative paths are not supported. You must provide an absolute path." : "The absolute path to the file to read (e.g., '/home/user/project/file.txt'). Relative paths are not supported. You must provide an absolute path.",
           type: "string"
         },
         offset: {
@@ -302961,8 +303088,9 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
       return "Limit must be a positive number";
     }
     const fileService = this.config.getFileService();
-    if (fileService.shouldGeminiIgnoreFile(params.absolute_path)) {
-      return `File path '${filePath}' is ignored by .geminiignore pattern(s).`;
+    const fileFilteringOptions = this.config.getFileFilteringOptions();
+    if (fileService.shouldIgnoreFile(params.absolute_path, fileFilteringOptions)) {
+      return `File path '${filePath}' is ignored by configured ignore patterns.`;
     }
     return null;
   }
@@ -307225,7 +307353,7 @@ var PathScurryBase = class {
     const dirs = /* @__PURE__ */ new Set();
     const queue = [entry];
     let processing = 0;
-    const process23 = () => {
+    const process25 = () => {
       let paused = false;
       while (!paused) {
         const dir = queue.shift();
@@ -307240,14 +307368,14 @@ var PathScurryBase = class {
           if (er)
             return results.emit("error", er);
           if (follow && !didRealpaths) {
-            const promises2 = [];
+            const promises3 = [];
             for (const e2 of entries2) {
               if (e2.isSymbolicLink()) {
-                promises2.push(e2.realpath().then((r2) => r2?.isUnknown() ? r2.lstat() : r2));
+                promises3.push(e2.realpath().then((r2) => r2?.isUnknown() ? r2.lstat() : r2));
               }
             }
-            if (promises2.length) {
-              Promise.all(promises2).then(() => onReaddir(null, entries2, true));
+            if (promises3.length) {
+              Promise.all(promises3).then(() => onReaddir(null, entries2, true));
               return;
             }
           }
@@ -307266,9 +307394,9 @@ var PathScurryBase = class {
             }
           }
           if (paused && !results.flowing) {
-            results.once("drain", process23);
+            results.once("drain", process25);
           } else if (!sync2) {
-            process23();
+            process25();
           }
         };
         let sync2 = true;
@@ -307276,7 +307404,7 @@ var PathScurryBase = class {
         sync2 = false;
       }
     };
-    process23();
+    process25();
     return results;
   }
   streamSync(entry = this.cwd, opts = {}) {
@@ -307294,7 +307422,7 @@ var PathScurryBase = class {
     }
     const queue = [entry];
     let processing = 0;
-    const process23 = () => {
+    const process25 = () => {
       let paused = false;
       while (!paused) {
         const dir = queue.shift();
@@ -307328,9 +307456,9 @@ var PathScurryBase = class {
         }
       }
       if (paused && !results.flowing)
-        results.once("drain", process23);
+        results.once("drain", process25);
     };
-    process23();
+    process25();
     return results;
   }
   chdir(path64 = this.cwd) {
@@ -308597,7 +308725,7 @@ var GrepToolInvocation = class extends BaseToolInvocation {
         returnDisplay: `Found ${matchCount} ${matchTerm}`
       };
     } catch (error) {
-      console.error(`Error during GrepLogic execution: ${error}`);
+      debugLogger.warn(`Error during GrepLogic execution: ${error}`);
       const errorMessage = getErrorMessage(error);
       return {
         llmContent: `Error during grep search operation: ${errorMessage}`,
@@ -308864,7 +308992,7 @@ var GrepToolInvocation = class extends BaseToolInvocation {
       }
       return allMatches;
     } catch (error) {
-      console.error(`GrepLogic: Error in performGrepSearch (Strategy: ${strategyUsed}): ${getErrorMessage(error)}`);
+      debugLogger.warn(`GrepLogic: Error in performGrepSearch (Strategy: ${strategyUsed}): ${getErrorMessage(error)}`);
       throw error;
     }
   }
@@ -309212,9 +309340,9 @@ import { spawnSync } from "node:child_process";
 import { debuglog } from "node:util";
 
 // node_modules/execa/lib/utils/standard-stream.js
-import process9 from "node:process";
+import process10 from "node:process";
 var isStandardStream = (stream3) => STANDARD_STREAMS.includes(stream3);
-var STANDARD_STREAMS = [process9.stdin, process9.stdout, process9.stderr];
+var STANDARD_STREAMS = [process10.stdin, process10.stdout, process10.stderr];
 var STANDARD_STREAMS_ALIASES = ["stdin", "stdout", "stderr"];
 var getStreamName = (fdNumber) => STANDARD_STREAMS_ALIASES[fdNumber] ?? `stdio[${fdNumber}]`;
 
@@ -309349,11 +309477,11 @@ var quoteString = (escapedArgument) => {
 var NO_ESCAPE_REGEXP = /^[\w./-]+$/;
 
 // node_modules/is-unicode-supported/index.js
-import process10 from "node:process";
+import process11 from "node:process";
 function isUnicodeSupported() {
-  const { env: env2 } = process10;
+  const { env: env2 } = process11;
   const { TERM, TERM_PROGRAM } = env2;
-  if (process10.platform !== "win32") {
+  if (process11.platform !== "win32") {
     return TERM !== "linux";
   }
   return Boolean(env2.WT_SESSION) || Boolean(env2.TERMINUS_SUBLIME) || env2.ConEmuTask === "{cmd::Cmder}" || TERM_PROGRAM === "Terminus-Sublime" || TERM_PROGRAM === "vscode" || TERM === "xterm-256color" || TERM === "alacritty" || TERM === "rxvt-unicode" || TERM === "rxvt-unicode-256color" || env2.TERMINAL_EMULATOR === "JetBrains-JediTerm";
@@ -309856,10 +309984,10 @@ var handleCommand = (filePath, rawArguments, rawOptions) => {
 // node_modules/execa/lib/arguments/options.js
 var import_cross_spawn2 = __toESM(require_cross_spawn(), 1);
 import path31 from "node:path";
-import process13 from "node:process";
+import process14 from "node:process";
 
 // node_modules/npm-run-path/index.js
-import process11 from "node:process";
+import process12 from "node:process";
 import path28 from "node:path";
 
 // node_modules/npm-run-path/node_modules/path-key/index.js
@@ -309900,10 +310028,10 @@ var TEN_MEGABYTES_IN_BYTES = 10 * 1024 * 1024;
 
 // node_modules/npm-run-path/index.js
 var npmRunPath = ({
-  cwd: cwd2 = process11.cwd(),
-  path: pathOption = process11.env[pathKey()],
+  cwd: cwd2 = process12.cwd(),
+  path: pathOption = process12.env[pathKey()],
   preferLocal = true,
-  execPath: execPath2 = process11.execPath,
+  execPath: execPath2 = process12.execPath,
   addExecPath = true
 } = {}) => {
   const cwdPath = path28.resolve(toPath(cwd2));
@@ -309931,7 +310059,7 @@ var applyExecPath = (result, pathParts, execPath2, cwdPath) => {
     result.push(pathPart);
   }
 };
-var npmRunPathEnv = ({ env: env2 = process11.env, ...options2 } = {}) => {
+var npmRunPathEnv = ({ env: env2 = process12.env, ...options2 } = {}) => {
   env2 = { ...env2 };
   const pathName = pathKey({ env: env2 });
   options2.path = env2[pathName];
@@ -310661,7 +310789,7 @@ var incrementMaxListeners = (eventEmitter, maxListenersIncrement, signal) => {
 };
 
 // node_modules/execa/lib/ipc/forward.js
-import { EventEmitter as EventEmitter5 } from "node:events";
+import { EventEmitter as EventEmitter6 } from "node:events";
 
 // node_modules/execa/lib/ipc/incoming.js
 import { once as once2 } from "node:events";
@@ -310743,7 +310871,7 @@ var getIpcEmitter = (anyProcess, channel, isSubprocess) => {
   if (IPC_EMITTERS.has(anyProcess)) {
     return IPC_EMITTERS.get(anyProcess);
   }
-  const ipcEmitter = new EventEmitter5();
+  const ipcEmitter = new EventEmitter6();
   ipcEmitter.connected = true;
   IPC_EMITTERS.set(anyProcess, ipcEmitter);
   forwardEvents({
@@ -311201,14 +311329,14 @@ var serializeEncoding = (encoding) => typeof encoding === "string" ? `"${encodin
 // node_modules/execa/lib/arguments/cwd.js
 import { statSync } from "node:fs";
 import path30 from "node:path";
-import process12 from "node:process";
+import process13 from "node:process";
 var normalizeCwd = (cwd2 = getDefaultCwd()) => {
   const cwdString = safeNormalizeFileUrl(cwd2, 'The "cwd" option');
   return path30.resolve(cwdString);
 };
 var getDefaultCwd = () => {
   try {
-    return process12.cwd();
+    return process13.cwd();
   } catch (error) {
     error.message = `The current directory does not exist.
 ${error.message}`;
@@ -311251,7 +311379,7 @@ var normalizeOptions = (filePath, rawArguments, rawOptions) => {
   options2.killSignal = normalizeKillSignal(options2.killSignal);
   options2.forceKillAfterDelay = normalizeForceKillAfterDelay(options2.forceKillAfterDelay);
   options2.lines = options2.lines.map((lines, fdNumber) => lines && !BINARY_ENCODINGS.has(options2.encoding) && options2.buffer[fdNumber]);
-  if (process13.platform === "win32" && path31.basename(file, ".exe") === "cmd") {
+  if (process14.platform === "win32" && path31.basename(file, ".exe") === "cmd") {
     commandArguments.unshift("/q");
   }
   return { file, commandArguments, options: options2 };
@@ -311292,7 +311420,7 @@ var addDefaultOptions = ({
   serialization
 });
 var getEnv2 = ({ env: envOption, extendEnv, preferLocal, node, localDirectory, nodePath: nodePath2 }) => {
-  const env2 = extendEnv ? { ...process13.env, ...envOption } : envOption;
+  const env2 = extendEnv ? { ...process14.env, ...envOption } : envOption;
   if (preferLocal || node) {
     return npmRunPathEnv({
       env: env2,
@@ -312493,7 +312621,7 @@ var normalizeGenerator = ({ stdioItem, stdioItem: { value }, index, newTransform
 var sortTransforms = (newTransforms, direction) => direction === "input" ? newTransforms.reverse() : newTransforms;
 
 // node_modules/execa/lib/stdio/direction.js
-import process14 from "node:process";
+import process15 from "node:process";
 var getStreamDirection = (stdioItems, fdNumber, optionName) => {
   const directions = stdioItems.map((stdioItem) => getStdioItemDirection(stdioItem, fdNumber));
   if (directions.includes("input") && directions.includes("output")) {
@@ -312533,10 +312661,10 @@ var guessStreamDirection = {
   }
 };
 var getStandardStreamDirection = (value) => {
-  if ([0, process14.stdin].includes(value)) {
+  if ([0, process15.stdin].includes(value)) {
     return "input";
   }
-  if ([1, 2, process14.stdout, process14.stderr].includes(value)) {
+  if ([1, 2, process15.stdout, process15.stderr].includes(value)) {
     return "output";
   }
 };
@@ -313640,7 +313768,7 @@ import { setMaxListeners } from "node:events";
 import { spawn as spawn4 } from "node:child_process";
 
 // node_modules/execa/lib/ipc/methods.js
-import process15 from "node:process";
+import process16 from "node:process";
 
 // node_modules/execa/lib/ipc/get-one.js
 import { once as once5, on as on2 } from "node:events";
@@ -313781,9 +313909,9 @@ var addIpcMethods = (subprocess, { ipc }) => {
   Object.assign(subprocess, getIpcMethods(subprocess, false, ipc));
 };
 var getIpcExport = () => {
-  const anyProcess = process15;
+  const anyProcess = process16;
   const isSubprocess = true;
-  const ipc = process15.channel !== void 0;
+  const ipc = process16.channel !== void 0;
   return {
     ...getIpcMethods(anyProcess, isSubprocess, ipc),
     getCancelSignal: getCancelSignal.bind(void 0, {
@@ -314249,7 +314377,7 @@ if (process.platform === "linux") {
 }
 
 // node_modules/signal-exit/dist/mjs/index.js
-var processOk = (process23) => !!process23 && typeof process23 === "object" && typeof process23.removeListener === "function" && typeof process23.emit === "function" && typeof process23.reallyExit === "function" && typeof process23.listeners === "function" && typeof process23.kill === "function" && typeof process23.pid === "number" && typeof process23.on === "function";
+var processOk = (process25) => !!process25 && typeof process25 === "object" && typeof process25.removeListener === "function" && typeof process25.emit === "function" && typeof process25.reallyExit === "function" && typeof process25.listeners === "function" && typeof process25.kill === "function" && typeof process25.pid === "number" && typeof process25.on === "function";
 var kExitEmitter = Symbol.for("signal-exit emitter");
 var global2 = globalThis;
 var ObjectDefineProperty = Object.defineProperty.bind(Object);
@@ -314334,7 +314462,7 @@ var SignalExit = class extends SignalExitBase {
   // "SIGHUP" throws an `ENOSYS` error on Windows,
   // so use a supported signal instead
   /* c8 ignore start */
-  #hupSig = process16.platform === "win32" ? "SIGINT" : "SIGHUP";
+  #hupSig = process17.platform === "win32" ? "SIGINT" : "SIGHUP";
   /* c8 ignore stop */
   #emitter = new Emitter();
   #process;
@@ -314342,15 +314470,15 @@ var SignalExit = class extends SignalExitBase {
   #originalProcessReallyExit;
   #sigListeners = {};
   #loaded = false;
-  constructor(process23) {
+  constructor(process25) {
     super();
-    this.#process = process23;
+    this.#process = process25;
     this.#sigListeners = {};
     for (const sig of signals) {
       this.#sigListeners[sig] = () => {
         const listeners = this.#process.listeners(sig);
         let { count: count2 } = this.#emitter;
-        const p = process23;
+        const p = process25;
         if (typeof p.__signal_exit_emitter__ === "object" && typeof p.__signal_exit_emitter__.count === "number") {
           count2 += p.__signal_exit_emitter__.count;
         }
@@ -314359,12 +314487,12 @@ var SignalExit = class extends SignalExitBase {
           const ret = this.#emitter.emit("exit", null, sig);
           const s2 = sig === "SIGHUP" ? this.#hupSig : sig;
           if (!ret)
-            process23.kill(process23.pid, s2);
+            process25.kill(process25.pid, s2);
         }
       };
     }
-    this.#originalProcessReallyExit = process23.reallyExit;
-    this.#originalProcessEmit = process23.emit;
+    this.#originalProcessReallyExit = process25.reallyExit;
+    this.#originalProcessEmit = process25.emit;
   }
   onExit(cb, opts) {
     if (!processOk(this.#process)) {
@@ -314445,7 +314573,7 @@ var SignalExit = class extends SignalExitBase {
     }
   }
 };
-var process16 = globalThis.process;
+var process17 = globalThis.process;
 var {
   /**
    * Called when the process is exiting, whether via signal, explicit
@@ -314473,7 +314601,7 @@ var {
    * @internal
    */
   unload
-} = signalExitWrap(processOk(process16) ? new SignalExit(process16) : new SignalExitFallback());
+} = signalExitWrap(processOk(process17) ? new SignalExit(process17) : new SignalExitFallback());
 
 // node_modules/execa/lib/terminate/cleanup.js
 var cleanupOnExit = (subprocess, { cleanup, detached }, { signal }) => {
@@ -315222,17 +315350,17 @@ var addConcurrentStream = (concurrentStreams, stream3, waitName) => {
   if (!weakMap.has(stream3)) {
     weakMap.set(stream3, []);
   }
-  const promises2 = weakMap.get(stream3);
+  const promises3 = weakMap.get(stream3);
   const promise = createDeferred();
-  promises2.push(promise);
+  promises3.push(promise);
   const resolve13 = promise.resolve.bind(promise);
-  return { resolve: resolve13, promises: promises2 };
+  return { resolve: resolve13, promises: promises3 };
 };
-var waitForConcurrentStreams = async ({ resolve: resolve13, promises: promises2 }, subprocess) => {
+var waitForConcurrentStreams = async ({ resolve: resolve13, promises: promises3 }, subprocess) => {
   resolve13();
   const [isSubprocessExit] = await Promise.race([
     Promise.allSettled([true, subprocess]),
-    Promise.all([false, ...promises2])
+    Promise.all([false, ...promises3])
   ]);
   return !isSubprocessExit;
 };
@@ -317075,7 +317203,7 @@ function assertWhitespaceString(value, message) {
 var distribution_default = is;
 
 // node_modules/got/dist/source/as-promise/index.js
-import { EventEmitter as EventEmitter7 } from "node:events";
+import { EventEmitter as EventEmitter8 } from "node:events";
 
 // node_modules/p-cancelable/index.js
 var CancelError = class extends Error {
@@ -317280,7 +317408,7 @@ var AbortError = class extends RequestError2 {
 };
 
 // node_modules/got/dist/source/core/index.js
-import process18 from "node:process";
+import process19 from "node:process";
 import { Buffer as Buffer8 } from "node:buffer";
 import { Duplex as Duplex4 } from "node:stream";
 import http5, { ServerResponse } from "node:http";
@@ -317391,7 +317519,7 @@ var timer = (request3) => {
 var source_default = timer;
 
 // node_modules/cacheable-request/dist/index.js
-import EventEmitter6 from "node:events";
+import EventEmitter7 from "node:events";
 import urlLib from "node:url";
 import crypto19 from "node:crypto";
 import stream2, { PassThrough as PassThroughStream2 } from "node:stream";
@@ -317739,7 +317867,7 @@ var CacheableRequest = class {
         ...urlObjectToRequestOptions(url4)
       };
       options2.headers = Object.fromEntries(entries(options2.headers).map(([key2, value]) => [key2.toLowerCase(), value]));
-      const ee = new EventEmitter6();
+      const ee = new EventEmitter7();
       const normalizedUrlString = normalizeUrl(urlLib.format(url4), {
         stripWWW: false,
         // eslint-disable-line @typescript-eslint/naming-convention
@@ -318558,7 +318686,7 @@ var calculateRetryDelay = ({ attemptCount, retryOptions, error, retryAfter, comp
 var calculate_retry_delay_default = calculateRetryDelay;
 
 // node_modules/got/dist/source/core/options.js
-import process17 from "node:process";
+import process18 from "node:process";
 import { promisify as promisify11, inspect as inspect3 } from "node:util";
 import { checkServerIdentity } from "node:tls";
 import https2 from "node:https";
@@ -318956,7 +319084,7 @@ function parseLinkHeader(link2) {
 }
 
 // node_modules/got/dist/source/core/options.js
-var [major2, minor] = process17.versions.node.split(".").map(Number);
+var [major2, minor] = process18.versions.node.split(".").map(Number);
 function validateSearchParameters(searchParameters) {
   for (const key in searchParameters) {
     const value = searchParameters[key];
@@ -320568,7 +320696,7 @@ function isUnixSocketURL(url4) {
 }
 
 // node_modules/got/dist/source/core/index.js
-var supportsBrotli = distribution_default.string(process18.versions.brotli);
+var supportsBrotli = distribution_default.string(process19.versions.brotli);
 var methodsWithoutBody = /* @__PURE__ */ new Set(["GET", "HEAD"]);
 var cacheableStore = new WeakableMap();
 var redirectCodes = /* @__PURE__ */ new Set([300, 301, 302, 303, 304, 307, 308]);
@@ -320798,7 +320926,7 @@ var Request = class _Request extends Duplex4 {
           this.emit("retry", this.retryCount + 1, error, (updatedOptions) => {
             const request3 = new _Request(options2.url, updatedOptions, options2);
             request3.retryCount = this.retryCount + 1;
-            process18.nextTick(() => {
+            process19.nextTick(() => {
               void request3.flush();
             });
             return request3;
@@ -320991,9 +321119,9 @@ var Request = class _Request extends Duplex4 {
     this.emit("downloadProgress", this.downloadProgress);
     const rawCookies = response.headers["set-cookie"];
     if (distribution_default.object(options2.cookieJar) && rawCookies) {
-      let promises2 = rawCookies.map(async (rawCookie) => options2.cookieJar.setCookie(rawCookie, url4.toString()));
+      let promises3 = rawCookies.map(async (rawCookie) => options2.cookieJar.setCookie(rawCookie, url4.toString()));
       if (options2.ignoreInvalidCookies) {
-        promises2 = promises2.map(async (promise) => {
+        promises3 = promises3.map(async (promise) => {
           try {
             await promise;
           } catch {
@@ -321001,7 +321129,7 @@ var Request = class _Request extends Duplex4 {
         });
       }
       try {
-        await Promise.all(promises2);
+        await Promise.all(promises3);
       } catch (error) {
         this._beforeError(error);
         return;
@@ -321470,7 +321598,7 @@ function asPromise(firstRequest) {
   let globalRequest;
   let globalResponse;
   let normalizedOptions;
-  const emitter = new EventEmitter7();
+  const emitter = new EventEmitter8();
   const promise = new PCancelable((resolve13, reject, onCancel) => {
     onCancel(() => {
       globalRequest.destroy();
@@ -321861,7 +321989,7 @@ var getTarget = () => {
 var downloadFile2 = async (url4, outFile) => {
   let tmpDir = void 0;
   try {
-    tmpDir = await import_fs_extra.default.mkdtemp("download-ripgrep");
+    tmpDir = await import_fs_extra.default.mkdtemp(path33.join(os8.tmpdir(), "download-ripgrep"));
     const tmpFile = path33.join(tmpDir, "tmp-file");
     await pipeline2(source_default2.stream(url4), createWriteStream5(tmpFile));
     await mkdir3(dirname7(outFile), { recursive: true });
@@ -322377,7 +322505,7 @@ var GlobToolInvocation = class extends BaseToolInvocation {
         allEntries.push(...entries2);
       }
       const relativePaths = allEntries.map((p) => path35.relative(this.config.getTargetDir(), p.fullpath()));
-      const { filteredPaths, gitIgnoredCount, geminiIgnoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
         respectGitIgnore: this.params?.respect_git_ignore ?? this.config.getFileFilteringOptions().respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
         respectGeminiIgnore: this.params?.respect_gemini_ignore ?? this.config.getFileFilteringOptions().respectGeminiIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore
       });
@@ -322390,11 +322518,8 @@ var GlobToolInvocation = class extends BaseToolInvocation {
         } else {
           message += ` within ${searchDirectories.length} workspace directories`;
         }
-        if (gitIgnoredCount > 0) {
-          message += ` (${gitIgnoredCount} files were git-ignored)`;
-        }
-        if (geminiIgnoredCount > 0) {
-          message += ` (${geminiIgnoredCount} files were gemini-ignored)`;
+        if (ignoredCount > 0) {
+          message += ` (${ignoredCount} files were ignored)`;
         }
         return {
           llmContent: message,
@@ -322413,11 +322538,8 @@ var GlobToolInvocation = class extends BaseToolInvocation {
       } else {
         resultMessage += ` across ${searchDirectories.length} workspace directories`;
       }
-      if (gitIgnoredCount > 0) {
-        resultMessage += ` (${gitIgnoredCount} additional files were git-ignored)`;
-      }
-      if (geminiIgnoredCount > 0) {
-        resultMessage += ` (${geminiIgnoredCount} additional files were gemini-ignored)`;
+      if (ignoredCount > 0) {
+        resultMessage += ` (${ignoredCount} additional files were ignored)`;
       }
       resultMessage += `, sorted by modification time (newest first):
 ${fileListDescription}`;
@@ -322426,8 +322548,8 @@ ${fileListDescription}`;
         returnDisplay: `Found ${fileCount} matching file(s)`
       };
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      console.error(`GlobLogic execute Error: ${errorMessage}`, error);
+      debugLogger.warn(`GlobLogic execute Error`, error);
+      const errorMessage = getErrorMessage(error);
       const rawError = `Error during glob search operation: ${errorMessage}`;
       return {
         llmContent: rawError,
@@ -322506,6 +322628,7 @@ var GlobTool = class _GlobTool extends BaseDeclarativeTool {
 // packages/core/dist/src/tools/edit.js
 import * as fs36 from "node:fs";
 import * as path38 from "node:path";
+import process20 from "node:process";
 
 // packages/core/dist/src/utils/LruCache.js
 var LruCache = class {
@@ -324005,12 +324128,11 @@ function applyReplacement(currentContent, oldString, newString, isNewFile) {
   }
   return safeLiteralReplace(currentContent, oldString, newString);
 }
-var EditToolInvocation = class {
+var EditToolInvocation = class extends BaseToolInvocation {
   config;
-  params;
-  constructor(config2, params) {
+  constructor(config2, params, messageBus, toolName, displayName) {
+    super(params, messageBus, toolName, displayName);
     this.config = config2;
-    this.params = params;
   }
   toolLocations() {
     return [{ path: this.params.file_path }];
@@ -324106,7 +324228,7 @@ var EditToolInvocation = class {
    * Handles the confirmation prompt for the Edit tool in the CLI.
    * It needs to calculate the diff to show the user.
    */
-  async shouldConfirmExecute(abortSignal) {
+  async getConfirmationDetails(abortSignal) {
     if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
       return false;
     }
@@ -324260,8 +324382,11 @@ var EditToolInvocation = class {
 var EditTool = class _EditTool extends BaseDeclarativeTool {
   config;
   static Name = EDIT_TOOL_NAME;
-  constructor(config2) {
-    super(_EditTool.Name, "Edit", `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
+  constructor(config2, messageBus) {
+    super(
+      _EditTool.Name,
+      "Edit",
+      `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
 
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
 
@@ -324271,29 +324396,37 @@ Expectation for required parameters:
 3. \`new_string\` MUST be the exact literal text to replace \`old_string\` with (also including all whitespace, indentation, newlines, and surrounding code etc.). Ensure the resulting code is correct and idiomatic.
 4. NEVER escape \`old_string\` or \`new_string\`, that would break the exact literal text requirement.
 **Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
-**Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`, Kind.Edit, {
-      properties: {
-        file_path: {
-          description: "The absolute path to the file to modify. Must start with '/'.",
-          type: "string"
-        },
-        old_string: {
-          description: "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
-          type: "string"
-        },
-        new_string: {
-          description: "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
-          type: "string"
+**Multiple replacements:** Set \`expected_replacements\` to the number of occurrences you want to replace. The tool will replace ALL occurrences that match \`old_string\` exactly. Ensure the number of replacements matches your expectation.`,
+      Kind.Edit,
+      {
+        properties: {
+          file_path: {
+            description: process20.platform === "win32" ? "The absolute path to the file to modify (e.g., 'C:\\Users\\project\\file.txt'). Must be an absolute path." : "The absolute path to the file to modify (e.g., '/home/user/project/file.txt'). Must start with '/'.",
+            type: "string"
+          },
+          old_string: {
+            description: "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string"
+          },
+          new_string: {
+            description: "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string"
+          },
+          expected_replacements: {
+            type: "number",
+            description: "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
+            minimum: 1
+          }
         },
-        expected_replacements: {
-          type: "number",
-          description: "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
-          minimum: 1
-        }
+        required: ["file_path", "old_string", "new_string"],
+        type: "object"
       },
-      required: ["file_path", "old_string", "new_string"],
-      type: "object"
-    });
+      true,
+      // isOutputMarkdown
+      false,
+      // canUpdateOutput
+      messageBus
+    );
     this.config = config2;
   }
   /**
@@ -324315,8 +324448,8 @@ Expectation for required parameters:
     }
     return null;
   }
-  createInvocation(params) {
-    return new EditToolInvocation(this.config, params);
+  createInvocation(params, messageBus, toolName, displayName) {
+    return new EditToolInvocation(this.config, params, messageBus ?? this.messageBus, toolName ?? this.name, displayName ?? this.displayName);
   }
   getModifyContext(_) {
     return {
@@ -324663,6 +324796,226 @@ async function reportError(error, baseMessage, context2, type = "general", repor
   }
 }
 
+// packages/core/dist/src/utils/googleErrors.js
+function parseGoogleApiError(error) {
+  if (!error) {
+    return null;
+  }
+  let errorObj = error;
+  if (typeof errorObj === "string") {
+    try {
+      errorObj = JSON.parse(errorObj);
+    } catch (_) {
+      return null;
+    }
+  }
+  if (Array.isArray(errorObj) && errorObj.length > 0) {
+    errorObj = errorObj[0];
+  }
+  if (typeof errorObj !== "object" || errorObj === null) {
+    return null;
+  }
+  let currentError = fromGaxiosError(errorObj) ?? fromApiError(errorObj);
+  let depth = 0;
+  const maxDepth = 10;
+  while (currentError && typeof currentError.message === "string" && depth < maxDepth) {
+    try {
+      const parsedMessage = JSON.parse(currentError.message.replace(/\u00A0/g, "").replace(/\n/g, " "));
+      if (parsedMessage.error) {
+        currentError = parsedMessage.error;
+        depth++;
+      } else {
+        break;
+      }
+    } catch (_error) {
+      break;
+    }
+  }
+  if (!currentError) {
+    return null;
+  }
+  const code2 = currentError.code;
+  const message = currentError.message;
+  const errorDetails = currentError.details;
+  if (Array.isArray(errorDetails) && code2 && message) {
+    const details = [];
+    for (const detail of errorDetails) {
+      if (detail && typeof detail === "object") {
+        const detailObj = detail;
+        const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
+        if (typeKey) {
+          if (typeKey !== "@type") {
+            detailObj["@type"] = detailObj[typeKey];
+            delete detailObj[typeKey];
+          }
+          details.push(detailObj);
+        }
+      }
+    }
+    if (details.length > 0) {
+      return {
+        code: code2,
+        message,
+        details
+      };
+    }
+  }
+  return null;
+}
+function fromGaxiosError(errorObj) {
+  const gaxiosError = errorObj;
+  let outerError;
+  if (gaxiosError.response?.data) {
+    let data = gaxiosError.response.data;
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (_) {
+      }
+    }
+    if (Array.isArray(data) && data.length > 0) {
+      data = data[0];
+    }
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
+        outerError = data.error;
+      }
+    }
+  }
+  if (!outerError) {
+    if (gaxiosError.error) {
+      outerError = gaxiosError.error;
+    } else {
+      return void 0;
+    }
+  }
+  return outerError;
+}
+function fromApiError(errorObj) {
+  const apiError = errorObj;
+  let outerError;
+  if (apiError.message) {
+    let data = apiError.message;
+    if (typeof data === "string") {
+      try {
+        data = JSON.parse(data);
+      } catch (_) {
+      }
+    }
+    if (Array.isArray(data) && data.length > 0) {
+      data = data[0];
+    }
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
+        outerError = data.error;
+      }
+    }
+  }
+  return outerError;
+}
+
+// packages/core/dist/src/utils/googleQuotaErrors.js
+var TerminalQuotaError = class extends Error {
+  cause;
+  constructor(message, cause) {
+    super(message);
+    this.cause = cause;
+    this.name = "TerminalQuotaError";
+  }
+};
+var RetryableQuotaError = class extends Error {
+  cause;
+  retryDelayMs;
+  constructor(message, cause, retryDelaySeconds) {
+    super(message);
+    this.cause = cause;
+    this.name = "RetryableQuotaError";
+    this.retryDelayMs = retryDelaySeconds * 1e3;
+  }
+};
+function parseDurationInSeconds(duration) {
+  if (!duration.endsWith("s")) {
+    return null;
+  }
+  const seconds = parseFloat(duration.slice(0, -1));
+  return isNaN(seconds) ? null : seconds;
+}
+function classifyGoogleError(error) {
+  const googleApiError = parseGoogleApiError(error);
+  if (!googleApiError || googleApiError.code !== 429) {
+    return error;
+  }
+  const quotaFailure = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure");
+  const errorInfo = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.ErrorInfo");
+  const retryInfo = googleApiError.details.find((d) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo");
+  if (quotaFailure) {
+    for (const violation of quotaFailure.violations) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerDay") || quotaId.includes("Daily")) {
+        return new TerminalQuotaError(`${googleApiError.message}
+Expected quota reset within 24h.`, googleApiError);
+      }
+    }
+  }
+  if (errorInfo) {
+    if (errorInfo.domain) {
+      const validDomains = [
+        "cloudcode-pa.googleapis.com",
+        "staging-cloudcode-pa.googleapis.com",
+        "autopush-cloudcode-pa.googleapis.com"
+      ];
+      if (validDomains.includes(errorInfo.domain)) {
+        if (errorInfo.reason === "RATE_LIMIT_EXCEEDED") {
+          let delaySeconds = 10;
+          if (retryInfo?.retryDelay) {
+            const parsedDelay = parseDurationInSeconds(retryInfo.retryDelay);
+            if (parsedDelay) {
+              delaySeconds = parsedDelay;
+            }
+          }
+          return new RetryableQuotaError(`${googleApiError.message}`, googleApiError, delaySeconds);
+        }
+        if (errorInfo.reason === "QUOTA_EXHAUSTED") {
+          return new TerminalQuotaError(`${googleApiError.message}`, googleApiError);
+        }
+      }
+    }
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerDay") || quotaLimit.includes("Daily")) {
+      return new TerminalQuotaError(`${googleApiError.message}
+Expected quota reset within 24h.`, googleApiError);
+    }
+  }
+  if (retryInfo?.retryDelay) {
+    const delaySeconds = parseDurationInSeconds(retryInfo.retryDelay);
+    if (delaySeconds) {
+      if (delaySeconds > 120) {
+        return new TerminalQuotaError(`${googleApiError.message}
+Suggested retry after ${retryInfo.retryDelay}.`, googleApiError);
+      }
+      return new RetryableQuotaError(`${googleApiError.message}
+Suggested retry after ${retryInfo.retryDelay}.`, googleApiError, delaySeconds);
+    }
+  }
+  if (quotaFailure) {
+    for (const violation of quotaFailure.violations) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerMinute")) {
+        return new RetryableQuotaError(`${googleApiError.message}
+Suggested retry after 60s.`, googleApiError, 60);
+      }
+    }
+  }
+  if (errorInfo) {
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerMinute")) {
+      return new RetryableQuotaError(`${errorInfo.reason}
+Suggested retry after 60s.`, googleApiError, 60);
+    }
+  }
+  return error;
+}
+
 // packages/core/dist/src/utils/delay.js
 function createAbortError() {
   const abortError = new Error("Aborted");
@@ -324693,7 +325046,7 @@ function delay2(ms, signal) {
 // packages/core/dist/src/utils/retry.js
 var FETCH_FAILED_MESSAGE = "exception TypeError: fetch failed sending request";
 var DEFAULT_RETRY_OPTIONS = {
-  maxAttempts: 5,
+  maxAttempts: 3,
   initialDelayMs: 5e3,
   maxDelayMs: 3e4,
   // 30 seconds
@@ -324728,7 +325081,6 @@ async function retryWithBackoff(fn, options2) {
   };
   let attempt = 0;
   let currentDelay = initialDelayMs;
-  let consecutive429Count = 0;
   while (attempt < maxAttempts) {
     if (signal?.aborted) {
       throw createAbortError();
@@ -324748,72 +325100,51 @@ async function retryWithBackoff(fn, options2) {
       if (error instanceof Error && error.name === "AbortError") {
         throw error;
       }
-      const errorStatus = getErrorStatus(error);
-      if (errorStatus === 429 && authType === AuthType2.LOGIN_WITH_GOOGLE && isProQuotaExceededError(error) && onPersistent429) {
-        try {
-          const fallbackModel = await onPersistent429(authType, error);
-          if (fallbackModel !== false && fallbackModel !== null) {
-            attempt = 0;
-            consecutive429Count = 0;
-            currentDelay = initialDelayMs;
-            continue;
-          } else {
-            throw error;
-          }
-        } catch (fallbackError) {
-          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
-        }
-      }
-      if (errorStatus === 429 && authType === AuthType2.LOGIN_WITH_GOOGLE && !isProQuotaExceededError(error) && isGenericQuotaExceededError(error) && onPersistent429) {
-        try {
-          const fallbackModel = await onPersistent429(authType, error);
-          if (fallbackModel !== false && fallbackModel !== null) {
-            attempt = 0;
-            consecutive429Count = 0;
-            currentDelay = initialDelayMs;
-            continue;
-          } else {
-            throw error;
+      const classifiedError = classifyGoogleError(error);
+      if (classifiedError instanceof TerminalQuotaError) {
+        if (onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
+          try {
+            const fallbackModel = await onPersistent429(authType, classifiedError);
+            if (fallbackModel) {
+              attempt = 0;
+              currentDelay = initialDelayMs;
+              continue;
+            }
+          } catch (fallbackError) {
+            debugLogger.warn("Fallback to Flash model failed:", fallbackError);
           }
-        } catch (fallbackError) {
-          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
         }
+        throw classifiedError;
       }
-      if (errorStatus === 429) {
-        consecutive429Count++;
-      } else {
-        consecutive429Count = 0;
-      }
-      if (consecutive429Count >= 2 && onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
-        try {
-          const fallbackModel = await onPersistent429(authType, error);
-          if (fallbackModel !== false && fallbackModel !== null) {
-            attempt = 0;
-            consecutive429Count = 0;
-            currentDelay = initialDelayMs;
-            continue;
-          } else {
-            throw error;
+      if (classifiedError instanceof RetryableQuotaError) {
+        if (attempt >= maxAttempts) {
+          if (onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
+            try {
+              const fallbackModel = await onPersistent429(authType, classifiedError);
+              if (fallbackModel) {
+                attempt = 0;
+                currentDelay = initialDelayMs;
+                continue;
+              }
+            } catch (fallbackError) {
+              console.warn("Model fallback failed:", fallbackError);
+            }
           }
-        } catch (fallbackError) {
-          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
+          throw classifiedError;
         }
+        console.warn(`Attempt ${attempt} failed: ${classifiedError.message}. Retrying after ${classifiedError.retryDelayMs}ms...`);
+        await delay2(classifiedError.retryDelayMs, signal);
+        continue;
       }
       if (attempt >= maxAttempts || !shouldRetryOnError(error, retryFetchErrors)) {
         throw error;
       }
-      const { delayDurationMs, errorStatus: delayErrorStatus } = getDelayDurationAndStatus(error);
-      if (delayDurationMs > 0) {
-        debugLogger.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? "unknown"}. Retrying after explicit delay of ${delayDurationMs}ms...`, error);
-        await delay2(delayDurationMs, signal);
-        currentDelay = initialDelayMs;
-      } else {
-        logRetryAttempt(attempt, error, errorStatus);
-        const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
-        const delayWithJitter = Math.max(0, currentDelay + jitter);
-        await delay2(delayWithJitter, signal);
-        currentDelay = Math.min(maxDelayMs, currentDelay * 2);
-      }
+      const errorStatus = getErrorStatus(error);
+      logRetryAttempt(attempt, error, errorStatus);
+      const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
+      const delayWithJitter = Math.max(0, currentDelay + jitter);
+      await delay2(delayWithJitter, signal);
+      currentDelay = Math.min(maxDelayMs, currentDelay * 2);
     }
   }
   throw new Error("Retry attempts exhausted");
@@ -324832,36 +325163,6 @@ function getErrorStatus(error) {
   }
   return void 0;
 }
-function getRetryAfterDelayMs(error) {
-  if (typeof error === "object" && error !== null) {
-    if ("response" in error && typeof error.response === "object" && error.response !== null) {
-      const response = error.response;
-      if ("headers" in response && typeof response.headers === "object" && response.headers !== null) {
-        const headers = response.headers;
-        const retryAfterHeader = headers["retry-after"];
-        if (typeof retryAfterHeader === "string") {
-          const retryAfterSeconds = parseInt(retryAfterHeader, 10);
-          if (!isNaN(retryAfterSeconds)) {
-            return retryAfterSeconds * 1e3;
-          }
-          const retryAfterDate = new Date(retryAfterHeader);
-          if (!isNaN(retryAfterDate.getTime())) {
-            return Math.max(0, retryAfterDate.getTime() - Date.now());
-          }
-        }
-      }
-    }
-  }
-  return 0;
-}
-function getDelayDurationAndStatus(error) {
-  const errorStatus = getErrorStatus(error);
-  let delayDurationMs = 0;
-  if (errorStatus === 429) {
-    delayDurationMs = getRetryAfterDelayMs(error);
-  }
-  return { delayDurationMs, errorStatus };
-}
 function logRetryAttempt(attempt, error, errorStatus) {
   let message = `Attempt ${attempt} failed. Retrying with backoff...`;
   if (errorStatus) {
@@ -325277,12 +325578,11 @@ function getErrorReplaceResult(params, occurrences, expectedReplacements, finalO
   }
   return error;
 }
-var EditToolInvocation2 = class {
+var EditToolInvocation2 = class extends BaseToolInvocation {
   config;
-  params;
-  constructor(config2, params) {
+  constructor(config2, params, messageBus, toolName, displayName) {
+    super(params, messageBus, toolName, displayName);
     this.config = config2;
-    this.params = params;
   }
   toolLocations() {
     return [{ path: this.params.file_path }];
@@ -325449,7 +325749,7 @@ var EditToolInvocation2 = class {
    * Handles the confirmation prompt for the Edit tool in the CLI.
    * It needs to calculate the diff to show the user.
    */
-  async shouldConfirmExecute(abortSignal) {
+  async getConfirmationDetails(abortSignal) {
     if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
       return false;
     }
@@ -325607,8 +325907,11 @@ var EditToolInvocation2 = class {
 var SmartEditTool = class _SmartEditTool extends BaseDeclarativeTool {
   config;
   static Name = EDIT_TOOL_NAME;
-  constructor(config2) {
-    super(_SmartEditTool.Name, "Edit", `Replaces text within a file. Replaces a single occurrence. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
+  constructor(config2, messageBus) {
+    super(
+      _SmartEditTool.Name,
+      "Edit",
+      `Replaces text within a file. Replaces a single occurrence. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
       
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
       
@@ -325620,14 +325923,16 @@ var SmartEditTool = class _SmartEditTool extends BaseDeclarativeTool {
       5. NEVER escape \`old_string\` or \`new_string\`, that would break the exact literal text requirement.
       **Important:** If ANY of the above are not satisfied, the tool will fail. CRITICAL for \`old_string\`: Must uniquely identify the single instance to change. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string matches multiple locations, or does not match exactly, the tool will fail.
       6. Prefer to break down complex and long changes into multiple smaller atomic calls to this tool. Always check the content of the file after changes or not finding a string to match.
-      **Multiple replacements:** If there are multiple and ambiguous occurences of the \`old_string\` in the file, the tool will also fail.`, Kind.Edit, {
-      properties: {
-        file_path: {
-          description: "The absolute path to the file to modify. Must start with '/'.",
-          type: "string"
-        },
-        instruction: {
-          description: `A clear, semantic instruction for the code change, acting as a high-quality prompt for an expert LLM assistant. It must be self-contained and explain the goal of the change.
+      **Multiple replacements:** If there are multiple and ambiguous occurences of the \`old_string\` in the file, the tool will also fail.`,
+      Kind.Edit,
+      {
+        properties: {
+          file_path: {
+            description: "The absolute path to the file to modify. Must start with '/'.",
+            type: "string"
+          },
+          instruction: {
+            description: `A clear, semantic instruction for the code change, acting as a high-quality prompt for an expert LLM assistant. It must be self-contained and explain the goal of the change.
 
 A good instruction should concisely answer:
 1.  WHY is the change needed? (e.g., "To fix a bug where users can be null...")
@@ -325642,20 +325947,26 @@ A good instruction should concisely answer:
 - "Fix the bug." (Doesn't explain the bug or the fix)
 - "Replace the line with this new line." (Brittle, just repeats the other parameters)
 `,
-          type: "string"
-        },
-        old_string: {
-          description: "The exact literal text to replace, preferably unescaped. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
-          type: "string"
+            type: "string"
+          },
+          old_string: {
+            description: "The exact literal text to replace, preferably unescaped. Include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string"
+          },
+          new_string: {
+            description: "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string"
+          }
         },
-        new_string: {
-          description: "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
-          type: "string"
-        }
+        required: ["file_path", "instruction", "old_string", "new_string"],
+        type: "object"
       },
-      required: ["file_path", "instruction", "old_string", "new_string"],
-      type: "object"
-    });
+      true,
+      // isOutputMarkdown
+      false,
+      // canUpdateOutput
+      messageBus
+    );
     this.config = config2;
   }
   /**
@@ -325685,7 +325996,7 @@ A good instruction should concisely answer:
     return null;
   }
   createInvocation(params) {
-    return new EditToolInvocation2(this.config, params);
+    return new EditToolInvocation2(this.config, params, this.messageBus, this.name, this.displayName);
   }
   getModifyContext(_) {
     return {
@@ -325756,14 +326067,22 @@ async function summarizeToolOutput(textToSummarize, geminiClient, abortSignal, m
     const parsedResponse = await geminiClient.generateContent(contents, toolOutputSummarizerConfig, abortSignal, DEFAULT_GEMINI_FLASH_LITE_MODEL);
     return getResponseText(parsedResponse) || textToSummarize;
   } catch (error) {
-    console.error("Failed to summarize tool output.", error);
+    debugLogger.warn("Failed to summarize tool output.", error);
     return textToSummarize;
   }
 }
 
+// node_modules/ansi-regex/index.js
+function ansiRegex({ onlyFirst = false } = {}) {
+  const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
+  const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
+  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
+  const pattern = `${osc}|${csi}`;
+  return new RegExp(pattern, onlyFirst ? void 0 : "g");
+}
+
 // node_modules/strip-ansi/index.js
-var import_ansi_regex = __toESM(require_ansi_regex(), 1);
-var regex = (0, import_ansi_regex.default)();
+var regex = ansiRegex();
 function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
@@ -331301,8 +331620,8 @@ var OUTPUT_UPDATE_INTERVAL_MS = 1e3;
 var ShellToolInvocation = class extends BaseToolInvocation {
   config;
   allowlist;
-  constructor(config2, params, allowlist) {
-    super(params);
+  constructor(config2, params, allowlist, messageBus) {
+    super(params, messageBus);
     this.config = config2;
     this.allowlist = allowlist;
   }
@@ -331316,13 +331635,11 @@ var ShellToolInvocation = class extends BaseToolInvocation {
     }
     return description;
   }
-  async shouldConfirmExecute(_abortSignal) {
+  async getConfirmationDetails(_abortSignal) {
     const command = stripShellWrapper(this.params.command);
     const rootCommands = [...new Set(getCommandRoots(command))];
     if (!this.config.isInteractive() && this.config.getApprovalMode() !== ApprovalMode.YOLO) {
-      const allowedTools = this.config.getAllowedTools() || [];
-      const [SHELL_TOOL_NAME2] = SHELL_TOOL_NAMES;
-      if (doesToolInvocationMatch(SHELL_TOOL_NAME2, command, allowedTools)) {
+      if (this.isInvocationAllowlisted(command)) {
         return false;
       }
       throw new Error(`Command "${command}" is not in the list of allowed tools for non-interactive mode.`);
@@ -331489,6 +331806,14 @@ ${result.output}`;
       }
     }
   }
+  isInvocationAllowlisted(command) {
+    const allowedTools = this.config.getAllowedTools() || [];
+    if (allowedTools.length === 0) {
+      return false;
+    }
+    const invocation = { params: { command } };
+    return isShellInvocationAllowlisted(invocation, allowedTools);
+  }
 };
 function getShellToolDescription() {
   const returnedInfo = `
@@ -331521,7 +331846,7 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
   config;
   static Name = SHELL_TOOL_NAME;
   allowlist = /* @__PURE__ */ new Set();
-  constructor(config2) {
+  constructor(config2, messageBus) {
     void initializeShellParsers().catch(() => {
     });
     super(
@@ -331549,7 +331874,9 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
       },
       false,
       // output is not markdown
-      true
+      true,
+      // output can be updated
+      messageBus
     );
     this.config = config2;
   }
@@ -331580,8 +331907,8 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new ShellToolInvocation(this.config, params, this.allowlist);
+  createInvocation(params, messageBus) {
+    return new ShellToolInvocation(this.config, params, this.allowlist, messageBus);
   }
 };
 
@@ -331624,8 +331951,8 @@ async function getCorrectedFileContent(config2, filePath, proposedContent, abort
 }
 var WriteFileToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, toolName, displayName) {
+    super(params, messageBus, toolName, displayName);
     this.config = config2;
   }
   toolLocations() {
@@ -331635,7 +331962,7 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
     const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
     return `Writing to ${shortenPath(relativePath)}`;
   }
-  async shouldConfirmExecute(abortSignal) {
+  async getConfirmationDetails(abortSignal) {
     if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
       return false;
     }
@@ -331768,7 +332095,7 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
 var WriteFileTool = class _WriteFileTool extends BaseDeclarativeTool {
   config;
   static Name = WRITE_FILE_TOOL_NAME;
-  constructor(config2) {
+  constructor(config2, messageBus) {
     super(_WriteFileTool.Name, "WriteFile", `Writes content to a specified file in the local filesystem.
 
       The user has the ability to modify \`content\`. If modified, this will be stated in the response.`, Kind.Edit, {
@@ -331784,7 +332111,7 @@ var WriteFileTool = class _WriteFileTool extends BaseDeclarativeTool {
       },
       required: ["file_path", "content"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   validateToolParamValues(params) {
@@ -331813,7 +332140,7 @@ var WriteFileTool = class _WriteFileTool extends BaseDeclarativeTool {
     return null;
   }
   createInvocation(params) {
-    return new WriteFileToolInvocation(this.config, params);
+    return new WriteFileToolInvocation(this.config, params, this.messageBus, this.name, this.displayName);
   }
   getModifyContext(abortSignal) {
     return {
@@ -336149,10 +336476,10 @@ function compile$1(options2 = {}) {
     }
   );
   return function(html2, metadata2 = void 0) {
-    return process19(html2, metadata2, options2, picker, findBaseElements, limitedWalk);
+    return process21(html2, metadata2, options2, picker, findBaseElements, limitedWalk);
   };
 }
-function process19(html2, metadata2, options2, picker, findBaseElements, walk) {
+function process21(html2, metadata2, options2, picker, findBaseElements, walk) {
   const maxInputLength = options2.limits.maxInputLength;
   if (maxInputLength && html2 && html2.length > maxInputLength) {
     console.warn(
@@ -336917,16 +337244,7 @@ ${textContent2}
     const displayPrompt = this.params.prompt.length > 100 ? this.params.prompt.substring(0, 97) + "..." : this.params.prompt;
     return `Processing URLs and instructions from prompt: "${displayPrompt}"`;
   }
-  async shouldConfirmExecute(abortSignal) {
-    if (this.messageBus) {
-      const decision = await this.getMessageBusDecision(abortSignal);
-      if (decision === "ALLOW") {
-        return false;
-      }
-      if (decision === "DENY") {
-        throw new Error("Tool execution denied by policy.");
-      }
-    }
+  async getConfirmationDetails(_abortSignal) {
     if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
       return false;
     }
@@ -337116,20 +337434,9 @@ ${this.config.getTargetDir()}
 ) `;
     const paramExcludes = this.params.exclude || [];
     const paramUseDefaultExcludes = this.params.useDefaultExcludes !== false;
-    const geminiIgnorePatterns = this.config.getFileService().getGeminiIgnorePatterns();
-    const finalExclusionPatternsForDescription = paramUseDefaultExcludes ? [
-      ...getDefaultExcludes(this.config),
-      ...paramExcludes,
-      ...geminiIgnorePatterns
-    ] : [...paramExcludes, ...geminiIgnorePatterns];
-    let excludeDesc = `Excluding: ${finalExclusionPatternsForDescription.length > 0 ? `patterns like 
+    const finalExclusionPatternsForDescription = paramUseDefaultExcludes ? [...getDefaultExcludes(this.config), ...paramExcludes] : [...paramExcludes];
+    const excludeDesc = `Excluding: ${finalExclusionPatternsForDescription.length > 0 ? `patterns like 
 ${finalExclusionPatternsForDescription.slice(0, 2).join("`, `")}${finalExclusionPatternsForDescription.length > 2 ? "...`" : "`"}` : "none specified"}`;
-    if (geminiIgnorePatterns.length > 0) {
-      const geminiPatternsInEffect = geminiIgnorePatterns.filter((p) => finalExclusionPatternsForDescription.includes(p)).length;
-      if (geminiPatternsInEffect > 0) {
-        excludeDesc += ` (includes ${geminiPatternsInEffect} from .geminiignore)`;
-      }
-    }
     return `Will attempt to read and concatenate files ${pathDesc}. ${excludeDesc}. File encoding: ${DEFAULT_ENCODING}. Separator: "${DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace("{filePath}", "path/to/file.ext")}".`;
   }
   async execute(signal) {
@@ -337169,7 +337476,7 @@ ${finalExclusionPatternsForDescription.slice(0, 2).join("`, `")}${finalExclusion
       }
       const relativeEntries = Array.from(allEntries).map((p) => path45.relative(this.config.getTargetDir(), p));
       const fileDiscovery = this.config.getFileService();
-      const { filteredPaths, gitIgnoredCount, geminiIgnoredCount } = fileDiscovery.filterFilesWithReport(relativeEntries, {
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativeEntries, {
         respectGitIgnore: this.params.file_filtering_options?.respect_git_ignore ?? this.config.getFileFilteringOptions().respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
         respectGeminiIgnore: this.params.file_filtering_options?.respect_gemini_ignore ?? this.config.getFileFilteringOptions().respectGeminiIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore
       });
@@ -337184,16 +337491,10 @@ ${finalExclusionPatternsForDescription.slice(0, 2).join("`, `")}${finalExclusion
         }
         filesToConsider.add(fullPath);
       }
-      if (gitIgnoredCount > 0) {
+      if (ignoredCount > 0) {
         skippedFiles.push({
-          path: `${gitIgnoredCount} file(s)`,
-          reason: "git ignored"
-        });
-      }
-      if (geminiIgnoredCount > 0) {
-        skippedFiles.push({
-          path: `${geminiIgnoredCount} file(s)`,
-          reason: "gemini ignored"
+          path: `${ignoredCount} file(s)`,
+          reason: "ignored by project ignore files"
         });
       }
     } catch (error) {
@@ -337622,6 +337923,10 @@ async function readFullStructure(rootPath, options2) {
     }
     const filesInCurrentDir = [];
     const subFoldersInCurrentDir = [];
+    const filterFileOptions = {
+      respectGitIgnore: options2.fileFilteringOptions?.respectGitIgnore,
+      respectGeminiIgnore: options2.fileFilteringOptions?.respectGeminiIgnore
+    };
     for (const entry of entries2) {
       if (entry.isFile()) {
         if (currentItemCount >= options2.maxItems) {
@@ -337630,11 +337935,8 @@ async function readFullStructure(rootPath, options2) {
         }
         const fileName = entry.name;
         const filePath = path46.join(currentPath, fileName);
-        if (options2.fileService) {
-          const shouldIgnore = options2.fileFilteringOptions.respectGitIgnore && options2.fileService.shouldGitIgnoreFile(filePath) || options2.fileFilteringOptions.respectGeminiIgnore && options2.fileService.shouldGeminiIgnoreFile(filePath);
-          if (shouldIgnore) {
-            continue;
-          }
+        if (options2.fileService?.shouldIgnoreFile(filePath, filterFileOptions)) {
+          continue;
         }
         if (!options2.fileIncludePattern || options2.fileIncludePattern.test(fileName)) {
           filesInCurrentDir.push(fileName);
@@ -337653,10 +337955,7 @@ async function readFullStructure(rootPath, options2) {
         }
         const subFolderName = entry.name;
         const subFolderPath = path46.join(currentPath, subFolderName);
-        let isIgnored = false;
-        if (options2.fileService) {
-          isIgnored = options2.fileFilteringOptions.respectGitIgnore && options2.fileService.shouldGitIgnoreFile(subFolderPath) || options2.fileFilteringOptions.respectGeminiIgnore && options2.fileService.shouldGeminiIgnoreFile(subFolderPath);
-        }
+        const isIgnored = options2.fileService?.shouldIgnoreFile(subFolderPath, filterFileOptions) ?? false;
         if (options2.ignoredFolders.has(subFolderName) || isIgnored) {
           const ignoredSubFolder = {
             name: subFolderName,
@@ -337797,6 +338096,24 @@ ${directoryContext}
   const initialParts = [{ text: context2 }];
   return initialParts;
 }
+async function getInitialChatHistory(config2, extraHistory) {
+  const envParts = await getEnvironmentContext(config2);
+  const envContextString = envParts.map((part) => part.text || "").join("\n\n");
+  const allSetupText = `
+${envContextString}
+
+Reminder: Do not return an empty response when a tool call is required.
+
+My setup is complete. I will provide my first command in the next turn.
+    `.trim();
+  return [
+    {
+      role: "user",
+      parts: [{ text: allSetupText }]
+    },
+    ...extraHistory ?? []
+  ];
+}
 
 // packages/core/dist/src/utils/generateContentResponseUtilities.js
 function getResponseTextFromParts(parts2) {
@@ -337929,8 +338246,10 @@ ${truncatedContent}`,
     };
   }
 }
-var CoreToolScheduler = class {
-  toolRegistry;
+var CoreToolScheduler = class _CoreToolScheduler {
+  // Static WeakMap to track which MessageBus instances already have a handler subscribed
+  // This prevents duplicate subscriptions when multiple CoreToolScheduler instances are created
+  static subscribedMessageBuses = /* @__PURE__ */ new WeakMap();
   toolCalls = [];
   outputUpdateHandler;
   onAllToolCallsComplete;
@@ -337940,10 +338259,12 @@ var CoreToolScheduler = class {
   onEditorClose;
   isFinalizingToolCalls = false;
   isScheduling = false;
+  isCancelling = false;
   requestQueue = [];
+  toolCallQueue = [];
+  completedToolCallsForBatch = [];
   constructor(options2) {
     this.config = options2.config;
-    this.toolRegistry = options2.config.getToolRegistry();
     this.outputUpdateHandler = options2.outputUpdateHandler;
     this.onAllToolCallsComplete = options2.onAllToolCallsComplete;
     this.onToolCallsUpdate = options2.onToolCallsUpdate;
@@ -337951,10 +338272,21 @@ var CoreToolScheduler = class {
     this.onEditorClose = options2.onEditorClose;
     if (this.config.getEnableMessageBusIntegration()) {
       const messageBus = this.config.getMessageBus();
-      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, this.handleToolConfirmationRequest.bind(this));
+      if (!_CoreToolScheduler.subscribedMessageBuses.has(messageBus)) {
+        const sharedHandler = (request3) => {
+          messageBus.publish({
+            type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+            correlationId: request3.correlationId,
+            confirmed: false,
+            requiresUserConfirmation: true
+          });
+        };
+        messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, sharedHandler);
+        _CoreToolScheduler.subscribedMessageBuses.set(messageBus, sharedHandler);
+      }
     }
   }
-  setStatusInternal(targetCallId, newStatus, auxiliaryData) {
+  setStatusInternal(targetCallId, newStatus, signal, auxiliaryData) {
     this.toolCalls = this.toolCalls.map((currentCall) => {
       if (currentCall.request.callId !== targetCallId || currentCall.status === "success" || currentCall.status === "error" || currentCall.status === "cancelled") {
         return currentCall;
@@ -338073,7 +338405,6 @@ var CoreToolScheduler = class {
       }
     });
     this.notifyToolCallsUpdate();
-    this.checkAndNotifyCompletion();
   }
   setArgsInternal(targetCallId, args2) {
     this.toolCalls = this.toolCalls.map((call) => {
@@ -338118,7 +338449,7 @@ var CoreToolScheduler = class {
    * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?", or an empty string if no suggestions are found.
    */
   getToolSuggestion(unknownToolName, topN = 3) {
-    const allToolNames = this.toolRegistry.getAllToolNames();
+    const allToolNames = this.config.getToolRegistry().getAllToolNames();
     const matches = allToolNames.map((toolName) => ({
       name: toolName,
       distance: import_fast_levenshtein.default.get(unknownToolName, toolName)
@@ -338162,15 +338493,31 @@ var CoreToolScheduler = class {
     }
     return this._schedule(request3, signal);
   }
+  cancelAll(signal) {
+    if (this.isCancelling) {
+      return;
+    }
+    this.isCancelling = true;
+    if (this.toolCalls.length > 0) {
+      const activeCall = this.toolCalls[0];
+      if (activeCall.status === "awaiting_approval" || activeCall.status === "executing" || activeCall.status === "scheduled" || activeCall.status === "validating") {
+        this.setStatusInternal(activeCall.request.callId, "cancelled", signal, "User cancelled the operation.");
+      }
+    }
+    this._cancelAllQueuedCalls();
+    void this.checkAndNotifyCompletion(signal);
+  }
   async _schedule(request3, signal) {
     this.isScheduling = true;
+    this.isCancelling = false;
     try {
       if (this.isRunning()) {
         throw new Error("Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).");
       }
       const requestsToProcess = Array.isArray(request3) ? request3 : [request3];
+      this.completedToolCallsForBatch = [];
       const newToolCalls = requestsToProcess.map((reqInfo) => {
-        const toolInstance = this.toolRegistry.getTool(reqInfo.name);
+        const toolInstance = this.config.getToolRegistry().getTool(reqInfo.name);
         if (!toolInstance) {
           const suggestion = this.getToolSuggestion(reqInfo.name);
           const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
@@ -338199,28 +338546,44 @@ var CoreToolScheduler = class {
           startTime: Date.now()
         };
       });
-      this.toolCalls = this.toolCalls.concat(newToolCalls);
-      this.notifyToolCallsUpdate();
-      for (const toolCall of newToolCalls) {
-        if (toolCall.status !== "validating") {
-          continue;
+      this.toolCallQueue.push(...newToolCalls);
+      await this._processNextInQueue(signal);
+    } finally {
+      this.isScheduling = false;
+    }
+  }
+  async _processNextInQueue(signal) {
+    if (this.toolCalls.length > 0 || this.toolCallQueue.length === 0) {
+      return;
+    }
+    if (signal.aborted) {
+      this._cancelAllQueuedCalls();
+      await this.checkAndNotifyCompletion(signal);
+      return;
+    }
+    const toolCall = this.toolCallQueue.shift();
+    this.toolCalls = [toolCall];
+    this.notifyToolCallsUpdate();
+    if (toolCall.status === "error") {
+      await this.checkAndNotifyCompletion(signal);
+      return;
+    }
+    if (toolCall.status === "validating") {
+      const { request: reqInfo, invocation } = toolCall;
+      try {
+        if (signal.aborted) {
+          this.setStatusInternal(reqInfo.callId, "cancelled", signal, "Tool call cancelled by user.");
+          await this.checkAndNotifyCompletion(signal);
+          return;
         }
-        const validatingCall = toolCall;
-        const { request: reqInfo, invocation } = validatingCall;
-        try {
-          if (signal.aborted) {
-            this.setStatusInternal(reqInfo.callId, "cancelled", "Tool call cancelled by user.");
-            continue;
-          }
-          const confirmationDetails = await invocation.shouldConfirmExecute(signal);
-          if (!confirmationDetails) {
-            this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
-            this.setStatusInternal(reqInfo.callId, "scheduled");
-            continue;
-          }
-          if (this.isAutoApproved(validatingCall)) {
+        const confirmationDetails = await invocation.shouldConfirmExecute(signal);
+        if (!confirmationDetails) {
+          this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+          this.setStatusInternal(reqInfo.callId, "scheduled", signal);
+        } else {
+          if (this.isAutoApproved(toolCall)) {
             this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
-            this.setStatusInternal(reqInfo.callId, "scheduled");
+            this.setStatusInternal(reqInfo.callId, "scheduled", signal);
           } else {
             if (confirmationDetails.type === "edit" && confirmationDetails.ideConfirmation) {
               confirmationDetails.ideConfirmation.then((resolution) => {
@@ -338236,33 +338599,30 @@ var CoreToolScheduler = class {
               ...confirmationDetails,
               onConfirm: (outcome, payload) => this.handleConfirmationResponse(reqInfo.callId, originalOnConfirm, outcome, signal, payload)
             };
-            this.setStatusInternal(reqInfo.callId, "awaiting_approval", wrappedConfirmationDetails);
-          }
-        } catch (error) {
-          if (signal.aborted) {
-            this.setStatusInternal(reqInfo.callId, "cancelled", "Tool call cancelled by user.");
-            continue;
+            this.setStatusInternal(reqInfo.callId, "awaiting_approval", signal, wrappedConfirmationDetails);
           }
-          this.setStatusInternal(reqInfo.callId, "error", createErrorResponse(reqInfo, error instanceof Error ? error : new Error(String(error)), ToolErrorType.UNHANDLED_EXCEPTION));
+        }
+      } catch (error) {
+        if (signal.aborted) {
+          this.setStatusInternal(reqInfo.callId, "cancelled", signal, "Tool call cancelled by user.");
+          await this.checkAndNotifyCompletion(signal);
+        } else {
+          this.setStatusInternal(reqInfo.callId, "error", signal, createErrorResponse(reqInfo, error instanceof Error ? error : new Error(String(error)), ToolErrorType.UNHANDLED_EXCEPTION));
+          await this.checkAndNotifyCompletion(signal);
         }
       }
-      await this.attemptExecutionOfScheduledCalls(signal);
-      void this.checkAndNotifyCompletion();
-    } finally {
-      this.isScheduling = false;
     }
+    await this.attemptExecutionOfScheduledCalls(signal);
   }
   async handleConfirmationResponse(callId, originalOnConfirm, outcome, signal, payload) {
     const toolCall = this.toolCalls.find((c4) => c4.request.callId === callId && c4.status === "awaiting_approval");
     if (toolCall && toolCall.status === "awaiting_approval") {
       await originalOnConfirm(outcome);
     }
-    if (outcome === ToolConfirmationOutcome.ProceedAlways) {
-      await this.autoApproveCompatiblePendingTools(signal, callId);
-    }
     this.setToolCallOutcome(callId, outcome);
     if (outcome === ToolConfirmationOutcome.Cancel || signal.aborted) {
-      this.setStatusInternal(callId, "cancelled", "User did not allow tool call");
+      this.cancelAll(signal);
+      return;
     } else if (outcome === ToolConfirmationOutcome.ModifyWithEditor) {
       const waitingToolCall = toolCall;
       if (isModifiableDeclarativeTool(waitingToolCall.tool)) {
@@ -338271,13 +338631,13 @@ var CoreToolScheduler = class {
         if (!editorType) {
           return;
         }
-        this.setStatusInternal(callId, "awaiting_approval", {
+        this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
           isModifying: true
         });
         const { updatedParams, updatedDiff } = await modifyWithEditor(waitingToolCall.request.args, modifyContext, editorType, signal, this.onEditorClose);
         this.setArgsInternal(callId, updatedParams);
-        this.setStatusInternal(callId, "awaiting_approval", {
+        this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
           fileDiff: updatedDiff,
           isModifying: false
@@ -338287,7 +338647,7 @@ var CoreToolScheduler = class {
       if (payload?.newContent && toolCall) {
         await this._applyInlineModify(toolCall, payload, signal);
       }
-      this.setStatusInternal(callId, "scheduled");
+      this.setStatusInternal(callId, "scheduled", signal);
     }
     await this.attemptExecutionOfScheduledCalls(signal);
   }
@@ -338306,7 +338666,7 @@ var CoreToolScheduler = class {
     const updatedParams = modifyContext.createUpdatedParams(currentContent, payload.newContent, toolCall.request.args);
     const updatedDiff = createPatch(modifyContext.getFilePath(toolCall.request.args), currentContent, payload.newContent, "Current", "Proposed");
     this.setArgsInternal(toolCall.request.callId, updatedParams);
-    this.setStatusInternal(toolCall.request.callId, "awaiting_approval", {
+    this.setStatusInternal(toolCall.request.callId, "awaiting_approval", signal, {
       ...toolCall.confirmationDetails,
       fileDiff: updatedDiff
     });
@@ -338321,7 +338681,7 @@ var CoreToolScheduler = class {
         const scheduledCall = toolCall;
         const { callId, name: toolName } = scheduledCall.request;
         const invocation = scheduledCall.invocation;
-        this.setStatusInternal(callId, "executing");
+        this.setStatusInternal(callId, "executing", signal);
         const liveOutputCallback = scheduledCall.tool.canUpdateOutput && this.outputUpdateHandler ? (outputChunk) => {
           if (this.outputUpdateHandler) {
             this.outputUpdateHandler(callId, outputChunk);
@@ -338343,10 +338703,8 @@ var CoreToolScheduler = class {
         try {
           const toolResult = await promise;
           if (signal.aborted) {
-            this.setStatusInternal(callId, "cancelled", "User cancelled tool execution.");
-            continue;
-          }
-          if (toolResult.error === void 0) {
+            this.setStatusInternal(callId, "cancelled", signal, "User cancelled tool execution.");
+          } else if (toolResult.error === void 0) {
             let content = toolResult.llmContent;
             let outputFile = void 0;
             const contentLength = typeof content === "string" ? content.length : void 0;
@@ -338377,45 +338735,106 @@ var CoreToolScheduler = class {
               outputFile,
               contentLength
             };
-            this.setStatusInternal(callId, "success", successResponse);
+            this.setStatusInternal(callId, "success", signal, successResponse);
           } else {
             const error = new Error(toolResult.error.message);
             const errorResponse = createErrorResponse(scheduledCall.request, error, toolResult.error.type);
-            this.setStatusInternal(callId, "error", errorResponse);
+            this.setStatusInternal(callId, "error", signal, errorResponse);
           }
         } catch (executionError) {
           if (signal.aborted) {
-            this.setStatusInternal(callId, "cancelled", "User cancelled tool execution.");
+            this.setStatusInternal(callId, "cancelled", signal, "User cancelled tool execution.");
           } else {
-            this.setStatusInternal(callId, "error", createErrorResponse(scheduledCall.request, executionError instanceof Error ? executionError : new Error(String(executionError)), ToolErrorType.UNHANDLED_EXCEPTION));
+            this.setStatusInternal(callId, "error", signal, createErrorResponse(scheduledCall.request, executionError instanceof Error ? executionError : new Error(String(executionError)), ToolErrorType.UNHANDLED_EXCEPTION));
           }
         }
+        await this.checkAndNotifyCompletion(signal);
       }
     }
   }
-  async checkAndNotifyCompletion() {
-    const allCallsAreTerminal = this.toolCalls.every((call) => call.status === "success" || call.status === "error" || call.status === "cancelled");
-    if (this.toolCalls.length > 0 && allCallsAreTerminal) {
-      const completedCalls = [...this.toolCalls];
+  async checkAndNotifyCompletion(signal) {
+    if (this.toolCalls.length === 0) {
+      if (signal.aborted && this.toolCallQueue.length > 0) {
+        this._cancelAllQueuedCalls();
+      }
+    } else {
+      const activeCall = this.toolCalls[0];
+      const isTerminal = activeCall.status === "success" || activeCall.status === "error" || activeCall.status === "cancelled";
+      if (!isTerminal) {
+        return;
+      }
+      const completedCall = activeCall;
+      this.completedToolCallsForBatch.push(completedCall);
+      logToolCall(this.config, new ToolCallEvent(completedCall));
       this.toolCalls = [];
-      for (const call of completedCalls) {
-        logToolCall(this.config, new ToolCallEvent(call));
+    }
+    if (this.toolCallQueue.length === 0 || signal.aborted) {
+      if (signal.aborted) {
+        this._cancelAllQueuedCalls();
+      }
+      if (this.completedToolCallsForBatch.length === 0 && !signal.aborted) {
+        return;
       }
       if (this.onAllToolCallsComplete) {
         this.isFinalizingToolCalls = true;
-        await this.onAllToolCallsComplete(completedCalls);
+        await this.onAllToolCallsComplete(this.completedToolCallsForBatch);
+        this.completedToolCallsForBatch = [];
         this.isFinalizingToolCalls = false;
       }
+      this.isCancelling = false;
       this.notifyToolCallsUpdate();
       if (this.requestQueue.length > 0) {
         const next = this.requestQueue.shift();
         this._schedule(next.request, next.signal).then(next.resolve).catch(next.reject);
       }
+    } else {
+      await this._processNextInQueue(signal);
+    }
+  }
+  _cancelAllQueuedCalls() {
+    while (this.toolCallQueue.length > 0) {
+      const queuedCall = this.toolCallQueue.shift();
+      if (queuedCall.status === "error") {
+        this.completedToolCallsForBatch.push(queuedCall);
+        continue;
+      }
+      const durationMs = "startTime" in queuedCall && queuedCall.startTime ? Date.now() - queuedCall.startTime : void 0;
+      const errorMessage = "[Operation Cancelled] User cancelled the operation.";
+      this.completedToolCallsForBatch.push({
+        request: queuedCall.request,
+        tool: queuedCall.tool,
+        invocation: queuedCall.invocation,
+        status: "cancelled",
+        response: {
+          callId: queuedCall.request.callId,
+          responseParts: [
+            {
+              functionResponse: {
+                id: queuedCall.request.callId,
+                name: queuedCall.request.name,
+                response: {
+                  error: errorMessage
+                }
+              }
+            }
+          ],
+          resultDisplay: void 0,
+          error: void 0,
+          errorType: void 0,
+          contentLength: errorMessage.length
+        },
+        durationMs,
+        outcome: ToolConfirmationOutcome.Cancel
+      });
     }
   }
   notifyToolCallsUpdate() {
     if (this.onToolCallsUpdate) {
-      this.onToolCallsUpdate([...this.toolCalls]);
+      this.onToolCallsUpdate([
+        ...this.completedToolCallsForBatch,
+        ...this.toolCalls,
+        ...this.toolCallQueue
+      ]);
     }
   }
   setToolCallOutcome(callId, outcome) {
@@ -338428,22 +338847,6 @@ var CoreToolScheduler = class {
       };
     });
   }
-  /**
-   * Handle tool confirmation requests from the message bus when policy decision is ASK_USER.
-   * This publishes a response with requiresUserConfirmation=true to signal the tool
-   * that it should fall back to its legacy confirmation UI.
-   */
-  handleToolConfirmationRequest(request3) {
-    const messageBus = this.config.getMessageBus();
-    messageBus.publish({
-      type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-      correlationId: request3.correlationId,
-      confirmed: false,
-      // Not auto-approved
-      requiresUserConfirmation: true
-      // Use legacy UI confirmation
-    });
-  }
   isAutoApproved(toolCall) {
     if (this.config.getApprovalMode() === ApprovalMode.YOLO) {
       return true;
@@ -338456,20 +338859,6 @@ var CoreToolScheduler = class {
     }
     return doesToolInvocationMatch(tool, invocation, allowedTools);
   }
-  async autoApproveCompatiblePendingTools(signal, triggeringCallId) {
-    const pendingTools = this.toolCalls.filter((call) => call.status === "awaiting_approval" && call.request.callId !== triggeringCallId);
-    for (const pendingTool of pendingTools) {
-      try {
-        const stillNeedsConfirmation = await pendingTool.invocation.shouldConfirmExecute(signal);
-        if (!stillNeedsConfirmation) {
-          this.setToolCallOutcome(pendingTool.request.callId, ToolConfirmationOutcome.ProceedAlways);
-          this.setStatusInternal(pendingTool.request.callId, "scheduled");
-        }
-      } catch (error) {
-        console.error(`Error checking confirmation for tool ${pendingTool.request.callId}:`, error);
-      }
-    }
-  }
 };
 
 // packages/core/dist/src/utils/thoughtUtils.js
@@ -339362,7 +339751,7 @@ function getCitations(resp) {
 import path49 from "node:path";
 import fs47 from "node:fs";
 import os17 from "node:os";
-import process20 from "node:process";
+import process22 from "node:process";
 
 // packages/core/dist/src/agents/codebase-investigator.js
 var CodebaseInvestigationReportSchema = external_exports.object({
@@ -339512,7 +339901,7 @@ function resolvePathFromEnv(envVar) {
 function getCoreSystemPrompt(config2, userMemory) {
   let systemMdEnabled = false;
   let systemMdPath = path49.resolve(path49.join(GEMINI_DIR, "system.md"));
-  const systemMdResolution = resolvePathFromEnv(process20.env["GEMINI_SYSTEM_MD"]);
+  const systemMdResolution = resolvePathFromEnv(process22.env["GEMINI_SYSTEM_MD"]);
   if (systemMdResolution.value && !systemMdResolution.isDisabled) {
     systemMdEnabled = true;
     if (!systemMdResolution.isSwitch) {
@@ -339630,8 +340019,8 @@ ${function() {
 - **Feedback:** To report a bug or provide feedback, please use the /bug command.
 
 ${function() {
-    const isSandboxExec = process20.env["SANDBOX"] === "sandbox-exec";
-    const isGenericSandbox = !!process20.env["SANDBOX"];
+    const isSandboxExec = process22.env["SANDBOX"] === "sandbox-exec";
+    const isGenericSandbox = !!process22.env["SANDBOX"];
     if (isSandboxExec) {
       return `
 # macOS Seatbelt
@@ -339651,7 +340040,7 @@ You are running outside of a sandbox container, directly on the user's system. F
   }()}
 
 ${function() {
-    if (isGitRepository(process20.cwd())) {
+    if (isGitRepository(process22.cwd())) {
       return `
 # Git Repository
 - The current working (project) directory is being managed by a git repository.
@@ -339675,7 +340064,7 @@ ${function() {
 # Final Reminder
 Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${READ_FILE_TOOL_NAME}' or '${READ_MANY_FILES_TOOL_NAME}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.
 `.trim();
-  const writeSystemMdResolution = resolvePathFromEnv(process20.env["GEMINI_WRITE_SYSTEM_MD"]);
+  const writeSystemMdResolution = resolvePathFromEnv(process22.env["GEMINI_WRITE_SYSTEM_MD"]);
   if (writeSystemMdResolution.value && !writeSystemMdResolution.isDisabled) {
     const writePath = writeSystemMdResolution.isSwitch ? systemMdPath : writeSystemMdResolution.value;
     fs47.mkdirSync(path49.dirname(writePath), { recursive: true });
@@ -340082,19 +340471,28 @@ var LoopDetectionService = class {
       ...trimmedHistory,
       { role: "user", parts: [{ text: taskPrompt }] }
     ];
+    if (contents.length > 0 && isFunctionCall(contents[0])) {
+      contents.unshift({
+        role: "user",
+        parts: [{ text: "Recent conversation history:" }]
+      });
+    }
     const schema = {
       type: "object",
       properties: {
-        reasoning: {
+        unproductive_state_analysis: {
           type: "string",
           description: "Your reasoning on if the conversation is looping without forward progress."
         },
-        confidence: {
+        unproductive_state_confidence: {
           type: "number",
           description: "A number between 0.0 and 1.0 representing your confidence that the conversation is in an unproductive state."
         }
       },
-      required: ["reasoning", "confidence"]
+      required: [
+        "unproductive_state_analysis",
+        "unproductive_state_confidence"
+      ]
     };
     let result;
     try {
@@ -340107,18 +340505,18 @@ var LoopDetectionService = class {
         promptId: this.promptId
       });
     } catch (e2) {
-      this.config.getDebugMode() ? console.error(e2) : debugLogger.debug(e2);
+      this.config.getDebugMode() ? debugLogger.warn(e2) : debugLogger.debug(e2);
       return false;
     }
-    if (typeof result["confidence"] === "number") {
-      if (result["confidence"] > 0.9) {
-        if (typeof result["reasoning"] === "string" && result["reasoning"]) {
-          debugLogger.warn(result["reasoning"]);
+    if (typeof result["unproductive_state_confidence"] === "number") {
+      if (result["unproductive_state_confidence"] > 0.9) {
+        if (typeof result["unproductive_state_analysis"] === "string" && result["unproductive_state_analysis"]) {
+          debugLogger.warn(result["unproductive_state_analysis"]);
         }
         logLoopDetected(this.config, new LoopDetectedEvent(LoopType.LLM_DETECTED_LOOP, this.promptId));
         return true;
       } else {
-        this.llmCheckInterval = Math.round(MIN_LLM_CHECK_INTERVAL + (MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) * (1 - result["confidence"]));
+        this.llmCheckInterval = Math.round(MIN_LLM_CHECK_INTERVAL + (MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) * (1 - result["unproductive_state_confidence"]));
       }
     }
     return false;
@@ -340151,10 +340549,9 @@ var LoopDetectionService = class {
   }
 };
 
-// packages/core/dist/src/core/client.js
-function isThinkingSupported(model) {
-  return model.startsWith("gemini-2.5") || model === DEFAULT_GEMINI_MODEL_AUTO;
-}
+// packages/core/dist/src/services/chatCompressionService.js
+var COMPRESSION_TOKEN_THRESHOLD = 0.7;
+var COMPRESSION_PRESERVE_THRESHOLD = 0.3;
 function findCompressSplitPoint(contents, fraction) {
   if (fraction <= 0 || fraction >= 1) {
     throw new Error("Fraction must be between 0 and 1");
@@ -340180,9 +340577,110 @@ function findCompressSplitPoint(contents, fraction) {
   }
   return lastSplitPoint;
 }
+var ChatCompressionService = class {
+  async compress(chat, promptId, force, model, config2, hasFailedCompressionAttempt) {
+    const curatedHistory = chat.getHistory(true);
+    if (curatedHistory.length === 0 || hasFailedCompressionAttempt && !force) {
+      return {
+        newHistory: null,
+        info: {
+          originalTokenCount: 0,
+          newTokenCount: 0,
+          compressionStatus: CompressionStatus.NOOP
+        }
+      };
+    }
+    const originalTokenCount = uiTelemetryService.getLastPromptTokenCount();
+    const contextPercentageThreshold = config2.getChatCompression()?.contextPercentageThreshold;
+    if (!force) {
+      const threshold = contextPercentageThreshold ?? COMPRESSION_TOKEN_THRESHOLD;
+      if (originalTokenCount < threshold * tokenLimit(model)) {
+        return {
+          newHistory: null,
+          info: {
+            originalTokenCount,
+            newTokenCount: originalTokenCount,
+            compressionStatus: CompressionStatus.NOOP
+          }
+        };
+      }
+    }
+    const splitPoint = findCompressSplitPoint(curatedHistory, 1 - COMPRESSION_PRESERVE_THRESHOLD);
+    const historyToCompress = curatedHistory.slice(0, splitPoint);
+    const historyToKeep = curatedHistory.slice(splitPoint);
+    if (historyToCompress.length === 0) {
+      return {
+        newHistory: null,
+        info: {
+          originalTokenCount,
+          newTokenCount: originalTokenCount,
+          compressionStatus: CompressionStatus.NOOP
+        }
+      };
+    }
+    const summaryResponse = await config2.getContentGenerator().generateContent({
+      model,
+      contents: [
+        ...historyToCompress,
+        {
+          role: "user",
+          parts: [
+            {
+              text: "First, reason in your scratchpad. Then, generate the <state_snapshot>."
+            }
+          ]
+        }
+      ],
+      config: {
+        systemInstruction: { text: getCompressionPrompt() }
+      }
+    }, promptId);
+    const summary = getResponseText(summaryResponse) ?? "";
+    const extraHistory = [
+      {
+        role: "user",
+        parts: [{ text: summary }]
+      },
+      {
+        role: "model",
+        parts: [{ text: "Got it. Thanks for the additional context!" }]
+      },
+      ...historyToKeep
+    ];
+    const fullNewHistory = await getInitialChatHistory(config2, extraHistory);
+    const newTokenCount = Math.floor(fullNewHistory.reduce((total, content) => total + JSON.stringify(content).length, 0) / 4);
+    logChatCompression(config2, makeChatCompressionEvent({
+      tokens_before: originalTokenCount,
+      tokens_after: newTokenCount
+    }));
+    if (newTokenCount > originalTokenCount) {
+      return {
+        newHistory: null,
+        info: {
+          originalTokenCount,
+          newTokenCount,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT
+        }
+      };
+    } else {
+      uiTelemetryService.setLastPromptTokenCount(newTokenCount);
+      return {
+        newHistory: extraHistory,
+        info: {
+          originalTokenCount,
+          newTokenCount,
+          compressionStatus: CompressionStatus.COMPRESSED
+        }
+      };
+    }
+  }
+};
+
+// packages/core/dist/src/core/client.js
+function isThinkingSupported(model) {
+  return model.startsWith("gemini-2.5") || model === DEFAULT_GEMINI_MODEL_AUTO;
+}
 var MAX_TURNS = 100;
-var COMPRESSION_TOKEN_THRESHOLD = 0.7;
-var COMPRESSION_PRESERVE_THRESHOLD = 0.3;
 var GeminiClient = class {
   config;
   chat;
@@ -340192,6 +340690,7 @@ var GeminiClient = class {
   };
   sessionTurnCount = 0;
   loopDetector;
+  compressionService;
   lastPromptId;
   currentSequenceModel = null;
   lastSentIdeContext;
@@ -340204,6 +340703,7 @@ var GeminiClient = class {
   constructor(config2) {
     this.config = config2;
     this.loopDetector = new LoopDetectionService(config2);
+    this.compressionService = new ChatCompressionService();
     this.lastPromptId = this.config.getSessionId();
   }
   async initialize() {
@@ -340270,22 +340770,7 @@ var GeminiClient = class {
     const toolRegistry = this.config.getToolRegistry();
     const toolDeclarations = toolRegistry.getFunctionDeclarations();
     const tools = [{ functionDeclarations: toolDeclarations }];
-    const envParts = await getEnvironmentContext(this.config);
-    const envContextString = envParts.map((part) => part.text || "").join("\n\n");
-    const allSetupText = `
-${envContextString}
-
-Reminder: Do not return an empty response when a tool call is required.
-
-My setup is complete. I will provide my first command in the next turn.
-    `.trim();
-    const history = [
-      {
-        role: "user",
-        parts: [{ text: allSetupText }]
-      },
-      ...extraHistory ?? []
-    ];
+    const history = await getInitialChatHistory(this.config, extraHistory);
     try {
       const userMemory = this.config.getUserMemory();
       const systemInstruction = getCoreSystemPrompt(this.config, userMemory);
@@ -340597,87 +341082,16 @@ My setup is complete. I will provide my first command in the next turn.
   }
   async tryCompressChat(prompt_id, force = false) {
     const model = this._getEffectiveModelForCurrentTurn();
-    const curatedHistory = this.getChat().getHistory(true);
-    if (curatedHistory.length === 0 || this.hasFailedCompressionAttempt && !force) {
-      return {
-        originalTokenCount: 0,
-        newTokenCount: 0,
-        compressionStatus: CompressionStatus.NOOP
-      };
-    }
-    const originalTokenCount = uiTelemetryService.getLastPromptTokenCount();
-    const contextPercentageThreshold = this.config.getChatCompression()?.contextPercentageThreshold;
-    if (!force) {
-      const threshold = contextPercentageThreshold ?? COMPRESSION_TOKEN_THRESHOLD;
-      if (originalTokenCount < threshold * tokenLimit(model)) {
-        return {
-          originalTokenCount,
-          newTokenCount: originalTokenCount,
-          compressionStatus: CompressionStatus.NOOP
-        };
-      }
-    }
-    const splitPoint = findCompressSplitPoint(curatedHistory, 1 - COMPRESSION_PRESERVE_THRESHOLD);
-    const historyToCompress = curatedHistory.slice(0, splitPoint);
-    const historyToKeep = curatedHistory.slice(splitPoint);
-    if (historyToCompress.length === 0) {
-      return {
-        originalTokenCount,
-        newTokenCount: originalTokenCount,
-        compressionStatus: CompressionStatus.NOOP
-      };
-    }
-    const summaryResponse = await this.config.getContentGenerator().generateContent({
-      model,
-      contents: [
-        ...historyToCompress,
-        {
-          role: "user",
-          parts: [
-            {
-              text: "First, reason in your scratchpad. Then, generate the <state_snapshot>."
-            }
-          ]
-        }
-      ],
-      config: {
-        systemInstruction: { text: getCompressionPrompt() }
-      }
-    }, prompt_id);
-    const summary = getResponseText(summaryResponse) ?? "";
-    const chat = await this.startChat([
-      {
-        role: "user",
-        parts: [{ text: summary }]
-      },
-      {
-        role: "model",
-        parts: [{ text: "Got it. Thanks for the additional context!" }]
-      },
-      ...historyToKeep
-    ]);
-    this.forceFullIdeContext = true;
-    const newTokenCount = Math.floor(chat.getHistory().reduce((total, content) => total + JSON.stringify(content).length, 0) / 4);
-    logChatCompression(this.config, makeChatCompressionEvent({
-      tokens_before: originalTokenCount,
-      tokens_after: newTokenCount
-    }));
-    if (newTokenCount > originalTokenCount) {
+    const { newHistory, info: info2 } = await this.compressionService.compress(this.getChat(), prompt_id, force, model, this.config, this.hasFailedCompressionAttempt);
+    if (info2.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT) {
       this.hasFailedCompressionAttempt = !force && true;
-      return {
-        originalTokenCount,
-        newTokenCount,
-        compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT
-      };
-    } else {
-      this.chat = chat;
-      uiTelemetryService.setLastPromptTokenCount(newTokenCount);
+    } else if (info2.compressionStatus === CompressionStatus.COMPRESSED) {
+      if (newHistory) {
+        this.chat = await this.startChat(newHistory);
+        this.forceFullIdeContext = true;
+      }
     }
-    return {
-      originalTokenCount,
-      newTokenCount,
-      compressionStatus: CompressionStatus.COMPRESSED
-    };
+    return info2;
   }
 };
 
@@ -340860,15 +341274,13 @@ var FileDiscoveryService = class {
   /**
    * Filters a list of file paths based on git ignore rules
    */
-  filterFiles(filePaths, options2 = {
-    respectGitIgnore: true,
-    respectGeminiIgnore: true
-  }) {
+  filterFiles(filePaths, options2 = {}) {
+    const { respectGitIgnore = true, respectGeminiIgnore = true } = options2;
     return filePaths.filter((filePath) => {
-      if (options2.respectGitIgnore && this.shouldGitIgnoreFile(filePath)) {
+      if (respectGitIgnore && this.gitIgnoreFilter?.isIgnored(filePath)) {
         return false;
       }
-      if (options2.respectGeminiIgnore && this.shouldGeminiIgnoreFile(filePath)) {
+      if (respectGeminiIgnore && this.geminiIgnoreFilter?.isIgnored(filePath)) {
         return false;
       }
       return true;
@@ -340882,62 +341294,18 @@ var FileDiscoveryService = class {
     respectGitIgnore: true,
     respectGeminiIgnore: true
   }) {
-    const filteredPaths = [];
-    let gitIgnoredCount = 0;
-    let geminiIgnoredCount = 0;
-    for (const filePath of filePaths) {
-      if (opts.respectGitIgnore && this.shouldGitIgnoreFile(filePath)) {
-        gitIgnoredCount++;
-        continue;
-      }
-      if (opts.respectGeminiIgnore && this.shouldGeminiIgnoreFile(filePath)) {
-        geminiIgnoredCount++;
-        continue;
-      }
-      filteredPaths.push(filePath);
-    }
+    const filteredPaths = this.filterFiles(filePaths, opts);
+    const ignoredCount = filePaths.length - filteredPaths.length;
     return {
       filteredPaths,
-      gitIgnoredCount,
-      geminiIgnoredCount
+      ignoredCount
     };
   }
-  /**
-   * Checks if a single file should be git-ignored
-   */
-  shouldGitIgnoreFile(filePath) {
-    if (this.gitIgnoreFilter) {
-      return this.gitIgnoreFilter.isIgnored(filePath);
-    }
-    return false;
-  }
-  /**
-   * Checks if a single file should be gemini-ignored
-   */
-  shouldGeminiIgnoreFile(filePath) {
-    if (this.geminiIgnoreFilter) {
-      return this.geminiIgnoreFilter.isIgnored(filePath);
-    }
-    return false;
-  }
   /**
    * Unified method to check if a file should be ignored based on filtering options
    */
   shouldIgnoreFile(filePath, options2 = {}) {
-    const { respectGitIgnore = true, respectGeminiIgnore = true } = options2;
-    if (respectGitIgnore && this.shouldGitIgnoreFile(filePath)) {
-      return true;
-    }
-    if (respectGeminiIgnore && this.shouldGeminiIgnoreFile(filePath)) {
-      return true;
-    }
-    return false;
-  }
-  /**
-   * Returns loaded patterns from .geminiignore
-   */
-  getGeminiIgnorePatterns() {
-    return this.geminiIgnoreFilter?.getPatterns() ?? [];
+    return this.filterFiles([filePath], options2).length === 0;
   }
 };
 
@@ -340952,7 +341320,7 @@ var import_promise_deferred = __toESM(require_dist9(), 1);
 var import_promise_deferred2 = __toESM(require_dist9(), 1);
 import { Buffer as Buffer22 } from "node:buffer";
 import { spawn as spawn8 } from "child_process";
-import { EventEmitter as EventEmitter8 } from "node:events";
+import { EventEmitter as EventEmitter9 } from "node:events";
 var __defProp3 = Object.defineProperty;
 var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames2 = Object.getOwnPropertyNames;
@@ -345293,7 +345661,7 @@ init_utils4();
 var PluginStore = class {
   constructor() {
     this.plugins = /* @__PURE__ */ new Set();
-    this.events = new EventEmitter8();
+    this.events = new EventEmitter9();
   }
   on(type, listener) {
     this.events.on(type, listener);
@@ -345723,7 +346091,7 @@ var WriteTodosTool = class _WriteTodosTool extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
+  createInvocation(params, _messageBus, _toolName, _displayName) {
     return new WriteTodosToolInvocation(params);
   }
 };
@@ -346088,7 +346456,7 @@ var JsonStreamEventType;
 // packages/core/dist/src/utils/workspaceContext.js
 import * as fs52 from "node:fs";
 import * as path55 from "node:path";
-import * as process21 from "node:process";
+import * as process23 from "node:process";
 var WorkspaceContext = class {
   directories = /* @__PURE__ */ new Set();
   initialDirectories;
@@ -346130,7 +346498,7 @@ var WorkspaceContext = class {
    * @param directory The directory path to add (can be relative or absolute)
    * @param basePath Optional base path for resolving relative paths (defaults to cwd)
    */
-  addDirectory(directory, basePath = process21.cwd()) {
+  addDirectory(directory, basePath = process23.cwd()) {
     try {
       const resolved = this.resolveAndValidateDir(directory, basePath);
       if (this.directories.has(resolved)) {
@@ -346142,7 +346510,7 @@ var WorkspaceContext = class {
       debugLogger.warn(`[WARN] Skipping unreadable directory: ${directory} (${err2 instanceof Error ? err2.message : String(err2)})`);
     }
   }
-  resolveAndValidateDir(directory, basePath = process21.cwd()) {
+  resolveAndValidateDir(directory, basePath = process23.cwd()) {
     const absolutePath = path55.isAbsolute(directory) ? directory : path55.resolve(basePath, directory);
     if (!fs52.existsSync(absolutePath)) {
       throw new Error(`Directory does not exist: ${absolutePath}`);
@@ -346231,7 +346599,7 @@ var WorkspaceContext = class {
 };
 
 // packages/core/dist/src/confirmation-bus/message-bus.js
-import { EventEmitter as EventEmitter9 } from "node:events";
+import { EventEmitter as EventEmitter10 } from "node:events";
 
 // packages/core/dist/src/policy/types.js
 var PolicyDecision;
@@ -346242,7 +346610,7 @@ var PolicyDecision;
 })(PolicyDecision || (PolicyDecision = {}));
 
 // packages/core/dist/src/confirmation-bus/message-bus.js
-var MessageBus = class extends EventEmitter9 {
+var MessageBus = class extends EventEmitter10 {
   policyEngine;
   debug;
   constructor(policyEngine, debug2 = false) {
@@ -346550,7 +346918,7 @@ function convertInputConfigToJsonSchema(inputConfig) {
 // packages/core/dist/src/core/nonInteractiveToolExecutor.js
 async function executeToolCall(config2, toolCallRequest, abortSignal) {
   return new Promise((resolve13, reject) => {
-    new CoreToolScheduler({
+    const scheduler3 = new CoreToolScheduler({
       config: config2,
       getPreferredEditor: () => void 0,
       onEditorClose: () => {
@@ -346558,7 +346926,10 @@ async function executeToolCall(config2, toolCallRequest, abortSignal) {
       onAllToolCallsComplete: async (completedToolCalls) => {
         resolve13(completedToolCalls[0]);
       }
-    }).schedule(toolCallRequest, abortSignal).catch(reject);
+    });
+    scheduler3.schedule(toolCallRequest, abortSignal).catch((error) => {
+      reject(error);
+    });
   });
 }
 
@@ -348573,6 +348944,7 @@ var Config = class {
   continueOnFailedApiCall;
   retryFetchErrors;
   enableShellOutputEfficiency;
+  fakeResponses;
   disableYoloMode;
   constructor(params) {
     this.sessionId = params.sessionId;
@@ -348614,7 +348986,7 @@ var Config = class {
     };
     this.checkpointing = params.checkpointing ?? false;
     this.proxy = params.proxy;
-    this.cwd = params.cwd ?? process22.cwd();
+    this.cwd = params.cwd ?? process24.cwd();
     this.fileDiscoveryService = params.fileDiscoveryService ?? null;
     this.bugCommand = params.bugCommand;
     this.model = params.model;
@@ -348660,6 +349032,7 @@ var Config = class {
     this.enableShellOutputEfficiency = params.enableShellOutputEfficiency ?? true;
     this.extensionManagement = params.extensionManagement ?? true;
     this.storage = new Storage2(this.targetDir);
+    this.fakeResponses = params.fakeResponses;
     this.enablePromptCompletion = params.enablePromptCompletion ?? false;
     this.fileExclusions = new FileExclusions(this);
     this.eventEmitter = params.eventEmitter;
@@ -348712,7 +349085,6 @@ var Config = class {
     this.contentGeneratorConfig = newContentGeneratorConfig;
     this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
     this.inFallbackMode = false;
-    logCliConfiguration(this, new StartSessionEvent(this, this.toolRegistry));
   }
   getUserTier() {
     return this.contentGenerator?.userTier;
@@ -348774,7 +349146,7 @@ var Config = class {
   }
   isRestrictiveSandbox() {
     const sandboxConfig = this.getSandbox();
-    const seatbeltProfile = process22.env["SEATBELT_PROFILE"];
+    const seatbeltProfile = process24.env["SEATBELT_PROFILE"];
     return !!sandboxConfig && sandboxConfig.command === "sandbox-exec" && !!seatbeltProfile && seatbeltProfile.startsWith("restrictive-");
   }
   getTargetDir() {
@@ -349157,15 +349529,9 @@ var Config = class {
         const isExcluded = excludeTools.includes(definition.name);
         const isAllowed = !allowedTools || allowedTools.includes(definition.name);
         if (isAllowed && !isExcluded) {
-          try {
-            const messageBusEnabled = this.getEnableMessageBusIntegration();
-            const wrapper = new SubagentToolWrapper(definition, this, messageBusEnabled ? this.getMessageBus() : void 0);
-            registry.registerTool(wrapper);
-          } catch (error) {
-            console.error(`Failed to wrap agent '${definition.name}' as a tool:`, error);
-          }
-        } else if (this.getDebugMode()) {
-          debugLogger.log(`[Config] Skipping registration of agent '${definition.name}' due to allow/exclude configuration.`);
+          const messageBusEnabled = this.getEnableMessageBusIntegration();
+          const wrapper = new SubagentToolWrapper(definition, this, messageBusEnabled ? this.getMessageBus() : void 0);
+          registry.registerTool(wrapper);
         }
       }
     }
@@ -349174,6 +349540,11 @@ var Config = class {
   }
 };
 
+// packages/core/dist/src/commands/extensions.js
+function listExtensions(config2) {
+  return config2.getExtensions();
+}
+
 // packages/core/dist/src/core/logger.js
 var MessageSenderType;
 (function(MessageSenderType2) {
@@ -351827,34 +352198,12 @@ var hasFileExtension = (0, import_picomatch.default)("**/*[*.]*");
 var import_fdir = __toESM(require_dist10(), 1);
 
 // packages/core/dist/src/utils/errorParsing.js
-var getRateLimitErrorMessageGoogleFree = (fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-Possible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session.`;
-var getRateLimitErrorMessageGoogleProQuotaFree = (currentModel = DEFAULT_GEMINI_MODEL, fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-You have reached your daily ${currentModel} quota limit. You will be switched to the ${fallbackModel} model for the rest of this session. To increase your limits, upgrade to get higher limits at https://goo.gle/set-up-gemini-code-assist, or use /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-var getRateLimitErrorMessageGoogleGenericQuotaFree = () => `
-You have reached your daily quota limit. To increase your limits, upgrade to get higher limits at https://goo.gle/set-up-gemini-code-assist, or use /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-var getRateLimitErrorMessageGooglePaid = (fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-Possible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session. We appreciate you for choosing Gemini Code Assist and the Gemini CLI.`;
-var getRateLimitErrorMessageGoogleProQuotaPaid = (currentModel = DEFAULT_GEMINI_MODEL, fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
-You have reached your daily ${currentModel} quota limit. You will be switched to the ${fallbackModel} model for the rest of this session. We appreciate you for choosing Gemini Code Assist and the Gemini CLI. To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
-var getRateLimitErrorMessageGoogleGenericQuotaPaid = (currentModel = DEFAULT_GEMINI_MODEL) => `
-You have reached your daily quota limit. We appreciate you for choosing Gemini Code Assist and the Gemini CLI. To continue accessing the ${currentModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
 var RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI = "\nPlease wait and try again later. To increase your limits, request a quota increase through AI Studio, or switch to another /auth method";
 var RATE_LIMIT_ERROR_MESSAGE_VERTEX = "\nPlease wait and try again later. To increase your limits, request a quota increase through Vertex, or switch to another /auth method";
 var getRateLimitErrorMessageDefault = (fallbackModel = DEFAULT_GEMINI_FLASH_MODEL) => `
 Possible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session.`;
-function getRateLimitMessage(authType, error, userTier, currentModel, fallbackModel) {
+function getRateLimitMessage(authType, fallbackModel) {
   switch (authType) {
-    case AuthType2.LOGIN_WITH_GOOGLE: {
-      const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
-      if (isProQuotaExceededError(error)) {
-        return isPaidTier ? getRateLimitErrorMessageGoogleProQuotaPaid(currentModel || DEFAULT_GEMINI_MODEL, fallbackModel) : getRateLimitErrorMessageGoogleProQuotaFree(currentModel || DEFAULT_GEMINI_MODEL, fallbackModel);
-      } else if (isGenericQuotaExceededError(error)) {
-        return isPaidTier ? getRateLimitErrorMessageGoogleGenericQuotaPaid(currentModel || DEFAULT_GEMINI_MODEL) : getRateLimitErrorMessageGoogleGenericQuotaFree();
-      } else {
-        return isPaidTier ? getRateLimitErrorMessageGooglePaid(fallbackModel) : getRateLimitErrorMessageGoogleFree(fallbackModel);
-      }
-    }
     case AuthType2.USE_GEMINI:
       return RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI;
     case AuthType2.USE_VERTEX_AI:
@@ -351867,7 +352216,7 @@ function parseAndFormatApiError(error, authType, userTier, currentModel, fallbac
   if (isStructuredError(error)) {
     let text = `[API Error: ${error.message}]`;
     if (error.status === 429) {
-      text += getRateLimitMessage(authType, error, userTier, currentModel, fallbackModel);
+      text += getRateLimitMessage(authType, fallbackModel);
     }
     return text;
   }
@@ -351890,7 +352239,7 @@ function parseAndFormatApiError(error, authType, userTier, currentModel, fallbac
         }
         let text = `[API Error: ${finalMessage} (Status: ${parsedError.error.status})]`;
         if (parsedError.error.code === 429) {
-          text += getRateLimitMessage(authType, parsedError, userTier, currentModel, fallbackModel);
+          text += getRateLimitMessage(authType, fallbackModel);
         }
         return text;
       }
@@ -351901,6 +352250,9 @@ function parseAndFormatApiError(error, authType, userTier, currentModel, fallbac
   return "[API Error: An unknown error occurred.]";
 }
 
+// packages/core/dist/src/index.js
+init_events();
+
 // packages/core/dist/src/utils/session.js
 import { randomUUID as randomUUID6 } from "node:crypto";
 var sessionId = randomUUID6();
@@ -351951,7 +352303,8 @@ async function loadConfig(settings, extensions, taskId) {
       enableRecursiveFileSearch: settings.fileFiltering?.enableRecursiveFileSearch
     },
     ideMode: false,
-    folderTrust: settings.folderTrust === true
+    folderTrust: settings.folderTrust === true,
+    extensions
   };
   const fileService = new FileDiscoveryService(workspaceDir);
   const { memoryContent, fileCount } = await loadServerHierarchicalMemory(
@@ -352146,7 +352499,7 @@ var GCSTaskStore = class {
       if (await fse.pathExists(workDir)) {
         const entries2 = await fsPromises4.readdir(workDir);
         if (entries2.length > 0) {
-          const tmpArchiveFile = join22(tmpdir3(), getTmpArchiveFilename(taskId));
+          const tmpArchiveFile = join22(tmpdir4(), getTmpArchiveFilename(taskId));
           try {
             await create(
               {
@@ -352268,7 +352621,7 @@ var GCSTaskStore = class {
       const workspaceFile = this.storage.bucket(this.bucketName).file(workspaceObjectPath);
       const [workspaceExists] = await workspaceFile.exists();
       if (workspaceExists) {
-        const tmpArchiveFile = join22(tmpdir3(), getTmpArchiveFilename(taskId));
+        const tmpArchiveFile = join22(tmpdir4(), getTmpArchiveFilename(taskId));
         try {
           await workspaceFile.download({ destination: tmpArchiveFile });
           await extract({ file: tmpArchiveFile, cwd: workDir });
@@ -352362,10 +352715,10 @@ function loadSettings(workspaceDir) {
     });
   }
   if (settingsErrors.length > 0) {
-    console.error("Errors loading settings:");
+    debugLogger.error("Errors loading settings:");
     for (const error of settingsErrors) {
-      console.error(`  Path: ${error.path}`);
-      console.error(`  Message: ${error.message}`);
+      debugLogger.error(`  Path: ${error.path}`);
+      debugLogger.error(`  Message: ${error.message}`);
     }
   }
   return {
@@ -352751,8 +353104,8 @@ var Task = class _Task {
         );
       }
       if (hasChanged) {
-        const message = this.toolStatusMessage(tc, this.id, this.contextId);
         const coderAgentMessage = tc.status === "awaiting_approval" ? { kind: "tool-call-confirmation" /* ToolCallConfirmationEvent */ } : { kind: "tool-call-update" /* ToolCallUpdateEvent */ };
+        const message = this.toolStatusMessage(tc, this.id, this.contextId);
         const event = this._createStatusUpdateEvent(
           this.taskState,
           coderAgentMessage,
@@ -352777,10 +353130,10 @@ var Task = class _Task {
     const isAwaitingApproval = allPendingStatuses.some(
       (status) => status === "awaiting_approval"
     );
-    const allPendingAreStable = allPendingStatuses.every(
-      (status) => status === "awaiting_approval" || status === "success" || status === "error" || status === "cancelled"
+    const isExecuting = allPendingStatuses.some(
+      (status) => status === "executing"
     );
-    if (isAwaitingApproval && allPendingAreStable && !this.skipFinalTrueAfterInlineEdit) {
+    if (isAwaitingApproval && !isExecuting && !this.skipFinalTrueAfterInlineEdit) {
       this.skipFinalTrueAfterInlineEdit = false;
       this.setTaskStateAndPublishUpdate(
         "input-required",
@@ -352949,6 +353302,10 @@ var Task = class _Task {
         logger.info("[Task] Sending agent thought...");
         this._sendThought(event.value, traceId);
         break;
+      case GeminiEventType.Citation:
+        logger.info("[Task] Received citation from LLM stream.");
+        this._sendCitation(event.value);
+        break;
       case GeminiEventType.ChatCompressed:
         break;
       case GeminiEventType.Finished:
@@ -353225,6 +353582,19 @@ var Task = class _Task {
       )
     );
   }
+  _sendCitation(citation) {
+    if (!citation || citation.trim() === "") {
+      return;
+    }
+    logger.info("[Task] Sending citation to event bus.");
+    const message = this._createTextMessage(citation);
+    const citationEvent = {
+      kind: "citation" /* CitationEvent */
+    };
+    this.eventBus?.publish(
+      this._createStatusUpdateEvent(this.taskState, citationEvent, message)
+    );
+  }
 };
 
 // packages/a2a-server/src/http/requestStorage.ts
@@ -353751,6 +354121,31 @@ var CoderAgentExecutor = class {
   }
 };
 
+// packages/a2a-server/src/commands/list-extensions.ts
+var ListExtensionsCommand = class {
+  names = ["extensions", "extensions list"];
+  async execute(config2, _) {
+    return listExtensions(config2);
+  }
+};
+
+// packages/a2a-server/src/commands/command-registry.ts
+var CommandRegistry = class {
+  commands = /* @__PURE__ */ new Map();
+  constructor() {
+    this.register(new ListExtensionsCommand());
+  }
+  register(command) {
+    for (const name4 of command.names) {
+      this.commands.set(name4, command);
+    }
+  }
+  get(commandName) {
+    return this.commands.get(commandName);
+  }
+};
+var commandRegistry = new CommandRegistry();
+
 // packages/a2a-server/src/http/app.ts
 var coderAgentCard = {
   name: "Gemini SDLC Agent",
@@ -353793,6 +354188,11 @@ function updateCoderAgentCardUrl(port) {
 }
 async function createApp() {
   try {
+    const workspaceRoot = setTargetDir(void 0);
+    loadEnvironment();
+    const settings = loadSettings(workspaceRoot);
+    const extensions = loadExtensions(workspaceRoot);
+    const config2 = await loadConfig(settings, extensions, "a2a-server");
     const bucketName = process.env["GCS_BUCKET_NAME"];
     let taskStoreForExecutor;
     let taskStoreForHandler;
@@ -353838,6 +354238,27 @@ async function createApp() {
         res.status(500).send({ error: errorMessage });
       }
     });
+    expressApp.post("/executeCommand", async (req, res) => {
+      try {
+        const { command, args: args2 } = req.body;
+        if (typeof command !== "string") {
+          return res.status(400).json({ error: 'Invalid "command" field.' });
+        }
+        if (args2 && !Array.isArray(args2)) {
+          return res.status(400).json({ error: '"args" field must be an array.' });
+        }
+        const commandToExecute = commandRegistry.get(command);
+        if (!commandToExecute) {
+          return res.status(404).json({ error: `Command not found: ${command}` });
+        }
+        const result = await commandToExecute.execute(config2, args2 ?? []);
+        return res.status(200).json(result);
+      } catch (e2) {
+        logger.error("Error executing /executeCommand:", e2);
+        const errorMessage = e2 instanceof Error ? e2.message : "Unknown error executing command";
+        return res.status(500).json({ error: errorMessage });
+      }
+    });
     expressApp.get("/tasks/metadata", async (req, res) => {
       if (!(taskStoreForExecutor instanceof InMemoryTaskStore)) {
         res.status(501).send({