@google/gemini-cli-core 0.24.0-nightly.20251231.05049b5ab → 0.24.0-preview.0

package/dist/src/code_assist/setup.test.js

@@ -75,8 +75,10 @@ describe('setupUser for existing user', () => {
 describe('setupUser for new user', () => {
     let mockLoad;
     let mockOnboardUser;
+    let mockGetOperation;
     beforeEach(() => {
         vi.resetAllMocks();
+        vi.useFakeTimers();
         mockLoad = vi.fn();
         mockOnboardUser = vi.fn().mockResolvedValue({
             done: true,
@@ -86,12 +88,15 @@ describe('setupUser for new user', () => {
                 },
             },
         });
+        mockGetOperation = vi.fn();
         vi.mocked(CodeAssistServer).mockImplementation(() => ({
             loadCodeAssist: mockLoad,
             onboardUser: mockOnboardUser,
+            getOperation: mockGetOperation,
         }));
     });
     afterEach(() => {
+        vi.useRealTimers();
         vi.unstubAllEnvs();
     });
     it('should use GOOGLE_CLOUD_PROJECT when set and onboard a new paid user', async () => {
@@ -167,5 +172,63 @@ describe('setupUser for new user', () => {
         });
         await expect(setupUser({})).rejects.toThrow(ProjectIdRequiredError);
     });
+    it('should poll getOperation when onboardUser returns done=false', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+        mockLoad.mockResolvedValue({
+            allowedTiers: [mockPaidTier],
+        });
+        const operationName = 'operations/123';
+        mockOnboardUser.mockResolvedValueOnce({
+            name: operationName,
+            done: false,
+        });
+        mockGetOperation
+            .mockResolvedValueOnce({
+            name: operationName,
+            done: false,
+        })
+            .mockResolvedValueOnce({
+            name: operationName,
+            done: true,
+            response: {
+                cloudaicompanionProject: {
+                    id: 'server-project',
+                },
+            },
+        });
+        const setupPromise = setupUser({});
+        await vi.advanceTimersByTimeAsync(5000);
+        await vi.advanceTimersByTimeAsync(5000);
+        const userData = await setupPromise;
+        expect(mockOnboardUser).toHaveBeenCalledTimes(1);
+        expect(mockGetOperation).toHaveBeenCalledTimes(2);
+        expect(mockGetOperation).toHaveBeenCalledWith(operationName);
+        expect(userData).toEqual({
+            projectId: 'server-project',
+            userTier: 'standard-tier',
+        });
+    });
+    it('should not poll getOperation when onboardUser returns done=true immediately', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+        mockLoad.mockResolvedValue({
+            allowedTiers: [mockPaidTier],
+        });
+        mockOnboardUser.mockResolvedValueOnce({
+            name: 'operations/123',
+            done: true,
+            response: {
+                cloudaicompanionProject: {
+                    id: 'server-project',
+                },
+            },
+        });
+        const userData = await setupUser({});
+        expect(mockOnboardUser).toHaveBeenCalledTimes(1);
+        expect(mockGetOperation).not.toHaveBeenCalled();
+        expect(userData).toEqual({
+            projectId: 'server-project',
+            userTier: 'standard-tier',
+        });
+    });
 });
 //# sourceMappingURL=setup.test.js.map

package/dist/src/code_assist/setup.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.test.js","sourceRoot":"","sources":["../../../src/code_assist/setup.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.test.js","sourceRoot":"","sources":["../../../src/code_assist/setup.test.ts"],"names":[],"mappings":"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"}

package/dist/src/code_assist/types.d.ts

@@ -225,4 +225,22 @@ export interface ConversationInteraction {
     language?: string;
     isAgentic?: boolean;
 }
+export interface GeminiCodeAssistSetting {
+    secureModeEnabled?: boolean;
+    mcpSetting?: McpSetting;
+    cliFeatureSetting?: CliFeatureSetting;
+}
+export interface McpSetting {
+    mcpEnabled?: boolean;
+    allowedMcpConfigs?: McpConfig[];
+}
+export interface McpConfig {
+    mcpServer?: string;
+}
+export interface CliFeatureSetting {
+    extensionsSetting?: ExtensionsSetting;
+}
+export interface ExtensionsSetting {
+    extensionsEnabled?: boolean;
+}
 export {};

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

@@ -37,9 +37,10 @@ import type { PolicyEngineConfig } from '../policy/types.js';
 import { HookSystem } from '../hooks/index.js';
 import type { UserTierId } from '../code_assist/types.js';
 import type { RetrieveUserQuotaResponse } from '../code_assist/types.js';
+import type { GeminiCodeAssistSetting } from '../code_assist/types.js';
 import type { Experiments } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
-import { SkillManager } from '../services/skillManager.js';
+import { SkillManager, type SkillDefinition } from '../skills/skillManager.js';
 import { ApprovalMode } from '../policy/types.js';
 export interface AccessibilitySettings {
     disableLoadingPhrases?: boolean;
@@ -107,6 +108,7 @@ export interface GeminiCLIExtension {
     };
     settings?: ExtensionSetting[];
     resolvedSettings?: ResolvedExtensionSetting[];
+    skills?: SkillDefinition[];
 }
 export interface ExtensionInstallMetadata {
     source: string;
@@ -225,7 +227,6 @@ export interface ConfigParameters {
     truncateToolOutputLines?: number;
     enableToolOutputTruncation?: boolean;
     eventEmitter?: EventEmitter;
-    useSmartEdit?: boolean;
     useWriteTodos?: boolean;
     policyEngineConfig?: PolicyEngineConfig;
     output?: OutputSettings;
@@ -259,6 +260,10 @@ export interface ConfigParameters {
     disabledSkills?: string[];
     experimentalJitContext?: boolean;
     onModelChange?: (model: string) => void;
+    mcpEnabled?: boolean;
+    onReload?: () => Promise<{
+        disabledSkills?: string[];
+    }>;
 }
 export declare class Config {
     private toolRegistry;
@@ -289,6 +294,7 @@ export declare class Config {
     private readonly toolDiscoveryCommand;
     private readonly toolCallCommand;
     private readonly mcpServerCommand;
+    private readonly mcpEnabled;
     private mcpServers;
     private userMemory;
     private geminiMdFileCount;
@@ -346,7 +352,6 @@ export declare class Config {
     readonly storage: Storage;
     private readonly fileExclusions;
     private readonly eventEmitter?;
-    private readonly useSmartEdit;
     private readonly useWriteTodos;
     private readonly messageBus;
     private readonly policyEngine;
@@ -369,12 +374,14 @@ export declare class Config {
     private experimentsPromise;
     private hookSystem?;
     private readonly onModelChange;
+    private readonly onReload;
     private readonly enableAgents;
     private readonly skillsSupport;
-    private readonly disabledSkills;
+    private disabledSkills;
     private readonly experimentalJitContext;
     private contextManager?;
     private terminalBackground;
+    private remoteAdminSettings;
     constructor(params: ConfigParameters);
     /**
      * Must only be called once, throws if called again.
@@ -392,12 +399,15 @@ export declare class Config {
     setSessionId(sessionId: string): void;
     setTerminalBackground(terminalBackground: string | undefined): void;
     getTerminalBackground(): string | undefined;
+    getRemoteAdminSettings(): GeminiCodeAssistSetting | undefined;
+    setRemoteAdminSettings(settings: GeminiCodeAssistSetting): void;
     shouldLoadMemoryFromIncludeDirectories(): boolean;
     getImportFormat(): 'tree' | 'flat';
     getDiscoveryMaxDirs(): number;
     getContentGeneratorConfig(): ContentGeneratorConfig;
     getModel(): string;
-    setModel(newModel: string, isFallbackModel?: boolean): void;
+    setModel(newModel: string, isTemporary?: boolean): void;
+    activateFallbackMode(model: string): void;
     getActiveModel(): string;
     setActiveModel(model: string): void;
     setFallbackModelHandler(handler: FallbackModelHandler): void;
@@ -442,6 +452,7 @@ export declare class Config {
      * Does NOT include mcp servers configured by extensions.
      */
     getMcpServers(): Record<string, MCPServerConfig> | undefined;
+    getMcpEnabled(): boolean;
     getMcpClientManager(): McpClientManager | undefined;
     getAllowedMcpServers(): string[] | undefined;
     getBlockedMcpServers(): string[] | undefined;
@@ -536,6 +547,10 @@ export declare class Config {
     private ensureExperimentsLoaded;
     isInteractiveShellEnabled(): boolean;
     isSkillsSupportEnabled(): boolean;
+    /**
+     * Reloads skills by re-discovering them from extensions and local directories.
+     */
+    reloadSkills(): Promise<void>;
     isInteractive(): boolean;
     getUseRipgrep(): boolean;
     getEnableInteractiveShell(): boolean;
@@ -551,7 +566,6 @@ export declare class Config {
     getEnableToolOutputTruncation(): boolean;
     getTruncateToolOutputThreshold(): number;
     getTruncateToolOutputLines(): number;
-    getUseSmartEdit(): boolean;
     getUseWriteTodos(): boolean;
     getOutputFormat(): OutputFormat;
     getGitService(): Promise<GitService>;

package/dist/src/config/config.js

@@ -15,8 +15,8 @@ import { ReadFileTool } from '../tools/read-file.js';
 import { GrepTool } from '../tools/grep.js';
 import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
 import { GlobTool } from '../tools/glob.js';
+import { ActivateSkillTool } from '../tools/activate-skill.js';
 import { EditTool } from '../tools/edit.js';
-import { SmartEditTool } from '../tools/smart-edit.js';
 import { ShellTool } from '../tools/shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { WebFetchTool } from '../tools/web-fetch.js';
@@ -34,8 +34,8 @@ import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { WriteTodosTool } from '../tools/write-todos.js';
 import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
+import { logRipgrepFallback, logFlashFallback } from '../telemetry/loggers.js';
+import { RipgrepFallbackEvent, FlashFallbackEvent, } from '../telemetry/types.js';
 import { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
 import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
@@ -56,7 +56,7 @@ import { DELEGATE_TO_AGENT_TOOL_NAME } from '../tools/tool-names.js';
 import { getExperiments } from '../code_assist/experiments/experiments.js';
 import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
 import { debugLogger } from '../utils/debugLogger.js';
-import { SkillManager } from '../services/skillManager.js';
+import { SkillManager } from '../skills/skillManager.js';
 import { startupProfiler } from '../telemetry/startupProfiler.js';
 import { ApprovalMode } from '../policy/types.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, } from './constants.js';
@@ -167,6 +167,7 @@ export class Config {
     toolDiscoveryCommand;
     toolCallCommand;
     mcpServerCommand;
+    mcpEnabled;
     mcpServers;
     userMemory;
     geminiMdFileCount;
@@ -224,7 +225,6 @@ export class Config {
     storage;
     fileExclusions;
     eventEmitter;
-    useSmartEdit;
     useWriteTodos;
     messageBus;
     policyEngine;
@@ -247,12 +247,14 @@ export class Config {
     experimentsPromise;
     hookSystem;
     onModelChange;
+    onReload;
     enableAgents;
     skillsSupport;
     disabledSkills;
     experimentalJitContext;
     contextManager;
     terminalBackground = undefined;
+    remoteAdminSettings;
     constructor(params) {
         this.sessionId = params.sessionId;
         this.embeddingModel =
@@ -272,6 +274,7 @@ export class Config {
         this.toolCallCommand = params.toolCallCommand;
         this.mcpServerCommand = params.mcpServerCommand;
         this.mcpServers = params.mcpServers;
+        this.mcpEnabled = params.mcpEnabled ?? true;
         this.allowedMcpServers = params.allowedMcpServers ?? [];
         this.blockedMcpServers = params.blockedMcpServers ?? [];
         this.allowedEnvironmentVariables = params.allowedEnvironmentVariables ?? [];
@@ -352,7 +355,6 @@ export class Config {
         this.truncateToolOutputLines =
             params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
         this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
-        this.useSmartEdit = params.useSmartEdit ?? true;
         // // TODO(joshualitt): Re-evaluate the todo tool for 3 family.
         this.useWriteTodos = isPreviewModel(this.model)
             ? false
@@ -401,6 +403,7 @@ export class Config {
         this.projectHooks = params.projectHooks;
         this.experiments = params.experiments;
         this.onModelChange = params.onModelChange;
+        this.onReload = params.onReload;
         if (params.contextFileName) {
             setGeminiMdFilename(params.contextFileName);
         }
@@ -472,11 +475,15 @@ export class Config {
         initMcpHandle?.end();
         // Discover skills if enabled
         if (this.skillsSupport) {
-            await this.getSkillManager().discoverSkills(this.storage);
+            await this.getSkillManager().discoverSkills(this.storage, this.getExtensions());
             this.getSkillManager().setDisabledSkills(this.disabledSkills);
+            // Re-register ActivateSkillTool to update its schema with the discovered enabled skill enums
+            if (this.getSkillManager().getSkills().length > 0) {
+                this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+            }
         }
         // Initialize hook system if enabled
-        if (this.enableHooks) {
+        if (this.getEnableHooks()) {
             this.hookSystem = new HookSystem(this);
             await this.hookSystem.initialize();
         }
@@ -581,6 +588,12 @@ export class Config {
     getTerminalBackground() {
         return this.terminalBackground;
     }
+    getRemoteAdminSettings() {
+        return this.remoteAdminSettings;
+    }
+    setRemoteAdminSettings(settings) {
+        this.remoteAdminSettings = settings;
+    }
     shouldLoadMemoryFromIncludeDirectories() {
         return this.loadMemoryFromIncludeDirectories;
     }
@@ -596,18 +609,25 @@ export class Config {
     getModel() {
         return this.model;
     }
-    setModel(newModel, isFallbackModel = false) {
+    setModel(newModel, isTemporary = true) {
         if (this.model !== newModel || this._activeModel !== newModel) {
             this.model = newModel;
             // When the user explicitly sets a model, that becomes the active model.
             this._activeModel = newModel;
             coreEvents.emitModelChanged(newModel);
-            if (this.onModelChange && !isFallbackModel) {
+            if (this.onModelChange && !isTemporary) {
                 this.onModelChange(newModel);
             }
         }
         this.modelAvailabilityService.reset();
     }
+    activateFallbackMode(model) {
+        this.setModel(model, true);
+        const authType = this.getContentGeneratorConfig()?.authType;
+        if (authType) {
+            logFlashFallback(this, new FlashFallbackEvent(authType));
+        }
+    }
     getActiveModel() {
         return this._activeModel ?? this.model;
     }
@@ -762,6 +782,9 @@ export class Config {
     getMcpServers() {
         return this.mcpServers;
     }
+    getMcpEnabled() {
+        return this.mcpEnabled;
+    }
     getMcpClientManager() {
         return this.mcpClientManager;
     }
@@ -1000,21 +1023,12 @@ export class Config {
      * 'false' for untrusted.
      */
     isTrustedFolder() {
-        // isWorkspaceTrusted in cli/src/config/trustedFolder.js returns undefined
-        // when the file based trust value is unavailable, since it is mainly used
-        // in the initialization for trust dialogs, etc. Here we return true since
-        // config.isTrustedFolder() is used for the main business logic of blocking
-        // tool calls etc in the rest of the application.
-        //
-        // Default value is true since we load with trusted settings to avoid
-        // restarts in the more common path. If the user chooses to mark the folder
-        // as untrusted, the CLI will restart and we will have the trust value
-        // reloaded.
         const context = ideContextStore.get();
         if (context?.workspaceState?.isTrusted !== undefined) {
             return context.workspaceState.isTrusted;
         }
-        return this.trustedFolder ?? true;
+        // Default to untrusted if folder trust is enabled and no explicit value is set.
+        return this.folderTrust ? (this.trustedFolder ?? false) : true;
     }
     setIdeMode(value) {
         this.ideMode = value;
@@ -1076,6 +1090,29 @@ export class Config {
     isSkillsSupportEnabled() {
         return this.skillsSupport;
     }
+    /**
+     * Reloads skills by re-discovering them from extensions and local directories.
+     */
+    async reloadSkills() {
+        if (!this.skillsSupport) {
+            return;
+        }
+        if (this.onReload) {
+            const refreshed = await this.onReload();
+            this.disabledSkills = refreshed.disabledSkills ?? [];
+        }
+        await this.getSkillManager().discoverSkills(this.storage, this.getExtensions());
+        this.getSkillManager().setDisabledSkills(this.disabledSkills);
+        // Re-register ActivateSkillTool to update its schema with the newly discovered skills
+        if (this.getSkillManager().getSkills().length > 0) {
+            this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+        }
+        else {
+            this.getToolRegistry().unregisterTool(ActivateSkillTool.Name);
+        }
+        // Notify the client that system instructions might need updating
+        await this.updateSystemInstructionIfInitialized();
+    }
     isInteractive() {
         return this.interactive;
     }
@@ -1131,9 +1168,6 @@ export class Config {
     getTruncateToolOutputLines() {
         return this.truncateToolOutputLines;
     }
-    getUseSmartEdit() {
-        return this.useSmartEdit;
-    }
     getUseWriteTodos() {
         return this.useWriteTodos;
     }
@@ -1168,9 +1202,7 @@ export class Config {
         return this.introspectionAgentSettings;
     }
     async createToolRegistry() {
-        const registry = new ToolRegistry(this);
-        // Set message bus on tool registry before discovery so MCP tools can access it
-        registry.setMessageBus(this.messageBus);
+        const registry = new ToolRegistry(this, this.messageBus);
         // helper to create & register core tools that are enabled
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const registerCoreTool = (ToolClass, ...args) => {
@@ -1187,9 +1219,7 @@ export class Config {
                     tool.startsWith(`${normalizedClassName}(`));
             }
             if (isEnabled) {
-                // Pass message bus to tools when feature flag is enabled
-                // This first implementation is only focused on the general case of
-                // the tool registry.
+                // Pass message bus to tools (required for policy engine integration)
                 const toolArgs = [...args, this.getMessageBus()];
                 registry.registerTool(new ToolClass(...toolArgs));
             }
@@ -1217,19 +1247,15 @@ export class Config {
             registerCoreTool(GrepTool, this);
         }
         registerCoreTool(GlobTool, this);
-        if (this.getUseSmartEdit()) {
-            registerCoreTool(SmartEditTool, this);
-        }
-        else {
-            registerCoreTool(EditTool, this);
-        }
+        registerCoreTool(ActivateSkillTool, this);
+        registerCoreTool(EditTool, this);
         registerCoreTool(WriteFileTool, this);
         registerCoreTool(WebFetchTool, this);
         registerCoreTool(ShellTool, this);
         registerCoreTool(MemoryTool);
         registerCoreTool(WebSearchTool, this);
         if (this.getUseWriteTodos()) {
-            registerCoreTool(WriteTodosTool, this);
+            registerCoreTool(WriteTodosTool);
         }
         // Register Subagents as Tools
         // Register DelegateToAgentTool if agents are enabled