rivet-design 0.21.9 → 0.22.0

package/dist/agent-variants/WorktreeOrchestrator.js

@@ -5,11 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentVariantsOrchestrator = exports.buildStaticPreviewDocument = void 0;
 const workItemContextFiles_1 = require("./workItemContextFiles");
+const staticPreviewFiles_1 = require("./staticPreviewFiles");
+const workItemPreviewRoutes_1 = require("./workItemPreviewRoutes");
 const staticPreviewRefinements_1 = require("./staticPreviewRefinements");
 const crypto_1 = require("crypto");
 const events_1 = require("events");
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const DependencyPreparationService_1 = require("../services/DependencyPreparationService");
 const simple_git_1 = require("simple-git");
@@ -33,6 +34,7 @@ const variantsTelemetry_1 = require("./variantsTelemetry");
 const variantWorkspaceFiles_1 = require("./variantWorkspaceFiles");
 const errnoCode_1 = require("../utils/errnoCode");
 const errorMessage_1 = require("../utils/errorMessage");
+const pathContainment_1 = require("../utils/pathContainment");
 var variantWorkspaceFiles_2 = require("./variantWorkspaceFiles");
 Object.defineProperty(exports, "buildStaticPreviewDocument", { enumerable: true, get: function () { return variantWorkspaceFiles_2.buildStaticPreviewDocument; } });
 const log = (0, logger_1.createLogger)('AgentVariantsOrchestrator');
@@ -184,8 +186,7 @@ const buildDiffCaptureFailureQa = (detail, message) => ({
     summary: DIFF_CAPTURE_FAILURE_SUMMARY,
 });
 const isDesignCreationCodeGenInput = (input, prompt) => {
-    const codeGenInput = input;
-    const text = [prompt, codeGenInput?.briefLabel, codeGenInput?.briefBody]
+    const text = [prompt, input?.briefLabel, input?.briefBody]
         .filter((value) => typeof value === 'string')
         .join('\n');
     if (NON_VISUAL_CHANGE_RE.test(text))
@@ -410,6 +411,7 @@ class AgentVariantsOrchestrator {
         this.emitChange();
     }
     getHostWork(sessionId) {
+        const projectContext = this.store.getProjectContext(sessionId);
         return this.store.getHostWork(sessionId).map((item) => {
             const kind = item.kind;
             if (!isImplementationWorkItemKind(kind)) {
@@ -419,7 +421,11 @@ class AgentVariantsOrchestrator {
                 };
                 return planningItem;
             }
-            const input = (item.input ?? {});
+            const input = this.store.requireVariantWorkItemInput({
+                sessionId,
+                workItemId: item.workId,
+                kinds: [kind],
+            });
             const workspace = this.workspaceInventory.requireAssignedWorkspace(sessionId, item.workId, kind);
             const contextAssets = this.workspaceInventory.getContextAssets(sessionId, item.workId);
             const mode = input.sourceVariantId
@@ -430,6 +436,7 @@ class AgentVariantsOrchestrator {
                 (mode === 'refine' ? input.briefBody : undefined) ??
                 sourceLabel;
             const implementationItem = {
+                ...(input.previewRoutes ? { previewRoutes: input.previewRoutes } : {}),
                 workId: item.workId,
                 guidance: input.guidance ?? [],
                 variantId: item.variantId,
@@ -466,6 +473,11 @@ class AgentVariantsOrchestrator {
                     ? { kind: 'worktree_diff' }
                     : { kind: 'static_artifact' },
             };
+            if (kind === 'code_gen' && projectContext.kind === 'existing')
+                implementationItem.previewRoutesPath = (0, workItemPreviewRoutes_1.prepareWorkItemPreviewRoutes)({
+                    ...item,
+                    sessionId,
+                });
             return implementationItem;
         });
     }
@@ -632,7 +644,7 @@ class AgentVariantsOrchestrator {
         return 'completed';
     }
     refinementTelemetryForWorkItem(args) {
-        const input = this.store.getWorkItemInput(args.sessionId, args.workItemId);
+        const input = this.store.getVariantWorkItemInput(args.sessionId, args.workItemId);
         const targetVariantId = input?.variantId ?? input?.sourceVariantId;
         if (!targetVariantId)
             return null;
@@ -854,13 +866,18 @@ class AgentVariantsOrchestrator {
         });
     }
     async adoptPastVariant(args) {
-        const { assetBase, hasAssets } = await this.resolveAdoptedStaticPreviewFiles(args.filesDir, args.entryPath);
+        const { assetBase, entryPath, hasAssets } = await (0, staticPreviewFiles_1.resolveStaticPreviewFiles)({
+            filesDir: args.filesDir,
+            entryPath: args.entryPath,
+            isWebsite: Boolean(args.previewRoutes?.length),
+        });
         const append = this.store.appendAdoptedStaticVariant({
             sessionId: args.sessionId,
             source: args.source,
             label: args.label,
             description: args.description,
             references: args.references,
+            previewRoutes: args.previewRoutes,
             runLabel: args.runLabel,
         });
         this.telemetry.trackAgentVariantsRequestStarted?.({
@@ -875,7 +892,7 @@ class AgentVariantsOrchestrator {
         this.workspaceInventory.setStaticPreview(args.sessionId, {
             workItemId: append.workItemId,
             briefId: append.briefId,
-            entryPath: args.entryPath,
+            entryPath,
             assetBase,
             hasAssets,
         });
@@ -909,6 +926,7 @@ class AgentVariantsOrchestrator {
                 label: args.label,
                 description: args.description,
                 references: args.references,
+                previewRoutes: args.previewRoutes,
                 runLabel: args.runLabel,
             });
             return {
@@ -918,7 +936,11 @@ class AgentVariantsOrchestrator {
                 bootstrapped: false,
             };
         }
-        const { assetBase, hasAssets } = await this.resolveAdoptedStaticPreviewFiles(args.filesDir, args.entryPath);
+        const { assetBase, entryPath, hasAssets } = await (0, staticPreviewFiles_1.resolveStaticPreviewFiles)({
+            filesDir: args.filesDir,
+            entryPath: args.entryPath,
+            isWebsite: Boolean(args.previewRoutes?.length),
+        });
         void this.previewRuntime.stopLingeringCommitted().catch((err) => {
             log.warn('Stopping lingering committed dev servers failed', err);
         });
@@ -928,6 +950,7 @@ class AgentVariantsOrchestrator {
             label: args.label,
             description: args.description,
             references: args.references,
+            previewRoutes: args.previewRoutes,
             runLabel: args.runLabel,
             projectContext: args.projectContext,
         });
@@ -936,7 +959,7 @@ class AgentVariantsOrchestrator {
         this.workspaceInventory.setStaticPreview(created.sessionId, {
             workItemId: created.workItemId,
             briefId: created.briefId,
-            entryPath: args.entryPath,
+            entryPath,
             assetBase,
             hasAssets,
         });
@@ -959,30 +982,6 @@ class AgentVariantsOrchestrator {
         const stage = this.store.getStage(sessionId);
         return stage === 'failed' || stage === 'cancelled' ? null : sessionId;
     }
-    async resolveAdoptedStaticPreviewFiles(filesDir, entryPath) {
-        const entryFile = path_1.default.join(filesDir, entryPath);
-        try {
-            await fs_1.default.promises.access(entryFile, fs_1.default.constants.R_OK);
-        }
-        catch {
-            throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', `Cannot adopt past variant: no readable ${entryPath} under ${filesDir}`);
-        }
-        let assetBase;
-        try {
-            assetBase = fs_1.default.realpathSync(filesDir);
-        }
-        catch {
-            assetBase = filesDir;
-        }
-        let hasAssets = false;
-        try {
-            hasAssets = fs_1.default.readdirSync(assetBase).some((name) => name !== entryPath);
-        }
-        catch {
-            hasAssets = false;
-        }
-        return { assetBase, hasAssets };
-    }
     isStaticPreviewVariant(sessionId, workItemId) {
         try {
             return (this.store.getWorkItemKind(sessionId, workItemId) === 'static_preview');
@@ -995,7 +994,7 @@ class AgentVariantsOrchestrator {
         if (!sourceVariantId)
             return undefined;
         try {
-            const sourceInput = this.store.getWorkItemInput(sessionId, sourceVariantId);
+            const sourceInput = this.store.getVariantWorkItemInput(sessionId, sourceVariantId);
             return (sourceInput?.adoptedFrom ?? { sessionId, variantId: sourceVariantId });
         }
         catch {
@@ -1067,8 +1066,8 @@ class AgentVariantsOrchestrator {
     getStage(sessionId) {
         return this.store.getStage(sessionId);
     }
-    getWorkItemInput(sessionId, workItemId) {
-        return this.store.getWorkItemInput(sessionId, workItemId);
+    getVariantWorkItemInput(sessionId, workItemId) {
+        return this.store.getVariantWorkItemInput(sessionId, workItemId);
     }
     getWorkItemStatus(sessionId, workItemId) {
         return this.store.getWorkItemStatus(sessionId, workItemId);
@@ -1245,11 +1244,15 @@ class AgentVariantsOrchestrator {
         const record = this.workspaceInventory.getStaticPreview(sessionId, workItemId);
         if (!record?.assetBase)
             return undefined;
-        if (!requestedPath || requestedPath.length === 0)
+        const requested = requestedPath ?? record.entryPath;
+        if (!requested)
             return undefined;
-        return ((0, variantWorkspaceFiles_1.resolveAssetWithinBase)(record.assetBase, requestedPath) ??
+        const assetPath = requested.endsWith('/')
+            ? requested + 'index.html'
+            : requested;
+        return ((0, variantWorkspaceFiles_1.resolveAssetWithinBase)(record.assetBase, assetPath) ??
             (record.assetFallbackBase
-                ? (0, variantWorkspaceFiles_1.resolveAssetWithinBase)(record.assetFallbackBase, requestedPath)
+                ? (0, variantWorkspaceFiles_1.resolveAssetWithinBase)(record.assetFallbackBase, assetPath)
                 : undefined));
     }
     getStaticPreviewByBriefId(sessionId, briefId) {
@@ -1425,6 +1428,12 @@ class AgentVariantsOrchestrator {
         if (args.requestId) {
             this.store.assignVariantRequestId(sessionId, variantIds, args.requestId);
         }
+        this.store.assignVariantPreviewRoutes({
+            sessionId,
+            workItemIds: variantIds,
+            previewRoutes: args.previewRoutes,
+            sourceVariantId: args.sourceVariantId,
+        });
         if (args.sourceVariantId) {
             this.telemetry.trackAgentVariantsRefinementRequested?.({
                 sessionId,
@@ -1561,7 +1570,7 @@ class AgentVariantsOrchestrator {
             if (telemetry) {
                 this.telemetry.trackAgentVariantsRefinementFailed?.(telemetry);
             }
-            throw new errors_1.AgentVariantsError('SCHEMA_VALIDATION_FAILED', `${workItemKind} output.html must be a string and non-empty when explicit output is provided. Host workers should write the assigned index.html instead.`);
+            throw new errors_1.AgentVariantsError('SCHEMA_VALIDATION_FAILED', `${workItemKind} output.html must be a string and non-empty when explicit output is provided. Host workers should write the assigned entry file instead.`);
         }
         const qaStartedAt = Date.now();
         const qaEval = workItemKind === 'refine_variant'
@@ -1572,6 +1581,16 @@ class AgentVariantsOrchestrator {
             return this.handleQaRegenRetry(resolvedArgs, qaEval.qa);
         }
         let effectiveArgs = qaEval?.decision === 'fail_terminal' ? qaEval.overrideArgs : resolvedArgs;
+        if (effectiveArgs.status === 'succeeded' && workItemKind === 'code_gen') {
+            effectiveArgs = {
+                ...effectiveArgs,
+                ...(await (0, workItemPreviewRoutes_1.recordWorkItemPreviewRoutes)({
+                    store: this.store,
+                    ...args,
+                    workId: args.workItemId,
+                })),
+            };
+        }
         if (workItemKind === 'refine_variant' &&
             effectiveArgs.status === 'succeeded') {
             try {
@@ -1949,7 +1968,11 @@ class AgentVariantsOrchestrator {
                 'Variant is not committable');
         }
         await this.settleHistoryPersists();
-        const input = this.store.getWorkItemInput(args.sessionId, args.variantId);
+        const input = this.store.requireVariantWorkItemInput({
+            sessionId: args.sessionId,
+            workItemId: args.variantId,
+            kinds: ['code_gen', 'static_preview'],
+        });
         const projectContext = this.store.getProjectContext(args.sessionId);
         if (projectContext.kind === 'fresh') {
             await this.persistCompletedFreshVariantsForCommit(args.sessionId);
@@ -1981,7 +2004,8 @@ class AgentVariantsOrchestrator {
                 if (!anyAssetBaseIsDestination) {
                     const allowed = new Set();
                     for (const sp of this.workspaceInventory.getStaticPreviews(args.sessionId)) {
-                        if (sp.assetBase && (0, variantWorkspaceFiles_1.isStrictlyInside)(sp.assetBase, compareBase)) {
+                        if (sp.assetBase &&
+                            (0, pathContainment_1.isPathStrictlyInsideRoot)(compareBase, sp.assetBase)) {
                             allowed.add(path_1.default.basename(sp.assetBase));
                         }
                     }
@@ -2077,7 +2101,7 @@ class AgentVariantsOrchestrator {
                     }
                     const chosenAssetBase = staticPreview?.assetBase;
                     if (chosenAssetBase &&
-                        (0, variantWorkspaceFiles_1.isStrictlyInside)(chosenAssetBase, flattenBase)) {
+                        (0, pathContainment_1.isPathStrictlyInsideRoot)(flattenBase, chosenAssetBase)) {
                         for (const entry of fs_1.default.readdirSync(chosenAssetBase)) {
                             const src = path_1.default.join(chosenAssetBase, entry);
                             const dst = path_1.default.join(flattenBase, entry);
@@ -2103,7 +2127,7 @@ class AgentVariantsOrchestrator {
                         if (other.workItemId === args.variantId)
                             continue;
                         if (other.assetBase &&
-                            (0, variantWorkspaceFiles_1.isStrictlyInside)(other.assetBase, flattenBase)) {
+                            (0, pathContainment_1.isPathStrictlyInsideRoot)(flattenBase, other.assetBase)) {
                             fs_1.default.rmSync(other.assetBase, { recursive: true, force: true });
                         }
                     }
@@ -2296,7 +2320,11 @@ class AgentVariantsOrchestrator {
         return { decision: 'pass', qa: passedBase };
     }
     async evaluateExistingCodeGenQa(args) {
-        const input = this.store.getWorkItemInput(args.sessionId, args.workItemId);
+        const input = this.store.requireVariantWorkItemInput({
+            sessionId: args.sessionId,
+            workItemId: args.workItemId,
+            kinds: ['code_gen'],
+        });
         if (!isDesignCreationCodeGenInput(input, this.store.getPrompt(args.sessionId))) {
             return null;
         }
@@ -2426,8 +2454,8 @@ class AgentVariantsOrchestrator {
         if (resources && !record) {
             const staticPreview = (0, variantWorkspaceFiles_1.parseStaticPreviewOutput)((0, variantWorkspaceFiles_1.normalizeOutput)(args.output));
             if (staticPreview) {
-                const input = this.store.getWorkItemInput(sessionId, workItemId);
-                if (input.briefId) {
+                const input = this.store.getVariantWorkItemInput(sessionId, workItemId);
+                if (input?.briefId) {
                     const projectContext = this.store.getProjectContext(sessionId);
                     const previewStartedAt = Date.now();
                     (0, variantsTelemetry_1.trackPreviewStarted)(this.telemetry, {
@@ -2465,21 +2493,27 @@ class AgentVariantsOrchestrator {
                         });
                         return;
                     }
+                    let entryPath = 'index.html';
                     try {
                         fs_1.default.mkdirSync(dir, { recursive: true });
                         try {
                             dir = fs_1.default.realpathSync(dir);
                         }
                         catch { }
-                        fs_1.default.writeFileSync(path_1.default.join(dir, 'index.html'), staticPreview.html, 'utf8');
+                        entryPath = (0, staticPreviewFiles_1.writeStaticPreviewPage)({
+                            assetBase: dir,
+                            html: staticPreview.html,
+                            previewRoutes: input.previewRoutes,
+                            source: this.workspaceInventory.getStaticPreview(sessionId, input.sourceVariantId ?? workItemId),
+                        });
                     }
                     catch (err) {
-                        log.warn(`failed to materialize static preview index.html for ${workItemId}`, err);
+                        log.warn(`failed to materialize the static preview page for ${workItemId}`, err);
                     }
                     const record = {
                         workItemId,
                         briefId: input.briefId,
-                        entryPath: 'index.html',
+                        entryPath,
                         assetBase: dir,
                         hasAssets: Boolean(resolvedAssetBase || assignedArtifactBase),
                     };
@@ -2568,7 +2602,11 @@ class AgentVariantsOrchestrator {
         if (!resources) {
             throw new errors_1.AgentVariantsError('SESSION_NOT_FOUND', `No live resources for session ${args.sessionId}`);
         }
-        const input = this.store.getWorkItemInput(args.sessionId, args.workItemId);
+        const input = this.store.requireVariantWorkItemInput({
+            sessionId: args.sessionId,
+            workItemId: args.workItemId,
+            kinds: ['refine_variant'],
+        });
         if (!input.variantId) {
             throw new errors_1.AgentVariantsError('MISSING_REQUIRED_INPUT', 'refine_variant work item is missing variantId');
         }
@@ -2576,7 +2614,11 @@ class AgentVariantsOrchestrator {
         if (!parsed) {
             throw new errors_1.AgentVariantsError('SCHEMA_VALIDATION_FAILED', 'refine_variant report_variant_complete requires output.html');
         }
-        const targetInput = this.store.getWorkItemInput(args.sessionId, input.variantId);
+        const targetInput = this.store.requireVariantWorkItemInput({
+            sessionId: args.sessionId,
+            workItemId: input.variantId,
+            kinds: ['static_preview'],
+        });
         if (!targetInput.briefId) {
             throw new errors_1.AgentVariantsError('VARIANT_NOT_EDITABLE', 'Target static_preview variant is missing briefId');
         }
@@ -2590,10 +2632,15 @@ class AgentVariantsOrchestrator {
             ? refinementWorkspace.rootPath
             : undefined;
         const dir = resolvedAssetBase ?? assignedArtifactBase ?? previousRecord?.assetBase;
+        let entryPath = 'index.html';
         if (dir) {
             try {
-                fs_1.default.mkdirSync(dir, { recursive: true });
-                fs_1.default.writeFileSync(path_1.default.join(dir, 'index.html'), parsed.html, 'utf8');
+                entryPath = (0, staticPreviewFiles_1.writeStaticPreviewPage)({
+                    assetBase: dir,
+                    html: parsed.html,
+                    source: previousRecord,
+                    previewRoutes: targetInput.previewRoutes,
+                });
             }
             catch (err) {
                 throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', `Failed to materialize refined static preview for ${input.variantId}: ${(0, errorMessage_1.errorMessage)(err)}`);
@@ -2607,7 +2654,7 @@ class AgentVariantsOrchestrator {
             this.workspaceInventory.setStaticPreview(args.sessionId, {
                 workItemId: input.variantId,
                 briefId: targetInput.briefId,
-                entryPath: 'index.html',
+                entryPath,
                 assetBase: dir,
                 hasAssets: Boolean(resolvedAssetBase) ||
                     Boolean(assignedArtifactBase) ||
@@ -2732,7 +2779,11 @@ class AgentVariantsOrchestrator {
                 log.warn(`persistCompletedExistingVariant: static snapshot path failed for ${args.sessionId}/${args.workItemId}`, err);
             }
         }
-        const input = this.store.getWorkItemInput(args.sessionId, args.workItemId);
+        const input = this.store.requireVariantWorkItemInput({
+            sessionId: args.sessionId,
+            workItemId: args.workItemId,
+            kinds: ['code_gen'],
+        });
         const sessionPrompt = this.store.getPrompt(args.sessionId);
         const snapshotDir = record?.worktreePath;
         let baseDir;
@@ -2775,6 +2826,7 @@ class AgentVariantsOrchestrator {
             brief: input.briefBody,
             references: input.references,
             referenceContext: input.context,
+            previewRoutes: input.previewRoutes,
             referenceContextRoots: [
                 path_1.default.join(this.variantHistory.store.storage.resolve(env.projectPath)
                     .dataDirectory, 'variant-context'),
@@ -2821,8 +2873,8 @@ class AgentVariantsOrchestrator {
         const resources = this.resources.get(sessionId);
         if (!resources)
             return 'unavailable';
-        const input = this.store.getWorkItemInput(sessionId, workItemId);
-        if (!input.briefId)
+        const input = this.store.getVariantWorkItemInput(sessionId, workItemId);
+        if (!input?.briefId)
             return 'unavailable';
         let projectCwd;
         try {
@@ -2860,20 +2912,20 @@ class AgentVariantsOrchestrator {
         catch {
             dir = projectCwd;
         }
-        let assetFallbackBase;
+        let siteFallbackBase;
         try {
             const hostRealRoot = fs_1.default.realpathSync(env.projectPath);
             if (hostRealRoot !== dir)
-                assetFallbackBase = hostRealRoot;
+                siteFallbackBase = path_1.default.join(hostRealRoot, path_1.default.dirname(env.entryPath));
         }
         catch { }
         this.workspaceInventory.setStaticPreview(sessionId, {
             workItemId,
             briefId: input.briefId,
-            entryPath: env.entryPath,
-            assetBase: dir,
+            entryPath: path_1.default.basename(env.entryPath),
+            assetBase: path_1.default.dirname(path_1.default.join(dir, env.entryPath)),
             hasAssets: true,
-            ...(assetFallbackBase ? { assetFallbackBase } : {}),
+            ...(siteFallbackBase ? { assetFallbackBase: siteFallbackBase } : {}),
         });
         this.previewRuntime.clearFailure(sessionId, workItemId);
         log.info(`Variant ${workItemId} served as a static preview (existing/static, no dev server; root ${projectCwd})`);
@@ -2899,15 +2951,11 @@ class AgentVariantsOrchestrator {
         const base = await this.prepareArtifactBase(args.sessionId);
         const env = await this.resolveEnv(args.sessionId);
         const entryPath = env.framework === 'static' ? env.entryPath : 'index.html';
-        const entryFile = path_1.default.resolve(args.sourceDir, entryPath);
-        if (!(0, variantWorkspaceFiles_1.isStrictlyInside)(entryFile, args.sourceDir)) {
-            throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', 'Artifact entry must be inside its project directory.');
-        }
-        const isEntryMapped = entryFile !== path_1.default.join(args.sourceDir, 'index.html');
-        if (isEntryMapped) {
-            fs_1.default.mkdirSync(path_1.default.dirname(entryFile), { recursive: true });
-            fs_1.default.copyFileSync(path_1.default.join(args.sourceDir, 'index.html'), entryFile);
-        }
+        const files = (0, staticPreviewFiles_1.prepareStaticPreviewProjectFiles)({
+            sourceDir: args.sourceDir,
+            entryPath,
+            isWebsite: args.isWebsite,
+        });
         const store = this.variantHistory.store;
         const tree = await store.putTree({
             projectPath: args.projectPath,
@@ -2917,19 +2965,9 @@ class AgentVariantsOrchestrator {
         });
         const gitRoot = (await this.worktrees.getGitRoot?.()) ?? args.projectPath;
         const relative = path_1.default.relative(gitRoot, args.projectPath);
-        if (relative === '..' ||
-            relative.startsWith(`..${path_1.default.sep}`) ||
-            path_1.default.isAbsolute(relative)) {
+        if (!(0, pathContainment_1.isPathWithinRoot)(gitRoot, args.projectPath)) {
             throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', 'Artifact project must be inside its Git root.');
         }
-        const files = fs_1.default
-            .readdirSync(args.sourceDir, { recursive: true, withFileTypes: true })
-            .filter((entry) => entry.isFile())
-            .map((entry) => path_1.default
-            .relative(args.sourceDir, path_1.default.join(entry.parentPath, entry.name))
-            .split(path_1.default.sep)
-            .join('/'))
-            .filter((file) => !isEntryMapped || file !== 'index.html');
         return store.diffFiles({
             projectPath: args.projectPath,
             fromRef: base.commitSha,
@@ -2946,31 +2984,36 @@ class AgentVariantsOrchestrator {
         const contextRoots = projectContext.kind === 'fresh'
             ? [projectContext.workspacePath, projectContext.workspaceRoot]
             : [historyProjectPath];
-        const input = this.store.getWorkItemInput(args.sessionId, args.workItemId);
+        const input = this.store.requireVariantWorkItemInput({
+            sessionId: args.sessionId,
+            workItemId: args.workItemId,
+            kinds: ['static_preview', 'code_gen'],
+        });
         const sessionPrompt = this.store.getPrompt(args.sessionId);
         const designArtifact = (0, designContextArtifacts_1.resolveDesignArtifact)(input.designContextEntry);
         const worktreeRecord = this.workspaceInventory.getWorktree(args.sessionId, args.workItemId);
         const staticPreview = this.workspaceInventory.getStaticPreview(args.sessionId, args.workItemId);
         let sourceDir = null;
         let tmpStagingDir = null;
+        let staticEntryPath = 'index.html';
         if (worktreeRecord && fs_1.default.existsSync(worktreeRecord.worktreePath)) {
             sourceDir = worktreeRecord.worktreePath;
         }
         else if (staticPreview) {
-            tmpStagingDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), `rivet-variant-${args.workItemId}-`));
-            (0, variantWorkspaceFiles_1.copyStaticPreviewDirectory)(staticPreview.assetBase, tmpStagingDir);
-            let stagedHtml = '';
-            try {
-                stagedHtml = fs_1.default.readFileSync(path_1.default.join(staticPreview.assetBase, 'index.html'), 'utf8');
-            }
-            catch (err) {
-                log.warn(`persistCompletedArtifactVariant: could not read index.html for ${args.workItemId}`, err);
-            }
-            fs_1.default.writeFileSync(path_1.default.join(tmpStagingDir, 'index.html'), stagedHtml, 'utf8');
-            if (projectContext.kind === 'fresh') {
-                fs_1.default.writeFileSync(path_1.default.join(tmpStagingDir, 'brief.md'), `# ${input.briefLabel}\n\n${input.briefBody}\n`, 'utf8');
-            }
-            sourceDir = tmpStagingDir;
+            const staged = (0, staticPreviewFiles_1.stageStaticPreviewFiles)({
+                preview: staticPreview,
+                workItemId: args.workItemId,
+                environment: projectContext.kind === 'existing'
+                    ? await this.resolveEnv(args.sessionId)
+                    : undefined,
+                isWebsite: Boolean(input.previewRoutes?.length),
+                briefMarkdown: projectContext.kind === 'fresh'
+                    ? `# ${input.briefLabel}\n\n${input.briefBody}\n`
+                    : undefined,
+            });
+            tmpStagingDir = staged.rootPath;
+            sourceDir = staged.rootPath;
+            staticEntryPath = staged.entryPath;
         }
         if (!sourceDir) {
             log.warn(`persistCompletedArtifactVariant: no source for ${args.workItemId} (session ${args.sessionId}); skipping`);
@@ -2979,7 +3022,7 @@ class AgentVariantsOrchestrator {
         const changedFilesCount = staticPreview ? 1 : (0, variantWorkspaceFiles_1.countWorktreeFiles)(sourceDir);
         const runningPreview = this.previewRuntime.getRunningVariant(args.sessionId, args.workItemId);
         const preview = staticPreview
-            ? { kind: 'static', entryPath: 'index.html' }
+            ? { kind: 'static', entryPath: staticEntryPath }
             : {
                 kind: 'dev-server',
                 command: {
@@ -2989,7 +3032,7 @@ class AgentVariantsOrchestrator {
                 },
             };
         const serve = staticPreview
-            ? { kind: 'static', entryPath: 'index.html' }
+            ? { kind: 'static', entryPath: staticEntryPath }
             : worktreeRecord && runningPreview
                 ? {
                     kind: 'dev-server',
@@ -3019,6 +3062,7 @@ class AgentVariantsOrchestrator {
                     workItemId: args.workItemId,
                     sourceDir,
                     projectPath: historyProjectPath,
+                    isWebsite: Boolean(input.previewRoutes?.length),
                 })
                 : undefined;
             await this.variantHistory.persistVariant({
@@ -3027,9 +3071,10 @@ class AgentVariantsOrchestrator {
                 variantId: args.workItemId,
                 ...(input.requestId ? { requestId: input.requestId } : {}),
                 label: input.briefLabel,
-                brief: input.briefBody,
+                brief: input.briefBody ?? '',
                 references: input.references,
                 referenceContext: input.context,
+                previewRoutes: input.previewRoutes,
                 referenceContextRoots: contextRoots
                     .filter((projectPath) => Boolean(projectPath))
                     .map((projectPath) => path_1.default.join(this.variantHistory.store.storage.resolve(projectPath)
@@ -3207,8 +3252,8 @@ class AgentVariantsOrchestrator {
         const manifestEntries = [];
         let chosenSlug = '';
         for (const variant of variants) {
-            const input = this.store.getWorkItemInput(args.sessionId, variant.workItemId);
-            const label = input.briefLabel ?? variant.label ?? 'variant';
+            const input = this.store.getVariantWorkItemInput(args.sessionId, variant.workItemId);
+            const label = input?.briefLabel ?? variant.label ?? 'variant';
             const slug = (0, createProjectArtifacts_1.createProjectVariantSlug)(label);
             const briefIdx = briefIndexById.get(variant.briefId) ?? 0;
             const numericPrefix = String(briefIdx + 1).padStart(2, '0');