@google/gemini-cli-a2a-server 0.11.0-nightly.20251021.e72c00cf → 0.11.0-preview.0

package/dist/a2a-server.mjs

@@ -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;
@@ -286424,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;
@@ -286433,6 +286451,7 @@ var DeclarativeTool = class {
     this.isOutputMarkdown = isOutputMarkdown;
     this.canUpdateOutput = canUpdateOutput;
     this.messageBus = messageBus;
+    this.extensionId = extensionId;
   }
   get schema() {
     return {
@@ -286738,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)`,
@@ -286747,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;
@@ -286755,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);
@@ -286963,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();
@@ -286988,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;
@@ -287013,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() {
@@ -287035,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) {
@@ -287053,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";
       }
@@ -287095,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) {
@@ -288417,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";
@@ -288465,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 = "e72c00cf";
-var CLI_VERSION = "0.11.0-nightly.20251021.e72c00cf";
+var GIT_COMMIT_INFO = "0542de95";
+var CLI_VERSION = "0.11.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -288643,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()) {
@@ -288677,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();
@@ -288735,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);
         }
       });
     }
@@ -288806,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) {
@@ -289003,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) {
@@ -289114,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) {
@@ -289180,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
@@ -289195,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) {
@@ -289204,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
@@ -289211,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) {
@@ -289220,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
@@ -289239,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) {
@@ -289302,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
@@ -289309,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) {
@@ -289328,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
@@ -289335,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) {
@@ -289469,8 +289535,6 @@ var ClearcutLogger = class _ClearcutLogger {
     }
   }
   getConfigJson() {
-    const configJson = safeJsonStringifyBooleanValuesOnly(this.config);
-    console.debug(configJson);
     return safeJsonStringifyBooleanValuesOnly(this.config);
   }
   shutdown() {
@@ -289479,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;
     }
@@ -289497,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})`);
     }
   }
 };
@@ -290423,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);
@@ -290448,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);
@@ -290943,7 +291007,7 @@ function createContentGeneratorConfig(config2, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, gcConfig, sessionId2) {
-  const version3 = "0.11.0-nightly.20251021.e72c00cf";
+  const version3 = "0.11.0-preview.0";
   const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -290983,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);
@@ -298708,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;
     }
   }
@@ -298726,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;
     }
   }
@@ -298768,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;
   }
   /**
@@ -298794,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;
     }
   }
@@ -298876,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}`;
   }
 };
 
@@ -299008,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();
@@ -299044,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);
@@ -299082,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, {
@@ -299109,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);
@@ -299162,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, {
@@ -299189,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);
@@ -299228,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" };
@@ -299258,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);
@@ -299286,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");
@@ -299299,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");
       }
@@ -299320,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");
@@ -299339,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");
       }
@@ -299361,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,
@@ -299542,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) {
@@ -299563,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)}`);
@@ -299658,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}`);
       }
@@ -299775,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, {
@@ -299797,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) {
@@ -299857,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,
@@ -299879,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();
@@ -299989,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}'`);
       }
     }
   }
@@ -300039,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;
@@ -300048,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;
@@ -300252,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);
@@ -300395,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 : {};
@@ -302514,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));
       }
     }
   }
@@ -308428,23 +308492,6 @@ 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;
@@ -308698,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";
@@ -308778,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();
@@ -308811,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)}`);
           }
         }
       }
@@ -321958,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({
@@ -323352,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)
 };
@@ -324071,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);
@@ -324714,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) {
@@ -324729,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) {
@@ -324749,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)) {
@@ -324757,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 {
@@ -324821,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);
   }
 }
 
@@ -324997,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,
@@ -325414,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);
@@ -325773,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;
   }
@@ -325783,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;
     }
   }
@@ -325823,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) {
@@ -325833,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;
 }
@@ -331215,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;
         }
@@ -336921,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;
@@ -336976,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 {
@@ -337565,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;
         }
@@ -339452,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 };
     }
   }
@@ -339769,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;
   }
 }
@@ -340060,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;
@@ -340294,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,
@@ -340377,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,
@@ -345535,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.
@@ -345638,7 +345691,7 @@ var WriteTodosTool = class _WriteTodosTool extends BaseDeclarativeTool {
               status: {
                 type: "string",
                 description: "The current status of the task.",
-                enum: ["pending", "in_progress", "completed"]
+                enum: TODO_STATUSES
               }
             },
             required: ["description", "status"]
@@ -345660,8 +345713,8 @@ var WriteTodosTool = class _WriteTodosTool 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;
@@ -345823,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));
@@ -345860,7 +345913,7 @@ var ClassifierStrategy = class {
         };
       }
     } catch (error) {
-      console.warn(`[Routing] ClassifierStrategy failed:`, error);
+      debugLogger.warn(`[Routing] ClassifierStrategy failed:`, error);
       return null;
     }
   }
@@ -346086,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()) {
@@ -346403,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() {
@@ -346432,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);
   }
@@ -348110,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,
@@ -348596,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,
@@ -349048,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));
       }
@@ -349107,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.`);
         }
       }
     }
@@ -349133,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;
@@ -349167,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);
         }
@@ -351346,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)
 };
@@ -351566,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)
 };
@@ -351940,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;