studiograph 1.3.48-next.2 → 1.3.48-next.201

package/dist/mcp/oauth-provider.js

@@ -1,160 +1,91 @@
 /**
- * OAuth Client Provider for MCP Connectors
+ * MCP OAuth Client Provider
  *
- * Implements OAuthClientProvider from the MCP SDK to support OAuth-based
- * MCP servers (Figma, Linear, etc.) using dynamic client registration.
- *
- * Storage: ~/.studiograph/connectors/<name>.oauth.json (tokens, client info, PKCE verifier)
- * Auth flow: opens browser → local callback server → exchanges code for tokens
- *
- * Works with any MCP server that supports RFC 8414 (OAuth metadata discovery)
- * and RFC 7591 (dynamic client registration). No pre-registered client secrets needed.
- */
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { join } from 'path';
-import { createServer } from 'http';
-import { CONNECTORS_DIR } from './connector-manager.js';
-const CALLBACK_PORT = 38741; // Fixed port for OAuth callbacks
-const CALLBACK_PATH = '/oauth/callback';
-const REDIRECT_URI = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`;
-/**
- * File-backed OAuth provider for a single connector.
- * Stores tokens and client info alongside the connector config.
+ * Implements the OAuthClientProvider interface from the MCP SDK.
+ * Stores tokens and client registration in the auth database per user+connector.
+ * Supports both dynamic client registration and pre-registered OAuth apps.
  */
-export class ConnectorOAuthProvider {
+export class McpOAuthProvider {
     connectorName;
-    storagePath;
-    constructor(connectorName) {
+    userId;
+    authService;
+    serverUrl;
+    /** Set by redirectToAuthorization — the frontend reads this to open the auth URL. */
+    authorizationUrl = null;
+    preRegistered;
+    constructor(connectorName, userId, authService, serverUrl, oauthCredentials) {
         this.connectorName = connectorName;
-        this.storagePath = join(CONNECTORS_DIR, `${connectorName}.oauth.json`);
+        this.userId = userId;
+        this.authService = authService;
+        this.serverUrl = serverUrl;
+        this.preRegistered = oauthCredentials;
     }
     get redirectUrl() {
-        return new URL(REDIRECT_URI);
+        // Use pre-registered redirect URI if available (e.g. auth.studiograph.com)
+        if (this.preRegistered?.redirect_uri)
+            return this.preRegistered.redirect_uri;
+        return `${this.serverUrl}/api/oauth/callback/${encodeURIComponent(this.connectorName)}`;
     }
     get clientMetadata() {
         return {
-            redirect_uris: [REDIRECT_URI],
             client_name: 'Studiograph',
+            redirect_uris: [this.redirectUrl.toString()],
             grant_types: ['authorization_code', 'refresh_token'],
             response_types: ['code'],
-            token_endpoint_auth_method: 'none', // public client — no secret
+            token_endpoint_auth_method: this.preRegistered?.client_secret ? 'client_secret_post' : 'none',
         };
     }
-    async clientInformation() {
-        return this._load().clientInfo;
+    state() {
+        // HMAC-signed so the callback/claim handlers can verify the state was
+        // minted by this instance. Without the signature, an attacker who
+        // controls a callback URL could forge {c, u, o} and bind their tokens
+        // against a victim's userId. The signing key is HKDF-derived from the
+        // workspace master key in AuthService — see src/mcp/state-signer.ts.
+        return this.authService.signOAuthState({
+            connectorName: this.connectorName,
+            userId: this.userId,
+            origin: this.serverUrl,
+        });
     }
-    async saveClientInformation(info) {
-        const data = this._load();
-        data.clientInfo = info;
-        this._save(data);
+    clientInformation() {
+        // Pre-registered credentials take priority
+        if (this.preRegistered) {
+            return {
+                client_id: this.preRegistered.client_id,
+                client_secret: this.preRegistered.client_secret,
+            };
+        }
+        // Fall back to dynamically registered credentials
+        const data = this.authService.getOAuthData(this.userId, this.connectorName);
+        return data?.clientInfo ?? undefined;
     }
-    async tokens() {
-        return this._load().tokens;
+    saveClientInformation(clientInfo) {
+        if (this.preRegistered)
+            return; // Don't overwrite pre-registered credentials
+        const data = this.authService.getOAuthData(this.userId, this.connectorName) ?? {};
+        data.clientInfo = clientInfo;
+        this.authService.saveOAuthData(this.userId, this.connectorName, data);
     }
-    async saveTokens(tokens) {
-        const data = this._load();
+    tokens() {
+        const data = this.authService.getOAuthData(this.userId, this.connectorName);
+        return data?.tokens ?? undefined;
+    }
+    saveTokens(tokens) {
+        const data = this.authService.getOAuthData(this.userId, this.connectorName) ?? {};
         data.tokens = tokens;
-        this._save(data);
+        this.authService.saveOAuthData(this.userId, this.connectorName, data);
     }
-    async redirectToAuthorization(authorizationUrl) {
-        // Open browser to authorization URL
-        const { exec } = await import('child_process');
-        const url = authorizationUrl.toString();
-        const platform = process.platform;
-        if (platform === 'darwin') {
-            exec(`open "${url}"`);
-        }
-        else if (platform === 'win32') {
-            exec(`start "" "${url}"`);
-        }
-        else {
-            exec(`xdg-open "${url}"`);
-        }
-        console.log(`[connectors] Opening browser for ${this.connectorName} authorization...`);
+    redirectToAuthorization(authorizationUrl) {
+        this.authorizationUrl = authorizationUrl.toString();
     }
-    async saveCodeVerifier(codeVerifier) {
-        const data = this._load();
+    saveCodeVerifier(codeVerifier) {
+        const data = this.authService.getOAuthData(this.userId, this.connectorName) ?? {};
         data.codeVerifier = codeVerifier;
-        this._save(data);
-    }
-    async codeVerifier() {
-        const data = this._load();
-        return data.codeVerifier ?? '';
+        this.authService.saveOAuthData(this.userId, this.connectorName, data);
     }
-    async invalidateCredentials(scope) {
-        const data = this._load();
-        if (scope === 'all' || scope === 'tokens')
-            data.tokens = undefined;
-        if (scope === 'all' || scope === 'client')
-            data.clientInfo = undefined;
-        if (scope === 'all' || scope === 'verifier')
-            data.codeVerifier = undefined;
-        this._save(data);
+    codeVerifier() {
+        const data = this.authService.getOAuthData(this.userId, this.connectorName);
+        return data?.codeVerifier ?? '';
     }
-    // ── storage helpers ──────────────────────────────────────────────────────
-    _load() {
-        if (!existsSync(this.storagePath))
-            return {};
-        try {
-            return JSON.parse(readFileSync(this.storagePath, 'utf-8'));
-        }
-        catch {
-            return {};
-        }
-    }
-    _save(data) {
-        mkdirSync(CONNECTORS_DIR, { recursive: true });
-        writeFileSync(this.storagePath, JSON.stringify(data, null, 2) + '\n', { mode: 0o600 });
-    }
-}
-// ── Callback server ──────────────────────────────────────────────────────────
-/**
- * Start a temporary local HTTP server to receive the OAuth callback.
- * Returns a promise that resolves with the authorization code.
- * Server auto-closes after receiving the callback or timing out.
- */
-export function waitForOAuthCallback(timeoutMs = 120_000) {
-    return new Promise((resolve, reject) => {
-        let server;
-        const timeout = setTimeout(() => {
-            server?.close();
-            reject(new Error('OAuth callback timed out (2 minutes)'));
-        }, timeoutMs);
-        server = createServer((req, res) => {
-            const url = new URL(req.url ?? '/', `http://localhost:${CALLBACK_PORT}`);
-            if (url.pathname !== CALLBACK_PATH) {
-                res.writeHead(404);
-                res.end('Not found');
-                return;
-            }
-            const code = url.searchParams.get('code');
-            const error = url.searchParams.get('error');
-            if (error) {
-                res.writeHead(200, { 'Content-Type': 'text/html' });
-                res.end(`<html><body><h2>Authorization failed</h2><p>${error}</p><p>You can close this tab.</p></body></html>`);
-                clearTimeout(timeout);
-                server.close();
-                reject(new Error(`OAuth authorization denied: ${error}`));
-                return;
-            }
-            if (!code) {
-                res.writeHead(400, { 'Content-Type': 'text/html' });
-                res.end('<html><body><h2>Missing authorization code</h2><p>You can close this tab.</p></body></html>');
-                return;
-            }
-            res.writeHead(200, { 'Content-Type': 'text/html' });
-            res.end('<html><body><h2>Authorization successful</h2><p>You can close this tab and return to Studiograph.</p></body></html>');
-            clearTimeout(timeout);
-            server.close();
-            resolve(code);
-        });
-        server.listen(CALLBACK_PORT, () => {
-            // Server ready — browser will be opened by redirectToAuthorization()
-        });
-        server.on('error', (err) => {
-            clearTimeout(timeout);
-            reject(new Error(`Failed to start OAuth callback server: ${err.message}`));
-        });
-    });
 }
 //# sourceMappingURL=oauth-provider.js.map

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

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

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

@@ -0,0 +1,62 @@
+/**
+ * OAuth Broker Registry
+ *
+ * Catalog of MCP servers with pre-registered OAuth apps on the
+ * `auth.studiograph.com` broker. Two responsibilities, both driven by
+ * the same array below:
+ *
+ *   1. RUNTIME — when a user-imported connector's URL matches one of
+ *      these hostnames, OAuth gets routed through the broker (which
+ *      holds the client secret) instead of expecting per-instance
+ *      credentials. See `getBrokerConnectUrl`.
+ *   2. CATALOG — Settings → External Connectors lists these as
+ *      "available to one-click add" tiles so an owner doesn't have to
+ *      know the canonical URL or paste JSON. See
+ *      `listAvailableBrokerConnectors`.
+ *
+ * Adding a new entry is a deliberate decision, not a default workflow.
+ * See AGENTS.md § "Broker strategy" for when to do it and the costs
+ * involved (provider relationship, rate-limit exposure, single point
+ * of compromise).
+ */
+declare const BROKER_URL = "https://auth.studiograph.com";
+export interface BrokerConnector {
+    /** Hostname extracted from connector URLs for runtime routing. */
+    hostname: string;
+    /** Slug used in the broker's `/connect/:name` and `/callback/:name`. */
+    name: string;
+    /** User-facing display label for the catalog tile. */
+    displayName: string;
+    /**
+     * Canonical MCP server URL the catalog tile imports when an owner
+     * clicks "Add". Verified periodically — providers move endpoints
+     * occasionally and a stale value here surfaces as an import failure.
+     */
+    serverUrl: string;
+    /**
+     * If true, the catalog suppresses the tile even though the runtime
+     * still routes OAuth through the broker should someone manually
+     * configure it. Use for entries where the OAuth app is registered
+     * but the upstream MCP server isn't generally available yet.
+     */
+    catalogHidden?: boolean;
+}
+export declare const BROKER_CONNECTORS: readonly BrokerConnector[];
+/**
+ * Check if a connector URL has broker support.
+ * Returns the broker connect URL, or undefined if not supported.
+ */
+export declare function getBrokerConnectUrl(connectorUrl: string, state: string): string | undefined;
+/**
+ * Check if a connector URL is supported by the broker.
+ */
+export declare function hasBrokerSupport(connectorUrl: string): boolean;
+/**
+ * Catalog entries owners can one-click add. Drops `catalogHidden`
+ * connectors and anything callers have already configured (the names
+ * passed in are case-normalized — connector names are url-safe slugs
+ * but the import form may capitalize the display label).
+ */
+export declare function listAvailableBrokerConnectors(configuredNames?: ReadonlySet<string>): Array<Pick<BrokerConnector, 'name' | 'displayName' | 'serverUrl'>>;
+/** Broker base URL for claim retrieval. */
+export { BROKER_URL };

package/dist/mcp/oauth-registry.js

@@ -0,0 +1,85 @@
+/**
+ * OAuth Broker Registry
+ *
+ * Catalog of MCP servers with pre-registered OAuth apps on the
+ * `auth.studiograph.com` broker. Two responsibilities, both driven by
+ * the same array below:
+ *
+ *   1. RUNTIME — when a user-imported connector's URL matches one of
+ *      these hostnames, OAuth gets routed through the broker (which
+ *      holds the client secret) instead of expecting per-instance
+ *      credentials. See `getBrokerConnectUrl`.
+ *   2. CATALOG — Settings → External Connectors lists these as
+ *      "available to one-click add" tiles so an owner doesn't have to
+ *      know the canonical URL or paste JSON. See
+ *      `listAvailableBrokerConnectors`.
+ *
+ * Adding a new entry is a deliberate decision, not a default workflow.
+ * See AGENTS.md § "Broker strategy" for when to do it and the costs
+ * involved (provider relationship, rate-limit exposure, single point
+ * of compromise).
+ */
+const BROKER_URL = 'https://auth.studiograph.com';
+export const BROKER_CONNECTORS = [
+    {
+        hostname: 'mcp.asana.com',
+        name: 'asana',
+        displayName: 'Asana',
+        serverUrl: 'https://mcp.asana.com/sse',
+    },
+    {
+        hostname: 'mcp.figma.com',
+        name: 'figma',
+        displayName: 'Figma',
+        serverUrl: 'https://mcp.figma.com/v1/mcp',
+        // Figma's MCP server is pending GA; keep the OAuth app registered
+        // for early-access workspaces but don't surface the catalog tile
+        // until the endpoint is publicly available.
+        catalogHidden: true,
+    },
+];
+/** Internal lookup — hostname → slug. Rebuilt from BROKER_CONNECTORS. */
+const BROKER_HOSTS = new Map(BROKER_CONNECTORS.map(c => [c.hostname, c.name]));
+/**
+ * Check if a connector URL has broker support.
+ * Returns the broker connect URL, or undefined if not supported.
+ */
+export function getBrokerConnectUrl(connectorUrl, state) {
+    try {
+        const hostname = new URL(connectorUrl).hostname;
+        const connectorName = BROKER_HOSTS.get(hostname);
+        if (!connectorName)
+            return undefined;
+        return `${BROKER_URL}/connect/${connectorName}?state=${encodeURIComponent(state)}`;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Check if a connector URL is supported by the broker.
+ */
+export function hasBrokerSupport(connectorUrl) {
+    try {
+        return BROKER_HOSTS.has(new URL(connectorUrl).hostname);
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Catalog entries owners can one-click add. Drops `catalogHidden`
+ * connectors and anything callers have already configured (the names
+ * passed in are case-normalized — connector names are url-safe slugs
+ * but the import form may capitalize the display label).
+ */
+export function listAvailableBrokerConnectors(configuredNames = new Set()) {
+    const normalized = new Set([...configuredNames].map(n => n.toLowerCase()));
+    return BROKER_CONNECTORS
+        .filter(c => !c.catalogHidden)
+        .filter(c => !normalized.has(c.name.toLowerCase()) && !normalized.has(c.displayName.toLowerCase()))
+        .map(({ name, displayName, serverUrl }) => ({ name, displayName, serverUrl }));
+}
+/** Broker base URL for claim retrieval. */
+export { BROKER_URL };
+//# sourceMappingURL=oauth-registry.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-registry.js","sourceRoot":"","sources":["../../src/mcp/oauth-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,MAAM,UAAU,GAAG,8BAA8B,CAAC;AAwBlD,MAAM,CAAC,MAAM,iBAAiB,GAA+B;IAC3D;QACE,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,OAAO;QACpB,SAAS,EAAE,2BAA2B;KACvC;IACD;QACE,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,OAAO;QACpB,SAAS,EAAE,8BAA8B;QACzC,kEAAkE;QAClE,iEAAiE;QACjE,4CAA4C;QAC5C,aAAa,EAAE,IAAI;KACpB;CACF,CAAC;AAEF,yEAAyE;AACzE,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE/E;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAoB,EAAE,KAAa;IACrE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC;QAChD,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa;YAAE,OAAO,SAAS,CAAC;QACrC,OAAO,GAAG,UAAU,YAAY,aAAa,UAAU,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;IACrF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,YAAoB;IACnD,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,6BAA6B,CAC3C,kBAAuC,IAAI,GAAG,EAAE;IAEhD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC3E,OAAO,iBAAiB;SACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;SAClG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,2CAA2C;AAC3C,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/mcp/server.d.ts

@@ -1,11 +1,19 @@
 /**
- * Studiograph MCP server
+ * Studiograph MCP server (stdio transport)
  *
  * Creates a McpServer instance, registers all tools, and connects via stdio
  * transport for integration with Claude Desktop and other MCP clients.
  *
- * NOTE: All logging uses console.error() — stdout is reserved for the
+ * Identity: requires STUDIOGRAPH_MCP_TOKEN to be set to a per-user API token
+ * (or a JWT). The token is resolved against the workspace's AuthService to
+ * produce the caller identity used by every tool's access control check.
+ * Fails closed — if the token is missing or invalid the process exits.
+ *
+ * NOTE: All logging uses log.error() — stdout is reserved for the
  * JSON-RPC protocol messages and must not be written to directly.
+ * log.error writes to stderr (via console.error under the hood), which
+ * preserves the stdio-transport invariant.
  */
 import { WorkspaceManager } from '../core/workspace-manager.js';
-export declare function startMcpServer(workspaceManager: WorkspaceManager): Promise<void>;
+import { AuthService } from '../services/auth-service.js';
+export declare function startMcpServer(workspaceManager: WorkspaceManager, authService: AuthService): Promise<void>;

package/dist/mcp/server.js

@@ -1,28 +1,53 @@
 /**
- * Studiograph MCP server
+ * Studiograph MCP server (stdio transport)
  *
  * Creates a McpServer instance, registers all tools, and connects via stdio
  * transport for integration with Claude Desktop and other MCP clients.
  *
- * NOTE: All logging uses console.error() — stdout is reserved for the
+ * Identity: requires STUDIOGRAPH_MCP_TOKEN to be set to a per-user API token
+ * (or a JWT). The token is resolved against the workspace's AuthService to
+ * produce the caller identity used by every tool's access control check.
+ * Fails closed — if the token is missing or invalid the process exits.
+ *
+ * NOTE: All logging uses log.error() — stdout is reserved for the
  * JSON-RPC protocol messages and must not be written to directly.
+ * log.error writes to stderr (via console.error under the hood), which
+ * preserves the stdio-transport invariant.
  */
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { registerTools } from './tools.js';
-export async function startMcpServer(workspaceManager) {
+import { log } from '../utils/log.js';
+export async function startMcpServer(workspaceManager, authService) {
+    const user = resolveStdioUser(authService);
+    if (!user) {
+        process.stderr.write('Studiograph MCP: STUDIOGRAPH_MCP_TOKEN is required.\n' +
+            'Generate a token with:\n' +
+            '  curl -X POST http://<host>/api/auth/tokens \\\n' +
+            '       -H "Content-Type: application/json" \\\n' +
+            '       -b __sg_token=<your-jwt> \\\n' +
+            '       -d \'{"name":"claude-desktop"}\'\n' +
+            'Then set STUDIOGRAPH_MCP_TOKEN=<token> in your Claude Desktop MCP config env.\n');
+        process.exit(1);
+    }
     const server = new McpServer({
         name: 'studiograph',
         version: '1.0.0',
     });
-    registerTools(server, workspaceManager);
+    registerTools(server, workspaceManager, authService, { user });
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    console.error('Studiograph MCP server ready');
+    log.error(`Studiograph MCP server ready (user: ${user.email})`);
     // Keep the process alive — the transport closes when the client disconnects
     process.on('SIGINT', async () => {
         await server.close();
         process.exit(0);
     });
 }
+function resolveStdioUser(authService) {
+    const token = process.env.STUDIOGRAPH_MCP_TOKEN?.trim();
+    if (!token)
+        return null;
+    return authService.verifyApiToken(token) ?? authService.verifyToken(token);
+}
 //# sourceMappingURL=server.js.map

package/dist/mcp/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,gBAAkC;IACrE,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC;QAC3B,IAAI,EAAK,aAAa;QACtB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IAEH,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAC7C,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEhC,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAE9C,4EAA4E;IAC5E,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGjF,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,gBAAkC,EAClC,WAAwB;IAExB,MAAM,IAAI,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,uDAAuD;YACvD,0BAA0B;YAC1B,mDAAmD;YACnD,iDAAiD;YACjD,sCAAsC;YACtC,2CAA2C;YAC3C,iFAAiF,CAClF,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC;QAC3B,IAAI,EAAK,aAAa;QACtB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IAEH,aAAa,CAAC,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAC7C,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEhC,GAAG,CAAC,KAAK,CAAC,uCAAuC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IAEhE,4EAA4E;IAC5E,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAwB;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC;IACxD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC7E,CAAC"}

package/dist/mcp/state-signer.d.ts

@@ -0,0 +1,62 @@
+/**
+ * OAuth state signer
+ *
+ * Signs the `state` parameter on outbound OAuth flows so the server can prove,
+ * on callback/claim, that the userId + connector + origin it sees were minted
+ * by this instance — not forged by an attacker controlling a callback URL.
+ *
+ * Without integrity protection on `state`, an attacker who controls a
+ * `/api/oauth/callback/:name` or `/api/oauth/claim/:connector` URL can
+ * forge `{c, u, o}` to bind their own OAuth tokens against a victim's
+ * userId. This module closes that gap.
+ *
+ * Signing key is derived from the workspace master key via HKDF
+ * (info="studiograph-oauth-state-v1") so it's distinct from the AEAD key
+ * used for at-rest encryption — a leak of one doesn't compromise the other.
+ *
+ * The serialized state is a base64url-encoded JSON object:
+ *   { c, u, o, t, s }
+ * where `s` is the base64url HMAC-SHA256 over the canonical message
+ * (a JSON array of [c, u, o, t]). The OAuth broker continues to decode
+ * `c`, `u`, `o` from this JSON unchanged — adding `t` and `s` is forward-
+ * compatible.
+ */
+export interface OAuthStateClaims {
+    connectorName: string;
+    userId: number;
+    origin: string;
+}
+export interface OAuthStateSigner {
+    sign(claims: OAuthStateClaims): string;
+    verify(state: string, opts?: {
+        maxAgeMs?: number;
+    }): OAuthStateClaims | null;
+}
+/**
+ * Derive a 32-byte signing key from the workspace master key. The `info`
+ * binding ensures this key is domain-separated from the AEAD key used to
+ * encrypt secrets at rest.
+ */
+export declare function deriveStateSigningKey(masterKey: Uint8Array): Uint8Array;
+export declare function createOAuthStateSigner(key: Uint8Array): OAuthStateSigner;
+export interface PayloadSigner {
+    sign(payload: Record<string, unknown>): string;
+    verify(token: string, opts?: {
+        maxAgeMs?: number;
+    }): Record<string, unknown> | null;
+}
+/**
+ * Derive the consent signing key from the JWT secret via HKDF. Domain-separated
+ * from session JWTs (different mechanism entirely) and from the outbound state
+ * signer (different `info`). Keying off the JWT secret — rather than the master
+ * key — means the authorization server works on every boot, including
+ * non-encrypted/test boots where no master key is wired.
+ */
+export declare function deriveConsentSigningKey(jwtSecret: string): Uint8Array;
+/**
+ * Generic HMAC payload signer: serializes `{ p: <payload>, t: <ts> }`, signs
+ * the canonical JSON with HMAC-SHA256, and base64url-encodes the blob. `verify`
+ * recomputes the HMAC with `timingSafeEqual`, enforces a max age, and rejects
+ * future-dated tokens. Returns the payload object on success, null otherwise.
+ */
+export declare function createConsentSigner(key: Uint8Array): PayloadSigner;