@remnic/cli 9.69.87 → 9.69.89

package/dist/index.js

@@ -488,7 +488,7 @@ function resetLegacyDatasetWarningState() {
 // src/index.ts
 import fs32 from "fs";
 import os4 from "os";
-import path23 from "path";
+import path24 from "path";
 import { createHash as createHash6 } from "crypto";
 import { writeFile as fsWriteFile } from "fs/promises";
 import * as childProcess2 from "child_process";
@@ -573,7 +573,7 @@ import {
   discoverMemoryExtensions,
   resolveExtensionsRoot,
   coerceInstallExtension,
-  StorageManager as StorageManager4,
+  StorageManager as StorageManager5,
   parseXrayCliOptions,
   renderXray,
   parseWhyCliOptions,
@@ -597,6 +597,8 @@ import {
   offlineSyncStateFromSnapshot,
   readOfflineSyncFileContentChunk,
   readOfflineSyncState,
+  embeddingGenerationMembership as embeddingGenerationMembership2,
+  divergedEmbeddingGenerationDeferrals,
   shouldPreferIncomingOfflineRuntimeFile,
   summarizeOfflineSyncPendingChanges,
   summarizeOfflineSyncPendingFiles,
@@ -2965,7 +2967,8 @@ async function createOfflineStorageIo(memoryDir, configuredStorage, persistedExc
       chunkSize
     }),
     writeFile: async ({ filePath, content }) => storage.writeOfflineSyncFile(filePath, content),
-    writeStagingFile: async ({ filePath, content }) => storage.writeOfflineSyncStagingFile(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 }),
     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)
@@ -3305,13 +3308,13 @@ async function planLocalNamespaceCensus(args) {
     citationTemplate: args.citationTemplate,
     cachedFiles: identityCache.size > 0 ? [...identityCache.values()] : priorFiles,
     readFile: async (file) => {
-      const readFile5 = io.readFile;
-      if (!readFile5) {
+      const readFile6 = io.readFile;
+      if (!readFile6) {
         manifestReadFailed = true;
         throw new Error("offline storage cannot read reconciliation manifest files");
       }
       try {
-        return await readFile5({
+        return await readFile6({
           root: rootDir,
           path: file.path,
           filePath: path6.join(rootDir, file.path)
@@ -5447,6 +5450,157 @@ async function drainOfflineSyncImpressions(memoryDir, rotation) {
   );
 }
 
+// src/offline-generation-staging.ts
+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";
+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
+  ).sort((left, right) => right.bytes - left.bytes || left.path.localeCompare(right.path));
+}
+async function assertPrivateOfflineDir(offlineDir) {
+  const info = await lstat3(offlineDir).catch((error) => {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  });
+  if (info && (info.isSymbolicLink() || !info.isDirectory())) {
+    throw new Error("offline-sync staging directory must be a real directory, not a symlink");
+  }
+}
+async function removeStage(offlineDir, stage) {
+  await assertPrivateOfflineDir(offlineDir);
+  const info = await lstat3(stage).catch((error) => {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  });
+  if (info?.isDirectory() && !info.isSymbolicLink()) {
+    await rm3(stage, { recursive: true, force: true });
+  }
+}
+async function reclaimAbandonedGenerationStages(offlineDir) {
+  await assertPrivateOfflineDir(offlineDir);
+  const names = await readdir3(offlineDir).catch((error) => {
+    if (error.code === "ENOENT") return [];
+    throw error;
+  });
+  for (const name of names) {
+    if (!name.startsWith(GENERATION_STAGING_PREFIX)) continue;
+    const dir = path8.join(offlineDir, name);
+    try {
+      const info = await lstat3(dir);
+      if (!info.isDirectory() || info.isSymbolicLink()) continue;
+      const owner = JSON.parse(await readFile2(path8.join(dir, "owner.json"), "utf-8"));
+      if (owner?.hostname !== hostname() || !Number.isSafeInteger(owner.pid) || owner.pid <= 0) continue;
+      try {
+        process.kill(owner.pid, 0);
+      } catch (error) {
+        if (error.code === "ESRCH") {
+          await removeStage(offlineDir, dir);
+        }
+      }
+    } catch {
+    }
+  }
+}
+async function stageGenerationMembersForApply(options) {
+  const noop = {
+    stagedPaths: /* @__PURE__ */ new Set(),
+    readIncomingFile: async () => null,
+    cleanup: async () => {
+    }
+  };
+  const candidates = generationMembersForStagedTransport({
+    incomingFiles: options.incomingFiles,
+    currentFiles: options.currentFiles,
+    deferredPaths: options.deferredPaths,
+    minBytes: options.minBytes
+  });
+  const offlineDir = path8.join(options.memoryDir, ".offline-sync");
+  await reclaimAbandonedGenerationStages(offlineDir);
+  if (candidates.length === 0) return noop;
+  await mkdir2(offlineDir, { recursive: true });
+  await assertPrivateOfflineDir(offlineDir);
+  const stagingRoot = await mkdtemp2(path8.join(offlineDir, GENERATION_STAGING_PREFIX));
+  try {
+    await writeFile2(path8.join(stagingRoot, "owner.json"), JSON.stringify({
+      pid: process.pid,
+      hostname: hostname()
+    }), { mode: 384, flag: "wx" });
+    const configured = await createConfiguredOfflineStorage(options.memoryDir, options.secureStoreEncryptOnWrite);
+    const stagingStorage = new StorageManager4(stagingRoot);
+    if (configured.secureStoreRequired) stagingStorage.setSecureStoreRequired(true);
+    if (configured.secureStoreKey) {
+      await stagingStorage.setSecureStoreKeyAndWait(
+        configured.secureStoreKey,
+        options.secureStoreEncryptOnWrite ?? true
+      );
+    }
+    const stagingIo = await createOfflineStorageIo(stagingRoot, {
+      storage: stagingStorage,
+      secureStoreKey: configured.secureStoreKey,
+      secureStoreRequired: configured.secureStoreRequired
+    });
+    const stagingReadFile = stagingIo.readFile;
+    const {
+      readFileDigest: stagingReadFileDigest,
+      writeFile: stagingWriteFile,
+      writeStagingFile: stagingWriteStagingFile,
+      writeFileChunks: stagingWriteFileChunks
+    } = stagingIo;
+    if (!stagingReadFile || !stagingReadFileDigest || !stagingWriteFile || !stagingWriteStagingFile || !stagingWriteFileChunks) {
+      throw new Error("offline generation staging requires full storage IO hooks");
+    }
+    const stagedPaths = /* @__PURE__ */ new Set();
+    for (const member of candidates) {
+      const result = await options.hydrateFileContent({
+        remoteUrl: options.remoteUrl,
+        token: options.token,
+        namespace: options.namespace,
+        includeTranscripts: options.includeTranscripts,
+        memoryDir: stagingRoot,
+        sourceId: "remote",
+        expected: member,
+        readFile: stagingReadFile,
+        readFileDigest: stagingReadFileDigest,
+        writeFile: stagingWriteFile,
+        writeStagingFile: stagingWriteStagingFile,
+        writeFileChunks: stagingWriteFileChunks
+      });
+      if (result.conflict) {
+        throw new Error(`offline generation staging conflict for ${member.path}`);
+      }
+      if (!result.done || !(result.applied || result.skipped)) {
+        throw new Error(`offline generation staging did not finish for ${member.path}`);
+      }
+      stagedPaths.add(member.path);
+    }
+    return {
+      stagedPaths,
+      readIncomingFile: async (target) => {
+        if (!stagedPaths.has(target.path)) return null;
+        return await stagingReadFile({
+          root: stagingRoot,
+          path: target.path,
+          filePath: resolveOfflineDirectHydrationPath(stagingRoot, target.path)
+        });
+      },
+      cleanup: async () => {
+        await removeStage(offlineDir, stagingRoot).catch(() => {
+        });
+      }
+    };
+  } catch (error) {
+    await removeStage(offlineDir, stagingRoot).catch(() => {
+    });
+    throw error;
+  }
+}
+
 // src/index.ts
 import { briefingLocationSection, locationTaggingEnabled } from "@remnic/core/location";
 
@@ -5458,15 +5612,15 @@ import {
   readFileSync as readFileSync3,
   statSync
 } from "fs";
-import path8 from "path";
+import path9 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var STALE_BUILD_TOLERANCE_MS = 1e3;
 function assertLocalBenchBuildFreshForDevelopment(currentModuleUrl) {
   if (isTruthyEnv(process.env.REMNIC_BENCH_ALLOW_STALE_DIST)) {
     return;
   }
-  const currentDir = path8.dirname(fileURLToPath2(currentModuleUrl));
-  const benchPackageDir = path8.resolve(currentDir, "../../bench");
+  const currentDir = path9.dirname(fileURLToPath2(currentModuleUrl));
+  const benchPackageDir = path9.resolve(currentDir, "../../bench");
   const freshness = checkBenchBuildFreshness(benchPackageDir);
   if (!freshness.stale) {
     return;
@@ -5483,7 +5637,7 @@ function assertLocalBenchBuildFreshForDevelopment(currentModuleUrl) {
   );
 }
 function checkBenchBuildFreshness(benchPackageDir) {
-  const packageJsonPath = path8.join(benchPackageDir, "package.json");
+  const packageJsonPath = path9.join(benchPackageDir, "package.json");
   if (!existsSync2(packageJsonPath)) {
     return { stale: false };
   }
@@ -5496,17 +5650,17 @@ function checkBenchBuildFreshness(benchPackageDir) {
   if (packageName !== "@remnic/bench") {
     return { stale: false };
   }
-  const srcDir = path8.join(benchPackageDir, "src");
+  const srcDir = path9.join(benchPackageDir, "src");
   if (!isDirectory(srcDir)) {
     return { stale: false };
   }
   const sourceRoots = [
     srcDir,
     packageJsonPath,
-    path8.join(benchPackageDir, "tsup.config.ts"),
-    path8.join(benchPackageDir, "tsconfig.json")
+    path9.join(benchPackageDir, "tsup.config.ts"),
+    path9.join(benchPackageDir, "tsconfig.json")
   ];
-  const distPath = path8.join(benchPackageDir, "dist", "index.js");
+  const distPath = path9.join(benchPackageDir, "dist", "index.js");
   if (!existsSync2(distPath)) {
     return {
       stale: true,
@@ -5549,7 +5703,7 @@ function newestMtime(roots) {
     }
     if (stat3.isDirectory()) {
       for (const child of readdirSync(entryPath)) {
-        visit(path8.join(entryPath, child));
+        visit(path9.join(entryPath, child));
       }
       return;
     }
@@ -5582,18 +5736,18 @@ function isTruthyEnv(value) {
 
 // src/optional-bench.ts
 import { existsSync as existsSync3 } from "fs";
-import path9 from "path";
+import path10 from "path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL } from "url";
 var SPECIFIER2 = "@remnic/bench";
 var TSX_ESM_API_SPECIFIER = "tsx/esm/api";
 var cached2;
 var cachedFromLocalWorkspaceBenchSource = false;
 function resolveLocalWorkspaceBenchPaths() {
-  const currentDir = path9.dirname(fileURLToPath3(import.meta.url));
-  const benchPackageDir = path9.resolve(currentDir, "../../bench");
+  const currentDir = path10.dirname(fileURLToPath3(import.meta.url));
+  const benchPackageDir = path10.resolve(currentDir, "../../bench");
   return {
-    distEntry: path9.join(benchPackageDir, "dist", "index.js"),
-    sourceEntry: path9.join(benchPackageDir, "src", "index.ts")
+    distEntry: path10.join(benchPackageDir, "dist", "index.js"),
+    sourceEntry: path10.join(benchPackageDir, "src", "index.ts")
   };
 }
 async function tryImportLocalWorkspaceBenchSource(err) {
@@ -5730,7 +5884,7 @@ async function cmdSecurity(rest) {
 
 // src/daemon-service-candidates.ts
 import fs25 from "fs";
-import path10 from "path";
+import path11 from "path";
 var LAUNCHD_LABEL = "ai.remnic.daemon";
 var LEGACY_REMNIC_SERVER_LAUNCHD_LABEL = "ai.remnic.server";
 var LEGACY_LAUNCHD_LABEL = "ai.engram.daemon";
@@ -5743,10 +5897,10 @@ var SYSTEMD_SERVICE = "remnic.service";
 var LEGACY_SYSTEMD_SERVICE = "engram.service";
 var SYSTEMD_SERVICE_CANDIDATES = [SYSTEMD_SERVICE, LEGACY_SYSTEMD_SERVICE];
 function launchdPlistPaths(homeDir) {
-  return LAUNCHD_LABEL_CANDIDATES.map((label) => path10.join(homeDir, "Library", "LaunchAgents", `${label}.plist`));
+  return LAUNCHD_LABEL_CANDIDATES.map((label) => path11.join(homeDir, "Library", "LaunchAgents", `${label}.plist`));
 }
 function systemdUnitPaths(homeDir) {
-  return SYSTEMD_SERVICE_CANDIDATES.map((service) => path10.join(homeDir, ".config", "systemd", "user", service));
+  return SYSTEMD_SERVICE_CANDIDATES.map((service) => path11.join(homeDir, ".config", "systemd", "user", service));
 }
 function anyFileExists(paths) {
   return paths.some((candidate) => {
@@ -5780,13 +5934,13 @@ function resolveShimNodeScript(filePath) {
   } catch {
     return void 0;
   }
-  const basedir = path10.dirname(filePath);
+  const basedir = path11.dirname(filePath);
   const jsReferencePattern = /"([^"]+\.js)"|'([^']+\.js)'|([^\s"'`]+\.js)/g;
   for (const match of text.matchAll(jsReferencePattern)) {
     const raw = match[1] ?? match[2] ?? match[3];
     if (!raw) continue;
     const candidate = raw.replaceAll("${basedir}", basedir).replaceAll("$basedir", basedir).replaceAll("\\ ", " ");
-    const resolved = path10.isAbsolute(candidate) ? candidate : path10.resolve(basedir, candidate);
+    const resolved = path11.isAbsolute(candidate) ? candidate : path11.resolve(basedir, candidate);
     try {
       if (fs25.statSync(resolved).isFile() && isRunnableNodeScript(resolved)) {
         return fs25.realpathSync(resolved);
@@ -5802,10 +5956,10 @@ function resolveRunnableNodeScript(filePath) {
   return resolveShimNodeScript(realPath);
 }
 function findCommandOnPath(command, pathEnv = process.env.PATH ?? "") {
-  for (const dir of pathEnv.split(path10.delimiter)) {
+  for (const dir of pathEnv.split(path11.delimiter)) {
     if (!dir) continue;
     for (const name of commandNames(command)) {
-      const candidate = path10.join(dir, name);
+      const candidate = path11.join(dir, name);
       try {
         const stat3 = fs25.statSync(candidate);
         if (!stat3.isFile()) continue;
@@ -5819,11 +5973,11 @@ function findCommandOnPath(command, pathEnv = process.env.PATH ?? "") {
   return void 0;
 }
 function serverBinWrapperRequiredPath(candidate) {
-  const filename = path10.basename(candidate);
+  const filename = path11.basename(candidate);
   if (filename !== "remnic-server.js" && filename !== "engram-server.js") return void 0;
-  const binDir = path10.dirname(candidate);
-  if (path10.basename(binDir) !== "bin") return void 0;
-  return path10.join(path10.dirname(binDir), "dist", "index.js");
+  const binDir = path11.dirname(candidate);
+  if (path11.basename(binDir) !== "bin") return void 0;
+  return path11.join(path11.dirname(binDir), "dist", "index.js");
 }
 
 // src/service-candidates.ts
@@ -5845,7 +5999,7 @@ function firstSuccessfulCandidate(candidates, attempt) {
 }
 
 // src/bench-args.ts
-import path12 from "path";
+import path13 from "path";
 
 // src/bench-flags.ts
 function readBenchOptionValue(argv, flag) {
@@ -6210,7 +6364,7 @@ function collectBenchmarks(argv) {
 }
 
 // src/bench-args-research.ts
-import path11 from "path";
+import path12 from "path";
 function readPositiveInteger(args, flag) {
   const raw = readBenchOptionValue(args, flag);
   if (raw === void 0) return void 0;
@@ -6256,7 +6410,7 @@ function parseBenchResearchArgs(action, args) {
     }
     const outRaw = readBenchOptionValue(args, "--out");
     if (outRaw !== void 0) {
-      out = path11.resolve(expandTilde(outRaw));
+      out = path12.resolve(expandTilde(outRaw));
     }
   }
   const epochs = readPositiveInteger(args, "--epochs");
@@ -6270,8 +6424,8 @@ function parseBenchResearchArgs(action, args) {
   }
   return {
     runRef,
-    memoryDir: memoryDirRaw ? path11.resolve(expandTilde(memoryDirRaw)) : void 0,
-    qmdPath: qmdPathRaw ? path11.resolve(expandTilde(qmdPathRaw)) : void 0,
+    memoryDir: memoryDirRaw ? path12.resolve(expandTilde(memoryDirRaw)) : void 0,
+    qmdPath: qmdPathRaw ? path12.resolve(expandTilde(qmdPathRaw)) : void 0,
     collection,
     users: readPositiveInteger(args, "--users"),
     epochs,
@@ -6491,7 +6645,7 @@ function parseBenchArgs(argv) {
   }
   validateBenchFlags(action, args);
   const driftGenPositionals = action === "drift-gen" && driftGenAction === "validate" ? collectBenchmarks(args.slice(1)) : [];
-  const driftGenDir = driftGenPositionals[0] ? path12.resolve(expandTilde(driftGenPositionals[0])) : void 0;
+  const driftGenDir = driftGenPositionals[0] ? path13.resolve(expandTilde(driftGenPositionals[0])) : void 0;
   const benchmarkArgs = action === "baseline" || action === "datasets" || action === "providers" || action === "runs" || action === "drift-gen" && (args[0] === "validate" || args[0] === "generate") ? args.slice(1) : args;
   const benchmarks = collectBenchmarks(benchmarkArgs);
   const datasetDir = readBenchOptionValue(args, "--dataset-dir") ?? readBenchOptionValue(args, "--dataset");
@@ -7041,13 +7195,13 @@ function parseBenchArgs(argv) {
     mcpUrl,
     mcpToolMap,
     mcpDemo,
-    datasetDir: datasetDir ? path12.resolve(expandTilde(datasetDir)) : void 0,
-    resultsDir: resultsDir ? path12.resolve(expandTilde(resultsDir)) : void 0,
-    baselinesDir: baselinesDir ? path12.resolve(expandTilde(baselinesDir)) : void 0,
+    datasetDir: datasetDir ? path13.resolve(expandTilde(datasetDir)) : void 0,
+    resultsDir: resultsDir ? path13.resolve(expandTilde(resultsDir)) : void 0,
+    baselinesDir: baselinesDir ? path13.resolve(expandTilde(baselinesDir)) : void 0,
     runtimeProfile,
     matrixProfiles,
-    remnicConfigPath: remnicConfigRaw ? path12.resolve(expandTilde(remnicConfigRaw)) : void 0,
-    openclawConfigPath: openclawConfigRaw ? path12.resolve(expandTilde(openclawConfigRaw)) : void 0,
+    remnicConfigPath: remnicConfigRaw ? path13.resolve(expandTilde(remnicConfigRaw)) : void 0,
+    openclawConfigPath: openclawConfigRaw ? path13.resolve(expandTilde(openclawConfigRaw)) : void 0,
     modelSource,
     gatewayAgentId,
     fastGatewayAgentId,
@@ -7070,13 +7224,13 @@ function parseBenchArgs(argv) {
     internalDisableThinking: args.includes("--internal-disable-thinking"),
     internalCodexReasoningEffort,
     threshold,
-    custom: customRaw ? path12.resolve(expandTilde(customRaw)) : void 0,
+    custom: customRaw ? path13.resolve(expandTilde(customRaw)) : void 0,
     baselineAction,
     datasetAction,
     providerAction,
     runAction,
     format,
-    output: output ? path12.resolve(expandTilde(output)) : void 0,
+    output: output ? path13.resolve(expandTilde(output)) : void 0,
     target,
     publishedName,
     publishedSeed,
@@ -7086,24 +7240,24 @@ function parseBenchArgs(argv) {
     publishedIngestConcurrency,
     publishedTaskFilter,
     memcorrectAdapter,
-    publishedOut: publishedOutRaw ? path12.resolve(expandTilde(publishedOutRaw)) : void 0,
+    publishedOut: publishedOutRaw ? path13.resolve(expandTilde(publishedOutRaw)) : void 0,
     publishedDryRun: args.includes("--dry-run"),
     requestTimeout,
     localJudgeRequestTimeout,
     frontierJudgeRequestTimeout,
-    calibrationDir: calibrationDirRaw ? path12.resolve(expandTilde(calibrationDirRaw)) : void 0,
+    calibrationDir: calibrationDirRaw ? path13.resolve(expandTilde(calibrationDirRaw)) : void 0,
     calibrationLocalConfigSha256,
     calibrationFrontierConfigSha256,
     sourceResultId,
     expectedAnswerSetSha256,
     expectedQuestionIdListSha256,
-    taskIdsFile: taskIdsFileRaw ? path12.resolve(expandTilde(taskIdsFileRaw)) : void 0,
+    taskIdsFile: taskIdsFileRaw ? path13.resolve(expandTilde(taskIdsFileRaw)) : void 0,
     expectedTaskIdListSha256,
     drainTimeout,
     // Issue #1573 PR1: surface judge-cache flags into the runner options.
     noJudgeCache: args.includes("--no-judge-cache"),
-    judgeCacheDir: judgeCacheDirRaw ? path12.resolve(expandTilde(judgeCacheDirRaw)) : void 0,
-    localLabManifestPath: localLabManifestRaw ? path12.resolve(expandTilde(localLabManifestRaw)) : void 0,
+    judgeCacheDir: judgeCacheDirRaw ? path13.resolve(expandTilde(judgeCacheDirRaw)) : void 0,
+    localLabManifestPath: localLabManifestRaw ? path13.resolve(expandTilde(localLabManifestRaw)) : void 0,
     max429WaitMs,
     disableThinking: args.includes("--disable-thinking"),
     amaBenchJudgeProtocol,
@@ -7140,23 +7294,23 @@ function assertCalibrationProvenanceMatches(binding, state, benchmarkId) {
 }
 
 // src/bench-status.ts
-import { mkdir as mkdir2, readFile as readFile2, readdir as readdir3, rename as rename2, writeFile as writeFile2 } from "fs/promises";
-import path13 from "path";
+import { mkdir as mkdir3, readFile as readFile3, readdir as readdir4, rename as rename2, writeFile as writeFile3 } from "fs/promises";
+import path14 from "path";
 function createBenchStatusPath(resultsDir, pid, startedAtMs = Date.now()) {
-  return path13.join(resultsDir, `bench-status-${startedAtMs}-${pid}.json`);
+  return path14.join(resultsDir, `bench-status-${startedAtMs}-${pid}.json`);
 }
 var BENCH_STATUS_FILENAME = /^bench-status-\d+-\d+\.json$/;
 var VALID_BENCH_ENTRY_STATUSES = /* @__PURE__ */ new Set(["pending", "running", "complete", "failed"]);
 async function findLatestBenchStatusFile(resultsDir) {
   let entries;
   try {
-    entries = await readdir3(resultsDir);
+    entries = await readdir4(resultsDir);
   } catch {
     return null;
   }
   const candidates = entries.filter((name) => BENCH_STATUS_FILENAME.test(name)).sort().reverse();
   for (const name of candidates) {
-    const filePath = path13.join(resultsDir, name);
+    const filePath = path14.join(resultsDir, name);
     const status = await readBenchStatus(filePath);
     if (status) {
       return filePath;
@@ -7165,14 +7319,14 @@ async function findLatestBenchStatusFile(resultsDir) {
   return null;
 }
 async function atomicWriteJSON(filePath, data) {
-  await mkdir2(path13.dirname(filePath), { recursive: true });
+  await mkdir3(path14.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.${Date.now()}-${Math.random().toString(36).slice(2)}.tmp`;
-  await writeFile2(tmp, JSON.stringify(data, null, 2) + "\n");
+  await writeFile3(tmp, JSON.stringify(data, null, 2) + "\n");
   await rename2(tmp, filePath);
 }
 async function readBenchStatus(filePath) {
   try {
-    const raw = await readFile2(filePath, "utf-8");
+    const raw = await readFile3(filePath, "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null) return null;
     const obj = parsed;
@@ -7283,13 +7437,13 @@ function finalizeBenchStatus(filePath) {
 
 // src/openclaw-upgrade-swap.ts
 import fs26 from "fs";
-import path14 from "path";
+import path15 from "path";
 function describeError(error) {
   return error instanceof Error ? error.message : String(error);
 }
 function createSiblingTempFilePath(targetPath, label) {
   const nonce = `${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
-  return path14.join(path14.dirname(targetPath), `.${path14.basename(targetPath)}.${label}.${nonce}.tmp`);
+  return path15.join(path15.dirname(targetPath), `.${path15.basename(targetPath)}.${label}.${nonce}.tmp`);
 }
 function resolveAtomicWriteMode(targetPath, explicitMode) {
   if (explicitMode !== void 0) return explicitMode;
@@ -7317,7 +7471,7 @@ function resolveAtomicReplacementPath(targetPath) {
 }
 function createSiblingSwapPath(targetDir, label) {
   const nonce = `${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
-  return path14.join(path14.dirname(targetDir), `.${path14.basename(targetDir)}.${label}.${nonce}`);
+  return path15.join(path15.dirname(targetDir), `.${path15.basename(targetDir)}.${label}.${nonce}`);
 }
 function cleanupDisplacedDirectoryBestEffort(displacedDir, context) {
   if (!displacedDir) return void 0;
@@ -7330,7 +7484,7 @@ function cleanupDisplacedDirectoryBestEffort(displacedDir, context) {
 }
 function atomicWriteFileSync(targetPath, data, options = {}) {
   const resolvedTargetPath = resolveAtomicReplacementPath(targetPath);
-  fs26.mkdirSync(path14.dirname(resolvedTargetPath), { recursive: true });
+  fs26.mkdirSync(path15.dirname(resolvedTargetPath), { recursive: true });
   const tempPath = createSiblingTempFilePath(resolvedTargetPath, "write");
   const mode = resolveAtomicWriteMode(resolvedTargetPath, options.mode);
   try {
@@ -7350,7 +7504,7 @@ function atomicWriteFileSync(targetPath, data, options = {}) {
 function atomicCopyFileSync(sourcePath, targetPath, options = {}) {
   if (!fs26.existsSync(sourcePath)) return;
   const resolvedTargetPath = resolveAtomicReplacementPath(targetPath);
-  fs26.mkdirSync(path14.dirname(resolvedTargetPath), { recursive: true });
+  fs26.mkdirSync(path15.dirname(resolvedTargetPath), { recursive: true });
   const tempPath = createSiblingTempFilePath(resolvedTargetPath, "copy");
   const mode = fs26.statSync(sourcePath).mode & 4095;
   try {
@@ -7381,7 +7535,7 @@ function restoreDirectoryFromRollback(targetDir, rollbackDir) {
   if (!fs26.existsSync(rollbackDir)) {
     throw new Error(`Rollback directory is missing: ${rollbackDir}`);
   }
-  fs26.mkdirSync(path14.dirname(targetDir), { recursive: true });
+  fs26.mkdirSync(path15.dirname(targetDir), { recursive: true });
   const displacedDir = fs26.existsSync(targetDir) ? createSiblingSwapPath(targetDir, "rollback-restore") : void 0;
   if (displacedDir) {
     fs26.renameSync(targetDir, displacedDir);
@@ -7410,7 +7564,7 @@ function restoreDirectoryFromBackup(targetDir, backupDir) {
   if (!fs26.existsSync(backupDir)) {
     throw new Error(`Plugin backup directory is missing: ${backupDir}`);
   }
-  fs26.mkdirSync(path14.dirname(targetDir), { recursive: true });
+  fs26.mkdirSync(path15.dirname(targetDir), { recursive: true });
   const stagedDir = createSiblingSwapPath(targetDir, "backup-restore");
   const displacedDir = fs26.existsSync(targetDir) ? createSiblingSwapPath(targetDir, "pre-backup-restore") : void 0;
   fs26.cpSync(backupDir, stagedDir, { recursive: true });
@@ -7551,7 +7705,7 @@ Run this manually when you're ready:
 import { execFileSync } from "child_process";
 import fs27 from "fs";
 import os from "os";
-import path15 from "path";
+import path16 from "path";
 import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL2 } from "url";
 var MANAGED_UPGRADE_SPECIFIER = "@remnic/plugin-openclaw/managed-upgrade";
 var OPENCLAW_PLUGIN_PACKAGE = "@remnic/plugin-openclaw";
@@ -7623,8 +7777,8 @@ function buildOpenclawManagedUpgradePackageSpec(version = "latest") {
   return `${OPENCLAW_PLUGIN_PACKAGE}@${version}`;
 }
 function readCliAdapterRange() {
-  const moduleDir = path15.dirname(fileURLToPath4(import.meta.url));
-  const manifestPath = path15.resolve(moduleDir, "../package.json");
+  const moduleDir = path16.dirname(fileURLToPath4(import.meta.url));
+  const manifestPath = path16.resolve(moduleDir, "../package.json");
   const manifest = JSON.parse(fs27.readFileSync(manifestPath, "utf8"));
   if (manifest.name !== "@remnic/cli") {
     throw new Error(`Invalid @remnic/cli package manifest at ${manifestPath}.`);
@@ -7669,7 +7823,7 @@ async function loadOpenclawManagedUpgradeModule(packageSpec, hooks = {}) {
     const adapterMissing = isSpecifierNotFoundError(error, OPENCLAW_PLUGIN_PACKAGE) || isSpecifierNotFoundError(error, MANAGED_UPGRADE_SPECIFIER) || isManagedUpgradeSubpathMissing(error);
     if (!adapterMissing) throw error;
   }
-  const temporaryRoot = fs27.mkdtempSync(path15.join(os.tmpdir(), "remnic-openclaw-upgrade-"));
+  const temporaryRoot = fs27.mkdtempSync(path16.join(os.tmpdir(), "remnic-openclaw-upgrade-"));
   try {
     const toolingPackageSpec = `${OPENCLAW_PLUGIN_PACKAGE}@${readCliAdapterRange()}`;
     const installArgs = [
@@ -7683,7 +7837,7 @@ async function loadOpenclawManagedUpgradeModule(packageSpec, hooks = {}) {
       toolingPackageSpec
     ];
     (hooks.runNpmInstall ?? runNpmInstall)(installArgs);
-    const resolverPath = path15.join(temporaryRoot, "load-managed-upgrade.mjs");
+    const resolverPath = path16.join(temporaryRoot, "load-managed-upgrade.mjs");
     fs27.writeFileSync(resolverPath, `export * from ${JSON.stringify(MANAGED_UPGRADE_SPECIFIER)};
 `, "utf8");
     return await importModule(pathToFileURL2(resolverPath).href);
@@ -7699,9 +7853,9 @@ async function loadOpenclawManagedUpgradeModule(packageSpec, hooks = {}) {
 
 // src/report.ts
 import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync2, writeFileSync } from "fs";
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 import os2 from "os";
-import path16 from "path";
+import path17 from "path";
 var REPORT_ALLOWED_CONFIG_FIELDS = Object.freeze([
   "qmdEnabled",
   "qmdAutoEmbedEnabled",
@@ -7752,7 +7906,7 @@ function countMemories(dir) {
     let count = 0;
     const walk = (d) => {
       for (const entry of readdirSync2(d)) {
-        const full = path16.join(d, entry);
+        const full = path17.join(d, entry);
         const st = statSync2(full);
         if (st.isDirectory()) walk(full);
         else if (entry.endsWith(".md")) count++;
@@ -7766,9 +7920,9 @@ function countMemories(dir) {
 }
 function findConfigPath() {
   const candidates = [
-    path16.join(os2.homedir(), ".config", "remnic", "config.json"),
-    path16.join(os2.homedir(), ".config", "openclaw", "openclaw.json"),
-    path16.join(os2.homedir(), ".openclaw", "config.json")
+    path17.join(os2.homedir(), ".config", "remnic", "config.json"),
+    path17.join(os2.homedir(), ".config", "openclaw", "openclaw.json"),
+    path17.join(os2.homedir(), ".openclaw", "config.json")
   ];
   for (const p of candidates) {
     if (existsSync4(p)) return p;
@@ -7784,7 +7938,7 @@ function findMemoryDir(configPath) {
     } catch {
     }
   }
-  return path16.join(os2.homedir(), ".remnic", "memory");
+  return path17.join(os2.homedir(), ".remnic", "memory");
 }
 function extractConfigShape(rawConfig) {
   const result = {};
@@ -7813,7 +7967,7 @@ function runDoctorChecks() {
   } catch {
     checks.push({ name: "Memory directory", ok: false });
   }
-  const openclawPath = path16.join(os2.homedir(), ".config", "openclaw", "openclaw.json");
+  const openclawPath = path17.join(os2.homedir(), ".config", "openclaw", "openclaw.json");
   checks.push({ name: "OpenClaw config file", ok: existsSync4(openclawPath) });
   return checks;
 }
@@ -7895,9 +8049,9 @@ function summarizeBenchScorecard(raw) {
 function readOwn(source, key) {
   return Object.hasOwn(source, key) ? source[key] : void 0;
 }
-function readNested(source, ...path24) {
+function readNested(source, ...path25) {
   let current = source;
-  for (const key of path24) {
+  for (const key of path25) {
     if (typeof current !== "object" || current === null) return void 0;
     if (!Object.hasOwn(current, key)) return void 0;
     current = current[key];
@@ -7960,9 +8114,9 @@ async function buildReport(options = {}) {
   const sizeBucketLabel = sizeBucket(storeBytes);
   let benchScorecard;
   if (options.includeBench) {
-    const scorecardPath = path16.join(os2.homedir(), ".remnic", "reports", "bench-scorecard.json");
+    const scorecardPath = path17.join(os2.homedir(), ".remnic", "reports", "bench-scorecard.json");
     try {
-      const raw = JSON.parse(await readFile3(scorecardPath, "utf-8"));
+      const raw = JSON.parse(await readFile4(scorecardPath, "utf-8"));
       benchScorecard = summarizeBenchScorecard(raw);
     } catch {
     }
@@ -8022,12 +8176,12 @@ function renderReportJson(report) {
   return JSON.stringify(report, null, 2);
 }
 async function cmdReport(options = {}) {
-  const reportDir = path16.join(os2.homedir(), ".remnic", "reports");
+  const reportDir = path17.join(os2.homedir(), ".remnic", "reports");
   mkdirSync(reportDir, { recursive: true });
   const report = await buildReport({ includeBench: options.includeBench });
   const dateStr = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10).replace(/-/g, "");
-  const mdPath = path16.join(reportDir, `report-${dateStr}.md`);
-  const jsonPath = path16.join(reportDir, `report-${dateStr}.json`);
+  const mdPath = path17.join(reportDir, `report-${dateStr}.md`);
+  const jsonPath = path17.join(reportDir, `report-${dateStr}.json`);
   const md = renderReportMarkdown(report);
   const json = renderReportJson(report);
   writeFileSync(mdPath, md, "utf-8");
@@ -8149,13 +8303,13 @@ function resolveRemoteDaemon(configPath) {
 function resolveHostedOnlyDaemonRefusal(configPath) {
   const remoteUrl = resolveRemoteDaemonUrl(configPath);
   if (!remoteUrl) return void 0;
-  let hostname;
+  let hostname2;
   try {
-    hostname = new URL(remoteUrl).hostname;
+    hostname2 = new URL(remoteUrl).hostname;
   } catch {
     return void 0;
   }
-  if (isLoopbackHost(hostname)) return void 0;
+  if (isLoopbackHost(hostname2)) return void 0;
   return { remoteUrl };
 }
 function hostedOnlyDaemonRefusalMessage(remoteUrl, action) {
@@ -8346,10 +8500,10 @@ async function remoteRecallWhy(daemon, request) {
 
 // src/daemon-service.ts
 import fs29 from "fs";
-import path17 from "path";
+import path18 from "path";
 import * as childProcess from "child_process";
 import { fileURLToPath as fileURLToPath5 } from "url";
-var thisModuleDir = path17.dirname(fileURLToPath5(import.meta.url));
+var thisModuleDir = path18.dirname(fileURLToPath5(import.meta.url));
 function launchdLoadPlist(plistPath, processApi = childProcess) {
   processApi.execFileSync("launchctl", ["load", "-w", plistPath], { stdio: "pipe" });
 }
@@ -8371,8 +8525,8 @@ function resolveServerBinDetails(options = {}) {
     });
   } catch {
   }
-  const workspaceServerBin = path17.resolve(moduleDir, "../../remnic-server/bin/remnic-server.js");
-  const workspaceDistIndex = path17.resolve(moduleDir, "../../remnic-server/dist/index.js");
+  const workspaceServerBin = path18.resolve(moduleDir, "../../remnic-server/bin/remnic-server.js");
+  const workspaceDistIndex = path18.resolve(moduleDir, "../../remnic-server/dist/index.js");
   candidates.push(
     {
       path: workspaceServerBin,
@@ -8393,11 +8547,11 @@ function resolveServerBinDetails(options = {}) {
     });
   }
   candidates.push({
-    path: path17.resolve(moduleDir, "../../remnic-server/src/index.ts"),
+    path: path18.resolve(moduleDir, "../../remnic-server/src/index.ts"),
     source: "workspace-source"
   });
   const selected = candidates.find((candidate) => isCandidateReady(candidate, existsSync5)) ?? candidates.find((candidate) => existsSync5(candidate.path)) ?? candidates[0] ?? {
-    path: path17.resolve(moduleDir, "../../remnic-server/dist/index.js"),
+    path: path18.resolve(moduleDir, "../../remnic-server/dist/index.js"),
     source: "workspace-dist"
   };
   const exists = existsSync5(selected.path);
@@ -8452,7 +8606,7 @@ function readVerifiedDaemonPid(options) {
 }
 function doesProcessCommandLookLikeRemnicDaemon(command, expectedServerBin) {
   const normalizedCommand = command.trim();
-  const normalizedExpected = path17.resolve(expandTilde(expectedServerBin));
+  const normalizedExpected = path18.resolve(expandTilde(expectedServerBin));
   return normalizedCommand.includes(normalizedExpected) || /(?:^|\s|[/\\])(?:remnic-server|engram-server)(?:\.js)?(?:\s|$)/.test(normalizedCommand) || /@remnic[/\\]server[/\\]/.test(normalizedCommand) || /packages[/\\]remnic-server[/\\](?:bin[/\\]remnic-server\.js|dist[/\\]index\.js|src[/\\]index\.ts)/.test(normalizedCommand);
 }
 function parseDaemonPid(raw) {
@@ -8557,7 +8711,7 @@ function inspectLaunchdPlist(plistPath, options = {}) {
     };
   }
   const expandedServerArg = expandTilde(serverArg);
-  if (!path17.isAbsolute(expandedServerArg)) {
+  if (!path18.isAbsolute(expandedServerArg)) {
     return {
       installed: true,
       ok: false,
@@ -8629,8 +8783,8 @@ function normalizeResolvedPath(resolved) {
   return resolved;
 }
 function packageServerBinFromEntry(packageEntry) {
-  if (path17.basename(packageEntry) === "index.js" && path17.basename(path17.dirname(packageEntry)) === "dist") {
-    return path17.join(path17.dirname(path17.dirname(packageEntry)), "bin", "remnic-server.js");
+  if (path18.basename(packageEntry) === "index.js" && path18.basename(path18.dirname(packageEntry)) === "dist") {
+    return path18.join(path18.dirname(path18.dirname(packageEntry)), "bin", "remnic-server.js");
   }
   return packageEntry;
 }
@@ -8705,9 +8859,9 @@ import {
 
 // src/import-bundle-detect.ts
 import { lstatSync as lstatSync3, readdirSync as readdirSync3, readFileSync as readFileSync5 } from "fs";
-import path18 from "path";
+import path19 from "path";
 function detectBundleEntries(bundleDir, options = {}) {
-  const readdir4 = options.readdirImpl ?? defaultReaddir;
+  const readdir5 = options.readdirImpl ?? defaultReaddir;
   const readFileImpl = options.readFileImpl ?? defaultReadFile;
   const isDirectory2 = options.isDirectoryImpl ?? defaultIsDirectory;
   const isRegularFile = options.isRegularFileImpl ?? (options.readdirImpl !== void 0 || options.isDirectoryImpl !== void 0 ? (p) => !isDirectory2(p) : defaultIsRegularFile);
@@ -8727,7 +8881,7 @@ function detectBundleEntries(bundleDir, options = {}) {
   }
   const roots = collectCandidatePaths(
     bundleDir,
-    readdir4,
+    readdir5,
     isDirectory2,
     isRegularFile
   );
@@ -8736,7 +8890,7 @@ function detectBundleEntries(bundleDir, options = {}) {
   for (const filePath of roots) {
     if (seenFiles.has(filePath)) continue;
     seenFiles.add(filePath);
-    const name = path18.basename(filePath);
+    const name = path19.basename(filePath);
     const match = classifyFile(name, filePath, readFileImpl);
     if (match) entries.push(match);
   }
@@ -8756,9 +8910,9 @@ function detectBundleEntries(bundleDir, options = {}) {
   return entries;
 }
 var MAX_WALK_DEPTH = 4;
-function collectCandidatePaths(root, readdir4, isDirectory2, isRegularFile) {
+function collectCandidatePaths(root, readdir5, isDirectory2, isRegularFile) {
   try {
-    readdir4(root);
+    readdir5(root);
   } catch {
     throw new Error(
       `Bundle directory '${root}' could not be read. Pass an existing directory.`
@@ -8769,12 +8923,12 @@ function collectCandidatePaths(root, readdir4, isDirectory2, isRegularFile) {
     if (depth > MAX_WALK_DEPTH) return;
     let entries;
     try {
-      entries = readdir4(dir);
+      entries = readdir5(dir);
     } catch {
       return;
     }
     for (const entry of entries) {
-      const full = path18.join(dir, entry);
+      const full = path19.join(dir, entry);
       if (isDirectory2(full)) {
         walk(full, depth + 1);
       } else if (isRegularFile(full)) {
@@ -9330,7 +9484,7 @@ async function cmdCapture(rest, io) {
 
 // src/import-lossless-claw-cmd.ts
 import fs31 from "fs";
-import path19 from "path";
+import path20 from "path";
 import {
   applyLcmSchema,
   ensureLcmStateDir,
@@ -9480,7 +9634,7 @@ async function cmdImportLosslessClaw(argv, io, deps = {}) {
     let destDb;
     try {
       if (parsed.dryRun) {
-        const lcmPath = path19.join(memoryDir, "state", "lcm.sqlite");
+        const lcmPath = path20.join(memoryDir, "state", "lcm.sqlite");
         if (fs31.existsSync(lcmPath)) {
           destDb = mod.openExistingLcmDatabaseReadOnly(lcmPath);
         } else {
@@ -9600,9 +9754,9 @@ function printBenchComparisonSummary(comparison, baseline, candidate) {
 }
 
 // src/bench-coding-commands.ts
-import { lstat as lstat3, readFile as readFile4, realpath as realpath2, stat as stat2 } from "fs/promises";
+import { lstat as lstat4, readFile as readFile5, realpath as realpath2, stat as stat2 } from "fs/promises";
 import os3 from "os";
-import path20 from "path";
+import path21 from "path";
 var UINT32_MAX = 4294967295;
 var FROZEN_GENERATOR_SEED = 81;
 var FROZEN_TASK_COUNT = 30;
@@ -9612,7 +9766,7 @@ var FROZEN_MAX_STEPS = 12;
 var FROZEN_MAX_TOOL_CALLS = 8;
 var FROZEN_MAX_OUTPUT_CHARS = 16384;
 var MAX_OUTPUT_BYTES = 16384;
-var DEFAULT_REPEATED_FAILURE_OUTPUT_DIR = path20.join(
+var DEFAULT_REPEATED_FAILURE_OUTPUT_DIR = path21.join(
   resolveHomeDir(),
   ".remnic",
   "bench",
@@ -9946,7 +10100,7 @@ function parseBenchCodingArgs(args) {
   throw new Error(`unknown bench coding subcommand ${args[0]}`);
 }
 function normalizeCommandPaths(command) {
-  const resolve3 = (value) => path20.resolve(expandTilde(value));
+  const resolve3 = (value) => path21.resolve(expandTilde(value));
   if (command.kind === "repo-generate") {
     return { ...command, outputDir: resolve3(command.outputDir) };
   }
@@ -9977,27 +10131,27 @@ function normalizeCommandPaths(command) {
   return command;
 }
 async function canonicalProspectivePath(value) {
-  let candidate = path20.resolve(value);
+  let candidate = path21.resolve(value);
   const missingSegments = [];
   while (true) {
     try {
-      return path20.join(await realpath2(candidate), ...missingSegments.reverse());
+      return path21.join(await realpath2(candidate), ...missingSegments.reverse());
     } catch (error) {
       if (error.code !== "ENOENT") throw error;
-      const parent = path20.dirname(candidate);
+      const parent = path21.dirname(candidate);
       if (parent === candidate) throw error;
-      missingSegments.push(path20.basename(candidate));
+      missingSegments.push(path21.basename(candidate));
       candidate = parent;
     }
   }
 }
 function isSameOrDescendant(candidate, root) {
-  const relative2 = path20.relative(root, candidate);
-  return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path20.sep}`) && !path20.isAbsolute(relative2);
+  const relative2 = path21.relative(root, candidate);
+  return relative2 === "" || relative2 !== ".." && !relative2.startsWith(`..${path21.sep}`) && !path21.isAbsolute(relative2);
 }
 async function pathExists(value) {
   try {
-    await lstat3(value);
+    await lstat4(value);
     return true;
   } catch (error) {
     if (error.code === "ENOENT") return false;
@@ -10012,7 +10166,7 @@ async function assertSafeBenchmarkOutput(outputDir) {
       const configured = process.env[variable]?.trim();
       if (!configured) continue;
       const memoryRoot = await canonicalProspectivePath(
-        path20.resolve(expandTilde(configured))
+        path21.resolve(expandTilde(configured))
       );
       if (isSameOrDescendant(canonicalOutput, memoryRoot)) {
         throw new Error(refusal);
@@ -10020,10 +10174,10 @@ async function assertSafeBenchmarkOutput(outputDir) {
     }
     let candidate = canonicalOutput;
     while (true) {
-      const hasProfile = await pathExists(path20.join(candidate, "profile.md"));
-      const hasMemoryData = await pathExists(path20.join(candidate, "facts")) || await pathExists(path20.join(candidate, "entities")) || await pathExists(path20.join(candidate, "state"));
+      const hasProfile = await pathExists(path21.join(candidate, "profile.md"));
+      const hasMemoryData = await pathExists(path21.join(candidate, "facts")) || await pathExists(path21.join(candidate, "entities")) || await pathExists(path21.join(candidate, "state"));
       if (hasProfile && hasMemoryData) throw new Error(refusal);
-      const parent = path20.dirname(candidate);
+      const parent = path21.dirname(candidate);
       if (parent === candidate) break;
       candidate = parent;
     }
@@ -10035,7 +10189,7 @@ async function assertSafeBenchmarkOutput(outputDir) {
 async function assertH6StatsRunDirectory(runDir, commandName = "stats") {
   try {
     const parsed = JSON.parse(
-      await readFile4(path20.join(runDir, "run.json"), "utf8")
+      await readFile5(path21.join(runDir, "run.json"), "utf8")
     );
     if (parsed.schemaVersion !== 1 || typeof parsed.runId !== "string" || parsed.runId.length === 0 || typeof parsed.suiteVersion !== "string" || !parsed.suiteVersion.startsWith("h6-failure-gate-v1-")) {
       throw new Error("invalid H6 metadata");
@@ -10094,7 +10248,7 @@ async function runRepoVerification(command, bench) {
   if (command.directory === void 0) {
     dataset = await requireFunction(bench, "loadCommittedH6BenchmarkDataset")();
   } else {
-    const serialized = await readFile4(path20.join(command.directory, "dataset.json"), "utf8").catch(
+    const serialized = await readFile5(path21.join(command.directory, "dataset.json"), "utf8").catch(
       () => void 0
     );
     if (serialized === void 0) {
@@ -10222,8 +10376,8 @@ async function cmdBenchCoding(args) {
 }
 
 // src/bench-security-commands.ts
-import path21 from "path";
-var DEFAULT_OUTPUT_DIR = path21.join(
+import path22 from "path";
+var DEFAULT_OUTPUT_DIR = path22.join(
   resolveHomeDir(),
   ".remnic",
   "bench",
@@ -10706,7 +10860,7 @@ ${BENCH_SECURITY_USAGE}`);
 }
 
 // src/bench-research-commands.ts
-import path22 from "path";
+import path23 from "path";
 function emit(result) {
   if (result.output) {
     console.log(result.output);
@@ -10724,7 +10878,7 @@ async function runBenchResearchCommand(parsed) {
     emit(
       await runAttributeCliCommand({
         runRef: parsed.runRef,
-        resultsDir: parsed.resultsDir ?? path22.join(resolveHomeDir(), ".remnic", "bench", "results"),
+        resultsDir: parsed.resultsDir ?? path23.join(resolveHomeDir(), ".remnic", "bench", "results"),
         memoryDir: parsed.memoryDir,
         qmdPath: parsed.qmdPath,
         collection: parsed.collection,
@@ -10954,6 +11108,7 @@ Examples:
 }
 
 // src/index.ts
+import { divergedEmbeddingGenerationDeferrals as divergedEmbeddingGenerationDeferrals2 } from "@remnic/core";
 var LazyPluginPiPublisher = class {
   constructor(hostId, select) {
     this.hostId = hostId;
@@ -10994,14 +11149,14 @@ registerPublisher("hermes", () => new HermesMemoryExtensionPublisher());
 registerPublisher("pi", () => new LazyPluginPiPublisher("pi", (mod) => mod.PiMemoryExtensionPublisher));
 registerPublisher("omp", () => new LazyPluginPiPublisher("omp", (mod) => mod.OmpMemoryExtensionPublisher));
 registerPublisher("prime-agent", () => new LazyPluginPiPublisher("prime-agent", (mod) => mod.PrimeAgentMemoryExtensionPublisher));
-var PID_DIR = path23.join(resolveHomeDir(), ".remnic");
-var LEGACY_PID_DIR = path23.join(resolveHomeDir(), ".engram");
-var PID_FILE = path23.join(PID_DIR, "server.pid");
-var LEGACY_PID_FILE = path23.join(LEGACY_PID_DIR, "server.pid");
-var LOG_FILE = path23.join(PID_DIR, "server.log");
-var LEGACY_LOG_FILE = path23.join(LEGACY_PID_DIR, "server.log");
-var CLI_MODULE_DIR = path23.dirname(fileURLToPath6(import.meta.url));
-var CLI_REPO_ROOT2 = path23.resolve(CLI_MODULE_DIR, "../../..");
+var PID_DIR = path24.join(resolveHomeDir(), ".remnic");
+var LEGACY_PID_DIR = path24.join(resolveHomeDir(), ".engram");
+var PID_FILE = path24.join(PID_DIR, "server.pid");
+var LEGACY_PID_FILE = path24.join(LEGACY_PID_DIR, "server.pid");
+var LOG_FILE = path24.join(PID_DIR, "server.log");
+var LEGACY_LOG_FILE = path24.join(LEGACY_PID_DIR, "server.log");
+var CLI_MODULE_DIR = path24.dirname(fileURLToPath6(import.meta.url));
+var CLI_REPO_ROOT2 = path24.resolve(CLI_MODULE_DIR, "../../..");
 var OPENCLAW_GATEWAY_LABEL = "ai.openclaw.gateway";
 var CLI_SUCCESS_EXIT_GRACE_MS = 5e3;
 var CLI_OUTPUT_FLUSH_GRACE_MS = 250;
@@ -11180,12 +11335,12 @@ async function resolveKnownBenchmarkIds() {
   return knownIds;
 }
 function resolveBenchOutputDir() {
-  return path23.join(resolveHomeDir(), ".remnic", "bench", "results");
+  return path24.join(resolveHomeDir(), ".remnic", "bench", "results");
 }
 async function launchBenchUi(resultsDir) {
-  const benchUiDir = path23.join(CLI_REPO_ROOT2, "packages", "bench-ui");
+  const benchUiDir = path24.join(CLI_REPO_ROOT2, "packages", "bench-ui");
   const pnpmCmd = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
-  if (!fs32.existsSync(path23.join(benchUiDir, "package.json"))) {
+  if (!fs32.existsSync(path24.join(benchUiDir, "package.json"))) {
     console.error("ERROR: @remnic/bench-ui is not available in this checkout.");
     process.exit(1);
   }
@@ -11212,11 +11367,11 @@ async function launchBenchUi(resultsDir) {
   });
 }
 function resolveDatasetDownloadScriptPath() {
-  const bundled = path23.join(CLI_MODULE_DIR, "assets", "download-datasets.sh");
+  const bundled = path24.join(CLI_MODULE_DIR, "assets", "download-datasets.sh");
   if (fs32.existsSync(bundled)) {
     return bundled;
   }
-  return path23.join(CLI_REPO_ROOT2, "packages", "remnic-cli", "assets", "download-datasets.sh");
+  return path24.join(CLI_REPO_ROOT2, "packages", "remnic-cli", "assets", "download-datasets.sh");
 }
 function runDatasetDownloadScript(scriptPath, benchmarkId, datasetRoot, jsonMode) {
   const stdio = jsonMode ? ["inherit", process.stderr, "inherit"] : "inherit";
@@ -11522,12 +11677,12 @@ async function exportBenchPackageResult(parsed) {
     process.exit(1);
   }
   const result = await loadBenchmarkResult(summary.path);
-  const reportCardProvenance = parsed.format === "html" ? await loadBenchmarkReportCardProvenance(path23.dirname(summary.path), result.meta.id) : void 0;
+  const reportCardProvenance = parsed.format === "html" ? await loadBenchmarkReportCardProvenance(path24.dirname(summary.path), result.meta.id) : void 0;
   const rendered = renderBenchmarkResultExport(result, parsed.format, {
     ...reportCardProvenance ? { reportCardProvenance } : {}
   });
   if (parsed.output) {
-    fs32.mkdirSync(path23.dirname(parsed.output), { recursive: true });
+    fs32.mkdirSync(path24.dirname(parsed.output), { recursive: true });
     fs32.writeFileSync(parsed.output, rendered);
     console.log(`Exported ${summary.id} as ${parsed.format} to ${parsed.output}`);
     return;
@@ -11549,7 +11704,7 @@ async function manageBenchDatasets(parsed) {
       return {
         benchmark: benchmarkId,
         downloaded: discovered !== void 0,
-        path: discovered ? discovered.dir : path23.join(datasetRoot, benchmarkId),
+        path: discovered ? discovered.dir : path24.join(datasetRoot, benchmarkId),
         source: discovered?.source ?? "canonical"
       };
     });
@@ -11584,7 +11739,7 @@ async function manageBenchDatasets(parsed) {
     runDatasetDownloadScript(scriptPath, benchmarkId, datasetRoot, parsed.json === true);
     downloaded.push({
       benchmark: benchmarkId,
-      path: path23.join(datasetRoot, benchmarkId)
+      path: path24.join(datasetRoot, benchmarkId)
     });
   }
   if (parsed.json) {
@@ -11723,10 +11878,10 @@ async function calibrateBenchJudges(parsed, rawArgs) {
   }
   const bench = await loadBenchModule();
   const resultsDir = expandTilde(
-    parsed.resultsDir ?? path23.join(resolveHomeDir(), ".remnic", "bench", "results")
+    parsed.resultsDir ?? path24.join(resolveHomeDir(), ".remnic", "bench", "results")
   );
   const calibrationDir = expandTilde(
-    parsed.calibrationDir ?? path23.join(resolveHomeDir(), ".remnic", "bench", "calibration")
+    parsed.calibrationDir ?? path24.join(resolveHomeDir(), ".remnic", "bench", "calibration")
   );
   const stored = await bench.listBenchmarkResults(resultsDir);
   const allForBenchmark = stored.filter((entry) => entry.benchmark === benchmarkId);
@@ -12286,7 +12441,7 @@ async function loadPublishedPromotionHelpers() {
   return {
     async promoteArtifactsToPublished(args) {
       const { mkdirSync: mkdirSync2, readFileSync: readFileSync6, writeFileSync: writeFileSync2 } = await import("fs");
-      const path24 = await import("path");
+      const path25 = await import("path");
       mkdirSync2(args.publishedOutDir, { recursive: true });
       if (args.artifactPaths.length === 0) {
         console.warn(
@@ -12303,13 +12458,13 @@ async function loadPublishedPromotionHelpers() {
         const modelSlug = args.model.replace(/[^a-zA-Z0-9_.-]/g, "-");
         const rawProfile = parsedObj.config?.runtimeProfile;
         const profileSlug = typeof rawProfile === "string" && rawProfile.length > 0 ? `-${rawProfile.replace(/[^a-zA-Z0-9_.-]/g, "-")}` : "";
-        const target = path24.join(
+        const target = path25.join(
           args.publishedOutDir,
           `${today}-${args.benchmarkId}-${modelSlug}${profileSlug}-${gitShaShort}.json`
         );
         writeFileSync2(target, raw, "utf8");
         console.log(
-          `[bench published] Promoted ${path24.basename(artifactPath)} \u2192 ${target}`
+          `[bench published] Promoted ${path25.basename(artifactPath)} \u2192 ${target}`
         );
       }
       void benchModule;
@@ -12416,7 +12571,7 @@ async function runBenchViaPackage(parsed, benchmarkId, runtimeProfile, benchStat
   const previousCodexDiagnosticsDir = process.env[CODEX_CLI_BENCH_DIAGNOSTICS_DIR_ENV];
   const previousCodexDiagnosticsMode = process.env[CODEX_CLI_BENCH_DIAGNOSTICS_MODE_ENV];
   if (!previousCodexDiagnosticsDir) {
-    process.env[CODEX_CLI_BENCH_DIAGNOSTICS_DIR_ENV] = path23.join(
+    process.env[CODEX_CLI_BENCH_DIAGNOSTICS_DIR_ENV] = path24.join(
       outputDir,
       "codex-cli-diagnostics"
     );
@@ -12566,7 +12721,7 @@ async function preparePersistedJudgeCalibrationAttachment(benchModule, benchmark
     );
   }
   const calibrationDir = expandTilde(
-    calibrationBinding.calibrationDir ?? path23.join(resolveHomeDir(), ".remnic", "bench", "calibration")
+    calibrationBinding.calibrationDir ?? path24.join(resolveHomeDir(), ".remnic", "bench", "calibration")
   );
   const state = await benchModule.loadJudgeCalibrationState?.(benchmarkId, calibrationDir);
   if (!state) {
@@ -13048,7 +13203,7 @@ async function resolvePackageBenchRuntime(benchModule, parsed, runtimeProfile) {
   );
 }
 function normalizeMemoryDirPath(memoryDir) {
-  return path23.resolve(expandTilde(memoryDir));
+  return path24.resolve(expandTilde(memoryDir));
 }
 function resolveMemoryDir() {
   const configMemoryDir = (() => {
@@ -13061,9 +13216,9 @@ function resolveMemoryDir() {
       return normalizeMemoryDirPath(remnicCfg.memoryDir);
     }
     const home = resolveHomeDir();
-    const standalonePath = path23.join(home, ".remnic", "memory");
-    const legacyStandalonePath = path23.join(home, ".engram", "memory");
-    const openclawPath = path23.join(resolveOpenclawStateDir(), "workspace", "memory", "local");
+    const standalonePath = path24.join(home, ".remnic", "memory");
+    const legacyStandalonePath = path24.join(home, ".engram", "memory");
+    const openclawPath = path24.join(resolveOpenclawStateDir(), "workspace", "memory", "local");
     if (fs32.existsSync(standalonePath)) return standalonePath;
     if (fs32.existsSync(legacyStandalonePath)) return legacyStandalonePath;
     return openclawPath;
@@ -13112,21 +13267,21 @@ function resolveFlagStrict(args, flag) {
 var REMNIC_OPENCLAW_LEGACY_PLUGIN_ID = "openclaw-engram";
 function resolveOpenclawStateDir() {
   const configuredStateDir = process.env.OPENCLAW_STATE_DIR?.trim();
-  return configuredStateDir ? path23.resolve(expandTilde(configuredStateDir)) : path23.join(resolveHomeDir(), ".openclaw");
+  return configuredStateDir ? path24.resolve(expandTilde(configuredStateDir)) : path24.join(resolveHomeDir(), ".openclaw");
 }
 var DEFAULT_OPENCLAW_CONFIG_PATHS_FOR_DOCTOR = [
   process.env.OPENCLAW_CONFIG_PATH,
   process.env.OPENCLAW_ENGRAM_CONFIG_PATH,
-  path23.join(resolveOpenclawStateDir(), "openclaw.json")
+  path24.join(resolveOpenclawStateDir(), "openclaw.json")
 ].filter(Boolean);
 function resolveOpenclawConfigPath(cliPath) {
-  if (cliPath) return path23.resolve(expandTilde(cliPath));
+  if (cliPath) return path24.resolve(expandTilde(cliPath));
   const envPath = process.env.OPENCLAW_CONFIG_PATH || process.env.OPENCLAW_ENGRAM_CONFIG_PATH;
-  if (envPath) return path23.resolve(expandTilde(envPath));
+  if (envPath) return path24.resolve(expandTilde(envPath));
   for (const candidate of DEFAULT_OPENCLAW_CONFIG_PATHS_FOR_DOCTOR) {
     if (fs32.existsSync(candidate)) return candidate;
   }
-  return path23.join(resolveOpenclawStateDir(), "openclaw.json");
+  return path24.join(resolveOpenclawStateDir(), "openclaw.json");
 }
 function readOpenclawConfig(configPath) {
   if (!fs32.existsSync(configPath)) return {};
@@ -13185,10 +13340,10 @@ function buildRemnicOpenclawHooksPolicy(legacyHooks, existingHooks) {
 function resolveOpenclawInstallMemoryDir(args) {
   const existingMemoryDir = (typeof args.existingNewEntryConfig.memoryDir === "string" ? args.existingNewEntryConfig.memoryDir : void 0) || (args.migrateLegacy && typeof args.legacyConfigToMerge.memoryDir === "string" ? args.legacyConfigToMerge.memoryDir : void 0);
   if (args.requestedMemoryDir) {
-    return path23.resolve(expandTilde(args.requestedMemoryDir));
+    return path24.resolve(expandTilde(args.requestedMemoryDir));
   }
   if (existingMemoryDir) {
-    return path23.resolve(expandTilde(existingMemoryDir));
+    return path24.resolve(expandTilde(existingMemoryDir));
   }
   return args.fallbackMemoryDir;
 }
@@ -13206,21 +13361,21 @@ function resolveCurrentOpenclawMemoryDir(entries, slots, fallbackMemoryDir) {
     if (!config || typeof config !== "object" || Array.isArray(config)) continue;
     const memoryDir = config.memoryDir;
     if (typeof memoryDir === "string" && memoryDir.trim().length > 0) {
-      return path23.resolve(expandTilde(memoryDir));
+      return path24.resolve(expandTilde(memoryDir));
     }
   }
   return fallbackMemoryDir;
 }
 function resolveOpenclawPluginDir(cliPath) {
-  if (cliPath) return path23.resolve(expandTilde(cliPath));
+  if (cliPath) return path24.resolve(expandTilde(cliPath));
   return resolveOpenclawManagedPluginDir();
 }
 function resolveOpenclawManagedPluginDir() {
-  return path23.join(resolveOpenclawStateDir(), "extensions", REMNIC_OPENCLAW_PLUGIN_ID);
+  return path24.join(resolveOpenclawStateDir(), "extensions", REMNIC_OPENCLAW_PLUGIN_ID);
 }
 function resolveOpenclawLegacyPluginDir(cliPath) {
-  if (cliPath) return path23.resolve(expandTilde(cliPath));
-  return path23.join(resolveOpenclawStateDir(), "extensions", REMNIC_OPENCLAW_LEGACY_PLUGIN_ID);
+  if (cliPath) return path24.resolve(expandTilde(cliPath));
+  return path24.join(resolveOpenclawStateDir(), "extensions", REMNIC_OPENCLAW_LEGACY_PLUGIN_ID);
 }
 function formatOpenclawUpgradeStamp(now = /* @__PURE__ */ new Date()) {
   const yyyy = now.getFullYear().toString();
@@ -13233,7 +13388,7 @@ function formatOpenclawUpgradeStamp(now = /* @__PURE__ */ new Date()) {
 }
 function backupPathIfPresent(sourcePath, backupPath) {
   if (!fs32.existsSync(sourcePath)) return false;
-  fs32.mkdirSync(path23.dirname(backupPath), { recursive: true });
+  fs32.mkdirSync(path24.dirname(backupPath), { recursive: true });
   fs32.cpSync(sourcePath, backupPath, { recursive: true });
   return true;
 }
@@ -13252,7 +13407,7 @@ function restartOpenclawGateway() {
   });
 }
 function cmdInit() {
-  const configPath = path23.join(process.cwd(), "remnic.config.json");
+  const configPath = path24.join(process.cwd(), "remnic.config.json");
   if (fs32.existsSync(configPath)) {
     console.log(`Config already exists: ${configPath}`);
     return;
@@ -13260,7 +13415,7 @@ function cmdInit() {
   const template = {
     remnic: {
       openaiApiKey: "${OPENAI_API_KEY}",
-      memoryDir: path23.join(process.cwd(), ".remnic", "memory"),
+      memoryDir: path24.join(process.cwd(), ".remnic", "memory"),
       memoryOsPreset: "balanced"
     },
     server: {
@@ -13322,7 +13477,7 @@ async function cmdStatus(json) {
   console.log(`Remnic server: running${pid ? ` (pid ${pid})` : ""}`);
   await printHealthCheck(resolveDaemonBaseUrl(resolveConfigPath()), resolveStatusProbeToken());
 }
-async function oauthFetch(method, path24, token, body) {
+async function oauthFetch(method, path25, token, body) {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), 5e3);
   try {
@@ -13341,7 +13496,7 @@ async function oauthFetch(method, path24, token, body) {
     if (body !== void 0) {
       init.body = JSON.stringify(body);
     }
-    const response = await fetch(`${resolveDaemonBaseUrl(resolveConfigPath())}${path24}`, init);
+    const response = await fetch(`${resolveDaemonBaseUrl(resolveConfigPath())}${path25}`, init);
     if (response.status === 401) {
       throw new Error(
         "operator token rejected by remnic-server (HTTP 401). Update `server.authToken` or `REMNIC_AUTH_TOKEN` to match the running daemon."
@@ -14035,7 +14190,7 @@ async function cmdVersions(rest) {
         console.error("Usage: remnic versions list <page-path>");
         process.exit(1);
       }
-      const absPath = path23.resolve(pagePath);
+      const absPath = path24.resolve(pagePath);
       const history = await listVersions(absPath, versioningConfig, memDir);
       if (json) {
         console.log(JSON.stringify(history, null, 2));
@@ -14060,7 +14215,7 @@ async function cmdVersions(rest) {
         console.error("Usage: remnic versions show <page-path> <version-id>");
         process.exit(1);
       }
-      const absPath = path23.resolve(pagePath);
+      const absPath = path24.resolve(pagePath);
       try {
         const content = await getVersion(absPath, versionId, versioningConfig, memDir);
         console.log(content);
@@ -14078,7 +14233,7 @@ async function cmdVersions(rest) {
         console.error("Usage: remnic versions diff <page-path> <v1> <v2>");
         process.exit(1);
       }
-      const absPath = path23.resolve(pagePath);
+      const absPath = path24.resolve(pagePath);
       try {
         const diffOutput = await diffVersions(absPath, v1, v2, versioningConfig, memDir);
         console.log(diffOutput);
@@ -14095,7 +14250,7 @@ async function cmdVersions(rest) {
         console.error("Usage: remnic versions revert <page-path> <version-id>");
         process.exit(1);
       }
-      const absPath = path23.resolve(pagePath);
+      const absPath = path24.resolve(pagePath);
       try {
         const version = await revertToVersion(absPath, versionId, versioningConfig, void 0, memDir);
         if (json) {
@@ -14135,7 +14290,7 @@ async function cmdEnrich(rest) {
   const subcommand = rest[0];
   if (subcommand === "audit") {
     const memoryDir2 = expandTilde(config.memoryDir);
-    const auditDir2 = path23.join(memoryDir2, "enrichment");
+    const auditDir2 = path24.join(memoryDir2, "enrichment");
     const sinceFlag = resolveFlag(rest.slice(1), "--since");
     const entries = await readAuditLog(auditDir2, sinceFlag ?? void 0);
     if (entries.length === 0) {
@@ -14260,7 +14415,7 @@ Registered providers:`);
     return;
   }
   const memoryDir = expandTilde(config.memoryDir);
-  const auditDir = path23.join(memoryDir, "enrichment");
+  const auditDir = path24.join(memoryDir, "enrichment");
   let totalPersisted = 0;
   for (const result of results) {
     for (const candidate of result.acceptedCandidates) {
@@ -14383,7 +14538,7 @@ Root: ${root}`);
       const validNames = new Set(extensions.map((e) => e.name));
       let errors = 0;
       for (const entry of entries) {
-        const entryPath = path23.join(root, entry);
+        const entryPath = path24.join(root, entry);
         try {
           if (!fs32.statSync(entryPath).isDirectory()) continue;
         } catch {
@@ -14514,7 +14669,7 @@ ${section}
       const saveDir = resolveBriefingSaveDir(config.briefing.saveDir);
       fs32.mkdirSync(saveDir, { recursive: true });
       const filename = briefingFilename(new Date(result.window.to), format);
-      const filePath = path23.join(saveDir, filename);
+      const filePath = path24.join(saveDir, filename);
       fs32.writeFileSync(filePath, payload + (payload.endsWith("\n") ? "" : "\n"));
       console.error(`Saved briefing: ${filePath}`);
     } catch (err) {
@@ -14670,7 +14825,7 @@ async function cmdDoctor() {
       const rawMemoryDir = entryConfig?.memoryDir;
       const configuredMemoryDir = typeof rawMemoryDir === "string" ? rawMemoryDir : void 0;
       if (configuredMemoryDir) {
-        const resolvedMemDir = path23.resolve(expandTilde(configuredMemoryDir));
+        const resolvedMemDir = path24.resolve(expandTilde(configuredMemoryDir));
         let memDirOk = false;
         let memDirDetail = `${resolvedMemDir} (not found)`;
         let memDirRemediation = `Run \`remnic openclaw install --memory-dir "${resolvedMemDir}"\` to create the directory.`;
@@ -14883,7 +15038,7 @@ async function cmdMigrate(json, rollback) {
   console.log(`  Rollback: ${result.rollbackCommand}`);
 }
 function cmdOnboard(dirPath, json) {
-  const directory = path23.resolve(dirPath || process.cwd());
+  const directory = path24.resolve(dirPath || process.cwd());
   const result = onboard({ directory });
   if (json) {
     console.log(JSON.stringify(result, null, 2));
@@ -14902,7 +15057,7 @@ Suggested namespace: ${result.plan.suggestedNamespace}`);
 async function cmdCurate(targetPath, json) {
   const memoryDir = resolveMemoryDir();
   const result = await curate({
-    targetPath: path23.resolve(targetPath),
+    targetPath: path24.resolve(targetPath),
     memoryDir,
     source: "curation",
     checkDuplicates: true,
@@ -14940,7 +15095,7 @@ async function cmdReview(action, rest) {
       console.error("Usage: remnic review <approve|dismiss|flag> <id>");
       process.exit(1);
     }
-    const storage = new StorageManager4(memoryDir);
+    const storage = new StorageManager5(memoryDir);
     const configPath = resolveConfigPath();
     let tombstonesConfig = null;
     try {
@@ -15032,7 +15187,7 @@ async function cmdSync(action, rest, json) {
 }
 function localOfflineSourceId(memoryDir) {
   const host = os4.hostname() || "unknown-host";
-  const dirHash = createHash6("sha256").update(path23.resolve(memoryDir)).digest("hex").slice(0, 16);
+  const dirHash = createHash6("sha256").update(path24.resolve(memoryDir)).digest("hex").slice(0, 16);
   return `remnic-local:${host}:${dirHash}`;
 }
 function normalizeOfflineRemoteUrl(raw) {
@@ -15224,7 +15379,8 @@ async function parseOfflineSnapshotStreamResponse(response) {
         schemaVersion: parsed.schemaVersion,
         createdAt: parsed.createdAt,
         sourceId: parsed.sourceId,
-        includeTranscripts: parsed.includeTranscripts
+        includeTranscripts: parsed.includeTranscripts,
+        ...Array.isArray(parsed.omittedEmbeddingGenerationDirs) ? { omittedEmbeddingGenerationDirs: parsed.omittedEmbeddingGenerationDirs } : {}
       };
       return;
     }
@@ -15257,7 +15413,8 @@ async function parseOfflineSnapshotStreamResponse(response) {
     createdAt: finalHeader.createdAt,
     sourceId: finalHeader.sourceId,
     includeTranscripts: finalHeader.includeTranscripts,
-    files
+    files,
+    ...finalHeader.omittedEmbeddingGenerationDirs ? { omittedEmbeddingGenerationDirs: finalHeader.omittedEmbeddingGenerationDirs } : {}
   });
   return {
     ...finalHeader.namespace ? { namespace: finalHeader.namespace } : {},
@@ -15441,10 +15598,10 @@ var OFFLINE_SYNC_CONTENT_MISSING_RETRY_MAX = 3;
 var OFFLINE_SYNC_CONTENT_MISSING_RETRY_DELAY_MS = 250;
 var OfflineRemoteFileChangedError = class extends Error {
   path;
-  constructor(path24) {
-    super(`remote file changed while fetching offline content: ${path24}`);
+  constructor(path25) {
+    super(`remote file changed while fetching offline content: ${path25}`);
     this.name = "OfflineRemoteFileChangedError";
-    this.path = path24;
+    this.path = path25;
   }
 };
 function isOfflineRemoteFileChangedError(error) {
@@ -15585,9 +15742,11 @@ function offlineSnapshotContentFilesForApply(options) {
   const current = options.currentFiles ? offlineFileStateMap(options.currentFiles) : null;
   const conflictContentMaxBytes = options.conflictContentMaxBytes ?? Number.POSITIVE_INFINITY;
   const deferredPaths = new Set(options.deferredPaths ?? []);
+  const skipPaths = options.skipPaths ?? /* @__PURE__ */ new Set();
   const files = [];
   for (const incoming of options.snapshot.files) {
     if (deferredPaths.has(incoming.path)) continue;
+    if (skipPaths.has(incoming.path)) continue;
     const baseEntry = base.get(incoming.path);
     const currentEntry = current?.get(incoming.path);
     if (currentEntry?.sha256 === incoming.sha256) continue;
@@ -15613,6 +15772,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 (shouldPreferIncomingOfflineRuntimeFile(options.incoming.path)) return true;
   if (options.current && options.base && options.current.sha256 === options.base.sha256) {
     return true;
@@ -15705,7 +15865,7 @@ async function pushOfflineFileContentFromChunkReader(args) {
   }
   const hash = createHash6("sha256");
   const chunks = args.readFileChunks({
-    root: path23.resolve(args.memoryDir),
+    root: path24.resolve(args.memoryDir),
     path: args.file.path,
     filePath,
     chunkSize: OFFLINE_SYNC_FILE_CONTENT_UPLOAD_CHUNK_BYTES
@@ -15975,7 +16135,8 @@ async function hydrateOfflineSnapshotContent(args) {
     baseFiles: args.baseFiles,
     currentFiles: args.currentFiles,
     conflictContentMaxBytes: OFFLINE_SYNC_FILES_CONTENT_MAX_BATCH_BYTES,
-    deferredPaths: args.deferredPaths
+    deferredPaths: args.deferredPaths,
+    skipPaths: args.skipContentPaths
   });
   if (neededFiles.length === 0) return { ...args.snapshot, files: snapshot.files };
   const expectedByPath = new Map(snapshot.files.map((file) => [file.path, file]));
@@ -16053,31 +16214,66 @@ function chunkOfflineChangesetApplyBatches(changeset, namespace, maxRequestBytes
   if (!Number.isInteger(maxRequestBytes) || maxRequestBytes < 1) {
     throw new Error("offline sync apply max request bytes must be a positive integer");
   }
-  const chunks = [];
-  let current = [];
-  const requestBytesFor = (changes) => Buffer.byteLength(JSON.stringify({
+  const items = [];
+  const itemIndexByDir = /* @__PURE__ */ new Map();
+  for (const change of changeset.changes) {
+    const membership = embeddingGenerationMembership2(change.path);
+    if (!membership) {
+      items.push({ changes: [change], shardDir: null });
+      continue;
+    }
+    const existing = itemIndexByDir.get(membership.shardDir);
+    if (existing !== void 0) {
+      items[existing].changes.push(change);
+      continue;
+    }
+    itemIndexByDir.set(membership.shardDir, items.length);
+    items.push({ changes: [change], shardDir: membership.shardDir });
+  }
+  const manifestFor = (dirs) => (changeset.embeddingGenerations ?? []).filter((generation) => dirs.has(generation.shardDir));
+  const requestBytesFor = (changes, dirs) => Buffer.byteLength(JSON.stringify({
     namespace,
     changeset: {
       ...changeset,
-      changes
+      changes,
+      embeddingGenerations: manifestFor(dirs)
     }
   }), "utf-8");
-  for (const change of changeset.changes) {
-    const withChange = [...current, change];
-    if (current.length > 0 && requestBytesFor(withChange) > maxRequestBytes) {
-      chunks.push({ ...changeset, changes: current });
-      current = [];
-    }
-    const singleBytes = requestBytesFor([...current, change]);
-    if (singleBytes > maxRequestBytes) {
+  const chunks = [];
+  let current = [];
+  const currentDirs = /* @__PURE__ */ new Set();
+  const flush = () => {
+    chunks.push({ ...changeset, changes: current, embeddingGenerations: manifestFor(currentDirs) });
+    current = [];
+    currentDirs.clear();
+  };
+  for (const item of items) {
+    if (current.length > 0) {
+      const nextDirs = /* @__PURE__ */ new Set([...currentDirs, ...item.shardDir ? [item.shardDir] : []]);
+      if (requestBytesFor([...current, ...item.changes], nextDirs) > maxRequestBytes) {
+        flush();
+      }
+    }
+    const singleDirs = new Set(item.shardDir ? [item.shardDir] : []);
+    if (requestBytesFor(item.changes, singleDirs) > maxRequestBytes) {
+      if (item.shardDir) {
+        const generationBytes = item.changes.reduce(
+          (total, change) => total + (change.type === "upsert" ? change.file.bytes : 0),
+          0
+        );
+        throw new Error(
+          `offline sync push aborted before any request: embedding generation ${item.shardDir} (${generationBytes} bytes of shards plus sync overhead) exceeds the apply request budget of ${maxRequestBytes} bytes and cannot be split without exposing a mixed generation. Oversized generations need the secure staged chunk transport (planned; chunks land in a private staging root and publish through the atomic generation swap), not final-path upload \u2014 retry after the index shrinks below the budget.`
+        );
+      }
       throw new Error(
-        `offline sync change for ${change.path} exceeds the apply request size budget; retry after direct-push threshold is lowered`
+        `offline sync change for ${item.changes[0].path} exceeds the apply request size budget; retry after direct-push threshold is lowered`
       );
     }
-    current.push(change);
+    current.push(...item.changes);
+    if (item.shardDir) currentDirs.add(item.shardDir);
   }
   if (current.length > 0) {
-    chunks.push({ ...changeset, changes: current });
+    flush();
   }
   return chunks;
 }
@@ -16340,16 +16536,16 @@ async function runOfflineSyncOnce(options) {
     conflicts: [...prior?.conflicts ?? [], ...result.conflicts]
   });
   pushed = buildPushedSummary(null);
-  const stateWritePathsFor = (resolvedNamespace2) => offlineStatePathsForNamespace({
+  const stateWritePathsFor = (resolvedNamespace) => offlineStatePathsForNamespace({
     memoryDir: options.memoryDir,
     remoteUrl: options.remoteUrl,
     requestedNamespace: options.namespace,
-    resolvedNamespace: resolvedNamespace2,
+    resolvedNamespace,
     explicitStatePath: options.statePathExplicit ? activeStatePath : void 0
   });
   const writePartialPushState = async (error, partial, checkpointChangeset = changeset) => {
-    const resolvedNamespace2 = partial?.resolvedNamespace ?? resolvedOfflineSnapshotNamespace({ namespace: pushed?.namespace ?? "" }, syncNamespace);
-    const stateWritePaths2 = stateWritePathsFor(resolvedNamespace2);
+    const resolvedNamespace = partial?.resolvedNamespace ?? resolvedOfflineSnapshotNamespace({ namespace: pushed?.namespace ?? "" }, syncNamespace);
+    const stateWritePaths = stateWritePathsFor(resolvedNamespace);
     const nextBaseFiles = advanceOfflineBaseFilesForSuccessfulPush({
       baseFiles: syncBaseFiles,
       currentFiles: currentSnapshotForPush.files,
@@ -16358,23 +16554,23 @@ async function runOfflineSyncOnce(options) {
       changeset: checkpointChangeset,
       conflicts: pushed?.conflicts ?? directPushConflicts
     });
-    const state2 = {
+    const state = {
       version: 1,
       remoteId: options.remoteUrl,
-      ...resolvedNamespace2 ? { namespace: resolvedNamespace2 } : {},
+      ...resolvedNamespace ? { namespace: resolvedNamespace } : {},
       includeTranscripts: options.includeTranscripts,
       // Partial checkpoints do not recapture conflicted/deferred paths, so keep
       // the original capture time for safe fast-base reuse on the next run.
       lastSyncedAt: priorState?.lastSyncedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
       baseFiles: nextBaseFiles
     };
-    for (const statePath of stateWritePaths2) {
-      await writeOfflineSyncState(statePath, state2);
+    for (const statePath of stateWritePaths) {
+      await writeOfflineSyncState(statePath, state);
     }
     const message = error instanceof Error ? error.message : String(error);
     return {
-      statePath: stateWritePaths2[0] ?? activeStatePath,
-      namespace: resolvedNamespace2,
+      statePath: stateWritePaths[0] ?? activeStatePath,
+      namespace: resolvedNamespace,
       prepared: priorState === null,
       pushed,
       pull: null,
@@ -16581,18 +16777,26 @@ async function runOfflineSyncOnce(options) {
     excludeNodeLocalState: false
   });
   const applyCurrentSnapshot = await buildCurrentSnapshotForApply();
-  let remoteSnapshot;
+  const generationDeferrals = divergedEmbeddingGenerationDeferrals({
+    incomingFiles: remoteSnapshotMetadata.files,
+    baseFiles: syncBaseFiles,
+    currentFiles: applyCurrentSnapshot.files
+  });
+  const pullDeferredPaths = [...remoteDeferredPaths, ...generationDeferrals];
+  let stagedTransport;
   try {
-    remoteSnapshot = await hydrateOfflineSnapshotContent({
+    stagedTransport = await stageGenerationMembersForApply({
+      memoryDir: options.memoryDir,
       remoteUrl: options.remoteUrl,
       token: options.token,
       namespace: syncNamespace,
       includeTranscripts: options.includeTranscripts,
-      snapshot: remoteSnapshotMetadata,
-      baseFiles: syncBaseFiles,
+      incomingFiles: remoteSnapshotMetadata.files,
       currentFiles: applyCurrentSnapshot.files,
-      deferredPaths: [...remoteDeferredPaths],
-      missingContentDeferredPaths: remoteDeferredPaths
+      deferredPaths: pullDeferredPaths,
+      minBytes: options.generationStagedHydrateMinBytes ?? OFFLINE_SYNC_DIRECT_HYDRATE_MIN_BYTES,
+      secureStoreEncryptOnWrite: options.secureStoreEncryptOnWrite,
+      hydrateFileContent: hydrateOfflineFileContent
     });
   } catch (error) {
     if (pushed || partialHydration.hydratedFiles.length > 0) {
@@ -16600,36 +16804,10 @@ async function runOfflineSyncOnce(options) {
     }
     throw error;
   }
-  const resolvedNamespace = resolvedOfflineSnapshotNamespace(remoteSnapshot, syncNamespace);
-  let pull;
   try {
-    const latestApplySnapshot = await buildCurrentSnapshotForApply();
-    pull = await applyOfflineSyncSnapshot({
-      root: options.memoryDir,
-      snapshot: remoteSnapshot,
-      baseFiles: syncBaseFiles,
-      currentFiles: latestApplySnapshot.files,
-      deferredPaths: [...remoteDeferredPaths],
-      allowMissingConflictContent: true,
-      readFile: storageIo.readFile,
-      readFileDigest: storageIo.readFileDigest,
-      writeFile: storageIo.writeFile,
-      deleteFile: storageIo.deleteFile,
-      recordDeletionRevision: storageIo.recordDeletionRevision
-    });
-  } catch (error) {
-    if (!isMissingOfflineContentError(error)) {
-      if (pushed || partialHydration.hydratedFiles.length > 0) {
-        return writePartialPushState(error, {
-          ...partialHydrationWithContext,
-          resolvedNamespace
-        });
-      }
-      throw error;
-    }
-    let retrySnapshot;
+    let remoteSnapshot;
     try {
-      retrySnapshot = await hydrateOfflineSnapshotContent({
+      remoteSnapshot = await hydrateOfflineSnapshotContent({
         remoteUrl: options.remoteUrl,
         token: options.token,
         namespace: syncNamespace,
@@ -16637,69 +16815,126 @@ async function runOfflineSyncOnce(options) {
         snapshot: remoteSnapshotMetadata,
         baseFiles: syncBaseFiles,
         currentFiles: applyCurrentSnapshot.files,
-        deferredPaths: [...remoteDeferredPaths],
-        missingContentDeferredPaths: remoteDeferredPaths
+        deferredPaths: pullDeferredPaths,
+        missingContentDeferredPaths: remoteDeferredPaths,
+        skipContentPaths: stagedTransport.stagedPaths
       });
-    } catch (retryError) {
+    } catch (error) {
       if (pushed || partialHydration.hydratedFiles.length > 0) {
-        return writePartialPushState(retryError, {
-          ...partialHydrationWithContext,
-          resolvedNamespace
-        });
+        return writePartialPushState(error, partialHydrationWithContext);
       }
-      throw retryError;
+      throw error;
     }
+    const resolvedNamespace = resolvedOfflineSnapshotNamespace(remoteSnapshot, syncNamespace);
+    let pull;
     try {
-      const latestRetryApplySnapshot = await buildCurrentSnapshotForApply();
+      const latestApplySnapshot = await buildCurrentSnapshotForApply();
       pull = await applyOfflineSyncSnapshot({
         root: options.memoryDir,
-        snapshot: retrySnapshot,
+        snapshot: remoteSnapshot,
         baseFiles: syncBaseFiles,
-        currentFiles: latestRetryApplySnapshot.files,
-        deferredPaths: [...remoteDeferredPaths],
+        currentFiles: latestApplySnapshot.files,
+        deferredPaths: pullDeferredPaths,
         allowMissingConflictContent: true,
+        readIncomingFile: stagedTransport.readIncomingFile,
         readFile: storageIo.readFile,
         readFileDigest: storageIo.readFileDigest,
         writeFile: storageIo.writeFile,
+        writeStagingFile: storageIo.writeStagingFile,
+        readStagingFile: storageIo.readStagingFile,
         deleteFile: storageIo.deleteFile,
         recordDeletionRevision: storageIo.recordDeletionRevision
       });
-    } catch (retryApplyError) {
-      if (pushed || partialHydration.hydratedFiles.length > 0) {
-        return writePartialPushState(retryApplyError, {
-          ...partialHydrationWithContext,
-          resolvedNamespace
+    } catch (error) {
+      if (!isMissingOfflineContentError(error)) {
+        if (pushed || partialHydration.hydratedFiles.length > 0) {
+          return writePartialPushState(error, {
+            ...partialHydrationWithContext,
+            resolvedNamespace
+          });
+        }
+        throw error;
+      }
+      let retrySnapshot;
+      try {
+        retrySnapshot = await hydrateOfflineSnapshotContent({
+          remoteUrl: options.remoteUrl,
+          token: options.token,
+          namespace: syncNamespace,
+          includeTranscripts: options.includeTranscripts,
+          snapshot: remoteSnapshotMetadata,
+          baseFiles: syncBaseFiles,
+          currentFiles: applyCurrentSnapshot.files,
+          deferredPaths: pullDeferredPaths,
+          missingContentDeferredPaths: remoteDeferredPaths,
+          skipContentPaths: stagedTransport.stagedPaths
+        });
+      } catch (retryError) {
+        if (pushed || partialHydration.hydratedFiles.length > 0) {
+          return writePartialPushState(retryError, {
+            ...partialHydrationWithContext,
+            resolvedNamespace
+          });
+        }
+        throw retryError;
+      }
+      try {
+        const latestRetryApplySnapshot = await buildCurrentSnapshotForApply();
+        pull = await applyOfflineSyncSnapshot({
+          root: options.memoryDir,
+          snapshot: retrySnapshot,
+          baseFiles: syncBaseFiles,
+          currentFiles: latestRetryApplySnapshot.files,
+          deferredPaths: pullDeferredPaths,
+          allowMissingConflictContent: true,
+          readIncomingFile: stagedTransport.readIncomingFile,
+          readFile: storageIo.readFile,
+          readFileDigest: storageIo.readFileDigest,
+          writeFile: storageIo.writeFile,
+          writeStagingFile: storageIo.writeStagingFile,
+          readStagingFile: storageIo.readStagingFile,
+          deleteFile: storageIo.deleteFile,
+          recordDeletionRevision: storageIo.recordDeletionRevision
         });
+      } catch (retryApplyError) {
+        if (pushed || partialHydration.hydratedFiles.length > 0) {
+          return writePartialPushState(retryApplyError, {
+            ...partialHydrationWithContext,
+            resolvedNamespace
+          });
+        }
+        throw retryApplyError;
       }
-      throw retryApplyError;
     }
-  }
-  const state = offlineSyncStateFromSnapshot({
-    remoteId: options.remoteUrl,
-    namespace: resolvedNamespace,
-    snapshot: remoteSnapshot,
-    baseFiles: pull.nextBaseFiles
-  });
-  const stateWritePaths = stateWritePathsFor(resolvedNamespace);
-  for (const statePath of stateWritePaths) {
-    await writeOfflineSyncState(statePath, state);
-  }
-  return {
-    statePath: stateWritePaths[0] ?? activeStatePath,
-    namespace: resolvedNamespace,
-    prepared: priorState === null,
-    pushed,
-    pull,
-    partial: false,
-    pendingSummary,
-    remoteFileCount: remoteSnapshot.files.length,
-    largeFilePushFailures: [...directPushFailures],
-    deferred: {
-      localChangedDuringPush: [...directPushDeferredPaths].sort(),
-      remoteChangedDuringHydrate: [...remoteDeferredPaths].sort(),
-      total: directPushDeferredPaths.size + remoteDeferredPaths.size
+    const state = offlineSyncStateFromSnapshot({
+      remoteId: options.remoteUrl,
+      namespace: resolvedNamespace,
+      snapshot: remoteSnapshot,
+      baseFiles: pull.nextBaseFiles
+    });
+    const stateWritePaths = stateWritePathsFor(resolvedNamespace);
+    for (const statePath of stateWritePaths) {
+      await writeOfflineSyncState(statePath, state);
     }
-  };
+    return {
+      statePath: stateWritePaths[0] ?? activeStatePath,
+      namespace: resolvedNamespace,
+      prepared: priorState === null,
+      pushed,
+      pull,
+      partial: false,
+      pendingSummary,
+      remoteFileCount: remoteSnapshot.files.length,
+      largeFilePushFailures: [...directPushFailures],
+      deferred: {
+        localChangedDuringPush: [...directPushDeferredPaths].sort(),
+        remoteChangedDuringHydrate: [...remoteDeferredPaths].sort(),
+        total: directPushDeferredPaths.size + remoteDeferredPaths.size
+      }
+    };
+  } finally {
+    await stagedTransport.cleanup();
+  }
 }
 function sumOfflineFileBytes(files) {
   return files.reduce((total, file) => total + file.bytes, 0);
@@ -16819,7 +17054,7 @@ Environment fallbacks:
   REMNIC_OFFLINE_TOKEN > REMNIC_AUTH_TOKEN > ENGRAM_AUTH_TOKEN.`);
     return;
   }
-  const memoryDir = path23.resolve(expandTilde(resolveRequiredValueFlag(rest, "--memory-dir") ?? resolveMemoryDir()));
+  const memoryDir = path24.resolve(expandTilde(resolveRequiredValueFlag(rest, "--memory-dir") ?? resolveMemoryDir()));
   const namespace = resolveRequiredValueFlag(rest, "--namespace");
   const includeTranscripts = !hasFlag(rest, "--no-transcripts");
   const stateOverride = resolveRequiredValueFlag(rest, "--state");
@@ -16840,17 +17075,18 @@ Environment fallbacks:
   const remoteUrl = needsRemote ? resolveOfflineRemoteUrl(rest) : resolveOptionalOfflineRemoteUrl(rest);
   const knownAction = needsRemote || action === "status";
   const token = knownAction ? resolveOfflineToken(rest) : void 0;
-  const statePath = statePathExplicit ? path23.resolve(expandTilde(stateOverride)) : remoteUrl !== void 0 ? defaultOfflineSyncStatePath(memoryDir, remoteUrl, namespace) : void 0;
+  const statePath = statePathExplicit ? path24.resolve(expandTilde(stateOverride)) : remoteUrl !== void 0 ? defaultOfflineSyncStatePath(memoryDir, remoteUrl, namespace) : void 0;
   if (action === "prepare") {
     if (!remoteUrl || !token || !statePath) throw new Error("offline prepare requires remote URL and token");
     fs32.mkdirSync(memoryDir, { recursive: true });
-    const remoteSnapshot = await fetchOfflineSnapshot({
+    const remoteSnapshotMetadata = await fetchOfflineSnapshot({
       remoteUrl,
       token,
       namespace,
-      includeTranscripts
+      includeTranscripts,
+      includeContent: false
     });
-    const resolvedNamespace = resolvedOfflineSnapshotNamespace(remoteSnapshot, namespace);
+    const resolvedNamespace = resolvedOfflineSnapshotNamespace(remoteSnapshotMetadata, namespace);
     const stateWritePaths = offlineStatePathsForNamespace({
       memoryDir,
       remoteUrl,
@@ -16873,16 +17109,56 @@ Environment fallbacks:
       memoryDir,
       await createConfiguredOfflineStorage(memoryDir, config.secureStoreEncryptOnWrite)
     );
-    const pull = await applyOfflineSyncSnapshot({
+    const currentSnapshot = await buildOfflineSyncSnapshotFromBase2({
       root: memoryDir,
-      snapshot: remoteSnapshot,
-      baseFiles: existingState?.state.baseFiles ?? [],
+      sourceId: "local",
+      includeContent: false,
+      includeTranscripts,
       readFile: storageIo.readFile,
       readFileDigest: storageIo.readFileDigest,
-      writeFile: storageIo.writeFile,
-      deleteFile: storageIo.deleteFile,
-      recordDeletionRevision: storageIo.recordDeletionRevision
+      excludeNodeLocalState: false
+    });
+    const stagedTransport = await stageGenerationMembersForApply({
+      memoryDir,
+      remoteUrl,
+      token,
+      namespace: resolvedNamespace,
+      includeTranscripts,
+      incomingFiles: remoteSnapshotMetadata.files,
+      currentFiles: currentSnapshot.files,
+      minBytes: OFFLINE_SYNC_DIRECT_HYDRATE_MIN_BYTES,
+      secureStoreEncryptOnWrite: config.secureStoreEncryptOnWrite,
+      hydrateFileContent: hydrateOfflineFileContent
     });
+    let remoteSnapshot;
+    let pull;
+    try {
+      remoteSnapshot = await hydrateOfflineSnapshotContent({
+        remoteUrl,
+        token,
+        namespace: resolvedNamespace,
+        includeTranscripts,
+        snapshot: remoteSnapshotMetadata,
+        baseFiles: existingState?.state.baseFiles ?? [],
+        currentFiles: currentSnapshot.files,
+        skipContentPaths: stagedTransport.stagedPaths
+      });
+      pull = await applyOfflineSyncSnapshot({
+        root: memoryDir,
+        snapshot: remoteSnapshot,
+        baseFiles: existingState?.state.baseFiles ?? [],
+        readFile: storageIo.readFile,
+        readFileDigest: storageIo.readFileDigest,
+        writeFile: storageIo.writeFile,
+        writeStagingFile: storageIo.writeStagingFile,
+        readStagingFile: storageIo.readStagingFile,
+        deleteFile: storageIo.deleteFile,
+        recordDeletionRevision: storageIo.recordDeletionRevision,
+        readIncomingFile: stagedTransport.readIncomingFile
+      });
+    } finally {
+      await stagedTransport.cleanup();
+    }
     const state = offlineSyncStateFromSnapshot({
       remoteId: remoteUrl,
       namespace: resolvedNamespace,
@@ -17022,11 +17298,11 @@ Environment fallbacks:
           failures: result.largeFilePushFailures
         });
         largeFileFailureCounts = advanced.counts;
-        for (const path24 of advanced.newlySkipped) {
-          if (skippedLargeFiles.has(path24)) continue;
-          skippedLargeFiles.add(path24);
+        for (const path25 of advanced.newlySkipped) {
+          if (skippedLargeFiles.has(path25)) continue;
+          skippedLargeFiles.add(path25);
           console.warn(
-            `offline sync: permanently skipping ${path24} after ${OFFLINE_LARGE_FILE_SKIP_AFTER_FAILURES} failed large-file pushes for this watcher process (see issue #1786; use --exclude or offlineSyncExcludes to silence permanently)`
+            `offline sync: permanently skipping ${path25} after ${OFFLINE_LARGE_FILE_SKIP_AFTER_FAILURES} failed large-file pushes for this watcher process (see issue #1786; use --exclude or offlineSyncExcludes to silence permanently)`
           );
         }
         const pulled = result.pull ? result.pull.upserted + result.pull.deleted : 0;
@@ -17041,11 +17317,11 @@ Environment fallbacks:
             failures: error.failures
           });
           largeFileFailureCounts = advanced.counts;
-          for (const path24 of advanced.newlySkipped) {
-            if (skippedLargeFiles.has(path24)) continue;
-            skippedLargeFiles.add(path24);
+          for (const path25 of advanced.newlySkipped) {
+            if (skippedLargeFiles.has(path25)) continue;
+            skippedLargeFiles.add(path25);
             console.warn(
-              `offline sync: permanently skipping ${path24} after ${OFFLINE_LARGE_FILE_SKIP_AFTER_FAILURES} failed large-file pushes for this watcher process (see issue #1786; use --exclude or offlineSyncExcludes to silence permanently)`
+              `offline sync: permanently skipping ${path25} after ${OFFLINE_LARGE_FILE_SKIP_AFTER_FAILURES} failed large-file pushes for this watcher process (see issue #1786; use --exclude or offlineSyncExcludes to silence permanently)`
             );
           }
         }
@@ -17186,7 +17462,7 @@ async function cmdConnectors(action, rest, json) {
             const connectorDaemonUrl = typeof effectiveConnectorConfig.remnicDaemonUrl === "string" && effectiveConnectorConfig.remnicDaemonUrl.trim().length > 0 ? effectiveConnectorConfig.remnicDaemonUrl.trim() : void 0;
             const pubResult = await pub.publish({
               config: { memoryDir, namespace: connectorNamespace, daemonUrl: connectorDaemonUrl },
-              skillsRoot: path23.join(memoryDir, "skills"),
+              skillsRoot: path24.join(memoryDir, "skills"),
               rollbackTokenEntry: preInstallTokenEntry,
               log: { info: console.log, warn: console.warn, error: console.error }
             });
@@ -17546,15 +17822,15 @@ async function cmdConnectorsMarketplace(subAction, rest, json) {
     }
     const manifest = generateMarketplaceManifest();
     await writeMarketplaceManifest(outputDir, manifest);
-    const outPath = path23.join(outputDir, "marketplace.json");
+    const outPath = path24.join(outputDir, "marketplace.json");
     if (json) {
       console.log(JSON.stringify({ status: "generated", path: outPath }, null, 2));
     } else {
       console.log(`Generated marketplace.json at ${outPath}`);
     }
   } else if (subAction === "validate") {
-    const targetPath = rest.filter((a) => !a.startsWith("--"))[0] ?? path23.join(process.cwd(), "marketplace.json");
-    const resolved = path23.resolve(targetPath);
+    const targetPath = rest.filter((a) => !a.startsWith("--"))[0] ?? path24.join(process.cwd(), "marketplace.json");
+    const resolved = path24.resolve(targetPath);
     if (!fs32.existsSync(resolved)) {
       console.error(`File not found: ${resolved}`);
       process.exit(1);
@@ -17970,7 +18246,7 @@ async function cmdBench(rest) {
     }
     const completeCount = prevStatus.benchmarks.filter((b) => b.status === "complete").length;
     const failedCount = prevStatus.benchmarks.filter((b) => b.status === "failed").length;
-    printBenchStatusLine(parsed.json, `Resuming from: ${path23.basename(latestStatusPath)}`);
+    printBenchStatusLine(parsed.json, `Resuming from: ${path24.basename(latestStatusPath)}`);
     printBenchStatusLine(parsed.json, `  Previous run: ${prevStatus.startedAt}`);
     printBenchStatusLine(parsed.json, `  Benchmarks: ${prevStatus.benchmarks.length} total, ${completeCount} complete, ${failedCount} failed`);
     const before = selectedBenchmarks.length;
@@ -18135,9 +18411,9 @@ Options:
     );
     process.exit(1);
   } else {
-    fixturePath = path23.resolve(expandTilde(fixturePathRaw));
+    fixturePath = path24.resolve(expandTilde(fixturePathRaw));
   }
-  const outPath = path23.resolve(expandTilde(outPathRaw));
+  const outPath = path24.resolve(expandTilde(outPathRaw));
   const benchModule = await loadBenchModule();
   const runner = benchModule.runProceduralAblationCli;
   if (typeof runner !== "function") {
@@ -18156,7 +18432,7 @@ Options:
   );
   console.log(`wrote ${outPath}`);
 }
-var LOGS_DIR = path23.join(PID_DIR, "logs");
+var LOGS_DIR = path24.join(PID_DIR, "logs");
 var LAUNCHD_PLIST_PATHS = launchdPlistPaths(resolveHomeDir());
 var [LAUNCHD_PLIST_PATH] = LAUNCHD_PLIST_PATHS;
 var SYSTEMD_UNIT_PATHS = systemdUnitPaths(resolveHomeDir());
@@ -18233,7 +18509,7 @@ function selectLaunchdInspection(openclawPluginModeConfigured) {
   for (const plistPath of LAUNCHD_PLIST_PATHS.slice(1)) {
     const legacy = inspectLaunchdPlist(plistPath);
     if (!legacy.installed) continue;
-    const label = path23.basename(plistPath, ".plist");
+    const label = path24.basename(plistPath, ".plist");
     return legacy.ok ? {
       ...legacy,
       warn: true,
@@ -18267,10 +18543,10 @@ function daemonInstall() {
   const vars = { HOME: home, NODE_PATH: nodePath, REMNIC_SERVER_BIN: serverBin };
   fs32.mkdirSync(LOGS_DIR, { recursive: true });
   if (isMacOS()) {
-    const templatePath = path23.resolve(import.meta.dirname, "../templates/launchd/ai.remnic.daemon.plist");
+    const templatePath = path24.resolve(import.meta.dirname, "../templates/launchd/ai.remnic.daemon.plist");
     const template = fs32.readFileSync(templatePath, "utf8");
     const plist = renderTemplate(template, vars);
-    fs32.mkdirSync(path23.dirname(LAUNCHD_PLIST_PATH), { recursive: true });
+    fs32.mkdirSync(path24.dirname(LAUNCHD_PLIST_PATH), { recursive: true });
     fs32.writeFileSync(LAUNCHD_PLIST_PATH, plist);
     try {
       launchdLoadPlist(LAUNCHD_PLIST_PATH);
@@ -18287,10 +18563,10 @@ function daemonInstall() {
     console.log(`  RunAtLoad: true, KeepAlive: true`);
     console.log(`  Logs: ${LOGS_DIR}/daemon.log`);
   } else if (isLinux()) {
-    const templatePath = path23.resolve(import.meta.dirname, "../templates/systemd/remnic.service");
+    const templatePath = path24.resolve(import.meta.dirname, "../templates/systemd/remnic.service");
     const template = fs32.readFileSync(templatePath, "utf8");
     const unit = renderTemplate(template, vars);
-    fs32.mkdirSync(path23.dirname(SYSTEMD_UNIT_PATH), { recursive: true });
+    fs32.mkdirSync(path24.dirname(SYSTEMD_UNIT_PATH), { recursive: true });
     fs32.writeFileSync(SYSTEMD_UNIT_PATH, unit);
     try {
       childProcess2.execSync("systemctl --user daemon-reload", { stdio: "pipe" });
@@ -18789,7 +19065,7 @@ Clean complete: cleaned=${result.cleaned}`
 }
 async function cmdOpenclawInstall(opts) {
   const configPath = resolveOpenclawConfigPath(opts.configPath);
-  const fallbackMemoryDir = path23.join(resolveOpenclawStateDir(), "workspace", "memory", "local");
+  const fallbackMemoryDir = path24.join(resolveOpenclawStateDir(), "workspace", "memory", "local");
   console.log(`OpenClaw config: ${configPath}`);
   const existingConfig = readOpenclawConfig(configPath);
   const { plugins, entries, slots } = parseOpenclawPluginState(existingConfig, configPath);
@@ -18892,7 +19168,7 @@ Remove it first and re-run, or choose a different path with --memory-dir.`
     fs32.mkdirSync(memoryDir, { recursive: true });
     console.log(`Created memory directory: ${memoryDir}`);
   }
-  const configDir = path23.dirname(configPath);
+  const configDir = path24.dirname(configPath);
   if (!fs32.existsSync(configDir)) {
     fs32.mkdirSync(configDir, { recursive: true });
   }
@@ -18921,12 +19197,12 @@ async function cmdOpenclawUpgrade(opts) {
   const pluginDir = resolveOpenclawPluginDir(opts.pluginDir);
   const managedTargetDir = resolveOpenclawManagedPluginDir();
   const legacyPluginDirForBackup = opts.legacyPluginDirForBackup ? resolveOpenclawLegacyPluginDir(opts.legacyPluginDirForBackup) : void 0;
-  const fallbackMemoryDir = path23.join(resolveOpenclawStateDir(), "workspace", "memory", "local");
+  const fallbackMemoryDir = path24.join(resolveOpenclawStateDir(), "workspace", "memory", "local");
   const packageSpec = buildOpenclawManagedUpgradePackageSpec(opts.version);
   const configExistedBefore = fs32.existsSync(configPath);
   const existingConfig = readOpenclawConfig(configPath);
   const { entries, slots } = parseOpenclawPluginState(existingConfig, configPath);
-  const preservedMemoryDir = opts.memoryDir ? path23.resolve(expandTilde(opts.memoryDir)) : resolveCurrentOpenclawMemoryDir(entries, slots, fallbackMemoryDir);
+  const preservedMemoryDir = opts.memoryDir ? path24.resolve(expandTilde(opts.memoryDir)) : resolveCurrentOpenclawMemoryDir(entries, slots, fallbackMemoryDir);
   console.log(`OpenClaw config: ${configPath}`);
   console.log(`Plugin dir:      ${pluginDir}`);
   if (legacyPluginDirForBackup) {
@@ -18934,7 +19210,7 @@ async function cmdOpenclawUpgrade(opts) {
   }
   console.log(`Memory dir:      ${preservedMemoryDir}`);
   console.log(`Package spec:    ${packageSpec}`);
-  console.log(`Backup root:     ${path23.join(resolveOpenclawStateDir(), "backups")}`);
+  console.log(`Backup root:     ${path24.join(resolveOpenclawStateDir(), "backups")}`);
   const plannedActions = [
     `backup openclaw.json and the existing ${REMNIC_OPENCLAW_PLUGIN_ID} extension`,
     ...legacyPluginDirForBackup ? [`backup the existing ${REMNIC_OPENCLAW_LEGACY_PLUGIN_ID} extension without modifying it`] : [],
@@ -18972,9 +19248,9 @@ async function cmdOpenclawUpgrade(opts) {
     assertDirectoryPathOrMissing(legacyPluginDirForBackup, "Legacy OpenClaw plugin dir");
   }
   const backupDir = createOpenclawUpgradeBackupDir();
-  const configBackupPath = path23.join(backupDir, "openclaw.json");
-  const pluginBackupDir = path23.join(backupDir, "extensions", REMNIC_OPENCLAW_PLUGIN_ID);
-  const legacyPluginBackupDir = legacyPluginDirForBackup ? path23.join(backupDir, "extensions", REMNIC_OPENCLAW_LEGACY_PLUGIN_ID) : void 0;
+  const configBackupPath = path24.join(backupDir, "openclaw.json");
+  const pluginBackupDir = path24.join(backupDir, "extensions", REMNIC_OPENCLAW_PLUGIN_ID);
+  const legacyPluginBackupDir = legacyPluginDirForBackup ? path24.join(backupDir, "extensions", REMNIC_OPENCLAW_LEGACY_PLUGIN_ID) : void 0;
   const backupNotes = [];
   if (backupPathIfPresent(configPath, configBackupPath)) {
     backupNotes.push(`+ Backed up config to ${configBackupPath}`);
@@ -19024,7 +19300,7 @@ async function cmdOpenclawUpgrade(opts) {
     const managedRollbackDir = publishedInstallError ? publishedInstallError.managedRollbackDir : installResult?.managedRollbackDir;
     const managedRollbackTargetDir = publishedInstallError?.managedRollbackTargetDir ?? installResult?.managedRollbackTargetDir ?? managedTargetDir;
     const requiresHostManagedRestore = publishedInstallError?.requiresHostManagedRestore ?? installResult?.requiresHostManagedRestore ?? false;
-    const managedRollbackSharesPluginDir = managedRollbackDir && path23.resolve(managedRollbackTargetDir) === path23.resolve(pluginDir);
+    const managedRollbackSharesPluginDir = managedRollbackDir && path24.resolve(managedRollbackTargetDir) === path24.resolve(pluginDir);
     const pluginRollbackDir = managedRollbackSharesPluginDir ? requiresHostManagedRestore ? rollbackDir : rollbackDir ?? managedRollbackDir : rollbackDir;
     const shouldRestorePlugin = Boolean(
       installResult && !requiresHostManagedRestore || pluginRollbackDir || publishedInstallError?.shouldRestoreBackup
@@ -19081,7 +19357,7 @@ async function cmdOpenclawUpgrade(opts) {
       rollbackErrors.push(error);
     }
     if (pendingConfigRestoreError) rollbackErrors.push(pendingConfigRestoreError);
-    if (managedRollbackDir && path23.resolve(managedRollbackTargetDir) !== path23.resolve(pluginDir) && !requiresHostManagedRestore) {
+    if (managedRollbackDir && path24.resolve(managedRollbackTargetDir) !== path24.resolve(pluginDir) && !requiresHostManagedRestore) {
       try {
         rollbackNotes.push(
           ...rollbackOpenclawUpgrade({
@@ -19147,9 +19423,9 @@ async function cmdOpenclawMigrateEngram(opts) {
   console.log("  - Re-apply any local source patches to the new package only after verifying the published build.");
 }
 function createOpenclawUpgradeBackupDir() {
-  const backupsRoot = path23.join(resolveOpenclawStateDir(), "backups");
+  const backupsRoot = path24.join(resolveOpenclawStateDir(), "backups");
   fs32.mkdirSync(backupsRoot, { recursive: true });
-  return fs32.mkdtempSync(path23.join(backupsRoot, `remnic-openclaw-upgrade-${formatOpenclawUpgradeStamp()}-`));
+  return fs32.mkdtempSync(path24.join(backupsRoot, `remnic-openclaw-upgrade-${formatOpenclawUpgradeStamp()}-`));
 }
 async function cmdTaxonomy(rest) {
   initLogger5();
@@ -19191,8 +19467,8 @@ async function cmdTaxonomy(rest) {
       const doc = generateResolverDocument(taxonomy);
       console.log(doc);
       if (config.taxonomyAutoGenResolver) {
-        const resolverPath = path23.join(config.memoryDir, ".taxonomy", "RESOLVER.md");
-        fs32.mkdirSync(path23.dirname(resolverPath), { recursive: true });
+        const resolverPath = path24.join(config.memoryDir, ".taxonomy", "RESOLVER.md");
+        fs32.mkdirSync(path24.dirname(resolverPath), { recursive: true });
         fs32.writeFileSync(resolverPath, doc);
         console.error(`Written: ${resolverPath}`);
       }
@@ -19238,7 +19514,7 @@ async function cmdTaxonomy(rest) {
       console.log(`Added category "${id}" (${name}).`);
       if (config.taxonomyAutoGenResolver) {
         const doc = generateResolverDocument(taxonomy);
-        const resolverPath = path23.join(config.memoryDir, ".taxonomy", "RESOLVER.md");
+        const resolverPath = path24.join(config.memoryDir, ".taxonomy", "RESOLVER.md");
         fs32.writeFileSync(resolverPath, doc);
         console.error(`Regenerated: ${resolverPath}`);
       }
@@ -19269,7 +19545,7 @@ async function cmdTaxonomy(rest) {
       console.log(`Removed category "${id}".`);
       if (config.taxonomyAutoGenResolver) {
         const doc = generateResolverDocument(taxonomy);
-        const resolverPath = path23.join(config.memoryDir, ".taxonomy", "RESOLVER.md");
+        const resolverPath = path24.join(config.memoryDir, ".taxonomy", "RESOLVER.md");
         fs32.writeFileSync(resolverPath, doc);
         console.error(`Regenerated: ${resolverPath}`);
       }
@@ -19551,7 +19827,7 @@ async function runTrainingExport(args, stdout = process.stdout) {
     );
   }
   const formatted = adapter.formatRecords(records);
-  const outDir = path23.dirname(args.output);
+  const outDir = path24.dirname(args.output);
   fs32.mkdirSync(outDir, { recursive: true });
   const tmpPath = `${args.output}.tmp-${process.pid}-${Date.now()}`;
   fs32.writeFileSync(tmpPath, formatted, "utf-8");
@@ -19680,7 +19956,7 @@ async function main(argv = process.argv.slice(2)) {
     case "tree": {
       const subAction = rest[0];
       const json = rest.includes("--json");
-      const outputDir = resolveFlag(rest, "--output") ?? path23.join(process.cwd(), ".remnic", "context-tree");
+      const outputDir = resolveFlag(rest, "--output") ?? path24.join(process.cwd(), ".remnic", "context-tree");
       const categoriesFlag = resolveFlag(rest, "--categories");
       const categories = categoriesFlag ? categoriesFlag.split(",") : void 0;
       const maxPerCategoryRaw = resolveFlag(rest, "--max-per-category");
@@ -19757,7 +20033,7 @@ async function main(argv = process.argv.slice(2)) {
           console.error(`Context tree not found at ${treeDir}. Run 'remnic tree generate' first.`);
           process.exit(1);
         }
-        const indexPath = path23.join(treeDir, "INDEX.md");
+        const indexPath = path24.join(treeDir, "INDEX.md");
         if (!fs32.existsSync(indexPath)) {
           console.error(`INDEX.md missing in ${treeDir}. Tree may be corrupt \u2014 regenerate.`);
           process.exit(1);
@@ -20370,6 +20646,7 @@ export {
   chunkOfflineChangesetApplyBatches,
   chunkOfflineFileContentBatches,
   directHydrateLargeOfflineFiles,
+  divergedEmbeddingGenerationDeferrals2 as divergedEmbeddingGenerationDeferrals,
   extractWhyRawArgs,
   extractXrayRawArgs,
   fetchOfflineSnapshot,
@@ -20377,6 +20654,7 @@ export {
   formatOfflineRequestForError,
   hasFlag,
   hashCalibrationProviderConfig,
+  hydrateOfflineFileContent,
   hydrateOfflineSnapshotContent,
   isOfflineMissingContentDeferrablePath,
   isOfflineSnapshotPostFallbackError,