mrplex 0.0.1 → 0.0.3

package/dist/sync/feed.js

@@ -8,10 +8,14 @@
  * 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.
+ *
+ * better-sync.plan: hot files defer inbound effects into an in-memory map
+ * (cursor still advances); dirty+stale local files rebase onto remote current
+ * before parking a sibling.
  */
-import { withVersionSuffix } from "../kernel/deletion.js";
-import { decodeVersionId } from "../kernel/version-id.js";
-import { isDirty, isIgnored, readFileIntrinsics, renderIgnoredSibling, renderMaterialized, } from "./intrinsics.js";
+import { materializeAt } from "./converge.js";
+import { decideInbound, effectInbound, enqueueDeferred, pathIsHot, versionAtOrAhead, } from "./hot-path.js";
+import { isDirty, isIgnored, readFileIntrinsics } 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
@@ -21,11 +25,15 @@ export async function applyFeed(client, store, scope, opts) {
     const log = opts.log ?? (() => { });
     let cursor = opts.since;
     let applied = 0;
+    let deferredCount = 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))
+            const outcome = await applyRef(client, store, scope, opts, ref, log);
+            if (outcome === "applied")
                 applied++;
+            else if (outcome === "deferred")
+                deferredCount++;
         }
         // No forward progress → caught up (or a hot gap). Stop draining.
         if (page.next_since === cursor || page.refs.length === 0) {
@@ -34,92 +42,109 @@ export async function applyFeed(client, store, scope, opts) {
         }
         cursor = page.next_since;
     }
-    return { cursor, applied };
+    return { cursor, applied, deferred: deferredCount };
 }
-/** 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) {
+/** Apply one feed ref to the local store. */
+async function applyRef(client, store, scope, opts, ref, log) {
+    const settleMs = opts.settleMs ?? 0;
+    const nowMs = opts.nowMs?.() ?? Date.now();
+    const canDefer = opts.deferred !== undefined;
     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);
+            return "noop";
+        opts.map?.delete(target);
         const text = await store.read(target);
         if (text === null)
-            return false;
+            return "noop";
         const intr = readFileIntrinsics(text);
         if (isIgnored(intr) || isDirty(intr))
-            return false; // preserve local work
+            return "noop"; // preserve local work
+        if (canDefer && (await pathIsHot(store, target, settleMs, nowMs))) {
+            enqueueDeferred(opts.deferred, target, ref, nowMs);
+            return "deferred";
+        }
         await store.remove(target);
         log(`feed delete\t${target}`);
-        return true;
+        return "applied";
     }
     if (ref.op === "move") {
         const from = ref.prev_path;
         if (from !== null && scope.matches(from)) {
-            map?.delete(from);
+            opts.map?.delete(from);
             const text = await store.read(from);
             if (text !== null) {
                 const intr = readFileIntrinsics(text);
-                if (!isIgnored(intr) && !isDirty(intr))
+                if (!isIgnored(intr) && !isDirty(intr)) {
+                    if (canDefer && (await pathIsHot(store, from, settleMs, nowMs))) {
+                        // Hold the whole move (including dest) until source is cold.
+                        enqueueDeferred(opts.deferred, ref.path, ref, nowMs);
+                        return "deferred";
+                    }
                     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;
+        return "noop";
     const existing = await store.read(ref.path);
     if (existing !== null) {
         const intr = readFileIntrinsics(existing);
         if (isIgnored(intr))
-            return false;
+            return "noop";
+        // Fast path: bytes already match — provenance repair or defer when hot.
         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.
+            opts.map?.set(ref.path, { version_id: ref.version_id, content_hash: ref.content_hash });
             if (intr.version === ref.version_id)
-                return false;
+                return "noop";
             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;
+                return "noop";
+            const hot = await pathIsHot(store, ref.path, settleMs, nowMs);
+            if (hot && canDefer) {
+                enqueueDeferred(opts.deferred, ref.path, ref, nowMs);
+                return "deferred";
+            }
+            const v = await client.docs.get_version(opts.repo, ref.version_id);
+            await materializeAt(store, ref.path, v, { preserveMtime: true });
+            log(`feed adopt\t${ref.path}`);
+            return "applied";
         }
-        // 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));
+            return "noop";
+        // Divergent local vs newer remote → decideInbound (rebase / defer / park).
+        const hot = await pathIsHot(store, ref.path, settleMs, nowMs);
+        const v = await client.docs.get_version(opts.repo, ref.version_id);
+        const decision = decideInbound({
+            localText: existing,
+            remote: v,
+            hot,
+            canDefer,
+        });
+        const result = await effectInbound(client, store, opts.repo, ref.path, decision, {
+            deferred: opts.deferred,
+            ref,
+            map: opts.map,
+            nowMs,
+        });
+        if (result === "deferred")
+            return "deferred";
+        if (result === "noop")
+            return "noop";
+        if (result === "parked")
             log(`feed conflict\t${ref.path}`);
-            return true;
-        }
+        else if (decision.action === "rebase")
+            log(`feed rebase\t${ref.path}`);
+        else
+            log(`feed ${ref.op}\t${ref.path}`);
+        return "applied";
     }
-    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 });
+    // Absent locally → materialize (unless somehow hot — can't be; no mtime).
+    const v = await client.docs.get_version(opts.repo, ref.version_id);
+    await materializeAt(store, ref.path, v);
+    opts.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;
+    return "applied";
 }
 //# sourceMappingURL=feed.js.map

package/dist/sync/feed.js.map

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

package/dist/sync/fs-store.js

@@ -44,6 +44,16 @@ export function createFsStore(root) {
         async remove(docPath) {
             await rm(toLocalPath(root, docPath), { force: true });
         },
+        async mtime(docPath) {
+            try {
+                return (await stat(toLocalPath(root, docPath))).mtimeMs;
+            }
+            catch (err) {
+                if (err.code === "ENOENT")
+                    return null;
+                throw err;
+            }
+        },
     };
 }
 async function walk(root, dir, out) {

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

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

package/dist/sync/hot-path.d.ts

@@ -0,0 +1,83 @@
+/**
+ * Hot-path detection and inbound convergence decisions (better-sync.plan).
+ * Feed/reconcile call `decideInbound` then `effectInbound`; the daemon holds
+ * deferred refs in memory and retries them on later polls.
+ */
+import type { KernelClient } from "../client/kernel-client.js";
+import type { Version, VersionRef } from "../kernel/wire.js";
+import { type UserContent } from "./converge.js";
+import type { FileStore } from "./reconcile.js";
+import type { RemoteMap } from "./push.js";
+/** Drop deferred entries older than this and force cold treatment (park/rebase). */
+export declare const DEFER_TTL_MS: number;
+export type DeferredEntry = {
+    ref: VersionRef;
+    since: number;
+};
+export type DeferredMap = Map<string, DeferredEntry>;
+export type InboundDecision = {
+    action: "noop";
+} | {
+    action: "adopt";
+    version: Version;
+} | {
+    action: "materialize";
+    version: Version;
+} | {
+    action: "rebase";
+    prevVersionId: string;
+    user: UserContent;
+} | {
+    action: "defer";
+};
+/**
+ * Pure mtime gate: true when the file was modified within settleMs of now.
+ * settleMs ≤ 0 disables the gate. Absent files (null mtime) are never hot.
+ */
+export declare function isPathHot(mtimeMs: number | null, settleMs: number, nowMs?: number): boolean;
+/** Store-backed hot check. */
+export declare function pathIsHot(store: FileStore, path: string, settleMs: number, nowMs?: number): Promise<boolean>;
+/** True when the local embedded version is this ref or a later one. */
+export declare function versionAtOrAhead(localVersion: string | undefined, refVersion: string): boolean;
+export declare function isDeferExpired(entry: DeferredEntry, nowMs: number, ttlMs?: number): boolean;
+/**
+ * Insert or replace a deferred hold. Newer version_id wins when both decode.
+ */
+export declare function enqueueDeferred(deferred: DeferredMap, path: string, ref: VersionRef, nowMs?: number): void;
+/**
+ * Decide how to converge an existing local file with an incoming remote version.
+ * Does not touch the filesystem or kernel — callers run `effectInbound`.
+ *
+ * When `canDefer` is false (e.g. `--once` with no deferred map), hot files are
+ * treated as cold so the pass still converges.
+ */
+export declare function decideInbound(opts: {
+    localText: string;
+    remote: Version;
+    hot: boolean;
+    canDefer: boolean;
+}): InboundDecision;
+export type EffectResult = "noop" | "applied" | "deferred" | "parked";
+/**
+ * Apply a decision from `decideInbound`. Rebase failures (`stale_prev` /
+ * `path_taken`) fall through to parking the remote as an ignored sibling.
+ */
+export declare function effectInbound(client: KernelClient, store: FileStore, repo: string, path: string, decision: InboundDecision, opts?: {
+    deferred?: DeferredMap;
+    ref?: VersionRef;
+    map?: RemoteMap;
+    nowMs?: number;
+}): Promise<EffectResult>;
+/**
+ * Retry one deferred hold: re-read local, fetch remote, decide, effect.
+ * Returns whether the entry should be removed from the deferred map.
+ */
+export declare function retryDeferredEntry(client: KernelClient, store: FileStore, repo: string, path: string, entry: DeferredEntry, opts: {
+    settleMs: number;
+    map?: RemoteMap;
+    nowMs?: number;
+    deferred?: DeferredMap;
+}): Promise<{
+    done: boolean;
+    result: EffectResult;
+}>;

package/dist/sync/hot-path.js

@@ -0,0 +1,232 @@
+/**
+ * Hot-path detection and inbound convergence decisions (better-sync.plan).
+ * Feed/reconcile call `decideInbound` then `effectInbound`; the daemon holds
+ * deferred refs in memory and retries them on later polls.
+ */
+import { KernelError } from "../kernel/errors.js";
+import { decodeVersionId } from "../kernel/version-id.js";
+import { materializeAt, parkIgnoredSibling, putAndAck, stripToUserContent, } from "./converge.js";
+import { isDirty, isIgnored, readFileIntrinsics } from "./intrinsics.js";
+/** Drop deferred entries older than this and force cold treatment (park/rebase). */
+export const DEFER_TTL_MS = 30 * 60 * 1000;
+/**
+ * Pure mtime gate: true when the file was modified within settleMs of now.
+ * settleMs ≤ 0 disables the gate. Absent files (null mtime) are never hot.
+ */
+export function isPathHot(mtimeMs, settleMs, nowMs = Date.now()) {
+    if (settleMs <= 0)
+        return false;
+    if (mtimeMs === null)
+        return false;
+    return nowMs - mtimeMs < settleMs;
+}
+/** Store-backed hot check. */
+export async function pathIsHot(store, path, settleMs, nowMs = Date.now()) {
+    return isPathHot(await store.mtime(path), settleMs, nowMs);
+}
+/** True when the local embedded version is this ref or a later one. */
+export 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;
+}
+export function isDeferExpired(entry, nowMs, ttlMs = DEFER_TTL_MS) {
+    return nowMs - entry.since >= ttlMs;
+}
+/**
+ * Insert or replace a deferred hold. Newer version_id wins when both decode.
+ */
+export function enqueueDeferred(deferred, path, ref, nowMs = Date.now()) {
+    const existing = deferred.get(path);
+    if (existing) {
+        const old = decodeVersionId(existing.ref.version_id);
+        const neu = decodeVersionId(ref.version_id);
+        if (old !== null && neu !== null && neu <= old)
+            return;
+        // Keep original `since` so TTL is from first deferral of this path.
+        deferred.set(path, { ref, since: existing.since });
+        return;
+    }
+    deferred.set(path, { ref, since: nowMs });
+}
+/**
+ * Decide how to converge an existing local file with an incoming remote version.
+ * Does not touch the filesystem or kernel — callers run `effectInbound`.
+ *
+ * When `canDefer` is false (e.g. `--once` with no deferred map), hot files are
+ * treated as cold so the pass still converges.
+ */
+export function decideInbound(opts) {
+    const { localText, remote } = opts;
+    const treatHot = opts.hot && opts.canDefer;
+    const intr = readFileIntrinsics(localText);
+    if (isIgnored(intr))
+        return { action: "noop" };
+    if (intr.computed_hash === remote.content_hash) {
+        if (intr.version === remote.version_id && intr.content_hash === remote.content_hash) {
+            return { action: "noop" };
+        }
+        if (treatHot)
+            return { action: "defer" };
+        return { action: "adopt", version: remote };
+    }
+    if (versionAtOrAhead(intr.version, remote.version_id)) {
+        return { action: "noop" };
+    }
+    if (!isDirty(intr)) {
+        if (treatHot)
+            return { action: "defer" };
+        return { action: "materialize", version: remote };
+    }
+    // Dirty + divergent: rebase local bytes onto remote current (better-sync WS2).
+    if (treatHot)
+        return { action: "defer" };
+    return {
+        action: "rebase",
+        prevVersionId: remote.version_id,
+        user: stripToUserContent(localText),
+    };
+}
+/**
+ * Apply a decision from `decideInbound`. Rebase failures (`stale_prev` /
+ * `path_taken`) fall through to parking the remote as an ignored sibling.
+ */
+export async function effectInbound(client, store, repo, path, decision, opts = {}) {
+    const nowMs = opts.nowMs ?? Date.now();
+    switch (decision.action) {
+        case "noop":
+            return "noop";
+        case "defer": {
+            if (opts.deferred && opts.ref) {
+                enqueueDeferred(opts.deferred, path, opts.ref, nowMs);
+                return "deferred";
+            }
+            // No place to hold it — treat as cold materialize of the ref's version.
+            return "noop";
+        }
+        case "adopt": {
+            await materializeAt(store, path, decision.version, { preserveMtime: true });
+            opts.map?.set(path, {
+                version_id: decision.version.version_id,
+                content_hash: decision.version.content_hash,
+            });
+            return "applied";
+        }
+        case "materialize": {
+            await materializeAt(store, path, decision.version);
+            opts.map?.set(path, {
+                version_id: decision.version.version_id,
+                content_hash: decision.version.content_hash,
+            });
+            return "applied";
+        }
+        case "rebase": {
+            try {
+                const v = await putAndAck(client, store, repo, path, decision.prevVersionId, decision.user);
+                opts.map?.set(path, { version_id: v.version_id, content_hash: v.content_hash });
+                return "applied";
+            }
+            catch (err) {
+                if (err instanceof KernelError &&
+                    (err.code === "stale_prev" || err.code === "path_taken")) {
+                    const current = await client.docs.get_version(repo, decision.prevVersionId);
+                    // Prefer live current at path if available (may have advanced).
+                    let park = current;
+                    try {
+                        park = await client.docs.get(repo, path);
+                    }
+                    catch (err) {
+                        if (!(err instanceof KernelError && err.code === "doc_not_found"))
+                            throw err;
+                    }
+                    await parkIgnoredSibling(store, path, park);
+                    return "parked";
+                }
+                throw err;
+            }
+        }
+    }
+}
+/**
+ * Retry one deferred hold: re-read local, fetch remote, decide, effect.
+ * Returns whether the entry should be removed from the deferred map.
+ */
+export async function retryDeferredEntry(client, store, repo, path, entry, opts) {
+    const nowMs = opts.nowMs ?? Date.now();
+    const forceCold = isDeferExpired(entry, nowMs);
+    const hot = forceCold ? false : await pathIsHot(store, path, opts.settleMs, nowMs);
+    const canDefer = opts.deferred !== undefined && !forceCold;
+    if (entry.ref.op === "delete") {
+        const text = await store.read(path);
+        if (text === null)
+            return { done: true, result: "noop" };
+        const intr = readFileIntrinsics(text);
+        if (isIgnored(intr) || isDirty(intr))
+            return { done: true, result: "noop" };
+        if (hot && canDefer)
+            return { done: false, result: "deferred" };
+        await store.remove(path);
+        opts.map?.delete(path);
+        return { done: true, result: "applied" };
+    }
+    const text = await store.read(path);
+    if (text === null) {
+        // Local gone — materialize remote current if still live.
+        try {
+            const current = await client.docs.get(repo, path);
+            if (hot && canDefer)
+                return { done: false, result: "deferred" };
+            await materializeAt(store, path, current);
+            opts.map?.set(path, {
+                version_id: current.version_id,
+                content_hash: current.content_hash,
+            });
+            return { done: true, result: "applied" };
+        }
+        catch (err) {
+            if (err instanceof KernelError && err.code === "doc_not_found") {
+                return { done: true, result: "noop" };
+            }
+            throw err;
+        }
+    }
+    // Prefer live current at path; fall back to the held version.
+    let remote;
+    try {
+        remote = await client.docs.get(repo, path);
+    }
+    catch (err) {
+        if (!(err instanceof KernelError && err.code === "doc_not_found"))
+            throw err;
+        try {
+            remote = await client.docs.get_version(repo, entry.ref.version_id);
+        }
+        catch (err) {
+            if (err instanceof KernelError && err.code === "doc_not_found") {
+                return { done: true, result: "noop" };
+            }
+            throw err;
+        }
+    }
+    const decision = decideInbound({
+        localText: text,
+        remote,
+        hot,
+        canDefer,
+    });
+    if (decision.action === "defer") {
+        return { done: false, result: "deferred" };
+    }
+    const result = await effectInbound(client, store, repo, path, decision, {
+        map: opts.map,
+        nowMs,
+    });
+    return { done: true, result };
+}
+//# sourceMappingURL=hot-path.js.map

package/dist/sync/hot-path.js.map

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