@google/gemini-cli-core 0.39.0-preview.2 → 0.40.0-preview.0

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

@@ -8,7 +8,7 @@ import { z } from 'zod';
 import type { ConversationRecord } from '../services/chatRecordingService.js';
 import type { AgentHistoryProviderConfig, ContextManagementConfig, ToolOutputMaskingConfig } from '../context/types.js';
 export type { ConversationRecord };
-import { AuthType, type ContentGenerator, type ContentGeneratorConfig } from '../core/contentGenerator.js';
+import { AuthType, type ContentGenerator, type ContentGeneratorConfig, type VertexAiRoutingConfig } from '../core/contentGenerator.js';
 import type { OverageStrategy } from '../billing/billing.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
 import { ResourceRegistry } from '../resources/resource-registry.js';
@@ -71,6 +71,7 @@ export interface PlanSettings {
 }
 export interface TelemetrySettings {
     enabled?: boolean;
+    traces?: boolean;
     target?: TelemetryTarget;
     otlpEndpoint?: string;
     otlpProtocol?: 'grpc' | 'http';
@@ -84,6 +85,8 @@ export interface OutputSettings {
 }
 export interface GemmaModelRouterSettings {
     enabled?: boolean;
+    autoStartServer?: boolean;
+    binaryPath?: string;
     classifier?: {
         host?: string;
         model?: string;
@@ -438,6 +441,7 @@ export interface ConfigParameters {
     fileFiltering?: {
         respectGitIgnore?: boolean;
         respectGeminiIgnore?: boolean;
+        enableFileWatcher?: boolean;
         enableRecursiveFileSearch?: boolean;
         enableFuzzySearch?: boolean;
         maxFileCount?: number;
@@ -530,7 +534,8 @@ export interface ConfigParameters {
     adminSkillsEnabled?: boolean;
     experimentalJitContext?: boolean;
     autoDistillation?: boolean;
-    experimentalMemoryManager?: boolean;
+    experimentalMemoryV2?: boolean;
+    experimentalAutoMemory?: boolean;
     experimentalContextManagementConfig?: string;
     experimentalAgentHistoryTruncation?: boolean;
     experimentalAgentHistoryTruncationThreshold?: number;
@@ -557,6 +562,7 @@ export interface ConfigParameters {
     billing?: {
         overageStrategy?: OverageStrategy;
     };
+    vertexAiRouting?: VertexAiRoutingConfig;
 }
 export declare class Config implements McpContext, AgentLoopContext {
     private _toolRegistry;
@@ -712,6 +718,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly onModelChange;
     private readonly onReload;
     private readonly billing;
+    private readonly vertexAiRouting;
     private readonly enableAgents;
     private agents;
     private readonly enableEventDrivenScheduler;
@@ -719,7 +726,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     private disabledSkills;
     private readonly adminSkillsEnabled;
     private readonly experimentalJitContext;
-    private readonly experimentalMemoryManager;
+    private readonly experimentalMemoryV2;
+    private readonly experimentalAutoMemory;
     private readonly experimentalContextManagementConfig?;
     private readonly memoryBoundaryMarkers;
     private readonly topicUpdateNarration;
@@ -790,6 +798,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     getWorktreeSettings(): WorktreeSettings | undefined;
     getClientName(): string | undefined;
     setSessionId(sessionId: string): void;
+    resetNewSessionState(sessionId: string): void;
     setTerminalBackground(terminalBackground: string | undefined): void;
     getTerminalBackground(): string | undefined;
     getLatestApiRequest(): GenerateContentParameters | undefined;
@@ -833,6 +842,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     getTargetDir(): string;
     getProjectRoot(): string;
     getWorkspaceContext(): WorkspaceContext;
+    private refreshSessionScopedPlansDirectory;
     getAgentRegistry(): AgentRegistry;
     getAcknowledgedAgentsService(): AcknowledgedAgentsService;
     /** @deprecated Use toolRegistry getter */
@@ -913,7 +923,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     isJitContextEnabled(): boolean;
     isContextManagementEnabled(): boolean;
     getMemoryBoundaryMarkers(): readonly string[];
-    isMemoryManagerEnabled(): boolean;
+    isMemoryV2Enabled(): boolean;
+    isAutoMemoryEnabled(): boolean;
     getExperimentalContextManagementConfig(): string | undefined;
     getContextManagementConfig(): ContextManagementConfig;
     get agentHistoryProviderConfig(): AgentHistoryProviderConfig;
@@ -950,6 +961,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     getShowMemoryUsage(): boolean;
     getAccessibility(): AccessibilitySettings;
     getTelemetryEnabled(): boolean;
+    getTelemetryTracesEnabled(): boolean;
     getTelemetryLogPromptsEnabled(): boolean;
     getTelemetryOtlpEndpoint(): string;
     getTelemetryOtlpProtocol(): 'grpc' | 'http';
@@ -1034,7 +1046,10 @@ export declare class Config implements McpContext, AgentLoopContext {
     getFileSystemService(): FileSystemService;
     /**
      * Checks if a given absolute path is allowed for file system operations.
-     * A path is allowed if it's within the workspace context or the project's temporary directory.
+     * A path is allowed if it's within the workspace context, the project's
+     * temporary directory, or is exactly the global personal `~/.gemini/GEMINI.md`
+     * file (the latter is the only file under `~/.gemini/` that is reachable —
+     * settings, credentials, keybindings, etc. remain disallowed).
      *
      * @param absolutePath The absolute path to check.
      * @returns true if the path is allowed, false otherwise.
@@ -1143,7 +1158,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     getEnableShellOutputEfficiency(): boolean;
     getShellToolInactivityTimeout(): number;
     getShellExecutionConfig(): ShellExecutionConfig;
-    setShellExecutionConfig(config: ShellExecutionConfig): void;
+    setShellExecutionConfig(config: Partial<ShellExecutionConfig>): void;
     getScreenReader(): boolean;
     getTruncateToolOutputThreshold(): number;
     getToolMaxOutputTokens(): number;

package/dist/src/config/config.js

@@ -15,6 +15,8 @@ import { ResourceRegistry } from '../resources/resource-registry.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { LSTool } from '../tools/ls.js';
 import { ReadFileTool } from '../tools/read-file.js';
+import { ReadMcpResourceTool } from '../tools/read-mcp-resource.js';
+import { ListMcpResourcesTool } from '../tools/list-mcp-resources.js';
 import { GrepTool } from '../tools/grep.js';
 import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
 import { GlobTool } from '../tools/glob.js';
@@ -23,7 +25,7 @@ import { EditTool } from '../tools/edit.js';
 import { ShellTool } from '../tools/shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { WebFetchTool } from '../tools/web-fetch.js';
-import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
+import { MemoryTool, setGeminiMdFilename, getCurrentGeminiMdFilename, } from '../tools/memoryTool.js';
 import { WebSearchTool } from '../tools/web-search.js';
 import { AskUserTool } from '../tools/ask-user.js';
 import { UpdateTopicTool } from '../tools/topicTool.js';
@@ -362,6 +364,7 @@ export class Config {
     onModelChange;
     onReload;
     billing;
+    vertexAiRouting;
     enableAgents;
     agents;
     enableEventDrivenScheduler;
@@ -369,7 +372,8 @@ export class Config {
     disabledSkills;
     adminSkillsEnabled;
     experimentalJitContext;
-    experimentalMemoryManager;
+    experimentalMemoryV2;
+    experimentalAutoMemory;
     experimentalContextManagementConfig;
     memoryBoundaryMarkers;
     topicUpdateNarration;
@@ -466,6 +470,7 @@ export class Config {
         this.accessibility = params.accessibility ?? {};
         this.telemetrySettings = {
             enabled: params.telemetry?.enabled ?? false,
+            traces: params.telemetry?.traces ?? false,
             target: params.telemetry?.target ?? DEFAULT_TELEMETRY_TARGET,
             otlpEndpoint: params.telemetry?.otlpEndpoint ?? DEFAULT_OTLP_ENDPOINT,
             otlpProtocol: params.telemetry?.otlpProtocol,
@@ -480,6 +485,9 @@ export class Config {
                 DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
             respectGeminiIgnore: params.fileFiltering?.respectGeminiIgnore ??
                 DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+            enableFileWatcher: params.fileFiltering?.enableFileWatcher ??
+                DEFAULT_FILE_FILTERING_OPTIONS.enableFileWatcher ??
+                true,
             enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
             enableFuzzySearch: params.fileFiltering?.enableFuzzySearch ?? true,
             maxFileCount: params.fileFiltering?.maxFileCount ??
@@ -550,8 +558,9 @@ export class Config {
             };
         }
         this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
-        this.experimentalJitContext = params.experimentalJitContext ?? false;
-        this.experimentalMemoryManager = params.experimentalMemoryManager ?? false;
+        this.experimentalJitContext = params.experimentalJitContext ?? true;
+        this.experimentalMemoryV2 = params.experimentalMemoryV2 ?? true;
+        this.experimentalAutoMemory = params.experimentalAutoMemory ?? false;
         this.experimentalContextManagementConfig =
             params.experimentalContextManagementConfig;
         this.memoryBoundaryMarkers = params.memoryBoundaryMarkers ?? ['.git'];
@@ -585,7 +594,7 @@ export class Config {
                 },
             },
         };
-        this.topicUpdateNarration = params.topicUpdateNarration ?? false;
+        this.topicUpdateNarration = params.topicUpdateNarration ?? true;
         this.modelSteering = params.modelSteering ?? false;
         this.injectionService = new InjectionService(() => this.isModelSteeringEnabled());
         ExecutionLifecycleService.setInjectionService(this.injectionService);
@@ -696,6 +705,8 @@ export class Config {
         };
         this.gemmaModelRouter = {
             enabled: params.gemmaModelRouter?.enabled ?? false,
+            autoStartServer: params.gemmaModelRouter?.autoStartServer ?? true,
+            binaryPath: params.gemmaModelRouter?.binaryPath ?? '',
             classifier: {
                 host: params.gemmaModelRouter?.classifier?.host ?? 'http://localhost:9379',
                 model: params.gemmaModelRouter?.classifier?.model ?? 'gemma3-1b-gpu-custom',
@@ -722,6 +733,7 @@ export class Config {
         this.billing = {
             overageStrategy: params.billing?.overageStrategy ?? 'ask',
         };
+        this.vertexAiRouting = params.vertexAiRouting;
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
@@ -857,7 +869,7 @@ export class Config {
         if (this.contentGeneratorConfig) {
             this.contentGeneratorConfig.authType = undefined;
         }
-        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, apiKey, baseUrl, customHeaders);
+        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, apiKey, baseUrl, customHeaders, this.vertexAiRouting);
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         // Only assign to instance properties after successful initialization
         this.contentGeneratorConfig = newContentGeneratorConfig;
@@ -1021,7 +1033,19 @@ export class Config {
         return this.clientName;
     }
     setSessionId(sessionId) {
+        const previousPlansDir = this.storage.isInitialized()
+            ? this.storage.getPlansDir()
+            : undefined;
         this._sessionId = sessionId;
+        this.storage.setSessionId(sessionId);
+        this.trackerService = undefined;
+        if (previousPlansDir) {
+            this.refreshSessionScopedPlansDirectory(previousPlansDir);
+        }
+    }
+    resetNewSessionState(sessionId) {
+        this.setSessionId(sessionId);
+        this.approvedPlanPath = undefined;
     }
     setTerminalBackground(terminalBackground) {
         this.terminalBackground = terminalBackground;
@@ -1228,6 +1252,34 @@ export class Config {
     getWorkspaceContext() {
         return getWorkspaceContextOverride() ?? this.workspaceContext;
     }
+    refreshSessionScopedPlansDirectory(previousPlansDir) {
+        const nextPlansDir = this.storage.getPlansDir();
+        if (previousPlansDir === nextPlansDir) {
+            return;
+        }
+        const pathsToRemove = new Set([previousPlansDir]);
+        try {
+            pathsToRemove.add(resolveToRealPath(previousPlansDir));
+        }
+        catch {
+            // The previous session's plans directory may never have been created.
+            // In that case there is nothing to resolve or remove beyond the raw path.
+        }
+        const currentDirectories = this.workspaceContext
+            .getDirectories()
+            .filter((dir) => !pathsToRemove.has(dir));
+        this.workspaceContext.setDirectories(currentDirectories);
+        try {
+            if (fs.existsSync(nextPlansDir)) {
+                this.workspaceContext.addDirectory(nextPlansDir);
+            }
+        }
+        catch {
+            // Ignore invalid or unreadable plans directories here. This mirrors
+            // initialization behavior, which only adds the plans directory when it
+            // already exists and is readable.
+        }
+    }
     getAgentRegistry() {
         return this.agentRegistry;
     }
@@ -1530,8 +1582,11 @@ export class Config {
     getMemoryBoundaryMarkers() {
         return this.memoryBoundaryMarkers;
     }
-    isMemoryManagerEnabled() {
-        return this.experimentalMemoryManager;
+    isMemoryV2Enabled() {
+        return this.experimentalMemoryV2;
+    }
+    isAutoMemoryEnabled() {
+        return this.experimentalAutoMemory;
     }
     getExperimentalContextManagementConfig() {
         return this.experimentalContextManagementConfig;
@@ -1699,6 +1754,9 @@ export class Config {
     getTelemetryEnabled() {
         return this.telemetrySettings.enabled ?? false;
     }
+    getTelemetryTracesEnabled() {
+        return this.telemetrySettings.traces ?? false;
+    }
     getTelemetryLogPromptsEnabled() {
         return this.telemetrySettings.logPrompts ?? true;
     }
@@ -1773,6 +1831,7 @@ export class Config {
         return {
             respectGitIgnore: this.fileFiltering.respectGitIgnore,
             respectGeminiIgnore: this.fileFiltering.respectGeminiIgnore,
+            enableFileWatcher: this.fileFiltering.enableFileWatcher,
             maxFileCount: this.fileFiltering.maxFileCount,
             searchTimeout: this.fileFiltering.searchTimeout,
             customIgnoreFilePaths: this.fileFiltering.customIgnoreFilePaths,
@@ -1925,7 +1984,10 @@ export class Config {
     }
     /**
      * Checks if a given absolute path is allowed for file system operations.
-     * A path is allowed if it's within the workspace context or the project's temporary directory.
+     * A path is allowed if it's within the workspace context, the project's
+     * temporary directory, or is exactly the global personal `~/.gemini/GEMINI.md`
+     * file (the latter is the only file under `~/.gemini/` that is reachable —
+     * settings, credentials, keybindings, etc. remain disallowed).
      *
      * @param absolutePath The absolute path to check.
      * @returns true if the path is allowed, false otherwise.
@@ -1938,7 +2000,19 @@ export class Config {
         }
         const projectTempDir = this.storage.getProjectTempDir();
         const resolvedTempDir = resolveToRealPath(projectTempDir);
-        return isSubpath(resolvedTempDir, resolvedPath);
+        if (isSubpath(resolvedTempDir, resolvedPath)) {
+            return true;
+        }
+        // Surgical allowlist: the global personal GEMINI.md file (and ONLY that
+        // file) is reachable so the prompt-driven memory flow can persist
+        // cross-project personal preferences. This deliberately does NOT
+        // allowlist the rest of `~/.gemini/`.
+        const globalMemoryFilePath = path.join(Storage.getGlobalGeminiDir(), getCurrentGeminiMdFilename());
+        const resolvedGlobalMemoryFilePath = resolveToRealPath(globalMemoryFilePath);
+        if (resolvedPath === resolvedGlobalMemoryFilePath) {
+            return true;
+        }
+        return false;
     }
     /**
      * Validates if a path is allowed and returns a detailed error message if not.
@@ -2041,7 +2115,8 @@ export class Config {
      * Note: This method should only be called after startup, once experiments have been loaded.
      */
     getProModelNoAccessSync() {
-        if (this.contentGeneratorConfig?.authType !== AuthType.LOGIN_WITH_GOOGLE) {
+        if (this.contentGeneratorConfig?.authType !== AuthType.LOGIN_WITH_GOOGLE &&
+            this.contentGeneratorConfig?.authType !== AuthType.COMPUTE_ADC) {
             return false;
         }
         return (this.experiments?.flags[ExperimentFlags.PRO_MODEL_NO_ACCESS]?.boolValue ??
@@ -2236,15 +2311,21 @@ export class Config {
         return this.shellExecutionConfig;
     }
     setShellExecutionConfig(config) {
+        const definedConfig = {};
+        for (const [k, v] of Object.entries(config)) {
+            // Only merge properties explicitly provided with a concrete value.
+            // Filtering out `null` and `undefined` ensures existing system defaults
+            // are preserved when an extension doesn't want to override them.
+            if (v != null) {
+                Object.assign(definedConfig, { [k]: v });
+            }
+        }
+        // Note: This performs a shallow merge. If the incoming config provides a nested
+        // object (e.g., sandboxConfig), it will completely overwrite the existing
+        // nested object rather than merging its individual properties.
         this.shellExecutionConfig = {
             ...this.shellExecutionConfig,
-            terminalWidth: config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
-            terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
-            showColor: config.showColor ?? this.shellExecutionConfig.showColor,
-            pager: config.pager ?? this.shellExecutionConfig.pager,
-            sanitizationConfig: config.sanitizationConfig ??
-                this.shellExecutionConfig.sanitizationConfig,
-            sandboxManager: config.sandboxManager ?? this.shellExecutionConfig.sandboxManager,
+            ...definedConfig,
         };
     }
     getScreenReader() {
@@ -2386,6 +2467,7 @@ export class Config {
                 maybeRegister(RipGrepTool, () => registry.registerTool(new RipGrepTool(this, this.messageBus)));
             }
             else {
+                debugLogger.warn(`Ripgrep is not available. Falling back to GrepTool.`);
                 logRipgrepFallback(this, new RipgrepFallbackEvent(errorString));
                 maybeRegister(GrepTool, () => registry.registerTool(new GrepTool(this, this.messageBus)));
             }
@@ -2398,10 +2480,12 @@ export class Config {
         maybeRegister(EditTool, () => registry.registerTool(new EditTool(this, this.messageBus)));
         maybeRegister(WriteFileTool, () => registry.registerTool(new WriteFileTool(this, this.messageBus)));
         maybeRegister(WebFetchTool, () => registry.registerTool(new WebFetchTool(this, this.messageBus)));
+        maybeRegister(ReadMcpResourceTool, () => registry.registerTool(new ReadMcpResourceTool(this, this.messageBus)));
+        maybeRegister(ListMcpResourcesTool, () => registry.registerTool(new ListMcpResourcesTool(this, this.messageBus)));
         maybeRegister(ShellTool, () => registry.registerTool(new ShellTool(this, this.messageBus)));
         maybeRegister(ListBackgroundProcessesTool, () => registry.registerTool(new ListBackgroundProcessesTool(this, this.messageBus)));
         maybeRegister(ReadBackgroundOutputTool, () => registry.registerTool(new ReadBackgroundOutputTool(this, this.messageBus)));
-        if (!this.isMemoryManagerEnabled()) {
+        if (!this.isMemoryV2Enabled()) {
             maybeRegister(MemoryTool, () => registry.registerTool(new MemoryTool(this.messageBus, this.storage)));
         }
         maybeRegister(WebSearchTool, () => registry.registerTool(new WebSearchTool(this, this.messageBus)));