@google/gemini-cli-core 0.35.0-preview.2 → 0.36.0-nightly.20260321.fc03891a1

package/dist/src/config/config.d.ts

@@ -196,6 +196,10 @@ export interface BrowserAgentCustomConfig {
     allowedDomains?: string[];
     /** Disable user input on the browser window during automation. Default: true in non-headless mode */
     disableUserInput?: boolean;
+    /** Whether to confirm sensitive actions (e.g., fill_form, evaluate_script). */
+    confirmSensitiveActions?: boolean;
+    /** Whether to block file uploads. */
+    blockFileUploads?: boolean;
 }
 /**
  * All information required in CLI to handle an extension. Defined in Core so
@@ -258,6 +262,7 @@ export interface ExtensionInstallMetadata {
 import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, type FileFilteringOptions } from './constants.js';
 import { type ExtensionLoader } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
+import { A2AClientManager } from '../agents/a2a-client-manager.js';
 import { type McpContext } from '../tools/mcp-client.js';
 import type { EnvironmentSanitizationConfig } from '../services/environmentSanitization.js';
 export type { FileFilteringOptions };
@@ -294,7 +299,7 @@ export interface SandboxConfig {
     enabled: boolean;
     allowedPaths?: string[];
     networkAccess?: boolean;
-    command?: 'docker' | 'podman' | 'sandbox-exec' | 'runsc' | 'lxc';
+    command?: 'docker' | 'podman' | 'sandbox-exec' | 'runsc' | 'lxc' | 'windows-native';
     image?: string;
 }
 export declare const ConfigSchema: z.ZodObject<{
@@ -302,16 +307,16 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         allowedPaths: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
         networkAccess: z.ZodDefault<z.ZodBoolean>;
-        command: z.ZodOptional<z.ZodEnum<["docker", "podman", "sandbox-exec", "runsc", "lxc"]>>;
+        command: z.ZodOptional<z.ZodEnum<["docker", "podman", "sandbox-exec", "runsc", "lxc", "windows-native"]>>;
         image: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         enabled: boolean;
         allowedPaths: string[];
         networkAccess: boolean;
-        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | undefined;
+        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
     }, {
-        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | undefined;
+        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
         enabled?: boolean | undefined;
         allowedPaths?: string[] | undefined;
@@ -320,10 +325,10 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled: boolean;
         allowedPaths: string[];
         networkAccess: boolean;
-        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | undefined;
+        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
     }, {
-        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | undefined;
+        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
         enabled?: boolean | undefined;
         allowedPaths?: string[] | undefined;
@@ -334,12 +339,12 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled: boolean;
         allowedPaths: string[];
         networkAccess: boolean;
-        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | undefined;
+        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
     } | undefined;
 }, {
     sandbox?: {
-        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | undefined;
+        command?: "sandbox-exec" | "docker" | "podman" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
         enabled?: boolean | undefined;
         allowedPaths?: string[] | undefined;
@@ -363,6 +368,11 @@ export interface PolicyUpdateConfirmationRequest {
     policyDir: string;
     newHash: string;
 }
+export interface WorktreeSettings {
+    name: string;
+    path: string;
+    baseSha: string;
+}
 export interface ConfigParameters {
     sessionId: string;
     clientName?: string;
@@ -374,6 +384,7 @@ export interface ConfigParameters {
     debugMode: boolean;
     question?: string;
     coreTools?: string[];
+    mainAgentTools?: string[];
     /** @deprecated Use Policy Engine instead */
     allowedTools?: string[];
     /** @deprecated Use Policy Engine instead */
@@ -481,12 +492,14 @@ export interface ConfigParameters {
     disabledSkills?: string[];
     adminSkillsEnabled?: boolean;
     experimentalJitContext?: boolean;
+    experimentalMemoryManager?: boolean;
     topicUpdateNarration?: boolean;
     toolOutputMasking?: Partial<ToolOutputMaskingConfig>;
     disableLLMCorrection?: boolean;
     plan?: boolean;
     tracker?: boolean;
     planSettings?: PlanSettings;
+    worktreeSettings?: WorktreeSettings;
     modelSteering?: boolean;
     onModelChange?: (model: string) => void;
     mcpEnabled?: boolean;
@@ -505,13 +518,14 @@ export interface ConfigParameters {
 export declare class Config implements McpContext, AgentLoopContext {
     private _toolRegistry;
     private mcpClientManager?;
+    private readonly a2aClientManager?;
     private allowedMcpServers;
     private blockedMcpServers;
     private allowedEnvironmentVariables;
     private blockedEnvironmentVariables;
     private readonly enableEnvironmentVariableRedaction;
-    private promptRegistry;
-    private resourceRegistry;
+    private _promptRegistry;
+    private _resourceRegistry;
     private agentRegistry;
     private readonly acknowledgedAgentsService;
     private skillManager;
@@ -529,8 +543,10 @@ export declare class Config implements McpContext, AgentLoopContext {
     private workspaceContext;
     private readonly debugMode;
     private readonly question;
+    private readonly worktreeSettings;
     readonly enableConseca: boolean;
     private readonly coreTools;
+    private readonly mainAgentTools;
     /** @deprecated Use Policy Engine instead */
     private readonly allowedTools;
     /** @deprecated Use Policy Engine instead */
@@ -653,6 +669,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     private disabledSkills;
     private readonly adminSkillsEnabled;
     private readonly experimentalJitContext;
+    private readonly experimentalMemoryManager;
     private readonly topicUpdateNarration;
     private readonly disableLLMCorrection;
     private readonly planEnabled;
@@ -692,6 +709,16 @@ export declare class Config implements McpContext, AgentLoopContext {
      * Use the injected AgentLoopContext instead.
      */
     get toolRegistry(): ToolRegistry;
+    /**
+     * @deprecated Do not access directly on Config.
+     * Use the injected AgentLoopContext instead.
+     */
+    get promptRegistry(): PromptRegistry;
+    /**
+     * @deprecated Do not access directly on Config.
+     * Use the injected AgentLoopContext instead.
+     */
+    get resourceRegistry(): ResourceRegistry;
     /**
      * @deprecated Do not access directly on Config.
      * Use the injected AgentLoopContext instead.
@@ -704,6 +731,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     get geminiClient(): GeminiClient;
     get sandboxManager(): SandboxManager;
     getSessionId(): string;
+    getWorktreeSettings(): WorktreeSettings | undefined;
     getClientName(): string | undefined;
     setSessionId(sessionId: string): void;
     setTerminalBackground(terminalBackground: string | undefined): void;
@@ -770,6 +798,7 @@ export declare class Config implements McpContext, AgentLoopContext {
         resetTime?: string;
     } | undefined;
     getCoreTools(): string[] | undefined;
+    getMainAgentTools(): string[] | undefined;
     getAllowedTools(): string[] | undefined;
     /**
      * All the excluded tools from static configuration, loaded extensions, or
@@ -792,6 +821,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     getExtensionsEnabled(): boolean;
     getExtensionRegistryURI(): string | undefined;
     getMcpClientManager(): McpClientManager | undefined;
+    getA2AClientManager(): A2AClientManager | undefined;
     setUserInteractedWithMcp(): void;
     /** @deprecated Use getMcpClientManager().getLastError() directly */
     getLastMcpError(serverName: string): string | undefined;
@@ -823,6 +853,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     getEnvironmentMemory(): string;
     getContextManager(): ContextManager | undefined;
     isJitContextEnabled(): boolean;
+    isMemoryManagerEnabled(): boolean;
     isTopicUpdateNarrationEnabled(): boolean;
     isModelSteeringEnabled(): boolean;
     getToolOutputMaskingEnabled(): boolean;

package/dist/src/config/config.js

@@ -32,11 +32,13 @@ import { BaseLlmClient } from '../core/baseLlmClient.js';
 import { LocalLiteRtLmClient } from '../core/localLiteRtLmClient.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { GitService } from '../services/gitService.js';
-import { createSandboxManager, } from '../services/sandboxManager.js';
+import { NoopSandboxManager, } from '../services/sandboxManager.js';
+import { createSandboxManager } from '../services/sandboxManagerFactory.js';
+import { SandboxedFileSystemService } from '../services/sandboxedFileSystemService.js';
 import { initializeTelemetry, DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, uiTelemetryService, } from '../telemetry/index.js';
 import { coreEvents, CoreEvent } from '../utils/events.js';
 import { tokenLimit } from '../core/tokenLimits.js';
-import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, isAutoModel, isPreviewModel, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_MODEL_AUTO, resolveModel, } from './models.js';
+import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, isAutoModel, isPreviewModel, isGemini2Model, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_MODEL_AUTO, resolveModel, } from './models.js';
 import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { WriteTodosTool } from '../tools/write-todos.js';
@@ -83,6 +85,7 @@ import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
 import { DEFAULT_TOOL_PROTECTION_THRESHOLD, DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD, DEFAULT_PROTECT_LATEST_TURN, } from '../services/toolOutputMaskingService.js';
 import { SimpleExtensionLoader, } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
+import { A2AClientManager } from '../agents/a2a-client-manager.js';
 import {} from '../tools/mcp-client.js';
 import { getErrorMessage } from '../utils/errors.js';
 export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
@@ -167,7 +170,14 @@ export const ConfigSchema = z.object({
         allowedPaths: z.array(z.string()).default([]),
         networkAccess: z.boolean().default(false),
         command: z
-            .enum(['docker', 'podman', 'sandbox-exec', 'runsc', 'lxc'])
+            .enum([
+            'docker',
+            'podman',
+            'sandbox-exec',
+            'runsc',
+            'lxc',
+            'windows-native',
+        ])
             .optional(),
         image: z.string().optional(),
     })
@@ -185,13 +195,14 @@ export const ConfigSchema = z.object({
 export class Config {
     _toolRegistry;
     mcpClientManager;
+    a2aClientManager;
     allowedMcpServers;
     blockedMcpServers;
     allowedEnvironmentVariables;
     blockedEnvironmentVariables;
     enableEnvironmentVariableRedaction;
-    promptRegistry;
-    resourceRegistry;
+    _promptRegistry;
+    _resourceRegistry;
     agentRegistry;
     acknowledgedAgentsService;
     skillManager;
@@ -209,8 +220,10 @@ export class Config {
     workspaceContext;
     debugMode;
     question;
+    worktreeSettings;
     enableConseca;
     coreTools;
+    mainAgentTools;
     /** @deprecated Use Policy Engine instead */
     allowedTools;
     /** @deprecated Use Policy Engine instead */
@@ -342,6 +355,7 @@ export class Config {
     disabledSkills;
     adminSkillsEnabled;
     experimentalJitContext;
+    experimentalMemoryManager;
     topicUpdateNarration;
     disableLLMCorrection;
     planEnabled;
@@ -362,7 +376,6 @@ export class Config {
         this.approvedPlanPath = undefined;
         this.embeddingModel =
             params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
-        this.fileSystemService = new StandardFileSystemService();
         this.sandbox = params.sandbox
             ? {
                 enabled: params.sandbox.enabled ?? false,
@@ -376,13 +389,23 @@ export class Config {
                 allowedPaths: [],
                 networkAccess: false,
             };
+        this._sandboxManager = createSandboxManager(this.sandbox, params.targetDir);
+        if (!(this._sandboxManager instanceof NoopSandboxManager) &&
+            this.sandbox.enabled) {
+            this.fileSystemService = new SandboxedFileSystemService(this._sandboxManager, params.targetDir);
+        }
+        else {
+            this.fileSystemService = new StandardFileSystemService();
+        }
         this.targetDir = path.resolve(params.targetDir);
         this.folderTrust = params.folderTrust ?? false;
         this.workspaceContext = new WorkspaceContext(this.targetDir, []);
         this.pendingIncludeDirectories = params.includeDirectories ?? [];
         this.debugMode = params.debugMode;
         this.question = params.question;
+        this.worktreeSettings = params.worktreeSettings;
         this.coreTools = params.coreTools;
+        this.mainAgentTools = params.mainAgentTools;
         this.allowedTools = params.allowedTools;
         this.excludeTools = params.excludeTools;
         this.toolDiscoveryCommand = params.toolDiscoveryCommand;
@@ -463,6 +486,18 @@ export class Config {
                 ...DEFAULT_MODEL_CONFIGS.modelDefinitions,
                 ...modelConfigServiceConfig.modelDefinitions,
             };
+            const mergedModelIdResolutions = {
+                ...DEFAULT_MODEL_CONFIGS.modelIdResolutions,
+                ...modelConfigServiceConfig.modelIdResolutions,
+            };
+            const mergedClassifierIdResolutions = {
+                ...DEFAULT_MODEL_CONFIGS.classifierIdResolutions,
+                ...modelConfigServiceConfig.classifierIdResolutions,
+            };
+            const mergedModelChains = {
+                ...DEFAULT_MODEL_CONFIGS.modelChains,
+                ...modelConfigServiceConfig.modelChains,
+            };
             modelConfigServiceConfig = {
                 // Preserve other user settings like customAliases
                 ...modelConfigServiceConfig,
@@ -471,10 +506,14 @@ export class Config {
                 overrides: modelConfigServiceConfig.overrides ?? DEFAULT_MODEL_CONFIGS.overrides,
                 // Use the merged model definitions
                 modelDefinitions: mergedModelDefinitions,
+                modelIdResolutions: mergedModelIdResolutions,
+                classifierIdResolutions: mergedClassifierIdResolutions,
+                modelChains: mergedModelChains,
             };
         }
         this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
         this.experimentalJitContext = params.experimentalJitContext ?? true;
+        this.experimentalMemoryManager = params.experimentalMemoryManager ?? false;
         this.topicUpdateNarration = params.topicUpdateNarration ?? false;
         this.modelSteering = params.modelSteering ?? false;
         this.injectionService = new InjectionService(() => this.isModelSteeringEnabled());
@@ -521,14 +560,17 @@ export class Config {
             showColor: params.shellExecutionConfig?.showColor ?? false,
             pager: params.shellExecutionConfig?.pager ?? 'cat',
             sanitizationConfig: this.sanitizationConfig,
-            sandboxManager: this.sandboxManager,
+            sandboxManager: this._sandboxManager,
+            sandboxConfig: this.sandbox,
         };
         this.truncateToolOutputThreshold =
             params.truncateToolOutputThreshold ??
                 DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
-        this.useWriteTodos = isPreviewModel(this.model, this)
-            ? false
-            : (params.useWriteTodos ?? true);
+        const isGemini2 = isGemini2Model(this.model);
+        this.useWriteTodos =
+            isGemini2 && !isPreviewModel(this.model, this) && !this.trackerEnabled
+                ? (params.useWriteTodos ?? true)
+                : false;
         this.workspacePoliciesDir = params.workspacePoliciesDir;
         this.enableHooksUI = params.enableHooksUI ?? true;
         this.enableHooks = params.enableHooks ?? true;
@@ -617,8 +659,7 @@ export class Config {
             }
         }
         this._geminiClient = new GeminiClient(this);
-        this._sandboxManager = createSandboxManager(params.toolSandboxing ?? false, this.targetDir);
-        this.shellExecutionConfig.sandboxManager = this._sandboxManager;
+        this.a2aClientManager = new A2AClientManager(this);
         this.modelRouterService = new ModelRouterService(this);
     }
     get config() {
@@ -664,14 +705,19 @@ export class Config {
         if (this.getCheckpointingEnabled()) {
             await this.getGitService();
         }
-        this.promptRegistry = new PromptRegistry();
-        this.resourceRegistry = new ResourceRegistry();
+        this._promptRegistry = new PromptRegistry();
+        this._resourceRegistry = new ResourceRegistry();
         this.agentRegistry = new AgentRegistry(this);
         await this.agentRegistry.initialize();
         coreEvents.on(CoreEvent.AgentsRefreshed, this.onAgentsRefreshed);
         this._toolRegistry = await this.createToolRegistry();
         discoverToolsHandle?.end();
-        this.mcpClientManager = new McpClientManager(this.clientVersion, this._toolRegistry, this, this.eventEmitter);
+        this.mcpClientManager = new McpClientManager(this.clientVersion, this, this.eventEmitter);
+        this.mcpClientManager.setMainRegistries({
+            toolRegistry: this._toolRegistry,
+            promptRegistry: this.promptRegistry,
+            resourceRegistry: this.resourceRegistry,
+        });
         // We do not await this promise so that the CLI can start up even if
         // MCP servers are slow to connect.
         this.mcpInitializationPromise = Promise.allSettled([
@@ -822,6 +868,20 @@ export class Config {
     get toolRegistry() {
         return this._toolRegistry;
     }
+    /**
+     * @deprecated Do not access directly on Config.
+     * Use the injected AgentLoopContext instead.
+     */
+    get promptRegistry() {
+        return this._promptRegistry;
+    }
+    /**
+     * @deprecated Do not access directly on Config.
+     * Use the injected AgentLoopContext instead.
+     */
+    get resourceRegistry() {
+        return this._resourceRegistry;
+    }
     /**
      * @deprecated Do not access directly on Config.
      * Use the injected AgentLoopContext instead.
@@ -842,6 +902,9 @@ export class Config {
     getSessionId() {
         return this.promptId;
     }
+    getWorktreeSettings() {
+        return this.worktreeSettings;
+    }
     getClientName() {
         return this.clientName;
     }
@@ -1056,13 +1119,13 @@ export class Config {
         return this.toolRegistry;
     }
     getPromptRegistry() {
-        return this.promptRegistry;
+        return this._promptRegistry;
     }
     getSkillManager() {
         return this.skillManager;
     }
     getResourceRegistry() {
-        return this.resourceRegistry;
+        return this._resourceRegistry;
     }
     getDebugMode() {
         return this.debugMode;
@@ -1154,6 +1217,9 @@ export class Config {
     getCoreTools() {
         return this.coreTools;
     }
+    getMainAgentTools() {
+        return this.mainAgentTools;
+    }
     getAllowedTools() {
         return this.allowedTools;
     }
@@ -1212,6 +1278,9 @@ export class Config {
     getMcpClientManager() {
         return this.mcpClientManager;
     }
+    getA2AClientManager() {
+        return this.a2aClientManager;
+    }
     setUserInteractedWithMcp() {
         this.mcpClientManager?.setUserInteractedWithMcp();
     }
@@ -1318,6 +1387,9 @@ export class Config {
     isJitContextEnabled() {
         return this.experimentalJitContext;
     }
+    isMemoryManagerEnabled() {
+        return this.experimentalMemoryManager;
+    }
     isTopicUpdateNarrationEnabled() {
         return this.topicUpdateNarration;
     }
@@ -2032,6 +2104,8 @@ export class Config {
                 visualModel: customConfig.visualModel,
                 allowedDomains: customConfig.allowedDomains,
                 disableUserInput: customConfig.disableUserInput,
+                confirmSensitiveActions: customConfig.confirmSensitiveActions,
+                blockFileUploads: customConfig.blockFileUploads,
             },
         };
     }
@@ -2045,7 +2119,8 @@ export class Config {
             !browserConfig.customConfig?.headless);
     }
     async createToolRegistry() {
-        const registry = new ToolRegistry(this, this.messageBus);
+        const registry = new ToolRegistry(this, this.messageBus, 
+        /* isMainRegistry= */ true);
         // helper to create & register core tools that are enabled
         const maybeRegister = (toolClass, registerFn) => {
             const className = toolClass.name;
@@ -2092,7 +2167,9 @@ export class Config {
         maybeRegister(WriteFileTool, () => registry.registerTool(new WriteFileTool(this, this.messageBus)));
         maybeRegister(WebFetchTool, () => registry.registerTool(new WebFetchTool(this, this.messageBus)));
         maybeRegister(ShellTool, () => registry.registerTool(new ShellTool(this, this.messageBus)));
-        maybeRegister(MemoryTool, () => registry.registerTool(new MemoryTool(this.messageBus)));
+        if (!this.isMemoryManagerEnabled()) {
+            maybeRegister(MemoryTool, () => registry.registerTool(new MemoryTool(this.messageBus)));
+        }
         maybeRegister(WebSearchTool, () => registry.registerTool(new WebSearchTool(this, this.messageBus)));
         maybeRegister(AskUserTool, () => registry.registerTool(new AskUserTool(this.messageBus)));
         if (this.getUseWriteTodos()) {