@machina.ai/cell-cli-core 1.19.4-rc3 → 1.22.5-rc1

package/dist/src/commands/restore.test.js

@@ -0,0 +1,137 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { performRestore } from './restore.js';
+import {} from '../utils/checkpointUtils.js';
+describe('performRestore', () => {
+    let mockGitService;
+    beforeEach(() => {
+        mockGitService = {
+            initialize: vi.fn(),
+            verifyGitAvailability: vi.fn(),
+            setupShadowGitRepository: vi.fn(),
+            getCurrentCommitHash: vi.fn(),
+            createFileSnapshot: vi.fn(),
+            restoreProjectFromSnapshot: vi.fn(),
+            storage: {},
+            getHistoryDir: vi.fn().mockReturnValue('mock-history-dir'),
+            shadowGitRepository: {},
+        };
+    });
+    it('should yield load_history if history and clientHistory are present', async () => {
+        const toolCallData = {
+            toolCall: { name: 'test', args: {} },
+            history: [{ some: 'history' }],
+            clientHistory: [{ role: 'user', parts: [{ text: 'hello' }] }],
+        };
+        const generator = performRestore(toolCallData, undefined);
+        const result = await generator.next();
+        expect(result.value).toEqual({
+            type: 'load_history',
+            history: toolCallData.history,
+            clientHistory: toolCallData.clientHistory,
+        });
+        expect(result.done).toBe(false);
+        const nextResult = await generator.next();
+        expect(nextResult.done).toBe(true);
+    });
+    it('should call restoreProjectFromSnapshot and yield a message if commitHash and gitService are present', async () => {
+        const toolCallData = {
+            toolCall: { name: 'test', args: {} },
+            commitHash: 'test-commit-hash',
+        };
+        const spy = vi
+            .spyOn(mockGitService, 'restoreProjectFromSnapshot')
+            .mockResolvedValue(undefined);
+        const generator = performRestore(toolCallData, mockGitService);
+        const result = await generator.next();
+        expect(spy).toHaveBeenCalledWith('test-commit-hash');
+        expect(result.value).toEqual({
+            type: 'message',
+            messageType: 'info',
+            content: 'Restored project to the state before the tool call.',
+        });
+        expect(result.done).toBe(false);
+        const nextResult = await generator.next();
+        expect(nextResult.done).toBe(true);
+    });
+    it('should yield an error message if restoreProjectFromSnapshot throws "unable to read tree" error', async () => {
+        const toolCallData = {
+            toolCall: { name: 'test', args: {} },
+            commitHash: 'invalid-commit-hash',
+        };
+        const spy = vi
+            .spyOn(mockGitService, 'restoreProjectFromSnapshot')
+            .mockRejectedValue(new Error('fatal: unable to read tree invalid-commit-hash'));
+        const generator = performRestore(toolCallData, mockGitService);
+        const result = await generator.next();
+        expect(spy).toHaveBeenCalledWith('invalid-commit-hash');
+        expect(result.value).toEqual({
+            type: 'message',
+            messageType: 'error',
+            content: "The commit hash 'invalid-commit-hash' associated with this checkpoint could not be found in your Git repository. This can happen if the repository has been re-cloned, reset, or if old commits have been garbage collected. This checkpoint cannot be restored.",
+        });
+        expect(result.done).toBe(false);
+        const nextResult = await generator.next();
+        expect(nextResult.done).toBe(true);
+    });
+    it('should re-throw other errors from restoreProjectFromSnapshot', async () => {
+        const toolCallData = {
+            toolCall: { name: 'test', args: {} },
+            commitHash: 'some-commit-hash',
+        };
+        const testError = new Error('something went wrong');
+        vi.spyOn(mockGitService, 'restoreProjectFromSnapshot').mockRejectedValue(testError);
+        const generator = performRestore(toolCallData, mockGitService);
+        await expect(generator.next()).rejects.toThrow(testError);
+    });
+    it('should yield load_history then a message if both are present', async () => {
+        const toolCallData = {
+            toolCall: { name: 'test', args: {} },
+            history: [{ some: 'history' }],
+            clientHistory: [{ role: 'user', parts: [{ text: 'hello' }] }],
+            commitHash: 'test-commit-hash',
+        };
+        const spy = vi
+            .spyOn(mockGitService, 'restoreProjectFromSnapshot')
+            .mockResolvedValue(undefined);
+        const generator = performRestore(toolCallData, mockGitService);
+        const historyResult = await generator.next();
+        expect(historyResult.value).toEqual({
+            type: 'load_history',
+            history: toolCallData.history,
+            clientHistory: toolCallData.clientHistory,
+        });
+        expect(historyResult.done).toBe(false);
+        const messageResult = await generator.next();
+        expect(spy).toHaveBeenCalledWith('test-commit-hash');
+        expect(messageResult.value).toEqual({
+            type: 'message',
+            messageType: 'info',
+            content: 'Restored project to the state before the tool call.',
+        });
+        expect(messageResult.done).toBe(false);
+        const nextResult = await generator.next();
+        expect(nextResult.done).toBe(true);
+    });
+    it('should yield error message if commitHash is present but gitService is undefined', async () => {
+        const toolCallData = {
+            toolCall: { name: 'test', args: {} },
+            commitHash: 'test-commit-hash',
+        };
+        const generator = performRestore(toolCallData, undefined);
+        const result = await generator.next();
+        expect(result.value).toEqual({
+            type: 'message',
+            messageType: 'error',
+            content: 'Git service is not available, cannot restore checkpoint. Please ensure you are in a git repository.',
+        });
+        expect(result.done).toBe(false);
+        const nextResult = await generator.next();
+        expect(nextResult.done).toBe(true);
+    });
+});
+//# sourceMappingURL=restore.test.js.map

package/dist/src/commands/restore.test.js.map

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

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

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Content, PartListUnion } from '@google/genai';
+/**
+ * The return type for a command action that results in scheduling a tool call.
+ */
+export interface ToolActionReturn {
+    type: 'tool';
+    toolName: string;
+    toolArgs: Record<string, unknown>;
+}
+/**
+ * The return type for a command action that results in a simple message
+ * being displayed to the user.
+ */
+export interface MessageActionReturn {
+    type: 'message';
+    messageType: 'info' | 'error';
+    content: string;
+}
+/**
+ * The return type for a command action that results in replacing
+ * the entire conversation history.
+ */
+export interface LoadHistoryActionReturn<HistoryType = unknown> {
+    type: 'load_history';
+    history: HistoryType;
+    clientHistory: Content[];
+}
+/**
+ * The return type for a command action that should immediately submit
+ * content as a prompt to the Gemini model.
+ */
+export interface SubmitPromptActionReturn {
+    type: 'submit_prompt';
+    content: PartListUnion;
+}
+export type CommandActionReturn<HistoryType = unknown> = ToolActionReturn | MessageActionReturn | LoadHistoryActionReturn<HistoryType> | SubmitPromptActionReturn;

package/dist/src/commands/types.js

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/commands/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

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

@@ -6,6 +6,7 @@
 import type { ContentGenerator, ContentGeneratorConfig } from '../core/contentGenerator.js';
 import { AuthType } from '../core/contentGenerator.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
+import { ResourceRegistry } from '../resources/resource-registry.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { GeminiClient } from '../core/client.js';
 import { BaseLlmClient } from '../core/baseLlmClient.js';
@@ -17,10 +18,12 @@ import { DEFAULT_GEMINI_FLASH_MODEL } from './models.js';
 import type { MCPOAuthConfig } from '../mcp/oauth-provider.js';
 import type { FileSystemService } from '../services/fileSystemService.js';
 import type { FallbackModelHandler } from '../fallback/types.js';
+import { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
 import { ModelRouterService } from '../routing/modelRouterService.js';
 import { OutputFormat } from '../output/types.js';
 import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
 import { ModelConfigService } from '../services/modelConfigService.js';
+import { ContextManager } from '../services/contextManager.js';
 export type { MCPOAuthConfig, AnyToolInvocation };
 import type { AnyToolInvocation } from '../tools/tools.js';
 import { WorkspaceContext } from '../utils/workspaceContext.js';
@@ -33,6 +36,7 @@ import { PolicyEngine } from '../policy/policy-engine.js';
 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 { Experiments } from '../code_assist/experiments/experiments.js';
 import { AgentRegistry } from '../agents/registry.js';
 import { ApprovalMode } from '../policy/types.js';
@@ -55,6 +59,7 @@ export interface TelemetrySettings {
     logPrompts?: boolean;
     outfile?: string;
     useCollector?: boolean;
+    useCliAuth?: boolean;
 }
 export interface OutputSettings {
     format?: OutputFormat;
@@ -112,6 +117,7 @@ export declare class MCPServerConfig {
     readonly httpUrl?: string | undefined;
     readonly headers?: Record<string, string> | undefined;
     readonly tcp?: string | undefined;
+    readonly type?: "sse" | "http" | undefined;
     readonly timeout?: number | undefined;
     readonly trust?: boolean | undefined;
     readonly description?: string | undefined;
@@ -122,7 +128,7 @@ export declare class MCPServerConfig {
     readonly authProviderType?: AuthProviderType | undefined;
     readonly targetAudience?: string | undefined;
     readonly targetServiceAccount?: string | undefined;
-    constructor(command?: string | undefined, args?: string[] | undefined, env?: Record<string, string> | undefined, cwd?: string | undefined, stdio?: boolean | undefined, url?: string | undefined, httpUrl?: string | undefined, headers?: Record<string, string> | undefined, tcp?: string | undefined, timeout?: number | undefined, trust?: boolean | undefined, description?: string | undefined, includeTools?: string[] | undefined, excludeTools?: string[] | undefined, extension?: GeminiCLIExtension | undefined, oauth?: MCPOAuthConfig | undefined, authProviderType?: AuthProviderType | undefined, targetAudience?: string | undefined, targetServiceAccount?: string | undefined);
+    constructor(command?: string | undefined, args?: string[] | undefined, env?: Record<string, string> | undefined, cwd?: string | undefined, stdio?: boolean | undefined, url?: string | undefined, httpUrl?: string | undefined, headers?: Record<string, string> | undefined, tcp?: string | undefined, type?: "sse" | "http" | undefined, timeout?: number | undefined, trust?: boolean | undefined, description?: string | undefined, includeTools?: string[] | undefined, excludeTools?: string[] | undefined, extension?: GeminiCLIExtension | undefined, oauth?: MCPOAuthConfig | undefined, authProviderType?: AuthProviderType | undefined, targetAudience?: string | undefined, targetServiceAccount?: string | undefined);
 }
 export declare enum AuthProviderType {
     DYNAMIC_DISCOVERY = "dynamic_discovery",
@@ -213,6 +219,7 @@ export interface ConfigParameters {
     continueOnFailedApiCall?: boolean;
     retryFetchErrors?: boolean;
     enableShellOutputEfficiency?: boolean;
+    shellToolInactivityTimeout?: number;
     fakeResponses?: string;
     recordResponses?: string;
     ptyInfo?: string;
@@ -222,9 +229,15 @@ export interface ConfigParameters {
     experiments?: Experiments;
     hooks?: {
         [K in HookEventName]?: HookDefinition[];
-    };
+    } | ({
+        [K in HookEventName]?: HookDefinition[];
+    } & {
+        disabled?: string[];
+    });
     previewFeatures?: boolean;
+    enableAgents?: boolean;
     enableModelAvailabilityService?: boolean;
+    experimentalJitContext?: boolean;
 }
 export declare class Config {
     private toolRegistry;
@@ -232,6 +245,7 @@ export declare class Config {
     private allowedMcpServers;
     private blockedMcpServers;
     private promptRegistry;
+    private resourceRegistry;
     private agentRegistry;
     private sessionId;
     private fileSystemService;
@@ -254,7 +268,6 @@ export declare class Config {
     private userMemory;
     private geminiMdFileCount;
     private geminiMdFilePaths;
-    private approvalMode;
     private readonly showMemoryUsage;
     private readonly accessibility;
     private readonly telemetrySettings;
@@ -262,6 +275,7 @@ export declare class Config {
     private geminiClient;
     private baseLlmClient;
     private modelRouterService;
+    private readonly modelAvailabilityService;
     private readonly fileFiltering;
     private fileDiscoveryService;
     private gitService;
@@ -275,10 +289,12 @@ export declare class Config {
     private readonly bugCommand;
     private model;
     private previewFeatures;
+    private hasAccessToPreviewModel;
     private readonly noBrowser;
     private readonly folderTrust;
     private ideMode;
     private inFallbackMode;
+    private _activeModel;
     private readonly maxSessionTurns;
     private readonly listSessions;
     private readonly deleteSession;
@@ -320,18 +336,23 @@ export declare class Config {
     private readonly continueOnFailedApiCall;
     private readonly retryFetchErrors;
     private readonly enableShellOutputEfficiency;
+    private readonly shellToolInactivityTimeout;
     readonly fakeResponses?: string;
     readonly recordResponses?: string;
     private readonly disableYoloMode;
     private pendingIncludeDirectories;
     private readonly enableHooks;
     private readonly hooks;
+    private readonly disabledHooks;
     private experiments;
     private experimentsPromise;
     private hookSystem?;
     private previewModelFallbackMode;
     private previewModelBypassMode;
     private readonly enableModelAvailabilityService;
+    private readonly enableAgents;
+    private readonly experimentalJitContext;
+    private contextManager?;
     constructor(params: ConfigParameters);
     /**
      * Must only be called once, throws if called again.
@@ -353,6 +374,9 @@ export declare class Config {
     getContentGeneratorConfig(): ContentGeneratorConfig;
     getModel(): string;
     setModel(newModel: string): void;
+    getActiveModel(): string;
+    setActiveModel(model: string): void;
+    resetTurn(): void;
     isInFallbackMode(): boolean;
     setFallbackMode(active: boolean): void;
     setFallbackModelHandler(handler: FallbackModelHandler): void;
@@ -373,10 +397,14 @@ export declare class Config {
     getAgentRegistry(): AgentRegistry;
     getToolRegistry(): ToolRegistry;
     getPromptRegistry(): PromptRegistry;
+    getResourceRegistry(): ResourceRegistry;
     getDebugMode(): boolean;
     getQuestion(): string | undefined;
     getPreviewFeatures(): boolean | undefined;
     setPreviewFeatures(previewFeatures: boolean): void;
+    getHasAccessToPreviewModel(): boolean;
+    setHasAccessToPreviewModel(hasAccess: boolean): void;
+    refreshUserQuota(): Promise<RetrieveUserQuotaResponse | undefined>;
     getCoreTools(): string[] | undefined;
     getAllowedTools(): string[] | undefined;
     /**
@@ -401,6 +429,10 @@ export declare class Config {
     setMcpServers(mcpServers: Record<string, MCPServerConfig>): void;
     getUserMemory(): string;
     setUserMemory(newUserMemory: string): void;
+    getGlobalMemory(): string;
+    getEnvironmentMemory(): string;
+    getContextManager(): ContextManager | undefined;
+    isJitContextEnabled(): boolean;
     getGeminiMdFileCount(): number;
     setGeminiMdFileCount(count: number): void;
     getGeminiMdFilePaths(): string[];
@@ -419,6 +451,7 @@ export declare class Config {
     getTelemetryTarget(): TelemetryTarget;
     getTelemetryOutfile(): string | undefined;
     getTelemetryUseCollector(): boolean;
+    getTelemetryUseCliAuth(): boolean;
     getGeminiClient(): GeminiClient;
     /**
      * Updates the system instruction with the latest user memory.
@@ -426,6 +459,7 @@ export declare class Config {
      */
     updateSystemInstructionIfInitialized(): Promise<void>;
     getModelRouterService(): ModelRouterService;
+    getModelAvailabilityService(): ModelAvailabilityService;
     getEnableRecursiveFileSearch(): boolean;
     getFileFilteringDisableFuzzySearch(): boolean;
     getFileFilteringRespectGitIgnore(): boolean;
@@ -457,6 +491,7 @@ export declare class Config {
     getEnabledExtensions(): string[];
     getEnableExtensionReloading(): boolean;
     isModelAvailabilityServiceEnabled(): boolean;
+    isAgentsEnabled(): boolean;
     getNoBrowser(): boolean;
     isBrowserLaunchSuppressed(): boolean;
     getSummarizeToolOutputConfig(): Record<string, SummarizeToolOutputSettings> | undefined;
@@ -492,6 +527,7 @@ export declare class Config {
     getContinueOnFailedApiCall(): boolean;
     getRetryFetchErrors(): boolean;
     getEnableShellOutputEfficiency(): boolean;
+    getShellToolInactivityTimeout(): number;
     getShellExecutionConfig(): ShellExecutionConfig;
     setShellExecutionConfig(config: ShellExecutionConfig): void;
     getScreenReader(): boolean;
@@ -520,6 +556,10 @@ export declare class Config {
     getHooks(): {
         [K in HookEventName]?: HookDefinition[];
     } | undefined;
+    /**
+     * Get disabled hooks list
+     */
+    getDisabledHooks(): string[];
     /**
      * Get experiments configuration
      */