rivet-design 0.11.2 → 0.11.4

package/dist/config/flags.d.ts

@@ -40,6 +40,9 @@ export declare const FLAG_DEFINITIONS: {
     readonly generativeControls: {
         readonly default: false;
     };
+    readonly refineMode: {
+        readonly default: false;
+    };
 };
 export type FlagKey = keyof typeof FLAG_DEFINITIONS;
 export type FeatureFlag = {

package/dist/config/flags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../src/config/flags.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAY4B,CAAC;AAI1D,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,gBAAgB,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AACjD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAExD,eAAO,MAAM,qBAAqB,EAAE,YAKnB,CAAC"}
+{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../src/config/flags.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgB4B,CAAC;AAI1D,MAAM,MAAM,OAAO,GAAG,MAAM,OAAO,gBAAgB,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC;AACjD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAExD,eAAO,MAAM,qBAAqB,EAAE,YAKnB,CAAC"}

package/dist/config/flags.js

@@ -27,6 +27,10 @@ exports.FLAG_DEFINITIONS = {
     // Generative Editor Interfaces (NL → generated controls). Off by default —
     // still in progress. See docs/generative-editor-interfaces.md.
     generativeControls: { default: false },
+    // Refine mode (the per-variant adaptive control page). Off by default while
+    // we decide its place in the new Select/Comment/Refine action bar. When off,
+    // the Refine action is hidden and `changeModeAtom` refuses the 'edit' mode.
+    refineMode: { default: false },
 };
 exports.DEFAULT_FEATURE_FLAGS = Object.fromEntries(Object.entries(exports.FLAG_DEFINITIONS).map(([key, def]) => [
     key,

package/dist/config/flags.js.map

@@ -1 +1 @@
-{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/config/flags.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;GAaG;AACU,QAAA,gBAAgB,GAAG;IAC9B,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAC1B,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAC5B,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACtC,UAAU,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAC9B,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;IACxB,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACjC,mBAAmB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACvC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACnC,2EAA2E;IAC3E,+DAA+D;IAC/D,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;CACiB,CAAC;AAQ7C,QAAA,qBAAqB,GAAiB,MAAM,CAAC,WAAW,CACnE,MAAM,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;IACnD,GAAG;IACH,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE;CAC3B,CAAC,CACa,CAAC"}
+{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/config/flags.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;GAaG;AACU,QAAA,gBAAgB,GAAG;IAC9B,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAC1B,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAC5B,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACtC,UAAU,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IAC9B,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;IACxB,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACjC,mBAAmB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACvC,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACnC,2EAA2E;IAC3E,+DAA+D;IAC/D,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;IACtC,4EAA4E;IAC5E,6EAA6E;IAC7E,4EAA4E;IAC5E,UAAU,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;CACyB,CAAC;AAQ7C,QAAA,qBAAqB,GAAiB,MAAM,CAAC,WAAW,CACnE,MAAM,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;IACnD,GAAG;IACH,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE;CAC3B,CAAC,CACa,CAAC"}

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

@@ -701,6 +701,11 @@ export declare class AgentVariantsOrchestrator {
      * one. Mirrors the existing-project persistCompletedExistingVariant flow.
      */
     private persistCompletedFreshVariant;
+    /**
+     * @effect Drains fresh-project history writes before commit moves or rewrites
+     * the generated project folder.
+     */
+    private persistCompletedFreshVariantsForCommit;
     /**
      * At commit time, flip persisted variant manifests to terminal statuses
      * ('committed' for the chosen, 'rejected' for the rest). Both existing- and
@@ -723,10 +728,8 @@ export declare class AgentVariantsOrchestrator {
     private markPersistedVariantRenamed;
     /**
      * Resolve the project path that owns `.rivet/variants/` for a session.
-     * Existing sessions: the user's project (via `resolveEnv`). Fresh sessions:
-     * the *workspace root*, which is the parent of `workspacePath` — variants
-     * accumulate there across sessions instead of being scattered under each
-     * subproject. Must match what `persistCompletedFreshVariant` writes to.
+     * Existing sessions use the user's project. Fresh sessions use the generated
+     * project folder. Must match what `persistCompletedFreshVariant` writes to.
      */
     private resolveHistoryProjectPath;
     private readManifest;

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

@@ -1 +1 @@
-{"version":3,"file":"WorktreeOrchestrator.d.ts","sourceRoot":"","sources":["../../../src/mcp/agent-variants/WorktreeOrchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorktreeOrchestrator.d.ts","sourceRoot":"","sources":["../../../src/mcp/agent-variants/WorktreeOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAalD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAU9C,OAAO,EACL,YAAY,EACZ,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EAErB,KAAK,EACL,kBAAkB,EAClB,cAAc,EACd,KAAK,EACL,MAAM,EACN,eAAe,EACf,qBAAqB,EAGrB,eAAe,EACf,sBAAsB,EACtB,cAAc,EACf,MAAM,aAAa,CAAC;AAGrB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAQrE,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAC1B,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EACL,qBAAqB,EAEtB,MAAM,sCAAsC,CAAC;AA4S9C;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrE,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C;;mFAE+E;IAC/E,kBAAkB,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE;;kFAE8E;IAC9E,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,sBAAsB,CAAC,EAAE,MAAM,GAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B;;oEAEgE;IAChE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD;;yEAEqE;IACrE,WAAW,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,cAAc,CACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC1B,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/D;;;;sDAIkD;IAClD,oBAAoB,CAAC,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,OAAO,sCAAsC,EAAE,cAAc,EACvE,aAAa,EAAE,aAAa,CAAC,kBAAkB,GAAG,SAAS,CAAC,GAAG,SAAS,EACxE,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrB;gFAC4E;IAC5E,qBAAqB,CAAC,CACpB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,CAAC;IACV;+EAC2E;IAC3E,yBAAyB,CAAC,CACxB,YAAY,EAAE,MAAM,EACpB,wBAAwB,EAAE,MAAM,GAC/B,IAAI,CAAC;CACT;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB;;8EAE0E;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;gEAG4D;IAC5D,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK;QAClC,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC7B,CAAC;CACH;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAU/B;;;;;;;;;;GAUG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,8EAA8E;IAC9E,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAErC;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,EAAE,oBAIgC,CAAC;AA2I3E,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,YAAY,CAAC;IACpB,eAAe,EAAE,mBAAmB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,yBAAyB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9E,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B;2EACuE;IACvE,mBAAmB,CAAC,EAAE,CACpB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,qBAAqB,KACnC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;+CAG2C;IAC3C,kBAAkB,CAAC,EAAE,CACnB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,MAAM,KACpB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,8EAA8E;IAC9E,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;qDAIiD;IACjD,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C;;;;;;oDAMgD;IAChD,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAClD;;;;;;8DAM0D;IAC1D,2BAA2B,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC5D;;;;mEAI+D;IAC/D,cAAc,CAAC,EAAE,qBAAqB,CAAC;IACvC;;;yCAGqC;IACrC,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE;QAChC,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B;;yEAEqE;IACrE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAiHD;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACjE,iCAAiC,CAAC,EAAE,CAAC,IAAI,EAAE;QACzC,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,KAAK,CAAC;YACpB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;YAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,aAAa,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC,GAAG,IAAI,CAAC;KACX,KAAK,IAAI,CAAC;IACX,mCAAmC,CAAC,EAAE,CAAC,IAAI,EAAE;QAC3C,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;KACtB,KAAK,IAAI,CAAC;IACX,gCAAgC,CAAC,EAAE,CAAC,IAAI,EAAE;QACxC,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAK,IAAI,CAAC;IACX,uCAAuC,CAAC,EAAE,CAAC,IAAI,EAAE;QAC/C,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,CAAC;IACX,sCAAsC,CAAC,EAAE,CAAC,IAAI,EAAE;QAC9C,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,sEAAsE;QACtE,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,iFAAiF;QACjF,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,KAAK,IAAI,CAAC;IACX,wCAAwC,CAAC,EAAE,CAAC,IAAI,EAAE;QAChD,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;QACxB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC;KACpB,KAAK,IAAI,CAAC;IACX,sCAAsC,CAAC,EAAE,CAAC,IAAI,EAAE;QAC9C,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,MAAM,CAAC;QACtB,uBAAuB,EAAE,OAAO,CAAC;QACjC,aAAa,EAAE,OAAO,CAAC;KACxB,KAAK,IAAI,CAAC;IACX,8BAA8B,CAAC,EAAE,CAAC,IAAI,EAAE;QACtC,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC;KACzB,KAAK,IAAI,CAAC;IACX,wCAAwC,CAAC,EAAE,CAAC,IAAI,EAAE;QAChD,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,KAAK,IAAI,CAAC;CACZ;AAID;;8EAE8E;AAC9E,MAAM,MAAM,cAAc,GACtB;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE,GACjB;IACE,MAAM,EAAE,IAAI,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,QAAQ,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC;;qDAEiD;IACjD,cAAc,EAAE,oBAAoB,CAAC;IACrC;sEACkE;IAClE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;wEAEoE;IACpE,SAAS,CAAC,EAAE,sBAAsB,EAAE,CAAC;CACtC,CAAC;AAkDN;;;;;;;;;;;GAWG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEM;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAGjB;IACnB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAGhB;IACnB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAmC;IACxE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAEpB;IACd,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAE9B;IACd,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAIjB;IAC5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAGzC;IACJ;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IACvE;iEAC6D;IAC7D,OAAO,CAAC,eAAe,CAAuB;IAC9C;8EAC0E;IAC1E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;gBAEjC,IAAI,EAAE,gBAAgB;IAsBlC,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,aAAa;IAsBzC,kEAAkE;IAClE,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAInC,sEAAsE;IACtE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,GAAG,MAAM,IAAI;IAO3E;yEACqE;IACrE,OAAO,CAAC,aAAa,CAAK;IAC1B;;;;8CAI0C;IAC1C,OAAO,CAAC,sBAAsB,CAAK;IACnC;;qFAEiF;IACjF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAElD;;;;;OAKG;IACH,gBAAgB,IAAI,MAAM,IAAI;IAY9B;+EAC2E;IAC3E,YAAY,IAAI,OAAO;IASvB;wDACoD;IACpD,mBAAmB,IAAI,cAAc;IAqCrC,OAAO,CAAC,UAAU;IAQlB,YAAY,CAAC,IAAI,EAAE;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,KAAK,EAAE,CAAC;QAChB,QAAQ,CAAC,EAAE,qBAAqB,EAAE,CAAC;KACpC,GAAG;QAAE,MAAM,EAAE,KAAK,EAAE,CAAA;KAAE;IAsBvB,gBAAgB,CAAC,IAAI,EAAE,OAAO,gBAAgB,EAAE,oBAAoB,GAAG;QACrE,aAAa,EAAE,OAAO,aAAa,EAAE,QAAQ,CAAC;KAC/C;IA2BD,WAAW,CAAC,IAAI,EAAE;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,iBAAiB;IAkCrB,6BAA6B,CAAC,IAAI,EAAE;QAClC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,KAAK,CAAC;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KAC5D,GAAG,IAAI;IA6CR,cAAc,CACZ,SAAS,EAAE,MAAM,GAChB,UAAU,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAI7C,aAAa,CAAC,IAAI,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,iBAAiB;IAyCrB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK;IAIlC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IAIhE,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE;IAIrC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAIhE,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe;IAI9C,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,qBAAqB,EAAE;IAsFvD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAItC;yDACqD;IACrD,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;IAIpD,wEAAwE;IACxE,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAK1E;;;OAGG;IACH,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI9D,wEAAwE;IACxE,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3E,oBAAoB,CAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS;IA+BrB,8DAA8D;IAC9D,wBAAwB,CACtB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS;IAQrB,iEAAiE;IACjE,0BAA0B,CACxB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS;IAQrB;;;;;;OAMG;IACH,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IAOtE;;;;;;;;OAQG;IACH,6BAA6B,CAC3B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS;IAsDrB,OAAO,CAAC,yBAAyB;IAWjC,OAAO,CAAC,qBAAqB;IAQvB,OAAO,CAAC,IAAI,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,sBAAsB,EAAE,CAAC;KACtC,GAAG,OAAO,CAAC,aAAa,CAAC;IA2B1B;;;;;;;;;;;;;;;;;OAiBG;IACG,YAAY,CAAC,IAAI,EAAE;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC;;0EAEkE;QAClE,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB;gEACwD;QACxD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;0DAGkD;QAClD,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB;;;wEAGgE;QAChE,MAAM,CAAC,EAAE,OAAO,aAAa,EAAE,yBAAyB,EAAE,CAAC;KAC5D,GAAG,OAAO,CAAC;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,KAAK,CAAC;YACd,SAAS,EAAE,MAAM,CAAC;YAClB,OAAO,EAAE,MAAM,CAAC;YAChB,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,SAAS,CAAC;SACnB,CAAC,CAAC;QACH,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;QACtC,gDAAgD;QAChD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;KACjF,CAAC;IAuHI,cAAc,CAAC,IAAI,EAAE;QACzB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,cAAc,CAAC;QACvB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA2L3B,MAAM,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAClE,KAAK,EAAE,WAAW,CAAC;QACnB,aAAa,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;KACnD,CAAC;IA2BF;;;;;;OAMG;IACG,aAAa,CAAC,IAAI,EAAE;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,cAAc,CAAC;QAC5B,YAAY,EAAE,KAAK,CAAC;QACpB,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IAwCF;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAC3E,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,cAAc,CAAC;QAC5B,YAAY,EAAE,KAAK,CAAC;QACpB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IAsCF;;;;;;OAMG;IACG,aAAa,CAAC,IAAI,EAAE;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,KAAK,CAAC;KACrB,CAAC;IAqCF;;;;;OAKG;IACG,aAAa,CAAC,IAAI,EAAE;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,GAAG,OAAO,CAAC;QACV,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,iBAAiB,CAAC;QAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;YAuBY,iBAAiB;IA8jBzB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D;;;;;;;;OAQG;IACH,OAAO,CAAC,0BAA0B;IA2BlC,mEAAmE;IACnE,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;YAM1D,kBAAkB;IA4FhC;;;;OAIG;YACW,0BAA0B;IA8BxC;;;;;;;;;;;;OAYG;YACW,uBAAuB;IAwIrC;;;;OAIG;YACW,oBAAoB;IA4ElC;;;;;;;;;;;OAWG;YACW,mBAAmB;YAgInB,yBAAyB;IAuIvC;wEACoE;YACtD,kBAAkB;IAwBhC;6EACyE;YAC3D,uBAAuB;IAqCrC,2EAA2E;IAC3E,OAAO,CAAC,0BAA0B;IAclC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,SAAS;IAQjB;;;;OAIG;YACW,yBAAyB;YAiCzB,qBAAqB;YAmHrB,qBAAqB;YA6LrB,6BAA6B;IA2G3C;;;;;;OAMG;YACW,+BAA+B;IA4D7C;;;;;;;;;;;;;;;OAeG;YACW,6BAA6B;IA6E3C;;;;;;;;;;;;OAYG;YACW,4BAA4B;IAgH1C;;;OAGG;YACW,sCAAsC;IAuBpD;;;;;;;OAOG;YACW,6BAA6B;IAkC3C;;;;;;OAMG;YACW,8BAA8B;YAiB9B,6BAA6B;YAe7B,2BAA2B;YAkB3B,2BAA2B;IAmBzC;;;;OAIG;YACW,yBAAyB;IAmBvC,OAAO,CAAC,YAAY;IAYpB;;;;;;OAMG;YACW,yBAAyB;IAavC;;;;OAIG;YACW,gBAAgB;IA0D9B;;;;;OAKG;YACW,iCAAiC;IAc/C;;;;;;OAMG;YACW,yBAAyB;IAwBvC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,wBAAwB;IAuKhC;;;;;;;;;;;OAWG;YACW,6BAA6B;IA0F3C;;;;;;;OAOG;YACW,2BAA2B;IAuBzC;;;;;;;;;;;OAWG;YACW,uBAAuB;IAwErC;;;;;;OAMG;YACW,gCAAgC;YA8BhC,eAAe;IAsG7B,OAAO,CAAC,eAAe;CAoBxB;AAmJD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GAAG,MAAM,CAsCT;AA40BD,KAAK,qBAAqB,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAyKrD,YAAY,EAAE,kBAAkB,EAAE,CAAC"}

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

@@ -1430,7 +1430,7 @@ class AgentVariantsOrchestrator {
             const projectContext = this.store.getProjectContext(args.sessionId);
             let historyProjectPath;
             if (projectContext.kind === 'fresh') {
-                historyProjectPath = projectContext.workspaceRoot;
+                historyProjectPath = projectContext.workspacePath;
             }
             else {
                 try {
@@ -1482,6 +1482,9 @@ class AgentVariantsOrchestrator {
         }
         const input = this.store.getWorkItemInput(args.sessionId, args.variantId);
         const projectContext = this.store.getProjectContext(args.sessionId);
+        if (projectContext.kind === 'fresh') {
+            await this.persistCompletedFreshVariantsForCommit(args.sessionId);
+        }
         let payload;
         let envelopeDestination;
         let changedFilesCount;
@@ -1665,7 +1668,7 @@ class AgentVariantsOrchestrator {
             else {
                 // Static_preview: HTML is the entire deliverable. Write index.html.
                 // Prefer the in-memory record; fall back to the persisted history at
-                // `<workspaceRoot>/.rivet/variants/<sessionId>/<variantId>/files/index.html`
+                // `<workspacePath>/.rivet/variants/<sessionId>/<variantId>/files/index.html`
                 // so a process restart between report_variant_complete and commit
                 // doesn't strand the variant.
                 const staticPreview = resources.staticPreviews.get(args.variantId);
@@ -1679,7 +1682,7 @@ class AgentVariantsOrchestrator {
                     ? this.getStaticPreviewHtml(args.sessionId, args.variantId)
                     : undefined;
                 const htmlFromSnapshot = await this.variantHistory.readStaticPreview({
-                    projectPath: projectContext.workspaceRoot,
+                    projectPath: projectContext.workspacePath,
                     sessionId: args.sessionId,
                     variantId: args.variantId,
                 });
@@ -1838,25 +1841,25 @@ class AgentVariantsOrchestrator {
             envelope,
         });
         // History: flip every persisted variant in this session to its terminal
-        // status. Variants were persisted at code_gen success time; this only
-        // patches the status (+ destinationPath on the chosen one). For fresh
-        // sessions, history lives at `<workspaceRoot>/.rivet/variants/` — the
-        // user's working dir — so all variants from any session in the workspace
-        // accumulate in one place, not per-subproject. Best-effort, never blocks
-        // the commit.
+        // status. Variants are persisted at code_gen success time; this patches
+        // the status and destinationPath for the chosen one. Best-effort, never
+        // blocks the commit.
         const historyProjectPath = projectContext.kind === 'fresh'
-            ? projectContext.workspaceRoot
+            ? projectContext.workspacePath
             : envelopeDestination;
-        void this.persistVariantHistoryAtCommit({
-            sessionId: args.sessionId,
-            chosenVariantId: args.variantId,
-            projectPath: historyProjectPath,
-            projectKind: projectContext.kind,
-            destinationPath: envelopeDestination,
-            runnablePaths,
-        }).catch((err) => {
+        try {
+            await this.persistVariantHistoryAtCommit({
+                sessionId: args.sessionId,
+                chosenVariantId: args.variantId,
+                projectPath: historyProjectPath,
+                projectKind: projectContext.kind,
+                destinationPath: envelopeDestination,
+                runnablePaths,
+            });
+        }
+        catch (err) {
             log.warn(`persistVariantHistoryAtCommit failed for session ${args.sessionId}`, err);
-        });
+        }
         const enqueueResult = this.adapter.enqueue(envelope);
         resources.committedVariantIds.add(args.variantId);
         // For fresh `new-project` commits the committed variant IS the user's
@@ -2711,12 +2714,8 @@ class AgentVariantsOrchestrator {
                     };
                     resources.staticPreviews.set(workItemId, record);
                     if (this.store.getProjectContext(sessionId).kind === 'fresh') {
-                        // History at `<workspaceRoot>/.rivet/variants/<sessionId>/<variantId>/`
-                        // is the sole on-disk record. The legacy per-subproject snapshot
-                        // tree (`<slug>/.rivet/<variantName>/`) is no longer written —
-                        // it duplicated this data in a parallel layout and cluttered
-                        // `.rivet/` with slug-named directories before the user ever
-                        // committed.
+                        // History at `<workspacePath>/.rivet/variants/<sessionId>/<variantId>/`
+                        // is the on-disk record for this generated project.
                         this.persistCompletedFreshVariant({
                             sessionId,
                             workItemId,
@@ -3021,11 +3020,9 @@ class AgentVariantsOrchestrator {
         const projectContext = this.store.getProjectContext(args.sessionId);
         if (projectContext.kind !== 'fresh')
             return;
-        // Variant history lives at the workspace root — the user's working
-        // dir (e.g. `fable-eng-demo/`). All variants from any session in this
-        // workspace accumulate at
-        // `<workspaceRoot>/.rivet/variants/<sessionId>/<variantId>/`.
-        const historyProjectPath = projectContext.workspaceRoot;
+        // Variant history lives in the generated project folder so reopening that
+        // folder gives the history panel the same owner path that wrote it.
+        const historyProjectPath = projectContext.workspacePath;
         const input = this.store.getWorkItemInput(args.sessionId, args.workItemId);
         const sessionPrompt = this.store.getPrompt(args.sessionId);
         const designArtifact = resolveDesignArtifact(input.designContextEntry);
@@ -3105,6 +3102,29 @@ class AgentVariantsOrchestrator {
             }
         }
     }
+    /**
+     * @effect Drains fresh-project history writes before commit moves or rewrites
+     * the generated project folder.
+     */
+    async persistCompletedFreshVariantsForCommit(sessionId) {
+        const projectContext = this.store.getProjectContext(sessionId);
+        if (projectContext.kind !== 'fresh')
+            return;
+        const variants = this.store
+            .getVariants(sessionId)
+            .filter((variant) => variant.status === 'succeeded');
+        for (const variant of variants) {
+            try {
+                await this.persistCompletedFreshVariant({
+                    sessionId,
+                    workItemId: variant.workItemId,
+                });
+            }
+            catch (err) {
+                log.warn(`persistCompletedFreshVariantsForCommit failed for ${sessionId}/${variant.workItemId}`, err);
+            }
+        }
+    }
     /**
      * At commit time, flip persisted variant manifests to terminal statuses
      * ('committed' for the chosen, 'rejected' for the rest). Both existing- and
@@ -3203,15 +3223,13 @@ class AgentVariantsOrchestrator {
     }
     /**
      * Resolve the project path that owns `.rivet/variants/` for a session.
-     * Existing sessions: the user's project (via `resolveEnv`). Fresh sessions:
-     * the *workspace root*, which is the parent of `workspacePath` — variants
-     * accumulate there across sessions instead of being scattered under each
-     * subproject. Must match what `persistCompletedFreshVariant` writes to.
+     * Existing sessions use the user's project. Fresh sessions use the generated
+     * project folder. Must match what `persistCompletedFreshVariant` writes to.
      */
     async resolveHistoryProjectPath(sessionId) {
         const projectContext = this.store.getProjectContext(sessionId);
         if (projectContext.kind === 'fresh') {
-            return projectContext.workspaceRoot;
+            return projectContext.workspacePath;
         }
         try {
             const env = await this.resolveEnv(sessionId);
@@ -3517,7 +3535,19 @@ class AgentVariantsOrchestrator {
         if (preservedRivetParent) {
             const preservedRivetPath = path_1.default.join(preservedRivetParent, '.rivet');
             if (fs_1.default.existsSync(preservedRivetPath)) {
-                await fs_1.default.promises.rename(preservedRivetPath, existingRivetPath);
+                if (fs_1.default.existsSync(existingRivetPath)) {
+                    await fs_1.default.promises.cp(preservedRivetPath, existingRivetPath, {
+                        recursive: true,
+                        force: true,
+                    });
+                    await fs_1.default.promises.rm(preservedRivetPath, {
+                        recursive: true,
+                        force: true,
+                    });
+                }
+                else {
+                    await fs_1.default.promises.rename(preservedRivetPath, existingRivetPath);
+                }
             }
             await fs_1.default.promises.rm(preservedRivetParent, {
                 recursive: true,
@@ -4549,6 +4579,7 @@ const trackStaticPreviewCompleted = (telemetry, data) => {
 const MATERIALIZE_EXCLUDE = new Set([
     'node_modules',
     '.git',
+    '.rivet',
     'dist',
     '.next',
     '.cache',