@remnic/cli 9.44.0 → 9.45.1

package/dist/index.js

@@ -243,9 +243,12 @@ import * as fs3 from "fs";
 import { createHash as createHash2 } from "crypto";
 import * as path2 from "path";
 import {
+  CONVERGE_CONFLICT_POLICIES,
+  DEFAULT_CONVERGE_CONFLICT_POLICY,
   parseConfig as parseConfig2,
   buildOfflineSyncSnapshotFromBase,
   OFFLINE_SYNC_FILE_CONTENT_MAX_CHUNK_BYTES,
+  OFFLINE_SYNC_CHANGESET_FORMAT,
   OFFLINE_SYNC_FILE_CONTENT_TRANSFER_CHUNK_BYTES as OFFLINE_SYNC_FILE_CONTENT_TRANSFER_CHUNK_BYTES2,
   applyOfflineSyncFileContentChunk
 } from "@remnic/core";
@@ -259,6 +262,10 @@ import {
   readConvergeCursor,
   writeConvergeCursor
 } from "@remnic/core/reconcile/cursor.js";
+import {
+  buildReconcileManifest,
+  collapseActiveFactDuplicates
+} from "@remnic/core/reconcile/manifest.js";
 
 // src/offline-storage-io.ts
 import { mkdtemp, readdir, lstat, rm } from "fs/promises";
@@ -762,6 +769,45 @@ async function postPeerConvergenceComplete(peerUrl, namespaces, token, fetchImpl
   }
   return false;
 }
+async function postPeerFileDeletion(peerUrl, namespace, filePath, baseSha256, token, fetchImpl = globalThis.fetch) {
+  const base = withoutTrailingSlashes(peerUrl);
+  const routes = ["/remnic/v1/offline-sync/apply", "/engram/v1/offline-sync/apply"];
+  const headers = {
+    "content-type": "application/json",
+    ...token ? { authorization: `Bearer ${token}` } : {}
+  };
+  let previousAttemptFailed = false;
+  for (const route of routes) {
+    try {
+      const response = await fetchImpl(`${base}${route}`, {
+        method: "POST",
+        headers,
+        body: JSON.stringify({
+          namespace,
+          changeset: {
+            format: OFFLINE_SYNC_CHANGESET_FORMAT,
+            schemaVersion: 1,
+            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            sourceId: "remnic-converge",
+            includeTranscripts: false,
+            changes: [{ type: "delete", path: filePath, baseSha256 }]
+          }
+        })
+      });
+      if (!response.ok) throw new Error(`offline apply request failed: ${response.status}`);
+      const result = await response.json().catch(() => null);
+      if (!result || typeof result !== "object" || !("appliedDeletes" in result) || typeof result.appliedDeletes !== "number" || !("skipped" in result) || typeof result.skipped !== "number" || !("conflicts" in result) || !Array.isArray(result.conflicts) || result.conflicts.length > 0) {
+        return false;
+      }
+      if (result.appliedDeletes === 1) return "applied";
+      if (result.skipped === 1) return previousAttemptFailed ? "applied" : "skipped";
+      return false;
+    } catch {
+      previousAttemptFailed = true;
+    }
+  }
+  return false;
+}
 async function computeConvergePlan(options = {}) {
   const baseMap = /* @__PURE__ */ new Map();
   const namespacesToPlan = /* @__PURE__ */ new Set();
@@ -769,6 +815,10 @@ async function computeConvergePlan(options = {}) {
   const localTombstones = /* @__PURE__ */ new Map();
   const peerMap = /* @__PURE__ */ new Map();
   const peerTombstones = /* @__PURE__ */ new Map();
+  const localDeletionMtimeMs = /* @__PURE__ */ new Map();
+  const peerDeletionMtimeMs = /* @__PURE__ */ new Map();
+  const localManifests = /* @__PURE__ */ new Map();
+  const peerManifests = /* @__PURE__ */ new Map();
   if (options.baseFilesByNamespace) {
     for (const [ns, files] of options.baseFilesByNamespace) {
       namespacesToPlan.add(ns);
@@ -786,6 +836,12 @@ async function computeConvergePlan(options = {}) {
       localTombstones.set(ns, new Set(tombstones));
     }
   }
+  if (options.localDeletionMtimeMsByNamespace) {
+    for (const [ns, mtimes] of options.localDeletionMtimeMsByNamespace) {
+      namespacesToPlan.add(ns);
+      localDeletionMtimeMs.set(ns, mtimes);
+    }
+  }
   if (options.peerFilesByNamespace) {
     for (const [ns, files] of options.peerFilesByNamespace) {
       namespacesToPlan.add(ns);
@@ -797,6 +853,12 @@ async function computeConvergePlan(options = {}) {
       peerTombstones.set(ns, new Set(tombstones));
     }
   }
+  if (options.peerDeletionMtimeMsByNamespace) {
+    for (const [ns, mtimes] of options.peerDeletionMtimeMsByNamespace) {
+      namespacesToPlan.add(ns);
+      peerDeletionMtimeMs.set(ns, mtimes);
+    }
+  }
   let config = options.config;
   if (!config) {
     try {
@@ -826,6 +888,26 @@ async function computeConvergePlan(options = {}) {
           bytes: record.bytes
         }));
         localMap.set(ns, files);
+        try {
+          const io = await createOfflineStorageIo(rootInfo.rootDir);
+          localManifests.set(
+            ns,
+            await buildReconcileManifest({
+              files,
+              readFile: async (file) => {
+                const readFile2 = io.readFile;
+                if (!readFile2) throw new Error("offline storage cannot read reconciliation manifest files");
+                return await readFile2({
+                  root: rootInfo.rootDir,
+                  path: file.path,
+                  filePath: path2.join(rootInfo.rootDir, file.path)
+                });
+              }
+            })
+          );
+        } catch {
+          localManifests.delete(ns);
+        }
         const tombstones = await readLocalTombstones(rootInfo.rootDir);
         localTombstones.set(ns, tombstones);
       } catch {
@@ -833,7 +915,8 @@ async function computeConvergePlan(options = {}) {
       }
     }
   }
-  if (!options.peerFilesByNamespace && options.peerUrl) {
+  const peerUrl = options.peerUrl;
+  if (!options.peerFilesByNamespace && peerUrl) {
     let resolvedToken;
     if (options.peerToken) {
       try {
@@ -846,9 +929,23 @@ async function computeConvergePlan(options = {}) {
     }
     const fetchFn = options.fetchImpl ?? globalThis.fetch;
     for (const ns of namespacesToPlan) {
-      const peerData = await fetchPeerSnapshot(options.peerUrl, ns, resolvedToken, fetchFn);
+      const peerData = await fetchPeerSnapshot(peerUrl, ns, resolvedToken, fetchFn);
       peerMap.set(ns, peerData.files);
       peerTombstones.set(ns, peerData.tombstones);
+      peerManifests.set(
+        ns,
+        await buildReconcileManifest({
+          files: peerData.files,
+          cachedFiles: localManifests.get(ns)?.files,
+          readFile: async (file) => {
+            const remote = await fetchPeerFileContent(peerUrl, ns, file.path, resolvedToken, fetchFn);
+            if (!remote || remote.sha256 !== file.sha256) {
+              throw new Error(`failed to read peer reconciliation manifest file: ${file.path}`);
+            }
+            return remote.content;
+          }
+        })
+      );
     }
   }
   const memoryDir = options.cursorDir ?? config?.memoryDir;
@@ -863,19 +960,28 @@ async function computeConvergePlan(options = {}) {
   }
   const inputs = [];
   for (const ns of [...namespacesToPlan].sort()) {
+    const baseFiles = baseMap.get(ns);
+    const localFiles = localMap.get(ns) ?? [];
+    const peerFiles = peerMap.get(ns) ?? [];
+    const localDeletions = new Map(localDeletionMtimeMs.get(ns) ?? []);
+    const peerDeletions = new Map(peerDeletionMtimeMs.get(ns) ?? []);
     inputs.push({
       namespace: ns,
-      local: localMap.get(ns) ?? [],
-      peer: peerMap.get(ns) ?? [],
-      base: baseMap.get(ns),
+      local: localFiles,
+      peer: peerFiles,
+      base: baseFiles,
+      localDeletionMtimeMs: localDeletions,
+      peerDeletionMtimeMs: peerDeletions,
       tombstonedFileSha256: localTombstones.get(ns) ?? [],
       peerTombstonedFileSha256: peerTombstones.get(ns) ?? []
     });
   }
-  return planReconciliation(inputs, { conflictPolicy: options.conflictPolicy });
+  const conflictPolicy = options.conflictPolicy ?? config?.converge.conflictPolicy ?? DEFAULT_CONVERGE_CONFLICT_POLICY;
+  const plan = planReconciliation(inputs, { conflictPolicy });
+  return collapseActiveFactDuplicates(plan, localManifests, peerManifests);
 }
 async function executeConvergeApply(options = {}) {
-  const conflictPolicy = options.conflictPolicy ?? "manual";
+  const conflictPolicy = options.conflictPolicy ?? options.config?.converge.conflictPolicy ?? DEFAULT_CONVERGE_CONFLICT_POLICY;
   const plan = await computeConvergePlan({ ...options, conflictPolicy });
   if (plan.converged && !options.dryRun) {
     await updateCursorsForPlan(plan, options);
@@ -888,7 +994,7 @@ async function executeConvergeApply(options = {}) {
     };
   }
   const unresolvedCount = plan.byNamespace.reduce((acc, report) => acc + report.unresolved, 0);
-  if (unresolvedCount > 0 && conflictPolicy === "manual") {
+  if (unresolvedCount > 0) {
     return {
       converged: false,
       status: "stopped_unresolved_conflicts",
@@ -966,12 +1072,9 @@ async function executeConvergeApply(options = {}) {
       transferType = "suppress";
     } else if (entry.action === "conflict") {
       if (entry.resolution === "peer-wins") {
-        transferType = "pull";
+        transferType = entry.peerSha256 ? "pull" : "delete-local";
       } else if (entry.resolution === "local-wins") {
-        transferType = "push";
-      } else if (entry.resolution === "supersede-link") {
-        if (entry.newerSide === "peer") transferType = "pull";
-        else if (entry.newerSide === "local") transferType = "push";
+        transferType = entry.localSha256 ? "push" : "delete-peer";
       }
     }
     if (transferType === "pull") {
@@ -1116,6 +1219,56 @@ async function executeConvergeApply(options = {}) {
       } else {
         actualTransfers.failed += 1;
       }
+    } else if (transferType === "delete-local") {
+      let deleted = false;
+      const bufferedFiles = options.localFileBuffers?.get(entry.namespace);
+      if (options.localFileBuffers) {
+        const current = bufferedFiles?.get(entry.path);
+        if (current && entry.localSha256 && createHash2("sha256").update(current).digest("hex") === entry.localSha256) {
+          bufferedFiles.delete(entry.path);
+          deleted = true;
+        }
+      } else {
+        const rootDir = rootMap.get(entry.namespace);
+        if (rootDir && entry.localSha256) {
+          try {
+            const io = await createOfflineStorageIo(rootDir);
+            const filePath = path2.join(rootDir, entry.path);
+            const current = await io.readFileDigest({ root: rootDir, path: entry.path, filePath });
+            if (current.sha256 === entry.localSha256) {
+              await io.deleteFile({ root: rootDir, path: entry.path, filePath });
+              deleted = true;
+            }
+          } catch {
+            deleted = false;
+          }
+        }
+      }
+      if (deleted) actualTransfers.conflictsResolved += 1;
+      else actualTransfers.failed += 1;
+    } else if (transferType === "delete-peer") {
+      let deleted = false;
+      const bufferedFiles = options.peerFileBuffers?.get(entry.namespace);
+      if (options.peerFileBuffers) {
+        const current = bufferedFiles?.get(entry.path);
+        if (current && entry.peerSha256 && createHash2("sha256").update(current).digest("hex") === entry.peerSha256) {
+          bufferedFiles.delete(entry.path);
+          deleted = true;
+        }
+      } else if (options.peerUrl && entry.peerSha256) {
+        const deletionResult = await postPeerFileDeletion(
+          options.peerUrl,
+          entry.namespace,
+          entry.path,
+          entry.peerSha256,
+          resolvedToken,
+          fetchFn
+        );
+        deleted = Boolean(deletionResult);
+        if (deletionResult === "applied") peerMutatedNamespaces.add(entry.namespace);
+      }
+      if (deleted) actualTransfers.conflictsResolved += 1;
+      else actualTransfers.failed += 1;
     } else if (transferType === "suppress") {
       actualTransfers.suppressed += 1;
     }
@@ -1156,10 +1309,9 @@ async function updateCursorsForPlan(plan, options) {
   const namespaces = new Set(plan.byNamespace.map((n) => n.namespace));
   for (const ns of namespaces) {
     const cursorPath = defaultConvergeCursorPath(memoryDir, peerUrl, ns);
-    const nsEntries = plan.entries.filter((e) => e.namespace === ns);
-    const baseFiles = nsEntries.map((e) => ({
-      path: e.path,
-      sha256: e.localSha256 ?? e.peerSha256 ?? "unknown"
+    const baseFiles = plan.entries.filter((entry) => entry.namespace === ns && entry.reason !== "semantic_duplicate" && !(entry.reason === "local_modified_peer_deleted" && entry.resolution === "peer-wins") && !(entry.reason === "local_deleted_peer_modified" && entry.resolution === "local-wins")).map((entry) => ({
+      path: entry.path,
+      sha256: entry.localSha256 ?? entry.peerSha256 ?? "unknown"
     }));
     const cursorState = {
       version: 1,
@@ -1209,7 +1361,7 @@ function formatConvergeApplyReport(result) {
   lines.push(formatConvergeReport(result.plan));
   return lines.join("\n");
 }
-async function cmdConverge(action, rest, json) {
+async function cmdConverge(action, rest, json, config = parseConfig2({})) {
   if (action === "help" || action === "--help" || action === "-h" || rest.includes("--help") || rest.includes("-h")) {
     console.log(`Usage: remnic converge <plan|apply> [options]
 
@@ -1221,7 +1373,8 @@ Options:
   --peer <url>      Peer server URL (or --remote-url / --remote)
   --token <token>   Bearer token or SecretRef for peer authentication
   --conflict-policy <policy>
-                    Conflict resolution policy (manual|newest-wins|keep-both)
+                    Policy override (newest-wins|manual)
+                    Default: converge.conflictPolicy (newest-wins)
   --dry-run         Simulate transfers without mutating disk or remote peer
   --json            Output detailed JSON plan report
 `);
@@ -1247,16 +1400,19 @@ Options:
       i += 1;
     } else if (arg === "--dry-run") {
       dryRun = true;
-    } else if (arg === "--conflict-policy" && rest[i + 1]) {
-      const pol = rest[i + 1];
-      if (pol === "manual" || pol === "newest-wins" || pol === "keep-both") {
-        conflictPolicy = pol;
+    } else if (arg === "--conflict-policy") {
+      const policy = rest[i + 1];
+      if (typeof policy !== "string" || !CONVERGE_CONFLICT_POLICIES.includes(policy)) {
+        throw new Error(
+          `converge: --conflict-policy must be one of ${CONVERGE_CONFLICT_POLICIES.join(", ")}`
+        );
       }
+      conflictPolicy = policy;
       i += 1;
     }
   }
   if (action === "plan") {
-    const plan = await computeConvergePlan({ peerUrl, peerToken, conflictPolicy });
+    const plan = await computeConvergePlan({ config, peerUrl, peerToken, conflictPolicy });
     if (json) {
       console.log(JSON.stringify(plan, null, 2));
     } else {
@@ -1268,7 +1424,8 @@ Options:
     peerUrl,
     peerToken,
     dryRun,
-    conflictPolicy
+    conflictPolicy,
+    config
   });
   if (json) {
     console.log(JSON.stringify(result, null, 2));
@@ -14385,7 +14542,15 @@ Options:
     case "converge": {
       const action = rest[0] ?? "plan";
       const json = rest.includes("--json");
-      await cmdConverge(action, rest.slice(1), json);
+      const args = rest.slice(1);
+      if (action === "help" || action === "--help" || action === "-h" || args.includes("--help") || args.includes("-h")) {
+        await cmdConverge(action, args, json);
+        break;
+      }
+      const configPath = resolveConfigPath();
+      const raw = fs12.existsSync(configPath) ? JSON.parse(fs12.readFileSync(configPath, "utf8")) : {};
+      const config = parseConfig5(resolveRemnicConfigRecord4(raw));
+      await cmdConverge(action, args, json, config);
       break;
     }
     case "oauth": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnic/cli",
-  "version": "9.44.0",
+  "version": "9.45.1",
   "description": "CLI for Remnic memory — init, query, doctor, daemon management",
   "type": "module",
   "main": "dist/index.js",
@@ -26,24 +26,24 @@
   },
   "dependencies": {
     "yaml": "^2.4.2",
-    "@remnic/plugin-pi": "^9.44.0",
-    "@remnic/core": "^9.44.0",
-    "@remnic/server": "^9.44.0"
+    "@remnic/server": "^9.45.1",
+    "@remnic/plugin-pi": "^9.45.1",
+    "@remnic/core": "^9.45.1"
   },
   "peerDependencies": {
-    "@remnic/bench": "^9.44.0",
-    "@remnic/export-weclone": "^9.44.0",
-    "@remnic/import-weclone": "^9.44.0",
-    "@remnic/import-chatgpt": "^9.44.0",
-    "@remnic/import-claude": "^9.44.0",
-    "@remnic/import-gemini": "^9.44.0",
-    "@remnic/import-lossless-claw": "^9.44.0",
-    "@remnic/import-mem0": "^9.44.0",
-    "@remnic/import-supermemory": "^9.44.0",
-    "@remnic/connector-limitless": "^9.44.0",
-    "@remnic/connector-bee": "^9.44.0",
-    "@remnic/connector-omi": "^9.44.0",
-    "@remnic/capture-audio": "^9.44.0"
+    "@remnic/bench": "^9.45.1",
+    "@remnic/export-weclone": "^9.45.1",
+    "@remnic/import-weclone": "^9.45.1",
+    "@remnic/import-chatgpt": "^9.45.1",
+    "@remnic/import-claude": "^9.45.1",
+    "@remnic/import-gemini": "^9.45.1",
+    "@remnic/import-lossless-claw": "^9.45.1",
+    "@remnic/import-mem0": "^9.45.1",
+    "@remnic/import-supermemory": "^9.45.1",
+    "@remnic/connector-limitless": "^9.45.1",
+    "@remnic/connector-bee": "^9.45.1",
+    "@remnic/connector-omi": "^9.45.1",
+    "@remnic/capture-audio": "^9.45.1"
   },
   "peerDependenciesMeta": {
     "@remnic/bench": {
@@ -89,18 +89,18 @@
   "devDependencies": {
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "@remnic/bench": "9.44.0",
-    "@remnic/export-weclone": "9.44.0",
-    "@remnic/import-weclone": "9.44.0",
-    "@remnic/import-chatgpt": "9.44.0",
-    "@remnic/import-gemini": "9.44.0",
-    "@remnic/import-mem0": "9.44.0",
-    "@remnic/import-supermemory": "9.44.0",
-    "@remnic/import-lossless-claw": "9.44.0",
-    "@remnic/connector-limitless": "9.44.0",
-    "@remnic/connector-bee": "9.44.0",
-    "@remnic/import-claude": "9.44.0",
-    "@remnic/connector-omi": "9.44.0"
+    "@remnic/bench": "9.45.1",
+    "@remnic/export-weclone": "9.45.1",
+    "@remnic/import-weclone": "9.45.1",
+    "@remnic/import-chatgpt": "9.45.1",
+    "@remnic/import-claude": "9.45.1",
+    "@remnic/import-mem0": "9.45.1",
+    "@remnic/import-gemini": "9.45.1",
+    "@remnic/import-lossless-claw": "9.45.1",
+    "@remnic/import-supermemory": "9.45.1",
+    "@remnic/connector-bee": "9.45.1",
+    "@remnic/connector-limitless": "9.45.1",
+    "@remnic/connector-omi": "9.45.1"
   },
   "license": "MIT",
   "repository": {