@machina.ai/cell-cli-core 1.36.0-rc1 → 1.38.1-rc2

package/dist/src/config/config.js

@@ -26,8 +26,11 @@ import { WebFetchTool } from '../tools/web-fetch.js';
 import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
 import { WebSearchTool } from '../tools/web-search.js';
 import { AskUserTool } from '../tools/ask-user.js';
+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';
@@ -52,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 '../services/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';
@@ -65,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';
@@ -83,7 +87,7 @@ import { CheckerRegistry } from '../safety/registry.js';
 import { ConsecaSafetyChecker } from '../safety/conseca/conseca.js';
 import { DEFAULT_MAX_ATTEMPTS } from '../utils/retry.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, } from './constants.js';
-import { DEFAULT_TOOL_PROTECTION_THRESHOLD, DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD, DEFAULT_PROTECT_LATEST_TURN, } from '../services/toolOutputMaskingService.js';
+import { DEFAULT_TOOL_PROTECTION_THRESHOLD, DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD, DEFAULT_PROTECT_LATEST_TURN, } from '../context/toolOutputMaskingService.js';
 import { SimpleExtensionLoader, } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
 import { A2AClientManager } from '../agents/a2a-client-manager.js';
@@ -171,6 +175,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([
@@ -214,11 +219,13 @@ export class Config {
     clientVersion;
     fileSystemService;
     trackerService;
+    topicState = new TopicState();
     contentGeneratorConfig;
     contentGenerator;
     modelConfigService;
     embeddingModel;
     sandbox;
+    _sandboxForbiddenPaths;
     targetDir;
     workspaceContext;
     debugMode;
@@ -310,9 +317,12 @@ export class Config {
     directWebFetch;
     useRipgrep;
     enableInteractiveShell;
+    shellBackgroundCompletionBehavior;
     skipNextSpeakerCheck;
     useBackgroundColor;
     useAlternateBuffer;
+    useTerminalBuffer;
+    useRenderProcess;
     shellExecutionConfig;
     extensionManagement = true;
     extensionRegistryURI;
@@ -331,6 +341,8 @@ export class Config {
     policyUpdateConfirmationRequest;
     outputSettings;
     gemmaModelRouter;
+    agentSessionNoninteractiveEnabled;
+    agentSessionInteractiveEnabled;
     continueOnFailedApiCall;
     retryFetchErrors;
     maxAttempts;
@@ -344,9 +356,8 @@ export class Config {
     acceptRawOutputRisk;
     dynamicModelConfiguration;
     pendingIncludeDirectories;
-    enableHooks;
     enableHooksUI;
-    toolOutputMasking;
+    enableHooks;
     hooks;
     projectHooks;
     disabledHooks;
@@ -364,13 +375,15 @@ export class Config {
     adminSkillsEnabled;
     experimentalJitContext;
     experimentalMemoryManager;
+    memoryBoundaryMarkers;
     topicUpdateNarration;
     disableLLMCorrection;
     planEnabled;
     trackerEnabled;
     planModeRoutingEnabled;
     modelSteering;
-    contextManager;
+    memoryContextManager;
+    contextManagement;
     terminalBackground = undefined;
     remoteAdminSettings;
     latestApiRequest;
@@ -388,6 +401,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,21 +413,29 @@ export class Config {
             : {
                 enabled: params.toolSandboxing || false,
                 allowedPaths: [],
+                includeDirectories: [Storage.getGlobalTempDir()],
                 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._sandboxPolicyManager = new SandboxPolicyManager();
         const initialApprovalMode = params.approvalMode ??
             params.policyEngineConfig?.approvalMode ??
             'default';
-        this._sandboxManager = createSandboxManager(this.sandbox, params.targetDir, this._sandboxPolicyManager, initialApprovalMode);
+        this._sandboxManager = createSandboxManager(this.sandbox, {
+            workspace: this.targetDir,
+            forbiddenPaths: this.getSandboxForbiddenPaths.bind(this),
+            includeDirectories: [
+                ...this.pendingIncludeDirectories,
+                Storage.getGlobalTempDir(),
+            ],
+            policyManager: this._sandboxPolicyManager,
+        }, initialApprovalMode);
         if (!(this._sandboxManager instanceof NoopSandboxManager) &&
             this.sandbox?.enabled) {
             this.fileSystemService = new SandboxedFileSystemService(this._sandboxManager, params.targetDir);
@@ -417,10 +443,6 @@ export class Config {
         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;
@@ -538,19 +560,41 @@ export class Config {
         this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
         this.experimentalJitContext = params.experimentalJitContext ?? false;
         this.experimentalMemoryManager = params.experimentalMemoryManager ?? false;
+        this.memoryBoundaryMarkers = params.memoryBoundaryMarkers ?? ['.git'];
+        this.contextManagement = {
+            enabled: params.contextManagement?.enabled ?? false,
+            historyWindow: {
+                maxTokens: params.contextManagement?.historyWindow?.maxTokens ?? 150000,
+                retainedTokens: params.contextManagement?.historyWindow?.retainedTokens ?? 40000,
+            },
+            messageLimits: {
+                normalMaxTokens: params.contextManagement?.messageLimits?.normalMaxTokens ?? 2500,
+                retainedMaxTokens: params.contextManagement?.messageLimits?.retainedMaxTokens ?? 12000,
+                normalizationHeadRatio: params.contextManagement?.messageLimits?.normalizationHeadRatio ??
+                    0.25,
+            },
+            tools: {
+                distillation: {
+                    maxOutputTokens: params.contextManagement?.tools?.distillation?.maxOutputTokens ??
+                        10000,
+                    summarizationThresholdTokens: params.contextManagement?.tools?.distillation
+                        ?.summarizationThresholdTokens ?? 20000,
+                },
+                outputMasking: {
+                    protectionThresholdTokens: params.contextManagement?.tools?.outputMasking
+                        ?.protectionThresholdTokens ?? DEFAULT_TOOL_PROTECTION_THRESHOLD,
+                    minPrunableThresholdTokens: params.contextManagement?.tools?.outputMasking
+                        ?.minPrunableThresholdTokens ??
+                        DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD,
+                    protectLatestTurn: params.contextManagement?.tools?.outputMasking?.protectLatestTurn ??
+                        DEFAULT_PROTECT_LATEST_TURN,
+                },
+            },
+        };
         this.topicUpdateNarration = params.topicUpdateNarration ?? false;
         this.modelSteering = params.modelSteering ?? false;
         this.injectionService = new InjectionService(() => this.isModelSteeringEnabled());
         ExecutionLifecycleService.setInjectionService(this.injectionService);
-        this.toolOutputMasking = {
-            enabled: params.toolOutputMasking?.enabled ?? true,
-            toolProtectionThreshold: params.toolOutputMasking?.toolProtectionThreshold ??
-                DEFAULT_TOOL_PROTECTION_THRESHOLD,
-            minPrunableTokensThreshold: params.toolOutputMasking?.minPrunableTokensThreshold ??
-                DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD,
-            protectLatestTurn: params.toolOutputMasking?.protectLatestTurn ??
-                DEFAULT_PROTECT_LATEST_TURN,
-        };
         this.maxSessionTurns = params.maxSessionTurns ?? -1;
         this.acpMode = params.acpMode ?? false;
         this.listSessions = params.listSessions ?? false;
@@ -576,7 +620,16 @@ 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') {
+            this.shellBackgroundCompletionBehavior = requestedBehavior;
+        }
+        else {
+            this.shellBackgroundCompletionBehavior = 'silent';
+        }
         this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? true;
         this.shellExecutionConfig = {
             terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
@@ -586,6 +639,7 @@ export class Config {
             sanitizationConfig: this.sanitizationConfig,
             sandboxManager: this._sandboxManager,
             sandboxConfig: this.sandbox,
+            backgroundCompletionBehavior: this.shellBackgroundCompletionBehavior,
         };
         this.truncateToolOutputThreshold =
             params.truncateToolOutputThreshold ??
@@ -633,9 +687,7 @@ export class Config {
             ...params.policyEngineConfig,
             approvalMode: engineApprovalMode,
             disableAlwaysAllow: this.disableAlwaysAllow,
-            toolSandboxEnabled: this.getSandboxEnabled(),
-            sandboxApprovedTools: this.sandboxPolicyManager?.getModeConfig(engineApprovalMode)
-                ?.approvedTools ?? [],
+            sandboxManager: this._sandboxManager,
         }, checkerRunner);
         // Register Conseca if enabled
         if (this.enableConseca) {
@@ -655,6 +707,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;
@@ -781,8 +837,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;
@@ -815,8 +871,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()
@@ -830,6 +884,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 ||
@@ -843,8 +905,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) => {
@@ -878,6 +938,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);
             }
@@ -931,8 +994,26 @@ export class Config {
     get geminiClient() {
         return this._geminiClient;
     }
+    async getSandboxForbiddenPaths() {
+        if (this._sandboxForbiddenPaths) {
+            return this._sandboxForbiddenPaths;
+        }
+        this._sandboxForbiddenPaths = await this.getFileService().getIgnoredPaths({
+            respectGitIgnore: false,
+            respectGeminiIgnore: true,
+        });
+        return this._sandboxForbiddenPaths;
+    }
     refreshSandboxManager() {
-        this._sandboxManager = createSandboxManager(this.sandbox, this.targetDir, this._sandboxPolicyManager, this.getApprovalMode());
+        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;
     }
     get sandboxPolicyManager() {
@@ -1127,7 +1208,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;
@@ -1148,7 +1234,7 @@ export class Config {
         return this.targetDir;
     }
     getWorkspaceContext() {
-        return this.workspaceContext;
+        return getWorkspaceContextOverride() ?? this.workspaceContext;
     }
     getAgentRegistry() {
         return this.agentRegistry;
@@ -1355,11 +1441,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(),
+                global: this.memoryContextManager.getGlobalMemory(),
+                extension: this.memoryContextManager.getExtensionMemory(),
+                project: this.memoryContextManager.getEnvironmentMemory(),
+                userProjectMemory: this.memoryContextManager.getUserProjectMemory(),
             };
         }
         return this.userMemory;
@@ -1368,8 +1455,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');
@@ -1385,13 +1472,20 @@ export class Config {
     }
     /**
      * Returns memory for the system instruction.
-     * When JIT is enabled, only global memory (Tier 1) goes in the system
-     * instruction. Extension and project memory (Tier 2) are placed in the
-     * first user message instead, per the tiered context model.
+     * When JIT is enabled, global memory and user project memory (Tier 1) go
+     * in the system instruction. Extension and project memory (Tier 2) are
+     * placed in the first user message instead, per the tiered context model.
+     * User project memory is in Tier 1 so mid-session saves are reflected
+     * via system instruction updates.
      */
     getSystemInstructionMemory() {
-        if (this.experimentalJitContext && this.contextManager) {
-            return this.contextManager.getGlobalMemory();
+        if (this.experimentalJitContext && this.memoryContextManager) {
+            const global = this.memoryContextManager.getGlobalMemory();
+            const userProjectMemory = this.memoryContextManager.getUserProjectMemory();
+            if (userProjectMemory?.trim()) {
+                return { global, userProjectMemory };
+            }
+            return global;
         }
         return this.userMemory;
     }
@@ -1401,12 +1495,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>`);
         }
@@ -1418,29 +1512,44 @@ 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;
     }
+    isContextManagementEnabled() {
+        return this.contextManagement.enabled;
+    }
+    getMemoryBoundaryMarkers() {
+        return this.memoryBoundaryMarkers;
+    }
     isMemoryManagerEnabled() {
         return this.experimentalMemoryManager;
     }
+    getContextManagementConfig() {
+        return this.contextManagement;
+    }
+    get agentHistoryProviderConfig() {
+        return {
+            maxTokens: this.contextManagement.historyWindow.maxTokens,
+            retainedTokens: this.contextManagement.historyWindow.retainedTokens,
+            normalMessageTokens: this.contextManagement.messageLimits.normalMaxTokens,
+            maximumMessageTokens: this.contextManagement.messageLimits.retainedMaxTokens,
+            normalizationHeadRatio: this.contextManagement.messageLimits.normalizationHeadRatio,
+        };
+    }
     isTopicUpdateNarrationEnabled() {
         return this.topicUpdateNarration;
     }
     isModelSteeringEnabled() {
         return this.modelSteering;
     }
-    getToolOutputMaskingEnabled() {
-        return this.toolOutputMasking.enabled;
-    }
     async getToolOutputMaskingConfig() {
         await this.ensureExperimentsLoaded();
         const remoteProtection = this.experiments?.flags[ExperimentFlags.MASKING_PROTECTION_THRESHOLD]
@@ -1456,19 +1565,21 @@ export class Config {
             ? parseInt(remotePrunable, 10)
             : undefined;
         return {
-            enabled: this.toolOutputMasking.enabled,
-            toolProtectionThreshold: parsedProtection !== undefined && !isNaN(parsedProtection)
+            protectionThresholdTokens: parsedProtection !== undefined && !isNaN(parsedProtection)
                 ? parsedProtection
-                : this.toolOutputMasking.toolProtectionThreshold,
-            minPrunableTokensThreshold: parsedPrunable !== undefined && !isNaN(parsedPrunable)
+                : this.contextManagement.tools.outputMasking
+                    .protectionThresholdTokens,
+            minPrunableThresholdTokens: parsedPrunable !== undefined && !isNaN(parsedPrunable)
                 ? parsedPrunable
-                : this.toolOutputMasking.minPrunableTokensThreshold,
-            protectLatestTurn: remoteProtectLatest ?? this.toolOutputMasking.protectLatestTurn,
+                : this.contextManagement.tools.outputMasking
+                    .minPrunableThresholdTokens,
+            protectLatestTurn: remoteProtectLatest ??
+                this.contextManagement.tools.outputMasking.protectLatestTurn,
         };
     }
     getGeminiMdFileCount() {
-        if (this.experimentalJitContext && this.contextManager) {
-            return this.contextManager.getLoadedPaths().size;
+        if (this.experimentalJitContext && this.memoryContextManager) {
+            return this.memoryContextManager.getLoadedPaths().size;
         }
         return this.geminiMdFileCount;
     }
@@ -1476,8 +1587,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;
     }
@@ -1517,7 +1628,9 @@ export class Config {
         debugLogger.debug(`Workspace policies loaded from: ${policyDir}`);
     }
     setApprovalMode(mode) {
-        if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT) {
+        if (!this.isTrustedFolder() &&
+            mode !== ApprovalMode.DEFAULT &&
+            mode !== ApprovalMode.PLAN) {
             throw new Error('Cannot enable privileged approval modes in an untrusted folder.');
         }
         const currentMode = this.getApprovalMode();
@@ -1525,7 +1638,7 @@ export class Config {
             this.logCurrentModeDuration(currentMode);
             logApprovalModeSwitch(this, new ApprovalModeSwitchEvent(currentMode, mode));
         }
-        this.policyEngine.setApprovalMode(mode, this.sandboxPolicyManager?.getModeConfig(mode)?.approvedTools ?? []);
+        this.policyEngine.setApprovalMode(mode);
         this.refreshSandboxManager();
         const isPlanModeTransition = currentMode !== mode &&
             (currentMode === ApprovalMode.PLAN || mode === ApprovalMode.PLAN);
@@ -1533,6 +1646,7 @@ export class Config {
             (currentMode === ApprovalMode.YOLO || mode === ApprovalMode.YOLO);
         if (isPlanModeTransition || isYoloModeTransition) {
             if (this._geminiClient?.isInitialized()) {
+                this._geminiClient.clearCurrentSequenceModel();
                 this._geminiClient.setTools().catch((err) => {
                     debugLogger.error('Failed to update tools', err);
                 });
@@ -1630,6 +1744,9 @@ export class Config {
     getModelRouterService() {
         return this.modelRouterService;
     }
+    getModelConfigService() {
+        return this.modelConfigService;
+    }
     getModelAvailabilityService() {
         return this.modelAvailabilityService;
     }
@@ -1972,6 +2089,12 @@ export class Config {
         const authType = this.contentGeneratorConfig?.authType;
         return useGemini3_1 && authType === AuthType.USE_GEMINI;
     }
+    isGemini31LaunchedForAuthType(authType) {
+        return (authType === AuthType.USE_GEMINI ||
+            authType === AuthType.USE_VERTEX_AI ||
+            authType === AuthType.GATEWAY ||
+            authType === AuthType.KEYCLOAK);
+    }
     /**
      * Returns whether Gemini 3.1 has been launched.
      *
@@ -1981,14 +2104,25 @@ export class Config {
      */
     getGemini31LaunchedSync() {
         const authType = this.contentGeneratorConfig?.authType;
-        if (authType === AuthType.USE_GEMINI ||
-            authType === AuthType.USE_VERTEX_AI ||
-            authType === AuthType.KEYCLOAK) {
+        if (this.isGemini31LaunchedForAuthType(authType)) {
             return true;
         }
         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.
      *
@@ -1998,8 +2132,7 @@ export class Config {
      */
     getGemini31FlashLiteLaunchedSync() {
         const authType = this.contentGeneratorConfig?.authType;
-        if (authType === AuthType.USE_GEMINI ||
-            authType === AuthType.USE_VERTEX_AI) {
+        if (this.isGemini31LaunchedForAuthType(authType)) {
             return true;
         }
         return (this.experiments?.flags[ExperimentFlags.GEMINI_3_1_FLASH_LITE_LAUNCHED]
@@ -2078,9 +2211,18 @@ export class Config {
     getUseAlternateBuffer() {
         return this.useAlternateBuffer;
     }
+    getUseTerminalBuffer() {
+        return this.useTerminalBuffer;
+    }
+    getUseRenderProcess() {
+        return this.useRenderProcess;
+    }
     getEnableInteractiveShell() {
         return this.enableInteractiveShell;
     }
+    getShellBackgroundCompletionBehavior() {
+        return this.shellBackgroundCompletionBehavior;
+    }
     getSkipNextSpeakerCheck() {
         return this.skipNextSpeakerCheck;
     }
@@ -2122,6 +2264,13 @@ export class Config {
         4 *
             (tokenLimit(this.model) - uiTelemetryService.getLastPromptTokenCount()), this.truncateToolOutputThreshold);
     }
+    getToolMaxOutputTokens() {
+        return this.contextManagement.tools.distillation.maxOutputTokens;
+    }
+    getToolSummarizationThresholdTokens() {
+        return this.contextManagement.tools.distillation
+            .summarizationThresholdTokens;
+    }
     getNextCompressionTruncationId() {
         return ++this.compressionTruncationCounter;
     }
@@ -2162,6 +2311,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>.
@@ -2187,6 +2342,7 @@ export class Config {
                 visualModel: customConfig.visualModel,
                 allowedDomains: customConfig.allowedDomains,
                 disableUserInput: customConfig.disableUserInput,
+                maxActionsPerTask: customConfig.maxActionsPerTask ?? 100,
                 confirmSensitiveActions: customConfig.confirmSensitiveActions,
                 blockFileUploads: customConfig.blockFileUploads,
             },
@@ -2222,6 +2378,7 @@ export class Config {
                 registerFn();
             }
         };
+        maybeRegister(UpdateTopicTool, () => registry.registerTool(new UpdateTopicTool(this, this.messageBus)));
         maybeRegister(LSTool, () => registry.registerTool(new LSTool(this, this.messageBus)));
         maybeRegister(ReadFileTool, () => registry.registerTool(new ReadFileTool(this, this.messageBus)));
         if (this.getUseRipgrep()) {
@@ -2250,8 +2407,10 @@ 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)));
+            maybeRegister(MemoryTool, () => registry.registerTool(new MemoryTool(this.messageBus, this.storage)));
         }
         maybeRegister(WebSearchTool, () => registry.registerTool(new WebSearchTool(this, this.messageBus)));
         maybeRegister(AskUserTool, () => registry.registerTool(new AskUserTool(this.messageBus)));