pushwork 2.0.0-preview.6 → 2.0.0-preview.8

package/dist/utils/repo-factory.js

@@ -0,0 +1,156 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRepo = createRepo;
+const automerge_repo_storage_nodefs_1 = require("@automerge/automerge-repo-storage-nodefs");
+const fs = __importStar(require("fs/promises"));
+const path = __importStar(require("path"));
+/**
+ * Perform a real ESM dynamic import that tsc won't rewrite to require().
+ *
+ * TypeScript with `"module": "commonjs"` compiles `await import("x")` to
+ * `require("x")`, which resolves CJS entries instead of ESM entries. The
+ * Wasm module instance is different between the CJS and ESM module graphs,
+ * so initializing via CJS require() doesn't help the ESM /slim imports
+ * inside automerge-repo.
+ *
+ * This helper uses `new Function` to create a real `import()` expression
+ * that Node.js evaluates as ESM, sharing the same module graph as the
+ * Repo's internal imports.
+ */
+const dynamicImport = new Function("specifier", "return import(specifier)");
+/**
+ * Initialize the Subduction Wasm module and return the Repo constructor.
+ *
+ * The Repo constructor calls set_subduction_logger() and new MemorySigner()
+ * from @automerge/automerge-subduction/slim, which require the Wasm module
+ * to be initialized first. automerge-repo exports initSubduction() to
+ * handle this — it dynamically imports the non-/slim entry (which
+ * auto-initializes the Wasm as a side effect).
+ *
+ * Both the Repo and initSubduction must be loaded via ESM dynamic import()
+ * so they share the same module graph as the Repo's internal /slim imports.
+ */
+let cachedRepoClass;
+async function getRepoClass() {
+    if (cachedRepoClass)
+        return cachedRepoClass;
+    // Import Repo and initialize Subduction Wasm via automerge-repo's
+    // initSubduction() helper. This must happen before new Repo() because
+    // the constructor calls set_subduction_logger() and new MemorySigner()
+    // which require the Wasm module to be ready.
+    //
+    // Both imports use the ESM dynamic import wrapper so they share the
+    // same module graph as the Repo's internal /slim imports.
+    const repoMod = await dynamicImport("@automerge/automerge-repo");
+    await repoMod.initSubduction();
+    cachedRepoClass = repoMod.Repo;
+    return cachedRepoClass;
+}
+/**
+ * Scan a directory tree for 0-byte files, which indicate incomplete writes
+ * from a previous run (process exited before storage flushed). Returns true
+ * if any are found.
+ */
+async function hasCorruptStorage(dir) {
+    try {
+        await fs.access(dir);
+    }
+    catch {
+        return false;
+    }
+    const entries = await fs.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            if (await hasCorruptStorage(fullPath))
+                return true;
+        }
+        else if (entry.isFile()) {
+            const stat = await fs.stat(fullPath);
+            if (stat.size === 0)
+                return true;
+        }
+    }
+    return false;
+}
+/**
+ * Create an Automerge repository with configuration-based setup.
+ *
+ * When `sub` is true, uses the Subduction sync backend built into
+ * automerge-repo. The Repo manages its own SubductionSource internally —
+ * we just pass `subductionWebsocketEndpoints` and the Repo handles
+ * connection management, sync, and retries.
+ *
+ * When `sub` is false (default), uses the traditional WebSocket network
+ * adapter for sync via the automerge sync server.
+ */
+async function createRepo(workingDir, config, sub = false) {
+    const RepoClass = await getRepoClass();
+    const syncToolDir = path.join(workingDir, ".pushwork");
+    const automergeDir = path.join(syncToolDir, "automerge");
+    // Detect and recover from corrupt local storage (0-byte files left by
+    // incomplete writes from a previous run). Wipe the cache so the Repo
+    // hydrates cleanly from the sync server.
+    if (await hasCorruptStorage(automergeDir)) {
+        console.warn("[pushwork] Corrupt local storage detected, clearing cache...");
+        await fs.rm(automergeDir, { recursive: true, force: true });
+        await fs.mkdir(automergeDir, { recursive: true });
+    }
+    const storage = new automerge_repo_storage_nodefs_1.NodeFSStorageAdapter(automergeDir);
+    if (sub) {
+        const endpoints = [];
+        if (config.sync_enabled && config.sync_server) {
+            endpoints.push(config.sync_server);
+        }
+        return new RepoClass({ storage, subductionWebsocketEndpoints: endpoints });
+    }
+    // Default: WebSocket sync adapter
+    const repoConfig = { storage };
+    if (config.sync_enabled && config.sync_server) {
+        // Load the WebSocket adapter via ESM dynamic import to stay in the
+        // same module graph as the Repo.
+        const wsMod = await dynamicImport("@automerge/automerge-repo-network-websocket");
+        // The websocket adapter package (subduction.8) hasn't updated its
+        // NetworkAdapter base-class types to match the repo's new
+        // NetworkAdapterInterface (which added state() and stricter
+        // EventEmitter generics). At runtime the adapter has all required
+        // methods; this is purely a declaration mismatch.
+        const networkAdapter = new wsMod.BrowserWebSocketClientAdapter(config.sync_server);
+        repoConfig.network = [networkAdapter];
+    }
+    return new RepoClass(repoConfig);
+}
+//# sourceMappingURL=repo-factory.js.map

package/dist/utils/repo-factory.js.map

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

package/dist/utils/string-similarity.d.ts

@@ -0,0 +1,14 @@
+/**
+
+ * Calculate similarity between two strings
+
+ * @param {string} str1 First string to match
+ * @param {string} str2 Second string to match
+ * @param {number} [substringLength=2] Optional. Length of substring to be used in calculating similarity. Default 2.
+ * @param {boolean} [caseSensitive=false] Optional. Whether you want to consider case in string matching. Default false;
+
+ * @returns Number between 0 and 1, with 0 being a low match score.
+
+ */
+export declare const stringSimilarity: (str1: string, str2: string, substringLength?: number, caseSensitive?: boolean) => number;
+//# sourceMappingURL=string-similarity.d.ts.map

package/dist/utils/string-similarity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"string-similarity.d.ts","sourceRoot":"","sources":["../../src/utils/string-similarity.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,MAAM,EACZ,MAAM,MAAM,EACZ,kBAAiB,MAAU,EAC3B,gBAAe,OAAe,WAkC/B,CAAC"}

package/dist/utils/string-similarity.js

@@ -0,0 +1,43 @@
+"use strict";
+/* Based on the Sørensen–Dice coefficient, code from https://github.com/stephenjjbrown/string-similarity-js */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringSimilarity = void 0;
+/**
+
+ * Calculate similarity between two strings
+
+ * @param {string} str1 First string to match
+ * @param {string} str2 Second string to match
+ * @param {number} [substringLength=2] Optional. Length of substring to be used in calculating similarity. Default 2.
+ * @param {boolean} [caseSensitive=false] Optional. Whether you want to consider case in string matching. Default false;
+
+ * @returns Number between 0 and 1, with 0 being a low match score.
+
+ */
+const stringSimilarity = (str1, str2, substringLength = 2, caseSensitive = false) => {
+    if (str1 === str2)
+        return 1;
+    if (!caseSensitive) {
+        str1 = str1.toLowerCase();
+        str2 = str2.toLowerCase();
+    }
+    if (str1.length < substringLength || str2.length < substringLength)
+        return 0;
+    const map = new Map();
+    for (let i = 0; i < str1.length - (substringLength - 1); i++) {
+        const substr1 = str1.substring(i, i + substringLength);
+        map.set(substr1, map.has(substr1) ? map.get(substr1) + 1 : 1);
+    }
+    let match = 0;
+    for (let j = 0; j < str2.length - (substringLength - 1); j++) {
+        const substr2 = str2.substring(j, j + substringLength);
+        const count = map.has(substr2) ? map.get(substr2) : 0;
+        if (count > 0) {
+            map.set(substr2, count - 1);
+            match++;
+        }
+    }
+    return (match * 2) / (str1.length + str2.length - (substringLength - 1) * 2);
+};
+exports.stringSimilarity = stringSimilarity;
+//# sourceMappingURL=string-similarity.js.map

package/dist/utils/string-similarity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"string-similarity.js","sourceRoot":"","sources":["../../src/utils/string-similarity.ts"],"names":[],"mappings":";AAAA,8GAA8G;;;AAE9G;;;;;;;;;;;GAWG;AAEI,MAAM,gBAAgB,GAAG,CAC9B,IAAY,EACZ,IAAY,EACZ,kBAA0B,CAAC,EAC3B,gBAAyB,KAAK,EAC9B,EAAE;IACF,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,CAAC,CAAC;IAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE1B,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,GAAG,eAAe,IAAI,IAAI,CAAC,MAAM,GAAG,eAAe;QAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC;QAEvD,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC;QAEvD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAE5B,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,eAAe,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AAtCW,QAAA,gBAAgB,oBAsC3B"}

package/dist/utils/text-diff.d.ts

@@ -0,0 +1,37 @@
+import * as A from "@automerge/automerge";
+/**
+ * Read content from an Automerge document, normalizing legacy ImmutableString
+ * values to plain strings for backwards compatibility.
+ *
+ * Old documents may store text as ImmutableString. This helper ensures callers
+ * always get back `string | Uint8Array | null`.
+ */
+export declare function readDocContent(content: unknown): string | Uint8Array | null;
+/**
+ * Update text content on an Automerge document property inside a change
+ * callback.
+ *
+ * If the existing value is already a collaborative text string, we diff and
+ * splice for minimal CRDT operations.  If the existing value is a legacy
+ * ImmutableString we can't splice into it, so we assign the whole string
+ * which converts the field to a collaborative text CRDT going forward.
+ *
+ * @param doc  - The mutable Automerge document (inside a change callback)
+ * @param path - Property path to the text field, e.g. ["content"]
+ * @param newContent - The desired new text value
+ */
+export declare function updateTextContent(doc: any, path: A.Prop[], newContent: string): void;
+/**
+ * Apply a text diff between oldContent and newContent as Automerge splice
+ * operations on the given document property path.
+ *
+ * This preserves the collaborative text CRDT structure by making minimal
+ * character-level edits rather than replacing the entire string.
+ *
+ * @param doc - The Automerge document (inside a change callback)
+ * @param path - The property path to the text field, e.g. ["content"]
+ * @param oldContent - The previous text content
+ * @param newContent - The desired new text content
+ */
+export declare function spliceText(doc: any, path: A.Prop[], oldContent: string, newContent: string): void;
+//# sourceMappingURL=text-diff.d.ts.map

package/dist/utils/text-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text-diff.d.ts","sourceRoot":"","sources":["../../src/utils/text-diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,sBAAsB,CAAA;AAGzC;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAO3E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EACd,UAAU,EAAE,MAAM,GAChB,IAAI,CAeN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CACzB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GAChB,IAAI,CA8BN"}

package/dist/utils/text-diff.js

@@ -0,0 +1,131 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readDocContent = readDocContent;
+exports.updateTextContent = updateTextContent;
+exports.spliceText = spliceText;
+const A = __importStar(require("@automerge/automerge"));
+const diffLib = __importStar(require("diff"));
+/**
+ * Read content from an Automerge document, normalizing legacy ImmutableString
+ * values to plain strings for backwards compatibility.
+ *
+ * Old documents may store text as ImmutableString. This helper ensures callers
+ * always get back `string | Uint8Array | null`.
+ */
+function readDocContent(content) {
+    if (content == null)
+        return null;
+    if (typeof content === "string")
+        return content;
+    if (content instanceof Uint8Array)
+        return content;
+    // Legacy ImmutableString — convert to plain string
+    if (A.isImmutableString(content))
+        return content.toString();
+    return null;
+}
+/**
+ * Update text content on an Automerge document property inside a change
+ * callback.
+ *
+ * If the existing value is already a collaborative text string, we diff and
+ * splice for minimal CRDT operations.  If the existing value is a legacy
+ * ImmutableString we can't splice into it, so we assign the whole string
+ * which converts the field to a collaborative text CRDT going forward.
+ *
+ * @param doc  - The mutable Automerge document (inside a change callback)
+ * @param path - Property path to the text field, e.g. ["content"]
+ * @param newContent - The desired new text value
+ */
+function updateTextContent(doc, path, newContent) {
+    const target = path.reduce((obj, key) => obj?.[key], doc);
+    if (typeof target === "string") {
+        // Already a collaborative text string — diff and splice
+        spliceText(doc, path, target, newContent);
+    }
+    else {
+        // Legacy ImmutableString, undefined, or other — assign directly.
+        // This converts the field to a collaborative text CRDT.
+        let obj = doc;
+        for (let i = 0; i < path.length - 1; i++) {
+            obj = obj[path[i]];
+        }
+        obj[path[path.length - 1]] = newContent;
+    }
+}
+/**
+ * Apply a text diff between oldContent and newContent as Automerge splice
+ * operations on the given document property path.
+ *
+ * This preserves the collaborative text CRDT structure by making minimal
+ * character-level edits rather than replacing the entire string.
+ *
+ * @param doc - The Automerge document (inside a change callback)
+ * @param path - The property path to the text field, e.g. ["content"]
+ * @param oldContent - The previous text content
+ * @param newContent - The desired new text content
+ */
+function spliceText(doc, path, oldContent, newContent) {
+    if (oldContent === newContent)
+        return;
+    // Fast path: if old is empty, just insert everything
+    if (oldContent === "") {
+        A.splice(doc, path, 0, 0, newContent);
+        return;
+    }
+    // Fast path: if new is empty, just delete everything
+    if (newContent === "") {
+        A.splice(doc, path, 0, oldContent.length);
+        return;
+    }
+    const changes = diffLib.diffChars(oldContent, newContent);
+    let pos = 0;
+    for (const part of changes) {
+        if (part.removed) {
+            A.splice(doc, path, pos, part.value.length);
+            // Don't advance pos — text shifted left after deletion
+        }
+        else if (part.added) {
+            A.splice(doc, path, pos, 0, part.value);
+            pos += part.value.length;
+        }
+        else {
+            // Unchanged text — just advance the cursor
+            pos += part.value.length;
+        }
+    }
+}
+//# sourceMappingURL=text-diff.js.map

package/dist/utils/text-diff.js.map

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

package/dist/utils/trace.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Enable or disable tracing
+ */
+export declare function setTracingEnabled(enabled: boolean): void;
+/**
+ * Check if tracing is enabled
+ */
+export declare function isTracingEnabled(): boolean;
+/**
+ * Trace a span of work by outputting to console
+ * Works for both sync and async functions
+ * Only outputs if tracing is enabled
+ *
+ * Usage:
+ *   await span("operation", async () => { ... })
+ *   span("operation", () => { ... })
+ */
+export declare function span<T>(name: string, fn: () => T | Promise<T>): T | Promise<T>;
+//# sourceMappingURL=trace.d.ts.map

package/dist/utils/trace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAExD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,IAAI,CAAC,CAAC,EACpB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GACvB,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAqBhB"}

package/dist/utils/trace.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setTracingEnabled = setTracingEnabled;
+exports.isTracingEnabled = isTracingEnabled;
+exports.span = span;
+const output_1 = require("./output");
+/**
+ * Global tracing state
+ */
+let tracingEnabled = false;
+/**
+ * Enable or disable tracing
+ */
+function setTracingEnabled(enabled) {
+    tracingEnabled = enabled;
+}
+/**
+ * Check if tracing is enabled
+ */
+function isTracingEnabled() {
+    return tracingEnabled;
+}
+/**
+ * Trace a span of work by outputting to console
+ * Works for both sync and async functions
+ * Only outputs if tracing is enabled
+ *
+ * Usage:
+ *   await span("operation", async () => { ... })
+ *   span("operation", () => { ... })
+ */
+function span(name, fn) {
+    if (!tracingEnabled) {
+        return fn();
+    }
+    const start = performance.now();
+    const result = fn();
+    // Check if it's a promise (async)
+    if (result instanceof Promise) {
+        return result.then((value) => {
+            const duration = performance.now() - start;
+            output_1.out.taskLine(`${name} (${formatDuration(duration)})`, true);
+            return value;
+        });
+    }
+    // Sync case
+    const duration = performance.now() - start;
+    output_1.out.taskLine(`${name} (${formatDuration(duration)})`, true);
+    return result;
+}
+/**
+ * Format duration for display
+ */
+function formatDuration(ms) {
+    if (ms < 1) {
+        return `${ms.toFixed(2)}ms`;
+    }
+    else if (ms < 1000) {
+        return `${Math.round(ms)}ms`;
+    }
+    else if (ms < 2000) {
+        return `${(ms / 1000).toFixed(2)}s`;
+    }
+    else {
+        return `${(ms / 1000).toFixed(1)}s`;
+    }
+}
+//# sourceMappingURL=trace.js.map

package/dist/utils/trace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":";;AAUA,8CAEC;AAKD,4CAEC;AAWD,oBAwBC;AAtDD,qCAA+B;AAE/B;;GAEG;AACH,IAAI,cAAc,GAAG,KAAK,CAAC;AAE3B;;GAEG;AACH,SAAgB,iBAAiB,CAAC,OAAgB;IAChD,cAAc,GAAG,OAAO,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,IAAI,CAClB,IAAY,EACZ,EAAwB;IAExB,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,EAAE,EAAE,CAAC;IAEpB,kCAAkC;IAClC,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YAC3C,YAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,KAAK,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC5D,OAAO,KAAK,CAAC;QACf,CAAC,CAAM,CAAC;IACV,CAAC;IAED,YAAY;IACZ,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IAC3C,YAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,KAAK,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,EAAU;IAChC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;QACX,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9B,CAAC;SAAM,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;QACrB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC;IAC/B,CAAC;SAAM,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;QACrB,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IACtC,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwork",
-  "version": "2.0.0-preview.6",
+  "version": "2.0.0-preview.8",
   "description": "Bidirectional directory synchronization using Automerge CRDTs",
   "main": "dist/index.js",
   "exports": {
@@ -28,10 +28,10 @@
   ],
   "dependencies": {
     "@automerge/automerge": "^3.2.6",
-    "@automerge/automerge-repo": "2.6.0-subduction.19",
-    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.19",
-    "@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.19",
-    "@automerge/automerge-subduction": "0.12.0",
+    "@automerge/automerge-repo": "2.6.0-subduction.29",
+    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.29",
+    "@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.29",
+    "@automerge/automerge-subduction": "0.15.0",
     "@commander-js/extra-typings": "^14.0.0",
     "chalk": "^5.3.0",
     "commander": "^14.0.2",

package/dist/checkpoints.d.ts

@@ -1,41 +0,0 @@
-import { type AutomergeUrl, type DocHandle, type Repo } from "@automerge/automerge-repo";
-export type CheckpointKind = "save" | "merge";
-export type CheckpointSource = {
-    name: string;
-    url: AutomergeUrl;
-    heads: string[];
-};
-export type Checkpoint = {
-    id: string;
-    ts: number;
-    kind: CheckpointKind;
-    headsBefore: string[];
-    headsAfter: string[];
-    message?: string;
-    source?: CheckpointSource;
-};
-export type CheckpointsDoc = {
-    "@patchwork": {
-        type: "checkpoints";
-    };
-    entries: {
-        [id: string]: Checkpoint;
-    };
-};
-export declare const isCheckpointsDoc: (doc: unknown) => doc is CheckpointsDoc;
-export declare function makeCheckpointId(ts?: number): string;
-export declare function findOrCreateCheckpoints(repo: Repo, folderHandle: DocHandle<unknown>): Promise<DocHandle<CheckpointsDoc>>;
-export declare function cloneCheckpointsTo(repo: Repo, sourceFolder: DocHandle<unknown>, targetFolder: DocHandle<unknown>): Promise<AutomergeUrl | null>;
-export type AppendArgs = {
-    kind: CheckpointKind;
-    headsBefore: string[];
-    headsAfter: string[];
-    message?: string;
-    source?: CheckpointSource;
-    force?: boolean;
-};
-export declare function appendCheckpointTo(checkpoints: DocHandle<CheckpointsDoc>, args: AppendArgs): Checkpoint | null;
-export declare function listCheckpoints(doc: CheckpointsDoc): Checkpoint[];
-export declare function topoSort(entries: Checkpoint[]): Checkpoint[];
-export declare function getFolderHeads(folderHandle: DocHandle<unknown>): string[];
-//# sourceMappingURL=checkpoints.d.ts.map

package/dist/checkpoints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"checkpoints.d.ts","sourceRoot":"","sources":["../src/checkpoints.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,IAAI,EACT,MAAM,2BAA2B,CAAC;AAQnC,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9C,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,YAAY,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,cAAc,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,YAAY,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC;IACtC,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;CACtC,CAAC;AAKF,eAAO,MAAM,gBAAgB,GAAI,KAAK,OAAO,KAAG,GAAG,IAAI,cAQtD,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,EAAE,SAAa,GAAG,MAAM,CAMxD;AAED,wBAAsB,uBAAuB,CAC5C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,GAC9B,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAuBpC;AAED,wBAAsB,kBAAkB,CACvC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,EAChC,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,GAC9B,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAiB9B;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,wBAAgB,kBAAkB,CACjC,WAAW,EAAE,SAAS,CAAC,cAAc,CAAC,EACtC,IAAI,EAAE,UAAU,GACd,UAAU,GAAG,IAAI,CAqBnB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,EAAE,CAEjE;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAuD5D;AAeD,wBAAgB,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAIzE"}