trellis 3.1.30 → 3.1.33

package/dist/index.js

@@ -1,5 +1,5 @@
 // @bun
-import"./index-4gknc19b.js";
+import"./index-w5wccer3.js";
 import {
   FileWatcher,
   Ingestion,
@@ -12,12 +12,14 @@ import {
   loadProfile,
   saveProfile,
   writeAgentScaffold
-} from "./index-ncckgtrk.js";
+} from "./index-rv1p47gp.js";
 import {
   VcsMiddleware
-} from "./index-hy73j9z8.js";
+} from "./index-nq520y6k.js";
 import {
   BlobStore,
+  JsonOpLog,
+  LaneOpLog,
   addCriterion,
   assignIssue,
   blockIssue,
@@ -27,6 +29,7 @@ import {
   createBranch,
   createCheckpoint,
   createIssue,
+  createLaneMeta,
   createMilestone,
   decompose,
   deleteBranch,
@@ -34,28 +37,40 @@ import {
   diffOpRange,
   generateUnifiedDiff,
   getActiveIssues,
+  getBranchHeadOpHash,
   getIssue,
+  laneDir,
+  laneMetaPath,
+  lanesRoot,
   listBranches,
   listCheckpoints,
   listIssues,
+  listLaneIds,
+  listLaneMetas,
   listMilestones,
   loadBranchState,
+  loadLaneMeta,
   myersDiff,
+  newLaneId,
   pauseIssue,
   reopenIssue,
+  resolveLaneHeadFromJournal,
   resumeIssue,
   runCriteria,
   saveBranchState,
+  saveLaneMeta,
   setCriterionStatus,
+  shouldAdvanceBranchHead,
   startIssue,
   switchBranch,
   threeWayMerge,
   threeWayTextMerge,
   triageIssue,
   unblockIssue,
-  updateIssue
-} from "./index-a2a394zz.js";
-import"./index-65z0xfjw.js";
+  updateIssue,
+  updateLaneHead
+} from "./index-xhcp6xrn.js";
+import"./index-4cdr7x2x.js";
 import {
   DEFAULT_CONFIG,
   branchEntityId,
@@ -68,8 +83,9 @@ import {
   isVcsOp,
   isVcsOpKind,
   issueEntityId,
+  laneEntityId,
   milestoneEntityId
-} from "./index-v9b4hqa7.js";
+} from "./index-nzb3am4f.js";
 import {
   TrellisKernel
 } from "./index-4wxa8xz4.js";
@@ -86,6 +102,7 @@ init_fs_watcher();
 init_ingestion();
 export {
   writeAgentScaffold,
+  updateLaneHead,
   updateIssue,
   unblockIssue,
   triageIssue,
@@ -93,27 +110,39 @@ export {
   threeWayMerge,
   switchBranch,
   startIssue,
+  shouldAdvanceBranchHead,
   setCriterionStatus,
   saveProfile,
+  saveLaneMeta,
   saveBranchState,
   runCriteria,
   resumeIssue,
+  resolveLaneHeadFromJournal,
   reopenIssue,
   pauseIssue,
+  newLaneId,
   myersDiff,
   milestoneEntityId,
   loadProfile,
+  loadLaneMeta,
   loadBranchState,
   listMilestones,
+  listLaneMetas,
+  listLaneIds,
   listIssues,
   listCheckpoints,
   listBranches,
+  lanesRoot,
+  laneMetaPath,
+  laneEntityId,
+  laneDir,
   issueEntityId,
   isVcsOpKind,
   isVcsOp,
   inferProjectContext,
   hasProfile,
   getIssue,
+  getBranchHeadOpHash,
   getActiveIssues,
   generateUnifiedDiff,
   fileEntityId,
@@ -126,6 +155,7 @@ export {
   criterionEntityId,
   createVcsOp,
   createMilestone,
+  createLaneMeta,
   createIssue,
   createCheckpoint,
   createBranch,
@@ -141,6 +171,8 @@ export {
   TrellisVcsEngine,
   TrellisKernel,
   SqliteKernelBackend,
+  LaneOpLog,
+  JsonOpLog,
   Ingestion,
   FileWatcher,
   DEFAULT_CONFIG,

package/dist/mcp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAwBrE,wBAAgB,sBAAsB,IAAI,SAAS,CAqrClD;AAMD;;;GAGG;AACH,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAKjE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAwBrE,wBAAgB,sBAAsB,IAAI,SAAS,CAisClD;AAMD;;;GAGG;AACH,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAKjE"}

package/dist/plugins/agent-memory/graph-context-manager.d.ts

@@ -25,6 +25,8 @@ export declare class GraphContextManager implements ContextManager {
      * Always kept in sync with the graph via addMessage/prune/resume.
      */
     private cache;
+    /** In-flight graph writes from fire-and-forget addMessage/prune calls. */
+    private pendingWrites;
     constructor(kernel: TrellisKernel);
     /**
      * Create a new conversation entity and set it as the active context.
@@ -67,6 +69,9 @@ export declare class GraphContextManager implements ContextManager {
      * Get the total estimated token count for the active conversation.
      */
     getTotalTokenCount(): number;
+    /** Wait for in-flight graph writes (tests and graceful shutdown). */
+    awaitPersistence(): Promise<void>;
+    private trackWrite;
     /**
      * Load messages from the graph for a given conversation, sorted by timestamp.
      */

package/dist/plugins/agent-memory/graph-context-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph-context-manager.d.ts","sourceRoot":"","sources":["../../../src/plugins/agent-memory/graph-context-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAOzE,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAmBD,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAK;IAE3B;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAuB;gBAExB,MAAM,EAAE,aAAa;IAQjC;;;OAGG;IACG,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBpE;;OAEG;IACG,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/D;;OAEG;IACH,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIlC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;IA0CrC,UAAU,IAAI,UAAU,EAAE;IAMpB,KAAK,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B9C,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAO5B,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM;IAQhD;;OAEG;IACH,iBAAiB,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,KAAK,CAAC;QACvD,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAeF;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAU5B;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAiC/B"}
+{"version":3,"file":"graph-context-manager.d.ts","sourceRoot":"","sources":["../../../src/plugins/agent-memory/graph-context-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAOzE,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAmBD,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,cAAc,CAAK;IAE3B;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAuB;IAEpC,0EAA0E;IAC1E,OAAO,CAAC,aAAa,CAA4B;gBAErC,MAAM,EAAE,aAAa;IAQjC;;;OAGG;IACG,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBpE;;OAEG;IACG,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/D;;OAEG;IACH,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIlC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;IA4CrC,UAAU,IAAI,UAAU,EAAE;IAMpB,KAAK,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+B9C,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAO5B,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM;IAQhD;;OAEG;IACH,iBAAiB,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,KAAK,CAAC;QACvD,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAeF;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAM5B,qEAAqE;IAC/D,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvC,OAAO,CAAC,UAAU;IAOlB;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAiC/B"}

package/dist/{remote-manager-n71bmcy1.js → remote-manager-xvbg4230.js}

@@ -2,10 +2,10 @@
 import {
   TrellisVcsEngine,
   init_engine
-} from "./index-ncckgtrk.js";
-import"./index-a2a394zz.js";
-import"./index-65z0xfjw.js";
-import"./index-v9b4hqa7.js";
+} from "./index-rv1p47gp.js";
+import"./index-xhcp6xrn.js";
+import"./index-4cdr7x2x.js";
+import"./index-nzb3am4f.js";
 import"./index-yhwjgfvj.js";
 import"./index-a76rekgs.js";
 

package/dist/vcs/branch.d.ts

@@ -13,7 +13,13 @@ export interface BranchInfo {
 }
 export interface BranchState {
     currentBranch: string;
+    /** Active agent lane (W1.1). */
+    activeLaneId?: string;
 }
+/** Whether an integration-journal op should emit a follow-up branchAdvance (ADR 0004). */
+export declare function shouldAdvanceBranchHead(kind: string): boolean;
+/** Read branch:NAME headOpHash from the materialized store (latest wins). */
+export declare function getBranchHeadOpHash(ctx: EngineContext, branchName: string): string | undefined;
 /**
  * Create a new branch forked from the current branch.
  */

package/dist/vcs/branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/vcs/branch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMzD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB;AAMD;;GAEG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,KAAK,CAAC,CAmBhB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,GACX,IAAI,CAON;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,GACpB,UAAU,EAAE,CAmBd;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,KAAK,CAAC,CAkBhB;AAMD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAG1E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAY7D"}
+{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/vcs/branch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMzD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AASD,0FAA0F;AAC1F,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,6EAA6E;AAC7E,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAKpB;AAMD;;GAEG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,KAAK,CAAC,CAmBhB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,GACX,IAAI,CAON;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,GACpB,UAAU,EAAE,CAmBd;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,KAAK,CAAC,CAkBhB;AAMD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAG1E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAe7D"}

package/dist/vcs/decompose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decompose.d.ts","sourceRoot":"","sources":["../../src/vcs/decompose.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAUxC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI,EAAE,CAAC;IACpB,WAAW,EAAE,IAAI,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,CAgcjD"}
+{"version":3,"file":"decompose.d.ts","sourceRoot":"","sources":["../../src/vcs/decompose.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWxC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI,EAAE,CAAC;IACpB,WAAW,EAAE,IAAI,EAAE,CAAC;CACrB;AA4BD;;GAEG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,CAyjBjD"}

package/dist/vcs/engine-context.d.ts

@@ -6,6 +6,13 @@
  */
 import type { EAVStore } from '../core/store/eav-store.js';
 import type { VcsOp } from './types.js';
+/** Options for engine op ingestion (integration vs lane journals). */
+export interface ApplyOpOptions {
+    /** Skip emitting vcs:branchAdvance after this op (replay, promote, advance ops). */
+    skipBranchAdvance?: boolean;
+    /** Write to integration journal while a lane is active (lane create/drop, promote). */
+    allowIntegrationWrite?: boolean;
+}
 export interface EngineContext {
     /** The EAV store for querying/mutating graph state. */
     store: EAVStore;
@@ -15,7 +22,7 @@ export interface EngineContext {
     readAllOps(): VcsOp[];
     /** Get the last op in the log. */
     getLastOp(): VcsOp | undefined;
-    /** Apply an op (decompose + persist + auto-checkpoint flag). */
-    applyOp(op: VcsOp): void;
+    /** Apply an op (decompose + persist + branch advance + auto-checkpoint flag). */
+    applyOp(op: VcsOp, opts?: ApplyOpOptions): Promise<void>;
 }
 //# sourceMappingURL=engine-context.d.ts.map

package/dist/vcs/engine-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine-context.d.ts","sourceRoot":"","sources":["../../src/vcs/engine-context.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,aAAa;IAC5B,uDAAuD;IACvD,KAAK,EAAE,QAAQ,CAAC;IAEhB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAEhB,gCAAgC;IAChC,UAAU,IAAI,KAAK,EAAE,CAAC;IAEtB,kCAAkC;IAClC,SAAS,IAAI,KAAK,GAAG,SAAS,CAAC;IAE/B,gEAAgE;IAChE,OAAO,CAAC,EAAE,EAAE,KAAK,GAAG,IAAI,CAAC;CAC1B"}
+{"version":3,"file":"engine-context.d.ts","sourceRoot":"","sources":["../../src/vcs/engine-context.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,sEAAsE;AACtE,MAAM,WAAW,cAAc;IAC7B,oFAAoF;IACpF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uFAAuF;IACvF,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,uDAAuD;IACvD,KAAK,EAAE,QAAQ,CAAC;IAEhB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAEhB,gCAAgC;IAChC,UAAU,IAAI,KAAK,EAAE,CAAC;IAEtB,kCAAkC;IAClC,SAAS,IAAI,KAAK,GAAG,SAAS,CAAC;IAE/B,iFAAiF;IACjF,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D"}

package/dist/vcs/index.d.ts

@@ -20,4 +20,6 @@ export * from './checkpoint.js';
 export * from './diff.js';
 export * from './merge.js';
 export * from './issue.js';
+export * from './op-log.js';
+export * from './lane.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/vcs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vcs/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vcs/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}

package/dist/vcs/index.js

@@ -1,9 +1,11 @@
 // @bun
 import {
   VcsMiddleware
-} from "../index-hy73j9z8.js";
+} from "../index-nq520y6k.js";
 import {
   BlobStore,
+  JsonOpLog,
+  LaneOpLog,
   addCriterion,
   assignIssue,
   blockIssue,
@@ -13,6 +15,7 @@ import {
   createBranch,
   createCheckpoint,
   createIssue,
+  createLaneMeta,
   createMilestone,
   decompose,
   deleteBranch,
@@ -20,27 +23,39 @@ import {
   diffOpRange,
   generateUnifiedDiff,
   getActiveIssues,
+  getBranchHeadOpHash,
   getIssue,
+  laneDir,
+  laneMetaPath,
+  lanesRoot,
   listBranches,
   listCheckpoints,
   listIssues,
+  listLaneIds,
+  listLaneMetas,
   listMilestones,
   loadBranchState,
+  loadLaneMeta,
   myersDiff,
+  newLaneId,
   pauseIssue,
   reopenIssue,
+  resolveLaneHeadFromJournal,
   resumeIssue,
   runCriteria,
   saveBranchState,
+  saveLaneMeta,
   setCriterionStatus,
+  shouldAdvanceBranchHead,
   startIssue,
   switchBranch,
   threeWayMerge,
   threeWayTextMerge,
   triageIssue,
   unblockIssue,
-  updateIssue
-} from "../index-a2a394zz.js";
+  updateIssue,
+  updateLaneHead
+} from "../index-xhcp6xrn.js";
 import {
   DEFAULT_CONFIG,
   branchEntityId,
@@ -53,10 +68,12 @@ import {
   isVcsOp,
   isVcsOpKind,
   issueEntityId,
+  laneEntityId,
   milestoneEntityId
-} from "../index-v9b4hqa7.js";
+} from "../index-nzb3am4f.js";
 import"../index-a76rekgs.js";
 export {
+  updateLaneHead,
   updateIssue,
   unblockIssue,
   triageIssue,
@@ -64,23 +81,35 @@ export {
   threeWayMerge,
   switchBranch,
   startIssue,
+  shouldAdvanceBranchHead,
   setCriterionStatus,
+  saveLaneMeta,
   saveBranchState,
   runCriteria,
   resumeIssue,
+  resolveLaneHeadFromJournal,
   reopenIssue,
   pauseIssue,
+  newLaneId,
   myersDiff,
   milestoneEntityId,
+  loadLaneMeta,
   loadBranchState,
   listMilestones,
+  listLaneMetas,
+  listLaneIds,
   listIssues,
   listCheckpoints,
   listBranches,
+  lanesRoot,
+  laneMetaPath,
+  laneEntityId,
+  laneDir,
   issueEntityId,
   isVcsOpKind,
   isVcsOp,
   getIssue,
+  getBranchHeadOpHash,
   getActiveIssues,
   generateUnifiedDiff,
   fileEntityId,
@@ -93,6 +122,7 @@ export {
   criterionEntityId,
   createVcsOp,
   createMilestone,
+  createLaneMeta,
   createIssue,
   createCheckpoint,
   createBranch,
@@ -105,6 +135,8 @@ export {
   assignIssue,
   addCriterion,
   VcsMiddleware,
+  LaneOpLog,
+  JsonOpLog,
   DEFAULT_CONFIG,
   BlobStore
 };

package/dist/vcs/issue.d.ts

@@ -76,6 +76,8 @@ export declare function updateIssue(ctx: EngineContext, id: string, updates: {
     labels?: string[];
     assignee?: string;
     status?: 'backlog' | 'queue' | 'in_progress' | 'paused' | 'closed';
+    /** Set parent issue id, or `null` to remove an existing parent link. */
+    parentId?: string | null;
 }): Promise<VcsOp>;
 /**
  * Start working on an issue: sets in_progress, auto-assigns, creates branch.

package/dist/vcs/issue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issue.d.ts","sourceRoot":"","sources":["../../src/vcs/issue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"issue.d.ts","sourceRoot":"","sources":["../../src/vcs/issue.ts"],"names":[],"mappings":"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"}

package/dist/vcs/lane-materialize.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Integration materialization cache + lane overlay (W4 lazy replay).
+ *
+ * ADR 0001: do not replay all lane journals on every open — cache integration
+ * state and overlay only the active lane journal.
+ */
+import { EAVStore } from '../core/store/eav-store.js';
+import type { VcsOp } from './types.js';
+export interface MaterializationStats {
+    /** Integration ops replayed in the last materialize call (0 = cache hit). */
+    integrationOpsReplayed: number;
+    /** Lane ops replayed in the last overlay call. */
+    laneOpsReplayed: number;
+    /** True when integration cache tail matched the journal tail. */
+    integrationCacheHit: boolean;
+    /** Integration journal tail hash after last materialize. */
+    integrationTailHash?: string;
+}
+export interface IntegrationCache {
+    tailHash: string | undefined;
+    store: EAVStore;
+}
+export declare function emptyMaterializationStats(): MaterializationStats;
+export declare function replayOpIntoStore(store: EAVStore, op: VcsOp): void;
+/** Clone an EAV store via snapshot/restore (lane overlay fork point). */
+export declare function cloneStore(source: EAVStore): EAVStore;
+export declare function materializeIntegrationOps(ops: VcsOp[], cache: IntegrationCache | null, tailHash: string | undefined): {
+    store: EAVStore;
+    cache: IntegrationCache;
+    stats: MaterializationStats;
+};
+/** Apply lane journal ops on a fork of the integration store. */
+export declare function overlayLaneOps(integrationStore: EAVStore, laneOps: VcsOp[]): {
+    store: EAVStore;
+    laneOpsReplayed: number;
+};
+/**
+ * Materialize a child-fork lane entry (ADR 0007).
+ * Integration through baseOpHash, then parent journal, then child journal.
+ */
+export declare function materializeChildForkEntry(integrationOps: VcsOp[], baseOpHash: string, parentLaneOps: VcsOp[], childLaneOps: VcsOp[]): {
+    store: EAVStore;
+    stats: MaterializationStats;
+};
+//# sourceMappingURL=lane-materialize.d.ts.map

package/dist/vcs/lane-materialize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lane-materialize.d.ts","sourceRoot":"","sources":["../../src/vcs/lane-materialize.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,oBAAoB;IACnC,6EAA6E;IAC7E,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kDAAkD;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,iEAAiE;IACjE,mBAAmB,EAAE,OAAO,CAAC;IAC7B,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,KAAK,EAAE,QAAQ,CAAC;CACjB;AAED,wBAAgB,yBAAyB,IAAI,oBAAoB,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,GAAG,IAAI,CAMlE;AAED,yEAAyE;AACzE,wBAAgB,UAAU,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAIrD;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,KAAK,EAAE,EACZ,KAAK,EAAE,gBAAgB,GAAG,IAAI,EAC9B,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,oBAAoB,CAAA;CAAE,CA6B3E;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAC5B,gBAAgB,EAAE,QAAQ,EAC1B,OAAO,EAAE,KAAK,EAAE,GACf;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAM9C;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,KAAK,EAAE,EACvB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,KAAK,EAAE,EACtB,YAAY,EAAE,KAAK,EAAE,GACpB;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,oBAAoB,CAAA;CAAE,CA0BlD"}

package/dist/vcs/lane-promote.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Agent Lane promotion — conflict detection and replay planning (ADR 0002, ADR 0003).
+ */
+import { EAVStore } from '../core/store/eav-store.js';
+import type { BlobStore } from './blob-store.js';
+import type { LaneMeta } from './lane.js';
+import type { VcsOp } from './types.js';
+export interface LaneConflict {
+    class: 'safe' | 'soft' | 'hard' | 'file';
+    laneOpHash: string;
+    entityId?: string;
+    attribute?: string;
+    filePath?: string;
+    integrationValue?: unknown;
+    laneValue?: unknown;
+    suggestion?: 'accept-ours' | 'accept-theirs' | 'manual';
+    message?: string;
+}
+export interface PromoteOpAction {
+    sourceOp: VcsOp;
+    /** Populated when a clean three-way file merge produced new content. */
+    mergedContent?: string;
+}
+export interface LanePromotePlan {
+    laneId: string;
+    targetBranch: string;
+    snapshotHead: string;
+    baseOpHash: string;
+    opsToReplay: PromoteOpAction[];
+    conflicts: LaneConflict[];
+    blockingConflicts: LaneConflict[];
+    safeOpCount: number;
+    canPromote: boolean;
+}
+export interface LanePromoteResult extends LanePromotePlan {
+    promoted: boolean;
+    integrationOpsAppended?: number;
+    completeOpHash?: string;
+}
+export interface PlanLanePromoteParams {
+    laneId: string;
+    meta: LaneMeta;
+    targetBranch: string;
+    snapshotHead: string;
+    integrationOps: VcsOp[];
+    laneOps: VcsOp[];
+    /** Parent lane journal when meta.forkKind === 'child' (ADR 0007). */
+    parentLaneOps?: VcsOp[];
+    blobStore?: BlobStore | null;
+}
+export declare function resolveBranchHeadFromOps(ops: VcsOp[], branchName: string): string | undefined;
+export declare function buildStoreUpTo(ops: VcsOp[], atOpHash?: string): EAVStore;
+export declare function planLanePromote(params: PlanLanePromoteParams): Promise<LanePromotePlan>;
+export declare function rechainOpForIntegration(op: VcsOp, previousHash: string | undefined): Promise<VcsOp>;
+export declare function formatPromoteExplain(plan: LanePromotePlan): string;
+//# sourceMappingURL=lane-promote.d.ts.map

package/dist/vcs/lane-promote.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lane-promote.d.ts","sourceRoot":"","sources":["../../src/vcs/lane-promote.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAwB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAKjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,KAAK,EAAa,MAAM,YAAY,CAAC;AAMnD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,aAAa,GAAG,eAAe,GAAG,QAAQ,CAAC;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,KAAK,CAAC;IAChB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,iBAAiB,EAAE,YAAY,EAAE,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,QAAQ,EAAE,OAAO,CAAC;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,KAAK,EAAE,CAAC;IACxB,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,qEAAqE;IACrE,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;CAC9B;AA8BD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,KAAK,EAAE,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAYpB;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAOxE;AAsOD,wBAAsB,eAAe,CACnC,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,eAAe,CAAC,CAsF1B;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,KAAK,EACT,YAAY,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAAC,KAAK,CAAC,CAShB;AAUD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CA+BlE"}

package/dist/vcs/lane.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Agent Lane metadata and paths (ADR 0001, terminology ADR 0005).
+ * Journal I/O: {@link LaneOpLog} in ./op-log.js
+ */
+import type { VcsOp } from './types.js';
+export type LaneStatus = 'active' | 'promoting' | 'promoted' | 'dropped';
+/** ADR 0006 sibling; ADR 0007 child with virtualBaseOpHash. */
+export type LaneForkKind = 'sibling' | 'child';
+export interface LaneMeta {
+    id: string;
+    status: LaneStatus;
+    baseBranch: string;
+    baseOpHash: string;
+    targetBranch: string;
+    headOpHash?: string;
+    agentId: string;
+    issueId?: string;
+    sessionId?: string;
+    parentLaneId?: string;
+    forkKind?: LaneForkKind;
+    forkedAt?: string;
+    /** Parent lane head at child fork (ADR 0007). */
+    virtualBaseOpHash?: string;
+    worktreePath?: string;
+    leaseExpiresAt?: string;
+    createdAt: string;
+    updatedAt: string;
+}
+export declare function lanesRoot(trellisDir: string): string;
+export declare function laneDir(trellisDir: string, laneId: string): string;
+export declare function laneMetaPath(trellisDir: string, laneId: string): string;
+export declare function newLaneId(): string;
+export declare function loadLaneMeta(trellisDir: string, laneId: string): LaneMeta | undefined;
+export declare function saveLaneMeta(trellisDir: string, meta: LaneMeta): void;
+export declare function listLaneIds(trellisDir: string): string[];
+export interface CreateLaneParams {
+    baseBranch: string;
+    baseOpHash: string;
+    agentId: string;
+    targetBranch?: string;
+    issueId?: string;
+    sessionId?: string;
+    parentLaneId?: string;
+    forkKind?: LaneForkKind;
+    forkedAt?: string;
+    virtualBaseOpHash?: string;
+    worktreePath?: string;
+    leaseExpiresAt?: string;
+}
+/** Lane journal tail, else meta head, else integration fork base. */
+export declare function resolveLaneHeadFromJournal(meta: LaneMeta, laneOps: VcsOp[]): string;
+export declare function createLaneMeta(trellisDir: string, params: CreateLaneParams): LaneMeta;
+export declare function updateLaneHead(trellisDir: string, laneId: string, headOpHash: string): void;
+export declare function listLaneMetas(trellisDir: string): LaneMeta[];
+//# sourceMappingURL=lane.d.ts.map

package/dist/vcs/lane.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lane.d.ts","sourceRoot":"","sources":["../../src/vcs/lane.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,MAAM,UAAU,GAClB,QAAQ,GACR,WAAW,GACX,UAAU,GACV,SAAS,CAAC;AAEd,+DAA+D;AAC/D,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAE/C,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,QAAQ,GAAG,SAAS,CAItB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,QAAQ,GACb,IAAI,CAON;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAMxD;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qEAAqE;AACrE,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,KAAK,EAAE,GACf,MAAM,CAER;AAED,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,GACvB,QAAQ,CAuBV;AAED,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,IAAI,CAMN;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE,CAI5D"}

package/dist/vcs/op-log.d.ts

@@ -0,0 +1,29 @@
+/**
+ * JSON-file-backed op log (P0).
+ * Shared by integration journal and per-lane journals (ADR 0001, ADR 0005).
+ */
+import type { VcsOp } from './types.js';
+export declare class JsonOpLog {
+    private ops;
+    private filePath;
+    private lockPath;
+    constructor(filePath: string);
+    get path(): string;
+    load(): void;
+    append(op: VcsOp): void;
+    readAll(): VcsOp[];
+    getLastOp(): VcsOp | undefined;
+    count(): number;
+    private flush;
+    private readOpsFromDisk;
+    private withLock;
+    static repair(filePath: string): {
+        recovered: number;
+        lost: number;
+    };
+}
+/** Lane journal op log — same implementation, distinct path (ADR 0001, ADR 0005). */
+export declare class LaneOpLog extends JsonOpLog {
+    constructor(laneDir: string);
+}
+//# sourceMappingURL=op-log.d.ts.map

package/dist/vcs/op-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"op-log.d.ts","sourceRoot":"","sources":["../../src/vcs/op-log.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AASxC,qBAAa,SAAS;IACpB,OAAO,CAAC,GAAG,CAAe;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM;IAK5B,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,IAAI,IAAI;IAoBZ,MAAM,CAAC,EAAE,EAAE,KAAK,GAAG,IAAI;IAcvB,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,IAAI,KAAK,GAAG,SAAS;IAI9B,KAAK,IAAI,MAAM;IAIf,OAAO,CAAC,KAAK;IAgBb,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,QAAQ;IAoChB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;CAkDrE;AAED,qFAAqF;AACrF,qBAAa,SAAU,SAAQ,SAAS;gBAC1B,OAAO,EAAE,MAAM;CAG5B"}