rivet-design 0.14.10 → 0.14.12

package/dist/agent-variants/WorktreeOrchestrator.js

@@ -29,6 +29,7 @@ const VariantWorkspaceManager_1 = require("./VariantWorkspaceManager");
 const diffQa_1 = require("./diffQa");
 const VariantHistoryService_1 = require("../services/VariantHistoryService");
 const variantContext_1 = require("./variantContext");
+const contextAssets_1 = require("./contextAssets");
 const log = (0, logger_1.createLogger)('AgentVariantsOrchestrator');
 const FRESH_DEV_SERVER_HOST = '127.0.0.1';
 const BRIEF_LABEL_MAX_LENGTH = 48;
@@ -142,28 +143,16 @@ function withProvisionTimeout(work, timeoutMs) {
     return Promise.race([work, timeout]).finally(() => clearTimeout(timer));
 }
 /**
- * Allowlist of asset file extensions an agent-planned source may have.
- * `assetPlan` is sized for large local *assets* (3D models, images,
- * audio, video, fonts) — never code, dotfiles, secrets, or arbitrary
- * configs. The check is defense-in-depth alongside the path / symlink
- * filters in `copyAssetIntoWorktree`; without it, a prompt-injected
- * source plan could copy readable host files such as SSH keys or
- * project secrets into the generated app.
- *
- * Intentionally excludes `.json`, `.txt`, `.md`, `.csv`: these are
- * common carriers for credentials (`credentials.json`, `.aws/config`,
- * shell history `.txt`, README-shaped secrets) and have no legitimate
- * use as binary preview assets. If a future flow needs structured data
- * it should ship it through the manifest instead of file copy.
+ * File types an agent-authored asset plan may copy into a generated preview.
+ * This allowlist protects an agent-controlled path; caller-selected context
+ * assets use the separate, type-neutral delivery path.
  */
-const ALLOWED_ASSET_EXTENSIONS = new Set([
-    // 3D / models
+const ALLOWED_INERT_ASSET_EXTENSIONS = new Set([
     '.glb',
     '.gltf',
     '.obj',
     '.fbx',
     '.usdz',
-    // images
     '.png',
     '.jpg',
     '.jpeg',
@@ -173,22 +162,18 @@ const ALLOWED_ASSET_EXTENSIONS = new Set([
     '.avif',
     '.bmp',
     '.ico',
-    // video
     '.mp4',
     '.webm',
     '.mov',
-    // audio
     '.mp3',
     '.wav',
     '.ogg',
     '.m4a',
-    // fonts
     '.woff',
     '.woff2',
     '.ttf',
     '.otf',
     '.eot',
-    // PDFs
     '.pdf',
 ]);
 /**
@@ -267,7 +252,7 @@ function copyAssetIntoWorktree(worktreePath, entry, assetSourceRoot) {
         ? entry.source
         : path_1.default.resolve(assetSourceRoot, entry.source);
     const ext = path_1.default.extname(absoluteSource).toLowerCase();
-    if (!ALLOWED_ASSET_EXTENSIONS.has(ext)) {
+    if (!ALLOWED_INERT_ASSET_EXTENSIONS.has(ext)) {
         throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', `assetPlan.source extension '${ext || '(none)'}' is not on the allowlist (got '${entry.source}'). Only inert media/font/document assets may be copied.`);
     }
     // lstat first: a symlink whose target lies outside the source path
@@ -331,7 +316,7 @@ function copyAssetIntoWorktree(worktreePath, entry, assetSourceRoot) {
         throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', `assetPlan.source traverses a sensitive directory and is refused: ${entry.source}`);
     }
     const resolvedExt = path_1.default.extname(resolvedSource).toLowerCase();
-    if (!ALLOWED_ASSET_EXTENSIONS.has(resolvedExt)) {
+    if (!ALLOWED_INERT_ASSET_EXTENSIONS.has(resolvedExt)) {
         throw new errors_1.AgentVariantsError('RUNTIME_VALIDATION_FAILED', `assetPlan.source resolved extension '${resolvedExt || '(none)'}' is not on the allowlist (resolved from '${entry.source}').`);
     }
     const normalizedDest = path_1.default.normalize(entry.destination);
@@ -559,6 +544,7 @@ class AgentVariantsOrchestrator {
                 requestedCount: args.count ?? contracts_1.DEFAULT_VARIANT_COUNT,
             });
         }
+        const designContextCount = projectContext.designContext?.length ?? 0;
         this.telemetry.track('agent_variants.session_started', {
             source: 'mcp',
             sessionId: result.sessionId,
@@ -566,6 +552,8 @@ class AgentVariantsOrchestrator {
             hasTarget: Boolean(args.target),
             targetType: args.target?.type ?? null,
             projectContextKind: args.projectContext?.kind ?? 'existing',
+            design_context_count: designContextCount,
+            design_context_kinds: designContextCount > 0 ? ['design_system'] : [],
         });
         this.emitChange();
         return result;
@@ -660,6 +648,7 @@ class AgentVariantsOrchestrator {
             : undefined;
         const artifacts = buildSessionArtifacts(sessionId, sessionProjectContext);
         const hostWork = this.getHostWork(sessionId);
+        const workerRuntime = this.store.getWorkerRuntime(sessionId);
         return {
             active: true,
             sessionId,
@@ -672,8 +661,22 @@ class AgentVariantsOrchestrator {
             ...(destinationPath ? { destinationPath } : {}),
             ...(artifacts.length > 0 ? { artifacts } : {}),
             ...(hostWork.length > 0 ? { hostWork } : {}),
+            ...(workerRuntime ? { workerRuntime } : {}),
         };
     }
+    /** Record which worker runtime this session's current batch leases to —
+     *  called by the generation services right after the lease-owner decision
+     *  so `variants start`/status can answer "what is running these?". */
+    setWorkerRuntime(sessionId, summary) {
+        if (!this.store.hasSession(sessionId))
+            return;
+        this.store.setWorkerRuntime(sessionId, summary);
+        // Push a fresh snapshot to SSE subscribers: startUnified/requestWork
+        // already emitted before this setter ran, and without an emit here a
+        // subscribed client would not see workerRuntime until the next state
+        // transition (possibly the first worker completion).
+        this.emitChange();
+    }
     /** User reference files stored in the work item's context bundle (uploaded
      *  or copied local images). Surfaced on the snapshot so briefings can point
      *  workers at the files directly — one Read instead of a bundle walk. */
@@ -682,7 +685,7 @@ class AgentVariantsOrchestrator {
             .filter((source) => source.transport === 'file')
             .map((source) => ({
             path: source.path,
-            ...(source.label ?? source.originalFilename
+            ...((source.label ?? source.originalFilename)
                 ? { label: source.label ?? source.originalFilename }
                 : {}),
         }));
@@ -704,6 +707,9 @@ class AgentVariantsOrchestrator {
                 workItemId: item.workId,
                 kind,
             });
+            const contextAssets = this.resources
+                .get(sessionId)
+                ?.contextAssets.get(item.workId);
             const mode = input.sourceVariantId
                 ? 'vary'
                 : DEFAULT_EXECUTION_MODE_BY_KIND[kind];
@@ -741,6 +747,7 @@ class AgentVariantsOrchestrator {
                     ? { contextBundlePath: input.context.contextBundlePath }
                     : {}),
                 ...(AgentVariantsOrchestrator.contextFilesOf(input.context) ?? {}),
+                ...(contextAssets?.length ? { contextAssets } : {}),
                 completion: kind === 'code_gen'
                     ? { kind: 'worktree_diff' }
                     : { kind: 'static_artifact' },
@@ -1059,12 +1066,12 @@ class AgentVariantsOrchestrator {
         const result = this.store.requestWork(args);
         try {
             this.ensureStaticWorkspaces(args.sessionId, result.leasedWorkItems);
+            this.materializeContextAssets(args.sessionId, result.leasedWorkItems);
         }
         catch (error) {
             for (const item of result.leasedWorkItems) {
-                if (item.kind !== 'static_preview' && item.kind !== 'refine_variant') {
+                if (!isImplementationWorkItemKind(item.kind))
                     continue;
-                }
                 try {
                     this.store.reportComplete({
                         sessionId: args.sessionId,
@@ -1076,7 +1083,7 @@ class AgentVariantsOrchestrator {
                             code: 'RUNTIME_VALIDATION_FAILED',
                             message: error instanceof Error
                                 ? error.message
-                                : 'Failed to assign static variant workspace',
+                                : 'Failed to prepare variant workspace',
                         },
                     });
                 }
@@ -1118,6 +1125,24 @@ class AgentVariantsOrchestrator {
         this.emitChange();
         return decorated;
     }
+    /** @effect Copies caller-supplied context assets into each leased workspace. */
+    materializeContextAssets(sessionId, items) {
+        const resources = this.ensureResources(sessionId);
+        for (const item of items) {
+            if (!isImplementationWorkItemKind(item.kind))
+                continue;
+            const input = (item.input ?? {});
+            const assets = input.context?.contextAssets ?? [];
+            if (assets.length === 0)
+                continue;
+            const workspace = this.getAssignedWorkspace({
+                sessionId,
+                workItemId: item.id,
+                kind: item.kind,
+            });
+            resources.contextAssets.set(item.id, (0, contextAssets_1.materializeContextAssets)({ assets, workspace }));
+        }
+    }
     /**
      * @effect Writes each leased implementation item's server-authored briefing
      * BESIDE its workspace so the coordinating host dispatches workers with a
@@ -1919,6 +1944,7 @@ class AgentVariantsOrchestrator {
         const projectContext = args.projectContext ?? {
             kind: 'existing',
         };
+        const designContextCount = projectContext.designContext?.length ?? 0;
         // Fresh source-grounded sessions (a captured context bundle on a fresh
         // project) must run through `propose` so the source-research/source_plan
         // flow gates generation; start_variants routes them there before reaching
@@ -2041,6 +2067,8 @@ class AgentVariantsOrchestrator {
                 hasTarget: Boolean(args.target),
                 targetType: args.target?.type ?? null,
                 projectContextKind: projectContext.kind,
+                design_context_count: designContextCount,
+                design_context_kinds: designContextCount > 0 ? ['design_system'] : [],
             });
             sessionId = proposeResult.sessionId;
             scaffoldBaseWorkItemId = approveResult.scaffoldBaseWorkItemId ?? null;
@@ -2230,7 +2258,11 @@ class AgentVariantsOrchestrator {
     async provisionAppendedExistingWorktrees(sessionId, workItemIds) {
         if (workItemIds.length === 0)
             return;
-        await this.withProvisioningTelemetry({ sessionId, kind: 'appended_existing', variantCount: workItemIds.length }, async () => {
+        await this.withProvisioningTelemetry({
+            sessionId,
+            kind: 'appended_existing',
+            variantCount: workItemIds.length,
+        }, async () => {
             const resources = this.ensureResources(sessionId);
             const instanceKeyPrefix = `a${(0, crypto_1.randomUUID)().slice(0, 8)}-`;
             const paths = await withProvisionTimeout(this.worktrees.createWorktrees(sessionId, workItemIds.length, instanceKeyPrefix), this.provisionTimeoutMs);
@@ -4223,7 +4255,7 @@ class AgentVariantsOrchestrator {
             label: input.briefLabel,
             brief: input.briefBody,
             sessionPrompt,
-            runLabel: this.store.getRunLabel(args.sessionId),
+            runLabel: input.runLabel ?? this.store.getRunLabel(args.sessionId),
             kind: 'diff',
             diff: args.diff,
             sourceDir,
@@ -4236,6 +4268,11 @@ class AgentVariantsOrchestrator {
             baseDir,
             serve,
             parentVariant: this.resolveHistoryParentVariant(args.sessionId, input.sourceVariantId),
+            ...(this.store.getWorkItemRuntime(args.sessionId, args.workItemId)
+                ? {
+                    runtime: this.store.getWorkItemRuntime(args.sessionId, args.workItemId),
+                }
+                : {}),
         });
     }
     /**
@@ -4463,7 +4500,7 @@ class AgentVariantsOrchestrator {
                 label: input.briefLabel,
                 brief: input.briefBody,
                 sessionPrompt,
-                runLabel: this.store.getRunLabel(args.sessionId),
+                runLabel: input.runLabel ?? this.store.getRunLabel(args.sessionId),
                 kind: 'project-created',
                 sourceDir,
                 preview,
@@ -4474,6 +4511,11 @@ class AgentVariantsOrchestrator {
                 snapshotDir: sourceDir,
                 serve,
                 parentVariant: this.resolveHistoryParentVariant(args.sessionId, input.sourceVariantId),
+                ...(this.store.getWorkItemRuntime(args.sessionId, args.workItemId)
+                    ? {
+                        runtime: this.store.getWorkItemRuntime(args.sessionId, args.workItemId),
+                    }
+                    : {}),
             });
         }
         finally {
@@ -5272,6 +5314,7 @@ class AgentVariantsOrchestrator {
                 worktrees: new Map(),
                 staticPreviews: new Map(),
                 workspaceManager: new VariantWorkspaceManager_1.VariantWorkspaceManager(),
+                contextAssets: new Map(),
                 cleanupStarted: false,
                 committedVariantIds: new Set(),
                 startedAt: Date.now(),
@@ -6166,7 +6209,7 @@ const STATIC_PREVIEW_HISTORY_EXCLUDE = new Set([
     '.rivet',
 ]);
 const STATIC_PREVIEW_HISTORY_FILE_EXTENSIONS = new Set([
-    ...ALLOWED_ASSET_EXTENSIONS,
+    ...ALLOWED_INERT_ASSET_EXTENSIONS,
     '.css',
     '.htm',
     '.html',