trellis 3.2.2 → 3.2.4

package/dist/cli/index.js

@@ -2,10 +2,10 @@
 import {
   init_node_adapter,
   startNodeServer
-} from "../chunk-TCKXSOBP.js";
+} from "../chunk-RARKFVWU.js";
 import {
   seedContext
-} from "../chunk-S6GBJ2ZB.js";
+} from "../chunk-OKNASCZY.js";
 import {
   TrellisVcsEngine,
   formatPromoteExplain,
@@ -19,8 +19,8 @@ import {
   updateProfile,
   writeAgentScaffold,
   writeIdeScaffold
-} from "../chunk-L5N5PR2S.js";
-import "../chunk-GU374KWZ.js";
+} from "../chunk-N3R74ZSR.js";
+import "../chunk-NLFRRGX6.js";
 import {
   OntologyRegistry,
   builtinOntologies,
@@ -32,21 +32,21 @@ import {
 } from "../chunk-X5FLTRUB.js";
 import {
   TrellisKernel
-} from "../chunk-KQ4A2D2P.js";
+} from "../chunk-V4YCJDYL.js";
 import {
   QueryEngine
 } from "../chunk-6CTA6MCE.js";
-import "../chunk-4XIVMVHC.js";
-import "../chunk-VBYUTRXX.js";
-import "../chunk-N6MYZT4O.js";
+import "../chunk-G3XIHPSQ.js";
+import "../chunk-IJNC25UD.js";
+import "../chunk-547FZFKO.js";
 import {
   init_reconciler,
   reconciler_exports
-} from "../chunk-4HYPLFJD.js";
+} from "../chunk-FA5TFVA5.js";
 import {
   createVcsOp,
   init_ops
-} from "../chunk-GLM4HGN4.js";
+} from "../chunk-GRWQPKYK.js";
 import {
   VectorStore,
   buildRAGContext,
@@ -56,27 +56,27 @@ import {
   init_embeddings,
   init_model,
   init_store
-} from "../chunk-S3XLFZ27.js";
+} from "../chunk-IHHSOBJS.js";
 import {
   buildRefIndex,
   createResolverContext,
   init_links,
   links_exports
-} from "../chunk-VDAKEOML.js";
+} from "../chunk-J6OUIION.js";
 import {
   __esm,
   __export,
   __require,
   __toCommonJS
-} from "../chunk-KFQGP6VL.js";
+} from "../chunk-2ESYSVXG.js";
 
 // src/ui/server.ts
 var server_exports = {};
 __export(server_exports, {
   startUIServer: () => startUIServer
 });
-import { readFileSync as readFileSync4, existsSync as existsSync5 } from "fs";
-import { join as join5, dirname as dirname5 } from "path";
+import { readFileSync as readFileSync6, existsSync as existsSync6 } from "fs";
+import { join as join6, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function buildGraph(engine) {
   const nodes = [];
@@ -177,11 +177,11 @@ function buildGraph(engine) {
     const mdFiles = [];
     for (const f of files) {
       if (f.path.endsWith(".md")) {
-        const absPath = join5(engine.getRootPath(), f.path);
-        if (existsSync5(absPath)) {
+        const absPath = join6(engine.getRootPath(), f.path);
+        if (existsSync6(absPath)) {
           mdFiles.push({
             path: f.path,
-            content: readFileSync4(absPath, "utf-8")
+            content: readFileSync6(absPath, "utf-8")
           });
         }
       }
@@ -326,8 +326,8 @@ function buildSystemInfo(engine) {
   const status = engine.status();
   const store = engine.getStore();
   const stats = store.getStats();
-  const embeddingsAvailable = existsSync5(
-    join5(engine.getRootPath(), ".trellis", "embeddings.db")
+  const embeddingsAvailable = existsSync6(
+    join6(engine.getRootPath(), ".trellis", "embeddings.db")
   );
   const blobStoreAvailable = engine.getBlobStore() !== null;
   return {
@@ -409,13 +409,13 @@ async function startUIServer(opts) {
     const push = (...paths) => {
       for (const p of paths) candidates.push(p);
     };
-    push(join5(process.cwd(), "dist", "ui", "client.html"));
+    push(join6(process.cwd(), "dist", "ui", "client.html"));
     try {
       const moduleDir = dirname5(fileURLToPath2(import.meta.url));
       push(
-        join5(moduleDir, "client.html"),
-        join5(moduleDir, "..", "ui", "client.html"),
-        join5(moduleDir, "ui", "client.html")
+        join6(moduleDir, "client.html"),
+        join6(moduleDir, "..", "ui", "client.html"),
+        join6(moduleDir, "ui", "client.html")
       );
     } catch {
     }
@@ -423,43 +423,43 @@ async function startUIServer(opts) {
     if (argvEntry) {
       const argvDir = dirname5(argvEntry);
       push(
-        join5(argvDir, "client.html"),
-        join5(argvDir, "..", "ui", "client.html"),
-        join5(argvDir, "ui", "client.html"),
-        join5(argvDir, "..", "dist", "ui", "client.html")
+        join6(argvDir, "client.html"),
+        join6(argvDir, "..", "ui", "client.html"),
+        join6(argvDir, "ui", "client.html"),
+        join6(argvDir, "..", "dist", "ui", "client.html")
       );
       let dir = argvDir;
       for (let i = 0; i < 6; i++) {
-        push(join5(dir, "dist", "ui", "client.html"), join5(dir, "ui", "client.html"));
+        push(join6(dir, "dist", "ui", "client.html"), join6(dir, "ui", "client.html"));
         dir = dirname5(dir);
       }
     }
     let cwd = process.cwd();
     for (let i = 0; i < 8; i++) {
       push(
-        join5(cwd, "dist", "ui", "client.html"),
-        join5(cwd, "node_modules", "trellis", "dist", "ui", "client.html")
+        join6(cwd, "dist", "ui", "client.html"),
+        join6(cwd, "node_modules", "trellis", "dist", "ui", "client.html")
       );
       const parent = dirname5(cwd);
       if (parent === cwd) break;
       cwd = parent;
     }
     for (const p of candidates) {
-      if (existsSync5(p)) return p;
+      if (existsSync6(p)) return p;
     }
     throw new Error(
       `Could not find client.html. cwd=${process.cwd()} argv=${argvEntry ?? "(none)"}
 Try reinstalling the package or running \`npm run build\`.`
     );
   }
-  const clientHtml = readFileSync4(findClientHtml(), "utf-8");
+  const clientHtml = readFileSync6(findClientHtml(), "utf-8");
   let embeddingManager = null;
   async function getEmbeddingManager() {
     if (!embeddingManager) {
       try {
         const { EmbeddingManager } = (init_embeddings(), __toCommonJS(embeddings_exports));
-        const dbPath = join5(opts.rootPath, ".trellis", "embeddings.db");
-        if (existsSync5(dbPath)) {
+        const dbPath = join6(opts.rootPath, ".trellis", "embeddings.db");
+        if (existsSync6(dbPath)) {
           embeddingManager = await EmbeddingManager.create(dbPath);
         }
       } catch {
@@ -609,8 +609,8 @@ var init_server = __esm({
 // src/cli/index.ts
 init_engine();
 import { Command } from "commander";
-import chalk4 from "chalk";
-import { resolve as resolve2, join as join6 } from "path";
+import chalk5 from "chalk";
+import { resolve as resolve2, join as join7 } from "path";
 import { select, checkbox } from "@inquirer/prompts";
 init_auto_embed();
 init_store();
@@ -774,9 +774,9 @@ async function importFromGit(opts) {
     agentId: opts.agentId ?? `git-import:${opts.from}`,
     defaultBranch
   });
-  const trellisDir = join2(opts.to, ".trellis");
-  if (!existsSync2(trellisDir)) {
-    mkdirSync(trellisDir, { recursive: true });
+  const trellisDir2 = join2(opts.to, ".trellis");
+  if (!existsSync2(trellisDir2)) {
+    mkdirSync(trellisDir2, { recursive: true });
   }
   const importEngine = new ImportEngine(engine, opts);
   await importEngine.createBranch(defaultBranch);
@@ -901,9 +901,9 @@ var ImportEngine = class {
   flushOps() {
     const opsPath = join2(this.opts.to, ".trellis", "ops.json");
     const configPath = join2(this.opts.to, ".trellis", "config.json");
-    const trellisDir = join2(this.opts.to, ".trellis");
-    if (!existsSync2(trellisDir)) {
-      mkdirSync(trellisDir, { recursive: true });
+    const trellisDir2 = join2(this.opts.to, ".trellis");
+    if (!existsSync2(trellisDir2)) {
+      mkdirSync(trellisDir2, { recursive: true });
     }
     if (!existsSync2(configPath)) {
       const config = {
@@ -922,11 +922,11 @@ var ImportEngine = class {
         agentId: this.agentId(),
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const { writeFileSync: writeFileSync4 } = __require("fs");
-      writeFileSync4(configPath, JSON.stringify(config, null, 2));
+      const { writeFileSync: writeFileSync5 } = __require("fs");
+      writeFileSync5(configPath, JSON.stringify(config, null, 2));
     }
-    const { writeFileSync: writeFileSync3 } = __require("fs");
-    writeFileSync3(opsPath, JSON.stringify(this.ops, null, 2));
+    const { writeFileSync: writeFileSync4 } = __require("fs");
+    writeFileSync4(opsPath, JSON.stringify(this.ops, null, 2));
   }
   async hashFileAtCommit(commitHash, filePath) {
     try {
@@ -1230,15 +1230,15 @@ function deriveDid(rawPublicKey) {
   return `did:key:z${encoded}`;
 }
 var IDENTITY_FILE = "identity.json";
-function saveIdentity(trellisDir, identity) {
-  const filePath = join4(trellisDir, IDENTITY_FILE);
+function saveIdentity(trellisDir2, identity) {
+  const filePath = join4(trellisDir2, IDENTITY_FILE);
   if (!existsSync4(dirname3(filePath))) {
     mkdirSync3(dirname3(filePath), { recursive: true });
   }
   writeFileSync2(filePath, JSON.stringify(identity, null, 2), "utf-8");
 }
-function loadIdentity(trellisDir) {
-  const filePath = join4(trellisDir, IDENTITY_FILE);
+function loadIdentity(trellisDir2) {
+  const filePath = join4(trellisDir2, IDENTITY_FILE);
   if (!existsSync4(filePath)) return null;
   try {
     return JSON.parse(readFileSync2(filePath, "utf-8"));
@@ -1246,8 +1246,8 @@ function loadIdentity(trellisDir) {
     return null;
   }
 }
-function hasIdentity(trellisDir) {
-  return existsSync4(join4(trellisDir, IDENTITY_FILE));
+function hasIdentity(trellisDir2) {
+  return existsSync4(join4(trellisDir2, IDENTITY_FILE));
 }
 function toPublicIdentity(identity) {
   return {
@@ -1441,12 +1441,22 @@ function registerLaneCommands(program2) {
       console.log(chalk3.green(`\u2713 Lane created: ${chalk3.bold(meta.id)}`));
       console.log(`  ${chalk3.dim("Base:")}     ${meta.baseBranch} @ ${meta.baseOpHash.slice(0, 20)}\u2026`);
       console.log(`  ${chalk3.dim("Target:")}   ${meta.targetBranch}`);
+      if (meta.worktreePath) {
+        console.log(`  ${chalk3.dim("Worktree:")} ${meta.worktreePath}`);
+      }
       if (meta.issueId) {
         console.log(`  ${chalk3.dim("Issue:")}    ${meta.issueId}`);
       }
       console.log(
         chalk3.dim(`  Enter: trellis lane enter ${meta.id}  |  export TRELLIS_LANE_ID=${meta.id}`)
       );
+      if (!meta.worktreePath) {
+        console.log(
+          chalk3.yellow(
+            "  No worktree \u2014 set lanes.worktreeBind in .trellis/config.json and use a CLI build that includes TRL-40 (bun src/cli/index.ts or rebuild dist)."
+          )
+        );
+      }
     } catch (err) {
       console.error(chalk3.red(err.message));
       process.exit(1);
@@ -1482,6 +1492,9 @@ function registerLaneCommands(program2) {
           `    ${chalk3.dim("from")} ${lane.parentLaneId}${lane.forkKind ? ` (${lane.forkKind})` : ""}`
         );
       }
+      if (lane.worktreePath) {
+        console.log(`    ${chalk3.dim("worktree")} ${lane.worktreePath}`);
+      }
     }
   });
   laneCmd.command("enter <id>").description("Enter a lane (route writes to lane journal)").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
@@ -1550,6 +1563,9 @@ function registerLaneCommands(program2) {
     if (meta.agentId) {
       console.log(`  ${chalk3.dim("Agent:")}       ${meta.agentId}`);
     }
+    if (meta.worktreePath) {
+      console.log(`  ${chalk3.dim("Worktree:")}   ${meta.worktreePath}`);
+    }
     if (filePaths.length > 0) {
       console.log(`  ${chalk3.dim("Files:")}       ${filePaths.length} touched`);
     }
@@ -1644,6 +1660,392 @@ function summarizeOpKinds(ops) {
   return [...counts.entries()].map(([kind, n]) => `${kind.replace("vcs:", "")}:${n}`).join(", ");
 }
 
+// src/cli/protocol.ts
+init_engine();
+import chalk4 from "chalk";
+import { readFileSync as readFileSync5 } from "fs";
+
+// src/protocol/envelope.ts
+var HANDOFF_ROLES = [
+  "strategist",
+  "designer",
+  "architect",
+  "executor",
+  "reviewer",
+  "optimizer",
+  "synthesist",
+  "writer",
+  "human"
+];
+var HANDOFF_STATUSES = [
+  "HANDOFF",
+  "CLARIFY",
+  "REJECT",
+  "BLOCKED",
+  "DECISION"
+];
+var ROLE_SET = new Set(HANDOFF_ROLES);
+var STATUS_SET = new Set(HANDOFF_STATUSES);
+var ROLE_BALL = {
+  strategist: "\u{1F7E3}",
+  designer: "\u{1F7E0}",
+  architect: "\u{1F535}",
+  executor: "\u{1F7E2}",
+  reviewer: "\u{1F7E1}",
+  optimizer: "\u26A1",
+  synthesist: "\u{1F3A8}",
+  writer: "\u270D\uFE0F",
+  human: "\u26AA"
+};
+function parseYamlFields(yaml) {
+  const result = {};
+  const lines = yaml.replace(/\r\n/g, "\n").split("\n");
+  let currentKey = null;
+  let bodyLines = [];
+  let inBody = false;
+  const flushBody = () => {
+    if (currentKey && inBody) {
+      result[currentKey] = bodyLines.join("\n").replace(/\n$/, "");
+      inBody = false;
+      bodyLines = [];
+    }
+  };
+  for (const line of lines) {
+    if (inBody) {
+      if (line.startsWith("  ") || line === "") {
+        bodyLines.push(line.startsWith("  ") ? line.slice(2) : "");
+        continue;
+      }
+      flushBody();
+    }
+    const kv = line.match(/^([a-z_]+):\s*(.*)$/);
+    if (!kv) continue;
+    currentKey = kv[1];
+    const rest = kv[2];
+    if (rest === "|") {
+      inBody = true;
+      bodyLines = [];
+    } else {
+      result[currentKey] = rest.trim();
+    }
+  }
+  flushBody();
+  return result;
+}
+function extractYamlFooter(text) {
+  const normalized = text.replace(/\r\n/g, "\n");
+  const idx = normalized.lastIndexOf("\n---\n");
+  if (idx === -1) {
+    if (normalized.startsWith("---\n")) {
+      return normalized.slice(4);
+    }
+    return null;
+  }
+  return normalized.slice(idx + 5);
+}
+function parseEnvelope(text) {
+  const yaml = extractYamlFooter(text);
+  if (!yaml) {
+    throw new Error("No handoff envelope found (expected --- YAML footer)");
+  }
+  const fields = parseYamlFields(yaml);
+  if (!fields.from || !fields.to || !fields.re || !fields.status) {
+    throw new Error("Envelope missing required fields: from, to, re, status");
+  }
+  const env = {
+    from: fields.from,
+    to: fields.to,
+    re: fields.re,
+    status: fields.status
+  };
+  if (fields.body) env.body = fields.body;
+  if (fields.in_reply_to) env.in_reply_to = fields.in_reply_to;
+  if (fields.refs) {
+    env.refs = fields.refs.split(",").map((r) => r.trim()).filter(Boolean);
+  }
+  const validation = validateEnvelope(env);
+  if (!validation.ok) {
+    throw new Error(validation.errors.join("; "));
+  }
+  return env;
+}
+function validateEnvelope(env) {
+  const errors = [];
+  if (!ROLE_SET.has(env.from)) {
+    errors.push(`invalid from role: ${env.from}`);
+  }
+  if (!ROLE_SET.has(env.to)) {
+    errors.push(`invalid to role: ${env.to}`);
+  }
+  if (!STATUS_SET.has(env.status)) {
+    errors.push(`invalid status: ${env.status}`);
+  }
+  if (!env.re?.trim()) {
+    errors.push("re is required");
+  } else if (!/^TRL-\d+/.test(env.re.trim())) {
+    errors.push(`re must start with TRL-N issue ref, got: ${env.re}`);
+  }
+  return errors.length === 0 ? { ok: true } : { ok: false, errors };
+}
+function formatEnvelope(env) {
+  const lines = [
+    "---",
+    `from: ${env.from}`,
+    `to: ${env.to}`,
+    `re: ${env.re}`,
+    `status: ${env.status}`
+  ];
+  if (env.body !== void 0) {
+    if (env.body.includes("\n")) {
+      lines.push("body: |", ...env.body.split("\n").map((l) => `  ${l}`));
+    } else {
+      lines.push(`body: ${env.body}`);
+    }
+  }
+  if (env.refs?.length) {
+    lines.push(`refs: ${env.refs.join(", ")}`);
+  }
+  if (env.in_reply_to) {
+    lines.push(`in_reply_to: ${env.in_reply_to}`);
+  }
+  return lines.join("\n");
+}
+function formatTurnBanner(env, stage) {
+  const ball = ROLE_BALL[env.to] ?? "\u26AA";
+  const stagePart = stage ? ` \xB7 stage ${stage}` : "";
+  return `${ball} TURN ${env.to}${stagePart} \xB7 ${env.status} \xB7 ${env.re}`;
+}
+function formatIssueDescription(env, stage) {
+  return `${formatTurnBanner(env, stage)}
+${formatEnvelope(env)}`;
+}
+function isWaitingOnHuman(env) {
+  return env.to === "human";
+}
+function tryParseEnvelope(description) {
+  if (!description?.includes("from:")) return void 0;
+  try {
+    return parseEnvelope(description);
+  } catch {
+    return void 0;
+  }
+}
+
+// src/protocol/whereami.ts
+import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4 } from "fs";
+import { join as join5 } from "path";
+function trellisDir(rootPath) {
+  return join5(rootPath, ".trellis");
+}
+function checkpointPath(rootPath) {
+  return join5(trellisDir(rootPath), "reentry-checkpoint.json");
+}
+function loadCheckpoint(rootPath) {
+  const path = checkpointPath(rootPath);
+  if (!existsSync5(path)) return null;
+  try {
+    return JSON.parse(readFileSync4(path, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function writeCheckpoint(rootPath, issueIds, openMessageIds) {
+  const cp = {
+    at: (/* @__PURE__ */ new Date()).toISOString(),
+    issueIds,
+    openMessageIds
+  };
+  const dir = trellisDir(rootPath);
+  mkdirSync4(dir, { recursive: true });
+  writeFileSync3(checkpointPath(rootPath), JSON.stringify(cp, null, 2), "utf-8");
+  return cp;
+}
+function isOpenProtocolChild(issue) {
+  if (issue.status === "closed") return false;
+  return issue.labels.includes("message") || issue.labels.includes("decision");
+}
+function collectProtocolChildren(engine) {
+  return engine.listIssues().filter(isOpenProtocolChild);
+}
+function findWaitingOnYou(engine) {
+  const waiting = [];
+  for (const issue of collectProtocolChildren(engine)) {
+    const envelope = tryParseEnvelope(issue.description);
+    if (!envelope) continue;
+    if (issue.labels.includes("decision")) {
+      waiting.push({ issue, envelope });
+      continue;
+    }
+    if (isWaitingOnHuman(envelope)) {
+      waiting.push({ issue, envelope });
+    }
+  }
+  return waiting;
+}
+function findMovedSinceCheckpoint(engine, rootPath) {
+  const cp = loadCheckpoint(rootPath);
+  if (!cp) return [];
+  const known = /* @__PURE__ */ new Set([...cp.issueIds, ...cp.openMessageIds]);
+  const moved = [];
+  for (const issue of engine.listIssues()) {
+    if (known.has(issue.id)) continue;
+    if (issue.labels.includes("message") || issue.labels.includes("decision")) {
+      moved.push(issue);
+    }
+  }
+  for (const issue of collectProtocolChildren(engine)) {
+    if (cp.openMessageIds.includes(issue.id)) continue;
+    if (issue.labels.includes("message") || issue.labels.includes("decision")) {
+      if (!moved.some((m) => m.id === issue.id)) {
+        moved.push(issue);
+      }
+    }
+  }
+  return moved;
+}
+function getActiveContext(engine, rootPath) {
+  const issues = engine.listIssues({ status: "in_progress" });
+  const laneId = engine.getActiveLaneId();
+  let worktreePath;
+  if (laneId) {
+    worktreePath = engine.getLaneMeta(laneId)?.worktreePath;
+  }
+  const editRoot = worktreePath ?? rootPath;
+  return { issues, laneId, worktreePath, editRoot };
+}
+function formatWhereami(opts) {
+  const { engine, rootPath } = opts;
+  const lines = ["Trellis whereami", ""];
+  lines.push("## WAITING ON YOU");
+  const waiting = findWaitingOnYou(engine);
+  if (waiting.length === 0) {
+    lines.push("  (none)");
+  } else {
+    for (const { issue, envelope } of waiting) {
+      lines.push(
+        `  ${issue.id} \xB7 ${envelope.status} \xB7 to:${envelope.to} \xB7 re:${envelope.re}`
+      );
+      if (envelope.body) {
+        const preview = envelope.body.split("\n")[0].slice(0, 80);
+        lines.push(`    ${preview}`);
+      }
+    }
+  }
+  lines.push("");
+  lines.push("## ACTIVE");
+  const active = getActiveContext(engine, rootPath);
+  if (active.issues.length === 0) {
+    lines.push("  (no in_progress issues)");
+  } else {
+    for (const issue of active.issues) {
+      lines.push(`  ${issue.id} \xB7 ${issue.title ?? "(untitled)"}`);
+    }
+  }
+  if (active.laneId) {
+    lines.push(`  Lane: ${active.laneId}`);
+  }
+  if (active.worktreePath) {
+    lines.push(`  Worktree: ${active.worktreePath}`);
+  }
+  lines.push(`  Edit root: ${active.editRoot}`);
+  lines.push("");
+  lines.push("## MOVED SINCE LAST");
+  const cp = loadCheckpoint(rootPath);
+  if (!cp) {
+    lines.push("  (no checkpoint \u2014 run trellis whereami checkpoint)");
+  } else {
+    const moved = findMovedSinceCheckpoint(engine, rootPath);
+    if (moved.length === 0) {
+      lines.push(`  (none since ${cp.at})`);
+    } else {
+      for (const issue of moved) {
+        lines.push(`  ${issue.id} \xB7 ${issue.title ?? "(untitled)"}`);
+      }
+    }
+  }
+  return lines.join("\n");
+}
+
+// src/cli/protocol.ts
+async function openEngine2(rootPath) {
+  const engine = new TrellisVcsEngine({ rootPath });
+  engine.open();
+  await engine.syncEnvLaneFromEnv();
+  return engine;
+}
+function readBody(opts) {
+  if (opts.body) return opts.body;
+  if (opts.file) return readFileSync5(opts.file, "utf-8");
+  if (!process.stdin.isTTY) {
+    return readFileSync5(0, "utf-8").trim() || void 0;
+  }
+  return void 0;
+}
+function registerWhereamiCommands(program2) {
+  const whereamiCmd = program2.command("whereami").description("Re-entry dump: waiting / active / moved since checkpoint").option("-p, --path <path>", "Repository path", ".");
+  whereamiCmd.action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine2(rootPath);
+    console.log(formatWhereami({ engine, rootPath }));
+  });
+  whereamiCmd.command("checkpoint").description("Save re-entry checkpoint manifest").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine2(rootPath);
+    const allIds = engine.listIssues().map((i) => i.id);
+    const openMessageIds = engine.listIssues().filter(
+      (i) => i.status !== "closed" && (i.labels.includes("message") || i.labels.includes("decision"))
+    ).map((i) => i.id);
+    const cp = writeCheckpoint(rootPath, allIds, openMessageIds);
+    console.log(chalk4.green(`\u2713 Checkpoint saved at ${cp.at}`));
+    console.log(
+      `  ${chalk4.dim("Issues:")} ${cp.issueIds.length} \xB7 ${chalk4.dim("open protocol:")} ${cp.openMessageIds.length}`
+    );
+  });
+}
+function registerProtocolCommands(program2) {
+  registerWhereamiCommands(program2);
+  const protocolCmd = program2.command("protocol").description("Agent handoff protocol (trellis-handoffs envelope)");
+  protocolCmd.command("send").description("Record a handoff envelope as a child issue").requiredOption("--parent <id>", "Parent issue id").requiredOption("--from <role>", "Sender role").requiredOption("--to <role>", "Receiver role").requiredOption("--re <path>", "Issue path (e.g. TRL-41)").requiredOption(
+    "--status <status>",
+    "HANDOFF | CLARIFY | REJECT | BLOCKED | DECISION"
+  ).option("--body <text>", "Message body").option("--file <path>", "Read body from file").option("-l, --label <label>", "Override label (default: message or decision)").option("--stage <stage>", "Pipeline stage for turn banner").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine2(rootPath);
+    const envelope = {
+      from: opts.from,
+      to: opts.to,
+      re: opts.re,
+      status: opts.status,
+      body: readBody(opts)
+    };
+    const validation = validateEnvelope(envelope);
+    if (!validation.ok) {
+      console.error(chalk4.red(validation.errors.join("\n")));
+      process.exit(1);
+    }
+    const label = opts.label ?? (envelope.status === "DECISION" ? "decision" : "message");
+    const title = `msg: ${envelope.status} ${envelope.re}`;
+    const description = formatIssueDescription(envelope, opts.stage);
+    const op = await engine.createIssue(title, {
+      parentId: opts.parent,
+      labels: [label],
+      description,
+      status: "queue"
+    });
+    const childId = op.vcs?.issueId;
+    console.log(
+      chalk4.green(`\u2713 Protocol message recorded: ${chalk4.bold(childId)}`)
+    );
+    console.log(`  ${chalk4.dim("Parent:")}  ${opts.parent}`);
+    console.log(`  ${chalk4.dim("Label:")}   ${label}`);
+  });
+  protocolCmd.command("whereami").description("Re-entry orientation (alias of trellis whereami)").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+    const rootPath = resolveRepoRoot(opts.path);
+    const engine = await openEngine2(rootPath);
+    console.log(formatWhereami({ engine, rootPath }));
+  });
+}
+
 // src/cli/index.ts
 var program = new Command();
 program.name("trellis").description("TrellisVCS \u2014 graph-native, code-first version control").version(cliVersion());
@@ -1660,15 +2062,15 @@ async function runInit(rootPath, opts = {}) {
     };
   }
   if (!hasProfile()) {
-    const identity = hasIdentity(rootPath) ? loadIdentity(join6(rootPath, ".trellis")) : null;
+    const identity = hasIdentity(rootPath) ? loadIdentity(join7(rootPath, ".trellis")) : null;
     if (isInteractive) {
-      console.log(chalk4.cyan("\n  Welcome to Trellis! Let's get you set up."));
+      console.log(chalk5.cyan("\n  Welcome to Trellis! Let's get you set up."));
       const newProfile = await promptForProfile({
         name: identity?.displayName
       });
       saveProfile(newProfile);
       console.log(
-        chalk4.green("  \u2713 Profile saved to ~/.trellis/profile.json\n")
+        chalk5.green("  \u2713 Profile saved to ~/.trellis/profile.json\n")
       );
     } else {
       updateProfile({ name: identity?.displayName || "Unknown" });
@@ -1688,7 +2090,7 @@ async function runInit(rootPath, opts = {}) {
     selectedIdes = ["cursor"];
   }
   if (isInteractive) {
-    console.log(chalk4.cyan("\n  Configuring workspace..."));
+    console.log(chalk5.cyan("\n  Configuring workspace..."));
     const setupType = await select({
       message: "Choose your setup mode:",
       choices: [
@@ -1719,11 +2121,11 @@ async function runInit(rootPath, opts = {}) {
       selectedIdes = ides;
       plugins = [];
       console.log(
-        chalk4.green(`  \u2713 Detected project type: ${chalk4.bold(framework)}`)
+        chalk5.green(`  \u2713 Detected project type: ${chalk5.bold(framework)}`)
       );
       console.log(
-        chalk4.green(
-          `  \u2713 Scaffolding rules for: ${chalk4.bold(selectedIdes.join(", "))}`
+        chalk5.green(
+          `  \u2713 Scaffolding rules for: ${chalk5.bold(selectedIdes.join(", "))}`
         )
       );
     } else {
@@ -1851,7 +2253,7 @@ async function runInit(rootPath, opts = {}) {
       }
       const label = progress.phase === "discovering" ? "Discovering\u2026" : progress.phase === "hashing" ? "Hashing\u2026" : progress.phase === "scaffolding" ? "Scaffolding\u2026" : "Scanning\u2026";
       process.stdout.write(
-        `\r\x1B[2K  ${chalk4.dim(label)} ${progress.message}`
+        `\r\x1B[2K  ${chalk5.dim(label)} ${progress.message}`
       );
     }
   });
@@ -1917,24 +2319,24 @@ program.command("init").description(
           }
           const label = progress.phase === "discovering" ? "Discovering\u2026" : progress.phase === "hashing" ? "Hashing\u2026" : progress.phase === "scaffolding" ? "Scaffolding\u2026" : "Scanning\u2026";
           process.stdout.write(
-            `\r\x1B[2K  ${chalk4.dim(label)} ${progress.message}`
+            `\r\x1B[2K  ${chalk5.dim(label)} ${progress.message}`
           );
         }
       });
       if (renderedProgress) {
         process.stdout.write("\n");
       }
-      console.log(chalk4.green("\u2713 Indexed Trellis workspace"));
-      console.log(`  ${chalk4.dim("Path:")}           ${rootPath}`);
+      console.log(chalk5.green("\u2713 Indexed Trellis workspace"));
+      console.log(`  ${chalk5.dim("Path:")}           ${rootPath}`);
       console.log(
-        `  ${chalk4.dim("Files indexed:")}  ${result.filesIndexed}`
+        `  ${chalk5.dim("Files indexed:")}  ${result.filesIndexed}`
       );
       console.log(
-        `  ${chalk4.dim("Ops created:")}    ${result.opsCreated}`
+        `  ${chalk5.dim("Ops created:")}    ${result.opsCreated}`
       );
       return;
     }
-    console.log(chalk4.yellow("Already a Trellis workspace."));
+    console.log(chalk5.yellow("Already a Trellis workspace."));
     return;
   }
   const configResult = await runInit(rootPath, {
@@ -1944,74 +2346,74 @@ program.command("init").description(
     footprint,
     indexWorkspace
   });
-  console.log(chalk4.green("\u2713 Initialized Trellis repository"));
-  console.log(`  ${chalk4.dim("Path:")}           ${rootPath}`);
+  console.log(chalk5.green("\u2713 Initialized Trellis repository"));
+  console.log(`  ${chalk5.dim("Path:")}           ${rootPath}`);
   console.log(
-    `  ${chalk4.dim("Files indexed:")}  ${configResult.filesIndexed}`
+    `  ${chalk5.dim("Files indexed:")}  ${configResult.filesIndexed}`
   );
   console.log(
-    `  ${chalk4.dim("Ops:")}            ${configResult.opsCreated} initial ${configResult.opsCreated === 1 ? "operation" : "operations"}`
+    `  ${chalk5.dim("Ops:")}            ${configResult.opsCreated} initial ${configResult.opsCreated === 1 ? "operation" : "operations"}`
   );
-  console.log(`  ${chalk4.dim("Config:")}         .trellis/config.json`);
-  console.log(`  ${chalk4.dim("Op log:")}         .trellis/ops.json`);
-  console.log(`  ${chalk4.dim("Agent context:")}  .trellis/agents/AGENTS.md`);
+  console.log(`  ${chalk5.dim("Config:")}         .trellis/config.json`);
+  console.log(`  ${chalk5.dim("Op log:")}         .trellis/ops.json`);
+  console.log(`  ${chalk5.dim("Agent context:")}  .trellis/agents/AGENTS.md`);
   const preInfer = await inferProjectContext(rootPath);
   if (preInfer.domain) {
     console.log(
-      `  ${chalk4.dim("Domain:")}         ${chalk4.cyan(preInfer.domain)} ${chalk4.dim("(inferred)")}`
+      `  ${chalk5.dim("Domain:")}         ${chalk5.cyan(preInfer.domain)} ${chalk5.dim("(inferred)")}`
     );
   }
   if (preInfer.ecosystem && preInfer.ecosystem !== "unknown") {
-    console.log(`  ${chalk4.dim("Ecosystem:")}      ${preInfer.ecosystem}`);
+    console.log(`  ${chalk5.dim("Ecosystem:")}      ${preInfer.ecosystem}`);
   }
   console.log();
-  console.log(chalk4.bold("Next steps (VCS):"));
+  console.log(chalk5.bold("Next steps (VCS):"));
   console.log();
   console.log(
-    `  ${chalk4.cyan("trellis status")}     Check repository status`
+    `  ${chalk5.cyan("trellis status")}     Check repository status`
   );
-  console.log(`  ${chalk4.cyan("trellis log")}        View recent history`);
+  console.log(`  ${chalk5.cyan("trellis log")}        View recent history`);
   console.log(
-    `  ${chalk4.cyan("trellis branch")}     List or create branches`
+    `  ${chalk5.cyan("trellis branch")}     List or create branches`
   );
   console.log(
-    `  ${chalk4.cyan("trellis milestone")}  Create narrative checkpoints`
+    `  ${chalk5.cyan("trellis milestone")}  Create narrative checkpoints`
   );
   console.log(
-    `  ${chalk4.cyan("trellis garden")}     Discover abandoned work`
+    `  ${chalk5.cyan("trellis garden")}     Discover abandoned work`
   );
   console.log(
-    `  ${chalk4.cyan("trellis issue")}      Create and track issues`
+    `  ${chalk5.cyan("trellis issue")}      Create and track issues`
   );
   if (preInfer.confidence !== "high") {
     console.log(
-      `  ${chalk4.cyan("trellis season")}     Enrich project context for agents`
+      `  ${chalk5.cyan("trellis season")}     Enrich project context for agents`
     );
   }
   console.log();
-  console.log(chalk4.bold("Semantic Substrate (Live local services):"));
+  console.log(chalk5.bold("Semantic Substrate (Live local services):"));
   console.log();
   console.log(
-    `  ${chalk4.cyan("trellis web")}        Launch local web client / graph visualizer`
+    `  ${chalk5.cyan("trellis web")}        Launch local web client / graph visualizer`
   );
   console.log(
-    `  ${chalk4.cyan("trellis query")}      Run EQL-S semantic queries against your code graph`
+    `  ${chalk5.cyan("trellis query")}      Run EQL-S semantic queries against your code graph`
   );
   if (configResult.selectedIdes.length > 0) {
     console.log(
-      `  ${chalk4.cyan("Agent Rules")}       Active for ${chalk4.bold(configResult.selectedIdes.join(", "))}. Agents will auto-detect the graph.`
+      `  ${chalk5.cyan("Agent Rules")}       Active for ${chalk5.bold(configResult.selectedIdes.join(", "))}. Agents will auto-detect the graph.`
     );
   }
   console.log();
   if (configResult.indexWorkspace) {
     console.log(
-      chalk4.dim(
+      chalk5.dim(
         "The causal stream is now active. Every file change will be tracked."
       )
     );
   } else {
     console.log(
-      chalk4.dim(
+      chalk5.dim(
         "Minimal workspace initialized. Existing files were not indexed."
       )
     );
@@ -2025,35 +2427,35 @@ program.command("seed").description("Refresh agent context files with current pr
   const rootPath = resolveRepoRoot(opts.path);
   const ide = opts.ide || "none";
   const force = opts.force || false;
-  console.log(chalk4.dim("Seeding agent context..."));
+  console.log(chalk5.dim("Seeding agent context..."));
   const result = await seedContext({ rootPath, ide, force });
   if (result.success) {
-    console.log(chalk4.green("\u2713 Context seeded"));
+    console.log(chalk5.green("\u2713 Context seeded"));
     console.log(
-      `  ${chalk4.dim("Files updated:")} ${result.filesUpdated.length}`
+      `  ${chalk5.dim("Files updated:")} ${result.filesUpdated.length}`
     );
     for (const f of result.filesUpdated) {
-      console.log(`    ${chalk4.dim("-")} ${f}`);
+      console.log(`    ${chalk5.dim("-")} ${f}`);
     }
-    console.log(`  ${chalk4.dim("Timestamp:")} ${result.timestamp}`);
+    console.log(`  ${chalk5.dim("Timestamp:")} ${result.timestamp}`);
   } else {
-    console.log(chalk4.red("\u2717 Failed to seed context"));
+    console.log(chalk5.red("\u2717 Failed to seed context"));
   }
 });
 program.command("repair").description("Attempt to repair a corrupted .trellis/ops.json file").option("-p, --path <path>", "Repository path", ".").action((opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  console.log(chalk4.yellow("Attempting to repair ops.json..."));
+  console.log(chalk5.yellow("Attempting to repair ops.json..."));
   const result = TrellisVcsEngine.repair(rootPath);
   if (result.lost === -1) {
     console.log(
-      chalk4.red(
+      chalk5.red(
         "Could not recover any ops. A corrupted backup was saved as ops.json.corrupted"
       )
     );
   } else if (result.recovered > 0) {
-    console.log(chalk4.green(`\u2713 Recovered ${result.recovered} ops.`));
+    console.log(chalk5.green(`\u2713 Recovered ${result.recovered} ops.`));
   } else {
-    console.log(chalk4.green("ops.json is already valid. No repair needed."));
+    console.log(chalk5.green("ops.json is already valid. No repair needed."));
   }
 });
 program.command("status").description("Show current repository status").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
@@ -2061,32 +2463,32 @@ program.command("status").description("Show current repository status").option("
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   const st = engine.status();
-  console.log(chalk4.bold("TrellisVCS Status"));
+  console.log(chalk5.bold("TrellisVCS Status"));
   console.log();
-  console.log(`  ${chalk4.dim("Branch:")}        ${chalk4.cyan(st.branch)}`);
-  console.log(`  ${chalk4.dim("Total ops:")}     ${st.totalOps}`);
-  console.log(`  ${chalk4.dim("Tracked files:")} ${st.trackedFiles}`);
+  console.log(`  ${chalk5.dim("Branch:")}        ${chalk5.cyan(st.branch)}`);
+  console.log(`  ${chalk5.dim("Total ops:")}     ${st.totalOps}`);
+  console.log(`  ${chalk5.dim("Tracked files:")} ${st.trackedFiles}`);
   if (st.lastOp) {
     console.log();
     console.log(
-      `  ${chalk4.dim("Last op:")}      ${chalk4.yellow(st.lastOp.kind)}`
+      `  ${chalk5.dim("Last op:")}      ${chalk5.yellow(st.lastOp.kind)}`
     );
-    console.log(`  ${chalk4.dim("  at:")}          ${st.lastOp.timestamp}`);
+    console.log(`  ${chalk5.dim("  at:")}          ${st.lastOp.timestamp}`);
     if (st.lastOp.vcs?.filePath) {
       console.log(
-        `  ${chalk4.dim("  file:")}        ${st.lastOp.vcs.filePath}`
+        `  ${chalk5.dim("  file:")}        ${st.lastOp.vcs.filePath}`
       );
     }
   }
   if (st.recentOps.length > 0) {
     console.log();
-    console.log(chalk4.dim("  Recent activity:"));
+    console.log(chalk5.dim("  Recent activity:"));
     const display = st.recentOps.filter((op) => op.kind !== "vcs:branchCreate").slice(-5);
     for (const op of display) {
       const kind = formatOpKind(op.kind);
       const file = op.vcs?.filePath ?? "";
       const time = formatRelativeTime2(op.timestamp);
-      console.log(`    ${kind} ${chalk4.white(file)} ${chalk4.dim(time)}`);
+      console.log(`    ${kind} ${chalk5.white(file)} ${chalk5.dim(time)}`);
     }
   }
 });
@@ -2099,8 +2501,8 @@ program.command("log").description("Show operation history").option("-p, --path
     filePath: opts.file
   });
   if (opts.remote || opts.all) {
-    const { RemoteManager } = await import("../remote-manager-ODE3T2KR.js");
-    const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
+    const { RemoteManager } = await import("../remote-manager-6ERQUBSL.js");
+    const remoteManager = new RemoteManager(join7(rootPath, ".trellis"));
     if (opts.all) {
       const remotes = remoteManager.listRemotes();
       const remoteOps = ops.filter(
@@ -2126,7 +2528,7 @@ program.command("log").description("Show operation history").option("-p, --path
     }
   }
   if (ops.length === 0) {
-    console.log(chalk4.dim("No operations found."));
+    console.log(chalk5.dim("No operations found."));
     return;
   }
   const groupedOps = opts.all || opts.remote ? ops.reduce(
@@ -2141,19 +2543,19 @@ program.command("log").description("Show operation history").option("-p, --path
     },
     {}
   ) : { local: ops };
-  console.log(chalk4.bold(`Causal Stream \u2014 ${ops.length} ops`));
+  console.log(chalk5.bold(`Causal Stream \u2014 ${ops.length} ops`));
   console.log();
   for (const [remote, remoteOps] of Object.entries(groupedOps)) {
     if (opts.all || opts.remote) {
-      console.log(chalk4.cyan(`${remote === "local" ? "Local" : remote}:`));
+      console.log(chalk5.cyan(`${remote === "local" ? "Local" : remote}:`));
     }
     for (const op of remoteOps.reverse()) {
       const kind = formatOpKind(op.kind);
-      const hash = chalk4.dim(op.hash.slice(0, 28) + "\u2026");
+      const hash = chalk5.dim(op.hash.slice(0, 28) + "\u2026");
       const time = formatRelativeTime2(op.timestamp);
-      const file = op.vcs?.filePath ? chalk4.white(op.vcs.filePath) : "";
-      const rename = op.vcs?.oldFilePath ? chalk4.dim(` (from ${op.vcs.oldFilePath})`) : "";
-      console.log(`  ${hash} ${kind} ${file}${rename} ${chalk4.dim(time)}`);
+      const file = op.vcs?.filePath ? chalk5.white(op.vcs.filePath) : "";
+      const rename = op.vcs?.oldFilePath ? chalk5.dim(` (from ${op.vcs.oldFilePath})`) : "";
+      console.log(`  ${hash} ${kind} ${file}${rename} ${chalk5.dim(time)}`);
     }
     if (opts.all || opts.remote) {
       console.log();
@@ -2166,13 +2568,13 @@ program.command("files").description("List all tracked files").option("-p, --pat
   engine.open();
   const files = engine.trackedFiles();
   if (files.length === 0) {
-    console.log(chalk4.dim("No tracked files."));
+    console.log(chalk5.dim("No tracked files."));
     return;
   }
-  console.log(chalk4.bold(`Tracked Files \u2014 ${files.length}`));
+  console.log(chalk5.bold(`Tracked Files \u2014 ${files.length}`));
   console.log();
   for (const f of files.sort((a, b) => a.path.localeCompare(b.path))) {
-    const hash = f.contentHash ? chalk4.dim(f.contentHash.slice(0, 12)) : chalk4.dim("(no hash)");
+    const hash = f.contentHash ? chalk5.dim(f.contentHash.slice(0, 12)) : chalk5.dim("(no hash)");
     console.log(`  ${hash} ${f.path}`);
   }
 });
@@ -2183,10 +2585,10 @@ program.command("watch").description("Start file watcher (foreground, Ctrl+C to
   await engine.syncEnvLaneFromEnv();
   const laneId = engine.getActiveLaneId();
   console.log(
-    chalk4.green("\u2713 Watching for changes\u2026") + chalk4.dim(" (Ctrl+C to stop)")
+    chalk5.green("\u2713 Watching for changes\u2026") + chalk5.dim(" (Ctrl+C to stop)")
   );
   if (laneId) {
-    console.log(chalk4.dim(`  Lane: ${laneId} (writes \u2192 lane journal)`));
+    console.log(chalk5.dim(`  Lane: ${laneId} (writes \u2192 lane journal)`));
   }
   console.log();
   const originalWatch = engine.watch.bind(engine);
@@ -2194,15 +2596,15 @@ program.command("watch").description("Start file watcher (foreground, Ctrl+C to
   process.on("SIGINT", () => {
     engine.stop();
     console.log();
-    console.log(chalk4.dim("Watcher stopped."));
+    console.log(chalk5.dim("Watcher stopped."));
     process.exit(0);
   });
 });
 program.command("import").description("Import from an existing Git repository").requiredOption("--from <path>", "Path to the Git repository to import from").option("-p, --path <path>", "Target TrellisVCS repository path", ".").action(async (opts) => {
   const from = resolve2(opts.from);
   const to = resolve2(opts.path);
-  console.log(chalk4.dim(`Importing from Git: ${from}`));
-  console.log(chalk4.dim(`Target: ${to}`));
+  console.log(chalk5.dim(`Importing from Git: ${from}`));
+  console.log(chalk5.dim(`Target: ${to}`));
   console.log();
   try {
     const result = await importFromGit({
@@ -2210,10 +2612,10 @@ program.command("import").description("Import from an existing Git repository").
       to,
       onProgress: (p) => {
         if (p.phase === "reading") {
-          process.stdout.write(`\r  ${chalk4.dim("Reading\u2026")} ${p.message}`);
+          process.stdout.write(`\r  ${chalk5.dim("Reading\u2026")} ${p.message}`);
         } else if (p.phase === "importing") {
           process.stdout.write(
-            `\r  ${chalk4.dim("Importing\u2026")} ${p.current}/${p.total} commits`
+            `\r  ${chalk5.dim("Importing\u2026")} ${p.current}/${p.total} commits`
           );
         } else {
           process.stdout.write("\n");
@@ -2221,24 +2623,24 @@ program.command("import").description("Import from an existing Git repository").
       }
     });
     console.log();
-    console.log(chalk4.green("\u2713 Git import complete"));
-    console.log(`  ${chalk4.dim("Commits:")}    ${result.commitsImported}`);
-    console.log(`  ${chalk4.dim("Ops:")}        ${result.opsCreated}`);
-    console.log(`  ${chalk4.dim("Files:")}      ${result.filesTracked}`);
+    console.log(chalk5.green("\u2713 Git import complete"));
+    console.log(`  ${chalk5.dim("Commits:")}    ${result.commitsImported}`);
+    console.log(`  ${chalk5.dim("Ops:")}        ${result.opsCreated}`);
+    console.log(`  ${chalk5.dim("Files:")}      ${result.filesTracked}`);
     console.log(
-      `  ${chalk4.dim("Branches:")}   ${result.branches.join(", ")}`
+      `  ${chalk5.dim("Branches:")}   ${result.branches.join(", ")}`
     );
     console.log(
-      `  ${chalk4.dim("Duration:")}   ${(result.duration / 1e3).toFixed(1)}s`
+      `  ${chalk5.dim("Duration:")}   ${(result.duration / 1e3).toFixed(1)}s`
     );
     console.log();
     console.log(
-      chalk4.dim(
+      chalk5.dim(
         "Run `trellis status` or `trellis log` to explore the imported history."
       )
     );
   } catch (err) {
-    console.error(chalk4.red(`
+    console.error(chalk5.red(`
 Import failed: ${err.message}`));
     process.exit(1);
   }
@@ -2246,8 +2648,8 @@ Import failed: ${err.message}`));
 program.command("export").description("Export milestones to a Git repository").requiredOption("--to <path>", "Path to the target Git repository").option("-p, --path <path>", "Source TrellisVCS repository path", ".").option("--author-name <name>", "Author name for Git commits").option("--author-email <email>", "Author email for Git commits").action(async (opts) => {
   const from = resolveRepoRoot(opts.path);
   const to = resolve2(opts.to);
-  console.log(chalk4.dim(`Exporting from: ${from}`));
-  console.log(chalk4.dim(`Target Git repo: ${to}`));
+  console.log(chalk5.dim(`Exporting from: ${from}`));
+  console.log(chalk5.dim(`Target Git repo: ${to}`));
   console.log();
   try {
     const result = await exportToGit({
@@ -2257,10 +2659,10 @@ program.command("export").description("Export milestones to a Git repository").r
       authorEmail: opts.authorEmail,
       onProgress: (p) => {
         if (p.phase === "preparing") {
-          console.log(`  ${chalk4.dim(p.message)}`);
+          console.log(`  ${chalk5.dim(p.message)}`);
         } else if (p.phase === "exporting") {
           process.stdout.write(
-            `\r  ${chalk4.dim("Exporting\u2026")} ${p.current}/${p.total} milestones`
+            `\r  ${chalk5.dim("Exporting\u2026")} ${p.current}/${p.total} milestones`
           );
         } else {
           process.stdout.write("\n");
@@ -2268,14 +2670,14 @@ program.command("export").description("Export milestones to a Git repository").r
       }
     });
     console.log();
-    console.log(chalk4.green("\u2713 Git export complete"));
-    console.log(`  ${chalk4.dim("Milestones:")} ${result.milestonesExported}`);
-    console.log(`  ${chalk4.dim("Commits:")}    ${result.commitsCreated}`);
+    console.log(chalk5.green("\u2713 Git export complete"));
+    console.log(`  ${chalk5.dim("Milestones:")} ${result.milestonesExported}`);
+    console.log(`  ${chalk5.dim("Commits:")}    ${result.commitsCreated}`);
     console.log(
-      `  ${chalk4.dim("Duration:")}   ${(result.duration / 1e3).toFixed(1)}s`
+      `  ${chalk5.dim("Duration:")}   ${(result.duration / 1e3).toFixed(1)}s`
     );
   } catch (err) {
-    console.error(chalk4.red(`
+    console.error(chalk5.red(`
 Export failed: ${err.message}`));
     process.exit(1);
   }
@@ -2287,9 +2689,9 @@ program.command("branch").description("Manage branches").argument("[name]", "Bra
   if (opts.delete) {
     try {
       await engine.deleteBranch(opts.delete);
-      console.log(chalk4.green(`\u2713 Deleted branch '${opts.delete}'`));
+      console.log(chalk5.green(`\u2713 Deleted branch '${opts.delete}'`));
     } catch (err) {
-      console.error(chalk4.red(err.message));
+      console.error(chalk5.red(err.message));
       process.exit(1);
     }
     return;
@@ -2300,9 +2702,9 @@ program.command("branch").description("Manage branches").argument("[name]", "Bra
     if (exists) {
       try {
         engine.switchBranch(name);
-        console.log(chalk4.green(`\u2713 Switched to branch '${name}'`));
+        console.log(chalk5.green(`\u2713 Switched to branch '${name}'`));
       } catch (err) {
-        console.error(chalk4.red(err.message));
+        console.error(chalk5.red(err.message));
         process.exit(1);
       }
     } else {
@@ -2310,10 +2712,10 @@ program.command("branch").description("Manage branches").argument("[name]", "Bra
         await engine.createBranch(name);
         engine.switchBranch(name);
         console.log(
-          chalk4.green(`\u2713 Created and switched to branch '${name}'`)
+          chalk5.green(`\u2713 Created and switched to branch '${name}'`)
         );
       } catch (err) {
-        console.error(chalk4.red(err.message));
+        console.error(chalk5.red(err.message));
         process.exit(1);
       }
     }
@@ -2321,14 +2723,14 @@ program.command("branch").description("Manage branches").argument("[name]", "Bra
   }
   const branches = engine.listBranches();
   if (branches.length === 0) {
-    console.log(chalk4.dim("No branches"));
+    console.log(chalk5.dim("No branches"));
     return;
   }
-  console.log(chalk4.bold("Branches\n"));
+  console.log(chalk5.bold("Branches\n"));
   for (const b of branches) {
-    const marker = b.isCurrent ? chalk4.green("* ") : "  ";
-    const name2 = b.isCurrent ? chalk4.green(b.name) : b.name;
-    const age = b.createdAt ? chalk4.dim(formatRelativeTime2(b.createdAt)) : "";
+    const marker = b.isCurrent ? chalk5.green("* ") : "  ";
+    const name2 = b.isCurrent ? chalk5.green(b.name) : b.name;
+    const age = b.createdAt ? chalk5.dim(formatRelativeTime2(b.createdAt)) : "";
     console.log(`${marker}${name2} ${age}`);
   }
 });
@@ -2339,7 +2741,7 @@ program.command("milestone").description("Create or list milestones").argument("
   if (action === "create") {
     if (!opts.message) {
       console.error(
-        chalk4.red('Milestone message is required: --message "..."')
+        chalk5.red('Milestone message is required: --message "..."')
       );
       process.exit(1);
     }
@@ -2348,32 +2750,32 @@ program.command("milestone").description("Create or list milestones").argument("
         fromOpHash: opts.from,
         toOpHash: opts.to
       });
-      console.log(chalk4.green(`\u2713 Milestone created`));
-      console.log(`  ${chalk4.dim("ID:")}      ${op.vcs?.milestoneId}`);
-      console.log(`  ${chalk4.dim("Message:")} ${opts.message}`);
-      console.log(`  ${chalk4.dim("Hash:")}    ${op.hash.slice(0, 32)}\u2026`);
+      console.log(chalk5.green(`\u2713 Milestone created`));
+      console.log(`  ${chalk5.dim("ID:")}      ${op.vcs?.milestoneId}`);
+      console.log(`  ${chalk5.dim("Message:")} ${opts.message}`);
+      console.log(`  ${chalk5.dim("Hash:")}    ${op.hash.slice(0, 32)}\u2026`);
     } catch (err) {
-      console.error(chalk4.red(`Failed: ${err.message}`));
+      console.error(chalk5.red(`Failed: ${err.message}`));
       process.exit(1);
     }
     return;
   }
   const milestones = engine.listMilestones();
   if (milestones.length === 0) {
-    console.log(chalk4.dim("No milestones"));
+    console.log(chalk5.dim("No milestones"));
     return;
   }
-  console.log(chalk4.bold(`Milestones (${milestones.length})
+  console.log(chalk5.bold(`Milestones (${milestones.length})
 `));
   for (const m of milestones) {
     const age = m.createdAt ? formatRelativeTime2(m.createdAt) : "";
     console.log(
-      `  ${chalk4.cyan("\u2605")} ${chalk4.bold(m.message ?? "(no message)")}`
+      `  ${chalk5.cyan("\u2605")} ${chalk5.bold(m.message ?? "(no message)")}`
     );
-    console.log(`    ${chalk4.dim("ID:")} ${m.id}  ${chalk4.dim(age)}`);
+    console.log(`    ${chalk5.dim("ID:")} ${m.id}  ${chalk5.dim(age)}`);
     if (m.affectedFiles.length > 0) {
       console.log(
-        `    ${chalk4.dim("Files:")} ${m.affectedFiles.slice(0, 5).join(", ")}${m.affectedFiles.length > 5 ? ` +${m.affectedFiles.length - 5} more` : ""}`
+        `    ${chalk5.dim("Files:")} ${m.affectedFiles.slice(0, 5).join(", ")}${m.affectedFiles.length > 5 ? ` +${m.affectedFiles.length - 5} more` : ""}`
       );
     }
     console.log();
@@ -2386,26 +2788,26 @@ program.command("checkpoint").description("Create or list checkpoints").argument
   if (action === "create") {
     try {
       const op = await engine.createCheckpoint("manual");
-      console.log(chalk4.green(`\u2713 Checkpoint created`));
-      console.log(`  ${chalk4.dim("Hash:")}    ${op.hash.slice(0, 32)}\u2026`);
-      console.log(`  ${chalk4.dim("Trigger:")} manual`);
+      console.log(chalk5.green(`\u2713 Checkpoint created`));
+      console.log(`  ${chalk5.dim("Hash:")}    ${op.hash.slice(0, 32)}\u2026`);
+      console.log(`  ${chalk5.dim("Trigger:")} manual`);
     } catch (err) {
-      console.error(chalk4.red(`Failed: ${err.message}`));
+      console.error(chalk5.red(`Failed: ${err.message}`));
       process.exit(1);
     }
     return;
   }
   const checkpoints = engine.listCheckpoints();
   if (checkpoints.length === 0) {
-    console.log(chalk4.dim("No checkpoints"));
+    console.log(chalk5.dim("No checkpoints"));
     return;
   }
-  console.log(chalk4.bold(`Checkpoints (${checkpoints.length})
+  console.log(chalk5.bold(`Checkpoints (${checkpoints.length})
 `));
   for (const cp of checkpoints) {
     const age = cp.createdAt ? formatRelativeTime2(cp.createdAt) : "";
     console.log(
-      `  ${chalk4.dim("\u25CF")} ${cp.id.slice(0, 32)}  ${chalk4.dim(cp.trigger ?? "")}  ${chalk4.dim(age)}`
+      `  ${chalk5.dim("\u25CF")} ${cp.id.slice(0, 32)}  ${chalk5.dim(cp.trigger ?? "")}  ${chalk5.dim(age)}`
     );
   }
 });
@@ -2421,44 +2823,44 @@ program.command("diff").description("Show file-level diff between two points in
   } else {
     const ops = engine.getOps();
     if (ops.length < 2) {
-      console.log(chalk4.dim("Not enough history to diff."));
+      console.log(chalk5.dim("Not enough history to diff."));
       return;
     }
     result = engine.diffOps(ops[0].hash, ops[ops.length - 1].hash);
   }
   if (result.diffs.length === 0) {
-    console.log(chalk4.dim("No differences."));
+    console.log(chalk5.dim("No differences."));
     return;
   }
   const s = result.stats;
   console.log(
-    `${chalk4.green(`+${s.added} added`)}  ${chalk4.yellow(`~${s.modified} modified`)}  ${chalk4.red(`-${s.removed} removed`)}${s.renamed ? `  ${chalk4.blue(`\u2192${s.renamed} renamed`)}` : ""}`
+    `${chalk5.green(`+${s.added} added`)}  ${chalk5.yellow(`~${s.modified} modified`)}  ${chalk5.red(`-${s.removed} removed`)}${s.renamed ? `  ${chalk5.blue(`\u2192${s.renamed} renamed`)}` : ""}`
   );
   console.log();
   if (opts.stat) return;
   for (const diff of result.diffs) {
     switch (diff.kind) {
       case "fileAdded":
-        console.log(`${chalk4.green("+ " + diff.path)}`);
+        console.log(`${chalk5.green("+ " + diff.path)}`);
         break;
       case "fileDeleted":
-        console.log(`${chalk4.red("- " + diff.path)}`);
+        console.log(`${chalk5.red("- " + diff.path)}`);
         break;
       case "fileRenamed":
-        console.log(`${chalk4.blue(`\u2192 ${diff.oldPath} \u2192 ${diff.path}`)}`);
+        console.log(`${chalk5.blue(`\u2192 ${diff.oldPath} \u2192 ${diff.path}`)}`);
         break;
       case "fileModified":
-        console.log(`${chalk4.yellow("~ " + diff.path)}`);
+        console.log(`${chalk5.yellow("~ " + diff.path)}`);
         if (diff.unifiedDiff) {
           for (const line of diff.unifiedDiff.split("\n")) {
             if (line.startsWith("+")) {
-              console.log(chalk4.green(line));
+              console.log(chalk5.green(line));
             } else if (line.startsWith("-")) {
-              console.log(chalk4.red(line));
+              console.log(chalk5.red(line));
             } else if (line.startsWith("@@")) {
-              console.log(chalk4.cyan(line));
+              console.log(chalk5.cyan(line));
             } else {
-              console.log(chalk4.dim(line));
+              console.log(chalk5.dim(line));
             }
           }
         }
@@ -2473,67 +2875,67 @@ program.command("merge").description("Merge a branch into the current branch").a
   engine.open();
   const result = engine.mergeBranch(branch);
   if (result.clean) {
-    console.log(chalk4.green("\u2713 Merge completed cleanly"));
+    console.log(chalk5.green("\u2713 Merge completed cleanly"));
   } else {
     console.log(
-      chalk4.yellow(`\u26A0 Merge has ${result.conflicts.length} conflict(s)`)
+      chalk5.yellow(`\u26A0 Merge has ${result.conflicts.length} conflict(s)`)
     );
   }
   const s = result.stats;
-  console.log(`  ${chalk4.dim("Modified:")}   ${s.modified}`);
-  console.log(`  ${chalk4.dim("Deleted:")}    ${s.deleted}`);
-  console.log(`  ${chalk4.dim("Conflicted:")} ${s.conflicted}`);
+  console.log(`  ${chalk5.dim("Modified:")}   ${s.modified}`);
+  console.log(`  ${chalk5.dim("Deleted:")}    ${s.deleted}`);
+  console.log(`  ${chalk5.dim("Conflicted:")} ${s.conflicted}`);
   if (result.conflicts.length > 0) {
     console.log();
-    console.log(chalk4.bold("Conflicts:"));
+    console.log(chalk5.bold("Conflicts:"));
     for (const c of result.conflicts) {
-      console.log(`  ${chalk4.red("\u2717")} ${c.path} (${c.kind})`);
+      console.log(`  ${chalk5.red("\u2717")} ${c.path} (${c.kind})`);
     }
   }
   if (opts.dryRun) {
     console.log();
-    console.log(chalk4.dim("(dry run \u2014 no changes applied)"));
+    console.log(chalk5.dim("(dry run \u2014 no changes applied)"));
   }
 });
 program.command("parse").description("Parse a file into AST-level semantic entities").argument("<file>", "File to parse").option("-p, --path <path>", "Repository path", ".").action((file, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
-  const { readFileSync: readFileSync5 } = __require("fs");
+  const { readFileSync: readFileSync7 } = __require("fs");
   const filePath = resolve2(file);
-  const content = readFileSync5(filePath, "utf-8");
+  const content = readFileSync7(filePath, "utf-8");
   const result = engine.parseFile(content, file);
   if (!result) {
-    console.log(chalk4.dim(`No parser available for: ${file}`));
+    console.log(chalk5.dim(`No parser available for: ${file}`));
     return;
   }
-  console.log(chalk4.bold(`Parse: ${file}
+  console.log(chalk5.bold(`Parse: ${file}
 `));
-  console.log(`  ${chalk4.dim("Language:")}     ${result.language}`);
+  console.log(`  ${chalk5.dim("Language:")}     ${result.language}`);
   console.log(
-    `  ${chalk4.dim("Declarations:")} ${result.declarations.length}`
+    `  ${chalk5.dim("Declarations:")} ${result.declarations.length}`
   );
-  console.log(`  ${chalk4.dim("Imports:")}      ${result.imports.length}`);
-  console.log(`  ${chalk4.dim("Exports:")}      ${result.exports.length}`);
+  console.log(`  ${chalk5.dim("Imports:")}      ${result.imports.length}`);
+  console.log(`  ${chalk5.dim("Exports:")}      ${result.exports.length}`);
   if (result.declarations.length > 0) {
     console.log();
-    console.log(chalk4.bold("Declarations:"));
+    console.log(chalk5.bold("Declarations:"));
     for (const d of result.declarations) {
       console.log(
-        `  ${chalk4.cyan(d.kind.padEnd(14))} ${chalk4.bold(d.name)}${d.children.length ? ` (${d.children.length} members)` : ""}`
+        `  ${chalk5.cyan(d.kind.padEnd(14))} ${chalk5.bold(d.name)}${d.children.length ? ` (${d.children.length} members)` : ""}`
       );
       for (const child of d.children) {
-        console.log(`    ${chalk4.dim(child.kind.padEnd(14))} ${child.name}`);
+        console.log(`    ${chalk5.dim(child.kind.padEnd(14))} ${child.name}`);
       }
     }
   }
   if (result.imports.length > 0) {
     console.log();
-    console.log(chalk4.bold("Imports:"));
+    console.log(chalk5.bold("Imports:"));
     for (const imp of result.imports) {
       const specs = imp.specifiers.length > 0 ? ` { ${imp.specifiers.join(", ")} }` : "";
       console.log(
-        `  ${chalk4.dim("from")} ${chalk4.yellow(imp.source)}${specs}`
+        `  ${chalk5.dim("from")} ${chalk5.yellow(imp.source)}${specs}`
       );
     }
   }
@@ -2542,64 +2944,64 @@ program.command("sdiff").description("Show semantic diff between two versions of
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
-  const { readFileSync: readFileSync5 } = __require("fs");
-  const oldContent = readFileSync5(resolve2(fileA), "utf-8");
-  const newContent = readFileSync5(resolve2(fileB), "utf-8");
+  const { readFileSync: readFileSync7 } = __require("fs");
+  const oldContent = readFileSync7(resolve2(fileA), "utf-8");
+  const newContent = readFileSync7(resolve2(fileB), "utf-8");
   const patches = engine.semanticDiff(oldContent, newContent, fileA);
   if (patches.length === 0) {
-    console.log(chalk4.dim("No semantic differences."));
+    console.log(chalk5.dim("No semantic differences."));
     return;
   }
-  console.log(chalk4.bold(`Semantic diff: ${fileA} \u2192 ${fileB}
+  console.log(chalk5.bold(`Semantic diff: ${fileA} \u2192 ${fileB}
 `));
-  console.log(`  ${chalk4.dim("Patches:")} ${patches.length}
+  console.log(`  ${chalk5.dim("Patches:")} ${patches.length}
 `);
   for (const patch of patches) {
     switch (patch.kind) {
       case "symbolAdd":
         console.log(
-          `  ${chalk4.green("+")} ${chalk4.green(`${patch.entity.kind}: ${patch.entity.name}`)}`
+          `  ${chalk5.green("+")} ${chalk5.green(`${patch.entity.kind}: ${patch.entity.name}`)}`
         );
         break;
       case "symbolRemove":
         console.log(
-          `  ${chalk4.red("-")} ${chalk4.red(`${patch.entityName}`)} (removed)`
+          `  ${chalk5.red("-")} ${chalk5.red(`${patch.entityName}`)} (removed)`
         );
         break;
       case "symbolModify":
         console.log(
-          `  ${chalk4.yellow("~")} ${chalk4.yellow(patch.entityName)} (modified)`
+          `  ${chalk5.yellow("~")} ${chalk5.yellow(patch.entityName)} (modified)`
         );
         break;
       case "symbolRename":
         console.log(
-          `  ${chalk4.blue("\u2192")} ${chalk4.blue(`${patch.oldName} \u2192 ${patch.newName}`)} (renamed)`
+          `  ${chalk5.blue("\u2192")} ${chalk5.blue(`${patch.oldName} \u2192 ${patch.newName}`)} (renamed)`
         );
         break;
       case "importAdd":
         console.log(
-          `  ${chalk4.green("+")} import from ${chalk4.yellow(patch.source)}`
+          `  ${chalk5.green("+")} import from ${chalk5.yellow(patch.source)}`
         );
         break;
       case "importRemove":
         console.log(
-          `  ${chalk4.red("-")} import from ${chalk4.yellow(patch.source)}`
+          `  ${chalk5.red("-")} import from ${chalk5.yellow(patch.source)}`
         );
         break;
       case "importModify":
         console.log(
-          `  ${chalk4.yellow("~")} import from ${chalk4.yellow(patch.source)} (specifiers changed)`
+          `  ${chalk5.yellow("~")} import from ${chalk5.yellow(patch.source)} (specifiers changed)`
         );
         break;
       case "exportAdd":
-        console.log(`  ${chalk4.green("+")} export ${chalk4.bold(patch.name)}`);
+        console.log(`  ${chalk5.green("+")} export ${chalk5.bold(patch.name)}`);
         break;
       case "exportRemove":
-        console.log(`  ${chalk4.red("-")} export ${chalk4.bold(patch.name)}`);
+        console.log(`  ${chalk5.red("-")} export ${chalk5.bold(patch.name)}`);
         break;
       case "symbolMove":
         console.log(
-          `  ${chalk4.blue("\u2192")} ${chalk4.blue(patch.entityName)} moved ${patch.oldFile} \u2192 ${patch.newFile}`
+          `  ${chalk5.blue("\u2192")} ${chalk5.blue(patch.entityName)} moved ${patch.oldFile} \u2192 ${patch.newFile}`
         );
         break;
     }
@@ -2614,18 +3016,18 @@ program.command("sync").description("Sync operations with another TrellisVCS rep
   engine.open();
   const ops = engine.getOps();
   if (action === "status" || !action) {
-    console.log(chalk4.bold("Sync Status\n"));
-    console.log(`  ${chalk4.dim("Local ops:")}  ${ops.length}`);
+    console.log(chalk5.bold("Sync Status\n"));
+    console.log(`  ${chalk5.dim("Local ops:")}  ${ops.length}`);
     console.log(
-      `  ${chalk4.dim("Head:")}       ${ops.length > 0 ? ops[ops.length - 1].hash.slice(0, 16) + "\u2026" : "(none)"}`
+      `  ${chalk5.dim("Head:")}       ${ops.length > 0 ? ops[ops.length - 1].hash.slice(0, 16) + "\u2026" : "(none)"}`
     );
-    console.log(`  ${chalk4.dim("Branch:")}     ${engine.getCurrentBranch()}`);
+    console.log(`  ${chalk5.dim("Branch:")}     ${engine.getCurrentBranch()}`);
     return;
   }
   if (action === "reconcile" && opts.remote) {
     const remotePath = resolve2(opts.remote);
     if (!TrellisVcsEngine.isRepo(remotePath)) {
-      console.error(chalk4.red(`Not a TrellisVCS repository: ${remotePath}`));
+      console.error(chalk5.red(`Not a TrellisVCS repository: ${remotePath}`));
       process.exit(1);
     }
     const remoteEngine = new TrellisVcsEngine({ rootPath: remotePath });
@@ -2633,32 +3035,32 @@ program.command("sync").description("Sync operations with another TrellisVCS rep
     const remoteOps = remoteEngine.getOps();
     const { reconcile } = (init_reconciler(), __toCommonJS(reconciler_exports));
     const result = reconcile(ops, remoteOps);
-    console.log(chalk4.bold("Reconcile Result\n"));
-    console.log(`  ${chalk4.dim("Merged ops:")}    ${result.merged.length}`);
-    console.log(`  ${chalk4.dim("Unique local:")} ${result.uniqueToA.length}`);
+    console.log(chalk5.bold("Reconcile Result\n"));
+    console.log(`  ${chalk5.dim("Merged ops:")}    ${result.merged.length}`);
+    console.log(`  ${chalk5.dim("Unique local:")} ${result.uniqueToA.length}`);
     console.log(
-      `  ${chalk4.dim("Unique remote:")} ${result.uniqueToB.length}`
+      `  ${chalk5.dim("Unique remote:")} ${result.uniqueToB.length}`
     );
     console.log(
-      `  ${chalk4.dim("Fork point:")}   ${result.forkPoint?.slice(0, 16) ?? "(none)"}`
+      `  ${chalk5.dim("Fork point:")}   ${result.forkPoint?.slice(0, 16) ?? "(none)"}`
     );
     console.log(
-      `  ${chalk4.dim("Clean:")}        ${result.clean ? chalk4.green("yes") : chalk4.red("no")}`
+      `  ${chalk5.dim("Clean:")}        ${result.clean ? chalk5.green("yes") : chalk5.red("no")}`
     );
     if (result.conflicts.length > 0) {
       console.log();
-      console.log(chalk4.bold("Conflicts:"));
+      console.log(chalk5.bold("Conflicts:"));
       for (const c of result.conflicts) {
-        console.log(`  ${chalk4.red("\u2717")} ${c.filePath}: ${c.reason}`);
+        console.log(`  ${chalk5.red("\u2717")} ${c.filePath}: ${c.reason}`);
       }
     }
     return;
   }
   console.log(
-    chalk4.dim("Use --remote <path> with reconcile to compare repositories.")
+    chalk5.dim("Use --remote <path> with reconcile to compare repositories.")
   );
   console.log(
-    chalk4.dim("Full peer sync requires a transport layer (coming soon).")
+    chalk5.dim("Full peer sync requires a transport layer (coming soon).")
   );
 });
 program.command("garden").description("Explore the Idea Garden \u2014 abandoned work clusters").argument(
@@ -2671,66 +3073,66 @@ program.command("garden").description("Explore the Idea Garden \u2014 abandoned
   const garden = engine.garden();
   if (action === "stats") {
     const s = garden.stats();
-    console.log(chalk4.bold("Idea Garden Stats\n"));
-    console.log(`  ${chalk4.dim("Total clusters:")} ${s.total}`);
-    console.log(`  ${chalk4.dim("Abandoned:")}      ${s.abandoned}`);
-    console.log(`  ${chalk4.dim("Draft:")}          ${s.draft}`);
-    console.log(`  ${chalk4.dim("Revived:")}        ${s.revived}`);
-    console.log(`  ${chalk4.dim("Total ops:")}      ${s.totalOps}`);
-    console.log(`  ${chalk4.dim("Total files:")}    ${s.totalFiles}`);
+    console.log(chalk5.bold("Idea Garden Stats\n"));
+    console.log(`  ${chalk5.dim("Total clusters:")} ${s.total}`);
+    console.log(`  ${chalk5.dim("Abandoned:")}      ${s.abandoned}`);
+    console.log(`  ${chalk5.dim("Draft:")}          ${s.draft}`);
+    console.log(`  ${chalk5.dim("Revived:")}        ${s.revived}`);
+    console.log(`  ${chalk5.dim("Total ops:")}      ${s.totalOps}`);
+    console.log(`  ${chalk5.dim("Total files:")}    ${s.totalFiles}`);
     return;
   }
   if (action === "show") {
     if (!id) {
-      console.error(chalk4.red("Usage: trellis garden show <cluster-id>"));
+      console.error(chalk5.red("Usage: trellis garden show <cluster-id>"));
       process.exit(1);
     }
     const cluster = garden.getCluster(id);
     if (!cluster) {
-      console.error(chalk4.red(`Cluster not found: ${id}`));
+      console.error(chalk5.red(`Cluster not found: ${id}`));
       process.exit(1);
     }
-    console.log(chalk4.bold(`Cluster: ${cluster.id}
+    console.log(chalk5.bold(`Cluster: ${cluster.id}
 `));
     console.log(
-      `  ${chalk4.dim("Status:")}     ${formatClusterStatus(cluster.status)}`
+      `  ${chalk5.dim("Status:")}     ${formatClusterStatus(cluster.status)}`
     );
-    console.log(`  ${chalk4.dim("Detected by:")} ${cluster.detectedBy}`);
-    console.log(`  ${chalk4.dim("Created:")}    ${cluster.createdAt}`);
-    console.log(`  ${chalk4.dim("Abandoned:")}  ${cluster.abandonedAt}`);
-    console.log(`  ${chalk4.dim("Ops:")}        ${cluster.ops.length}`);
+    console.log(`  ${chalk5.dim("Detected by:")} ${cluster.detectedBy}`);
+    console.log(`  ${chalk5.dim("Created:")}    ${cluster.createdAt}`);
+    console.log(`  ${chalk5.dim("Abandoned:")}  ${cluster.abandonedAt}`);
+    console.log(`  ${chalk5.dim("Ops:")}        ${cluster.ops.length}`);
     console.log(
-      `  ${chalk4.dim("Files:")}      ${cluster.affectedFiles.join(", ")}`
+      `  ${chalk5.dim("Files:")}      ${cluster.affectedFiles.join(", ")}`
     );
     if (cluster.estimatedIntent) {
-      console.log(`  ${chalk4.dim("Intent:")}     ${cluster.estimatedIntent}`);
+      console.log(`  ${chalk5.dim("Intent:")}     ${cluster.estimatedIntent}`);
     }
     console.log();
-    console.log(chalk4.bold("Operations:"));
+    console.log(chalk5.bold("Operations:"));
     for (const op of cluster.ops.slice(0, 20)) {
       console.log(
-        `  ${formatOpKind(op.kind)} ${chalk4.dim(op.hash.slice(0, 12))} ${op.vcs?.filePath ?? ""}`
+        `  ${formatOpKind(op.kind)} ${chalk5.dim(op.hash.slice(0, 12))} ${op.vcs?.filePath ?? ""}`
       );
     }
     if (cluster.ops.length > 20) {
-      console.log(chalk4.dim(`  ... +${cluster.ops.length - 20} more`));
+      console.log(chalk5.dim(`  ... +${cluster.ops.length - 20} more`));
     }
     return;
   }
   if (action === "revive") {
     if (!id) {
-      console.error(chalk4.red("Usage: trellis garden revive <cluster-id>"));
+      console.error(chalk5.red("Usage: trellis garden revive <cluster-id>"));
       process.exit(1);
     }
     const ops = garden.revive(id);
     if (!ops) {
-      console.error(chalk4.red(`Cluster not found: ${id}`));
+      console.error(chalk5.red(`Cluster not found: ${id}`));
       process.exit(1);
     }
-    console.log(chalk4.green(`\u2713 Cluster revived: ${id}`));
-    console.log(`  ${chalk4.dim("Ops to replay:")} ${ops.length}`);
+    console.log(chalk5.green(`\u2713 Cluster revived: ${id}`));
+    console.log(`  ${chalk5.dim("Ops to replay:")} ${ops.length}`);
     console.log(
-      `  ${chalk4.dim("Files:")} ${[...new Set(ops.filter((o) => o.vcs?.filePath).map((o) => o.vcs.filePath))].join(", ")}`
+      `  ${chalk5.dim("Files:")} ${[...new Set(ops.filter((o) => o.vcs?.filePath).map((o) => o.vcs.filePath))].join(", ")}`
     );
     return;
   }
@@ -2742,10 +3144,10 @@ program.command("garden").description("Explore the Idea Garden \u2014 abandoned
       limit: opts.limit
     });
     if (results.length === 0) {
-      console.log(chalk4.dim("No matching clusters found."));
+      console.log(chalk5.dim("No matching clusters found."));
       return;
     }
-    console.log(chalk4.bold(`Search results (${results.length})
+    console.log(chalk5.bold(`Search results (${results.length})
 `));
     for (const c of results) {
       printClusterSummary(c);
@@ -2759,10 +3161,10 @@ program.command("garden").description("Explore the Idea Garden \u2014 abandoned
     limit: opts.limit
   });
   if (clusters.length === 0) {
-    console.log(chalk4.dim("No idea clusters found. The garden is empty."));
+    console.log(chalk5.dim("No idea clusters found. The garden is empty."));
     return;
   }
-  console.log(chalk4.bold(`Idea Garden (${clusters.length} clusters)
+  console.log(chalk5.bold(`Idea Garden (${clusters.length} clusters)
 `));
   for (const c of clusters) {
     printClusterSummary(c);
@@ -2771,67 +3173,67 @@ program.command("garden").description("Explore the Idea Garden \u2014 abandoned
 function formatClusterStatus(status) {
   switch (status) {
     case "abandoned":
-      return chalk4.yellow("abandoned");
+      return chalk5.yellow("abandoned");
     case "draft":
-      return chalk4.blue("draft");
+      return chalk5.blue("draft");
     case "revived":
-      return chalk4.green("revived");
+      return chalk5.green("revived");
     default:
-      return chalk4.dim(status);
+      return chalk5.dim(status);
   }
 }
 function printClusterSummary(c) {
   console.log(
-    `  ${chalk4.cyan("\u2740")} ${chalk4.bold(c.id)}  ${formatClusterStatus(c.status)}  ${chalk4.dim(c.detectedBy)}`
+    `  ${chalk5.cyan("\u2740")} ${chalk5.bold(c.id)}  ${formatClusterStatus(c.status)}  ${chalk5.dim(c.detectedBy)}`
   );
   console.log(
-    `    ${chalk4.dim("Ops:")} ${c.ops.length}  ${chalk4.dim("Files:")} ${c.affectedFiles.slice(0, 3).join(", ")}${c.affectedFiles.length > 3 ? ` +${c.affectedFiles.length - 3}` : ""}`
+    `    ${chalk5.dim("Ops:")} ${c.ops.length}  ${chalk5.dim("Files:")} ${c.affectedFiles.slice(0, 3).join(", ")}${c.affectedFiles.length > 3 ? ` +${c.affectedFiles.length - 3}` : ""}`
   );
   console.log(
-    `    ${chalk4.dim("Created:")} ${formatRelativeTime2(c.createdAt)}  ${chalk4.dim("Abandoned:")} ${formatRelativeTime2(c.abandonedAt)}`
+    `    ${chalk5.dim("Created:")} ${formatRelativeTime2(c.createdAt)}  ${chalk5.dim("Abandoned:")} ${formatRelativeTime2(c.abandonedAt)}`
   );
   console.log();
 }
 function formatIssueStatus(status) {
   switch (status) {
     case "backlog":
-      return chalk4.gray("backlog");
+      return chalk5.gray("backlog");
     case "queue":
-      return chalk4.blue("queue");
+      return chalk5.blue("queue");
     case "in_progress":
-      return chalk4.yellow("in_progress");
+      return chalk5.yellow("in_progress");
     case "paused":
-      return chalk4.magenta("paused");
+      return chalk5.magenta("paused");
     case "closed":
-      return chalk4.green("closed");
+      return chalk5.green("closed");
     default:
-      return chalk4.dim(status ?? "unknown");
+      return chalk5.dim(status ?? "unknown");
   }
 }
 function formatPriority(p) {
   switch (p) {
     case "critical":
-      return chalk4.red("critical");
+      return chalk5.red("critical");
     case "high":
-      return chalk4.yellow("high");
+      return chalk5.yellow("high");
     case "medium":
-      return chalk4.cyan("medium");
+      return chalk5.cyan("medium");
     case "low":
-      return chalk4.dim("low");
+      return chalk5.dim("low");
     default:
-      return chalk4.dim(p ?? "");
+      return chalk5.dim(p ?? "");
   }
 }
 function formatCriterionStatus(status) {
   switch (status) {
     case "passed":
-      return chalk4.green("\u2713 passed");
+      return chalk5.green("\u2713 passed");
     case "failed":
-      return chalk4.red("\u2717 failed");
+      return chalk5.red("\u2717 failed");
     case "pending":
-      return chalk4.dim("\u25CB pending");
+      return chalk5.dim("\u25CB pending");
     default:
-      return chalk4.dim(status ?? "pending");
+      return chalk5.dim(status ?? "pending");
   }
 }
 var issueCmd = program.command("issue").description("Manage issues (task tracking)");
@@ -2867,18 +3269,18 @@ issueCmd.command("create").description("Create a new issue").requiredOption("-t,
     criteria
   });
   const issueId = op.vcs?.issueId;
-  console.log(chalk4.green(`\u2713 Issue created: ${chalk4.bold(issueId)}`));
-  console.log(`  ${chalk4.dim("Title:")}    ${opts.title}`);
-  console.log(`  ${chalk4.dim("Priority:")} ${formatPriority(opts.priority)}`);
+  console.log(chalk5.green(`\u2713 Issue created: ${chalk5.bold(issueId)}`));
+  console.log(`  ${chalk5.dim("Title:")}    ${opts.title}`);
+  console.log(`  ${chalk5.dim("Priority:")} ${formatPriority(opts.priority)}`);
   if (labels) {
-    console.log(`  ${chalk4.dim("Labels:")}   ${labels.join(", ")}`);
+    console.log(`  ${chalk5.dim("Labels:")}   ${labels.join(", ")}`);
   }
   if (opts.parent) {
-    console.log(`  ${chalk4.dim("Parent:")}   ${opts.parent}`);
+    console.log(`  ${chalk5.dim("Parent:")}   ${opts.parent}`);
   }
   if (criteria) {
     console.log(
-      `  ${chalk4.dim("Criteria:")} ${criteria.length} acceptance criteria`
+      `  ${chalk5.dim("Criteria:")} ${criteria.length} acceptance criteria`
     );
   }
 });
@@ -2896,8 +3298,8 @@ issueCmd.command("list").description("List issues").option(
     parentId: opts.parent
   });
   if (opts.remote || opts.all) {
-    const { RemoteManager } = await import("../remote-manager-ODE3T2KR.js");
-    const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
+    const { RemoteManager } = await import("../remote-manager-6ERQUBSL.js");
+    const remoteManager = new RemoteManager(join7(rootPath, ".trellis"));
     if (opts.all) {
       const remotes = remoteManager.listRemotes();
       const remoteIssues = issues.filter(
@@ -2917,7 +3319,7 @@ issueCmd.command("list").description("List issues").option(
     }
   }
   if (issues.length === 0) {
-    console.log(chalk4.dim("No issues found."));
+    console.log(chalk5.dim("No issues found."));
     return;
   }
   const groupedIssues = opts.all || opts.remote ? issues.reduce(
@@ -2930,24 +3332,24 @@ issueCmd.command("list").description("List issues").option(
     },
     {}
   ) : { local: issues };
-  console.log(chalk4.bold(`Issues (${issues.length})
+  console.log(chalk5.bold(`Issues (${issues.length})
 `));
   for (const [remote, remoteIssues] of Object.entries(groupedIssues)) {
     if (opts.all || opts.remote) {
-      console.log(chalk4.cyan(`
+      console.log(chalk5.cyan(`
 ${remote === "local" ? "Local" : remote}:`));
     }
     for (const issue of remoteIssues) {
-      const labels = (issue.labels?.length ?? 0) > 0 ? chalk4.dim(` [${issue.labels.join(",")}]`) : "";
-      const assignee = issue.assignee ? chalk4.dim(` \u2192 ${issue.assignee}`) : "";
-      const parent = issue.parentId ? chalk4.dim(` \u2190 ${issue.parentId}`) : "";
-      const blocked = issue.isBlocked ? chalk4.yellow(" \u{1F512} blocked") : "";
-      const criteria = (issue.criteria?.length ?? 0) > 0 ? chalk4.dim(
+      const labels = (issue.labels?.length ?? 0) > 0 ? chalk5.dim(` [${issue.labels.join(",")}]`) : "";
+      const assignee = issue.assignee ? chalk5.dim(` \u2192 ${issue.assignee}`) : "";
+      const parent = issue.parentId ? chalk5.dim(` \u2190 ${issue.parentId}`) : "";
+      const blocked = issue.isBlocked ? chalk5.yellow(" \u{1F512} blocked") : "";
+      const criteria = (issue.criteria?.length ?? 0) > 0 ? chalk5.dim(
         ` (${issue.criteria.filter((c) => c.status === "passed").length}/${issue.criteria.length} AC)`
       ) : "";
       const displayId = opts.all || opts.remote ? issue.id : issue.id;
       console.log(
-        `  ${formatPriority(issue.priority)} ${chalk4.bold(displayId)} ${formatIssueStatus(issue.status)} ${issue.title ?? ""}${labels}${assignee}${parent}${blocked}${criteria}`
+        `  ${formatPriority(issue.priority)} ${chalk5.bold(displayId)} ${formatIssueStatus(issue.status)} ${issue.title ?? ""}${labels}${assignee}${parent}${blocked}${criteria}`
       );
     }
   }
@@ -2960,61 +3362,61 @@ issueCmd.command("show").description("Show issue details").argument("<id>", "Iss
   if (!issue) {
     throw new Error(`Issue not found: ${id}`);
   }
-  console.log(chalk4.bold(`${issue.id}: ${issue.title ?? "(untitled)"}
+  console.log(chalk5.bold(`${issue.id}: ${issue.title ?? "(untitled)"}
 `));
   if (issue.description) {
-    console.log(`  ${chalk4.dim(issue.description)}
+    console.log(`  ${chalk5.dim(issue.description)}
 `);
   }
   console.log(
-    `  ${chalk4.dim("Status:")}    ${formatIssueStatus(issue.status)}`
+    `  ${chalk5.dim("Status:")}    ${formatIssueStatus(issue.status)}`
   );
   console.log(
-    `  ${chalk4.dim("Priority:")}  ${formatPriority(issue.priority)}`
+    `  ${chalk5.dim("Priority:")}  ${formatPriority(issue.priority)}`
   );
   if ((issue.labels?.length ?? 0) > 0) {
-    console.log(`  ${chalk4.dim("Labels:")}    ${issue.labels.join(", ")}`);
+    console.log(`  ${chalk5.dim("Labels:")}    ${issue.labels.join(", ")}`);
   }
   if (issue.assignee) {
-    console.log(`  ${chalk4.dim("Assignee:")}  ${issue.assignee}`);
+    console.log(`  ${chalk5.dim("Assignee:")}  ${issue.assignee}`);
   }
   if (issue.parentId) {
-    console.log(`  ${chalk4.dim("Parent:")}    ${issue.parentId}`);
+    console.log(`  ${chalk5.dim("Parent:")}    ${issue.parentId}`);
   }
   if (issue.branchName) {
-    console.log(`  ${chalk4.dim("Branch:")}    ${issue.branchName}`);
+    console.log(`  ${chalk5.dim("Branch:")}    ${issue.branchName}`);
   }
   if ((issue.blockedBy?.length ?? 0) > 0) {
     console.log(
-      `  ${chalk4.dim("Blocked by:")} ${issue.blockedBy.map((b) => chalk4.yellow(b)).join(", ")}`
+      `  ${chalk5.dim("Blocked by:")} ${issue.blockedBy.map((b) => chalk5.yellow(b)).join(", ")}`
     );
   }
   if ((issue.blocking?.length ?? 0) > 0) {
     console.log(
-      `  ${chalk4.dim("Blocking:")}  ${issue.blocking.map((b) => chalk4.cyan(b)).join(", ")}`
+      `  ${chalk5.dim("Blocking:")}  ${issue.blocking.map((b) => chalk5.cyan(b)).join(", ")}`
     );
   }
   if (issue.createdAt) {
     console.log(
-      `  ${chalk4.dim("Created:")}   ${formatRelativeTime2(issue.createdAt)}`
+      `  ${chalk5.dim("Created:")}   ${formatRelativeTime2(issue.createdAt)}`
     );
   }
   if (issue.startedAt) {
     console.log(
-      `  ${chalk4.dim("Started:")}   ${formatRelativeTime2(issue.startedAt)}`
+      `  ${chalk5.dim("Started:")}   ${formatRelativeTime2(issue.startedAt)}`
     );
   }
   if (issue.closedAt) {
     console.log(
-      `  ${chalk4.dim("Closed:")}    ${formatRelativeTime2(issue.closedAt)}`
+      `  ${chalk5.dim("Closed:")}    ${formatRelativeTime2(issue.closedAt)}`
     );
   }
   if ((issue.criteria?.length ?? 0) > 0) {
     console.log(`
-  ${chalk4.bold("Acceptance Criteria:")}`);
+  ${chalk5.bold("Acceptance Criteria:")}`);
     for (const c of issue.criteria) {
       const desc = c.description ?? c.id;
-      const cmd = c.command ? chalk4.dim(` (${c.command})`) : "";
+      const cmd = c.command ? chalk5.dim(` (${c.command})`) : "";
       console.log(`    ${formatCriterionStatus(c.status)} ${desc}${cmd}`);
     }
   }
@@ -3025,17 +3427,17 @@ issueCmd.command("start").description("Start working on an issue (creates branch
   engine.open();
   await engine.startIssue(id, { lane: !opts.noLane });
   const issue = engine.getIssue(id);
-  console.log(chalk4.green(`\u2713 Started issue ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u2713 Started issue ${chalk5.bold(id)}`));
   if (issue?.branchName) {
-    console.log(`  ${chalk4.dim("Branch:")}   ${issue.branchName}`);
+    console.log(`  ${chalk5.dim("Branch:")}   ${issue.branchName}`);
   }
   if (issue?.assignee) {
-    console.log(`  ${chalk4.dim("Assignee:")} ${issue.assignee}`);
+    console.log(`  ${chalk5.dim("Assignee:")} ${issue.assignee}`);
   }
   const laneId = engine.getActiveLaneId();
   if (laneId) {
-    console.log(`  ${chalk4.dim("Lane:")}     ${laneId}`);
-    console.log(chalk4.dim(`  export TRELLIS_LANE_ID=${laneId}`));
+    console.log(`  ${chalk5.dim("Lane:")}     ${laneId}`);
+    console.log(chalk5.dim(`  export TRELLIS_LANE_ID=${laneId}`));
   }
 });
 issueCmd.command("pause").description("Pause an in-progress issue (switches to default branch)").argument("<id>", "Issue ID").requiredOption(
@@ -3046,9 +3448,9 @@ issueCmd.command("pause").description("Pause an in-progress issue (switches to d
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   await engine.pauseIssue(id, opts.note);
-  console.log(chalk4.yellow(`\u23F8 Paused issue ${chalk4.bold(id)}`));
-  console.log(`  ${chalk4.dim("Note:")} ${opts.note}`);
-  console.log(`  ${chalk4.dim("Switched to:")} ${engine.getCurrentBranch()}`);
+  console.log(chalk5.yellow(`\u23F8 Paused issue ${chalk5.bold(id)}`));
+  console.log(`  ${chalk5.dim("Note:")} ${opts.note}`);
+  console.log(`  ${chalk5.dim("Switched to:")} ${engine.getCurrentBranch()}`);
 });
 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);
@@ -3056,13 +3458,13 @@ issueCmd.command("resume").description("Resume a paused issue (switches to issue
   engine.open();
   await engine.resumeIssue(id, { lane: !opts.noLane });
   const issue = engine.getIssue(id);
-  console.log(chalk4.green(`\u25B6 Resumed issue ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u25B6 Resumed issue ${chalk5.bold(id)}`));
   if (issue?.branchName) {
-    console.log(`  ${chalk4.dim("Branch:")} ${issue.branchName}`);
+    console.log(`  ${chalk5.dim("Branch:")} ${issue.branchName}`);
   }
   const laneId = engine.getActiveLaneId();
   if (laneId) {
-    console.log(`  ${chalk4.dim("Lane:")}   ${laneId}`);
+    console.log(`  ${chalk5.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) => {
@@ -3070,7 +3472,7 @@ issueCmd.command("triage").description("Move a backlog issue to queue (ready to
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   await engine.triageIssue(id);
-  console.log(chalk4.green(`\u2713 Triaged ${chalk4.bold(id)} \u2192 queue`));
+  console.log(chalk5.green(`\u2713 Triaged ${chalk5.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>",
@@ -3100,31 +3502,31 @@ issueCmd.command("update").description("Update issue metadata").argument("<id>",
     );
   }
   await engine.updateIssue(id, updates);
-  console.log(chalk4.green(`\u2713 Updated ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u2713 Updated ${chalk5.bold(id)}`));
 });
 issueCmd.command("describe").description("Set an issue description").argument("<id>", "Issue ID").argument("<description>", "Short description text").option("-p, --path <path>", "Repository path", ".").action(async (id, description, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   await engine.updateIssue(id, { description });
-  console.log(chalk4.green(`\u2713 Description set for ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u2713 Description set for ${chalk5.bold(id)}`));
 });
 issueCmd.command("assign").description("Assign an issue to an agent").argument("<id>", "Issue ID").requiredOption("--to <agentId>", "Agent ID to assign").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   await engine.assignIssue(id, opts.to);
-  console.log(chalk4.green(`\u2713 Assigned ${chalk4.bold(id)} \u2192 ${opts.to}`));
+  console.log(chalk5.green(`\u2713 Assigned ${chalk5.bold(id)} \u2192 ${opts.to}`));
 });
 issueCmd.command("ac").description("Add acceptance criterion to an issue").argument("<id>", "Issue ID").argument("<description>", "Criterion description").option("--test <command>", "Shell command to validate (exit 0 = pass)").option("-p, --path <path>", "Repository path", ".").action(async (id, description, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   await engine.addCriterion(id, description, opts.test);
-  const cmdNote = opts.test ? chalk4.dim(` (test: ${opts.test})`) : "";
+  const cmdNote = opts.test ? chalk5.dim(` (test: ${opts.test})`) : "";
   console.log(
-    chalk4.green(
-      `\u2713 Added criterion to ${chalk4.bold(id)}: ${description}${cmdNote}`
+    chalk5.green(
+      `\u2713 Added criterion to ${chalk5.bold(id)}: ${description}${cmdNote}`
     )
   );
 });
@@ -3134,8 +3536,8 @@ issueCmd.command("ac-pass").description("Manually mark an acceptance criterion a
   engine.open();
   await engine.setCriterionStatus(id, parseInt(index, 10), "passed");
   console.log(
-    chalk4.green(
-      `\u2713 Criterion #${index} on ${chalk4.bold(id)} marked as passed`
+    chalk5.green(
+      `\u2713 Criterion #${index} on ${chalk5.bold(id)} marked as passed`
     )
   );
 });
@@ -3145,31 +3547,31 @@ issueCmd.command("ac-fail").description("Manually mark an acceptance criterion a
   engine.open();
   await engine.setCriterionStatus(id, parseInt(index, 10), "failed");
   console.log(
-    chalk4.red(`\u2717 Criterion #${index} on ${chalk4.bold(id)} marked as failed`)
+    chalk5.red(`\u2717 Criterion #${index} on ${chalk5.bold(id)} marked as failed`)
   );
 });
 issueCmd.command("check").description("Run acceptance criteria for an issue").argument("<id>", "Issue ID").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
-  console.log(chalk4.bold(`Running criteria for ${id}...
+  console.log(chalk5.bold(`Running criteria for ${id}...
 `));
   const results = await engine.runCriteria(id);
   if (results.length === 0) {
-    console.log(chalk4.dim("No acceptance criteria defined."));
+    console.log(chalk5.dim("No acceptance criteria defined."));
     return;
   }
   for (const r of results) {
     const desc = r.description ?? r.id;
-    const statusStr = r.status === "passed" ? chalk4.green("\u2713 PASSED") : r.status === "failed" ? chalk4.red("\u2717 FAILED") : chalk4.dim("\u25CB SKIPPED");
+    const statusStr = r.status === "passed" ? chalk5.green("\u2713 PASSED") : r.status === "failed" ? chalk5.red("\u2717 FAILED") : chalk5.dim("\u25CB SKIPPED");
     console.log(`  ${statusStr}  ${desc}`);
     if (r.command) {
-      console.log(`    ${chalk4.dim("$")} ${r.command}`);
+      console.log(`    ${chalk5.dim("$")} ${r.command}`);
     }
     if (r.output && r.status === "failed") {
       const lines = r.output.split("\n").slice(0, 5);
       for (const line of lines) {
-        console.log(`    ${chalk4.dim(line)}`);
+        console.log(`    ${chalk5.dim(line)}`);
       }
     }
   }
@@ -3178,12 +3580,12 @@ issueCmd.command("check").description("Run acceptance criteria for an issue").ar
   console.log();
   if (passed === total) {
     console.log(
-      chalk4.green(
+      chalk5.green(
         `All ${total} criteria passed. Close with: trellis issue close ${id} --confirm`
       )
     );
   } else {
-    console.log(chalk4.yellow(`${passed}/${total} criteria passing.`));
+    console.log(chalk5.yellow(`${passed}/${total} criteria passing.`));
   }
 });
 issueCmd.command("close").description("Close an issue (requires all criteria pass + --confirm)").argument("<id>", "Issue ID").option("--confirm", "Confirm closure after criteria pass").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
@@ -3193,7 +3595,7 @@ issueCmd.command("close").description("Close an issue (requires all criteria pas
   const lane = engine.findLaneForIssue(id);
   if (lane && lane.status === "active" && engine.getLaneOpCount(lane.id) > 0) {
     console.log(
-      chalk4.yellow(
+      chalk5.yellow(
         `\u26A0 Lane ${lane.id} has unpromoted ops \u2014 promote before close when W3 lands (trellis lane promote)`
       )
     );
@@ -3201,7 +3603,7 @@ issueCmd.command("close").description("Close an issue (requires all criteria pas
   try {
     const result = await engine.closeIssue(id, { confirm: opts.confirm });
     if (!result.op) {
-      console.log(chalk4.bold(`Criteria status for ${id}:
+      console.log(chalk5.bold(`Criteria status for ${id}:
 `));
       for (const r of result.criteriaResults) {
         console.log(
@@ -3210,15 +3612,15 @@ issueCmd.command("close").description("Close an issue (requires all criteria pas
       }
       console.log();
       console.log(
-        chalk4.yellow(
+        chalk5.yellow(
           `All criteria pass. Re-run with --confirm to close: trellis issue close ${id} --confirm`
         )
       );
       return;
     }
-    console.log(chalk4.green(`\u2713 Issue ${chalk4.bold(id)} closed`));
+    console.log(chalk5.green(`\u2713 Issue ${chalk5.bold(id)} closed`));
   } catch (err) {
-    console.error(chalk4.red(err.message));
+    console.error(chalk5.red(err.message));
     process.exit(1);
   }
 });
@@ -3227,7 +3629,7 @@ issueCmd.command("reopen").description("Reopen a closed issue").argument("<id>",
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   await engine.reopenIssue(id);
-  console.log(chalk4.green(`\u2713 Issue ${chalk4.bold(id)} reopened`));
+  console.log(chalk5.green(`\u2713 Issue ${chalk5.bold(id)} reopened`));
 });
 issueCmd.command("block").description("Mark an issue as blocked by another issue").argument("<id>", "Issue ID to block").argument("<blockedBy>", "Issue ID that blocks it").option("-p, --path <path>", "Repository path", ".").action(async (id, blockedBy, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
@@ -3235,8 +3637,8 @@ issueCmd.command("block").description("Mark an issue as blocked by another issue
   engine.open();
   await engine.blockIssue(id, blockedBy);
   console.log(
-    chalk4.yellow(
-      `\u{1F512} ${chalk4.bold(id)} is now blocked by ${chalk4.bold(blockedBy)}`
+    chalk5.yellow(
+      `\u{1F512} ${chalk5.bold(id)} is now blocked by ${chalk5.bold(blockedBy)}`
     )
   );
 });
@@ -3246,8 +3648,8 @@ issueCmd.command("unblock").description("Remove a blocking relationship").argume
   engine.open();
   await engine.unblockIssue(id, blockedBy);
   console.log(
-    chalk4.green(
-      `\u{1F513} ${chalk4.bold(id)} is no longer blocked by ${chalk4.bold(blockedBy)}`
+    chalk5.green(
+      `\u{1F513} ${chalk5.bold(id)} is no longer blocked by ${chalk5.bold(blockedBy)}`
     )
   );
 });
@@ -3257,16 +3659,16 @@ issueCmd.command("active").description("Show all active (in-progress) issues").o
   engine.open();
   const active = engine.getActiveIssues();
   if (active.length === 0) {
-    console.log(chalk4.dim("No active issues."));
+    console.log(chalk5.dim("No active issues."));
     return;
   }
-  console.log(chalk4.bold(`Active Issues (${active.length})
+  console.log(chalk5.bold(`Active Issues (${active.length})
 `));
   for (const issue of active) {
-    const branch = issue.branchName ? chalk4.dim(` on ${issue.branchName}`) : "";
-    const assignee = issue.assignee ? chalk4.dim(` \u2192 ${issue.assignee}`) : "";
+    const branch = issue.branchName ? chalk5.dim(` on ${issue.branchName}`) : "";
+    const assignee = issue.assignee ? chalk5.dim(` \u2192 ${issue.assignee}`) : "";
     console.log(
-      `  ${formatPriority(issue.priority)} ${chalk4.bold(issue.id)} ${issue.title ?? ""}${branch}${assignee}`
+      `  ${formatPriority(issue.priority)} ${chalk5.bold(issue.id)} ${issue.title ?? ""}${branch}${assignee}`
     );
   }
 });
@@ -3296,14 +3698,14 @@ decisionCmd.command("list").description("List decision traces").option("-p, --pa
     limit: parseInt(opts.limit, 10)
   });
   if (decisions.length === 0) {
-    console.log(chalk4.dim("No decision traces found."));
+    console.log(chalk5.dim("No decision traces found."));
     return;
   }
   for (const d of decisions) {
-    const ts = d.createdAt ? chalk4.dim(d.createdAt) : "";
-    console.log(`${chalk4.cyan(d.id)}  ${chalk4.white(d.toolName)}  ${ts}`);
+    const ts = d.createdAt ? chalk5.dim(d.createdAt) : "";
+    console.log(`${chalk5.cyan(d.id)}  ${chalk5.white(d.toolName)}  ${ts}`);
     if (d.rationale) {
-      console.log(`  ${chalk4.dim("\u2192")} ${d.rationale}`);
+      console.log(`  ${chalk5.dim("\u2192")} ${d.rationale}`);
     }
   }
 });
@@ -3313,26 +3715,26 @@ decisionCmd.command("show").description("Show full details of a decision trace")
   engine.open();
   const d = engine.getDecision(id);
   if (!d) {
-    console.error(chalk4.red(`Decision ${id} not found.`));
+    console.error(chalk5.red(`Decision ${id} not found.`));
     process.exit(1);
   }
-  console.log(`${chalk4.bold("ID:")}         ${d.id}`);
-  console.log(`${chalk4.bold("Tool:")}       ${d.toolName}`);
-  console.log(`${chalk4.bold("Created:")}    ${d.createdAt ?? "unknown"}`);
-  console.log(`${chalk4.bold("Agent:")}      ${d.createdBy ?? "unknown"}`);
-  if (d.context) console.log(`${chalk4.bold("Context:")}    ${d.context}`);
-  if (d.rationale) console.log(`${chalk4.bold("Rationale:")}  ${d.rationale}`);
+  console.log(`${chalk5.bold("ID:")}         ${d.id}`);
+  console.log(`${chalk5.bold("Tool:")}       ${d.toolName}`);
+  console.log(`${chalk5.bold("Created:")}    ${d.createdAt ?? "unknown"}`);
+  console.log(`${chalk5.bold("Agent:")}      ${d.createdBy ?? "unknown"}`);
+  if (d.context) console.log(`${chalk5.bold("Context:")}    ${d.context}`);
+  if (d.rationale) console.log(`${chalk5.bold("Rationale:")}  ${d.rationale}`);
   if (d.alternatives && d.alternatives.length > 0) {
     console.log(
-      `${chalk4.bold("Alternatives:")} ${d.alternatives.join(", ")}`
+      `${chalk5.bold("Alternatives:")} ${d.alternatives.join(", ")}`
     );
   }
   if (d.outputSummary) {
-    console.log(`${chalk4.bold("Output:")}    ${d.outputSummary}`);
+    console.log(`${chalk5.bold("Output:")}    ${d.outputSummary}`);
   }
   if (d.relatedEntities.length > 0) {
     console.log(
-      `${chalk4.bold("Related:")}   ${d.relatedEntities.join(", ")}`
+      `${chalk5.bold("Related:")}   ${d.relatedEntities.join(", ")}`
     );
   }
 });
@@ -3345,27 +3747,27 @@ decisionCmd.command("chain").description("Trace all decisions that affected a gi
   engine.open();
   const chain = engine.getDecisionChain(entityId);
   if (chain.length === 0) {
-    console.log(chalk4.dim(`No decision traces found for ${entityId}.`));
+    console.log(chalk5.dim(`No decision traces found for ${entityId}.`));
     return;
   }
   console.log(
-    chalk4.bold(`Decision chain for ${entityId} (${chain.length} decisions):`)
+    chalk5.bold(`Decision chain for ${entityId} (${chain.length} decisions):`)
   );
   for (const d of chain) {
-    const ts = d.createdAt ? chalk4.dim(d.createdAt) : "";
-    console.log(`  ${chalk4.cyan(d.id)}  ${chalk4.white(d.toolName)}  ${ts}`);
+    const ts = d.createdAt ? chalk5.dim(d.createdAt) : "";
+    console.log(`  ${chalk5.cyan(d.id)}  ${chalk5.white(d.toolName)}  ${ts}`);
     if (d.rationale) {
-      console.log(`    ${chalk4.dim("\u2192")} ${d.rationale}`);
+      console.log(`    ${chalk5.dim("\u2192")} ${d.rationale}`);
     }
   }
 });
 program.command("identity").description("Manage local identity (Ed25519 key pair)").argument("[action]", '"init" or "show" (default: show)').option("-p, --path <path>", "Repository path", ".").option("--name <name>", "Display name for new identity").option("--email <email>", "Email for new identity").action((action, opts) => {
   const rootPath = resolve2(opts.path);
-  const trellisDir = join6(rootPath, ".trellis");
+  const trellisDir2 = join7(rootPath, ".trellis");
   if (action === "init") {
-    if (hasIdentity(trellisDir)) {
+    if (hasIdentity(trellisDir2)) {
       console.error(
-        chalk4.yellow(
+        chalk5.yellow(
           "Identity already exists. Use `trellis identity` to view it."
         )
       );
@@ -3374,35 +3776,35 @@ program.command("identity").description("Manage local identity (Ed25519 key pair
     const name = opts.name ?? "Anonymous";
     const email = opts.email;
     const identity2 = createIdentity({ displayName: name, email });
-    saveIdentity(trellisDir, identity2);
-    console.log(chalk4.green("\u2713 Identity created"));
-    console.log(`  ${chalk4.dim("Name:")}  ${identity2.displayName}`);
+    saveIdentity(trellisDir2, identity2);
+    console.log(chalk5.green("\u2713 Identity created"));
+    console.log(`  ${chalk5.dim("Name:")}  ${identity2.displayName}`);
     if (identity2.email) {
-      console.log(`  ${chalk4.dim("Email:")} ${identity2.email}`);
+      console.log(`  ${chalk5.dim("Email:")} ${identity2.email}`);
     }
-    console.log(`  ${chalk4.dim("DID:")}   ${identity2.did}`);
-    console.log(`  ${chalk4.dim("ID:")}    ${identity2.entityId}`);
+    console.log(`  ${chalk5.dim("DID:")}   ${identity2.did}`);
+    console.log(`  ${chalk5.dim("ID:")}    ${identity2.entityId}`);
     return;
   }
-  const identity = loadIdentity(trellisDir);
+  const identity = loadIdentity(trellisDir2);
   if (!identity) {
     console.log(
-      chalk4.dim(
+      chalk5.dim(
         'No identity configured. Run `trellis identity init --name "Your Name"`.'
       )
     );
     return;
   }
   const pub = toPublicIdentity(identity);
-  console.log(chalk4.bold("Identity\n"));
-  console.log(`  ${chalk4.dim("Name:")}       ${pub.displayName}`);
+  console.log(chalk5.bold("Identity\n"));
+  console.log(`  ${chalk5.dim("Name:")}       ${pub.displayName}`);
   if (pub.email) {
-    console.log(`  ${chalk4.dim("Email:")}      ${pub.email}`);
+    console.log(`  ${chalk5.dim("Email:")}      ${pub.email}`);
   }
-  console.log(`  ${chalk4.dim("DID:")}        ${pub.did}`);
-  console.log(`  ${chalk4.dim("Entity ID:")}  ${pub.entityId}`);
-  console.log(`  ${chalk4.dim("Public Key:")} ${pub.publicKey.slice(0, 32)}\u2026`);
-  console.log(`  ${chalk4.dim("Created:")}    ${pub.createdAt}`);
+  console.log(`  ${chalk5.dim("DID:")}        ${pub.did}`);
+  console.log(`  ${chalk5.dim("Entity ID:")}  ${pub.entityId}`);
+  console.log(`  ${chalk5.dim("Public Key:")} ${pub.publicKey.slice(0, 32)}\u2026`);
+  console.log(`  ${chalk5.dim("Created:")}    ${pub.createdAt}`);
 });
 program.command("refs").description("List wiki-link references in files or find backlinks").argument("[file]", "File to list outgoing refs for").option("-p, --path <path>", "Repository path", ".").option(
   "--backlinks <entity>",
@@ -3411,7 +3813,7 @@ program.command("refs").description("List wiki-link references in files or find
   const rootPath = resolveRepoRoot(opts.path);
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
-  const { readFileSync: readFileSync5 } = __require("fs");
+  const { readFileSync: readFileSync7 } = __require("fs");
   const {
     parseFileRefs,
     buildRefIndex: buildRefIndex2,
@@ -3430,8 +3832,8 @@ program.command("refs").description("List wiki-link references in files or find
   const fileContents = [];
   for (const f of trackedFiles) {
     try {
-      const absPath = join6(rootPath, f.path);
-      const content = readFileSync5(absPath, "utf-8");
+      const absPath = join7(rootPath, f.path);
+      const content = readFileSync7(absPath, "utf-8");
       fileContents.push({ path: f.path, content });
     } catch {
     }
@@ -3439,10 +3841,10 @@ program.command("refs").description("List wiki-link references in files or find
   const index = buildRefIndex2(fileContents, resolverCtx);
   if (opts.stats) {
     const stats = getIndexStats(index);
-    console.log(chalk4.bold("Reference Index Stats\n"));
-    console.log(`  ${chalk4.dim("Files with refs:")} ${stats.totalFiles}`);
-    console.log(`  ${chalk4.dim("Total refs:")}      ${stats.totalRefs}`);
-    console.log(`  ${chalk4.dim("Unique entities:")} ${stats.totalEntities}`);
+    console.log(chalk5.bold("Reference Index Stats\n"));
+    console.log(`  ${chalk5.dim("Files with refs:")} ${stats.totalFiles}`);
+    console.log(`  ${chalk5.dim("Total refs:")}      ${stats.totalRefs}`);
+    console.log(`  ${chalk5.dim("Unique entities:")} ${stats.totalEntities}`);
     return;
   }
   if (opts.backlinks) {
@@ -3462,14 +3864,14 @@ program.command("refs").description("List wiki-link references in files or find
       const sources = getBacklinks2(index, eid);
       if (sources.length > 0) {
         console.log(
-          chalk4.bold(
-            `Backlinks for ${chalk4.cyan(eid)} (${sources.length})
+          chalk5.bold(
+            `Backlinks for ${chalk5.cyan(eid)} (${sources.length})
 `
           )
         );
         for (const s of sources) {
           console.log(
-            `  ${chalk4.dim(s.filePath)}:${s.line}  ${chalk4.dim(`(${s.context})`)}`
+            `  ${chalk5.dim(s.filePath)}:${s.line}  ${chalk5.dim(`(${s.context})`)}`
           );
         }
         found = true;
@@ -3477,7 +3879,7 @@ program.command("refs").description("List wiki-link references in files or find
       }
     }
     if (!found) {
-      console.log(chalk4.dim(`No references found for: ${entity}`));
+      console.log(chalk5.dim(`No references found for: ${entity}`));
     }
     return;
   }
@@ -3494,31 +3896,31 @@ program.command("refs").description("List wiki-link references in files or find
     }
     const diags = getDiagnostics(index, registry, resolvedIds);
     if (diags.length === 0) {
-      console.log(chalk4.green("\u2713 No broken or stale references found."));
+      console.log(chalk5.green("\u2713 No broken or stale references found."));
       return;
     }
     const stale = diags.filter((d) => d.state === "stale");
     const broken = diags.filter((d) => d.state === "broken");
     if (broken.length > 0) {
       console.log(
-        chalk4.bold(chalk4.red(`Broken references (${broken.length})
+        chalk5.bold(chalk5.red(`Broken references (${broken.length})
 `))
       );
       for (const d of broken) {
         console.log(
-          `  ${chalk4.red("\u2717")} ${d.source.filePath}:${d.source.line}  ${d.message}`
+          `  ${chalk5.red("\u2717")} ${d.source.filePath}:${d.source.line}  ${d.message}`
         );
       }
       console.log();
     }
     if (stale.length > 0) {
       console.log(
-        chalk4.bold(chalk4.yellow(`Stale references (${stale.length})
+        chalk5.bold(chalk5.yellow(`Stale references (${stale.length})
 `))
       );
       for (const d of stale) {
         console.log(
-          `  ${chalk4.yellow("\u26A0")} ${d.source.filePath}:${d.source.line}  ${d.message}`
+          `  ${chalk5.yellow("\u26A0")} ${d.source.filePath}:${d.source.line}  ${d.message}`
         );
       }
     }
@@ -3527,43 +3929,43 @@ program.command("refs").description("List wiki-link references in files or find
   if (file) {
     const refs = getOutgoingRefs2(index, file);
     if (refs.length === 0) {
-      console.log(chalk4.dim(`No [[...]] references found in: ${file}`));
+      console.log(chalk5.dim(`No [[...]] references found in: ${file}`));
       return;
     }
     console.log(
-      chalk4.bold(`References in ${chalk4.cyan(file)} (${refs.length})
+      chalk5.bold(`References in ${chalk5.cyan(file)} (${refs.length})
 `)
     );
     for (const ref of refs) {
       const resolved = resolveRef(ref, resolverCtx);
-      const stateIcon = resolved.state === "resolved" ? chalk4.green("\u2713") : resolved.state === "stale" ? chalk4.yellow("\u26A0") : chalk4.red("\u2717");
+      const stateIcon = resolved.state === "resolved" ? chalk5.green("\u2713") : resolved.state === "stale" ? chalk5.yellow("\u26A0") : chalk5.red("\u2717");
       const display = ref.alias ?? ref.raw;
-      const entityId = resolved.entityId ?? chalk4.dim("unresolved");
+      const entityId = resolved.entityId ?? chalk5.dim("unresolved");
       console.log(
-        `  ${stateIcon} [[${display}]]  \u2192 ${entityId}  ${chalk4.dim(`L${ref.source.line}`)}`
+        `  ${stateIcon} [[${display}]]  \u2192 ${entityId}  ${chalk5.dim(`L${ref.source.line}`)}`
       );
     }
   } else {
     const stats = getIndexStats(index);
     if (stats.totalRefs === 0) {
       console.log(
-        chalk4.dim("No [[...]] references found in any tracked files.")
+        chalk5.dim("No [[...]] references found in any tracked files.")
       );
       return;
     }
     console.log(
-      chalk4.bold(
+      chalk5.bold(
         `References (${stats.totalRefs} across ${stats.totalFiles} files)
 `
       )
     );
     for (const [filePath, refs] of index.outgoing) {
-      console.log(`  ${chalk4.cyan(filePath)} (${refs.length} refs)`);
+      console.log(`  ${chalk5.cyan(filePath)} (${refs.length} refs)`);
       for (const ref of refs) {
         const resolved = resolveRef(ref, resolverCtx);
-        const stateIcon = resolved.state === "resolved" ? chalk4.green("\u2713") : resolved.state === "stale" ? chalk4.yellow("\u26A0") : chalk4.red("\u2717");
+        const stateIcon = resolved.state === "resolved" ? chalk5.green("\u2713") : resolved.state === "stale" ? chalk5.yellow("\u26A0") : chalk5.red("\u2717");
         console.log(
-          `    ${stateIcon} [[${ref.raw}]]  ${chalk4.dim(`L${ref.source.line}`)}`
+          `    ${stateIcon} [[${ref.raw}]]  ${chalk5.dim(`L${ref.source.line}`)}`
         );
       }
     }
@@ -3577,7 +3979,7 @@ program.command("search").description("Semantic search across all embedded conte
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   const { EmbeddingManager } = (init_embeddings(), __toCommonJS(embeddings_exports));
-  const dbPath = join6(rootPath, ".trellis", "embeddings.db");
+  const dbPath = join7(rootPath, ".trellis", "embeddings.db");
   const manager = await EmbeddingManager.create(dbPath);
   try {
     const searchOpts = {
@@ -3589,25 +3991,25 @@ program.command("search").description("Semantic search across all embedded conte
     const results = await manager.search(query, searchOpts);
     if (results.length === 0) {
       console.log(
-        chalk4.dim(
+        chalk5.dim(
           "No results found. Try `trellis reindex` to build the index."
         )
       );
       return;
     }
     console.log(
-      chalk4.bold(
-        `Search results for ${chalk4.cyan(`"${query}"`)} (${results.length})
+      chalk5.bold(
+        `Search results for ${chalk5.cyan(`"${query}"`)} (${results.length})
 `
       )
     );
     for (const r of results) {
       const score = (r.score * 100).toFixed(1);
-      const typeTag = chalk4.dim(`[${r.chunk.chunkType}]`);
-      const filePart = r.chunk.filePath ? chalk4.dim(` ${r.chunk.filePath}`) : "";
+      const typeTag = chalk5.dim(`[${r.chunk.chunkType}]`);
+      const filePart = r.chunk.filePath ? chalk5.dim(` ${r.chunk.filePath}`) : "";
       const preview = r.chunk.content.slice(0, 120).replace(/\n/g, " ");
-      console.log(`  ${chalk4.green(`${score}%`)} ${typeTag}${filePart}`);
-      console.log(`    ${chalk4.dim(preview)}`);
+      console.log(`  ${chalk5.green(`${score}%`)} ${typeTag}${filePart}`);
+      console.log(`    ${chalk5.dim(preview)}`);
       console.log();
     }
   } finally {
@@ -3619,14 +4021,14 @@ program.command("reindex").description("Rebuild the semantic embedding index").o
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   const { EmbeddingManager } = (init_embeddings(), __toCommonJS(embeddings_exports));
-  const dbPath = join6(rootPath, ".trellis", "embeddings.db");
+  const dbPath = join7(rootPath, ".trellis", "embeddings.db");
   const manager = await EmbeddingManager.create(dbPath);
   try {
-    console.log(chalk4.dim("Loading embedding model\u2026"));
+    console.log(chalk5.dim("Loading embedding model\u2026"));
     const result = await manager.reindex(engine);
-    console.log(chalk4.green(`\u2713 Indexed ${result.chunks} chunks`));
+    console.log(chalk5.green(`\u2713 Indexed ${result.chunks} chunks`));
     const stats = manager.stats();
-    console.log(chalk4.dim(`  Types: ${JSON.stringify(stats.byType)}`));
+    console.log(chalk5.dim(`  Types: ${JSON.stringify(stats.byType)}`));
   } finally {
     manager.close();
   }
@@ -3655,24 +4057,24 @@ program.command("ui").description(
     try {
       const server = await startUIServer2({ rootPath, port: appPort });
       const url = `http://localhost:${server.port}`;
-      console.log(chalk4.yellow("Legacy System Visualizer (client.html)"));
-      console.log(chalk4.green(`\u2713 Running at ${chalk4.bold(url)}`));
+      console.log(chalk5.yellow("Legacy System Visualizer (client.html)"));
+      console.log(chalk5.green(`\u2713 Running at ${chalk5.bold(url)}`));
       openBrowser(url);
       process.on("SIGINT", () => {
         server.stop();
         process.exit(0);
       });
     } catch (err) {
-      console.error(chalk4.red(`Failed to start server: ${err.message}`));
+      console.error(chalk5.red(`Failed to start server: ${err.message}`));
       process.exit(1);
     }
     return;
   }
   try {
-    const { launchRealtimeExplorer } = await import("../launch-explorer-HZ4ZJA4X.js");
-    console.log(chalk4.dim(`Workspace: ${rootPath}`));
+    const { launchRealtimeExplorer } = await import("../launch-explorer-FVX6ZABW.js");
+    console.log(chalk5.dim(`Workspace: ${rootPath}`));
     console.log(
-      chalk4.dim("Starting Svelte realtime explorer (sidecar + Vite)\u2026\n")
+      chalk5.dim("Starting Svelte realtime explorer (sidecar + Vite)\u2026\n")
     );
     const handle = await launchRealtimeExplorer({
       rootPath,
@@ -3680,27 +4082,27 @@ program.command("ui").description(
       trellisPort
     });
     console.log(
-      chalk4.green(`\u2713 Live graph explorer \u2192 ${chalk4.bold(handle.appUrl)}`)
+      chalk5.green(`\u2713 Live graph explorer \u2192 ${chalk5.bold(handle.appUrl)}`)
     );
     console.log(
-      chalk4.dim(`  Trellis sidecar / inspector \u2192 ${handle.trellisUrl}`)
+      chalk5.dim(`  Trellis sidecar / inspector \u2192 ${handle.trellisUrl}`)
     );
-    console.log(chalk4.dim("  Press Ctrl+C to stop\n"));
+    console.log(chalk5.dim("  Press Ctrl+C to stop\n"));
     openBrowser(handle.appUrl);
     process.on("SIGINT", () => {
       handle.stop();
-      console.log(chalk4.dim("\nExplorer stopped."));
+      console.log(chalk5.dim("\nExplorer stopped."));
       process.exit(0);
     });
   } catch (err) {
-    console.error(chalk4.red(`Failed to start explorer: ${err.message}`));
+    console.error(chalk5.red(`Failed to start explorer: ${err.message}`));
     process.exit(1);
   }
 });
 async function bootKernel(rootPath) {
-  const dbPath = join6(rootPath, ".trellis", "kernel.db");
+  const dbPath = join7(rootPath, ".trellis", "kernel.db");
   const { createKernelBackend } = await import("../core/persist/factory.js");
-  const { attachStandardMiddleware } = await import("../boot-middleware-MHLHFCUC.js");
+  const { attachStandardMiddleware } = await import("../boot-middleware-PATBLD52.js");
   const backend = await createKernelBackend(dbPath);
   const kernel = new TrellisKernel({
     backend,
@@ -3710,40 +4112,61 @@ async function bootKernel(rootPath) {
   attachStandardMiddleware(kernel);
   return kernel;
 }
-var entityCmd = program.command("entity").description("Manage graph entities (generic CRUD)");
-entityCmd.command("create").description("Create a new entity in the graph").requiredOption("-i, --id <id>", 'Entity ID (e.g. "project:my-app")').requiredOption("-t, --type <type>", 'Entity type (e.g. "Project", "User")').option("-a, --attr <attrs...>", "Attributes as key=value pairs").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
-  const rootPath = resolveRepoRoot(opts.path);
+function parseAttrPairs(pairs) {
+  const attrs = {};
+  if (!pairs) return attrs;
+  for (const pair of pairs) {
+    const eq = pair.indexOf("=");
+    if (eq === -1) continue;
+    const key = pair.slice(0, eq);
+    let val = pair.slice(eq + 1);
+    if (val === "true") val = true;
+    else if (val === "false") val = false;
+    else if (!isNaN(Number(val)) && val !== "") val = Number(val);
+    attrs[key] = val;
+  }
+  return attrs;
+}
+async function withGraphStore(rootPath, fn) {
+  if (TrellisVcsEngine.isRepo(rootPath)) {
+    const engine = new TrellisVcsEngine({ rootPath });
+    engine.open();
+    await fn({ mode: "vcs", engine });
+    return;
+  }
   const kernel = await bootKernel(rootPath);
   try {
-    const attrs = {};
-    if (opts.attr) {
-      for (const pair of opts.attr) {
-        const eq = pair.indexOf("=");
-        if (eq === -1) continue;
-        const key = pair.slice(0, eq);
-        let val = pair.slice(eq + 1);
-        if (val === "true") val = true;
-        else if (val === "false") val = false;
-        else if (!isNaN(Number(val)) && val !== "") val = Number(val);
-        attrs[key] = val;
-      }
-    }
-    const result = await kernel.createEntity(opts.id, opts.type, attrs);
-    console.log(chalk4.green(`\u2713 Entity created: ${chalk4.bold(opts.id)}`));
-    console.log(`  ${chalk4.dim("Type:")}  ${opts.type}`);
-    console.log(`  ${chalk4.dim("Facts:")} ${result.factsDelta.added}`);
-    console.log(`  ${chalk4.dim("Op:")}    ${result.op.hash.slice(0, 32)}\u2026`);
+    await fn({ mode: "kernel", kernel });
   } finally {
     kernel.close();
   }
+}
+var entityCmd = program.command("entity").description("Manage graph entities (generic CRUD)");
+entityCmd.command("create").description("Create a new entity in the graph").requiredOption("-i, --id <id>", 'Entity ID (e.g. "project:my-app")').requiredOption("-t, --type <type>", 'Entity type (e.g. "Project", "User")').option("-a, --attr <attrs...>", "Attributes as key=value pairs").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
+  const rootPath = resolveRepoRoot(opts.path);
+  const attrs = parseAttrPairs(opts.attr);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    if (mode === "vcs" && engine) {
+      const op = await engine.createStoreEntity(opts.id, opts.type, attrs);
+      console.log(chalk5.green(`\u2713 Entity created: ${chalk5.bold(opts.id)}`));
+      console.log(`  ${chalk5.dim("Type:")}  ${opts.type}`);
+      console.log(`  ${chalk5.dim("Journal:")} ops.json (vcs:storeAssert)`);
+      console.log(`  ${chalk5.dim("Op:")}    ${op.hash.slice(0, 32)}\u2026`);
+      return;
+    }
+    const result = await kernel.createEntity(opts.id, opts.type, attrs);
+    console.log(chalk5.green(`\u2713 Entity created: ${chalk5.bold(opts.id)}`));
+    console.log(`  ${chalk5.dim("Type:")}  ${opts.type}`);
+    console.log(`  ${chalk5.dim("Facts:")} ${result.factsDelta.added}`);
+    console.log(`  ${chalk5.dim("Op:")}    ${result.op.hash.slice(0, 32)}\u2026`);
+  });
 });
 entityCmd.command("get").description("Get an entity by ID").argument("<id>", "Entity ID").option("-p, --path <path>", "Repository path", ".").option("--json", "Output as JSON").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    const entity = kernel.getEntity(id);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    const entity = mode === "vcs" && engine ? engine.getStoreEntity(id) : kernel.getEntity(id);
     if (!entity) {
-      console.error(chalk4.red(`Entity not found: ${id}`));
+      console.error(chalk5.red(`Entity not found: ${id}`));
       process.exit(1);
     }
     if (opts.json) {
@@ -3759,82 +4182,64 @@ entityCmd.command("get").description("Get an entity by ID").argument("<id>", "En
       console.log(JSON.stringify(obj, null, 2));
       return;
     }
-    console.log(chalk4.bold(`${entity.type}: ${entity.id}
+    console.log(chalk5.bold(`${entity.type}: ${entity.id}
 `));
     for (const f of entity.facts) {
-      console.log(`  ${chalk4.dim(f.a.padEnd(20))} ${f.v}`);
+      console.log(`  ${chalk5.dim(f.a.padEnd(20))} ${f.v}`);
     }
     if (entity.links.length > 0) {
       console.log(`
-  ${chalk4.bold("Links:")}`);
+  ${chalk5.bold("Links:")}`);
       for (const l of entity.links) {
         const dir = l.e1 === id ? "\u2192" : "\u2190";
         const other = l.e1 === id ? l.e2 : l.e1;
-        console.log(`    ${dir} ${chalk4.dim(l.a)} ${other}`);
+        console.log(`    ${dir} ${chalk5.dim(l.a)} ${other}`);
       }
     }
-  } finally {
-    kernel.close();
-  }
+  });
 });
 entityCmd.command("update").description("Update attributes on an existing entity").argument("<id>", "Entity ID").requiredOption("-a, --attr <attrs...>", "Attributes as key=value pairs").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    const updates = {};
-    for (const pair of opts.attr) {
-      const eq = pair.indexOf("=");
-      if (eq === -1) continue;
-      const key = pair.slice(0, eq);
-      let val = pair.slice(eq + 1);
-      if (val === "true") val = true;
-      else if (val === "false") val = false;
-      else if (!isNaN(Number(val)) && val !== "") val = Number(val);
-      updates[key] = val;
-    }
-    await kernel.updateEntity(id, updates);
-    console.log(chalk4.green(`\u2713 Updated ${chalk4.bold(id)}`));
+  const updates = parseAttrPairs(opts.attr);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    if (mode === "vcs" && engine) {
+      await engine.updateStoreEntity(id, updates);
+    } else {
+      await kernel.updateEntity(id, updates);
+    }
+    console.log(chalk5.green(`\u2713 Updated ${chalk5.bold(id)}`));
     for (const [k, v] of Object.entries(updates)) {
-      console.log(`  ${chalk4.dim(k)} = ${v}`);
+      console.log(`  ${chalk5.dim(k)} = ${v}`);
     }
-  } finally {
-    kernel.close();
-  }
+  });
 });
 entityCmd.command("delete").description("Delete an entity and all its facts/links").argument("<id>", "Entity ID").option("-p, --path <path>", "Repository path", ".").action(async (id, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    const entity = kernel.getEntity(id);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    const entity = mode === "vcs" && engine ? engine.getStoreEntity(id) : kernel.getEntity(id);
     if (!entity) {
-      console.error(chalk4.red(`Entity not found: ${id}`));
+      console.error(chalk5.red(`Entity not found: ${id}`));
       process.exit(1);
     }
-    await kernel.deleteEntity(id);
-    console.log(chalk4.green(`\u2713 Deleted entity ${chalk4.bold(id)}`));
-  } finally {
-    kernel.close();
-  }
+    if (mode === "vcs" && engine) {
+      await engine.deleteStoreEntity(id);
+    } else {
+      await kernel.deleteEntity(id);
+    }
+    console.log(chalk5.green(`\u2713 Deleted entity ${chalk5.bold(id)}`));
+  });
 });
 entityCmd.command("list").description("List entities, optionally filtered by type").option("-t, --type <type>", "Filter by entity type").option("-f, --filter <filters...>", "Attribute filters as key=value").option("--json", "Output as JSON").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    let filters;
-    if (opts.filter) {
-      filters = {};
-      for (const pair of opts.filter) {
-        const eq = pair.indexOf("=");
-        if (eq === -1) continue;
-        const key = pair.slice(0, eq);
-        let val = pair.slice(eq + 1);
-        if (val === "true") val = true;
-        else if (val === "false") val = false;
-        else if (!isNaN(Number(val)) && val !== "") val = Number(val);
-        filters[key] = val;
-      }
-    }
-    const entities = kernel.listEntities(opts.type, filters);
+  const filters = parseAttrPairs(opts.filter);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    const entities = mode === "vcs" && engine ? engine.listStoreEntities(
+      opts.type,
+      Object.keys(filters).length > 0 ? filters : void 0
+    ) : kernel.listEntities(
+      opts.type,
+      Object.keys(filters).length > 0 ? filters : void 0
+    );
     if (opts.json) {
       const out = entities.map((e) => {
         const obj = { id: e.id, type: e.type };
@@ -3847,65 +4252,64 @@ entityCmd.command("list").description("List entities, optionally filtered by typ
       return;
     }
     if (entities.length === 0) {
-      console.log(chalk4.dim("No entities found."));
+      console.log(chalk5.dim("No entities found."));
       return;
     }
     const typeLabel = opts.type ? ` (type: ${opts.type})` : "";
-    console.log(chalk4.bold(`Entities (${entities.length})${typeLabel}
+    console.log(chalk5.bold(`Entities (${entities.length})${typeLabel}
 `));
     for (const e of entities) {
-      const nameFact = e.facts.find((f) => f.a === "name");
-      const name = nameFact ? ` ${chalk4.white(String(nameFact.v))}` : "";
+      const labelFact = e.facts.find((f) => f.a === "title") ?? e.facts.find((f) => f.a === "name");
+      const name = labelFact ? ` ${chalk5.white(String(labelFact.v))}` : "";
       console.log(
-        `  ${chalk4.cyan(e.type.padEnd(16))} ${chalk4.bold(e.id)}${name}`
+        `  ${chalk5.cyan(e.type.padEnd(16))} ${chalk5.bold(e.id)}${name}`
       );
     }
-  } finally {
-    kernel.close();
-  }
+  });
 });
 var factCmd = program.command("fact").description("Add or remove individual facts on entities");
 factCmd.command("add").description("Add a fact to an entity").argument("<entity>", "Entity ID").argument("<attribute>", "Attribute name").argument("<value>", "Value").option("-p, --path <path>", "Repository path", ".").action(async (entity, attribute, value, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    let val = value;
-    if (val === "true") val = true;
-    else if (val === "false") val = false;
-    else if (!isNaN(Number(val)) && val !== "") val = Number(val);
-    await kernel.addFact(entity, attribute, val);
+  let val = value;
+  if (val === "true") val = true;
+  else if (val === "false") val = false;
+  else if (!isNaN(Number(val)) && val !== "") val = Number(val);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    if (mode === "vcs" && engine) {
+      await engine.addStoreFact(entity, attribute, val);
+    } else {
+      await kernel.addFact(entity, attribute, val);
+    }
     console.log(
-      chalk4.green(
-        `\u2713 Added fact: ${chalk4.bold(entity)}.${attribute} = ${val}`
+      chalk5.green(
+        `\u2713 Added fact: ${chalk5.bold(entity)}.${attribute} = ${val}`
       )
     );
-  } finally {
-    kernel.close();
-  }
+  });
 });
 factCmd.command("remove").description("Remove a fact from an entity").argument("<entity>", "Entity ID").argument("<attribute>", "Attribute name").argument("<value>", "Value to remove").option("-p, --path <path>", "Repository path", ".").action(async (entity, attribute, value, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    let val = value;
-    if (val === "true") val = true;
-    else if (val === "false") val = false;
-    else if (!isNaN(Number(val)) && val !== "") val = Number(val);
-    await kernel.removeFact(entity, attribute, val);
+  let val = value;
+  if (val === "true") val = true;
+  else if (val === "false") val = false;
+  else if (!isNaN(Number(val)) && val !== "") val = Number(val);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    if (mode === "vcs" && engine) {
+      await engine.removeStoreFact(entity, attribute, val);
+    } else {
+      await kernel.removeFact(entity, attribute, val);
+    }
     console.log(
-      chalk4.green(
-        `\u2713 Removed fact: ${chalk4.bold(entity)}.${attribute} = ${val}`
+      chalk5.green(
+        `\u2713 Removed fact: ${chalk5.bold(entity)}.${attribute} = ${val}`
       )
     );
-  } finally {
-    kernel.close();
-  }
+  });
 });
 factCmd.command("query").description("Query facts by entity or attribute").option("-e, --entity <id>", "Filter by entity ID").option("-a, --attribute <attr>", "Filter by attribute").option("--json", "Output as JSON").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    const store = kernel.getStore();
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    const store = mode === "vcs" && engine ? engine.getEavStore() : kernel.getStore();
     let facts;
     if (opts.entity) {
       facts = store.getFactsByEntity(opts.entity);
@@ -3919,57 +4323,56 @@ factCmd.command("query").description("Query facts by entity or attribute").optio
       return;
     }
     if (facts.length === 0) {
-      console.log(chalk4.dim("No facts found."));
+      console.log(chalk5.dim("No facts found."));
       return;
     }
-    console.log(chalk4.bold(`Facts (${facts.length})
+    console.log(chalk5.bold(`Facts (${facts.length})
 `));
     for (const f of facts.slice(0, 100)) {
       console.log(
-        `  ${chalk4.cyan(f.e.padEnd(24))} ${chalk4.dim(f.a.padEnd(20))} ${f.v}`
+        `  ${chalk5.cyan(f.e.padEnd(24))} ${chalk5.dim(f.a.padEnd(20))} ${f.v}`
       );
     }
     if (facts.length > 100) {
-      console.log(chalk4.dim(`  \u2026 +${facts.length - 100} more`));
+      console.log(chalk5.dim(`  \u2026 +${facts.length - 100} more`));
     }
-  } finally {
-    kernel.close();
-  }
+  });
 });
 var linkCmd = program.command("link").description("Add or remove links between entities");
 linkCmd.command("add").description("Add a link between two entities").argument("<source>", "Source entity ID").argument("<attribute>", "Relationship attribute").argument("<target>", "Target entity ID").option("-p, --path <path>", "Repository path", ".").action(async (source, attribute, target, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    await kernel.addLink(source, attribute, target);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    if (mode === "vcs" && engine) {
+      await engine.addStoreLink(source, attribute, target);
+    } else {
+      await kernel.addLink(source, attribute, target);
+    }
     console.log(
-      chalk4.green(
-        `\u2713 Link: ${chalk4.bold(source)} \u2014[${attribute}]\u2192 ${chalk4.bold(target)}`
+      chalk5.green(
+        `\u2713 Link: ${chalk5.bold(source)} \u2014[${attribute}]\u2192 ${chalk5.bold(target)}`
       )
     );
-  } finally {
-    kernel.close();
-  }
+  });
 });
 linkCmd.command("remove").description("Remove a link between two entities").argument("<source>", "Source entity ID").argument("<attribute>", "Relationship attribute").argument("<target>", "Target entity ID").option("-p, --path <path>", "Repository path", ".").action(async (source, attribute, target, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    await kernel.removeLink(source, attribute, target);
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    if (mode === "vcs" && engine) {
+      await engine.removeStoreLink(source, attribute, target);
+    } else {
+      await kernel.removeLink(source, attribute, target);
+    }
     console.log(
-      chalk4.green(
-        `\u2713 Removed: ${chalk4.bold(source)} \u2014[${attribute}]\u2192 ${chalk4.bold(target)}`
+      chalk5.green(
+        `\u2713 Removed: ${chalk5.bold(source)} \u2014[${attribute}]\u2192 ${chalk5.bold(target)}`
       )
     );
-  } finally {
-    kernel.close();
-  }
+  });
 });
 linkCmd.command("query").description("Query links for an entity").option("-e, --entity <id>", "Entity ID").option("-a, --attribute <attr>", "Relationship attribute").option("--json", "Output as JSON").option("-p, --path <path>", "Repository path", ".").action(async (opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const kernel = await bootKernel(rootPath);
-  try {
-    const store = kernel.getStore();
+  await withGraphStore(rootPath, async ({ mode, engine, kernel }) => {
+    const store = mode === "vcs" && engine ? engine.getEavStore() : kernel.getStore();
     let links;
     if (opts.entity && opts.attribute) {
       links = store.getLinksByEntityAndAttribute(opts.entity, opts.attribute);
@@ -3985,22 +4388,20 @@ linkCmd.command("query").description("Query links for an entity").option("-e, --
       return;
     }
     if (links.length === 0) {
-      console.log(chalk4.dim("No links found."));
+      console.log(chalk5.dim("No links found."));
       return;
     }
-    console.log(chalk4.bold(`Links (${links.length})
+    console.log(chalk5.bold(`Links (${links.length})
 `));
     for (const l of links.slice(0, 100)) {
       console.log(
-        `  ${chalk4.cyan(l.e1)} \u2014[${chalk4.dim(l.a)}]\u2192 ${chalk4.cyan(l.e2)}`
+        `  ${chalk5.cyan(l.e1)} \u2014[${chalk5.dim(l.a)}]\u2192 ${chalk5.cyan(l.e2)}`
       );
     }
     if (links.length > 100) {
-      console.log(chalk4.dim(`  \u2026 +${links.length - 100} more`));
+      console.log(chalk5.dim(`  \u2026 +${links.length - 100} more`));
     }
-  } finally {
-    kernel.close();
-  }
+  });
 });
 program.command("examples").description("Print example CLI commands and EQL-S queries for this repo").option("-p, --path <path>", "Repository path", ".").option("--json", "Output as JSON").action(async (opts) => {
   const rootPath = resolveRepoRoot(opts.path);
@@ -4016,20 +4417,20 @@ program.command("examples").description("Print example CLI commands and EQL-S qu
     console.log(JSON.stringify(examples, null, 2));
     return;
   }
-  console.log(chalk4.bold("Example commands for this repo\n"));
+  console.log(chalk5.bold("Example commands for this repo\n"));
   for (const section of examples.sections) {
-    console.log(chalk4.cyan(section.title));
+    console.log(chalk5.cyan(section.title));
     for (const cmd of section.commands) {
-      console.log(`  ${chalk4.dim("$")} ${cmd}`);
+      console.log(`  ${chalk5.dim("$")} ${cmd}`);
     }
     console.log();
   }
-  console.log(chalk4.cyan("EQL-S queries"));
+  console.log(chalk5.cyan("EQL-S queries"));
   console.log(
-    chalk4.dim("  (requires kernel materialization \u2014 run after init)\n")
+    chalk5.dim("  (requires kernel materialization \u2014 run after init)\n")
   );
   for (const cmd of examples.eql) {
-    console.log(`  ${chalk4.dim("$")} ${cmd}`);
+    console.log(`  ${chalk5.dim("$")} ${cmd}`);
   }
 });
 program.command("query").description("Execute an EQL-S query against the graph").argument(
@@ -4048,7 +4449,7 @@ program.command("query").description("Execute an EQL-S query against the graph")
       try {
         q = parseQuery(queryStr);
       } catch (e) {
-        console.error(chalk4.red(`Parse error: ${e.message}`));
+        console.error(chalk5.red(`Parse error: ${e.message}`));
         process.exit(1);
         return;
       }
@@ -4058,16 +4459,16 @@ program.command("query").description("Execute an EQL-S query against the graph")
       console.log(JSON.stringify(result.bindings, null, 2));
     } else {
       if (result.count === 0) {
-        console.log(chalk4.dim("No results."));
+        console.log(chalk5.dim("No results."));
       } else {
         const cols = result.bindings.length > 0 ? Object.keys(result.bindings[0]) : [];
-        console.log(chalk4.bold(cols.map((c) => `?${c}`).join("	")));
-        console.log(chalk4.dim("\u2500".repeat(cols.length * 20)));
+        console.log(chalk5.bold(cols.map((c) => `?${c}`).join("	")));
+        console.log(chalk5.dim("\u2500".repeat(cols.length * 20)));
         for (const row of result.bindings) {
           console.log(cols.map((c) => String(row[c] ?? "")).join("	"));
         }
         console.log(
-          chalk4.dim(
+          chalk5.dim(
             `
 ${result.count} result(s) in ${result.executionTime.toFixed(1)}ms`
           )
@@ -4083,18 +4484,18 @@ program.command("repl").description("Interactive EQL-S query shell").option("-p,
   const kernel = await bootKernel(rootPath);
   const store = kernel.getStore();
   const engine = new QueryEngine(store);
-  console.log(chalk4.cyan.bold("Trellis EQL-S REPL"));
+  console.log(chalk5.cyan.bold("Trellis EQL-S REPL"));
   console.log(
-    chalk4.dim(
+    chalk5.dim(
       'Type EQL-S queries or "find ?e where attr = value" shorthand.'
     )
   );
-  console.log(chalk4.dim("Type .exit to quit, .help for help.\n"));
+  console.log(chalk5.dim("Type .exit to quit, .help for help.\n"));
   const readline = await import("readline");
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
-    prompt: chalk4.green("eql> ")
+    prompt: chalk5.green("eql> ")
   });
   rl.prompt();
   rl.on("line", (line) => {
@@ -4110,19 +4511,19 @@ program.command("repl").description("Interactive EQL-S query shell").option("-p,
     }
     if (trimmed === ".help") {
       console.log(`
-${chalk4.bold("EQL-S Query Syntax:")}
-  ${chalk4.cyan("SELECT")} ?var1 ?var2 ${chalk4.cyan("WHERE")} { patterns } [${chalk4.cyan("FILTER")} ...] [${chalk4.cyan("ORDER BY")} ...] [${chalk4.cyan("LIMIT")} n]
+${chalk5.bold("EQL-S Query Syntax:")}
+  ${chalk5.cyan("SELECT")} ?var1 ?var2 ${chalk5.cyan("WHERE")} { patterns } [${chalk5.cyan("FILTER")} ...] [${chalk5.cyan("ORDER BY")} ...] [${chalk5.cyan("LIMIT")} n]
 
-${chalk4.bold("Pattern types:")}
-  ${chalk4.yellow('[?e "attr" "value"]')}     Fact pattern (entity, attribute, value)
-  ${chalk4.yellow('(?src "rel" ?tgt)')}       Link pattern (source, relationship, target)
-  ${chalk4.yellow('NOT [?e "attr" ?v]')}      Negation
-  ${chalk4.yellow("OR { ... } { ... }")}      Disjunction
+${chalk5.bold("Pattern types:")}
+  ${chalk5.yellow('[?e "attr" "value"]')}     Fact pattern (entity, attribute, value)
+  ${chalk5.yellow('(?src "rel" ?tgt)')}       Link pattern (source, relationship, target)
+  ${chalk5.yellow('NOT [?e "attr" ?v]')}      Negation
+  ${chalk5.yellow("OR { ... } { ... }")}      Disjunction
 
-${chalk4.bold("Shorthand:")}
-  ${chalk4.yellow('find ?e where type = "Project"')}
+${chalk5.bold("Shorthand:")}
+  ${chalk5.yellow('find ?e where type = "Project"')}
 
-${chalk4.bold("Commands:")}
+${chalk5.bold("Commands:")}
   .exit / .quit   Exit the REPL
   .stats          Show store statistics
   .help           Show this help
@@ -4151,27 +4552,27 @@ ${chalk4.bold("Commands:")}
       }
       const result = engine.execute(q);
       if (result.count === 0) {
-        console.log(chalk4.dim("No results."));
+        console.log(chalk5.dim("No results."));
       } else {
         const cols = Object.keys(result.bindings[0]);
-        console.log(chalk4.bold(cols.map((c) => `?${c}`).join("	")));
+        console.log(chalk5.bold(cols.map((c) => `?${c}`).join("	")));
         for (const row of result.bindings) {
           console.log(cols.map((c) => String(row[c] ?? "")).join("	"));
         }
         console.log(
-          chalk4.dim(
+          chalk5.dim(
             `${result.count} result(s) in ${result.executionTime.toFixed(1)}ms`
           )
         );
       }
     } catch (e) {
-      console.error(chalk4.red(`Error: ${e.message}`));
+      console.error(chalk5.red(`Error: ${e.message}`));
     }
     rl.prompt();
   });
   rl.on("close", () => {
     kernel.close();
-    console.log(chalk4.dim("Goodbye."));
+    console.log(chalk5.dim("Goodbye."));
   });
 });
 var ontologyCmd = program.command("ontology").description("Manage and inspect ontology schemas");
@@ -4180,15 +4581,15 @@ ontologyCmd.command("list").description("List all registered ontologies (built-i
   for (const o of builtinOntologies) registry.register(o);
   const schemas = registry.list();
   if (schemas.length === 0) {
-    console.log(chalk4.dim("No ontologies registered."));
+    console.log(chalk5.dim("No ontologies registered."));
     return;
   }
-  console.log(chalk4.bold(`Ontologies (${schemas.length})
+  console.log(chalk5.bold(`Ontologies (${schemas.length})
 `));
   for (const s of schemas) {
-    console.log(`  ${chalk4.cyan(s.id)} ${chalk4.dim(`v${s.version}`)}`);
+    console.log(`  ${chalk5.cyan(s.id)} ${chalk5.dim(`v${s.version}`)}`);
     console.log(
-      `    ${s.name}${s.description ? ` \u2014 ${chalk4.dim(s.description)}` : ""}`
+      `    ${s.name}${s.description ? ` \u2014 ${chalk5.dim(s.description)}` : ""}`
     );
     console.log(`    Entities: ${s.entities.map((e) => e.name).join(", ")}`);
     console.log(
@@ -4206,35 +4607,35 @@ ontologyCmd.command("inspect").description("Inspect a specific ontology or entit
   const schema = registry.get(name);
   if (schema) {
     console.log(
-      chalk4.bold(
-        `${schema.name} ${chalk4.dim(`(${schema.id} v${schema.version})`)}`
+      chalk5.bold(
+        `${schema.name} ${chalk5.dim(`(${schema.id} v${schema.version})`)}`
       )
     );
-    if (schema.description) console.log(chalk4.dim(schema.description));
+    if (schema.description) console.log(chalk5.dim(schema.description));
     console.log();
-    console.log(chalk4.bold("Entity Types:"));
+    console.log(chalk5.bold("Entity Types:"));
     for (const e of schema.entities) {
       console.log(
         `
-  ${chalk4.cyan.bold(e.name)}${e.abstract ? chalk4.dim(" (abstract)") : ""}${e.extends ? chalk4.dim(` extends ${e.extends}`) : ""}`
+  ${chalk5.cyan.bold(e.name)}${e.abstract ? chalk5.dim(" (abstract)") : ""}${e.extends ? chalk5.dim(` extends ${e.extends}`) : ""}`
       );
-      if (e.description) console.log(`  ${chalk4.dim(e.description)}`);
+      if (e.description) console.log(`  ${chalk5.dim(e.description)}`);
       for (const a of e.attributes) {
         const flags = [
-          a.required ? chalk4.red("required") : null,
+          a.required ? chalk5.red("required") : null,
           a.enum ? `enum[${a.enum.join("|")}]` : null,
           a.default !== void 0 ? `default=${a.default}` : null
         ].filter(Boolean).join(", ");
         console.log(
-          `    ${chalk4.yellow(a.name)}: ${a.type}${flags ? ` (${flags})` : ""}`
+          `    ${chalk5.yellow(a.name)}: ${a.type}${flags ? ` (${flags})` : ""}`
         );
       }
     }
     if (schema.relations.length > 0) {
-      console.log(chalk4.bold("\nRelations:"));
+      console.log(chalk5.bold("\nRelations:"));
       for (const r of schema.relations) {
         console.log(
-          `  ${chalk4.yellow(r.name)}: ${r.sourceTypes.join("|")} \u2192 ${r.targetTypes.join("|")}${r.cardinality ? ` [${r.cardinality}]` : ""}`
+          `  ${chalk5.yellow(r.name)}: ${r.sourceTypes.join("|")} \u2192 ${r.targetTypes.join("|")}${r.cardinality ? ` [${r.cardinality}]` : ""}`
         );
       }
     }
@@ -4243,43 +4644,43 @@ ontologyCmd.command("inspect").description("Inspect a specific ontology or entit
   const def = registry.getEntityDef(name);
   if (def) {
     const ontId = registry.getEntityOntology(name);
-    console.log(chalk4.bold(`${def.name}`) + chalk4.dim(` (from ${ontId})`));
-    if (def.description) console.log(chalk4.dim(def.description));
+    console.log(chalk5.bold(`${def.name}`) + chalk5.dim(` (from ${ontId})`));
+    if (def.description) console.log(chalk5.dim(def.description));
     if (def.abstract)
-      console.log(chalk4.dim("(abstract \u2014 cannot be instantiated)"));
-    if (def.extends) console.log(chalk4.dim(`extends ${def.extends}`));
-    console.log(chalk4.bold("\nAttributes:"));
+      console.log(chalk5.dim("(abstract \u2014 cannot be instantiated)"));
+    if (def.extends) console.log(chalk5.dim(`extends ${def.extends}`));
+    console.log(chalk5.bold("\nAttributes:"));
     for (const a of def.attributes) {
       const flags = [
-        a.required ? chalk4.red("required") : null,
+        a.required ? chalk5.red("required") : null,
         a.enum ? `enum[${a.enum.join("|")}]` : null,
         a.default !== void 0 ? `default=${a.default}` : null
       ].filter(Boolean).join(", ");
       console.log(
-        `  ${chalk4.yellow(a.name)}: ${a.type}${flags ? ` (${flags})` : ""}`
+        `  ${chalk5.yellow(a.name)}: ${a.type}${flags ? ` (${flags})` : ""}`
       );
-      if (a.description) console.log(`    ${chalk4.dim(a.description)}`);
+      if (a.description) console.log(`    ${chalk5.dim(a.description)}`);
     }
     const rels = registry.getRelationsForType(name);
     if (rels.length > 0) {
-      console.log(chalk4.bold("\nRelations:"));
+      console.log(chalk5.bold("\nRelations:"));
       for (const r of rels) {
         const dir = r.sourceTypes.includes(name) ? "\u2192" : "\u2190";
         console.log(
-          `  ${chalk4.yellow(r.name)} ${dir} ${r.sourceTypes.includes(name) ? r.targetTypes.join("|") : r.sourceTypes.join("|")}`
+          `  ${chalk5.yellow(r.name)} ${dir} ${r.sourceTypes.includes(name) ? r.targetTypes.join("|") : r.sourceTypes.join("|")}`
         );
       }
     }
     return;
   }
-  console.error(chalk4.red(`Unknown ontology or entity type: "${name}"`));
+  console.error(chalk5.red(`Unknown ontology or entity type: "${name}"`));
   console.log(
-    chalk4.dim(
+    chalk5.dim(
       "Available ontologies: " + registry.list().map((s) => s.id).join(", ")
     )
   );
   console.log(
-    chalk4.dim("Available types: " + registry.listEntityTypes().join(", "))
+    chalk5.dim("Available types: " + registry.listEntityTypes().join(", "))
   );
 });
 ontologyCmd.command("validate").description(
@@ -4293,32 +4694,32 @@ ontologyCmd.command("validate").description(
     const store = kernel.getStore();
     const result = validateStore(store, registry);
     if (result.errors.length > 0) {
-      console.log(chalk4.red.bold(`\u2717 ${result.errors.length} error(s):
+      console.log(chalk5.red.bold(`\u2717 ${result.errors.length} error(s):
 `));
       for (const err of result.errors) {
         console.log(
-          `  ${chalk4.red("ERROR")} ${chalk4.bold(err.entityId)} (${err.entityType}) \u2192 ${err.field}: ${err.message}`
+          `  ${chalk5.red("ERROR")} ${chalk5.bold(err.entityId)} (${err.entityType}) \u2192 ${err.field}: ${err.message}`
         );
       }
     }
     if (result.warnings.length > 0) {
       console.log(
-        chalk4.yellow.bold(`
+        chalk5.yellow.bold(`
 \u26A0 ${result.warnings.length} warning(s):
 `)
       );
       for (const w of result.warnings) {
         console.log(
-          `  ${chalk4.yellow("WARN")}  ${chalk4.bold(w.entityId)} (${w.entityType}) \u2192 ${w.field}: ${w.message}`
+          `  ${chalk5.yellow("WARN")}  ${chalk5.bold(w.entityId)} (${w.entityType}) \u2192 ${w.field}: ${w.message}`
         );
       }
     }
     if (result.valid && result.warnings.length === 0) {
-      console.log(chalk4.green("\u2713 All entities pass ontology validation."));
+      console.log(chalk5.green("\u2713 All entities pass ontology validation."));
     } else if (result.valid) {
-      console.log(chalk4.green("\n\u2713 Valid (with warnings)."));
+      console.log(chalk5.green("\n\u2713 Valid (with warnings)."));
     } else {
-      console.log(chalk4.red("\n\u2717 Validation failed."));
+      console.log(chalk5.red("\n\u2717 Validation failed."));
     }
   } finally {
     kernel.close();
@@ -4326,7 +4727,7 @@ ontologyCmd.command("validate").description(
 });
 program.command("ask").description("Natural language search over the graph (semantic search)").argument("<question>", "Natural language query").option("-p, --path <path>", "Repository path", ".").option("-n, --limit <n>", "Max results", "5").option("--json", "Output as JSON").option("--rag", "Output as RAG context (for LLM consumption)").action(async (question, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const dbPath = join6(rootPath, ".trellis", "embeddings.db");
+  const dbPath = join7(rootPath, ".trellis", "embeddings.db");
   const vectorStore = await VectorStore.create(dbPath);
   try {
     const limit = parseInt(opts.limit, 10) || 5;
@@ -4337,17 +4738,17 @@ program.command("ask").description("Natural language search over the graph (sema
       if (opts.json) {
         console.log(JSON.stringify(ctx, null, 2));
       } else {
-        console.log(chalk4.bold.cyan("RAG Context"));
-        console.log(chalk4.dim(`Query: ${ctx.query}`));
+        console.log(chalk5.bold.cyan("RAG Context"));
+        console.log(chalk5.dim(`Query: ${ctx.query}`));
         console.log(
-          chalk4.dim(
+          chalk5.dim(
             `Chunks: ${ctx.chunks.length} | ~${ctx.estimatedTokens} tokens
 `
           )
         );
         for (const c of ctx.chunks) {
           console.log(
-            chalk4.yellow(
+            chalk5.yellow(
               `[${c.score.toFixed(3)}] ${c.entityId} (${c.chunkType})`
             )
           );
@@ -4374,17 +4775,17 @@ program.command("ask").description("Natural language search over the graph (sema
       } else {
         if (results.length === 0) {
           console.log(
-            chalk4.dim(
+            chalk5.dim(
               "No results. Run `trellis reindex` first to build the embedding index."
             )
           );
         } else {
-          console.log(chalk4.bold(`Results for: "${question}"
+          console.log(chalk5.bold(`Results for: "${question}"
 `));
           for (const r of results) {
-            const score = chalk4.dim(`[${r.score.toFixed(3)}]`);
-            const entity = chalk4.cyan(r.chunk.entityId);
-            const type = chalk4.dim(`(${r.chunk.chunkType})`);
+            const score = chalk5.dim(`[${r.score.toFixed(3)}]`);
+            const entity = chalk5.cyan(r.chunk.entityId);
+            const type = chalk5.dim(`(${r.chunk.chunkType})`);
             console.log(`${score} ${entity} ${type}`);
             const preview = r.chunk.content.length > 200 ? r.chunk.content.slice(0, 200) + "\u2026" : r.chunk.content;
             console.log(`  ${preview}
@@ -4395,10 +4796,10 @@ program.command("ask").description("Natural language search over the graph (sema
     }
   } catch (err) {
     if (err.message?.includes("No transformers")) {
-      console.error(chalk4.red("Embedding model not available."));
-      console.error(chalk4.dim("Install: bun add @huggingface/transformers"));
+      console.error(chalk5.red("Embedding model not available."));
+      console.error(chalk5.dim("Install: bun add @huggingface/transformers"));
     } else {
-      console.error(chalk4.red(`Error: ${err.message}`));
+      console.error(chalk5.red(`Error: ${err.message}`));
     }
   } finally {
     vectorStore.close();
@@ -4406,16 +4807,16 @@ program.command("ask").description("Natural language search over the graph (sema
 });
 function formatOpKind(kind) {
   const kindMap = {
-    "vcs:fileAdd": chalk4.green("+add"),
-    "vcs:fileModify": chalk4.yellow("~mod"),
-    "vcs:fileDelete": chalk4.red("-del"),
-    "vcs:fileRename": chalk4.blue("\u2192ren"),
-    "vcs:branchCreate": chalk4.magenta("\u2295branch"),
-    "vcs:branchAdvance": chalk4.magenta("\u2192branch"),
-    "vcs:milestoneCreate": chalk4.cyan("\u2605milestone"),
-    "vcs:checkpointCreate": chalk4.dim("\u25CFcheckpoint")
+    "vcs:fileAdd": chalk5.green("+add"),
+    "vcs:fileModify": chalk5.yellow("~mod"),
+    "vcs:fileDelete": chalk5.red("-del"),
+    "vcs:fileRename": chalk5.blue("\u2192ren"),
+    "vcs:branchCreate": chalk5.magenta("\u2295branch"),
+    "vcs:branchAdvance": chalk5.magenta("\u2192branch"),
+    "vcs:milestoneCreate": chalk5.cyan("\u2605milestone"),
+    "vcs:checkpointCreate": chalk5.dim("\u25CFcheckpoint")
   };
-  return kindMap[kind] ?? chalk4.dim(kind);
+  return kindMap[kind] ?? chalk5.dim(kind);
 }
 function formatRelativeTime2(iso) {
   const now = Date.now();
@@ -4428,11 +4829,11 @@ function formatRelativeTime2(iso) {
 }
 var db = program.command("db").description("Trellis DB \u2014 use Trellis as an application database");
 db.command("init").description("Initialize a new Trellis DB in the current directory").option("-p, --path <path>", "Database directory", ".trellis-db").option("--port <port>", "Server port", "3000").option("--key <key>", "API key (auto-generated if omitted)").option("--jwt-secret <secret>", "JWT secret (auto-generated if omitted)").option("--multi-tenant", "Enable multi-tenancy (separate SQLite per tenant)").action(async (opts) => {
-  const { writeConfig, defaultLocalConfig, hasConfig, configPath } = await import("../config-PFTP67TR.js");
+  const { writeConfig, defaultLocalConfig, hasConfig, configPath } = await import("../config-KMY6RRK3.js");
   const { resolve: resolve3 } = await import("path");
   if (hasConfig(".")) {
     console.log(
-      chalk4.yellow(
+      chalk5.yellow(
         `Already initialized (${configPath(".")}). Use \`trellis db serve\` to start.`
       )
     );
@@ -4450,52 +4851,54 @@ db.command("init").description("Initialize a new Trellis DB in the current direc
     }),
     "."
   );
-  console.log(chalk4.green("\u2713 Trellis DB initialized"));
-  console.log(chalk4.dim(`  Config:     .trellis-db.json`));
-  console.log(chalk4.dim(`  DB path:    ${dbPath}`));
-  console.log(chalk4.dim(`  API key:    ${apiKey}`));
-  console.log(chalk4.dim(`  Port:       ${opts.port}`));
+  console.log(chalk5.green("\u2713 Trellis DB initialized"));
+  console.log(chalk5.dim(`  Config:     .trellis-db.json`));
+  console.log(chalk5.dim(`  DB path:    ${dbPath}`));
+  console.log(chalk5.dim(`  API key:    ${apiKey}`));
+  console.log(chalk5.dim(`  Port:       ${opts.port}`));
   console.log("");
-  console.log(chalk4.bold("Next steps:"));
+  console.log(chalk5.bold("Next steps:"));
   console.log(
-    `  ${chalk4.cyan("trellis db serve")}          Start the local HTTP server`
+    `  ${chalk5.cyan("trellis db serve")}          Start the local HTTP server`
   );
   console.log(
-    `  ${chalk4.cyan("trellis deploy --name <n>")}       Deploy room node to Sprites`
+    `  ${chalk5.cyan("trellis deploy --name <n>")}       Deploy room node to Sprites`
   );
 });
 db.command("serve").description("Start the Trellis DB HTTP + WebSocket server").option("-p, --port <port>", "Override port from config").option("--config-dir <dir>", "Directory containing .trellis-db.json", ".").action(async (opts) => {
-  const { readConfig } = await import("../config-PFTP67TR.js");
-  const { TenantPool } = await import("../tenancy-POMWQP6M.js");
-  const { startServer } = await import("../server-ZVWGLLRF.js");
+  const { readConfig } = await import("../config-KMY6RRK3.js");
+  const { TenantPool } = await import("../tenancy-U4E7ZEAG.js");
+  const { startServer } = await import("../server-FQT2VYRE.js");
   const config = readConfig(opts.configDir);
   if (!config) {
     console.error(
-      chalk4.red("No .trellis-db.json found. Run `trellis db init` first.")
+      chalk5.red("No .trellis-db.json found. Run `trellis db init` first.")
     );
     process.exit(1);
   }
   if (!config.dbPath) {
     console.error(
-      chalk4.red("Config is missing dbPath. Re-run `trellis db init`.")
+      chalk5.red("Config is missing dbPath. Re-run `trellis db init`.")
     );
     process.exit(1);
   }
   const port = opts.port ? parseInt(opts.port) : config.port ?? 3e3;
-  const { DEFAULT_TENANT, resolvePoolBackendFromEnv } = await import("../tenancy-POMWQP6M.js");
+  const { DEFAULT_TENANT, resolvePoolBackendFromEnv } = await import("../tenancy-U4E7ZEAG.js");
   const backendOpts = resolvePoolBackendFromEnv();
   const pool = new TenantPool(
     config.dbPath,
     backendOpts ? { backend: backendOpts } : void 0
   );
   await pool.preload(DEFAULT_TENANT);
-  const { startServerCrossRuntime } = await import("../server-ZVWGLLRF.js");
+  const { startServerCrossRuntime } = await import("../server-FQT2VYRE.js");
   const server = await startServerCrossRuntime({ port, config, pool });
-  console.log(chalk4.green(`\u2713 Trellis DB running`));
-  console.log(chalk4.dim(`  URL:  http://localhost:${port}`));
-  console.log(chalk4.dim(`  Docs: GET http://localhost:${port}/health`));
+  console.log(chalk5.green(`\u2713 Trellis DB running`));
+  console.log(chalk5.dim(`  URL:  http://localhost:${port}`));
+  console.log(chalk5.dim(`  MCP:  http://localhost:${port}/mcp`));
+  console.log(chalk5.dim(`  Gateway:  http://localhost:${port}/gateway/mcp`));
+  console.log(chalk5.dim(`  Docs: GET http://localhost:${port}/health`));
   if (config.apiKey) {
-    console.log(chalk4.dim(`  Key:  ${config.apiKey}`));
+    console.log(chalk5.dim(`  Key:  ${config.apiKey}`));
   }
 });
 db.command("create <type> [json]").description("Create an entity (json can be a JSON string or @file.json)").option("--config-dir <dir>", "Config directory", ".").option("--tenant <id>", "Tenant ID").action(async (type, jsonArg, opts) => {
@@ -4503,12 +4906,12 @@ db.command("create <type> [json]").description("Create an entity (json can be a
   const db2 = await TrellisDb.fromConfig(opts.configDir);
   let attributes = {};
   if (jsonArg) {
-    const { readFileSync: readFileSync5 } = await import("fs");
-    const raw = jsonArg.startsWith("@") ? readFileSync5(jsonArg.slice(1), "utf8") : jsonArg;
+    const { readFileSync: readFileSync7 } = await import("fs");
+    const raw = jsonArg.startsWith("@") ? readFileSync7(jsonArg.slice(1), "utf8") : jsonArg;
     attributes = JSON.parse(raw);
   }
   const id = await db2.create(type, attributes);
-  console.log(chalk4.green(`\u2713 Created: ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u2713 Created: ${chalk5.bold(id)}`));
   db2.close();
 });
 db.command("read <id>").description("Read an entity by ID").option("--config-dir <dir>", "Config directory", ".").action(async (id, opts) => {
@@ -4516,7 +4919,7 @@ db.command("read <id>").description("Read an entity by ID").option("--config-dir
   const db2 = await TrellisDb.fromConfig(opts.configDir);
   const entity = await db2.read(id);
   if (!entity) {
-    console.error(chalk4.red(`Not found: ${id}`));
+    console.error(chalk5.red(`Not found: ${id}`));
     process.exit(1);
   }
   console.log(JSON.stringify(entity, null, 2));
@@ -4525,17 +4928,17 @@ db.command("read <id>").description("Read an entity by ID").option("--config-dir
 db.command("update <id> <json>").description("Update entity attributes (JSON string or @file.json)").option("--config-dir <dir>", "Config directory", ".").action(async (id, jsonArg, opts) => {
   const { TrellisDb } = await import("../client/sdk.js");
   const db2 = await TrellisDb.fromConfig(opts.configDir);
-  const { readFileSync: readFileSync5 } = await import("fs");
-  const raw = jsonArg.startsWith("@") ? readFileSync5(jsonArg.slice(1), "utf8") : jsonArg;
+  const { readFileSync: readFileSync7 } = await import("fs");
+  const raw = jsonArg.startsWith("@") ? readFileSync7(jsonArg.slice(1), "utf8") : jsonArg;
   await db2.update(id, JSON.parse(raw));
-  console.log(chalk4.green(`\u2713 Updated: ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u2713 Updated: ${chalk5.bold(id)}`));
   db2.close();
 });
 db.command("delete <id>").description("Delete an entity by ID").option("--config-dir <dir>", "Config directory", ".").action(async (id, opts) => {
   const { TrellisDb } = await import("../client/sdk.js");
   const db2 = await TrellisDb.fromConfig(opts.configDir);
   await db2.delete(id);
-  console.log(chalk4.green(`\u2713 Deleted: ${chalk4.bold(id)}`));
+  console.log(chalk5.green(`\u2713 Deleted: ${chalk5.bold(id)}`));
   db2.close();
 });
 db.command("list").description("List entities").option("--type <type>", "Filter by entity type").option("--limit <n>", "Max results", "50").option("--offset <n>", "Offset", "0").option("--config-dir <dir>", "Config directory", ".").action(async (opts) => {
@@ -4553,11 +4956,11 @@ db.command("query <eql>").description("Run an EQL-S query").option("--config-dir
   const db2 = await TrellisDb.fromConfig(opts.configDir);
   const result = await db2.query(eql);
   console.log(JSON.stringify(result.bindings, null, 2));
-  console.log(chalk4.dim(`Execution time: ${result.executionTime}ms`));
+  console.log(chalk5.dim(`Execution time: ${result.executionTime}ms`));
   db2.close();
 });
 db.command("upload <file>").description("Upload a file to the blob store").option("--config-dir <dir>", "Config directory", ".").option("--type <mime>", "MIME type (auto-detected if omitted)").action(async (filePath, opts) => {
-  const { readFileSync: readFileSync5 } = await import("fs");
+  const { readFileSync: readFileSync7 } = await import("fs");
   const { extname } = await import("path");
   const { TrellisDb } = await import("../client/sdk.js");
   const mimeMap = {
@@ -4570,22 +4973,22 @@ db.command("upload <file>").description("Upload a file to the blob store").optio
     ".txt": "text/plain"
   };
   const contentType = opts.type ?? mimeMap[extname(filePath).toLowerCase()] ?? "application/octet-stream";
-  const buffer = readFileSync5(filePath);
+  const buffer = readFileSync7(filePath);
   const db2 = await TrellisDb.fromConfig(opts.configDir);
   const result = await db2.upload(new Uint8Array(buffer), contentType);
-  console.log(chalk4.green(`\u2713 Uploaded`));
-  console.log(chalk4.dim(`  Hash: ${result.hash}`));
-  console.log(chalk4.dim(`  Size: ${result.size} bytes`));
+  console.log(chalk5.green(`\u2713 Uploaded`));
+  console.log(chalk5.dim(`  Hash: ${result.hash}`));
+  console.log(chalk5.dim(`  Size: ${result.size} bytes`));
   db2.close();
 });
 db.command("import <file>").description("Import data from CSV, JSON, NDJSON, or Parquet").requiredOption("--type <type>", "Entity type to assign to each record").option("--id-field <field>", "Field to use as entity ID").option("--limit <n>", "Max rows to import").option("--config-dir <dir>", "Config directory", ".").option("--tenant <id>", "Tenant ID").action(async (filePath, opts) => {
-  const { readConfig } = await import("../config-PFTP67TR.js");
-  const { TenantPool } = await import("../tenancy-POMWQP6M.js");
-  const { importFile } = await import("../import-UZEKXU3B.js");
+  const { readConfig } = await import("../config-KMY6RRK3.js");
+  const { TenantPool } = await import("../tenancy-U4E7ZEAG.js");
+  const { importFile } = await import("../import-AJLYHFIA.js");
   const config = readConfig(opts.configDir);
   if (!config?.dbPath) {
     console.error(
-      chalk4.red("No .trellis-db.json found. Run `trellis db init` first.")
+      chalk5.red("No .trellis-db.json found. Run `trellis db init` first.")
     );
     process.exit(1);
   }
@@ -4596,13 +4999,13 @@ db.command("import <file>").description("Import data from CSV, JSON, NDJSON, or
     idField: opts.idField,
     limit: opts.limit ? parseInt(opts.limit) : void 0
   });
-  console.log(chalk4.green(`\u2713 Import complete`));
-  console.log(chalk4.dim(`  Imported: ${result.imported}`));
-  console.log(chalk4.dim(`  Skipped:  ${result.skipped}`));
+  console.log(chalk5.green(`\u2713 Import complete`));
+  console.log(chalk5.dim(`  Imported: ${result.imported}`));
+  console.log(chalk5.dim(`  Skipped:  ${result.skipped}`));
   if (result.errors.length > 0) {
-    console.log(chalk4.yellow(`  Errors:   ${result.errors.length}`));
+    console.log(chalk5.yellow(`  Errors:   ${result.errors.length}`));
     result.errors.slice(0, 5).forEach((e) => {
-      console.log(chalk4.red(`    Row ${e.row}: ${e.message}`));
+      console.log(chalk5.red(`    Row ${e.row}: ${e.message}`));
     });
   }
   pool.closeAll();
@@ -4621,7 +5024,7 @@ function registerDeployOptions(cmd) {
   );
 }
 async function handleDeployCommand(opts) {
-  const { runDeployCli } = await import("../deploy-cli-C35HTITO.js");
+  const { runDeployCli } = await import("./deploy-cli.js");
   await runDeployCli(opts);
 }
 registerDeployOptions(
@@ -4634,7 +5037,7 @@ var vmProgram = new Command("vm");
 vmProgram.description("Manage Sprites VMs").option("-s, --sprite <name>", "Sprite name to operate on");
 async function getSpriteName(spriteOption) {
   if (spriteOption) return spriteOption;
-  const { getActiveSprite } = await import("../vm-config-JI4OXKDQ.js");
+  const { getActiveSprite } = await import("../vm-config-YZRJ3KUB.js");
   const active = getActiveSprite();
   if (active) return active;
   throw new Error(
@@ -4642,9 +5045,9 @@ async function getSpriteName(spriteOption) {
   );
 }
 vmProgram.command("create <name>").description("Create a new Sprite and deploy Trellis DB").option("-k, --api-key <key>", "API key (auto-generated if omitted)").option("-p, --port <port>", "Port (default: 3000)", "3000").action(async (name, cmdOpts) => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
-  const { trackSprite } = await import("../vm-config-JI4OXKDQ.js");
-  const { deploy } = await import("../deploy-LQ7GUGJ5.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
+  const { trackSprite } = await import("../vm-config-YZRJ3KUB.js");
+  const { deploy } = await import("../server/deploy.js");
   try {
     await assertSpriteCli();
     console.log(`Creating Sprite: ${name}...`);
@@ -4654,7 +5057,7 @@ vmProgram.command("create <name>").description("Create a new Sprite and deploy T
       name,
       apiKey: cmdOpts.apiKey,
       port: parseInt(cmdOpts.port),
-      onProgress: (msg) => console.log(chalk4.dim(`  ${msg}`))
+      onProgress: (msg) => console.log(chalk5.dim(`  ${msg}`))
     });
     trackSprite(name, {
       url: result.url,
@@ -4663,18 +5066,18 @@ vmProgram.command("create <name>").description("Create a new Sprite and deploy T
     });
     console.log("");
     console.log(
-      chalk4.green(`\u2713 Sprite ${name} created and Trellis DB deployed`)
+      chalk5.green(`\u2713 Sprite ${name} created and Trellis DB deployed`)
     );
-    console.log(chalk4.dim(`  URL:    ${result.url}`));
-    console.log(chalk4.dim(`  Key:    ${result.apiKey}`));
+    console.log(chalk5.dim(`  URL:    ${result.url}`));
+    console.log(chalk5.dim(`  Key:    ${result.apiKey}`));
     console.log("");
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("list").description("List all tracked Sprites").action(async () => {
-  const { loadVmConfig } = await import("../vm-config-JI4OXKDQ.js");
+  const { loadVmConfig } = await import("../vm-config-YZRJ3KUB.js");
   const config = loadVmConfig();
   const sprites = config.sprites;
   if (Object.keys(sprites).length === 0) {
@@ -4685,8 +5088,8 @@ vmProgram.command("list").description("List all tracked Sprites").action(async (
   }
   console.log("Tracked Sprites:");
   for (const [name, sprite] of Object.entries(sprites)) {
-    const activeMarker = config.activeSprite === name ? chalk4.green("*") : " ";
-    const trellisStatus = sprite.hasTrellis ? chalk4.green("\u2713 Trellis") : chalk4.dim("\u25CB No Trellis");
+    const activeMarker = config.activeSprite === name ? chalk5.green("*") : " ";
+    const trellisStatus = sprite.hasTrellis ? chalk5.green("\u2713 Trellis") : chalk5.dim("\u25CB No Trellis");
     console.log(`${activeMarker} ${name} ${trellisStatus}`);
     console.log(`    URL: ${sprite.url}`);
     if (sprite.lastCheckpoint) {
@@ -4696,8 +5099,8 @@ vmProgram.command("list").description("List all tracked Sprites").action(async (
   }
 });
 vmProgram.command("use <name>").description("Set the active Sprite").action(async (name) => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
-  const { setActiveSprite } = await import("../vm-config-JI4OXKDQ.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
+  const { setActiveSprite } = await import("../vm-config-YZRJ3KUB.js");
   try {
     await assertSpriteCli();
     try {
@@ -4706,15 +5109,15 @@ vmProgram.command("use <name>").description("Set the active Sprite").action(asyn
       throw new Error(`Sprite ${name} does not exist`);
     }
     setActiveSprite(name);
-    console.log(chalk4.green(`\u2713 Active Sprite set to: ${name}`));
+    console.log(chalk5.green(`\u2713 Active Sprite set to: ${name}`));
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("destroy <name>").description("Destroy a Sprite").action(async (name) => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
-  const { untrackSprite } = await import("../vm-config-JI4OXKDQ.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
+  const { untrackSprite } = await import("../vm-config-YZRJ3KUB.js");
   try {
     await assertSpriteCli();
     const { createInterface } = await import("readline");
@@ -4737,36 +5140,36 @@ vmProgram.command("destroy <name>").description("Destroy a Sprite").action(async
     }
     await runSpriteCmd(["destroy", "-s", name, "-y"]);
     untrackSprite(name);
-    console.log(chalk4.green(`\u2713 Sprite ${name} destroyed`));
+    console.log(chalk5.green(`\u2713 Sprite ${name} destroyed`));
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("exec <command...>").description("Execute a command on the active Sprite").action(async (command) => {
-  const { runSpriteInteractive, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
+  const { runSpriteInteractive, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     console.log(`Executing on ${spriteName}: ${command.join(" ")}`);
     await runSpriteInteractive(["exec", "--sprite", spriteName, ...command]);
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("console").description("Open an interactive console on the active Sprite").action(async () => {
-  const { runSpriteInteractive, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
+  const { runSpriteInteractive, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     console.log(`Opening console on ${spriteName}...`);
     await runSpriteInteractive(["console", "--sprite", spriteName]);
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("sessions").description("Manage Sprite sessions").argument("<action>", "Action: list, attach, or kill").argument("[sessionId]", "Session ID (required for attach/kill)").action(async (action, sessionId) => {
-  const { runSpriteCmd, runSpriteInteractive, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
+  const { runSpriteCmd, runSpriteInteractive, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     switch (action) {
@@ -4792,23 +5195,23 @@ vmProgram.command("sessions").description("Manage Sprite sessions").argument("<a
           spriteName,
           sessionId
         ]);
-        console.log(chalk4.green(`\u2713 Killed session ${sessionId}`));
+        console.log(chalk5.green(`\u2713 Killed session ${sessionId}`));
         break;
       default:
         throw new Error(`Invalid action: ${action}`);
     }
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("url").description("Get or update the URL for the active Sprite").option("--public", "Get public URL (default)").option("--private", "Get private URL").option("--update-auth", "Update authentication").action(async (cmdOpts) => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     if (cmdOpts.updateAuth) {
       await runSpriteCmd(["url", "update", "--auth", "--sprite", spriteName]);
-      console.log(chalk4.green(`\u2713 Updated authentication for ${spriteName}`));
+      console.log(chalk5.green(`\u2713 Updated authentication for ${spriteName}`));
     } else {
       const urlType = cmdOpts.private ? "private" : "public";
       const url = await runSpriteCmd([
@@ -4820,24 +5223,24 @@ vmProgram.command("url").description("Get or update the URL for the active Sprit
       console.log(url.trim());
     }
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("proxy <ports...>").description("Proxy local ports to the active Sprite").action(async (ports) => {
-  const { runSpriteInteractive, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
+  const { runSpriteInteractive, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     console.log(`Proxying ports ${ports.join(", ")} to ${spriteName}...`);
     await runSpriteInteractive(["proxy", "--sprite", spriteName, ...ports]);
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("checkpoint").description("Manage Sprite checkpoints").argument("<action>", "Action: create, list, or restore").option("-m, --milestone <msg>", "Message for linked milestone (create only)").option("-c, --checkpoint <id>", "Checkpoint ID (restore only)").action(async (action, cmdOpts) => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
-  const { loadVmConfig, trackSprite } = await import("../vm-config-JI4OXKDQ.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
+  const { loadVmConfig, trackSprite } = await import("../vm-config-YZRJ3KUB.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     switch (action) {
@@ -4864,7 +5267,7 @@ vmProgram.command("checkpoint").description("Manage Sprite checkpoints").argumen
           linkedMilestone: milestoneId
         });
         console.log(
-          chalk4.green(`\u2713 Checkpoint: ${checkpointId || "unknown"}`)
+          chalk5.green(`\u2713 Checkpoint: ${checkpointId || "unknown"}`)
         );
         break;
       case "list":
@@ -4880,18 +5283,18 @@ vmProgram.command("checkpoint").description("Manage Sprite checkpoints").argumen
           spriteName,
           cmdOpts.checkpoint
         ]);
-        console.log(chalk4.green(`\u2713 Restored: ${cmdOpts.checkpoint}`));
+        console.log(chalk5.green(`\u2713 Restored: ${cmdOpts.checkpoint}`));
         break;
       default:
         throw new Error(`Invalid action: ${action}`);
     }
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("cp <src> <dest>").description("Copy files (use :prefix for remote paths)").action(async (src, dest) => {
-  const { runSpriteCmd, runSpriteCopy, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
+  const { runSpriteCmd, runSpriteCopy, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     const isToSprite = !src.startsWith(":") && dest.startsWith(":");
@@ -4899,58 +5302,58 @@ vmProgram.command("cp <src> <dest>").description("Copy files (use :prefix for re
     if (isToSprite) {
       await runSpriteCopy(src, spriteName, dest.slice(1));
       console.log(
-        chalk4.green(`\u2713 Copied ${src} to ${spriteName}:${dest.slice(1)}`)
+        chalk5.green(`\u2713 Copied ${src} to ${spriteName}:${dest.slice(1)}`)
       );
     } else if (isFromSprite) {
       await runSpriteCopy(src.slice(1), spriteName, dest);
       console.log(
-        chalk4.green(`\u2713 Copied ${spriteName}:${src.slice(1)} to ${dest}`)
+        chalk5.green(`\u2713 Copied ${spriteName}:${src.slice(1)} to ${dest}`)
       );
     } else {
       await runSpriteCmd(["cp", src, dest]);
-      console.log(chalk4.green(`\u2713 Copied ${src} to ${dest}`));
+      console.log(chalk5.green(`\u2713 Copied ${src} to ${dest}`));
     }
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("status").description("Show detailed status of the active Sprite").action(async () => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
-  const { loadVmConfig } = await import("../vm-config-JI4OXKDQ.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
+  const { loadVmConfig } = await import("../vm-config-YZRJ3KUB.js");
   try {
     const spriteName = await getSpriteName(vmProgram.opts().sprite);
     const config = loadVmConfig();
     const spriteConfig = config.sprites[spriteName];
     if (!spriteConfig) {
-      console.log(chalk4.red(`Sprite ${spriteName} not in config`));
+      console.log(chalk5.red(`Sprite ${spriteName} not in config`));
       return;
     }
-    console.log(`Status for: ${chalk4.cyan(spriteName)}`);
+    console.log(`Status for: ${chalk5.cyan(spriteName)}`);
     console.log(
-      `  Active: ${config.activeSprite === spriteName ? chalk4.green("yes") : chalk4.dim("no")}`
+      `  Active: ${config.activeSprite === spriteName ? chalk5.green("yes") : chalk5.dim("no")}`
     );
     console.log(`  URL: ${spriteConfig.url}`);
     console.log(
-      `  Trellis: ${spriteConfig.hasTrellis ? chalk4.green("yes") : chalk4.dim("no")}`
+      `  Trellis: ${spriteConfig.hasTrellis ? chalk5.green("yes") : chalk5.dim("no")}`
     );
     if (spriteConfig.hasTrellis) {
       console.log(
-        `  API Key: ${spriteConfig.apiKey ?? chalk4.dim("not available")}`
+        `  API Key: ${spriteConfig.apiKey ?? chalk5.dim("not available")}`
       );
     }
     if (spriteConfig.lastCheckpoint) {
       console.log(`  Checkpoint: ${spriteConfig.lastCheckpoint}`);
     }
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
 vmProgram.command("code [name]").description("Create Sprite, deploy Trellis, open in browser").action(async (nameOpt) => {
-  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-KQGTGM6W.js");
-  const { loadVmConfig, trackSprite, getActiveSprite } = await import("../vm-config-JI4OXKDQ.js");
-  const { deploy } = await import("../deploy-LQ7GUGJ5.js");
+  const { runSpriteCmd, assertSpriteCli } = await import("../sprites-NC6D7YZS.js");
+  const { loadVmConfig, trackSprite, getActiveSprite } = await import("../vm-config-YZRJ3KUB.js");
+  const { deploy } = await import("../server/deploy.js");
   const openUrl = (url) => {
     const cmd = process.platform === "darwin" ? "open" : process.platform === "linux" ? "xdg-open" : null;
     if (!cmd) {
@@ -4980,20 +5383,20 @@ vmProgram.command("code [name]").description("Create Sprite, deploy Trellis, ope
       console.log(`Deploying Trellis to ${spriteName}...`);
       const result = await deploy({
         name: spriteName,
-        onProgress: (msg) => console.log(chalk4.dim(`  ${msg}`))
+        onProgress: (msg) => console.log(chalk5.dim(`  ${msg}`))
       });
       trackSprite(spriteName, {
         url: result.url,
         hasTrellis: true,
         apiKey: result.apiKey
       });
-      console.log(chalk4.green(`\u2713 Deployed`));
+      console.log(chalk5.green(`\u2713 Deployed`));
     }
     const url = spriteConfig?.url || `https://${spriteName}.sprites.app`;
     console.log(`Opening ${url}...`);
     openUrl(url);
   } catch (err) {
-    console.error(chalk4.red(`Failed: ${err.message}`));
+    console.error(chalk5.red(`Failed: ${err.message}`));
     process.exit(1);
   }
 });
@@ -5008,11 +5411,11 @@ program.command("season").description("Enrich project context for agents \u2014
   const ask = (q) => new Promise((r) => rl.question(q, (a) => r(a.trim())));
   const context = await inferProjectContext(rootPath);
   console.log(
-    chalk4.bold("\n  Trellis Season \u2014 let's enrich your project context\n")
+    chalk5.bold("\n  Trellis Season \u2014 let's enrich your project context\n")
   );
-  console.log(chalk4.dim(`  Current domain: ${context.domain ?? "(none)"}`));
+  console.log(chalk5.dim(`  Current domain: ${context.domain ?? "(none)"}`));
   console.log(
-    chalk4.dim(`  Current ecosystem: ${context.ecosystem ?? "(none)"}
+    chalk5.dim(`  Current ecosystem: ${context.ecosystem ?? "(none)"}
 `)
   );
   const domain = await ask(
@@ -5033,15 +5436,15 @@ program.command("season").description("Enrich project context for agents \u2014
   };
   const profile = loadProfile();
   writeAgentScaffold(rootPath, { profile, context: updatedContext });
-  const agentContextPath = join6(
+  const agentContextPath = join7(
     rootPath,
     ".trellis",
     "agents",
     "agent-context.json"
   );
   try {
-    const { readFileSync: readFileSync5, writeFileSync: writeFileSync3 } = await import("fs");
-    const existing = JSON.parse(readFileSync5(agentContextPath, "utf-8"));
+    const { readFileSync: readFileSync7, writeFileSync: writeFileSync4 } = await import("fs");
+    const existing = JSON.parse(readFileSync7(agentContextPath, "utf-8"));
     existing.domain = updatedContext.domain;
     if (toolsRaw) {
       existing.tools = toolsRaw.split(",").map((s) => s.trim()).filter(Boolean);
@@ -5051,20 +5454,20 @@ program.command("season").description("Enrich project context for agents \u2014
     }
     existing.generatedAt = (/* @__PURE__ */ new Date()).toISOString();
     existing.confidence = "high";
-    writeFileSync3(agentContextPath, JSON.stringify(existing, null, 2));
+    writeFileSync4(agentContextPath, JSON.stringify(existing, null, 2));
   } catch {
   }
   console.log();
-  console.log(chalk4.green("\u2713 Project context updated"));
+  console.log(chalk5.green("\u2713 Project context updated"));
   console.log(
-    `  ${chalk4.dim("AGENTS.md:")}         .trellis/agents/AGENTS.md`
+    `  ${chalk5.dim("AGENTS.md:")}         .trellis/agents/AGENTS.md`
   );
   console.log(
-    `  ${chalk4.dim("Agent config:")}      .trellis/agents/agent-context.json`
+    `  ${chalk5.dim("Agent config:")}      .trellis/agents/agent-context.json`
   );
   if (updatedContext.domain) {
     console.log(
-      `  ${chalk4.dim("Domain:")}            ${chalk4.cyan(updatedContext.domain)}`
+      `  ${chalk5.dim("Domain:")}            ${chalk5.cyan(updatedContext.domain)}`
     );
   }
   console.log();
@@ -5072,57 +5475,57 @@ program.command("season").description("Enrich project context for agents \u2014
 program.command("code").alias("ide").description(
   'Launch OpenCode in "Harness" mode, bridged to this Trellis repository'
 ).option("-p, --path <path>", "Repository path", ".").option("-m, --model <model>", "OpenCode model to use").option("-w, --web", "Launch MCP server in HTTP mode for web client access").option("--mcp-port <port>", "MCP HTTP server port (default: 3333)", "3333").option("--no-init", "Skip initialization even if not a Trellis workspace").action(async (opts) => {
-  const { resolve: resolve3, dirname: dirname7, join: join7 } = await import("path");
-  const { existsSync: existsSync6 } = await import("fs");
+  const { resolve: resolve3, dirname: dirname7, join: join8 } = await import("path");
+  const { existsSync: existsSync7 } = await import("fs");
   const { spawn } = await import("child_process");
-  const { readFileSync: readFileSync5 } = await import("fs");
+  const { readFileSync: readFileSync7 } = await import("fs");
   const { createServer: createHttpServer } = await import("http");
   const rootPath = findRepoRoot(opts.path) ?? resolve3(opts.path);
   if (!opts.noInit) {
     if (!TrellisVcsEngine.isRepo(rootPath)) {
-      console.log(chalk4.dim("Not a Trellis workspace \u2014 initializing\u2026"));
+      console.log(chalk5.dim("Not a Trellis workspace \u2014 initializing\u2026"));
       await runInit(rootPath, {
         interactive: false
       });
-      console.log(chalk4.green("\u2713 Initialized Trellis repository"));
+      console.log(chalk5.green("\u2713 Initialized Trellis repository"));
     }
   }
   function findOpencode() {
     const here2 = dirname7(process.argv[1]);
     const candidates = [
-      join7(here2, "..", "node_modules", ".bin", "opencode"),
-      join7(here2, "..", "..", "node_modules", ".bin", "opencode")
+      join8(here2, "..", "node_modules", ".bin", "opencode"),
+      join8(here2, "..", "..", "node_modules", ".bin", "opencode")
     ];
     let dir = here2;
     for (let i = 0; i < 5; i++) {
-      const p = join7(dir, "node_modules", ".bin", "opencode");
-      if (existsSync6(p)) return p;
+      const p = join8(dir, "node_modules", ".bin", "opencode");
+      if (existsSync7(p)) return p;
       dir = dirname7(dir);
     }
     for (const p of candidates) {
-      if (existsSync6(p)) return p;
+      if (existsSync7(p)) return p;
     }
     return null;
   }
   function findMcpServer() {
     const here2 = dirname7(process.argv[1]);
     const candidates = [
-      join7(here2, "..", "..", "src", "mcp", "index.ts"),
-      join7(here2, "..", "src", "mcp", "index.ts"),
-      join7(here2, "..", "..", "..", "src", "mcp", "index.ts"),
-      join7(here2, "..", "mcp", "index.js"),
-      join7(here2, "..", "mcp", "index.ts"),
-      join7(here2, "mcp", "index.ts")
+      join8(here2, "..", "..", "src", "mcp", "index.ts"),
+      join8(here2, "..", "src", "mcp", "index.ts"),
+      join8(here2, "..", "..", "..", "src", "mcp", "index.ts"),
+      join8(here2, "..", "mcp", "index.js"),
+      join8(here2, "..", "mcp", "index.ts"),
+      join8(here2, "mcp", "index.ts")
     ];
     for (const p of candidates) {
-      if (existsSync6(p)) return p;
+      if (existsSync7(p)) return p;
     }
     return null;
   }
   const opencode = findOpencode();
   if (!opencode) {
     console.error(
-      chalk4.red(
+      chalk5.red(
         "OpenCode not found. Try running `bun install` or `npm install -g opencode-ai`."
       )
     );
@@ -5130,22 +5533,22 @@ program.command("code").alias("ide").description(
   }
   const mcp = findMcpServer();
   if (!mcp) {
-    console.error(chalk4.red("Trellis MCP server not found."));
+    console.error(chalk5.red("Trellis MCP server not found."));
     process.exit(1);
   }
   const mcpPort = parseInt(opts.mcpPort, 10) || 3333;
   const mcpUrl = `http://localhost:${mcpPort}`;
-  console.log(chalk4.green(`\u26A1 Spinning up Trellis Agentic Harness...`));
-  console.log(chalk4.dim(`   Root:    ${rootPath}`));
-  console.log(chalk4.dim(`   MCP:     ${mcp}`));
-  console.log(chalk4.dim(`   Agent:   OpenCode`));
+  console.log(chalk5.green(`\u26A1 Spinning up Trellis Agentic Harness...`));
+  console.log(chalk5.dim(`   Root:    ${rootPath}`));
+  console.log(chalk5.dim(`   MCP:     ${mcp}`));
+  console.log(chalk5.dim(`   Agent:   OpenCode`));
   if (opts.web) {
-    console.log(chalk4.dim(`   Web:     ${mcpUrl}`));
+    console.log(chalk5.dim(`   Web:     ${mcpUrl}`));
   }
   console.log("");
   let mcpProcess = null;
   if (opts.web) {
-    console.log(chalk4.dim(`   Starting MCP server on port ${mcpPort}\u2026`));
+    console.log(chalk5.dim(`   Starting MCP server on port ${mcpPort}\u2026`));
     mcpProcess = spawn(
       "bun",
       [
@@ -5166,26 +5569,26 @@ program.command("code").alias("ide").description(
     mcpProcess.stderr?.on("data", (data) => {
       const msg = data.toString();
       if (!msg.includes("TrellisVCS MCP Server")) {
-        process.stderr.write(chalk4.dim(`   [mcp] ${msg}`));
+        process.stderr.write(chalk5.dim(`   [mcp] ${msg}`));
       }
     });
     mcpProcess.on("error", (err) => {
       console.error(
-        chalk4.red(`
+        chalk5.red(`
 \u2717 MCP server failed to start: ${err.message}`)
       );
       process.exit(1);
     });
     const ready = await waitForMcpReady(mcpUrl, 1e4);
     if (!ready) {
-      console.error(chalk4.red(`
+      console.error(chalk5.red(`
 \u2717 MCP server did not become ready in time`));
       if (mcpProcess) {
         mcpProcess.kill();
       }
       process.exit(1);
     }
-    console.log(chalk4.green(`\u2713 MCP server ready at ${mcpUrl}`));
+    console.log(chalk5.green(`\u2713 MCP server ready at ${mcpUrl}`));
   }
   const args = [rootPath];
   if (opts.model) {
@@ -5217,9 +5620,9 @@ program.command("code").alias("ide").description(
       mcpProcess.kill();
     }
     if (code === 0) {
-      console.log(chalk4.green("\n\u2713 Agentic session complete."));
+      console.log(chalk5.green("\n\u2713 Agentic session complete."));
     } else {
-      console.log(chalk4.yellow(`
+      console.log(chalk5.yellow(`
 \u26A0 Agent session exited with code ${code}`));
     }
     process.exit(code ?? 0);
@@ -5230,27 +5633,27 @@ program.command("studio").alias("web").description("Launch Trellis Studio in you
   "Open the new-project prompt instead of the current directory"
 ).option("--no-open", "Do not auto-open the browser").option("--no-init", "Skip initialization even if not a Trellis workspace").option("--quiet-backend", "Suppress backend stdout/stderr").allowUnknownOption(true).action(async (opts, command) => {
   const { resolve: resolve3 } = await import("path");
-  const { existsSync: existsSync6, readFileSync: readFileSync5 } = await import("fs");
+  const { existsSync: existsSync7, readFileSync: readFileSync7 } = await import("fs");
   const { spawn } = await import("child_process");
   const { createRequire } = await import("module");
   const path = await import("path");
   const rootPath = findRepoRoot(opts.path) ?? resolve3(opts.path);
   if (!opts.noInit) {
     if (!TrellisVcsEngine.isRepo(rootPath)) {
-      console.log(chalk4.dim("Not a Trellis workspace \u2014 initializing\u2026"));
+      console.log(chalk5.dim("Not a Trellis workspace \u2014 initializing\u2026"));
       await runInit(rootPath, { interactive: false });
-      console.log(chalk4.green("\u2713 Initialized Trellis repository"));
+      console.log(chalk5.green("\u2713 Initialized Trellis repository"));
     }
   }
   const requireFn = createRequire(import.meta.url);
   let turtlecodeBin = null;
   try {
     const pkgPath = requireFn.resolve("turtlecode/package.json");
-    const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync7(pkgPath, "utf-8"));
     const binRel = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.turtlecode;
     if (binRel) {
       const candidate = path.join(path.dirname(pkgPath), binRel);
-      if (existsSync6(candidate)) turtlecodeBin = candidate;
+      if (existsSync7(candidate)) turtlecodeBin = candidate;
     }
   } catch {
   }
@@ -5263,8 +5666,8 @@ program.command("studio").alias("web").description("Launch Trellis Studio in you
   passthrough.push(...extra);
   const spawnArgs = turtlecodeBin ? [turtlecodeBin, ...passthrough] : ["turtlecode", ...passthrough];
   const spawnCmd = turtlecodeBin ? process.execPath : "npx";
-  console.log(chalk4.green("\u26A1 Launching Trellis Studio..."));
-  console.log(chalk4.dim(`   Project: ${rootPath}`));
+  console.log(chalk5.green("\u26A1 Launching Trellis Studio..."));
+  console.log(chalk5.dim(`   Project: ${rootPath}`));
   console.log("");
   const child = spawn(spawnCmd, spawnArgs, {
     stdio: "inherit",
@@ -5274,12 +5677,12 @@ program.command("studio").alias("web").description("Launch Trellis Studio in you
   child.on("error", (err) => {
     if (err.code === "ENOENT" && !turtlecodeBin) {
       console.error(
-        chalk4.red(
+        chalk5.red(
           "\nCould not find `turtlecode`. Reinstall trellis, or install turtlecode globally: `npm i -g turtlecode`\n"
         )
       );
     } else {
-      console.error(chalk4.red(`
+      console.error(chalk5.red(`
 Failed to launch Studio: ${err.message}`));
     }
     process.exit(1);
@@ -5320,18 +5723,18 @@ cmsCmd.command("register-library <pkg>").description(
   "Print the facts that would be asserted without contacting the server"
 ).action(async (pkg, opts) => {
   const rootPath = resolveRepoRoot(opts.path);
-  const { readFileSync: readFileSync5, existsSync: existsSync6 } = await import("fs");
-  const manifestPath = join6(
+  const { readFileSync: readFileSync7, existsSync: existsSync7 } = await import("fs");
+  const manifestPath = join7(
     rootPath,
     "node_modules",
     pkg,
     "dist",
     "components.json"
   );
-  if (!existsSync6(manifestPath)) {
-    console.error(chalk4.red(`\u2717 No manifest at ${manifestPath}`));
+  if (!existsSync7(manifestPath)) {
+    console.error(chalk5.red(`\u2717 No manifest at ${manifestPath}`));
     console.error(
-      chalk4.dim(
+      chalk5.dim(
         `  Install ${pkg} in this repo and ensure it ships dist/components.json.`
       )
     );
@@ -5339,15 +5742,15 @@ cmsCmd.command("register-library <pkg>").description(
   }
   let manifest;
   try {
-    manifest = JSON.parse(readFileSync5(manifestPath, "utf8"));
+    manifest = JSON.parse(readFileSync7(manifestPath, "utf8"));
   } catch (err) {
-    console.error(chalk4.red(`\u2717 Manifest is not valid JSON: ${manifestPath}`));
-    console.error(chalk4.dim(`  ${err?.message ?? String(err)}`));
+    console.error(chalk5.red(`\u2717 Manifest is not valid JSON: ${manifestPath}`));
+    console.error(chalk5.dim(`  ${err?.message ?? String(err)}`));
     process.exit(1);
   }
   const { package: pkgName, version, components } = manifest;
   if (!Array.isArray(components) || components.length === 0) {
-    console.error(chalk4.yellow(`\u26A0 Manifest is empty: ${manifestPath}`));
+    console.error(chalk5.yellow(`\u26A0 Manifest is empty: ${manifestPath}`));
     process.exit(1);
   }
   const pkgSlug = pkgName.replace(/^@/, "").replace(/\//g, "__");
@@ -5367,10 +5770,10 @@ cmsCmd.command("register-library <pkg>").description(
     );
   }
   if (opts.dryRun) {
-    console.log(chalk4.dim("\u2500\u2500 Dry run: would assert these facts \u2500\u2500"));
+    console.log(chalk5.dim("\u2500\u2500 Dry run: would assert these facts \u2500\u2500"));
     console.log(JSON.stringify(facts, null, 2));
     console.log(
-      chalk4.dim(
+      chalk5.dim(
         `\u2500\u2500 ${facts.length} facts across ${components.length} components \u2500\u2500`
       )
     );
@@ -5392,31 +5795,31 @@ cmsCmd.command("register-library <pkg>").description(
     });
     if (!res.ok) {
       const body2 = await res.text().catch(() => "");
-      console.error(chalk4.red(`\u2717 Assert failed: HTTP ${res.status}`));
-      if (body2) console.error(chalk4.dim(`  ${body2.slice(0, 400)}`));
+      console.error(chalk5.red(`\u2717 Assert failed: HTTP ${res.status}`));
+      if (body2) console.error(chalk5.dim(`  ${body2.slice(0, 400)}`));
       process.exit(1);
     }
     const body = await res.json().catch(() => ({ added: 0 }));
     console.log(
-      chalk4.green(
-        `\u2713 Registered ${chalk4.bold(String(components.length))} components from ${chalk4.bold(pkgName)}@${version}`
+      chalk5.green(
+        `\u2713 Registered ${chalk5.bold(String(components.length))} components from ${chalk5.bold(pkgName)}@${version}`
       )
     );
-    console.log(`  ${chalk4.dim("Facts added:")} ${body.added ?? "?"}`);
-    console.log(`  ${chalk4.dim("Workspace:")}   ${rootPath}`);
+    console.log(`  ${chalk5.dim("Facts added:")} ${body.added ?? "?"}`);
+    console.log(`  ${chalk5.dim("Workspace:")}   ${rootPath}`);
     for (const comp of components) {
       console.log(
-        `  ${chalk4.dim("\u2022")} ${comp.component} ${chalk4.dim(`(design:component:${pkgSlug}:${comp.slug})`)}`
+        `  ${chalk5.dim("\u2022")} ${comp.component} ${chalk5.dim(`(design:component:${pkgSlug}:${comp.slug})`)}`
       );
     }
   } catch (err) {
     const msg = err?.message ?? String(err);
     console.error(
-      chalk4.red(`\u2717 Could not reach Trellis server at ${opts.url}`)
+      chalk5.red(`\u2717 Could not reach Trellis server at ${opts.url}`)
     );
-    console.error(chalk4.dim(`  ${msg}`));
+    console.error(chalk5.dim(`  ${msg}`));
     console.error(
-      chalk4.dim(
+      chalk5.dim(
         `  Hint: start the Trellis backend (e.g. open the turtlecode IDE) and retry.`
       )
     );
@@ -5425,91 +5828,91 @@ cmsCmd.command("register-library <pkg>").description(
 });
 program.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-ODE3T2KR.js");
-  const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
+  const { RemoteManager } = await import("../remote-manager-6ERQUBSL.js");
+  const remoteManager = new RemoteManager(join7(rootPath, ".trellis"));
   try {
     if (!action || action === "list") {
       const remotes = remoteManager.listRemotes();
       if (remotes.length === 0) {
-        console.log(chalk4.dim("No remotes configured."));
+        console.log(chalk5.dim("No remotes configured."));
         return;
       }
-      console.log(chalk4.bold(`Remotes (${remotes.length})
+      console.log(chalk5.bold(`Remotes (${remotes.length})
 `));
       for (const remote of remotes) {
-        const lastPulled = remote.pulledAt ? chalk4.dim(
+        const lastPulled = remote.pulledAt ? chalk5.dim(
           ` (pulled ${new Date(remote.pulledAt).toLocaleDateString()})`
-        ) : chalk4.dim(" (never pulled)");
+        ) : chalk5.dim(" (never pulled)");
         console.log(
-          `  ${chalk4.cyan(remote.name)}: ${remote.path}${lastPulled}`
+          `  ${chalk5.cyan(remote.name)}: ${remote.path}${lastPulled}`
         );
       }
       return;
     }
     if (action === "add") {
       if (!name) {
-        console.error(chalk4.red("Error: Remote name required for add"));
+        console.error(chalk5.red("Error: Remote name required for add"));
         process.exit(1);
       }
       if (!path) {
-        console.error(chalk4.red("Error: Remote path required for add"));
+        console.error(chalk5.red("Error: Remote path required for add"));
         process.exit(1);
       }
       remoteManager.addRemote(name, path);
-      console.log(chalk4.green(`\u2713 Added remote '${name}' -> ${path}`));
+      console.log(chalk5.green(`\u2713 Added remote '${name}' -> ${path}`));
       return;
     }
     if (action === "remove") {
       if (!name) {
-        console.error(chalk4.red("Error: Remote name required for remove"));
+        console.error(chalk5.red("Error: Remote name required for remove"));
         process.exit(1);
       }
       remoteManager.removeRemote(name);
-      console.log(chalk4.green(`\u2713 Removed remote '${name}'`));
+      console.log(chalk5.green(`\u2713 Removed remote '${name}'`));
       return;
     }
-    console.error(chalk4.red(`Unknown action: ${action}`));
+    console.error(chalk5.red(`Unknown action: ${action}`));
     process.exit(1);
   } catch (error) {
-    console.error(chalk4.red(`Error: ${error}`));
+    console.error(chalk5.red(`Error: ${error}`));
     process.exit(1);
   }
 });
 program.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-ODE3T2KR.js");
-  const remoteManager = new RemoteManager(join6(rootPath, ".trellis"));
+  const { RemoteManager } = await import("../remote-manager-6ERQUBSL.js");
+  const remoteManager = new RemoteManager(join7(rootPath, ".trellis"));
   const engine = new TrellisVcsEngine({ rootPath });
   engine.open();
   try {
     if (opts.remote) {
       const result = await remoteManager.pullRemote(opts.remote, engine);
-      console.log(chalk4.bold(`Pull from ${opts.remote}
+      console.log(chalk5.bold(`Pull from ${opts.remote}
 `));
-      console.log(`  ${chalk4.dim("New ops:")} ${result.newOps}`);
+      console.log(`  ${chalk5.dim("New ops:")} ${result.newOps}`);
       if (result.errors.length > 0) {
-        console.log(`  ${chalk4.dim("Errors:")} ${result.errors.join(", ")}`);
+        console.log(`  ${chalk5.dim("Errors:")} ${result.errors.join(", ")}`);
       }
-      console.log(`  ${chalk4.dim("Duration:")} ${result.durationMs}ms`);
+      console.log(`  ${chalk5.dim("Duration:")} ${result.durationMs}ms`);
     } else {
       const result = await remoteManager.pullAll(engine);
-      console.log(chalk4.bold("Pull from all remotes\n"));
-      console.log(`  ${chalk4.dim("Total new ops:")} ${result.totalNewOps}`);
-      console.log(`  ${chalk4.dim("Duration:")} ${result.totalDurationMs}ms`);
+      console.log(chalk5.bold("Pull from all remotes\n"));
+      console.log(`  ${chalk5.dim("Total new ops:")} ${result.totalNewOps}`);
+      console.log(`  ${chalk5.dim("Duration:")} ${result.totalDurationMs}ms`);
       for (const remoteResult of result.results) {
-        const status = remoteResult.errors.length > 0 ? chalk4.red("\u2717") : chalk4.green("\u2713");
+        const status = remoteResult.errors.length > 0 ? chalk5.red("\u2717") : chalk5.green("\u2713");
         console.log(
           `  ${status} ${remoteResult.remote}: ${remoteResult.newOps} new ops`
         );
         if (remoteResult.errors.length > 0) {
           for (const error of remoteResult.errors) {
-            console.log(`    ${chalk4.dim(error)}`);
+            console.log(`    ${chalk5.dim(error)}`);
           }
         }
       }
     }
   } catch (error) {
-    console.error(chalk4.red(`Pull failed: ${error}`));
+    console.error(chalk5.red(`Pull failed: ${error}`));
     process.exit(1);
   }
 });
@@ -5518,8 +5921,8 @@ program.command("skills").description("Install Trellis agent skills using the sk
   const extraArgs = skillsIndex !== -1 ? process.argv.slice(skillsIndex + 1) : [];
   const { spawnSync } = await import("child_process");
   const skillsArgs = ["skills", "add", "trentbrew/trellis", ...extraArgs];
-  console.log(chalk4.cyan("  Installing Trellis agent skills..."));
-  console.log(chalk4.dim(`  Running: npx ${skillsArgs.join(" ")}
+  console.log(chalk5.cyan("  Installing Trellis agent skills..."));
+  console.log(chalk5.dim(`  Running: npx ${skillsArgs.join(" ")}
 `));
   if (process.env.TRELLIS_CLI_DRY_RUN === "1") {
     return;
@@ -5530,7 +5933,7 @@ program.command("skills").description("Install Trellis agent skills using the sk
   });
   if (result.error) {
     console.error(
-      chalk4.red(`
+      chalk5.red(`
 \u2717 Failed to run skills CLI: ${result.error.message}`)
     );
     process.exit(1);
@@ -5539,5 +5942,81 @@ program.command("skills").description("Install Trellis agent skills using the sk
     process.exit(result.status ?? 1);
   }
 });
+var mcpProgram = program.command("mcp").description("MCP servers and remote room bridges");
+mcpProgram.command("bridge").description(
+  "stdio proxy to a remote Trellis room MCP endpoint (Streamable HTTP)"
+).option("-r, --room <url>", "Room base URL or full /mcp URL").option("-k, --api-key <key>", "API key (defaults to .trellis-db.json)").option("--tenant <id>", "Default tenant (e.g. embed-design-review)").option(
+  "--playground-room <slug>",
+  "Playground ?room= slug \u2192 tenant embed-{slug}"
+).option("--config-dir <dir>", "Directory containing .trellis-db.json", ".").option("--quiet", "Suppress stderr startup message").action(async (opts) => {
+  const { runRoomMcpBridge } = await import("../bridge-JSSPQPRH.js");
+  try {
+    await runRoomMcpBridge({
+      room: opts.room,
+      apiKey: opts.apiKey,
+      tenant: opts.tenant,
+      playgroundRoom: opts.playgroundRoom,
+      configDir: opts.configDir,
+      quiet: !!opts.quiet
+    });
+  } catch (err) {
+    console.error(
+      chalk5.red(err instanceof Error ? err.message : String(err))
+    );
+    process.exit(1);
+  }
+});
+var gatewayProgram = mcpProgram.command("gateway").description("Hosted MCP discovery gateway (mcp.trellis.computer pattern)");
+gatewayProgram.command("serve").description("Start discovery-only MCP gateway (list_rooms, connect_room)").option("-p, --port <port>", "HTTP port", "3940").option("--config-dir <dir>", "Directory for .trellis-db.json lookup", ".").option(
+  "--public-url <url>",
+  "Public URL for OAuth metadata (default: http://localhost:<port>)"
+).action(async (opts) => {
+  const { startGatewayServer } = await import("../mcp/gateway-serve.js");
+  const port = parseInt(opts.port, 10) || 3940;
+  const publicUrl = opts.publicUrl?.trim() || `http://localhost:${port}`;
+  const server = await startGatewayServer({
+    port,
+    configDir: opts.configDir,
+    publicUrl
+  });
+  console.log(chalk5.green("\u2713 Trellis MCP discovery gateway running"));
+  console.log(chalk5.dim(`  Public:   ${publicUrl}`));
+  console.log(chalk5.dim(`  MCP:      ${publicUrl}/mcp`));
+  console.log(chalk5.dim(`  Gateway:  ${publicUrl}/gateway/mcp`));
+  console.log(chalk5.dim(`  Health:   ${publicUrl}/health`));
+  console.log(chalk5.dim(`  OAuth:    ${publicUrl}/.well-known/oauth-protected-resource`));
+  console.log("");
+  console.log(chalk5.bold("Tools: list_rooms, get_room, connect_room"));
+  await new Promise((resolve3) => {
+    const shutdown = () => {
+      server.stop();
+      resolve3();
+    };
+    process.on("SIGINT", shutdown);
+    process.on("SIGTERM", shutdown);
+  });
+});
+gatewayProgram.command("deploy").description("Deploy discovery gateway to Sprites (mcp.trellis.computer)").requiredOption("--name <name>", "Sprite name (e.g. mcp-gateway)").option(
+  "--public-url <url>",
+  "Vanity URL for agents",
+  "https://mcp.trellis.computer"
+).option(
+  "--port <port>",
+  "Port inside Sprite (default: 8080)"
+).option("--config-dir <dir>", "Directory for gateway config + room registry", ".").option(
+  "--rooms-file <path>",
+  "Extra rooms JSON merged into .trellis-rooms.json at deploy"
+).option("--stub", "Write config only \u2014 skip Sprites provisioning", false).action(async (opts) => {
+  const { runGatewayDeployCli } = await import("../gateway-deploy-cli-4TU4V3QI.js");
+  await runGatewayDeployCli({
+    name: opts.name,
+    publicUrl: opts.publicUrl,
+    port: opts.port,
+    configDir: opts.configDir,
+    roomsFile: opts.roomsFile,
+    stub: !!opts.stub
+  });
+});
 registerLaneCommands(program);
+registerProtocolCommands(program);
 program.parseAsync(process.argv).catch(handleCliError);