@pleri/olam-cli 0.1.207 → 0.1.209

package/dist/mcp-server.js

@@ -10908,24 +10908,62 @@ var require_dist = __commonJS({
   }
 });
 
+// ../core/dist/paths/olam-paths.js
+import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+function olamHome() {
+  const fromEnv = process.env["OLAM_HOME"];
+  if (fromEnv && fromEnv.length > 0)
+    return fromEnv;
+  return join2(homedir(), ".olam");
+}
+function claudeDir() {
+  const fromEnv = process.env["OLAM_CLAUDE_DIR"];
+  if (fromEnv && fromEnv.length > 0)
+    return fromEnv;
+  return join2(homedir(), ".claude");
+}
+function globalConfigPath() {
+  const override = process.env["OLAM_GLOBAL_CONFIG_PATH"];
+  if (override && override.length > 0)
+    return override;
+  return join2(olamHome(), "config.json");
+}
+function stateDir() {
+  const override = process.env["OLAM_STATE_DIR"];
+  if (override && override.length > 0)
+    return override;
+  return join2(olamHome(), "state");
+}
+function skillSourcesDir() {
+  const override = process.env["OLAM_SKILL_SOURCES_DIR"];
+  if (override && override.length > 0)
+    return override;
+  return join2(stateDir(), "skill-sources");
+}
+var init_olam_paths = __esm({
+  "../core/dist/paths/olam-paths.js"() {
+    "use strict";
+  }
+});
+
 // ../core/dist/secrets/paths.js
 import * as fs2 from "node:fs";
-import * as os from "node:os";
 import * as path2 from "node:path";
-function olamHome() {
-  return process.env.OLAM_HOME ?? path2.join(os.homedir(), ".olam");
+function olamHome2() {
+  return olamHome();
 }
 function canonicalSecretPath(name) {
-  return path2.join(olamHome(), "secrets", name);
+  return path2.join(olamHome2(), "secrets", name);
 }
 function ensureSecretsDir() {
-  fs2.mkdirSync(path2.join(olamHome(), "secrets"), { recursive: true, mode: 448 });
+  fs2.mkdirSync(path2.join(olamHome2(), "secrets"), { recursive: true, mode: 448 });
 }
 function resolveSecretPath(name) {
   const newPath = canonicalSecretPath(name);
   if (fs2.existsSync(newPath))
     return newPath;
-  const oldPath = path2.join(olamHome(), name);
+  const oldPath = path2.join(olamHome2(), name);
   if (fs2.existsSync(oldPath)) {
     if (!_warnedNames.has(name)) {
       _warnedNames.add(name);
@@ -10942,6 +10980,7 @@ var _warnedNames;
 var init_paths = __esm({
   "../core/dist/secrets/paths.js"() {
     "use strict";
+    init_olam_paths();
     _warnedNames = /* @__PURE__ */ new Set();
   }
 });
@@ -11048,7 +11087,7 @@ var init_version2 = __esm({
 
 // ../core/dist/world/repo-manifest.js
 import { existsSync as existsSync5, lstatSync, readFileSync as readFileSync3 } from "node:fs";
-import { join as join5, resolve as resolve3, sep } from "node:path";
+import { join as join6, resolve as resolve3, sep } from "node:path";
 import YAML from "yaml";
 function bootstrapStepCmd(entry) {
   return typeof entry === "string" ? entry : entry.cmd;
@@ -11112,8 +11151,8 @@ function isPlainObject3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && Object.getPrototypeOf(value) === Object.prototype;
 }
 function loadRepoManifest(repoDir) {
-  const olamPath = join5(repoDir, ".olam.yaml");
-  const adbPath = join5(repoDir, ".adb.yaml");
+  const olamPath = join6(repoDir, ".olam.yaml");
+  const adbPath = join6(repoDir, ".adb.yaml");
   let manifestPath2;
   let source;
   if (existsSync5(olamPath)) {
@@ -11354,13 +11393,13 @@ var init_repo_manifest = __esm({
 });
 
 // ../core/dist/util/path.js
-import * as os4 from "node:os";
+import * as os3 from "node:os";
 import * as path6 from "node:path";
 function resolveTildePath(p) {
   if (p === "~")
-    return os4.homedir();
+    return os3.homedir();
   if (p.startsWith("~/"))
-    return path6.join(os4.homedir(), p.slice(2));
+    return path6.join(os3.homedir(), p.slice(2));
   if (p.startsWith("~")) {
     throw new Error(`[path] POSIX "~user" syntax is not supported (got "${p}"). Use "~/..." for the operator's home or an absolute path.`);
   }
@@ -11376,14 +11415,14 @@ var init_path = __esm({
 
 // ../core/dist/workspace/store.js
 import * as fs5 from "node:fs";
-import * as os5 from "node:os";
+import * as os4 from "node:os";
 import * as path7 from "node:path";
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
 function workspacesDir() {
   const override = process.env["OLAM_WORKSPACES_DIR"];
   if (override && override.length > 0)
     return override;
-  return path7.join(os5.homedir(), ".olam", "workspaces");
+  return path7.join(os4.homedir(), ".olam", "workspaces");
 }
 function validateName(name) {
   if (!WORKSPACE_NAME_PATTERN.test(name)) {
@@ -11752,7 +11791,7 @@ var init_volume = __esm({
 
 // ../adapters/dist/shared/anthropic-base-url.js
 import * as fs6 from "node:fs";
-import * as os6 from "node:os";
+import * as os5 from "node:os";
 import * as path8 from "node:path";
 function normalizeAnthropicBaseUrl(raw) {
   if (!raw)
@@ -11780,7 +11819,7 @@ function readAnthropicBaseUrl() {
   if (fromOlamEnv && fromOlamEnv.length > 0) {
     return normalizeAnthropicBaseUrl(fromOlamEnv.trim());
   }
-  const file2 = path8.join(os6.homedir(), ".olam", "anthropic-base-url");
+  const file2 = path8.join(os5.homedir(), ".olam", "anthropic-base-url");
   try {
     const content = fs6.readFileSync(file2, "utf-8").trim();
     if (content.length > 0)
@@ -12458,7 +12497,7 @@ var init_loader = __esm({
 
 // ../adapters/dist/docker/container.js
 import * as fs9 from "node:fs";
-import * as os7 from "node:os";
+import * as os6 from "node:os";
 import * as path10 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function readAuthSecret() {
@@ -12476,7 +12515,7 @@ function readHostCpToken() {
   const fromEnv = process.env["OLAM_HOST_CP_TOKEN"];
   if (fromEnv && fromEnv.length > 0)
     return fromEnv;
-  const file2 = path10.join(os7.homedir(), ".olam", "host-cp.token");
+  const file2 = path10.join(os6.homedir(), ".olam", "host-cp.token");
   try {
     return fs9.readFileSync(file2, "utf-8").trim();
   } catch {
@@ -12499,9 +12538,9 @@ function isKubernetesServiceSubstrate() {
 }
 function expandHome(p) {
   if (p.startsWith("~/"))
-    return path10.join(os7.homedir(), p.slice(2));
+    return path10.join(os6.homedir(), p.slice(2));
   if (p === "~")
-    return os7.homedir();
+    return os6.homedir();
   return p;
 }
 function readCloudMemorySecretAtPath(secretRef) {
@@ -12743,7 +12782,7 @@ var init_container = __esm({
         ...env
       };
       const envList = Object.entries(worldEnv).map(([k, v]) => `${k}=${v}`);
-      const olamHomeDir = process.env["HOME"] ?? os7.homedir();
+      const olamHomeDir = process.env["HOME"] ?? os6.homedir();
       const hostWorkspacesDir = `${olamHomeDir}/.olam/workspaces`;
       const binds = [
         "/var/run/docker.sock:/var/run/docker.sock",
@@ -14245,19 +14284,19 @@ var init_schema4 = __esm({
 
 // ../core/dist/global-config/store.js
 import * as fs13 from "node:fs";
-import * as os9 from "node:os";
+import * as os8 from "node:os";
 import * as path16 from "node:path";
-function globalConfigPath() {
+function globalConfigPath2() {
   const override = process.env["OLAM_GLOBAL_CONFIG_PATH"];
   if (override && override.length > 0)
     return override;
   if (process.env["VITEST"]) {
-    return path16.join(os9.tmpdir(), `olam-vitest-global-config-${process.pid}.json`);
+    return path16.join(os8.tmpdir(), `olam-vitest-global-config-${process.pid}.json`);
   }
-  return path16.join(os9.homedir(), ".olam", "config.json");
+  return globalConfigPath();
 }
 function readGlobalConfig() {
-  const configPath = globalConfigPath();
+  const configPath = globalConfigPath2();
   if (!fs13.existsSync(configPath)) {
     return { ...DEFAULT_GLOBAL_CONFIG };
   }
@@ -14369,7 +14408,7 @@ function migrateSchemaVersion(parsed) {
   return { value: { ...obj, schemaVersion: 1 }, changed: true };
 }
 function writeGlobalConfig(config2) {
-  const configPath = globalConfigPath();
+  const configPath = globalConfigPath2();
   const validated = GlobalConfigSchema.parse(config2);
   const dir = path16.dirname(configPath);
   fs13.mkdirSync(dir, { recursive: true });
@@ -14383,6 +14422,7 @@ var init_store2 = __esm({
     "use strict";
     init_schema4();
     init_schema3();
+    init_olam_paths();
     quarantineSink = (configPath, report) => {
       if (report.drops.length === 0)
         return;
@@ -14410,11 +14450,11 @@ var init_store2 = __esm({
 
 // ../core/dist/global-config/repos.js
 import * as fs14 from "node:fs";
-import * as os10 from "node:os";
+import * as os9 from "node:os";
 import * as path17 from "node:path";
 function expandPath(p) {
   if (p === "~" || p.startsWith("~/")) {
-    return path17.join(os10.homedir(), p.slice(1));
+    return path17.join(os9.homedir(), p.slice(1));
   }
   return p;
 }
@@ -14694,13 +14734,11 @@ var init_bridge = __esm({
 // ../core/dist/skill-sources/trust-audit-log.js
 import * as fs16 from "node:fs";
 import * as path18 from "node:path";
-import * as os11 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"] ?? path18.join(os11.homedir(), ".olam", "state");
-  return path18.join(stateDir, SKILL_SOURCES_AUDIT_LOG_FILENAME);
+  return path18.join(stateDir(), SKILL_SOURCES_AUDIT_LOG_FILENAME);
 }
 function appendTrustAudit(entry) {
   const candidate = {
@@ -14744,6 +14782,7 @@ var init_trust_audit_log = __esm({
   "../core/dist/skill-sources/trust-audit-log.js"() {
     "use strict";
     init_v3();
+    init_olam_paths();
     SKILL_SOURCES_AUDIT_LOG_FILENAME = "skill-sources-audit.log";
     TrustActionSchema = external_exports2.enum([
       "added",
@@ -14773,13 +14812,9 @@ var init_trust_audit_log = __esm({
 // ../core/dist/skill-sources/clone.js
 import { execFileSync as execFileSync2 } from "node:child_process";
 import * as fs17 from "node:fs";
-import * as os12 from "node:os";
 import * as path19 from "node:path";
 function skillSourcesRootDir() {
-  const override = process.env["OLAM_SKILL_SOURCES_DIR"];
-  if (override && override.length > 0)
-    return override;
-  return path19.join(os12.homedir(), ".olam", "state", "skill-sources");
+  return skillSourcesDir();
 }
 function skillSourceClonePath(id) {
   return path19.join(skillSourcesRootDir(), id);
@@ -14845,6 +14880,7 @@ var SkillSourceGitError;
 var init_clone = __esm({
   "../core/dist/skill-sources/clone.js"() {
     "use strict";
+    init_olam_paths();
     SkillSourceGitError = class extends Error {
       op;
       gitUrl;
@@ -15407,10 +15443,9 @@ var init_merge_settings = __esm({
 // ../core/dist/skill-sources/hook-install.js
 import * as fs22 from "node:fs";
 import * as path23 from "node:path";
-import * as os13 from "node:os";
 function settingsPathFor(scope, cwd) {
   if (scope === "user") {
-    return path23.join(os13.homedir(), ".claude", "settings.json");
+    return path23.join(claudeDir(), "settings.json");
   }
   return path23.join(cwd ?? process.cwd(), ".claude", "settings.json");
 }
@@ -15478,6 +15513,7 @@ function isSkillsHookInstalled(filePath) {
 var init_hook_install = __esm({
   "../core/dist/skill-sources/hook-install.js"() {
     "use strict";
+    init_olam_paths();
     init_merge_settings();
     init_hook_template();
   }
@@ -15485,19 +15521,19 @@ var init_hook_install = __esm({
 
 // ../core/dist/skill-sources/migration-snapshot.js
 import * as fs23 from "node:fs";
-import * as os14 from "node:os";
+import * as os10 from "node:os";
 import * as path24 from "node:path";
 function claudeDirInternal() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path24.join(os14.homedir(), ".claude");
+  return path24.join(os10.homedir(), ".claude");
 }
 function migrationSnapshotsDir() {
   const override = process.env["OLAM_MIGRATION_SNAPSHOTS_DIR"];
   if (override && override.length > 0)
     return override;
-  return path24.join(os14.homedir(), ".olam", "state", "migration-snapshots");
+  return path24.join(os10.homedir(), ".olam", "state", "migration-snapshots");
 }
 function listToolboxManagedSymlinks(toolboxPath) {
   const claude = claudeDirInternal();
@@ -15870,13 +15906,13 @@ var init_shim_targets = __esm({
 
 // ../core/dist/skill-sync/symlink-deployer.js
 import * as fs25 from "node:fs";
-import * as os15 from "node:os";
+import * as os11 from "node:os";
 import * as path26 from "node:path";
-function claudeDir() {
+function claudeDir2() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path26.join(os15.homedir(), ".claude");
+  return path26.join(os11.homedir(), ".claude");
 }
 function bucketFor(kind) {
   switch (kind) {
@@ -16007,7 +16043,7 @@ function linkIfNeeded(target, link) {
   return { created: true, shadowBackup: backup };
 }
 function deployArtifacts(artifacts, opts) {
-  const claude = claudeDir();
+  const claude = claudeDir2();
   for (const bucket of BUCKETS) {
     fs25.mkdirSync(path26.join(claude, bucket), { recursive: true });
   }
@@ -16270,8 +16306,8 @@ var init_model_router = __esm({
 
 // ../core/dist/meta-hooks/model-router-deploy.js
 import { existsSync as existsSync32, mkdirSync as mkdirSync16, readFileSync as readFileSync23, writeFileSync as writeFileSync15 } from "node:fs";
-import { homedir as homedir18 } from "node:os";
-import { dirname as dirname13, join as join29, resolve as resolve7 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { dirname as dirname13, join as join30, resolve as resolve7 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function resolveModelRouterSourcePath() {
   const here = dirname13(fileURLToPath3(import.meta.url));
@@ -16291,8 +16327,8 @@ function resolveModelRouterSourcePath() {
   return candidates[0];
 }
 function deployModelRouterScript(opts = {}) {
-  const targetDir = opts.targetDir ?? join29(homedir18(), ".claude", "hooks");
-  const targetPath = join29(targetDir, MODEL_ROUTER_SCRIPT_BASENAME);
+  const targetDir = opts.targetDir ?? join30(homedir14(), ".claude", "hooks");
+  const targetPath = join30(targetDir, MODEL_ROUTER_SCRIPT_BASENAME);
   const sourcePath = opts.sourcePath ?? resolveModelRouterSourcePath();
   if (!existsSync32(sourcePath)) {
     return { basename: MODEL_ROUTER_SCRIPT_BASENAME, action: "source-missing", targetPath };
@@ -16331,7 +16367,7 @@ var init_meta_hooks = __esm({
 
 // ../core/dist/skill-sync/settings-merger.js
 import * as fs29 from "node:fs";
-import * as os16 from "node:os";
+import * as os12 from "node:os";
 import * as path27 from "node:path";
 function claudeSettingsPath() {
   const override = process.env["OLAM_CLAUDE_SETTINGS_PATH"];
@@ -16343,13 +16379,13 @@ function claudeDirInternal2() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path27.join(os16.homedir(), ".claude");
+  return path27.join(os12.homedir(), ".claude");
 }
 function settingsBackupDir() {
   const override = process.env["OLAM_SETTINGS_BACKUP_DIR"];
   if (override && override.length > 0)
     return override;
-  return path27.join(os16.homedir(), ".olam", "state", "settings-backups");
+  return path27.join(os12.homedir(), ".olam", "state", "settings-backups");
 }
 function dedupeByMatcher(entries) {
   const map2 = /* @__PURE__ */ new Map();
@@ -16625,8 +16661,12 @@ var init_per_project_override = __esm({
 
 // ../core/dist/lib/file-lock.js
 import * as fs31 from "node:fs";
-import * as os17 from "node:os";
+import * as os13 from "node:os";
 import * as path29 from "node:path";
+function mintToken2() {
+  tokenCounter += 1;
+  return `${process.pid}-${tokenCounter}-${Math.random().toString(36).slice(2, 10)}`;
+}
 function defaultIsPidAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -16651,43 +16691,69 @@ function readLockMeta(lockPath) {
   return void 0;
 }
 function isLockStale(meta3, opts) {
-  if (meta3.hostname !== os17.hostname()) {
+  if (meta3.hostname !== os13.hostname()) {
     return opts.now - meta3.timestamp > opts.staleLockMs * 2;
   }
   if (!opts.isPidAlive(meta3.pid))
     return true;
   return opts.now - meta3.timestamp > opts.staleLockMs;
 }
+function sameAcquisition(a, b) {
+  if (a.token !== void 0 && b.token !== void 0)
+    return a.token === b.token;
+  return a.pid === b.pid && a.timestamp === b.timestamp;
+}
+function createLockFile(lockPath, meta3) {
+  const fd = fs31.openSync(lockPath, "wx", 384);
+  try {
+    fs31.writeSync(fd, JSON.stringify(meta3));
+    fs31.fsyncSync(fd);
+  } finally {
+    fs31.closeSync(fd);
+  }
+}
 function tryAcquireOnce(lockPath, meta3, opts) {
+  fs31.mkdirSync(path29.dirname(lockPath), { recursive: true });
   try {
-    fs31.mkdirSync(path29.dirname(lockPath), { recursive: true });
-    const fd = fs31.openSync(lockPath, "wx", 384);
-    try {
-      fs31.writeSync(fd, JSON.stringify(meta3));
-    } finally {
-      fs31.closeSync(fd);
-    }
+    createLockFile(lockPath, meta3);
     return true;
   } catch (err) {
     const code = err.code;
     if (code !== "EEXIST")
       throw err;
-    const existing = readLockMeta(lockPath);
-    if (existing === void 0) {
-      try {
-        fs31.unlinkSync(lockPath);
-      } catch {
-      }
-      return tryAcquireOnce(lockPath, meta3, opts);
+  }
+  const existing = readLockMeta(lockPath);
+  if (existing === void 0) {
+    let mtimeMs;
+    try {
+      mtimeMs = fs31.statSync(lockPath).mtimeMs;
+    } catch {
+      mtimeMs = 0;
     }
-    if (isLockStale(existing, opts)) {
-      try {
-        fs31.unlinkSync(lockPath);
-      } catch {
-      }
-      return tryAcquireOnce(lockPath, meta3, opts);
+    const graceMs = Math.min(2e3, opts.staleLockMs);
+    if (mtimeMs !== 0 && opts.now - mtimeMs <= graceMs) {
+      return false;
     }
+  } else if (!isLockStale(existing, opts)) {
     return false;
+  } else {
+    const recheck = readLockMeta(lockPath);
+    if (recheck !== void 0 && (!sameAcquisition(existing, recheck) || !isLockStale(recheck, opts))) {
+      return false;
+    }
+  }
+  try {
+    fs31.unlinkSync(lockPath);
+  } catch {
+  }
+  try {
+    createLockFile(lockPath, meta3);
+    return true;
+  } catch (err) {
+    const code = err.code;
+    if (code === "EEXIST")
+      return false;
+    throw err;
   }
 }
 async function acquireFileLock(lockDir, options = {}) {
@@ -16697,20 +16763,35 @@ async function acquireFileLock(lockDir, options = {}) {
   const staleLockMs = options.staleLockMs ?? DEFAULT_STALE_LOCK_MS;
   const now = options.now ?? Date.now;
   const isPidAlive2 = options.isPidAlive ?? defaultIsPidAlive;
+  const ownToken = mintToken2();
   const deadline = now() + acquireTimeoutMs;
   let backoffMs = 25;
   while (true) {
     const meta3 = {
+      token: ownToken,
       pid: process.pid,
-      hostname: os17.hostname(),
+      hostname: os13.hostname(),
       timestamp: now(),
       ...options.reason ? { reason: options.reason } : {}
     };
     const acquired = tryAcquireOnce(lockPath, meta3, { now: now(), staleLockMs, isPidAlive: isPidAlive2 });
     if (acquired) {
+      let released = false;
       return {
         lockPath,
+        // Ownership-checked release: only unlink if WE still own the file.
+        // A holder that overran its lease and was stolen must not delete
+        // the new holder's lock. Idempotent (safe to call twice).
         release: () => {
+          if (released)
+            return;
+          released = true;
+          const current = readLockMeta(lockPath);
+          if (current === void 0)
+            return;
+          const isOurs = current.token !== void 0 ? current.token === ownToken : current.pid === process.pid;
+          if (!isOurs)
+            return;
           try {
             fs31.unlinkSync(lockPath);
           } catch {
@@ -16723,7 +16804,8 @@ async function acquireFileLock(lockDir, options = {}) {
       const held = existing ? `(held by pid ${existing.pid} on ${existing.hostname}, since ${new Date(existing.timestamp).toISOString()})` : "(holder unknown)";
       throw new FileLockError(`failed to acquire file lock at ${lockPath} within ${acquireTimeoutMs}ms ${held}`);
     }
-    await sleep3(Math.min(backoffMs, 200));
+    const jittered = backoffMs * (0.5 + Math.random());
+    await sleep3(Math.min(jittered, 200));
     backoffMs = Math.min(backoffMs * 2, 200);
   }
 }
@@ -16735,7 +16817,7 @@ async function withFileLock(lockDir, fn, options) {
     release();
   }
 }
-var DEFAULT_LOCK_FILENAME, DEFAULT_ACQUIRE_TIMEOUT_MS, DEFAULT_STALE_LOCK_MS, FileLockError;
+var DEFAULT_LOCK_FILENAME, DEFAULT_ACQUIRE_TIMEOUT_MS, DEFAULT_STALE_LOCK_MS, FileLockError, tokenCounter;
 var init_file_lock = __esm({
   "../core/dist/lib/file-lock.js"() {
     "use strict";
@@ -16748,6 +16830,7 @@ var init_file_lock = __esm({
         this.name = "FileLockError";
       }
     };
+    tokenCounter = 0;
   }
 });
 
@@ -16919,11 +17002,11 @@ var init_overlay_scan = __esm({
 
 // ../core/dist/skill-sync/settings-json-lock.js
 import * as fs33 from "node:fs";
-import * as os18 from "node:os";
+import * as os14 from "node:os";
 import * as path31 from "node:path";
 function defaultSettingsJsonLockPath() {
-  const stateDir = process.env["OLAM_STATE_DIR"] ?? path31.join(os18.homedir(), ".olam", "state");
-  return path31.join(stateDir, SETTINGS_JSON_LOCK_FILENAME);
+  const stateDir2 = process.env["OLAM_STATE_DIR"] ?? path31.join(os14.homedir(), ".olam", "state");
+  return path31.join(stateDir2, SETTINGS_JSON_LOCK_FILENAME);
 }
 function defaultIsPidAlive2(pid) {
   try {
@@ -16952,7 +17035,7 @@ function isLockStale2(meta3, opts) {
   const ageMs = opts.now - meta3.timestamp;
   if (ageMs < opts.staleLockMs / 2)
     return false;
-  if (meta3.hostname !== os18.hostname()) {
+  if (meta3.hostname !== os14.hostname()) {
     return ageMs > opts.staleLockMs * 2;
   }
   if (!opts.isPidAlive(meta3.pid))
@@ -17009,7 +17092,7 @@ async function acquireSettingsJsonLock(options = {}) {
   while (true) {
     const meta3 = {
       pid: process.pid,
-      hostname: os18.hostname(),
+      hostname: os14.hostname(),
       timestamp: now(),
       ...options.reason ? { reason: options.reason } : {}
     };
@@ -17123,13 +17206,13 @@ var init_services_status = __esm({
 // ../core/dist/skill-sources/meta-hooks-migration-snapshot.js
 import * as crypto5 from "node:crypto";
 import * as fs34 from "node:fs";
-import * as os19 from "node:os";
+import * as os15 from "node:os";
 import * as path32 from "node:path";
 function migrationSnapshotsDir2() {
   const override = process.env["OLAM_MIGRATION_SNAPSHOTS_DIR"];
   if (override && override.length > 0)
     return override;
-  return path32.join(os19.homedir(), ".olam", "state", "migration-snapshots");
+  return path32.join(os15.homedir(), ".olam", "state", "migration-snapshots");
 }
 function writeMetaHooksSnapshot(originalSettings) {
   const snapshot = {
@@ -17434,7 +17517,7 @@ var init_meta_hook_injector = __esm({
 
 // ../core/dist/lib/markdown-merger.js
 import { createHash as createHash5 } from "node:crypto";
-import { readFileSync as readFileSync31, existsSync as existsSync38, statSync as statSync9 } from "node:fs";
+import { readFileSync as readFileSync31, existsSync as existsSync38, statSync as statSync10 } from "node:fs";
 function parseFrontmatter(text) {
   const match = FM_RE2.exec(text);
   if (match === null)
@@ -17563,7 +17646,7 @@ function mergeMarkdown(upstreamText, overlayText, labelForError, upstreamPath, o
   return { merged: fmBlock !== "" ? fmBlock + mergedBody : mergedBody };
 }
 function sha256OfPath(p) {
-  if (!existsSync38(p) || !statSync9(p).isFile())
+  if (!existsSync38(p) || !statSync10(p).isFile())
     return "MISSING";
   return createHash5("sha256").update(readFileSync31(p)).digest("hex");
 }
@@ -17580,9 +17663,9 @@ var init_markdown_merger = __esm({
 import * as fs35 from "node:fs";
 import * as path33 from "node:path";
 function materializeMergedSkill(opts) {
-  const { sourceId, sourcePath, deployBasename, mergedContent, claudeDir: claudeDir2 } = opts;
-  const managedDir = path33.join(claudeDir2, ".olam-merged", sourceId, deployBasename);
-  const sourceRoot = path33.resolve(path33.join(claudeDir2, ".olam-merged", sourceId));
+  const { sourceId, sourcePath, deployBasename, mergedContent, claudeDir: claudeDir3 } = opts;
+  const managedDir = path33.join(claudeDir3, ".olam-merged", sourceId, deployBasename);
+  const sourceRoot = path33.resolve(path33.join(claudeDir3, ".olam-merged", sourceId));
   const managedResolved = path33.resolve(managedDir);
   if (!(managedResolved === sourceRoot || managedResolved.startsWith(sourceRoot + path33.sep))) {
     throw new Error(`[managed-merge] refusing to materialize: deployBasename "${deployBasename}" escapes managed root "${sourceRoot}" (resolved to "${managedResolved}")`);
@@ -17621,8 +17704,8 @@ function materializeMergedSkill(opts) {
   }
   return managedDir;
 }
-function cleanMergedDir(claudeDir2) {
-  fs35.rmSync(path33.join(claudeDir2, ".olam-merged"), { recursive: true, force: true });
+function cleanMergedDir(claudeDir3) {
+  fs35.rmSync(path33.join(claudeDir3, ".olam-merged"), { recursive: true, force: true });
 }
 var init_managed_merge = __esm({
   "../core/dist/skill-sync/managed-merge.js"() {
@@ -17742,7 +17825,7 @@ function buildSourcePrefixMap(sources) {
     registeredPrefixes: Array.from(prefixes)
   };
 }
-function applyPrefixRewrites(baseArtifacts, sourceMap, claudeDir2, dryRun) {
+function applyPrefixRewrites(baseArtifacts, sourceMap, claudeDir3, dryRun) {
   const result = { rewrittenCount: 0, entries: [] };
   for (const artifact of baseArtifacts) {
     if (artifact.kind !== "skill" && artifact.kind !== "agent")
@@ -17783,7 +17866,7 @@ function applyPrefixRewrites(baseArtifacts, sourceMap, claudeDir2, dryRun) {
         sourcePath: artifact.sourcePath,
         deployBasename: renamed,
         mergedContent: rewritten,
-        claudeDir: claudeDir2
+        claudeDir: claudeDir3
       });
       artifact.sourcePath = managedDir;
       artifact.deployBasename = renamed;
@@ -17834,10 +17917,10 @@ var init_prefix_deploy = __esm({
 
 // ../core/dist/skill-sync/resolve-source-config.js
 import { readFileSync as readFileSync33, existsSync as existsSync39 } from "node:fs";
-import { join as join38 } from "node:path";
+import { join as join39 } from "node:path";
 import { parse as parseYaml4 } from "yaml";
 function sourceConfigPath(clonePath) {
-  return join38(clonePath, "shared", "source-config.yaml");
+  return join39(clonePath, "shared", "source-config.yaml");
 }
 function readSourceConfig(clonePath, sourceId) {
   const path62 = sourceConfigPath(clonePath);
@@ -17941,13 +18024,13 @@ var init_resolve_source_config = __esm({
 
 // ../core/dist/skill-sync/engine.js
 import * as fs37 from "node:fs";
-import * as os20 from "node:os";
+import * as os16 from "node:os";
 import * as path35 from "node:path";
 function resolveAtlasUser(override) {
   if (override)
     return override;
-  const claudeDir2 = process.env["OLAM_CLAUDE_DIR"] || path35.join(os20.homedir(), ".claude");
-  const f = path35.join(claudeDir2, ".atlas-user");
+  const claudeDir3 = process.env["OLAM_CLAUDE_DIR"] || path35.join(os16.homedir(), ".claude");
+  const f = path35.join(claudeDir3, ".atlas-user");
   if (fs37.existsSync(f)) {
     return fs37.readFileSync(f, "utf-8").trim() || void 0;
   }
@@ -18093,11 +18176,11 @@ async function syncSkills(opts = {}) {
   }
   const willMutateManagedDir = !opts.dryRun && (memberOverlaysEnabled && overlayArtifacts.length > 0 || hasPrefixRewrites);
   if (willMutateManagedDir) {
-    const claude = claudeDir();
+    const claude = claudeDir2();
     cleanMergedDir(claude);
   }
   if (memberOverlaysEnabled && overlayArtifacts.length > 0 && !opts.dryRun) {
-    const claude = claudeDir();
+    const claude = claudeDir2();
     for (const overlay of overlayArtifacts) {
       if (!overlay.targetKind)
         continue;
@@ -18137,7 +18220,7 @@ async function syncSkills(opts = {}) {
   }
   const hookFiles = projectFilteredArtifacts.filter((a) => a.kind === "hook").map((a) => a.sourcePath);
   const permissionFiles = projectFilteredArtifacts.filter((a) => a.kind === "permission").map((a) => a.sourcePath);
-  const claudeDirForRewrites = claudeDir();
+  const claudeDirForRewrites = claudeDir2();
   const prefixRewriteResult = applyPrefixRewrites(baseArtifacts, sourcePrefixMap, claudeDirForRewrites, opts.dryRun === true);
   const prefixCollisions = detectPrefixCollisions(effectiveSources);
   if (!opts.dryRun) {
@@ -18174,7 +18257,7 @@ async function syncSkills(opts = {}) {
     summary.collisions = detectCollisions(baseArtifacts).collisions;
     return summary;
   }
-  const claudeDirPath = process.env["OLAM_CLAUDE_DIR"] || path35.join(os20.homedir(), ".claude");
+  const claudeDirPath = process.env["OLAM_CLAUDE_DIR"] || path35.join(os16.homedir(), ".claude");
   const overlayReferences = scanOverlayReferences(claudeDirPath, SHIM_TARGETS.map((t) => t.basename));
   summary.deploy = deployArtifacts(baseArtifacts, {
     installedOlamVersion,
@@ -18273,7 +18356,7 @@ async function injectMetaHooksIntoSettings(opts) {
   if (modelRouterTargeted) {
     try {
       scriptDeploy = deployModelRouterScript({
-        targetDir: path35.join(claudeDir(), "hooks")
+        targetDir: path35.join(claudeDir2(), "hooks")
       });
     } catch (err) {
       scriptDeploy = {
@@ -18327,7 +18410,7 @@ var init_engine = __esm({
 import * as fs38 from "node:fs";
 import * as path36 from "node:path";
 function listShadowBackups(opts = {}) {
-  const claude = opts.claudeDirOverride ?? claudeDir();
+  const claude = opts.claudeDirOverride ?? claudeDir2();
   const now = opts.now ?? Date.now();
   const out = [];
   for (const bucket of SHADOW_BACKUP_BUCKETS) {
@@ -18461,15 +18544,15 @@ var init_shadow_backup_manager = __esm({
 // ../core/dist/skill-sources/doctor-checks.js
 import * as fs39 from "node:fs";
 import * as path37 from "node:path";
-import * as os21 from "node:os";
+import * as os17 from "node:os";
 function claudeDirInternal3() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path37.join(os21.homedir(), ".claude");
+  return path37.join(os17.homedir(), ".claude");
 }
 function checkStateFileParse() {
-  const filePath = globalConfigPath();
+  const filePath = globalConfigPath2();
   const result = {
     name: "state-parse",
     healthy: true,
@@ -18709,8 +18792,8 @@ function checkMemberNameMissing() {
     result.details = ["(atlas-toolbox source not registered \u2014 check not applicable)"];
     return result;
   }
-  const claudeDir2 = claudeDirInternal3();
-  const atlasUserPath = path37.join(claudeDir2, ".atlas-user");
+  const claudeDir3 = claudeDirInternal3();
+  const atlasUserPath = path37.join(claudeDir3, ".atlas-user");
   const value = fs39.existsSync(atlasUserPath) ? fs39.readFileSync(atlasUserPath, "utf-8").trim() : "";
   if (value.length > 0) {
     result.details = [`atlas-user: ${value}`];
@@ -18735,8 +18818,8 @@ function checkMemberNameMissing() {
   return result;
 }
 function checkMemberOverlayDrift() {
-  const claudeDir2 = claudeDirInternal3();
-  const atlasUserPath = path37.join(claudeDir2, ".atlas-user");
+  const claudeDir3 = claudeDirInternal3();
+  const atlasUserPath = path37.join(claudeDir3, ".atlas-user");
   const atlasUser = fs39.existsSync(atlasUserPath) ? fs39.readFileSync(atlasUserPath, "utf-8").trim() : "";
   if (atlasUser.length === 0) {
     return [];
@@ -18753,7 +18836,7 @@ function checkMemberOverlayDrift() {
   const clonePath = skillSourceClonePath(atlasSource.id);
   const results = [];
   for (const kind of ["skills", "agents"]) {
-    const localRoot = path37.join(claudeDir2, `${kind}.overrides`);
+    const localRoot = path37.join(claudeDir3, `${kind}.overrides`);
     if (!fs39.existsSync(localRoot))
       continue;
     let entries;
@@ -18856,7 +18939,7 @@ function detectPullDeployDrift(opts) {
     prefixEntry.prefixScope = eff.prefixScope;
   if (eff.prefixTarget !== void 0)
     prefixEntry.prefixTarget = eff.prefixTarget;
-  applyPrefixRewrites(artifacts, buildSourcePrefixMap([prefixEntry]), claudeDir(), true);
+  applyPrefixRewrites(artifacts, buildSourcePrefixMap([prefixEntry]), claudeDir2(), true);
   const cloneByKind = {
     skill: /* @__PURE__ */ new Set(),
     agent: /* @__PURE__ */ new Set(),
@@ -18874,7 +18957,7 @@ function detectPullDeployDrift(opts) {
     const kind = artifact.kind;
     cloneByKind[kind].add(artifact.deployBasename);
   }
-  const claude = claudeDir();
+  const claude = claudeDir2();
   const perKind = {
     skill: { added: [], removed: [] },
     agent: { added: [], removed: [] },
@@ -18958,7 +19041,7 @@ __export(skill_sources_exports, {
   checkOrphanedSnapshots: () => checkOrphanedSnapshots,
   checkSentinelDrift: () => checkSentinelDrift,
   checkStateFileParse: () => checkStateFileParse,
-  claudeDir: () => claudeDir,
+  claudeDir: () => claudeDir2,
   claudeSettingsPath: () => claudeSettingsPath,
   cloneSkillSource: () => cloneSkillSource,
   computeSkillsHookUninstall: () => computeUninstall,
@@ -39876,7 +39959,7 @@ __export(auth_exports, {
 init_paths();
 import * as crypto from "node:crypto";
 import * as fs3 from "node:fs";
-import * as os2 from "node:os";
+import * as os from "node:os";
 import * as path3 from "node:path";
 var SECRET_ENV_VAR = "OLAM_AUTH_SECRET";
 var SECRET_NAME = "auth-secret";
@@ -40459,7 +40542,7 @@ __export(pr_exports, {
 // ../core/dist/world/registry.js
 import { createRequire } from "node:module";
 import * as net from "node:net";
-import * as os3 from "node:os";
+import * as os2 from "node:os";
 import * as path5 from "node:path";
 import * as fs4 from "node:fs";
 var _require = createRequire(import.meta.url);
@@ -40572,7 +40655,7 @@ CREATE TABLE IF NOT EXISTS meta (
 var WorldRegistry = class {
   db;
   constructor(dbPath) {
-    const resolvedPath = dbPath ?? path5.join(os3.homedir(), ".olam", "worlds.db");
+    const resolvedPath = dbPath ?? path5.join(os2.homedir(), ".olam", "worlds.db");
     if (resolvedPath !== ":memory:") {
       fs4.mkdirSync(path5.dirname(resolvedPath), { recursive: true });
     }
@@ -41037,9 +41120,9 @@ function register3(server, _ctx, _initError) {
     }
     try {
       const { default: fs62 } = await import("node:fs");
-      const { default: os36 } = await import("node:os");
+      const { default: os32 } = await import("node:os");
       const { default: path62 } = await import("node:path");
-      const tokenPath = path62.join(os36.homedir(), ".olam", "host-cp.token");
+      const tokenPath = path62.join(os32.homedir(), ".olam", "host-cp.token");
       if (fs62.existsSync(tokenPath)) {
         const token = fs62.readFileSync(tokenPath, "utf-8").trim();
         await fetch("http://127.0.0.1:19000/api/admin/world-pr", {
@@ -41290,7 +41373,7 @@ import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { readFileSync as readFileSync5, existsSync as existsSync7, statSync } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 var execFileP = promisify(execFile);
 async function tarSkillsDir(skillsDir) {
   if (!existsSync7(skillsDir) || !statSync(skillsDir).isDirectory()) {
@@ -41356,10 +41439,10 @@ function readOptional(path62) {
 }
 async function syncProfileToCloudflare(opts) {
   const home = opts.homeDir ?? homedir5();
-  const skillsDir = join8(home, ".claude", "skills");
-  const claudeJsonPath = join8(home, ".claude.json");
-  const claudeMdPath = join8(home, ".claude", "CLAUDE.md");
-  const agentsMdPath = join8(home, ".claude", "AGENTS.md");
+  const skillsDir = join9(home, ".claude", "skills");
+  const claudeJsonPath = join9(home, ".claude.json");
+  const claudeMdPath = join9(home, ".claude", "CLAUDE.md");
+  const agentsMdPath = join9(home, ".claude", "AGENTS.md");
   const form = new FormData();
   const skillsBuf = await tarSkillsDir(skillsDir);
   if (skillsBuf) {
@@ -41583,10 +41666,10 @@ async function selectComputeProvider(config2, env) {
 function createCloudflareProvider(CloudflareProviderClass, config2, env) {
   const resolved = resolveCloudflareCallerConfig(config2, env);
   warnOnWorkerPylonMismatch(resolved.workerUrl, resolved.pylonOrgUrl);
-  const mintToken2 = buildMintTokenForResolvedConfig(resolved);
+  const mintToken3 = buildMintTokenForResolvedConfig(resolved);
   return new CloudflareProviderClass({
     workerUrl: resolved.workerUrl,
-    mintToken: mintToken2,
+    mintToken: mintToken3,
     cfAccessClientId: resolved.cfAccessClientId,
     cfAccessClientSecret: resolved.cfAccessClientSecret
   });
@@ -41954,8 +42037,8 @@ function register5(server, ctx, initError) {
       }
       if (resolved) {
         try {
-          const mintToken2 = createMintTokenForCtx(resolved);
-          const authToken = await mintToken2();
+          const mintToken3 = createMintTokenForCtx(resolved);
+          const authToken = await mintToken3();
           await syncProfileToCloudflare({
             workerUrl: resolved.workerUrl,
             authToken,
@@ -42511,7 +42594,7 @@ var ThoughtLocalStore = class {
 // ../core/dist/world/env-setup.js
 import * as crypto2 from "node:crypto";
 import * as fs10 from "node:fs";
-import * as os8 from "node:os";
+import * as os7 from "node:os";
 import * as path12 from "node:path";
 import { globSync } from "node:fs";
 
@@ -42601,7 +42684,7 @@ function generateHooksConfig(hookServerUrl = DEFAULT_HOOK_SERVER_URL) {
 // ../core/dist/world/env-setup.js
 var DEFAULT_CLAUDE_MODEL = "claude-opus-4-7";
 function copyClaudeConfig(workspacePath, homeDir, configCtx) {
-  const sourceClaudeDir = path12.join(homeDir ?? os8.homedir(), ".claude");
+  const sourceClaudeDir = path12.join(homeDir ?? os7.homedir(), ".claude");
   const destClaudeDir = path12.join(workspacePath, ".claude-host-config");
   void configCtx;
   if (!fs10.existsSync(sourceClaudeDir))
@@ -42647,7 +42730,7 @@ function copyClaudeConfig(workspacePath, homeDir, configCtx) {
     copyDirRecursive(scriptsDir, path12.join(destClaudeDir, "scripts"));
   }
   applyProjectClaudeOverlay(workspacePath, destClaudeDir);
-  writeStrippedMcpServersSnapshot(homeDir ?? os8.homedir(), workspacePath, destClaudeDir);
+  writeStrippedMcpServersSnapshot(homeDir ?? os7.homedir(), workspacePath, destClaudeDir);
 }
 function applyProjectClaudeOverlay(workspacePath, destClaudeDir) {
   const projectClaudeDir = path12.join(workspacePath, ".claude");
@@ -44480,12 +44563,12 @@ __export(capture_view_exports, {
 });
 init_v3();
 import { mkdir } from "node:fs/promises";
-import { join as join15, resolve as resolvePath } from "node:path";
+import { join as join16, resolve as resolvePath } from "node:path";
 
 // ../mcp-server/src/tools/_capture/manifest.ts
 import { createHash as createHash3 } from "node:crypto";
 import { readFile, writeFile } from "node:fs/promises";
-import { basename as basename2, join as join14 } from "node:path";
+import { basename as basename2, join as join15 } from "node:path";
 function redactUrl(url3) {
   if (url3.startsWith("world://")) return url3;
   let parsed;
@@ -44528,7 +44611,7 @@ async function writeManifest(args) {
     capturedAt: args.capturedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     shots: entries
   };
-  const path62 = join14(args.outDir, "manifest.json");
+  const path62 = join15(args.outDir, "manifest.json");
   await writeFile(path62, `${JSON.stringify(manifest, null, 2)}
 `, "utf8");
   return { path: path62, manifest };
@@ -45326,7 +45409,7 @@ function releaseLaunchSlot() {
 function resolveShootsRoot() {
   const fromEnv = process.env.OLAM_SHOOTS_ROOT;
   if (fromEnv && fromEnv.length > 0) return resolvePath(fromEnv);
-  return resolvePath(join15(process.cwd(), ".olam", "shoots"));
+  return resolvePath(join16(process.cwd(), ".olam", "shoots"));
 }
 function isUnderRoot(absPath, root) {
   if (absPath === root) return true;
@@ -45627,7 +45710,7 @@ async function runShot(browser, shot, outDir, format, jpegQuality, allowEval, as
       await page.waitForTimeout(shot.afterLoadMs);
     }
     const ext = format === "jpeg" ? "jpg" : "png";
-    const path62 = join15(outDir, `${shot.name}.${ext}`);
+    const path62 = join16(outDir, `${shot.name}.${ext}`);
     await page.screenshot({
       path: path62,
       type: format,
@@ -45941,17 +46024,17 @@ var webTaskShape = external_exports2.object(webTaskInput);
 import { spawn as spawn3 } from "node:child_process";
 import { existsSync as existsSync14 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 var WEBWRIGHT_SETUP_COMMAND = "olam webwright setup";
 function resolveVenvPath(cfg) {
   if (cfg?.venvPath && cfg.venvPath.length > 0) return cfg.venvPath;
-  return join16(homedir9(), ".olam", "venvs", "webwright");
+  return join17(homedir9(), ".olam", "venvs", "webwright");
 }
 function resolveConfigDir(cfg) {
   if (cfg?.configDir && cfg.configDir.length > 0) {
     return existsSync14(cfg.configDir) ? cfg.configDir : null;
   }
-  const candidate = join16(
+  const candidate = join17(
     homedir9(),
     ".claude",
     "plugins",
@@ -45969,9 +46052,9 @@ function isWebwrightEnabled(cfg) {
   return cfg?.enabled === true;
 }
 function venvPython(venvPath) {
-  const posix = join16(venvPath, "bin", "python");
+  const posix = join17(venvPath, "bin", "python");
   if (existsSync14(posix)) return posix;
-  const win = join16(venvPath, "Scripts", "python.exe");
+  const win = join17(venvPath, "Scripts", "python.exe");
   if (existsSync14(win)) return win;
   return null;
 }
@@ -46057,12 +46140,12 @@ import { spawn as spawn4 } from "node:child_process";
 import { mkdir as mkdir2, mkdtemp, readFile as readFile3, readdir, rm, writeFile as writeFile2 } from "node:fs/promises";
 import { existsSync as existsSync15 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join18, resolve as resolvePath2 } from "node:path";
+import { join as join19, resolve as resolvePath2 } from "node:path";
 
 // ../mcp-server/src/tools/_web_task/model-config.ts
 import { readFile as readFile2 } from "node:fs/promises";
 import { homedir as homedir10 } from "node:os";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 var PLACEHOLDER_ANTHROPIC_API_KEY = "olam-vault-routed-placeholder-stripped-by-proxy";
 var DEFAULT_WEB_TASK_MODEL = "claude-opus-4-7";
 var AnthropicBaseUrlMissingError = class extends Error {
@@ -46077,7 +46160,7 @@ async function resolveVaultBaseUrl(opts = {}) {
   const env = opts.env ?? process.env;
   const fromEnv = env.OLAM_ANTHROPIC_BASE_URL;
   if (fromEnv && fromEnv.trim().length > 0) return fromEnv.trim();
-  const file2 = opts.baseUrlFile ?? join17(homedir10(), ".olam", "anthropic-base-url");
+  const file2 = opts.baseUrlFile ?? join18(homedir10(), ".olam", "anthropic-base-url");
   let raw;
   try {
     raw = await readFile2(file2, "utf-8");
@@ -46127,7 +46210,7 @@ var WebTaskSpawnError = class extends Error {
 function resolveWebTaskRoot() {
   const fromEnv = process.env.OLAM_WEB_TASK_ROOT;
   if (fromEnv && fromEnv.length > 0) return resolvePath2(fromEnv);
-  return resolvePath2(join18(process.cwd(), ".olam", "web-tasks"));
+  return resolvePath2(join19(process.cwd(), ".olam", "web-tasks"));
 }
 function isUnderRoot2(absPath, root) {
   if (absPath === root) return true;
@@ -46190,7 +46273,7 @@ async function runWebwright(pythonPath, args, spawnEnv, timeoutMs, deps) {
   });
 }
 async function locateRunDir(outDir) {
-  if (existsSync15(join18(outDir, "trajectory.json"))) return outDir;
+  if (existsSync15(join19(outDir, "trajectory.json"))) return outDir;
   let entries = [];
   try {
     entries = await readdir(outDir);
@@ -46199,8 +46282,8 @@ async function locateRunDir(outDir) {
   }
   const candidates = [];
   for (const name of entries) {
-    const sub = join18(outDir, name);
-    if (existsSync15(join18(sub, "trajectory.json"))) candidates.push({ dir: sub });
+    const sub = join19(outDir, name);
+    if (existsSync15(join19(sub, "trajectory.json"))) candidates.push({ dir: sub });
   }
   if (candidates.length === 0) return outDir;
   candidates.sort((a, b) => a.dir < b.dir ? 1 : -1);
@@ -46213,14 +46296,14 @@ async function collectScreenshots(runDir) {
   } catch {
     return [];
   }
-  const shots = entries.filter((n) => /\.(png|jpe?g)$/i.test(n)).sort().map((n, i) => ({ step: i, path: join18(runDir, n) }));
+  const shots = entries.filter((n) => /\.(png|jpe?g)$/i.test(n)).sort().map((n, i) => ({ step: i, path: join19(runDir, n) }));
   return shots;
 }
 async function readTrajectoryFacts(runDir, stdoutTail) {
   let answer = null;
   let modelCalls = null;
   try {
-    const raw = await readFile3(join18(runDir, "trajectory.json"), "utf-8");
+    const raw = await readFile3(join19(runDir, "trajectory.json"), "utf-8");
     const parsed = JSON.parse(raw);
     answer = extractFinalAnswer(parsed);
     modelCalls = extractModelCalls(parsed);
@@ -46353,11 +46436,11 @@ async function runSpawnExecutor(spec, ctx, provision, deps = { spawn: spawn4 })
   } catch (err) {
     throw new WebTaskSpawnError("vault_base_url_missing", err.message);
   }
-  const tmpDirRoot = await mkdtemp(join18(tmpdir2(), "olam-web-task-"));
-  const modelYamlPath = join18(tmpDirRoot, "model_olam.yaml");
+  const tmpDirRoot = await mkdtemp(join19(tmpdir2(), "olam-web-task-"));
+  const modelYamlPath = join19(tmpDirRoot, "model_olam.yaml");
   await writeFile2(modelYamlPath, modelYaml.yaml, "utf-8");
   try {
-    const baseYaml = join18(provision.configDir, "base.yaml");
+    const baseYaml = join19(provision.configDir, "base.yaml");
     const args = [
       "-m",
       "webwright.run.cli",
@@ -46411,10 +46494,10 @@ ${tail}` : ""}`
       );
     }
     const runDir = await locateRunDir(absOutDir);
-    const trajectoryPath = join18(runDir, "trajectory.json");
+    const trajectoryPath = join19(runDir, "trajectory.json");
     const screenshots = await collectScreenshots(runDir);
     const facts = await readTrajectoryFacts(runDir, outcome.stdout);
-    const scriptPath = existsSync15(join18(runDir, "final_script.py")) ? join18(runDir, "final_script.py") : void 0;
+    const scriptPath = existsSync15(join19(runDir, "final_script.py")) ? join19(runDir, "final_script.py") : void 0;
     return {
       result: facts.answer,
       trajectoryPath,
@@ -46968,9 +47051,9 @@ var HOST_CP_URL = "http://127.0.0.1:19000";
 async function readHostCpToken2() {
   try {
     const { default: fs62 } = await import("node:fs");
-    const { default: os36 } = await import("node:os");
+    const { default: os32 } = await import("node:os");
     const { default: path62 } = await import("node:path");
-    const tp = path62.join(os36.homedir(), ".olam", "host-cp.token");
+    const tp = path62.join(os32.homedir(), ".olam", "host-cp.token");
     if (!fs62.existsSync(tp)) return { token: null };
     return { token: fs62.readFileSync(tp, "utf-8").trim() };
   } catch {
@@ -47332,7 +47415,7 @@ __export(process_port_exports, {
   resolveHostCpToken: () => resolveHostCpToken
 });
 import fs41 from "node:fs";
-import os22 from "node:os";
+import os18 from "node:os";
 import path39 from "node:path";
 
 // ../skill-runtime/dist/skills/process-list.js
@@ -47378,7 +47461,7 @@ var HOST_CP_BASE = "http://127.0.0.1:19000";
 function resolveHostCpToken() {
   const envToken = process.env["OLAM_HOST_CP_TOKEN"];
   if (envToken) return envToken;
-  const tokenPath = path39.join(os22.homedir(), ".olam", "host-cp.token");
+  const tokenPath = path39.join(os18.homedir(), ".olam", "host-cp.token");
   if (fs41.existsSync(tokenPath)) return fs41.readFileSync(tokenPath, "utf-8").trim();
   return null;
 }
@@ -47977,7 +48060,7 @@ function fail2(err, hint) {
   };
 }
 function listDeployed() {
-  const dir = claudeDir();
+  const dir = claudeDir2();
   const sources = listSkillSources();
   const sourcePaths = new Map(
     sources.map((s) => [skillSourceClonePath(s.id), s.id])
@@ -48080,13 +48163,13 @@ function deriveModeId(name, taken) {
 // ../core/dist/ree-modes/store.js
 init_skill_sources();
 import * as fs44 from "node:fs";
-import * as os24 from "node:os";
+import * as os20 from "node:os";
 import * as path42 from "node:path";
 
 // ../core/dist/ree-modes/registry.js
 init_v3();
 import * as fs43 from "node:fs";
-import * as os23 from "node:os";
+import * as os19 from "node:os";
 import * as path41 from "node:path";
 var CadenceStatusSchema = external_exports2.enum(["running", "stopped"]);
 var CadenceEntrySchema = external_exports2.object({
@@ -48109,7 +48192,7 @@ function olamRootDir() {
   const override = process.env["OLAM_STATE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path41.join(os23.homedir(), ".olam");
+  return path41.join(os19.homedir(), ".olam");
 }
 function cadenceRegistryPath() {
   return path41.join(olamRootDir(), "ree-cadences.json");
@@ -48176,7 +48259,7 @@ function claudeRootDir() {
   const override = process.env["OLAM_CLAUDE_DIR"];
   if (override && override.length > 0)
     return override;
-  return path42.join(os24.homedir(), ".claude");
+  return path42.join(os20.homedir(), ".claude");
 }
 function localModesDir() {
   return path42.join(claudeRootDir(), "ree-modes.local");
@@ -48557,13 +48640,13 @@ __export(skills_search_exports, {
   register: () => register28
 });
 import * as path45 from "node:path";
-import * as os26 from "node:os";
+import * as os22 from "node:os";
 
 // ../mcp-server/src/lib/skills-index.mjs
 import { createRequire as createRequire5 } from "node:module";
 import * as fs46 from "node:fs";
 import * as path44 from "node:path";
-import * as os25 from "node:os";
+import * as os21 from "node:os";
 var VECTOR_DIM = 256;
 var SCHEMA_VERSION3 = "1";
 var SCHEMA_KEY = "skills_index_schema_version";
@@ -48694,8 +48777,8 @@ function searchIndex(dbPath, query, k = 5) {
     db.close();
   }
 }
-var DEFAULT_DB_PATH = path44.join(os25.homedir(), ".olam", "skills.vec.db");
-var DEFAULT_SOURCE_DIR = path44.join(os25.homedir(), ".claude", "skills");
+var DEFAULT_DB_PATH = path44.join(os21.homedir(), ".olam", "skills.vec.db");
+var DEFAULT_SOURCE_DIR = path44.join(os21.homedir(), ".claude", "skills");
 
 // ../skill-runtime/dist/skills/skills-search.js
 init_v3();
@@ -48714,7 +48797,7 @@ var skillsSearchSkill = defineSkill({
 function defaultDbPath() {
   const override = process.env["SKILLS_INDEX_PATH"];
   if (override) return override;
-  return path45.join(os26.homedir(), ".olam", "skills.vec.db");
+  return path45.join(os22.homedir(), ".olam", "skills.vec.db");
 }
 function asMessage10(err) {
   return err instanceof Error ? err.message : String(err);
@@ -48990,7 +49073,7 @@ __export(kg_install_hook_exports, {
 init_merge_settings();
 import * as fs47 from "node:fs";
 import * as path46 from "node:path";
-import * as os27 from "node:os";
+import * as os23 from "node:os";
 
 // ../core/dist/kg/hook-template.js
 var KG_HOOK_SENTINEL = "kg-service-v3-classifier-hook";
@@ -49086,7 +49169,7 @@ var kgInstallHookSkill = defineSkill({
 // ../mcp-server/src/tools/kg-install-hook.ts
 function settingsPathFor2(scope, projectPath) {
   if (scope === "user") {
-    return path46.join(os27.homedir(), ".claude", "settings.json");
+    return path46.join(os23.homedir(), ".claude", "settings.json");
   }
   const root = projectPath ?? process.cwd();
   return path46.join(root, ".claude", "settings.json");
@@ -49156,7 +49239,7 @@ __export(kg_uninstall_hook_exports, {
 });
 import * as fs48 from "node:fs";
 import * as path47 from "node:path";
-import * as os28 from "node:os";
+import * as os24 from "node:os";
 
 // ../skill-runtime/dist/skills/kg-uninstall-hook.js
 init_v3();
@@ -49178,7 +49261,7 @@ var kgUninstallHookSkill = defineSkill({
 // ../mcp-server/src/tools/kg-uninstall-hook.ts
 function settingsPathFor3(scope, projectPath) {
   if (scope === "user") {
-    return path47.join(os28.homedir(), ".claude", "settings.json");
+    return path47.join(os24.homedir(), ".claude", "settings.json");
   }
   const root = projectPath ?? process.cwd();
   return path47.join(root, ".claude", "settings.json");
@@ -50008,11 +50091,11 @@ function registerAllTools(server, ctx, initError) {
 
 // ../mcp-server/src/resources/chunks.ts
 import fs49 from "node:fs";
-import os29 from "node:os";
+import os25 from "node:os";
 import path48 from "node:path";
 var DEFAULT_HOST_CP_URL = "http://127.0.0.1:19000";
 var DEFAULT_PLAN_CHAT_SECRET_PATH = path48.join(
-  os29.homedir(),
+  os25.homedir(),
   ".olam",
   "plan-chat-secret"
 );
@@ -51801,7 +51884,7 @@ init_loader();
 import * as crypto8 from "node:crypto";
 import { execSync as execSync6, spawnSync as spawnSync4 } from "node:child_process";
 import * as fs59 from "node:fs";
-import * as os34 from "node:os";
+import * as os30 from "node:os";
 import * as path59 from "node:path";
 
 // ../core/dist/world/state.js
@@ -52025,8 +52108,8 @@ import * as fs51 from "node:fs";
 import * as path50 from "node:path";
 
 // ../core/dist/kg/storage-paths.js
-import { homedir as homedir30 } from "node:os";
-import { join as join52, resolve as resolve11 } from "node:path";
+import { homedir as homedir26 } from "node:os";
+import { join as join53, resolve as resolve11 } from "node:path";
 
 // ../core/dist/world/workspace-name.js
 var InvalidWorkspaceNameError = class extends Error {
@@ -52046,14 +52129,14 @@ function validateWorkspaceName(name) {
 }
 
 // ../core/dist/kg/storage-paths.js
-function olamHome2() {
-  return process.env.OLAM_HOME ?? join52(homedir30(), ".olam");
+function olamHome3() {
+  return process.env.OLAM_HOME ?? join53(homedir26(), ".olam");
 }
 function kgRoot() {
-  return join52(olamHome2(), "kg");
+  return join53(olamHome3(), "kg");
 }
 function worldsRoot() {
-  return join52(olamHome2(), "worlds");
+  return join53(olamHome3(), "worlds");
 }
 function assertWithinPrefix(path62, prefix, label) {
   if (!path62.startsWith(prefix + "/")) {
@@ -52063,12 +52146,12 @@ function assertWithinPrefix(path62, prefix, label) {
 function kgPristinePath(workspace) {
   validateWorkspaceName(workspace);
   const root = kgRoot();
-  const path62 = resolve11(join52(root, workspace));
+  const path62 = resolve11(join53(root, workspace));
   assertWithinPrefix(path62, root, "kgPristinePath");
   return path62;
 }
 var KG_PATHS_INTERNALS = Object.freeze({
-  olamHome: olamHome2,
+  olamHome: olamHome3,
   kgRoot,
   worldsRoot
 });
@@ -52161,11 +52244,11 @@ function createWorldOverlay(opts) {
 // ../core/dist/world/baseline-diff.js
 import { execFileSync as execFileSync7 } from "node:child_process";
 import * as fs52 from "node:fs";
-import * as os30 from "node:os";
+import * as os26 from "node:os";
 import * as path51 from "node:path";
 var DEFAULT_MAX_BUFFER_BYTES = 50 * 1024 * 1024;
-function expandHome2(p, homedir37) {
-  return p.replace(/^~(?=$|\/|\\)/, homedir37());
+function expandHome2(p, homedir33) {
+  return p.replace(/^~(?=$|\/|\\)/, homedir33());
 }
 function sanitizeRepoFilename(name) {
   const sanitized = name.replace(/[^A-Za-z0-9._-]/g, "_");
@@ -52188,7 +52271,7 @@ ${stderr}`;
 }
 function snapshotBaselineDiff(repos, workspacePath, deps = {}) {
   const exec = deps.exec ?? ((cmd, args, opts) => execFileSync7(cmd, args, opts));
-  const homedir37 = deps.homedir ?? (() => os30.homedir());
+  const homedir33 = deps.homedir ?? (() => os26.homedir());
   const baselineDir = path51.join(workspacePath, ".olam", "baseline");
   try {
     fs52.mkdirSync(baselineDir, { recursive: true });
@@ -52204,7 +52287,7 @@ function snapshotBaselineDiff(repos, workspacePath, deps = {}) {
       continue;
     const filename = `${sanitizeRepoFilename(repo.name)}.diff`;
     const outPath = path51.join(baselineDir, filename);
-    const repoPath = expandHome2(repo.path, homedir37);
+    const repoPath = expandHome2(repo.path, homedir33);
     if (!fs52.existsSync(repoPath)) {
       writeBaselineFile(outPath, `# repo: ${repo.name}
 # (skipped: path ${repoPath} does not exist)
@@ -52340,7 +52423,7 @@ function extractStderr(err) {
 }
 function carryUncommittedEdits(repos, workspacePath, deps = {}) {
   const exec = deps.exec ?? ((cmd, args, opts) => execFileSync7(cmd, args, opts));
-  const homedir37 = deps.homedir ?? (() => os30.homedir());
+  const homedir33 = deps.homedir ?? (() => os26.homedir());
   const existsSync61 = deps.existsSync ?? ((p) => fs52.existsSync(p));
   const copyFileSync10 = deps.copyFileSync ?? ((src, dest) => fs52.copyFileSync(src, dest));
   const mkdirSync34 = deps.mkdirSync ?? ((dirPath, opts) => {
@@ -52350,7 +52433,7 @@ function carryUncommittedEdits(repos, workspacePath, deps = {}) {
   for (const repo of repos) {
     if (!repo.path)
       continue;
-    const repoPath = expandHome2(repo.path, homedir37);
+    const repoPath = expandHome2(repo.path, homedir33);
     const worktreePath = path51.join(workspacePath, repo.name);
     if (!existsSync61(repoPath))
       continue;
@@ -52454,10 +52537,10 @@ var WORLD_CLAUDE_MD = '# Olam World: {{worldName}}\n\n{{taskBlock}}\n\n## Enviro
 // ../core/dist/world/context-injection.js
 function injectWorldContext(opts) {
   const { world } = opts;
-  const claudeDir2 = path52.join(world.workspacePath, ".claude");
-  fs53.mkdirSync(claudeDir2, { recursive: true });
+  const claudeDir3 = path52.join(world.workspacePath, ".claude");
+  fs53.mkdirSync(claudeDir3, { recursive: true });
   const content = WORLD_CLAUDE_MD.replace("{{worldName}}", world.name).replace("{{worldId}}", world.id).replace("{{branch}}", world.branch).replace("{{taskBlock}}", buildTaskBlock(opts)).replace("{{reposList}}", buildReposList(world)).replace("{{servicesLine}}", buildServicesLine(opts.services)).replace("{{pleriPlaneLine}}", buildPleriPlaneLine(opts.pleriPlaneUrl)).replace("{{planFileBlock}}", buildPlanFileBlock(world)).replace("{{extraContextBlock}}", buildExtraContextBlock(opts.claudeMdExtra));
-  fs53.writeFileSync(path52.join(claudeDir2, "CLAUDE.md"), content);
+  fs53.writeFileSync(path52.join(claudeDir3, "CLAUDE.md"), content);
   writeOlamDocs(world.workspacePath);
 }
 function buildTaskBlock(opts) {
@@ -53120,12 +53203,12 @@ init_repo_manifest();
 // ../core/dist/world/snapshot.js
 import * as crypto7 from "node:crypto";
 import * as fs54 from "node:fs";
-import * as os31 from "node:os";
+import * as os27 from "node:os";
 import * as path53 from "node:path";
 import { execFileSync as execFileSync8, spawn as spawn5 } from "node:child_process";
 import { gunzipSync } from "node:zlib";
 function snapshotsDir() {
-  return process.env["OLAM_SNAPSHOTS_DIR"] ?? path53.join(os31.homedir(), ".olam", "snapshots");
+  return process.env["OLAM_SNAPSHOTS_DIR"] ?? path53.join(os27.homedir(), ".olam", "snapshots");
 }
 function snapshotKindDirByWorkspace(workspace, arch, kind) {
   return path53.join(snapshotsDir(), "by-workspace", workspace, arch, kind);
@@ -53850,7 +53933,7 @@ async function autoDispatchTask(opts) {
 
 // ../core/dist/world/wiki-injection-loader.js
 import * as fs56 from "node:fs";
-import * as os32 from "node:os";
+import * as os28 from "node:os";
 import * as path56 from "node:path";
 var WIKI_INJECTION_FLAG = "OLAM_WIKI_INJECTION";
 var WIKI_PATH_ENV = "OLAM_WIKI_PATH";
@@ -53864,7 +53947,7 @@ function wikiBlobPath() {
   const override = process.env[WIKI_PATH_ENV];
   if (override && override.length > 0)
     return override;
-  return path56.join(os32.homedir(), ".olam", "wiki.json");
+  return path56.join(os28.homedir(), ".olam", "wiki.json");
 }
 function defaultReadBlob() {
   const p = wikiBlobPath();
@@ -53911,11 +53994,11 @@ init_bridge();
 
 // ../core/dist/global-config/runbook-resolver.js
 import * as fs57 from "node:fs";
-import * as os33 from "node:os";
+import * as os29 from "node:os";
 import * as path57 from "node:path";
 function expandTilde(p) {
   if (p === "~" || p.startsWith("~/")) {
-    return path57.join(os33.homedir(), p.slice(1));
+    return path57.join(os29.homedir(), p.slice(1));
   }
   return p;
 }
@@ -54658,7 +54741,7 @@ ${detail}`);
       runbookSeeds = resolved.seeds;
     }
     const worldId = generateWorldId();
-    const workspacePath = path59.join(os34.homedir(), ".olam", "worlds", worldId);
+    const workspacePath = path59.join(os30.homedir(), ".olam", "worlds", worldId);
     const portOffset = this.registry.getNextPortOffset();
     const branch = opts.branchName ?? `olam/${worldId}`;
     const repos = await this.resolveReposWithWorkspace(opts);
@@ -54740,7 +54823,7 @@ ${detail}`);
     for (const repo of repos) {
       if (!repo.path)
         continue;
-      const sourceRoot = repo.path.replace(/^~/, os34.homedir());
+      const sourceRoot = repo.path.replace(/^~/, os30.homedir());
       const worktreeRoot = path59.join(workspacePath, repo.name);
       if (!fs59.existsSync(sourceRoot) || !fs59.existsSync(worktreeRoot))
         continue;
@@ -54956,7 +55039,7 @@ ${detail}`);
       const worldEnv = {};
       if (opts.task)
         worldEnv.OLAM_TASK = opts.task;
-      const r2CredsPath = path59.join(os34.homedir(), ".olam", "r2-credentials.json");
+      const r2CredsPath = path59.join(os30.homedir(), ".olam", "r2-credentials.json");
       if (fs59.existsSync(r2CredsPath)) {
         try {
           const r2Raw = fs59.readFileSync(r2CredsPath, "utf-8").trim();
@@ -54976,7 +55059,7 @@ ${detail}`);
         } catch {
         }
       }
-      const keysYamlPath = path59.join(os34.homedir(), ".olam", "keys.yaml");
+      const keysYamlPath = path59.join(os30.homedir(), ".olam", "keys.yaml");
       if (fs59.existsSync(keysYamlPath)) {
         try {
           const keysRaw = fs59.readFileSync(keysYamlPath, "utf-8").trim();
@@ -56844,9 +56927,9 @@ function createDashboardServer(opts) {
 
 // ../core/dist/dashboard/state.js
 import * as fs61 from "node:fs";
-import * as os35 from "node:os";
+import * as os31 from "node:os";
 import * as path61 from "node:path";
-var STATE_PATH = path61.join(os35.homedir(), ".olam", "dashboard.json");
+var STATE_PATH = path61.join(os31.homedir(), ".olam", "dashboard.json");
 function saveDashboardState(state) {
   fs61.mkdirSync(path61.dirname(STATE_PATH), { recursive: true });
   fs61.writeFileSync(STATE_PATH, JSON.stringify(state, null, 2));
@@ -57141,8 +57224,8 @@ var PleriClient = class {
 };
 
 // ../mcp-server/src/env-loader.ts
-import { readFileSync as readFileSync47, existsSync as existsSync60, statSync as statSync15 } from "node:fs";
-import { join as join64, dirname as dirname31, resolve as resolve15 } from "node:path";
+import { readFileSync as readFileSync47, existsSync as existsSync60, statSync as statSync16 } from "node:fs";
+import { join as join65, dirname as dirname31, resolve as resolve15 } from "node:path";
 var PROJECT_MARKERS = [
   ".olam/config.yaml",
   ".olam/config.yml",
@@ -57154,9 +57237,9 @@ function findProjectRoot2(startDir) {
   const root = resolve15("/");
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      if (existsSync60(join64(dir, marker))) return dir;
+      if (existsSync60(join65(dir, marker))) return dir;
     }
-    const pkg = join64(dir, "package.json");
+    const pkg = join65(dir, "package.json");
     if (existsSync60(pkg)) {
       try {
         const json2 = JSON.parse(readFileSync47(pkg, "utf8"));
@@ -57196,8 +57279,8 @@ function loadProjectEnv(startDir = process.cwd()) {
   const filesRead = [];
   const merged = {};
   for (const name of [".env", ".env.local"]) {
-    const p = join64(root, name);
-    if (existsSync60(p) && statSync15(p).isFile()) {
+    const p = join65(root, name);
+    if (existsSync60(p) && statSync16(p).isFile()) {
       Object.assign(merged, parseEnvFile(p));
       filesRead.push(p);
     }
@@ -57272,6 +57355,13 @@ async function main() {
   const transport = new StdioServerTransport();
   await server.connect(transport);
   logger.info("Olam MCP server running on stdio transport");
+  const shutdown = (reason) => {
+    logger.info("Olam MCP client disconnected; shutting down", { reason });
+    process.exit(0);
+  };
+  process.stdin.once("end", () => shutdown("stdin end"));
+  process.stdin.once("close", () => shutdown("stdin close"));
+  process.stdin.resume();
 }
 main().catch((error51) => {
   logger.error("Fatal error starting Olam MCP server", {