@machina.ai/cell-cli-core 1.41.1-rc2 → 1.45.1-rc1

package/dist/src/config/config.js

@@ -18,14 +18,14 @@ 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 { RipGrepTool, resolveRipgrepPath } from '../tools/ripGrep.js';
 import { GlobTool } from '../tools/glob.js';
 import { ActivateSkillTool } from '../tools/activate-skill.js';
 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, getCurrentGeminiMdFilename, } from '../tools/memoryTool.js';
+import { 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';
@@ -45,7 +45,7 @@ import { SandboxedFileSystemService } from '../services/sandboxedFileSystemServi
 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, isGemini2Model, 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_AUTO, isAutoModel, isPreviewModel, isGemini2Model, PREVIEW_GEMINI_FLASH_MODEL, resolveModel, setFlashModels, } from './models.js';
 import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { WriteTodosTool } from '../tools/write-todos.js';
@@ -61,7 +61,7 @@ import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.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 { getWorkspaceContextOverride, hasScopedAutoMemoryExtractionWriteAccess, hasScopedMemoryInboxAccess, } from './scoped-config.js';
 import { Storage } from './storage.js';
 import { FileExclusions } from '../utils/ignorePatterns.js';
 import { MessageBus } from '../confirmation-bus/message-bus.js';
@@ -75,10 +75,12 @@ import { AcknowledgedAgentsService } from '../agents/acknowledgedAgents.js';
 import { setGlobalProxy, updateGlobalFetchTimeouts } from '../utils/fetch.js';
 import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
 import { debugLogger } from '../utils/debugLogger.js';
+import { ragLogger } from '../utils/ragLogger.js';
 import { SkillManager } from '../skills/skillManager.js';
 import { startupProfiler } from '../telemetry/startupProfiler.js';
 import { fetchAdminControls } from '../code_assist/admin/admin_controls.js';
 import { isSubpath, resolveToRealPath } from '../utils/paths.js';
+import { validatePath } from '../utils/path-validator.js';
 import { InjectionService } from './injectionService.js';
 import { ExecutionLifecycleService } from '../services/executionLifecycleService.js';
 import { WORKSPACE_POLICY_TIER } from '../policy/config.js';
@@ -87,6 +89,7 @@ import { CheckerRunner } from '../safety/checker-runner.js';
 import { ContextBuilder } from '../safety/context-builder.js';
 import { CheckerRegistry } from '../safety/registry.js';
 import { ConsecaSafetyChecker } from '../safety/conseca/conseca.js';
+import { getChannelFromVersion } from '../utils/channel.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 '../context/toolOutputMaskingService.js';
@@ -217,7 +220,7 @@ export class Config {
     skillManager;
     _sessionId;
     clientName;
-    clientVersion;
+    _clientVersion;
     fileSystemService;
     trackerService;
     topicState = new TopicState();
@@ -228,6 +231,7 @@ export class Config {
     sandbox;
     _sandboxForbiddenPaths;
     targetDir;
+    _ripgrepPathPromise;
     workspaceContext;
     debugMode;
     question;
@@ -250,6 +254,7 @@ export class Config {
     geminiMdFileCount;
     geminiMdFilePaths;
     showMemoryUsage;
+    logRagSnippets;
     accessibility;
     telemetrySettings;
     usageStatisticsEnabled;
@@ -279,6 +284,7 @@ export class Config {
     folderTrust;
     ideMode;
     _activeModel;
+    fallbackOverrides = new Map();
     maxSessionTurns;
     listSessions;
     deleteSession;
@@ -346,12 +352,13 @@ export class Config {
     gemmaModelRouter;
     agentSessionNoninteractiveEnabled;
     agentSessionInteractiveEnabled;
-    continueOnFailedApiCall;
+    agentSessionSubagentEnabled;
     retryFetchErrors;
     maxAttempts;
     enableShellOutputEfficiency;
     shellToolInactivityTimeout;
     fakeResponses;
+    fakeResponsesNonStrict;
     recordResponses;
     disableYoloMode;
     disableAlwaysAllow;
@@ -377,8 +384,6 @@ export class Config {
     skillsSupport;
     disabledSkills;
     adminSkillsEnabled;
-    experimentalJitContext;
-    experimentalMemoryV2;
     experimentalAutoMemory;
     experimentalGemma;
     experimentalContextManagementConfig;
@@ -401,7 +406,7 @@ export class Config {
     constructor(params) {
         this._sessionId = params.sessionId;
         this.clientName = params.clientName;
-        this.clientVersion = params.clientVersion ?? 'unknown';
+        this._clientVersion = params.clientVersion ?? 'unknown';
         this.approvedPlanPath = undefined;
         this.embeddingModel =
             params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
@@ -475,6 +480,7 @@ export class Config {
         this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
         this.geminiMdFilePaths = params.geminiMdFilePaths ?? [];
         this.showMemoryUsage = params.showMemoryUsage ?? false;
+        this.logRagSnippets = params.logRagSnippets ?? false;
         this.accessibility = params.accessibility ?? {};
         this.telemetrySettings = {
             enabled: params.telemetry?.enabled ?? false,
@@ -571,10 +577,8 @@ export class Config {
             };
         }
         this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
-        this.experimentalJitContext = params.experimentalJitContext ?? true;
-        this.experimentalMemoryV2 = params.experimentalMemoryV2 ?? true;
         this.experimentalAutoMemory = params.experimentalAutoMemory ?? false;
-        this.experimentalGemma = params.experimentalGemma ?? false;
+        this.experimentalGemma = params.experimentalGemma ?? true;
         this.experimentalContextManagementConfig =
             params.experimentalContextManagementConfig;
         this.memoryBoundaryMarkers = params.memoryBoundaryMarkers ?? ['.git'];
@@ -670,7 +674,6 @@ export class Config {
         this.enableHooksUI = params.enableHooksUI ?? true;
         this.enableHooks = params.enableHooks ?? true;
         this.disabledHooks = params.disabledHooks ?? [];
-        this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
         this.enableShellOutputEfficiency =
             params.enableShellOutputEfficiency ?? true;
         this.shellToolInactivityTimeout =
@@ -681,6 +684,7 @@ export class Config {
         this.storage = new Storage(this.targetDir, this._sessionId);
         this.storage.setCustomPlansDir(params.planSettings?.directory);
         this.fakeResponses = params.fakeResponses;
+        this.fakeResponsesNonStrict = params.fakeResponsesNonStrict;
         this.recordResponses = params.recordResponses;
         this.fileExclusions = new FileExclusions(this);
         this.eventEmitter = params.eventEmitter;
@@ -730,6 +734,8 @@ export class Config {
             params.adk?.agentSessionNoninteractiveEnabled ?? false;
         this.agentSessionInteractiveEnabled =
             params.adk?.agentSessionInteractiveEnabled ?? false;
+        this.agentSessionSubagentEnabled =
+            params.adk?.agentSessionSubagentEnabled ?? false;
         this.retryFetchErrors = params.retryFetchErrors ?? true;
         this.maxAttempts = Math.min(params.maxAttempts ?? DEFAULT_MAX_ATTEMPTS, DEFAULT_MAX_ATTEMPTS);
         this.disableYoloMode = params.disableYoloMode ?? false;
@@ -787,13 +793,26 @@ export class Config {
     }
     async _initialize() {
         await this.storage.initialize();
+        ragLogger.initialize(this.storage.getProjectTempLogsDir());
         // Add pending directories to workspace context
         for (const dir of this.pendingIncludeDirectories) {
             this.workspaceContext.addDirectory(dir);
         }
         // Add plans directory to workspace context for plan file storage
         if (this.planEnabled) {
-            const plansDir = this.storage.getPlansDir();
+            let plansDir;
+            try {
+                plansDir = this.storage.getPlansDir();
+            }
+            catch (error) {
+                // Fallback to the default plan dir if any error occurs
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                coreEvents.emitFeedback('warning', 'Invalid custom plans directory: ' +
+                    errorMessage +
+                    '. Falling back to default project temp directory.', error);
+                this.storage.setCustomPlansDir(undefined);
+                plansDir = this.storage.getPlansDir();
+            }
             try {
                 await fs.promises.access(plansDir);
                 this.workspaceContext.addDirectory(plansDir);
@@ -856,10 +875,8 @@ export class Config {
             this.hookSystem = new HookSystem(this);
             await this.hookSystem.initialize();
         }
-        if (this.experimentalJitContext) {
-            this.memoryContextManager = new MemoryContextManager(this);
-            await this.memoryContextManager.refresh();
-        }
+        this.memoryContextManager = new MemoryContextManager(this);
+        await this.memoryContextManager.refresh();
         await this._geminiClient.initialize();
         this.initialized = true;
     }
@@ -869,6 +886,8 @@ export class Config {
     async refreshAuth(authMethod, displayMessage, apiKey, baseUrl, customHeaders) {
         // Reset availability service when switching auth
         this.modelAvailabilityService.reset();
+        this.fallbackOverrides.clear();
+        this.modelConfigService.clearRuntimeOverrides();
         // Vertex and Genai have incompatible encryption and sending history with
         // thoughtSignature from Genai to Vertex will fail, we need to strip them
         if (this.contentGeneratorConfig?.authType === AuthType.USE_GEMINI &&
@@ -1066,13 +1085,30 @@ export class Config {
         this._sessionId = sessionId;
         this.storage.setSessionId(sessionId);
         this.trackerService = undefined;
+        this.fallbackOverrides.clear();
+        this.modelConfigService.clearRuntimeOverrides();
+        this.approvedPlanPath = undefined;
+        this.topicState.reset();
+        this.skillManager.reset();
+        this.latestApiRequest = undefined;
+        this.lastModeSwitchTime = performance.now();
+        this.compressionTruncationCounter = 0;
+        this.quotaErrorOccurred = false;
+        this.creditsNotificationShown = false;
+        this.modelAvailabilityService.reset();
+        this.modelQuotas.clear();
+        this.lastRetrievedQuota = undefined;
+        this.lastQuotaFetchTime = 0;
+        // Force an event emission to clear the UI display
+        coreEvents.emitQuotaChanged(undefined, undefined, undefined);
+        this.lastEmittedQuotaRemaining = undefined;
+        this.lastEmittedQuotaLimit = undefined;
         if (previousPlansDir) {
             this.refreshSessionScopedPlansDirectory(previousPlansDir);
         }
     }
     resetNewSessionState(sessionId) {
         this.setSessionId(sessionId);
-        this.approvedPlanPath = undefined;
     }
     setTerminalBackground(terminalBackground) {
         this.terminalBackground = terminalBackground;
@@ -1128,13 +1164,37 @@ export class Config {
         }
         this.modelAvailabilityService.reset();
     }
-    activateFallbackMode(model) {
-        this.setModel(model, true);
+    activateFallbackMode(model, failedModel) {
+        if (this.getActiveModel() !== model) {
+            this.setModel(model, true);
+        }
+        if (failedModel) {
+            // Chained fallback mitigation: If we already have overrides that point to the model
+            // that just failed, we need to update them to point to the new fallback model.
+            // e.g. A -> B, then B fails and we fallback to C. We must update A to point to C.
+            for (const [source, target] of this.fallbackOverrides.entries()) {
+                if (target === failedModel) {
+                    this.fallbackOverrides.set(source, model);
+                    this.modelConfigService.registerRuntimeModelOverride({
+                        match: { model: source },
+                        modelConfig: { model },
+                    });
+                }
+            }
+            this.fallbackOverrides.set(failedModel, model);
+            this.modelConfigService.registerRuntimeModelOverride({
+                match: { model: failedModel },
+                modelConfig: { model },
+            });
+        }
         const authType = this.getContentGeneratorConfig()?.authType;
         if (authType) {
             logFlashFallback(this, new FlashFallbackEvent(authType));
         }
     }
+    getFallbackOverride(model) {
+        return this.fallbackOverrides.get(model);
+    }
     getActiveModel() {
         return this._activeModel ?? this.model;
     }
@@ -1192,12 +1252,12 @@ export class Config {
     }
     getPooledQuota() {
         const model = this.getModel();
-        if (!isAutoModel(model)) {
+        if (!isAutoModel(model, this)) {
             return {};
         }
-        const isPreview = model === PREVIEW_GEMINI_MODEL_AUTO ||
-            isPreviewModel(this.getActiveModel(), this);
-        const proModel = isPreview ? PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
+        const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
+        const isPreview = isPreviewModel(primaryModel, this);
+        const proModel = primaryModel;
         const flashModel = isPreview
             ? PREVIEW_GEMINI_FLASH_MODEL
             : DEFAULT_GEMINI_FLASH_MODEL;
@@ -1222,7 +1282,7 @@ export class Config {
         if (pooled.remaining !== undefined) {
             return pooled.remaining;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         return this.modelQuotas.get(primaryModel)?.remaining;
     }
     getQuotaLimit() {
@@ -1230,7 +1290,7 @@ export class Config {
         if (pooled.limit !== undefined) {
             return pooled.limit;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         return this.modelQuotas.get(primaryModel)?.limit;
     }
     getQuotaResetTime() {
@@ -1238,7 +1298,7 @@ export class Config {
         if (pooled.resetTime !== undefined) {
             return pooled.resetTime;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getGemini31FlashLiteLaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         return this.modelQuotas.get(primaryModel)?.resetTime;
     }
     getEmbeddingModel() {
@@ -1276,6 +1336,29 @@ export class Config {
     getProjectRoot() {
         return this.targetDir;
     }
+    /**
+     * Returns the path to the ripgrep binary, or null if not found or unsafe.
+     * Uses Promise-based caching to prevent race conditions and redundant I/O.
+     */
+    async getRipgrepPath() {
+        if (!this._ripgrepPathPromise) {
+            this._ripgrepPathPromise = resolveRipgrepPath();
+        }
+        return this._ripgrepPathPromise;
+    }
+    /**
+     * Checks if ripgrep is available.
+     */
+    async canUseRipgrep() {
+        return (await this.getRipgrepPath()) !== null;
+    }
+    /**
+     * Resets the cached ripgrep path. Used for testing.
+     * @internal
+     */
+    __resetRipgrepPathCache() {
+        this._ripgrepPathPromise = undefined;
+    }
     getWorkspaceContext() {
         return getWorkspaceContextOverride() ?? this.workspaceContext;
     }
@@ -1333,7 +1416,7 @@ export class Config {
         return this.question;
     }
     getHasAccessToPreviewModel() {
-        return this.hasAccessToPreviewModel !== false;
+        return this.hasAccessToPreviewModel ?? false;
     }
     setHasAccessToPreviewModel(hasAccess) {
         this.hasAccessToPreviewModel = hasAccess;
@@ -1389,10 +1472,12 @@ export class Config {
                         });
                     }
                 }
-                this.emitQuotaChangedEvent();
             }
             const hasAccess = quota.buckets?.some((b) => b.modelId && isPreviewModel(b.modelId, this)) ?? false;
             this.setHasAccessToPreviewModel(hasAccess);
+            if (quota.buckets) {
+                this.emitQuotaChangedEvent();
+            }
             return quota;
         }
         catch (e) {
@@ -1521,7 +1606,7 @@ export class Config {
         this.mcpServers = mcpServers;
     }
     getUserMemory() {
-        if (this.experimentalJitContext && this.memoryContextManager) {
+        if (this.memoryContextManager) {
             return {
                 global: this.memoryContextManager.getGlobalMemory(),
                 extension: this.memoryContextManager.getExtensionMemory(),
@@ -1535,13 +1620,7 @@ export class Config {
      * Refreshes the MCP context, including memory, tools, and system instructions.
      */
     async refreshMcpContext() {
-        if (this.experimentalJitContext && this.memoryContextManager) {
-            await this.memoryContextManager.refresh();
-        }
-        else {
-            const { refreshServerHierarchicalMemory } = await import('../utils/memoryDiscovery.js');
-            await refreshServerHierarchicalMemory(this);
-        }
+        await this.memoryContextManager?.refresh();
         if (this._geminiClient?.isInitialized()) {
             await this._geminiClient.setTools();
             this._geminiClient.updateSystemInstruction();
@@ -1551,15 +1630,14 @@ export class Config {
         this.userMemory = newUserMemory;
     }
     /**
-     * Returns memory for the system instruction.
-     * 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.
+     * Returns Tier 1 memory for the system instruction. Global memory and user
+     * project memory go in the system instruction; extension and project memory
+     * 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.memoryContextManager) {
+        if (this.memoryContextManager) {
             const global = this.memoryContextManager.getGlobalMemory();
             const userProjectMemory = this.memoryContextManager.getUserProjectMemory();
             if (userProjectMemory?.trim()) {
@@ -1571,15 +1649,17 @@ export class Config {
     }
     /**
      * Returns Tier 2 memory (extension + project) for injection into the first
-     * user message when JIT is enabled. Returns empty string when JIT is
-     * disabled (Tier 2 memory is already in the system instruction).
+     * user message.
      */
-    getSessionMemory() {
-        if (!this.experimentalJitContext || !this.memoryContextManager) {
+    getSessionMemory(options) {
+        if (!this.memoryContextManager) {
             return '';
         }
         const sections = [];
-        const extension = this.memoryContextManager.getExtensionMemory();
+        const includeExtensionContext = options?.includeExtensionContext ?? true;
+        const extension = includeExtensionContext
+            ? this.memoryContextManager.getExtensionMemory()
+            : '';
         const project = this.memoryContextManager.getEnvironmentMemory();
         if (extension?.trim()) {
             sections.push(`<extension_context>\n${extension.trim()}\n</extension_context>`);
@@ -1600,18 +1680,15 @@ export class Config {
     getMemoryContextManager() {
         return this.memoryContextManager;
     }
-    isJitContextEnabled() {
-        return this.experimentalJitContext;
-    }
     isContextManagementEnabled() {
         return this.contextManagement.enabled;
     }
+    isAgentSessionSubagentEnabled() {
+        return this.agentSessionSubagentEnabled;
+    }
     getMemoryBoundaryMarkers() {
         return this.memoryBoundaryMarkers;
     }
-    isMemoryV2Enabled() {
-        return this.experimentalMemoryV2;
-    }
     isAutoMemoryEnabled() {
         return this.experimentalAutoMemory;
     }
@@ -1667,7 +1744,7 @@ export class Config {
         };
     }
     getGeminiMdFileCount() {
-        if (this.experimentalJitContext && this.memoryContextManager) {
+        if (this.memoryContextManager) {
             return this.memoryContextManager.getLoadedPaths().size;
         }
         return this.geminiMdFileCount;
@@ -1676,7 +1753,7 @@ export class Config {
         this.geminiMdFileCount = count;
     }
     getGeminiMdFilePaths() {
-        if (this.experimentalJitContext && this.memoryContextManager) {
+        if (this.memoryContextManager) {
             return Array.from(this.memoryContextManager.getLoadedPaths());
         }
         return this.geminiMdFilePaths;
@@ -1726,21 +1803,23 @@ export class Config {
         if (currentMode !== mode) {
             this.logCurrentModeDuration(currentMode);
             logApprovalModeSwitch(this, new ApprovalModeSwitchEvent(currentMode, mode));
-        }
-        this.policyEngine.setApprovalMode(mode);
-        this.refreshSandboxManager();
-        const isPlanModeTransition = currentMode !== mode &&
-            (currentMode === ApprovalMode.PLAN || mode === ApprovalMode.PLAN);
-        const isYoloModeTransition = currentMode !== mode &&
-            (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);
-                });
+            this.policyEngine.setApprovalMode(mode);
+            this.refreshSandboxManager();
+            coreEvents.emit(CoreEvent.ApprovalModeChanged, {
+                sessionId: this.getSessionId(),
+                mode,
+            });
+            const isPlanModeTransition = currentMode === ApprovalMode.PLAN || mode === ApprovalMode.PLAN;
+            const isYoloModeTransition = 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);
+                    });
+                }
+                this.updateSystemInstructionIfInitialized();
             }
-            this.updateSystemInstructionIfInitialized();
         }
     }
     /**
@@ -1769,6 +1848,9 @@ export class Config {
     getExperimentalDynamicModelConfiguration() {
         return this.dynamicModelConfiguration;
     }
+    getReleaseChannel() {
+        return getChannelFromVersion(this._clientVersion);
+    }
     getPendingIncludeDirectories() {
         return this.pendingIncludeDirectories;
     }
@@ -1781,6 +1863,9 @@ export class Config {
     getAccessibility() {
         return this.accessibility;
     }
+    getLogRagSnippets() {
+        return this.logRagSnippets;
+    }
     getTelemetryEnabled() {
         return this.telemetrySettings.enabled ?? false;
     }
@@ -2021,6 +2106,53 @@ export class Config {
     setIdeMode(value) {
         this.ideMode = value;
     }
+    isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, inboxRoot, checkType = 'write') {
+        if (!hasScopedMemoryInboxAccess()) {
+            return false;
+        }
+        const normalizedPath = path.resolve(absolutePath);
+        const resolvedMemoryRoot = resolveToRealPath(this.storage.getProjectMemoryTempDir());
+        // Reads: allow the inbox root and the per-kind subtrees so the extraction
+        // agent can list/inspect prior patches (including non-canonical filenames
+        // left over from older runs) before deciding how to rewrite the canonical
+        // extraction.patch. Writes still flow through the strict canonical-path
+        // check below so the inbox cannot be backdoored with arbitrary files.
+        if (checkType === 'read') {
+            const resolvedInboxRoot = resolveToRealPath(inboxRoot);
+            const normalizedInboxRoot = path.resolve(inboxRoot);
+            if (resolvedPath === resolvedInboxRoot ||
+                normalizedPath === normalizedInboxRoot) {
+                return isSubpath(resolvedMemoryRoot, resolvedPath);
+            }
+            for (const kind of ['private', 'global']) {
+                const kindRoot = path.join(inboxRoot, kind);
+                const resolvedKindRoot = resolveToRealPath(kindRoot);
+                const normalizedKindRoot = path.resolve(kindRoot);
+                if (resolvedPath === resolvedKindRoot ||
+                    normalizedPath === normalizedKindRoot ||
+                    isSubpath(resolvedKindRoot, resolvedPath) ||
+                    isSubpath(normalizedKindRoot, normalizedPath)) {
+                    return isSubpath(resolvedMemoryRoot, resolvedPath);
+                }
+            }
+            return false;
+        }
+        const isCanonicalPatchPath = ['private', 'global'].some((kind) => normalizedPath === path.resolve(inboxRoot, kind, 'extraction.patch'));
+        if (!isCanonicalPatchPath) {
+            return false;
+        }
+        return isSubpath(resolvedMemoryRoot, resolvedPath);
+    }
+    isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath) {
+        if (!hasScopedAutoMemoryExtractionWriteAccess()) {
+            return false;
+        }
+        const resolvedSkillsMemoryDir = resolveToRealPath(this.storage.getProjectSkillsMemoryDir());
+        if (isSubpath(resolvedSkillsMemoryDir, resolvedPath)) {
+            return true;
+        }
+        return this.isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, path.join(this.storage.getProjectMemoryTempDir(), '.inbox'));
+    }
     /**
      * Get the current FileSystemService
      */
@@ -2034,11 +2166,37 @@ export class Config {
      * file (the latter is the only file under `~/.cell-cli/` that is reachable —
      * settings, credentials, keybindings, etc. remain disallowed).
      *
+     * One subtree is *carved back out*: `<projectMemoryDir>/.inbox/` is owned by
+     * the auto-memory extraction agent and the `/memory inbox` review flow. The
+     * main agent is denied access to it even though it falls inside the project
+     * temp dir; the extraction agent receives a narrow execution-scoped exception
+     * for *writes* to `.inbox/{private,global}/extraction.patch`. Scoped *read*
+     * access to the wider `.inbox/{private,global}/` subtree is granted in
+     * `validatePathAccess` so the extractor can enumerate prior patches.
+     *
      * @param absolutePath The absolute path to check.
      * @returns true if the path is allowed, false otherwise.
      */
     isPathAllowed(absolutePath) {
         const resolvedPath = resolveToRealPath(absolutePath);
+        // The auto-memory inbox (`<projectMemoryDir>/.inbox/`) is owned by the
+        // background extraction agent and the `/memory inbox` review flow. The
+        // main agent must NOT drop files into it directly (that would let the
+        // model bypass review). Deny first, even if the path also satisfies the
+        // workspace or project-temp allowlists below.
+        const inboxRoot = path.join(this.storage.getProjectMemoryTempDir(), '.inbox');
+        const resolvedInboxRoot = resolveToRealPath(inboxRoot);
+        const normalizedPath = path.resolve(absolutePath);
+        const normalizedInboxRoot = path.resolve(inboxRoot);
+        if (resolvedPath === resolvedInboxRoot ||
+            isSubpath(resolvedInboxRoot, resolvedPath) ||
+            normalizedPath === normalizedInboxRoot ||
+            isSubpath(normalizedInboxRoot, normalizedPath)) {
+            if (this.isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, inboxRoot)) {
+                return true;
+            }
+            return false;
+        }
         const workspaceContext = this.getWorkspaceContext();
         if (workspaceContext.isPathWithinWorkspace(resolvedPath)) {
             return true;
@@ -2067,11 +2225,33 @@ export class Config {
      * @returns An error message string if the path is disallowed, null otherwise.
      */
     validatePathAccess(absolutePath, checkType = 'write') {
+        const pathValidation = validatePath(absolutePath);
+        if (!pathValidation.isValid) {
+            return `Invalid path: ${pathValidation.error}`;
+        }
+        if (checkType === 'write' && hasScopedAutoMemoryExtractionWriteAccess()) {
+            const resolvedPath = resolveToRealPath(absolutePath);
+            if (this.isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath)) {
+                return null;
+            }
+            return `Auto-memory extraction write denied: Attempted path "${absolutePath}" is outside the extraction write allowlist. Extraction may only write extracted skills under ${this.storage.getProjectSkillsMemoryDir()} and canonical inbox patches under ${path.join(this.storage.getProjectMemoryTempDir(), '.inbox', '{private,global}', 'extraction.patch')}.`;
+        }
         // For read operations, check read-only paths first
         if (checkType === 'read') {
             if (this.getWorkspaceContext().isPathReadable(absolutePath)) {
                 return null;
             }
+            // The memory inbox is carved out of the standard temp-dir allowlist by
+            // `isPathAllowed`. The extraction agent is granted a scoped read
+            // exception so it can enumerate prior patches (including non-canonical
+            // filenames) before consolidating them into the canonical
+            // extraction.patch. Writes remain restricted to canonical paths.
+            if (hasScopedMemoryInboxAccess()) {
+                const inboxRoot = path.join(this.storage.getProjectMemoryTempDir(), '.inbox');
+                if (this.isScopedMemoryInboxPatchPathAllowed(absolutePath, resolveToRealPath(absolutePath), inboxRoot, 'read')) {
+                    return null;
+                }
+            }
         }
         // Then check standard allowed paths (Workspace + Temp)
         // This covers 'write' checks and acts as a fallback/temp-dir check for 'read'
@@ -2175,14 +2355,6 @@ export class Config {
         await this.ensureExperimentsLoaded();
         return this.getGemini31LaunchedSync();
     }
-    /**
-     * Returns whether Gemini 3.1 Flash Lite has been launched.
-     * This method is async and ensures that experiments are loaded before returning the result.
-     */
-    async getGemini31FlashLiteLaunched() {
-        await this.ensureExperimentsLoaded();
-        return this.getGemini31FlashLiteLaunchedSync();
-    }
     /**
      * Returns whether the custom tool model should be used.
      */
@@ -2203,10 +2375,44 @@ export class Config {
     }
     isGemini31LaunchedForAuthType(authType) {
         return (authType === AuthType.USE_GEMINI ||
+            authType === AuthType.LOGIN_WITH_GOOGLE ||
             authType === AuthType.USE_VERTEX_AI ||
             authType === AuthType.GATEWAY ||
             authType === AuthType.KEYCLOAK);
     }
+    /**
+     * Returns whether Gemini 3.5 Flash GA has been launched.
+     *
+     * Note: This method should only be called after startup, once experiments have been loaded.
+     */
+    hasGemini35FlashGAAccess() {
+        const authType = this.contentGeneratorConfig?.authType;
+        const hasAccess = (() => {
+            if (this.isGemini31LaunchedForAuthType(authType)) {
+                return true;
+            }
+            return (this.experiments?.flags[ExperimentFlags.GEMINI_3_5_FLASH_GA_LAUNCHED]
+                ?.boolValue ?? false);
+        })();
+        // Used to set default flash models based on access
+        // TODO: Remove once the experiment for 3_5 flash rollut can be cleaned up.
+        if (hasAccess) {
+            // Gemini API key users should have the ability to manually select the
+            // old preview flash model.
+            if (authType === AuthType.USE_GEMINI ||
+                authType === AuthType.LOGIN_WITH_GOOGLE ||
+                authType === AuthType.KEYCLOAK) {
+                setFlashModels('gemini-3-flash-preview', 'gemini-3.5-flash');
+            }
+            else {
+                setFlashModels('gemini-3-flash', 'gemini-3-flash');
+            }
+        }
+        else {
+            setFlashModels('gemini-3-flash-preview', 'gemini-2.5-flash');
+        }
+        return hasAccess;
+    }
     /**
      * Returns whether Gemini 3.1 has been launched.
      *
@@ -2236,19 +2442,10 @@ export class Config {
         return undefined;
     }
     /**
-     * Returns whether Gemini 3.1 Flash Lite has been launched.
-     *
-     * Note: This method should only be called after startup, once experiments have been loaded.
-     * If you need to call this during startup or from an async context, use
-     * getGemini31FlashLiteLaunched instead.
+     * Returns the client version.
      */
-    getGemini31FlashLiteLaunchedSync() {
-        const authType = this.contentGeneratorConfig?.authType;
-        if (this.isGemini31LaunchedForAuthType(authType)) {
-            return true;
-        }
-        return (this.experiments?.flags[ExperimentFlags.GEMINI_3_1_FLASH_LITE_LAUNCHED]
-            ?.boolValue ?? false);
+    get clientVersion() {
+        return this._clientVersion;
     }
     async ensureExperimentsLoaded() {
         if (!this.experimentsPromise) {
@@ -2338,9 +2535,6 @@ export class Config {
     getSkipNextSpeakerCheck() {
         return this.skipNextSpeakerCheck;
     }
-    getContinueOnFailedApiCall() {
-        return this.continueOnFailedApiCall;
-    }
     getRetryFetchErrors() {
         return this.retryFetchErrors;
     }
@@ -2431,10 +2625,12 @@ export class Config {
         return this.gemmaModelRouter;
     }
     getAgentSessionNoninteractiveEnabled() {
-        return this.agentSessionNoninteractiveEnabled;
+        return (process.env['CELL_CLI_EXP_AGENT'] === 'true' ||
+            this.agentSessionNoninteractiveEnabled);
     }
     getAgentSessionInteractiveEnabled() {
-        return this.agentSessionInteractiveEnabled;
+        return (process.env['CELL_CLI_EXP_AGENT'] === 'true' ||
+            this.agentSessionInteractiveEnabled);
     }
     /**
      * Get override settings for a specific agent.
@@ -2504,7 +2700,7 @@ export class Config {
             let useRipgrep = false;
             let errorString = undefined;
             try {
-                useRipgrep = await canUseRipgrep();
+                useRipgrep = await this.canUseRipgrep();
             }
             catch (error) {
                 errorString = String(error);
@@ -2531,9 +2727,6 @@ export class Config {
         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.isMemoryV2Enabled()) {
-            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)));
         if (this.getUseWriteTodos()) {