claude-nomad 0.43.0 → 0.44.1

package/dist/nomad.mjs

@@ -170,7 +170,7 @@ function gitOrFatal(args, context, cwd) {
     throw new NomadFatal(`${context} failed`);
   }
 }
-var log, warn, fail, NomadFatal, die, gitStatusPorcelainZ;
+var log, warn, fail, item, NomadFatal, die, gitStatusPorcelainZ;
 var init_utils = __esm({
   "src/utils.ts"() {
     "use strict";
@@ -182,6 +182,7 @@ var init_utils = __esm({
     fail = (msg) => {
       console.error(`${red(failGlyph)} ${msg}`);
     };
+    item = (msg) => console.log(dim(`  ${msg}`));
     NomadFatal = class extends Error {
       constructor(message) {
         super(message);
@@ -360,6 +361,18 @@ var init_settings_keys = __esm({
 // src/config.ts
 import { homedir, hostname } from "node:os";
 import { join, resolve } from "node:path";
+function home() {
+  return process.env.HOME || homedir();
+}
+function claudeHome() {
+  return resolve(home(), ".claude");
+}
+function repoHome() {
+  return process.env.NOMAD_REPO || resolve(home(), "claude-nomad");
+}
+function backupBase() {
+  return join(home(), ".cache", "claude-nomad", "backup");
+}
 function allSharedLinks(map) {
   const extras = [];
   for (const entry of map.sharedDirs ?? []) {
@@ -373,7 +386,7 @@ function allSharedLinks(map) {
   }
   return [...SHARED_LINKS, ...extras];
 }
-var HOME, CLAUDE_HOME, BACKUP_BASE, REPO_HOME, SETTINGS_SCHEMA_URL, NPM_REGISTRY_LATEST_URL, GITLEAKS_PINNED_VERSION, HOST, SHARED_LINKS, SUPPORTED_EXTRAS, ALWAYS_NEVER_SYNC, PUSH_ALLOWED_STATIC;
+var SETTINGS_SCHEMA_URL, NPM_REGISTRY_LATEST_URL, GITLEAKS_PINNED_VERSION, HOST, SHARED_LINKS, SUPPORTED_EXTRAS, ALWAYS_NEVER_SYNC, PUSH_ALLOWED_STATIC;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
@@ -381,10 +394,6 @@ var init_config = __esm({
     init_utils();
     init_config_never_sync();
     init_settings_keys();
-    HOME = homedir();
-    CLAUDE_HOME = resolve(HOME, ".claude");
-    BACKUP_BASE = join(HOME, ".cache", "claude-nomad", "backup");
-    REPO_HOME = process.env.NOMAD_REPO || resolve(HOME, "claude-nomad");
     SETTINGS_SCHEMA_URL = "https://json.schemastore.org/claude-code-settings.json";
     NPM_REGISTRY_LATEST_URL = "https://registry.npmjs.org/claude-nomad/latest";
     GITLEAKS_PINNED_VERSION = "8.30.1";
@@ -526,18 +535,19 @@ function ensureSymlink(linkPath, target) {
 }
 function backupBeforeWrite(absPath, ts) {
   if (!existsSync(absPath)) return;
-  const rel = relative(CLAUDE_HOME, absPath);
+  const claude = claudeHome();
+  const rel = relative(claude, absPath);
   if (rel.startsWith("..") || rel === "") return;
-  const backupRoot = join2(BACKUP_BASE, ts);
+  const backupRoot = join2(backupBase(), ts);
   const dst = join2(backupRoot, rel);
   mkdirSync(dirname(dst), { recursive: true });
   cpSync(absPath, dst, { recursive: true, force: false, preserveTimestamps: true });
 }
-function backupRepoWrite(absPath, ts, repoHome) {
+function backupRepoWrite(absPath, ts, repoHome2) {
   if (!existsSync(absPath)) return;
-  const rel = relative(repoHome, absPath);
+  const rel = relative(repoHome2, absPath);
   if (rel.startsWith("..") || rel === "") return;
-  const backupRoot = join2(BACKUP_BASE, ts, "repo");
+  const backupRoot = join2(backupBase(), ts, "repo");
   const dst = join2(backupRoot, rel);
   mkdirSync(dirname(dst), { recursive: true });
   cpSync(absPath, dst, { recursive: true, force: false, preserveTimestamps: true });
@@ -546,7 +556,7 @@ function backupExtrasWrite(absPath, ts, projectRoot) {
   if (!existsSync(absPath)) return;
   const rel = relative(projectRoot, absPath);
   if (rel.startsWith("..") || rel === "") return;
-  const backupRoot = join2(BACKUP_BASE, ts, "extras");
+  const backupRoot = join2(backupBase(), ts, "extras");
   const dst = join2(backupRoot, encodePath(projectRoot), rel);
   mkdirSync(dirname(dst), { recursive: true });
   cpSync(absPath, dst, { recursive: true, force: false, preserveTimestamps: true });
@@ -561,31 +571,32 @@ var init_utils_fs = __esm({
 });
 
 // src/push-gitleaks.config.ts
-import { existsSync as existsSync10, mkdtempSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync11, mkdtempSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 import { fileURLToPath } from "node:url";
-function resolveTomlPath() {
-  const repoToml = join11(REPO_HOME, ".gitleaks.toml");
-  if (existsSync10(repoToml)) return repoToml;
+function resolveTomlPath(repo = repoHome()) {
+  const repoToml = join12(repo, ".gitleaks.toml");
+  if (existsSync11(repoToml)) return repoToml;
   const bundled = fileURLToPath(new URL("../.gitleaks.toml", import.meta.url));
-  return existsSync10(bundled) ? bundled : null;
+  return existsSync11(bundled) ? bundled : null;
 }
 function buildOverlayTempConfig(overlayBody, bundled) {
   const tempBody = `[extend]
 path = ${JSON.stringify(bundled)}
 
 ${overlayBody}`;
-  const tempPath = mkdtempSync(join11(tmpdir(), "nomad-gitleaks-cfg-"));
-  const configPath = join11(tempPath, "config.toml");
+  const tempPath = mkdtempSync(join12(tmpdir(), "nomad-gitleaks-cfg-"));
+  const configPath = join12(tempPath, "config.toml");
   writeFileSync2(configPath, tempBody, { mode: 384, flag: "wx" });
   return { configPath, tempPath };
 }
 function resolveTomlConfig() {
-  const overlayPath = join11(REPO_HOME, ".gitleaks.overlay.toml");
-  const repoToml = join11(REPO_HOME, ".gitleaks.toml");
-  const bundled = resolveTomlPath();
-  if (!existsSync10(overlayPath)) {
+  const repo = repoHome();
+  const overlayPath = join12(repo, ".gitleaks.overlay.toml");
+  const repoToml = join12(repo, ".gitleaks.toml");
+  const bundled = resolveTomlPath(repo);
+  if (!existsSync11(overlayPath)) {
     return { path: bundled, tempPath: null };
   }
   if (bundled === repoToml) {
@@ -626,9 +637,9 @@ var init_push_gitleaks_config = __esm({
 
 // src/push-checks.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
-import { readdirSync as readdirSync4, rmSync as rmSync3 } from "node:fs";
+import { readdirSync as readdirSync4, rmSync as rmSync4 } from "node:fs";
 import { homedir as homedir2, platform } from "node:os";
-import { join as join12 } from "node:path";
+import { join as join13 } from "node:path";
 function gitleaksInstallHint() {
   const head = "gitleaks not on PATH (required for nomad push). Install:";
   const plat = platform();
@@ -671,7 +682,7 @@ function findGitlinks(dir) {
       return;
     }
     for (const e of entries) {
-      const p = join12(current, e.name);
+      const p = join13(current, e.name);
       if (e.name === ".git") {
         hits.push(p);
         continue;
@@ -693,27 +704,26 @@ function probeGitleaks() {
     if (e.code === "ENOENT") throw new NomadFatal(gitleaksInstallHint());
     throw new NomadFatal(`gitleaks --version failed: ${e.message}`);
   } finally {
-    if (tempPath !== null) rmSync3(tempPath, { recursive: true, force: true });
+    if (tempPath !== null) rmSync4(tempPath, { recursive: true, force: true });
   }
 }
-function rebaseBeforePush() {
+function rebaseBeforePush(repo) {
   try {
     execFileSync2("git", ["pull", "--rebase", "--autostash"], {
-      cwd: REPO_HOME,
+      cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
   } catch (err) {
     const e = err;
     if (e.stderr) process.stderr.write(e.stderr);
     throw new NomadFatal(
-      'rebase failed; if a conflict was reported, resolve it in ~/claude-nomad/ and run "git rebase --continue" (or "git rebase --abort" to give up). Re-run nomad push after resolution.'
+      `rebase failed; if a conflict was reported, resolve it in ${repo} and run "git rebase --continue" (or "git rebase --abort" to give up). Re-run nomad push after resolution.`
     );
   }
 }
 var init_push_checks = __esm({
   "src/push-checks.ts"() {
     "use strict";
-    init_config();
     init_push_gitleaks_config();
     init_utils();
   }
@@ -721,9 +731,9 @@ var init_push_checks = __esm({
 
 // src/push-gitleaks.scan.ts
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync as rmSync4 } from "node:fs";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync as rmSync5 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 function readGitleaksReport(reportPath) {
   try {
     const raw = readFileSync4(reportPath, "utf8");
@@ -735,9 +745,9 @@ function readGitleaksReport(reportPath) {
   }
 }
 function scanStagedTree(repoDir, forwardStreams = false) {
-  const cacheDir = join16(homedir3(), ".cache", "claude-nomad");
+  const cacheDir = join17(homedir3(), ".cache", "claude-nomad");
   mkdirSync2(cacheDir, { recursive: true });
-  const reportPath = join16(cacheDir, `gitleaks-${nowTimestamp()}-${process.pid}.json`);
+  const reportPath = join17(cacheDir, `gitleaks-${nowTimestamp()}-${process.pid}.json`);
   const { path: toml, tempPath } = resolveTomlConfig();
   const args = [
     "protect",
@@ -764,14 +774,14 @@ function scanStagedTree(repoDir, forwardStreams = false) {
     }
     return report;
   } finally {
-    if (tempPath !== null) rmSync4(tempPath, { recursive: true, force: true });
-    rmSync4(reportPath, { force: true });
+    if (tempPath !== null) rmSync5(tempPath, { recursive: true, force: true });
+    rmSync5(reportPath, { force: true });
   }
 }
 function scanFile(filePath, forwardStreams = false) {
-  const cacheDir = join16(homedir3(), ".cache", "claude-nomad");
+  const cacheDir = join17(homedir3(), ".cache", "claude-nomad");
   mkdirSync2(cacheDir, { recursive: true });
-  const reportPath = join16(cacheDir, `gitleaks-file-${nowTimestamp()}-${process.pid}.json`);
+  const reportPath = join17(cacheDir, `gitleaks-file-${nowTimestamp()}-${process.pid}.json`);
   const { path: toml, tempPath } = resolveTomlConfig();
   const args = [
     "detect",
@@ -796,8 +806,8 @@ function scanFile(filePath, forwardStreams = false) {
     }
     return report;
   } finally {
-    if (tempPath !== null) rmSync4(tempPath, { recursive: true, force: true });
-    rmSync4(reportPath, { force: true });
+    if (tempPath !== null) rmSync5(tempPath, { recursive: true, force: true });
+    rmSync5(reportPath, { force: true });
   }
 }
 var init_push_gitleaks_scan = __esm({
@@ -937,10 +947,10 @@ function verdictScanError(text) {
   process.exitCode = 1;
   return { leak: false, verdictRow: failRow(text), recovery: null, findings: [] };
 }
-function scanPushVerdict() {
+function scanPushVerdict(repo) {
   let findings;
   try {
-    findings = scanStagedTree(REPO_HOME, true);
+    findings = scanStagedTree(repo, true);
   } catch (err) {
     if (err.code === "ENOENT") {
       return {
@@ -970,7 +980,6 @@ var init_push_leak_verdict = __esm({
   "src/push-leak-verdict.ts"() {
     "use strict";
     init_color();
-    init_config();
     init_push_checks();
     init_push_gitleaks();
     noLeaksRow = () => `${green(okGlyph)} no leaks`;
@@ -995,8 +1004,8 @@ function lexists(p) {
     return false;
   }
 }
-function readMapIfPresent(repoHome) {
-  const mapPath = join3(repoHome, "path-map.json");
+function readMapIfPresent(repoHome2) {
+  const mapPath = join3(repoHome2, "path-map.json");
   return existsSync2(mapPath) ? readPathMap(mapPath) : { projects: {} };
 }
 function isConfiguredTarget(name, map) {
@@ -1006,14 +1015,14 @@ function isValidAdoptName(name) {
   if (SHARED_LINKS.includes(name)) return true;
   return isValidSharedDir(name);
 }
-function performAdoptMove(name, linkPath, sharedTarget) {
-  const ts = freshBackupTs(BACKUP_BASE);
+function performAdoptMove(name, linkPath, sharedTarget, repo, backup) {
+  const ts = freshBackupTs(backup);
   backupBeforeWrite(linkPath, ts);
   cpSync2(linkPath, sharedTarget, { recursive: true, force: true, preserveTimestamps: true });
   rmSync(linkPath, { recursive: true, force: true });
   ensureSymlink(linkPath, sharedTarget);
   const rel = join3("shared", name);
-  gitOrFatal(["add", "--", rel], `git add shared/${name}`, REPO_HOME);
+  gitOrFatal(["add", "--", rel], `git add shared/${name}`, repo);
   log(`adopted ${name}; ${ADOPT_PUSH_HINT}`);
 }
 function cmdAdopt(name, opts = {}) {
@@ -1022,15 +1031,18 @@ function cmdAdopt(name, opts = {}) {
     fail(`invalid name: ${JSON.stringify(name)}`);
     process.exit(1);
   }
-  const map = readMapIfPresent(REPO_HOME);
+  const repo = repoHome();
+  const claude = claudeHome();
+  const backup = backupBase();
+  const map = readMapIfPresent(repo);
   if (!isConfiguredTarget(name, map)) {
     fail(
       `${name}: not a configured shared target. Add it to sharedDirs in path-map.json first, then re-run adopt.`
     );
     process.exit(1);
   }
-  const linkPath = join3(CLAUDE_HOME, name);
-  const sharedTarget = join3(REPO_HOME, "shared", name);
+  const linkPath = join3(claude, name);
+  const sharedTarget = join3(repo, "shared", name);
   if (!existsSync2(linkPath)) {
     log(`${name}: nothing to adopt (not present in ~/.claude/)`);
     return;
@@ -1044,14 +1056,14 @@ function cmdAdopt(name, opts = {}) {
     process.exit(1);
   }
   if (dryRun) {
-    const ts = freshBackupTs(BACKUP_BASE);
+    const ts = freshBackupTs(backup);
     log(`would backup: ${linkPath} -> backup/${ts}/${name}`);
     log(`would move: ${linkPath} -> shared/${name}`);
     log(`would stage: shared/${name}`);
     return;
   }
   try {
-    performAdoptMove(name, linkPath, sharedTarget);
+    performAdoptMove(name, linkPath, sharedTarget, repo, backup);
   } catch (err) {
     if (!(err instanceof NomadFatal)) throw err;
     fail(err.message);
@@ -1064,7 +1076,6 @@ init_config();
 import { existsSync as existsSync3 } from "node:fs";
 
 // src/commands.redact.core.ts
-init_config();
 import { appendFileSync, readFileSync as readFileSync2 } from "node:fs";
 import { join as join4 } from "node:path";
 function collectMatchIntervals(content, findings) {
@@ -1121,10 +1132,10 @@ function isValidFingerprint(fingerprint) {
 function isAlreadyPresent(line, lines) {
   return lines.includes(line);
 }
-function appendGitleaksIgnore(fingerprint) {
+function appendGitleaksIgnore(fingerprint, repo) {
   const sanitized = fingerprint.replace(/[\r\n]/g, "").trim();
   if (sanitized.length === 0) return;
-  const ignPath = join4(REPO_HOME, ".gitleaksignore");
+  const ignPath = join4(repo, ".gitleaksignore");
   let raw;
   try {
     raw = readFileSync2(ignPath, "utf8");
@@ -1141,7 +1152,8 @@ function appendGitleaksIgnore(fingerprint) {
 // src/commands.allow.ts
 init_utils();
 function cmdAllow(fingerprints) {
-  if (!existsSync3(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+  const repo = repoHome();
+  if (!existsSync3(repo)) die(`repo not cloned at ${repo}`);
   for (const fp of fingerprints) {
     if (!isValidFingerprint(fp)) {
       const shown = fp.replaceAll("\r", String.raw`\r`).replaceAll("\n", String.raw`\n`);
@@ -1150,9 +1162,10 @@ function cmdAllow(fingerprints) {
     }
   }
   for (const fp of fingerprints) {
-    appendGitleaksIgnore(fp);
-    log(`allowed: ${fp}`);
+    appendGitleaksIgnore(fp, repo);
+    item(`allowed: ${fp}`);
   }
+  log(`allowed ${fingerprints.length} fingerprint(s)`);
 }
 
 // src/commands.clean.ts
@@ -1172,9 +1185,9 @@ function parseDuration(s) {
   if (!m) return null;
   return Number(m[1]) * UNIT_MS[m[2]];
 }
-function listBackupDirs(backupBase) {
-  if (!existsSync4(backupBase)) return [];
-  return readdirSync(backupBase).filter(isTsDir).map((name) => ({ name, mtimeMs: statSync2(join5(backupBase, name)).mtimeMs })).sort((a, b) => b.mtimeMs - a.mtimeMs);
+function listBackupDirs(backupBase2) {
+  if (!existsSync4(backupBase2)) return [];
+  return readdirSync(backupBase2).filter(isTsDir).map((name) => ({ name, mtimeMs: statSync2(join5(backupBase2, name)).mtimeMs })).sort((a, b) => b.mtimeMs - a.mtimeMs);
 }
 function prunableByAge(dirs, olderThanMs, nowMs) {
   return dirs.filter((d) => nowMs - d.mtimeMs > olderThanMs).map((d) => d.name);
@@ -1182,9 +1195,9 @@ function prunableByAge(dirs, olderThanMs, nowMs) {
 function prunableByCount(dirs, keep) {
   return dirs.slice(keep).map((d) => d.name);
 }
-function safeDelete(backupBase, name) {
+function safeDelete(backupBase2, name) {
   if (!isTsDir(name)) return;
-  const full = join5(backupBase, name);
+  const full = join5(backupBase2, name);
   const st = lstatSync3(full, { throwIfNoEntry: false });
   if (!st || st.isSymbolicLink() || !st.isDirectory()) return;
   rmSync2(full, { recursive: true, force: true });
@@ -1193,7 +1206,7 @@ function resolveTargets(dirs, olderThanMs, keep) {
   if (keep !== void 0) return prunableByCount(dirs, keep);
   return prunableByAge(dirs, olderThanMs, Date.now());
 }
-function cmdClean(opts, backupBase = BACKUP_BASE) {
+function cmdClean(opts, backupBase2 = backupBase()) {
   const { dryRun, olderThan, keep } = opts;
   if (olderThan !== void 0 && keep !== void 0) {
     fail("--older-than and --keep are mutually exclusive");
@@ -1208,26 +1221,193 @@ function cmdClean(opts, backupBase = BACKUP_BASE) {
     }
     olderThanMs = parsed;
   }
-  const dirs = listBackupDirs(backupBase);
+  const dirs = listBackupDirs(backupBase2);
   const targets = resolveTargets(dirs, olderThanMs, keep);
   if (dryRun) {
-    for (const name of targets) log(`would remove ${name}`);
+    for (const name of targets) item(name);
     log(`dry-run: ${targets.length} backup(s) would be removed`);
     return;
   }
-  for (const name of targets) safeDelete(backupBase, name);
+  for (const name of targets) safeDelete(backupBase2, name);
   log(`removed ${targets.length} backup(s)`);
 }
 
+// src/commands.eject.ts
+init_config();
+init_utils();
+init_utils_json();
+import { cpSync as cpSync3, existsSync as existsSync5, lstatSync as lstatSync4, realpathSync, renameSync as renameSync2, rmSync as rmSync3 } from "node:fs";
+import { join as join6, sep } from "node:path";
+function ejectChecklist() {
+  return [
+    "Manual steps remaining to finish leaving claude-nomad on this host:",
+    `  1. Uninstall the CLI: npm uninstall -g claude-nomad`,
+    `  2. Remove NOMAD_HOST and NOMAD_REPO from your shell rc (~/.zshrc or ~/.bashrc)`,
+    `  3. Optionally delete the local sync checkout: rm -rf ${repoHome()}`,
+    `  4. Optionally delete the private sync repo on GitHub`,
+    `  5. Optionally delete the backup cache: rm -rf ${backupBase()}`
+  ].join("\n");
+}
+function errMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function lexists2(p) {
+  try {
+    lstatSync4(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function readMapIfPresent2(repoHome2) {
+  const mapPath = join6(repoHome2, "path-map.json");
+  return existsSync5(mapPath) ? readPathMap(mapPath) : { projects: {} };
+}
+function classifyName(linkPath) {
+  if (!lexists2(linkPath)) return "absent";
+  if (!lstatSync4(linkPath).isSymbolicLink()) return "skip-real";
+  if (!existsSync5(linkPath)) return "dangling";
+  return "materialize";
+}
+function resolveSharedRoot(repoHome2) {
+  try {
+    return realpathSync(join6(repoHome2, "shared"));
+  } catch {
+    return die(
+      `cannot resolve ${join6(repoHome2, "shared")} (repo checkout incomplete). run \`nomad pull\` first, then re-run \`nomad eject\``
+    );
+  }
+}
+function isManagedTarget(target, sharedRoot) {
+  return target.startsWith(sharedRoot + sep);
+}
+function materializeOne(name, linkPath, sharedRoot) {
+  const target = realpathSync(linkPath);
+  if (!isManagedTarget(target, sharedRoot)) {
+    item(`skipped (not a nomad-managed target): ${name} -> ${target}`);
+    return false;
+  }
+  const tmp = `${linkPath}.eject.tmp.${process.pid}.${Date.now()}`;
+  try {
+    rmSync3(tmp, { recursive: true, force: true });
+    cpSync3(target, tmp, {
+      recursive: true,
+      force: true,
+      dereference: true,
+      preserveTimestamps: true
+    });
+    rmSync3(linkPath, { force: true });
+    renameSync2(tmp, linkPath);
+    item(`ejected: ${name}`);
+    return true;
+  } catch (err) {
+    try {
+      rmSync3(tmp, { recursive: true, force: true });
+    } catch {
+    }
+    throw err;
+  }
+}
+function previewDryRun(names, classifications, claudeHome2, sharedRoot) {
+  for (const name of names) {
+    const cls = classifications.get(name);
+    const linkPath = join6(claudeHome2, name);
+    if (cls === "absent") {
+      item(`skipped (absent): ${name}`);
+    } else if (cls === "skip-real") {
+      item(`skipped (not a symlink): ${name}`);
+    } else {
+      previewMaterialize(name, linkPath, sharedRoot);
+    }
+  }
+  log(ejectChecklist());
+}
+function previewMaterialize(name, linkPath, sharedRoot) {
+  let target;
+  try {
+    target = realpathSync(linkPath);
+  } catch {
+    item(`would materialize: ${name} (target now unresolvable; re-run to re-classify)`);
+    return;
+  }
+  if (!isManagedTarget(target, sharedRoot)) {
+    item(`skipped (not a nomad-managed target): ${name} -> ${target}`);
+    return;
+  }
+  item(`would materialize: ${name} (copy ${target} -> ${linkPath})`);
+}
+function runLiveEject(names, classifications, claudeHome2, sharedRoot) {
+  const done = [];
+  let skipped = 0;
+  for (const name of names) {
+    const cls = classifications.get(name);
+    const linkPath = join6(claudeHome2, name);
+    if (cls === "absent") {
+      item(`skipped (absent): ${name}`);
+      skipped++;
+    } else if (cls === "skip-real") {
+      item(`skipped (not a symlink): ${name}`);
+      skipped++;
+    } else if (materializeOneOrDie(name, linkPath, sharedRoot, done)) {
+      done.push(name);
+    } else {
+      skipped++;
+    }
+  }
+  log(`materialized ${done.length}, skipped ${skipped}`);
+  log(ejectChecklist());
+}
+function materializeOneOrDie(name, linkPath, sharedRoot, done) {
+  try {
+    return materializeOne(name, linkPath, sharedRoot);
+  } catch (err) {
+    const msg = errMessage(err);
+    return die(
+      `failed to materialize ${name}: ${msg}. already materialized: ${done.join(", ") || "(none)"}. the remaining names are still symlinks; do NOT delete ${repoHome()} yet, fix the cause and re-run \`nomad eject\` (it is idempotent on already-real names)`
+    );
+  }
+}
+function defaultEjectRoots() {
+  return { claudeHome: claudeHome(), repoHome: repoHome() };
+}
+function cmdEject(opts = {}, roots = defaultEjectRoots()) {
+  const dryRun = opts.dryRun === true;
+  const { claudeHome: claudeHome2, repoHome: repoHome2 } = roots;
+  const map = readMapIfPresent2(repoHome2);
+  const names = allSharedLinks(map);
+  const classifications = /* @__PURE__ */ new Map();
+  for (const name of names) {
+    classifications.set(name, classifyName(join6(claudeHome2, name)));
+  }
+  const dangling = names.filter((n) => classifications.get(n) === "dangling");
+  if (dangling.length > 0) {
+    fail(
+      `dangling symlink(s): ${dangling.join(", ")}. run \`nomad pull\` first to restore the missing target, then re-run \`nomad eject\``
+    );
+    process.exit(1);
+  }
+  const sharedRoot = resolveSharedRoot(repoHome2);
+  if (dryRun) {
+    previewDryRun(names, classifications, claudeHome2, sharedRoot);
+    return;
+  }
+  try {
+    runLiveEject(names, classifications, claudeHome2, sharedRoot);
+  } catch (err) {
+    fail(errMessage(err));
+    process.exit(1);
+  }
+}
+
 // src/commands.doctor.ts
-import { existsSync as existsSync21 } from "node:fs";
-import { join as join25 } from "node:path";
+import { existsSync as existsSync22 } from "node:fs";
+import { join as join26 } from "node:path";
 
 // src/commands.doctor.checks.repo.ts
 init_color();
 init_config();
-import { existsSync as existsSync6, lstatSync as lstatSync4, statSync as statSync3 } from "node:fs";
-import { join as join7 } from "node:path";
+import { existsSync as existsSync7, lstatSync as lstatSync5, statSync as statSync3 } from "node:fs";
+import { join as join8 } from "node:path";
 
 // src/commands.doctor.format.ts
 init_color();
@@ -1248,8 +1428,8 @@ function sectionFailed(s) {
   return s.items.some((line) => line.includes(failGlyph));
 }
 function renderRawItems(items) {
-  for (const item of items) {
-    console.log(item === "" ? "" : `  ${item}`);
+  for (const item2 of items) {
+    console.log(item2 === "" ? "" : `  ${item2}`);
   }
 }
 function renderSection(s) {
@@ -1261,18 +1441,18 @@ function renderSection(s) {
   const header = sectionFailed(s) ? `${red(FAIL_GLYPH_BARE)} ${s.header}` : s.header;
   console.log(header);
   const lastContent = s.items.reduce(
-    (acc, item, j) => item === "" || isChild(item) ? acc : j,
+    (acc, item2, j) => item2 === "" || isChild(item2) ? acc : j,
     -1
   );
   for (let j = 0; j < s.items.length; j++) {
-    const item = s.items[j];
-    if (item === "") console.log("");
-    else if (isChild(item)) console.log(renderChildLine(s.items, j));
-    else console.log(`${j === lastContent ? "  \u2514 " : "  \u251C "}${item}`);
+    const item2 = s.items[j];
+    if (item2 === "") console.log("");
+    else if (isChild(item2)) console.log(renderChildLine(s.items, j));
+    else console.log(`${j === lastContent ? "  \u2514 " : "  \u251C "}${item2}`);
   }
 }
-function isChild(item) {
-  return item.startsWith("	");
+function isChild(item2) {
+  return item2.startsWith("	");
 }
 function renderChildLine(items, j) {
   const parentContinues = items.some((it, k) => k > j && it !== "" && !isChild(it));
@@ -1305,15 +1485,15 @@ function readJsonSafe(path, label, section2) {
 // src/init.classify.ts
 init_config();
 init_utils_json();
-import { existsSync as existsSync5 } from "node:fs";
-import { join as join6 } from "node:path";
-function classifyRepoState(repoHome, host) {
-  const basePath = join6(repoHome, "shared", "settings.base.json");
-  const mapPath = join6(repoHome, "path-map.json");
-  const hostPath = join6(repoHome, "hosts", `${host}.json`);
-  const hasBase = existsSync5(basePath);
-  const hasMap = existsSync5(mapPath);
-  const hasHost = existsSync5(hostPath);
+import { existsSync as existsSync6 } from "node:fs";
+import { join as join7 } from "node:path";
+function classifyRepoState(repoHome2, host) {
+  const basePath = join7(repoHome2, "shared", "settings.base.json");
+  const mapPath = join7(repoHome2, "path-map.json");
+  const hostPath = join7(repoHome2, "hosts", `${host}.json`);
+  const hasBase = existsSync6(basePath);
+  const hasMap = existsSync6(mapPath);
+  const hasHost = existsSync6(hostPath);
   let mapEntryCount = 0;
   if (hasMap) {
     try {
@@ -1327,12 +1507,12 @@ function classifyRepoState(repoHome, host) {
   if (hasBase && mapEntryCount > 0 && hasHost) return "populated";
   return "partial";
 }
-function reasonForPartial(repoHome, host) {
-  const basePath = join6(repoHome, "shared", "settings.base.json");
-  const mapPath = join6(repoHome, "path-map.json");
-  const hostPath = join6(repoHome, "hosts", `${host}.json`);
-  if (!existsSync5(basePath)) return "- shared/settings.base.json missing";
-  if (!existsSync5(mapPath)) return "- path-map.json missing";
+function reasonForPartial(repoHome2, host) {
+  const basePath = join7(repoHome2, "shared", "settings.base.json");
+  const mapPath = join7(repoHome2, "path-map.json");
+  const hostPath = join7(repoHome2, "hosts", `${host}.json`);
+  if (!existsSync6(basePath)) return "- shared/settings.base.json missing";
+  if (!existsSync6(mapPath)) return "- path-map.json missing";
   let mapEntryCount;
   try {
     const map = readJson(mapPath);
@@ -1341,7 +1521,7 @@ function reasonForPartial(repoHome, host) {
     mapEntryCount = 0;
   }
   if (mapEntryCount === 0) return "- path-map.json.projects has no entries";
-  if (!existsSync5(hostPath)) return `- hosts/${host}.json missing`;
+  if (!existsSync6(hostPath)) return `- hosts/${host}.json missing`;
   return "- partial state (unknown gap)";
 }
 
@@ -1351,28 +1531,28 @@ function isOverrideActive() {
 }
 function reportHostAndPaths(section2) {
   const unsetHint = process.env.NOMAD_HOST ? "" : dim(" (env unset, using hostname)");
+  const repo = repoHome();
+  const claude = claudeHome();
   addItem(section2, `${dim(infoGlyph)} NOMAD_HOST: ${cyan(HOST)}${unsetHint}`);
   if (isOverrideActive()) {
-    addItem(section2, `${dim(infoGlyph)} NOMAD_REPO: ${blue(REPO_HOME)}`);
+    addItem(section2, `${dim(infoGlyph)} NOMAD_REPO: ${blue(repo)}`);
   }
+  addItem(section2, `${existsSync7(repo) ? green(okGlyph) : yellow(warnGlyph)} repo: ${blue(repo)}`);
   addItem(
     section2,
-    `${existsSync6(REPO_HOME) ? green(okGlyph) : yellow(warnGlyph)} repo: ${blue(REPO_HOME)}`
-  );
-  addItem(
-    section2,
-    `${existsSync6(CLAUDE_HOME) ? green(okGlyph) : yellow(warnGlyph)} claude home: ${blue(CLAUDE_HOME)}`
+    `${existsSync7(claude) ? green(okGlyph) : yellow(warnGlyph)} claude home: ${blue(claude)}`
   );
 }
 function reportRepoState(section2) {
-  const state = classifyRepoState(REPO_HOME, HOST);
+  const repo = repoHome();
+  const state = classifyRepoState(repo, HOST);
   const overrideLabel = isOverrideActive() ? " (NOMAD_REPO)" : "";
   if (state === "populated") {
     addItem(section2, `${green(okGlyph)} repo state: populated${overrideLabel}`);
   } else if (state === "partial") {
     addItem(
       section2,
-      `${yellow(warnGlyph)} repo state: partial ${reasonForPartial(REPO_HOME, HOST)}${overrideLabel}`
+      `${yellow(warnGlyph)} repo state: partial ${reasonForPartial(repo, HOST)}${overrideLabel}`
     );
   } else {
     addItem(
@@ -1383,12 +1563,12 @@ function reportRepoState(section2) {
   }
 }
 function repoHasSharedSource(name) {
-  return existsSync6(join7(REPO_HOME, "shared", name));
+  return existsSync7(join8(repoHome(), "shared", name));
 }
 function classifySharedLink(name, p) {
   let stat;
   try {
-    stat = lstatSync4(p);
+    stat = lstatSync5(p);
   } catch (err) {
     const code = err.code;
     if (code === "ENOENT") {
@@ -1429,8 +1609,9 @@ function classifySymlinkTarget(name, p) {
   }
 }
 function reportSharedLinks(section2, map) {
+  const claude = claudeHome();
   for (const name of allSharedLinks(map)) {
-    const p = join7(CLAUDE_HOME, name);
+    const p = join8(claude, name);
     const { line, fail: fail2 } = classifySharedLink(name, p);
     addItem(section2, line);
     if (fail2) process.exitCode = 1;
@@ -1440,11 +1621,11 @@ function reportSharedLinks(section2, map) {
 // src/commands.doctor.checks.settings.ts
 init_color();
 init_config();
-import { existsSync as existsSync7, readdirSync as readdirSync2 } from "node:fs";
-import { join as join8 } from "node:path";
+import { existsSync as existsSync8, readdirSync as readdirSync2 } from "node:fs";
+import { join as join9 } from "node:path";
 function loadBaseSettings(section2) {
-  const basePath = join8(REPO_HOME, "shared", "settings.base.json");
-  if (!existsSync7(basePath)) {
+  const basePath = join9(repoHome(), "shared", "settings.base.json");
+  if (!existsSync8(basePath)) {
     addItem(section2, `${red(failGlyph)} shared/settings.base.json missing at ${blue(basePath)}`);
     process.exitCode = 1;
     return null;
@@ -1452,8 +1633,8 @@ function loadBaseSettings(section2) {
   return readJsonSafe(basePath, basePath, section2);
 }
 function loadAndReportSettings(section2) {
-  const settingsPath = join8(CLAUDE_HOME, "settings.json");
-  if (!existsSync7(settingsPath)) return null;
+  const settingsPath = join9(claudeHome(), "settings.json");
+  if (!existsSync8(settingsPath)) return null;
   const settings = readJsonSafe(settingsPath, settingsPath, section2);
   if (settings === null) return null;
   const unknownKeys = Object.keys(settings).filter((k) => !KNOWN_SETTINGS_KEYS.has(k));
@@ -1468,13 +1649,14 @@ function loadAndReportSettings(section2) {
   return settings;
 }
 function reportHostOverrides(section2, base, settings) {
-  const hostFile = join8(REPO_HOME, "hosts", `${HOST}.json`);
+  const repo = repoHome();
+  const hostFile = join9(repo, "hosts", `${HOST}.json`);
   let drift = [];
   if (base !== null && settings !== null) {
     const baseKeys = new Set(Object.keys(base));
     drift = Object.keys(settings).filter((k) => !baseKeys.has(k));
   }
-  if (existsSync7(hostFile)) {
+  if (existsSync8(hostFile)) {
     if (readJsonSafe(hostFile, hostFile, section2) !== null) {
       addItem(section2, `${green(okGlyph)} host overrides: ${blue(hostFile)}`);
     }
@@ -1483,8 +1665,8 @@ function reportHostOverrides(section2, base, settings) {
       section2,
       `${red(failGlyph)} no hosts/${HOST}.json AND settings.json has unbased keys ${JSON.stringify(drift)}`
     );
-    const hostsDir = join8(REPO_HOME, "hosts");
-    if (existsSync7(hostsDir)) {
+    const hostsDir = join9(repo, "hosts");
+    if (existsSync8(hostsDir)) {
       const cands = readdirSync2(hostsDir).filter((f) => f.endsWith(".json"));
       if (cands.length > 0) addItem(section2, `${dim(infoGlyph)} candidates: ${cands.join(", ")}`);
     }
@@ -1500,8 +1682,8 @@ function reportHostOverrides(section2, base, settings) {
 // src/commands.doctor.checks.pathmap.ts
 init_color();
 init_config();
-import { existsSync as existsSync8, readdirSync as readdirSync3 } from "node:fs";
-import { join as join9 } from "node:path";
+import { existsSync as existsSync9, readdirSync as readdirSync3 } from "node:fs";
+import { join as join10 } from "node:path";
 init_utils_json();
 function reportMappedProjects(section2, map) {
   const mapped = Object.entries(map.projects).filter(([, hosts]) => hosts[HOST]);
@@ -1511,8 +1693,8 @@ function reportMappedProjects(section2, map) {
   }
 }
 function reportUnmappedProjects(section2, map) {
-  const localProjects = join9(CLAUDE_HOME, "projects");
-  if (!existsSync8(localProjects)) return;
+  const localProjects = join10(claudeHome(), "projects");
+  if (!existsSync9(localProjects)) return;
   let localDirs;
   try {
     localDirs = readdirSync3(localProjects);
@@ -1552,8 +1734,8 @@ function reportPathCollisions(section2, map) {
   else addItem(section2, `${green(okGlyph)} path-encoding: no collisions`);
 }
 function reportPathMap(section2) {
-  const mapPath = join9(REPO_HOME, "path-map.json");
-  if (!existsSync8(mapPath)) {
+  const mapPath = join10(repoHome(), "path-map.json");
+  if (!existsSync9(mapPath)) {
     addItem(section2, `${red(failGlyph)} path-map.json missing at ${blue(mapPath)}`);
     process.exitCode = 1;
     return;
@@ -1606,16 +1788,16 @@ function reportNeverSync(section2) {
 init_color();
 init_config();
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { existsSync as existsSync11 } from "node:fs";
-import { join as join13, relative as relative2 } from "node:path";
+import { existsSync as existsSync12 } from "node:fs";
+import { join as join14, relative as relative2 } from "node:path";
 
 // src/commands.pull.wedge.ts
-import { existsSync as existsSync9 } from "node:fs";
-import { join as join10 } from "node:path";
+import { existsSync as existsSync10 } from "node:fs";
+import { join as join11 } from "node:path";
 function detectWedge(repo) {
-  const g = join10(repo, ".git");
-  if (existsSync9(join10(g, "rebase-merge")) || existsSync9(join10(g, "rebase-apply"))) return "rebase";
-  if (existsSync9(join10(g, "MERGE_HEAD"))) return "merge";
+  const g = join11(repo, ".git");
+  if (existsSync10(join11(g, "rebase-merge")) || existsSync10(join11(g, "rebase-apply"))) return "rebase";
+  if (existsSync10(join11(g, "MERGE_HEAD"))) return "merge";
   return null;
 }
 
@@ -1640,11 +1822,12 @@ function reportGitleaksProbe(section2) {
   }
 }
 function reportGitlinks(section2) {
-  const sharedDir = join13(REPO_HOME, "shared");
-  if (existsSync11(sharedDir)) {
+  const repo = repoHome();
+  const sharedDir = join14(repo, "shared");
+  if (existsSync12(sharedDir)) {
     const gitlinks = findGitlinks(sharedDir);
     for (const p of gitlinks) {
-      const rel = relative2(REPO_HOME, p);
+      const rel = relative2(repo, p);
       addItem(
         section2,
         `${red(failGlyph)} gitlink: ${blue(rel)} would push as submodule (run: rm -rf ${rel} or remove the nested repo)`
@@ -1660,7 +1843,7 @@ function reportGitlinks(section2) {
 function reportRemote(section2) {
   try {
     const url = execFileSync3("git", ["remote", "get-url", "origin"], {
-      cwd: REPO_HOME,
+      cwd: repoHome(),
       stdio: ["ignore", "pipe", "pipe"]
     }).toString().trim();
     addItem(section2, `${dim(infoGlyph)} remote origin: ${cyan(url)}`);
@@ -1670,7 +1853,7 @@ function reportRemote(section2) {
 }
 function reportRebaseClean(section2) {
   try {
-    const status = gitStatusPorcelainZ(REPO_HOME);
+    const status = gitStatusPorcelainZ(repoHome());
     if (status.length > 0) {
       addItem(
         section2,
@@ -1682,7 +1865,7 @@ function reportRebaseClean(section2) {
 }
 function reportRebaseState(section2) {
   try {
-    const wedge = detectWedge(REPO_HOME);
+    const wedge = detectWedge(repoHome());
     if (wedge !== null) {
       const state = wedge === "rebase" ? "mid-rebase" : "mid-merge";
       addItem(
@@ -1697,8 +1880,8 @@ function reportRebaseState(section2) {
 
 // src/commands.doctor.checks.backups.ts
 init_color();
-import { existsSync as existsSync12, lstatSync as lstatSync5, readdirSync as readdirSync5 } from "node:fs";
-import { join as join14 } from "node:path";
+import { existsSync as existsSync13, lstatSync as lstatSync6, readdirSync as readdirSync5 } from "node:fs";
+import { join as join15 } from "node:path";
 init_config();
 var TS_SHAPE2 = /^\d{8}-\d{6}(-\d+)?$/;
 function safeReaddir(dir) {
@@ -1714,8 +1897,8 @@ var BYTES_PER_MB = 1024 * 1024;
 function dirSizeBytes(dir) {
   let bytes = 0;
   for (const entry of safeReaddir(dir)) {
-    const full = join14(dir, entry);
-    const st = lstatSync5(full, { throwIfNoEntry: false });
+    const full = join15(dir, entry);
+    const st = lstatSync6(full, { throwIfNoEntry: false });
     if (!st) continue;
     if (st.isSymbolicLink()) continue;
     if (st.isDirectory()) bytes += dirSizeBytes(full);
@@ -1723,16 +1906,16 @@ function dirSizeBytes(dir) {
   }
   return bytes;
 }
-function totalSizeMb(backupBase, dirs) {
+function totalSizeMb(backupBase2, dirs) {
   let bytes = 0;
-  for (const name of dirs) bytes += dirSizeBytes(join14(backupBase, name));
+  for (const name of dirs) bytes += dirSizeBytes(join15(backupBase2, name));
   return bytes / BYTES_PER_MB;
 }
-function reportBackupsCheck(section2, backupBase = BACKUP_BASE) {
-  if (!existsSync12(backupBase)) return;
-  const dirs = safeReaddir(backupBase).filter((n) => TS_SHAPE2.test(n));
+function reportBackupsCheck(section2, backupBase2 = backupBase()) {
+  if (!existsSync13(backupBase2)) return;
+  const dirs = safeReaddir(backupBase2).filter((n) => TS_SHAPE2.test(n));
   const count = dirs.length;
-  const sizeMb = totalSizeMb(backupBase, dirs);
+  const sizeMb = totalSizeMb(backupBase2, dirs);
   if (count > DOCTOR_BACKUP_COUNT_WARN || sizeMb > DOCTOR_BACKUP_SIZE_WARN_MB) {
     addItem(
       section2,
@@ -1743,8 +1926,8 @@ function reportBackupsCheck(section2, backupBase = BACKUP_BASE) {
 
 // src/commands.doctor.check-schema.ts
 init_color();
-import { existsSync as existsSync13 } from "node:fs";
-import { join as join15 } from "node:path";
+import { existsSync as existsSync14 } from "node:fs";
+import { join as join16 } from "node:path";
 init_config();
 
 // src/http-fetch.ts
@@ -1781,8 +1964,8 @@ function fetchSchemaKeys() {
   }
 }
 function reportCheckSchema(section2) {
-  const settingsPath = join15(CLAUDE_HOME, "settings.json");
-  if (!existsSync13(settingsPath)) {
+  const settingsPath = join16(claudeHome(), "settings.json");
+  if (!existsSync14(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json to check`);
     return;
   }
@@ -1812,18 +1995,18 @@ function reportCheckSchema(section2) {
 init_color();
 import { randomBytes } from "node:crypto";
 import { execFileSync as execFileSync6 } from "node:child_process";
-import { existsSync as existsSync15, mkdirSync as mkdirSync4, readdirSync as readdirSync7, rmSync as rmSync6 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync4, readdirSync as readdirSync7, rmSync as rmSync7 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 
 // src/commands.doctor.check-shared.scan.ts
 init_color();
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 init_config();
 init_push_gitleaks();
 function scrubPath(logical, sid, logicalToEncoded) {
   const encoded = logicalToEncoded.get(logical) ?? logical;
-  return join17(CLAUDE_HOME, "projects", encoded, `${sid}.jsonl`);
+  return join18(claudeHome(), "projects", encoded, `${sid}.jsonl`);
 }
 function reportSessionFindings(section2, bySession) {
   for (const [sid, counts] of bySession) {
@@ -1915,24 +2098,24 @@ init_config();
 init_utils();
 init_utils_fs();
 init_utils_json();
-import { cpSync as cpSync3, existsSync as existsSync14, mkdirSync as mkdirSync3, readdirSync as readdirSync6, rmSync as rmSync5, statSync as statSync4 } from "node:fs";
-import { join as join18, relative as relative3, sep } from "node:path";
+import { cpSync as cpSync4, existsSync as existsSync15, mkdirSync as mkdirSync3, readdirSync as readdirSync6, rmSync as rmSync6, statSync as statSync4 } from "node:fs";
+import { join as join19, relative as relative3, sep as sep2 } from "node:path";
 function copyDir(src, dst) {
-  rmSync5(dst, { recursive: true, force: true });
-  cpSync3(src, dst, { recursive: true, force: true });
+  rmSync6(dst, { recursive: true, force: true });
+  cpSync4(src, dst, { recursive: true, force: true });
 }
 function copyDirJsonlOnly(src, dst) {
-  rmSync5(dst, { recursive: true, force: true });
-  cpSync3(src, dst, {
+  rmSync6(dst, { recursive: true, force: true });
+  cpSync4(src, dst, {
     recursive: true,
     force: true,
     filter: (srcPath) => {
       const rel = relative3(src, srcPath);
       if (rel === "") return true;
-      if (rel.split(sep).length > 1) return true;
+      if (rel.split(sep2).length > 1) return true;
       if (statSync4(srcPath).isDirectory()) return true;
       if (srcPath.endsWith(".jsonl")) return true;
-      log(`skip ${rel}: extension not in allowlist`);
+      item(`skip ${rel}: extension not in allowlist`);
       return false;
     }
   });
@@ -1946,15 +2129,17 @@ function remapPull(ts, opts = {}) {
   let unmapped = 0;
   const pulled = [];
   const wouldPull = [];
-  const mapPath = join18(REPO_HOME, "path-map.json");
-  const repoProjects = join18(REPO_HOME, "shared", "projects");
-  if (!existsSync14(mapPath) || !existsSync14(repoProjects)) {
+  const repo = repoHome();
+  const claude = claudeHome();
+  const mapPath = join19(repo, "path-map.json");
+  const repoProjects = join19(repo, "shared", "projects");
+  if (!existsSync15(mapPath) || !existsSync15(repoProjects)) {
     const text = "no path-map or repo projects dir; skipping session remap";
     emitPreview(opts.onPreview, { kind: "note", text }, text);
     return { unmapped: 0, pulled, wouldPull };
   }
   const map = readJson(mapPath);
-  const localProjects = join18(CLAUDE_HOME, "projects");
+  const localProjects = join19(claude, "projects");
   if (!dryRun) mkdirSync3(localProjects, { recursive: true });
   for (const [logical, hosts] of Object.entries(map.projects)) {
     assertSafeLogical(logical);
@@ -1963,9 +2148,9 @@ function remapPull(ts, opts = {}) {
       unmapped++;
       continue;
     }
-    const src = join18(repoProjects, logical);
-    if (!existsSync14(src)) continue;
-    const dst = join18(localProjects, encodePath(localPath));
+    const src = join19(repoProjects, logical);
+    if (!existsSync15(src)) continue;
+    const dst = join19(localProjects, encodePath(localPath));
     if (dryRun) {
       wouldPull.push(logical);
       emitPreview(
@@ -2010,16 +2195,18 @@ function remapPush(ts, opts = {}) {
   let unmapped = 0;
   const pushed = [];
   const wouldPush = [];
-  const mapPath = join18(REPO_HOME, "path-map.json");
-  if (!existsSync14(mapPath)) {
+  const repo = repoHome();
+  const claude = claudeHome();
+  const mapPath = join19(repo, "path-map.json");
+  if (!existsSync15(mapPath)) {
     log("no path-map.json; skipping session export");
     return { unmapped: 0, collisions: 0, pushed, wouldPush };
   }
   const map = readJson(mapPath);
-  const localProjects = join18(CLAUDE_HOME, "projects");
-  const repoProjects = join18(REPO_HOME, "shared", "projects");
+  const localProjects = join19(claude, "projects");
+  const repoProjects = join19(repo, "shared", "projects");
   const reverse = buildReverseMap(map);
-  if (!existsSync14(localProjects)) return { unmapped, collisions: 0, pushed, wouldPush };
+  if (!existsSync15(localProjects)) return { unmapped, collisions: 0, pushed, wouldPush };
   if (!dryRun) mkdirSync3(repoProjects, { recursive: true });
   for (const dir of readdirSync6(localProjects)) {
     const logical = reverse.get(dir);
@@ -2027,13 +2214,13 @@ function remapPush(ts, opts = {}) {
       unmapped++;
       continue;
     }
-    const repoDst = join18(repoProjects, logical);
+    const repoDst = join19(repoProjects, logical);
     if (dryRun) {
       wouldPush.push(logical);
       continue;
     }
-    backupRepoWrite(repoDst, ts, REPO_HOME);
-    copyDirJsonlOnly(join18(localProjects, dir), repoDst);
+    backupRepoWrite(repoDst, ts, repo);
+    copyDirJsonlOnly(join19(localProjects, dir), repoDst);
     pushed.push(logical);
   }
   return { unmapped, collisions: 0, pushed, wouldPush };
@@ -2045,8 +2232,9 @@ init_utils_json();
 function buildScanTree(tmpRoot) {
   const logicalToEncoded = /* @__PURE__ */ new Map();
   let staged = 0;
-  const mapPath = join19(REPO_HOME, "path-map.json");
-  if (!existsSync15(mapPath)) return { logicalToEncoded, staged, malformed: false };
+  const repo = repoHome();
+  const mapPath = join20(repo, "path-map.json");
+  if (!existsSync16(mapPath)) return { logicalToEncoded, staged, malformed: false };
   let map;
   try {
     map = readJson(mapPath);
@@ -2063,12 +2251,12 @@ function buildScanTree(tmpRoot) {
     if (!p || p === "TBD") continue;
     reverse.set(encodePath(p), logical);
   }
-  const localProjects = join19(CLAUDE_HOME, "projects");
-  if (!existsSync15(localProjects)) return { logicalToEncoded, staged, malformed: false };
+  const localProjects = join20(claudeHome(), "projects");
+  if (!existsSync16(localProjects)) return { logicalToEncoded, staged, malformed: false };
   for (const dir of readdirSync7(localProjects)) {
     const logical = reverse.get(dir);
     if (!logical) continue;
-    copyDirJsonlOnly(join19(localProjects, dir), join19(tmpRoot, "shared", "projects", logical));
+    copyDirJsonlOnly(join20(localProjects, dir), join20(tmpRoot, "shared", "projects", logical));
     logicalToEncoded.set(logical, dir);
     staged++;
   }
@@ -2099,11 +2287,11 @@ function ensureGitleaksReady(section2, gitleaksReady) {
 }
 function reportCheckShared(section2, gitleaksReady) {
   if (!ensureGitleaksReady(section2, gitleaksReady)) return;
-  const cacheDir = join19(homedir4(), ".cache", "claude-nomad");
+  const cacheDir = join20(homedir4(), ".cache", "claude-nomad");
   mkdirSync4(cacheDir, { recursive: true });
   const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes(4).toString("hex")}`;
-  const reportPath = join19(cacheDir, `check-shared-${stamp}.json`);
-  const tmpRoot = join19(cacheDir, `check-shared-tree-${stamp}`);
+  const reportPath = join20(cacheDir, `check-shared-${stamp}.json`);
+  const tmpRoot = join20(cacheDir, `check-shared-tree-${stamp}`);
   try {
     const { logicalToEncoded, staged, malformed } = buildScanTree(tmpRoot);
     if (malformed) {
@@ -2117,15 +2305,15 @@ function reportCheckShared(section2, gitleaksReady) {
     }
     scanAndReport(section2, tmpRoot, staged, logicalToEncoded);
   } finally {
-    rmSync6(reportPath, { force: true });
-    rmSync6(tmpRoot, { recursive: true, force: true });
+    rmSync7(reportPath, { force: true });
+    rmSync7(tmpRoot, { recursive: true, force: true });
   }
 }
 
 // src/commands.doctor.checks.hooks.scope.ts
 init_color();
-import { existsSync as existsSync16, readFileSync as readFileSync5, readdirSync as readdirSync8, realpathSync } from "node:fs";
-import { dirname as dirname2, extname, join as join20 } from "node:path";
+import { existsSync as existsSync17, readFileSync as readFileSync5, readdirSync as readdirSync8, realpathSync as realpathSync2 } from "node:fs";
+import { dirname as dirname2, extname, join as join21 } from "node:path";
 init_config();
 function typeFromPackageJson(pkgPath) {
   try {
@@ -2141,14 +2329,14 @@ function effectiveType(hookPath) {
   if (ext === ".cjs") return "cjs";
   let real;
   try {
-    real = realpathSync(hookPath);
+    real = realpathSync2(hookPath);
   } catch {
     return null;
   }
   let dir = dirname2(real);
   for (; ; ) {
-    const pkg = join20(dir, "package.json");
-    if (existsSync16(pkg)) return typeFromPackageJson(pkg);
+    const pkg = join21(dir, "package.json");
+    if (existsSync17(pkg)) return typeFromPackageJson(pkg);
     const parent = dirname2(dir);
     if (parent === dir) return "cjs";
     dir = parent;
@@ -2190,15 +2378,15 @@ function safeRead(path) {
   }
 }
 function reportHookScopeCheck(section2) {
-  const hooksDir = join20(CLAUDE_HOME, "hooks");
-  if (!existsSync16(hooksDir)) {
+  const hooksDir = join21(claudeHome(), "hooks");
+  if (!existsSync17(hooksDir)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/hooks; skipping module-scope check`);
     return;
   }
   let anyWarn = false;
   for (const name of safeReaddir2(hooksDir)) {
     if (extname(name) !== ".js") continue;
-    const abs = join20(hooksDir, name);
+    const abs = join21(hooksDir, name);
     const eff = effectiveType(abs);
     if (eff === null) continue;
     const src = safeRead(abs);
@@ -2218,17 +2406,18 @@ function reportHookScopeCheck(section2) {
 
 // src/commands.doctor.checks.hooks.ts
 init_color();
-import { existsSync as existsSync17 } from "node:fs";
-import { join as join21 } from "node:path";
+import { existsSync as existsSync18 } from "node:fs";
+import { join as join22 } from "node:path";
 init_config();
 function expandHome(token) {
-  return token.replace(/^\$\{HOME\}/, HOME).replace(/^\$HOME/, HOME).replace(/^~/, HOME);
+  const h2 = home();
+  return token.replace(/^\$\{HOME\}/, h2).replace(/^\$HOME/, h2).replace(/^~/, h2);
 }
 function stripShellPunctuation(token) {
   return token.replace(/^['"]+/, "").replace(/['"`;)|&>]+$/, "");
 }
 function* claudePathsIn(command) {
-  const claudePrefix = `${CLAUDE_HOME}/`;
+  const claudePrefix = `${claudeHome()}/`;
   for (const segment of command.split(/&&|\|\||;|\|/)) {
     for (const raw of segment.trim().split(/\s+/).filter(Boolean)) {
       const expanded = expandHome(stripShellPunctuation(raw));
@@ -2257,7 +2446,7 @@ function checkEventGroups(section2, event, groups) {
   for (const group of groups) {
     for (const cmd of commandsFromGroup(group)) {
       for (const resolved of claudePathsIn(cmd)) {
-        if (existsSync17(resolved)) continue;
+        if (existsSync18(resolved)) continue;
         addItem(
           section2,
           `${red(failGlyph)} hooks/${event}: command target missing: ${resolved} (run nomad pull)`
@@ -2270,8 +2459,8 @@ function checkEventGroups(section2, event, groups) {
   return anyFail;
 }
 function reportHooksTargetCheck(section2) {
-  const settingsPath = join21(CLAUDE_HOME, "settings.json");
-  if (!existsSync17(settingsPath)) {
+  const settingsPath = join22(claudeHome(), "settings.json");
+  if (!existsSync18(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json; skipping hook target check`);
     return;
   }
@@ -2294,12 +2483,12 @@ function reportHooksTargetCheck(section2) {
 
 // src/commands.doctor.checks.hooks.preserve-symlinks.ts
 init_color();
-import { existsSync as existsSync19, readFileSync as readFileSync6 } from "node:fs";
-import { join as join23 } from "node:path";
+import { existsSync as existsSync20, readFileSync as readFileSync6 } from "node:fs";
+import { join as join24 } from "node:path";
 
 // src/commands.doctor.checks.hooks.preserve-symlinks.probe.ts
-import { closeSync as closeSync2, existsSync as existsSync18, openSync as openSync2, readSync, realpathSync as realpathSync2 } from "node:fs";
-import { dirname as dirname3, join as join22, resolve as resolve2 } from "node:path";
+import { closeSync as closeSync2, existsSync as existsSync19, openSync as openSync2, readSync, realpathSync as realpathSync3 } from "node:fs";
+import { dirname as dirname3, join as join23, resolve as resolve2 } from "node:path";
 function suppressedRanges(src) {
   const ranges = [];
   const re = /\/\*[\s\S]*?\*\/|\/\/[^\n]*|'[^']*'|"[^"]*"|`[^`]*`/g;
@@ -2331,19 +2520,19 @@ function topRelativeSpecifiers(src) {
 }
 function specifierIsMissing(specifier, baseDir) {
   const base = resolve2(baseDir, specifier);
-  if (existsSync18(base)) return false;
+  if (existsSync19(base)) return false;
   for (const ext of [".js", ".cjs", ".mjs"]) {
-    if (existsSync18(base + ext)) return false;
+    if (existsSync19(base + ext)) return false;
   }
   for (const idx of ["index.js", "index.cjs", "index.mjs"]) {
-    if (existsSync18(join22(base, idx))) return false;
+    if (existsSync19(join23(base, idx))) return false;
   }
   return true;
 }
 function relativeRequireTargetsBroken(scriptPath) {
   let realPath;
   try {
-    realPath = realpathSync2(scriptPath);
+    realPath = realpathSync3(scriptPath);
   } catch {
     return false;
   }
@@ -2372,7 +2561,8 @@ function relativeRequireTargetsBroken(scriptPath) {
 // src/commands.doctor.checks.hooks.preserve-symlinks.ts
 init_config();
 function expandHome2(token) {
-  return token.replace(/^\$\{HOME\}/, HOME).replace(/^\$HOME/, HOME).replace(/^~/, HOME);
+  const h2 = home();
+  return token.replace(/^\$\{HOME\}/, h2).replace(/^\$HOME/, h2).replace(/^~/, h2);
 }
 function stripShellPunct(token) {
   const head = token.replace(/^['"]+/, "");
@@ -2390,8 +2580,8 @@ function commandTokens(command) {
   return tokens;
 }
 function readPathMapSafe() {
-  const mapPath = join23(REPO_HOME, "path-map.json");
-  if (!existsSync19(mapPath)) return { projects: {} };
+  const mapPath = join24(repoHome(), "path-map.json");
+  if (!existsSync20(mapPath)) return { projects: {} };
   try {
     return JSON.parse(readFileSync6(mapPath, "utf8"));
   } catch {
@@ -2400,7 +2590,7 @@ function readPathMapSafe() {
 }
 function resolvesUnderSymlinkedShared(scriptPath, sharedLinkNames) {
   for (const name of sharedLinkNames) {
-    const prefix = `${CLAUDE_HOME}/${name}/`;
+    const prefix = `${claudeHome()}/${name}/`;
     if (scriptPath.startsWith(prefix)) return true;
   }
   return false;
@@ -2464,8 +2654,8 @@ function checkEventForPreserveSymlinks(section2, event, groups, sharedLinkNames)
   return anyWarn;
 }
 function reportPreserveSymlinksCheck(section2) {
-  const settingsPath = join23(CLAUDE_HOME, "settings.json");
-  if (!existsSync19(settingsPath)) {
+  const settingsPath = join24(claudeHome(), "settings.json");
+  if (!existsSync20(settingsPath)) {
     addItem(
       section2,
       `${dim(infoGlyph)} no ~/.claude/settings.json; skipping preserve-symlinks-main check`
@@ -2611,8 +2801,8 @@ function reportNodeEngineCheck(section2) {
 // src/commands.doctor.gitleaks-version.ts
 init_color();
 import { execFileSync as execFileSync7 } from "node:child_process";
-import { existsSync as existsSync20 } from "node:fs";
-import { join as join24 } from "node:path";
+import { existsSync as existsSync21 } from "node:fs";
+import { join as join25 } from "node:path";
 init_config();
 var SEMVER_MAJOR_MINOR = /^(\d+)\.(\d+)\.\d+$/;
 var GITLEAKS_TIMEOUT_MS = 5e3;
@@ -2621,7 +2811,7 @@ function majorMinorOf(value) {
   return m === null ? null : [m[1], m[2]];
 }
 function readGitleaksVersion(run, tomlExists) {
-  const tomlPath = join24(REPO_HOME, ".gitleaks.toml");
+  const tomlPath = join25(repoHome(), ".gitleaks.toml");
   const args = ["version"];
   if (tomlExists(tomlPath)) args.push("--config", tomlPath);
   try {
@@ -2633,7 +2823,7 @@ function readGitleaksVersion(run, tomlExists) {
     return null;
   }
 }
-function reportGitleaksVersionCheck(section2, run = execFileSync7, tomlExists = existsSync20) {
+function reportGitleaksVersionCheck(section2, run = execFileSync7, tomlExists = existsSync21) {
   const raw = readGitleaksVersion(run, tomlExists);
   if (raw === null) return;
   const local = majorMinorOf(raw);
@@ -2772,7 +2962,7 @@ function readOriginRemote(cwd, run = execFileSync9) {
 function reportActionsDrift(section2, run = execFileSync10) {
   let remote;
   try {
-    remote = readOriginRemote(REPO_HOME, run);
+    remote = readOriginRemote(repoHome(), run);
   } catch {
     return;
   }
@@ -2802,15 +2992,15 @@ function reportActionsDrift(section2, run = execFileSync10) {
 
 // src/commands.doctor.verdict.ts
 init_color();
-function isFailLine(item) {
-  return item.includes(failGlyph);
+function isFailLine(item2) {
+  return item2.includes(failGlyph);
 }
-function isWarnLine(item) {
-  return !isFailLine(item) && item.includes(warnGlyph);
+function isWarnLine(item2) {
+  return !isFailLine(item2) && item2.includes(warnGlyph);
 }
 function buildVerdictSection(sections) {
   const summary = section("Summary");
-  const lines = sections.flatMap((s) => s.items).map((item) => item.replace(/^\t/, ""));
+  const lines = sections.flatMap((s) => s.items).map((item2) => item2.replace(/^\t/, ""));
   const failures = lines.filter(isFailLine);
   const warnings = lines.filter(isWarnLine);
   for (const line of [...failures, ...warnings]) addItem(summary, line);
@@ -2833,8 +3023,8 @@ function cmdDoctor(opts = {}) {
   reportHostAndPaths(host);
   reportRepoState(host);
   const links = section("Shared links");
-  const mapPath = join25(REPO_HOME, "path-map.json");
-  const rawMap = existsSync21(mapPath) ? readJsonSafe(mapPath, mapPath, links) : null;
+  const mapPath = join26(repoHome(), "path-map.json");
+  const rawMap = existsSync22(mapPath) ? readJsonSafe(mapPath, mapPath, links) : null;
   const map = rawMap ?? { projects: {} };
   reportSharedLinks(links, map);
   const hooksScan = section("Hook targets");
@@ -2888,16 +3078,15 @@ function cmdDoctor(opts = {}) {
 // src/commands.drop-session.ts
 init_config();
 import { execFileSync as execFileSync12 } from "node:child_process";
-import { existsSync as existsSync23, readdirSync as readdirSync9, statSync as statSync5 } from "node:fs";
-import { join as join28, relative as relative4 } from "node:path";
+import { existsSync as existsSync24, readdirSync as readdirSync9, statSync as statSync5 } from "node:fs";
+import { join as join29, relative as relative4 } from "node:path";
 
 // src/commands.drop-session.git.ts
-init_config();
 import { execFileSync as execFileSync11 } from "node:child_process";
-function expandStagedDir(dirRel) {
+function expandStagedDir(dirRel, repo) {
   try {
     const out = execFileSync11("git", ["ls-files", "-z", "--", dirRel], {
-      cwd: REPO_HOME,
+      cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
     return out.toString().split("\0").filter((p) => p !== "");
@@ -2905,10 +3094,10 @@ function expandStagedDir(dirRel) {
     return [];
   }
 }
-function isTrackedInHead(rel) {
+function isTrackedInHead(rel, repo) {
   try {
     execFileSync11("git", ["cat-file", "-e", `HEAD:${rel}`], {
-      cwd: REPO_HOME,
+      cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
     return true;
@@ -2916,10 +3105,10 @@ function isTrackedInHead(rel) {
     return false;
   }
 }
-function isInIndex(rel) {
+function isInIndex(rel, repo) {
   try {
     const out = execFileSync11("git", ["ls-files", "--", rel], {
-      cwd: REPO_HOME,
+      cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
     return out.toString().trim() !== "";
@@ -2932,8 +3121,8 @@ function isInIndex(rel) {
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync22 } from "node:fs";
-import { join as join26 } from "node:path";
+import { existsSync as existsSync23 } from "node:fs";
+import { join as join27 } from "node:path";
 var SHARED_PROJECT_LOGICAL = /^shared\/projects\/([^/]+)\//;
 function reportScrubHint(id, matches) {
   const live = resolveLiveTranscript(id, matches);
@@ -2949,16 +3138,17 @@ function reportScrubHint(id, matches) {
 }
 function resolveLiveTranscript(id, matches) {
   try {
-    const mapPath = join26(REPO_HOME, "path-map.json");
-    if (!existsSync22(mapPath)) return null;
+    const mapPath = join27(repoHome(), "path-map.json");
+    if (!existsSync23(mapPath)) return null;
     const projects = readJson(mapPath).projects;
+    const claude = claudeHome();
     for (const rel of matches) {
       const logical = SHARED_PROJECT_LOGICAL.exec(rel)?.[1];
       if (logical === void 0) continue;
       const abs = projects[logical]?.[HOST];
       if (abs === void 0) continue;
-      const live = join26(CLAUDE_HOME, "projects", encodePath(abs), `${id}.jsonl`);
-      if (existsSync22(live)) return live;
+      const live = join27(claude, "projects", encodePath(abs), `${id}.jsonl`);
+      if (existsSync23(live)) return live;
     }
     return null;
   } catch {
@@ -2973,12 +3163,15 @@ init_utils();
 init_config();
 init_utils();
 import { closeSync as closeSync3, mkdirSync as mkdirSync5, openSync as openSync3, readFileSync as readFileSync9, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname4, join as join27 } from "node:path";
-var LOCK_PATH = join27(HOME, ".cache", "claude-nomad", "nomad.lock");
+import { dirname as dirname4, join as join28 } from "node:path";
+function lockFilePath() {
+  return join28(home(), ".cache", "claude-nomad", "nomad.lock");
+}
 function acquireLock(verb) {
-  mkdirSync5(dirname4(LOCK_PATH), { recursive: true });
+  const lp = lockFilePath();
+  mkdirSync5(dirname4(lp), { recursive: true });
   try {
-    const fd = openSync3(LOCK_PATH, "wx");
+    const fd = openSync3(lp, "wx");
     try {
       writeFileSync3(fd, String(process.pid));
     } catch (writeErr) {
@@ -2987,55 +3180,56 @@ function acquireLock(verb) {
       } catch {
       }
       try {
-        unlinkSync(LOCK_PATH);
+        unlinkSync(lp);
       } catch {
       }
       throw writeErr;
     }
-    return { fd };
+    return { fd, path: lp };
   } catch (err) {
     const code = err.code;
     if (code !== "EEXIST") throw err;
-    return checkStaleAndRetry(verb);
+    return checkStaleAndRetry(verb, lp);
   }
 }
 function releaseLock(handle) {
   if (handle === null) return;
+  const lp = handle.path;
   try {
     closeSync3(handle.fd);
   } catch {
   }
   try {
-    unlinkSync(LOCK_PATH);
+    unlinkSync(lp);
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
   }
 }
-function unlinkIfSamePid(expectedPidStr) {
+function unlinkIfSamePid(expectedPidStr, lp) {
   let current;
   try {
-    current = readFileSync9(LOCK_PATH, "utf8").trim();
+    current = readFileSync9(lp, "utf8").trim();
   } catch {
     return false;
   }
   if (current !== expectedPidStr) return false;
   try {
-    unlinkSync(LOCK_PATH);
+    unlinkSync(lp);
     return true;
   } catch {
     return false;
   }
 }
-function checkStaleAndRetry(verb) {
+function checkStaleAndRetry(verb, lp) {
   let pidStr;
   try {
-    pidStr = readFileSync9(LOCK_PATH, "utf8").trim();
+    pidStr = readFileSync9(lp, "utf8").trim();
   } catch {
     pidStr = "";
   }
   const pid = Number.parseInt(pidStr, 10);
   if (!Number.isFinite(pid) || pid <= 0) {
-    if (unlinkIfSamePid(pidStr)) return retryOnce(verb);
+    if (unlinkIfSamePid(pidStr, lp)) return retryOnce(verb, lp);
     warn(`another nomad ${verb} running, skipping`);
     return null;
   }
@@ -3046,7 +3240,7 @@ function checkStaleAndRetry(verb) {
   } catch (err) {
     const code = err.code;
     if (code === "ESRCH") {
-      if (unlinkIfSamePid(pidStr)) return retryOnce(verb);
+      if (unlinkIfSamePid(pidStr, lp)) return retryOnce(verb, lp);
       warn(`another nomad ${verb} running, skipping`);
       return null;
     }
@@ -3054,9 +3248,9 @@ function checkStaleAndRetry(verb) {
     return null;
   }
 }
-function retryOnce(verb) {
+function retryOnce(verb, lp) {
   try {
-    const fd = openSync3(LOCK_PATH, "wx");
+    const fd = openSync3(lp, "wx");
     try {
       writeFileSync3(fd, String(process.pid));
     } catch {
@@ -3065,13 +3259,13 @@ function retryOnce(verb) {
       } catch {
       }
       try {
-        unlinkSync(LOCK_PATH);
+        unlinkSync(lp);
       } catch {
       }
       warn(`another nomad ${verb} running, skipping`);
       return null;
     }
-    return { fd };
+    return { fd, path: lp };
   } catch {
     warn(`another nomad ${verb} running, skipping`);
     return null;
@@ -3084,19 +3278,20 @@ function cmdDropSession(id) {
     fail(`invalid session id: ${id}`);
     process.exit(1);
   }
-  if (!existsSync23(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+  const repo = repoHome();
+  if (!existsSync24(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("drop-session");
   if (handle === null) process.exit(0);
   try {
-    const repoProjects = join28(REPO_HOME, "shared", "projects");
-    if (!existsSync23(repoProjects)) {
+    const repoProjects = join29(repo, "shared", "projects");
+    if (!existsSync24(repoProjects)) {
       throw new NomadFatal(`no staged session matches ${id}`);
     }
-    const matches = collectMatches(repoProjects, id);
+    const matches = collectMatches(repoProjects, id, repo);
     if (matches.length === 0) {
       throw new NomadFatal(`no staged session matches ${id}`);
     }
-    for (const rel of matches) unstageOne(rel);
+    for (const rel of matches) unstageOne(rel, repo);
     reportScrubHint(id, matches);
   } catch (err) {
     if (!(err instanceof NomadFatal)) {
@@ -3108,37 +3303,37 @@ function cmdDropSession(id) {
     releaseLock(handle);
   }
 }
-function collectMatches(repoProjects, id) {
+function collectMatches(repoProjects, id, repo) {
   const matches = [];
   for (const logical of readdirSync9(repoProjects)) {
-    const candidate = join28(repoProjects, logical, `${id}.jsonl`);
-    if (existsSync23(candidate)) {
-      matches.push(relative4(REPO_HOME, candidate));
-    }
-    const dir = join28(repoProjects, logical, id);
-    if (existsSync23(dir) && statSync5(dir).isDirectory()) {
-      const dirRel = relative4(REPO_HOME, dir);
-      const staged = expandStagedDir(dirRel);
+    const candidate = join29(repoProjects, logical, `${id}.jsonl`);
+    if (existsSync24(candidate)) {
+      matches.push(relative4(repo, candidate));
+    }
+    const dir = join29(repoProjects, logical, id);
+    if (existsSync24(dir) && statSync5(dir).isDirectory()) {
+      const dirRel = relative4(repo, dir);
+      const staged = expandStagedDir(dirRel, repo);
       if (staged.length > 0) matches.push(...staged);
       else matches.push(dirRel);
     }
   }
   return matches;
 }
-function unstageOne(rel) {
-  if (!isInIndex(rel)) {
-    log(`dropped ${rel} (already absent from index)`);
+function unstageOne(rel, repo) {
+  if (!isInIndex(rel, repo)) {
+    item(`dropped ${rel} (already absent from index)`);
     return;
   }
   try {
-    if (isTrackedInHead(rel)) {
+    if (isTrackedInHead(rel, repo)) {
       execFileSync12("git", ["restore", "--staged", "--worktree", "--", rel], {
-        cwd: REPO_HOME,
+        cwd: repo,
         stdio: ["ignore", "pipe", "pipe"]
       });
     } else {
       execFileSync12("git", ["rm", "--cached", "-f", "--", rel], {
-        cwd: REPO_HOME,
+        cwd: repo,
         stdio: ["ignore", "pipe", "pipe"]
       });
     }
@@ -3147,25 +3342,25 @@ function unstageOne(rel) {
     const detail = e.stderr?.toString().trim() ?? e.message;
     throw new NomadFatal(`git failed to unstage ${rel}: ${detail}`);
   }
-  log(`dropped ${rel}`);
+  item(`dropped ${rel}`);
 }
 
 // src/commands.redact.ts
 init_config();
-import { existsSync as existsSync25, statSync as statSync7 } from "node:fs";
-import { dirname as dirname5, join as join30 } from "node:path";
+import { existsSync as existsSync26, statSync as statSync7 } from "node:fs";
+import { dirname as dirname5, join as join31 } from "node:path";
 
 // src/commands.redact.subtree.ts
-import { existsSync as existsSync24, lstatSync as lstatSync6, readFileSync as readFileSync10, readdirSync as readdirSync10, statSync as statSync6, writeFileSync as writeFileSync4 } from "node:fs";
-import { join as join29 } from "node:path";
+import { existsSync as existsSync25, lstatSync as lstatSync7, readFileSync as readFileSync10, readdirSync as readdirSync10, statSync as statSync6, writeFileSync as writeFileSync4 } from "node:fs";
+import { join as join30 } from "node:path";
 init_utils_fs();
 function collectFiles(dir, out) {
-  if (!existsSync24(dir)) return;
-  const st = lstatSync6(dir);
+  if (!existsSync25(dir)) return;
+  const st = lstatSync7(dir);
   if (!st.isDirectory()) return;
   for (const entry of readdirSync10(dir)) {
-    const abs = join29(dir, entry);
-    const lst = lstatSync6(abs);
+    const abs = join30(dir, entry);
+    const lst = lstatSync7(abs);
     if (lst.isSymbolicLink()) continue;
     if (lst.isDirectory()) {
       collectFiles(abs, out);
@@ -3214,14 +3409,15 @@ init_utils_json();
 init_utils();
 function resolveLiveTranscript2(id) {
   try {
-    const mapPath = join30(REPO_HOME, "path-map.json");
-    if (!existsSync25(mapPath)) return null;
+    const mapPath = join31(repoHome(), "path-map.json");
+    if (!existsSync26(mapPath)) return null;
     const projects = readJson(mapPath).projects;
+    const claude = claudeHome();
     for (const hostMap of Object.values(projects)) {
       const abs = hostMap[HOST];
       if (abs === void 0) continue;
-      const live = join30(CLAUDE_HOME, "projects", encodePath(abs), `${id}.jsonl`);
-      if (existsSync25(live)) return live;
+      const live = join31(claude, "projects", encodePath(abs), `${id}.jsonl`);
+      if (existsSync26(live)) return live;
     }
     return null;
   } catch {
@@ -3239,17 +3435,19 @@ function cmdRedact(opts, nowMs = Date.now, scan = scanFile) {
     fail(`invalid session id: ${id}`);
     process.exit(1);
   }
-  if (!existsSync25(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+  const repo = repoHome();
+  const backup = backupBase();
+  if (!existsSync26(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("redact");
   if (handle === null) process.exit(0);
   try {
     const localPath = resolveLiveTranscript2(id);
-    if (localPath === null || !existsSync25(localPath)) {
+    if (localPath === null || !existsSync26(localPath)) {
       fail(`could not resolve local transcript for session ${id} on this host`);
       process.exitCode = 1;
       return;
     }
-    const sessionDir = join30(dirname5(localPath), id);
+    const sessionDir = join31(dirname5(localPath), id);
     const subtreeFiles = listSubtreeFiles(sessionDir);
     const subtreeMtime = newestSubtreeMtimeMs(localPath, subtreeFiles, (p) => statSync7(p).mtimeMs);
     if (isRecentlyModified(subtreeMtime, nowMs())) {
@@ -3268,7 +3466,7 @@ function cmdRedact(opts, nowMs = Date.now, scan = scanFile) {
       process.exitCode = 1;
       return;
     }
-    const ts = freshBackupTs(BACKUP_BASE);
+    const ts = freshBackupTs(backup);
     const { total: totalCount, dirty } = applySubtreeRedactions(
       localPath,
       mainFindings,
@@ -3302,8 +3500,8 @@ ${lines}`);
 }
 
 // src/commands.pull.ts
-import { existsSync as existsSync33, mkdirSync as mkdirSync8 } from "node:fs";
-import { join as join39 } from "node:path";
+import { existsSync as existsSync34, mkdirSync as mkdirSync8 } from "node:fs";
+import { join as join40 } from "node:path";
 
 // src/commands.push.sections.ts
 init_color();
@@ -3391,8 +3589,8 @@ init_config();
 
 // src/extras-sync.ts
 init_config();
-import { existsSync as existsSync28 } from "node:fs";
-import { join as join33 } from "node:path";
+import { existsSync as existsSync29 } from "node:fs";
+import { join as join34 } from "node:path";
 
 // src/extras-sync.diff.ts
 init_utils();
@@ -3431,8 +3629,8 @@ function listDivergingFiles(a, b) {
 
 // src/extras-sync.core.ts
 init_config();
-import { cpSync as cpSync4, existsSync as existsSync26, rmSync as rmSync7 } from "node:fs";
-import { join as join31 } from "node:path";
+import { cpSync as cpSync5, existsSync as existsSync27, rmSync as rmSync8 } from "node:fs";
+import { join as join32 } from "node:path";
 
 // src/extras-sync.guards.ts
 init_utils();
@@ -3455,9 +3653,10 @@ function assertSafeLocalRoot(localRoot, logical) {
 init_utils();
 init_utils_json();
 function loadValidatedExtras(opts) {
-  const mapPath = join31(REPO_HOME, "path-map.json");
-  const repoExtras = join31(REPO_HOME, "shared", "extras");
-  if (!existsSync26(mapPath) || opts.requireRepoExtras === true && !existsSync26(repoExtras)) {
+  const repo = repoHome();
+  const mapPath = join32(repo, "path-map.json");
+  const repoExtras = join32(repo, "shared", "extras");
+  if (!existsSync27(mapPath) || opts.requireRepoExtras === true && !existsSync27(repoExtras)) {
     if (opts.missingMsg !== void 0) log(opts.missingMsg);
     return null;
   }
@@ -3489,8 +3688,8 @@ function* eachExtrasTarget(v, counts) {
   }
 }
 function copyExtras(src, dst) {
-  rmSync7(dst, { recursive: true, force: true });
-  cpSync4(src, dst, { recursive: true, force: true, verbatimSymlinks: true });
+  rmSync8(dst, { recursive: true, force: true });
+  cpSync5(src, dst, { recursive: true, force: true, verbatimSymlinks: true });
 }
 
 // src/extras-sync.ts
@@ -3499,8 +3698,8 @@ init_utils_json();
 
 // src/extras-sync.remap.ts
 init_config();
-import { existsSync as existsSync27, mkdirSync as mkdirSync6 } from "node:fs";
-import { join as join32 } from "node:path";
+import { existsSync as existsSync28, mkdirSync as mkdirSync6 } from "node:fs";
+import { join as join33 } from "node:path";
 init_utils_fs();
 function runExtrasOp(v, dryRun, paths, backup) {
   const counts = { unmapped: 0, skipped: 0 };
@@ -3508,15 +3707,15 @@ function runExtrasOp(v, dryRun, paths, backup) {
   const would = [];
   for (const t of eachExtrasTarget(v, counts)) {
     const { src, dst } = paths(t);
-    if (!existsSync27(src)) continue;
-    const item = `${t.logical}/${t.dirname}`;
+    if (!existsSync28(src)) continue;
+    const item2 = `${t.logical}/${t.dirname}`;
     if (dryRun) {
-      would.push(item);
+      would.push(item2);
       continue;
     }
     backup(dst, t.localRoot);
     copyExtras(src, dst);
-    done.push(item);
+    done.push(item2);
   }
   return { ...counts, done, would };
 }
@@ -3524,16 +3723,17 @@ function remapExtrasPush(ts, opts = {}) {
   const dryRun = opts.dryRun === true;
   const v = loadValidatedExtras({ missingMsg: "no path-map.json; skipping extras push" });
   if (v === null) return { unmapped: 0, skipped: 0, pushed: [], wouldPush: [] };
-  const repoExtras = join32(REPO_HOME, "shared", "extras");
+  const repo = repoHome();
+  const repoExtras = join33(repo, "shared", "extras");
   if (!dryRun) mkdirSync6(repoExtras, { recursive: true });
   const { unmapped, skipped, done, would } = runExtrasOp(
     v,
     dryRun,
     ({ localRoot, logical, dirname: dirname7 }) => ({
-      src: join32(localRoot, dirname7),
-      dst: join32(repoExtras, logical, dirname7)
+      src: join33(localRoot, dirname7),
+      dst: join33(repoExtras, logical, dirname7)
     }),
-    (dst) => backupRepoWrite(dst, ts, REPO_HOME)
+    (dst) => backupRepoWrite(dst, ts, repo)
   );
   return { unmapped, skipped, pushed: done, wouldPush: would };
 }
@@ -3544,13 +3744,13 @@ function remapExtrasPull(ts, opts = {}) {
     missingMsg: "no path-map or repo extras dir; skipping extras remap"
   });
   if (v === null) return { unmapped: 0, skipped: 0, pulled: [], wouldPull: [] };
-  const repoExtras = join32(REPO_HOME, "shared", "extras");
+  const repoExtras = join33(repoHome(), "shared", "extras");
   const { unmapped, skipped, done, would } = runExtrasOp(
     v,
     dryRun,
     ({ localRoot, logical, dirname: dirname7 }) => ({
-      src: join32(repoExtras, logical, dirname7),
-      dst: join32(localRoot, dirname7)
+      src: join33(repoExtras, logical, dirname7),
+      dst: join33(localRoot, dirname7)
     }),
     // Snapshot the host-side dst BEFORE copyExtras clobbers it. Anchor on
     // localRoot so the backup tree mirrors the project layout.
@@ -3564,14 +3764,15 @@ function divergenceCheckExtras(ts) {
   const v = loadValidatedExtras({});
   if (v === null) return;
   const counts = { unmapped: 0, skipped: 0 };
-  const backupRoot = join33(BACKUP_BASE, ts, "extras");
+  const backupRoot = join34(backupBase(), ts, "extras");
+  const repo = repoHome();
   for (const { logical, localRoot, dirname: dirname7 } of eachExtrasTarget(v, counts)) {
-    const local = join33(localRoot, dirname7);
-    const repo = join33(REPO_HOME, "shared", "extras", logical, dirname7);
-    if (!existsSync28(local) || !existsSync28(repo)) continue;
-    const diff = listDivergingFiles(local, repo);
+    const local = join34(localRoot, dirname7);
+    const repoEntry = join34(repo, "shared", "extras", logical, dirname7);
+    if (!existsSync29(local) || !existsSync29(repoEntry)) continue;
+    const diff = listDivergingFiles(local, repoEntry);
     if (diff.length === 0) continue;
-    const projectBackupRoot = join33(backupRoot, encodePath(localRoot));
+    const projectBackupRoot = join34(backupRoot, encodePath(localRoot));
     warn(
       `local ${dirname7} for ${logical} diverges from origin in ${diff.length} file(s); next remapExtrasPull will overwrite them (backups at ${projectBackupRoot}/)`
     );
@@ -3584,8 +3785,8 @@ init_config();
 init_utils();
 init_utils_fs();
 init_utils_json();
-import { existsSync as existsSync29, lstatSync as lstatSync7, rmSync as rmSync8 } from "node:fs";
-import { join as join34 } from "node:path";
+import { existsSync as existsSync30, lstatSync as lstatSync8, rmSync as rmSync9 } from "node:fs";
+import { join as join35 } from "node:path";
 function emitAutoMove(onPreview, linkPath, ts, name) {
   if (onPreview) {
     onPreview({ kind: "auto-move", from: linkPath, to: `backup/${ts}/${name}` });
@@ -3602,43 +3803,47 @@ function emitCreate(onPreview, from, to) {
 }
 function applySharedLinks(ts, map, opts = {}) {
   const dryRun = opts.dryRun === true;
+  const claude = claudeHome();
+  const repo = repoHome();
   const linkNames = allSharedLinks(map);
   for (const name of linkNames) {
-    const linkPath = join34(CLAUDE_HOME, name);
-    const target = join34(REPO_HOME, "shared", name);
-    if (!existsSync29(linkPath)) continue;
-    if (lstatSync7(linkPath).isSymbolicLink()) continue;
-    if (!existsSync29(target)) continue;
+    const linkPath = join35(claude, name);
+    const target = join35(repo, "shared", name);
+    if (!existsSync30(linkPath)) continue;
+    if (lstatSync8(linkPath).isSymbolicLink()) continue;
+    if (!existsSync30(target)) continue;
     if (dryRun) {
       emitAutoMove(opts.onPreview, linkPath, ts, name);
       continue;
     }
     backupBeforeWrite(linkPath, ts);
-    rmSync8(linkPath, { recursive: true, force: true });
+    rmSync9(linkPath, { recursive: true, force: true });
   }
   for (const name of linkNames) {
-    const target = join34(REPO_HOME, "shared", name);
-    if (!existsSync29(target)) continue;
+    const target = join35(repo, "shared", name);
+    if (!existsSync30(target)) continue;
     if (dryRun) {
-      emitCreate(opts.onPreview, join34(CLAUDE_HOME, name), target);
+      emitCreate(opts.onPreview, join35(claude, name), target);
       continue;
     }
-    ensureSymlink(join34(CLAUDE_HOME, name), target);
+    ensureSymlink(join35(claude, name), target);
   }
 }
 function regenerateSettings(ts, opts = {}) {
   const dryRun = opts.dryRun === true;
-  const basePath = join34(REPO_HOME, "shared", "settings.base.json");
-  const hostPath = join34(REPO_HOME, "hosts", `${HOST}.json`);
-  if (!existsSync29(basePath)) {
+  const repo = repoHome();
+  const claude = claudeHome();
+  const basePath = join35(repo, "shared", "settings.base.json");
+  const hostPath = join35(repo, "hosts", `${HOST}.json`);
+  if (!existsSync30(basePath)) {
     die("repo not initialized; run 'nomad init' to scaffold");
   }
   const base = readJson(basePath);
-  const hasOverrides = existsSync29(hostPath);
+  const hasOverrides = existsSync30(hostPath);
   const overrides = hasOverrides ? readJson(hostPath) : {};
   const merged = deepMerge(base, overrides);
-  const settingsPath = join34(CLAUDE_HOME, "settings.json");
-  if (!hasOverrides && existsSync29(settingsPath)) {
+  const settingsPath = join35(claude, "settings.json");
+  if (!hasOverrides && existsSync30(settingsPath)) {
     try {
       const existing = readJson(settingsPath);
       const baseKeys = new Set(Object.keys(base));
@@ -3664,8 +3869,8 @@ function regenerateSettings(ts, opts = {}) {
 
 // src/preview.ts
 init_config();
-import { existsSync as existsSync30 } from "node:fs";
-import { join as join35 } from "node:path";
+import { existsSync as existsSync31 } from "node:fs";
+import { join as join36 } from "node:path";
 
 // node_modules/diff/libesm/diff/base.js
 var Diff = class {
@@ -3951,7 +4156,7 @@ function diffJsonStrings(currentJsonText, newJsonText) {
   return lines.join("\n");
 }
 function readJsonOrNull(path) {
-  if (!existsSync30(path)) return null;
+  if (!existsSync31(path)) return null;
   try {
     return readJson(path);
   } catch {
@@ -3965,12 +4170,12 @@ function previewSettings(basePath, hostPath, settingsPath) {
   }
   const notes = [];
   const hostOverrides = readJsonOrNull(hostPath);
-  if (hostOverrides === null && existsSync30(hostPath)) {
+  if (hostOverrides === null && existsSync31(hostPath)) {
     notes.push(`malformed hosts/${HOST}.json; ignoring overrides`);
   }
   const merged = deepMerge(base, hostOverrides ?? {});
   const current = readJsonOrNull(settingsPath);
-  if (current === null && existsSync30(settingsPath)) {
+  if (current === null && existsSync31(settingsPath)) {
     return { diff: "", notes: [...notes, "malformed; skipping diff"] };
   }
   const rawEqual = JSON.stringify(current ?? {}, null, 2) === JSON.stringify(merged, null, 2);
@@ -4000,6 +4205,8 @@ function buildSettingsSectionForPreview(result) {
   return s;
 }
 function computePreview(ts, map, verb = "pull") {
+  const repo = repoHome();
+  const claude = claudeHome();
   console.log(`would pull on host=${HOST} (dry-run; no mutation)`);
   console.log("");
   const links = section("Symlinks");
@@ -4008,9 +4215,9 @@ function computePreview(ts, map, verb = "pull") {
     onPreview: (e) => addItem(links, formatLinkRow(e))
   });
   const settingsResult = previewSettings(
-    join35(REPO_HOME, "shared", "settings.base.json"),
-    join35(REPO_HOME, "hosts", `${HOST}.json`),
-    join35(CLAUDE_HOME, "settings.json")
+    join36(repo, "shared", "settings.base.json"),
+    join36(repo, "hosts", `${HOST}.json`),
+    join36(claude, "settings.json")
   );
   const settingsSection = buildSettingsSectionForPreview(settingsResult);
   const sessions = section("Sessions");
@@ -4026,21 +4233,21 @@ function computePreview(ts, map, verb = "pull") {
 
 // src/spinner.ts
 init_color();
-import { existsSync as existsSync32 } from "node:fs";
+import { existsSync as existsSync33 } from "node:fs";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { Worker } from "node:worker_threads";
 
 // src/commands.push.recovery.ts
 init_config();
-import { readFileSync as readFileSync11, rmSync as rmSync10, writeFileSync as writeFileSync5 } from "node:fs";
-import { join as join38 } from "node:path";
+import { readFileSync as readFileSync11, rmSync as rmSync11, writeFileSync as writeFileSync5 } from "node:fs";
+import { join as join39 } from "node:path";
 import { createInterface } from "node:readline/promises";
 
 // src/commands.push.recovery.redact.ts
 init_config();
 init_config_sharedDirs_guard();
-import { cpSync as cpSync5, existsSync as existsSync31, mkdirSync as mkdirSync7, statSync as statSync8 } from "node:fs";
-import { dirname as dirname6, join as join36, sep as sep2 } from "node:path";
+import { cpSync as cpSync6, existsSync as existsSync32, mkdirSync as mkdirSync7, statSync as statSync8 } from "node:fs";
+import { dirname as dirname6, join as join37, sep as sep3 } from "node:path";
 init_push_gitleaks_scan();
 init_utils_json();
 init_utils();
@@ -4066,13 +4273,13 @@ function parseAction(raw) {
 }
 
 // src/commands.push.recovery.redact.ts
-function resolveStagedDir(localPath, map) {
+function resolveStagedDir(localPath, map, claude, repo) {
   for (const [logical, hostMap] of Object.entries(map.projects)) {
     assertSafeLogical(logical);
     const abs = hostMap[HOST];
     if (abs === void 0) continue;
-    if (localPath.startsWith(join36(CLAUDE_HOME, "projects", encodePath(abs)) + sep2)) {
-      return join36(REPO_HOME, "shared", "projects", logical);
+    if (localPath.startsWith(join37(claude, "projects", encodePath(abs)) + sep3)) {
+      return join37(repo, "shared", "projects", logical);
     }
   }
   return null;
@@ -4082,6 +4289,8 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
     log(msg);
     return false;
   };
+  const claude = claudeHome();
+  const repo = repoHome();
   const sid = sessionIdFromFinding(f);
   if (sid === null) {
     return refuse(
@@ -4094,7 +4303,7 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
       `could not locate the local transcript for session ${sid}; choose Skip or Drop session.`
     );
   }
-  const sessionDir = join36(dirname6(localPath), sid);
+  const sessionDir = join37(dirname6(localPath), sid);
   const subtreeFiles = listSubtreeFiles(sessionDir);
   const subtreeMtime = newestSubtreeMtimeMs(localPath, subtreeFiles, (p) => statSync8(p).mtimeMs);
   if (isRecentlyModified(subtreeMtime, nowMs())) {
@@ -4103,7 +4312,7 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
   End the session and choose Redact again, or choose Drop session (holds this session back from the push, local copy kept) or Skip.`
     );
   }
-  const stagedProjectDir = resolveStagedDir(localPath, map);
+  const stagedProjectDir = resolveStagedDir(localPath, map, claude, repo);
   if (stagedProjectDir === null) {
     return refuse(
       `could not map the local transcript for session ${sid} to a staged copy; choose Drop session or Skip.`
@@ -4128,25 +4337,26 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
     );
   }
   mkdirSync7(stagedProjectDir, { recursive: true });
-  cpSync5(localPath, join36(stagedProjectDir, `${sid}.jsonl`), { force: true });
-  if (existsSync31(sessionDir)) {
-    cpSync5(sessionDir, join36(stagedProjectDir, sid), { force: true, recursive: true });
+  cpSync6(localPath, join37(stagedProjectDir, `${sid}.jsonl`), { force: true });
+  if (existsSync32(sessionDir)) {
+    cpSync6(sessionDir, join37(stagedProjectDir, sid), { force: true, recursive: true });
   }
   return true;
 }
 
 // src/commands.push.recovery.drop.ts
 init_config();
-import { rmSync as rmSync9 } from "node:fs";
-import { join as join37 } from "node:path";
+import { rmSync as rmSync10 } from "node:fs";
+import { join as join38 } from "node:path";
 function dropSessionFromStaged(sid, map) {
   const logicals = Object.keys(map.projects);
   if (logicals.length === 0) return false;
+  const repo = repoHome();
   for (const logical of logicals) {
-    const jsonl = join37(REPO_HOME, "shared", "projects", logical, `${sid}.jsonl`);
-    const dir = join37(REPO_HOME, "shared", "projects", logical, sid);
-    rmSync9(jsonl, { force: true });
-    rmSync9(dir, { recursive: true, force: true });
+    const jsonl = join38(repo, "shared", "projects", logical, `${sid}.jsonl`);
+    const dir = join38(repo, "shared", "projects", logical, sid);
+    rmSync10(jsonl, { force: true });
+    rmSync10(dir, { recursive: true, force: true });
   }
   return true;
 }
@@ -4154,19 +4364,19 @@ function dropSessionFromStaged(sid, map) {
 // src/commands.push.recovery.actions.ts
 init_push_gitleaks_scan();
 init_utils();
-function applyAllow(f) {
-  appendGitleaksIgnore(f.Fingerprint);
+function applyAllow(f, repo) {
+  appendGitleaksIgnore(f.Fingerprint, repo);
 }
-function allowAllFindings(findings) {
+function allowAllFindings(findings, repo) {
   for (const f of findings) {
-    appendGitleaksIgnore(f.Fingerprint);
+    appendGitleaksIgnore(f.Fingerprint, repo);
   }
 }
-function allowFindingsByRule(findings, ruleId) {
+function allowFindingsByRule(findings, ruleId, repo) {
   let count = 0;
   for (const f of findings) {
     if (f.RuleID === ruleId) {
-      appendGitleaksIgnore(f.Fingerprint);
+      appendGitleaksIgnore(f.Fingerprint, repo);
       count++;
     }
   }
@@ -4188,7 +4398,7 @@ function dispatchOne(f, ctx) {
   const sid = sessionIdFromFinding(f);
   if (sid !== null && ctx.droppedSids.has(sid)) return;
   if (action === "allow") {
-    applyAllow(f);
+    applyAllow(f, ctx.repo);
     return;
   }
   if (sid === null) return;
@@ -4205,12 +4415,14 @@ function dispatchOne(f, ctx) {
     if (applyRedact(f, ctx.ts, ctx.map, ctx.nowMs, ctx.scan)) ctx.redactedSids.add(sid);
   }
 }
-function dispatchActions(findings, actions, ts, map, nowMs, scan = scanFile, drop = dropSessionFromStaged) {
+function dispatchActions(findings, actions, opts) {
+  const { ts, map, nowMs, repo, scan = scanFile, drop = dropSessionFromStaged } = opts;
   const ctx = {
     actions,
     ts,
     map,
     nowMs,
+    repo,
     scan,
     drop,
     redactedSids: /* @__PURE__ */ new Set(),
@@ -4252,17 +4464,17 @@ function printRecoveryLegend(print = console.log) {
   print("  Skip         - leave unresolved (the push aborts)");
   print("");
 }
-function applyThenRescan(scanVerdict, repoHome) {
-  gitOrFatal(["add", "-A"], "git add", repoHome);
-  const next = scanVerdict();
+function applyThenRescan(scanVerdict, repoHome2) {
+  gitOrFatal(["add", "-A"], "git add", repoHome2);
+  const next = scanVerdict(repoHome2);
   if (next.leak) {
     const { bySession, other } = partitionFindings(next.findings);
     throw new NomadFatal(buildSessionAwareFatal(bySession, other));
   }
   return next;
 }
-function allowThenRescan(append, scanVerdict, repoHome) {
-  const ignPath = join38(repoHome, ".gitleaksignore");
+function allowThenRescan(append, scanVerdict, repoHome2) {
+  const ignPath = join39(repoHome2, ".gitleaksignore");
   let before;
   try {
     before = readFileSync11(ignPath, "utf8");
@@ -4271,9 +4483,9 @@ function allowThenRescan(append, scanVerdict, repoHome) {
   }
   append();
   try {
-    return applyThenRescan(scanVerdict, repoHome);
+    return applyThenRescan(scanVerdict, repoHome2);
   } catch (err) {
-    if (before === null) rmSync10(ignPath, { force: true });
+    if (before === null) rmSync11(ignPath, { force: true });
     else writeFileSync5(ignPath, before, "utf8");
     throw err;
   }
@@ -4304,22 +4516,23 @@ async function resolveLeakFindings(verdict, ts, map, deps = {}) {
     printLegend = printRecoveryLegend
   } = deps;
   const scanVerdict = deps.scanVerdict ?? (await Promise.resolve().then(() => (init_push_leak_verdict(), push_leak_verdict_exports))).scanPushVerdict;
+  const repo = repoHome();
   let current = verdict;
   if (redactAll) {
     redactAllFindings(current.findings, ts, map, nowMs, scan);
-    return applyThenRescan(scanVerdict, REPO_HOME);
+    return applyThenRescan(scanVerdict, repo);
   }
   if (allowAll) {
-    return allowThenRescan(() => allowAllFindings(current.findings), scanVerdict, REPO_HOME);
+    return allowThenRescan(() => allowAllFindings(current.findings, repo), scanVerdict, repo);
   }
   if (allowRule !== void 0) {
     return allowThenRescan(
       () => {
-        const matched = allowFindingsByRule(current.findings, allowRule);
+        const matched = allowFindingsByRule(current.findings, allowRule, repo);
         if (matched === 0) log(`no findings matched rule ${allowRule}; re-scanning`);
       },
       scanVerdict,
-      REPO_HOME
+      repo
     );
   }
   if (!isTTYCheck()) {
@@ -4334,9 +4547,9 @@ async function resolveLeakFindings(verdict, ts, map, deps = {}) {
       const { bySession, other } = partitionFindings(unresolved);
       throw new NomadFatal(buildSessionAwareFatal(bySession, other));
     }
-    dispatchActions(current.findings, actions, ts, map, nowMs, scan);
-    gitOrFatal(["add", "-A"], "git add", REPO_HOME);
-    current = scanVerdict();
+    dispatchActions(current.findings, actions, { ts, map, nowMs, repo, scan });
+    gitOrFatal(["add", "-A"], "git add", repo);
+    current = scanVerdict(repo);
   }
   return current;
 }
@@ -4360,7 +4573,7 @@ function writeAnimatedDone(out, label, ms, useTTY) {
 `);
 }
 function resolveWorkerPath(deps = {}) {
-  const check = deps.existsSyncFn ?? existsSync32;
+  const check = deps.existsSyncFn ?? existsSync33;
   const base = deps.baseUrl ?? import.meta.url;
   const mjs = fileURLToPath4(new URL("./nomad.worker.mjs", base));
   if (check(mjs)) return mjs;
@@ -4566,17 +4779,19 @@ function handleWedge(repo, forceRemote) {
 function cmdPull(opts = {}) {
   const dryRun = opts.dryRun === true;
   const forceRemote = opts.forceRemote === true;
-  if (!existsSync33(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
-  if (!existsSync33(join39(REPO_HOME, "shared", "settings.base.json"))) {
+  const repo = repoHome();
+  const backup = backupBase();
+  if (!existsSync34(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync34(join40(repo, "shared", "settings.base.json"))) {
     die("repo not initialized; run 'nomad init' to scaffold");
   }
   const handle = acquireLock("pull");
   if (handle === null) process.exit(0);
   try {
-    const ts = freshBackupTs(BACKUP_BASE);
-    handleWedge(REPO_HOME, forceRemote);
+    const ts = freshBackupTs(backup);
+    handleWedge(repo, forceRemote);
     if (!dryRun) {
-      const backupRoot = join39(BACKUP_BASE, ts);
+      const backupRoot = join40(backup, ts);
       try {
         mkdirSync8(backupRoot, { recursive: true });
       } catch (err) {
@@ -4586,9 +4801,9 @@ function cmdPull(opts = {}) {
     log(
       dryRun ? `pulling on host=${HOST} (backup=${ts}; dry-run)` : `pull on host=${HOST} (backup=${ts})`
     );
-    gitOrFatal(["pull", "--rebase", "--autostash"], "git pull --rebase", REPO_HOME);
-    const mapPath = join39(REPO_HOME, "path-map.json");
-    const map = existsSync33(mapPath) ? readPathMap(mapPath) : { projects: {} };
+    gitOrFatal(["pull", "--rebase", "--autostash"], "git pull --rebase", repo);
+    const mapPath = join40(repo, "path-map.json");
+    const map = existsSync34(mapPath) ? readPathMap(mapPath) : { projects: {} };
     divergenceCheckExtras(ts);
     if (dryRun) {
       computePreview(ts, map, "pull");
@@ -4610,8 +4825,8 @@ function cmdPull(opts = {}) {
 
 // src/commands.push.ts
 init_config();
-import { existsSync as existsSync35 } from "node:fs";
-import { join as join41, relative as relative5 } from "node:path";
+import { existsSync as existsSync36 } from "node:fs";
+import { join as join42, relative as relative5 } from "node:path";
 
 // src/commands.push.allowlist.ts
 init_config();
@@ -4691,9 +4906,9 @@ init_color();
 init_config();
 init_config_sharedDirs_guard();
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { copyFileSync, existsSync as existsSync34, mkdirSync as mkdirSync9, readdirSync as readdirSync11, rmSync as rmSync11 } from "node:fs";
+import { copyFileSync, existsSync as existsSync35, mkdirSync as mkdirSync9, readdirSync as readdirSync11, rmSync as rmSync12 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join40 } from "node:path";
+import { join as join41 } from "node:path";
 init_push_leak_verdict();
 init_push_gitleaks();
 init_utils_fs();
@@ -4708,13 +4923,13 @@ function stageSessions(tmpRoot, map) {
     if (!p || p === "TBD") continue;
     reverse.set(encodePath(p), logical);
   }
-  const localProjects = join40(CLAUDE_HOME, "projects");
-  if (!existsSync34(localProjects)) return 0;
+  const localProjects = join41(claudeHome(), "projects");
+  if (!existsSync35(localProjects)) return 0;
   let staged = 0;
   for (const dir of readdirSync11(localProjects)) {
     const logical = reverse.get(dir);
     if (!logical) continue;
-    copyDirJsonlOnly(join40(localProjects, dir), join40(tmpRoot, "shared", "projects", logical));
+    copyDirJsonlOnly(join41(localProjects, dir), join41(tmpRoot, "shared", "projects", logical));
     staged++;
   }
   return staged;
@@ -4730,9 +4945,9 @@ function stageExtras(tmpRoot, map) {
     if (!localRoot || localRoot === "TBD") continue;
     for (const dirname7 of dirnames) {
       if (!whitelist.includes(dirname7)) continue;
-      const src = join40(localRoot, dirname7);
-      if (!existsSync34(src)) continue;
-      const dst = join40(tmpRoot, "shared", "extras", logical, dirname7);
+      const src = join41(localRoot, dirname7);
+      if (!existsSync35(src)) continue;
+      const dst = join41(tmpRoot, "shared", "extras", logical, dirname7);
       copyExtras(src, dst);
       staged++;
     }
@@ -4740,19 +4955,19 @@ function stageExtras(tmpRoot, map) {
   return staged;
 }
 function previewPushLeaks(map) {
-  const cacheDir = join40(homedir5(), ".cache", "claude-nomad");
+  const cacheDir = join41(homedir5(), ".cache", "claude-nomad");
   mkdirSync9(cacheDir, { recursive: true });
   const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes2(4).toString("hex")}`;
-  const tmpRoot = join40(cacheDir, `push-preview-tree-${stamp}`);
+  const tmpRoot = join41(cacheDir, `push-preview-tree-${stamp}`);
   try {
     const sessionCount = stageSessions(tmpRoot, map);
     const extrasCount = stageExtras(tmpRoot, map);
     if (sessionCount + extrasCount === 0) {
       return { leak: false, verdictRow: NOTHING_TO_SCAN_ROW, recovery: null, findings: [] };
     }
-    const ignoreFile = join40(REPO_HOME, ".gitleaksignore");
-    if (existsSync34(ignoreFile)) {
-      copyFileSync(ignoreFile, join40(tmpRoot, ".gitleaksignore"));
+    const ignoreFile = join41(repoHome(), ".gitleaksignore");
+    if (existsSync35(ignoreFile)) {
+      copyFileSync(ignoreFile, join41(tmpRoot, ".gitleaksignore"));
     }
     let findings;
     try {
@@ -4765,7 +4980,7 @@ function previewPushLeaks(map) {
     }
     return verdictFromFindings(findings);
   } finally {
-    rmSync11(tmpRoot, { recursive: true, force: true });
+    rmSync12(tmpRoot, { recursive: true, force: true });
   }
 }
 
@@ -4773,11 +4988,11 @@ function previewPushLeaks(map) {
 init_utils();
 init_utils_fs();
 init_utils_json();
-function guardGitlinks() {
-  const gitlinks = findGitlinks(join41(REPO_HOME, "shared"));
+function guardGitlinks(repo) {
+  const gitlinks = findGitlinks(join42(repo, "shared"));
   if (gitlinks.length === 0) return;
   for (const p of gitlinks) {
-    const rel = relative5(REPO_HOME, p);
+    const rel = relative5(repo, p);
     fail(`gitlink: ${rel} would push as submodule (run: rm -rf ${rel} or remove the nested repo)`);
   }
   const noun = gitlinks.length === 1 ? "entry" : "entries";
@@ -4785,15 +5000,15 @@ function guardGitlinks() {
     `gitlink trap: ${gitlinks.length} nested .git ${noun} in shared/; remove before retry`
   );
 }
-async function commitAndPush(st, ts, map, redactAll, allowAll, allowRule) {
-  gitOrFatal(["add", "-A"], "git add", REPO_HOME);
-  let verdict = withSpinner("Scanning for secrets", scanPushVerdict);
+async function commitAndPush(st, ts, map, redactAll, allowAll, allowRule, repo) {
+  gitOrFatal(["add", "-A"], "git add", repo);
+  let verdict = withSpinner("Scanning for secrets", () => scanPushVerdict(repo));
   if (verdict.leak) {
     renderPushTree(st, verdict);
     verdict = await resolveLeakFindings(verdict, ts, map, { redactAll, allowAll, allowRule });
   }
-  gitOrFatal(["commit", "-m", `chore: sync from ${HOST}`], "git commit", REPO_HOME);
-  withSpinner("Pushing", () => gitOrFatal(["push"], "git push", REPO_HOME));
+  gitOrFatal(["commit", "-m", `chore: sync from ${HOST}`], "git commit", repo);
+  withSpinner("Pushing", () => gitOrFatal(["push"], "git push", repo));
   renderPushTree(st, verdict);
 }
 function runDryRunPreview(st, map) {
@@ -4826,33 +5041,35 @@ async function cmdPush(opts = {}) {
   const allowAll = opts.allowAll === true;
   const allowRule = opts.allowRule;
   guardResolutionModeConflicts(dryRun, redactAll, allowAll, allowRule);
-  if (!existsSync35(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
+  const repo = repoHome();
+  const backup = backupBase();
+  if (!existsSync36(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("push");
   if (handle === null) process.exit(0);
   try {
     console.log(dryRun ? `push on host=${HOST} (dry-run)` : `push on host=${HOST}`);
     probeGitleaks();
-    withSpinner("Rebasing onto origin", rebaseBeforePush);
-    const ts = freshBackupTs(BACKUP_BASE);
+    withSpinner("Rebasing onto origin", () => rebaseBeforePush(repo));
+    const ts = freshBackupTs(backup);
     const remap = withSpinner("Syncing sessions", () => remapPush(ts, { dryRun }));
     const extras = withSpinner("Syncing extras", () => remapExtrasPush(ts, { dryRun }));
     const st = { dryRun, remap, extras };
-    guardGitlinks();
-    const status = gitStatusPorcelainZ(REPO_HOME, { untrackedAll: true });
+    guardGitlinks(repo);
+    const status = gitStatusPorcelainZ(repo, { untrackedAll: true });
     if (!dryRun && !status) {
       log("nothing to commit");
       renderNoScanTree(st);
       return;
     }
-    const mapPath = join41(REPO_HOME, "path-map.json");
-    if (!existsSync35(mapPath)) {
+    const mapPath = join42(repo, "path-map.json");
+    if (!existsSync36(mapPath)) {
       if (dryRun) return runDryRunPreview(st, null);
       die("path-map.json missing, cannot enforce push allow-list");
     }
     const map = readPathMap(mapPath);
     if (status) enforceAllowList(status, map);
     if (dryRun) return runDryRunPreview(st, map);
-    await commitAndPush(st, ts, map, redactAll, allowAll, allowRule);
+    await commitAndPush(st, ts, map, redactAll, allowAll, allowRule, repo);
   } catch (err) {
     if (err instanceof NomadFatal) {
       fail(err.message);
@@ -4885,17 +5102,18 @@ init_config();
 
 // src/diff.ts
 init_config();
-import { existsSync as existsSync36 } from "node:fs";
-import { join as join42 } from "node:path";
+import { existsSync as existsSync37 } from "node:fs";
+import { join as join43 } from "node:path";
 init_utils();
 init_utils_fs();
 init_utils_json();
 function cmdDiff() {
   try {
-    if (!existsSync36(REPO_HOME)) die(`repo not cloned at ${REPO_HOME}`);
-    const ts = freshBackupTs(BACKUP_BASE);
-    const mapPath = join42(REPO_HOME, "path-map.json");
-    const map = existsSync36(mapPath) ? readPathMap(mapPath) : { projects: {} };
+    const repo = repoHome();
+    if (!existsSync37(repo)) die(`repo not cloned at ${repo}`);
+    const ts = freshBackupTs(backupBase());
+    const mapPath = join43(repo, "path-map.json");
+    const map = existsSync37(mapPath) ? readPathMap(mapPath) : { projects: {} };
     computePreview(ts, map, "diff");
   } catch (err) {
     if (err instanceof NomadFatal) {
@@ -4909,8 +5127,8 @@ function cmdDiff() {
 
 // src/init.ts
 init_config();
-import { existsSync as existsSync38, mkdirSync as mkdirSync10, writeFileSync as writeFileSync6 } from "node:fs";
-import { join as join44 } from "node:path";
+import { existsSync as existsSync39, mkdirSync as mkdirSync10, writeFileSync as writeFileSync6 } from "node:fs";
+import { join as join45 } from "node:path";
 
 // src/init.gh-onboard.ts
 init_config();
@@ -4927,8 +5145,9 @@ function ensureOriginRepo(repoName, run = execFileSync16) {
       `invalid repo name: ${JSON.stringify(repoName)}. Use only letters, digits, hyphens, underscores, and dots (1-100 chars).`
     );
   }
+  const repo = repoHome();
   try {
-    readOriginRemote(REPO_HOME, run);
+    readOriginRemote(repo, run);
     return;
   } catch {
   }
@@ -4943,7 +5162,7 @@ function ensureOriginRepo(repoName, run = execFileSync16) {
     die("gh CLI is not authenticated. Run `gh auth login` and retry.");
   }
   try {
-    run("git", ["init", "-b", "main"], { cwd: REPO_HOME, stdio: ["ignore", "ignore", "pipe"] });
+    run("git", ["init", "-b", "main"], { cwd: repo, stdio: ["ignore", "ignore", "pipe"] });
   } catch (err) {
     const e = err;
     throw new NomadFatal(`git init failed: ${e.message}`);
@@ -4976,7 +5195,7 @@ function ensureOriginRepo(repoName, run = execFileSync16) {
   }
   try {
     run("git", ["remote", "add", "origin", `git@github.com:${owner}/${repoName}.git`], {
-      cwd: REPO_HOME,
+      cwd: repo,
       stdio: ["ignore", "ignore", "pipe"]
     });
   } catch (err) {
@@ -4991,31 +5210,33 @@ init_config();
 init_utils();
 init_utils_fs();
 init_utils_json();
-import { copyFileSync as copyFileSync2, cpSync as cpSync6, existsSync as existsSync37, rmSync as rmSync12, statSync as statSync9 } from "node:fs";
-import { join as join43 } from "node:path";
+import { copyFileSync as copyFileSync2, cpSync as cpSync7, existsSync as existsSync38, rmSync as rmSync13, statSync as statSync9 } from "node:fs";
+import { join as join44 } from "node:path";
 function snapshotIntoShared(map) {
+  const repo = repoHome();
+  const claude = claudeHome();
   for (const name of allSharedLinks(map)) {
-    const src = join43(CLAUDE_HOME, name);
-    if (!existsSync37(src)) continue;
-    const dst = join43(REPO_HOME, "shared", name);
+    const src = join44(claude, name);
+    if (!existsSync38(src)) continue;
+    const dst = join44(repo, "shared", name);
     if (statSync9(src).isDirectory()) {
-      const gk = join43(dst, ".gitkeep");
-      if (existsSync37(gk)) rmSync12(gk);
-      cpSync6(src, dst, { recursive: true, force: false, errorOnExist: true });
+      const gk = join44(dst, ".gitkeep");
+      if (existsSync38(gk)) rmSync13(gk);
+      cpSync7(src, dst, { recursive: true, force: false, errorOnExist: true });
     } else {
       copyFileSync2(src, dst);
     }
     log(`snapshotted shared/${name} from ${src}`);
   }
-  const userSettings = join43(CLAUDE_HOME, "settings.json");
-  if (existsSync37(userSettings)) {
+  const userSettings = join44(claude, "settings.json");
+  if (existsSync38(userSettings)) {
     let parsed;
     try {
       parsed = readJson(userSettings);
     } catch (err) {
       return die(`malformed ${userSettings}: ${err.message}`);
     }
-    const hostFile = join43(REPO_HOME, "hosts", `${HOST}.json`);
+    const hostFile = join44(repo, "hosts", `${HOST}.json`);
     writeJsonAtomic(hostFile, parsed);
     log(`snapshotted hosts/${HOST}.json from ${userSettings}`);
   }
@@ -5026,62 +5247,64 @@ init_utils();
 init_utils_fs();
 var SHARED_CLAUDE_MD = "<!-- claude-nomad shared CLAUDE.md; symlinked into ~/.claude/CLAUDE.md by nomad pull -->\n";
 var SHARED_KEEP_DIRS = ["agents", "skills", "commands", "rules", "hooks"];
-function preflightConflict(repoHome) {
+function preflightConflict(repoHome2) {
   const candidates = [
-    join44(repoHome, "shared", "settings.base.json"),
-    join44(repoHome, "shared", "CLAUDE.md"),
-    join44(repoHome, "path-map.json"),
-    join44(repoHome, "hosts"),
-    join44(repoHome, "shared")
+    join45(repoHome2, "shared", "settings.base.json"),
+    join45(repoHome2, "shared", "CLAUDE.md"),
+    join45(repoHome2, "path-map.json"),
+    join45(repoHome2, "hosts"),
+    join45(repoHome2, "shared")
   ];
   for (const c of candidates) {
-    if (existsSync38(c)) return c;
+    if (existsSync39(c)) return c;
   }
   return null;
 }
 function cmdInit(opts = {}) {
   const snapshot = opts.snapshot === true;
   const keepActions = opts.keepActions === true;
-  mkdirSync10(REPO_HOME, { recursive: true });
-  const conflict = preflightConflict(REPO_HOME);
+  const repo = repoHome();
+  const claude = claudeHome();
+  mkdirSync10(repo, { recursive: true });
+  const conflict = preflightConflict(repo);
   if (conflict !== null) {
     die(`already initialized; refusing to clobber ${conflict}`);
   }
   ensureOriginRepo(opts.repoName ?? DEFAULT_REPO_NAME, opts.run);
-  mkdirSync10(join44(REPO_HOME, "shared"), { recursive: true });
-  mkdirSync10(join44(REPO_HOME, "hosts"), { recursive: true });
+  mkdirSync10(join45(repo, "shared"), { recursive: true });
+  mkdirSync10(join45(repo, "hosts"), { recursive: true });
   for (const name of SHARED_KEEP_DIRS) {
-    mkdirSync10(join44(REPO_HOME, "shared", name), { recursive: true });
+    mkdirSync10(join45(repo, "shared", name), { recursive: true });
   }
-  const userClaudeMd = join44(CLAUDE_HOME, "CLAUDE.md");
-  if (!snapshot || !existsSync38(userClaudeMd)) {
-    writeFileSync6(join44(REPO_HOME, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
-    log("created shared/CLAUDE.md");
+  const userClaudeMd = join45(claude, "CLAUDE.md");
+  if (!snapshot || !existsSync39(userClaudeMd)) {
+    writeFileSync6(join45(repo, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
+    item("created shared/CLAUDE.md");
   }
   for (const name of SHARED_KEEP_DIRS) {
-    writeFileSync6(join44(REPO_HOME, "shared", name, ".gitkeep"), "");
-    log(`created shared/${name}/.gitkeep`);
-  }
-  writeFileSync6(join44(REPO_HOME, "hosts", ".gitkeep"), "");
-  log("created hosts/.gitkeep");
-  writeJsonAtomic(join44(REPO_HOME, "shared", "settings.base.json"), {});
-  log("created shared/settings.base.json");
-  writeJsonAtomic(join44(REPO_HOME, "path-map.json"), { projects: {} });
-  log("created path-map.json");
+    writeFileSync6(join45(repo, "shared", name, ".gitkeep"), "");
+    item(`created shared/${name}/.gitkeep`);
+  }
+  writeFileSync6(join45(repo, "hosts", ".gitkeep"), "");
+  item("created hosts/.gitkeep");
+  writeJsonAtomic(join45(repo, "shared", "settings.base.json"), {});
+  item("created shared/settings.base.json");
+  writeJsonAtomic(join45(repo, "path-map.json"), { projects: {} });
+  item("created path-map.json");
   if (snapshot) {
     snapshotIntoShared({ projects: {} });
     log(`snapshot staged in shared/; review, then 'nomad push' to share with other hosts.`);
     log("~/.claude/ originals were NOT removed.");
   }
   if (!keepActions) {
-    maybeDisableRepoActions(REPO_HOME, opts.run);
+    maybeDisableRepoActions(repo, opts.run);
   }
   log("init complete");
 }
-function maybeDisableRepoActions(repoHome, run) {
+function maybeDisableRepoActions(repoHome2, run) {
   let remote;
   try {
-    remote = readOriginRemote(repoHome, run);
+    remote = readOriginRemote(repoHome2, run);
   } catch {
     return;
   }
@@ -5260,6 +5483,23 @@ function parseCleanArgs(argv) {
   return { dryRun: st.dryRun, olderThan: st.olderThan, keep: st.keep };
 }
 
+// src/nomad.dispatch.eject.ts
+function parseEjectArgs(argv) {
+  let dryRun = false;
+  let i = 3;
+  while (i < argv.length) {
+    const token = argv[i];
+    if (token === "--dry-run") {
+      if (dryRun) return null;
+      dryRun = true;
+    } else {
+      return null;
+    }
+    i++;
+  }
+  return { dryRun };
+}
+
 // src/nomad.dispatch.allow.ts
 function parseAllowArgs(argv) {
   const positionals = argv.slice(3);
@@ -5350,7 +5590,7 @@ function parsePushArgs(argv) {
 // package.json
 var package_default = {
   name: "claude-nomad",
-  version: "0.43.0",
+  version: "0.44.1",
   type: "module",
   description: "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   keywords: [
@@ -5417,6 +5657,8 @@ var package_default = {
     "@commitlint/cli": "^21.0.1",
     "@commitlint/config-conventional": "^21.0.1",
     "@eslint/js": "^10.0.1",
+    "@stryker-mutator/core": "9.6.1",
+    "@stryker-mutator/vitest-runner": "9.6.1",
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^4.1.6",
     diff: "^9.0.0",
@@ -5509,6 +5751,11 @@ var DEFAULT_HELP = [
   cont("symlink, and stage for push. <name> must be in SHARED_LINKS or sharedDirs."),
   row("       --dry-run", "Preview backup, move, and git-add without writing."),
   "",
+  row("  eject", "Materialize every managed ~/.claude/ symlink into a real copy so the"),
+  cont("setup keeps working after deleting the sync repo. Prints a"),
+  cont("manual-remainder checklist (uninstall CLI, drop env vars, optional deletes)."),
+  row("       --dry-run", "List what would be materialized without writing anything."),
+  "",
   row(
     "  redact <session-id>",
     "Rewrite the secret span in the local source transcript for a session,"
@@ -5545,15 +5792,15 @@ var DEFAULT_HELP = [
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync39, readFileSync as readFileSync12, readdirSync as readdirSync12 } from "node:fs";
-import { join as join45 } from "node:path";
+import { existsSync as existsSync40, readFileSync as readFileSync12, readdirSync as readdirSync12 } from "node:fs";
+import { join as join46 } from "node:path";
 function resumeCmd(sessionId) {
   if (!/^[A-Za-z0-9_-]+$/.test(sessionId) || sessionId.length > 128) {
     fail(`invalid session id: ${sessionId}`);
     process.exit(1);
   }
-  const projectsRoot = join45(CLAUDE_HOME, "projects");
-  if (!existsSync39(projectsRoot)) {
+  const projectsRoot = join46(claudeHome(), "projects");
+  if (!existsSync40(projectsRoot)) {
     fail(`${projectsRoot} does not exist`);
     process.exit(1);
   }
@@ -5567,8 +5814,8 @@ function resumeCmd(sessionId) {
     fail(`no cwd field found in ${jsonlPath}`);
     process.exit(1);
   }
-  const mapPath = join45(REPO_HOME, "path-map.json");
-  if (!existsSync39(mapPath)) {
+  const mapPath = join46(repoHome(), "path-map.json");
+  if (!existsSync40(mapPath)) {
     fail("path-map.json missing");
     process.exit(1);
   }
@@ -5591,8 +5838,8 @@ function resumeCmd(sessionId) {
 }
 function findTranscriptPath(projectsRoot, sessionId) {
   for (const dir of readdirSync12(projectsRoot)) {
-    const candidate = join45(projectsRoot, dir, `${sessionId}.jsonl`);
-    if (existsSync39(candidate)) return candidate;
+    const candidate = join46(projectsRoot, dir, `${sessionId}.jsonl`);
+    if (existsSync40(candidate)) return candidate;
   }
   return null;
 }
@@ -5647,7 +5894,8 @@ function shQuote(s) {
 
 // src/nomad.ts
 init_utils();
-if (!HOME) {
+var h = home();
+if (!h) {
   fail(
     "could not determine home directory (HOME env unset and no uid mapping). Set HOME and retry."
   );
@@ -5726,6 +5974,15 @@ try {
       cmdAdopt(name, { dryRun: sub === "--dry-run" });
       break;
     }
+    case "eject": {
+      const ejectArgs = parseEjectArgs(process.argv);
+      if (ejectArgs === null) {
+        console.error("usage: nomad eject [--dry-run]");
+        process.exit(1);
+      }
+      cmdEject({ dryRun: ejectArgs.dryRun });
+      break;
+    }
     case "doctor":
       if (process.argv[3] === void 0) {
         cmdDoctor();