@google/gemini-cli-a2a-server 0.13.0-nightly.20251030.42c79c64 → 0.13.0-nightly.20251101.caf2ca14

package/dist/a2a-server.mjs

@@ -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 {
@@ -286671,8 +286672,9 @@ var DeclarativeTool = class {
   isOutputMarkdown;
   canUpdateOutput;
   messageBus;
+  extensionName;
   extensionId;
-  constructor(name4, displayName, description, kind, parameterSchema, isOutputMarkdown = true, canUpdateOutput = false, messageBus, extensionId) {
+  constructor(name4, displayName, description, kind, parameterSchema, isOutputMarkdown = true, canUpdateOutput = false, messageBus, extensionName, extensionId) {
     this.name = name4;
     this.displayName = displayName;
     this.description = description;
@@ -286681,6 +286683,7 @@ var DeclarativeTool = class {
     this.isOutputMarkdown = isOutputMarkdown;
     this.canUpdateOutput = canUpdateOutput;
     this.messageBus = messageBus;
+    this.extensionName = extensionName;
     this.extensionId = extensionId;
   }
   get schema() {
@@ -286987,8 +286990,9 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
   parameterSchema;
   trust;
   cliConfig;
+  extensionName;
   extensionId;
-  constructor(mcpTool, serverName, serverToolName, description, parameterSchema, trust, nameOverride, cliConfig, extensionId, messageBus) {
+  constructor(mcpTool, serverName, serverToolName, description, parameterSchema, trust, nameOverride, cliConfig, extensionName, extensionId, messageBus) {
     super(
       nameOverride ?? generateValidName(serverToolName),
       `${serverToolName} (${serverName} MCP Server)`,
@@ -287000,6 +287004,7 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
       false,
       // canUpdateOutput,
       messageBus,
+      extensionName,
       extensionId
     );
     this.mcpTool = mcpTool;
@@ -287008,10 +287013,11 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
     this.parameterSchema = parameterSchema;
     this.trust = trust;
     this.cliConfig = cliConfig;
+    this.extensionName = extensionName;
     this.extensionId = extensionId;
   }
   asFullyQualifiedTool() {
-    return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.trust, `${this.serverName}__${this.serverToolName}`, this.cliConfig, this.extensionId, this.messageBus);
+    return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.trust, `${this.serverName}__${this.serverToolName}`, this.cliConfig, this.extensionName, this.extensionId, this.messageBus);
   }
   createInvocation(params, _messageBus, _toolName, _displayName) {
     return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, this.displayName, this.trust, params, this.cliConfig, _messageBus);
@@ -287183,7 +287189,7 @@ var InstallationManager = class {
       }
       return installationId;
     } catch (error) {
-      console.error("Error accessing installation ID file, generating ephemeral ID:", error);
+      debugLogger.warn("Error accessing installation ID file, generating ephemeral ID:", error);
       return "123456789";
     }
   }
@@ -287210,6 +287216,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";
@@ -287233,6 +287240,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 SLOW_RENDER_LATENCY = "gemini_cli.ui.slow_render.latency";
 var EXIT_FAIL_COUNT = "gemini_cli.exit.fail.count";
 var baseMetricDefinition = {
   getCommonAttributes
@@ -287268,6 +287276,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,
@@ -287352,6 +287366,13 @@ var HISTOGRAM_DEFINITIONS = {
     assign: (h2) => agentDurationHistogram = h2,
     attributes: {}
   },
+  [SLOW_RENDER_LATENCY]: {
+    description: "Counts UI frames that take too long to render.",
+    unit: "ms",
+    valueType: ValueType.INT,
+    assign: (h2) => slowRenderHistogram = h2,
+    attributes: {}
+  },
   [AGENT_TURNS]: {
     description: "Number of turns taken by agents.",
     unit: "turns",
@@ -287512,6 +287533,7 @@ var apiRequestLatencyHistogram;
 var tokenUsageCounter;
 var sessionCounter;
 var fileOperationCounter;
+var linesChangedCounter;
 var chatCompressionCounter;
 var invalidChunkCounter;
 var contentRetryCounter;
@@ -287524,6 +287546,7 @@ var agentDurationHistogram;
 var agentTurnsHistogram;
 var flickerFrameCounter;
 var exitFailCounter;
+var slowRenderHistogram;
 var genAiClientTokenUsageHistogram;
 var genAiClientOperationDurationHistogram;
 var startupTimeHistogram;
@@ -287627,6 +287650,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;
@@ -288020,6 +288054,7 @@ var ToolCallEvent = class {
   tool_type;
   content_length;
   mcp_server_name;
+  extension_name;
   extension_id;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metadata;
@@ -288039,6 +288074,7 @@ var ToolCallEvent = class {
       if (typeof call.tool !== "undefined" && call.tool instanceof DiscoveredMCPTool) {
         this.tool_type = "mcp";
         this.mcp_server_name = call.tool.serverName;
+        this.extension_name = call.tool.extensionName;
         this.extension_id = call.tool.extensionId;
       } else {
         this.tool_type = "native";
@@ -288082,6 +288118,7 @@ var ToolCallEvent = class {
       tool_type: this.tool_type,
       content_length: this.content_length,
       mcp_server_name: this.mcp_server_name,
+      extension_name: this.extension_name,
       extension_id: this.extension_id,
       metadata: this.metadata
     };
@@ -288967,8 +289004,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 = "42c79c64";
-var CLI_VERSION = "0.13.0-nightly.20251030.42c79c64";
+var GIT_COMMIT_INFO = "caf2ca14";
+var CLI_VERSION = "0.13.0-nightly.20251101.caf2ca14";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -289415,6 +289452,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();
@@ -289595,6 +289638,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();
   }
@@ -290139,7 +290188,6 @@ var GcpLogExporter = class {
             }
           }
         }, {
-          session_id: log.attributes?.["session.id"],
           ...log.attributes,
           ...log.resource?.attributes,
           message: log.body
@@ -291093,14 +291141,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);
@@ -291709,7 +291765,7 @@ async function createContentGenerator(config2, gcConfig, sessionId2) {
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version3 = "0.13.0-nightly.20251030.42c79c64";
+    const version3 = "0.13.0-nightly.20251101.caf2ca14";
     const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
     const baseHeaders = {
       "User-Agent": userAgent
@@ -299243,6 +299299,7 @@ var OAuthUtils = class {
 };
 
 // packages/core/dist/src/mcp/google-auth-provider.js
+init_events();
 var ALLOWED_HOSTS = [/^.+\.googleapis\.com$/, /^(.*\.)?luci\.app$/];
 var GoogleCredentialProvider = class {
   config;
@@ -299292,7 +299349,7 @@ var GoogleCredentialProvider = class {
     const client = await this.auth.getClient();
     const accessTokenResponse = await client.getAccessToken();
     if (!accessTokenResponse.token) {
-      console.error("Failed to get access token from Google ADC");
+      coreEvents.emitFeedback("error", "Failed to get access token from Google ADC");
       return void 0;
     }
     const newToken = {
@@ -299506,6 +299563,7 @@ async function openBrowserSecurely(url4) {
 }
 
 // packages/core/dist/src/mcp/oauth-token-storage.js
+init_events();
 import { promises as fs25 } from "node:fs";
 import * as path17 from "node:path";
 var MCPOAuthTokenStorage = class {
@@ -299667,6 +299725,7 @@ var MCPOAuthTokenStorage = class {
 };
 
 // packages/core/dist/src/mcp/oauth-provider.js
+init_events();
 var OAUTH_DISPLAY_MESSAGE_EVENT = "oauth-display-message";
 var REDIRECT_PORT = 7777;
 var REDIRECT_PATH = "/oauth/callback";
@@ -300131,10 +300190,10 @@ ${authUrl}
         const tokenFingerprint = crypto18.createHash("sha256").update(savedToken.token.accessToken).digest("hex").slice(0, 8);
         debugLogger.debug(`\u2713 Token verification successful (fingerprint: ${tokenFingerprint})`);
       } else {
-        console.error("Token verification failed: token not found or invalid after save");
+        debugLogger.warn("Token verification failed: token not found or invalid after save");
       }
     } catch (saveError) {
-      console.error(`Failed to save token: ${getErrorMessage(saveError)}`);
+      debugLogger.error("Failed to save auth token.", saveError);
       throw saveError;
     }
     return token2;
@@ -300175,7 +300234,7 @@ ${authUrl}
         await this.tokenStorage.saveToken(serverName, newToken, config2.clientId, credentials.tokenUrl, credentials.mcpServerUrl);
         return newToken.accessToken;
       } catch (error) {
-        console.error(`Failed to refresh token: ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback("error", "Failed to refresh auth token.", error);
         await this.tokenStorage.deleteCredentials(serverName);
       }
     }
@@ -300264,6 +300323,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;
@@ -300445,7 +300505,7 @@ async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfi
         if (!isEnabled(funcDecl, mcpServerName, mcpServerConfig)) {
           continue;
         }
-        const tool2 = new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? "", funcDecl.parametersJsonSchema ?? { type: "object", properties: {} }, mcpServerConfig.trust, void 0, cliConfig, mcpServerConfig.extension?.id, messageBus);
+        const tool2 = new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? "", funcDecl.parametersJsonSchema ?? { type: "object", properties: {} }, mcpServerConfig.trust, void 0, cliConfig, mcpServerConfig.extension?.name, mcpServerConfig.extension?.id, messageBus);
         if (cliConfig.getDebugMode?.() && cliConfig.getEnableMessageBusIntegration?.()) {
           debugLogger.log(`[DEBUG] Discovered MCP tool '${funcDecl.name}' from server '${mcpServerName}' with messageBus: ${messageBus ? "YES" : "NO"}`);
         }
@@ -300829,40 +300889,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.
@@ -300873,7 +301016,7 @@ var McpClientManager = class {
       try {
         await client.disconnect();
       } catch (error) {
-        console.error(`Error stopping client '${name4}': ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback("error", `Error stopping client '${name4}':`, error);
       }
     });
     await Promise.all(disconnectionPromises);
@@ -301010,7 +301153,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;
@@ -301059,7 +301202,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).
@@ -301069,7 +301212,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.
@@ -325240,12 +325383,12 @@ function deleteTempFiles(oldPath, newPath) {
   try {
     fs37.unlinkSync(oldPath);
   } catch {
-    console.error(`Error deleting temp diff file: ${oldPath}`);
+    debugLogger.error(`Error deleting temp diff file: ${oldPath}`);
   }
   try {
     fs37.unlinkSync(newPath);
   } catch {
-    console.error(`Error deleting temp diff file: ${newPath}`);
+    debugLogger.error(`Error deleting temp diff file: ${newPath}`);
   }
 }
 async function modifyWithEditor(originalParams, modifyContext, editorType, _abortSignal, onEditorClose) {
@@ -325531,8 +325674,7 @@ function classifyGoogleError(error) {
     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);
+        return new TerminalQuotaError(`You have exhausted your daily quota on this model.`, googleApiError);
       }
     }
   }
@@ -325561,8 +325703,7 @@ Expected quota reset within 24h.`, 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);
+      return new TerminalQuotaError(`You have exhausted your daily quota on this model.`, googleApiError);
     }
   }
   if (retryInfo?.retryDelay) {
@@ -326441,8 +326582,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,
@@ -339873,6 +340013,7 @@ var GeminiChat = class {
   // model.
   sendPromise = Promise.resolve();
   chatRecordingService;
+  lastPromptTokenCount;
   constructor(config2, generationConfig = {}, history = []) {
     this.config = config2;
     this.generationConfig = generationConfig;
@@ -339880,6 +340021,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;
@@ -340095,7 +340237,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;
@@ -340126,6 +340268,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.
    */
@@ -340886,7 +341031,10 @@ var LoopDetectionService = class {
    * @returns true if a loop is detected, false otherwise
    */
   addAndCheck(event) {
-    if (this.loopDetected || this.disabledForSession) {
+    if (this.disabledForSession) {
+      return false;
+    }
+    if (this.loopDetected) {
       return this.loopDetected;
     }
     switch (event.type) {
@@ -341144,7 +341292,7 @@ var LoopDetectionService = class {
 };
 
 // packages/core/dist/src/services/chatCompressionService.js
-var COMPRESSION_TOKEN_THRESHOLD = 0.7;
+var DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.2;
 var COMPRESSION_PRESERVE_THRESHOLD = 0.3;
 function findCompressSplitPoint(contents, fraction) {
   if (fraction <= 0 || fraction >= 1) {
@@ -341184,10 +341332,9 @@ var ChatCompressionService = class {
         }
       };
     }
-    const originalTokenCount = uiTelemetryService.getLastPromptTokenCount();
-    const contextPercentageThreshold = config2.getChatCompression()?.contextPercentageThreshold;
+    const originalTokenCount = chat.getLastPromptTokenCount();
     if (!force) {
-      const threshold = contextPercentageThreshold ?? COMPRESSION_TOKEN_THRESHOLD;
+      const threshold = config2.getCompressionThreshold() ?? DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
       if (originalTokenCount < threshold * tokenLimit(model)) {
         return {
           newHistory: null,
@@ -341257,7 +341404,6 @@ var ChatCompressionService = class {
         }
       };
     } else {
-      uiTelemetryService.setLastPromptTokenCount(newTokenCount);
       return {
         newHistory: extraHistory,
         info: {
@@ -341300,8 +341446,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()) {
@@ -341339,6 +341491,7 @@ var GeminiClient = class {
   }
   async resetChat() {
     this.chat = await this.startChat();
+    this.updateTelemetryTokenCount();
   }
   getChatRecordingService() {
     return this.chat?.getChatRecordingService();
@@ -341536,7 +341689,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,
@@ -341595,6 +341748,7 @@ var GeminiClient = class {
         return turn;
       }
       yield event;
+      this.updateTelemetryTokenCount();
       if (event.type === GeminiEventType.InvalidStream) {
         if (this.config.getContinueOnFailedApiCall()) {
           if (isInvalidStreamRetry) {
@@ -341682,6 +341836,7 @@ var GeminiClient = class {
     } else if (info2.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
         this.chat = await this.startChat(newHistory);
+        this.updateTelemetryTokenCount();
         this.forceFullIdeContext = true;
       }
     }
@@ -349526,13 +349681,14 @@ var Config = class {
   listExtensions;
   _extensionLoader;
   _enabledExtensions;
+  enableExtensionReloading;
   _blockedMcpServers;
   fallbackModelHandler;
   quotaErrorOccurred = false;
   summarizeToolOutput;
   experimentalZedIntegration = false;
   loadMemoryFromIncludeDirectories = false;
-  chatCompression;
+  compressionThreshold;
   interactive;
   ptyInfo;
   trustedFolder;
@@ -349620,7 +349776,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;
@@ -349640,9 +349796,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,
@@ -349654,6 +349808,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;
@@ -349707,8 +349862,6 @@ var Config = class {
       if (this.model === DEFAULT_GEMINI_MODEL_AUTO) {
         this.model = DEFAULT_GEMINI_MODEL;
       }
-    } else if (this.useModelRouter && this.model === DEFAULT_GEMINI_MODEL) {
-      this.model = DEFAULT_GEMINI_MODEL_AUTO;
     }
     if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod === AuthType2.LOGIN_WITH_GOOGLE) {
       this.geminiClient.stripThoughtsFromHistory();
@@ -349827,6 +349980,9 @@ var Config = class {
   getMcpServers() {
     return this.mcpServers;
   }
+  setMcpServers(mcpServers) {
+    this.mcpServers = mcpServers;
+  }
   getUserMemory() {
     return this.userMemory;
   }
@@ -349957,6 +350113,9 @@ var Config = class {
   getEnabledExtensions() {
     return this._enabledExtensions;
   }
+  getEnableExtensionReloading() {
+    return this.enableExtensionReloading;
+  }
   getBlockedMcpServers() {
     return this._blockedMcpServers;
   }
@@ -350004,8 +350163,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;