rivet-design 0.24.0 → 0.26.0

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

@@ -24,20 +24,13 @@ export declare class FakeWorktreeManager implements WorktreeManagerLike {
     startDevServer(worktreePath: string, port: number, cmd: string, args: string[], env: Record<string, string>): Promise<never>;
     stopDevServer(): Promise<void>;
     getProjectCwdInWorktree(worktreePath: string): Promise<string>;
-    applyDiffToProjectImpl: (diff: string, projectPath: string) => Promise<void>;
-    applyDiffToProject(diff: string, projectPath: string): Promise<void>;
 }
 export declare const ENV: ProjectEnvironment;
 export interface OrchestratorHarness {
     installCalls: Array<{
         worktreePath: string;
     }>;
-    materializeCalls: Array<{
-        source: string;
-        destination: string;
-    }>;
     installResult: Promise<void>;
-    materializeResult: Promise<void>;
     destinationExists: boolean;
     telemetryEvents: Array<{
         event: string;

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

@@ -96,14 +96,6 @@ class FakeWorktreeManager {
         });
         return worktreePath;
     }
-    applyDiffToProjectImpl = async () => undefined;
-    async applyDiffToProject(diff, projectPath) {
-        this.calls.push({
-            method: 'applyDiffToProject',
-            args: [diff, projectPath],
-        });
-        return this.applyDiffToProjectImpl(diff, projectPath);
-    }
 }
 exports.FakeWorktreeManager = FakeWorktreeManager;
 exports.ENV = {
@@ -124,14 +116,13 @@ function buildOrchestrator(opts = {}) {
     const worktreeManager = new FakeWorktreeManager();
     const harness = {
         installCalls: [],
-        materializeCalls: [],
         installResult: Promise.resolve(),
-        materializeResult: Promise.resolve(),
         destinationExists: opts.destinationExists ?? false,
         telemetryEvents: [],
         switchPreviewPortCalls: [],
     };
     const orchestrator = new WorktreeOrchestrator_1.AgentVariantsOrchestrator({
+        getProjectPath: () => (opts.env ?? exports.ENV).projectPath,
         store,
         worktreeManager,
         resolveProjectEnvironment: opts.resolveProjectEnvironment ?? (async () => opts.env ?? exports.ENV),
@@ -142,26 +133,10 @@ function buildOrchestrator(opts = {}) {
             harness.installCalls.push({ worktreePath });
             return harness.installResult;
         },
-        materializeProject: async (source, destination) => {
-            harness.materializeCalls.push({ source, destination });
-            return harness.materializeResult;
-        },
         previewQaRunner: opts.previewQaRunner ?? exports.passingQaRunner,
         switchPreviewPort: (port) => {
             harness.switchPreviewPortCalls.push(port);
         },
-        startStaticPreviewServer: async () => {
-            const stub = {
-                killed: false,
-                exitCode: 0,
-                pid: undefined,
-                kill: () => true,
-                on: () => stub,
-                once: () => stub,
-                off: () => stub,
-            };
-            return stub;
-        },
         telemetry: {
             track: (event, properties) => harness.telemetryEvents.push({ event, properties }),
             trackAgentVariantsSourceContextQuality: (properties) => harness.telemetryEvents.push({
@@ -220,14 +195,6 @@ function buildOrchestrator(opts = {}) {
                 event: 'agent_variants.round_completed',
                 properties,
             }),
-            trackAgentVariantsCommitFailed: (properties) => harness.telemetryEvents.push({
-                event: 'agent_variants.commit_failed',
-                properties,
-            }),
-            trackAgentVariantsNewProjectMaterialized: (properties) => harness.telemetryEvents.push({
-                event: 'agent_variants.new_project_materialized',
-                properties,
-            }),
         },
     });
     builtOrchestrators.push(orchestrator);

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

@@ -7996,10 +7996,6 @@ export interface ActiveVariantActions {
         enabled: boolean;
         reason?: string;
     };
-    commit?: {
-        enabled: boolean;
-        reason?: string;
-    };
 }
 export interface SavedVariantPreview {
     source: {
@@ -8137,26 +8133,6 @@ export interface HostVariantPlanningWorkItemSnapshot extends HostVariantWorkItem
     outputSchema: unknown;
 }
 export type HostVariantWorkItemSnapshot = HostVariantImplementationWorkItemSnapshot | HostVariantPlanningWorkItemSnapshot;
-export declare const VARIANT_ARTIFACT_KINDS: readonly ["design_context", "source_context", "qa_report", "asset"];
-export type VariantArtifactKind = (typeof VARIANT_ARTIFACT_KINDS)[number];
-export type VariantArtifactStatus = 'ready' | 'warning' | 'failed';
-export type VariantArtifactSource = 'agent_browser' | 'cache' | 'static' | 'manual';
-export type VariantArtifactContentType = 'text/markdown' | 'application/json' | 'text/plain';
-export interface VariantSessionArtifact {
-    id: string;
-    kind: VariantArtifactKind;
-    label: string;
-    summary?: string;
-    usedByVariantCount?: number;
-    status?: VariantArtifactStatus;
-    source?: VariantArtifactSource;
-    contentType?: VariantArtifactContentType;
-    content?: string;
-    rawUrl?: string;
-    viewUrl?: string;
-    path?: string;
-    warnings?: string[];
-}
 export type VariantQaStatus = 'passed' | 'failed' | 'not_run';
 export type VariantQaIssueKind = 'asset_load_failed' | 'console_error' | 'preview_unavailable' | 'output_integrity' | 'verification_unavailable';
 export interface VariantQaIssue {
@@ -10649,32 +10625,6 @@ export type ReportVariantBriefsInput = {
     briefs: Brief[];
     bindings?: VariantContextBinding[];
 };
-export declare const commitVariantInput: {
-    sessionId: z.ZodString;
-    variantId: z.ZodString;
-    confirmedByUser: z.ZodOptional<z.ZodBoolean>;
-    bypassRequestedByUser: z.ZodOptional<z.ZodBoolean>;
-    bypassReason: z.ZodOptional<z.ZodString>;
-};
-export type CommitVariantInput = {
-    sessionId: string;
-    variantId: string;
-    confirmedByUser?: boolean;
-    bypassRequestedByUser?: boolean;
-    bypassReason?: string;
-};
-export type CommitVariantOutput = {
-    stage: Stage;
-    enqueued: boolean;
-    duplicate: boolean;
-    changedFilesCount: number;
-    payloadKind?: 'diff' | 'diff-applied' | 'project-created';
-    destinationPath?: string;
-} | {
-    stage: 'failed';
-    errorCode: ErrorCode;
-    message: string;
-};
 export declare const continueVariantsAction: z.ZodOptional<z.ZodEnum<["check", "wait", "request_work", "refine_variant"]>>;
 export declare const continueVariantsInput: {
     sessionId: z.ZodString;
@@ -11153,35 +11103,5 @@ export type GetVariantOutput = {
     errorCode: ErrorCode;
     message: string;
 };
-export type VariantPickPayload = {
-    kind: 'diff';
-    diff: string;
-    target?: Target;
-    changedFilesCount: number;
-} | {
-    kind: 'diff-applied';
-    diff: string;
-    target?: Target;
-    changedFilesCount: number;
-    note: string;
-} | {
-    kind: 'new-project';
-    destinationPath: string;
-    sourceWorktreePath: string;
-    changedFilesCount: number;
-} | {
-    kind: 'project-created';
-    destinationPath: string;
-    changedFilesCount: number;
-    note: string;
-};
-export interface VariantPickEnvelope {
-    sourceSessionId: string;
-    variantId: string;
-    variantLabel: string;
-    destinationPath: string;
-    changedFilesCount: number;
-    payload: VariantPickPayload;
-}
 export { ERROR_CODES, type ErrorCode };
 //# sourceMappingURL=contracts.d.ts.map

package/dist/agent-variants/contracts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ERROR_CODES = exports.getVariantInput = exports.captureDesignEvidenceInput = exports.listPastVariantsInput = exports.variantHistoryStatusSchema = exports.startVariantsBriefContent = exports.cancelVariantsInput = exports.reportWorkItemInput = exports.reportVariantCompleteStatus = exports.continueVariantsInput = exports.continueVariantsAction = exports.commitVariantInput = exports.reportVariantBriefsInput = exports.proposeVariantsInput = exports.runLabelSchema = exports.DEFAULT_VARIANT_COUNT = exports.VARIANT_COUNT_MAX = exports.VARIANT_COUNT_MIN = exports.variantWorkItemContextSchema = exports.briefSchema = exports.targetSchema = exports.VARIANT_ARTIFACT_KINDS = exports.isWorkerFidelity = exports.VARIANT_EXECUTION_MODES = exports.projectContextInputSchema = exports.projectContextSchema = exports.projectContextFresh = exports.projectContextExisting = exports.variantContextBundleSchema = exports.executionCapabilityPlanSchema = exports.assetPlanEntrySchema = exports.executionConfidenceSchema = exports.executionModeSchema = exports.variantContextBindingSchema = exports.rivetMetadataSchema = exports.rivetContextActionSchema = exports.rivetContextActionKindSchema = exports.storedUserContextSourceRecordSchema = exports.stagedContextAssetSchema = exports.contextAssetInputSchema = exports.rawUserContextSourceSchema = exports.rawUserContextInputSchema = exports.sourceRoleSchema = exports.designContextEntrySchema = exports.CONTEXT_ASSET_MAX_ITEMS = exports.WORK_ITEM_STATUSES = exports.WORK_ITEM_KINDS = exports.TERMINAL_STAGES = exports.STAGES = void 0;
+exports.ERROR_CODES = exports.getVariantInput = exports.captureDesignEvidenceInput = exports.listPastVariantsInput = exports.variantHistoryStatusSchema = exports.startVariantsBriefContent = exports.cancelVariantsInput = exports.reportWorkItemInput = exports.reportVariantCompleteStatus = exports.continueVariantsInput = exports.continueVariantsAction = exports.reportVariantBriefsInput = exports.proposeVariantsInput = exports.runLabelSchema = exports.DEFAULT_VARIANT_COUNT = exports.VARIANT_COUNT_MAX = exports.VARIANT_COUNT_MIN = exports.variantWorkItemContextSchema = exports.briefSchema = exports.targetSchema = exports.isWorkerFidelity = exports.VARIANT_EXECUTION_MODES = exports.projectContextInputSchema = exports.projectContextSchema = exports.projectContextFresh = exports.projectContextExisting = exports.variantContextBundleSchema = exports.executionCapabilityPlanSchema = exports.assetPlanEntrySchema = exports.executionConfidenceSchema = exports.executionModeSchema = exports.variantContextBindingSchema = exports.rivetMetadataSchema = exports.rivetContextActionSchema = exports.rivetContextActionKindSchema = exports.storedUserContextSourceRecordSchema = exports.stagedContextAssetSchema = exports.contextAssetInputSchema = exports.rawUserContextSourceSchema = exports.rawUserContextInputSchema = exports.sourceRoleSchema = exports.designContextEntrySchema = exports.CONTEXT_ASSET_MAX_ITEMS = exports.WORK_ITEM_STATUSES = exports.WORK_ITEM_KINDS = exports.TERMINAL_STAGES = exports.STAGES = void 0;
 const variant_reference_1 = require("../types/variant-reference");
 const v3_1 = require("zod/v3");
 const errors_1 = require("./errors");
@@ -355,12 +355,6 @@ exports.projectContextInputSchema = v3_1.z.discriminatedUnion('kind', [
 exports.VARIANT_EXECUTION_MODES = ['create', 'vary', 'refine'];
 const isWorkerFidelity = (value) => value === 'low' || value === 'medium' || value === 'high';
 exports.isWorkerFidelity = isWorkerFidelity;
-exports.VARIANT_ARTIFACT_KINDS = [
-    'design_context',
-    'source_context',
-    'qa_report',
-    'asset',
-];
 exports.targetSchema = v3_1.z.object({
     type: v3_1.z.enum(['element', 'file', 'route']),
     ref: v3_1.z.string().min(1),
@@ -452,13 +446,6 @@ exports.reportVariantBriefsInput = {
         .max(exports.VARIANT_COUNT_MAX)
         .optional(),
 };
-exports.commitVariantInput = {
-    sessionId: v3_1.z.string().min(1),
-    variantId: v3_1.z.string().min(1),
-    confirmedByUser: v3_1.z.boolean().optional(),
-    bypassRequestedByUser: v3_1.z.boolean().optional(),
-    bypassReason: v3_1.z.string().min(1).optional(),
-};
 exports.continueVariantsAction = v3_1.z
     .enum(['check', 'wait', 'request_work', 'refine_variant'])
     .optional();

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

@@ -0,0 +1,9 @@
+import type { ActiveProjectContext, ActiveVariantSnapshot, DesignContextEntry, ProjectContext } from './contracts';
+import type { VariantDesignSource } from '../services/VariantHistoryService';
+export declare const enrichDesignSource: (design: ActiveVariantSnapshot["design"]) => ActiveVariantSnapshot["design"];
+export declare const toActiveProjectContext: (projectContext: ProjectContext) => ActiveProjectContext;
+export declare const resolveDesignArtifact: (entry: DesignContextEntry | undefined) => {
+    markdown: string;
+    source: VariantDesignSource;
+} | null;
+//# sourceMappingURL=designContext.d.ts.map

package/dist/agent-variants/designContext.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDesignArtifact = exports.toActiveProjectContext = exports.enrichDesignSource = void 0;
+const designCatalog_1 = require("../services/templates/designCatalog");
+const enrichDesignSource = (design) => {
+    if (!design || design.kind !== 'slug')
+        return design;
+    return {
+        ...design,
+        displayName: (0, designCatalog_1.getDesignSystemBySlug)(design.slug)?.name ?? design.slug,
+    };
+};
+exports.enrichDesignSource = enrichDesignSource;
+const toActiveProjectContext = (projectContext) => {
+    const sourceCount = projectContext.variantContext?.userContext.filter((source) => source.transport !== 'prompt').length ?? 0;
+    const hasSourceContextSummary = Boolean(sourceCount > 0 ||
+        (projectContext.variantContext?.rivetMetadata.length ?? 0) > 0);
+    const activeSourceContext = hasSourceContextSummary
+        ? {
+            sourceCount,
+            isSourceGrounded: Boolean(sourceCount > 0 ||
+                projectContext.designContext?.length ||
+                projectContext.variantContext?.rivetMetadata.length),
+        }
+        : undefined;
+    if (projectContext.kind === 'existing') {
+        return {
+            kind: 'existing',
+            designContext: projectContext.designContext?.map((entry) => entry.kind === 'slug'
+                ? { kind: 'slug', slug: entry.slug }
+                : { kind: 'markdown', label: entry.label }),
+            ...(activeSourceContext ? { sourceContext: activeSourceContext } : {}),
+        };
+    }
+    return {
+        kind: 'fresh',
+        workspacePath: projectContext.workspacePath,
+        workspaceRoot: projectContext.workspaceRoot,
+        framework: projectContext.framework,
+        designContext: projectContext.designContext?.map((entry) => entry.kind === 'slug'
+            ? { kind: 'slug', slug: entry.slug }
+            : { kind: 'markdown', label: entry.label }),
+        ...(activeSourceContext ? { sourceContext: activeSourceContext } : {}),
+        ...(projectContext.executionPlan
+            ? {
+                executionPlan: {
+                    mode: projectContext.executionPlan.mode,
+                    confidence: projectContext.executionPlan.confidence,
+                    reason: projectContext.executionPlan.reason,
+                    assetCount: projectContext.executionPlan.assetPlan?.length ?? 0,
+                    runtimeRequirementCount: projectContext.executionPlan.runtimeRequirements?.length ?? 0,
+                },
+            }
+            : {}),
+    };
+};
+exports.toActiveProjectContext = toActiveProjectContext;
+const resolveDesignArtifact = (entry) => {
+    if (!entry)
+        return null;
+    if (entry.kind === 'markdown') {
+        return {
+            markdown: entry.content,
+            source: { kind: 'markdown', label: entry.label },
+        };
+    }
+    const markdown = (0, designCatalog_1.loadDesignSystemMarkdown)(entry.slug);
+    if (!markdown)
+        return null;
+    const catalogEntry = (0, designCatalog_1.getDesignSystemBySlug)(entry.slug);
+    return {
+        markdown,
+        source: {
+            kind: 'slug',
+            slug: entry.slug,
+            label: catalogEntry?.name ?? entry.slug,
+        },
+    };
+};
+exports.resolveDesignArtifact = resolveDesignArtifact;
+//# sourceMappingURL=designContext.js.map

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

@@ -5,5 +5,5 @@ export type { ActiveSnapshot, DroppedRefinement, OrchestratorDeps, PreviewQaRunn
 export { slugifyPrompt } from './generatedDestination';
 export { AgentVariantsError, ERROR_CODES, type ErrorCode } from './errors';
 export { DEFAULT_VARIANT_COUNT, VARIANT_COUNT_MIN, VARIANT_COUNT_MAX, } from './contracts';
-export type { Brief, CancelVariantsInput, CancelVariantsOutput, ContinueVariantsInput, ContinueVariantsOutput, LeaseRecord, LeasedWorkItemDescriptor, ProjectContext, ProposeVariantsInput, ProposeVariantsOutput, RawUserContextInput, RawUserContextSource, ReportVariantBriefsInput, ReportVariantBriefsOutput, RivetContextAction, RivetMetadata, ReportVariantCompleteInput, ReportVariantCompleteOutput, Stage, Target, TerminalSummary, VariantContextBinding, VariantContextBundle, VariantPickEnvelope, VariantPickPayload, VariantWorkItemContext, VisualEditorAttachment, WorkItem, WorkItemKind, WorkItemStatus, } from './contracts';
+export type { Brief, CancelVariantsInput, CancelVariantsOutput, ContinueVariantsInput, ContinueVariantsOutput, LeaseRecord, LeasedWorkItemDescriptor, ProjectContext, ProposeVariantsInput, ProposeVariantsOutput, RawUserContextInput, RawUserContextSource, ReportVariantBriefsInput, ReportVariantBriefsOutput, RivetContextAction, RivetMetadata, ReportVariantCompleteInput, ReportVariantCompleteOutput, Stage, Target, TerminalSummary, VariantContextBinding, VariantContextBundle, VariantWorkItemContext, VisualEditorAttachment, WorkItem, WorkItemKind, WorkItemStatus, } from './contracts';
 //# sourceMappingURL=index.d.ts.map

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

@@ -10,12 +10,10 @@ export type VariantRunPlan = {
 };
 export type RunTopology = 'code_gen' | 'static_preview';
 export type RunProvision = 'git_worktree' | 'template_worktree' | 'none';
-export type RunCommit = 'apply_diff' | 'write_static_site' | 'materialize_project';
 export type RunPreview = 'static_artifact' | 'dev_server';
 export interface RunPlanPolicy {
     topology: RunTopology;
     provision: RunProvision;
-    commit: RunCommit;
     needsScaffoldBase: boolean;
     preview?: RunPreview;
 }

package/dist/agent-variants/runPlan.js

@@ -15,7 +15,6 @@ function runPlanPolicy(plan) {
         return {
             topology: 'code_gen',
             provision: 'git_worktree',
-            commit: 'apply_diff',
             needsScaffoldBase: false,
         };
     }
@@ -23,7 +22,6 @@ function runPlanPolicy(plan) {
         return {
             topology: 'static_preview',
             provision: 'none',
-            commit: 'write_static_site',
             needsScaffoldBase: false,
             preview: 'static_artifact',
         };
@@ -31,7 +29,6 @@ function runPlanPolicy(plan) {
     return {
         topology: 'code_gen',
         provision: 'template_worktree',
-        commit: 'materialize_project',
         needsScaffoldBase: true,
         preview: 'dev_server',
     };

package/dist/agent-variants/variant-project-runtime.d.ts

@@ -7,7 +7,6 @@ export interface WorktreeManagerLike {
     forkWorktreesFrom?(sourceWorktreePath: string, sessionId: string, count: number, instanceKeyPrefix?: string): Promise<string[]>;
     getDiff(worktreePath: string): Promise<string>;
     getGitRoot?(): Promise<string>;
-    applyDiffToProject?(diff: string, projectPath: string): Promise<void>;
     cleanupSession(sessionId: string, freshDestinationParent?: string): Promise<void>;
     getFreePort(): Promise<number>;
     findFreePortFrom(startPort: number): Promise<number>;
@@ -16,7 +15,6 @@ export interface WorktreeManagerLike {
     stopDevServer(proc: ChildProcess, timeoutMs?: number): Promise<void>;
     getProjectCwdInWorktree(worktreePath: string): Promise<string>;
     createFreshWorktrees?(sessionId: string, count: number, template: TemplateBundle, designContext: ReadonlyArray<DesignContextEntry | undefined> | undefined, destinationParent: string): Promise<string[]>;
-    moveWorktreeToHistory?(srcWorktreePath: string, historyDir: string, folderName: string): string;
 }
 type DevServerProjectEnvironment = {
     projectPath: string;

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

@@ -36,8 +36,5 @@ export declare const buildServeRecipeFromResolved: (snapshotRoot: string, dev: {
 }, port: number) => DevServerRecipe;
 export declare const canInstallWithoutTouchingHost: (cwd: string) => boolean;
 export declare const assertDevScriptExists: (cwd: string, scriptName: string) => void;
-export declare function areSameVolume(a: string, b: string): boolean;
-export declare function resolveNodeModulesSymlink(worktreePath: string): Promise<boolean>;
-export declare const defaultMaterializeProject: (sourceWorktreePath: string, destinationPath: string) => Promise<void>;
 export declare function synthesizeUnifiedBriefBody(prompt: string, index: number, total: number): string;
 //# sourceMappingURL=variantWorkspaceFiles.d.ts.map

package/dist/agent-variants/variantWorkspaceFiles.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultMaterializeProject = exports.assertDevScriptExists = exports.canInstallWithoutTouchingHost = exports.buildServeRecipeFromResolved = exports.defaultInstallDependencies = exports.STATIC_PREVIEW_HISTORY_FILE_EXTENSIONS = exports.STATIC_PREVIEW_HISTORY_EXCLUDE = exports.MATERIALIZE_EXCLUDE = exports.ALLOWED_INERT_ASSET_EXTENSIONS = void 0;
+exports.assertDevScriptExists = exports.canInstallWithoutTouchingHost = exports.buildServeRecipeFromResolved = exports.defaultInstallDependencies = exports.STATIC_PREVIEW_HISTORY_FILE_EXTENSIONS = exports.STATIC_PREVIEW_HISTORY_EXCLUDE = exports.MATERIALIZE_EXCLUDE = exports.ALLOWED_INERT_ASSET_EXTENSIONS = void 0;
 exports.estimateOutputBytes = estimateOutputBytes;
 exports.normalizeOutput = normalizeOutput;
 exports.resolveAssetWithinBase = resolveAssetWithinBase;
@@ -13,16 +13,12 @@ exports.buildStaticPreviewDocument = buildStaticPreviewDocument;
 exports.countDiffFiles = countDiffFiles;
 exports.countWorktreeFiles = countWorktreeFiles;
 exports.copyStaticPreviewDirectory = copyStaticPreviewDirectory;
-exports.areSameVolume = areSameVolume;
-exports.resolveNodeModulesSymlink = resolveNodeModulesSymlink;
 exports.synthesizeUnifiedBriefBody = synthesizeUnifiedBriefBody;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const simple_git_1 = require("simple-git");
 const DependencyPreparationService_1 = require("../services/DependencyPreparationService");
 const devServerError_1 = require("../utils/devServerError");
 const logger_1 = require("../utils/logger");
-const errnoCode_1 = require("../utils/errnoCode");
 const pathContainment_1 = require("../utils/pathContainment");
 const log = (0, logger_1.createLogger)('VariantWorkspaceFiles');
 const FALLBACK_DIRECTION_FOCI = [
@@ -357,60 +353,6 @@ const assertDevScriptExists = (cwd, scriptName) => {
     });
 };
 exports.assertDevScriptExists = assertDevScriptExists;
-function areSameVolume(a, b) {
-    try {
-        const statA = fs_1.default.statSync(a);
-        const parentB = fs_1.default.existsSync(b) ? b : path_1.default.dirname(b);
-        const statB = fs_1.default.statSync(parentB);
-        return statA.dev === statB.dev;
-    }
-    catch {
-        return false;
-    }
-}
-async function resolveNodeModulesSymlink(worktreePath) {
-    const nodeModulesPath = path_1.default.join(worktreePath, 'node_modules');
-    try {
-        if (!(await fs_1.default.promises.lstat(nodeModulesPath)).isSymbolicLink())
-            return false;
-        await fs_1.default.promises.rm(nodeModulesPath, { force: true });
-        return true;
-    }
-    catch (error) {
-        if ((0, errnoCode_1.errnoCode)(error) === 'ENOENT')
-            return true;
-        throw error;
-    }
-}
-const defaultMaterializeProject = async (sourceWorktreePath, destinationPath) => {
-    await fs_1.default.promises.mkdir(destinationPath, { recursive: true });
-    await fs_1.default.promises.cp(sourceWorktreePath, destinationPath, {
-        recursive: true,
-        filter: (sourcePath) => {
-            const rel = path_1.default.relative(sourceWorktreePath, sourcePath);
-            if (!rel)
-                return true;
-            const top = rel.split(path_1.default.sep)[0];
-            return !exports.MATERIALIZE_EXCLUDE.has(top);
-        },
-    });
-    const git = (0, simple_git_1.simpleGit)(destinationPath);
-    await git.raw(['init']);
-    await git.raw(['add', '-A']);
-    await git
-        .raw([
-        '-c',
-        'user.name=Rivet',
-        '-c',
-        'user.email=hello@tryrivet.design',
-        'commit',
-        '--no-gpg-sign',
-        '-m',
-        'Initial commit (created with Rivet)',
-    ])
-        .catch(() => { });
-};
-exports.defaultMaterializeProject = defaultMaterializeProject;
 function synthesizeUnifiedBriefBody(prompt, index, total) {
     const trimmed = prompt.trim().replace(/\s+/g, ' ').slice(0, 200);
     const intent = trimmed.length > 0 ? trimmed : 'Create this variant';

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

@@ -14,7 +14,6 @@ export interface VariantsTelemetry {
     trackAgentVariantsRefinementFailed?: (data: MCPVariantsTelemetryMetadata) => void;
     trackAgentVariantsRoundStarted?: (data: MCPVariantsTelemetryMetadata) => void;
     trackAgentVariantsRoundCompleted?: (data: MCPVariantsTelemetryMetadata) => void;
-    trackAgentVariantsCommitFailed?: (data: MCPVariantsTelemetryMetadata) => void;
     trackAgentVariantsScaffoldStarted?: (data: {
         sessionId: string;
         variantCount: number;
@@ -79,13 +78,6 @@ export interface VariantsTelemetry {
         signal?: string | null;
         missingDeps?: boolean;
     }) => void;
-    trackAgentVariantsNewProjectMaterialized?: (data: {
-        sessionId: string;
-        variantId: string;
-        destinationPath: string;
-        changedFilesCount: number;
-        durationMs: number;
-    }) => void;
     trackAgentVariantsSourceContextQuality?: (data: {
         sessionId: string;
         sourceUrlCount: number;

package/dist/cli/browser.d.ts

@@ -9,8 +9,10 @@ export type BrowserOpenResult = {
     action: 'launch_failed';
     reason: 'launcher_error';
 };
-export declare const requestBrowserOpen: ({ editorUrl, isBrowserDisabled, io, launch, }: {
-    editorUrl: string;
+export type BrowserUrlField = 'editorUrl' | 'authUrl';
+export declare const requestBrowserOpen: ({ url, urlField, isBrowserDisabled, io, launch, }: {
+    url: string;
+    urlField: BrowserUrlField;
     isBrowserDisabled: boolean;
     io: CliIO;
     launch?: (url: string) => Promise<unknown>;

package/dist/cli/browser.js

@@ -34,21 +34,21 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestBrowserOpen = void 0;
-const requestBrowserOpen = async ({ editorUrl, isBrowserDisabled, io, launch, }) => {
-    const publicUrl = new URL(editorUrl);
+const requestBrowserOpen = async ({ url, urlField, isBrowserDisabled, io, launch, }) => {
+    const publicUrl = new URL(url);
     publicUrl.hash = '';
     if (isBrowserDisabled) {
-        io.writeProgress(`Browser launch skipped (--no-browser). Open the editorUrl from the command result to authorize ${publicUrl}.`);
+        io.writeProgress(`Browser launch skipped (--no-browser). Open the ${urlField} from the command result to authorize ${publicUrl}.`);
         return { action: 'skipped', reason: 'no_browser_flag' };
     }
     try {
         const open = launch ?? (await Promise.resolve().then(() => __importStar(require('open')))).default;
-        await open(editorUrl);
+        await open(url);
         io.writeProgress(`Requested browser launch for ${publicUrl}`);
         return { action: 'launch_requested', reason: 'interactive_open' };
     }
     catch {
-        io.writeProgress(`Browser launch failed. Open the editorUrl from the command result to authorize ${publicUrl}.`);
+        io.writeProgress(`Browser launch failed. Open the ${urlField} from the command result to authorize ${publicUrl}.`);
         return { action: 'launch_failed', reason: 'launcher_error' };
     }
 };

package/dist/cli/browserSignIn.d.ts

@@ -0,0 +1,15 @@
+import { AuthService } from '../services/AuthService';
+import { type CliCommandResult } from './envelope';
+import type { CliIO } from './io';
+type BrowserSignInOptions = {
+    command: string;
+    io: CliIO;
+    isBrowserDisabled: boolean;
+    env: NodeJS.ProcessEnv;
+    editor?: string;
+    authService?: AuthService;
+    launch?: (url: string) => Promise<unknown>;
+};
+export declare const signInThroughBrowser: ({ command, io, isBrowserDisabled, env, editor, authService, launch, }: BrowserSignInOptions) => Promise<CliCommandResult | null>;
+export {};
+//# sourceMappingURL=browserSignIn.d.ts.map

package/dist/cli/browserSignIn.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signInThroughBrowser = void 0;
+const AuthService_1 = require("../services/AuthService");
+const browser_1 = require("./browser");
+const envelope_1 = require("./envelope");
+const SIGN_IN_WAIT_ENV = 'RIVET_SIGN_IN_WAIT_MS';
+const DEFAULT_SIGN_IN_WAIT_MS = 45_000;
+const SIGN_IN_POLL_INTERVAL_MS = 2_000;
+const signInWaitMs = (env) => {
+    const parsed = Number.parseInt(env[SIGN_IN_WAIT_ENV] ?? '', 10);
+    return Number.isFinite(parsed) && parsed >= 0
+        ? parsed
+        : DEFAULT_SIGN_IN_WAIT_MS;
+};
+const signInRequired = ({ command, io, authUrl, browser, }) => {
+    const message = browser?.action === 'launch_requested'
+        ? `Rivet sign-in is open in the browser. Finish signing in there, then run \`rivet open\` again. If the browser did not open, use this link: ${authUrl}`
+        : `Sign in to Rivet in the browser with this link, then run \`rivet open\` again: ${authUrl}`;
+    io.writeProgress(message);
+    return (0, envelope_1.errorResult)(command, 'AUTH_REQUIRED', message, browser ? { browser } : undefined, (0, envelope_1.loginRecovery)(authUrl));
+};
+const signInThroughBrowser = async ({ command, io, isBrowserDisabled, env, editor, authService = new AuthService_1.AuthService(), launch, }) => {
+    const waitAttempts = isBrowserDisabled
+        ? 0
+        : Math.floor(signInWaitMs(env) / SIGN_IN_POLL_INTERVAL_MS);
+    const isSignedIn = async (attempts) => (await authService.resumePendingLogin(attempts))?.success === true;
+    if (await isSignedIn(waitAttempts + 1))
+        return null;
+    const pending = authService.peekPendingLogin();
+    if (pending?.authUrl) {
+        return signInRequired({ command, io, authUrl: pending.authUrl });
+    }
+    const begun = await authService.beginGoogleLogin({
+        source: 'cli',
+        editor,
+        noBrowser: true,
+    });
+    if (!begun.started) {
+        return (0, envelope_1.errorResult)(command, 'AUTH_REQUIRED', `Authentication required. Rivet could not start browser sign-in: ${begun.error} Have the user run \`rivet login\` to sign in.`);
+    }
+    const browser = await (0, browser_1.requestBrowserOpen)({
+        url: begun.authUrl,
+        urlField: 'authUrl',
+        isBrowserDisabled,
+        io,
+        launch,
+    });
+    if (browser.action === 'launch_requested' && (await isSignedIn(waitAttempts)))
+        return null;
+    return signInRequired({ command, io, authUrl: begun.authUrl, browser });
+};
+exports.signInThroughBrowser = signInThroughBrowser;
+//# sourceMappingURL=browserSignIn.js.map

package/dist/cli/client.js

@@ -109,7 +109,18 @@ const requestServer = async (attached, path, options = {}) => {
     if (options.expectedAccountId) {
         headers['X-Rivet-Account-Id'] = options.expectedAccountId;
     }
+    if ((0, editorAccess_1.isEditorApiPath)(path, options.method)) {
+        const token = (0, editorSession_1.readEditorAccessToken)({
+            pid: attached.handshake.pid,
+            port: attached.handshake.rivetPort,
+            projectPath: attached.handshake.projectPath,
+            startedAt: attached.handshake.startedAt,
+        });
+        if (token)
+            headers[editorAccess_1.EDITOR_ACCESS_TOKEN_HEADER] = token;
+    }
     const response = await fetch(`${attached.baseUrl}${path}`, {
+        redirect: 'error',
         method: options.method ?? 'GET',
         headers,
         ...(options.body === undefined

package/dist/cli/commands/evidence.js

@@ -60,7 +60,7 @@ const handleEvidenceCapture = async (args) => {
     }
     const { getConfigManager } = await Promise.resolve().then(() => __importStar(require('../../services/ConfigManager')));
     if (!getConfigManager().isAuthenticated()) {
-        return (0, envelope_1.errorResult)(COMMAND, 'AUTH_REQUIRED', 'Authentication required. Call the rivet_login MCP tool if this host has it; otherwise have the user run `rivet login` in a terminal.');
+        return (0, envelope_1.errorResult)(COMMAND, 'AUTH_REQUIRED', envelope_1.AUTH_REQUIRED_MESSAGE);
     }
     const { BrowserAgentClient } = await Promise.resolve().then(() => __importStar(require('../../services/BrowserAgentClient')));
     const client = new BrowserAgentClient();