@remnic/cli 10.0.13 → 10.0.14

package/dist/index.js

@@ -2944,9 +2944,20 @@ async function createOfflineStorageForPath(memoryDir, filePath, configured, secu
   }
   return storage;
 }
-async function createOfflineStorageIo(memoryDir, configuredStorage, persistedExclusion) {
+async function createOfflineStorageIo(memoryDir, configuredStorage, persistedExclusion, captureWriteLockBackoff, signal) {
   await cleanupOrphanedOfflineDecryptStaging(memoryDir);
   const { storage, secureStoreKey } = configuredStorage ?? await createConfiguredOfflineStorage(memoryDir);
+  if (captureWriteLockBackoff || signal) {
+    storage.factHashIndexLockOptions = {
+      ...storage.factHashIndexLockOptions,
+      ...captureWriteLockBackoff ? {
+        captureWriteLockInitialDelayMs: captureWriteLockBackoff.initialDelayMs,
+        captureWriteLockMaxDelayMs: captureWriteLockBackoff.maxDelayMs,
+        captureWriteLockDeadlineMs: captureWriteLockBackoff.deadlineMs
+      } : {},
+      ...signal ? { captureWriteLockSignal: signal } : {}
+    };
+  }
   return {
     // With persisted classifications the warm path skips the per-file
     // read+parse the plain exclusion performs for every candidate.
@@ -2965,8 +2976,15 @@ async function createOfflineStorageIo(memoryDir, configuredStorage, persistedExc
       chunkSize
     }),
     writeFile: async ({ filePath, content }) => storage.writeOfflineSyncFile(filePath, content),
-    writeStagingFile: async ({ filePath, content, finalAadFilePath }) => storage.writeOfflineSyncStagingFile(filePath, content, finalAadFilePath === void 0 ? void 0 : { aadFilePath: finalAadFilePath }),
-    readStagingFile: async ({ filePath, finalAadFilePath }) => storage.readOfflineSyncFile(filePath, finalAadFilePath === void 0 ? void 0 : { aadFilePath: finalAadFilePath }),
+    writeStagingFile: async ({ filePath, content, finalAadFilePath }) => storage.writeOfflineSyncStagingFile(
+      filePath,
+      content,
+      finalAadFilePath === void 0 ? void 0 : { aadFilePath: finalAadFilePath }
+    ),
+    readStagingFile: async ({ filePath, finalAadFilePath }) => storage.readOfflineSyncFile(
+      filePath,
+      finalAadFilePath === void 0 ? void 0 : { aadFilePath: finalAadFilePath }
+    ),
     writeFileChunks: async ({ filePath, chunks }) => storage.writeOfflineSyncFileChunks(filePath, chunks),
     deleteFile: async ({ filePath, mtimeMs }) => storage.deleteOfflineSyncFile(filePath, mtimeMs ?? null),
     recordDeletionRevision: async ({ filePath, mtimeMs }) => storage.recordReplicatedDeletionRevision(filePath, mtimeMs)
@@ -4518,6 +4536,32 @@ function resolveCredentialChannel(input, env, hooks) {
   return { ok: true, token: void 0, tokenFromArgv: false };
 }
 
+// src/converge-capture-lock.ts
+import { resolveConvergeCaptureWriteLockBackoff } from "@remnic/core";
+import { isTombstoneBlockedCaptureWriteLockBusy } from "@remnic/core/capture-write-lock-backoff.js";
+function createConvergeStorageIoOpener(convergeConfig, signal) {
+  const backoff = resolveConvergeCaptureWriteLockBackoff(convergeConfig);
+  return (rootDir) => createOfflineStorageIo(rootDir, void 0, void 0, backoff, signal);
+}
+function handleConvergeTransferResults(results, batch, onFailed) {
+  for (let index = 0; index < results.length; index += 1) {
+    const result = results[index];
+    if (!result || result.status === "fulfilled") continue;
+    if (isTombstoneBlockedCaptureWriteLockBusy(result.reason)) {
+      onFailed();
+      const entry = batch[index];
+      const namespace = entry?.namespace ?? "unknown";
+      const entryPath = entry?.path ?? "";
+      process.stderr.write(
+        `converge: tombstone-blocked capture write lock remained busy for ${namespace} ${entryPath}; continuing the cycle
+`
+      );
+      continue;
+    }
+    throw result.reason;
+  }
+}
+
 // src/converge.ts
 async function discoverCursorNamespaces(memoryDir, peerUrl) {
   const cursorDir = path7.join(path7.resolve(memoryDir), ".remnic", "state", "converge-cursors");
@@ -4853,6 +4897,7 @@ async function executeConvergeApply(options = {}) {
   }
   const fetchFn = options.fetchImpl ?? globalThis.fetch;
   const timeoutMs = options.peerRequestTimeoutMs ?? config?.converge.peerRequestTimeoutMs ?? envConvergePeerRequestTimeoutMs2() ?? DEFAULT_PEER_REQUEST_TIMEOUT_MS;
+  const openStorageIo = createConvergeStorageIoOpener(config?.converge, options.signal);
   const rootMap = /* @__PURE__ */ new Map();
   if (config) {
     try {
@@ -4924,7 +4969,7 @@ async function executeConvergeApply(options = {}) {
         actualTransfers.failed += 1;
         return;
       }
-      const io = await createOfflineStorageIo(rootDir);
+      const io = await openStorageIo(rootDir);
       const expectedLocalSha256 = entry.action === "conflict" ? entry.localSha256 : entry.baseSha256;
       let transferComplete = false;
       let transferRejected = false;
@@ -5011,7 +5056,7 @@ async function executeConvergeApply(options = {}) {
         if (rootDir) {
           try {
             const filePath = path7.join(rootDir, localPath);
-            const io = await createOfflineStorageIo(rootDir);
+            const io = await openStorageIo(rootDir);
             const current = await io.readFileDigest({ root: rootDir, path: localPath, filePath });
             if (current.sha256 !== entry.localSha256) {
               throw new Error(`local file changed during push: ${localPath}`);
@@ -5108,7 +5153,7 @@ async function executeConvergeApply(options = {}) {
         const rootDir = rootMap.get(entry.namespace);
         if (rootDir && entry.localSha256) {
           try {
-            const io = await createOfflineStorageIo(rootDir);
+            const io = await openStorageIo(rootDir);
             const filePath = path7.join(rootDir, localPath);
             const current = await io.readFileDigest({ root: rootDir, path: localPath, filePath });
             if (current.sha256 === entry.localSha256) {
@@ -5163,7 +5208,7 @@ async function executeConvergeApply(options = {}) {
           const rootDir = rootMap.get(entry.namespace);
           if (rootDir) {
             try {
-              const io = await createOfflineStorageIo(rootDir);
+              const io = await openStorageIo(rootDir);
               const filePath = path7.join(rootDir, localPath);
               const current = await io.readFileDigest({ root: rootDir, path: localPath, filePath });
               if (current.sha256 === entry.localSha256) {
@@ -5213,8 +5258,9 @@ async function executeConvergeApply(options = {}) {
     options.signal?.throwIfAborted();
     const batch = actionable.slice(i, i + TRANSFER_BATCH_SIZE);
     const results = await Promise.allSettled(batch.map((entry) => executeTransferEntry(entry)));
-    const rejected = results.find((result) => result.status === "rejected");
-    if (rejected && rejected.status === "rejected") throw rejected.reason;
+    handleConvergeTransferResults(results, batch, () => {
+      actualTransfers.failed += 1;
+    });
   }
   options.signal?.throwIfAborted();
   if (options.peerUrl && peerMutatedNamespaces.size > 0) {

package/package.json

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