claude-nomad 0.67.0 → 0.67.2

package/dist/nomad.mjs

@@ -70,6 +70,9 @@ function regionKey(segment) {
 function isExtrasScoped(segments) {
   return segments[0] === "shared" && segments.length > 1 && regionKey(segments[1]) === "extras";
 }
+function isLogicalNameScoped(segments) {
+  return segments[0] === "shared" && segments.length > 1 && UNFILTERED_SHARED_REGIONS.has(regionKey(segments[1]));
+}
 function isSharedNameScoped(segments) {
   return segments[0] === "shared" && segments.length > 1 && !UNFILTERED_SHARED_REGIONS.has(regionKey(segments[1]));
 }
@@ -83,7 +86,7 @@ function blockSetFor(segments) {
 function deniedSegmentFor(path) {
   const segments = path.split("/");
   const blockSet = blockSetFor(segments);
-  const scan = isExtrasScoped(segments) ? segments.slice(4) : segments;
+  const scan = isLogicalNameScoped(segments) && segments.length > 3 ? segments.slice(3) : segments;
   for (const segment of scan) {
     if (isDeniedName(blockSet, segment)) return segment;
   }
@@ -803,12 +806,12 @@ import {
   cpSync as cpSync3,
   existsSync as existsSync3,
   fsyncSync,
-  lstatSync as lstatSync4,
+  lstatSync as lstatSync5,
   mkdirSync,
   openSync,
   renameSync,
   rmdirSync,
-  statSync,
+  statSync as statSync2,
   symlinkSync,
   writeFileSync
 } from "node:fs";
@@ -837,7 +840,7 @@ function renameAtomicRetry(tmp, dst, renameFn = renameSync) {
   }
 }
 function writeJsonAtomic(path, data) {
-  const mode = existsSync3(path) ? statSync(path).mode & 511 : 384;
+  const mode = existsSync3(path) ? statSync2(path).mode & 511 : 384;
   const tmp = `${path}.tmp.${process.pid}`;
   const fd = openSync(tmp, "w", mode);
   try {
@@ -876,7 +879,7 @@ function discardEmptyBackupDir(backupRoot) {
 }
 function ensureSymlink(linkPath, target) {
   if (existsSync3(linkPath)) {
-    if (lstatSync4(linkPath).isSymbolicLink()) return;
+    if (lstatSync5(linkPath).isSymbolicLink()) return;
     die(`${linkPath} exists and is not a symlink. Move it aside first.`);
   }
   mkdirSync(dirname(linkPath), { recursive: true });
@@ -915,12 +918,12 @@ var init_utils_fs = __esm({
 
 // src/commands.pull.wedge.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { existsSync as existsSync16 } from "node:fs";
-import { join as join20 } from "node:path";
+import { existsSync as existsSync15 } from "node:fs";
+import { join as join21 } from "node:path";
 function detectWedge(repo) {
-  const g = join20(repo, ".git");
-  if (existsSync16(join20(g, "rebase-merge")) || existsSync16(join20(g, "rebase-apply"))) return "rebase";
-  if (existsSync16(join20(g, "MERGE_HEAD"))) return "merge";
+  const g = join21(repo, ".git");
+  if (existsSync15(join21(g, "rebase-merge")) || existsSync15(join21(g, "rebase-apply"))) return "rebase";
+  if (existsSync15(join21(g, "MERGE_HEAD"))) return "merge";
   return null;
 }
 function probeUnmergedIndex(repo) {
@@ -990,15 +993,15 @@ var init_commands_pull_wedge = __esm({
 });
 
 // src/push-gitleaks.config.ts
-import { existsSync as existsSync17, mkdtempSync, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync16, mkdtempSync, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join21 } from "node:path";
+import { join as join22 } from "node:path";
 import { fileURLToPath } from "node:url";
 function resolveTomlPath(repo = repoHome()) {
-  const repoToml = join21(repo, ".gitleaks.toml");
-  if (existsSync17(repoToml)) return repoToml;
+  const repoToml = join22(repo, ".gitleaks.toml");
+  if (existsSync16(repoToml)) return repoToml;
   const bundled = fileURLToPath(new URL("../.gitleaks.toml", import.meta.url));
-  return existsSync17(bundled) ? bundled : null;
+  return existsSync16(bundled) ? bundled : null;
 }
 function assertOverlayAllowlistsScoped(overlayBody) {
   if (OVERLAY_INLINE_ALLOWLIST_RE.test(overlayBody)) {
@@ -1036,17 +1039,17 @@ function buildOverlayTempConfig(overlayBody, bundled) {
 path = ${JSON.stringify(bundled)}
 
 ${overlayBody}`;
-  const tempPath = mkdtempSync(join21(tmpdir(), "nomad-gitleaks-cfg-"));
-  const configPath = join21(tempPath, "config.toml");
+  const tempPath = mkdtempSync(join22(tmpdir(), "nomad-gitleaks-cfg-"));
+  const configPath = join22(tempPath, "config.toml");
   writeFileSync3(configPath, tempBody, { mode: 384, flag: "wx" });
   return { configPath, tempPath };
 }
 function resolveTomlConfig() {
   const repo = repoHome();
-  const overlayPath = join21(repo, ".gitleaks.overlay.toml");
-  const repoToml = join21(repo, ".gitleaks.toml");
+  const overlayPath = join22(repo, ".gitleaks.overlay.toml");
+  const repoToml = join22(repo, ".gitleaks.toml");
   const bundled = resolveTomlPath(repo);
-  if (!existsSync17(overlayPath)) {
+  if (!existsSync16(overlayPath)) {
     return { path: bundled, tempPath: null };
   }
   if (bundled === repoToml) {
@@ -1134,7 +1137,7 @@ var init_autostash_guard = __esm({
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { readdirSync as readdirSync8, rmSync as rmSync7 } from "node:fs";
 import { homedir as homedir2, platform } from "node:os";
-import { delimiter, join as join22 } from "node:path";
+import { delimiter, join as join23 } from "node:path";
 function gitleaksInstallHint() {
   const head = "gitleaks not on PATH (required for nomad push). Install:";
   const plat = platform();
@@ -1182,7 +1185,7 @@ function findGitlinks(dir) {
       return;
     }
     for (const e of entries) {
-      const p = join22(current, e.name);
+      const p = join23(current, e.name);
       if (e.name === ".git") {
         hits.push(p);
         continue;
@@ -1246,7 +1249,7 @@ var init_push_checks = __esm({
 import { execFileSync as execFileSync8 } from "node:child_process";
 import { mkdirSync as mkdirSync3, mkdtempSync as mkdtempSync2, readFileSync as readFileSync6, rmSync as rmSync8 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join26 } from "node:path";
+import { join as join27 } from "node:path";
 function toFinding(entry) {
   if (typeof entry !== "object" || entry === null) return null;
   const e = entry;
@@ -1294,9 +1297,9 @@ function resolveScanFailure(reportPath, e, forwardStreams) {
   return report;
 }
 function scanStagedTree(repoDir, forwardStreams = false) {
-  const cacheDir = join26(homedir3(), ".cache", "claude-nomad");
+  const cacheDir = join27(homedir3(), ".cache", "claude-nomad");
   mkdirSync3(cacheDir, { recursive: true });
-  const reportPath = join26(cacheDir, `gitleaks-${nowTimestamp()}-${process.pid}.json`);
+  const reportPath = join27(cacheDir, `gitleaks-${nowTimestamp()}-${process.pid}.json`);
   const { path: toml, tempPath } = resolveTomlConfig();
   const args = [
     "protect",
@@ -1324,14 +1327,14 @@ function scanStagedTree(repoDir, forwardStreams = false) {
   }
 }
 function scanFile(filePath, forwardStreams = false, timeoutMs = GITLEAKS_SCAN_TIMEOUT_MS) {
-  const cacheDir = join26(homedir3(), ".cache", "claude-nomad");
+  const cacheDir = join27(homedir3(), ".cache", "claude-nomad");
   mkdirSync3(cacheDir, { recursive: true });
   const { path: toml, tempPath } = resolveTomlConfig();
   let reportDir;
   let reportPath;
   try {
-    reportDir = mkdtempSync2(join26(cacheDir, `gitleaks-file-${nowTimestamp()}-${process.pid}-`));
-    reportPath = join26(reportDir, "report.json");
+    reportDir = mkdtempSync2(join27(cacheDir, `gitleaks-file-${nowTimestamp()}-${process.pid}-`));
+    reportPath = join27(reportDir, "report.json");
     const args = [
       "detect",
       "--no-git",
@@ -1559,15 +1562,27 @@ import { existsSync as existsSync5, lstatSync as lstatSync7 } from "node:fs";
 import { join as join9 } from "node:path";
 
 // src/commands.adopt.recover.ts
-import { lstatSync as lstatSync6, rmSync as rmSync4 } from "node:fs";
+import { rmSync as rmSync4 } from "node:fs";
 import { dirname as dirname2, join as join7, resolve as resolve2 } from "node:path";
 
 // src/commands.adopt.scan.ts
 init_config();
-init_exit_codes();
-init_utils();
 import { lstatSync, readdirSync } from "node:fs";
 import { join as join2, relative } from "node:path";
+
+// src/error-text.ts
+function errorText(err) {
+  try {
+    const message = err?.message;
+    return typeof message === "string" ? message : String(err);
+  } catch {
+    return "unprintable error value";
+  }
+}
+
+// src/commands.adopt.scan.ts
+init_exit_codes();
+init_utils();
 function toForwardSlash(p) {
   return p.replaceAll("\\", "/");
 }
@@ -1596,10 +1611,8 @@ function scanOrFatal(name, root, state) {
   try {
     return scanDeniedEntries(root);
   } catch (err) {
-    const message = err?.message;
-    const text = typeof message === "string" ? message : String(err);
     throw new NomadFatal(
-      `cannot adopt ${name}: could not scan ${root} for never-sync content (${text}). ${state()} Check that it is readable and not being written to, then run \`nomad adopt ${name}\` again.`,
+      `cannot adopt ${name}: could not scan ${root} for never-sync content (${errorText(err)}). ${state()} Check that it is readable and not being written to, then run \`nomad adopt ${name}\` again.`,
       { code: EXIT.GENERIC_FAILURE }
     );
   }
@@ -1859,9 +1872,34 @@ function copyExtrasFilteredPreserving(src, dst, blockSet) {
   });
 }
 
+// src/fs-presence.ts
+import { lstatSync as lstatSync4, statSync } from "node:fs";
+var ABSENT_CODES = /* @__PURE__ */ new Set(["ENOENT", "ENOTDIR", "ENAMETOOLONG"]);
+function classifyPresence(p) {
+  let stat;
+  try {
+    stat = lstatSync4(p, { throwIfNoEntry: false });
+  } catch (err) {
+    return ABSENT_CODES.has(String(err.code)) ? "absent" : "unknown";
+  }
+  if (stat === void 0) return "absent";
+  try {
+    statSync(p);
+  } catch (err) {
+    return ABSENT_CODES.has(String(err.code)) ? "dangling" : "unknown";
+  }
+  return "resolves";
+}
+function isUnusableTarget(state) {
+  return state === "dangling" || state === "unknown";
+}
+function lexists(p) {
+  return classifyPresence(p) !== "absent";
+}
+
 // src/links.ts
 init_config();
-import { existsSync as existsSync4, lstatSync as lstatSync5, rmSync as rmSync3 } from "node:fs";
+import { existsSync as existsSync4, lstatSync as lstatSync6, rmSync as rmSync3 } from "node:fs";
 import { join as join6 } from "node:path";
 
 // src/hooks-filter.ts
@@ -2177,14 +2215,14 @@ function emitCopy(onPreview, from, to) {
   }
 }
 function isAlreadySymlink(linkPath) {
-  return existsSync4(linkPath) && lstatSync5(linkPath).isSymbolicLink();
+  return existsSync4(linkPath) && lstatSync6(linkPath).isSymbolicLink();
 }
 function runAutoMovePasses(linkNames, claude, repo, ts, dryRun, onPreview) {
   for (const name of linkNames) {
     const linkPath = join6(claude, name);
     const target = join6(repo, "shared", name);
     if (!existsSync4(linkPath)) continue;
-    if (lstatSync5(linkPath).isSymbolicLink()) continue;
+    if (lstatSync6(linkPath).isSymbolicLink()) continue;
     if (!existsSync4(target)) continue;
     if (dryRun) {
       emitAutoMove(onPreview, linkPath, ts, name);
@@ -2199,7 +2237,7 @@ function copySharedLinkPull(src, dst) {
 }
 function stillOccupied(abs) {
   try {
-    return lstatSync5(abs, { throwIfNoEntry: false }) !== void 0;
+    return lstatSync6(abs, { throwIfNoEntry: false }) !== void 0;
   } catch {
     return true;
   }
@@ -2224,7 +2262,7 @@ function warnWin32ApplyFailed(linkPath, ts, err, snapshotted) {
 function applyOneSharedLinkWin32(target, linkPath, ts) {
   let snapshotted = false;
   try {
-    const stat = lstatSync5(linkPath, { throwIfNoEntry: false });
+    const stat = lstatSync6(linkPath, { throwIfNoEntry: false });
     if (stat !== void 0) {
       const snapshot = snapshotBeforeWin32Copy(linkPath, ts);
       if (snapshot === "failed") return;
@@ -2339,18 +2377,6 @@ function regenerateSettings(ts, opts = {}) {
 
 // src/commands.adopt.recover.ts
 init_utils();
-function errorText(err) {
-  const message = err?.message;
-  return typeof message === "string" ? message : String(err);
-}
-function lexists(p) {
-  try {
-    lstatSync6(p);
-    return true;
-  } catch {
-    return false;
-  }
-}
 function isDirectChildOf(root, abs) {
   return dirname2(resolve2(abs)) === resolve2(root);
 }
@@ -2595,11 +2621,56 @@ function isValidAdoptName(name) {
   if (SHARED_LINKS.includes(name)) return true;
   return isValidSharedDir(name);
 }
+function refuseUnusableSharedTarget(name) {
+  throw new NomadFatal(
+    `${name}: shared/${name} does not resolve to anything usable, so adopting would publish nothing. Remove shared/${name} from the repo, or restore what it points at, then re-run adopt.`,
+    { code: EXIT.GENERIC_FAILURE }
+  );
+}
+function clobberMessage(name, state) {
+  if (state === "dangling") {
+    return `${name}: shared/${name} is a pointer that does not resolve; would clobber. Remove it, or restore what it points at, first.`;
+  }
+  if (state === "unknown") {
+    return `${name}: shared/${name} could not be read, so adopt cannot tell whether it would clobber existing content. Check its permissions in the sync repo.`;
+  }
+  return `${name}: shared/${name} already exists; would clobber. Remove it first.`;
+}
+function refuseClobber(name, sharedTarget) {
+  const state = classifyPresence(sharedTarget);
+  if (state === "absent") return;
+  throw new NomadFatal(clobberMessage(name, state), { code: EXIT.GENERIC_FAILURE });
+}
 function reportWin32AlreadyAdopted(name, sharedTarget) {
-  if (process.platform !== "win32" || !lexists(sharedTarget)) return false;
+  if (process.platform !== "win32") return false;
+  const state = classifyPresence(sharedTarget);
+  if (state === "absent") return false;
+  if (isUnusableTarget(state)) refuseUnusableSharedTarget(name);
   log(`${name}: already adopted (win32 copy-sync); run \`nomad pull\` to refresh the local copy`);
   return true;
 }
+function alreadySymlinkMessage(name, sharedTarget) {
+  const state = classifyPresence(sharedTarget);
+  if (state === "dangling") {
+    return {
+      text: `${name}: already a symlink, but shared/${name} does not resolve, so the link is broken. Restore shared/${name} in the repo, or remove ~/.claude/${name} and re-run adopt`,
+      healthy: false
+    };
+  }
+  if (state === "unknown") {
+    return {
+      text: `${name}: already a symlink, but shared/${name} could not be read, so whether the link works could not be determined. Check its permissions in the sync repo`,
+      healthy: false
+    };
+  }
+  if (state === "absent") {
+    return {
+      text: `${name}: already a symlink, but there is no shared/${name} in the repo, so it is not adopted. Remove ~/.claude/${name} and re-run adopt, or run \`nomad pull\` if another host shares it`,
+      healthy: false
+    };
+  }
+  return { text: `${name}: already adopted (already a symlink)`, healthy: true };
+}
 function adoptStopsEarly(name, linkPath, sharedTarget) {
   if (!existsSync5(linkPath)) {
     if (reportWin32AlreadyAdopted(name, sharedTarget)) return true;
@@ -2607,14 +2678,13 @@ function adoptStopsEarly(name, linkPath, sharedTarget) {
     return true;
   }
   if (lstatSync7(linkPath).isSymbolicLink()) {
-    log(`${name}: already adopted (already a symlink)`);
+    const { text, healthy } = alreadySymlinkMessage(name, sharedTarget);
+    if (healthy) log(text);
+    else warn(text);
     return true;
   }
   if (reportWin32AlreadyAdopted(name, sharedTarget)) return true;
-  if (lexists(sharedTarget)) {
-    fail(`${name}: shared/${name} already exists; would clobber. Remove it first.`);
-    process.exit(1);
-  }
+  refuseClobber(name, sharedTarget);
   return false;
 }
 function performAdoptMove(name, linkPath, sharedTarget, repo, backup) {
@@ -2647,18 +2717,19 @@ function cmdAdopt(name, opts = {}) {
     );
   }
   if (!isValidAdoptName(name)) {
-    fail(`invalid name: ${JSON.stringify(name)}`);
-    process.exit(1);
+    throw new NomadFatal(`invalid name: ${JSON.stringify(name)}`, {
+      code: EXIT.GENERIC_FAILURE
+    });
   }
   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.`
+    throw new NomadFatal(
+      `${name}: not a configured shared target. Add it to sharedDirs in path-map.json first, then re-run adopt.`,
+      { code: EXIT.GENERIC_FAILURE }
     );
-    process.exit(1);
   }
   const linkPath = join9(claude, name);
   const sharedTarget = join9(repo, "shared", name);
@@ -2880,7 +2951,7 @@ async function cmdCaptureSettings(opts) {
 init_config();
 init_exit_codes();
 init_utils();
-import { existsSync as existsSync8, lstatSync as lstatSync8, readdirSync as readdirSync4, rmSync as rmSync5, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync8, lstatSync as lstatSync8, readdirSync as readdirSync4, rmSync as rmSync5, statSync as statSync3 } from "node:fs";
 import { join as join12 } from "node:path";
 var TS_SHAPE = /^\d{8}-\d{6}(-\d+)?$/;
 var DURATION_RE = /^(\d+)([dhm])$/;
@@ -2899,7 +2970,7 @@ function parseDuration(s) {
 }
 function listBackupDirs(backupBase2) {
   if (!existsSync8(backupBase2)) return [];
-  return readdirSync4(backupBase2).filter(isTsDir).map((name) => ({ name, mtimeMs: statSync2(join12(backupBase2, name)).mtimeMs })).sort((a, b) => b.mtimeMs - a.mtimeMs);
+  return readdirSync4(backupBase2).filter(isTsDir).map((name) => ({ name, mtimeMs: statSync3(join12(backupBase2, name)).mtimeMs })).sort((a, b) => b.mtimeMs - a.mtimeMs);
 }
 function holdsNoContent(dir) {
   let entries;
@@ -3180,14 +3251,14 @@ function cmdEject(opts = {}, roots = defaultEjectRoots()) {
 }
 
 // src/commands.doctor.ts
-import { existsSync as existsSync36 } from "node:fs";
-import { join as join48 } from "node:path";
+import { existsSync as existsSync35 } from "node:fs";
+import { join as join49 } from "node:path";
 
 // src/commands.doctor.checks.repo.ts
 init_color();
 init_config();
-import { existsSync as existsSync12, lstatSync as lstatSync10, readdirSync as readdirSync5, statSync as statSync3 } from "node:fs";
-import { join as join16 } from "node:path";
+import { existsSync as existsSync11, lstatSync as lstatSync10, readdirSync as readdirSync5, statSync as statSync4 } from "node:fs";
+import { join as join17 } from "node:path";
 
 // src/commands.doctor.format.ts
 init_color();
@@ -3265,7 +3336,6 @@ function readJsonSafe(path, label, section2) {
 // src/commands.doctor.checks.repo.win32.ts
 init_color();
 init_config();
-import { existsSync as existsSync10 } from "node:fs";
 import { join as join14, win32 as win32Path } from "node:path";
 
 // src/extras-sync.diff.ts
@@ -3334,6 +3404,18 @@ function win32CopyUnpublishedRow(name) {
     fail: false
   };
 }
+function win32CopyUnusableRow(name, state) {
+  if (state === "dangling") {
+    return {
+      line: `${yellow(warnGlyph)} ${name}: real local copy, but shared/${name} does not resolve in the repo (remove shared/${name}, or restore what it points at)`,
+      fail: false
+    };
+  }
+  return {
+    line: `${yellow(warnGlyph)} ${name}: real local copy, but shared/${name} could not be read in the repo, so whether it is usable could not be determined (check its permissions in the sync repo)`,
+    fail: false
+  };
+}
 function relativeUnder(root, path) {
   const rel = win32Path.relative(root, path);
   const segments = rel.split(win32Path.sep);
@@ -3347,7 +3429,9 @@ function divergingRepoPath(line, name, local, shared) {
 }
 function classifyWin32Copy(name, p) {
   const sharedPath = join14(repoHome(), "shared", name);
-  if (!existsSync10(sharedPath)) return win32CopyUnpublishedRow(name);
+  const sharedState = classifyPresence(sharedPath);
+  if (sharedState === "absent") return win32CopyUnpublishedRow(name);
+  if (isUnusableTarget(sharedState)) return win32CopyUnusableRow(name, sharedState);
   const compared = listDivergingFiles(p, sharedPath);
   const diverging = compared.filter(
     (line) => deniedSegmentFor(divergingRepoPath(line, name, p, sharedPath)) === null
@@ -3361,18 +3445,69 @@ function classifyWin32Copy(name, p) {
   };
 }
 
+// src/commands.doctor.checks.repo.source.ts
+init_color();
+init_config();
+import { join as join15 } from "node:path";
+function repoSourceState(name) {
+  return classifyPresence(join15(repoHome(), "shared", name));
+}
+function adoptRefusalClause(name, state) {
+  if (state === "dangling") {
+    return `shared/${name} does not resolve, so \`nomad adopt ${name}\` would refuse (remove shared/${name}, or restore what it points at, first)`;
+  }
+  return `shared/${name} could not be read, so \`nomad adopt ${name}\` would refuse (check its permissions in the sync repo first)`;
+}
+function adoptWouldClobberRow(name) {
+  return {
+    line: `${red(failGlyph)} ${name}: NOT a symlink (blocks sync), and shared/${name} already holds content, so \`nomad adopt ${name}\` would refuse rather than choose between them (compare the two, then either remove ~/.claude/${name} and run \`nomad pull\`, or remove shared/${name} and run \`nomad adopt ${name}\`)`,
+    fail: true
+  };
+}
+function posixNonSymlinkRow(name) {
+  const state = repoSourceState(name);
+  if (isUnusableTarget(state)) {
+    return {
+      line: `${red(failGlyph)} ${name}: NOT a symlink (blocks sync), and ${adoptRefusalClause(name, state)}`,
+      fail: true
+    };
+  }
+  if (state === "resolves") return adoptWouldClobberRow(name);
+  return {
+    line: `${red(failGlyph)} ${name}: NOT a symlink (blocks sync); run \`nomad adopt ${name}\` to fix`,
+    fail: true
+  };
+}
+function repoSourceUnusableRow(name, state) {
+  if (state === "dangling") {
+    return {
+      line: `${yellow(warnGlyph)} ${name}: shared/${name} in the repo does not resolve, so there is nothing to restore from (remove shared/${name}, or restore what it points at)`,
+      fail: false
+    };
+  }
+  return {
+    line: `${yellow(warnGlyph)} ${name}: shared/${name} in the repo could not be read, so whether there is anything to restore from could not be determined (check its permissions in the sync repo)`,
+    fail: false
+  };
+}
+function repoSourceRow(name, present, absent) {
+  const state = repoSourceState(name);
+  if (isUnusableTarget(state)) return repoSourceUnusableRow(name, state);
+  return state === "resolves" ? present : absent;
+}
+
 // src/init.classify.ts
 init_config();
 init_utils_json();
-import { existsSync as existsSync11 } from "node:fs";
-import { join as join15 } from "node:path";
+import { existsSync as existsSync10 } from "node:fs";
+import { join as join16 } from "node:path";
 function classifyRepoState(repoHome2, host) {
-  const basePath = join15(repoHome2, "shared", "settings.base.json");
-  const mapPath = join15(repoHome2, "path-map.json");
-  const hostPath = join15(repoHome2, "hosts", `${host}.json`);
-  const hasBase = existsSync11(basePath);
-  const hasMap = existsSync11(mapPath);
-  const hasHost = existsSync11(hostPath);
+  const basePath = join16(repoHome2, "shared", "settings.base.json");
+  const mapPath = join16(repoHome2, "path-map.json");
+  const hostPath = join16(repoHome2, "hosts", `${host}.json`);
+  const hasBase = existsSync10(basePath);
+  const hasMap = existsSync10(mapPath);
+  const hasHost = existsSync10(hostPath);
   let mapEntryCount = 0;
   if (hasMap) {
     try {
@@ -3387,11 +3522,11 @@ function classifyRepoState(repoHome2, host) {
   return "partial";
 }
 function reasonForPartial(repoHome2, host) {
-  const basePath = join15(repoHome2, "shared", "settings.base.json");
-  const mapPath = join15(repoHome2, "path-map.json");
-  const hostPath = join15(repoHome2, "hosts", `${host}.json`);
-  if (!existsSync11(basePath)) return "- shared/settings.base.json missing";
-  if (!existsSync11(mapPath)) return "- path-map.json missing";
+  const basePath = join16(repoHome2, "shared", "settings.base.json");
+  const mapPath = join16(repoHome2, "path-map.json");
+  const hostPath = join16(repoHome2, "hosts", `${host}.json`);
+  if (!existsSync10(basePath)) return "- shared/settings.base.json missing";
+  if (!existsSync10(mapPath)) return "- path-map.json missing";
   let mapEntryCount;
   try {
     const map = readJson(mapPath);
@@ -3400,7 +3535,7 @@ function reasonForPartial(repoHome2, host) {
     mapEntryCount = 0;
   }
   if (mapEntryCount === 0) return "- path-map.json.projects has no entries";
-  if (!existsSync11(hostPath)) return `- hosts/${host}.json missing`;
+  if (!existsSync10(hostPath)) return `- hosts/${host}.json missing`;
   return "- partial state (unknown gap)";
 }
 
@@ -3417,15 +3552,15 @@ function reportHostAndPaths(section2) {
   if (isOverrideActive()) {
     addItem(section2, `${dim(infoGlyph)} NOMAD_REPO: ${blue(repo)}`);
   }
-  addItem(section2, `${existsSync12(repo) ? green(okGlyph) : yellow(warnGlyph)} repo: ${blue(repo)}`);
+  addItem(section2, `${existsSync11(repo) ? green(okGlyph) : yellow(warnGlyph)} repo: ${blue(repo)}`);
   addItem(
     section2,
-    `${existsSync12(claude) ? green(okGlyph) : yellow(warnGlyph)} claude home: ${blue(claude)}`
+    `${existsSync11(claude) ? green(okGlyph) : yellow(warnGlyph)} claude home: ${blue(claude)}`
   );
 }
 function pathMapHostKeys() {
-  const mapPath = join16(repoHome(), "path-map.json");
-  if (!existsSync12(mapPath)) return /* @__PURE__ */ new Set();
+  const mapPath = join17(repoHome(), "path-map.json");
+  if (!existsSync11(mapPath)) return /* @__PURE__ */ new Set();
   let raw;
   try {
     raw = readJson(mapPath);
@@ -3442,7 +3577,7 @@ function pathMapHostKeys() {
 function hostOverrideLabels() {
   let entries;
   try {
-    entries = readdirSync5(join16(repoHome(), "hosts"));
+    entries = readdirSync5(join17(repoHome(), "hosts"));
   } catch {
     return /* @__PURE__ */ new Set();
   }
@@ -3482,9 +3617,6 @@ function reportRepoState(section2) {
     process.exitCode = 1;
   }
 }
-function repoHasSharedSource(name) {
-  return existsSync12(join16(repoHome(), "shared", name));
-}
 function classifySharedLink(name, p) {
   let stat;
   try {
@@ -3492,10 +3624,14 @@ function classifySharedLink(name, p) {
   } catch (err) {
     const code = err.code;
     if (code === "ENOENT") {
-      return repoHasSharedSource(name) ? {
-        line: `${yellow(warnGlyph)} ${name}: missing (run \`nomad pull\` to restore)`,
-        fail: false
-      } : { line: `${dim(infoGlyph)} ${name}: not synced (nothing in shared/)`, fail: false };
+      return repoSourceRow(
+        name,
+        {
+          line: `${yellow(warnGlyph)} ${name}: missing (run \`nomad pull\` to restore)`,
+          fail: false
+        },
+        { line: `${dim(infoGlyph)} ${name}: not synced (nothing in shared/)`, fail: false }
+      );
     }
     return { line: `${red(failGlyph)} ${name}: could not stat (${String(code)})`, fail: true };
   }
@@ -3503,27 +3639,28 @@ function classifySharedLink(name, p) {
     if (process.platform === "win32") {
       return classifyWin32Copy(name, p);
     }
-    return {
-      line: `${red(failGlyph)} ${name}: NOT a symlink (blocks sync); run \`nomad adopt ${name}\` to fix`,
-      fail: true
-    };
+    return posixNonSymlinkRow(name);
   }
   return classifySymlinkTarget(name, p);
 }
 function classifySymlinkTarget(name, p) {
   try {
-    statSync3(p);
+    statSync4(p);
     return { line: `${green(okGlyph)} ${name}: symlink`, fail: false };
   } catch (err) {
     const code = err.code;
     if (code === "ENOENT") {
-      return repoHasSharedSource(name) ? {
-        line: `${yellow(warnGlyph)} ${name}: broken symlink (target missing, run \`nomad pull\`)`,
-        fail: false
-      } : {
-        line: `${dim(infoGlyph)} ${name}: stale symlink (no longer in shared/, safe to remove)`,
-        fail: false
-      };
+      return repoSourceRow(
+        name,
+        {
+          line: `${yellow(warnGlyph)} ${name}: broken symlink (target missing, run \`nomad pull\`)`,
+          fail: false
+        },
+        {
+          line: `${dim(infoGlyph)} ${name}: stale symlink (no longer in shared/, safe to remove)`,
+          fail: false
+        }
+      );
     }
     return {
       line: `${yellow(warnGlyph)} ${name}: symlink target unreadable (${String(code)})`,
@@ -3534,7 +3671,7 @@ function classifySymlinkTarget(name, p) {
 function reportSharedLinks(section2, map) {
   const claude = claudeHome();
   for (const name of allSharedLinks(map, { quiet: true })) {
-    const p = join16(claude, name);
+    const p = join17(claude, name);
     const { line, fail: fail2, children } = classifySharedLink(name, p);
     addItem(section2, line);
     if (fail2) process.exitCode = 1;
@@ -3546,7 +3683,7 @@ function reportSharedLinks(section2, map) {
 function reportDroppedNamesMigration(section2) {
   const claude = claudeHome();
   for (const name of GSD_DROPPED_NAMES) {
-    const p = join16(claude, name);
+    const p = join17(claude, name);
     let stat;
     try {
       stat = lstatSync10(p);
@@ -3564,11 +3701,11 @@ function reportDroppedNamesMigration(section2) {
 // src/commands.doctor.checks.settings.ts
 init_color();
 init_config();
-import { existsSync as existsSync13, readdirSync as readdirSync6 } from "node:fs";
-import { join as join17 } from "node:path";
+import { existsSync as existsSync12, readdirSync as readdirSync6 } from "node:fs";
+import { join as join18 } from "node:path";
 function loadBaseSettings(section2) {
-  const basePath = join17(repoHome(), "shared", "settings.base.json");
-  if (!existsSync13(basePath)) {
+  const basePath = join18(repoHome(), "shared", "settings.base.json");
+  if (!existsSync12(basePath)) {
     addItem(section2, `${red(failGlyph)} shared/settings.base.json missing at ${blue(basePath)}`);
     process.exitCode = 1;
     return null;
@@ -3576,8 +3713,8 @@ function loadBaseSettings(section2) {
   return readJsonSafe(basePath, basePath, section2);
 }
 function loadAndReportSettings(section2) {
-  const settingsPath = join17(claudeHome(), "settings.json");
-  if (!existsSync13(settingsPath)) return null;
+  const settingsPath = join18(claudeHome(), "settings.json");
+  if (!existsSync12(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));
@@ -3593,13 +3730,13 @@ function loadAndReportSettings(section2) {
 }
 function reportHostOverrides(section2, base, settings) {
   const repo = repoHome();
-  const hostFile = join17(repo, "hosts", `${HOST}.json`);
+  const hostFile = join18(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 (existsSync13(hostFile)) {
+  if (existsSync12(hostFile)) {
     if (readJsonSafe(hostFile, hostFile, section2) !== null) {
       addItem(section2, `${green(okGlyph)} host overrides: ${blue(hostFile)}`);
     }
@@ -3608,8 +3745,8 @@ function reportHostOverrides(section2, base, settings) {
       section2,
       `${red(failGlyph)} no hosts/${HOST}.json AND settings.json has unbased keys ${JSON.stringify(drift)}`
     );
-    const hostsDir = join17(repo, "hosts");
-    if (existsSync13(hostsDir)) {
+    const hostsDir = join18(repo, "hosts");
+    if (existsSync12(hostsDir)) {
       const cands = readdirSync6(hostsDir).filter((f) => f.endsWith(".json"));
       if (cands.length > 0) addItem(section2, `${dim(infoGlyph)} candidates: ${cands.join(", ")}`);
     }
@@ -3626,8 +3763,8 @@ function reportHostOverrides(section2, base, settings) {
 init_color();
 init_config();
 init_config_sharedDirs_guard();
-import { existsSync as existsSync14, lstatSync as lstatSync11, readdirSync as readdirSync7, realpathSync as realpathSync2 } from "node:fs";
-import { join as join18, sep as sep4 } from "node:path";
+import { existsSync as existsSync13, lstatSync as lstatSync11, readdirSync as readdirSync7, realpathSync as realpathSync2 } from "node:fs";
+import { join as join19, sep as sep4 } from "node:path";
 init_utils_json();
 function reportMappedProjects(section2, map) {
   const mapped = Object.entries(map.projects).filter(([, hosts]) => hosts[HOST]);
@@ -3637,8 +3774,8 @@ function reportMappedProjects(section2, map) {
   }
 }
 function reportUnmappedProjects(section2, map) {
-  const localProjects = join18(claudeHome(), "projects");
-  if (!existsSync14(localProjects)) return;
+  const localProjects = join19(claudeHome(), "projects");
+  if (!existsSync13(localProjects)) return;
   let localDirs;
   try {
     localDirs = readdirSync7(localProjects);
@@ -3659,7 +3796,7 @@ function reportCurrentHostPathsMissing(section2, map) {
   for (const [name, hosts] of Object.entries(map.projects)) {
     const abspath = hosts[HOST];
     if (!abspath || abspath === "TBD") continue;
-    if (!existsSync14(abspath)) {
+    if (!existsSync13(abspath)) {
       addItem(
         section2,
         `${yellow(warnGlyph)} path-map: ${name} local path missing on ${HOST}: ${blue(abspath)}`
@@ -3669,7 +3806,7 @@ function reportCurrentHostPathsMissing(section2, map) {
 }
 function hasSharedLeftover(entry) {
   try {
-    return lstatSync11(join18(repoHome(), "shared", entry), { throwIfNoEntry: false }) !== void 0;
+    return lstatSync11(join19(repoHome(), "shared", entry), { throwIfNoEntry: false }) !== void 0;
   } catch {
     return false;
   }
@@ -3679,7 +3816,7 @@ var PROBEABLE_REASONS = /* @__PURE__ */ new Set([
   "secret-shaped"
 ]);
 function classifyLocalLink(entry) {
-  const linkPath = join18(claudeHome(), entry);
+  const linkPath = join19(claudeHome(), entry);
   let stat;
   try {
     stat = lstatSync11(linkPath, { throwIfNoEntry: false });
@@ -3695,7 +3832,7 @@ function classifyLocalLink(entry) {
   }
   let root;
   try {
-    root = realpathSync2(join18(repoHome(), "shared"));
+    root = realpathSync2(join19(repoHome(), "shared"));
   } catch {
     return "foreign";
   }
@@ -3779,8 +3916,8 @@ function reportPathCollisions(section2, map) {
   else addItem(section2, `${green(okGlyph)} path-encoding: no collisions`);
 }
 function reportPathMap(section2) {
-  const mapPath = join18(repoHome(), "path-map.json");
-  if (!existsSync14(mapPath)) {
+  const mapPath = join19(repoHome(), "path-map.json");
+  if (!existsSync13(mapPath)) {
     addItem(section2, `${red(failGlyph)} path-map.json missing at ${blue(mapPath)}`);
     process.exitCode = 1;
     return;
@@ -3810,8 +3947,8 @@ function reportNeverSync(section2) {
 
 // src/commands.doctor.checks.skills.ts
 init_color();
-import { existsSync as existsSync15 } from "node:fs";
-import { join as join19 } from "node:path";
+import { existsSync as existsSync14 } from "node:fs";
+import { join as join20 } from "node:path";
 init_config();
 function stripSideIndicator(line) {
   if (line.endsWith(" (local only)")) return line.slice(0, -" (local only)".length);
@@ -3831,13 +3968,13 @@ function isGsdDiffLine(line, localBase, sharedBase) {
   return relative12.split("/")[0].startsWith(GSD_PREFIX);
 }
 function reportSkillsDivergence(section2) {
-  const sharedSkills = join19(repoHome(), "shared", "skills");
-  const localSkills = join19(claudeHome(), "skills");
-  if (!existsSync15(sharedSkills)) {
+  const sharedSkills = join20(repoHome(), "shared", "skills");
+  const localSkills = join20(claudeHome(), "skills");
+  if (!existsSync14(sharedSkills)) {
     addItem(section2, `${dim(infoGlyph)} skills: no shared/skills/ to compare`);
     return;
   }
-  if (!existsSync15(localSkills)) {
+  if (!existsSync14(localSkills)) {
     addItem(section2, `${dim(infoGlyph)} skills: no local skills/ to compare`);
     return;
   }
@@ -3860,8 +3997,8 @@ function reportSkillsDivergence(section2) {
 init_color();
 init_config();
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { existsSync as existsSync18 } from "node:fs";
-import { join as join23, relative as relative5 } from "node:path";
+import { existsSync as existsSync17 } from "node:fs";
+import { join as join24, relative as relative5 } from "node:path";
 init_commands_pull_wedge();
 init_push_checks();
 init_utils();
@@ -3884,8 +4021,8 @@ function reportGitleaksProbe(section2) {
 }
 function reportGitlinks(section2) {
   const repo = repoHome();
-  const sharedDir = join23(repo, "shared");
-  if (existsSync18(sharedDir)) {
+  const sharedDir = join24(repo, "shared");
+  if (existsSync17(sharedDir)) {
     const gitlinks = findGitlinks(sharedDir);
     for (const p of gitlinks) {
       const rel = relative5(repo, p).replaceAll("\\", "/");
@@ -3983,8 +4120,8 @@ function reportGitIdentity(section2) {
 
 // src/commands.doctor.checks.backups.ts
 init_color();
-import { existsSync as existsSync19, lstatSync as lstatSync12, readdirSync as readdirSync9 } from "node:fs";
-import { join as join24 } from "node:path";
+import { existsSync as existsSync18, lstatSync as lstatSync12, readdirSync as readdirSync9 } from "node:fs";
+import { join as join25 } from "node:path";
 init_config();
 var TS_SHAPE2 = /^\d{8}-\d{6}(-\d+)?$/;
 function safeReaddir(dir) {
@@ -4000,7 +4137,7 @@ var BYTES_PER_MB = 1024 * 1024;
 function dirSizeBytes(dir) {
   let bytes = 0;
   for (const entry of safeReaddir(dir)) {
-    const full = join24(dir, entry);
+    const full = join25(dir, entry);
     const st = lstatSync12(full, { throwIfNoEntry: false });
     if (!st) continue;
     if (st.isSymbolicLink()) continue;
@@ -4011,11 +4148,11 @@ function dirSizeBytes(dir) {
 }
 function totalSizeMb(backupBase2, dirs) {
   let bytes = 0;
-  for (const name of dirs) bytes += dirSizeBytes(join24(backupBase2, name));
+  for (const name of dirs) bytes += dirSizeBytes(join25(backupBase2, name));
   return bytes / BYTES_PER_MB;
 }
 function reportBackupsCheck(section2, backupBase2 = backupBase()) {
-  if (!existsSync19(backupBase2)) return;
+  if (!existsSync18(backupBase2)) return;
   const dirs = safeReaddir(backupBase2).filter((n) => TS_SHAPE2.test(n));
   const count = dirs.length;
   const sizeMb = totalSizeMb(backupBase2, dirs);
@@ -4096,8 +4233,8 @@ function reportCheckRemote(section2) {
 
 // src/commands.doctor.check-schema.ts
 init_color();
-import { existsSync as existsSync20 } from "node:fs";
-import { join as join25 } from "node:path";
+import { existsSync as existsSync19 } from "node:fs";
+import { join as join26 } from "node:path";
 init_config();
 
 // src/http-fetch.ts
@@ -4134,8 +4271,8 @@ function fetchSchemaKeys() {
   }
 }
 function reportCheckSchema(section2) {
-  const settingsPath = join25(claudeHome(), "settings.json");
-  if (!existsSync20(settingsPath)) {
+  const settingsPath = join26(claudeHome(), "settings.json");
+  if (!existsSync19(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json to check`);
     return;
   }
@@ -4165,9 +4302,9 @@ function reportCheckSchema(section2) {
 init_color();
 import { randomBytes as randomBytes3 } from "node:crypto";
 import { execFileSync as execFileSync11 } from "node:child_process";
-import { existsSync as existsSync23, mkdirSync as mkdirSync8, readdirSync as readdirSync12, rmSync as rmSync12 } from "node:fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync8, readdirSync as readdirSync12, rmSync as rmSync12 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join32 } from "node:path";
+import { join as join33 } from "node:path";
 
 // src/commands.doctor.check-shared.memory.ts
 init_color();
@@ -4175,7 +4312,7 @@ import { execFileSync as execFileSync9 } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import { mkdirSync as mkdirSync4, rmSync as rmSync9, writeFileSync as writeFileSync4 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { dirname as dirname4, join as join27 } from "node:path";
+import { dirname as dirname4, join as join28 } from "node:path";
 init_config();
 init_push_gitleaks();
 init_utils_fs();
@@ -4208,7 +4345,7 @@ function buildMemoryScanTree(tmpRoot) {
       incomplete = true;
       continue;
     }
-    const dest = join27(tmpRoot, rel);
+    const dest = join28(tmpRoot, rel);
     mkdirSync4(dirname4(dest), { recursive: true });
     writeFileSync4(dest, blob);
     logicals.add(m[1]);
@@ -4227,10 +4364,10 @@ function reportMemoryFindings(section2, findings) {
 function reportCommittedMemory(section2) {
   let tmpRoot;
   try {
-    const cacheDir = join27(homedir4(), ".cache", "claude-nomad");
+    const cacheDir = join28(homedir4(), ".cache", "claude-nomad");
     mkdirSync4(cacheDir, { recursive: true });
     const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes(4).toString("hex")}`;
-    tmpRoot = join27(cacheDir, `check-shared-memory-tree-${stamp}`);
+    tmpRoot = join28(cacheDir, `check-shared-memory-tree-${stamp}`);
     mkdirSync4(tmpRoot, { recursive: true, mode: 448 });
     const { staged, incomplete } = buildMemoryScanTree(tmpRoot);
     if (incomplete) {
@@ -4277,12 +4414,12 @@ function reportCommittedMemory(section2) {
 
 // src/commands.doctor.check-shared.scan.ts
 init_color();
-import { join as join28 } from "node:path";
+import { join as join29 } from "node:path";
 init_config();
 init_push_gitleaks();
 function scrubPath(logical, sid, logicalToEncoded) {
   const encoded = logicalToEncoded.get(logical) ?? logical;
-  return join28(claudeHome(), "projects", encoded, `${sid}.jsonl`);
+  return join29(claudeHome(), "projects", encoded, `${sid}.jsonl`);
 }
 function reportSessionFindings(section2, bySession) {
   for (const [sid, counts] of bySession) {
@@ -4371,7 +4508,7 @@ import { execFileSync as execFileSync10 } from "node:child_process";
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { mkdirSync as mkdirSync5, rmSync as rmSync10, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { dirname as dirname5, join as join29 } from "node:path";
+import { dirname as dirname5, join as join30 } from "node:path";
 init_config();
 init_push_gitleaks();
 init_utils_fs();
@@ -4404,7 +4541,7 @@ function buildSkillScanTree(tmpRoot) {
       incomplete = true;
       continue;
     }
-    const dest = join29(tmpRoot, rel);
+    const dest = join30(tmpRoot, rel);
     mkdirSync5(dirname5(dest), { recursive: true });
     writeFileSync5(dest, blob);
     names.add(m[1]);
@@ -4427,10 +4564,10 @@ function reportSkillFindings(section2, findings) {
 function reportCommittedSkills(section2) {
   let tmpRoot;
   try {
-    const cacheDir = join29(homedir5(), ".cache", "claude-nomad");
+    const cacheDir = join30(homedir5(), ".cache", "claude-nomad");
     mkdirSync5(cacheDir, { recursive: true });
     const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes2(4).toString("hex")}`;
-    tmpRoot = join29(cacheDir, `check-shared-skills-tree-${stamp}`);
+    tmpRoot = join30(cacheDir, `check-shared-skills-tree-${stamp}`);
     mkdirSync5(tmpRoot, { recursive: true, mode: 448 });
     const { staged, incomplete } = buildSkillScanTree(tmpRoot);
     if (incomplete) {
@@ -4480,8 +4617,8 @@ init_config();
 
 // src/remap.ts
 init_config_sharedDirs_guard();
-import { cpSync as cpSync5, existsSync as existsSync22, lstatSync as lstatSync13, mkdirSync as mkdirSync7, readdirSync as readdirSync11, rmSync as rmSync11, statSync as statSync5 } from "node:fs";
-import { dirname as dirname7, join as join31, relative as relative6, sep as sep5 } from "node:path";
+import { cpSync as cpSync5, existsSync as existsSync21, lstatSync as lstatSync13, mkdirSync as mkdirSync7, readdirSync as readdirSync11, rmSync as rmSync11, statSync as statSync6 } from "node:fs";
+import { dirname as dirname7, join as join32, relative as relative6, sep as sep5 } from "node:path";
 init_config();
 
 // src/push-manifest.ts
@@ -4489,8 +4626,8 @@ init_config();
 init_push_gitleaks_config();
 init_utils_fs();
 import { createHash } from "node:crypto";
-import { existsSync as existsSync21, mkdirSync as mkdirSync6, readdirSync as readdirSync10, readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
-import { dirname as dirname6, join as join30 } from "node:path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync6, readdirSync as readdirSync10, readFileSync as readFileSync7, statSync as statSync5 } from "node:fs";
+import { dirname as dirname6, join as join31 } from "node:path";
 function isChanged(prev, cur, hash) {
   if (prev === void 0) return true;
   if (prev.size !== cur.size) return true;
@@ -4531,8 +4668,8 @@ function hashFile(absPath) {
 }
 function enumerateDir(dir, results) {
   for (const entry of readdirSync10(dir)) {
-    const fullPath = join30(dir, entry);
-    const st = statSync4(fullPath);
+    const fullPath = join31(dir, entry);
+    const st = statSync5(fullPath);
     if (st.isDirectory()) {
       enumerateDir(fullPath, results);
     } else {
@@ -4543,8 +4680,8 @@ function enumerateDir(dir, results) {
 function enumerateSourceFiles(projectDir) {
   const results = [];
   for (const entry of readdirSync10(projectDir)) {
-    const fullPath = join30(projectDir, entry);
-    const st = statSync4(fullPath);
+    const fullPath = join31(projectDir, entry);
+    const st = statSync5(fullPath);
     if (st.isDirectory()) {
       enumerateDir(fullPath, results);
     } else if (fullPath.endsWith(".jsonl")) {
@@ -4555,15 +4692,15 @@ function enumerateSourceFiles(projectDir) {
 }
 function fileIdentity(p) {
   if (p === null) return "none::absent";
-  if (!existsSync21(p)) return `${p}::absent`;
+  if (!existsSync20(p)) return `${p}::absent`;
   return `${p}::${createHash("sha256").update(readFileSync7(p)).digest("hex")}`;
 }
 function computeConfigHash() {
   const repo = repoHome();
   const parts = [
     fileIdentity(resolveTomlPath(repo)),
-    fileIdentity(join30(repo, ".gitleaks.overlay.toml")),
-    fileIdentity(join30(repo, ".gitleaksignore"))
+    fileIdentity(join31(repo, ".gitleaks.overlay.toml")),
+    fileIdentity(join31(repo, ".gitleaksignore"))
   ];
   return createHash("sha256").update(parts.join("\n")).digest("hex");
 }
@@ -4625,12 +4762,12 @@ function applySelective(sel, localDir, repoDst) {
   const prefix = `${localDir}${sep5}`;
   for (const src of sel.changed) {
     if (!src.startsWith(prefix)) continue;
-    copyFileAtomic(src, join31(repoDst, relative6(localDir, src)));
+    copyFileAtomic(src, join32(repoDst, relative6(localDir, src)));
   }
   for (const src of sel.deleted) {
     if (!src.startsWith(prefix)) continue;
-    const dst = join31(repoDst, relative6(localDir, src));
-    if (existsSync22(dst)) rmSync11(dst);
+    const dst = join32(repoDst, relative6(localDir, src));
+    if (existsSync21(dst)) rmSync11(dst);
   }
 }
 function copyDirJsonlOnly(src, dst) {
@@ -4641,7 +4778,7 @@ function copyDirJsonlOnly(src, dst) {
       const rel = relative6(src, srcPath);
       if (rel === "") return true;
       if (rel.split(sep5).length > 1) return true;
-      if (statSync5(srcPath).isDirectory()) return true;
+      if (statSync6(srcPath).isDirectory()) return true;
       if (srcPath.endsWith(".jsonl")) return true;
       item(`skip ${rel}: extension not in allowlist`);
       return false;
@@ -4659,15 +4796,15 @@ function remapPull(ts, opts = {}) {
   const wouldPull = [];
   const repo = repoHome();
   const claude = claudeHome();
-  const mapPath = join31(repo, "path-map.json");
-  const repoProjects = join31(repo, "shared", "projects");
-  if (!existsSync22(mapPath) || !existsSync22(repoProjects)) {
+  const mapPath = join32(repo, "path-map.json");
+  const repoProjects = join32(repo, "shared", "projects");
+  if (!existsSync21(mapPath) || !existsSync21(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 = readPathMap(mapPath);
-  const localProjects = join31(claude, "projects");
+  const localProjects = join32(claude, "projects");
   if (!dryRun) mkdirSync7(localProjects, { recursive: true });
   for (const [logical, hosts] of Object.entries(map.projects)) {
     assertSafeLogical(logical);
@@ -4677,9 +4814,9 @@ function remapPull(ts, opts = {}) {
       continue;
     }
     assertSafeLocalRoot(localPath, logical);
-    const src = join31(repoProjects, logical);
-    if (!existsSync22(src)) continue;
-    const dst = join31(localProjects, encodePath(localPath));
+    const src = join32(repoProjects, logical);
+    if (!existsSync21(src)) continue;
+    const dst = join32(localProjects, encodePath(localPath));
     if (dryRun) {
       wouldPull.push(logical);
       emitPreview(
@@ -4698,8 +4835,8 @@ function remapPull(ts, opts = {}) {
 function countLocalOnly(src, dst) {
   let count = 0;
   for (const name of readdirSync11(dst)) {
-    const dstPath = join31(dst, name);
-    const srcPath = join31(src, name);
+    const dstPath = join32(dst, name);
+    const srcPath = join32(src, name);
     if (lstatSync13(dstPath).isDirectory()) {
       count += countLocalOnly(srcPath, dstPath);
     } else if (lstatSync13(srcPath, { throwIfNoEntry: false }) === void 0) {
@@ -4711,20 +4848,20 @@ function countLocalOnly(src, dst) {
 function scanLocalOnly() {
   const repo = repoHome();
   const claude = claudeHome();
-  const mapPath = join31(repo, "path-map.json");
-  const repoProjects = join31(repo, "shared", "projects");
-  if (!existsSync22(mapPath) || !existsSync22(repoProjects)) return 0;
+  const mapPath = join32(repo, "path-map.json");
+  const repoProjects = join32(repo, "shared", "projects");
+  if (!existsSync21(mapPath) || !existsSync21(repoProjects)) return 0;
   const map = readPathMap(mapPath);
-  const localProjects = join31(claude, "projects");
+  const localProjects = join32(claude, "projects");
   let count = 0;
   for (const [logical, hosts] of Object.entries(map.projects)) {
     assertSafeLogical(logical);
     const localPath = hosts[HOST];
     if (!localPath || localPath === "TBD") continue;
     assertSafeLocalRoot(localPath, logical);
-    const dst = join31(localProjects, encodePath(localPath));
-    if (!existsSync22(dst)) continue;
-    count += countLocalOnly(join31(repoProjects, logical), dst);
+    const dst = join32(localProjects, encodePath(localPath));
+    if (!existsSync21(dst)) continue;
+    count += countLocalOnly(join32(repoProjects, logical), dst);
   }
   return count;
 }
@@ -4759,16 +4896,16 @@ function remapPush(ts, opts = {}) {
   const wouldPush = [];
   const repo = repoHome();
   const claude = claudeHome();
-  const mapPath = join31(repo, "path-map.json");
-  if (!existsSync22(mapPath)) {
+  const mapPath = join32(repo, "path-map.json");
+  if (!existsSync21(mapPath)) {
     log("no path-map.json; skipping session export");
     return { unmapped: 0, collisions: 0, pushed, wouldPush };
   }
   const map = readPathMap(mapPath);
-  const localProjects = join31(claude, "projects");
-  const repoProjects = join31(repo, "shared", "projects");
+  const localProjects = join32(claude, "projects");
+  const repoProjects = join32(repo, "shared", "projects");
   const reverse = buildReverseMap(map);
-  if (!existsSync22(localProjects)) return { unmapped, collisions: 0, pushed, wouldPush };
+  if (!existsSync21(localProjects)) return { unmapped, collisions: 0, pushed, wouldPush };
   if (!dryRun) mkdirSync7(repoProjects, { recursive: true });
   for (const dir of readdirSync11(localProjects)) {
     if (dir.endsWith(TMP_SUFFIX)) continue;
@@ -4777,8 +4914,8 @@ function remapPush(ts, opts = {}) {
       unmapped++;
       continue;
     }
-    const localDir = join31(localProjects, dir);
-    const repoDst = join31(repoProjects, logical);
+    const localDir = join32(localProjects, dir);
+    const repoDst = join32(repoProjects, logical);
     if (skipForSelection(opts.selection, localDir)) continue;
     if (dryRun) {
       wouldPush.push(logical);
@@ -4802,8 +4939,8 @@ function buildScanTree(tmpRoot) {
   const logicalToEncoded = /* @__PURE__ */ new Map();
   let staged = 0;
   const repo = repoHome();
-  const mapPath = join32(repo, "path-map.json");
-  if (!existsSync23(mapPath)) return { logicalToEncoded, staged, malformed: false };
+  const mapPath = join33(repo, "path-map.json");
+  if (!existsSync22(mapPath)) return { logicalToEncoded, staged, malformed: false };
   let map;
   try {
     map = readJson(mapPath);
@@ -4820,12 +4957,12 @@ function buildScanTree(tmpRoot) {
     if (!p || p === "TBD") continue;
     reverse.set(encodePath(p), logical);
   }
-  const localProjects = join32(claudeHome(), "projects");
-  if (!existsSync23(localProjects)) return { logicalToEncoded, staged, malformed: false };
+  const localProjects = join33(claudeHome(), "projects");
+  if (!existsSync22(localProjects)) return { logicalToEncoded, staged, malformed: false };
   for (const dir of readdirSync12(localProjects)) {
     const logical = reverse.get(dir);
     if (!logical) continue;
-    copyDirJsonlOnly(join32(localProjects, dir), join32(tmpRoot, "shared", "projects", logical));
+    copyDirJsonlOnly(join33(localProjects, dir), join33(tmpRoot, "shared", "projects", logical));
     logicalToEncoded.set(logical, dir);
     staged++;
   }
@@ -4855,11 +4992,11 @@ function ensureGitleaksReady(section2, gitleaksReady) {
   return true;
 }
 function runLocalPreviewScan(section2) {
-  const cacheDir = join32(homedir6(), ".cache", "claude-nomad");
+  const cacheDir = join33(homedir6(), ".cache", "claude-nomad");
   mkdirSync8(cacheDir, { recursive: true });
   const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes3(4).toString("hex")}`;
-  const reportPath = join32(cacheDir, `check-shared-${stamp}.json`);
-  const tmpRoot = join32(cacheDir, `check-shared-tree-${stamp}`);
+  const reportPath = join33(cacheDir, `check-shared-${stamp}.json`);
+  const tmpRoot = join33(cacheDir, `check-shared-tree-${stamp}`);
   try {
     const { logicalToEncoded, staged, malformed } = buildScanTree(tmpRoot);
     if (malformed) {
@@ -4892,8 +5029,8 @@ function reportCheckShared(section2, gitleaksReady) {
 
 // src/commands.doctor.checks.hooks.scope.ts
 init_color();
-import { existsSync as existsSync24, readFileSync as readFileSync8, readdirSync as readdirSync13, realpathSync as realpathSync3 } from "node:fs";
-import { dirname as dirname8, extname, join as join33 } from "node:path";
+import { existsSync as existsSync23, readFileSync as readFileSync8, readdirSync as readdirSync13, realpathSync as realpathSync3 } from "node:fs";
+import { dirname as dirname8, extname, join as join34 } from "node:path";
 init_config();
 function typeFromPackageJson(pkgPath) {
   try {
@@ -4915,8 +5052,8 @@ function effectiveType(hookPath) {
   }
   let dir = dirname8(real);
   for (; ; ) {
-    const pkg = join33(dir, "package.json");
-    if (existsSync24(pkg)) return typeFromPackageJson(pkg);
+    const pkg = join34(dir, "package.json");
+    if (existsSync23(pkg)) return typeFromPackageJson(pkg);
     const parent = dirname8(dir);
     if (parent === dir) return "cjs";
     dir = parent;
@@ -4958,15 +5095,15 @@ function safeRead(path) {
   }
 }
 function reportHookScopeCheck(section2) {
-  const hooksDir = join33(claudeHome(), "hooks");
-  if (!existsSync24(hooksDir)) {
+  const hooksDir = join34(claudeHome(), "hooks");
+  if (!existsSync23(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 = join33(hooksDir, name);
+    const abs = join34(hooksDir, name);
     const eff = effectiveType(abs);
     if (eff === null) continue;
     const src = safeRead(abs);
@@ -4986,8 +5123,8 @@ function reportHookScopeCheck(section2) {
 
 // src/commands.doctor.checks.hooks.ts
 init_color();
-import { existsSync as existsSync25 } from "node:fs";
-import { join as join34 } from "node:path";
+import { existsSync as existsSync24 } from "node:fs";
+import { join as join35 } from "node:path";
 init_config();
 function expandHome(token) {
   const h2 = home();
@@ -5030,7 +5167,7 @@ function checkEventGroups(section2, event, groups) {
   for (const group of groups) {
     for (const cmd of commandsFromGroup(group)) {
       for (const resolved of claudePathsIn(cmd)) {
-        if (existsSync25(resolved)) continue;
+        if (existsSync24(resolved)) continue;
         addItem(
           section2,
           `${red(failGlyph)} hooks/${event}: command target missing: ${resolved} (run nomad pull)`
@@ -5043,8 +5180,8 @@ function checkEventGroups(section2, event, groups) {
   return anyFail;
 }
 function reportHooksTargetCheck(section2) {
-  const settingsPath = join34(claudeHome(), "settings.json");
-  if (!existsSync25(settingsPath)) {
+  const settingsPath = join35(claudeHome(), "settings.json");
+  if (!existsSync24(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json; skipping hook target check`);
     return;
   }
@@ -5067,12 +5204,12 @@ function reportHooksTargetCheck(section2) {
 
 // src/commands.doctor.checks.hooks.preserve-symlinks.ts
 init_color();
-import { existsSync as existsSync27, readFileSync as readFileSync9 } from "node:fs";
-import { join as join36 } from "node:path";
+import { existsSync as existsSync26, readFileSync as readFileSync9 } from "node:fs";
+import { join as join37 } from "node:path";
 
 // src/commands.doctor.checks.hooks.preserve-symlinks.probe.ts
-import { closeSync as closeSync3, existsSync as existsSync26, openSync as openSync3, readSync, realpathSync as realpathSync4 } from "node:fs";
-import { dirname as dirname9, join as join35, resolve as resolve3 } from "node:path";
+import { closeSync as closeSync3, existsSync as existsSync25, openSync as openSync3, readSync, realpathSync as realpathSync4 } from "node:fs";
+import { dirname as dirname9, join as join36, resolve as resolve3 } from "node:path";
 function suppressedRanges(src) {
   const ranges = [];
   const re = /\/\*[\s\S]*?\*\/|\/\/[^\n]*|'[^']*'|"[^"]*"|`[^`]*`/g;
@@ -5104,12 +5241,12 @@ function topRelativeSpecifiers(src) {
 }
 function specifierIsMissing(specifier, baseDir) {
   const base = resolve3(baseDir, specifier);
-  if (existsSync26(base)) return false;
+  if (existsSync25(base)) return false;
   for (const ext of [".js", ".cjs", ".mjs"]) {
-    if (existsSync26(base + ext)) return false;
+    if (existsSync25(base + ext)) return false;
   }
   for (const idx of ["index.js", "index.cjs", "index.mjs"]) {
-    if (existsSync26(join35(base, idx))) return false;
+    if (existsSync25(join36(base, idx))) return false;
   }
   return true;
 }
@@ -5164,8 +5301,8 @@ function commandTokens(command) {
   return tokens;
 }
 function readPathMapSafe() {
-  const mapPath = join36(repoHome(), "path-map.json");
-  if (!existsSync27(mapPath)) return { projects: {} };
+  const mapPath = join37(repoHome(), "path-map.json");
+  if (!existsSync26(mapPath)) return { projects: {} };
   try {
     return JSON.parse(readFileSync9(mapPath, "utf8"));
   } catch {
@@ -5239,8 +5376,8 @@ function checkEventForPreserveSymlinks(section2, event, groups, sharedLinkNames)
   return anyWarn;
 }
 function reportPreserveSymlinksCheck(section2) {
-  const settingsPath = join36(claudeHome(), "settings.json");
-  if (!existsSync27(settingsPath)) {
+  const settingsPath = join37(claudeHome(), "settings.json");
+  if (!existsSync26(settingsPath)) {
     addItem(
       section2,
       `${dim(infoGlyph)} no ~/.claude/settings.json; skipping preserve-symlinks-main check`
@@ -5273,8 +5410,8 @@ function reportPreserveSymlinksCheck(section2) {
 
 // src/commands.doctor.checks.settings-drift.ts
 init_color();
-import { existsSync as existsSync28, readFileSync as readFileSync10 } from "node:fs";
-import { join as join37 } from "node:path";
+import { existsSync as existsSync27, readFileSync as readFileSync10 } from "node:fs";
+import { join as join38 } from "node:path";
 init_config();
 init_utils_json();
 function diffMergedSettings(merged, settings) {
@@ -5292,7 +5429,7 @@ function tryReadJson(filePath) {
   }
 }
 function reportHooksBaseSelfCleanNote(section2) {
-  const basePath = join37(repoHome(), "shared", "settings.base.json");
+  const basePath = join38(repoHome(), "shared", "settings.base.json");
   const base = tryReadJson(basePath);
   if (base === null) return;
   if (!baseHasGsdHookEntries(base)) return;
@@ -5305,14 +5442,14 @@ function reportSettingsDriftCheck(section2) {
   const claude = claudeHome();
   const repo = repoHome();
   const host = HOST;
-  const settingsPath = join37(claude, "settings.json");
-  const basePath = join37(repo, "shared", "settings.base.json");
-  const hostPath = join37(repo, "hosts", `${host}.json`);
-  if (!existsSync28(settingsPath)) {
+  const settingsPath = join38(claude, "settings.json");
+  const basePath = join38(repo, "shared", "settings.base.json");
+  const hostPath = join38(repo, "hosts", `${host}.json`);
+  if (!existsSync27(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json; skipping merge-drift check`);
     return;
   }
-  if (!existsSync28(basePath)) {
+  if (!existsSync27(basePath)) {
     addItem(
       section2,
       `${dim(infoGlyph)} shared/settings.base.json missing; skipping merge-drift check`
@@ -5331,7 +5468,7 @@ function reportSettingsDriftCheck(section2) {
   if (settings === null) {
     return;
   }
-  const hostExists = existsSync28(hostPath);
+  const hostExists = existsSync27(hostPath);
   const hostObj = hostExists ? tryReadJson(hostPath) : null;
   if (hostExists && hostObj === null) {
     addItem(
@@ -5548,15 +5685,15 @@ function reportSyncModality(section2) {
 // src/commands.doctor.checks.crlf.ts
 init_color();
 import { execFileSync as execFileSync13 } from "node:child_process";
-import { existsSync as existsSync29, readFileSync as readFileSync13 } from "node:fs";
-import { join as join38 } from "node:path";
+import { existsSync as existsSync28, readFileSync as readFileSync13 } from "node:fs";
+import { join as join39 } from "node:path";
 init_config();
 var PROBE_TIMEOUT_MS2 = 3e3;
 var GUARD_LINE = /^\*\s+-text\b/;
 function hasGitattributesGuard(repo) {
   try {
-    const path = join38(repo, ".gitattributes");
-    if (!existsSync29(path)) return false;
+    const path = join39(repo, ".gitattributes");
+    if (!existsSync28(path)) return false;
     const content = readFileSync13(path, "utf8");
     return content.split("\n").map((line) => line.trim()).some((line) => line !== "" && !line.startsWith("#") && GUARD_LINE.test(line));
   } catch {
@@ -5597,14 +5734,14 @@ function reportCrlfGuardCheck(section2, run = execFileSync13) {
 
 // src/spinner.ts
 init_color();
-import { existsSync as existsSync34 } 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 readFileSync18, rmSync as rmSync15, writeFileSync as writeFileSync9 } from "node:fs";
-import { join as join46 } from "node:path";
+import { join as join47 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 
 // src/commands.push.recovery.actions.ts
@@ -5621,10 +5758,10 @@ import {
   mkdirSync as mkdirSync9,
   readFileSync as readFileSync14,
   realpathSync as realpathSync5,
-  statSync as statSync6,
+  statSync as statSync7,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { dirname as dirname10, join as join39, sep as sep6 } from "node:path";
+import { dirname as dirname10, join as join40, sep as sep6 } from "node:path";
 init_push_gitleaks_scan();
 
 // src/rel-path-guard.ts
@@ -5653,15 +5790,15 @@ function resolveMemoryLocalPath(logical, relPath, map) {
   if (!isSafeRelPath(relPath)) return null;
   const abs = map.projects[logical]?.[HOST];
   if (abs === void 0) return null;
-  const memoryRoot = join39(claudeHome(), "projects", encodePath(abs), "memory");
-  const localPath = join39(memoryRoot, ...relPath.split("/"));
+  const memoryRoot = join40(claudeHome(), "projects", encodePath(abs), "memory");
+  const localPath = join40(memoryRoot, ...relPath.split("/"));
   if (localPath !== memoryRoot && !localPath.startsWith(memoryRoot + sep6)) return null;
   try {
     if (lstatSync14(localPath).isSymbolicLink()) return null;
     const realLocal = realpathSync5(localPath);
     const realRoot = realpathSync5(memoryRoot);
     if (!realLocal.startsWith(realRoot + sep6)) return null;
-    if (!statSync6(realLocal).isFile()) return null;
+    if (!statSync7(realLocal).isFile()) return null;
   } catch {
     return null;
   }
@@ -5708,7 +5845,7 @@ function applyMemoryRedact(f, ts, map, scan = scanFile) {
     );
   }
   writeFileSync6(localPath, after, "utf8");
-  const dest = join39(repoHome(), "shared", "projects", logical, "memory", ...relPath.split("/"));
+  const dest = join40(repoHome(), "shared", "projects", logical, "memory", ...relPath.split("/"));
   mkdirSync9(dirname10(dest), { recursive: true });
   cpSync6(localPath, dest, { force: true });
   return true;
@@ -5722,15 +5859,15 @@ import {
   mkdirSync as mkdirSync11,
   readFileSync as readFileSync15,
   realpathSync as realpathSync6,
-  statSync as statSync7,
+  statSync as statSync8,
   writeFileSync as writeFileSync7
 } from "node:fs";
-import { dirname as dirname11, join as join41, sep as sep7 } from "node:path";
+import { dirname as dirname11, join as join42, sep as sep7 } from "node:path";
 
 // src/skills-sync.ts
 init_config();
-import { existsSync as existsSync30, lstatSync as lstatSync15, mkdirSync as mkdirSync10, readdirSync as readdirSync14, rmSync as rmSync13 } from "node:fs";
-import { join as join40 } from "node:path";
+import { existsSync as existsSync29, lstatSync as lstatSync15, mkdirSync as mkdirSync10, readdirSync as readdirSync14, rmSync as rmSync13 } from "node:fs";
+import { join as join41 } from "node:path";
 
 // src/skills-sync.tracked.ts
 init_utils();
@@ -5765,9 +5902,9 @@ function copySkillsPull(src, dst, isRootPreserved) {
   copyExtrasFilteredPreservingBy(src, dst, isSkillExcluded, isRootPreserved);
 }
 function syncSkillsPull(ts, prePostHeads) {
-  const sharedSkills = join40(repoHome(), "shared", "skills");
-  if (!existsSync30(sharedSkills)) return;
-  const localSkills = join40(claudeHome(), "skills");
+  const sharedSkills = join41(repoHome(), "shared", "skills");
+  if (!existsSync29(sharedSkills)) return;
+  const localSkills = join41(claudeHome(), "skills");
   backupBeforeWrite(localSkills, ts);
   const dstStat = lstatSync15(localSkills, { throwIfNoEntry: false });
   if (dstStat?.isSymbolicLink() === true) {
@@ -5778,11 +5915,11 @@ function syncSkillsPull(ts, prePostHeads) {
   copySkillsPull(sharedSkills, localSkills, (name) => !tracked.has(name));
 }
 function syncSkillsPush() {
-  const localSkills = join40(claudeHome(), "skills");
+  const localSkills = join41(claudeHome(), "skills");
   const stat = lstatSync15(localSkills, { throwIfNoEntry: false });
   if (stat === void 0) return;
   if (stat.isSymbolicLink()) return;
-  const sharedSkills = join40(repoHome(), "shared", "skills");
+  const sharedSkills = join41(repoHome(), "shared", "skills");
   copySkillsPush(localSkills, sharedSkills);
 }
 
@@ -5805,16 +5942,16 @@ function resolveSkillLocalPath(name, relPath) {
   if (!SAFE_SKILL_NAME.test(name) || name === "." || name === "..") return null;
   if (isGsdOwned(name)) return null;
   if (!isSafeRelPath(relPath)) return null;
-  const skillsRoot = join41(claudeHome(), "skills");
-  const skillRoot = join41(skillsRoot, name);
-  const localPath = join41(skillRoot, ...relPath.split("/"));
+  const skillsRoot = join42(claudeHome(), "skills");
+  const skillRoot = join42(skillsRoot, name);
+  const localPath = join42(skillRoot, ...relPath.split("/"));
   if (localPath !== skillRoot && !localPath.startsWith(skillRoot + sep7)) return null;
   try {
     if (lstatSync16(localPath).isSymbolicLink()) return null;
     const realLocal = realpathSync6(localPath);
     const realRoot = realpathSync6(skillsRoot);
     if (!realLocal.startsWith(realRoot + sep7)) return null;
-    if (!statSync7(realLocal).isFile()) return null;
+    if (!statSync8(realLocal).isFile()) return null;
   } catch {
     return null;
   }
@@ -5859,7 +5996,7 @@ function applySkillRedact(f, ts, scan = scanFile) {
     );
   }
   writeFileSync7(localPath, after, "utf8");
-  const dest = join41(repoHome(), "shared", "skills", name, ...relPath.split("/"));
+  const dest = join42(repoHome(), "shared", "skills", name, ...relPath.split("/"));
   mkdirSync11(dirname11(dest), { recursive: true });
   cpSync7(localPath, dest, { force: true });
   return true;
@@ -5937,25 +6074,25 @@ function applyDeferredAllows(findings, state, repo) {
 // src/commands.push.recovery.redact.ts
 init_config();
 init_config_sharedDirs_guard();
-import { cpSync as cpSync8, existsSync as existsSync33, mkdirSync as mkdirSync12 } from "node:fs";
-import { dirname as dirname13, join as join44, sep as sep8 } from "node:path";
+import { cpSync as cpSync8, existsSync as existsSync32, mkdirSync as mkdirSync12 } from "node:fs";
+import { dirname as dirname13, join as join45, sep as sep8 } from "node:path";
 
 // src/commands.redact.ts
 init_config();
-import { existsSync as existsSync32 } from "node:fs";
-import { dirname as dirname12, join as join43 } from "node:path";
+import { existsSync as existsSync31 } from "node:fs";
+import { dirname as dirname12, join as join44 } from "node:path";
 
 // src/commands.redact.subtree.ts
-import { existsSync as existsSync31, lstatSync as lstatSync17, readFileSync as readFileSync16, readdirSync as readdirSync15, statSync as statSync8, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join42 } from "node:path";
+import { existsSync as existsSync30, lstatSync as lstatSync17, readFileSync as readFileSync16, readdirSync as readdirSync15, statSync as statSync9, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join43 } from "node:path";
 init_utils_fs();
 init_utils();
 function collectFiles(dir, out) {
-  if (!existsSync31(dir)) return;
+  if (!existsSync30(dir)) return;
   const st = lstatSync17(dir);
   if (!st.isDirectory()) return;
   for (const entry of readdirSync15(dir)) {
-    const abs = join42(dir, entry);
+    const abs = join43(dir, entry);
     const lst = lstatSync17(abs);
     if (lst.isSymbolicLink()) continue;
     if (lst.isDirectory()) {
@@ -5970,7 +6107,7 @@ function listSubtreeFiles(sessionDir) {
   collectFiles(sessionDir, out);
   return out.sort((a, b) => a.localeCompare(b));
 }
-function newestSubtreeMtimeMs(mainPath, subtreeFiles, statMtime = (p) => statSync8(p).mtimeMs) {
+function newestSubtreeMtimeMs(mainPath, subtreeFiles, statMtime = (p) => statSync9(p).mtimeMs) {
   let newest = statMtime(mainPath);
   for (const filePath of subtreeFiles) {
     const t = statMtime(filePath);
@@ -5979,7 +6116,7 @@ function newestSubtreeMtimeMs(mainPath, subtreeFiles, statMtime = (p) => statSyn
   return newest;
 }
 function isSubtreeActive(mainPath, subtreeFiles, now) {
-  const subtreeMtime = newestSubtreeMtimeMs(mainPath, subtreeFiles, (p) => statSync8(p).mtimeMs);
+  const subtreeMtime = newestSubtreeMtimeMs(mainPath, subtreeFiles, (p) => statSync9(p).mtimeMs);
   return isRecentlyModified(subtreeMtime, now);
 }
 function applySubtreeRedactions(mainPath, mainFindings, subtreeFiles, rule, ts, scan, dryRun) {
@@ -6065,15 +6202,15 @@ init_utils_json();
 init_utils();
 function resolveLiveTranscript(id) {
   try {
-    const mapPath = join43(repoHome(), "path-map.json");
-    if (!existsSync32(mapPath)) return null;
+    const mapPath = join44(repoHome(), "path-map.json");
+    if (!existsSync31(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 = join43(claude, "projects", encodePath(abs), `${id}.jsonl`);
-      if (existsSync32(live)) return live;
+      const live = join44(claude, "projects", encodePath(abs), `${id}.jsonl`);
+      if (existsSync31(live)) return live;
     }
     return null;
   } catch {
@@ -6093,17 +6230,17 @@ function cmdRedact(opts, nowMs = Date.now, scan = scanFile) {
   }
   const repo = repoHome();
   const backup = backupBase();
-  if (!existsSync32(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync31(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("redact");
   if (handle === null) process.exit(0);
   try {
     const localPath = resolveLiveTranscript(id);
-    if (localPath === null || !existsSync32(localPath)) {
+    if (localPath === null || !existsSync31(localPath)) {
       fail(`could not resolve local transcript for session ${id} on this host`);
       process.exitCode = 1;
       return;
     }
-    const sessionDir = join43(dirname12(localPath), id);
+    const sessionDir = join44(dirname12(localPath), id);
     const subtreeFiles = listSubtreeFiles(sessionDir);
     if (isSubtreeActive(localPath, subtreeFiles, nowMs())) {
       log(
@@ -6164,8 +6301,8 @@ function resolveStagedDir(localPath, map, claude, repo) {
     assertSafeLogical(logical);
     const abs = hostMap[HOST];
     if (abs === void 0) continue;
-    if (localPath.startsWith(join44(claude, "projects", encodePath(abs)) + sep8)) {
-      return join44(repo, "shared", "projects", logical);
+    if (localPath.startsWith(join45(claude, "projects", encodePath(abs)) + sep8)) {
+      return join45(repo, "shared", "projects", logical);
     }
   }
   return null;
@@ -6175,7 +6312,7 @@ function preflightRedactable(f, map, nowMs) {
   if (sid === null) return "a finding has no resolvable session id (not a session transcript)";
   const localPath = resolveLiveTranscript(sid);
   if (localPath === null) return `session ${sid}: local transcript not found`;
-  const sessionDir = join44(dirname13(localPath), sid);
+  const sessionDir = join45(dirname13(localPath), sid);
   const subtreeFiles = listSubtreeFiles(sessionDir);
   if (isSubtreeActive(localPath, subtreeFiles, nowMs())) {
     return `session ${sid}: looks active (modified within the last 5 minutes)`;
@@ -6204,7 +6341,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 = join44(dirname13(localPath), sid);
+  const sessionDir = join45(dirname13(localPath), sid);
   const subtreeFiles = listSubtreeFiles(sessionDir);
   if (isSubtreeActive(localPath, subtreeFiles, nowMs())) {
     return refuse(
@@ -6237,9 +6374,9 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
     );
   }
   mkdirSync12(stagedProjectDir, { recursive: true });
-  cpSync8(localPath, join44(stagedProjectDir, `${sid}.jsonl`), { force: true });
-  if (existsSync33(sessionDir)) {
-    cpSync8(sessionDir, join44(stagedProjectDir, sid), { force: true, recursive: true });
+  cpSync8(localPath, join45(stagedProjectDir, `${sid}.jsonl`), { force: true });
+  if (existsSync32(sessionDir)) {
+    cpSync8(sessionDir, join45(stagedProjectDir, sid), { force: true, recursive: true });
   }
   return true;
 }
@@ -6247,14 +6384,14 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
 // src/commands.push.recovery.drop.ts
 init_config();
 import { rmSync as rmSync14 } from "node:fs";
-import { join as join45 } from "node:path";
+import { join as join46 } 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 = join45(repo, "shared", "projects", logical, `${sid}.jsonl`);
-    const dir = join45(repo, "shared", "projects", logical, sid);
+    const jsonl = join46(repo, "shared", "projects", logical, `${sid}.jsonl`);
+    const dir = join46(repo, "shared", "projects", logical, sid);
     rmSync14(jsonl, { force: true });
     rmSync14(dir, { recursive: true, force: true });
   }
@@ -6739,7 +6876,7 @@ function applyThenRescan(scanVerdict, repoHome2) {
   return next;
 }
 function allowThenRescan(append, scanVerdict, repoHome2) {
-  const ignPath = join46(repoHome2, ".gitleaksignore");
+  const ignPath = join47(repoHome2, ".gitleaksignore");
   let before;
   try {
     before = readFileSync18(ignPath, "utf8");
@@ -6845,7 +6982,7 @@ function writeAnimatedDone(out, label, ms, useTTY) {
 `);
 }
 function resolveWorkerPath(deps = {}) {
-  const check = deps.existsSyncFn ?? existsSync34;
+  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;
@@ -6912,8 +7049,8 @@ function withSpinner(label, fn, deps) {
 // src/commands.doctor.gitleaks-version.ts
 init_color();
 import { execFileSync as execFileSync15 } from "node:child_process";
-import { existsSync as existsSync35 } from "node:fs";
-import { join as join47 } from "node:path";
+import { existsSync as existsSync34 } from "node:fs";
+import { join as join48 } from "node:path";
 init_config();
 var SEMVER_MAJOR_MINOR = /^(\d+)\.(\d+)\.\d+$/;
 var GITLEAKS_TIMEOUT_MS = 5e3;
@@ -6922,7 +7059,7 @@ function majorMinorOf(value) {
   return m === null ? null : [m[1], m[2]];
 }
 function readGitleaksVersion(run, tomlExists) {
-  const tomlPath = join47(repoHome(), ".gitleaks.toml");
+  const tomlPath = join48(repoHome(), ".gitleaks.toml");
   const args = ["version"];
   if (tomlExists(tomlPath)) args.push("--config", tomlPath);
   try {
@@ -6934,7 +7071,7 @@ function readGitleaksVersion(run, tomlExists) {
     return null;
   }
 }
-function reportGitleaksVersionCheck(section2, run = execFileSync15, tomlExists = existsSync35) {
+function reportGitleaksVersionCheck(section2, run = execFileSync15, tomlExists = existsSync34) {
   const raw = readGitleaksVersion(run, tomlExists);
   if (raw === null) return;
   const local = majorMinorOf(raw);
@@ -7191,8 +7328,8 @@ function gatherDoctorSections(opts) {
   reportLongPathsCheck(host);
   reportCrlfGuardCheck(host);
   const links = section("Shared links");
-  const mapPath = join48(repoHome(), "path-map.json");
-  const rawMap = existsSync36(mapPath) ? readJsonSafe(mapPath, mapPath, links) : null;
+  const mapPath = join49(repoHome(), "path-map.json");
+  const rawMap = existsSync35(mapPath) ? readJsonSafe(mapPath, mapPath, links) : null;
   const map = rawMap ?? { projects: {} };
   reportSharedLinks(links, map);
   reportDroppedNamesMigration(links);
@@ -7290,8 +7427,8 @@ function parseDoctorArgs(args) {
 // src/commands.drop-session.ts
 init_config();
 import { execFileSync as execFileSync20 } from "node:child_process";
-import { existsSync as existsSync38, readdirSync as readdirSync16, statSync as statSync9 } from "node:fs";
-import { join as join50, relative as relative7 } from "node:path";
+import { existsSync as existsSync37, readdirSync as readdirSync16, statSync as statSync10 } from "node:fs";
+import { join as join51, relative as relative7 } from "node:path";
 
 // src/commands.drop-session.git.ts
 import { execFileSync as execFileSync19 } from "node:child_process";
@@ -7334,8 +7471,8 @@ function isInIndex(rel, repo) {
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync37 } from "node:fs";
-import { join as join49 } from "node:path";
+import { existsSync as existsSync36 } from "node:fs";
+import { join as join50 } from "node:path";
 var SHARED_PROJECT_LOGICAL = /^shared\/projects\/([^/]+)\//;
 function reportScrubHint(id, matches) {
   const live = resolveLiveTranscript2(id, matches);
@@ -7351,8 +7488,8 @@ function reportScrubHint(id, matches) {
 }
 function resolveLiveTranscript2(id, matches) {
   try {
-    const mapPath = join49(repoHome(), "path-map.json");
-    if (!existsSync37(mapPath)) return null;
+    const mapPath = join50(repoHome(), "path-map.json");
+    if (!existsSync36(mapPath)) return null;
     const projects = readJson(mapPath).projects;
     const claude = claudeHome();
     for (const rel of matches) {
@@ -7360,8 +7497,8 @@ function resolveLiveTranscript2(id, matches) {
       if (logical === void 0) continue;
       const abs = projects[logical]?.[HOST];
       if (abs === void 0) continue;
-      const live = join49(claude, "projects", encodePath(abs), `${id}.jsonl`);
-      if (existsSync37(live)) return live;
+      const live = join50(claude, "projects", encodePath(abs), `${id}.jsonl`);
+      if (existsSync36(live)) return live;
     }
     return null;
   } catch {
@@ -7377,12 +7514,12 @@ function cmdDropSession(id) {
     process.exit(1);
   }
   const repo = repoHome();
-  if (!existsSync38(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync37(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("drop-session");
   if (handle === null) process.exit(0);
   try {
-    const repoProjects = join50(repo, "shared", "projects");
-    if (!existsSync38(repoProjects)) {
+    const repoProjects = join51(repo, "shared", "projects");
+    if (!existsSync37(repoProjects)) {
       throw new NomadFatal(`no staged session matches ${id}`);
     }
     const matches = collectMatches(repoProjects, id, repo);
@@ -7405,12 +7542,12 @@ function cmdDropSession(id) {
 function collectMatches(repoProjects, id, repo) {
   const matches = [];
   for (const logical of readdirSync16(repoProjects)) {
-    const candidate = join50(repoProjects, logical, `${id}.jsonl`);
-    if (existsSync38(candidate)) {
+    const candidate = join51(repoProjects, logical, `${id}.jsonl`);
+    if (existsSync37(candidate)) {
       matches.push(relative7(repo, candidate));
     }
-    const dir = join50(repoProjects, logical, id);
-    if (existsSync38(dir) && statSync9(dir).isDirectory()) {
+    const dir = join51(repoProjects, logical, id);
+    if (existsSync37(dir) && statSync10(dir).isDirectory()) {
       const dirRel = relative7(repo, dir);
       const staged = expandStagedDir(dirRel, repo);
       if (staged.length > 0) matches.push(...staged);
@@ -7446,8 +7583,8 @@ function unstageOne(rel, repo) {
 
 // src/commands.pull.ts
 init_autostash_guard();
-import { existsSync as existsSync47, mkdirSync as mkdirSync14 } from "node:fs";
-import { join as join61 } from "node:path";
+import { existsSync as existsSync46, mkdirSync as mkdirSync14 } from "node:fs";
+import { join as join62 } from "node:path";
 
 // src/commands.push.sections.ts
 init_color();
@@ -7555,18 +7692,18 @@ init_config();
 
 // src/extras-sync.ts
 init_config();
-import { existsSync as existsSync40, statSync as statSync10 } from "node:fs";
-import { join as join53 } from "node:path";
+import { existsSync as existsSync39, statSync as statSync11 } from "node:fs";
+import { join as join54 } from "node:path";
 init_utils();
 init_utils_json();
 
 // src/extras-sync.remap.ts
 init_config();
-import { existsSync as existsSync39, mkdirSync as mkdirSync13, readdirSync as readdirSync17, readFileSync as readFileSync19, realpathSync as realpathSync7, rmSync as rmSync16 } from "node:fs";
-import { dirname as dirname14, join as join52, sep as sep11 } from "node:path";
+import { existsSync as existsSync38, mkdirSync as mkdirSync13, readdirSync as readdirSync17, readFileSync as readFileSync19, realpathSync as realpathSync7, rmSync as rmSync16 } from "node:fs";
+import { dirname as dirname14, join as join53, sep as sep11 } from "node:path";
 
 // src/extras-sync.planning-diff.ts
-import { join as join51, normalize as normalize2, sep as sep10 } from "node:path";
+import { join as join52, normalize as normalize2, sep as sep10 } from "node:path";
 init_utils();
 function processRecord(fields, i, changed, deleted) {
   const status = fields[i];
@@ -7618,7 +7755,7 @@ function planningDeleteTargets(opts) {
   const { deleted } = parsePlanningDiff(raw);
   const logicalPrefix = "shared/extras/" + logical + "/";
   const prefix = logicalPrefix + ".planning/";
-  const planningRoot = join51(localRoot, ".planning");
+  const planningRoot = join52(localRoot, ".planning");
   const planningRootBoundary = planningRoot + sep10;
   const targets = [];
   for (const repoPath of deleted) {
@@ -7626,7 +7763,7 @@ function planningDeleteTargets(opts) {
       continue;
     }
     const remainder = repoPath.slice(logicalPrefix.length);
-    const candidate = join51(localRoot, remainder);
+    const candidate = join52(localRoot, remainder);
     const resolved = normalize2(candidate);
     if (!resolved.startsWith(planningRootBoundary)) {
       throw new NomadFatal(
@@ -7647,7 +7784,7 @@ function runExtrasOp(v, dryRun, paths, backup, copy) {
   const would = [];
   for (const t of eachExtrasTarget(v, counts)) {
     const { src, dst } = paths(t);
-    if (!existsSync39(src)) continue;
+    if (!existsSync38(src)) continue;
     const item2 = `${t.logical}/${t.dirname}`;
     if (dryRun) {
       would.push(item2);
@@ -7682,7 +7819,7 @@ function isInsidePlanningRoot(parentReal, rootReal) {
   return parentReal === rootReal || parentReal.startsWith(rootReal + sep11);
 }
 function deletePlanningTarget(target, planningRoot, repoCounterpart) {
-  if (existsSync39(repoCounterpart)) return;
+  if (existsSync38(repoCounterpart)) return;
   const parentReal = tryRealpath(dirname14(target));
   if (parentReal === void 0) return;
   const rootReal = tryRealpath(planningRoot);
@@ -7692,7 +7829,7 @@ function deletePlanningTarget(target, planningRoot, repoCounterpart) {
   pruneEmptyAncestors(target, planningRoot);
 }
 function localDivergesFromPreDelete(target, pre, repoRel, repo) {
-  if (!existsSync39(target)) return false;
+  if (!existsSync38(target)) return false;
   try {
     const preBlob = gitCaptureBuffer(["show", `${pre}:${repoRel}`], repo);
     return !readFileSync19(target).equals(preBlob);
@@ -7737,7 +7874,7 @@ function keptDeletePreview(v, prePostHeads, repo) {
   return kept;
 }
 function propagatePlanningDeletes(v, ts, prePostHeads, repo) {
-  const repoExtras = join52(repo, "shared", "extras");
+  const repoExtras = join53(repo, "shared", "extras");
   for (const t of eachExtrasTarget(v, { unmapped: 0, skipped: 0 })) {
     if (t.dirname !== ".planning") continue;
     let raw;
@@ -7752,14 +7889,14 @@ function propagatePlanningDeletes(v, ts, prePostHeads, repo) {
     }
     const pairs = deletePairsFor(t, raw);
     if (pairs.length === 0) continue;
-    backupExtrasWrite(join52(t.localRoot, t.dirname), ts, t.localRoot);
-    const planningRoot = join52(t.localRoot, ".planning");
+    backupExtrasWrite(join53(t.localRoot, t.dirname), ts, t.localRoot);
+    const planningRoot = join53(t.localRoot, ".planning");
     for (const { target, relToLocal, repoRel } of pairs) {
       if (localDivergesFromPreDelete(target, prePostHeads.pre, repoRel, repo)) {
         warn(keptDeleteWarnLine(t.logical, relToLocal));
         continue;
       }
-      deletePlanningTarget(target, planningRoot, join52(repoExtras, t.logical, relToLocal));
+      deletePlanningTarget(target, planningRoot, join53(repoExtras, t.logical, relToLocal));
     }
   }
 }
@@ -7768,14 +7905,14 @@ function remapExtrasPush(ts, opts = {}) {
   const v = loadValidatedExtras({ missingMsg: "no path-map.json; skipping extras push" });
   if (v === null) return { unmapped: 0, skipped: 0, pushed: [], wouldPush: [] };
   const repo = repoHome();
-  const repoExtras = join52(repo, "shared", "extras");
+  const repoExtras = join53(repo, "shared", "extras");
   if (!dryRun) mkdirSync13(repoExtras, { recursive: true });
   const { unmapped, skipped, done, would } = runExtrasOp(
     v,
     dryRun,
     ({ localRoot, logical, dirname: dirname15 }) => ({
-      src: join52(localRoot, dirname15),
-      dst: join52(repoExtras, logical, dirname15)
+      src: join53(localRoot, dirname15),
+      dst: join53(repoExtras, logical, dirname15)
     }),
     (dst) => backupRepoWrite(dst, ts, repo),
     // Push copy routing per extra type:
@@ -7805,8 +7942,8 @@ function remapExtrasPull(ts, opts = {}) {
     v,
     dryRun,
     ({ localRoot, logical, dirname: dirname15 }) => ({
-      src: join52(repo, "shared", "extras", logical, dirname15),
-      dst: join52(localRoot, dirname15)
+      src: join53(repo, "shared", "extras", logical, dirname15),
+      dst: join53(localRoot, dirname15)
     }),
     // Snapshot the host-side dst BEFORE the copy step touches it. Anchor on
     // localRoot so the backup tree mirrors the project layout.
@@ -7853,22 +7990,22 @@ function divergenceCheckExtras(ts, prePostHeads) {
   const v = loadValidatedExtras({});
   if (v === null) return 0;
   const counts = { unmapped: 0, skipped: 0 };
-  const backupRoot = join53(backupBase(), ts, "extras");
+  const backupRoot = join54(backupBase(), ts, "extras");
   const repo = repoHome();
   let divergedCount = 0;
   for (const { logical, localRoot, dirname: dirname15 } of eachExtrasTarget(v, counts)) {
-    const local = join53(localRoot, dirname15);
-    const repoEntry = join53(repo, "shared", "extras", logical, dirname15);
-    if (!existsSync40(local) || !existsSync40(repoEntry)) continue;
+    const local = join54(localRoot, dirname15);
+    const repoEntry = join54(repo, "shared", "extras", logical, dirname15);
+    if (!existsSync39(local) || !existsSync39(repoEntry)) continue;
     const modified = listDivergingModified(local, repoEntry);
     if (modified.length === 0) continue;
     divergedCount += modified.length;
-    const projectBackupRoot = join53(backupRoot, encodePath(localRoot));
+    const projectBackupRoot = join54(backupRoot, encodePath(localRoot));
     warn(
       divergenceWarnLine({
         dirname: dirname15,
         logical,
-        isDir: statSync10(local).isDirectory(),
+        isDir: statSync11(local).isDirectory(),
         count: modified.length,
         projectBackupRoot
       })
@@ -7886,7 +8023,7 @@ function divergenceCheckExtras(ts, prePostHeads) {
 // src/links.baseline.ts
 init_config();
 import { lstatSync as lstatSync18, readdirSync as readdirSync18 } from "node:fs";
-import { join as join54, relative as relative8, sep as sep12 } from "node:path";
+import { join as join55, relative as relative8, sep as sep12 } from "node:path";
 init_utils();
 var SHARED_BASELINE_KIND = "shared-links-baseline/1";
 var SHARED_BASELINE_CONFIG_HASH = "not-applicable";
@@ -7928,7 +8065,7 @@ function collectSharedFiles(dir, claude, scan) {
     return;
   }
   for (const entry of entries) {
-    const abs = join54(dir, entry);
+    const abs = join55(dir, entry);
     if (isDeniedName(ALWAYS_NEVER_SYNC, entry)) {
       scan.declined.push(baselineKey(claude, abs));
       continue;
@@ -7944,7 +8081,7 @@ function enumerateLocalSharedScan(map, opts = {}) {
       scan.declined.push(name);
       continue;
     }
-    addLocalPath(join54(claude, name), claude, scan);
+    addLocalPath(join55(claude, name), claude, scan);
   }
   return scan;
 }
@@ -7956,7 +8093,7 @@ function buildSharedBaseline(map, opts = {}) {
   const files = {};
   for (const [key, st] of Object.entries(enumerateLocalSharedFiles(map, opts))) {
     try {
-      files[key] = { size: st.size, mtime: st.mtime, hash: hashFile(join54(claude, key)) };
+      files[key] = { size: st.size, mtime: st.mtime, hash: hashFile(join55(claude, key)) };
     } catch {
     }
   }
@@ -7973,8 +8110,8 @@ function writeSharedBaseline(map, opts = {}) {
 
 // src/commands.pull.win32.ts
 init_color();
-import { existsSync as existsSync45 } from "node:fs";
-import { join as join59 } from "node:path";
+import { existsSync as existsSync44 } from "node:fs";
+import { join as join60 } from "node:path";
 
 // src/commands.pull.recovery.git.ts
 init_utils();
@@ -8037,8 +8174,8 @@ function gitProbe(args, repo) {
 
 // src/links.deletions.ts
 init_config();
-import { existsSync as existsSync41, lstatSync as lstatSync19, rmSync as rmSync17 } from "node:fs";
-import { join as join55, relative as relative9, resolve as resolve5, sep as sep13 } from "node:path";
+import { existsSync as existsSync40, lstatSync as lstatSync19, rmSync as rmSync17 } from "node:fs";
+import { join as join56, relative as relative9, resolve as resolve5, sep as sep13 } from "node:path";
 init_utils();
 init_utils_fs();
 function isUnknown(declined, key) {
@@ -8048,15 +8185,15 @@ function deletionFor(key, names, claude, sharedRoot) {
   const segments = key.split("/");
   const name = segments[0];
   if (!names.has(name)) return null;
-  if (!existsSync41(join55(claude, name))) return null;
+  if (!existsSync40(join56(claude, name))) return null;
   if (segments.some((segment) => isDeniedName(ALWAYS_NEVER_SYNC, segment))) return null;
   const repoPath = resolve5(sharedRoot, key);
-  const rel = relative9(join55(sharedRoot, name), repoPath);
+  const rel = relative9(join56(sharedRoot, name), repoPath);
   if (rel === "" || rel === ".." || rel.startsWith(`..${sep13}`)) return null;
   if (segments.some((segment) => segment === "" || segment === "." || segment === ".."))
     return null;
-  if (!existsSync41(repoPath)) return null;
-  return { kind: "deletion", name, localPath: join55(claude, key), repoPath };
+  if (!existsSync40(repoPath)) return null;
+  return { kind: "deletion", name, localPath: join56(claude, key), repoPath };
 }
 function planSharedLinkDeletions(map, opts = {}) {
   if (process.platform !== "win32") return [];
@@ -8064,7 +8201,7 @@ function planSharedLinkDeletions(map, opts = {}) {
   const baseline = readSharedBaseline();
   if (baseline === null) return [];
   const claude = claudeHome();
-  const sharedRoot = join55(repoHome(), "shared");
+  const sharedRoot = join56(repoHome(), "shared");
   const linkNames = opts.linkNames ?? allSharedLinks(map);
   const scan = enumerateLocalSharedScan(map, { linkNames });
   const present = new Set(Object.keys(scan.files).map((key) => key.toLowerCase()));
@@ -8098,8 +8235,8 @@ function applySharedLinkDeletions(map, ts, opts = {}) {
 
 // src/links.mirror.ts
 init_config();
-import { existsSync as existsSync42, lstatSync as lstatSync20, rmSync as rmSync18 } from "node:fs";
-import { join as join56 } from "node:path";
+import { existsSync as existsSync41, lstatSync as lstatSync20, rmSync as rmSync18, statSync as statSync12 } from "node:fs";
+import { join as join57 } from "node:path";
 init_utils();
 init_utils_fs();
 function emitMirror(onPreview, name, localPath, repoPath) {
@@ -8112,31 +8249,52 @@ function emitMirror(onPreview, name, localPath, repoPath) {
 function emitMirrorWet(onPreview, name, localPath, repoPath) {
   if (onPreview) onPreview({ kind: "mirror", name, localPath, repoPath });
 }
-function notShared(policy, target) {
-  return !policy.adoptNew && !existsSync42(target);
+function notShared(target) {
+  return !existsSync41(target);
+}
+function warnUnusableSharedTarget(name, dryRun, state) {
+  const reason = state === "dangling" ? `shared/${name} does not resolve to anything usable in the sync repo. Remove it, or restore what it points at` : `shared/${name} could not be read in the sync repo, so whether it is usable could not be determined. Check its permissions there`;
+  if (dryRun) {
+    warn(`${name} would not be captured into shared/: ${reason}`);
+    return;
+  }
+  warn(`${name} was not captured into shared/ this run: ${reason}, then run \`nomad push\` again`);
+}
+function warnUnreadableLocalName(name, target, err, dryRun) {
+  const compoundState = classifyPresence(target);
+  if (isUnusableTarget(compoundState)) {
+    warnUnusableSharedTarget(name, dryRun, compoundState);
+    return;
+  }
+  if (notShared(target)) return;
+  if (dryRun) {
+    warn(
+      `${name} could not be read (${errorText(err)}), so nothing was captured for it and nothing was written. A pull that captures shared edits would skip it too. Check its permissions, or whether another program has it open`
+    );
+    return;
+  }
+  warn(
+    `${name} could not be read (${errorText(err)}), so it was left out of shared/ this run. Check its permissions, or whether another program has it open`
+  );
 }
 function mirrorOneSharedName(name, claude, repo, policy, opts) {
-  const localPath = join56(claude, name);
-  const target = join56(repo, "shared", name);
+  const localPath = join57(claude, name);
+  const target = join57(repo, "shared", name);
   let stat;
   try {
     stat = lstatSync20(localPath, { throwIfNoEntry: false });
   } catch (err) {
-    if (notShared(policy, target)) return;
-    if (opts.dryRun === true) {
-      warn(
-        `${name} could not be read (${err.message}), so nothing was captured for it and nothing was written. A pull that captures shared edits would skip it too. Check its permissions, or whether another program has it open`
-      );
-      return;
-    }
-    warn(
-      `${name} could not be read (${err.message}), so it was left out of shared/ this run. Check its permissions, or whether another program has it open`
-    );
+    warnUnreadableLocalName(name, target, err, opts.dryRun === true);
     return;
   }
   if (stat === void 0) return;
   if (stat.isSymbolicLink()) return;
-  if (notShared(policy, target)) return;
+  const targetState = classifyPresence(target);
+  if (isUnusableTarget(targetState)) {
+    warnUnusableSharedTarget(name, opts.dryRun === true, targetState);
+    return;
+  }
+  if (notShared(target)) return;
   if (opts.dryRun === true) {
     emitMirror(opts.onPreview, name, localPath, target);
     return;
@@ -8149,21 +8307,58 @@ function mirrorOneSharedName(name, claude, repo, policy, opts) {
   }
   emitMirrorWet(opts.onPreview, name, localPath, target);
 }
+function warnUnusableSharedDir(dryRun, state) {
+  const reason = state === "dangling" ? "shared/ does not resolve to anything usable in the sync repo. Remove it, or restore what it points at" : "shared/ could not be read in the sync repo, so whether it is usable could not be determined. Check its permissions there";
+  if (dryRun) {
+    warn(`no shared name would be captured into shared/: ${reason}`);
+    return;
+  }
+  warn(
+    `no shared name was captured into shared/ this run: ${reason}, then run \`nomad push\` again`
+  );
+}
+function resolvesToDirectory(p) {
+  try {
+    return statSync12(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function warnSharedNotADirectory(dryRun) {
+  const reason = "shared/ in the sync repo is not a directory, so there is nowhere to capture names into. Replace it with the shared/ directory the repo expects";
+  if (dryRun) {
+    warn(`no shared name would be captured into shared/: ${reason}`);
+    return;
+  }
+  warn(
+    `no shared name was captured into shared/ this run: ${reason}, then run \`nomad push\` again`
+  );
+}
 function mirrorSharedNames(map, policy, opts = {}) {
   if (process.platform !== "win32") return;
   if (map === null) return;
   const claude = claudeHome();
   const repo = repoHome();
+  const sharedPath = join57(repo, "shared");
+  const sharedState = classifyPresence(sharedPath);
+  if (isUnusableTarget(sharedState)) {
+    warnUnusableSharedDir(opts.dryRun === true, sharedState);
+    return;
+  }
+  if (sharedState === "resolves" && !resolvesToDirectory(sharedPath)) {
+    warnSharedNotADirectory(opts.dryRun === true);
+    return;
+  }
   const linkNames = opts.linkNames ?? allSharedLinks(map);
   for (const name of linkNames) {
     mirrorOneSharedName(name, claude, repo, policy, opts);
   }
 }
 function syncSharedLinksPush(map, opts = {}) {
-  mirrorSharedNames(map, { adoptNew: false, overlay: false }, opts);
+  mirrorSharedNames(map, { overlay: false }, opts);
 }
 function stageLocalSharedEdits(map, ts, opts = {}) {
-  mirrorSharedNames(map, { adoptNew: false, overlay: true, backupTs: ts }, opts);
+  mirrorSharedNames(map, { overlay: true, backupTs: ts }, opts);
 }
 function presentAt(abs) {
   try {
@@ -8173,7 +8368,7 @@ function presentAt(abs) {
   }
 }
 function removeUntrackedDenied(repo, path, segment, ts) {
-  const abs = join56(repo, path);
+  const abs = join57(repo, path);
   const denied = `the path segment "${segment}" is on the never-sync list`;
   if (!presentAt(abs)) {
     warn(
@@ -8181,12 +8376,12 @@ function removeUntrackedDenied(repo, path, segment, ts) {
     );
     return;
   }
-  const snapshotted = existsSync42(abs);
+  const snapshotted = existsSync41(abs);
   try {
     backupRepoWrite(abs, ts, repo);
   } catch (err) {
     warn(
-      `could not snapshot ${abs} before removing it (${err.message}), so it was left in place: ${denied}, so remove it by hand`
+      `could not snapshot ${abs} before removing it (${errorText(err)}), so it was left in place: ${denied}, so remove it by hand`
     );
     return;
   }
@@ -8199,7 +8394,7 @@ function removeUntrackedDenied(repo, path, segment, ts) {
     const where = snapshotted ? `. A copy was snapshotted under backup/${ts}/repo/ first` : "";
     warn(`removed ${path} from the sync repo working tree: ${denied}${where}`);
   } catch (err) {
-    warn(`could not remove ${abs}: ${err.message}`);
+    warn(`could not remove ${abs}: ${errorText(err)}`);
   }
 }
 function reportTrackedDenied(repo, path, segment) {
@@ -8217,7 +8412,7 @@ function reportTrackedDenied(repo, path, segment) {
     );
     return;
   }
-  if (!existsSync42(join56(repo, path))) return;
+  if (!existsSync41(join57(repo, path))) return;
   warn(
     `${path} is tracked and has changes against HEAD: ${denied}. Nothing was changed. Run "git checkout HEAD -- ${path}" to put the committed content back, or move the file outside shared/ if you want to keep it. Neither of those takes the committed copy out of the repo: "git rm -- ${path}" and a commit does that going forward, and if it holds a real secret, rotate it and rewrite history, because nomad only changes your local worktree and index and cannot scrub what a previous push already sent to the remote`
   );
@@ -8235,8 +8430,8 @@ function revertDeniedMirrorPaths(repo, status, ts) {
 
 // src/preview.ts
 init_config();
-import { existsSync as existsSync44 } from "node:fs";
-import { join as join58 } from "node:path";
+import { existsSync as existsSync43 } from "node:fs";
+import { join as join59 } from "node:path";
 
 // node_modules/diff/libesm/diff/base.js
 var Diff = class {
@@ -8511,16 +8706,16 @@ function diffLinesToUnified(oldStr, newStr) {
 
 // src/preview.skills.ts
 init_config();
-import { existsSync as existsSync43, readdirSync as readdirSync19 } from "node:fs";
-import { join as join57 } from "node:path";
+import { existsSync as existsSync42, readdirSync as readdirSync19 } from "node:fs";
+import { join as join58 } from "node:path";
 function buildSkillsPreviewSection() {
   const s = section("Skills");
-  const sharedSkills = join57(repoHome(), "shared", "skills");
-  if (!existsSync43(sharedSkills)) return s;
+  const sharedSkills = join58(repoHome(), "shared", "skills");
+  if (!existsSync42(sharedSkills)) return s;
   const sharedNames = readdirSync19(sharedSkills, { encoding: "utf8" }).filter((name) => !isSkillExcluded(name)).sort((a, b) => a.localeCompare(b, "en"));
   for (const name of sharedNames) addItem(s, name);
-  const localSkills = join57(claudeHome(), "skills");
-  const localOnly = existsSync43(localSkills) ? readdirSync19(localSkills, { encoding: "utf8" }).filter(
+  const localSkills = join58(claudeHome(), "skills");
+  const localOnly = existsSync42(localSkills) ? readdirSync19(localSkills, { encoding: "utf8" }).filter(
     (name) => !isSkillExcluded(name) && !sharedNames.includes(name)
   ).length : 0;
   if (localOnly > 0) {
@@ -8542,7 +8737,7 @@ function diffJsonStrings(currentJsonText, newJsonText) {
   return lines.join("\n");
 }
 function readJsonOrNull(path) {
-  if (!existsSync44(path)) return null;
+  if (!existsSync43(path)) return null;
   try {
     return readJson(path);
   } catch {
@@ -8556,12 +8751,12 @@ function previewSettings(basePath, hostPath, settingsPath) {
   }
   const notes = [];
   const hostOverrides = readJsonOrNull(hostPath);
-  if (hostOverrides === null && existsSync44(hostPath)) {
+  if (hostOverrides === null && existsSync43(hostPath)) {
     notes.push(`malformed hosts/${HOST}.json; ignoring overrides`);
   }
   const merged = stripGsdHookEntries(deepMerge(base, hostOverrides ?? {}));
   const current = readJsonOrNull(settingsPath);
-  if (current === null && existsSync44(settingsPath)) {
+  if (current === null && existsSync43(settingsPath)) {
     return { diff: "", notes: [...notes, "malformed; skipping diff"] };
   }
   const strippedCurrent = stripGsdHookEntries(current ?? {});
@@ -8628,9 +8823,9 @@ function computePreview(ts, map, verb = "pull", plans) {
     onPreview: (e) => addItem(links, formatLinkRow(e))
   });
   const settingsResult = previewSettings(
-    join58(repo, "shared", "settings.base.json"),
-    join58(repo, "hosts", `${HOST}.json`),
-    join58(claude, "settings.json")
+    join59(repo, "shared", "settings.base.json"),
+    join59(repo, "hosts", `${HOST}.json`),
+    join59(claude, "settings.json")
   );
   const settingsSection = buildSettingsSectionForPreview(settingsResult);
   const sessions = section("Sessions");
@@ -8646,7 +8841,7 @@ function computePreview(ts, map, verb = "pull", plans) {
   const extras = section("Extras");
   let extrasSkipped = 0;
   let extrasUnmapped = 0;
-  if (existsSync44(join58(repo, "path-map.json")) && existsSync44(join58(repo, "shared", "extras"))) {
+  if (existsSync43(join59(repo, "path-map.json")) && existsSync43(join59(repo, "shared", "extras"))) {
     const extrasResult = remapExtrasPull(ts, { dryRun: true });
     for (const entry of extrasResult.wouldPull) {
       addItem(extras, entry);
@@ -8667,7 +8862,7 @@ function computePreview(ts, map, verb = "pull", plans) {
 init_utils();
 init_utils_json();
 function readMapForMirror(mapPath) {
-  if (!existsSync45(mapPath)) return { projects: {} };
+  if (!existsSync44(mapPath)) return { projects: {} };
   try {
     return readPathMap(mapPath);
   } catch {
@@ -8714,7 +8909,7 @@ function reconcileSharedLinksBeforePull(repo, ts) {
   let namesDerived = false;
   let derivedSharedDirs;
   try {
-    const map = readMapForMirror(join59(repo, "path-map.json"));
+    const map = readMapForMirror(join60(repo, "path-map.json"));
     if (map !== null) {
       linkNames = allSharedLinks(map);
       namesDerived = true;
@@ -8753,7 +8948,7 @@ function buildMirrorSection(events, discard) {
 function describeSkippedMirrorDiscard(repo, ts) {
   if (process.platform !== "win32") return null;
   try {
-    const map = readMapForMirror(join59(repo, "path-map.json"));
+    const map = readMapForMirror(join60(repo, "path-map.json"));
     const linkNames = map !== null ? allSharedLinks(map, { quiet: true }) : void 0;
     const captures = [];
     stageLocalSharedEdits(map, ts, {
@@ -8762,13 +8957,13 @@ function describeSkippedMirrorDiscard(repo, ts) {
       linkNames
     });
     if (captures.length === 0) return null;
-    return { count: captures.length, backupPath: join59(backupBase(), ts) };
+    return { count: captures.length, backupPath: join60(backupBase(), ts) };
   } catch {
     return null;
   }
 }
 function planSharedReconcileBeforePull(repo, ts) {
-  const map = readMapForMirror(join59(repo, "path-map.json"));
+  const map = readMapForMirror(join60(repo, "path-map.json"));
   const captures = [];
   const linkNames = process.platform === "win32" && map !== null ? allSharedLinks(map) : void 0;
   stageLocalSharedEdits(map, ts, { dryRun: true, onPreview: (e) => captures.push(e), linkNames });
@@ -8783,8 +8978,8 @@ function planSharedReconcileBeforePull(repo, ts) {
 // src/commands.pull.collision.ts
 init_config();
 init_exit_codes();
-import { existsSync as existsSync46, lstatSync as lstatSync21, readFileSync as readFileSync20, rmSync as rmSync19 } from "node:fs";
-import { join as join60 } from "node:path";
+import { existsSync as existsSync45, lstatSync as lstatSync21, readFileSync as readFileSync20, rmSync as rmSync19 } from "node:fs";
+import { join as join61 } from "node:path";
 init_utils();
 var SHARED_PREFIX = /^shared\//;
 var EXTENSION = /(\.[^.]+)?$/;
@@ -8840,15 +9035,15 @@ function isContainedMirrorPath(rel) {
 }
 function matchesLocalOriginal(repo, rel) {
   try {
-    const local = join60(claudeHome(), rel.replace(SHARED_PREFIX, ""));
-    return readFileSync20(join60(repo, rel)).equals(readFileSync20(local));
+    const local = join61(claudeHome(), rel.replace(SHARED_PREFIX, ""));
+    return readFileSync20(join61(repo, rel)).equals(readFileSync20(local));
   } catch {
     return false;
   }
 }
 function removeMirroredCopies(repo, repoRelPaths) {
   for (const rel of repoRelPaths.filter(isContainedMirrorPath)) {
-    const abs = join60(repo, rel);
+    const abs = join61(repo, rel);
     try {
       if (lstatSync21(abs, { throwIfNoEntry: false })?.isFile() !== true) continue;
       if (!matchesLocalOriginal(repo, rel)) continue;
@@ -8857,7 +9052,7 @@ function removeMirroredCopies(repo, repoRelPaths) {
       warn(`could not remove nomad's copy at ${abs}: ${err.message}`);
     }
   }
-  return repoRelPaths.every((rel) => !existsSync46(join60(repo, rel)));
+  return repoRelPaths.every((rel) => !existsSync45(join61(repo, rel)));
 }
 function pullWithCollisionRunbook(repo, mirrored) {
   try {
@@ -9064,7 +9259,7 @@ function runPullCore(opts = {}) {
   try {
     return runPullWithBackupTs(ts, opts);
   } finally {
-    discardEmptyBackupDir(join61(backup, ts));
+    discardEmptyBackupDir(join62(backup, ts));
   }
 }
 function runPullWithBackupTs(ts, opts) {
@@ -9075,7 +9270,7 @@ function runPullWithBackupTs(ts, opts) {
   const backup = backupBase();
   const recovered = handleWedge(repo, forceRemote);
   if (!dryRun) {
-    const backupRoot = join61(backup, ts);
+    const backupRoot = join62(backup, ts);
     try {
       mkdirSync14(backupRoot, { recursive: true });
     } catch (err) {
@@ -9098,8 +9293,8 @@ function runPullWithBackupTs(ts, opts) {
     pullWithCollisionRunbook(repo, mirrored);
   });
   assertNoAutostashConflict(repo, "nomad pull");
-  const mapPath = join61(repo, "path-map.json");
-  const map = existsSync47(mapPath) ? readPathMap(mapPath) : { projects: {} };
+  const mapPath = join62(repo, "path-map.json");
+  const map = existsSync46(mapPath) ? readPathMap(mapPath) : { projects: {} };
   const divergedKeptLocal = divergenceCheckExtras(ts, dryRun ? prePostHeads : void 0);
   if (dryRun) {
     computePreview(ts, map, "pull", plansAgainst(sharedPlans, map));
@@ -9126,8 +9321,8 @@ function runPullWithBackupTs(ts, opts) {
 }
 function cmdPull(opts = {}) {
   const repo = repoHome();
-  if (!existsSync47(repo)) die(`repo not cloned at ${repo}`);
-  if (!existsSync47(join61(repo, "shared", "settings.base.json"))) {
+  if (!existsSync46(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync46(join62(repo, "shared", "settings.base.json"))) {
     die("repo not initialized; run 'nomad init' to scaffold");
   }
   const handle = acquireLock("pull");
@@ -9150,13 +9345,13 @@ function cmdPull(opts = {}) {
 
 // src/commands.push.ts
 init_config();
-import { existsSync as existsSync51 } from "node:fs";
-import { join as join66 } from "node:path";
+import { existsSync as existsSync50 } from "node:fs";
+import { join as join67 } from "node:path";
 
 // src/commands.push.selection.ts
 init_config();
-import { existsSync as existsSync48, statSync as statSync11 } from "node:fs";
-import { join as join62 } from "node:path";
+import { existsSync as existsSync47, statSync as statSync13 } from "node:fs";
+import { join as join63 } from "node:path";
 init_utils_json();
 function buildCurrentMap(map) {
   const current = {};
@@ -9165,10 +9360,10 @@ function buildCurrentMap(map) {
   for (const [, hostMap] of Object.entries(map.projects)) {
     const localPath = hostMap[HOST];
     if (!localPath) continue;
-    const localDir = join62(claude, "projects", encodePath(localPath));
-    if (!existsSync48(localDir)) continue;
+    const localDir = join63(claude, "projects", encodePath(localPath));
+    if (!existsSync47(localDir)) continue;
     for (const f of enumerateSourceFiles(localDir)) {
-      const st = statSync11(f);
+      const st = statSync13(f);
       current[f] = { size: st.size, mtime: st.mtimeMs };
     }
   }
@@ -9197,7 +9392,7 @@ function computePushSelection(map, old, scannerVersion, configHash, fullScan) {
   };
 }
 function loadSelectionForPush(mapPath, old, scannerVersion, configHash, fullScan) {
-  const map = existsSync48(mapPath) ? readPathMap(mapPath) : null;
+  const map = existsSync47(mapPath) ? readPathMap(mapPath) : null;
   const { selection, newManifest } = computePushSelection(
     map,
     old,
@@ -9290,14 +9485,14 @@ function enforceAllowList(statusPorcelain, map) {
 
 // src/commands.push.settings.ts
 init_config();
-import { existsSync as existsSync49 } from "node:fs";
-import { join as join63 } from "node:path";
+import { existsSync as existsSync48 } from "node:fs";
+import { join as join64 } from "node:path";
 init_utils();
 init_utils_fs();
 init_utils_json();
 function stripGsdHooksFromBase(repo, backup) {
-  const basePath = join63(repo, "shared", "settings.base.json");
-  if (!existsSync49(basePath)) return;
+  const basePath = join64(repo, "shared", "settings.base.json");
+  if (!existsSync48(basePath)) return;
   let base;
   try {
     base = readJson(basePath);
@@ -9311,14 +9506,14 @@ function stripGsdHooksFromBase(repo, backup) {
   writeJsonAtomic(basePath, stripped);
 }
 function reportSettingsAheadDrift(repo) {
-  const basePath = join63(repo, "shared", "settings.base.json");
-  if (!existsSync49(basePath)) return;
-  const settingsPath = join63(claudeHome(), "settings.json");
-  if (!existsSync49(settingsPath)) return;
+  const basePath = join64(repo, "shared", "settings.base.json");
+  if (!existsSync48(basePath)) return;
+  const settingsPath = join64(claudeHome(), "settings.json");
+  if (!existsSync48(settingsPath)) return;
   try {
     const base = readJson(basePath);
-    const hostPath = join63(repo, "hosts", `${HOST}.json`);
-    const overrides = existsSync49(hostPath) ? readJson(hostPath) : {};
+    const hostPath = join64(repo, "hosts", `${HOST}.json`);
+    const overrides = existsSync48(hostPath) ? readJson(hostPath) : {};
     const merged = deepMerge(base, overrides);
     const settings = readJson(settingsPath);
     const { ahead } = classifySettingsDrift(merged, settings);
@@ -9335,9 +9530,9 @@ function reportSettingsAheadDrift(repo) {
 // src/commands.push.guards.ts
 init_push_checks();
 init_utils();
-import { join as join64, relative as relative10 } from "node:path";
+import { join as join65, relative as relative10 } from "node:path";
 function guardGitlinks(repo) {
-  const gitlinks = findGitlinks(join64(repo, "shared"));
+  const gitlinks = findGitlinks(join65(repo, "shared"));
   if (gitlinks.length === 0) return;
   for (const p of gitlinks) {
     const rel = relative10(repo, p).replaceAll("\\", "/");
@@ -9447,9 +9642,9 @@ init_color();
 init_config();
 init_config_sharedDirs_guard();
 import { randomBytes as randomBytes4 } from "node:crypto";
-import { copyFileSync, existsSync as existsSync50, lstatSync as lstatSync22, mkdirSync as mkdirSync15, readdirSync as readdirSync20, rmSync as rmSync20 } from "node:fs";
+import { copyFileSync, existsSync as existsSync49, lstatSync as lstatSync22, mkdirSync as mkdirSync15, readdirSync as readdirSync20, rmSync as rmSync20 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { join as join65, relative as relative11, sep as sep14 } from "node:path";
+import { join as join66, relative as relative11, sep as sep14 } from "node:path";
 init_push_leak_verdict();
 init_push_gitleaks();
 init_utils_fs();
@@ -9461,7 +9656,7 @@ function stageSessionDir(localDir, dstDir, changed) {
     const matching = [...changed].filter((p) => p.startsWith(prefix));
     if (matching.length === 0) return false;
     for (const src of matching) {
-      copyFileAtomic(src, join65(dstDir, relative11(localDir, src)));
+      copyFileAtomic(src, join66(dstDir, relative11(localDir, src)));
     }
     return true;
   }
@@ -9477,14 +9672,14 @@ function stageSessions(tmpRoot, map, changed) {
     if (!p || p === "TBD") continue;
     reverse.set(encodePath(p), logical);
   }
-  const localProjects = join65(claudeHome(), "projects");
-  if (!existsSync50(localProjects)) return 0;
+  const localProjects = join66(claudeHome(), "projects");
+  if (!existsSync49(localProjects)) return 0;
   let staged = 0;
   for (const dir of readdirSync20(localProjects)) {
     const logical = reverse.get(dir);
     if (!logical) continue;
-    const localDir = join65(localProjects, dir);
-    const dstDir = join65(tmpRoot, "shared", "projects", logical);
+    const localDir = join66(localProjects, dir);
+    const dstDir = join66(tmpRoot, "shared", "projects", logical);
     if (stageSessionDir(localDir, dstDir, changed)) staged++;
   }
   return staged;
@@ -9500,9 +9695,9 @@ function stageExtras(tmpRoot, map) {
     if (!localRoot || localRoot === "TBD") continue;
     for (const dirname15 of dirnames) {
       if (!whitelist.includes(dirname15)) continue;
-      const src = join65(localRoot, dirname15);
-      if (!existsSync50(src)) continue;
-      const dst = join65(tmpRoot, "shared", "extras", logical, dirname15);
+      const src = join66(localRoot, dirname15);
+      if (!existsSync49(src)) continue;
+      const dst = join66(tmpRoot, "shared", "extras", logical, dirname15);
       copyExtras(src, dst);
       staged++;
     }
@@ -9510,19 +9705,19 @@ function stageExtras(tmpRoot, map) {
   return staged;
 }
 function stageSkills(tmpRoot) {
-  const localSkills = join65(claudeHome(), "skills");
+  const localSkills = join66(claudeHome(), "skills");
   const stat = lstatSync22(localSkills, { throwIfNoEntry: false });
   if (stat === void 0 || stat.isSymbolicLink()) return 0;
   const names = readdirSync20(localSkills, { encoding: "utf8" }).filter((n) => !isSkillExcluded(n));
   if (names.length === 0) return 0;
-  copySkillsPush(localSkills, join65(tmpRoot, "shared", "skills"));
+  copySkillsPush(localSkills, join66(tmpRoot, "shared", "skills"));
   return names.length;
 }
 function previewPushLeaks(map, opts = {}) {
-  const cacheDir = join65(homedir7(), ".cache", "claude-nomad");
+  const cacheDir = join66(homedir7(), ".cache", "claude-nomad");
   mkdirSync15(cacheDir, { recursive: true });
   const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes4(4).toString("hex")}`;
-  const tmpRoot = join65(cacheDir, `push-preview-tree-${stamp}`);
+  const tmpRoot = join66(cacheDir, `push-preview-tree-${stamp}`);
   try {
     const sessionCount = stageSessions(tmpRoot, map, opts.selection?.changed);
     const extrasCount = stageExtras(tmpRoot, map);
@@ -9530,9 +9725,9 @@ function previewPushLeaks(map, opts = {}) {
     if (sessionCount + extrasCount + skillCount === 0) {
       return { leak: false, verdictRow: NOTHING_TO_SCAN_ROW, recovery: null, findings: [] };
     }
-    const ignoreFile = join65(repoHome(), ".gitleaksignore");
-    if (existsSync50(ignoreFile)) {
-      copyFileSync(ignoreFile, join65(tmpRoot, ".gitleaksignore"));
+    const ignoreFile = join66(repoHome(), ".gitleaksignore");
+    if (existsSync49(ignoreFile)) {
+      copyFileSync(ignoreFile, join66(tmpRoot, ".gitleaksignore"));
     }
     let findings;
     try {
@@ -9660,7 +9855,7 @@ async function runPushCore(opts = {}) {
   const scannerVersion = probeGitleaks();
   const configHash = computeConfigHash();
   const old = readManifest(manifestPath());
-  const mapPath = join66(repo, "path-map.json");
+  const mapPath = join67(repo, "path-map.json");
   const { map, selection, newManifest } = loadSelectionForPush(
     mapPath,
     old,
@@ -9713,7 +9908,7 @@ async function cmdPush(opts = {}) {
     opts.allowRule
   );
   const repo = repoHome();
-  if (!existsSync51(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync50(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("push");
   if (handle === null) process.exit(0);
   try {
@@ -9731,8 +9926,8 @@ async function cmdPush(opts = {}) {
 }
 
 // src/commands.sync.ts
-import { existsSync as existsSync52 } from "node:fs";
-import { join as join67 } from "node:path";
+import { existsSync as existsSync51 } from "node:fs";
+import { join as join68 } from "node:path";
 init_config();
 init_color();
 init_utils();
@@ -9873,8 +10068,8 @@ async function cmdSync(opts = {}) {
   const dryRun = opts.dryRun === true;
   const verbose = opts.verbose === true;
   const repo = repoHome();
-  if (!existsSync52(repo)) die(`repo not cloned at ${repo}`);
-  if (!existsSync52(join67(repo, "shared", "settings.base.json"))) {
+  if (!existsSync51(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync51(join68(repo, "shared", "settings.base.json"))) {
     die("repo not initialized; run 'nomad init' to scaffold");
   }
   const handle = acquireLock("sync");
@@ -9950,8 +10145,8 @@ init_config();
 // src/crash-report.write.ts
 init_config();
 import { randomBytes as randomBytes5 } from "node:crypto";
-import { mkdirSync as mkdirSync16, readdirSync as readdirSync21, statSync as statSync12, unlinkSync as unlinkSync2, writeFileSync as writeFileSync11 } from "node:fs";
-import { join as join69 } from "node:path";
+import { mkdirSync as mkdirSync16, readdirSync as readdirSync21, statSync as statSync14, unlinkSync as unlinkSync2, writeFileSync as writeFileSync11 } from "node:fs";
+import { join as join70 } from "node:path";
 
 // src/crash-report.ts
 var CRASH_MAX_STACK_LINES = 50;
@@ -10036,15 +10231,15 @@ function buildCrashReport(input) {
 // src/crash-report.redact.ts
 import { mkdtempSync as mkdtempSync3, rmSync as rmSync21, writeFileSync as writeFileSync10 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join68 } from "node:path";
+import { join as join69 } from "node:path";
 init_push_gitleaks_scan();
 var CRASH_SCAN_TIMEOUT_MS = 3e3;
 var SCAN_UNAVAILABLE_ADVISORY = "\n\n[gitleaks value-based scan unavailable; only structural redaction applied. Review before sharing this file publicly.]\n";
 function redactWithGitleaks(text, scan = scanFile) {
   let dir;
   try {
-    dir = mkdtempSync3(join68(tmpdir2(), "nomad-crash-scan-"));
-    const tmp = join68(dir, "crash.txt");
+    dir = mkdtempSync3(join69(tmpdir2(), "nomad-crash-scan-"));
+    const tmp = join69(dir, "crash.txt");
     writeFileSync10(tmp, text, { mode: 384 });
     const findings = scan(tmp, false, CRASH_SCAN_TIMEOUT_MS);
     if (findings === null) return text + SCAN_UNAVAILABLE_ADVISORY;
@@ -10069,7 +10264,7 @@ function listCrashFiles(dir = crashDir()) {
   try {
     return readdirSync21(dir).flatMap((name) => {
       try {
-        return [{ name, mtimeMs: statSync12(join69(dir, name)).mtimeMs }];
+        return [{ name, mtimeMs: statSync14(join70(dir, name)).mtimeMs }];
       } catch {
         return [];
       }
@@ -10083,7 +10278,7 @@ function pruneCrashDir(dir, keep = CRASH_RETENTION_KEEP) {
   const targets = prunableByCount(files, keep);
   for (const name of targets) {
     try {
-      unlinkSync2(join69(dir, name));
+      unlinkSync2(join70(dir, name));
     } catch {
     }
   }
@@ -10091,7 +10286,7 @@ function pruneCrashDir(dir, keep = CRASH_RETENTION_KEEP) {
 function writeCrashReport(text, dir = crashDir()) {
   mkdirSync16(dir, { recursive: true, mode: 448 });
   const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes5(4).toString("hex")}`;
-  const path = join69(dir, `crash-${stamp}.txt`);
+  const path = join70(dir, `crash-${stamp}.txt`);
   writeFileSync11(path, text, { mode: 384 });
   pruneCrashDir(dir);
   return path;
@@ -10123,18 +10318,18 @@ function handleCrash(err, argv, opts) {
 
 // src/diff.ts
 init_config();
-import { existsSync as existsSync53 } from "node:fs";
-import { join as join70 } from "node:path";
+import { existsSync as existsSync52 } from "node:fs";
+import { join as join71 } from "node:path";
 init_utils();
 init_utils_fs();
 init_utils_json();
 function cmdDiff() {
   try {
     const repo = repoHome();
-    if (!existsSync53(repo)) die(`repo not cloned at ${repo}`);
+    if (!existsSync52(repo)) die(`repo not cloned at ${repo}`);
     const ts = freshBackupTs(backupBase());
-    const mapPath = join70(repo, "path-map.json");
-    const map = existsSync53(mapPath) ? readPathMap(mapPath) : { projects: {} };
+    const mapPath = join71(repo, "path-map.json");
+    const map = existsSync52(mapPath) ? readPathMap(mapPath) : { projects: {} };
     divergenceCheckExtras(ts);
     computePreview(ts, map, "diff");
   } catch (err) {
@@ -10149,8 +10344,8 @@ function cmdDiff() {
 
 // src/init.ts
 init_config();
-import { existsSync as existsSync55, mkdirSync as mkdirSync17, writeFileSync as writeFileSync12 } from "node:fs";
-import { join as join72 } from "node:path";
+import { existsSync as existsSync54, mkdirSync as mkdirSync17, writeFileSync as writeFileSync12 } from "node:fs";
+import { join as join73 } from "node:path";
 
 // src/init.gh-onboard.ts
 init_config();
@@ -10232,33 +10427,33 @@ init_config();
 init_utils();
 init_utils_fs();
 init_utils_json();
-import { copyFileSync as copyFileSync2, cpSync as cpSync9, existsSync as existsSync54, rmSync as rmSync22, statSync as statSync13 } from "node:fs";
-import { join as join71 } from "node:path";
+import { copyFileSync as copyFileSync2, cpSync as cpSync9, existsSync as existsSync53, rmSync as rmSync22, statSync as statSync15 } from "node:fs";
+import { join as join72 } from "node:path";
 function snapshotIntoShared(map) {
   const repo = repoHome();
   const claude = claudeHome();
   for (const name of allSharedLinks(map)) {
-    const src = join71(claude, name);
-    if (!existsSync54(src)) continue;
-    const dst = join71(repo, "shared", name);
-    if (statSync13(src).isDirectory()) {
-      const gk = join71(dst, ".gitkeep");
-      if (existsSync54(gk)) rmSync22(gk);
+    const src = join72(claude, name);
+    if (!existsSync53(src)) continue;
+    const dst = join72(repo, "shared", name);
+    if (statSync15(src).isDirectory()) {
+      const gk = join72(dst, ".gitkeep");
+      if (existsSync53(gk)) rmSync22(gk);
       cpSync9(src, dst, { recursive: true, force: false, errorOnExist: true });
     } else {
       copyFileSync2(src, dst);
     }
     log(`snapshotted shared/${name} from ${src}`);
   }
-  const userSettings = join71(claude, "settings.json");
-  if (existsSync54(userSettings)) {
+  const userSettings = join72(claude, "settings.json");
+  if (existsSync53(userSettings)) {
     let parsed;
     try {
       parsed = readJson(userSettings);
     } catch (err) {
       return die(`malformed ${userSettings}: ${err.message}`);
     }
-    const hostFile = join71(repo, "hosts", `${HOST}.json`);
+    const hostFile = join72(repo, "hosts", `${HOST}.json`);
     writeJsonAtomic(hostFile, parsed);
     log(`snapshotted hosts/${HOST}.json from ${userSettings}`);
   }
@@ -10272,14 +10467,14 @@ var GITATTRIBUTES = "# nomad: sync content is byte-managed, disable all line-end
 var SHARED_KEEP_DIRS = ["agents", "skills", "commands", "rules", "hooks"];
 function preflightConflict(repoHome2) {
   const candidates = [
-    join72(repoHome2, "shared", "settings.base.json"),
-    join72(repoHome2, "shared", "CLAUDE.md"),
-    join72(repoHome2, "path-map.json"),
-    join72(repoHome2, "hosts"),
-    join72(repoHome2, "shared")
+    join73(repoHome2, "shared", "settings.base.json"),
+    join73(repoHome2, "shared", "CLAUDE.md"),
+    join73(repoHome2, "path-map.json"),
+    join73(repoHome2, "hosts"),
+    join73(repoHome2, "shared")
   ];
   for (const c of candidates) {
-    if (existsSync55(c)) return c;
+    if (existsSync54(c)) return c;
   }
   return null;
 }
@@ -10297,27 +10492,27 @@ function cmdInit(opts = {}) {
     die(`already initialized; refusing to clobber ${conflict}`);
   }
   ensureOriginRepo(opts.repoName ?? DEFAULT_REPO_NAME, opts.run);
-  mkdirSync17(join72(repo, "shared"), { recursive: true });
-  mkdirSync17(join72(repo, "hosts"), { recursive: true });
+  mkdirSync17(join73(repo, "shared"), { recursive: true });
+  mkdirSync17(join73(repo, "hosts"), { recursive: true });
   for (const name of SHARED_KEEP_DIRS) {
-    mkdirSync17(join72(repo, "shared", name), { recursive: true });
+    mkdirSync17(join73(repo, "shared", name), { recursive: true });
   }
-  const userClaudeMd = join72(claude, "CLAUDE.md");
-  if (!snapshot || !existsSync55(userClaudeMd)) {
-    writeFileSync12(join72(repo, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
+  const userClaudeMd = join73(claude, "CLAUDE.md");
+  if (!snapshot || !existsSync54(userClaudeMd)) {
+    writeFileSync12(join73(repo, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
     item("created shared/CLAUDE.md");
   }
   for (const name of SHARED_KEEP_DIRS) {
-    writeFileSync12(join72(repo, "shared", name, ".gitkeep"), "");
+    writeFileSync12(join73(repo, "shared", name, ".gitkeep"), "");
     item(`created shared/${name}/.gitkeep`);
   }
-  writeFileSync12(join72(repo, "hosts", ".gitkeep"), "");
+  writeFileSync12(join73(repo, "hosts", ".gitkeep"), "");
   item("created hosts/.gitkeep");
-  writeJsonAtomic(join72(repo, "shared", "settings.base.json"), {});
+  writeJsonAtomic(join73(repo, "shared", "settings.base.json"), {});
   item("created shared/settings.base.json");
-  writeJsonAtomic(join72(repo, "path-map.json"), { projects: {} });
+  writeJsonAtomic(join73(repo, "path-map.json"), { projects: {} });
   item("created path-map.json");
-  writeFileSync12(join72(repo, ".gitattributes"), GITATTRIBUTES);
+  writeFileSync12(join73(repo, ".gitattributes"), GITATTRIBUTES);
   item("created .gitattributes");
   if (snapshot) {
     snapshotIntoShared({ projects: {} });
@@ -10383,21 +10578,21 @@ function maybeDisableRepoActions(repoHome2, run) {
 // src/init.prompt.ts
 init_config();
 init_utils();
-import { existsSync as existsSync56, readdirSync as readdirSync22, statSync as statSync14 } from "node:fs";
-import { join as join73 } from "node:path";
+import { existsSync as existsSync55, readdirSync as readdirSync22, statSync as statSync16 } from "node:fs";
+import { join as join74 } from "node:path";
 import { createInterface as createInterface3 } from "node:readline/promises";
 function nonEmptyExists(path) {
-  if (!existsSync56(path)) return false;
+  if (!existsSync55(path)) return false;
   try {
-    if (statSync14(path).isDirectory()) return readdirSync22(path).length > 0;
+    if (statSync16(path).isDirectory()) return readdirSync22(path).length > 0;
     return true;
   } catch {
     return false;
   }
 }
 function hasExistingClaudeConfig(claudeHome2) {
-  if (existsSync56(join73(claudeHome2, "settings.json"))) return true;
-  return SHARED_LINKS.some((name) => nonEmptyExists(join73(claudeHome2, name)));
+  if (existsSync55(join74(claudeHome2, "settings.json"))) return true;
+  return SHARED_LINKS.some((name) => nonEmptyExists(join74(claudeHome2, name)));
 }
 async function confirmSnapshotDefault(claudeHome2) {
   if (process.stdin.isTTY !== true || process.stdout.isTTY !== true) {
@@ -10704,7 +10899,7 @@ function parseSyncArgs(argv) {
 // package.json
 var package_default = {
   name: "claude-nomad",
-  version: "0.67.0",
+  version: "0.67.2",
   type: "module",
   description: "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   keywords: [
@@ -10777,10 +10972,11 @@ 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",
+    "@stryker-mutator/core": "10.0.0",
+    "@stryker-mutator/vitest-runner": "10.0.0",
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^4.1.6",
+    "conventional-changelog-conventionalcommits": "^10.2.1",
     diff: "^9.0.0",
     esbuild: "^0.28.0",
     eslint: "^10.4.0",
@@ -10951,15 +11147,15 @@ var DEFAULT_HELP = [
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync57, readFileSync as readFileSync21, readdirSync as readdirSync23 } from "node:fs";
-import { join as join74 } from "node:path";
+import { existsSync as existsSync56, readFileSync as readFileSync21, readdirSync as readdirSync23 } from "node:fs";
+import { join as join75 } 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 = join74(claudeHome(), "projects");
-  if (!existsSync57(projectsRoot)) {
+  const projectsRoot = join75(claudeHome(), "projects");
+  if (!existsSync56(projectsRoot)) {
     fail(`${projectsRoot} does not exist`);
     process.exit(1);
   }
@@ -10973,8 +11169,8 @@ function resumeCmd(sessionId) {
     fail(`no cwd field found in ${jsonlPath}`);
     process.exit(1);
   }
-  const mapPath = join74(repoHome(), "path-map.json");
-  if (!existsSync57(mapPath)) {
+  const mapPath = join75(repoHome(), "path-map.json");
+  if (!existsSync56(mapPath)) {
     fail("path-map.json missing");
     process.exit(1);
   }
@@ -10997,8 +11193,8 @@ function resumeCmd(sessionId) {
 }
 function findTranscriptPath(projectsRoot, sessionId) {
   for (const dir of readdirSync23(projectsRoot)) {
-    const candidate = join74(projectsRoot, dir, `${sessionId}.jsonl`);
-    if (existsSync57(candidate)) return candidate;
+    const candidate = join75(projectsRoot, dir, `${sessionId}.jsonl`);
+    if (existsSync56(candidate)) return candidate;
   }
   return null;
 }