@unbrained/pm-cli 2026.5.6 → 2026.5.11

package/dist/core/history/history.js

@@ -1,9 +1,13 @@
 import jsonPatch from "fast-json-patch";
-import { EMPTY_CANONICAL_DOCUMENT, FRONT_MATTER_KEY_ORDER } from "../shared/constants.js";
+import { FRONT_MATTER_KEY_ORDER } from "../shared/constants.js";
 import { runActiveServiceOverride } from "../extensions/index.js";
 import { appendLineAtomic } from "../fs/fs-utils.js";
 import { canonicalDocument } from "../item/item-format.js";
 import { orderObject, sha256Hex, stableStringify } from "../shared/serialization.js";
+const EMPTY_LEGACY_HASH_DOCUMENT = {
+    front_matter: {},
+    body: "",
+};
 function decodeJsonPointer(path) {
     if (!path || path === "/") {
         return [];
@@ -65,38 +69,55 @@ function normalizeHistoryPatchOps(beforeDocument, patch) {
     return normalized;
 }
 function canonicalHashDocument(document) {
-    const hasFrontMatter = document.front_matter && Object.keys(document.front_matter).length > 0;
-    if (!hasFrontMatter) {
+    const hasMetadata = document.metadata && Object.keys(document.metadata).length > 0;
+    if (!hasMetadata) {
         return {
             front_matter: {},
             body: document.body ?? "",
         };
     }
     const canonical = canonicalDocument(document);
-    const orderedFrontMatter = orderObject(canonical.front_matter, FRONT_MATTER_KEY_ORDER);
+    const orderedFrontMatter = orderObject(canonical.metadata, FRONT_MATTER_KEY_ORDER);
     return {
         front_matter: orderedFrontMatter,
         body: canonical.body,
     };
 }
+function canonicalPatchDocument(document) {
+    const hasMetadata = document.metadata && Object.keys(document.metadata).length > 0;
+    if (!hasMetadata) {
+        return {
+            metadata: {},
+            body: document.body ?? "",
+        };
+    }
+    const canonical = canonicalDocument(document);
+    const orderedMetadata = orderObject(canonical.metadata, FRONT_MATTER_KEY_ORDER);
+    return {
+        metadata: orderedMetadata,
+        body: canonical.body,
+    };
+}
 export function hashDocument(document) {
     return sha256Hex(stableStringify(canonicalHashDocument(document)));
 }
 export function hashEmptyDocument() {
-    return sha256Hex(stableStringify(EMPTY_CANONICAL_DOCUMENT));
+    return sha256Hex(stableStringify(EMPTY_LEGACY_HASH_DOCUMENT));
 }
 export function createHistoryEntry(params) {
-    const beforeCanonical = canonicalHashDocument(params.before);
-    const afterCanonical = canonicalHashDocument(params.after);
-    const rawPatch = jsonPatch.compare(beforeCanonical, afterCanonical);
-    const patch = normalizeHistoryPatchOps(beforeCanonical, rawPatch);
+    const beforeHashCanonical = canonicalHashDocument(params.before);
+    const afterHashCanonical = canonicalHashDocument(params.after);
+    const beforePatchCanonical = canonicalPatchDocument(params.before);
+    const afterPatchCanonical = canonicalPatchDocument(params.after);
+    const rawPatch = jsonPatch.compare(beforePatchCanonical, afterPatchCanonical);
+    const patch = normalizeHistoryPatchOps(beforePatchCanonical, rawPatch);
     return {
         ts: params.nowIso,
         author: params.author,
         op: params.op,
         patch,
-        before_hash: sha256Hex(stableStringify(beforeCanonical)),
-        after_hash: sha256Hex(stableStringify(afterCanonical)),
+        before_hash: sha256Hex(stableStringify(beforeHashCanonical)),
+        after_hash: sha256Hex(stableStringify(afterHashCanonical)),
         message: params.message === undefined ? undefined : params.message,
     };
 }

package/dist/core/history/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","sourceRoot":"/","sources":["core/history/history.ts"],"names":[],"mappings":"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","sourcesContent":["import jsonPatch from \"fast-json-patch\";\nimport { EMPTY_CANONICAL_DOCUMENT, FRONT_MATTER_KEY_ORDER } from \"../shared/constants.js\";\nimport { runActiveServiceOverride } from \"../extensions/index.js\";\nimport { appendLineAtomic } from \"../fs/fs-utils.js\";\nimport { canonicalDocument } from \"../item/item-format.js\";\nimport { orderObject, sha256Hex, stableStringify } from \"../shared/serialization.js\";\nimport type { HistoryEntry, HistoryPatchOp, ItemDocument } from \"../../types/index.js\";\n\nfunction decodeJsonPointer(path: string): string[] {\n  if (!path || path === \"/\") {\n    return [];\n  }\n  if (!path.startsWith(\"/\")) {\n    return [];\n  }\n  return path\n    .slice(1)\n    .split(\"/\")\n    .map((segment) => segment.replaceAll(\"~1\", \"/\").replaceAll(\"~0\", \"~\"));\n}\n\nfunction isDefinedPointerPath(document: unknown, path: string): boolean {\n  const segments = decodeJsonPointer(path);\n  if (segments.length === 0) {\n    return true;\n  }\n  let cursor: unknown = document;\n  for (const segment of segments) {\n    if (Array.isArray(cursor)) {\n      if (segment === \"-\" || !/^(0|[1-9]\\d*)$/.test(segment)) {\n        return false;\n      }\n      const index = Number(segment);\n      if (!Number.isInteger(index) || index < 0 || index >= cursor.length) {\n        return false;\n      }\n      const next = cursor[index];\n      if (next === undefined) {\n        return false;\n      }\n      cursor = next;\n      continue;\n    }\n    if (typeof cursor !== \"object\" || cursor === null) {\n      return false;\n    }\n    if (!Object.prototype.hasOwnProperty.call(cursor, segment)) {\n      return false;\n    }\n    const next = (cursor as Record<string, unknown>)[segment];\n    if (next === undefined) {\n      return false;\n    }\n    cursor = next;\n  }\n  return true;\n}\n\nfunction normalizeHistoryPatchOps(\n  beforeDocument: { front_matter: Record<string, unknown>; body: string },\n  patch: HistoryPatchOp[],\n): HistoryPatchOp[] {\n  const normalized: HistoryPatchOp[] = [];\n  let replayCursor: unknown = structuredClone(beforeDocument);\n  for (const operation of patch) {\n    const normalizedOperation =\n      operation.op === \"replace\" && !isDefinedPointerPath(replayCursor, operation.path)\n        ? ({ ...operation, op: \"add\" } as HistoryPatchOp)\n        : operation;\n    normalized.push(normalizedOperation);\n    replayCursor = jsonPatch.applyPatch(\n      replayCursor,\n      [normalizedOperation as jsonPatch.Operation],\n      true,\n      true,\n    ).newDocument as unknown;\n  }\n  return normalized;\n}\n\nfunction canonicalHashDocument(document: ItemDocument): { front_matter: Record<string, unknown>; body: string } {\n  const hasFrontMatter = document.front_matter && Object.keys(document.front_matter).length > 0;\n  if (!hasFrontMatter) {\n    return {\n      front_matter: {},\n      body: document.body ?? \"\",\n    };\n  }\n  const canonical = canonicalDocument(document);\n  const orderedFrontMatter = orderObject(\n    canonical.front_matter as unknown as Record<string, unknown>,\n    FRONT_MATTER_KEY_ORDER,\n  );\n  return {\n    front_matter: orderedFrontMatter,\n    body: canonical.body,\n  };\n}\n\nexport function hashDocument(document: ItemDocument): string {\n  return sha256Hex(stableStringify(canonicalHashDocument(document)));\n}\n\nexport function hashEmptyDocument(): string {\n  return sha256Hex(stableStringify(EMPTY_CANONICAL_DOCUMENT));\n}\n\nexport function createHistoryEntry(params: {\n  nowIso: string;\n  author: string;\n  op: string;\n  before: ItemDocument;\n  after: ItemDocument;\n  message?: string;\n}): HistoryEntry {\n  const beforeCanonical = canonicalHashDocument(params.before);\n  const afterCanonical = canonicalHashDocument(params.after);\n  const rawPatch = jsonPatch.compare(beforeCanonical, afterCanonical) as HistoryPatchOp[];\n  const patch = normalizeHistoryPatchOps(beforeCanonical, rawPatch);\n\n  return {\n    ts: params.nowIso,\n    author: params.author,\n    op: params.op,\n    patch,\n    before_hash: sha256Hex(stableStringify(beforeCanonical)),\n    after_hash: sha256Hex(stableStringify(afterCanonical)),\n    message: params.message === undefined ? undefined : params.message,\n  };\n}\n\nexport async function appendHistoryEntry(historyPath: string, entry: HistoryEntry): Promise<void> {\n  const override = await runActiveServiceOverride(\"history_append\", {\n    history_path: historyPath,\n    entry,\n  });\n  if (override.handled) {\n    if (override.result === false) {\n      return;\n    }\n    if (typeof override.result === \"string\") {\n      await appendLineAtomic(historyPath, override.result);\n      return;\n    }\n    if (typeof override.result === \"object\" && override.result !== null) {\n      const record = override.result as {\n        history_path?: unknown;\n        entry?: unknown;\n        line?: unknown;\n        skip?: unknown;\n      };\n      if (record.skip === true) {\n        return;\n      }\n      const nextHistoryPath = typeof record.history_path === \"string\" ? record.history_path : historyPath;\n      if (typeof record.line === \"string\") {\n        await appendLineAtomic(nextHistoryPath, record.line);\n        return;\n      }\n      const nextEntry = (record.entry ?? entry) as HistoryEntry;\n      await appendLineAtomic(nextHistoryPath, JSON.stringify(nextEntry));\n      return;\n    }\n  }\n  await appendLineAtomic(historyPath, JSON.stringify(entry));\n}\n"]}
+{"version":3,"file":"history.js","sourceRoot":"/","sources":["core/history/history.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAGrF,MAAM,0BAA0B,GAAG;IACjC,YAAY,EAAE,EAAE;IAChB,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,SAAS,iBAAiB,CAAC,IAAY;IACrC,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,IAAI;SACR,KAAK,CAAC,CAAC,CAAC;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAiB,EAAE,IAAY;IAC3D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,MAAM,GAAY,QAAQ,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,OAAO,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACpE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,GAAG,IAAI,CAAC;YACd,SAAS;QACX,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,IAAI,GAAI,MAAkC,CAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,wBAAwB,CAC/B,cAAmE,EACnE,KAAuB;IAEvB,MAAM,UAAU,GAAqB,EAAE,CAAC;IACxC,IAAI,YAAY,GAAY,eAAe,CAAC,cAAc,CAAC,CAAC;IAC5D,KAAK,MAAM,SAAS,IAAI,KAAK,EAAE,CAAC;QAC9B,MAAM,mBAAmB,GACvB,SAAS,CAAC,EAAE,KAAK,SAAS,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC;YAC/E,CAAC,CAAE,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,KAAK,EAAqB;YACjD,CAAC,CAAC,SAAS,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACrC,YAAY,GAAG,SAAS,CAAC,UAAU,CACjC,YAAY,EACZ,CAAC,mBAA0C,CAAC,EAC5C,IAAI,EACJ,IAAI,CACL,CAAC,WAAsB,CAAC;IAC3B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAsB;IACnD,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACnF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;YACL,YAAY,EAAE,EAAE;YAChB,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,EAAE;SAC1B,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,kBAAkB,GAAG,WAAW,CAAC,SAAS,CAAC,QAA8C,EAAE,sBAAsB,CAAC,CAAC;IACzH,OAAO;QACL,YAAY,EAAE,kBAAkB;QAChC,IAAI,EAAE,SAAS,CAAC,IAAI;KACrB,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAsB;IACpD,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACnF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;YACL,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,EAAE;SAC1B,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,WAAW,CAAC,SAAS,CAAC,QAA8C,EAAE,sBAAsB,CAAC,CAAC;IACtH,OAAO;QACL,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,SAAS,CAAC,IAAI;KACrB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAsB;IACjD,OAAO,SAAS,CAAC,eAAe,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,SAAS,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAOlC;IACC,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjE,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,oBAAoB,EAAE,mBAAmB,CAAqB,CAAC;IAClG,MAAM,KAAK,GAAG,wBAAwB,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IAEvE,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,MAAM;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK;QACL,WAAW,EAAE,SAAS,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;QAC5D,UAAU,EAAE,SAAS,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC1D,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO;KACnE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,WAAmB,EAAE,KAAmB;IAC/E,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,gBAAgB,EAAE;QAChE,YAAY,EAAE,WAAW;QACzB,KAAK;KACN,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,IAAI,QAAQ,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,gBAAgB,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QACD,IAAI,OAAO,QAAQ,CAAC,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACpE,MAAM,MAAM,GAAG,QAAQ,CAAC,MAKvB,CAAC;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,MAAM,eAAe,GAAG,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;YACpG,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpC,MAAM,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrD,OAAO;YACT,CAAC;YACD,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAiB,CAAC;YAC1D,MAAM,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;IACH,CAAC;IACD,MAAM,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7D,CAAC","sourcesContent":["import jsonPatch from \"fast-json-patch\";\nimport { FRONT_MATTER_KEY_ORDER } from \"../shared/constants.js\";\nimport { runActiveServiceOverride } from \"../extensions/index.js\";\nimport { appendLineAtomic } from \"../fs/fs-utils.js\";\nimport { canonicalDocument } from \"../item/item-format.js\";\nimport { orderObject, sha256Hex, stableStringify } from \"../shared/serialization.js\";\nimport type { HistoryEntry, HistoryPatchOp, ItemDocument } from \"../../types/index.js\";\n\nconst EMPTY_LEGACY_HASH_DOCUMENT = {\n  front_matter: {},\n  body: \"\",\n};\n\nfunction decodeJsonPointer(path: string): string[] {\n  if (!path || path === \"/\") {\n    return [];\n  }\n  if (!path.startsWith(\"/\")) {\n    return [];\n  }\n  return path\n    .slice(1)\n    .split(\"/\")\n    .map((segment) => segment.replaceAll(\"~1\", \"/\").replaceAll(\"~0\", \"~\"));\n}\n\nfunction isDefinedPointerPath(document: unknown, path: string): boolean {\n  const segments = decodeJsonPointer(path);\n  if (segments.length === 0) {\n    return true;\n  }\n  let cursor: unknown = document;\n  for (const segment of segments) {\n    if (Array.isArray(cursor)) {\n      if (segment === \"-\" || !/^(0|[1-9]\\d*)$/.test(segment)) {\n        return false;\n      }\n      const index = Number(segment);\n      if (!Number.isInteger(index) || index < 0 || index >= cursor.length) {\n        return false;\n      }\n      const next = cursor[index];\n      if (next === undefined) {\n        return false;\n      }\n      cursor = next;\n      continue;\n    }\n    if (typeof cursor !== \"object\" || cursor === null) {\n      return false;\n    }\n    if (!Object.prototype.hasOwnProperty.call(cursor, segment)) {\n      return false;\n    }\n    const next = (cursor as Record<string, unknown>)[segment];\n    if (next === undefined) {\n      return false;\n    }\n    cursor = next;\n  }\n  return true;\n}\n\nfunction normalizeHistoryPatchOps(\n  beforeDocument: { metadata: Record<string, unknown>; body: string },\n  patch: HistoryPatchOp[],\n): HistoryPatchOp[] {\n  const normalized: HistoryPatchOp[] = [];\n  let replayCursor: unknown = structuredClone(beforeDocument);\n  for (const operation of patch) {\n    const normalizedOperation =\n      operation.op === \"replace\" && !isDefinedPointerPath(replayCursor, operation.path)\n        ? ({ ...operation, op: \"add\" } as HistoryPatchOp)\n        : operation;\n    normalized.push(normalizedOperation);\n    replayCursor = jsonPatch.applyPatch(\n      replayCursor,\n      [normalizedOperation as jsonPatch.Operation],\n      true,\n      true,\n    ).newDocument as unknown;\n  }\n  return normalized;\n}\n\nfunction canonicalHashDocument(document: ItemDocument): { front_matter: Record<string, unknown>; body: string } {\n  const hasMetadata = document.metadata && Object.keys(document.metadata).length > 0;\n  if (!hasMetadata) {\n    return {\n      front_matter: {},\n      body: document.body ?? \"\",\n    };\n  }\n  const canonical = canonicalDocument(document);\n  const orderedFrontMatter = orderObject(canonical.metadata as unknown as Record<string, unknown>, FRONT_MATTER_KEY_ORDER);\n  return {\n    front_matter: orderedFrontMatter,\n    body: canonical.body,\n  };\n}\n\nfunction canonicalPatchDocument(document: ItemDocument): { metadata: Record<string, unknown>; body: string } {\n  const hasMetadata = document.metadata && Object.keys(document.metadata).length > 0;\n  if (!hasMetadata) {\n    return {\n      metadata: {},\n      body: document.body ?? \"\",\n    };\n  }\n  const canonical = canonicalDocument(document);\n  const orderedMetadata = orderObject(canonical.metadata as unknown as Record<string, unknown>, FRONT_MATTER_KEY_ORDER);\n  return {\n    metadata: orderedMetadata,\n    body: canonical.body,\n  };\n}\n\nexport function hashDocument(document: ItemDocument): string {\n  return sha256Hex(stableStringify(canonicalHashDocument(document)));\n}\n\nexport function hashEmptyDocument(): string {\n  return sha256Hex(stableStringify(EMPTY_LEGACY_HASH_DOCUMENT));\n}\n\nexport function createHistoryEntry(params: {\n  nowIso: string;\n  author: string;\n  op: string;\n  before: ItemDocument;\n  after: ItemDocument;\n  message?: string;\n}): HistoryEntry {\n  const beforeHashCanonical = canonicalHashDocument(params.before);\n  const afterHashCanonical = canonicalHashDocument(params.after);\n  const beforePatchCanonical = canonicalPatchDocument(params.before);\n  const afterPatchCanonical = canonicalPatchDocument(params.after);\n  const rawPatch = jsonPatch.compare(beforePatchCanonical, afterPatchCanonical) as HistoryPatchOp[];\n  const patch = normalizeHistoryPatchOps(beforePatchCanonical, rawPatch);\n\n  return {\n    ts: params.nowIso,\n    author: params.author,\n    op: params.op,\n    patch,\n    before_hash: sha256Hex(stableStringify(beforeHashCanonical)),\n    after_hash: sha256Hex(stableStringify(afterHashCanonical)),\n    message: params.message === undefined ? undefined : params.message,\n  };\n}\n\nexport async function appendHistoryEntry(historyPath: string, entry: HistoryEntry): Promise<void> {\n  const override = await runActiveServiceOverride(\"history_append\", {\n    history_path: historyPath,\n    entry,\n  });\n  if (override.handled) {\n    if (override.result === false) {\n      return;\n    }\n    if (typeof override.result === \"string\") {\n      await appendLineAtomic(historyPath, override.result);\n      return;\n    }\n    if (typeof override.result === \"object\" && override.result !== null) {\n      const record = override.result as {\n        history_path?: unknown;\n        entry?: unknown;\n        line?: unknown;\n        skip?: unknown;\n      };\n      if (record.skip === true) {\n        return;\n      }\n      const nextHistoryPath = typeof record.history_path === \"string\" ? record.history_path : historyPath;\n      if (typeof record.line === \"string\") {\n        await appendLineAtomic(nextHistoryPath, record.line);\n        return;\n      }\n      const nextEntry = (record.entry ?? entry) as HistoryEntry;\n      await appendLineAtomic(nextHistoryPath, JSON.stringify(nextEntry));\n      return;\n    }\n  }\n  await appendLineAtomic(historyPath, JSON.stringify(entry));\n}\n"]}

package/dist/core/item/item-format.d.ts

@@ -1,11 +1,11 @@
-import type { ItemDocument, ItemFrontMatter, RuntimeSchemaSettings } from "../../types/index.js";
+import type { ItemDocument, ItemMetadata, RuntimeSchemaSettings } from "../../types/index.js";
 import type { ItemFormat } from "../../types/index.js";
 export interface ItemDocumentFormatOptions {
     format?: ItemFormat;
     schema?: RuntimeSchemaSettings;
     onWarning?: (warning: string) => void;
 }
-export declare function normalizeFrontMatter(frontMatter: ItemFrontMatter, options?: Pick<ItemDocumentFormatOptions, "schema" | "onWarning">): ItemFrontMatter;
+export declare function normalizeFrontMatter(frontMatter: ItemMetadata, options?: Pick<ItemDocumentFormatOptions, "schema" | "onWarning">): ItemMetadata;
 export declare function splitFrontMatter(content: string): {
     frontMatter: string;
     body: string;

package/dist/core/item/item-format.js

@@ -219,25 +219,25 @@ function assertValidFrontMatter(frontMatter, runtimeContext) {
     }
     if (runtimeContext?.fieldRegistry) {
         for (const definition of runtimeContext.fieldRegistry.definitions) {
-            const fieldValue = record[definition.front_matter_key];
+            const fieldValue = record[definition.metadata_key];
             if (fieldValue === undefined) {
                 if (runtimeFieldRequiredForType(definition, itemType)) {
-                    validationError(`missing required schema field: ${definition.front_matter_key}`);
+                    validationError(`missing required schema field: ${definition.metadata_key}`);
                 }
                 continue;
             }
             try {
-                record[definition.front_matter_key] = coerceRuntimeFieldValue(definition, fieldValue, `metadata field "${definition.front_matter_key}"`);
+                record[definition.metadata_key] = coerceRuntimeFieldValue(definition, fieldValue, `metadata field "${definition.metadata_key}"`);
             }
             catch (error) {
-                validationError(error instanceof Error ? error.message.replace(/^Invalid\s+/u, "") : `invalid ${definition.front_matter_key} value`);
+                validationError(error instanceof Error ? error.message.replace(/^Invalid\s+/u, "") : `invalid ${definition.metadata_key} value`);
             }
         }
     }
     if (runtimeContext && runtimeContext.unknownFieldPolicy !== "allow") {
         const knownKeys = new Set(STATIC_FRONT_MATTER_FIELD_SET);
         for (const definition of runtimeContext.fieldRegistry?.definitions ?? []) {
-            knownKeys.add(definition.front_matter_key);
+            knownKeys.add(definition.metadata_key);
         }
         const unknownKeys = Object.keys(record).filter((key) => !knownKeys.has(key)).sort((left, right) => left.localeCompare(right));
         if (unknownKeys.length > 0) {
@@ -693,17 +693,17 @@ export function normalizeFrontMatter(frontMatter, options = {}) {
     }
     if (runtimeContext?.fieldRegistry) {
         for (const definition of runtimeContext.fieldRegistry.definitions) {
-            const currentValue = normalized[definition.front_matter_key];
+            const currentValue = normalized[definition.metadata_key];
             if (currentValue === undefined) {
                 continue;
             }
-            normalized[definition.front_matter_key] = coerceRuntimeFieldValue(definition, currentValue, `metadata field "${definition.front_matter_key}"`);
+            normalized[definition.metadata_key] = coerceRuntimeFieldValue(definition, currentValue, `metadata field "${definition.metadata_key}"`);
         }
     }
     if (runtimeContext && runtimeContext.unknownFieldPolicy !== "allow") {
         const knownKeys = new Set(STATIC_FRONT_MATTER_FIELD_SET);
         for (const definition of runtimeContext.fieldRegistry?.definitions ?? []) {
-            knownKeys.add(definition.front_matter_key);
+            knownKeys.add(definition.metadata_key);
         }
         const unknownKeys = Object.keys(normalized)
             .filter((key) => !knownKeys.has(key))
@@ -814,7 +814,7 @@ function parseJsonMarkdownItemDocument(content, runtimeContext, options = {}) {
     }
     assertValidFrontMatter(parsed, runtimeContext);
     return {
-        front_matter: normalizeFrontMatter(parsed, options),
+        metadata: normalizeFrontMatter(parsed, options),
         body: normalizeBody(body),
     };
 }
@@ -832,7 +832,7 @@ function parseToonItemDocument(content, runtimeContext, options = {}) {
         assertValidFrontMatter(record.front_matter, runtimeContext);
         assertFrontMatterCondition(record.body === undefined || typeof record.body === "string", "TOON item document body must be a string");
         return {
-            front_matter: normalizeFrontMatter(record.front_matter, options),
+            metadata: normalizeFrontMatter(record.front_matter, options),
             body: normalizeBody(typeof record.body === "string" ? record.body : ""),
         };
     }
@@ -840,12 +840,12 @@ function parseToonItemDocument(content, runtimeContext, options = {}) {
     assertFrontMatterCondition(body === undefined || typeof body === "string", "TOON item document body must be a string");
     assertValidFrontMatter(frontMatterRecord, runtimeContext);
     return {
-        front_matter: normalizeFrontMatter(frontMatterRecord, options),
+        metadata: normalizeFrontMatter(frontMatterRecord, options),
         body: normalizeBody(typeof body === "string" ? body : ""),
     };
 }
 function serializeJsonMarkdownItemDocument(document, options = {}) {
-    const normalizedFrontMatter = normalizeFrontMatter(document.front_matter, options);
+    const normalizedFrontMatter = normalizeFrontMatter(document.metadata, options);
     const orderedFrontMatter = orderFrontMatter(normalizedFrontMatter);
     const serializedFrontMatter = JSON.stringify(orderedFrontMatter, null, 2);
     const normalizedBody = normalizeBody(document.body ?? "");
@@ -855,7 +855,7 @@ function serializeJsonMarkdownItemDocument(document, options = {}) {
     return `${serializedFrontMatter}\n\n${normalizedBody}\n`;
 }
 function serializeToonItemDocument(document, options = {}) {
-    const normalizedFrontMatter = normalizeFrontMatter(document.front_matter, options);
+    const normalizedFrontMatter = normalizeFrontMatter(document.metadata, options);
     const orderedFrontMatter = orderFrontMatter(normalizedFrontMatter);
     const normalizedBody = normalizeBody(document.body ?? "");
     return `${encodeToon({ ...orderedFrontMatter, body: normalizedBody })}\n`;
@@ -871,19 +871,19 @@ export function parseItemDocument(content, options = {}) {
             nextSteps: ["Resolve conflicts, save the file, then rerun the pm command."],
         });
     }
-    const format = options.format ?? "json_markdown";
+    const format = options.format ?? "toon";
     const runtimeContext = resolveRuntimeSchemaValidationContext(options);
     return format === "toon"
         ? parseToonItemDocument(content, runtimeContext, options)
         : parseJsonMarkdownItemDocument(content, runtimeContext, options);
 }
 export function serializeItemDocument(document, options = {}) {
-    const format = options.format ?? "json_markdown";
+    const format = options.format ?? "toon";
     return format === "toon" ? serializeToonItemDocument(document, options) : serializeJsonMarkdownItemDocument(document, options);
 }
 export function canonicalDocument(document, options = {}) {
     return {
-        front_matter: normalizeFrontMatter(document.front_matter, options),
+        metadata: normalizeFrontMatter(document.metadata, options),
         body: normalizeBody(document.body ?? ""),
     };
 }