@remnic/cli 10.0.48 → 10.0.50

package/dist/index.js

@@ -531,6 +531,7 @@ import {
   migrateFromEngram,
   rollbackFromEngramMigration,
   buildBriefing,
+  withBriefingDeadline,
   parseBriefingWindow,
   parseBriefingFocus,
   validateBriefingFormat,
@@ -597,7 +598,7 @@ import {
   offlineSyncStateFromSnapshot,
   readOfflineSyncFileContentChunk,
   readOfflineSyncState,
-  embeddingGenerationMembership as embeddingGenerationMembership2,
+  embeddingGenerationMembership as embeddingGenerationMembership3,
   divergedEmbeddingGenerationDeferrals,
   shouldPreferIncomingOfflineRuntimeFile,
   summarizeOfflineSyncPendingChanges,
@@ -4537,12 +4538,24 @@ function resolveCredentialChannel(input, env, hooks) {
 }
 
 // src/converge-capture-lock.ts
-import { resolveConvergeCaptureWriteLockBackoff } from "@remnic/core";
+import { advanceEmbeddingGenerationMarker, embeddingGenerationMembership, 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);
 }
+async function deleteConvergeFile(io, target, expectedSha256) {
+  await advanceEmbeddingGenerationMarker(
+    target.root,
+    embeddingGenerationMembership(target.path),
+    () => io.deleteFile(target),
+    async () => {
+      if ((await io.readFileDigest(target)).sha256 !== expectedSha256) {
+        throw new Error(`converge file changed before deletion: ${target.path}`);
+      }
+    }
+  );
+}
 function handleConvergeTransferResults(results, batch, onFailed) {
   for (let index = 0; index < results.length; index += 1) {
     const result = results[index];
@@ -5155,11 +5168,8 @@ async function executeConvergeApply(options = {}) {
           try {
             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) {
-              await io.deleteFile({ root: rootDir, path: localPath, filePath });
-              deleted = true;
-            }
+            await deleteConvergeFile(io, { root: rootDir, path: localPath, filePath }, entry.localSha256);
+            deleted = true;
           } catch {
             deleted = false;
           }
@@ -5210,11 +5220,8 @@ async function executeConvergeApply(options = {}) {
             try {
               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) {
-                await io.deleteFile({ root: rootDir, path: localPath, filePath });
-                deletedLocal = true;
-              }
+              await deleteConvergeFile(io, { root: rootDir, path: localPath, filePath }, entry.localSha256);
+              deletedLocal = true;
             } catch {
               deletedLocal = false;
             }
@@ -5805,13 +5812,13 @@ async function drainOfflineSyncImpressions(memoryDir, rotation) {
 import { lstat as lstat3, mkdir as mkdir2, mkdtemp as mkdtemp2, readFile as readFile2, readdir as readdir3, rm as rm3, writeFile as writeFile2 } from "fs/promises";
 import path8 from "path";
 import { hostname } from "os";
-import { StorageManager as StorageManager4, embeddingGenerationMembership } from "@remnic/core";
+import { StorageManager as StorageManager4, embeddingGenerationMembership as embeddingGenerationMembership2 } from "@remnic/core";
 var GENERATION_STAGING_PREFIX = "generation-incoming-";
 function generationMembersForStagedTransport(options) {
   const currentByPath = new Map((options.currentFiles ?? []).map((file) => [file.path, file]));
   const deferred = new Set(options.deferredPaths ?? []);
   return options.incomingFiles.filter(
-    (file) => file.bytes >= options.minBytes && !deferred.has(file.path) && currentByPath.get(file.path)?.sha256 !== file.sha256 && embeddingGenerationMembership(file.path) !== null
+    (file) => file.bytes >= options.minBytes && !deferred.has(file.path) && currentByPath.get(file.path)?.sha256 !== file.sha256 && embeddingGenerationMembership2(file.path) !== null
   ).sort((left, right) => right.bytes - left.bytes || left.path.localeCompare(right.path));
 }
 async function assertPrivateOfflineDir(offlineDir) {
@@ -14985,7 +14992,7 @@ Root: ${root}`);
       break;
   }
 }
-async function cmdBriefing(rest) {
+async function cmdBriefing(rest, abortSignal) {
   initLogger5();
   const configPath = resolveConfigPath();
   const raw = fs32.existsSync(configPath) ? JSON.parse(fs32.readFileSync(configPath, "utf8")) : {};
@@ -15046,10 +15053,13 @@ async function cmdBriefing(rest) {
   const format = effectiveFormatFlag === "json" ? "json" : effectiveFormatFlag === "markdown" ? "markdown" : config.briefing.defaultFormat;
   const orchestrator = new Orchestrator11(config);
   await orchestrator.initialize();
+  abortSignal.throwIfAborted();
   const storage = await orchestrator.getStorage(config.defaultNamespace);
   const calendarSource = config.briefing.calendarSource ? new FileCalendarSource(config.briefing.calendarSource) : void 0;
+  const locationSection = includeLocation && locationTaggingEnabled(config.location) ? await briefingLocationSection(storage.dir, window.from.toISOString(), config.location) : void 0;
   const result = await buildBriefing({
     storage,
+    abortSignal,
     window,
     focus,
     namespace: config.defaultNamespace,
@@ -15064,20 +15074,15 @@ async function cmdBriefing(rest) {
     // service so CLI and server briefings behave identically.
     followupGenerator: config.openaiApiKey ? void 0 : orchestrator.briefingChainFollowupGenerator
   });
-  if (includeLocation && locationTaggingEnabled(config.location)) {
-    const section = await briefingLocationSection(
-      storage.dir,
-      window.from.toISOString(),
-      config.location
-    );
-    if (section) {
-      result.markdown += `
+  abortSignal.throwIfAborted();
+  if (locationSection) {
+    result.markdown += `
 
-${section}
+${locationSection}
 `;
-      result.json = { ...result.json, locationContext: section };
-    }
+    result.json = { ...result.json, locationContext: locationSection };
   }
+  abortSignal.throwIfAborted();
   const payload = format === "json" ? JSON.stringify(result.json, null, 2) : result.markdown;
   console.log(payload);
   if (save) {
@@ -16188,7 +16193,7 @@ function offlineSnapshotContentFilesForApply(options) {
 function shouldDirectHydrateOfflineFile(options) {
   if (options.incoming.bytes < OFFLINE_SYNC_DIRECT_HYDRATE_MIN_BYTES) return false;
   if (options.current?.sha256 === options.incoming.sha256) return false;
-  if (embeddingGenerationMembership2(options.incoming.path)) return false;
+  if (embeddingGenerationMembership3(options.incoming.path)) return false;
   if (shouldPreferIncomingOfflineRuntimeFile(options.incoming.path)) return true;
   if (options.current && options.base && options.current.sha256 === options.base.sha256) {
     return true;
@@ -16633,7 +16638,7 @@ function chunkOfflineChangesetApplyBatches(changeset, namespace, maxRequestBytes
   const items = [];
   const itemIndexByDir = /* @__PURE__ */ new Map();
   for (const change of changeset.changes) {
-    const membership = embeddingGenerationMembership2(change.path);
+    const membership = embeddingGenerationMembership3(change.path);
     if (!membership) {
       items.push({ changes: [change], shardDir: null });
       continue;
@@ -20584,7 +20589,7 @@ Options:
       break;
     }
     case "briefing": {
-      await cmdBriefing(rest);
+      await withBriefingDeadline((signal) => cmdBriefing(rest, signal));
       break;
     }
     case "versions": {

package/package.json

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