mrplex 0.0.1

package/dist/sync/cursor.js

@@ -0,0 +1,66 @@
+/**
+ * The one persistent client state: a single cursor (sync/history plan §4.2).
+ * `<root>/.mrplex/sync.json` holds `{ server | database, repo,
+ * last_synced_version_id }`, meaning "every change at or before this position
+ * in the log is reflected on disk." The source is recorded as exactly one of
+ * `server` (remote sync) or `database` (local sync) — they are mutually
+ * exclusive, mirroring the CLI's --server/--database gate. In-vault so it
+ * travels with the vault it describes. There is no per-file manifest or
+ * tombstone journal.
+ */
+import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { CURSOR_FILE } from "./paths.js";
+/**
+ * Resolve the cursor's source fields (§4.2). The source is exactly one of
+ * `server` (remote sync) or `database` (local sync); a set `server` always
+ * wins, otherwise a set `database` is recorded. When neither is supplied on
+ * this run, carry forward whatever the existing marker held so an incidental
+ * re-run (e.g. via a different code path) doesn't strip provenance.
+ */
+export function sourceFields(server, database, existing) {
+    if (server !== undefined)
+        return { server };
+    if (database !== undefined)
+        return { database };
+    if (existing?.server !== undefined)
+        return { server: existing.server };
+    if (existing?.database !== undefined)
+        return { database: existing.database };
+    return {};
+}
+/**
+ * Read the cursor file, or null when absent (marker absent → full index
+ * reconciliation, §4.9). A malformed file throws — the caller must not silently
+ * treat corruption as "start fresh."
+ */
+export async function readCursor(root) {
+    const path = join(root, CURSOR_FILE);
+    let text;
+    try {
+        text = await readFile(path, "utf8");
+    }
+    catch (err) {
+        if (err.code === "ENOENT")
+            return null;
+        throw err;
+    }
+    const parsed = JSON.parse(text);
+    if (typeof parsed.last_synced_version_id !== "string") {
+        throw new Error(`${path}: missing last_synced_version_id`);
+    }
+    return parsed;
+}
+/**
+ * Write the cursor atomically (temp + rename) so a crash mid-write can't leave
+ * a torn file. The cursor advances only after a batch's filesystem effects
+ * complete (§4.3), so this is called at safe points.
+ */
+export async function writeCursor(root, cursor) {
+    const path = join(root, CURSOR_FILE);
+    await mkdir(dirname(path), { recursive: true });
+    const tmp = `${path}.tmp`;
+    await writeFile(tmp, `${JSON.stringify(cursor, null, 2)}\n`, "utf8");
+    await rename(tmp, path);
+}
+//# sourceMappingURL=cursor.js.map

package/dist/sync/cursor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../src/sync/cursor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AASzC;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA0B,EAC1B,QAA4B,EAC5B,QAA2B;IAE3B,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAC5C,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAChD,IAAI,QAAQ,EAAE,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACvE,IAAI,QAAQ,EAAE,QAAQ,KAAK,SAAS;QAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC7E,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAY;IAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACrC,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAClE,MAAM,GAAG,CAAC;IACZ,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAe,CAAC;IAC9C,IAAI,OAAO,MAAM,CAAC,sBAAsB,KAAK,QAAQ,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,kCAAkC,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAY,EAAE,MAAkB;IAChE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACrC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,GAAG,IAAI,MAAM,CAAC;IAC1B,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrE,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC"}

package/dist/sync/daemon.d.ts

@@ -0,0 +1,40 @@
+/**
+ * The two-way sync daemon (sync/history plan §4.3–4.8, M8). Startup
+ * reconciliation, then two steady-state loops:
+ *
+ *   • remote → local: poll history.since(cursor) every --interval, apply refs
+ *     (feed.ts), advance the cursor after fs effects.
+ *   • local → remote: a chokidar watcher coalesces events into a debounce
+ *     *burst* (all paths that settled together). The burst runs present files
+ *     first so unlink+add of a rename is a move, not a delete (§4.7); each
+ *     path is still stated, not trusted by event type (§4.6).
+ *
+ * chokidar is confined to this module (§4.4). Echo suppression falls out of
+ * self-description (§4.5): our own pushes come back on the feed but the local
+ * file already embeds that version+hash, and our own writes trip the watcher
+ * but the hash gate no-ops them.
+ */
+import type { KernelClient } from "../client/kernel-client.js";
+export type DaemonOptions = {
+    root: string;
+    repo: string;
+    server?: string;
+    database?: string;
+    include?: string[];
+    exclude?: string[];
+    intervalMs?: number;
+    debounceMs?: number;
+    settleMs?: number;
+    log?: (msg: string) => void;
+};
+export type Daemon = {
+    /** Resolves once the initial reconciliation + first feed drain complete. */
+    ready: Promise<void>;
+    /** Stop the watcher and poll loop; resolves when fully torn down. */
+    stop(): Promise<void>;
+};
+/**
+ * Start the daemon. Returns handles rather than blocking, so the CLI (or a
+ * test) controls its lifetime. The poll loop and watcher run until `stop()`.
+ */
+export declare function startDaemon(client: KernelClient, opts: DaemonOptions): Daemon;

package/dist/sync/daemon.js

@@ -0,0 +1,202 @@
+/**
+ * The two-way sync daemon (sync/history plan §4.3–4.8, M8). Startup
+ * reconciliation, then two steady-state loops:
+ *
+ *   • remote → local: poll history.since(cursor) every --interval, apply refs
+ *     (feed.ts), advance the cursor after fs effects.
+ *   • local → remote: a chokidar watcher coalesces events into a debounce
+ *     *burst* (all paths that settled together). The burst runs present files
+ *     first so unlink+add of a rename is a move, not a delete (§4.7); each
+ *     path is still stated, not trusted by event type (§4.6).
+ *
+ * chokidar is confined to this module (§4.4). Echo suppression falls out of
+ * self-description (§4.5): our own pushes come back on the feed but the local
+ * file already embeds that version+hash, and our own writes trip the watcher
+ * but the hash gate no-ops them.
+ */
+import { watch } from "chokidar";
+import { readCursor, sourceFields, writeCursor } from "./cursor.js";
+import { applyFeed } from "./feed.js";
+import { createFsStore } from "./fs-store.js";
+import { isIgnored, readFileIntrinsics } from "./intrinsics.js";
+import { SYNC_DIR, makeScopeFilter, toDocPath } from "./paths.js";
+import { pushBurst, pushPath } from "./push.js";
+import { reconcileOnce } from "./reconcile.js";
+/**
+ * Start the daemon. Returns handles rather than blocking, so the CLI (or a
+ * test) controls its lifetime. The poll loop and watcher run until `stop()`.
+ */
+export function startDaemon(client, opts) {
+    const log = opts.log ?? (() => { });
+    const store = createFsStore(opts.root);
+    const scope = makeScopeFilter({ include: opts.include, exclude: opts.exclude });
+    const map = new Map();
+    const intervalMs = opts.intervalMs ?? 5000;
+    const debounceMs = opts.debounceMs ?? 5000;
+    let stopped = false;
+    let watcher;
+    const pending = new Set();
+    let burstTimer;
+    let cursor = "";
+    let existingCursor = null;
+    // Serialize all remote-touching work so a poll and a push never interleave a
+    // read-modify-write on the same path.
+    let chain = Promise.resolve();
+    const serialize = (fn) => {
+        chain = chain.then(fn, fn);
+        return chain;
+    };
+    async function persistCursor() {
+        await writeCursor(opts.root, {
+            ...sourceFields(opts.server, opts.database, existingCursor),
+            repo: opts.repo,
+            last_synced_version_id: cursor,
+        });
+    }
+    /**
+     * The marker-present offline reconcile (§4.9): a purely-local walk that
+     * pushes offline edits and creations without enumerating the remote. Each
+     * file runs the ordinary push pass — clean files no-op via the hash gate,
+     * dirty ones push, files lacking provenance resolve the remote path first.
+     * Offline deletions and moves reconcile lazily (they are not witnessed), per
+     * the plan's stated consequence; a full pass (--once) is the lever for those.
+     */
+    async function localDirtyWalk() {
+        for (const docPath of await store.list()) {
+            if (!scope.matches(docPath))
+                continue;
+            try {
+                await pushPath(docPath, { client, store, repo: opts.repo, map, log });
+            }
+            catch (err) {
+                log(`push error\t${docPath}\t${err.message}`);
+            }
+        }
+    }
+    async function pollFeedOnce() {
+        const { cursor: next } = await applyFeed(client, store, scope, {
+            repo: opts.repo,
+            since: cursor,
+            log,
+            map,
+        });
+        if (next !== cursor) {
+            cursor = next;
+            await persistCursor();
+        }
+    }
+    function schedulePush(docPath) {
+        if (!scope.matches(docPath))
+            return;
+        pending.add(docPath);
+        if (burstTimer)
+            clearTimeout(burstTimer);
+        burstTimer = setTimeout(() => {
+            burstTimer = undefined;
+            const batch = [...pending];
+            pending.clear();
+            void serialize(async () => {
+                if (stopped)
+                    return;
+                await pushBurst(batch, { client, store, repo: opts.repo, map, log });
+            });
+        }, debounceMs);
+    }
+    const ready = (async () => {
+        // 1. Startup is deterministic on the cursor marker (§4.9, §7).
+        const existing = await readCursor(opts.root);
+        existingCursor = existing;
+        // Seed the map from local provenance first, so the dirty walk's witnessed
+        // deletes (and the feed's) know each file's prev_version_id.
+        await seedMapFromLocal(store, scope, map);
+        if (existing === null) {
+            // Marker absent → full index reconciliation, then resume the feed from R.
+            const report = await reconcileOnce(client, store, scope, { repo: opts.repo, log });
+            // reconcileOnce may have materialized/pushed files; re-seed so the map
+            // reflects the post-reconcile provenance.
+            await seedMapFromLocal(store, scope, map);
+            cursor = report.through_version;
+        }
+        else {
+            // Marker present → skip the index scan. Run a purely-local dirty walk
+            // (pushes offline edits + creations; no remote enumeration), then resume
+            // history.since(cursor). The feed is gap-free from any cursor age (§3.2),
+            // so an old marker is merely more replay, never a correctness question.
+            // Offline deletions/moves reconcile lazily until a full pass (§4.9).
+            await localDirtyWalk();
+            cursor = existing.last_synced_version_id;
+        }
+        await persistCursor();
+        // 2. Drain the feed from the cursor (advances + re-persists if it moves).
+        await pollFeedOnce();
+        // 3. Start the watcher (local → remote).
+        watcher = watch(opts.root, {
+            ignoreInitial: true,
+            // Prune the sync state dir; the scope filter still guards everything else.
+            ignored: (p) => p.includes(`/${SYNC_DIR}/`) || p.endsWith(`/${SYNC_DIR}`),
+            ...(opts.settleMs
+                ? { awaitWriteFinish: { stabilityThreshold: opts.settleMs, pollInterval: 100 } }
+                : {}),
+        });
+        const onEvent = (abs) => {
+            const docPath = toDocPath(opts.root, abs);
+            if (docPath !== null)
+                schedulePush(docPath);
+        };
+        watcher.on("add", onEvent).on("change", onEvent).on("unlink", onEvent);
+        // Wait for the initial scan to finish so events aren't missed right after
+        // ready resolves (chokidar only watches reliably once it emits `ready`).
+        const w = watcher;
+        await new Promise((resolve) => w.once("ready", () => resolve()));
+        // 4. Start the remote → local poll loop.
+        void pollLoop();
+    })();
+    async function pollLoop() {
+        while (!stopped) {
+            await sleep(intervalMs);
+            if (stopped)
+                break;
+            await serialize(async () => {
+                if (stopped)
+                    return;
+                try {
+                    await pollFeedOnce();
+                }
+                catch (err) {
+                    log(`poll error\t${err.message}`);
+                }
+            });
+        }
+    }
+    return {
+        ready,
+        async stop() {
+            stopped = true;
+            if (burstTimer)
+                clearTimeout(burstTimer);
+            burstTimer = undefined;
+            pending.clear();
+            if (watcher)
+                await watcher.close();
+            await chain.catch(() => { });
+        },
+    };
+}
+/** Seed the in-memory map from the local files' embedded provenance (§4.2). */
+async function seedMapFromLocal(store, scope, map) {
+    for (const path of await store.list()) {
+        if (!scope.matches(path))
+            continue;
+        const text = await store.read(path);
+        if (text === null)
+            continue;
+        const intr = readFileIntrinsics(text);
+        if (isIgnored(intr) || !intr.version || !intr.content_hash)
+            continue;
+        map.set(path, { version_id: intr.version, content_hash: intr.content_hash });
+    }
+}
+function sleep(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+//# sourceMappingURL=daemon.js.map

package/dist/sync/daemon.js.map

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

package/dist/sync/feed.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Remote → local: consume the change feed (sync/history plan §4.3). Drains
+ * `history.since` from a cursor and applies each ref to the local store, then
+ * returns the final cursor and a count. Shared by `--once` (drain to the tip
+ * after reconciliation) and the daemon's poll loop (M8).
+ *
+ * Every operation is idempotent (§4.3): same bytes → same file; removing an
+ * absent file is a no-op; the dirty check prevents a replay from clobbering an
+ * edit made in a crash window. So a crash between apply and cursor-advance
+ * simply replays the batch harmlessly.
+ */
+import type { KernelClient } from "../client/kernel-client.js";
+import type { ScopeFilter } from "./paths.js";
+import type { RemoteMap } from "./push.js";
+import type { FileStore } from "./reconcile.js";
+export type ApplyFeedOptions = {
+    repo: string;
+    since: string;
+    log?: (msg: string) => void;
+    /**
+     * Optional daemon working-map (§4.2 tier 3). When supplied, feed application
+     * keeps it current — set on materialize, delete on remove — so a later
+     * witnessed unlink knows the file's prev_version_id.
+     */
+    map?: RemoteMap;
+};
+export type ApplyFeedResult = {
+    /** Final resume cursor after draining the currently-safe feed. */
+    cursor: string;
+    /** Number of refs whose filesystem effect was applied. */
+    applied: number;
+};
+/**
+ * Drain the safe feed from `since` to the live tip, applying each in-scope ref.
+ * Returns the final cursor to persist. Stops when a poll returns no new refs
+ * (caught up, or stalled at a hot gap — the caller decides whether to re-poll).
+ */
+export declare function applyFeed(client: KernelClient, store: FileStore, scope: ScopeFilter, opts: ApplyFeedOptions): Promise<ApplyFeedResult>;

package/dist/sync/feed.js

@@ -0,0 +1,125 @@
+/**
+ * Remote → local: consume the change feed (sync/history plan §4.3). Drains
+ * `history.since` from a cursor and applies each ref to the local store, then
+ * returns the final cursor and a count. Shared by `--once` (drain to the tip
+ * after reconciliation) and the daemon's poll loop (M8).
+ *
+ * Every operation is idempotent (§4.3): same bytes → same file; removing an
+ * absent file is a no-op; the dirty check prevents a replay from clobbering an
+ * edit made in a crash window. So a crash between apply and cursor-advance
+ * simply replays the batch harmlessly.
+ */
+import { withVersionSuffix } from "../kernel/deletion.js";
+import { decodeVersionId } from "../kernel/version-id.js";
+import { isDirty, isIgnored, readFileIntrinsics, renderIgnoredSibling, renderMaterialized, } from "./intrinsics.js";
+/**
+ * Drain the safe feed from `since` to the live tip, applying each in-scope ref.
+ * Returns the final cursor to persist. Stops when a poll returns no new refs
+ * (caught up, or stalled at a hot gap — the caller decides whether to re-poll).
+ */
+export async function applyFeed(client, store, scope, opts) {
+    const log = opts.log ?? (() => { });
+    let cursor = opts.since;
+    let applied = 0;
+    for (;;) {
+        const page = await client.history.since({ after_version: cursor, repo: opts.repo });
+        for (const ref of page.refs) {
+            if (await applyRef(client, store, scope, opts.repo, ref, log, opts.map))
+                applied++;
+        }
+        // No forward progress → caught up (or a hot gap). Stop draining.
+        if (page.next_since === cursor || page.refs.length === 0) {
+            cursor = page.next_since;
+            break;
+        }
+        cursor = page.next_since;
+    }
+    return { cursor, applied };
+}
+/** Apply one feed ref to the local store. Returns true if it changed a file. */
+async function applyRef(client, store, scope, repo, ref, log, map) {
+    if (ref.op === "delete") {
+        // Remove the local file at prev_path IF clean; dirty ⇒ keep (resurrection
+        // happens on its next local-change cycle). §4.3 delete.
+        const target = ref.prev_path;
+        if (target === null || !scope.matches(target))
+            return false;
+        map?.delete(target);
+        const text = await store.read(target);
+        if (text === null)
+            return false;
+        const intr = readFileIntrinsics(text);
+        if (isIgnored(intr) || isDirty(intr))
+            return false; // preserve local work
+        await store.remove(target);
+        log(`feed delete\t${target}`);
+        return true;
+    }
+    if (ref.op === "move") {
+        const from = ref.prev_path;
+        if (from !== null && scope.matches(from)) {
+            map?.delete(from);
+            const text = await store.read(from);
+            if (text !== null) {
+                const intr = readFileIntrinsics(text);
+                if (!isIgnored(intr) && !isDirty(intr))
+                    await store.remove(from);
+            }
+        }
+        // Fall through to materialize at the destination path.
+    }
+    // create / update / move-destination: materialize at ref.path unless the
+    // local file already holds these bytes, is at-or-ahead of this ref, is
+    // dirty against a *newer* remote, or is $sync: ignore.
+    if (!scope.matches(ref.path))
+        return false;
+    const existing = await store.read(ref.path);
+    if (existing !== null) {
+        const intr = readFileIntrinsics(existing);
+        if (isIgnored(intr))
+            return false;
+        if (intr.computed_hash === ref.content_hash) {
+            // Bytes already present (our own push echoing back, or a vault copy).
+            map?.set(ref.path, { version_id: ref.version_id, content_hash: ref.content_hash });
+            // Repair provenance only if the embedded version lags.
+            if (intr.version === ref.version_id)
+                return false;
+            if (versionAtOrAhead(intr.version, ref.version_id))
+                return false;
+            const v = await client.docs.get_version(repo, ref.version_id);
+            await store.write(ref.path, renderMaterialized(v), { preserveMtime: true });
+            return true;
+        }
+        // Local is at or ahead of this ref (echo of our push, or a replay of an
+        // older version). Never clobber and never park a sibling of something we
+        // already have — including when the user has typed more since (dirty).
+        if (versionAtOrAhead(intr.version, ref.version_id))
+            return false;
+        if (isDirty(intr)) {
+            // A local edit collides with a *newer* incoming version → conflict, not
+            // overwrite. Park the remote as an ignored sibling; keep local bytes.
+            const v = await client.docs.get_version(repo, ref.version_id);
+            await store.write(withVersionSuffix(ref.path, ref.version_id), renderIgnoredSibling(v));
+            log(`feed conflict\t${ref.path}`);
+            return true;
+        }
+    }
+    const v = await client.docs.get_version(repo, ref.version_id);
+    await store.write(ref.path, renderMaterialized(v));
+    map?.set(ref.path, { version_id: ref.version_id, content_hash: ref.content_hash });
+    log(`feed ${ref.op}\t${ref.path}`);
+    return true;
+}
+/** True when the local embedded version is this ref or a later one. */
+function versionAtOrAhead(localVersion, refVersion) {
+    if (!localVersion)
+        return false;
+    if (localVersion === refVersion)
+        return true;
+    const local = decodeVersionId(localVersion);
+    const ref = decodeVersionId(refVersion);
+    if (local === null || ref === null)
+        return false;
+    return local > ref;
+}
+//# sourceMappingURL=feed.js.map

package/dist/sync/feed.js.map

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

package/dist/sync/fs-store.d.ts

@@ -0,0 +1,8 @@
+/**
+ * The real filesystem `FileStore` (sync/history plan §4). Maps repo-relative
+ * POSIX doc paths to files under `<root>`, walking the vault to enumerate the
+ * live set. The `.mrplex/` state dir is skipped by the scope filter, but we
+ * also prune it (and dotdirs like `.obsidian/`) during the walk for speed.
+ */
+import type { FileStore } from "./reconcile.js";
+export declare function createFsStore(root: string): FileStore;

package/dist/sync/fs-store.js

@@ -0,0 +1,76 @@
+/**
+ * The real filesystem `FileStore` (sync/history plan §4). Maps repo-relative
+ * POSIX doc paths to files under `<root>`, walking the vault to enumerate the
+ * live set. The `.mrplex/` state dir is skipped by the scope filter, but we
+ * also prune it (and dotdirs like `.obsidian/`) during the walk for speed.
+ */
+import { mkdir, readFile, readdir, rm, stat, utimes, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
+import { toDocPath, toLocalPath } from "./paths.js";
+export function createFsStore(root) {
+    return {
+        async list() {
+            const out = [];
+            await walk(root, root, out);
+            return out;
+        },
+        async read(docPath) {
+            try {
+                return await readFile(toLocalPath(root, docPath), "utf8");
+            }
+            catch (err) {
+                if (err.code === "ENOENT")
+                    return null;
+                throw err;
+            }
+        },
+        async write(docPath, text, opts) {
+            const abs = toLocalPath(root, docPath);
+            await mkdir(dirname(abs), { recursive: true });
+            let mtime;
+            if (opts?.preserveMtime) {
+                try {
+                    mtime = (await stat(abs)).mtime;
+                }
+                catch (err) {
+                    if (err.code !== "ENOENT")
+                        throw err;
+                }
+            }
+            await writeFile(abs, text, "utf8");
+            if (mtime)
+                await utimes(abs, mtime, mtime);
+        },
+        async remove(docPath) {
+            await rm(toLocalPath(root, docPath), { force: true });
+        },
+    };
+}
+async function walk(root, dir, out) {
+    let entries;
+    try {
+        entries = await readdir(dir, { withFileTypes: true });
+    }
+    catch (err) {
+        if (err.code === "ENOENT")
+            return;
+        throw err;
+    }
+    for (const ent of entries) {
+        if (ent.isDirectory()) {
+            // Prune any dot-prefixed dir (the `.mrplex/` state dir, app dotdirs like
+            // `.obsidian/`). This is exactly what makeScopeFilter's hasDotSegment
+            // excludes, so the walk and the scope filter agree in both directions
+            // (§4.1); pruning here just avoids the descent.
+            if (ent.name.startsWith("."))
+                continue;
+            await walk(root, `${dir}/${ent.name}`, out);
+        }
+        else if (ent.isFile()) {
+            const docPath = toDocPath(root, `${dir}/${ent.name}`);
+            if (docPath !== null)
+                out.push(docPath);
+        }
+    }
+}
+//# sourceMappingURL=fs-store.js.map

package/dist/sync/fs-store.js.map

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

package/dist/sync/intrinsics.d.ts

@@ -0,0 +1,52 @@
+/**
+ * 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 type { Version } from "../kernel/wire.js";
+/** The `$sync` directive value we honor (§4.2). Only `ignore` is defined. */
+export declare const SYNC_IGNORE = "ignore";
+export type FileIntrinsics = {
+    /** Embedded `$version` (ancestry), or undefined if absent. */
+    version?: string;
+    /** Embedded `$content_hash` (clean-state fingerprint), or undefined. */
+    content_hash?: string;
+    /** Embedded `$sync` client directive, or undefined. */
+    sync?: string;
+    /** The canonical content hash computed from the file's user bytes. */
+    computed_hash: string;
+};
+/**
+ * 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 declare function readFileIntrinsics(text: string): FileIntrinsics;
+/** True when the file opts out of sync via `$sync: ignore` (§4.2). */
+export declare function isIgnored(intr: FileIntrinsics): boolean;
+/**
+ * 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 declare function isDirty(intr: FileIntrinsics): boolean;
+/**
+ * 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 declare function renderMaterialized(v: Version): string;
+/**
+ * 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 declare function renderIgnoredSibling(v: Version): string;
+/**
+ * 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 declare function stampProvenance(text: string, versionId: string, contentHash: string): string;