@remnic/cli 9.43.0 → 9.45.0

package/dist/index.js

@@ -259,6 +259,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";
@@ -680,12 +684,18 @@ async function fetchPeerFileContent(peerUrl, namespace, filePath, token, fetchIm
   }
   return null;
 }
+function withoutTrailingSlashes(value) {
+  let end = value.length;
+  while (end > 0 && value.charCodeAt(end - 1) === 47) end -= 1;
+  return value.slice(0, end);
+}
 async function postPeerFileContent(peerUrl, namespace, filePath, content, metadata, token, fetchImpl = globalThis.fetch) {
-  const base = peerUrl.replace(/\/+$/, "");
+  const base = withoutTrailingSlashes(peerUrl);
   const routes = [
     `/remnic/v1/offline-sync/apply-file-content?namespace=${encodeURIComponent(namespace)}`,
     `/engram/v1/offline-sync/apply-file-content?namespace=${encodeURIComponent(namespace)}`
   ];
+  let previousAttemptFailed = false;
   for (const route of routes) {
     try {
       let offset = 0;
@@ -717,7 +727,9 @@ async function postPeerFileContent(peerUrl, namespace, filePath, content, metada
           return false;
         }
         if (result.done) {
-          return result.skipped || result.applied && offset + chunk.length === content.length;
+          if (result.skipped) return previousAttemptFailed ? "applied" : "skipped";
+          if (result.applied && offset + chunk.length === content.length) return "applied";
+          return false;
         }
         if (result.applied || result.skipped || chunk.length === 0) {
           return false;
@@ -726,6 +738,30 @@ async function postPeerFileContent(peerUrl, namespace, filePath, content, metada
       } while (offset < content.length);
       return false;
     } catch {
+      previousAttemptFailed = true;
+    }
+  }
+  return false;
+}
+async function postPeerConvergenceComplete(peerUrl, namespaces, token, fetchImpl = globalThis.fetch) {
+  const base = withoutTrailingSlashes(peerUrl);
+  const query = namespaces.map((namespace) => `namespace=${encodeURIComponent(namespace)}`).join("&");
+  const routes = [
+    "/remnic/v1/offline-sync/convergence-complete",
+    "/engram/v1/offline-sync/convergence-complete"
+  ];
+  for (const route of routes) {
+    const response = await fetchImpl(`${base}${route}?${query}`, {
+      method: "POST",
+      headers: {
+        "x-remnic-source-id": encodeURIComponent("remnic-converge"),
+        ...token ? { authorization: `Bearer ${token}` } : {}
+      }
+    }).catch(() => null);
+    if (!response?.ok) continue;
+    const result = await response.json().catch(() => null);
+    if (result && typeof result === "object" && "namespaces" in result && Array.isArray(result.namespaces) && result.namespaces.length === namespaces.length && result.namespaces.every((namespace, index) => namespace === namespaces[index]) && "refreshed" in result && result.refreshed === true) {
+      return true;
     }
   }
   return false;
@@ -737,6 +773,8 @@ async function computeConvergePlan(options = {}) {
   const localTombstones = /* @__PURE__ */ new Map();
   const peerMap = /* @__PURE__ */ new Map();
   const peerTombstones = /* @__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);
@@ -794,6 +832,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 {
@@ -801,7 +859,8 @@ async function computeConvergePlan(options = {}) {
       }
     }
   }
-  if (!options.peerFilesByNamespace && options.peerUrl) {
+  const peerUrl = options.peerUrl;
+  if (!options.peerFilesByNamespace && peerUrl) {
     let resolvedToken;
     if (options.peerToken) {
       try {
@@ -814,9 +873,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;
@@ -840,7 +913,8 @@ async function computeConvergePlan(options = {}) {
       peerTombstonedFileSha256: peerTombstones.get(ns) ?? []
     });
   }
-  return planReconciliation(inputs, { conflictPolicy: options.conflictPolicy });
+  const plan = planReconciliation(inputs, { conflictPolicy: options.conflictPolicy });
+  return collapseActiveFactDuplicates(plan, localManifests, peerManifests);
 }
 async function executeConvergeApply(options = {}) {
   const conflictPolicy = options.conflictPolicy ?? "manual";
@@ -894,6 +968,7 @@ async function executeConvergeApply(options = {}) {
     suppressed: 0,
     failed: 0
   };
+  const peerMutatedNamespaces = /* @__PURE__ */ new Set();
   let resolvedToken;
   if (options.peerToken) {
     try {
@@ -1057,7 +1132,7 @@ async function executeConvergeApply(options = {}) {
           else actualTransfers.pushed += 1;
         } else if (options.peerUrl && entry.localSha256) {
           const expectedPeerSha256 = entry.action === "conflict" ? entry.peerSha256 : entry.baseSha256;
-          const ok = await postPeerFileContent(
+          const applied = await postPeerFileContent(
             options.peerUrl,
             entry.namespace,
             entry.path,
@@ -1070,7 +1145,8 @@ async function executeConvergeApply(options = {}) {
             resolvedToken,
             fetchFn
           );
-          if (ok) {
+          if (applied) {
+            if (applied === "applied") peerMutatedNamespaces.add(entry.namespace);
             if (entry.action === "conflict") actualTransfers.conflictsResolved += 1;
             else actualTransfers.pushed += 1;
           } else {
@@ -1086,6 +1162,17 @@ async function executeConvergeApply(options = {}) {
       actualTransfers.suppressed += 1;
     }
   }
+  if (options.peerUrl && peerMutatedNamespaces.size > 0) {
+    const namespaces = [...peerMutatedNamespaces].sort();
+    if (!await postPeerConvergenceComplete(
+      options.peerUrl,
+      namespaces,
+      resolvedToken,
+      fetchFn
+    )) {
+      actualTransfers.failed += 1;
+    }
+  }
   let cursorUpdated = false;
   if (actualTransfers.failed === 0) {
     await updateCursorsForPlan(plan, options);
@@ -1111,10 +1198,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").map((entry) => ({
+      path: entry.path,
+      sha256: entry.localSha256 ?? entry.peerSha256 ?? "unknown"
     }));
     const cursorState = {
       version: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnic/cli",
-  "version": "9.43.0",
+  "version": "9.45.0",
   "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/server": "^9.43.0",
-    "@remnic/plugin-pi": "^9.43.0",
-    "@remnic/core": "^9.43.0"
+    "@remnic/plugin-pi": "^9.45.0",
+    "@remnic/core": "^9.45.0",
+    "@remnic/server": "^9.45.0"
   },
   "peerDependencies": {
-    "@remnic/bench": "^9.43.0",
-    "@remnic/export-weclone": "^9.43.0",
-    "@remnic/import-weclone": "^9.43.0",
-    "@remnic/import-chatgpt": "^9.43.0",
-    "@remnic/import-claude": "^9.43.0",
-    "@remnic/import-gemini": "^9.43.0",
-    "@remnic/import-lossless-claw": "^9.43.0",
-    "@remnic/import-mem0": "^9.43.0",
-    "@remnic/import-supermemory": "^9.43.0",
-    "@remnic/connector-limitless": "^9.43.0",
-    "@remnic/connector-bee": "^9.43.0",
-    "@remnic/connector-omi": "^9.43.0",
-    "@remnic/capture-audio": "^9.43.0"
+    "@remnic/bench": "^9.45.0",
+    "@remnic/export-weclone": "^9.45.0",
+    "@remnic/import-weclone": "^9.45.0",
+    "@remnic/import-chatgpt": "^9.45.0",
+    "@remnic/import-claude": "^9.45.0",
+    "@remnic/import-gemini": "^9.45.0",
+    "@remnic/import-lossless-claw": "^9.45.0",
+    "@remnic/import-mem0": "^9.45.0",
+    "@remnic/import-supermemory": "^9.45.0",
+    "@remnic/connector-limitless": "^9.45.0",
+    "@remnic/connector-bee": "^9.45.0",
+    "@remnic/connector-omi": "^9.45.0",
+    "@remnic/capture-audio": "^9.45.0"
   },
   "peerDependenciesMeta": {
     "@remnic/bench": {
@@ -89,18 +89,18 @@
   "devDependencies": {
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "@remnic/bench": "9.43.0",
-    "@remnic/export-weclone": "9.43.0",
-    "@remnic/import-weclone": "9.43.0",
-    "@remnic/import-chatgpt": "9.43.0",
-    "@remnic/import-claude": "9.43.0",
-    "@remnic/import-lossless-claw": "9.43.0",
-    "@remnic/import-mem0": "9.43.0",
-    "@remnic/import-gemini": "9.43.0",
-    "@remnic/import-supermemory": "9.43.0",
-    "@remnic/connector-limitless": "9.43.0",
-    "@remnic/connector-bee": "9.43.0",
-    "@remnic/connector-omi": "9.43.0"
+    "@remnic/bench": "9.45.0",
+    "@remnic/export-weclone": "9.45.0",
+    "@remnic/import-weclone": "9.45.0",
+    "@remnic/import-chatgpt": "9.45.0",
+    "@remnic/import-claude": "9.45.0",
+    "@remnic/import-gemini": "9.45.0",
+    "@remnic/import-lossless-claw": "9.45.0",
+    "@remnic/import-mem0": "9.45.0",
+    "@remnic/connector-limitless": "9.45.0",
+    "@remnic/import-supermemory": "9.45.0",
+    "@remnic/connector-omi": "9.45.0",
+    "@remnic/connector-bee": "9.45.0"
   },
   "license": "MIT",
   "repository": {