npm - pi-mcp-adapter - Versions diffs - 2.2.1 → 2.3.2 - Mend

pi-mcp-adapter 2.2.1 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/mcp-callback-server.ts ADDED Viewed

@@ -0,0 +1,251 @@
+/**
+ * MCP OAuth Callback Server
+ *
+ * HTTP server that handles OAuth callbacks from the authorization server.
+ * Uses Node.js http module for compatibility.
+ */
+import { createServer, type Server, type IncomingMessage, type ServerResponse } from "http"
+import { connect } from "net"
+import { OAUTH_CALLBACK_PORT, OAUTH_CALLBACK_PATH } from "./mcp-oauth-provider.js"
+// HTML templates for callback responses
+const HTML_SUCCESS = `<!DOCTYPE html>
+<html>
+<head>
+  <title>Pi - Authorization Successful</title>
+  <style>
+    body { font-family: system-ui, -apple-system, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #1a1a2e; color: #eee; }
+    .container { text-align: center; padding: 2rem; }
+    h1 { color: #4ade80; margin-bottom: 1rem; }
+    p { color: #aaa; }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>Authorization Successful</h1>
+    <p>You can close this window and return to Pi.</p>
+  </div>
+  <script>setTimeout(() => window.close(), 2000);</script>
+</body>
+</html>`
+const HTML_ERROR = (error: string) => `<!DOCTYPE html>
+<html>
+<head>
+  <title>Pi - Authorization Failed</title>
+  <style>
+    body { font-family: system-ui, -apple-system, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #1a1a2e; color: #eee; }
+    .container { text-align: center; padding: 2rem; }
+    h1 { color: #f87171; margin-bottom: 1rem; }
+    p { color: #aaa; }
+    .error { color: #fca5a5; font-family: monospace; margin-top: 1rem; padding: 1rem; background: rgba(248,113,113,0.1); border-radius: 0.5rem; }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>Authorization Failed</h1>
+    <p>An error occurred during authorization.</p>
+    <div class="error">${error}</div>
+  </div>
+</body>
+</html>`
+/** Pending authorization request */
+interface PendingAuth {
+  resolve: (code: string) => void
+  reject: (error: Error) => void
+  timeout: ReturnType<typeof setTimeout>
+}
+/** Server singleton state */
+let server: Server | undefined
+const pendingAuths = new Map<string, PendingAuth>()
+/** Timeout for callback completion (5 minutes) */
+const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000
+/**
+ * Check if the callback port is already in use.
+ * Used to detect if another instance is running the server.
+ */
+async function isPortInUse(): Promise<boolean> {
+  return new Promise((resolve) => {
+    const socket = connect({ host: "127.0.0.1", port: OAUTH_CALLBACK_PORT })
+    socket.setTimeout(1000)
+    socket.on("connect", () => {
+      socket.end()
+      resolve(true)
+    })
+    socket.on("error", () => {
+      resolve(false)
+    })
+    socket.on("timeout", () => {
+      socket.destroy()
+      resolve(false)
+    })
+  })
+}
+/**
+ * Handle incoming HTTP requests to the callback server.
+ */
+function handleRequest(req: IncomingMessage, res: ServerResponse): void {
+  const url = new URL(req.url || "/", `http://${req.headers.host}`)
+  // Only handle the callback path
+  if (url.pathname !== OAUTH_CALLBACK_PATH) {
+    res.writeHead(404, { "Content-Type": "text/plain" })
+    res.end("Not found")
+    return
+  }
+  const code = url.searchParams.get("code")
+  const state = url.searchParams.get("state")
+  const error = url.searchParams.get("error")
+  const errorDescription = url.searchParams.get("error_description")
+  // Enforce state parameter presence for CSRF protection
+  if (!state) {
+    const errorMsg = "Missing required state parameter - potential CSRF attack"
+    res.writeHead(400, { "Content-Type": "text/html" })
+    res.end(HTML_ERROR(errorMsg))
+    return
+  }
+  // Handle OAuth errors
+  if (error) {
+    const errorMsg = errorDescription || error
+    // Send HTTP response first before rejecting promise
+    res.writeHead(200, { "Content-Type": "text/html" })
+    res.end(HTML_ERROR(errorMsg))
+    // Reject promise after response is sent (defer to allow test to attach handler)
+    if (pendingAuths.has(state)) {
+      const pending = pendingAuths.get(state)!
+      clearTimeout(pending.timeout)
+      pendingAuths.delete(state)
+      setTimeout(() => pending.reject(new Error(errorMsg)), 0)
+    }
+    return
+  }
+  // Require authorization code
+  if (!code) {
+    res.writeHead(400, { "Content-Type": "text/html" })
+    res.end(HTML_ERROR("No authorization code provided"))
+    return
+  }
+  // Validate state parameter
+  if (!pendingAuths.has(state)) {
+    const errorMsg = "Invalid or expired state parameter - potential CSRF attack"
+    res.writeHead(400, { "Content-Type": "text/html" })
+    res.end(HTML_ERROR(errorMsg))
+    return
+  }
+  const pending = pendingAuths.get(state)!
+  // Clear timeout and resolve the pending promise
+  clearTimeout(pending.timeout)
+  pendingAuths.delete(state)
+  pending.resolve(code)
+  res.writeHead(200, { "Content-Type": "text/html" })
+  res.end(HTML_SUCCESS)
+}
+/**
+ * Ensure the callback server is running.
+ * If the port is in use by another process, fail fast with a clear error.
+ */
+export async function ensureCallbackServer(): Promise<void> {
+  if (server) return
+  const running = await isPortInUse()
+  if (running) {
+    throw new Error(`OAuth callback port ${OAUTH_CALLBACK_PORT} is already in use`)
+  }
+  server = createServer(handleRequest)
+  await new Promise<void>((resolve, reject) => {
+    server!.once("error", (err) => {
+      reject(err)
+    })
+    server!.listen(OAUTH_CALLBACK_PORT, "127.0.0.1", () => {
+      resolve()
+    })
+  })
+}
+/**
+ * Wait for a callback with the given OAuth state.
+ * Returns a promise that resolves with the authorization code.
+ */
+export function waitForCallback(oauthState: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      if (pendingAuths.has(oauthState)) {
+        pendingAuths.delete(oauthState)
+        reject(new Error("OAuth callback timeout - authorization took too long"))
+      }
+    }, CALLBACK_TIMEOUT_MS)
+    pendingAuths.set(oauthState, { resolve, reject, timeout })
+  })
+}
+/**
+ * Cancel a pending authorization by state.
+ */
+export function cancelPendingCallback(oauthState: string): void {
+  const pending = pendingAuths.get(oauthState)
+  if (pending) {
+    clearTimeout(pending.timeout)
+    pendingAuths.delete(oauthState)
+    pending.reject(new Error("Authorization cancelled"))
+  }
+}
+/**
+ * Stop the callback server and reject all pending authorizations.
+ */
+export async function stopCallbackServer(): Promise<void> {
+  if (server) {
+    await new Promise<void>((resolve) => {
+      server!.close(() => {
+        resolve()
+      })
+    })
+    server = undefined
+  }
+  // Reject all pending auths (defer to allow any pending operations to complete)
+  const pendingList = Array.from(pendingAuths.entries())
+  pendingAuths.clear()
+  setTimeout(() => {
+    for (const [state, pending] of pendingList) {
+      clearTimeout(pending.timeout)
+      pending.reject(new Error("OAuth callback server stopped"))
+    }
+  }, 0)
+}
+/**
+ * Check if the callback server is running.
+ */
+export function isCallbackServerRunning(): boolean {
+  return server !== undefined
+}
+/**
+ * Get the number of pending authorizations.
+ */
+export function getPendingAuthCount(): number {
+  return pendingAuths.size
+}

package/mcp-oauth-provider.ts ADDED Viewed

@@ -0,0 +1,265 @@
+/**
+ * MCP OAuth Provider
+ *
+ * Implementation of the MCP SDK's OAuthClientProvider interface.
+ * Handles OAuth client registration, token storage, and authorization redirection.
+ */
+import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js"
+import type {
+  OAuthClientMetadata,
+  OAuthTokens,
+  OAuthClientInformation,
+  OAuthClientInformationFull,
+} from "@modelcontextprotocol/sdk/shared/auth.js"
+import {
+  getAuthEntry,
+  getAuthForUrl,
+  updateTokens,
+  updateClientInfo,
+  updateCodeVerifier,
+  updateOAuthState,
+  clearAllCredentials,
+  clearClientInfo,
+  clearTokens,
+  type StoredTokens,
+  type StoredClientInfo,
+} from "./mcp-auth.js"
+// Callback server configuration
+const OAUTH_CALLBACK_PORT = 19876
+const OAUTH_CALLBACK_PATH = "/mcp/oauth/callback"
+/** Configuration options for OAuth */
+export interface McpOAuthConfig {
+  grantType?: "authorization_code" | "client_credentials"
+  clientId?: string
+  clientSecret?: string
+  scope?: string
+}
+/** Callbacks for OAuth flow interactions */
+export interface McpOAuthCallbacks {
+  onRedirect: (url: URL) => void | Promise<void>
+}
+/**
+ * OAuth provider implementation for MCP servers.
+ * Implements the OAuthClientProvider interface from the MCP SDK.
+ */
+export class McpOAuthProvider implements OAuthClientProvider {
+  constructor(
+    private serverName: string,
+    private serverUrl: string,
+    private config: McpOAuthConfig,
+    private callbacks: McpOAuthCallbacks,
+  ) {}
+  private get usesClientCredentials(): boolean {
+    return this.config.grantType === "client_credentials"
+  }
+  /**
+   * The redirect URL for OAuth callbacks.
+   * This must match the redirect_uri in client metadata.
+   */
+  get redirectUrl(): string | undefined {
+    if (this.usesClientCredentials) return undefined
+    return `http://127.0.0.1:${OAUTH_CALLBACK_PORT}${OAUTH_CALLBACK_PATH}`
+  }
+  /**
+   * Client metadata for dynamic registration.
+   * Describes this client to the OAuth authorization server.
+   */
+  get clientMetadata(): OAuthClientMetadata {
+    if (this.usesClientCredentials) {
+      return {
+        client_name: "Pi Coding Agent",
+        redirect_uris: [],
+        grant_types: ["client_credentials"],
+        token_endpoint_auth_method: this.config.clientSecret ? "client_secret_post" : "none",
+      }
+    }
+    const redirectUrl = this.redirectUrl
+    if (!redirectUrl) {
+      throw new Error("redirectUrl is required for authorization_code flow")
+    }
+    return {
+      redirect_uris: [redirectUrl],
+      client_name: "Pi Coding Agent",
+      client_uri: "https://github.com/nicobailon/pi-mcp-adapter",
+      grant_types: ["authorization_code", "refresh_token"],
+      response_types: ["code"],
+      token_endpoint_auth_method: this.config.clientSecret ? "client_secret_post" : "none",
+    }
+  }
+  /**
+   * Get client information (for pre-registered or dynamically registered clients).
+   * Returns undefined if no client info exists or if the server URL has changed.
+   */
+  async clientInformation(): Promise<OAuthClientInformation | undefined> {
+    // Check config first (pre-registered client)
+    if (this.config.clientId) {
+      return {
+        client_id: this.config.clientId,
+        client_secret: this.config.clientSecret,
+      }
+    }
+    // Check stored client info (from dynamic registration)
+    // Use getAuthForUrl to validate credentials are for the current server URL
+    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
+    if (entry?.clientInfo) {
+      // Check if client secret has expired
+      if (entry.clientInfo.clientSecretExpiresAt && entry.clientInfo.clientSecretExpiresAt < Date.now() / 1000) {
+        return undefined
+      }
+      return {
+        client_id: entry.clientInfo.clientId,
+        client_secret: entry.clientInfo.clientSecret,
+      }
+    }
+    // No client info or URL changed - will trigger dynamic registration
+    return undefined
+  }
+  /**
+   * Save client information from dynamic registration.
+   */
+  async saveClientInformation(info: OAuthClientInformationFull): Promise<void> {
+    const clientInfo: StoredClientInfo = {
+      clientId: info.client_id,
+      clientSecret: info.client_secret,
+      clientIdIssuedAt: info.client_id_issued_at,
+      clientSecretExpiresAt: info.client_secret_expires_at,
+    }
+    updateClientInfo(this.serverName, clientInfo, this.serverUrl)
+  }
+  /**
+   * Get stored OAuth tokens.
+   * Returns undefined if no tokens exist or if the server URL has changed.
+   */
+  async tokens(): Promise<OAuthTokens | undefined> {
+    // Use getAuthForUrl to validate tokens are for the current server URL
+    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
+    if (!entry?.tokens) return undefined
+    return {
+      access_token: entry.tokens.accessToken,
+      token_type: "Bearer",
+      refresh_token: entry.tokens.refreshToken,
+      expires_in: entry.tokens.expiresAt
+        ? Math.max(0, Math.floor(entry.tokens.expiresAt - Date.now() / 1000))
+        : undefined,
+      scope: entry.tokens.scope,
+    }
+  }
+  /**
+   * Save OAuth tokens.
+   */
+  async saveTokens(tokens: OAuthTokens): Promise<void> {
+    const storedTokens: StoredTokens = {
+      accessToken: tokens.access_token,
+      refreshToken: tokens.refresh_token,
+      expiresAt: tokens.expires_in ? Date.now() / 1000 + tokens.expires_in : undefined,
+      scope: tokens.scope,
+    }
+    updateTokens(this.serverName, storedTokens, this.serverUrl)
+  }
+  /**
+   * Redirect the user to the authorization URL.
+   * This opens the browser for the user to authenticate.
+   */
+  async redirectToAuthorization(authorizationUrl: URL): Promise<void> {
+    if (this.usesClientCredentials) {
+      throw new Error("redirectToAuthorization is not used for client_credentials flow")
+    }
+    // URL is passed to callback, not logged (may contain sensitive params)
+    await this.callbacks.onRedirect(authorizationUrl)
+  }
+  /**
+   * Save the PKCE code verifier.
+   */
+  async saveCodeVerifier(codeVerifier: string): Promise<void> {
+    updateCodeVerifier(this.serverName, codeVerifier)
+  }
+  /**
+   * Get the stored PKCE code verifier.
+   * @throws Error if no code verifier is stored
+   */
+  async codeVerifier(): Promise<string> {
+    if (this.usesClientCredentials) {
+      throw new Error("codeVerifier is not used for client_credentials flow")
+    }
+    const entry = await getAuthEntry(this.serverName)
+    if (!entry?.codeVerifier) {
+      throw new Error(`No code verifier saved for MCP server: ${this.serverName}`)
+    }
+    return entry.codeVerifier
+  }
+  /**
+   * Save the OAuth state parameter for CSRF protection.
+   */
+  async saveState(state: string): Promise<void> {
+    updateOAuthState(this.serverName, state)
+  }
+  /**
+   * Get the stored OAuth state parameter.
+   * @throws Error if no state is stored
+   */
+  async state(): Promise<string> {
+    if (this.usesClientCredentials) {
+      throw new Error("state is not used for client_credentials flow")
+    }
+    const entry = await getAuthEntry(this.serverName)
+    if (!entry?.oauthState) {
+      throw new Error(`No OAuth state saved for MCP server: ${this.serverName}`)
+    }
+    return entry.oauthState
+  }
+  /**
+   * Invalidate credentials when authentication fails.
+   * Clears tokens, client info, or all credentials based on the type.
+   */
+  async invalidateCredentials(type: "all" | "client" | "tokens"): Promise<void> {
+    switch (type) {
+      case "all":
+        clearAllCredentials(this.serverName)
+        break
+      case "client":
+        clearClientInfo(this.serverName)
+        break
+      case "tokens":
+        clearTokens(this.serverName)
+        break
+    }
+  }
+  prepareTokenRequest(scope?: string): URLSearchParams | undefined {
+    if (!this.usesClientCredentials) {
+      return undefined
+    }
+    const params = new URLSearchParams({ grant_type: "client_credentials" })
+    const requestedScope = scope ?? this.config.scope
+    if (requestedScope) {
+      params.set("scope", requestedScope)
+    }
+    return params
+  }
+}
+export { OAUTH_CALLBACK_PORT, OAUTH_CALLBACK_PATH }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "pi-mcp-adapter",
-  "version": "2.2.1",
+  "version": "2.3.2",
   "description": "MCP (Model Context Protocol) adapter extension for Pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -8,6 +8,11 @@
   "bin": {
     "pi-mcp-adapter": "./cli.js"
   },
+  "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/nicobailon/pi-mcp-adapter"
@@ -23,11 +28,6 @@
     "claude",
     "llm"
   ],
-  "scripts": {
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage"
-  },
   "pi": {
     "extensions": [
       "./index.ts"
@@ -60,6 +60,10 @@
     "glimpse-ui.ts",
     "npx-resolver.ts",
     "oauth-handler.ts",
+    "mcp-auth.ts",
+    "mcp-oauth-provider.ts",
+    "mcp-callback-server.ts",
+    "mcp-auth-flow.ts",
     "mcp-panel.ts",
     "logger.ts",
     "errors.ts",
@@ -72,13 +76,17 @@
     "@modelcontextprotocol/ext-apps": "^1.2.2",
     "@modelcontextprotocol/sdk": "^1.25.1",
     "@sinclair/typebox": "^0.32.0",
+    "open": "^10.2.0",
     "zod": "^3.25.0 || ^4.0.0"
   },
   "peerDependencies": {
     "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
+    "@types/bun": "^1.0.0",
     "@types/node": "^20.0.0",
+    "@types/open": "^6.2.1",
+    "tsx": "^4.21.0",
     "typescript": "^5.0.0",
     "vitest": "^3.0.0"
   }

package/proxy-modes.ts CHANGED Viewed

@@ -99,6 +99,8 @@ export function executeStatus(state: McpExtensionState): ProxyToolResult {
     let status = "not connected";
     if (connection?.status === "connected") {
       status = "connected";
+    } else if (connection?.status === "needs-auth") {
+      status = "needs-auth";
     } else if (failedAgo !== null) {
       status = "failed";
     } else if (metadata !== undefined) {
@@ -117,6 +119,10 @@ export function executeStatus(state: McpExtensionState): ProxyToolResult {
       text += `✓ ${server.name} (${server.toolCount} tools)\n`;
       continue;
     }
+    if (server.status === "needs-auth") {
+      text += `⚠ ${server.name} (needs auth)\n`;
+      continue;
+    }
     if (server.status === "cached") {
       text += `○ ${server.name} (${server.toolCount} tools, cached)\n`;
       continue;
@@ -371,6 +377,12 @@ export async function executeConnect(state: McpExtensionState, serverName: strin
       state.ui.setStatus("mcp", `MCP: connecting to ${serverName}...`);
     }
     const connection = await state.manager.connect(serverName, definition);
+    if (connection.status === "needs-auth") {
+      return {
+        content: [{ type: "text" as const, text: `Server "${serverName}" requires OAuth authentication. Run /mcp-auth ${serverName} first.` }],
+        details: { mode: "connect", error: "auth_required", server: serverName },
+      };
+    }
     const prefix = state.config.settings?.toolPrefix ?? "server";
     const { metadata } = buildToolMetadata(connection.tools, connection.resources, definition, serverName, prefix);
     state.toolMetadata.set(serverName, metadata);
@@ -424,6 +436,13 @@ export async function executeCall(
     if (connected) {
       toolMeta = findToolByName(state.toolMetadata.get(serverName), toolName);
     } else {
+      const needsAuthConnection = state.manager.getConnection(serverName);
+      if (needsAuthConnection?.status === "needs-auth") {
+        return {
+          content: [{ type: "text" as const, text: `Server "${serverName}" requires OAuth authentication. Run /mcp-auth ${serverName} first.` }],
+          details: { mode: "call", error: "auth_required", server: serverName },
+        };
+      }
       const failedAgo = getFailureAgeSeconds(state, serverName);
       if (failedAgo !== null) {
         return {
@@ -472,6 +491,12 @@ export async function executeCall(
   }
   let connection = state.manager.getConnection(serverName);
+  if (connection?.status === "needs-auth") {
+    return {
+      content: [{ type: "text" as const, text: `Server "${serverName}" requires OAuth authentication. Run /mcp-auth ${serverName} first.` }],
+      details: { mode: "call", error: "auth_required", server: serverName },
+    };
+  }
   if (!connection || connection.status !== "connected") {
     const failedAgo = getFailureAgeSeconds(state, serverName);
     if (failedAgo !== null) {
@@ -494,6 +519,12 @@ export async function executeCall(
         state.ui.setStatus("mcp", `MCP: connecting to ${serverName}...`);
       }
       connection = await state.manager.connect(serverName, definition);
+      if (connection.status === "needs-auth") {
+        return {
+          content: [{ type: "text" as const, text: `Server "${serverName}" requires OAuth authentication. Run /mcp-auth ${serverName} first.` }],
+          details: { mode: "call", error: "auth_required", server: serverName },
+        };
+      }
       state.failureTracker.delete(serverName);
       updateServerMetadata(state, serverName);
       updateMetadataCache(state, serverName);