rivet-design 0.26.2 → 0.27.1

package/dist/agent-variants/WorktreeOrchestrator.js

@@ -8,6 +8,7 @@ const workItemContextFiles_1 = require("./workItemContextFiles");
 const staticPreviewFiles_1 = require("./staticPreviewFiles");
 const workItemPreviewRoutes_1 = require("./workItemPreviewRoutes");
 const staticPreviewRefinements_1 = require("./staticPreviewRefinements");
+const WorkItemRequestTimes_1 = require("./WorkItemRequestTimes");
 const crypto_1 = require("crypto");
 const events_1 = require("events");
 const fs_1 = __importDefault(require("fs"));
@@ -20,6 +21,7 @@ const workItemBriefing_1 = require("./workItemBriefing");
 const briefContent_1 = require("./briefContent");
 const runLabel_1 = require("./runLabel");
 const previewQa_1 = require("./previewQa");
+const workItemInput_1 = require("./workItemInput");
 const WorkspaceInventory_1 = require("./WorkspaceInventory");
 const WorkspaceProvisioning_1 = require("./WorkspaceProvisioning");
 const PreviewRuntime_1 = require("./PreviewRuntime");
@@ -31,6 +33,7 @@ const variantsTelemetry_1 = require("./variantsTelemetry");
 const variantWorkspaceFiles_1 = require("./variantWorkspaceFiles");
 const errorMessage_1 = require("../utils/errorMessage");
 const pathContainment_1 = require("../utils/pathContainment");
+const existingStaticEntry_1 = require("./existingStaticEntry");
 var variantWorkspaceFiles_2 = require("./variantWorkspaceFiles");
 Object.defineProperty(exports, "buildStaticPreviewDocument", { enumerable: true, get: function () { return variantWorkspaceFiles_2.buildStaticPreviewDocument; } });
 const log = (0, logger_1.createLogger)('AgentVariantsOrchestrator');
@@ -426,6 +429,7 @@ class AgentVariantsOrchestrator {
                 leaseExpiresAt: item.leaseExpiresAt,
                 workspace,
                 mode,
+                ...(0, workItemInput_1.shownDirectionRef)(input),
                 direction: {
                     label: input.briefLabel ?? 'Variant',
                     brief: input.briefBody ?? input.instruction ?? 'Create this variant',
@@ -487,6 +491,7 @@ class AgentVariantsOrchestrator {
         resources.currentRoundStartedAt = startedAt;
         resources.currentRoundMode = args.mode;
         resources.currentRoundWorkItemIds = workItemIds;
+        resources.requestTimes.record(workItemIds ?? [], startedAt);
         const projectContext = this.store.getProjectContext(args.sessionId);
         this.telemetry.trackAgentVariantsRoundStarted?.({
             sessionId: args.sessionId,
@@ -565,6 +570,7 @@ class AgentVariantsOrchestrator {
         const workItemIds = [...args.workItemIds];
         round.workItemIds = workItemIds;
         resources.currentRoundWorkItemIds = workItemIds;
+        resources.requestTimes.record(workItemIds, round.startedAt);
         this.completeTerminalVariantsRounds(args.sessionId);
     }
     completeTerminalVariantsRounds(sessionId) {
@@ -646,6 +652,8 @@ class AgentVariantsOrchestrator {
         };
     }
     trackRefinementLeased(args) {
+        const requestTimes = this.resources.get(args.sessionId)?.requestTimes;
+        const leasedAt = Date.now();
         for (const item of args.lease.leasedWorkItems) {
             const telemetry = this.refinementTelemetryForWorkItem({
                 sessionId: args.sessionId,
@@ -657,6 +665,7 @@ class AgentVariantsOrchestrator {
             this.telemetry.trackAgentVariantsRefinementLeased?.({
                 ...telemetry,
                 leaseDurationMs: args.lease.leaseTtlMs,
+                queueWaitMs: requestTimes?.elapsedSinceRequestMs(item.id, leasedAt) ?? undefined,
                 workItemCount: 1,
             });
         }
@@ -788,13 +797,16 @@ class AgentVariantsOrchestrator {
         }
     }
     beginStaticPreviewRefinements(args) {
-        return (0, staticPreviewRefinements_1.createStaticPreviewRefinements)({
+        const result = (0, staticPreviewRefinements_1.createStaticPreviewRefinements)({
             request: args,
             store: this.store,
             telemetry: this.telemetry,
             getStaticPreviewHtml: (sessionId, workItemId) => this.getStaticPreviewHtml(sessionId, workItemId),
             emitChange: () => this.emitChange(),
         });
+        const requestTimes = this.resources.get(args.sessionId)?.requestTimes;
+        requestTimes?.record(result.createdWorkItemIds, Date.now());
+        return result;
     }
     async adoptPastVariant(args) {
         const { assetBase, entryPath, hasAssets } = await (0, staticPreviewFiles_1.resolveStaticPreviewFiles)({
@@ -810,6 +822,7 @@ class AgentVariantsOrchestrator {
             references: args.references,
             previewRoutes: args.previewRoutes,
             runLabel: args.runLabel,
+            sourceDirectionRef: args.directionRef,
         });
         this.telemetry.trackAgentVariantsRequestStarted?.({
             sessionId: args.sessionId,
@@ -859,6 +872,7 @@ class AgentVariantsOrchestrator {
                 references: args.references,
                 previewRoutes: args.previewRoutes,
                 runLabel: args.runLabel,
+                directionRef: args.directionRef,
             });
             return {
                 sessionId: usableSessionId,
@@ -880,6 +894,7 @@ class AgentVariantsOrchestrator {
             references: args.references,
             previewRoutes: args.previewRoutes,
             runLabel: args.runLabel,
+            sourceDirectionRef: args.directionRef,
             projectContext: args.projectContext,
         });
         this.activeSessionId = created.sessionId;
@@ -1548,6 +1563,8 @@ class AgentVariantsOrchestrator {
             const durationMs = leasedAt !== undefined ? Date.now() - leasedAt : null;
             const approveStartedAt = resources?.approveStartedAt;
             const approveToCompleteMs = approveStartedAt !== undefined ? Date.now() - approveStartedAt : null;
+            const requestTimes = resources?.requestTimes;
+            const elapsedSinceRequestMs = (at) => requestTimes?.elapsedSinceRequestMs(args.workItemId, at) ?? null;
             const outputBytes = (0, variantWorkspaceFiles_1.estimateOutputBytes)(effectiveArgs.output);
             const projectContextKind = this.store.getProjectContext(args.sessionId).kind;
             const mode = workItemKind !== undefined && isImplementationWorkItemKind(workItemKind)
@@ -1563,6 +1580,8 @@ class AgentVariantsOrchestrator {
                 attempt: args.attempt,
                 durationMs,
                 approveToCompleteMs,
+                requestToCompleteMs: elapsedSinceRequestMs(Date.now()),
+                queueWaitMs: elapsedSinceRequestMs(leasedAt),
                 kind: workItemKind ?? null,
                 mode,
                 leaseToReportMs: leasedAt !== undefined ? reportReceivedAt - leasedAt : null,
@@ -2094,12 +2113,24 @@ class AgentVariantsOrchestrator {
         catch (err) {
             log.warn(`getDiff failed for ${record.worktreePath}`, err);
         }
+        const staticEntryResolution = isFresh
+            ? Promise.resolve(undefined)
+            : (0, existingStaticEntry_1.resolveExistingStaticPreviewEntry)({
+                sessionId,
+                record,
+                resolveEnv: this.resolveEnv,
+                worktrees: this.worktrees,
+                telemetry: this.telemetry,
+            });
         if (!isFresh) {
-            this.trackHistoryPersist(this.persistCompletedExistingVariant({
+            this.trackHistoryPersist(staticEntryResolution
+                .then((staticEntry) => this.persistCompletedExistingVariant({
                 sessionId,
                 workItemId,
                 diff: record.diff ?? '',
-            }).catch((err) => {
+                staticEntry,
+            }))
+                .catch((err) => {
                 log.warn(`persistCompletedExistingVariant failed for ${sessionId}/${workItemId}`, err);
             }));
         }
@@ -2111,12 +2142,11 @@ class AgentVariantsOrchestrator {
                 log.warn(`persistCompletedArtifactVariant failed for ${sessionId}/${workItemId}`, err);
             }));
         }
-        if (!isFresh) {
-            const staticPreview = await this.registerExistingStaticPreview(sessionId, workItemId, record);
-            if (staticPreview !== 'not_static') {
-                this.emitChange();
-                return;
-            }
+        const staticEntry = await staticEntryResolution;
+        if (staticEntry) {
+            await this.registerExistingStaticPreview(sessionId, workItemId, staticEntry);
+            this.emitChange();
+            return;
         }
         await this.previewRuntime.startVariant({
             sessionId,
@@ -2224,6 +2254,12 @@ class AgentVariantsOrchestrator {
             await Promise.allSettled([...this.pendingHistoryPersists]);
         }
     }
+    loadDirectionRefs() {
+        return this.store.directionRefs.load({
+            projectPath: this.getProjectPath(),
+            history: this.variantHistory,
+        });
+    }
     async getSavedVariant(args) {
         const saved = await this.variantHistory.getVariant(args);
         if (saved)
@@ -2297,16 +2333,9 @@ class AgentVariantsOrchestrator {
             return;
         }
         const record = this.workspaceInventory.getWorktree(args.sessionId, args.workItemId);
-        let sourceDir;
-        const staticEntryPath = env.framework === 'static' ? env.entryPath : undefined;
-        if (env.framework === 'static' && record) {
-            try {
-                sourceDir = await this.worktrees.getProjectCwdInWorktree(record.worktreePath);
-            }
-            catch (err) {
-                log.warn(`persistCompletedExistingVariant: static snapshot path failed for ${args.sessionId}/${args.workItemId}`, err);
-            }
-        }
+        const staticSource = args.staticEntry?.kind === 'found' ? args.staticEntry : undefined;
+        const sourceDir = staticSource?.projectDirectory;
+        const staticEntryPath = staticSource?.entryPath;
         const input = this.store.requireVariantWorkItemInput({
             sessionId: args.sessionId,
             workItemId: args.workItemId,
@@ -2333,7 +2362,7 @@ class AgentVariantsOrchestrator {
                 recipe: (0, variantWorkspaceFiles_1.buildServeRecipeFromResolved)(record.worktreePath, runningPreview.command, runningPreview.port),
             };
         }
-        else if (record) {
+        else if (record && env.framework !== 'static') {
             try {
                 const dev = await this.previewRuntime.resolveCommand(args.sessionId, record.worktreePath, RECIPE_PORT_SENTINEL, false);
                 serve = {
@@ -2350,6 +2379,7 @@ class AgentVariantsOrchestrator {
             sessionId: args.sessionId,
             variantId: args.workItemId,
             ...(input.requestId ? { requestId: input.requestId } : {}),
+            directionRef: this.store.claimDirectionRef(args),
             label: input.briefLabel,
             brief: input.briefBody,
             references: input.references,
@@ -2380,92 +2410,74 @@ class AgentVariantsOrchestrator {
                 : {}),
         });
     }
-    async registerExistingStaticPreview(sessionId, workItemId, record) {
-        let env;
-        try {
-            env = await this.resolveEnv(sessionId);
-        }
-        catch (err) {
-            log.warn(`registerExistingStaticPreview: resolveEnv failed for ${sessionId}`, err);
-            return 'not_static';
-        }
-        if (env.framework !== 'static')
-            return 'not_static';
-        const previewStartedAt = Date.now();
-        (0, variantsTelemetry_1.trackPreviewStarted)(this.telemetry, {
-            sessionId,
-            variantId: workItemId,
-            projectContextKind: 'existing',
-            previewKind: 'static_artifact',
-        });
+    async registerExistingStaticPreview(sessionId, workItemId, entry) {
         const resources = this.resources.get(sessionId);
         if (!resources)
-            return 'unavailable';
+            return;
         const input = this.store.getVariantWorkItemInput(sessionId, workItemId);
         if (!input?.briefId)
-            return 'unavailable';
-        let projectCwd;
-        try {
-            projectCwd = await this.worktrees.getProjectCwdInWorktree(record.worktreePath);
-        }
-        catch (err) {
-            log.warn(`registerExistingStaticPreview: project cwd failed for ${sessionId}/${workItemId}`, err);
-            return 'unavailable';
-        }
-        const entryFile = path_1.default.join(projectCwd, env.entryPath);
-        try {
-            await fs_1.default.promises.access(entryFile, fs_1.default.constants.R_OK);
-        }
-        catch (err) {
-            log.warn(`registerExistingStaticPreview: no entry HTML at ${entryFile} for ${sessionId}/${workItemId}; preview unavailable`, err);
-            (0, variantsTelemetry_1.trackPreviewFailed)(this.telemetry, {
-                sessionId,
-                variantId: workItemId,
-                projectContextKind: 'existing',
-                previewKind: 'static_artifact',
-                errorCode: 'STATIC_PREVIEW_ENTRY_MISSING',
-                reason: 'missing_static_entry',
-                durationMs: Date.now() - previewStartedAt,
-            });
-            this.previewRuntime.setFailure(sessionId, workItemId, {
-                reason: 'missing_static_entry',
-                portInUse: false,
-            });
-            return 'unavailable';
+            return;
+        switch (entry.kind) {
+            case 'unresolved':
+                return;
+            case 'missing':
+                log.warn(`registerExistingStaticPreview: no entry page (${entry.source}) for ${sessionId}/${workItemId}; preview unavailable`);
+                (0, variantsTelemetry_1.trackPreviewFailed)(this.telemetry, {
+                    sessionId,
+                    variantId: workItemId,
+                    projectContextKind: 'existing',
+                    previewKind: 'static_artifact',
+                    errorCode: 'STATIC_PREVIEW_ENTRY_MISSING',
+                    reason: 'missing_static_entry',
+                    durationMs: Date.now() - entry.startedAt,
+                    staticEntrySource: entry.source,
+                });
+                this.previewRuntime.setFailure(sessionId, workItemId, {
+                    reason: 'missing_static_entry',
+                    portInUse: false,
+                    detail: entry.detail,
+                });
+                return;
+            case 'found':
+                break;
+            default: {
+                const unhandled = entry;
+                throw new Error(`Unhandled static entry ${JSON.stringify(unhandled)}`);
+            }
         }
         let dir;
         try {
-            dir = fs_1.default.realpathSync(projectCwd);
+            dir = fs_1.default.realpathSync(entry.projectDirectory);
         }
         catch {
-            dir = projectCwd;
+            dir = entry.projectDirectory;
         }
         let siteFallbackBase;
         try {
-            const hostRealRoot = fs_1.default.realpathSync(env.projectPath);
+            const hostRealRoot = fs_1.default.realpathSync(entry.hostProjectPath);
             if (hostRealRoot !== dir)
-                siteFallbackBase = path_1.default.join(hostRealRoot, path_1.default.dirname(env.entryPath));
+                siteFallbackBase = path_1.default.join(hostRealRoot, path_1.default.dirname(entry.entryPath));
         }
         catch { }
         this.workspaceInventory.setStaticPreview(sessionId, {
             workItemId,
             briefId: input.briefId,
-            entryPath: path_1.default.basename(env.entryPath),
-            assetBase: path_1.default.dirname(path_1.default.join(dir, env.entryPath)),
+            entryPath: path_1.default.basename(entry.entryPath),
+            assetBase: path_1.default.dirname(path_1.default.join(dir, entry.entryPath)),
             hasAssets: true,
             ...(siteFallbackBase ? { assetFallbackBase: siteFallbackBase } : {}),
         });
         this.previewRuntime.clearFailure(sessionId, workItemId);
-        log.info(`Variant ${workItemId} served as a static preview (existing/static, no dev server; root ${projectCwd})`);
+        log.info(`Variant ${workItemId} served as a static preview (existing/static, no dev server; root ${entry.projectDirectory})`);
         (0, variantsTelemetry_1.trackPreviewReady)(this.telemetry, {
             sessionId,
             variantId: workItemId,
             projectContextKind: 'existing',
             previewKind: 'static_artifact',
             hasPort: false,
-            durationMs: Date.now() - previewStartedAt,
+            durationMs: Date.now() - entry.startedAt,
+            staticEntrySource: entry.source,
         });
-        return 'registered';
     }
     async prepareArtifactBase(sessionId) {
         const { projectPath } = await this.resolveEnv(sessionId);
@@ -2478,7 +2490,7 @@ class AgentVariantsOrchestrator {
     async createArtifactDiff(args) {
         const base = await this.prepareArtifactBase(args.sessionId);
         const env = await this.resolveEnv(args.sessionId);
-        const entryPath = env.framework === 'static' ? env.entryPath : 'index.html';
+        const entryPath = (env.framework === 'static' && env.entryPath) || 'index.html';
         const files = (0, staticPreviewFiles_1.prepareStaticPreviewProjectFiles)({
             sourceDir: args.sourceDir,
             entryPath,
@@ -2598,6 +2610,7 @@ class AgentVariantsOrchestrator {
                 sessionId: args.sessionId,
                 variantId: args.workItemId,
                 ...(input.requestId ? { requestId: input.requestId } : {}),
+                directionRef: this.store.claimDirectionRef(args),
                 label: input.briefLabel,
                 brief: input.briefBody ?? '',
                 references: input.references,
@@ -2746,6 +2759,7 @@ class AgentVariantsOrchestrator {
                 startedAt: Date.now(),
                 nextRoundIndex: 0,
                 rounds: new Map(),
+                requestTimes: new WorkItemRequestTimes_1.WorkItemRequestTimes(),
                 leasedAt: new Map(),
                 qaResults: new Map(),
                 qaRegenRetried: new Set(),