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

package/dist/src/config/config.test.js

@@ -6,7 +6,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { DEFAULT_FILE_FILTERING_OPTIONS, OutputFormat, SHELL_TOOL_NAME, WRITE_FILE_TOOL_NAME, EDIT_TOOL_NAME, WEB_FETCH_TOOL_NAME, ASK_USER_TOOL_NAME, debugLogger, ApprovalMode, Storage, } from '@google/gemini-cli-core';
+import { DEFAULT_FILE_FILTERING_OPTIONS, OutputFormat, SHELL_TOOL_NAME, WRITE_FILE_TOOL_NAME, EDIT_TOOL_NAME, WEB_FETCH_TOOL_NAME, ASK_USER_TOOL_NAME, debugLogger, ApprovalMode, Storage, generalistProfile, } from '@google/gemini-cli-core';
 import { loadCliConfig, parseArguments } from './config.js';
 import { createTestMergedSettings, } from './settings.js';
 import * as ServerConfig from '@google/gemini-cli-core';
@@ -97,11 +97,14 @@ vi.mock('@google/gemini-cli-core', async () => {
             respectGeminiIgnore: true,
             customIgnoreFilePaths: [],
         },
-        createPolicyEngineConfig: vi.fn(async () => ({
+        createPolicyEngineConfig: vi.fn(async (_settings, approvalMode, _workspacePoliciesDir, interactive) => ({
             rules: [],
             checkers: [],
-            defaultDecision: ServerConfig.PolicyDecision.ASK_USER,
-            approvalMode: ServerConfig.ApprovalMode.DEFAULT,
+            defaultDecision: interactive
+                ? ServerConfig.PolicyDecision.ASK_USER
+                : ServerConfig.PolicyDecision.DENY,
+            approvalMode: approvalMode ?? ServerConfig.ApprovalMode.DEFAULT,
+            nonInteractive: !interactive,
         })),
         getAdminErrorMessage: vi.fn((_feature) => `YOLO mode is disabled by your administrator. To enable it, please request an update to the settings at: https://goo.gle/manage-gemini-cli`),
         isHeadlessMode: vi.fn((opts) => {
@@ -801,7 +804,8 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
         expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(expect.any(String), [], expect.any(Object), expect.any(ExtensionManager), true, 'tree', expect.objectContaining({
             respectGitIgnore: true,
             respectGeminiIgnore: true,
-        }), 200);
+        }), 200, // maxDirs
+        ['.git']);
     });
     it('should pass includeDirectories to loadServerHierarchicalMemory when loadMemoryFromIncludeDirectories is true', async () => {
         process.argv = ['node', 'script.js'];
@@ -818,7 +822,7 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
         expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(expect.any(String), [includeDir], expect.any(Object), expect.any(ExtensionManager), true, 'tree', expect.objectContaining({
             respectGitIgnore: true,
             respectGeminiIgnore: true,
-        }), 200);
+        }), 200, ['.git']);
     });
     it('should NOT pass includeDirectories to loadServerHierarchicalMemory when loadMemoryFromIncludeDirectories is false', async () => {
         process.argv = ['node', 'script.js'];
@@ -834,7 +838,7 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
         expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(expect.any(String), [], expect.any(Object), expect.any(ExtensionManager), true, 'tree', expect.objectContaining({
             respectGitIgnore: true,
             respectGeminiIgnore: true,
-        }), 200);
+        }), 200, ['.git']);
     });
 });
 describe('mergeMcpServers', () => {
@@ -1114,8 +1118,8 @@ describe('Approval mode tool exclusion logic', () => {
             'test',
         ];
         const settings = createTestMergedSettings({
-            experimental: {
-                plan: true,
+            general: {
+                plan: { enabled: true },
             },
         });
         const argv = await parseArguments(createTestMergedSettings());
@@ -1205,23 +1209,19 @@ describe('Approval mode tool exclusion logic', () => {
         const settings = createTestMergedSettings({
             general: {
                 defaultApprovalMode: 'plan',
-            },
-            experimental: {
-                plan: false,
+                plan: { enabled: false },
             },
         });
         const argv = await parseArguments(settings);
         const config = await loadCliConfig(settings, 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
     });
-    it('should allow plan approval mode if experimental plan is enabled', async () => {
+    it('should allow plan approval mode if plan is enabled', async () => {
         process.argv = ['node', 'script.js'];
         const settings = createTestMergedSettings({
             general: {
                 defaultApprovalMode: 'plan',
-            },
-            experimental: {
-                plan: true,
+                plan: { enabled: true },
             },
         });
         const argv = await parseArguments(settings);
@@ -1809,6 +1809,79 @@ describe('loadCliConfig directWebFetch', () => {
         expect(config.getDirectWebFetch()).toBe(true);
     });
 });
+describe('loadCliConfig context management', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+        vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
+        vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
+        vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    });
+    afterEach(() => {
+        vi.unstubAllEnvs();
+        vi.restoreAllMocks();
+    });
+    it('should be false by default when generalistProfile / context management is not set in settings', async () => {
+        process.argv = ['node', 'script.js'];
+        const argv = await parseArguments(createTestMergedSettings());
+        const settings = createTestMergedSettings();
+        const config = await loadCliConfig(settings, 'test-session', argv);
+        expect(config.getContextManagementConfig()).haveOwnProperty('enabled', false);
+        expect(config.isContextManagementEnabled()).toBe(false);
+    });
+    it('should be true when generalistProfile is set to true in settings', async () => {
+        process.argv = ['node', 'script.js'];
+        const argv = await parseArguments(createTestMergedSettings());
+        const settings = createTestMergedSettings({
+            experimental: {
+                generalistProfile: true,
+            },
+        });
+        const config = await loadCliConfig(settings, 'test-session', argv);
+        expect(config.getContextManagementConfig()).toStrictEqual(generalistProfile);
+        expect(config.isContextManagementEnabled()).toBe(true);
+    });
+    it('should be true when contextManagement is set to true in settings', async () => {
+        process.argv = ['node', 'script.js'];
+        const argv = await parseArguments(createTestMergedSettings());
+        const contextManagementConfig = {
+            historyWindow: {
+                maxTokens: 100_000,
+                retainedTokens: 50_000,
+            },
+            messageLimits: {
+                normalMaxTokens: 1000,
+                retainedMaxTokens: 10_000,
+                normalizationHeadRatio: 0.25,
+            },
+            tools: {
+                distillation: {
+                    maxOutputTokens: 10_000,
+                    summarizationThresholdTokens: 15_000,
+                },
+                outputMasking: {
+                    protectionThresholdTokens: 30_000,
+                    minPrunableThresholdTokens: 10_000,
+                    protectLatestTurn: false,
+                },
+            },
+        };
+        const settings = createTestMergedSettings({
+            experimental: {
+                contextManagement: true,
+            },
+            // The type of numbers is being inferred strangely, and so we have to cast
+            // to `any` here.
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            contextManagement: contextManagementConfig,
+        });
+        const config = await loadCliConfig(settings, 'test-session', argv);
+        expect(config.getContextManagementConfig()).toStrictEqual({
+            enabled: true,
+            ...contextManagementConfig,
+        });
+        expect(config.isContextManagementEnabled()).toBe(true);
+    });
+});
 describe('screenReader configuration', () => {
     beforeEach(() => {
         vi.resetAllMocks();
@@ -2203,12 +2276,12 @@ describe('loadCliConfig approval mode', () => {
         const config = await loadCliConfig(createTestMergedSettings(), 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
-    it('should set Plan approval mode when --approval-mode=plan is used and experimental.plan is enabled', async () => {
+    it('should set Plan approval mode when --approval-mode=plan is used and plan is enabled', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
         const argv = await parseArguments(createTestMergedSettings());
         const settings = createTestMergedSettings({
-            experimental: {
-                plan: true,
+            general: {
+                plan: { enabled: true },
             },
         });
         const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2226,12 +2299,12 @@ describe('loadCliConfig approval mode', () => {
         const config = await loadCliConfig(settings, 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
-    it('should throw error when --approval-mode=plan is used but experimental.plan is disabled', async () => {
+    it('should throw error when --approval-mode=plan is used but plan is disabled', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
         const argv = await parseArguments(createTestMergedSettings());
         const settings = createTestMergedSettings({
-            experimental: {
-                plan: false,
+            general: {
+                plan: { enabled: false },
             },
         });
         const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2319,21 +2392,25 @@ describe('loadCliConfig approval mode', () => {
             const config = await loadCliConfig(settings, 'test-session', argv);
             expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
         });
-        it('should respect plan mode from settings when experimental.plan is enabled', async () => {
+        it('should respect plan mode from settings when plan is enabled', async () => {
             process.argv = ['node', 'script.js'];
             const settings = createTestMergedSettings({
-                general: { defaultApprovalMode: 'plan' },
-                experimental: { plan: true },
+                general: {
+                    defaultApprovalMode: 'plan',
+                    plan: { enabled: true },
+                },
             });
             const argv = await parseArguments(settings);
             const config = await loadCliConfig(settings, 'test-session', argv);
             expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.PLAN);
         });
-        it('should throw error if plan mode is in settings but experimental.plan is disabled', async () => {
+        it('should fall back to default if plan mode is in settings but disabled', async () => {
             process.argv = ['node', 'script.js'];
             const settings = createTestMergedSettings({
-                general: { defaultApprovalMode: 'plan' },
-                experimental: { plan: false },
+                general: {
+                    defaultApprovalMode: 'plan',
+                    plan: { enabled: false },
+                },
             });
             const argv = await parseArguments(settings);
             const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2761,7 +2838,7 @@ describe('Policy Engine Integration in loadCliConfig', () => {
             tools: expect.objectContaining({
                 allowed: expect.arrayContaining(['cli-tool']),
             }),
-        }), expect.anything());
+        }), expect.anything(), undefined, expect.anything());
     });
     it('should pass merged exclude tools from CLI logic and settings to createPolicyEngineConfig', async () => {
         process.stdin.isTTY = false; // Non-interactive to trigger default excludes
@@ -2776,7 +2853,7 @@ describe('Policy Engine Integration in loadCliConfig', () => {
             tools: expect.objectContaining({
                 exclude: expect.arrayContaining([ASK_USER_TOOL_NAME]),
             }),
-        }), expect.anything());
+        }), expect.anything(), undefined, expect.anything());
     });
     it('should pass user-provided policy paths from --policy flag to createPolicyEngineConfig', async () => {
         process.argv = [
@@ -2793,7 +2870,7 @@ describe('Policy Engine Integration in loadCliConfig', () => {
                 path.normalize('/path/to/policy1.toml'),
                 path.normalize('/path/to/policy2.toml'),
             ],
-        }), expect.anything());
+        }), expect.anything(), undefined, expect.anything());
     });
 });
 describe('loadCliConfig disableYoloMode', () => {
@@ -2949,7 +3026,9 @@ describe('loadCliConfig mcpEnabled', () => {
         it('should use plan directory from active extension when user has not specified one', async () => {
             process.argv = ['node', 'script.js'];
             const settings = createTestMergedSettings({
-                experimental: { plan: true },
+                general: {
+                    plan: { enabled: true },
+                },
             });
             const argv = await parseArguments(settings);
             vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
@@ -2965,9 +3044,11 @@ describe('loadCliConfig mcpEnabled', () => {
         it('should NOT use plan directory from active extension when user has specified one', async () => {
             process.argv = ['node', 'script.js'];
             const settings = createTestMergedSettings({
-                experimental: { plan: true },
                 general: {
-                    plan: { directory: 'user-plans-dir' },
+                    plan: {
+                        enabled: true,
+                        directory: 'user-plans-dir',
+                    },
                 },
             });
             const argv = await parseArguments(settings);
@@ -2985,7 +3066,9 @@ describe('loadCliConfig mcpEnabled', () => {
         it('should NOT use plan directory from inactive extension', async () => {
             process.argv = ['node', 'script.js'];
             const settings = createTestMergedSettings({
-                experimental: { plan: true },
+                general: {
+                    plan: { enabled: true },
+                },
             });
             const argv = await parseArguments(settings);
             vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
@@ -3001,7 +3084,9 @@ describe('loadCliConfig mcpEnabled', () => {
         it('should use default path if neither user nor extension settings provide a plan directory', async () => {
             process.argv = ['node', 'script.js'];
             const settings = createTestMergedSettings({
-                experimental: { plan: true },
+                general: {
+                    plan: { enabled: true },
+                },
             });
             const argv = await parseArguments(settings);
             // No extensions providing plan directory