rivet-design 0.11.7 → 0.11.9

package/dist/index.js

@@ -36,13 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCursorLocalRivetEntry = exports.buildCursorHostedRivetEntry = 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;
+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;
 /* eslint-disable no-console */
-const child_process_1 = require("child_process");
 const dotenv = __importStar(require("dotenv"));
 const fs_1 = __importDefault(require("fs"));
 const open_1 = __importDefault(require("open"));
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const index_core_1 = require("./index-core");
 const server_1 = require("./server");
@@ -53,7 +51,12 @@ 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 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");
@@ -315,6 +318,13 @@ const main = async (args = process.argv.slice(2)) => {
             await handleInstall(args[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\".",
+            });
+            process.exit(result.ok ? 0 : 1);
+        }
         if (command === 'update') {
             await handleUpdate();
             return;
@@ -518,22 +528,32 @@ const main = async (args = process.argv.slice(2)) => {
                     console.log('\n❌ E2E auth required: set RIVET_E2E_EMAIL and RIVET_E2E_PASSWORD (or RIVET_TEST_EMAIL and RIVET_TEST_PASSWORD) in repo secrets. Must be e2etest@gmail.com.');
                     process.exit(1);
                 }
-                console.log('\n🔐 Authentication required');
-                console.log('Opening browser for Google login...\n');
-                const authService = new AuthService_1.AuthService();
-                const oauthRedirectOrigin = useLocalhostRivetUiRootEntrypoint
-                    ? `http://localhost:${rivetPort}`
-                    : `http://localhost:${rivetPort}/rivet`;
-                const loginResult = await authService.loginWithGoogle(oauthRedirectOrigin);
-                if (!loginResult.success) {
-                    console.log(`\n❌ Authentication failed: ${loginResult.error || loginResult.message}`);
-                    process.exit(1);
+                if (options.noBrowser) {
+                    // Headless: can't show the in-browser sign-in page, so fall back to
+                    // the terminal OAuth flow.
+                    console.log('\n🔐 Authentication required');
+                    console.log('Opening browser for Google login...\n');
+                    const authService = new AuthService_1.AuthService();
+                    const oauthRedirectOrigin = useLocalhostRivetUiRootEntrypoint
+                        ? `http://localhost:${rivetPort}`
+                        : `http://localhost:${rivetPort}/rivet`;
+                    const loginResult = await authService.loginWithGoogle(oauthRedirectOrigin);
+                    if (!loginResult.success) {
+                        console.log(`\n❌ Authentication failed: ${loginResult.error || loginResult.message}`);
+                        process.exit(1);
+                    }
+                    console.log(`\n✅ Authenticated as ${loginResult.user?.email}`);
+                    if (loginResult.profile) {
+                        console.log(`💰 Balance: $${loginResult.profile.remaining_spend_usd.toFixed(2)}`);
+                    }
+                    didAuthenticate = true;
                 }
-                console.log(`\n✅ Authenticated as ${loginResult.user?.email}`);
-                if (loginResult.profile) {
-                    console.log(`💰 Balance: $${loginResult.profile.remaining_spend_usd.toFixed(2)}`);
+                else {
+                    // Interactive: the Rivet UI we open below renders its sign-in screen
+                    // for unauthenticated users. They sign in there and the editor
+                    // unlocks live — no need to jump straight to Google from the terminal.
+                    console.log('\n🔐 Sign in to Rivet in the browser window that opens next.');
                 }
-                didAuthenticate = true;
             }
         }
         // Open browser to Rivet UI (only if we didn't just authenticate, since OAuth already opened it)
@@ -876,14 +896,12 @@ USAGE:
 COMMANDS:
   rivet                 Start Rivet (auto-login if needed)
   rivet agent           Start Rivet with a terminal AI agent applying visual changes
-  rivet install claude    Set up Rivet for Claude Code
-  rivet install cursor    Set up Rivet for Cursor
-  rivet install codex     Set up Rivet for OpenAI Codex CLI
-  rivet uninstall claude  Remove Rivet from Claude Code
-  rivet uninstall cursor  Remove Rivet from Cursor
-  rivet uninstall codex   Remove Rivet from OpenAI Codex CLI
+  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 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 signin          Sign in or create a Rivet account in your browser
   rivet login           Login with Google
   rivet logout          Logout from Rivet
 
@@ -922,9 +940,8 @@ EXAMPLES:
   rivet --rivet-port 4000           # Use port 4000 for Rivet (fails if in use)
   rivet --framework static          # Serve static HTML from ./index.html
   rivet --framework static --entry dist/   # Serve static files from ./dist/ directory
-  rivet install claude                 # Configure Rivet as a Claude Code MCP server
-  rivet install cursor                 # Configure Rivet for Cursor
-  rivet install codex                  # Configure Rivet for OpenAI Codex CLI
+  rivet install                        # Configure Rivet for every detected agent at once
+  rivet install cursor                 # Configure Rivet for Cursor only
   rivet uninstall cursor               # Remove Rivet from Cursor
   rivet uninstall all                  # Remove Rivet from all editors
   rivet login                       # Manually login with Google
@@ -943,593 +960,82 @@ const showVersion = () => {
         log.error('Could not read version from package.json', error);
     }
 };
-const MCP_INSTALL_WELCOME = `
-Welcome to Rivet!
-
-Rivet is a visual editor for your coding agent. 
-`;
-const RIVET_ASCII_LOGO = `
-
-****************************************************************************************************
-****************************************************************************************************
-*******************************+.  :****************************************************************
-*******************************:    =*************************************:...=*********************
-*******************************+=--=*************************************+.   =*********************
-*****************-....... ..:+*-....**:....=*****:....=**:..........-**+..    ....-*****************
-*****************-    ....  .+*-   .***:    +***-    -*+.            :*+.         :*****************
-*****************-   .+****++**-   .****.   :**+.   :**+    :====:   .***+    =*********************
-*****************-   .+********-   .****+.   -+.   :***+             .***+    =*********************
-*****************-   .+********-   .*****+.  .:   :****+    .++++==--****+    :+++******************
-*****************-   .+********-   .******+.     :******:.           .+***.       =*****************
-*****************+++++*********+++++*******+++++++********+++++++++++******+++++++******************
-****************************************************************************************************
-****************************************************************************************************
-
-`;
-/**
- * Handle install command — configure Rivet as an MCP server for the specified editor
- */
-const handleInstall = async (editor) => {
-    switch (editor) {
-        case 'claude':
-            console.log(MCP_INSTALL_WELCOME);
-            await handleInstallClaude();
-            break;
-        case 'claude-desktop':
-            console.log(MCP_INSTALL_WELCOME);
-            await handleInstallClaudeDesktop();
-            break;
-        case 'cursor':
-            console.log(MCP_INSTALL_WELCOME);
-            await handleInstallCursor();
-            break;
-        case 'codex':
-            console.log(MCP_INSTALL_WELCOME);
-            await handleInstallCodex();
-            break;
-        default:
-            console.log('\nUsage: rivet install <editor>\n');
-            console.log('  rivet install claude          Set up for Claude Code');
-            console.log('  rivet install claude-desktop  Set up for the Claude desktop app');
-            console.log('  rivet install cursor          Set up for Cursor');
-            console.log('  rivet install codex           Set up for OpenAI Codex CLI');
-            console.log('');
-            process.exit(editor ? 1 : 0);
-    }
-    console.log(RIVET_ASCII_LOGO);
-};
 /**
- * Register Rivet with Claude Code MCP. Returns true on success, false on failure.
- * Does NOT call process.exit — callers decide how to handle failure.
+ * Ask a yes/no question on the terminal. Defaults to yes on a bare Enter.
+ * Resolves false immediately if stdin isn't interactive.
  */
-const registerClaudeMCP = () => {
-    const mcpAddCommand = 'claude mcp add --transport stdio --scope user rivet -- npx -y rivet-design@latest mcp --editor claude';
-    try {
-        const output = (0, child_process_1.execSync)(mcpAddCommand, { stdio: 'pipe', encoding: 'utf8' });
-        process.stdout.write(output);
-        console.log('✓ Rivet MCP server added to Claude Code');
-        return true;
-    }
-    catch (err) {
-        const stderr = err.stderr ?? '';
-        if (stderr.includes('already exists')) {
-            console.log('✓ Rivet MCP server already registered');
-            return true;
-        }
-        process.stderr.write(stderr);
-        console.log('Run manually:', 'claude mcp add --transport stdio --scope user rivet -- npx -y rivet-design@latest mcp --editor claude');
+const promptYesNo = async (question) => {
+    if (!process.stdin.isTTY)
         return false;
-    }
-};
-const handleInstallClaude = async () => {
-    console.log('\nSetting up Rivet for Claude Code...\n');
-    try {
-        (0, child_process_1.execSync)('claude --version', { stdio: 'ignore' });
-    }
-    catch {
-        console.log('Claude Code is not installed or not in your PATH.');
-        console.log('Install it: https://claude.ai/download');
-        process.exit(1);
-    }
-    if (!registerClaudeMCP()) {
-        process.exit(1);
-    }
-    const skillResult = (0, skillWriter_1.writeSkillFileIfNeeded)();
-    if (skillResult.success) {
-        console.log('✓ Rivet skill installed');
-    }
-    else {
-        console.log(`  Warning: could not write skill file to ${path_1.default.join(os_1.default.homedir(), '.claude', 'skills', 'rivet')}: ${skillResult.error}`);
-        console.log('  Claude Code will still work with Rivet, but may need manual guidance on tool usage.');
-    }
-    console.log(`
-Next steps:
-  1. Start a new Claude Code session
-  2. Type /rivet or say "Open Rivet"
-`);
-};
-/**
- * Resolve `npx` to an absolute path using the install-time shell PATH.
- *
- * Why: editors like Claude desktop inherit a sanitized PATH at launch that
- * can put stale node versions (e.g. legacy nvm installs) first, causing
- * `npx` to dispatch to a node so old it can't even `require('node:url')`.
- * Writing the absolute path into the MCP config bypasses that lookup so the
- * editor uses the same `npx` the user has in their interactive shell.
- *
- * Falls back to the literal "npx" with a warning if resolution fails — the
- * prior behavior — so install never hard-blocks on a quirky environment.
- */
-const resolveNpxCommand = () => {
-    const which = process.platform === 'win32' ? 'where' : 'which';
+    const readline = await Promise.resolve().then(() => __importStar(require('node:readline/promises')));
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
     try {
-        const out = (0, child_process_1.execSync)(`${which} npx`, {
-            stdio: ['ignore', 'pipe', 'ignore'],
-            encoding: 'utf8',
-        });
-        // `where` on Windows can return multiple lines (npx, npx.cmd, npx.ps1).
-        // Prefer .cmd / .exe over a shebanged shell script so Windows can spawn
-        // the resolved path directly.
-        const lines = out
-            .split(/\r?\n/)
-            .map((l) => l.trim())
-            .filter((l) => l.length > 0 && fs_1.default.existsSync(l));
-        if (lines.length === 0) {
-            throw new Error('which returned no usable paths');
-        }
-        if (process.platform === 'win32') {
-            const directlySpawnable = lines.find((l) => /\.(cmd|exe|bat)$/i.test(l));
-            return directlySpawnable ?? lines[0];
-        }
-        return lines[0];
+        const answer = (await rl.question(`${question} [Y/n] `)).trim().toLowerCase();
+        return answer === '' || answer === 'y' || answer === 'yes';
     }
-    catch {
-        console.log('  Warning: could not resolve `npx` to an absolute path. Falling back to "npx" — if your editor uses an outdated Node, it may fail to start the server.');
-        return 'npx';
+    finally {
+        rl.close();
     }
 };
-const CURSOR_HOSTED_MCP_URL = 'https://rivet-proxy.onrender.com/mcp';
-const buildCursorHostedRivetEntry = () => ({
-    url: CURSOR_HOSTED_MCP_URL,
-});
-exports.buildCursorHostedRivetEntry = buildCursorHostedRivetEntry;
-const buildCursorLocalRivetEntry = () => ({
-    command: resolveNpxCommand(),
-    args: ['-y', 'rivet-design@latest', 'mcp', '--editor', 'cursor'],
-});
-exports.buildCursorLocalRivetEntry = buildCursorLocalRivetEntry;
 /**
- * Surface a diagnostic when an existing rivet MCP entry's `command` is an
- * absolute path that no longer exists. Common when the user removes the
- * node version that was resolved at install time. Update rewrites the entry
- * anyway, but the note explains *why* the entry needed refreshing.
+ * After a successful install, nudge the user into Rivet. If they're not signed
+ * in yet, offer to open the sign-in page; if they already are, point them at
+ * their agent. Stays silent-but-helpful in non-interactive / CI runs.
  */
-const warnIfStaleRivetCommand = (entry, editorLabel) => {
-    if (typeof entry !== 'object' || entry === null)
-        return;
-    const cmd = entry.command;
-    if (typeof cmd !== 'string')
-        return;
-    if (!path_1.default.isAbsolute(cmd))
+const promptPostInstall = async () => {
+    // Non-interactive / CI: don't probe auth or prompt — just leave guidance.
+    if (!process.stdin.isTTY || process.env.CI === 'true') {
+        console.log('\nOne more step: run `rivet login` to sign in (or create an account) and start using Rivet.\n');
         return;
-    if (fs_1.default.existsSync(cmd))
-        return;
-    console.log(`  Note: previous Rivet command for ${editorLabel} (${cmd}) no longer exists. Re-resolving.`);
-};
-const handleInstallCursor = async () => {
-    console.log('\nSetting up Rivet for Cursor...\n');
-    const cursorDir = path_1.default.join(os_1.default.homedir(), '.cursor');
-    if (!fs_1.default.existsSync(cursorDir)) {
-        console.log('Cursor does not appear to be installed (~/.cursor not found).');
-        console.log('Install it: https://cursor.com');
-        process.exit(1);
-    }
-    const mcpConfigPath = path_1.default.join(cursorDir, 'mcp.json');
-    const hostedEntry = (0, exports.buildCursorHostedRivetEntry)();
-    const localEntry = (0, exports.buildCursorLocalRivetEntry)();
-    let config = {};
-    if (fs_1.default.existsSync(mcpConfigPath)) {
-        const raw = fs_1.default.readFileSync(mcpConfigPath, 'utf8');
-        try {
-            const parsed = JSON.parse(raw);
-            if (parsed !== null &&
-                typeof parsed === 'object' &&
-                !Array.isArray(parsed)) {
-                config = parsed;
-            }
-            else {
-                console.log(`  Error: ${mcpConfigPath} is not a JSON object. Aborting to avoid data loss.`);
-                console.log(`  Fix or delete the file manually, then re-run.`);
-                process.exit(1);
-            }
-        }
-        catch {
-            console.log(`  Error: could not parse ${mcpConfigPath}. Aborting to avoid data loss.`);
-            console.log(`  Fix or delete the file manually, then re-run.`);
-            process.exit(1);
-        }
-    }
-    // Ensure mcpServers is an object, not some other type
-    if (config.mcpServers !== undefined &&
-        (typeof config.mcpServers !== 'object' || Array.isArray(config.mcpServers))) {
-        console.log(`  Error: mcpServers in ${mcpConfigPath} is not an object. Aborting to avoid data loss.`);
-        process.exit(1);
-    }
-    config.mcpServers = {
-        ...config.mcpServers,
-        rivet: hostedEntry,
-        'rivet-local': localEntry,
-    };
-    fs_1.default.writeFileSync(mcpConfigPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-    console.log(`✓ Rivet MCP servers added to ${mcpConfigPath}`);
-    console.log(`
-Next steps:
-  1. Fully restart Cursor
-  2. Open a new chat and say "Open Rivet"
-`);
-};
-const buildClaudeDesktopRivetEntry = () => ({
-    command: resolveNpxCommand(),
-    args: ['-y', 'rivet-design@latest', 'mcp', '--editor', 'claude-desktop'],
-});
-/**
- * Path to the Claude desktop app's MCP config file.
- * macOS:  ~/Library/Application Support/Claude/claude_desktop_config.json
- * Win:    %APPDATA%\Claude\claude_desktop_config.json
- * Linux:  ~/.config/Claude/claude_desktop_config.json (unofficial, but the
- *         freedesktop default if Anthropic ships a Linux build)
- */
-const claudeDesktopConfigPath = () => {
-    const home = os_1.default.homedir();
-    if (process.platform === 'darwin') {
-        return path_1.default.join(home, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
-    }
-    if (process.platform === 'win32') {
-        const appData = process.env.APPDATA ?? path_1.default.join(home, 'AppData', 'Roaming');
-        return path_1.default.join(appData, 'Claude', 'claude_desktop_config.json');
-    }
-    return path_1.default.join(home, '.config', 'Claude', 'claude_desktop_config.json');
-};
-const handleInstallClaudeDesktop = async () => {
-    console.log('\nSetting up Rivet for the Claude desktop app...\n');
-    const mcpConfigPath = claudeDesktopConfigPath();
-    const claudeDir = path_1.default.dirname(mcpConfigPath);
-    if (!fs_1.default.existsSync(claudeDir)) {
-        console.log(`Claude desktop does not appear to be installed (${claudeDir} not found).`);
-        console.log('Install it: https://claude.ai/download');
-        process.exit(1);
-    }
-    const rivetEntry = buildClaudeDesktopRivetEntry();
-    let config = {};
-    if (fs_1.default.existsSync(mcpConfigPath)) {
-        const raw = fs_1.default.readFileSync(mcpConfigPath, 'utf8');
-        try {
-            const parsed = JSON.parse(raw);
-            if (parsed !== null &&
-                typeof parsed === 'object' &&
-                !Array.isArray(parsed)) {
-                config = parsed;
-            }
-            else {
-                console.log(`  Error: ${mcpConfigPath} is not a JSON object. Aborting to avoid data loss.`);
-                console.log(`  Fix or delete the file manually, then re-run.`);
-                process.exit(1);
-            }
-        }
-        catch {
-            console.log(`  Error: could not parse ${mcpConfigPath}. Aborting to avoid data loss.`);
-            console.log(`  Fix or delete the file manually, then re-run.`);
-            process.exit(1);
-        }
-    }
-    if (config.mcpServers !== undefined &&
-        (typeof config.mcpServers !== 'object' || Array.isArray(config.mcpServers))) {
-        console.log(`  Error: mcpServers in ${mcpConfigPath} is not an object. Aborting to avoid data loss.`);
-        process.exit(1);
-    }
-    config.mcpServers = { ...config.mcpServers, rivet: rivetEntry };
-    fs_1.default.writeFileSync(mcpConfigPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-    console.log(`✓ Rivet MCP server added to ${mcpConfigPath}`);
-    console.log(`
-Next steps:
-  1. Fully quit and reopen the Claude desktop app
-  2. Open a new chat and say "Open Rivet"
-`);
-};
-/**
- * Register Rivet with Codex MCP. Returns true on success, false on failure.
- * Does NOT call process.exit — callers decide how to handle failure.
- */
-const registerCodexMCP = () => {
-    const mcpAddCommand = 'codex mcp add rivet -- npx -y rivet-design@latest mcp --editor codex';
-    try {
-        (0, child_process_1.execSync)(mcpAddCommand, { stdio: 'inherit' });
-        console.log('✓ Rivet MCP server added to Codex');
-        return true;
-    }
-    catch {
-        console.log('Run manually:', 'codex mcp add rivet -- npx -y rivet-design@latest mcp --editor codex');
-        return false;
-    }
-};
-const handleInstallCodex = async () => {
-    console.log('\nSetting up Rivet for OpenAI Codex CLI...\n');
-    // Check codex binary
-    try {
-        (0, child_process_1.execSync)('codex --version', { stdio: 'ignore' });
-    }
-    catch {
-        console.log('Codex CLI is not installed or not in your PATH.');
-        console.log('Install it: https://github.com/openai/codex');
-        process.exit(1);
-    }
-    if (!registerCodexMCP()) {
-        process.exit(1);
     }
-    console.log(`
-Next steps:
-  1. Start a new Codex session
-  2. Say "Open Rivet"
-`);
-};
-const handleUninstallClaude = () => {
-    try {
-        (0, child_process_1.execSync)('claude --version', { stdio: 'ignore' });
-    }
-    catch {
-        console.log('Claude Code is not installed or not in your PATH — skipping.');
-        return false;
-    }
-    let madeChanges = false;
-    try {
-        (0, child_process_1.execSync)('claude mcp remove rivet', { stdio: 'pipe' });
-        console.log('✓ Rivet MCP server removed from Claude Code');
-        madeChanges = true;
-    }
-    catch {
-        console.log('  Rivet was not registered with Claude Code (nothing to remove).');
-    }
-    // Remove skill file
-    const skillDir = path_1.default.join(os_1.default.homedir(), '.claude', 'skills', 'rivet');
-    if (fs_1.default.existsSync(skillDir)) {
-        fs_1.default.rmSync(skillDir, { recursive: true, force: true });
-        console.log('✓ Rivet skill file removed');
-        madeChanges = true;
-    }
-    return madeChanges;
-};
-const handleUninstallCursor = () => {
-    const mcpConfigPath = path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json');
-    if (!fs_1.default.existsSync(mcpConfigPath)) {
-        console.log('  No Cursor MCP config found — nothing to remove.');
-        return false;
-    }
-    try {
-        const raw = fs_1.default.readFileSync(mcpConfigPath, 'utf8');
-        const config = JSON.parse(raw);
-        if (!config.mcpServers ||
-            (!('rivet' in config.mcpServers) && !('rivet-local' in config.mcpServers))) {
-            console.log('  Rivet was not registered with Cursor (nothing to remove).');
-            return false;
-        }
-        delete config.mcpServers['rivet'];
-        delete config.mcpServers['rivet-local'];
-        fs_1.default.writeFileSync(mcpConfigPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-        console.log(`✓ Rivet MCP server removed from ${mcpConfigPath}`);
-        return true;
-    }
-    catch {
-        console.log(`  Error: could not parse ${mcpConfigPath}. Fix or delete the file manually.`);
-        return false;
-    }
-};
-const handleUninstallClaudeDesktop = () => {
-    const mcpConfigPath = claudeDesktopConfigPath();
-    if (!fs_1.default.existsSync(mcpConfigPath)) {
-        console.log('  No Claude desktop MCP config found — nothing to remove.');
-        return false;
+    // Validate the token (refreshing if stale) rather than trusting its presence,
+    // so a revoked/expired token still gets a fresh sign-in prompt.
+    if (await new AuthService_1.AuthService().ensureAuthenticated()) {
+        const email = (0, ConfigManager_1.getConfigManager)().getEmail();
+        console.log(`\nYou're signed in${email ? ` as ${email}` : ''}. Open your agent and say "Open Rivet" to start.\n`);
+        return;
     }
-    try {
-        const raw = fs_1.default.readFileSync(mcpConfigPath, 'utf8');
-        const config = JSON.parse(raw);
-        if (!config.mcpServers || !('rivet' in config.mcpServers)) {
-            console.log('  Rivet was not registered with the Claude desktop app (nothing to remove).');
-            return false;
-        }
-        delete config.mcpServers['rivet'];
-        fs_1.default.writeFileSync(mcpConfigPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-        console.log(`✓ Rivet MCP server removed from ${mcpConfigPath}`);
-        return true;
+    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\".",
+        });
     }
-    catch {
-        console.log(`  Error: could not parse ${mcpConfigPath}. Fix or delete the file manually.`);
-        return false;
+    else {
+        console.log("\nNo problem — run `rivet login` whenever you're ready.\n");
     }
 };
-const handleUninstallCodex = () => {
-    try {
-        (0, child_process_1.execSync)('codex --version', { stdio: 'ignore' });
-    }
-    catch {
-        console.log('Codex CLI is not installed or not in your PATH — skipping.');
-        return false;
-    }
-    try {
-        (0, child_process_1.execSync)('codex mcp remove rivet', { stdio: 'pipe' });
-        console.log('✓ Rivet MCP server removed from Codex');
-        return true;
-    }
-    catch {
-        console.log('  Rivet was not registered with Codex (nothing to remove).');
-        return false;
-    }
+const handleInstall = async (editor) => {
+    const { exitCode } = (0, harnesses_1.installHarnesses)(editor);
+    if (exitCode !== 0)
+        process.exit(exitCode);
+    await promptPostInstall();
 };
-/**
- * Handle uninstall command — remove Rivet MCP server for the specified editor (or all)
- */
 const handleUninstall = async (editor) => {
-    switch (editor) {
-        case 'claude': {
-            console.log('\nUninstalling Rivet from Claude Code...\n');
-            const changed = handleUninstallClaude();
-            if (changed)
-                console.log('\nRestart Claude Code to apply changes.\n');
-            break;
-        }
-        case 'claude-desktop': {
-            console.log('\nUninstalling Rivet from the Claude desktop app...\n');
-            const changed = handleUninstallClaudeDesktop();
-            if (changed)
-                console.log('\nFully restart the Claude desktop app to apply changes.\n');
-            break;
-        }
-        case 'cursor': {
-            console.log('\nUninstalling Rivet from Cursor...\n');
-            const changed = handleUninstallCursor();
-            if (changed)
-                console.log('\nRestart Cursor to apply changes.\n');
-            break;
-        }
-        case 'codex': {
-            console.log('\nUninstalling Rivet from OpenAI Codex CLI...\n');
-            const changed = handleUninstallCodex();
-            if (changed)
-                console.log('\nStart a new Codex session to apply changes.\n');
-            break;
-        }
-        case 'all': {
-            console.log('\nUninstalling Rivet from all editors...\n');
-            const claudeChanged = handleUninstallClaude();
-            const claudeDesktopChanged = handleUninstallClaudeDesktop();
-            const cursorChanged = handleUninstallCursor();
-            const codexChanged = handleUninstallCodex();
-            if (claudeChanged ||
-                claudeDesktopChanged ||
-                cursorChanged ||
-                codexChanged) {
-                console.log('\nRestart your editor sessions to apply changes.\n');
-            }
-            break;
-        }
-        default:
-            console.log('\nUsage: rivet uninstall <editor>\n');
-            console.log('  rivet uninstall claude          Remove from Claude Code');
-            console.log('  rivet uninstall claude-desktop  Remove from the Claude desktop app');
-            console.log('  rivet uninstall cursor          Remove from Cursor');
-            console.log('  rivet uninstall codex           Remove from OpenAI Codex CLI');
-            console.log('  rivet uninstall all             Remove from all editors');
-            console.log('');
-            process.exit(editor ? 1 : 0);
-    }
+    const { exitCode } = (0, harnesses_1.uninstallHarnesses)(editor);
+    if (exitCode !== 0)
+        process.exit(exitCode);
 };
-/**
- * Handle update command — re-register Rivet MCP server for all detected editors
- */
 const handleUpdate = async () => {
-    console.log('\nUpdating Rivet...\n');
-    let updatedAny = false;
-    // Claude Code — only run if installed; surface re-add failure so we don't leave user without MCP
-    let claudeInstalled = false;
-    try {
-        (0, child_process_1.execSync)('claude --version', { stdio: 'ignore' });
-        claudeInstalled = true;
-    }
-    catch {
-        // Claude not installed — skip
-    }
-    if (claudeInstalled) {
-        try {
-            (0, child_process_1.execSync)('claude mcp remove rivet', { stdio: 'pipe' });
-        }
-        catch {
-            // not registered, that's fine
-        }
-        if (registerClaudeMCP()) {
-            console.log('✓ Updated Rivet MCP server for Claude Code');
-            const skillResult = (0, skillWriter_1.writeSkillFileIfNeeded)();
-            if (skillResult.success) {
-                console.log('✓ Updated Rivet skill for Claude Code');
-            }
-            else {
-                console.log(`  Warning: could not write skill file (${skillResult.error})`);
-            }
-            updatedAny = true;
-        }
-        else {
-            console.log('  Failed to re-add Rivet for Claude Code. Run: rivet install claude');
-        }
-    }
-    // Cursor — only update if rivet was already registered
-    const cursorMcpPath = path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json');
-    if (fs_1.default.existsSync(cursorMcpPath)) {
-        try {
-            const raw = fs_1.default.readFileSync(cursorMcpPath, 'utf8');
-            const config = JSON.parse(raw);
-            if (config.mcpServers &&
-                ('rivet' in config.mcpServers || 'rivet-local' in config.mcpServers)) {
-                warnIfStaleRivetCommand(config.mcpServers['rivet'], 'Cursor');
-                warnIfStaleRivetCommand(config.mcpServers['rivet-local'], 'Cursor');
-                config.mcpServers['rivet'] = (0, exports.buildCursorHostedRivetEntry)();
-                config.mcpServers['rivet-local'] = (0, exports.buildCursorLocalRivetEntry)();
-                fs_1.default.writeFileSync(cursorMcpPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-                console.log('✓ Updated Rivet MCP servers for Cursor');
-                updatedAny = true;
-            }
-        }
-        catch {
-            console.log('  Warning: could not update Cursor MCP config');
-        }
-    }
-    // Claude desktop — only update if rivet was already registered
-    const claudeDesktopMcpPath = claudeDesktopConfigPath();
-    if (fs_1.default.existsSync(claudeDesktopMcpPath)) {
-        try {
-            const raw = fs_1.default.readFileSync(claudeDesktopMcpPath, 'utf8');
-            const config = JSON.parse(raw);
-            if (config.mcpServers && 'rivet' in config.mcpServers) {
-                warnIfStaleRivetCommand(config.mcpServers['rivet'], 'the Claude desktop app');
-                config.mcpServers['rivet'] = buildClaudeDesktopRivetEntry();
-                fs_1.default.writeFileSync(claudeDesktopMcpPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-                console.log('✓ Updated Rivet MCP server for the Claude desktop app');
-                updatedAny = true;
-            }
-        }
-        catch {
-            console.log('  Warning: could not update Claude desktop MCP config');
-        }
-    }
-    // Codex — remove then re-add so update works when already registered
-    try {
-        (0, child_process_1.execSync)('codex --version', { stdio: 'ignore' });
-        try {
-            (0, child_process_1.execSync)('codex mcp remove rivet', { stdio: 'pipe' });
-        }
-        catch {
-            // not registered, that's fine
-        }
-        if (registerCodexMCP()) {
-            console.log('✓ Updated Rivet MCP server for Codex');
-            updatedAny = true;
-        }
-    }
-    catch {
-        // Codex not installed — skip
-    }
-    if (!updatedAny) {
-        console.log("No editors found to update. Run 'rivet install <editor>' first.");
-        console.log('  rivet install claude');
-        console.log('  rivet install claude-desktop');
-        console.log('  rivet install cursor');
-        console.log('  rivet install codex');
-    }
-    else {
-        console.log('\nRestart your editor session to use the latest Rivet.\n');
-    }
+    (0, harnesses_1.updateHarnesses)();
 };
 /**
  * Handle login command
  */
 const handleLogin = async () => {
+    // Interactive terminal: open Rivet's own sign-in page rather than shelling
+    // straight to Google. The page's "Sign in with Google" button kicks off the
+    // OAuth flow and stores the token locally.
+    if (process.stdin.isTTY) {
+        const result = await (0, signin_1.runSignIn)({ nextStepHint: 'You can now run: rivet' });
+        if (!result.ok)
+            process.exit(1);
+        return;
+    }
+    // Headless / non-interactive: fall back to the terminal OAuth flow.
     console.log('\n🔐 Rivet Login with Google\n');
     const authService = new AuthService_1.AuthService();
     console.log('Opening browser for Google authentication...');