@machina.ai/cell-cli-core 1.0.21-rc4 → 1.4.0-rc1

package/dist/src/ide/process-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC/B,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;IAE7B,uFAAuF;IACvF,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI,SAAiB,CAAC;QAEtB,IAAI,CAAC;YACH,uBAAuB;YACvB,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,iCAAiC,UAAU,8BAA8B,CAAC;gBAC1F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBACpD,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB;YACzE,CAAC;YACD,uDAAuD;iBAClD,CAAC;gBACJ,MAAM,OAAO,GAAG,kBAAkB,UAAU,EAAE,CAAC;gBAC/C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,uBAAuB;YAC7D,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,mEAAmE;YACnE,+DAA+D;YAC/D,MAAM;QACR,CAAC;QAED,yCAAyC;QACzC,MAAM,OAAO,GAAG,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7C,wEAAwE;QACxE,IAAI,SAAS,KAAK,OAAO,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;YAC5C,MAAM;QACR,CAAC;QACD,qDAAqD;QACrD,UAAU,GAAG,SAAS,CAAC;IACzB,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"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"}

package/dist/src/ide/process-utils.test.js

@@ -0,0 +1,158 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, afterEach, beforeEach, } from 'vitest';
+import { getIdeProcessInfo } from './process-utils.js';
+import os from 'node:os';
+const mockedExec = vi.hoisted(() => vi.fn());
+vi.mock('node:util', () => ({
+    promisify: vi.fn().mockReturnValue(mockedExec),
+}));
+vi.mock('node:os', () => ({
+    default: {
+        platform: vi.fn(),
+    },
+}));
+describe('getIdeProcessInfo', () => {
+    beforeEach(() => {
+        Object.defineProperty(process, 'pid', { value: 1000, configurable: true });
+        mockedExec.mockReset();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('on Unix', () => {
+        it('should traverse up to find the shell and return grandparent process info', async () => {
+            os.platform.mockReturnValue('linux');
+            // process (1000) -> shell (800) -> IDE (700)
+            mockedExec
+                .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
+                .mockResolvedValueOnce({ stdout: '700 /usr/lib/vscode/code' }) // pid 800 -> ppid 700 (IDE)
+                .mockResolvedValueOnce({ stdout: '700 /usr/lib/vscode/code' }); // get command for pid 700
+            const result = await getIdeProcessInfo();
+            expect(result).toEqual({ pid: 700, command: '/usr/lib/vscode/code' });
+        });
+        it('should return parent process info if grandparent lookup fails', async () => {
+            os.platform.mockReturnValue('linux');
+            mockedExec
+                .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
+                .mockRejectedValueOnce(new Error('ps failed')) // lookup for ppid of 800 fails
+                .mockResolvedValueOnce({ stdout: '800 /bin/bash' }); // get command for pid 800
+            const result = await getIdeProcessInfo();
+            expect(result).toEqual({ pid: 800, command: '/bin/bash' });
+        });
+    });
+    describe('on Windows', () => {
+        it('should traverse up and find the great-grandchild of the root process', async () => {
+            os.platform.mockReturnValue('win32');
+            const processInfoMap = new Map([
+                [
+                    1000,
+                    {
+                        stdout: '{"Name":"node.exe","ParentProcessId":900,"CommandLine":"node.exe"}',
+                    },
+                ],
+                [
+                    900,
+                    {
+                        stdout: '{"Name":"powershell.exe","ParentProcessId":800,"CommandLine":"powershell.exe"}',
+                    },
+                ],
+                [
+                    800,
+                    {
+                        stdout: '{"Name":"code.exe","ParentProcessId":700,"CommandLine":"code.exe"}',
+                    },
+                ],
+                [
+                    700,
+                    {
+                        stdout: '{"Name":"wininit.exe","ParentProcessId":0,"CommandLine":"wininit.exe"}',
+                    },
+                ],
+            ]);
+            mockedExec.mockImplementation((command) => {
+                const pidMatch = command.match(/ProcessId=(\d+)/);
+                if (pidMatch) {
+                    const pid = parseInt(pidMatch[1], 10);
+                    return Promise.resolve(processInfoMap.get(pid));
+                }
+                return Promise.reject(new Error('Invalid command for mock'));
+            });
+            const result = await getIdeProcessInfo();
+            expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
+        });
+        it('should handle non-existent process gracefully', async () => {
+            os.platform.mockReturnValue('win32');
+            mockedExec
+                .mockResolvedValueOnce({ stdout: '' }) // Non-existent PID returns empty due to -ErrorAction SilentlyContinue
+                .mockResolvedValueOnce({
+                stdout: '{"Name":"fallback.exe","ParentProcessId":0,"CommandLine":"fallback.exe"}',
+            }); // Fallback call
+            const result = await getIdeProcessInfo();
+            expect(result).toEqual({ pid: 1000, command: 'fallback.exe' });
+        });
+        it('should handle malformed JSON output gracefully', async () => {
+            os.platform.mockReturnValue('win32');
+            mockedExec
+                .mockResolvedValueOnce({ stdout: '{"invalid":json}' }) // Malformed JSON
+                .mockResolvedValueOnce({
+                stdout: '{"Name":"fallback.exe","ParentProcessId":0,"CommandLine":"fallback.exe"}',
+            }); // Fallback call
+            const result = await getIdeProcessInfo();
+            expect(result).toEqual({ pid: 1000, command: 'fallback.exe' });
+        });
+        it('should handle PowerShell errors without crashing the process chain', async () => {
+            os.platform.mockReturnValue('win32');
+            const processInfoMap = new Map([
+                [1000, { stdout: '' }], // First process doesn't exist (empty due to -ErrorAction)
+                [
+                    1001,
+                    {
+                        stdout: '{"Name":"parent.exe","ParentProcessId":800,"CommandLine":"parent.exe"}',
+                    },
+                ],
+                [
+                    800,
+                    {
+                        stdout: '{"Name":"ide.exe","ParentProcessId":0,"CommandLine":"ide.exe"}',
+                    },
+                ],
+            ]);
+            // Mock the process.pid to test traversal with missing processes
+            Object.defineProperty(process, 'pid', {
+                value: 1001,
+                configurable: true,
+            });
+            mockedExec.mockImplementation((command) => {
+                const pidMatch = command.match(/ProcessId=(\d+)/);
+                if (pidMatch) {
+                    const pid = parseInt(pidMatch[1], 10);
+                    return Promise.resolve(processInfoMap.get(pid) || { stdout: '' });
+                }
+                return Promise.reject(new Error('Invalid command for mock'));
+            });
+            const result = await getIdeProcessInfo();
+            // Should return the current process command since traversal continues despite missing processes
+            expect(result).toEqual({ pid: 1001, command: 'parent.exe' });
+            // Reset process.pid
+            Object.defineProperty(process, 'pid', {
+                value: 1000,
+                configurable: true,
+            });
+        });
+        it('should handle partial JSON data with defaults', async () => {
+            os.platform.mockReturnValue('win32');
+            mockedExec
+                .mockResolvedValueOnce({ stdout: '{"Name":"partial.exe"}' }) // Missing ParentProcessId, defaults to 0
+                .mockResolvedValueOnce({
+                stdout: '{"Name":"root.exe","ParentProcessId":0,"CommandLine":"root.exe"}',
+            }); // Get grandparent info
+            const result = await getIdeProcessInfo();
+            expect(result).toEqual({ pid: 1000, command: 'root.exe' });
+        });
+    });
+});
+//# sourceMappingURL=process-utils.test.js.map

package/dist/src/ide/process-utils.test.js.map

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

package/dist/src/index.d.ts

@@ -34,8 +34,13 @@ export * from './utils/shell-utils.js';
 export * from './utils/systemEncoding.js';
 export * from './utils/textUtils.js';
 export * from './utils/formatters.js';
+export * from './utils/generateContentResponseUtilities.js';
 export * from './utils/filesearch/fileSearch.js';
 export * from './utils/errorParsing.js';
+export * from './utils/workspaceContext.js';
+export * from './utils/ignorePatterns.js';
+export * from './utils/partUtils.js';
+export * from './utils/ide-trust.js';
 export * from './services/fileDiscoveryService.js';
 export * from './services/gitService.js';
 export * from './services/chatRecordingService.js';
@@ -43,7 +48,8 @@ export * from './services/fileSystemService.js';
 export * from './ide/ide-client.js';
 export * from './ide/ideContext.js';
 export * from './ide/ide-installer.js';
-export { getIdeInfo, DetectedIde, IdeInfo } from './ide/detect-ide.js';
+export { getIdeInfo, DetectedIde } from './ide/detect-ide.js';
+export { type IdeInfo } from './ide/detect-ide.js';
 export * from './ide/constants.js';
 export * from './services/shellExecutionService.js';
 export * from './tools/tools.js';
@@ -53,6 +59,7 @@ export * from './prompts/mcp-prompts.js';
 export * from './tools/read-file.js';
 export * from './tools/ls.js';
 export * from './tools/grep.js';
+export * from './tools/ripGrep.js';
 export * from './tools/glob.js';
 export * from './tools/edit.js';
 export * from './tools/write-file.js';
@@ -64,10 +71,13 @@ export * from './tools/read-many-files.js';
 export * from './tools/mcp-client.js';
 export * from './tools/mcp-tool.js';
 export { MCPOAuthProvider } from './mcp/oauth-provider.js';
-export { MCPOAuthToken, MCPOAuthCredentials, MCPOAuthTokenStorage, } from './mcp/oauth-token-storage.js';
+export type { OAuthToken, OAuthCredentials, } from './mcp/token-storage/types.js';
+export { MCPOAuthTokenStorage } from './mcp/oauth-token-storage.js';
 export type { MCPOAuthConfig } from './mcp/oauth-provider.js';
 export type { OAuthAuthorizationServerMetadata, OAuthProtectedResourceMetadata, } from './mcp/oauth-utils.js';
 export { OAuthUtils } from './mcp/oauth-utils.js';
 export * from './telemetry/index.js';
 export { sessionId } from './utils/session.js';
 export * from './utils/browser.js';
+export { Storage } from './config/storage.js';
+export * from './test-utils/index.js';

package/dist/src/index.js

@@ -37,8 +37,13 @@ export * from './utils/shell-utils.js';
 export * from './utils/systemEncoding.js';
 export * from './utils/textUtils.js';
 export * from './utils/formatters.js';
+export * from './utils/generateContentResponseUtilities.js';
 export * from './utils/filesearch/fileSearch.js';
 export * from './utils/errorParsing.js';
+export * from './utils/workspaceContext.js';
+export * from './utils/ignorePatterns.js';
+export * from './utils/partUtils.js';
+export * from './utils/ide-trust.js';
 // Export services
 export * from './services/fileDiscoveryService.js';
 export * from './services/gitService.js';
@@ -49,6 +54,7 @@ export * from './ide/ide-client.js';
 export * from './ide/ideContext.js';
 export * from './ide/ide-installer.js';
 export { getIdeInfo, DetectedIde } from './ide/detect-ide.js';
+export {} from './ide/detect-ide.js';
 export * from './ide/constants.js';
 // Export Shell Execution Service
 export * from './services/shellExecutionService.js';
@@ -62,6 +68,7 @@ export * from './prompts/mcp-prompts.js';
 export * from './tools/read-file.js';
 export * from './tools/ls.js';
 export * from './tools/grep.js';
+export * from './tools/ripGrep.js';
 export * from './tools/glob.js';
 export * from './tools/edit.js';
 export * from './tools/write-file.js';
@@ -74,10 +81,13 @@ export * from './tools/mcp-client.js';
 export * from './tools/mcp-tool.js';
 // MCP OAuth
 export { MCPOAuthProvider } from './mcp/oauth-provider.js';
-export { MCPOAuthTokenStorage, } from './mcp/oauth-token-storage.js';
+export { MCPOAuthTokenStorage } from './mcp/oauth-token-storage.js';
 export { OAuthUtils } from './mcp/oauth-utils.js';
 // Export telemetry functions
 export * from './telemetry/index.js';
 export { sessionId } from './utils/session.js';
 export * from './utils/browser.js';
+export { Storage } from './config/storage.js';
+// Export test utils
+export * from './test-utils/index.js';
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AAEnC,oBAAoB;AACpB,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AAErD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AAEvC,mBAAmB;AACnB,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,yBAAyB,CAAC;AAExC,kBAAkB;AAClB,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAEhD,4BAA4B;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAW,MAAM,qBAAqB,CAAC;AACvE,cAAc,oBAAoB,CAAC;AAEnC,iCAAiC;AACjC,cAAc,qCAAqC,CAAC;AAEpD,+BAA+B;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AAEzC,sBAAsB;AACtB,cAAc,0BAA0B,CAAC;AAEzC,6BAA6B;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AAEpC,YAAY;AACZ,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAGL,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,6BAA6B;AAC7B,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AAEnC,oBAAoB;AACpB,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AAErD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AAEvC,mBAAmB;AACnB,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,kCAAkC,CAAC;AACjD,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AAErC,kBAAkB;AAClB,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAEhD,4BAA4B;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAgB,MAAM,qBAAqB,CAAC;AACnD,cAAc,oBAAoB,CAAC;AAEnC,iCAAiC;AACjC,cAAc,qCAAqC,CAAC;AAEpD,+BAA+B;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AAEzC,sBAAsB;AACtB,cAAc,0BAA0B,CAAC;AAEzC,6BAA6B;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AAEpC,YAAY;AACZ,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAK3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAMpE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,6BAA6B;AAC7B,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,oBAAoB;AACpB,cAAc,uBAAuB,CAAC"}

package/dist/src/mcp/google-auth-provider.d.ts

@@ -3,9 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
-import { OAuthClientInformation, OAuthClientInformationFull, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
-import { MCPServerConfig } from '../config/config.js';
+import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import type { OAuthClientInformation, OAuthClientInformationFull, OAuthClientMetadata, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
+import type { MCPServerConfig } from '../config/config.js';
 export declare class GoogleCredentialProvider implements OAuthClientProvider {
     private readonly config?;
     private readonly auth;

package/dist/src/mcp/google-auth-provider.test.js.map

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

package/dist/src/mcp/oauth-provider.d.ts

@@ -3,7 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { MCPOAuthToken } from './oauth-token-storage.js';
+import type { OAuthToken } from './token-storage/types.js';
+import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
 /**
  * OAuth configuration for an MCP server.
  */
@@ -66,9 +67,8 @@ export interface OAuthClientRegistrationResponse {
  * Provider for handling OAuth authentication for MCP servers.
  */
 export declare class MCPOAuthProvider {
-    private static readonly REDIRECT_PORT;
-    private static readonly REDIRECT_PATH;
-    private static readonly HTTP_OK;
+    private readonly tokenStorage;
+    constructor(tokenStorage?: MCPOAuthTokenStorage);
     /**
      * Register a client dynamically with the OAuth server.
      *
@@ -76,27 +76,27 @@ export declare class MCPOAuthProvider {
      * @param config OAuth configuration
      * @returns The registered client information
      */
-    private static registerClient;
+    private registerClient;
     /**
      * Discover OAuth configuration from an MCP server URL.
      *
      * @param mcpServerUrl The MCP server URL
      * @returns OAuth configuration if discovered, null otherwise
      */
-    private static discoverOAuthFromMCPServer;
+    private discoverOAuthFromMCPServer;
     /**
      * Generate PKCE parameters for OAuth flow.
      *
      * @returns PKCE parameters including code verifier, challenge, and state
      */
-    private static generatePKCEParams;
+    private generatePKCEParams;
     /**
      * Start a local HTTP server to handle OAuth callback.
      *
      * @param expectedState The state parameter to validate
      * @returns Promise that resolves with the authorization code
      */
-    private static startCallbackServer;
+    private startCallbackServer;
     /**
      * Build the authorization URL with PKCE parameters.
      *
@@ -105,7 +105,7 @@ export declare class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The authorization URL
      */
-    private static buildAuthorizationUrl;
+    private buildAuthorizationUrl;
     /**
      * Exchange authorization code for tokens.
      *
@@ -115,7 +115,7 @@ export declare class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The token response
      */
-    private static exchangeCodeForToken;
+    private exchangeCodeForToken;
     /**
      * Refresh an access token using a refresh token.
      *
@@ -125,7 +125,7 @@ export declare class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The new token response
      */
-    static refreshAccessToken(config: MCPOAuthConfig, refreshToken: string, tokenUrl: string, mcpServerUrl?: string): Promise<OAuthTokenResponse>;
+    refreshAccessToken(config: MCPOAuthConfig, refreshToken: string, tokenUrl: string, mcpServerUrl?: string): Promise<OAuthTokenResponse>;
     /**
      * Perform the full OAuth authorization code flow with PKCE.
      *
@@ -134,7 +134,7 @@ export declare class MCPOAuthProvider {
      * @param mcpServerUrl Optional MCP server URL for OAuth discovery
      * @returns The obtained OAuth token
      */
-    static authenticate(serverName: string, config: MCPOAuthConfig, mcpServerUrl?: string): Promise<MCPOAuthToken>;
+    authenticate(serverName: string, config: MCPOAuthConfig, mcpServerUrl?: string): Promise<OAuthToken>;
     /**
      * Get a valid access token for an MCP server, refreshing if necessary.
      *
@@ -142,5 +142,5 @@ export declare class MCPOAuthProvider {
      * @param config OAuth configuration
      * @returns A valid access token or null if not authenticated
      */
-    static getValidToken(serverName: string, config: MCPOAuthConfig): Promise<string | null>;
+    getValidToken(serverName: string, config: MCPOAuthConfig): Promise<string | null>;
 }

package/dist/src/mcp/oauth-provider.js

@@ -10,13 +10,17 @@ import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
 import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { OAuthUtils } from './oauth-utils.js';
+const REDIRECT_PORT = 7777;
+const REDIRECT_PATH = '/oauth/callback';
+const HTTP_OK = 200;
 /**
  * Provider for handling OAuth authentication for MCP servers.
  */
 export class MCPOAuthProvider {
-    static REDIRECT_PORT = 7777;
-    static REDIRECT_PATH = '/oauth/callback';
-    static HTTP_OK = 200;
+    tokenStorage;
+    constructor(tokenStorage = new MCPOAuthTokenStorage()) {
+        this.tokenStorage = tokenStorage;
+    }
     /**
      * Register a client dynamically with the OAuth server.
      *
@@ -24,9 +28,8 @@ export class MCPOAuthProvider {
      * @param config OAuth configuration
      * @returns The registered client information
      */
-    static async registerClient(registrationUrl, config) {
-        const redirectUri = config.redirectUri ||
-            `http://localhost:${this.REDIRECT_PORT}${this.REDIRECT_PATH}`;
+    async registerClient(registrationUrl, config) {
+        const redirectUri = config.redirectUri || `http://localhost:${REDIRECT_PORT}${REDIRECT_PATH}`;
         const registrationRequest = {
             client_name: 'Gemini CLI MCP Client',
             redirect_uris: [redirectUri],
@@ -55,7 +58,7 @@ export class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL
      * @returns OAuth configuration if discovered, null otherwise
      */
-    static async discoverOAuthFromMCPServer(mcpServerUrl) {
+    async discoverOAuthFromMCPServer(mcpServerUrl) {
         // Use the full URL with path preserved for OAuth discovery
         return OAuthUtils.discoverOAuthConfig(mcpServerUrl);
     }
@@ -64,7 +67,7 @@ export class MCPOAuthProvider {
      *
      * @returns PKCE parameters including code verifier, challenge, and state
      */
-    static generatePKCEParams() {
+    generatePKCEParams() {
         // Generate code verifier (43-128 characters)
         const codeVerifier = crypto.randomBytes(32).toString('base64url');
         // Generate code challenge using SHA256
@@ -82,12 +85,12 @@ export class MCPOAuthProvider {
      * @param expectedState The state parameter to validate
      * @returns Promise that resolves with the authorization code
      */
-    static async startCallbackServer(expectedState) {
+    async startCallbackServer(expectedState) {
         return new Promise((resolve, reject) => {
             const server = http.createServer(async (req, res) => {
                 try {
-                    const url = new URL(req.url, `http://localhost:${this.REDIRECT_PORT}`);
-                    if (url.pathname !== this.REDIRECT_PATH) {
+                    const url = new URL(req.url, `http://localhost:${REDIRECT_PORT}`);
+                    if (url.pathname !== REDIRECT_PATH) {
                         res.writeHead(404);
                         res.end('Not found');
                         return;
@@ -96,7 +99,7 @@ export class MCPOAuthProvider {
                     const state = url.searchParams.get('state');
                     const error = url.searchParams.get('error');
                     if (error) {
-                        res.writeHead(this.HTTP_OK, { 'Content-Type': 'text/html' });
+                        res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
                         res.end(`
               <html>
                 <body>
@@ -124,7 +127,7 @@ export class MCPOAuthProvider {
                         return;
                     }
                     // Send success response to browser
-                    res.writeHead(this.HTTP_OK, { 'Content-Type': 'text/html' });
+                    res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
                     res.end(`
             <html>
               <body>
@@ -143,8 +146,8 @@ export class MCPOAuthProvider {
                 }
             });
             server.on('error', reject);
-            server.listen(this.REDIRECT_PORT, () => {
-                console.log(`OAuth callback server listening on port ${this.REDIRECT_PORT}`);
+            server.listen(REDIRECT_PORT, () => {
+                console.log(`OAuth callback server listening on port ${REDIRECT_PORT}`);
             });
             // Timeout after 5 minutes
             setTimeout(() => {
@@ -161,9 +164,8 @@ export class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The authorization URL
      */
-    static buildAuthorizationUrl(config, pkceParams, mcpServerUrl) {
-        const redirectUri = config.redirectUri ||
-            `http://localhost:${this.REDIRECT_PORT}${this.REDIRECT_PATH}`;
+    buildAuthorizationUrl(config, pkceParams, mcpServerUrl) {
+        const redirectUri = config.redirectUri || `http://localhost:${REDIRECT_PORT}${REDIRECT_PATH}`;
         const params = new URLSearchParams({
             client_id: config.clientId,
             response_type: 'code',
@@ -203,9 +205,8 @@ export class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The token response
      */
-    static async exchangeCodeForToken(config, code, codeVerifier, mcpServerUrl) {
-        const redirectUri = config.redirectUri ||
-            `http://localhost:${this.REDIRECT_PORT}${this.REDIRECT_PATH}`;
+    async exchangeCodeForToken(config, code, codeVerifier, mcpServerUrl) {
+        const redirectUri = config.redirectUri || `http://localhost:${REDIRECT_PORT}${REDIRECT_PATH}`;
         const params = new URLSearchParams({
             grant_type: 'authorization_code',
             code,
@@ -300,7 +301,7 @@ export class MCPOAuthProvider {
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The new token response
      */
-    static async refreshAccessToken(config, refreshToken, tokenUrl, mcpServerUrl) {
+    async refreshAccessToken(config, refreshToken, tokenUrl, mcpServerUrl) {
         const params = new URLSearchParams({
             grant_type: 'refresh_token',
             refresh_token: refreshToken,
@@ -394,7 +395,7 @@ export class MCPOAuthProvider {
      * @param mcpServerUrl Optional MCP server URL for OAuth discovery
      * @returns The obtained OAuth token
      */
-    static async authenticate(serverName, config, mcpServerUrl) {
+    async authenticate(serverName, config, mcpServerUrl) {
         // If no authorization URL is provided, try to discover OAuth configuration
         if (!config.authorizationUrl && mcpServerUrl) {
             console.log('No authorization URL provided, attempting OAuth discovery...');
@@ -530,10 +531,10 @@ export class MCPOAuthProvider {
         }
         // Save token
         try {
-            await MCPOAuthTokenStorage.saveToken(serverName, token, config.clientId, config.tokenUrl, mcpServerUrl);
+            await this.tokenStorage.saveToken(serverName, token, config.clientId, config.tokenUrl, mcpServerUrl);
             console.log('Authentication successful! Token saved.');
             // Verify token was saved
-            const savedToken = await MCPOAuthTokenStorage.getToken(serverName);
+            const savedToken = await this.tokenStorage.getToken(serverName);
             if (savedToken && savedToken.token && savedToken.token.accessToken) {
                 const tokenPreview = savedToken.token.accessToken.length > 20
                     ? `${savedToken.token.accessToken.substring(0, 20)}...`
@@ -557,17 +558,17 @@ export class MCPOAuthProvider {
      * @param config OAuth configuration
      * @returns A valid access token or null if not authenticated
      */
-    static async getValidToken(serverName, config) {
+    async getValidToken(serverName, config) {
         console.debug(`Getting valid token for server: ${serverName}`);
-        const credentials = await MCPOAuthTokenStorage.getToken(serverName);
+        const credentials = await this.tokenStorage.getToken(serverName);
         if (!credentials) {
             console.debug(`No credentials found for server: ${serverName}`);
             return null;
         }
         const { token } = credentials;
-        console.debug(`Found token for server: ${serverName}, expired: ${MCPOAuthTokenStorage.isTokenExpired(token)}`);
+        console.debug(`Found token for server: ${serverName}, expired: ${this.tokenStorage.isTokenExpired(token)}`);
         // Check if token is expired
-        if (!MCPOAuthTokenStorage.isTokenExpired(token)) {
+        if (!this.tokenStorage.isTokenExpired(token)) {
             console.debug(`Returning valid token for server: ${serverName}`);
             return token.accessToken;
         }
@@ -586,13 +587,13 @@ export class MCPOAuthProvider {
                 if (newTokenResponse.expires_in) {
                     newToken.expiresAt = Date.now() + newTokenResponse.expires_in * 1000;
                 }
-                await MCPOAuthTokenStorage.saveToken(serverName, newToken, config.clientId, credentials.tokenUrl, credentials.mcpServerUrl);
+                await this.tokenStorage.saveToken(serverName, newToken, config.clientId, credentials.tokenUrl, credentials.mcpServerUrl);
                 return newToken.accessToken;
             }
             catch (error) {
                 console.error(`Failed to refresh token: ${getErrorMessage(error)}`);
                 // Remove invalid token
-                await MCPOAuthTokenStorage.removeToken(serverName);
+                await this.tokenStorage.removeToken(serverName);
             }
         }
         return null;