rivet-design 0.23.1 → 0.25.0

package/dist/agent-variants/SessionStore.d.ts

@@ -1,4 +1,5 @@
 import type { GuidanceDocument } from '../types/guidance';
+import type { WorkerSelection } from '../types/change-request-types';
 import { type VariantReference } from '../types/variant-reference';
 import { type Brief, type ActiveVariantSnapshot, type LeasedWorkItemDescriptor, type ProjectContext, type Stage, type StartVariantsBriefContent, type StaticPreviewTargetElement, type Target, type TerminalSummary, type VariantContextBinding, type VariantContextBundle, type VariantQaResult, type VariantWorkItemContext, type VariantPickEnvelope, type WorkItem, type WorkItemKind, type WorkItemStatus, type WorkerFidelity, type WorkerRuntimeInfo } from './contracts';
 import { type VariantWorkItemInput, type VariantWorkItemInputByKind, type VariantWorkItemKind } from './workItemInput';
@@ -17,6 +18,7 @@ export interface ProposeArgs {
     projectContext?: ProjectContext;
     runLabel?: string;
     fidelity?: WorkerFidelity;
+    workerSelection?: WorkerSelection;
 }
 export interface ProposeResult {
     sessionId: string;
@@ -116,6 +118,7 @@ export declare class SessionStore {
         relevantFiles?: string[];
         requestId?: string;
         fidelity?: WorkerFidelity;
+        workerSelection?: WorkerSelection;
     }): WorkItem;
     createForkedStaticPreviewWorkItems(args: {
         guidance?: GuidanceDocument[];
@@ -132,6 +135,7 @@ export declare class SessionStore {
         requestId?: string;
         additionalContext?: Pick<VariantWorkItemContext, 'contextBundlePath' | 'userContext' | 'rivetMetadata'>;
         fidelity?: WorkerFidelity;
+        workerSelection?: WorkerSelection;
     }): WorkItem[];
     appendCodeGenVariants(args: {
         guidance?: GuidanceDocument[];
@@ -141,6 +145,7 @@ export declare class SessionStore {
         sourceVariantId?: string;
         runLabel?: string;
         fidelity?: WorkerFidelity;
+        workerSelection?: WorkerSelection;
         relevantFiles?: string[];
         variantContext?: VariantContextBundle;
     }): {
@@ -197,6 +202,7 @@ export declare class SessionStore {
         variantId: string;
         instruction: string;
         fidelity?: WorkerFidelity;
+        workerSelection?: WorkerSelection;
     }): boolean;
     leaseRefineItemForVariant(args: {
         sessionId: string;

package/dist/agent-variants/SessionStore.js

@@ -211,6 +211,9 @@ class SessionStore {
             guidance: args.guidance ?? [],
             runLabel: args.runLabel?.trim() || undefined,
             ...(args.fidelity ? { fidelity: args.fidelity } : {}),
+            ...(args.workerSelection
+                ? { workerSelection: args.workerSelection }
+                : {}),
             count,
             target: args.target,
             relevantFiles: args.relevantFiles,
@@ -351,6 +354,9 @@ class SessionStore {
                             ? { relevantFiles: session.relevantFiles }
                             : {}),
                         ...(session.fidelity ? { fidelity: session.fidelity } : {}),
+                        ...(session.workerSelection
+                            ? { workerSelection: session.workerSelection }
+                            : {}),
                         projectContext: session.projectContext,
                         ...(designContextEntry ? { designContextEntry } : {}),
                         ...(context ? { context, references: context.references } : {}),
@@ -380,6 +386,9 @@ class SessionStore {
                             ? { relevantFiles: session.relevantFiles }
                             : {}),
                         ...(session.fidelity ? { fidelity: session.fidelity } : {}),
+                        ...(session.workerSelection
+                            ? { workerSelection: session.workerSelection }
+                            : {}),
                         projectContext: session.projectContext,
                         ...(designContextEntry ? { designContextEntry } : {}),
                         ...(context ? { context, references: context.references } : {}),
@@ -401,10 +410,7 @@ class SessionStore {
     }
     requestWork(args) {
         const session = this.requireSession(args.sessionId);
-        this.assertStage(session, [
-            'work_items_ready',
-            'waiting_for_results',
-        ]);
+        this.assertStage(session, ['work_items_ready', 'waiting_for_results']);
         this.expireStaleLeases(session);
         let leasable = this.leasableItems(session);
         if (args.workItemId !== undefined) {
@@ -585,6 +591,9 @@ class SessionStore {
                     ? { briefNotes: targetInput.briefNotes }
                     : {}),
                 ...(args.fidelity ? { fidelity: args.fidelity } : {}),
+                ...(args.workerSelection
+                    ? { workerSelection: args.workerSelection }
+                    : {}),
                 ...(args.currentHtml ? { currentHtml: args.currentHtml } : {}),
                 ...(args.targetElement ? { targetElement: args.targetElement } : {}),
                 ...(args.requestId ? { requestId: args.requestId } : {}),
@@ -667,6 +676,7 @@ class SessionStore {
                     briefId: `${sourceInput.briefId ?? 'v'}-vary-${(0, crypto_1.randomUUID)().slice(0, 8)}`,
                     briefLabel: brief?.label ?? `${labelBase}${suffix}`,
                     briefBody: brief?.body ?? prettyInstruction,
+                    ...(brief?.notes ? { briefNotes: brief.notes } : {}),
                     ...(previewRoutes.length ? { previewRoutes } : {}),
                     references: (0, variant_reference_1.mergeVariantReferences)(sourceInput.references, context?.references),
                     ...(args.runLabel ? { runLabel: args.runLabel } : {}),
@@ -686,6 +696,9 @@ class SessionStore {
                     ...(args.targetElement ? { targetElement: args.targetElement } : {}),
                     ...(args.requestId ? { requestId: args.requestId } : {}),
                     ...(args.fidelity ? { fidelity: args.fidelity } : {}),
+                    ...(args.workerSelection
+                        ? { workerSelection: args.workerSelection }
+                        : {}),
                     projectContext: sourceInput.projectContext,
                     ...(context ? { context } : {}),
                     ...(relevantFiles.length > 0 ? { relevantFiles } : {}),
@@ -772,6 +785,9 @@ class SessionStore {
                     target: session.target,
                     ...(relevantFiles.length > 0 ? { relevantFiles } : {}),
                     ...(args.fidelity ? { fidelity: args.fidelity } : {}),
+                    ...(args.workerSelection
+                        ? { workerSelection: args.workerSelection }
+                        : {}),
                     projectContext: session.projectContext,
                     ...(context ? { context } : {}),
                 },
@@ -905,6 +921,7 @@ class SessionStore {
         if (!refineItem)
             return false;
         const { input } = refineItem;
+        input.workerSelection = args.workerSelection;
         input.guidance = args.guidance ?? [];
         input.requestId = args.requestId;
         input.instruction =

package/dist/agent-variants/WorkerExecutorService.js

@@ -21,10 +21,12 @@ const workerModelFrom = (explicitModel, callerModel) => {
     return { source: 'fallback' };
 };
 const chooseWorkerLeaseOwner = async (executor, args) => {
-    if (!executor) {
+    if (!executor && args?.initiator?.kind !== 'agent') {
         return { leaseOwner: 'rivet-host-agent', summary: 'host path' };
     }
-    const decision = await executor.resolveRuntime(args);
+    const decision = executor
+        ? await executor.resolveRuntime(args)
+        : await new workerRuntime_1.WorkerRuntimeResolver({ runnerPaths: () => ({}) }).resolve(args);
     if (decision.mode === 'executor') {
         return {
             leaseOwner: exports.EXECUTOR_LEASE_OWNER,
@@ -36,6 +38,14 @@ const chooseWorkerLeaseOwner = async (executor, args) => {
             summary: `${decision.adapter.vendor} (${decision.source})`,
         };
     }
+    if (decision.reason === 'initiating_host') {
+        return {
+            leaseOwner: 'rivet-host-agent',
+            summary: 'initiating host (native permissions and approvals)',
+        };
+    }
+    if (!executor)
+        return { leaseOwner: 'rivet-host-agent', summary: 'host path' };
     const reasons = decision.diagnostics
         .map((d) => `${d.vendor}: ${d.reason.slice(0, 200)}`)
         .join('; ');
@@ -100,7 +110,7 @@ const isRuntimeShapedFailure = (message, apiErrorStatus) => {
 };
 const defaultSpawn = ({ command, args, cwd, env }) => (0, child_process_1.spawn)(command, args, {
     cwd,
-    ...(env ? { env } : {}),
+    env: env ?? {},
     stdio: ['pipe', 'pipe', 'pipe'],
     detached: process.platform !== 'win32',
 });
@@ -206,6 +216,7 @@ class WorkerExecutorService {
         if (this.runtimeAvailable === undefined) {
             try {
                 (0, child_process_1.execFileSync)(this.workerCommand, ['--version'], {
+                    env: this.defaultAdapter.spawnEnv(),
                     stdio: 'ignore',
                     timeout: 10_000,
                 });
@@ -255,7 +266,18 @@ class WorkerExecutorService {
         const stranded = claimedItems.filter((item) => !runnable.some((candidate) => candidate.workId === item.workId));
         const unseen = workItemIds.filter((workItemId) => !claimedItems.some((item) => item.workId === workItemId));
         await Promise.all([
-            ...runnable.map((item) => this.runOne(sessionId, item, { retried: false }, adapter, models)),
+            ...runnable.map((item) => adapter.vendor === 'cursor'
+                ? this.reportSafely(sessionId, {
+                    workItemId: item.workId,
+                    leaseId: item.leaseId,
+                    attempt: item.attempt,
+                    status: 'failed',
+                    error: {
+                        code: 'EXECUTOR_RUNTIME_UNSUPPORTED',
+                        message: workerRuntime_1.CURSOR_NATIVE_WORKER_REQUIRED,
+                    },
+                })
+                : this.runOne(sessionId, item, { retried: false }, adapter, models)),
             ...stranded.map((item) => this.reportSafely(sessionId, {
                 workItemId: item.workId,
                 leaseId: item.leaseId,
@@ -375,6 +397,7 @@ class WorkerExecutorService {
         try {
             outcome = await this.spawnAndWait(sessionId, item, adapter, tier);
             if (outcome.status === 'failed' &&
+                !(0, workerRuntime_1.isWorkerPermissionFailure)(outcome.message) &&
                 outcome.usage?.tokensOut === 0 &&
                 (outcome.apiErrorStatus === 429 ||
                     (outcome.message !== undefined &&
@@ -395,6 +418,7 @@ class WorkerExecutorService {
             const workspacePristine = (outcome.usage?.tokensOut ?? 0) === 0;
             if (outcome.status === 'failed' &&
                 !this.cancelledSessions.has(sessionId) &&
+                !(0, workerRuntime_1.isWorkerPermissionFailure)(outcome.message) &&
                 adapter.supportsModelFallback &&
                 models.modelOverride === undefined &&
                 tier.vendor === 'claude' &&
@@ -638,17 +662,20 @@ class WorkerExecutorService {
                     ? ` | result: ${resultText.slice(-500)}`
                     : '';
                 const processFailure = `worker exited ${code}: ${stderrTail.slice(-400)}${resultDetail}`;
+                const capacityError = (0, workerRuntime_1.isWorkerPermissionFailure)(processFailure)
+                    ? undefined
+                    : (0, generationCapacity_1.getGenerationCapacityError)({
+                        message: stderrTail,
+                        result: isFailed ? resultText : undefined,
+                        status: apiErrorStatus,
+                        error,
+                    });
                 resolve({
                     status: 'failed',
                     terminationReason,
                     exitCode: code,
                     signal,
-                    message: (0, generationCapacity_1.getGenerationCapacityError)({
-                        message: stderrTail,
-                        result: isFailed ? resultText : undefined,
-                        status: apiErrorStatus,
-                        error,
-                    })?.message ??
+                    message: capacityError?.message ??
                         (inputError
                             ? `worker input delivery failed: ${inputError.message}; ${processFailure}`
                             : processFailure),

package/dist/agent-variants/WorktreeOrchestrator.d.ts

@@ -1,9 +1,10 @@
 import { type StaticPreviewRefinementRequest, type StaticPreviewRefinementResult } from './staticPreviewRefinements';
 import type { GuidanceDocument } from '../types/guidance';
+import type { VariantStartRequest, VariantStartResult } from './variant-start-types';
 import type { ChildProcess } from 'child_process';
 import { AgentVariantsError } from './errors';
 import { SessionStore, type ApprovedBriefSelection, type ApproveResult, type ProposeArgs, type ProposeResult, type ReportCompleteResult, type RequestWorkResult } from './SessionStore';
-import type { ActiveProjectContext, AdoptPastVariantArgs, BootstrapPastVariantSessionArgs, BootstrapPastVariantSessionResult, ActiveVariantSnapshot, Brief, ProjectContext, Stage, Target, TerminalSummary, VariantContextBinding, HostVariantWorkItemSnapshot, VariantQaResult, VariantSessionArtifact, WorkItemStatus } from './contracts';
+import type { ActiveProjectContext, AdoptPastVariantArgs, BootstrapPastVariantSessionArgs, BootstrapPastVariantSessionResult, ActiveVariantSnapshot, Brief, ProjectContext, Stage, TerminalSummary, VariantContextBinding, HostVariantWorkItemSnapshot, VariantQaResult, WorkItemStatus } from './contracts';
 import type { VariantWorkItemInput } from './workItemInput';
 import { VariantHistoryService } from '../services/VariantHistoryService';
 import type { MCPVariantsTelemetryMetadata } from '../services/MCPVariantsTelemetry';
@@ -19,6 +20,7 @@ export type PreviewQaRunner = (args: {
 }) => Promise<VariantQaResult>;
 export type { DroppedRefinement } from './staticPreviewRefinements';
 export interface OrchestratorDeps {
+    getProjectPath: () => string;
     store: SessionStore;
     worktreeManager: WorktreeManagerLike;
     resolveProjectEnvironment: (sessionId: string) => Promise<ProjectEnvironment>;
@@ -57,12 +59,12 @@ export type ActiveSnapshot = {
     variants: ActiveVariantSnapshot[];
     projectContext: ActiveProjectContext;
     destinationPath?: string;
-    artifacts?: VariantSessionArtifact[];
     hostWork?: import('./contracts').HostVariantWorkItemSnapshot[];
     workerRuntime?: string;
     pendingVariantRequests?: number;
 };
 export declare class AgentVariantsOrchestrator {
+    private readonly getProjectPath;
     private readonly store;
     private readonly worktrees;
     private readonly resolveEnv;
@@ -164,8 +166,6 @@ export declare class AgentVariantsOrchestrator {
     resolveDevServerPortForPreview(sessionId: string, workItemId: string): number | undefined;
     getVariantWorkItemKind(sessionId: string, workItemId: string): string | undefined;
     getStaticPreviewHtml(sessionId: string, workItemId: string): string | undefined;
-    getDesignContextMarkdown(sessionId: string, artifactId: string): string | undefined;
-    getDesignContextViewerHtml(sessionId: string, artifactId: string): string | undefined;
     hasStaticPreviewAssets(sessionId: string, workItemId: string): boolean;
     resolveStaticPreviewAssetPath(sessionId: string, workItemId: string, requestedPath?: string): string | undefined;
     private getStaticPreviewByBriefId;
@@ -174,37 +174,7 @@ export declare class AgentVariantsOrchestrator {
         sessionId: string;
         selections: ApprovedBriefSelection[];
     }): Promise<ApproveResult>;
-    startUnified(args: {
-        previewRoutes?: string[];
-        beforeDispatch?: (workItemIds: string[]) => Promise<void> | void;
-        guidance?: GuidanceDocument[];
-        assertContext?: () => void;
-        prompt: string;
-        count?: number;
-        target?: Target;
-        projectContext?: ProjectContext;
-        sessionId?: string;
-        runLabel?: string;
-        leaseOwner?: string;
-        briefs?: import('./contracts').StartVariantsBriefContent[];
-        requestId?: string;
-        allowAccumulate?: boolean;
-        sourceVariantId?: string;
-        relevantFiles?: string[];
-        fidelity?: import('./contracts').WorkerFidelity;
-    }): Promise<{
-        sessionId: string;
-        variants: Array<{
-            variantId: string;
-            briefId: string;
-            label: string;
-            status: 'pending';
-        }>;
-        scaffoldBaseWorkItemId: string | null;
-        leaseId?: string;
-        leaseTtlMs?: number;
-        leasedWorkItems?: import('./SessionStore').RequestWorkResult['leasedWorkItems'];
-    }>;
+    startUnified(args: VariantStartRequest): Promise<VariantStartResult>;
     private buildUnifiedBriefs;
     private getAppendableExistingSessionId;
     reportComplete(args: {

package/dist/agent-variants/WorktreeOrchestrator.js

@@ -29,7 +29,7 @@ const PreviewRuntime_1 = require("./PreviewRuntime");
 const diffQa_1 = require("./diffQa");
 const VariantHistoryService_1 = require("../services/VariantHistoryService");
 const variantContext_1 = require("./variantContext");
-const designContextArtifacts_1 = require("./designContextArtifacts");
+const designContext_1 = require("./designContext");
 const variantsTelemetry_1 = require("./variantsTelemetry");
 const variantWorkspaceFiles_1 = require("./variantWorkspaceFiles");
 const errnoCode_1 = require("../utils/errnoCode");
@@ -195,6 +195,7 @@ const isDesignCreationCodeGenInput = (input, prompt) => {
         DESIGN_CREATION_SURFACE_RE.test(text));
 };
 class AgentVariantsOrchestrator {
+    getProjectPath;
     store;
     worktrees;
     resolveEnv;
@@ -214,6 +215,7 @@ class AgentVariantsOrchestrator {
     activeSessionId = null;
     events = new events_1.EventEmitter();
     constructor(deps) {
+        this.getProjectPath = deps.getProjectPath;
         this.store = deps.store;
         this.worktrees = deps.worktreeManager;
         this.workspaceInventory = new WorkspaceInventory_1.WorkspaceInventory({
@@ -360,11 +362,10 @@ class AgentVariantsOrchestrator {
             : null;
         const variants = this.getVariants(sessionId);
         const sessionProjectContext = this.store.getProjectContext(sessionId);
-        const projectContext = (0, designContextArtifacts_1.toActiveProjectContext)(sessionProjectContext);
+        const projectContext = (0, designContext_1.toActiveProjectContext)(sessionProjectContext);
         const destinationPath = projectContext.kind === 'fresh'
             ? projectContext.workspacePath
             : undefined;
-        const artifacts = (0, designContextArtifacts_1.buildSessionArtifacts)(sessionId, sessionProjectContext);
         const hostWork = this.getHostWork(sessionId).map((item) => {
             if ('guidance' in item) {
                 const publicItem = { ...item };
@@ -390,7 +391,6 @@ class AgentVariantsOrchestrator {
             variants,
             projectContext,
             ...(destinationPath ? { destinationPath } : {}),
-            ...(artifacts.length > 0 ? { artifacts } : {}),
             ...(hostWork.length > 0 ? { hostWork } : {}),
             ...(workerRuntime ? { workerRuntime } : {}),
         };
@@ -445,6 +445,9 @@ class AgentVariantsOrchestrator {
                     ...(input.briefNotes ? { notes: input.briefNotes } : {}),
                 },
                 ...(input.fidelity ? { fidelity: input.fidelity } : {}),
+                ...(input.workerSelection
+                    ? { workerSelection: input.workerSelection }
+                    : {}),
                 ...(sourceLabel && sourceBody
                     ? { sourceDirection: { label: sourceLabel, brief: sourceBody } }
                     : {}),
@@ -775,10 +778,7 @@ class AgentVariantsOrchestrator {
         if (leasedWorkItemIds.length === 0)
             return;
         const leased = new Set(leasedWorkItemIds);
-        const projectContext = this.store.getProjectContext(sessionId);
-        const projectPath = projectContext.kind === 'fresh'
-            ? projectContext.workspaceRoot
-            : projectContext.projectPath;
+        const projectPath = this.getProjectPath();
         for (const item of this.getHostWork(sessionId)) {
             if (!leased.has(item.workId))
                 continue;
@@ -1073,7 +1073,7 @@ class AgentVariantsOrchestrator {
                 : 'Wait for a successful variant';
             return {
                 ...variant,
-                design: (0, designContextArtifacts_1.enrichDesignSource)(variant.design),
+                design: (0, designContext_1.enrichDesignSource)(variant.design),
                 ...(preview ? { preview } : {}),
                 port,
                 ...(changedFilesCount !== undefined ? { changedFilesCount } : {}),
@@ -1172,14 +1172,6 @@ class AgentVariantsOrchestrator {
             return undefined;
         }
     }
-    getDesignContextMarkdown(sessionId, artifactId) {
-        const artifact = (0, designContextArtifacts_1.findDesignContextArtifact)(this.store.getProjectContext(sessionId), artifactId);
-        return artifact?.content;
-    }
-    getDesignContextViewerHtml(sessionId, artifactId) {
-        const artifact = (0, designContextArtifacts_1.findDesignContextArtifact)(this.store.getProjectContext(sessionId), artifactId);
-        return artifact ? (0, designContextArtifacts_1.buildDesignContextViewerDocument)(artifact) : undefined;
-    }
     hasStaticPreviewAssets(sessionId, workItemId) {
         const record = this.workspaceInventory.getStaticPreview(sessionId, workItemId);
         return Boolean(record?.hasAssets);
@@ -1286,6 +1278,9 @@ class AgentVariantsOrchestrator {
                 guidance: args.guidance ?? [],
                 runLabel: args.runLabel?.trim() || (0, runLabel_1.deriveRunLabel)(args.prompt),
                 ...(args.fidelity ? { fidelity: args.fidelity } : {}),
+                ...(args.workerSelection
+                    ? { workerSelection: args.workerSelection }
+                    : {}),
                 ...(args.relevantFiles?.length
                     ? { relevantFiles: args.relevantFiles }
                     : {}),
@@ -1334,6 +1329,9 @@ class AgentVariantsOrchestrator {
                 projectContext,
                 runLabel: args.runLabel,
                 ...(args.fidelity ? { fidelity: args.fidelity } : {}),
+                ...(args.workerSelection
+                    ? { workerSelection: args.workerSelection }
+                    : {}),
                 ...(args.sessionId ? { sessionId: args.sessionId } : {}),
             });
             if (proposeResult.stage !== 'awaiting_briefs' ||
@@ -2929,7 +2927,7 @@ class AgentVariantsOrchestrator {
             kinds: ['static_preview', 'code_gen'],
         });
         const sessionPrompt = this.store.getPrompt(args.sessionId);
-        const designArtifact = (0, designContextArtifacts_1.resolveDesignArtifact)(input.designContextEntry);
+        const designArtifact = (0, designContext_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;

package/dist/agent-variants/WorktreeOrchestrator.testHelpers.js

@@ -132,6 +132,7 @@ function buildOrchestrator(opts = {}) {
         switchPreviewPortCalls: [],
     };
     const orchestrator = new WorktreeOrchestrator_1.AgentVariantsOrchestrator({
+        getProjectPath: () => (opts.env ?? exports.ENV).projectPath,
         store,
         worktreeManager,
         resolveProjectEnvironment: opts.resolveProjectEnvironment ?? (async () => opts.env ?? exports.ENV),