@remit/mcp-server 0.2.1 → 0.3.0

package/dist/app-entry.d.ts

@@ -1,11 +1,11 @@
 export { CLIENT_IP_HEADER } from "@remit/auth-service/constants";
-export { createMcpApp, type McpAppConfig } from "./app.js";
+export { challenge, createMcpApp, createMcpPages, type McpAppConfig, type McpChallengeError, type McpPagesConfig, type McpResourceConfig, protectedResourceMetadata, } from "./app.js";
 export { AUTH_BASE_PATH, CONNECTED_APPS_API_PATH, CONNECTED_APPS_PATH, CONSENT_PATH, createBetterAuthTokenVerifier, createMcpAuth, DEVICE_APPROVE_PATH, DEVICE_CODE_PATH, DEVICE_DENY_PATH, DEVICE_PATH, JWKS_PATH, LOGIN_PATH, MCP_PATH, type McpAuth, type McpAuthConfig, type McpAuthRoutes, type McpAuthServer, type McpBrowserAuth, type McpBrowserRoutes, type McpIdentity, type McpSessionState, type McpSignInResult, type McpSubject, mcpResource, OAUTH2_PATH_PREFIX, REVOKE_CLIENT_API_PATH, SIGN_IN_PATH, type SignIn, } from "./auth/authorization-server.js";
 export { type McpSqliteDatabase, type McpUserTables, mcpDatabase, } from "./auth/mcp-database.js";
 export { describeScopes, MCP_READ_SCOPE, MCP_RULES_SCOPE, MCP_SCOPES, OFFLINE_ACCESS_SCOPE, } from "./auth/scopes.js";
 export type { TokenVerification, TokenVerifier, } from "./auth/token-verifier.js";
 export { claudeMcpAddCommand, type DeviceLoginIo, type DeviceLoginResult, deviceLogin, } from "./cli/device-login.js";
-export { type FilterToolDeps, type FolderToolDeps, type McpDeps, type McpDepsExtras, mcpDepsOf, } from "./deps.js";
+export { type FilterToolDeps, FOLDER_POLL_INTERVAL_MS, FOLDER_SETTLE_TIMEOUT_MS, type FolderToolDeps, type McpDeps, type McpDepsExtras, mcpDepsOf, } from "./deps.js";
 export { STYLESHEET_PATH } from "./pages/assets.js";
 export { errorPage, pageError, renderPage } from "./pages/render.js";
 export { type ConnectedAppGrant, connectedAppsView, consentView, deviceView, loginView, } from "./pages/views.js";

package/dist/app-entry.js

@@ -1,10 +1,10 @@
 export { CLIENT_IP_HEADER } from "@remit/auth-service/constants";
-export { createMcpApp } from "./app.js";
+export { challenge, createMcpApp, createMcpPages, protectedResourceMetadata, } from "./app.js";
 export { AUTH_BASE_PATH, CONNECTED_APPS_API_PATH, CONNECTED_APPS_PATH, CONSENT_PATH, createBetterAuthTokenVerifier, createMcpAuth, DEVICE_APPROVE_PATH, DEVICE_CODE_PATH, DEVICE_DENY_PATH, DEVICE_PATH, JWKS_PATH, LOGIN_PATH, MCP_PATH, mcpResource, OAUTH2_PATH_PREFIX, REVOKE_CLIENT_API_PATH, SIGN_IN_PATH, } from "./auth/authorization-server.js";
 export { mcpDatabase, } from "./auth/mcp-database.js";
 export { describeScopes, MCP_READ_SCOPE, MCP_RULES_SCOPE, MCP_SCOPES, OFFLINE_ACCESS_SCOPE, } from "./auth/scopes.js";
 export { claudeMcpAddCommand, deviceLogin, } from "./cli/device-login.js";
-export { mcpDepsOf, } from "./deps.js";
+export { FOLDER_POLL_INTERVAL_MS, FOLDER_SETTLE_TIMEOUT_MS, mcpDepsOf, } from "./deps.js";
 export { STYLESHEET_PATH } from "./pages/assets.js";
 export { errorPage, pageError, renderPage } from "./pages/render.js";
 export { connectedAppsView, consentView, deviceView, loginView, } from "./pages/views.js";

package/dist/app.d.ts

@@ -2,10 +2,18 @@ import { type McpAuthRoutes } from "./auth/authorization-server.js";
 import type { TokenVerifier } from "./auth/token-verifier.js";
 import type { McpDeps } from "./deps.js";
 import { type McpRequestHandler } from "./server.js";
-export interface McpAppConfig {
+export interface McpResourceConfig {
     origin: string;
+}
+export interface McpPagesConfig extends McpResourceConfig {
     authRoutes: McpAuthRoutes;
+}
+export interface McpAppConfig extends McpPagesConfig {
     verifier: TokenVerifier;
     deps: McpDeps;
 }
-export declare const createMcpApp: ({ origin, authRoutes, verifier, deps, }: McpAppConfig) => McpRequestHandler;
+export type McpChallengeError = "unauthorized" | "invalid_token";
+export declare const challenge: ({ origin }: McpResourceConfig, error: McpChallengeError) => Response;
+export declare const protectedResourceMetadata: ({ origin, }: McpResourceConfig) => Response;
+export declare const createMcpPages: ({ origin, authRoutes, }: McpPagesConfig) => McpRequestHandler;
+export declare const createMcpApp: (config: McpAppConfig) => McpRequestHandler;

package/dist/app.js

@@ -6,6 +6,25 @@ import { errorPage, pageError } from "./pages/render.js";
 import { connectedAppsView, consentView, deviceView, loginView, } from "./pages/views.js";
 import { createMcpHandler } from "./server.js";
 const PROTECTED_RESOURCE_METADATA_PATH = "/.well-known/oauth-protected-resource";
+const RESOURCE_METADATA_PATH = `${PROTECTED_RESOURCE_METADATA_PATH}${MCP_PATH}`;
+export const challenge = ({ origin }, error) => new Response(JSON.stringify({ error, resource: mcpResource(origin) }), {
+    status: 401,
+    headers: {
+        "content-type": "application/json",
+        "www-authenticate": [
+            "Bearer",
+            ` resource_metadata="${origin}${RESOURCE_METADATA_PATH}",`,
+            ` scope="${MCP_SCOPES.join(" ")}"`,
+            error === "unauthorized" ? "" : `, error="${error}"`,
+        ].join(""),
+    },
+});
+export const protectedResourceMetadata = ({ origin, }) => Response.json({
+    resource: mcpResource(origin),
+    authorization_servers: [origin],
+    scopes_supported: [...MCP_SCOPES],
+    bearer_methods_supported: ["header"],
+});
 const RETURN_PATHS = new Set([
     DEVICE_PATH,
     CONNECTED_APPS_PATH,
@@ -40,21 +59,7 @@ const redirectWithCookies = (location, from) => {
     }
     return new Response(null, { status: 302, headers });
 };
-export const createMcpApp = ({ origin, authRoutes, verifier, deps, }) => {
-    const resource = mcpResource(origin);
-    const resourceMetadataPath = `${PROTECTED_RESOURCE_METADATA_PATH}${MCP_PATH}`;
-    const challenge = (error) => new Response(JSON.stringify({ error: error ?? "unauthorized", resource }), {
-        status: 401,
-        headers: {
-            "content-type": "application/json",
-            "www-authenticate": [
-                "Bearer",
-                ` resource_metadata="${origin}${resourceMetadataPath}",`,
-                ` scope="${MCP_SCOPES.join(" ")}"`,
-                error ? `, error="${error}"` : "",
-            ].join(""),
-        },
-    });
+export const createMcpPages = ({ origin, authRoutes, }) => {
     const continueFrom = async (response) => {
         if (!response.ok) {
             return errorPage("Connecting failed", await failureOf(response), "Go back to your MCP client and connect remit again.", response.status);
@@ -222,31 +227,15 @@ export const createMcpApp = ({ origin, authRoutes, verifier, deps, }) => {
             return after;
         return connectedAppsView(after, 200, name);
     };
-    const serveMcp = async (request) => {
-        const bearer = extractBearerToken(request.headers.get("authorization") ?? undefined);
-        if (!bearer)
-            return challenge();
-        const verification = await verifier.verify(bearer);
-        if (!verification.ok)
-            return challenge("invalid_token");
-        return createMcpHandler(verification.principal, deps)(request);
-    };
     return async (request) => {
         const { pathname } = new URL(request.url);
         if (pathname === "/.well-known/oauth-authorization-server") {
             return authRoutes.serverMetadata(request);
         }
-        if (pathname === resourceMetadataPath ||
+        if (pathname === RESOURCE_METADATA_PATH ||
             pathname === PROTECTED_RESOURCE_METADATA_PATH) {
-            return Response.json({
-                resource,
-                authorization_servers: [origin],
-                scopes_supported: [...MCP_SCOPES],
-                bearer_methods_supported: ["header"],
-            });
+            return protectedResourceMetadata({ origin });
         }
-        if (pathname === MCP_PATH)
-            return serveMcp(request);
         if (pathname === LOGIN_PATH && authRoutes.browser.kind === "signIn") {
             return login(request, authRoutes.browser.signIn);
         }
@@ -259,3 +248,20 @@ export const createMcpApp = ({ origin, authRoutes, verifier, deps, }) => {
         return authRoutes.handle(request);
     };
 };
+export const createMcpApp = (config) => {
+    const pages = createMcpPages(config);
+    const serveMcp = async (request) => {
+        const bearer = extractBearerToken(request.headers.get("authorization") ?? undefined);
+        if (!bearer)
+            return challenge(config, "unauthorized");
+        const verification = await config.verifier.verify(bearer);
+        if (!verification.ok)
+            return challenge(config, "invalid_token");
+        return createMcpHandler(verification.principal, config.deps)(request);
+    };
+    return (request) => {
+        if (new URL(request.url).pathname === MCP_PATH)
+            return serveMcp(request);
+        return pages(request);
+    };
+};

package/dist/deps.d.ts

@@ -2,6 +2,8 @@ import type { RemitClient } from "@remit/backend/client";
 import type { IAccountRepository, IFilterRepository, IMailboxRepository, IMessageRepository, IOrganizeJobRequestRepository, IThreadMessageRepository, OrganizeJobEvent, QueueProducer } from "@remit/data-ports";
 import type { BodyPartMaterializer, BodySyncCue, MailboxQueueService, MaterializeLogger, OrganizeJobLogger } from "@remit/mailbox-service";
 import type { StorageService } from "@remit/storage-service";
+export declare const FOLDER_SETTLE_TIMEOUT_MS = 20000;
+export declare const FOLDER_POLL_INTERVAL_MS = 500;
 export interface FolderToolDeps {
     mailboxQueue: Pick<MailboxQueueService, "createMailbox" | "renameMailbox" | "dismissMailboxIntent">;
     settleTimeoutMs: number;

package/dist/deps.js

@@ -1,3 +1,5 @@
+export const FOLDER_SETTLE_TIMEOUT_MS = 20_000;
+export const FOLDER_POLL_INTERVAL_MS = 500;
 export const mcpDepsOf = (client, { logger, settle }) => ({
     account: client.account,
     mailbox: client.mailbox,

package/dist/main.js

@@ -9,12 +9,10 @@ import { createBetterAuthTokenVerifier } from "./auth/authorization-server.js";
 import { openMcpAuthDatabase } from "./auth/database.js";
 import { createSqliteMcpAuth } from "./auth/node-auth.js";
 import { resolveMcpServerConfig } from "./config.js";
-import { mcpDepsOf } from "./deps.js";
+import { FOLDER_POLL_INTERVAL_MS, FOLDER_SETTLE_TIMEOUT_MS, mcpDepsOf, } from "./deps.js";
 import { ASSETS_PATH_PREFIX, serveAsset } from "./pages/assets.js";
 import { loadPageAssets } from "./pages/load-assets.js";
 installNodeLogger();
-const FOLDER_SETTLE_TIMEOUT_MS = 20_000;
-const FOLDER_POLL_INTERVAL_MS = 500;
 const config = resolveMcpServerConfig();
 const client = await getClient();
 const deps = mcpDepsOf(client, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/mcp-server",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"description": "The remit MCP server: mail tools over streamable HTTP and the OAuth authorization server that guards them.",
 	"type": "module",
 	"exports": {