@remnic/cli 9.69.15 → 9.69.16

package/dist/index.js

@@ -1701,6 +1701,65 @@ function secureStoreEnvelopeHeaderAad(salt) {
   return out;
 }
 
+// src/converge-watch.ts
+var CONVERGE_WATCH_MIN_INTERVAL_MS = 1e3;
+var CONVERGE_WATCH_DEFAULT_INTERVAL_MS = 3e5;
+var CONVERGE_WATCH_MAX_INTERVAL_MS = 2147483647;
+function sleepAborted(ms, signal) {
+  return new Promise((resolve2) => {
+    const timer = setTimeout(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve2(true);
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      resolve2(false);
+    };
+    if (signal.aborted) {
+      clearTimeout(timer);
+      resolve2(false);
+      return;
+    }
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+}
+async function convergeWatch(options) {
+  const intervalMs = Math.min(
+    CONVERGE_WATCH_MAX_INTERVAL_MS,
+    Math.max(CONVERGE_WATCH_MIN_INTERVAL_MS, options.intervalMs ?? CONVERGE_WATCH_DEFAULT_INTERVAL_MS)
+  );
+  const { apply, intervalMs: _intervalMs, maxCycles, onCycle, signal, ...applyOptions } = options;
+  const outcome = {
+    cycles: 0,
+    convergedCycles: 0,
+    appliedCycles: 0,
+    failedCycles: 0,
+    lastStatus: "aborted"
+  };
+  while (maxCycles === void 0 || outcome.cycles < maxCycles) {
+    if (signal?.aborted) break;
+    try {
+      const result = await apply(applyOptions);
+      outcome.cycles += 1;
+      if (result.status === "converged") outcome.convergedCycles += 1;
+      else if (result.status === "stopped_unresolved_conflicts" || result.status === "applied" && result.transfers.failed > 0) {
+        outcome.failedCycles += 1;
+      } else outcome.appliedCycles += 1;
+      outcome.lastStatus = result.status;
+      onCycle?.(outcome.cycles, { result });
+    } catch (err) {
+      outcome.cycles += 1;
+      outcome.failedCycles += 1;
+      outcome.lastStatus = "error";
+      onCycle?.(outcome.cycles, { error: err });
+    }
+    if (maxCycles !== void 0 && outcome.cycles >= maxCycles) break;
+    const slept = await sleepAborted(intervalMs, signal ?? new AbortController().signal);
+    if (!slept) break;
+  }
+  return outcome;
+}
+
 // src/converge.ts
 import { resolveAgentAccessAuthToken } from "@remnic/core/resolve-auth-token.js";
 
@@ -2292,7 +2351,10 @@ async function computeConvergePlan(options = {}) {
   if (options.baseFilesByNamespace) {
     for (const [ns, files] of options.baseFilesByNamespace) {
       namespacesToPlan.add(ns);
-      baseMap.set(ns, files.filter((file) => !isInternalRemnicStatePath3(file.path)));
+      baseMap.set(
+        ns,
+        files.filter((file) => !isInternalRemnicStatePath3(file.path))
+      );
     }
   }
   if (options.semanticAgreementsByNamespace) {
@@ -2304,7 +2366,10 @@ async function computeConvergePlan(options = {}) {
   if (options.localFilesByNamespace) {
     for (const [ns, files] of options.localFilesByNamespace) {
       namespacesToPlan.add(ns);
-      localMap.set(ns, files.filter((file) => !isInternalRemnicStatePath3(file.path)));
+      localMap.set(
+        ns,
+        files.filter((file) => !isInternalRemnicStatePath3(file.path))
+      );
     }
   }
   if (options.localTombstonesByNamespace) {
@@ -2321,7 +2386,10 @@ async function computeConvergePlan(options = {}) {
   if (options.peerFilesByNamespace) {
     for (const [ns, files] of options.peerFilesByNamespace) {
       namespacesToPlan.add(ns);
-      peerMap.set(ns, files.filter((file) => !isInternalRemnicStatePath3(file.path)));
+      peerMap.set(
+        ns,
+        files.filter((file) => !isInternalRemnicStatePath3(file.path))
+      );
     }
   }
   if (options.peerTombstonesByNamespace) {
@@ -2418,12 +2486,7 @@ async function computeConvergePlan(options = {}) {
     }
     const fetchFn = options.fetchImpl ?? globalThis.fetch;
     const timeoutMs = options.peerRequestTimeoutMs ?? DEFAULT_PEER_REQUEST_TIMEOUT_MS;
-    const capabilities = await fetchPeerSyncCapabilities(
-      peerUrl,
-      resolvedToken,
-      fetchFn,
-      timeoutMs
-    );
+    const capabilities = await fetchPeerSyncCapabilities(peerUrl, resolvedToken, fetchFn, timeoutMs);
     for (const ns of namespacesToPlan) {
       const peerData = await fetchPeerSnapshot(peerUrl, ns, resolvedToken, fetchFn, timeoutMs);
       const streamedManifest = capabilities?.manifestStream ? await fetchPeerManifestStream(peerUrl, ns, resolvedToken, fetchFn, timeoutMs) : null;
@@ -2459,14 +2522,7 @@ async function computeConvergePlan(options = {}) {
       for (const tombstonePath of TOMBSTONE_PATHS) {
         const state = peerFiles.find((file) => file.path === tombstonePath);
         if (!state) continue;
-        const remote = await fetchPeerFileContent(
-          peerUrl,
-          ns,
-          tombstonePath,
-          resolvedToken,
-          fetchFn,
-          timeoutMs
-        );
+        const remote = await fetchPeerFileContent(peerUrl, ns, tombstonePath, resolvedToken, fetchFn, timeoutMs);
         if (!remote || remote.sha256.toLowerCase() !== state.sha256.toLowerCase()) {
           throw new Error(`failed to read peer tombstone evidence: ${tombstonePath}`);
         }
@@ -2939,13 +2995,7 @@ async function executeConvergeApply(options = {}) {
   }
   if (options.peerUrl && peerMutatedNamespaces.size > 0) {
     const namespaces = [...peerMutatedNamespaces].sort();
-    if (!await postPeerConvergenceComplete(
-      options.peerUrl,
-      namespaces,
-      resolvedToken,
-      fetchFn,
-      timeoutMs
-    )) {
+    if (!await postPeerConvergenceComplete(options.peerUrl, namespaces, resolvedToken, fetchFn, timeoutMs)) {
       actualTransfers.failed += 1;
     }
   }
@@ -2975,11 +3025,7 @@ async function updateCursorsForPlan(plan, options) {
   for (const ns of namespaces) {
     const cursorPath = defaultConvergeCursorPath(memoryDir, peerUrl, ns);
     const priorSemanticAgreements = options.semanticAgreementsByNamespace?.get(ns) ?? (await readConvergeCursor(cursorPath))?.semanticAgreements ?? [];
-    const { baseFiles, semanticAgreements } = deriveConvergeCursorBase(
-      plan.entries,
-      ns,
-      priorSemanticAgreements
-    );
+    const { baseFiles, semanticAgreements } = deriveConvergeCursorBase(plan.entries, ns, priorSemanticAgreements);
     const cursorState = {
       version: 1,
       peerUrl,
@@ -3031,11 +3077,12 @@ function formatConvergeApplyReport(result) {
 }
 async function cmdConverge(action, rest, json, config = parseConfig13({})) {
   if (action === "help" || action === "--help" || action === "-h" || rest.includes("--help") || rest.includes("-h")) {
-    console.log(`Usage: remnic converge <plan|apply> [options]
+    console.log(`Usage: remnic converge <plan|apply|watch> [options]
 
 Subcommands:
   plan              Compute and display reconciliation plan
   apply             Execute bidirectional converge transport (alias: transport, sync)
+  watch             Run apply on a cadence until stopped (scheduled replication)
 
 Options:
   --peer <url>      Peer server URL (or --remote-url / --remote)
@@ -3043,13 +3090,15 @@ Options:
   --conflict-policy <policy>
                     Policy override (newest-wins|manual)
                     Default: converge.conflictPolicy (newest-wins)
+  --interval <seconds>
+                    Watch cadence in seconds (watch only; default 300, min 1)
   --dry-run         Simulate transfers without mutating disk or remote peer
   --json            Output detailed JSON plan report
 `);
     return;
   }
-  if (action !== "plan" && action !== "apply" && action !== "transport" && action !== "sync") {
-    process.stderr.write(`converge: unknown action "${action}". Use: plan or apply [options].
+  if (action !== "plan" && action !== "apply" && action !== "transport" && action !== "sync" && action !== "watch") {
+    process.stderr.write(`converge: unknown action "${action}". Use: plan, apply, or watch [options].
 `);
     process.exitCode = 2;
     return;
@@ -3058,6 +3107,7 @@ Options:
   let peerToken;
   let dryRun = false;
   let conflictPolicy;
+  let intervalSeconds;
   for (let i = 0; i < rest.length; i += 1) {
     const arg = rest[i];
     if ((arg === "--peer" || arg === "--remote-url" || arg === "--remote") && rest[i + 1]) {
@@ -3068,17 +3118,70 @@ Options:
       i += 1;
     } else if (arg === "--dry-run") {
       dryRun = true;
+    } else if (arg === "--interval") {
+      const raw = rest[i + 1];
+      const parsed = raw === void 0 ? Number.NaN : Number(raw);
+      if (!Number.isFinite(parsed) || parsed <= 0) {
+        process.stderr.write("converge: --interval must be a positive number of seconds.\n");
+        process.exitCode = 2;
+        return;
+      }
+      intervalSeconds = parsed;
+      i += 1;
     } 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(", ")}`
-        );
+        throw new Error(`converge: --conflict-policy must be one of ${CONVERGE_CONFLICT_POLICIES.join(", ")}`);
       }
       conflictPolicy = policy;
       i += 1;
     }
   }
+  if (action === "watch") {
+    const controller = new AbortController();
+    const onSignal = () => controller.abort();
+    process.once("SIGINT", onSignal);
+    process.once("SIGTERM", onSignal);
+    let outcome;
+    try {
+      outcome = await convergeWatch({
+        apply: (applyOptions) => executeConvergeApply(applyOptions),
+        config,
+        peerUrl,
+        dryRun,
+        peerToken,
+        conflictPolicy,
+        intervalMs: intervalSeconds !== void 0 ? intervalSeconds * 1e3 : void 0,
+        signal: controller.signal,
+        onCycle: json ? void 0 : (cycle, event) => {
+          if (event.error !== void 0) {
+            console.error(`converge watch: cycle ${cycle} failed: ${String(event.error)}`);
+            return;
+          }
+          const result2 = event.result;
+          if (!result2) return;
+          const transfers = result2.transfers;
+          console.log(
+            `converge watch: cycle ${cycle} status=${result2.status} pulled=${transfers.pulled} pushed=${transfers.pushed} conflicts=${transfers.conflictsResolved} failed=${transfers.failed}`
+          );
+        }
+      });
+      if (json) {
+        console.log(JSON.stringify(outcome, null, 2));
+      } else {
+        console.log(
+          `converge watch stopped after ${outcome.cycles} cycle(s): ${outcome.convergedCycles} converged, ${outcome.appliedCycles} applied, ${outcome.failedCycles} failed (last: ${outcome.lastStatus}).`
+        );
+      }
+    } finally {
+      process.removeListener("SIGINT", onSignal);
+      process.removeListener("SIGTERM", onSignal);
+      if (outcome && outcome.cycles > 0 && outcome.failedCycles === outcome.cycles) {
+        process.exitCode = 1;
+      }
+    }
+    return;
+  }
   if (action === "plan") {
     const plan = await computeConvergePlan({ config, peerUrl, peerToken, conflictPolicy });
     if (json) {

package/package.json

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