@google/gemini-cli-a2a-server 0.11.0-nightly.20251020.a96f0659 → 0.11.0-preview.0

package/dist/a2a-server.mjs

@@ -223680,7 +223680,7 @@ var require_proxy_agent = __commonJS({
         return this.#client.destroy(err2);
       }
     };
-    var ProxyAgent3 = class extends DispatcherBase {
+    var ProxyAgent2 = class extends DispatcherBase {
       constructor(opts) {
         if (!opts || typeof opts === "object" && !(opts instanceof URL) && !opts.uri) {
           throw new InvalidArgumentError("Proxy uri is mandatory");
@@ -223821,7 +223821,7 @@ var require_proxy_agent = __commonJS({
         throw new InvalidArgumentError("Proxy-Authorization should be sent in ProxyAgent constructor");
       }
     }
-    module2.exports = ProxyAgent3;
+    module2.exports = ProxyAgent2;
   }
 });
 
@@ -223831,7 +223831,7 @@ var require_env_http_proxy_agent = __commonJS({
     "use strict";
     var DispatcherBase = require_dispatcher_base();
     var { kClose, kDestroy, kClosed, kDestroyed, kDispatch, kNoProxyAgent, kHttpProxyAgent, kHttpsProxyAgent } = require_symbols();
-    var ProxyAgent3 = require_proxy_agent();
+    var ProxyAgent2 = require_proxy_agent();
     var Agent3 = require_agent4();
     var DEFAULT_PORTS = {
       "http:": 80,
@@ -223848,13 +223848,13 @@ var require_env_http_proxy_agent = __commonJS({
         this[kNoProxyAgent] = new Agent3(agentOpts);
         const HTTP_PROXY = httpProxy ?? process.env.http_proxy ?? process.env.HTTP_PROXY;
         if (HTTP_PROXY) {
-          this[kHttpProxyAgent] = new ProxyAgent3({ ...agentOpts, uri: HTTP_PROXY });
+          this[kHttpProxyAgent] = new ProxyAgent2({ ...agentOpts, uri: HTTP_PROXY });
         } else {
           this[kHttpProxyAgent] = this[kNoProxyAgent];
         }
         const HTTPS_PROXY = httpsProxy ?? process.env.https_proxy ?? process.env.HTTPS_PROXY;
         if (HTTPS_PROXY) {
-          this[kHttpsProxyAgent] = new ProxyAgent3({ ...agentOpts, uri: HTTPS_PROXY });
+          this[kHttpsProxyAgent] = new ProxyAgent2({ ...agentOpts, uri: HTTPS_PROXY });
         } else {
           this[kHttpsProxyAgent] = this[kHttpProxyAgent];
         }
@@ -227433,9 +227433,9 @@ var require_global2 = __commonJS({
     var { InvalidArgumentError } = require_errors6();
     var Agent3 = require_agent4();
     if (getGlobalDispatcher() === void 0) {
-      setGlobalDispatcher3(new Agent3());
+      setGlobalDispatcher2(new Agent3());
     }
-    function setGlobalDispatcher3(agent) {
+    function setGlobalDispatcher2(agent) {
       if (!agent || typeof agent.dispatch !== "function") {
         throw new InvalidArgumentError("Argument agent must implement Agent");
       }
@@ -227450,7 +227450,7 @@ var require_global2 = __commonJS({
       return globalThis[globalDispatcher];
     }
     module2.exports = {
-      setGlobalDispatcher: setGlobalDispatcher3,
+      setGlobalDispatcher: setGlobalDispatcher2,
       getGlobalDispatcher
     };
   }
@@ -236675,7 +236675,7 @@ var require_undici = __commonJS({
     var Pool = require_pool2();
     var BalancedPool = require_balanced_pool();
     var Agent3 = require_agent4();
-    var ProxyAgent3 = require_proxy_agent();
+    var ProxyAgent2 = require_proxy_agent();
     var EnvHttpProxyAgent2 = require_env_http_proxy_agent();
     var RetryAgent = require_retry_agent();
     var H2CClient = require_h2c_client();
@@ -236691,7 +236691,7 @@ var require_undici = __commonJS({
     var SnapshotAgent = require_snapshot_agent();
     var mockErrors = require_mock_errors();
     var RetryHandler = require_retry_handler();
-    var { getGlobalDispatcher, setGlobalDispatcher: setGlobalDispatcher3 } = require_global2();
+    var { getGlobalDispatcher, setGlobalDispatcher: setGlobalDispatcher2 } = require_global2();
     var DecoratorHandler = require_decorator_handler();
     var RedirectHandler = require_redirect_handler();
     Object.assign(Dispatcher.prototype, api);
@@ -236700,7 +236700,7 @@ var require_undici = __commonJS({
     module2.exports.Pool = Pool;
     module2.exports.BalancedPool = BalancedPool;
     module2.exports.Agent = Agent3;
-    module2.exports.ProxyAgent = ProxyAgent3;
+    module2.exports.ProxyAgent = ProxyAgent2;
     module2.exports.EnvHttpProxyAgent = EnvHttpProxyAgent2;
     module2.exports.RetryAgent = RetryAgent;
     module2.exports.H2CClient = H2CClient;
@@ -236766,7 +236766,7 @@ var require_undici = __commonJS({
         }, handler);
       };
     }
-    module2.exports.setGlobalDispatcher = setGlobalDispatcher3;
+    module2.exports.setGlobalDispatcher = setGlobalDispatcher2;
     module2.exports.getGlobalDispatcher = getGlobalDispatcher;
     var fetchImpl = require_fetch2().fetch;
     module2.exports.fetch = async function fetch2(init3, options2 = void 0) {
@@ -285059,6 +285059,23 @@ var Storage2 = class _Storage {
   }
 };
 
+// packages/core/dist/src/utils/debugLogger.js
+var DebugLogger = class {
+  log(...args2) {
+    console.log(...args2);
+  }
+  warn(...args2) {
+    console.warn(...args2);
+  }
+  error(...args2) {
+    console.error(...args2);
+  }
+  debug(...args2) {
+    console.debug(...args2);
+  }
+};
+var debugLogger = new DebugLogger();
+
 // packages/core/dist/src/utils/userAccountManager.js
 var UserAccountManager = class {
   getGoogleAccountsCachePath() {
@@ -285076,13 +285093,13 @@ var UserAccountManager = class {
     }
     const parsed = JSON.parse(content);
     if (typeof parsed !== "object" || parsed === null) {
-      console.log("Invalid accounts file schema, starting fresh.");
+      debugLogger.log("Invalid accounts file schema, starting fresh.");
       return defaultState;
     }
     const { active, old } = parsed;
     const isValid2 = (active === void 0 || active === null || typeof active === "string") && (old === void 0 || Array.isArray(old) && old.every((i3) => typeof i3 === "string"));
     if (!isValid2) {
-      console.log("Invalid accounts file schema, starting fresh.");
+      debugLogger.log("Invalid accounts file schema, starting fresh.");
       return defaultState;
     }
     return {
@@ -285099,7 +285116,7 @@ var UserAccountManager = class {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return defaultState;
       }
-      console.log("Error during sync read of accounts, starting fresh.", error);
+      debugLogger.log("Error during sync read of accounts, starting fresh.", error);
       return defaultState;
     }
   }
@@ -285112,7 +285129,7 @@ var UserAccountManager = class {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return defaultState;
       }
-      console.log("Could not parse accounts file, starting fresh.", error);
+      debugLogger.log("Could not parse accounts file, starting fresh.", error);
       return defaultState;
     }
   }
@@ -285512,21 +285529,21 @@ async function initOauthClient(authType, config2) {
       try {
         await fetchAndCacheUserInfo(client);
       } catch (error) {
-        console.warn("Failed to fetch user info:", getErrorMessage(error));
+        debugLogger.warn("Failed to fetch user info:", getErrorMessage(error));
       }
     }
-    console.log("Loaded cached credentials.");
+    debugLogger.log("Loaded cached credentials.");
     return client;
   }
   if (authType === AuthType2.CLOUD_SHELL) {
     try {
-      console.log("Attempting to authenticate via Cloud Shell VM's ADC.");
+      debugLogger.log("Attempting to authenticate via Cloud Shell VM's ADC.");
       const computeClient = new import_google_auth_library8.Compute({
         // We can leave this empty, since the metadata server will provide
         // the service account email.
       });
       await computeClient.getAccessToken();
-      console.log("Authentication successful.");
+      debugLogger.log("Authentication successful.");
       return computeClient;
     } catch (e2) {
       throw new Error(`Could not authenticate using Cloud Shell credentials. Please select a different authentication method or ensure you are in a properly configured environment. Error: ${getErrorMessage(e2)}`);
@@ -285546,7 +285563,7 @@ async function initOauthClient(authType, config2) {
     }
   } else {
     const webLogin = await authWithWeb(client);
-    console.log(`
+    debugLogger.log(`
 
 Code Assist login required.
 Attempting to open authentication page in your browser.
@@ -285565,7 +285582,7 @@ ${webLogin.authUrl}
       console.error("An unexpected error occurred while trying to open the browser:", getErrorMessage(err2), "\nThis might be due to browser compatibility issues or system configuration.", "\nPlease try running again with NO_BROWSER=true set for manual authentication.");
       throw new FatalAuthenticationError(`Failed to open browser: ${getErrorMessage(err2)}`);
     }
-    console.log("Waiting for authentication...");
+    debugLogger.log("Waiting for authentication...");
     const authTimeout = 5 * 60 * 1e3;
     const timeoutPromise = new Promise((_, reject) => {
       setTimeout(() => {
@@ -285594,10 +285611,10 @@ async function authWithUserCode(client) {
     code_challenge: codeVerifier.codeChallenge,
     state
   });
-  console.log("Please visit the following URL to authorize the application:");
-  console.log("");
-  console.log(authUrl);
-  console.log("");
+  debugLogger.log("Please visit the following URL to authorize the application:");
+  debugLogger.log("");
+  debugLogger.log(authUrl);
+  debugLogger.log("");
   const code2 = await new Promise((resolve13) => {
     const rl = readline.createInterface({
       input: process.stdin,
@@ -285664,7 +285681,7 @@ async function authWithWeb(client) {
             try {
               await fetchAndCacheUserInfo(client);
             } catch (error) {
-              console.warn("Failed to retrieve Google Account ID during authentication:", getErrorMessage(error));
+              debugLogger.warn("Failed to retrieve Google Account ID during authentication:", getErrorMessage(error));
             }
             res.writeHead(HTTP_REDIRECT, { Location: SIGN_IN_SUCCESS_URL });
             res.end();
@@ -285751,7 +285768,7 @@ async function loadCachedCredentials(client) {
       await client.getTokenInfo(token2);
       return true;
     } catch (error) {
-      console.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error));
+      debugLogger.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error));
     }
   }
   return false;
@@ -285847,6 +285864,7 @@ function fromGenerateContentResponse(res) {
   out2.promptFeedback = inres.promptFeedback;
   out2.usageMetadata = inres.usageMetadata;
   out2.modelVersion = inres.modelVersion;
+  out2.responseId = res.traceId;
   return out2;
 }
 function toVertexGenerateContentRequest(req, sessionId2) {
@@ -286303,24 +286321,53 @@ var MessageBusType;
   MessageBusType2["TOOL_POLICY_REJECTION"] = "tool-policy-rejection";
   MessageBusType2["TOOL_EXECUTION_SUCCESS"] = "tool-execution-success";
   MessageBusType2["TOOL_EXECUTION_FAILURE"] = "tool-execution-failure";
+  MessageBusType2["UPDATE_POLICY"] = "update-policy";
 })(MessageBusType || (MessageBusType = {}));
 
 // packages/core/dist/src/tools/tools.js
 var BaseToolInvocation = class {
   params;
   messageBus;
-  constructor(params, messageBus) {
+  _toolName;
+  _toolDisplayName;
+  constructor(params, messageBus, _toolName, _toolDisplayName) {
     this.params = params;
     this.messageBus = messageBus;
-    if (this.messageBus) {
-      console.debug(`[DEBUG] Tool ${this.constructor.name} created with messageBus: YES`);
-    }
+    this._toolName = _toolName;
+    this._toolDisplayName = _toolDisplayName;
   }
   toolLocations() {
     return [];
   }
-  shouldConfirmExecute(_abortSignal) {
-    return Promise.resolve(false);
+  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 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 false;
   }
   getMessageBusDecision(abortSignal) {
     if (!this.messageBus) {
@@ -286328,7 +286375,7 @@ var BaseToolInvocation = class {
     }
     const correlationId = randomUUID3();
     const toolCall = {
-      name: this.constructor.name,
+      name: this._toolName || this.constructor.name,
       args: this.params
     };
     return new Promise((resolve13) => {
@@ -286394,7 +286441,8 @@ var DeclarativeTool = class {
   isOutputMarkdown;
   canUpdateOutput;
   messageBus;
-  constructor(name4, displayName, description, kind, parameterSchema, isOutputMarkdown = true, canUpdateOutput = false, messageBus) {
+  extensionId;
+  constructor(name4, displayName, description, kind, parameterSchema, isOutputMarkdown = true, canUpdateOutput = false, messageBus, extensionId) {
     this.name = name4;
     this.displayName = displayName;
     this.description = description;
@@ -286403,6 +286451,7 @@ var DeclarativeTool = class {
     this.isOutputMarkdown = isOutputMarkdown;
     this.canUpdateOutput = canUpdateOutput;
     this.messageBus = messageBus;
+    this.extensionId = extensionId;
   }
   get schema() {
     return {
@@ -286489,7 +286538,7 @@ var BaseDeclarativeTool = class extends DeclarativeTool {
     if (validationError) {
       throw new Error(validationError);
     }
-    return this.createInvocation(params, this.messageBus);
+    return this.createInvocation(params, this.messageBus, this.name, this.displayName);
   }
   validateToolParams(params) {
     const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
@@ -286708,7 +286757,8 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
   parameterSchema;
   trust;
   cliConfig;
-  constructor(mcpTool, serverName, serverToolName, description, parameterSchema, trust, nameOverride, cliConfig) {
+  extensionId;
+  constructor(mcpTool, serverName, serverToolName, description, parameterSchema, trust, nameOverride, cliConfig, extensionId) {
     super(
       nameOverride ?? generateValidName(serverToolName),
       `${serverToolName} (${serverName} MCP Server)`,
@@ -286717,7 +286767,11 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
       parameterSchema,
       true,
       // isOutputMarkdown
-      false
+      false,
+      // canUpdateOutput
+      void 0,
+      // messageBus
+      extensionId
     );
     this.mcpTool = mcpTool;
     this.serverName = serverName;
@@ -286725,9 +286779,10 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
     this.parameterSchema = parameterSchema;
     this.trust = trust;
     this.cliConfig = cliConfig;
+    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);
+    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) {
     return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, this.displayName, this.trust, params, this.cliConfig);
@@ -286933,6 +286988,8 @@ var StartSessionEvent = class {
   mcp_tools_count;
   mcp_tools;
   output_format;
+  extensions_count;
+  extension_ids;
   constructor(config2, toolRegistry) {
     const generatorConfig = config2.getContentGeneratorConfig();
     const mcpServers = config2.getMcpServers();
@@ -286958,6 +287015,9 @@ var StartSessionEvent = class {
     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;
@@ -286983,7 +287043,9 @@ var StartSessionEvent = class {
       mcp_servers_count: this.mcp_servers_count,
       mcp_tools: this.mcp_tools,
       mcp_tools_count: this.mcp_tools_count,
-      output_format: this.output_format
+      output_format: this.output_format,
+      extensions_count: this.extensions_count,
+      extension_ids: this.extension_ids
     };
   }
   toLogBody() {
@@ -287005,6 +287067,7 @@ var ToolCallEvent = class {
   tool_type;
   content_length;
   mcp_server_name;
+  extension_id;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metadata;
   constructor(call, function_name, function_args, duration_ms, success, prompt_id, tool_type, error) {
@@ -287023,6 +287086,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_id = call.tool.extensionId;
       } else {
         this.tool_type = "native";
       }
@@ -287065,6 +287129,7 @@ var ToolCallEvent = class {
       tool_type: this.tool_type,
       content_length: this.content_length,
       mcp_server_name: this.mcp_server_name,
+      extension_id: this.extension_id,
       metadata: this.metadata
     };
     if (this.error) {
@@ -288387,12 +288452,15 @@ var EventMetadataKey;
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS"] = 81] = "GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_NODE_VERSION"] = 83] = "GEMINI_CLI_NODE_VERSION";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_NAME"] = 85] = "GEMINI_CLI_EXTENSION_NAME";
+  EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_ID"] = 121] = "GEMINI_CLI_EXTENSION_ID";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_VERSION"] = 86] = "GEMINI_CLI_EXTENSION_VERSION";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_PREVIOUS_VERSION"] = 117] = "GEMINI_CLI_EXTENSION_PREVIOUS_VERSION";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_SOURCE"] = 87] = "GEMINI_CLI_EXTENSION_SOURCE";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_INSTALL_STATUS"] = 88] = "GEMINI_CLI_EXTENSION_INSTALL_STATUS";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_UNINSTALL_STATUS"] = 96] = "GEMINI_CLI_EXTENSION_UNINSTALL_STATUS";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_UPDATE_STATUS"] = 118] = "GEMINI_CLI_EXTENSION_UPDATE_STATUS";
+  EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT"] = 119] = "GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT";
+  EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_START_SESSION_EXTENSION_IDS"] = 120] = "GEMINI_CLI_START_SESSION_EXTENSION_IDS";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE"] = 102] = "GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE"] = 107] = "GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE";
   EventMetadataKey2[EventMetadataKey2["GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH"] = 89] = "GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH";
@@ -288435,8 +288503,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 = "a96f0659";
-var CLI_VERSION = "0.11.0-nightly.20251020.a96f0659";
+var GIT_COMMIT_INFO = "0542de95";
+var CLI_VERSION = "0.11.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -288613,7 +288681,7 @@ var ClearcutLogger = class _ClearcutLogger {
         }
       ]);
       if (wasAtCapacity && this.config?.getDebugMode()) {
-        console.debug(`ClearcutLogger: Dropped old event to prevent memory leak (queue size: ${this.events.size})`);
+        debugLogger.debug(`ClearcutLogger: Dropped old event to prevent memory leak (queue size: ${this.events.size})`);
       }
     } catch (error) {
       if (this.config?.getDebugMode()) {
@@ -288647,20 +288715,20 @@ var ClearcutLogger = class _ClearcutLogger {
       return;
     }
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   async flushToClearcut() {
     if (this.flushing) {
       if (this.config?.getDebugMode()) {
-        console.debug("ClearcutLogger: Flush already in progress, marking pending flush.");
+        debugLogger.debug("ClearcutLogger: Flush already in progress, marking pending flush.");
       }
       this.pendingFlush = true;
       return Promise.resolve({});
     }
     this.flushing = true;
     if (this.config?.getDebugMode()) {
-      console.log("Flushing log events to Clearcut.");
+      debugLogger.log("Flushing log events to Clearcut.");
     }
     const eventsToSend = this.events.toArray();
     this.events.clear();
@@ -288705,7 +288773,7 @@ var ClearcutLogger = class _ClearcutLogger {
       this.pendingFlush = false;
       this.flushToClearcut().catch((error) => {
         if (this.config?.getDebugMode()) {
-          console.debug("Error in pending flush to Clearcut:", error);
+          debugLogger.debug("Error in pending flush to Clearcut:", error);
         }
       });
     }
@@ -288776,12 +288844,20 @@ var ClearcutLogger = class _ClearcutLogger {
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS,
         value: event.mcp_tools ? event.mcp_tools : ""
+      },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
+        value: event.extensions_count.toString()
+      },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSION_IDS,
+        value: event.extension_ids.toString()
       }
     ];
     this.sessionData = data;
     this.enqueueLogEvent(this.createLogEvent(EventNames.START_SESSION, data));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logNewPromptEvent(event) {
@@ -288973,13 +289049,13 @@ var ClearcutLogger = class _ClearcutLogger {
   logFlashFallbackEvent() {
     this.enqueueLogEvent(this.createLogEvent(EventNames.FLASH_FALLBACK, []));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logRipgrepFallbackEvent() {
     this.enqueueLogEvent(this.createLogEvent(EventNames.RIPGREP_FALLBACK, []));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logLoopDetectedEvent(event) {
@@ -289084,7 +289160,7 @@ var ClearcutLogger = class _ClearcutLogger {
   logEndSessionEvent() {
     this.enqueueLogEvent(this.createLogEvent(EventNames.END_SESSION, []));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logInvalidChunkEvent(event) {
@@ -289150,6 +289226,10 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
         value: event.extension_name
       },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_VERSION,
         value: event.extension_version
@@ -289165,7 +289245,7 @@ var ClearcutLogger = class _ClearcutLogger {
     ];
     this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_INSTALL, data));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logExtensionUninstallEvent(event) {
@@ -289174,6 +289254,10 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
         value: event.extension_name
       },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_UNINSTALL_STATUS,
         value: event.status
@@ -289181,7 +289265,7 @@ var ClearcutLogger = class _ClearcutLogger {
     ];
     this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_UNINSTALL, data));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logExtensionUpdateEvent(event) {
@@ -289190,6 +289274,10 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
         value: event.extension_name
       },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_VERSION,
         value: event.extension_version
@@ -289209,7 +289297,7 @@ var ClearcutLogger = class _ClearcutLogger {
     ];
     this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_UPDATE, data));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logToolOutputTruncatedEvent(event) {
@@ -289272,6 +289360,10 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
         value: event.extension_name
       },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
         value: event.setting_scope
@@ -289279,7 +289371,7 @@ var ClearcutLogger = class _ClearcutLogger {
     ];
     this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_ENABLE, data));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logModelSlashCommandEvent(event) {
@@ -289298,6 +289390,10 @@ var ClearcutLogger = class _ClearcutLogger {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
         value: event.extension_name
       },
+      {
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ID,
+        value: event.extension_id
+      },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
         value: event.setting_scope
@@ -289305,7 +289401,7 @@ var ClearcutLogger = class _ClearcutLogger {
     ];
     this.enqueueLogEvent(this.createLogEvent(EventNames.EXTENSION_DISABLE, data));
     this.flushToClearcut().catch((error) => {
-      console.debug("Error flushing to Clearcut:", error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
   logSmartEditStrategyEvent(event) {
@@ -289439,8 +289535,6 @@ var ClearcutLogger = class _ClearcutLogger {
     }
   }
   getConfigJson() {
-    const configJson = safeJsonStringifyBooleanValuesOnly(this.config);
-    console.debug(configJson);
     return safeJsonStringifyBooleanValuesOnly(this.config);
   }
   shutdown() {
@@ -289449,13 +289543,13 @@ var ClearcutLogger = class _ClearcutLogger {
   requeueFailedEvents(eventsToSend) {
     const eventsToRetry = eventsToSend.slice(-MAX_RETRY_EVENTS);
     if (eventsToSend.length > MAX_RETRY_EVENTS && this.config?.getDebugMode()) {
-      console.warn(`ClearcutLogger: Dropping ${eventsToSend.length - MAX_RETRY_EVENTS} events due to retry queue limit. Total events: ${eventsToSend.length}, keeping: ${MAX_RETRY_EVENTS}`);
+      debugLogger.warn(`ClearcutLogger: Dropping ${eventsToSend.length - MAX_RETRY_EVENTS} events due to retry queue limit. Total events: ${eventsToSend.length}, keeping: ${MAX_RETRY_EVENTS}`);
     }
     const availableSpace = MAX_EVENTS - this.events.size;
     const numEventsToRequeue = Math.min(eventsToRetry.length, availableSpace);
     if (numEventsToRequeue === 0) {
       if (this.config?.getDebugMode()) {
-        console.debug(`ClearcutLogger: No events re-queued (queue size: ${this.events.size})`);
+        debugLogger.debug(`ClearcutLogger: No events re-queued (queue size: ${this.events.size})`);
       }
       return;
     }
@@ -289467,7 +289561,7 @@ var ClearcutLogger = class _ClearcutLogger {
       this.events.pop();
     }
     if (this.config?.getDebugMode()) {
-      console.debug(`ClearcutLogger: Re-queued ${numEventsToRequeue} events for retry (queue size: ${this.events.size})`);
+      debugLogger.debug(`ClearcutLogger: Re-queued ${numEventsToRequeue} events for retry (queue size: ${this.events.size})`);
     }
   }
 };
@@ -290393,7 +290487,7 @@ function initializeTelemetry(config2) {
   try {
     sdk.start();
     if (config2.getDebugMode()) {
-      console.log("OpenTelemetry SDK started successfully.");
+      debugLogger.log("OpenTelemetry SDK started successfully.");
     }
     telemetryInitialized = true;
     initializeMetrics(config2);
@@ -290418,7 +290512,7 @@ async function shutdownTelemetry(config2) {
     ClearcutLogger.getInstance()?.shutdown();
     await sdk.shutdown();
     if (config2.getDebugMode()) {
-      console.log("OpenTelemetry SDK shut down successfully.");
+      debugLogger.log("OpenTelemetry SDK shut down successfully.");
     }
   } catch (error) {
     console.error("Error shutting down SDK:", error);
@@ -290913,7 +291007,7 @@ function createContentGeneratorConfig(config2, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, gcConfig, sessionId2) {
-  const version3 = "0.11.0-nightly.20251020.a96f0659";
+  const version3 = "0.11.0-preview.0";
   const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -290953,7 +291047,7 @@ var PromptRegistry = class {
   registerPrompt(prompt) {
     if (this.prompts.has(prompt.name)) {
       const newName = `${prompt.serverName}_${prompt.name}`;
-      console.warn(`Prompt with name "${prompt.name}" is already registered. Renaming to "${newName}".`);
+      debugLogger.warn(`Prompt with name "${prompt.name}" is already registered. Renaming to "${newName}".`);
       this.prompts.set(newName, { ...prompt, name: newName });
     } else {
       this.prompts.set(prompt.name, prompt);
@@ -298678,7 +298772,7 @@ var OAuthUtils = class {
       }
       return await response.json();
     } catch (error) {
-      console.debug(`Failed to fetch protected resource metadata from ${resourceMetadataUrl}: ${getErrorMessage(error)}`);
+      debugLogger.debug(`Failed to fetch protected resource metadata from ${resourceMetadataUrl}: ${getErrorMessage(error)}`);
       return null;
     }
   }
@@ -298696,7 +298790,7 @@ var OAuthUtils = class {
       }
       return await response.json();
     } catch (error) {
-      console.debug(`Failed to fetch authorization server metadata from ${authServerMetadataUrl}: ${getErrorMessage(error)}`);
+      debugLogger.debug(`Failed to fetch authorization server metadata from ${authServerMetadataUrl}: ${getErrorMessage(error)}`);
       return null;
     }
   }
@@ -298738,7 +298832,7 @@ var OAuthUtils = class {
         return authServerMetadata;
       }
     }
-    console.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
+    debugLogger.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
     return null;
   }
   /**
@@ -298764,23 +298858,23 @@ var OAuthUtils = class {
         if (authServerMetadata2) {
           const config2 = this.metadataToOAuthConfig(authServerMetadata2);
           if (authServerMetadata2.registration_endpoint) {
-            console.log("Dynamic client registration is supported at:", authServerMetadata2.registration_endpoint);
+            debugLogger.log("Dynamic client registration is supported at:", authServerMetadata2.registration_endpoint);
           }
           return config2;
         }
       }
-      console.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
+      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) {
-          console.log("Dynamic client registration is supported at:", authServerMetadata.registration_endpoint);
+          debugLogger.log("Dynamic client registration is supported at:", authServerMetadata.registration_endpoint);
         }
         return config2;
       }
       return null;
     } catch (error) {
-      console.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
+      debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
       return null;
     }
   }
@@ -298846,7 +298940,7 @@ var OAuthUtils = class {
    */
   static buildResourceParameter(endpointUrl) {
     const url4 = new URL(endpointUrl);
-    return `${url4.protocol}//${url4.host}`;
+    return `${url4.protocol}//${url4.host}${url4.pathname}`;
   }
 };
 
@@ -298978,7 +299072,7 @@ var MCPOAuthProvider = class {
       });
       server.on("error", reject);
       server.listen(REDIRECT_PORT, () => {
-        console.log(`OAuth callback server listening on port ${REDIRECT_PORT}`);
+        debugLogger.log(`OAuth callback server listening on port ${REDIRECT_PORT}`);
       });
       setTimeout(() => {
         server.close();
@@ -299014,7 +299108,7 @@ var MCPOAuthProvider = class {
       try {
         params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        console.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
     const url4 = new URL7(config2.authorizationUrl);
@@ -299052,7 +299146,7 @@ var MCPOAuthProvider = class {
       try {
         params.append("resource", OAuthUtils.buildResourceParameter(resourceUrl));
       } catch (error) {
-        console.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
     const response = await fetch(config2.tokenUrl, {
@@ -299079,7 +299173,7 @@ var MCPOAuthProvider = class {
       throw new Error(errorMessage || `Token exchange failed: ${response.status} - ${responseText}`);
     }
     if (!contentType.includes("application/json") && !contentType.includes("application/x-www-form-urlencoded")) {
-      console.warn(`Token endpoint returned unexpected content-type: ${contentType}. Expected application/json or application/x-www-form-urlencoded. Will attempt to parse response.`);
+      debugLogger.warn(`Token endpoint returned unexpected content-type: ${contentType}. Expected application/json or application/x-www-form-urlencoded. Will attempt to parse response.`);
     }
     try {
       return JSON.parse(responseText);
@@ -299132,7 +299226,7 @@ var MCPOAuthProvider = class {
       try {
         params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        console.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
     const response = await fetch(tokenUrl, {
@@ -299159,7 +299253,7 @@ var MCPOAuthProvider = class {
       throw new Error(errorMessage || `Token refresh failed: ${response.status} - ${responseText}`);
     }
     if (!contentType.includes("application/json") && !contentType.includes("application/x-www-form-urlencoded")) {
-      console.warn(`Token refresh endpoint returned unexpected content-type: ${contentType}. Expected application/json or application/x-www-form-urlencoded. Will attempt to parse response.`);
+      debugLogger.warn(`Token refresh endpoint returned unexpected content-type: ${contentType}. Expected application/json or application/x-www-form-urlencoded. Will attempt to parse response.`);
     }
     try {
       return JSON.parse(responseText);
@@ -299198,11 +299292,11 @@ var MCPOAuthProvider = class {
       if (events) {
         events.emit(OAUTH_DISPLAY_MESSAGE_EVENT, message);
       } else {
-        console.log(message);
+        debugLogger.log(message);
       }
     };
     if (!config2.authorizationUrl && mcpServerUrl) {
-      console.debug(`Starting OAuth for MCP server "${serverName}"\u2026
+      debugLogger.debug(`Starting OAuth for MCP server "${serverName}"\u2026
 \u2713 No authorization URL; using OAuth discovery`);
       try {
         const headers = OAuthUtils.isSSEEndpoint(mcpServerUrl) ? { Accept: "text/event-stream" } : { Accept: "application/json" };
@@ -299228,7 +299322,7 @@ var MCPOAuthProvider = class {
           }
         }
       } catch (error) {
-        console.debug(`Failed to check endpoint for authentication requirements: ${getErrorMessage(error)}`);
+        debugLogger.debug(`Failed to check endpoint for authentication requirements: ${getErrorMessage(error)}`);
       }
       if (!config2.authorizationUrl) {
         const discoveredConfig = await this.discoverOAuthFromMCPServer(mcpServerUrl);
@@ -299256,7 +299350,7 @@ var MCPOAuthProvider = class {
         }
         const authUrl2 = new URL7(config2.authorizationUrl);
         const serverUrl = `${authUrl2.protocol}//${authUrl2.host}`;
-        console.debug("\u2192 Attempting dynamic client registration...");
+        debugLogger.debug("\u2192 Attempting dynamic client registration...");
         const authServerMetadata = await OAuthUtils.discoverAuthorizationServerMetadata(serverUrl);
         if (!authServerMetadata) {
           throw new Error("Failed to fetch authorization server metadata for client registration");
@@ -299269,7 +299363,7 @@ var MCPOAuthProvider = class {
         if (clientRegistration.client_secret) {
           config2.clientSecret = clientRegistration.client_secret;
         }
-        console.debug("\u2713 Dynamic client registration successful");
+        debugLogger.debug("\u2713 Dynamic client registration successful");
       } else {
         throw new Error("No client ID provided and dynamic registration not supported");
       }
@@ -299290,10 +299384,10 @@ ${authUrl}
     try {
       await openBrowserSecurely(authUrl);
     } catch (error) {
-      console.warn("Failed to open browser automatically:", getErrorMessage(error));
+      debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
     }
     const { code: code2 } = await callbackPromise;
-    console.debug("\u2713 Authorization code received, exchanging for tokens...");
+    debugLogger.debug("\u2713 Authorization code received, exchanging for tokens...");
     const tokenResponse = await this.exchangeCodeForToken(config2, code2, pkceParams.codeVerifier, mcpServerUrl);
     if (!tokenResponse.access_token) {
       throw new Error("No access token received from token endpoint");
@@ -299309,11 +299403,11 @@ ${authUrl}
     }
     try {
       await this.tokenStorage.saveToken(serverName, token2, config2.clientId, config2.tokenUrl, mcpServerUrl);
-      console.debug("\u2713 Authentication successful! Token saved.");
+      debugLogger.debug("\u2713 Authentication successful! Token saved.");
       const savedToken = await this.tokenStorage.getCredentials(serverName);
       if (savedToken && savedToken.token && savedToken.token.accessToken) {
         const tokenFingerprint = crypto18.createHash("sha256").update(savedToken.token.accessToken).digest("hex").slice(0, 8);
-        console.debug(`\u2713 Token verification successful (fingerprint: ${tokenFingerprint})`);
+        debugLogger.debug(`\u2713 Token verification successful (fingerprint: ${tokenFingerprint})`);
       } else {
         console.error("Token verification failed: token not found or invalid after save");
       }
@@ -299331,21 +299425,21 @@ ${authUrl}
    * @returns A valid access token or null if not authenticated
    */
   async getValidToken(serverName, config2) {
-    console.debug(`Getting valid token for server: ${serverName}`);
+    debugLogger.debug(`Getting valid token for server: ${serverName}`);
     const credentials = await this.tokenStorage.getCredentials(serverName);
     if (!credentials) {
-      console.debug(`No credentials found for server: ${serverName}`);
+      debugLogger.debug(`No credentials found for server: ${serverName}`);
       return null;
     }
     const { token: token2 } = credentials;
-    console.debug(`Found token for server: ${serverName}, expired: ${this.tokenStorage.isTokenExpired(token2)}`);
+    debugLogger.debug(`Found token for server: ${serverName}, expired: ${this.tokenStorage.isTokenExpired(token2)}`);
     if (!this.tokenStorage.isTokenExpired(token2)) {
-      console.debug(`Returning valid token for server: ${serverName}`);
+      debugLogger.debug(`Returning valid token for server: ${serverName}`);
       return token2.accessToken;
     }
     if (token2.refreshToken && config2.clientId && credentials.tokenUrl) {
       try {
-        console.log(`Refreshing expired token for MCP server: ${serverName}`);
+        debugLogger.log(`Refreshing expired token for MCP server: ${serverName}`);
         const newTokenResponse = await this.refreshAccessToken(config2, token2.refreshToken, credentials.tokenUrl, credentials.mcpServerUrl);
         const newToken = {
           accessToken: newTokenResponse.access_token,
@@ -299512,7 +299606,7 @@ function extractWWWAuthenticateHeader(errorString) {
 }
 async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthenticate) {
   try {
-    console.log(`\u{1F510} '${mcpServerName}' requires OAuth authentication`);
+    debugLogger.log(`\u{1F510} '${mcpServerName}' requires OAuth authentication`);
     let oauthConfig;
     const resourceMetadataUri = OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (resourceMetadataUri) {
@@ -299533,10 +299627,10 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
       scopes: oauthConfig.scopes || []
     };
     const serverUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
-    console.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+    debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
     const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
     await authProvider.authenticate(mcpServerName, oauthAuthConfig, serverUrl);
-    console.log(`OAuth authentication successful for server '${mcpServerName}'`);
+    debugLogger.log(`OAuth authentication successful for server '${mcpServerName}'`);
     return true;
   } catch (error) {
     console.error(`Failed to handle automatic OAuth for server '${mcpServerName}': ${getErrorMessage(error)}`);
@@ -299628,7 +299722,7 @@ async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfi
         if (!isEnabled(funcDecl, mcpServerName, mcpServerConfig)) {
           continue;
         }
-        discoveredTools.push(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? "", funcDecl.parametersJsonSchema ?? { type: "object", properties: {} }, mcpServerConfig.trust, void 0, cliConfig));
+        discoveredTools.push(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? "", funcDecl.parametersJsonSchema ?? { type: "object", properties: {} }, mcpServerConfig.trust, void 0, cliConfig, mcpServerConfig.extension?.id));
       } catch (error) {
         console.error(`Error discovering tool: '${funcDecl.name}' from MCP server '${mcpServerName}': ${error.message}`);
       }
@@ -299745,16 +299839,16 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
             clientId: credentials.clientId
           });
           if (hasStoredTokens) {
-            console.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. Please re-authenticate using: /mcp auth ${mcpServerName}`);
+            debugLogger.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. Please re-authenticate using: /mcp auth ${mcpServerName}`);
           } else {
-            console.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. Please authenticate using: /mcp auth ${mcpServerName}`);
+            debugLogger.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. Please authenticate using: /mcp auth ${mcpServerName}`);
           }
         }
         throw new Error(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. Please authenticate using: /mcp auth ${mcpServerName}`);
       }
       let wwwAuthenticate = extractWWWAuthenticateHeader(errorString);
       if (!wwwAuthenticate && hasNetworkTransport(mcpServerConfig)) {
-        console.log(`No www-authenticate header in error, trying to fetch it from server...`);
+        debugLogger.log(`No www-authenticate header in error, trying to fetch it from server...`);
         try {
           const urlToFetch = mcpServerConfig.httpUrl || mcpServerConfig.url;
           const response = await fetch(urlToFetch, {
@@ -299767,18 +299861,18 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
           if (response.status === 401) {
             wwwAuthenticate = response.headers.get("www-authenticate");
             if (wwwAuthenticate) {
-              console.log(`Found www-authenticate header from server: ${wwwAuthenticate}`);
+              debugLogger.log(`Found www-authenticate header from server: ${wwwAuthenticate}`);
             }
           }
         } catch (fetchError) {
-          console.debug(`Failed to fetch www-authenticate header: ${getErrorMessage(fetchError)}`);
+          debugLogger.debug(`Failed to fetch www-authenticate header: ${getErrorMessage(fetchError)}`);
         }
       }
       if (wwwAuthenticate) {
-        console.log(`Received 401 with www-authenticate header: ${wwwAuthenticate}`);
+        debugLogger.log(`Received 401 with www-authenticate header: ${wwwAuthenticate}`);
         const oauthSuccess = await handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthenticate);
         if (oauthSuccess) {
-          console.log(`Retrying connection to '${mcpServerName}' with OAuth token...`);
+          debugLogger.log(`Retrying connection to '${mcpServerName}' with OAuth token...`);
           const tokenStorage = new MCPOAuthTokenStorage();
           const credentials = await tokenStorage.getCredentials(mcpServerName);
           if (credentials) {
@@ -299827,21 +299921,21 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
               clientId: credentials.clientId
             });
             if (hasStoredTokens) {
-              console.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. Please re-authenticate using: /mcp auth ${mcpServerName}`);
+              debugLogger.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. Please re-authenticate using: /mcp auth ${mcpServerName}`);
             } else {
-              console.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. Please authenticate using: /mcp auth ${mcpServerName}`);
+              debugLogger.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. Please authenticate using: /mcp auth ${mcpServerName}`);
             }
           }
           throw new Error(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. Please authenticate using: /mcp auth ${mcpServerName}`);
         }
-        console.log(`\u{1F50D} Attempting OAuth discovery for '${mcpServerName}'...`);
+        debugLogger.log(`\u{1F50D} Attempting OAuth discovery for '${mcpServerName}'...`);
         if (hasNetworkTransport(mcpServerConfig)) {
           const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url);
           const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
           try {
             const oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
             if (oauthConfig) {
-              console.log(`Discovered OAuth configuration from base URL for server '${mcpServerName}'`);
+              debugLogger.log(`Discovered OAuth configuration from base URL for server '${mcpServerName}'`);
               const oauthAuthConfig = {
                 enabled: true,
                 authorizationUrl: oauthConfig.authorizationUrl,
@@ -299849,7 +299943,7 @@ async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, wor
                 scopes: oauthConfig.scopes || []
               };
               const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
-              console.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+              debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
               const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
               await authProvider.authenticate(mcpServerName, oauthAuthConfig, authServerUrl);
               const tokenStorage = new MCPOAuthTokenStorage();
@@ -299959,7 +300053,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
       });
       if (accessToken) {
         hasOAuthConfig = true;
-        console.log(`Found stored OAuth token for server '${mcpServerName}'`);
+        debugLogger.log(`Found stored OAuth token for server '${mcpServerName}'`);
       }
     }
   }
@@ -300009,7 +300103,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
     if (debugMode) {
       transport.stderr.on("data", (data) => {
         const stderrStr = data.toString().trim();
-        console.debug(`[DEBUG] [MCP STDERR (${mcpServerName})]: `, stderrStr);
+        debugLogger.debug(`[DEBUG] [MCP STDERR (${mcpServerName})]: `, stderrStr);
       });
     }
     return transport;
@@ -300018,7 +300112,7 @@ async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
 }
 function isEnabled(funcDecl, mcpServerName, mcpServerConfig) {
   if (!funcDecl.name) {
-    console.warn(`Discovered a function declaration without a name from MCP server '${mcpServerName}'. Skipping.`);
+    debugLogger.warn(`Discovered a function declaration without a name from MCP server '${mcpServerName}'. Skipping.`);
     return false;
   }
   const { includeTools, excludeTools } = mcpServerConfig;
@@ -300031,21 +300125,11 @@ function isEnabled(funcDecl, mcpServerName, mcpServerConfig) {
 // packages/core/dist/src/tools/mcp-client-manager.js
 var McpClientManager = class {
   clients = /* @__PURE__ */ new Map();
-  mcpServers;
-  mcpServerCommand;
   toolRegistry;
-  promptRegistry;
-  debugMode;
-  workspaceContext;
   discoveryState = MCPDiscoveryState.NOT_STARTED;
   eventEmitter;
-  constructor(mcpServers, mcpServerCommand, toolRegistry, promptRegistry, debugMode, workspaceContext, eventEmitter) {
-    this.mcpServers = mcpServers;
-    this.mcpServerCommand = mcpServerCommand;
+  constructor(toolRegistry, eventEmitter) {
     this.toolRegistry = toolRegistry;
-    this.promptRegistry = promptRegistry;
-    this.debugMode = debugMode;
-    this.workspaceContext = workspaceContext;
     this.eventEmitter = eventEmitter;
   }
   /**
@@ -300058,11 +300142,11 @@ var McpClientManager = class {
       return;
     }
     await this.stop();
-    const servers = populateMcpServerCommand(this.mcpServers, this.mcpServerCommand);
+    const servers = populateMcpServerCommand(cliConfig.getMcpServers() || {}, cliConfig.getMcpServerCommand());
     this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
     this.eventEmitter?.emit("mcp-client-update", this.clients);
-    const discoveryPromises = Object.entries(servers).map(async ([name4, config2]) => {
-      const client = new McpClient(name4, config2, this.toolRegistry, this.promptRegistry, this.workspaceContext, this.debugMode);
+    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 {
@@ -300221,7 +300305,7 @@ var ToolRegistry = class {
   mcpClientManager;
   constructor(config2, eventEmitter) {
     this.config = config2;
-    this.mcpClientManager = new McpClientManager(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this, this.config.getPromptRegistry(), this.config.getDebugMode(), this.config.getWorkspaceContext(), eventEmitter);
+    this.mcpClientManager = new McpClientManager(this, eventEmitter);
   }
   /**
    * Registers a tool definition.
@@ -300232,7 +300316,7 @@ var ToolRegistry = class {
       if (tool instanceof DiscoveredMCPTool) {
         tool = tool.asFullyQualifiedTool();
       } else {
-        console.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
+        debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
       }
     }
     this.tools.set(tool.name, tool);
@@ -300375,7 +300459,7 @@ var ToolRegistry = class {
       }
       for (const func2 of functions) {
         if (!func2.name) {
-          console.warn("Discovered a tool with no name. Skipping.");
+          debugLogger.warn("Discovered a tool with no name. Skipping.");
           continue;
         }
         const parameters = func2.parametersJsonSchema && typeof func2.parametersJsonSchema === "object" && !Array.isArray(func2.parametersJsonSchema) ? func2.parametersJsonSchema : {};
@@ -300477,8 +300561,8 @@ var MEMORY_TOOL_NAME = "save_memory";
 // packages/core/dist/src/tools/ls.js
 var LSToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   /**
@@ -300602,10 +300686,11 @@ ${directoryContent}`;
     }
   }
 };
-var LSTool = class extends BaseDeclarativeTool {
+var LSTool = class _LSTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
-    super(LS_TOOL_NAME, "ReadFolder", "Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.", Kind.Search, {
+  static Name = LS_TOOL_NAME;
+  constructor(config2, messageBus) {
+    super(_LSTool.Name, "ReadFolder", "Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.", Kind.Search, {
       properties: {
         path: {
           description: "The absolute path to the directory to list (must be absolute, not relative)",
@@ -300635,7 +300720,7 @@ var LSTool = class extends BaseDeclarativeTool {
       },
       required: ["path"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   /**
@@ -300654,8 +300739,8 @@ var LSTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new LSToolInvocation(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new LSToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -302163,9 +302248,10 @@ var MemoryToolInvocation = class _MemoryToolInvocation extends BaseToolInvocatio
     }
   }
 };
-var MemoryTool = class extends BaseDeclarativeTool {
+var MemoryTool = class _MemoryTool extends BaseDeclarativeTool {
+  static Name = MEMORY_TOOL_NAME;
   constructor() {
-    super(MEMORY_TOOL_NAME, "Save Memory", memoryToolDescription, Kind.Think, memoryToolSchemaData.parametersJsonSchema);
+    super(_MemoryTool.Name, "Save Memory", memoryToolDescription, Kind.Think, memoryToolSchemaData.parametersJsonSchema);
   }
   validateToolParamValues(params) {
     if (params.fact.trim() === "") {
@@ -302492,14 +302578,14 @@ async function isBinaryFile(filePath) {
     }
     return nonPrintableCount / bytesRead > 0.3;
   } catch (error) {
-    console.warn(`Failed to check if file is binary: ${filePath}`, error instanceof Error ? error.message : String(error));
+    debugLogger.warn(`Failed to check if file is binary: ${filePath}`, error instanceof Error ? error.message : String(error));
     return false;
   } finally {
     if (fh) {
       try {
         await fh.close();
       } catch (closeError) {
-        console.warn(`Failed to close file handle for: ${filePath}`, closeError instanceof Error ? closeError.message : String(closeError));
+        debugLogger.warn(`Failed to close file handle for: ${filePath}`, closeError instanceof Error ? closeError.message : String(closeError));
       }
     }
   }
@@ -302777,8 +302863,8 @@ function getProgrammingLanguage(args2) {
 // packages/core/dist/src/tools/read-file.js
 var ReadFileToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   getDescription() {
@@ -302827,10 +302913,11 @@ ${result.llmContent}`;
     };
   }
 };
-var ReadFileTool = class extends BaseDeclarativeTool {
+var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
-    super(READ_FILE_TOOL_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, {
+  static Name = READ_FILE_TOOL_NAME;
+  constructor(config2, messageBus) {
+    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.",
@@ -302847,7 +302934,7 @@ var ReadFileTool = class extends BaseDeclarativeTool {
       },
       required: ["absolute_path"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   validateToolParamValues(params) {
@@ -302879,8 +302966,8 @@ var ReadFileTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new ReadFileToolInvocation(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new ReadFileToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -308405,29 +308492,12 @@ function isGitRepository(directory) {
   }
 }
 
-// packages/core/dist/src/utils/debugLogger.js
-var DebugLogger = class {
-  log(...args2) {
-    console.log(...args2);
-  }
-  warn(...args2) {
-    console.warn(...args2);
-  }
-  error(...args2) {
-    console.error(...args2);
-  }
-  debug(...args2) {
-    console.debug(...args2);
-  }
-};
-var debugLogger = new DebugLogger();
-
 // packages/core/dist/src/tools/grep.js
 var GrepToolInvocation = class extends BaseToolInvocation {
   config;
   fileExclusions;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
     this.fileExclusions = config2.getFileExclusions();
   }
@@ -308675,10 +308745,10 @@ var GrepToolInvocation = class extends BaseToolInvocation {
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (gitError) {
-          console.debug(`GrepLogic: git grep failed: ${getErrorMessage(gitError)}. Falling back...`);
+          debugLogger.debug(`GrepLogic: git grep failed: ${getErrorMessage(gitError)}. Falling back...`);
         }
       }
-      console.debug("GrepLogic: System grep is being considered as fallback strategy.");
+      debugLogger.debug("GrepLogic: System grep is being considered as fallback strategy.");
       const grepAvailable = await this.isCommandAvailable("grep");
       if (grepAvailable) {
         strategyUsed = "system grep";
@@ -308755,10 +308825,10 @@ var GrepToolInvocation = class extends BaseToolInvocation {
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (grepError) {
-          console.debug(`GrepLogic: System grep failed: ${getErrorMessage(grepError)}. Falling back...`);
+          debugLogger.debug(`GrepLogic: System grep failed: ${getErrorMessage(grepError)}. Falling back...`);
         }
       }
-      console.debug("GrepLogic: Falling back to JavaScript grep implementation.");
+      debugLogger.debug("GrepLogic: Falling back to JavaScript grep implementation.");
       strategyUsed = "javascript fallback";
       const globPattern = include ? include : "**/*";
       const ignorePatterns = this.fileExclusions.getGlobExcludes();
@@ -308788,7 +308858,7 @@ var GrepToolInvocation = class extends BaseToolInvocation {
           });
         } catch (readError) {
           if (!isNodeError(readError) || readError.code !== "ENOENT") {
-            console.debug(`GrepLogic: Could not read/process ${fileAbsolutePath}: ${getErrorMessage(readError)}`);
+            debugLogger.debug(`GrepLogic: Could not read/process ${fileAbsolutePath}: ${getErrorMessage(readError)}`);
           }
         }
       }
@@ -308799,10 +308869,11 @@ var GrepToolInvocation = class extends BaseToolInvocation {
     }
   }
 };
-var GrepTool = class extends BaseDeclarativeTool {
+var GrepTool = class _GrepTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
-    super(GREP_TOOL_NAME, "SearchText", "Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.", Kind.Search, {
+  static Name = GREP_TOOL_NAME;
+  constructor(config2, messageBus) {
+    super(_GrepTool.Name, "SearchText", "Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.", Kind.Search, {
       properties: {
         pattern: {
           description: "The regular expression (regex) pattern to search for within file contents (e.g., 'function\\s+myFunction', 'import\\s+\\{.*\\}\\s+from\\s+.*').",
@@ -308819,7 +308890,7 @@ var GrepTool = class extends BaseDeclarativeTool {
       },
       required: ["pattern"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   /**
@@ -308871,8 +308942,8 @@ var GrepTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new GrepToolInvocation(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new GrepToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -321844,26 +321915,51 @@ var rgPath = join9(__dirname4, "..", "bin", `rg${process.platform === "win32" ?
 
 // packages/core/dist/src/tools/ripGrep.js
 var DEFAULT_TOTAL_MAX_MATCHES = 2e4;
-function getRgPath() {
-  return path34.join(Storage2.getGlobalBinDir(), "rg");
+function getRgCandidateFilenames() {
+  return process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
 }
-async function canUseRipgrep() {
-  if (await fileExists(getRgPath())) {
-    return true;
+async function resolveExistingRgPath() {
+  const binDir = Storage2.getGlobalBinDir();
+  for (const fileName of getRgCandidateFilenames()) {
+    const candidatePath = path34.join(binDir, fileName);
+    if (await fileExists(candidatePath)) {
+      return candidatePath;
+    }
+  }
+  return null;
+}
+var ripgrepAcquisitionPromise = null;
+async function ensureRipgrepAvailable() {
+  const existingPath = await resolveExistingRgPath();
+  if (existingPath) {
+    return existingPath;
+  }
+  if (!ripgrepAcquisitionPromise) {
+    ripgrepAcquisitionPromise = (async () => {
+      try {
+        await downloadRipGrep(Storage2.getGlobalBinDir());
+        return await resolveExistingRgPath();
+      } finally {
+        ripgrepAcquisitionPromise = null;
+      }
+    })();
   }
-  await downloadRipGrep(Storage2.getGlobalBinDir());
-  return await fileExists(getRgPath());
+  return ripgrepAcquisitionPromise;
+}
+async function canUseRipgrep() {
+  return await ensureRipgrepAvailable() !== null;
 }
 async function ensureRgPath() {
-  if (await canUseRipgrep()) {
-    return getRgPath();
+  const downloadedPath = await ensureRipgrepAvailable();
+  if (downloadedPath) {
+    return downloadedPath;
   }
   throw new Error("Cannot use ripgrep.");
 }
 var GrepToolInvocation2 = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   /**
@@ -321909,7 +322005,7 @@ var GrepToolInvocation2 = class extends BaseToolInvocation {
       let allMatches = [];
       const totalMaxMatches = DEFAULT_TOTAL_MAX_MATCHES;
       if (this.config.getDebugMode()) {
-        console.log(`[GrepTool] Total result limit: ${totalMaxMatches}`);
+        debugLogger.log(`[GrepTool] Total result limit: ${totalMaxMatches}`);
       }
       for (const searchDir of searchDirectories) {
         const searchResult = await this.performRipgrepSearch({
@@ -322112,27 +322208,39 @@ var GrepToolInvocation2 = class extends BaseToolInvocation {
     return description;
   }
 };
-var RipGrepTool = class extends BaseDeclarativeTool {
+var RipGrepTool = class _RipGrepTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
-    super(GREP_TOOL_NAME, "SearchText", "Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers. Total results limited to 20,000 matches like VSCode.", Kind.Search, {
-      properties: {
-        pattern: {
-          description: "The regular expression (regex) pattern to search for within file contents (e.g., 'function\\s+myFunction', 'import\\s+\\{.*\\}\\s+from\\s+.*').",
-          type: "string"
-        },
-        path: {
-          description: "Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.",
-          type: "string"
+  static Name = GREP_TOOL_NAME;
+  constructor(config2, messageBus) {
+    super(
+      _RipGrepTool.Name,
+      "SearchText",
+      "Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers. Total results limited to 20,000 matches like VSCode.",
+      Kind.Search,
+      {
+        properties: {
+          pattern: {
+            description: "The regular expression (regex) pattern to search for within file contents (e.g., 'function\\s+myFunction', 'import\\s+\\{.*\\}\\s+from\\s+.*').",
+            type: "string"
+          },
+          path: {
+            description: "Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.",
+            type: "string"
+          },
+          include: {
+            description: "Optional: A glob pattern to filter which files are searched (e.g., '*.js', '*.{ts,tsx}', 'src/**'). If omitted, searches all files (respecting potential global ignores).",
+            type: "string"
+          }
         },
-        include: {
-          description: "Optional: A glob pattern to filter which files are searched (e.g., '*.js', '*.{ts,tsx}', 'src/**'). If omitted, searches all files (respecting potential global ignores).",
-          type: "string"
-        }
+        required: ["pattern"],
+        type: "object"
       },
-      required: ["pattern"],
-      type: "object"
-    });
+      true,
+      // isOutputMarkdown
+      false,
+      // canUpdateOutput
+      messageBus
+    );
     this.config = config2;
   }
   /**
@@ -322183,8 +322291,8 @@ var RipGrepTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new GrepToolInvocation2(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new GrepToolInvocation2(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -322212,8 +322320,8 @@ function sortFileEntries(entries2, nowTimestamp, recencyThresholdMs) {
 }
 var GlobToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   getDescription() {
@@ -322332,10 +322440,11 @@ ${fileListDescription}`;
     }
   }
 };
-var GlobTool = class extends BaseDeclarativeTool {
+var GlobTool = class _GlobTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
-    super(GLOB_TOOL_NAME, "FindFiles", "Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.", Kind.Search, {
+  static Name = GLOB_TOOL_NAME;
+  constructor(config2, messageBus) {
+    super(_GlobTool.Name, "FindFiles", "Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.", Kind.Search, {
       properties: {
         pattern: {
           description: "The glob pattern to match against (e.g., '**/*.py', 'docs/*.md').",
@@ -322360,7 +322469,7 @@ var GlobTool = class extends BaseDeclarativeTool {
       },
       required: ["pattern"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   /**
@@ -322389,8 +322498,8 @@ var GlobTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new GlobToolInvocation(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new GlobToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -323290,7 +323399,7 @@ import * as os10 from "node:os";
 import * as path37 from "node:path";
 var logger2 = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args2) => console.debug("[DEBUG] [IDEClient]", ...args2),
+  debug: (...args2) => debugLogger.debug("[DEBUG] [IDEClient]", ...args2),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: (...args2) => console.error("[ERROR] [IDEClient]", ...args2)
 };
@@ -324009,11 +324118,11 @@ var EditToolInvocation = class {
         throw error;
       }
       const errorMsg = error instanceof Error ? error.message : String(error);
-      console.log(`Error preparing edit: ${errorMsg}`);
+      debugLogger.log(`Error preparing edit: ${errorMsg}`);
       return false;
     }
     if (editData.error) {
-      console.log(`Error: ${editData.error.display}`);
+      debugLogger.log(`Error: ${editData.error.display}`);
       return false;
     }
     const fileName = path38.basename(this.params.file_path);
@@ -324148,10 +324257,11 @@ var EditToolInvocation = class {
     }
   }
 };
-var EditTool = class extends BaseDeclarativeTool {
+var EditTool = class _EditTool extends BaseDeclarativeTool {
   config;
+  static Name = EDIT_TOOL_NAME;
   constructor(config2) {
-    super(EDIT_TOOL_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.
+    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.
 
@@ -324333,47 +324443,42 @@ function getDiffCommand(oldPath, newPath, editor) {
 async function openDiff(oldPath, newPath, editor, onEditorClose) {
   const diffCommand = getDiffCommand(oldPath, newPath, editor);
   if (!diffCommand) {
-    console.error("No diff tool available. Install a supported editor.");
+    debugLogger.error("No diff tool available. Install a supported editor.");
     return;
   }
-  try {
-    const isTerminalEditor = ["vim", "emacs", "neovim"].includes(editor);
-    if (isTerminalEditor) {
-      try {
-        const result = spawnSync2(diffCommand.command, diffCommand.args, {
-          stdio: "inherit"
-        });
-        if (result.error) {
-          throw result.error;
-        }
-        if (result.status !== 0) {
-          throw new Error(`${editor} exited with code ${result.status}`);
-        }
-      } finally {
-        onEditorClose();
+  const isTerminalEditor = ["vim", "emacs", "neovim"].includes(editor);
+  if (isTerminalEditor) {
+    try {
+      const result = spawnSync2(diffCommand.command, diffCommand.args, {
+        stdio: "inherit"
+      });
+      if (result.error) {
+        throw result.error;
       }
-      return;
+      if (result.status !== 0) {
+        throw new Error(`${editor} exited with code ${result.status}`);
+      }
+    } finally {
+      onEditorClose();
     }
-    return new Promise((resolve13, reject) => {
-      const childProcess2 = spawn6(diffCommand.command, diffCommand.args, {
-        stdio: "inherit",
-        shell: process.platform === "win32"
-      });
-      childProcess2.on("close", (code2) => {
-        if (code2 === 0) {
-          resolve13();
-        } else {
-          reject(new Error(`${editor} exited with code ${code2}`));
-        }
-      });
-      childProcess2.on("error", (error) => {
-        reject(error);
-      });
-    });
-  } catch (error) {
-    console.error(error);
-    throw error;
+    return;
   }
+  return new Promise((resolve13, reject) => {
+    const childProcess2 = spawn6(diffCommand.command, diffCommand.args, {
+      stdio: "inherit",
+      shell: process.platform === "win32"
+    });
+    childProcess2.on("close", (code2) => {
+      if (code2 === 0) {
+        resolve13();
+      } else {
+        reject(new Error(`${editor} exited with code ${code2}`));
+      }
+    });
+    childProcess2.on("error", (error) => {
+      reject(error);
+    });
+  });
 }
 
 // packages/core/dist/src/tools/modifiable-tool.js
@@ -324656,7 +324761,7 @@ async function retryWithBackoff(fn, options2) {
             throw error;
           }
         } catch (fallbackError) {
-          console.warn("Fallback to Flash model failed:", fallbackError);
+          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
         }
       }
       if (errorStatus === 429 && authType === AuthType2.LOGIN_WITH_GOOGLE && !isProQuotaExceededError(error) && isGenericQuotaExceededError(error) && onPersistent429) {
@@ -324671,7 +324776,7 @@ async function retryWithBackoff(fn, options2) {
             throw error;
           }
         } catch (fallbackError) {
-          console.warn("Fallback to Flash model failed:", fallbackError);
+          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
         }
       }
       if (errorStatus === 429) {
@@ -324691,7 +324796,7 @@ async function retryWithBackoff(fn, options2) {
             throw error;
           }
         } catch (fallbackError) {
-          console.warn("Fallback to Flash model failed:", fallbackError);
+          debugLogger.warn("Fallback to Flash model failed:", fallbackError);
         }
       }
       if (attempt >= maxAttempts || !shouldRetryOnError(error, retryFetchErrors)) {
@@ -324699,7 +324804,7 @@ async function retryWithBackoff(fn, options2) {
       }
       const { delayDurationMs, errorStatus: delayErrorStatus } = getDelayDurationAndStatus(error);
       if (delayDurationMs > 0) {
-        console.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? "unknown"}. Retrying after explicit delay of ${delayDurationMs}ms...`, error);
+        debugLogger.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? "unknown"}. Retrying after explicit delay of ${delayDurationMs}ms...`, error);
         await delay2(delayDurationMs, signal);
         currentDelay = initialDelayMs;
       } else {
@@ -324763,19 +324868,19 @@ function logRetryAttempt(attempt, error, errorStatus) {
     message = `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`;
   }
   if (errorStatus === 429) {
-    console.warn(message, error);
+    debugLogger.warn(message, error);
   } else if (errorStatus && errorStatus >= 500 && errorStatus < 600) {
     console.error(message, error);
   } else if (error instanceof Error) {
     if (error.message.includes("429")) {
-      console.warn(`Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`, error);
+      debugLogger.warn(`Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`, error);
     } else if (error.message.match(/5\d{2}/)) {
       console.error(`Attempt ${attempt} failed with 5xx error. Retrying with backoff...`, error);
     } else {
-      console.warn(message, error);
+      debugLogger.warn(message, error);
     }
   } else {
-    console.warn(message, error);
+    debugLogger.warn(message, error);
   }
 }
 
@@ -324939,7 +325044,7 @@ async function FixLLMEditWithInstruction(instruction, old_string, new_string, er
   let promptId = promptIdContext.getStore();
   if (!promptId) {
     promptId = `llm-fixer-fallback-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-    console.warn(`Could not find promptId in context. This is unexpected. Using a fallback ID: ${promptId}`);
+    debugLogger.warn(`Could not find promptId in context. This is unexpected. Using a fallback ID: ${promptId}`);
   }
   const cacheKey = createHash8("sha256").update(JSON.stringify([
     current_content,
@@ -325356,11 +325461,11 @@ var EditToolInvocation2 = class {
         throw error;
       }
       const errorMsg = error instanceof Error ? error.message : String(error);
-      console.log(`Error preparing edit: ${errorMsg}`);
+      debugLogger.log(`Error preparing edit: ${errorMsg}`);
       return false;
     }
     if (editData.error) {
-      console.log(`Error: ${editData.error.display}`);
+      debugLogger.log(`Error: ${editData.error.display}`);
       return false;
     }
     const fileName = path42.basename(this.params.file_path);
@@ -325499,10 +325604,11 @@ var EditToolInvocation2 = class {
     }
   }
 };
-var SmartEditTool = class extends BaseDeclarativeTool {
+var SmartEditTool = class _SmartEditTool extends BaseDeclarativeTool {
   config;
+  static Name = EDIT_TOOL_NAME;
   constructor(config2) {
-    super(EDIT_TOOL_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.
+    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.
       
@@ -325714,7 +325820,7 @@ function getSystemEncoding() {
       }
       throw new Error(`Unable to parse Windows code page from 'chcp' output "${output.trim()}". `);
     } catch (error) {
-      console.warn(`Failed to get Windows code page using 'chcp' command: ${error instanceof Error ? error.message : String(error)}. Will attempt to detect encoding from command output instead.`);
+      debugLogger.warn(`Failed to get Windows code page using 'chcp' command: ${error instanceof Error ? error.message : String(error)}. Will attempt to detect encoding from command output instead.`);
     }
     return null;
   }
@@ -325724,7 +325830,7 @@ function getSystemEncoding() {
     try {
       locale = execSync2("locale charmap", { encoding: "utf8" }).toString().trim();
     } catch (_e) {
-      console.warn("Failed to get locale charmap.");
+      debugLogger.warn("Failed to get locale charmap.");
       return null;
     }
   }
@@ -325764,7 +325870,7 @@ function windowsCodePageToEncoding(cp) {
   if (map2[cp]) {
     return map2[cp];
   }
-  console.warn(`Unable to determine encoding for windows code page ${cp}.`);
+  debugLogger.warn(`Unable to determine encoding for windows code page ${cp}.`);
   return null;
 }
 function detectEncodingFromBuffer(buffer) {
@@ -325774,7 +325880,7 @@ function detectEncodingFromBuffer(buffer) {
       return detected.toLowerCase();
     }
   } catch (error) {
-    console.warn("Failed to detect encoding with chardet:", error);
+    debugLogger.warn("Failed to detect encoding with chardet:", error);
   }
   return null;
 }
@@ -330197,6 +330303,37 @@ function isCommandAllowed(command, config2) {
   }
   return { allowed: false, reason: blockReason };
 }
+function isShellInvocationAllowlisted(invocation, allowedPatterns) {
+  if (!allowedPatterns.length) {
+    return false;
+  }
+  const hasShellWildcard = allowedPatterns.some((pattern) => SHELL_TOOL_NAMES.includes(pattern));
+  const hasShellSpecificPattern = allowedPatterns.some((pattern) => SHELL_TOOL_NAMES.some((name4) => pattern.startsWith(`${name4}(`)));
+  if (!hasShellWildcard && !hasShellSpecificPattern) {
+    return false;
+  }
+  if (hasShellWildcard) {
+    return true;
+  }
+  if (!("params" in invocation) || typeof invocation.params !== "object" || invocation.params === null || !("command" in invocation.params)) {
+    return false;
+  }
+  const commandValue = invocation.params.command;
+  if (typeof commandValue !== "string" || !commandValue.trim()) {
+    return false;
+  }
+  const command = commandValue.trim();
+  const parseResult = parseCommandDetails(command);
+  if (!parseResult || parseResult.hasError) {
+    return false;
+  }
+  const normalize5 = (cmd) => cmd.trim().replace(/\s+/g, " ");
+  const commandsToValidate = parseResult.details.map((detail) => normalize5(detail.text)).filter(Boolean);
+  if (commandsToValidate.length === 0) {
+    return false;
+  }
+  return commandsToValidate.every((commandSegment) => doesToolInvocationMatch(SHELL_TOOL_NAMES[0], { params: { command: commandSegment } }, allowedPatterns));
+}
 
 // packages/core/dist/src/services/shellExecutionService.js
 var import_headless = __toESM(require_xterm_headless(), 1);
@@ -331063,19 +331200,27 @@ var ShellExecutionService = class {
       return { pid: ptyProcess.pid, result };
     } catch (e2) {
       const error = e2;
-      return {
-        pid: void 0,
-        result: Promise.resolve({
-          error,
-          rawOutput: Buffer.from(""),
-          output: "",
-          exitCode: 1,
-          signal: null,
-          aborted: false,
+      if (error.message.includes("posix_spawnp failed")) {
+        onOutputEvent({
+          type: "data",
+          chunk: "[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n"
+        });
+        throw e2;
+      } else {
+        return {
           pid: void 0,
-          executionMethod: "none"
-        })
-      };
+          result: Promise.resolve({
+            error,
+            rawOutput: Buffer.from(""),
+            output: "",
+            exitCode: 1,
+            signal: null,
+            aborted: false,
+            pid: void 0,
+            executionMethod: "none"
+          })
+        };
+      }
     }
   }
   /**
@@ -331117,7 +331262,7 @@ var ShellExecutionService = class {
         activePty.ptyProcess.resize(cols, rows);
         activePty.headlessTerminal.resize(cols, rows);
       } catch (e2) {
-        if (e2 instanceof Error && "code" in e2 && e2.code === "ESRCH") {
+        if (e2 instanceof Error && ("code" in e2 && e2.code === "ESRCH" || e2.message === "Cannot resize a pty that has already exited")) {
         } else {
           throw e2;
         }
@@ -331372,14 +331517,15 @@ function getCommandDescription() {
     return "Exact bash command to execute as `bash -c <command>`";
   }
 }
-var ShellTool = class extends BaseDeclarativeTool {
+var ShellTool = class _ShellTool extends BaseDeclarativeTool {
   config;
+  static Name = SHELL_TOOL_NAME;
   allowlist = /* @__PURE__ */ new Set();
   constructor(config2) {
     void initializeShellParsers().catch(() => {
     });
     super(
-      SHELL_TOOL_NAME,
+      _ShellTool.Name,
       "Shell",
       getShellToolDescription(),
       Kind.Execute,
@@ -331619,10 +331765,11 @@ var WriteFileToolInvocation = class extends BaseToolInvocation {
     }
   }
 };
-var WriteFileTool = class extends BaseDeclarativeTool {
+var WriteFileTool = class _WriteFileTool extends BaseDeclarativeTool {
   config;
+  static Name = WRITE_FILE_TOOL_NAME;
   constructor(config2) {
-    super(WRITE_FILE_TOOL_NAME, "WriteFile", `Writes content to a specified file in the local filesystem.
+    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, {
       properties: {
@@ -331693,6 +331840,7 @@ var WriteFileTool = class extends BaseDeclarativeTool {
 };
 
 // packages/core/dist/src/utils/fetch.js
+var import_undici2 = __toESM(require_undici(), 1);
 import { URL as URL8 } from "node:url";
 var PRIVATE_IP_RANGES = [
   /^10\./,
@@ -331734,6 +331882,13 @@ async function fetchWithTimeout(url4, timeout) {
     clearTimeout(timeoutId);
   }
 }
+function setGlobalProxy(proxy2) {
+  try {
+    (0, import_undici2.setGlobalDispatcher)(new import_undici2.ProxyAgent(proxy2));
+  } catch (e2) {
+    console.error(`Failed to set proxy: ${getErrorMessage(e2)}`);
+  }
+}
 
 // node_modules/domelementtype/lib/esm/index.js
 var ElementType;
@@ -336674,7 +336829,6 @@ function handleDeprecatedOptions(options2) {
 }
 
 // packages/core/dist/src/tools/web-fetch.js
-var import_undici2 = __toESM(require_undici(), 1);
 var URL_FETCH_TIMEOUT_MS = 1e4;
 var MAX_CONTENT_LENGTH = 1e5;
 function parsePrompt(text) {
@@ -336701,8 +336855,8 @@ function parsePrompt(text) {
 }
 var WebFetchToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params, messageBus) {
-    super(params, messageBus);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   async executeFallback(signal) {
@@ -336814,7 +336968,7 @@ ${textContent2}
         // Pass signal
         DEFAULT_GEMINI_FLASH_MODEL
       );
-      console.debug(`[WebFetchTool] Full response for prompt "${userPrompt.substring(0, 50)}...":`, JSON.stringify(response, null, 2));
+      debugLogger.debug(`[WebFetchTool] Full response for prompt "${userPrompt.substring(0, 50)}...":`, JSON.stringify(response, null, 2));
       let responseText = getResponseText(response) || "";
       const urlContextMeta = response.candidates?.[0]?.urlContextMetadata;
       const groundingMetadata = response.candidates?.[0]?.groundingMetadata;
@@ -336869,7 +337023,7 @@ ${sourceListFormatted.join("\n")}`;
         }
       }
       const llmContent = responseText;
-      console.debug(`[WebFetchTool] Formatted tool response for prompt "${userPrompt}:
+      debugLogger.debug(`[WebFetchTool] Formatted tool response for prompt "${userPrompt}:
 
 ":`, llmContent);
       return {
@@ -336889,11 +337043,12 @@ ${sourceListFormatted.join("\n")}`;
     }
   }
 };
-var WebFetchTool = class extends BaseDeclarativeTool {
+var WebFetchTool = class _WebFetchTool extends BaseDeclarativeTool {
   config;
+  static Name = WEB_FETCH_TOOL_NAME;
   constructor(config2, messageBus) {
     super(
-      WEB_FETCH_TOOL_NAME,
+      _WebFetchTool.Name,
       "WebFetch",
       "Processes content from URL(s), including local and private network addresses (e.g., localhost), embedded in a prompt. Include up to 20 URLs and instructions (e.g., summarize, extract specific data) directly in the 'prompt' parameter.",
       Kind.Fetch,
@@ -336916,7 +337071,7 @@ var WebFetchTool = class extends BaseDeclarativeTool {
     this.config = config2;
     const proxy2 = config2.getProxy();
     if (proxy2) {
-      (0, import_undici2.setGlobalDispatcher)(new import_undici2.ProxyAgent(proxy2));
+      setGlobalProxy(proxy2);
     }
   }
   validateToolParamValues(params) {
@@ -336933,8 +337088,8 @@ var WebFetchTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params, messageBus) {
-    return new WebFetchToolInvocation(this.config, params, messageBus);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new WebFetchToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -336948,8 +337103,8 @@ var DEFAULT_OUTPUT_SEPARATOR_FORMAT = "--- {filePath} ---";
 var DEFAULT_OUTPUT_TERMINATOR = "\n--- End of content ---";
 var ReadManyFilesToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   getDescription() {
@@ -337200,9 +337355,10 @@ ${fileContentForLlm}
     };
   }
 };
-var ReadManyFilesTool = class extends BaseDeclarativeTool {
+var ReadManyFilesTool = class _ReadManyFilesTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
+  static Name = READ_MANY_FILES_TOOL_NAME;
+  constructor(config2, messageBus) {
     const parameterSchema = {
       type: "object",
       properties: {
@@ -337260,7 +337416,10 @@ var ReadManyFilesTool = class extends BaseDeclarativeTool {
       },
       required: ["paths"]
     };
-    super(READ_MANY_FILES_TOOL_NAME, "ReadManyFiles", `Reads content from multiple files specified by paths or glob patterns within a configured target directory. For text files, it concatenates their content into a single string. It is primarily designed for text-based files. However, it can also process image (e.g., .png, .jpg) and PDF (.pdf) files if their file names or extensions are explicitly included in the 'paths' argument. For these explicitly requested non-text files, their data is read and included in a format suitable for model consumption (e.g., base64 encoded).
+    super(
+      _ReadManyFilesTool.Name,
+      "ReadManyFiles",
+      `Reads content from multiple files specified by paths or glob patterns within a configured target directory. For text files, it concatenates their content into a single string. It is primarily designed for text-based files. However, it can also process image (e.g., .png, .jpg) and PDF (.pdf) files if their file names or extensions are explicitly included in the 'paths' argument. For these explicitly requested non-text files, their data is read and included in a format suitable for model consumption (e.g., base64 encoded).
 
 This tool is useful when you need to understand or analyze a collection of files, such as:
 - Getting an overview of a codebase or parts of it (e.g., all TypeScript files in the 'src' directory).
@@ -337269,19 +337428,27 @@ This tool is useful when you need to understand or analyze a collection of files
 - Gathering context from multiple configuration files.
 - When the user asks to "read all files in X directory" or "show me the content of all Y files".
 
-Use this tool when the user's query implies needing the content of several files simultaneously for context, analysis, or summarization. For text files, it uses default UTF-8 encoding and a '--- {filePath} ---' separator between file contents. The tool inserts a '--- End of content ---' after the last file. Ensure paths are relative to the target directory. Glob patterns like 'src/**/*.js' are supported. Avoid using for single files if a more specific single-file reading tool is available, unless the user specifically requests to process a list containing just one file via this tool. Other binary files (not explicitly requested as image/PDF) are generally skipped. Default excludes apply to common non-text files (except for explicitly requested images/PDFs) and large dependency directories unless 'useDefaultExcludes' is false.`, Kind.Read, parameterSchema);
+Use this tool when the user's query implies needing the content of several files simultaneously for context, analysis, or summarization. For text files, it uses default UTF-8 encoding and a '--- {filePath} ---' separator between file contents. The tool inserts a '--- End of content ---' after the last file. Ensure paths are relative to the target directory. Glob patterns like 'src/**/*.js' are supported. Avoid using for single files if a more specific single-file reading tool is available, unless the user specifically requests to process a list containing just one file via this tool. Other binary files (not explicitly requested as image/PDF) are generally skipped. Default excludes apply to common non-text files (except for explicitly requested images/PDFs) and large dependency directories unless 'useDefaultExcludes' is false.`,
+      Kind.Read,
+      parameterSchema,
+      true,
+      // isOutputMarkdown
+      false,
+      // canUpdateOutput
+      messageBus
+    );
     this.config = config2;
   }
-  createInvocation(params) {
-    return new ReadManyFilesToolInvocation(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new ReadManyFilesToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
 // packages/core/dist/src/tools/web-search.js
 var WebSearchToolInvocation = class extends BaseToolInvocation {
   config;
-  constructor(config2, params) {
-    super(params);
+  constructor(config2, params, messageBus, _toolName, _toolDisplayName) {
+    super(params, messageBus, _toolName, _toolDisplayName);
     this.config = config2;
   }
   getDescription() {
@@ -337366,19 +337533,31 @@ ${modifiedResponseText}`,
     }
   }
 };
-var WebSearchTool = class extends BaseDeclarativeTool {
+var WebSearchTool = class _WebSearchTool extends BaseDeclarativeTool {
   config;
-  constructor(config2) {
-    super(WEB_SEARCH_TOOL_NAME, "GoogleSearch", "Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.", Kind.Search, {
-      type: "object",
-      properties: {
-        query: {
-          type: "string",
-          description: "The search query to find information on the web."
-        }
+  static Name = WEB_SEARCH_TOOL_NAME;
+  constructor(config2, messageBus) {
+    super(
+      _WebSearchTool.Name,
+      "GoogleSearch",
+      "Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.",
+      Kind.Search,
+      {
+        type: "object",
+        properties: {
+          query: {
+            type: "string",
+            description: "The search query to find information on the web."
+          }
+        },
+        required: ["query"]
       },
-      required: ["query"]
-    });
+      true,
+      // isOutputMarkdown
+      false,
+      // canUpdateOutput
+      messageBus
+    );
     this.config = config2;
   }
   /**
@@ -337392,8 +337571,8 @@ var WebSearchTool = class extends BaseDeclarativeTool {
     }
     return null;
   }
-  createInvocation(params) {
-    return new WebSearchToolInvocation(this.config, params);
+  createInvocation(params, messageBus, _toolName, _toolDisplayName) {
+    return new WebSearchToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 };
 
@@ -337433,7 +337612,7 @@ async function readFullStructure(rootPath, options2) {
       entries2 = rawEntries.sort((a2, b) => a2.name.localeCompare(b.name));
     } catch (error) {
       if (isNodeError(error) && (error.code === "EACCES" || error.code === "ENOENT")) {
-        console.warn(`Warning: Could not read directory ${currentPath}: ${error.message}`);
+        debugLogger.warn(`Warning: Could not read directory ${currentPath}: ${error.message}`);
         if (currentPath === rootPath && error.code === "ENOENT") {
           return null;
         }
@@ -338026,7 +338205,8 @@ var CoreToolScheduler = class {
         if (toolCall.status !== "validating") {
           continue;
         }
-        const { request: reqInfo, invocation } = toolCall;
+        const validatingCall = toolCall;
+        const { request: reqInfo, invocation } = validatingCall;
         try {
           if (signal.aborted) {
             this.setStatusInternal(reqInfo.callId, "cancelled", "Tool call cancelled by user.");
@@ -338038,8 +338218,7 @@ var CoreToolScheduler = class {
             this.setStatusInternal(reqInfo.callId, "scheduled");
             continue;
           }
-          const allowedTools = this.config.getAllowedTools() || [];
-          if (this.config.getApprovalMode() === ApprovalMode.YOLO || doesToolInvocationMatch(toolCall.tool, invocation, allowedTools)) {
+          if (this.isAutoApproved(validatingCall)) {
             this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
             this.setStatusInternal(reqInfo.callId, "scheduled");
           } else {
@@ -338265,6 +338444,18 @@ var CoreToolScheduler = class {
       // Use legacy UI confirmation
     });
   }
+  isAutoApproved(toolCall) {
+    if (this.config.getApprovalMode() === ApprovalMode.YOLO) {
+      return true;
+    }
+    const allowedTools = this.config.getAllowedTools() || [];
+    const { tool, invocation } = toolCall;
+    const toolName = typeof tool === "string" ? tool : tool.name;
+    if (SHELL_TOOL_NAMES.includes(toolName)) {
+      return isShellInvocationAllowlisted(invocation, allowedTools);
+    }
+    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) {
@@ -339064,18 +339255,20 @@ var Turn = class {
         if (!resp)
           continue;
         this.debugResponses.push(resp);
+        const traceId = resp.responseId;
         const thoughtPart = resp.candidates?.[0]?.content?.parts?.[0];
         if (thoughtPart?.thought) {
           const thought = parseThought(thoughtPart.text ?? "");
           yield {
             type: GeminiEventType.Thought,
-            value: thought
+            value: thought,
+            traceId
           };
           continue;
         }
         const text = getResponseText(resp);
         if (text) {
-          yield { type: GeminiEventType.Content, value: text };
+          yield { type: GeminiEventType.Content, value: text, traceId };
         }
         const functionCalls = resp.functionCalls ?? [];
         for (const fnCall of functionCalls) {
@@ -339306,7 +339499,7 @@ function resolvePathFromEnv(envVar) {
         customPath = path49.join(home, customPath.slice(2));
       }
     } catch (error) {
-      console.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error);
+      debugLogger.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error);
       return { isSwitch: false, value: null, isDisabled: false };
     }
   }
@@ -339623,7 +339816,7 @@ async function checkNextSpeaker(chat, baseLlmClient, abortSignal, promptId) {
     }
     return null;
   } catch (error) {
-    console.warn("Failed to talk to Gemini endpoint when seeing if conversation should continue.", error);
+    debugLogger.warn("Failed to talk to Gemini endpoint when seeing if conversation should continue.", error);
     return null;
   }
 }
@@ -339914,13 +340107,13 @@ var LoopDetectionService = class {
         promptId: this.promptId
       });
     } catch (e2) {
-      this.config.getDebugMode() ? console.error(e2) : console.debug(e2);
+      this.config.getDebugMode() ? console.error(e2) : debugLogger.debug(e2);
       return false;
     }
     if (typeof result["confidence"] === "number") {
       if (result["confidence"] > 0.9) {
         if (typeof result["reasoning"] === "string" && result["reasoning"]) {
-          console.warn(result["reasoning"]);
+          debugLogger.warn(result["reasoning"]);
         }
         logLoopDetected(this.config, new LoopDetectedEvent(LoopType.LLM_DETECTED_LOOP, this.promptId));
         return true;
@@ -340148,7 +340341,7 @@ My setup is complete. I will provide my first command in the next turn.
         "```"
       ];
       if (this.config.getDebugMode()) {
-        console.log(contextParts.join("\n"));
+        debugLogger.log(contextParts.join("\n"));
       }
       return {
         contextParts,
@@ -340231,7 +340424,7 @@ My setup is complete. I will provide my first command in the next turn.
         "```"
       ];
       if (this.config.getDebugMode()) {
-        console.log(contextParts.join("\n"));
+        debugLogger.log(contextParts.join("\n"));
       }
       return {
         contextParts,
@@ -340508,7 +340701,7 @@ var GitIgnoreParser = class {
     }
     const isExcludeFile = patternsFilePath.endsWith(path50.join(".git", "info", "exclude"));
     const relativeBaseDir = isExcludeFile ? "." : path50.dirname(path50.relative(this.projectRoot, patternsFilePath)).split(path50.sep).join(path50.posix.sep);
-    return content.split("\n").map((p) => p.trim()).filter((p) => p !== "" && !p.startsWith("#")).map((p) => {
+    return content.split("\n").map((p) => p.trimStart()).filter((p) => p !== "" && !p.startsWith("#")).map((p) => {
       const isNegative = p.startsWith("!");
       if (isNegative) {
         p = p.substring(1);
@@ -345389,6 +345582,12 @@ function shouldAttemptBrowserLaunch() {
 }
 
 // packages/core/dist/src/tools/write-todos.js
+var TODO_STATUSES = [
+  "pending",
+  "in_progress",
+  "completed",
+  "cancelled"
+];
 var WRITE_TODOS_DESCRIPTION = `This tool can help you list out the current subtasks that are required to be completed for a given user request. The list of subtasks helps you keep track of the current task, organize complex queries and help ensure that you don't miss any steps. With this list, the user can also see the current progress you are making in executing a given task.
 
 Depending on the task complexity, you should first divide a given task into subtasks and then use this tool to list out the subtasks that are required to be completed for a given user request.
@@ -345472,9 +345671,10 @@ ${todoListString}` : "Successfully cleared the todo list.";
     };
   }
 };
-var WriteTodosTool = class extends BaseDeclarativeTool {
+var WriteTodosTool = class _WriteTodosTool extends BaseDeclarativeTool {
+  static Name = WRITE_TODOS_TOOL_NAME;
   constructor() {
-    super(WRITE_TODOS_TOOL_NAME, "Write Todos", WRITE_TODOS_DESCRIPTION, Kind.Other, {
+    super(_WriteTodosTool.Name, "Write Todos", WRITE_TODOS_DESCRIPTION, Kind.Other, {
       type: "object",
       properties: {
         todos: {
@@ -345491,7 +345691,7 @@ var WriteTodosTool = class extends BaseDeclarativeTool {
               status: {
                 type: "string",
                 description: "The current status of the task.",
-                enum: ["pending", "in_progress", "completed"]
+                enum: TODO_STATUSES
               }
             },
             required: ["description", "status"]
@@ -345513,8 +345713,8 @@ var WriteTodosTool = class extends BaseDeclarativeTool {
       if (typeof todo.description !== "string" || !todo.description.trim()) {
         return "Each todo must have a non-empty description string";
       }
-      if (!["pending", "in_progress", "completed"].includes(todo.status)) {
-        return "Each todo must have a valid status (pending, in_progress, or completed)";
+      if (!TODO_STATUSES.includes(todo.status)) {
+        return `Each todo must have a valid status (${TODO_STATUSES.join(", ")})`;
       }
     }
     const inProgressCount = todos.filter((todo) => todo.status === "in_progress").length;
@@ -345676,7 +345876,7 @@ var ClassifierStrategy = class {
       let promptId = promptIdContext.getStore();
       if (!promptId) {
         promptId = `classifier-router-fallback-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-        console.warn(`Could not find promptId in context. This is unexpected. Using a fallback ID: ${promptId}`);
+        debugLogger.warn(`Could not find promptId in context. This is unexpected. Using a fallback ID: ${promptId}`);
       }
       const historySlice = context2.history.slice(-HISTORY_SEARCH_WINDOW);
       const cleanHistory = historySlice.filter((content) => !isFunctionCall(content) && !isFunctionResponse(content));
@@ -345713,7 +345913,7 @@ var ClassifierStrategy = class {
         };
       }
     } catch (error) {
-      console.warn(`[Routing] ClassifierStrategy failed:`, error);
+      debugLogger.warn(`[Routing] ClassifierStrategy failed:`, error);
       return null;
     }
   }
@@ -345939,7 +346139,7 @@ var WorkspaceContext = class {
       this.directories.add(resolved);
       this.notifyDirectoriesChanged();
     } catch (err2) {
-      console.warn(`[WARN] Skipping unreadable directory: ${directory} (${err2 instanceof Error ? err2.message : String(err2)})`);
+      debugLogger.warn(`[WARN] Skipping unreadable directory: ${directory} (${err2 instanceof Error ? err2.message : String(err2)})`);
     }
   }
   resolveAndValidateDir(directory, basePath = process21.cwd()) {
@@ -346044,9 +346244,12 @@ var PolicyDecision;
 // packages/core/dist/src/confirmation-bus/message-bus.js
 var MessageBus = class extends EventEmitter9 {
   policyEngine;
-  constructor(policyEngine) {
+  debug;
+  constructor(policyEngine, debug2 = false) {
     super();
     this.policyEngine = policyEngine;
+    this.debug = debug2;
+    this.debug = debug2;
   }
   isValidMessage(message) {
     if (!message || !message.type) {
@@ -346061,6 +346264,9 @@ var MessageBus = class extends EventEmitter9 {
     this.emit(message.type, message);
   }
   publish(message) {
+    if (this.debug) {
+      console.debug(`[MESSAGE_BUS] publish: ${safeJsonStringify(message)}`);
+    }
     try {
       if (!this.isValidMessage(message)) {
         throw new Error(`Invalid message structure: ${safeJsonStringify(message)}`);
@@ -346236,9 +346442,6 @@ var PolicyEngine = class {
   }
 };
 
-// packages/core/dist/src/config/config.js
-var import_undici3 = __toESM(require_undici(), 1);
-
 // packages/core/dist/src/agents/registry.js
 var AgentRegistry = class {
   config;
@@ -346253,7 +346456,7 @@ var AgentRegistry = class {
   async initialize() {
     this.loadBuiltInAgents();
     if (this.config.getDebugMode()) {
-      console.log(`[AgentRegistry] Initialized with ${this.agents.size} agents.`);
+      debugLogger.log(`[AgentRegistry] Initialized with ${this.agents.size} agents.`);
     }
   }
   loadBuiltInAgents() {
@@ -346282,11 +346485,11 @@ var AgentRegistry = class {
    */
   registerAgent(definition) {
     if (!definition.name || !definition.description) {
-      console.warn(`[AgentRegistry] Skipping invalid agent definition. Missing name or description.`);
+      debugLogger.warn(`[AgentRegistry] Skipping invalid agent definition. Missing name or description.`);
       return;
     }
     if (this.agents.has(definition.name) && this.config.getDebugMode()) {
-      console.log(`[AgentRegistry] Overriding agent '${definition.name}'`);
+      debugLogger.log(`[AgentRegistry] Overriding agent '${definition.name}'`);
     }
     this.agents.set(definition.name, definition);
   }
@@ -347960,7 +348163,7 @@ var AgentExecutor = class _AgentExecutor {
       }
       if (!allowedToolNames.has(functionCall.name)) {
         const error = `Unauthorized tool call: '${functionCall.name}' is not available to this agent.`;
-        console.warn(`[AgentExecutor] Blocked call: ${error}`);
+        debugLogger.warn(`[AgentExecutor] Blocked call: ${error}`);
         syncResponseParts.push({
           functionResponse: {
             name: functionCall.name,
@@ -348328,7 +348531,6 @@ var Config = class {
   cwd;
   bugCommand;
   model;
-  extensionContextFilePaths;
   noBrowser;
   folderTrust;
   ideMode;
@@ -348336,6 +348538,7 @@ var Config = class {
   maxSessionTurns;
   listExtensions;
   _extensions;
+  _enabledExtensions;
   _blockedMcpServers;
   fallbackModelHandler;
   quotaErrorOccurred = false;
@@ -348414,11 +348617,11 @@ var Config = class {
     this.fileDiscoveryService = params.fileDiscoveryService ?? null;
     this.bugCommand = params.bugCommand;
     this.model = params.model;
-    this.extensionContextFilePaths = params.extensionContextFilePaths ?? [];
     this.maxSessionTurns = params.maxSessionTurns ?? -1;
     this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
     this.listExtensions = params.listExtensions ?? false;
     this._extensions = params.extensions ?? [];
+    this._enabledExtensions = params.enabledExtensions ?? [];
     this._blockedMcpServers = params.blockedMcpServers ?? [];
     this.noBrowser = params.noBrowser ?? false;
     this.summarizeToolOutput = params.summarizeToolOutput;
@@ -348446,7 +348649,7 @@ var Config = class {
     this.useModelRouter = params.useModelRouter ?? false;
     this.enableMessageBusIntegration = params.enableMessageBusIntegration ?? false;
     this.codebaseInvestigatorSettings = {
-      enabled: params.codebaseInvestigatorSettings?.enabled ?? true,
+      enabled: params.codebaseInvestigatorSettings?.enabled ?? false,
       maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 15,
       maxTimeMinutes: params.codebaseInvestigatorSettings?.maxTimeMinutes ?? 5,
       thinkingBudget: params.codebaseInvestigatorSettings?.thinkingBudget ?? DEFAULT_THINKING_MODE,
@@ -348460,7 +348663,7 @@ var Config = class {
     this.fileExclusions = new FileExclusions(this);
     this.eventEmitter = params.eventEmitter;
     this.policyEngine = new PolicyEngine(params.policyEngineConfig);
-    this.messageBus = new MessageBus(this.policyEngine);
+    this.messageBus = new MessageBus(this.policyEngine, this.debugMode);
     this.outputSettings = {
       format: params.output?.format ?? OutputFormat.TEXT
     };
@@ -348472,7 +348675,7 @@ var Config = class {
       initializeTelemetry(this);
     }
     if (this.getProxy()) {
-      (0, import_undici3.setGlobalDispatcher)(new import_undici3.ProxyAgent(this.getProxy()));
+      setGlobalProxy(this.getProxy());
     }
     this.geminiClient = new GeminiClient(this);
     this.modelRouterService = new ModelRouterService(this);
@@ -348724,9 +348927,6 @@ var Config = class {
   getUsageStatisticsEnabled() {
     return this.usageStatisticsEnabled;
   }
-  getExtensionContextFilePaths() {
-    return this.extensionContextFilePaths;
-  }
   getExperimentalZedIntegration() {
     return this.experimentalZedIntegration;
   }
@@ -348739,6 +348939,11 @@ var Config = class {
   getExtensions() {
     return this._extensions;
   }
+  // The list of explicitly enabled extensions, if any were given, may contain
+  // the string "none".
+  getEnabledExtensions() {
+    return this._enabledExtensions;
+  }
   getBlockedMcpServers() {
     return this._blockedMcpServers;
   }
@@ -348896,11 +349101,11 @@ var Config = class {
       if (isEnabled2) {
         const messageBusEnabled = this.getEnableMessageBusIntegration();
         if (this.debugMode && messageBusEnabled) {
-          console.log(`[DEBUG] enableMessageBusIntegration setting: ${messageBusEnabled}`);
+          debugLogger.log(`[DEBUG] enableMessageBusIntegration setting: ${messageBusEnabled}`);
         }
         const toolArgs = messageBusEnabled ? [...args2, this.getMessageBus()] : args2;
         if (this.debugMode && messageBusEnabled) {
-          console.log(`[DEBUG] Registering ${className} with messageBus: ${messageBusEnabled ? "YES" : "NO"}`);
+          debugLogger.log(`[DEBUG] Registering ${className} with messageBus: ${messageBusEnabled ? "YES" : "NO"}`);
         }
         registry.registerTool(new ToolClass(...toolArgs));
       }
@@ -348955,7 +349160,7 @@ var Config = class {
             console.error(`Failed to wrap agent '${definition.name}' as a tool:`, error);
           }
         } else if (this.getDebugMode()) {
-          console.log(`[Config] Skipping registration of agent '${definition.name}' due to allow/exclude configuration.`);
+          debugLogger.log(`[Config] Skipping registration of agent '${definition.name}' due to allow/exclude configuration.`);
         }
       }
     }
@@ -348981,7 +349186,7 @@ import * as fs53 from "node:fs/promises";
 import * as path57 from "node:path";
 var logger3 = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args2) => console.debug("[DEBUG] [BfsFileSearch]", ...args2)
+  debug: (...args2) => debugLogger.debug("[DEBUG] [BfsFileSearch]", ...args2)
 };
 async function bfsFileSearch(rootDir, options2) {
   const { fileName, ignoreDirs = [], maxDirs = Infinity, debug: debug2 = false, fileService } = options2;
@@ -349015,7 +349220,7 @@ async function bfsFileSearch(rootDir, options2) {
         return { currentDir, entries: entries2 };
       } catch (error) {
         const message = error?.message ?? "Unknown error";
-        console.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
+        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
         if (debug2) {
           logger3.debug(`Full error for ${currentDir}:`, error);
         }
@@ -351194,9 +351399,9 @@ var lexer = _Lexer.lex;
 // packages/core/dist/src/utils/memoryImportProcessor.js
 var logger4 = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args2) => console.debug("[DEBUG] [ImportProcessor]", ...args2),
+  debug: (...args2) => debugLogger.debug("[DEBUG] [ImportProcessor]", ...args2),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args2) => console.warn("[WARN] [ImportProcessor]", ...args2),
+  warn: (...args2) => debugLogger.warn("[WARN] [ImportProcessor]", ...args2),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: (...args2) => console.error("[ERROR] [ImportProcessor]", ...args2)
 };
@@ -351414,9 +351619,9 @@ function validateImportPath(importPath, basePath, allowedDirectories) {
 // packages/core/dist/src/utils/memoryDiscovery.js
 var logger5 = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args2) => console.debug("[DEBUG] [MemoryDiscovery]", ...args2),
+  debug: (...args2) => debugLogger.debug("[DEBUG] [MemoryDiscovery]", ...args2),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args2) => console.warn("[WARN] [MemoryDiscovery]", ...args2),
+  warn: (...args2) => debugLogger.warn("[WARN] [MemoryDiscovery]", ...args2),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: (...args2) => console.error("[ERROR] [MemoryDiscovery]", ...args2)
 };
@@ -351448,7 +351653,7 @@ async function findProjectRoot2(startDir) {
     currentDir = parentDir;
   }
 }
-async function getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, extensionContextFilePaths = [], folderTrust, fileFilteringOptions, maxDirs) {
+async function getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, folderTrust, fileFilteringOptions, maxDirs) {
   const dirs = /* @__PURE__ */ new Set([
     ...includeDirectoriesToReadGemini,
     currentWorkingDirectory
@@ -351458,7 +351663,7 @@ async function getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDire
   const pathsArrays = [];
   for (let i3 = 0; i3 < dirsArray.length; i3 += CONCURRENT_LIMIT) {
     const batch = dirsArray.slice(i3, i3 + CONCURRENT_LIMIT);
-    const batchPromises = batch.map((dir) => getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, extensionContextFilePaths, folderTrust, fileFilteringOptions, maxDirs));
+    const batchPromises = batch.map((dir) => getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, folderTrust, fileFilteringOptions, maxDirs));
     const batchResults = await Promise.allSettled(batchPromises);
     for (const result of batchResults) {
       if (result.status === "fulfilled") {
@@ -351473,7 +351678,7 @@ async function getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDire
   const paths = pathsArrays.flat();
   return Array.from(new Set(paths));
 }
-async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, extensionContextFilePaths = [], folderTrust, fileFilteringOptions, maxDirs) {
+async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMode, fileService, folderTrust, fileFilteringOptions, maxDirs) {
   const allPaths = /* @__PURE__ */ new Set();
   const geminiMdFilenames = getAllGeminiMdFilenames();
   for (const geminiMdFilename of geminiMdFilenames) {
@@ -351531,9 +351736,6 @@ async function getGeminiMdFilePathsInternalForEachDir(dir, userHomePath, debugMo
       }
     }
   }
-  for (const extensionPath of extensionContextFilePaths) {
-    allPaths.add(extensionPath);
-  }
   const finalPaths = Array.from(allPaths);
   if (debugMode)
     logger5.debug(`Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(finalPaths)}`);
@@ -351587,11 +351789,12 @@ ${trimmedContent}
 --- End of Context from: ${displayPath} ---`;
   }).filter((block2) => block2 !== null).join("\n\n");
 }
-async function loadServerHierarchicalMemory(currentWorkingDirectory, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths = [], folderTrust, importFormat = "tree", fileFilteringOptions, maxDirs = 200) {
+async function loadServerHierarchicalMemory(currentWorkingDirectory, includeDirectoriesToReadGemini, debugMode, fileService, extensions, folderTrust, importFormat = "tree", fileFilteringOptions, maxDirs = 200) {
   if (debugMode)
     logger5.debug(`Loading server hierarchical memory for CWD: ${currentWorkingDirectory} (importFormat: ${importFormat})`);
   const userHomePath = homedir4();
-  const filePaths = await getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, extensionContextFilePaths, folderTrust, fileFilteringOptions || DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, maxDirs);
+  const filePaths = await getGeminiMdFilePathsInternal(currentWorkingDirectory, includeDirectoriesToReadGemini, userHomePath, debugMode, fileService, folderTrust, fileFilteringOptions || DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, maxDirs);
+  filePaths.push(...extensions.filter((ext2) => ext2.isActive).flatMap((ext2) => ext2.contextFiles));
   if (filePaths.length === 0) {
     if (debugMode)
       logger5.debug("No GEMINI.md files found in hierarchy of the workspace.");
@@ -351746,13 +351949,12 @@ async function loadConfig(settings, extensions, taskId) {
     folderTrust: settings.folderTrust === true
   };
   const fileService = new FileDiscoveryService(workspaceDir);
-  const extensionContextFilePaths = extensions.flatMap((e2) => e2.contextFiles);
   const { memoryContent, fileCount } = await loadServerHierarchicalMemory(
     workspaceDir,
     [workspaceDir],
     false,
     fileService,
-    extensionContextFilePaths,
+    extensions,
     settings.folderTrust === true
   );
   configParams.userMemory = memoryContent;
@@ -351791,7 +351993,7 @@ function mergeMcpServers(settings, extensions) {
   for (const extension of extensions) {
     Object.entries(extension.mcpServers || {}).forEach(([key, server]) => {
       if (mcpServers[key]) {
-        console.warn(
+        debugLogger.warn(
           `Skipping extension MCP config for server with key "${key}" as it already exists.`
         );
         return;
@@ -351856,6 +352058,10 @@ function findEnvFile(startDir) {
 
 // packages/a2a-server/src/persistence/gcs.ts
 var getTmpArchiveFilename = (taskId) => `task-${taskId}-workspace-${v4_default2()}.tar.gz`;
+var isTaskIdValid = (taskId) => {
+  const validTaskIdRegex = /^[a-zA-Z0-9_-]+$/;
+  return validTaskIdRegex.test(taskId);
+};
 var GCSTaskStore = class {
   storage;
   bucketName;
@@ -351904,6 +352110,9 @@ var GCSTaskStore = class {
     await this.bucketInitialized;
   }
   getObjectPath(taskId, type) {
+    if (!isTaskIdValid(taskId)) {
+      throw new Error(`Invalid taskId: ${taskId}`);
+    }
     return `tasks/${taskId}/${type}.tar.gz`;
   }
   async save(task) {
@@ -352426,7 +352635,7 @@ var Task = class _Task {
       contextId: this.contextId
     };
   }
-  _createStatusUpdateEvent(stateToReport, coderAgentMessage, message, final = false, timestamp, metadataError) {
+  _createStatusUpdateEvent(stateToReport, coderAgentMessage, message, final = false, timestamp, metadataError, traceId) {
     const metadata2 = {
       coderAgent: coderAgentMessage,
       model: this.config.getModel(),
@@ -352435,6 +352644,9 @@ var Task = class _Task {
     if (metadataError) {
       metadata2.error = metadataError;
     }
+    if (traceId) {
+      metadata2.traceId = traceId;
+    }
     return {
       kind: "status-update",
       taskId: this.id,
@@ -352449,7 +352661,7 @@ var Task = class _Task {
       metadata: metadata2
     };
   }
-  setTaskStateAndPublishUpdate(newState, coderAgentMessage, messageText, messageParts, final = false, metadataError) {
+  setTaskStateAndPublishUpdate(newState, coderAgentMessage, messageText, messageParts, final = false, metadataError, traceId) {
     this.taskState = newState;
     let message;
     if (messageText) {
@@ -352470,7 +352682,8 @@ var Task = class _Task {
       message,
       final,
       void 0,
-      metadataError
+      metadataError,
+      traceId
     );
     this.eventBus?.publish(event);
   }
@@ -352687,10 +352900,11 @@ var Task = class _Task {
     const stateChange = {
       kind: "state-change" /* StateChangeEvent */
     };
+    const traceId = "traceId" in event && event.traceId ? event.traceId : void 0;
     switch (event.type) {
       case GeminiEventType.Content:
         logger.info("[Task] Sending agent message content...");
-        this._sendTextContent(event.value);
+        this._sendTextContent(event.value, traceId);
         break;
       case GeminiEventType.ToolCallRequest:
         logger.warn(
@@ -352721,12 +352935,14 @@ var Task = class _Task {
           stateChange,
           "Task cancelled by user",
           void 0,
-          true
+          true,
+          void 0,
+          traceId
         );
         break;
       case GeminiEventType.Thought:
         logger.info("[Task] Sending agent thought...");
-        this._sendThought(event.value);
+        this._sendThought(event.value, traceId);
         break;
       case GeminiEventType.ChatCompressed:
         break;
@@ -352752,7 +352968,8 @@ var Task = class _Task {
           `Agent Error, unknown agent message: ${errorMessage}`,
           void 0,
           false,
-          errMessage
+          errMessage,
+          traceId
         );
         break;
       }
@@ -352949,7 +353166,7 @@ var Task = class _Task {
       }();
     }
   }
-  _sendTextContent(content) {
+  _sendTextContent(content, traceId) {
     if (content === "") {
       return;
     }
@@ -352963,11 +353180,14 @@ var Task = class _Task {
         this.taskState,
         textContent2,
         message,
-        false
+        false,
+        void 0,
+        void 0,
+        traceId
       )
     );
   }
-  _sendThought(content) {
+  _sendThought(content, traceId) {
     if (!content.subject && !content.description) {
       return;
     }
@@ -352989,7 +353209,15 @@ var Task = class _Task {
       kind: "thought" /* ThoughtEvent */
     };
     this.eventBus?.publish(
-      this._createStatusUpdateEvent(this.taskState, thought, message, false)
+      this._createStatusUpdateEvent(
+        this.taskState,
+        thought,
+        message,
+        false,
+        void 0,
+        void 0,
+        traceId
+      )
     );
   }
 };