pushwork 2.0.0-preview.4 → 2.0.0-preview.5

package/dist/branches.d.ts

@@ -3,7 +3,7 @@ export declare const META = "@patchwork";
 export declare const DEFAULT_BRANCH = "default";
 export type BranchesDoc = {
     "@patchwork": {
-        type: "branches";
+        type: "branches" | "package";
         title?: string;
     };
     branches: {
@@ -11,6 +11,7 @@ export type BranchesDoc = {
     };
 };
 export declare const isBranchesDoc: (doc: unknown) => doc is BranchesDoc;
+export declare function migrateLegacyBranchesType(handle: DocHandle<unknown>): boolean;
 export declare function detectDocType(doc: unknown): "branches" | "folder" | "directory" | "unknown";
 export declare function resolveEffectiveRoot(repo: Repo, rootHandle: DocHandle<unknown>, branchName: string | null): Promise<DocHandle<unknown>>;
 export declare function listBranchNames(branchesDoc: BranchesDoc): string[];

package/dist/branches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../src/branches.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,IAAI,EACT,MAAM,2BAA2B,CAAC;AAKnC,eAAO,MAAM,IAAI,eAAe,CAAC;AACjC,eAAO,MAAM,cAAc,YAAY,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACzB,YAAY,EAAE;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,QAAQ,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,OAAO,KAAG,GAAG,IAAI,WAQnD,CAAC;AAEF,wBAAgB,aAAa,CAC5B,GAAG,EAAE,OAAO,GACV,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,CAOjD;AAED,wBAAsB,oBAAoB,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAC9B,UAAU,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAgB7B;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,EAAE,CAElE;AAID,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQzE;AAED,wBAAsB,eAAe,CACpC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlE"}
+{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../src/branches.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,IAAI,EACT,MAAM,2BAA2B,CAAC;AAKnC,eAAO,MAAM,IAAI,eAAe,CAAC;AACjC,eAAO,MAAM,cAAc,YAAY,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACzB,YAAY,EAAE;QAAE,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/D,QAAQ,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,OAAO,KAAG,GAAG,IAAI,WAMnD,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,CAY7E;AAED,wBAAgB,aAAa,CAC5B,GAAG,EAAE,OAAO,GACV,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,CAQjD;AAED,wBAAsB,oBAAoB,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,EAC9B,UAAU,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAgB7B;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,EAAE,CAElE;AAID,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQzE;AAED,wBAAsB,eAAe,CACpC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlE"}

package/dist/branches.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBranchesDoc = exports.DEFAULT_BRANCH = exports.META = void 0;
+exports.migrateLegacyBranchesType = migrateLegacyBranchesType;
 exports.detectDocType = detectDocType;
 exports.resolveEffectiveRoot = resolveEffectiveRoot;
 exports.listBranchNames = listBranchNames;
@@ -50,11 +51,27 @@ const isBranchesDoc = (doc) => {
     if (!doc || typeof doc !== "object")
         return false;
     const meta = doc[exports.META];
-    return (!!meta &&
-        typeof meta === "object" &&
-        meta.type === "branches");
+    if (!meta || typeof meta !== "object")
+        return false;
+    const t = meta.type;
+    return t === "branches" || t === "package";
 };
 exports.isBranchesDoc = isBranchesDoc;
+function migrateLegacyBranchesType(handle) {
+    const doc = handle.doc();
+    if (!doc || typeof doc !== "object")
+        return false;
+    const meta = doc[exports.META];
+    if (!meta || meta.type !== "branches")
+        return false;
+    handle.change((d) => {
+        if (d?.[exports.META]?.type === "branches") {
+            d[exports.META].type = "package";
+        }
+    });
+    dlog("migrated legacy branches→package on %s", handle.url);
+    return true;
+}
 function detectDocType(doc) {
     if (!doc || typeof doc !== "object")
         return "unknown";
@@ -62,7 +79,9 @@ function detectDocType(doc) {
     if (!meta || typeof meta !== "object")
         return "unknown";
     const t = meta.type;
-    if (t === "branches" || t === "folder" || t === "directory")
+    if (t === "branches" || t === "package")
+        return "branches";
+    if (t === "folder" || t === "directory")
         return t;
     return "unknown";
 }

package/dist/branches.js.map

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

package/dist/checkpoints.d.ts

@@ -0,0 +1,41 @@
+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

@@ -0,0 +1 @@
+{"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"}

package/dist/checkpoints.js

@@ -0,0 +1,210 @@
+"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.isCheckpointsDoc = void 0;
+exports.makeCheckpointId = makeCheckpointId;
+exports.findOrCreateCheckpoints = findOrCreateCheckpoints;
+exports.cloneCheckpointsTo = cloneCheckpointsTo;
+exports.appendCheckpointTo = appendCheckpointTo;
+exports.listCheckpoints = listCheckpoints;
+exports.topoSort = topoSort;
+exports.getFolderHeads = getFolderHeads;
+const Automerge = __importStar(require("@automerge/automerge"));
+const log_js_1 = require("./log.js");
+const dlog = (0, log_js_1.log)("checkpoints");
+const META = "@patchwork";
+const TYPE = "checkpoints";
+const isCheckpointsDoc = (doc) => {
+    if (!doc || typeof doc !== "object")
+        return false;
+    const meta = doc[META];
+    return (!!meta &&
+        typeof meta === "object" &&
+        meta.type === TYPE);
+};
+exports.isCheckpointsDoc = isCheckpointsDoc;
+function makeCheckpointId(ts = Date.now()) {
+    const tsPart = ts.toString(36).padStart(9, "0");
+    const rand = Math.floor(Math.random() * 36 ** 6)
+        .toString(36)
+        .padStart(6, "0");
+    return `${tsPart}-${rand}`;
+}
+async function findOrCreateCheckpoints(repo, folderHandle) {
+    const folder = folderHandle.doc();
+    const existing = folder?.["@patchwork"]?.checkpoints;
+    if (existing) {
+        const handle = await repo.find(existing);
+        const doc = handle.doc();
+        if ((0, exports.isCheckpointsDoc)(doc))
+            return handle;
+        dlog("checkpoints url %s on folder %s is not a checkpoints doc; recreating", existing, folderHandle.url);
+    }
+    const created = repo.create({
+        "@patchwork": { type: TYPE },
+        entries: {},
+    });
+    folderHandle.change((d) => {
+        if (!d["@patchwork"])
+            d["@patchwork"] = { type: "folder" };
+        d["@patchwork"].checkpoints = created.url;
+    });
+    dlog("created checkpoints %s for folder %s", created.url, folderHandle.url);
+    return created;
+}
+async function cloneCheckpointsTo(repo, sourceFolder, targetFolder) {
+    const src = sourceFolder.doc();
+    const url = src?.["@patchwork"]?.checkpoints;
+    if (!url)
+        return null;
+    const sourceHandle = await repo.find(url);
+    const cloned = repo.clone(sourceHandle);
+    targetFolder.change((d) => {
+        if (!d["@patchwork"])
+            d["@patchwork"] = { type: "folder" };
+        d["@patchwork"].checkpoints = cloned.url;
+    });
+    dlog("cloned checkpoints %s → %s for folder %s", url, cloned.url, targetFolder.url);
+    return cloned.url;
+}
+function appendCheckpointTo(checkpoints, args) {
+    if (!args.force && headsEqual(args.headsBefore, args.headsAfter)) {
+        dlog("skip append: heads unchanged");
+        return null;
+    }
+    const ts = Date.now();
+    const id = makeCheckpointId(ts);
+    const entry = {
+        id,
+        ts,
+        kind: args.kind,
+        headsBefore: [...args.headsBefore].sort(),
+        headsAfter: [...args.headsAfter].sort(),
+    };
+    if (args.message)
+        entry.message = args.message;
+    if (args.source)
+        entry.source = args.source;
+    checkpoints.change((d) => {
+        d.entries[id] = entry;
+    });
+    dlog("appended %s (kind=%s)", id, args.kind);
+    return entry;
+}
+function listCheckpoints(doc) {
+    return Object.values(doc.entries ?? {});
+}
+function topoSort(entries) {
+    // Stable order: build a graph where parents are checkpoints whose
+    // headsAfter is a subset of this checkpoint's headsBefore. Topo-sort with
+    // ts as tiebreaker. Returns oldest-first.
+    const byHeadKey = new Map();
+    for (const e of entries) {
+        const k = headsKey(e.headsAfter);
+        const list = byHeadKey.get(k) ?? [];
+        list.push(e);
+        byHeadKey.set(k, list);
+    }
+    const parentsOf = new Map();
+    for (const e of entries) {
+        const ps = new Set();
+        // A checkpoint p is a parent of e if p.headsAfter ⊆ e.headsBefore.
+        // Approximation: any p whose headsAfter equals e.headsBefore, OR any
+        // proper subset whose union with siblings covers headsBefore. The
+        // subset case requires more work; for v1 we just match exact headsAfter
+        // → headsBefore equality and headsBefore contains-each-individual-hash.
+        const beforeSet = new Set(e.headsBefore);
+        for (const candidate of entries) {
+            if (candidate.id === e.id)
+                continue;
+            if (candidate.headsAfter.every((h) => beforeSet.has(h))) {
+                ps.add(candidate.id);
+            }
+        }
+        parentsOf.set(e.id, ps);
+    }
+    const indegree = new Map();
+    for (const e of entries)
+        indegree.set(e.id, parentsOf.get(e.id).size);
+    const ready = entries
+        .filter((e) => indegree.get(e.id) === 0)
+        .sort(byTs);
+    const out = [];
+    const seen = new Set();
+    while (ready.length) {
+        ready.sort(byTs);
+        const next = ready.shift();
+        if (seen.has(next.id))
+            continue;
+        seen.add(next.id);
+        out.push(next);
+        for (const e of entries) {
+            if (seen.has(e.id))
+                continue;
+            const ps = parentsOf.get(e.id);
+            if (ps.has(next.id)) {
+                const remaining = (indegree.get(e.id) ?? 0) - 1;
+                indegree.set(e.id, remaining);
+                if (remaining === 0)
+                    ready.push(e);
+            }
+        }
+    }
+    for (const e of entries) {
+        if (!seen.has(e.id))
+            out.push(e);
+    }
+    return out;
+}
+const byTs = (a, b) => a.ts - b.ts || a.id.localeCompare(b.id);
+function headsEqual(a, b) {
+    if (a.length !== b.length)
+        return false;
+    const set = new Set(a);
+    for (const h of b)
+        if (!set.has(h))
+            return false;
+    return true;
+}
+function headsKey(heads) {
+    return [...heads].sort().join(",");
+}
+function getFolderHeads(folderHandle) {
+    const doc = folderHandle.doc();
+    if (!doc)
+        return [];
+    return Automerge.getHeads(doc);
+}
+//# sourceMappingURL=checkpoints.js.map

package/dist/checkpoints.js.map

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

package/dist/stash.d.ts

@@ -7,12 +7,14 @@ export interface StashEntry {
 export interface Stash {
     id: number;
     name?: string;
+    branch: string | null;
     createdAt: number;
     entries: StashEntry[];
 }
 export declare function listStashes(root: string): Promise<Stash[]>;
 export declare function appendStash(root: string, args: {
     name?: string;
+    branch: string | null;
     entries: StashEntry[];
 }): Promise<Stash>;
 export declare function takeStash(root: string, selector?: string): Promise<Stash | null>;

package/dist/stash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stash.d.ts","sourceRoot":"","sources":["../src/stash.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAEzD,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,KAAK;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,UAAU,EAAE,CAAC;CACtB;AA+BD,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAIhE;AAED,wBAAsB,WAAW,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,UAAU,EAAE,CAAA;CAAE,GAC5C,OAAO,CAAC,KAAK,CAAC,CAahB;AAED,wBAAsB,SAAS,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAkBvB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAErD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEnD"}
+{"version":3,"file":"stash.d.ts","sourceRoot":"","sources":["../src/stash.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;AAEzD,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,KAAK;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,UAAU,EAAE,CAAC;CACtB;AA+BD,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAIhE;AAED,wBAAsB,WAAW,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,UAAU,EAAE,CAAA;CAAE,GACnE,OAAO,CAAC,KAAK,CAAC,CAchB;AAED,wBAAsB,SAAS,CAC9B,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAkBvB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAErD;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAEnD"}

package/dist/stash.js

@@ -80,6 +80,7 @@ async function appendStash(root, args) {
     const stash = {
         id,
         name: args.name,
+        branch: args.branch,
         createdAt: Date.now(),
         entries: args.entries,
     };

package/dist/stash.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwork",
-  "version": "2.0.0-preview.4",
+  "version": "2.0.0-preview.5",
   "description": "Bidirectional directory synchronization using Automerge CRDTs",
   "main": "dist/index.js",
   "exports": {
@@ -31,7 +31,7 @@
     "@automerge/automerge-repo": "2.6.0-subduction.15",
     "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.15",
     "@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.15",
-    "@automerge/automerge-subduction": "0.8.1",
+    "@automerge/automerge-subduction": "0.11.0",
     "@commander-js/extra-typings": "^14.0.0",
     "chalk": "^5.3.0",
     "commander": "^14.0.2",

package/dist/cli/commands.d.ts

@@ -1,71 +0,0 @@
-import { Repo } from "@automerge/automerge-repo";
-import { CloneOptions, SyncOptions, DiffOptions, LogOptions, CheckoutOptions, DirectoryConfig } from "../types";
-import { SyncEngine } from "../core";
-/**
- * Shared context that commands can use
- */
-export interface CommandContext {
-    repo: Repo;
-    syncEngine: SyncEngine;
-    config: DirectoryConfig;
-    workingDir: string;
-}
-/**
- * Shared pre-action that ensures repository and sync engine are properly initialized
- * This function always works, with or without network connectivity
- */
-export declare function setupCommandContext(workingDir?: string, customSyncServer?: string, customStorageId?: string, enableNetwork?: boolean): Promise<CommandContext>;
-/**
- * Safely shutdown a repository with proper error handling
- */
-export declare function safeRepoShutdown(repo: Repo, context?: string): Promise<void>;
-/**
- * Common progress message helpers
- */
-export declare const ProgressMessages: {
-    directoryFound: () => void;
-    configLoaded: () => void;
-    repoConnected: () => void;
-    syncServer: (server: string) => void;
-    storageId: (id: string) => void;
-    rootUrl: (url: string) => void;
-    changesWritten: () => void;
-    syncCompleted: (duration: number) => void;
-    directoryStructureCreated: () => void;
-    configSaved: () => void;
-    repoCreated: () => void;
-};
-/**
- * Initialize sync in a directory
- */
-export declare function init(targetPath: string, syncServer?: string, syncServerStorageId?: string): Promise<void>;
-/**
- * Run bidirectional sync
- */
-export declare function sync(options: SyncOptions): Promise<void>;
-/**
- * Show differences between local and remote
- */
-export declare function diff(targetPath: string | undefined, options: DiffOptions): Promise<void>;
-/**
- * Show sync status
- */
-export declare function status(): Promise<void>;
-/**
- * Show sync history
- */
-export declare function log(targetPath: string | undefined, options: LogOptions): Promise<void>;
-/**
- * Checkout/restore from previous sync
- */
-export declare function checkout(syncId: string, targetPath: string | undefined, options: CheckoutOptions): Promise<void>;
-/**
- * Clone an existing synced directory from an AutomergeUrl
- */
-export declare function clone(rootUrl: string, targetPath: string, options: CloneOptions): Promise<void>;
-/**
- * Get the root URL for the current pushwork repository
- */
-export declare function url(targetPath?: string): Promise<void>;
-export declare function commit(targetPath: string, dryRun?: boolean): Promise<void>;
-//# sourceMappingURL=commands.d.ts.map

package/dist/cli/commands.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAA2B,MAAM,2BAA2B,CAAC;AAI1E,OAAO,EAEL,YAAY,EACZ,WAAW,EACX,WAAW,EACX,UAAU,EACV,eAAe,EACf,eAAe,EAEhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,GAAE,MAAsB,EAClC,gBAAgB,CAAC,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,OAAc,GAC5B,OAAO,CAAC,cAAc,CAAC,CAqCzB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;yBAON,MAAM;oBAEX,MAAM;mBACP,MAAM;;8BAKK,MAAM;;;;CAOjC,CAAC;AA+DF;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC,CA6Hf;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgM9D;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,oBAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED;;GAEG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CA6H5C;AAED;;GAEG;AACH,wBAAsB,GAAG,CACvB,UAAU,oBAAM,EAChB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,oBAAM,EAChB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;GAEG;AACH,wBAAsB,KAAK,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Hf;AAED;;GAEG;AACH,wBAAsB,GAAG,CAAC,UAAU,SAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCzD;AAED,wBAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAgEf"}