@remnic/cli 9.69.16 → 9.69.18

package/dist/index.js

@@ -1401,6 +1401,8 @@ import {
   CONVERGE_CONFLICT_POLICIES,
   DEFAULT_CONVERGE_CONFLICT_POLICY,
   parseConfig as parseConfig13,
+  envConvergePeerRequestTimeoutMs as envConvergePeerRequestTimeoutMs2,
+  normalizeConvergePeerRequestTimeoutMs,
   buildOfflineSyncSnapshotFromBase,
   applyOfflineSyncFileContentChunk,
   isInternalRemnicStatePath as isInternalRemnicStatePath3,
@@ -1921,6 +1923,7 @@ async function parsePeerManifestStream(response, expectedNamespace) {
 }
 
 // src/converge-peer-transport.ts
+import { envConvergePeerRequestTimeoutMs } from "@remnic/core";
 var DEFAULT_PEER_REQUEST_TIMEOUT_MS = 3e4;
 function normalizePeerBaseUrl(peerUrl) {
   const normalized = normalizeConvergePeerUrl(peerUrl);
@@ -1943,10 +1946,7 @@ async function fetchPeerRequest(fetchImpl, input, init, timeoutMs) {
 async function fetchPeerSyncCapabilities(peerUrl, token, fetchImpl, timeoutMs) {
   const base = normalizePeerBaseUrl(peerUrl);
   const headers = token ? { authorization: `Bearer ${token}` } : {};
-  const routes = [
-    "/remnic/v1/offline-sync/capabilities",
-    "/engram/v1/offline-sync/capabilities"
-  ];
+  const routes = ["/remnic/v1/offline-sync/capabilities", "/engram/v1/offline-sync/capabilities"];
   for (const route of routes) {
     const response = await fetchPeerRequest(fetchImpl, `${base}${route}`, { headers }, timeoutMs);
     if (response.status === 404 || response.status === 405) continue;
@@ -1960,9 +1960,11 @@ async function fetchPeerSyncCapabilities(peerUrl, token, fetchImpl, timeoutMs) {
     if (!payload || typeof payload !== "object" || !("convergenceFinalization" in payload) || typeof payload.convergenceFinalization !== "boolean" || !("manifestStream" in payload) || typeof payload.manifestStream !== "boolean") {
       throw new Error("peer capability response was malformed");
     }
+    const platform = "platform" in payload && typeof payload.platform === "string" ? payload.platform : void 0;
     return {
       convergenceFinalization: payload.convergenceFinalization,
-      manifestStream: payload.manifestStream
+      manifestStream: payload.manifestStream,
+      ...platform !== void 0 ? { platform } : {}
     };
   }
   return null;
@@ -2051,10 +2053,7 @@ function requiredResponseNumber(response, name) {
 async function streamPeerFileContent(peerUrl, namespace, filePath, onChunk, token, fetchImpl = globalThis.fetch, timeoutMs = DEFAULT_PEER_REQUEST_TIMEOUT_MS) {
   assertTransferablePeerPath(filePath);
   const base = normalizePeerBaseUrl(peerUrl);
-  const routes = [
-    "/remnic/v1/offline-sync/file-content",
-    "/engram/v1/offline-sync/file-content"
-  ];
+  const routes = ["/remnic/v1/offline-sync/file-content", "/engram/v1/offline-sync/file-content"];
   const headers = {
     "content-type": "application/json",
     ...token ? { authorization: `Bearer ${token}` } : {}
@@ -2069,17 +2068,22 @@ async function streamPeerFileContent(peerUrl, namespace, filePath, onChunk, toke
     do {
       let response;
       try {
-        response = await fetchPeerRequest(fetchImpl, `${base}${route}`, {
-          method: "POST",
-          headers,
-          body: JSON.stringify({
-            namespace,
-            includeTranscripts: false,
-            path: filePath,
-            offset,
-            length: OFFLINE_SYNC_FILE_CONTENT_MAX_CHUNK_BYTES
-          })
-        }, timeoutMs);
+        response = await fetchPeerRequest(
+          fetchImpl,
+          `${base}${route}`,
+          {
+            method: "POST",
+            headers,
+            body: JSON.stringify({
+              namespace,
+              includeTranscripts: false,
+              path: filePath,
+              offset,
+              length: OFFLINE_SYNC_FILE_CONTENT_MAX_CHUNK_BYTES
+            })
+          },
+          timeoutMs
+        );
         if (!response.ok) throw new Error(`offline file content request failed: ${response.status}`);
       } catch {
         routeFailed = true;
@@ -2177,11 +2181,16 @@ async function postPeerFileContent(peerUrl, namespace, filePath, source, token,
       };
       let response;
       try {
-        response = await fetchPeerRequest(fetchImpl, `${base}${route}`, {
-          method: "POST",
-          headers,
-          body: new Uint8Array(chunk)
-        }, timeoutMs);
+        response = await fetchPeerRequest(
+          fetchImpl,
+          `${base}${route}`,
+          {
+            method: "POST",
+            headers,
+            body: new Uint8Array(chunk)
+          },
+          timeoutMs
+        );
         if (!response.ok) throw new Error(`offline apply-file-content request failed: ${response.status}`);
       } catch {
         if (previousAttemptFailed && offset > 0 && !restartedRoute) {
@@ -2209,18 +2218,20 @@ async function postPeerFileContent(peerUrl, namespace, filePath, source, token,
 async function postPeerConvergenceComplete(peerUrl, namespaces, token, fetchImpl = globalThis.fetch, timeoutMs = DEFAULT_PEER_REQUEST_TIMEOUT_MS) {
   const base = normalizePeerBaseUrl(peerUrl);
   const query = namespaces.map((namespace) => `namespace=${encodeURIComponent(namespace)}`).join("&");
-  const routes = [
-    "/remnic/v1/offline-sync/convergence-complete",
-    "/engram/v1/offline-sync/convergence-complete"
-  ];
+  const routes = ["/remnic/v1/offline-sync/convergence-complete", "/engram/v1/offline-sync/convergence-complete"];
   for (const route of routes) {
-    const response = await fetchPeerRequest(fetchImpl, `${base}${route}?${query}`, {
-      method: "POST",
-      headers: {
-        "x-remnic-source-id": encodeURIComponent("remnic-converge"),
-        ...token ? { authorization: `Bearer ${token}` } : {}
-      }
-    }, timeoutMs).catch(() => null);
+    const response = await fetchPeerRequest(
+      fetchImpl,
+      `${base}${route}?${query}`,
+      {
+        method: "POST",
+        headers: {
+          "x-remnic-source-id": encodeURIComponent("remnic-converge"),
+          ...token ? { authorization: `Bearer ${token}` } : {}
+        }
+      },
+      timeoutMs
+    ).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) {
@@ -2240,21 +2251,26 @@ async function postPeerFileDeletion(peerUrl, namespace, filePath, baseSha256, to
   let previousAttemptFailed = false;
   for (const route of routes) {
     try {
-      const response = await fetchPeerRequest(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 }]
-          }
-        })
-      }, timeoutMs);
+      const response = await fetchPeerRequest(
+        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 }]
+            }
+          })
+        },
+        timeoutMs
+      );
       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) {
@@ -2348,6 +2364,7 @@ async function computeConvergePlan(options = {}) {
   const peerDeletionMtimeMs = /* @__PURE__ */ new Map();
   const localManifests = /* @__PURE__ */ new Map();
   const peerManifests = /* @__PURE__ */ new Map();
+  let peerPlatform;
   if (options.baseFilesByNamespace) {
     for (const [ns, files] of options.baseFilesByNamespace) {
       namespacesToPlan.add(ns);
@@ -2485,8 +2502,9 @@ async function computeConvergePlan(options = {}) {
       }
     }
     const fetchFn = options.fetchImpl ?? globalThis.fetch;
-    const timeoutMs = options.peerRequestTimeoutMs ?? DEFAULT_PEER_REQUEST_TIMEOUT_MS;
+    const timeoutMs = options.peerRequestTimeoutMs ?? config?.converge.peerRequestTimeoutMs ?? envConvergePeerRequestTimeoutMs2() ?? DEFAULT_PEER_REQUEST_TIMEOUT_MS;
     const capabilities = await fetchPeerSyncCapabilities(peerUrl, resolvedToken, fetchFn, timeoutMs);
+    peerPlatform = capabilities?.platform;
     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;
@@ -2523,9 +2541,16 @@ async function computeConvergePlan(options = {}) {
         const state = peerFiles.find((file) => file.path === tombstonePath);
         if (!state) continue;
         const remote = await fetchPeerFileContent(peerUrl, ns, tombstonePath, resolvedToken, fetchFn, timeoutMs);
-        if (!remote || remote.sha256.toLowerCase() !== state.sha256.toLowerCase()) {
+        if (!remote) {
           throw new Error(`failed to read peer tombstone evidence: ${tombstonePath}`);
         }
+        if (remote.sha256.toLowerCase() !== state.sha256.toLowerCase()) {
+          const listedBytes = typeof state.bytes === "number" ? state.bytes : -1;
+          const prefixMatches = listedBytes >= 0 && remote.content.length >= listedBytes && createHash3("sha256").update(remote.content.subarray(0, listedBytes)).digest("hex") === state.sha256.toLowerCase();
+          if (!prefixMatches) {
+            throw new Error(`failed to read peer tombstone evidence: ${tombstonePath}`);
+          }
+        }
         const parsed = parseTombstoneEvidence(remote.content.toString("utf8"));
         for (const value of parsed.contentHashes) evidence.contentHashes.add(value);
         for (const value of parsed.fileSha256) evidence.fileSha256.add(value);
@@ -2574,7 +2599,7 @@ async function computeConvergePlan(options = {}) {
     });
   }
   const conflictPolicy = options.conflictPolicy ?? config?.converge.conflictPolicy ?? DEFAULT_CONVERGE_CONFLICT_POLICY;
-  const plan = planReconciliation(inputs, { conflictPolicy });
+  const plan = planReconciliation(inputs, { conflictPolicy, peerPlatform });
   return collapseActiveFactDuplicates(plan, localManifests, peerManifests, semanticAgreementMap);
 }
 async function executeConvergeApply(options = {}) {
@@ -2640,8 +2665,6 @@ async function executeConvergeApply(options = {}) {
       resolvedToken = options.peerToken;
     }
   }
-  const fetchFn = options.fetchImpl ?? globalThis.fetch;
-  const timeoutMs = options.peerRequestTimeoutMs ?? DEFAULT_PEER_REQUEST_TIMEOUT_MS;
   let config = options.config;
   if (!config) {
     try {
@@ -2649,6 +2672,8 @@ async function executeConvergeApply(options = {}) {
     } catch {
     }
   }
+  const fetchFn = options.fetchImpl ?? globalThis.fetch;
+  const timeoutMs = options.peerRequestTimeoutMs ?? config?.converge.peerRequestTimeoutMs ?? envConvergePeerRequestTimeoutMs2() ?? DEFAULT_PEER_REQUEST_TIMEOUT_MS;
   const rootMap = /* @__PURE__ */ new Map();
   if (config) {
     try {
@@ -3092,6 +3117,9 @@ Options:
                     Default: converge.conflictPolicy (newest-wins)
   --interval <seconds>
                     Watch cadence in seconds (watch only; default 300, min 1)
+  --timeout <seconds>
+                    Per-request peer HTTP timeout (default 30; use 300+ for
+                    boot-scale namespaces of ~100k files)
   --dry-run         Simulate transfers without mutating disk or remote peer
   --json            Output detailed JSON plan report
 `);
@@ -3108,6 +3136,7 @@ Options:
   let dryRun = false;
   let conflictPolicy;
   let intervalSeconds;
+  let timeoutSeconds;
   for (let i = 0; i < rest.length; i += 1) {
     const arg = rest[i];
     if ((arg === "--peer" || arg === "--remote-url" || arg === "--remote") && rest[i + 1]) {
@@ -3128,6 +3157,17 @@ Options:
       }
       intervalSeconds = parsed;
       i += 1;
+    } else if (arg === "--timeout") {
+      const raw = rest[i + 1];
+      const parsed = raw === void 0 ? Number.NaN : Number(raw);
+      try {
+        timeoutSeconds = normalizeConvergePeerRequestTimeoutMs(parsed, "--timeout") / 1e3;
+      } catch {
+        process.stderr.write("converge: --timeout must be a positive number of seconds.\n");
+        process.exitCode = 2;
+        return;
+      }
+      i += 1;
     } else if (arg === "--conflict-policy") {
       const policy = rest[i + 1];
       if (typeof policy !== "string" || !CONVERGE_CONFLICT_POLICIES.includes(policy)) {
@@ -3152,6 +3192,7 @@ Options:
         peerToken,
         conflictPolicy,
         intervalMs: intervalSeconds !== void 0 ? intervalSeconds * 1e3 : void 0,
+        peerRequestTimeoutMs: timeoutSeconds !== void 0 ? timeoutSeconds * 1e3 : void 0,
         signal: controller.signal,
         onCycle: json ? void 0 : (cycle, event) => {
           if (event.error !== void 0) {
@@ -3183,7 +3224,13 @@ Options:
     return;
   }
   if (action === "plan") {
-    const plan = await computeConvergePlan({ config, peerUrl, peerToken, conflictPolicy });
+    const plan = await computeConvergePlan({
+      config,
+      peerUrl,
+      peerToken,
+      conflictPolicy,
+      ...timeoutSeconds !== void 0 ? { peerRequestTimeoutMs: timeoutSeconds * 1e3 } : {}
+    });
     if (json) {
       console.log(JSON.stringify(plan, null, 2));
     } else {
@@ -3196,7 +3243,8 @@ Options:
     peerToken,
     dryRun,
     conflictPolicy,
-    config
+    config,
+    ...timeoutSeconds !== void 0 ? { peerRequestTimeoutMs: timeoutSeconds * 1e3 } : {}
   });
   if (json) {
     console.log(JSON.stringify(result, null, 2));

package/package.json

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