@remnic/cli 1.0.13 → 1.0.15

package/dist/index.js

@@ -97,6 +97,7 @@ import {
   offlineSyncStateFromSnapshot,
   readOfflineSyncState,
   summarizeOfflineSyncChangeset,
+  summarizeOfflineSyncPendingChanges,
   writeOfflineSyncState,
   buildActionConfidenceInputFromOptions,
   evaluateActionConfidence,
@@ -6670,6 +6671,7 @@ async function fetchOfflineFiles(args) {
   );
 }
 var OFFLINE_SYNC_DIRECT_HYDRATE_MIN_BYTES = 16 * 1024 * 1024;
+var OFFLINE_SYNC_FILES_CONTENT_MAX_BATCH_BYTES = 8 * 1024 * 1024;
 function parseOfflineHeaderNumber(headers, name) {
   const raw = headers.get(name);
   if (raw === null) throw new Error(`offline file content response omitted ${name}`);
@@ -6761,16 +6763,16 @@ async function readFirstOfflineSyncState(paths) {
 function offlineFileStateMap(files) {
   return new Map(files.map((file) => [file.path, file]));
 }
-function offlineSnapshotContentPathsForApply(options) {
+function offlineSnapshotContentFilesForApply(options) {
   const base = offlineFileStateMap(options.baseFiles);
   const current = options.currentFiles ? offlineFileStateMap(options.currentFiles) : null;
-  const paths = [];
+  const files = [];
   for (const incoming of options.snapshot.files) {
     if (current?.get(incoming.path)?.sha256 === incoming.sha256) continue;
     if (base.get(incoming.path)?.sha256 === incoming.sha256) continue;
-    paths.push(incoming.path);
+    files.push(incoming);
   }
-  return paths.sort();
+  return files.sort((left, right) => left.path.localeCompare(right.path));
 }
 function shouldDirectHydrateOfflineFile(options) {
   if (options.incoming.bytes < OFFLINE_SYNC_DIRECT_HYDRATE_MIN_BYTES) return false;
@@ -6852,19 +6854,22 @@ async function directHydrateLargeOfflineFiles(args) {
   }
   return hydrated;
 }
-function chunkOfflineFilePaths(paths) {
+function chunkOfflineFileContentBatches(files) {
   const chunks = [];
   let current = [];
-  let currentBytes = 256;
-  for (const relPath of paths) {
-    const cost = Buffer.byteLength(JSON.stringify(relPath), "utf-8") + 1;
-    if (current.length > 0 && (current.length >= 1e3 || currentBytes + cost > 96e3)) {
+  let currentPathBytes = 256;
+  let currentContentBytes = 0;
+  for (const file of files) {
+    const pathCost = Buffer.byteLength(JSON.stringify(file.path), "utf-8") + 1;
+    if (current.length > 0 && (current.length >= 1e3 || currentPathBytes + pathCost > 96e3 || currentContentBytes + file.bytes > OFFLINE_SYNC_FILES_CONTENT_MAX_BATCH_BYTES)) {
       chunks.push(current);
       current = [];
-      currentBytes = 256;
+      currentPathBytes = 256;
+      currentContentBytes = 0;
     }
-    current.push(relPath);
-    currentBytes += cost;
+    current.push(file);
+    currentPathBytes += pathCost;
+    currentContentBytes += file.bytes;
   }
   if (current.length > 0) chunks.push(current);
   return chunks;
@@ -6878,32 +6883,34 @@ function isMissingOfflineContentError(error) {
   return /^missing decoded content for /.test(message);
 }
 async function hydrateOfflineSnapshotContent(args) {
-  const neededPaths = offlineSnapshotContentPathsForApply({
-    snapshot: args.snapshot,
+  const snapshot = normalizeOfflineSyncSnapshot(args.snapshot);
+  const neededFiles = offlineSnapshotContentFilesForApply({
+    snapshot,
     baseFiles: args.baseFiles,
     currentFiles: args.currentFiles
   });
-  if (neededPaths.length === 0) return args.snapshot;
-  const expectedByPath = new Map(args.snapshot.files.map((file) => [file.path, file]));
+  if (neededFiles.length === 0) return { ...args.snapshot, files: snapshot.files };
+  const expectedByPath = new Map(snapshot.files.map((file) => [file.path, file]));
   const contentByPath = /* @__PURE__ */ new Map();
+  const updatedByPath = /* @__PURE__ */ new Map();
   try {
-    for (const batch of chunkOfflineFilePaths(neededPaths)) {
+    for (const batch of chunkOfflineFileContentBatches(neededFiles)) {
       const partial = await fetchOfflineFiles({
         remoteUrl: args.remoteUrl,
         token: args.token,
         namespace: args.namespace,
         includeTranscripts: args.includeTranscripts,
-        paths: batch
+        paths: batch.map((file) => file.path)
       });
       for (const file of partial.files) {
         const expected = expectedByPath.get(file.path);
         if (!expected) continue;
-        if (file.sha256 !== expected.sha256 || file.bytes !== expected.bytes) {
-          throw new Error(`remote file changed while fetching offline content: ${file.path}`);
-        }
         if (typeof file.contentBase64 !== "string") {
           throw new Error(`remote offline content response omitted contentBase64 for ${file.path}`);
         }
+        if (file.sha256 !== expected.sha256 || file.bytes !== expected.bytes || file.mtimeMs !== expected.mtimeMs) {
+          updatedByPath.set(file.path, file);
+        }
         contentByPath.set(file.path, file.contentBase64);
       }
     }
@@ -6917,7 +6924,7 @@ async function hydrateOfflineSnapshotContent(args) {
       includeContent: true
     });
   }
-  const missing = neededPaths.filter((relPath) => !contentByPath.has(relPath));
+  const missing = neededFiles.map((file) => file.path).filter((relPath) => !contentByPath.has(relPath));
   if (missing.length > 0) {
     throw new Error(
       `remote offline content response omitted ${missing.length} changed file${missing.length === 1 ? "" : "s"}; retry sync`
@@ -6925,7 +6932,9 @@ async function hydrateOfflineSnapshotContent(args) {
   }
   return {
     ...args.snapshot,
-    files: args.snapshot.files.map((file) => {
+    files: snapshot.files.map((file) => {
+      const updated = updatedByPath.get(file.path);
+      if (updated) return updated;
       const contentBase64 = contentByPath.get(file.path);
       return contentBase64 === void 0 ? file : { ...file, contentBase64 };
     })
@@ -7269,14 +7278,13 @@ Environment fallbacks:
       });
     }
     const storageIo = await createOfflineStorageIo(memoryDir);
-    const changeset = await buildOfflineSyncChangeset({
+    const summary = await summarizeOfflineSyncPendingChanges({
       root: memoryDir,
       sourceId: localOfflineSourceId(memoryDir),
       baseFiles: state?.baseFiles ?? [],
       includeTranscripts,
       readFile: storageIo.readFile
     });
-    const summary = summarizeOfflineSyncChangeset(changeset);
     if (json) {
       console.log(JSON.stringify({ statePath: statePath ?? null, state, pending: summary }, null, 2));
     } else {
@@ -10228,6 +10236,7 @@ export {
   buildBenchRuntimeProfileRequest,
   buildPackageBenchExecutionPlans,
   buildQueryRecallRequest,
+  chunkOfflineFileContentBatches,
   extractXrayRawArgs,
   getBenchUsageText,
   hasFlag,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnic/cli",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "CLI for Remnic memory — init, query, doctor, daemon management",
   "type": "module",
   "main": "dist/index.js",
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "yaml": "^2.4.2",
-    "@remnic/plugin-pi": "^1.0.0",
-    "@remnic/core": "^1.1.19",
-    "@remnic/server": "^1.0.5"
+    "@remnic/plugin-pi": "^1.0.1",
+    "@remnic/server": "^1.0.5",
+    "@remnic/core": "^1.1.21"
   },
   "peerDependencies": {
     "@remnic/bench": "^1.0.0",
@@ -78,10 +78,10 @@
     "@remnic/import-weclone": "1.0.1",
     "@remnic/import-chatgpt": "0.1.0",
     "@remnic/import-claude": "0.1.0",
+    "@remnic/import-gemini": "0.1.0",
     "@remnic/import-lossless-claw": "0.1.1",
-    "@remnic/import-supermemory": "0.1.2",
     "@remnic/import-mem0": "0.1.0",
-    "@remnic/import-gemini": "0.1.0"
+    "@remnic/import-supermemory": "0.1.2"
   },
   "license": "MIT",
   "repository": {