@remnic/cli 9.45.1 → 9.45.3

package/dist/index.js

@@ -138,6 +138,7 @@ import {
   OPERATION_NAMES,
   validateCapabilitiesForMint
 } from "@remnic/core";
+import { resolveRemnicPluginEntry } from "@remnic/core/plugin-id.js";
 
 // src/commands/meetings.ts
 import fs from "fs";
@@ -259,6 +260,7 @@ import {
 } from "@remnic/core/reconcile/plan.js";
 import {
   defaultConvergeCursorPath,
+  deriveConvergeCursorBase,
   readConvergeCursor,
   writeConvergeCursor
 } from "@remnic/core/reconcile/cursor.js";
@@ -810,6 +812,7 @@ async function postPeerFileDeletion(peerUrl, namespace, filePath, baseSha256, to
 }
 async function computeConvergePlan(options = {}) {
   const baseMap = /* @__PURE__ */ new Map();
+  const semanticAgreementMap = /* @__PURE__ */ new Map();
   const namespacesToPlan = /* @__PURE__ */ new Set();
   const localMap = /* @__PURE__ */ new Map();
   const localTombstones = /* @__PURE__ */ new Map();
@@ -825,6 +828,12 @@ async function computeConvergePlan(options = {}) {
       baseMap.set(ns, files);
     }
   }
+  if (options.semanticAgreementsByNamespace) {
+    for (const [ns, agreements] of options.semanticAgreementsByNamespace) {
+      namespacesToPlan.add(ns);
+      semanticAgreementMap.set(ns, agreements);
+    }
+  }
   if (options.localFilesByNamespace) {
     for (const [ns, files] of options.localFilesByNamespace) {
       namespacesToPlan.add(ns);
@@ -949,13 +958,16 @@ async function computeConvergePlan(options = {}) {
     }
   }
   const memoryDir = options.cursorDir ?? config?.memoryDir;
-  if (!options.baseFilesByNamespace && memoryDir && options.peerUrl) {
+  if (memoryDir && options.peerUrl && (!options.baseFilesByNamespace || !options.semanticAgreementsByNamespace)) {
     for (const ns of namespacesToPlan) {
       const cursorPath = defaultConvergeCursorPath(memoryDir, options.peerUrl, ns);
       const cursor = await readConvergeCursor(cursorPath);
-      if (cursor?.baseFiles && cursor.baseFiles.length > 0) {
+      if (!options.baseFilesByNamespace && cursor?.baseFiles && cursor.baseFiles.length > 0) {
         baseMap.set(ns, cursor.baseFiles);
       }
+      if (!options.semanticAgreementsByNamespace && cursor?.semanticAgreements && cursor.semanticAgreements.length > 0) {
+        semanticAgreementMap.set(ns, cursor.semanticAgreements);
+      }
     }
   }
   const inputs = [];
@@ -978,7 +990,7 @@ async function computeConvergePlan(options = {}) {
   }
   const conflictPolicy = options.conflictPolicy ?? config?.converge.conflictPolicy ?? DEFAULT_CONVERGE_CONFLICT_POLICY;
   const plan = planReconciliation(inputs, { conflictPolicy });
-  return collapseActiveFactDuplicates(plan, localManifests, peerManifests);
+  return collapseActiveFactDuplicates(plan, localManifests, peerManifests, semanticAgreementMap);
 }
 async function executeConvergeApply(options = {}) {
   const conflictPolicy = options.conflictPolicy ?? options.config?.converge.conflictPolicy ?? DEFAULT_CONVERGE_CONFLICT_POLICY;
@@ -1309,16 +1321,19 @@ 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 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 priorSemanticAgreements = options.semanticAgreementsByNamespace?.get(ns) ?? (await readConvergeCursor(cursorPath))?.semanticAgreements ?? [];
+    const { baseFiles, semanticAgreements } = deriveConvergeCursorBase(
+      plan.entries,
+      ns,
+      priorSemanticAgreements
+    );
     const cursorState = {
       version: 1,
       peerUrl,
       namespace: ns,
       lastConvergedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      baseFiles
+      baseFiles,
+      semanticAgreements
     };
     try {
       await writeConvergeCursor(cursorPath, cursorState);
@@ -7734,6 +7749,26 @@ async function writeBenchReproManifestForPackageRun(args) {
     console.warn(`WARNING: failed to write reproducibility manifest: ${message}`);
   }
 }
+function loadStandaloneConvergeCommandConfig() {
+  const configPath = resolveConfigPath();
+  const raw = fs12.existsSync(configPath) ? JSON.parse(fs12.readFileSync(configPath, "utf8")) : {};
+  return parseConfig5(resolveRemnicConfigRecord4(raw));
+}
+function parseConvergePluginConfig(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+  if (Object.keys(value).length === 0) return void 0;
+  return parseConfig5(resolveRemnicConfigRecord4(value));
+}
+function loadConvergeCommandConfig() {
+  if (readCompatEnv("REMNIC_CONFIG_PATH", "ENGRAM_CONFIG_PATH")) {
+    return loadStandaloneConvergeCommandConfig();
+  }
+  const openclawConfig = readOpenclawConfig(resolveOpenclawConfigPath());
+  const pluginEntry = resolveRemnicPluginEntry(openclawConfig);
+  const pluginConfig = parseConvergePluginConfig(pluginEntry?.["config"]);
+  if (pluginConfig) return pluginConfig;
+  return loadStandaloneConvergeCommandConfig();
+}
 function resolveConfigPath(cliPath) {
   if (cliPath) return path15.resolve(expandTilde(cliPath));
   const envPath = readCompatEnv("REMNIC_CONFIG_PATH", "ENGRAM_CONFIG_PATH");
@@ -14547,9 +14582,7 @@ Options:
         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));
+      const config = loadConvergeCommandConfig();
       await cmdConverge(action, args, json, config);
       break;
     }
@@ -15087,6 +15120,7 @@ export {
   hydrateOfflineSnapshotContent,
   isOfflineMissingContentDeferrablePath,
   isOfflineSnapshotPostFallbackError,
+  loadConvergeCommandConfig,
   main,
   offlinePartialHydrationForPaths,
   offlineSnapshotBasePostBody,

package/package.json

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