@google/gemini-cli-core 0.37.0-preview.2 → 0.38.0-preview.0

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

@@ -6,7 +6,7 @@
 import { SandboxPolicyManager } from '../policy/sandboxPolicyManager.js';
 import { z } from 'zod';
 import type { ConversationRecord } from '../services/chatRecordingService.js';
-import type { AgentHistoryProviderConfig } from '../services/types.js';
+import type { AgentHistoryProviderConfig, ContextManagementConfig, ToolOutputMaskingConfig } from '../context/types.js';
 export type { ConversationRecord };
 import { AuthType, type ContentGenerator, type ContentGeneratorConfig } from '../core/contentGenerator.js';
 import type { OverageStrategy } from '../billing/billing.js';
@@ -30,7 +30,7 @@ import { ModelAvailabilityService } from '../availability/modelAvailabilityServi
 import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
 import { ModelConfigService, type ModelConfig, type ModelConfigServiceConfig } from '../services/modelConfigService.js';
-import { ContextManager } from '../context/contextManager.js';
+import { MemoryContextManager } from '../context/memoryContextManager.js';
 import { TrackerService } from '../services/trackerService.js';
 import type { GenerateContentParameters } from '@google/genai';
 export type { MCPOAuthConfig, AnyToolInvocation, AnyDeclarativeTool };
@@ -82,30 +82,6 @@ export interface TelemetrySettings {
 export interface OutputSettings {
     format?: OutputFormat;
 }
-export interface ToolOutputMaskingConfig {
-    protectionThresholdTokens: number;
-    minPrunableThresholdTokens: number;
-    protectLatestTurn: boolean;
-}
-export interface ContextManagementConfig {
-    enabled: boolean;
-    historyWindow: {
-        maxTokens: number;
-        retainedTokens: number;
-    };
-    messageLimits: {
-        normalMaxTokens: number;
-        retainedMaxTokens: number;
-        normalizationHeadRatio: number;
-    };
-    tools: {
-        distillation: {
-            maxOutputTokens: number;
-            summarizationThresholdTokens: number;
-        };
-        outputMasking: ToolOutputMaskingConfig;
-    };
-}
 export interface GemmaModelRouterSettings {
     enabled?: boolean;
     classifier?: {
@@ -113,6 +89,10 @@ export interface GemmaModelRouterSettings {
         model?: string;
     };
 }
+export interface ADKSettings {
+    agentSessionNoninteractiveEnabled?: boolean;
+    agentSessionInteractiveEnabled?: boolean;
+}
 export interface ExtensionSetting {
     name: string;
     description: string;
@@ -230,7 +210,7 @@ export interface BrowserAgentCustomConfig {
     headless?: boolean;
     /** Path to Chrome profile directory for session persistence. */
     profilePath?: string;
-    /** Model override for the visual agent. */
+    /** Model for the visual agent's analyze_screenshot tool. When set, enables the tool. */
     visualModel?: string;
     /** List of allowed domains for the browser agent (e.g., ["github.com", "*.google.com"]). */
     allowedDomains?: string[];
@@ -342,6 +322,7 @@ export declare enum AuthProviderType {
 export interface SandboxConfig {
     enabled: boolean;
     allowedPaths?: string[];
+    includeDirectories?: string[];
     networkAccess?: boolean;
     command?: 'docker' | 'podman' | 'sandbox-exec' | 'runsc' | 'lxc' | 'windows-native';
     image?: string;
@@ -350,6 +331,7 @@ export declare const ConfigSchema: z.ZodObject<{
     sandbox: z.ZodOptional<z.ZodEffects<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         allowedPaths: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+        includeDirectories: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
         networkAccess: z.ZodDefault<z.ZodBoolean>;
         command: z.ZodOptional<z.ZodEnum<["docker", "podman", "sandbox-exec", "runsc", "lxc", "windows-native"]>>;
         image: z.ZodOptional<z.ZodString>;
@@ -357,6 +339,7 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled: boolean;
         networkAccess: boolean;
         allowedPaths: string[];
+        includeDirectories: string[];
         command?: "docker" | "podman" | "sandbox-exec" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
     }, {
@@ -365,10 +348,12 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
         networkAccess?: boolean | undefined;
         allowedPaths?: string[] | undefined;
+        includeDirectories?: string[] | undefined;
     }>, {
         enabled: boolean;
         networkAccess: boolean;
         allowedPaths: string[];
+        includeDirectories: string[];
         command?: "docker" | "podman" | "sandbox-exec" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
     }, {
@@ -377,12 +362,14 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
         networkAccess?: boolean | undefined;
         allowedPaths?: string[] | undefined;
+        includeDirectories?: string[] | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     sandbox?: {
         enabled: boolean;
         networkAccess: boolean;
         allowedPaths: string[];
+        includeDirectories: string[];
         command?: "docker" | "podman" | "sandbox-exec" | "runsc" | "lxc" | "windows-native" | undefined;
         image?: string | undefined;
     } | undefined;
@@ -393,6 +380,7 @@ export declare const ConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
         networkAccess?: boolean | undefined;
         allowedPaths?: string[] | undefined;
+        includeDirectories?: string[] | undefined;
     } | undefined;
 }>;
 /**
@@ -490,6 +478,8 @@ export interface ConfigParameters {
     trustedFolder?: boolean;
     useBackgroundColor?: boolean;
     useAlternateBuffer?: boolean;
+    useTerminalBuffer?: boolean;
+    useRenderProcess?: boolean;
     useRipgrep?: boolean;
     enableInteractiveShell?: boolean;
     shellBackgroundCompletionBehavior?: string;
@@ -506,6 +496,7 @@ export interface ConfigParameters {
     policyUpdateConfirmationRequest?: PolicyUpdateConfirmationRequest;
     output?: OutputSettings;
     gemmaModelRouter?: GemmaModelRouterSettings;
+    adk?: ADKSettings;
     disableModelRouterForAuth?: AuthType[];
     continueOnFailedApiCall?: boolean;
     retryFetchErrors?: boolean;
@@ -674,6 +665,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly skipNextSpeakerCheck;
     private readonly useBackgroundColor;
     private readonly useAlternateBuffer;
+    private readonly useTerminalBuffer;
+    private readonly useRenderProcess;
     private shellExecutionConfig;
     private readonly extensionManagement;
     private readonly extensionRegistryURI;
@@ -692,6 +685,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     private policyUpdateConfirmationRequest;
     private readonly outputSettings;
     private readonly gemmaModelRouter;
+    private readonly agentSessionNoninteractiveEnabled;
+    private readonly agentSessionInteractiveEnabled;
     private readonly continueOnFailedApiCall;
     private readonly retryFetchErrors;
     private readonly maxAttempts;
@@ -705,8 +700,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly acceptRawOutputRisk;
     private readonly dynamicModelConfiguration;
     private pendingIncludeDirectories;
-    private readonly enableHooks;
     private readonly enableHooksUI;
+    private readonly enableHooks;
     private hooks;
     private projectHooks;
     private disabledHooks;
@@ -731,7 +726,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly trackerEnabled;
     private readonly planModeRoutingEnabled;
     private readonly modelSteering;
-    private contextManager?;
+    private memoryContextManager?;
     private readonly contextManagement;
     private terminalBackground;
     private remoteAdminSettings;
@@ -912,9 +907,9 @@ export declare class Config implements McpContext, AgentLoopContext {
     getSessionMemory(): string;
     getGlobalMemory(): string;
     getEnvironmentMemory(): string;
-    getContextManager(): ContextManager | undefined;
+    getMemoryContextManager(): MemoryContextManager | undefined;
     isJitContextEnabled(): boolean;
-    isAutoDistillationEnabled(): boolean;
+    isContextManagementEnabled(): boolean;
     getMemoryBoundaryMarkers(): readonly string[];
     isMemoryManagerEnabled(): boolean;
     getContextManagementConfig(): ContextManagementConfig;
@@ -1107,6 +1102,10 @@ export declare class Config implements McpContext, AgentLoopContext {
      * getGemini31Launched instead.
      */
     getGemini31LaunchedSync(): boolean;
+    /**
+     * Returns the configured default request timeout in milliseconds.
+     */
+    getRequestTimeoutMs(): number | undefined;
     /**
      * Returns whether Gemini 3.1 Flash Lite has been launched.
      *
@@ -1130,6 +1129,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     getUseRipgrep(): boolean;
     getUseBackgroundColor(): boolean;
     getUseAlternateBuffer(): boolean;
+    getUseTerminalBuffer(): boolean;
+    getUseRenderProcess(): boolean;
     getEnableInteractiveShell(): boolean;
     getShellBackgroundCompletionBehavior(): 'inject' | 'notify' | 'silent';
     getSkipNextSpeakerCheck(): boolean;
@@ -1156,6 +1157,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     getEnableHooksUI(): boolean;
     getGemmaModelRouterEnabled(): boolean;
     getGemmaModelRouterSettings(): GemmaModelRouterSettings;
+    getAgentSessionNoninteractiveEnabled(): boolean;
+    getAgentSessionInteractiveEnabled(): boolean;
     /**
      * Get override settings for a specific agent.
      * Reads from agents.overrides.<agentName>.

package/dist/src/config/config.js

@@ -30,6 +30,7 @@ import { UpdateTopicTool } from '../tools/topicTool.js';
 import { TopicState } from './topicState.js';
 import { ExitPlanModeTool } from '../tools/exit-plan-mode.js';
 import { EnterPlanModeTool } from '../tools/enter-plan-mode.js';
+import { ListBackgroundProcessesTool, ReadBackgroundOutputTool, } from '../tools/shellBackgroundTools.js';
 import { GeminiClient } from '../core/client.js';
 import { BaseLlmClient } from '../core/baseLlmClient.js';
 import { LocalLiteRtLmClient } from '../core/localLiteRtLmClient.js';
@@ -54,9 +55,10 @@ import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
 import { ModelConfigService, } from '../services/modelConfigService.js';
 import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.js';
-import { ContextManager } from '../context/contextManager.js';
+import { MemoryContextManager } from '../context/memoryContextManager.js';
 import { TrackerService } from '../services/trackerService.js';
 import { WorkspaceContext } from '../utils/workspaceContext.js';
+import { getWorkspaceContextOverride } from './scoped-config.js';
 import { Storage } from './storage.js';
 import { FileExclusions } from '../utils/ignorePatterns.js';
 import { MessageBus } from '../confirmation-bus/message-bus.js';
@@ -67,7 +69,7 @@ import { getCodeAssistServer } from '../code_assist/codeAssist.js';
 import { getExperiments, } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
 import { AcknowledgedAgentsService } from '../agents/acknowledgedAgents.js';
-import { setGlobalProxy } from '../utils/fetch.js';
+import { setGlobalProxy, updateGlobalFetchTimeouts } from '../utils/fetch.js';
 import { SubagentTool } from '../agents/subagent-tool.js';
 import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
 import { debugLogger } from '../utils/debugLogger.js';
@@ -171,6 +173,7 @@ export const ConfigSchema = z.object({
         .object({
         enabled: z.boolean().default(false),
         allowedPaths: z.array(z.string()).default([]),
+        includeDirectories: z.array(z.string()).default([]),
         networkAccess: z.boolean().default(false),
         command: z
             .enum([
@@ -312,6 +315,8 @@ export class Config {
     skipNextSpeakerCheck;
     useBackgroundColor;
     useAlternateBuffer;
+    useTerminalBuffer;
+    useRenderProcess;
     shellExecutionConfig;
     extensionManagement = true;
     extensionRegistryURI;
@@ -330,6 +335,8 @@ export class Config {
     policyUpdateConfirmationRequest;
     outputSettings;
     gemmaModelRouter;
+    agentSessionNoninteractiveEnabled;
+    agentSessionInteractiveEnabled;
     continueOnFailedApiCall;
     retryFetchErrors;
     maxAttempts;
@@ -343,8 +350,8 @@ export class Config {
     acceptRawOutputRisk;
     dynamicModelConfiguration;
     pendingIncludeDirectories;
-    enableHooks;
     enableHooksUI;
+    enableHooks;
     hooks;
     projectHooks;
     disabledHooks;
@@ -369,7 +376,7 @@ export class Config {
     trackerEnabled;
     planModeRoutingEnabled;
     modelSteering;
-    contextManager;
+    memoryContextManager;
     contextManagement;
     terminalBackground = undefined;
     remoteAdminSettings;
@@ -388,6 +395,11 @@ export class Config {
             ? {
                 enabled: params.sandbox.enabled || params.toolSandboxing || false,
                 allowedPaths: params.sandbox.allowedPaths ?? [],
+                includeDirectories: [
+                    ...(params.sandbox.includeDirectories ?? []),
+                    ...(params.sandbox.allowedPaths ?? []),
+                    Storage.getGlobalTempDir(),
+                ],
                 networkAccess: params.sandbox.networkAccess ?? false,
                 command: params.sandbox.command,
                 image: params.sandbox.image,
@@ -395,6 +407,7 @@ export class Config {
             : {
                 enabled: params.toolSandboxing || false,
                 allowedPaths: [],
+                includeDirectories: [Storage.getGlobalTempDir()],
                 networkAccess: false,
             };
         this.targetDir = path.resolve(params.targetDir);
@@ -411,11 +424,14 @@ export class Config {
         this._sandboxManager = createSandboxManager(this.sandbox, {
             workspace: this.targetDir,
             forbiddenPaths: this.getSandboxForbiddenPaths.bind(this),
-            includeDirectories: this.pendingIncludeDirectories,
+            includeDirectories: [
+                ...this.pendingIncludeDirectories,
+                Storage.getGlobalTempDir(),
+            ],
             policyManager: this._sandboxPolicyManager,
         }, initialApprovalMode);
         if (!(this._sandboxManager instanceof NoopSandboxManager) &&
-            this.sandbox.enabled) {
+            this.sandbox?.enabled) {
             this.fileSystemService = new SandboxedFileSystemService(this._sandboxManager, params.targetDir);
         }
         else {
@@ -594,6 +610,8 @@ export class Config {
         this.useRipgrep = params.useRipgrep ?? true;
         this.useBackgroundColor = params.useBackgroundColor ?? true;
         this.useAlternateBuffer = params.useAlternateBuffer ?? false;
+        this.useTerminalBuffer = params.useTerminalBuffer ?? false;
+        this.useRenderProcess = params.useRenderProcess ?? true;
         this.enableInteractiveShell = params.enableInteractiveShell ?? false;
         const requestedBehavior = params.shellBackgroundCompletionBehavior;
         if (requestedBehavior === 'inject' || requestedBehavior === 'notify') {
@@ -679,6 +697,10 @@ export class Config {
                 model: params.gemmaModelRouter?.classifier?.model ?? 'gemma3-1b-gpu-custom',
             },
         };
+        this.agentSessionNoninteractiveEnabled =
+            params.adk?.agentSessionNoninteractiveEnabled ?? false;
+        this.agentSessionInteractiveEnabled =
+            params.adk?.agentSessionInteractiveEnabled ?? false;
         this.retryFetchErrors = params.retryFetchErrors ?? true;
         this.maxAttempts = Math.min(params.maxAttempts ?? DEFAULT_MAX_ATTEMPTS, DEFAULT_MAX_ATTEMPTS);
         this.disableYoloMode = params.disableYoloMode ?? false;
@@ -805,8 +827,8 @@ export class Config {
             await this.hookSystem.initialize();
         }
         if (this.experimentalJitContext) {
-            this.contextManager = new ContextManager(this);
-            await this.contextManager.refresh();
+            this.memoryContextManager = new MemoryContextManager(this);
+            await this.memoryContextManager.refresh();
         }
         await this._geminiClient.initialize();
         this.initialized = true;
@@ -835,8 +857,6 @@ export class Config {
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         // Only assign to instance properties after successful initialization
         this.contentGeneratorConfig = newContentGeneratorConfig;
-        // Initialize BaseLlmClient now that the ContentGenerator is available
-        this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
         const codeAssistServer = getCodeAssistServer(this);
         const quotaPromise = codeAssistServer?.projectId
             ? this.refreshUserQuota()
@@ -850,6 +870,14 @@ export class Config {
             debugLogger.error('Failed to fetch experiments', e);
             return undefined;
         });
+        // Fetch experiments and update timeouts before continuing initialization
+        const experiments = await this.experimentsPromise;
+        const requestTimeoutMs = this.getRequestTimeoutMs();
+        if (requestTimeoutMs !== undefined) {
+            updateGlobalFetchTimeouts(requestTimeoutMs);
+        }
+        // Initialize BaseLlmClient now that the ContentGenerator and experiments are available
+        this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
         await quotaPromise;
         const authType = this.contentGeneratorConfig.authType;
         if (authType === AuthType.USE_GEMINI ||
@@ -862,8 +890,6 @@ export class Config {
             this.hasAccessToPreviewModel === false) {
             this.setModel(DEFAULT_GEMINI_MODEL_AUTO);
         }
-        // Fetch admin controls
-        const experiments = await this.experimentsPromise;
         const adminControlsEnabled = experiments?.flags[ExperimentFlags.ENABLE_ADMIN_CONTROLS]?.boolValue ??
             false;
         const adminControls = await fetchAdminControls(codeAssistServer, this.getRemoteAdminSettings(), adminControlsEnabled, (newSettings) => {
@@ -897,6 +923,9 @@ export class Config {
     getBaseLlmClient() {
         if (!this.baseLlmClient) {
             // Handle cases where initialization might be deferred or authentication failed
+            if (!this.experiments) {
+                throw new Error('BaseLlmClient not initialized. Ensure experiments have been fetched and configuration is ready.');
+            }
             if (this.contentGenerator) {
                 this.baseLlmClient = new BaseLlmClient(this.getContentGenerator(), this);
             }
@@ -964,6 +993,10 @@ export class Config {
         this._sandboxManager = createSandboxManager(this.sandbox, {
             workspace: this.targetDir,
             forbiddenPaths: this.getSandboxForbiddenPaths.bind(this),
+            includeDirectories: [
+                ...this.pendingIncludeDirectories,
+                Storage.getGlobalTempDir(),
+            ],
             policyManager: this._sandboxPolicyManager,
         }, this.getApprovalMode());
         this.shellExecutionConfig.sandboxManager = this._sandboxManager;
@@ -1160,7 +1193,12 @@ export class Config {
         return this.sandbox?.enabled ?? false;
     }
     getSandboxAllowedPaths() {
-        return this.sandbox?.allowedPaths ?? [];
+        const paths = [...(this.sandbox?.allowedPaths ?? [])];
+        const globalTempDir = Storage.getGlobalTempDir();
+        if (!paths.includes(globalTempDir)) {
+            paths.push(globalTempDir);
+        }
+        return paths;
     }
     getSandboxNetworkAccess() {
         return this.sandbox?.networkAccess ?? false;
@@ -1181,7 +1219,7 @@ export class Config {
         return this.targetDir;
     }
     getWorkspaceContext() {
-        return this.workspaceContext;
+        return getWorkspaceContextOverride() ?? this.workspaceContext;
     }
     getAgentRegistry() {
         return this.agentRegistry;
@@ -1388,12 +1426,12 @@ export class Config {
         this.mcpServers = mcpServers;
     }
     getUserMemory() {
-        if (this.experimentalJitContext && this.contextManager) {
+        if (this.experimentalJitContext && this.memoryContextManager) {
             return {
-                global: this.contextManager.getGlobalMemory(),
-                extension: this.contextManager.getExtensionMemory(),
-                project: this.contextManager.getEnvironmentMemory(),
-                userProjectMemory: this.contextManager.getUserProjectMemory(),
+                global: this.memoryContextManager.getGlobalMemory(),
+                extension: this.memoryContextManager.getExtensionMemory(),
+                project: this.memoryContextManager.getEnvironmentMemory(),
+                userProjectMemory: this.memoryContextManager.getUserProjectMemory(),
             };
         }
         return this.userMemory;
@@ -1402,8 +1440,8 @@ export class Config {
      * Refreshes the MCP context, including memory, tools, and system instructions.
      */
     async refreshMcpContext() {
-        if (this.experimentalJitContext && this.contextManager) {
-            await this.contextManager.refresh();
+        if (this.experimentalJitContext && this.memoryContextManager) {
+            await this.memoryContextManager.refresh();
         }
         else {
             const { refreshServerHierarchicalMemory } = await import('../utils/memoryDiscovery.js');
@@ -1426,9 +1464,9 @@ export class Config {
      * via system instruction updates.
      */
     getSystemInstructionMemory() {
-        if (this.experimentalJitContext && this.contextManager) {
-            const global = this.contextManager.getGlobalMemory();
-            const userProjectMemory = this.contextManager.getUserProjectMemory();
+        if (this.experimentalJitContext && this.memoryContextManager) {
+            const global = this.memoryContextManager.getGlobalMemory();
+            const userProjectMemory = this.memoryContextManager.getUserProjectMemory();
             if (userProjectMemory?.trim()) {
                 return { global, userProjectMemory };
             }
@@ -1442,12 +1480,12 @@ export class Config {
      * disabled (Tier 2 memory is already in the system instruction).
      */
     getSessionMemory() {
-        if (!this.experimentalJitContext || !this.contextManager) {
+        if (!this.experimentalJitContext || !this.memoryContextManager) {
             return '';
         }
         const sections = [];
-        const extension = this.contextManager.getExtensionMemory();
-        const project = this.contextManager.getEnvironmentMemory();
+        const extension = this.memoryContextManager.getExtensionMemory();
+        const project = this.memoryContextManager.getEnvironmentMemory();
         if (extension?.trim()) {
             sections.push(`<extension_context>\n${extension.trim()}\n</extension_context>`);
         }
@@ -1459,18 +1497,18 @@ export class Config {
         return `\n<loaded_context>\n${sections.join('\n')}\n</loaded_context>`;
     }
     getGlobalMemory() {
-        return this.contextManager?.getGlobalMemory() ?? '';
+        return this.memoryContextManager?.getGlobalMemory() ?? '';
     }
     getEnvironmentMemory() {
-        return this.contextManager?.getEnvironmentMemory() ?? '';
+        return this.memoryContextManager?.getEnvironmentMemory() ?? '';
     }
-    getContextManager() {
-        return this.contextManager;
+    getMemoryContextManager() {
+        return this.memoryContextManager;
     }
     isJitContextEnabled() {
         return this.experimentalJitContext;
     }
-    isAutoDistillationEnabled() {
+    isContextManagementEnabled() {
         return this.contextManagement.enabled;
     }
     getMemoryBoundaryMarkers() {
@@ -1484,8 +1522,6 @@ export class Config {
     }
     get agentHistoryProviderConfig() {
         return {
-            isTruncationEnabled: this.contextManagement.enabled,
-            isSummarizationEnabled: this.contextManagement.enabled,
             maxTokens: this.contextManagement.historyWindow.maxTokens,
             retainedTokens: this.contextManagement.historyWindow.retainedTokens,
             normalMessageTokens: this.contextManagement.messageLimits.normalMaxTokens,
@@ -1527,8 +1563,8 @@ export class Config {
         };
     }
     getGeminiMdFileCount() {
-        if (this.experimentalJitContext && this.contextManager) {
-            return this.contextManager.getLoadedPaths().size;
+        if (this.experimentalJitContext && this.memoryContextManager) {
+            return this.memoryContextManager.getLoadedPaths().size;
         }
         return this.geminiMdFileCount;
     }
@@ -1536,8 +1572,8 @@ export class Config {
         this.geminiMdFileCount = count;
     }
     getGeminiMdFilePaths() {
-        if (this.experimentalJitContext && this.contextManager) {
-            return Array.from(this.contextManager.getLoadedPaths());
+        if (this.experimentalJitContext && this.memoryContextManager) {
+            return Array.from(this.memoryContextManager.getLoadedPaths());
         }
         return this.geminiMdFilePaths;
     }
@@ -2046,6 +2082,19 @@ export class Config {
         return (this.experiments?.flags[ExperimentFlags.GEMINI_3_1_PRO_LAUNCHED]
             ?.boolValue ?? false);
     }
+    /**
+     * Returns the configured default request timeout in milliseconds.
+     */
+    getRequestTimeoutMs() {
+        const flag = this.experiments?.flags?.[ExperimentFlags.DEFAULT_REQUEST_TIMEOUT];
+        if (flag?.intValue !== undefined) {
+            const seconds = parseInt(flag.intValue, 10);
+            if (Number.isInteger(seconds) && seconds >= 0) {
+                return seconds * 1000; // Convert seconds to milliseconds
+            }
+        }
+        return undefined;
+    }
     /**
      * Returns whether Gemini 3.1 Flash Lite has been launched.
      *
@@ -2134,6 +2183,12 @@ export class Config {
     getUseAlternateBuffer() {
         return this.useAlternateBuffer;
     }
+    getUseTerminalBuffer() {
+        return this.useTerminalBuffer;
+    }
+    getUseRenderProcess() {
+        return this.useRenderProcess;
+    }
     getEnableInteractiveShell() {
         return this.enableInteractiveShell;
     }
@@ -2228,6 +2283,12 @@ export class Config {
     getGemmaModelRouterSettings() {
         return this.gemmaModelRouter;
     }
+    getAgentSessionNoninteractiveEnabled() {
+        return this.agentSessionNoninteractiveEnabled;
+    }
+    getAgentSessionInteractiveEnabled() {
+        return this.agentSessionInteractiveEnabled;
+    }
     /**
      * Get override settings for a specific agent.
      * Reads from agents.overrides.<agentName>.
@@ -2318,6 +2379,8 @@ 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(ListBackgroundProcessesTool, () => registry.registerTool(new ListBackgroundProcessesTool(this, this.messageBus)));
+        maybeRegister(ReadBackgroundOutputTool, () => registry.registerTool(new ReadBackgroundOutputTool(this, this.messageBus)));
         if (!this.isMemoryManagerEnabled()) {
             maybeRegister(MemoryTool, () => registry.registerTool(new MemoryTool(this.messageBus, this.storage)));
         }