@pleri/olam-cli 0.1.169 → 0.1.173

package/dist/index.js

@@ -492,8 +492,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path95, errorMaps, issueData } = params;
-      const fullPath = [...path95, ...issueData.path || []];
+      const { data, path: path96, errorMaps, issueData } = params;
+      const fullPath = [...path96, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -801,11 +801,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path95, key) {
+      constructor(parent, value, path96, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path95;
+        this._path = path96;
         this._key = key;
       }
       get path() {
@@ -4286,7 +4286,7 @@ import YAML from "yaml";
 function bootstrapStepCmd(entry) {
   return typeof entry === "string" ? entry : entry.cmd;
 }
-function refineForbiddenKeys(value, path95, ctx, rejectSource) {
+function refineForbiddenKeys(value, path96, ctx, rejectSource) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
     return;
   }
@@ -4294,12 +4294,12 @@ function refineForbiddenKeys(value, path95, ctx, rejectSource) {
     if (FORBIDDEN_KEYS.has(key)) {
       ctx.addIssue({
         code: external_exports.ZodIssueCode.custom,
-        path: [...path95, key],
+        path: [...path96, key],
         message: `forbidden key "${key}" (prototype-pollution surface)`
       });
       continue;
     }
-    if (rejectSource && path95.length === 0 && key === "source") {
+    if (rejectSource && path96.length === 0 && key === "source") {
       ctx.addIssue({
         code: external_exports.ZodIssueCode.custom,
         path: ["source"],
@@ -4307,21 +4307,21 @@ function refineForbiddenKeys(value, path95, ctx, rejectSource) {
       });
       continue;
     }
-    refineForbiddenKeys(value[key], [...path95, key], ctx, false);
+    refineForbiddenKeys(value[key], [...path96, key], ctx, false);
   }
 }
-function rejectForbiddenKeys(value, path95, rejectSource) {
+function rejectForbiddenKeys(value, path96, rejectSource) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
     return;
   }
   for (const key of Object.keys(value)) {
     if (FORBIDDEN_KEYS.has(key)) {
-      throw new Error(`[manifest] ${path95}: forbidden key "${key}" (prototype-pollution surface)`);
+      throw new Error(`[manifest] ${path96}: forbidden key "${key}" (prototype-pollution surface)`);
     }
     if (rejectSource && key === "source") {
-      throw new Error(`[manifest] ${path95}: top-level "source" is loader-stamped \u2014 manifests must not author it`);
+      throw new Error(`[manifest] ${path96}: top-level "source" is loader-stamped \u2014 manifests must not author it`);
     }
-    rejectForbiddenKeys(value[key], `${path95}.${key}`, false);
+    rejectForbiddenKeys(value[key], `${path96}.${key}`, false);
   }
 }
 function unknownTopLevelKeys(parsed) {
@@ -4860,7 +4860,13 @@ var init_schema2 = __esm({
       user: external_exports.string().min(1),
       key: external_exports.string().optional()
     });
-    computeProviderType = external_exports.enum(["docker", "ssh", "e2b", "cloudflare"]);
+    computeProviderType = external_exports.enum([
+      "docker",
+      "ssh",
+      "e2b",
+      "cloudflare",
+      "cloudflare-isolate"
+    ]);
     stackImageSchema = external_exports.object({
       enabled: external_exports.boolean().optional().default(true),
       auto_commit: external_exports.boolean().optional().default(true),
@@ -4872,6 +4878,15 @@ var init_schema2 = __esm({
       }).optional(),
       ssh: external_exports.object({ hosts: external_exports.array(sshHostSchema).optional() }).optional(),
       e2b: external_exports.object({ template: external_exports.string().optional() }).optional(),
+      // V8-isolate runtime tier per ADR 022. Pure isolate, no DO, no Container.
+      // worker_url points at the deployed olam-worker-runner-isolate Worker.
+      // Same https-or-localhost guard as the cloudflare profile — bearer token
+      // in cleartext would leak the OLAM_TASK_TOKEN.
+      "cloudflare-isolate": external_exports.object({
+        worker_url: external_exports.string().url("worker_url must be a valid URL").refine(isSecureOrLocalhost, {
+          message: "worker_url must use https:// (or http://localhost for dev)"
+        }).optional()
+      }).optional(),
       cloudflare: external_exports.object({
         account_id: external_exports.string().optional(),
         // https-only refine: bare http:// would send the operator's Pylon
@@ -5500,8 +5515,8 @@ var init_client = __esm({
           throw new Error(`failed to report rate-limit for ${accountId} (HTTP ${res.status})`);
         }
       }
-      async request(method, path95, body, attempt = 0) {
-        const url2 = `${this.baseUrl}${path95}`;
+      async request(method, path96, body, attempt = 0) {
+        const url2 = `${this.baseUrl}${path96}`;
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), this.timeoutMs);
         const headers = {};
@@ -5519,7 +5534,7 @@ var init_client = __esm({
         } catch (err) {
           if (attempt < RETRY_COUNT && isTransient(err)) {
             await sleep(RETRY_BACKOFF_MS * (attempt + 1));
-            return this.request(method, path95, body, attempt + 1);
+            return this.request(method, path96, body, attempt + 1);
           }
           throw err;
         } finally {
@@ -7322,8 +7337,8 @@ var init_provider3 = __esm({
       // -----------------------------------------------------------------------
       // Internal fetch helper
       // -----------------------------------------------------------------------
-      async request(path95, method, body) {
-        const url2 = `${this.config.workerUrl}${path95}`;
+      async request(path96, method, body) {
+        const url2 = `${this.config.workerUrl}${path96}`;
         const bearer = await this.config.mintToken();
         const headers = {
           Authorization: `Bearer ${bearer}`
@@ -7884,6 +7899,46 @@ function hasImageRef(present, ref) {
   const variants = [`docker.io/library/${ref}`, `docker.io/${ref}`];
   return variants.some((v) => present.has(v));
 }
+function probeColimaKubernetesEnabled(opts) {
+  const { platform: platform2, home } = opts;
+  const colimaProfile = opts.colimaProfile ?? process.env.COLIMA_PROFILE ?? "default";
+  const readFileFn = opts.readFileFn ?? ((p, enc) => readFileSync13(p, enc));
+  const existsFn = opts.existsFn ?? existsSync13;
+  if (platform2 !== "darwin") {
+    return { ok: true, message: "colima k8s lint: not darwin, skip" };
+  }
+  const colimaYamlPath = path12.join(home, ".colima", colimaProfile, "colima.yaml");
+  if (!existsFn(colimaYamlPath)) {
+    return { ok: true, message: `colima k8s lint: ${colimaYamlPath} not found, skip` };
+  }
+  let yaml;
+  try {
+    yaml = readFileFn(colimaYamlPath, "utf8");
+  } catch {
+    return { ok: true, message: `colima k8s lint: could not read ${colimaYamlPath}` };
+  }
+  const kubernetesSection = yaml.split(/^kubernetes:/m)[1];
+  if (!kubernetesSection) {
+    return { ok: true, message: "colima k8s lint: no kubernetes section found" };
+  }
+  const sectionLines = kubernetesSection.split("\n");
+  const sectionBody2 = [];
+  for (const line of sectionLines) {
+    if (line.length > 0 && !/^\s/.test(line)) break;
+    sectionBody2.push(line);
+  }
+  const section = sectionBody2.join("\n");
+  const enabled = /^\s+enabled:\s*true\s*$/m.test(section);
+  if (!enabled) {
+    return { ok: true, message: "colima k8s lint: kubernetes.enabled is not true" };
+  }
+  return {
+    ok: true,
+    warn: true,
+    message: `Colima has Kubernetes mode enabled at profile '${colimaProfile}'`,
+    remedy: `Colima has Kubernetes mode enabled at profile '${colimaProfile}'. k3d will attempt to coexist but may fail to start with 'context deadline exceeded' due to port conflicts. To fix: \`colima stop && colima start --kubernetes=false\`, OR re-run \`olam setup --reuse-cluster=colima\` to use Colima's existing k3s.`
+  };
+}
 async function probeKubectl(exec = defaultDockerExec) {
   const r = exec("kubectl", ["version", "--client", "--output=json"]);
   if (r.status === 0 && r.stdout.length > 0) {
@@ -8104,7 +8159,8 @@ function rowToMetadata(row) {
     ...expectedServices !== void 0 ? { expectedServices } : {},
     ...appPortUrls !== void 0 ? { appPortUrls } : {},
     ...worldDbNames !== void 0 ? { worldDbNames } : {},
-    ...row.world_role_name ? { worldRoleName: row.world_role_name } : {}
+    ...row.world_role_name ? { worldRoleName: row.world_role_name } : {},
+    ...row.claude_home ? { claudeHome: row.claude_home } : {}
   };
 }
 var _require, _Database, SCHEMA_VERSION, CREATE_TABLE, CREATE_META, WorldRegistry;
@@ -8165,7 +8221,9 @@ CREATE TABLE IF NOT EXISTS meta (
           // world_db_names (SQLite has no native array; matches repos column shape).
           // TEXT[] would fail at DDL time (closes OQ13/OQ22 / FS-03).
           "world_db_names TEXT",
-          "world_role_name TEXT"
+          "world_role_name TEXT",
+          // ADR 045 — per-world Claude Code HOME path. Additive migration.
+          "claude_home TEXT"
         ]) {
           try {
             this.db.exec(`ALTER TABLE worlds ADD COLUMN ${col}`);
@@ -8196,8 +8254,8 @@ CREATE TABLE IF NOT EXISTS meta (
           compute_provider, total_cost_usd, thought_count, created_at, updated_at,
           pr_url, pr_number, pr_repo, pr_created_at, pr_state, pr_merged_at, auto_destroy_on_merge,
           readiness_chain, expected_services, app_port_urls,
-          world_db_names, world_role_name)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(world.id, world.name, world.status, JSON.stringify(world.repos), world.branch, world.portOffset, world.workspacePath, world.computeProvider, world.totalCostUsd, world.thoughtCount, world.createdAt, world.updatedAt, world.prUrl ?? null, world.prNumber ?? null, world.prRepo ?? null, world.prCreatedAt ?? null, world.prState ?? "none", world.prMergedAt ?? null, world.autoDestroyOnMerge === false ? 0 : 1, world.readinessChain !== void 0 ? JSON.stringify(world.readinessChain) : null, world.expectedServices !== void 0 ? JSON.stringify(world.expectedServices) : null, world.appPortUrls !== void 0 ? JSON.stringify(world.appPortUrls) : null, world.worldDbNames !== void 0 ? JSON.stringify(world.worldDbNames) : null, world.worldRoleName ?? null);
+          world_db_names, world_role_name, claude_home)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(world.id, world.name, world.status, JSON.stringify(world.repos), world.branch, world.portOffset, world.workspacePath, world.computeProvider, world.totalCostUsd, world.thoughtCount, world.createdAt, world.updatedAt, world.prUrl ?? null, world.prNumber ?? null, world.prRepo ?? null, world.prCreatedAt ?? null, world.prState ?? "none", world.prMergedAt ?? null, world.autoDestroyOnMerge === false ? 0 : 1, world.readinessChain !== void 0 ? JSON.stringify(world.readinessChain) : null, world.expectedServices !== void 0 ? JSON.stringify(world.expectedServices) : null, world.appPortUrls !== void 0 ? JSON.stringify(world.appPortUrls) : null, world.worldDbNames !== void 0 ? JSON.stringify(world.worldDbNames) : null, world.worldRoleName ?? null, world.claudeHome ?? null);
       }
       update(worldId, updates) {
         const setClauses = [];
@@ -8225,7 +8283,9 @@ CREATE TABLE IF NOT EXISTS meta (
           appPortUrls: "app_port_urls",
           // olam-hybrid-shared-postgres Phase A task A7.
           worldDbNames: "world_db_names",
-          worldRoleName: "world_role_name"
+          worldRoleName: "world_role_name",
+          // ADR 045 — per-world Claude Code HOME (multi-account isolation).
+          claudeHome: "claude_home"
         };
         const jsonColumns = /* @__PURE__ */ new Set(["repos", "readinessChain", "expectedServices", "appPortUrls", "worldDbNames"]);
         for (const [key, col] of Object.entries(columnMap)) {
@@ -8709,6 +8769,8 @@ function stripMcpServers(mcpServers) {
         stripped.type = value;
       } else if (key === "url" && typeof value === "string") {
         stripped.url = value;
+      } else if (key === "alwaysLoad" && typeof value === "boolean") {
+        stripped.alwaysLoad = value;
       }
     }
     out[svc] = stripped;
@@ -8922,9 +8984,9 @@ function buildRepoEnvBundle(repoName, serviceEnv, crossRepoEnv, envOverrides) {
   const merged = { ...serviceEnv, ...injectables };
   return { merged, injectables };
 }
-function setupWorldEnv(repos, workspacePath, serviceEnv, crossRepoEnv = {}, configCtx) {
+function setupWorldEnv(repos, workspacePath, serviceEnv, crossRepoEnv = {}, configCtx, claudeHomeOverride) {
   try {
-    copyClaudeConfig(workspacePath, void 0, configCtx);
+    copyClaudeConfig(workspacePath, claudeHomeOverride, configCtx);
   } catch {
   }
   if (configCtx) {
@@ -9026,7 +9088,8 @@ var init_env_setup = __esm({
       "command",
       "args",
       "type",
-      "url"
+      "url",
+      "alwaysLoad"
     ]);
     SKIP_FILES = /* @__PURE__ */ new Set([
       ".credentials.json",
@@ -9124,17 +9187,17 @@ function kgRoot() {
 function worldsRoot() {
   return join17(olamHome(), "worlds");
 }
-function assertWithinPrefix(path95, prefix, label) {
-  if (!path95.startsWith(prefix + "/")) {
-    throw new Error(`${label} escape: ${path95} not under ${prefix}/`);
+function assertWithinPrefix(path96, prefix, label) {
+  if (!path96.startsWith(prefix + "/")) {
+    throw new Error(`${label} escape: ${path96} not under ${prefix}/`);
   }
 }
 function kgPristinePath(workspace) {
   validateWorkspaceName(workspace);
   const root = kgRoot();
-  const path95 = resolve6(join17(root, workspace));
-  assertWithinPrefix(path95, root, "kgPristinePath");
-  return path95;
+  const path96 = resolve6(join17(root, workspace));
+  assertWithinPrefix(path96, root, "kgPristinePath");
+  return path96;
 }
 var KG_PATHS_INTERNALS;
 var init_storage_paths = __esm({
@@ -9249,8 +9312,8 @@ import { execFileSync as execFileSync4 } from "node:child_process";
 import * as fs15 from "node:fs";
 import * as os9 from "node:os";
 import * as path17 from "node:path";
-function expandHome2(p, homedir63) {
-  return p.replace(/^~(?=$|\/|\\)/, homedir63());
+function expandHome2(p, homedir64) {
+  return p.replace(/^~(?=$|\/|\\)/, homedir64());
 }
 function sanitizeRepoFilename(name) {
   const sanitized = name.replace(/[^A-Za-z0-9._-]/g, "_");
@@ -9273,7 +9336,7 @@ ${stderr}`;
 }
 function snapshotBaselineDiff(repos, workspacePath, deps = {}) {
   const exec = deps.exec ?? ((cmd, args, opts) => execFileSync4(cmd, args, opts));
-  const homedir63 = deps.homedir ?? (() => os9.homedir());
+  const homedir64 = deps.homedir ?? (() => os9.homedir());
   const baselineDir = path17.join(workspacePath, ".olam", "baseline");
   try {
     fs15.mkdirSync(baselineDir, { recursive: true });
@@ -9289,7 +9352,7 @@ function snapshotBaselineDiff(repos, workspacePath, deps = {}) {
       continue;
     const filename = `${sanitizeRepoFilename(repo.name)}.diff`;
     const outPath = path17.join(baselineDir, filename);
-    const repoPath = expandHome2(repo.path, homedir63);
+    const repoPath = expandHome2(repo.path, homedir64);
     if (!fs15.existsSync(repoPath)) {
       writeBaselineFile(outPath, `# repo: ${repo.name}
 # (skipped: path ${repoPath} does not exist)
@@ -9409,7 +9472,7 @@ function extractStderr(err) {
 }
 function carryUncommittedEdits(repos, workspacePath, deps = {}) {
   const exec = deps.exec ?? ((cmd, args, opts) => execFileSync4(cmd, args, opts));
-  const homedir63 = deps.homedir ?? (() => os9.homedir());
+  const homedir64 = deps.homedir ?? (() => os9.homedir());
   const existsSync113 = deps.existsSync ?? ((p) => fs15.existsSync(p));
   const copyFileSync16 = deps.copyFileSync ?? ((src, dest) => fs15.copyFileSync(src, dest));
   const mkdirSync67 = deps.mkdirSync ?? ((dirPath, opts) => {
@@ -9419,7 +9482,7 @@ function carryUncommittedEdits(repos, workspacePath, deps = {}) {
   for (const repo of repos) {
     if (!repo.path)
       continue;
-    const repoPath = expandHome2(repo.path, homedir63);
+    const repoPath = expandHome2(repo.path, homedir64);
     const worktreePath = path17.join(workspacePath, repo.name);
     if (!existsSync113(repoPath))
       continue;
@@ -12692,7 +12755,8 @@ ${detail}`);
           createdAt: now,
           updatedAt: now,
           readinessChain,
-          expectedServices
+          expectedServices,
+          ...opts.claudeHome ? { claudeHome: opts.claudeHome } : {}
         };
         const sm = new WorldStateMachine(worldId, "creating");
         this.registry.register(metadata);
@@ -12830,7 +12894,7 @@ ${detail}`);
             worlds_default: this.config.worlds_default,
             repos: enrichedRepos
           };
-          setupWorldEnv(enrichedRepos, workspacePath, serviceEnv, crossRepoEnv, configCtx);
+          setupWorldEnv(enrichedRepos, workspacePath, serviceEnv, crossRepoEnv, configCtx, opts.claudeHome);
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
           console.warn(`[WorldManager] env setup failed: ${msg}`);
@@ -15704,10 +15768,10 @@ async function readHostCpToken2() {
   if (!fs26.existsSync(tp)) return null;
   return fs26.readFileSync(tp, "utf-8").trim();
 }
-async function callHostCpProxy(method, worldId, path95, body) {
+async function callHostCpProxy(method, worldId, path96, body) {
   const token = await readHostCpToken2();
   if (!token) return { ok: false, status: 0, error: "no token (host CP not started)" };
-  const url2 = `http://127.0.0.1:${HOST_CP_PORT}/api/world/${encodeURIComponent(worldId)}${path95}`;
+  const url2 = `http://127.0.0.1:${HOST_CP_PORT}/api/world/${encodeURIComponent(worldId)}${path96}`;
   try {
     const headers = {
       Authorization: `Bearer ${token}`
@@ -16174,17 +16238,75 @@ var init_registry_allowlist = __esm({
   }
 });
 
+// src/spawn/home-override.ts
+var home_override_exports = {};
+__export(home_override_exports, {
+  CLAUDE_HOMES_BASE: () => CLAUDE_HOMES_BASE,
+  HOME_ID_RE: () => HOME_ID_RE,
+  SENTINEL_FILENAME: () => SENTINEL_FILENAME,
+  ensureClaudeHomeDir: () => ensureClaudeHomeDir,
+  resolveClaudeHome: () => resolveClaudeHome
+});
+import { mkdir, writeFile, access } from "node:fs/promises";
+import { homedir as homedir22 } from "node:os";
+import path36 from "node:path";
+function resolveClaudeHome(args) {
+  const home = args.homeDir ?? homedir22();
+  if (args.flag !== void 0 && args.flag.length > 0) {
+    return resolveSpec(args.flag, home);
+  }
+  const stored = args.existingWorldConfig?.claudeHome;
+  if (stored !== void 0 && stored.length > 0) {
+    return resolveSpec(stored, home);
+  }
+  return args.envHome ?? home;
+}
+function resolveSpec(spec, home) {
+  if (path36.isAbsolute(spec)) {
+    return spec;
+  }
+  if (!HOME_ID_RE.test(spec)) {
+    throw new Error(
+      `--claude-home value "${spec}" must be either an absolute path or a bare id matching ${HOME_ID_RE} (alphanumeric, underscore, dash; starts with alphanumeric; max 64 chars). Rejected: relative paths, parent refs, uppercase, whitespace.`
+    );
+  }
+  return path36.join(home, CLAUDE_HOMES_BASE, spec);
+}
+async function ensureClaudeHomeDir(targetPath) {
+  await mkdir(targetPath, { recursive: true });
+  const sentinelPath2 = path36.join(targetPath, SENTINEL_FILENAME);
+  try {
+    await access(sentinelPath2);
+    return;
+  } catch {
+  }
+  await writeFile(
+    sentinelPath2,
+    "# olam claude-home \u2014 managed by `olam create --claude-home`.\n# Do not delete. Re-create by running `olam create --claude-home <id>` again.\n",
+    "utf-8"
+  );
+}
+var CLAUDE_HOMES_BASE, SENTINEL_FILENAME, HOME_ID_RE;
+var init_home_override = __esm({
+  "src/spawn/home-override.ts"() {
+    "use strict";
+    CLAUDE_HOMES_BASE = path36.join(".olam", "claude-homes");
+    SENTINEL_FILENAME = ".olam-claude-home";
+    HOME_ID_RE = /^[a-z0-9][a-z0-9_-]{0,63}$/;
+  }
+});
+
 // ../core/dist/world/world-yaml.js
 import * as fs35 from "node:fs";
-import * as path36 from "node:path";
+import * as path37 from "node:path";
 import { parse as parseYaml4, stringify as stringifyYaml4 } from "yaml";
 function writeWorldYaml(worldPath, data) {
-  const olamDir = path36.join(worldPath, ".olam");
+  const olamDir = path37.join(worldPath, ".olam");
   fs35.mkdirSync(olamDir, { recursive: true });
-  fs35.writeFileSync(path36.join(olamDir, "world.yaml"), stringifyYaml4(data), "utf-8");
+  fs35.writeFileSync(path37.join(olamDir, "world.yaml"), stringifyYaml4(data), "utf-8");
 }
 function readWorldYaml(worldPath) {
-  const yamlPath = path36.join(worldPath, ".olam", "world.yaml");
+  const yamlPath = path37.join(worldPath, ".olam", "world.yaml");
   if (!fs35.existsSync(yamlPath))
     return null;
   try {
@@ -16313,14 +16435,14 @@ var init_checksum = __esm({
 
 // ../core/dist/skill-sources/trust-audit-log.js
 import * as fs52 from "node:fs";
-import * as path54 from "node:path";
+import * as path55 from "node:path";
 import * as os28 from "node:os";
 function skillSourcesAuditLogPath() {
   const override = process.env["OLAM_SKILL_SOURCES_AUDIT_LOG_PATH"];
   if (override && override.length > 0)
     return override;
-  const stateDir = process.env["OLAM_STATE_DIR"] ?? path54.join(os28.homedir(), ".olam", "state");
-  return path54.join(stateDir, SKILL_SOURCES_AUDIT_LOG_FILENAME);
+  const stateDir = process.env["OLAM_STATE_DIR"] ?? path55.join(os28.homedir(), ".olam", "state");
+  return path55.join(stateDir, SKILL_SOURCES_AUDIT_LOG_FILENAME);
 }
 function appendTrustAudit(entry) {
   const candidate = {
@@ -16329,7 +16451,7 @@ function appendTrustAudit(entry) {
   };
   const validated = TrustAuditEntrySchema.parse(candidate);
   const filePath = skillSourcesAuditLogPath();
-  fs52.mkdirSync(path54.dirname(filePath), { recursive: true, mode: 448 });
+  fs52.mkdirSync(path55.dirname(filePath), { recursive: true, mode: 448 });
   const fd = fs52.openSync(filePath, "a", 384);
   try {
     fs52.writeSync(fd, JSON.stringify(validated) + "\n");
@@ -16542,22 +16664,22 @@ var init_store3 = __esm({
 });
 
 // ../core/dist/skill-sources/clone.js
-import { execFileSync as execFileSync13 } from "node:child_process";
+import { execFileSync as execFileSync14 } from "node:child_process";
 import * as fs53 from "node:fs";
 import * as os29 from "node:os";
-import * as path55 from "node:path";
+import * as path56 from "node:path";
 function skillSourcesRootDir() {
   const override = process.env["OLAM_SKILL_SOURCES_DIR"];
   if (override && override.length > 0)
     return override;
-  return path55.join(os29.homedir(), ".olam", "state", "skill-sources");
+  return path56.join(os29.homedir(), ".olam", "state", "skill-sources");
 }
 function skillSourceClonePath(id) {
-  return path55.join(skillSourcesRootDir(), id);
+  return path56.join(skillSourcesRootDir(), id);
 }
 function runGit(args, cwd) {
   try {
-    return execFileSync13("git", args, {
+    return execFileSync14("git", args, {
       cwd,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
@@ -16715,7 +16837,7 @@ var init_hook_template = __esm({
 
 // ../core/dist/world/merge-settings.js
 import * as fs55 from "node:fs";
-import * as path56 from "node:path";
+import * as path57 from "node:path";
 import * as crypto8 from "node:crypto";
 function mergeHomeSettingsJson(filePath, options) {
   let settings;
@@ -16799,7 +16921,7 @@ function isHookSentinelPresent(matchers, sentinel) {
   return false;
 }
 function atomicWriteJson(filePath, data) {
-  const dir = path56.dirname(filePath);
+  const dir = path57.dirname(filePath);
   fs55.mkdirSync(dir, { recursive: true });
   const rand = crypto8.randomBytes(6).toString("hex");
   const tmp = `${filePath}.tmp.${process.pid}.${rand}`;
@@ -16815,13 +16937,13 @@ var init_merge_settings = __esm({
 
 // ../core/dist/skill-sources/hook-install.js
 import * as fs56 from "node:fs";
-import * as path57 from "node:path";
+import * as path58 from "node:path";
 import * as os30 from "node:os";
 function settingsPathFor(scope, cwd) {
   if (scope === "user") {
-    return path57.join(os30.homedir(), ".claude", "settings.json");
+    return path58.join(os30.homedir(), ".claude", "settings.json");
   }
-  return path57.join(cwd ?? process.cwd(), ".claude", "settings.json");
+  return path58.join(cwd ?? process.cwd(), ".claude", "settings.json");
 }
 function backupFile(filePath) {
   if (!fs56.existsSync(filePath))
@@ -16832,7 +16954,7 @@ function backupFile(filePath) {
   return backupPath;
 }
 function installSkillsHookToFile(filePath) {
-  fs56.mkdirSync(path57.dirname(filePath), { recursive: true });
+  fs56.mkdirSync(path58.dirname(filePath), { recursive: true });
   const backupPath = backupFile(filePath);
   const result = mergeHomeSettingsJson(filePath, {
     ensureHook: {
@@ -16895,29 +17017,29 @@ var init_hook_install = __esm({
 // ../core/dist/skill-sources/migration-snapshot.js
 import * as fs57 from "node:fs";
 import * as os31 from "node:os";
-import * as path58 from "node:path";
+import * as path59 from "node:path";
 function claudeDirInternal() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path58.join(os31.homedir(), ".claude");
+  return path59.join(os31.homedir(), ".claude");
 }
 function migrationSnapshotsDir() {
   const override = process.env["OLAM_MIGRATION_SNAPSHOTS_DIR"];
   if (override && override.length > 0)
     return override;
-  return path58.join(os31.homedir(), ".olam", "state", "migration-snapshots");
+  return path59.join(os31.homedir(), ".olam", "state", "migration-snapshots");
 }
 function listToolboxManagedSymlinks(toolboxPath) {
   const claude = claudeDirInternal();
   const out = [];
   const BUCKETS2 = ["skills", "agents", "scripts", "rules", "commands"];
   for (const bucket of BUCKETS2) {
-    const dir = path58.join(claude, bucket);
+    const dir = path59.join(claude, bucket);
     if (!fs57.existsSync(dir))
       continue;
     for (const name of fs57.readdirSync(dir)) {
-      const link = path58.join(dir, name);
+      const link = path59.join(dir, name);
       try {
         const stat = fs57.lstatSync(link);
         if (!stat.isSymbolicLink())
@@ -16935,12 +17057,12 @@ function listToolboxManagedSymlinks(toolboxPath) {
 function detectToolboxState(opts) {
   const claude = claudeDirInternal();
   const toolboxPath = opts.toolboxPath;
-  const namespace = opts.namespace ?? path58.basename(toolboxPath);
-  const atlasUserFile = path58.join(claude, ".atlas-user");
+  const namespace = opts.namespace ?? path59.basename(toolboxPath);
+  const atlasUserFile = path59.join(claude, ".atlas-user");
   const atlasUser = fs57.existsSync(atlasUserFile) ? fs57.readFileSync(atlasUserFile, "utf-8").trim() || void 0 : void 0;
   let subscriptionsJson;
   if (atlasUser) {
-    const sp = path58.join(toolboxPath, "members", atlasUser, "subscriptions.json");
+    const sp = path59.join(toolboxPath, "members", atlasUser, "subscriptions.json");
     if (fs57.existsSync(sp)) {
       try {
         subscriptionsJson = JSON.parse(fs57.readFileSync(sp, "utf-8"));
@@ -16950,7 +17072,7 @@ function detectToolboxState(opts) {
   }
   const atlasManagedSymlinks = listToolboxManagedSymlinks(toolboxPath);
   let originalSessionStartHook;
-  const settingsPath = path58.join(claude, "settings.json");
+  const settingsPath = path59.join(claude, "settings.json");
   if (fs57.existsSync(settingsPath)) {
     try {
       const settings = JSON.parse(fs57.readFileSync(settingsPath, "utf-8"));
@@ -16978,7 +17100,7 @@ function writeMigrationSnapshot(snapshot) {
   const dir = migrationSnapshotsDir();
   fs57.mkdirSync(dir, { recursive: true });
   const stamp = snapshot.takenAt.replace(/[:.]/g, "-");
-  const file = path58.join(dir, `${snapshot.namespace}-${stamp}.json`);
+  const file = path59.join(dir, `${snapshot.namespace}-${stamp}.json`);
   fs57.writeFileSync(file, JSON.stringify(snapshot, null, 2) + "\n", { mode: 420 });
   return file;
 }
@@ -16988,7 +17110,7 @@ function readLatestMigrationSnapshot(opts = {}) {
     return void 0;
   const files = fs57.readdirSync(dir).filter((f) => f.endsWith(".json")).sort().reverse();
   for (const f of files) {
-    const full = path58.join(dir, f);
+    const full = path59.join(dir, f);
     try {
       const snapshot = JSON.parse(fs57.readFileSync(full, "utf-8"));
       if (snapshot.schemaVersion !== MIGRATION_SNAPSHOT_SCHEMA_VERSION)
@@ -17015,11 +17137,11 @@ var init_migration_snapshot = __esm({
 
 // ../core/dist/skill-sync/artifact-resolver.js
 import * as fs58 from "node:fs";
-import * as path59 from "node:path";
+import * as path60 from "node:path";
 function resolveSubscriptions(opts) {
   const { clonePath, atlasUser } = opts;
   if (atlasUser) {
-    const subsPath = path59.join(clonePath, "members", atlasUser, "subscriptions.json");
+    const subsPath = path60.join(clonePath, "members", atlasUser, "subscriptions.json");
     if (fs58.existsSync(subsPath)) {
       try {
         const parsed = JSON.parse(fs58.readFileSync(subsPath, "utf-8"));
@@ -17034,7 +17156,7 @@ function resolveSubscriptions(opts) {
       }
     }
   }
-  const catsPath = path59.join(clonePath, "shared", "categories.json");
+  const catsPath = path60.join(clonePath, "shared", "categories.json");
   if (fs58.existsSync(catsPath)) {
     try {
       const parsed = JSON.parse(fs58.readFileSync(catsPath, "utf-8"));
@@ -17048,14 +17170,14 @@ function resolveSubscriptions(opts) {
     } catch {
     }
   }
-  const sharedDir = path59.join(clonePath, "shared");
+  const sharedDir = path60.join(clonePath, "shared");
   const cats = [];
   if (fs58.existsSync(sharedDir)) {
     for (const name of fs58.readdirSync(sharedDir)) {
-      const dir = path59.join(sharedDir, name);
+      const dir = path60.join(sharedDir, name);
       if (!fs58.statSync(dir).isDirectory())
         continue;
-      if (fs58.existsSync(path59.join(dir, "skills")) || fs58.existsSync(path59.join(dir, "agents"))) {
+      if (fs58.existsSync(path60.join(dir, "skills")) || fs58.existsSync(path60.join(dir, "agents"))) {
         cats.push(name);
       }
     }
@@ -17071,13 +17193,13 @@ function resolveSkillsDir(opts) {
   const { sourceId, baseDir } = opts;
   const out = [];
   for (const name of listDirSafe(baseDir)) {
-    const subdir = path59.join(baseDir, name);
+    const subdir = path60.join(baseDir, name);
     if (!fs58.statSync(subdir).isDirectory())
       continue;
-    if (!fs58.existsSync(path59.join(subdir, "SKILL.md")))
+    if (!fs58.existsSync(path60.join(subdir, "SKILL.md")))
       continue;
     out.push({ kind: "skill", sourceId, sourcePath: subdir, deployBasename: name });
-    const subagentsDir = path59.join(subdir, "references", "agents");
+    const subagentsDir = path60.join(subdir, "references", "agents");
     if (fs58.existsSync(subagentsDir) && fs58.statSync(subagentsDir).isDirectory()) {
       for (const f of listDirSafe(subagentsDir)) {
         if (!f.endsWith(".md"))
@@ -17085,7 +17207,7 @@ function resolveSkillsDir(opts) {
         out.push({
           kind: "subagent",
           sourceId,
-          sourcePath: path59.join(subagentsDir, f),
+          sourcePath: path60.join(subagentsDir, f),
           deployBasename: f,
           parentSkill: name
         });
@@ -17098,7 +17220,7 @@ function resolveAgentsDir(opts) {
   const { sourceId, baseDir } = opts;
   const out = [];
   for (const name of listDirSafe(baseDir)) {
-    const full = path59.join(baseDir, name);
+    const full = path60.join(baseDir, name);
     const stat = fs58.statSync(full);
     if (stat.isFile() && name.endsWith(".md")) {
       out.push({ kind: "agent", sourceId, sourcePath: full, deployBasename: name });
@@ -17109,7 +17231,7 @@ function resolveAgentsDir(opts) {
         out.push({
           kind: "agent",
           sourceId,
-          sourcePath: path59.join(full, f),
+          sourcePath: path60.join(full, f),
           deployBasename: `${name}-${f}`
         });
       }
@@ -17121,7 +17243,7 @@ function resolveScriptsDir(opts) {
   const { sourceId, baseDir } = opts;
   const out = [];
   for (const name of listDirSafe(baseDir)) {
-    const full = path59.join(baseDir, name);
+    const full = path60.join(baseDir, name);
     const stat = fs58.statSync(full);
     if (stat.isFile() && name.endsWith(".sh")) {
       out.push({ kind: "script", sourceId, sourcePath: full, deployBasename: name });
@@ -17137,7 +17259,7 @@ function resolveRulesDir(opts) {
   for (const name of listDirSafe(baseDir)) {
     if (!name.endsWith(".md"))
       continue;
-    const full = path59.join(baseDir, name);
+    const full = path60.join(baseDir, name);
     if (!fs58.statSync(full).isFile())
       continue;
     out.push({ kind: "rule", sourceId, sourcePath: full, deployBasename: name });
@@ -17150,7 +17272,7 @@ function resolveJsonDir(opts) {
   for (const name of listDirSafe(baseDir)) {
     if (!name.endsWith(".json"))
       continue;
-    const full = path59.join(baseDir, name);
+    const full = path60.join(baseDir, name);
     if (!fs58.statSync(full).isFile())
       continue;
     out.push({ kind, sourceId, sourcePath: full, deployBasename: name });
@@ -17163,7 +17285,7 @@ function resolveOverlaysDir(opts) {
   for (const name of listDirSafe(baseDir)) {
     if (!name.endsWith(".md"))
       continue;
-    const full = path59.join(baseDir, name);
+    const full = path60.join(baseDir, name);
     if (!fs58.statSync(full).isFile())
       continue;
     const deployBasename = name.replace(/\.md$/, "");
@@ -17182,33 +17304,33 @@ function resolveSourceArtifacts(opts) {
   const subscription = resolveSubscriptions({ clonePath, atlasUser });
   const artifacts = [];
   for (const cat of subscription.categories) {
-    const catDir = path59.join(clonePath, "shared", cat);
+    const catDir = path60.join(clonePath, "shared", cat);
     if (!fs58.existsSync(catDir))
       continue;
-    artifacts.push(...resolveSkillsDir({ sourceId, baseDir: path59.join(catDir, "skills") }));
-    artifacts.push(...resolveAgentsDir({ sourceId, baseDir: path59.join(catDir, "agents") }));
-    artifacts.push(...resolveScriptsDir({ sourceId, baseDir: path59.join(catDir, "scripts") }));
-    artifacts.push(...resolveRulesDir({ sourceId, baseDir: path59.join(catDir, "rules") }));
-    artifacts.push(...resolveJsonDir({ sourceId, baseDir: path59.join(catDir, "hooks"), kind: "hook" }));
-    artifacts.push(...resolveJsonDir({ sourceId, baseDir: path59.join(catDir, "permissions"), kind: "permission" }));
+    artifacts.push(...resolveSkillsDir({ sourceId, baseDir: path60.join(catDir, "skills") }));
+    artifacts.push(...resolveAgentsDir({ sourceId, baseDir: path60.join(catDir, "agents") }));
+    artifacts.push(...resolveScriptsDir({ sourceId, baseDir: path60.join(catDir, "scripts") }));
+    artifacts.push(...resolveRulesDir({ sourceId, baseDir: path60.join(catDir, "rules") }));
+    artifacts.push(...resolveJsonDir({ sourceId, baseDir: path60.join(catDir, "hooks"), kind: "hook" }));
+    artifacts.push(...resolveJsonDir({ sourceId, baseDir: path60.join(catDir, "permissions"), kind: "permission" }));
   }
   if (atlasUser) {
-    const memberRoot = path59.join(clonePath, "members", atlasUser);
+    const memberRoot = path60.join(clonePath, "members", atlasUser);
     if (fs58.existsSync(memberRoot)) {
-      artifacts.push(...resolveSkillsDir({ sourceId, baseDir: path59.join(memberRoot, "skills") }));
-      artifacts.push(...resolveAgentsDir({ sourceId, baseDir: path59.join(memberRoot, "agents") }));
-      artifacts.push(...resolveScriptsDir({ sourceId, baseDir: path59.join(memberRoot, "scripts") }));
-      artifacts.push(...resolveRulesDir({ sourceId, baseDir: path59.join(memberRoot, "rules") }));
-      artifacts.push(...resolveJsonDir({ sourceId, baseDir: path59.join(memberRoot, "hooks"), kind: "hook" }));
-      artifacts.push(...resolveJsonDir({ sourceId, baseDir: path59.join(memberRoot, "permissions"), kind: "permission" }));
+      artifacts.push(...resolveSkillsDir({ sourceId, baseDir: path60.join(memberRoot, "skills") }));
+      artifacts.push(...resolveAgentsDir({ sourceId, baseDir: path60.join(memberRoot, "agents") }));
+      artifacts.push(...resolveScriptsDir({ sourceId, baseDir: path60.join(memberRoot, "scripts") }));
+      artifacts.push(...resolveRulesDir({ sourceId, baseDir: path60.join(memberRoot, "rules") }));
+      artifacts.push(...resolveJsonDir({ sourceId, baseDir: path60.join(memberRoot, "hooks"), kind: "hook" }));
+      artifacts.push(...resolveJsonDir({ sourceId, baseDir: path60.join(memberRoot, "permissions"), kind: "permission" }));
       artifacts.push(...resolveOverlaysDir({
         sourceId,
-        baseDir: path59.join(memberRoot, "skills.overrides"),
+        baseDir: path60.join(memberRoot, "skills.overrides"),
         targetKind: "skill"
       }));
       artifacts.push(...resolveOverlaysDir({
         sourceId,
-        baseDir: path59.join(memberRoot, "agents.overrides"),
+        baseDir: path60.join(memberRoot, "agents.overrides"),
         targetKind: "agent"
       }));
     }
@@ -17275,12 +17397,12 @@ var init_shim_targets = __esm({
 // ../core/dist/skill-sync/symlink-deployer.js
 import * as fs59 from "node:fs";
 import * as os32 from "node:os";
-import * as path60 from "node:path";
+import * as path61 from "node:path";
 function claudeDir() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path60.join(os32.homedir(), ".claude");
+  return path61.join(os32.homedir(), ".claude");
 }
 function bucketFor(kind) {
   switch (kind) {
@@ -17340,13 +17462,13 @@ function detectCollisions(artifacts) {
 function cleanManagedSymlinks(claude, installedOlamVersion, overlayReferences, expectedAgentWinnerNames) {
   const shadowBackups = [];
   for (const bucket of BUCKETS) {
-    const dir = path60.join(claude, bucket);
+    const dir = path61.join(claude, bucket);
     if (!fs59.existsSync(dir))
       continue;
     for (const name of fs59.readdirSync(dir)) {
       if (name === ".olam-merged")
         continue;
-      const p = path60.join(dir, name);
+      const p = path61.join(dir, name);
       try {
         const stat = fs59.lstatSync(p);
         if (stat.isSymbolicLink()) {
@@ -17413,7 +17535,7 @@ function linkIfNeeded(target, link) {
 function deployArtifacts(artifacts, opts) {
   const claude = claudeDir();
   for (const bucket of BUCKETS) {
-    fs59.mkdirSync(path60.join(claude, bucket), { recursive: true });
+    fs59.mkdirSync(path61.join(claude, bucket), { recursive: true });
   }
   const { winners, collisions } = detectCollisions(artifacts);
   const expectedAgentWinnerNames = new Set(winners.filter((a) => a.kind === "agent").map((a) => a.deployBasename));
@@ -17423,7 +17545,7 @@ function deployArtifacts(artifacts, opts) {
     const bucket = bucketFor(artifact.kind);
     if (!bucket)
       continue;
-    const linkPath = path60.join(claude, bucket, artifact.deployBasename);
+    const linkPath = path61.join(claude, bucket, artifact.deployBasename);
     if (artifact.kind === "agent" && artifact.resolvedContent !== void 0) {
       const tmpPath = `${linkPath}.tmp-${process.pid}-${Date.now()}`;
       fs59.writeFileSync(tmpPath, artifact.resolvedContent);
@@ -17610,24 +17732,24 @@ var init_meta_hooks = __esm({
 // ../core/dist/skill-sync/settings-merger.js
 import * as fs62 from "node:fs";
 import * as os33 from "node:os";
-import * as path61 from "node:path";
+import * as path62 from "node:path";
 function claudeSettingsPath() {
   const override = process.env["OLAM_CLAUDE_SETTINGS_PATH"];
   if (override && override.length > 0)
     return override;
-  return path61.join(claudeDirInternal2(), "settings.json");
+  return path62.join(claudeDirInternal2(), "settings.json");
 }
 function claudeDirInternal2() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path61.join(os33.homedir(), ".claude");
+  return path62.join(os33.homedir(), ".claude");
 }
 function settingsBackupDir() {
   const override = process.env["OLAM_SETTINGS_BACKUP_DIR"];
   if (override && override.length > 0)
     return override;
-  return path61.join(os33.homedir(), ".olam", "state", "settings-backups");
+  return path62.join(os33.homedir(), ".olam", "state", "settings-backups");
 }
 function dedupeByMatcher(entries) {
   const map = /* @__PURE__ */ new Map();
@@ -17679,7 +17801,7 @@ function readJson(file) {
 function rotateBackups(backupDir) {
   if (!fs62.existsSync(backupDir))
     return;
-  const files = fs62.readdirSync(backupDir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, full: path61.join(backupDir, f), mtime: fs62.statSync(path61.join(backupDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
+  const files = fs62.readdirSync(backupDir).filter((f) => f.endsWith(".json")).map((f) => ({ name: f, full: path62.join(backupDir, f), mtime: fs62.statSync(path62.join(backupDir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
   for (const f of files.slice(BACKUP_RETENTION)) {
     try {
       fs62.unlinkSync(f.full);
@@ -17694,7 +17816,7 @@ function backupSettings() {
   const dir = settingsBackupDir();
   fs62.mkdirSync(dir, { recursive: true });
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const dest = path61.join(dir, `settings-${stamp}.json`);
+  const dest = path62.join(dir, `settings-${stamp}.json`);
   fs62.copyFileSync(src, dest);
   rotateBackups(dir);
   return dest;
@@ -17771,7 +17893,7 @@ function mergeSettings(input2) {
       ...input2.permissionFiles.length > 0 ? { allow: [...permSet] } : {}
     }
   };
-  fs62.mkdirSync(path61.dirname(settingsPath), { recursive: true });
+  fs62.mkdirSync(path62.dirname(settingsPath), { recursive: true });
   const tmp = `${settingsPath}.tmp-${process.pid}`;
   fs62.writeFileSync(tmp, JSON.stringify(next, null, 2) + "\n", { mode: 420 });
   fs62.renameSync(tmp, settingsPath);
@@ -17830,15 +17952,15 @@ var init_schema5 = __esm({
 });
 
 // ../core/dist/skill-sync/per-project-override.js
-import { execFileSync as execFileSync14 } from "node:child_process";
+import { execFileSync as execFileSync15 } from "node:child_process";
 import * as fs63 from "node:fs";
-import * as path62 from "node:path";
+import * as path63 from "node:path";
 import { parse as parseYaml5 } from "yaml";
 function findProjectOverride(startDir) {
-  let dir = path62.resolve(startDir);
-  const root = path62.parse(dir).root;
+  let dir = path63.resolve(startDir);
+  const root = path63.parse(dir).root;
   while (true) {
-    const candidate = path62.join(dir, PROJECT_OVERRIDE_RELATIVE_PATH);
+    const candidate = path63.join(dir, PROJECT_OVERRIDE_RELATIVE_PATH);
     if (fs63.existsSync(candidate) && fs63.statSync(candidate).isFile()) {
       const raw = fs63.readFileSync(candidate, "utf-8");
       let parsed;
@@ -17853,7 +17975,7 @@ function findProjectOverride(startDir) {
     }
     if (dir === root)
       return void 0;
-    dir = path62.dirname(dir);
+    dir = path63.dirname(dir);
   }
 }
 function applyOverrideToArtifacts(artifacts, override) {
@@ -17873,7 +17995,7 @@ function applyPinToClone(opts) {
   if (ref.startsWith("-")) {
     throw new Error(`refuses ref "${ref}" \u2014 must not start with "-" (would be parsed as a git option)`);
   }
-  execFileSync14("git", ["-C", clonePath, "checkout", "-q", ref], {
+  execFileSync15("git", ["-C", clonePath, "checkout", "-q", ref], {
     stdio: ["ignore", "ignore", "pipe"]
   });
 }
@@ -17883,7 +18005,7 @@ function restoreCloneToBranchHead(opts) {
     return;
   }
   try {
-    execFileSync14("git", ["-C", clonePath, "checkout", "-q", branch], {
+    execFileSync15("git", ["-C", clonePath, "checkout", "-q", branch], {
       stdio: ["ignore", "ignore", "pipe"]
     });
   } catch {
@@ -17894,14 +18016,14 @@ var init_per_project_override = __esm({
   "../core/dist/skill-sync/per-project-override.js"() {
     "use strict";
     init_schema5();
-    PROJECT_OVERRIDE_RELATIVE_PATH = path62.join(".olam", "skill-overrides.yaml");
+    PROJECT_OVERRIDE_RELATIVE_PATH = path63.join(".olam", "skill-overrides.yaml");
   }
 });
 
 // ../core/dist/lib/file-lock.js
 import * as fs64 from "node:fs";
 import * as os34 from "node:os";
-import * as path63 from "node:path";
+import * as path64 from "node:path";
 function defaultIsPidAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -17935,7 +18057,7 @@ function isLockStale(meta, opts) {
 }
 function tryAcquireOnce(lockPath, meta, opts) {
   try {
-    fs64.mkdirSync(path63.dirname(lockPath), { recursive: true });
+    fs64.mkdirSync(path64.dirname(lockPath), { recursive: true });
     const fd = fs64.openSync(lockPath, "wx", 384);
     try {
       fs64.writeSync(fd, JSON.stringify(meta));
@@ -17967,7 +18089,7 @@ function tryAcquireOnce(lockPath, meta, opts) {
 }
 async function acquireFileLock(lockDir, options = {}) {
   const lockFilename = options.lockFilename ?? DEFAULT_LOCK_FILENAME;
-  const lockPath = path63.join(lockDir, lockFilename);
+  const lockPath = path64.join(lockDir, lockFilename);
   const acquireTimeoutMs = options.acquireTimeoutMs ?? DEFAULT_ACQUIRE_TIMEOUT_MS;
   const staleLockMs = options.staleLockMs ?? DEFAULT_STALE_LOCK_MS;
   const now = options.now ?? Date.now;
@@ -18092,7 +18214,7 @@ var init_min_version_filter = __esm({
 
 // ../core/dist/skill-sync/overlay-scan.js
 import * as fs65 from "node:fs";
-import * as path64 from "node:path";
+import * as path65 from "node:path";
 function scanOverlayReferences(overlayRoot, basenames, caps = DEFAULT_CAPS) {
   const result = /* @__PURE__ */ new Map();
   if (!fs65.existsSync(overlayRoot)) {
@@ -18109,7 +18231,7 @@ function scanOverlayReferences(overlayRoot, basenames, caps = DEFAULT_CAPS) {
     return result;
   }
   for (const subdir of OVERRIDE_SUBDIRS) {
-    const dir = path64.join(overlayRoot, subdir);
+    const dir = path65.join(overlayRoot, subdir);
     if (!fs65.existsSync(dir))
       continue;
     walkMarkdown(dir, mdFiles, caps.maxFiles);
@@ -18125,8 +18247,8 @@ function scanOverlayReferences(overlayRoot, basenames, caps = DEFAULT_CAPS) {
         continue;
       throw err;
     }
-    const rel = path64.relative(overlayRootReal, realFile);
-    if (rel.startsWith("..") || path64.isAbsolute(rel)) {
+    const rel = path65.relative(overlayRootReal, realFile);
+    if (rel.startsWith("..") || path65.isAbsolute(rel)) {
       continue;
     }
     let content;
@@ -18144,7 +18266,7 @@ function scanOverlayReferences(overlayRoot, basenames, caps = DEFAULT_CAPS) {
       }
       throw err;
     }
-    const relpath = path64.relative(overlayRoot, filepath).split(path64.sep).join("/");
+    const relpath = path65.relative(overlayRoot, filepath).split(path65.sep).join("/");
     for (const basename16 of basenames) {
       if (content.includes(basename16)) {
         const list = result.get(basename16) ?? [];
@@ -18168,7 +18290,7 @@ function walkMarkdown(dir, out, cap) {
     if (out.length >= cap) {
       throw new Error(`[overlay-scan] aborted: overlay tree contains > ${cap} markdown files. Check OLAM_CLAUDE_DIR / overlay paths are correctly scoped.`);
     }
-    const full = path64.join(dir, entry.name);
+    const full = path65.join(dir, entry.name);
     if (entry.isSymbolicLink())
       continue;
     if (entry.isDirectory()) {
@@ -18195,10 +18317,10 @@ var init_overlay_scan = __esm({
 // ../core/dist/skill-sync/settings-json-lock.js
 import * as fs66 from "node:fs";
 import * as os35 from "node:os";
-import * as path65 from "node:path";
+import * as path66 from "node:path";
 function defaultSettingsJsonLockPath() {
-  const stateDir = process.env["OLAM_STATE_DIR"] ?? path65.join(os35.homedir(), ".olam", "state");
-  return path65.join(stateDir, SETTINGS_JSON_LOCK_FILENAME);
+  const stateDir = process.env["OLAM_STATE_DIR"] ?? path66.join(os35.homedir(), ".olam", "state");
+  return path66.join(stateDir, SETTINGS_JSON_LOCK_FILENAME);
 }
 function defaultIsPidAlive2(pid) {
   try {
@@ -18237,7 +18359,7 @@ function isLockStale2(meta, opts) {
 function tryAcquireOnce2(lockPath, meta, opts) {
   for (let attempt = 0; attempt <= MAX_STEAL_ATTEMPTS; attempt += 1) {
     try {
-      fs66.mkdirSync(path65.dirname(lockPath), { recursive: true });
+      fs66.mkdirSync(path66.dirname(lockPath), { recursive: true });
       const fd = fs66.openSync(lockPath, "wx", 384);
       try {
         fs66.writeSync(fd, JSON.stringify(meta));
@@ -18399,12 +18521,12 @@ var init_services_status = __esm({
 import * as crypto9 from "node:crypto";
 import * as fs67 from "node:fs";
 import * as os36 from "node:os";
-import * as path66 from "node:path";
+import * as path67 from "node:path";
 function migrationSnapshotsDir2() {
   const override = process.env["OLAM_MIGRATION_SNAPSHOTS_DIR"];
   if (override && override.length > 0)
     return override;
-  return path66.join(os36.homedir(), ".olam", "state", "migration-snapshots");
+  return path67.join(os36.homedir(), ".olam", "state", "migration-snapshots");
 }
 function writeMetaHooksSnapshot(originalSettings) {
   const snapshot = {
@@ -18418,7 +18540,7 @@ function writeMetaHooksSnapshot(originalSettings) {
   fs67.mkdirSync(dir, { recursive: true });
   const stamp = validated.takenAt.replace(/[:.]/g, "-");
   const rand = crypto9.randomBytes(3).toString("hex");
-  const file = path66.join(dir, `${META_HOOKS_SNAPSHOT_PREFIX}${stamp}-${process.pid}-${rand}.json`);
+  const file = path67.join(dir, `${META_HOOKS_SNAPSHOT_PREFIX}${stamp}-${process.pid}-${rand}.json`);
   fs67.writeFileSync(file, JSON.stringify(validated, null, 2) + "\n", { mode: 384 });
   return file;
 }
@@ -18437,7 +18559,7 @@ function findLatestMetaHooksSnapshot() {
   const candidates2 = fs67.readdirSync(dir).filter((n) => n.startsWith(META_HOOKS_SNAPSHOT_PREFIX) && n.endsWith(".json")).sort().reverse();
   if (candidates2.length === 0)
     return void 0;
-  return path66.join(dir, candidates2[0]);
+  return path67.join(dir, candidates2[0]);
 }
 function restoreSettingsFromSnapshot(snapshot, settingsPath) {
   if (snapshot.originalSettings === null) {
@@ -18446,7 +18568,7 @@ function restoreSettingsFromSnapshot(snapshot, settingsPath) {
     }
     return;
   }
-  fs67.mkdirSync(path66.dirname(settingsPath), { recursive: true });
+  fs67.mkdirSync(path67.dirname(settingsPath), { recursive: true });
   const tmp = `${settingsPath}.tmp-restore-${process.pid}-${Date.now()}`;
   fs67.writeFileSync(tmp, JSON.stringify(snapshot.originalSettings, null, 2) + "\n");
   fs67.renameSync(tmp, settingsPath);
@@ -18816,17 +18938,17 @@ var init_markdown_merger = __esm({
 
 // ../core/dist/skill-sync/managed-merge.js
 import * as fs68 from "node:fs";
-import * as path67 from "node:path";
+import * as path68 from "node:path";
 function materializeMergedSkill(opts) {
   const { sourceId, sourcePath, deployBasename, mergedContent, claudeDir: claudeDir2 } = opts;
-  const managedDir = path67.join(claudeDir2, ".olam-merged", sourceId, deployBasename);
-  const sourceRoot = path67.resolve(path67.join(claudeDir2, ".olam-merged", sourceId));
-  const managedResolved = path67.resolve(managedDir);
-  if (!(managedResolved === sourceRoot || managedResolved.startsWith(sourceRoot + path67.sep))) {
+  const managedDir = path68.join(claudeDir2, ".olam-merged", sourceId, deployBasename);
+  const sourceRoot = path68.resolve(path68.join(claudeDir2, ".olam-merged", sourceId));
+  const managedResolved = path68.resolve(managedDir);
+  if (!(managedResolved === sourceRoot || managedResolved.startsWith(sourceRoot + path68.sep))) {
     throw new Error(`[managed-merge] refusing to materialize: deployBasename "${deployBasename}" escapes managed root "${sourceRoot}" (resolved to "${managedResolved}")`);
   }
   fs68.mkdirSync(managedDir, { recursive: true });
-  const skillMdPath = path67.join(managedDir, "SKILL.md");
+  const skillMdPath = path68.join(managedDir, "SKILL.md");
   const tmpPath = `${skillMdPath}.tmp-${process.pid}-${Date.now()}`;
   fs68.writeFileSync(tmpPath, mergedContent);
   fs68.renameSync(tmpPath, skillMdPath);
@@ -18834,9 +18956,9 @@ function materializeMergedSkill(opts) {
   for (const entry of baseEntries) {
     if (entry === "SKILL.md")
       continue;
-    const linkPath = path67.join(managedDir, entry);
-    const targetAbsolute = path67.join(sourcePath, entry);
-    const targetRelative = path67.relative(managedDir, targetAbsolute);
+    const linkPath = path68.join(managedDir, entry);
+    const targetAbsolute = path68.join(sourcePath, entry);
+    const targetRelative = path68.relative(managedDir, targetAbsolute);
     try {
       fs68.lstatSync(linkPath);
       fs68.rmSync(linkPath, { recursive: true, force: true });
@@ -18850,7 +18972,7 @@ function materializeMergedSkill(opts) {
     if (entry === "SKILL.md")
       continue;
     if (!baseEntrySet.has(entry)) {
-      const stalePath = path67.join(managedDir, entry);
+      const stalePath = path68.join(managedDir, entry);
       try {
         fs68.rmSync(stalePath, { recursive: true, force: true });
       } catch {
@@ -18860,7 +18982,7 @@ function materializeMergedSkill(opts) {
   return managedDir;
 }
 function cleanMergedDir(claudeDir2) {
-  fs68.rmSync(path67.join(claudeDir2, ".olam-merged"), { recursive: true, force: true });
+  fs68.rmSync(path68.join(claudeDir2, ".olam-merged"), { recursive: true, force: true });
 }
 var init_managed_merge = __esm({
   "../core/dist/skill-sync/managed-merge.js"() {
@@ -18949,7 +19071,7 @@ var init_prefix_rules = __esm({
 
 // ../core/dist/skill-sync/prefix-deploy.js
 import * as fs69 from "node:fs";
-import * as path68 from "node:path";
+import * as path69 from "node:path";
 function buildSourcePrefixMap(sources) {
   const byId = /* @__PURE__ */ new Map();
   const scopeById = /* @__PURE__ */ new Map();
@@ -18997,7 +19119,7 @@ function applyPrefixRewrites(baseArtifacts, sourceMap, claudeDir2, dryRun) {
       continue;
     }
     if (artifact.kind === "skill") {
-      const skillMdPath = path68.join(artifact.sourcePath, "SKILL.md");
+      const skillMdPath = path69.join(artifact.sourcePath, "SKILL.md");
       const content = fs69.readFileSync(skillMdPath);
       const rewritten = rewriteFrontmatterName(content, () => renamedFrontmatterName);
       const managedDir = materializeMergedSkill({
@@ -19062,12 +19184,12 @@ function sourceConfigPath(clonePath) {
   return join76(clonePath, "shared", "source-config.yaml");
 }
 function readSourceConfig(clonePath, sourceId) {
-  const path95 = sourceConfigPath(clonePath);
-  if (!existsSync77(path95))
+  const path96 = sourceConfigPath(clonePath);
+  if (!existsSync77(path96))
     return void 0;
   let raw;
   try {
-    raw = readFileSync66(path95, "utf-8");
+    raw = readFileSync66(path96, "utf-8");
   } catch (err) {
     emitMalformedWarning(sourceId, `read failed: ${errToMsg(err)}`);
     return void 0;
@@ -19148,12 +19270,12 @@ var init_resolve_source_config = __esm({
 // ../core/dist/skill-sync/engine.js
 import * as fs70 from "node:fs";
 import * as os37 from "node:os";
-import * as path69 from "node:path";
+import * as path70 from "node:path";
 function resolveAtlasUser(override) {
   if (override)
     return override;
-  const claudeDir2 = process.env["OLAM_CLAUDE_DIR"] || path69.join(os37.homedir(), ".claude");
-  const f = path69.join(claudeDir2, ".atlas-user");
+  const claudeDir2 = process.env["OLAM_CLAUDE_DIR"] || path70.join(os37.homedir(), ".claude");
+  const f = path70.join(claudeDir2, ".atlas-user");
   if (fs70.existsSync(f)) {
     return fs70.readFileSync(f, "utf-8").trim() || void 0;
   }
@@ -19310,7 +19432,7 @@ async function syncSkills(opts = {}) {
       let baseContent;
       let basePath;
       if (overlay.targetKind === "skill") {
-        basePath = path69.join(base.sourcePath, "SKILL.md");
+        basePath = path70.join(base.sourcePath, "SKILL.md");
         baseContent = fs70.readFileSync(basePath, "utf-8");
       } else {
         basePath = base.sourcePath;
@@ -19377,7 +19499,7 @@ async function syncSkills(opts = {}) {
     summary2.collisions = detectCollisions(baseArtifacts).collisions;
     return summary2;
   }
-  const claudeDirPath = process.env["OLAM_CLAUDE_DIR"] || path69.join(os37.homedir(), ".claude");
+  const claudeDirPath = process.env["OLAM_CLAUDE_DIR"] || path70.join(os37.homedir(), ".claude");
   const overlayReferences = scanOverlayReferences(claudeDirPath, SHIM_TARGETS.map((t) => t.basename));
   summary2.deploy = deployArtifacts(baseArtifacts, {
     installedOlamVersion,
@@ -19411,10 +19533,10 @@ async function injectMetaHooksIntoSettings(opts) {
       } catch {
         try {
           const raw = fs70.readFileSync(settingsFile);
-          const bakDir = path69.join(path69.dirname(settingsFile), ".malformed-backups");
+          const bakDir = path70.join(path70.dirname(settingsFile), ".malformed-backups");
           fs70.mkdirSync(bakDir, { recursive: true });
           const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-          const bakFile = path69.join(bakDir, `settings.json.malformed.${stamp}.bak`);
+          const bakFile = path70.join(bakDir, `settings.json.malformed.${stamp}.bak`);
           fs70.writeFileSync(bakFile, raw, { mode: 384 });
           snapshotError = `settings.json was malformed; original bytes preserved at ${bakFile}`;
         } catch (bakErr) {
@@ -19465,7 +19587,7 @@ async function injectMetaHooksIntoSettings(opts) {
       } catch {
       }
     }
-    fs70.mkdirSync(path69.dirname(settingsFile), { recursive: true });
+    fs70.mkdirSync(path70.dirname(settingsFile), { recursive: true });
     const tmpPath = `${settingsFile}.tmp-${process.pid}-${Date.now()}`;
     fs70.writeFileSync(tmpPath, JSON.stringify(inject.nextSettings, null, 2) + "\n");
     fs70.renameSync(tmpPath, settingsFile);
@@ -19510,13 +19632,13 @@ var init_engine = __esm({
 
 // ../core/dist/skill-sync/shadow-backup-manager.js
 import * as fs71 from "node:fs";
-import * as path70 from "node:path";
+import * as path71 from "node:path";
 function listShadowBackups(opts = {}) {
   const claude = opts.claudeDirOverride ?? claudeDir();
   const now = opts.now ?? Date.now();
   const out = [];
   for (const bucket of SHADOW_BACKUP_BUCKETS) {
-    const bucketDir = path70.join(claude, bucket);
+    const bucketDir = path71.join(claude, bucket);
     if (!fs71.existsSync(bucketDir))
       continue;
     let entries;
@@ -19532,7 +19654,7 @@ function listShadowBackups(opts = {}) {
       const epochSeconds = Number.parseInt(match2[1], 10);
       if (!Number.isFinite(epochSeconds) || epochSeconds < 0)
         continue;
-      const full = path70.join(bucketDir, name);
+      const full = path71.join(bucketDir, name);
       let sizeBytes = 0;
       try {
         const st = fs71.statSync(full);
@@ -19548,7 +19670,7 @@ function listShadowBackups(opts = {}) {
         bucket,
         basename: name,
         originalBasename,
-        originalPath: path70.join(bucketDir, originalBasename),
+        originalPath: path71.join(bucketDir, originalBasename),
         epochSeconds,
         ageMs: now - epochSeconds * 1e3,
         sizeBytes
@@ -19602,17 +19724,17 @@ function pruneShadowBackups(opts) {
   return { deleted, skipped };
 }
 function restoreShadowBackup(opts) {
-  const abs = path70.resolve(opts.backupPath);
+  const abs = path71.resolve(opts.backupPath);
   if (!fs71.existsSync(abs)) {
     throw new Error(`backup file not found: ${abs}`);
   }
-  const basename16 = path70.basename(abs);
+  const basename16 = path71.basename(abs);
   const match2 = SHADOW_BACKUP_SUFFIX_RE.exec(basename16);
   if (!match2) {
     throw new Error(`not a shadow-backup file (basename "${basename16}" does not match \`.shadow-backup-<epoch>\`): ${abs}`);
   }
   const originalBasename = basename16.slice(0, basename16.length - match2[0].length);
-  const originalPath = path70.join(path70.dirname(abs), originalBasename);
+  const originalPath = path71.join(path71.dirname(abs), originalBasename);
   if (fs71.existsSync(originalPath) && !opts.force) {
     throw new Error(`original path already occupied: ${originalPath}. Move/rename it first OR re-run with --force.`);
   }
@@ -19635,10 +19757,10 @@ var init_shadow_backup_manager = __esm({
 // ../core/dist/global-config/repos.js
 import * as fs72 from "node:fs";
 import * as os38 from "node:os";
-import * as path71 from "node:path";
+import * as path72 from "node:path";
 function expandPath(p) {
   if (p === "~" || p.startsWith("~/")) {
-    return path71.join(os38.homedir(), p.slice(1));
+    return path72.join(os38.homedir(), p.slice(1));
   }
   return p;
 }
@@ -19750,13 +19872,13 @@ var init_global_config = __esm({
 
 // ../core/dist/skill-sources/doctor-checks.js
 import * as fs73 from "node:fs";
-import * as path72 from "node:path";
+import * as path73 from "node:path";
 import * as os39 from "node:os";
 function claudeDirInternal3() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path72.join(os39.homedir(), ".claude");
+  return path73.join(os39.homedir(), ".claude");
 }
 function checkStateFileParse() {
   const filePath = globalConfigPath();
@@ -19811,11 +19933,11 @@ function checkDanglingSymlinks() {
   const buckets = ["commands", "agents", "skills", "scripts", "rules"];
   const dangling = [];
   for (const bucket of buckets) {
-    const dir = path72.join(claude, bucket);
+    const dir = path73.join(claude, bucket);
     if (!fs73.existsSync(dir))
       continue;
     for (const name of fs73.readdirSync(dir)) {
-      const linkPath = path72.join(dir, name);
+      const linkPath = path73.join(dir, name);
       try {
         const lst = fs73.lstatSync(linkPath);
         if (!lst.isSymbolicLink())
@@ -19860,7 +19982,7 @@ function checkOrphanedSnapshots() {
   for (const name of fs73.readdirSync(dir)) {
     if (!name.endsWith(".json"))
       continue;
-    const full = path72.join(dir, name);
+    const full = path73.join(dir, name);
     try {
       const stat = fs73.statSync(full);
       if (!stat.isFile())
@@ -19998,7 +20120,7 @@ function checkMemberNameMissing() {
     return result;
   }
   const claudeDir2 = claudeDirInternal3();
-  const atlasUserPath = path72.join(claudeDir2, ".atlas-user");
+  const atlasUserPath = path73.join(claudeDir2, ".atlas-user");
   const value = fs73.existsSync(atlasUserPath) ? fs73.readFileSync(atlasUserPath, "utf-8").trim() : "";
   if (value.length > 0) {
     result.details = [`atlas-user: ${value}`];
@@ -20007,10 +20129,10 @@ function checkMemberNameMissing() {
   result.healthy = false;
   result.issue = "atlas-toolbox source registered but ~/.claude/.atlas-user not set";
   const clonePath = skillSourceClonePath(atlasSource.id);
-  const membersDir = path72.join(clonePath, "members");
+  const membersDir = path73.join(clonePath, "members");
   const existing = fs73.existsSync(membersDir) ? fs73.readdirSync(membersDir).filter((e) => {
     try {
-      return fs73.statSync(path72.join(membersDir, e)).isDirectory();
+      return fs73.statSync(path73.join(membersDir, e)).isDirectory();
     } catch {
       return false;
     }
@@ -20024,7 +20146,7 @@ function checkMemberNameMissing() {
 }
 function checkMemberOverlayDrift() {
   const claudeDir2 = claudeDirInternal3();
-  const atlasUserPath = path72.join(claudeDir2, ".atlas-user");
+  const atlasUserPath = path73.join(claudeDir2, ".atlas-user");
   const atlasUser = fs73.existsSync(atlasUserPath) ? fs73.readFileSync(atlasUserPath, "utf-8").trim() : "";
   if (atlasUser.length === 0) {
     return [];
@@ -20041,7 +20163,7 @@ function checkMemberOverlayDrift() {
   const clonePath = skillSourceClonePath(atlasSource.id);
   const results = [];
   for (const kind of ["skills", "agents"]) {
-    const localRoot = path72.join(claudeDir2, `${kind}.overrides`);
+    const localRoot = path73.join(claudeDir2, `${kind}.overrides`);
     if (!fs73.existsSync(localRoot))
       continue;
     let entries;
@@ -20051,7 +20173,7 @@ function checkMemberOverlayDrift() {
       continue;
     }
     for (const entry of entries) {
-      const localFile = path72.join(localRoot, entry);
+      const localFile = path73.join(localRoot, entry);
       let stat;
       try {
         stat = fs73.statSync(localFile);
@@ -20060,7 +20182,7 @@ function checkMemberOverlayDrift() {
       }
       if (!stat.isFile())
         continue;
-      const cloneFile = path72.join(clonePath, "members", atlasUser, `${kind}.overrides`, entry);
+      const cloneFile = path73.join(clonePath, "members", atlasUser, `${kind}.overrides`, entry);
       const localSha = sha256OfPath(localFile);
       const cloneSha = sha256OfPath(cloneFile);
       if (localSha === cloneSha) {
@@ -20229,7 +20351,7 @@ var project_sweep_exports = {};
 __export(project_sweep_exports, {
   walkProjectRoot: () => walkProjectRoot
 });
-import * as path73 from "node:path";
+import * as path74 from "node:path";
 import { readdirSync as readdirSync25, lstatSync as lstatSync6, statSync as statSync25, existsSync as existsSync82 } from "node:fs";
 function isSkipped(basename16, extra) {
   if (DEFAULT_SKIP.has(basename16))
@@ -20241,7 +20363,7 @@ function isSkipped(basename16, extra) {
   return false;
 }
 function resolveMtime(dirPath, manifestFile, fsAdapter) {
-  const gitHead = path73.join(dirPath, ".git", "HEAD");
+  const gitHead = path74.join(dirPath, ".git", "HEAD");
   if (fsAdapter.existsSync(gitHead)) {
     try {
       return fsAdapter.statSync(gitHead).mtimeMs;
@@ -20255,8 +20377,8 @@ function resolveMtime(dirPath, manifestFile, fsAdapter) {
   }
 }
 function walk2(currentPath, depth, maxDepth, extraExclude, fsAdapter, results) {
-  const adbManifest = path73.join(currentPath, ".adb.yaml");
-  const olamManifest = path73.join(currentPath, ".olam.yaml");
+  const adbManifest = path74.join(currentPath, ".adb.yaml");
+  const olamManifest = path74.join(currentPath, ".olam.yaml");
   if (fsAdapter.existsSync(adbManifest)) {
     const mtime = resolveMtime(currentPath, adbManifest, fsAdapter);
     results.push({ path: currentPath, manifestType: "adb", mtime });
@@ -20278,7 +20400,7 @@ function walk2(currentPath, depth, maxDepth, extraExclude, fsAdapter, results) {
   for (const entry of entries) {
     if (isSkipped(entry, extraExclude))
       continue;
-    const childPath = path73.join(currentPath, entry);
+    const childPath = path74.join(currentPath, entry);
     let stat;
     try {
       stat = fsAdapter.lstatSync(childPath);
@@ -20336,11 +20458,11 @@ __export(kg_eager_exports, {
   writeQueue: () => writeQueue
 });
 import * as fs74 from "node:fs";
-import * as path74 from "node:path";
+import * as path75 from "node:path";
 import * as os40 from "node:os";
 function defaultQueuePath() {
-  const stateDir = process.env["OLAM_STATE_DIR"] ?? path74.join(os40.homedir(), ".olam", "state");
-  return path74.join(stateDir, "kg-pending.jsonl");
+  const stateDir = process.env["OLAM_STATE_DIR"] ?? path75.join(os40.homedir(), ".olam", "state");
+  return path75.join(stateDir, "kg-pending.jsonl");
 }
 function readQueue(queuePath) {
   if (!fs74.existsSync(queuePath))
@@ -20359,14 +20481,14 @@ function readQueue(queuePath) {
   return entries;
 }
 function writeQueue(queuePath, entries) {
-  fs74.mkdirSync(path74.dirname(queuePath), { recursive: true });
+  fs74.mkdirSync(path75.dirname(queuePath), { recursive: true });
   const content = entries.map((e) => JSON.stringify(e)).join("\n") + (entries.length > 0 ? "\n" : "");
   fs74.writeFileSync(queuePath, content, "utf-8");
 }
 function appendQueue(queuePath, repos, nowMs) {
   if (repos.length === 0)
     return;
-  fs74.mkdirSync(path74.dirname(queuePath), { recursive: true });
+  fs74.mkdirSync(path75.dirname(queuePath), { recursive: true });
   const lines = repos.map((r) => JSON.stringify({ path: r.path, addedAt: nowMs })).join("\n") + "\n";
   fs74.appendFileSync(queuePath, lines, "utf-8");
 }
@@ -20422,7 +20544,7 @@ __export(machine_schema_exports, {
   writeMachineConfig: () => writeMachineConfig
 });
 import * as fs77 from "node:fs";
-import * as path78 from "node:path";
+import * as path79 from "node:path";
 import * as os41 from "node:os";
 import { parse as parseYaml7, stringify as stringifyYaml5 } from "yaml";
 function readMachineConfig(configPath) {
@@ -20439,7 +20561,7 @@ function readMachineConfig(configPath) {
 }
 function writeMachineConfig(config, configPath) {
   const p = configPath ?? DEFAULT_CONFIG_PATH;
-  fs77.mkdirSync(path78.dirname(p), { recursive: true });
+  fs77.mkdirSync(path79.dirname(p), { recursive: true });
   fs77.writeFileSync(p, stringifyYaml5({ ...config }), { mode: 420 });
 }
 function initMachineConfig(opts = {}) {
@@ -20463,9 +20585,9 @@ var init_machine_schema = __esm({
       channel: external_exports.enum(["stable", "beta", "edge"]).default("stable"),
       auto_update: external_exports.boolean().default(true),
       telemetry: external_exports.boolean().default(true),
-      worlds_dir: external_exports.string().default(() => path78.join(os41.homedir(), ".olam", "worlds"))
+      worlds_dir: external_exports.string().default(() => path79.join(os41.homedir(), ".olam", "worlds"))
     });
-    DEFAULT_CONFIG_PATH = path78.join(os41.homedir(), ".olam", "config.yaml");
+    DEFAULT_CONFIG_PATH = path79.join(os41.homedir(), ".olam", "config.yaml");
   }
 });
 
@@ -20660,16 +20782,16 @@ function isValidConfig(value) {
   if (typeof v.install_id !== "string" || v.install_id.length === 0) return false;
   return true;
 }
-function atomicWriteJSON(path95, value, stderr = process.stderr) {
+function atomicWriteJSON(path96, value, stderr = process.stderr) {
   ensureStateDir();
-  const dir = dirname3(path95);
+  const dir = dirname3(path96);
   if (!existsSync6(dir)) {
     mkdirSync2(dir, { recursive: true });
   }
-  const tmp = `${path95}.tmp.${process.pid}`;
+  const tmp = `${path96}.tmp.${process.pid}`;
   try {
     writeFileSync2(tmp, JSON.stringify(value, null, 2) + "\n", { encoding: "utf8" });
-    renameSync2(tmp, path95);
+    renameSync2(tmp, path96);
   } catch (err) {
     if (existsSync6(tmp)) {
       try {
@@ -21030,9 +21152,9 @@ var UnknownArchetypeError = class extends Error {
 };
 var ArchetypeCycleError = class extends Error {
   path;
-  constructor(path95) {
-    super(`Archetype inheritance cycle detected: ${path95.join(" \u2192 ")} \u2192 ${path95[0] ?? "?"}`);
-    this.path = path95;
+  constructor(path96) {
+    super(`Archetype inheritance cycle detected: ${path96.join(" \u2192 ")} \u2192 ${path96[0] ?? "?"}`);
+    this.path = path96;
     this.name = "ArchetypeCycleError";
   }
 };
@@ -21520,7 +21642,7 @@ function substitutePlaceholders(templateYaml, values) {
 function renderOneSecret(binding, templatesRoot, reuse, deps = {}, rotate = false) {
   const olamHome5 = deps.olamHome ?? OLAM_HOME;
   const readFile = deps.readFile ?? defaultReadFile;
-  const writeFile = deps.writeFile ?? defaultWriteFile;
+  const writeFile2 = deps.writeFile ?? defaultWriteFile;
   const fileExists = deps.fileExists ?? defaultFileExists;
   const genRandomHex = deps.genRandomHex ?? defaultGenRandomHex;
   const runGhTokenCmd = deps.runGhTokenCmd ?? defaultRunGhTokenCmd;
@@ -21535,7 +21657,7 @@ function renderOneSecret(binding, templatesRoot, reuse, deps = {}, rotate = fals
       olamHome5,
       reuse?.keys[p.key],
       rotate,
-      { readFile, writeFile, fileExists, genRandomHex, runGhTokenCmd }
+      { readFile, writeFile: writeFile2, fileExists, genRandomHex, runGhTokenCmd }
     );
     if (!resolved.ok) {
       missingSources.push(`${p.key}: ${resolved.reason}`);
@@ -21831,14 +21953,14 @@ function ensureSecrets() {
   step("1/6 \u2014 operator secrets");
   mkdirSync19(OLAM_HOME3, { recursive: true });
   for (const name of SECRET_FILES) {
-    const path95 = join34(OLAM_HOME3, name);
-    if (existsSync29(path95)) {
+    const path96 = join34(OLAM_HOME3, name);
+    if (existsSync29(path96)) {
       printInfo("skip", `~/.olam/${name} already exists`);
       continue;
     }
     const hex = randomBytes7(32).toString("hex");
-    writeFileSync15(path95, hex + "\n", { encoding: "utf8", mode: 384 });
-    chmodSync4(path95, 384);
+    writeFileSync15(path96, hex + "\n", { encoding: "utf8", mode: 384 });
+    chmodSync4(path96, 384);
     printSuccess(`generated ~/.olam/${name}`);
   }
 }
@@ -21961,13 +22083,13 @@ function installObservability(opts) {
     scriptEnv.OLAM_BUNDLE_ROOT = bundleRoot;
   }
   for (const script of OBSERVABILITY_SCRIPTS) {
-    const path95 = join34(observabilityDir, script);
-    if (!existsSync29(path95)) {
+    const path96 = join34(observabilityDir, script);
+    if (!existsSync29(path96)) {
       printWarning(`observability script missing: ${script} \u2014 skipping`);
       continue;
     }
     printInfo("run", script);
-    const result = spawnSync10("bash", [path95], {
+    const result = spawnSync10("bash", [path96], {
       stdio: "inherit",
       env: scriptEnv
     });
@@ -22976,56 +23098,56 @@ var SECRET_LEN_BYTES = 32;
 function generateSecret() {
   return randomBytes8(SECRET_LEN_BYTES).toString("hex");
 }
-function writeSecretAtPath(path95, value) {
-  mkdirSync21(dirname22(path95), { recursive: true });
-  const tmp = `${path95}.tmp.${process.pid}`;
+function writeSecretAtPath(path96, value) {
+  mkdirSync21(dirname22(path96), { recursive: true });
+  const tmp = `${path96}.tmp.${process.pid}`;
   writeFileSync16(tmp, value, { mode: 384 });
   chmodSync5(tmp, 384);
-  renameSync6(tmp, path95);
+  renameSync6(tmp, path96);
 }
-function readSecretAtPathOrNull(path95) {
-  if (!existsSync32(path95)) return null;
-  const mode = statSync8(path95).mode & 511;
+function readSecretAtPathOrNull(path96) {
+  if (!existsSync32(path96)) return null;
+  const mode = statSync8(path96).mode & 511;
   if (mode !== 384) {
     process.stderr.write(
-      `warn: ${path95} has mode 0${mode.toString(8)}; expected 0600. Run 'olam memory secret rotate' to regenerate.
+      `warn: ${path96} has mode 0${mode.toString(8)}; expected 0600. Run 'olam memory secret rotate' to regenerate.
 `
     );
   }
-  return readFileSync25(path95, "utf8").trim();
+  return readFileSync25(path96, "utf8").trim();
 }
-function readSecretAtPath(path95) {
-  const v = readSecretAtPathOrNull(path95);
+function readSecretAtPath(path96) {
+  const v = readSecretAtPathOrNull(path96);
   if (v === null) {
     throw new Error(
-      `Secret not found at ${path95}. Run 'olam memory start' to generate it.`
+      `Secret not found at ${path96}. Run 'olam memory start' to generate it.`
     );
   }
   return v;
 }
-function ensureMemorySecret(path95 = MEMORY_SECRET_PATH) {
-  const existing = readSecretAtPathOrNull(path95);
+function ensureMemorySecret(path96 = MEMORY_SECRET_PATH) {
+  const existing = readSecretAtPathOrNull(path96);
   if (existing) return existing;
   const fresh = generateSecret();
-  writeSecretAtPath(path95, fresh);
+  writeSecretAtPath(path96, fresh);
   return fresh;
 }
-function readMemorySecretOrNull(path95 = MEMORY_SECRET_PATH) {
-  return readSecretAtPathOrNull(path95);
+function readMemorySecretOrNull(path96 = MEMORY_SECRET_PATH) {
+  return readSecretAtPathOrNull(path96);
 }
-function readMemorySecret(path95 = MEMORY_SECRET_PATH) {
-  return readSecretAtPath(path95);
+function readMemorySecret(path96 = MEMORY_SECRET_PATH) {
+  return readSecretAtPath(path96);
 }
-function rotateMemorySecret(path95 = MEMORY_SECRET_PATH) {
+function rotateMemorySecret(path96 = MEMORY_SECRET_PATH) {
   const fresh = generateSecret();
-  writeSecretAtPath(path95, fresh);
+  writeSecretAtPath(path96, fresh);
   return fresh;
 }
-function hasMemorySecret(path95 = MEMORY_SECRET_PATH) {
-  return existsSync32(path95);
+function hasMemorySecret(path96 = MEMORY_SECRET_PATH) {
+  return existsSync32(path96);
 }
-function writeCloudMemorySecret(value, path95 = CLOUD_MEMORY_SECRET_PATH) {
-  writeSecretAtPath(path95, value);
+function writeCloudMemorySecret(value, path96 = CLOUD_MEMORY_SECRET_PATH) {
+  writeSecretAtPath(path96, value);
 }
 
 // src/commands/memory-service-container.ts
@@ -25194,9 +25316,9 @@ function formatFreshnessWarning(result, image = DEFAULT_DEVBOX_IMAGE) {
     "These source files have changed since the image was built; the",
     "changes will NOT take effect in fresh worlds until you rebuild:"
   ];
-  for (const { path: path95, mtimeMs } of result.newerSources) {
+  for (const { path: path96, mtimeMs } of result.newerSources) {
     const when = new Date(mtimeMs).toISOString();
-    lines.push(`  \u2022 ${path95}  (modified ${when})`);
+    lines.push(`  \u2022 ${path96}  (modified ${when})`);
   }
   lines.push("");
   lines.push("Rebuild with:");
@@ -25577,9 +25699,9 @@ async function readHostCpTokenForCreate() {
   try {
     const { default: fs96 } = await import("node:fs");
     const { default: os50 } = await import("node:os");
-    const { default: path95 } = await import("node:path");
-    const tp = path95.join(
-      process.env.OLAM_HOME ?? path95.join(os50.homedir(), ".olam"),
+    const { default: path96 } = await import("node:path");
+    const tp = path96.join(
+      process.env.OLAM_HOME ?? path96.join(os50.homedir(), ".olam"),
       "host-cp.token"
     );
     if (!fs96.existsSync(tp)) return null;
@@ -25592,7 +25714,10 @@ function registerCreate(program2) {
   program2.command("create").description("Create a new development world").option("--name <name>", "World name (required unless --from-prompt is set; auto-derived in that case)").option("--repos <repos...>", "Repos to include (names from .olam/config.yaml; wins over --workspace)").option("--workspace <name>", "Named workspace from the host catalog (~/.olam/workspaces/<name>.yaml)").option("--task <task>", "Initial task to dispatch").option("--branch <branch>", "Override default branch name").option("--plan <file>", "Path to a plan file to inject").option("--no-auth", "Skip auto-injecting host credentials").option("--no-host-cp", 'Suppress the host CP "you might want to start it" hint').option("--auto-codex-review", "Spawn a parallel codex-review lane that critiques main as it works").option("--no-open", "Suppress auto-opening the Host CP UI in the browser on success").option("--rebuild-base", "Rebuild olam-devbox:latest before creating (slow)").option("--no-freshness-check", "Skip the devbox image freshness check").option("--from-prompt <prompt>", "NL prompt \u2192 infer workspace + dispatch (CLI parity for olam_create_from_prompt MCP tool)").option("--keep-after-merge", "Disable auto-destroy when the world's PR merges (useful for inspection/debugging)").option("--carry-uncommitted", "Preserve operator's uncommitted edits in the world's worktree").option(
     "--allow-bootstrap-failure",
     "Treat bootstrap step failures as warnings instead of destroying the world (dogfood escape hatch for cross-repo seed coupling)"
-  ).option("--devbox-image <ref>", "Override the default devbox image (full registry/name:tag or @sha256: ref)").option("--allow-custom-registry", "Allow --devbox-image refs outside ghcr.io/pleri/* (logs a warning)").option("--runbook <name>", "Named runbook profile from ~/.olam/config.json").action(async (opts) => {
+  ).option("--devbox-image <ref>", "Override the default devbox image (full registry/name:tag or @sha256: ref)").option("--allow-custom-registry", "Allow --devbox-image refs outside ghcr.io/pleri/* (logs a warning)").option("--runbook <name>", "Named runbook profile from ~/.olam/config.json").option(
+    "--claude-home <id-or-path>",
+    "Use a per-world Claude Code HOME (multi-account isolation; see docs/decisions/045-claude-home-override.md)"
+  ).action(async (opts) => {
     const { resolveDevboxImageOverride: resolveDevboxImageOverride2, decideAllowlist: decideAllowlist2 } = await Promise.resolve().then(() => (init_registry_allowlist(), registry_allowlist_exports));
     const overrideRef = resolveDevboxImageOverride2(opts.devboxImage);
     if (overrideRef) {
@@ -25770,6 +25895,25 @@ function registerCreate(program2) {
         throw err;
       }
     }
+    let resolvedClaudeHome;
+    if (opts.claudeHome !== void 0 && opts.claudeHome.length > 0) {
+      try {
+        const { resolveClaudeHome: resolveClaudeHome2, ensureClaudeHomeDir: ensureClaudeHomeDir2 } = await Promise.resolve().then(() => (init_home_override(), home_override_exports));
+        const target = resolveClaudeHome2({ flag: opts.claudeHome });
+        await ensureClaudeHomeDir2(target);
+        resolvedClaudeHome = target;
+        printInfo(
+          "Claude home",
+          `${target} (per-world Claude Code instance \u2014 see ADR 045)`
+        );
+      } catch (err) {
+        printError(
+          `Invalid --claude-home: ${err instanceof Error ? err.message : String(err)}`
+        );
+        process.exitCode = 1;
+        return;
+      }
+    }
     const spinner = ora5("Creating world...").start();
     try {
       const world = await ctx.worldManager.createWorld({
@@ -25788,7 +25932,8 @@ function registerCreate(program2) {
         // manager, matching the manager's strict `if (!opts.carryUncommitted)`.
         carryUncommitted: opts.carryUncommitted === true,
         allowBootstrapFailure: opts.allowBootstrapFailure === true,
-        ...opts.runbook ? { runbookName: opts.runbook } : {}
+        ...opts.runbook ? { runbookName: opts.runbook } : {},
+        ...resolvedClaudeHome ? { claudeHome: resolvedClaudeHome } : {}
       });
       spinner.succeed("World created");
       try {
@@ -26022,8 +26167,8 @@ async function readHostCpToken3() {
   try {
     const { default: fs96 } = await import("node:fs");
     const { default: os50 } = await import("node:os");
-    const { default: path95 } = await import("node:path");
-    const tp = path95.join(os50.homedir(), ".olam", "host-cp.token");
+    const { default: path96 } = await import("node:path");
+    const tp = path96.join(os50.homedir(), ".olam", "host-cp.token");
     if (!fs96.existsSync(tp)) return null;
     const raw = fs96.readFileSync(tp, "utf-8").trim();
     return raw.length > 0 ? raw : null;
@@ -26240,7 +26385,7 @@ init_output();
 import * as fs36 from "node:fs";
 import * as http3 from "node:http";
 import * as os18 from "node:os";
-import * as path37 from "node:path";
+import * as path38 from "node:path";
 var CLI_VERSION2 = process.env["OLAM_CLI_VERSION"] ?? "0.0.0";
 var HOST_CP_PORT2 = 19e3;
 var STATE_ENUM = [
@@ -26331,7 +26476,7 @@ async function getMachineStatus(_probe, _loadCtx, _readToken) {
     }
   } catch {
   }
-  const manifestPath2 = path37.join(os18.homedir(), ".olam", "cache", "manifest.json");
+  const manifestPath2 = path38.join(os18.homedir(), ".olam", "cache", "manifest.json");
   let updateAvailable = null;
   let lastUpdateCheck = null;
   if (fs36.existsSync(manifestPath2)) {
@@ -26477,7 +26622,7 @@ init_context();
 init_output();
 import fs37 from "node:fs";
 import os19 from "node:os";
-import path38 from "node:path";
+import path39 from "node:path";
 import { execFileSync as execFileSync9 } from "node:child_process";
 function registerClean(program2) {
   program2.command("clean").description("Reap orphan world filesystem state under ~/.olam/worlds/").option("--apply", "Actually delete the orphans (default is dry-run)", false).option(
@@ -26501,7 +26646,7 @@ async function runClean(opts) {
     printError(error?.message ?? "Olam is not configured. Run `olam init` first.");
     return 1;
   }
-  const worldsDir = path38.join(os19.homedir(), ".olam", "worlds");
+  const worldsDir = path39.join(os19.homedir(), ".olam", "worlds");
   if (!fs37.existsSync(worldsDir)) {
     if (opts.json) {
       process.stdout.write(`${JSON.stringify({ worldsDir, entries: [] })}
@@ -26518,7 +26663,7 @@ async function runClean(opts) {
   const worktreeMap = collectWorktrees(worldsDir);
   const entries = [];
   for (const id of fs37.readdirSync(worldsDir).sort()) {
-    const fullPath = path38.join(worldsDir, id);
+    const fullPath = path39.join(worldsDir, id);
     const stat = safeStat(fullPath);
     if (!stat || !stat.isDirectory()) continue;
     entries.push(classifyWorld({ id, fullPath, liveIds, worktreeMap }));
@@ -26584,7 +26729,7 @@ function classifyWorld(args) {
   if (liveIds.has(id)) {
     return { id, path: fullPath, bytes, category: "active", note: "in registry" };
   }
-  const worktreeChild = path38.join(fullPath, "olam");
+  const worktreeChild = path39.join(fullPath, "olam");
   const worktreeInfo = worktreeMap.get(worktreeChild);
   if (worktreeInfo) {
     if (worktreeInfo.dirty > 0 || worktreeInfo.unpushed > 0) {
@@ -26641,8 +26786,8 @@ function reapEntry(entry) {
 function collectWorktrees(worldsDir) {
   const out = /* @__PURE__ */ new Map();
   for (const id of fs37.readdirSync(worldsDir)) {
-    const child = path38.join(worldsDir, id, "olam");
-    const gitMarker = path38.join(child, ".git");
+    const child = path39.join(worldsDir, id, "olam");
+    const gitMarker = path39.join(child, ".git");
     if (!fs37.existsSync(gitMarker)) continue;
     const gitDir = resolveGitDirForWorktree(child);
     if (!gitDir) continue;
@@ -26654,7 +26799,7 @@ function collectWorktrees(worldsDir) {
   return out;
 }
 function resolveGitDirForWorktree(worktreePath) {
-  const gitMarker = path38.join(worktreePath, ".git");
+  const gitMarker = path39.join(worktreePath, ".git");
   try {
     const top = execFileSync9("git", ["rev-parse", "--show-toplevel"], {
       cwd: worktreePath,
@@ -26668,7 +26813,7 @@ function resolveGitDirForWorktree(worktreePath) {
       stdio: "pipe"
     }).trim();
     if (!common) return top;
-    return path38.dirname(path38.resolve(worktreePath, common));
+    return path39.dirname(path39.resolve(worktreePath, common));
   } catch {
     return null;
   }
@@ -26735,7 +26880,7 @@ function computeBytes(p) {
       } catch {
         continue;
       }
-      for (const name of entries) stack.push(path38.join(cur, name));
+      for (const name of entries) stack.push(path39.join(cur, name));
     } else {
       total += st.size;
     }
@@ -26789,7 +26934,7 @@ init_output();
 import { execFileSync as execFileSync10 } from "node:child_process";
 import * as fs38 from "node:fs";
 import * as os20 from "node:os";
-import * as path39 from "node:path";
+import * as path40 from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 import pc17 from "picocolors";
 var NPM_PACKAGE = "@pleri/olam-cli";
@@ -26811,7 +26956,7 @@ var realExec = (cmd, args) => {
 };
 function surveyOlam(opts = {}) {
   const exec = opts.exec ?? realExec;
-  const home = opts.olamHome ?? path39.join(os20.homedir(), ".olam");
+  const home = opts.olamHome ?? path40.join(os20.homedir(), ".olam");
   const containers = listDocker(exec, ["ps", "-a", "--format", "{{.Names}}"]).filter(
     (n) => n.startsWith("olam-")
   );
@@ -26825,11 +26970,11 @@ function surveyOlam(opts = {}) {
     (n) => n.startsWith("olam-") && n !== "olam-host-cp-internal-default"
   );
   const worlds = [];
-  const worldsDir = path39.join(home, "worlds");
+  const worldsDir = path40.join(home, "worlds");
   if (fs38.existsSync(worldsDir)) {
     for (const entry of fs38.readdirSync(worldsDir, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
-      const wPath = path39.join(worldsDir, entry.name);
+      const wPath = path40.join(worldsDir, entry.name);
       const bytes = dirSize(wPath);
       const { dirty, note } = inspectWorldGitState(wPath);
       worlds.push({ id: entry.name, bytes, dirty, note, path: wPath });
@@ -26838,7 +26983,7 @@ function surveyOlam(opts = {}) {
   const homeBytesNonWorld = fs38.existsSync(home) ? Math.max(0, dirSize(home) - worlds.reduce((acc, w) => acc + w.bytes, 0)) : 0;
   const npmRoot = exec("npm", ["root", "-g"]);
   const npmGlobalRoot = npmRoot.exitCode === 0 ? npmRoot.stdout.trim() : null;
-  const npmInstalled = npmGlobalRoot !== null && fs38.existsSync(path39.join(npmGlobalRoot, NPM_PACKAGE));
+  const npmInstalled = npmGlobalRoot !== null && fs38.existsSync(path40.join(npmGlobalRoot, NPM_PACKAGE));
   return {
     containers,
     images,
@@ -26868,7 +27013,7 @@ function dirSize(p) {
         continue;
       }
       for (const e of entries) {
-        const full = path39.join(cur, e.name);
+        const full = path40.join(cur, e.name);
         try {
           if (e.isDirectory()) stack.push(full);
           else if (e.isFile()) total += fs38.statSync(full).size;
@@ -26886,8 +27031,8 @@ function inspectWorldGitState(worldPath) {
   try {
     for (const entry of fs38.readdirSync(worldPath, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
-      const repo = path39.join(worldPath, entry.name);
-      const gitDir = path39.join(repo, ".git");
+      const repo = path40.join(worldPath, entry.name);
+      const gitDir = path40.join(repo, ".git");
       if (!fs38.existsSync(gitDir)) continue;
       try {
         const status2 = execFileSync10("git", ["status", "--porcelain"], {
@@ -26981,7 +27126,7 @@ function formatBytes3(n) {
 }
 async function executeImplode(survey, opts) {
   const exec = opts.exec ?? realExec;
-  const home = opts.olamHome ?? path39.join(os20.homedir(), ".olam");
+  const home = opts.olamHome ?? path40.join(os20.homedir(), ".olam");
   const removed = [];
   const skipped = [];
   const errors = [];
@@ -27045,7 +27190,7 @@ async function executeImplode(survey, opts) {
           skipped.push(`fs:~/.olam/auth-data (--keep-vault)`);
           continue;
         }
-        const target = path39.join(home, entry.name);
+        const target = path40.join(home, entry.name);
         try {
           fs38.rmSync(target, { recursive: true, force: true });
           removed.push(`fs:${target}`);
@@ -27220,6 +27365,11 @@ function registerEnter(program2) {
     if (worldMeta) {
       const { checkVersionPin: checkVersionPin2 } = await Promise.resolve().then(() => (init_version_pin(), version_pin_exports));
       checkVersionPin2(worldId, worldMeta.workspacePath);
+      if (worldMeta.claudeHome) {
+        console.log(
+          pc18.dim(`# claude-home: ${worldMeta.claudeHome} (per-world Claude Code instance, ADR 045)`)
+        );
+      }
     }
     const computeWorld = await ctx.computeProvider.getWorld(worldId);
     if (!computeWorld) {
@@ -27308,6 +27458,138 @@ ${pc18.dim(`Observe dispatch: docker exec -it ${containerName} tmux attach -t ol
   });
 }
 
+// src/commands/resume.ts
+init_context();
+init_output();
+import { execFileSync as execFileSync11 } from "node:child_process";
+function looksLikePrIdentifier(input2) {
+  if (/^\d+$/.test(input2.trim())) return true;
+  if (/^https?:\/\/[^\s]*\/pull\/\d+(?:[/?#].*)?$/i.test(input2.trim())) return true;
+  return false;
+}
+async function runResume(input2, deps) {
+  const trimmed = input2.trim();
+  if (trimmed.length === 0) {
+    deps.stderr("resume: argument <pr> is required (PR number, URL, or branch name).");
+    return 1;
+  }
+  let resolved;
+  try {
+    resolved = await deps.resolveInput(trimmed);
+  } catch (err) {
+    deps.stderr(
+      `resume: could not resolve "${trimmed}" via gh pr view \u2014 ` + (err instanceof Error ? err.message : String(err))
+    );
+    return 1;
+  }
+  const { branch, prNumber } = resolved;
+  const worlds = deps.listWorlds();
+  const matches2 = worlds.filter((w) => w.branch === branch);
+  const prLabel = prNumber !== void 0 ? `PR #${prNumber}` : `branch ${branch}`;
+  if (matches2.length === 0) {
+    deps.stderr(
+      `No active world found for ${prLabel} (branch ${branch}). Worlds visible via olam list.`
+    );
+    return 1;
+  }
+  if (matches2.length > 1) {
+    deps.stderr(
+      `Multiple worlds match ${prLabel} (branch ${branch}); operator decides:`
+    );
+    for (const w of matches2) {
+      deps.stderr(`  - ${w.name} (${w.id})`);
+    }
+    return 1;
+  }
+  const match2 = matches2[0];
+  deps.stdout(
+    `Found world ${match2.name} (${match2.id}) for ${prLabel}. Entering...`
+  );
+  try {
+    deps.enterWorld(match2.id);
+  } catch (err) {
+    deps.stderr(
+      `resume: olam enter ${match2.id} failed \u2014 ` + (err instanceof Error ? err.message : String(err))
+    );
+    return 1;
+  }
+  return 0;
+}
+function resolveInputViaGh(input2) {
+  if (!looksLikePrIdentifier(input2)) {
+    if (input2.length === 0) {
+      return Promise.reject(new Error("empty branch name"));
+    }
+    return Promise.resolve({ branch: input2 });
+  }
+  let stdout;
+  try {
+    stdout = execFileSync11("gh", ["pr", "view", input2, "--json", "number,headRefName"], {
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "pipe"],
+      timeout: 1e4
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return Promise.reject(new Error(`gh pr view failed: ${msg}`));
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(stdout);
+  } catch (err) {
+    return Promise.reject(
+      new Error(`gh pr view returned non-JSON output: ${err instanceof Error ? err.message : String(err)}`)
+    );
+  }
+  if (typeof parsed.headRefName !== "string" || parsed.headRefName.length === 0) {
+    return Promise.reject(new Error("gh pr view response missing headRefName"));
+  }
+  const prNumber = typeof parsed.number === "number" ? parsed.number : void 0;
+  return Promise.resolve({ branch: parsed.headRefName, prNumber });
+}
+function registerResume(program2) {
+  program2.command("resume").description(
+    "Resume a world by PR number, URL, or branch \u2014 finds the world that opened the PR and enters it."
+  ).argument("<pr>", "PR number (876), PR URL, or branch name").addHelpText(
+    "after",
+    `
+Examples:
+  $ olam resume 876
+  $ olam resume https://github.com/pleri/olam/pull/876
+  $ olam resume night/feat/foo
+`
+  ).action(async (pr) => {
+    const { ctx, error } = await loadContext();
+    if (!ctx) {
+      printError(error?.message ?? "Olam is not configured. Run `olam init` first.");
+      process.exitCode = 1;
+      return;
+    }
+    const code = await runResume(pr, {
+      resolveInput: resolveInputViaGh,
+      listWorlds: () => ctx.worldManager.listWorlds().map((w) => ({
+        id: w.id,
+        name: w.name,
+        branch: w.branch
+      })),
+      enterWorld: (worldId) => {
+        const entry = process.argv[1];
+        if (!entry) {
+          throw new Error("cannot locate CLI entry script (process.argv[1] missing)");
+        }
+        execFileSync11(process.execPath, [entry, "enter", worldId, "--exec"], {
+          stdio: "inherit"
+        });
+      },
+      stdout: (line) => console.log(line),
+      stderr: (line) => printError(line)
+    });
+    if (code !== 0) {
+      process.exitCode = code;
+    }
+  });
+}
+
 // src/commands/crystallize.ts
 init_context();
 init_output();
@@ -27573,7 +27855,7 @@ init_host_cp();
 // src/lib/plans-client.ts
 import * as fs40 from "node:fs";
 import * as os21 from "node:os";
-import * as path41 from "node:path";
+import * as path42 from "node:path";
 var PlansClientError = class extends Error {
   constructor(status2, message, body) {
     super(message);
@@ -27584,7 +27866,7 @@ var PlansClientError = class extends Error {
   status;
   body;
 };
-var OLAM_HOME4 = path41.join(os21.homedir(), ".olam");
+var OLAM_HOME4 = path42.join(os21.homedir(), ".olam");
 function readFileOrNull(p) {
   try {
     return fs40.readFileSync(p, "utf8").trim();
@@ -27593,9 +27875,9 @@ function readFileOrNull(p) {
   }
 }
 function resolveCloudConfig() {
-  const cloudUrl = process.env.OLAM_CLOUD_URL ?? readFileOrNull(path41.join(OLAM_HOME4, "cloud-url"));
+  const cloudUrl = process.env.OLAM_CLOUD_URL ?? readFileOrNull(path42.join(OLAM_HOME4, "cloud-url"));
   if (!cloudUrl) return null;
-  const bearer = process.env.OLAM_SHOWCASE_PASSWORD ?? readFileOrNull(path41.join(OLAM_HOME4, "showcase-password"));
+  const bearer = process.env.OLAM_SHOWCASE_PASSWORD ?? readFileOrNull(path42.join(OLAM_HOME4, "showcase-password"));
   if (!bearer) return null;
   return { cloudUrl: cloudUrl.replace(/\/+$/, ""), bearer };
 }
@@ -27609,13 +27891,13 @@ var PlansClient = class {
     const credentials = Buffer.from(`operator:${this.cfg.bearer}`).toString("base64");
     return `Basic ${credentials}`;
   }
-  async request(path95, init) {
+  async request(path96, init) {
     const headers = {
       Authorization: this.authHeader()
     };
     if (init.body) headers["content-type"] = "application/json";
     if (init.adminSecret) headers["X-Admin-Secret"] = init.adminSecret;
-    return fetch(`${this.cfg.cloudUrl}${path95}`, {
+    return fetch(`${this.cfg.cloudUrl}${path96}`, {
       method: init.method,
       headers,
       body: init.body ? JSON.stringify(init.body) : void 0
@@ -28987,11 +29269,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path42 = {
+var path43 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep2 = defaultPlatform === "win32" ? path42.win32.sep : path42.posix.sep;
+var sep2 = defaultPlatform === "win32" ? path43.win32.sep : path43.posix.sep;
 minimatch.sep = sep2;
 var GLOBSTAR = /* @__PURE__ */ Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -30100,11 +30382,11 @@ function zodIssueToError(issue, doc, lineCounter) {
     suggestion: deriveSuggestion(issue)
   };
 }
-function formatJsonPath(path95) {
-  if (path95.length === 0)
+function formatJsonPath(path96) {
+  if (path96.length === 0)
     return "<root>";
   let out = "";
-  for (const seg of path95) {
+  for (const seg of path96) {
     if (typeof seg === "number") {
       out += `[${seg}]`;
     } else {
@@ -30113,11 +30395,11 @@ function formatJsonPath(path95) {
   }
   return out;
 }
-function resolveYamlLocation(path95, doc, lineCounter) {
+function resolveYamlLocation(path96, doc, lineCounter) {
   let bestLine = 0;
   let bestColumn = 0;
-  for (let depth = path95.length; depth >= 0; depth -= 1) {
-    const segment = path95.slice(0, depth);
+  for (let depth = path96.length; depth >= 0; depth -= 1) {
+    const segment = path96.slice(0, depth);
     try {
       const node = doc.getIn(segment, true);
       if (node && typeof node === "object" && "range" in node) {
@@ -30335,11 +30617,11 @@ function topoSort(nodes) {
 }
 function traceCycle(start, byId) {
   const seen = /* @__PURE__ */ new Set();
-  const path95 = [];
+  const path96 = [];
   let current = start;
   while (current && !seen.has(current)) {
     seen.add(current);
-    path95.push(current);
+    path96.push(current);
     const node = byId.get(current);
     const next = node?.dependsOn[0];
     if (next === void 0)
@@ -30347,10 +30629,10 @@ function traceCycle(start, byId) {
     current = next;
   }
   if (current && seen.has(current)) {
-    const idx = path95.indexOf(current);
-    return [...path95.slice(idx), current];
+    const idx = path96.indexOf(current);
+    return [...path96.slice(idx), current];
   }
-  return path95;
+  return path96;
 }
 
 // ../core/dist/executor/types.js
@@ -30574,11 +30856,11 @@ async function resolveDigests(lockfile, resolver) {
 }
 
 // ../core/dist/worldspec/image-digest.js
-import { execFileSync as execFileSync11 } from "node:child_process";
+import { execFileSync as execFileSync12 } from "node:child_process";
 var DOCKER_SUBPROCESS_TIMEOUT_MS = 3e4;
 var dockerDigestResolver = async (image, source) => {
   if (source === "local") {
-    const out = execFileSync11("docker", ["inspect", image, "--format", "{{.Id}}"], {
+    const out = execFileSync12("docker", ["inspect", image, "--format", "{{.Id}}"], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "pipe"],
       timeout: DOCKER_SUBPROCESS_TIMEOUT_MS,
@@ -30589,7 +30871,7 @@ var dockerDigestResolver = async (image, source) => {
     }
     return out;
   }
-  const raw = execFileSync11("docker", ["buildx", "imagetools", "inspect", image], {
+  const raw = execFileSync12("docker", ["buildx", "imagetools", "inspect", image], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "pipe"],
     timeout: DOCKER_SUBPROCESS_TIMEOUT_MS,
@@ -32250,7 +32532,7 @@ function registerWorldspec(program2) {
 init_output();
 init_host_cp();
 import * as fs43 from "node:fs";
-import * as path45 from "node:path";
+import * as path46 from "node:path";
 import { spawnSync as spawnSync22 } from "node:child_process";
 import ora9 from "ora";
 import pc21 from "picocolors";
@@ -32258,9 +32540,9 @@ import pc21 from "picocolors";
 // src/commands/upgrade-lock.ts
 import * as fs41 from "node:fs";
 import * as os22 from "node:os";
-import * as path43 from "node:path";
+import * as path44 from "node:path";
 import { spawnSync as spawnSync21 } from "node:child_process";
-var LOCK_FILE_PATH = path43.join(os22.homedir(), ".olam", ".upgrade.lock");
+var LOCK_FILE_PATH = path44.join(os22.homedir(), ".olam", ".upgrade.lock");
 var STALE_LOCK_TIMEOUT_MS = 5 * 60 * 1e3;
 function readLockFile(lockPath) {
   try {
@@ -32310,7 +32592,7 @@ function isStaleLock(content, nowMs = Date.now()) {
   return false;
 }
 function acquireLock(lockPath = LOCK_FILE_PATH, nowMs = Date.now()) {
-  const dir = path43.dirname(lockPath);
+  const dir = path44.dirname(lockPath);
   fs41.mkdirSync(dir, { recursive: true });
   for (let attempt = 0; attempt < 2; attempt++) {
     try {
@@ -32373,15 +32655,15 @@ function formatRefusalMessage(result, lockPath = LOCK_FILE_PATH) {
 // src/commands/upgrade-log.ts
 import * as fs42 from "node:fs";
 import * as os23 from "node:os";
-import * as path44 from "node:path";
+import * as path45 from "node:path";
 function getUpgradeLogPath() {
   const home = process.env["HOME"] ?? os23.homedir();
-  return path44.join(home, ".olam", "upgrade.log");
+  return path45.join(home, ".olam", "upgrade.log");
 }
 var UPGRADE_LOG_PATH = getUpgradeLogPath();
 function appendUpgradeLog(row, logPath = getUpgradeLogPath()) {
   try {
-    fs42.mkdirSync(path44.dirname(logPath), { recursive: true });
+    fs42.mkdirSync(path45.dirname(logPath), { recursive: true });
     const line = JSON.stringify(row) + "\n";
     fs42.appendFileSync(logPath, line, { mode: 420 });
   } catch (err) {
@@ -32488,8 +32770,8 @@ init_protocol_version();
 init_install_root();
 var AUTH_HEALTH_URL2 = "http://127.0.0.1:9999/health";
 function isNodeModulesInSync(cwd) {
-  const lockPath = path45.join(cwd, "package-lock.json");
-  const markerPath = path45.join(cwd, "node_modules", ".package-lock.json");
+  const lockPath = path46.join(cwd, "package-lock.json");
+  const markerPath = path46.join(cwd, "node_modules", ".package-lock.json");
   if (!fs43.existsSync(lockPath) || !fs43.existsSync(markerPath)) return false;
   try {
     const lockStat = fs43.statSync(lockPath);
@@ -32509,7 +32791,7 @@ function shouldSkipInstall(opts, cwd) {
   return { skip: false };
 }
 function validateRepoRoot(cwd) {
-  const marker = path45.join(cwd, "packages/host-cp/compose.yaml");
+  const marker = path46.join(cwd, "packages/host-cp/compose.yaml");
   if (!fs43.existsSync(marker)) {
     return {
       ok: false,
@@ -32870,7 +33152,7 @@ async function recreateAuthService() {
   }
 }
 function readBundleHash(cwd) {
-  const indexPath = path45.join(cwd, "packages/control-plane/public/index.html");
+  const indexPath = path46.join(cwd, "packages/control-plane/public/index.html");
   if (!fs43.existsSync(indexPath)) return null;
   return extractBundleHash(fs43.readFileSync(indexPath, "utf-8"));
 }
@@ -33476,7 +33758,7 @@ ${buildResult.stderr}`);
     return;
   }
   const authSecret = readAuthSecret2();
-  const spaDir = path45.join(cwd, "packages/control-plane/app");
+  const spaDir = path46.join(cwd, "packages/control-plane/app");
   const spaResult = runStep2(
     "vite build (SPA)",
     "npx",
@@ -34019,13 +34301,13 @@ ${pc23.dim(`world: ${worldId}  sort: ${sortKey}  refresh: 5s  Ctrl-C to exit`)}
 init_output();
 import * as fs44 from "node:fs";
 import * as os24 from "node:os";
-import * as path46 from "node:path";
+import * as path47 from "node:path";
 import YAML6 from "yaml";
 function olamHome3() {
-  return process.env.OLAM_HOME ?? path46.join(os24.homedir(), ".olam");
+  return process.env.OLAM_HOME ?? path47.join(os24.homedir(), ".olam");
 }
 function keysFilePath() {
-  return path46.join(olamHome3(), "keys.yaml");
+  return path47.join(olamHome3(), "keys.yaml");
 }
 function readKeysFile() {
   const filePath = keysFilePath();
@@ -34121,7 +34403,7 @@ function registerKeys(program2) {
 init_snapshot();
 init_output();
 import * as fs45 from "node:fs";
-import * as path47 from "node:path";
+import * as path48 from "node:path";
 import { execSync as execSync11 } from "node:child_process";
 import pc24 from "picocolors";
 
@@ -34144,9 +34426,9 @@ function emitDeprecationWarning(subcommand) {
 }
 function bumpDeprecationCounter() {
   if (process.env[INTERNAL_SENTINEL_ENV] === "1") return;
-  const counterPath = path47.join(snapshotsDir(), ".deprecation-counter");
+  const counterPath = path48.join(snapshotsDir(), ".deprecation-counter");
   try {
-    fs45.mkdirSync(path47.dirname(counterPath), { recursive: true });
+    fs45.mkdirSync(path48.dirname(counterPath), { recursive: true });
     let current = 0;
     if (fs45.existsSync(counterPath)) {
       const raw = fs45.readFileSync(counterPath, "utf-8").trim();
@@ -34229,13 +34511,13 @@ function resolveKinds(arg) {
   return [];
 }
 async function captureGems(worldId, workspacePath, repo) {
-  const repoDir = path47.join(workspacePath, repo);
+  const repoDir = path48.join(workspacePath, repo);
   const fingerprint = computeGemsFingerprint(repoDir);
   if (!fingerprint) {
     return { ok: false, tarPath: "", msg: "no Gemfile.lock \u2014 layer does not apply" };
   }
   const tarPath = snapshotTarPath(worldId, "gems", repo, fingerprint);
-  const vendorBundle = path47.join(repoDir, "vendor", "bundle");
+  const vendorBundle = path48.join(repoDir, "vendor", "bundle");
   if (fs45.existsSync(vendorBundle)) {
     try {
       packTarball(vendorBundle, tarPath);
@@ -34272,7 +34554,7 @@ async function captureGems(worldId, workspacePath, repo) {
       `docker exec ${containerName} sh -c 'mkdir -p "$(dirname ${tmpTar})" && tar -czf ${tmpTar}.tmp -C ${bundlePath} . && mv ${tmpTar}.tmp ${tmpTar}'`,
       { stdio: "pipe", timeout: 12e4 }
     );
-    fs45.mkdirSync(path47.dirname(tarPath), { recursive: true });
+    fs45.mkdirSync(path48.dirname(tarPath), { recursive: true });
     execSync11(`docker cp ${containerName}:${tmpTar} "${tarPath}"`, { stdio: "pipe", timeout: 12e4 });
     execSync11(`docker exec ${containerName} rm -f ${tmpTar}`, { stdio: "pipe" });
     const stat = fs45.statSync(tarPath);
@@ -34292,12 +34574,12 @@ async function captureGems(worldId, workspacePath, repo) {
   }
 }
 async function captureNode(worldId, workspacePath, repo) {
-  const repoDir = path47.join(workspacePath, repo);
+  const repoDir = path48.join(workspacePath, repo);
   const fingerprint = computeNodeFingerprint(repoDir);
   if (!fingerprint) {
     return { ok: false, tarPath: "", msg: "no lockfile \u2014 layer does not apply" };
   }
-  const nodeModules = path47.join(repoDir, "node_modules");
+  const nodeModules = path48.join(repoDir, "node_modules");
   if (!fs45.existsSync(nodeModules)) {
     return { ok: false, tarPath: "", msg: "node_modules not installed yet" };
   }
@@ -34321,7 +34603,7 @@ async function captureNode(worldId, workspacePath, repo) {
   }
 }
 async function capturePg(worldId, workspacePath, repoNames) {
-  const repoDirs = repoNames.map((r) => path47.join(workspacePath, r));
+  const repoDirs = repoNames.map((r) => path48.join(workspacePath, r));
   const fingerprint = computePgFingerprint(repoDirs);
   if (!fingerprint) {
     return { ok: false, tarPath: "", msg: "no Gemfile.lock / schema.rb \u2014 layer does not apply" };
@@ -34336,9 +34618,9 @@ async function capturePg(worldId, workspacePath, repoNames) {
   }
   try {
     execSync11(`docker stop ${containerName}`, { stdio: "pipe", timeout: 3e4 });
-    fs45.mkdirSync(path47.dirname(tarPath), { recursive: true });
+    fs45.mkdirSync(path48.dirname(tarPath), { recursive: true });
     execSync11(
-      `docker run --rm         -v "${volumeName2}:/pgdata:ro"         -v "${path47.dirname(tarPath)}:/dest"         alpine         sh -c 'tar -czf /dest/${path47.basename(tarPath)}.tmp -C /pgdata . && mv /dest/${path47.basename(tarPath)}.tmp /dest/${path47.basename(tarPath)}'`,
+      `docker run --rm         -v "${volumeName2}:/pgdata:ro"         -v "${path48.dirname(tarPath)}:/dest"         alpine         sh -c 'tar -czf /dest/${path48.basename(tarPath)}.tmp -C /pgdata . && mv /dest/${path48.basename(tarPath)}.tmp /dest/${path48.basename(tarPath)}'`,
       { stdio: "pipe", timeout: 18e4 }
     );
     execSync11(`docker start ${containerName}`, { stdio: "pipe", timeout: 3e4 });
@@ -34373,7 +34655,7 @@ async function handleEvict(opts) {
     const allTars = [];
     const walk3 = (d) => {
       for (const entry of fs45.readdirSync(d, { withFileTypes: true })) {
-        const full = path47.join(d, entry.name);
+        const full = path48.join(d, entry.name);
         if (entry.isDirectory()) {
           walk3(full);
         } else if (entry.name.endsWith(".tar.gz")) {
@@ -34472,33 +34754,33 @@ init_context();
 init_output();
 import * as fs47 from "node:fs";
 import * as os25 from "node:os";
-import * as path49 from "node:path";
+import * as path50 from "node:path";
 import { spawnSync as spawnSync24 } from "node:child_process";
 import ora10 from "ora";
 
 // src/commands/refresh-helpers.ts
 import * as fs46 from "node:fs";
-import * as path48 from "node:path";
+import * as path49 from "node:path";
 function collectCpSourceFiles(standaloneDir) {
   if (!fs46.existsSync(standaloneDir)) {
     throw new Error(`CP standalone dir not found: ${standaloneDir}`);
   }
   const entries = [];
   const topLevel = fs46.readdirSync(standaloneDir).filter((f) => {
-    const stat = fs46.statSync(path48.join(standaloneDir, f));
+    const stat = fs46.statSync(path49.join(standaloneDir, f));
     return stat.isFile() && f.endsWith(".mjs") && !f.endsWith(".test.mjs");
   }).sort();
   for (const f of topLevel) {
-    entries.push({ srcPath: path48.join(standaloneDir, f), destRelPath: f });
+    entries.push({ srcPath: path49.join(standaloneDir, f), destRelPath: f });
   }
-  const libDir = path48.join(standaloneDir, "lib");
+  const libDir = path49.join(standaloneDir, "lib");
   if (fs46.existsSync(libDir) && fs46.statSync(libDir).isDirectory()) {
     const libFiles = fs46.readdirSync(libDir).filter((f) => {
-      const stat = fs46.statSync(path48.join(libDir, f));
+      const stat = fs46.statSync(path49.join(libDir, f));
       return stat.isFile() && f.endsWith(".mjs") && !f.endsWith(".test.mjs");
     }).sort();
     for (const f of libFiles) {
-      entries.push({ srcPath: path48.join(libDir, f), destRelPath: `lib/${f}` });
+      entries.push({ srcPath: path49.join(libDir, f), destRelPath: `lib/${f}` });
     }
   }
   return entries;
@@ -34557,15 +34839,15 @@ async function refreshWorld(worldId, portOffset, standaloneDir, opts) {
     };
   }
   const stagingDir = fs47.mkdtempSync(
-    path49.join(os25.tmpdir(), `olam-refresh-${worldId}-`)
+    path50.join(os25.tmpdir(), `olam-refresh-${worldId}-`)
   );
   try {
     const hasLib = entries.some((e) => e.destRelPath.startsWith("lib/"));
     if (hasLib) {
-      fs47.mkdirSync(path49.join(stagingDir, "lib"), { recursive: true });
+      fs47.mkdirSync(path50.join(stagingDir, "lib"), { recursive: true });
     }
     for (const { srcPath, destRelPath } of entries) {
-      fs47.copyFileSync(srcPath, path49.join(stagingDir, destRelPath));
+      fs47.copyFileSync(srcPath, path50.join(stagingDir, destRelPath));
     }
     const cpResult = docker([
       "cp",
@@ -34617,7 +34899,7 @@ function registerRefresh(program2) {
       process.exitCode = 1;
       return;
     }
-    const standaloneDir = path49.join(
+    const standaloneDir = path50.join(
       process.cwd(),
       "packages/control-plane/standalone"
     );
@@ -34785,8 +35067,8 @@ function registerRestart(program2) {
 // src/commands/diagnose.ts
 import * as fs48 from "node:fs";
 import * as os26 from "node:os";
-import * as path50 from "node:path";
-import { execFileSync as execFileSync12, execSync as execSync12 } from "node:child_process";
+import * as path51 from "node:path";
+import { execFileSync as execFileSync13, execSync as execSync12 } from "node:child_process";
 import pc25 from "picocolors";
 
 // ../core/dist/diagnose/secret-stripper.js
@@ -34820,9 +35102,9 @@ function stripSecrets(input2) {
 }
 
 // src/commands/diagnose.ts
-var DIAGNOSTICS_DIR = path50.join(os26.homedir(), ".olam", "diagnostics");
-var LOG_DIR = path50.join(os26.homedir(), ".olam", "log");
-var CACHE_DIR = path50.join(os26.homedir(), ".olam", "cache");
+var DIAGNOSTICS_DIR = path51.join(os26.homedir(), ".olam", "diagnostics");
+var LOG_DIR = path51.join(os26.homedir(), ".olam", "log");
+var CACHE_DIR = path51.join(os26.homedir(), ".olam", "cache");
 var LOG_TAIL_LINES = 200;
 function safeExec(cmd) {
   try {
@@ -34832,12 +35114,12 @@ function safeExec(cmd) {
   }
 }
 function defaultZip(zipPath, files) {
-  execFileSync12("zip", ["-j", zipPath, ...files]);
+  execFileSync13("zip", ["-j", zipPath, ...files]);
 }
 async function buildDiagnosticsZip(_exec = (cmd) => safeExec(cmd), _outDir = DIAGNOSTICS_DIR, _logDir = LOG_DIR, _zip = defaultZip) {
   const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 23);
-  const zipPath = path50.join(_outDir, `olam-diag-${ts}.zip`);
-  const tmpDir = fs48.mkdtempSync(path50.join(os26.tmpdir(), "olam-diag-"));
+  const zipPath = path51.join(_outDir, `olam-diag-${ts}.zip`);
+  const tmpDir = fs48.mkdtempSync(path51.join(os26.tmpdir(), "olam-diag-"));
   try {
     fs48.mkdirSync(_outDir, { recursive: true });
     const entries = [];
@@ -34855,7 +35137,7 @@ platform: ${platform2}
       `uptime: ${os26.uptime()}s`
     ].join("\n") + "\n";
     _writeEntry(tmpDir, "os-info.txt", stripSecrets(osContent), entries);
-    const depsFile = path50.join(CACHE_DIR, "deps.json");
+    const depsFile = path51.join(CACHE_DIR, "deps.json");
     if (fs48.existsSync(depsFile)) {
       const deps = fs48.readFileSync(depsFile, "utf-8");
       _writeEntry(tmpDir, "deps.json", stripSecrets(deps), entries);
@@ -34874,7 +35156,7 @@ platform: ${platform2}
     if (authAudit) {
       _writeEntry(tmpDir, "audit-auth-callers.txt", stripSecrets(authAudit), entries);
     }
-    const fileArgs = entries.map((e) => path50.join(tmpDir, e));
+    const fileArgs = entries.map((e) => path51.join(tmpDir, e));
     try {
       _zip(zipPath, fileArgs);
     } catch (err) {
@@ -34892,17 +35174,17 @@ platform: ${platform2}
   }
 }
 function _writeEntry(dir, name, content, entries) {
-  fs48.writeFileSync(path50.join(dir, name), content, { mode: 420 });
+  fs48.writeFileSync(path51.join(dir, name), content, { mode: 420 });
   entries.push(name);
 }
 function _latestLog(logDir) {
   if (!fs48.existsSync(logDir)) return null;
   const files = fs48.readdirSync(logDir).filter((f) => f.startsWith("host-")).sort().reverse();
-  return files.length > 0 ? path50.join(logDir, files[0]) : null;
+  return files.length > 0 ? path51.join(logDir, files[0]) : null;
 }
 async function buildTelemetryPayload() {
   const channel = "stable";
-  const manifestFile = path50.join(CACHE_DIR, "manifest.json");
+  const manifestFile = path51.join(CACHE_DIR, "manifest.json");
   let manifestAgeHours = null;
   if (fs48.existsSync(manifestFile)) {
     const mtime = fs48.statSync(manifestFile).mtime.getTime();
@@ -35057,8 +35339,8 @@ function checkWorld(container, hostShas, dockerExec) {
     const m = shaLine.match(/^([a-f0-9]{64})\s+(.+)$/);
     if (!m) continue;
     const sha = m[1];
-    const path95 = m[2];
-    const filename = path95?.split("/").pop();
+    const path96 = m[2];
+    const filename = path96?.split("/").pop();
     if (!filename) continue;
     const mtimeSecs = parseInt(mtimeLine.trim(), 10);
     if (Number.isNaN(mtimeSecs) || !sha) continue;
@@ -35106,28 +35388,28 @@ function resolveRepoRootBestEffort() {
 init_output();
 import * as fs50 from "node:fs";
 import * as net4 from "node:net";
-import * as path52 from "node:path";
+import * as path53 from "node:path";
 import * as os27 from "node:os";
 
 // src/commands/hermes-kg-hook.ts
 import * as fs49 from "node:fs";
-import * as path51 from "node:path";
+import * as path52 from "node:path";
 import { createHash as createHash5 } from "node:crypto";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 var HERMES_KG_HOOK_SENTINEL = "OLAM_KG_HOOK";
 function bundleDir() {
   const thisFile = fileURLToPath6(import.meta.url);
-  return path51.resolve(path51.dirname(thisFile), "..", "..", "hermes-bundle");
+  return path52.resolve(path52.dirname(thisFile), "..", "..", "hermes-bundle");
 }
 function templateContent() {
-  const templatePath = path51.join(bundleDir(), "kg-first.sh");
+  const templatePath = path52.join(bundleDir(), "kg-first.sh");
   return fs49.readFileSync(templatePath);
 }
 function sha256(buf) {
   return createHash5("sha256").update(buf).digest("hex");
 }
 function installKgFirstHookForHermes(hooksDir, dryRun) {
-  const destPath2 = path51.join(hooksDir, "kg-first.sh");
+  const destPath2 = path52.join(hooksDir, "kg-first.sh");
   const template = templateContent();
   if (fs49.existsSync(destPath2)) {
     const existing = fs49.readFileSync(destPath2);
@@ -35203,7 +35485,7 @@ async function runDoctor(opts, deps = {}) {
   if (isK8s) {
     const wrapImpl = deps.kubectlWrapImpl ?? kubectlWrap;
     const k8sCtx = deps.kubectlContext;
-    const manifestsDir = deps.manifestsDir ?? path52.join(OLAM_HOME, "k8s", "manifests");
+    const manifestsDir = deps.manifestsDir ?? path53.join(OLAM_HOME, "k8s", "manifests");
     const readFileSyncImpl = deps.readFileSyncImpl ?? fs50.readFileSync;
     const sortedPeripherals = [...PERIPHERALS].sort((a, b) => a.name.localeCompare(b.name));
     let peripheralPosition = 14;
@@ -35340,7 +35622,7 @@ async function probeStorageClassMatch(peripherals, kubectlContext, manifestsDir,
   const ctxArgs = kubectlContext ? ["--context", kubectlContext] : [];
   const mismatches = [];
   for (const peripheral of peripherals) {
-    const pvcManifestPath = path52.join(manifestsDir, peripheral.name, "45-pvc.yaml");
+    const pvcManifestPath = path53.join(manifestsDir, peripheral.name, "45-pvc.yaml");
     let declaredClass;
     try {
       const raw = readFileSyncImpl(pvcManifestPath, "utf8");
@@ -35453,7 +35735,7 @@ function probeNodeMemory(dockerExec, kubectlContext) {
 function defaultResolveHostSideProxyComposePath() {
   const root = resolveK8sAssetsRoot();
   if (root === null) return null;
-  const candidate = path52.join(root, "host-side", "docker-socket-proxy.compose.yaml");
+  const candidate = path53.join(root, "host-side", "docker-socket-proxy.compose.yaml");
   return fs50.existsSync(candidate) ? candidate : null;
 }
 async function defaultDockerSocketCheck(composePath) {
@@ -35590,8 +35872,8 @@ function renderHuman(report) {
   }
 }
 function probeHermesIntegration(hermesDir) {
-  const configPath = path52.join(hermesDir, "config.yaml");
-  const hookPath = path52.join(hermesDir, "hooks", "kg-first.sh");
+  const configPath = path53.join(hermesDir, "config.yaml");
+  const hookPath = path53.join(hermesDir, "hooks", "kg-first.sh");
   const issues = [];
   if (!fs50.existsSync(configPath)) {
     issues.push("~/.hermes/config.yaml not found");
@@ -35632,7 +35914,7 @@ function registerDoctor(program2) {
   program2.command("doctor").description(
     "Pass/fail host-health check. Exits 0 on a healthy host (including WARN-only); 1 on any FAIL probe. Auto-detects substrate from ~/.olam/config.yaml (host.substrate) \u2014 runs 28 probes on kubernetes, 7 on docker/compose. Override with OLAM_HOST_CP_ENGINE env var."
   ).option("--json", "emit the report as JSON instead of a human-readable table").action(async (opts) => {
-    const hermesDir = path52.join(os27.homedir(), ".hermes");
+    const hermesDir = path53.join(os27.homedir(), ".hermes");
     const r = await runDoctor(opts, {
       // Pass hermesHomeOverride so the probe fires when ~/.hermes/ exists.
       // When the dir is absent the probe is skipped; when present it WARNs
@@ -35907,7 +36189,7 @@ function registerSubstrate(program2) {
 
 // ../cli-plugin-tasks/dist/client.js
 import { readFileSync as readFileSync46 } from "node:fs";
-import { homedir as homedir30 } from "node:os";
+import { homedir as homedir31 } from "node:os";
 import { join as join61 } from "node:path";
 var TasksClient = class {
   baseUrl;
@@ -35916,7 +36198,7 @@ var TasksClient = class {
   sessionId;
   constructor(opts) {
     this.baseUrl = (opts.hostCpUrl ?? process.env.OLAM_HOST_CP_URL ?? "http://localhost:19000").replace(/\/$/, "");
-    const tokenPath2 = opts.tokenPath ?? join61(homedir30(), ".olam", "host-cp.token");
+    const tokenPath2 = opts.tokenPath ?? join61(homedir31(), ".olam", "host-cp.token");
     try {
       this.token = readFileSync46(tokenPath2, "utf8").trim();
     } catch (e) {
@@ -35925,9 +36207,9 @@ var TasksClient = class {
     this.olamNodeId = opts.olamNodeId;
     this.sessionId = opts.sessionId;
   }
-  async call(method, path95, scopes, body, query) {
+  async call(method, path96, scopes, body, query) {
     const qs = query ? "?" + new URLSearchParams(Object.entries(query).filter(([, v]) => v !== void 0)).toString() : "";
-    const url2 = `${this.baseUrl}${path95}${qs}`;
+    const url2 = `${this.baseUrl}${path96}${qs}`;
     const res = await fetch(url2, {
       method,
       headers: {
@@ -35978,8 +36260,8 @@ function parseFrontmatter2(raw) {
   }
   return { frontmatter: fm, body };
 }
-function parseTracker(path95) {
-  const raw = readFileSync47(path95, "utf8");
+function parseTracker(path96) {
+  const raw = readFileSync47(path96, "utf8");
   const { frontmatter, body } = parseFrontmatter2(raw);
   const lines = body.split("\n");
   const tasks = [];
@@ -36216,8 +36498,8 @@ function registerTasks(program2) {
 `);
     }
   });
-  tasks.command("sync-tracker <path>").description("Parse /10x:commit-plan tracker.md + upsert each task via POST /api/tasks (B2.4; dual-emit pattern, olam-side per cross-ownership decoupling)").option("--node-id <uuid>", "Olam node ID").option("--session-id <uuid>", "Session ID").option("--dry-run", "Parse + print task records; do not POST").option("--json", "Output raw JSON envelope").action(async (path95, opts) => {
-    const parsed = parseTracker(path95);
+  tasks.command("sync-tracker <path>").description("Parse /10x:commit-plan tracker.md + upsert each task via POST /api/tasks (B2.4; dual-emit pattern, olam-side per cross-ownership decoupling)").option("--node-id <uuid>", "Olam node ID").option("--session-id <uuid>", "Session ID").option("--dry-run", "Parse + print task records; do not POST").option("--json", "Output raw JSON envelope").action(async (path96, opts) => {
+    const parsed = parseTracker(path96);
     if (opts.dryRun) {
       process.stdout.write(JSON.stringify(parsed, null, 2) + "\n");
       return;
@@ -36371,15 +36653,76 @@ function registerCompletion(program2) {
 // src/commands/setup.ts
 init_cli_version();
 init_health_probes();
-import { spawn as spawn7, spawnSync as spawnSync26 } from "node:child_process";
+import { spawn as spawn7, spawnSync as spawnSync27 } from "node:child_process";
 import { existsSync as existsSync85, readFileSync as readFileSync70 } from "node:fs";
-import { homedir as homedir44 } from "node:os";
-import path76 from "node:path";
+import { homedir as homedir45 } from "node:os";
+import path77 from "node:path";
 import { createInterface as createInterface3 } from "node:readline";
 
+// src/lib/k8s-context-discovery.ts
+import { spawnSync as spawnSync26 } from "node:child_process";
+var OLAM_MANAGED_CONTEXT_PREFIX = "k3d-olam-";
+function isOlamManagedContext(name) {
+  return name.startsWith(OLAM_MANAGED_CONTEXT_PREFIX);
+}
+function defaultGetContexts() {
+  const r = spawnSync26(
+    "kubectl",
+    ["config", "get-contexts", "-o", "name"],
+    { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }
+  );
+  if (r.status !== 0 || !r.stdout) return [];
+  return r.stdout.split("\n").map((l) => l.trim()).filter(Boolean);
+}
+function defaultClusterInfo(context) {
+  const r = spawnSync26(
+    "kubectl",
+    ["--context", context, "cluster-info", "--request-timeout=3s"],
+    { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }
+  );
+  if (r.status === 0) {
+    const match2 = r.stdout.match(/running at (https?:\/\/\S+)/i);
+    return { reachable: true, serverUrl: match2?.[1] };
+  }
+  const err = (r.stderr || "").trim().slice(0, 200);
+  return { reachable: false, error: err || "cluster-info failed" };
+}
+function defaultIsIdle(context) {
+  const nsResult = spawnSync26(
+    "kubectl",
+    ["--context", context, "get", "namespace", "olam", "--ignore-not-found", "-o", "name"],
+    { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }
+  );
+  const nsLine = (nsResult.stdout || "").trim();
+  if (!nsLine) {
+    return true;
+  }
+  const podsResult = spawnSync26(
+    "kubectl",
+    ["--context", context, "get", "pods", "-n", "olam", "--no-headers"],
+    { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] }
+  );
+  const podsOut = (podsResult.stdout || "").trim();
+  return !podsOut || /no resources found/i.test(podsOut);
+}
+function discoverOfferableContexts(deps = {}) {
+  const getContextsFn = deps.getContexts ?? defaultGetContexts;
+  const clusterInfoFn = deps.clusterInfo ?? defaultClusterInfo;
+  const isIdleFn = deps.isIdle ?? defaultIsIdle;
+  const allContexts = getContextsFn();
+  const offerable = [];
+  for (const ctx of allContexts) {
+    if (isOlamManagedContext(ctx)) continue;
+    const probe2 = clusterInfoFn(ctx);
+    if (!probe2.reachable) continue;
+    if (isIdleFn(ctx)) offerable.push(ctx);
+  }
+  return { offerable, allContexts };
+}
+
 // src/lib/shell-rc.ts
 import { copyFileSync as copyFileSync5, existsSync as existsSync60, readFileSync as readFileSync48, renameSync as renameSync8, writeFileSync as writeFileSync29 } from "node:fs";
-import path53 from "node:path";
+import path54 from "node:path";
 function appendIdempotent(opts) {
   const { rcPath, marker, contentLine, clock = () => /* @__PURE__ */ new Date() } = opts;
   if (!existsSync60(rcPath)) {
@@ -36402,9 +36745,9 @@ function appendIdempotent(opts) {
 }
 function resolveShellRc(home, shellEnv) {
   if (!shellEnv) return null;
-  const basename16 = path53.basename(shellEnv);
-  if (basename16 === "zsh") return path53.join(home, ".zshrc");
-  if (basename16 === "bash") return path53.join(home, ".bashrc");
+  const basename16 = path54.basename(shellEnv);
+  if (basename16 === "zsh") return path54.join(home, ".zshrc");
+  if (basename16 === "bash") return path54.join(home, ".bashrc");
   return null;
 }
 
@@ -36563,8 +36906,8 @@ async function pickSkillSourcePhase(opts, deps) {
 }
 
 // src/commands/setup-phase-5b-project-sweep.ts
-import { homedir as homedir43 } from "node:os";
-import * as path75 from "node:path";
+import { homedir as homedir44 } from "node:os";
+import * as path76 from "node:path";
 import * as fs75 from "node:fs";
 async function loadWalkFn() {
   const m = await Promise.resolve().then(() => (init_project_sweep(), project_sweep_exports));
@@ -36583,9 +36926,9 @@ async function loadAppendTrustAuditFn() {
   return m.appendTrustAudit;
 }
 function deriveRepoName(repoPath, existingNames) {
-  const base = path75.basename(repoPath).toLowerCase().replace(/[^a-z0-9-]/g, "-");
+  const base = path76.basename(repoPath).toLowerCase().replace(/[^a-z0-9-]/g, "-");
   if (!existingNames.has(base)) return base;
-  const parent = path75.basename(path75.dirname(repoPath)).toLowerCase().replace(/[^a-z0-9-]/g, "-");
+  const parent = path76.basename(path76.dirname(repoPath)).toLowerCase().replace(/[^a-z0-9-]/g, "-");
   const composite = `${parent}-${base}`;
   if (!existingNames.has(composite)) return composite;
   let suffix = 2;
@@ -36596,8 +36939,8 @@ async function runProjectSweepPhase(opts, deps, sweepDeps = {}) {
   if (opts.skipProjectSweep) {
     return { ok: true, skipped: true, message: "skipped via --skip-project-sweep" };
   }
-  const home = deps.home ?? homedir43();
-  const projectsRoot = opts.projects ?? path75.join(home, "Projects");
+  const home = deps.home ?? homedir44();
+  const projectsRoot = opts.projects ?? path76.join(home, "Projects");
   const existsSyncFn = sweepDeps.existsSync ?? fs75.existsSync;
   if (!existsSyncFn(projectsRoot)) {
     return {
@@ -36771,6 +37114,67 @@ function resolveSubstrate(opts, deps) {
   }
   return "kubernetes";
 }
+async function phase0_5DetectExistingContext(substrate, opts, deps) {
+  if (substrate !== "kubernetes") {
+    return { ok: true, skipped: true, message: "no-op for docker substrate" };
+  }
+  if (opts.reuseCluster) {
+    const name = opts.reuseCluster;
+    const clusterInfoFn = deps.kubectlClusterInfo ?? defaultClusterInfo;
+    const probe2 = clusterInfoFn(name);
+    if (!probe2.reachable) {
+      return {
+        ok: false,
+        message: `--reuse-cluster=${name} but context is not reachable: ${probe2.error ?? "unknown error"}`,
+        remedy: `Verify the context exists (\`kubectl config get-contexts\`) and is reachable (\`kubectl --context=${name} cluster-info\`), then re-run \`olam setup --reuse-cluster=${name}\`.`,
+        reuseContext: void 0
+      };
+    }
+    return {
+      ok: true,
+      message: `will reuse context ${name}${probe2.serverUrl ? ` (${probe2.serverUrl})` : ""}`,
+      reuseContext: name
+    };
+  }
+  const { offerable } = discoverOfferableContexts(deps.kubeContextDeps);
+  if (offerable.length === 0) {
+    return {
+      ok: true,
+      skipped: true,
+      message: "no idle reachable contexts detected; will provision k3d cluster"
+    };
+  }
+  if (opts.yes) {
+    process.stdout.write(
+      `  Detected ${offerable.length} existing Kubernetes context(s): ${offerable.join(", ")}. To reuse one, pass --reuse-cluster=<name>. Provisioning k3d (--yes default).
+`
+    );
+    return {
+      ok: true,
+      skipped: true,
+      message: `idle context(s) available but --yes defaults to k3d provision; use --reuse-cluster=<name> to opt in`
+    };
+  }
+  const promptFn = deps.prompt ?? defaultPrompt;
+  for (const ctx of offerable) {
+    const reuse = await promptFn(
+      `Detected existing Kubernetes context \`${ctx}\`. Use this cluster instead of provisioning a new k3d cluster?`,
+      false
+    );
+    if (reuse) {
+      return {
+        ok: true,
+        message: `operator chose to reuse context ${ctx}`,
+        reuseContext: ctx
+      };
+    }
+  }
+  return {
+    ok: true,
+    skipped: true,
+    message: "operator declined reuse; will provision k3d cluster"
+  };
+}
 async function phase1SystemCheck(substrate, deps) {
   const nodeVersion = deps.nodeVersion ?? process.version;
   const nodeMajor = parseNodeMajor(nodeVersion);
@@ -36795,6 +37199,13 @@ async function phase1SystemCheck(substrate, deps) {
         remedy: `Install Node.js ${REQUIRED_NODE_MAJOR}+ LTS via nvm/fnm/asdf and re-run \`olam setup\`.`
       };
     }
+    const platform2 = String(deps.osPlatform ?? process.platform);
+    const home = deps.home ?? homedir45();
+    const colimaLint = probeColimaKubernetesEnabled({ platform: platform2, home });
+    if (colimaLint.ok && "warn" in colimaLint && colimaLint.warn === true) {
+      const lintWithWarn = colimaLint;
+      printWarning(`  \u26A0 ${lintWithWarn.remedy}`);
+    }
     return { ok: true, message: `kubectl on PATH; docker ready; node ${nodeVersion}` };
   }
   const dockerProbe = await probeDockerDaemon(deps.dockerExec);
@@ -36817,17 +37228,24 @@ async function phase1SystemCheck(substrate, deps) {
     message: `${dockerProbe.message}; ${composeProbe.message}; node ${nodeVersion}`
   };
 }
-async function phase1_5InstallSubstrate(substrate, opts, deps) {
+async function phase1_5InstallSubstrate(substrate, opts, deps, reuseContext) {
   if (substrate === "docker") {
     return { ok: true, skipped: true, message: "no-op for docker substrate" };
   }
+  if (reuseContext) {
+    return {
+      ok: true,
+      skipped: true,
+      message: `skipped k3d install (reusing context ${reuseContext})`
+    };
+  }
   const spawnFn = deps.spawnSubprocess ?? defaultSpawn;
   const promptFn = deps.prompt ?? defaultPrompt;
   const k3dProbe = await probeK3d(deps.dockerExec);
   if (k3dProbe.ok) {
     return { ok: true, message: `k3d already present: ${k3dProbe.message}` };
   }
-  const hasBrew = spawnSync26("command", ["-v", "brew"], { shell: true, stdio: "pipe" }).status === 0;
+  const hasBrew = spawnSync27("command", ["-v", "brew"], { shell: true, stdio: "pipe" }).status === 0;
   const useBrewMsg = hasBrew ? "Homebrew" : "upstream install script";
   if (!opts.yes) {
     const confirmed = await promptFn(
@@ -36886,10 +37304,17 @@ function phaseFromProbe(probe2) {
   if (probe2.ok) return { ok: true, message: probe2.message };
   return { ok: false, message: probe2.message, remedy: probe2.remedy };
 }
-async function phase2_5ProvisionCluster(substrate, clusterName, opts, deps) {
+async function phase2_5ProvisionCluster(substrate, clusterName, opts, deps, reuseContext) {
   if (substrate === "docker") {
     return { ok: true, skipped: true, message: "no-op for docker substrate" };
   }
+  if (reuseContext) {
+    return {
+      ok: true,
+      skipped: true,
+      message: `skipped k3d cluster provision (reusing context ${reuseContext})`
+    };
+  }
   const spawnFn = deps.spawnSubprocess ?? defaultSpawn;
   const listResult = await captureSpawn("k3d", ["cluster", "list", "--output", "json"], deps.dockerExec);
   if (listResult.ok) {
@@ -36903,7 +37328,7 @@ async function phase2_5ProvisionCluster(substrate, clusterName, opts, deps) {
   }
   process.stdout.write(`Creating k3d cluster ${clusterName}...
 `);
-  const ghConfigBind = `${homedir44()}/.config/gh:/host/.config/gh`;
+  const ghConfigBind = `${homedir45()}/.config/gh:/host/.config/gh`;
   const createResult = await spawnFn("k3d", [
     "cluster",
     "create",
@@ -36927,14 +37352,14 @@ async function phase2_5ProvisionCluster(substrate, clusterName, opts, deps) {
 }
 async function captureSpawn(cmd, args, dockerExec) {
   const exec = dockerExec ?? ((c, a) => {
-    const r2 = spawnSync26(c, [...a], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
+    const r2 = spawnSync27(c, [...a], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
     return { status: r2.status, stdout: r2.stdout ?? "", stderr: r2.stderr ?? "" };
   });
   const r = exec(cmd, args);
   return { ok: r.status === 0, stdout: r.stdout, stderr: r.stderr };
 }
 function captureSpawnSync(cmd, args) {
-  const r = spawnSync26(cmd, [...args], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
+  const r = spawnSync27(cmd, [...args], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
   return { ok: r.status === 0, stdout: r.stdout ?? "" };
 }
 function clusterExistsInList(json, clusterName) {
@@ -36963,11 +37388,11 @@ function safeReadCliVersion() {
     return null;
   }
 }
-async function phase2_6PinKubectlContext(substrate, clusterName, deps) {
+async function phase2_6PinKubectlContext(substrate, clusterName, deps, reuseContext) {
   if (substrate !== "kubernetes") {
     return { ok: true, skipped: true, message: "no-op for docker substrate" };
   }
-  const expectedContext = `k3d-${clusterName}`;
+  const expectedContext = reuseContext ?? `k3d-${clusterName}`;
   writeConfig({ host: { substrate: "kubernetes" } }, { configPath: deps.configPath });
   const result = applyKubectlContextPin([expectedContext], {
     configPath: deps.configPath
@@ -37004,7 +37429,7 @@ async function phase4ShellInit(opts, deps) {
   if (opts.skipShellInit) {
     return { ok: true, skipped: true, message: "skipped via --skip-shell-init" };
   }
-  const home = deps.home ?? homedir44();
+  const home = deps.home ?? homedir45();
   const shellEnv = deps.shellEnv ?? process.env.SHELL;
   const rcPath = resolveShellRc(home, shellEnv);
   if (rcPath === null) {
@@ -37014,7 +37439,7 @@ async function phase4ShellInit(opts, deps) {
       message: `unsupported $SHELL (${shellEnv ?? "unset"}); add \`eval "$(olam completion <shell>)"\` to your shell rc manually`
     };
   }
-  const shellBasename = path76.basename(shellEnv);
+  const shellBasename = path77.basename(shellEnv);
   const evalLine = `eval "$(olam completion ${shellBasename})"`;
   const result = appendIdempotent({
     rcPath,
@@ -37040,7 +37465,7 @@ async function phase4ShellInit(opts, deps) {
 async function phase5InitProject(opts, deps) {
   const cwd = deps.cwd ?? process.cwd();
   const projectRoot = findProjectRoot(cwd);
-  const configPath = path76.join(projectRoot, ".olam", "config.yaml");
+  const configPath = path77.join(projectRoot, ".olam", "config.yaml");
   if (existsSync85(configPath)) {
     return { ok: true, message: `${configPath} present (no change)` };
   }
@@ -37119,7 +37544,8 @@ async function phase7Verify(opts, deps) {
     remedy: "Inspect doctor output above; the specific failing probe names its remedy."
   };
 }
-var PHASE_TITLES_DOCKER = [
+var PHASE_TITLES = [
+  "Phase 0.5: Detect existing k8s context",
   "Phase 1: System check",
   "Phase 1.5: Substrate tools install",
   "Phase 2: olam CLI sanity",
@@ -37157,12 +37583,32 @@ async function runSetup(opts, deps = {}) {
     process.stdout.write(`cluster:   ${clusterName}
 `);
   }
+  const results = [];
+  let failureAt = null;
+  const phase0_5Title = PHASE_TITLES[0];
+  process.stdout.write(`
+${phase0_5Title}
+`);
+  const phase0_5Result = await phase0_5DetectExistingContext(substrate, opts, deps);
+  results.push({ name: phase0_5Title, result: phase0_5Result });
+  if (phase0_5Result.ok && phase0_5Result.skipped) {
+    printWarning(`  \u2298 ${phase0_5Result.message}`);
+  } else if (phase0_5Result.ok) {
+    printSuccess(`  \u2713 ${phase0_5Result.message}`);
+  } else {
+    printError(`  \u2717 ${phase0_5Result.message}`);
+    if (phase0_5Result.remedy) printWarning(`    remedy: ${phase0_5Result.remedy}`);
+    process.stdout.write("\n");
+    printError("Setup FAILED at Phase 1");
+    return { phases: results, failureAt: 1, exitCode: 1 };
+  }
+  const reuseContext = phase0_5Result.reuseContext;
   const phaseFns = [
     () => phase1SystemCheck(substrate, deps),
-    () => phase1_5InstallSubstrate(substrate, opts, deps),
+    () => phase1_5InstallSubstrate(substrate, opts, deps, reuseContext),
     () => phase2CliSanity(deps),
-    () => phase2_5ProvisionCluster(substrate, clusterName, opts, deps),
-    () => phase2_6PinKubectlContext(substrate, clusterName, deps),
+    () => phase2_5ProvisionCluster(substrate, clusterName, opts, deps, reuseContext),
+    () => phase2_6PinKubectlContext(substrate, clusterName, deps, reuseContext),
     () => phase3Bootstrap(substrate, deps),
     () => phase4ShellInit(opts, deps),
     () => phase5InitProject(opts, deps),
@@ -37171,10 +37617,8 @@ async function runSetup(opts, deps = {}) {
     () => phase6Auth(opts, deps),
     () => phase7Verify(opts, deps)
   ];
-  const results = [];
-  let failureAt = null;
   for (let i = 0; i < phaseFns.length; i += 1) {
-    const name = PHASE_TITLES_DOCKER[i];
+    const name = PHASE_TITLES[i + 1];
     process.stdout.write(`
 ${name}
 `);
@@ -37187,7 +37631,7 @@ ${name}
     } else {
       printError(`  \u2717 ${result.message}`);
       if (result.remedy) printWarning(`    remedy: ${result.remedy}`);
-      failureAt = i + 1;
+      failureAt = i + 2;
       break;
     }
   }
@@ -37214,6 +37658,9 @@ function registerSetup(program2) {
   ).option(
     "--cluster-name <name>",
     "k3d cluster name to create/use (kubernetes substrate only; default: olam-dev). Use a different name to avoid colliding with a pre-existing olam-dev cluster, to run multiple olam stacks side-by-side, or for per-run unique names in CI smoke. Must be DNS-compatible: lowercase alphanumeric, hyphens allowed in the middle."
+  ).option(
+    "--reuse-cluster <name>",
+    "Reuse an existing kubeconfig context instead of provisioning a new k3d cluster. Pair with --substrate=kubernetes. Skips Phase 1.5 (k3d install) and Phase 2.5 (cluster provision); Phase 2.6 pins to this context. Operator owns the cluster lifecycle (teardown not handled by olam setup). Example: --reuse-cluster=colima (for Colima k8s users)."
   ).option("--skip-shell-init", "Skip Phase 4 (do not append to ~/.zshrc / ~/.bashrc)").option("--skip-auth", "Skip Phase 6 (do not prompt for `olam auth login`)").option("--skip-skill-source", "Skip Phase 5a (do not pick a skill source; run `olam skills source add` later)").option("--skill-source <id-or-url>", "Non-interactive Phase 5a: curated name (e.g. atlas-toolbox) or git URL").option("--skip-project-sweep", "Skip Phase 5b (do not walk projects directory for repo discovery)").option("--projects <path>", "Phase 5b: project root path to walk (default: ~/Projects)").option("--dry-run", "Phase 5b: print matches without registering or building (no side effects)").option("--exclude <glob...>", "Phase 5b: additional skip patterns for project sweep").option("--skip-kg", "Phase 5b: skip KG eager-build sub-step (sources still registered)").option(
     "--skip-doctor",
     "Skip Phase 7 final `olam doctor` verification (for CI or minimal setups)"
@@ -37412,13 +37859,13 @@ function registerSetupLinuxGate(program2) {
 // src/commands/update.ts
 import * as fs78 from "node:fs";
 import * as os42 from "node:os";
-import * as path79 from "node:path";
+import * as path80 from "node:path";
 import { execSync as execSync14 } from "node:child_process";
 import pc28 from "picocolors";
 
 // src/lib/symlink-reconcile.ts
 import * as fs76 from "node:fs";
-import * as path77 from "node:path";
+import * as path78 from "node:path";
 var realFs = {
   readdirSync: (p) => fs76.readdirSync(p),
   existsSync: (p) => fs76.existsSync(p),
@@ -37437,8 +37884,8 @@ function reconcileSkillSymlinks(npmSkillsDir, claudeSkillsDir2, _fs = realFs) {
   _fs.mkdirSync(claudeSkillsDir2, { recursive: true });
   const sourceSkills = _fs.existsSync(npmSkillsDir) ? _fs.readdirSync(npmSkillsDir).filter((d) => d.startsWith("olam-")) : [];
   for (const skill of sourceSkills) {
-    const linkPath = path77.join(claudeSkillsDir2, skill);
-    const target = path77.join(npmSkillsDir, skill);
+    const linkPath = path78.join(claudeSkillsDir2, skill);
+    const target = path78.join(npmSkillsDir, skill);
     if (!_fs.existsSync(linkPath)) {
       try {
         _fs.symlinkSync(target, linkPath);
@@ -37451,7 +37898,7 @@ function reconcileSkillSymlinks(npmSkillsDir, claudeSkillsDir2, _fs = realFs) {
   }
   const deployedEntries = _fs.existsSync(claudeSkillsDir2) ? _fs.readdirSync(claudeSkillsDir2).filter((d) => d.startsWith("olam-")) : [];
   for (const entry of deployedEntries) {
-    const linkPath = path77.join(claudeSkillsDir2, entry);
+    const linkPath = path78.join(claudeSkillsDir2, entry);
     let isSymlink = false;
     try {
       isSymlink = _fs.lstatSync(linkPath).isSymbolicLink();
@@ -37476,9 +37923,9 @@ function reconcileSkillSymlinks(npmSkillsDir, claudeSkillsDir2, _fs = realFs) {
 
 // src/commands/update.ts
 var PACKAGE_NAME = "@pleri/olam-cli";
-var CACHE_DIR2 = path79.join(os42.homedir(), ".olam", "cache");
-var LOG_DIR2 = path79.join(os42.homedir(), ".olam", "log");
-var LAST_STABLE_FILE = path79.join(CACHE_DIR2, "last-stable.txt");
+var CACHE_DIR2 = path80.join(os42.homedir(), ".olam", "cache");
+var LOG_DIR2 = path80.join(os42.homedir(), ".olam", "log");
+var LAST_STABLE_FILE = path80.join(CACHE_DIR2, "last-stable.txt");
 function defaultExec(cmd) {
   try {
     const stdout = execSync14(cmd, { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] });
@@ -37507,12 +37954,12 @@ function readLastStable(file = LAST_STABLE_FILE) {
   }
 }
 function writeLastStable(version, file = LAST_STABLE_FILE) {
-  fs78.mkdirSync(path79.dirname(file), { recursive: true });
+  fs78.mkdirSync(path80.dirname(file), { recursive: true });
   fs78.writeFileSync(file, version, { mode: 420 });
 }
 function logUpdateFailure(stderr) {
   const ts = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-  const logFile = path79.join(LOG_DIR2, `update-${ts}.log`);
+  const logFile = path80.join(LOG_DIR2, `update-${ts}.log`);
   try {
     fs78.mkdirSync(LOG_DIR2, { recursive: true });
     fs78.appendFileSync(logFile, `[update-failure ${(/* @__PURE__ */ new Date()).toISOString()}]
@@ -37602,8 +38049,8 @@ async function doUpdate(opts, _exec = defaultExec, _reconcile = reconcileSkillSy
   let symlinkResult = { added: [], removed: [] };
   if (npmRootResult.exitCode === 0) {
     const npmRoot = npmRootResult.stdout.trim();
-    const npmSkillsDir = path79.join(npmRoot, "@pleri", "olam-cli", "plugin", "skills");
-    const claudeSkillsDir2 = path79.join(os42.homedir(), ".claude", "skills");
+    const npmSkillsDir = path80.join(npmRoot, "@pleri", "olam-cli", "plugin", "skills");
+    const claudeSkillsDir2 = path80.join(os42.homedir(), ".claude", "skills");
     const rec = _reconcile(npmSkillsDir, claudeSkillsDir2);
     symlinkResult = { added: rec.added, removed: rec.removed };
     if (!quiet && (rec.added.length > 0 || rec.removed.length > 0)) {
@@ -37649,8 +38096,8 @@ async function doRollback(_exec = defaultExec, _reconcile = reconcileSkillSymlin
   if (npmRootResult.exitCode === 0) {
     const npmRoot = npmRootResult.stdout.trim();
     _reconcile(
-      path79.join(npmRoot, "@pleri", "olam-cli", "plugin", "skills"),
-      path79.join(os42.homedir(), ".claude", "skills")
+      path80.join(npmRoot, "@pleri", "olam-cli", "plugin", "skills"),
+      path80.join(os42.homedir(), ".claude", "skills")
     );
   }
   return { action: "rolled-back", restoredVersion: prev, exitCode: 0 };
@@ -38007,7 +38454,7 @@ import pc32 from "picocolors";
 
 // src/commands/flywheel/install-shims.ts
 import { copyFileSync as copyFileSync9, existsSync as existsSync89, mkdirSync as mkdirSync53, readFileSync as readFileSync74, writeFileSync as writeFileSync44 } from "node:fs";
-import { homedir as homedir47 } from "node:os";
+import { homedir as homedir48 } from "node:os";
 import { dirname as dirname48, join as join87 } from "node:path";
 
 // src/lib/shim-generator.ts
@@ -38071,7 +38518,7 @@ ${argsBlock}
 // src/commands/flywheel/install-shims.ts
 var SHIM_HEADER_MARKER = "# AUTO-GENERATED by `olam flywheel install-shims`";
 function refreshShims(opts = {}) {
-  const targetDir = opts.targetDir ?? join87(homedir47(), ".claude", "scripts");
+  const targetDir = opts.targetDir ?? join87(homedir48(), ".claude", "scripts");
   const results = [];
   let written = 0;
   let overwritten = 0;
@@ -38132,7 +38579,7 @@ function installOne(spec, targetDir, opts) {
 }
 function registerFlywheelInstallShims(parent) {
   parent.command("install-shims").description("Install backwards-compat bash shims under ~/.claude/scripts/ that delegate to olam flywheel <subcmd>").option("--force", "overwrite existing non-shim files (backs them up to .shim-backup-<ts>)").option("--dry-run", "preview which shims would be written without modifying disk").option("--target-dir <path>", "override target directory (default: ~/.claude/scripts/); for tests").action((opts) => {
-    const targetDir = opts.targetDir ?? join87(homedir47(), ".claude", "scripts");
+    const targetDir = opts.targetDir ?? join87(homedir48(), ".claude", "scripts");
     const summary2 = refreshShims(opts);
     const lines = [];
     const dryRunSuffix = opts.dryRun === true ? " (dry-run)" : "";
@@ -38757,7 +39204,7 @@ init_skill_sources();
 init_output();
 import * as fs80 from "node:fs";
 import * as os43 from "node:os";
-import * as path80 from "node:path";
+import * as path81 from "node:path";
 import * as readline3 from "node:readline";
 import pc33 from "picocolors";
 
@@ -38776,7 +39223,7 @@ import {
   statSync as statSync27,
   writeFileSync as writeFileSync45
 } from "node:fs";
-import { homedir as homedir48 } from "node:os";
+import { homedir as homedir49 } from "node:os";
 import { basename as basename8, dirname as dirname49, isAbsolute as isAbsolute4, join as join88, relative as relative5, resolve as resolve21 } from "node:path";
 
 // src/commands/flywheel/sanitize-persona-output.ts
@@ -38839,7 +39286,7 @@ function registerFlywheelSanitizePersonaOutput(parent) {
 
 // src/lib/skills-apply-overlays.ts
 function claudeRoot(opts) {
-  return opts.claudeDir ?? opts.fixtureRoot ?? join88(homedir48(), ".claude");
+  return opts.claudeDir ?? opts.fixtureRoot ?? join88(homedir49(), ".claude");
 }
 function ensureRealDir(p) {
   if (!existsSync90(p)) {
@@ -39036,12 +39483,12 @@ function asMessage4(err) {
 }
 var ATLAS_USER_PICKER_RE = /^[a-z0-9][a-z0-9_-]{0,38}$/;
 function listMemberNames(clonePath) {
-  const membersDir = path80.join(clonePath, "members");
+  const membersDir = path81.join(clonePath, "members");
   if (!fs80.existsSync(membersDir)) return [];
   try {
     return fs80.readdirSync(membersDir).filter((e) => {
       try {
-        return fs80.statSync(path80.join(membersDir, e)).isDirectory();
+        return fs80.statSync(path81.join(membersDir, e)).isDirectory();
       } catch {
         return false;
       }
@@ -39090,8 +39537,8 @@ function defaultAtlasUserPrompt(question) {
 async function resolveAtlasUserWithPicker(cliOverride, opts) {
   if (cliOverride !== void 0) return cliOverride;
   const ATLAS_USER_RE2 = /^[a-z0-9][a-z0-9_-]{0,38}$/;
-  const claudeDirPathForRead = opts?._testClaudeDir ?? (process.env["OLAM_CLAUDE_DIR"] ?? path80.join(os43.homedir(), ".claude"));
-  const atlasUserFile = path80.join(claudeDirPathForRead, ".atlas-user");
+  const claudeDirPathForRead = opts?._testClaudeDir ?? (process.env["OLAM_CLAUDE_DIR"] ?? path81.join(os43.homedir(), ".claude"));
+  const atlasUserFile = path81.join(claudeDirPathForRead, ".atlas-user");
   if (fs80.existsSync(atlasUserFile)) {
     const existing = fs80.readFileSync(atlasUserFile, "utf-8").trim();
     if (existing.length > 0) {
@@ -39152,10 +39599,10 @@ async function resolveAtlasUserWithPicker(cliOverride, opts) {
     );
     return void 0;
   }
-  const claudeDirPath = opts?._testClaudeDir ?? (process.env["OLAM_CLAUDE_DIR"] ?? path80.join(os43.homedir(), ".claude"));
+  const claudeDirPath = opts?._testClaudeDir ?? (process.env["OLAM_CLAUDE_DIR"] ?? path81.join(os43.homedir(), ".claude"));
   fs80.mkdirSync(claudeDirPath, { recursive: true });
-  fs80.writeFileSync(path80.join(claudeDirPath, ".atlas-user"), picked + "\n", "utf8");
-  process.stdout.write(pc33.green(`\u2713 atlas-user set to "${picked}" (written to ${path80.join(claudeDirPath, ".atlas-user")})
+  fs80.writeFileSync(path81.join(claudeDirPath, ".atlas-user"), picked + "\n", "utf8");
+  process.stdout.write(pc33.green(`\u2713 atlas-user set to "${picked}" (written to ${path81.join(claudeDirPath, ".atlas-user")})
 `));
   return picked;
 }
@@ -39167,10 +39614,10 @@ function listDeployed() {
   );
   const entries = [];
   for (const bucket of ["skills", "agents", "scripts", "rules", "commands"]) {
-    const bucketDir = path80.join(dir, bucket);
+    const bucketDir = path81.join(dir, bucket);
     if (!fs80.existsSync(bucketDir)) continue;
     for (const name of fs80.readdirSync(bucketDir)) {
-      const full = path80.join(bucketDir, name);
+      const full = path81.join(bucketDir, name);
       try {
         const stat = fs80.lstatSync(full);
         if (!stat.isSymbolicLink()) continue;
@@ -39621,7 +40068,7 @@ init_merge_settings();
 init_skill_sources();
 init_output();
 import * as fs82 from "node:fs";
-import * as path81 from "node:path";
+import * as path82 from "node:path";
 var MIGRATE_FROM_TOOLBOX_COMMAND = "migrate-from-toolbox";
 function asMessage6(err) {
   return err instanceof Error ? err.message : String(err);
@@ -39689,7 +40136,7 @@ function registerSkillsMigrate(program2) {
       return;
     }
     const toolboxPath = opts.path;
-    const namespace = opts.namespace ?? path81.basename(toolboxPath);
+    const namespace = opts.namespace ?? path82.basename(toolboxPath);
     const sourceName = opts.sourceName ?? namespace;
     const snapshot = detectToolboxState({ toolboxPath, namespace });
     if (!snapshot) {
@@ -39743,9 +40190,9 @@ function registerSkillsMigrate(program2) {
       printWarning(`legacy hook removal failed: ${asMessage6(err)}; proceeding`);
     }
     const scope = opts.scope === "user" ? "user" : "project";
-    const olamHookPath = scope === "user" ? settingsFile : path81.join(process.cwd(), ".claude", "settings.json");
+    const olamHookPath = scope === "user" ? settingsFile : path82.join(process.cwd(), ".claude", "settings.json");
     try {
-      fs82.mkdirSync(path81.dirname(olamHookPath), { recursive: true });
+      fs82.mkdirSync(path82.dirname(olamHookPath), { recursive: true });
       const result = mergeHomeSettingsJson(olamHookPath, {
         ensureHook: {
           stage: OLAM_SKILLS_HOOK_STAGE,
@@ -39779,7 +40226,7 @@ function registerSkillsMigrate(program2) {
 init_skill_sources();
 init_output();
 import * as fs83 from "node:fs";
-import * as path82 from "node:path";
+import * as path83 from "node:path";
 var MIGRATE_BACK_TO_TOOLBOX_COMMAND = "migrate-back-to-toolbox";
 function asMessage7(err) {
   return err instanceof Error ? err.message : String(err);
@@ -39787,7 +40234,7 @@ function asMessage7(err) {
 function claudeDirInternal4() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0) return override;
-  return path82.join(process.env["HOME"] ?? "", ".claude");
+  return path83.join(process.env["HOME"] ?? "", ".claude");
 }
 function restoreSessionStartFromSnapshot(filePath, originalSessionStartHook) {
   if (!originalSessionStartHook || originalSessionStartHook.length === 0) {
@@ -39812,7 +40259,7 @@ function restoreSessionStartFromSnapshot(filePath, originalSessionStartHook) {
       SessionStart: originalSessionStartHook
     }
   };
-  fs83.mkdirSync(path82.dirname(filePath), { recursive: true });
+  fs83.mkdirSync(path83.dirname(filePath), { recursive: true });
   fs83.writeFileSync(filePath, JSON.stringify(next, null, 2) + "\n");
   return { restored: true };
 }
@@ -39822,10 +40269,10 @@ function removeOlamManagedSymlinks() {
   const olamClonePaths = sources.map((s) => skillSourceClonePath(s.id));
   let removed = 0;
   for (const bucket of ["skills", "agents", "scripts", "rules", "commands"]) {
-    const dir = path82.join(claude, bucket);
+    const dir = path83.join(claude, bucket);
     if (!fs83.existsSync(dir)) continue;
     for (const name of fs83.readdirSync(dir)) {
-      const linkPath = path82.join(dir, name);
+      const linkPath = path83.join(dir, name);
       try {
         const stat = fs83.lstatSync(linkPath);
         if (!stat.isSymbolicLink()) continue;
@@ -39844,7 +40291,7 @@ function restoreToolboxSymlinks(symlinks) {
   let restored = 0;
   for (const { link, target } of symlinks) {
     try {
-      fs83.mkdirSync(path82.dirname(link), { recursive: true });
+      fs83.mkdirSync(path83.dirname(link), { recursive: true });
       if (fs83.existsSync(link) || (() => {
         try {
           fs83.lstatSync(link);
@@ -39864,8 +40311,8 @@ function restoreToolboxSymlinks(symlinks) {
 }
 function restoreAtlasUserMarker(atlasUser) {
   if (!atlasUser) return false;
-  const file = path82.join(claudeDirInternal4(), ".atlas-user");
-  fs83.mkdirSync(path82.dirname(file), { recursive: true });
+  const file = path83.join(claudeDirInternal4(), ".atlas-user");
+  fs83.mkdirSync(path83.dirname(file), { recursive: true });
   fs83.writeFileSync(file, atlasUser);
   return true;
 }
@@ -39879,7 +40326,7 @@ function registerSkillsMigrateBack(program2) {
     let snapshot;
     try {
       if (opts.snapshot) {
-        snapshotPath = path82.resolve(opts.snapshot);
+        snapshotPath = path83.resolve(opts.snapshot);
         if (!fs83.existsSync(snapshotPath)) {
           printError(`snapshot not found at ${snapshotPath}`);
           process.exitCode = 1;
@@ -39887,7 +40334,7 @@ function registerSkillsMigrateBack(program2) {
         }
         snapshot = readMigrationSnapshotFromPath(snapshotPath);
       } else {
-        const filterNamespace = opts.namespace ?? (opts.path ? path82.basename(opts.path) : void 0);
+        const filterNamespace = opts.namespace ?? (opts.path ? path83.basename(opts.path) : void 0);
         const latest = readLatestMigrationSnapshot({ namespace: filterNamespace });
         if (!latest) {
           const where = filterNamespace ? ` for namespace "${filterNamespace}"` : "";
@@ -39965,7 +40412,7 @@ init_trust_audit_log();
 init_atlas_hook_strip();
 init_output();
 import * as fs84 from "node:fs";
-import * as path83 from "node:path";
+import * as path84 from "node:path";
 import pc35 from "picocolors";
 var MIGRATE_HOOKS_COMMAND = "migrate-hooks";
 function settingsHasOlamMetaSentinel(settings) {
@@ -39992,7 +40439,7 @@ function readSettings2(filePath) {
   return JSON.parse(raw);
 }
 function writeSettings(filePath, settings) {
-  fs84.mkdirSync(path83.dirname(filePath), { recursive: true });
+  fs84.mkdirSync(path84.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.tmp-migrate-hooks-${process.pid}-${Date.now()}`;
   fs84.writeFileSync(tmp, JSON.stringify(settings, null, 2) + "\n");
   fs84.renameSync(tmp, filePath);
@@ -40075,7 +40522,7 @@ function registerSkillsMigrateHooks(program2) {
 init_meta_hooks_migration_snapshot();
 init_skill_sources();
 init_output();
-import * as path84 from "node:path";
+import * as path85 from "node:path";
 function asMessage9(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -40092,16 +40539,16 @@ function registerSkillsMigrateHooksBack(program2) {
         return;
       }
       if (opts.snapshot) {
-        const resolved = path84.resolve(opts.snapshot);
-        const allowedDir = path84.resolve(migrationSnapshotsDir2());
-        if (!resolved.startsWith(allowedDir + path84.sep)) {
+        const resolved = path85.resolve(opts.snapshot);
+        const allowedDir = path85.resolve(migrationSnapshotsDir2());
+        if (!resolved.startsWith(allowedDir + path85.sep)) {
           printError(
             `--snapshot path must be inside ${allowedDir} (got "${resolved}"). Refusing to restore from an arbitrary path \u2014 settings.json would land operator-chosen content.`
           );
           process.exitCode = 1;
           return;
         }
-        const basename16 = path84.basename(resolved);
+        const basename16 = path85.basename(resolved);
         if (!basename16.startsWith(META_HOOKS_SNAPSHOT_PREFIX)) {
           printError(
             `--snapshot filename must start with "${META_HOOKS_SNAPSHOT_PREFIX}" (got "${basename16}"). Cross-namespace snapshots (atlas-toolbox-*) are not valid restore targets for olam-meta hooks.`
@@ -40335,9 +40782,9 @@ function registerSkillsDoctor(program2) {
 init_skill_sources();
 init_cli_version();
 init_output();
-import { execFileSync as execFileSync15 } from "node:child_process";
+import { execFileSync as execFileSync16 } from "node:child_process";
 import * as fs86 from "node:fs";
-import * as path85 from "node:path";
+import * as path86 from "node:path";
 var CHAIN_SKILL_NAMES = [
   "10x:brainstorm",
   "10x:plan-hard",
@@ -40353,17 +40800,17 @@ function asMessage12(err) {
 }
 function hasBeadsCli() {
   try {
-    execFileSync15("bd", ["--version"], { stdio: "ignore" });
+    execFileSync16("bd", ["--version"], { stdio: "ignore" });
     return true;
   } catch {
     return false;
   }
 }
 function hasBeadsProjectInit(cwd) {
-  return fs86.existsSync(path85.join(cwd, ".beads"));
+  return fs86.existsSync(path86.join(cwd, ".beads"));
 }
 function hasBeadsClaudeSetup() {
-  const settingsPath = path85.join(claudeDir(), "settings.json");
+  const settingsPath = path86.join(claudeDir(), "settings.json");
   if (!fs86.existsSync(settingsPath)) return false;
   try {
     const content = fs86.readFileSync(settingsPath, "utf8");
@@ -40382,7 +40829,7 @@ async function bootstrapBeads(cwd) {
   if (!hasBeadsProjectInit(cwd)) {
     console.log("bd init \u2014 initializing beads in current project");
     try {
-      execFileSync15("bd", ["init", "--quiet", "--stealth"], {
+      execFileSync16("bd", ["init", "--quiet", "--stealth"], {
         cwd,
         stdio: "inherit"
       });
@@ -40395,7 +40842,7 @@ async function bootstrapBeads(cwd) {
   if (!hasBeadsClaudeSetup()) {
     console.log("bd setup claude \u2014 installing beads Claude Code hooks");
     try {
-      execFileSync15("bd", ["setup", "claude"], { cwd, stdio: "inherit" });
+      execFileSync16("bd", ["setup", "claude"], { cwd, stdio: "inherit" });
     } catch (err) {
       printWarning(`bd setup claude failed (continuing): ${asMessage12(err)}`);
     }
@@ -40431,12 +40878,12 @@ function shortSha(sha) {
   return sha.slice(0, 8);
 }
 function listInstalledClaudeSkills() {
-  const skillsDir = path85.join(claudeDir(), "skills");
+  const skillsDir = path86.join(claudeDir(), "skills");
   if (!fs86.existsSync(skillsDir)) return [];
   try {
     return fs86.readdirSync(skillsDir).filter((name) => {
       try {
-        const stat = fs86.lstatSync(path85.join(skillsDir, name));
+        const stat = fs86.lstatSync(path86.join(skillsDir, name));
         return stat.isSymbolicLink() || stat.isDirectory();
       } catch {
         return false;
@@ -40511,14 +40958,14 @@ function registerSkills10x(program2) {
   tenx.command("uninstall").description(
     "Remove /10x: chain skill symlinks from ~/.claude/skills (preserves user-authored skills + non-chain skill sources)"
   ).action(() => {
-    const skillsDir = path85.join(claudeDir(), "skills");
+    const skillsDir = path86.join(claudeDir(), "skills");
     if (!fs86.existsSync(skillsDir)) {
       printWarning("No ~/.claude/skills/ directory found; nothing to uninstall");
       return;
     }
     let removed = 0;
     for (const name of fs86.readdirSync(skillsDir)) {
-      const full = path85.join(skillsDir, name);
+      const full = path86.join(skillsDir, name);
       try {
         const stat = fs86.lstatSync(full);
         if (!stat.isSymbolicLink()) continue;
@@ -40594,17 +41041,17 @@ function registerSkills10x(program2) {
 init_output();
 import * as fs87 from "node:fs";
 import * as os44 from "node:os";
-import * as path86 from "node:path";
+import * as path87 from "node:path";
 import * as child_process from "node:child_process";
 import { parse as yamlParse2, stringify as yamlStringify3 } from "yaml";
 function hermesConfigPath() {
-  return path86.join(os44.homedir(), ".hermes", "config.yaml");
+  return path87.join(os44.homedir(), ".hermes", "config.yaml");
 }
 function hermesSkillsDir() {
-  return path86.join(os44.homedir(), ".hermes", "skills");
+  return path87.join(os44.homedir(), ".hermes", "skills");
 }
 function claudeSkillsDir() {
-  return path86.join(os44.homedir(), ".claude", "skills");
+  return path87.join(os44.homedir(), ".claude", "skills");
 }
 function readHermesConfig(configPath) {
   const raw = fs87.readFileSync(configPath, "utf-8");
@@ -40716,8 +41163,8 @@ function mirrorSkillSymlinks(dryRun, summary2) {
   let mirrored = 0;
   let collisions = 0;
   for (const entry of entries) {
-    const srcPath = path86.join(srcDir, entry);
-    const destPath2 = path86.join(destDir, entry);
+    const srcPath = path87.join(srcDir, entry);
+    const destPath2 = path87.join(destDir, entry);
     if (fs87.existsSync(destPath2) || fs87.lstatSync(srcPath).isFile()) {
       if (fs87.existsSync(destPath2)) collisions++;
       continue;
@@ -40772,7 +41219,7 @@ async function runHermesBootstrap(opts, deps = {}) {
   } else {
     summary2.skipped.push("mcp_servers.agentmemory-atlas (AGENTMEMORY_BRIDGE_URL/SECRET not set; use --bridge-url/--bridge-secret to add)");
   }
-  const hooksDir = path86.join(path86.dirname(configPath), "hooks");
+  const hooksDir = path87.join(path87.dirname(configPath), "hooks");
   const hookResult = installHookFn(hooksDir, dryRun);
   switch (hookResult.status) {
     case "installed":
@@ -40819,7 +41266,7 @@ async function runHermesBootstrap(opts, deps = {}) {
 }
 var HOOK_MATCHERS = ["terminal", "bash", "shell", "search_files", "grep", "ripgrep"];
 function ensureHermesHookEntry(config, hooksDir, dryRun, summary2) {
-  const hookScriptPath = path86.join(hooksDir, "kg-first.sh");
+  const hookScriptPath = path87.join(hooksDir, "kg-first.sh");
   const hooks = config["hooks"] ?? {};
   const preToolCall = Array.isArray(hooks["pre_tool_call"]) ? hooks["pre_tool_call"] : [];
   const alreadyPresent = preToolCall.some(
@@ -40957,9 +41404,9 @@ function registerMcpServe(cmd) {
 init_output();
 
 // src/commands/mcp/install-shared.ts
-import { spawnSync as spawnSync28 } from "node:child_process";
+import { spawnSync as spawnSync29 } from "node:child_process";
 var DEFAULT_CLAUDE_SHELL_DEPS = {
-  spawn: spawnSync28,
+  spawn: spawnSync29,
   log: (msg) => console.log(msg)
 };
 function isOnPath(deps, bin) {
@@ -41092,8 +41539,8 @@ var SECRET = process.env["OLAM_MCP_AUTH_SECRET"] ?? "";
 function authHeaders() {
   return SECRET ? { "X-Olam-Mcp-Secret": SECRET } : {};
 }
-async function apiFetch(path95, init = {}) {
-  const res = await fetch(`${BASE_URL}${path95}`, {
+async function apiFetch(path96, init = {}) {
+  const res = await fetch(`${BASE_URL}${path96}`, {
     ...init,
     headers: {
       "Content-Type": "application/json",
@@ -41355,7 +41802,7 @@ import pc40 from "picocolors";
 // src/commands/mcp/import-discovery.ts
 import * as fs88 from "node:fs";
 import * as os45 from "node:os";
-import * as path87 from "node:path";
+import * as path88 from "node:path";
 function readJsonFile(filePath) {
   try {
     const raw = fs88.readFileSync(filePath, "utf-8");
@@ -41387,18 +41834,18 @@ function extractMcpServers(obj, source, sourceLabel) {
 }
 function getClaudeDesktopPath() {
   if (process.platform === "darwin") {
-    return path87.join(os45.homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    return path88.join(os45.homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
   if (process.platform === "win32") {
-    const appData = process.env["APPDATA"] ?? path87.join(os45.homedir(), "AppData", "Roaming");
-    return path87.join(appData, "Claude", "claude_desktop_config.json");
+    const appData = process.env["APPDATA"] ?? path88.join(os45.homedir(), "AppData", "Roaming");
+    return path88.join(appData, "Claude", "claude_desktop_config.json");
   }
-  return path87.join(os45.homedir(), ".config", "Claude", "claude_desktop_config.json");
+  return path88.join(os45.homedir(), ".config", "Claude", "claude_desktop_config.json");
 }
 function getOlamRepoPaths() {
   const configPaths = [
-    path87.join(os45.homedir(), ".olam", "config.yaml"),
-    path87.join(process.cwd(), ".olam", "config.yaml")
+    path88.join(os45.homedir(), ".olam", "config.yaml"),
+    path88.join(process.cwd(), ".olam", "config.yaml")
   ];
   const paths = [];
   for (const configPath of configPaths) {
@@ -41420,7 +41867,7 @@ async function discoverMcpSources(repoPaths) {
   const sources = [];
   const sourceDefs = [
     {
-      path: path87.join(os45.homedir(), ".claude.json"),
+      path: path88.join(os45.homedir(), ".claude.json"),
       label: "Claude Code (~/.claude.json)"
     },
     {
@@ -41428,19 +41875,19 @@ async function discoverMcpSources(repoPaths) {
       label: "Claude Desktop"
     },
     {
-      path: path87.join(os45.homedir(), ".cursor", "mcp.json"),
+      path: path88.join(os45.homedir(), ".cursor", "mcp.json"),
       label: "Cursor (~/.cursor/mcp.json)"
     },
     {
-      path: path87.join(os45.homedir(), ".codeium", "windsurf", "mcp_config.json"),
+      path: path88.join(os45.homedir(), ".codeium", "windsurf", "mcp_config.json"),
       label: "Windsurf (~/.codeium/windsurf/mcp_config.json)"
     }
   ];
   const resolvedRepoPaths = repoPaths ?? getOlamRepoPaths();
   for (const repoPath of resolvedRepoPaths) {
     sourceDefs.push({
-      path: path87.join(repoPath, ".mcp.json"),
-      label: `.mcp.json (${path87.basename(repoPath)})`
+      path: path88.join(repoPath, ".mcp.json"),
+      label: `.mcp.json (${path88.basename(repoPath)})`
     });
   }
   const reads = await Promise.all(
@@ -41677,13 +42124,13 @@ init_output();
 
 // src/lib/memory-host-process-migration.ts
 import { existsSync as existsSync101, readFileSync as readFileSync83, unlinkSync as unlinkSync23 } from "node:fs";
-import { spawnSync as spawnSync29 } from "node:child_process";
+import { spawnSync as spawnSync30 } from "node:child_process";
 
 // src/commands/memory/_paths.ts
-import { homedir as homedir52 } from "node:os";
+import { homedir as homedir53 } from "node:os";
 import { join as join95, dirname as dirname55 } from "node:path";
 import { fileURLToPath as fileURLToPath8 } from "node:url";
-var OLAM_HOME5 = join95(homedir52(), ".olam");
+var OLAM_HOME5 = join95(homedir53(), ".olam");
 var MEMORY_PID_PATH = join95(OLAM_HOME5, "memory.pid");
 var MEMORY_LOG_PATH = join95(OLAM_HOME5, "memory-service.log");
 var MEMORY_DATA_DIR = join95(OLAM_HOME5, "memory-data");
@@ -41762,7 +42209,7 @@ function isProcessAlive(pid) {
   }
 }
 function processCommName(pid) {
-  const r = spawnSync29("ps", ["-p", String(pid), "-o", "comm="], { encoding: "utf-8" });
+  const r = spawnSync30("ps", ["-p", String(pid), "-o", "comm="], { encoding: "utf-8" });
   if (r.status !== 0) return null;
   const comm = r.stdout.trim();
   return comm.split("/").pop() ?? null;
@@ -41776,7 +42223,7 @@ function terminateProcess(pid) {
   const deadline = Date.now() + KILL_TIMEOUT_MS;
   while (Date.now() < deadline) {
     if (!isProcessAlive(pid)) return true;
-    spawnSync29("sleep", ["0.1"]);
+    spawnSync30("sleep", ["0.1"]);
   }
   try {
     process.kill(pid, "SIGKILL");
@@ -42333,13 +42780,13 @@ function resolveMemoryServiceDir() {
   );
 }
 function resolveLocalBridgeScript(serviceDir) {
-  const path95 = join97(serviceDir, "scripts", "local-bridge-server.mjs");
-  if (!existsSync105(path95)) {
+  const path96 = join97(serviceDir, "scripts", "local-bridge-server.mjs");
+  if (!existsSync105(path96)) {
     throw new Error(
-      `Could not find local-bridge-server.mjs at ${path95}. Verify packages/memory-service ships the scripts/ directory.`
+      `Could not find local-bridge-server.mjs at ${path96}. Verify packages/memory-service ships the scripts/ directory.`
     );
   }
-  return path95;
+  return path96;
 }
 function validateBridgeOpts(opts) {
   const local = opts.local ?? false;
@@ -42681,7 +43128,7 @@ function registerMemoryStats(cmd) {
 
 // src/commands/memory/install-hooks.ts
 import { copyFileSync as copyFileSync12, existsSync as existsSync106, mkdirSync as mkdirSync60, readFileSync as readFileSync85, writeFileSync as writeFileSync52 } from "node:fs";
-import { homedir as homedir53 } from "node:os";
+import { homedir as homedir54 } from "node:os";
 import { dirname as dirname56, join as join98, resolve as resolve25 } from "node:path";
 import { fileURLToPath as fileURLToPath9 } from "node:url";
 var HOOK_BASENAMES = [
@@ -42750,7 +43197,7 @@ If existing entries already point at the same paths, no edit needed.
 }
 function registerMemoryInstallHooks(parent) {
   parent.command("install-hooks").description("Install agentmemory hooks (PreToolUse + PostToolUse + SessionStart) to ~/.claude/scripts/hooks/").option("--force", "overwrite existing non-canonical files (backs them up to .agentmemory-hook-backup-<ts>)").option("--dry-run", "preview which hooks would be written without modifying disk").option("--target-dir <path>", "override target directory (default: ~/.claude/scripts/hooks/); for tests").option("--source-dir <path>", "override source directory (default: packages/memory-service/hooks/); for tests").action((opts) => {
-    const targetDir = opts.targetDir ?? join98(homedir53(), ".claude", "scripts", "hooks");
+    const targetDir = opts.targetDir ?? join98(homedir54(), ".claude", "scripts", "hooks");
     const sourceDir = opts.sourceDir ?? defaultSourceDir();
     let written = 0;
     let unchanged = 0;
@@ -42830,7 +43277,7 @@ init_storage_paths();
 init_workspace_name();
 import * as fs93 from "node:fs";
 import * as os48 from "node:os";
-import * as path92 from "node:path";
+import * as path93 from "node:path";
 
 // ../core/dist/kg/kg-service-client.js
 var KG_SERVICE_PORT_DEFAULT = 9997;
@@ -42841,8 +43288,8 @@ function port() {
   const n = Number.parseInt(env, 10);
   return Number.isFinite(n) && n > 0 ? n : KG_SERVICE_PORT_DEFAULT;
 }
-function url(path95) {
-  return `http://127.0.0.1:${port()}${path95}`;
+function url(path96) {
+  return `http://127.0.0.1:${port()}${path96}`;
 }
 function kgServiceHealthUrl() {
   return url("/health");
@@ -42923,16 +43370,16 @@ init_workspace_name();
 init_kg_caps();
 init_output();
 import fs89 from "node:fs";
-import { homedir as homedir54 } from "node:os";
-import path88 from "node:path";
+import { homedir as homedir55 } from "node:os";
+import path89 from "node:path";
 function olamHome4() {
-  return process.env.OLAM_HOME ?? path88.join(homedir54(), ".olam");
+  return process.env.OLAM_HOME ?? path89.join(homedir55(), ".olam");
 }
 function kgRoot2() {
-  return path88.join(olamHome4(), "kg");
+  return path89.join(olamHome4(), "kg");
 }
 function worldsRoot2() {
-  return path88.join(olamHome4(), "worlds");
+  return path89.join(olamHome4(), "worlds");
 }
 function dirSizeBytes2(dir) {
   if (!fs89.existsSync(dir)) return 0;
@@ -42947,7 +43394,7 @@ function dirSizeBytes2(dir) {
       continue;
     }
     for (const entry of entries) {
-      const full = path88.join(cur, entry.name);
+      const full = path89.join(cur, entry.name);
       if (entry.isSymbolicLink()) continue;
       if (entry.isDirectory()) {
         stack.push(full);
@@ -42968,7 +43415,7 @@ function formatBytes5(n) {
   return `${(n / 1024 / 1024 / 1024).toFixed(2)} GB`;
 }
 function readFreshness(workspace) {
-  const file = path88.join(kgPristinePath(workspace), "freshness.json");
+  const file = path89.join(kgPristinePath(workspace), "freshness.json");
   if (!fs89.existsSync(file)) return null;
   try {
     const raw = JSON.parse(fs89.readFileSync(file, "utf-8"));
@@ -42979,7 +43426,7 @@ function readFreshness(workspace) {
   }
 }
 function readOverlayNodeCount(graphifyOutDir) {
-  const graphPath = path88.join(graphifyOutDir, "graph.json");
+  const graphPath = path89.join(graphifyOutDir, "graph.json");
   if (!fs89.existsSync(graphPath)) return null;
   try {
     const raw = JSON.parse(fs89.readFileSync(graphPath, "utf-8"));
@@ -43005,7 +43452,7 @@ function listOverlays() {
   for (const worldEntry of worldDirs) {
     if (!worldEntry.isDirectory()) continue;
     const worldId = worldEntry.name;
-    const worldDir = path88.join(root, worldId);
+    const worldDir = path89.join(root, worldId);
     let cloneDirs;
     try {
       cloneDirs = fs89.readdirSync(worldDir, { withFileTypes: true });
@@ -43014,7 +43461,7 @@ function listOverlays() {
     }
     for (const cloneEntry of cloneDirs) {
       if (!cloneEntry.isDirectory()) continue;
-      const graphifyOut = path88.join(worldDir, cloneEntry.name, "graphify-out");
+      const graphifyOut = path89.join(worldDir, cloneEntry.name, "graphify-out");
       if (!fs89.existsSync(graphifyOut)) continue;
       records.push({
         world_id: worldId,
@@ -43046,7 +43493,7 @@ function listPristines(overlays) {
       continue;
     }
     const fresh = readFreshness(workspace);
-    const graphifyOut = path88.join(kgPristinePath(workspace), "graphify-out");
+    const graphifyOut = path89.join(kgPristinePath(workspace), "graphify-out");
     const size = dirSizeBytes2(graphifyOut);
     const worldCount = overlays.filter((o) => o.clone_dir === workspace).length;
     records.push({
@@ -43183,9 +43630,9 @@ init_workspace_name();
 init_output();
 import { spawn as spawn12 } from "node:child_process";
 import fs90 from "node:fs";
-import path89 from "node:path";
+import path90 from "node:path";
 function pidFilePath2(workspace) {
-  return path89.join(kgPristinePath(workspace), ".watch.pid");
+  return path90.join(kgPristinePath(workspace), ".watch.pid");
 }
 function isPidAlive3(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
@@ -43219,7 +43666,7 @@ function readAndClassifyPid(workspace) {
 }
 function writePidFile2(workspace, pid) {
   const file = pidFilePath2(workspace);
-  const dir = path89.dirname(file);
+  const dir = path90.dirname(file);
   fs90.mkdirSync(dir, { recursive: true });
   fs90.writeFileSync(file, String(pid), { encoding: "utf-8" });
 }
@@ -43232,7 +43679,7 @@ function removePidFile(workspace) {
 }
 async function runKgWatch(workspaceArg, opts, deps = {}) {
   const cwd = deps.cwd ?? opts.cwd ?? process.cwd();
-  const name = workspaceArg ?? path89.basename(cwd).toLowerCase();
+  const name = workspaceArg ?? path90.basename(cwd).toLowerCase();
   try {
     validateWorkspaceName(name);
   } catch (err) {
@@ -43240,7 +43687,7 @@ async function runKgWatch(workspaceArg, opts, deps = {}) {
     return { exitCode: 1, pidWritten: false };
   }
   const pristinePath = kgPristinePath(name);
-  const graphPath = path89.join(pristinePath, "graphify-out", "graph.json");
+  const graphPath = path90.join(pristinePath, "graphify-out", "graph.json");
   const pidState = readAndClassifyPid(name);
   if (pidState.status === "active") {
     printError(
@@ -43479,7 +43926,7 @@ function registerKgDoctorCommand(kg) {
 // src/commands/kg-install-hook.ts
 init_merge_settings();
 import * as fs91 from "node:fs";
-import * as path90 from "node:path";
+import * as path91 from "node:path";
 import * as os46 from "node:os";
 import { parse as yamlParse3, stringify as yamlStringify4 } from "yaml";
 
@@ -43532,9 +43979,9 @@ function buildHookMatcherEntry(opts) {
 init_output();
 function settingsPathFor2(scope) {
   if (scope === "user") {
-    return path90.join(os46.homedir(), ".claude", "settings.json");
+    return path91.join(os46.homedir(), ".claude", "settings.json");
   }
-  return path90.join(process.cwd(), ".claude", "settings.json");
+  return path91.join(process.cwd(), ".claude", "settings.json");
 }
 function backup2(filePath) {
   if (!fs91.existsSync(filePath)) return null;
@@ -43545,10 +43992,10 @@ function backup2(filePath) {
 }
 var HERMES_HOOK_MATCHERS = ["terminal", "bash", "shell", "search_files", "grep", "ripgrep"];
 function hermesConfigPath2() {
-  return path90.join(os46.homedir(), ".hermes", "config.yaml");
+  return path91.join(os46.homedir(), ".hermes", "config.yaml");
 }
 function hermesHooksDir() {
-  return path90.join(os46.homedir(), ".hermes", "hooks");
+  return path91.join(os46.homedir(), ".hermes", "hooks");
 }
 function patchHermesConfigForHook(action) {
   const configPath = hermesConfigPath2();
@@ -43561,7 +44008,7 @@ function patchHermesConfigForHook(action) {
       (e) => typeof e["command"] === "string" && e["command"].includes(HERMES_KG_HOOK_SENTINEL)
     );
     if (alreadyPresent) return "already-present";
-    const hookScriptPath = path90.join(hermesHooksDir(), "kg-first.sh");
+    const hookScriptPath = path91.join(hermesHooksDir(), "kg-first.sh");
     const entry = {
       matcher: HERMES_HOOK_MATCHERS.join("|"),
       command: `${hookScriptPath} # ${HERMES_KG_HOOK_SENTINEL}`
@@ -43615,7 +44062,7 @@ function doInstallForHermes() {
 function doUninstallForHermes() {
   const configPath = hermesConfigPath2();
   const hooksDir = hermesHooksDir();
-  const hookScriptPath = path90.join(hooksDir, "kg-first.sh");
+  const hookScriptPath = path91.join(hooksDir, "kg-first.sh");
   let scriptRemoved = false;
   if (fs91.existsSync(hookScriptPath)) {
     const content = fs91.readFileSync(hookScriptPath, "utf-8");
@@ -43650,9 +44097,9 @@ function registerKgInstallHookCommand(kg) {
     const scope = opts.scope === "user" ? "user" : "project";
     const filePath = settingsPathFor2(scope);
     try {
-      fs91.mkdirSync(path90.dirname(filePath), { recursive: true });
+      fs91.mkdirSync(path91.dirname(filePath), { recursive: true });
     } catch (err) {
-      printError(`could not create ${path90.dirname(filePath)}: ${err instanceof Error ? err.message : String(err)}`);
+      printError(`could not create ${path91.dirname(filePath)}: ${err instanceof Error ? err.message : String(err)}`);
       process.exitCode = 1;
       return;
     }
@@ -43695,14 +44142,14 @@ function registerKgInstallHookCommand(kg) {
 
 // src/commands/kg-uninstall-hook.ts
 import * as fs92 from "node:fs";
-import * as path91 from "node:path";
+import * as path92 from "node:path";
 import * as os47 from "node:os";
 init_output();
 function settingsPathFor3(scope) {
   if (scope === "user") {
-    return path91.join(os47.homedir(), ".claude", "settings.json");
+    return path92.join(os47.homedir(), ".claude", "settings.json");
   }
-  return path91.join(process.cwd(), ".claude", "settings.json");
+  return path92.join(process.cwd(), ".claude", "settings.json");
 }
 function dropSentinel(matchers) {
   let changed = false;
@@ -43864,14 +44311,14 @@ function readQueueFromDisk(queuePath) {
   return entries;
 }
 function writeQueueToDisk(queuePath, entries) {
-  fs93.mkdirSync(path92.dirname(queuePath), { recursive: true });
+  fs93.mkdirSync(path93.dirname(queuePath), { recursive: true });
   const content = entries.map((e) => JSON.stringify(e)).join("\n") + (entries.length > 0 ? "\n" : "");
   fs93.writeFileSync(queuePath, content, "utf-8");
 }
 async function runKgBuildPending(opts = {}) {
   const queuePath = opts.queuePath ?? (() => {
-    const stateDir = process.env["OLAM_STATE_DIR"] ?? path92.join(os48.homedir(), ".olam", "state");
-    return path92.join(stateDir, "kg-pending.jsonl");
+    const stateDir = process.env["OLAM_STATE_DIR"] ?? path93.join(os48.homedir(), ".olam", "state");
+    return path93.join(stateDir, "kg-pending.jsonl");
   })();
   const readQueue2 = opts.readQueueFn ?? readQueueFromDisk;
   const writeQueue2 = opts.writeQueueFn ?? writeQueueToDisk;
@@ -43887,7 +44334,7 @@ async function runKgBuildPending(opts = {}) {
   const remaining = [];
   for (const entry of deduped) {
     const repoPath = entry.path;
-    const workspaceName = path92.basename(repoPath).toLowerCase();
+    const workspaceName = path93.basename(repoPath).toLowerCase();
     printInfo("kg build --pending", `building ${repoPath} (workspace=${workspaceName})`);
     let containerPath;
     try {
@@ -43925,20 +44372,20 @@ async function runKgBuildPending(opts = {}) {
 }
 function resolveWorkspace(arg) {
   const cwd = process.cwd();
-  const name = arg ?? path92.basename(cwd).toLowerCase();
+  const name = arg ?? path93.basename(cwd).toLowerCase();
   validateWorkspaceName(name);
   return { name, sourcePath: cwd };
 }
 function toContainerPath(hostPath) {
   const home = os48.homedir();
-  const resolved = path92.resolve(hostPath);
-  if (!resolved.startsWith(home + path92.sep) && resolved !== home) {
+  const resolved = path93.resolve(hostPath);
+  if (!resolved.startsWith(home + path93.sep) && resolved !== home) {
     throw new Error(
       `source path "${resolved}" is not under $HOME (${home}). kg-service can only build repos that live under your home dir (it bind-mounts $HOME:/host-home:ro at start). Move the repo or set OLAM_HOME if you need a different root.`
     );
   }
-  const rel = path92.relative(home, resolved);
-  return rel === "" ? "/host-home" : path92.posix.join("/host-home", rel.split(path92.sep).join("/"));
+  const rel = path93.relative(home, resolved);
+  return rel === "" ? "/host-home" : path93.posix.join("/host-home", rel.split(path93.sep).join("/"));
 }
 async function runKgBuild(workspaceArg, options = {}) {
   let workspace;
@@ -43990,11 +44437,11 @@ async function runKgBuild(workspaceArg, options = {}) {
     graphify_path: "container"
   };
   fs93.writeFileSync(
-    path92.join(outDir, "freshness.json"),
+    path93.join(outDir, "freshness.json"),
     JSON.stringify(freshness, null, 2) + "\n",
     "utf-8"
   );
-  const finalOut = path92.join(outDir, "graphify-out");
+  const finalOut = path93.join(outDir, "graphify-out");
   if (options.json) {
     process.stdout.write(JSON.stringify(freshness) + "\n");
   } else {
@@ -44036,12 +44483,12 @@ function registerKg(program2) {
 // src/commands/flywheel/emit-breadcrumb.ts
 init_file_lock();
 import { mkdirSync as mkdirSync63, appendFileSync as appendFileSync6 } from "node:fs";
-import { homedir as homedir58 } from "node:os";
+import { homedir as homedir59 } from "node:os";
 import { dirname as dirname59, join as join102 } from "node:path";
 import { randomUUID as randomUUID4 } from "node:crypto";
 var VALID_SEVERITIES = /* @__PURE__ */ new Set(["critical", "high", "medium", "low", "info", "warn"]);
 var PROMPT_FEEDING_FIELDS = ["extracted_pattern", "severity", "affected_persona", "proposed_edit"];
-var BREADCRUMBS_BASE = join102(homedir58(), ".local", "share", "claude", "breadcrumbs");
+var BREADCRUMBS_BASE = join102(homedir59(), ".local", "share", "claude", "breadcrumbs");
 var LOCK_FILENAME = ".flywheel-emit.lock";
 function buildRecord(opts) {
   const rec = {
@@ -44107,14 +44554,14 @@ async function emitBreadcrumb(opts) {
     );
     process.exit(2);
   }
-  const path95 = destPath(rec.project_slug);
-  const lockDir = dirname59(path95);
+  const path96 = destPath(rec.project_slug);
+  const lockDir = dirname59(path96);
   mkdirSync63(lockDir, { recursive: true });
   const line = JSON.stringify(rec) + "\n";
   await withFileLock(
     lockDir,
     () => {
-      appendFileSync6(path95, line, "utf8");
+      appendFileSync6(path96, line, "utf8");
     },
     {
       lockFilename: LOCK_FILENAME,
@@ -44124,7 +44571,7 @@ async function emitBreadcrumb(opts) {
       acquireTimeoutMs: 5e3
     }
   );
-  process.stdout.write(`[K7-emit] ${path95}: ${rec.extracted_pattern} (${rec.severity})
+  process.stdout.write(`[K7-emit] ${path96}: ${rec.extracted_pattern} (${rec.severity})
 `);
 }
 function registerFlywheelEmitBreadcrumb(parent) {
@@ -44247,38 +44694,38 @@ function validateK5ScoredAt(scoredAt) {
   }
   return null;
 }
-function validatePlan(path95) {
+function validatePlan(path96) {
   let stat;
   try {
-    stat = statSync30(path95);
+    stat = statSync30(path96);
   } catch (err) {
-    return { ok: false, message: `FAIL cannot stat ${path95}: ${err instanceof Error ? err.message : "unknown"}` };
+    return { ok: false, message: `FAIL cannot stat ${path96}: ${err instanceof Error ? err.message : "unknown"}` };
   }
   if (stat.size > MAX_PLAN_BYTES) {
-    return { ok: false, message: `FAIL ${path95}: plan file exceeds 1MB (${stat.size} bytes); refusing to parse` };
+    return { ok: false, message: `FAIL ${path96}: plan file exceeds 1MB (${stat.size} bytes); refusing to parse` };
   }
   let text;
   try {
-    text = readFileSync89(path95, "utf8");
+    text = readFileSync89(path96, "utf8");
   } catch (err) {
-    return { ok: false, message: `FAIL cannot read ${path95}: ${err instanceof Error ? err.message : "unknown"}` };
+    return { ok: false, message: `FAIL cannot read ${path96}: ${err instanceof Error ? err.message : "unknown"}` };
   }
   if (!text.replace(/^/, "").startsWith("---")) {
-    return { ok: false, message: `FAIL ${path95}: no YAML frontmatter (missing opening --- marker)` };
+    return { ok: false, message: `FAIL ${path96}: no YAML frontmatter (missing opening --- marker)` };
   }
   if (!text.includes("\n---", 3)) {
-    return { ok: false, message: `FAIL ${path95}: frontmatter block never closed (missing closing --- marker)` };
+    return { ok: false, message: `FAIL ${path96}: frontmatter block never closed (missing closing --- marker)` };
   }
   const fm = extractFrontmatter(text);
   if (fm === null) {
-    return { ok: false, message: `FAIL ${path95}: frontmatter could not be parsed as YAML` };
+    return { ok: false, message: `FAIL ${path96}: frontmatter could not be parsed as YAML` };
   }
   const hasScores = "k5_scores" in fm;
   const hasBoost = "k5_boost" in fm;
   const hasComposite = "k5_composite" in fm;
   const hasScoredAt = "k5_scored_at" in fm;
   if (!hasScores && !hasBoost && !hasComposite && !hasScoredAt) {
-    return { ok: true, message: `PASS ${path95}: k5_scores absent (acceptable \u2014 legacy plan)` };
+    return { ok: true, message: `PASS ${path96}: k5_scores absent (acceptable \u2014 legacy plan)` };
   }
   const errors = [];
   if (hasScores) {
@@ -44298,9 +44745,9 @@ function validatePlan(path95) {
     if (err !== null) errors.push(err);
   }
   if (errors.length > 0) {
-    return { ok: false, message: `FAIL ${path95}: ${errors.join("; ")}` };
+    return { ok: false, message: `FAIL ${path96}: ${errors.join("; ")}` };
   }
-  const lines = [`PASS ${path95}: k5_scores valid`];
+  const lines = [`PASS ${path96}: k5_scores valid`];
   if (hasScores && typeof fm.k5_scores === "object" && fm.k5_scores !== null) {
     const scoresObj = fm.k5_scores;
     const vals = [];
@@ -44445,12 +44892,12 @@ function registerFlywheelK10Measure(parent) {
 
 // src/commands/flywheel/check-persona-skeleton.ts
 import { existsSync as existsSync110, readFileSync as readFileSync91, statSync as statSync31 } from "node:fs";
-import { homedir as homedir59 } from "node:os";
+import { homedir as homedir60 } from "node:os";
 import { basename as basename14, join as join103 } from "node:path";
 import { parse as parseYAML2 } from "yaml";
 var CHARS_PER_TOKEN3 = 4;
 var K10_TOKEN_CAP2 = 6e3;
-var AGENTS_DIR = join103(homedir59(), ".claude", "agents");
+var AGENTS_DIR = join103(homedir60(), ".claude", "agents");
 var REQUIRED_FRONTMATTER_KEYS = ["name", "description", "allowed-tools"];
 var REQUIRED_SECTIONS = [
   "## Role",
@@ -44700,7 +45147,7 @@ ${formatRedivergencePrompt(persona_a, persona_b, score, void 0, void 0, threshol
 
 // src/commands/flywheel/ping.ts
 import { mkdirSync as mkdirSync64, writeFileSync as writeFileSync56 } from "node:fs";
-import { homedir as homedir60 } from "node:os";
+import { homedir as homedir61 } from "node:os";
 import { dirname as dirname60, join as join104 } from "node:path";
 var COLD_START_BUDGET_GOOD_MS = 200;
 var COLD_START_BUDGET_FAIR_MS = 500;
@@ -44717,7 +45164,7 @@ function readOlamVersion() {
   }
 }
 function writeBaseline(record) {
-  const baselinePath = join104(homedir60(), ".local", "share", "olam", "flywheel-baseline.json");
+  const baselinePath = join104(homedir61(), ".local", "share", "olam", "flywheel-baseline.json");
   mkdirSync64(dirname60(baselinePath), { recursive: true });
   writeFileSync56(baselinePath, JSON.stringify(record, null, 2) + "\n", "utf8");
   return baselinePath;
@@ -44766,8 +45213,8 @@ import {
   statSync as statSync32,
   writeFileSync as writeFileSync57
 } from "node:fs";
-import { spawnSync as spawnSync30 } from "node:child_process";
-import { homedir as homedir61 } from "node:os";
+import { spawnSync as spawnSync31 } from "node:child_process";
+import { homedir as homedir62 } from "node:os";
 import { dirname as dirname61, join as join105, relative as relative7 } from "node:path";
 function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -44844,7 +45291,7 @@ function resolveAtlasUser2(opts) {
     assertValidAtlasUser(v);
     return v;
   }
-  const claudeDir2 = opts._testClaudeDir ?? process.env["OLAM_CLAUDE_DIR"] ?? join105(homedir61(), ".claude");
+  const claudeDir2 = opts._testClaudeDir ?? process.env["OLAM_CLAUDE_DIR"] ?? join105(homedir62(), ".claude");
   const f = join105(claudeDir2, ".atlas-user");
   if (existsSync111(f)) {
     const v = readFileSync93(f, "utf-8").trim();
@@ -44855,7 +45302,7 @@ function resolveAtlasUser2(opts) {
   return null;
 }
 function runGit2(args, cwd) {
-  const result = spawnSync30("git", args, {
+  const result = spawnSync31("git", args, {
     cwd,
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "pipe"]
@@ -44981,7 +45428,7 @@ function pushOverlays(opts) {
   Run \`olam skills atlas-user set <name>\` to configure your atlas user.`
     );
   }
-  const claudeDir2 = opts._testClaudeDir ?? opts.targetDir ?? process.env["OLAM_CLAUDE_DIR"] ?? join105(homedir61(), ".claude");
+  const claudeDir2 = opts._testClaudeDir ?? opts.targetDir ?? process.env["OLAM_CLAUDE_DIR"] ?? join105(homedir62(), ".claude");
   const sourceFiles = walkPushSourceFiles(claudeDir2);
   const registeredPrefixes = (opts._testSkillSources ?? listSkillSources()).map((s) => s.prefix).filter((p) => typeof p === "string" && p.length > 0);
   if (registeredPrefixes.length > 0) {
@@ -45289,7 +45736,7 @@ Next steps (run in ${clonePath}):`,
   };
 }
 function migrateOverlays(opts = {}) {
-  const root = opts.targetDir ?? join105(homedir61(), ".claude");
+  const root = opts.targetDir ?? join105(homedir62(), ".claude");
   const overrideRoots = [
     join105(root, "skills.overrides"),
     join105(root, "agents.overrides")
@@ -45411,7 +45858,7 @@ function registerFlywheelMigrateOverlays(parent) {
       }
       return;
     }
-    const root = opts.targetDir ?? join105(homedir61(), ".claude");
+    const root = opts.targetDir ?? join105(homedir62(), ".claude");
     const summary2 = migrateOverlays(opts);
     if (opts.json === true) {
       process.stdout.write(JSON.stringify(summary2, null, 2) + "\n");
@@ -45468,7 +45915,7 @@ function registerFlywheel(program2) {
 
 // src/commands/seed.ts
 init_output();
-import { spawnSync as spawnSync31, spawn as spawnAsync2 } from "node:child_process";
+import { spawnSync as spawnSync32, spawn as spawnAsync2 } from "node:child_process";
 var DEFAULT_SINGLETON_CONTAINER = "olam-postgres";
 var DEFAULT_SINGLETON_USER = "development";
 function assertValidSeedName(name) {
@@ -45479,7 +45926,7 @@ function assertValidSeedName(name) {
   }
 }
 function singletonDocker(container, user, args, stdin) {
-  return spawnSync31(
+  return spawnSync32(
     "docker",
     ["exec", "-i", container, "psql", "-U", user, ...args],
     { encoding: "utf-8", input: stdin }
@@ -45534,7 +45981,7 @@ async function handleBake(opts) {
   if (sources.length > 1) {
     throw new Error("multiple sources specified \u2014 pass exactly one of --source-container, --source-url, --source-local");
   }
-  const ping = spawnSync31("docker", ["inspect", "--format", "{{.State.Status}}", singleton], { encoding: "utf-8" });
+  const ping = spawnSync32("docker", ["inspect", "--format", "{{.State.Status}}", singleton], { encoding: "utf-8" });
   if (ping.status !== 0 || (ping.stdout || "").trim() !== "running") {
     throw new Error(`singleton container "${singleton}" not running \u2014 run \`olam bootstrap\` first`);
   }
@@ -45717,12 +46164,12 @@ init_output();
 import { spawnSync as defaultSpawnSync } from "node:child_process";
 import * as fs94 from "node:fs";
 import * as os49 from "node:os";
-import * as path93 from "node:path";
+import * as path94 from "node:path";
 function devboxContainerName(worldId) {
   return `olam-${worldId}-devbox`;
 }
 function olamHomeDir() {
-  return process.env["OLAM_HOME"] ?? path93.join(os49.homedir(), ".olam");
+  return process.env["OLAM_HOME"] ?? path94.join(os49.homedir(), ".olam");
 }
 function defaultRestartContainer(name, spawn13 = defaultSpawnSync) {
   const r = spawn13("docker", ["restart", "--time", "30", name], {
@@ -45736,7 +46183,7 @@ function defaultRestartContainer(name, spawn13 = defaultSpawnSync) {
 }
 function defaultAppendAuditLog(homeDir, line) {
   fs94.mkdirSync(homeDir, { recursive: true });
-  fs94.appendFileSync(path93.join(homeDir, "usage.log"), line.endsWith("\n") ? line : line + "\n", {
+  fs94.appendFileSync(path94.join(homeDir, "usage.log"), line.endsWith("\n") ? line : line + "\n", {
     encoding: "utf-8"
   });
 }
@@ -45781,9 +46228,9 @@ async function doRekey(worldId, deps) {
   );
   const rotatedAt = deps.now().toISOString();
   const homeDir = deps.olamHomeDir();
-  const worldDir = path93.join(homeDir, "worlds", worldId);
+  const worldDir = path94.join(homeDir, "worlds", worldId);
   fs94.mkdirSync(worldDir, { recursive: true });
-  const credentialsPath = path93.join(worldDir, "credentials.json");
+  const credentialsPath = path94.join(worldDir, "credentials.json");
   const payload = {
     worldRoleName,
     password,
@@ -45858,12 +46305,12 @@ function registerRekey(program2) {
 
 // src/pleri-config.ts
 import * as fs95 from "node:fs";
-import * as path94 from "node:path";
+import * as path95 from "node:path";
 function isPleriConfigured(configDir = process.env.OLAM_CONFIG_DIR ?? ".olam") {
   if (process.env.PLERI_BASE_URL) {
     return true;
   }
-  const configPath = path94.join(configDir, "config.yaml");
+  const configPath = path95.join(configDir, "config.yaml");
   if (!fs95.existsSync(configPath)) {
     return false;
   }
@@ -45902,6 +46349,7 @@ registerDestroy(program);
 registerClean(program);
 registerImplode(program);
 registerEnter(program);
+registerResume(program);
 registerCrystallize(program, { hidden: !isPleriConfigured() });
 registerPr(program);
 registerWorkspace(program);