@edwardlee5423/magi 0.1.0-alpha.0

package/dist/mcp/client.js

@@ -0,0 +1,276 @@
+import { MagiUsageError } from "../errors.js";
+import { requiresMcpApproval } from "./approval.js";
+import { createMcpTransport } from "./transport.js";
+export class McpClient {
+    input;
+    transport;
+    nextId = 1;
+    closed = false;
+    pending = new Map();
+    constructor(input) {
+        this.input = input;
+        this.transport = this.openConnection();
+    }
+    async initialize() {
+        await this.request("initialize", {
+            protocolVersion: "2024-11-05",
+            clientInfo: { name: "magi-next", version: "0.1.0-alpha.0" },
+            capabilities: {}
+        });
+    }
+    async reconnect() {
+        if (this.closed) {
+            throw new Error(`MCP client ${this.input.serverName} is closed`);
+        }
+        this.rejectAll(new Error(`MCP server ${this.input.serverName} reconnecting`));
+        this.transport.close();
+        this.transport = this.openConnection();
+        await this.initialize();
+    }
+    async listTools() {
+        const result = await this.requestWithSessionRetry("tools/list", {});
+        if (!isRecord(result) || !Array.isArray(result.tools)) {
+            return [];
+        }
+        return result.tools
+            .filter(isRecord)
+            .map((tool) => ({
+            name: typeof tool.name === "string" ? tool.name : "",
+            description: typeof tool.description === "string" ? tool.description : undefined,
+            inputSchema: isRecord(tool.inputSchema) ? tool.inputSchema : undefined
+        }))
+            .filter((tool) => tool.name);
+    }
+    async callTool(input) {
+        const approval = requiresMcpApproval({
+            serverName: this.input.serverName,
+            server: this.input.server,
+            toolName: input.toolName,
+            params: input.params
+        });
+        if (approval && !input.approved) {
+            throw new McpApprovalRequiredError(approval);
+        }
+        const result = await this.requestWithSessionRetry("tools/call", {
+            name: input.toolName,
+            arguments: input.params
+        });
+        return { content: result };
+    }
+    async listResources() {
+        const result = await this.requestWithSessionRetry("resources/list", {});
+        if (!isRecord(result) || !Array.isArray(result.resources)) {
+            return [];
+        }
+        return result.resources
+            .filter(isRecord)
+            .map((resource) => ({
+            uri: typeof resource.uri === "string" ? resource.uri : "",
+            name: typeof resource.name === "string" ? resource.name : undefined,
+            description: typeof resource.description === "string" ? resource.description : undefined,
+            mimeType: typeof resource.mimeType === "string" ? resource.mimeType : undefined
+        }))
+            .filter((resource) => resource.uri);
+    }
+    async readResource(uri) {
+        const result = await this.requestWithSessionRetry("resources/read", { uri });
+        if (!isRecord(result) || !Array.isArray(result.contents)) {
+            return { contents: [] };
+        }
+        return {
+            contents: result.contents
+                .filter(isRecord)
+                .map(readResourceContent)
+        };
+    }
+    /**
+     * Lightweight health check. MCP has no standard ping RPC, so we use
+     * `tools/list` (most servers cache its result) as a heartbeat.
+     * Returns true if the server responds within timeoutMs.
+     */
+    async ping(timeoutMs = 5000) {
+        try {
+            await Promise.race([
+                this.request("tools/list", {}),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("ping timeout")), timeoutMs))
+            ]);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    async listPrompts() {
+        const result = await this.requestWithSessionRetry("prompts/list", {});
+        if (!isRecord(result) || !Array.isArray(result.prompts)) {
+            return [];
+        }
+        return result.prompts
+            .filter(isRecord)
+            .map((prompt) => ({
+            name: typeof prompt.name === "string" ? prompt.name : "",
+            description: typeof prompt.description === "string" ? prompt.description : undefined,
+            arguments: Array.isArray(prompt.arguments)
+                ? prompt.arguments.filter(isRecord).map((arg) => ({
+                    name: typeof arg.name === "string" ? arg.name : "",
+                    description: typeof arg.description === "string" ? arg.description : undefined,
+                    required: typeof arg.required === "boolean" ? arg.required : undefined
+                })).filter((a) => a.name)
+                : undefined
+        }))
+            .filter((prompt) => prompt.name);
+    }
+    async getPrompt(name, params) {
+        const result = await this.requestWithSessionRetry("prompts/get", { name, arguments: params ?? {} });
+        if (!isRecord(result)) {
+            return { messages: [] };
+        }
+        const description = typeof result.description === "string" ? result.description : undefined;
+        const messages = Array.isArray(result.messages)
+            ? result.messages.filter(isRecord).map(readPromptMessage)
+            : [];
+        return { description, messages };
+    }
+    close() {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        this.transport.close();
+        this.rejectAll(new Error(`MCP client ${this.input.serverName} closed`));
+    }
+    openConnection() {
+        return createMcpTransport({
+            serverName: this.input.serverName,
+            server: this.input.server,
+            env: this.input.env,
+            callbacks: {
+                onMessage: (message) => this.handleMessage(message),
+                onError: (error) => this.rejectAll(error),
+                onDisconnect: () => this.input.onDisconnect?.()
+            }
+        });
+    }
+    async request(method, params) {
+        if (this.closed) {
+            return Promise.reject(new Error(`MCP client ${this.input.serverName} is closed`));
+        }
+        const id = this.nextId++;
+        const payload = { jsonrpc: "2.0", id, method, params };
+        return new Promise((resolve, reject) => {
+            this.pending.set(id, { resolve, reject });
+            this.transport.ready()
+                .then(() => this.transport.send(payload))
+                .catch((error) => {
+                if (this.pending.delete(id)) {
+                    reject(error);
+                }
+            });
+        });
+    }
+    async requestWithSessionRetry(method, params) {
+        try {
+            return await this.request(method, params);
+        }
+        catch (error) {
+            if (error instanceof McpJsonRpcError && error.code === -32001) {
+                await this.reconnect();
+                return this.request(method, params);
+            }
+            // 401 Unauthorized — try to refresh OAuth token and retry once
+            if (error && typeof error === "object" && error.name === "McpUnauthorizedError") {
+                const unauthorizedError = error;
+                if (this.input.onUnauthorized) {
+                    const newToken = await this.input.onUnauthorized({
+                        wwwAuthenticate: unauthorizedError.wwwAuthenticate
+                    });
+                    if (newToken) {
+                        // Update headers and reconnect with new token
+                        this.input.server.headers = {
+                            ...(this.input.server.headers ?? {}),
+                            Authorization: `Bearer ${newToken}`
+                        };
+                        await this.reconnect();
+                        return this.request(method, params);
+                    }
+                }
+            }
+            throw error;
+        }
+    }
+    handleMessage(message) {
+        if (!isRecord(message) || typeof message.id !== "number") {
+            return;
+        }
+        const pending = this.pending.get(message.id);
+        if (!pending) {
+            return;
+        }
+        this.pending.delete(message.id);
+        if (message.error) {
+            pending.reject(toJsonRpcError(message.error));
+            return;
+        }
+        pending.resolve(message.result);
+    }
+    rejectAll(error) {
+        for (const pending of this.pending.values()) {
+            pending.reject(error);
+        }
+        this.pending.clear();
+    }
+}
+export class McpApprovalRequiredError extends MagiUsageError {
+    approval;
+    constructor(approval) {
+        super(`MCP approval required for ${approval.serverName}/${approval.toolName}: ${approval.reason}`);
+        this.name = "McpApprovalRequiredError";
+        this.approval = approval;
+    }
+}
+export class McpJsonRpcError extends Error {
+    code;
+    data;
+    constructor(input) {
+        super(input.message);
+        this.name = "McpJsonRpcError";
+        this.code = input.code;
+        this.data = input.data;
+    }
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function toJsonRpcError(error) {
+    if (!isRecord(error)) {
+        return new McpJsonRpcError({ message: String(error) });
+    }
+    return new McpJsonRpcError({
+        code: typeof error.code === "number" ? error.code : undefined,
+        message: typeof error.message === "string" ? error.message : JSON.stringify(error),
+        data: error.data
+    });
+}
+function readResourceContent(value) {
+    return {
+        uri: typeof value.uri === "string" ? value.uri : undefined,
+        mimeType: typeof value.mimeType === "string" ? value.mimeType : undefined,
+        text: typeof value.text === "string" ? value.text : undefined,
+        blob: typeof value.blob === "string" ? value.blob : undefined
+    };
+}
+function readPromptMessage(value) {
+    const role = value.role === "user" || value.role === "assistant" || value.role === "system" ? value.role : "user";
+    const content = isRecord(value.content) ? value.content : { type: "text", text: "" };
+    if (content.type === "image" && typeof content.data === "string" && typeof content.mimeType === "string") {
+        return { role, content: { type: "image", data: content.data, mimeType: content.mimeType } };
+    }
+    if (content.type === "resource" && isRecord(content.resource)) {
+        return { role, content: { type: "resource", resource: readResourceContent(content.resource) } };
+    }
+    return {
+        role,
+        content: { type: "text", text: typeof content.text === "string" ? content.text : "" }
+    };
+}
+//# sourceMappingURL=client.js.map

package/dist/mcp/client.js.map

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

package/dist/mcp/connection-manager.d.ts

@@ -0,0 +1,30 @@
+import { McpServerConfig } from "../config.js";
+import { McpClient } from "./client.js";
+export interface McpConnectionManagerInput {
+    servers: Record<string, McpServerConfig>;
+    env?: NodeJS.ProcessEnv;
+    /** If set, run a periodic health check every N ms. Failure triggers reconnect. */
+    healthCheckIntervalMs?: number;
+    /** Callback when a server reconnects (for telemetry). */
+    onReconnect?: (serverName: string, success: boolean) => void;
+    /** Look up an OAuth bearer token for the server, if any. */
+    tokenLookup?: (serverName: string) => string | undefined;
+    /** Refresh OAuth token after 401. Should return the new access token. */
+    tokenRefresh?: (serverName: string) => Promise<string | undefined>;
+}
+export declare class McpConnectionManager {
+    private readonly input;
+    private readonly clients;
+    private readonly connecting;
+    private healthTimer?;
+    constructor(input: McpConnectionManagerInput);
+    runHealthCheck(): Promise<Array<{
+        serverName: string;
+        healthy: boolean;
+        reconnected: boolean;
+    }>>;
+    connect(serverName: string): Promise<McpClient>;
+    disconnect(serverName: string): void;
+    disconnectAll(): void;
+    connectedServerNames(): string[];
+}

package/dist/mcp/connection-manager.js

@@ -0,0 +1,126 @@
+import { McpClient } from "./client.js";
+export class McpConnectionManager {
+    input;
+    clients = new Map();
+    connecting = new Map();
+    healthTimer;
+    constructor(input) {
+        this.input = input;
+        if (input.healthCheckIntervalMs && input.healthCheckIntervalMs > 0) {
+            this.healthTimer = setInterval(() => {
+                void this.runHealthCheck();
+            }, input.healthCheckIntervalMs);
+            // Don't keep the process alive just for health checks
+            this.healthTimer.unref?.();
+        }
+    }
+    async runHealthCheck() {
+        const results = [];
+        for (const [name, client] of this.clients) {
+            const healthy = await client.ping().catch(() => false);
+            let reconnected = false;
+            if (!healthy) {
+                try {
+                    await client.reconnect();
+                    reconnected = true;
+                    this.input.onReconnect?.(name, true);
+                }
+                catch {
+                    // Reconnect failed — drop the client
+                    client.close();
+                    this.clients.delete(name);
+                    this.input.onReconnect?.(name, false);
+                }
+            }
+            results.push({ serverName: name, healthy, reconnected });
+        }
+        return results;
+    }
+    async connect(serverName) {
+        const existing = this.clients.get(serverName);
+        if (existing) {
+            return existing;
+        }
+        const pending = this.connecting.get(serverName);
+        if (pending) {
+            return pending.promise;
+        }
+        const server = this.input.servers[serverName];
+        if (!server) {
+            throw new Error(`MCP server is not configured: ${serverName}`);
+        }
+        // If an OAuth token is stored for this server, inject it as a Bearer header.
+        const token = this.input.tokenLookup?.(serverName);
+        const serverWithAuth = token
+            ? { ...server, headers: { ...(server.headers ?? {}), Authorization: `Bearer ${token}` } }
+            : server;
+        const client = new McpClient({
+            serverName,
+            server: serverWithAuth,
+            env: this.input.env,
+            onDisconnect: () => {
+                if (this.clients.get(serverName) === client) {
+                    this.clients.delete(serverName);
+                }
+            },
+            onUnauthorized: this.input.tokenRefresh
+                ? async () => this.input.tokenRefresh(serverName)
+                : undefined
+        });
+        let connection;
+        const promise = Promise.resolve()
+            .then(async () => {
+            await client.initialize();
+            if (this.connecting.get(serverName) !== connection) {
+                client.close();
+                throw new Error(`MCP connection to ${serverName} was closed before initialization completed`);
+            }
+            this.clients.set(serverName, client);
+            return client;
+        })
+            .catch((error) => {
+            client.close();
+            throw error;
+        })
+            .finally(() => {
+            if (this.connecting.get(serverName) === connection) {
+                this.connecting.delete(serverName);
+            }
+        });
+        connection = { client, promise };
+        this.connecting.set(serverName, connection);
+        return promise;
+    }
+    disconnect(serverName) {
+        const pending = this.connecting.get(serverName);
+        if (pending) {
+            pending.client.close();
+            this.connecting.delete(serverName);
+        }
+        const client = this.clients.get(serverName);
+        if (client) {
+            client.close();
+            this.clients.delete(serverName);
+        }
+        this.connecting.delete(serverName);
+    }
+    disconnectAll() {
+        if (this.healthTimer) {
+            clearInterval(this.healthTimer);
+            this.healthTimer = undefined;
+        }
+        for (const [serverName, pending] of this.connecting) {
+            pending.client.close();
+            this.connecting.delete(serverName);
+        }
+        for (const [serverName, client] of this.clients) {
+            client.close();
+            this.clients.delete(serverName);
+        }
+        this.connecting.clear();
+    }
+    connectedServerNames() {
+        return [...this.clients.keys()];
+    }
+}
+//# sourceMappingURL=connection-manager.js.map

package/dist/mcp/connection-manager.js.map

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

package/dist/mcp/oauth-callback.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Temporary local HTTP server to receive the OAuth redirect.
+ *
+ * Listens on 127.0.0.1 on a random port, waits for `?code=...&state=...`,
+ * shows a "you can close this tab now" page, then shuts down.
+ */
+export interface CallbackResult {
+    code: string;
+    state: string;
+}
+export interface CallbackServerHandle {
+    port: number;
+    redirectUri: string;
+    /** Resolves with the (code, state) pair when the redirect arrives. */
+    result: Promise<CallbackResult>;
+    close: () => void;
+}
+export declare function startOAuthCallbackServer(input?: {
+    /** Path component of the redirect URI. Default: /oauth/callback */
+    path?: string;
+    /** Maximum time to wait for the redirect, in ms. Default: 5 minutes */
+    timeoutMs?: number;
+}): Promise<CallbackServerHandle>;

package/dist/mcp/oauth-callback.js

@@ -0,0 +1,108 @@
+/**
+ * Temporary local HTTP server to receive the OAuth redirect.
+ *
+ * Listens on 127.0.0.1 on a random port, waits for `?code=...&state=...`,
+ * shows a "you can close this tab now" page, then shuts down.
+ */
+import * as http from "node:http";
+import { URL } from "node:url";
+export function startOAuthCallbackServer(input = {}) {
+    const path = input.path ?? "/oauth/callback";
+    const timeoutMs = input.timeoutMs ?? 5 * 60 * 1000;
+    return new Promise((resolveHandle, rejectHandle) => {
+        let resolveResult;
+        let rejectResult;
+        const result = new Promise((res, rej) => {
+            resolveResult = res;
+            rejectResult = rej;
+        });
+        let timeoutTimer;
+        const server = http.createServer((req, res) => {
+            try {
+                const url = new URL(req.url ?? "/", "http://127.0.0.1");
+                if (url.pathname !== path) {
+                    res.statusCode = 404;
+                    res.end("Not found");
+                    return;
+                }
+                const error = url.searchParams.get("error");
+                if (error) {
+                    const errorDescription = url.searchParams.get("error_description") ?? "";
+                    res.setHeader("Content-Type", "text/html; charset=utf-8");
+                    res.statusCode = 400;
+                    res.end(renderErrorPage(error, errorDescription));
+                    rejectResult(new Error(`OAuth authorization failed: ${error} ${errorDescription}`.trim()));
+                    return;
+                }
+                const code = url.searchParams.get("code");
+                const state = url.searchParams.get("state");
+                if (!code || !state) {
+                    res.statusCode = 400;
+                    res.setHeader("Content-Type", "text/html; charset=utf-8");
+                    res.end(renderErrorPage("invalid_request", "Missing code or state"));
+                    rejectResult(new Error("OAuth callback missing code or state"));
+                    return;
+                }
+                res.setHeader("Content-Type", "text/html; charset=utf-8");
+                res.end(renderSuccessPage());
+                resolveResult({ code, state });
+            }
+            catch (error) {
+                res.statusCode = 500;
+                res.end("Internal server error");
+                rejectResult(error instanceof Error ? error : new Error(String(error)));
+            }
+        });
+        server.on("error", (error) => {
+            if (timeoutTimer)
+                clearTimeout(timeoutTimer);
+            rejectHandle(error);
+        });
+        server.listen(0, "127.0.0.1", () => {
+            const address = server.address();
+            const port = address.port;
+            const redirectUri = `http://127.0.0.1:${port}${path}`;
+            timeoutTimer = setTimeout(() => {
+                rejectResult(new Error(`OAuth callback timed out after ${timeoutMs}ms`));
+            }, timeoutMs);
+            timeoutTimer.unref?.();
+            const close = () => {
+                if (timeoutTimer)
+                    clearTimeout(timeoutTimer);
+                server.close();
+            };
+            // Auto-close after result resolves or rejects
+            result.finally(() => close()).catch(() => undefined);
+            resolveHandle({ port, redirectUri, result, close });
+        });
+    });
+}
+function renderSuccessPage() {
+    return `<!doctype html>
+<html><head><title>Magi Next — Authorized</title>
+<style>body{font-family:system-ui;max-width:480px;margin:80px auto;padding:0 20px;color:#222;line-height:1.5}.ok{color:#0a8a3a}</style>
+</head><body>
+<h1 class="ok">✓ Authorization complete</h1>
+<p>You may close this window and return to Magi Next.</p>
+</body></html>`;
+}
+function renderErrorPage(error, description) {
+    return `<!doctype html>
+<html><head><title>Magi Next — Authorization failed</title>
+<style>body{font-family:system-ui;max-width:480px;margin:80px auto;padding:0 20px;color:#222;line-height:1.5}.err{color:#c0282b}pre{background:#f4f4f4;padding:12px;border-radius:4px;white-space:pre-wrap}</style>
+</head><body>
+<h1 class="err">✗ Authorization failed</h1>
+<pre>${escapeHtml(error)}\n${escapeHtml(description)}</pre>
+<p>Return to Magi Next and try again.</p>
+</body></html>`;
+}
+function escapeHtml(text) {
+    return text.replace(/[&<>"']/g, (c) => ({
+        "&": "&amp;",
+        "<": "&lt;",
+        ">": "&gt;",
+        '"': "&quot;",
+        "'": "&#39;"
+    })[c] ?? c);
+}
+//# sourceMappingURL=oauth-callback.js.map

package/dist/mcp/oauth-callback.js.map

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

package/dist/mcp/oauth-flow.d.ts

@@ -0,0 +1,45 @@
+/**
+ * High-level OAuth orchestrator: glues the OAuth client, callback server,
+ * and SessionStore token persistence together.
+ *
+ * Usage:
+ *
+ *   const result = await runOAuthFlow({
+ *     serverName: "linear",
+ *     authServerUrl: "https://auth.linear.app",
+ *     scope: "read",
+ *     store
+ *   });
+ *
+ *   // Browser opens, user authorizes, control returns here with the token saved.
+ */
+import { SessionStore } from "../session-store.js";
+export interface RunOAuthFlowInput {
+    serverName: string;
+    authServerUrl: string;
+    store: SessionStore;
+    scope?: string;
+    /** Static client_id. If omitted, dynamic registration (RFC 7591) is attempted. */
+    clientId?: string;
+    clientSecret?: string;
+    /** Skip auto-launching the browser (for headless testing) */
+    noBrowser?: boolean;
+    /** Called once we know the authorization URL (e.g., to print it before opening browser). */
+    onAuthorizationUrl?: (url: string) => void;
+}
+export interface RunOAuthFlowResult {
+    serverName: string;
+    accessToken: string;
+    refreshToken?: string;
+    expiresAt?: string;
+    scope?: string;
+}
+export declare function runOAuthFlow(input: RunOAuthFlowInput): Promise<RunOAuthFlowResult>;
+/**
+ * Refresh a stored token if it has a refresh_token. Updates the stored record.
+ * Returns the new access token, or undefined if refresh is not possible.
+ */
+export declare function refreshStoredToken(input: {
+    serverName: string;
+    store: SessionStore;
+}): Promise<string | undefined>;