@machina.ai/cell-cli-core 1.10.0-rc1 → 1.13.0-rc1

package/dist/src/mcp/mcpLauncher.js

@@ -0,0 +1,238 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { fileURLToPath } from 'node:url';
+import { execa } from 'execa';
+import * as fs from 'node:fs';
+import * as fsp from 'node:fs/promises';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { Readable } from 'node:stream';
+import * as lockfile from 'proper-lockfile';
+import { rimraf } from 'rimraf';
+import { extract } from 'tar';
+import { getPackageJson } from '../utils/package.js';
+/**
+ * A user-defined type guard to check if a config is a ManagedMcpConfig.
+ * @param config The config object to check.
+ * @returns True if the config is a ManagedMcpConfig.
+ */
+export function isManagedMcpConfig(config) {
+    return 'managed' in config;
+}
+async function fileExists(filePath) {
+    try {
+        await fsp.access(filePath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function setupUvEnvironment(log) {
+    const uvBinDir = path.join(os.homedir(), '.cell-cli', 'bin');
+    const uvBinaryName = process.platform === 'win32' ? 'uv.exe' : 'uv';
+    const uvPath = path.join(uvBinDir, uvBinaryName);
+    // Idempotency: If uv is already installed, return the path.
+    if (await fileExists(uvPath)) {
+        log('Found existing uv binary.');
+        return { pythonPath: uvPath, pipPath: uvPath };
+    }
+    log('Setting up uv environment...');
+    await fsp.mkdir(uvBinDir, { recursive: true });
+    log('Downloading and installing uv...');
+    if (process.platform === 'win32') {
+        const script = '& {irm https://astral.sh/uv/install.ps1 | iex}';
+        await execa('powershell', ['-ExecutionPolicy', 'Bypass', '-Command', script], {
+            env: { UV_INSTALL_DIR: uvBinDir },
+            stdio: 'pipe',
+        });
+    }
+    else {
+        const installScript = await fetch('https://astral.sh/uv/install.sh');
+        if (!installScript.ok || !installScript.body) {
+            throw new Error(`Failed to download uv install script: ${installScript.statusText}`);
+        }
+        const scriptContent = await installScript.text();
+        await execa('sh', ['-c', scriptContent], {
+            env: { UV_INSTALL_DIR: uvBinDir },
+            stdio: 'pipe',
+        });
+    }
+    if (!(await fileExists(uvPath))) {
+        throw new Error(`uv installation failed. Binary not found at ${uvPath}`);
+    }
+    log('uv environment is ready.');
+    return { pythonPath: uvPath, pipPath: uvPath };
+}
+/**
+ * Ensures a valid Python environment is available for the MCP server,
+ * bootstrapping it if necessary.
+ * @returns A promise that resolves to the paths of the python and pip executables.
+ */
+async function ensurePythonEnvironment(log) {
+    return await setupUvEnvironment(log);
+}
+/**
+ * Manages the installation and configuration of a managed MCP server.
+ * This function is the core of the bootstrap logic.
+ *
+ * @param serverName The name of the server to manage (e.g., 'cell').
+ * @returns A promise that resolves to the McpConfig object for the server.
+ */
+export async function getManagedMcpConfig(serverName) {
+    const pkg = (await getPackageJson(path.dirname(fileURLToPath(import.meta.url))));
+    if (!pkg) {
+        // This is a fatal error for the managed server logic.
+        throw new Error('Could not find package.json in the project root.');
+    }
+    const baseDir = path.join(os.homedir(), '.cell-cli', 'mcp_servers', serverName);
+    await fsp.mkdir(baseDir, { recursive: true });
+    const statePath = path.join(baseDir, 'state.json');
+    // Idempotency check: If already installed and correct, return immediately.
+    if (await fileExists(statePath)) {
+        const state = JSON.parse(await fsp.readFile(statePath, 'utf-8'));
+        if (state.status === 'installed' &&
+            state.version === pkg.cellMcpServer.version &&
+            state.executablePath &&
+            (await fileExists(state.executablePath))) {
+            // No need to log anything if it's already correctly installed.
+            return {
+                command: state.executablePath,
+                args: [],
+                cwd: state.cwd,
+                stdio: true,
+            };
+        }
+    }
+    // --- Start Logging Only When Installation is Needed ---
+    const logDir = path.join(os.homedir(), '.cell-cli', 'logs');
+    await fsp.mkdir(logDir, { recursive: true });
+    const date = new Date().toISOString().split('T')[0];
+    const logPath = path.join(logDir, `mcp-${date}.log`);
+    const logStream = fs.createWriteStream(logPath, { flags: 'a' });
+    const log = (message) => {
+        const timestamp = new Date().toISOString();
+        const logMessage = `[${timestamp}] ${message}\n`;
+        logStream.write(logMessage);
+        process.stdout.write(logMessage);
+    };
+    log(`Bootstrapping managed MCP server: ${serverName}...`);
+    log(`Checking installation status at: ${statePath}`);
+    await lockfile.lock(baseDir, { retries: { retries: 3, factor: 1.2 } });
+    log('Acquired lock on installation directory.');
+    try {
+        // Re-check state after acquiring lock
+        if (await fileExists(statePath)) {
+            const state = JSON.parse(await fsp.readFile(statePath, 'utf-8'));
+            if (state.status === 'installed' &&
+                state.version === pkg.cellMcpServer.version &&
+                state.executablePath &&
+                (await fileExists(state.executablePath))) {
+                log(`${serverName} is already installed at version ${pkg.cellMcpServer.version}.`);
+                return {
+                    command: state.executablePath,
+                    args: [],
+                    cwd: state.cwd,
+                    stdio: true,
+                };
+            }
+            log('Previous installation is outdated or incomplete. Proceeding with new installation.');
+        }
+        log(`Updating state file to 'installing': ${statePath}`);
+        await fsp.writeFile(statePath, JSON.stringify({ status: 'installing' }, null, 2));
+        const tempInstallDir = path.join(baseDir, `install_temp_${Date.now()}`);
+        const finalInstallDir = path.join(baseDir, 'server');
+        log(`Creating temporary installation directory: ${tempInstallDir}`);
+        await fsp.mkdir(tempInstallDir, { recursive: true });
+        const venvPath = path.join(tempInstallDir, '.zen_venv');
+        try {
+            log('Ensuring Python environment is available...');
+            const { pythonPath } = await ensurePythonEnvironment(log);
+            log(`Using Python executable at: ${pythonPath}`);
+            const archiveUrl = `${pkg.cellMcpServer.repositoryUrl}/archive/refs/tags/${pkg.cellMcpServer.version}.tar.gz`;
+            log(`Downloading and extracting ${archiveUrl}...`);
+            const response = await fetch(archiveUrl);
+            if (!response.ok) {
+                throw new Error(`Failed to download: ${response.statusText}`);
+            }
+            if (!response.body) {
+                throw new Error('Download response has no body');
+            }
+            // The response body is a stream. We need to convert it from a Web Stream
+            // to a Node.js stream before piping it to tar.
+            await new Promise((resolve, reject) => {
+                Readable.fromWeb(response.body)
+                    .pipe(extract({
+                    cwd: tempInstallDir,
+                    strip: 1, // Remove the top-level directory from the tarball
+                }))
+                    .on('finish', resolve)
+                    .on('error', reject);
+            });
+            log('Creating dedicated virtual environment...');
+            const pythonVersion = '3.13.3';
+            log(`Creating venv with Python ${pythonVersion}...`);
+            await execa(pythonPath, ['venv', venvPath, '--python', pythonVersion], {
+                cwd: tempInstallDir,
+            });
+            log('Installing dependencies from requirements.txt with uv...');
+            await execa(pythonPath, ['pip', 'install', '-r', 'requirements.txt'], {
+                cwd: tempInstallDir,
+                env: {
+                    VIRTUAL_ENV: venvPath,
+                },
+            });
+            log(`Installation successful. Moving ${tempInstallDir} to ${finalInstallDir}`);
+            if (await fileExists(finalInstallDir)) {
+                await rimraf(finalInstallDir);
+            }
+            await fsp.rename(tempInstallDir, finalInstallDir);
+            const executableName = process.platform === 'win32'
+                ? 'cell-mcp-server.bat'
+                : 'cell-mcp-server';
+            const finalExecutablePath = path.join(finalInstallDir, executableName);
+            const newState = {
+                status: 'installed',
+                version: pkg.cellMcpServer.version,
+                executablePath: finalExecutablePath,
+                cwd: finalInstallDir,
+                failureCount: 0,
+            };
+            log(`Updating state file to 'installed': ${statePath}`);
+            await fsp.writeFile(statePath, JSON.stringify(newState, null, 2));
+            return {
+                command: finalExecutablePath,
+                args: [],
+                cwd: finalInstallDir,
+                stdio: true,
+            };
+        }
+        catch (error) {
+            const state = (await fileExists(statePath))
+                ? JSON.parse(await fsp.readFile(statePath, 'utf-8'))
+                : {};
+            const failureCount = (state.failureCount || 0) + 1;
+            const newState = {
+                status: 'failed',
+                failureCount,
+                lastAttempt: new Date().toISOString(),
+            };
+            log(`Installation failed. Updating state file to 'failed': ${statePath}`);
+            await fsp.writeFile(statePath, JSON.stringify(newState, null, 2));
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            log(`Error details: ${errorMessage}`);
+            log(`Cleaning up temporary directory: ${tempInstallDir}`);
+            await rimraf(tempInstallDir);
+            throw new Error(`Failed to bootstrap '${serverName}'. Details logged to ${logPath}`);
+        }
+    }
+    finally {
+        log('Releasing lock on installation directory.');
+        await lockfile.unlock(baseDir);
+        logStream.end();
+    }
+}
+//# sourceMappingURL=mcpLauncher.js.map

package/dist/src/mcp/mcpLauncher.js.map

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

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

@@ -40,7 +40,7 @@ export interface OAuthTokenResponse {
     scope?: string;
 }
 /**
- * Dynamic client registration request.
+ * Dynamic client registration request (RFC 7591).
  */
 export interface OAuthClientRegistrationRequest {
     client_name: string;
@@ -48,11 +48,10 @@ export interface OAuthClientRegistrationRequest {
     grant_types: string[];
     response_types: string[];
     token_endpoint_auth_method: string;
-    code_challenge_method?: string[];
     scope?: string;
 }
 /**
- * Dynamic client registration response.
+ * Dynamic client registration response (RFC 7591).
  */
 export interface OAuthClientRegistrationResponse {
     client_id: string;
@@ -63,7 +62,6 @@ export interface OAuthClientRegistrationResponse {
     grant_types: string[];
     response_types: string[];
     token_endpoint_auth_method: string;
-    code_challenge_method?: string[];
     scope?: string;
 }
 /**
@@ -77,6 +75,7 @@ export declare class MCPOAuthProvider {
      *
      * @param registrationUrl The client registration endpoint URL
      * @param config OAuth configuration
+     * @param redirectPort The port to use for the redirect URI
      * @returns The registered client information
      */
     private registerClient;
@@ -87,6 +86,7 @@ export declare class MCPOAuthProvider {
      * @returns OAuth configuration if discovered, null otherwise
      */
     private discoverOAuthFromMCPServer;
+    private discoverAuthServerMetadataForRegistration;
     /**
      * Generate PKCE parameters for OAuth flow.
      *
@@ -95,9 +95,10 @@ export declare class MCPOAuthProvider {
     private generatePKCEParams;
     /**
      * Start a local HTTP server to handle OAuth callback.
+     * The server will listen on the specified port (or port 0 for OS assignment).
      *
      * @param expectedState The state parameter to validate
-     * @returns Promise that resolves with the authorization code
+     * @returns Object containing the port (available immediately) and a promise for the auth response
      */
     private startCallbackServer;
     /**
@@ -105,6 +106,7 @@ export declare class MCPOAuthProvider {
      *
      * @param config OAuth configuration
      * @param pkceParams PKCE parameters
+     * @param redirectPort The port to use for the redirect URI
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The authorization URL
      */
@@ -115,6 +117,7 @@ export declare class MCPOAuthProvider {
      * @param config OAuth configuration
      * @param code Authorization code
      * @param codeVerifier PKCE code verifier
+     * @param redirectPort The port to use for the redirect URI
      * @param mcpServerUrl The MCP server URL to use as the resource parameter
      * @returns The token response
      */