@machina.ai/cell-cli-core 1.0.13-rc9 → 1.0.21-rc1

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { setupUser, ProjectIdRequiredError } from './setup.js';
 import { CodeAssistServer } from '../code_assist/server.js';
 import { UserTierId } from './types.js';
@@ -12,8 +12,15 @@ const mockPaidTier = {
     id: UserTierId.STANDARD,
     name: 'paid',
     description: 'Paid tier',
+    isDefault: true,
 };
-describe('setupUser', () => {
+const mockFreeTier = {
+    id: UserTierId.FREE,
+    name: 'free',
+    description: 'Free tier',
+    isDefault: true,
+};
+describe('setupUser for existing user', () => {
     let mockLoad;
     let mockOnboardUser;
     beforeEach(() => {
@@ -32,29 +39,32 @@ describe('setupUser', () => {
             onboardUser: mockOnboardUser,
         }));
     });
-    it('should use GOOGLE_CLOUD_PROJECT when set', async () => {
-        process.env.GOOGLE_CLOUD_PROJECT = 'test-project';
+    afterEach(() => {
+        vi.unstubAllEnvs();
+    });
+    it('should use GOOGLE_CLOUD_PROJECT when set and project from server is undefined', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
         mockLoad.mockResolvedValue({
             currentTier: mockPaidTier,
         });
         await setupUser({});
-        expect(CodeAssistServer).toHaveBeenCalledWith(expect.any(Object), 'test-project');
+        expect(CodeAssistServer).toHaveBeenCalledWith({}, 'test-project', {}, '', undefined);
     });
-    it('should treat empty GOOGLE_CLOUD_PROJECT as undefined and use project from server', async () => {
-        process.env.GOOGLE_CLOUD_PROJECT = '';
+    it('should ignore GOOGLE_CLOUD_PROJECT when project from server is set', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
         mockLoad.mockResolvedValue({
             cloudaicompanionProject: 'server-project',
             currentTier: mockPaidTier,
         });
         const projectId = await setupUser({});
-        expect(CodeAssistServer).toHaveBeenCalledWith(expect.any(Object), undefined);
+        expect(CodeAssistServer).toHaveBeenCalledWith({}, 'test-project', {}, '', undefined);
         expect(projectId).toEqual({
             projectId: 'server-project',
             userTier: 'standard-tier',
         });
     });
     it('should throw ProjectIdRequiredError when no project ID is available', async () => {
-        delete process.env.GOOGLE_CLOUD_PROJECT;
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
         // And the server itself requires a project ID internally
         vi.mocked(CodeAssistServer).mockImplementation(() => {
             throw new ProjectIdRequiredError();
@@ -62,4 +72,100 @@ describe('setupUser', () => {
         await expect(setupUser({})).rejects.toThrow(ProjectIdRequiredError);
     });
 });
+describe('setupUser for new user', () => {
+    let mockLoad;
+    let mockOnboardUser;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        mockLoad = vi.fn();
+        mockOnboardUser = vi.fn().mockResolvedValue({
+            done: true,
+            response: {
+                cloudaicompanionProject: {
+                    id: 'server-project',
+                },
+            },
+        });
+        vi.mocked(CodeAssistServer).mockImplementation(() => ({
+            loadCodeAssist: mockLoad,
+            onboardUser: mockOnboardUser,
+        }));
+    });
+    afterEach(() => {
+        vi.unstubAllEnvs();
+    });
+    it('should use GOOGLE_CLOUD_PROJECT when set and onboard a new paid user', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+        mockLoad.mockResolvedValue({
+            allowedTiers: [mockPaidTier],
+        });
+        const userData = await setupUser({});
+        expect(CodeAssistServer).toHaveBeenCalledWith({}, 'test-project', {}, '', undefined);
+        expect(mockLoad).toHaveBeenCalled();
+        expect(mockOnboardUser).toHaveBeenCalledWith({
+            tierId: 'standard-tier',
+            cloudaicompanionProject: 'test-project',
+            metadata: {
+                ideType: 'IDE_UNSPECIFIED',
+                platform: 'PLATFORM_UNSPECIFIED',
+                pluginType: 'GEMINI',
+                duetProject: 'test-project',
+            },
+        });
+        expect(userData).toEqual({
+            projectId: 'server-project',
+            userTier: 'standard-tier',
+        });
+    });
+    it('should onboard a new free user when GOOGLE_CLOUD_PROJECT is not set', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+        mockLoad.mockResolvedValue({
+            allowedTiers: [mockFreeTier],
+        });
+        const userData = await setupUser({});
+        expect(CodeAssistServer).toHaveBeenCalledWith({}, undefined, {}, '', undefined);
+        expect(mockLoad).toHaveBeenCalled();
+        expect(mockOnboardUser).toHaveBeenCalledWith({
+            tierId: 'free-tier',
+            cloudaicompanionProject: undefined,
+            metadata: {
+                ideType: 'IDE_UNSPECIFIED',
+                platform: 'PLATFORM_UNSPECIFIED',
+                pluginType: 'GEMINI',
+            },
+        });
+        expect(userData).toEqual({
+            projectId: 'server-project',
+            userTier: 'free-tier',
+        });
+    });
+    it('should use GOOGLE_CLOUD_PROJECT when onboard response has no project ID', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+        mockLoad.mockResolvedValue({
+            allowedTiers: [mockPaidTier],
+        });
+        mockOnboardUser.mockResolvedValue({
+            done: true,
+            response: {
+                cloudaicompanionProject: undefined,
+            },
+        });
+        const userData = await setupUser({});
+        expect(userData).toEqual({
+            projectId: 'test-project',
+            userTier: 'standard-tier',
+        });
+    });
+    it('should throw ProjectIdRequiredError when no project ID is available', async () => {
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+        mockLoad.mockResolvedValue({
+            allowedTiers: [mockPaidTier],
+        });
+        mockOnboardUser.mockResolvedValue({
+            done: true,
+            response: {},
+        });
+        await expect(setupUser({})).rejects.toThrow(ProjectIdRequiredError);
+    });
+});
 //# 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":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAkB,UAAU,EAAE,MAAM,YAAY,CAAC;AAExD,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;AAEpC,MAAM,YAAY,GAAmB;IACnC,EAAE,EAAE,UAAU,CAAC,QAAQ;IACvB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,WAAW;CACzB,CAAC;AAEF,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,QAAkC,CAAC;IACvC,IAAI,eAAyC,CAAC;IAE9C,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,QAAQ,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACnB,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YAC1C,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE;gBACR,uBAAuB,EAAE;oBACvB,EAAE,EAAE,gBAAgB;iBACrB;aACF;SACF,CAAC,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,kBAAkB,CAC5C,GAAG,EAAE,CACH,CAAC;YACC,cAAc,EAAE,QAAQ;YACxB,WAAW,EAAE,eAAe;SAC7B,CAAgC,CACpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,cAAc,CAAC;QAClD,QAAQ,CAAC,iBAAiB,CAAC;YACzB,WAAW,EAAE,YAAY;SAC1B,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,EAAkB,CAAC,CAAC;QACpC,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAClB,cAAc,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;QAChG,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,EAAE,CAAC;QACtC,QAAQ,CAAC,iBAAiB,CAAC;YACzB,uBAAuB,EAAE,gBAAgB;YACzC,WAAW,EAAE,YAAY;SAC1B,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,EAAkB,CAAC,CAAC;QACtD,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAClB,SAAS,CACV,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YACxB,SAAS,EAAE,gBAAgB;YAC3B,QAAQ,EAAE,eAAe;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACnF,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;QACxC,yDAAyD;QACzD,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE;YAClD,MAAM,IAAI,sBAAsB,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,SAAS,CAAC,EAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACzD,sBAAsB,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"setup.test.js","sourceRoot":"","sources":["../../../src/code_assist/setup.test.ts"],"names":[],"mappings":"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"}

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

@@ -4,12 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { AuthType, ContentGeneratorConfig } from '../core/contentGenerator.js';
+import { PromptRegistry } from '../prompts/prompt-registry.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
 import { GeminiClient } from '../core/client.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { GitService } from '../services/gitService.js';
 import { TelemetryTarget } from '../telemetry/index.js';
 import { DEFAULT_GEMINI_FLASH_MODEL } from './models.js';
+import { MCPOAuthConfig } from '../mcp/oauth-provider.js';
+import { IdeClient } from '../ide/ide-client.js';
+import { FileSystemService } from '../services/fileSystemService.js';
+export type { MCPOAuthConfig };
+import { WorkspaceContext } from '../utils/workspaceContext.js';
 export declare enum ApprovalMode {
     DEFAULT = "default",
     AUTO_EDIT = "autoEdit",
@@ -21,6 +27,9 @@ export interface AccessibilitySettings {
 export interface BugCommandSettings {
     urlTemplate: string;
 }
+export interface ChatCompressionSettings {
+    contextPercentageThreshold?: number;
+}
 export interface SummarizeToolOutputSettings {
     tokenBudget?: number;
 }
@@ -28,12 +37,15 @@ export interface TelemetrySettings {
     enabled?: boolean;
     target?: TelemetryTarget;
     otlpEndpoint?: string;
+    otlpProtocol?: 'grpc' | 'http';
     logPrompts?: boolean;
+    outfile?: string;
 }
 export interface GeminiCLIExtension {
     name: string;
     version: string;
     isActive: boolean;
+    path: string;
 }
 export interface FileFilteringOptions {
     respectGitIgnore: boolean;
@@ -56,7 +68,13 @@ export declare class MCPServerConfig {
     readonly includeTools?: string[] | undefined;
     readonly excludeTools?: string[] | undefined;
     readonly extensionName?: string | undefined;
-    constructor(command?: string | undefined, args?: string[] | undefined, env?: Record<string, string> | undefined, cwd?: string | 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, extensionName?: string | undefined);
+    readonly oauth?: MCPOAuthConfig | undefined;
+    readonly authProviderType?: AuthProviderType | undefined;
+    constructor(command?: string | undefined, args?: string[] | undefined, env?: Record<string, string> | undefined, cwd?: string | 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, extensionName?: string | undefined, oauth?: MCPOAuthConfig | undefined, authProviderType?: AuthProviderType | undefined);
+}
+export declare enum AuthProviderType {
+    DYNAMIC_DISCOVERY = "dynamic_discovery",
+    GOOGLE_CREDENTIALS = "google_credentials"
 }
 export interface SandboxConfig {
     command: 'docker' | 'podman' | 'sandbox-exec';
@@ -98,11 +116,12 @@ export interface ConfigParameters {
     agentApiUrl?: string;
     cwd: string;
     fileDiscoveryService?: FileDiscoveryService;
+    includeDirectories?: string[];
     bugCommand?: BugCommandSettings;
     model: string;
     extensionContextFilePaths?: string[];
     maxSessionTurns?: number;
-    experimentalAcp?: boolean;
+    experimentalZedIntegration?: boolean;
     listExtensions?: boolean;
     extensions?: GeminiCLIExtension[];
     blockedMcpServers?: Array<{
@@ -111,15 +130,24 @@ export interface ConfigParameters {
     }>;
     noBrowser?: boolean;
     summarizeToolOutput?: Record<string, SummarizeToolOutputSettings>;
+    folderTrustFeature?: boolean;
+    folderTrust?: boolean;
     ideMode?: boolean;
+    loadMemoryFromIncludeDirectories?: boolean;
+    chatCompression?: ChatCompressionSettings;
+    interactive?: boolean;
+    trustedFolder?: boolean;
 }
 export declare class Config {
     private toolRegistry;
-    private readonly sessionId;
+    private promptRegistry;
+    private sessionId;
+    private fileSystemService;
     private contentGeneratorConfig;
     private readonly embeddingModel;
     private readonly sandbox;
     private readonly targetDir;
+    private workspaceContext;
     private readonly debugMode;
     private readonly question;
     private readonly fullContext;
@@ -151,8 +179,11 @@ export declare class Config {
     private readonly model;
     private readonly extensionContextFilePaths;
     private readonly noBrowser;
-    private readonly ideMode;
-    private modelSwitchedDuringSession;
+    private readonly folderTrustFeature;
+    private readonly folderTrust;
+    private ideMode;
+    private ideClient;
+    private inFallbackMode;
     private readonly maxSessionTurns;
     private readonly listExtensions;
     private readonly _extensions;
@@ -160,25 +191,38 @@ export declare class Config {
     flashFallbackHandler?: FlashFallbackHandler;
     private quotaErrorOccurred;
     private readonly summarizeToolOutput;
-    private readonly experimentalAcp;
+    private readonly experimentalZedIntegration;
+    private readonly loadMemoryFromIncludeDirectories;
+    private readonly chatCompression;
+    private readonly interactive;
+    private readonly trustedFolder;
+    private initialized;
     constructor(params: ConfigParameters);
+    /**
+     * Must only be called once, throws if called again.
+     */
     initialize(): Promise<void>;
     refreshAuth(authMethod: AuthType, displayMessage?: (message: string) => void): Promise<void>;
     getSessionId(): string;
+    setSessionId(sessionId: string): void;
+    shouldLoadMemoryFromIncludeDirectories(): boolean;
     getContentGeneratorConfig(): ContentGeneratorConfig;
     getModel(): string;
     setModel(newModel: string): void;
-    isModelSwitchedDuringSession(): boolean;
-    resetModelToDefault(): void;
+    isInFallbackMode(): boolean;
+    setFallbackMode(active: boolean): void;
     setFlashFallbackHandler(handler: FlashFallbackHandler): void;
     getMaxSessionTurns(): number;
     setQuotaErrorOccurred(value: boolean): void;
     getQuotaErrorOccurred(): boolean;
     getEmbeddingModel(): string;
     getSandbox(): SandboxConfig | undefined;
+    isRestrictiveSandbox(): boolean;
     getTargetDir(): string;
     getProjectRoot(): string;
+    getWorkspaceContext(): WorkspaceContext;
     getToolRegistry(): Promise<ToolRegistry>;
+    getPromptRegistry(): PromptRegistry;
     getDebugMode(): boolean;
     getQuestion(): string | undefined;
     getFullContext(): boolean;
@@ -199,7 +243,9 @@ export declare class Config {
     getTelemetryEnabled(): boolean;
     getTelemetryLogPromptsEnabled(): boolean;
     getTelemetryOtlpEndpoint(): string;
+    getTelemetryOtlpProtocol(): 'grpc' | 'http';
     getTelemetryTarget(): TelemetryTarget;
+    getTelemetryOutfile(): string | undefined;
     getGeminiClient(): GeminiClient;
     getGeminiDir(): string;
     getProjectTempDir(): string;
@@ -218,7 +264,7 @@ export declare class Config {
     getFileService(): FileDiscoveryService;
     getUsageStatisticsEnabled(): boolean;
     getExtensionContextFilePaths(): string[];
-    getExperimentalAcp(): boolean;
+    getExperimentalZedIntegration(): boolean;
     getListExtensions(): boolean;
     getExtensions(): GeminiCLIExtension[];
     getBlockedMcpServers(): Array<{
@@ -229,11 +275,23 @@ export declare class Config {
     isBrowserLaunchSuppressed(): boolean;
     getSummarizeToolOutputConfig(): Record<string, SummarizeToolOutputSettings> | undefined;
     getIdeMode(): boolean;
+    getFolderTrustFeature(): boolean;
+    getFolderTrust(): boolean;
+    isTrustedFolder(): boolean | undefined;
+    setIdeMode(value: boolean): void;
+    setIdeModeAndSyncConnection(value: boolean): Promise<void>;
+    getIdeClient(): IdeClient;
+    /**
+     * Get the current FileSystemService
+     */
+    getFileSystemService(): FileSystemService;
+    /**
+     * Set a custom FileSystemService
+     */
+    setFileSystemService(fileSystemService: FileSystemService): void;
+    getChatCompression(): ChatCompressionSettings | undefined;
+    isInteractive(): boolean;
     getGitService(): Promise<GitService>;
-    refreshMemory(): Promise<{
-        memoryContent: string;
-        fileCount: number;
-    }>;
     createToolRegistry(): Promise<ToolRegistry>;
 }
 export { DEFAULT_GEMINI_FLASH_MODEL };