claude-nomad 0.59.0 → 0.61.0

package/dist/nomad.mjs

@@ -1353,6 +1353,75 @@ function stripGsdHookEntries(settings) {
   }
   return out;
 }
+function keepMatcherEntry(entry) {
+  if (entry === null || typeof entry !== "object" || Array.isArray(entry)) return null;
+  const entryObj = entry;
+  if (!Array.isArray(entryObj.hooks)) return null;
+  const innerHooks = entryObj.hooks;
+  const kept = innerHooks.filter((h2) => {
+    if (h2 === null || typeof h2 !== "object" || Array.isArray(h2)) return false;
+    const hookObj = h2;
+    const cmd = hookObj.command;
+    return isGsdHookEntry(typeof cmd === "string" ? cmd : "");
+  });
+  if (kept.length === 0) return null;
+  return { ...entryObj, hooks: kept };
+}
+function keepEventMatchers(matchers) {
+  if (!Array.isArray(matchers)) return null;
+  const kept = [];
+  for (const entry of matchers) {
+    const result = keepMatcherEntry(entry);
+    if (result !== null) kept.push(result);
+  }
+  return kept.length === 0 ? null : kept;
+}
+function keepGsdHookEntries(settings) {
+  const hooksVal = settings.hooks;
+  if (hooksVal === null || typeof hooksVal !== "object" || Array.isArray(hooksVal)) return {};
+  const hooksObj = hooksVal;
+  const keptHooks = {};
+  for (const [event, matchers] of Object.entries(hooksObj)) {
+    const kept = keepEventMatchers(matchers);
+    if (kept !== null) keptHooks[event] = kept;
+  }
+  return Object.keys(keptHooks).length === 0 ? {} : { hooks: keptHooks };
+}
+function asPlainObject(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
+  return value;
+}
+function canonicalMatcherKey(m) {
+  const obj = asPlainObject(m);
+  if (obj === null) return JSON.stringify(m);
+  return JSON.stringify(
+    Object.keys(obj).sort((a, b) => a.localeCompare(b)).map((k) => [k, obj[k]])
+  );
+}
+function unionMatcherArrays(baseMatchers, gsdMatchers) {
+  const seen = new Set(baseMatchers.map(canonicalMatcherKey));
+  const merged = [...baseMatchers];
+  for (const m of gsdMatchers) {
+    const key = canonicalMatcherKey(m);
+    if (!seen.has(key)) {
+      merged.push(m);
+      seen.add(key);
+    }
+  }
+  return merged;
+}
+function graftGsdHookEntries(base, gsdOnly) {
+  const gsdHooks = asPlainObject(gsdOnly.hooks);
+  if (gsdHooks === null || Object.keys(gsdHooks).length === 0) return base;
+  const baseHooks = asPlainObject(base.hooks);
+  const mergedHooks = baseHooks ? { ...baseHooks } : {};
+  for (const [event, gsdMatchers] of Object.entries(gsdHooks)) {
+    if (!Array.isArray(gsdMatchers)) continue;
+    const baseMatchers = mergedHooks[event];
+    mergedHooks[event] = Array.isArray(baseMatchers) ? unionMatcherArrays(baseMatchers, gsdMatchers) : gsdMatchers;
+  }
+  return { ...base, hooks: mergedHooks };
+}
 function matcherHasGsdEntry(entry) {
   if (entry === null || typeof entry !== "object" || Array.isArray(entry)) return false;
   const entryObj = entry;
@@ -1617,12 +1686,12 @@ function* eachExtrasTarget(v, counts) {
       counts.unmapped++;
       continue;
     }
-    for (const dirname10 of dirnames) {
-      if (!whitelist.includes(dirname10)) {
+    for (const dirname11 of dirnames) {
+      if (!whitelist.includes(dirname11)) {
         counts.skipped++;
         continue;
       }
-      yield { logical, localRoot, dirname: dirname10 };
+      yield { logical, localRoot, dirname: dirname11 };
     }
   }
 }
@@ -1660,8 +1729,8 @@ function copyExtrasFileSkipDiverged(src, dst) {
   }
   copyExtras(src, dst);
 }
-function extrasDenySet(dirname10) {
-  return dirname10 === ".claude" ? CLAUDE_EXTRA_NEVER_SYNC : ALWAYS_NEVER_SYNC;
+function extrasDenySet(dirname11) {
+  return dirname11 === ".claude" ? CLAUDE_EXTRA_NEVER_SYNC : ALWAYS_NEVER_SYNC;
 }
 function copyExtrasFiltered(src, dst, blockSet) {
   rmSync2(dst, { recursive: true, force: true });
@@ -1804,6 +1873,34 @@ function syncSharedLinksPush(map) {
     copyExtrasFiltered(localPath, join5(repo, "shared", name), ALWAYS_NEVER_SYNC);
   }
 }
+function readExistingSettings(settingsPath) {
+  if (!existsSync4(settingsPath)) return { existing: {}, present: false, malformed: false };
+  try {
+    const parsed = readJson(settingsPath);
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return { existing: {}, present: true, malformed: true };
+    }
+    return { existing: parsed, present: true, malformed: false };
+  } catch {
+    return { existing: {}, present: true, malformed: true };
+  }
+}
+function emitDriftWarnings(merged, existing) {
+  const drift = classifySettingsDrift(merged, existing);
+  if (drift.behind.length > 0) {
+    const { phrase, pronoun } = describeSettings(drift.behind);
+    warn(
+      `your settings.json is missing ${phrase} that the synced copy has; run 'nomad pull' to restore ${pronoun}.`
+    );
+  }
+  const { promotable } = partitionByCaptureExclusion(drift.ahead);
+  if (promotable.length > 0) {
+    const { phrase, pronoun, verb } = describeSettings(promotable);
+    warn(
+      `your settings.json has ${phrase} that ${verb} not yet synced; run 'nomad capture-settings' to save ${pronoun} to the repo before the next pull overwrites ${pronoun}.`
+    );
+  }
+}
 function regenerateSettings(ts, opts = {}) {
   const dryRun = opts.dryRun === true;
   const suppressDriftWarn = opts.suppressDriftWarn === true;
@@ -1819,25 +1916,12 @@ function regenerateSettings(ts, opts = {}) {
   const overrides = hasOverrides ? readJson(hostPath) : {};
   const merged = deepMerge(base, overrides);
   const settingsPath = join5(claude, "settings.json");
-  if (!suppressDriftWarn && existsSync4(settingsPath)) {
-    try {
-      const existing = readJson(settingsPath);
-      const drift = classifySettingsDrift(merged, existing);
-      if (drift.behind.length > 0) {
-        const { phrase, pronoun } = describeSettings(drift.behind);
-        warn(
-          `your settings.json is missing ${phrase} that the synced copy has; run 'nomad pull' to restore ${pronoun}.`
-        );
-      }
-      const { promotable } = partitionByCaptureExclusion(drift.ahead);
-      if (promotable.length > 0) {
-        const { phrase, pronoun, verb } = describeSettings(promotable);
-        warn(
-          `your settings.json has ${phrase} that ${verb} not yet synced; run 'nomad capture-settings' to save ${pronoun} to the repo before the next pull overwrites ${pronoun}.`
-        );
-      }
-    } catch {
+  const { existing, present, malformed } = readExistingSettings(settingsPath);
+  if (!suppressDriftWarn && present) {
+    if (malformed) {
       warn("existing settings.json is malformed; skipping drift-check and regenerating.");
+    } else {
+      emitDriftWarnings(merged, existing);
     }
   }
   const overrideLabel = hasOverrides ? `${HOST}.json` : "no host overrides";
@@ -1846,7 +1930,10 @@ function regenerateSettings(ts, opts = {}) {
     return { label: overrideLabel };
   }
   backupBeforeWrite(settingsPath, ts);
-  writeJsonAtomic(settingsPath, stripGsdHookEntries(merged));
+  writeJsonAtomic(
+    settingsPath,
+    graftGsdHookEntries(stripGsdHookEntries(merged), keepGsdHookEntries(existing))
+  );
   return { label: overrideLabel };
 }
 
@@ -2471,8 +2558,8 @@ function cmdEject(opts = {}, roots = defaultEjectRoots()) {
 }
 
 // src/commands.doctor.ts
-import { existsSync as existsSync34 } from "node:fs";
-import { join as join40 } from "node:path";
+import { existsSync as existsSync35 } from "node:fs";
+import { join as join42 } from "node:path";
 
 // src/commands.doctor.checks.repo.ts
 init_color();
@@ -3319,20 +3406,117 @@ function reportCheckSchema(section2) {
 
 // src/commands.doctor.check-shared.ts
 init_color();
-import { randomBytes } from "node:crypto";
+import { randomBytes as randomBytes2 } from "node:crypto";
+import { execFileSync as execFileSync10 } from "node:child_process";
+import { existsSync as existsSync22, mkdirSync as mkdirSync7, readdirSync as readdirSync11, rmSync as rmSync11 } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { join as join28 } from "node:path";
+
+// src/commands.doctor.check-shared.memory.ts
+init_color();
 import { execFileSync as execFileSync9 } from "node:child_process";
-import { existsSync as existsSync22, mkdirSync as mkdirSync6, readdirSync as readdirSync11, rmSync as rmSync10 } from "node:fs";
+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 { join as join27 } from "node:path";
+import { dirname as dirname3, join as join24 } from "node:path";
+init_config();
+init_push_gitleaks();
+init_utils_fs();
+var MEMORY_MD_PATH = /^shared\/projects\/([^/]+)\/memory\/[^/]+\.md$/;
+function buildMemoryScanTree(tmpRoot) {
+  let paths;
+  try {
+    const out = execFileSync9(
+      "git",
+      ["-C", repoHome(), "ls-tree", "-r", "-z", "--name-only", "HEAD", "--", "shared/projects"],
+      { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 1e4 }
+    );
+    paths = out.split("\0").filter((p) => p.length > 0);
+  } catch {
+    return 0;
+  }
+  const logicals = /* @__PURE__ */ new Set();
+  for (const rel of paths) {
+    const m = MEMORY_MD_PATH.exec(rel);
+    if (m?.[1] === void 0) continue;
+    let blob;
+    try {
+      blob = execFileSync9("git", ["-C", repoHome(), "cat-file", "blob", `HEAD:${rel}`], {
+        stdio: ["ignore", "pipe", "ignore"],
+        maxBuffer: 67108864,
+        timeout: 1e4
+      });
+    } catch {
+      continue;
+    }
+    const dest = join24(tmpRoot, rel);
+    mkdirSync4(dirname3(dest), { recursive: true });
+    writeFileSync4(dest, blob);
+    logicals.add(m[1]);
+  }
+  return logicals.size;
+}
+function reportMemoryFindings(section2, findings) {
+  for (const f of findings) {
+    addItem(section2, `${yellow(warnGlyph)} ${f.RuleID} in ${f.File}`);
+  }
+  addItem(
+    section2,
+    `  ${dim("run `nomad push` and choose Redact in the recovery menu to scrub these")}`
+  );
+}
+function reportCommittedMemory(section2) {
+  let tmpRoot;
+  try {
+    const cacheDir = join24(homedir4(), ".cache", "claude-nomad");
+    mkdirSync4(cacheDir, { recursive: true });
+    const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes(4).toString("hex")}`;
+    tmpRoot = join24(cacheDir, `check-shared-memory-tree-${stamp}`);
+    mkdirSync4(tmpRoot, { recursive: true, mode: 448 });
+    const staged = buildMemoryScanTree(tmpRoot);
+    if (staged === 0) return;
+    let findings;
+    try {
+      findings = scanStagedTree(tmpRoot);
+    } catch (err) {
+      addItem(
+        section2,
+        `${yellow(warnGlyph)} committed-memory scan skipped: ${err.message}`
+      );
+      return;
+    }
+    if (findings === null) {
+      addItem(
+        section2,
+        `${yellow(warnGlyph)} committed-memory scan skipped: no parseable gitleaks report`
+      );
+      return;
+    }
+    if (findings.length === 0) return;
+    reportMemoryFindings(section2, findings);
+  } catch (err) {
+    addItem(
+      section2,
+      `${yellow(warnGlyph)} committed-memory scan skipped: ${err.message}`
+    );
+  } finally {
+    if (tmpRoot !== void 0) {
+      try {
+        rmSync9(tmpRoot, { recursive: true, force: true });
+      } catch {
+      }
+    }
+  }
+}
 
 // src/commands.doctor.check-shared.scan.ts
 init_color();
-import { join as join24 } from "node:path";
+import { join as join25 } from "node:path";
 init_config();
 init_push_gitleaks();
 function scrubPath(logical, sid, logicalToEncoded) {
   const encoded = logicalToEncoded.get(logical) ?? logical;
-  return join24(claudeHome(), "projects", encoded, `${sid}.jsonl`);
+  return join25(claudeHome(), "projects", encoded, `${sid}.jsonl`);
 }
 function reportSessionFindings(section2, bySession) {
   for (const [sid, counts] of bySession) {
@@ -3420,8 +3604,8 @@ init_config();
 
 // src/remap.ts
 init_config_sharedDirs_guard();
-import { cpSync as cpSync6, existsSync as existsSync21, lstatSync as lstatSync10, mkdirSync as mkdirSync5, readdirSync as readdirSync10, rmSync as rmSync9, statSync as statSync5 } from "node:fs";
-import { dirname as dirname4, join as join26, relative as relative5, sep as sep4 } from "node:path";
+import { cpSync as cpSync6, existsSync as existsSync21, lstatSync as lstatSync10, mkdirSync as mkdirSync6, readdirSync as readdirSync10, rmSync as rmSync10, statSync as statSync5 } from "node:fs";
+import { dirname as dirname5, join as join27, relative as relative5, sep as sep4 } from "node:path";
 init_config();
 
 // src/push-manifest.ts
@@ -3429,8 +3613,8 @@ init_config();
 init_push_gitleaks_config();
 init_utils_fs();
 import { createHash } from "node:crypto";
-import { existsSync as existsSync20, mkdirSync as mkdirSync4, readdirSync as readdirSync9, readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
-import { dirname as dirname3, join as join25 } from "node:path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync5, readdirSync as readdirSync9, readFileSync as readFileSync7, statSync as statSync4 } from "node:fs";
+import { dirname as dirname4, join as join26 } from "node:path";
 function isChanged(prev, cur, hash) {
   if (prev === void 0) return true;
   if (prev.size !== cur.size) return true;
@@ -3471,7 +3655,7 @@ function hashFile(absPath) {
 }
 function enumerateDir(dir, results) {
   for (const entry of readdirSync9(dir)) {
-    const fullPath = join25(dir, entry);
+    const fullPath = join26(dir, entry);
     const st = statSync4(fullPath);
     if (st.isDirectory()) {
       enumerateDir(fullPath, results);
@@ -3483,7 +3667,7 @@ function enumerateDir(dir, results) {
 function enumerateSourceFiles(projectDir) {
   const results = [];
   for (const entry of readdirSync9(projectDir)) {
-    const fullPath = join25(projectDir, entry);
+    const fullPath = join26(projectDir, entry);
     const st = statSync4(fullPath);
     if (st.isDirectory()) {
       enumerateDir(fullPath, results);
@@ -3502,8 +3686,8 @@ function computeConfigHash() {
   const repo = repoHome();
   const parts = [
     fileIdentity(resolveTomlPath(repo)),
-    fileIdentity(join25(repo, ".gitleaks.overlay.toml")),
-    fileIdentity(join25(repo, ".gitleaksignore"))
+    fileIdentity(join26(repo, ".gitleaks.overlay.toml")),
+    fileIdentity(join26(repo, ".gitleaksignore"))
   ];
   return createHash("sha256").update(parts.join("\n")).digest("hex");
 }
@@ -3523,7 +3707,7 @@ function readManifest(path) {
   }
 }
 function writeManifest(path, manifest) {
-  mkdirSync4(dirname3(path), { recursive: true });
+  mkdirSync5(dirname4(path), { recursive: true });
   writeJsonAtomic(path, manifest);
 }
 function buildManifest(files, scannerVersion, configHash) {
@@ -3537,9 +3721,9 @@ init_utils_json();
 var TMP_SUFFIX = ".nomad-tmp";
 function atomicMirror(src, dst, options) {
   const tmp = `${dst}${TMP_SUFFIX}`;
-  rmSync9(tmp, { recursive: true, force: true });
+  rmSync10(tmp, { recursive: true, force: true });
   cpSync6(src, tmp, options);
-  rmSync9(dst, { recursive: true, force: true });
+  rmSync10(dst, { recursive: true, force: true });
   renameAtomicRetry(tmp, dst);
 }
 function overlaySessionDir(src, dst) {
@@ -3547,7 +3731,7 @@ function overlaySessionDir(src, dst) {
   cpSyncGuarded(src, dst, void 0, "overlaySessionDir");
 }
 function copyFileAtomic(src, dst) {
-  mkdirSync5(dirname4(dst), { recursive: true });
+  mkdirSync6(dirname5(dst), { recursive: true });
   const tmp = `${dst}.tmp.${process.pid}`;
   cpSync6(src, tmp, { force: true, preserveTimestamps: true });
   renameAtomicRetry(tmp, dst);
@@ -3565,12 +3749,12 @@ function applySelective(sel, localDir, repoDst) {
   const prefix = `${localDir}${sep4}`;
   for (const src of sel.changed) {
     if (!src.startsWith(prefix)) continue;
-    copyFileAtomic(src, join26(repoDst, relative5(localDir, src)));
+    copyFileAtomic(src, join27(repoDst, relative5(localDir, src)));
   }
   for (const src of sel.deleted) {
     if (!src.startsWith(prefix)) continue;
-    const dst = join26(repoDst, relative5(localDir, src));
-    if (existsSync21(dst)) rmSync9(dst);
+    const dst = join27(repoDst, relative5(localDir, src));
+    if (existsSync21(dst)) rmSync10(dst);
   }
 }
 function copyDirJsonlOnly(src, dst) {
@@ -3599,16 +3783,16 @@ function remapPull(ts, opts = {}) {
   const wouldPull = [];
   const repo = repoHome();
   const claude = claudeHome();
-  const mapPath = join26(repo, "path-map.json");
-  const repoProjects = join26(repo, "shared", "projects");
+  const mapPath = join27(repo, "path-map.json");
+  const repoProjects = join27(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 = join26(claude, "projects");
-  if (!dryRun) mkdirSync5(localProjects, { recursive: true });
+  const localProjects = join27(claude, "projects");
+  if (!dryRun) mkdirSync6(localProjects, { recursive: true });
   for (const [logical, hosts] of Object.entries(map.projects)) {
     assertSafeLogical(logical);
     const localPath = hosts[HOST];
@@ -3617,9 +3801,9 @@ function remapPull(ts, opts = {}) {
       continue;
     }
     assertSafeLocalRoot(localPath, logical);
-    const src = join26(repoProjects, logical);
+    const src = join27(repoProjects, logical);
     if (!existsSync21(src)) continue;
-    const dst = join26(localProjects, encodePath(localPath));
+    const dst = join27(localProjects, encodePath(localPath));
     if (dryRun) {
       wouldPull.push(logical);
       emitPreview(
@@ -3638,8 +3822,8 @@ function remapPull(ts, opts = {}) {
 function countLocalOnly(src, dst) {
   let count = 0;
   for (const name of readdirSync10(dst)) {
-    const dstPath = join26(dst, name);
-    const srcPath = join26(src, name);
+    const dstPath = join27(dst, name);
+    const srcPath = join27(src, name);
     if (lstatSync10(dstPath).isDirectory()) {
       count += countLocalOnly(srcPath, dstPath);
     } else if (lstatSync10(srcPath, { throwIfNoEntry: false }) === void 0) {
@@ -3651,20 +3835,20 @@ function countLocalOnly(src, dst) {
 function scanLocalOnly() {
   const repo = repoHome();
   const claude = claudeHome();
-  const mapPath = join26(repo, "path-map.json");
-  const repoProjects = join26(repo, "shared", "projects");
+  const mapPath = join27(repo, "path-map.json");
+  const repoProjects = join27(repo, "shared", "projects");
   if (!existsSync21(mapPath) || !existsSync21(repoProjects)) return 0;
   const map = readPathMap(mapPath);
-  const localProjects = join26(claude, "projects");
+  const localProjects = join27(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 = join26(localProjects, encodePath(localPath));
+    const dst = join27(localProjects, encodePath(localPath));
     if (!existsSync21(dst)) continue;
-    count += countLocalOnly(join26(repoProjects, logical), dst);
+    count += countLocalOnly(join27(repoProjects, logical), dst);
   }
   return count;
 }
@@ -3699,17 +3883,17 @@ function remapPush(ts, opts = {}) {
   const wouldPush = [];
   const repo = repoHome();
   const claude = claudeHome();
-  const mapPath = join26(repo, "path-map.json");
+  const mapPath = join27(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 = join26(claude, "projects");
-  const repoProjects = join26(repo, "shared", "projects");
+  const localProjects = join27(claude, "projects");
+  const repoProjects = join27(repo, "shared", "projects");
   const reverse = buildReverseMap(map);
   if (!existsSync21(localProjects)) return { unmapped, collisions: 0, pushed, wouldPush };
-  if (!dryRun) mkdirSync5(repoProjects, { recursive: true });
+  if (!dryRun) mkdirSync6(repoProjects, { recursive: true });
   for (const dir of readdirSync10(localProjects)) {
     if (dir.endsWith(TMP_SUFFIX)) continue;
     const logical = reverse.get(dir);
@@ -3717,8 +3901,8 @@ function remapPush(ts, opts = {}) {
       unmapped++;
       continue;
     }
-    const localDir = join26(localProjects, dir);
-    const repoDst = join26(repoProjects, logical);
+    const localDir = join27(localProjects, dir);
+    const repoDst = join27(repoProjects, logical);
     if (skipForSelection(opts.selection, localDir)) continue;
     if (dryRun) {
       wouldPush.push(logical);
@@ -3742,7 +3926,7 @@ function buildScanTree(tmpRoot) {
   const logicalToEncoded = /* @__PURE__ */ new Map();
   let staged = 0;
   const repo = repoHome();
-  const mapPath = join27(repo, "path-map.json");
+  const mapPath = join28(repo, "path-map.json");
   if (!existsSync22(mapPath)) return { logicalToEncoded, staged, malformed: false };
   let map;
   try {
@@ -3760,12 +3944,12 @@ function buildScanTree(tmpRoot) {
     if (!p || p === "TBD") continue;
     reverse.set(encodePath(p), logical);
   }
-  const localProjects = join27(claudeHome(), "projects");
+  const localProjects = join28(claudeHome(), "projects");
   if (!existsSync22(localProjects)) return { logicalToEncoded, staged, malformed: false };
   for (const dir of readdirSync11(localProjects)) {
     const logical = reverse.get(dir);
     if (!logical) continue;
-    copyDirJsonlOnly(join27(localProjects, dir), join27(tmpRoot, "shared", "projects", logical));
+    copyDirJsonlOnly(join28(localProjects, dir), join28(tmpRoot, "shared", "projects", logical));
     logicalToEncoded.set(logical, dir);
     staged++;
   }
@@ -3773,7 +3957,7 @@ function buildScanTree(tmpRoot) {
 }
 function probeGitleaksForScan() {
   try {
-    execFileSync9("gitleaks", ["version"], { stdio: ["ignore", "pipe", "pipe"] });
+    execFileSync10("gitleaks", ["version"], { stdio: ["ignore", "pipe", "pipe"] });
     return "ok";
   } catch (err) {
     if (err.code === "ENOENT") return "missing";
@@ -3794,13 +3978,12 @@ function ensureGitleaksReady(section2, gitleaksReady) {
   }
   return true;
 }
-function reportCheckShared(section2, gitleaksReady) {
-  if (!ensureGitleaksReady(section2, gitleaksReady)) return;
-  const cacheDir = join27(homedir4(), ".cache", "claude-nomad");
-  mkdirSync6(cacheDir, { recursive: true });
-  const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes(4).toString("hex")}`;
-  const reportPath = join27(cacheDir, `check-shared-${stamp}.json`);
-  const tmpRoot = join27(cacheDir, `check-shared-tree-${stamp}`);
+function runLocalPreviewScan(section2) {
+  const cacheDir = join28(homedir5(), ".cache", "claude-nomad");
+  mkdirSync7(cacheDir, { recursive: true });
+  const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes2(4).toString("hex")}`;
+  const reportPath = join28(cacheDir, `check-shared-${stamp}.json`);
+  const tmpRoot = join28(cacheDir, `check-shared-tree-${stamp}`);
   try {
     const { logicalToEncoded, staged, malformed } = buildScanTree(tmpRoot);
     if (malformed) {
@@ -3814,15 +3997,26 @@ function reportCheckShared(section2, gitleaksReady) {
     }
     scanAndReport(section2, tmpRoot, staged, logicalToEncoded);
   } finally {
-    rmSync10(reportPath, { force: true });
-    rmSync10(tmpRoot, { recursive: true, force: true });
+    rmSync11(reportPath, { force: true });
+    rmSync11(tmpRoot, { recursive: true, force: true });
+  }
+}
+function reportCheckShared(section2, gitleaksReady) {
+  if (!ensureGitleaksReady(section2, gitleaksReady)) return;
+  try {
+    runLocalPreviewScan(section2);
+  } catch (err) {
+    addItem(section2, `${red(failGlyph)} shared scan failed: ${err.message}`);
+    process.exitCode = 1;
+  } finally {
+    reportCommittedMemory(section2);
   }
 }
 
 // src/commands.doctor.checks.hooks.scope.ts
 init_color();
 import { existsSync as existsSync23, readFileSync as readFileSync8, readdirSync as readdirSync12, realpathSync as realpathSync2 } from "node:fs";
-import { dirname as dirname5, extname, join as join28 } from "node:path";
+import { dirname as dirname6, extname, join as join29 } from "node:path";
 init_config();
 function typeFromPackageJson(pkgPath) {
   try {
@@ -3842,11 +4036,11 @@ function effectiveType(hookPath) {
   } catch {
     return null;
   }
-  let dir = dirname5(real);
+  let dir = dirname6(real);
   for (; ; ) {
-    const pkg = join28(dir, "package.json");
+    const pkg = join29(dir, "package.json");
     if (existsSync23(pkg)) return typeFromPackageJson(pkg);
-    const parent = dirname5(dir);
+    const parent = dirname6(dir);
     if (parent === dir) return "cjs";
     dir = parent;
   }
@@ -3887,7 +4081,7 @@ function safeRead(path) {
   }
 }
 function reportHookScopeCheck(section2) {
-  const hooksDir = join28(claudeHome(), "hooks");
+  const hooksDir = join29(claudeHome(), "hooks");
   if (!existsSync23(hooksDir)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/hooks; skipping module-scope check`);
     return;
@@ -3895,7 +4089,7 @@ function reportHookScopeCheck(section2) {
   let anyWarn = false;
   for (const name of safeReaddir2(hooksDir)) {
     if (extname(name) !== ".js") continue;
-    const abs = join28(hooksDir, name);
+    const abs = join29(hooksDir, name);
     const eff = effectiveType(abs);
     if (eff === null) continue;
     const src = safeRead(abs);
@@ -3916,7 +4110,7 @@ function reportHookScopeCheck(section2) {
 // src/commands.doctor.checks.hooks.ts
 init_color();
 import { existsSync as existsSync24 } from "node:fs";
-import { join as join29 } from "node:path";
+import { join as join30 } from "node:path";
 init_config();
 function expandHome(token) {
   const h2 = home();
@@ -3972,7 +4166,7 @@ function checkEventGroups(section2, event, groups) {
   return anyFail;
 }
 function reportHooksTargetCheck(section2) {
-  const settingsPath = join29(claudeHome(), "settings.json");
+  const settingsPath = join30(claudeHome(), "settings.json");
   if (!existsSync24(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json; skipping hook target check`);
     return;
@@ -3997,11 +4191,11 @@ function reportHooksTargetCheck(section2) {
 // src/commands.doctor.checks.hooks.preserve-symlinks.ts
 init_color();
 import { existsSync as existsSync26, readFileSync as readFileSync9 } from "node:fs";
-import { join as join31 } from "node:path";
+import { join as join32 } from "node:path";
 
 // src/commands.doctor.checks.hooks.preserve-symlinks.probe.ts
 import { closeSync as closeSync3, existsSync as existsSync25, openSync as openSync3, readSync, realpathSync as realpathSync3 } from "node:fs";
-import { dirname as dirname6, join as join30, resolve as resolve2 } from "node:path";
+import { dirname as dirname7, join as join31, resolve as resolve2 } from "node:path";
 function suppressedRanges(src) {
   const ranges = [];
   const re = /\/\*[\s\S]*?\*\/|\/\/[^\n]*|'[^']*'|"[^"]*"|`[^`]*`/g;
@@ -4038,7 +4232,7 @@ function specifierIsMissing(specifier, baseDir) {
     if (existsSync25(base + ext)) return false;
   }
   for (const idx of ["index.js", "index.cjs", "index.mjs"]) {
-    if (existsSync25(join30(base, idx))) return false;
+    if (existsSync25(join31(base, idx))) return false;
   }
   return true;
 }
@@ -4064,7 +4258,7 @@ function relativeRequireTargetsBroken(scriptPath) {
   }
   const specifiers = topRelativeSpecifiers(raw);
   if (specifiers.length === 0) return false;
-  const baseDir = dirname6(realPath);
+  const baseDir = dirname7(realPath);
   for (const spec of specifiers) {
     if (specifierIsMissing(spec, baseDir)) return true;
   }
@@ -4093,7 +4287,7 @@ function commandTokens(command) {
   return tokens;
 }
 function readPathMapSafe() {
-  const mapPath = join31(repoHome(), "path-map.json");
+  const mapPath = join32(repoHome(), "path-map.json");
   if (!existsSync26(mapPath)) return { projects: {} };
   try {
     return JSON.parse(readFileSync9(mapPath, "utf8"));
@@ -4168,7 +4362,7 @@ function checkEventForPreserveSymlinks(section2, event, groups, sharedLinkNames)
   return anyWarn;
 }
 function reportPreserveSymlinksCheck(section2) {
-  const settingsPath = join31(claudeHome(), "settings.json");
+  const settingsPath = join32(claudeHome(), "settings.json");
   if (!existsSync26(settingsPath)) {
     addItem(
       section2,
@@ -4203,7 +4397,7 @@ function reportPreserveSymlinksCheck(section2) {
 // src/commands.doctor.checks.settings-drift.ts
 init_color();
 import { existsSync as existsSync27, readFileSync as readFileSync10 } from "node:fs";
-import { join as join32 } from "node:path";
+import { join as join33 } from "node:path";
 init_config();
 init_utils_json();
 function diffMergedSettings(merged, settings) {
@@ -4221,7 +4415,7 @@ function tryReadJson(filePath) {
   }
 }
 function reportHooksBaseSelfCleanNote(section2) {
-  const basePath = join32(repoHome(), "shared", "settings.base.json");
+  const basePath = join33(repoHome(), "shared", "settings.base.json");
   const base = tryReadJson(basePath);
   if (base === null) return;
   if (!baseHasGsdHookEntries(base)) return;
@@ -4234,9 +4428,9 @@ function reportSettingsDriftCheck(section2) {
   const claude = claudeHome();
   const repo = repoHome();
   const host = HOST;
-  const settingsPath = join32(claude, "settings.json");
-  const basePath = join32(repo, "shared", "settings.base.json");
-  const hostPath = join32(repo, "hosts", `${host}.json`);
+  const settingsPath = join33(claude, "settings.json");
+  const basePath = join33(repo, "shared", "settings.base.json");
+  const hostPath = join33(repo, "hosts", `${host}.json`);
   if (!existsSync27(settingsPath)) {
     addItem(section2, `${dim(infoGlyph)} no ~/.claude/settings.json; skipping merge-drift check`);
     return;
@@ -4418,7 +4612,7 @@ function reportNodeEngineCheck(section2) {
 
 // src/commands.doctor.checks.longpaths.ts
 init_color();
-import { execFileSync as execFileSync10 } from "node:child_process";
+import { execFileSync as execFileSync11 } from "node:child_process";
 init_config();
 var PROBE_TIMEOUT_MS = 3e3;
 var LONGPATHS_REG_KEY = String.raw`HKLM\SYSTEM\CurrentControlSet\Control\FileSystem`;
@@ -4452,7 +4646,7 @@ function addLongpathsRow(section2, label, enabled2, remediation) {
   }
   addItem(section2, `${yellow(warnGlyph)} ${label}: not enabled (${remediation})`);
 }
-function reportLongPathsCheck(section2, run = execFileSync10) {
+function reportLongPathsCheck(section2, run = execFileSync11) {
   if (process.platform !== "win32") return;
   addLongpathsRow(
     section2,
@@ -4474,15 +4668,15 @@ function reportSyncModality(section2) {
 
 // src/commands.doctor.checks.crlf.ts
 init_color();
-import { execFileSync as execFileSync11 } from "node:child_process";
+import { execFileSync as execFileSync12 } from "node:child_process";
 import { existsSync as existsSync28, readFileSync as readFileSync13 } from "node:fs";
-import { join as join33 } from "node:path";
+import { join as join34 } from "node:path";
 init_config();
 var PROBE_TIMEOUT_MS2 = 3e3;
 var GUARD_LINE = /^\*\s+-text\b/;
 function hasGitattributesGuard(repo) {
   try {
-    const path = join33(repo, ".gitattributes");
+    const path = join34(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));
@@ -4513,7 +4707,7 @@ function addExposedRow(section2, repo, verdict) {
   const remediation = `add a .gitattributes with a \`* -text\` line, or run \`git config core.autocrlf false\`, in ${repo}`;
   addItem(section2, `${yellow(warnGlyph)} CRLF guard: ${risk}; ${remediation}`);
 }
-function reportCrlfGuardCheck(section2, run = execFileSync11) {
+function reportCrlfGuardCheck(section2, run = execFileSync12) {
   const repo = repoHome();
   if (hasGitattributesGuard(repo)) {
     addItem(section2, `${green(okGlyph)} CRLF guard: .gitattributes (* -text) present`);
@@ -4524,35 +4718,35 @@ function reportCrlfGuardCheck(section2, run = execFileSync11) {
 
 // src/spinner.ts
 init_color();
-import { existsSync as existsSync32 } from "node:fs";
+import { existsSync as existsSync33 } from "node:fs";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { Worker } from "node:worker_threads";
 
 // src/commands.push.recovery.ts
 init_config();
-import { readFileSync as readFileSync16, rmSync as rmSync12, writeFileSync as writeFileSync5 } from "node:fs";
-import { join as join38 } from "node:path";
+import { readFileSync as readFileSync17, rmSync as rmSync13, writeFileSync as writeFileSync7 } from "node:fs";
+import { join as join40 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 
 // src/commands.push.recovery.actions.ts
 init_config();
-import { readFileSync as readFileSync15 } from "node:fs";
+import { readFileSync as readFileSync16 } from "node:fs";
 import { isAbsolute as isAbsolute2, resolve as resolve3, sep as sep6 } from "node:path";
 
 // src/commands.push.recovery.redact.ts
 init_config();
 init_config_sharedDirs_guard();
-import { cpSync as cpSync7, existsSync as existsSync31, mkdirSync as mkdirSync7, statSync as statSync8 } from "node:fs";
-import { dirname as dirname8, join as join36, sep as sep5 } from "node:path";
+import { cpSync as cpSync8, existsSync as existsSync32, mkdirSync as mkdirSync9, statSync as statSync8 } from "node:fs";
+import { dirname as dirname9, join as join38, sep as sep5 } from "node:path";
 
 // src/commands.redact.ts
 init_config();
 import { existsSync as existsSync30, statSync as statSync7 } from "node:fs";
-import { dirname as dirname7, join as join35 } from "node:path";
+import { dirname as dirname8, join as join36 } from "node:path";
 
 // src/commands.redact.subtree.ts
-import { existsSync as existsSync29, lstatSync as lstatSync11, readFileSync as readFileSync14, readdirSync as readdirSync13, statSync as statSync6, writeFileSync as writeFileSync4 } from "node:fs";
-import { join as join34 } from "node:path";
+import { existsSync as existsSync29, lstatSync as lstatSync11, readFileSync as readFileSync14, readdirSync as readdirSync13, statSync as statSync6, writeFileSync as writeFileSync5 } from "node:fs";
+import { join as join35 } from "node:path";
 init_utils_fs();
 init_utils();
 function collectFiles(dir, out) {
@@ -4560,7 +4754,7 @@ function collectFiles(dir, out) {
   const st = lstatSync11(dir);
   if (!st.isDirectory()) return;
   for (const entry of readdirSync13(dir)) {
-    const abs = join34(dir, entry);
+    const abs = join35(dir, entry);
     const lst = lstatSync11(abs);
     if (lst.isSymbolicLink()) continue;
     if (lst.isDirectory()) {
@@ -4604,7 +4798,7 @@ function applySubtreeRedactions(mainPath, mainFindings, subtreeFiles, rule, ts,
           `warning: no redaction applied to ${filePath}: finding match values were not located in the file. Inspect it manually; the push re-scan still blocks a real leak.`
         );
       }
-      writeFileSync4(filePath, after, "utf8");
+      writeFileSync5(filePath, after, "utf8");
     }
   }
   return { total, dirty };
@@ -4612,10 +4806,10 @@ function applySubtreeRedactions(mainPath, mainFindings, subtreeFiles, rule, ts,
 
 // src/commands.pushed-history.ts
 init_utils();
-import { execFileSync as execFileSync12 } from "node:child_process";
+import { execFileSync as execFileSync13 } from "node:child_process";
 function pushedRef(repo) {
   try {
-    const ref = execFileSync12("git", ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"], {
+    const ref = execFileSync13("git", ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"], {
       cwd: repo,
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim();
@@ -4628,7 +4822,7 @@ function sessionInPushedHistory(id, repo) {
   const ref = pushedRef(repo);
   if (ref === null) return false;
   try {
-    const out = execFileSync12(
+    const out = execFileSync13(
       "git",
       [
         "log",
@@ -4665,14 +4859,14 @@ init_utils_json();
 init_utils();
 function resolveLiveTranscript(id) {
   try {
-    const mapPath = join35(repoHome(), "path-map.json");
+    const mapPath = join36(repoHome(), "path-map.json");
     if (!existsSync30(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 = join35(claude, "projects", encodePath(abs), `${id}.jsonl`);
+      const live = join36(claude, "projects", encodePath(abs), `${id}.jsonl`);
       if (existsSync30(live)) return live;
     }
     return null;
@@ -4703,7 +4897,7 @@ function cmdRedact(opts, nowMs = Date.now, scan = scanFile) {
       process.exitCode = 1;
       return;
     }
-    const sessionDir = join35(dirname7(localPath), id);
+    const sessionDir = join36(dirname8(localPath), id);
     const subtreeFiles = listSubtreeFiles(sessionDir);
     const subtreeMtime = newestSubtreeMtimeMs(localPath, subtreeFiles, (p) => statSync7(p).mtimeMs);
     if (isRecentlyModified(subtreeMtime, nowMs())) {
@@ -4763,6 +4957,78 @@ init_utils();
 
 // src/commands.push.recovery.seams.ts
 init_push_gitleaks();
+
+// src/commands.push.recovery.memory.ts
+init_config();
+init_config_sharedDirs_guard();
+import { cpSync as cpSync7, existsSync as existsSync31, mkdirSync as mkdirSync8, readFileSync as readFileSync15, writeFileSync as writeFileSync6 } from "node:fs";
+import { join as join37 } from "node:path";
+init_push_gitleaks_scan();
+init_utils_fs();
+init_utils_json();
+init_utils();
+var MEMORY_FINDING_PATH = /^shared\/projects\/([^/]+)\/memory\/([^/]+\.md)$/;
+var SAFE_MEMORY_FILENAME = /^[^/\\]+\.md$/;
+var MEMORY_DIR_PATH = /^shared\/projects\/[^/]+\/memory\//;
+function memoryFileFromFinding(f) {
+  const m = MEMORY_FINDING_PATH.exec(f.File);
+  if (m?.[1] === void 0 || m[2] === void 0) return null;
+  return { logical: m[1], filename: m[2] };
+}
+function isMemoryFindingPath(f) {
+  return MEMORY_DIR_PATH.test(f.File);
+}
+function resolveMemoryLocalPath(logical, filename, map) {
+  assertSafeLogical(logical);
+  if (!SAFE_MEMORY_FILENAME.test(filename) || filename.includes("..")) return null;
+  const abs = map.projects[logical]?.[HOST];
+  if (abs === void 0) return null;
+  const localPath = join37(claudeHome(), "projects", encodePath(abs), "memory", filename);
+  return existsSync31(localPath) ? localPath : null;
+}
+function preflightMemoryRedactable(f, map) {
+  const parsed = memoryFileFromFinding(f);
+  if (parsed === null) return "a finding is not a project-level memory file";
+  const localPath = resolveMemoryLocalPath(parsed.logical, parsed.filename, map);
+  if (localPath === null) {
+    return `memory file ${parsed.logical}/memory/${parsed.filename}: local file not found or unmapped`;
+  }
+  return null;
+}
+function applyMemoryRedact(f, ts, map, scan = scanFile) {
+  const refuse = (msg) => {
+    log(msg);
+    return false;
+  };
+  const parsed = memoryFileFromFinding(f);
+  if (parsed === null) {
+    return refuse("could not parse this finding as a project-level memory file; choose Skip.");
+  }
+  const { logical, filename } = parsed;
+  const localPath = resolveMemoryLocalPath(logical, filename, map);
+  if (localPath === null) {
+    return refuse(
+      `could not locate the local memory file for ${logical}/memory/${filename}; choose Skip.`
+    );
+  }
+  const findings = scan(localPath);
+  if (findings === null) {
+    return refuse(`re-scan of ${logical}/memory/${filename} failed; choose Skip.`);
+  }
+  if (findings.length === 0) {
+    return refuse(`nothing to redact in ${logical}/memory/${filename}; choose Skip.`);
+  }
+  backupBeforeWrite(localPath, ts);
+  const before = readFileSync15(localPath, "utf8");
+  const after = applyRedactions(before, findings);
+  writeFileSync6(localPath, after, "utf8");
+  const stagedMemoryDir = join37(repoHome(), "shared", "projects", logical, "memory");
+  mkdirSync8(stagedMemoryDir, { recursive: true });
+  cpSync7(localPath, join37(stagedMemoryDir, filename), { force: true });
+  return true;
+}
+
+// src/commands.push.recovery.seams.ts
 var MASK_LEAD = 4;
 var MASK_BODY = "************";
 var CONTEXT_WINDOW = 40;
@@ -4771,8 +5037,10 @@ function findingKey(f) {
   return `${f.File}:${f.StartLine}:${f.StartColumn}:${f.RuleID}`;
 }
 var VALID_SID = /^[A-Za-z0-9_-]+$/;
+var SUBTREE_PATH = /^shared\/projects\/[^/]+\/([^/]+)\/.+$/;
 function sessionIdFromFinding(f) {
-  const m = SESSION_PATH.exec(f.File) ?? /^shared\/projects\/[^/]+\/([^/]+)\//.exec(f.File);
+  if (isMemoryFindingPath(f)) return null;
+  const m = SESSION_PATH.exec(f.File) ?? SUBTREE_PATH.exec(f.File);
   if (m === null) return null;
   const sid = m[1];
   return VALID_SID.test(sid) ? sid : null;
@@ -4819,8 +5087,8 @@ function resolveStagedDir(localPath, map, claude, repo) {
     assertSafeLogical(logical);
     const abs = hostMap[HOST];
     if (abs === void 0) continue;
-    if (localPath.startsWith(join36(claude, "projects", encodePath(abs)) + sep5)) {
-      return join36(repo, "shared", "projects", logical);
+    if (localPath.startsWith(join38(claude, "projects", encodePath(abs)) + sep5)) {
+      return join38(repo, "shared", "projects", logical);
     }
   }
   return null;
@@ -4830,7 +5098,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 = join36(dirname8(localPath), sid);
+  const sessionDir = join38(dirname9(localPath), sid);
   const subtreeFiles = listSubtreeFiles(sessionDir);
   const subtreeMtime = newestSubtreeMtimeMs(localPath, subtreeFiles, (p) => statSync8(p).mtimeMs);
   if (isRecentlyModified(subtreeMtime, nowMs())) {
@@ -4860,7 +5128,7 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
       `could not locate the local transcript for session ${sid}; choose Skip or Drop session.`
     );
   }
-  const sessionDir = join36(dirname8(localPath), sid);
+  const sessionDir = join38(dirname9(localPath), sid);
   const subtreeFiles = listSubtreeFiles(sessionDir);
   const subtreeMtime = newestSubtreeMtimeMs(localPath, subtreeFiles, (p) => statSync8(p).mtimeMs);
   if (isRecentlyModified(subtreeMtime, nowMs())) {
@@ -4893,27 +5161,27 @@ function applyRedact(f, ts, map, nowMs, scan = scanFile) {
       `nothing to redact in the local transcript for session ${sid}; choose Skip or Drop session.`
     );
   }
-  mkdirSync7(stagedProjectDir, { recursive: true });
-  cpSync7(localPath, join36(stagedProjectDir, `${sid}.jsonl`), { force: true });
-  if (existsSync31(sessionDir)) {
-    cpSync7(sessionDir, join36(stagedProjectDir, sid), { force: true, recursive: true });
+  mkdirSync9(stagedProjectDir, { recursive: true });
+  cpSync8(localPath, join38(stagedProjectDir, `${sid}.jsonl`), { force: true });
+  if (existsSync32(sessionDir)) {
+    cpSync8(sessionDir, join38(stagedProjectDir, sid), { force: true, recursive: true });
   }
   return true;
 }
 
 // src/commands.push.recovery.drop.ts
 init_config();
-import { rmSync as rmSync11 } from "node:fs";
-import { join as join37 } from "node:path";
+import { rmSync as rmSync12 } from "node:fs";
+import { join as join39 } from "node:path";
 function dropSessionFromStaged(sid, map) {
   const logicals = Object.keys(map.projects);
   if (logicals.length === 0) return false;
   const repo = repoHome();
   for (const logical of logicals) {
-    const jsonl = join37(repo, "shared", "projects", logical, `${sid}.jsonl`);
-    const dir = join37(repo, "shared", "projects", logical, sid);
-    rmSync11(jsonl, { force: true });
-    rmSync11(dir, { recursive: true, force: true });
+    const jsonl = join39(repo, "shared", "projects", logical, `${sid}.jsonl`);
+    const dir = join39(repo, "shared", "projects", logical, sid);
+    rmSync12(jsonl, { force: true });
+    rmSync12(dir, { recursive: true, force: true });
   }
   return true;
 }
@@ -4947,7 +5215,7 @@ function makeDefaultReadLine(repo) {
       if (isAbsolute2(file) || target !== repoRoot && !target.startsWith(repoRoot + sep6)) {
         return null;
       }
-      const content = readFileSync15(target, "utf8");
+      const content = readFileSync16(target, "utf8");
       const lines = content.split(/\r?\n/);
       const idx = line - 1;
       if (idx < 0 || idx >= lines.length) return null;
@@ -4970,6 +5238,22 @@ Finding: ${f.RuleID} in ${f.File} line ${f.StartLine}` + (sid === null ? "" : `
   }
   return actions;
 }
+function dispatchMemory(f, action, ctx) {
+  const parsed = memoryFileFromFinding(f);
+  if (parsed === null) {
+    if (isMemoryFindingPath(f)) {
+      log(`memory path not auto-redactable: ${f.File}; scrub it by hand or choose Skip`);
+    }
+    return;
+  }
+  if (action === "drop") {
+    log("memory files cannot be dropped; use Redact or Skip");
+    return;
+  }
+  const memKey = `${parsed.logical}/${parsed.filename}`;
+  if (ctx.redactedMemory.has(memKey)) return;
+  if (applyMemoryRedact(f, ctx.ts, ctx.map, ctx.scan)) ctx.redactedMemory.add(memKey);
+}
 function dispatchOne(f, ctx) {
   const action = ctx.actions.get(findingKey(f)) ?? "skip";
   if (action === "skip") return;
@@ -4979,7 +5263,10 @@ function dispatchOne(f, ctx) {
     applyAllow(f, ctx.repo);
     return;
   }
-  if (sid === null) return;
+  if (sid === null) {
+    dispatchMemory(f, action, ctx);
+    return;
+  }
   if (action === "drop") {
     ctx.droppedSids.add(sid);
     if (ctx.drop(sid, ctx.map)) {
@@ -5004,20 +5291,46 @@ function dispatchActions(findings, actions, opts) {
     scan,
     drop,
     redactedSids: /* @__PURE__ */ new Set(),
-    droppedSids: /* @__PURE__ */ new Set()
+    droppedSids: /* @__PURE__ */ new Set(),
+    redactedMemory: /* @__PURE__ */ new Set()
   };
   for (const f of findings) {
     dispatchOne(f, ctx);
   }
 }
+function redactAllDedupeKey(f) {
+  const sid = sessionIdFromFinding(f);
+  if (sid !== null) return sid;
+  const parsed = memoryFileFromFinding(f);
+  return parsed !== null ? `${parsed.logical}/${parsed.filename}` : findingKey(f);
+}
+function redactAllPreflightOne(f, map, nowMs) {
+  if (sessionIdFromFinding(f) === null && memoryFileFromFinding(f) !== null) {
+    return preflightMemoryRedactable(f, map);
+  }
+  return preflightRedactable(f, map, nowMs);
+}
+function redactAllOne(f, ts, map, nowMs, scan, redactedSids, redactedMemory) {
+  const sid = sessionIdFromFinding(f);
+  if (sid !== null) {
+    if (redactedSids.has(sid)) return;
+    if (applyRedact(f, ts, map, nowMs, scan)) redactedSids.add(sid);
+    return;
+  }
+  const parsed = memoryFileFromFinding(f);
+  if (parsed === null) return;
+  const memKey = `${parsed.logical}/${parsed.filename}`;
+  if (redactedMemory.has(memKey)) return;
+  if (applyMemoryRedact(f, ts, map, scan)) redactedMemory.add(memKey);
+}
 function redactAllFindings(findings, ts, map, nowMs, scan = scanFile) {
   const refusals = [];
   const preflighted = /* @__PURE__ */ new Set();
   for (const f of findings) {
-    const dedupeKey = sessionIdFromFinding(f) ?? findingKey(f);
+    const dedupeKey = redactAllDedupeKey(f);
     if (preflighted.has(dedupeKey)) continue;
     preflighted.add(dedupeKey);
-    const reason = preflightRedactable(f, map, nowMs);
+    const reason = redactAllPreflightOne(f, map, nowMs);
     if (reason !== null) refusals.push(reason);
   }
   if (refusals.length > 0) {
@@ -5028,10 +5341,9 @@ function redactAllFindings(findings, ts, map, nowMs, scan = scanFile) {
     );
   }
   const redactedSids = /* @__PURE__ */ new Set();
+  const redactedMemory = /* @__PURE__ */ new Set();
   for (const f of findings) {
-    const sid = sessionIdFromFinding(f);
-    if (sid === null || redactedSids.has(sid)) continue;
-    if (applyRedact(f, ts, map, nowMs, scan)) redactedSids.add(sid);
+    redactAllOne(f, ts, map, nowMs, scan, redactedSids, redactedMemory);
   }
 }
 
@@ -5068,10 +5380,10 @@ function applyThenRescan(scanVerdict, repoHome2) {
   return next;
 }
 function allowThenRescan(append, scanVerdict, repoHome2) {
-  const ignPath = join38(repoHome2, ".gitleaksignore");
+  const ignPath = join40(repoHome2, ".gitleaksignore");
   let before;
   try {
-    before = readFileSync16(ignPath, "utf8");
+    before = readFileSync17(ignPath, "utf8");
   } catch {
     before = null;
   }
@@ -5079,8 +5391,8 @@ function allowThenRescan(append, scanVerdict, repoHome2) {
   try {
     return applyThenRescan(scanVerdict, repoHome2);
   } catch (err) {
-    if (before === null) rmSync12(ignPath, { force: true });
-    else writeFileSync5(ignPath, before, "utf8");
+    if (before === null) rmSync13(ignPath, { force: true });
+    else writeFileSync7(ignPath, before, "utf8");
     throw err;
   }
 }
@@ -5167,7 +5479,7 @@ function writeAnimatedDone(out, label, ms, useTTY) {
 `);
 }
 function resolveWorkerPath(deps = {}) {
-  const check = deps.existsSyncFn ?? existsSync32;
+  const check = deps.existsSyncFn ?? existsSync33;
   const base = deps.baseUrl ?? import.meta.url;
   const mjs = fileURLToPath4(new URL("./nomad.worker.mjs", base));
   if (check(mjs)) return mjs;
@@ -5233,9 +5545,9 @@ function withSpinner(label, fn, deps) {
 
 // src/commands.doctor.gitleaks-version.ts
 init_color();
-import { execFileSync as execFileSync13 } from "node:child_process";
-import { existsSync as existsSync33 } from "node:fs";
-import { join as join39 } from "node:path";
+import { execFileSync as execFileSync14 } from "node:child_process";
+import { existsSync as existsSync34 } from "node:fs";
+import { join as join41 } from "node:path";
 init_config();
 var SEMVER_MAJOR_MINOR = /^(\d+)\.(\d+)\.\d+$/;
 var GITLEAKS_TIMEOUT_MS = 5e3;
@@ -5244,7 +5556,7 @@ function majorMinorOf(value) {
   return m === null ? null : [m[1], m[2]];
 }
 function readGitleaksVersion(run, tomlExists) {
-  const tomlPath = join39(repoHome(), ".gitleaks.toml");
+  const tomlPath = join41(repoHome(), ".gitleaks.toml");
   const args = ["version"];
   if (tomlExists(tomlPath)) args.push("--config", tomlPath);
   try {
@@ -5256,7 +5568,7 @@ function readGitleaksVersion(run, tomlExists) {
     return null;
   }
 }
-function reportGitleaksVersionCheck(section2, run = execFileSync13, tomlExists = existsSync33) {
+function reportGitleaksVersionCheck(section2, run = execFileSync14, tomlExists = existsSync34) {
   const raw = readGitleaksVersion(run, tomlExists);
   if (raw === null) return;
   const local = majorMinorOf(raw);
@@ -5276,7 +5588,7 @@ function reportGitleaksVersionCheck(section2, run = execFileSync13, tomlExists =
 
 // src/commands.doctor.checks.deps.ts
 init_color();
-import { execFileSync as execFileSync14 } from "node:child_process";
+import { execFileSync as execFileSync15 } from "node:child_process";
 var VERSION_TOKEN = /(\d{1,9}\.\d{1,9}\.\d{1,9})/;
 var PROBE_TIMEOUT_MS3 = 3e3;
 var FETCHER_BASE = "HTTP fetcher";
@@ -5313,7 +5625,7 @@ function reportFetcherRow(section2, run) {
     );
   }
 }
-function reportOptionalDeps(section2, run = execFileSync14) {
+function reportOptionalDeps(section2, run = execFileSync15) {
   const gh = probeOptionalDep("gh", run);
   if (gh.status === "present") {
     addItem(section2, `${green(okGlyph)} gh: ${gh.version ?? "present"}`);
@@ -5328,11 +5640,11 @@ function reportOptionalDeps(section2, run = execFileSync14) {
 
 // src/commands.doctor.actions-drift.ts
 init_color();
-import { execFileSync as execFileSync16 } from "node:child_process";
+import { execFileSync as execFileSync17 } from "node:child_process";
 init_config();
 
 // src/gh-actions.ts
-import { execFileSync as execFileSync15 } from "node:child_process";
+import { execFileSync as execFileSync16 } from "node:child_process";
 var GH_TIMEOUT_MS = 5e3;
 function parseGitHubRemote(remoteUrl) {
   const normalized = remoteUrl.trim().replace(/\/$/, "");
@@ -5340,7 +5652,7 @@ function parseGitHubRemote(remoteUrl) {
   if (m === null) return null;
   return { owner: m[1], repo: m[2] };
 }
-function ghAuthStatus(run = execFileSync15) {
+function ghAuthStatus(run = execFileSync16) {
   try {
     run("gh", ["auth", "status"], {
       stdio: ["ignore", "ignore", "ignore"],
@@ -5354,7 +5666,7 @@ function ghAuthStatus(run = execFileSync15) {
     return "gh-probe-error";
   }
 }
-function isRepoPrivate(ref, run = execFileSync15) {
+function isRepoPrivate(ref, run = execFileSync16) {
   const out = run("gh", ["repo", "view", `${ref.owner}/${ref.repo}`, "--json", "isPrivate"], {
     stdio: ["ignore", "pipe", "ignore"],
     timeout: GH_TIMEOUT_MS
@@ -5362,7 +5674,7 @@ function isRepoPrivate(ref, run = execFileSync15) {
   const parsed = JSON.parse(out);
   return parsed.isPrivate === true;
 }
-function isActionsEnabled(ref, run = execFileSync15) {
+function isActionsEnabled(ref, run = execFileSync16) {
   const out = run(
     "gh",
     ["api", `repos/${ref.owner}/${ref.repo}/actions/permissions`, "--jq", ".enabled"],
@@ -5370,7 +5682,7 @@ function isActionsEnabled(ref, run = execFileSync15) {
   ).toString().trim();
   return out === "true";
 }
-function disableActions(ref, run = execFileSync15) {
+function disableActions(ref, run = execFileSync16) {
   run(
     "gh",
     [
@@ -5384,7 +5696,7 @@ function disableActions(ref, run = execFileSync15) {
     { stdio: ["ignore", "ignore", "pipe"], timeout: GH_TIMEOUT_MS }
   );
 }
-function readOriginRemote(cwd, run = execFileSync15) {
+function readOriginRemote(cwd, run = execFileSync16) {
   return run("git", ["remote", "get-url", "origin"], {
     cwd,
     stdio: ["ignore", "pipe", "ignore"]
@@ -5392,7 +5704,7 @@ function readOriginRemote(cwd, run = execFileSync15) {
 }
 
 // src/commands.doctor.actions-drift.ts
-function reportActionsDrift(section2, run = execFileSync16) {
+function reportActionsDrift(section2, run = execFileSync17) {
   let remote;
   try {
     remote = readOriginRemote(repoHome(), run);
@@ -5482,8 +5794,8 @@ function gatherDoctorSections(opts) {
   reportLongPathsCheck(host);
   reportCrlfGuardCheck(host);
   const links = section("Shared links");
-  const mapPath = join40(repoHome(), "path-map.json");
-  const rawMap = existsSync34(mapPath) ? readJsonSafe(mapPath, mapPath, links) : null;
+  const mapPath = join42(repoHome(), "path-map.json");
+  const rawMap = existsSync35(mapPath) ? readJsonSafe(mapPath, mapPath, links) : null;
   const map = rawMap ?? { projects: {} };
   reportSharedLinks(links, map);
   reportDroppedNamesMigration(links);
@@ -5579,15 +5891,15 @@ function parseDoctorArgs(args) {
 
 // src/commands.drop-session.ts
 init_config();
-import { execFileSync as execFileSync18 } from "node:child_process";
-import { existsSync as existsSync36, readdirSync as readdirSync14, statSync as statSync9 } from "node:fs";
-import { join as join42, relative as relative6 } from "node:path";
+import { execFileSync as execFileSync19 } from "node:child_process";
+import { existsSync as existsSync37, readdirSync as readdirSync14, statSync as statSync9 } from "node:fs";
+import { join as join44, relative as relative6 } from "node:path";
 
 // src/commands.drop-session.git.ts
-import { execFileSync as execFileSync17 } from "node:child_process";
+import { execFileSync as execFileSync18 } from "node:child_process";
 function expandStagedDir(dirRel, repo) {
   try {
-    const out = execFileSync17("git", ["ls-files", "-z", "--", dirRel], {
+    const out = execFileSync18("git", ["ls-files", "-z", "--", dirRel], {
       cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -5599,7 +5911,7 @@ function expandStagedDir(dirRel, repo) {
 function isTrackedInHead(rel, repo) {
   try {
     const treePath = process.platform === "win32" ? rel.replaceAll("\\", "/") : rel;
-    execFileSync17("git", ["cat-file", "-e", `HEAD:${treePath}`], {
+    execFileSync18("git", ["cat-file", "-e", `HEAD:${treePath}`], {
       cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -5610,7 +5922,7 @@ function isTrackedInHead(rel, repo) {
 }
 function isInIndex(rel, repo) {
   try {
-    const out = execFileSync17("git", ["ls-files", "--", rel], {
+    const out = execFileSync18("git", ["ls-files", "--", rel], {
       cwd: repo,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -5624,8 +5936,8 @@ function isInIndex(rel, repo) {
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync35 } from "node:fs";
-import { join as join41 } from "node:path";
+import { existsSync as existsSync36 } from "node:fs";
+import { join as join43 } from "node:path";
 var SHARED_PROJECT_LOGICAL = /^shared\/projects\/([^/]+)\//;
 function reportScrubHint(id, matches) {
   const live = resolveLiveTranscript2(id, matches);
@@ -5641,8 +5953,8 @@ function reportScrubHint(id, matches) {
 }
 function resolveLiveTranscript2(id, matches) {
   try {
-    const mapPath = join41(repoHome(), "path-map.json");
-    if (!existsSync35(mapPath)) return null;
+    const mapPath = join43(repoHome(), "path-map.json");
+    if (!existsSync36(mapPath)) return null;
     const projects = readJson(mapPath).projects;
     const claude = claudeHome();
     for (const rel of matches) {
@@ -5650,8 +5962,8 @@ function resolveLiveTranscript2(id, matches) {
       if (logical === void 0) continue;
       const abs = projects[logical]?.[HOST];
       if (abs === void 0) continue;
-      const live = join41(claude, "projects", encodePath(abs), `${id}.jsonl`);
-      if (existsSync35(live)) return live;
+      const live = join43(claude, "projects", encodePath(abs), `${id}.jsonl`);
+      if (existsSync36(live)) return live;
     }
     return null;
   } catch {
@@ -5667,12 +5979,12 @@ function cmdDropSession(id) {
     process.exit(1);
   }
   const repo = repoHome();
-  if (!existsSync36(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 = join42(repo, "shared", "projects");
-    if (!existsSync36(repoProjects)) {
+    const repoProjects = join44(repo, "shared", "projects");
+    if (!existsSync37(repoProjects)) {
       throw new NomadFatal(`no staged session matches ${id}`);
     }
     const matches = collectMatches(repoProjects, id, repo);
@@ -5695,12 +6007,12 @@ function cmdDropSession(id) {
 function collectMatches(repoProjects, id, repo) {
   const matches = [];
   for (const logical of readdirSync14(repoProjects)) {
-    const candidate = join42(repoProjects, logical, `${id}.jsonl`);
-    if (existsSync36(candidate)) {
+    const candidate = join44(repoProjects, logical, `${id}.jsonl`);
+    if (existsSync37(candidate)) {
       matches.push(relative6(repo, candidate));
     }
-    const dir = join42(repoProjects, logical, id);
-    if (existsSync36(dir) && statSync9(dir).isDirectory()) {
+    const dir = join44(repoProjects, logical, id);
+    if (existsSync37(dir) && statSync9(dir).isDirectory()) {
       const dirRel = relative6(repo, dir);
       const staged = expandStagedDir(dirRel, repo);
       if (staged.length > 0) matches.push(...staged);
@@ -5716,12 +6028,12 @@ function unstageOne(rel, repo) {
   }
   try {
     if (isTrackedInHead(rel, repo)) {
-      execFileSync18("git", ["restore", "--staged", "--worktree", "--", rel], {
+      execFileSync19("git", ["restore", "--staged", "--worktree", "--", rel], {
         cwd: repo,
         stdio: ["ignore", "pipe", "pipe"]
       });
     } else {
-      execFileSync18("git", ["rm", "--cached", "-f", "--", rel], {
+      execFileSync19("git", ["rm", "--cached", "-f", "--", rel], {
         cwd: repo,
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -5735,8 +6047,8 @@ function unstageOne(rel, repo) {
 }
 
 // src/commands.pull.ts
-import { existsSync as existsSync41, mkdirSync as mkdirSync10 } from "node:fs";
-import { join as join48 } from "node:path";
+import { existsSync as existsSync42, mkdirSync as mkdirSync12 } from "node:fs";
+import { join as join50 } from "node:path";
 
 // src/commands.push.sections.ts
 init_color();
@@ -5818,19 +6130,25 @@ function summarySection(st) {
   addItem(s, summaryRow("push", unmapped, st.remap.collisions, st.extras.skipped));
   return s;
 }
-function renderPushTree(st, verdict) {
+function buildPushTreeSections(st, verdict) {
   const leakScan = section("Leak scan");
   addItem(leakScan, verdict.verdictRow);
-  renderTree([...syncedSections(st), leakScan, summarySection(st)]);
+  return [...syncedSections(st), leakScan, summarySection(st)];
 }
-function renderNoScanTree(st, opts = {}) {
+function renderPushTree(st, verdict) {
+  renderTree(buildPushTreeSections(st, verdict));
+}
+function buildNoScanSections(st, opts = {}) {
   const sections = [];
   if (opts.noMapHint === true) {
     const pathMap = section("Path map");
     addItem(pathMap, `${dim(infoGlyph)} no path-map.json (nothing to preview)`);
     sections.push(pathMap);
   }
-  renderTree([...sections, ...syncedSections(st), summarySection(st)]);
+  return [...sections, ...syncedSections(st), summarySection(st)];
+}
+function renderNoScanTree(st, opts = {}) {
+  renderTree(buildNoScanSections(st, opts));
 }
 
 // src/commands.pull.ts
@@ -5838,18 +6156,18 @@ init_config();
 
 // src/extras-sync.ts
 init_config();
-import { existsSync as existsSync38, statSync as statSync10 } from "node:fs";
-import { join as join45 } from "node:path";
+import { existsSync as existsSync39, statSync as statSync10 } from "node:fs";
+import { join as join47 } from "node:path";
 init_utils();
 init_utils_json();
 
 // src/extras-sync.remap.ts
 init_config();
-import { existsSync as existsSync37, mkdirSync as mkdirSync8, readdirSync as readdirSync15, readFileSync as readFileSync17, realpathSync as realpathSync4, rmSync as rmSync13 } from "node:fs";
-import { dirname as dirname9, join as join44, sep as sep8 } from "node:path";
+import { existsSync as existsSync38, mkdirSync as mkdirSync10, readdirSync as readdirSync15, readFileSync as readFileSync18, realpathSync as realpathSync4, rmSync as rmSync14 } from "node:fs";
+import { dirname as dirname10, join as join46, sep as sep8 } from "node:path";
 
 // src/extras-sync.planning-diff.ts
-import { join as join43, normalize as normalize2, sep as sep7 } from "node:path";
+import { join as join45, normalize as normalize2, sep as sep7 } from "node:path";
 init_utils();
 function processRecord(fields, i, changed, deleted) {
   const status = fields[i];
@@ -5901,7 +6219,7 @@ function planningDeleteTargets(opts) {
   const { deleted } = parsePlanningDiff(raw);
   const logicalPrefix = "shared/extras/" + logical + "/";
   const prefix = logicalPrefix + ".planning/";
-  const planningRoot = join43(localRoot, ".planning");
+  const planningRoot = join45(localRoot, ".planning");
   const planningRootBoundary = planningRoot + sep7;
   const targets = [];
   for (const repoPath of deleted) {
@@ -5909,7 +6227,7 @@ function planningDeleteTargets(opts) {
       continue;
     }
     const remainder = repoPath.slice(logicalPrefix.length);
-    const candidate = join43(localRoot, remainder);
+    const candidate = join45(localRoot, remainder);
     const resolved = normalize2(candidate);
     if (!resolved.startsWith(planningRootBoundary)) {
       throw new NomadFatal(
@@ -5930,7 +6248,7 @@ function runExtrasOp(v, dryRun, paths, backup, copy) {
   const would = [];
   for (const t of eachExtrasTarget(v, counts)) {
     const { src, dst } = paths(t);
-    if (!existsSync37(src)) continue;
+    if (!existsSync38(src)) continue;
     const item2 = `${t.logical}/${t.dirname}`;
     if (dryRun) {
       would.push(item2);
@@ -5943,15 +6261,15 @@ function runExtrasOp(v, dryRun, paths, backup, copy) {
   return { ...counts, done, would };
 }
 function pruneEmptyAncestors(target, planningRoot) {
-  let dir = dirname9(target);
+  let dir = dirname10(target);
   while (dir !== planningRoot && dir.startsWith(planningRoot + sep8)) {
     try {
       if (readdirSync15(dir).length > 0) break;
-      rmSync13(dir, { recursive: true, force: true });
+      rmSync14(dir, { recursive: true, force: true });
     } catch {
       break;
     }
-    dir = dirname9(dir);
+    dir = dirname10(dir);
   }
 }
 function tryRealpath(dir) {
@@ -5965,20 +6283,20 @@ function isInsidePlanningRoot(parentReal, rootReal) {
   return parentReal === rootReal || parentReal.startsWith(rootReal + sep8);
 }
 function deletePlanningTarget(target, planningRoot, repoCounterpart) {
-  if (existsSync37(repoCounterpart)) return;
-  const parentReal = tryRealpath(dirname9(target));
+  if (existsSync38(repoCounterpart)) return;
+  const parentReal = tryRealpath(dirname10(target));
   if (parentReal === void 0) return;
   const rootReal = tryRealpath(planningRoot);
   if (rootReal === void 0) return;
   if (!isInsidePlanningRoot(parentReal, rootReal)) return;
-  rmSync13(target, { recursive: true, force: true });
+  rmSync14(target, { recursive: true, force: true });
   pruneEmptyAncestors(target, planningRoot);
 }
 function localDivergesFromPreDelete(target, pre, repoRel, repo) {
-  if (!existsSync37(target)) return false;
+  if (!existsSync38(target)) return false;
   try {
     const preBlob = gitCaptureBuffer(["show", `${pre}:${repoRel}`], repo);
-    return !readFileSync17(target).equals(preBlob);
+    return !readFileSync18(target).equals(preBlob);
   } catch {
     return true;
   }
@@ -6020,7 +6338,7 @@ function keptDeletePreview(v, prePostHeads, repo) {
   return kept;
 }
 function propagatePlanningDeletes(v, ts, prePostHeads, repo) {
-  const repoExtras = join44(repo, "shared", "extras");
+  const repoExtras = join46(repo, "shared", "extras");
   for (const t of eachExtrasTarget(v, { unmapped: 0, skipped: 0 })) {
     if (t.dirname !== ".planning") continue;
     let raw;
@@ -6035,14 +6353,14 @@ function propagatePlanningDeletes(v, ts, prePostHeads, repo) {
     }
     const pairs = deletePairsFor(t, raw);
     if (pairs.length === 0) continue;
-    backupExtrasWrite(join44(t.localRoot, t.dirname), ts, t.localRoot);
-    const planningRoot = join44(t.localRoot, ".planning");
+    backupExtrasWrite(join46(t.localRoot, t.dirname), ts, t.localRoot);
+    const planningRoot = join46(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, join44(repoExtras, t.logical, relToLocal));
+      deletePlanningTarget(target, planningRoot, join46(repoExtras, t.logical, relToLocal));
     }
   }
 }
@@ -6051,14 +6369,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 = join44(repo, "shared", "extras");
-  if (!dryRun) mkdirSync8(repoExtras, { recursive: true });
+  const repoExtras = join46(repo, "shared", "extras");
+  if (!dryRun) mkdirSync10(repoExtras, { recursive: true });
   const { unmapped, skipped, done, would } = runExtrasOp(
     v,
     dryRun,
-    ({ localRoot, logical, dirname: dirname10 }) => ({
-      src: join44(localRoot, dirname10),
-      dst: join44(repoExtras, logical, dirname10)
+    ({ localRoot, logical, dirname: dirname11 }) => ({
+      src: join46(localRoot, dirname11),
+      dst: join46(repoExtras, logical, dirname11)
     }),
     (dst) => backupRepoWrite(dst, ts, repo),
     // Push copy routing per extra type:
@@ -6070,7 +6388,7 @@ function remapExtrasPush(ts, opts = {}) {
     //     (enforceAllowList / blockSetFor in commands.push.allowlist.ts)
     //     remains the hard security boundary.
     //   All others: copyExtrasFiltered with per-extra denylist.
-    (src, dst, dirname10) => dirname10 === ".planning" ? copyExtrasOverlayFiltered(src, dst, extrasDenySet(dirname10)) : copyExtrasFiltered(src, dst, extrasDenySet(dirname10))
+    (src, dst, dirname11) => dirname11 === ".planning" ? copyExtrasOverlayFiltered(src, dst, extrasDenySet(dirname11)) : copyExtrasFiltered(src, dst, extrasDenySet(dirname11))
   );
   return { unmapped, skipped, pushed: done, wouldPush: would };
 }
@@ -6086,9 +6404,9 @@ function remapExtrasPull(ts, opts = {}) {
   const { unmapped, skipped, done, would } = runExtrasOp(
     v,
     dryRun,
-    ({ localRoot, logical, dirname: dirname10 }) => ({
-      src: join44(repo, "shared", "extras", logical, dirname10),
-      dst: join44(localRoot, dirname10)
+    ({ localRoot, logical, dirname: dirname11 }) => ({
+      src: join46(repo, "shared", "extras", logical, dirname11),
+      dst: join46(localRoot, dirname11)
     }),
     // Snapshot the host-side dst BEFORE the copy step touches it. Anchor on
     // localRoot so the backup tree mirrors the project layout.
@@ -6106,12 +6424,12 @@ function remapExtrasPull(ts, opts = {}) {
     //     copyExtrasFileSkipDiverged keeps a locally-edited file rather than
     //     clobbering it, so the divergence WARN's keep-local promise holds for
     //     every extra, not just `.planning`.
-    (src, dst, dirname10) => {
-      if (dirname10 === ".claude")
-        return copyExtrasFilteredPreserving(src, dst, extrasDenySet(dirname10));
-      if (dirname10 === ".planning") {
+    (src, dst, dirname11) => {
+      if (dirname11 === ".claude")
+        return copyExtrasFilteredPreserving(src, dst, extrasDenySet(dirname11));
+      if (dirname11 === ".planning") {
         const divergedSet = new Set(listDivergingModified(dst, src));
-        return copyExtrasOverlaySkipDiverged(src, dst, extrasDenySet(dirname10), divergedSet);
+        return copyExtrasOverlaySkipDiverged(src, dst, extrasDenySet(dirname11), divergedSet);
       }
       return copyExtrasFileSkipDiverged(src, dst);
     }
@@ -6135,20 +6453,20 @@ function divergenceCheckExtras(ts, prePostHeads) {
   const v = loadValidatedExtras({});
   if (v === null) return 0;
   const counts = { unmapped: 0, skipped: 0 };
-  const backupRoot = join45(backupBase(), ts, "extras");
+  const backupRoot = join47(backupBase(), ts, "extras");
   const repo = repoHome();
   let divergedCount = 0;
-  for (const { logical, localRoot, dirname: dirname10 } of eachExtrasTarget(v, counts)) {
-    const local = join45(localRoot, dirname10);
-    const repoEntry = join45(repo, "shared", "extras", logical, dirname10);
-    if (!existsSync38(local) || !existsSync38(repoEntry)) continue;
+  for (const { logical, localRoot, dirname: dirname11 } of eachExtrasTarget(v, counts)) {
+    const local = join47(localRoot, dirname11);
+    const repoEntry = join47(repo, "shared", "extras", logical, dirname11);
+    if (!existsSync39(local) || !existsSync39(repoEntry)) continue;
     const modified = listDivergingModified(local, repoEntry);
     if (modified.length === 0) continue;
     divergedCount += modified.length;
-    const projectBackupRoot = join45(backupRoot, encodePath(localRoot));
+    const projectBackupRoot = join47(backupRoot, encodePath(localRoot));
     warn(
       divergenceWarnLine({
-        dirname: dirname10,
+        dirname: dirname11,
         logical,
         isDir: statSync10(local).isDirectory(),
         count: modified.length,
@@ -6167,8 +6485,8 @@ function divergenceCheckExtras(ts, prePostHeads) {
 
 // src/skills-sync.ts
 init_config();
-import { existsSync as existsSync39, lstatSync as lstatSync12, mkdirSync as mkdirSync9, readdirSync as readdirSync16, rmSync as rmSync14 } from "node:fs";
-import { join as join46 } from "node:path";
+import { existsSync as existsSync40, lstatSync as lstatSync12, mkdirSync as mkdirSync11, readdirSync as readdirSync16, rmSync as rmSync15 } from "node:fs";
+import { join as join48 } from "node:path";
 init_utils_fs();
 function isGsdOwned(name) {
   return name.startsWith(GSD_PREFIX);
@@ -6188,30 +6506,30 @@ function copySkillsPull(src, dst) {
   copyExtrasFilteredPreservingBy(src, dst, isSkillExcluded);
 }
 function syncSkillsPull(ts) {
-  const sharedSkills = join46(repoHome(), "shared", "skills");
-  if (!existsSync39(sharedSkills)) return;
-  const localSkills = join46(claudeHome(), "skills");
+  const sharedSkills = join48(repoHome(), "shared", "skills");
+  if (!existsSync40(sharedSkills)) return;
+  const localSkills = join48(claudeHome(), "skills");
   const dstStat = lstatSync12(localSkills, { throwIfNoEntry: false });
   if (dstStat?.isSymbolicLink() === true) {
     backupBeforeWrite(localSkills, ts);
-    rmSync14(localSkills, { recursive: true, force: true });
-    mkdirSync9(localSkills, { recursive: true });
+    rmSync15(localSkills, { recursive: true, force: true });
+    mkdirSync11(localSkills, { recursive: true });
   }
   copySkillsPull(sharedSkills, localSkills);
 }
 function syncSkillsPush() {
-  const localSkills = join46(claudeHome(), "skills");
+  const localSkills = join48(claudeHome(), "skills");
   const stat = lstatSync12(localSkills, { throwIfNoEntry: false });
   if (stat === void 0) return;
   if (stat.isSymbolicLink()) return;
-  const sharedSkills = join46(repoHome(), "shared", "skills");
+  const sharedSkills = join48(repoHome(), "shared", "skills");
   copySkillsPush(localSkills, sharedSkills);
 }
 
 // src/preview.ts
 init_config();
-import { existsSync as existsSync40 } from "node:fs";
-import { join as join47 } from "node:path";
+import { existsSync as existsSync41 } from "node:fs";
+import { join as join49 } from "node:path";
 
 // node_modules/diff/libesm/diff/base.js
 var Diff = class {
@@ -6497,7 +6815,7 @@ function diffJsonStrings(currentJsonText, newJsonText) {
   return lines.join("\n");
 }
 function readJsonOrNull(path) {
-  if (!existsSync40(path)) return null;
+  if (!existsSync41(path)) return null;
   try {
     return readJson(path);
   } catch {
@@ -6511,12 +6829,12 @@ function previewSettings(basePath, hostPath, settingsPath) {
   }
   const notes = [];
   const hostOverrides = readJsonOrNull(hostPath);
-  if (hostOverrides === null && existsSync40(hostPath)) {
+  if (hostOverrides === null && existsSync41(hostPath)) {
     notes.push(`malformed hosts/${HOST}.json; ignoring overrides`);
   }
   const merged = stripGsdHookEntries(deepMerge(base, hostOverrides ?? {}));
   const current = readJsonOrNull(settingsPath);
-  if (current === null && existsSync40(settingsPath)) {
+  if (current === null && existsSync41(settingsPath)) {
     return { diff: "", notes: [...notes, "malformed; skipping diff"] };
   }
   const strippedCurrent = stripGsdHookEntries(current ?? {});
@@ -6558,9 +6876,9 @@ function computePreview(ts, map, verb = "pull") {
     onPreview: (e) => addItem(links, formatLinkRow(e))
   });
   const settingsResult = previewSettings(
-    join47(repo, "shared", "settings.base.json"),
-    join47(repo, "hosts", `${HOST}.json`),
-    join47(claude, "settings.json")
+    join49(repo, "shared", "settings.base.json"),
+    join49(repo, "hosts", `${HOST}.json`),
+    join49(claude, "settings.json")
   );
   const settingsSection = buildSettingsSectionForPreview(settingsResult);
   const sessions = section("Sessions");
@@ -6575,7 +6893,7 @@ function computePreview(ts, map, verb = "pull") {
   const extras = section("Extras");
   let extrasSkipped = 0;
   let extrasUnmapped = 0;
-  if (existsSync40(join47(repo, "path-map.json")) && existsSync40(join47(repo, "shared", "extras"))) {
+  if (existsSync41(join49(repo, "path-map.json")) && existsSync41(join49(repo, "shared", "extras"))) {
     const extrasResult = remapExtrasPull(ts, { dryRun: true });
     for (const entry of extrasResult.wouldPull) {
       addItem(extras, entry);
@@ -6600,9 +6918,9 @@ init_config();
 init_commands_pull_wedge();
 init_utils();
 init_utils_fs();
-import { execFileSync as execFileSync19 } from "node:child_process";
+import { execFileSync as execFileSync20 } from "node:child_process";
 function gitCapture(args, cwd) {
-  return execFileSync19("git", args, {
+  return execFileSync20("git", args, {
     cwd,
     stdio: ["ignore", "pipe", "pipe"],
     maxBuffer: 64 * 1024 * 1024
@@ -6746,17 +7064,9 @@ function buildWetPullSections(ts, map, prePostHeads) {
   const remapResult = withSpinner("Syncing sessions", () => remapPull(ts));
   const extrasResult = remapExtrasPull(ts, { prePostHeads });
   const localOnly = scanLocalOnly();
+  const unmapped = remapResult.unmapped + extrasResult.unmapped;
   const summary = section(PULL_SUMMARY_HEADER);
-  addItem(
-    summary,
-    summaryRow(
-      "pull",
-      remapResult.unmapped + extrasResult.unmapped,
-      0,
-      extrasResult.skipped,
-      localOnly
-    )
-  );
+  addItem(summary, summaryRow("pull", unmapped, 0, extrasResult.skipped, localOnly));
   return {
     sections: [
       buildSettingsSection(label),
@@ -6764,7 +7074,10 @@ function buildWetPullSections(ts, map, prePostHeads) {
       buildExtrasSection(extrasResult.pulled, extrasResult.skipped),
       summary
     ],
-    localOnly
+    localOnly,
+    settingsLabel: label,
+    unmapped,
+    extrasSkipped: extrasResult.skipped
   };
 }
 function handleWedge(repo, forceRemote) {
@@ -6788,39 +7101,56 @@ function handleWedge(repo, forceRemote) {
 function runPullCore(opts = {}) {
   const dryRun = opts.dryRun === true;
   const forceRemote = opts.forceRemote === true;
+  const compose = opts.compose === true;
   const repo = repoHome();
   const backup = backupBase();
   const ts = freshBackupTs(backup);
   handleWedge(repo, forceRemote);
   if (!dryRun) {
-    const backupRoot = join48(backup, ts);
+    const backupRoot = join50(backup, ts);
     try {
-      mkdirSync10(backupRoot, { recursive: true });
+      mkdirSync12(backupRoot, { recursive: true });
     } catch (err) {
       die(`could not create backup dir: ${err.message}`);
     }
   }
-  log(
-    dryRun ? `pulling on host=${HOST} (backup=${ts}; dry-run)` : `pull on host=${HOST} (backup=${ts})`
-  );
+  if (!compose) {
+    log(
+      dryRun ? `pulling on host=${HOST} (backup=${ts}; dry-run)` : `pull on host=${HOST} (backup=${ts})`
+    );
+  }
   const prePostHeads = capturePrePostHeads(repo, () => {
     gitOrFatal(["pull", "--rebase", "--autostash"], "git pull --rebase", repo);
   });
-  const mapPath = join48(repo, "path-map.json");
-  const map = existsSync41(mapPath) ? readPathMap(mapPath) : { projects: {} };
+  const mapPath = join50(repo, "path-map.json");
+  const map = existsSync42(mapPath) ? readPathMap(mapPath) : { projects: {} };
   const divergedKeptLocal = divergenceCheckExtras(ts, dryRun ? prePostHeads : void 0);
   if (dryRun) {
     computePreview(ts, map, "pull");
     log("dry-run complete; no mutation");
     return { tag: "dry" };
   }
-  const { sections, localOnly } = buildWetPullSections(ts, map, prePostHeads);
-  return { tag: "wet", sections, localOnly, divergedKeptLocal };
+  const { sections, localOnly, settingsLabel, unmapped, extrasSkipped } = buildWetPullSections(
+    ts,
+    map,
+    prePostHeads
+  );
+  const incomingChanges = prePostHeads === void 0 ? true : prePostHeads.pre !== prePostHeads.post;
+  return {
+    tag: "wet",
+    sections,
+    localOnly,
+    divergedKeptLocal,
+    incomingChanges,
+    settingsLabel,
+    unmapped,
+    extrasSkipped
+  };
 }
 function cmdPull(opts = {}) {
   const repo = repoHome();
-  if (!existsSync41(repo)) die(`repo not cloned at ${repo}`);
-  if (!existsSync41(join48(repo, "shared", "settings.base.json"))) {
+  if (!existsSync42(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync42(join50(repo, "shared", "settings.base.json"))) {
     die("repo not initialized; run 'nomad init' to scaffold");
   }
   const handle = acquireLock("pull");
@@ -6842,13 +7172,13 @@ function cmdPull(opts = {}) {
 
 // src/commands.push.ts
 init_config();
-import { existsSync as existsSync45 } from "node:fs";
-import { join as join53 } from "node:path";
+import { existsSync as existsSync46 } from "node:fs";
+import { join as join55 } from "node:path";
 
 // src/commands.push.selection.ts
 init_config();
-import { existsSync as existsSync42, statSync as statSync11 } from "node:fs";
-import { join as join49 } from "node:path";
+import { existsSync as existsSync43, statSync as statSync11 } from "node:fs";
+import { join as join51 } from "node:path";
 init_utils_json();
 function buildCurrentMap(map) {
   const current = {};
@@ -6857,8 +7187,8 @@ function buildCurrentMap(map) {
   for (const [, hostMap] of Object.entries(map.projects)) {
     const localPath = hostMap[HOST];
     if (!localPath) continue;
-    const localDir = join49(claude, "projects", encodePath(localPath));
-    if (!existsSync42(localDir)) continue;
+    const localDir = join51(claude, "projects", encodePath(localPath));
+    if (!existsSync43(localDir)) continue;
     for (const f of enumerateSourceFiles(localDir)) {
       const st = statSync11(f);
       current[f] = { size: st.size, mtime: st.mtimeMs };
@@ -6889,7 +7219,7 @@ function computePushSelection(map, old, scannerVersion, configHash, fullScan) {
   };
 }
 function loadSelectionForPush(mapPath, old, scannerVersion, configHash, fullScan) {
-  const map = existsSync42(mapPath) ? readPathMap(mapPath) : null;
+  const map = existsSync43(mapPath) ? readPathMap(mapPath) : null;
   const { selection, newManifest } = computePushSelection(
     map,
     old,
@@ -6991,14 +7321,14 @@ function enforceAllowList(statusPorcelain, map) {
 
 // src/commands.push.settings.ts
 init_config();
-import { existsSync as existsSync43 } from "node:fs";
-import { join as join50 } from "node:path";
+import { existsSync as existsSync44 } from "node:fs";
+import { join as join52 } from "node:path";
 init_utils();
 init_utils_fs();
 init_utils_json();
 function stripGsdHooksFromBase(repo, backup) {
-  const basePath = join50(repo, "shared", "settings.base.json");
-  if (!existsSync43(basePath)) return;
+  const basePath = join52(repo, "shared", "settings.base.json");
+  if (!existsSync44(basePath)) return;
   let base;
   try {
     base = readJson(basePath);
@@ -7012,14 +7342,14 @@ function stripGsdHooksFromBase(repo, backup) {
   writeJsonAtomic(basePath, stripped);
 }
 function reportSettingsAheadDrift(repo) {
-  const basePath = join50(repo, "shared", "settings.base.json");
-  if (!existsSync43(basePath)) return;
-  const settingsPath = join50(claudeHome(), "settings.json");
-  if (!existsSync43(settingsPath)) return;
+  const basePath = join52(repo, "shared", "settings.base.json");
+  if (!existsSync44(basePath)) return;
+  const settingsPath = join52(claudeHome(), "settings.json");
+  if (!existsSync44(settingsPath)) return;
   try {
     const base = readJson(basePath);
-    const hostPath = join50(repo, "hosts", `${HOST}.json`);
-    const overrides = existsSync43(hostPath) ? readJson(hostPath) : {};
+    const hostPath = join52(repo, "hosts", `${HOST}.json`);
+    const overrides = existsSync44(hostPath) ? readJson(hostPath) : {};
     const merged = deepMerge(base, overrides);
     const settings = readJson(settingsPath);
     const { ahead } = classifySettingsDrift(merged, settings);
@@ -7036,9 +7366,9 @@ function reportSettingsAheadDrift(repo) {
 // src/commands.push.guards.ts
 init_push_checks();
 init_utils();
-import { join as join51, relative as relative7 } from "node:path";
+import { join as join53, relative as relative7 } from "node:path";
 function guardGitlinks(repo) {
-  const gitlinks = findGitlinks(join51(repo, "shared"));
+  const gitlinks = findGitlinks(join53(repo, "shared"));
   if (gitlinks.length === 0) return;
   for (const p of gitlinks) {
     const rel = relative7(repo, p).replaceAll("\\", "/");
@@ -7070,7 +7400,7 @@ init_config();
 
 // src/push-global-config.ts
 init_config();
-import { execFileSync as execFileSync20 } from "node:child_process";
+import { execFileSync as execFileSync21 } from "node:child_process";
 var STATUS_LABELS = {
   A: "add",
   M: "modify",
@@ -7110,7 +7440,7 @@ function isInScope(filePath, exactPrefixes, dirPrefixes) {
 }
 function collectGlobalConfigChanges(repoHome2, hostname2, opts) {
   const args = opts.staged ? ["diff", "--cached", "--name-status", "-z"] : ["diff", "HEAD", "--name-status", "-z"];
-  const raw = execFileSync20("git", args, {
+  const raw = execFileSync21("git", args, {
     cwd: repoHome2,
     stdio: ["ignore", "pipe", "pipe"]
   }).toString();
@@ -7147,10 +7477,10 @@ init_push_leak_verdict();
 init_color();
 init_config();
 init_config_sharedDirs_guard();
-import { randomBytes as randomBytes2 } from "node:crypto";
-import { copyFileSync, existsSync as existsSync44, mkdirSync as mkdirSync11, readdirSync as readdirSync17, rmSync as rmSync15 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join52, relative as relative8, sep as sep9 } from "node:path";
+import { randomBytes as randomBytes3 } from "node:crypto";
+import { copyFileSync, existsSync as existsSync45, mkdirSync as mkdirSync13, readdirSync as readdirSync17, rmSync as rmSync16 } from "node:fs";
+import { homedir as homedir6 } from "node:os";
+import { join as join54, relative as relative8, sep as sep9 } from "node:path";
 init_push_leak_verdict();
 init_push_gitleaks();
 init_utils_fs();
@@ -7162,7 +7492,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, join52(dstDir, relative8(localDir, src)));
+      copyFileAtomic(src, join54(dstDir, relative8(localDir, src)));
     }
     return true;
   }
@@ -7178,14 +7508,14 @@ function stageSessions(tmpRoot, map, changed) {
     if (!p || p === "TBD") continue;
     reverse.set(encodePath(p), logical);
   }
-  const localProjects = join52(claudeHome(), "projects");
-  if (!existsSync44(localProjects)) return 0;
+  const localProjects = join54(claudeHome(), "projects");
+  if (!existsSync45(localProjects)) return 0;
   let staged = 0;
   for (const dir of readdirSync17(localProjects)) {
     const logical = reverse.get(dir);
     if (!logical) continue;
-    const localDir = join52(localProjects, dir);
-    const dstDir = join52(tmpRoot, "shared", "projects", logical);
+    const localDir = join54(localProjects, dir);
+    const dstDir = join54(tmpRoot, "shared", "projects", logical);
     if (stageSessionDir(localDir, dstDir, changed)) staged++;
   }
   return staged;
@@ -7199,11 +7529,11 @@ function stageExtras(tmpRoot, map) {
     assertSafeLogical(logical);
     const localRoot = map.projects[logical]?.[HOST];
     if (!localRoot || localRoot === "TBD") continue;
-    for (const dirname10 of dirnames) {
-      if (!whitelist.includes(dirname10)) continue;
-      const src = join52(localRoot, dirname10);
-      if (!existsSync44(src)) continue;
-      const dst = join52(tmpRoot, "shared", "extras", logical, dirname10);
+    for (const dirname11 of dirnames) {
+      if (!whitelist.includes(dirname11)) continue;
+      const src = join54(localRoot, dirname11);
+      if (!existsSync45(src)) continue;
+      const dst = join54(tmpRoot, "shared", "extras", logical, dirname11);
       copyExtras(src, dst);
       staged++;
     }
@@ -7211,19 +7541,19 @@ function stageExtras(tmpRoot, map) {
   return staged;
 }
 function previewPushLeaks(map, opts = {}) {
-  const cacheDir = join52(homedir5(), ".cache", "claude-nomad");
-  mkdirSync11(cacheDir, { recursive: true });
-  const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes2(4).toString("hex")}`;
-  const tmpRoot = join52(cacheDir, `push-preview-tree-${stamp}`);
+  const cacheDir = join54(homedir6(), ".cache", "claude-nomad");
+  mkdirSync13(cacheDir, { recursive: true });
+  const stamp = `${nowTimestamp()}-${process.pid}-${randomBytes3(4).toString("hex")}`;
+  const tmpRoot = join54(cacheDir, `push-preview-tree-${stamp}`);
   try {
     const sessionCount = stageSessions(tmpRoot, map, opts.selection?.changed);
     const extrasCount = stageExtras(tmpRoot, map);
     if (sessionCount + extrasCount === 0) {
       return { leak: false, verdictRow: NOTHING_TO_SCAN_ROW, recovery: null, findings: [] };
     }
-    const ignoreFile = join52(repoHome(), ".gitleaksignore");
-    if (existsSync44(ignoreFile)) {
-      copyFileSync(ignoreFile, join52(tmpRoot, ".gitleaksignore"));
+    const ignoreFile = join54(repoHome(), ".gitleaksignore");
+    if (existsSync45(ignoreFile)) {
+      copyFileSync(ignoreFile, join54(tmpRoot, ".gitleaksignore"));
     }
     let findings;
     try {
@@ -7236,13 +7566,13 @@ function previewPushLeaks(map, opts = {}) {
     }
     return verdictFromFindings(findings);
   } finally {
-    rmSync15(tmpRoot, { recursive: true, force: true });
+    rmSync16(tmpRoot, { recursive: true, force: true });
   }
 }
 
 // src/commands.push.steps.ts
 init_utils();
-async function commitAndPush(st, ts, map, resolution, repo, newManifest) {
+async function commitAndPush(st, ts, map, resolution, repo, newManifest, render) {
   gitOrFatal(["add", "-A"], "git add", repo);
   const staged = parsePorcelainZ2(gitStatusPorcelainZ(repo));
   const toDrop = staged.filter((p) => isGsdDropped(p));
@@ -7250,13 +7580,18 @@ async function commitAndPush(st, ts, map, resolution, repo, newManifest) {
     gitOrFatal(["restore", "--staged", "--", ...toDrop], "git restore --staged", repo);
   }
   if (staged.length === toDrop.length) {
-    log("nothing to commit");
-    renderNoScanTree(st);
-    return "nothing";
+    const sections2 = buildNoScanSections(st);
+    if (render) {
+      log("nothing to commit");
+      renderTree(sections2);
+    }
+    return { outcome: "nothing", sections: sections2 };
   }
   st.globalConfig = collectGlobalConfigChanges(repo, HOST, { staged: true });
   let verdict = withSpinner("Scanning for secrets", () => scanPushVerdict(repo));
+  const hadLeak = verdict.leak;
   if (verdict.leak) {
+    if (!render) log("push (leak recovery)");
     renderPushTree(st, verdict);
     verdict = await resolveLeakFindings(verdict, ts, map, resolution);
   }
@@ -7267,8 +7602,13 @@ async function commitAndPush(st, ts, map, resolution, repo, newManifest) {
   } catch (err) {
     warn(`could not write push manifest (next push will full-rescan): ${String(err)}`);
   }
-  renderPushTree(st, verdict);
-  return "pushed";
+  if (hadLeak) {
+    renderPushTree(st, verdict);
+    return { outcome: "pushed", sections: [] };
+  }
+  const sections = buildPushTreeSections(st, verdict);
+  if (render) renderTree(sections);
+  return { outcome: "pushed", sections };
 }
 function runDryRunPreview(st, map, repo, selection) {
   st.globalConfig = collectGlobalConfigChanges(repo, HOST, { staged: false });
@@ -7285,20 +7625,61 @@ function runDryRunPreview(st, map, repo, selection) {
 init_push_checks();
 init_utils();
 init_utils_fs();
+function aheadOfUpstream(repo) {
+  try {
+    const raw = gitCaptureRaw(["rev-list", "--count", "@{u}..HEAD"], repo);
+    return Number.parseInt(raw.trim(), 10) > 0;
+  } catch {
+    return false;
+  }
+}
+function emptyStatusResult(st, compose, repo) {
+  if (compose) {
+    return {
+      tag: "nothing",
+      sections: buildNoScanSections(st),
+      aheadOfOrigin: aheadOfUpstream(repo),
+      globalConfigCount: st.globalConfig.length,
+      collisions: st.remap.collisions
+    };
+  }
+  log("nothing to commit");
+  renderNoScanTree(st);
+  return { tag: "nothing" };
+}
+function toPushCoreResult(outcome, sections, compose, repo, st) {
+  if (!compose) return { tag: outcome };
+  const globalConfigCount = st.globalConfig.length;
+  const collisions = st.remap.collisions;
+  if (outcome === "nothing") {
+    return {
+      tag: "nothing",
+      sections,
+      aheadOfOrigin: aheadOfUpstream(repo),
+      globalConfigCount,
+      collisions
+    };
+  }
+  return { tag: "pushed", sections, globalConfigCount, collisions };
+}
 async function runPushCore(opts = {}) {
   const dryRun = opts.dryRun === true;
   const redactAll = opts.redactAll === true;
   const allowAll = opts.allowAll === true;
   const allowRule = opts.allowRule;
   const fullScan = opts.fullScan === true;
+  const compose = opts.compose === true;
+  const render = !compose;
   const repo = repoHome();
   const backup = backupBase();
-  console.log(dryRun ? `push on host=${HOST} (dry-run)` : `push on host=${HOST}`);
+  if (!compose) {
+    console.log(dryRun ? `push on host=${HOST} (dry-run)` : `push on host=${HOST}`);
+  }
   reportSettingsAheadDrift(repo);
   const scannerVersion = probeGitleaks();
   const configHash = computeConfigHash();
   const old = readManifest(manifestPath());
-  const mapPath = join53(repo, "path-map.json");
+  const mapPath = join55(repo, "path-map.json");
   const { map, selection, newManifest } = loadSelectionForPush(
     mapPath,
     old,
@@ -7318,11 +7699,7 @@ async function runPushCore(opts = {}) {
   const st = { dryRun, remap, extras, globalConfig: [] };
   guardGitlinks(repo);
   const status = gitStatusPorcelainZ(repo, { untrackedAll: true });
-  if (!dryRun && !status) {
-    log("nothing to commit");
-    renderNoScanTree(st);
-    return { tag: "nothing" };
-  }
+  if (!dryRun && !status) return emptyStatusResult(st, compose, repo);
   if (map === null) {
     if (dryRun) {
       runDryRunPreview(st, null, repo, selection);
@@ -7335,15 +7712,16 @@ async function runPushCore(opts = {}) {
     runDryRunPreview(st, map, repo, selection);
     return { tag: "dry" };
   }
-  const outcome = await commitAndPush(
+  const { outcome, sections } = await commitAndPush(
     st,
     ts,
     map,
     { redactAll, allowAll, allowRule },
     repo,
-    newManifest
+    newManifest,
+    render
   );
-  return outcome === "nothing" ? { tag: "nothing" } : { tag: "pushed" };
+  return toPushCoreResult(outcome, sections, compose, repo, st);
 }
 async function cmdPush(opts = {}) {
   const dryRun = opts.dryRun === true;
@@ -7352,7 +7730,7 @@ async function cmdPush(opts = {}) {
   const allowRule = opts.allowRule;
   guardResolutionModeConflicts(dryRun, redactAll, allowAll, allowRule);
   const repo = repoHome();
-  if (!existsSync45(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync46(repo)) die(`repo not cloned at ${repo}`);
   const handle = acquireLock("push");
   if (handle === null) process.exit(0);
   try {
@@ -7370,36 +7748,59 @@ async function cmdPush(opts = {}) {
 }
 
 // src/commands.sync.ts
-import { existsSync as existsSync46 } from "node:fs";
-import { join as join54 } from "node:path";
+import { existsSync as existsSync47 } from "node:fs";
+import { join as join56 } from "node:path";
 init_config();
+init_color();
 init_utils();
 init_utils_fs();
 init_utils_json();
-function pullHasNoSyncedItems(sections) {
-  return sections.every(
-    (s) => s.header === "Settings" || s.header === PULL_SUMMARY_HEADER || s.items.length === 0
-  );
-}
 function isNoopSync(pull, pushOutcome) {
   if (!pushOutcome.ok) return false;
   if (pull.localOnly !== 0 || pull.divergedKeptLocal !== 0) return false;
   if (pushOutcome.result.tag !== "nothing") return false;
-  return pullHasNoSyncedItems(pull.sections);
+  if (pushOutcome.result.aheadOfOrigin === true) return false;
+  return !pull.incomingChanges;
 }
-function pullPhrase(pull) {
-  const summary = pull.sections.find((s) => s.header === PULL_SUMMARY_HEADER);
-  return summary?.items[0] ?? "applied";
+function buildPullSummaryRow(pull) {
+  const applied = pull.incomingChanges ? "upstream changes applied" : "no upstream changes";
+  return `pull: ${applied}; settings regenerated (base + ${pull.settingsLabel})`;
 }
-function reconciledNotes(pull) {
-  const notes = [];
+function countNoun(n, singular, plural) {
+  return `${n} ${n === 1 ? singular : plural}`;
+}
+function pushedParenParts(pull, globalConfigCount) {
+  const parts = [];
+  if (pull.localOnly > 0) {
+    parts.push(countNoun(pull.localOnly, "local-only session", "local-only sessions"));
+  }
   if (pull.divergedKeptLocal > 0) {
-    notes.push(`${pull.divergedKeptLocal} diverged files kept local and pushed`);
+    parts.push(countNoun(pull.divergedKeptLocal, "diverged extras file", "diverged extras files"));
   }
-  if (pull.localOnly > 0) {
-    notes.push(`${pull.localOnly} local-only sessions pushed`);
+  if (globalConfigCount > 0) {
+    parts.push(countNoun(globalConfigCount, "config file", "config files"));
   }
-  return notes;
+  return parts;
+}
+function buildPushSummaryRow(pull, result) {
+  if (result.tag !== "pushed") return "push: nothing to push";
+  const parts = pushedParenParts(pull, result.globalConfigCount ?? 0);
+  return parts.length > 0 ? `push: pushed (${parts.join(", ")})` : "push: pushed";
+}
+function buildSkipAndCollisionRows(pull, result) {
+  const rows = [];
+  if (pull.unmapped > 0) {
+    rows.push(`${dim(infoGlyph)} ${pull.unmapped} not in path-map (run nomad doctor to list)`);
+  }
+  if (pull.extrasSkipped > 0) {
+    rows.push(`${dim(infoGlyph)} ${pull.extrasSkipped} extras skipped`);
+  }
+  const collisions = result.tag === "dry" ? void 0 : result.collisions;
+  if (collisions !== void 0 && collisions > 0) {
+    const phrase = countNoun(collisions, "collision", "collisions");
+    rows.push(`${yellow(warnGlyph)} ${phrase} (run nomad doctor to list)`);
+  }
+  return rows;
 }
 function buildSyncSummarySection(pull, pushOutcome) {
   const s = section("Sync summary");
@@ -7407,22 +7808,59 @@ function buildSyncSummarySection(pull, pushOutcome) {
     addItem(s, `pull: applied, push: failed (${pushOutcome.message})`);
     return s;
   }
-  addItem(s, `pull: ${pullPhrase(pull)}`);
-  addItem(s, `push: ${pushOutcome.result.tag === "pushed" ? "pushed" : "nothing to push"}`);
-  for (const note of reconciledNotes(pull)) addItem(s, note);
+  const { result } = pushOutcome;
+  addItem(s, buildPullSummaryRow(pull));
+  addItem(s, buildPushSummaryRow(pull, result));
+  if (result.tag === "nothing" && result.aheadOfOrigin === true) {
+    addItem(s, "sync repo has unpushed commits");
+  }
+  for (const row2 of buildSkipAndCollisionRows(pull, result)) addItem(s, row2);
   return s;
 }
-function renderWetSync(pull, pushOutcome) {
+var SYNC_SECTION_ORDER = ["Settings", "Global config", "Sessions", "Extras", "Leak scan"];
+function isDroppedSummaryHeader(header) {
+  return header === PULL_SUMMARY_HEADER || header === "Push summary";
+}
+function mergeSyncSections(pullSections, pushSections) {
+  const byHeader = new Map(
+    SYNC_SECTION_ORDER.map((header) => [header, section(header)])
+  );
+  for (const s of [...pullSections, ...pushSections]) {
+    if (isDroppedSummaryHeader(s.header)) continue;
+    let target = byHeader.get(s.header);
+    if (target === void 0) {
+      target = section(s.header);
+      byHeader.set(s.header, target);
+    }
+    for (const item2 of s.items) {
+      if (!target.items.includes(item2)) addItem(target, item2);
+    }
+  }
+  return [...byHeader.values()].filter((s) => s.items.length > 0);
+}
+function pushSectionsOf(pushOutcome) {
+  if (!pushOutcome.ok) return [];
+  const result = pushOutcome.result;
+  if (result.tag === "dry") return [];
+  return result.sections ?? [];
+}
+function renderWetSync(pull, pushOutcome, verbose) {
   if (isNoopSync(pull, pushOutcome)) {
     ok("already in sync");
     return;
   }
-  renderTree(pull.sections);
-  renderTree([buildSyncSummarySection(pull, pushOutcome)]);
+  log(`sync on host=${HOST}`);
+  const summary = buildSyncSummarySection(pull, pushOutcome);
+  if (!verbose) {
+    renderTree([summary]);
+    return;
+  }
+  const merged = mergeSyncSections(pull.sections, pushSectionsOf(pushOutcome));
+  renderTree([...merged, summary]);
 }
 async function runSyncPushHalf() {
   try {
-    const result = await runPushCore();
+    const result = await runPushCore({ compose: true });
     return { ok: true, result };
   } catch (err) {
     if (err instanceof NomadFatal) {
@@ -7432,25 +7870,26 @@ async function runSyncPushHalf() {
     throw err;
   }
 }
-async function runSyncWet() {
-  const pull = runPullCore();
+async function runSyncWet(verbose) {
+  const pull = runPullCore({ compose: true });
   const pushOutcome = await runSyncPushHalf();
-  renderWetSync(pull, pushOutcome);
+  renderWetSync(pull, pushOutcome, verbose);
 }
 async function runSyncDryRun(repo, backup) {
   const ts = freshBackupTs(backup);
-  const mapPath = join54(repo, "path-map.json");
-  const map = existsSync46(mapPath) ? readPathMap(mapPath) : { projects: {} };
+  const mapPath = join56(repo, "path-map.json");
+  const map = existsSync47(mapPath) ? readPathMap(mapPath) : { projects: {} };
   computePreview(ts, map, "pull");
   log("push preview below is computed against pre-pull state (a real sync pushes after pull)");
   await runPushCore({ dryRun: true });
 }
 async function cmdSync(opts = {}) {
   const dryRun = opts.dryRun === true;
+  const verbose = opts.verbose === true;
   const repo = repoHome();
   const backup = backupBase();
-  if (!existsSync46(repo)) die(`repo not cloned at ${repo}`);
-  if (!existsSync46(join54(repo, "shared", "settings.base.json"))) {
+  if (!existsSync47(repo)) die(`repo not cloned at ${repo}`);
+  if (!existsSync47(join56(repo, "shared", "settings.base.json"))) {
     die("repo not initialized; run 'nomad init' to scaffold");
   }
   const handle = acquireLock("sync");
@@ -7459,7 +7898,7 @@ async function cmdSync(opts = {}) {
     if (dryRun) {
       await runSyncDryRun(repo, backup);
     } else {
-      await runSyncWet();
+      await runSyncWet(verbose);
     }
   } catch (err) {
     if (err instanceof NomadFatal) {
@@ -7474,9 +7913,9 @@ async function cmdSync(opts = {}) {
 }
 
 // src/commands.update.ts
-import { execFileSync as execFileSync21 } from "node:child_process";
+import { execFileSync as execFileSync22 } from "node:child_process";
 init_utils();
-function readInstalledVersion(run = execFileSync21) {
+function readInstalledVersion(run = execFileSync22) {
   const isWin = process.platform === "win32";
   try {
     return run(isWin ? "nomad.cmd" : "nomad", ["--version"], {
@@ -7487,7 +7926,7 @@ function readInstalledVersion(run = execFileSync21) {
     return null;
   }
 }
-function cmdUpdate(currentVersion, run = execFileSync21) {
+function cmdUpdate(currentVersion, run = execFileSync22) {
   console.log(`Updating claude-nomad v${currentVersion}...`);
   const isWin = process.platform === "win32";
   try {
@@ -7523,18 +7962,18 @@ init_config();
 
 // src/diff.ts
 init_config();
-import { existsSync as existsSync47 } from "node:fs";
-import { join as join55 } from "node:path";
+import { existsSync as existsSync48 } from "node:fs";
+import { join as join57 } from "node:path";
 init_utils();
 init_utils_fs();
 init_utils_json();
 function cmdDiff() {
   try {
     const repo = repoHome();
-    if (!existsSync47(repo)) die(`repo not cloned at ${repo}`);
+    if (!existsSync48(repo)) die(`repo not cloned at ${repo}`);
     const ts = freshBackupTs(backupBase());
-    const mapPath = join55(repo, "path-map.json");
-    const map = existsSync47(mapPath) ? readPathMap(mapPath) : { projects: {} };
+    const mapPath = join57(repo, "path-map.json");
+    const map = existsSync48(mapPath) ? readPathMap(mapPath) : { projects: {} };
     divergenceCheckExtras(ts);
     computePreview(ts, map, "diff");
   } catch (err) {
@@ -7549,19 +7988,19 @@ function cmdDiff() {
 
 // src/init.ts
 init_config();
-import { existsSync as existsSync49, mkdirSync as mkdirSync12, writeFileSync as writeFileSync6 } from "node:fs";
-import { join as join57 } from "node:path";
+import { existsSync as existsSync50, mkdirSync as mkdirSync14, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join59 } from "node:path";
 
 // src/init.gh-onboard.ts
 init_config();
-import { execFileSync as execFileSync22 } from "node:child_process";
+import { execFileSync as execFileSync23 } from "node:child_process";
 init_utils();
 var DEFAULT_REPO_NAME = "claude-nomad-config";
 function isValidRepoName(name) {
   return /^[A-Za-z0-9._-]{1,100}$/.test(name);
 }
 var GH_NETWORK_TIMEOUT_MS = 3e4;
-function ensureOriginRepo(repoName, run = execFileSync22) {
+function ensureOriginRepo(repoName, run = execFileSync23) {
   if (!isValidRepoName(repoName)) {
     die(
       `invalid repo name: ${JSON.stringify(repoName)}. Use only letters, digits, hyphens, underscores, and dots (1-100 chars).`
@@ -7632,33 +8071,33 @@ init_config();
 init_utils();
 init_utils_fs();
 init_utils_json();
-import { copyFileSync as copyFileSync2, cpSync as cpSync8, existsSync as existsSync48, rmSync as rmSync16, statSync as statSync12 } from "node:fs";
-import { join as join56 } from "node:path";
+import { copyFileSync as copyFileSync2, cpSync as cpSync9, existsSync as existsSync49, rmSync as rmSync17, statSync as statSync12 } from "node:fs";
+import { join as join58 } from "node:path";
 function snapshotIntoShared(map) {
   const repo = repoHome();
   const claude = claudeHome();
   for (const name of allSharedLinks(map)) {
-    const src = join56(claude, name);
-    if (!existsSync48(src)) continue;
-    const dst = join56(repo, "shared", name);
+    const src = join58(claude, name);
+    if (!existsSync49(src)) continue;
+    const dst = join58(repo, "shared", name);
     if (statSync12(src).isDirectory()) {
-      const gk = join56(dst, ".gitkeep");
-      if (existsSync48(gk)) rmSync16(gk);
-      cpSync8(src, dst, { recursive: true, force: false, errorOnExist: true });
+      const gk = join58(dst, ".gitkeep");
+      if (existsSync49(gk)) rmSync17(gk);
+      cpSync9(src, dst, { recursive: true, force: false, errorOnExist: true });
     } else {
       copyFileSync2(src, dst);
     }
     log(`snapshotted shared/${name} from ${src}`);
   }
-  const userSettings = join56(claude, "settings.json");
-  if (existsSync48(userSettings)) {
+  const userSettings = join58(claude, "settings.json");
+  if (existsSync49(userSettings)) {
     let parsed;
     try {
       parsed = readJson(userSettings);
     } catch (err) {
       return die(`malformed ${userSettings}: ${err.message}`);
     }
-    const hostFile = join56(repo, "hosts", `${HOST}.json`);
+    const hostFile = join58(repo, "hosts", `${HOST}.json`);
     writeJsonAtomic(hostFile, parsed);
     log(`snapshotted hosts/${HOST}.json from ${userSettings}`);
   }
@@ -7672,14 +8111,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 = [
-    join57(repoHome2, "shared", "settings.base.json"),
-    join57(repoHome2, "shared", "CLAUDE.md"),
-    join57(repoHome2, "path-map.json"),
-    join57(repoHome2, "hosts"),
-    join57(repoHome2, "shared")
+    join59(repoHome2, "shared", "settings.base.json"),
+    join59(repoHome2, "shared", "CLAUDE.md"),
+    join59(repoHome2, "path-map.json"),
+    join59(repoHome2, "hosts"),
+    join59(repoHome2, "shared")
   ];
   for (const c of candidates) {
-    if (existsSync49(c)) return c;
+    if (existsSync50(c)) return c;
   }
   return null;
 }
@@ -7691,33 +8130,33 @@ function cmdInit(opts = {}) {
   const keepActions = opts.keepActions === true;
   const repo = repoHome();
   const claude = claudeHome();
-  mkdirSync12(repo, { recursive: true });
+  mkdirSync14(repo, { recursive: true });
   const conflict = preflightConflict(repo);
   if (conflict !== null) {
     die(`already initialized; refusing to clobber ${conflict}`);
   }
   ensureOriginRepo(opts.repoName ?? DEFAULT_REPO_NAME, opts.run);
-  mkdirSync12(join57(repo, "shared"), { recursive: true });
-  mkdirSync12(join57(repo, "hosts"), { recursive: true });
+  mkdirSync14(join59(repo, "shared"), { recursive: true });
+  mkdirSync14(join59(repo, "hosts"), { recursive: true });
   for (const name of SHARED_KEEP_DIRS) {
-    mkdirSync12(join57(repo, "shared", name), { recursive: true });
+    mkdirSync14(join59(repo, "shared", name), { recursive: true });
   }
-  const userClaudeMd = join57(claude, "CLAUDE.md");
-  if (!snapshot || !existsSync49(userClaudeMd)) {
-    writeFileSync6(join57(repo, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
+  const userClaudeMd = join59(claude, "CLAUDE.md");
+  if (!snapshot || !existsSync50(userClaudeMd)) {
+    writeFileSync8(join59(repo, "shared", "CLAUDE.md"), SHARED_CLAUDE_MD);
     item("created shared/CLAUDE.md");
   }
   for (const name of SHARED_KEEP_DIRS) {
-    writeFileSync6(join57(repo, "shared", name, ".gitkeep"), "");
+    writeFileSync8(join59(repo, "shared", name, ".gitkeep"), "");
     item(`created shared/${name}/.gitkeep`);
   }
-  writeFileSync6(join57(repo, "hosts", ".gitkeep"), "");
+  writeFileSync8(join59(repo, "hosts", ".gitkeep"), "");
   item("created hosts/.gitkeep");
-  writeJsonAtomic(join57(repo, "shared", "settings.base.json"), {});
+  writeJsonAtomic(join59(repo, "shared", "settings.base.json"), {});
   item("created shared/settings.base.json");
-  writeJsonAtomic(join57(repo, "path-map.json"), { projects: {} });
+  writeJsonAtomic(join59(repo, "path-map.json"), { projects: {} });
   item("created path-map.json");
-  writeFileSync6(join57(repo, ".gitattributes"), GITATTRIBUTES);
+  writeFileSync8(join59(repo, ".gitattributes"), GITATTRIBUTES);
   item("created .gitattributes");
   if (snapshot) {
     snapshotIntoShared({ projects: {} });
@@ -7783,11 +8222,11 @@ function maybeDisableRepoActions(repoHome2, run) {
 // src/init.prompt.ts
 init_config();
 init_utils();
-import { existsSync as existsSync50, readdirSync as readdirSync18, statSync as statSync13 } from "node:fs";
-import { join as join58 } from "node:path";
+import { existsSync as existsSync51, readdirSync as readdirSync18, statSync as statSync13 } from "node:fs";
+import { join as join60 } from "node:path";
 import { createInterface as createInterface3 } from "node:readline/promises";
 function nonEmptyExists(path) {
-  if (!existsSync50(path)) return false;
+  if (!existsSync51(path)) return false;
   try {
     if (statSync13(path).isDirectory()) return readdirSync18(path).length > 0;
     return true;
@@ -7796,8 +8235,8 @@ function nonEmptyExists(path) {
   }
 }
 function hasExistingClaudeConfig(claudeHome2) {
-  if (existsSync50(join58(claudeHome2, "settings.json"))) return true;
-  return SHARED_LINKS.some((name) => nonEmptyExists(join58(claudeHome2, name)));
+  if (existsSync51(join60(claudeHome2, "settings.json"))) return true;
+  return SHARED_LINKS.some((name) => nonEmptyExists(join60(claudeHome2, name)));
 }
 async function confirmSnapshotDefault(claudeHome2) {
   if (process.stdin.isTTY !== true || process.stdout.isTTY !== true) {
@@ -8084,24 +8523,27 @@ function parsePushArgs(argv) {
 // src/nomad.dispatch.sync.ts
 function parseSyncArgs(argv) {
   let dryRun = false;
+  let verbose = false;
   let i = 3;
   while (i < argv.length) {
     const token = argv[i];
     if (token === "--dry-run") {
       if (dryRun) return null;
       dryRun = true;
+    } else if (token === "--verbose" || token === "--all" || token === "-v") {
+      verbose = true;
     } else {
       return null;
     }
     i++;
   }
-  return { dryRun };
+  return { dryRun, verbose };
 }
 
 // package.json
 var package_default = {
   name: "claude-nomad",
-  version: "0.59.0",
+  version: "0.61.0",
   type: "module",
   description: "Sync Claude Code config (~/.claude/) across machines via a private Git repo, with path remapping and per-host settings overrides.",
   keywords: [
@@ -8236,10 +8678,15 @@ var DEFAULT_HELP = [
   cont("Mutually exclusive with --redact-all/--allow. Cannot combine with --dry-run."),
   "",
   row("  sync", "Pull (retain-merge), then push, under one lock. One-shot; hides ordering."),
+  cont("Compact by default: prints only the Sync summary."),
   row("       --dry-run", "Stack the pull preview then the push preview; mutates nothing."),
   cont("Fails fast on a pull-half error; a wedged repo hints at nomad pull --force-remote"),
   cont("(sync itself takes no --force-remote). Mid-push leak recovery behaves exactly"),
   cont("like nomad push."),
+  row(
+    "       --verbose, --all, -v",
+    "Show the full merged tree; default output is the Sync summary only."
+  ),
   "",
   row("  diff", "Offline preview of what `pull` would change against local repo state."),
   cont("No git pull, no lock acquired."),
@@ -8337,15 +8784,15 @@ var DEFAULT_HELP = [
 init_config();
 init_utils();
 init_utils_json();
-import { existsSync as existsSync51, readFileSync as readFileSync18, readdirSync as readdirSync19 } from "node:fs";
-import { join as join59 } from "node:path";
+import { existsSync as existsSync52, readFileSync as readFileSync19, readdirSync as readdirSync19 } from "node:fs";
+import { join as join61 } 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 = join59(claudeHome(), "projects");
-  if (!existsSync51(projectsRoot)) {
+  const projectsRoot = join61(claudeHome(), "projects");
+  if (!existsSync52(projectsRoot)) {
     fail(`${projectsRoot} does not exist`);
     process.exit(1);
   }
@@ -8359,8 +8806,8 @@ function resumeCmd(sessionId) {
     fail(`no cwd field found in ${jsonlPath}`);
     process.exit(1);
   }
-  const mapPath = join59(repoHome(), "path-map.json");
-  if (!existsSync51(mapPath)) {
+  const mapPath = join61(repoHome(), "path-map.json");
+  if (!existsSync52(mapPath)) {
     fail("path-map.json missing");
     process.exit(1);
   }
@@ -8383,13 +8830,13 @@ function resumeCmd(sessionId) {
 }
 function findTranscriptPath(projectsRoot, sessionId) {
   for (const dir of readdirSync19(projectsRoot)) {
-    const candidate = join59(projectsRoot, dir, `${sessionId}.jsonl`);
-    if (existsSync51(candidate)) return candidate;
+    const candidate = join61(projectsRoot, dir, `${sessionId}.jsonl`);
+    if (existsSync52(candidate)) return candidate;
   }
   return null;
 }
 function extractRecordedCwd(jsonlPath) {
-  for (const line of readFileSync18(jsonlPath, "utf8").split("\n")) {
+  for (const line of readFileSync19(jsonlPath, "utf8").split("\n")) {
     if (!line.trim()) continue;
     try {
       const obj = JSON.parse(line);
@@ -8465,10 +8912,10 @@ try {
     case "sync": {
       const syncArgs = parseSyncArgs(process.argv);
       if (syncArgs === null) {
-        console.error("usage: nomad sync [--dry-run]");
+        console.error("usage: nomad sync [--dry-run] [--verbose|--all|-v]");
         process.exit(1);
       }
-      await cmdSync({ dryRun: syncArgs.dryRun });
+      await cmdSync({ dryRun: syncArgs.dryRun, verbose: syncArgs.verbose });
       break;
     }
     case "init": {