@google/gemini-cli 0.34.0-preview.1 → 0.34.0-preview.3

package/bundle/gemini.js

@@ -89787,161 +89787,6 @@ var init_base_token_storage = __esm({
   }
 });
 
-// packages/core/dist/src/mcp/token-storage/file-token-storage.js
-import { promises as fs14 } from "node:fs";
-import * as path8 from "node:path";
-import * as os6 from "node:os";
-import * as crypto8 from "node:crypto";
-var FileTokenStorage;
-var init_file_token_storage = __esm({
-  "packages/core/dist/src/mcp/token-storage/file-token-storage.js"() {
-    "use strict";
-    init_base_token_storage();
-    init_paths();
-    FileTokenStorage = class extends BaseTokenStorage {
-      tokenFilePath;
-      encryptionKey;
-      constructor(serviceName) {
-        super(serviceName);
-        const configDir = path8.join(homedir(), GEMINI_DIR);
-        this.tokenFilePath = path8.join(configDir, "mcp-oauth-tokens-v2.json");
-        this.encryptionKey = this.deriveEncryptionKey();
-      }
-      deriveEncryptionKey() {
-        const salt = `${os6.hostname()}-${os6.userInfo().username}-gemini-cli`;
-        return crypto8.scryptSync("gemini-cli-oauth", salt, 32);
-      }
-      encrypt(text) {
-        const iv = crypto8.randomBytes(16);
-        const cipher = crypto8.createCipheriv("aes-256-gcm", this.encryptionKey, iv);
-        let encrypted = cipher.update(text, "utf8", "hex");
-        encrypted += cipher.final("hex");
-        const authTag = cipher.getAuthTag();
-        return iv.toString("hex") + ":" + authTag.toString("hex") + ":" + encrypted;
-      }
-      decrypt(encryptedData) {
-        const parts2 = encryptedData.split(":");
-        if (parts2.length !== 3) {
-          throw new Error("Invalid encrypted data format");
-        }
-        const iv = Buffer.from(parts2[0], "hex");
-        const authTag = Buffer.from(parts2[1], "hex");
-        const encrypted = parts2[2];
-        const decipher = crypto8.createDecipheriv("aes-256-gcm", this.encryptionKey, iv);
-        decipher.setAuthTag(authTag);
-        let decrypted = decipher.update(encrypted, "hex", "utf8");
-        decrypted += decipher.final("utf8");
-        return decrypted;
-      }
-      async ensureDirectoryExists() {
-        const dir = path8.dirname(this.tokenFilePath);
-        await fs14.mkdir(dir, { recursive: true, mode: 448 });
-      }
-      async loadTokens() {
-        try {
-          const data = await fs14.readFile(this.tokenFilePath, "utf-8");
-          const decrypted = this.decrypt(data);
-          const tokens = JSON.parse(decrypted);
-          return new Map(Object.entries(tokens));
-        } catch (error40) {
-          const err2 = error40;
-          if (err2.code === "ENOENT") {
-            return /* @__PURE__ */ new Map();
-          }
-          if (err2.message?.includes("Invalid encrypted data format") || err2.message?.includes("Unsupported state or unable to authenticate data")) {
-            throw new Error(`Corrupted token file detected at: ${this.tokenFilePath}
-Please delete or rename this file to resolve the issue.`);
-          }
-          throw error40;
-        }
-      }
-      async saveTokens(tokens) {
-        await this.ensureDirectoryExists();
-        const data = Object.fromEntries(tokens);
-        const json4 = JSON.stringify(data, null, 2);
-        const encrypted = this.encrypt(json4);
-        await fs14.writeFile(this.tokenFilePath, encrypted, { mode: 384 });
-      }
-      async getCredentials(serverName) {
-        const tokens = await this.loadTokens();
-        const credentials2 = tokens.get(serverName);
-        if (!credentials2) {
-          return null;
-        }
-        if (this.isTokenExpired(credentials2)) {
-          return null;
-        }
-        return credentials2;
-      }
-      async setCredentials(credentials2) {
-        this.validateCredentials(credentials2);
-        const tokens = await this.loadTokens();
-        const updatedCredentials = {
-          ...credentials2,
-          updatedAt: Date.now()
-        };
-        tokens.set(credentials2.serverName, updatedCredentials);
-        await this.saveTokens(tokens);
-      }
-      async deleteCredentials(serverName) {
-        const tokens = await this.loadTokens();
-        if (!tokens.has(serverName)) {
-          throw new Error(`No credentials found for ${serverName}`);
-        }
-        tokens.delete(serverName);
-        if (tokens.size === 0) {
-          try {
-            await fs14.unlink(this.tokenFilePath);
-          } catch (error40) {
-            const err2 = error40;
-            if (err2.code !== "ENOENT") {
-              throw error40;
-            }
-          }
-        } else {
-          await this.saveTokens(tokens);
-        }
-      }
-      async listServers() {
-        const tokens = await this.loadTokens();
-        return Array.from(tokens.keys());
-      }
-      async getAllCredentials() {
-        const tokens = await this.loadTokens();
-        const result2 = /* @__PURE__ */ new Map();
-        for (const [serverName, credentials2] of tokens) {
-          if (!this.isTokenExpired(credentials2)) {
-            result2.set(serverName, credentials2);
-          }
-        }
-        return result2;
-      }
-      async clearAll() {
-        try {
-          await fs14.unlink(this.tokenFilePath);
-        } catch (error40) {
-          const err2 = error40;
-          if (err2.code !== "ENOENT") {
-            throw error40;
-          }
-        }
-      }
-    };
-  }
-});
-
-// packages/core/dist/src/mcp/token-storage/types.js
-var TokenStorageType;
-var init_types = __esm({
-  "packages/core/dist/src/mcp/token-storage/types.js"() {
-    "use strict";
-    (function(TokenStorageType2) {
-      TokenStorageType2["KEYCHAIN"] = "keychain";
-      TokenStorageType2["ENCRYPTED_FILE"] = "encrypted_file";
-    })(TokenStorageType || (TokenStorageType = {}));
-  }
-});
-
 // packages/core/dist/src/utils/events.js
 import { EventEmitter as EventEmitter4 } from "node:events";
 var CoreEvent, CoreEventEmitter, coreEvents;
@@ -90133,7 +89978,7 @@ function getHookSource(input) {
   return "project";
 }
 var PolicyDecision, VALID_HOOK_SOURCES, ApprovalMode, InProcessCheckerType, PRIORITY_SUBAGENT_TOOL;
-var init_types2 = __esm({
+var init_types = __esm({
   "packages/core/dist/src/policy/types.js"() {
     "use strict";
     (function(PolicyDecision2) {
@@ -90163,10 +90008,10 @@ var init_types2 = __esm({
 
 // packages/core/dist/src/scheduler/types.js
 var ROOT_SCHEDULER_ID, CoreToolCallStatus;
-var init_types3 = __esm({
+var init_types2 = __esm({
   "packages/core/dist/src/scheduler/types.js"() {
     "use strict";
-    init_types2();
+    init_types();
     ROOT_SCHEDULER_ID = "root";
     (function(CoreToolCallStatus2) {
       CoreToolCallStatus2["Validating"] = "validating";
@@ -103572,7 +103417,7 @@ var init_schemaValidator = __esm({
 
 // packages/core/dist/src/confirmation-bus/types.js
 var MessageBusType, QuestionType;
-var init_types4 = __esm({
+var init_types3 = __esm({
   "packages/core/dist/src/confirmation-bus/types.js"() {
     "use strict";
     init_node();
@@ -103667,8 +103512,8 @@ var init_tools = __esm({
     "use strict";
     init_tool_error();
     init_schemaValidator();
-    init_types4();
-    init_types2();
+    init_types3();
+    init_types();
     BaseToolInvocation = class {
       params;
       messageBus;
@@ -104260,7 +104105,7 @@ var init_mcp_tool = __esm({
         return safeJsonStringify(this.params);
       }
     };
-    DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
+    DiscoveredMCPTool = class extends BaseDeclarativeTool {
       mcpTool;
       serverName;
       serverToolName;
@@ -104312,9 +104157,6 @@ var init_mcp_tool = __esm({
       getFullyQualifiedName() {
         return generateValidName(`${this.serverName}${MCP_QUALIFIED_NAME_SEPARATOR}${this.serverToolName}`);
       }
-      asFullyQualifiedTool() {
-        return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.messageBus, this.trust, this.isReadOnly, this.getFullyQualifiedName(), this.cliConfig, this.extensionName, this.extensionId, this._toolAnnotations);
-      }
       createInvocation(params, messageBus, _toolName, _displayName) {
         return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, _displayName ?? this.displayName, messageBus, this.trust, params, this.cliConfig, this.description, this.parameterSchema, this._toolAnnotations);
       }
@@ -104592,7 +104434,7 @@ var init_ComponentLogger = __esm({
 
 // node_modules/@opentelemetry/api/build/esm/diag/types.js
 var DiagLogLevel;
-var init_types5 = __esm({
+var init_types4 = __esm({
   "node_modules/@opentelemetry/api/build/esm/diag/types.js"() {
     (function(DiagLogLevel2) {
       DiagLogLevel2[DiagLogLevel2["NONE"] = 0] = "NONE";
@@ -104632,7 +104474,7 @@ function createLogLevelDiagLogger(maxLevel, logger6) {
 }
 var init_logLevelLogger = __esm({
   "node_modules/@opentelemetry/api/build/esm/diag/internal/logLevelLogger.js"() {
-    init_types5();
+    init_types4();
   }
 });
 
@@ -104642,7 +104484,7 @@ var init_diag = __esm({
   "node_modules/@opentelemetry/api/build/esm/api/diag.js"() {
     init_ComponentLogger();
     init_logLevelLogger();
-    init_types5();
+    init_types4();
     init_global_utils();
     __read2 = function(o3, n3) {
       var m3 = typeof Symbol === "function" && o3[Symbol.iterator];
@@ -105951,7 +105793,7 @@ var init_esm = __esm({
     init_utils();
     init_context();
     init_consoleLogger();
-    init_types5();
+    init_types4();
     init_NoopMeter();
     init_Metric();
     init_TextMapPropagator();
@@ -106014,9 +105856,9 @@ var init_constants = __esm({
 });
 
 // packages/core/dist/src/utils/installationManager.js
-import * as fs15 from "node:fs";
+import * as fs14 from "node:fs";
 import { randomUUID as randomUUID2 } from "node:crypto";
-import * as path9 from "node:path";
+import * as path8 from "node:path";
 var InstallationManager;
 var init_installationManager = __esm({
   "packages/core/dist/src/utils/installationManager.js"() {
@@ -106029,17 +105871,17 @@ var init_installationManager = __esm({
       }
       readInstallationIdFromFile() {
         const installationIdFile = this.getInstallationIdPath();
-        if (fs15.existsSync(installationIdFile)) {
-          const installationid = fs15.readFileSync(installationIdFile, "utf-8").trim();
+        if (fs14.existsSync(installationIdFile)) {
+          const installationid = fs14.readFileSync(installationIdFile, "utf-8").trim();
           return installationid || null;
         }
         return null;
       }
       writeInstallationIdToFile(installationId) {
         const installationIdFile = this.getInstallationIdPath();
-        const dir = path9.dirname(installationIdFile);
-        fs15.mkdirSync(dir, { recursive: true });
-        fs15.writeFileSync(installationIdFile, installationId, "utf-8");
+        const dir = path8.dirname(installationIdFile);
+        fs14.mkdirSync(dir, { recursive: true });
+        fs14.writeFileSync(installationIdFile, installationId, "utf-8");
       }
       /**
        * Retrieves the installation ID from a file, creating it if it doesn't exist.
@@ -109532,10 +109374,10 @@ function makeChatCompressionEvent({ tokens_before, tokens_after }) {
   };
 }
 var EVENT_CLI_CONFIG, StartSessionEvent, EndSessionEvent, EVENT_USER_PROMPT, UserPromptEvent, EVENT_TOOL_CALL, ToolCallEvent, EVENT_API_REQUEST, ApiRequestEvent, EVENT_API_ERROR, ApiErrorEvent, EVENT_API_RESPONSE, EVENT_GEN_AI_OPERATION_DETAILS, ApiResponseEvent, EVENT_FLASH_FALLBACK, FlashFallbackEvent, EVENT_RIPGREP_FALLBACK, RipgrepFallbackEvent, LoopType, LoopDetectedEvent, LoopDetectionDisabledEvent, EVENT_NEXT_SPEAKER_CHECK, NextSpeakerCheckEvent, EVENT_CONSECA_POLICY_GENERATION, ConsecaPolicyGenerationEvent, EVENT_CONSECA_VERDICT, ConsecaVerdictEvent, EVENT_SLASH_COMMAND, SlashCommandStatus, EVENT_REWIND, RewindEvent, EVENT_CHAT_COMPRESSION2, EVENT_MALFORMED_JSON_RESPONSE, MalformedJsonResponseEvent, IdeConnectionType, EVENT_IDE_CONNECTION, IdeConnectionEvent, EVENT_CONVERSATION_FINISHED, ConversationFinishedEvent, EVENT_FILE_OPERATION, FileOperationEvent, EVENT_INVALID_CHUNK, InvalidChunkEvent, EVENT_CONTENT_RETRY, ContentRetryEvent, EVENT_CONTENT_RETRY_FAILURE, ContentRetryFailureEvent, EVENT_MODEL_ROUTING, ModelRoutingEvent, EVENT_EXTENSION_INSTALL, ExtensionInstallEvent, EVENT_TOOL_OUTPUT_TRUNCATED, ToolOutputTruncatedEvent, EVENT_TOOL_OUTPUT_MASKING, ToolOutputMaskingEvent, EVENT_EXTENSION_UNINSTALL, ExtensionUninstallEvent, EVENT_EXTENSION_UPDATE, ExtensionUpdateEvent, EVENT_EXTENSION_ENABLE, ExtensionEnableEvent, EVENT_MODEL_SLASH_COMMAND, ModelSlashCommandEvent, EVENT_LLM_LOOP_CHECK, LlmLoopCheckEvent, EVENT_EXTENSION_DISABLE, ExtensionDisableEvent, EVENT_EDIT_STRATEGY, EditStrategyEvent, EVENT_EDIT_CORRECTION, EditCorrectionEvent, EVENT_STARTUP_STATS, StartupStatsEvent, BaseAgentEvent, EVENT_AGENT_START, AgentStartEvent, EVENT_AGENT_FINISH, AgentFinishEvent, EVENT_AGENT_RECOVERY_ATTEMPT, RecoveryAttemptEvent, EVENT_WEB_FETCH_FALLBACK_ATTEMPT, WebFetchFallbackAttemptEvent, EVENT_HOOK_CALL, EVENT_APPROVAL_MODE_SWITCH, ApprovalModeSwitchEvent, EVENT_APPROVAL_MODE_DURATION, ApprovalModeDurationEvent, EVENT_PLAN_EXECUTION, PlanExecutionEvent, HookCallEvent, EVENT_KEYCHAIN_AVAILABILITY, KeychainAvailabilityEvent, EVENT_TOKEN_STORAGE_INITIALIZATION, TokenStorageInitializationEvent;
-var init_types6 = __esm({
+var init_types5 = __esm({
   "packages/core/dist/src/telemetry/types.js"() {
     "use strict";
-    init_types3();
+    init_types2();
     init_mcp_tool();
     init_contentGenerator();
     init_tool_call_decision();
@@ -111907,7 +111749,7 @@ function custom(check2, _params = {}, fatal) {
   return ZodAny.create();
 }
 var ParseInputLazyPath, handleResult, ZodType, cuidRegex, cuid2Regex, ulidRegex, uuidRegex, nanoidRegex, jwtRegex, durationRegex, emailRegex, _emojiRegex, emojiRegex2, ipv4Regex, ipv4CidrRegex, ipv6Regex, ipv6CidrRegex, base64Regex, base64urlRegex, dateRegexSource, dateRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, BRAND, ZodBranded, ZodPipeline, ZodReadonly, late, ZodFirstPartyTypeKind, instanceOfType, stringType, numberType, nanType, bigIntType, booleanType, dateType, symbolType, undefinedType, nullType, anyType, unknownType, neverType, voidType, arrayType, objectType, strictObjectType, unionType, discriminatedUnionType, intersectionType, tupleType, recordType, mapType, setType, functionType, lazyType, literalType, enumType, nativeEnumType, promiseType, effectsType, optionalType, nullableType, preprocessType, pipelineType, ostring, onumber, oboolean, coerce, NEVER;
-var init_types7 = __esm({
+var init_types6 = __esm({
   "node_modules/zod/v3/types.js"() {
     init_ZodError();
     init_errors2();
@@ -115287,7 +115129,7 @@ var init_external = __esm({
     init_parseUtil();
     init_typeAliases();
     init_util();
-    init_types7();
+    init_types6();
     init_ZodError();
   }
 });
@@ -115409,17 +115251,137 @@ var init_markdownUtils = __esm({
   }
 });
 
+// packages/core/dist/src/services/fileKeychain.js
+import { promises as fs15 } from "node:fs";
+import * as path9 from "node:path";
+import * as os6 from "node:os";
+import * as crypto8 from "node:crypto";
+var FileKeychain;
+var init_fileKeychain = __esm({
+  "packages/core/dist/src/services/fileKeychain.js"() {
+    "use strict";
+    init_paths();
+    FileKeychain = class {
+      tokenFilePath;
+      encryptionKey;
+      constructor() {
+        const configDir = path9.join(homedir(), GEMINI_DIR);
+        this.tokenFilePath = path9.join(configDir, "gemini-credentials.json");
+        this.encryptionKey = this.deriveEncryptionKey();
+      }
+      deriveEncryptionKey() {
+        const salt = `${os6.hostname()}-${os6.userInfo().username}-gemini-cli`;
+        return crypto8.scryptSync("gemini-cli-oauth", salt, 32);
+      }
+      encrypt(text) {
+        const iv = crypto8.randomBytes(16);
+        const cipher = crypto8.createCipheriv("aes-256-gcm", this.encryptionKey, iv);
+        let encrypted = cipher.update(text, "utf8", "hex");
+        encrypted += cipher.final("hex");
+        const authTag = cipher.getAuthTag();
+        return iv.toString("hex") + ":" + authTag.toString("hex") + ":" + encrypted;
+      }
+      decrypt(encryptedData) {
+        const parts2 = encryptedData.split(":");
+        if (parts2.length !== 3) {
+          throw new Error("Invalid encrypted data format");
+        }
+        const iv = Buffer.from(parts2[0], "hex");
+        const authTag = Buffer.from(parts2[1], "hex");
+        const encrypted = parts2[2];
+        const decipher = crypto8.createDecipheriv("aes-256-gcm", this.encryptionKey, iv);
+        decipher.setAuthTag(authTag);
+        let decrypted = decipher.update(encrypted, "hex", "utf8");
+        decrypted += decipher.final("utf8");
+        return decrypted;
+      }
+      async ensureDirectoryExists() {
+        const dir = path9.dirname(this.tokenFilePath);
+        await fs15.mkdir(dir, { recursive: true, mode: 448 });
+      }
+      async loadData() {
+        try {
+          const data = await fs15.readFile(this.tokenFilePath, "utf-8");
+          const decrypted = this.decrypt(data);
+          return JSON.parse(decrypted);
+        } catch (error40) {
+          const err2 = error40;
+          if (err2.code === "ENOENT") {
+            return {};
+          }
+          if (err2.message?.includes("Invalid encrypted data format") || err2.message?.includes("Unsupported state or unable to authenticate data")) {
+            throw new Error(`Corrupted credentials file detected at: ${this.tokenFilePath}
+Please delete or rename this file to resolve the issue.`);
+          }
+          throw error40;
+        }
+      }
+      async saveData(data) {
+        await this.ensureDirectoryExists();
+        const json4 = JSON.stringify(data, null, 2);
+        const encrypted = this.encrypt(json4);
+        await fs15.writeFile(this.tokenFilePath, encrypted, { mode: 384 });
+      }
+      async getPassword(service, account) {
+        const data = await this.loadData();
+        return data[service]?.[account] ?? null;
+      }
+      async setPassword(service, account, password) {
+        const data = await this.loadData();
+        if (!data[service]) {
+          data[service] = {};
+        }
+        data[service][account] = password;
+        await this.saveData(data);
+      }
+      async deletePassword(service, account) {
+        const data = await this.loadData();
+        if (data[service] && account in data[service]) {
+          delete data[service][account];
+          if (Object.keys(data[service]).length === 0) {
+            delete data[service];
+          }
+          if (Object.keys(data).length === 0) {
+            try {
+              await fs15.unlink(this.tokenFilePath);
+            } catch (error40) {
+              const err2 = error40;
+              if (err2.code !== "ENOENT") {
+                throw error40;
+              }
+            }
+          } else {
+            await this.saveData(data);
+          }
+          return true;
+        }
+        return false;
+      }
+      async findCredentials(service) {
+        const data = await this.loadData();
+        const serviceData = data[service] || {};
+        return Object.entries(serviceData).map(([account, password]) => ({
+          account,
+          password
+        }));
+      }
+    };
+  }
+});
+
 // packages/core/dist/src/services/keychainService.js
 import * as crypto9 from "node:crypto";
-var KeychainService;
+var FORCE_FILE_STORAGE_ENV_VAR, KeychainService;
 var init_keychainService = __esm({
   "packages/core/dist/src/services/keychainService.js"() {
     "use strict";
     init_events();
-    init_types6();
+    init_types5();
     init_debugLogger();
     init_keychainTypes();
     init_markdownUtils();
+    init_fileKeychain();
+    FORCE_FILE_STORAGE_ENV_VAR = "GEMINI_FORCE_FILE_STORAGE";
     KeychainService = class {
       serviceName;
       // Track an ongoing initialization attempt to avoid race conditions.
@@ -115433,6 +115395,13 @@ var init_keychainService = __esm({
       async isAvailable() {
         return await this.getKeychain() !== null;
       }
+      /**
+       * Returns true if the service is using the encrypted file fallback backend.
+       */
+      async isUsingFileFallback() {
+        const keychain = await this.getKeychain();
+        return keychain instanceof FileKeychain;
+      }
       /**
        * Retrieves a secret for the given account.
        * @throws Error if the keychain is unavailable.
@@ -115479,20 +115448,27 @@ var init_keychainService = __esm({
       // High-level orchestration of the loading and testing cycle.
       async initializeKeychain() {
         let resultKeychain = null;
-        try {
-          const keychainModule = await this.loadKeychainModule();
-          if (keychainModule) {
-            if (await this.isKeychainFunctional(keychainModule)) {
-              resultKeychain = keychainModule;
-            } else {
-              debugLogger.log("Keychain functional verification failed");
+        const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
+        if (!forceFileStorage) {
+          try {
+            const keychainModule = await this.loadKeychainModule();
+            if (keychainModule) {
+              if (await this.isKeychainFunctional(keychainModule)) {
+                resultKeychain = keychainModule;
+              } else {
+                debugLogger.log("Keychain functional verification failed");
+              }
             }
+          } catch (error40) {
+            const message = error40 instanceof Error ? error40.message : String(error40);
+            debugLogger.log("Keychain initialization encountered an error:", message);
           }
-        } catch (error40) {
-          const message = error40 instanceof Error ? error40.message : String(error40);
-          debugLogger.log("Keychain initialization encountered an error:", message);
         }
-        coreEvents.emitTelemetryKeychainAvailability(new KeychainAvailabilityEvent(resultKeychain !== null));
+        coreEvents.emitTelemetryKeychainAvailability(new KeychainAvailabilityEvent(resultKeychain !== null && !forceFileStorage));
+        if (!resultKeychain) {
+          resultKeychain = new FileKeychain();
+          debugLogger.log("Using FileKeychain fallback for secure storage.");
+        }
         return resultKeychain;
       }
       // Low-level dynamic loading and structural validation.
@@ -115521,10 +115497,6 @@ var init_keychainService = __esm({
 });
 
 // packages/core/dist/src/mcp/token-storage/keychain-token-storage.js
-var keychain_token_storage_exports = {};
-__export(keychain_token_storage_exports, {
-  KeychainTokenStorage: () => KeychainTokenStorage
-});
 var KeychainTokenStorage;
 var init_keychain_token_storage = __esm({
   "packages/core/dist/src/mcp/token-storage/keychain-token-storage.js"() {
@@ -115625,6 +115597,9 @@ var init_keychain_token_storage = __esm({
       async isAvailable() {
         return this.keychainService.isAvailable();
       }
+      async isUsingFileFallback() {
+        return this.keychainService.isUsingFileFallback();
+      }
       async setSecret(key, value) {
         await this.keychainService.setPassword(`${SECRET_PREFIX}${key}`, value);
       }
@@ -115650,17 +115625,29 @@ var init_keychain_token_storage = __esm({
   }
 });
 
+// packages/core/dist/src/mcp/token-storage/types.js
+var TokenStorageType;
+var init_types7 = __esm({
+  "packages/core/dist/src/mcp/token-storage/types.js"() {
+    "use strict";
+    (function(TokenStorageType2) {
+      TokenStorageType2["KEYCHAIN"] = "keychain";
+      TokenStorageType2["ENCRYPTED_FILE"] = "encrypted_file";
+    })(TokenStorageType || (TokenStorageType = {}));
+  }
+});
+
 // packages/core/dist/src/mcp/token-storage/hybrid-token-storage.js
-var FORCE_FILE_STORAGE_ENV_VAR, HybridTokenStorage;
+var HybridTokenStorage;
 var init_hybrid_token_storage = __esm({
   "packages/core/dist/src/mcp/token-storage/hybrid-token-storage.js"() {
     "use strict";
     init_base_token_storage();
-    init_file_token_storage();
-    init_types();
+    init_keychain_token_storage();
+    init_types7();
     init_events();
-    init_types6();
-    FORCE_FILE_STORAGE_ENV_VAR = "GEMINI_FORCE_FILE_STORAGE";
+    init_types5();
+    init_keychainService();
     HybridTokenStorage = class extends BaseTokenStorage {
       storage = null;
       storageType = null;
@@ -115670,23 +115657,11 @@ var init_hybrid_token_storage = __esm({
       }
       async initializeStorage() {
         const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
-        if (!forceFileStorage) {
-          try {
-            const { KeychainTokenStorage: KeychainTokenStorage2 } = await Promise.resolve().then(() => (init_keychain_token_storage(), keychain_token_storage_exports));
-            const keychainStorage = new KeychainTokenStorage2(this.serviceName);
-            const isAvailable = await keychainStorage.isAvailable();
-            if (isAvailable) {
-              this.storage = keychainStorage;
-              this.storageType = TokenStorageType.KEYCHAIN;
-              coreEvents.emitTelemetryTokenStorageType(new TokenStorageInitializationEvent("keychain", forceFileStorage));
-              return this.storage;
-            }
-          } catch (_e2) {
-          }
-        }
-        this.storage = new FileTokenStorage(this.serviceName);
-        this.storageType = TokenStorageType.ENCRYPTED_FILE;
-        coreEvents.emitTelemetryTokenStorageType(new TokenStorageInitializationEvent("encrypted_file", forceFileStorage));
+        const keychainStorage = new KeychainTokenStorage(this.serviceName);
+        this.storage = keychainStorage;
+        const isUsingFileFallback = await keychainStorage.isUsingFileFallback();
+        this.storageType = isUsingFileFallback ? TokenStorageType.ENCRYPTED_FILE : TokenStorageType.KEYCHAIN;
+        coreEvents.emitTelemetryTokenStorageType(new TokenStorageInitializationEvent(isUsingFileFallback ? "encrypted_file" : "keychain", forceFileStorage));
         return this.storage;
       }
       async getStorage() {
@@ -115834,10 +115809,10 @@ var DEFAULT_SERVICE_NAME, FORCE_ENCRYPTED_FILE_ENV_VAR;
 var init_token_storage = __esm({
   "packages/core/dist/src/mcp/token-storage/index.js"() {
     "use strict";
-    init_types();
+    init_types7();
     init_base_token_storage();
-    init_file_token_storage();
     init_hybrid_token_storage();
+    init_keychain_token_storage();
     DEFAULT_SERVICE_NAME = "gemini-cli-oauth";
     FORCE_ENCRYPTED_FILE_ENV_VAR = "GEMINI_FORCE_ENCRYPTED_FILE_STORAGE";
   }
@@ -195045,18 +195020,28 @@ function isValidToolName(name3, options = {}) {
   if (options.allowWildcards && name3 === "*") {
     return true;
   }
-  if (name3.includes("__")) {
-    const parts2 = name3.split("__");
-    if (parts2.length !== 2 || parts2[0].length === 0 || parts2[1].length === 0) {
+  if (isMcpToolName(name3)) {
+    if (name3 === `${MCP_TOOL_PREFIX}*` && options.allowWildcards) {
+      return true;
+    }
+    if (name3.startsWith(`${MCP_TOOL_PREFIX}_`)) {
       return false;
     }
-    const server = parts2[0];
-    const tool = parts2[1];
-    if (tool === "*") {
-      return !!options.allowWildcards;
+    const parsed = parseMcpToolName(name3);
+    if (parsed.serverName && parsed.toolName) {
+      const slugRegex = /^[a-z0-9_.:-]+$/i;
+      if (!slugRegex.test(parsed.serverName)) {
+        return false;
+      }
+      if (parsed.toolName === "*") {
+        return options.allowWildcards === true;
+      }
+      if (/^_*$/.test(parsed.toolName)) {
+        return false;
+      }
+      return slugRegex.test(parsed.toolName);
     }
-    const slugRegex = /^[a-z0-9_.:-]+$/i;
-    return slugRegex.test(server) && slugRegex.test(tool);
+    return false;
   }
   return false;
 }
@@ -195065,6 +195050,7 @@ var init_tool_names = __esm({
   "packages/core/dist/src/tools/tool-names.js"() {
     "use strict";
     init_coreTools();
+    init_mcp_tool();
     LS_TOOL_NAME_LEGACY = "list_directory";
     EDIT_TOOL_NAMES = /* @__PURE__ */ new Set([EDIT_TOOL_NAME, WRITE_FILE_TOOL_NAME]);
     SENSITIVE_TOOLS = /* @__PURE__ */ new Set([
@@ -195136,8 +195122,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "c56e58d7a";
-    CLI_VERSION = "0.34.0-preview.1";
+    GIT_COMMIT_INFO = "810cd6716";
+    CLI_VERSION = "0.34.0-preview.3";
   }
 });
 
@@ -273277,7 +273263,7 @@ var createInitialRoleMetrics, createInitialModelMetrics, createInitialMetrics, U
 var init_uiTelemetry = __esm({
   "packages/core/dist/src/telemetry/uiTelemetry.js"() {
     "use strict";
-    init_types6();
+    init_types5();
     init_tool_call_decision();
     createInitialRoleMetrics = () => ({
       totalRequests: 0,
@@ -274468,7 +274454,7 @@ var init_startupProfiler = __esm({
     "use strict";
     init_metrics2();
     init_debugLogger();
-    init_types6();
+    init_types5();
     init_loggers();
     StartupProfiler = class _StartupProfiler {
       phases = /* @__PURE__ */ new Map();
@@ -274626,9 +274612,9 @@ var init_telemetry = __esm({
     init_gcp_exporters();
     init_loggers();
     init_conseca_logger();
-    init_types6();
+    init_types5();
     init_llmRole();
-    init_types6();
+    init_types5();
     init_esm();
     init_esm2();
     init_uiTelemetry();
@@ -275539,7 +275525,7 @@ var init_loggers = __esm({
     "use strict";
     import_api_logs2 = __toESM(require_src12(), 1);
     init_constants();
-    init_types6();
+    init_types5();
     init_metrics2();
     init_sdk();
     init_uiTelemetry();
@@ -325977,7 +325963,7 @@ var init_baseLlmClient = __esm({
     init_errorReporting();
     init_errors();
     init_loggers();
-    init_types6();
+    init_types5();
     init_retry();
     init_policyHelpers();
     DEFAULT_MAX_ATTEMPTS2 = 5;
@@ -326205,7 +326191,7 @@ var init_llm_edit_fixer = __esm({
     init_mnemonist();
     init_promptIdContext();
     init_debugLogger();
-    init_types6();
+    init_types5();
     MAX_CACHE_SIZE = 50;
     GENERATE_JSON_TIMEOUT_MS = 4e4;
     EDIT_SYS_PROMPT = `
@@ -326782,15 +326768,15 @@ var init_edit = __esm({
     init_paths();
     init_errors();
     init_pathCorrector();
+    init_types();
     init_types2();
-    init_types3();
     init_diffOptions();
     init_diff_utils();
     init_modifiable_tool();
     init_ide_client();
     init_llm_edit_fixer();
     init_textUtils();
-    init_types6();
+    init_types5();
     init_loggers();
     init_tool_names();
     init_debugLogger();
@@ -327379,7 +327365,7 @@ var init_editCorrector = __esm({
     init_promptIdContext();
     init_debugLogger();
     init_mnemonist();
-    init_types6();
+    init_types5();
     CODE_CORRECTION_SYSTEM_PROMPT = `
 You are an expert code-editing assistant. Your task is to analyze a failed edit attempt and provide a corrected version of the text snippets.
 The correction should be as minimal as possible, staying very close to the original.
@@ -328678,7 +328664,7 @@ var init_write_file = __esm({
     "use strict";
     init_libesm();
     init_tool_names();
-    init_types2();
+    init_types();
     init_tools();
     init_utils4();
     init_tool_error();
@@ -328690,7 +328676,7 @@ var init_write_file = __esm({
     init_diff_utils();
     init_ide_client();
     init_loggers();
-    init_types6();
+    init_types5();
     init_metrics2();
     init_fileUtils();
     init_language_detection();
@@ -334183,7 +334169,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.34.0-preview.1";
+    return "0.34.0-preview.3";
   })();
   return versionPromise;
 }
@@ -334270,7 +334256,7 @@ var init_server = __esm({
     init_converter();
     init_telemetry2();
     init_client_metadata();
-    init_types6();
+    init_types5();
     CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com";
     CODE_ASSIST_API_VERSION = "v1internal";
     GENERATE_CONTENT_RETRY_DELAY_IN_MILLISECONDS = 1e3;
@@ -335007,7 +334993,7 @@ var LoggingContentGenerator;
 var init_loggingContentGenerator = __esm({
   "packages/core/dist/src/core/loggingContentGenerator.js"() {
     "use strict";
-    init_types6();
+    init_types5();
     init_loggers();
     init_server();
     init_converter();
@@ -335990,7 +335976,7 @@ var init_tool_registry = __esm({
   "packages/core/dist/src/tools/tool-registry.js"() {
     "use strict";
     init_tools();
-    init_types2();
+    init_types();
     init_mcp_tool();
     import_shell_quote = __toESM(require_shell_quote(), 1);
     init_tool_error();
@@ -336138,11 +336124,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
        */
       registerTool(tool) {
         if (this.allKnownTools.has(tool.name)) {
-          if (tool instanceof DiscoveredMCPTool) {
-            tool = tool.asFullyQualifiedTool();
-          } else {
-            debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
-          }
+          debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
         }
         this.allKnownTools.set(tool.name, tool);
       }
@@ -336416,7 +336398,14 @@ Signal: Signal number or \`(none)\` if no signal was received.
         for (const name3 of toolNames) {
           const tool = this.getTool(name3);
           if (tool) {
-            declarations.push(tool.getSchema(modelId));
+            let schema2 = tool.getSchema(modelId);
+            if (tool instanceof DiscoveredMCPTool) {
+              schema2 = {
+                ...schema2,
+                name: tool.getFullyQualifiedName()
+              };
+            }
+            declarations.push(schema2);
           }
         }
         return declarations;
@@ -336476,16 +336465,6 @@ Signal: Signal number or \`(none)\` if no signal was received.
             debugLogger.debug(`Resolved legacy tool name "${name3}" to current name "${currentName}"`);
           }
         }
-        if (!tool && name3.includes("__")) {
-          for (const t3 of this.allKnownTools.values()) {
-            if (t3 instanceof DiscoveredMCPTool) {
-              if (t3.getFullyQualifiedName() === name3) {
-                tool = t3;
-                break;
-              }
-            }
-          }
-        }
         if (tool && this.isActiveTool(tool)) {
           return tool;
         }
@@ -337581,7 +337560,7 @@ var init_read_file = __esm({
     init_metrics2();
     init_telemetry_utils();
     init_loggers();
-    init_types6();
+    init_types5();
     init_tool_names();
     init_fileDiscoveryService();
     init_coreTools();
@@ -387964,7 +387943,7 @@ var init_web_fetch = __esm({
     init_utils4();
     init_tool_error();
     init_errors();
-    init_types2();
+    init_types();
     init_partUtils();
     init_fetch();
     init_textUtils();
@@ -388571,7 +388550,7 @@ var init_ask_user = __esm({
     "use strict";
     init_tools();
     init_tool_error();
-    init_types4();
+    init_types3();
     init_tool_names();
     init_coreTools();
     init_resolver();
@@ -388768,7 +388747,7 @@ function getPlanModeExitMessage(newMode, isManual = false) {
 var init_approvalModeUtils = __esm({
   "packages/core/dist/src/utils/approvalModeUtils.js"() {
     "use strict";
-    init_types2();
+    init_types();
     init_checks4();
   }
 });
@@ -388782,10 +388761,10 @@ var init_exit_plan_mode = __esm({
     init_tools();
     init_tool_names();
     init_planUtils();
-    init_types2();
+    init_types();
     init_paths();
     init_loggers();
-    init_types6();
+    init_types5();
     init_coreTools();
     init_resolver();
     init_approvalModeUtils();
@@ -388936,7 +388915,7 @@ var init_enter_plan_mode = __esm({
     "use strict";
     init_tools();
     init_tool_names();
-    init_types2();
+    init_types();
     init_coreTools();
     init_resolver();
     EnterPlanModeTool = class _EnterPlanModeTool extends BaseDeclarativeTool {
@@ -389219,8 +389198,8 @@ var init_tool_utils = __esm({
     init_src2();
     init_shell_utils();
     import_fast_levenshtein2 = __toESM(require_levenshtein(), 1);
+    init_types();
     init_types2();
-    init_types3();
     init_tool_names();
   }
 });
@@ -389841,7 +389820,7 @@ var init_tool_executor = __esm({
     init_coreToolHookTriggers();
     init_fileUtils();
     init_generateContentResponseUtilities();
-    init_types3();
+    init_types2();
     init_constants();
     ToolExecutor = class {
       config;
@@ -390167,8 +390146,8 @@ var init_policy = __esm({
   "packages/core/dist/src/scheduler/policy.js"() {
     "use strict";
     init_tool_error();
-    init_types2();
-    init_types4();
+    init_types();
+    init_types3();
     init_tools();
     init_utils4();
     init_paths();
@@ -390183,15 +390162,15 @@ var init_coreToolScheduler = __esm({
   "packages/core/dist/src/core/coreToolScheduler.js"() {
     "use strict";
     init_tools();
-    init_types2();
+    init_types();
     init_loggers();
     init_tool_error();
-    init_types6();
+    init_types5();
     init_trace3();
     init_tool_modifier();
     init_tool_utils();
-    init_types4();
     init_types3();
+    init_types2();
     init_tool_executor();
     init_mcp_tool();
     init_policy();
@@ -391387,7 +391366,7 @@ var init_geminiChat = __esm({
     init_tools();
     init_loggers();
     init_chatRecordingService();
-    init_types6();
+    init_types5();
     init_handler();
     init_messageInspectors();
     init_geminiRequest();
@@ -391964,8 +391943,8 @@ var init_turn = __esm({
     init_geminiChat();
     init_thoughtUtils();
     init_generateContentResponseUtilities();
-    init_types6();
-    init_types3();
+    init_types5();
+    init_types2();
     (function(GeminiEventType2) {
       GeminiEventType2["Content"] = "content";
       GeminiEventType2["ToolCallRequest"] = "tool_call_request";
@@ -393585,7 +393564,7 @@ var init_promptProvider = __esm({
   "packages/core/dist/src/prompts/promptProvider.js"() {
     "use strict";
     init_paths();
-    init_types2();
+    init_types();
     init_snippets();
     init_snippets_legacy();
     init_utils6();
@@ -393795,7 +393774,7 @@ var init_nextSpeakerChecker = __esm({
     "use strict";
     init_messageInspectors();
     init_debugLogger();
-    init_types6();
+    init_types5();
     CHECK_PROMPT = `Analyze *only* the content and structure of your immediately preceding response (your last turn in the conversation history). Based *strictly* on that response, determine who should logically speak next: the 'user' or the 'model' (you).
 **Decision Rules (apply in order):**
 1.  **Model Continues:** If your last response explicitly states an immediate next action *you* intend to take (e.g., "Next, I will...", "Now I'll process...", "Moving on to analyze...", indicates an intended tool call that didn't execute), OR if the response seems clearly incomplete (cut off mid-thought without a natural conclusion), then the **'model'** should speak next.
@@ -393849,7 +393828,7 @@ var init_loopDetectionService = __esm({
     "use strict";
     init_turn();
     init_loggers();
-    init_types6();
+    init_types5();
     init_messageInspectors();
     init_debugLogger();
     TOOL_CALL_LOOP_THRESHOLD = 5;
@@ -394434,7 +394413,7 @@ var init_chatCompressionService = __esm({
     init_prompts();
     init_partUtils();
     init_loggers();
-    init_types6();
+    init_types5();
     init_fileUtils();
     init_debugLogger();
     init_environmentContext();
@@ -394626,7 +394605,7 @@ var init_toolOutputMaskingService = __esm({
     init_fileUtils();
     init_loggers();
     init_tool_names();
-    init_types6();
+    init_types5();
     DEFAULT_TOOL_PROTECTION_THRESHOLD = 5e4;
     DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD = 3e4;
     DEFAULT_PROTECT_LATEST_TURN = true;
@@ -394870,7 +394849,7 @@ var init_client3 = __esm({
     init_chatCompressionService();
     init_ideContext();
     init_loggers();
-    init_types6();
+    init_types5();
     init_uiTelemetry();
     init_handler();
     init_debugLogger();
@@ -401259,7 +401238,7 @@ var init_classifierStrategy = __esm({
     init_node();
     init_messageInspectors();
     init_debugLogger();
-    init_types6();
+    init_types5();
     HISTORY_TURNS_FOR_CONTEXT2 = 4;
     HISTORY_SEARCH_WINDOW2 = 20;
     FLASH_MODEL2 = "flash";
@@ -401424,7 +401403,7 @@ var init_numericalClassifierStrategy = __esm({
     init_models();
     init_node();
     init_debugLogger();
-    init_types6();
+    init_types5();
     HISTORY_TURNS_FOR_CONTEXT3 = 8;
     FLASH_MODEL3 = "flash";
     PRO_MODEL3 = "pro";
@@ -401694,7 +401673,7 @@ var init_approvalModeStrategy = __esm({
   "packages/core/dist/src/routing/strategies/approvalModeStrategy.js"() {
     "use strict";
     init_models();
-    init_types2();
+    init_types();
     ApprovalModeStrategy = class {
       name = "approval-mode";
       async route(context2, config2, _baseLlmClient) {
@@ -401753,7 +401732,7 @@ var init_modelRouterService = __esm({
     init_overrideStrategy();
     init_approvalModeStrategy();
     init_loggers();
-    init_types6();
+    init_types5();
     init_debugLogger();
     ModelRouterService = class {
       config;
@@ -403476,8 +403455,8 @@ var MessageBus;
 var init_message_bus = __esm({
   "packages/core/dist/src/confirmation-bus/message-bus.js"() {
     "use strict";
-    init_types2();
-    init_types4();
+    init_types();
+    init_types3();
     init_safeJsonStringify();
     init_debugLogger();
     MessageBus = class extends EventEmitter12 {
@@ -403737,7 +403716,7 @@ var init_policy_engine = __esm({
   "packages/core/dist/src/policy/policy-engine.js"() {
     "use strict";
     init_node();
-    init_types2();
+    init_types();
     init_stable_stringify();
     init_debugLogger();
     init_protocol2();
@@ -405122,7 +405101,7 @@ var init_hookEventHandler = __esm({
     init_types16();
     init_hookTranslator();
     init_loggers();
-    init_types6();
+    init_types5();
     init_debugLogger();
     init_events();
     HookEventHandler = class {
@@ -408735,7 +408714,7 @@ var init_agentLoader = __esm({
       name: nameSchema,
       description: external_exports.string().min(1),
       display_name: external_exports.string().optional(),
-      tools: external_exports.array(external_exports.string().refine((val) => isValidToolName(val), {
+      tools: external_exports.array(external_exports.string().refine((val) => isValidToolName(val, { allowWildcards: true }), {
         message: "Invalid tool name"
       })).optional(),
       model: external_exports.string().optional(),
@@ -413885,7 +413864,7 @@ var init_registry = __esm({
     init_debugLogger();
     init_models();
     init_modelConfigService();
-    init_types2();
+    init_types();
     init_a2a_errors();
     AgentRegistry = class {
       config;
@@ -414351,8 +414330,8 @@ var SchedulerStateManager;
 var init_state_manager = __esm({
   "packages/core/dist/src/scheduler/state-manager.js"() {
     "use strict";
+    init_types2();
     init_types3();
-    init_types4();
     init_tool_utils();
     SchedulerStateManager = class {
       messageBus;
@@ -414877,9 +414856,9 @@ async function waitForConfirmation(messageBus, correlationId, signal, ideConfirm
 var init_confirmation = __esm({
   "packages/core/dist/src/scheduler/confirmation.js"() {
     "use strict";
-    init_types4();
-    init_tools();
     init_types3();
+    init_tools();
+    init_types2();
     init_editor();
     init_debugLogger();
     init_events();
@@ -414896,15 +414875,15 @@ var init_scheduler2 = __esm({
     init_policy();
     init_tool_executor();
     init_tool_modifier();
-    init_types3();
-    init_tool_error();
     init_types2();
+    init_tool_error();
+    init_types();
     init_tools();
     init_tool_utils();
     init_trace3();
     init_loggers();
-    init_types6();
-    init_types4();
+    init_types5();
+    init_types3();
     init_toolCallContext();
     init_events();
     init_constants();
@@ -415590,15 +415569,16 @@ var init_local_executor = __esm({
     init_geminiChat();
     init_node();
     init_tool_registry();
+    init_tools();
     init_mcp_tool();
     init_turn();
+    init_types2();
     init_types3();
-    init_types4();
     init_chatCompressionService();
     init_environmentContext();
     init_promptIdContext();
     init_loggers();
-    init_types6();
+    init_types5();
     init_types18();
     init_errors();
     init_utils8();
@@ -415649,18 +415629,40 @@ var init_local_executor = __esm({
         const agentToolRegistry = new ToolRegistry(runtimeContext, subagentMessageBus);
         const parentToolRegistry = runtimeContext.getToolRegistry();
         const allAgentNames = new Set(runtimeContext.getAgentRegistry().getAllAgentNames());
+        const registerToolInstance = (tool) => {
+          if (allAgentNames.has(tool.name)) {
+            debugLogger.warn(`[LocalAgentExecutor] Skipping subagent tool '${tool.name}' for agent '${definition.name}' to prevent recursion.`);
+            return;
+          }
+          agentToolRegistry.registerTool(tool);
+        };
         const registerToolByName = (toolName) => {
-          if (allAgentNames.has(toolName)) {
-            debugLogger.warn(`[LocalAgentExecutor] Skipping subagent tool '${toolName}' for agent '${definition.name}' to prevent recursion.`);
+          if (toolName === "*") {
+            for (const tool2 of parentToolRegistry.getAllTools()) {
+              registerToolInstance(tool2);
+            }
             return;
           }
+          if (isMcpToolName(toolName)) {
+            if (toolName === `${MCP_TOOL_PREFIX}*`) {
+              for (const tool2 of parentToolRegistry.getAllTools()) {
+                if (tool2 instanceof DiscoveredMCPTool) {
+                  registerToolInstance(tool2);
+                }
+              }
+              return;
+            }
+            const parsed = parseMcpToolName(toolName);
+            if (parsed.serverName && parsed.toolName === "*") {
+              for (const tool2 of parentToolRegistry.getToolsByServer(parsed.serverName)) {
+                registerToolInstance(tool2);
+              }
+              return;
+            }
+          }
           const tool = parentToolRegistry.getTool(toolName);
           if (tool) {
-            if (tool instanceof DiscoveredMCPTool) {
-              agentToolRegistry.registerTool(tool.asFullyQualifiedTool());
-            } else {
-              agentToolRegistry.registerTool(tool);
-            }
+            registerToolInstance(tool);
           }
         };
         if (definition.toolConfig) {
@@ -416323,17 +416325,12 @@ var init_local_executor = __esm({
         const toolsList = [];
         const { toolConfig, outputConfig } = this.definition;
         if (toolConfig) {
-          const toolNamesToLoad = [];
           for (const toolRef of toolConfig.tools) {
-            if (typeof toolRef === "string") {
-              toolNamesToLoad.push(toolRef);
-            } else if (typeof toolRef === "object" && "schema" in toolRef) {
-              toolsList.push(toolRef.schema);
-            } else {
+            if (typeof toolRef === "object" && !("schema" in toolRef)) {
               toolsList.push(toolRef);
             }
           }
-          toolsList.push(...this.toolRegistry.getFunctionDeclarationsFiltered(toolNamesToLoad));
+          toolsList.push(...this.toolRegistry.getFunctionDeclarations());
         }
         const completeTool = {
           name: TASK_COMPLETE_TOOL_NAME,
@@ -435283,7 +435280,7 @@ var import_fast_levenshtein3, import_toml, MAX_TYPO_DISTANCE, PolicyRuleSchema,
 var init_toml_loader = __esm({
   "packages/core/dist/src/policy/toml-loader.js"() {
     "use strict";
-    init_types2();
+    init_types();
     init_utils4();
     init_tool_names();
     init_tool_utils();
@@ -435740,11 +435737,11 @@ var init_config3 = __esm({
   "packages/core/dist/src/policy/config.js"() {
     "use strict";
     init_storage();
-    init_types2();
+    init_types();
     init_toml_loader();
     init_utils4();
     import_toml2 = __toESM(require_toml(), 1);
-    init_types4();
+    init_types3();
     init_message_bus();
     init_events();
     init_debugLogger();
@@ -436518,7 +436515,7 @@ var init_registry2 = __esm({
   "packages/core/dist/src/safety/registry.js"() {
     "use strict";
     init_built_in();
-    init_types2();
+    init_types();
     init_conseca();
     CheckerRegistry = class _CheckerRegistry {
       checkersPath;
@@ -439875,7 +439872,7 @@ var init_config4 = __esm({
     init_fileSystemService();
     init_trackerTools2();
     init_loggers();
-    init_types6();
+    init_types5();
     init_modelAvailabilityService();
     init_modelRouterService();
     init_types17();
@@ -439888,7 +439885,7 @@ var init_config4 = __esm({
     init_ignorePatterns();
     init_message_bus();
     init_policy_engine();
-    init_types2();
+    init_types();
     init_hooks();
     init_codeAssist();
     init_experiments();
@@ -446805,7 +446802,7 @@ var init_sessionSummaryService = __esm({
     init_geminiRequest();
     init_debugLogger();
     init_partUtils();
-    init_types6();
+    init_types5();
     DEFAULT_MAX_MESSAGES = 20;
     DEFAULT_TIMEOUT_MS = 5e3;
     MAX_MESSAGE_LENGTH = 500;
@@ -447251,7 +447248,7 @@ var init_read_many_files = __esm({
     init_metrics2();
     init_telemetry_utils();
     init_loggers();
-    init_types6();
+    init_types5();
     init_tool_error();
     init_tool_names();
     init_coreTools();
@@ -447711,13 +447708,13 @@ var init_src2 = __esm({
     init_types17();
     init_json_formatter();
     init_stream_json_formatter();
-    init_types2();
+    init_types();
     init_policy_engine();
     init_toml_loader();
     init_config3();
     init_integrity();
     init_billing2();
-    init_types4();
+    init_types3();
     init_message_bus();
     init_extensions();
     init_restore();
@@ -447736,7 +447733,7 @@ var init_src2 = __esm({
     init_geminiRequest();
     init_coreToolScheduler();
     init_scheduler2();
-    init_types3();
+    init_types2();
     init_tool_executor();
     init_recordingContentGenerator();
     init_types20();
@@ -447775,7 +447772,7 @@ var init_src2 = __esm({
     init_fileDiffUtils();
     init_retry();
     init_shell_utils();
-    init_types2();
+    init_types();
     init_tool_utils();
     init_terminalSerializer();
     init_systemEncoding();
@@ -448122,6 +448119,7 @@ __export(dist_exports, {
   ExtensionLoader: () => ExtensionLoader,
   ExtensionUninstallEvent: () => ExtensionUninstallEvent,
   ExtensionUpdateEvent: () => ExtensionUpdateEvent,
+  FORCE_FILE_STORAGE_ENV_VAR: () => FORCE_FILE_STORAGE_ENV_VAR,
   FRONTMATTER_REGEX: () => FRONTMATTER_REGEX,
   FatalAuthenticationError: () => FatalAuthenticationError,
   FatalCancellationError: () => FatalCancellationError,
@@ -448846,7 +448844,7 @@ var init_dist7 = __esm({
     init_config4();
     init_detect_ide();
     init_loggers();
-    init_types6();
+    init_types5();
     init_config5();
     init_pathReader();
     init_clearcut_logger();
@@ -528062,7 +528060,7 @@ var WarningMessage = ({ text }) => {
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "881822fab";
+var GIT_COMMIT_INFO2 = "25bb21ed7";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 init_dist7();
@@ -576943,7 +576941,7 @@ async function loadSandboxConfig(settings, argv) {
   const sandboxOption = argv.sandbox ?? settings.tools?.sandbox;
   const command2 = getSandboxCommand(sandboxOption);
   const packageJson2 = await getPackageJson(__dirname13);
-  const image3 = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-preview.1" ?? packageJson2?.config?.sandboxImageUri;
+  const image3 = process.env["GEMINI_SANDBOX_IMAGE"] ?? "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-preview.3" ?? packageJson2?.config?.sandboxImageUri;
   return command2 && image3 ? { command: command2, image: image3 } : void 0;
 }