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

package/dist/src/config/config.js

@@ -15,6 +15,8 @@ import { ResourceRegistry } from '../resources/resource-registry.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { LSTool } from '../tools/ls.js';
 import { ReadFileTool } from '../tools/read-file.js';
+import { ReadMcpResourceTool } from '../tools/read-mcp-resource.js';
+import { ListMcpResourcesTool } from '../tools/list-mcp-resources.js';
 import { GrepTool } from '../tools/grep.js';
 import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
 import { GlobTool } from '../tools/glob.js';
@@ -23,11 +25,12 @@ import { EditTool } from '../tools/edit.js';
 import { ShellTool } from '../tools/shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { WebFetchTool } from '../tools/web-fetch.js';
-import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
+import { MemoryTool, setGeminiMdFilename, getCurrentGeminiMdFilename, } from '../tools/memoryTool.js';
 import { WebSearchTool } from '../tools/web-search.js';
 import { AskUserTool } from '../tools/ask-user.js';
 import { UpdateTopicTool } from '../tools/topicTool.js';
 import { TopicState } from './topicState.js';
+import { AgentTool } from '../agents/agent-tool.js';
 import { ExitPlanModeTool } from '../tools/exit-plan-mode.js';
 import { EnterPlanModeTool } from '../tools/enter-plan-mode.js';
 import { ListBackgroundProcessesTool, ReadBackgroundOutputTool, } from '../tools/shellBackgroundTools.js';
@@ -70,7 +73,6 @@ import { getExperiments, } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
 import { AcknowledgedAgentsService } from '../agents/acknowledgedAgents.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';
 import { SkillManager } from '../skills/skillManager.js';
@@ -92,7 +94,6 @@ import { SimpleExtensionLoader, } from '../utils/extensionLoader.js';
 import { McpClientManager } from '../tools/mcp-client-manager.js';
 import { A2AClientManager } from '../agents/a2a-client-manager.js';
 import {} from '../tools/mcp-client.js';
-import { getErrorMessage } from '../utils/errors.js';
 export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 40_000;
 export class MCPServerConfig {
@@ -295,12 +296,14 @@ export class Config {
     lastEmittedQuotaRemaining;
     lastEmittedQuotaLimit;
     emitQuotaChangedEvent() {
-        const pooled = this.getPooledQuota();
-        if (this.lastEmittedQuotaRemaining !== pooled.remaining ||
-            this.lastEmittedQuotaLimit !== pooled.limit) {
-            this.lastEmittedQuotaRemaining = pooled.remaining;
-            this.lastEmittedQuotaLimit = pooled.limit;
-            coreEvents.emitQuotaChanged(pooled.remaining, pooled.limit, pooled.resetTime);
+        const remaining = this.getQuotaRemaining();
+        const limit = this.getQuotaLimit();
+        const resetTime = this.getQuotaResetTime();
+        if (this.lastEmittedQuotaRemaining !== remaining ||
+            this.lastEmittedQuotaLimit !== limit) {
+            this.lastEmittedQuotaRemaining = remaining;
+            this.lastEmittedQuotaLimit = limit;
+            coreEvents.emitQuotaChanged(remaining, limit, resetTime);
         }
     }
     summarizeToolOutput;
@@ -367,6 +370,7 @@ export class Config {
     onModelChange;
     onReload;
     billing;
+    vertexAiRouting;
     enableAgents;
     agents;
     enableEventDrivenScheduler;
@@ -374,7 +378,9 @@ export class Config {
     disabledSkills;
     adminSkillsEnabled;
     experimentalJitContext;
-    experimentalMemoryManager;
+    experimentalMemoryV2;
+    experimentalAutoMemory;
+    experimentalContextManagementConfig;
     memoryBoundaryMarkers;
     topicUpdateNarration;
     disableLLMCorrection;
@@ -470,6 +476,7 @@ export class Config {
         this.accessibility = params.accessibility ?? {};
         this.telemetrySettings = {
             enabled: params.telemetry?.enabled ?? false,
+            traces: params.telemetry?.traces ?? false,
             target: params.telemetry?.target ?? DEFAULT_TELEMETRY_TARGET,
             otlpEndpoint: params.telemetry?.otlpEndpoint ?? DEFAULT_OTLP_ENDPOINT,
             otlpProtocol: params.telemetry?.otlpProtocol,
@@ -484,6 +491,9 @@ export class Config {
                 DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
             respectGeminiIgnore: params.fileFiltering?.respectGeminiIgnore ??
                 DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+            enableFileWatcher: params.fileFiltering?.enableFileWatcher ??
+                DEFAULT_FILE_FILTERING_OPTIONS.enableFileWatcher ??
+                true,
             enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
             enableFuzzySearch: params.fileFiltering?.enableFuzzySearch ?? true,
             maxFileCount: params.fileFiltering?.maxFileCount ??
@@ -558,8 +568,11 @@ export class Config {
             };
         }
         this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
-        this.experimentalJitContext = params.experimentalJitContext ?? false;
-        this.experimentalMemoryManager = params.experimentalMemoryManager ?? false;
+        this.experimentalJitContext = params.experimentalJitContext ?? true;
+        this.experimentalMemoryV2 = params.experimentalMemoryV2 ?? true;
+        this.experimentalAutoMemory = params.experimentalAutoMemory ?? false;
+        this.experimentalContextManagementConfig =
+            params.experimentalContextManagementConfig;
         this.memoryBoundaryMarkers = params.memoryBoundaryMarkers ?? ['.git'];
         this.contextManagement = {
             enabled: params.contextManagement?.enabled ?? false,
@@ -591,7 +604,7 @@ export class Config {
                 },
             },
         };
-        this.topicUpdateNarration = params.topicUpdateNarration ?? false;
+        this.topicUpdateNarration = params.topicUpdateNarration ?? true;
         this.modelSteering = params.modelSteering ?? false;
         this.injectionService = new InjectionService(() => this.isModelSteeringEnabled());
         ExecutionLifecycleService.setInjectionService(this.injectionService);
@@ -702,6 +715,8 @@ export class Config {
         };
         this.gemmaModelRouter = {
             enabled: params.gemmaModelRouter?.enabled ?? false,
+            autoStartServer: params.gemmaModelRouter?.autoStartServer ?? true,
+            binaryPath: params.gemmaModelRouter?.binaryPath ?? '',
             classifier: {
                 host: params.gemmaModelRouter?.classifier?.host ?? 'http://localhost:9379',
                 model: params.gemmaModelRouter?.classifier?.model ?? 'gemma3-1b-gpu-custom',
@@ -728,6 +743,7 @@ export class Config {
         this.billing = {
             overageStrategy: params.billing?.overageStrategy ?? 'ask',
         };
+        this.vertexAiRouting = params.vertexAiRouting;
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
@@ -863,11 +879,11 @@ export class Config {
         if (this.contentGeneratorConfig) {
             this.contentGeneratorConfig.authType = undefined;
         }
-        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, {
+        const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod, apiKey, baseUrl, customHeaders, this.vertexAiRouting, {
             clientId: this.keycloakClientId,
             deviceEndpoint: this.keycloakDeviceEndpoint,
             tokenEndpoint: this.keycloakTokenEndpoint,
-        }, displayMessage, apiKey, baseUrl, customHeaders);
+        }, displayMessage);
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
         // Only assign to instance properties after successful initialization
         this.contentGeneratorConfig = newContentGeneratorConfig;
@@ -1032,7 +1048,19 @@ export class Config {
         return this.clientName;
     }
     setSessionId(sessionId) {
+        const previousPlansDir = this.storage.isInitialized()
+            ? this.storage.getPlansDir()
+            : undefined;
         this._sessionId = sessionId;
+        this.storage.setSessionId(sessionId);
+        this.trackerService = undefined;
+        if (previousPlansDir) {
+            this.refreshSessionScopedPlansDirectory(previousPlansDir);
+        }
+    }
+    resetNewSessionState(sessionId) {
+        this.setSessionId(sessionId);
+        this.approvedPlanPath = undefined;
     }
     setTerminalBackground(terminalBackground) {
         this.terminalBackground = terminalBackground;
@@ -1079,6 +1107,9 @@ export class Config {
             // When the user explicitly sets a model, that becomes the active model.
             this._activeModel = newModel;
             coreEvents.emitModelChanged(newModel);
+            this.lastEmittedQuotaRemaining = undefined;
+            this.lastEmittedQuotaLimit = undefined;
+            this.emitQuotaChangedEvent();
         }
         if (this.onModelChange && !isTemporary) {
             this.onModelChange(newModel);
@@ -1236,6 +1267,34 @@ export class Config {
     getWorkspaceContext() {
         return getWorkspaceContextOverride() ?? this.workspaceContext;
     }
+    refreshSessionScopedPlansDirectory(previousPlansDir) {
+        const nextPlansDir = this.storage.getPlansDir();
+        if (previousPlansDir === nextPlansDir) {
+            return;
+        }
+        const pathsToRemove = new Set([previousPlansDir]);
+        try {
+            pathsToRemove.add(resolveToRealPath(previousPlansDir));
+        }
+        catch {
+            // The previous session's plans directory may never have been created.
+            // In that case there is nothing to resolve or remove beyond the raw path.
+        }
+        const currentDirectories = this.workspaceContext
+            .getDirectories()
+            .filter((dir) => !pathsToRemove.has(dir));
+        this.workspaceContext.setDirectories(currentDirectories);
+        try {
+            if (fs.existsSync(nextPlansDir)) {
+                this.workspaceContext.addDirectory(nextPlansDir);
+            }
+        }
+        catch {
+            // Ignore invalid or unreadable plans directories here. This mirrors
+            // initialization behavior, which only adds the plans directory when it
+            // already exists and is readable.
+        }
+    }
     getAgentRegistry() {
         return this.agentRegistry;
     }
@@ -1293,20 +1352,29 @@ export class Config {
                 this.lastRetrievedQuota = quota;
                 this.lastQuotaFetchTime = Date.now();
                 for (const bucket of quota.buckets) {
-                    if (bucket.modelId &&
-                        bucket.remainingAmount &&
-                        bucket.remainingFraction != null) {
-                        const remaining = parseInt(bucket.remainingAmount, 10);
-                        const limit = bucket.remainingFraction > 0
-                            ? Math.round(remaining / bucket.remainingFraction)
-                            : (this.modelQuotas.get(bucket.modelId)?.limit ?? 0);
-                        if (!isNaN(remaining) && Number.isFinite(limit) && limit > 0) {
-                            this.modelQuotas.set(bucket.modelId, {
-                                remaining,
-                                limit,
-                                resetTime: bucket.resetTime,
-                            });
-                        }
+                    if (!bucket.modelId || bucket.remainingFraction == null) {
+                        continue;
+                    }
+                    let remaining;
+                    let limit;
+                    if (bucket.remainingAmount) {
+                        remaining = parseInt(bucket.remainingAmount, 10);
+                        limit =
+                            bucket.remainingFraction > 0
+                                ? Math.round(remaining / bucket.remainingFraction)
+                                : (this.modelQuotas.get(bucket.modelId)?.limit ?? 0);
+                    }
+                    else {
+                        // Server only sent remainingFraction — use a normalized scale.
+                        limit = 100;
+                        remaining = Math.round(bucket.remainingFraction * limit);
+                    }
+                    if (!isNaN(remaining) && Number.isFinite(limit) && limit > 0) {
+                        this.modelQuotas.set(bucket.modelId, {
+                            remaining,
+                            limit,
+                            resetTime: bucket.resetTime,
+                        });
                     }
                 }
                 this.emitQuotaChangedEvent();
@@ -1529,8 +1597,14 @@ export class Config {
     getMemoryBoundaryMarkers() {
         return this.memoryBoundaryMarkers;
     }
-    isMemoryManagerEnabled() {
-        return this.experimentalMemoryManager;
+    isMemoryV2Enabled() {
+        return this.experimentalMemoryV2;
+    }
+    isAutoMemoryEnabled() {
+        return this.experimentalAutoMemory;
+    }
+    getExperimentalContextManagementConfig() {
+        return this.experimentalContextManagementConfig;
     }
     getContextManagementConfig() {
         return this.contextManagement;
@@ -1695,6 +1769,9 @@ export class Config {
     getTelemetryEnabled() {
         return this.telemetrySettings.enabled ?? false;
     }
+    getTelemetryTracesEnabled() {
+        return this.telemetrySettings.traces ?? false;
+    }
     getTelemetryLogPromptsEnabled() {
         return this.telemetrySettings.logPrompts ?? true;
     }
@@ -1769,6 +1846,7 @@ export class Config {
         return {
             respectGitIgnore: this.fileFiltering.respectGitIgnore,
             respectGeminiIgnore: this.fileFiltering.respectGeminiIgnore,
+            enableFileWatcher: this.fileFiltering.enableFileWatcher,
             maxFileCount: this.fileFiltering.maxFileCount,
             searchTimeout: this.fileFiltering.searchTimeout,
             customIgnoreFilePaths: this.fileFiltering.customIgnoreFilePaths,
@@ -1933,7 +2011,10 @@ export class Config {
     }
     /**
      * Checks if a given absolute path is allowed for file system operations.
-     * A path is allowed if it's within the workspace context or the project's temporary directory.
+     * A path is allowed if it's within the workspace context, the project's
+     * temporary directory, or is exactly the global personal `~/.cell-cli/GEMINI.md`
+     * file (the latter is the only file under `~/.cell-cli/` that is reachable —
+     * settings, credentials, keybindings, etc. remain disallowed).
      *
      * @param absolutePath The absolute path to check.
      * @returns true if the path is allowed, false otherwise.
@@ -1946,7 +2027,19 @@ export class Config {
         }
         const projectTempDir = this.storage.getProjectTempDir();
         const resolvedTempDir = resolveToRealPath(projectTempDir);
-        return isSubpath(resolvedTempDir, resolvedPath);
+        if (isSubpath(resolvedTempDir, resolvedPath)) {
+            return true;
+        }
+        // Surgical allowlist: the global personal GEMINI.md file (and ONLY that
+        // file) is reachable so the prompt-driven memory flow can persist
+        // cross-project personal preferences. This deliberately does NOT
+        // allowlist the rest of `~/.cell-cli/`.
+        const globalMemoryFilePath = path.join(Storage.getGlobalGeminiDir(), getCurrentGeminiMdFilename());
+        const resolvedGlobalMemoryFilePath = resolveToRealPath(globalMemoryFilePath);
+        if (resolvedPath === resolvedGlobalMemoryFilePath) {
+            return true;
+        }
+        return false;
     }
     /**
      * Validates if a path is allowed and returns a detailed error message if not.
@@ -2049,7 +2142,8 @@ export class Config {
      * Note: This method should only be called after startup, once experiments have been loaded.
      */
     getProModelNoAccessSync() {
-        if (this.contentGeneratorConfig?.authType !== AuthType.LOGIN_WITH_GOOGLE) {
+        if (this.contentGeneratorConfig?.authType !== AuthType.LOGIN_WITH_GOOGLE &&
+            this.contentGeneratorConfig?.authType !== AuthType.COMPUTE_ADC) {
             return false;
         }
         return (this.experiments?.flags[ExperimentFlags.PRO_MODEL_NO_ACCESS]?.boolValue ??
@@ -2245,14 +2339,21 @@ export class Config {
         return this.shellExecutionConfig;
     }
     setShellExecutionConfig(config) {
+        const definedConfig = {};
+        for (const [k, v] of Object.entries(config)) {
+            // Only merge properties explicitly provided with a concrete value.
+            // Filtering out `null` and `undefined` ensures existing system defaults
+            // are preserved when an extension doesn't want to override them.
+            if (v != null) {
+                Object.assign(definedConfig, { [k]: v });
+            }
+        }
+        // Note: This performs a shallow merge. If the incoming config provides a nested
+        // object (e.g., sandboxConfig), it will completely overwrite the existing
+        // nested object rather than merging its individual properties.
         this.shellExecutionConfig = {
-            terminalWidth: config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
-            terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
-            showColor: config.showColor ?? this.shellExecutionConfig.showColor,
-            pager: config.pager ?? this.shellExecutionConfig.pager,
-            sanitizationConfig: config.sanitizationConfig ??
-                this.shellExecutionConfig.sanitizationConfig,
-            sandboxManager: config.sandboxManager ?? this.shellExecutionConfig.sandboxManager,
+            ...this.shellExecutionConfig,
+            ...definedConfig,
         };
     }
     getScreenReader() {
@@ -2394,6 +2495,7 @@ export class Config {
                 maybeRegister(RipGrepTool, () => registry.registerTool(new RipGrepTool(this, this.messageBus)));
             }
             else {
+                debugLogger.warn(`Ripgrep is not available. Falling back to GrepTool.`);
                 logRipgrepFallback(this, new RipgrepFallbackEvent(errorString));
                 maybeRegister(GrepTool, () => registry.registerTool(new GrepTool(this, this.messageBus)));
             }
@@ -2406,10 +2508,12 @@ export class Config {
         maybeRegister(EditTool, () => registry.registerTool(new EditTool(this, this.messageBus)));
         maybeRegister(WriteFileTool, () => registry.registerTool(new WriteFileTool(this, this.messageBus)));
         maybeRegister(WebFetchTool, () => registry.registerTool(new WebFetchTool(this, this.messageBus)));
+        maybeRegister(ReadMcpResourceTool, () => registry.registerTool(new ReadMcpResourceTool(this, this.messageBus)));
+        maybeRegister(ListMcpResourcesTool, () => registry.registerTool(new ListMcpResourcesTool(this, this.messageBus)));
         maybeRegister(ShellTool, () => registry.registerTool(new ShellTool(this, this.messageBus)));
         maybeRegister(ListBackgroundProcessesTool, () => registry.registerTool(new ListBackgroundProcessesTool(this, this.messageBus)));
         maybeRegister(ReadBackgroundOutputTool, () => registry.registerTool(new ReadBackgroundOutputTool(this, this.messageBus)));
-        if (!this.isMemoryManagerEnabled()) {
+        if (!this.isMemoryV2Enabled()) {
             maybeRegister(MemoryTool, () => registry.registerTool(new MemoryTool(this.messageBus, this.storage)));
         }
         maybeRegister(WebSearchTool, () => registry.registerTool(new WebSearchTool(this, this.messageBus)));
@@ -2429,47 +2533,12 @@ export class Config {
             maybeRegister(TrackerAddDependencyTool, () => registry.registerTool(new TrackerAddDependencyTool(this, this.messageBus)));
             maybeRegister(TrackerVisualizeTool, () => registry.registerTool(new TrackerVisualizeTool(this, this.messageBus)));
         }
-        // Register Subagents as Tools
-        this.registerSubAgentTools(registry);
+        // Register Subagent Tool
+        maybeRegister(AgentTool, () => registry.registerTool(new AgentTool(this, this.messageBus)));
         await registry.discoverAllTools();
         registry.sortTools();
         return registry;
     }
-    /**
-     * Registers SubAgentTools for all available agents.
-     */
-    registerSubAgentTools(registry) {
-        const agentsOverrides = this.getAgentsSettings().overrides ?? {};
-        const discoveredDefinitions = this.agentRegistry.getAllDiscoveredAgentNames();
-        // First, unregister any agents that are now disabled
-        for (const agentName of discoveredDefinitions) {
-            if (!this.isAgentsEnabled() ||
-                agentsOverrides[agentName]?.enabled === false) {
-                const tool = registry.getTool(agentName);
-                if (tool instanceof SubagentTool) {
-                    registry.unregisterTool(agentName);
-                }
-            }
-        }
-        const discoveredNames = this.agentRegistry.getAllDiscoveredAgentNames();
-        for (const agentName of discoveredNames) {
-            const definition = this.agentRegistry.getDiscoveredDefinition(agentName);
-            if (!definition) {
-                continue;
-            }
-            try {
-                if (!this.isAgentsEnabled() ||
-                    agentsOverrides[definition.name]?.enabled === false) {
-                    continue;
-                }
-                const tool = new SubagentTool(definition, this, this.messageBus);
-                registry.registerTool(tool);
-            }
-            catch (e) {
-                debugLogger.warn(`Failed to register tool for agent ${definition.name}: ${getErrorMessage(e)}`);
-            }
-        }
-    }
     /**
      * Get the hook system instance
      */
@@ -2553,9 +2622,6 @@ export class Config {
         debugLogger.debug('Experiments loaded', summaryString);
     }
     onAgentsRefreshed = async () => {
-        if (this._toolRegistry) {
-            this.registerSubAgentTools(this._toolRegistry);
-        }
         // Propagate updates to the active chat session
         const client = this.geminiClient;
         if (client?.isInitialized()) {