rivet-design 0.8.6 → 0.9.1

package/dist/mcp/agent-variants/pendingChangesAdapter.d.ts

@@ -0,0 +1,38 @@
+import type { ChangeRequest } from '../../types/change-request-types';
+import type { VariantPickEnvelope, VariantPickPayload } from './contracts';
+/**
+ * Bridge contract — matches `SessionBridgeService.queueChangeRequest` so this
+ * adapter can pass a `SessionBridgeService` instance directly. The fake bridge
+ * in unit tests captures intents without touching disk.
+ */
+export interface BridgeQueue {
+    queueChangeRequest(intent: ChangeRequest): void;
+}
+/** @deprecated — alias kept for tests that haven't migrated yet. */
+export type BridgeChangeIntent = ChangeRequest;
+export interface AdapterTelemetry {
+    enqueued(envelope: VariantPickEnvelope): void;
+    duplicateSuppressed(envelope: VariantPickEnvelope): void;
+}
+export declare class PendingChangesAdapter {
+    private readonly enqueued;
+    private readonly bridge;
+    private readonly telemetry;
+    constructor(bridge: BridgeQueue, telemetry?: AdapterTelemetry);
+    /**
+     * Enqueue a chosen variant into the existing pending-changes channel.
+     * Idempotent on `{sourceSessionId, variantId}`: a repeated submit with the
+     * same key returns `enqueued: false, duplicate: true` and does not re-call
+     * the bridge.
+     */
+    enqueue(envelope: VariantPickEnvelope): {
+        enqueued: boolean;
+        duplicate: boolean;
+    };
+    /**
+     * Test/inspect helper — count of unique variants successfully enqueued.
+     */
+    size(): number;
+}
+export type { VariantPickPayload };
+//# sourceMappingURL=pendingChangesAdapter.d.ts.map

package/dist/mcp/agent-variants/pendingChangesAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pendingChangesAdapter.d.ts","sourceRoot":"","sources":["../../../src/mcp/agent-variants/pendingChangesAdapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EAEd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE3E;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;CACjD;AAED,oEAAoE;AACpE,MAAM,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAE/C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC9C,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAC;CAC1D;AAOD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0C;IACnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;gBAEjC,MAAM,EAAE,WAAW,EAAE,SAAS,GAAE,gBAAiC;IAK7E;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,mBAAmB,GAAG;QACtC,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;KACpB;IAqBD;;OAEG;IACH,IAAI,IAAI,MAAM;CAGf;AAmCD,YAAY,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/mcp/agent-variants/pendingChangesAdapter.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PendingChangesAdapter = void 0;
+const crypto_1 = require("crypto");
+const NOOP_TELEMETRY = {
+    enqueued: () => undefined,
+    duplicateSuppressed: () => undefined,
+};
+class PendingChangesAdapter {
+    enqueued = new Map();
+    bridge;
+    telemetry;
+    constructor(bridge, telemetry = NOOP_TELEMETRY) {
+        this.bridge = bridge;
+        this.telemetry = telemetry;
+    }
+    /**
+     * Enqueue a chosen variant into the existing pending-changes channel.
+     * Idempotent on `{sourceSessionId, variantId}`: a repeated submit with the
+     * same key returns `enqueued: false, duplicate: true` and does not re-call
+     * the bridge.
+     */
+    enqueue(envelope) {
+        const key = idempotencyKey(envelope);
+        if (this.enqueued.has(key)) {
+            this.telemetry.duplicateSuppressed(envelope);
+            return { enqueued: false, duplicate: true };
+        }
+        const variantItem = toVariantChangeItem(envelope);
+        const request = {
+            changes: [variantItem],
+            sourceFiles: [],
+            traceId: (0, crypto_1.randomUUID)(),
+            agentRunId: (0, crypto_1.randomUUID)(),
+        };
+        this.bridge.queueChangeRequest(request);
+        this.enqueued.set(key, envelope);
+        this.telemetry.enqueued(envelope);
+        return { enqueued: true, duplicate: false };
+    }
+    /**
+     * Test/inspect helper — count of unique variants successfully enqueued.
+     */
+    size() {
+        return this.enqueued.size;
+    }
+}
+exports.PendingChangesAdapter = PendingChangesAdapter;
+function idempotencyKey(envelope) {
+    return `${envelope.sourceSessionId}|${envelope.variantId}`;
+}
+function toVariantChangeItem(envelope) {
+    const base = {
+        kind: 'variant',
+        sourceSessionId: envelope.sourceSessionId,
+        variantId: envelope.variantId,
+        variantLabel: envelope.variantLabel,
+        destinationPath: envelope.destinationPath,
+        changedFilesCount: envelope.changedFilesCount,
+    };
+    if (envelope.payload.kind === 'diff') {
+        return {
+            ...base,
+            payload: {
+                kind: 'diff',
+                diff: envelope.payload.diff,
+                target: envelope.payload.target,
+            },
+        };
+    }
+    return {
+        ...base,
+        payload: {
+            kind: 'new-project',
+            sourceWorktreePath: envelope.payload.sourceWorktreePath,
+        },
+    };
+}
+//# sourceMappingURL=pendingChangesAdapter.js.map

package/dist/mcp/agent-variants/pendingChangesAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pendingChangesAdapter.js","sourceRoot":"","sources":["../../../src/mcp/agent-variants/pendingChangesAdapter.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAwBpC,MAAM,cAAc,GAAqB;IACvC,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;IACzB,mBAAmB,EAAE,GAAG,EAAE,CAAC,SAAS;CACrC,CAAC;AAEF,MAAa,qBAAqB;IACf,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IAClD,MAAM,CAAc;IACpB,SAAS,CAAmB;IAE7C,YAAY,MAAmB,EAAE,YAA8B,cAAc;QAC3E,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,QAA6B;QAInC,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAC7C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC9C,CAAC;QAED,MAAM,WAAW,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,OAAO,GAAkB;YAC7B,OAAO,EAAE,CAAC,WAAW,CAAC;YACtB,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,IAAA,mBAAU,GAAE;YACrB,UAAU,EAAE,IAAA,mBAAU,GAAE;SACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;CACF;AA9CD,sDA8CC;AAED,SAAS,cAAc,CAAC,QAA6B;IACnD,OAAO,GAAG,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;AAC7D,CAAC;AAED,SAAS,mBAAmB,CAAC,QAA6B;IACxD,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,SAAkB;QACxB,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;KAC9C,CAAC;IACF,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACrC,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE;gBACP,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI;gBAC3B,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM;aAChC;SACF,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE;YACP,IAAI,EAAE,aAAa;YACnB,kBAAkB,EAAE,QAAQ,CAAC,OAAO,CAAC,kBAAkB;SACxD;KACF,CAAC;AACJ,CAAC"}

package/dist/mcp/agent-variants/tools.d.ts

@@ -0,0 +1,8 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { AgentVariantsOrchestrator } from './WorktreeOrchestrator';
+export interface ToolDeps {
+    orchestrator: AgentVariantsOrchestrator;
+    leaseOwner: () => string;
+}
+export declare function registerAgentVariantsTools(mcp: McpServer, deps: ToolDeps): void;
+//# sourceMappingURL=tools.d.ts.map

package/dist/mcp/agent-variants/tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/mcp/agent-variants/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA0BzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAExE,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,yBAAyB,CAAC;IACxC,UAAU,EAAE,MAAM,MAAM,CAAC;CAC1B;AAED,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,QAAQ,GACb,IAAI,CAoON"}

package/dist/mcp/agent-variants/tools.js

@@ -0,0 +1,221 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerAgentVariantsTools = registerAgentVariantsTools;
+const contracts_1 = require("./contracts");
+const errors_1 = require("./errors");
+function registerAgentVariantsTools(mcp, deps) {
+    mcp.tool('propose_variants', 'START HERE for any "create variants", "show me N options for X", "explore approaches to X", "build me Y from scratch", or "create a new Z app" request. DO NOT generate variants natively (Task tool, parallel tool calls, or your own creative process). Returns { sessionId, briefWorkItem }. Protocol: 1) call this tool, 2) run the brief work item with your own LLM to generate N briefs, 3) call report_variant_briefs, 3.5) AUTO-OPEN the Rivet editor — call detect_project + open_visual_editor if not already open; the user needs the iframe up to see variants render, do NOT wait for them to ask, 4) SHOW the briefs to the user IN CHAT as a numbered list and ask "look good or want adjustments?" — DO NOT ask which one to pick, 5) wait for user feedback (affirmative → proceed; tweak → bodyOverride or re-brief), 6) call approve_variant_briefs({sessionId, briefIds: [all]}), 7) call continue_variants(action="request_work") to lease all items in parallel (scaffold_base first for fresh-project), 8) run all code-gens IN PARALLEL in their own worktreePath, calling report_variant_complete per item, 9) DO NOT print diffs — instead tell the user the variants are ready and to use the chip at the bottom-center of the Rivet iframe to cycle (prev/next pills) and commit (check button), 10) watch_for_changes (or poll get_pending_changes) — when the user clicks the check, you get a VariantChangeItem on the queue, 11) apply via git apply (diff payload) or copy the worktree (new-project payload). Pass projectContext.kind=fresh with workspacePath for brand-new projects.', contracts_1.proposeVariantsInput, async (args) => {
+        try {
+            const result = deps.orchestrator.propose({
+                sessionId: args.sessionId,
+                prompt: args.prompt,
+                count: args.count,
+                target: args.target,
+                projectContext: args.projectContext,
+            });
+            const out = {
+                sessionId: result.sessionId,
+                stage: 'awaiting_briefs',
+                briefWorkItem: {
+                    id: result.briefWorkItem.id,
+                    kind: 'brief',
+                    attempt: result.briefWorkItem.attempt,
+                    input: result.briefWorkItem.input,
+                    output_schema: { briefs: 'Array<{briefId, label, body}>' },
+                },
+                nextAction: 'report_variant_briefs',
+            };
+            return jsonResponse(out);
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+    mcp.tool('report_variant_briefs', 'Agent reports N drafted briefs back to Rivet after running its own LLM call on the brief work item. Transitions the session to awaiting_approval; user reviews briefs in the variants tab.', contracts_1.reportVariantBriefsInput, async (args) => {
+        try {
+            const result = deps.orchestrator.reportBriefs({
+                sessionId: args.sessionId,
+                workItemId: args.workItemId,
+                attempt: args.attempt,
+                leaseId: args.leaseId,
+                briefs: args.briefs,
+            });
+            const out = {
+                stage: 'awaiting_approval',
+                briefs: result.briefs,
+                nextAction: 'continue_variants',
+            };
+            return jsonResponse(out);
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+    mcp.tool('approve_variant_briefs', 'Call AFTER showing the briefs to the user in chat and getting an affirmative ("looks good", "yep", "go") OR refined selections from them. Provide briefIds for ALL the briefs the user wants generated (typically all of them). Each approved brief gets a parallel code-gen work item — Rivet provisions one isolated worktree per item. Advance via continue_variants(action="request_work") to lease and run them in parallel. For tweak-with-feedback, use the selections form with bodyOverride per brief.', contracts_1.approveVariantBriefsInput, async (args) => {
+        try {
+            const selections = args.selections ??
+                (args.briefIds ?? []).map((briefId) => ({ briefId }));
+            if (selections.length === 0) {
+                throw new Error('approve_variant_briefs requires either briefIds or selections');
+            }
+            const result = await deps.orchestrator.approve({
+                sessionId: args.sessionId,
+                selections,
+            });
+            const out = {
+                stage: 'work_items_ready',
+                approvedCount: result.approvedCount,
+                codeGenWorkItemIds: result.codeGenWorkItemIds,
+                scaffoldBaseWorkItemId: result.scaffoldBaseWorkItemId ?? null,
+                nextAction: 'continue_variants',
+            };
+            return jsonResponse(out);
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+    mcp.tool('commit_variant', "Call AFTER all variants have been generated AND you've shown each variant's diff/changes to the user in chat AND the user has picked one. Pass the variantId (the workItemId of the chosen variant). Rivet looks up that variant's captured diff and enqueues it onto the existing pending-changes channel — call get_pending_changes next to retrieve and apply. Idempotent on (sessionId, variantId).", contracts_1.commitVariantInput, async (args) => {
+        try {
+            const result = await deps.orchestrator.commitVariant({
+                sessionId: args.sessionId,
+                variantId: args.variantId,
+            });
+            const out = {
+                stage: deps.orchestrator.getStage(args.sessionId),
+                enqueued: result.enqueued,
+                duplicate: result.duplicate,
+                changedFilesCount: result.changedFilesCount,
+            };
+            return jsonResponse(out);
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+    mcp.tool('continue_variants', 'Long-poll/state-pump the variants flow. action=check returns immediately; action=wait blocks up to ~5min for a state change; action=request_work asks for a lease on ready work items.', contracts_1.continueVariantsInput, async (args) => {
+        try {
+            const stage = deps.orchestrator.getStage(args.sessionId);
+            if (stage === 'awaiting_briefs') {
+                // continue_variants while still awaiting briefs means the agent
+                // hasn't run the brief work item yet — that's a programming error.
+                throw new errors_1.AgentVariantsError('INVALID_STAGE_ACTION', 'Run the brief work item and call report_variant_briefs before continue_variants');
+            }
+            if (stage === 'awaiting_approval') {
+                return jsonResponse({
+                    stage: 'awaiting_approval',
+                    briefs: deps.orchestrator.getBriefs(args.sessionId),
+                });
+            }
+            if (stage === 'work_items_ready' &&
+                args.action === 'request_work') {
+                const lease = deps.orchestrator.requestWork({
+                    sessionId: args.sessionId,
+                    leaseOwner: deps.leaseOwner(),
+                    requestedLeaseCount: args.requestedLeaseCount,
+                });
+                return jsonResponse({
+                    stage: 'work_items_ready',
+                    leaseId: lease.leaseId,
+                    leaseTtlMs: lease.leaseTtlMs,
+                    leasedWorkItems: lease.leasedWorkItems,
+                });
+            }
+            if (stage === 'work_items_ready' || stage === 'waiting_for_results') {
+                return jsonResponse({
+                    stage: 'waiting_for_results',
+                    progress: deps.orchestrator.getProgress(args.sessionId),
+                });
+            }
+            // Terminal stages
+            return jsonResponse({
+                stage,
+                summary: deps.orchestrator.getSummary(args.sessionId),
+            });
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+    mcp.tool('report_variant_complete', "Agent reports per-variant code-gen status: running (heartbeat), succeeded, failed, or cancelled. Requires a valid leaseId and matching attempt obtained from continue_variants(action='request_work').", contracts_1.reportVariantCompleteInput, async (args) => {
+        try {
+            const result = await deps.orchestrator.reportComplete({
+                sessionId: args.sessionId,
+                workItemId: args.workItemId,
+                leaseId: args.leaseId,
+                attempt: args.attempt,
+                status: args.status,
+                output: args.output,
+                error: args.error,
+            });
+            let out;
+            if (result.stage === 'ready' ||
+                result.stage === 'degraded' ||
+                result.stage === 'failed' ||
+                result.stage === 'cancelled') {
+                out = {
+                    stage: result.stage,
+                    summary: result.summary ?? deps.orchestrator.getSummary(args.sessionId),
+                };
+            }
+            else {
+                out = {
+                    stage: 'waiting_for_results',
+                    progress: result.progress,
+                };
+            }
+            return jsonResponse(out);
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+    mcp.tool('cancel_variants', 'Cancel an in-flight variants session. Stops accepting new execution leases, marks running items cancelled, and triggers cleanup.', contracts_1.cancelVariantsInput, async (args) => {
+        try {
+            const result = await deps.orchestrator.cancel({
+                sessionId: args.sessionId,
+                reason: args.reason,
+            });
+            const out = {
+                stage: 'cancelled',
+                cleanupStatus: result.cleanupStatus,
+            };
+            return jsonResponse(out);
+        }
+        catch (err) {
+            return errorResponse(err);
+        }
+    });
+}
+// --- Helpers --------------------------------------------------------------
+// Return type is left implicit so the MCP SDK's overload selection picks the
+// raw-shape variant; tagging an explicit interface here breaks the index
+// signature the SDK expects.
+function jsonResponse(payload) {
+    return {
+        content: [
+            {
+                type: 'text',
+                text: JSON.stringify(payload),
+            },
+        ],
+    };
+}
+function errorResponse(err) {
+    const code = err instanceof errors_1.AgentVariantsError ? err.code : 'SCHEMA_VALIDATION_FAILED';
+    const message = err instanceof Error ? err.message : 'Unknown error in agent-variants tool';
+    return {
+        content: [
+            {
+                type: 'text',
+                text: JSON.stringify({
+                    stage: 'failed',
+                    errorCode: code,
+                    message,
+                }),
+            },
+        ],
+        isError: true,
+    };
+}
+//# sourceMappingURL=tools.js.map

package/dist/mcp/agent-variants/tools.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAyfA,eAAO,MAAM,cAAc,GAAU,YAAY,MAAM,KAAG,OAAO,CAAC,IAAI,CAm8BrE,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAgeA,eAAO,MAAM,cAAc,GAAU,YAAY,MAAM,KAAG,OAAO,CAAC,IAAI,CAo/BrE,CAAC"}

package/dist/mcp/server.js

@@ -16,41 +16,16 @@ const index_1 = require("../index");
 const evaluateFlags_1 = require("../config/evaluateFlags");
 const skillWriter_1 = require("../utils/skillWriter");
 const portUtils_1 = require("../utils/portUtils");
+const agent_variants_1 = require("./agent-variants");
+const WorktreeManager_1 = require("../services/WorktreeManager");
+const ProjectDetectionService_1 = require("../services/ProjectDetectionService");
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
+const devServerCommand_1 = require("../utils/devServerCommand");
 const log = (0, index_core_1.createLogger)('MCPServer');
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
-// Dev server command + default port per framework
-const FRAMEWORK_DEV_CONFIG = {
-    nextjs: { devCommand: 'dev', defaultPort: 3000 },
-    vite: { devCommand: 'dev', defaultPort: 5173 },
-    cra: { devCommand: 'start', defaultPort: 3000 },
-    remix: { devCommand: 'dev', defaultPort: 3000 },
-    svelte: { devCommand: 'dev', defaultPort: 5173 },
-    static: { devCommand: '', defaultPort: 0 },
-};
-/** Build the shell command to start the user's dev server on a specific port. */
-function buildDevServerCommand(framework, packageManager, devCommand, port) {
-    // CRA uses PORT env var instead of a CLI flag
-    if (framework === 'cra') {
-        const args = packageManager === 'npm' ? ['run', devCommand] : [devCommand];
-        return { cmd: packageManager, args, env: { PORT: String(port) } };
-    }
-    // All others (Next.js, Vite, Remix, Svelte) accept --port
-    if (packageManager === 'npm') {
-        return {
-            cmd: 'npm',
-            args: ['run', devCommand, '--', '--port', String(port)],
-            env: {},
-        };
-    }
-    if (packageManager === 'yarn') {
-        return { cmd: 'yarn', args: [devCommand, '--port', String(port)], env: {} };
-    }
-    return { cmd: 'pnpm', args: [devCommand, '--port', String(port)], env: {} };
-}
 /** Poll until the port responds to HTTP or the timeout is reached. */
 async function waitForPort(port, host, timeoutMs = 60_000) {
     const deadline = Date.now() + timeoutMs;
@@ -314,6 +289,8 @@ function getSendButtonLabel(mcpEditor) {
         return 'Send to Cursor';
     if (mcpEditor === 'codex')
         return 'Send to Codex';
+    if (mcpEditor === 'claude-desktop')
+        return 'Send to Claude';
     return 'Send to Claude Code';
 }
 function trackChangesQueuedFromIntent(intent, bridge, telemetry, sessionId) {
@@ -393,10 +370,42 @@ const startMCPServer = async (mcpEditor) => {
     // then silence all output — users shouldn't see Rivet logs in their terminal.
     // Error capture (_onError) still fires for PostHog since it bypasses loglevel.
     (0, index_core_1.redirectLogsToStderr)();
-    (0, index_core_1.setLogLevel)('SILENT');
+    // Default silent so MCP transport stays clean; opt in via env for debugging
+    // (e.g. `RIVET_LOG_LEVEL=debug` in the MCP client's env block).
+    (0, index_core_1.setLogLevel)(process.env.RIVET_LOG_LEVEL ?? 'SILENT');
     const sendButtonLabel = getSendButtonLabel(mcpEditor);
     const bridge = new SessionBridgeService_1.SessionBridgeService();
     const telemetry = new TelemetryService_1.TelemetryService();
+    // Agent-driven variants orchestrator. Long-lived singleton: state machine +
+    // worktree lifecycle for any variants session, surfaced via the 5 MCP tools
+    // (registered below near mcp.connect) and the /api/variants Express routes
+    // (mounted by startServer when this orchestrator is passed in).
+    const agentVariantsStore = new agent_variants_1.SessionStore();
+    const agentVariantsAdapter = new agent_variants_1.PendingChangesAdapter(bridge);
+    // WorktreeManager binds its project path lazily — the orchestrator
+    // outlives any MCP session, but `bridge.getProjectPath()` only becomes
+    // known once `open_visual_editor` runs. The getter resolves on each call.
+    const agentVariantsOrchestrator = new agent_variants_1.AgentVariantsOrchestrator({
+        store: agentVariantsStore,
+        worktreeManager: new WorktreeManager_1.WorktreeManager(() => bridge.getProjectPath() ?? process.cwd()),
+        pendingChangesAdapter: agentVariantsAdapter,
+        telemetry,
+        resolveProjectEnvironment: async (sessionId) => {
+            const projectPath = bridge.getProjectPath() ?? process.cwd();
+            const detection = new ProjectDetectionService_1.ProjectDetectionService();
+            const framework = detection.detectFramework(projectPath);
+            const packageManager = await detection.detectPackageManager(projectPath);
+            const devCommand = devServerCommand_1.FRAMEWORK_DEV_CONFIG[framework]?.devCommand ?? 'dev';
+            log.info(`Resolved env for variants session ${sessionId}: ${framework}/${packageManager}`);
+            return {
+                projectPath,
+                framework,
+                packageManager,
+                devCommand,
+                buildDevCommand: (port) => (0, devServerCommand_1.buildDevServerCommand)(framework, packageManager, devCommand, port),
+            };
+        },
+    });
     /** Complete the active run correlation and refresh git status in the Rivet UI. */
     const handleRefreshGit = (sessionId) => {
         const activeRunCorrelation = bridge.completeActiveRunCorrelation();
@@ -599,7 +608,7 @@ const startMCPServer = async (mcpEditor) => {
                 isError: true,
             };
         }
-        const devConfig = FRAMEWORK_DEV_CONFIG[framework] ?? {
+        const devConfig = devServerCommand_1.FRAMEWORK_DEV_CONFIG[framework] ?? {
             devCommand: 'dev',
             defaultPort: 3000,
         };
@@ -651,7 +660,7 @@ const startMCPServer = async (mcpEditor) => {
         let nextDevServerOwnership = 'none';
         const startupModeSelection = requestedStartupMode ? 'explicit' : 'auto';
         if (framework !== 'static') {
-            const frameworkConfig = FRAMEWORK_DEV_CONFIG[framework] ?? {
+            const frameworkConfig = devServerCommand_1.FRAMEWORK_DEV_CONFIG[framework] ?? {
                 devCommand: 'dev',
                 defaultPort: 3000,
             };
@@ -763,7 +772,7 @@ const startMCPServer = async (mcpEditor) => {
                     detection.readConfiguredPort(projectPath) ??
                     frameworkConfig.defaultPort;
                 nextDevServerPort = await (0, portUtils_1.findAvailablePort)(preferredPort);
-                const { cmd, args: cmdArgs, env, } = buildDevServerCommand(framework, packageManager, frameworkConfig.devCommand, nextDevServerPort);
+                const { cmd, args: cmdArgs, env, } = (0, devServerCommand_1.buildDevServerCommand)(framework, packageManager, frameworkConfig.devCommand, nextDevServerPort);
                 log.info(`Auto-starting dev server: ${cmd} ${cmdArgs.join(' ')} in ${projectPath}`);
                 devServerProcess = (0, child_process_1.spawn)(cmd, cmdArgs, {
                     cwd: projectPath,
@@ -875,6 +884,7 @@ const startMCPServer = async (mcpEditor) => {
                     userPort: nextDevServerPort ?? 0,
                     userHost: nextDevServerHost,
                     sessionBridge: bridge,
+                    agentVariantsOrchestrator,
                     telemetry,
                     mcpEditor,
                     skipProcessHandlers: true,
@@ -980,7 +990,7 @@ const startMCPServer = async (mcpEditor) => {
                         startupModeSelection,
                         requestedStartupMode,
                         isGitEnabled: isGitEnabledForSession,
-                        next_step: mcpEditor === 'cursor' || mcpEditor === 'codex'
+                        next_step: mcpEditor === 'cursor' || mcpEditor === 'codex' || mcpEditor === 'claude-desktop'
                             ? `Rivet is open. Tell the user: "Rivet is ready — make your visual changes and click '${sendButtonLabel}'." Then call watch_for_changes({ sessionId: "${sessionId}" }) to wait for their changes. After applying, STOP and ask the user if they want to keep watching or go back to normal prompting.`
                             : `Rivet is open. Tell the user: "Rivet is ready — make your visual changes and click '${sendButtonLabel}'."
 
@@ -1156,6 +1166,13 @@ If the Monitor tool is not available, call watch_for_changes({ sessionId: "${ses
             ],
         };
     });
+    // Register the agent-variants MCP tools (orchestrator was constructed at
+    // the top of runMcpServer so it's shared with the Express routes).
+    (0, agent_variants_1.registerAgentVariantsTools)(mcp, {
+        orchestrator: agentVariantsOrchestrator,
+        leaseOwner: () => 'mcp-server',
+    });
+    log.info('agent-variants MCP tools registered');
     // Connect via stdio
     const transport = new stdio_js_1.StdioServerTransport();
     await mcp.connect(transport);