@google/gemini-cli-a2a-server 0.12.0-preview.4 → 0.13.0-nightly.20251031.c89bc30d

package/dist/a2a-server.mjs

@@ -123359,32 +123359,32 @@ var require_Meter = __commonJS({
        */
       createGauge(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.GAUGE, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.GaugeInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.GaugeInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link Histogram} instrument.
        */
       createHistogram(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.HISTOGRAM, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.HistogramInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.HistogramInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link Counter} instrument.
        */
       createCounter(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.COUNTER, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.CounterInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.CounterInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link UpDownCounter} instrument.
        */
       createUpDownCounter(name4, options2) {
         const descriptor = (0, InstrumentDescriptor_1.createInstrumentDescriptor)(name4, MetricData_1.InstrumentType.UP_DOWN_COUNTER, options2);
-        const storage = this._meterSharedState.registerMetricStorage(descriptor);
-        return new Instruments_1.UpDownCounterInstrument(storage, descriptor);
+        const storage2 = this._meterSharedState.registerMetricStorage(descriptor);
+        return new Instruments_1.UpDownCounterInstrument(storage2, descriptor);
       }
       /**
        * Create a {@link ObservableGauge} instrument.
@@ -123870,16 +123870,16 @@ var require_MetricStorageRegistry = __commonJS({
         }
         return storages;
       }
-      register(storage) {
-        this._registerStorage(storage, this._sharedRegistry);
+      register(storage2) {
+        this._registerStorage(storage2, this._sharedRegistry);
       }
-      registerForCollector(collector, storage) {
+      registerForCollector(collector, storage2) {
         let storageMap = this._perCollectorRegistry.get(collector);
         if (storageMap == null) {
           storageMap = /* @__PURE__ */ new Map();
           this._perCollectorRegistry.set(collector, storageMap);
         }
-        this._registerStorage(storage, storageMap);
+        this._registerStorage(storage2, storageMap);
       }
       findOrUpdateCompatibleStorage(expectedDescriptor) {
         const storages = this._sharedRegistry.get(expectedDescriptor.name);
@@ -123899,14 +123899,14 @@ var require_MetricStorageRegistry = __commonJS({
         }
         return this._findOrUpdateCompatibleStorage(expectedDescriptor, storages);
       }
-      _registerStorage(storage, storageMap) {
-        const descriptor = storage.getInstrumentDescriptor();
+      _registerStorage(storage2, storageMap) {
+        const descriptor = storage2.getInstrumentDescriptor();
         const storages = storageMap.get(descriptor.name);
         if (storages === void 0) {
-          storageMap.set(descriptor.name, [storage]);
+          storageMap.set(descriptor.name, [storage2]);
           return;
         }
-        storages.push(storage);
+        storages.push(storage2);
       }
       _findOrUpdateCompatibleStorage(expectedDescriptor, existingStorages) {
         let compatibleStorage = null;
@@ -124324,9 +124324,9 @@ var require_MeterSharedState = __commonJS({
             }
             const aggregator = aggregation.createAggregator(descriptor);
             const cardinalityLimit = collector.selectCardinalityLimit(descriptor.type);
-            const storage = new MetricStorageType(descriptor, aggregator, (0, AttributesProcessor_1.createNoopAttributesProcessor)(), [collector], cardinalityLimit);
-            this.metricStorageRegistry.registerForCollector(collector, storage);
-            return storage;
+            const storage2 = new MetricStorageType(descriptor, aggregator, (0, AttributesProcessor_1.createNoopAttributesProcessor)(), [collector], cardinalityLimit);
+            this.metricStorageRegistry.registerForCollector(collector, storage2);
+            return storage2;
           });
           storages = storages.concat(collectorStorages);
         }
@@ -233447,8 +233447,8 @@ var require_cache4 = __commonJS({
        */
       #queryCache(requestQuery, options2, targetStorage) {
         const resultList = [];
-        const storage = targetStorage ?? this.#relevantRequestResponseList;
-        for (const requestResponse of storage) {
+        const storage2 = targetStorage ?? this.#relevantRequestResponseList;
+        for (const requestResponse of storage2) {
           const [cachedRequest, cachedResponse] = requestResponse;
           if (this.#requestMatchesCachedItem(requestQuery, cachedRequest, cachedResponse, options2)) {
             resultList.push(requestResponse);
@@ -252648,11 +252648,11 @@ var SignerExceptionMessages;
 var DEFAULT_SIGNING_VERSION = "v2";
 var SEVEN_DAYS = 7 * 24 * 60 * 60;
 var URLSigner = class {
-  constructor(auth2, bucket, file, storage = new Storage()) {
+  constructor(auth2, bucket, file, storage2 = new Storage()) {
     this.auth = auth2;
     this.bucket = bucket;
     this.file = file;
-    this.storage = storage;
+    this.storage = storage2;
   }
   getSignedUrl(cfg) {
     const expiresInSeconds = this.parseExpires(cfg.expires);
@@ -257203,7 +257203,7 @@ var Bucket = class _Bucket extends ServiceObject {
   getFilesStream(query) {
     return new Readable2();
   }
-  constructor(storage, name4, options2) {
+  constructor(storage2, name4, options2) {
     var _a3, _b, _c, _d;
     options2 = options2 || {};
     name4 = name4.replace(/^gs:\/\//, "").replace(/\/+$/, "");
@@ -257565,14 +257565,14 @@ var Bucket = class _Bucket extends ServiceObject {
       }
     };
     super({
-      parent: storage,
+      parent: storage2,
       baseUrl: "/b",
       id: name4,
-      createMethod: storage.createBucket.bind(storage),
+      createMethod: storage2.createBucket.bind(storage2),
       methods
     });
     this.name = name4;
-    this.storage = storage;
+    this.storage = storage2;
     this.userProject = options2.userProject;
     this.acl = new Acl({
       request: this.request.bind(this),
@@ -257585,7 +257585,7 @@ var Bucket = class _Bucket extends ServiceObject {
     this.crc32cGenerator = options2.crc32cGenerator || this.storage.crc32cGenerator;
     this.iam = new Iam(this);
     this.getFilesStream = import_paginator.paginator.streamify("getFiles");
-    this.instanceRetryValue = storage.retryOptions.autoRetry;
+    this.instanceRetryValue = storage2.retryOptions.autoRetry;
     this.instancePreconditionOpts = options2 === null || options2 === void 0 ? void 0 : options2.preconditionOpts;
   }
   /**
@@ -260271,9 +260271,9 @@ import_paginator.paginator.extend(Bucket, "getFiles");
 // node_modules/@google-cloud/storage/build/esm/src/channel.js
 var import_promisify7 = __toESM(require_src14(), 1);
 var Channel = class extends ServiceObject {
-  constructor(storage, id, resourceId) {
+  constructor(storage2, id, resourceId) {
     const config2 = {
-      parent: storage,
+      parent: storage2,
       baseUrl: "/channels",
       // An ID shouldn't be included in the API requests.
       // RE:
@@ -260363,7 +260363,7 @@ var HmacKey = class extends ServiceObject {
    * const hmacKey = storage.hmacKey('access-id');
    * ```
    */
-  constructor(storage, accessId, options2) {
+  constructor(storage2, accessId, options2) {
     const methods = {
       /**
        * @typedef {object} DeleteHmacKeyOptions
@@ -260601,15 +260601,15 @@ var HmacKey = class extends ServiceObject {
         }
       }
     };
-    const projectId = options2 && options2.projectId || storage.projectId;
+    const projectId = options2 && options2.projectId || storage2.projectId;
     super({
-      parent: storage,
+      parent: storage2,
       id: accessId,
       baseUrl: `/projects/${projectId}/hmacKeys`,
       methods
     });
-    this.storage = storage;
-    this.instanceRetryValue = storage.retryOptions.autoRetry;
+    this.storage = storage2;
+    this.instanceRetryValue = storage2.retryOptions.autoRetry;
   }
   setMetadata(metadata2, optionsOrCallback, cb) {
     if (this.storage.retryOptions.idempotencyStrategy !== IdempotencyStrategy.RetryAlways) {
@@ -285567,28 +285567,28 @@ var HybridTokenStorage = class extends BaseTokenStorage {
     return await this.storageInitPromise;
   }
   async getCredentials(serverName) {
-    const storage = await this.getStorage();
-    return storage.getCredentials(serverName);
+    const storage2 = await this.getStorage();
+    return storage2.getCredentials(serverName);
   }
   async setCredentials(credentials) {
-    const storage = await this.getStorage();
-    await storage.setCredentials(credentials);
+    const storage2 = await this.getStorage();
+    await storage2.setCredentials(credentials);
   }
   async deleteCredentials(serverName) {
-    const storage = await this.getStorage();
-    await storage.deleteCredentials(serverName);
+    const storage2 = await this.getStorage();
+    await storage2.deleteCredentials(serverName);
   }
   async listServers() {
-    const storage = await this.getStorage();
-    return storage.listServers();
+    const storage2 = await this.getStorage();
+    return storage2.listServers();
   }
   async getAllCredentials() {
-    const storage = await this.getStorage();
-    return storage.getAllCredentials();
+    const storage2 = await this.getStorage();
+    return storage2.getAllCredentials();
   }
   async clearAll() {
-    const storage = await this.getStorage();
-    await storage.clearAll();
+    const storage2 = await this.getStorage();
+    await storage2.clearAll();
   }
   async getStorageType() {
     await this.getStorage();
@@ -285600,6 +285600,7 @@ var HybridTokenStorage = class extends BaseTokenStorage {
 import * as path14 from "node:path";
 import * as os5 from "node:os";
 import { promises as fs21 } from "node:fs";
+init_events();
 var KEYCHAIN_SERVICE_NAME = "gemini-cli-oauth";
 var MAIN_ACCOUNT_KEY = "main-account";
 var OAuthCredentialStorage = class {
@@ -285625,8 +285626,8 @@ var OAuthCredentialStorage = class {
       }
       return await this.migrateFromFileStorage();
     } catch (error) {
-      console.error(error);
-      throw new Error("Failed to load OAuth credentials");
+      coreEvents.emitFeedback("error", "Failed to load OAuth credentials", error);
+      throw new Error("Failed to load OAuth credentials", { cause: error });
     }
   }
   /**
@@ -285659,8 +285660,8 @@ var OAuthCredentialStorage = class {
       await fs21.rm(oldFilePath, { force: true }).catch(() => {
       });
     } catch (error) {
-      console.error(error);
-      throw new Error("Failed to clear OAuth credentials");
+      coreEvents.emitFeedback("error", "Failed to clear OAuth credentials", error);
+      throw new Error("Failed to clear OAuth credentials", { cause: error });
     }
   }
   /**
@@ -287210,6 +287211,7 @@ var API_REQUEST_LATENCY = "gemini_cli.api.request.latency";
 var TOKEN_USAGE = "gemini_cli.token.usage";
 var SESSION_COUNT = "gemini_cli.session.count";
 var FILE_OPERATION_COUNT = "gemini_cli.file.operation.count";
+var LINES_CHANGED = "gemini_cli.lines.changed";
 var INVALID_CHUNK_COUNT = "gemini_cli.chat.invalid_chunk.count";
 var CONTENT_RETRY_COUNT = "gemini_cli.chat.content_retry.count";
 var CONTENT_RETRY_FAILURE_COUNT = "gemini_cli.chat.content_retry_failure.count";
@@ -287268,6 +287270,12 @@ var COUNTER_DEFINITIONS = {
     assign: (c4) => fileOperationCounter = c4,
     attributes: {}
   },
+  [LINES_CHANGED]: {
+    description: "Number of lines changed (from file diffs).",
+    valueType: ValueType.INT,
+    assign: (c4) => linesChangedCounter = c4,
+    attributes: {}
+  },
   [INVALID_CHUNK_COUNT]: {
     description: "Counts invalid chunks received from a stream.",
     valueType: ValueType.INT,
@@ -287512,6 +287520,7 @@ var apiRequestLatencyHistogram;
 var tokenUsageCounter;
 var sessionCounter;
 var fileOperationCounter;
+var linesChangedCounter;
 var chatCompressionCounter;
 var invalidChunkCounter;
 var contentRetryCounter;
@@ -287627,6 +287636,17 @@ function recordFileOperationMetric(config2, attributes) {
     ...attributes
   });
 }
+function recordLinesChanged(config2, lines, changeType, attributes) {
+  if (!linesChangedCounter || !isMetricsInitialized)
+    return;
+  if (!Number.isFinite(lines) || lines <= 0)
+    return;
+  linesChangedCounter.add(lines, {
+    ...baseMetricDefinition.getCommonAttributes(config2),
+    type: changeType,
+    ...attributes ?? {}
+  });
+}
 function recordContentRetry(config2) {
   if (!contentRetryCounter || !isMetricsInitialized)
     return;
@@ -288967,8 +288987,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 = "66b61a13";
-var CLI_VERSION = "0.12.0-preview.4";
+var GIT_COMMIT_INFO = "c89bc30d";
+var CLI_VERSION = "0.13.0-nightly.20251031.c89bc30d";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -289337,6 +289357,7 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
         value: event.extensions_count.toString()
       },
+      // We deliberately do not log the names of extensions here, to be safe.
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSION_IDS,
         value: event.extension_ids.toString()
@@ -289414,6 +289435,12 @@ var ClearcutLogger = class _ClearcutLogger {
         }
       }
     }
+    if (event.extension_id) {
+      data.push({
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      });
+    }
     const logEvent = this.createLogEvent(EventNames.TOOL_CALL, data);
     this.enqueueLogEvent(logEvent);
     this.flushIfNeeded();
@@ -289594,6 +289621,12 @@ var ClearcutLogger = class _ClearcutLogger {
         value: JSON.stringify(event.status)
       });
     }
+    if (event.extension_id) {
+      data.push({
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      });
+    }
     this.enqueueLogEvent(this.createLogEvent(EventNames.SLASH_COMMAND, data));
     this.flushIfNeeded();
   }
@@ -291092,14 +291125,22 @@ function logToolCall(config2, event) {
     function_name: event.function_name,
     success: event.success,
     decision: event.decision,
-    tool_type: event.tool_type,
-    ...event.metadata ? {
-      model_added_lines: event.metadata["model_added_lines"],
-      model_removed_lines: event.metadata["model_removed_lines"],
-      user_added_lines: event.metadata["user_added_lines"],
-      user_removed_lines: event.metadata["user_removed_lines"]
-    } : {}
+    tool_type: event.tool_type
   });
+  if (event.metadata) {
+    const added = event.metadata["model_added_lines"];
+    if (typeof added === "number" && added > 0) {
+      recordLinesChanged(config2, added, "added", {
+        function_name: event.function_name
+      });
+    }
+    const removed = event.metadata["model_removed_lines"];
+    if (typeof removed === "number" && removed > 0) {
+      recordLinesChanged(config2, removed, "removed", {
+        function_name: event.function_name
+      });
+    }
+  }
 }
 function logToolOutputTruncated(config2, event) {
   ClearcutLogger.getInstance(config2)?.logToolOutputTruncatedEvent(event);
@@ -291536,6 +291577,26 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
   throw new Error(`Unsupported authType: ${authType}`);
 }
 
+// packages/core/dist/src/core/apiKeyCredentialStorage.js
+var KEYCHAIN_SERVICE_NAME2 = "gemini-cli-api-key";
+var DEFAULT_API_KEY_ENTRY = "default-api-key";
+var storage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME2);
+async function loadApiKey() {
+  try {
+    const credentials = await storage.getCredentials(DEFAULT_API_KEY_ENTRY);
+    if (credentials?.token?.accessToken) {
+      return credentials.token.accessToken;
+    }
+    return null;
+  } catch (error) {
+    if (error instanceof Error && error.message === "Token file does not exist") {
+      return null;
+    }
+    debugLogger.error("Failed to load API key from storage:", error);
+    return null;
+  }
+}
+
 // packages/core/dist/src/core/fakeContentGenerator.js
 import { promises } from "node:fs";
 var FakeContentGenerator = class _FakeContentGenerator {
@@ -291659,8 +291720,8 @@ var AuthType2;
   AuthType3["USE_VERTEX_AI"] = "vertex-ai";
   AuthType3["CLOUD_SHELL"] = "cloud-shell";
 })(AuthType2 || (AuthType2 = {}));
-function createContentGeneratorConfig(config2, authType) {
-  const geminiApiKey = process.env["GEMINI_API_KEY"] || void 0;
+async function createContentGeneratorConfig(config2, authType) {
+  const geminiApiKey = await loadApiKey() || process.env["GEMINI_API_KEY"] || void 0;
   const googleApiKey = process.env["GOOGLE_API_KEY"] || void 0;
   const googleCloudProject = process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || void 0;
   const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || void 0;
@@ -291688,7 +291749,7 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version3 = "0.12.0-preview.4";
+    const version3 = "0.13.0-nightly.20251031.c89bc30d";
     const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
     const baseHeaders = {
       "User-Agent": userAgent
@@ -300244,6 +300305,7 @@ var McpClient = class {
     if (this.status !== MCPServerStatus.CONNECTED) {
       return;
     }
+    this.toolRegistry.removeMcpToolsByServer(this.serverName);
     this.updateStatus(MCPServerStatus.DISCONNECTING);
     const client = this.client;
     this.client = void 0;
@@ -300809,40 +300871,123 @@ init_events();
 var McpClientManager = class {
   clients = /* @__PURE__ */ new Map();
   toolRegistry;
+  cliConfig;
+  // If we have ongoing MCP client discovery, this completes once that is done.
+  discoveryPromise;
   discoveryState = MCPDiscoveryState.NOT_STARTED;
   eventEmitter;
-  constructor(toolRegistry, eventEmitter) {
+  constructor(toolRegistry, cliConfig, eventEmitter) {
     this.toolRegistry = toolRegistry;
+    this.cliConfig = cliConfig;
     this.eventEmitter = eventEmitter;
+    if (this.cliConfig.getEnableExtensionReloading()) {
+      this.cliConfig.getExtensionLoader().extensionEvents().on("extensionLoaded", (event) => this.loadExtension(event.extension)).on("extensionEnabled", (event) => this.loadExtension(event.extension)).on("extensionDisabled", (event) => this.unloadExtension(event.extension)).on("extensionUnloaded", (event) => this.unloadExtension(event.extension));
+    }
+  }
+  /**
+   * For all the MCP servers associated with this extension:
+   *
+   *    - Removes all its MCP servers from the global configuration object.
+   *    - Disconnects all MCP clients from their servers.
+   *    - Updates the Gemini chat configuration to load the new tools.
+   */
+  async unloadExtension(extension) {
+    debugLogger.log(`Unloading extension: ${extension.name}`);
+    await Promise.all(Object.keys(extension.mcpServers ?? {}).map((name4) => {
+      const newMcpServers = {
+        ...this.cliConfig.getMcpServers()
+      };
+      delete newMcpServers[name4];
+      this.cliConfig.setMcpServers(newMcpServers);
+      return this.disconnectClient(name4);
+    }));
+    this.cliConfig.getGeminiClient().setTools();
+  }
+  /**
+   * For all the MCP servers associated with this extension:
+   *
+   *    - Adds all its MCP servers to the global configuration object.
+   *    - Connects MCP clients to each server and discovers their tools.
+   *    - Updates the Gemini chat configuration to load the new tools.
+   */
+  async loadExtension(extension) {
+    debugLogger.log(`Loading extension: ${extension.name}`);
+    await Promise.all(Object.entries(extension.mcpServers ?? {}).map(([name4, config2]) => {
+      this.cliConfig.setMcpServers({
+        ...this.cliConfig.getMcpServers(),
+        [name4]: config2
+      });
+      return this.discoverMcpTools(name4, config2);
+    }));
+    this.cliConfig.getGeminiClient().setTools();
+  }
+  async disconnectClient(name4) {
+    const existing = this.clients.get(name4);
+    if (existing) {
+      try {
+        this.clients.delete(name4);
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
+        await existing.disconnect();
+      } catch (error) {
+        debugLogger.warn(`Error stopping client '${name4}': ${getErrorMessage(error)}`);
+      }
+    }
+  }
+  discoverMcpTools(name4, config2) {
+    if (!this.cliConfig.isTrustedFolder()) {
+      return;
+    }
+    if (config2.extension && !config2.extension.isActive) {
+      return;
+    }
+    const currentDiscoveryPromise = new Promise((resolve13, _reject) => {
+      (async () => {
+        try {
+          await this.disconnectClient(name4);
+          const client = new McpClient(name4, config2, this.toolRegistry, this.cliConfig.getPromptRegistry(), this.cliConfig.getWorkspaceContext(), this.cliConfig.getDebugMode());
+          this.clients.set(name4, client);
+          this.eventEmitter?.emit("mcp-client-update", this.clients);
+          try {
+            await client.connect();
+            await client.discover(this.cliConfig);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
+          } catch (error) {
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
+            coreEvents.emitFeedback("error", `Error during discovery for server '${name4}': ${getErrorMessage(error)}`, error);
+          }
+        } finally {
+          resolve13();
+        }
+      })();
+    });
+    if (this.discoveryPromise) {
+      this.discoveryPromise = this.discoveryPromise.then(() => currentDiscoveryPromise);
+    } else {
+      this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
+      this.discoveryPromise = currentDiscoveryPromise;
+    }
+    const currentPromise = this.discoveryPromise;
+    currentPromise.then((_) => {
+      if (currentPromise === this.discoveryPromise) {
+        this.discoveryPromise = void 0;
+        this.discoveryState = MCPDiscoveryState.COMPLETED;
+      }
+    });
+    return currentPromise;
   }
   /**
    * Initiates the tool discovery process for all configured MCP servers.
    * It connects to each server, discovers its available tools, and registers
    * them with the `ToolRegistry`.
    */
-  async discoverAllMcpTools(cliConfig) {
-    if (!cliConfig.isTrustedFolder()) {
+  async discoverAllMcpTools() {
+    if (!this.cliConfig.isTrustedFolder()) {
       return;
     }
     await this.stop();
-    const servers = populateMcpServerCommand(cliConfig.getMcpServers() || {}, cliConfig.getMcpServerCommand());
-    this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
+    const servers = populateMcpServerCommand(this.cliConfig.getMcpServers() || {}, this.cliConfig.getMcpServerCommand());
     this.eventEmitter?.emit("mcp-client-update", this.clients);
-    const discoveryPromises = Object.entries(servers).filter(([_, config2]) => !config2.extension || config2.extension.isActive).map(async ([name4, config2]) => {
-      const client = new McpClient(name4, config2, this.toolRegistry, cliConfig.getPromptRegistry(), cliConfig.getWorkspaceContext(), cliConfig.getDebugMode());
-      this.clients.set(name4, client);
-      this.eventEmitter?.emit("mcp-client-update", this.clients);
-      try {
-        await client.connect();
-        await client.discover(cliConfig);
-        this.eventEmitter?.emit("mcp-client-update", this.clients);
-      } catch (error) {
-        this.eventEmitter?.emit("mcp-client-update", this.clients);
-        coreEvents.emitFeedback("error", `Error during discovery for server '${name4}': ${getErrorMessage(error)}`, error);
-      }
-    });
-    await Promise.all(discoveryPromises);
-    this.discoveryState = MCPDiscoveryState.COMPLETED;
+    await Promise.all(Object.entries(servers).map(async ([name4, config2]) => this.discoverMcpTools(name4, config2)));
   }
   /**
    * Stops all running local MCP servers and closes all client connections.
@@ -300990,7 +301135,7 @@ var ToolRegistry = class {
   messageBus;
   constructor(config2, eventEmitter) {
     this.config = config2;
-    this.mcpClientManager = new McpClientManager(this, eventEmitter);
+    this.mcpClientManager = new McpClientManager(this, config2, eventEmitter);
   }
   setMessageBus(messageBus) {
     this.messageBus = messageBus;
@@ -301039,7 +301184,7 @@ var ToolRegistry = class {
     this.removeDiscoveredTools();
     this.config.getPromptRegistry().clear();
     await this.discoverAndRegisterToolsFromCommand();
-    await this.mcpClientManager.discoverAllMcpTools(this.config);
+    await this.mcpClientManager.discoverAllMcpTools();
   }
   /**
    * Discovers tools from project (if available and configured).
@@ -301049,7 +301194,7 @@ var ToolRegistry = class {
   async discoverMcpTools() {
     this.removeDiscoveredTools();
     this.config.getPromptRegistry().clear();
-    await this.mcpClientManager.discoverAllMcpTools(this.config);
+    await this.mcpClientManager.discoverAllMcpTools();
   }
   /**
    * Restarts all MCP servers and re-discovers tools.
@@ -326421,8 +326566,7 @@ var EditToolInvocation2 = class extends BaseToolInvocation {
           "Proposed",
           DEFAULT_DIFF_OPTIONS
         );
-        const originallyProposedContent = this.params.ai_proposed_string || this.params.new_string;
-        const diffStat = getDiffStat(fileName, editData.currentContent ?? "", originallyProposedContent, this.params.new_string);
+        const diffStat = getDiffStat(fileName, editData.currentContent ?? "", editData.newContent, this.params.new_string);
         displayResult = {
           fileDiff,
           fileName,
@@ -332285,7 +332429,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           const pgrepLines = fs41.readFileSync(tempFilePath, "utf8").split(EOL3).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
-              console.error(`pgrep: ${line}`);
+              debugLogger.error(`pgrep: ${line}`);
             }
             const pid2 = Number(line);
             if (pid2 !== result.pid) {
@@ -332294,7 +332438,7 @@ var ShellToolInvocation = class extends BaseToolInvocation {
           }
         } else {
           if (!signal.aborted) {
-            console.error("missing pgrep output");
+            debugLogger.error("missing pgrep output");
           }
         }
       }
@@ -332446,7 +332590,7 @@ var ShellTool = class _ShellTool extends BaseDeclarativeTool {
     const commandCheck = isCommandAllowed(params.command, this.config);
     if (!commandCheck.allowed) {
       if (!commandCheck.reason) {
-        console.error("Unexpected: isCommandAllowed returned false without a reason");
+        debugLogger.error("Unexpected: isCommandAllowed returned false without a reason");
         return `Command is not allowed: ${params.command}`;
       }
       return commandCheck.reason;
@@ -339853,6 +339997,7 @@ var GeminiChat = class {
   // model.
   sendPromise = Promise.resolve();
   chatRecordingService;
+  lastPromptTokenCount;
   constructor(config2, generationConfig = {}, history = []) {
     this.config = config2;
     this.generationConfig = generationConfig;
@@ -339860,6 +340005,7 @@ var GeminiChat = class {
     validateHistory2(history);
     this.chatRecordingService = new ChatRecordingService(config2);
     this.chatRecordingService.initialize();
+    this.lastPromptTokenCount = Math.ceil(JSON.stringify(this.history).length / 4);
   }
   setSystemInstruction(sysInstr) {
     this.generationConfig.systemInstruction = sysInstr;
@@ -340075,7 +340221,7 @@ This error was probably caused by cyclic schema references in one of the followi
       if (chunk2.usageMetadata) {
         this.chatRecordingService.recordMessageTokens(chunk2.usageMetadata);
         if (chunk2.usageMetadata.promptTokenCount !== void 0) {
-          uiTelemetryService.setLastPromptTokenCount(chunk2.usageMetadata.promptTokenCount);
+          this.lastPromptTokenCount = chunk2.usageMetadata.promptTokenCount;
         }
       }
       yield chunk2;
@@ -340106,6 +340252,9 @@ This error was probably caused by cyclic schema references in one of the followi
     }
     this.history.push({ role: "model", parts: consolidatedParts });
   }
+  getLastPromptTokenCount() {
+    return this.lastPromptTokenCount;
+  }
   /**
    * Gets the chat recording service instance.
    */
@@ -341164,9 +341313,9 @@ var ChatCompressionService = class {
         }
       };
     }
-    const originalTokenCount = uiTelemetryService.getLastPromptTokenCount();
+    const originalTokenCount = chat.getLastPromptTokenCount();
     if (!force) {
-      const threshold = config2.getChatCompression()?.contextPercentageThreshold ?? DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
+      const threshold = config2.getCompressionThreshold() ?? DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
       if (originalTokenCount < threshold * tokenLimit(model)) {
         return {
           newHistory: null,
@@ -341236,7 +341385,6 @@ var ChatCompressionService = class {
         }
       };
     } else {
-      uiTelemetryService.setLastPromptTokenCount(newTokenCount);
       return {
         newHistory: extraHistory,
         info: {
@@ -341279,8 +341427,14 @@ var GeminiClient = class {
     this.compressionService = new ChatCompressionService();
     this.lastPromptId = this.config.getSessionId();
   }
+  updateTelemetryTokenCount() {
+    if (this.chat) {
+      uiTelemetryService.setLastPromptTokenCount(this.chat.getLastPromptTokenCount());
+    }
+  }
   async initialize() {
     this.chat = await this.startChat();
+    this.updateTelemetryTokenCount();
   }
   getContentGeneratorOrFail() {
     if (!this.config.getContentGenerator()) {
@@ -341318,6 +341472,7 @@ var GeminiClient = class {
   }
   async resetChat() {
     this.chat = await this.startChat();
+    this.updateTelemetryTokenCount();
   }
   getChatRecordingService() {
     return this.chat?.getChatRecordingService();
@@ -341515,7 +341670,7 @@ var GeminiClient = class {
     }
     const modelForLimitCheck = this._getEffectiveModelForCurrentTurn();
     const estimatedRequestTokenCount = Math.floor(JSON.stringify(request3).length / 4);
-    const remainingTokenCount = tokenLimit(modelForLimitCheck) - uiTelemetryService.getLastPromptTokenCount();
+    const remainingTokenCount = tokenLimit(modelForLimitCheck) - this.getChat().getLastPromptTokenCount();
     if (estimatedRequestTokenCount > remainingTokenCount * 0.95) {
       yield {
         type: GeminiEventType.ContextWindowWillOverflow,
@@ -341574,6 +341729,7 @@ var GeminiClient = class {
         return turn;
       }
       yield event;
+      this.updateTelemetryTokenCount();
       if (event.type === GeminiEventType.InvalidStream) {
         if (this.config.getContinueOnFailedApiCall()) {
           if (isInvalidStreamRetry) {
@@ -341661,6 +341817,7 @@ var GeminiClient = class {
     } else if (info2.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
         this.chat = await this.startChat(newHistory);
+        this.updateTelemetryTokenCount();
         this.forceFullIdeContext = true;
       }
     }
@@ -346411,9 +346568,9 @@ var simpleGit = gitInstanceFactory;
 var GitService = class {
   projectRoot;
   storage;
-  constructor(projectRoot, storage) {
+  constructor(projectRoot, storage2) {
     this.projectRoot = path53.resolve(projectRoot);
-    this.storage = storage;
+    this.storage = storage2;
   }
   getHistoryDir() {
     return this.storage.getHistoryDir();
@@ -349505,13 +349662,14 @@ var Config = class {
   listExtensions;
   _extensionLoader;
   _enabledExtensions;
+  enableExtensionReloading;
   _blockedMcpServers;
   fallbackModelHandler;
   quotaErrorOccurred = false;
   summarizeToolOutput;
   experimentalZedIntegration = false;
   loadMemoryFromIncludeDirectories = false;
-  chatCompression;
+  compressionThreshold;
   interactive;
   ptyInfo;
   trustedFolder;
@@ -349599,7 +349757,7 @@ var Config = class {
     this.folderTrust = params.folderTrust ?? false;
     this.ideMode = params.ideMode ?? false;
     this.loadMemoryFromIncludeDirectories = params.loadMemoryFromIncludeDirectories ?? false;
-    this.chatCompression = params.chatCompression;
+    this.compressionThreshold = params.compressionThreshold;
     this.interactive = params.interactive ?? false;
     this.ptyInfo = params.ptyInfo ?? "child_process";
     this.trustedFolder = params.trustedFolder;
@@ -349619,9 +349777,7 @@ var Config = class {
     this.useWriteTodos = params.useWriteTodos ?? false;
     this.initialUseModelRouter = params.useModelRouter ?? false;
     this.useModelRouter = this.initialUseModelRouter;
-    this.disableModelRouterForAuth = params.disableModelRouterForAuth ?? [
-      AuthType2.LOGIN_WITH_GOOGLE
-    ];
+    this.disableModelRouterForAuth = params.disableModelRouterForAuth ?? [];
     this.enableMessageBusIntegration = params.enableMessageBusIntegration ?? false;
     this.codebaseInvestigatorSettings = {
       enabled: params.codebaseInvestigatorSettings?.enabled ?? false,
@@ -349633,6 +349789,7 @@ var Config = class {
     this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
     this.enableShellOutputEfficiency = params.enableShellOutputEfficiency ?? true;
     this.extensionManagement = params.extensionManagement ?? true;
+    this.enableExtensionReloading = params.enableExtensionReloading ?? false;
     this.storage = new Storage2(this.targetDir);
     this.fakeResponses = params.fakeResponses;
     this.recordResponses = params.recordResponses;
@@ -349692,7 +349849,7 @@ var Config = class {
     if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod === AuthType2.LOGIN_WITH_GOOGLE) {
       this.geminiClient.stripThoughtsFromHistory();
     }
-    const newContentGeneratorConfig = createContentGeneratorConfig(this, authMethod);
+    const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
     this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
     this.contentGeneratorConfig = newContentGeneratorConfig;
     this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
@@ -349806,6 +349963,9 @@ var Config = class {
   getMcpServers() {
     return this.mcpServers;
   }
+  setMcpServers(mcpServers) {
+    this.mcpServers = mcpServers;
+  }
   getUserMemory() {
     return this.userMemory;
   }
@@ -349936,6 +350096,9 @@ var Config = class {
   getEnabledExtensions() {
     return this._enabledExtensions;
   }
+  getEnableExtensionReloading() {
+    return this.enableExtensionReloading;
+  }
   getBlockedMcpServers() {
     return this._blockedMcpServers;
   }
@@ -349983,8 +350146,8 @@ var Config = class {
   setFileSystemService(fileSystemService) {
     this.fileSystemService = fileSystemService;
   }
-  getChatCompression() {
-    return this.chatCompression;
+  getCompressionThreshold() {
+    return this.compressionThreshold;
   }
   isInteractiveShellEnabled() {
     return this.interactive && this.ptyInfo !== "child_process" && this.enableInteractiveShell;