@google/gemini-cli-a2a-server 0.11.0-nightly.20251020.a96f0659 → 0.11.0-nightly.20251021.e72c00cf

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) {
@@ -285847,6 +285847,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 +286304,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 +286358,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) => {
@@ -286489,7 +286519,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);
@@ -288435,8 +288465,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 = "e72c00cf";
+var CLI_VERSION = "0.11.0-nightly.20251021.e72c00cf";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -290913,7 +290943,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-nightly.20251021.e72c00cf";
   const userAgent = `GeminiCLI/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -300031,21 +300061,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 +300078,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 +300241,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.
@@ -300477,8 +300497,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 +300622,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 +300656,7 @@ var LSTool = class extends BaseDeclarativeTool {
       },
       required: ["path"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   /**
@@ -300654,8 +300675,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 +302184,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() === "") {
@@ -302777,8 +302799,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 +302849,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 +302870,7 @@ var ReadFileTool = class extends BaseDeclarativeTool {
       },
       required: ["absolute_path"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   validateToolParamValues(params) {
@@ -302879,8 +302902,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);
   }
 };
 
@@ -308426,8 +308449,8 @@ var debugLogger = new DebugLogger();
 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();
   }
@@ -308799,10 +308822,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 +308843,7 @@ var GrepTool = class extends BaseDeclarativeTool {
       },
       required: ["pattern"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   /**
@@ -308871,8 +308895,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 +321868,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;
+    }
   }
-  await downloadRipGrep(Storage2.getGlobalBinDir());
-  return await fileExists(getRgPath());
+  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;
+      }
+    })();
+  }
+  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;
   }
   /**
@@ -322112,27 +322161,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 +322244,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 +322273,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 +322393,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 +322422,7 @@ var GlobTool = class extends BaseDeclarativeTool {
       },
       required: ["pattern"],
       type: "object"
-    });
+    }, true, false, messageBus);
     this.config = config2;
   }
   /**
@@ -322389,8 +322451,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);
   }
 };
 
@@ -324148,10 +324210,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 +324396,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
@@ -325499,10 +325557,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.
       
@@ -330197,6 +330256,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 +331153,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"
+          })
+        };
+      }
     }
   }
   /**
@@ -331372,14 +331470,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 +331718,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 +331793,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 +331835,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 +336782,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 +336808,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) {
@@ -336889,11 +336996,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 +337024,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 +337041,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 +337056,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 +337308,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 +337369,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 +337381,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 +337486,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 +337524,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);
   }
 };
 
@@ -338026,7 +338158,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 +338171,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 +338397,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 +339208,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) {
@@ -340508,7 +340654,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);
@@ -345472,9 +345618,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: {
@@ -346044,9 +346191,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 +346211,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 +346389,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;
@@ -348328,7 +348478,6 @@ var Config = class {
   cwd;
   bugCommand;
   model;
-  extensionContextFilePaths;
   noBrowser;
   folderTrust;
   ideMode;
@@ -348336,6 +348485,7 @@ var Config = class {
   maxSessionTurns;
   listExtensions;
   _extensions;
+  _enabledExtensions;
   _blockedMcpServers;
   fallbackModelHandler;
   quotaErrorOccurred = false;
@@ -348414,11 +348564,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;
@@ -348460,7 +348610,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 +348622,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 +348874,6 @@ var Config = class {
   getUsageStatisticsEnabled() {
     return this.usageStatisticsEnabled;
   }
-  getExtensionContextFilePaths() {
-    return this.extensionContextFilePaths;
-  }
   getExperimentalZedIntegration() {
     return this.experimentalZedIntegration;
   }
@@ -348739,6 +348886,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;
   }
@@ -351448,7 +351600,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 +351610,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 +351625,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 +351683,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 +351736,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 +351896,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;
@@ -351856,6 +352005,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 +352057,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 +352582,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 +352591,9 @@ var Task = class _Task {
     if (metadataError) {
       metadata2.error = metadataError;
     }
+    if (traceId) {
+      metadata2.traceId = traceId;
+    }
     return {
       kind: "status-update",
       taskId: this.id,
@@ -352449,7 +352608,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 +352629,8 @@ var Task = class _Task {
       message,
       final,
       void 0,
-      metadataError
+      metadataError,
+      traceId
     );
     this.eventBus?.publish(event);
   }
@@ -352687,10 +352847,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 +352882,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 +352915,8 @@ var Task = class _Task {
           `Agent Error, unknown agent message: ${errorMessage}`,
           void 0,
           false,
-          errMessage
+          errMessage,
+          traceId
         );
         break;
       }
@@ -352949,7 +353113,7 @@ var Task = class _Task {
       }();
     }
   }
-  _sendTextContent(content) {
+  _sendTextContent(content, traceId) {
     if (content === "") {
       return;
     }
@@ -352963,11 +353127,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 +353156,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
+      )
     );
   }
 };