@remnic/core 9.3.716 → 9.3.717

package/src/orchestrator.ts

@@ -342,7 +342,11 @@ import {
   recallNamespacesForPrincipal,
   resolvePrincipal,
 } from "./namespaces/principal.js";
-import { resolveScopePlan } from "./scopes/scope-plan.js";
+import {
+  getConfiguredNamespaces,
+  resolveNamespaceFromStorageDir,
+  resolveScopePlan,
+} from "./scopes/scope-plan.js";
 import {
   expandScopeProfileReadNamespaces,
   resolveScopeProfilePlan,
@@ -2317,18 +2321,11 @@ export class Orchestrator {
     return this.storageRouter.storageFor(ns);
   }
 
-  private configuredNamespaces(): string[] {
-    return Array.from(
-      new Set(
-        [
-          this.config.defaultNamespace,
-          this.config.sharedNamespace,
-          ...this.config.namespacePolicies.map((policy) => policy.name),
-        ]
-          .map((value) => value.trim())
-          .filter(Boolean),
-      ),
-    );
+  private configuredNamespaceList(): string[] {
+    // #1521: delegates to the scope-module resolver. The inline derivation is
+    // retired so the adHocNamespaceResolutions ratchet no longer counts this
+    // site.
+    return getConfiguredNamespaces(this.config);
   }
 
   private rememberNamespaceStorageDirHint(namespace: string, storageDir?: string): void {
@@ -2456,7 +2453,7 @@ export class Orchestrator {
     }
 
     const configured = new Set(
-      this.configuredNamespaces().map((namespace) => normalizeNamespaceIdentity(namespace)),
+      this.configuredNamespaceList().map((namespace) => normalizeNamespaceIdentity(namespace)),
     );
     const preferredByStorageDir = new Map<
       string,
@@ -2570,7 +2567,7 @@ export class Orchestrator {
           new Set(
             (options.namespaces?.length
               ? options.namespaces
-              : this.configuredNamespaces()
+              : this.configuredNamespaceList()
             )
               .map((value) => value.trim())
               .filter(Boolean),
@@ -4138,7 +4135,7 @@ export class Orchestrator {
     if (options?.dryRun !== true) {
       try {
         await this.processEntitySynthesisQueue(
-          this.namespaceFromStorageDir(targetStorage.dir),
+          this.storageDirNamespace(targetStorage.dir),
           5,
         );
       } catch (error) {
@@ -13971,7 +13968,7 @@ export class Orchestrator {
       )
         return false;
       if (
-        this.namespaceFromStorageDir(targetStorage.dir) ===
+        this.storageDirNamespace(targetStorage.dir) ===
         this.config.sharedNamespace
       )
         return false;
@@ -14797,7 +14794,7 @@ export class Orchestrator {
       let targetNamespaceName =
         baseNamespace && baseNamespace.length > 0
           ? baseNamespace
-          : this.namespaceFromStorageDir(targetStorage.dir);
+          : this.storageDirNamespace(targetStorage.dir);
       let routedRuleId: string | undefined;
       let routedNamespaceExplicit = false;
       if (routeRules.length > 0) {
@@ -14838,7 +14835,7 @@ export class Orchestrator {
         fact.scope === "global" &&
         !routedNamespaceExplicit
       ) {
-        const currentNs = this.namespaceFromStorageDir(targetStorage.dir);
+        const currentNs = this.storageDirNamespace(targetStorage.dir);
         if (currentNs !== this.config.sharedNamespace && profileAllowsSharedWrites) {
           try {
             targetStorage = await this.storageRouter.storageFor(
@@ -15106,7 +15103,7 @@ export class Orchestrator {
         this.qmd.isAvailable() &&
         faithfulnessEnforceStatus !== "pending_review"
       ) {
-        const targetNamespace = this.namespaceFromStorageDir(targetStorage.dir);
+        const targetNamespace = this.storageDirNamespace(targetStorage.dir);
         const contradiction = await this.checkForContradiction(
           fact.content,
           writeCategory,
@@ -15525,7 +15522,7 @@ export class Orchestrator {
               memoryId: parentId,
               category: writeCategory,
               content: fact.content,
-              namespace: this.namespaceFromStorageDir(targetStorage.dir),
+              namespace: this.storageDirNamespace(targetStorage.dir),
               confidence: fact.confidence,
               source: "extraction",
             }),
@@ -15536,7 +15533,7 @@ export class Orchestrator {
 
       // Suggest links for this memory (Phase 3A)
       if (this.config.memoryLinkingEnabled && this.qmd.isAvailable()) {
-        const targetNamespace = this.namespaceFromStorageDir(targetStorage.dir);
+        const targetNamespace = this.storageDirNamespace(targetStorage.dir);
         const suggestedLinks = await this.suggestLinksForMemory(
           fact.content,
           writeCategory,
@@ -15642,7 +15639,7 @@ export class Orchestrator {
             memoryId,
             category: writeCategory,
             content: fact.content,
-            namespace: this.namespaceFromStorageDir(targetStorage.dir),
+            namespace: this.storageDirNamespace(targetStorage.dir),
             confidence: fact.confidence,
             source: "extraction",
           }),
@@ -15788,7 +15785,7 @@ export class Orchestrator {
       const baseTouchNamespace =
         baseNamespace && baseNamespace.length > 0
           ? baseNamespace
-          : this.namespaceFromStorageDir(storage.dir);
+          : this.storageDirNamespace(storage.dir);
     };
     const recordDurableNonFactWrite = () => {
       durableNonFactWritten = true;
@@ -17979,7 +17976,7 @@ export class Orchestrator {
 
       const fallbackNamespace =
         fallbackStorageDir !== null
-          ? this.namespaceFromStorageDir(fallbackStorageDir)
+          ? this.storageDirNamespace(fallbackStorageDir)
           : this.config.defaultNamespace;
       if (
         recallNamespaces.length === 0 ||
@@ -18169,7 +18166,7 @@ export class Orchestrator {
 
     const fallbackNamespace =
       fallbackStorageDir !== null
-        ? this.namespaceFromStorageDir(fallbackStorageDir)
+        ? this.storageDirNamespace(fallbackStorageDir)
         : this.config.defaultNamespace;
     maybeAddStorage(fallbackStorage, fallbackNamespace);
 
@@ -20034,41 +20031,18 @@ export class Orchestrator {
     return namespaceIdentityFromToken(m[1]) ?? m[1];
   }
 
-  private namespaceFromStorageDir(storageDir: string): string {
-    if (!this.config.namespacesEnabled) return this.config.defaultNamespace;
-    const resolvedStorageDir = path.resolve(storageDir);
-    const resolvedMemoryDir = path.resolve(this.config.memoryDir);
-    if (resolvedStorageDir === resolvedMemoryDir)
-      return this.config.defaultNamespace;
-    const m = resolvedStorageDir.match(/[\\/]namespaces[\\/]([^\\/]+)$/);
-    if (!m?.[1]) return this.config.defaultNamespace;
-    const dirName = m[1];
-    // Token-shaped raw names (round 6, codex P2 — NBsFz): a dir name might be a
-    // tokenized identity OR a literal raw namespace name that merely LOOKS like a
-    // token (e.g. a configured or dynamic name `ns-616c706861`). The round-trip check below
-    // (`namespaceIdentityToken(decoded) === dirName`) is TAUTOLOGICAL for a
-    // canonical token string, so it cannot tell a tokenized dir for `alpha` apart
-    // from the legacy raw root of a namespace literally named `ns-616c706861`
-    // (codex NRCve). A dir name that is itself a KNOWN namespace (configured or
-    // catalog-owned at this exact storage root) is therefore preserved as the
-    // literal namespace BEFORE attempting to decode it.
-    if (this.configuredNamespaces().includes(dirName)) {
-      return dirName;
-    }
-    this.loadNamespaceStorageDirHintsFromCatalog();
-    const hintedNamespaces = this.namespaceStorageDirHints.get(resolvedStorageDir);
-    if (hintedNamespaces?.has(dirName)) {
-      return dirName;
-    }
-    if (hintedNamespaces?.size === 1) {
-      const [hintedNamespace] = hintedNamespaces;
-      if (hintedNamespace) return hintedNamespace;
-    }
-    const decoded = namespaceIdentityFromToken(dirName);
-    if (decoded && namespaceIdentityToken(decoded) === dirName) {
-      return decoded;
-    }
-    return dirName;
+  private storageDirNamespace(storageDir: string): string {
+    // #1521: delegates to the scope-module resolver. The inline dir→namespace
+    // derivation (token round-trip guard, catalog hints) is retired so the
+    // adHocNamespaceResolutions ratchet no longer counts this site. Hints are
+    // loaded lazily via the callback (only after early returns, matching the
+    // original behavior — codex P2).
+    return resolveNamespaceFromStorageDir(storageDir, {
+      config: this.config,
+      configuredNamespaces: this.configuredNamespaceList(),
+      hints: this.namespaceStorageDirHints,
+      loadHints: () => this.loadNamespaceStorageDirHintsFromCatalog(),
+    });
   }
 
   // #1522: catalog touch methods removed — touches now happen at the storage chokepoint.

package/src/scopes/scope-plan.test.ts

@@ -21,7 +21,12 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { resolveScopePlan } from "./scope-plan.js";
+import {
+  getConfiguredNamespaces,
+  resolveNamespaceFromStorageDir,
+  resolveScopePlan,
+  resolveWritableNamespaceValue,
+} from "./scope-plan.js";
 import {
   combineNamespaces,
   lcmSessionKeyForNamespace,
@@ -358,3 +363,165 @@ test("scope-plan: LCM session ids match lcmSessionKeyForNamespace encoding", ()
   );
   assert.deepEqual([...plan.lcmReadSessionIds], expected);
 });
+
+// ──────────────────────────────────────────────────────────────────────────
+// Fitness tests: centralized namespace-resolution helpers (#1521 step 3–4)
+//
+// These pin the three pure helpers that replace the ad-hoc resolution scattered
+// across orchestrator.ts and access-service.ts. They MUST match the pre-migration
+// behavior byte-for-byte (the snapshots were derived from the original inline
+// implementations).
+// ──────────────────────────────────────────────────────────────────────────
+
+test("getConfiguredNamespaces: default + shared + policies, trimmed and deduped", () => {
+  const config = baseConfig({
+    defaultNamespace: "default",
+    sharedNamespace: "shared",
+    namespacePolicies: [
+      { name: "team-a", readPrincipals: ["*"], writePrincipals: ["*"] },
+      { name: "team-b", readPrincipals: ["*"], writePrincipals: ["*"] },
+    ],
+  });
+  const ns = getConfiguredNamespaces(config);
+  assert.deepEqual(ns, ["default", "shared", "team-a", "team-b"]);
+});
+
+test("getConfiguredNamespaces: trims whitespace and drops empty", () => {
+  const config = baseConfig({
+    defaultNamespace: "  default  ",
+    sharedNamespace: "",
+    namespacePolicies: [
+      { name: "team-a ", readPrincipals: ["*"], writePrincipals: ["*"] },
+    ],
+  });
+  const ns = getConfiguredNamespaces(config);
+  assert.deepEqual(ns, ["default", "team-a"]);
+});
+
+test("getConfiguredNamespaces: deduplicates identical names", () => {
+  const config = baseConfig({
+    defaultNamespace: "default",
+    sharedNamespace: "default",
+    namespacePolicies: [
+      { name: "default", readPrincipals: ["*"], writePrincipals: ["*"] },
+    ],
+  });
+  const ns = getConfiguredNamespaces(config);
+  assert.deepEqual(ns, ["default"]);
+});
+
+// ── resolveNamespaceFromStorageDir ──────────────────────────────────────────
+
+test("resolveNamespaceFromStorageDir: namespaces disabled → always default", () => {
+  const config = baseConfig({ namespacesEnabled: false });
+  const ns = resolveNamespaceFromStorageDir("/some/path/namespaces/team-a", {
+    config,
+    configuredNamespaces: getConfiguredNamespaces(config),
+  });
+  assert.equal(ns, "default");
+});
+
+test("resolveNamespaceFromStorageDir: memory root → default", () => {
+  const config = baseConfig({ memoryDir: "/data/memory" });
+  const ns = resolveNamespaceFromStorageDir("/data/memory", {
+    config,
+    configuredNamespaces: getConfiguredNamespaces(config),
+  });
+  assert.equal(ns, "default");
+});
+
+test("resolveNamespaceFromStorageDir: configured namespace dir → that namespace", () => {
+  const config = baseConfig({
+    memoryDir: "/data/memory",
+    namespacePolicies: [
+      { name: "team-a", readPrincipals: ["*"], writePrincipals: ["*"] },
+    ],
+  });
+  const ns = resolveNamespaceFromStorageDir("/data/memory/namespaces/team-a", {
+    config,
+    configuredNamespaces: getConfiguredNamespaces(config),
+  });
+  assert.equal(ns, "team-a");
+});
+
+test("resolveNamespaceFromStorageDir: tokenized dir → decoded namespace", () => {
+  const config = baseConfig({ memoryDir: "/data/memory" });
+  // "alpha" tokenizes to ns-616c706861
+  const ns = resolveNamespaceFromStorageDir("/data/memory/namespaces/ns-616c706861", {
+    config,
+    configuredNamespaces: getConfiguredNamespaces(config),
+  });
+  assert.equal(ns, "alpha");
+});
+
+test("resolveNamespaceFromStorageDir: unknown dir → literal dir name", () => {
+  const config = baseConfig({ memoryDir: "/data/memory" });
+  const ns = resolveNamespaceFromStorageDir("/data/memory/namespaces/custom-ns", {
+    config,
+    configuredNamespaces: getConfiguredNamespaces(config),
+  });
+  assert.equal(ns, "custom-ns");
+});
+
+test("resolveNamespaceFromStorageDir: catalog hint resolves single-hint dir", () => {
+  const config = baseConfig({ memoryDir: "/data/memory" });
+  const resolvedDir = "/data/memory/namespaces/dynamic-xyz";
+  const hints = new Map([[resolvedDir, new Set(["my-dynamic-ns"])]]);
+  const ns = resolveNamespaceFromStorageDir(resolvedDir, {
+    config,
+    configuredNamespaces: getConfiguredNamespaces(config),
+    hints,
+  });
+  assert.equal(ns, "my-dynamic-ns");
+});
+
+// ── resolveWritableNamespaceValue ───────────────────────────────────────────
+
+test("resolveWritableNamespaceValue: undefined namespace → default, ok", () => {
+  const config = baseConfig();
+  const result = resolveWritableNamespaceValue(undefined, "sess-1", undefined, config);
+  assert.equal(result.ok, true);
+  if (result.ok) assert.equal(result.namespace, "default");
+});
+
+test("resolveWritableNamespaceValue: explicit namespace, writable principal → ok", () => {
+  const config = baseConfig({
+    namespacePolicies: [
+      { name: "team-a", readPrincipals: ["alice"], writePrincipals: ["alice"] },
+    ],
+  });
+  const result = resolveWritableNamespaceValue("team-a", "alice:sess-1", "alice", config);
+  assert.equal(result.ok, true);
+  if (result.ok) assert.equal(result.namespace, "team-a");
+});
+
+test("resolveWritableNamespaceValue: explicit namespace, non-writable principal → not_writable", () => {
+  const config = baseConfig({
+    namespacePolicies: [
+      { name: "team-a", readPrincipals: ["alice"], writePrincipals: ["alice"] },
+    ],
+  });
+  const result = resolveWritableNamespaceValue("team-a", "bob:sess-1", "bob", config);
+  assert.equal(result.ok, false);
+  if (!result.ok) {
+    assert.equal(result.reason, "not_writable");
+    assert.equal(result.namespace, "team-a");
+  }
+});
+
+test("resolveWritableNamespaceValue: non-default namespace with namespaces disabled → unsupported", () => {
+  const config = baseConfig({ namespacesEnabled: false });
+  const result = resolveWritableNamespaceValue("custom-ns", "sess-1", undefined, config);
+  assert.equal(result.ok, false);
+  if (!result.ok) {
+    assert.equal(result.reason, "unsupported");
+    assert.equal(result.namespace, "custom-ns");
+  }
+});
+
+test("resolveWritableNamespaceValue: namespaces disabled, default namespace → ok", () => {
+  const config = baseConfig({ namespacesEnabled: false });
+  const result = resolveWritableNamespaceValue("default", "sess-1", undefined, config);
+  assert.equal(result.ok, true);
+  if (result.ok) assert.equal(result.namespace, "default");
+});

package/src/scopes/scope-plan.ts

@@ -33,10 +33,16 @@
 
 import {
   canReadNamespace,
+  canWriteNamespace,
   defaultNamespaceForPrincipal,
   recallNamespacesForPrincipal,
   resolvePrincipal,
 } from "../namespaces/principal.js";
+import {
+  namespaceIdentityFromToken,
+  namespaceIdentityToken,
+} from "../namespaces/identity.js";
+import path from "node:path";
 import type { ResolvedScopeProfilePlan } from "../namespaces/scope-profiles.js";
 import {
   expandScopeProfileReadNamespaces,
@@ -318,3 +324,160 @@ export function resolveScopePlan(options: ResolveScopePlanOptions): ScopePlan {
     scopeProfilePlan,
   };
 }
+
+// ────────────────────────────────────────────────────────────────────────────
+// Centralized namespace-resolution helpers (issue #1521 step 3–4)
+//
+// The three functions below consolidate the ad-hoc namespace-resolution logic
+// that was previously scattered across orchestrator.ts (namespaceFromStorageDir,
+// configuredNamespaces) and access-service.ts (resolveWritableNamespace). By
+// living in THIS module they are excluded from the adHocNamespaceResolutions
+// ratchet, and every consumer reaches them through a single well-known import
+// instead of reimplementing the derivation inline (#1519's failure mode).
+// ────────────────────────────────────────────────────────────────────────────
+
+/**
+ * The configured namespace set: default + shared + every namespace-policy
+ * name, trimmed and de-duplicated. Pure — reads only from `config`.
+ *
+ * Replaces the `configuredNamespaces()` private method that lived on both
+ * `Orchestrator` and the maintenance namespace-planner (two copies of the
+ * same logic).
+ */
+export function getConfiguredNamespaces(config: PluginConfig): string[] {
+  return Array.from(
+    new Set(
+      [
+        config.defaultNamespace,
+        config.sharedNamespace,
+        ...config.namespacePolicies.map((policy) => policy.name),
+      ]
+        .map((value) => value.trim())
+        .filter(Boolean),
+    ),
+  );
+}
+
+/**
+ * Options for {@link resolveNamespaceFromStorageDir}.
+ */
+export interface ResolveNamespaceFromStorageDirOptions {
+  /** Plugin config (memoryDir, defaultNamespace, namespacesEnabled, …). */
+  readonly config: PluginConfig;
+  /**
+   * Pre-computed configured-namespace set (from {@link getConfiguredNamespaces}).
+   * Passed by the caller so this function does not re-derive it on every call.
+   */
+  readonly configuredNamespaces: readonly string[];
+  /**
+   * Catalog-owned dir→namespace hints (best-effort union of configured +
+   * catalog-discovered). May be `undefined` when no catalog hints are loaded.
+   */
+  readonly hints?: ReadonlyMap<string, ReadonlySet<string>> | undefined;
+  /**
+   * Lazy catalog-hint loader. Called ONLY after the early returns (disabled,
+   * memory root, no namespace segment, configured namespace) — matching the
+   * original lazy behavior so an eager load does not mark hints as loaded
+   * before the catalog file exists (codex P2).
+   */
+  readonly loadHints?: () => void;
+}
+
+/**
+ * Derive the namespace a storage directory belongs to.
+ *
+ * Pure (no orchestrator state): the caller passes `config`, the configured set,
+ * and any catalog hints. The logic is byte-identical to the private
+ * `namespaceFromStorageDir` method that previously lived on `Orchestrator`
+ * (including the token round-trip guard from codex round 6).
+ */
+export function resolveNamespaceFromStorageDir(
+  storageDir: string,
+  options: ResolveNamespaceFromStorageDirOptions,
+): string {
+  const { config } = options;
+  if (!config.namespacesEnabled) return config.defaultNamespace;
+  const resolvedStorageDir = path.resolve(storageDir);
+  const resolvedMemoryDir = path.resolve(config.memoryDir);
+  if (resolvedStorageDir === resolvedMemoryDir) return config.defaultNamespace;
+  const m = resolvedStorageDir.match(/[\\/]namespaces[\\/]([^\\/]+)$/);
+  if (!m?.[1]) return config.defaultNamespace;
+  const dirName = m[1];
+  // Token-shaped raw names (codex P2 — NBsFz): a dir name might be a tokenized
+  // identity OR a literal raw namespace name that merely LOOKS like a token.
+  // A dir name that is itself a KNOWN namespace is preserved BEFORE decoding.
+  if (options.configuredNamespaces.includes(dirName)) {
+    return dirName;
+  }
+  // Load catalog hints ONLY after the early returns (codex P2: an eager load
+  // before the catalog file exists would mark hints as loaded and skip later
+  // catalog-derived rows).
+  options.loadHints?.();
+  const hints = options.hints;
+  const hintedNamespaces = hints?.get(resolvedStorageDir);
+  if (hintedNamespaces?.has(dirName)) {
+    return dirName;
+  }
+  if (hintedNamespaces?.size === 1) {
+    const [hintedNamespace] = hintedNamespaces;
+    if (hintedNamespace) return hintedNamespace;
+  }
+  const decoded = namespaceIdentityFromToken(dirName);
+  if (decoded && namespaceIdentityToken(decoded) === dirName) {
+    return decoded;
+  }
+  return dirName;
+}
+
+/**
+ * Result of resolving a writable namespace: either the authorized namespace
+ * or a structured rejection. The caller decides how to surface the rejection
+ * (e.g. as an `EngramAccessInputError` in the access-service layer), keeping
+ * this module free of transport-specific error types.
+ */
+export type WritableNamespaceResult =
+  | { readonly ok: true; readonly namespace: string }
+  | { readonly ok: false; readonly reason: "unsupported" | "not_writable"; readonly namespace: string };
+
+/**
+ * Resolve and authorize a writable namespace.
+ *
+ * Combines the three steps that `AccessService.resolveWritableNamespace`
+ * performed inline: (1) resolve the namespace value (trim → default fallback →
+ * validate against `namespacesEnabled`), (2) resolve the principal, (3) check
+ * `canWriteNamespace`. Returns a structured result so this module stays free of
+ * `EngramAccessInputError` (avoiding a circular dependency on access-service.ts).
+ *
+ * The caller throws `EngramAccessInputError` when `ok === false` — the access-
+ * service wrapper does this in one place.
+ */
+export function resolveWritableNamespaceValue(
+  namespace: string | undefined,
+  sessionKey: string | undefined,
+  authenticatedPrincipal: string | undefined,
+  config: PluginConfig,
+): WritableNamespaceResult {
+  const requested = namespace?.trim();
+  let resolved: string;
+  if (!requested) {
+    resolved = config.defaultNamespace;
+  } else if (
+    !config.namespacesEnabled &&
+    requested !== config.defaultNamespace
+  ) {
+    return { ok: false, reason: "unsupported", namespace: requested };
+  } else {
+    resolved = requested;
+  }
+
+  const trusted = authenticatedPrincipal?.trim();
+  const principal =
+    typeof trusted === "string" && trusted.length > 0
+      ? trusted
+      : resolvePrincipal(sessionKey, config);
+
+  if (!canWriteNamespace(principal, resolved, config)) {
+    return { ok: false, reason: "not_writable", namespace: resolved };
+  }
+  return { ok: true, namespace: resolved };
+}