saasaloy 0.4.0 → 0.5.1

package/dist/index.js

@@ -367,6 +367,34 @@ var MANIFEST_FILE = join3(".saasaloy", "manifest.json");
 function samePatchEntry(a, b) {
   return a.module === b.module && a.file === b.file && JSON.stringify(a.patch) === JSON.stringify(b.patch);
 }
+function recordManagedFile(manifest, record) {
+  manifest.managed[record.target] = {
+    hash: record.hash,
+    module: record.module,
+    ...record.adopted ? { adopted: true } : {},
+    ...record.from === void 0 ? {} : { from: record.from }
+  };
+}
+function untrackManagedFile(manifest, target) {
+  delete manifest.managed[target];
+}
+function recordPatch(manifest, entry) {
+  if (manifest.patches.some((existing) => samePatchEntry(existing, entry))) {
+    return;
+  }
+  manifest.patches.push(entry);
+}
+function untrackPatch(manifest, entry) {
+  manifest.patches = manifest.patches.filter(
+    (patch) => !samePatchEntry(patch, entry)
+  );
+}
+function recordLink(manifest, target, path) {
+  manifest.links[target] = path;
+}
+function untrackLink(manifest, target) {
+  delete manifest.links[target];
+}
 function emptyManifest() {
   return { links: {}, managed: {}, patches: [], removeWarnings: {} };
 }
@@ -707,40 +735,45 @@ function buildRouteLink(receiver, path, call) {
 
 // src/lib/patch/const-array.ts
 import { parseModule as parseModule2 } from "magicast";
-function insertIntoConstArray(source, patch) {
-  const mod = parseModule2(source);
-  const array = findConstArray(mod.$ast, patch.constName);
-  const wanted = patch.entry[patch.key];
-  if (!array || wanted === void 0 || hasEntry(array, patch.key, wanted)) {
-    return source;
+
+// src/lib/patch/ts-array.ts
+function findConstArray(program, constName) {
+  for (const statement of program.body) {
+    const declaration = statement.type === "ExportNamedDeclaration" ? statement.declaration : statement;
+    if (declaration?.type !== "VariableDeclaration" || declaration.kind !== "const") {
+      continue;
+    }
+    for (const declarator of declaration.declarations) {
+      if (declarator.id.type !== "Identifier" || declarator.id.name !== constName || !declarator.init) {
+        continue;
+      }
+      return asArray(declarator.init);
+    }
   }
-  return appendEntry(source, array, renderObject(patch.entry));
+  return void 0;
 }
-function constArrayInsertRefusal(source, patch) {
-  const mod = parseModule2(source);
-  const array = findConstArray(mod.$ast, patch.constName);
-  if (!array) {
-    return `const-array could not find a module-scope const array named ${patch.constName}`;
-  }
-  if (patch.entry[patch.key] === void 0) {
-    return `const-array entry has no identity property named ${patch.key}`;
+function asArray(node) {
+  const value = unwrapTypeExpression(node);
+  return value.type === "ArrayExpression" ? value : void 0;
+}
+function findElement(array, key, wanted) {
+  for (const element of array.elements) {
+    if (element?.type === "ObjectExpression" && entryValue(element, key) === wanted) {
+      return element;
+    }
   }
   return void 0;
 }
-function removeFromConstArray(source, patch) {
-  const mod = parseModule2(source);
-  const array = findConstArray(mod.$ast, patch.constName);
-  const wanted = patch.entry[patch.key];
-  if (!array || wanted === void 0) {
-    return source;
-  }
-  const index = array.elements.findIndex(
-    (element) => entryValue(element, patch.key) === wanted
-  );
-  if (index === -1) {
-    return source;
+function propertyValue(object, key) {
+  for (const property of object.properties) {
+    if (property.type !== "ObjectProperty" || property.computed) {
+      continue;
+    }
+    if (propertyName(property.key) === key) {
+      return property.value;
+    }
   }
-  return removeEntry(source, array, index);
+  return void 0;
 }
 function appendEntry(source, array, entry) {
   const close = array.end - 1;
@@ -797,6 +830,32 @@ function entryValue(element, key) {
   }
   return void 0;
 }
+function renderObject(entry) {
+  return `{ ${renderProperties(entry).join(", ")} }`;
+}
+function renderProperties(entry) {
+  return Object.entries(entry).map(
+    ([key, value]) => `${renderKey(key)}: ${renderValue(value)}`
+  );
+}
+function renderKey(key) {
+  return /^[A-Za-z_$][\w$]*$/.test(key) ? key : JSON.stringify(key);
+}
+function renderValue(value) {
+  if (value === null || typeof value === "string" || typeof value === "boolean") {
+    return JSON.stringify(value);
+  }
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return String(value);
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map(renderValue).join(", ")}]`;
+  }
+  if (typeof value === "object") {
+    return renderObject(value);
+  }
+  throw new TypeError("patch entries must contain JSON values");
+}
 function propertyName(node) {
   if (node.type === "Identifier") {
     return node.name;
@@ -809,22 +868,6 @@ function literalValue(node) {
   }
   return node.type === "NullLiteral" ? null : node.value;
 }
-function findConstArray(program, constName) {
-  for (const statement of program.body) {
-    const declaration = statement.type === "ExportNamedDeclaration" ? statement.declaration : statement;
-    if (declaration?.type !== "VariableDeclaration" || declaration.kind !== "const") {
-      continue;
-    }
-    for (const declarator of declaration.declarations) {
-      if (declarator.id.type !== "Identifier" || declarator.id.name !== constName || !declarator.init) {
-        continue;
-      }
-      const value = unwrapTypeExpression(declarator.init);
-      return value.type === "ArrayExpression" ? value : void 0;
-    }
-  }
-  return void 0;
-}
 function unwrapTypeExpression(node) {
   let value = node;
   while (value.type === "TSAsExpression" || value.type === "TSSatisfiesExpression" || value.type === "TypeCastExpression") {
@@ -832,26 +875,42 @@ function unwrapTypeExpression(node) {
   }
   return value;
 }
-function renderObject(entry) {
-  return `{ ${Object.entries(entry).map(([key, value]) => `${renderKey(key)}: ${renderValue(value)}`).join(", ")} }`;
-}
-function renderKey(key) {
-  return /^[A-Za-z_$][\w$]*$/.test(key) ? key : JSON.stringify(key);
+
+// src/lib/patch/const-array.ts
+function insertIntoConstArray(source, patch) {
+  const mod = parseModule2(source);
+  const array = findConstArray(mod.$ast, patch.constName);
+  const wanted = patch.entry[patch.key];
+  if (!array || wanted === void 0 || hasEntry(array, patch.key, wanted)) {
+    return source;
+  }
+  return appendEntry(source, array, renderObject(patch.entry));
 }
-function renderValue(value) {
-  if (value === null || typeof value === "string" || typeof value === "boolean") {
-    return JSON.stringify(value);
+function constArrayInsertRefusal(source, patch) {
+  const mod = parseModule2(source);
+  const array = findConstArray(mod.$ast, patch.constName);
+  if (!array) {
+    return `const-array could not find a module-scope const array named ${patch.constName}`;
   }
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return String(value);
+  if (patch.entry[patch.key] === void 0) {
+    return `const-array entry has no identity property named ${patch.key}`;
   }
-  if (Array.isArray(value)) {
-    return `[${value.map(renderValue).join(", ")}]`;
+  return void 0;
+}
+function removeFromConstArray(source, patch) {
+  const mod = parseModule2(source);
+  const array = findConstArray(mod.$ast, patch.constName);
+  const wanted = patch.entry[patch.key];
+  if (!array || wanted === void 0) {
+    return source;
   }
-  if (typeof value === "object") {
-    return renderObject(value);
+  const index = array.elements.findIndex(
+    (element) => entryValue(element, patch.key) === wanted
+  );
+  if (index === -1) {
+    return source;
   }
-  throw new TypeError("const-array entries must contain JSON values");
+  return removeEntry(source, array, index);
 }
 
 // src/lib/patch/diff.ts
@@ -1211,6 +1270,233 @@ function inferFormatting(source) {
   };
 }
 
+// src/lib/patch/nav-entry.ts
+import { parseModule as parseModule5 } from "magicast";
+
+// src/lib/patch/named-import.ts
+import { parseModule as parseModule4 } from "magicast";
+var PRINT_WIDTH = 80;
+function ensureNamedImport(source, want) {
+  const program = parseModule4(source).$ast;
+  const declaration = findImport(program, want.from);
+  if (!declaration) {
+    return insertDeclaration(source, program, want);
+  }
+  const named = namedSpecifiers(declaration).map(
+    (specifier) => source.slice(specifier.start, specifier.end)
+  );
+  if (named.includes(want.name)) {
+    return source;
+  }
+  const at = named.findIndex((text4) => localOf(text4) > want.name);
+  const next = at === -1 ? [...named, want.name] : named.toSpliced(at, 0, want.name);
+  return replaceDeclaration(source, declaration, next, want.from);
+}
+function removeNamedImport(source, want) {
+  const program = parseModule4(source).$ast;
+  const declaration = findImport(program, want.from);
+  if (!declaration || isReferenced(program, want.name)) {
+    return source;
+  }
+  const specifiers = namedSpecifiers(declaration);
+  const texts = specifiers.map(
+    (specifier) => source.slice(specifier.start, specifier.end)
+  );
+  const at = texts.indexOf(want.name);
+  if (at === -1) {
+    return source;
+  }
+  if (declaration.specifiers.length === 1) {
+    const lineEnd = source.indexOf("\n", declaration.end);
+    return lineEnd === -1 ? source.slice(0, declaration.start) : `${source.slice(0, declaration.start)}${source.slice(lineEnd + 1)}`;
+  }
+  return replaceDeclaration(
+    source,
+    declaration,
+    texts.toSpliced(at, 1),
+    want.from
+  );
+}
+function importedElsewhere(source, want) {
+  const program = parseModule4(source).$ast;
+  for (const statement of program.body) {
+    if (statement.type !== "ImportDeclaration") {
+      continue;
+    }
+    const declaration = statement;
+    for (const specifier of declaration.specifiers) {
+      if (localName(specifier) !== want.name) {
+        continue;
+      }
+      const ours = specifier.type === "ImportSpecifier" && importedName(specifier) === want.name && sourceValue(declaration) === want.from;
+      if (!ours) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function replaceDeclaration(source, declaration, named, from) {
+  const leading = declaration.specifiers.filter((specifier) => specifier.type !== "ImportSpecifier").map((specifier) => source.slice(specifier.start, specifier.end));
+  const text4 = source.slice(declaration.start, declaration.end);
+  const tail = `from ${JSON.stringify(from)}${text4.trimEnd().endsWith(";") ? ";" : ""}`;
+  const keyword = declaration.importKind === "type" ? "import type" : "import";
+  const inline = [...leading, `{ ${named.join(", ")} }`].join(", ");
+  const oneLine = `${keyword} ${inline} ${tail}`;
+  const printed2 = oneLine.length <= PRINT_WIDTH ? oneLine : `${[keyword, ...leading.map((part) => `${part},`)].join(" ")} {
+${named.map((specifier) => `  ${specifier},
+`).join("")}} ${tail}`;
+  return `${source.slice(0, declaration.start)}${printed2}${source.slice(declaration.end)}`;
+}
+function insertDeclaration(source, program, want) {
+  const statement = `import { ${want.name} } from ${JSON.stringify(want.from)};`;
+  const last = program.body.findLast(
+    (node) => node.type === "ImportDeclaration"
+  );
+  if (!last) {
+    return `${statement}
+
+${source}`;
+  }
+  return `${source.slice(0, last.end)}
+${statement}${source.slice(last.end)}`;
+}
+function findImport(program, from) {
+  for (const statement of program.body) {
+    if (statement.type !== "ImportDeclaration") {
+      continue;
+    }
+    const declaration = statement;
+    if (declaration.importKind === "type") {
+      continue;
+    }
+    if (sourceValue(declaration) === from) {
+      return declaration;
+    }
+  }
+  return void 0;
+}
+function namedSpecifiers(declaration) {
+  return declaration.specifiers.filter(
+    (specifier) => specifier.type === "ImportSpecifier" && specifier.importKind !== "type"
+  );
+}
+function localOf(text4) {
+  const [, local] = text4.split(/\s+as\s+/);
+  return (local ?? text4).trim();
+}
+function sourceValue(declaration) {
+  const value = declaration.source.value;
+  return typeof value === "string" ? value : void 0;
+}
+function importedName(specifier) {
+  return identifierName(specifier.imported);
+}
+function localName(specifier) {
+  return identifierName(specifier.local);
+}
+function identifierName(node) {
+  if (node?.type === "Identifier") {
+    return node.name;
+  }
+  if (node?.type === "StringLiteral" || node?.type === "Literal") {
+    const value = node.value;
+    return typeof value === "string" ? value : void 0;
+  }
+  return void 0;
+}
+
+// src/lib/patch/nav-entry.ts
+var IDENTITY = "to";
+function insertNavEntry(source, patch) {
+  const items = findItems(source, patch);
+  const wanted = patch.entry[IDENTITY];
+  if (!items || wanted === void 0 || hasEntry(items, IDENTITY, wanted)) {
+    return source;
+  }
+  if (importedElsewhere(source, patch.icon)) {
+    return source;
+  }
+  const withEntry = appendEntry(source, items, renderItem(patch));
+  return ensureNamedImport(withEntry, patch.icon);
+}
+function navEntryInsertRefusal(source, patch) {
+  const program = parseModule5(source).$ast;
+  const areas = findConstArray(program, patch.constName);
+  if (!areas) {
+    return `nav-entry could not find a module-scope const array named ${patch.constName}`;
+  }
+  const area = findElement(areas, IDENTITY, patch.area);
+  if (!area) {
+    return `nav-entry could not find an area with ${IDENTITY} ${JSON.stringify(patch.area)} in ${patch.constName}`;
+  }
+  const groups = arrayProperty(area, "groups");
+  if (!groups) {
+    return `nav-entry found the ${JSON.stringify(patch.area)} area but it has no groups array`;
+  }
+  const group = findElement(groups, "label", patch.group);
+  if (!group) {
+    return `nav-entry could not find a group labelled ${JSON.stringify(patch.group)} in the ${JSON.stringify(patch.area)} area`;
+  }
+  if (!arrayProperty(group, "items")) {
+    return `nav-entry found the ${JSON.stringify(patch.group)} group but it has no items array`;
+  }
+  if (patch.entry[IDENTITY] === void 0) {
+    return `nav-entry entry has no identity property named ${IDENTITY}`;
+  }
+  if (importedElsewhere(source, patch.icon)) {
+    return `${JSON.stringify(patch.icon.name)} is already bound to something other than the named import from ${JSON.stringify(patch.icon.from)}, so the icon would render the wrong component`;
+  }
+  return void 0;
+}
+function removeNavEntry(source, patch) {
+  const items = findItems(source, patch);
+  const wanted = patch.entry[IDENTITY];
+  if (!items || wanted === void 0) {
+    return source;
+  }
+  const index = items.elements.findIndex(
+    (element) => entryValue(element, IDENTITY) === wanted
+  );
+  if (index === -1) {
+    return source;
+  }
+  const withoutEntry = removeEntry(source, items, index);
+  return removeNamedImport(withoutEntry, patch.icon);
+}
+function navEntryRemoveRefusal(source, patch) {
+  const items = findItems(source, patch);
+  if (!items) {
+    return `nav-entry could not find the ${JSON.stringify(patch.group)} group of the ${JSON.stringify(patch.area)} area in ${patch.constName}`;
+  }
+  return void 0;
+}
+function findItems(source, patch) {
+  const program = parseModule5(source).$ast;
+  const areas = findConstArray(program, patch.constName);
+  if (!areas) {
+    return void 0;
+  }
+  const area = findElement(areas, IDENTITY, patch.area);
+  const groups = area && arrayProperty(area, "groups");
+  if (!groups) {
+    return void 0;
+  }
+  const group = findElement(groups, "label", patch.group);
+  return group ? arrayProperty(group, "items") : void 0;
+}
+function arrayProperty(object, key) {
+  const value = propertyValue(object, key);
+  return value ? asArray(value) : void 0;
+}
+function renderItem(patch) {
+  const properties = [
+    ...renderProperties(patch.entry),
+    `${renderKey("icon")}: ${patch.icon.name}`
+  ];
+  return `{ ${properties.join(", ")} }`;
+}
+
 // src/lib/patch/pkg-json.ts
 import {
   applyEdits as applyEdits2,
@@ -1325,9 +1611,9 @@ function upsertPackageJsonScript(source, patch) {
 }
 
 // src/lib/patch/ts-module.ts
-import { builders as builders2, generateCode as generateCode3, parseModule as parseModule4 } from "magicast";
+import { builders as builders2, generateCode as generateCode3, parseModule as parseModule6 } from "magicast";
 function insertIntoPluginArray(source, patch) {
-  const mod = parseModule4(source);
+  const mod = parseModule6(source);
   const exported = mod.exports[patch.exportName];
   const callArg = exported?.$args?.[0];
   if (!callArg) {
@@ -1353,7 +1639,7 @@ function insertIntoPluginArray(source, patch) {
   return print2(source, mod);
 }
 function removeFromPluginArray(source, patch) {
-  const mod = parseModule4(source);
+  const mod = parseModule6(source);
   const exported = mod.exports[patch.exportName];
   const callArg = exported?.$args?.[0];
   if (!callArg) {
@@ -1381,7 +1667,7 @@ function removeFromPluginArray(source, patch) {
   return print2(source, mod);
 }
 function pluginArrayRemoveRefusal(source, patch) {
-  const mod = parseModule4(source);
+  const mod = parseModule6(source);
   const callArg = mod.exports[patch.exportName]?.$args?.[0];
   if (!callArg) {
     return void 0;
@@ -1433,6 +1719,7 @@ var PATCH_KIND_KEYS = {
   "chained-route": true,
   "const-array": true,
   "drizzle-column": true,
+  "nav-entry": true,
   "package-json-dependency": true,
   "package-json-script": true,
   "plugin-array": true,
@@ -1469,6 +1756,9 @@ function applyCodemod(source, patch) {
     case "const-array": {
       return insertIntoConstArray(source, patch);
     }
+    case "nav-entry": {
+      return insertNavEntry(source, patch);
+    }
     case "drizzle-column": {
       return insertDrizzleColumn(source, patch);
     }
@@ -1497,6 +1787,7 @@ var INVERSES = {
   "chained-route": removeChainedRoute,
   "const-array": removeFromConstArray,
   "drizzle-column": removeDrizzleColumn,
+  "nav-entry": removeNavEntry,
   "plugin-array": removeFromPluginArray,
   "wrangler-binding": removeWranglerBinding
 };
@@ -1521,11 +1812,13 @@ var REFUSALS = {
   "chained-route": chainedRouteInsertRefusal,
   "const-array": constArrayInsertRefusal,
   "drizzle-column": drizzleColumnInsertRefusal,
+  "nav-entry": navEntryInsertRefusal,
   "package-json-script": packageJsonScriptRefusal
 };
 var REVERSAL_REFUSALS = {
   "chained-route": chainedRouteRemoveRefusal,
   "drizzle-column": drizzleColumnRemoveRefusal,
+  "nav-entry": navEntryRemoveRefusal,
   "plugin-array": pluginArrayRemoveRefusal,
   "wrangler-binding": wranglerBindingRemoveRefusal
 };
@@ -1957,11 +2250,12 @@ async function executePlan(plan, root, config, manifest) {
     } else {
       refreshed.push(file);
     }
-    manifest.managed[file.target] = {
-      module: file.module,
+    recordManagedFile(manifest, {
+      from: file.from,
       hash: file.newHash,
-      from: file.from
-    };
+      module: file.module,
+      target: file.target
+    });
   }
   for (const p of plan.patches) {
     if (!await pathExists(p.fileAbs)) {
@@ -1974,14 +2268,11 @@ async function executePlan(plan, root, config, manifest) {
     if (changed) {
       await writeFile3(p.fileAbs, content, "utf-8");
       patched.push(p);
-      const entry = {
-        module: p.module,
+      recordPatch(manifest, {
         file: p.file,
+        module: p.module,
         patch: p.patch
-      };
-      if (!manifest.patches.some((existing) => samePatchEntry(existing, entry))) {
-        manifest.patches.push(entry);
-      }
+      });
     } else if (reason !== void 0) {
       patchRefusals.push({ patch: p, reason });
     }
@@ -1995,7 +2286,7 @@ async function executePlan(plan, root, config, manifest) {
       await assertNoSymlinkPath(root, link.pathAbs);
       await createDirLink(link.pathAbs, link.targetAbs);
     }
-    manifest.links[link.target] = link.path;
+    recordLink(manifest, link.target, link.path);
     links.push(link);
   }
   for (const [alias, prefix] of Object.entries(plan.aliases)) {
@@ -2633,6 +2924,24 @@ function upsertLock(lock, provenance, installed, graph) {
   }
 }
 
+// src/lib/ledger.ts
+async function persistLedger(input) {
+  const saves = [
+    [MANIFEST_FILE, () => saveManifest(input.root, input.manifest)],
+    [CONFIG_FILE, () => saveConfig(input.root, input.config)],
+    [LOCK_FILE, () => saveLock(input.root, input.lock)]
+  ];
+  const failures = [];
+  for (const [file, save] of saves) {
+    try {
+      await save();
+    } catch (error) {
+      failures.push({ error, file });
+    }
+  }
+  return failures;
+}
+
 // src/lib/pkg-json.ts
 import { readFile as readFile8, writeFile as writeFile6 } from "fs/promises";
 import { join as join6 } from "path";
@@ -3478,18 +3787,11 @@ async function persistState(input) {
     failures.push(error);
     log.warn(`Couldn't pin ${LOCK_FILE} \u2014 ${formatFailure(error)}.`);
   }
-  const saves = [
-    [MANIFEST_FILE, () => saveManifest(input.root, input.manifest)],
-    [CONFIG_FILE, () => saveConfig(input.root, input.config)],
-    [LOCK_FILE, () => saveLock(input.root, input.lock)]
-  ];
-  for (const [file, save] of saves) {
-    try {
-      await save();
-    } catch (error) {
-      failures.push(error);
-      log.warn(`Couldn't write ${file} \u2014 ${formatFailure(error)}.`);
-    }
+  for (const failure of await persistLedger(input)) {
+    failures.push(failure.error);
+    log.warn(
+      `Couldn't write ${failure.file} \u2014 ${formatFailure(failure.error)}.`
+    );
   }
   return failures;
 }
@@ -3881,7 +4183,7 @@ import { fileURLToPath as fileURLToPath3 } from "url";
 // package.json
 var package_default = {
   name: "saasaloy",
-  version: "0.4.0",
+  version: "0.5.1",
   description: "Composable SaaS accelerator kit.",
   keywords: [
     "saas",
@@ -4107,16 +4409,17 @@ function baseEntries(manifest) {
 function recordBaseFiles(manifest, files) {
   for (const [target, entry] of Object.entries(manifest.managed)) {
     if (entry.module === BASE_MODULE) {
-      delete manifest.managed[target];
+      untrackManagedFile(manifest, target);
     }
   }
   for (const file of files) {
-    manifest.managed[file.target] = {
-      module: BASE_MODULE,
+    recordManagedFile(manifest, {
+      adopted: file.adopted,
+      from: file.from,
       hash: file.hash,
-      ...file.adopted ? { adopted: true } : {},
-      from: file.from
-    };
+      module: BASE_MODULE,
+      target: file.target
+    });
   }
 }
 function isBaseTracked(lock, manifest) {
@@ -4250,7 +4553,7 @@ async function baseUpdateInput(args) {
 
 // src/lib/doctor.ts
 import { findNodeAtLocation as findNodeAtLocation4, getNodeValue as getNodeValue4, parseTree as parseTree4 } from "jsonc-parser";
-import { parseModule as parseModule5 } from "magicast";
+import { parseModule as parseModule7 } from "magicast";
 import { readFile as readFile13 } from "fs/promises";
 import { basename, dirname as dirname6, join as join11, posix as posix7, resolve as resolve3 } from "path";
 var SKILL_PREFIX = "saasaloy-";
@@ -4258,7 +4561,7 @@ var PINNED_DEP = /^(@[^/@]+\/)?[^/@]+@\d+\.\d+\.\d+(-[\w.-]+)?(\+[\w.-]+)?$/;
 function finding(module, where, message) {
   return { message, module, where };
 }
-function asArray(value) {
+function asArray2(value) {
   return Array.isArray(value) ? value : [];
 }
 function asRecord(value) {
@@ -4282,7 +4585,7 @@ async function collectAliases(registryDir, names) {
   const fromScaffolds = {};
   for (const name of names) {
     const item = asRecord(await readDescriptor(join11(registryDir, name)));
-    for (const scaffold of asArray(item.scaffolds)) {
+    for (const scaffold of asArray2(item.scaffolds)) {
       const aliases = asRecord(asRecord(scaffold).aliases);
       for (const [alias, prefix] of Object.entries(aliases)) {
         if (typeof prefix === "string") {
@@ -4346,7 +4649,7 @@ async function checkModule(input) {
   }
   const known = { ...aliases.base, ...aliases.fromScaffolds };
   const knownList = Object.keys(known).toSorted().join(", ") || "(none)";
-  for (const [index, entry] of asArray(item.files).entries()) {
+  for (const [index, entry] of asArray2(item.files).entries()) {
     await checkSourcePath(findings, module, dir, `/files/${index}/path`, entry);
     const target = asRecord(entry).target;
     const alias = typeof target === "string" ? target.split("/")[0] : void 0;
@@ -4360,8 +4663,8 @@ async function checkModule(input) {
       );
     }
   }
-  for (const [index, scaffold] of asArray(item.scaffolds).entries()) {
-    for (const [fileIndex, entry] of asArray(
+  for (const [index, scaffold] of asArray2(item.scaffolds).entries()) {
+    for (const [fileIndex, entry] of asArray2(
       asRecord(scaffold).files
     ).entries()) {
       await checkSourcePath(
@@ -4379,7 +4682,7 @@ async function checkModule(input) {
     ["requiresOneOf", item.requiresOneOf],
     ["conflictsWith", item.conflictsWith]
   ]) {
-    for (const [index, name] of asArray(names).entries()) {
+    for (const [index, name] of asArray2(names).entries()) {
       if (typeof name === "string" && !siblingSet.has(name)) {
         findings.push(
           finding(
@@ -4395,7 +4698,7 @@ async function checkModule(input) {
     ["dependencies", item.dependencies],
     ["devDependencies", item.devDependencies]
   ]) {
-    for (const [index, dep] of asArray(deps).entries()) {
+    for (const [index, dep] of asArray2(deps).entries()) {
       if (typeof dep === "string" && !PINNED_DEP.test(dep)) {
         findings.push(
           finding(
@@ -4438,7 +4741,7 @@ async function checkModule(input) {
       );
     }
   }
-  for (const [index, skill] of asArray(asRecord(item.agent).skills).entries()) {
+  for (const [index, skill] of asArray2(asRecord(item.agent).skills).entries()) {
     if (typeof skill !== "string") {
       continue;
     }
@@ -4561,7 +4864,7 @@ function rateLimitBindingNames(wrangler) {
 function registeredPolicies(args) {
   let mod;
   try {
-    mod = parseModule5(args.index);
+    mod = parseModule7(args.index);
   } catch {
     return [];
   }
@@ -4609,7 +4912,7 @@ function calleeName(element) {
 function policyNameIn(source, callee) {
   let program;
   try {
-    program = parseModule5(source).$ast;
+    program = parseModule7(source).$ast;
   } catch {
     return void 0;
   }
@@ -4624,8 +4927,8 @@ function policyNameIn(source, callee) {
     factory,
     (node) => node.type === "CallExpression" && asRecord(node.callee).name === "definePolicy"
   );
-  const argument = asArray(call?.arguments)[0];
-  const property = asArray(asRecord(argument).properties).find(
+  const argument = asArray2(call?.arguments)[0];
+  const property = asArray2(asRecord(argument).properties).find(
     (entry) => asRecord(asRecord(entry).key).name === "name"
   );
   const value = asRecord(asRecord(property).value).value;
@@ -4688,7 +4991,7 @@ async function readPolicyState(root, installed) {
 function relativeImportsIn(index) {
   let mod;
   try {
-    mod = parseModule5(index);
+    mod = parseModule7(index);
   } catch {
     return [];
   }
@@ -6552,7 +6855,7 @@ async function executeRemovePlan(plan, args) {
     } else {
       missingUntracked.push(file);
     }
-    delete manifest.managed[file.target];
+    untrackManagedFile(manifest, file.target);
   }
   const linksRemoved = [];
   const linkConflicts = [];
@@ -6568,7 +6871,7 @@ async function executeRemovePlan(plan, args) {
     } else if (link.action === "conflict") {
       linkConflicts.push(link);
     }
-    delete manifest.links[link.target];
+    untrackLink(manifest, link.target);
   }
   const patchesReversed = [];
   const patchesDropped = [];
@@ -6591,9 +6894,7 @@ async function executeRemovePlan(plan, args) {
       }
     }
     (reversed ? patchesReversed : patchesDropped).push(entry);
-    manifest.patches = manifest.patches.filter(
-      (p) => !samePatchEntry(p, entry)
-    );
+    untrackPatch(manifest, entry);
   }
   const prunedDirs = await pruneEmptyDirs(root, [
     ...deleted.map((f) => f.targetAbs),
@@ -7173,11 +7474,12 @@ async function executeUpdatePlan(plan, args) {
         await writeFile11(file.targetAbs, file.theirs, "utf-8");
         result.written.push(file);
       }
-      manifest.managed[file.target] = {
-        module: file.module,
+      recordManagedFile(manifest, {
+        from: file.from,
         hash: file.newHash ?? hashContent(file.theirs),
-        from: file.from
-      };
+        module: file.module,
+        target: file.target
+      });
     }
     for (const file of mod.removals) {
       if (file.action === "delete") {
@@ -7193,7 +7495,7 @@ async function executeUpdatePlan(plan, args) {
       } else {
         result.untracked.push(file);
       }
-      delete manifest.managed[file.target];
+      untrackManagedFile(manifest, file.target);
     }
     for (const p of mod.patches) {
       if (!await pathExists(p.fileAbs)) {
@@ -7208,14 +7510,11 @@ async function executeUpdatePlan(plan, args) {
       }
       await writeFile11(p.fileAbs, content, "utf-8");
       result.patched.push(p);
-      const entry = {
-        module: p.module,
+      recordPatch(manifest, {
         file: p.file,
+        module: p.module,
         patch: p.patch
-      };
-      if (!manifest.patches.some((existing) => samePatchEntry(existing, entry))) {
-        manifest.patches.push(entry);
-      }
+      });
     }
     for (const link of mod.links) {
       if (link.action === "conflict") {
@@ -7225,7 +7524,7 @@ async function executeUpdatePlan(plan, args) {
       if (link.action === "create") {
         await createDirLink(link.pathAbs, link.targetAbs);
       }
-      manifest.links[link.target] = link.path;
+      recordLink(manifest, link.target, link.path);
       result.links.push(link);
     }
     for (const bump of mod.depBumps) {
@@ -7737,6 +8036,7 @@ async function runRemove(argv) {
       }
     }
     let result;
+    let ledgerFailures = [];
     try {
       result = await executeRemovePlan(plan, {
         root,
@@ -7746,9 +8046,11 @@ async function runRemove(argv) {
         deleteDrifted
       });
     } finally {
-      await saveManifest(root, manifest);
-      await saveConfig(root, config);
-      await saveLock(root, lock);
+      ledgerFailures = await persistLedger({ config, lock, manifest, root });
+    }
+    const failedSave = ledgerFailures[0];
+    if (failedSave) {
+      throw failedSave.error;
     }
     for (const file of result.deleted) {
       log6.step(`${pc10.red("delete")}  ${file.target}`);
@@ -8705,7 +9007,11 @@ async function runUpdate(argv) {
     const skipped = comparisons.filter((c) => c.status !== "outdated");
     if (outdated.length === 0) {
       if (!preview && recordRefRewrites(lock, comparisons).length > 0) {
-        await saveLock(root, lock);
+        const failures2 = await persistLedger({ config, lock, manifest, root });
+        const failedSave2 = failures2[0];
+        if (failedSave2) {
+          throw failedSave2.error;
+        }
       }
       for (const comparison of skipped) {
         log7.info(
@@ -8932,17 +9238,13 @@ async function runUpdate(argv) {
       (value) => ({ ok: true, value }),
       (error) => ({ ok: false, error })
     );
-    const saves = await Promise.allSettled([
-      saveManifest(root, manifest),
-      saveConfig(root, config),
-      saveLock(root, lock)
-    ]);
+    const failures = await persistLedger({ config, lock, manifest, root });
     if (!outcome.ok) {
       throw outcome.error;
     }
-    const failedSave = saves.find((save) => save.status === "rejected");
+    const failedSave = failures[0];
     if (failedSave) {
-      throw failedSave.reason;
+      throw failedSave.error;
     }
     const result = outcome.value;
     reportResult(result);