craftar 0.2.0 → 0.2.1

package/dist/cli.js

@@ -15,7 +15,7 @@ import { UnifyPlanSchema } from "./schema/index.js";
 process.stdout.on("error", (e) => { if (e.code === "EPIPE")
     process.exit(0); });
 const program = new Command();
-program.name("craftar").description("Craft, sync and convert AI-coding workspace harnesses.").version("0.2.0");
+program.name("craftar").description("Craft, sync and convert AI-coding workspace harnesses.").version("0.2.1");
 /* ---------------------------------------------------------------- import */
 program
     .command("import")

package/dist/core/fingerprint.js

@@ -13,17 +13,55 @@ export function fingerprintOf(meta, files) {
     delete m.origin;
     delete m.name;
     delete m.as;
-    const parts = [JSON.stringify(m, Object.keys(m).sort())];
+    const parts = [JSON.stringify(sortedDeep(m))];
     for (const k of Object.keys(files).sort())
         parts.push(k, hashNormalized(files[k]));
     return hashNormalized(parts.join("\0"));
 }
+/**
+ * A copy of `v` with object keys sorted at every depth, so `JSON.stringify` of it is canonical.
+ * Not `JSON.stringify(v, sortedKeys)`: a replacer array filters keys at every depth, which hashed
+ * an MCP `server: { command, args, env }` as `{}` and made two different servers look identical.
+ * For metadata with no nested object the output is byte-identical to that form, so those
+ * fingerprints — and the unify plans that record them — do not move. (One exception: integer-like
+ * keys, which only a hand-added unknown field can introduce, now follow the engine's numeric-first
+ * key order instead of the replacer's lexicographic one. The result is still canonical.)
+ * A YAML alias can make the parsed metadata cyclic; that is refused rather than overflowing.
+ */
+function sortedDeep(v, ancestors = new Set()) {
+    if (v === null || typeof v !== "object")
+        return v;
+    if (ancestors.has(v))
+        throw new Error("ingredient metadata is cyclic (a YAML alias refers back to itself)");
+    if (Array.isArray(v)) {
+        ancestors.add(v);
+        const out = v.map((x) => sortedDeep(x, ancestors));
+        ancestors.delete(v);
+        return out;
+    }
+    const proto = Object.getPrototypeOf(v);
+    if (proto !== Object.prototype && proto !== null)
+        return v; // Date and friends keep their toJSON
+    ancestors.add(v);
+    // A null prototype, so a `__proto__` key is an ordinary key instead of setting the prototype.
+    const out = Object.create(null);
+    for (const k of Object.keys(v).sort())
+        out[k] = sortedDeep(v[k], ancestors);
+    ancestors.delete(v);
+    return out;
+}
 export async function fingerprintDir(dir) {
-    const meta = YAML.parse(await fs.readFile(path.join(dir, "ingredient.yaml"), "utf8"));
+    const metaFile = path.join(dir, "ingredient.yaml");
+    const meta = YAML.parse(await fs.readFile(metaFile, "utf8"));
     const files = {};
     for (const rel of await listFiles(dir))
         if (rel !== "ingredient.yaml")
             files[rel] = await fs.readFile(path.join(dir, rel));
-    return fingerprintOf(meta, files);
+    try {
+        return fingerprintOf(meta, files);
+    }
+    catch (e) {
+        throw new Error(`${metaFile}: ${e.message}`);
+    }
 }
 //# sourceMappingURL=fingerprint.js.map

package/dist/core/fingerprint.js.map

@@ -1 +1 @@
-{"version":3,"file":"fingerprint.js","sourceRoot":"","sources":["../../src/core/fingerprint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,IAAa,EAAE,KAAsC;IACjF,MAAM,CAAC,GAA4B,EAAE,GAAI,IAAgC,EAAE,CAAC;IAC5E,OAAO,CAAC,CAAC,MAAM,CAAC;IAChB,OAAO,CAAC,CAAC,IAAI,CAAC;IACd,OAAO,CAAC,CAAC,EAAE,CAAC;IACZ,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACtF,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,KAAK,MAAM,GAAG,IAAI,MAAM,SAAS,CAAC,GAAG,CAAC;QAAE,IAAI,GAAG,KAAK,iBAAiB;YAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3H,OAAO,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"fingerprint.js","sourceRoot":"","sources":["../../src/core/fingerprint.ts"],"names":[],"mappings":"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"}

package/dist/core/unify.js

@@ -89,9 +89,9 @@ function comparableMeta(meta) {
  * Ruling 28: the top-level `ingredient.yaml` fields on which base and variant differ, sorted.
  * `diffIngredients` leaves `ingredient.yaml` out, so without this a variant that differs only in
  * its metadata (an MCP `server`, an agent's `model` or `tools`) would resolve with zero decisions
- * and be deleted. Compared on the zod-validated `meta` with a real deep equality — never through
- * `fingerprintOf` or `JSON.stringify(x, keys)`, whose key-array replacer filters at every depth
- * and would see two different nested `server` objects as the same `{}`.
+ * and be deleted. Compared on the zod-validated `meta` with a real deep equality, field by field so
+ * the differing fields can be named — never through `JSON.stringify(x, keys)`, whose key-array
+ * replacer filters at every depth and sees two different nested `server` objects as the same `{}`.
  */
 export function metaDifferences(base, variant) {
     const a = comparableMeta(base.meta);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craftar",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Craft, sync and convert AI-coding workspace harnesses across clients and tools.",
   "license": "MIT",
   "type": "module",