rivet-design 0.12.4 → 0.13.1

package/dist/cli/serverHandshake.js

@@ -0,0 +1,144 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.acquireStartLock = exports.isPidAlive = exports.removeHandshake = exports.readHandshake = exports.writeHandshake = exports.handshakeFilePath = exports.CLI_HANDSHAKE_VERSION = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const logger_1 = require("../utils/logger");
+const pid_1 = require("../utils/pid");
+Object.defineProperty(exports, "isPidAlive", { enumerable: true, get: function () { return pid_1.isPidAlive; } });
+const log = (0, logger_1.createLogger)('CliServerHandshake');
+/**
+ * Per-project server discovery for CLI invocations.
+ *
+ * A running Rivet server advertises itself in
+ * `<projectPath>/.rivet/cli/server.json` (owner-only, since it can carry the
+ * control access token). CLI subcommands read it, health-ping the port, and
+ * attach; `rivet open` uses a companion lock file so two racing invocations
+ * against one project root converge on a single server.
+ *
+ * This is the minimal stand-in for the daemon handshake/lock protocol
+ * (`.rivet/daemon/`, PR #913). When that substrate merges, this file is
+ * subsumed by `daemon.json` and the CLI attach path moves onto it.
+ */
+exports.CLI_HANDSHAKE_VERSION = 1;
+const handshakeDir = (projectPath) => (0, path_1.join)(projectPath, '.rivet', 'cli');
+const handshakeFilePath = (projectPath) => (0, path_1.join)(handshakeDir(projectPath), 'server.json');
+exports.handshakeFilePath = handshakeFilePath;
+const lockFilePath = (projectPath) => (0, path_1.join)(handshakeDir(projectPath), 'server.lock');
+const OWNER_ONLY_FILE_MODE = 0o600;
+/** Atomically write the handshake with owner-only permissions. */
+const writeHandshake = (handshake) => {
+    const filePath = (0, exports.handshakeFilePath)(handshake.projectPath);
+    (0, fs_1.mkdirSync)((0, path_1.dirname)(filePath), { recursive: true });
+    const tempPath = `${filePath}.${process.pid}.tmp`;
+    const fd = (0, fs_1.openSync)(tempPath, 'w', OWNER_ONLY_FILE_MODE);
+    try {
+        (0, fs_1.writeSync)(fd, JSON.stringify(handshake));
+    }
+    finally {
+        (0, fs_1.closeSync)(fd);
+    }
+    (0, fs_1.chmodSync)(tempPath, OWNER_ONLY_FILE_MODE);
+    (0, fs_1.renameSync)(tempPath, filePath);
+};
+exports.writeHandshake = writeHandshake;
+/** Read the handshake, or null when missing/corrupt/mismatched. */
+const readHandshake = (projectPath) => {
+    const filePath = (0, exports.handshakeFilePath)(projectPath);
+    try {
+        const parsed = JSON.parse((0, fs_1.readFileSync)(filePath, 'utf8'));
+        if (parsed.version !== exports.CLI_HANDSHAKE_VERSION) {
+            return null;
+        }
+        if (typeof parsed.pid !== 'number' ||
+            typeof parsed.rivetPort !== 'number') {
+            return null;
+        }
+        return parsed;
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT') {
+            log.debug(`Unreadable CLI handshake at ${filePath}`, error);
+        }
+        return null;
+    }
+};
+exports.readHandshake = readHandshake;
+/** Remove the handshake if this process wrote it (pid match). */
+const removeHandshake = (projectPath, pid) => {
+    const existing = (0, exports.readHandshake)(projectPath);
+    if (!existing || existing.pid !== pid) {
+        return;
+    }
+    try {
+        (0, fs_1.unlinkSync)((0, exports.handshakeFilePath)(projectPath));
+    }
+    catch {
+        // Already gone.
+    }
+};
+exports.removeHandshake = removeHandshake;
+/**
+ * Try to become the process responsible for starting the project's server.
+ * Returns a releasable lock on success, or null when another live process
+ * already holds it (the caller should then wait for that winner's
+ * handshake). Stale locks from dead processes are broken.
+ */
+const acquireStartLock = (projectPath) => {
+    const filePath = lockFilePath(projectPath);
+    (0, fs_1.mkdirSync)((0, path_1.dirname)(filePath), { recursive: true });
+    const tryAcquire = () => {
+        try {
+            const fd = (0, fs_1.openSync)(filePath, 'wx', OWNER_ONLY_FILE_MODE);
+            try {
+                (0, fs_1.writeSync)(fd, String(process.pid));
+            }
+            finally {
+                (0, fs_1.closeSync)(fd);
+            }
+            return {
+                holdForProcess: (pid) => {
+                    (0, fs_1.writeFileSync)(filePath, String(pid), { mode: OWNER_ONLY_FILE_MODE });
+                    (0, fs_1.chmodSync)(filePath, OWNER_ONLY_FILE_MODE);
+                },
+                release: () => {
+                    try {
+                        (0, fs_1.unlinkSync)(filePath);
+                    }
+                    catch {
+                        // Already released.
+                    }
+                },
+            };
+        }
+        catch (error) {
+            if (error.code !== 'EEXIST') {
+                throw error;
+            }
+            return null;
+        }
+    };
+    const acquired = tryAcquire();
+    if (acquired) {
+        return acquired;
+    }
+    try {
+        const holderPid = Number.parseInt((0, fs_1.readFileSync)(filePath, 'utf8'), 10);
+        if (Number.isInteger(holderPid) && (0, pid_1.isPidAlive)(holderPid)) {
+            return null;
+        }
+    }
+    catch {
+        // Unreadable lock — treat as stale.
+    }
+    // Stale lock from a dead process: break it and retry once.
+    try {
+        (0, fs_1.unlinkSync)(filePath);
+    }
+    catch {
+        // A racer may have broken it first.
+    }
+    return tryAcquire();
+};
+exports.acquireStartLock = acquireStartLock;
+//# sourceMappingURL=serverHandshake.js.map

package/dist/cli/serverHandshake.js.map

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

package/dist/index.d.ts

@@ -1,9 +1,7 @@
 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 { buildCursorHostedRivetEntry, buildCursorLocalRivetEntry, } from './install/harnesses';
 export type CLIOptions = {
     userPort?: number;
     rivetPort?: number;
@@ -26,11 +24,6 @@ export type CLIOptions = {
     demoMaxActiveSessions?: number;
     demoBaseRivetPort?: number;
     demoPublicBaseUrl?: string;
-    agent?: EmbeddedAgentKind;
-    agentBin?: string;
-    claudeBin?: string;
-    model?: string;
-    agentTimeoutSeconds?: number;
 };
 export declare const DEFAULT_PORT = 4000;
 export declare const DEFAULT_USER_PORT = 3000;
@@ -91,14 +84,8 @@ export declare const buildAgentDevServerHealth: (context: AgentDevServerContext)
  * 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.
- */
+/** Returns whether variants can be offered for this runtime. */
 export declare const isAgentVariantsEnabled: (options: Pick<CLIOptions, "noGit">) => boolean;
-/**
- * @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.
  */
@@ -107,4 +94,5 @@ export declare const registerOwnedDevServerSignalHandlers: (options: {
 }) => void;
 export declare const main: (args?: string[]) => Promise<void>;
 export declare const parseArgs: (args: string[]) => CLIOptions;
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"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.registerOwnedDevServerSignalHandlers = exports.registerAgentSignalHandlers = exports.isAgentVariantsEnabled = exports.updateOwnedDevServerHealthOnExit = exports.buildAgentDevServerHealth = exports.resolveAgentDevServer = exports.buildAgentDevServerContext = exports.DEFAULT_USER_PORT = exports.DEFAULT_PORT = exports.buildCursorLocalRivetEntry = exports.buildCursorHostedRivetEntry = void 0;
+exports.parseArgs = exports.main = exports.registerOwnedDevServerSignalHandlers = exports.isAgentVariantsEnabled = exports.updateOwnedDevServerHealthOnExit = exports.buildAgentDevServerHealth = exports.resolveAgentDevServer = exports.buildAgentDevServerContext = exports.DEFAULT_USER_PORT = exports.DEFAULT_PORT = void 0;
 /* eslint-disable no-console */
 const dotenv = __importStar(require("dotenv"));
 const fs_1 = __importDefault(require("fs"));
@@ -45,21 +45,16 @@ const path_1 = __importDefault(require("path"));
 const index_core_1 = require("./index-core");
 const server_1 = require("./server");
 const AuthService_1 = require("./services/AuthService");
-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 harnesses_1 = require("./install/harnesses");
 const signin_1 = require("./onboarding/signin");
-// Re-exported for back-compat with existing tests that import them from here.
-var harnesses_2 = require("./install/harnesses");
-Object.defineProperty(exports, "buildCursorHostedRivetEntry", { enumerable: true, get: function () { return harnesses_2.buildCursorHostedRivetEntry; } });
-Object.defineProperty(exports, "buildCursorLocalRivetEntry", { enumerable: true, get: function () { return harnesses_2.buildCursorLocalRivetEntry; } });
 const portUtils_1 = require("./utils/portUtils");
 const VariantsRuntime_1 = require("./services/VariantsRuntime");
-const VisualVariantAgentRunner_1 = require("./services/VisualVariantAgentRunner");
+const router_1 = require("./cli/router");
+const flags_1 = require("./cli/flags");
 const log = (0, index_core_1.createLogger)('RivetCLI');
 exports.DEFAULT_PORT = 4000;
 exports.DEFAULT_USER_PORT = 3000;
@@ -231,20 +226,9 @@ const updateOwnedDevServerHealthOnExit = (bridge, ownedDevServerPort) => {
     });
 };
 exports.updateOwnedDevServerHealthOnExit = updateOwnedDevServerHealthOnExit;
-/**
- * Returns whether embedded agent variants can be offered for this runtime.
- */
+/** Returns whether variants can be offered for this runtime. */
 const isAgentVariantsEnabled = (options) => !options.noGit;
 exports.isAgentVariantsEnabled = isAgentVariantsEnabled;
-/**
- * @effect Stops active terminal agent processes before the CLI exits on OS signals.
- */
-const registerAgentSignalHandlers = (runner) => {
-    const stopAgentChildren = () => runner.stopActiveRuns();
-    process.prependOnceListener('SIGINT', stopAgentChildren);
-    process.prependOnceListener('SIGTERM', stopAgentChildren);
-};
-exports.registerAgentSignalHandlers = registerAgentSignalHandlers;
 /**
  * @effect Sends a best-effort signal to an owned app dev server before process exit.
  */
@@ -287,41 +271,18 @@ const main = async (args = process.argv.slice(2)) => {
             await handleLogout();
             return;
         }
-        if (command === 'mcp') {
-            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;
-        }
         if (command === 'agent') {
             await handleAgent(args.slice(1));
             return;
         }
         if (command === 'install') {
-            await handleInstall(args[1]);
+            await handleInstall(args.slice(1));
             return;
         }
         if (command === 'signin' || command === 'sign-in') {
             const result = await (0, signin_1.runSignIn)({
                 noBrowser: args.includes('--no-browser'),
-                nextStepHint: "You're all set — open your agent and say \"Open Rivet\".",
+                nextStepHint: 'You\'re all set — open your agent and say "Open Rivet".',
             });
             process.exit(result.ok ? 0 : 1);
         }
@@ -333,6 +294,15 @@ const main = async (args = process.argv.slice(2)) => {
             await handleUninstall(args[1]);
             return;
         }
+        // Control-plane subcommands (CLI-first surface): one JSON envelope on
+        // stdout, progress on stderr, documented exit codes. `__serve` never
+        // resolves on success — it runs the project's server in the foreground.
+        if ((0, router_1.isCliControlCommand)(command)) {
+            const exitCode = await (0, router_1.runCliControlCommand)(args);
+            // Flush stdout before exiting so piped envelopes are never truncated.
+            process.stdout.write('', () => process.exit(exitCode));
+            return;
+        }
         // Parse basic CLI arguments first
         const options = (0, exports.parseArgs)(args);
         // Initialize telemetry
@@ -434,15 +404,15 @@ const main = async (args = process.argv.slice(2)) => {
             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;
+        // The default `rivet` (desktop/hosted-spawned) runtime has no local agent,
+        // so it cannot run variants: the hosted LLM gateway path has been removed
+        // and there is no vendor CLI to plan/apply with. It serves the editor with
+        // a session bridge only; variant runs require a CLI-first session
+        // (`rivet open`) that drives a local vendor-CLI agent.
+        const sessionBridge = new SessionBridgeService_1.SessionBridgeService();
+        sessionBridge.startSession(projectPath);
+        sessionBridge.setDevServerContext(devServerContext);
+        sessionBridge.updateDevServerHealth((0, exports.buildAgentDevServerHealth)(devServerContext));
         // Start server; on EADDRINUSE retry with next available port (handles race when desktop or another instance binds first).
         let serverStarted = false;
         let retries = 0;
@@ -457,7 +427,7 @@ const main = async (args = process.argv.slice(2)) => {
                 staticEntry: project.entryPoint,
                 styleFramework: options.styleFramework,
                 tailwindConfig: options.tailwindConfig,
-                variantsRuntime,
+                sessionBridge,
                 rivetPort,
                 skipProcessHandlers: retries > 0,
                 isGitEnabled: options.noGit ? false : true,
@@ -644,42 +614,6 @@ const parseArgs = (args) => {
                     options.tailwindConfig = tailwindConfigValue;
                 }
                 break;
-            case '--claude-bin':
-                // eslint-disable-next-line no-case-declarations
-                const claudeBinValue = args[++i];
-                if (claudeBinValue) {
-                    options.claudeBin = claudeBinValue;
-                }
-                break;
-            case '--agent':
-                // eslint-disable-next-line no-case-declarations
-                const agentValue = args[++i];
-                if (agentValue && ['claude', 'codex'].includes(agentValue)) {
-                    options.agent = agentValue;
-                }
-                break;
-            case '--agent-bin':
-                // eslint-disable-next-line no-case-declarations
-                const agentBinValue = args[++i];
-                if (agentBinValue) {
-                    options.agentBin = agentBinValue;
-                }
-                break;
-            case '--model':
-                // eslint-disable-next-line no-case-declarations
-                const modelValue = args[++i];
-                if (modelValue) {
-                    options.model = modelValue;
-                }
-                break;
-            case '--agent-timeout-seconds':
-                // eslint-disable-next-line no-case-declarations
-                const agentTimeoutSecondsValue = args[++i];
-                if (agentTimeoutSecondsValue &&
-                    !isNaN(Number(agentTimeoutSecondsValue))) {
-                    options.agentTimeoutSeconds = Number(agentTimeoutSecondsValue);
-                }
-                break;
             // Hosted tryout from the CLI: `--demo-mode` turns on `startServer` demoMode; sibling flags fill that object
             // (template path, worktrees root, TTL, max sessions, child Rivet base port, public base URL). The packaged
             // hosted image uses `src/hosted-demo.ts` env instead of these switches.
@@ -726,8 +660,7 @@ const parseArgs = (args) => {
             case '--demo-base-rivet-port':
                 // eslint-disable-next-line no-case-declarations
                 const demoBaseRivetPortValue = args[++i];
-                if (demoBaseRivetPortValue &&
-                    !isNaN(Number(demoBaseRivetPortValue))) {
+                if (demoBaseRivetPortValue && !isNaN(Number(demoBaseRivetPortValue))) {
                     options.demoBaseRivetPort = Number(demoBaseRivetPortValue);
                 }
                 break;
@@ -745,7 +678,9 @@ const parseArgs = (args) => {
 exports.parseArgs = parseArgs;
 const handleAgent = async (args) => {
     const options = (0, exports.parseArgs)(args);
-    const agentHost = '127.0.0.1';
+    // User-facing URL host. We bind to loopback but surface `localhost` so the
+    // browser address bar reads cleanly (and matches the non-agent path).
+    const agentHost = 'localhost';
     if (options.help) {
         showHelp();
         return;
@@ -765,10 +700,6 @@ const handleAgent = async (args) => {
         dotenv.config({ path: rivetEnvPath });
         log.debug('📝 Loaded Rivet environment variables');
     }
-    const agentKind = options.agent ?? 'claude';
-    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 projectPath = process.cwd();
     const agentDevServer = await (0, exports.resolveAgentDevServer)({
         projectPath,
@@ -777,19 +708,11 @@ const handleAgent = async (args) => {
     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,
                 telemetry,
-                runner,
                 devServerContext,
                 devServerHealth: (0, exports.buildAgentDevServerHealth)(devServerContext),
             })
@@ -808,21 +731,12 @@ const handleAgent = async (args) => {
                 (0, exports.updateOwnedDevServerHealthOnExit)(bridge, ownedDevServerPort);
             });
         }
-        const agentVariantsOrchestrator = variantsRuntime?.orchestrator;
-        const variantRunService = variantsRuntime?.runService;
-        const agentSession = new AgentSessionService_1.AgentSessionService({
-            bridge,
-            projectPath,
-            runner,
-            variantRunService,
-            worktreeProjectLocator: agentVariantsOrchestrator,
-        });
-        let serverStarted = false;
+        let serverHandle = null;
         let retries = 0;
         const maxRetries = 5;
-        while (!serverStarted && retries < maxRetries) {
+        while (!serverHandle && retries < maxRetries) {
             try {
-                await (0, server_1.startServer)({
+                serverHandle = await (0, server_1.startServer)({
                     userPort: userDevServerPort,
                     userHost: project.devServerHost,
                     framework: project.framework,
@@ -833,15 +747,12 @@ const handleAgent = async (args) => {
                     tailwindConfig: options.tailwindConfig,
                     sessionBridge: bridge,
                     variantsRuntime,
-                    mcpEditor: agentKind === 'codex' ? 'codex' : 'claude',
-                    agentApplyMode: 'embedded',
-                    agentRunController: agentSession,
+                    agentApplyMode: 'external',
                     rivetPort,
                     isGitEnabled: options.noGit ? false : true,
                     skipProcessHandlers: retries > 0,
                     beforeShutdown: agentDevServer.cleanup,
                 });
-                serverStarted = true;
             }
             catch (err) {
                 const code = err?.code;
@@ -856,15 +767,12 @@ const handleAgent = async (args) => {
                 }
             }
         }
-        if (!serverStarted) {
+        if (!serverHandle) {
             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}`);
@@ -889,16 +797,39 @@ USAGE:
 
 COMMANDS:
   rivet                 Start Rivet (auto-login if needed)
-  rivet agent           Start Rivet with a terminal AI agent applying visual changes
+  rivet agent           Start Rivet with a terminal AI agent generating variants
   rivet install          Set up Rivet for every detected agent (Claude Code, Cursor, Codex, …)
   rivet install cursor    Set up Rivet for a specific agent only
+  rivet install --mcp     Also register the resident MCP server (rivet mcp serve);
+                          enables Claude Desktop (rivet install claude-desktop --mcp)
   rivet uninstall <name>  Remove Rivet from one agent (claude|claude-desktop|cursor|codex)
   rivet uninstall all     Remove Rivet from all editors
-  rivet update            Update Rivet MCP server for all installed editors
+  rivet update            Refresh Rivet's agent guidance and allowlists for installed editors
   rivet signin          Sign in or create a Rivet account in your browser
   rivet login           Login with Google
   rivet logout          Logout from Rivet
 
+CONTROL PLANE (agent-oriented contract):
+  Every subcommand prints exactly one JSON envelope on stdout —
+  {"schemaVersion":1,"ok":true,"command":"…","data":{…}} or
+  {"schemaVersion":1,"ok":false,"command":"…","error":{"code","message"}} —
+  routes progress to stderr, and never prompts for input.
+  Exit codes: 0 ok, 1 failed, 2 usage, 3 auth required, 4 server unavailable,
+  5 wait timeout (work still pending or running).
+  rivet open [--project <path>] [--agent claude|codex|cursor]
+                                     Start or attach the project's Rivet server
+  rivet stop [--project <path>]      Stop the CLI-owned server
+  rivet status [--watch]             Session, runner, and variants status
+  rivet wait <workId> [--timeout N]  Block until a work id settles (exit 5 on timeout)
+  rivet variants start --instruction <text> [--count N] [--element <sel>] [--fresh] [--target <sessionId>:<variantId>]
+  rivet variants status|cancel <sessionId>|commit <variantId>|list [--history]
+  rivet evidence capture --url <url> Capture rendered design evidence
+  rivet reference fetch <url>        Fetch Pinterest / Are.na references
+  rivet auth status                  Report signed-in state
+  rivet mcp serve [--project <path>] Resident stdio MCP server over these commands
+  Handoff (agent invocations): --caller-agent claude|codex|cursor
+  --caller-model <model> --caller-session <id>, or --handoff <json>.
+
 OPTIONS:
   -h, --help            Show this help message
   -v, --version         Show version number
@@ -910,13 +841,7 @@ OPTIONS:
   --framework TYPE      Override framework detection (nextjs|vite|cra|remix|svelte|static)
   --entry PATH          Entry point for static projects (default: index.html)
   --style-framework TYPE Override design token detection (tailwind)
-  --anthropic-api-key KEY Anthropic API key for Claude-based agentic modifications
-  --agent TYPE          Terminal agent for rivet agent (claude|codex; default: claude)
-  --agent-bin PATH      Terminal agent binary for rivet agent
   --tailwind-config PATH Path to Tailwind config file (e.g., landing/tailwind.config.ts)
-  --claude-bin PATH     Claude Code binary for rivet agent (default: claude)
-  --model MODEL         Model for rivet agent (uses agent default if omitted)
-  --agent-timeout-seconds SECONDS Timeout for each terminal agent run in rivet agent
   --demo-mode            Enable hosted demo mode with session routing
   --no-git               Disable git features for this runtime
   --demo-allow-anonymous Allow unauthenticated demo session creation
@@ -967,7 +892,9 @@ const promptYesNo = async (question) => {
         output: process.stdout,
     });
     try {
-        const answer = (await rl.question(`${question} [Y/n] `)).trim().toLowerCase();
+        const answer = (await rl.question(`${question} [Y/n] `))
+            .trim()
+            .toLowerCase();
         return answer === '' || answer === 'y' || answer === 'yes';
     }
     finally {
@@ -995,15 +922,34 @@ const promptPostInstall = async () => {
     const wantsSignIn = await promptYesNo('Sign in or create your Rivet account now?');
     if (wantsSignIn) {
         await (0, signin_1.runSignIn)({
-            nextStepHint: "You're all set — open your agent and say \"Open Rivet\".",
+            nextStepHint: 'You\'re all set — open your agent and say "Open Rivet".',
         });
     }
     else {
         console.log("\nNo problem — run `rivet login` whenever you're ready.\n");
     }
 };
-const handleInstall = async (editor) => {
-    const { exitCode } = (0, harnesses_1.installHarnesses)(editor);
+const handleInstall = async (installArgs) => {
+    // `rivet install [editor] [--mcp]` — flags and the editor name can come in
+    // either order. `--mcp` opts into registering the resident stdio MCP
+    // server (`rivet mcp serve`) alongside the CLI setup.
+    const parsed = (0, flags_1.parseFlags)(installArgs, {
+        mcp: { takesValue: false },
+        'no-telemetry': { takesValue: false },
+    });
+    if (parsed.errors.length > 0 || parsed.positionals.length > 1) {
+        const positionalError = parsed.positionals.length > 1
+            ? [
+                `Expected at most one install target, got ${parsed.positionals.length}`,
+            ]
+            : [];
+        console.error(`Invalid install arguments: ${[...parsed.errors, ...positionalError].join('; ')}`);
+        console.error('Usage: rivet install [agent] [--mcp]');
+        process.exit(2);
+    }
+    const mcp = parsed.values.mcp === true;
+    const editor = parsed.positionals[0];
+    const { exitCode } = (0, harnesses_1.installHarnesses)(editor, { mcp });
     if (exitCode !== 0)
         process.exit(exitCode);
     await promptPostInstall();