rivet-design 0.21.10 → 0.23.0

package/dist/agent-variants/SessionStore.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionStore = exports.buildImageRefs = exports.SOURCE_PLAN_ACTION_OPTIONS = exports.SOURCE_PLAN_OUTPUT_SCHEMA = exports.SCAFFOLD_LEASE_TTL_MS = exports.DEFAULT_LEASE_TTL_MS = void 0;
+exports.SessionStore = exports.buildImageRefs = exports.SCAFFOLD_LEASE_TTL_MS = exports.DEFAULT_LEASE_TTL_MS = void 0;
 const preview_routes_1 = require("../types/preview-routes");
 const variant_reference_1 = require("../types/variant-reference");
 const crypto_1 = require("crypto");
@@ -9,6 +9,7 @@ const contracts_1 = require("./contracts");
 const briefContent_1 = require("./briefContent");
 const runLabel_1 = require("./runLabel");
 const runPlan_1 = require("./runPlan");
+const workItemInput_1 = require("./workItemInput");
 const MAX_SUBTITLE_WORDS = 10;
 const MAX_RELEVANT_FILES = 12;
 const capSubtitleWords = (text) => {
@@ -22,11 +23,10 @@ exports.DEFAULT_LEASE_TTL_MS = 20 * 60 * 1000;
 exports.SCAFFOLD_LEASE_TTL_MS = 30 * 60 * 1000;
 const SYSTEM_CLOCK = { now: () => Date.now() };
 function isAdoptedVariant(item) {
-    return Boolean(item.input.adoptedFrom);
+    return (0, workItemInput_1.isVariantWorkItem)(item) && Boolean(item.input.adoptedFrom);
 }
 function isForkedStaticPreviewVariant(item) {
-    return (item.kind === 'static_preview' &&
-        Boolean(item.input.sourceVariantId));
+    return item.kind === 'static_preview' && Boolean(item.input.sourceVariantId);
 }
 function fingerprint(parts) {
     return parts.map((p) => (p === undefined ? '∅' : String(p))).join('|');
@@ -46,32 +46,8 @@ function descriptorFor(item) {
         output_schema: outputSchemaFor(item.kind),
     };
 }
-exports.SOURCE_PLAN_OUTPUT_SCHEMA = {
-    actions: "Required Array<{ id, kind: 'extract_design_system'|'describe_motion', sourceIds, reason }> — actions selected after inspecting raw input.userContext and the prompt. Use only kinds listed in input.availableActions. May be empty when no source warrants enrichment.",
-    metadata: "Required Array<{ id, kind: 'design_system'|'motion_guidance', sourceIds, actionId?, producedBy, data }> — additive metadata produced from the reported actions. Every action MUST produce its matching metadata kind (extract_design_system -> design_system, describe_motion -> motion_guidance). For URL-backed design_system, call capture_design_evidence({ sessionId, url }) before report_source_plan and set data.evidenceStatus. For design_system, data may include designMarkdown; otherwise Rivet synthesizes DESIGN.md from the structured observations. For motion_guidance, data may include motionMarkdown plus notes/timings. Raw userContext remains authoritative; metadata is additive shared guidance.",
-    bindings: "Optional Array<{ kind:'global', sourceIds, actionIds, metadataIds? } | { kind:'slot', slotIndex, sourceIds, actionIds, metadataIds? }> — omit for the default global context behavior.",
-    executionPlan: "{ mode: 'static_preview' | 'vite_app', confidence: low|medium|high, reason, assetPlan?: Array<{source, destination, referenceAs}>, runtimeRequirements?, userQuestion? } — choose vite_app for large local assets, model-viewer, Three.js, route structure, package deps, files under public/, or when a full app scaffold materially improves the requested result; assetPlan.source must live under the approved asset root. Choose static_preview only when a single HTML/CSS/JS file can preserve the full requested scope and visual fidelity.",
-};
-exports.SOURCE_PLAN_ACTION_OPTIONS = [
-    {
-        kind: 'extract_design_system',
-        sourceTransports: ['url', 'file', 'text'],
-        capability: 'extract_inspiration_context',
-        produces: 'design_system',
-        instructions: 'Inspect visual references natively and use the existing inspiration/design-context extraction path to produce reusable design_system metadata.',
-    },
-    {
-        kind: 'describe_motion',
-        sourceTransports: ['url', 'file'],
-        capability: 'rivet_describe_motion',
-        produces: 'motion_guidance',
-        instructions: 'Inspect interaction references natively and use the Rivet Describe Motion protocol to produce motion_guidance metadata.',
-    },
-];
 function outputSchemaFor(kind) {
     switch (kind) {
-        case 'source_plan':
-            return exports.SOURCE_PLAN_OUTPUT_SCHEMA;
         case 'brief':
             return { briefs: 'Array<{briefId, label, body, visualReferenceUrl?}>' };
         case 'scaffold_base':
@@ -148,126 +124,6 @@ const buildImageRefs = (artifacts) => {
     return refs;
 };
 exports.buildImageRefs = buildImageRefs;
-const requiresSourcePlan = (projectContext) => projectContext.kind === 'fresh' && Boolean(projectContext.variantContext);
-const listSection = (title, items) => {
-    if (items.length === 0)
-        return [];
-    return [`## ${title}`, '', ...items.map((item) => `- ${item}`), ''];
-};
-const hasSharedSource = (sourceIds, candidateSourceIds) => candidateSourceIds.some((sourceId) => sourceIds.includes(sourceId));
-const buildMotionGuidanceMarkdown = (sourceIds, metadata) => {
-    const matchingMotion = metadata.filter((entry) => entry.kind === 'motion_guidance' &&
-        hasSharedSource(sourceIds, entry.sourceIds));
-    if (matchingMotion.length === 0)
-        return [];
-    const lines = ['## Motion Guidance', ''];
-    for (const entry of matchingMotion) {
-        if (entry.data.motionMarkdown) {
-            lines.push(entry.data.motionMarkdown.trim(), '');
-            continue;
-        }
-        lines.push(...entry.data.notes.map((item) => `- ${item}`));
-        if (entry.data.timings && entry.data.timings.length > 0) {
-            lines.push('', '### Timings', '');
-            lines.push(...entry.data.timings.map((item) => `- ${item}`));
-        }
-        lines.push('');
-    }
-    return lines;
-};
-const buildDesignMarkdownFromMetadata = (entry, metadata) => {
-    if (entry.data.designMarkdown) {
-        return entry.data.designMarkdown;
-    }
-    const sourceRoleLines = entry.data.sourceRoles.map((role) => role.rationale
-        ? `${role.role}: ${role.sourceId} (${role.rationale})`
-        : `${role.role}: ${role.sourceId}`);
-    const lines = [
-        '# Design System',
-        '',
-        ...listSection('Source Findings', entry.data.sourceFindings),
-        ...listSection('Section Inventory', entry.data.sectionInventory),
-        ...listSection('Visual Observations', entry.data.visualObservations),
-        ...listSection('Source Roles', sourceRoleLines),
-        ...buildMotionGuidanceMarkdown(entry.sourceIds, metadata),
-        ...listSection('Quality Bar', entry.data.qualityBar),
-        ...(entry.data.risks ? listSection('Risks', entry.data.risks) : []),
-    ];
-    return `${lines.join('\n').trim()}\n`;
-};
-const designContextsFromActionMetadata = (metadata) => {
-    if (!metadata)
-        return [];
-    return metadata
-        .filter((entry) => entry.kind === 'design_system')
-        .map((entry, index) => ({
-        label: index === 0 ? 'Design system' : `Design system ${index + 1}`,
-        markdown: buildDesignMarkdownFromMetadata(entry, metadata),
-    }));
-};
-const mergeVariantContext = (args) => {
-    if (!args.bundle)
-        return undefined;
-    const metadata = args.sourcePlan.metadata;
-    const metadataByActionId = new Map();
-    for (const entry of metadata) {
-        if (!entry.actionId)
-            continue;
-        const ids = metadataByActionId.get(entry.actionId) ?? [];
-        ids.push(entry.id);
-        metadataByActionId.set(entry.actionId, ids);
-    }
-    const actions = args.sourcePlan.actions.map((action) => ({
-        ...action,
-        outputMetadataIds: action.outputMetadataIds ?? metadataByActionId.get(action.id),
-    }));
-    return {
-        ...args.bundle,
-        sessionId: args.sessionId,
-        rivetActions: actions,
-        rivetMetadata: metadata,
-        ...(args.sourcePlan.bindings ? { bindings: args.sourcePlan.bindings } : {}),
-        executionPlan: args.sourcePlan.executionPlan,
-    };
-};
-const METADATA_KIND_BY_ACTION_KIND = {
-    extract_design_system: 'design_system',
-    describe_motion: 'motion_guidance',
-};
-const validateActionMetadataOutputs = (args) => {
-    const actions = args.sourcePlan.actions;
-    const metadata = args.sourcePlan.metadata;
-    if (actions.length === 0 && metadata.length > 0) {
-        throw new errors_1.AgentVariantsError('SOURCE_CONTEXT_INVALID', 'source_plan reported metadata without any actions; metadata must be produced by a reported action');
-    }
-    const sourceIds = new Set(args.bundle?.userContext.map((source) => source.id) ?? []);
-    for (const entry of metadata) {
-        const unknownSourceIds = entry.sourceIds.filter((sourceId) => sourceIds.size > 0 && !sourceIds.has(sourceId));
-        if (unknownSourceIds.length > 0) {
-            throw new errors_1.AgentVariantsError('SOURCE_CONTEXT_INVALID', `source_plan metadata ${entry.id} references unknown sourceIds: ${unknownSourceIds.join(', ')}`);
-        }
-    }
-    if (actions.length === 0)
-        return;
-    const metadataById = new Map(metadata.map((entry) => [entry.id, entry]));
-    for (const action of actions) {
-        const unknownSourceIds = action.sourceIds.filter((sourceId) => sourceIds.size > 0 && !sourceIds.has(sourceId));
-        if (unknownSourceIds.length > 0) {
-            throw new errors_1.AgentVariantsError('SOURCE_CONTEXT_INVALID', `source_plan action ${action.id} references unknown sourceIds: ${unknownSourceIds.join(', ')}`);
-        }
-        const expectedMetadataKind = METADATA_KIND_BY_ACTION_KIND[action.kind];
-        const linkedMetadata = [
-            ...metadata.filter((entry) => entry.actionId === action.id),
-            ...(action.outputMetadataIds ?? [])
-                .map((id) => metadataById.get(id))
-                .filter((entry) => Boolean(entry)),
-        ];
-        const hasExpectedMetadata = linkedMetadata.some((entry) => entry.kind === expectedMetadataKind);
-        if (!hasExpectedMetadata) {
-            throw new errors_1.AgentVariantsError('SOURCE_CONTEXT_INVALID', `source_plan action ${action.id} (${action.kind}) must produce ${expectedMetadataKind} metadata`);
-        }
-    }
-};
 const collectSlotBoundIds = (bindings) => {
     const sourceIds = new Set();
     const actionIds = new Set();
@@ -341,44 +197,16 @@ class SessionStore {
             kind: 'existing',
         };
         const count = clampCount(args.count);
-        const bundle = projectContext.kind === 'fresh'
-            ? projectContext.variantContext
-            : undefined;
-        const needsSourcePlan = requiresSourcePlan(projectContext) && !args.hasPreparedBriefs;
-        const initialItem = needsSourcePlan
-            ? {
-                id: (0, crypto_1.randomUUID)(),
-                kind: 'source_plan',
-                status: 'pending',
-                attempt: 0,
-                dependsOn: [],
-                input: {
-                    prompt: args.prompt,
-                    guidance: args.guidance ?? [],
-                    count,
-                    target: args.target,
-                    ...(bundle
-                        ? {
-                            contextBundlePath: bundle.contextBundlePath,
-                            userContext: bundle.userContext,
-                            availableActions: exports.SOURCE_PLAN_ACTION_OPTIONS,
-                            variantSlotCount: count,
-                        }
-                        : {}),
-                    projectContext,
-                },
-                acceptedReports: [],
-            }
-            : createBriefWorkItem({
-                prompt: args.prompt,
-                guidance: args.guidance ?? [],
-                count,
-                target: args.target,
-                projectContext,
-            });
+        const initialItem = createBriefWorkItem({
+            prompt: args.prompt,
+            guidance: args.guidance ?? [],
+            count,
+            target: args.target,
+            projectContext,
+        });
         const record = {
             sessionId,
-            stage: needsSourcePlan ? 'awaiting_source_plan' : 'awaiting_briefs',
+            stage: 'awaiting_briefs',
             prompt: args.prompt,
             guidance: args.guidance ?? [],
             runLabel: args.runLabel?.trim() || undefined,
@@ -395,17 +223,11 @@ class SessionStore {
             createdAt: this.clock.now(),
         };
         this.sessions.set(sessionId, record);
-        return needsSourcePlan
-            ? {
-                sessionId,
-                stage: 'awaiting_source_plan',
-                sourcePlanWorkItem: initialItem,
-            }
-            : {
-                sessionId,
-                stage: 'awaiting_briefs',
-                briefWorkItem: initialItem,
-            };
+        return {
+            sessionId,
+            stage: 'awaiting_briefs',
+            briefWorkItem: initialItem,
+        };
     }
     reportBriefs(args) {
         const session = this.requireSession(args.sessionId);
@@ -452,83 +274,6 @@ class SessionStore {
         session.acceptedFingerprints.set(fp, result);
         return result;
     }
-    reportSourcePlan(args) {
-        const session = this.requireSession(args.sessionId);
-        const fp = fingerprint([
-            'reportSourcePlan',
-            args.sessionId,
-            args.workItemId,
-            args.leaseId,
-            args.attempt,
-            'succeeded',
-        ]);
-        const cached = session.acceptedFingerprints.get(fp);
-        if (cached)
-            return cached;
-        this.assertStage(session, ['awaiting_source_plan']);
-        const item = this.requireWorkItem(session, args.workItemId);
-        if (item.kind !== 'source_plan') {
-            throw new errors_1.AgentVariantsError('INVALID_STAGE_ACTION', `Work item ${args.workItemId} is not a source_plan item`);
-        }
-        this.validatePlanningReport(item, args.leaseId, args.attempt);
-        const { executionPlan, actions, metadata, bindings } = args.sourcePlan;
-        validateActionMetadataOutputs({
-            bundle: session.projectContext.kind === 'fresh'
-                ? session.projectContext.variantContext
-                : undefined,
-            sourcePlan: args.sourcePlan,
-        });
-        if (session.projectContext.kind === 'fresh') {
-            const projectDesignContexts = designContextsFromActionMetadata(metadata);
-            session.projectContext = {
-                ...session.projectContext,
-                ...(projectDesignContexts.length > 0
-                    ? {
-                        designContext: projectDesignContexts.map((entry) => ({
-                            kind: 'markdown',
-                            label: entry.label,
-                            content: entry.markdown,
-                        })),
-                    }
-                    : {}),
-                executionPlan,
-            };
-        }
-        const updatedContext = mergeVariantContext({
-            bundle: session.projectContext.kind === 'fresh'
-                ? session.projectContext.variantContext
-                : undefined,
-            sessionId: session.sessionId,
-            sourcePlan: args.sourcePlan,
-        });
-        if (updatedContext && session.projectContext.kind === 'fresh') {
-            session.projectContext = {
-                ...session.projectContext,
-                variantContext: updatedContext,
-            };
-        }
-        item.status = 'succeeded';
-        item.output = {
-            actions,
-            metadata,
-            ...(bindings ? { bindings } : {}),
-            executionPlan,
-        };
-        item.lease = undefined;
-        const briefItem = createBriefWorkItem({
-            prompt: session.prompt,
-            guidance: session.guidance,
-            count: session.count,
-            target: session.target,
-            projectContext: session.projectContext,
-        });
-        session.workItems.set(briefItem.id, briefItem);
-        session.workItemOrder.push(briefItem.id);
-        session.stage = 'awaiting_briefs';
-        const result = { briefWorkItem: briefItem };
-        session.acceptedFingerprints.set(fp, result);
-        return result;
-    }
     approve(args) {
         const session = this.requireSession(args.sessionId);
         this.assertStage(session, ['awaiting_approval']);
@@ -657,7 +402,6 @@ class SessionStore {
     requestWork(args) {
         const session = this.requireSession(args.sessionId);
         this.assertStage(session, [
-            'awaiting_source_plan',
             'work_items_ready',
             'waiting_for_results',
         ]);
@@ -698,10 +442,7 @@ class SessionStore {
             };
             item.status = 'running';
         }
-        session.stage =
-            session.stage === 'awaiting_source_plan'
-                ? 'awaiting_source_plan'
-                : 'waiting_for_results';
+        session.stage = 'waiting_for_results';
         return {
             leaseId,
             leaseTtlMs: Math.max(...issued.map((i) => leaseTtlForKind(i.kind))),
@@ -762,12 +503,13 @@ class SessionStore {
         item.error = args.error;
         if (args.runtime)
             item.runtime = args.runtime;
-        if (args.status === 'succeeded' && (args.title || args.description)) {
-            const input = item.input;
+        if (args.status === 'succeeded' &&
+            (args.title || args.description) &&
+            (0, workItemInput_1.isVariantWorkItem)(item)) {
             if (args.title)
-                input.briefLabel = args.title.trim().slice(0, 80);
+                item.input.briefLabel = args.title.trim().slice(0, 80);
             if (args.description)
-                input.briefBody = args.description.trim();
+                item.input.briefBody = args.description.trim();
         }
         item.acceptedReports.push(fp);
         item.lease = undefined;
@@ -797,8 +539,8 @@ class SessionStore {
         item.lease = undefined;
         item.output = undefined;
         item.error = undefined;
-        const input = (item.input ?? {});
-        item.input = { ...input, qaRetry: args.qaRetry };
+        if ((0, workItemInput_1.isVariantWorkItem)(item))
+            item.input = { ...item.input, qaRetry: args.qaRetry };
         const result = {
             stage: session.stage,
             progress: this.progressOf(session),
@@ -818,8 +560,7 @@ class SessionStore {
         const activeRefinement = [...session.workItems.values()].find((item) => {
             if (item.kind !== 'refine_variant')
                 return false;
-            const input = item.input;
-            return input.variantId === args.variantId && item.status === 'pending';
+            return (item.input.variantId === args.variantId && item.status === 'pending');
         });
         if (activeRefinement) {
             throw new errors_1.AgentVariantsError('PENDING_CHANGE_CONFLICT', 'A refinement is already queued for this variant');
@@ -847,7 +588,7 @@ class SessionStore {
                 ...(args.currentHtml ? { currentHtml: args.currentHtml } : {}),
                 ...(args.targetElement ? { targetElement: args.targetElement } : {}),
                 ...(args.requestId ? { requestId: args.requestId } : {}),
-                projectContext: targetInput.projectContext ?? session.projectContext,
+                projectContext: targetInput.projectContext,
                 ...(targetInput.context ? { context: targetInput.context } : {}),
                 ...(relevantFiles.length > 0 ? { relevantFiles } : {}),
             },
@@ -870,8 +611,7 @@ class SessionStore {
         const activeRefinement = [...session.workItems.values()].find((item) => {
             if (item.kind !== 'refine_variant')
                 return false;
-            const input = item.input;
-            return (input.variantId === args.sourceVariantId &&
+            return (item.input.variantId === args.sourceVariantId &&
                 (item.status === 'pending' || item.status === 'running'));
         });
         if (activeRefinement) {
@@ -946,7 +686,7 @@ class SessionStore {
                     ...(args.targetElement ? { targetElement: args.targetElement } : {}),
                     ...(args.requestId ? { requestId: args.requestId } : {}),
                     ...(args.fidelity ? { fidelity: args.fidelity } : {}),
-                    projectContext: sourceInput.projectContext ?? session.projectContext,
+                    projectContext: sourceInput.projectContext,
                     ...(context ? { context } : {}),
                     ...(relevantFiles.length > 0 ? { relevantFiles } : {}),
                 },
@@ -984,16 +724,15 @@ class SessionStore {
             const activeRefinement = [...session.workItems.values()].find((item) => {
                 if (item.kind !== 'refine_variant')
                     return false;
-                const input = item.input;
-                return (input.variantId === args.sourceVariantId &&
+                return (item.input.variantId === args.sourceVariantId &&
                     (item.status === 'pending' || item.status === 'running'));
             });
             if (activeRefinement) {
                 throw new errors_1.AgentVariantsError('PENDING_CHANGE_CONFLICT', 'Cannot vary a variant while an in-place refinement is pending or running');
             }
         }
-        const sourceInput = (source?.input ?? {});
-        const relevantFiles = mergeRelevantFiles(sourceInput.relevantFiles, args.relevantFiles);
+        const sourceInput = source && (0, workItemInput_1.isVariantWorkItem)(source) ? source.input : undefined;
+        const relevantFiles = mergeRelevantFiles(sourceInput?.relevantFiles, args.relevantFiles);
         const createdWorkItemIds = [];
         for (const [batchSlotIndex, brief] of args.briefs.entries()) {
             const context = resolveVariantWorkItemContext({
@@ -1015,7 +754,7 @@ class SessionStore {
                     briefId: brief.briefId,
                     briefLabel: brief.label,
                     briefBody: brief.body,
-                    references: (0, variant_reference_1.mergeVariantReferences)(sourceInput.references, context?.references),
+                    references: (0, variant_reference_1.mergeVariantReferences)(sourceInput?.references, context?.references),
                     instruction: args.instruction,
                     guidance: args.guidance ?? [],
                     ...(brief.notes ? { briefNotes: brief.notes } : {}),
@@ -1024,10 +763,10 @@ class SessionStore {
                     ...(args.sourceVariantId
                         ? { sourceVariantId: args.sourceVariantId }
                         : {}),
-                    ...(source && sourceInput.briefLabel
+                    ...(sourceInput?.briefLabel
                         ? { sourceLabel: sourceInput.briefLabel }
                         : {}),
-                    ...(source && sourceInput.briefBody
+                    ...(sourceInput?.briefBody
                         ? { sourceBody: sourceInput.briefBody }
                         : {}),
                     target: session.target,
@@ -1053,10 +792,9 @@ class SessionStore {
         }
         const existing = this.findAdoptedVariant(session, args.source);
         if (existing) {
-            const input = existing.input;
             return {
                 workItemId: existing.id,
-                briefId: input.briefId ?? '',
+                briefId: existing.input.briefId ?? '',
                 created: false,
             };
         }
@@ -1121,10 +859,9 @@ class SessionStore {
     }
     findAdoptedVariant(session, source) {
         for (const item of session.workItems.values()) {
-            if (item.removed)
+            if (item.removed || !(0, workItemInput_1.isVariantWorkItem)(item))
                 continue;
-            const adoptedFrom = item.input
-                .adoptedFrom;
+            const { adoptedFrom } = item.input;
             if (adoptedFrom &&
                 adoptedFrom.sessionId === source.sessionId &&
                 adoptedFrom.variantId === source.variantId) {
@@ -1136,43 +873,38 @@ class SessionStore {
     assignVariantPreviewRoutes(args) {
         const session = this.requireSession(args.sessionId);
         const source = args.sourceVariantId
-            ? this.requireWorkItem(session, args.sourceVariantId).input
+            ? this.requireWorkItem(session, args.sourceVariantId)
             : undefined;
-        const merged = (0, preview_routes_1.mergePreviewRoutes)(args.previewRoutes, source?.previewRoutes);
+        const merged = (0, preview_routes_1.mergePreviewRoutes)(args.previewRoutes, source && (0, workItemInput_1.isVariantWorkItem)(source)
+            ? source.input.previewRoutes
+            : undefined);
         if (!merged.length)
             return;
         const previewRoutes = preview_routes_1.previewRoutesSchema.parse(merged);
         for (const workItemId of args.workItemIds) {
             const item = this.requireWorkItem(session, workItemId);
-            item.input = {
-                ...item.input,
-                previewRoutes: [...previewRoutes],
-            };
+            if ((0, workItemInput_1.isVariantWorkItem)(item))
+                item.input = { ...item.input, previewRoutes: [...previewRoutes] };
         }
     }
     assignVariantRequestId(sessionId, workItemIds, requestId) {
         const session = this.requireSession(sessionId);
         for (const id of workItemIds) {
             const item = session.workItems.get(id);
-            if (!item)
-                continue;
-            const input = (item.input ?? {});
-            item.input = { ...input, requestId };
+            if (item && (0, workItemInput_1.isVariantWorkItem)(item))
+                item.input = { ...item.input, requestId };
         }
     }
     getPendingRefinement(sessionId, variantId) {
-        return [...this.requireSession(sessionId).workItems.values()].find((item) => {
-            if (item.kind !== 'refine_variant')
-                return false;
-            const input = item.input;
-            return input.variantId === variantId && item.status === 'pending';
-        });
+        return [...this.requireSession(sessionId).workItems.values()].find((item) => item.kind === 'refine_variant' &&
+            item.input.variantId === variantId &&
+            item.status === 'pending');
     }
     appendPendingRefineVariantInstruction(args) {
         const refineItem = this.getPendingRefinement(args.sessionId, args.variantId);
         if (!refineItem)
             return false;
-        const input = refineItem.input;
+        const { input } = refineItem;
         input.guidance = args.guidance ?? [];
         input.requestId = args.requestId;
         input.instruction =
@@ -1192,7 +924,7 @@ class SessionStore {
         const runningRefinement = [...session.workItems.values()].find((item) => {
             if (item.kind !== 'refine_variant')
                 return false;
-            const input = item.input;
+            const { input } = item;
             return input.variantId === args.variantId && item.status === 'running';
         });
         if (runningRefinement) {
@@ -1201,7 +933,7 @@ class SessionStore {
         const refineItem = [...session.workItems.values()].find((item) => {
             if (item.kind !== 'refine_variant')
                 return false;
-            const input = item.input;
+            const { input } = item;
             return input.variantId === args.variantId && item.status === 'pending';
         });
         if (!refineItem) {
@@ -1299,7 +1031,7 @@ class SessionStore {
         for (const other of session.workItems.values()) {
             if (other.kind !== 'refine_variant')
                 continue;
-            const input = other.input;
+            const { input } = other;
             if (input.variantId !== item.id)
                 continue;
             if (other.status === 'pending' || other.status === 'running') {
@@ -1318,8 +1050,8 @@ class SessionStore {
     renameWorkItem(args) {
         const session = this.requireSession(args.sessionId);
         const item = this.requireWorkItem(session, args.workItemId);
-        const input = item.input;
-        input.briefLabel = args.label;
+        if ((0, workItemInput_1.isVariantWorkItem)(item))
+            item.input.briefLabel = args.label;
         return {
             workItemId: item.id,
             label: args.label,
@@ -1332,9 +1064,9 @@ class SessionStore {
         const workItemIds = [];
         for (const id of session.workItemOrder) {
             const item = session.workItems.get(id);
-            if (!item || item.removed)
+            if (!item || item.removed || !(0, workItemInput_1.isVariantWorkItem)(item))
                 continue;
-            const input = item.input;
+            const { input } = item;
             if (input.requestId !== args.requestId)
                 continue;
             const effective = input.runLabel ?? sessionFallback;
@@ -1401,12 +1133,7 @@ class SessionStore {
             const { lease } = item;
             if (!lease || item.status !== 'running')
                 return [];
-            const input = item.input && typeof item.input === 'object'
-                ? item.input
-                : {};
-            const variantId = item.kind === 'refine_variant' && typeof input.variantId === 'string'
-                ? input.variantId
-                : item.id;
+            const variantId = (item.kind === 'refine_variant' && item.input.variantId) || item.id;
             return {
                 workId: item.id,
                 variantId,
@@ -1432,14 +1159,25 @@ class SessionStore {
     hasSession(sessionId) {
         return this.sessions.has(sessionId);
     }
-    getWorkItemInput(sessionId, workItemId) {
+    getVariantWorkItemInput(sessionId, workItemId) {
         const session = this.requireSession(sessionId);
         const item = this.requireWorkItem(session, workItemId);
-        return item.input;
+        return (0, workItemInput_1.isVariantWorkItem)(item)
+            ? (0, workItemInput_1.parseVariantWorkItemInput)(item)
+            : undefined;
+    }
+    requireVariantWorkItemInput(args) {
+        const session = this.requireSession(args.sessionId);
+        const item = this.requireWorkItem(session, args.workItemId);
+        const kind = args.kinds.find((candidate) => candidate === item.kind);
+        if (!kind) {
+            throw new errors_1.AgentVariantsError('WORK_ITEM_NOT_FOUND', `Work item ${item.id} is a ${item.kind} work item, not ${args.kinds.join(' or ')}`);
+        }
+        return (0, workItemInput_1.parseVariantWorkItemInput)({ id: item.id, kind, input: item.input });
     }
     getWorkItemIdsForRequest(sessionId, requestId) {
         return [...this.requireSession(sessionId).workItems.values()]
-            .filter((item) => item.input.requestId === requestId)
+            .filter((item) => (0, workItemInput_1.isVariantWorkItem)(item) && item.input.requestId === requestId)
             .map((item) => item.id);
     }
     getWorkItemOutput(sessionId, workItemId) {
@@ -1463,7 +1201,7 @@ class SessionStore {
     }
     isVaryForkWorkItem(sessionId, workItemId) {
         const item = this.sessions.get(sessionId)?.workItems.get(workItemId);
-        return Boolean(item && item.input.sourceVariantId);
+        return Boolean(item && (0, workItemInput_1.isVariantWorkItem)(item) && item.input.sourceVariantId);
     }
     isWorkItemAborted(sessionId, workItemId) {
         const session = this.sessions.get(sessionId);
@@ -1551,8 +1289,7 @@ class SessionStore {
         return out;
     }
     hasLeasableCodeGenForStaticPreview(session, staticPreview) {
-        const staticInput = staticPreview.input;
-        if (!staticInput.briefId)
+        if (!(0, workItemInput_1.isVariantWorkItem)(staticPreview) || !staticPreview.input.briefId)
             return false;
         for (const candidate of session.workItems.values()) {
             if (candidate.kind !== 'code_gen')
@@ -1561,8 +1298,7 @@ class SessionStore {
                 continue;
             if (!this.dependenciesMet(session, candidate))
                 continue;
-            const codeInput = candidate.input;
-            if (codeInput.briefId === staticInput.briefId)
+            if (candidate.input.briefId === staticPreview.input.briefId)
                 return true;
         }
         return false;
@@ -1646,11 +1382,6 @@ class SessionStore {
         };
     }
     progressOf(session) {
-        if (session.stage === 'awaiting_source_plan') {
-            const planItems = [...session.workItems.values()].filter((item) => item.kind === 'source_plan');
-            const ready = planItems.filter((item) => item.status === 'succeeded').length;
-            return { ready, total: planItems.length };
-        }
         const items = this.terminalItems(session);
         const ready = items.filter((i) => i.status === 'succeeded').length;
         return { ready, total: items.length };
@@ -1661,14 +1392,11 @@ class SessionStore {
             successCount: items.filter((i) => i.status === 'succeeded').length,
             failureCount: items.filter((i) => i.status === 'failed').length,
             cancelledCount: items.filter((i) => i.status === 'cancelled').length,
-            variants: items.map((i) => {
-                const input = i.input;
-                return {
-                    workItemId: i.id,
-                    status: i.status,
-                    label: input.briefLabel,
-                };
-            }),
+            variants: items.map((i) => ({
+                workItemId: i.id,
+                status: i.status,
+                label: (0, workItemInput_1.isVariantWorkItem)(i) ? i.input.briefLabel : undefined,
+            })),
         };
     }
     refinementSnapshotPriority(item) {
@@ -1684,7 +1412,7 @@ class SessionStore {
         for (const item of session.workItems.values()) {
             if (item.kind !== 'refine_variant')
                 continue;
-            const input = item.input;
+            const { input } = item;
             if (!input.variantId)
                 continue;
             const existing = refinementsByVariantId.get(input.variantId);
@@ -1698,14 +1426,14 @@ class SessionStore {
             .map((id) => session.workItems.get(id))
             .filter((i) => !!i &&
             !i.removed &&
+            (0, workItemInput_1.isVariantWorkItem)(i) &&
             (i.kind === kind ||
                 isAdoptedVariant(i) ||
                 isForkedStaticPreviewVariant(i)))
             .map((item) => {
-            const input = item.input;
+            const { input } = item;
             const refineItem = refinementsByVariantId.get(item.id);
-            const refineRequestId = refineItem?.input
-                ?.requestId;
+            const refineRequestId = refineItem?.input.requestId;
             return {
                 workItemId: item.id,
                 ...(input.previewRoutes