mrplex 0.0.1

package/dist/sync/intrinsics.js

@@ -0,0 +1,76 @@
+/**
+ * Reading and writing the self-describing frontmatter that makes sync work
+ * (sync/history plan §2.4, §4.2). A materialized file embeds `$version` and
+ * `$content_hash`; a user may also add the `$sync: ignore` client directive.
+ * Per-file sync state lives *in the file* — this module is the single place
+ * that parses it out and renders it back.
+ */
+import { contentHashOfFile } from "../markdown/content-hash.js";
+import { appendSystemProperty, extractSystemProperties, join, split, } from "../markdown/frontmatter.js";
+/** The `$sync` directive value we honor (§4.2). Only `ignore` is defined. */
+export const SYNC_IGNORE = "ignore";
+/**
+ * Parse a file's embedded intrinsics and compute its canonical content hash.
+ * The computed hash excludes all `$*` lines, so adding/removing intrinsics or
+ * the `$sync` directive never changes it (§4.2).
+ */
+export function readFileIntrinsics(text) {
+    const lf = text.replace(/\r\n/g, "\n");
+    const { frontmatter_raw } = split(lf);
+    const { props } = extractSystemProperties(frontmatter_raw);
+    return {
+        version: props.version,
+        content_hash: props.content_hash,
+        sync: props.sync,
+        computed_hash: contentHashOfFile(lf),
+    };
+}
+/** True when the file opts out of sync via `$sync: ignore` (§4.2). */
+export function isIgnored(intr) {
+    return intr.sync === SYNC_IGNORE;
+}
+/**
+ * A file is "dirty" when its user bytes differ from the version its embedded
+ * `$version` names — i.e. the computed hash ≠ the embedded `$content_hash`
+ * (§4.4 hash gate). A file with no embedded hash is treated as dirty (we
+ * cannot prove it clean).
+ */
+export function isDirty(intr) {
+    return intr.content_hash === undefined || intr.computed_hash !== intr.content_hash;
+}
+/**
+ * Render a version as a self-describing file: strip any stale `$*` lines from
+ * the stored frontmatter, then append `$version` and `$content_hash` in fixed
+ * order (§2.4). Robust whether or not the transport already injected them.
+ */
+export function renderMaterialized(v) {
+    const { raw } = extractSystemProperties(v.frontmatter_raw);
+    let fm = appendSystemProperty(raw, "version", v.version_id);
+    fm = appendSystemProperty(fm, "content_hash", v.content_hash);
+    return join({ frontmatter_raw: fm, body: v.body });
+}
+/**
+ * Render a version as a conflict sibling (§4.8): the normal materialization
+ * plus `$sync: ignore`, which is the *only* thing keeping it out of sync.
+ */
+export function renderIgnoredSibling(v) {
+    const { raw } = extractSystemProperties(v.frontmatter_raw);
+    let fm = appendSystemProperty(raw, "version", v.version_id);
+    fm = appendSystemProperty(fm, "content_hash", v.content_hash);
+    fm = appendSystemProperty(fm, "sync", SYNC_IGNORE);
+    return join({ frontmatter_raw: fm, body: v.body });
+}
+/**
+ * Stamp `$version` / `$content_hash` onto an existing file without replacing
+ * its user bytes. Used when the editor saved again between our kernel write
+ * and the ack rewrite — we must not revert their typing.
+ */
+export function stampProvenance(text, versionId, contentHash) {
+    const lf = text.replace(/\r\n/g, "\n");
+    const { frontmatter_raw, body } = split(lf);
+    const { raw } = extractSystemProperties(frontmatter_raw);
+    let fm = appendSystemProperty(raw, "version", versionId);
+    fm = appendSystemProperty(fm, "content_hash", contentHash);
+    return join({ frontmatter_raw: fm, body });
+}
+//# sourceMappingURL=intrinsics.js.map

package/dist/sync/intrinsics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"intrinsics.js","sourceRoot":"","sources":["../../src/sync/intrinsics.ts"],"names":[],"mappings":"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"}

package/dist/sync/paths.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Path mapping and scope filtering for sync (sync/history plan §4.1). A single
+ * include/exclude predicate filters BOTH directions — the local walk, the index
+ * items, and the feed refs all pass through it — so the two sides can never
+ * disagree about what is in scope. Local `<root>`-relative paths map to doc
+ * paths by relative POSIX path.
+ */
+/** The cursor/state directory inside a synced vault (§4.2). */
+export declare const SYNC_DIR = ".mrplex";
+/** The cursor file path relative to the vault root. */
+export declare const CURSOR_FILE = ".mrplex/sync.json";
+export type ScopeFilter = {
+    /** True when a doc path (POSIX, repo-relative) is in sync scope. */
+    matches(docPath: string): boolean;
+};
+/**
+ * Build the include/exclude predicate. Defaults to `**\/*.md` include (§4.1).
+ * Exclusions always win. Any path with a dot-prefixed segment is excluded
+ * unconditionally — this covers the `.mrplex/` state dir AND app dotdirs like
+ * `.obsidian/` (§4.2). Crucially, the local walk (fs-store) prunes the same
+ * dotdirs, so both directions filter identically and can never disagree about
+ * what is in scope (§4.1: "the same include/exclude globs filter both
+ * directions").
+ */
+export declare function makeScopeFilter(opts?: {
+    include?: string[];
+    exclude?: string[];
+}): ScopeFilter;
+/** True when any POSIX path segment starts with a dot (`.mrplex/`, `.obsidian/`, …). */
+export declare function hasDotSegment(docPath: string): boolean;
+/**
+ * Map an absolute local file path to its repo-relative POSIX doc path, or null
+ * when the file is outside `<root>`. On POSIX this is just the relative path;
+ * on Windows backslashes fold to `/` so doc paths are portable.
+ */
+export declare function toDocPath(root: string, absPath: string): string | null;
+/** Map a repo-relative POSIX doc path back to an absolute local file path. */
+export declare function toLocalPath(root: string, docPath: string): string;

package/dist/sync/paths.js

@@ -0,0 +1,56 @@
+/**
+ * Path mapping and scope filtering for sync (sync/history plan §4.1). A single
+ * include/exclude predicate filters BOTH directions — the local walk, the index
+ * items, and the feed refs all pass through it — so the two sides can never
+ * disagree about what is in scope. Local `<root>`-relative paths map to doc
+ * paths by relative POSIX path.
+ */
+import { relative, resolve, sep } from "node:path";
+import { pathMatchesGlobs } from "../kernel/auth/glob.js";
+/** The cursor/state directory inside a synced vault (§4.2). */
+export const SYNC_DIR = ".mrplex";
+/** The cursor file path relative to the vault root. */
+export const CURSOR_FILE = `${SYNC_DIR}/sync.json`;
+/**
+ * Build the include/exclude predicate. Defaults to `**\/*.md` include (§4.1).
+ * Exclusions always win. Any path with a dot-prefixed segment is excluded
+ * unconditionally — this covers the `.mrplex/` state dir AND app dotdirs like
+ * `.obsidian/` (§4.2). Crucially, the local walk (fs-store) prunes the same
+ * dotdirs, so both directions filter identically and can never disagree about
+ * what is in scope (§4.1: "the same include/exclude globs filter both
+ * directions").
+ */
+export function makeScopeFilter(opts) {
+    const include = opts?.include && opts.include.length > 0 ? opts.include : ["**/*.md"];
+    const exclude = opts?.exclude ?? [];
+    return {
+        matches(docPath) {
+            if (hasDotSegment(docPath))
+                return false;
+            if (exclude.length > 0 && pathMatchesGlobs(exclude, docPath))
+                return false;
+            return pathMatchesGlobs(include, docPath);
+        },
+    };
+}
+/** True when any POSIX path segment starts with a dot (`.mrplex/`, `.obsidian/`, …). */
+export function hasDotSegment(docPath) {
+    return docPath.split("/").some((seg) => seg.startsWith("."));
+}
+/**
+ * Map an absolute local file path to its repo-relative POSIX doc path, or null
+ * when the file is outside `<root>`. On POSIX this is just the relative path;
+ * on Windows backslashes fold to `/` so doc paths are portable.
+ */
+export function toDocPath(root, absPath) {
+    const rel = relative(resolve(root), resolve(absPath));
+    if (rel === "" || rel.startsWith("..") || rel.startsWith(`..${sep}`))
+        return null;
+    return sep === "/" ? rel : rel.split(sep).join("/");
+}
+/** Map a repo-relative POSIX doc path back to an absolute local file path. */
+export function toLocalPath(root, docPath) {
+    const native = sep === "/" ? docPath : docPath.split("/").join(sep);
+    return resolve(root, native);
+}
+//# sourceMappingURL=paths.js.map

package/dist/sync/paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/sync/paths.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,+DAA+D;AAC/D,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC;AAClC,uDAAuD;AACvD,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,QAAQ,YAAY,CAAC;AAOnD;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,IAG/B;IACC,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACtF,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC;IACpC,OAAO;QACL,OAAO,CAAC,OAAe;YACrB,IAAI,aAAa,CAAC,OAAO,CAAC;gBAAE,OAAO,KAAK,CAAC;YACzC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC3E,OAAO,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,OAAe;IACrD,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,GAAG,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAClF,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,OAAe;IACvD,MAAM,MAAM,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpE,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC/B,CAAC"}

package/dist/sync/push.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Local → remote: the debounced per-path pass (sync/history plan §4.4, §4.6,
+ * §4.7). Given a settled path, decide: skip (ignored/clean), push (edit/create/
+ * move), witnessed-delete, or conflict-park. Event *types* are untrusted — the
+ * pass stats the path itself (§4.6): present → change; ENOENT → witnessed
+ * delete.
+ *
+ * The in-memory map (path → last-known { version_id, content_hash }) is the
+ * daemon's working knowledge, chiefly so a witnessed unlink still knows the
+ * prev_version_id of a file that no longer exists to be read (§4.2 tier 3).
+ *
+ * A rename is unlink(old) + add(new) of a file that still embeds `$version`.
+ * `pushBurst` is the §4.7 debounce burst: present paths (moves/edits) run
+ * before absent ones (deletes), and a delete is suppressed when another file
+ * in the burst still carries that version. `pushPath` itself still pushes a
+ * *clean* move when the map knows the version at a different path, and a
+ * late-arriving dest after a premature delete restores from `:deleted`
+ * rather than parking a no-op conflict.
+ */
+import type { KernelClient } from "../client/kernel-client.js";
+import type { FileStore } from "./reconcile.js";
+/** Last-known remote state per path (§4.2 tier 3). */
+export type RemoteMap = Map<string, {
+    version_id: string;
+    content_hash: string;
+}>;
+export type PushResult = "skip" | "clean" | "ignored" | "created" | "updated" | "deleted" | "conflict" | "no-op-untracked-unlink";
+export type PushDeps = {
+    client: KernelClient;
+    store: FileStore;
+    repo: string;
+    map: RemoteMap;
+    log?: (msg: string) => void;
+};
+/**
+ * Process a debounce burst of paths together (§4.7). Present files (moves,
+ * edits, creates) run first so a rename's dest put supersedes the source
+ * unlink; a witnessed delete is skipped when another file in the burst still
+ * embeds that version. Each path is isolated: one failure does not abort the
+ * rest.
+ */
+export declare function pushBurst(paths: string[], deps: PushDeps): Promise<PushResult[]>;
+/**
+ * Process one settled path. The store's `read` returning null is the stat
+ * verdict "absent" (a witnessed delete); a non-null read is "present" (a
+ * change), coalescing the atomic-rename save case into a plain update.
+ */
+export declare function pushPath(path: string, deps: PushDeps): Promise<PushResult>;

package/dist/sync/push.js

@@ -0,0 +1,328 @@
+/**
+ * Local → remote: the debounced per-path pass (sync/history plan §4.4, §4.6,
+ * §4.7). Given a settled path, decide: skip (ignored/clean), push (edit/create/
+ * move), witnessed-delete, or conflict-park. Event *types* are untrusted — the
+ * pass stats the path itself (§4.6): present → change; ENOENT → witnessed
+ * delete.
+ *
+ * The in-memory map (path → last-known { version_id, content_hash }) is the
+ * daemon's working knowledge, chiefly so a witnessed unlink still knows the
+ * prev_version_id of a file that no longer exists to be read (§4.2 tier 3).
+ *
+ * A rename is unlink(old) + add(new) of a file that still embeds `$version`.
+ * `pushBurst` is the §4.7 debounce burst: present paths (moves/edits) run
+ * before absent ones (deletes), and a delete is suppressed when another file
+ * in the burst still carries that version. `pushPath` itself still pushes a
+ * *clean* move when the map knows the version at a different path, and a
+ * late-arriving dest after a premature delete restores from `:deleted`
+ * rather than parking a no-op conflict.
+ */
+import { pathIsInSystemNamespace, withVersionSuffix } from "../kernel/deletion.js";
+import { KernelError } from "../kernel/errors.js";
+import { HARDCODED_DEFAULTS } from "../kernel/path-config.js";
+import { extractSystemProperties, split } from "../markdown/frontmatter.js";
+import { isDirty, isIgnored, readFileIntrinsics, renderIgnoredSibling, renderMaterialized, stampProvenance, } from "./intrinsics.js";
+/**
+ * Process a debounce burst of paths together (§4.7). Present files (moves,
+ * edits, creates) run first so a rename's dest put supersedes the source
+ * unlink; a witnessed delete is skipped when another file in the burst still
+ * embeds that version. Each path is isolated: one failure does not abort the
+ * rest.
+ */
+export async function pushBurst(paths, deps) {
+    const unique = [...new Set(paths)];
+    const present = [];
+    const absent = [];
+    const presentByVersion = new Map();
+    for (const path of unique) {
+        const text = await deps.store.read(path);
+        if (text === null) {
+            absent.push(path);
+            continue;
+        }
+        present.push(path);
+        const version = readFileIntrinsics(text).version;
+        if (version)
+            presentByVersion.set(version, path);
+    }
+    const suppressDelete = new Set();
+    for (const path of absent) {
+        const known = deps.map.get(path);
+        if (!known)
+            continue;
+        const dest = presentByVersion.get(known.version_id);
+        if (dest !== undefined && dest !== path)
+            suppressDelete.add(path);
+    }
+    const results = [];
+    const log = deps.log ?? (() => { });
+    for (const path of present) {
+        try {
+            results.push(await pushPath(path, deps));
+        }
+        catch (err) {
+            log(`push error\t${path}\t${err.message}`);
+        }
+    }
+    for (const path of absent) {
+        if (suppressDelete.has(path)) {
+            deps.map.delete(path);
+            results.push("no-op-untracked-unlink");
+            continue;
+        }
+        try {
+            results.push(await pushPath(path, deps));
+        }
+        catch (err) {
+            log(`push error\t${path}\t${err.message}`);
+        }
+    }
+    return results;
+}
+/**
+ * Process one settled path. The store's `read` returning null is the stat
+ * verdict "absent" (a witnessed delete); a non-null read is "present" (a
+ * change), coalescing the atomic-rename save case into a plain update.
+ */
+export async function pushPath(path, deps) {
+    const { client, store, repo, map } = deps;
+    const log = deps.log ?? (() => { });
+    const text = await store.read(path);
+    // --- Witnessed delete (§4.6): the file is gone. ---
+    if (text === null) {
+        const known = map.get(path);
+        if (!known)
+            return "no-op-untracked-unlink"; // never tracked (e.g. $sync:ignore)
+        try {
+            await client.docs.delete(repo, known.version_id);
+            map.delete(path);
+            log(`delete\t${path}`);
+            return "deleted";
+        }
+        catch (err) {
+            if (err instanceof KernelError && err.code === "stale_prev") {
+                // Remote advanced after our last knowledge → skip the delete; the feed
+                // will re-materialize the newer version (§4.6 "remote edit outlives a
+                // local delete"). Drop our stale map entry so the feed can repopulate.
+                map.delete(path);
+                return "skip";
+            }
+            throw err;
+        }
+    }
+    const intr = readFileIntrinsics(text);
+    if (isIgnored(intr)) {
+        map.delete(path); // invisible to diffing + deletion (§4.4 directive gate)
+        return "ignored";
+    }
+    // Hash gate (§4.4): computed == embedded → clean, no push. Absorbs editor
+    // noise, our own materializations, and our own post-push intrinsic rewrites.
+    // Exceptions that still fall through to put:
+    //   • `$version` is known at a *different* map path — a live rename (§4.7)
+    //   • `$version` is not in the map at all — a late rename dest after the
+    //     source was already dropped; currentAtPath equal to embedded is the
+    //     only cheap "already synced here" proof that avoids a no-op version
+    if (!isDirty(intr)) {
+        const source = intr.version ? findMapPathByVersion(map, intr.version) : undefined;
+        if (source === path) {
+            return "clean";
+        }
+        if (source === undefined) {
+            if (intr.version) {
+                const current = await currentAtPath(client, repo, path);
+                if (current && current.version_id === intr.version) {
+                    map.set(path, { version_id: current.version_id, content_hash: current.content_hash });
+                    return "clean";
+                }
+                // dest empty or different version → fall through to put / restore
+            }
+            else {
+                return "clean";
+            }
+        }
+    }
+    const user = stripToUserContent(text);
+    // Provenance present → optimistic put (§4.4). This is also how a move
+    // propagates (§4.7): the file at the new path still embeds its `$version`,
+    // and a put whose path differs from the prev version's path IS a move that
+    // preserves document identity — the kernel resolves it from prev_version_id.
+    if (intr.version) {
+        try {
+            return await commitPut(deps, path, intr.version, user, "update");
+        }
+        catch (err) {
+            if (err instanceof KernelError && err.code === "stale_prev") {
+                return recoverStalePut(deps, path, user, intr.computed_hash, err);
+            }
+            throw err;
+        }
+    }
+    // Dirty, no embedded provenance → resolve the current remote doc at this path
+    // first (§4.4): absent → create; present + hash-equal → adopt provenance in
+    // place; present + differ → occupied-path conflict.
+    const current = await currentAtPath(client, repo, path);
+    if (!current) {
+        return createAtPath(deps, path, user, intr.computed_hash);
+    }
+    return occupiedPath(deps, path, intr.computed_hash, current);
+}
+/**
+ * `stale_prev` on a put: dest occupied → rebase local bytes onto the remote
+ * current (Obsidian keeps typing after we already pushed a snapshot); dest
+ * empty and the document currently lives in the system namespace (a premature
+ * local delete of a rename source) → put from that current version to restore
+ * identity; dest empty with no recoverable current → create so the local file
+ * is not stranded.
+ */
+async function recoverStalePut(deps, path, user, computedHash, err) {
+    const { client, store, repo } = deps;
+    const log = deps.log ?? (() => { });
+    const destCurrent = await currentAtPath(client, repo, path);
+    if (destCurrent) {
+        if (computedHash === destCurrent.content_hash) {
+            return occupiedPath(deps, path, computedHash, destCurrent);
+        }
+        try {
+            // Same-path continuation: the editor is still on an older $version but
+            // has newer bytes. Put those bytes on top of current instead of parking
+            // a sibling that then gets fed back over the open note.
+            return await commitPut(deps, path, destCurrent.version_id, user, "update");
+        }
+        catch (rebaseErr) {
+            if (!(rebaseErr instanceof KernelError &&
+                (rebaseErr.code === "stale_prev" || rebaseErr.code === "path_taken"))) {
+                throw rebaseErr;
+            }
+            await store.write(withVersionSuffix(path, destCurrent.version_id), renderIgnoredSibling(destCurrent));
+            log(`conflict\t${path}`);
+            return "conflict";
+        }
+    }
+    const data = err.data;
+    const currentId = data.current_version_id ?? null;
+    let currentPath = data.current_path ?? null;
+    if (currentId && !currentPath) {
+        try {
+            currentPath = (await client.docs.get_version(repo, currentId)).path;
+        }
+        catch {
+            // Leave currentPath unset; restore is skipped and we may create.
+        }
+    }
+    if (currentId && currentPath && isDeletedPath(currentPath)) {
+        try {
+            return await commitPut(deps, path, currentId, user, "restore");
+        }
+        catch (restoreErr) {
+            if (!(restoreErr instanceof KernelError && restoreErr.code === "stale_prev"))
+                throw restoreErr;
+            // Raced; fall through to create so the file is not left unpushable.
+        }
+    }
+    if (currentId && currentPath && !isDeletedPath(currentPath)) {
+        // Still live at another path with a newer version — local rename vs
+        // remote edit. Park the remote current; keep local bytes.
+        const current = await client.docs.get_version(repo, currentId);
+        await store.write(withVersionSuffix(path, current.version_id), renderIgnoredSibling(current));
+        log(`conflict\t${path}`);
+        return "conflict";
+    }
+    // Dest is empty and we could not follow the document — create so a renamed
+    // (or late-arriving) file is never stranded.
+    return createAtPath(deps, path, user, computedHash);
+}
+async function createAtPath(deps, path, user, computedHash) {
+    const { client, store, repo, map } = deps;
+    const log = deps.log ?? (() => { });
+    try {
+        const v = await client.docs.create(repo, path, user);
+        await ackLocalWrite(store, path, v, user);
+        map.set(path, { version_id: v.version_id, content_hash: v.content_hash });
+        log(`create\t${path}`);
+        return "created";
+    }
+    catch (err) {
+        if (err instanceof KernelError && err.code === "create_conflict") {
+            const raced = await currentAtPath(client, repo, path);
+            if (raced)
+                return occupiedPath(deps, path, computedHash, raced);
+        }
+        throw err;
+    }
+}
+async function commitPut(deps, path, prevVersionId, user, logLabel) {
+    const { client, store, repo, map } = deps;
+    const log = deps.log ?? (() => { });
+    const v = await client.docs.put(repo, prevVersionId, path, user);
+    await ackLocalWrite(store, path, v, user);
+    dropMapEntriesForVersion(map, prevVersionId, path);
+    map.set(path, { version_id: v.version_id, content_hash: v.content_hash });
+    log(`${logLabel}\t${path}`);
+    return "updated";
+}
+/**
+ * After a successful kernel write, restamp the local file. If the editor saved
+ * again during the round-trip, keep those bytes and only update provenance —
+ * never write the snapshot we just pushed over newer typing.
+ */
+async function ackLocalWrite(store, path, v, pushed) {
+    const now = await store.read(path);
+    if (now === null)
+        return;
+    const current = stripToUserContent(now);
+    if (current.body === pushed.body && current.frontmatter_raw === pushed.frontmatter_raw) {
+        await store.write(path, renderMaterialized(v), { preserveMtime: true });
+        return;
+    }
+    await store.write(path, stampProvenance(now, v.version_id, v.content_hash), {
+        preserveMtime: true,
+    });
+}
+/** The occupied-path rule (§4.4): hash match → adopt; differ → conflict park. */
+async function occupiedPath(deps, path, computedHash, current) {
+    const { store, map } = deps;
+    const log = deps.log ?? (() => { });
+    if (computedHash === current.content_hash) {
+        // Clean local copy missing metadata → inject remote provenance in place, no
+        // server write. Re-render from the current version so intrinsics are exact.
+        await store.write(path, renderMaterialized(current), { preserveMtime: true });
+        map.set(path, { version_id: current.version_id, content_hash: current.content_hash });
+        return "clean";
+    }
+    await store.write(withVersionSuffix(path, current.version_id), renderIgnoredSibling(current));
+    log(`conflict\t${path}`);
+    return "conflict";
+}
+async function currentAtPath(client, repo, path) {
+    try {
+        return await client.docs.get(repo, path);
+    }
+    catch (err) {
+        if (err instanceof KernelError && err.code === "doc_not_found")
+            return null;
+        throw err;
+    }
+}
+function findMapPathByVersion(map, versionId) {
+    for (const [path, entry] of map) {
+        if (entry.version_id === versionId)
+            return path;
+    }
+    return undefined;
+}
+/** After a move/restore, the source path must not still look live for unlink. */
+function dropMapEntriesForVersion(map, versionId, keepPath) {
+    for (const [path, entry] of map) {
+        if (path !== keepPath && entry.version_id === versionId)
+            map.delete(path);
+    }
+}
+function isDeletedPath(path) {
+    return pathIsInSystemNamespace(path, HARDCODED_DEFAULTS.system_sigils);
+}
+function stripToUserContent(text) {
+    const lf = text.replace(/\r\n/g, "\n");
+    const { frontmatter_raw, body } = split(lf);
+    return { frontmatter_raw: extractSystemProperties(frontmatter_raw).raw, body };
+}
+//# sourceMappingURL=push.js.map

package/dist/sync/push.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/sync/push.ts"],"names":[],"mappings":"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"}

package/dist/sync/reconcile.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Startup reconciliation (sync/history plan §4.9) — the entirety of
+ * `mrplex sync --once`. No watcher, no remote deletes (by construction, §4.6).
+ *
+ * The pass walks the remote live set (history.index through a safe head R) and
+ * the local files, then resolves each path/identity against the §4.9 table.
+ * Every verdict is deterministic and non-destructive: local edits are pushed,
+ * clean local copies adopt remote provenance in place, and true conflicts park
+ * the remote current as an ignored sibling rather than clobbering local bytes.
+ *
+ * This module is transport-agnostic: it drives a `KernelClient` and a small
+ * `FileStore` seam (real fs in `fs-store.ts`, in-memory in tests), so the whole
+ * §4.9 table is testable against a local kernel without touching disk.
+ */
+import type { KernelClient } from "../client/kernel-client.js";
+import type { ScopeFilter } from "./paths.js";
+/** The filesystem seam the reconciler drives (real fs or in-memory test double). */
+export type FileStore = {
+    /** All in-scope doc paths present locally (repo-relative POSIX). */
+    list(): Promise<string[]>;
+    /** File text at a doc path, or null if absent. */
+    read(docPath: string): Promise<string | null>;
+    /**
+     * Write file text at a doc path (creating parent dirs).
+     * `preserveMtime` keeps the previous mtime — provenance stamps must not look
+     * newer than an Obsidian client's still-unsynced buffer or iCloud/Obsidian
+     * Sync will push the stamped snapshot back and clobber in-progress typing.
+     */
+    write(docPath: string, text: string, opts?: {
+        preserveMtime?: boolean;
+    }): Promise<void>;
+    /** Remove the file at a doc path (no-op if already absent). */
+    remove(docPath: string): Promise<void>;
+};
+/** One reconciliation action, for reporting + dry-run (§4.1 `--dry-run`). */
+export type SyncAction = {
+    path: string;
+    verdict: "clean" | "adopt" | "materialize" | "push" | "conflict" | "delete-local" | "resurrect" | "ignored" | "skip";
+    detail?: string;
+};
+export type ReconcileOptions = {
+    repo: string;
+    dryRun?: boolean;
+    log?: (msg: string) => void;
+};
+export type ReconcileReport = {
+    through_version: string;
+    actions: SyncAction[];
+};
+/**
+ * Run the full §4.9 reconciliation once. Returns the safe head R (the cursor to
+ * persist) and the list of actions taken (or planned, under dryRun).
+ */
+export declare function reconcileOnce(client: KernelClient, store: FileStore, scope: ScopeFilter, opts: ReconcileOptions): Promise<ReconcileReport>;