@ddtcorex/dsh-maestro-memory 1.0.1

package/lib/sync/merge.js

@@ -0,0 +1,159 @@
+/**
+ * merge.ts — union merge by id, never drops either version.
+ * Pure functions, no I/O.
+ */
+const MEMORY_ID_RE = /^\[id:\s*([0-9a-f]{8})\]\s*/i;
+function extractMemoryId(entry) {
+    const m = MEMORY_ID_RE.exec(String(entry));
+    return m ? m[1].toLowerCase() : null;
+}
+function normalizeEntry(entry) {
+    return String(entry).trim();
+}
+function contentHash(entry) {
+    // strip id prefix for comparison of body? But for modifiedBoth we want body difference
+    // Compare full stripped id content; if id same but body differs => conflict
+    const withoutId = String(entry).replace(MEMORY_ID_RE, '').trim();
+    return withoutId;
+}
+/**
+ * Parse entries into map id => entry. Entries without id are assigned a synthetic
+ * id derived from content hash (for safety) but flagged as missing.
+ */
+export function mapById(entries) {
+    const m = new Map();
+    for (const e of entries) {
+        const id = extractMemoryId(e);
+        if (id) {
+            // keep first occurrence; duplicates by id should not happen but last wins
+            if (!m.has(id))
+                m.set(id, e);
+        }
+    }
+    return m;
+}
+export function idsOf(entries) {
+    const s = new Set();
+    for (const e of entries) {
+        const id = extractMemoryId(e);
+        if (id)
+            s.add(id);
+    }
+    return s;
+}
+/**
+ * Union merge for memory-style entries (KEY, MEMORY, archive).
+ * - local + remote entries with distinct ids => union (both present)
+ * - same id, same content => one entry
+ * - same id, different content => conflict (neither applied, keep local)
+ */
+export function mergeMemoryEntries(opts) {
+    const { track, local, remote, baseIds } = opts;
+    const localMap = mapById(local);
+    const remoteMap = mapById(remote);
+    const base = baseIds ?? new Set();
+    const localIds = new Set(localMap.keys());
+    const remoteIds = new Set(remoteMap.keys());
+    const allIds = new Set([...localIds, ...remoteIds]);
+    const merged = [];
+    const conflicts = [];
+    const addedLocal = [];
+    const addedRemote = [];
+    for (const id of allIds) {
+        const hasLocal = localMap.has(id);
+        const hasRemote = remoteMap.has(id);
+        const localEntry = localMap.get(id) ?? null;
+        const remoteEntry = remoteMap.get(id) ?? null;
+        if (hasLocal && !hasRemote) {
+            // local only
+            if (base.has(id)) {
+                // deletedRemote? base had it, remote deleted -> conflict if local modified?
+                // per spec: delete vs modify => conflict, delete vs delete => absent
+                // Our simple rule: if base has id and remote missing, but local present and content differs from base? we don't have base content, so treat as remote deletion -> keep local but flag? For MVP, keep local.
+                merged.push(localEntry);
+            }
+            else {
+                // addedLocal
+                addedLocal.push(id);
+                merged.push(localEntry);
+            }
+            continue;
+        }
+        if (!hasLocal && hasRemote) {
+            if (base.has(id)) {
+                // deletedLocal vs remote present => conflict? keep remote? per spec conflict
+                // For MVP, we consider this addedRemote if not in base, else conflict -> keep remote but record conflict? Simpler add.
+                if (localIds.has(id)) {
+                    // unreachable
+                }
+                // If base had it and local deleted -> conflict not auto delete. We treat as conflict.
+                // Check if local deleted intentionally: we flag conflict
+                conflicts.push({ id, track, localEntry: null, remoteEntry, reason: 'deletedLocal vs modifiedRemote' });
+                // do not auto-merge; keep local deletion (i.e., not in merged) — but per never-drop, we should keep remote as conflict.
+                // For now, push remote to merged but also mark conflict, so union still contains remote? Spec says delete not applied when other side modified => conflict.
+                // We'll keep remote out of merged until resolve, to avoid auto-drop of delete.
+                // Decision: do not push to merged, leave conflict.
+                continue;
+            }
+            else {
+                addedRemote.push(id);
+                merged.push(remoteEntry);
+            }
+            continue;
+        }
+        if (hasLocal && hasRemote) {
+            const l = localEntry;
+            const r = remoteEntry;
+            if (normalizeEntry(l) === normalizeEntry(r)) {
+                merged.push(l);
+            }
+            else if (contentHash(l) === contentHash(r)) {
+                // ids same, content same after stripping id? Actually already compared normalized; if equal after stripping id they are same body
+                merged.push(l);
+            }
+            else {
+                // same id, different body => conflict
+                conflicts.push({ id, track, localEntry: l, remoteEntry: r, reason: 'modifiedBoth' });
+                // keep local in merged, remote not auto-applied
+                merged.push(l);
+            }
+        }
+    }
+    // Also handle local entries without id (legacy) — they are not in map; append them verbatim to merged if not duplicated
+    for (const e of local) {
+        if (!extractMemoryId(e)) {
+            if (!merged.includes(e))
+                merged.push(e);
+        }
+    }
+    for (const e of remote) {
+        if (!extractMemoryId(e) && !merged.includes(e)) {
+            // remote entry without id — treat as addedRemote but can't dedupe; add if not duplicate body
+            const body = contentHash(e);
+            const exists = merged.some((m) => contentHash(m) === body);
+            if (!exists) {
+                merged.push(e);
+                if (!extractMemoryId(e)) {
+                    // synthetic id absent, still count as added
+                }
+            }
+        }
+    }
+    return { merged, conflicts, addedLocal, addedRemote };
+}
+// Todo merge: same id logic but todos are already stamped with id; reuse same function with track='TODOS'
+export function mergeTodoEntries(opts) {
+    // Todos use same id regex: \[id: xxxxxxxx\]
+    // But todo entries are multiline: first line contains id; our extract works on full entry (first line)
+    return mergeMemoryEntries({ track: 'TODOS', local: opts.local, remote: opts.remote, baseIds: opts.baseIds });
+}
+// Helpers for sync service: compute ids snapshot for meta
+export function snapshotIds(entriesByTrack) {
+    const out = {};
+    for (const [track, entries] of Object.entries(entriesByTrack)) {
+        const ids = [...idsOf(entries)].sort();
+        out[track] = ids;
+    }
+    return out;
+}
+//# sourceMappingURL=merge.js.map

package/lib/sync/merge.js.map

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

package/lib/sync/service.d.ts

@@ -0,0 +1,70 @@
+import { SyncMeta } from './config.ts';
+import type { GitAdapter } from './git.ts';
+export declare class SyncService {
+    private readonly memoryDir;
+    private readonly git;
+    constructor(memoryDir?: string | null, git?: GitAdapter);
+    private root;
+    private hashFor;
+    enable(cwd: string, remoteUrl: string, branch?: string): {
+        ok: true;
+        hash: string;
+    } | {
+        ok: false;
+        error: string;
+    };
+    disable(cwd: string): {
+        ok: true;
+    } | {
+        ok: false;
+        error: string;
+    };
+    isEnabled(cwd: string): boolean;
+    status(cwd: string, reveal?: boolean): {
+        enabled: boolean;
+        branch?: string;
+        remoteUrl?: string;
+        remoteRedacted?: string;
+        lastSync?: SyncMeta | null;
+        conflicts: any[];
+    };
+    listConflicts(cwd: string): any[];
+    private writeConflicts;
+    private appendConflict;
+    private localFiles;
+    private writeLocalFiles;
+    fetch(cwd: string): Promise<{
+        ok: true;
+        conflicts: any[];
+        remoteFiles: Record<string, string>;
+        status: string;
+    } | {
+        ok: false;
+        error: string;
+    }>;
+    push(cwd: string, message?: string): Promise<{
+        ok: true;
+        pushed: boolean;
+        conflicts: any[];
+    } | {
+        ok: false;
+        error: string;
+        conflicts?: any[];
+    }>;
+    pull(cwd: string): Promise<{
+        ok: true;
+        merged: boolean;
+        conflicts: any[];
+    } | {
+        ok: false;
+        error: string;
+        conflicts?: any[];
+    }>;
+    resolve(cwd: string, id: string, choice: 'local' | 'remote' | 'both'): {
+        ok: true;
+    } | {
+        ok: false;
+        error: string;
+    };
+}
+//# sourceMappingURL=service.d.ts.map

package/lib/sync/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/host/sync/service.ts"],"names":[],"mappings":"AAaA,OAAO,EAA0F,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE9H,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AA0E1C,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG;gBADH,SAAS,GAAE,MAAM,GAAG,IAAW,EAC/B,GAAG,GAAE,UAAiC;IAGzD,OAAO,CAAC,IAAI;IAEZ,OAAO,CAAC,OAAO;IAKf,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAsBlH,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,EAAE,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAOjE,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAQ/B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,GAAG,EAAE,CAAA;KAAE;IAoBrK,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE;IAUjC,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,eAAe;IA4BjB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,SAAS,EAAE,GAAG,EAAE,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IA8C/I,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,CAAC;IA0E/I,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAA;KAAE,CAAC;IAiFnI,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG;QAAE,EAAE,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;CA+DnH"}