@omgbase/core 0.6.0 → 0.6.1

package/dist/src/graph/history.d.ts

@@ -25,8 +25,16 @@ export interface DiffEntry {
     after?: string;
 }
 export declare function diffBlocks(store: Store, docId: string, fromRev: string, toRev: string): DiffEntry[];
-/** `diff_unified` (spec/surface §3): a unified diff of two revisions' rendered
- * texts — each revision's live raws joined by `\n` — via {@link unifiedDiff}. */
+/**
+ * `diff_unified` (spec/surface §3): a unified diff of the two revisions'
+ * **reconstructed file text** — exactly the bytes `docs_read_at` returns for
+ * each revision ({@link readDocumentAtRevision}: frontmatter, trivia and
+ * top-level order included) — via {@link unifiedDiff}, so hunk line numbers
+ * are real file lines. Until 1.4.x this diffed the Merkle-tree walk (every
+ * live raw at every depth joined by `\n`), which repeated each nested block
+ * after its container's raw and put an appended list item before the list's
+ * first item (§9). An unknown revision is {@link RevisionNotFound}.
+ */
 export declare function diffUnified(store: Store, docId: string, fromRev: string, toRev: string): string;
 /** The `diff_unified` tool's result (spec/surface §3): the resolved revision pair and the diff. */
 export interface DocDiffUnified {

package/dist/src/graph/history.js

@@ -1,4 +1,5 @@
 import { findDocByRef } from "../core/read/reader.js";
+import { readDocumentAtRevision } from "../core/read/document.js";
 import { isValidId } from "../core/ids.js";
 import { EngineError } from "../mcp/errors.js";
 /** history_node: a block's biography from block_changes + commits (06 §3). */
@@ -50,7 +51,9 @@ export function diffBlocks(store, docId, fromRev, toRev) {
 // core/hash.ts serializeTreeEntries): [blockId, rawHashHex, childTreeHashHex,
 // type, attrs, triviaHashHex]. Diff needs only the first three; whole-document
 // byte-faithful reconstruction (which also needs trivia + top-level order) lives
-// in core/read/document.ts readDocumentAtRevision.
+// in core/read/document.ts readDocumentAtRevision. This map is NOT a rendering
+// of the document: a container's raw already holds its children's text, so
+// joining the values would repeat every nested block (spec/surface §9).
 function blocksAtRevision(store, docId, revId) {
     const rev = store.db.prepare("SELECT root_tree FROM revisions WHERE rev_id = ? AND doc_id = ?").get(revId, docId);
     if (!rev)
@@ -73,10 +76,23 @@ function blocksAtRevision(store, docId, revId) {
     walk(rev.root_tree.toString("hex"));
     return out;
 }
-/** `diff_unified` (spec/surface §3): a unified diff of two revisions' rendered
- * texts — each revision's live raws joined by `\n` — via {@link unifiedDiff}. */
+/**
+ * `diff_unified` (spec/surface §3): a unified diff of the two revisions'
+ * **reconstructed file text** — exactly the bytes `docs_read_at` returns for
+ * each revision ({@link readDocumentAtRevision}: frontmatter, trivia and
+ * top-level order included) — via {@link unifiedDiff}, so hunk line numbers
+ * are real file lines. Until 1.4.x this diffed the Merkle-tree walk (every
+ * live raw at every depth joined by `\n`), which repeated each nested block
+ * after its container's raw and put an appended list item before the list's
+ * first item (§9). An unknown revision is {@link RevisionNotFound}.
+ */
 export function diffUnified(store, docId, fromRev, toRev) {
-    const rendered = (rev) => [...blocksAtRevision(store, docId, rev).values()].join("\n");
+    const rendered = (rev) => {
+        const at = readDocumentAtRevision(store, docId, rev);
+        if (!at)
+            throw new RevisionNotFound(docId, rev);
+        return at.content;
+    };
     return unifiedDiff(rendered(fromRev), rendered(toRev));
 }
 /**

package/dist/src/mcp/server.js

@@ -940,7 +940,7 @@ export function buildServer(ctx) {
         }
     });
     server.registerTool("diff_unified", {
-        description: "Unified diff between two revisions of a document (the `omg diff` rendering): returns `{ doc, path, from, to, diff }` where `diff` is a unified diff of the two rendered texts (Myers shortest edit script; `@@ -a,b +c,d @@` hunks with 3 lines of context; lines prefixed `-`, `+` or a space; no file header; identical texts → \"\"). `from_rev`/`to_rev` default to the previous and current revisions ('what did the last commit change here'). Contrast `diff`, which returns block-grain added/removed/changed entries.",
+        description: "Unified diff between two revisions of a document (the `omg diff` rendering): returns `{ doc, path, from, to, diff }` where `diff` is a unified diff of the two revisions' file texts — for each revision exactly the bytes docs_read_at returns, so hunk line numbers are real file lines (Myers shortest edit script; `@@ -a,b +c,d @@` hunks with 3 lines of context; lines prefixed `-`, `+` or a space; no file header; identical texts → \"\"). `from_rev`/`to_rev` default to the previous and current revisions ('what did the last commit change here'). Contrast `diff`, which returns block-grain added/removed/changed entries.",
         inputSchema: { doc: z.string(), from_rev: z.string().optional(), to_rev: z.string().optional(), ...REPO_ARG },
     }, async (args) => {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omgbase/core",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Open Markdown Graph Base — embedded engine",
   "license": "MIT",
   "repository": {