rivet-design 0.10.7 → 0.10.9

package/dist/services/VariantRunService.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VariantRunService = void 0;
+const InlineVariantGenerationService_1 = require("./InlineVariantGenerationService");
+/**
+ * Product-facing entry point for variant runs.
+ *
+ * Keeps callers independent from the lower-level variants state machine so
+ * desktop UI, MCP requests, and future hosted workers can start/refine/commit
+ * variants through the same lifecycle.
+ */
+class VariantRunService {
+    orchestrator;
+    elementVariantService;
+    constructor(options) {
+        this.orchestrator = options.orchestrator;
+        this.elementVariantService = new InlineVariantGenerationService_1.InlineVariantGenerationService({
+            bridge: options.bridge,
+            orchestrator: options.orchestrator,
+            runner: options.runner,
+            createSessionId: options.createSessionId,
+            leaseHeartbeatMs: options.leaseHeartbeatMs,
+        });
+    }
+    /**
+     * @effect Starts variants for a selected/commented element using the shared
+     * variants lifecycle.
+     */
+    async startElementVariants(request) {
+        return this.elementVariantService.processVariantRequest(request);
+    }
+    /**
+     * @effect Starts a refinement work item for an existing static preview variant.
+     */
+    refineVariant(args) {
+        return this.orchestrator.refineVariant(args);
+    }
+    /**
+     * @effect Commits the chosen variant through the shared orchestrator path.
+     */
+    commitVariant(args) {
+        return this.orchestrator.commitVariant(args);
+    }
+    /**
+     * @effect Cancels a variants session and lets the orchestrator clean up.
+     */
+    cancelVariants(args) {
+        return this.orchestrator.cancel(args);
+    }
+    /** Returns the active variants snapshot for UI and orchestration callers. */
+    getSnapshot() {
+        return this.orchestrator.buildActiveSnapshot();
+    }
+}
+exports.VariantRunService = VariantRunService;
+//# sourceMappingURL=VariantRunService.js.map

package/dist/services/VariantRunService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"VariantRunService.js","sourceRoot":"","sources":["../../src/services/VariantRunService.ts"],"names":[],"mappings":";;;AAOA,qFAG0C;AAW1C;;;;;;GAMG;AACH,MAAa,iBAAiB;IACX,YAAY,CAA4B;IACxC,qBAAqB,CAAiC;IAEvE,YAAY,OAAiC;QAC3C,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,qBAAqB,GAAG,IAAI,+DAA8B,CAAC;YAC9D,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;SAC3C,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,oBAAoB,CACxB,OAAsB;QAEtB,OAAO,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,IAKb;QACC,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,IAIb;QACC,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,IAGd;QACC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,6EAA6E;IAC7E,WAAW;QACT,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;IACjD,CAAC;CACF;AA9DD,8CA8DC"}

package/dist/services/VariantsRuntime.d.ts

@@ -0,0 +1,22 @@
+import type { AgentVariantsOrchestrator } from '../mcp/agent-variants';
+import { SessionBridgeService } from './SessionBridgeService';
+import type { TelemetryService } from './TelemetryService';
+import { VariantRunService } from './VariantRunService';
+import type { InlineVariantAgentRunner } from './InlineVariantGenerationService';
+export type VariantsRuntime = {
+    bridge: SessionBridgeService;
+    orchestrator: AgentVariantsOrchestrator;
+    runService: VariantRunService;
+};
+export type CreateVariantsRuntimeOptions = {
+    projectPath: string;
+    telemetry?: TelemetryService;
+    runner: InlineVariantAgentRunner;
+    devServerContext?: Parameters<SessionBridgeService['setDevServerContext']>[0];
+    devServerHealth?: Parameters<SessionBridgeService['updateDevServerHealth']>[0];
+};
+/**
+ * Creates the shared runtime used to start, preview, refine, and commit variant sessions.
+ */
+export declare const createVariantsRuntime: (options: CreateVariantsRuntimeOptions) => VariantsRuntime;
+//# sourceMappingURL=VariantsRuntime.d.ts.map

package/dist/services/VariantsRuntime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"VariantsRuntime.d.ts","sourceRoot":"","sources":["../../src/services/VariantsRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAEjF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,YAAY,EAAE,yBAAyB,CAAC;IACxC,UAAU,EAAE,iBAAiB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,MAAM,EAAE,wBAAwB,CAAC;IACjC,gBAAgB,CAAC,EAAE,UAAU,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,eAAe,CAAC,EAAE,UAAU,CAC1B,oBAAoB,CAAC,uBAAuB,CAAC,CAC9C,CAAC,CAAC,CAAC,CAAC;CACN,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,SAAS,4BAA4B,KACpC,eAsBF,CAAC"}

package/dist/services/VariantsRuntime.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createVariantsRuntime = void 0;
+const createAgentVariantsOrchestrator_1 = require("./createAgentVariantsOrchestrator");
+const SessionBridgeService_1 = require("./SessionBridgeService");
+const VariantRunService_1 = require("./VariantRunService");
+/**
+ * Creates the shared runtime used to start, preview, refine, and commit variant sessions.
+ */
+const createVariantsRuntime = (options) => {
+    const bridge = new SessionBridgeService_1.SessionBridgeService();
+    bridge.startSession(options.projectPath);
+    if (options.devServerContext) {
+        bridge.setDevServerContext(options.devServerContext);
+    }
+    if (options.devServerHealth) {
+        bridge.updateDevServerHealth(options.devServerHealth);
+    }
+    const orchestrator = (0, createAgentVariantsOrchestrator_1.createAgentVariantsOrchestrator)({
+        bridge,
+        telemetry: options.telemetry,
+        projectPathFallback: options.projectPath,
+    });
+    const runService = new VariantRunService_1.VariantRunService({
+        bridge,
+        orchestrator,
+        runner: options.runner,
+    });
+    return { bridge, orchestrator, runService };
+};
+exports.createVariantsRuntime = createVariantsRuntime;
+//# sourceMappingURL=VariantsRuntime.js.map

package/dist/services/VariantsRuntime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"VariantsRuntime.js","sourceRoot":"","sources":["../../src/services/VariantsRuntime.ts"],"names":[],"mappings":";;;AACA,uFAAoF;AACpF,iEAA8D;AAE9D,2DAAwD;AAmBxD;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,OAAqC,EACpB,EAAE;IACnB,MAAM,MAAM,GAAG,IAAI,2CAAoB,EAAE,CAAC;IAC1C,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACzC,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC5B,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,iEAA+B,EAAC;QACnD,MAAM;QACN,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,mBAAmB,EAAE,OAAO,CAAC,WAAW;KACzC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,qCAAiB,CAAC;QACvC,MAAM;QACN,YAAY;QACZ,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AAC9C,CAAC,CAAC;AAxBW,QAAA,qBAAqB,yBAwBhC"}

package/dist/services/VisualVariantAgentRunner.d.ts

@@ -0,0 +1,20 @@
+import type { ChangeRequest } from '../types/change-request-types';
+import type { InlineVariantAgentRunner } from './InlineVariantGenerationService';
+import type { TerminalAgentRunResult } from './TerminalAgentRunner';
+/**
+ * Runs variant work items through the visual editor's direct agent modification path.
+ */
+export declare class VisualVariantAgentRunner implements InlineVariantAgentRunner {
+    getDisplayName(): string;
+    /**
+     * @effect Executes a single variant request in the provided worktree and streams feedback to the variants lifecycle.
+     */
+    runChangeRequest(params: {
+        request: ChangeRequest;
+        cwd: string;
+        sessionId: string;
+        resumeSession?: boolean;
+        onFeedback: (message: string) => void;
+    }): Promise<TerminalAgentRunResult>;
+}
+//# sourceMappingURL=VisualVariantAgentRunner.d.ts.map

package/dist/services/VisualVariantAgentRunner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"VisualVariantAgentRunner.d.ts","sourceRoot":"","sources":["../../src/services/VisualVariantAgentRunner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAIvC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAyCpE;;GAEG;AACH,qBAAa,wBAAyB,YAAW,wBAAwB;IACvE,cAAc,IAAI,MAAM;IAIxB;;OAEG;IACG,gBAAgB,CAAC,MAAM,EAAE;QAC7B,OAAO,EAAE,aAAa,CAAC;QACvB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;KACvC,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAsCpC"}

package/dist/services/VisualVariantAgentRunner.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VisualVariantAgentRunner = void 0;
+const elementRefToContext_1 = require("../utils/elementRefToContext");
+const agent_1 = require("./agent");
+const commentChanges = (request) => request.changes.filter((change) => change.kind === 'comment');
+const buildInstruction = (request) => {
+    const comments = commentChanges(request);
+    if (comments.length === 0) {
+        return 'Apply the requested variant changes.';
+    }
+    if (comments.length === 1) {
+        return comments[0].instruction;
+    }
+    return comments
+        .map((comment, index) => `Comment ${index + 1}: ${comment.instruction}`)
+        .join('\n\n');
+};
+const buildElements = (request) => {
+    const elements = commentChanges(request).flatMap((comment) => (comment.elements?.length ? comment.elements : [comment.element]).map(elementRefToContext_1.elementRefToContext));
+    if (elements.length > 0) {
+        return elements;
+    }
+    return request.changes
+        .filter((change) => 'element' in change)
+        .map((change) => (0, elementRefToContext_1.elementRefToContext)(change.element));
+};
+/**
+ * Runs variant work items through the visual editor's direct agent modification path.
+ */
+class VisualVariantAgentRunner {
+    getDisplayName() {
+        return 'Rivet agent';
+    }
+    /**
+     * @effect Executes a single variant request in the provided worktree and streams feedback to the variants lifecycle.
+     */
+    async runChangeRequest(params) {
+        const service = new agent_1.AgentModService(params.cwd);
+        const result = await service.executeAgenticModification(buildInstruction(params.request), buildElements(params.request), (event) => {
+            if (event.type === 'error' && event.error) {
+                params.onFeedback(event.error);
+                return;
+            }
+            if (event.type === 'step' && event.step?.type === 'reasoning') {
+                const data = event.step.data;
+                if (typeof data.text === 'string' && data.text.trim()) {
+                    params.onFeedback(data.text.trim());
+                }
+            }
+        }, undefined, undefined, params.resumeSession ? params.sessionId : undefined, undefined, {
+            traceId: params.request.traceId ?? params.sessionId,
+            agentRunId: params.request.agentRunId ?? params.sessionId,
+            posthogSessionId: params.request.telemetryContext?.browserSessionId ?? undefined,
+        });
+        if (!result.success) {
+            return {
+                success: false,
+                error: result.changes || 'Variant generation failed',
+            };
+        }
+        return { success: true };
+    }
+}
+exports.VisualVariantAgentRunner = VisualVariantAgentRunner;
+//# sourceMappingURL=VisualVariantAgentRunner.js.map

package/dist/services/VisualVariantAgentRunner.js.map

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

package/dist/services/WorktreeManager.d.ts

@@ -6,6 +6,15 @@ export declare const FRESH_WORKTREES_DIRNAME = ".rivet-variants";
 export declare const INSTANCE_PREFIX: string;
 export declare class WorktreeManager {
     private readonly resolveProjectPath;
+    /**
+     * Ports handed out by `findFreePortFrom` to a dev server that hasn't bound
+     * them yet. Until a port is actually listening, a bind/connect probe still
+     * sees it as free, so without this set two concurrent variant starts would
+     * both walk away with the same "free" port and collide. Released (see
+     * `releasePort`) once the dev server has bound the port — at which point the
+     * listener check sees it taken — or has failed to start.
+     */
+    private readonly reservedPorts;
     /**
      * Accepts either a static path, null, or a lazy getter. The getter form
      * lets long-lived callers (e.g. the agent-variants orchestrator) defer the
@@ -96,6 +105,31 @@ export declare class WorktreeManager {
     applyDiffToProject(diff: string, projectPath: string): Promise<void>;
     /** Bind port 0 to get an OS-assigned free port */
     getFreePort(): Promise<number>;
+    /**
+     * Find a free port by scanning upward from `startPort` (the framework's
+     * default, e.g. 3000 for Next, 5173 for Vite). Returns the first port that is
+     * both bindable and not already reserved by a concurrent variant start, so a
+     * preview comes up on a sensible, predictable port near the project's normal
+     * one — and naturally steps past a port the user's own dev server already
+     * holds — instead of a random high port. Falls back to an OS-assigned port if
+     * the scan window is exhausted.
+     *
+     * Port availability is delegated to {@link findAvailablePort}, which (unlike a
+     * plain bind check) also rejects a port with an active listener on 127.0.0.1
+     * or ::1 — the ports that actually carry `localhost` preview traffic.
+     *
+     * The returned port is reserved synchronously; the caller MUST `releasePort`
+     * it once the dev server has bound it or failed to start (the orchestrator
+     * does this in a `finally`). Reserving here is what stops two concurrent
+     * starts — neither of which has bound its port yet — from both picking it.
+     */
+    findFreePortFrom(startPort: number, scanWindow?: number): Promise<number>;
+    /**
+     * Release a port previously handed out by {@link findFreePortFrom}. Call once
+     * the dev server has bound it (the listener check now sees it taken, so the
+     * reservation is redundant) or has failed to start (the port is free again).
+     */
+    releasePort(port: number): void;
     /** Validate a diff via `git apply --check` without modifying files */
     validateDiff(diff: string, reverse: boolean): Promise<void>;
     /**

package/dist/services/WorktreeManager.d.ts.map

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

package/dist/services/WorktreeManager.js

@@ -14,7 +14,18 @@ const logger_1 = require("../utils/logger");
 const designCatalog_1 = require("./templates/designCatalog");
 const viteReactTs_1 = require("./templates/viteReactTs");
 const sourceContext_1 = require("../mcp/agent-variants/sourceContext");
+const devServerError_1 = require("../utils/devServerError");
+const portUtils_1 = require("../utils/portUtils");
 const log = (0, logger_1.createLogger)('WorktreeManager');
+// How long to wait for a freshly-spawned dev server to answer on its port
+// before giving up. Generous because cold Vite/Next boots (esp. first compile)
+// can take 10s+. The probe now fails fast on early process exit, so this
+// ceiling only governs the "spawned but slow / never serves our port" case.
+const DEV_SERVER_READY_TIMEOUT_MS = 30_000;
+// Keep a rolling tail of the dev server's output so a failed start is
+// diagnosable (which port it tried, EADDRINUSE, missing script) without
+// retaining unbounded logs.
+const DEV_SERVER_OUTPUT_TAIL_LIMIT = 4_000;
 // Abort any git child process that goes silent (no stdout/stderr) for this
 // long. Provisioning worktrees for a large project (e.g. React Native, whose
 // working tree carries native build dirs) used to hang indefinitely because
@@ -43,6 +54,15 @@ const FRESH_ROOTS_REGISTRY_PATH = path_1.default.join(os_1.default.homedir(), '.
 const FRESH_SESSION_ERROR = 'Fresh-project sessions have no source project — this operation requires an existing project path.';
 class WorktreeManager {
     resolveProjectPath;
+    /**
+     * Ports handed out by `findFreePortFrom` to a dev server that hasn't bound
+     * them yet. Until a port is actually listening, a bind/connect probe still
+     * sees it as free, so without this set two concurrent variant starts would
+     * both walk away with the same "free" port and collide. Released (see
+     * `releasePort`) once the dev server has bound the port — at which point the
+     * listener check sees it taken — or has failed to start.
+     */
+    reservedPorts = new Set();
     /**
      * Accepts either a static path, null, or a lazy getter. The getter form
      * lets long-lived callers (e.g. the agent-variants orchestrator) defer the
@@ -184,8 +204,7 @@ class WorktreeManager {
     symlinkNodeModulesIfAvailable(sourceRoot, destRoot) {
         const nodeModulesSource = path_1.default.join(sourceRoot, 'node_modules');
         const nodeModulesDest = path_1.default.join(destRoot, 'node_modules');
-        if (fs_1.default.existsSync(nodeModulesSource) &&
-            !fs_1.default.existsSync(nodeModulesDest)) {
+        if (fs_1.default.existsSync(nodeModulesSource) && !fs_1.default.existsSync(nodeModulesDest)) {
             fs_1.default.mkdirSync(destRoot, { recursive: true });
             fs_1.default.symlinkSync(nodeModulesSource, nodeModulesDest);
         }
@@ -193,9 +212,14 @@ class WorktreeManager {
     /** Apply a patch string via stdin to the given cwd using git apply */
     applyPatchViaStdin(patch, cwd) {
         return new Promise((resolve, reject) => {
-            const cp = (0, child_process_1.spawn)('git', ['apply', '--whitespace=nowarn', '-'], { cwd, stdio: ['pipe', 'pipe', 'pipe'] });
+            const cp = (0, child_process_1.spawn)('git', ['apply', '--whitespace=nowarn', '-'], {
+                cwd,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
             let stderr = '';
-            cp.stderr.on('data', (d) => { stderr += d.toString(); });
+            cp.stderr.on('data', (d) => {
+                stderr += d.toString();
+            });
             cp.on('close', (code) => {
                 if (code !== 0)
                     reject(new Error(`git apply failed: ${stderr}`));
@@ -314,7 +338,9 @@ class WorktreeManager {
                 stdio: ['pipe', 'pipe', 'pipe'],
             });
             let stderr = '';
-            cp.stderr.on('data', (d) => { stderr += d.toString(); });
+            cp.stderr.on('data', (d) => {
+                stderr += d.toString();
+            });
             cp.on('close', (code) => {
                 if (code !== 0)
                     reject(new Error(`git apply failed: ${stderr}`));
@@ -347,6 +373,62 @@ class WorktreeManager {
             server.on('error', reject);
         });
     }
+    /**
+     * Find a free port by scanning upward from `startPort` (the framework's
+     * default, e.g. 3000 for Next, 5173 for Vite). Returns the first port that is
+     * both bindable and not already reserved by a concurrent variant start, so a
+     * preview comes up on a sensible, predictable port near the project's normal
+     * one — and naturally steps past a port the user's own dev server already
+     * holds — instead of a random high port. Falls back to an OS-assigned port if
+     * the scan window is exhausted.
+     *
+     * Port availability is delegated to {@link findAvailablePort}, which (unlike a
+     * plain bind check) also rejects a port with an active listener on 127.0.0.1
+     * or ::1 — the ports that actually carry `localhost` preview traffic.
+     *
+     * The returned port is reserved synchronously; the caller MUST `releasePort`
+     * it once the dev server has bound it or failed to start (the orchestrator
+     * does this in a `finally`). Reserving here is what stops two concurrent
+     * starts — neither of which has bound its port yet — from both picking it.
+     */
+    async findFreePortFrom(startPort, scanWindow = 64) {
+        const base = Number.isInteger(startPort) && startPort > 0 && startPort <= 65535
+            ? startPort
+            : 3000;
+        const limit = Math.min(65535, base + scanWindow - 1);
+        let from = base;
+        while (from <= limit) {
+            let candidate;
+            try {
+                candidate = await (0, portUtils_1.findAvailablePort)(from);
+            }
+            catch {
+                break; // no bindable port between `from` and 65535
+            }
+            if (candidate > limit)
+                break; // first free port is outside the scan window
+            // Check-and-claim with no `await` in between, so two concurrent callers
+            // can't both observe the same port as unreserved before claiming it.
+            if (!this.reservedPorts.has(candidate)) {
+                this.reservedPorts.add(candidate);
+                return candidate;
+            }
+            from = candidate + 1; // reserved by a sibling start — step past it
+        }
+        // Scan window exhausted (or every free port in it is reserved by a sibling
+        // that hasn't bound yet) — fall back to an OS-assigned ephemeral port.
+        const fallback = await this.getFreePort();
+        this.reservedPorts.add(fallback);
+        return fallback;
+    }
+    /**
+     * Release a port previously handed out by {@link findFreePortFrom}. Call once
+     * the dev server has bound it (the listener check now sees it taken, so the
+     * reservation is redundant) or has failed to start (the port is free again).
+     */
+    releasePort(port) {
+        this.reservedPorts.delete(port);
+    }
     /** Validate a diff via `git apply --check` without modifying files */
     validateDiff(diff, reverse) {
         if (!diff.trim())
@@ -361,7 +443,9 @@ class WorktreeManager {
                 stdio: ['pipe', 'pipe', 'pipe'],
             });
             let stderr = '';
-            cp.stderr.on('data', (d) => { stderr += d.toString(); });
+            cp.stderr.on('data', (d) => {
+                stderr += d.toString();
+            });
             cp.on('close', (code) => {
                 if (code !== 0)
                     reject(new Error(`Diff validation failed: ${stderr.trim()}`));
@@ -383,50 +467,113 @@ class WorktreeManager {
             stdio: 'pipe',
             detached: false,
         });
-        proc.on('error', (err) => log.warn(`Dev server error (port ${port}):`, err));
-        // Drain stdout/stderr. With `stdio: 'pipe'` and no consumer, the OS pipe
-        // buffer (~64KB) fills within seconds of Vite's HMR/request logging and
-        // the child blocks on write, freezing the dev server even though it
-        // passed the readiness probe.
-        proc.stdout?.on('data', (data) => {
-            log.debug(`[variant-dev:${port}] ${data.toString().trim()}`);
-        });
-        proc.stderr?.on('data', (data) => {
+        // Capture a rolling tail of the child's output so a failed start is
+        // diagnosable (EADDRINUSE, missing dev script, build crash) instead of a
+        // blind timeout. Draining the pipes is also required: with `stdio: 'pipe'`
+        // and no consumer, the OS pipe buffer (~64KB) fills within seconds of
+        // Vite's HMR/request logging and the child blocks on write, freezing the
+        // dev server even though it passed the readiness probe.
+        let outputTail = '';
+        const drain = (data) => {
+            outputTail = (outputTail + data.toString()).slice(-DEV_SERVER_OUTPUT_TAIL_LIMIT);
             log.debug(`[variant-dev:${port}] ${data.toString().trim()}`);
-        });
-        const deadline = Date.now() + 30_000;
+        };
+        proc.stdout?.on('data', drain);
+        proc.stderr?.on('data', drain);
+        // Track early termination so the probe can fail fast: a dev server that
+        // exits (or never spawns) before answering on `port` is never coming up —
+        // commonly because the project's dev script ignored the injected port and
+        // tried to bind its own default, which was already taken (EADDRINUSE).
+        const term = {};
+        const onExit = (code, signal) => {
+            term.exited = { code, signal };
+        };
+        const onError = (err) => {
+            term.spawnError = err;
+            log.warn(`Dev server error (port ${port}):`, err);
+        };
+        proc.once('exit', onExit);
+        proc.once('error', onError);
+        const detach = () => {
+            proc.off('exit', onExit);
+            proc.off('error', onError);
+        };
+        const fail = (reason) => {
+            detach();
+            const portInUse = (0, devServerError_1.isPortInUseOutput)(outputTail);
+            const detail = outputTail.trim();
+            let message;
+            if (reason === 'spawn_error') {
+                message = `Dev server failed to spawn on port ${port}: ${term.spawnError?.message ?? 'unknown error'}`;
+            }
+            else if (reason === 'exited') {
+                message = `Dev server exited before becoming ready on port ${port} (code=${term.exited?.code ?? 'null'}, signal=${term.exited?.signal ?? 'null'}${portInUse ? ', port already in use' : ''})`;
+            }
+            else {
+                message = `Dev server on port ${port} did not become ready within ${DEV_SERVER_READY_TIMEOUT_MS / 1000}s`;
+            }
+            throw new devServerError_1.DevServerStartError({
+                message: detail ? `${message}\n${detail}` : message,
+                reason,
+                portInUse,
+                detail,
+                exitCode: term.exited?.code ?? null,
+                signal: term.exited?.signal ?? null,
+            });
+        };
+        const deadline = Date.now() + DEV_SERVER_READY_TIMEOUT_MS;
         while (Date.now() < deadline) {
+            if (term.spawnError)
+                fail('spawn_error');
+            if (term.exited)
+                fail('exited');
             try {
                 const res = await fetch(`http://localhost:${port}`, {
                     signal: AbortSignal.timeout(1_000),
                 });
-                if (res.status !== 502)
+                if (res.status !== 502) {
+                    detach();
                     return proc;
+                }
             }
             catch {
                 // not up yet
             }
             await new Promise((r) => setTimeout(r, 500));
         }
+        // Deadline hit. If the child died during the final wait, report that
+        // (actionable) rather than a generic timeout.
+        if (term.spawnError)
+            fail('spawn_error');
+        if (term.exited)
+            fail('exited');
         try {
             proc.kill('SIGTERM');
         }
-        catch { /* ignore */ }
-        throw new Error(`Dev server on port ${port} did not become ready within 30s`);
+        catch {
+            /* ignore */
+        }
+        return fail('timeout');
     }
     /** Stop a dev server with SIGTERM + SIGKILL fallback */
     async stopDevServer(proc, timeoutMs = 5_000) {
         if (proc.killed || proc.exitCode !== null || proc.pid == null)
             return;
         const exited = new Promise((resolve) => {
-            const done = () => { proc.off('exit', done); proc.off('error', done); resolve(); };
+            const done = () => {
+                proc.off('exit', done);
+                proc.off('error', done);
+                resolve();
+            };
             proc.once('exit', done);
             proc.once('error', done);
         });
         try {
             proc.kill('SIGTERM');
         }
-        catch { /* ignore */ }
+        catch {
+            /* ignore */
+        }
         const timedOut = await Promise.race([
             exited.then(() => false),
             new Promise((r) => setTimeout(() => r(true), timeoutMs)),
@@ -436,7 +583,9 @@ class WorktreeManager {
         try {
             proc.kill('SIGKILL');
         }
-        catch { /* ignore */ }
+        catch {
+            /* ignore */
+        }
         await exited;
     }
     /** Remove all worktrees for a session.