trellis 3.1.35 → 3.2.0

package/dist/{index-xhcp6xrn.js → chunk-NSDXU6QX.js}

@@ -1,4 +1,3 @@
-// @bun
 import {
   createVcsOp,
   criterionEntityId,
@@ -9,25 +8,23 @@ import {
   init_types,
   issueEntityId,
   laneEntityId
-} from "./index-nzb3am4f.js";
+} from "./chunk-V3G7Q3QQ.js";
 import {
   __esm,
   __require
-} from "./index-a76rekgs.js";
+} from "./chunk-2ESYSVXG.js";
 
 // src/vcs/decompose.ts
 import { dirname } from "path";
 function pickFacts(input) {
-  if (!Array.isArray(input))
-    return [];
+  if (!Array.isArray(input)) return [];
   return input.filter((item) => {
     const fact = item;
     return typeof fact.e === "string" && typeof fact.a === "string" && (typeof fact.v === "string" || typeof fact.v === "number" || typeof fact.v === "boolean");
   });
 }
 function pickLinks(input) {
-  if (!Array.isArray(input))
-    return [];
+  if (!Array.isArray(input)) return [];
   return input.filter((item) => {
     const link = item;
     return typeof link.e1 === "string" && typeof link.a === "string" && typeof link.e2 === "string";
@@ -41,8 +38,7 @@ function decompose(op) {
     deleteLinks: []
   };
   const vcs = op.vcs;
-  if (!vcs)
-    return result;
+  if (!vcs) return result;
   if (vcs.issueId && vcs.oldIssueStatus) {
     result.deleteFacts.push({
       e: issueEntityId(vcs.issueId),
@@ -52,29 +48,33 @@ function decompose(op) {
   }
   switch (op.kind) {
     case "vcs:fileAdd": {
-      if (!vcs.filePath)
-        break;
+      if (!vcs.filePath) break;
       const eid = fileEntityId(vcs.filePath);
       const dir = dirname(vcs.filePath);
       const did = dirEntityId(dir === "." ? "" : dir);
-      result.addFacts.push({ e: eid, a: "type", v: "FileNode" }, { e: eid, a: "path", v: vcs.filePath });
+      result.addFacts.push(
+        { e: eid, a: "type", v: "FileNode" },
+        { e: eid, a: "path", v: vcs.filePath }
+      );
       if (vcs.contentHash) {
         result.addFacts.push({ e: eid, a: "contentHash", v: vcs.contentHash });
       }
-      if (vcs.size !== undefined) {
+      if (vcs.size !== void 0) {
         result.addFacts.push({ e: eid, a: "size", v: vcs.size });
       }
       if (vcs.language) {
         result.addFacts.push({ e: eid, a: "language", v: vcs.language });
       }
       result.addFacts.push({ e: eid, a: "lastModified", v: op.timestamp });
-      result.addFacts.push({ e: did, a: "type", v: "DirectoryNode" }, { e: did, a: "path", v: dir === "." ? "" : dir });
+      result.addFacts.push(
+        { e: did, a: "type", v: "DirectoryNode" },
+        { e: did, a: "path", v: dir === "." ? "" : dir }
+      );
       result.addLinks.push({ e1: did, a: "contains", e2: eid });
       break;
     }
     case "vcs:fileModify": {
-      if (!vcs.filePath)
-        break;
+      if (!vcs.filePath) break;
       const eid = fileEntityId(vcs.filePath);
       if (vcs.oldContentHash) {
         result.deleteFacts.push({
@@ -86,19 +86,21 @@ function decompose(op) {
       if (vcs.contentHash) {
         result.addFacts.push({ e: eid, a: "contentHash", v: vcs.contentHash });
       }
-      if (vcs.size !== undefined) {
+      if (vcs.size !== void 0) {
         result.addFacts.push({ e: eid, a: "size", v: vcs.size });
       }
       result.addFacts.push({ e: eid, a: "lastModified", v: op.timestamp });
       break;
     }
     case "vcs:fileDelete": {
-      if (!vcs.filePath)
-        break;
+      if (!vcs.filePath) break;
       const eid = fileEntityId(vcs.filePath);
       const dir = dirname(vcs.filePath);
       const did = dirEntityId(dir === "." ? "" : dir);
-      result.deleteFacts.push({ e: eid, a: "type", v: "FileNode" }, { e: eid, a: "path", v: vcs.filePath });
+      result.deleteFacts.push(
+        { e: eid, a: "type", v: "FileNode" },
+        { e: eid, a: "path", v: vcs.filePath }
+      );
       if (vcs.contentHash) {
         result.deleteFacts.push({
           e: eid,
@@ -110,8 +112,7 @@ function decompose(op) {
       break;
     }
     case "vcs:fileRename": {
-      if (!vcs.filePath || !vcs.oldFilePath)
-        break;
+      if (!vcs.filePath || !vcs.oldFilePath) break;
       const eid = fileEntityId(vcs.oldFilePath);
       const oldDir = dirname(vcs.oldFilePath);
       const newDir = dirname(vcs.filePath);
@@ -121,15 +122,22 @@ function decompose(op) {
       result.addFacts.push({ e: eid, a: "path", v: vcs.filePath });
       result.addFacts.push({ e: eid, a: "lastModified", v: op.timestamp });
       result.deleteLinks.push({ e1: oldDid, a: "contains", e2: eid });
-      result.addFacts.push({ e: newDid, a: "type", v: "DirectoryNode" }, { e: newDid, a: "path", v: newDir === "." ? "" : newDir });
+      result.addFacts.push(
+        { e: newDid, a: "type", v: "DirectoryNode" },
+        { e: newDid, a: "path", v: newDir === "." ? "" : newDir }
+      );
       result.addLinks.push({ e1: newDid, a: "contains", e2: eid });
       break;
     }
     case "vcs:branchCreate": {
-      if (!vcs.branchName)
-        break;
+      if (!vcs.branchName) break;
       const bid = `branch:${vcs.branchName}`;
-      result.addFacts.push({ e: bid, a: "type", v: "Branch" }, { e: bid, a: "name", v: vcs.branchName }, { e: bid, a: "createdAt", v: op.timestamp }, { e: bid, a: "createdBy", v: op.agentId });
+      result.addFacts.push(
+        { e: bid, a: "type", v: "Branch" },
+        { e: bid, a: "name", v: vcs.branchName },
+        { e: bid, a: "createdAt", v: op.timestamp },
+        { e: bid, a: "createdBy", v: op.agentId }
+      );
       if (vcs.targetOpHash) {
         result.addFacts.push({ e: bid, a: "headOpHash", v: vcs.targetOpHash });
       }
@@ -143,24 +151,28 @@ function decompose(op) {
       break;
     }
     case "vcs:branchDelete": {
-      if (!vcs.branchName)
-        break;
+      if (!vcs.branchName) break;
       const bid = `branch:${vcs.branchName}`;
-      result.deleteFacts.push({ e: bid, a: "type", v: "Branch" }, { e: bid, a: "name", v: vcs.branchName });
+      result.deleteFacts.push(
+        { e: bid, a: "type", v: "Branch" },
+        { e: bid, a: "name", v: vcs.branchName }
+      );
       break;
     }
     case "vcs:branchAdvance": {
-      if (!vcs.branchName || !vcs.targetOpHash)
-        break;
+      if (!vcs.branchName || !vcs.targetOpHash) break;
       const bid = `branch:${vcs.branchName}`;
       result.addFacts.push({ e: bid, a: "headOpHash", v: vcs.targetOpHash });
       break;
     }
     case "vcs:milestoneCreate": {
-      if (!vcs.milestoneId)
-        break;
+      if (!vcs.milestoneId) break;
       const mid = vcs.milestoneId;
-      result.addFacts.push({ e: mid, a: "type", v: "Milestone" }, { e: mid, a: "createdAt", v: op.timestamp }, { e: mid, a: "createdBy", v: op.agentId });
+      result.addFacts.push(
+        { e: mid, a: "type", v: "Milestone" },
+        { e: mid, a: "createdAt", v: op.timestamp },
+        { e: mid, a: "createdBy", v: op.agentId }
+      );
       if (vcs.message) {
         result.addFacts.push({ e: mid, a: "message", v: vcs.message });
       }
@@ -174,17 +186,26 @@ function decompose(op) {
     }
     case "vcs:checkpointCreate": {
       const cid = `checkpoint:${op.hash}`;
-      result.addFacts.push({ e: cid, a: "type", v: "Checkpoint" }, { e: cid, a: "createdAt", v: op.timestamp }, { e: cid, a: "atOpHash", v: op.hash });
+      result.addFacts.push(
+        { e: cid, a: "type", v: "Checkpoint" },
+        { e: cid, a: "createdAt", v: op.timestamp },
+        { e: cid, a: "atOpHash", v: op.hash }
+      );
       if (vcs.trigger) {
         result.addFacts.push({ e: cid, a: "trigger", v: vcs.trigger });
       }
       break;
     }
+    // ----- Issue tracking -----
     case "vcs:issueCreate": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
-      result.addFacts.push({ e: eid, a: "type", v: "Issue" }, { e: eid, a: "status", v: vcs.issueStatus ?? "backlog" }, { e: eid, a: "createdAt", v: op.timestamp }, { e: eid, a: "createdBy", v: op.agentId });
+      result.addFacts.push(
+        { e: eid, a: "type", v: "Issue" },
+        { e: eid, a: "status", v: vcs.issueStatus ?? "backlog" },
+        { e: eid, a: "createdAt", v: op.timestamp },
+        { e: eid, a: "createdBy", v: op.agentId }
+      );
       if (vcs.issueTitle) {
         result.addFacts.push({ e: eid, a: "title", v: vcs.issueTitle });
       }
@@ -218,8 +239,7 @@ function decompose(op) {
       break;
     }
     case "vcs:issueUpdate": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
       if (vcs.issueStatus) {
         result.addFacts.push({ e: eid, a: "status", v: vcs.issueStatus });
@@ -240,7 +260,7 @@ function decompose(op) {
       if (vcs.issueAssignee) {
         result.addFacts.push({ e: eid, a: "assignee", v: vcs.issueAssignee });
       }
-      if (vcs.issueDescription !== undefined) {
+      if (vcs.issueDescription !== void 0) {
         result.addFacts.push({
           e: eid,
           a: "description",
@@ -264,10 +284,12 @@ function decompose(op) {
       break;
     }
     case "vcs:issueStart": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
-      result.addFacts.push({ e: eid, a: "status", v: "in_progress" }, { e: eid, a: "startedAt", v: op.timestamp });
+      result.addFacts.push(
+        { e: eid, a: "status", v: "in_progress" },
+        { e: eid, a: "startedAt", v: op.timestamp }
+      );
       if (vcs.issueAssignee) {
         result.addFacts.push({ e: eid, a: "assignee", v: vcs.issueAssignee });
       }
@@ -281,41 +303,50 @@ function decompose(op) {
       break;
     }
     case "vcs:issuePause": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
-      result.addFacts.push({ e: eid, a: "status", v: "paused" }, { e: eid, a: "pausedAt", v: op.timestamp });
+      result.addFacts.push(
+        { e: eid, a: "status", v: "paused" },
+        { e: eid, a: "pausedAt", v: op.timestamp }
+      );
       if (vcs.pauseNote) {
         result.addFacts.push({ e: eid, a: "pauseNote", v: vcs.pauseNote });
       }
       break;
     }
     case "vcs:issueResume": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
-      result.addFacts.push({ e: eid, a: "status", v: "in_progress" }, { e: eid, a: "resumedAt", v: op.timestamp }, { e: eid, a: "pauseNote", v: "" });
+      result.addFacts.push(
+        { e: eid, a: "status", v: "in_progress" },
+        { e: eid, a: "resumedAt", v: op.timestamp },
+        { e: eid, a: "pauseNote", v: "" }
+      );
       break;
     }
     case "vcs:issueClose": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
-      result.addFacts.push({ e: eid, a: "status", v: "closed" }, { e: eid, a: "closedAt", v: op.timestamp });
+      result.addFacts.push(
+        { e: eid, a: "status", v: "closed" },
+        { e: eid, a: "closedAt", v: op.timestamp }
+      );
       break;
     }
     case "vcs:issueReopen": {
-      if (!vcs.issueId)
-        break;
+      if (!vcs.issueId) break;
       const eid = issueEntityId(vcs.issueId);
       result.addFacts.push({ e: eid, a: "status", v: "queue" });
       break;
     }
     case "vcs:criterionAdd": {
-      if (!vcs.criterionId || !vcs.issueId)
-        break;
+      if (!vcs.criterionId || !vcs.issueId) break;
       const ceid = vcs.criterionId;
-      result.addFacts.push({ e: ceid, a: "type", v: "Criterion" }, { e: ceid, a: "status", v: "pending" }, { e: ceid, a: "createdAt", v: op.timestamp });
+      result.addFacts.push(
+        { e: ceid, a: "type", v: "Criterion" },
+        { e: ceid, a: "status", v: "pending" },
+        { e: ceid, a: "createdAt", v: op.timestamp }
+      );
       if (vcs.criterionDescription) {
         result.addFacts.push({
           e: ceid,
@@ -338,8 +369,7 @@ function decompose(op) {
       break;
     }
     case "vcs:criterionUpdate": {
-      if (!vcs.criterionId)
-        break;
+      if (!vcs.criterionId) break;
       const ceid = vcs.criterionId;
       if (vcs.criterionStatus) {
         result.addFacts.push({ e: ceid, a: "status", v: vcs.criterionStatus });
@@ -354,27 +384,30 @@ function decompose(op) {
       result.addFacts.push({ e: ceid, a: "lastRunAt", v: op.timestamp });
       break;
     }
+    // ----- Issue blocking -----
     case "vcs:issueBlock": {
-      if (!vcs.issueId || !vcs.blockedByIssueId)
-        break;
+      if (!vcs.issueId || !vcs.blockedByIssueId) break;
       const eid = issueEntityId(vcs.issueId);
       const blockerEid = issueEntityId(vcs.blockedByIssueId);
       result.addLinks.push({ e1: eid, a: "blockedBy", e2: blockerEid });
       break;
     }
     case "vcs:issueUnblock": {
-      if (!vcs.issueId || !vcs.blockedByIssueId)
-        break;
+      if (!vcs.issueId || !vcs.blockedByIssueId) break;
       const eid = issueEntityId(vcs.issueId);
       const blockerEid = issueEntityId(vcs.blockedByIssueId);
       result.deleteLinks.push({ e1: eid, a: "blockedBy", e2: blockerEid });
       break;
     }
+    // ----- Decision traces -----
     case "vcs:decisionRecord": {
-      if (!vcs.decisionId)
-        break;
+      if (!vcs.decisionId) break;
       const did = decisionEntityId(vcs.decisionId);
-      result.addFacts.push({ e: did, a: "type", v: "Decision" }, { e: did, a: "createdAt", v: op.timestamp }, { e: did, a: "createdBy", v: op.agentId });
+      result.addFacts.push(
+        { e: did, a: "type", v: "Decision" },
+        { e: did, a: "createdAt", v: op.timestamp },
+        { e: did, a: "createdBy", v: op.agentId }
+      );
       if (vcs.decisionToolName) {
         result.addFacts.push({
           e: did,
@@ -416,10 +449,14 @@ function decompose(op) {
       break;
     }
     case "vcs:laneCreate": {
-      if (!vcs.laneId)
-        break;
+      if (!vcs.laneId) break;
       const lid = laneEntityId(vcs.laneId);
-      result.addFacts.push({ e: lid, a: "type", v: "AgentLane" }, { e: lid, a: "status", v: "active" }, { e: lid, a: "createdAt", v: op.timestamp }, { e: lid, a: "createdBy", v: op.agentId });
+      result.addFacts.push(
+        { e: lid, a: "type", v: "AgentLane" },
+        { e: lid, a: "status", v: "active" },
+        { e: lid, a: "createdAt", v: op.timestamp },
+        { e: lid, a: "createdBy", v: op.agentId }
+      );
       if (vcs.baseBranch) {
         result.addFacts.push({ e: lid, a: "baseBranch", v: vcs.baseBranch });
       }
@@ -459,8 +496,7 @@ function decompose(op) {
       break;
     }
     case "vcs:laneDrop": {
-      if (!vcs.laneId)
-        break;
+      if (!vcs.laneId) break;
       const lid = laneEntityId(vcs.laneId);
       if (vcs.laneStatus) {
         result.deleteFacts.push({ e: lid, a: "status", v: "active" });
@@ -469,16 +505,14 @@ function decompose(op) {
       break;
     }
     case "vcs:lanePromoteStart": {
-      if (!vcs.laneId)
-        break;
+      if (!vcs.laneId) break;
       const lid = laneEntityId(vcs.laneId);
       result.deleteFacts.push({ e: lid, a: "status", v: "active" });
       result.addFacts.push({ e: lid, a: "status", v: "promoting" });
       break;
     }
     case "vcs:lanePromoteComplete": {
-      if (!vcs.laneId)
-        break;
+      if (!vcs.laneId) break;
       const lid = laneEntityId(vcs.laneId);
       result.deleteFacts.push({ e: lid, a: "status", v: "promoting" });
       result.addFacts.push({ e: lid, a: "status", v: "promoted" });
@@ -488,13 +522,13 @@ function decompose(op) {
       break;
     }
     case "vcs:lanePromoteAbort": {
-      if (!vcs.laneId)
-        break;
+      if (!vcs.laneId) break;
       const lid = laneEntityId(vcs.laneId);
       result.deleteFacts.push({ e: lid, a: "status", v: "promoting" });
       result.addFacts.push({ e: lid, a: "status", v: "active" });
       break;
     }
+    // ----- EAV store (CMS / knowledge graph) -----
     case "vcs:storeAssert": {
       result.addFacts.push(...pickFacts(vcs.facts));
       break;
@@ -514,89 +548,120 @@ function decompose(op) {
   }
   return result;
 }
-var init_decompose = __esm(() => {
-  init_types();
+var init_decompose = __esm({
+  "src/vcs/decompose.ts"() {
+    "use strict";
+    init_types();
+  }
 });
 
 // src/vcs/blob-store.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
-
-class BlobStore {
-  blobDir;
-  constructor(trellisDir) {
-    this.blobDir = join(trellisDir, "blobs");
-    if (!existsSync(this.blobDir)) {
-      mkdirSync(this.blobDir, { recursive: true });
-    }
-  }
-  async put(content) {
-    const hash = await this.hash(content);
-    const blobPath = join(this.blobDir, hash);
-    if (!existsSync(blobPath)) {
-      writeFileSync(blobPath, content);
-    }
-    return hash;
-  }
-  putSync(content) {
-    const hash = this.hashSync(content);
-    const blobPath = join(this.blobDir, hash);
-    if (!existsSync(blobPath)) {
-      writeFileSync(blobPath, content);
-    }
-    return hash;
-  }
-  get(hash) {
-    const blobPath = join(this.blobDir, hash);
-    if (!existsSync(blobPath)) {
-      return null;
-    }
-    return readFileSync(blobPath);
-  }
-  has(hash) {
-    return existsSync(join(this.blobDir, hash));
-  }
-  async hash(content) {
-    const hashBuffer = await crypto.subtle.digest("SHA-256", content);
-    return this.hexFromBuffer(hashBuffer);
-  }
-  hashSync(content) {
-    if (typeof globalThis.Bun !== "undefined") {
-      const hasher = new globalThis.Bun.CryptoHasher("sha256");
-      hasher.update(content);
-      return hasher.digest("hex");
-    }
-    const { createHash } = __require("crypto");
-    return createHash("sha256").update(content).digest("hex");
-  }
-  count() {
-    try {
-      const { readdirSync } = __require("fs");
-      return readdirSync(this.blobDir).length;
-    } catch {
-      return 0;
-    }
-  }
-  totalSize() {
-    try {
-      const { readdirSync, statSync } = __require("fs");
-      const files = readdirSync(this.blobDir);
-      return files.reduce((sum, f) => {
+var BlobStore;
+var init_blob_store = __esm({
+  "src/vcs/blob-store.ts"() {
+    "use strict";
+    BlobStore = class {
+      blobDir;
+      constructor(trellisDir) {
+        this.blobDir = join(trellisDir, "blobs");
+        if (!existsSync(this.blobDir)) {
+          mkdirSync(this.blobDir, { recursive: true });
+        }
+      }
+      /**
+       * Store content and return its SHA-256 hash.
+       * Idempotent — storing the same content twice is a no-op.
+       */
+      async put(content) {
+        const hash = await this.hash(content);
+        const blobPath = join(this.blobDir, hash);
+        if (!existsSync(blobPath)) {
+          writeFileSync(blobPath, content);
+        }
+        return hash;
+      }
+      /**
+       * Synchronous put — uses Bun's sync crypto if available.
+       */
+      putSync(content) {
+        const hash = this.hashSync(content);
+        const blobPath = join(this.blobDir, hash);
+        if (!existsSync(blobPath)) {
+          writeFileSync(blobPath, content);
+        }
+        return hash;
+      }
+      /**
+       * Retrieve content by hash. Returns null if not found.
+       */
+      get(hash) {
+        const blobPath = join(this.blobDir, hash);
+        if (!existsSync(blobPath)) {
+          return null;
+        }
+        return readFileSync(blobPath);
+      }
+      /**
+       * Check if a blob exists.
+       */
+      has(hash) {
+        return existsSync(join(this.blobDir, hash));
+      }
+      /**
+       * Compute SHA-256 hash of content (async).
+       */
+      async hash(content) {
+        const hashBuffer = await crypto.subtle.digest(
+          "SHA-256",
+          content
+        );
+        return this.hexFromBuffer(hashBuffer);
+      }
+      /**
+       * Compute SHA-256 hash of content (sync).
+       * Uses Bun.CryptoHasher when running under Bun, else node:crypto.
+       */
+      hashSync(content) {
+        const { createHash } = __require("crypto");
+        return createHash("sha256").update(content).digest("hex");
+      }
+      /**
+       * Returns the number of blobs stored.
+       */
+      count() {
         try {
-          return sum + statSync(join(this.blobDir, f)).size;
+          const { readdirSync: readdirSync2 } = __require("fs");
+          return readdirSync2(this.blobDir).length;
         } catch {
-          return sum;
+          return 0;
         }
-      }, 0);
-    } catch {
-      return 0;
-    }
-  }
-  hexFromBuffer(buffer) {
-    return Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join("");
+      }
+      /**
+       * Returns the total size of all blobs in bytes.
+       */
+      totalSize() {
+        try {
+          const { readdirSync: readdirSync2, statSync } = __require("fs");
+          const files = readdirSync2(this.blobDir);
+          return files.reduce((sum, f) => {
+            try {
+              return sum + statSync(join(this.blobDir, f)).size;
+            } catch {
+              return sum;
+            }
+          }, 0);
+        } catch {
+          return 0;
+        }
+      }
+      hexFromBuffer(buffer) {
+        return Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join("");
+      }
+    };
   }
-}
-var init_blob_store = () => {};
+});
 
 // src/vcs/branch.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
@@ -676,19 +741,23 @@ function loadBranchState(rootPath) {
           activeLaneId: state.activeLaneId
         };
       }
-    } catch {}
+    } catch {
+    }
   }
   return { currentBranch: "main" };
 }
 var BRANCH_ADVANCE_SKIP_KINDS;
-var init_branch = __esm(() => {
-  init_ops();
-  BRANCH_ADVANCE_SKIP_KINDS = new Set([
-    "vcs:branchAdvance",
-    "vcs:branchCreate",
-    "vcs:branchDelete",
-    "vcs:checkpointCreate"
-  ]);
+var init_branch = __esm({
+  "src/vcs/branch.ts"() {
+    "use strict";
+    init_ops();
+    BRANCH_ADVANCE_SKIP_KINDS = /* @__PURE__ */ new Set([
+      "vcs:branchAdvance",
+      "vcs:branchCreate",
+      "vcs:branchDelete",
+      "vcs:checkpointCreate"
+    ]);
+  }
 });
 
 // src/vcs/milestone.ts
@@ -715,7 +784,9 @@ async function createMilestone(ctx, message, opts) {
   const toIdx = ops.findIndex((o) => o.hash === toOpHash);
   const rangeOps = fromIdx >= 0 && toIdx >= 0 ? ops.slice(fromIdx, toIdx + 1) : ops;
   const affectedFiles = [
-    ...new Set(rangeOps.filter((o) => o.vcs?.filePath).map((o) => o.vcs.filePath))
+    ...new Set(
+      rangeOps.filter((o) => o.vcs?.filePath).map((o) => o.vcs.filePath)
+    )
   ];
   const op = await createVcsOp("vcs:milestoneCreate", {
     agentId: ctx.agentId,
@@ -750,8 +821,11 @@ function listMilestones(ctx) {
     };
   });
 }
-var init_milestone = __esm(() => {
-  init_ops();
+var init_milestone = __esm({
+  "src/vcs/milestone.ts"() {
+    "use strict";
+    init_ops();
+  }
 });
 
 // src/vcs/checkpoint.ts
@@ -777,16 +851,18 @@ function listCheckpoints(ctx) {
     };
   });
 }
-var init_checkpoint = __esm(() => {
-  init_ops();
+var init_checkpoint = __esm({
+  "src/vcs/checkpoint.ts"() {
+    "use strict";
+    init_ops();
+  }
 });
 
 // src/vcs/diff.ts
 function diffFileStates(stateA, stateB, blobStore) {
   const diffs = [];
   for (const [path, bState] of stateB) {
-    if (bState.deleted)
-      continue;
+    if (bState.deleted) continue;
     const aState = stateA.get(path);
     if (!aState || aState.deleted) {
       diffs.push({
@@ -805,15 +881,18 @@ function diffFileStates(stateA, stateB, blobStore) {
         const oldContent = blobStore.get(aState.contentHash);
         const newContent = blobStore.get(bState.contentHash);
         if (oldContent && newContent) {
-          diff.unifiedDiff = generateUnifiedDiff(path, oldContent.toString("utf-8"), newContent.toString("utf-8"));
+          diff.unifiedDiff = generateUnifiedDiff(
+            path,
+            oldContent.toString("utf-8"),
+            newContent.toString("utf-8")
+          );
         }
       }
       diffs.push(diff);
     }
   }
   for (const [path, aState] of stateA) {
-    if (aState.deleted)
-      continue;
+    if (aState.deleted) continue;
     const bState = stateB.get(path);
     if (!bState || bState.deleted) {
       diffs.push({
@@ -836,7 +915,7 @@ function diffFileStates(stateA, stateB, blobStore) {
   };
 }
 function buildFileStateAtOp(ops, atOpHash) {
-  const state = new Map;
+  const state = /* @__PURE__ */ new Map();
   for (const op of ops) {
     if (op.vcs?.filePath) {
       switch (op.kind) {
@@ -855,8 +934,7 @@ function buildFileStateAtOp(ops, atOpHash) {
           break;
       }
     }
-    if (atOpHash && op.hash === atOpHash)
-      break;
+    if (atOpHash && op.hash === atOpHash) break;
   }
   return state;
 }
@@ -866,17 +944,16 @@ function diffOpRange(ops, fromHash, toHash, blobStore) {
   return diffFileStates(stateA, stateB, blobStore);
 }
 function generateUnifiedDiff(filePath, oldText, newText, contextLines = 3) {
-  const oldLines = oldText.split(`
-`);
-  const newLines = newText.split(`
-`);
+  const oldLines = oldText.split("\n");
+  const newLines = newText.split("\n");
   const edits = myersDiff(oldLines, newLines);
   const hunks = buildHunks(edits, contextLines);
-  if (hunks.length === 0)
-    return "";
+  if (hunks.length === 0) return "";
   const lines = [`--- a/${filePath}`, `+++ b/${filePath}`];
   for (const hunk of hunks) {
-    lines.push(`@@ -${hunk.oldStart},${hunk.oldCount} +${hunk.newStart},${hunk.newCount} @@`);
+    lines.push(
+      `@@ -${hunk.oldStart},${hunk.oldCount} +${hunk.newStart},${hunk.newCount} @@`
+    );
     for (const edit of hunk.edits) {
       switch (edit.kind) {
         case "equal":
@@ -891,14 +968,12 @@ function generateUnifiedDiff(filePath, oldText, newText, contextLines = 3) {
       }
     }
   }
-  return lines.join(`
-`);
+  return lines.join("\n");
 }
 function myersDiff(oldLines, newLines) {
   const n = oldLines.length;
   const m = newLines.length;
-  if (n === 0 && m === 0)
-    return [];
+  if (n === 0 && m === 0) return [];
   if (n === 0)
     return newLines.map((line) => ({ kind: "insert", line }));
   if (m === 0)
@@ -908,30 +983,28 @@ function myersDiff(oldLines, newLines) {
   const v = new Int32Array(size);
   const trace = [];
   const off = max;
-  outer:
-    for (let d = 0;d <= max; d++) {
-      trace.push(v.slice());
-      for (let k = -d;k <= d; k += 2) {
-        let x2;
-        if (k === -d || k !== d && v[k - 1 + off] < v[k + 1 + off]) {
-          x2 = v[k + 1 + off];
-        } else {
-          x2 = v[k - 1 + off] + 1;
-        }
-        let y2 = x2 - k;
-        while (x2 < n && y2 < m && oldLines[x2] === newLines[y2]) {
-          x2++;
-          y2++;
-        }
-        v[k + off] = x2;
-        if (x2 >= n && y2 >= m)
-          break outer;
+  outer: for (let d = 0; d <= max; d++) {
+    trace.push(v.slice());
+    for (let k = -d; k <= d; k += 2) {
+      let x2;
+      if (k === -d || k !== d && v[k - 1 + off] < v[k + 1 + off]) {
+        x2 = v[k + 1 + off];
+      } else {
+        x2 = v[k - 1 + off] + 1;
       }
+      let y2 = x2 - k;
+      while (x2 < n && y2 < m && oldLines[x2] === newLines[y2]) {
+        x2++;
+        y2++;
+      }
+      v[k + off] = x2;
+      if (x2 >= n && y2 >= m) break outer;
     }
+  }
   let x = n;
   let y = m;
   const edits = [];
-  for (let d = trace.length - 1;d >= 0; d--) {
+  for (let d = trace.length - 1; d >= 0; d--) {
     const tv = trace[d];
     const k = x - y;
     let prevK;
@@ -967,22 +1040,23 @@ function myersDiff(oldLines, newLines) {
   return edits;
 }
 function buildHunks(edits, contextLines) {
-  if (edits.length === 0)
-    return [];
+  if (edits.length === 0) return [];
   const changeIndices = [];
-  for (let i = 0;i < edits.length; i++) {
+  for (let i = 0; i < edits.length; i++) {
     if (edits[i].kind !== "equal") {
       changeIndices.push(i);
     }
   }
-  if (changeIndices.length === 0)
-    return [];
+  if (changeIndices.length === 0) return [];
   const hunks = [];
   let hunkStart = Math.max(0, changeIndices[0] - contextLines);
   let hunkEnd = Math.min(edits.length - 1, changeIndices[0] + contextLines);
-  for (let i = 1;i < changeIndices.length; i++) {
+  for (let i = 1; i < changeIndices.length; i++) {
     const changeStart = changeIndices[i] - contextLines;
-    const changeEnd = Math.min(edits.length - 1, changeIndices[i] + contextLines);
+    const changeEnd = Math.min(
+      edits.length - 1,
+      changeIndices[i] + contextLines
+    );
     if (changeStart <= hunkEnd + 1) {
       hunkEnd = changeEnd;
     } else {
@@ -998,19 +1072,15 @@ function createHunk(edits, start, end) {
   const hunkEdits = edits.slice(start, end + 1);
   let oldLine = 1;
   let newLine = 1;
-  for (let i = 0;i < start; i++) {
-    if (edits[i].kind === "equal" || edits[i].kind === "delete")
-      oldLine++;
-    if (edits[i].kind === "equal" || edits[i].kind === "insert")
-      newLine++;
+  for (let i = 0; i < start; i++) {
+    if (edits[i].kind === "equal" || edits[i].kind === "delete") oldLine++;
+    if (edits[i].kind === "equal" || edits[i].kind === "insert") newLine++;
   }
   let oldCount = 0;
   let newCount = 0;
   for (const edit of hunkEdits) {
-    if (edit.kind === "equal" || edit.kind === "delete")
-      oldCount++;
-    if (edit.kind === "equal" || edit.kind === "insert")
-      newCount++;
+    if (edit.kind === "equal" || edit.kind === "delete") oldCount++;
+    if (edit.kind === "equal" || edit.kind === "insert") newCount++;
   }
   return {
     oldStart: oldLine,
@@ -1020,28 +1090,22 @@ function createHunk(edits, start, end) {
     edits: hunkEdits
   };
 }
-var init_diff = () => {};
+var init_diff = __esm({
+  "src/vcs/diff.ts"() {
+    "use strict";
+  }
+});
 
 // src/vcs/merge.ts
 function threeWayMerge(base, ours, theirs, blobStore) {
-  const mergedFiles = new Map;
+  const mergedFiles = /* @__PURE__ */ new Map();
   const conflicts = [];
-  const allPaths = new Set;
-  for (const [p, s] of base)
-    if (!s.deleted)
-      allPaths.add(p);
-  for (const [p, s] of ours)
-    if (!s.deleted)
-      allPaths.add(p);
-  for (const [p, s] of theirs)
-    if (!s.deleted)
-      allPaths.add(p);
-  for (const [p, s] of ours)
-    if (s.deleted)
-      allPaths.add(p);
-  for (const [p, s] of theirs)
-    if (s.deleted)
-      allPaths.add(p);
+  const allPaths = /* @__PURE__ */ new Set();
+  for (const [p, s] of base) if (!s.deleted) allPaths.add(p);
+  for (const [p, s] of ours) if (!s.deleted) allPaths.add(p);
+  for (const [p, s] of theirs) if (!s.deleted) allPaths.add(p);
+  for (const [p, s] of ours) if (s.deleted) allPaths.add(p);
+  for (const [p, s] of theirs) if (s.deleted) allPaths.add(p);
   for (const path of allPaths) {
     const b = base.get(path);
     const o = ours.get(path);
@@ -1049,9 +1113,9 @@ function threeWayMerge(base, ours, theirs, blobStore) {
     const baseExists = b && !b.deleted;
     const oursExists = o && !o.deleted;
     const theirsExists = t && !t.deleted;
-    const baseHash = baseExists ? b.contentHash : undefined;
-    const oursHash = oursExists ? o.contentHash : undefined;
-    const theirsHash = theirsExists ? t.contentHash : undefined;
+    const baseHash = baseExists ? b.contentHash : void 0;
+    const oursHash = oursExists ? o.contentHash : void 0;
+    const theirsHash = theirsExists ? t.contentHash : void 0;
     if (oursHash === theirsHash) {
       continue;
     }
@@ -1076,9 +1140,9 @@ function threeWayMerge(base, ours, theirs, blobStore) {
       if (oursHash === theirsHash) {
         continue;
       }
-      const oursContent = oursHash && blobStore ? blobStore.get(oursHash)?.toString("utf-8") : undefined;
-      const theirsContent = theirsHash && blobStore ? blobStore.get(theirsHash)?.toString("utf-8") : undefined;
-      if (oursContent !== undefined && theirsContent !== undefined) {
+      const oursContent = oursHash && blobStore ? blobStore.get(oursHash)?.toString("utf-8") : void 0;
+      const theirsContent = theirsHash && blobStore ? blobStore.get(theirsHash)?.toString("utf-8") : void 0;
+      if (oursContent !== void 0 && theirsContent !== void 0) {
         const textResult = threeWayTextMerge("", oursContent, theirsContent);
         if (textResult.clean) {
           mergedFiles.set(path, textResult.merged);
@@ -1100,7 +1164,7 @@ function threeWayMerge(base, ours, theirs, blobStore) {
       conflicts.push({
         path,
         kind: "modify-delete",
-        ours: oursHash && blobStore ? blobStore.get(oursHash)?.toString("utf-8") : undefined
+        ours: oursHash && blobStore ? blobStore.get(oursHash)?.toString("utf-8") : void 0
       });
       continue;
     }
@@ -1108,15 +1172,15 @@ function threeWayMerge(base, ours, theirs, blobStore) {
       conflicts.push({
         path,
         kind: "modify-delete",
-        theirs: theirsHash && blobStore ? blobStore.get(theirsHash)?.toString("utf-8") : undefined
+        theirs: theirsHash && blobStore ? blobStore.get(theirsHash)?.toString("utf-8") : void 0
       });
       continue;
     }
     if (oursExists && theirsExists && oursHash !== theirsHash) {
-      const baseContent = baseHash && blobStore ? blobStore.get(baseHash)?.toString("utf-8") : undefined;
-      const oursContent = oursHash && blobStore ? blobStore.get(oursHash)?.toString("utf-8") : undefined;
-      const theirsContent = theirsHash && blobStore ? blobStore.get(theirsHash)?.toString("utf-8") : undefined;
-      if (baseContent !== undefined && oursContent !== undefined && theirsContent !== undefined) {
+      const baseContent = baseHash && blobStore ? blobStore.get(baseHash)?.toString("utf-8") : void 0;
+      const oursContent = oursHash && blobStore ? blobStore.get(oursHash)?.toString("utf-8") : void 0;
+      const theirsContent = theirsHash && blobStore ? blobStore.get(theirsHash)?.toString("utf-8") : void 0;
+      if (baseContent !== void 0 && oursContent !== void 0 && theirsContent !== void 0) {
         const textResult = threeWayTextMerge(baseContent, oursContent, theirsContent);
         if (textResult.clean) {
           mergedFiles.set(path, textResult.merged);
@@ -1151,18 +1215,16 @@ function threeWayMerge(base, ours, theirs, blobStore) {
     stats: {
       added,
       modified: added,
+      // in a merge context, additions from theirs are "modified"
       deleted,
       conflicted: conflicts.length
     }
   };
 }
 function threeWayTextMerge(baseText, oursText, theirsText) {
-  const baseLines = baseText.split(`
-`);
-  const oursLines = oursText.split(`
-`);
-  const theirsLines = theirsText.split(`
-`);
+  const baseLines = baseText.split("\n");
+  const oursLines = oursText.split("\n");
+  const theirsLines = theirsText.split("\n");
   const oursChanges = computeLineChanges(baseLines, oursLines);
   const theirsChanges = computeLineChanges(baseLines, theirsLines);
   const result = [];
@@ -1198,9 +1260,7 @@ function threeWayTextMerge(baseText, oursText, theirsText) {
       oursIdx += theirsChange.baseCount;
       theirsIdx += theirsChange.newCount;
     } else if (oursChange && theirsChange) {
-      if (oursChange.baseCount === theirsChange.baseCount && oursChange.newLines.join(`
-`) === theirsChange.newLines.join(`
-`)) {
+      if (oursChange.baseCount === theirsChange.baseCount && oursChange.newLines.join("\n") === theirsChange.newLines.join("\n")) {
         applyChange(oursChange, result);
         baseIdx += oursChange.baseCount;
         oursIdx += oursChange.newCount;
@@ -1208,11 +1268,9 @@ function threeWayTextMerge(baseText, oursText, theirsText) {
       } else {
         clean = false;
         result.push("<<<<<<< ours");
-        for (const line of oursChange.newLines)
-          result.push(line);
+        for (const line of oursChange.newLines) result.push(line);
         result.push("=======");
-        for (const line of theirsChange.newLines)
-          result.push(line);
+        for (const line of theirsChange.newLines) result.push(line);
         result.push(">>>>>>> theirs");
         baseIdx += Math.max(oursChange.baseCount, theirsChange.baseCount);
         oursIdx += oursChange.newCount;
@@ -1220,8 +1278,7 @@ function threeWayTextMerge(baseText, oursText, theirsText) {
       }
     }
   }
-  return { clean, merged: result.join(`
-`) };
+  return { clean, merged: result.join("\n") };
 }
 function applyChange(change, result) {
   for (const line of change.newLines) {
@@ -1229,7 +1286,7 @@ function applyChange(change, result) {
   }
 }
 function computeLineChanges(baseLines, newLines) {
-  const changes = new Map;
+  const changes = /* @__PURE__ */ new Map();
   const matches = lcsMatch(baseLines, newLines);
   let baseIdx = 0;
   let newIdx = 0;
@@ -1266,11 +1323,13 @@ function computeLineChanges(baseLines, newLines) {
 function lcsMatch(a, b) {
   const n = a.length;
   const m = b.length;
-  if (n === 0 || m === 0)
-    return [];
-  const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
-  for (let i2 = 1;i2 <= n; i2++) {
-    for (let j2 = 1;j2 <= m; j2++) {
+  if (n === 0 || m === 0) return [];
+  const dp = Array.from(
+    { length: n + 1 },
+    () => new Array(m + 1).fill(0)
+  );
+  for (let i2 = 1; i2 <= n; i2++) {
+    for (let j2 = 1; j2 <= m; j2++) {
       if (a[i2 - 1] === b[j2 - 1]) {
         dp[i2][j2] = dp[i2 - 1][j2 - 1] + 1;
       } else {
@@ -1294,7 +1353,11 @@ function lcsMatch(a, b) {
   }
   return matches;
 }
-var init_merge = () => {};
+var init_merge = __esm({
+  "src/vcs/merge.ts"() {
+    "use strict";
+  }
+});
 
 // src/vcs/issue.ts
 import { exec } from "child_process";
@@ -1315,10 +1378,9 @@ function getIssueCounterPath(rootPath) {
 function nextIssueId(rootPath) {
   const counterPath = getIssueCounterPath(rootPath);
   const dir = dirname2(counterPath);
-  if (!existsSync3(dir))
-    mkdirSync2(dir, { recursive: true });
+  if (!existsSync3(dir)) mkdirSync2(dir, { recursive: true });
   const lockPath = `${counterPath}.lock`;
-  const deadline = Date.now() + 5000;
+  const deadline = Date.now() + 5e3;
   let lockFd;
   while (Date.now() < deadline) {
     try {
@@ -1330,15 +1392,18 @@ function nextIssueId(rootPath) {
       }
     }
   }
-  if (lockFd === undefined) {
-    throw new Error(`Timed out waiting for issue counter lock: ${lockPath}. Another Trellis process may be stalled.`);
+  if (lockFd === void 0) {
+    throw new Error(
+      `Timed out waiting for issue counter lock: ${lockPath}. Another Trellis process may be stalled.`
+    );
   }
   try {
     let counter = 0;
     if (existsSync3(counterPath)) {
       try {
         counter = JSON.parse(readFileSync3(counterPath, "utf-8")).counter ?? 0;
-      } catch {}
+      } catch {
+      }
     }
     counter++;
     writeFileSync3(counterPath, JSON.stringify({ counter }, null, 2));
@@ -1347,13 +1412,14 @@ function nextIssueId(rootPath) {
     closeSync(lockFd);
     try {
       unlinkSync(lockPath);
-    } catch {}
+    } catch {
+    }
   }
 }
 function getIssueFact(ctx, entityId, attr) {
   const facts = ctx.store.getFactsByEntity(entityId);
   const matches = facts.filter((f) => f.a === attr);
-  return matches.length > 0 ? matches[matches.length - 1].v : undefined;
+  return matches.length > 0 ? matches[matches.length - 1].v : void 0;
 }
 function getIssueLinks(ctx, entityId, attr) {
   const links = ctx.store.getLinksByEntity(entityId);
@@ -1367,7 +1433,7 @@ function getCriteriaForIssue(ctx, issueId) {
     const facts = ctx.store.getFactsByEntity(ceid);
     const getLast = (a) => {
       const matches = facts.filter((f) => f.a === a);
-      return matches.length > 0 ? matches[matches.length - 1].v : undefined;
+      return matches.length > 0 ? matches[matches.length - 1].v : void 0;
     };
     return {
       id: ceid,
@@ -1383,14 +1449,14 @@ function buildIssueInfo(ctx, entityId) {
   const facts = ctx.store.getFactsByEntity(entityId);
   const get = (a) => {
     const matches = facts.filter((f) => f.a === a);
-    return matches.length > 0 ? matches[matches.length - 1].v : undefined;
+    return matches.length > 0 ? matches[matches.length - 1].v : void 0;
   };
   const labelsStr = get("labels");
   const labels = labelsStr ? labelsStr.split(",").filter(Boolean) : [];
   const trackedOnLinks = getIssueLinks(ctx, entityId, "trackedOn");
-  const branchName = trackedOnLinks.length > 0 ? trackedOnLinks[0].replace(/^branch:/, "") : undefined;
+  const branchName = trackedOnLinks.length > 0 ? trackedOnLinks[0].replace(/^branch:/, "") : void 0;
   const childOfLinks = getIssueLinks(ctx, entityId, "childOf");
-  const parentId = childOfLinks.length > 0 ? childOfLinks[0].replace(/^issue:/, "") : undefined;
+  const parentId = childOfLinks.length > 0 ? childOfLinks[0].replace(/^issue:/, "") : void 0;
   const bareId = entityId.replace(/^issue:/, "");
   const blockedByLinks = getIssueLinks(ctx, entityId, "blockedBy");
   const blockedBy = blockedByLinks.map((e) => e.replace(/^issue:/, ""));
@@ -1412,7 +1478,7 @@ function buildIssueInfo(ctx, entityId) {
     createdBy: get("createdBy"),
     startedAt: get("startedAt"),
     pausedAt: get("pausedAt"),
-    pauseNote: get("pauseNote") || undefined,
+    pauseNote: get("pauseNote") || void 0,
     closedAt: get("closedAt"),
     parentId,
     branchName,
@@ -1440,8 +1506,13 @@ async function createIssue(ctx, rootPath, title, opts) {
   });
   await ctx.applyOp(op);
   if (opts?.criteria) {
-    for (let i = 0;i < opts.criteria.length; i++) {
-      await addCriterion(ctx, id, opts.criteria[i].description, opts.criteria[i].command);
+    for (let i = 0; i < opts.criteria.length; i++) {
+      await addCriterion(
+        ctx,
+        id,
+        opts.criteria[i].description,
+        opts.criteria[i].command
+      );
     }
   }
   return op;
@@ -1452,21 +1523,16 @@ async function updateIssue(ctx, id, updates) {
     throw new Error(`Issue ${id} not found.`);
   }
   const vcs = { issueId: id };
-  if (updates.title !== undefined)
-    vcs.issueTitle = updates.title;
-  if (updates.description !== undefined)
-    vcs.issueDescription = updates.description;
-  if (updates.status !== undefined) {
+  if (updates.title !== void 0) vcs.issueTitle = updates.title;
+  if (updates.description !== void 0) vcs.issueDescription = updates.description;
+  if (updates.status !== void 0) {
     vcs.oldIssueStatus = getIssueFact(ctx, issueEntityId(id), "status");
     vcs.issueStatus = updates.status;
   }
-  if (updates.priority !== undefined)
-    vcs.issuePriority = updates.priority;
-  if (updates.labels !== undefined)
-    vcs.issueLabels = updates.labels;
-  if (updates.assignee !== undefined)
-    vcs.issueAssignee = updates.assignee;
-  if (updates.parentId !== undefined) {
+  if (updates.priority !== void 0) vcs.issuePriority = updates.priority;
+  if (updates.labels !== void 0) vcs.issueLabels = updates.labels;
+  if (updates.assignee !== void 0) vcs.issueAssignee = updates.assignee;
+  if (updates.parentId !== void 0) {
     const newParent = updates.parentId;
     if (newParent === id) {
       throw new Error(`Issue ${id} cannot be its own parent.`);
@@ -1479,10 +1545,8 @@ async function updateIssue(ctx, id, updates) {
     }
     const currentParent = issue.parentId;
     if (newParent !== currentParent) {
-      if (currentParent)
-        vcs.oldParentIssueId = currentParent;
-      if (newParent)
-        vcs.parentIssueId = newParent;
+      if (currentParent) vcs.oldParentIssueId = currentParent;
+      if (newParent) vcs.parentIssueId = newParent;
     }
   }
   const op = await createVcsOp("vcs:issueUpdate", {
@@ -1517,12 +1581,16 @@ async function startIssue(ctx, id, branchName) {
 }
 async function pauseIssue(ctx, id, note) {
   if (!note || !note.trim()) {
-    throw new Error(`A pause note is required. Explain why the issue is paused and what must happen before resuming.`);
+    throw new Error(
+      `A pause note is required. Explain why the issue is paused and what must happen before resuming.`
+    );
   }
   const eid = issueEntityId(id);
   const status = getIssueFact(ctx, eid, "status");
   if (status !== "in_progress") {
-    throw new Error(`Cannot pause issue ${id} \u2014 status is '${status}', expected 'in_progress'.`);
+    throw new Error(
+      `Cannot pause issue ${id} \u2014 status is '${status}', expected 'in_progress'.`
+    );
   }
   const op = await createVcsOp("vcs:issuePause", {
     agentId: ctx.agentId,
@@ -1540,7 +1608,9 @@ async function resumeIssue(ctx, id) {
   const eid = issueEntityId(id);
   const status = getIssueFact(ctx, eid, "status");
   if (status !== "paused") {
-    throw new Error(`Cannot resume issue ${id} \u2014 status is '${status}', expected 'paused'.`);
+    throw new Error(
+      `Cannot resume issue ${id} \u2014 status is '${status}', expected 'paused'.`
+    );
   }
   const op = await createVcsOp("vcs:issueResume", {
     agentId: ctx.agentId,
@@ -1566,9 +1636,10 @@ async function closeIssue(ctx, id, opts) {
   const allPassed = results.length === 0 || results.every((r) => r.status === "passed");
   if (!allPassed) {
     const failing = results.filter((r) => r.status !== "passed");
-    throw new Error(`Cannot close issue ${id}: ${failing.length} criteria not passing:
-` + failing.map((f) => `  - ${f.description ?? f.id} (${f.status})`).join(`
-`));
+    throw new Error(
+      `Cannot close issue ${id}: ${failing.length} criteria not passing:
+` + failing.map((f) => `  - ${f.description ?? f.id} (${f.status})`).join("\n")
+    );
   }
   if (!opts?.confirm) {
     return { criteriaResults: results };
@@ -1590,7 +1661,9 @@ async function triageIssue(ctx, id) {
   const eid = issueEntityId(id);
   const status = getIssueFact(ctx, eid, "status");
   if (status !== "backlog") {
-    throw new Error(`Cannot triage issue ${id} \u2014 status is '${status}', expected 'backlog'.`);
+    throw new Error(
+      `Cannot triage issue ${id} \u2014 status is '${status}', expected 'backlog'.`
+    );
   }
   const op = await createVcsOp("vcs:issueUpdate", {
     agentId: ctx.agentId,
@@ -1608,7 +1681,9 @@ async function reopenIssue(ctx, id) {
   const eid = issueEntityId(id);
   const status = getIssueFact(ctx, eid, "status");
   if (status !== "closed") {
-    throw new Error(`Cannot reopen issue ${id} \u2014 status is '${status}', expected 'closed'.`);
+    throw new Error(
+      `Cannot reopen issue ${id} \u2014 status is '${status}', expected 'closed'.`
+    );
   }
   const op = await createVcsOp("vcs:issueReopen", {
     agentId: ctx.agentId,
@@ -1670,7 +1745,9 @@ async function addCriterion(ctx, issueId, description, command) {
 async function setCriterionStatus(ctx, issueId, criterionIndex, status) {
   const criteria = getCriteriaForIssue(ctx, issueId);
   if (criterionIndex < 1 || criterionIndex > criteria.length) {
-    throw new Error(`Criterion index ${criterionIndex} out of range (1\u2013${criteria.length})`);
+    throw new Error(
+      `Criterion index ${criterionIndex} out of range (1\u2013${criteria.length})`
+    );
   }
   const c = criteria[criterionIndex - 1];
   const op = await createVcsOp("vcs:criterionUpdate", {
@@ -1703,15 +1780,13 @@ async function runCriteria(ctx, issueId, rootPath) {
     try {
       const result = await execAsync(c.command, {
         cwd: rootPath,
-        timeout: 120000
+        timeout: 12e4
       });
-      output = (result.stdout + `
-` + result.stderr).trim();
+      output = (result.stdout + "\n" + result.stderr).trim();
       exitCode = 0;
       status = "passed";
     } catch (err) {
-      output = (err.stdout ?? "") + `
-` + (err.stderr ?? err.message ?? "");
+      output = (err.stdout ?? "") + "\n" + (err.stderr ?? err.message ?? "");
       output = output.trim();
       exitCode = err.code ?? 1;
       status = "failed";
@@ -1752,7 +1827,7 @@ function listIssues(ctx, filters) {
   if (filters?.parentId) {
     issues = issues.filter((i) => i.parentId === filters.parentId);
   }
-  if (filters?.blocked !== undefined) {
+  if (filters?.blocked !== void 0) {
     issues = issues.filter((i) => i.isBlocked === filters.blocked);
   }
   return issues;
@@ -1760,8 +1835,7 @@ function listIssues(ctx, filters) {
 function getIssue(ctx, id) {
   const eid = issueEntityId(id);
   const typeFact = ctx.store.getFactsByEntity(eid).find((f) => f.a === "type" && f.v === "Issue");
-  if (!typeFact)
-    return null;
+  if (!typeFact) return null;
   return buildIssueInfo(ctx, eid);
 }
 function getActiveIssues(ctx) {
@@ -1779,23 +1853,31 @@ function checkCompletionReadiness(ctx) {
   } else {
     parts.push("\u2717 Not ready for completion:");
     if (queue.length > 0) {
-      parts.push(`  Queue (${queue.length}): ${queue.map((i) => i.id).join(", ")}`);
+      parts.push(
+        `  Queue (${queue.length}): ${queue.map((i) => i.id).join(", ")}`
+      );
     }
     if (inProgress.length > 0) {
-      parts.push(`  In progress (${inProgress.length}): ${inProgress.map((i) => i.id).join(", ")}`);
+      parts.push(
+        `  In progress (${inProgress.length}): ${inProgress.map((i) => i.id).join(", ")}`
+      );
     }
     if (paused.length > 0) {
-      parts.push(`  Paused (${paused.length}): ${paused.map((i) => `${i.id}${i.pauseNote ? ` \u2014 ${i.pauseNote}` : ""}`).join(", ")}`);
+      parts.push(
+        `  Paused (${paused.length}): ${paused.map((i) => `${i.id}${i.pauseNote ? ` \u2014 ${i.pauseNote}` : ""}`).join(", ")}`
+      );
     }
   }
-  return { ready, queue, paused, inProgress, summary: parts.join(`
-`) };
+  return { ready, queue, paused, inProgress, summary: parts.join("\n") };
 }
 var execAsync;
-var init_issue = __esm(() => {
-  init_ops();
-  init_types();
-  execAsync = promisify(exec);
+var init_issue = __esm({
+  "src/vcs/issue.ts"() {
+    "use strict";
+    init_ops();
+    init_types();
+    execAsync = promisify(exec);
+  }
 });
 
 // src/vcs/op-log.ts
@@ -1813,172 +1895,179 @@ import {
 import { dirname as dirname3 } from "path";
 function lockTimeoutMs() {
   const raw = process.env.TRELLIS_OPLOG_LOCK_MS;
-  if (!raw)
-    return 5000;
+  if (!raw) return 5e3;
   const parsed = Number(raw);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : 5000;
-}
-
-class JsonOpLog {
-  ops = [];
-  filePath;
-  lockPath;
-  constructor(filePath) {
-    this.filePath = filePath;
-    this.lockPath = `${filePath}.lock`;
-  }
-  get path() {
-    return this.filePath;
-  }
-  load() {
-    if (existsSync4(this.filePath)) {
-      const raw = readFileSync4(this.filePath, "utf-8");
-      try {
-        this.ops = JSON.parse(raw);
-      } catch {
-        const backupPath = this.filePath + ".bak";
-        if (existsSync4(backupPath)) {
-          const backupRaw = readFileSync4(backupPath, "utf-8");
-          this.ops = JSON.parse(backupRaw);
-          writeFileSync4(this.filePath, backupRaw);
-        } else {
-          throw new Error(`Corrupted ops log at ${this.filePath} and no backup found. Run \`trellis repair\` to attempt recovery.`);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 5e3;
+}
+var JsonOpLog, LaneOpLog;
+var init_op_log = __esm({
+  "src/vcs/op-log.ts"() {
+    "use strict";
+    JsonOpLog = class {
+      ops = [];
+      filePath;
+      lockPath;
+      constructor(filePath) {
+        this.filePath = filePath;
+        this.lockPath = `${filePath}.lock`;
+      }
+      get path() {
+        return this.filePath;
+      }
+      load() {
+        if (existsSync4(this.filePath)) {
+          const raw = readFileSync4(this.filePath, "utf-8");
+          try {
+            this.ops = JSON.parse(raw);
+          } catch {
+            const backupPath = this.filePath + ".bak";
+            if (existsSync4(backupPath)) {
+              const backupRaw = readFileSync4(backupPath, "utf-8");
+              this.ops = JSON.parse(backupRaw);
+              writeFileSync4(this.filePath, backupRaw);
+            } else {
+              throw new Error(
+                `Corrupted ops log at ${this.filePath} and no backup found. Run \`trellis repair\` to attempt recovery.`
+              );
+            }
+          }
         }
       }
-    }
-  }
-  append(op) {
-    this.withLock(() => {
-      const diskOps = this.readOpsFromDisk();
-      this.ops = diskOps;
-      if (this.ops.some((existing) => existing.hash === op.hash)) {
-        return;
+      append(op) {
+        this.withLock(() => {
+          const diskOps = this.readOpsFromDisk();
+          this.ops = diskOps;
+          if (this.ops.some((existing) => existing.hash === op.hash)) {
+            return;
+          }
+          this.ops.push(op);
+          this.flush();
+        });
       }
-      this.ops.push(op);
-      this.flush();
-    });
-  }
-  readAll() {
-    return [...this.ops];
-  }
-  getLastOp() {
-    return this.ops.length > 0 ? this.ops[this.ops.length - 1] : undefined;
-  }
-  count() {
-    return this.ops.length;
-  }
-  flush() {
-    const dir = dirname3(this.filePath);
-    if (!existsSync4(dir))
-      mkdirSync3(dir, { recursive: true });
-    if (existsSync4(this.filePath)) {
-      const backupPath = this.filePath + ".bak";
-      try {
-        copyFileSync(this.filePath, backupPath);
-      } catch {}
-    }
-    const tempPath = `${this.filePath}.tmp`;
-    writeFileSync4(tempPath, JSON.stringify(this.ops, null, 2));
-    renameSync(tempPath, this.filePath);
-  }
-  readOpsFromDisk() {
-    if (!existsSync4(this.filePath)) {
-      return [];
-    }
-    const raw = readFileSync4(this.filePath, "utf-8");
-    try {
-      const parsed = JSON.parse(raw);
-      return Array.isArray(parsed) ? parsed : [];
-    } catch {
-      const backupPath = this.filePath + ".bak";
-      if (existsSync4(backupPath)) {
-        const backupRaw = readFileSync4(backupPath, "utf-8");
-        const parsedBackup = JSON.parse(backupRaw);
-        writeFileSync4(this.filePath, backupRaw);
-        return Array.isArray(parsedBackup) ? parsedBackup : [];
-      }
-      throw new Error(`Corrupted ops log at ${this.filePath} and no backup found. Run \`trellis repair\` to attempt recovery.`);
-    }
-  }
-  withLock(fn) {
-    const dir = dirname3(this.filePath);
-    if (!existsSync4(dir))
-      mkdirSync3(dir, { recursive: true });
-    const deadline = Date.now() + lockTimeoutMs();
-    let lockFd;
-    while (Date.now() < deadline) {
-      try {
-        lockFd = openSync2(this.lockPath, "wx");
-        break;
-      } catch (err) {
-        if (err?.code !== "EEXIST") {
-          throw err;
+      readAll() {
+        return [...this.ops];
+      }
+      getLastOp() {
+        return this.ops.length > 0 ? this.ops[this.ops.length - 1] : void 0;
+      }
+      count() {
+        return this.ops.length;
+      }
+      flush() {
+        const dir = dirname3(this.filePath);
+        if (!existsSync4(dir)) mkdirSync3(dir, { recursive: true });
+        if (existsSync4(this.filePath)) {
+          const backupPath = this.filePath + ".bak";
+          try {
+            copyFileSync(this.filePath, backupPath);
+          } catch {
+          }
         }
+        const tempPath = `${this.filePath}.tmp`;
+        writeFileSync4(tempPath, JSON.stringify(this.ops, null, 2));
+        renameSync(tempPath, this.filePath);
       }
-    }
-    if (lockFd === undefined) {
-      throw new Error(`Timed out waiting for ops log lock: ${this.lockPath}. Another Trellis process may be stalled.`);
-    }
-    try {
-      fn();
-    } finally {
-      closeSync2(lockFd);
-      try {
-        unlinkSync2(this.lockPath);
-      } catch {}
-    }
-  }
-  static repair(filePath) {
-    if (!existsSync4(filePath)) {
-      return { recovered: 0, lost: 0 };
-    }
-    const raw = readFileSync4(filePath, "utf-8");
-    try {
-      const ops = JSON.parse(raw);
-      return { recovered: ops.length, lost: 0 };
-    } catch {}
-    const lastHash = raw.lastIndexOf('"hash": "trellis:op:');
-    if (lastHash === -1) {
-      const bakPath = filePath + ".bak";
-      if (existsSync4(bakPath)) {
-        const bakRaw = readFileSync4(bakPath, "utf-8");
+      readOpsFromDisk() {
+        if (!existsSync4(this.filePath)) {
+          return [];
+        }
+        const raw = readFileSync4(this.filePath, "utf-8");
         try {
-          const ops = JSON.parse(bakRaw);
-          writeFileSync4(filePath, bakRaw);
+          const parsed = JSON.parse(raw);
+          return Array.isArray(parsed) ? parsed : [];
+        } catch {
+          const backupPath = this.filePath + ".bak";
+          if (existsSync4(backupPath)) {
+            const backupRaw = readFileSync4(backupPath, "utf-8");
+            const parsedBackup = JSON.parse(backupRaw);
+            writeFileSync4(this.filePath, backupRaw);
+            return Array.isArray(parsedBackup) ? parsedBackup : [];
+          }
+          throw new Error(
+            `Corrupted ops log at ${this.filePath} and no backup found. Run \`trellis repair\` to attempt recovery.`
+          );
+        }
+      }
+      withLock(fn) {
+        const dir = dirname3(this.filePath);
+        if (!existsSync4(dir)) mkdirSync3(dir, { recursive: true });
+        const deadline = Date.now() + lockTimeoutMs();
+        let lockFd;
+        while (Date.now() < deadline) {
+          try {
+            lockFd = openSync2(this.lockPath, "wx");
+            break;
+          } catch (err) {
+            if (err?.code !== "EEXIST") {
+              throw err;
+            }
+          }
+        }
+        if (lockFd === void 0) {
+          throw new Error(
+            `Timed out waiting for ops log lock: ${this.lockPath}. Another Trellis process may be stalled.`
+          );
+        }
+        try {
+          fn();
+        } finally {
+          closeSync2(lockFd);
+          try {
+            unlinkSync2(this.lockPath);
+          } catch {
+          }
+        }
+      }
+      static repair(filePath) {
+        if (!existsSync4(filePath)) {
+          return { recovered: 0, lost: 0 };
+        }
+        const raw = readFileSync4(filePath, "utf-8");
+        try {
+          const ops = JSON.parse(raw);
+          return { recovered: ops.length, lost: 0 };
+        } catch {
+        }
+        const lastHash = raw.lastIndexOf('"hash": "trellis:op:');
+        if (lastHash === -1) {
+          const bakPath = filePath + ".bak";
+          if (existsSync4(bakPath)) {
+            const bakRaw = readFileSync4(bakPath, "utf-8");
+            try {
+              const ops = JSON.parse(bakRaw);
+              writeFileSync4(filePath, bakRaw);
+              return { recovered: ops.length, lost: 0 };
+            } catch {
+            }
+          }
+          writeFileSync4(filePath, "[]");
+          return { recovered: 0, lost: -1 };
+        }
+        const endOfLine = raw.indexOf("\n", lastHash);
+        const closingBrace = raw.indexOf("  }", endOfLine);
+        if (closingBrace === -1) {
+          writeFileSync4(filePath, "[]");
+          return { recovered: 0, lost: -1 };
+        }
+        const fixed = raw.slice(0, closingBrace + 3) + "\n]";
+        try {
+          const ops = JSON.parse(fixed);
+          writeFileSync4(filePath + ".corrupted", raw);
+          writeFileSync4(filePath, fixed);
           return { recovered: ops.length, lost: 0 };
-        } catch {}
+        } catch {
+          writeFileSync4(filePath + ".corrupted", raw);
+          writeFileSync4(filePath, "[]");
+          return { recovered: 0, lost: -1 };
+        }
       }
-      writeFileSync4(filePath, "[]");
-      return { recovered: 0, lost: -1 };
-    }
-    const endOfLine = raw.indexOf(`
-`, lastHash);
-    const closingBrace = raw.indexOf("  }", endOfLine);
-    if (closingBrace === -1) {
-      writeFileSync4(filePath, "[]");
-      return { recovered: 0, lost: -1 };
-    }
-    const fixed = raw.slice(0, closingBrace + 3) + `
-]`;
-    try {
-      const ops = JSON.parse(fixed);
-      writeFileSync4(filePath + ".corrupted", raw);
-      writeFileSync4(filePath, fixed);
-      return { recovered: ops.length, lost: 0 };
-    } catch {
-      writeFileSync4(filePath + ".corrupted", raw);
-      writeFileSync4(filePath, "[]");
-      return { recovered: 0, lost: -1 };
-    }
+    };
+    LaneOpLog = class extends JsonOpLog {
+      constructor(laneDir2) {
+        super(`${laneDir2}/ops.json`);
+      }
+    };
   }
-}
-var LaneOpLog;
-var init_op_log = __esm(() => {
-  LaneOpLog = class LaneOpLog extends JsonOpLog {
-    constructor(laneDir) {
-      super(`${laneDir}/ops.json`);
-    }
-  };
 });
 
 // src/vcs/lane.ts
@@ -1999,28 +2088,27 @@ function newLaneId() {
 }
 function loadLaneMeta(trellisDir, laneId) {
   const path = laneMetaPath(trellisDir, laneId);
-  if (!existsSync5(path))
-    return;
+  if (!existsSync5(path)) return void 0;
   return JSON.parse(readFileSync5(path, "utf-8"));
 }
 function saveLaneMeta(trellisDir, meta) {
   const dir = laneDir(trellisDir, meta.id);
-  if (!existsSync5(dir))
-    mkdirSync4(dir, { recursive: true });
-  writeFileSync5(laneMetaPath(trellisDir, meta.id), JSON.stringify(meta, null, 2) + `
-`);
+  if (!existsSync5(dir)) mkdirSync4(dir, { recursive: true });
+  writeFileSync5(
+    laneMetaPath(trellisDir, meta.id),
+    JSON.stringify(meta, null, 2) + "\n"
+  );
 }
 function listLaneIds(trellisDir) {
   const root = lanesRoot(trellisDir);
-  if (!existsSync5(root))
-    return [];
+  if (!existsSync5(root)) return [];
   return readdirSync(root, { withFileTypes: true }).filter((d) => d.isDirectory() && d.name.startsWith("lane-")).map((d) => d.name);
 }
 function resolveLaneHeadFromJournal(meta, laneOps) {
   return laneOps.at(-1)?.hash ?? meta.headOpHash ?? meta.baseOpHash;
 }
 function createLaneMeta(trellisDir, params) {
-  const now = new Date().toISOString();
+  const now = (/* @__PURE__ */ new Date()).toISOString();
   const meta = {
     id: newLaneId(),
     status: "active",
@@ -2045,15 +2133,81 @@ function createLaneMeta(trellisDir, params) {
 }
 function updateLaneHead(trellisDir, laneId, headOpHash) {
   const meta = loadLaneMeta(trellisDir, laneId);
-  if (!meta)
-    return;
+  if (!meta) return;
   meta.headOpHash = headOpHash;
-  meta.updatedAt = new Date().toISOString();
+  meta.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   saveLaneMeta(trellisDir, meta);
 }
 function listLaneMetas(trellisDir) {
-  return listLaneIds(trellisDir).map((id) => loadLaneMeta(trellisDir, id)).filter((m) => m !== undefined);
+  return listLaneIds(trellisDir).map((id) => loadLaneMeta(trellisDir, id)).filter((m) => m !== void 0);
 }
-var init_lane = () => {};
+var init_lane = __esm({
+  "src/vcs/lane.ts"() {
+    "use strict";
+  }
+});
 
-export { decompose, init_decompose, BlobStore, init_blob_store, shouldAdvanceBranchHead, getBranchHeadOpHash, createBranch, switchBranch, listBranches, deleteBranch, saveBranchState, loadBranchState, init_branch, createMilestone, listMilestones, init_milestone, createCheckpoint, listCheckpoints, init_checkpoint, diffFileStates, buildFileStateAtOp, diffOpRange, generateUnifiedDiff, myersDiff, init_diff, threeWayMerge, threeWayTextMerge, init_merge, createIssue, updateIssue, startIssue, pauseIssue, resumeIssue, closeIssue, triageIssue, reopenIssue, assignIssue, blockIssue, unblockIssue, addCriterion, setCriterionStatus, runCriteria, listIssues, getIssue, getActiveIssues, checkCompletionReadiness, init_issue, JsonOpLog, LaneOpLog, init_op_log, lanesRoot, laneDir, laneMetaPath, newLaneId, loadLaneMeta, saveLaneMeta, listLaneIds, resolveLaneHeadFromJournal, createLaneMeta, updateLaneHead, listLaneMetas, init_lane };
+export {
+  decompose,
+  init_decompose,
+  BlobStore,
+  init_blob_store,
+  shouldAdvanceBranchHead,
+  getBranchHeadOpHash,
+  createBranch,
+  switchBranch,
+  listBranches,
+  deleteBranch,
+  saveBranchState,
+  loadBranchState,
+  init_branch,
+  createMilestone,
+  listMilestones,
+  init_milestone,
+  createCheckpoint,
+  listCheckpoints,
+  init_checkpoint,
+  diffFileStates,
+  buildFileStateAtOp,
+  diffOpRange,
+  generateUnifiedDiff,
+  myersDiff,
+  init_diff,
+  threeWayMerge,
+  threeWayTextMerge,
+  init_merge,
+  createIssue,
+  updateIssue,
+  startIssue,
+  pauseIssue,
+  resumeIssue,
+  closeIssue,
+  triageIssue,
+  reopenIssue,
+  assignIssue,
+  blockIssue,
+  unblockIssue,
+  addCriterion,
+  setCriterionStatus,
+  runCriteria,
+  listIssues,
+  getIssue,
+  getActiveIssues,
+  checkCompletionReadiness,
+  init_issue,
+  JsonOpLog,
+  LaneOpLog,
+  init_op_log,
+  lanesRoot,
+  laneDir,
+  laneMetaPath,
+  newLaneId,
+  loadLaneMeta,
+  saveLaneMeta,
+  listLaneIds,
+  resolveLaneHeadFromJournal,
+  createLaneMeta,
+  updateLaneHead,
+  listLaneMetas,
+  init_lane
+};