rivet-design 0.10.7 → 0.10.9

package/dist/index.d.ts

@@ -1,5 +1,8 @@
+import { ProjectDetectionService } from './index-core';
 import { TerminalAgentRunner, type EmbeddedAgentKind } from './services/TerminalAgentRunner';
+import { SessionBridgeService } from './services/SessionBridgeService';
 import type { Framework } from './services/ProjectDetectionService';
+import { DevServerRuntimeService, type StartDevServerResult } from './services/DevServerRuntimeService';
 export type CLIOptions = {
     userPort?: number;
     rivetPort?: number;
@@ -31,20 +34,62 @@ export type CLIOptions = {
 export declare const DEFAULT_PORT = 4000;
 export declare const DEFAULT_USER_PORT = 3000;
 type AgentDevServerContext = {
-    ownership: 'external' | 'none';
+    ownership: 'external' | 'none' | 'rivet_owned';
     host: string | null;
     port: number | null;
-    startedByRivet: false;
+    startedByRivet: boolean;
+};
+type AgentDevServerHealth = AgentDevServerContext & {
+    isReachable: boolean | null;
+    reason: 'healthy' | 'unknown';
+    lastCheckedAt: number | null;
 };
 type AgentDevServerContextOptions = {
     framework: Framework;
+    ownership?: AgentDevServerContext['ownership'];
     devServerHost?: string;
     userDevServerPort: number;
+    startedByRivet?: boolean;
 };
 /**
  * Builds the dev-server context advertised to the embedded agent UI.
  */
-export declare const buildAgentDevServerContext: ({ framework, devServerHost, userDevServerPort, }: AgentDevServerContextOptions) => AgentDevServerContext;
+export declare const buildAgentDevServerContext: ({ framework, ownership, devServerHost, userDevServerPort, startedByRivet, }: AgentDevServerContextOptions) => AgentDevServerContext;
+type AgentProject = {
+    id: string;
+    path: string;
+    devServerPort: number;
+    devServerHost?: string;
+    status: 'detected' | 'connected' | 'error';
+    packageManager: 'npm' | 'yarn' | 'pnpm';
+    framework: Framework;
+    entryPoint?: string;
+};
+type AgentDevServerResolution = {
+    project: AgentProject;
+    userDevServerPort: number;
+    devServerContext: AgentDevServerContext;
+    cleanup?: () => Promise<void>;
+    ownedProcess?: Extract<StartDevServerResult, {
+        success: true;
+    }>['process'];
+};
+type AgentDevServerResolverOptions = {
+    projectPath: string;
+    options: Pick<CLIOptions, 'framework' | 'entry' | 'userPort'>;
+    detection?: Pick<ProjectDetectionService, 'detectProject' | 'detectFramework' | 'detectPackageManager' | 'readConfiguredPort' | 'findRunningDevServer'>;
+    runtime?: DevServerRuntimeService;
+};
+/**
+ * Resolves the target app endpoint for embedded agent mode.
+ */
+export declare const resolveAgentDevServer: ({ projectPath, options, detection, runtime, }: AgentDevServerResolverOptions) => Promise<AgentDevServerResolution>;
+/** Builds the current preview server health state used by variant preview routing. */
+export declare const buildAgentDevServerHealth: (context: AgentDevServerContext) => AgentDevServerHealth;
+/**
+ * Updates bridge health when the active owned app dev server exits.
+ */
+export declare const updateOwnedDevServerHealthOnExit: (bridge: Pick<SessionBridgeService, "getDevServerHealth" | "isActive" | "updateDevServerHealth">, ownedDevServerPort: number | null) => void;
 /**
  * Returns whether embedded agent variants can be offered for this runtime.
  */
@@ -53,6 +98,12 @@ export declare const isAgentVariantsEnabled: (options: Pick<CLIOptions, "noGit">
  * @effect Stops active terminal agent processes before the CLI exits on OS signals.
  */
 export declare const registerAgentSignalHandlers: (runner: Pick<TerminalAgentRunner, "stopActiveRuns">) => void;
+/**
+ * @effect Sends a best-effort signal to an owned app dev server before process exit.
+ */
+export declare const registerOwnedDevServerSignalHandlers: (options: {
+    kill: (signal: NodeJS.Signals) => unknown;
+}) => void;
 export declare const main: (args?: string[]) => Promise<void>;
 export declare const parseArgs: (args: string[]) => CLIOptions;
 export {};

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,mBAAmB,EAEnB,KAAK,iBAAiB,EACvB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AASpE,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,UAAU,GAAG,MAAM,CAAC;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,cAAc,EAAE,KAAK,CAAC;CACvB,CAAC;AAEF,KAAK,4BAA4B,GAAG;IAClC,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GAAI,kDAIxC,4BAA4B,KAAG,qBAgBjC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,SAAS,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,KACjC,OAAyB,CAAC;AAE7B;;GAEG;AACH,eAAO,MAAM,2BAA2B,GACtC,QAAQ,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,KAClD,IAIF,CAAC;AAgBF,eAAO,MAAM,IAAI,GACf,OAAM,MAAM,EAA0B,KACrC,OAAO,CAAC,IAAI,CA0Ud,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,KAAG,UA8K1C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseArgs = exports.main = exports.registerAgentSignalHandlers = exports.isAgentVariantsEnabled = exports.buildAgentDevServerContext = exports.DEFAULT_USER_PORT = exports.DEFAULT_PORT = void 0;
+exports.parseArgs = exports.main = exports.registerOwnedDevServerSignalHandlers = exports.registerAgentSignalHandlers = exports.isAgentVariantsEnabled = exports.updateOwnedDevServerHealthOnExit = exports.buildAgentDevServerHealth = exports.resolveAgentDevServer = exports.buildAgentDevServerContext = exports.DEFAULT_USER_PORT = exports.DEFAULT_PORT = void 0;
 /* eslint-disable no-console */
 const child_process_1 = require("child_process");
 const dotenv = __importStar(require("dotenv"));
@@ -51,18 +51,19 @@ const AgentSessionService_1 = require("./services/AgentSessionService");
 const TerminalAgentRunner_1 = require("./services/TerminalAgentRunner");
 const ConfigManager_1 = require("./services/ConfigManager");
 const SessionBridgeService_1 = require("./services/SessionBridgeService");
+const DevServerRuntimeService_1 = require("./services/DevServerRuntimeService");
 const TelemetryService_1 = require("./services/TelemetryService");
 const skillWriter_1 = require("./utils/skillWriter");
 const portUtils_1 = require("./utils/portUtils");
-const createAgentVariantsOrchestrator_1 = require("./services/createAgentVariantsOrchestrator");
-const InlineVariantGenerationService_1 = require("./services/InlineVariantGenerationService");
+const VariantsRuntime_1 = require("./services/VariantsRuntime");
+const VisualVariantAgentRunner_1 = require("./services/VisualVariantAgentRunner");
 const log = (0, index_core_1.createLogger)('RivetCLI');
 exports.DEFAULT_PORT = 4000;
 exports.DEFAULT_USER_PORT = 3000;
 /**
  * Builds the dev-server context advertised to the embedded agent UI.
  */
-const buildAgentDevServerContext = ({ framework, devServerHost, userDevServerPort, }) => {
+const buildAgentDevServerContext = ({ framework, ownership, devServerHost, userDevServerPort, startedByRivet, }) => {
     if (framework === 'static' || userDevServerPort === 0) {
         return {
             ownership: 'none',
@@ -72,13 +73,161 @@ const buildAgentDevServerContext = ({ framework, devServerHost, userDevServerPor
         };
     }
     return {
-        ownership: 'external',
+        ownership: ownership ?? 'external',
         host: devServerHost ?? 'localhost',
         port: userDevServerPort,
-        startedByRivet: false,
+        startedByRivet: startedByRivet ?? false,
     };
 };
 exports.buildAgentDevServerContext = buildAgentDevServerContext;
+/**
+ * Resolves the target app endpoint for embedded agent mode.
+ */
+const resolveAgentDevServer = async ({ projectPath, options, detection = new index_core_1.ProjectDetectionService(), runtime = (0, DevServerRuntimeService_1.createDevServerRuntimeService)(), }) => {
+    if (options.userPort) {
+        const framework = options.framework ?? 'nextjs';
+        const packageManager = await detection.detectPackageManager(projectPath);
+        const project = {
+            id: path_1.default.basename(projectPath),
+            framework,
+            path: projectPath,
+            devServerPort: options.userPort,
+            devServerHost: 'localhost',
+            status: 'detected',
+            packageManager,
+        };
+        return {
+            project,
+            userDevServerPort: options.userPort,
+            devServerContext: (0, exports.buildAgentDevServerContext)({
+                framework,
+                devServerHost: project.devServerHost,
+                userDevServerPort: options.userPort,
+            }),
+        };
+    }
+    try {
+        const project = (await detection.detectProject(projectPath, options.framework, options.entry, [], options.userPort));
+        const userDevServerPort = project.devServerPort;
+        return {
+            project,
+            userDevServerPort,
+            devServerContext: (0, exports.buildAgentDevServerContext)({
+                framework: project.framework,
+                devServerHost: project.devServerHost,
+                userDevServerPort,
+            }),
+        };
+    }
+    catch (error) {
+        const isNoServerError = error instanceof Error && error.message.includes('No running dev server');
+        if (!isNoServerError) {
+            throw error;
+        }
+    }
+    const framework = options.framework ?? detection.detectFramework(projectPath);
+    const packageManager = await detection.detectPackageManager(projectPath);
+    if (framework === 'static') {
+        const project = {
+            id: path_1.default.basename(projectPath),
+            framework,
+            path: projectPath,
+            devServerPort: 0,
+            devServerHost: 'localhost',
+            status: 'detected',
+            packageManager,
+            entryPoint: options.entry ?? 'index.html',
+        };
+        return {
+            project,
+            userDevServerPort: 0,
+            devServerContext: (0, exports.buildAgentDevServerContext)({
+                framework,
+                userDevServerPort: 0,
+            }),
+        };
+    }
+    const runningServer = await detection.findRunningDevServer(projectPath, []);
+    if (runningServer) {
+        const project = {
+            id: path_1.default.basename(projectPath),
+            framework,
+            path: projectPath,
+            devServerPort: runningServer.port,
+            devServerHost: runningServer.host,
+            status: 'detected',
+            packageManager,
+        };
+        return {
+            project,
+            userDevServerPort: runningServer.port,
+            devServerContext: (0, exports.buildAgentDevServerContext)({
+                framework,
+                devServerHost: runningServer.host,
+                userDevServerPort: runningServer.port,
+            }),
+        };
+    }
+    const preferredPort = detection.readConfiguredPort(projectPath) ??
+        (framework === 'vite' || framework === 'svelte' ? 5173 : exports.DEFAULT_USER_PORT);
+    const started = await runtime.start({
+        projectPath,
+        framework,
+        packageManager,
+        preferredPort,
+    });
+    if (!started.success) {
+        throw new Error(started.error);
+    }
+    const project = {
+        id: path_1.default.basename(projectPath),
+        framework,
+        path: projectPath,
+        devServerPort: started.port,
+        devServerHost: started.host,
+        status: 'detected',
+        packageManager,
+    };
+    return {
+        project,
+        userDevServerPort: started.port,
+        devServerContext: (0, exports.buildAgentDevServerContext)({
+            framework,
+            ownership: 'rivet_owned',
+            devServerHost: started.host,
+            userDevServerPort: started.port,
+            startedByRivet: true,
+        }),
+        cleanup: started.stop,
+        ownedProcess: started.process,
+    };
+};
+exports.resolveAgentDevServer = resolveAgentDevServer;
+/** Builds the current preview server health state used by variant preview routing. */
+const buildAgentDevServerHealth = (context) => ({
+    ...context,
+    isReachable: context.ownership === 'none' ? null : true,
+    reason: context.ownership === 'none' ? 'unknown' : 'healthy',
+    lastCheckedAt: Date.now(),
+});
+exports.buildAgentDevServerHealth = buildAgentDevServerHealth;
+/**
+ * Updates bridge health when the active owned app dev server exits.
+ */
+const updateOwnedDevServerHealthOnExit = (bridge, ownedDevServerPort) => {
+    const currentHealth = bridge.getDevServerHealth();
+    if (!bridge.isActive() ||
+        currentHealth.ownership !== 'rivet_owned' ||
+        currentHealth.port !== ownedDevServerPort) {
+        return;
+    }
+    bridge.updateDevServerHealth({
+        isReachable: false,
+        reason: 'upstream_unreachable',
+        lastCheckedAt: Date.now(),
+    });
+};
+exports.updateOwnedDevServerHealthOnExit = updateOwnedDevServerHealthOnExit;
 /**
  * Returns whether embedded agent variants can be offered for this runtime.
  */
@@ -93,6 +242,22 @@ const registerAgentSignalHandlers = (runner) => {
     process.prependOnceListener('SIGTERM', stopAgentChildren);
 };
 exports.registerAgentSignalHandlers = registerAgentSignalHandlers;
+/**
+ * @effect Sends a best-effort signal to an owned app dev server before process exit.
+ */
+const registerOwnedDevServerSignalHandlers = (options) => {
+    const stopOwnedDevServer = () => {
+        try {
+            options.kill('SIGTERM');
+        }
+        catch {
+            // The process may have already exited; async shutdown remains authoritative.
+        }
+    };
+    process.prependOnceListener('SIGINT', stopOwnedDevServer);
+    process.prependOnceListener('SIGTERM', stopOwnedDevServer);
+};
+exports.registerOwnedDevServerSignalHandlers = registerOwnedDevServerSignalHandlers;
 /** Host for production hosted tryout; aligns with `DEMO_PUBLIC_BASE_URL` on Render. */
 const DEMO_TRYOUT_PUBLIC_HOST = 'demo.rivet.design';
 const isDemoTryoutPublicBaseUrl = (url) => {
@@ -120,9 +285,25 @@ const main = async (args = process.argv.slice(2)) => {
             return;
         }
         if (command === 'mcp') {
-            const { startMCPServer } = await Promise.resolve().then(() => __importStar(require('./mcp/server')));
             const editorFlagIndex = args.indexOf('--editor');
             const mcpEditor = editorFlagIndex !== -1 ? args[editorFlagIndex + 1] : undefined;
+            if (args.includes('--http')) {
+                // Streamable HTTP + MCP OAuth so clients (Cursor/Claude/Codex) can
+                // offer their native "Connect" sign-in instead of the stdio login tool.
+                const { startMCPServerHttp } = await Promise.resolve().then(() => __importStar(require('./mcp/httpServer')));
+                const portFlagIndex = args.indexOf('--port');
+                const parsedPort = portFlagIndex !== -1
+                    ? Number.parseInt(args[portFlagIndex + 1] ?? '', 10)
+                    : Number.NaN;
+                await startMCPServerHttp({
+                    port: Number.isInteger(parsedPort) && parsedPort > 0
+                        ? parsedPort
+                        : undefined,
+                    mcpEditor,
+                });
+                return;
+            }
+            const { startMCPServer } = await Promise.resolve().then(() => __importStar(require('./mcp/server')));
             await startMCPServer(mcpEditor);
             return;
         }
@@ -238,6 +419,20 @@ const main = async (args = process.argv.slice(2)) => {
             debugMode: options.debug,
         });
         log.debug(`📡 Connecting to project dev server on port ${userDevServerPort}${options.userPort ? ' (user-specified)' : ' (detected)'}`);
+        const devServerContext = (0, exports.buildAgentDevServerContext)({
+            framework: project.framework,
+            devServerHost: project.devServerHost,
+            userDevServerPort,
+        });
+        const variantsRuntime = (0, exports.isAgentVariantsEnabled)(options)
+            ? (0, VariantsRuntime_1.createVariantsRuntime)({
+                projectPath,
+                telemetry,
+                runner: new VisualVariantAgentRunner_1.VisualVariantAgentRunner(),
+                devServerContext,
+                devServerHealth: (0, exports.buildAgentDevServerHealth)(devServerContext),
+            })
+            : undefined;
         // Start server; on EADDRINUSE retry with next available port (handles race when desktop or another instance binds first).
         let serverStarted = false;
         let retries = 0;
@@ -252,6 +447,7 @@ const main = async (args = process.argv.slice(2)) => {
                 staticEntry: project.entryPoint,
                 styleFramework: options.styleFramework,
                 tailwindConfig: options.tailwindConfig,
+                variantsRuntime,
                 rivetPort,
                 skipProcessHandlers: retries > 0,
                 isGitEnabled: options.noGit ? false : true,
@@ -559,139 +755,116 @@ const handleAgent = async (args) => {
     const agentLabel = agentKind === 'codex' ? 'Codex' : 'Claude Code';
     console.log(`\n⚠️  Rivet agent mode uses ${agentLabel} bypass permissions.`);
     console.log('Only run this in local projects you trust.\n');
-    const projectDetection = new index_core_1.ProjectDetectionService();
     const projectPath = process.cwd();
-    let project;
-    let userDevServerPort;
-    try {
-        project = await projectDetection.detectProject(projectPath, options.framework, options.entry, [], options.userPort);
-        userDevServerPort = options.userPort || project.devServerPort;
-    }
-    catch (error) {
-        if (options.userPort) {
-            userDevServerPort = options.userPort;
-            project = {
-                id: path_1.default.basename(projectPath),
-                framework: (options.framework || 'nextjs'),
-                path: projectPath,
-                devServerPort: options.userPort,
-                devServerHost: 'localhost',
-                status: 'detected',
-                packageManager: 'npm',
-            };
-        }
-        else {
-            const isNoServerError = error instanceof Error &&
-                error.message.includes('No running dev server');
-            if (!isNoServerError) {
-                throw error;
-            }
-            log.error('❌ No dev server detected.');
-            log.error('   Please start your dev server first (e.g., npm run dev), then run rivet agent again.');
-            process.exit(1);
-        }
-    }
-    if (userDevServerPort === undefined) {
-        log.error('❌ Could not determine dev server port.');
-        process.exit(1);
-    }
-    let rivetPort = options.rivetPort ?? (await (0, portUtils_1.findAvailablePort)(exports.DEFAULT_PORT));
-    const bridge = new SessionBridgeService_1.SessionBridgeService();
-    const sessionId = bridge.startSession(projectPath);
-    const devServerContext = (0, exports.buildAgentDevServerContext)({
-        framework: project.framework,
-        devServerHost: project.devServerHost,
-        userDevServerPort,
-    });
-    bridge.setDevServerContext(devServerContext);
-    bridge.updateDevServerHealth({
-        isReachable: devServerContext.ownership === 'none' ? null : true,
-        reason: devServerContext.ownership === 'none' ? 'unknown' : 'healthy',
-        lastCheckedAt: Date.now(),
-    });
-    const runner = new TerminalAgentRunner_1.TerminalAgentRunner({
-        agent: agentKind,
-        agentBin: options.agentBin,
-        claudeBin: options.claudeBin,
-        model: options.model,
-        timeoutSeconds: options.agentTimeoutSeconds ?? TerminalAgentRunner_1.DEFAULT_AGENT_TIMEOUT_SECONDS,
-    });
-    const areAgentVariantsEnabled = (0, exports.isAgentVariantsEnabled)(options);
-    const agentVariantsOrchestrator = areAgentVariantsEnabled
-        ? (0, createAgentVariantsOrchestrator_1.createAgentVariantsOrchestrator)({
-            bridge,
-            telemetry,
-            projectPathFallback: projectPath,
-        })
-        : undefined;
-    const inlineVariantService = agentVariantsOrchestrator
-        ? new InlineVariantGenerationService_1.InlineVariantGenerationService({
-            bridge,
-            orchestrator: agentVariantsOrchestrator,
-            runner,
-        })
-        : undefined;
-    const agentSession = new AgentSessionService_1.AgentSessionService({
-        bridge,
+    const agentDevServer = await (0, exports.resolveAgentDevServer)({
         projectPath,
-        runner,
-        inlineVariantService,
-        worktreeProjectLocator: agentVariantsOrchestrator,
+        options,
     });
-    let serverStarted = false;
-    let retries = 0;
-    const maxRetries = 5;
-    while (!serverStarted && retries < maxRetries) {
-        try {
-            await (0, server_1.startServer)({
-                userPort: userDevServerPort,
-                userHost: project.devServerHost,
-                framework: project.framework,
-                telemetry,
+    const { project, userDevServerPort, devServerContext } = agentDevServer;
+    try {
+        let rivetPort = options.rivetPort ?? (await (0, portUtils_1.findAvailablePort)(exports.DEFAULT_PORT));
+        const runner = new TerminalAgentRunner_1.TerminalAgentRunner({
+            agent: agentKind,
+            agentBin: options.agentBin,
+            claudeBin: options.claudeBin,
+            model: options.model,
+            timeoutSeconds: options.agentTimeoutSeconds ?? TerminalAgentRunner_1.DEFAULT_AGENT_TIMEOUT_SECONDS,
+        });
+        const areAgentVariantsEnabled = (0, exports.isAgentVariantsEnabled)(options);
+        const variantsRuntime = areAgentVariantsEnabled
+            ? (0, VariantsRuntime_1.createVariantsRuntime)({
                 projectPath,
-                staticEntry: project.entryPoint,
-                styleFramework: options.styleFramework,
-                tailwindConfig: options.tailwindConfig,
-                sessionBridge: bridge,
-                agentVariantsOrchestrator,
-                mcpEditor: agentKind === 'codex' ? 'codex' : 'claude',
-                agentApplyMode: 'embedded',
-                agentRunController: agentSession,
-                rivetPort,
-                isGitEnabled: options.noGit ? false : true,
-                skipProcessHandlers: retries > 0,
+                telemetry,
+                runner,
+                devServerContext,
+                devServerHealth: (0, exports.buildAgentDevServerHealth)(devServerContext),
+            })
+            : undefined;
+        const bridge = variantsRuntime?.bridge ?? new SessionBridgeService_1.SessionBridgeService();
+        if (!variantsRuntime) {
+            bridge.startSession(projectPath);
+            bridge.setDevServerContext(devServerContext);
+            bridge.updateDevServerHealth((0, exports.buildAgentDevServerHealth)(devServerContext));
+        }
+        const sessionId = bridge.getSessionId() ?? bridge.startSession(projectPath);
+        if (agentDevServer.ownedProcess) {
+            const ownedDevServerPort = devServerContext.port;
+            (0, exports.registerOwnedDevServerSignalHandlers)(agentDevServer.ownedProcess);
+            agentDevServer.ownedProcess.once('exit', () => {
+                (0, exports.updateOwnedDevServerHealthOnExit)(bridge, ownedDevServerPort);
             });
-            serverStarted = true;
         }
-        catch (err) {
-            const code = err?.code;
-            if (code === 'EADDRINUSE' && !options.rivetPort) {
-                retries++;
-                rivetPort = await (0, portUtils_1.findAvailablePort)(rivetPort + 1);
-                log.debug(`Port in use, retrying with port ${rivetPort} (attempt ${retries}/${maxRetries})`);
+        const agentVariantsOrchestrator = variantsRuntime?.orchestrator;
+        const variantRunService = variantsRuntime?.runService;
+        const agentSession = new AgentSessionService_1.AgentSessionService({
+            bridge,
+            projectPath,
+            runner,
+            variantRunService,
+            worktreeProjectLocator: agentVariantsOrchestrator,
+        });
+        let serverStarted = false;
+        let retries = 0;
+        const maxRetries = 5;
+        while (!serverStarted && retries < maxRetries) {
+            try {
+                await (0, server_1.startServer)({
+                    userPort: userDevServerPort,
+                    userHost: project.devServerHost,
+                    framework: project.framework,
+                    telemetry,
+                    projectPath,
+                    staticEntry: project.entryPoint,
+                    styleFramework: options.styleFramework,
+                    tailwindConfig: options.tailwindConfig,
+                    sessionBridge: bridge,
+                    variantsRuntime,
+                    mcpEditor: agentKind === 'codex' ? 'codex' : 'claude',
+                    agentApplyMode: 'embedded',
+                    agentRunController: agentSession,
+                    rivetPort,
+                    isGitEnabled: options.noGit ? false : true,
+                    skipProcessHandlers: retries > 0,
+                    beforeShutdown: agentDevServer.cleanup,
+                });
+                serverStarted = true;
             }
-            else {
-                throw err;
+            catch (err) {
+                const code = err?.code;
+                if (code === 'EADDRINUSE' && !options.rivetPort) {
+                    retries++;
+                    rivetPort = await (0, portUtils_1.findAvailablePort)(rivetPort + 1);
+                    log.debug(`Port in use, retrying with port ${rivetPort} (attempt ${retries}/${maxRetries})`);
+                }
+                else {
+                    await agentDevServer.cleanup?.();
+                    throw err;
+                }
             }
         }
+        if (!serverStarted) {
+            await agentDevServer.cleanup?.();
+            log.error(`❌ Could not start Rivet server after ${maxRetries} attempts.`);
+            process.exit(1);
+        }
+        agentSession.start();
+        (0, exports.registerAgentSignalHandlers)(runner);
+        log.info(`✅ Rivet agent server started on http://${agentHost}:${rivetPort}`);
+        log.info(`${runner.getDisplayName()} session: ${agentSession.getContinuousSessionId()}`);
+        if (!options.noBrowser) {
+            const rivetUiPath = project.framework === 'static' ? '/' : '/rivet';
+            await (0, open_1.default)(`http://${agentHost}:${rivetPort}${rivetUiPath}`);
+            log.info('🌐 Opened Rivet in your browser');
+        }
+        log.info(`✅ Rivet agent connected to your ${project.framework} project`);
+        log.info(`Bridge session: ${sessionId}`);
+        log.info('Press Ctrl+C to stop');
+        await new Promise(() => { });
     }
-    if (!serverStarted) {
-        log.error(`❌ Could not start Rivet server after ${maxRetries} attempts.`);
-        process.exit(1);
+    catch (error) {
+        await agentDevServer.cleanup?.();
+        throw error;
     }
-    agentSession.start();
-    (0, exports.registerAgentSignalHandlers)(runner);
-    log.info(`✅ Rivet agent server started on http://${agentHost}:${rivetPort}`);
-    log.info(`${runner.getDisplayName()} session: ${agentSession.getContinuousSessionId()}`);
-    if (!options.noBrowser) {
-        const rivetUiPath = project.framework === 'static' ? '/' : '/rivet';
-        await (0, open_1.default)(`http://${agentHost}:${rivetPort}${rivetUiPath}`);
-        log.info('🌐 Opened Rivet in your browser');
-    }
-    log.info(`✅ Rivet agent connected to your ${project.framework} project`);
-    log.info(`Bridge session: ${sessionId}`);
-    log.info('Press Ctrl+C to stop');
-    await new Promise(() => { });
 };
 const showHelp = () => {
     console.log(`