npm - @bastani/atomic - Versions diffs - 0.9.16-alpha.1 → 0.9.16-alpha.3 - Mend

@bastani/atomic 0.9.16-alpha.1 → 0.9.16-alpha.3

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 (714) hide show

package/dist/builtin/mcp/mcp-callback-server.ts DELETED Viewed

@@ -1,306 +0,0 @@
-/**
- * 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 {
-  OAUTH_CALLBACK_PATH,
-  getConfiguredOAuthCallbackPort,
-  getOAuthCallbackPort,
-  setOAuthCallbackPort,
-} from "./mcp-oauth-provider.js"
-import { logger } from "./logger.ts"
-// 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>`
-export const renderCallbackErrorHtml = () => `<!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">Return to Atomic and try again.</div>
-  </div>
-</body>
-</html>`
-/** Pending authorization request */
-interface PendingAuth {
-  resolve: (code: string) => void
-  reject: (error: Error) => void
-  timeout: ReturnType<typeof setTimeout>
-}
-/** Serialized callback-server ownership prevents startup/teardown publication races. */
-let server: Server | undefined
-let serverTransition: Promise<void> = Promise.resolve()
-const pendingAuths = new Map<string, PendingAuth>()
-/** Timeout for callback completion (5 minutes) */
-const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000
-const MAX_PORT_SCAN_ATTEMPTS = 25
-interface EnsureCallbackServerOptions {
-  strictPort?: boolean
-}
-/**
- * Handle incoming HTTP requests to the callback server.
- */
-export 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) {
-    logger.debug("OAuth callback rejected: missing state parameter")
-    res.writeHead(400, { "Content-Type": "text/html" })
-    res.end(renderCallbackErrorHtml())
-    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(renderCallbackErrorHtml())
-    // Reject only after the response is sent.
-    if (pendingAuths.has(state)) {
-      rejectPendingCallback(state, new Error(errorMsg))
-    }
-    return
-  }
-  // Require authorization code
-  if (!code) {
-    res.writeHead(400, { "Content-Type": "text/html" })
-    res.end(renderCallbackErrorHtml())
-    return
-  }
-  // Validate state parameter
-  if (!pendingAuths.has(state)) {
-    logger.debug("OAuth callback rejected: invalid or expired state parameter")
-    res.writeHead(400, { "Content-Type": "text/html" })
-    res.end(renderCallbackErrorHtml())
-    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 strictPort is true, requires binding on the configured callback port.
- * If strictPort is false, scans forward for an available local port.
- */
-export function ensureCallbackServer(options: EnsureCallbackServerOptions = {}): Promise<void> {
-  return enqueueServerTransition(() => ensureCallbackServerNow(options))
-}
-function enqueueServerTransition<T>(operation: () => Promise<T>): Promise<T> {
-  const result = serverTransition.then(operation, operation)
-  serverTransition = result.then(() => undefined, () => undefined)
-  return result
-}
-async function closeServer(target: Server): Promise<void> {
-  await new Promise<void>((resolve) => {
-    target.close(() => resolve())
-  })
-}
-async function stopPublishedServer(): Promise<void> {
-  const target = server
-  if (!target) return
-  server = undefined
-  await closeServer(target)
-}
-async function listen(candidate: Server, port: number): Promise<void> {
-  await new Promise<void>((resolve, reject) => {
-    const onError = (error: Error): void => {
-      candidate.off("error", onError)
-      reject(error)
-    }
-    const onListening = (): void => {
-      candidate.off("error", onError)
-      resolve()
-    }
-    candidate.once("error", onError)
-    candidate.listen(port, "localhost", onListening)
-  })
-}
-async function ensureCallbackServerNow(options: EnsureCallbackServerOptions): Promise<void> {
-  const configuredPort = getConfiguredOAuthCallbackPort()
-  const strictPort = options.strictPort === true
-  if (server) {
-    if (!strictPort || getOAuthCallbackPort() === configuredPort) return
-    if (pendingAuths.size > 0) {
-      throw new Error(
-        `OAuth callback server is running on port ${getOAuthCallbackPort()}, but strict callback port ${configuredPort} is required and cannot be switched while authorizations are pending`,
-      )
-    }
-    await stopPublishedServer()
-    setOAuthCallbackPort(configuredPort)
-  }
-  const maxAttempts = strictPort ? 1 : MAX_PORT_SCAN_ATTEMPTS
-  let lastError: Error | undefined
-  for (let offset = 0; offset < maxAttempts; offset++) {
-    const candidatePort = configuredPort + offset
-    const candidateServer = createServer(handleRequest)
-    try {
-      await listen(candidateServer, candidatePort)
-      server = candidateServer
-      candidateServer.unref()
-      setOAuthCallbackPort(candidatePort)
-      return
-    } catch (error) {
-      const nodeError = error as NodeJS.ErrnoException
-      await closeServer(candidateServer)
-      if (nodeError.code !== "EADDRINUSE") throw error
-      lastError = error instanceof Error ? error : new Error(String(error))
-    }
-  }
-  if (strictPort) {
-    throw new Error(
-      `OAuth callback port ${configuredPort} is already in use. Pre-registered OAuth clients require an exact redirect URI; set MCP_OAUTH_CALLBACK_PORT to your registered port or free port ${configuredPort}`,
-      { cause: lastError },
-    )
-  }
-  throw new Error(
-    `OAuth callback port ${configuredPort} is already in use and no free port was found in range ${configuredPort}-${configuredPort + MAX_PORT_SCAN_ATTEMPTS - 1}`,
-    { cause: lastError },
-  )
-}
-/**
- * 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> {
-  const promise = new Promise<string>((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 })
-  })
-  void promise.catch(() => undefined)
-  return promise
-}
-/**
- * Cancel a pending authorization by state.
- */
-function rejectPendingCallback(oauthState: string, error: Error): boolean {
-  const pending = pendingAuths.get(oauthState)
-  if (!pending) return false
-  pendingAuths.delete(oauthState)
-  clearTimeout(pending.timeout)
-  pending.reject(error)
-  return true
-}
-export function cancelPendingCallback(
-  oauthState: string,
-  error = new Error("Authorization cancelled"),
-): void {
-  rejectPendingCallback(oauthState, error)
-}
-/** Reject and remove every callback waiter before lifecycle cleanup settles. */
-export function cancelAllPendingCallbacks(error: Error): void {
-  for (const oauthState of Array.from(pendingAuths.keys())) {
-    rejectPendingCallback(oauthState, error)
-  }
-}
-/**
- * Stop the callback server and reject all pending authorizations.
- */
-export function stopCallbackServer(
-  error = new Error("OAuth callback server stopped"),
-): Promise<void> {
-  cancelAllPendingCallbacks(error)
-  return enqueueServerTransition(async () => {
-    // A producer can register its waiter while an earlier startup is publishing.
-    cancelAllPendingCallbacks(error)
-    await stopPublishedServer()
-    setOAuthCallbackPort(getConfiguredOAuthCallbackPort())
-  })
-}
-/**
- * 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/dist/builtin/mcp/mcp-oauth-provider.ts DELETED Viewed

@@ -1,324 +0,0 @@
-/**
- * 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 { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js"
-import type {
-  OAuthClientMetadata,
-  OAuthTokens,
-  OAuthClientInformation,
-  OAuthClientInformationFull,
-} from "@modelcontextprotocol/sdk/shared/auth.js"
-import {
-  getAuthForUrl,
-  updateTokens,
-  updateClientInfo,
-  updateCodeVerifier,
-  updateOAuthState,
-  clearAllCredentials,
-  clearClientInfo,
-  clearTokens,
-  type StoredTokens,
-  type StoredClientInfo,
-} from "./mcp-auth.js"
-// Callback server configuration
-const DEFAULT_OAUTH_CALLBACK_PORT = 19876
-const OAUTH_CALLBACK_PATH = "/callback"
-let configuredOAuthCallbackPort = DEFAULT_OAUTH_CALLBACK_PORT
-if (process.env.MCP_OAUTH_CALLBACK_PORT) {
-  const parsedPort = Number.parseInt(process.env.MCP_OAUTH_CALLBACK_PORT, 10)
-  if (Number.isInteger(parsedPort) && parsedPort > 0 && parsedPort <= 65535) {
-    configuredOAuthCallbackPort = parsedPort
-  }
-}
-let oauthCallbackPort = configuredOAuthCallbackPort
-export function getConfiguredOAuthCallbackPort(): number {
-  return configuredOAuthCallbackPort
-}
-export function getOAuthCallbackPort(): number {
-  return oauthCallbackPort
-}
-export function setOAuthCallbackPort(port: number): void {
-  oauthCallbackPort = port
-}
-/** 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>
-  assertActive?: () => 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 ensureActive(): void {
-    this.callbacks.assertActive?.()
-  }
-  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://localhost:${getOAuthCallbackPort()}${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> {
-    this.ensureActive()
-    // 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)
-    this.ensureActive()
-    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> {
-    this.ensureActive()
-    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> {
-    this.ensureActive()
-    // Use getAuthForUrl to validate tokens are for the current server URL
-    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
-    this.ensureActive()
-    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> {
-    this.ensureActive()
-    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.
-   *
-   * Throws UnauthorizedError when called outside of a user-initiated flow
-   * (no oauthState saved by startAuth). That path is reached when the SDK
-   * falls through from a failed refresh into a fresh authorization_code
-   * flow, which library hosts cannot complete in-process.
-   */
-  async redirectToAuthorization(authorizationUrl: URL): Promise<void> {
-    this.ensureActive()
-    if (this.usesClientCredentials) {
-      throw new Error("redirectToAuthorization is not used for client_credentials flow")
-    }
-    // No saved oauthState means we're on the post-refresh authorize fallback.
-    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
-    this.ensureActive()
-    if (!entry?.oauthState) {
-      throw new UnauthorizedError(
-        `Re-authentication required for MCP server: ${this.serverName}`,
-      )
-    }
-    // URL is passed to callback, not logged (may contain sensitive params)
-    await this.callbacks.onRedirect(authorizationUrl)
-    this.ensureActive()
-  }
-  /**
-   * Save the PKCE code verifier.
-   */
-  async saveCodeVerifier(codeVerifier: string): Promise<void> {
-    this.ensureActive()
-    updateCodeVerifier(this.serverName, codeVerifier, this.serverUrl)
-  }
-  /**
-   * Get the stored PKCE code verifier.
-   * @throws Error if no code verifier is stored
-   */
-  async codeVerifier(): Promise<string> {
-    this.ensureActive()
-    if (this.usesClientCredentials) {
-      throw new Error("codeVerifier is not used for client_credentials flow")
-    }
-    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
-    this.ensureActive()
-    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> {
-    this.ensureActive()
-    updateOAuthState(this.serverName, state, this.serverUrl)
-  }
-  /**
-   * Get the stored OAuth state parameter.
-   * @throws UnauthorizedError if no flow is in progress (see redirectToAuthorization)
-   */
-  async state(): Promise<string> {
-    this.ensureActive()
-    if (this.usesClientCredentials) {
-      throw new Error("state is not used for client_credentials flow")
-    }
-    const entry = await getAuthForUrl(this.serverName, this.serverUrl)
-    this.ensureActive()
-    if (!entry?.oauthState) {
-      throw new UnauthorizedError(
-        `Re-authentication required 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> {
-    this.ensureActive()
-    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 {
-    this.ensureActive()
-    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 { DEFAULT_OAUTH_CALLBACK_PORT, OAUTH_CALLBACK_PATH }