rivet-design 0.10.7 → 0.10.9

package/dist/mcp/auth/tools.js.map

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

package/dist/mcp/httpServer.d.ts

@@ -0,0 +1,36 @@
+import type { Server } from 'http';
+import express from 'express';
+import { RivetOAuthServerProvider } from './auth/httpOAuthProvider';
+import { type RivetMcpHandle } from './server';
+export declare const DEFAULT_MCP_HTTP_PORT = 5891;
+export declare const MCP_HTTP_PATH = "/mcp";
+export declare const OAUTH_CALLBACK_COMPLETE_PATH = "/oauth/callback/complete";
+export type McpHttpAppOptions = {
+    /** Public base URL of this server (issuer), e.g. http://127.0.0.1:5891 */
+    baseUrl: URL;
+    provider: RivetOAuthServerProvider;
+    /** Builds the MCP server lazily on the first initialize request. */
+    createMcp: () => RivetMcpHandle;
+};
+/**
+ * Creates the Express app exposing the Rivet MCP server over streamable HTTP
+ * with native MCP OAuth support:
+ * - `/.well-known/oauth-protected-resource/mcp` + `/.well-known/oauth-authorization-server`
+ * - `/authorize`, `/token`, `/register` (dynamic client registration)
+ * - `/oauth/callback` browser landing page for the proxy Google flow
+ * - `/mcp` streamable HTTP endpoint guarded by bearer auth (401 +
+ *   WWW-Authenticate with resource metadata when unauthenticated)
+ */
+export declare const createMcpHttpApp: (options: McpHttpAppOptions) => express.Express;
+export type StartMCPServerHttpOptions = {
+    port?: number;
+    mcpEditor?: string;
+};
+/**
+ * Starts the Rivet MCP server over streamable HTTP on localhost so MCP
+ * clients that implement the MCP OAuth authorization spec (Cursor, Claude,
+ * Codex) can offer their native "Connect" sign-in flow. Completed logins
+ * persist credentials via ConfigManager, the same store the stdio mode uses.
+ */
+export declare const startMCPServerHttp: (options?: StartMCPServerHttpOptions) => Promise<Server>;
+//# sourceMappingURL=httpServer.d.ts.map

package/dist/mcp/httpServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../../src/mcp/httpServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,OAAwC,MAAM,SAAS,CAAC;AAQ/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAW/D,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,4BAA4B,6BAA6B,CAAC;AA+EvE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,0EAA0E;IAC1E,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,wBAAwB,CAAC;IACnC,oEAAoE;IACpE,SAAS,EAAE,MAAM,cAAc,CAAC;CACjC,CAAC;AAuBF;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,iBAAiB,KAAG,OAAO,CAAC,OAiLrE,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,UAAS,yBAA8B,KACtC,OAAO,CAAC,MAAM,CA6ChB,CAAC"}

package/dist/mcp/httpServer.js

@@ -0,0 +1,307 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startMCPServerHttp = exports.createMcpHttpApp = exports.OAUTH_CALLBACK_COMPLETE_PATH = exports.MCP_HTTP_PATH = exports.DEFAULT_MCP_HTTP_PORT = void 0;
+const crypto_1 = require("crypto");
+const express_1 = __importDefault(require("express"));
+const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
+const router_js_1 = require("@modelcontextprotocol/sdk/server/auth/router.js");
+const bearerAuth_js_1 = require("@modelcontextprotocol/sdk/server/auth/middleware/bearerAuth.js");
+const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
+const httpOAuthProvider_1 = require("./auth/httpOAuthProvider");
+const server_1 = require("./server");
+const ConfigManager_1 = require("../services/ConfigManager");
+const RequestAuthContext_1 = require("../services/RequestAuthContext");
+const logger_1 = require("../utils/logger");
+const skillWriter_1 = require("../utils/skillWriter");
+const log = (0, logger_1.createLogger)('mcp-http');
+exports.DEFAULT_MCP_HTTP_PORT = 5891;
+exports.MCP_HTTP_PATH = '/mcp';
+exports.OAUTH_CALLBACK_COMPLETE_PATH = '/oauth/callback/complete';
+const MCP_OAUTH_SCOPE = 'rivet';
+const MCP_HTTP_HOST = '127.0.0.1';
+/**
+ * Browser page served at `/` as the OAuth callback. The proxy only accepts
+ * bare localhost origins as `redirectOrigin` (no custom paths), so it
+ * redirects the browser to `/?session=` with the Supabase tokens in the URL
+ * hash; this page forwards them to the local server, which finishes the
+ * login and replies with the MCP client's redirect URL (carrying the
+ * authorization code) to navigate to.
+ */
+const getOAuthCallbackHtml = (completePath) => `<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Rivet authentication</title>
+    <style>
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: grid;
+        place-items: center;
+        font-family: system-ui, sans-serif;
+        background: #0b0b0f;
+        color: #fff;
+      }
+      main {
+        max-width: 420px;
+        padding: 32px;
+        text-align: center;
+      }
+    </style>
+  </head>
+  <body>
+    <main>
+      <h1>Finishing Rivet sign in...</h1>
+      <p>You will be sent back to your editor automatically.</p>
+    </main>
+    <script>
+      const params = new URLSearchParams(window.location.search);
+      const hash = new URLSearchParams(window.location.hash.slice(1));
+      if (!params.get('session') || !hash.get('access_token')) {
+        document.querySelector('h1').textContent = 'Rivet MCP server is running';
+        document.querySelector('p').textContent =
+          'Connect from your MCP client (e.g. Cursor) to sign in.';
+        throw new Error('Not an OAuth callback');
+      }
+      if (window.location.hash) {
+        window.history.replaceState(
+          null,
+          document.title,
+          window.location.pathname + window.location.search
+        );
+      }
+      fetch('${completePath}', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          sessionId: params.get('session'),
+          accessToken: hash.get('access_token'),
+          refreshToken: hash.get('refresh_token')
+        })
+      }).then(async (response) => {
+        const result = await response.json().catch(() => null);
+        if (response.ok && result && result.redirectUrl) {
+          document.querySelector('h1').textContent = 'Rivet sign in complete';
+          window.location.replace(result.redirectUrl);
+        } else {
+          document.querySelector('h1').textContent = 'Rivet sign in failed';
+        }
+      }).catch(() => {
+        document.querySelector('h1').textContent = 'Rivet sign in failed';
+      });
+    </script>
+  </body>
+</html>`;
+const getAuthExtraString = (req, key) => {
+    const value = req.auth?.extra?.[key];
+    return typeof value === 'string' ? value : undefined;
+};
+/** Builds the request-scoped credentials used by services during MCP tools. */
+const getRequestAuthContextValue = (req) => ({
+    token: req.auth?.token,
+    refreshToken: getAuthExtraString(req, 'refreshToken'),
+    email: getAuthExtraString(req, 'email'),
+    userId: getAuthExtraString(req, 'userId'),
+});
+/** Handles an MCP request with bearer credentials isolated to this request. */
+const handleMcpRequestWithAuthContext = (req, callback) => {
+    return (0, RequestAuthContext_1.runWithRequestAuthContext)(getRequestAuthContextValue(req), callback);
+};
+/**
+ * Creates the Express app exposing the Rivet MCP server over streamable HTTP
+ * with native MCP OAuth support:
+ * - `/.well-known/oauth-protected-resource/mcp` + `/.well-known/oauth-authorization-server`
+ * - `/authorize`, `/token`, `/register` (dynamic client registration)
+ * - `/oauth/callback` browser landing page for the proxy Google flow
+ * - `/mcp` streamable HTTP endpoint guarded by bearer auth (401 +
+ *   WWW-Authenticate with resource metadata when unauthenticated)
+ */
+const createMcpHttpApp = (options) => {
+    const { baseUrl, provider, createMcp } = options;
+    const mcpUrl = new URL(exports.MCP_HTTP_PATH, baseUrl);
+    const app = (0, express_1.default)();
+    app.use(express_1.default.json());
+    app.use((0, router_js_1.mcpAuthRouter)({
+        provider,
+        issuerUrl: baseUrl,
+        resourceServerUrl: mcpUrl,
+        resourceName: 'Rivet',
+        scopesSupported: [MCP_OAUTH_SCOPE],
+    }));
+    app.get('/', (_req, res) => {
+        res
+            .status(200)
+            .type('html')
+            .send(getOAuthCallbackHtml(exports.OAUTH_CALLBACK_COMPLETE_PATH));
+    });
+    app.post(exports.OAUTH_CALLBACK_COMPLETE_PATH, async (req, res) => {
+        try {
+            const { redirectUrl } = await provider.completeBrowserCallback(req.body ?? {});
+            res.json({ success: true, redirectUrl });
+        }
+        catch (error) {
+            log.warn('OAuth callback completion failed:', error);
+            res.status(400).json({
+                success: false,
+                error: error instanceof Error ? error.message : 'Authentication failed',
+            });
+        }
+    });
+    const bearerAuth = (0, bearerAuth_js_1.requireBearerAuth)({
+        verifier: provider,
+        resourceMetadataUrl: (0, router_js_1.getOAuthProtectedResourceMetadataUrl)(mcpUrl),
+    });
+    // The Rivet MCP server holds long-lived session state (visual editor
+    // bridge, telemetry), so a single instance is shared across MCP sessions:
+    // a new initialize request closes the previous session's transport and
+    // reconnects the server to the new one.
+    let mcpHandle = null;
+    const transports = new Map();
+    let initializeRequestChain = Promise.resolve();
+    let activeSessionPostRequestCount = 0;
+    const activeSessionPostRequestIdleResolvers = new Set();
+    /** Waits until active MCP tool/resource POST requests have finished. */
+    const waitForActiveSessionPostRequests = () => {
+        if (activeSessionPostRequestCount === 0) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve) => {
+            activeSessionPostRequestIdleResolvers.add(resolve);
+        });
+    };
+    /** Tracks active session POSTs so reconnects do not close in-flight work. */
+    const handleActiveSessionPostRequest = async (req, callback) => {
+        if (req.method !== 'POST') {
+            await callback();
+            return;
+        }
+        activeSessionPostRequestCount += 1;
+        try {
+            await callback();
+        }
+        finally {
+            activeSessionPostRequestCount -= 1;
+            if (activeSessionPostRequestCount === 0) {
+                for (const resolve of activeSessionPostRequestIdleResolvers) {
+                    resolve();
+                }
+                activeSessionPostRequestIdleResolvers.clear();
+            }
+        }
+    };
+    app.all(exports.MCP_HTTP_PATH, bearerAuth, async (req, res) => {
+        try {
+            const sessionId = req.headers['mcp-session-id'];
+            const existingTransport = sessionId
+                ? transports.get(sessionId)
+                : undefined;
+            if (existingTransport) {
+                await handleActiveSessionPostRequest(req, () => handleMcpRequestWithAuthContext(req, () => existingTransport.handleRequest(req, res, req.body)));
+                return;
+            }
+            if (req.method === 'POST' && (0, types_js_1.isInitializeRequest)(req.body)) {
+                const handleInitializeRequest = async () => {
+                    await waitForActiveSessionPostRequests();
+                    for (const transport of transports.values()) {
+                        await transport.close();
+                    }
+                    transports.clear();
+                    if (!mcpHandle) {
+                        mcpHandle = createMcp();
+                    }
+                    else {
+                        await mcpHandle.closeActiveSession();
+                    }
+                    const transport = new streamableHttp_js_1.StreamableHTTPServerTransport({
+                        sessionIdGenerator: () => (0, crypto_1.randomUUID)(),
+                        onsessioninitialized: (newSessionId) => {
+                            transports.set(newSessionId, transport);
+                        },
+                    });
+                    await mcpHandle.mcp.connect(transport);
+                    // Protocol.connect installs its own onclose; chain ours after it so
+                    // closed sessions drop out of the transport map.
+                    const protocolOnClose = transport.onclose;
+                    transport.onclose = () => {
+                        const closedSessionId = transport.sessionId;
+                        if (closedSessionId) {
+                            transports.delete(closedSessionId);
+                        }
+                        protocolOnClose?.();
+                    };
+                    await handleMcpRequestWithAuthContext(req, () => transport.handleRequest(req, res, req.body));
+                };
+                const initializeRequest = initializeRequestChain.then(handleInitializeRequest, handleInitializeRequest);
+                initializeRequestChain = initializeRequest.catch(() => undefined);
+                await initializeRequest;
+                return;
+            }
+            res.status(400).json({
+                jsonrpc: '2.0',
+                error: {
+                    code: -32000,
+                    message: 'Bad Request: No valid session ID provided',
+                },
+                id: null,
+            });
+        }
+        catch (error) {
+            log.warn('MCP HTTP request failed:', error);
+            if (!res.headersSent) {
+                res.status(500).json({
+                    jsonrpc: '2.0',
+                    error: { code: -32603, message: 'Internal server error' },
+                    id: null,
+                });
+            }
+        }
+    });
+    return app;
+};
+exports.createMcpHttpApp = createMcpHttpApp;
+/**
+ * Starts the Rivet MCP server over streamable HTTP on localhost so MCP
+ * clients that implement the MCP OAuth authorization spec (Cursor, Claude,
+ * Codex) can offer their native "Connect" sign-in flow. Completed logins
+ * persist credentials via ConfigManager, the same store the stdio mode uses.
+ */
+const startMCPServerHttp = async (options = {}) => {
+    (0, logger_1.setLogLevel)(process.env.RIVET_LOG_LEVEL ?? 'INFO');
+    const port = options.port ?? exports.DEFAULT_MCP_HTTP_PORT;
+    const baseUrl = new URL(`http://${MCP_HTTP_HOST}:${port}`);
+    const configManager = (0, ConfigManager_1.getConfigManager)();
+    if (options.mcpEditor === 'claude' || options.mcpEditor === undefined) {
+        (0, skillWriter_1.writeSkillFileIfNeeded)();
+    }
+    const provider = new httpOAuthProvider_1.RivetOAuthServerProvider({
+        proxyUrl: configManager.getProxyUrl(),
+        // The proxy only accepts bare localhost origins; the callback page is
+        // served at `/`.
+        callbackUrl: baseUrl.origin,
+        mcpEditor: options.mcpEditor,
+        persistTokens: ({ token, refreshToken, user }) => {
+            configManager.setAuth(token, user?.email ?? configManager.getEmail() ?? '', refreshToken, user?.id);
+        },
+        isRefreshTokenCurrent: (refreshToken) => configManager.getRefreshToken() === refreshToken,
+    });
+    const app = (0, exports.createMcpHttpApp)({
+        baseUrl,
+        provider,
+        createMcp: () => (0, server_1.createRivetMcp)({
+            mcpEditor: options.mcpEditor,
+            revokeBearerToken: (token) => provider.revokeAccessToken(token),
+        }),
+    });
+    const server = await new Promise((resolve, reject) => {
+        const listening = app.listen(port, MCP_HTTP_HOST, () => resolve(listening));
+        listening.on('error', reject);
+    });
+    log.info(`Rivet MCP server (streamable HTTP) listening at ${baseUrl.href.replace(/\/$/, '')}${exports.MCP_HTTP_PATH}`);
+    return server;
+};
+exports.startMCPServerHttp = startMCPServerHttp;
+//# sourceMappingURL=httpServer.js.map

package/dist/mcp/httpServer.js.map

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

package/dist/mcp/server.d.ts

@@ -1,3 +1,4 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { type ImageContent } from './changeBatchClassification';
 import type { ChangeRequest, StaticPreviewChangeTarget } from '../types/change-request-types';
 /**
@@ -33,6 +34,22 @@ export declare const buildMixedVariantBatchResponse: (rejectedRequest: ChangeReq
 export declare const buildVariantRequestBatchResponse: (consumedRequest: ChangeRequest | null | undefined) => MCPChangeResponse;
 export declare const collectStaticPreviewRefineTargetInstructions: (request: ChangeRequest) => StaticPreviewRefineTargetInstruction[];
 export declare const buildStaticPreviewRefineResponse: (consumedRequest: ChangeRequest | null | undefined) => MCPChangeResponse;
+export type RivetMcpHandle = {
+    mcp: McpServer;
+    closeActiveSession: () => Promise<void>;
+    shutdown: () => Promise<void>;
+};
+export type RivetMcpOptions = {
+    mcpEditor?: string;
+    revokeBearerToken?: (token: string) => void;
+};
+/**
+ * Builds the fully configured Rivet MCP server (tools, auth gating, session
+ * bridge, telemetry) without binding it to a transport. Shared by the stdio
+ * and streamable-HTTP entry points. Call at most once per process: it
+ * registers process-level signal handlers for resource cleanup.
+ */
+export declare const createRivetMcp: (options?: RivetMcpOptions) => RivetMcpHandle;
 export declare const startMCPServer: (mcpEditor?: string) => Promise<void>;
 export {};
 //# sourceMappingURL=server.d.ts.map

package/dist/mcp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AA0CA,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,aAAa,EAEb,yBAAyB,EAC1B,MAAM,+BAA+B,CAAC;AA0FvC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,QAAQ;IAChD,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,KAAG,CAAC,MAAM,IAAI,CAyBd,CAAC;AAgXF,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAC9D,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,KAAK,oCAAoC,GAAG;IAC1C,MAAM,EAAE,yBAAyB,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAeF,eAAO,MAAM,8BAA8B,GACzC,iBAAiB,aAAa,GAAG,IAAI,GAAG,SAAS,KAChD,eAmBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,iBAAiB,aAAa,GAAG,IAAI,GAAG,SAAS,KAChD,iBAqBF,CAAC;AAWF,eAAO,MAAM,4CAA4C,GACvD,SAAS,aAAa,KACrB,oCAAoC,EAqBtC,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,iBAAiB,aAAa,GAAG,IAAI,GAAG,SAAS,KAChD,iBA0BF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAU,YAAY,MAAM,KAAG,OAAO,CAAC,IAAI,CAswCrE,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA8CpE,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,aAAa,EAEb,yBAAyB,EAC1B,MAAM,+BAA+B,CAAC;AA0FvC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,QAAQ;IAChD,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,KAAG,CAAC,MAAM,IAAI,CAyBd,CAAC;AA+WF,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAC9D,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF,KAAK,oCAAoC,GAAG;IAC1C,MAAM,EAAE,yBAAyB,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAeF,eAAO,MAAM,8BAA8B,GACzC,iBAAiB,aAAa,GAAG,IAAI,GAAG,SAAS,KAChD,eAmBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,iBAAiB,aAAa,GAAG,IAAI,GAAG,SAAS,KAChD,iBAqBF,CAAC;AAWF,eAAO,MAAM,4CAA4C,GACvD,SAAS,aAAa,KACrB,oCAAoC,EAqBtC,CAAC;AAEF,eAAO,MAAM,gCAAgC,GAC3C,iBAAiB,aAAa,GAAG,IAAI,GAAG,SAAS,KAChD,iBA0BF,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,SAAS,CAAC;IACf,kBAAkB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GACzB,UAAU,eAAe,KACxB,cA2vCF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAU,YAAY,MAAM,KAAG,OAAO,CAAC,IAAI,CAgCrE,CAAC"}

package/dist/mcp/server.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startMCPServer = exports.buildStaticPreviewRefineResponse = exports.collectStaticPreviewRefineTargetInstructions = exports.buildVariantRequestBatchResponse = exports.buildMixedVariantBatchResponse = exports.startParentProcessMonitor = void 0;
+exports.startMCPServer = exports.createRivetMcp = exports.buildStaticPreviewRefineResponse = exports.collectStaticPreviewRefineTargetInstructions = exports.buildVariantRequestBatchResponse = exports.buildMixedVariantBatchResponse = exports.startParentProcessMonitor = void 0;
 const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const v3_1 = require("zod/v3");
@@ -357,18 +357,18 @@ const APPLY_GUIDE = 'Read each file in sourceFiles, then apply every change in t
     'chat: interpret the free-text instruction in the "instruction" field and apply appropriate code changes across any file in the project. ' +
     'variant: a user-picked variant from the agent-variants flow. ' +
     'Variant protocol reminder: source_research (if present) -> report_source_context -> brief approval -> generation -> user commit. ' +
-    'variant.payload.kind=diff-applied: the server has already `git apply`d the unified diff to the user\'s working tree (uncommitted). DO NOT re-apply — acknowledge the variant and let the user review. ' +
+    "variant.payload.kind=diff-applied: the server has already `git apply`d the unified diff to the user's working tree (uncommitted). DO NOT re-apply — acknowledge the variant and let the user review. " +
     'variant.payload.kind=diff (legacy): apply the unified diff in payload.diff against the project root via `git apply` (no manual edits). ' +
     'variant.payload.kind=project-created: the project has already been materialized at destinationPath and git-committed by the server. Optionally run `npm install` in destinationPath and continue from there — no further file operations are required for the pick itself. ' +
     'For elements with empty filePaths, search the codebase by className or xpath. ' +
     'If a change has imageCount > 0, the corresponding reference images appear as image content items immediately following this text in the tool result — view them before making changes. ' +
-    'IMPORTANT — variantRequest branch: if a comment item carries `variantRequest: { count }`, do NOT edit any files. Instead, derive `target` from the comment\'s `element` using this priority: ' +
+    "IMPORTANT — variantRequest branch: if a comment item carries `variantRequest: { count }`, do NOT edit any files. Instead, derive `target` from the comment's `element` using this priority: " +
     '(a) prefer `{ type: "file", ref: filePaths[0] }` when `filePaths.length === 1`; otherwise ' +
     '(b) `rivetId` → `{ type: "element", ref: \'[data-rivet-id="<rivetId>"]\' }`, then ' +
     '(c) `id` (no whitespace) → `{ type: "element", ref: "#<id>" }`, then ' +
     '(d) `xpath` → `{ type: "element", ref: "<xpath>" }`, then ' +
     '(e) single-token `className` → `{ type: "element", ref: ".<token>" }`. ' +
-    'Then call `propose_variants` with `{ prompt: instruction, count: variantRequest.count, target, projectContext }` and follow the full variants lifecycle: `report_variant_briefs` → `approve_variant_briefs` (only after explicit user confirmation; pass `confirmedByUser: true`) → `continue_variants` → `report_variant_complete`. ' +
+    'Then call `start_variants` with `{ mode: "existing", prompt: instruction, count: variantRequest.count, target }`. Do NOT use the older `propose_variants` chain for this path. `start_variants` returns leased work items; generate each variant in its worktree, call `report_variant_complete` for each leased item, then wait for the user to pick and call `commit_variant`. ' +
     'CRITICAL WORKFLOW: 1. Call get_pending_changes with a message sharing your brief plan. 2. Edit the files. 3. Call get_pending_changes with a message summarizing what you changed and refresh_git: true so the Rivet UI updates. 4. STOP and let the user know their changes have been applied.';
 /**
  * Prefix added to the apply guide when a batch targets a specific variant. The
@@ -392,14 +392,13 @@ const requestHasResolvedReferences = (request) => request.changes.some((c) => c.
     c.resolvedReferences.length > 0);
 const VARIANT_REQUEST_GUIDE = 'This batch is a Rivet variant request — do NOT edit files directly. ' +
     'The pending change is a single CommentChangeItem with `variantRequest.count`. ' +
-    'Derive the `propose_variants.target` from the comment\'s `element` using this priority: ' +
+    "Derive the structured `start_variants.target` from the comment's `element` using this priority: " +
     '(a) `{ type: "file", ref: filePaths[0] }` when `filePaths.length === 1`; otherwise ' +
-    '(b) `rivetId` → `[data-rivet-id="<rivetId>"]`, then ' +
-    '(c) `id` (no whitespace) → `#<id>`, then ' +
-    '(d) `xpath` → `<xpath>`, then ' +
-    '(e) single-token `className` → `.<token>`. ' +
-    'Then call `propose_variants` with `{ prompt: instruction, count: variantRequest.count, target, projectContext }` and follow the full variants lifecycle: ' +
-    '`report_variant_briefs` → `approve_variant_briefs` (only after explicit user confirmation; pass `confirmedByUser: true`) → `continue_variants` → `report_variant_complete`. ' +
+    '(b) `{ type: "selector", ref: `[data-rivet-id="${rivetId}"]` }` when `rivetId` is present, then ' +
+    '(c) `{ type: "selector", ref: `#${id}` }` when `id` has no whitespace, then ' +
+    '(d) `{ type: "selector", ref: xpath }`, then ' +
+    '(e) `{ type: "selector", ref: `.${token}` }` for a single-token `className`. ' +
+    'Then call `start_variants` with `{ mode: "existing", prompt: instruction, count: variantRequest.count, target }`. Do NOT use the older `propose_variants` chain for this path. `start_variants` returns leased work items; generate each variant in its worktree and call `report_variant_complete` for each leased item. ' +
     'After the user picks a variant via `commit_variant`, STOP and tell the user their variant has been committed.';
 const VARIANT_MIXED_BATCH_GUIDE = 'Mixed batch rejected: a `variantRequest` comment must be the only item in its batch. ' +
     'Ask the user to send the variant request on its own (clear other pending changes first) and retry.';
@@ -512,21 +511,14 @@ const buildStaticPreviewRefineResponse = (consumedRequest) => {
     };
 };
 exports.buildStaticPreviewRefineResponse = buildStaticPreviewRefineResponse;
-const startMCPServer = async (mcpEditor) => {
-    // Default silent so MCP transport stays clean; opt in via env for debugging
-    // (e.g. `RIVET_LOG_LEVEL=debug` in the MCP client's env block).
-    (0, index_core_1.setLogLevel)(process.env.RIVET_LOG_LEVEL ?? 'SILENT');
-    // Refresh the Claude skill at startup — NOT only after a successful
-    // open_visual_editor (the other call sites below). Otherwise stale guidance
-    // that refuses an action deadlocks: e.g. a v22 skill that won't open an empty
-    // folder means open_visual_editor never runs, so the skill never rewrites,
-    // so the agent keeps refusing forever. Writing on boot guarantees the agent
-    // loads current guidance on its next turn. Idempotent + version-gated.
-    // (Cursor rules stay post-open: they're project-scoped and the project path
-    // isn't known until the editor opens.)
-    if (mcpEditor === 'claude' || mcpEditor === undefined) {
-        (0, skillWriter_1.writeSkillFileIfNeeded)();
-    }
+/**
+ * Builds the fully configured Rivet MCP server (tools, auth gating, session
+ * bridge, telemetry) without binding it to a transport. Shared by the stdio
+ * and streamable-HTTP entry points. Call at most once per process: it
+ * registers process-level signal handlers for resource cleanup.
+ */
+const createRivetMcp = (options) => {
+    const { mcpEditor, revokeBearerToken } = options ?? {};
     const sendButtonLabel = getSendButtonLabel(mcpEditor);
     const bridge = new SessionBridgeService_1.SessionBridgeService();
     const telemetry = new TelemetryService_1.TelemetryService({
@@ -925,7 +917,7 @@ const startMCPServer = async (mcpEditor) => {
             ],
         };
     });
-    guardedMcp.tool('open_visual_editor', "Start a Rivet visual editing session. Call detect_project first to get the framework. If the response has opened: false, follow the nextStep/nextAction instructions to recover. Once opened, follow the next_step instructions exactly.", openEditorArgs, async (args) => {
+    guardedMcp.tool('open_visual_editor', 'Start a Rivet visual editing session. Call detect_project first to get the framework. If the response has opened: false, follow the nextStep/nextAction instructions to recover. Once opened, follow the next_step instructions exactly.', openEditorArgs, async (args) => {
         if (bridge.isActive()) {
             return {
                 content: [
@@ -1308,7 +1300,9 @@ const startMCPServer = async (mcpEditor) => {
                         startupModeSelection,
                         requestedStartupMode,
                         isGitEnabled: isGitEnabledForSession,
-                        next_step: mcpEditor === 'cursor' || mcpEditor === 'codex' || mcpEditor === 'claude-desktop'
+                        next_step: mcpEditor === 'cursor' ||
+                            mcpEditor === 'codex' ||
+                            mcpEditor === 'claude-desktop'
                             ? `Rivet is open. Tell the user: "Rivet is ready — make your visual changes and click '${sendButtonLabel}'." Then call watch_for_changes({ sessionId: "${sessionId}" }) to wait for their changes. After applying, STOP and ask the user if they want to keep watching or go back to normal prompting.`
                             : `Rivet is open. Tell the user: "Rivet is ready — make your visual changes and click '${sendButtonLabel}'."
 
@@ -1555,8 +1549,35 @@ If the Monitor tool is not available, call watch_for_changes({ sessionId: "${ses
         integrationsClient,
     });
     (0, tools_2.registerIntegrationsTools)(guardedMcp, { integrationsClient });
-    (0, tools_1.registerAuthTools)(mcp, { authService, telemetry, mcpEditor });
+    (0, tools_1.registerAuthTools)(mcp, {
+        authService,
+        telemetry,
+        mcpEditor,
+        revokeBearerToken,
+    });
     log.info('agent-variants + integrations + auth MCP tools registered');
+    const closeActiveSession = async () => {
+        await cleanupSessionResources({ trackSessionEnd: true });
+    };
+    return { mcp, closeActiveSession, shutdown };
+};
+exports.createRivetMcp = createRivetMcp;
+const startMCPServer = async (mcpEditor) => {
+    // Default silent so MCP transport stays clean; opt in via env for debugging
+    // (e.g. `RIVET_LOG_LEVEL=debug` in the MCP client's env block).
+    (0, index_core_1.setLogLevel)(process.env.RIVET_LOG_LEVEL ?? 'SILENT');
+    // Refresh the Claude skill at startup — NOT only after a successful
+    // open_visual_editor (the other call sites below). Otherwise stale guidance
+    // that refuses an action deadlocks: e.g. a v22 skill that won't open an empty
+    // folder means open_visual_editor never runs, so the skill never rewrites,
+    // so the agent keeps refusing forever. Writing on boot guarantees the agent
+    // loads current guidance on its next turn. Idempotent + version-gated.
+    // (Cursor rules stay post-open: they're project-scoped and the project path
+    // isn't known until the editor opens.)
+    if (mcpEditor === 'claude' || mcpEditor === undefined) {
+        (0, skillWriter_1.writeSkillFileIfNeeded)();
+    }
+    const { mcp } = (0, exports.createRivetMcp)({ mcpEditor });
     // Connect via stdio
     const transport = new stdio_js_1.StdioServerTransport();
     await mcp.connect(transport);