trellis 3.1.31 → 3.1.33

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.1.32
+
+- **Agent Lanes (W1–W4):** `trellis lane` — isolated per-agent op journals under `.trellis/lanes/`, `create` / `enter` / `leave` / `status` / `diff` / `promote` / `drop`.
+- **`trellis lane promote`:** replay lane ops onto integration with `--dry-run`, `--explain`, and hard/soft/file conflict detection.
+- **`trellis issue start`:** auto-creates and enters a lane (opt out with `--no-lane`).
+- **`TRELLIS_LANE_ID`:** subprocess agents auto-enter the lane via `syncEnvLaneFromEnv()`.
+- **Lazy replay (W4):** integration materialization cache; `leaveLane` restores integration view without full journal replay.
+- **`getBranchHeadOpHash`:** latest `headOpHash` fact wins (fixes stale head during promote).
+- **Op log lock:** configurable timeout via `TRELLIS_OPLOG_LOCK_MS`.
+
 ## 3.1.14
 
 - CLI `trellis --version` now reports the real package version from `package.json` (was hardcoded `0.1.0`).

package/README.md

@@ -104,7 +104,7 @@ const off = cms.collection('blogpost').subscribe(
 off();
 ```
 
-- **Collections**: `cms.collections()` returns explicit `TypeSchema` collections and inferred collections from existing entity types.
+- **Collections**: `cms.collections()` returns `TypeSchema` collections marked with `cms=true`.
 - **Schema**: `cms.collection('blogpost').schema()` returns field definitions including types, labels, requirements, formulas, and targets.
 - **Normalized keys**: `cms.collection('blogpost')` matches stored entity types like `BlogPost`.
 - **References**: `expand` resolves reference ids from facts and graph links into nested entries.

package/dist/cli/index.d.ts

@@ -7,6 +7,7 @@
  *   status   Show current repository status
  *   log      Show operation history
  *   watch    Start file watcher (foreground)
+ *   lane     Agent lanes — isolated op journals
  *   files    List tracked files
  *   import   Import from a Git repository
  */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;GAUG;AAyCH,MAAM,MAAM,OAAO,GACf,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,SAAS,GACT,OAAO,GACP,QAAQ,GACR,MAAM,CAAC;AACX,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,MAAM,GACN,KAAK,GACL,MAAM,GACN,KAAK,GACL,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;GAWG;AA0CH,MAAM,MAAM,OAAO,GACf,QAAQ,GACR,UAAU,GACV,QAAQ,GACR,SAAS,GACT,OAAO,GACP,QAAQ,GACR,MAAM,CAAC;AACX,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,UAAU,GACV,MAAM,GACN,KAAK,GACL,MAAM,GACN,KAAK,GACL,SAAS,GACT,WAAW,GACX,OAAO,GACP,MAAM,CAAC"}

package/dist/cli/index.js

@@ -2,25 +2,27 @@
 // @bun
 import {
   seedContext
-} from "../index-1tv9sbwp.js";
+} from "../index-w5wccer3.js";
 import {
   TrellisVcsEngine,
+  formatPromoteExplain,
   hasProfile,
   inferProjectContext,
   init_engine,
+  init_lane_promote,
   loadProfile,
   promptForProfile,
   saveProfile,
   updateProfile,
   writeAgentScaffold,
   writeIdeScaffold
-} from "../index-8f2z3b0h.js";
+} from "../index-rv1p47gp.js";
 import {
   OntologyRegistry,
   builtinOntologies,
   validateStore
 } from "../index-w7ng765c.js";
-import"../index-p3nnc7ac.js";
+import"../index-xhcp6xrn.js";
 import {
   VectorStore,
   buildRAGContext,
@@ -37,11 +39,11 @@ import {
   exports_links,
   init_links
 } from "../index-vkpkfwhq.js";
-import"../index-65z0xfjw.js";
+import"../index-4cdr7x2x.js";
 import {
   createVcsOp,
   init_ops
-} from "../index-v9b4hqa7.js";
+} from "../index-nzb3am4f.js";
 import {
   parseQuery,
   parseSimple
@@ -5760,6 +5762,276 @@ function failNotRepo(start, pathOpt) {
   process.exit(1);
 }
 
+// src/cli/lane.ts
+init_engine();
+init_lane_promote();
+function formatRelativeTime(iso) {
+  const diff = Date.now() - new Date(iso).getTime();
+  if (diff < 60000)
+    return "just now";
+  if (diff < 3600000)
+    return `${Math.floor(diff / 60000)}m ago`;
+  if (diff < 86400000)
+    return `${Math.floor(diff / 3600000)}h ago`;
+  return `${Math.floor(diff / 86400000)}d ago`;
+}
+function formatLaneStatus(status) {
+  switch (status) {
+    case "active":
+      return source_default.green("active");
+    case "promoting":
+      return source_default.yellow("promoting");
+    case "promoted":
+      return source_default.blue("promoted");
+    case "dropped":
+      return source_default.dim("dropped");
+    default:
+      return status;
+  }
+}
+async function openEngine(rootPath) {
+  const engine = new TrellisVcsEngine({ rootPath });
+  engine.open();
+  await engine.syncEnvLaneFromEnv();
+  return engine;
+}
+function isStaleLane(lane) {
+  if (lane.status !== "active")
+    return false;
+  if (lane.leaseExpiresAt) {
+    return Date.now() > new Date(lane.leaseExpiresAt).getTime();
+  }
+  const ageMs = Date.now() - new Date(lane.createdAt).getTime();
+  return ageMs > 24 * 60 * 60 * 1000;
+}
+function registerLaneCommands(program2) {
+  const laneCmd = program2.command("lane").description("Agent lanes \u2014 isolated op journals for multi-agent work");
+  laneCmd.command("fork <parentId>").description("Fork a sibling lane from an existing lane (ADR 0006)").option("--session <id>", "New session id for the fork").option("--issue <id>", "Issue id override (default: inherit from parent)").option("--child", "Child fork from parent lane head (ADR 0007)").option("--worktree <path>", "Optional git worktree path (W5)").option("-p, --path <path>", "Repository path", ".").action(async (parentId, opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    try {
+      const meta = await engine.forkLane(parentId, {
+        sessionId: opts.session,
+        issueId: opts.issue,
+        worktreePath: opts.worktree,
+        forkKind: opts.child ? "child" : "sibling"
+      });
+      console.log(source_default.green(`\u2713 Lane forked: ${source_default.bold(meta.id)}`));
+      console.log(`  ${source_default.dim("Parent:")}   ${parentId}`);
+      console.log(`  ${source_default.dim("Base:")}     ${meta.baseBranch} @ ${meta.baseOpHash.slice(0, 20)}\u2026`);
+      if (meta.issueId) {
+        console.log(`  ${source_default.dim("Issue:")}    ${meta.issueId}`);
+      }
+      if (meta.sessionId) {
+        console.log(`  ${source_default.dim("Session:")}  ${meta.sessionId}`);
+      }
+      if (meta.forkKind) {
+        console.log(`  ${source_default.dim("Fork kind:")}  ${meta.forkKind}`);
+      }
+      if (meta.virtualBaseOpHash) {
+        console.log(`  ${source_default.dim("Virtual base:")} ${meta.virtualBaseOpHash.slice(0, 20)}\u2026`);
+      }
+      console.log(source_default.dim(`  Enter: trellis lane enter ${meta.id}  |  export TRELLIS_LANE_ID=${meta.id}`));
+    } catch (err) {
+      console.error(source_default.red(err.message));
+      process.exit(1);
+    }
+  });
+  laneCmd.command("create").description("Create a lane forked from the integration branch head").option("--from <branch>", "Base branch (default: current)").option("--to <branch>", "Promotion target branch").option("--issue <id>", "Link to issue id").option("--agent <agentId>", "Agent attribution override").option("--worktree <path>", "Optional git worktree path (W5)").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    try {
+      const meta = await engine.createLane({
+        fromBranch: opts.from,
+        targetBranch: opts.to,
+        issueId: opts.issue,
+        worktreePath: opts.worktree
+      });
+      console.log(source_default.green(`\u2713 Lane created: ${source_default.bold(meta.id)}`));
+      console.log(`  ${source_default.dim("Base:")}     ${meta.baseBranch} @ ${meta.baseOpHash.slice(0, 20)}\u2026`);
+      console.log(`  ${source_default.dim("Target:")}   ${meta.targetBranch}`);
+      if (meta.issueId) {
+        console.log(`  ${source_default.dim("Issue:")}    ${meta.issueId}`);
+      }
+      console.log(source_default.dim(`  Enter: trellis lane enter ${meta.id}  |  export TRELLIS_LANE_ID=${meta.id}`));
+    } catch (err) {
+      console.error(source_default.red(err.message));
+      process.exit(1);
+    }
+  });
+  laneCmd.command("list").description("List agent lanes").option("--active", "Show only active lanes").option("--stale", "Show only stale active lanes (lease expired or >24h)").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    let lanes = engine.listLanes();
+    if (opts.active) {
+      lanes = lanes.filter((l) => l.status === "active");
+    }
+    if (opts.stale) {
+      lanes = lanes.filter((l) => isStaleLane(l));
+    }
+    if (lanes.length === 0) {
+      console.log(source_default.dim("No lanes"));
+      return;
+    }
+    console.log(source_default.bold(`Agent Lanes
+`));
+    for (const lane of lanes) {
+      const marker = engine.getActiveLaneId() === lane.id ? source_default.green("* ") : "  ";
+      const opCount = engine.getLaneOpCount(lane.id);
+      const issue = lane.issueId ? source_default.dim(` \xB7 ${lane.issueId}`) : "";
+      console.log(`${marker}${source_default.cyan(lane.id)}  ${formatLaneStatus(lane.status)}  ${source_default.dim(`${opCount} ops`)}${issue}`);
+      console.log(`    ${source_default.dim("fork")} ${lane.baseBranch} \xB7 ${formatRelativeTime(lane.createdAt)}`);
+      if (lane.parentLaneId) {
+        console.log(`    ${source_default.dim("from")} ${lane.parentLaneId}${lane.forkKind ? ` (${lane.forkKind})` : ""}`);
+      }
+    }
+  });
+  laneCmd.command("enter <id>").description("Enter a lane (route writes to lane journal)").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    try {
+      await engine.enterLane(id);
+      console.log(source_default.green(`\u2713 Entered lane ${source_default.bold(id)}`));
+      console.log(source_default.dim(`  export TRELLIS_LANE_ID=${id}  for subprocess agents`));
+    } catch (err) {
+      console.error(source_default.red(err.message));
+      process.exit(1);
+    }
+  });
+  laneCmd.command("leave").description("Leave the active lane").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    const active = engine.getActiveLaneId();
+    if (!active) {
+      console.log(source_default.dim("No active lane"));
+      return;
+    }
+    await engine.leaveLane();
+    console.log(source_default.green(`\u2713 Left lane ${source_default.bold(active)}`));
+  });
+  laneCmd.command("status").description("Show active lane or a specific lane").argument("[id]", "Lane id (default: active session)").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    const laneId = id ?? engine.getActiveLaneId();
+    if (!laneId) {
+      console.log(source_default.dim("No active lane"));
+      return;
+    }
+    const summary = engine.summarizeLane(laneId);
+    const { meta, ops, filePaths, integrationHead } = summary;
+    const active = engine.getActiveLaneId() === laneId;
+    console.log(source_default.bold(`Lane ${meta.id}${active ? source_default.green(" (active)") : ""}
+`));
+    console.log(`  ${source_default.dim("Status:")}      ${formatLaneStatus(meta.status)}`);
+    console.log(`  ${source_default.dim("Base:")}        ${meta.baseBranch} @ ${meta.baseOpHash}`);
+    console.log(`  ${source_default.dim("Target:")}      ${meta.targetBranch}`);
+    console.log(`  ${source_default.dim("Head:")}        ${meta.headOpHash ?? "\u2014"}`);
+    console.log(`  ${source_default.dim("Ops:")}         ${ops.length} in lane journal`);
+    console.log(`  ${source_default.dim("Integration:")} ${integrationHead ?? "\u2014"} (${meta.targetBranch} head)`);
+    if (meta.issueId) {
+      console.log(`  ${source_default.dim("Issue:")}       ${meta.issueId}`);
+    }
+    if (meta.parentLaneId) {
+      console.log(`  ${source_default.dim("Parent:")}      ${meta.parentLaneId}`);
+    }
+    if (meta.forkKind) {
+      console.log(`  ${source_default.dim("Fork kind:")}  ${meta.forkKind}`);
+    }
+    if (meta.virtualBaseOpHash) {
+      console.log(`  ${source_default.dim("Virtual base:")} ${meta.virtualBaseOpHash.slice(0, 20)}\u2026`);
+    }
+    if (meta.sessionId) {
+      console.log(`  ${source_default.dim("Session:")}     ${meta.sessionId}`);
+    }
+    if (meta.agentId) {
+      console.log(`  ${source_default.dim("Agent:")}       ${meta.agentId}`);
+    }
+    if (filePaths.length > 0) {
+      console.log(`  ${source_default.dim("Files:")}       ${filePaths.length} touched`);
+    }
+    if (active) {
+      const mat = engine.getMaterializationStats();
+      const cacheLabel = mat.integrationCacheHit ? source_default.green("hit") : source_default.yellow("miss");
+      console.log(`  ${source_default.dim("Materialize:")} integration replay ${mat.integrationOpsReplayed} ops (${cacheLabel}), lane overlay ${mat.laneOpsReplayed} ops`);
+    }
+  });
+  laneCmd.command("diff <id>").description("Summarize lane journal vs integration head").option("--to <branch>", "Integration branch (default: lane target)").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    try {
+      const { meta, ops, filePaths, integrationHead } = engine.summarizeLane(id);
+      const target = opts.to ?? meta.targetBranch;
+      console.log(source_default.bold(`Lane diff: ${id}
+`));
+      console.log(`  ${source_default.dim("Fork base:")}     ${meta.baseOpHash}`);
+      console.log(`  ${source_default.dim("Integration head:")} ${integrationHead ?? "\u2014"} (${target})`);
+      console.log(`  ${source_default.dim("Lane ops:")}        ${ops.length}`);
+      console.log(`  ${source_default.dim("Kinds:")}          ${summarizeOpKinds(ops)}`);
+      if (filePaths.length > 0) {
+        console.log(`
+  ${source_default.bold("Touched files")}`);
+        for (const path of filePaths.slice(0, 20)) {
+          console.log(`    ${path}`);
+        }
+        if (filePaths.length > 20) {
+          console.log(source_default.dim(`    \u2026 and ${filePaths.length - 20} more`));
+        }
+      }
+      console.log(source_default.dim(`
+  Promote: trellis lane promote ${id}`));
+    } catch (err) {
+      console.error(source_default.red(err.message));
+      process.exit(1);
+    }
+  });
+  laneCmd.command("promote <id>").description("Promote lane ops onto the integration branch").option("--to <branch>", "Target branch (default: lane target)").option("--dry-run", "Run conflict detection only; no writes").option("--explain", "Human-readable conflict report").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    try {
+      const result = await engine.promoteLane(id, {
+        dryRun: opts.dryRun,
+        explain: opts.explain,
+        toBranch: opts.to
+      });
+      if (opts.explain || opts.dryRun || !result.canPromote) {
+        console.log(formatPromoteExplain(result));
+      }
+      if (result.promoted) {
+        console.log(source_default.green(`\u2713 Promoted ${source_default.bold(id)} \u2014 ${result.integrationOpsAppended ?? 0} integration ops`));
+      } else if (!opts.dryRun && !result.canPromote) {
+        process.exit(1);
+      } else if (opts.dryRun && !result.canPromote) {
+        console.log(source_default.dim(`
+  Nothing to promote \u2014 add lane ops first`));
+      } else if (opts.dryRun && result.canPromote) {
+        console.log(source_default.dim(`
+  Run without --dry-run to apply`));
+      }
+    } catch (err) {
+      console.error(source_default.red(err.message));
+      process.exit(1);
+    }
+  });
+  laneCmd.command("drop <id>").description("Drop a lane (archive journal on disk)").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine(rootPath);
+    try {
+      await engine.dropLane(id);
+      console.log(source_default.green(`\u2713 Dropped lane ${source_default.bold(id)}`));
+    } catch (err) {
+      console.error(source_default.red(err.message));
+      process.exit(1);
+    }
+  });
+}
+function summarizeOpKinds(ops) {
+  const counts = new Map;
+  for (const op of ops) {
+    counts.set(op.kind, (counts.get(op.kind) ?? 0) + 1);
+  }
+  return [...counts.entries()].map(([kind, n]) => `${kind.replace("vcs:", "")}:${n}`).join(", ");
+}
+
 // src/cli/index.ts
 var program2 = new Command;
 program2.name("trellis").description("TrellisVCS \u2014 graph-native, code-first version control").version(cliVersion());
@@ -6081,7 +6353,7 @@ program2.command("status").description("Show current repository status").option(
     for (const op of display) {
       const kind = formatOpKind(op.kind);
       const file = op.vcs?.filePath ?? "";
-      const time = formatRelativeTime(op.timestamp);
+      const time = formatRelativeTime2(op.timestamp);
       console.log(`    ${kind} ${source_default.white(file)} ${source_default.dim(time)}`);
     }
   }
@@ -6095,7 +6367,7 @@ program2.command("log").description("Show operation history").option("-p, --path
     filePath: opts.file
   });
   if (opts.remote || opts.all) {
-    const { RemoteManager } = await import("../remote-manager-8qbz3mrn.js");
+    const { RemoteManager } = await import("../remote-manager-xvbg4230.js");
     const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
     if (opts.all) {
       const remotes = remoteManager.listRemotes();
@@ -6130,7 +6402,7 @@ program2.command("log").description("Show operation history").option("-p, --path
     for (const op of remoteOps.reverse()) {
       const kind = formatOpKind(op.kind);
       const hash = source_default.dim(op.hash.slice(0, 28) + "\u2026");
-      const time = formatRelativeTime(op.timestamp);
+      const time = formatRelativeTime2(op.timestamp);
       const file = op.vcs?.filePath ? source_default.white(op.vcs.filePath) : "";
       const rename = op.vcs?.oldFilePath ? source_default.dim(` (from ${op.vcs.oldFilePath})`) : "";
       console.log(`  ${hash} ${kind} ${file}${rename} ${source_default.dim(time)}`);
@@ -6160,7 +6432,12 @@ program2.command("watch").description("Start file watcher (foreground, Ctrl+C to
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
+  await engine.syncEnvLaneFromEnv();
+  const laneId = engine.getActiveLaneId();
   console.log(source_default.green("\u2713 Watching for changes\u2026") + source_default.dim(" (Ctrl+C to stop)"));
+  if (laneId) {
+    console.log(source_default.dim(`  Lane: ${laneId} (writes \u2192 lane journal)`));
+  }
   console.log();
   const originalWatch = engine.watch.bind(engine);
   engine.watch();
@@ -6288,7 +6565,7 @@ program2.command("branch").description("Manage branches").argument("[name]", "Br
   for (const b of branches) {
     const marker = b.isCurrent ? source_default.green("* ") : "  ";
     const name2 = b.isCurrent ? source_default.green(b.name) : b.name;
-    const age = b.createdAt ? source_default.dim(formatRelativeTime(b.createdAt)) : "";
+    const age = b.createdAt ? source_default.dim(formatRelativeTime2(b.createdAt)) : "";
     console.log(`${marker}${name2} ${age}`);
   }
 });
@@ -6324,7 +6601,7 @@ program2.command("milestone").description("Create or list milestones").argument(
   console.log(source_default.bold(`Milestones (${milestones.length})
 `));
   for (const m of milestones) {
-    const age = m.createdAt ? formatRelativeTime(m.createdAt) : "";
+    const age = m.createdAt ? formatRelativeTime2(m.createdAt) : "";
     console.log(`  ${source_default.cyan("\u2605")} ${source_default.bold(m.message ?? "(no message)")}`);
     console.log(`    ${source_default.dim("ID:")} ${m.id}  ${source_default.dim(age)}`);
     if (m.affectedFiles.length > 0) {
@@ -6357,7 +6634,7 @@ program2.command("checkpoint").description("Create or list checkpoints").argumen
   console.log(source_default.bold(`Checkpoints (${checkpoints.length})
 `));
   for (const cp of checkpoints) {
-    const age = cp.createdAt ? formatRelativeTime(cp.createdAt) : "";
+    const age = cp.createdAt ? formatRelativeTime2(cp.createdAt) : "";
     console.log(`  ${source_default.dim("\u25CF")} ${cp.id.slice(0, 32)}  ${source_default.dim(cp.trigger ?? "")}  ${source_default.dim(age)}`);
   }
 });
@@ -6688,7 +6965,7 @@ function formatClusterStatus(status) {
 function printClusterSummary(c) {
   console.log(`  ${source_default.cyan("\u2740")} ${source_default.bold(c.id)}  ${formatClusterStatus(c.status)}  ${source_default.dim(c.detectedBy)}`);
   console.log(`    ${source_default.dim("Ops:")} ${c.ops.length}  ${source_default.dim("Files:")} ${c.affectedFiles.slice(0, 3).join(", ")}${c.affectedFiles.length > 3 ? ` +${c.affectedFiles.length - 3}` : ""}`);
-  console.log(`    ${source_default.dim("Created:")} ${formatRelativeTime(c.createdAt)}  ${source_default.dim("Abandoned:")} ${formatRelativeTime(c.abandonedAt)}`);
+  console.log(`    ${source_default.dim("Created:")} ${formatRelativeTime2(c.createdAt)}  ${source_default.dim("Abandoned:")} ${formatRelativeTime2(c.abandonedAt)}`);
   console.log();
 }
 function formatIssueStatus(status) {
@@ -6779,7 +7056,7 @@ issueCmd.command("list").description("List issues").option("--status <status>",
     parentId: opts.parent
   });
   if (opts.remote || opts.all) {
-    const { RemoteManager } = await import("../remote-manager-8qbz3mrn.js");
+    const { RemoteManager } = await import("../remote-manager-xvbg4230.js");
     const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
     if (opts.all) {
       const remotes = remoteManager.listRemotes();
@@ -6859,13 +7136,13 @@ issueCmd.command("show").description("Show issue details").argument("<id>", "Iss
     console.log(`  ${source_default.dim("Blocking:")}  ${issue.blocking.map((b) => source_default.cyan(b)).join(", ")}`);
   }
   if (issue.createdAt) {
-    console.log(`  ${source_default.dim("Created:")}   ${formatRelativeTime(issue.createdAt)}`);
+    console.log(`  ${source_default.dim("Created:")}   ${formatRelativeTime2(issue.createdAt)}`);
   }
   if (issue.startedAt) {
-    console.log(`  ${source_default.dim("Started:")}   ${formatRelativeTime(issue.startedAt)}`);
+    console.log(`  ${source_default.dim("Started:")}   ${formatRelativeTime2(issue.startedAt)}`);
   }
   if (issue.closedAt) {
-    console.log(`  ${source_default.dim("Closed:")}    ${formatRelativeTime(issue.closedAt)}`);
+    console.log(`  ${source_default.dim("Closed:")}    ${formatRelativeTime2(issue.closedAt)}`);
   }
   if (issue.criteria.length > 0) {
     console.log(`
@@ -6877,11 +7154,11 @@ issueCmd.command("show").description("Show issue details").argument("<id>", "Iss
     }
   }
 });
-issueCmd.command("start").description("Start working on an issue (creates branch, auto-assigns)").argument("<id>", "Issue ID").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+issueCmd.command("start").description("Start working on an issue (creates branch, lane, auto-assigns)").argument("<id>", "Issue ID").option("--no-lane", "Skip auto-create/enter agent lane").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
-  const op = await engine.startIssue(id);
+  await engine.startIssue(id, { lane: !opts.noLane });
   const issue = engine.getIssue(id);
   console.log(source_default.green(`\u2713 Started issue ${source_default.bold(id)}`));
   if (issue?.branchName) {
@@ -6890,6 +7167,11 @@ issueCmd.command("start").description("Start working on an issue (creates branch
   if (issue?.assignee) {
     console.log(`  ${source_default.dim("Assignee:")} ${issue.assignee}`);
   }
+  const laneId = engine.getActiveLaneId();
+  if (laneId) {
+    console.log(`  ${source_default.dim("Lane:")}     ${laneId}`);
+    console.log(source_default.dim(`  export TRELLIS_LANE_ID=${laneId}`));
+  }
 });
 issueCmd.command("pause").description("Pause an in-progress issue (switches to default branch)").argument("<id>", "Issue ID").requiredOption("-n, --note <note>", "Why paused and what must happen before resuming").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
@@ -6900,16 +7182,20 @@ issueCmd.command("pause").description("Pause an in-progress issue (switches to d
   console.log(`  ${source_default.dim("Note:")} ${opts.note}`);
   console.log(`  ${source_default.dim("Switched to:")} ${engine.getCurrentBranch()}`);
 });
-issueCmd.command("resume").description("Resume a paused issue (switches to issue branch)").argument("<id>", "Issue ID").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+issueCmd.command("resume").description("Resume a paused issue (switches to issue branch and lane)").argument("<id>", "Issue ID").option("--no-lane", "Do not re-enter linked agent lane").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
-  await engine.resumeIssue(id);
+  await engine.resumeIssue(id, { lane: !opts.noLane });
   const issue = engine.getIssue(id);
   console.log(source_default.green(`\u25B6 Resumed issue ${source_default.bold(id)}`));
   if (issue?.branchName) {
     console.log(`  ${source_default.dim("Branch:")} ${issue.branchName}`);
   }
+  const laneId = engine.getActiveLaneId();
+  if (laneId) {
+    console.log(`  ${source_default.dim("Lane:")}   ${laneId}`);
+  }
 });
 issueCmd.command("triage").description("Move a backlog issue to queue (ready to start)").argument("<id>", "Issue ID").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
@@ -6918,7 +7204,7 @@ issueCmd.command("triage").description("Move a backlog issue to queue (ready to
   await engine.triageIssue(id);
   console.log(source_default.green(`\u2713 Triaged ${source_default.bold(id)} \u2192 queue`));
 });
-issueCmd.command("update").description("Update issue metadata").argument("<id>", "Issue ID").option("--title <title>", "New title").option("-d, --desc <description>", "Short description").option("--description <description>", "Alias for --desc").option("--status <status>", "New status: backlog, queue, in_progress, paused, closed").option("-P, --priority <priority>", "Priority: critical, high, medium, low").option("-l, --labels <labels>", "Comma-separated labels").option("--assignee <agentId>", "Agent to assign").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
+issueCmd.command("update").description("Update issue metadata").argument("<id>", "Issue ID").option("--title <title>", "New title").option("-d, --desc <description>", "Short description").option("--description <description>", "Alias for --desc").option("--status <status>", "New status: backlog, queue, in_progress, paused, closed").option("-P, --priority <priority>", "Priority: critical, high, medium, low").option("-l, --labels <labels>", "Comma-separated labels").option("--assignee <agentId>", "Agent to assign").option("--parent <id>", "Parent issue ID (re-parent sub-task)").option("--clear-parent", "Remove parent link").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
@@ -6937,6 +7223,11 @@ issueCmd.command("update").description("Update issue metadata").argument("<id>",
   }
   if (opts.assignee !== undefined)
     updates.assignee = opts.assignee;
+  if (opts.clearParent) {
+    updates.parentId = null;
+  } else if (opts.parent !== undefined) {
+    updates.parentId = opts.parent;
+  }
   await engine.updateIssue(id, updates);
   console.log(source_default.green(`\u2713 Updated ${source_default.bold(id)}`));
 });
@@ -7015,6 +7306,10 @@ issueCmd.command("close").description("Close an issue (requires all criteria pas
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
+  const lane = engine.findLaneForIssue(id);
+  if (lane && lane.status === "active" && engine.getLaneOpCount(lane.id) > 0) {
+    console.log(source_default.yellow(`\u26A0 Lane ${lane.id} has unpromoted ops \u2014 promote before close when W3 lands (trellis lane promote)`));
+  }
   try {
     const result = await engine.closeIssue(id, { confirm: opts.confirm });
     if (!result.op) {
@@ -8028,7 +8323,7 @@ function formatOpKind(kind) {
   };
   return kindMap[kind] ?? source_default.dim(kind);
 }
-function formatRelativeTime(iso) {
+function formatRelativeTime2(iso) {
   const now = Date.now();
   const then = new Date(iso).getTime();
   const diff = now - then;
@@ -8936,7 +9231,7 @@ cmsCmd.command("register-library <pkg>").description("Register a Svelte 5 compon
 });
 program2.command("remote").description("Manage remote workspace subscriptions").argument("[action]", '"add", "remove", or "list" (default: list)').argument("[name]", "Remote name (for add/remove)").argument("[path]", "Remote path (for add)").option("-p, --path <path>", "Repository path", ".").action(async (action, name, path, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const { RemoteManager } = await import("../remote-manager-8qbz3mrn.js");
+  const { RemoteManager } = await import("../remote-manager-xvbg4230.js");
   const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
   try {
     if (!action || action === "list") {
@@ -8984,7 +9279,7 @@ program2.command("remote").description("Manage remote workspace subscriptions").
 });
 program2.command("pull").description("Pull operations from remote workspaces").option("-p, --path <path>", "Repository path", ".").option("--remote <remote>", "Pull from specific remote only").action(async (opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const { RemoteManager } = await import("../remote-manager-8qbz3mrn.js");
+  const { RemoteManager } = await import("../remote-manager-xvbg4230.js");
   const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
@@ -9043,4 +9338,5 @@ program2.command("skills").description("Install Trellis agent skills using the s
     process.exit(result.status ?? 1);
   }
 });
+registerLaneCommands(program2);
 program2.parse();

package/dist/cli/lane.d.ts

@@ -0,0 +1,6 @@
+/**
+ * trellis lane — Agent Lane CLI (W2)
+ */
+import type { Command } from 'commander';
+export declare function registerLaneCommands(program: Command): void;
+//# sourceMappingURL=lane.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lane.d.ts","sourceRoot":"","sources":["../../src/cli/lane.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8CzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuU3D"}

package/dist/cms/client.d.ts

@@ -36,7 +36,7 @@ export declare class CmsClient {
     constructor(opts: CmsClientOptions);
     collection<T extends Record<string, unknown> = Record<string, unknown>>(key: string): CollectionRef<T>;
     entry<T extends Record<string, unknown> = Record<string, unknown>>(id: string): EntryRef<T>;
-    /** List all CMS collections (explicit + inferred). */
+    /** List CMS collections (TypeSchema entities marked cms=true). */
     collections(): Promise<Collection[]>;
     close(): void;
     /**

package/dist/cms/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/cms/client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,KAAK,EACL,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAQL,KAAK,SAAS,EACd,KAAK,OAAO,EAEb,MAAM,eAAe,CAAC;AA4BvB,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG1B;gBAEQ,IAAI,EAAE,gBAAgB;IAYlC,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpE,GAAG,EAAE,MAAM,GACV,aAAa,CAAC,CAAC,CAAC;IAInB,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,EAAE,EAAE,MAAM,GACT,QAAQ,CAAC,CAAC,CAAC;IAId,sDAAsD;IAChD,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAiD1C,KAAK,IAAI,IAAI;IAQb;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EACN,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,EAC5B,MAAM,GAAE;QACN,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;QACnD,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;KAC7B,GACL,WAAW;IAmDd,gBAAgB;IACV,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IA8BnD,gBAAgB;IACV,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAcjC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAclC,gBAAgB;IACV,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAe7E;AAED,qBAAa,aAAa,CACxB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM;gBADH,MAAM,EAAE,SAAS,EACzB,GAAG,EAAE,MAAM;IAGhB,IAAI,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAoDjD,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAYtE;;;;;;OAMG;IACH,SAAS,CACP,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,IAAI,GAAE,oBAAyB,GAC9B,WAAW;IAWR,MAAM,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAI3C;AAED,qBAAa,QAAQ,CACnB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM;gBADF,MAAM,EAAE,SAAS,EACzB,EAAE,EAAE,MAAM;IAGf,GAAG,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAY1D,SAAS,CACP,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,EAC5B,IAAI,GAAE,qBAA0B,GAC/B,WAAW;CAUf;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,SAAS,CAEjE"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/cms/client.ts"],"names":[],"mappings":"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"}

package/dist/cms/index.js

@@ -23,9 +23,6 @@ var SYSTEM_TYPES = new Set([
   "typeschema",
   "field"
 ]);
-function isSystemType(type) {
-  return SYSTEM_TYPES.has(type.trim().toLowerCase());
-}
 function typeKey(type) {
   return type.trim().toLowerCase();
 }
@@ -292,12 +289,9 @@ class CmsClient {
     ]);
     const factsByEntity = groupFactsByEntity(facts ?? []);
     const counts = new Map;
-    const canonical = new Map;
     for (const e of entities ?? []) {
       const k = typeKey(e.type);
       counts.set(k, (counts.get(k) ?? 0) + 1);
-      if (!canonical.has(k))
-        canonical.set(k, e.type);
     }
     const out = new Map;
     for (const e of entities ?? []) {
@@ -318,16 +312,6 @@ class CmsClient {
         count: counts.get(k) ?? 0
       });
     }
-    for (const [k, count] of counts) {
-      if (isSystemType(k) || out.has(k))
-        continue;
-      out.set(k, {
-        key: k,
-        label: canonical.get(k) ?? k,
-        inferred: true,
-        count
-      });
-    }
     return [...out.values()].sort((a, b) => a.label.localeCompare(b.label));
   }
   close() {