Merge remote-tracking branch 'gitea/develop' into fix/541-reconnect-timeout

При живом обрыве SSE вход в лестницу reconnect происходил только
после резолва getRun(cid) (ре-сид из персиста). Путь REJECT
обрабатывался через .catch, но ЗАВИСШИЙ getRun (соединение есть,
ответа нет) был не ограничен: axios-клиент (lib/api-client.ts) не
имеет timeout, а stalled-idle-cap взводится только ПОСЛЕ входа в
reconnecting/polling. Итог — FSM залипала в `streaming` без баннера
и без поллинга до сокет-таймаута браузера (минуты). Это тот самый
класс тихого зависания, который устраняет эпик #497.

Оборачиваю ожидание getRun гонкой с таймаутом
(RECONNECT_RESEED_TIMEOUT_MS = 4s): по таймауту берётся ТОТ ЖЕ
фолбэк, что и на reject — dropLivePartialAndReplayFromStart() +
enterReconnect(runId), так что лестница/поллинг стартуют и
stalled-idle-cap взводится. Локальный флаг `settled` делает ветви
resolve/reject/timeout взаимоисключающими: поздний резолв getRun
после сработавшего таймаута полностью игнорируется (не входит в
reconnect повторно, не перетирает replay-from-start устаревшим
ре-сидом, ничего не перевзводит). Таймер живёт в reseedTimerRef и
очищается при размонтировании (никаких висящих setTimeout).

Тесты: hang-кейс (getRun не резолвится -> по таймауту FSM в
reconnecting, live-partial сброшен, replay-from-start) и
late-resolve safety (поздний резолв — no-op). Мутация: замена гонки
на голый getRun краснит оба #541-теста.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.env.example

@@ -251,16 +251,6 @@ MCP_DOCMOST_PASSWORD=
 # Default 120000 (2 min).
 # AI_MCP_CALL_TIMEOUT_MS=120000
 
-# Kill-switch for the agent API-key feature (#501). Default ON when unset — a
-# deploy that never sets it must NOT silently kill every agent. STRICT parse:
-# only the literals `true` / `false` are accepted; a typo like `=0`/`=off`/`=False`
-# FAILS AT BOOT by design (never silently read as "enabled"), so the switch is
-# guaranteed to actually flip when an operator flips it during an incident. When
-# set to `false`: all api-key auth is DENIED (every api-key token is rejected) and
-# the api-key management endpoints return 404. The resolved state is logged at boot
-# (`API keys: ENABLED/DISABLED (API_KEYS_ENABLED=...)`) so it is verifiable per deploy.
-# API_KEYS_ENABLED=true
-
 # Max JSON/urlencoded request body size (bytes). Fastify's 1 MiB default is too
 # small for a long AI-chat research turn: the client resends the FULL message
 # history (every tool call + search result) on each turn, so a deep conversation's

.github/workflows/develop.yml

@@ -226,13 +226,6 @@ jobs:
       - name: Build mcp
         run: pnpm --filter @docmost/mcp build
 
-      # apps/server imports @docmost/token-estimate at runtime (history-budget.ts,
-      # #490); its dist/ is gitignored and `test:e2e` type-checks + runs the code,
-      # so build it here or tsc fails with TS2307 Cannot find module
-      # '@docmost/token-estimate' (mirrors the editor-ext / mcp build steps above).
-      - name: Build token-estimate
-        run: pnpm --filter @docmost/token-estimate build
-
       - name: Run migrations
         run: pnpm --filter ./apps/server migration:latest
 

.github/workflows/test.yml

@@ -159,14 +159,6 @@ jobs:
       - name: Build prosemirror-markdown
         run: pnpm --filter @docmost/prosemirror-markdown build
 
-      # @docmost/token-estimate is a shared workspace package the client vitest
-      # suite resolves via its dist build (main: ./dist/index.js); dist/ is
-      # gitignored and `pnpm -r test` does NOT honour nx `dependsOn: ^build`, so
-      # build it before the recursive test run or the client suite fails with
-      # "Failed to resolve import '@docmost/token-estimate'" (#490).
-      - name: Build token-estimate
-        run: pnpm --filter @docmost/token-estimate build
-
       - name: Run unit tests
         run: pnpm -r test
 

CHANGELOG.md

@@ -392,25 +392,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   `@docmost/token-estimate` package) so they can never diverge. Deferred-tool
   activation is also cached in the chat metadata to avoid re-resolving it each
   turn. (#490)
-- **Cyrillic (and any non-ASCII) draw.io labels no longer turn into mojibake
-  when a diagram is opened in the draw.io editor.** Agent-created diagrams
-  (`drawioCreate`) and Confluence-imported diagrams stored their model in the
-  SVG's `content=` attribute as base64; the draw.io editor decodes that via
-  Latin-1 `atob` (no UTF-8 step), so every non-ASCII char (e.g. `Старт-бит`,
-  `ё`, `—`) split into garbage and the editor's autosave then persisted the
-  corrupted model, breaking the page preview too. Both write paths
-  (`buildDrawioSvg`, the import service's `createDrawioSvg`) now write `content=`
-  as XML-entity-escaped mxfile XML — draw.io's own native form, decoded by the
-  DOM as UTF-8 — so labels open intact. The decoder reads both the new
-  entity-encoded form and the old base64 form, so existing diagrams still open.
-  *Healing pre-fix diagrams:* only a diagram that still holds its original
-  (correct-UTF-8) base64 — i.e. one not yet opened/autosaved in the draw.io
-  editor — can be repaired in place by `drawioGet` → `drawioUpdate` with the
-  same XML (rewrites the attachment in the new form); no migration script is
-  needed. A diagram that was already opened in the editor persisted the
-  mojibake at rest, so `drawioGet` reads the already-corrupted text and
-  `drawioUpdate` faithfully rewrites it — that text is lost and is not
-  recoverable by a rewrite. (#507)
 - **A chat with one malformed message part no longer 500s on every turn, and a
   failed send no longer duplicates the user's message.** Incoming client parts
   are now whitelisted to `text` (a forged tool-result part can no longer reach

Dockerfile

@@ -59,14 +59,6 @@ COPY --from=builder /app/packages/mcp/data /app/packages/mcp/data
 COPY --from=builder /app/packages/prosemirror-markdown/build /app/packages/prosemirror-markdown/build
 COPY --from=builder /app/packages/prosemirror-markdown/package.json /app/packages/prosemirror-markdown/package.json
 
-# apps/server imports @docmost/token-estimate (workspace:*) at runtime
-# (history-budget.ts, #490). tsc emits only dist/ and dist/ is gitignored, so the
-# prod install would resolve a broken workspace symlink and the server would die
-# with ERR_MODULE_NOT_FOUND on the first history-budget call. Ship the built
-# package + its manifest, mirroring prosemirror-markdown above.
-COPY --from=builder /app/packages/token-estimate/dist /app/packages/token-estimate/dist
-COPY --from=builder /app/packages/token-estimate/package.json /app/packages/token-estimate/package.json
-
 # Copy root package files
 COPY --from=builder /app/package.json /app/package.json
 COPY --from=builder /app/pnpm*.yaml /app/

apps/client/src/features/ai-chat/components/chat-thread.test.tsx

@@ -1254,4 +1254,88 @@ describe("ChatThread — live reconnect + stalled", () => {
     });
     expect(onResumeFallback).toHaveBeenCalledWith(false); // POLL_IDLE_CAP -> idle -> disarm
   });
+
+  it("#541: getRun HANGS on a live disconnect — the timeout race still enters reconnect (no silent freeze in `streaming`)", async () => {
+    // MUTATION-VERIFY: revert the race to a bare `getRun(cid).then/.catch` and this
+    // reddens — a HUNG (never-settling, NOT rejected) getRun leaves the FSM stuck in
+    // `streaming` with no reconnect banner and no poll (the axios client sets no
+    // request timeout, and the stalled-idle cap only arms AFTER reconnecting/polling).
+    renderLive();
+    h.state.getRun.mockReset();
+    h.state.getRun.mockReturnValue(new Promise(() => {})); // getRun HANGS forever
+    await disconnect(); // live partial = liveMsg (id "a2")
+    expect(h.state.getRun).toHaveBeenCalledWith("c1");
+    // BEFORE the bound fires the FSM is still in the live turn — the very freeze bug.
+    expect(screen.queryByText(/reconnecting/i)).toBeNull();
+    // The recovery-start bound fires -> the SAME fallback as the reject path.
+    act(() => {
+      vi.advanceTimersByTime(4_000);
+    });
+    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
+    // The live partial (a2) was DROPPED from the store (replay-from-start, no stale
+    // tail-apply base). Mirrors the getRun-REJECT test's inspection.
+    const removedLivePartial = (
+      h.state.setMessages as unknown as {
+        mock: { calls: [unknown][] };
+      }
+    ).mock.calls.some(([updater]) => {
+      if (typeof updater !== "function") return false;
+      const out = (updater as (p: { id: string }[]) => { id: string }[])([
+        { id: "a2" },
+        { id: "u1" },
+      ]);
+      return !out.some((m) => m.id === "a2");
+    });
+    expect(removedLivePartial).toBe(true);
+    // ...and the anchor was NULLED -> replay-from-start (no ?anchor=&n= over the partial).
+    advanceToAttempt(1);
+    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
+    expect(h.state.transport!.prepareReconnectToStreamRequest!().api).toBe(
+      "/api/ai-chat/runs/c1/stream",
+    );
+  });
+
+  it("#541: a getRun resolve AFTER the timeout already fired is IGNORED (no double reconnect, no stale re-seed)", async () => {
+    // The timeout wins first and enters the ladder via replay-from-start. When the
+    // hung getRun FINALLY answers, its late `.then` must be a full no-op: it must not
+    // re-seed the store from the (now stale) persisted row, must not re-set the
+    // anchor, and must not re-enter reconnect. The local `settled` flag makes the
+    // resolve/reject/timeout branches mutually exclusive.
+    // MUTATION-VERIFY: drop the `settled` guard (let the late `.then` run) and the
+    // late re-seed re-sets the anchor (URL regains ?anchor=a2&n=3) + calls setMessages.
+    renderLive();
+    let resolveGetRun!: (v: unknown) => void;
+    h.state.getRun.mockReset();
+    h.state.getRun.mockReturnValue(
+      new Promise((r) => {
+        resolveGetRun = r;
+      }),
+    );
+    await disconnect();
+    act(() => {
+      vi.advanceTimersByTime(4_000); // bound fires -> replay-from-start, reconnecting
+    });
+    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
+    advanceToAttempt(1);
+    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
+    // Anchor is null -> replay-from-start URL (the pre-condition the late resolve must
+    // not undo).
+    expect(h.state.transport!.prepareReconnectToStreamRequest!().api).toBe(
+      "/api/ai-chat/runs/c1/stream",
+    );
+    const setMessagesCallsBefore = h.state.setMessages.mock.calls.length;
+    // NOW the hung getRun finally resolves with a persisted anchor (id a2, steps 3).
+    await act(async () => {
+      resolveGetRun(persistedAnchor());
+      await Promise.resolve();
+    });
+    // The late resolve did NOT re-seed the store...
+    expect(h.state.setMessages.mock.calls.length).toBe(setMessagesCallsBefore);
+    // ...did NOT re-set the anchor (URL stays replay-from-start, no ?anchor=&n=)...
+    expect(h.state.transport!.prepareReconnectToStreamRequest!().api).toBe(
+      "/api/ai-chat/runs/c1/stream",
+    );
+    // ...and did NOT trigger a fresh reconnect attach.
+    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
+  });
 });

apps/client/src/features/ai-chat/components/chat-thread.tsx

@@ -81,6 +81,17 @@ const STREAM_THROTTLE_MS = 50;
 // THREAD now (the FSM owns polling->stalled); the window just polls while armed.
 const DEGRADED_POLL_IDLE_MAX_MS = 10 * 60_000;
 
+// #541: the bound on the persist re-seed (getRun) wait when ENTERING the reconnect
+// ladder after a live SSE drop. The axios client (lib/api-client.ts) sets NO request
+// timeout, and the stalled-idle cap only arms AFTER the FSM enters reconnecting/
+// polling — which never happens if getRun HANGS (connection established, no response).
+// Without this bound a live drop + a hung getRun sticks the FSM in `streaming` with
+// no banner and no poll until the browser socket timeout (minutes) — the silent-freeze
+// class #497 eliminates. This is a deliberate RECOVERY-START bound (drop the live
+// partial + enter the ladder so the poll/idle-cap arms), intentionally much shorter
+// than any network socket timeout — not a network read timeout.
+const RECONNECT_RESEED_TIMEOUT_MS = 4_000;
+
 /** The #487 active (non-terminal) run statuses — mirrors the server's
  *  ACTIVE_RUN_STATUSES. A run-fact is "active" only for these. */
 function isActiveRunStatus(status: string | null | undefined): boolean {
@@ -286,6 +297,9 @@ export default function ChatThread({
   // stalled inactivity cap. Cleared by the cancelReconnect effect / the cap effect.
   const reconnectTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const idleCapTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  // #541: the persist re-seed (getRun) timeout race on the disconnect->reconnect
+  // entry. Held in a ref so unmount (DISPOSE cleanup) clears it — no dangling timer.
+  const reseedTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   // #491 tail-only: seed EVERY persisted row unchanged (no strip). The streaming
   // tail holds steps 0..N-1; the run-stream registry's tail (steps >= N) is APPENDED
@@ -748,37 +762,68 @@ export default function ChatThread({
           anchorRef.current = null;
         };
         if (cid) {
-          void getRun(cid)
-            .then((res) => {
-              if (!mountedRef.current) return;
-              const persisted = res.message;
-              if (persisted && persisted.role === "assistant") {
-                anchorRef.current = {
-                  id: persisted.id,
-                  stepsPersisted: stepsPersistedOf(persisted),
-                };
-                // Replace the live partial with the persisted row IN PLACE by id —
-                // the re-seed from persist. The attach's tail (steps >= N) then
-                // appends to a store holding EXACTLY steps 0..N-1: no duplication.
-                setMessages((prev) => mergeById(prev, rowToUiMessage(persisted)));
-              } else {
-                // No persisted assistant row (pre-first-frame break): drop the live
-                // partial + replay from start (no anchor/n) so nothing is duplicated.
-                dropLivePartialAndReplayFromStart();
-              }
-              enterReconnect(res.run?.id ?? runId);
-            })
-            .catch(() => {
-              if (!mountedRef.current) return;
-              // Persist read FAILED: we cannot re-seed from fresh persist, and a
-              // stale mount-time anchor over the live partial would tail-apply
-              // already-present steps -> duplication (a flaky-network blip:
-              // SSE + getRun both fail, network recovers in ~1s, the registry still
-              // covers from the mount frontier). Restore the removed-filter guarantee
-              // instead: drop the live partial + replay from start / 204 -> poll.
+          // #541: bound the persist re-seed wait with a timeout race. getRun goes
+          // through the axios client, which has NO request timeout; a HUNG getRun
+          // (connection open, no response) — distinct from a REJECT, which the
+          // `.catch` already handles — would otherwise never let us enter the ladder,
+          // leaving the FSM stuck in `streaming` with no banner and no poll until the
+          // browser socket timeout. `settled` makes the three branches (resolve /
+          // reject / timeout) mutually exclusive: whichever fires FIRST wins and the
+          // others become no-ops. So a LATE getRun resolve AFTER the timeout is fully
+          // ignored — it cannot (i) re-enter reconnect a second time, (ii) overwrite
+          // the timeout's replay-from-start with a stale re-seed, or (iii) re-arm any
+          // timer. On timeout we take the SAME fallback as the reject path (drop the
+          // live partial + enter the ladder, so the poll and the stalled-idle cap arm).
+          let settled = false;
+          const finishReseed = (apply: () => void): void => {
+            if (settled) return;
+            settled = true;
+            if (reseedTimerRef.current) {
+              clearTimeout(reseedTimerRef.current);
+              reseedTimerRef.current = null;
+            }
+            if (!mountedRef.current) return;
+            apply();
+          };
+          reseedTimerRef.current = setTimeout(() => {
+            finishReseed(() => {
               dropLivePartialAndReplayFromStart();
               enterReconnect(runId);
             });
+          }, RECONNECT_RESEED_TIMEOUT_MS);
+          void getRun(cid)
+            .then((res) => {
+              finishReseed(() => {
+                const persisted = res.message;
+                if (persisted && persisted.role === "assistant") {
+                  anchorRef.current = {
+                    id: persisted.id,
+                    stepsPersisted: stepsPersistedOf(persisted),
+                  };
+                  // Replace the live partial with the persisted row IN PLACE by id —
+                  // the re-seed from persist. The attach's tail (steps >= N) then
+                  // appends to a store holding EXACTLY steps 0..N-1: no duplication.
+                  setMessages((prev) => mergeById(prev, rowToUiMessage(persisted)));
+                } else {
+                  // No persisted assistant row (pre-first-frame break): drop the live
+                  // partial + replay from start (no anchor/n) so nothing is duplicated.
+                  dropLivePartialAndReplayFromStart();
+                }
+                enterReconnect(res.run?.id ?? runId);
+              });
+            })
+            .catch(() => {
+              finishReseed(() => {
+                // Persist read FAILED: we cannot re-seed from fresh persist, and a
+                // stale mount-time anchor over the live partial would tail-apply
+                // already-present steps -> duplication (a flaky-network blip:
+                // SSE + getRun both fail, network recovers in ~1s, the registry still
+                // covers from the mount frontier). Restore the removed-filter guarantee
+                // instead: drop the live partial + replay from start / 204 -> poll.
+                dropLivePartialAndReplayFromStart();
+                enterReconnect(runId);
+              });
+            });
         } else {
           dropLivePartialAndReplayFromStart();
           enterReconnect(runId);
@@ -903,6 +948,12 @@ export default function ChatThread({
     }
     return () => {
       mountedRef.current = false;
+      // #541: clear the in-flight persist re-seed timeout (not an FSM effect timer,
+      // so DISPOSE does not touch it) — no dangling setTimeout after unmount.
+      if (reseedTimerRef.current) {
+        clearTimeout(reseedTimerRef.current);
+        reseedTimerRef.current = null;
+      }
       dispatch({ type: "DISPOSE" }); // aborts attach + timers, bumps epoch (I5)
     };
     // Mount-only by design; the parent remounts per chat via `key`.

apps/client/src/features/page/tree/components/space-tree.tsx

@@ -281,12 +281,10 @@ const SpaceTree = forwardRef<SpaceTreeApi, SpaceTreeProps>(function SpaceTree(
       setOpenTreeNodes((prev) => ({ ...prev, [id]: isOpen }));
       if (isOpen) {
         const node = treeModel.find(data, id) as SpaceTreeNode | null;
-        // Same "unloaded branch" predicate the realtime insert paths use
-        // (`isUnloadedBranch`) so the lazy-load gate and the realtime inserts
-        // (`insertByPosition` / `placeByPosition`) can never disagree about what
-        // counts as unloaded (#525). Note: local raw `insert` (DnD/create-page)
-        // does not yet route through it — see #525 follow-up.
-        if (treeModel.isUnloadedBranch(node)) {
+        if (
+          node?.hasChildren &&
+          (!node.children || node.children.length === 0)
+        ) {
           const fetched = await fetchAllAncestorChildren({
             pageId: id,
             spaceId: node.spaceId,

apps/client/src/features/page/tree/model/tree-model.test.ts

@@ -74,48 +74,6 @@ describe("treeModel.isDescendant", () => {
   });
 });
 
-// #525: the single "is this branch unloaded?" predicate shared by the lazy-load
-// gate and the insert paths. Unloaded == server says hasChildren but none are
-// present locally (canonical form `children: []`, also `undefined`). A parent
-// without hasChildren is genuinely empty, not unloaded.
-describe("treeModel.isUnloadedBranch", () => {
-  type PH = TreeNode<{ name: string; hasChildren?: boolean }>;
-  it("true for hasChildren + empty array (canonical unloaded form)", () => {
-    const n: PH = { id: "p", name: "P", hasChildren: true, children: [] };
-    expect(treeModel.isUnloadedBranch(n)).toBe(true);
-  });
-  it("true for hasChildren + undefined children", () => {
-    const n: PH = { id: "p", name: "P", hasChildren: true };
-    expect(treeModel.isUnloadedBranch(n)).toBe(true);
-  });
-  it("false for hasChildren + already-loaded children", () => {
-    const n: PH = {
-      id: "p",
-      name: "P",
-      hasChildren: true,
-      children: [{ id: "c", name: "C" }],
-    };
-    expect(treeModel.isUnloadedBranch(n)).toBe(false);
-  });
-  it("false for a genuinely-empty parent (no hasChildren)", () => {
-    expect(
-      treeModel.isUnloadedBranch({
-        id: "p",
-        name: "P",
-        hasChildren: false,
-        children: [],
-      } as PH),
-    ).toBe(false);
-    expect(
-      treeModel.isUnloadedBranch({ id: "p", name: "P" } as PH),
-    ).toBe(false);
-  });
-  it("false for null/undefined", () => {
-    expect(treeModel.isUnloadedBranch(null)).toBe(false);
-    expect(treeModel.isUnloadedBranch(undefined)).toBe(false);
-  });
-});
-
 describe("treeModel.visible", () => {
   it("returns only root nodes when no openIds", () => {
     const v = treeModel.visible(fixture, new Set());
@@ -239,64 +197,43 @@ describe("treeModel.insertByPosition", () => {
     ]);
   });
 
-  type PH = TreeNode<{
-    name: string;
-    position?: string;
-    hasChildren?: boolean;
-  }>;
-
-  // #159 #1 / #525: inserting/moving a node under an UNLOADED parent must NOT
-  // materialize a partial `[node]` list — that would defeat the lazy-load gate and
-  // hide the parent's other real children. The canonical unloaded form here is
-  // `children: []` + `hasChildren: true` (from `pageToTreeNode` /
-  // `pruneCollapsedChildren`), which the pre-#525 `=== undefined` guard MISSED.
-  // The node is left to be lazy-loaded; the chevron stays enabled.
-  it("does NOT materialize a child under an UNLOADED parent (children: [], hasChildren: true)", () => {
-    const tree: PH[] = [
-      { id: "p", name: "P", position: "a0", hasChildren: true, children: [] },
-    ];
-    const node: PH = { id: "x", name: "X", position: "a1" };
-    const t = treeModel.insertByPosition(tree, "p", node);
-    const parent = treeModel.find(t, "p");
-    // The node was NOT inserted (children stay unloaded -> lazy-load fetches the
-    // full set, including this node, on expand). MUTATION: the pre-#525 predicate
-    // `children === undefined` does not fire for `[]`, so it would insert `[x]`
-    // here and reredden this expectation.
-    expect(parent?.children).toEqual([]);
-    expect(treeModel.find(t, "x")).toBeNull();
-    // ...and the chevron stays enabled so the user can expand to load it.
-    expect((parent as PH).hasChildren).toBe(true);
-  });
-
-  it("does NOT materialize a child under an UNLOADED parent (children undefined, hasChildren: true)", () => {
-    const tree: PH[] = [
-      { id: "p", name: "P", position: "a0", hasChildren: true }, // children: undefined
-    ];
-    const node: PH = { id: "x", name: "X", position: "a1" };
-    const t = treeModel.insertByPosition(tree, "p", node);
-    const parent = treeModel.find(t, "p");
-    expect(parent?.children).toBeUndefined();
-    expect(treeModel.find(t, "x")).toBeNull();
-    expect((parent as PH).hasChildren).toBe(true);
-  });
-
-  it("DOES insert under a genuinely-empty parent (children: [], hasChildren: false)", () => {
-    const tree: PH[] = [
-      { id: "p", name: "P", position: "a0", hasChildren: false, children: [] },
-    ];
-    const node: PH = { id: "x", name: "X", position: "a1" };
-    const t = treeModel.insertByPosition(tree, "p", node);
-    // No server children (`hasChildren: false`), so materializing the first child
-    // is correct — nothing is hidden.
-    expect(treeModel.find(t, "p")?.children?.map((n) => n.id)).toEqual(["x"]);
-  });
-
-  it("DOES insert under a genuinely-empty parent (children undefined, hasChildren: false)", () => {
+  // #159 #1: inserting/moving a node under a parent whose children are NOT
+  // loaded (`children === undefined`, e.g. a collapsed page) must NOT materialize
+  // a partial `[node]` list — that would defeat the lazy-load gate and hide the
+  // parent's other real children. The node is left to be lazy-loaded; only
+  // `hasChildren` is flagged so the chevron appears.
+  it("does NOT materialize a child under an UNLOADED parent (children undefined)", () => {
+    type PH = TreeNode<{
+      name: string;
+      position?: string;
+      hasChildren?: boolean;
+    }>;
     const tree: PH[] = [
       { id: "p", name: "P", position: "a0", hasChildren: false }, // children: undefined
     ];
     const node: PH = { id: "x", name: "X", position: "a1" };
     const t = treeModel.insertByPosition(tree, "p", node);
+    const parent = treeModel.find(t, "p");
+    // The node was NOT inserted (children stay unloaded -> lazy-load fetches the
+    // full set, including this node, on expand).
+    expect(parent?.children).toBeUndefined();
+    expect(treeModel.find(t, "x")).toBeNull();
+    // ...but the chevron is enabled so the user can expand to load it.
+    expect((parent as PH).hasChildren).toBe(true);
+  });
+
+  it("DOES insert under a LOADED-but-empty parent (children: [])", () => {
+    type PH = TreeNode<{
+      name: string;
+      position?: string;
+      hasChildren?: boolean;
+    }>;
+    const tree: PH[] = [
+      { id: "p", name: "P", position: "a0", hasChildren: false, children: [] },
+    ];
+    const node: PH = { id: "x", name: "X", position: "a1" };
+    const t = treeModel.insertByPosition(tree, "p", node);
+    // A loaded (empty) child list is complete, so the node IS inserted.
     expect(treeModel.find(t, "p")?.children?.map((n) => n.id)).toEqual(["x"]);
   });
 

apps/client/src/features/page/tree/model/tree-model.ts

@@ -43,26 +43,6 @@ export const treeModel = {
     };
   },
 
-  // A branch is "unloaded" when the server says it HAS children (`hasChildren`)
-  // but none are present locally. The canonical unloaded form in this codebase
-  // is `children: []` (produced by `pageToTreeNode` and by `pruneCollapsedChildren`
-  // resetting collapsed branches), NOT `children: undefined` — so a predicate that
-  // only checks `=== undefined` misses the real case and materializes a misleading
-  // partial list (#525). This is the SINGLE source of truth for "should a
-  // fetch/materialize be deferred?", shared by the lazy-load gate (`handleToggle`)
-  // and the realtime insert paths (`insertByPosition` / `placeByPosition`), so they
-  // can never drift apart again. (The local raw `insert` primitive and its DnD/
-  // create-page callers do NOT yet route through this predicate — see #525
-  // follow-up.) A parent WITHOUT `hasChildren` is genuinely empty
-  // (no server children) — inserting its first child is correct, not deferred.
-  isUnloadedBranch<T extends object>(
-    node: TreeNode<T> | null | undefined,
-  ): boolean {
-    if (!node) return false;
-    const hasChildren = (node as { hasChildren?: boolean }).hasChildren === true;
-    return hasChildren && (node.children == null || node.children.length === 0);
-  },
-
   isDescendant<T extends object>(
     tree: TreeNode<T>[],
     ancestorId: string,
@@ -147,15 +127,14 @@ export const treeModel = {
     }
     const parent = treeModel.find(tree, parentId);
     // The parent is in the tree but its children have NOT been lazy-loaded yet
-    // (`hasChildren` set + children absent/empty — see `isUnloadedBranch`; the
-    // canonical unloaded form is `children: []`, NOT just `undefined`). Inserting
+    // (`children === undefined`, distinct from a loaded-but-empty `[]`). Inserting
     // here would MATERIALIZE a misleading partial child list (`[node]`) that
     // defeats the lazy-load gate — which fetches only when children are
     // absent/empty — so the parent's OTHER real children would never load and the
     // moved/added node would be the only one shown (a silent data loss, #159 #1).
     // Instead, leave the children unloaded and just flag `hasChildren` so the
     // chevron appears; expanding fetches the FULL set (including this node).
-    if (parent && treeModel.isUnloadedBranch(parent)) {
+    if (parent && parent.children === undefined) {
       return treeModel.update(
         tree,
         parentId,

apps/client/src/features/websocket/tree-socket-reducers.test.ts

@@ -82,19 +82,17 @@ describe("applyMoveTreeNode", () => {
     ]);
   });
 
-  it("does NOT create a partial child list when the destination is loaded-but-collapsed (children unloaded) — keeps it lazy-loadable (#159 #525)", () => {
-    // `dstCollapsed` is in the tree but its children were never lazy-loaded. The
-    // CANONICAL unloaded form here is `hasChildren: true` + `children: []` (from
-    // `pageToTreeNode` / `pruneCollapsedChildren`), NOT `children: undefined`.
-    // The pre-#525 predicate (`children === undefined`) missed this form and
-    // inserted `src` as the ONLY child ([src]), defeating the lazy-load gate and
-    // HIDING the parent's other real children. Now the move leaves children
-    // unloaded (so expanding fetches the FULL set, including src).
+  it("does NOT create a partial child list when the destination is loaded-but-collapsed (children unloaded) — keeps it lazy-loadable (#159)", () => {
+    // `dstCollapsed` is in the tree but its children were never lazy-loaded
+    // (children === undefined). The OLD behavior inserted `src` as the ONLY
+    // child ([src]), which defeated the lazy-load gate and HID the parent's
+    // other real children. Now the move leaves children unloaded (so expanding
+    // fetches the FULL set, including src) and just flags hasChildren.
     const tree: SpaceTreeNode[] = [
       node("dstCollapsed", {
         position: "a0",
-        hasChildren: true,
-        children: [],
+        hasChildren: false,
+        children: undefined as unknown as SpaceTreeNode[],
       }),
       node("src", { position: "a9" }),
     ];
@@ -107,10 +105,9 @@ describe("applyMoveTreeNode", () => {
       pageData: {},
     });
     const dst = treeModel.find(next, "dstCollapsed");
-    // Children stay unloaded ([] not materialized to [src]) -> the lazy-load gate
-    // fetches the FULL set (incl. src) on expand. MUTATION: the pre-#525
-    // `=== undefined` predicate would insert [src] here and redden this.
-    expect(dst?.children).toEqual([]);
+    // Children stay unloaded -> the lazy-load gate fetches the FULL set (incl.
+    // src) on expand, rather than showing a misleading partial [src] list.
+    expect(dst?.children).toBeUndefined();
     expect(dst?.hasChildren).toBe(true);
     // src moved away from its old root slot (it lives under dstCollapsed
     // server-side and reappears when the parent is expanded/loaded).

apps/server/src/collaboration/collaboration.module.ts

@@ -16,7 +16,6 @@ import { TransclusionService } from '../core/page/transclusion/transclusion.serv
 import { TransclusionModule } from '../core/page/transclusion/transclusion.module';
 import { StorageModule } from '../integrations/storage/storage.module';
 import { EnvironmentModule } from '../integrations/environment/environment.module';
-import { ApiKeyModule } from '../core/api-key/api-key.module';
 
 @Module({
   providers: [
@@ -32,7 +31,6 @@ import { ApiKeyModule } from '../core/api-key/api-key.module';
   exports: [CollaborationGateway],
   imports: [
     TokenModule,
-    ApiKeyModule,
     WatcherModule,
     StorageModule.forRootAsync({
       imports: [EnvironmentModule],

apps/server/src/collaboration/extensions/authentication.extension.spec.ts

@@ -52,7 +52,6 @@ describe('AuthenticationExtension.onAuthenticate', () => {
   let pageRepo: { findById: jest.Mock };
   let spaceMemberRepo: { getUserSpaceRoles: jest.Mock };
   let pagePermissionRepo: { canUserEditPage: jest.Mock };
-  let apiKeyService: { validate: jest.Mock };
 
   // Build the hocuspocus onAuthenticate payload. connectionConfig.readOnly
   // starts false; the extension flips it to true on a read-only downgrade.
@@ -80,15 +79,12 @@ describe('AuthenticationExtension.onAuthenticate', () => {
       }),
     };
 
-    apiKeyService = { validate: jest.fn().mockResolvedValue({ user: {}, workspace: {} }) };
-
     ext = new AuthenticationExtension(
       tokenService as any,
       userRepo as any,
       pageRepo as any,
       spaceMemberRepo as any,
       pagePermissionRepo as any,
-      apiKeyService as any,
     );
     // Silence the extension's logger (it warns/debugs on denial branches).
     jest.spyOn(ext['logger'], 'warn').mockImplementation(() => undefined);
@@ -235,73 +231,4 @@ describe('AuthenticationExtension.onAuthenticate', () => {
     // No internal ai_chats row for an MCP/service-account collab edit → null.
     expect(ctx.aiChatId).toBeNull();
   });
-
-  // --- #501: api-key laundering guard (fail-closed discriminator) ----------
-  describe('api-key laundering guard', () => {
-    it('api_key principal → row-checks the key on connect (valid key proceeds)', async () => {
-      tokenService.verifyJwt.mockResolvedValue(
-        buildJwt({ principal: 'api_key', apiKeyId: 'key-1' }),
-      );
-      const data = buildData();
-      await ext.onAuthenticate(data as any);
-
-      expect(apiKeyService.validate).toHaveBeenCalledTimes(1);
-      expect(apiKeyService.validate).toHaveBeenCalledWith(
-        expect.objectContaining({ apiKeyId: 'key-1', type: JwtType.API_KEY }),
-      );
-    });
-
-    it('REVOKED api_key → Unauthorized on connect, BEFORE any page/user lookup', async () => {
-      tokenService.verifyJwt.mockResolvedValue(
-        buildJwt({ principal: 'api_key', apiKeyId: 'key-1' }),
-      );
-      // The shared validator denies a revoked key.
-      apiKeyService.validate.mockRejectedValue(new UnauthorizedException());
-
-      await expect(ext.onAuthenticate(buildData() as any)).rejects.toThrow(
-        UnauthorizedException,
-      );
-      // No new collab connection: the key check gates before page access.
-      expect(pageRepo.findById).not.toHaveBeenCalled();
-    });
-
-    it('api_key principal missing apiKeyId → Unauthorized (malformed)', async () => {
-      tokenService.verifyJwt.mockResolvedValue(buildJwt({ principal: 'api_key' }));
-      await expect(ext.onAuthenticate(buildData() as any)).rejects.toThrow(
-        UnauthorizedException,
-      );
-      expect(apiKeyService.validate).not.toHaveBeenCalled();
-    });
-
-    it('session principal → NO api-key check (session-backed, incl. internal agent)', async () => {
-      tokenService.verifyJwt.mockResolvedValue(buildJwt({ principal: 'session' }));
-      await ext.onAuthenticate(buildData() as any);
-      expect(apiKeyService.validate).not.toHaveBeenCalled();
-    });
-
-    it('claimless token WITHIN the grace window → trusted (legacy pre-rollout)', async () => {
-      // Default rolloutAt = now, so we are inside the grace window.
-      tokenService.verifyJwt.mockResolvedValue(buildJwt()); // no principal
-      await expect(ext.onAuthenticate(buildData() as any)).resolves.toBeDefined();
-      expect(apiKeyService.validate).not.toHaveBeenCalled();
-    });
-
-    it('claimless token AFTER the grace window → Unauthorized (fail-closed)', async () => {
-      // Move the rollout reference far into the past so the grace has elapsed.
-      (ext as any).rolloutAt = Date.now() - 25 * 60 * 60 * 1000;
-      tokenService.verifyJwt.mockResolvedValue(buildJwt()); // no principal
-      await expect(ext.onAuthenticate(buildData() as any)).rejects.toThrow(
-        UnauthorizedException,
-      );
-    });
-
-    it('infra error from the api-key row-check propagates (not masked)', async () => {
-      tokenService.verifyJwt.mockResolvedValue(
-        buildJwt({ principal: 'api_key', apiKeyId: 'key-1' }),
-      );
-      const boom = new Error('db down');
-      apiKeyService.validate.mockRejectedValue(boom);
-      await expect(ext.onAuthenticate(buildData() as any)).rejects.toBe(boom);
-    });
-  });
 });

apps/server/src/collaboration/extensions/authentication.extension.ts

@@ -14,37 +14,20 @@ import { findHighestUserSpaceRole } from '@docmost/db/repos/space/utils';
 import { SpaceRole } from '../../common/helpers/types/permission';
 import { isUserDisabled } from '../../common/helpers';
 import { getPageId } from '../collaboration.util';
-import {
-  JwtApiKeyPayload,
-  JwtCollabPayload,
-  JwtType,
-} from '../../core/auth/dto/jwt-payload';
+import { JwtCollabPayload, JwtType } from '../../core/auth/dto/jwt-payload';
 import { resolveProvenance } from '../../common/decorators/auth-provenance.decorator';
 import { observeCollabAuth } from '../../integrations/metrics/metrics.registry';
-import { ApiKeyService } from '../../core/api-key/api-key.service';
-
-// Max lifetime of a collab token (generateCollabToken uses expiresIn '24h'). Used
-// as the rollout grace window below: once this long has elapsed since this
-// process started serving the #501 code, every STILL-VALID collab token was
-// necessarily minted post-rollout and MUST carry the `principal` discriminator,
-// so a claimless one is a bug and is rejected (fail-closed) rather than trusted.
-const COLLAB_TOKEN_GRACE_MS = 24 * 60 * 60 * 1000;
 
 @Injectable()
 export class AuthenticationExtension implements Extension {
   private readonly logger = new Logger(AuthenticationExtension.name);
 
-  // Reference instant for the claimless-rejection grace window. Overridable so a
-  // unit test can drive the pre-/post-grace boundary without wall-clock waits.
-  protected rolloutAt = Date.now();
-
   constructor(
     private tokenService: TokenService,
     private userRepo: UserRepo,
     private pageRepo: PageRepo,
     private readonly spaceMemberRepo: SpaceMemberRepo,
     private readonly pagePermissionRepo: PagePermissionRepo,
-    private readonly apiKeyService: ApiKeyService,
   ) {}
 
   async onAuthenticate(data: onAuthenticatePayload) {
@@ -71,36 +54,6 @@ export class AuthenticationExtension implements Extension {
       throw new UnauthorizedException('Invalid collab token');
     }
 
-    // #501 — fail-closed api-key laundering guard. A collab token minted by an
-    // api-key principal carries principal='api_key' + apiKeyId; re-check the key
-    // on connect so a REVOKED key gets NO new collab connections (a collab token
-    // outlives its 24h, but a revoked key can no longer open fresh ones). An
-    // api-key token missing its apiKeyId is malformed → reject. A claimless token
-    // (no recognized principal) is trusted only DURING the rollout grace window
-    // (a legacy pre-rollout session token, which api keys could never mint);
-    // once the grace has elapsed every valid token must carry the discriminator,
-    // so a claimless one is a bug and is rejected (not silently trusted for 24h).
-    const principal = jwtPayload.principal;
-    if (principal === 'api_key') {
-      if (!jwtPayload.apiKeyId) {
-        throw new UnauthorizedException();
-      }
-      // Row-check via the SHARED validator: throws Unauthorized on a revoked/
-      // expired/disabled key; an infra error propagates (not masked). No new
-      // connection for a dead key.
-      await this.apiKeyService.validate({
-        sub: jwtPayload.sub,
-        workspaceId: jwtPayload.workspaceId,
-        apiKeyId: jwtPayload.apiKeyId,
-        type: JwtType.API_KEY,
-      } as JwtApiKeyPayload);
-    } else if (principal !== 'session') {
-      // Unrecognized/absent discriminator: reject once past the grace window.
-      if (Date.now() - this.rolloutAt >= COLLAB_TOKEN_GRACE_MS) {
-        throw new UnauthorizedException();
-      }
-    }
-
     const userId = jwtPayload.sub;
     const workspaceId = jwtPayload.workspaceId;
 

apps/server/src/core/ai-chat/ai-chat.service.ts

@@ -189,11 +189,10 @@ export function stepBudgetWarning(stepNumber: number): string {
 //
 // `system` is the in-scope system prompt; we CONCATENATE so the original
 // persona/context is preserved — a bare `system` override would REPLACE the
-// whole system prompt for the step. `activatedTools` is a closure Set grown by
-// loadTools and owned by the streaming loop; the caller seeds it from and
-// persists it to the chat's metadata across turns (#490), but this function only
-// READS the Set it is handed, so it stays a pure function of its arguments (not
-// module-global).
+// whole system prompt for the step. `activatedTools` is PER-TURN mutable state
+// owned by the streaming loop (a closure Set grown by loadTools); it is passed
+// in (not module-global, not persisted) so this stays a pure function of its
+// arguments.
 //
 // NOTE: at AI SDK v7 the per-step `system` field is renamed to `instructions`.
 // On v6 (`^6.0.134`) `system` is the correct field — adjust when bumping.
@@ -1411,11 +1410,10 @@ export class AiChatService implements OnModuleInit, OnModuleDestroy {
       const baseTools = { ...external.tools, ...docmostTools };
 
       // Deferred tool loading state (#332), scoped to THIS streaming loop:
-      //  - `activatedTools` is a fresh closure Set per streamText call (not
-      //    module-global), SEEDED from the chat's persisted metadata.activatedTools
-      //    (#490, just below) so activation carries across turns. loadTools.execute
-      //    adds to it; prepareAgentStep reads it to widen `activeTools` on the NEXT
-      //    step; turn end persists it back.
+      //  - `activatedTools` is per-TURN mutable state — a fresh closure Set created
+      //    per streamText call, NOT module-global and NOT persisted, so a new turn
+      //    starts cold. loadTools.execute adds to it; prepareAgentStep reads it to
+      //    widen `activeTools` on the NEXT step.
       //  - `validDeferredNames` = every tool that is NOT core (the in-app deferred
       //    tools + ALL external MCP tools), computed from the ACTUAL toolset so an
       //    external tool is loadable by its namespaced name. loadTools rejects any

apps/server/src/core/api-key/api-key.controller.spec.ts

@@ -1,193 +0,0 @@
-import { ForbiddenException, NotFoundException } from '@nestjs/common';
-import { ApiKeyController } from './api-key.controller';
-import {
-  WorkspaceCaslAction,
-  WorkspaceCaslSubject,
-} from '../casl/interfaces/workspace-ability.type';
-
-/**
- * Authorization contract for the /api-keys management surface.
- *
- *  - A token cannot manage tokens (an api_key PRINCIPAL is 403 on every method)
- *    — GitHub-PAT semantics closing post-revocation laundering.
- *  - admin (CASL Manage on API) sees/revokes all workspace keys; a member only
- *    their own.
- *  - kill-switch OFF -> the surface 404s (looks like the feature does not exist).
- */
-
-function makeController(over: any = {}) {
-  const apiKeyService = {
-    create: jest.fn().mockResolvedValue({
-      token: 'tok',
-      key: { id: 'k1', name: 'n', expiresAt: null, createdAt: new Date() },
-    }),
-    revoke: jest.fn().mockResolvedValue(undefined),
-    ...(over.apiKeyService ?? {}),
-  };
-  const apiKeyRepo = {
-    findAllInWorkspace: jest.fn().mockResolvedValue([]),
-    findByCreator: jest.fn().mockResolvedValue([]),
-    findById: jest.fn(),
-    ...(over.apiKeyRepo ?? {}),
-  };
-  const workspaceAbility = {
-    createForUser: jest.fn().mockReturnValue({
-      can: (_a: any, _s: any) => over.canManage ?? false,
-    }),
-    ...(over.workspaceAbility ?? {}),
-  };
-  const environmentService = {
-    isApiKeysEnabled: jest.fn().mockReturnValue(over.enabled ?? true),
-    ...(over.environmentService ?? {}),
-  };
-  const auditService = { log: jest.fn() };
-  const controller = new ApiKeyController(
-    apiKeyService as any,
-    apiKeyRepo as any,
-    workspaceAbility as any,
-    environmentService as any,
-    auditService as any,
-  );
-  return {
-    controller,
-    apiKeyService,
-    apiKeyRepo,
-    workspaceAbility,
-    environmentService,
-    auditService,
-  };
-}
-
-const user = { id: 'u-1', workspaceId: 'ws-1' } as any;
-const workspace = { id: 'ws-1' } as any;
-const reqAccess = () => ({ raw: {}, ip: '1.2.3.4', socket: {} }) as any;
-const reqApiKey = () =>
-  ({ raw: { authType: 'api_key', apiKeyId: 'k-self' }, ip: '1.2.3.4', socket: {} }) as any;
-
-describe('ApiKeyController — a token cannot manage tokens', () => {
-  it('403 on create for an api_key principal', async () => {
-    const { controller, apiKeyService } = makeController();
-    await expect(
-      controller.create({ name: 'x' } as any, user, reqApiKey()),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-    expect(apiKeyService.create).not.toHaveBeenCalled();
-  });
-
-  it('403 on list for an api_key principal', async () => {
-    const { controller } = makeController();
-    await expect(
-      controller.list(user, workspace, reqApiKey()),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-  });
-
-  it('403 on revoke for an api_key principal', async () => {
-    const { controller } = makeController();
-    await expect(
-      controller.revoke({ id: 'k1' } as any, user, workspace, reqApiKey()),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-  });
-});
-
-describe('ApiKeyController — kill-switch OFF → 404', () => {
-  it('create/list/revoke all 404 when disabled', async () => {
-    const { controller } = makeController({ enabled: false });
-    await expect(
-      controller.create({ name: 'x' } as any, user, reqAccess()),
-    ).rejects.toBeInstanceOf(NotFoundException);
-    await expect(
-      controller.list(user, workspace, reqAccess()),
-    ).rejects.toBeInstanceOf(NotFoundException);
-    await expect(
-      controller.revoke({ id: 'k1' } as any, user, workspace, reqAccess()),
-    ).rejects.toBeInstanceOf(NotFoundException);
-  });
-});
-
-describe('ApiKeyController — list scoping', () => {
-  it('admin (Manage on API) lists ALL workspace keys', async () => {
-    const { controller, apiKeyRepo } = makeController({ canManage: true });
-    await controller.list(user, workspace, reqAccess());
-    expect(apiKeyRepo.findAllInWorkspace).toHaveBeenCalledWith('ws-1');
-    expect(apiKeyRepo.findByCreator).not.toHaveBeenCalled();
-  });
-
-  it('member lists ONLY their own keys', async () => {
-    const { controller, apiKeyRepo } = makeController({ canManage: false });
-    await controller.list(user, workspace, reqAccess());
-    expect(apiKeyRepo.findByCreator).toHaveBeenCalledWith('u-1', 'ws-1');
-    expect(apiKeyRepo.findAllInWorkspace).not.toHaveBeenCalled();
-  });
-});
-
-describe('ApiKeyController — revoke scoping', () => {
-  it("member cannot revoke another user's key (403)", async () => {
-    const { controller, apiKeyRepo, apiKeyService } = makeController({
-      canManage: false,
-    });
-    apiKeyRepo.findById.mockResolvedValue({
-      id: 'k1',
-      creatorId: 'someone-else',
-      workspaceId: 'ws-1',
-    });
-    await expect(
-      controller.revoke({ id: 'k1' } as any, user, workspace, reqAccess()),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-    expect(apiKeyService.revoke).not.toHaveBeenCalled();
-  });
-
-  it('member CAN revoke their own key', async () => {
-    const { controller, apiKeyRepo, apiKeyService } = makeController({
-      canManage: false,
-    });
-    apiKeyRepo.findById.mockResolvedValue({
-      id: 'k1',
-      creatorId: 'u-1',
-      workspaceId: 'ws-1',
-    });
-    await controller.revoke({ id: 'k1' } as any, user, workspace, reqAccess());
-    expect(apiKeyService.revoke).toHaveBeenCalledWith('k1', 'ws-1');
-  });
-
-  it("admin CAN revoke another user's key", async () => {
-    const { controller, apiKeyRepo, apiKeyService } = makeController({
-      canManage: true,
-    });
-    apiKeyRepo.findById.mockResolvedValue({
-      id: 'k1',
-      creatorId: 'someone-else',
-      workspaceId: 'ws-1',
-    });
-    await controller.revoke({ id: 'k1' } as any, user, workspace, reqAccess());
-    expect(apiKeyService.revoke).toHaveBeenCalledWith('k1', 'ws-1');
-  });
-
-  it('404 when the key does not exist', async () => {
-    const { controller, apiKeyRepo } = makeController({ canManage: true });
-    apiKeyRepo.findById.mockResolvedValue(undefined);
-    await expect(
-      controller.revoke({ id: 'k1' } as any, user, workspace, reqAccess()),
-    ).rejects.toBeInstanceOf(NotFoundException);
-  });
-});
-
-describe('ApiKeyController — create emits audit + returns token once', () => {
-  it('logs API_KEY_CREATED and returns the token + computed expiry', async () => {
-    const { controller, auditService } = makeController();
-    const res = await controller.create(
-      { name: 'ci' } as any,
-      user,
-      reqAccess(),
-    );
-    expect(res.token).toBe('tok');
-    expect(res.apiKey).toMatchObject({ id: 'k1', name: 'n' });
-    expect(auditService.log).toHaveBeenCalledWith(
-      expect.objectContaining({ event: 'api_key.created' }),
-    );
-  });
-});
-
-// Sanity: the CASL subject used is the workspace API subject.
-it('uses WorkspaceCaslSubject.API with the Manage action', () => {
-  expect(WorkspaceCaslSubject.API).toBe('api_key');
-  expect(WorkspaceCaslAction.Manage).toBeDefined();
-});

apps/server/src/core/api-key/api-key.controller.ts

@@ -1,201 +0,0 @@
-import {
-  Body,
-  Controller,
-  ForbiddenException,
-  HttpCode,
-  HttpStatus,
-  Inject,
-  Logger,
-  NotFoundException,
-  Post,
-  Req,
-  UseGuards,
-} from '@nestjs/common';
-import { Throttle } from '@nestjs/throttler';
-import { FastifyRequest } from 'fastify';
-import { ApiKeyService } from './api-key.service';
-import { ApiKeyRepo } from '@docmost/db/repos/api-key/api-key.repo';
-import { CreateApiKeyDto } from './dto/create-api-key.dto';
-import { RevokeApiKeyDto } from './dto/revoke-api-key.dto';
-import { AuthUser } from '../../common/decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
-import { User, Workspace } from '@docmost/db/types/entity.types';
-import WorkspaceAbilityFactory from '../casl/abilities/workspace-ability.factory';
-import {
-  WorkspaceCaslAction,
-  WorkspaceCaslSubject,
-} from '../casl/interfaces/workspace-ability.type';
-import { AuditEvent, AuditResource } from '../../common/events/audit-events';
-import {
-  AUDIT_SERVICE,
-  IAuditService,
-} from '../../integrations/audit/audit.service';
-import { EnvironmentService } from '../../integrations/environment/environment.service';
-import { UserThrottlerGuard } from '../../integrations/throttle/user-throttler.guard';
-import { AUTH_THROTTLER } from '../../integrations/throttle/throttler-names';
-
-@UseGuards(JwtAuthGuard)
-@Controller('api-keys')
-export class ApiKeyController {
-  private readonly logger = new Logger(ApiKeyController.name);
-
-  constructor(
-    private readonly apiKeyService: ApiKeyService,
-    private readonly apiKeyRepo: ApiKeyRepo,
-    private readonly workspaceAbility: WorkspaceAbilityFactory,
-    private readonly environmentService: EnvironmentService,
-    @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
-  ) {}
-
-  // Kill-switch OFF: the issuance surface disappears entirely (404), not a 403 —
-  // it must look like the feature does not exist.
-  private assertEnabled(): void {
-    if (!this.environmentService.isApiKeysEnabled()) {
-      throw new NotFoundException();
-    }
-  }
-
-  // A token cannot manage tokens (GitHub-PAT semantics): an api-key principal is
-  // refused on the management surface, so a leaked key cannot mint a replacement
-  // or revoke the keys that would lock it out (closes post-revocation laundering).
-  private rejectApiKeyPrincipal(req: FastifyRequest): void {
-    if ((req.raw as { authType?: string }).authType === 'api_key') {
-      throw new ForbiddenException('API keys cannot manage API keys');
-    }
-  }
-
-  private clientIp(req: FastifyRequest): string {
-    return req.ip ?? req.socket?.remoteAddress ?? 'unknown';
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @UseGuards(JwtAuthGuard, UserThrottlerGuard)
-  @Throttle({ [AUTH_THROTTLER]: { limit: 10, ttl: 60_000 } })
-  @Post('create')
-  async create(
-    @Body() dto: CreateApiKeyDto,
-    @AuthUser() user: User,
-    @Req() req: FastifyRequest,
-  ) {
-    this.assertEnabled();
-    this.rejectApiKeyPrincipal(req);
-
-    // undefined -> service default (1 year); null -> unlimited; string -> Date.
-    const expiresAt =
-      dto.expiresAt === undefined
-        ? undefined
-        : dto.expiresAt === null
-          ? null
-          : new Date(dto.expiresAt);
-
-    const { token, key } = await this.apiKeyService.create(
-      user,
-      dto.name,
-      expiresAt,
-    );
-
-    this.auditService.log({
-      event: AuditEvent.API_KEY_CREATED,
-      resourceType: AuditResource.API_KEY,
-      resourceId: key.id,
-    });
-    // The durable trail lives in container logs (AUDIT_SERVICE is a Noop in this
-    // build). No token material — the JWT is only ever returned in the response.
-    this.logger.log(
-      `API key created: id=${key.id} name=${JSON.stringify(
-        key.name,
-      )} actor=${user.id} expiresAt=${
-        key.expiresAt ? new Date(key.expiresAt).toISOString() : 'never'
-      } ip=${this.clientIp(req)}`,
-    );
-
-    // Return the token ONCE (never retrievable again) and the computed expiry so
-    // the caller/UI can surface "expires <date>" (the year-default time-bomb
-    // early-warning).
-    return {
-      token,
-      apiKey: {
-        id: key.id,
-        name: key.name,
-        expiresAt: key.expiresAt,
-        createdAt: key.createdAt,
-      },
-    };
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('list')
-  async list(
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-    @Req() req: FastifyRequest,
-  ) {
-    this.assertEnabled();
-    this.rejectApiKeyPrincipal(req);
-
-    const ability = this.workspaceAbility.createForUser(user, workspace);
-    // Admin (CASL Manage on API): every key in the workspace, attributed to its
-    // creator (closes "a leaked key of a departed employee is invisible"). A
-    // member sees only their own.
-    const keys = ability.can(
-      WorkspaceCaslAction.Manage,
-      WorkspaceCaslSubject.API,
-    )
-      ? await this.apiKeyRepo.findAllInWorkspace(workspace.id)
-      : await this.apiKeyRepo.findByCreator(user.id, workspace.id);
-
-    return keys.map((k) => ({
-      id: k.id,
-      name: k.name,
-      expiresAt: k.expiresAt,
-      lastUsedAt: k.lastUsedAt,
-      createdAt: k.createdAt,
-      creator: k.creator,
-    }));
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('revoke')
-  async revoke(
-    @Body() dto: RevokeApiKeyDto,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-    @Req() req: FastifyRequest,
-  ) {
-    this.assertEnabled();
-    this.rejectApiKeyPrincipal(req);
-
-    const key = await this.apiKeyRepo.findById(dto.id, workspace.id);
-    // Uniform 404 for a missing/already-revoked key regardless of who asks — no
-    // existence oracle for keys the caller may not own.
-    if (!key) {
-      throw new NotFoundException();
-    }
-
-    const ability = this.workspaceAbility.createForUser(user, workspace);
-    const canManageAll = ability.can(
-      WorkspaceCaslAction.Manage,
-      WorkspaceCaslSubject.API,
-    );
-    // Admin may revoke any key in the workspace; a member only their own.
-    if (!canManageAll && key.creatorId !== user.id) {
-      throw new ForbiddenException();
-    }
-
-    await this.apiKeyService.revoke(key.id, workspace.id);
-
-    this.auditService.log({
-      event: AuditEvent.API_KEY_DELETED,
-      resourceType: AuditResource.API_KEY,
-      resourceId: key.id,
-    });
-    this.logger.log(
-      `API key revoked: id=${key.id} name=${JSON.stringify(
-        key.name,
-      )} actor=${user.id} ip=${this.clientIp(req)}`,
-    );
-
-    return { success: true };
-  }
-}

apps/server/src/core/api-key/api-key.module.ts

@@ -1,19 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ApiKeyService } from './api-key.service';
-import { ApiKeyController } from './api-key.controller';
-import { TokenModule } from '../auth/token.module';
-
-// Core (non-EE) API-key feature: issuance REST endpoints + the shared validator
-// consumed by jwt.strategy (REST) and McpService (the /mcp Bearer router).
-// DatabaseModule (global) provides ApiKeyRepo/UserRepo/WorkspaceRepo; CaslModule
-// (global) provides WorkspaceAbilityFactory; TokenModule provides TokenService
-// (the no-exp api-key signer). ApiKeyService is exported so AuthModule (for
-// jwt.strategy) and McpModule (for the /mcp router) can inject it directly,
-// replacing the absent EE `ee/api-key` dynamic require.
-@Module({
-  imports: [TokenModule],
-  controllers: [ApiKeyController],
-  providers: [ApiKeyService],
-  exports: [ApiKeyService],
-})
-export class ApiKeyModule {}

apps/server/src/core/api-key/api-key.service.spec.ts

@@ -1,299 +0,0 @@
-import { UnauthorizedException } from '@nestjs/common';
-import { ApiKeyService } from './api-key.service';
-import { JwtType } from '../auth/dto/jwt-payload';
-
-/**
- * Security contract for ApiKeyService.validate — the single validator shared by
- * jwt.strategy (REST) and the /mcp Bearer router.
- *
- * Invariants under test:
- *  - Anti-enumeration: every DEFINITE deny (missing/revoked/expired row, disabled
- *    user, workspace mismatch, kill-switch off) throws the SAME bare
- *    UnauthorizedException — an agent cannot distinguish expired from revoked.
- *  - deny-on-decision / 5xx-on-infra: an UNEXPECTED (infra) error PROPAGATES as
- *    itself (→ 5xx), never masked as a 401.
- *  - Expiry is read from the ROW, never a JWT exp claim.
- *  - No validate cache (each call re-reads the row → immediate revocation).
- */
-
-const APP_SECRET = 'secret';
-
-function makeDeps(over: Partial<Record<string, any>> = {}) {
-  const apiKeyRepo = {
-    findById: jest.fn(),
-    insert: jest.fn(),
-    softDelete: jest.fn(),
-    touchLastUsed: jest.fn().mockResolvedValue(undefined),
-    ...(over.apiKeyRepo ?? {}),
-  };
-  const userRepo = {
-    findById: jest.fn(),
-    ...(over.userRepo ?? {}),
-  };
-  const workspaceRepo = {
-    findById: jest.fn().mockResolvedValue({ id: 'ws-1' }),
-    ...(over.workspaceRepo ?? {}),
-  };
-  const tokenService = {
-    generateApiToken: jest.fn().mockResolvedValue('minted.jwt.token'),
-    ...(over.tokenService ?? {}),
-  };
-  const environmentService = {
-    isApiKeysEnabled: jest.fn().mockReturnValue(true),
-    getApiKeysEnabledRaw: jest.fn().mockReturnValue(undefined),
-    getAppSecret: jest.fn().mockReturnValue(APP_SECRET),
-    ...(over.environmentService ?? {}),
-  };
-  const service = new (ApiKeyService as unknown as new (...a: any[]) => ApiKeyService)(
-    apiKeyRepo,
-    userRepo,
-    workspaceRepo,
-    tokenService,
-    environmentService,
-  );
-  return { service, apiKeyRepo, userRepo, workspaceRepo, tokenService, environmentService };
-}
-
-const payload = (over: Record<string, any> = {}) => ({
-  sub: 'u-1',
-  workspaceId: 'ws-1',
-  apiKeyId: 'key-1',
-  type: JwtType.API_KEY,
-  ...over,
-});
-
-const activeRow = (over: Record<string, any> = {}) => ({
-  id: 'key-1',
-  name: 'k',
-  creatorId: 'u-1',
-  workspaceId: 'ws-1',
-  expiresAt: null,
-  lastUsedAt: null,
-  deletedAt: null,
-  ...over,
-});
-
-const activeUser = (over: Record<string, any> = {}) => ({
-  id: 'u-1',
-  workspaceId: 'ws-1',
-  deactivatedAt: null,
-  deletedAt: null,
-  isAgent: false,
-  ...over,
-});
-
-describe('ApiKeyService.validate', () => {
-  it('returns { user, workspace } for a valid active key', async () => {
-    const { service, apiKeyRepo, userRepo } = makeDeps();
-    apiKeyRepo.findById.mockResolvedValue(activeRow());
-    userRepo.findById.mockResolvedValue(activeUser());
-
-    const res = await service.validate(payload() as any);
-
-    expect(res.user).toMatchObject({ id: 'u-1' });
-    expect(res.workspace).toMatchObject({ id: 'ws-1' });
-    // Loads isAgent so downstream provenance does not silently degrade.
-    expect(userRepo.findById).toHaveBeenCalledWith('u-1', 'ws-1', {
-      includeIsAgent: true,
-    });
-  });
-
-  // --- Anti-enumeration: every deny is the SAME bare 401 -------------------
-  const denyCases: Array<[string, (d: ReturnType<typeof makeDeps>) => void]> = [
-    [
-      'missing/orphaned row',
-      (d) => d.apiKeyRepo.findById.mockResolvedValue(undefined),
-    ],
-    [
-      'revoked (soft-deleted → findById returns undefined)',
-      (d) => d.apiKeyRepo.findById.mockResolvedValue(undefined),
-    ],
-    [
-      'expired (expires_at in the past)',
-      (d) => {
-        d.apiKeyRepo.findById.mockResolvedValue(
-          activeRow({ expiresAt: new Date(Date.now() - 1000) }),
-        );
-        d.userRepo.findById.mockResolvedValue(activeUser());
-      },
-    ],
-    [
-      'disabled user',
-      (d) => {
-        d.apiKeyRepo.findById.mockResolvedValue(activeRow());
-        d.userRepo.findById.mockResolvedValue(
-          activeUser({ deactivatedAt: new Date() }),
-        );
-      },
-    ],
-    [
-      'user not found',
-      (d) => {
-        d.apiKeyRepo.findById.mockResolvedValue(activeRow());
-        d.userRepo.findById.mockResolvedValue(undefined);
-      },
-    ],
-    [
-      'creator/sub mismatch',
-      (d) => {
-        d.apiKeyRepo.findById.mockResolvedValue(activeRow({ creatorId: 'other' }));
-        d.userRepo.findById.mockResolvedValue(activeUser());
-      },
-    ],
-    [
-      'workspace row missing',
-      (d) => {
-        d.apiKeyRepo.findById.mockResolvedValue(activeRow());
-        d.userRepo.findById.mockResolvedValue(activeUser());
-        d.workspaceRepo.findById.mockResolvedValue(undefined);
-      },
-    ],
-    [
-      'kill-switch OFF',
-      (d) => d.environmentService.isApiKeysEnabled.mockReturnValue(false),
-    ],
-    [
-      'malformed payload (missing apiKeyId)',
-      () => undefined,
-    ],
-  ];
-
-  it.each(denyCases)(
-    'throws a bare UnauthorizedException with NO message for: %s',
-    async (label, arrange) => {
-      const deps = makeDeps();
-      arrange(deps);
-      const p =
-        label === 'malformed payload (missing apiKeyId)'
-          ? (payload({ apiKeyId: undefined }) as any)
-          : (payload() as any);
-
-      const err = await deps.service.validate(p).catch((e) => e);
-      expect(err).toBeInstanceOf(UnauthorizedException);
-      // Anti-enumeration: identical, class-less message for every failure mode.
-      expect(err.message).toBe('Unauthorized');
-    },
-  );
-
-  it('kill-switch OFF denies BEFORE any DB read', async () => {
-    const { service, apiKeyRepo, environmentService } = makeDeps();
-    environmentService.isApiKeysEnabled.mockReturnValue(false);
-
-    await expect(service.validate(payload() as any)).rejects.toBeInstanceOf(
-      UnauthorizedException,
-    );
-    expect(apiKeyRepo.findById).not.toHaveBeenCalled();
-  });
-
-  // --- Infra error propagates (5xx), NOT masked as 401 ---------------------
-  it('PROPAGATES an infra (DB) error instead of masking it as 401', async () => {
-    const { service, apiKeyRepo } = makeDeps();
-    const boom = new Error('connection terminated');
-    apiKeyRepo.findById.mockRejectedValue(boom);
-
-    await expect(service.validate(payload() as any)).rejects.toBe(boom);
-  });
-
-  // --- No cache: revocation is immediate on the next call ------------------
-  it('re-reads the row on every call (no validate cache → immediate revocation)', async () => {
-    const { service, apiKeyRepo, userRepo } = makeDeps();
-    apiKeyRepo.findById.mockResolvedValue(activeRow());
-    userRepo.findById.mockResolvedValue(activeUser());
-    await service.validate(payload() as any);
-
-    // Now the key is revoked (row invisible) — the very next call denies.
-    apiKeyRepo.findById.mockResolvedValue(undefined);
-    await expect(service.validate(payload() as any)).rejects.toBeInstanceOf(
-      UnauthorizedException,
-    );
-    expect(apiKeyRepo.findById).toHaveBeenCalledTimes(2);
-  });
-
-  // --- last_used_at is throttled + fire-and-forget -------------------------
-  it('touches last_used_at when stale and skips when fresh', async () => {
-    const { service, apiKeyRepo, userRepo } = makeDeps();
-    userRepo.findById.mockResolvedValue(activeUser());
-
-    // Stale (never used) -> touch.
-    apiKeyRepo.findById.mockResolvedValue(activeRow({ lastUsedAt: null }));
-    await service.validate(payload() as any);
-    expect(apiKeyRepo.touchLastUsed).toHaveBeenCalledTimes(1);
-
-    // Fresh (used 1 minute ago) -> skip.
-    apiKeyRepo.touchLastUsed.mockClear();
-    apiKeyRepo.findById.mockResolvedValue(
-      activeRow({ lastUsedAt: new Date(Date.now() - 60_000) }),
-    );
-    await service.validate(payload() as any);
-    expect(apiKeyRepo.touchLastUsed).not.toHaveBeenCalled();
-  });
-
-  it('a failing last_used_at touch never fails the request', async () => {
-    const { service, apiKeyRepo, userRepo } = makeDeps();
-    apiKeyRepo.findById.mockResolvedValue(activeRow({ lastUsedAt: null }));
-    userRepo.findById.mockResolvedValue(activeUser());
-    apiKeyRepo.touchLastUsed.mockRejectedValue(new Error('write failed'));
-
-    await expect(service.validate(payload() as any)).resolves.toMatchObject({
-      user: { id: 'u-1' },
-    });
-  });
-});
-
-describe('ApiKeyService.create (mint-then-insert, no exp)', () => {
-  it('mints the JWT BEFORE inserting the row and returns the token once', async () => {
-    const { service, apiKeyRepo, tokenService } = makeDeps();
-    const order: string[] = [];
-    tokenService.generateApiToken.mockImplementation(async () => {
-      order.push('mint');
-      return 'tok';
-    });
-    apiKeyRepo.insert.mockImplementation(async (row: any) => {
-      order.push('insert');
-      return { ...row, createdAt: new Date() };
-    });
-
-    const user = { id: 'u-1', workspaceId: 'ws-1' } as any;
-    const res = await service.create(user, 'my key');
-
-    expect(order).toEqual(['mint', 'insert']);
-    expect(res.token).toBe('tok');
-    // The id is generated before minting and reused for the row.
-    const mintArg = tokenService.generateApiToken.mock.calls[0][0];
-    const insertArg = apiKeyRepo.insert.mock.calls[0][0];
-    expect(mintArg.apiKeyId).toBe(insertArg.id);
-  });
-
-  it('applies the 1-year default when expiresAt is undefined', async () => {
-    const { service, apiKeyRepo } = makeDeps();
-    apiKeyRepo.insert.mockImplementation(async (row: any) => row);
-    const user = { id: 'u-1', workspaceId: 'ws-1' } as any;
-
-    await service.create(user, 'k');
-
-    const insertArg = apiKeyRepo.insert.mock.calls[0][0];
-    const days =
-      (insertArg.expiresAt.getTime() - Date.now()) / (24 * 60 * 60 * 1000);
-    expect(days).toBeGreaterThan(364);
-    expect(days).toBeLessThan(367);
-  });
-
-  it('honors an explicit null (unlimited)', async () => {
-    const { service, apiKeyRepo } = makeDeps();
-    apiKeyRepo.insert.mockImplementation(async (row: any) => row);
-    const user = { id: 'u-1', workspaceId: 'ws-1' } as any;
-
-    await service.create(user, 'k', null);
-
-    expect(apiKeyRepo.insert.mock.calls[0][0].expiresAt).toBeNull();
-  });
-
-  it('does NOT insert a row when minting fails (mint-then-insert → inert)', async () => {
-    const { service, apiKeyRepo, tokenService } = makeDeps();
-    tokenService.generateApiToken.mockRejectedValue(new Error('mint failed'));
-    const user = { id: 'u-1', workspaceId: 'ws-1' } as any;
-
-    await expect(service.create(user, 'k')).rejects.toThrow('mint failed');
-    expect(apiKeyRepo.insert).not.toHaveBeenCalled();
-  });
-});

apps/server/src/core/api-key/api-key.service.ts

@@ -1,191 +0,0 @@
-import {
-  Injectable,
-  Logger,
-  OnModuleInit,
-  UnauthorizedException,
-} from '@nestjs/common';
-import { v7 as uuid7 } from 'uuid';
-import { ApiKeyRepo } from '@docmost/db/repos/api-key/api-key.repo';
-import { UserRepo } from '@docmost/db/repos/user/user.repo';
-import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
-import { TokenService } from '../auth/services/token.service';
-import { EnvironmentService } from '../../integrations/environment/environment.service';
-import { JwtApiKeyPayload } from '../auth/dto/jwt-payload';
-import { ApiKey, User, Workspace } from '@docmost/db/types/entity.types';
-import { isUserDisabled } from '../../common/helpers';
-
-// Default lifetime for a new key when the caller does not specify one: 1 year.
-// The owner runs a homelab where agents live for years; forcing rotation is
-// operational pain, so an explicit `null` (unlimited) is also allowed.
-const DEFAULT_LIFETIME_MS = 365 * 24 * 60 * 60 * 1000;
-
-// last_used_at is a best-effort forensics stamp, not an access record; we only
-// refresh it when it is older than this to avoid a write on every request. The
-// 1h resolution is a deliberate constant (forensics granularity, not accounting).
-const LAST_USED_THROTTLE_MS = 60 * 60 * 1000;
-
-/**
- * Core API-key lifecycle service. Owns minting (create), the single validator
- * shared by BOTH the REST jwt.strategy path and the /mcp Bearer path (validate),
- * and revocation (revoke). The `api_keys` ROW is the sole source of truth for a
- * key's lifetime and revocation — never the JWT, which carries no `exp` claim.
- */
-@Injectable()
-export class ApiKeyService implements OnModuleInit {
-  private readonly logger = new Logger(ApiKeyService.name);
-
-  constructor(
-    private readonly apiKeyRepo: ApiKeyRepo,
-    private readonly userRepo: UserRepo,
-    private readonly workspaceRepo: WorkspaceRepo,
-    private readonly tokenService: TokenService,
-    private readonly environmentService: EnvironmentService,
-  ) {}
-
-  onModuleInit() {
-    // Boot log so the kill-switch state after each deploy is verifiable in logs.
-    const enabled = this.environmentService.isApiKeysEnabled();
-    const raw = this.environmentService.getApiKeysEnabledRaw();
-    this.logger.log(
-      `API keys: ${enabled ? 'ENABLED' : 'DISABLED'} (API_KEYS_ENABLED=${
-        raw ?? 'unset'
-      })`,
-    );
-  }
-
-  /**
-   * Mint a new key for `user`. mint-then-insert ordering (R1):
-   *   1. generate the id first — it must be in the JWT payload before the row.
-   *   2. mint the JWT (no `exp` claim). A mint failure aborts before any row is
-   *      written (inert), so a half-created key cannot exist.
-   *   3. insert the row last. A lost response leaves an orphaned row that is
-   *      visible in `list` and self-heals (the user revokes it).
-   * The token is returned ONCE and never stored — the JWT is self-contained, so
-   * no token material lives in the table.
-   *
-   * `expiresAt`: `undefined` -> default 1 year; `null` -> unlimited (explicit);
-   * a Date -> that instant (a past date is rejected at the DTO layer).
-   */
-  async create(
-    user: User,
-    name: string,
-    expiresAt?: Date | null,
-  ): Promise<{ token: string; key: ApiKey }> {
-    const resolvedExpiresAt =
-      expiresAt === undefined
-        ? new Date(Date.now() + DEFAULT_LIFETIME_MS)
-        : expiresAt;
-
-    const apiKeyId = uuid7();
-
-    const token = await this.tokenService.generateApiToken({
-      apiKeyId,
-      user,
-      workspaceId: user.workspaceId,
-    });
-
-    const key = await this.apiKeyRepo.insert({
-      id: apiKeyId,
-      name,
-      creatorId: user.id,
-      workspaceId: user.workspaceId,
-      expiresAt: resolvedExpiresAt,
-    });
-
-    return { token, key };
-  }
-
-  /**
-   * The single validator for an api-key principal, shared by jwt.strategy and the
-   * /mcp Bearer router. Returns `{ user, workspace }` (the same shape the access
-   * path returns) so the AuthUser/AuthWorkspace decorators and MCP identity work
-   * unchanged.
-   *
-   * Failure semantics (R4, anti-enumeration): a DEFINITE negative fact — feature
-   * disabled, missing/revoked/expired row, workspace mismatch, disabled user —
-   * throws a bare `UnauthorizedException` (a single generic 401 for every case;
-   * an agent cannot distinguish expired from revoked, and its reaction is
-   * identical). An UNEXPECTED (infra) error is NOT caught here: it propagates so
-   * the surface returns 5xx, never a masked 401 (deny-on-decision / 5xx-on-infra).
-   * There is NO validate cache: it is 2–3 PK lookups (~1ms), two orders of
-   * magnitude cheaper than the bcrypt it replaces; a cache would only add a
-   * Date-serialization trap and a revocation lag. Revocation is immediate.
-   */
-  async validate(
-    payload: JwtApiKeyPayload,
-  ): Promise<{ user: User; workspace: Workspace }> {
-    // Kill-switch OFF: deny unconditionally (same generic 401). Note the
-    // endpoints additionally 404 at the controller; here we deny the token.
-    if (!this.environmentService.isApiKeysEnabled()) {
-      throw new UnauthorizedException();
-    }
-
-    if (!payload?.apiKeyId || !payload?.sub || !payload?.workspaceId) {
-      throw new UnauthorizedException();
-    }
-
-    const row = await this.apiKeyRepo.findById(
-      payload.apiKeyId,
-      payload.workspaceId,
-    );
-    // Absent row = revoked (soft-deleted, invisible to findById), orphaned
-    // (creator/workspace cascade-deleted), or never existed. All terminal deny.
-    if (!row) {
-      throw new UnauthorizedException();
-    }
-
-    // Expiry is read from the ROW, never an `exp` JWT claim.
-    if (row.expiresAt && row.expiresAt.getTime() <= Date.now()) {
-      throw new UnauthorizedException();
-    }
-
-    const user = await this.userRepo.findById(
-      payload.sub,
-      payload.workspaceId,
-      { includeIsAgent: true },
-    );
-    if (!user || isUserDisabled(user)) {
-      throw new UnauthorizedException();
-    }
-
-    // The key acts only as its creator (defence in depth against a token whose
-    // signed `sub` ever drifted from the row's owner).
-    if (row.creatorId !== user.id) {
-      throw new UnauthorizedException();
-    }
-
-    const workspace = await this.workspaceRepo.findById(payload.workspaceId);
-    if (!workspace) {
-      throw new UnauthorizedException();
-    }
-
-    // Best-effort, throttled, fire-and-forget forensics stamp AFTER all checks.
-    this.touchLastUsed(row);
-
-    return { user, workspace };
-  }
-
-  /**
-   * Revoke (soft-delete) a key. Authorization/ownership is decided by the caller
-   * (the controller, via CASL); this only performs the terminal write. Idempotent:
-   * a second revoke is a no-op (the row is already invisible).
-   */
-  async revoke(id: string, workspaceId: string): Promise<void> {
-    await this.apiKeyRepo.softDelete(id, workspaceId);
-  }
-
-  // Throttled best-effort last_used_at bump: skip if it was touched within the
-  // window; otherwise fire-and-forget so a stamp write never fails or slows the
-  // request (mirrors SessionActivityService.trackActivity).
-  private touchLastUsed(row: ApiKey): void {
-    const last = row.lastUsedAt ? new Date(row.lastUsedAt).getTime() : 0;
-    if (Date.now() - last < LAST_USED_THROTTLE_MS) return;
-    void this.apiKeyRepo.touchLastUsed(row.id).catch((err) => {
-      this.logger.warn(
-        `Failed to update api_key last_used_at for ${row.id}: ${
-          (err as Error)?.message ?? err
-        }`,
-      );
-    });
-  }
-}

apps/server/src/core/api-key/dto/create-api-key.dto.ts

@@ -1,51 +0,0 @@
-import {
-  IsDateString,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  MaxLength,
-  registerDecorator,
-  ValidationOptions,
-} from 'class-validator';
-
-/**
- * `expiresAt` must be strictly in the future. Skips validation for `null`
- * (explicit "unlimited") and `undefined` (server applies the 1-year default),
- * so only an actually-supplied date is range-checked. Rejecting a PAST date at
- * the DTO layer means a caller cannot mint an already-dead key.
- */
-function IsFutureDateString(options?: ValidationOptions) {
-  return function (object: object, propertyName: string) {
-    registerDecorator({
-      name: 'isFutureDateString',
-      target: object.constructor,
-      propertyName,
-      options: {
-        message: 'expiresAt must be a date in the future',
-        ...options,
-      },
-      validator: {
-        validate(value: unknown) {
-          if (value === null || value === undefined) return true;
-          if (typeof value !== 'string') return false;
-          const t = Date.parse(value);
-          return !Number.isNaN(t) && t > Date.now();
-        },
-      },
-    });
-  };
-}
-
-export class CreateApiKeyDto {
-  @IsString()
-  @IsNotEmpty()
-  @MaxLength(255)
-  name: string;
-
-  // undefined -> default 1 year (applied server-side); null -> unlimited
-  // (explicit); an ISO date string -> that instant, which must be in the future.
-  @IsOptional()
-  @IsDateString()
-  @IsFutureDateString()
-  expiresAt?: string | null;
-}

apps/server/src/core/api-key/dto/revoke-api-key.dto.ts

@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator';
-
-export class RevokeApiKeyDto {
-  @IsUUID()
-  id: string;
-}

apps/server/src/core/auth/auth.controller.spec.ts

@@ -20,71 +20,3 @@ describe('AuthController', () => {
     expect(controller).toBeDefined();
   });
 });
-
-// The collab-token handler is the ARM-SEAM of the #501 anti-laundering defense:
-// it derives the api-key origin args ({ apiKeyId }) from the SIGNED-derived
-// `req.raw` fields (stamped by jwt.strategy) and threads them into the collab
-// token mint, forcing principal='api_key' so a later key revoke rejects NEW
-// collab connections. A regression here (reading `body`, dropping `apiKeyId`,
-// or inverting the ternary) would silently mint api-key requests as
-// principal='session' and reopen the laundering hole with a green suite. These
-// tests pin the EXACT args the controller passes to authService.getCollabToken.
-describe('AuthController.collabToken arms the api-key origin (#501)', () => {
-  let controller: AuthController;
-  let getCollabToken: jest.Mock;
-
-  const user = { id: 'u-1', workspaceId: 'ws-1' } as any;
-  const workspace = { id: 'ws-1' } as any;
-
-  beforeEach(() => {
-    getCollabToken = jest.fn().mockResolvedValue({ token: 'ct' });
-    controller = new AuthController(
-      { getCollabToken } as any, // authService
-      {} as any, // sessionService
-      {} as any, // environmentService
-      {} as any, // moduleRef
-      {} as any, // auditService
-    );
-  });
-
-  it('threads { apiKeyId } when req.raw marks an api_key principal (ARMED)', async () => {
-    const req = { raw: { authType: 'api_key', apiKeyId: 'k-1' } } as any;
-
-    await controller.collabToken(user, workspace, req);
-
-    expect(getCollabToken).toHaveBeenCalledTimes(1);
-    expect(getCollabToken).toHaveBeenCalledWith(user, 'ws-1', {
-      apiKeyId: 'k-1',
-    });
-  });
-
-  it('passes undefined for a normal session request (NOT armed)', async () => {
-    const req = { raw: {} } as any;
-
-    await controller.collabToken(user, workspace, req);
-
-    expect(getCollabToken).toHaveBeenCalledTimes(1);
-    expect(getCollabToken).toHaveBeenCalledWith(user, 'ws-1', undefined);
-  });
-
-  it('does NOT arm when api_key authType lacks an apiKeyId', async () => {
-    const req = { raw: { authType: 'api_key' } } as any;
-
-    await controller.collabToken(user, workspace, req);
-
-    expect(getCollabToken).toHaveBeenCalledWith(user, 'ws-1', undefined);
-  });
-
-  it('reads the SIGNED req.raw, never a spoofable client body', async () => {
-    // A client-supplied body claiming api_key must be ignored: only the
-    // jwt.strategy-stamped req.raw can arm the api-key origin.
-    const req = {
-      raw: {},
-      body: { authType: 'api_key', apiKeyId: 'attacker' },
-    } as any;
-
-    await controller.collabToken(user, workspace, req);
-
-    expect(getCollabToken).toHaveBeenCalledWith(user, 'ws-1', undefined);
-  });
-});

apps/server/src/core/auth/auth.controller.ts

@@ -207,20 +207,8 @@ export class AuthController {
   async collabToken(
     @AuthUser() user: User,
     @AuthWorkspace() workspace: Workspace,
-    @Req() req: FastifyRequest,
   ) {
-    // Thread the api-key origin (#501): when the requester authenticated with an
-    // api key (jwt.strategy stamped req.raw.authType/apiKeyId), the minted collab
-    // token carries principal='api_key' + apiKeyId so a later revoke of the key
-    // rejects NEW collab connections. A normal session request mints a
-    // principal='session' token. Reading the SIGNED-derived req.raw fields (never
-    // a client body) keeps it unspoofable.
-    const raw = req.raw as { authType?: string; apiKeyId?: string };
-    const apiKey =
-      raw.authType === 'api_key' && raw.apiKeyId
-        ? { apiKeyId: raw.apiKeyId }
-        : undefined;
-    return this.authService.getCollabToken(user, workspace.id, apiKey);
+    return this.authService.getCollabToken(user, workspace.id);
   }
 
   @SkipThrottle({ [AUTH_THROTTLER]: true })

apps/server/src/core/auth/auth.module.ts

@@ -5,13 +5,9 @@ import { JwtStrategy } from './strategies/jwt.strategy';
 import { WorkspaceModule } from '../workspace/workspace.module';
 import { SignupService } from './services/signup.service';
 import { TokenModule } from './token.module';
-import { ApiKeyModule } from '../api-key/api-key.module';
 
 @Module({
-  // ApiKeyModule supplies ApiKeyService, injected into JwtStrategy so an
-  // api_key Bearer/cookie token is validated directly (replacing the absent EE
-  // `ee/api-key` dynamic require).
-  imports: [TokenModule, WorkspaceModule, ApiKeyModule],
+  imports: [TokenModule, WorkspaceModule],
   controllers: [AuthController],
   providers: [AuthService, SignupService, JwtStrategy],
   exports: [SignupService, AuthService],

apps/server/src/core/auth/dto/jwt-payload.ts

@@ -33,17 +33,6 @@ export type JwtPayload = {
   aiChatId?: string | null;
 };
 
-// The AUTH-PRINCIPAL kind behind a collab token — distinct from `actor`
-// (provenance). Stamped into EVERY newly-minted collab token (#501): 'session'
-// for a normal user/session (incl. the internal AI agent, which is session-
-// backed), 'api_key' when the token was minted by an api-key principal (an
-// external MCP agent). The discriminator keys on the token's ORIGIN, so the
-// collab seam can re-check a revoked api key on connect and reject a claimless
-// token after the rollout grace window. NOT keyed on `actor:'agent'` — the
-// internal agent is 'agent' but session-backed, so it must stay on the no-check
-// path.
-export type CollabPrincipal = 'session' | 'api_key';
-
 export type JwtCollabPayload = {
   sub: string;
   workspaceId: string;
@@ -55,13 +44,6 @@ export type JwtCollabPayload = {
   // Nullable: an external MCP agent has no internal ai_chats row, so it carries
   // an 'agent' actor with a null aiChatId.
   aiChatId?: string | null;
-  // Auth-principal discriminator (#501). Present on every post-rollout token;
-  // its absence on a still-valid token past the grace window is treated as an
-  // error, not trust (fail-closed).
-  principal?: CollabPrincipal;
-  // Only when principal === 'api_key': the minting key's id, so the collab seam
-  // can row-check (and reject) a revoked key on connect.
-  apiKeyId?: string;
 };
 
 export type JwtExchangePayload = {

apps/server/src/core/auth/services/auth.service.ts

@@ -375,20 +375,10 @@ export class AuthService {
     }
   }
 
-  async getCollabToken(
-    user: User,
-    workspaceId: string,
-    // Origin of the request minting this collab token (#501). When the caller is
-    // an api-key principal, its apiKeyId is threaded into the token so the collab
-    // seam can re-check the key on connect (closing api-key -> long-lived-collab
-    // laundering). Absent for a normal session/human request.
-    apiKey?: { apiKeyId: string },
-  ) {
+  async getCollabToken(user: User, workspaceId: string) {
     const token = await this.tokenService.generateCollabToken(
       user,
       workspaceId,
-      undefined,
-      apiKey,
     );
     return { token };
   }

apps/server/src/core/auth/services/token.service.behavior.spec.ts

@@ -1,5 +1,4 @@
 import { ForbiddenException, UnauthorizedException } from '@nestjs/common';
-import * as jwt from 'jsonwebtoken';
 import { TokenService } from './token.service';
 import { JwtType } from '../dto/jwt-payload';
 
@@ -214,175 +213,4 @@ describe('TokenService.generateCollabToken', () => {
       aiChatId: 'chat-456',
     });
   });
-
-  // #501 fail-closed discriminator: EVERY collab token carries a principal.
-  it("defaults principal to 'session' with NO apiKeyId (normal/internal-agent path)", async () => {
-    const { service, jwtService } = makeTokenService();
-    await service.generateCollabToken(makeUser() as never, 'ws-1');
-    const [payload] = jwtService.sign.mock.calls[0];
-    expect(payload.principal).toBe('session');
-    expect(payload).not.toHaveProperty('apiKeyId');
-  });
-
-  it("the internal agent (provenance, NO apiKey) still gets principal='session'", async () => {
-    const { service, jwtService } = makeTokenService();
-    await service.generateCollabToken(
-      makeUser() as never,
-      'ws-1',
-      { actor: 'agent', aiChatId: 'chat-1' },
-    );
-    const [payload] = jwtService.sign.mock.calls[0];
-    // Keyed on api-key ORIGIN, not actor: an is_agent session token is 'session'.
-    expect(payload.principal).toBe('session');
-    expect(payload).not.toHaveProperty('apiKeyId');
-  });
-
-  it("stamps principal='api_key' + apiKeyId when minted by an api-key principal", async () => {
-    const { service, jwtService } = makeTokenService();
-    await service.generateCollabToken(
-      makeUser() as never,
-      'ws-1',
-      undefined,
-      { apiKeyId: 'key-9' },
-    );
-    const [payload] = jwtService.sign.mock.calls[0];
-    expect(payload.principal).toBe('api_key');
-    expect(payload.apiKeyId).toBe('key-9');
-  });
 });
-
-/**
- * API-key token minting MUST carry NO `exp` claim — the ONLY source of truth for
- * a key's lifetime/revocation is its `api_keys` row, checked on every request.
- *
- * This is a LIVE-bug regression: the shared JwtService is registered with a
- * global `signOptions.expiresIn` (default '90d') that merges into every sign(),
- * so an api-key minted through it silently gets exp=now+90d and an "unlimited"
- * key dies in 90 days. TokenService.generateApiToken mints through a dedicated
- * no-expiry signer instead. These tests construct the REAL signer (a real secret
- * via the stubbed EnvironmentService) and decode the produced JWT to assert the
- * observable property: no `exp`.
- */
-describe('TokenService.generateApiToken (no exp claim ever)', () => {
-  const APP_SECRET_LOCAL = 'apikey-secret';
-
-  function makeRealSignerService() {
-    // Give the SHARED jwtService a global expiresIn so a regression (minting
-    // through it) would show up as an exp claim — the exact live bug.
-    const { JwtService } = require('@nestjs/jwt');
-    const sharedJwt = new JwtService({
-      secret: APP_SECRET_LOCAL,
-      signOptions: { expiresIn: '90d', issuer: 'Docmost' },
-    });
-    const environmentService = {
-      getAppSecret: () => APP_SECRET_LOCAL,
-    };
-    const service = new (TokenService as unknown as new (
-      ...args: unknown[]
-    ) => TokenService)(sharedJwt, environmentService);
-    return { service };
-  }
-
-  const user = makeUser({ id: 'svc-1', workspaceId: 'ws-1' });
-
-  it('mints an api-key JWT with NO exp claim and issuer Docmost', async () => {
-    const { service } = makeRealSignerService();
-
-    const token = await service.generateApiToken({
-      apiKeyId: 'key-1',
-      user: user as never,
-      workspaceId: 'ws-1',
-    });
-
-    const decoded = jwt.decode(token) as Record<string, unknown>;
-    // The observable security property: no expiry lives in the JWT.
-    expect(decoded.exp).toBeUndefined();
-    expect(decoded).toMatchObject({
-      sub: 'svc-1',
-      apiKeyId: 'key-1',
-      workspaceId: 'ws-1',
-      type: JwtType.API_KEY,
-      iss: 'Docmost',
-    });
-  });
-
-  it('demonstrates the live bug it guards: the SHARED signer WOULD add exp', () => {
-    const { JwtService } = require('@nestjs/jwt');
-    const sharedJwt = new JwtService({
-      secret: APP_SECRET_LOCAL,
-      signOptions: { expiresIn: '90d', issuer: 'Docmost' },
-    });
-    // Even with empty per-call options the global expiresIn merges in.
-    const leaky = sharedJwt.sign({ sub: 'x', type: JwtType.API_KEY }, {});
-    expect((jwt.decode(leaky) as Record<string, unknown>).exp).toBeDefined();
-  });
-
-  it('refuses to mint for a disabled user', async () => {
-    const { service } = makeRealSignerService();
-    await expect(
-      service.generateApiToken({
-        apiKeyId: 'key-1',
-        user: makeUser({ deactivatedAt: new Date() }) as never,
-        workspaceId: 'ws-1',
-      }),
-    ).rejects.toBeInstanceOf(ForbiddenException);
-  });
-});
-
-/**
- * verifyJwtOneOf is the type-routing primitive: verify the signature once and
- * assert the token type is on an explicit allowlist. It must NOT degrade into a
- * "return whatever type" helper — a token whose type is off the allowlist is
- * rejected with the same generic error as a single-type mismatch.
- */
-describe('TokenService.verifyJwtOneOf (allowlist type-routing)', () => {
-  it('returns the payload when the type is on the allowlist', async () => {
-    const verifyAsync = jest
-      .fn()
-      .mockResolvedValue({ type: JwtType.API_KEY, sub: 'u-1' });
-    const { service } = makeTokenService({ verifyAsync });
-
-    const payload = await service.verifyJwtOneOf(token123(), [
-      JwtType.ACCESS,
-      JwtType.API_KEY,
-    ]);
-
-    expect(payload).toMatchObject({ type: JwtType.API_KEY, sub: 'u-1' });
-    expect(verifyAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('accepts the OTHER allowed type too', async () => {
-    const verifyAsync = jest
-      .fn()
-      .mockResolvedValue({ type: JwtType.ACCESS, sub: 'u-1' });
-    const { service } = makeTokenService({ verifyAsync });
-
-    await expect(
-      service.verifyJwtOneOf(token123(), [JwtType.ACCESS, JwtType.API_KEY]),
-    ).resolves.toMatchObject({ type: JwtType.ACCESS });
-  });
-
-  it('rejects a token whose type is OFF the allowlist (confused-deputy guard)', async () => {
-    const verifyAsync = jest
-      .fn()
-      .mockResolvedValue({ type: JwtType.COLLAB, sub: 'u-1' });
-    const { service } = makeTokenService({ verifyAsync });
-
-    await expect(
-      service.verifyJwtOneOf(token123(), [JwtType.ACCESS, JwtType.API_KEY]),
-    ).rejects.toBeInstanceOf(UnauthorizedException);
-  });
-
-  it('verifies the signature exactly ONCE', async () => {
-    const verifyAsync = jest
-      .fn()
-      .mockResolvedValue({ type: JwtType.ACCESS });
-    const { service } = makeTokenService({ verifyAsync });
-    await service.verifyJwtOneOf(token123(), [JwtType.ACCESS]);
-    expect(verifyAsync).toHaveBeenCalledTimes(1);
-  });
-});
-
-function token123(): string {
-  return 'a.b.c';
-}

apps/server/src/core/auth/services/token.service.ts

@@ -4,6 +4,7 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
+import type { StringValue } from 'ms';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
 import {
   JwtApiKeyPayload,
@@ -61,12 +62,6 @@ export class TokenService {
     // token carries no actor/aiChatId and is treated as 'user' downstream.
     // aiChatId is nullable for an external agent with no internal ai_chats row.
     provenance?: { actor: 'agent'; aiChatId: string | null },
-    // Optional api-key origin (#501). When the collab token is minted by an
-    // api-key principal (an external MCP agent), the caller passes the key id so
-    // the token carries principal='api_key' + apiKeyId and the collab seam can
-    // re-check the key on connect. Absent -> principal='session' (a normal
-    // user/session, including the internal session-backed AI agent).
-    apiKey?: { apiKeyId: string },
   ): Promise<string> {
     if (isUserDisabled(user)) {
       throw new ForbiddenException();
@@ -76,10 +71,6 @@ export class TokenService {
       sub: user.id,
       workspaceId,
       type: JwtType.COLLAB,
-      // Fail-closed discriminator on EVERY minted token: 'api_key' when minted by
-      // an api-key principal, else 'session'.
-      principal: apiKey ? 'api_key' : 'session',
-      ...(apiKey ? { apiKeyId: apiKey.apiKeyId } : {}),
       ...(provenance
         ? { actor: provenance.actor, aiChatId: provenance.aiChatId }
         : {}),
@@ -132,8 +123,9 @@ export class TokenService {
     apiKeyId: string;
     user: User;
     workspaceId: string;
+    expiresIn?: StringValue | number;
   }): Promise<string> {
-    const { apiKeyId, user, workspaceId } = opts;
+    const { apiKeyId, user, workspaceId, expiresIn } = opts;
     if (isUserDisabled(user)) {
       throw new ForbiddenException();
     }
@@ -145,32 +137,7 @@ export class TokenService {
       type: JwtType.API_KEY,
     };
 
-    // API-key tokens carry NO `exp` claim EVER — the ONLY source of truth for a
-    // key's lifetime and revocation is its `api_keys` row (checked on every
-    // request), not the JWT. This CANNOT use `this.jwtService`: TokenModule
-    // registers it with a global `signOptions.expiresIn` (JWT_TOKEN_EXPIRES_IN,
-    // default '90d'), which merges into EVERY sign() call — even `sign(payload,
-    // {})` — and `{ expiresIn: undefined }` THROWS rather than stripping it
-    // (verified empirically). So an "unlimited" key minted through the shared
-    // signer would silently get exp=now+90d and die in 90 days regardless of its
-    // row. We mint through a dedicated no-expiry signer, re-stamping only
-    // `issuer: 'Docmost'` for claim parity with the shared signer.
-    return this.apiKeyJwtService().sign(payload);
-  }
-
-  // Lazily-built JWT signer for API-key tokens: same APP_SECRET, same 'Docmost'
-  // issuer, but WITHOUT the global `expiresIn` — so minted API-key tokens have no
-  // `exp` claim. Built once and cached. Verification still goes through the
-  // shared verifier (same secret); `verifyAsync` does not require an `exp`.
-  private _apiKeyJwtService?: JwtService;
-  private apiKeyJwtService(): JwtService {
-    if (!this._apiKeyJwtService) {
-      this._apiKeyJwtService = new JwtService({
-        secret: this.environmentService.getAppSecret(),
-        signOptions: { issuer: 'Docmost' },
-      });
-    }
-    return this._apiKeyJwtService;
+    return this.jwtService.sign(payload, expiresIn ? { expiresIn } : {});
   }
 
   async generatePdfRenderToken(
@@ -210,31 +177,4 @@ export class TokenService {
 
     return payload;
   }
-
-  /**
-   * Verify a token's signature ONCE and assert its `type` is one of `allowed`.
-   *
-   * This is the type-routing primitive for surfaces that legitimately accept
-   * more than one token type on the same Bearer slot (the /mcp Bearer path
-   * accepts both an ACCESS and an API_KEY token). It is deliberately NOT a
-   * "verify-and-return-whatever-type" helper — that would be a reusable
-   * confused-deputy footgun (any caller could then feed an attachment/collab
-   * token where an access token is expected). An explicit allowlist preserves
-   * the type-pinning property of `verifyJwt`: a token whose `type` is not in the
-   * allowlist is rejected with the SAME generic error as a type mismatch, and
-   * the signature is verified exactly once (no double-verify).
-   */
-  async verifyJwtOneOf(token: string, allowed: JwtType[]) {
-    const payload = await this.jwtService.verifyAsync(token, {
-      secret: this.environmentService.getAppSecret(),
-    });
-
-    if (!allowed.includes(payload.type)) {
-      throw new UnauthorizedException(
-        'Invalid JWT token. Token type does not match.',
-      );
-    }
-
-    return payload;
-  }
 }

apps/server/src/core/auth/strategies/jwt.strategy.spec.ts

@@ -22,8 +22,7 @@ describe('JwtStrategy — provenance derivation', () => {
     const userSessionRepo: any = { findActiveById: jest.fn() };
     const sessionActivityService: any = { trackActivity: jest.fn() };
     const environmentService: any = { getAppSecret: () => 'test-secret' };
-    // ACCESS-path tests never touch the api-key seam; a bare stub suffices.
-    const apiKeyService: any = { validate: jest.fn() };
+    const moduleRef: any = {};
 
     const strategy = new JwtStrategy(
       userRepo,
@@ -31,7 +30,7 @@ describe('JwtStrategy — provenance derivation', () => {
       userSessionRepo,
       sessionActivityService,
       environmentService,
-      apiKeyService,
+      moduleRef,
     );
     return { strategy, userRepo };
   }
@@ -123,29 +122,25 @@ describe('JwtStrategy — provenance derivation', () => {
 });
 
 /**
- * Provenance derivation on the API-KEY path (jwt.strategy.validateApiKey, #486
- * + #501).
+ * Provenance derivation on the API-KEY path (jwt.strategy.validateApiKey, #486).
  *
  * The access-token path stamped provenance; the API-key path returned early
  * WITHOUT it, so an is_agent API key's REST writes recorded no 'agent' marker.
  * The API-key payload carries no signed claim, so provenance is resolved from the
- * SERVER-SIDE user returned by ApiKeyService.validate: isAgent -> 'agent',
+ * SERVER-SIDE user returned by ApiKeyService.validateApiKey: isAgent -> 'agent',
  * otherwise 'user'; aiChatId is always null (an API key has no ai_chats row).
  *
- * #501 wires the CORE ApiKeyService (the EE `ee/api-key` module is absent in the
- * fork) directly into the strategy — no dynamic require. The strategy also stamps
- * `req.raw.authType='api_key'` + `req.raw.apiKeyId` for the "a token cannot manage
- * tokens" guard on the /api-keys surface.
+ * The enterprise ApiKeyService is not bundled in the OSS build, so the strategy
+ * loads it through an overridable `resolveApiKeyService` seam that we stub here.
  */
-describe('JwtStrategy — API-key provenance derivation (#486/#501)', () => {
-  function makeApiKeyStrategy(validateImpl: (p: any) => Promise<any>) {
+describe('JwtStrategy — API-key provenance derivation (#486)', () => {
+  function makeApiKeyStrategy(validateApiKeyImpl: (p: any) => Promise<any>) {
     const userRepo: any = { findById: jest.fn() };
     const workspaceRepo: any = { findById: jest.fn() };
     const userSessionRepo: any = { findActiveById: jest.fn() };
     const sessionActivityService: any = { trackActivity: jest.fn() };
     const environmentService: any = { getAppSecret: () => 'test-secret' };
-    const validate = jest.fn(validateImpl);
-    const apiKeyService: any = { validate };
+    const moduleRef: any = {};
 
     const strategy = new JwtStrategy(
       userRepo,
@@ -153,9 +148,14 @@ describe('JwtStrategy — API-key provenance derivation (#486/#501)', () => {
       userSessionRepo,
       sessionActivityService,
       environmentService,
-      apiKeyService,
+      moduleRef,
     );
-    return { strategy, validate };
+    // Stub the EE ApiKeyService seam (the real module is not in the OSS build).
+    const validateApiKey = jest.fn(validateApiKeyImpl);
+    jest
+      .spyOn(strategy as any, 'resolveApiKeyService')
+      .mockReturnValue({ validateApiKey });
+    return { strategy, validateApiKey };
   }
 
   const makeReq = () => ({ raw: {} as Record<string, any> });
@@ -166,23 +166,22 @@ describe('JwtStrategy — API-key provenance derivation (#486/#501)', () => {
     type: JwtType.API_KEY,
   });
 
-  it("stamps actor='agent' + authType/apiKeyId for an is_agent API key", async () => {
+  it("stamps actor='agent' for an is_agent API key (from the validated user)", async () => {
     const validated = {
       user: { id: 'svc-1', isAgent: true },
       workspace: { id: 'ws-1' },
     };
-    const { strategy, validate } = makeApiKeyStrategy(async () => validated);
+    const { strategy, validateApiKey } = makeApiKeyStrategy(
+      async () => validated,
+    );
     const req = makeReq();
 
     const result = await strategy.validate(req, apiKeyPayload() as any);
 
-    expect(validate).toHaveBeenCalledTimes(1);
+    expect(validateApiKey).toHaveBeenCalledTimes(1);
     expect(req.raw.actor).toBe('agent');
     // API keys carry no internal ai_chats row -> null.
     expect(req.raw.aiChatId).toBeNull();
-    // Principal-kind markers for the management-surface guard.
-    expect(req.raw.authType).toBe('api_key');
-    expect(req.raw.apiKeyId).toBe('key-1');
     // The validated auth object is returned unchanged (req.user shape preserved).
     expect(result).toBe(validated);
   });
@@ -198,19 +197,25 @@ describe('JwtStrategy — API-key provenance derivation (#486/#501)', () => {
 
     expect(req.raw.actor).toBe('user');
     expect(req.raw.aiChatId).toBeNull();
-    expect(req.raw.authType).toBe('api_key');
   });
 
-  it('propagates a validate() rejection and stamps nothing', async () => {
-    const { strategy } = makeApiKeyStrategy(async () => {
-      throw new UnauthorizedException();
-    });
+  it('throws Unauthorized (and stamps nothing) when the EE module is missing', async () => {
+    const userRepo: any = { findById: jest.fn() };
+    const strategy = new JwtStrategy(
+      userRepo,
+      { findById: jest.fn() } as any,
+      { findActiveById: jest.fn() } as any,
+      { trackActivity: jest.fn() } as any,
+      { getAppSecret: () => 'test-secret' } as any,
+      {} as any,
+    );
+    // EE not bundled: the seam returns null.
+    jest.spyOn(strategy as any, 'resolveApiKeyService').mockReturnValue(null);
     const req = makeReq();
 
     await expect(
       strategy.validate(req, apiKeyPayload() as any),
     ).rejects.toThrow(UnauthorizedException);
     expect(req.raw.actor).toBeUndefined();
-    expect(req.raw.authType).toBeUndefined();
   });
 });

apps/server/src/core/auth/strategies/jwt.strategy.ts

@@ -1,4 +1,4 @@
-import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { Injectable, Logger, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy } from 'passport-jwt';
 import { EnvironmentService } from '../../../integrations/environment/environment.service';
@@ -9,18 +9,20 @@ import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo';
 import { SessionActivityService } from '../../session/session-activity.service';
 import { FastifyRequest } from 'fastify';
 import { extractBearerTokenFromHeader, isUserDisabled } from '../../../common/helpers';
+import { ModuleRef } from '@nestjs/core';
 import { resolveProvenance } from '../../../common/decorators/auth-provenance.decorator';
-import { ApiKeyService } from '../../api-key/api-key.service';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
+  private logger = new Logger('JwtStrategy');
+
   constructor(
     private userRepo: UserRepo,
     private workspaceRepo: WorkspaceRepo,
     private userSessionRepo: UserSessionRepo,
     private sessionActivityService: SessionActivityService,
     private readonly environmentService: EnvironmentService,
-    private readonly apiKeyService: ApiKeyService,
+    private moduleRef: ModuleRef,
   ) {
     super({
       jwtFromRequest: (req: FastifyRequest) => {
@@ -100,17 +102,12 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
   }
 
   private async validateApiKey(req: any, payload: JwtApiKeyPayload) {
-    // The fork ships the core `ApiKeyService` (the EE `ee/api-key` module is
-    // absent). `validate` throws a bare UnauthorizedException on any definite
-    // deny (missing/revoked/expired row, disabled user, kill-switch off) and
-    // propagates infra errors (→ 5xx) rather than masking them as a 401.
-    const result = await this.apiKeyService.validate(payload);
+    const apiKeyService = this.resolveApiKeyService();
+    if (!apiKeyService) {
+      throw new UnauthorizedException('Enterprise API Key module missing');
+    }
 
-    // Stamp the principal kind + key id so the /api-keys management surface can
-    // enforce "a token cannot manage tokens". Done in this branch because it
-    // returns before the shared ACCESS-path stamping below.
-    req.raw.authType = 'api_key';
-    req.raw.apiKeyId = payload.apiKeyId;
+    const result = await apiKeyService.validateApiKey(payload);
 
     // Stamp the agent-edit provenance for the API-KEY path too (#486). Unlike the
     // access-token path above, it CANNOT be resolved before this point: the
@@ -122,10 +119,32 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
     // SERVER-SIDE user (never a client field), so an 'agent' badge is unspoofable
     // — mirroring the access-token path. Passing `null` for the claim means the
     // actor is decided solely by user.isAgent.
-    const provenance = resolveProvenance(result.user, null);
+    const provenance = resolveProvenance((result as any)?.user, null);
     req.raw.actor = provenance.actor;
     req.raw.aiChatId = provenance.aiChatId;
 
     return result;
   }
+
+  /**
+   * Resolve the enterprise ApiKeyService, or `null` when the EE module is not
+   * bundled in this build (community build). Extracted as an overridable seam so
+   * the API-key provenance stamping can be unit-tested without the EE package
+   * present (docmost is OSS + a separate EE bundle; `require` of the EE path
+   * throws here). Any load/resolve error is treated as "module missing".
+   */
+  protected resolveApiKeyService(): {
+    validateApiKey: (payload: JwtApiKeyPayload) => Promise<unknown>;
+  } | null {
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const ApiKeyModule = require('./../../../ee/api-key/api-key.service');
+      return this.moduleRef.get(ApiKeyModule.ApiKeyService, { strict: false });
+    } catch (err) {
+      this.logger.debug(
+        'API Key module requested but enterprise module not bundled in this build',
+      );
+      return null;
+    }
+  }
 }

apps/server/src/core/core.module.ts

@@ -6,7 +6,6 @@ import {
 } from '@nestjs/common';
 import { UserModule } from './user/user.module';
 import { AuthModule } from './auth/auth.module';
-import { ApiKeyModule } from './api-key/api-key.module';
 import { WorkspaceModule } from './workspace/workspace.module';
 import { PageModule } from './page/page.module';
 import { AttachmentModule } from './attachment/attachment.module';
@@ -30,7 +29,6 @@ import { ClsMiddleware } from 'nestjs-cls';
   imports: [
     UserModule,
     AuthModule,
-    ApiKeyModule,
     WorkspaceModule,
     PageModule,
     AttachmentModule,

apps/server/src/database/database.module.ts

@@ -37,7 +37,6 @@ import { AiProviderCredentialsRepo } from '@docmost/db/repos/ai-chat/ai-provider
 import { AiMcpServerRepo } from '@docmost/db/repos/ai-chat/ai-mcp-server.repo';
 import { AiAgentRoleRepo } from '@docmost/db/repos/ai-agent-roles/ai-agent-roles.repo';
 import { PageEmbeddingRepo } from '@docmost/db/repos/ai-chat/page-embedding.repo';
-import { ApiKeyRepo } from '@docmost/db/repos/api-key/api-key.repo';
 import { PageListener } from '@docmost/db/listeners/page.listener';
 import { PostgresJSDialect } from 'kysely-postgres-js';
 import * as postgres from 'postgres';
@@ -130,7 +129,6 @@ import { firstSqlToken } from '../integrations/metrics/metrics.constants';
     AiMcpServerRepo,
     AiAgentRoleRepo,
     PageEmbeddingRepo,
-    ApiKeyRepo,
     PageListener,
   ],
   exports: [
@@ -166,7 +164,6 @@ import { firstSqlToken } from '../integrations/metrics/metrics.constants';
     AiMcpServerRepo,
     AiAgentRoleRepo,
     PageEmbeddingRepo,
-    ApiKeyRepo,
   ],
 })
 export class DatabaseModule implements OnApplicationBootstrap {

apps/server/src/database/repos/api-key/api-key.repo.ts

@@ -1,110 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectKysely } from 'nestjs-kysely';
-import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
-import { DB, Users } from '@docmost/db/types/db';
-import { dbOrTx } from '@docmost/db/utils';
-import { ApiKey, InsertableApiKey } from '@docmost/db/types/entity.types';
-import { jsonObjectFrom } from 'kysely/helpers/postgres';
-import { ExpressionBuilder } from 'kysely';
-
-// Public-facing shape: the api_keys row plus a compact creator attribution used
-// by the admin list (the workspace-wide view attributes each key to its author).
-export type ApiKeyWithCreator = ApiKey & {
-  creator: Pick<Users, 'id' | 'name' | 'email' | 'avatarUrl'> | null;
-};
-
-@Injectable()
-export class ApiKeyRepo {
-  constructor(@InjectKysely() private readonly db: KyselyDB) {}
-
-  // Compact creator attribution embedded in the admin list rows. A nested
-  // subquery (jsonObjectFrom) keeps it one round-trip; the token material is
-  // never stored, so nothing sensitive is joined in.
-  private withCreator(eb: ExpressionBuilder<DB, 'apiKeys'>) {
-    return jsonObjectFrom(
-      eb
-        .selectFrom('users')
-        .select(['users.id', 'users.name', 'users.email', 'users.avatarUrl'])
-        .whereRef('users.id', '=', 'apiKeys.creatorId'),
-    ).as('creator');
-  }
-
-  async findById(
-    id: string,
-    workspaceId: string,
-    trx?: KyselyTransaction,
-  ): Promise<ApiKey | undefined> {
-    const db = dbOrTx(this.db, trx);
-    return db
-      .selectFrom('apiKeys')
-      .selectAll()
-      .where('id', '=', id)
-      .where('workspaceId', '=', workspaceId)
-      // Convention (soft-delete): a revoked key is invisible to reads.
-      .where('deletedAt', 'is', null)
-      .executeTakeFirst();
-  }
-
-  async findByCreator(
-    creatorId: string,
-    workspaceId: string,
-  ): Promise<ApiKeyWithCreator[]> {
-    return this.db
-      .selectFrom('apiKeys')
-      .selectAll('apiKeys')
-      .select((eb) => this.withCreator(eb))
-      .where('creatorId', '=', creatorId)
-      .where('workspaceId', '=', workspaceId)
-      .where('deletedAt', 'is', null)
-      .orderBy('createdAt', 'desc')
-      .execute() as unknown as Promise<ApiKeyWithCreator[]>;
-  }
-
-  async findAllInWorkspace(
-    workspaceId: string,
-  ): Promise<ApiKeyWithCreator[]> {
-    return this.db
-      .selectFrom('apiKeys')
-      .selectAll('apiKeys')
-      .select((eb) => this.withCreator(eb))
-      .where('workspaceId', '=', workspaceId)
-      .where('deletedAt', 'is', null)
-      .orderBy('createdAt', 'desc')
-      .execute() as unknown as Promise<ApiKeyWithCreator[]>;
-  }
-
-  async insert(
-    insertable: InsertableApiKey,
-    trx?: KyselyTransaction,
-  ): Promise<ApiKey> {
-    const db = dbOrTx(this.db, trx);
-    return db
-      .insertInto('apiKeys')
-      .values(insertable)
-      .returningAll()
-      .executeTakeFirst();
-  }
-
-  // Soft-delete = revoke. Terminal: the row stays for forensics but is invisible
-  // to every read above, so validate() denies it immediately (no grace window).
-  async softDelete(id: string, workspaceId: string): Promise<void> {
-    await this.db
-      .updateTable('apiKeys')
-      .set({ deletedAt: new Date(), updatedAt: new Date() })
-      .where('id', '=', id)
-      .where('workspaceId', '=', workspaceId)
-      .where('deletedAt', 'is', null)
-      .execute();
-  }
-
-  // Throttled best-effort forensics stamp. Not on the critical path: callers
-  // fire-and-forget and swallow errors, so it never fails a request.
-  async touchLastUsed(id: string): Promise<void> {
-    await this.db
-      .updateTable('apiKeys')
-      .set({ lastUsedAt: new Date() })
-      .where('id', '=', id)
-      .where('deletedAt', 'is', null)
-      .execute();
-  }
-}

apps/server/src/integrations/environment/environment.service.ts

@@ -70,23 +70,6 @@ export class EnvironmentService {
     return this.configService.get<string>('JWT_TOKEN_EXPIRES_IN', '90d');
   }
 
-  // Kill-switch for the agent API-key feature. Default ON (unset -> enabled): a
-  // deploy that never sets the variable must NOT silently kill every agent. The
-  // parse is STRICT — the value is validated by environment.validation to be
-  // exactly 'true' or 'false' (or absent), so a typo like `=0`/`=off`/`=False`
-  // fails at boot rather than being read as "enabled" (which would leave an
-  // operator who yanked the switch during an incident with it still on). When
-  // OFF: validate() denies every api-key token and the issuance endpoints 404.
-  isApiKeysEnabled(): boolean {
-    return this.configService.get<string>('API_KEYS_ENABLED', 'true') !== 'false';
-  }
-
-  // Raw value (or undefined) for the boot log, so the state after each deploy is
-  // verifiable in container logs: `API keys: ENABLED/DISABLED (API_KEYS_ENABLED=...)`.
-  getApiKeysEnabledRaw(): string | undefined {
-    return this.configService.get<string>('API_KEYS_ENABLED');
-  }
-
   getCookieExpiresIn(): Date {
     const expiresInStr = this.getJwtTokenExpiresIn();
     let msUntilExpiry: number;

apps/server/src/integrations/environment/environment.validation.ts

@@ -103,15 +103,6 @@ export class EnvironmentVariables {
   @IsString()
   TYPESENSE_LOCALE: string;
 
-  // Agent API-key kill-switch. Optional (absent -> default ON). STRICT: only the
-  // literals 'true'/'false' are accepted, so `=0`/`=off`/`=False` fail at boot
-  // instead of being silently read as "enabled" — the switch must actually flip
-  // when an operator flips it. See EnvironmentService.isApiKeysEnabled.
-  @IsOptional()
-  @IsIn(['true', 'false'])
-  @IsString()
-  API_KEYS_ENABLED: string;
-
   @IsOptional()
   @ValidateIf((obj) => obj.AI_DRIVER)
   @IsIn(['openai', 'openai-compatible', 'gemini', 'ollama'])

apps/server/src/integrations/import/services/import-attachment.service.drawio-svg.spec.ts

@@ -1,131 +0,0 @@
-// p-limit and @sindresorhus/slugify are ESM-only and not in jest's transform
-// allowlist; both are irrelevant to createDrawioSvg (a pure fs + string method),
-// so they are mocked out to keep the module graph loadable under ts-jest.
-jest.mock('p-limit', () => ({
-  __esModule: true,
-  default: () => (fn: () => unknown) => fn(),
-}));
-jest.mock('@sindresorhus/slugify', () => ({
-  __esModule: true,
-  default: (input: string) => String(input),
-}));
-
-import { promises as fs } from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import { ImportAttachmentService } from './import-attachment.service';
-
-/**
- * Unit test for ImportAttachmentService.createDrawioSvg (issue #507).
- *
- * The Confluence import wraps a `.drawio` file into a `.drawio.svg` attachment.
- * The `content=` payload MUST be the mxfile XML entity-escaped (draw.io's native
- * form), NOT base64 — draw.io's editor decodes a base64 content= via Latin-1
- * atob, mangling every non-ASCII char into mojibake. createDrawioSvg touches no
- * injected dependency, so the service is built with placeholder deps.
- */
-describe('ImportAttachmentService.createDrawioSvg (#507)', () => {
-  const service = new ImportAttachmentService(
-    {} as any,
-    {} as any,
-    {} as any,
-  );
-  const call = (p: string): Promise<Buffer> =>
-    (service as any).createDrawioSvg(p);
-
-  let tmpDir: string;
-  beforeAll(async () => {
-    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'drawio-507-'));
-  });
-  afterAll(async () => {
-    await fs.rm(tmpDir, { recursive: true, force: true });
-  });
-
-  const writeDrawio = async (name: string, xml: string): Promise<string> => {
-    const p = path.join(tmpDir, name);
-    await fs.writeFile(p, xml, 'utf-8');
-    return p;
-  };
-
-  it('writes content= as entity-encoded XML, not base64', async () => {
-    const drawio =
-      '<mxfile host="Confluence"><diagram name="Схема — ёж">' +
-      '<mxGraphModel><root><mxCell id="0"/>' +
-      '<mxCell id="2" value="Старт-бит" vertex="1" parent="0"/>' +
-      '</root></mxGraphModel></diagram></mxfile>';
-    const p = await writeDrawio('cyrillic.drawio', drawio);
-
-    const svg = (await call(p)).toString('utf-8');
-    const content = /content="([^"]*)"/.exec(svg)?.[1];
-    expect(content).toBeDefined();
-
-    // Entity-encoded XML form, starting with &lt;mxfile — never a base64 blob.
-    expect(content).toMatch(/^&lt;mxfile/);
-    expect(content).toContain('&lt;');
-    // Non-ASCII survives as raw UTF-8, with no Latin-1 mojibake.
-    expect(content).toContain('Старт-бит');
-    expect(content).toContain('Схема — ёж');
-    expect(content).not.toContain('Ð');
-
-    // Decoding the attribute (un-escaping) yields the original drawio file.
-    const decoded = content!
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .replace(/&amp;/g, '&');
-    expect(decoded).toBe(drawio);
-  });
-
-  it('encodes literal tab/newline/CR as numeric char-refs, not literal control chars (#507 F1)', async () => {
-    // A literal tab/newline/CR inside the mxfile XML would be collapsed to a
-    // single space by XML attribute-value normalization when the draw.io editor
-    // reads content=, silently flattening multi-line labels and tab-bearing
-    // values. They must be emitted as numeric char-refs instead.
-    const drawio =
-      '<mxfile><diagram name="p">' +
-      '<mxGraphModel><root><mxCell id="0"/>' +
-      '<mxCell id="2" value="col1\tcol2" style="html=1;\nshadow=0" vertex="1" parent="0"/>' +
-      '<mxCell id="3" value="Line1\nLine2\rLine3" vertex="1" parent="0"/>' +
-      '</root></mxGraphModel></diagram></mxfile>';
-    const p = await writeDrawio('ctrl.drawio', drawio);
-
-    const svg = (await call(p)).toString('utf-8');
-    const content = /content="([^"]*)"/.exec(svg)?.[1];
-    expect(content).toBeDefined();
-    // No literal control chars survive in the attribute value.
-    expect(content).not.toMatch(/[\t\n\r]/);
-    // They round-trip as numeric char-refs.
-    expect(content).toContain('&#x9;');
-    expect(content).toContain('&#xa;');
-    expect(content).toContain('&#xd;');
-    // Decoding (char-refs back to literal, entities back) recovers the file.
-    const decoded = content!
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .replace(/&#39;/g, "'")
-      .replace(/&#x9;/gi, '\t')
-      .replace(/&#xa;/gi, '\n')
-      .replace(/&#xd;/gi, '\r')
-      .replace(/&amp;/g, '&');
-    expect(decoded).toBe(drawio);
-  });
-
-  it('escapes XML metacharacters in the drawio payload', async () => {
-    const drawio = '<mxfile><diagram name="a &amp; b">"q" &lt;x&gt;</diagram></mxfile>';
-    const p = await writeDrawio('meta.drawio', drawio);
-
-    const svg = (await call(p)).toString('utf-8');
-    const content = /content="([^"]*)"/.exec(svg)?.[1];
-    expect(content).toBeDefined();
-    // The attribute value must contain no bare `<`, `>` or `"` that would break
-    // out of the content="..." attribute or the SVG element.
-    expect(content).not.toMatch(/[<>"]/);
-    const decoded = content!
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .replace(/&amp;/g, '&');
-    expect(decoded).toBe(drawio);
-  });
-});

apps/server/src/integrations/import/services/import-attachment.service.ts

@@ -8,7 +8,6 @@ import { createReadStream } from 'node:fs';
 import { promises as fs } from 'fs';
 import { Readable } from 'stream';
 import { getMimeType, sanitizeFileName } from '../../../common/helpers';
-import { htmlEscape } from '../../../common/helpers/html-escaper';
 import { v7 } from 'uuid';
 import { FileTask } from '@docmost/db/types/entity.types';
 import { getAttachmentFolderPath } from '../../../core/attachment/attachment.utils';
@@ -850,12 +849,7 @@ export class ImportAttachmentService {
   ): Promise<Buffer> {
     try {
       const drawioContent = await fs.readFile(drawioPath, 'utf-8');
-      // Write the mxfile XML XML-entity-escaped (draw.io's native content= form),
-      // NOT base64. draw.io's editor decodes a base64 content= via Latin-1 atob
-      // (no UTF-8 step), turning every non-ASCII char (Cyrillic, ё, —) into
-      // mojibake; the entity-encoded form is decoded by the DOM as UTF-8 and
-      // opens intact. Docmost's own decoder reads both forms.
-      const drawioEscaped = this.xmlEscapeContent(drawioContent);
+      const drawioBase64 = Buffer.from(drawioContent).toString('base64');
 
       let imageElement = '';
       // If we have a PNG, include it in the SVG
@@ -881,7 +875,7 @@ export class ImportAttachmentService {
       width="600"
       height="400"
       viewBox="0 0 600 400"
-      content="${drawioEscaped}">${imageElement}</svg>`;
+      content="${drawioBase64}">${imageElement}</svg>`;
 
       return Buffer.from(svgContent, 'utf-8');
     } catch (error) {
@@ -890,24 +884,6 @@ export class ImportAttachmentService {
     }
   }
 
-  /**
-   * Escape a string so it is safe as the value of a double-quoted XML attribute
-   * (the `content=` payload of a `.drawio.svg`). The shared `htmlEscape` covers
-   * `& < > " '` (a strict superset of what this attribute needs; the extra `'`
-   * escape is harmless in a `"`-delimited value). On top of that, the numeric
-   * char-refs for tab/newline/CR are required: a literal tab/newline/CR inside
-   * an attribute value is collapsed to a single space by XML attribute-value
-   * normalization on DOM read (both our decoder and the real draw.io editor),
-   * silently flattening multi-line labels and tab-bearing values. Char-refs
-   * survive that normalization (#507).
-   */
-  private xmlEscapeContent(s: string): string {
-    return htmlEscape(s)
-      .replace(/\t/g, '&#x9;')
-      .replace(/\n/g, '&#xa;')
-      .replace(/\r/g, '&#xd;');
-  }
-
   private async uploadWithRetry(opts: {
     abs: string;
     storageFilePath: string;

apps/server/src/integrations/mcp/mcp-auth.helpers.ts

@@ -304,102 +304,37 @@ export function clientIp(req: ClientIpRequest): string {
   return 'unknown';
 }
 
-// The decoded payload shared by the /mcp Bearer allowlist. Carries the `type`
-// discriminator and the API-key `apiKeyId`, on top of the access-token fields.
-export interface McpBearerPayload {
-  type?: JwtType;
+// Minimal structural shape of the TokenService.verifyJwt method we depend on,
+// so this module never imports the concrete TokenService (heavy graph).
+export interface AccessJwtVerifier {
+  verifyJwt: (
+    token: string,
+    type: JwtType,
+  ) => Promise<{
+    sub?: string;
+    email?: string;
+    workspaceId?: string;
+    sessionId?: string;
+  }>;
+}
+
+/**
+ * Bind a TokenService-like verifier into a one-arg `verifyJwt(token)` that
+ * ALWAYS enforces `JwtType.ACCESS`. This is the single place where the /mcp
+ * Bearer path pins the token type: a Bearer access token must be verified AS an
+ * access token (not refresh/exchange/collab/etc.), so the type literal is fixed
+ * here rather than at the call site. McpService.verifyMcpBearer delegates to
+ * this, keeping the `JwtType.ACCESS` choice testable without the heavy graph.
+ */
+export function bindAccessJwtVerifier(
+  tokenService: AccessJwtVerifier,
+): (token: string) => Promise<{
   sub?: string;
   email?: string;
   workspaceId?: string;
   sessionId?: string;
-  apiKeyId?: string;
-}
-
-// Minimal structural shape of the TokenService.verifyJwtOneOf method.
-export interface OneOfJwtVerifier {
-  verifyJwtOneOf: (
-    token: string,
-    allowed: JwtType[],
-  ) => Promise<McpBearerPayload>;
-}
-
-/**
- * Bind a TokenService-like verifier into a one-arg `verifyJwtOneOf(token)` that
- * pins the /mcp Bearer ALLOWLIST to exactly {ACCESS, API_KEY}. This is the single
- * place the /mcp Bearer path pins the token type: the /mcp Bearer slot
- * legitimately accepts either an ACCESS token (a
- * human's session token) OR an API_KEY token (an agent's key), but NOTHING else
- * (collab/exchange/attachment/etc. are rejected with the generic type error).
- * The allowlist is fixed here rather than at the call site, and the signature is
- * verified exactly once (see verifyMcpBearer).
- */
-export function bindMcpBearerVerifier(
-  tokenService: OneOfJwtVerifier,
-): (token: string) => Promise<McpBearerPayload> {
-  return (token: string) =>
-    tokenService.verifyJwtOneOf(token, [JwtType.ACCESS, JwtType.API_KEY]);
-}
-
-// Deps for the /mcp Bearer router. `verifyJwtOneOf` is the one-arg verifier bound
-// above (allowlist {ACCESS, API_KEY}); the ACCESS-specific revocation/disabled
-// deps mirror BearerVerifyDeps; `validateApiKey` is the SHARED api-key row-check.
-export interface McpBearerDeps
-  extends Omit<BearerVerifyDeps, 'verifyJwt'> {
-  verifyJwtOneOf: (token: string) => Promise<McpBearerPayload>;
-  // Row-check for an API_KEY principal — the SAME validator REST uses. Throws
-  // UnauthorizedException on a definite deny; PROPAGATES an infra error (→ 5xx),
-  // never masking it as a 401. Not a login attempt: the Basic limiter is not
-  // involved on this path.
-  validateApiKey: (payload: McpBearerPayload) => Promise<unknown>;
-}
-
-/**
- * Verify a /mcp Bearer token that may be an ACCESS token OR an API_KEY token, and
- * route by type. The signature is verified EXACTLY ONCE (verifyJwtOneOf); the
- * result is reused so the ACCESS branch does not re-verify.
- *
- *   - API_KEY -> bind to THIS instance's workspace FIRST (a token for another
- *     workspace is rejected), THEN run the shared `validateApiKey` row-check.
- *     No session/limiter involvement (an API key is not a login).
- *   - ACCESS  -> the unchanged `verifyBearerAccess` (session-active + not-disabled
- *     checks), fed a closure over the already-verified payload so "verify once"
- *     and "helper unchanged" coexist.
- *
- * Throws UnauthorizedException on any auth failure (uniform generic message — no
- * enumeration of why); propagates an infra error from `validateApiKey` as itself.
- */
-export async function verifyMcpBearer(
-  token: string,
-  deps: McpBearerDeps,
-): Promise<{ sub?: string; email?: string }> {
-  const generic = 'Invalid or expired token';
-  const payload = await deps.verifyJwtOneOf(token);
-
-  if (payload.type === JwtType.API_KEY) {
-    if (!payload.sub || !payload.workspaceId) {
-      throw new UnauthorizedException(generic);
-    }
-    // Instance-binding (mirrors verifyBearerAccess): reject an API_KEY token
-    // minted for a different workspace before touching the DB.
-    if (
-      deps.expectedWorkspaceId &&
-      payload.workspaceId !== deps.expectedWorkspaceId
-    ) {
-      throw new UnauthorizedException(generic);
-    }
-    // Shared row-check. A definite deny throws Unauthorized; an infra error
-    // propagates (→ 5xx), which the caller must NOT convert to a 401.
-    await deps.validateApiKey(payload);
-    return { sub: payload.sub };
-  }
-
-  // ACCESS: reuse verifyBearerAccess WITHOUT re-verifying the signature.
-  return verifyBearerAccess(token, {
-    verifyJwt: async () => payload,
-    expectedWorkspaceId: deps.expectedWorkspaceId,
-    findUser: deps.findUser,
-    findActiveSession: deps.findActiveSession,
-  });
+}> {
+  return (token: string) => tokenService.verifyJwt(token, JwtType.ACCESS);
 }
 
 // Minimal shapes for the Bearer revocation/disabled check. Kept structural so
@@ -793,24 +728,18 @@ export async function resolveMcpSessionConfig(
     };
   }
 
-  // --- 2) fallback A: Bearer JWT (user-supplied ACCESS or agent API_KEY) ---
+  // --- 2) fallback A: Bearer access-JWT (user-supplied token) ---
   const bearer = extractBearer(authHeader);
   if (bearer) {
     let payload: { sub?: string; email?: string };
     try {
       payload = await deps.verifyAccessJwt(bearer);
     } catch (err) {
-      // Anti-enumeration (Bearer leg): EVERY auth failure surfaces the SAME
-      // generic 401 — expired/revoked/wrong-type/unknown are indistinguishable
-      // to the caller (its reaction is identical either way). But an UNEXPECTED
-      // (infra) error is NOT an auth verdict: rethrow it AS ITSELF so the surface
-      // maps it to 5xx (mapAuthResultToResponse), never masking a DB/Redis
-      // outage as a bad token. verifyMcpBearer throws UnauthorizedException on a
-      // definite deny and lets an infra error from validateApiKey propagate.
-      if (err instanceof UnauthorizedException) {
-        throw new UnauthorizedException('Invalid or expired token');
-      }
-      throw err;
+      const message =
+        err instanceof Error && err.message
+          ? err.message
+          : 'Invalid or expired token';
+      throw new UnauthorizedException(message);
     }
     return {
       config: { apiUrl, getToken: async () => bearer },

apps/server/src/integrations/mcp/mcp-basic-login-gate.spec.ts

@@ -115,7 +115,6 @@ function makeService(opts: {
     undefined as never, // userRepo
     undefined as never, // userSessionRepo
     moduleRef as never, // moduleRef (read by the MFA branch)
-    undefined as never, // apiKeyService (unused by the login-gate path)
     undefined as never, // sandboxStore (unused by the login-gate path)
   );
   // Stop the constructor's unref'd sweep timer leaking across tests.

apps/server/src/integrations/mcp/mcp.module.ts

@@ -4,16 +4,13 @@ import { McpService } from './mcp.service';
 import { DatabaseModule } from '@docmost/db/database.module';
 import { AuthModule } from '../../core/auth/auth.module';
 import { TokenModule } from '../../core/auth/token.module';
-import { ApiKeyModule } from '../../core/api-key/api-key.module';
 
 // Community MCP feature: the server itself serves the Model Context Protocol
 // over HTTP at /mcp. DatabaseModule (global) provides WorkspaceRepo. AuthModule
 // supplies AuthService (per-user HTTP-Basic login validation) and TokenModule
-// supplies TokenService (Bearer JWT verification for the token path). ApiKeyModule
-// supplies ApiKeyService (the shared api-key row-check for the API_KEY Bearer
-// branch, so an agent authenticates with a key instead of the bcrypt Basic path).
+// supplies TokenService (Bearer access-JWT verification for the token fallback).
 @Module({
-  imports: [DatabaseModule, AuthModule, TokenModule, ApiKeyModule],
+  imports: [DatabaseModule, AuthModule, TokenModule],
   controllers: [McpController],
   providers: [McpService],
 })

apps/server/src/integrations/mcp/mcp.service.spec.ts

@@ -6,10 +6,9 @@ import {
   isCredentialsFailure,
   isInitializeRequestBody,
   verifyBearerAccess,
-  verifyMcpBearer,
-  bindMcpBearerVerifier,
   sharedTokenMatches,
   clientIp,
+  bindAccessJwtVerifier,
   extractBearer,
   decideBasicGate,
   mapAuthResultToResponse,
@@ -525,28 +524,13 @@ describe('resolveMcpSessionConfig', () => {
     expect(resolved.identity).toBe('bearer:user-9');
   });
 
-  it('Bearer invalid -> UNIFORM generic 401 (anti-enumeration, reason not leaked)', async () => {
-    // #501: the Bearer leg no longer surfaces the specific reason. Whether the
-    // token is expired, revoked, wrong-type or unknown, the caller sees ONE bare
-    // 'Invalid or expired token' — an agent's reaction is identical, and a leaked
-    // class would be an enumeration oracle.
+  it('Bearer invalid -> specific 401 from verifyAccessJwt', async () => {
     const verifyAccessJwt = jest
       .fn()
       .mockRejectedValue(new UnauthorizedException('jwt expired'));
     await expect(
       resolveMcpSessionConfig('Bearer expired', makeDeps({ verifyAccessJwt })),
-    ).rejects.toThrow('Invalid or expired token');
-  });
-
-  it('Bearer INFRA error -> propagates (NOT masked as 401)', async () => {
-    // A non-UnauthorizedException (e.g. a DB outage in the api-key row-check) is
-    // not an auth verdict: it must propagate so the surface maps it to 5xx.
-    const verifyAccessJwt = jest
-      .fn()
-      .mockRejectedValue(new Error('connection terminated'));
-    await expect(
-      resolveMcpSessionConfig('Bearer x', makeDeps({ verifyAccessJwt })),
-    ).rejects.toThrow('connection terminated');
+    ).rejects.toThrow('jwt expired');
   });
 
   it('no creds + env service account configured -> service-account config', async () => {
@@ -1017,104 +1001,48 @@ describe('clientIp (XFF-fallback precedence, item 5)', () => {
   });
 });
 
-describe('bindMcpBearerVerifier pins the {ACCESS, API_KEY} allowlist (#501)', () => {
-  it('calls verifyJwtOneOf with exactly [ACCESS, API_KEY]', async () => {
-    const verifyJwtOneOf = jest
+describe('bindAccessJwtVerifier enforces JwtType.ACCESS (item 3)', () => {
+  it('calls TokenService.verifyJwt with JwtType.ACCESS as the second argument', async () => {
+    // Mock TokenService: assert the type literal is pinned to ACCESS so swapping
+    // to REFRESH (or omitting the type) breaks this test.
+    const verifyJwt = jest
       .fn()
-      .mockResolvedValue({ type: JwtType.API_KEY, sub: 'u-1' });
-    await bindMcpBearerVerifier({ verifyJwtOneOf })('the.jwt');
-    expect(verifyJwtOneOf).toHaveBeenCalledWith('the.jwt', [
-      JwtType.ACCESS,
-      JwtType.API_KEY,
-    ]);
-    // Pin the concrete enum values too.
-    expect(verifyJwtOneOf.mock.calls[0][1]).toEqual(['access', 'api_key']);
-  });
-});
+      .mockResolvedValue({ sub: 'user-1', workspaceId: 'ws-1' });
+    const verify = bindAccessJwtVerifier({ verifyJwt });
 
-describe('verifyMcpBearer routes by token type (#501)', () => {
-  const accessDeps = (over: any = {}) => ({
-    verifyJwtOneOf: jest.fn(),
-    expectedWorkspaceId: 'ws-1',
-    findUser: jest.fn().mockResolvedValue({ deactivatedAt: null }),
-    findActiveSession: jest
-      .fn()
-      .mockResolvedValue({ userId: 'u-1', workspaceId: 'ws-1' }),
-    validateApiKey: jest.fn(),
-    ...over,
+    await verify('the.access.jwt');
+
+    expect(verifyJwt).toHaveBeenCalledTimes(1);
+    expect(verifyJwt).toHaveBeenCalledWith('the.access.jwt', JwtType.ACCESS);
+    // Pin the real enum value too, so renaming/repointing the enum member is caught.
+    expect(verifyJwt.mock.calls[0][1]).toBe('access');
   });
 
-  it('API_KEY -> row-checks via validateApiKey and does NOT touch session/limiter', async () => {
-    const deps = accessDeps({
-      verifyJwtOneOf: jest.fn().mockResolvedValue({
-        type: JwtType.API_KEY,
-        sub: 'svc-1',
-        workspaceId: 'ws-1',
-        apiKeyId: 'k-1',
-      }),
-      validateApiKey: jest.fn().mockResolvedValue({ user: { id: 'svc-1' } }),
-    });
-    const res = await verifyMcpBearer('tok', deps);
-    expect(deps.validateApiKey).toHaveBeenCalledTimes(1);
-    // No session lookup on the api-key path (not a login).
-    expect(deps.findActiveSession).not.toHaveBeenCalled();
-    expect(res).toEqual({ sub: 'svc-1' });
+  it('passes through the verified payload', async () => {
+    const payload = { sub: 'user-9', email: 'u@e.com', workspaceId: 'ws-1' };
+    const verifyJwt = jest.fn().mockResolvedValue(payload);
+    await expect(
+      bindAccessJwtVerifier({ verifyJwt })('t'),
+    ).resolves.toBe(payload);
   });
 
-  it('API_KEY for ANOTHER workspace -> rejected before the row-check', async () => {
-    const deps = accessDeps({
-      verifyJwtOneOf: jest.fn().mockResolvedValue({
-        type: JwtType.API_KEY,
-        sub: 'svc-1',
-        workspaceId: 'ws-OTHER',
-        apiKeyId: 'k-1',
-      }),
-      validateApiKey: jest.fn(),
-    });
-    await expect(verifyMcpBearer('tok', deps)).rejects.toBeInstanceOf(
-      UnauthorizedException,
-    );
-    expect(deps.validateApiKey).not.toHaveBeenCalled();
-  });
-
-  it('API_KEY infra error from validateApiKey PROPAGATES (not masked)', async () => {
-    const boom = new Error('db down');
-    const deps = accessDeps({
-      verifyJwtOneOf: jest.fn().mockResolvedValue({
-        type: JwtType.API_KEY,
-        sub: 'svc-1',
-        workspaceId: 'ws-1',
-        apiKeyId: 'k-1',
-      }),
-      validateApiKey: jest.fn().mockRejectedValue(boom),
-    });
-    await expect(verifyMcpBearer('tok', deps)).rejects.toBe(boom);
-  });
-
-  it('ACCESS -> runs the session/disabled checks and does NOT call validateApiKey', async () => {
-    const deps = accessDeps({
-      verifyJwtOneOf: jest.fn().mockResolvedValue({
-        type: JwtType.ACCESS,
-        sub: 'u-1',
-        workspaceId: 'ws-1',
-        sessionId: 'sess-1',
-        email: 'u@e.com',
-      }),
-    });
-    const res = await verifyMcpBearer('tok', deps);
-    expect(deps.findActiveSession).toHaveBeenCalledWith('sess-1');
-    expect(deps.validateApiKey).not.toHaveBeenCalled();
-    expect(res).toEqual({ sub: 'u-1', email: 'u@e.com' });
-  });
-
-  it('verifies the signature exactly ONCE (single verifyJwtOneOf, no re-verify)', async () => {
-    const verifyJwtOneOf = jest.fn().mockResolvedValue({
-      type: JwtType.ACCESS,
-      sub: 'u-1',
+  // The Bearer revocation/disabled checks (verifyBearerAccess) are covered above;
+  // this binds the ACCESS-type enforcement that verifyMcpBearer wires in.
+  it('feeds verifyBearerAccess so the whole Bearer chain enforces ACCESS', async () => {
+    const verifyJwt = jest.fn().mockResolvedValue({
+      sub: 'user-1',
       workspaceId: 'ws-1',
+      sessionId: 'sess-1',
     });
-    await verifyMcpBearer('tok', accessDeps({ verifyJwtOneOf }));
-    expect(verifyJwtOneOf).toHaveBeenCalledTimes(1);
+    const res = await verifyBearerAccess('t', {
+      verifyJwt: bindAccessJwtVerifier({ verifyJwt }),
+      findUser: jest.fn().mockResolvedValue({ deactivatedAt: null }),
+      findActiveSession: jest
+        .fn()
+        .mockResolvedValue({ userId: 'user-1', workspaceId: 'ws-1' }),
+    });
+    expect(verifyJwt).toHaveBeenCalledWith('t', JwtType.ACCESS);
+    expect(res).toEqual({ sub: 'user-1', email: undefined });
   });
 });
 
@@ -1270,7 +1198,6 @@ describe('McpService.onModuleDestroy — CollabSession teardown (#486)', () => {
       {} as any,
       {} as any,
       {} as any,
-      {} as any,
     );
   }
 

apps/server/src/integrations/mcp/mcp.service.ts

@@ -14,17 +14,16 @@ import { UserSessionRepo } from '@docmost/db/repos/session/user-session.repo';
 import { AuthService } from '../../core/auth/services/auth.service';
 import { TokenService } from '../../core/auth/services/token.service';
 import { validateSsoEnforcement } from '../../core/auth/auth.util';
-import { JwtApiKeyPayload } from '../../core/auth/dto/jwt-payload';
+import { JwtPayload } from '../../core/auth/dto/jwt-payload';
 import { Workspace } from '@docmost/db/types/entity.types';
-import { ApiKeyService } from '../../core/api-key/api-key.service';
 import {
   FailedLoginLimiter,
   resolveMcpSessionConfig,
-  verifyMcpBearer,
+  verifyBearerAccess,
   isInitializeRequestBody,
   sharedTokenMatches,
   clientIp,
-  bindMcpBearerVerifier,
+  bindAccessJwtVerifier,
   decideBasicGate,
   mapAuthResultToResponse,
   DocmostMcpConfig,
@@ -106,10 +105,6 @@ export class McpService implements OnModuleDestroy {
     private readonly userRepo: UserRepo,
     private readonly userSessionRepo: UserSessionRepo,
     private readonly moduleRef: ModuleRef,
-    // Shared api-key row-check for the /mcp API_KEY Bearer branch (same validator
-    // REST uses). Also lets an agent authenticate to /mcp with an api key instead
-    // of the bcrypt Basic path, so parallel reads stop starving the limiter.
-    private readonly apiKeyService: ApiKeyService,
     // Shared singleton in-RAM blob store backing the stash tool.
     private readonly sandboxStore: SandboxStore,
   ) {
@@ -199,41 +194,37 @@ export class McpService implements OnModuleDestroy {
     }
   }
 
-  // Bearer verification for the /mcp token path. The Bearer slot accepts EITHER
-  // an ACCESS token (a human session token) OR an API_KEY token (an agent's key)
-  // — the allowlist is pinned in bindMcpBearerVerifier. An ACCESS token is
-  // checked exactly as JwtStrategy does (signature/exp/type + session-active +
-  // not-disabled), so the MCP path is not weaker than the cookie/header path. An
-  // API_KEY token is HMAC-verified (microseconds) then row-checked via the shared
-  // ApiKeyService.validate — NOT a login attempt, so the Basic bcrypt path and
-  // its anti-brute-force limiter are never touched (the parallel-reads fix).
+  // Bearer access-JWT verification for the /mcp token fallback. verifyJwt only
+  // checks signature/exp/type, but a logged-out (revoked) or disabled user can
+  // still hold an unexpired access JWT. JwtStrategy additionally checks the
+  // session is active and the user is not disabled; we mirror those exact checks
+  // here so the MCP Bearer path is not weaker than the normal cookie/header path.
   private async verifyMcpBearer(
     token: string,
   ): Promise<{ sub?: string; email?: string }> {
-    // Resolve THIS instance's workspace so the router can bind the token's
-    // `workspaceId` claim to it (mirrors JwtStrategy). The community build is
-    // single-workspace (findFirst), so this is the default workspace and the
-    // check is a no-op here; it only rejects a foreign-workspace token in a
-    // multi-workspace deployment. Undefined (no workspace configured) means no
-    // check — the credentials path would already have failed with no workspace.
+    // Resolve THIS instance's workspace so verifyBearerAccess can bind the
+    // token's `workspaceId` claim to it (mirrors JwtStrategy). The community
+    // build is single-workspace (findFirst), so this is the default workspace
+    // and the check is a no-op here; it only rejects a foreign-workspace token
+    // in a multi-workspace deployment. Undefined (no workspace configured) means
+    // no check — the credentials path would already have failed with no
+    // workspace, and an undefined here keeps the helper a no-op rather than
+    // rejecting every token.
     const instanceWorkspace = await this.workspaceRepo.findFirst();
-    // The type-routing + revocation/disabled decision logic lives in the
-    // framework-free verifyMcpBearer helper (unit-testable without the heavy auth
-    // graph); this method only wires in the concrete TokenService + repos + the
-    // shared api-key validator.
-    return verifyMcpBearer(token, {
-      // The {ACCESS, API_KEY} allowlist enforcement lives in bindMcpBearerVerifier
-      // (a pure, testable seam) so the type set cannot silently drift.
-      verifyJwtOneOf: bindMcpBearerVerifier(this.tokenService),
+    // The revocation/disabled decision logic lives in the framework-free
+    // verifyBearerAccess helper (unit-testable without the heavy auth graph);
+    // this method only wires in the concrete TokenService + repos.
+    return verifyBearerAccess(token, {
+      // The JwtType.ACCESS enforcement lives in bindAccessJwtVerifier (a pure,
+      // testable seam) so the type literal cannot silently drift to REFRESH.
+      verifyJwt: bindAccessJwtVerifier(this.tokenService) as (
+        t: string,
+      ) => Promise<JwtPayload>,
       expectedWorkspaceId: instanceWorkspace?.id,
       findUser: (sub, workspaceId) =>
         this.userRepo.findById(sub, workspaceId),
       findActiveSession: (sessionId) =>
         this.userSessionRepo.findActiveById(sessionId),
-      // Shared with REST: a definite deny throws Unauthorized, an infra error
-      // propagates (→ 5xx). The /mcp bearer catch must preserve that distinction.
-      validateApiKey: (payload) =>
-        this.apiKeyService.validate(payload as JwtApiKeyPayload),
     });
   }
 

apps/server/test/integration/ai-chat-stream.int-spec.ts

@@ -322,21 +322,20 @@ describe('AiChatService.stream [integration]', () => {
   });
 
   /**
-   * #332 + #490 deferred tool loading, the ON path. Turn 1 starts COLD (CORE +
-   * loadTools only) and activates a deferred tool via loadTools; that activation
-   * is PERSISTED into the chat's metadata.activatedTools (#490) so the NEXT turn
-   * SEEDS from it and the tool is active from the fresh turn's FIRST step — the
-   * model never re-runs loadTools to re-activate the same tool. The unit tests
-   * only exercise pure prepareAgentStep with hand-fed Sets; this pins the real
-   * wiring end-to-end (loadTools.execute -> activatedTools -> persist -> next-turn
-   * seed -> prepareStep -> per-step activeTools) against the real streamText loop.
-   * We drive a MockLanguageModelV3 whose step 1 calls loadTools(['createPage'])
-   * and assert, via the model's recorded per-step CallOptions.tools (the AI SDK
-   * filters the provider tool list by activeTools), that the deferred tool becomes
-   * active on the SAME turn's next step AND, seeded from metadata, on the next
-   * turn's first step.
+   * #332 deferred tool loading, the ON path. The riskiest property is that the
+   * per-turn `activatedTools` Set is created FRESH inside each stream() call, so a
+   * tool a previous turn activated via loadTools is NOT still active when the next
+   * turn starts — the new turn begins "cold" (CORE + loadTools only). The unit
+   * tests only exercise pure prepareAgentStep with hand-fed Sets; this pins the
+   * real wiring end-to-end (loadTools.execute -> activatedTools -> prepareStep ->
+   * per-step activeTools) against the real streamText loop, and proves there is no
+   * cross-turn leak. We drive a MockLanguageModelV3 whose step 1 calls
+   * loadTools(['createPage']) and assert, via the model's recorded per-step
+   * CallOptions.tools (the AI SDK filters the provider tool list by activeTools),
+   * that the deferred tool becomes active on the SAME turn's next step but NOT on a
+   * fresh turn's first step.
    */
-  describe('deferred tool loading ON — cross-turn activation persistence (#332 + #490)', () => {
+  describe('deferred tool loading ON — per-turn activation, no leak (#332)', () => {
     // A stub deferred (non-core) tool the agent can activate. Its execute is never
     // called — the model only needs to SEE it become active — but it must be a
     // valid AI-SDK tool so the SDK includes it in a step's tool list once active.
@@ -452,7 +451,7 @@ describe('AiChatService.stream [integration]', () => {
       } as any);
     }
 
-    it('activates a deferred tool for the SAME turn, and a NEW turn SEEDS it from persisted chat metadata (#490)', async () => {
+    it('activates a deferred tool for the SAME turn, and a NEW turn starts cold (no leak)', async () => {
       const chatId = (await createChat(db, { workspaceId, creatorId: userId })).id;
 
       // --- Turn 1: loadTools(createPage) on step 1, then answer on step 2. ---
@@ -475,7 +474,7 @@ describe('AiChatService.stream [integration]', () => {
       // Step 2 of the SAME turn sees the just-activated deferred tool.
       expect(step2Tools).toContain('createPage');
 
-      // --- Turn 2 on the SAME chat: seeds the persisted activation (#490). ---
+      // --- Turn 2 on the SAME chat: must start cold again. ---
       const model2 = new MockLanguageModelV3({
         doStream: async () => ({ stream: successStream() }),
       } as any);
@@ -486,10 +485,9 @@ describe('AiChatService.stream [integration]', () => {
 
       const nextTurnFirstStep = toolNames(model2.doStreamCalls[0]);
       expect(nextTurnFirstStep).toContain('loadTools');
-      // #490: activation PERSISTS across turns — turn 1 wrote createPage into the
-      // chat's metadata.activatedTools, so the next turn seeds from it and the
-      // deferred tool is active from the FIRST step (no need to re-run loadTools).
-      expect(nextTurnFirstStep).toContain('createPage');
+      // The activated set is per-turn: the prior turn's createPage did NOT leak,
+      // so the fresh turn's first step sees it deferred again.
+      expect(nextTurnFirstStep).not.toContain('createPage');
     });
   });
 });

packages/mcp/src/client.ts

@@ -31,11 +31,7 @@ import { TransformsMixin, type ITransformsMixin } from "./client/transforms.js";
 // existing importer (index.ts, http.ts, stdio.ts, the in-app host) keeps working
 // with ZERO changes.
 export type { DocmostMcpConfig, SandboxPut } from "./client/context.js";
-export {
-  formatDocmostAxiosError,
-  assertFullUuid,
-  formatSpaceNotAccessible,
-} from "./client/errors.js";
+export { formatDocmostAxiosError, assertFullUuid } from "./client/errors.js";
 
 // Branded canonical page-identity type (#435): the internal page UUID is a
 // distinct nominal type so an unresolved raw/slug string can't be swapped into

packages/mcp/src/client/comments.ts

@@ -725,15 +725,10 @@ export function CommentsMixin<TBase extends GConstructor<DocmostClientContext>>(
     // The subtree scope (parentPageId given) already INCLUDES the root node
     // itself: /pages/tree seeds getPageAndDescendants with id = parentPageId, so
     // no separate getPageRaw fetch for the parent is needed.
-    // #534: the enumerateSpacePages seed (`/pages/tree`) 404s for a bad or
-    // inaccessible spaceId; wrap it so that 404 becomes an actionable "spaceId
-    // not accessible" hint instead of the opaque "Space permissions not found".
-    // Only the whole enumeration is wrapped (the only 404 source here) — see the
-    // wrap-allowlist invariant on withSpaceAccessDiagnostics.
-    const { pages: pagesInScope, truncated } =
-      await this.withSpaceAccessDiagnostics(spaceId, "checkNewComments", () =>
-        this.enumerateSpacePages(spaceId, parentPageId),
-      );
+    const { pages: pagesInScope, truncated } = await this.enumerateSpacePages(
+      spaceId,
+      parentPageId,
+    );
 
     // 2. Fetch comments for each page, keep ones created after since. Runs with
     // bounded concurrency (#490) instead of one-at-a-time — the per-page reads are

packages/mcp/src/client/context.ts

@@ -26,10 +26,7 @@ import {
 import { withPageLock, isUuid } from "../lib/page-lock.js";
 import type { PageId } from "../lib/page-id.js";
 import { getCollabToken, performLogin } from "../lib/auth-utils.js";
-import {
-  formatDocmostAxiosError,
-  formatSpaceNotAccessible,
-} from "./errors.js";
+import { formatDocmostAxiosError } from "./errors.js";
 import { GetPageConversionCache } from "./getpage-cache.js";
 
 // A generic mixin base constructor (issue #450). Each domain mixin is a factory
@@ -120,36 +117,6 @@ function readCollabTokenTtlMs(): number {
   return Number.isFinite(raw) ? Math.max(0, raw) : 5 * 60 * 1000;
 }
 
-/**
- * Accessible-space index cache TTL in milliseconds (issue #534). Read fresh from
- * the environment on every access — mirroring readCollabTokenTtlMs above — so a
- * test or a live rollback can change it without reloading the module.
- *
- * The index (see getAccessibleSpaceIndex) is fetched ONLY on the enrich-on-404
- * slow path to turn an opaque "Space permissions not found" 404 into a factual
- * "spaceId X is not among your accessible spaces" hint; a short TTL keeps a burst
- * of failing tool calls from re-sweeping /spaces each time while never widening
- * the permission-staleness window meaningfully. Default 60s. An EXPLICIT 0 (or
- * negative) DISABLES the cache (exact fetch-per-enrichment). Unset/unparseable
- * (NaN) falls back to the 60s default with the cache ON.
- */
-function readSpacesCacheTtlMs(): number {
-  const raw = parseInt(process.env.MCP_SPACES_CACHE_TTL_MS ?? "", 10);
-  return Number.isFinite(raw) ? Math.max(0, raw) : 60000;
-}
-
-/**
- * The set of spaces the current token can see, plus a `complete` flag that is
- * false when the /spaces listing was truncated at the pagination ceiling. Used
- * by the enrich-on-404 diagnostics: an authoritative membership test is only
- * possible when `complete` is true (see withSpaceAccessDiagnostics).
- */
-export type AccessibleSpaceIndex = {
-  ids: Set<string>;
-  spaces: { id: string; name: string }[];
-  complete: boolean;
-};
-
 export abstract class DocmostClientContext {
   protected client: AxiosInstance;
   protected token: string | null = null;
@@ -197,27 +164,6 @@ export abstract class DocmostClientContext {
   // bypassed on a forced refresh (the 401/403 reauth path). null = no token yet.
   protected collabTokenCache: { token: string; mintedAt: number } | null = null;
 
-  // Accessible-space index cache + single-flight (issue #534). TWO separate
-  // fields, mirroring loginPromise (in-flight dedup) vs collabTokenCache
-  // (persistent value):
-  //   - spaceIndexCache: the last SUCCESSFULLY-FETCHED, COMPLETE index plus the
-  //     wall-clock time it was fetched. Written ONLY from a resolved /spaces
-  //     sweep whose result was complete (a truncated list is never cached, since
-  //     it cannot answer "is this spaceId missing?"). Per-instance (a
-  //     DocmostClient is built per user / per chat) so it can never leak across
-  //     identities; invalidated on every identity change exactly like
-  //     collabTokenCache (login() + the 401/403 reauth interceptor).
-  //   - spaceIndexInFlight: dedups concurrent enrich-on-404 fetches into ONE
-  //     /spaces sweep. CRITICAL INVARIANT: this promise is nulled in `.finally`
-  //     on BOTH resolve AND reject — a rejected/settled promise is NEVER
-  //     memoized, so a transient /spaces blip during one failed tool call cannot
-  //     poison the diagnostics for the rest of the session.
-  protected spaceIndexCache: {
-    index: AccessibleSpaceIndex;
-    fetchedAt: number;
-  } | null = null;
-  protected spaceIndexInFlight: Promise<AccessibleSpaceIndex> | null = null;
-
   // Content-addressed conversion cache for getPage (issue #479). Keyed on
   // (canonical pageId, updatedAt, optionsHash) -> the converted Markdown, so a
   // re-read of an UNCHANGED page skips the expensive convertProseMirrorToMarkdown
@@ -335,9 +281,6 @@ export abstract class DocmostClientContext {
           // keep serving a collab token minted under the old one.
           this.token = null;
           this.collabTokenCache = null;
-          // #534: a new identity/login must not keep serving a space index
-          // computed under the old token (same reasoning as collabTokenCache).
-          this.spaceIndexCache = null;
           delete this.client.defaults.headers.common["Authorization"];
           try {
             await this.login();
@@ -470,8 +413,6 @@ export abstract class DocmostClientContext {
           // Identity (re)established: drop any collab token minted under a
           // previous identity so the #435 cache can never outlive it.
           this.collabTokenCache = null;
-          // #534: likewise drop the accessible-space index of the old identity.
-          this.spaceIndexCache = null;
           this.client.defaults.headers.common["Authorization"] =
             `Bearer ${token}`;
         })
@@ -689,34 +630,13 @@ export abstract class DocmostClientContext {
   }
 
   /**
-   * Generic pagination handler for Docmost API endpoints. Thin wrapper over
-   * paginateAllWithMeta that discards the `truncated` flag — the historical
-   * contract every caller (getSpaces, etc.) relies on. Callers that need to KNOW
-   * whether the result set was complete (e.g. #534's getAccessibleSpaceIndex,
-   * which must not assert "spaceId missing" against a truncated list) call
-   * paginateAllWithMeta directly.
+   * Generic pagination handler for Docmost API endpoints
    */
   async paginateAll<T = any>(
     endpoint: string,
     basePayload: Record<string, any> = {},
     limit: number = 100,
   ): Promise<T[]> {
-    return (await this.paginateAllWithMeta<T>(endpoint, basePayload, limit))
-      .items;
-  }
-
-  /**
-   * Generic pagination handler that ALSO surfaces whether the result was
-   * truncated at the MAX_PAGES ceiling. `paginateAll` swallows this flag (it only
-   * warns); callers that must distinguish "complete listing" from "gave up at the
-   * cap" use this overload. `truncated` is true iff the loop stopped at the
-   * ceiling while the server still reported more pages.
-   */
-  async paginateAllWithMeta<T = any>(
-    endpoint: string,
-    basePayload: Record<string, any> = {},
-    limit: number = 100,
-  ): Promise<{ items: T[]; truncated: boolean }> {
     await this.ensureAuthenticated();
 
     const clampedLimit = Math.max(1, Math.min(100, limit));
@@ -777,137 +697,7 @@ export abstract class DocmostClientContext {
       );
     }
 
-    return { items: allItems, truncated };
-  }
-
-  /**
-   * The set of spaces the current token can access (issue #534), fetched from the
-   * single source of truth — the `/spaces` listing — with a per-instance
-   * short-TTL cache and single-flight dedup. Used ONLY by the enrich-on-404 slow
-   * path (withSpaceAccessDiagnostics), so the happy path incurs ZERO extra
-   * requests.
-   *
-   * `complete` is `!truncated`: it is false when the /spaces listing was cut at
-   * the pagination ceiling. A truncated index can never authoritatively answer
-   * "is this spaceId missing?", so only a complete result is cached AND only a
-   * complete result is allowed to drive the "not accessible" rewrite.
-   *
-   * Cache/single-flight discipline (see the spaceIndexCache / spaceIndexInFlight
-   * field docs):
-   *   - serve a fresh, complete cached index without any request;
-   *   - otherwise collapse concurrent callers onto ONE in-flight /spaces sweep;
-   *   - write the persistent cache ONLY from a resolved, complete fetch;
-   *   - null the in-flight promise on BOTH resolve and reject (never memoize a
-   *     rejected promise — a transient /spaces failure must be retried fresh).
-   */
-  async getAccessibleSpaceIndex(): Promise<AccessibleSpaceIndex> {
-    const ttl = readSpacesCacheTtlMs();
-
-    // Fast path: a still-fresh, complete cached index needs no request at all.
-    if (
-      ttl > 0 &&
-      this.spaceIndexCache &&
-      Date.now() - this.spaceIndexCache.fetchedAt < ttl
-    ) {
-      return this.spaceIndexCache.index;
-    }
-
-    // Single-flight: a concurrent enrichment joins the in-flight sweep instead of
-    // issuing its own. (A settled/rejected promise is never left here — see the
-    // `.finally` below — so this only ever joins a genuinely in-progress fetch.)
-    if (this.spaceIndexInFlight) return this.spaceIndexInFlight;
-
-    const fetchPromise = (async (): Promise<AccessibleSpaceIndex> => {
-      const { items, truncated } = await this.paginateAllWithMeta("/spaces", {});
-      const spaces = items.map((s: any) => ({
-        id: s?.id,
-        name: s?.name,
-      }));
-      return {
-        ids: new Set(spaces.map((s) => s.id)),
-        spaces,
-        complete: !truncated,
-      };
-    })();
-
-    this.spaceIndexInFlight = fetchPromise
-      .then((index) => {
-        // Cache ONLY a complete result, and only while the cache is enabled.
-        if (ttl > 0 && index.complete) {
-          this.spaceIndexCache = { index, fetchedAt: Date.now() };
-        }
-        return index;
-      })
-      .finally(() => {
-        // CRITICAL (#534): clear the in-flight slot on BOTH resolve and reject.
-        // Nulling on reject too means a transient /spaces error is retried by the
-        // NEXT enrichment with a fresh fetch, never re-serving the rejection.
-        this.spaceIndexInFlight = null;
-      });
-
-    return this.spaceIndexInFlight;
-  }
-
-  /**
-   * Wrap a client method whose 404 means "the supplied spaceId is not accessible"
-   * and, ONLY on that 404, replace the opaque server text ("Space permissions not
-   * found") with a factual, actionable message naming the spaceId and the spaces
-   * the token can actually see (issue #534). A HINT layered on top of the
-   * backend, which stays authoritative — so it FAILS OPEN on ANY uncertainty:
-   * every branch below that is not a confident "this spaceId is genuinely
-   * missing" rethrows the ORIGINAL server error unchanged. The happy path returns
-   * fn()'s value with zero extra requests.
-   *
-   * WRAP-ALLOWLIST INVARIANT (load-bearing — read before wrapping a new method):
-   * among the currently wrapped tools a 404 comes ONLY from the spaceId
-   * membership / space-permissions check — their pageId / rootPageId /
-   * parentPageId branches resolve to 403 or 200, NEVER 404. If a future change
-   * adds a `NotFoundException` to `/pages/tree`, `/pages/recent`,
-   * `/pages/sidebar-pages` or `/search` (e.g. "page not found"), this enrichment
-   * would MISATTRIBUTE that 404 to the spaceId. Re-audit the wrapped call before
-   * relying on this, and only wrap paths where the sole 404 cause is the space.
-   */
-  protected async withSpaceAccessDiagnostics<T>(
-    spaceId: string,
-    mcpName: string,
-    fn: () => Promise<T>,
-  ): Promise<T> {
-    try {
-      return await fn();
-    } catch (e) {
-      // Abort/cap wins FIRST and is detected by the SIGNAL FLAG, not e.name: a
-      // per-call cap may be an AbortSignal.timeout() (reason name "TimeoutError")
-      // or a custom reason, so `e.name === 'AbortError'` is NOT reliable (#534
-      // hole B). A stopped/capped turn must propagate its reason, never trigger a
-      // /spaces sweep or a rewrite.
-      if (this.toolAbortSignal?.aborted) throw e;
-
-      // Only a 404 is enrichable; any other status/shape is a different failure.
-      if (!(axios.isAxiosError(e) && e.response?.status === 404)) throw e;
-
-      let idx: AccessibleSpaceIndex;
-      try {
-        idx = await this.getAccessibleSpaceIndex();
-      } catch (fetchErr) {
-        // The /spaces sweep itself failed. If we were aborted mid-sweep,
-        // propagate the abort reason; otherwise FAIL OPEN with the ORIGINAL
-        // server error rather than a misleading "not found".
-        if (this.toolAbortSignal?.aborted) throw fetchErr;
-        if (process.env.DEBUG) {
-          console.error("space-diag: /spaces fetch failed:", fetchErr);
-        }
-        throw e;
-      }
-
-      // Fail open when the listing is incomplete (can't assert "missing") or when
-      // the spaceId IS present (the 404 is about something else, not the space).
-      if (!idx.complete) throw e;
-      if (idx.ids.has(spaceId)) throw e;
-
-      // Confident: the spaceId is well-formed but not among the accessible
-      // spaces. Replace the opaque server text with the actionable fact.
-      throw new Error(formatSpaceNotAccessible(mcpName, spaceId, idx.spaces));
-    }
+    return allItems;
   }
 
 

packages/mcp/src/client/errors.ts

@@ -46,60 +46,6 @@ export function assertFullUuid(
   }
 }
 
-// Max number of accessible spaces to enumerate inline in the "space not
-// accessible" message (issue #534) before collapsing the rest into a "(+N ещё)"
-// tail, so a workspace with many spaces cannot blow up the model context.
-const SPACE_LIST_CAP = 10;
-
-/**
- * Compose the model-facing "spaceId is not accessible" message (issue #534).
- * This is FACT text about the supplied spaceId that REPLACES the opaque server
- * string ("Space permissions not found") on the enrich-on-404 path — it names
- * the exact bad id, lists the spaces the token can actually see (id + name, so
- * the agent can copy the right id verbatim), and points at `listSpaces`.
- *
- * Deliberately Russian: like the other agent-facing tool guidance in this repo,
- * this is the message the acting agent reads to self-correct.
- */
-export function formatSpaceNotAccessible(
-  mcpName: string,
-  spaceId: string,
-  spaces: { id: string; name: string }[],
-): string {
-  // No accessible spaces at all — a distinct diagnosis (token has no space
-  // access), not "you picked the wrong one from this list".
-  if (!Array.isArray(spaces) || spaces.length === 0) {
-    return `${mcpName}: spaceId "${spaceId}" недоступен, и доступных тебе спейсов нет — проверь доступ токена / вызови listSpaces.`;
-  }
-
-  const shown = spaces.slice(0, SPACE_LIST_CAP);
-  const remaining = spaces.length - shown.length;
-  const tail =
-    remaining > 0 ? ` (+${remaining} ещё, см. listSpaces)` : "";
-
-  // Cap the whole message at ERROR_MESSAGE_CAP (same budget as
-  // formatDocmostAxiosError) so ~10 long space names cannot blow up the model
-  // context. Truncate ONLY the interpolated space LIST — the fixed prefix (which
-  // carries the bad spaceId) and the fixed suffix (the "…из listSpaces"
-  // instruction) are always kept intact, so the actionable parts survive even
-  // when the list is trimmed.
-  const prefix = `${mcpName}: spaceId "${spaceId}" не найден среди доступных тебе спейсов. Доступные: `;
-  const suffix = ` — скопируй нужный id дословно из listSpaces.`;
-  let listed = shown.map((s) => `${s.id} (${s.name})`).join(", ") + tail;
-  const budget = ERROR_MESSAGE_CAP - prefix.length - suffix.length;
-  if (listed.length > budget) {
-    listed = listed.slice(0, Math.max(0, budget - 1)) + "…";
-  }
-  const message = `${prefix}${listed}${suffix}`;
-  // Unconditional final backstop (mirrors formatDocmostAxiosError): the list
-  // cap above assumes a well-formed prefix, but a pathologically long
-  // agent-supplied spaceId lives in the prefix and would otherwise blow past the
-  // budget. Cap the WHOLE message so nothing bloats the model context.
-  return message.length > ERROR_MESSAGE_CAP
-    ? message.slice(0, ERROR_MESSAGE_CAP - 1) + "…"
-    : message;
-}
-
 // Keep ONLY the pathname of a request (no host, no query string, no fragment)
 // so the message never leaks a host or query params. Resolves a relative
 // config.url against config.baseURL, then discards everything but the path.

packages/mcp/src/client/read.ts

@@ -132,29 +132,17 @@ export function ReadMixin<TBase extends GConstructor<DocmostClientContext>>(Base
       // BFS hit its node cap) had no way to know pages were missing. Return the
       // tree alongside the flag; the primary /pages/tree path is uncapped so this
       // is false there.
-      // #534: spaceId is required here; wrap so a bad-spaceId 404 (from the
-      // /pages/tree seed inside enumerateSpacePages) becomes an actionable hint.
-      return this.withSpaceAccessDiagnostics(spaceId, "listPages", async () => {
-        const { pages, truncated } = await this.enumerateSpacePages(spaceId);
-        return { tree: buildPageTree(pages), truncated };
-      });
+      const { pages, truncated } = await this.enumerateSpacePages(spaceId);
+      return { tree: buildPageTree(pages), truncated };
     }
 
     const clampedLimit = Math.max(1, Math.min(100, limit));
     const payload: Record<string, any> = { limit: clampedLimit, page: 1 };
     if (spaceId) payload.spaceId = spaceId;
-    // #534: only the WITH-spaceId recent path can 404 on space access; wrap it so
-    // that 404 is rewritten. Without a spaceId there is no space to diagnose, so
-    // the wrapper is inert (run the request directly).
-    const runRecent = async () => {
-      const response = await this.client.post("/pages/recent", payload);
-      const data = response.data;
-      const items = data.data?.items || data.items || [];
-      return items.map((page: any) => filterPage(page));
-    };
-    return spaceId
-      ? this.withSpaceAccessDiagnostics(spaceId, "listPages", runRecent)
-      : runRecent();
+    const response = await this.client.post("/pages/recent", payload);
+    const data = response.data;
+    const items = data.data?.items || data.items || [];
+    return items.map((page: any) => filterPage(page));
   }
 
   /**
@@ -186,16 +174,8 @@ export function ReadMixin<TBase extends GConstructor<DocmostClientContext>>(Base
         "getTree: spaceId is required (a page tree is scoped to one space).",
       );
     }
-    // #534: the 404 for a bad/inaccessible spaceId surfaces from the
-    // `/pages/tree` seeding step inside enumerateSpacePages (which is NOT in a
-    // try/catch of its own for that case) — wrap the whole body so it is caught
-    // and rewritten into an actionable "spaceId not accessible" message. Only the
-    // space membership check can 404 here (rootPageId 403/200), see the
-    // wrap-allowlist invariant on withSpaceAccessDiagnostics.
-    return this.withSpaceAccessDiagnostics(spaceId, "getTree", async () => {
-      const { pages } = await this.enumerateSpacePages(spaceId, rootPageId);
-      return buildPageTree(pages, { shape: "getTree", maxDepth });
-    });
+    const { pages } = await this.enumerateSpacePages(spaceId, rootPageId);
+    return buildPageTree(pages, { shape: "getTree", maxDepth });
   }
 
   /**
@@ -720,27 +700,17 @@ export function ReadMixin<TBase extends GConstructor<DocmostClientContext>>(Base
     if (limit !== undefined) {
       payload.limit = Math.max(1, Math.min(50, limit));
     }
+    const response = await this.client.post("/search", payload);
 
-    const runSearch = async () => {
-      const response = await this.client.post("/search", payload);
+    // Normalize both response shapes: bare array and paginated { items: [...] }
+    const data = response.data?.data;
+    const items = Array.isArray(data) ? data : data?.items || [];
+    const filteredItems = items.map((item: any) => filterSearchResult(item));
 
-      // Normalize both response shapes: bare array and paginated { items: [...] }
-      const data = response.data?.data;
-      const items = Array.isArray(data) ? data : data?.items || [];
-      const filteredItems = items.map((item: any) => filterSearchResult(item));
-
-      return {
-        items: filteredItems,
-        success: response.data?.success || false,
-      };
+    return {
+      items: filteredItems,
+      success: response.data?.success || false,
     };
-
-    // #534: a search scoped to a spaceId 404s when that space is inaccessible;
-    // wrap only that case so the 404 becomes an actionable hint. A workspace-wide
-    // search (no spaceId) has no space to diagnose — run it directly (inert).
-    return spaceId
-      ? this.withSpaceAccessDiagnostics(spaceId, "search", runSearch)
-      : runSearch();
   }
 
   }

packages/mcp/src/lib/drawio-xml.ts

@@ -178,11 +178,10 @@ function sliceModel(xml: string): string | null {
 // --- decode chain ----------------------------------------------------------
 
 /**
- * Read the `content=` attribute out of a `.drawio.svg` string. Docmost writes
- * the mxfile XML entity-encoded there (buildDrawioSvg / createDrawioSvg), which
- * is also how draw.io's own SVG export stores it; older attachments stored a
- * base64 payload instead. The DOM decodes entities for us, so the caller only
- * has to distinguish "starts with '<'" (raw XML) from base64.
+ * Read the `content=` attribute out of a `.drawio.svg` string. Docmost stores a
+ * base64 payload there (createDrawioSvg); draw.io's own SVG export may store the
+ * XML entity-encoded instead. The DOM decodes entities for us, so the caller
+ * only has to distinguish "starts with '<'" (raw XML) from base64.
  */
 export function extractContentAttr(svg: string): string {
   const { doc, error } = parseXml(svg);
@@ -196,23 +195,12 @@ export function extractContentAttr(svg: string): string {
   // value itself never contains a double-quote (base64 / entity-encoded XML).
   const m = /content="([^"]*)"/.exec(svg);
   if (m) {
-    // Decode the handful of XML entities a raw regex would leave encoded. The
-    // numeric char-refs for tab/newline/CR MUST be decoded here too: the DOM
-    // path above turns them back into the literal control chars, so this
-    // regex fallback has to agree or the two decode paths diverge (#507).
-    // `&amp;` is decoded last so an escaped `&amp;#x9;` reads back as the
-    // literal text `&#x9;`, not a tab.
+    // Decode the handful of XML entities a raw regex would leave encoded.
     return m[1]
       .replace(/&lt;/g, "<")
       .replace(/&gt;/g, ">")
       .replace(/&quot;/g, '"')
       .replace(/&#39;/g, "'")
-      .replace(/&#x9;/gi, "\t")
-      .replace(/&#9;/g, "\t")
-      .replace(/&#xa;/gi, "\n")
-      .replace(/&#10;/g, "\n")
-      .replace(/&#xd;/gi, "\r")
-      .replace(/&#13;/g, "\r")
       .replace(/&amp;/g, "&");
   }
   throw new Error("drawio: SVG has no content= attribute to decode");
@@ -319,16 +307,9 @@ export function encodeDrawioFile(modelXml: string, title = "Page-1"): string {
 /**
  * Build the `diagram.drawio.svg` attachment. Mirrors the import service's
  * createDrawioSvg contract exactly:
- *   <svg xmlns=… xmlns:xlink=… content="${xmlEscape(drawioFile)}">${inner}</svg>
+ *   <svg xmlns=… xmlns:xlink=… content="${base64(drawioFile)}">${inner}</svg>
  * plus width/height/viewBox from the diagram bounding box and the schematic
  * preview as the visible children (`inner`).
- *
- * The `content=` value is the mxfile XML XML-entity-escaped (draw.io's own
- * native form), NOT base64. draw.io's editor decodes a base64 content= via
- * Latin-1 atob (no UTF-8 step), turning every non-ASCII char (e.g. Cyrillic,
- * ё, —) into mojibake; the entity-encoded form is decoded by the DOM as UTF-8
- * and opens intact. Our decoder (decodeDrawioSvg) reads both forms, so old
- * base64 attachments still round-trip.
  */
 export function buildDrawioSvg(
   modelXml: string,
@@ -337,14 +318,14 @@ export function buildDrawioSvg(
   title = "Page-1",
 ): string {
   const file = encodeDrawioFile(modelXml, title);
-  const content = xmlEscape(file);
+  const base64 = Buffer.from(file, "utf-8").toString("base64");
   const w = Math.max(1, Math.round(bbox.width));
   const h = Math.max(1, Math.round(bbox.height));
   return (
     `<svg xmlns="http://www.w3.org/2000/svg" ` +
     `xmlns:xlink="http://www.w3.org/1999/xlink" ` +
     `width="${w}" height="${h}" viewBox="0 0 ${w} ${h}" ` +
-    `content="${content}">${inner}</svg>`
+    `content="${base64}">${inner}</svg>`
   );
 }
 
@@ -353,15 +334,7 @@ function xmlEscape(s: string): string {
     .replace(/&/g, "&amp;")
     .replace(/</g, "&lt;")
     .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    // A literal tab/newline/CR inside an attribute value is collapsed to a
-    // single space by XML attribute-value normalization on DOM read (both jsdom
-    // here and the real draw.io editor), silently flattening multi-line labels
-    // and tab-bearing values. Numeric char-refs survive that normalization, so
-    // emit them the way draw.io's own native export does (#507).
-    .replace(/\t/g, "&#x9;")
-    .replace(/\n/g, "&#xa;")
-    .replace(/\r/g, "&#xd;");
+    .replace(/"/g, "&quot;");
 }
 
 // --- normalization + hash --------------------------------------------------

packages/mcp/test/unit/drawio-xml.test.mjs

@@ -51,14 +51,6 @@ const hasRule = (issues, rule, cellId) =>
     (i) => i.rule === rule && (cellId === undefined || i.cellId === cellId),
   );
 
-// Reverse the attribute-value XML escaping used in the `content=` payload.
-const unescapeAttr = (s) =>
-  s
-    .replace(/&lt;/g, "<")
-    .replace(/&gt;/g, ">")
-    .replace(/&quot;/g, '"')
-    .replace(/&amp;/g, "&");
-
 // --- style parsing ---------------------------------------------------------
 
 test("parseStyle: base stylename + key=value pairs", () => {
@@ -343,20 +335,16 @@ test("encode/build: a title with < > \" & round-trips without corrupting the SVG
 
   // The outer content="..." attribute must not be broken by the title: the raw
   // title metacharacters never appear literally in the SVG markup (they are
-  // entity-escaped inside content=, doubly so where the file XML already escaped
-  // them inside name="...").
+  // base64-encoded inside content=, and escaped inside the file XML).
   const contentMatch = /content="([^"]*)"/.exec(svg);
   assert.ok(contentMatch, "SVG has a single well-formed content= attribute");
 
   // The diagram model still decodes losslessly despite the exotic title.
   assert.equal(decodeDrawioSvg(svg), model);
 
-  // content= is now entity-encoded XML (draw.io's native form), never base64.
-  assert.match(contentMatch[1], /^&lt;mxfile/);
-
   // The file XML is well-formed: the title lives in name="..." as escaped
   // entities, so unescaping recovers the original title byte-for-byte.
-  const fileXml = unescapeAttr(contentMatch[1]);
+  const fileXml = Buffer.from(contentMatch[1], "base64").toString("utf-8");
   const nameMatch = /<diagram id="[^"]*" name="([^"]*)">/.exec(fileXml);
   assert.ok(nameMatch, "the diagram name attribute is intact and quote-safe");
   const decodedTitle = nameMatch[1]
@@ -370,112 +358,3 @@ test("encode/build: a title with < > \" & round-trips without corrupting the SVG
   const file = encodeDrawioFile(model, title);
   assert.match(file, /name="A &lt; B &gt; C &quot; D &amp; E">/);
 });
-
-// --- #507: content= is entity-encoded XML, never base64 --------------------
-
-// A model whose cell values carry Cyrillic, ё and an em dash — exactly the
-// characters draw.io's Latin-1 atob mangles when content= is base64.
-const CYRILLIC_MODEL =
-  "<mxGraphModel><root>" +
-  '<mxCell id="0"/><mxCell id="1" parent="0"/>' +
-  '<mxCell id="2" value="Старт-бит — ёж" style="rounded=1;html=1;" vertex="1" parent="1">' +
-  '<mxGeometry x="100" y="100" width="120" height="60" as="geometry"/></mxCell>' +
-  "</root></mxGraphModel>";
-
-test("#507: buildDrawioSvg writes content= as entity-encoded XML (not base64)", () => {
-  const model = normalizeXml(CYRILLIC_MODEL);
-  const svg = buildDrawioSvg(model, "<g/>", { width: 200, height: 120 }, "Диаграмма");
-
-  const contentMatch = /content="([^"]*)"/.exec(svg);
-  assert.ok(contentMatch, "SVG has a single well-formed content= attribute");
-  const content = contentMatch[1];
-
-  // The content= value is the entity-encoded mxfile XML — starts with `&lt;mxfile`.
-  assert.match(content, /^&lt;mxfile/, "content= is entity-encoded mxfile XML");
-  // It must NOT be a base64 blob: base64 has no XML entities and no literal `<`.
-  assert.ok(content.includes("&lt;"), "content= carries XML entities, not base64");
-
-  // Cyrillic / ё / — survive verbatim in the attribute (raw UTF-8, not atob-mangled).
-  assert.ok(content.includes("Старт-бит — ёж"), "non-ASCII value is raw UTF-8 in content=");
-  assert.ok(content.includes("Диаграмма"), "non-ASCII title is raw UTF-8 in content=");
-  // The mojibake that base64+atob would have produced must be absent.
-  assert.ok(!content.includes("Ð"), "no Latin-1 mojibake in content=");
-});
-
-test("#507: Cyrillic model round-trips byte-stable through buildDrawioSvg -> decodeDrawioSvg", () => {
-  const model = normalizeXml(CYRILLIC_MODEL);
-  const svg = buildDrawioSvg(model, "<g/>", { width: 200, height: 120 }, "Заголовок — ё");
-  assert.equal(decodeDrawioSvg(svg), model);
-});
-
-test("#507 back-compat: an OLD base64-form .drawio.svg still decodes losslessly", () => {
-  const model = normalizeXml(CYRILLIC_MODEL);
-  // Reproduce the pre-fix write path: encodeDrawioFile -> base64 in content=.
-  const file = encodeDrawioFile(model, "Старая диаграмма");
-  const base64 = Buffer.from(file, "utf-8").toString("base64");
-  const svg =
-    `<svg xmlns="http://www.w3.org/2000/svg" content="${base64}"><g/></svg>`;
-  // No XML entities, purely base64 alphabet — this is the legacy form.
-  assert.ok(!base64.includes("<") && !base64.includes("&"));
-  assert.equal(decodeDrawioSvg(svg), model);
-});
-
-test("#507 negative: non-ASCII in a cell value AND in the title round-trip clean", () => {
-  const model = normalizeXml(CYRILLIC_MODEL);
-  const title = "Тест — ёмкость № 5";
-  const svg = buildDrawioSvg(model, "<g/>", { width: 200, height: 120 }, title);
-
-  // Model recovered byte-for-byte.
-  assert.equal(decodeDrawioSvg(svg), model);
-
-  // Title lands in the <diagram name="..."> of the decoded file XML, intact.
-  const content = /content="([^"]*)"/.exec(svg)[1];
-  const fileXml = unescapeAttr(content);
-  const nameMatch = /<diagram id="[^"]*" name="([^"]*)">/.exec(fileXml);
-  assert.ok(nameMatch, "diagram name attribute present");
-  assert.equal(unescapeAttr(nameMatch[1]), title);
-});
-
-// --- #507 F1: literal tab/newline/CR in an attribute value survive the
-// content= round-trip. The whole mxfile XML lives in one content="..." attr;
-// XML attribute-value normalization collapses a LITERAL tab/newline/CR to a
-// single space on DOM read, so the escape must emit numeric char-refs instead.
-const CTRL_MODEL =
-  "<mxGraphModel><root>" +
-  '<mxCell id="0"/><mxCell id="1" parent="0"/>' +
-  '<mxCell id="2" value="col1\tcol2" style="html=1;\nshadow=0" vertex="1" parent="1">' +
-  '<mxGeometry x="10" y="10" width="120" height="60" as="geometry"/></mxCell>' +
-  '<mxCell id="3" value="Line1\nLine2\rLine3" vertex="1" parent="1">' +
-  '<mxGeometry x="10" y="100" width="120" height="60" as="geometry"/></mxCell>' +
-  "</root></mxGraphModel>";
-
-test("#507 F1: literal tab/newline/CR in a value round-trip byte-stable (DOM decode)", () => {
-  const svg = buildDrawioSvg(CTRL_MODEL, "<g/>", { width: 200, height: 200 });
-  const content = /content="([^"]*)"/.exec(svg)[1];
-  // The tab/newline/CR must be emitted as numeric char-refs, never as literal
-  // control chars (which DOM attribute-value normalization would eat).
-  assert.ok(
-    !/[\t\n\r]/.test(content),
-    "no literal tab/newline/CR survive in the content= attribute",
-  );
-  assert.ok(
-    content.includes("&#x9;") &&
-      content.includes("&#xa;") &&
-      content.includes("&#xd;"),
-    "tab/newline/CR are emitted as numeric char-refs",
-  );
-  // Full DOM decode recovers the model byte-for-byte, control chars intact.
-  assert.equal(decodeDrawioSvg(svg), CTRL_MODEL);
-});
-
-test("#507 F1: regex fallback decodes tab/newline/CR char-refs (agrees with DOM path)", () => {
-  const svg = buildDrawioSvg(CTRL_MODEL, "<g/>", { width: 200, height: 200 });
-  const content = /content="([^"]*)"/.exec(svg)[1];
-  // A bare `&` makes the SVG wrapper malformed, forcing extractContentAttr onto
-  // its regex fallback branch. That branch must decode the tab/newline/CR
-  // char-refs exactly like the DOM path, or the two decoders diverge.
-  const malformedSvg = `<svg content="${content}">&</svg>`;
-  assert.equal(decodeDrawioSvg(malformedSvg), CTRL_MODEL);
-  // The well-formed (DOM) path yields the identical result.
-  assert.equal(decodeDrawioSvg(svg), CTRL_MODEL);
-});

packages/mcp/test/unit/space-access-diagnostics.test.mjs

@@ -1,423 +0,0 @@
-// Issue #534: enrich-on-404 space-access diagnostics.
-//
-// When a tool is handed a well-formed but non-existent/inaccessible spaceId, the
-// server answers the space-permissions check with an opaque 404 ("Space
-// permissions not found"). The client wrapper (withSpaceAccessDiagnostics) turns
-// ONLY that 404 into an actionable message naming the bad spaceId and the spaces
-// the token can actually see — while FAILING OPEN (rethrowing the original
-// server error unchanged) on every source of uncertainty.
-//
-// These tests drive the assembled DocmostClient with its inner seams
-// (enumerateSpacePages / client.post / paginateAllWithMeta) stubbed at runtime,
-// mirroring the stub-client style of error-diagnostics.test.mjs. Only criterion
-// 9 (createPage is NOT wrapped) uses a real offline http server, because
-// createPage's 404 arrives over a bare-axios multipart path.
-import { test, after } from "node:test";
-import assert from "node:assert/strict";
-import http from "node:http";
-import axios, { AxiosError } from "axios";
-import {
-  DocmostClient,
-  formatSpaceNotAccessible,
-} from "../../build/client.js";
-
-// Two accessible spaces (id + name is all getAccessibleSpaceIndex maps/uses).
-const SPACES = [
-  { id: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa", name: "Engineering" },
-  { id: "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb", name: "Design" },
-];
-// A well-formed UUID that is NOT among the accessible spaces.
-const BAD = "99999999-9999-4999-8999-999999999999";
-
-// Build an AxiosError shaped exactly as the response interceptor would hand it
-// on a 404 — status readable, axios.isAxiosError() true.
-function makeAxiosErr(status, url = "/pages/tree", message = "boom") {
-  const config = { method: "post", url, baseURL: "http://host.example/api" };
-  const response = {
-    status,
-    statusText: String(status),
-    data: { message },
-    headers: {},
-    config,
-  };
-  return new AxiosError(
-    `Request failed with status code ${status}`,
-    "ERR_BAD_REQUEST",
-    config,
-    {},
-    response,
-  );
-}
-function make404(url = "/pages/tree") {
-  return makeAxiosErr(404, url, "Space permissions not found");
-}
-
-// A client whose token is pre-set (so ensureAuthenticated never hits the
-// network) and whose /spaces sweep is a counted stub. Individual tests override
-// enumerateSpacePages / client.post to shape the method-under-test's outcome.
-function makeClient({ spaces = SPACES, truncated = false } = {}) {
-  const c = new DocmostClient("http://127.0.0.1:1/api", "u@example.com", "pw");
-  c.token = "t";
-  c.client.defaults.headers.common["Authorization"] = "Bearer t";
-  c._spacesFetches = 0;
-  c.paginateAllWithMeta = async (endpoint) => {
-    if (endpoint === "/spaces") {
-      c._spacesFetches++;
-      return { items: spaces, truncated };
-    }
-    throw new Error(`unexpected paginate endpoint ${endpoint}`);
-  };
-  return c;
-}
-
-// --- Criterion 1: bad spaceId on getTree -> actionable rewrite --------------
-test("getTree with a non-existent spaceId is rewritten into an actionable hint", async () => {
-  const c = makeClient();
-  c.enumerateSpacePages = async () => {
-    throw make404();
-  };
-
-  await assert.rejects(
-    () => c.getTree(BAD),
-    (e) => {
-      assert.ok(e.message.includes(BAD), "names the passed spaceId");
-      // At least one valid "id (name)" pair.
-      assert.ok(
-        e.message.includes(`${SPACES[0].id} (${SPACES[0].name})`),
-        "lists an accessible id (name)",
-      );
-      assert.ok(e.message.includes("listSpaces"), "points at listSpaces");
-      assert.ok(
-        !e.message.includes("Space permissions not found"),
-        "the opaque server text is replaced",
-      );
-      return true;
-    },
-  );
-  assert.equal(c._spacesFetches, 1, "one /spaces sweep on the enrichment path");
-});
-
-// --- Criterion 2: happy path -> no /spaces request --------------------------
-test("getTree with a valid spaceId returns the tree and makes NO /spaces request", async () => {
-  const c = makeClient();
-  // Spy client.post to prove no /spaces POST is issued on the happy path.
-  const posted = [];
-  c.client.post = async (url) => {
-    posted.push(url);
-    throw new Error(`unexpected post ${url}`);
-  };
-  c.enumerateSpacePages = async () => ({ pages: [], truncated: false });
-
-  const res = await c.getTree(SPACES[0].id);
-  assert.ok(Array.isArray(res), "tree returned as before");
-  assert.equal(c._spacesFetches, 0, "no /spaces sweep on the happy path");
-  assert.ok(
-    !posted.includes("/spaces"),
-    "no /spaces POST on the happy path",
-  );
-});
-
-// --- Criterion 3: short-TTL cache + refetch after expiry --------------------
-test("two bad getTree within TTL share ONE /spaces fetch; a refetch happens after TTL", async () => {
-  const c = makeClient();
-  c.enumerateSpacePages = async () => {
-    throw make404();
-  };
-
-  await assert.rejects(() => c.getTree(BAD), /не найден среди/);
-  await assert.rejects(() => c.getTree(BAD), /не найден среди/);
-  assert.equal(c._spacesFetches, 1, "second call served from cache");
-
-  // Age the cache past the default 60s TTL -> exactly one refetch.
-  assert.ok(c.spaceIndexCache, "a complete result was cached");
-  c.spaceIndexCache.fetchedAt = Date.now() - 10 * 60 * 1000;
-  await assert.rejects(() => c.getTree(BAD), /не найден среди/);
-  assert.equal(c._spacesFetches, 2, "exactly one refetch after TTL");
-});
-
-// --- Criterion 4: no spaceId -> wrapper inert -------------------------------
-test("listPages WITHOUT spaceId is inert (raw error propagates, no /spaces sweep)", async () => {
-  const c = makeClient();
-  c.client.post = async () => {
-    throw make404("/pages/recent");
-  };
-  await assert.rejects(
-    () => c.listPages(),
-    (e) => {
-      assert.equal(e.response?.status, 404, "raw server 404 propagates");
-      assert.ok(!/не найден среди/.test(e.message ?? ""), "not rewritten");
-      return true;
-    },
-  );
-  assert.equal(c._spacesFetches, 0, "no /spaces sweep without a spaceId");
-});
-
-test("search WITHOUT spaceId is inert (raw error propagates, no /spaces sweep)", async () => {
-  const c = makeClient();
-  c.client.post = async () => {
-    throw make404("/search");
-  };
-  await assert.rejects(
-    () => c.search("query"),
-    (e) => {
-      assert.equal(e.response?.status, 404, "raw server 404 propagates");
-      assert.ok(!/не найден среди/.test(e.message ?? ""), "not rewritten");
-      return true;
-    },
-  );
-  assert.equal(c._spacesFetches, 0, "no /spaces sweep without a spaceId");
-});
-
-// --- Fail-open: a NON-404 error is never enriched (regression guard) --------
-test("a non-404 error (500) on a wrapped call propagates unchanged, with NO /spaces sweep", async () => {
-  const c = makeClient();
-  // A real server failure — must surface as-is, never be swallowed by the
-  // enrichment path or reformatted into a "not found among your spaces" message.
-  c.enumerateSpacePages = async () => {
-    throw makeAxiosErr(500, "/pages/tree", "Internal Server Error");
-  };
-  await assert.rejects(
-    () => c.getTree(BAD),
-    (e) => {
-      assert.equal(e.response?.status, 500, "the original 500 propagates");
-      assert.ok(
-        !/не найден среди/.test(e.message ?? ""),
-        "a non-404 is NOT rewritten",
-      );
-      return true;
-    },
-  );
-  assert.equal(c._spacesFetches, 0, "no /spaces sweep for a non-404");
-});
-
-// --- Fail-open: 404 when the spaceId IS accessible -> not about the space ----
-test("a 404 when the spaceId IS in the accessible index fails open (the 404 is about something else)", async () => {
-  const c = makeClient();
-  // The wrapped call 404s, but the spaceId is genuinely accessible — the 404
-  // must be about some OTHER resource, so the original error propagates and is
-  // NOT falsely rewritten to "spaceId not found among your spaces".
-  c.enumerateSpacePages = async () => {
-    throw make404();
-  };
-  await assert.rejects(
-    () => c.getTree(SPACES[0].id),
-    (e) => {
-      assert.equal(e.response?.status, 404, "original 404 preserved");
-      assert.ok(
-        !/не найден среди/.test(e.message ?? ""),
-        "no false 'not found' when the space is accessible",
-      );
-      return true;
-    },
-  );
-  assert.equal(c._spacesFetches, 1, "the index WAS consulted to make this call");
-});
-
-// --- Criterion 5: incomplete listing -> fail open ---------------------------
-test("a truncated /spaces listing (!complete) fails OPEN with the original 404", async () => {
-  const c = makeClient({ truncated: true });
-  c.enumerateSpacePages = async () => {
-    throw make404();
-  };
-  await assert.rejects(
-    () => c.getTree(BAD),
-    (e) => {
-      assert.equal(e.response?.status, 404, "original server error preserved");
-      assert.ok(!/не найден среди/.test(e.message ?? ""), "no false rewrite");
-      return true;
-    },
-  );
-  assert.equal(c.spaceIndexCache, null, "a truncated result is never cached");
-});
-
-// --- Criterion 6: /spaces fetch fails -> fail open; in-flight nulled on reject
-test("a /spaces fetch failure fails OPEN, logs under DEBUG, and never memoizes the rejected in-flight promise", async () => {
-  const c = makeClient();
-  let fetchCount = 0;
-  c.paginateAllWithMeta = async () => {
-    fetchCount++;
-    throw new Error("network boom");
-  };
-  c.enumerateSpacePages = async () => {
-    throw make404();
-  };
-
-  const prevDebug = process.env.DEBUG;
-  process.env.DEBUG = "1";
-  const errs = [];
-  const origErr = console.error;
-  console.error = (...a) => errs.push(a.map(String).join(" "));
-  try {
-    await assert.rejects(
-      () => c.getTree(BAD),
-      (e) => {
-        assert.equal(e.response?.status, 404, "original 404 rethrown");
-        return true;
-      },
-    );
-  } finally {
-    console.error = origErr;
-    if (prevDebug === undefined) delete process.env.DEBUG;
-    else process.env.DEBUG = prevDebug;
-  }
-
-  assert.ok(
-    errs.some((l) => l.includes("space-diag: /spaces fetch failed")),
-    "a DEBUG stderr line is emitted",
-  );
-  assert.equal(c.spaceIndexInFlight, null, "in-flight promise nulled on reject");
-
-  // The rejected in-flight promise must NOT be reused: a second enrichment does
-  // a genuinely fresh fetch (fetchCount increments to 2).
-  await assert.rejects(
-    () => c.getTree(BAD),
-    (e) => e.response?.status === 404,
-  );
-  assert.equal(fetchCount, 2, "fresh fetch — rejected promise not memoized");
-});
-
-// --- Criterion 7: zero accessible spaces ------------------------------------
-test("zero accessible spaces yields the dedicated 'no accessible spaces' message", async () => {
-  const c = makeClient({ spaces: [] });
-  c.enumerateSpacePages = async () => {
-    throw make404();
-  };
-  await assert.rejects(
-    () => c.getTree(BAD),
-    (e) => {
-      assert.ok(
-        e.message.includes("доступных тебе спейсов нет"),
-        "the zero-spaces branch fired",
-      );
-      assert.ok(e.message.includes(BAD), "still names the bad spaceId");
-      return true;
-    },
-  );
-});
-
-// --- Criterion 8: abort/cap during enrichment -------------------------------
-test("an aborted signal (custom/TimeoutError reason) propagates its reason, not a rewrite, and skips the sweep", async () => {
-  const c = makeClient();
-  const ac = new AbortController();
-  const reason = new Error("per-call cap exceeded");
-  reason.name = "TimeoutError"; // NOT 'AbortError' — hole B
-  ac.abort(reason);
-  c.setToolAbortSignal(ac.signal);
-  // Simulate paginateAll's throwIfAborted(): the inner op rejects with the
-  // signal's reason (not an AxiosError).
-  c.enumerateSpacePages = async () => {
-    throw ac.signal.reason;
-  };
-
-  await assert.rejects(
-    () => c.getTree(BAD),
-    (e) => {
-      assert.equal(e, reason, "the abort/cap reason itself propagates");
-      assert.equal(e.name, "TimeoutError");
-      assert.ok(!/не найден среди/.test(e.message ?? ""), "no rewrite");
-      return true;
-    },
-  );
-  assert.equal(c._spacesFetches, 0, "abort short-circuits before any sweep");
-});
-
-// --- Criterion 9: createPage is NOT wrapped (real offline server) -----------
-function readBody(req) {
-  return new Promise((resolve) => {
-    let raw = "";
-    req.on("data", (c) => (raw += c));
-    req.on("end", () => resolve(raw));
-  });
-}
-function sendJson(res, status, obj, extra = {}) {
-  res.writeHead(status, { "Content-Type": "application/json", ...extra });
-  res.end(JSON.stringify(obj));
-}
-const openServers = [];
-function spawn(handler) {
-  return new Promise((resolve) => {
-    const server = http.createServer(handler);
-    server.listen(0, "127.0.0.1", () => {
-      openServers.push(server);
-      const { port } = server.address();
-      resolve({ baseURL: `http://127.0.0.1:${port}/api` });
-    });
-  });
-}
-after(async () => {
-  await Promise.all(openServers.map((s) => new Promise((r) => s.close(r))));
-});
-
-test("createPage with an inaccessible spaceId returns the server error as-is (NOT wrapped)", async () => {
-  const { baseURL } = await spawn(async (req, res) => {
-    await readBody(req);
-    if (req.url === "/api/auth/login") {
-      sendJson(res, 200, { success: true }, {
-        "Set-Cookie": "authToken=t; Path=/; HttpOnly",
-      });
-      return;
-    }
-    if (req.url === "/api/pages/import") {
-      // The space-permissions 404 createPage would see for a bad spaceId.
-      sendJson(res, 404, { message: "Space permissions not found" });
-      return;
-    }
-    sendJson(res, 404, {});
-  });
-
-  const client = new DocmostClient(baseURL, "u@example.com", "pw");
-  // Prove the diagnostics path is never entered from createPage.
-  let idxCalls = 0;
-  const realIdx = client.getAccessibleSpaceIndex.bind(client);
-  client.getAccessibleSpaceIndex = async () => {
-    idxCalls++;
-    return realIdx();
-  };
-
-  await assert.rejects(
-    () => client.createPage("Title", "body", BAD),
-    (e) => {
-      assert.equal(e.response?.status, 404, "the raw server 404 surfaces");
-      assert.ok(
-        !/не найден среди/.test(e.message ?? ""),
-        "createPage's 404 is NOT rewritten (multi-cause path)",
-      );
-      return true;
-    },
-  );
-  assert.equal(idxCalls, 0, "createPage never invokes the space diagnostics");
-});
-
-// --- formatSpaceNotAccessible unit shape ------------------------------------
-test("formatSpaceNotAccessible caps the inline list at 10 and appends a (+N ещё) tail", () => {
-  // Short ids/names so the whole message stays under the length cap and the full
-  // list-cap behaviour (first 10 shown, rest collapsed) is observable intact.
-  const many = Array.from({ length: 13 }, (_, i) => ({
-    id: `s${i}`,
-    name: `${i}`,
-  }));
-  const msg = formatSpaceNotAccessible("getTree", BAD, many);
-  assert.ok(msg.includes("s0 (0)"));
-  assert.ok(msg.includes("s9 (9)"), "10th entry (index 9) is shown");
-  assert.ok(!msg.includes("s10 (10)"), "the 11th is collapsed");
-  assert.ok(msg.includes("(+3 ещё, см. listSpaces)"), "tail counts the remainder");
-  assert.ok(msg.length <= 300, `short-name message stays under the cap (${msg.length})`);
-});
-
-test("formatSpaceNotAccessible caps the assembled message at ERROR_MESSAGE_CAP (300)", () => {
-  // 10 spaces with long names would, uncapped, produce a message several times
-  // over the 300-char budget. The cap must keep it compact while still carrying
-  // the bad spaceId and the listSpaces pointer.
-  const longName = "X".repeat(120);
-  const spaces = Array.from({ length: 10 }, (_, i) => ({
-    id: `id-${i}`,
-    name: `${longName}-${i}`,
-  }));
-  const msg = formatSpaceNotAccessible("getTree", BAD, spaces);
-  assert.ok(
-    msg.length <= 300,
-    `message must be <= 300 chars, got ${msg.length}`,
-  );
-  assert.ok(msg.includes(BAD), "the bad spaceId survives the cap");
-  assert.ok(msg.includes("listSpaces"), "the listSpaces pointer survives the cap");
-});