@remnic/core 9.3.664 → 9.3.665

package/dist/access-cli.js

@@ -1,6 +1,6 @@
 import {
   Orchestrator
-} from "./chunk-LIERUFPO.js";
+} from "./chunk-WH4SKYPX.js";
 import "./chunk-4SKKVWLQ.js";
 import "./chunk-7HYPN2GC.js";
 import "./chunk-666A3MOW.js";
@@ -83,7 +83,7 @@ import "./chunk-AGRPGAKR.js";
 import "./chunk-S4DDLTPX.js";
 import "./chunk-SFQ6QNL7.js";
 import "./chunk-33JBK2XP.js";
-import "./chunk-7ILWCUWH.js";
+import "./chunk-D7IXTY5E.js";
 import "./chunk-KFY3SGN7.js";
 import {
   resolvePluginEntry

package/dist/access-schema.d.ts

@@ -104,9 +104,9 @@ declare const recallRequestSchema: z.ZodObject<{
     includeLowConfidence: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     query: string;
+    namespace?: string | undefined;
     sessionKey?: string | undefined;
     tags?: string[] | undefined;
-    namespace?: string | undefined;
     topK?: number | undefined;
     mode?: "auto" | "no_recall" | "minimal" | "full" | "graph_mode" | undefined;
     cwd?: string | undefined;
@@ -125,9 +125,9 @@ declare const recallRequestSchema: z.ZodObject<{
     tagMatch?: "all" | "any" | undefined;
 }, {
     query: string;
+    namespace?: string | undefined;
     sessionKey?: string | undefined;
     tags?: string[] | undefined;
-    namespace?: string | undefined;
     topK?: number | undefined;
     mode?: "auto" | "no_recall" | "minimal" | "full" | "graph_mode" | undefined;
     cwd?: string | undefined;
@@ -149,11 +149,11 @@ declare const recallExplainRequestSchema: z.ZodObject<{
     sessionKey: z.ZodOptional<z.ZodString>;
     namespace: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    sessionKey?: string | undefined;
     namespace?: string | undefined;
-}, {
     sessionKey?: string | undefined;
+}, {
     namespace?: string | undefined;
+    sessionKey?: string | undefined;
 }>;
 /**
  * Standalone "set coding context" request. Used by the HTTP endpoint
@@ -365,30 +365,30 @@ declare const memoryStoreRequestSchema: z.ZodObject<{
     projectTag: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     content: string;
+    namespace?: string | undefined;
+    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
+    confidence?: number | undefined;
+    ttl?: string | undefined;
     schemaVersion?: number | undefined;
     sessionKey?: string | undefined;
     tags?: string[] | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
-    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
-    confidence?: number | undefined;
     entityRef?: string | undefined;
-    ttl?: string | undefined;
     sourceReason?: string | undefined;
     cwd?: string | undefined;
     idempotencyKey?: string | undefined;
     projectTag?: string | undefined;
 }, {
     content: string;
+    namespace?: string | undefined;
+    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
+    confidence?: number | undefined;
+    ttl?: string | undefined;
     schemaVersion?: number | undefined;
     sessionKey?: string | undefined;
     tags?: string[] | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
-    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
-    confidence?: number | undefined;
     entityRef?: string | undefined;
-    ttl?: string | undefined;
     sourceReason?: string | undefined;
     cwd?: string | undefined;
     idempotencyKey?: string | undefined;
@@ -411,30 +411,30 @@ declare const suggestionSubmitRequestSchema: z.ZodObject<{
     projectTag: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     content: string;
+    namespace?: string | undefined;
+    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
+    confidence?: number | undefined;
+    ttl?: string | undefined;
     schemaVersion?: number | undefined;
     sessionKey?: string | undefined;
     tags?: string[] | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
-    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
-    confidence?: number | undefined;
     entityRef?: string | undefined;
-    ttl?: string | undefined;
     sourceReason?: string | undefined;
     cwd?: string | undefined;
     idempotencyKey?: string | undefined;
     projectTag?: string | undefined;
 }, {
     content: string;
+    namespace?: string | undefined;
+    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
+    confidence?: number | undefined;
+    ttl?: string | undefined;
     schemaVersion?: number | undefined;
     sessionKey?: string | undefined;
     tags?: string[] | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
-    category?: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace" | undefined;
-    confidence?: number | undefined;
     entityRef?: string | undefined;
-    ttl?: string | undefined;
     sourceReason?: string | undefined;
     cwd?: string | undefined;
     idempotencyKey?: string | undefined;
@@ -468,18 +468,18 @@ declare const trustZonePromoteRequestSchema: z.ZodObject<{
     recordId: string;
     targetZone: "working" | "trusted";
     promotionReason: string;
+    namespace?: string | undefined;
     recordedAt?: string | undefined;
     summary?: string | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
 }, {
     recordId: string;
     targetZone: "working" | "trusted";
     promotionReason: string;
+    namespace?: string | undefined;
     recordedAt?: string | undefined;
     summary?: string | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
 }>;
 declare const trustZoneDemoSeedRequestSchema: z.ZodObject<{
     scenario: z.ZodOptional<z.ZodString>;
@@ -487,14 +487,14 @@ declare const trustZoneDemoSeedRequestSchema: z.ZodObject<{
     dryRun: z.ZodOptional<z.ZodBoolean>;
     namespace: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
+    namespace?: string | undefined;
     recordedAt?: string | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
     scenario?: string | undefined;
 }, {
+    namespace?: string | undefined;
     recordedAt?: string | undefined;
     dryRun?: boolean | undefined;
-    namespace?: string | undefined;
     scenario?: string | undefined;
 }>;
 declare const lcmSearchRequestSchema: z.ZodObject<{
@@ -505,15 +505,15 @@ declare const lcmSearchRequestSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     query: string;
-    sessionKey?: string | undefined;
     namespace?: string | undefined;
     limit?: number | undefined;
+    sessionKey?: string | undefined;
     sessionPrefix?: string | undefined;
 }, {
     query: string;
-    sessionKey?: string | undefined;
     namespace?: string | undefined;
     limit?: number | undefined;
+    sessionKey?: string | undefined;
     sessionPrefix?: string | undefined;
 }>;
 declare const lcmCompactionFlushRequestSchema: z.ZodObject<{
@@ -548,14 +548,14 @@ declare const daySummaryRequestSchema: z.ZodObject<{
     namespace: z.ZodOptional<z.ZodString>;
     timeZone: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
 }, "strip", z.ZodTypeAny, {
+    namespace?: string | undefined;
     sessionKey?: string | undefined;
     timeZone?: string | undefined;
-    namespace?: string | undefined;
     memories?: string | undefined;
 }, {
+    namespace?: string | undefined;
     sessionKey?: string | undefined;
     timeZone?: string | undefined;
-    namespace?: string | undefined;
     memories?: string | undefined;
 }>;
 declare const capsuleExportRequestSchema: z.ZodObject<{
@@ -603,11 +603,11 @@ declare const capsuleListRequestSchema: z.ZodObject<{
     namespace: z.ZodOptional<z.ZodString>;
     sessionKey: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    sessionKey?: string | undefined;
     namespace?: string | undefined;
-}, {
     sessionKey?: string | undefined;
+}, {
     namespace?: string | undefined;
+    sessionKey?: string | undefined;
 }>;
 declare const offlineSyncSnapshotRequestSchema: z.ZodObject<{
     namespace: z.ZodOptional<z.ZodString>;
@@ -748,11 +748,11 @@ declare const actionConfidenceRequestSchema: z.ZodObject<{
         safety: z.ZodEffects<z.ZodNullable<z.ZodOptional<z.ZodEnum<["safe", "requires-review", "blocked"]>>>, NonNullable<"blocked" | "safe" | "requires-review"> | undefined, "blocked" | "safe" | "requires-review" | null | undefined>;
         safetyReasons: z.ZodEffects<z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>, string[] | undefined, string[] | null | undefined>;
     }, "strict", z.ZodTypeAny, {
+        confidence?: number | undefined;
         source?: string | undefined;
         stale?: boolean | undefined;
         created?: string | undefined;
         updated?: string | undefined;
-        confidence?: number | undefined;
         scope?: string | undefined;
         retrievalReason?: string | undefined;
         safety?: NonNullable<"blocked" | "safe" | "requires-review"> | undefined;
@@ -762,11 +762,11 @@ declare const actionConfidenceRequestSchema: z.ZodObject<{
         safetyReasons?: string[] | undefined;
         userContextScopes?: string[] | undefined;
     }, {
+        confidence?: number | null | undefined;
         source?: string | null | undefined;
         stale?: boolean | null | undefined;
         created?: string | null | undefined;
         updated?: string | null | undefined;
-        confidence?: number | null | undefined;
         scope?: string | null | undefined;
         retrievalReason?: string | null | undefined;
         safety?: "blocked" | "safe" | "requires-review" | null | undefined;
@@ -776,11 +776,11 @@ declare const actionConfidenceRequestSchema: z.ZodObject<{
         safetyReasons?: string[] | null | undefined;
         userContextScopes?: string[] | null | undefined;
     }>, "many">>>, {
+        confidence?: number | undefined;
         source?: string | undefined;
         stale?: boolean | undefined;
         created?: string | undefined;
         updated?: string | undefined;
-        confidence?: number | undefined;
         scope?: string | undefined;
         retrievalReason?: string | undefined;
         safety?: NonNullable<"blocked" | "safe" | "requires-review"> | undefined;
@@ -790,11 +790,11 @@ declare const actionConfidenceRequestSchema: z.ZodObject<{
         safetyReasons?: string[] | undefined;
         userContextScopes?: string[] | undefined;
     }[] | undefined, {
+        confidence?: number | null | undefined;
         source?: string | null | undefined;
         stale?: boolean | null | undefined;
         created?: string | null | undefined;
         updated?: string | null | undefined;
-        confidence?: number | null | undefined;
         scope?: string | null | undefined;
         retrievalReason?: string | null | undefined;
         safety?: "blocked" | "safe" | "requires-review" | null | undefined;
@@ -816,11 +816,11 @@ declare const actionConfidenceRequestSchema: z.ZodObject<{
         matched?: boolean | undefined;
     }[] | undefined;
     retrievedMemories?: {
+        confidence?: number | undefined;
         source?: string | undefined;
         stale?: boolean | undefined;
         created?: string | undefined;
         updated?: string | undefined;
-        confidence?: number | undefined;
         scope?: string | undefined;
         retrievalReason?: string | undefined;
         safety?: NonNullable<"blocked" | "safe" | "requires-review"> | undefined;
@@ -842,11 +842,11 @@ declare const actionConfidenceRequestSchema: z.ZodObject<{
         matched?: boolean | null | undefined;
     }[] | null | undefined;
     retrievedMemories?: {
+        confidence?: number | null | undefined;
         source?: string | null | undefined;
         stale?: boolean | null | undefined;
         created?: string | null | undefined;
         updated?: string | null | undefined;
-        confidence?: number | null | undefined;
         scope?: string | null | undefined;
         retrievalReason?: string | null | undefined;
         safety?: "blocked" | "safe" | "requires-review" | null | undefined;

package/dist/{chunk-NLF54XMD.js → chunk-2OPARZ4B.js}

@@ -93,12 +93,12 @@ import {
   runOperatorInventory,
   runOperatorRepair,
   runOperatorSetup
-} from "./chunk-YKX63GBK.js";
+} from "./chunk-XRSIGVTS.js";
 import {
   listNamespaces,
   runNamespaceMigration,
   verifyNamespaces
-} from "./chunk-XB5P5P2L.js";
+} from "./chunk-7C4MPEPE.js";
 import {
   collectPatternMemories,
   explainPatternMemory,
@@ -7311,4 +7311,4 @@ export {
   listMemoryMarkdownFilePaths,
   registerCli
 };
-//# sourceMappingURL=chunk-NLF54XMD.js.map
+//# sourceMappingURL=chunk-2OPARZ4B.js.map

package/dist/{chunk-XB5P5P2L.js → chunk-7C4MPEPE.js}

@@ -1,6 +1,6 @@
 import {
   NamespaceStorageRouter
-} from "./chunk-7ILWCUWH.js";
+} from "./chunk-D7IXTY5E.js";
 import {
   namespaceCollectionName
 } from "./chunk-DQY7NJ5L.js";
@@ -204,4 +204,4 @@ export {
   verifyNamespaces,
   runNamespaceMigration
 };
-//# sourceMappingURL=chunk-XB5P5P2L.js.map
+//# sourceMappingURL=chunk-7C4MPEPE.js.map

package/dist/{chunk-7ILWCUWH.js → chunk-D7IXTY5E.js}

@@ -126,6 +126,11 @@ var NamespaceStorageRouter = class {
   // entry is always removed when the promise settles, so the map cannot grow
   // unbounded (one transient entry per concurrently-resolving namespace).
   inFlightResolved = /* @__PURE__ */ new Map();
+  // Tracks every in-flight resolve-hook promise so callers can deterministically
+  // await the fire-and-forget registrations that `storageFor()` kicks off (see
+  // `whenResolveHooksSettled`). Entries are removed as each hook settles, so the
+  // set holds at most one promise per concurrently-resolving namespace.
+  pendingResolveHooks = /* @__PURE__ */ new Set();
   // Normalized (trimmed) default namespace identity (NH-FH). `storageFor`
   // normalizes its input, so default-namespace branches must compare against the
   // normalized config default too — otherwise a whitespace-padded configured
@@ -180,7 +185,9 @@ var NamespaceStorageRouter = class {
     if (this.inFlightResolved.get(namespace) === storageDir) return;
     try {
       this.inFlightResolved.set(namespace, storageDir);
-      Promise.resolve(hook(namespace, storageDir)).then(
+      const hookResult = Promise.resolve(hook(namespace, storageDir));
+      this.pendingResolveHooks.add(hookResult);
+      hookResult.then(
         (persisted) => {
           if (this.inFlightResolved.get(namespace) === storageDir) {
             this.inFlightResolved.delete(namespace);
@@ -188,6 +195,7 @@ var NamespaceStorageRouter = class {
           if (persisted !== false) {
             this.notifiedResolved.set(namespace, storageDir);
           }
+          this.pendingResolveHooks.delete(hookResult);
         },
         () => {
           if (this.inFlightResolved.get(namespace) === storageDir) {
@@ -196,6 +204,7 @@ var NamespaceStorageRouter = class {
           if (this.notifiedResolved.get(namespace) === storageDir) {
             this.notifiedResolved.delete(namespace);
           }
+          this.pendingResolveHooks.delete(hookResult);
         }
       );
     } catch {
@@ -204,6 +213,22 @@ var NamespaceStorageRouter = class {
       }
     }
   }
+  /**
+   * Resolve once every in-flight `onResolve` registration has settled.
+   *
+   * `storageFor()` fires the resolve hook fire-and-forget, so its catalog side
+   * effect (e.g. `registerResolved(...)`) is not observable the moment
+   * `storageFor()` returns. Callers that must act on that side effect — notably
+   * tests asserting the catalog was updated — should await this instead of
+   * racing a timer. Resolves immediately when no hook is registered or nothing
+   * is in flight. The loop re-checks because a settling hook could, in
+   * principle, trigger a follow-on resolution.
+   */
+  async whenResolveHooksSettled() {
+    while (this.pendingResolveHooks.size > 0) {
+      await Promise.allSettled([...this.pendingResolveHooks]);
+    }
+  }
 };
 
 export {
@@ -211,4 +236,4 @@ export {
   resolveNamespaceStorageRoot,
   NamespaceStorageRouter
 };
-//# sourceMappingURL=chunk-7ILWCUWH.js.map
+//# sourceMappingURL=chunk-D7IXTY5E.js.map

package/dist/chunk-D7IXTY5E.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/namespaces/storage.ts"],"sourcesContent":["import path from \"node:path\";\nimport { access, lstat, readdir } from \"node:fs/promises\";\nimport { isSafeRouteNamespace } from \"../routing/engine.js\";\nimport { StorageManager } from \"../storage.js\";\nimport type { PluginConfig } from \"../types.js\";\nimport { ALL_CATEGORY_DIRS } from \"../utils/category-dir.js\";\nimport { namespaceIdentityToken, normalizeNamespaceIdentity } from \"./identity.js\";\n\nasync function exists(p: string): Promise<boolean> {\n  try {\n    await access(p);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\nasync function hasStoredEntries(p: string): Promise<boolean> {\n  try {\n    const entry = await lstat(p);\n    if (entry.isSymbolicLink()) return true;\n    if (!entry.isDirectory()) return true;\n    const children = await readdir(p, { withFileTypes: true });\n    for (const child of children) {\n      const childPath = path.join(p, child.name);\n      if (child.isSymbolicLink() || child.isFile()) return true;\n      if (child.isDirectory() && (await hasStoredEntries(childPath))) return true;\n    }\n    return false;\n  } catch {\n    return false;\n  }\n}\n\n// Build a per-namespace directory under `<memoryDir>/namespaces` and assert the\n// resolved path stays inside that base. Namespace identifiers can originate from\n// operator config (config.defaultNamespace) and request-derived routing, so this\n// containment check prevents directory traversal (CodeQL js/path-injection).\n// For safe segments this returns exactly `path.join(base, segment)`, so there is\n// no behavioral change for valid namespaces.\nfunction resolveNamespaceDir(memoryDir: string, segment: string): string {\n  // Mirror isSafeRouteNamespace's separator/parent-ref rejection (without its\n  // 64-char cap, so identity tokens still pass). Rejecting separators and \"..\"\n  // up front keeps the value a single contained child of <memoryDir>/namespaces.\n  if (\n    segment.length === 0 ||\n    segment.includes(\"/\") ||\n    segment.includes(\"\\\\\") ||\n    segment.includes(\"..\") ||\n    path.isAbsolute(segment)\n  ) {\n    throw new Error(`unsafe namespace path segment: ${segment}`);\n  }\n  return path.join(memoryDir, \"namespaces\", segment);\n}\n\nconst LEGACY_NAMESPACE_CONTENT_CHILDREN = [\n  ...ALL_CATEGORY_DIRS,\n  \"entities\",\n  \"artifacts\",\n  \"identity\",\n  \"config\",\n  \"summaries\",\n  \"profile.md\",\n] as const;\n\nconst LEGACY_NAMESPACE_RUNTIME_CHILDREN = [\"state\"] as const;\n\nasync function hasAnyLegacyData(\n  rootDir: string,\n  options: { includeRuntimeState?: boolean } = {},\n): Promise<boolean> {\n  const children = options.includeRuntimeState === true\n    ? [...LEGACY_NAMESPACE_CONTENT_CHILDREN, ...LEGACY_NAMESPACE_RUNTIME_CHILDREN]\n    : LEGACY_NAMESPACE_CONTENT_CHILDREN;\n  for (const child of children) {\n    if (await hasStoredEntries(path.join(rootDir, child))) return true;\n  }\n  return false;\n}\n\nasync function hasAnyNamespaceStorageMarker(\n  rootDir: string,\n  options: { includeRuntimeState?: boolean } = {},\n): Promise<boolean> {\n  const children = options.includeRuntimeState === true\n    ? [...LEGACY_NAMESPACE_CONTENT_CHILDREN, ...LEGACY_NAMESPACE_RUNTIME_CHILDREN]\n    : LEGACY_NAMESPACE_CONTENT_CHILDREN;\n  for (const child of children) {\n    if (await exists(path.join(rootDir, child))) return true;\n  }\n  return false;\n}\n\n/**\n * Storage routing for namespaces.\n *\n * Compatibility note:\n * - When namespaces are enabled, existing raw namespace roots are preserved.\n *   New namespace roots use tokenized names under `memoryDir/namespaces/<token>`.\n * - The default namespace continues to use the legacy `memoryDir` root unless the caller\n *   has created `memoryDir/namespaces/<defaultNamespace>` (in which case we use that).\n *\n * This avoids surprising \"lost memories\" when an install flips namespaces on without\n * migrating existing data.\n */\n/**\n * Optional hooks for the storage router. `onResolve` fires whenever a namespace's\n * storage is resolved/created, so a downstream consumer (e.g. the namespace\n * catalog, issue #1499) can register the namespace. The hook MUST NOT throw into\n * the router; the router invokes it defensively and a hook failure never affects\n * storage resolution.\n *\n * The hook MAY return (or resolve to) a boolean indicating whether the\n * registration actually PERSISTED (round 6, codex P2 — NEFoX). When it resolves\n * to `false` (a dropped/no-op registration), the router does NOT mark the\n * (namespace, storageDir) pair as notified, so the next resolve RETRIES it\n * instead of suppressing it forever. A `void`/`undefined` result is treated as\n * success (legacy hooks).\n */\nexport interface NamespaceStorageRouterHooks {\n  onResolve?: (\n    namespace: string,\n    storageDir: string,\n  ) => void | boolean | Promise<void | boolean>;\n}\n\n/**\n * Resolve the runtime storage root for the configured DEFAULT namespace.\n *\n * Shared between the live router (`NamespaceStorageRouter.defaultNamespaceRoot`)\n * and the rebuildable catalog (`NamespaceCatalog.rebuildFromDisk`) so the two\n * can never diverge (CLAUDE.md rule #22/#42 — read & write paths resolve through\n * the same logic). The contract is: while legacy memory data still lives\n * directly under `memoryDir`, the default root stays `memoryDir`; only once the\n * legacy root is empty and a `namespaces/<default|token>` dir holds data does\n * the default migrate into that tokenized/legacy-named dir.\n */\nexport async function resolveDefaultNamespaceRoot(config: PluginConfig): Promise<string> {\n  if (!config.namespacesEnabled) {\n    return config.memoryDir;\n  }\n\n  // Build the legacy default root from the NORMALIZED (trimmed) name so a\n  // whitespace-padded `defaultNamespace` still finds the live `namespaces/default`\n  // root (NIabe). `storageFor()` classifies the trimmed value as the default, and\n  // the on-disk legacy dir is created under the trimmed name; using the raw spaced\n  // name here would look for `namespaces/<spaced>` and miss the real root, falling\n  // back to memoryDir/tokenized. `namespaceIdentityToken` already normalizes\n  // internally, so the tokenized path is unaffected.\n  const defaultIdentity = normalizeNamespaceIdentity(config.defaultNamespace);\n  const legacyNsDir = resolveNamespaceDir(config.memoryDir, defaultIdentity);\n  const tokenizedNsDir = resolveNamespaceDir(\n    config.memoryDir,\n    namespaceIdentityToken(config.defaultNamespace),\n  );\n  const tokenizedHasData =\n    (await exists(tokenizedNsDir)) &&\n    (await hasAnyNamespaceStorageMarker(tokenizedNsDir, { includeRuntimeState: true }));\n  const nsDir = tokenizedHasData\n    ? tokenizedNsDir\n    : (await exists(legacyNsDir))\n      ? legacyNsDir\n      : tokenizedNsDir;\n  return (await exists(nsDir)) && !(await hasAnyLegacyData(config.memoryDir))\n    ? nsDir\n    : config.memoryDir;\n}\n\n/**\n * Resolve the runtime storage root for ANY namespace exactly as the live router\n * would (`NamespaceStorageRouter.namespaceRoot`). Shared so the rebuildable\n * catalog records the SAME on-disk root the router routes to — a recall/read\n * touch must not guess `namespaces/<token>` when the router actually serves a\n * legacy raw-name dir or a migrated default root (CLAUDE.md rule #22/#42; round\n * 4, cursor Medium). The default namespace delegates to `resolveDefaultNamespaceRoot`;\n * every other namespace prefers the tokenized root when it has a storage marker,\n * else a legacy raw-name dir when present, else the tokenized root.\n */\nexport async function resolveNamespaceStorageRoot(\n  config: PluginConfig,\n  namespace: string,\n): Promise<string> {\n  if (!config.namespacesEnabled) return config.memoryDir;\n  // Compare on NORMALIZED identity so a whitespace-padded configured default name\n  // still routes to the default root rather than a tokenized non-default dir\n  // (NH-FH). The catalog keys records by the same normalized identity.\n  if (normalizeNamespaceIdentity(namespace) === normalizeNamespaceIdentity(config.defaultNamespace)) {\n    return resolveDefaultNamespaceRoot(config);\n  }\n  const legacyRoot = resolveNamespaceDir(config.memoryDir, namespace);\n  const tokenizedRoot = resolveNamespaceDir(config.memoryDir, namespaceIdentityToken(namespace));\n  if (\n    (await exists(tokenizedRoot)) &&\n    (await hasAnyNamespaceStorageMarker(tokenizedRoot, { includeRuntimeState: true }))\n  ) {\n    return tokenizedRoot;\n  }\n  return (await exists(legacyRoot)) ? legacyRoot : tokenizedRoot;\n}\n\nexport class NamespaceStorageRouter {\n  private readonly cache = new Map<string, StorageManager>();\n  private defaultNsRootResolved: string | null = null;\n  // Dedup the resolve hook (round 6, cursor Medium — NCNL2). Recall/extraction\n  // call `storageFor` repeatedly; firing `onResolve` (→ catalog loadCompacted +\n  // append) on every cache hit grows `namespaces.jsonl` without bound between\n  // rebuilds. We fire the hook only when the (namespace, storageDir) pair is new\n  // or its dir changed, so a steady-state cache hit is a no-op for the catalog.\n  private readonly notifiedResolved = new Map<string, string>();\n  // In-flight resolve-hook dedup (NFJV-, codex P2). The catalog's `onResolve`\n  // hook is ASYNC (it returns `registerResolved(...)`), so `notifiedResolved` is\n  // only set after the hook's promise SETTLES. Without tracking the in-flight\n  // window, a burst of `storageFor()` cache hits for the SAME namespace before\n  // the first registration finishes would each pass the `notifiedResolved` guard\n  // and fire their OWN `onResolve` — queueing N duplicate catalog touches + lock\n  // acquisitions despite the once-per-namespace intent. We therefore record the\n  // (namespace → storageDir) being registered BEFORE awaiting the hook so a\n  // concurrent call for the same pair skips firing. On SUCCESS the pair is\n  // promoted to `notifiedResolved` (future calls skip permanently); on `false`\n  // (dropped touch — e.g. rebuild-lock timeout) OR rejection the in-flight marker\n  // is CLEARED so a later `storageFor()` can RETRY the dropped registration. The\n  // entry is always removed when the promise settles, so the map cannot grow\n  // unbounded (one transient entry per concurrently-resolving namespace).\n  private readonly inFlightResolved = new Map<string, string>();\n  // Tracks every in-flight resolve-hook promise so callers can deterministically\n  // await the fire-and-forget registrations that `storageFor()` kicks off (see\n  // `whenResolveHooksSettled`). Entries are removed as each hook settles, so the\n  // set holds at most one promise per concurrently-resolving namespace.\n  private readonly pendingResolveHooks = new Set<Promise<unknown>>();\n\n  // Normalized (trimmed) default namespace identity (NH-FH). `storageFor`\n  // normalizes its input, so default-namespace branches must compare against the\n  // normalized config default too — otherwise a whitespace-padded configured\n  // default name routes the default namespace to a tokenized non-default root.\n  private readonly defaultNamespaceIdentity: string;\n\n  constructor(\n    private readonly config: PluginConfig,\n    private readonly hooks: NamespaceStorageRouterHooks = {},\n  ) {\n    this.defaultNamespaceIdentity = normalizeNamespaceIdentity(config.defaultNamespace);\n  }\n\n  private async defaultNamespaceRoot(): Promise<string> {\n    this.defaultNsRootResolved = await resolveDefaultNamespaceRoot(this.config);\n    return this.defaultNsRootResolved;\n  }\n\n  private async namespaceRoot(namespace: string): Promise<string> {\n    // NOTE: only used after defaultNamespaceRoot() resolution.\n    if (!this.config.namespacesEnabled) return this.config.memoryDir;\n    if (normalizeNamespaceIdentity(namespace) === this.defaultNamespaceIdentity) {\n      return this.defaultNsRootResolved ?? this.config.memoryDir;\n    }\n    return resolveNamespaceStorageRoot(this.config, namespace);\n  }\n\n  async storageFor(namespace: string): Promise<StorageManager> {\n    const ns = normalizeNamespaceIdentity(namespace || this.config.defaultNamespace);\n    if (ns !== this.defaultNamespaceIdentity && !isSafeRouteNamespace(ns)) {\n      throw new Error(`unsafe namespace: ${ns}`);\n    }\n    // Even when the default namespace is exempt from the check above, every\n    // on-disk path is built through resolveNamespaceDir(), which rejects\n    // traversal segments — so an unsafe configured default still cannot escape\n    // <memoryDir>/namespaces (CodeQL js/path-injection).\n\n    let root: string;\n    if (ns === this.defaultNamespaceIdentity) {\n      root = await this.defaultNamespaceRoot();\n      const cached = this.cache.get(ns);\n      if (cached && cached.dir === root) {\n        this.notifyResolved(ns, root);\n        return cached;\n      }\n    } else {\n      const cached = this.cache.get(ns);\n      root = await this.namespaceRoot(ns);\n      if (cached && cached.dir === root) {\n        this.notifyResolved(ns, root);\n        return cached;\n      }\n    }\n\n    const sm = new StorageManager(root, this.config.entitySchemas);\n    // Propagate the inline-attribution template so that router-created storages\n    // (used by extraction and shared-promotion paths) strip citations consistently,\n    // matching the behaviour of the primary this.storage instance in the orchestrator.\n    sm.citationTemplate = this.config.inlineSourceAttributionFormat;\n    this.cache.set(ns, sm);\n    this.notifyResolved(ns, root);\n    return sm;\n  }\n\n  /**\n   * Fire the resolve hook defensively. A hook failure (e.g. a catalog write\n   * error) MUST NOT crash storage resolution — see CLAUDE.md gotcha #13.\n   */\n  private notifyResolved(namespace: string, storageDir: string): void {\n    const hook = this.hooks.onResolve;\n    if (!hook) return;\n    // Skip when we've already SUCCESSFULLY notified this exact (namespace,\n    // storageDir) — a steady-state cache hit must not re-append to the catalog\n    // log (NCNL2). A changed dir (rare: migration/realignment) still re-fires\n    // once. We mark the pair as notified ONLY AFTER the hook succeeds, and CLEAR\n    // it on failure, so a dropped registration (e.g. rebuild-lock timeout) is\n    // RETRIED on the next cache hit instead of being suppressed forever (round 6,\n    // cursor Medium — ND3EJ).\n    if (this.notifiedResolved.get(namespace) === storageDir) return;\n    // In-flight dedup (NFJV-, codex P2): if a registration for this exact\n    // (namespace, storageDir) is already AWAITING its async hook, do not fire a\n    // second one. Without this, concurrent cache-hit bursts before the first\n    // append settles each pass the `notifiedResolved` guard above and queue\n    // duplicate catalog touches/lock acquisitions. A pair with a DIFFERENT\n    // in-flight dir (rare mid-migration realignment) still fires once.\n    if (this.inFlightResolved.get(namespace) === storageDir) return;\n    try {\n      // Handle BOTH synchronous throws and asynchronous rejections (round 6,\n      // codex P2 — NDo8C). The hook may be `async`; its rejected promise would\n      // bypass this try/catch and, where unhandled rejections are fatal, crash\n      // storage resolution. Mark the dedup pair as notified ONLY when the hook\n      // resolves to a PERSISTED result (round 6, codex P2 — NEFoX): a result of\n      // `false` means the registration was dropped/no-op (e.g. rebuild-lock\n      // timeout), so we must NOT suppress its retry. `void`/`undefined` is treated\n      // as success for legacy hooks. On rejection we leave it un-notified to retry.\n      //\n      // Record the in-flight marker BEFORE awaiting so concurrent calls for the\n      // same pair skip (NFJV-). It is always cleared once the promise settles, so\n      // the map holds at most one transient entry per concurrently-resolving\n      // namespace and cannot grow unbounded.\n      this.inFlightResolved.set(namespace, storageDir);\n      const hookResult = Promise.resolve(hook(namespace, storageDir));\n      // Track the in-flight promise so `whenResolveHooksSettled()` can await it.\n      this.pendingResolveHooks.add(hookResult);\n      hookResult.then(\n        (persisted) => {\n          // Clear the in-flight marker ONLY if it is still ours (a newer resolve\n          // for a different dir may have replaced it).\n          if (this.inFlightResolved.get(namespace) === storageDir) {\n            this.inFlightResolved.delete(namespace);\n          }\n          if (persisted !== false) {\n            this.notifiedResolved.set(namespace, storageDir);\n          }\n          // On `false` (dropped touch) we intentionally do NOT mark notified, so\n          // a later `storageFor()` retries the registration. Clearing the\n          // in-flight marker above is what re-enables that retry.\n          this.pendingResolveHooks.delete(hookResult);\n        },\n        () => {\n          // Registration failed — clear in-flight AND do NOT mark as notified, so\n          // it is retried on the next cache hit.\n          if (this.inFlightResolved.get(namespace) === storageDir) {\n            this.inFlightResolved.delete(namespace);\n          }\n          if (this.notifiedResolved.get(namespace) === storageDir) {\n            this.notifiedResolved.delete(namespace);\n          }\n          this.pendingResolveHooks.delete(hookResult);\n        },\n      );\n    } catch {\n      // Synchronous throw: clear any in-flight marker we just set and leave the\n      // pair un-notified so a later resolve retries.\n      if (this.inFlightResolved.get(namespace) === storageDir) {\n        this.inFlightResolved.delete(namespace);\n      }\n    }\n  }\n\n  /**\n   * Resolve once every in-flight `onResolve` registration has settled.\n   *\n   * `storageFor()` fires the resolve hook fire-and-forget, so its catalog side\n   * effect (e.g. `registerResolved(...)`) is not observable the moment\n   * `storageFor()` returns. Callers that must act on that side effect — notably\n   * tests asserting the catalog was updated — should await this instead of\n   * racing a timer. Resolves immediately when no hook is registered or nothing\n   * is in flight. The loop re-checks because a settling hook could, in\n   * principle, trigger a follow-on resolution.\n   */\n  async whenResolveHooksSettled(): Promise<void> {\n    while (this.pendingResolveHooks.size > 0) {\n      await Promise.allSettled([...this.pendingResolveHooks]);\n    }\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-LIERUFPO.js → chunk-WH4SKYPX.js}

@@ -236,7 +236,7 @@ import {
   NamespaceStorageRouter,
   resolveDefaultNamespaceRoot,
   resolveNamespaceStorageRoot
-} from "./chunk-7ILWCUWH.js";
+} from "./chunk-D7IXTY5E.js";
 import {
   isAboveImportanceThreshold,
   scoreImportance
@@ -17357,4 +17357,4 @@ export {
   resolvePersistedMemoryRelativePath,
   Orchestrator
 };
-//# sourceMappingURL=chunk-LIERUFPO.js.map
+//# sourceMappingURL=chunk-WH4SKYPX.js.map

package/dist/{chunk-YKX63GBK.js → chunk-XRSIGVTS.js}

@@ -1,6 +1,6 @@
 import {
   listNamespaces
-} from "./chunk-XB5P5P2L.js";
+} from "./chunk-7C4MPEPE.js";
 import {
   runConsolidationProvenanceCheck
 } from "./chunk-7XH7VJN4.js";
@@ -1336,4 +1336,4 @@ export {
   runBenchmarkRecall,
   runOperatorRepair
 };
-//# sourceMappingURL=chunk-YKX63GBK.js.map
+//# sourceMappingURL=chunk-XRSIGVTS.js.map

package/dist/cli.js

@@ -90,7 +90,7 @@ import {
   runWorkProductStatusCliCommand,
   runWorkProjectCliCommand,
   runWorkTaskCliCommand
-} from "./chunk-NLF54XMD.js";
+} from "./chunk-2OPARZ4B.js";
 import "./chunk-MC4FJXPA.js";
 import "./chunk-LQHDIS7L.js";
 import "./chunk-7F7Z6MOS.js";
@@ -123,8 +123,8 @@ import "./chunk-IHG6CC7T.js";
 import "./chunk-TGQ2NTWH.js";
 import "./chunk-PEPHBH2W.js";
 import "./chunk-SXYCVRLK.js";
-import "./chunk-YKX63GBK.js";
-import "./chunk-XB5P5P2L.js";
+import "./chunk-XRSIGVTS.js";
+import "./chunk-7C4MPEPE.js";
 import "./chunk-3T74IZB3.js";
 import "./chunk-HL4DB7TO.js";
 import "./chunk-YNDLCWXS.js";
@@ -145,7 +145,7 @@ import "./chunk-AGRPGAKR.js";
 import "./chunk-S4DDLTPX.js";
 import "./chunk-SFQ6QNL7.js";
 import "./chunk-33JBK2XP.js";
-import "./chunk-7ILWCUWH.js";
+import "./chunk-D7IXTY5E.js";
 import "./chunk-KFY3SGN7.js";
 import "./chunk-CMTINOFS.js";
 import "./chunk-TQNRI55H.js";

package/dist/index.js

@@ -94,7 +94,7 @@ import {
   registerTrainingExportAdapter,
   runBulkImportCliCommand,
   runWearablesCliCommand
-} from "./chunk-NLF54XMD.js";
+} from "./chunk-2OPARZ4B.js";
 import "./chunk-MC4FJXPA.js";
 import "./chunk-LQHDIS7L.js";
 import "./chunk-7F7Z6MOS.js";
@@ -147,8 +147,8 @@ import {
   parseXrayBudgetFlag,
   parseXrayCliOptions
 } from "./chunk-SXYCVRLK.js";
-import "./chunk-YKX63GBK.js";
-import "./chunk-XB5P5P2L.js";
+import "./chunk-XRSIGVTS.js";
+import "./chunk-7C4MPEPE.js";
 import {
   parseStrictCliDate
 } from "./chunk-3T74IZB3.js";
@@ -192,7 +192,7 @@ import {
   saveTaxonomy,
   validateSlug,
   validateTaxonomy
-} from "./chunk-LIERUFPO.js";
+} from "./chunk-WH4SKYPX.js";
 import {
   WEARABLE_SOURCE_PREFIX,
   buildExtractionTurns,
@@ -399,7 +399,7 @@ import {
 } from "./chunk-S4DDLTPX.js";
 import "./chunk-SFQ6QNL7.js";
 import "./chunk-33JBK2XP.js";
-import "./chunk-7ILWCUWH.js";
+import "./chunk-D7IXTY5E.js";
 import "./chunk-KFY3SGN7.js";
 import {
   resolvePluginEntry

package/dist/namespaces/migrate.js

@@ -2,8 +2,8 @@ import {
   listNamespaces,
   runNamespaceMigration,
   verifyNamespaces
-} from "../chunk-XB5P5P2L.js";
-import "../chunk-7ILWCUWH.js";
+} from "../chunk-7C4MPEPE.js";
+import "../chunk-D7IXTY5E.js";
 import "../chunk-DQY7NJ5L.js";
 import "../chunk-ROHLEUTH.js";
 import "../chunk-DOCTITOP.js";

package/dist/namespaces/storage.d.ts

@@ -68,6 +68,7 @@ declare class NamespaceStorageRouter {
     private defaultNsRootResolved;
     private readonly notifiedResolved;
     private readonly inFlightResolved;
+    private readonly pendingResolveHooks;
     private readonly defaultNamespaceIdentity;
     constructor(config: PluginConfig, hooks?: NamespaceStorageRouterHooks);
     private defaultNamespaceRoot;
@@ -78,6 +79,18 @@ declare class NamespaceStorageRouter {
      * error) MUST NOT crash storage resolution — see CLAUDE.md gotcha #13.
      */
     private notifyResolved;
+    /**
+     * Resolve once every in-flight `onResolve` registration has settled.
+     *
+     * `storageFor()` fires the resolve hook fire-and-forget, so its catalog side
+     * effect (e.g. `registerResolved(...)`) is not observable the moment
+     * `storageFor()` returns. Callers that must act on that side effect — notably
+     * tests asserting the catalog was updated — should await this instead of
+     * racing a timer. Resolves immediately when no hook is registered or nothing
+     * is in flight. The loop re-checks because a settling hook could, in
+     * principle, trigger a follow-on resolution.
+     */
+    whenResolveHooksSettled(): Promise<void>;
 }
 
 export { NamespaceStorageRouter, type NamespaceStorageRouterHooks, resolveDefaultNamespaceRoot, resolveNamespaceStorageRoot };

package/dist/namespaces/storage.js

@@ -2,7 +2,7 @@ import {
   NamespaceStorageRouter,
   resolveDefaultNamespaceRoot,
   resolveNamespaceStorageRoot
-} from "../chunk-7ILWCUWH.js";
+} from "../chunk-D7IXTY5E.js";
 import "../chunk-ZFXCQPNO.js";
 import "../chunk-VH6EIKVS.js";
 import "../chunk-M7XQSUBB.js";

package/dist/operator-toolkit.js

@@ -11,11 +11,11 @@ import {
   summarizeMemoryWorthLegacyCounters,
   summarizeObservationThroughput,
   summarizeTierDistribution
-} from "./chunk-YKX63GBK.js";
-import "./chunk-XB5P5P2L.js";
+} from "./chunk-XRSIGVTS.js";
+import "./chunk-7C4MPEPE.js";
 import "./chunk-7XH7VJN4.js";
 import "./chunk-YBPYIAA5.js";
-import "./chunk-7ILWCUWH.js";
+import "./chunk-D7IXTY5E.js";
 import "./chunk-KFY3SGN7.js";
 import "./chunk-CMTINOFS.js";
 import "./chunk-BEUDU7Y4.js";

package/dist/orchestrator.js

@@ -28,7 +28,7 @@ import {
   sanitizeSessionKeyForFilename,
   shouldFilterLifecycleRecallCandidate,
   summarizeGraphShadowComparison
-} from "./chunk-LIERUFPO.js";
+} from "./chunk-WH4SKYPX.js";
 import "./chunk-4SKKVWLQ.js";
 import "./chunk-7HYPN2GC.js";
 import "./chunk-666A3MOW.js";
@@ -111,7 +111,7 @@ import "./chunk-AGRPGAKR.js";
 import "./chunk-S4DDLTPX.js";
 import "./chunk-SFQ6QNL7.js";
 import "./chunk-33JBK2XP.js";
-import "./chunk-7ILWCUWH.js";
+import "./chunk-D7IXTY5E.js";
 import "./chunk-KFY3SGN7.js";
 import "./chunk-TQNRI55H.js";
 import "./chunk-6GUG4YNM.js";

package/dist/schemas.d.ts

@@ -7,13 +7,13 @@ declare const MemoryActionEligibilityContextSchema: z.ZodObject<{
     importance: z.ZodNumber;
     source: z.ZodEnum<["extraction", "consolidation", "replay", "manual", "unknown"]>;
 }, "strict", z.ZodTypeAny, {
-    source: "manual" | "extraction" | "consolidation" | "replay" | "unknown";
     confidence: number;
+    source: "unknown" | "manual" | "extraction" | "consolidation" | "replay";
     lifecycleState: "active" | "archived" | "candidate" | "validated" | "stale";
     importance: number;
 }, {
-    source: "manual" | "extraction" | "consolidation" | "replay" | "unknown";
     confidence: number;
+    source: "unknown" | "manual" | "extraction" | "consolidation" | "replay";
     lifecycleState: "active" | "archived" | "candidate" | "validated" | "stale";
     importance: number;
 }>;
@@ -149,10 +149,10 @@ declare const ExtractedFactSchema: z.ZodEffects<z.ZodObject<{
         observed_outcome?: string | null | undefined;
     }>>>;
 }, "strip", z.ZodTypeAny, {
-    tags: string[];
-    content: string;
     category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+    content: string;
     confidence: number;
+    tags: string[];
     entityRef?: string | null | undefined;
     structuredAttributes?: Record<string, string> | null | undefined;
     promptedByQuestion?: string | null | undefined;
@@ -178,10 +178,10 @@ declare const ExtractedFactSchema: z.ZodEffects<z.ZodObject<{
         observed_outcome?: string | null | undefined;
     } | null | undefined;
 }, {
-    tags: string[];
-    content: string;
     category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+    content: string;
     confidence: number;
+    tags: string[];
     entityRef?: string | null | undefined;
     structuredAttributes?: Record<string, string> | null | undefined;
     promptedByQuestion?: string | null | undefined;
@@ -207,10 +207,10 @@ declare const ExtractedFactSchema: z.ZodEffects<z.ZodObject<{
         observed_outcome?: string | null | undefined;
     } | null | undefined;
 }>, {
-    tags: string[];
-    content: string;
     category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+    content: string;
     confidence: number;
+    tags: string[];
     entityRef?: string | null | undefined;
     structuredAttributes?: Record<string, string> | null | undefined;
     promptedByQuestion?: string | null | undefined;
@@ -236,10 +236,10 @@ declare const ExtractedFactSchema: z.ZodEffects<z.ZodObject<{
         observed_outcome?: string | null | undefined;
     } | null | undefined;
 }, {
-    tags: string[];
-    content: string;
     category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+    content: string;
     confidence: number;
+    tags: string[];
     entityRef?: string | null | undefined;
     structuredAttributes?: Record<string, string> | null | undefined;
     promptedByQuestion?: string | null | undefined;
@@ -457,10 +457,10 @@ declare const ProactiveExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         }>>>;
     }, "strip", z.ZodTypeAny, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -486,10 +486,10 @@ declare const ProactiveExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         } | null | undefined;
     }, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -515,10 +515,10 @@ declare const ProactiveExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         } | null | undefined;
     }>, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -544,10 +544,10 @@ declare const ProactiveExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         } | null | undefined;
     }, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -631,10 +631,10 @@ declare const ProactiveExtractionResultSchema: z.ZodObject<{
     }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
     facts: {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -680,10 +680,10 @@ declare const ProactiveExtractionResultSchema: z.ZodObject<{
     }[] | null | undefined;
 }, {
     facts: {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -825,10 +825,10 @@ declare const ExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         }>>>;
     }, "strip", z.ZodTypeAny, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -854,10 +854,10 @@ declare const ExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         } | null | undefined;
     }, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -883,10 +883,10 @@ declare const ExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         } | null | undefined;
     }>, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -912,10 +912,10 @@ declare const ExtractionResultSchema: z.ZodObject<{
             observed_outcome?: string | null | undefined;
         } | null | undefined;
     }, {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -1013,10 +1013,10 @@ declare const ExtractionResultSchema: z.ZodObject<{
     }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
     facts: {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -1068,10 +1068,10 @@ declare const ExtractionResultSchema: z.ZodObject<{
     identityReflection?: string | null | undefined;
 }, {
     facts: {
-        tags: string[];
-        content: string;
         category: "fact" | "preference" | "correction" | "entity" | "decision" | "relationship" | "principle" | "commitment" | "moment" | "skill" | "rule" | "procedure" | "reasoning_trace";
+        content: string;
         confidence: number;
+        tags: string[];
         entityRef?: string | null | undefined;
         structuredAttributes?: Record<string, string> | null | undefined;
         promptedByQuestion?: string | null | undefined;
@@ -1285,13 +1285,13 @@ declare const ContradictionVerificationSchema: z.ZodObject<{
     reasoning: z.ZodString;
     whichIsNewer: z.ZodEnum<["first", "second", "unclear"]>;
 }, "strip", z.ZodTypeAny, {
-    reasoning: string;
     confidence: number;
+    reasoning: string;
     isContradiction: boolean;
     whichIsNewer: "second" | "first" | "unclear";
 }, {
-    reasoning: string;
     confidence: number;
+    reasoning: string;
     isContradiction: boolean;
     whichIsNewer: "second" | "first" | "unclear";
 }>;
@@ -1386,8 +1386,8 @@ declare const BehaviorLoopAdjustmentSchema: z.ZodObject<{
     reason: z.ZodString;
     appliedAt: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    reason: string;
     confidence: number;
+    reason: string;
     parameter: string;
     previousValue: number;
     nextValue: number;
@@ -1395,8 +1395,8 @@ declare const BehaviorLoopAdjustmentSchema: z.ZodObject<{
     evidenceCount: number;
     appliedAt: string;
 }, {
-    reason: string;
     confidence: number;
+    reason: string;
     parameter: string;
     previousValue: number;
     nextValue: number;
@@ -1420,8 +1420,8 @@ declare const BehaviorLoopPolicyStateSchema: z.ZodObject<{
         reason: z.ZodString;
         appliedAt: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        reason: string;
         confidence: number;
+        reason: string;
         parameter: string;
         previousValue: number;
         nextValue: number;
@@ -1429,8 +1429,8 @@ declare const BehaviorLoopPolicyStateSchema: z.ZodObject<{
         evidenceCount: number;
         appliedAt: string;
     }, {
-        reason: string;
         confidence: number;
+        reason: string;
         parameter: string;
         previousValue: number;
         nextValue: number;
@@ -1447,8 +1447,8 @@ declare const BehaviorLoopPolicyStateSchema: z.ZodObject<{
     maxDeltaPerCycle: number;
     protectedParams: string[];
     adjustments: {
-        reason: string;
         confidence: number;
+        reason: string;
         parameter: string;
         previousValue: number;
         nextValue: number;
@@ -1464,8 +1464,8 @@ declare const BehaviorLoopPolicyStateSchema: z.ZodObject<{
     maxDeltaPerCycle: number;
     protectedParams: string[];
     adjustments: {
-        reason: string;
         confidence: number;
+        reason: string;
         parameter: string;
         previousValue: number;
         nextValue: number;

package/dist/shared-context/manager.d.ts

@@ -22,9 +22,9 @@ declare const SharedFeedbackEntrySchema: z.ZodObject<{
     date: string;
     agent: string;
     reason: string;
+    confidence?: number | undefined;
     workflow?: string | undefined;
     tags?: string[] | undefined;
-    confidence?: number | undefined;
     severity?: "high" | "low" | "medium" | undefined;
     outcome?: string | undefined;
     refs?: string[] | undefined;
@@ -36,9 +36,9 @@ declare const SharedFeedbackEntrySchema: z.ZodObject<{
     date: string;
     agent: string;
     reason: string;
+    confidence?: number | undefined;
     workflow?: string | undefined;
     tags?: string[] | undefined;
-    confidence?: number | undefined;
     severity?: "high" | "low" | "medium" | undefined;
     outcome?: string | undefined;
     refs?: string[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnic/core",
-  "version": "9.3.664",
+  "version": "9.3.665",
   "description": "Framework-agnostic Remnic memory engine — orchestrator, storage, extraction, search, trust zones",
   "type": "module",
   "main": "dist/index.js",

package/src/namespaces/catalog.test.ts

@@ -487,13 +487,13 @@ test("StorageRouter integration: catalog registers namespace on storageFor", asy
     const config = makeConfig(memoryDir);
     const catalog = new NamespaceCatalog(config);
     const router = new NamespaceStorageRouter(config, {
-      onResolve: (namespace, storageDir) => {
-        void catalog.registerResolved(namespace, storageDir);
-      },
+      // Return the registration promise so the router tracks it as in-flight and
+      // `whenResolveHooksSettled()` can await it deterministically (no timer race).
+      onResolve: (namespace, storageDir) => catalog.registerResolved(namespace, storageDir),
     });
     await router.storageFor("project-origin-abc123");
-    // allow the fire-and-forget registration to settle
-    await new Promise((r) => setTimeout(r, 10));
+    // Deterministically await the fire-and-forget registration instead of sleeping.
+    await router.whenResolveHooksSettled();
 
     const record = await catalog.getNamespaceRecord("project-origin-abc123");
     assert.ok(record, "storageFor should have registered the namespace");
@@ -2523,8 +2523,8 @@ test("an async onResolve hook rejection does not crash storage resolution", asyn
     // Must not throw or produce an unhandled rejection that fails the test.
     const sm = await router.storageFor("default");
     assert.ok(sm, "storage resolution succeeds despite a rejecting async hook");
-    // Give the swallowed rejection a tick to settle.
-    await new Promise((r) => setTimeout(r, 10));
+    // Deterministically await the swallowed rejection instead of sleeping.
+    await router.whenResolveHooksSettled();
     assert.ok(called >= 1, "the async hook was invoked");
   } finally {
     await rm(memoryDir, { recursive: true, force: true });
@@ -2564,7 +2564,7 @@ test("concurrent storageFor() for one namespace fires the resolve hook ONCE whil
     // Let the in-flight registration settle, then a steady-state cache hit must
     // still be a catalog no-op (now deduped via notifiedResolved).
     release();
-    await new Promise((r) => setTimeout(r, 10));
+    await router.whenResolveHooksSettled();
     await router.storageFor("project-origin-inflight");
     assert.equal(calls, 1, "a steady-state cache hit after settle must not re-fire the hook");
   } finally {
@@ -2589,20 +2589,20 @@ test("a dropped resolve registration (hook returns false) is retried on a later
     });
 
     await router.storageFor("project-origin-retry");
-    // Give the async hook a tick to settle and clear the in-flight marker.
-    await new Promise((r) => setTimeout(r, 10));
+    // Deterministically await the async hook so the in-flight marker is cleared.
+    await router.whenResolveHooksSettled();
     assert.equal(calls, 1, "the hook fired once for the dropped registration");
 
     // Now the registration will succeed; a later resolve must RETRY (not be
     // suppressed by a stale in-flight/notified marker from the dropped attempt).
     result = undefined; // success (legacy void)
     await router.storageFor("project-origin-retry");
-    await new Promise((r) => setTimeout(r, 10));
+    await router.whenResolveHooksSettled();
     assert.equal(calls, 2, "a dropped registration must be retried on the next storageFor()");
 
     // After a SUCCESSFUL registration, further cache hits are deduped (no retry).
     await router.storageFor("project-origin-retry");
-    await new Promise((r) => setTimeout(r, 10));
+    await router.whenResolveHooksSettled();
     assert.equal(calls, 2, "a successful registration is not re-fired on subsequent cache hits");
   } finally {
     await rm(memoryDir, { recursive: true, force: true });

package/src/namespaces/storage.ts

@@ -223,6 +223,11 @@ export class NamespaceStorageRouter {
   // entry is always removed when the promise settles, so the map cannot grow
   // unbounded (one transient entry per concurrently-resolving namespace).
   private readonly inFlightResolved = new Map<string, string>();
+  // Tracks every in-flight resolve-hook promise so callers can deterministically
+  // await the fire-and-forget registrations that `storageFor()` kicks off (see
+  // `whenResolveHooksSettled`). Entries are removed as each hook settles, so the
+  // set holds at most one promise per concurrently-resolving namespace.
+  private readonly pendingResolveHooks = new Set<Promise<unknown>>();
 
   // Normalized (trimmed) default namespace identity (NH-FH). `storageFor`
   // normalizes its input, so default-namespace branches must compare against the
@@ -325,7 +330,10 @@ export class NamespaceStorageRouter {
       // the map holds at most one transient entry per concurrently-resolving
       // namespace and cannot grow unbounded.
       this.inFlightResolved.set(namespace, storageDir);
-      Promise.resolve(hook(namespace, storageDir)).then(
+      const hookResult = Promise.resolve(hook(namespace, storageDir));
+      // Track the in-flight promise so `whenResolveHooksSettled()` can await it.
+      this.pendingResolveHooks.add(hookResult);
+      hookResult.then(
         (persisted) => {
           // Clear the in-flight marker ONLY if it is still ours (a newer resolve
           // for a different dir may have replaced it).
@@ -338,6 +346,7 @@ export class NamespaceStorageRouter {
           // On `false` (dropped touch) we intentionally do NOT mark notified, so
           // a later `storageFor()` retries the registration. Clearing the
           // in-flight marker above is what re-enables that retry.
+          this.pendingResolveHooks.delete(hookResult);
         },
         () => {
           // Registration failed — clear in-flight AND do NOT mark as notified, so
@@ -348,6 +357,7 @@ export class NamespaceStorageRouter {
           if (this.notifiedResolved.get(namespace) === storageDir) {
             this.notifiedResolved.delete(namespace);
           }
+          this.pendingResolveHooks.delete(hookResult);
         },
       );
     } catch {
@@ -358,4 +368,21 @@ export class NamespaceStorageRouter {
       }
     }
   }
+
+  /**
+   * Resolve once every in-flight `onResolve` registration has settled.
+   *
+   * `storageFor()` fires the resolve hook fire-and-forget, so its catalog side
+   * effect (e.g. `registerResolved(...)`) is not observable the moment
+   * `storageFor()` returns. Callers that must act on that side effect — notably
+   * tests asserting the catalog was updated — should await this instead of
+   * racing a timer. Resolves immediately when no hook is registered or nothing
+   * is in flight. The loop re-checks because a settling hook could, in
+   * principle, trigger a follow-on resolution.
+   */
+  async whenResolveHooksSettled(): Promise<void> {
+    while (this.pendingResolveHooks.size > 0) {
+      await Promise.allSettled([...this.pendingResolveHooks]);
+    }
+  }
 }

package/dist/chunk-7ILWCUWH.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/namespaces/storage.ts"],"sourcesContent":["import path from \"node:path\";\nimport { access, lstat, readdir } from \"node:fs/promises\";\nimport { isSafeRouteNamespace } from \"../routing/engine.js\";\nimport { StorageManager } from \"../storage.js\";\nimport type { PluginConfig } from \"../types.js\";\nimport { ALL_CATEGORY_DIRS } from \"../utils/category-dir.js\";\nimport { namespaceIdentityToken, normalizeNamespaceIdentity } from \"./identity.js\";\n\nasync function exists(p: string): Promise<boolean> {\n  try {\n    await access(p);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\nasync function hasStoredEntries(p: string): Promise<boolean> {\n  try {\n    const entry = await lstat(p);\n    if (entry.isSymbolicLink()) return true;\n    if (!entry.isDirectory()) return true;\n    const children = await readdir(p, { withFileTypes: true });\n    for (const child of children) {\n      const childPath = path.join(p, child.name);\n      if (child.isSymbolicLink() || child.isFile()) return true;\n      if (child.isDirectory() && (await hasStoredEntries(childPath))) return true;\n    }\n    return false;\n  } catch {\n    return false;\n  }\n}\n\n// Build a per-namespace directory under `<memoryDir>/namespaces` and assert the\n// resolved path stays inside that base. Namespace identifiers can originate from\n// operator config (config.defaultNamespace) and request-derived routing, so this\n// containment check prevents directory traversal (CodeQL js/path-injection).\n// For safe segments this returns exactly `path.join(base, segment)`, so there is\n// no behavioral change for valid namespaces.\nfunction resolveNamespaceDir(memoryDir: string, segment: string): string {\n  // Mirror isSafeRouteNamespace's separator/parent-ref rejection (without its\n  // 64-char cap, so identity tokens still pass). Rejecting separators and \"..\"\n  // up front keeps the value a single contained child of <memoryDir>/namespaces.\n  if (\n    segment.length === 0 ||\n    segment.includes(\"/\") ||\n    segment.includes(\"\\\\\") ||\n    segment.includes(\"..\") ||\n    path.isAbsolute(segment)\n  ) {\n    throw new Error(`unsafe namespace path segment: ${segment}`);\n  }\n  return path.join(memoryDir, \"namespaces\", segment);\n}\n\nconst LEGACY_NAMESPACE_CONTENT_CHILDREN = [\n  ...ALL_CATEGORY_DIRS,\n  \"entities\",\n  \"artifacts\",\n  \"identity\",\n  \"config\",\n  \"summaries\",\n  \"profile.md\",\n] as const;\n\nconst LEGACY_NAMESPACE_RUNTIME_CHILDREN = [\"state\"] as const;\n\nasync function hasAnyLegacyData(\n  rootDir: string,\n  options: { includeRuntimeState?: boolean } = {},\n): Promise<boolean> {\n  const children = options.includeRuntimeState === true\n    ? [...LEGACY_NAMESPACE_CONTENT_CHILDREN, ...LEGACY_NAMESPACE_RUNTIME_CHILDREN]\n    : LEGACY_NAMESPACE_CONTENT_CHILDREN;\n  for (const child of children) {\n    if (await hasStoredEntries(path.join(rootDir, child))) return true;\n  }\n  return false;\n}\n\nasync function hasAnyNamespaceStorageMarker(\n  rootDir: string,\n  options: { includeRuntimeState?: boolean } = {},\n): Promise<boolean> {\n  const children = options.includeRuntimeState === true\n    ? [...LEGACY_NAMESPACE_CONTENT_CHILDREN, ...LEGACY_NAMESPACE_RUNTIME_CHILDREN]\n    : LEGACY_NAMESPACE_CONTENT_CHILDREN;\n  for (const child of children) {\n    if (await exists(path.join(rootDir, child))) return true;\n  }\n  return false;\n}\n\n/**\n * Storage routing for namespaces.\n *\n * Compatibility note:\n * - When namespaces are enabled, existing raw namespace roots are preserved.\n *   New namespace roots use tokenized names under `memoryDir/namespaces/<token>`.\n * - The default namespace continues to use the legacy `memoryDir` root unless the caller\n *   has created `memoryDir/namespaces/<defaultNamespace>` (in which case we use that).\n *\n * This avoids surprising \"lost memories\" when an install flips namespaces on without\n * migrating existing data.\n */\n/**\n * Optional hooks for the storage router. `onResolve` fires whenever a namespace's\n * storage is resolved/created, so a downstream consumer (e.g. the namespace\n * catalog, issue #1499) can register the namespace. The hook MUST NOT throw into\n * the router; the router invokes it defensively and a hook failure never affects\n * storage resolution.\n *\n * The hook MAY return (or resolve to) a boolean indicating whether the\n * registration actually PERSISTED (round 6, codex P2 — NEFoX). When it resolves\n * to `false` (a dropped/no-op registration), the router does NOT mark the\n * (namespace, storageDir) pair as notified, so the next resolve RETRIES it\n * instead of suppressing it forever. A `void`/`undefined` result is treated as\n * success (legacy hooks).\n */\nexport interface NamespaceStorageRouterHooks {\n  onResolve?: (\n    namespace: string,\n    storageDir: string,\n  ) => void | boolean | Promise<void | boolean>;\n}\n\n/**\n * Resolve the runtime storage root for the configured DEFAULT namespace.\n *\n * Shared between the live router (`NamespaceStorageRouter.defaultNamespaceRoot`)\n * and the rebuildable catalog (`NamespaceCatalog.rebuildFromDisk`) so the two\n * can never diverge (CLAUDE.md rule #22/#42 — read & write paths resolve through\n * the same logic). The contract is: while legacy memory data still lives\n * directly under `memoryDir`, the default root stays `memoryDir`; only once the\n * legacy root is empty and a `namespaces/<default|token>` dir holds data does\n * the default migrate into that tokenized/legacy-named dir.\n */\nexport async function resolveDefaultNamespaceRoot(config: PluginConfig): Promise<string> {\n  if (!config.namespacesEnabled) {\n    return config.memoryDir;\n  }\n\n  // Build the legacy default root from the NORMALIZED (trimmed) name so a\n  // whitespace-padded `defaultNamespace` still finds the live `namespaces/default`\n  // root (NIabe). `storageFor()` classifies the trimmed value as the default, and\n  // the on-disk legacy dir is created under the trimmed name; using the raw spaced\n  // name here would look for `namespaces/<spaced>` and miss the real root, falling\n  // back to memoryDir/tokenized. `namespaceIdentityToken` already normalizes\n  // internally, so the tokenized path is unaffected.\n  const defaultIdentity = normalizeNamespaceIdentity(config.defaultNamespace);\n  const legacyNsDir = resolveNamespaceDir(config.memoryDir, defaultIdentity);\n  const tokenizedNsDir = resolveNamespaceDir(\n    config.memoryDir,\n    namespaceIdentityToken(config.defaultNamespace),\n  );\n  const tokenizedHasData =\n    (await exists(tokenizedNsDir)) &&\n    (await hasAnyNamespaceStorageMarker(tokenizedNsDir, { includeRuntimeState: true }));\n  const nsDir = tokenizedHasData\n    ? tokenizedNsDir\n    : (await exists(legacyNsDir))\n      ? legacyNsDir\n      : tokenizedNsDir;\n  return (await exists(nsDir)) && !(await hasAnyLegacyData(config.memoryDir))\n    ? nsDir\n    : config.memoryDir;\n}\n\n/**\n * Resolve the runtime storage root for ANY namespace exactly as the live router\n * would (`NamespaceStorageRouter.namespaceRoot`). Shared so the rebuildable\n * catalog records the SAME on-disk root the router routes to — a recall/read\n * touch must not guess `namespaces/<token>` when the router actually serves a\n * legacy raw-name dir or a migrated default root (CLAUDE.md rule #22/#42; round\n * 4, cursor Medium). The default namespace delegates to `resolveDefaultNamespaceRoot`;\n * every other namespace prefers the tokenized root when it has a storage marker,\n * else a legacy raw-name dir when present, else the tokenized root.\n */\nexport async function resolveNamespaceStorageRoot(\n  config: PluginConfig,\n  namespace: string,\n): Promise<string> {\n  if (!config.namespacesEnabled) return config.memoryDir;\n  // Compare on NORMALIZED identity so a whitespace-padded configured default name\n  // still routes to the default root rather than a tokenized non-default dir\n  // (NH-FH). The catalog keys records by the same normalized identity.\n  if (normalizeNamespaceIdentity(namespace) === normalizeNamespaceIdentity(config.defaultNamespace)) {\n    return resolveDefaultNamespaceRoot(config);\n  }\n  const legacyRoot = resolveNamespaceDir(config.memoryDir, namespace);\n  const tokenizedRoot = resolveNamespaceDir(config.memoryDir, namespaceIdentityToken(namespace));\n  if (\n    (await exists(tokenizedRoot)) &&\n    (await hasAnyNamespaceStorageMarker(tokenizedRoot, { includeRuntimeState: true }))\n  ) {\n    return tokenizedRoot;\n  }\n  return (await exists(legacyRoot)) ? legacyRoot : tokenizedRoot;\n}\n\nexport class NamespaceStorageRouter {\n  private readonly cache = new Map<string, StorageManager>();\n  private defaultNsRootResolved: string | null = null;\n  // Dedup the resolve hook (round 6, cursor Medium — NCNL2). Recall/extraction\n  // call `storageFor` repeatedly; firing `onResolve` (→ catalog loadCompacted +\n  // append) on every cache hit grows `namespaces.jsonl` without bound between\n  // rebuilds. We fire the hook only when the (namespace, storageDir) pair is new\n  // or its dir changed, so a steady-state cache hit is a no-op for the catalog.\n  private readonly notifiedResolved = new Map<string, string>();\n  // In-flight resolve-hook dedup (NFJV-, codex P2). The catalog's `onResolve`\n  // hook is ASYNC (it returns `registerResolved(...)`), so `notifiedResolved` is\n  // only set after the hook's promise SETTLES. Without tracking the in-flight\n  // window, a burst of `storageFor()` cache hits for the SAME namespace before\n  // the first registration finishes would each pass the `notifiedResolved` guard\n  // and fire their OWN `onResolve` — queueing N duplicate catalog touches + lock\n  // acquisitions despite the once-per-namespace intent. We therefore record the\n  // (namespace → storageDir) being registered BEFORE awaiting the hook so a\n  // concurrent call for the same pair skips firing. On SUCCESS the pair is\n  // promoted to `notifiedResolved` (future calls skip permanently); on `false`\n  // (dropped touch — e.g. rebuild-lock timeout) OR rejection the in-flight marker\n  // is CLEARED so a later `storageFor()` can RETRY the dropped registration. The\n  // entry is always removed when the promise settles, so the map cannot grow\n  // unbounded (one transient entry per concurrently-resolving namespace).\n  private readonly inFlightResolved = new Map<string, string>();\n\n  // Normalized (trimmed) default namespace identity (NH-FH). `storageFor`\n  // normalizes its input, so default-namespace branches must compare against the\n  // normalized config default too — otherwise a whitespace-padded configured\n  // default name routes the default namespace to a tokenized non-default root.\n  private readonly defaultNamespaceIdentity: string;\n\n  constructor(\n    private readonly config: PluginConfig,\n    private readonly hooks: NamespaceStorageRouterHooks = {},\n  ) {\n    this.defaultNamespaceIdentity = normalizeNamespaceIdentity(config.defaultNamespace);\n  }\n\n  private async defaultNamespaceRoot(): Promise<string> {\n    this.defaultNsRootResolved = await resolveDefaultNamespaceRoot(this.config);\n    return this.defaultNsRootResolved;\n  }\n\n  private async namespaceRoot(namespace: string): Promise<string> {\n    // NOTE: only used after defaultNamespaceRoot() resolution.\n    if (!this.config.namespacesEnabled) return this.config.memoryDir;\n    if (normalizeNamespaceIdentity(namespace) === this.defaultNamespaceIdentity) {\n      return this.defaultNsRootResolved ?? this.config.memoryDir;\n    }\n    return resolveNamespaceStorageRoot(this.config, namespace);\n  }\n\n  async storageFor(namespace: string): Promise<StorageManager> {\n    const ns = normalizeNamespaceIdentity(namespace || this.config.defaultNamespace);\n    if (ns !== this.defaultNamespaceIdentity && !isSafeRouteNamespace(ns)) {\n      throw new Error(`unsafe namespace: ${ns}`);\n    }\n    // Even when the default namespace is exempt from the check above, every\n    // on-disk path is built through resolveNamespaceDir(), which rejects\n    // traversal segments — so an unsafe configured default still cannot escape\n    // <memoryDir>/namespaces (CodeQL js/path-injection).\n\n    let root: string;\n    if (ns === this.defaultNamespaceIdentity) {\n      root = await this.defaultNamespaceRoot();\n      const cached = this.cache.get(ns);\n      if (cached && cached.dir === root) {\n        this.notifyResolved(ns, root);\n        return cached;\n      }\n    } else {\n      const cached = this.cache.get(ns);\n      root = await this.namespaceRoot(ns);\n      if (cached && cached.dir === root) {\n        this.notifyResolved(ns, root);\n        return cached;\n      }\n    }\n\n    const sm = new StorageManager(root, this.config.entitySchemas);\n    // Propagate the inline-attribution template so that router-created storages\n    // (used by extraction and shared-promotion paths) strip citations consistently,\n    // matching the behaviour of the primary this.storage instance in the orchestrator.\n    sm.citationTemplate = this.config.inlineSourceAttributionFormat;\n    this.cache.set(ns, sm);\n    this.notifyResolved(ns, root);\n    return sm;\n  }\n\n  /**\n   * Fire the resolve hook defensively. A hook failure (e.g. a catalog write\n   * error) MUST NOT crash storage resolution — see CLAUDE.md gotcha #13.\n   */\n  private notifyResolved(namespace: string, storageDir: string): void {\n    const hook = this.hooks.onResolve;\n    if (!hook) return;\n    // Skip when we've already SUCCESSFULLY notified this exact (namespace,\n    // storageDir) — a steady-state cache hit must not re-append to the catalog\n    // log (NCNL2). A changed dir (rare: migration/realignment) still re-fires\n    // once. We mark the pair as notified ONLY AFTER the hook succeeds, and CLEAR\n    // it on failure, so a dropped registration (e.g. rebuild-lock timeout) is\n    // RETRIED on the next cache hit instead of being suppressed forever (round 6,\n    // cursor Medium — ND3EJ).\n    if (this.notifiedResolved.get(namespace) === storageDir) return;\n    // In-flight dedup (NFJV-, codex P2): if a registration for this exact\n    // (namespace, storageDir) is already AWAITING its async hook, do not fire a\n    // second one. Without this, concurrent cache-hit bursts before the first\n    // append settles each pass the `notifiedResolved` guard above and queue\n    // duplicate catalog touches/lock acquisitions. A pair with a DIFFERENT\n    // in-flight dir (rare mid-migration realignment) still fires once.\n    if (this.inFlightResolved.get(namespace) === storageDir) return;\n    try {\n      // Handle BOTH synchronous throws and asynchronous rejections (round 6,\n      // codex P2 — NDo8C). The hook may be `async`; its rejected promise would\n      // bypass this try/catch and, where unhandled rejections are fatal, crash\n      // storage resolution. Mark the dedup pair as notified ONLY when the hook\n      // resolves to a PERSISTED result (round 6, codex P2 — NEFoX): a result of\n      // `false` means the registration was dropped/no-op (e.g. rebuild-lock\n      // timeout), so we must NOT suppress its retry. `void`/`undefined` is treated\n      // as success for legacy hooks. On rejection we leave it un-notified to retry.\n      //\n      // Record the in-flight marker BEFORE awaiting so concurrent calls for the\n      // same pair skip (NFJV-). It is always cleared once the promise settles, so\n      // the map holds at most one transient entry per concurrently-resolving\n      // namespace and cannot grow unbounded.\n      this.inFlightResolved.set(namespace, storageDir);\n      Promise.resolve(hook(namespace, storageDir)).then(\n        (persisted) => {\n          // Clear the in-flight marker ONLY if it is still ours (a newer resolve\n          // for a different dir may have replaced it).\n          if (this.inFlightResolved.get(namespace) === storageDir) {\n            this.inFlightResolved.delete(namespace);\n          }\n          if (persisted !== false) {\n            this.notifiedResolved.set(namespace, storageDir);\n          }\n          // On `false` (dropped touch) we intentionally do NOT mark notified, so\n          // a later `storageFor()` retries the registration. Clearing the\n          // in-flight marker above is what re-enables that retry.\n        },\n        () => {\n          // Registration failed — clear in-flight AND do NOT mark as notified, so\n          // it is retried on the next cache hit.\n          if (this.inFlightResolved.get(namespace) === storageDir) {\n            this.inFlightResolved.delete(namespace);\n          }\n          if (this.notifiedResolved.get(namespace) === storageDir) {\n            this.notifiedResolved.delete(namespace);\n          }\n        },\n      );\n    } catch {\n      // Synchronous throw: clear any in-flight marker we just set and leave the\n      // pair un-notified so a later resolve retries.\n      if (this.inFlightResolved.get(namespace) === storageDir) {\n        this.inFlightResolved.delete(namespace);\n      }\n    }\n  }\n}\n"],"mappings":"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","names":[]}