@remnic/core 1.1.0 → 1.1.2

package/dist/consolidation-undo.js

@@ -0,0 +1,426 @@
+import {
+  getVersion
+} from "./chunk-FAAFWE4G.js";
+
+// src/consolidation-undo.ts
+import path from "path";
+import { mkdir, writeFile, access, realpath, lstat } from "fs/promises";
+import { constants as fsConstants } from "fs";
+var DERIVED_FROM_ENTRY_RE = /^(.+):(\d+)$/;
+function parseEntry(entry) {
+  if (typeof entry !== "string") return null;
+  const match = entry.match(DERIVED_FROM_ENTRY_RE);
+  if (!match) return null;
+  return { pagePath: match[1], versionId: match[2] };
+}
+function isInsideDirectory(candidate, root) {
+  const normRoot = path.resolve(root);
+  const normCandidate = path.resolve(candidate);
+  const rel = path.relative(normRoot, normCandidate);
+  if (rel.length === 0) return true;
+  if (rel.startsWith("..")) return false;
+  if (path.isAbsolute(rel)) return false;
+  return true;
+}
+async function isInsideDirectoryRealpath(candidate, root) {
+  if (!isInsideDirectory(candidate, root)) return false;
+  const rawSegments = candidate.replace(/\\/g, "/").split("/");
+  if (rawSegments.some((s) => s === "..")) return false;
+  let resolvedRoot;
+  try {
+    resolvedRoot = await realpath(path.resolve(root));
+  } catch {
+    return false;
+  }
+  const normCandidate = path.resolve(candidate);
+  const normRoot = path.resolve(root);
+  const relFromRoot = path.relative(normRoot, normCandidate);
+  const segments = relFromRoot.length > 0 ? relFromRoot.split(path.sep) : [];
+  for (let i = 0; i <= segments.length; i++) {
+    const probe = i === 0 ? normRoot : path.join(normRoot, ...segments.slice(0, i));
+    try {
+      const st = await lstat(probe);
+      if (st.isSymbolicLink() && probe !== normRoot) {
+        let target;
+        try {
+          target = await realpath(probe);
+        } catch {
+          return false;
+        }
+        const rel = path.relative(resolvedRoot, target);
+        if (rel.length === 0) continue;
+        if (rel.startsWith("..") || path.isAbsolute(rel)) return false;
+      }
+    } catch {
+    }
+  }
+  const parts = normCandidate.split(path.sep);
+  for (let i = parts.length; i > 0; i--) {
+    const probe = parts.slice(0, i).join(path.sep) || path.sep;
+    try {
+      const resolved = await realpath(probe);
+      const trailing = parts.slice(i).join(path.sep);
+      const final = trailing.length > 0 ? path.join(resolved, trailing) : resolved;
+      const rel = path.relative(resolvedRoot, final);
+      if (rel.length === 0) return true;
+      if (rel.startsWith("..")) return false;
+      if (path.isAbsolute(rel)) return false;
+      return true;
+    } catch {
+      continue;
+    }
+  }
+  return false;
+}
+var NON_ACTIVE_PREFIXES = ["archive/", "state/"];
+function normalizeRelativePath(p) {
+  const parts = p.replace(/\\/g, "/").split("/");
+  const resolved = [];
+  for (const seg of parts) {
+    if (seg === "" || seg === ".") continue;
+    if (seg === "..") {
+      if (resolved.length > 0) resolved.pop();
+    } else {
+      resolved.push(seg);
+    }
+  }
+  return resolved.join("/");
+}
+function isActiveMemoryRelativePath(pagePath, sidecarDir) {
+  const normalized = normalizeRelativePath(pagePath);
+  const prefixes = [...NON_ACTIVE_PREFIXES];
+  if (sidecarDir) {
+    const normSidecar = normalizeRelativePath(sidecarDir);
+    prefixes.push(normSidecar + "/");
+  }
+  for (const prefix of prefixes) {
+    if (normalized === prefix.slice(0, -1) || normalized.startsWith(prefix)) {
+      return false;
+    }
+  }
+  return true;
+}
+async function isRegularFile(p) {
+  try {
+    const st = await lstat(p);
+    return st.isFile();
+  } catch {
+    return false;
+  }
+}
+async function fileExists(p) {
+  try {
+    await access(p, fsConstants.F_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function runConsolidationUndo(options) {
+  const { storage, memoryDir, targetPath, versioning } = options;
+  const dryRun = options.dryRun === true;
+  const result = {
+    targetPath,
+    targetArchived: false,
+    restores: [],
+    dryRun
+  };
+  if (!await isInsideDirectoryRealpath(targetPath, memoryDir)) {
+    result.error = `target path ${targetPath} is outside memory directory ${memoryDir}`;
+    return result;
+  }
+  const targetRel = path.relative(memoryDir, targetPath);
+  if (!isActiveMemoryRelativePath(targetRel, versioning.sidecarDir)) {
+    result.error = `target path "${targetRel}" is inside a non-active directory \u2014 refusing to operate`;
+    return result;
+  }
+  const target = await storage.readMemoryByPath(targetPath);
+  if (!target) {
+    result.error = `could not load target memory at ${targetPath}`;
+    return result;
+  }
+  const derivedFrom = target.frontmatter.derived_from;
+  if (!Array.isArray(derivedFrom) || derivedFrom.length === 0) {
+    result.error = "target memory has no derived_from entries \u2014 nothing to undo";
+    return result;
+  }
+  const plans = [];
+  for (const rawEntry of derivedFrom) {
+    const entry = typeof rawEntry === "string" ? rawEntry : String(rawEntry);
+    const parsed = parseEntry(rawEntry);
+    if (!parsed) {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath: "",
+          outcome: "skipped_malformed_entry",
+          detail: `expected "<path>:<version>" shape`
+        }
+      });
+      continue;
+    }
+    if (path.isAbsolute(parsed.pagePath)) {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath: parsed.pagePath,
+          outcome: "skipped_malformed_entry",
+          detail: `derived_from path must be relative, got absolute: "${parsed.pagePath}"`
+        }
+      });
+      continue;
+    }
+    const sourcePath = path.join(memoryDir, parsed.pagePath);
+    if (!await isInsideDirectoryRealpath(sourcePath, memoryDir)) {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath,
+          outcome: "skipped_outside_memory_dir",
+          detail: `resolved path escapes memory directory ${memoryDir}`
+        }
+      });
+      continue;
+    }
+    let resolvedRelative = parsed.pagePath;
+    try {
+      const realBase = await realpath(memoryDir);
+      try {
+        const realSource = await realpath(sourcePath);
+        const rel = path.relative(realBase, realSource);
+        if (!rel.startsWith("..") && !path.isAbsolute(rel)) {
+          resolvedRelative = rel.replace(/\\/g, "/");
+        }
+      } catch {
+        const parentDir = path.dirname(sourcePath);
+        try {
+          const realParent = await realpath(parentDir);
+          const parentRel = path.relative(realBase, realParent);
+          if (!parentRel.startsWith("..") && !path.isAbsolute(parentRel)) {
+            const leafName = path.basename(sourcePath);
+            resolvedRelative = path.join(parentRel, leafName).replace(/\\/g, "/");
+          }
+        } catch {
+        }
+      }
+    } catch {
+    }
+    if (!isActiveMemoryRelativePath(parsed.pagePath, versioning.sidecarDir) || !isActiveMemoryRelativePath(resolvedRelative, versioning.sidecarDir)) {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath,
+          outcome: "skipped_non_active_path",
+          detail: `source path "${parsed.pagePath}" is inside a non-active directory (archive/state/versions)`
+        }
+      });
+      continue;
+    }
+    if (path.resolve(sourcePath) === path.resolve(targetPath)) {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath,
+          outcome: "skipped_self_referential",
+          detail: `derived_from entry "${entry}" resolves to the same file as the target \u2014 refusing to count as recovered`
+        }
+      });
+      continue;
+    }
+    if (await isRegularFile(sourcePath)) {
+      plans.push({ kind: "recovered_existing", entry, sourcePath });
+      continue;
+    }
+    if (await fileExists(sourcePath)) {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath,
+          outcome: "skipped_non_regular_file",
+          detail: "source path is occupied by a non-regular-file; refusing to proceed"
+        }
+      });
+      continue;
+    }
+    let snapshotContent;
+    try {
+      snapshotContent = await getVersion(
+        sourcePath,
+        parsed.versionId,
+        versioning,
+        memoryDir
+      );
+    } catch {
+      plans.push({
+        kind: "skip",
+        restore: {
+          entry,
+          sourcePath,
+          outcome: "skipped_snapshot_missing",
+          detail: `no snapshot for version ${parsed.versionId}`
+        }
+      });
+      continue;
+    }
+    plans.push({ kind: "write", entry, sourcePath, content: snapshotContent });
+  }
+  const skipped = plans.filter((p) => p.kind === "skip");
+  if (skipped.length > 0) {
+    for (const p of plans) {
+      if (p.kind === "skip") {
+        result.restores.push(p.restore);
+      } else if (p.kind === "write") {
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: dryRun ? "skipped_dry_run" : "skipped_blocked_by_other_failures",
+          detail: dryRun ? "would restore from snapshot (blocked by other failures)" : "snapshot available but undo aborted due to other failures"
+        });
+      } else {
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: "skipped_file_exists",
+          detail: "source file already exists; no restore needed"
+        });
+      }
+    }
+    const recovered = result.restores.filter(
+      (r) => r.outcome === "restored" || r.outcome === "skipped_file_exists"
+    ).length;
+    if (recovered === 0) {
+      result.error = "no sources could be recovered (all snapshots missing or paths unsafe); target not archived to preserve data";
+    } else {
+      result.error = `${skipped.length} of ${plans.length} sources could not be recovered; target not archived (undo is all-or-nothing)`;
+    }
+    return result;
+  }
+  const seenSourcePaths = /* @__PURE__ */ new Set();
+  const dedupedPlans = [];
+  for (const p of plans) {
+    if (p.kind === "write" || p.kind === "recovered_existing") {
+      if (seenSourcePaths.has(p.sourcePath)) {
+        dedupedPlans.push({
+          kind: "skip",
+          restore: {
+            entry: p.kind === "write" ? p.entry : p.entry,
+            sourcePath: p.sourcePath,
+            outcome: "skipped_file_exists",
+            detail: "duplicate derived_from entry \u2014 source already processed"
+          }
+        });
+        continue;
+      }
+      seenSourcePaths.add(p.sourcePath);
+    }
+    dedupedPlans.push(p);
+  }
+  if (dryRun) {
+    for (const p of dedupedPlans) {
+      if (p.kind === "write") {
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: "skipped_dry_run",
+          detail: "would restore from snapshot"
+        });
+      } else if (p.kind === "recovered_existing") {
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: "skipped_file_exists",
+          detail: "source file already exists; no restore needed"
+        });
+      } else if (p.kind === "skip" && p.restore) {
+        result.restores.push(p.restore);
+      }
+    }
+    return result;
+  }
+  let writeFailed = false;
+  for (const p of dedupedPlans) {
+    if (p.kind === "skip") {
+      if (p.restore) result.restores.push(p.restore);
+      continue;
+    }
+    if (p.kind === "recovered_existing") {
+      result.restores.push({
+        entry: p.entry,
+        sourcePath: p.sourcePath,
+        outcome: "skipped_file_exists",
+        detail: "source file already exists; no restore needed"
+      });
+      continue;
+    }
+    if (p.kind === "write") {
+      if (writeFailed) {
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: "skipped_blocked_by_other_failures",
+          detail: "a prior source write failed; skipping remaining writes to honor all-or-nothing contract"
+        });
+        continue;
+      }
+      try {
+        await mkdir(path.dirname(p.sourcePath), { recursive: true });
+        await writeFile(p.sourcePath, p.content, { encoding: "utf-8", flag: "wx" });
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: "restored"
+        });
+      } catch (err) {
+        writeFailed = true;
+        result.restores.push({
+          entry: p.entry,
+          sourcePath: p.sourcePath,
+          outcome: "skipped_write_failed",
+          detail: `write failed: ${err instanceof Error ? err.message : String(err)}`
+        });
+      }
+    }
+  }
+  if (writeFailed) {
+    result.error = "one or more source writes failed mid-restore; target not archived to preserve data";
+    return result;
+  }
+  const archivedAt = await storage.archiveMemory(target, {
+    actor: "consolidate-undo",
+    reasonCode: "consolidation-undo"
+  });
+  result.targetArchived = archivedAt !== null;
+  if (!result.targetArchived) {
+    result.error = "sources restored successfully but archiving the consolidated target failed; inspect storage for manual cleanup";
+  }
+  return result;
+}
+function formatConsolidationUndoResult(result) {
+  const lines = [];
+  lines.push(`consolidate undo ${result.dryRun ? "(dry run) " : ""}\u2192 ${result.targetPath}`);
+  for (const r of result.restores) {
+    lines.push(`  - ${r.entry} \u2192 ${r.outcome}${r.detail ? ` (${r.detail})` : ""}`);
+  }
+  if (result.error) {
+    lines.push(`  ERROR: ${result.error}`);
+    return lines.join("\n");
+  }
+  lines.push(
+    result.dryRun ? "  (dry run \u2014 no files were modified, target not archived)" : `  target archived: ${result.targetArchived ? "yes" : "no"}`
+  );
+  return lines.join("\n");
+}
+export {
+  formatConsolidationUndoResult,
+  isActiveMemoryRelativePath,
+  isInsideDirectory,
+  isInsideDirectoryRealpath,
+  runConsolidationUndo
+};
+//# sourceMappingURL=consolidation-undo.js.map

package/dist/consolidation-undo.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/consolidation-undo.ts"],"sourcesContent":["/**\n * Consolidation undo (issue #561 PR 5).\n *\n * Reverts a consolidated memory by restoring each source memory from its\n * `derived_from` snapshot and archiving the target.\n *\n * Contract:\n *   - Load the target memory markdown file via its absolute path.\n *   - For every `\"<rel>:<version>\"` entry in `derived_from`, fetch the\n *     snapshot content via `page-versioning.getVersion` and restore it\n *     to the original relative path.  If the restore target file\n *     already exists, we skip overwriting it (the source was never\n *     archived, or was re-created since) and record the skip.\n *   - Archive the target with reason code `\"consolidation-undo\"` so the\n *     lifecycle ledger records the undo.\n *   - Dry-run mode produces the same plan without touching disk.\n *\n * The helper is kept pure over `StorageManager` so the CLI can reuse it\n * without additional wiring, and tests can exercise the plan logic\n * directly.\n */\n\nimport path from \"node:path\";\nimport { mkdir, writeFile, access, realpath, lstat } from \"node:fs/promises\";\nimport { constants as fsConstants } from \"node:fs\";\nimport type { StorageManager } from \"./storage.js\";\nimport type { VersioningConfig } from \"./page-versioning.js\";\nimport { getVersion } from \"./page-versioning.js\";\n\n/**\n * Outcome of restoring a single `derived_from` source.\n */\nexport interface ConsolidationUndoRestore {\n  /** The raw `\"<relpath>:<version>\"` entry from `derived_from`. */\n  entry: string;\n  /** Absolute path where the source would be / was restored. */\n  sourcePath: string;\n  /** What actually happened. */\n  outcome:\n    | \"restored\"\n    | \"skipped_file_exists\"\n    | \"skipped_non_regular_file\"\n    | \"skipped_snapshot_missing\"\n    | \"skipped_malformed_entry\"\n    | \"skipped_outside_memory_dir\"\n    | \"skipped_non_active_path\"\n    | \"skipped_self_referential\"\n    | \"skipped_write_failed\"\n    | \"skipped_blocked_by_other_failures\"\n    | \"skipped_dry_run\";\n  /** Human-readable detail. */\n  detail?: string;\n}\n\n/**\n * Plan + result of a `remnic consolidate undo` invocation.\n */\nexport interface ConsolidationUndoResult {\n  /** Absolute path to the target memory. */\n  targetPath: string;\n  /** True when the target was archived successfully. */\n  targetArchived: boolean;\n  /** Per-source restore outcomes. */\n  restores: ConsolidationUndoRestore[];\n  /** Whether the run was a dry-run plan only. */\n  dryRun: boolean;\n  /** Fatal error, if any — the run bails early. */\n  error?: string;\n}\n\nconst DERIVED_FROM_ENTRY_RE = /^(.+):(\\d+)$/;\n\nfunction parseEntry(entry: unknown): { pagePath: string; versionId: string } | null {\n  // Non-string entries (PR #637 round-3 review, cursor Low) can arrive\n  // from hostile on-disk frontmatter — guard against a .match() crash.\n  if (typeof entry !== \"string\") return null;\n  const match = entry.match(DERIVED_FROM_ENTRY_RE);\n  if (!match) return null;\n  return { pagePath: match[1], versionId: match[2] };\n}\n\n/**\n * Verify that `candidate` resolves inside `root` (defense against\n * path-traversal in `derived_from` entries and user-facing target\n * paths).  Path-string normalization only; for symlink-aware checks\n * use `isInsideDirectoryRealpath`.  Both paths are resolved to\n * absolute form before comparison so `..` segments, symlinks-as-\n * strings, and relative prefixes are normalized.\n */\nexport function isInsideDirectory(candidate: string, root: string): boolean {\n  const normRoot = path.resolve(root);\n  const normCandidate = path.resolve(candidate);\n  const rel = path.relative(normRoot, normCandidate);\n  if (rel.length === 0) return true;\n  if (rel.startsWith(\"..\")) return false;\n  if (path.isAbsolute(rel)) return false;\n  return true;\n}\n\n/**\n * Symlink-aware containment check (PR #637 round-2 review, codex P1).\n *\n * `isInsideDirectory` only normalizes path strings — if a `derived_from`\n * entry resolves through a symlink inside `memoryDir` that points\n * outside, the string check passes but the subsequent `writeFile` would\n * land outside the memory tree.  Use this guard for any path that is\n * about to be written.\n *\n * Walks every parent directory between `candidate` and `root`,\n * `realpath`-ing each segment that exists and rejecting when any\n * segment escapes `root`.  Non-existent parents are resolved as the\n * canonicalized deepest-existing ancestor plus the trailing segments,\n * so a not-yet-created target file still gets the symlink check on its\n * existing parent directories.\n */\nexport async function isInsideDirectoryRealpath(\n  candidate: string,\n  root: string,\n): Promise<boolean> {\n  if (!isInsideDirectory(candidate, root)) return false;\n  // Reject raw `..` segments before canonicalization so that symlinks\n  // cannot be hidden behind intermediate dot-dot components (PR #637\n  // round-14 review, codex P1).\n  const rawSegments = candidate.replace(/\\\\/g, \"/\").split(\"/\");\n  if (rawSegments.some((s) => s === \"..\")) return false;\n  let resolvedRoot: string;\n  try {\n    resolvedRoot = await realpath(path.resolve(root));\n  } catch {\n    return false;\n  }\n  const normCandidate = path.resolve(candidate);\n\n  // Reject dangling symlinks (PR #637 round-3 review, codex P1).\n  // If the candidate itself is a symlink (even if its target doesn't\n  // exist), Node will follow it when we later call `writeFile`.\n  // `lstat` inspects the link itself without dereferencing; if it\n  // succeeds and reports a symlink, we treat the candidate as\n  // unsafe.  We must check every non-root ancestor too — a symlink\n  // anywhere along the path lets an attacker redirect writes.\n  const normRoot = path.resolve(root);\n  const relFromRoot = path.relative(normRoot, normCandidate);\n  const segments = relFromRoot.length > 0 ? relFromRoot.split(path.sep) : [];\n  for (let i = 0; i <= segments.length; i++) {\n    const probe = i === 0 ? normRoot : path.join(normRoot, ...segments.slice(0, i));\n    try {\n      const st = await lstat(probe);\n      if (st.isSymbolicLink() && probe !== normRoot) {\n        // A symlink on the path — resolve THIS segment and bail out\n        // if the resolved target escapes `resolvedRoot`.\n        let target: string;\n        try {\n          target = await realpath(probe);\n        } catch {\n          // Dangling symlink inside memoryDir — always unsafe.\n          return false;\n        }\n        const rel = path.relative(resolvedRoot, target);\n        if (rel.length === 0) continue;\n        if (rel.startsWith(\"..\") || path.isAbsolute(rel)) return false;\n      }\n    } catch {\n      // Segment doesn't exist yet — that's fine, fall through to the\n      // textual containment verification below.\n    }\n  }\n\n  // Walk up from the candidate until we hit a path that exists, then\n  // realpath THAT and re-apply the trailing segments textually.\n  const parts = normCandidate.split(path.sep);\n  for (let i = parts.length; i > 0; i--) {\n    const probe = parts.slice(0, i).join(path.sep) || path.sep;\n    try {\n      const resolved = await realpath(probe);\n      // Re-join any trailing segments that didn't exist yet.\n      const trailing = parts.slice(i).join(path.sep);\n      const final = trailing.length > 0 ? path.join(resolved, trailing) : resolved;\n      // Now apply the textual containment check against the canonical\n      // `resolvedRoot`.\n      const rel = path.relative(resolvedRoot, final);\n      if (rel.length === 0) return true;\n      if (rel.startsWith(\"..\")) return false;\n      if (path.isAbsolute(rel)) return false;\n      return true;\n    } catch {\n      continue;\n    }\n  }\n  // Nothing along the path resolvable — treat as outside by default.\n  return false;\n}\n\n/**\n * Directories under memoryDir that are NOT active memory locations.\n * A `derived_from` entry pointing into one of these should not be\n * counted as \"recovered_existing\" (PR #637 round-7 review, codex P2).\n * The versioning sidecar directory is included dynamically via the\n * `sidecarDir` parameter (PR #637 round-8 review, codex P2).\n */\nconst NON_ACTIVE_PREFIXES = [\"archive/\", \"state/\"];\n\n/**\n * Normalize a relative path by collapsing `.` and `..` segments so\n * that crafted entries like `\"facts/../archive/x.md\"` are reduced to\n * `\"archive/x.md\"` before the non-active-prefix check.\n */\nfunction normalizeRelativePath(p: string): string {\n  // Normalize separators, split into segments, then resolve.\n  const parts = p.replace(/\\\\/g, \"/\").split(\"/\");\n  const resolved: string[] = [];\n  for (const seg of parts) {\n    if (seg === \"\" || seg === \".\") continue;\n    if (seg === \"..\") {\n      if (resolved.length > 0) resolved.pop();\n      // If \"..\" pops past the root, we let the caller's containment\n      // check catch it — don't silently drop.\n    } else {\n      resolved.push(seg);\n    }\n  }\n  return resolved.join(\"/\");\n}\n\n/**\n * Check that a relative path (relative to memoryDir) points to an\n * active memory location rather than an internal/archive directory.\n * Returns `true` when the normalised `pagePath` does NOT start with\n * a known non-active prefix.\n *\n * @param pagePath   Relative path from `derived_from` entry.\n * @param sidecarDir Optional versioning sidecar directory name\n *                   (e.g. `\".versions\"`).  When provided, paths\n *                   under this directory are also rejected as\n *                   non-active.\n */\nexport function isActiveMemoryRelativePath(\n  pagePath: string,\n  sidecarDir?: string,\n): boolean {\n  const normalized = normalizeRelativePath(pagePath);\n  const prefixes = [...NON_ACTIVE_PREFIXES];\n  if (sidecarDir) {\n    const normSidecar = normalizeRelativePath(sidecarDir);\n    prefixes.push(normSidecar + \"/\");\n  }\n  for (const prefix of prefixes) {\n    if (normalized === prefix.slice(0, -1) || normalized.startsWith(prefix)) {\n      return false;\n    }\n  }\n  return true;\n}\n\nasync function isRegularFile(p: string): Promise<boolean> {\n  try {\n    const st = await lstat(p);\n    return st.isFile();\n  } catch {\n    return false;\n  }\n}\n\nasync function fileExists(p: string): Promise<boolean> {\n  try {\n    await access(p, fsConstants.F_OK);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Perform a consolidation-undo operation.\n *\n * @param options.storage        Storage manager for the memory directory.\n * @param options.memoryDir      Absolute memory directory root.\n * @param options.targetPath     Absolute path to the consolidated memory.\n * @param options.versioning     Page-versioning config (sidecarDir must\n *                               match the sidecar layout used when the\n *                               snapshots were created).\n * @param options.dryRun         When true, compute the plan but do not\n *                               write or archive.\n */\nexport async function runConsolidationUndo(options: {\n  storage: StorageManager;\n  memoryDir: string;\n  targetPath: string;\n  versioning: VersioningConfig;\n  dryRun?: boolean;\n}): Promise<ConsolidationUndoResult> {\n  const { storage, memoryDir, targetPath, versioning } = options;\n  const dryRun = options.dryRun === true;\n\n  const result: ConsolidationUndoResult = {\n    targetPath,\n    targetArchived: false,\n    restores: [],\n    dryRun,\n  };\n\n  // Defense against path-traversal (PR #637 review, codex P1): refuse\n  // to operate on a target outside the configured memory directory.\n  // Archive moves and eventual unlink would otherwise let an operator\n  // accidentally destroy an unrelated file with memory-like\n  // frontmatter.  Uses the realpath-aware check so a symlinked\n  // directory inside `memoryDir` can't tunnel a target past the guard.\n  if (!(await isInsideDirectoryRealpath(targetPath, memoryDir))) {\n    result.error = `target path ${targetPath} is outside memory directory ${memoryDir}`;\n    return result;\n  }\n\n  // Reject targets in non-active directories (archive/, state/,\n  // versioning sidecar).  A target inside `.versions/...` would be\n  // a sidecar snapshot, not a real consolidated memory; archiving\n  // it would silently delete version history (PR #637 round-8\n  // review, codex P2).\n  const targetRel = path.relative(memoryDir, targetPath);\n  if (!isActiveMemoryRelativePath(targetRel, versioning.sidecarDir)) {\n    result.error = `target path \"${targetRel}\" is inside a non-active directory — refusing to operate`;\n    return result;\n  }\n\n  // Load the target memory.  readMemoryByPath returns null when the file\n  // is absent or unparseable — surface that as a fatal error because the\n  // caller cannot continue without a derived_from list.\n  const target = await storage.readMemoryByPath(targetPath);\n  if (!target) {\n    result.error = `could not load target memory at ${targetPath}`;\n    return result;\n  }\n\n  const derivedFrom = target.frontmatter.derived_from;\n  if (!Array.isArray(derivedFrom) || derivedFrom.length === 0) {\n    result.error = \"target memory has no derived_from entries — nothing to undo\";\n    return result;\n  }\n\n  // Two-pass plan + execute (PR #637 round-4 review, cursor Medium):\n  // the undo is \"all-or-nothing\" both for the archive decision AND\n  // for the per-source writes.  First pass validates + loads every\n  // snapshot into memory; second pass writes only if every source\n  // would succeed.  This prevents the previous eager-write behaviour\n  // where a later-failing source would leave earlier sources already\n  // written to disk alongside an unarchived consolidated target.\n  type RestorePlan =\n    | { kind: \"skip\"; restore: ConsolidationUndoRestore }\n    | { kind: \"write\"; entry: string; sourcePath: string; content: string }\n    | { kind: \"recovered_existing\"; entry: string; sourcePath: string };\n\n  const plans: RestorePlan[] = [];\n  for (const rawEntry of derivedFrom) {\n    const entry = typeof rawEntry === \"string\" ? rawEntry : String(rawEntry);\n    const parsed = parseEntry(rawEntry);\n    if (!parsed) {\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath: \"\",\n          outcome: \"skipped_malformed_entry\",\n          detail: `expected \"<path>:<version>\" shape`,\n        },\n      });\n      continue;\n    }\n\n    // Reject absolute paths in derived_from entries (PR #637 round-10\n    // review, codex P1).  An absolute pagePath would cause path.join to\n    // ignore memoryDir, bypassing the active-directory guard downstream.\n    if (path.isAbsolute(parsed.pagePath)) {\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath: parsed.pagePath,\n          outcome: \"skipped_malformed_entry\",\n          detail: `derived_from path must be relative, got absolute: \"${parsed.pagePath}\"`,\n        },\n      });\n      continue;\n    }\n\n    const sourcePath = path.join(memoryDir, parsed.pagePath);\n\n    if (!(await isInsideDirectoryRealpath(sourcePath, memoryDir))) {\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath,\n          outcome: \"skipped_outside_memory_dir\",\n          detail: `resolved path escapes memory directory ${memoryDir}`,\n        },\n      });\n      continue;\n    }\n\n    // Reject source paths inside non-active directories (archive/,\n    // state/, versioning sidecar).  A crafted or corrupted derived_from\n    // entry like \"archive/2024-01-01/x.md:1\" would otherwise be counted\n    // as \"recovered_existing\" even though no active memory was restored.\n    // Also resolve symlinks before checking — a derived_from entry like\n    // \"facts/link/stale.md:1\" where `facts/link` points to `archive/…`\n    // must be caught (PR #637 round-8 review, cursor+codex).\n    let resolvedRelative = parsed.pagePath;\n    try {\n      const realBase = await realpath(memoryDir);\n      try {\n        const realSource = await realpath(sourcePath);\n        const rel = path.relative(realBase, realSource);\n        if (!rel.startsWith(\"..\") && !path.isAbsolute(rel)) {\n          resolvedRelative = rel.replace(/\\\\/g, \"/\");\n        }\n      } catch {\n        // realpath on the leaf failed (file doesn't exist yet).  Try\n        // resolving the parent directory instead — if the parent is a\n        // symlink into archive/state, the leaf would be written there\n        // too (PR #637 round-12 review, codex P1).\n        const parentDir = path.dirname(sourcePath);\n        try {\n          const realParent = await realpath(parentDir);\n          const parentRel = path.relative(realBase, realParent);\n          if (!parentRel.startsWith(\"..\") && !path.isAbsolute(parentRel)) {\n            const leafName = path.basename(sourcePath);\n            resolvedRelative = path.join(parentRel, leafName).replace(/\\\\/g, \"/\");\n          }\n        } catch {\n          // Parent also doesn't exist — fall through to text path check\n        }\n      }\n    } catch {\n      // memoryDir realpath failed — use the text path\n    }\n    if (!isActiveMemoryRelativePath(parsed.pagePath, versioning.sidecarDir) ||\n        !isActiveMemoryRelativePath(resolvedRelative, versioning.sidecarDir)) {\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath,\n          outcome: \"skipped_non_active_path\",\n          detail: `source path \"${parsed.pagePath}\" is inside a non-active directory (archive/state/versions)`,\n        },\n      });\n      continue;\n    }\n\n    // Reject self-referential derived_from entries (PR #637 round-9 review,\n    // codex P1).  If the source resolves to the same file as the target,\n    // counting it as \"recovered\" would let undo archive the target without\n    // restoring any independent source — leaving no active copy.  This\n    // guards against corrupted or manually-edited derived_from lists.\n    if (path.resolve(sourcePath) === path.resolve(targetPath)) {\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath,\n          outcome: \"skipped_self_referential\",\n          detail: `derived_from entry \"${entry}\" resolves to the same file as the target — refusing to count as recovered`,\n        },\n      });\n      continue;\n    }\n\n    if (await isRegularFile(sourcePath)) {\n      // Source is still active (regular file present) — nothing to\n      // restore but this counts as \"recovered\" for the archive\n      // decision.  We require a regular file specifically (PR #637\n      // round-5 review, codex P2): a directory, device node, or\n      // symlink at the source path should not count as \"recovered\"\n      // because a later read won't find the expected memory content.\n      plans.push({ kind: \"recovered_existing\", entry, sourcePath });\n      continue;\n    }\n    if (await fileExists(sourcePath)) {\n      // Something other than a regular file is at the source path\n      // (directory, device node, symlink).  Refuse to overwrite AND\n      // refuse to count as recovered (PR #637 round-5 review, codex\n      // P2) — the operator needs to clean up manually.  This is a\n      // blocking skip: no source writes happen, target stays active.\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath,\n          outcome: \"skipped_non_regular_file\",\n          detail: \"source path is occupied by a non-regular-file; refusing to proceed\",\n        },\n      });\n      continue;\n    }\n\n    let snapshotContent: string;\n    try {\n      snapshotContent = await getVersion(\n        sourcePath,\n        parsed.versionId,\n        versioning,\n        memoryDir,\n      );\n    } catch {\n      plans.push({\n        kind: \"skip\",\n        restore: {\n          entry,\n          sourcePath,\n          outcome: \"skipped_snapshot_missing\",\n          detail: `no snapshot for version ${parsed.versionId}`,\n        },\n      });\n      continue;\n    }\n\n    plans.push({ kind: \"write\", entry, sourcePath, content: snapshotContent });\n  }\n\n  // If any plan is a skip (anything other than \"write\" or\n  // \"recovered_existing\"), the undo is over before it starts — no\n  // writes happen.  Reveal every per-source skip reason in the\n  // result so operators can diagnose what went wrong.\n  const skipped = plans.filter((p) => p.kind === \"skip\");\n  if (skipped.length > 0) {\n    for (const p of plans) {\n      if (p.kind === \"skip\") {\n        result.restores.push(p.restore);\n      } else if (p.kind === \"write\") {\n        // Announced-but-not-executed write — still record it so the\n        // operator sees what would have been restored if the failed\n        // sources had been recoverable.\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: dryRun ? \"skipped_dry_run\" : \"skipped_blocked_by_other_failures\",\n          detail: dryRun\n            ? \"would restore from snapshot (blocked by other failures)\"\n            : \"snapshot available but undo aborted due to other failures\",\n        });\n      } else {\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: \"skipped_file_exists\",\n          detail: \"source file already exists; no restore needed\",\n        });\n      }\n    }\n    const recovered = result.restores.filter(\n      (r) => r.outcome === \"restored\" || r.outcome === \"skipped_file_exists\",\n    ).length;\n    if (recovered === 0) {\n      result.error =\n        \"no sources could be recovered (all snapshots missing or paths unsafe); target not archived to preserve data\";\n    } else {\n      result.error = `${skipped.length} of ${plans.length} sources could not be recovered; target not archived (undo is all-or-nothing)`;\n    }\n    return result;\n  }\n\n  // Deduplicate plans by sourcePath: duplicate derived_from entries for\n  // the same source would cause the second wx-flagged write to fail with\n  // EEXIST after the first succeeds.  The first plan for each source wins;\n  // subsequent duplicates are recorded as skipped.  Applied before dry-run\n  // so the preview accurately reflects what execution would do.\n  const seenSourcePaths = new Set<string>();\n  const dedupedPlans: RestorePlan[] = [];\n  for (const p of plans) {\n    if (p.kind === \"write\" || p.kind === \"recovered_existing\") {\n      if (seenSourcePaths.has(p.sourcePath)) {\n        dedupedPlans.push({\n          kind: \"skip\",\n          restore: {\n            entry: p.kind === \"write\" ? p.entry : p.entry,\n            sourcePath: p.sourcePath,\n            outcome: \"skipped_file_exists\",\n            detail: \"duplicate derived_from entry — source already processed\",\n          },\n        });\n        continue;\n      }\n      seenSourcePaths.add(p.sourcePath);\n    }\n    dedupedPlans.push(p);\n  }\n\n  // Dry-run: report what each plan would do.\n  if (dryRun) {\n    for (const p of dedupedPlans) {\n      if (p.kind === \"write\") {\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: \"skipped_dry_run\",\n          detail: \"would restore from snapshot\",\n        });\n      } else if (p.kind === \"recovered_existing\") {\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: \"skipped_file_exists\",\n          detail: \"source file already exists; no restore needed\",\n        });\n      } else if (p.kind === \"skip\" && p.restore) {\n        result.restores.push(p.restore);\n      }\n    }\n    return result;\n  }\n\n  // All validations passed — execute writes.  A write failure here\n  // is a filesystem problem rather than a provenance problem, but\n  // any failure still aborts the archive.\n\n  let writeFailed = false;\n  for (const p of dedupedPlans) {\n    if (p.kind === \"skip\") {\n      // Dedup-generated skip entries and other pre-write skips.\n      if (p.restore) result.restores.push(p.restore);\n      continue;\n    }\n    if (p.kind === \"recovered_existing\") {\n      result.restores.push({\n        entry: p.entry,\n        sourcePath: p.sourcePath,\n        outcome: \"skipped_file_exists\",\n        detail: \"source file already exists; no restore needed\",\n      });\n      continue;\n    }\n    if (p.kind === \"write\") {\n      if (writeFailed) {\n        // All-or-nothing: once a write fails, skip all remaining writes\n        // so the target is not archived with partial source coverage.\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: \"skipped_blocked_by_other_failures\",\n          detail: \"a prior source write failed; skipping remaining writes to honor all-or-nothing contract\",\n        });\n        continue;\n      }\n      try {\n        await mkdir(path.dirname(p.sourcePath), { recursive: true });\n        // Use exclusive create (wx / O_EXCL) so that if another process\n        // recreates the source file between planning and execution, this\n        // write fails with EEXIST instead of silently overwriting the new\n        // file (PR #637 round-11 review, codex P1).\n        await writeFile(p.sourcePath, p.content, { encoding: \"utf-8\", flag: \"wx\" });\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: \"restored\",\n        });\n      } catch (err) {\n        writeFailed = true;\n        result.restores.push({\n          entry: p.entry,\n          sourcePath: p.sourcePath,\n          outcome: \"skipped_write_failed\",\n          detail: `write failed: ${err instanceof Error ? err.message : String(err)}`,\n        });\n      }\n    }\n  }\n\n  if (writeFailed) {\n    result.error =\n      \"one or more source writes failed mid-restore; target not archived to preserve data\";\n    return result;\n  }\n\n  // Archive the target memory.  archiveMemory returns null on\n  // failure — surface that as a fatal error (PR #637 round-5 review,\n  // codex P2) so automation doesn't mistake a half-undo for a clean\n  // run.  The already-completed restores still roll forward; the\n  // result.restores list records what was written.\n  const archivedAt = await storage.archiveMemory(target, {\n    actor: \"consolidate-undo\",\n    reasonCode: \"consolidation-undo\",\n  });\n  result.targetArchived = archivedAt !== null;\n  if (!result.targetArchived) {\n    result.error =\n      \"sources restored successfully but archiving the consolidated target failed; inspect storage for manual cleanup\";\n  }\n  return result;\n}\n\n/**\n * Render a consolidation-undo result as a human-readable multi-line\n * string for the CLI.  Extracted so tests can snapshot the formatting\n * without parsing stdout.\n */\nexport function formatConsolidationUndoResult(result: ConsolidationUndoResult): string {\n  const lines: string[] = [];\n  lines.push(`consolidate undo ${result.dryRun ? \"(dry run) \" : \"\"}→ ${result.targetPath}`);\n  // Emit per-restore details BEFORE the error (PR #637 review, cursor\n  // Medium): the \"no sources could be recovered\" error is set after\n  // the restore loop ran, so operators need the per-source skip\n  // reasons to diagnose which snapshots were missing / outside\n  // memoryDir / malformed.  Early-bail errors (unloadable target,\n  // target outside memoryDir, no derived_from) run before the loop,\n  // so `result.restores` is empty in those cases and this block is a\n  // no-op.\n  for (const r of result.restores) {\n    lines.push(`  - ${r.entry} → ${r.outcome}${r.detail ? ` (${r.detail})` : \"\"}`);\n  }\n  if (result.error) {\n    lines.push(`  ERROR: ${result.error}`);\n    return lines.join(\"\\n\");\n  }\n  lines.push(\n    result.dryRun\n      ? \"  (dry run — no files were modified, target not archived)\"\n      : `  target archived: ${result.targetArchived ? \"yes\" : \"no\"}`,\n  );\n  return lines.join(\"\\n\");\n}\n"],"mappings":"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","names":[]}

package/dist/{contradiction-scan-GR33PONM.js → contradiction-scan-E3GJTI4F.js}

@@ -32,7 +32,7 @@ IMPORTANT:
 - Two memories about the same entity/topic are NOT necessarily contradictory.
 - Temporal changes ("Joshua uses pnpm" vs "Joshua switched to npm") ARE contradictions.
 - Different aspects of the same entity ("Joshua uses pnpm" vs "Joshua works on Remnic") are "independent".`;
-var verdictCache = /* @__PURE__ */ new Map();
+var defaultVerdictCache = /* @__PURE__ */ new Map();
 var CACHE_MAX = 1e4;
 function pairKey(idA, idB) {
   const sorted = [idA, idB].sort();
@@ -49,7 +49,7 @@ function contentHash(a) {
 async function judgeContradictionPairs(pairs, config, localLlm, fallbackLlm, cache) {
   const startTime = Date.now();
   const results = /* @__PURE__ */ new Map();
-  const activeCache = cache ?? verdictCache;
+  const activeCache = cache ?? defaultVerdictCache;
   let cached = 0;
   let judged = 0;
   const toJudge = [];
@@ -207,8 +207,9 @@ var SCAN_CATEGORIES = /* @__PURE__ */ new Set([
 ]);
 async function runContradictionScan(deps) {
   const startTime = Date.now();
-  const { storage, config, memoryDir, embeddingLookup, localLlm, fallbackLlm, namespace } = deps;
+  const { storage, config, memoryDir, embeddingLookup, embeddingLookupFactory, localLlm, fallbackLlm, namespace } = deps;
   const scanConfig = config.contradictionScan;
+  const scopedEmbeddingLookup = embeddingLookupFactory ? embeddingLookupFactory(storage) : embeddingLookup;
   if (!scanConfig.enabled) {
     log.info("[contradiction-scan] disabled by config");
     return { scanned: 0, candidates: 0, judged: 0, queued: 0, cooledDown: 0, elapsedMs: 0 };
@@ -223,7 +224,7 @@ async function runContradictionScan(deps) {
   for (const p of existingPairs) {
     existingMap.set(p.pairId, p);
   }
-  const candidates = generatePairs(memories, existingMap, scanConfig, embeddingLookup);
+  const candidates = await generatePairs(memories, existingMap, scanConfig, scopedEmbeddingLookup);
   const cooledDown = candidates.skipped;
   log.info("[contradiction-scan] generated %d candidates (%d cooled down)", candidates.pairs.length, cooledDown);
   if (candidates.pairs.length === 0) {
@@ -245,7 +246,8 @@ async function runContradictionScan(deps) {
     categoryA: pair.categoryA,
     categoryB: pair.categoryB
   }));
-  const judgeResult = await judgeContradictionPairs(judgeInputs, config, localLlm, fallbackLlm);
+  const scanCache = /* @__PURE__ */ new Map();
+  const judgeResult = await judgeContradictionPairs(judgeInputs, config, localLlm, fallbackLlm, scanCache);
   log.info("[contradiction-scan] judge completed: %d judged, %d cached in %dms", judgeResult.judged, judgeResult.cached, judgeResult.elapsed);
   const queueEntries = [];
   for (const [key, result] of judgeResult.results) {
@@ -272,8 +274,9 @@ async function runContradictionScan(deps) {
     elapsedMs: elapsed
   };
 }
-function generatePairs(memories, existingPairs, scanConfig, embeddingLookup) {
+async function generatePairs(memories, existingPairs, scanConfig, embeddingLookup) {
   const pairs = [];
+  const embeddingPairs = [];
   let skipped = 0;
   const seen = /* @__PURE__ */ new Set();
   const byEntity = /* @__PURE__ */ new Map();
@@ -338,6 +341,39 @@ function generatePairs(memories, existingPairs, scanConfig, embeddingLookup) {
       });
     }
   }
+  if (embeddingLookup) {
+    const memoryById = new Map(memories.map((m) => [m.frontmatter.id, m]));
+    for (const mem of memories) {
+      const id = mem.frontmatter.id;
+      try {
+        const hits = await embeddingLookup(mem.content, 20);
+        for (const hit of hits) {
+          if (hit.score < scanConfig.similarityFloor) continue;
+          if (hit.id === id) continue;
+          const peer = memoryById.get(hit.id);
+          if (!peer) continue;
+          const pairId = computePairId(id, hit.id);
+          if (seen.has(pairId)) continue;
+          seen.add(pairId);
+          const existing = existingPairs.get(pairId);
+          if (existing && isCoolingDown(existing, scanConfig.cooldownDays)) {
+            skipped++;
+            continue;
+          }
+          embeddingPairs.push({
+            idA: id,
+            idB: hit.id,
+            textA: mem.content,
+            textB: peer.content,
+            categoryA: mem.frontmatter.category,
+            categoryB: peer.frontmatter.category
+          });
+        }
+      } catch {
+      }
+    }
+  }
+  pairs.push(...embeddingPairs);
   return { pairs, skipped };
 }
 async function loadEligibleMemories(storage, namespace) {
@@ -373,4 +409,4 @@ export {
   ACTIVE_STATUSES,
   runContradictionScan
 };
-//# sourceMappingURL=contradiction-scan-GR33PONM.js.map
+//# sourceMappingURL=contradiction-scan-E3GJTI4F.js.map