Merge pull request 'fix(page-tree/dnd): drop-раскрытие + guard от потери детей (#523 )' (#532 ) from fix/523-tree-dnd into fix/525-insert-unloaded

Reviewed-on: #532
2026-07-12 05:08:42 +03:00
245 changed files with 2882 additions and 23164 deletions
@@ -198,42 +198,6 @@ MCP_DOCMOST_PASSWORD=
 # A slow/hung embeddings endpoint fails after this and the batch continues.
 # AI_EMBEDDING_TIMEOUT_MS=120000

-# ─── #530 Semantic search (Phase B) ──────────────────────────────────────────
-# The GLOBAL embedding provider used by search (query embed) AND the indexer
-# (document embed) when a workspace has NO embedding provider of its own. It is
-# an OpenAI-compatible endpoint — the docker-compose `embeddings` (TEI) sidecar.
-# A workspace that configures its own embedding provider OVERRIDES all of this.
-# When neither resolves, search runs lexical-only (semantic.reason=no-provider).
-EMBEDDING_ENDPOINT=http://embeddings:80/v1
-EMBEDDING_MODEL=intfloat/multilingual-e5-small
-# Dummy — the self-hosted TEI sidecar is keyless.
-EMBEDDING_API_KEY=unused
-EMBEDDING_DIMENSIONS=384
-# PLACEHOLDER — set to a PINNED intfloat/multilingual-e5-small commit sha (used
-# both as the TEI --revision and as part of the embedding fingerprint). Keep this
-# in lockstep with docker-compose; a bump changes the fingerprint (PR-2 handles
-# the generational swap/GC — PR-1 uses a single active fingerprint).
-EMBEDDING_REVISION=REPLACE_WITH_PINNED_E5_SMALL_COMMIT_SHA
-# e5 models require these input prefixes. Empty them for a non-e5 model.
-EMBEDDING_QUERY_PREFIX="query: "
-EMBEDDING_DOC_PREFIX="passage: "
-# Per-request timeout (ms) for the interactive SEARCH query embed — much shorter
-# than the batch indexer timeout: a slow/hung sidecar degrades search fast to the
-# lexical-only path instead of blocking the request. Default 800.
-# SEARCH_EMBED_TIMEOUT_MS=800
-# RRF weight of the vector leg relative to each lexical leg (1.0 = equal). Default 1.0.
-# SEARCH_VECTOR_WEIGHT=1.0
-# Vector top-N pulled into the fused candidate union per request. Default 50.
-# SEARCH_VECTOR_CANDIDATES=50
-# Per-statement timeout (ms) bounding ONLY the fused vector query (the brute-force
-# KNN seq scan — there is no ANN index). If the vector scan exceeds this it is
-# cancelled and search degrades to lexical-only (never hangs the request). Scoped
-# per-query (SET LOCAL), so it never affects other queries. Default 2000.
-# SEARCH_VECTOR_STATEMENT_TIMEOUT_MS=2000
-# Kill-switch: set to `off` to disable the semantic layer entirely (search then
-# runs the byte-identical Phase-A lexical path). Default on.
-# SEARCH_SEMANTIC=on
-
 # Silence timeout (ms) for streaming chat/agent AI calls AND external-MCP traffic.
 # Bounds time-to-first-byte and the gap BETWEEN chunks (NOT the total turn length),
 # so an arbitrarily long turn that keeps streaming is never cut. Finite so a hung
@@ -287,16 +251,6 @@ EMBEDDING_DOC_PREFIX="passage: "
 # 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
@@ -348,16 +302,6 @@ EMBEDDING_DOC_PREFIX="passage: "
 # enabled for a workspace, and the same single-instance constraint applies (the
 # registry is process-local).
 # AI_CHAT_RESUMABLE_STREAM=false
-#
-# Per-run replay ring cap (#491), in BYTES, for the resumable-stream registry
-# above. The registry buffers the run's recent SSE tail so a reopened tab can
-# attach and continue from the step it already persisted; the ring is bounded and
-# rotates on every confirmed step-persist. This caps the un-persisted tail between
-# rotations — an overflow evicts the oldest frames and a late attach falls back to
-# 204 -> degraded poll, so correctness never depends on the size. Default 4194304
-# (4MB); a 0/invalid value falls back to the default. The per-subscriber backpressure
-# cap is derived as 2x this value. Only meaningful with AI_CHAT_RESUMABLE_STREAM on.
-# AI_CHAT_RUN_STREAM_MAX_BUFFER_BYTES=4194304

 # --- Run lifecycle tunables (#487) ---
 # These govern the universal run machinery (every turn is now a first-class run,
@@ -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

@@ -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

@@ -463,7 +463,6 @@ Vite SPA. Code is organized by feature under `apps/client/src/features/*` (mirro
 - The editor is Tiptap; shared node/mark extensions live in `packages/editor-ext` and are imported by **both the client and the server** (collaboration, schema, `canonicalizeFootnotes`) — editor schema changes often need to be made in `editor-ext`, not just the client. Server-side markdown import/export no longer lives in `editor-ext`: it goes through the canonical converter (#345, see below). The ProseMirror↔Markdown converter and its Docmost schema mirror now live in a SINGLE package, `@docmost/prosemirror-markdown` (#293), consumed by `mcp`, `git-sync`, `apps/server` (#345), and `apps/client` (#347) — do NOT reintroduce a per-package copy. The client uses the package's `browser` entry (`@docmost/prosemirror-markdown/browser`): markdown paste (`markdown-clipboard.ts`), copy-as-markdown, and AI-chat rendering now all go through the canonical converter, so the hand-written `marked`/`turndown` markdown layer that used to live in `editor-ext` was deleted (#347). The browser entry runs the HTML→DOM stage on the native `DOMParser`, so jsdom stays out of the client bundle. `editor-ext` is the upstream source of the Tiptap schema; the package's `docmost-schema.ts` mirrors it and a serializer-contract test (`packages/prosemirror-markdown/test/serializer-contract.test.ts`) guards the boundary (every schema node must have a converter case), so a drift surfaces as a failing test rather than silent divergence. For the converter's property-testing and counterexample→fixture process (P1–P4 invariants, the `PROPERTY_SEED`/`PROPERTY_NUM_RUNS` knobs, and the nightly fuzz workflow), see `packages/prosemirror-markdown/README.md`.
 - API access goes through `apps/client/src/lib/api-client.ts` (axios). The `@` alias maps to `apps/client/src`.
 - Runtime config is injected at build time by `vite.config.ts` via `define` (`APP_URL`, `COLLAB_URL`, `APP_VERSION`, …) — these come from the root `.env`, not from `import.meta.env`.
- The build also emits `client/dist/version.json` (`{"version": …}`) from a small `vite.config.ts` plugin using the **same** `appVersion` that feeds `define.APP_VERSION`, so the file and the baked-in bundle version are identical by construction. The server reads it at startup (`ws.gateway.ts` via `readClientBuildVersion`/`resolveClientDistPath`) and announces it to each socket on connect (`app-version` event) so a tab left open across a redeploy can guard-reload before hitting a stale chunk (version-coherence). No runtime env / Dockerfile change — the file already ships in `client/dist`; missing/empty file ⇒ feature inert.

 ## Conventions

@@ -135,25 +135,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  new resync path re-reads the live anchor so the suggestion applies against the
  current text, and orphaned anchors (whose marked run was deleted) are
  reconciled rather than left blocking. (#496)
- **Save intentional page versions.** Press `Cmd/Ctrl+S` (or use the page menu)
-  to save a named version of a page. The history panel now distinguishes
-  intentional versions (a "Saved" / "Agent version" badge) from automatic
-  snapshots, dims autosaves, and offers an "Only versions" filter. Automatic
-  snapshots switched from a fixed interval to a trailing idle-flush with a
-  max-wait ceiling, and a boundary snapshot is pinned whenever the editing source
-  changes (e.g. a person's edits followed by the AI agent). (#370)
- **Open tabs pick up a new deploy on their own.** After the server is
-  redeployed while a tab is left open for hours, the tab now learns the new
-  build version over the existing WebSocket (announced per-connect, so a natural
-  reconnect delivers it) and shows a "A new version is available" banner with an
-  Update button. To avoid dropping a half-written comment or form, the tab is
-  not reloaded when you merely switch away from it; instead it auto-reloads at
-  the next safe point — the next in-app navigation (or immediately if you click
-  Update) — before it can hit a stale lazy-loaded chunk. At most one automatic
-  reload happens per 5-minute window, shared with the existing chunk-load
-  recovery, so a permanent version skew degrades to the banner rather than a
-  reload loop while a second deploy in the same tab still recovers. When the
-  build carries no version info the feature stays inert. (#481)

 - **Place several images side by side in a row.** A new "Inline (side by
  side)" alignment mode in the image bubble menu renders consecutive inline
@@ -404,25 +385,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
@@ -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/
@@ -1,362 +0,0 @@
-/**
- * PageHistoryModal — редизайн окна «Page history».
- * Mantine v7. Light/dark. Полноразмерное модальное окно.
- *
- * ─────────────────────────────────────────────────────────────────────────
- * ЧТО ЭТО
- * ─────────────────────────────────────────────────────────────────────────
- * Окно истории версий страницы. Слева — панель навигации: мини-календарь
- * (heatmap: яркость дня = число ревизий, обводка = выбранный день) + плотный
- * список ревизий (одна ревизия = одна строка). Справа — реально отрендеренная
- * версия страницы с подсветкой изменений. Все контролы — в одну строку шапки.
- *
- * Ключевые решения:
- *  - Плотный список: одна ревизия на строку (аватар · время · автор · [SAVED]).
- *    Бейдж показывается ТОЛЬКО у сохранённых версий; всё остальное — autosave.
- *  - Агентские ревизии визуально отличаются: квадратный глиф роли (К/Ф) вместо
- *    круглого аватара пользователя + «via <кто запустил>».
- *  - Календарь объединён со списком в одной панели (мини-календарь = date jumper).
- *  - Highlight changes + навигация по изменениям (N of M, ↑/↓) вынесены в шапку.
- *  - Текущая версия помечена; Restore для неё недоступен.
- *
- * ─────────────────────────────────────────────────────────────────────────
- * УСТАНОВКА / ИСПОЛЬЗОВАНИЕ
- * ─────────────────────────────────────────────────────────────────────────
- *   import { PageHistoryModal, Revision } from './PageHistoryModal';
- *
- *   <PageHistoryModal
- *     opened={open}
- *     onClose={() => setOpen(false)}
- *     revisions={revisions}                 // Revision[]
- *     selectedId={selId}
- *     onSelect={setSelId}                    // клик по ревизии → рендер справа
- *     renderVersion={(rev) => <ArticleView versionId={rev.id} />}  // ваш рендер страницы
- *     highlightChanges={hl}
- *     onToggleHighlight={setHl}
- *     changeNav={{ index: 1, total: 3, onPrev, onNext }}  // навигация по диффу
- *     onlySaved={onlySaved}
- *     onToggleOnlySaved={setOnlySaved}
- *     onRestore={(rev) => api.restore(rev.id)}   // async; текущая версия → disabled
- *   />
- *
- * Требует MantineProvider на корне приложения (defaultColorScheme="auto" для тем).
- *
- * ─────────────────────────────────────────────────────────────────────────
- * ФОРМАТ ДАННЫХ
- * ─────────────────────────────────────────────────────────────────────────
- *   interface Revision {
- *     id: string;
- *     at: Date | string;        // время ревизии; форматируется вызывающим/util-ом
- *     dayGroup: string;         // 'Today' | 'Yesterday' | 'Mon 12 Jul' — заголовок группы
- *     saved: boolean;           // true → бейдж SAVED; false → autosave (без бейджа)
- *     author: { name: string } & (
- *       | { kind: 'human' }
- *       | { kind: 'agent'; role: string; triggeredBy: string }  // роль + кто запустил
- *     );
- *     isCurrent?: boolean;      // текущая (последняя) версия — Restore недоступен
- *   }
- *
- * Ревизии приходят плоским массивом; группировка по dayGroup — на клиенте.
- * Никаких изменений API не требуется: агентское авторство берётся из author.kind.
- *
- * ─────────────────────────────────────────────────────────────────────────
- * СОСТОЯНИЯ (нарисованы/поддержаны)
- * ─────────────────────────────────────────────────────────────────────────
- *  - Ревизия: обычная / hover / выбранная / текущая / агентская / человеческая.
- *  - Restore: default / disabled (выбрана текущая) / loading (спиннер после клика).
- *  - Highlight changes: on/off; при off навигация по изменениям неактивна.
- *  - Пустая история: одна версия / нет ревизий → EmptyState.
- *  - Тёмная тема: через токены Mantine (useMantineColorScheme, var(--mantine-*)).
- */
-import { useMemo, useState, useCallback } from 'react';
-import {
-  Modal, Box, Group, Stack, Text, Switch, Avatar, Badge, Button, ActionIcon,
-  ScrollArea, useMantineTheme, useMantineColorScheme,
-} from '@mantine/core';
-
-/* ─────────────────────────── Типы ─────────────────────────── */
-
-export type Author =
-  | { name: string; kind: 'human' }
-  | { name: string; kind: 'agent'; role: string; triggeredBy: string };
-
-export interface Revision {
-  id: string;
-  at: Date | string;
-  atLabel: string;      // предформатированное «5:35AM»
-  dayGroup: string;     // «Today» | «Yesterday» | «Mon 12 Jul»
-  saved: boolean;
-  author: Author;
-  isCurrent?: boolean;
-}
-
-export interface CalendarDay {
-  label: string;        // «12»
-  inMonth: boolean;
-  count: number;        // число ревизий за день (для heatmap)
-  selected?: boolean;
-  date: Date | string;
-}
-
-export interface PageHistoryModalProps {
-  opened: boolean;
-  onClose: () => void;
-  revisions: Revision[];
-  selectedId: string | null;
-  onSelect: (id: string) => void;
-  renderVersion: (rev: Revision | null) => React.ReactNode;
-  highlightChanges: boolean;
-  onToggleHighlight: (v: boolean) => void;
-  changeNav?: { index: number; total: number; onPrev: () => void; onNext: () => void };
-  onlySaved: boolean;
-  onToggleOnlySaved: (v: boolean) => void;
-  onRestore: (rev: Revision) => Promise<void>;
-  /** Ячейки текущего месяца календаря + управление. Необязательно — без него панель = только список. */
-  calendar?: {
-    monthLabel: string;      // «July 2025»
-    weekdays: string[];      // ['Mon',…,'Sun']
-    days: CalendarDay[];     // обычно 35/42 ячейки
-    onPrevMonth: () => void;
-    onNextMonth: () => void;
-    onToday: () => void;
-    onPickDay: (d: CalendarDay) => void;
-  };
-}
-
-/* ─────────────────────────── Утилиты представления ─────────────────────────── */
-
-const USER_PALETTE = ['#495057', '#e8590c', '#1c7ed6', '#7048e8', '#0ca678'];
-function userColor(name: string) {
-  let h = 0;
-  for (let i = 0; i < name.length; i++) h = (h * 31 + name.charCodeAt(i)) >>> 0;
-  return USER_PALETTE[h % USER_PALETTE.length];
-}
-const AGENT_GRAD: Record<string, string> = {
-  'Корректор': 'linear-gradient(135deg,#20c997,#12b886)',
-  'Фактчекер': 'linear-gradient(135deg,#4c6ef5,#7048e8)',
-};
-function agentGrad(role: string) { return AGENT_GRAD[role] ?? 'linear-gradient(135deg,#868e96,#495057)'; }
-
-/** heatmap: число ревизий → фон/текст ячейки календаря. */
-function heat(n: number, dark: boolean) {
-  if (n === 0) return { bg: 'transparent', fg: dark ? '#5c5f66' : '#adb5bd' };
-  if (n <= 2) return { bg: dark ? 'rgba(34,139,230,.20)' : '#e7f0ff', fg: dark ? '#74c0fc' : '#1971c2' };
-  if (n <= 4) return { bg: dark ? 'rgba(34,139,230,.45)' : '#a5c8ff', fg: dark ? '#dbeafe' : '#0b3d91' };
-  return { bg: '#4c8dff', fg: '#ffffff' };
-}
-
-/* ─────────────────────────── Строка ревизии ─────────────────────────── */
-
-function RevisionRow({ rev, selected, onSelect }: { rev: Revision; selected: boolean; onSelect: () => void }) {
-  const theme = useMantineTheme();
-  const { colorScheme } = useMantineColorScheme();
-  const dark = colorScheme === 'dark';
-  const a = rev.author;
-  const isAgent = a.kind === 'agent';
-
-  return (
-    <Group
-      gap={8} wrap="nowrap" h={28} px="12px 14px" m="1px 6px"
-      onClick={onSelect}
-      style={{
-        cursor: 'pointer', borderRadius: 7,
-        background: selected ? (dark ? 'rgba(34,139,230,.14)' : '#eef4ff')
-          : isAgent ? (dark ? 'rgba(112,72,232,.06)' : '#fbfaff') : undefined,
-      }}
-    >
-      {/* аватар/глиф */}
-      {isAgent ? (
-        <Box style={{ flex: 'none', width: 16, height: 16, borderRadius: 4, background: agentGrad(a.role), display: 'flex', alignItems: 'center', justifyContent: 'center', color: '#fff', font: '700 8px system-ui' }}>
-          {a.role[0]}
-        </Box>
-      ) : (
-        <Box style={{ flex: 'none', width: 16, height: 16, borderRadius: '50%', background: userColor(a.name), display: 'flex', alignItems: 'center', justifyContent: 'center', color: '#fff', font: '700 8px system-ui' }}>
-          {a.name[0].toUpperCase()}
-        </Box>
-      )}
-      {/* время */}
-      <Text fz={12.5} fw={rev.isCurrent ? 600 : 500} c={rev.isCurrent ? undefined : 'dimmed'} style={{ flex: 'none', minWidth: 58 }}>
-        {rev.atLabel}
-      </Text>
-      {/* автор + via */}
-      <Group gap={4} wrap="nowrap" style={{ flex: 1, minWidth: 0, alignItems: 'baseline', overflow: 'hidden' }}>
-        <Text fz={12} fw={isAgent ? 600 : 400} c={isAgent ? undefined : 'dimmed'} truncate style={{ flex: 'none', maxWidth: 100 }}>
-          {isAgent ? a.role : a.name}
-        </Text>
-        {isAgent && <Text fz={11} c="dimmed" truncate>· via {a.triggeredBy}</Text>}
-      </Group>
-      {/* бейдж — только SAVED */}
-      {rev.saved && <Badge size="sm" radius="sm" variant="light" color="blue">SAVED</Badge>}
-    </Group>
-  );
-}
-
-/* ─────────────────────────── Мини-календарь ─────────────────────────── */
-
-function MiniCalendar({ cal }: { cal: NonNullable<PageHistoryModalProps['calendar']> }) {
-  const { colorScheme } = useMantineColorScheme();
-  const dark = colorScheme === 'dark';
-  return (
-    <Box p="10px 12px 8px" style={(t) => ({ borderBottom: `1px solid ${t.colorScheme === 'dark' ? t.colors.dark[5] : t.colors.gray[1]}` })}>
-      <Group gap={6} mb={6}>
-        <ActionIcon variant="subtle" color="gray" size="sm" onClick={cal.onPrevMonth}>‹</ActionIcon>
-        <Text fz={12} fw={600}>{cal.monthLabel}</Text>
-        <ActionIcon variant="subtle" color="gray" size="sm" onClick={cal.onNextMonth}>›</ActionIcon>
-        <Box style={{ flex: 1 }} />
-        <Button variant="subtle" size="compact-xs" onClick={cal.onToday}>Today</Button>
-      </Group>
-      <Box style={{ display: 'grid', gridTemplateColumns: 'repeat(7,1fr)', gap: 2, marginBottom: 2 }}>
-        {cal.weekdays.map((w) => (
-          <Text key={w} ta="center" fz={8.5} fw={600} c="dimmed">{w}</Text>
-        ))}
-      </Box>
-      <Box style={{ display: 'grid', gridTemplateColumns: 'repeat(7,1fr)', gap: 2 }}>
-        {cal.days.map((d, i) => {
-          const h = heat(d.count, dark);
-          return (
-            <Box
-              key={i} onClick={() => cal.onPickDay(d)}
-              style={{
-                position: 'relative', height: 26, borderRadius: 6, cursor: 'pointer',
-                display: 'flex', alignItems: 'center', justifyContent: 'center',
-                background: d.inMonth ? h.bg : 'transparent',
-                boxShadow: d.selected ? `inset 0 0 0 2px ${dark ? '#f1f3f5' : '#1a1b1e'}` : undefined,
-              }}
-            >
-              <Text fz={10.5} fw={d.selected ? 700 : 500} style={{ color: d.inMonth ? h.fg : (dark ? '#3a3d42' : '#dee2e6') }}>
-                {d.label}
-              </Text>
-            </Box>
-          );
-        })}
-      </Box>
-      {/* легенда heatmap */}
-      <Group gap={6} mt={8} align="center">
-        <Text fz={9.5} c="dimmed">fewer</Text>
-        {['#e7f0ff', '#a5c8ff', '#4c8dff'].map((c) => (
-          <Box key={c} style={{ width: 14, height: 10, borderRadius: 2, background: c }} />
-        ))}
-        <Text fz={9.5} c="dimmed">more revisions</Text>
-      </Group>
-    </Box>
-  );
-}
-
-/* ─────────────────────────── Окно ─────────────────────────── */
-
-export function PageHistoryModal(props: PageHistoryModalProps) {
-  const {
-    opened, onClose, revisions, selectedId, onSelect, renderVersion,
-    highlightChanges, onToggleHighlight, changeNav, onlySaved, onToggleOnlySaved,
-    onRestore, calendar,
-  } = props;
-  const [restoring, setRestoring] = useState(false);
-
-  const selected = revisions.find((r) => r.id === selectedId) ?? null;
-  const isEmpty = revisions.length <= 1;
-
-  // группировка по dayGroup, с фильтром Only saved
-  const groups = useMemo(() => {
-    const list = onlySaved ? revisions.filter((r) => r.saved) : revisions;
-    const map: { head: string; items: Revision[] }[] = [];
-    for (const r of list) {
-      let g = map.find((x) => x.head === r.dayGroup);
-      if (!g) { g = { head: r.dayGroup, items: [] }; map.push(g); }
-      g.items.push(r);
-    }
-    return map;
-  }, [revisions, onlySaved]);
-
-  const restore = useCallback(async () => {
-    if (!selected || selected.isCurrent) return;
-    setRestoring(true);
-    try { await onRestore(selected); } finally { setRestoring(false); }
-  }, [selected, onRestore]);
-
-  return (
-    <Modal
-      opened={opened} onClose={onClose} withCloseButton={false}
-      size="80rem" radius="lg" padding={0}
-      styles={{ body: { height: '80vh', maxHeight: 760, display: 'flex', flexDirection: 'column' } }}
-      overlayProps={{ backgroundOpacity: 0.5, blur: 1 }}
-    >
-      {/* ── single-row toolbar ── */}
-      <Group gap={14} h={60} px={16} wrap="nowrap" style={(t) => ({ flex: 'none', borderBottom: `1px solid ${t.colorScheme === 'dark' ? t.colors.dark[5] : t.colors.gray[1]}` })}>
-        <Text fz={16} fw={600}>Page history</Text>
-        <Box style={(t) => ({ width: 1, height: 22, background: t.colorScheme === 'dark' ? t.colors.dark[4] : t.colors.gray[2] })} />
-        <Stack gap={1} style={{ minWidth: 0 }}>
-          <Text fz={12} fw={600} truncate>{selected ? `${selected.dayGroup} · ${selected.atLabel}` : '—'}</Text>
-          <Text fz={10.5} c="dimmed">selected version</Text>
-        </Stack>
-
-        <Box style={{ flex: 1 }} />
-
-        {/* diff cluster */}
-        <Group gap={2} p={3} wrap="nowrap" style={(t) => ({ background: t.colorScheme === 'dark' ? t.colors.dark[6] : '#f4f6f8', borderRadius: 10 })}>
-          <Button variant="white" size="compact-sm" onClick={() => onToggleHighlight(!highlightChanges)}
-            leftSection={<Switch checked={highlightChanges} onChange={() => {}} size="xs" tabIndex={-1} styles={{ track: { cursor: 'pointer' } }} />}
-            styles={{ root: { boxShadow: '0 1px 2px rgba(0,0,0,.08)' } }}>
-            Highlight changes
-          </Button>
-          {changeNav && (
-            <>
-              <Text fz={12} fw={600} c="dimmed" px={6}>{changeNav.index} / {changeNav.total}</Text>
-              <Box style={{ display: 'flex' }}>
-                <ActionIcon variant="subtle" color="gray" size="lg" disabled={!highlightChanges} onClick={changeNav.onPrev} style={{ width: 26 }}>↑</ActionIcon>
-                <ActionIcon variant="subtle" color="gray" size="lg" disabled={!highlightChanges} onClick={changeNav.onNext} style={{ width: 26 }}>↓</ActionIcon>
-              </Box>
-            </>
-          )}
-        </Group>
-
-        <Box style={(t) => ({ width: 1, height: 22, background: t.colorScheme === 'dark' ? t.colors.dark[4] : t.colors.gray[2] })} />
-
-        <Button color="blue" onClick={restore} loading={restoring} disabled={!selected || selected.isCurrent}>
-          Restore this version
-        </Button>
-        <ActionIcon variant="subtle" color="gray" size="lg" onClick={onClose}>✕</ActionIcon>
-      </Group>
-
-      {/* ── body ── */}
-      <Box style={{ flex: 1, display: 'flex', minHeight: 0 }}>
-        {/* left: nav panel */}
-        <Stack gap={0} style={(t) => ({ flex: 'none', width: 280, minHeight: 0, borderRight: `1px solid ${t.colorScheme === 'dark' ? t.colors.dark[5] : t.colors.gray[1]}`, background: t.colorScheme === 'dark' ? t.colors.dark[7] : '#fcfcfd' })}>
-          <Group h={44} px={16} style={(t) => ({ flex: 'none', borderBottom: `1px solid ${t.colorScheme === 'dark' ? t.colors.dark[5] : t.colors.gray[1]}` })}>
-            <Switch checked={onlySaved} onChange={(e) => onToggleOnlySaved(e.currentTarget.checked)} size="sm" label="Only saved" labelPosition="right" styles={{ label: { fontSize: 13, fontWeight: 500 } }} />
-          </Group>
-
-          {calendar && <MiniCalendar cal={calendar} />}
-
-          <ScrollArea style={{ flex: 1 }}>
-            {groups.map((g) => (
-              <Box key={g.head}>
-                <Text px={16} pt={9} pb={5} fz={10.5} fw={600} tt="uppercase" c="dimmed" style={{ letterSpacing: '.05em', position: 'sticky', top: 0, zIndex: 2, background: 'var(--mantine-color-body)' }}>
-                  {g.head}
-                </Text>
-                {g.items.map((r) => (
-                  <RevisionRow key={r.id} rev={r} selected={r.id === selectedId} onSelect={() => onSelect(r.id)} />
-                ))}
-              </Box>
-            ))}
-          </ScrollArea>
-        </Stack>
-
-        {/* right: rendered version */}
-        <ScrollArea style={{ flex: 1, minWidth: 0 }} bg="var(--mantine-color-default-hover)">
-          {isEmpty ? (
-            <Stack align="center" justify="center" h="100%" gap={6} p={40}>
-              <Text fw={600} fz={14}>No earlier versions</Text>
-              <Text fz={12.5} c="dimmed" ta="center">У страницы пока одна версия — сравнивать не с чем.</Text>
-            </Stack>
-          ) : (
-            <Box p="26px 0" maw={660} mx="auto">
-              {renderVersion(selected)}
-            </Box>
-          )}
-        </ScrollArea>
-      </Box>
-    </Modal>
-  );
-}
-
-export default PageHistoryModal;
@@ -206,137 +206,6 @@ start the new migrations apply on top of your existing schema (`CREATE EXTENSION
  existing pages are indexed on their next edit. pgvector is still required for the migration to
  apply at all.

-## Local embeddings server
-
-The AI agent's semantic (RAG) search needs an **embeddings model**. Instead of paying a cloud
-provider (e.g. OpenAI `text-embedding-3-*`) to embed every page, you can run a small open-weights
-model yourself with Hugging Face
-[Text Embeddings Inference](https://github.com/huggingface/text-embeddings-inference) (TEI), which
-serves an OpenAI-compatible `/v1/embeddings` endpoint. `intfloat/multilingual-e5-small` is a good
-default: multilingual, 384-dim, and comfortable on CPU (~1–2 GB RAM, 1–2 vCPU). Point Gitmost at it
-under **Workspace settings → AI → Embeddings**.
-
-### Option A — local (same Docker network as Gitmost)
-
-Run TEI as a container on the network Gitmost is already on. The port is never published, so the
-endpoint stays internal and needs no authentication.
-
-```yaml
-services:
-  embeddings:
-    image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.9   # pin version; use a cuda-* tag for GPU
-    container_name: embeddings
-    restart: unless-stopped
-    networks:
-      - gitmost_net          # same network Gitmost is on
-    command:
-      - "--model-id"
-      - "intfloat/multilingual-e5-small"
-      - "--auto-truncate"    # clamp over-long inputs instead of returning 413
-    volumes:
-      - tei-models:/data     # weights are downloaded once and cached here
-
-networks:
-  gitmost_net:
-    external: true           # the network Gitmost already uses
-
-volumes:
-  tei-models:
-```
-
-Gitmost settings (**Workspace settings → AI → Embeddings**):
-
-| Field             | Value                             |
-|-------------------|-----------------------------------|
-| Model             | `intfloat/multilingual-e5-small`  |
-| Base URL          | `http://embeddings:80/v1/`        |
-| Embedding API key | — (leave empty)                   |
-
-> `embeddings` is the container name — Gitmost resolves it over DNS inside the Docker network.
-> The port is not published, so the endpoint is reachable only by containers on that network and
-> no authorization is required.
-
-### Option B — separate host (public via Traefik + Let's Encrypt)
-
-This assumes the host already runs Traefik with an ACME resolver (the example below uses
-`letsEncrypt`, the `websecure` entrypoint and a shared `docker_main_net` network). Replace the
-domain / network / resolver with your own.
-
-**DNS:** add an A record `embeddings.example.com` → the IP of your Traefik host (same
-challenge / port 80 as the rest of your sites).
-
-```yaml
-services:
-  embeddings:
-    image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.9   # pin version; cuda-* tag for GPU
-    container_name: embeddings
-    restart: unless-stopped
-    networks:
-      - docker_main_net      # the network Traefik is attached to
-    command:
-      - "--model-id"
-      - "intfloat/multilingual-e5-small"
-      - "--auto-truncate"
-      - "--api-key"
-      - "sk-emb-REPLACE_WITH_YOUR_KEY"
-    volumes:
-      - tei-models:/data
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.embeddings.rule: "Host(`embeddings.example.com`)"
-      traefik.http.routers.embeddings.entrypoints: "websecure"
-      traefik.http.routers.embeddings.tls: "true"
-      traefik.http.routers.embeddings.tls.certresolver: "letsEncrypt"
-      traefik.http.routers.embeddings.service: "embeddings"
-      traefik.http.services.embeddings.loadbalancer.server.port: "80"
-      # TEI enforces the Bearer key itself; Traefik only rate-limits to protect the CPU
-      traefik.http.routers.embeddings.middlewares: "embeddings-rl"
-      traefik.http.middlewares.embeddings-rl.ratelimit.average: "20"
-      traefik.http.middlewares.embeddings-rl.ratelimit.burst: "40"
-      traefik.http.middlewares.embeddings-rl.ratelimit.period: "1s"
-
-networks:
-  docker_main_net:
-    external: true
-
-volumes:
-  tei-models:
-```
-
-Gitmost settings (**Workspace settings → AI → Embeddings**):
-
-| Field             | Value                                 |
-|-------------------|---------------------------------------|
-| Model             | `intfloat/multilingual-e5-small`      |
-| Base URL          | `https://embeddings.example.com/v1/`  |
-| Embedding API key | your `sk-emb-…`                       |
-
-Check it from outside:
-
-```bash
-curl -s https://embeddings.example.com/v1/embeddings \
-  -H "Authorization: Bearer sk-emb-REPLACE_WITH_YOUR_KEY" \
-  -H "Content-Type: application/json" \
-  -d '{"model":"intfloat/multilingual-e5-small","input":"query: hello"}' \
-  | python3 -c 'import sys,json;print("dims:",len(json.load(sys.stdin)["data"][0]["embedding"]))'
-# -> dims: 384
-```
-
-### Embeddings server notes
-
- **Vector dimension is 384.** If this Gitmost was previously embedded with a different model
-  (e.g. `text-embedding-3-large` = 3072-dim), the old pgvector rows won't match the new dimension —
-  clear the existing embeddings / re-index before switching. Gitmost only compares vectors of the
-  same dimension, so mixed-dimension rows are silently ignored rather than searched.
- **First start downloads the weights** (hundreds of MB) from `huggingface.co` into the
-  `tei-models` volume; every start after that reads from the volume.
- **Pin the version.** Pin the image, and optionally the model: add `--revision <commit-sha>` to
-  `command` (the sha is on the model's page on Hugging Face).
- **Air-gapped / no egress:** seed the `tei-models` volume ahead of time and add
-  `environment: [HF_HUB_OFFLINE=1]`.
- **GPU:** use the cuda tag of the same release (e.g.
-  `ghcr.io/huggingface/text-embeddings-inference:cuda-1.9`) and start the container with `gpus: all`.
-
 ## Features

 - Real-time collaboration
@@ -193,137 +193,6 @@ dump/restore, существующий каталог данных переис
 > неизменным и бэкапьте вместе с базой данных.


-## Локальный сервер эмбеддингов
-
-Семантическому (RAG) поиску AI-агента нужна **модель эмбеддингов**. Вместо оплаты облачного
-провайдера (например, OpenAI `text-embedding-3-*`) за эмбеддинг каждой страницы можно запустить
-небольшую open-weights модель у себя через Hugging Face
-[Text Embeddings Inference](https://github.com/huggingface/text-embeddings-inference) (TEI) — он
-отдаёт OpenAI-совместимый эндпоинт `/v1/embeddings`. Хороший дефолт — `intfloat/multilingual-e5-small`:
-многоязычная, 384-мерная, комфортно работает на CPU (~1–2 ГБ RAM, 1–2 vCPU). Пропишите её в
-**Настройки воркспейса → AI → Эмбеддинги**.
-
-### Вариант A — локально (та же Docker-сеть, что и Gitmost)
-
-Запустите TEI контейнером в той же сети, где уже работает Gitmost. Порт наружу не публикуется,
-поэтому эндпоинт остаётся внутренним и не требует авторизации.
-
-```yaml
-services:
-  embeddings:
-    image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.9   # pin version; use a cuda-* tag for GPU
-    container_name: embeddings
-    restart: unless-stopped
-    networks:
-      - gitmost_net          # same network Gitmost is on
-    command:
-      - "--model-id"
-      - "intfloat/multilingual-e5-small"
-      - "--auto-truncate"    # clamp over-long inputs instead of returning 413
-    volumes:
-      - tei-models:/data     # weights are downloaded once and cached here
-
-networks:
-  gitmost_net:
-    external: true           # the network Gitmost already uses
-
-volumes:
-  tei-models:
-```
-
-Настройки Gitmost (**Настройки воркспейса → AI → Эмбеддинги**):
-
-| Поле              | Значение                          |
-|-------------------|-----------------------------------|
-| Model             | `intfloat/multilingual-e5-small`  |
-| Base URL          | `http://embeddings:80/v1/`        |
-| Embedding API key | — (оставить пустым)               |
-
-> `embeddings` — имя контейнера, Gitmost резолвит его по DNS внутри Docker-сети.
-> Наружу порт не публикуется, эндпоинт доступен только контейнерам этой сети, поэтому
-> авторизация не нужна.
-
-### Вариант B — на отдельном хосте (наружу через Traefik + Let's Encrypt)
-
-Предполагается, что на хосте уже есть Traefik с ACME-резолвером (в примере ниже — `letsEncrypt`,
-entrypoint `websecure`, общая сеть `docker_main_net`). Замените домен / сеть / резолвер на свои.
-
-**DNS:** заведите A-запись `embeddings.example.com` → IP хоста с Traefik (тот же challenge / порт 80,
-что и у остальных сайтов).
-
-```yaml
-services:
-  embeddings:
-    image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.9   # pin version; cuda-* tag for GPU
-    container_name: embeddings
-    restart: unless-stopped
-    networks:
-      - docker_main_net      # the network Traefik is attached to
-    command:
-      - "--model-id"
-      - "intfloat/multilingual-e5-small"
-      - "--auto-truncate"
-      - "--api-key"
-      - "sk-emb-REPLACE_WITH_YOUR_KEY"
-    volumes:
-      - tei-models:/data
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.embeddings.rule: "Host(`embeddings.example.com`)"
-      traefik.http.routers.embeddings.entrypoints: "websecure"
-      traefik.http.routers.embeddings.tls: "true"
-      traefik.http.routers.embeddings.tls.certresolver: "letsEncrypt"
-      traefik.http.routers.embeddings.service: "embeddings"
-      traefik.http.services.embeddings.loadbalancer.server.port: "80"
-      # TEI enforces the Bearer key itself; Traefik only rate-limits to protect the CPU
-      traefik.http.routers.embeddings.middlewares: "embeddings-rl"
-      traefik.http.middlewares.embeddings-rl.ratelimit.average: "20"
-      traefik.http.middlewares.embeddings-rl.ratelimit.burst: "40"
-      traefik.http.middlewares.embeddings-rl.ratelimit.period: "1s"
-
-networks:
-  docker_main_net:
-    external: true
-
-volumes:
-  tei-models:
-```
-
-Настройки Gitmost (**Настройки воркспейса → AI → Эмбеддинги**):
-
-| Поле              | Значение                              |
-|-------------------|---------------------------------------|
-| Model             | `intfloat/multilingual-e5-small`      |
-| Base URL          | `https://embeddings.example.com/v1/`  |
-| Embedding API key | ваш `sk-emb-…`                        |
-
-Проверка снаружи:
-
-```bash
-curl -s https://embeddings.example.com/v1/embeddings \
-  -H "Authorization: Bearer sk-emb-REPLACE_WITH_YOUR_KEY" \
-  -H "Content-Type: application/json" \
-  -d '{"model":"intfloat/multilingual-e5-small","input":"query: hello"}' \
-  | python3 -c 'import sys,json;print("dims:",len(json.load(sys.stdin)["data"][0]["embedding"]))'
-# -> dims: 384
-```
-
-### Заметки про сервер эмбеддингов
-
- **Размерность вектора — 384.** Если раньше этот Gitmost эмбеддился другой моделью
-  (например, `text-embedding-3-large` = 3072-dim), старые строки в pgvector не совпадут по
-  размерности — очистите существующие эмбеддинги / переиндексируйте перед переключением. Gitmost
-  сравнивает только вектора одной размерности, поэтому строки другой размерности не участвуют в
-  поиске, а не ломают его.
- **Первый старт тянет веса** (сотни МБ) с `huggingface.co` в том `tei-models`; дальше — из тома.
- **Пин версии.** Пиньте образ, а при желании и модель: добавьте в `command` `--revision <commit-sha>`
-  (sha берётся со страницы модели на Hugging Face).
- **Без egress (air-gapped):** засейте том `tei-models` заранее и добавьте
-  `environment: [HF_HUB_OFFLINE=1]`.
- **GPU:** возьмите cuda-тег того же релиза (например,
-  `ghcr.io/huggingface/text-embeddings-inference:cuda-1.9`) и запустите контейнер с `gpus: all`.
-
-
 ## Возможности

 - Совместная работа в реальном времени
@@ -346,9 +346,6 @@ roles:
        □ Working sections ("Log", "Open Questions", "Revision") are moved to an
          appendix at the end of the document or clearly separated from the report
          body.
-        □ Once the report is complete, call save_page_version to pin the finished
-          document as a restorable named version (a checkpoint the reader can
-          return to). A repeat call after no further edits is a harmless no-op.
      Be honest about gaps. If you couldn't find something, say so — don't disguise
      a guess as a fact.
    autoStart: false
@@ -445,7 +442,6 @@ roles:
      - **The language of the notes = the main language of the call.** Technical terms — in their canonical spelling (usually Latin).
      - **Don't evaluate the participants** and don't comment on the quality of the discussion.
      - The output is the notes only, with no preambles or meta-comments, apart from targeted uncertainty marks.
-      - **Pin the result.** Once the notes are complete on the page, call save_page_version to save them as a restorable named version (a checkpoint). Calling it again after no further edits is a harmless no-op.

      ## Style example (excerpt)

@@ -345,9 +345,6 @@ roles:
        □ Working sections («Журнал», «Открытые вопросы», «Ревизия») are moved to
          an appendix at the end of the document or clearly separated from the
          report body.
-        □ Once the report is complete, call save_page_version to pin the finished
-          document as a restorable named version (a checkpoint the reader can
-          return to). A repeat call after no further edits is a harmless no-op.
      Be honest about gaps. If you couldn't find something, say so — don't disguise
      a guess as a fact.
    autoStart: false
@@ -444,7 +441,6 @@ roles:
      - **Язык конспекта = основной язык созвона.** Технические термины — в каноническом написании (обычно латиницей).
      - **Не оценивай участников** и не комментируй качество обсуждения.
      - На выходе — только конспект, без преамбул и мета-комментариев, кроме точечных пометок неуверенности.
-      - **Зафиксируй результат.** Когда конспект готов на странице, вызови save_page_version, чтобы сохранить его как именованную версию (точку восстановления). Повторный вызов без новых правок — безвредный no-op.

      ## Пример стиля (фрагмент)

@@ -33,6 +33,6 @@ bundles:
      - en
    roles:
      - slug: researcher
-        version: 10
+        version: 9
      - slug: call-summarizer
-        version: 2
+        version: 1
@@ -1,8 +1,4 @@
 {
-  "1 year": "1 year",
-  "30 days": "30 days",
-  "90 days": "90 days",
-  "A new version is available": "A new version is available",
  "Account": "Account",
  "Active": "Active",
  "Add": "Add",
@@ -13,16 +9,11 @@
  "Add space members": "Add space members",
  "Add to favorites": "Add to favorites",
  "Admin": "Admin",
-  "API key created": "API key created",
-  "API key revoked": "API key revoked",
-  "API keys across the workspace.": "API keys across the workspace.",
  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "Are you sure you want to delete this group? Members will lose access to resources this group has access to.",
  "Are you sure you want to delete this page?": "Are you sure you want to delete this page?",
  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.",
  "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "Are you sure you want to remove this user from the space? The user will lose all access to this space.",
  "Are you sure you want to restore this version? Any changes not versioned will be lost.": "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-  "Are you sure you want to revoke \"{{name}}\"? Any client using this key will immediately lose access. This cannot be undone.": "Are you sure you want to revoke \"{{name}}\"? Any client using this key will immediately lose access. This cannot be undone.",
-  "Author": "Author",
  "Can become members of groups and spaces in workspace": "Can become members of groups and spaces in workspace",
  "Can create and edit pages in space.": "Can create and edit pages in space.",
  "Can edit": "Can edit",
@@ -41,14 +32,11 @@
  "Confirm": "Confirm",
  "Copy as Markdown": "Copy as Markdown",
  "Copy link": "Copy link",
-  "Copy your API key now and store it somewhere safe. For security reasons it will not be shown again.": "Copy your API key now and store it somewhere safe. For security reasons it will not be shown again.",
  "Create": "Create",
-  "Create API key": "Create API key",
  "Create group": "Create group",
  "Create page": "Create page",
  "Create space": "Create space",
  "Create workspace": "Create workspace",
-  "Critical": "Critical",
  "Current password": "Current password",
  "Dark": "Dark",
  "Date": "Date",
@@ -66,14 +54,7 @@
  "e.g Sales": "e.g Sales",
  "e.g Space for product team": "e.g Space for product team",
  "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
-  "e.g. CI deploy token": "e.g. CI deploy token",
  "Edit": "Edit",
-  "Expiring soon": "Expiring soon",
-  "Failed to create API key": "Failed to create API key",
-  "Failed to load API keys.": "Failed to load API keys.",
-  "Failed to revoke API key": "Failed to revoke API key",
-  "Never used": "Never used",
-  "No API keys yet": "No API keys yet",
  "Read": "Read",
  "Edit group": "Edit group",
  "Email": "Email",
@@ -126,7 +107,6 @@
  "Link copied": "Link copied",
  "Login": "Login",
  "Logout": "Logout",
-  "Major": "Major",
  "Manage Group": "Manage Group",
  "Manage members": "Manage members",
  "member": "member",
@@ -153,8 +133,6 @@
  "page": "page",
  "Page deleted successfully": "Page deleted successfully",
  "Page history": "Page history",
-  "Revoke API key": "Revoke API key",
-  "Revoke {{name}}": "Revoke {{name}}",
  "Select version": "Select version",
  "Highlight changes": "Highlight changes",
  "Page import is in progress. Please do not close this tab.": "Page import is in progress. Please do not close this tab.",
@@ -210,9 +188,6 @@
  "Template": "Template",
  "Templates": "Templates",
  "Theme": "Theme",
-  "This key expires within 30 days": "This key expires within 30 days",
-  "This key has expired": "This key has expired",
-  "This key never expires": "This key never expires",
  "To change your email, you have to enter your password and new email.": "To change your email, you have to enter your password and new email.",
  "Toggle full page width": "Toggle full page width",
  "Unable to import pages. Please try again.": "Unable to import pages. Please try again.",
@@ -220,7 +195,6 @@
  "Untitled": "Untitled",
  "Updated successfully": "Updated successfully",
  "User": "User",
-  "Within the last hour": "Within the last hour",
  "Workspace": "Workspace",
  "Workspace Name": "Workspace Name",
  "Workspace settings": "Workspace settings",
@@ -265,8 +239,6 @@
  "Comment re-opened successfully": "Comment re-opened successfully",
  "Comment unresolved successfully": "Comment unresolved successfully",
  "Failed to resolve comment": "Failed to resolve comment",
-  "Failed to re-open comment": "Failed to re-open comment",
-  "Comment no longer exists": "Comment no longer exists",
  "Resolve comment": "Resolve comment",
  "Unresolve comment": "Unresolve comment",
  "Resolve Comment Thread": "Resolve Comment Thread",
@@ -451,12 +423,9 @@
  "Write anything. Enter \"/\" for commands": "Write anything. Enter \"/\" for commands",
  "Write...": "Write...",
  "Column count": "Column count",
-  "Your personal API keys.": "Your personal API keys.",
  "{{count}} Columns": "{{count}} Columns",
  "{{count}} command available_one": "1 command available",
  "{{count}} command available_other": "{{count}} commands available",
-  "{{count}} edits": "{{count}} edits",
-  "{{count}} major": "{{count}} major",
  "{{count}} result available_one": "1 result available",
  "{{count}} result available_other": "{{count}} results available",
  "{{count}} result found_one": "{{count}} result found",
@@ -1449,30 +1418,5 @@
  "The commented text changed since this suggestion was made; it was not applied.": "The commented text changed since this suggestion was made; it was not applied.",
  "Dismiss": "Dismiss",
  "Suggestion dismissed": "Suggestion dismissed",
-  "Failed to dismiss suggestion": "Failed to dismiss suggestion",
-  "Save version": "Save version",
-  "Ctrl+S": "Ctrl+S",
-  "Version saved": "Version saved",
-  "Already saved as the latest version": "Already saved as the latest version",
-  "Agent version": "Agent version",
-  "Boundary": "Boundary",
-  "Autosave": "Autosave",
-  "Only versions": "Only versions",
-  "No saved versions yet.": "No saved versions yet.",
-  "Time worked on this article": "Time worked on this article",
-  "Show time worked on this page": "Show time worked on this page",
-  "Estimated time worked (inactivity gap {{gap}} min)": "Estimated time worked (inactivity gap {{gap}} min)",
-  "Estimate · timezone {{tz}} · inactivity gap {{gap}} min": "Estimate · timezone {{tz}} · inactivity gap {{gap}} min",
-  "No editing activity recorded yet.": "No editing activity recorded yet.",
-  "× {{count}} days without edits": "× {{count}} days without edits",
-  "agent: {{value}}": "agent: {{value}}",
-  "Work": "Work",
-  "Agent": "Agent",
-  "{{start}} – {{end}} · {{duration}}": "{{start}} – {{end}} · {{duration}}",
-  "≈ {{hours}}h {{minutes}}m": "≈ {{hours}}h {{minutes}}m",
-  "≈ {{hours}}h": "≈ {{hours}}h",
-  "≈ {{minutes}}m": "≈ {{minutes}}m",
-  "{{hours}}h {{minutes}}m": "{{hours}}h {{minutes}}m",
-  "{{hours}}h": "{{hours}}h",
-  "{{minutes}}m": "{{minutes}}m"
+  "Failed to dismiss suggestion": "Failed to dismiss suggestion"
 }
@@ -1,8 +1,4 @@
 {
-  "1 year": "1 год",
-  "30 days": "30 дней",
-  "90 days": "90 дней",
-  "A new version is available": "Доступна новая версия",
  "Account": "Аккаунт",
  "Active": "Активный",
  "Add": "Добавить",
@@ -13,16 +9,11 @@
  "Add space members": "Добавить участников пространства",
  "Add to favorites": "Добавить в избранное",
  "Admin": "Администратор",
-  "API key created": "API ключ создан",
-  "API key revoked": "API ключ отозван",
-  "API keys across the workspace.": "API ключи всего рабочего пространства.",
  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "Вы уверены, что хотите удалить эту группу? Участники потеряют доступ к материалам, к которым у этой группы есть доступ.",
  "Are you sure you want to delete this page?": "Вы уверены, что хотите удалить эту страницу?",
  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "Вы уверены, что хотите удалить этого пользователя из группы? Пользователь потеряет доступ к материалам, к которым есть доступ у этой группы.",
  "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "Вы уверены, что хотите удалить этого пользователя из пространства? Пользователь потеряет весь доступ к этому пространству.",
  "Are you sure you want to restore this version? Any changes not versioned will be lost.": "Вы уверены, что хотите восстановить эту версию? Все не зафиксированные изменения будут потеряны.",
-  "Are you sure you want to revoke \"{{name}}\"? Any client using this key will immediately lose access. This cannot be undone.": "Вы уверены, что хотите отозвать «{{name}}»? Любой клиент, использующий этот ключ, немедленно потеряет доступ. Это действие нельзя отменить.",
-  "Author": "Автор",
  "Can become members of groups and spaces in workspace": "Могут становиться участниками групп и пространств в рабочей области",
  "Can create and edit pages in space.": "Может создавать и редактировать страницы в пространстве.",
  "Can edit": "Может изменять",
@@ -41,14 +32,11 @@
  "Confirm": "Подтвердить",
  "Copy as Markdown": "Копировать как Markdown",
  "Copy link": "Копировать ссылку",
-  "Copy your API key now and store it somewhere safe. For security reasons it will not be shown again.": "Скопируйте API ключ сейчас и сохраните его в надёжном месте. В целях безопасности он больше не будет показан.",
  "Create": "Создать",
-  "Create API key": "Создать API ключ",
  "Create group": "Создать группу",
  "Create page": "Создать страницу",
  "Create space": "Создать пространство",
  "Create workspace": "Создать рабочую область",
-  "Critical": "Критично",
  "Current password": "Текущий пароль",
  "Dark": "Темная",
  "Date": "Дата",
@@ -57,7 +45,6 @@
  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "Вы уверены, что хотите удалить эту страницу? Это удалит её дочерние страницы, а также историю страницы. Это действие необратимо.",
  "Description": "Описание",
  "Details": "Подробности",
-  "Done": "Готово",
  "e.g ACME": "например, ACME",
  "e.g ACME Inc": "например, ACME Inc",
  "e.g Developers": "например, Developers",
@@ -67,15 +54,7 @@
  "e.g Sales": "например, Sales",
  "e.g Space for product team": "например, Пространство для команды продукта",
  "e.g Space for sales team to collaborate": "например, Пространство для совместной работы команды продаж",
-  "e.g. CI deploy token": "например, токен деплоя CI",
  "Edit": "Редактировать",
-  "Expiring soon": "Скоро истекает",
-  "Failed to create API key": "Не удалось создать API ключ",
-  "Failed to load API keys.": "Не удалось загрузить API ключи.",
-  "Failed to revoke API key": "Не удалось отозвать API ключ",
-  "Name is required": "Имя обязательно",
-  "Never used": "Не использовался",
-  "No API keys yet": "Пока нет API ключей",
  "Read": "Чтение",
  "Edit group": "Редактировать группу",
  "Email": "Электронная почта",
@@ -128,7 +107,6 @@
  "Link copied": "Ссылка скопирована",
  "Login": "Войти",
  "Logout": "Выйти",
-  "Major": "Существенно",
  "Manage Group": "Управление группой",
  "Manage members": "Управление участниками",
  "member": "участник",
@@ -155,8 +133,6 @@
  "page": "страница",
  "Page deleted successfully": "Страница успешно удалена",
  "Page history": "История страницы",
-  "Revoke API key": "Отозвать API ключ",
-  "Revoke {{name}}": "Отозвать {{name}}",
  "Select version": "Выбрать версию",
  "Highlight changes": "Выделить изменения",
  "Page import is in progress. Please do not close this tab.": "Импорт страницы в процессе. Пожалуйста, не закрывайте эту вкладку.",
@@ -212,9 +188,6 @@
  "Template": "Шаблон",
  "Templates": "Шаблоны",
  "Theme": "Тема",
-  "This key expires within 30 days": "Этот ключ истекает в течение 30 дней",
-  "This key has expired": "Этот ключ истек",
-  "This key never expires": "Этот ключ никогда не истекает",
  "To change your email, you have to enter your password and new email.": "Чтобы изменить электронную почту, вам нужно ввести пароль и новый адрес.",
  "Toggle full page width": "Переключить полную ширину страницы",
  "Unable to import pages. Please try again.": "Не удалось импортировать страницы. Пожалуйста, попробуйте ещё раз.",
@@ -222,7 +195,6 @@
  "Untitled": "Без названия",
  "Updated successfully": "Успешно обновлено",
  "User": "Пользователь",
-  "Within the last hour": "За последний час",
  "Workspace": "Рабочее пространство",
  "Workspace Name": "Название рабочего пространства",
  "Workspace settings": "Настройки рабочего пространства",
@@ -267,8 +239,6 @@
  "Comment re-opened successfully": "Комментарий успешно открыт повторно",
  "Comment unresolved successfully": "Комментарий успешно переведён в нерешённые",
  "Failed to resolve comment": "Не удалось разрешить комментарий",
-  "Failed to re-open comment": "Не удалось переоткрыть комментарий",
-  "Comment no longer exists": "Комментарий больше не существует",
  "Resolve comment": "Решить комментарий",
  "Unresolve comment": "Снять статус решённого с комментария",
  "Resolve Comment Thread": "Решить ветку комментариев",
@@ -459,12 +429,9 @@
  "Write anything. Enter \"/\" for commands": "Пишите что угодно. Введите \"/\" для команд",
  "Write...": "Напишите...",
  "Column count": "Количество столбцов",
-  "Your personal API keys.": "Ваши личные API ключи.",
  "{{count}} Columns": "{count, plural, one{# столбец} few{# столбца} many{# столбцов} other{# столбца}}",
  "{{count}} command available_one": "Доступна 1 команда",
  "{{count}} command available_other": "Доступно {{count}} команд",
-  "{{count}} edits": "{count, plural, one{# правка} few{# правки} many{# правок} other{# правки}}",
-  "{{count}} major": "{count, plural, one{# существенная} few{# существенных} many{# существенных} other{# существенных}}",
  "{{count}} result available_one": "Доступен 1 результат",
  "{{count}} result available_other": "Доступно {{count}} результатов",
  "{{count}} result found_one": "Найден {{count}} результат",
@@ -1466,30 +1433,5 @@
  "The commented text changed since this suggestion was made; it was not applied.": "Прокомментированный текст изменился после создания предложения; оно не было применено.",
  "Dismiss": "Не применять",
  "Suggestion dismissed": "Предложение отклонено",
-  "Failed to dismiss suggestion": "Не удалось отклонить предложение",
-  "Save version": "Сохранить версию",
-  "Ctrl+S": "Ctrl+S",
-  "Version saved": "Версия сохранена",
-  "Already saved as the latest version": "Уже сохранено как последняя версия",
-  "Agent version": "Версия агента",
-  "Boundary": "Граница",
-  "Autosave": "Автосейв",
-  "Only versions": "Только версии",
-  "No saved versions yet.": "Пока нет сохранённых версий.",
-  "Time worked on this article": "Время работы над статьёй",
-  "Show time worked on this page": "Показать время работы над страницей",
-  "Estimated time worked (inactivity gap {{gap}} min)": "Оценка времени работы (порог паузы {{gap}} мин)",
-  "Estimate · timezone {{tz}} · inactivity gap {{gap}} min": "Оценка · таймзона {{tz}} · порог паузы {{gap}} мин",
-  "No editing activity recorded yet.": "Правок пока нет.",
-  "× {{count}} days without edits": "× {{count}} дн. без правок",
-  "agent: {{value}}": "агент: {{value}}",
-  "Work": "Работа",
-  "Agent": "Агент",
-  "{{start}} – {{end}} · {{duration}}": "{{start}} – {{end}} · {{duration}}",
-  "≈ {{hours}}h {{minutes}}m": "≈ {{hours}} ч {{minutes}} мин",
-  "≈ {{hours}}h": "≈ {{hours}} ч",
-  "≈ {{minutes}}m": "≈ {{minutes}} мин",
-  "{{hours}}h {{minutes}}m": "{{hours}} ч {{minutes}} м",
-  "{{hours}}h": "{{hours}} ч",
-  "{{minutes}}m": "{{minutes}} м"
+  "Failed to dismiss suggestion": "Не удалось отклонить предложение"
 }
@@ -44,12 +44,6 @@ const AccountSettings = lazy(
 const AccountPreferences = lazy(
  () => import("@/pages/settings/account/account-preferences.tsx"),
 );
-// #506 — lazy leaf (own chunk): the API-keys management page is route-split so
-// its code (Mantine table/modals + the create/revoke flow) stays out of the
-// entry bundle (post-#342 bundle discipline).
-const AccountApiKeys = lazy(
-  () => import("@/pages/settings/account/account-api-keys.tsx"),
-);
 const WorkspaceSettings = lazy(
  () => import("@/pages/settings/workspace/workspace-settings"),
 );
@@ -111,7 +105,6 @@ export default function App() {
              path={"account/preferences"}
              element={<AccountPreferences />}
            />
-            <Route path={"account/api-keys"} element={<AccountApiKeys />} />
            <Route path={"workspace"} element={<WorkspaceSettings />} />
            <Route path={"ai"} element={<AiSettings />} />
            <Route path={"members"} element={<WorkspaceMembers />} />
@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { isChunkLoadError } from "./chunk-load-error-boundary";
+import { isChunkLoadError, shouldAutoReload } from "./chunk-load-error-boundary";

 // The detector decides whether a caught render error is a stale-deploy chunk-404
 // (→ auto-reload to fetch the new manifest) vs a genuine app error (→ generic
@@ -35,3 +35,31 @@ describe("isChunkLoadError", () => {
    expect(isChunkLoadError(err)).toBe(false);
  });
 });
+
+// The window gate replaces the old one-shot flag: it must permit recovery across
+// several deploys in one tab (each > window apart) while still stopping an infinite
+// reload loop when a lazy chunk is permanently broken (a second failure < window).
+describe("shouldAutoReload", () => {
+  const WINDOW = 5 * 60 * 1000;
+  const NOW = 1_000_000_000_000;
+
+  it("allows a reload when we have never auto-reloaded", () => {
+    expect(shouldAutoReload(NOW, null, WINDOW)).toBe(true);
+  });
+
+  it("allows a reload when the last one was 6 minutes ago (outside the window)", () => {
+    expect(shouldAutoReload(NOW, NOW - 6 * 60 * 1000, WINDOW)).toBe(true);
+  });
+
+  it("blocks a reload when the last one was 1 minute ago (inside the window)", () => {
+    expect(shouldAutoReload(NOW, NOW - 1 * 60 * 1000, WINDOW)).toBe(false);
+  });
+
+  it("blocks a reload exactly at the window boundary (not strictly older)", () => {
+    expect(shouldAutoReload(NOW, NOW - WINDOW, WINDOW)).toBe(false);
+  });
+
+  it("allows a reload when the stored timestamp is unparseable (NaN)", () => {
+    expect(shouldAutoReload(NOW, NaN, WINDOW)).toBe(true);
+  });
+});
@@ -1,11 +1,26 @@
 import { ReactNode } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { Button, Center, Stack, Text } from "@mantine/core";
-import {
-  hasAutoReloaded,
-  markAutoReloaded,
-  recordReloadBreadcrumb,
-} from "@/lib/reload-guard";
+
+// sessionStorage key holding the epoch-ms timestamp of the last automatic reload.
+const RELOAD_AT_KEY = "chunk-reload-at";
+// Allow at most one automatic reload per this window. A stale-deploy 404 is cured
+// by a single reload, so anything inside the window is treated as a reload loop
+// (permanently-broken chunk) and falls through to the manual UI. A window (rather
+// than a one-shot flag) lets a SECOND deploy in the same tab's lifetime recover too.
+const RELOAD_WINDOW_MS = 5 * 60 * 1000;
+
+// Pure window decision, unit-tested in isolation: auto-reload only if we have never
+// auto-reloaded (lastReloadAt null/NaN) or the last one was strictly older than the
+// window. Anything inside the window is suppressed to break an infinite reload loop.
+export function shouldAutoReload(
+  now: number,
+  lastReloadAt: number | null,
+  windowMs: number,
+): boolean {
+  if (lastReloadAt === null || Number.isNaN(lastReloadAt)) return true;
+  return now - lastReloadAt > windowMs;
+}

 // Heuristic detection of a failed dynamic import. Since the code-splitting work,
 // every route (plus Aside / AiChatWindow) is React.lazy: when a new deploy
@@ -24,26 +39,24 @@ export function isChunkLoadError(error: unknown): boolean {
  );
 }

-// Exported for tests: the reactive chunk-load reload decision, so the shared
-// window budget (invariant: ≤1 auto-reload per window across this path AND the
-// proactive version-coherence path) can be exercised against the real guard.
-export function handleError(error: unknown) {
+function handleError(error: unknown) {
  if (!isChunkLoadError(error)) return;
  // A stale-chunk 404 is cured by a full reload that re-fetches index.html and
-  // the new chunk manifest. Auto-reload at most once per window via the SHARED
-  // window-based reload guard (see @/lib/reload-guard — the same budget the
-  // proactive version-coherence path consumes, so a mismatch that arrives on
-  // both paths reloads at most once per window across BOTH). This recovers
-  // across multiple deploys in a single tab's lifetime, yet a permanently-broken
-  // lazy chunk (which would loop) is stopped after the first reload and falls
-  // through to the manual recovery UI below. If the shared budget is already
-  // spent this window, or the stamp write fails (storage unavailable), we return
-  // without reloading rather than risk a loop.
-  if (hasAutoReloaded()) return;
-  if (!markAutoReloaded()) return;
-  // Trace before the reload clears the console (same diagnostic breadcrumb the
-  // proactive version-coherence path writes, tagged with this path).
-  recordReloadBreadcrumb({ path: "chunk-boundary" });
+  // the new chunk manifest. Auto-reload at most once per RELOAD_WINDOW_MS: this
+  // recovers across multiple deploys in a single tab's lifetime, yet a
+  // permanently-broken lazy chunk (which would loop) is stopped after the first
+  // reload and falls through to the manual recovery UI below.
+  try {
+    const raw = sessionStorage.getItem(RELOAD_AT_KEY);
+    const lastReloadAt = raw === null ? null : Number.parseInt(raw, 10);
+    const now = Date.now();
+    if (!shouldAutoReload(now, lastReloadAt, RELOAD_WINDOW_MS)) return;
+    sessionStorage.setItem(RELOAD_AT_KEY, String(now));
+  } catch {
+    // sessionStorage unavailable (private mode / disabled): skip the automatic
+    // reload rather than risk an unguarded loop; the fallback UI still recovers.
+    return;
+  }
  window.location.reload();
 }

@@ -10,7 +10,6 @@ import {
  IconBrush,
  IconWorld,
  IconSparkles,
-  IconKey,
 } from "@tabler/icons-react";
 import { Link, useLocation } from "react-router-dom";
 import classes from "./settings.module.css";
@@ -47,11 +46,6 @@ const groupedData: DataGroup[] = [
        icon: IconBrush,
        path: "/settings/account/preferences",
      },
-      {
-        label: "API keys",
-        icon: IconKey,
-        path: "/settings/account/api-keys",
-      },
    ],
  },
  {
@@ -58,11 +58,8 @@ import ConversationList from "@/features/ai-chat/components/conversation-list.ts
 import ChatThread from "@/features/ai-chat/components/chat-thread.tsx";
 import {
  exportAiChat,
-  getAiChatMessagesDelta,
  stopRun,
 } from "@/features/ai-chat/services/ai-chat-service.ts";
-import { mergeDeltaRowsIntoPages } from "@/features/ai-chat/utils/resume-helpers.ts";
-import type { IAiChatMessageRow } from "@/features/ai-chat/types/ai-chat.types.ts";
 import { useChatSession } from "@/features/ai-chat/hooks/use-chat-session.ts";
 import {
  shouldCollapseOnOutsidePointer,
@@ -272,64 +269,17 @@ export default function AiChatWindow() {
  const { data: messageRows, isLoading: messagesLoading } =
    useAiChatMessagesQuery(
      activeChatId ?? undefined,
-      // #491: the full infinite-query no longer POLLS. It seeds the thread ONCE; the
-      // degraded fallback now runs a DELTA poller (below) that augments THIS cache
-      // idempotently, instead of refetching every page (with full parts) every 2.5s.
-      false,
-      // #344: gate on windowOpen too — no message history is fetched while the window
-      // is closed; it loads when the window opens with an active chat.
+      // DELIBERATELY DUMB: poll every 2.5s WHILE ARMED, otherwise off. NO error
+      // checks (TanStack resets fetchFailureCount each fetch; the poll must survive
+      // a server restart), NO tail checks, NO cap here — the settled/stalled/idle-cap
+      // semantics all live in ChatThread's FSM, which disarms via onResumeFallback.
+      () => (degradedPoll === true ? 2500 : false),
+      // #344: gate on windowOpen too — no message history is fetched (and no
+      // degraded poll runs) while the window is closed; it loads when the window
+      // opens with an active chat.
      windowOpen,
    );

-  // #491 degraded DELTA poll. While armed (degradedPoll) and the window is open on a
-  // chat, poll POST /ai-chat/messages/delta every 2.5s: it returns only the rows
-  // CHANGED since the previous cursor (+ the run fact) in ONE round-trip. We merge
-  // those rows into the SAME infinite-query cache the thread reads (idempotently by
-  // id — the delta's overlap window re-delivers rows), so the thread's reconcile
-  // effect follows the detached run to its terminal row from a fraction of the wire
-  // cost. The run-fact settle stays the thread FSM's job (row-status reconcile), so
-  // we do NOT double-poll /run here. Cursor resets when the chat changes / disarms.
-  const deltaCursorRef = useRef<string | undefined>(undefined);
-  useEffect(() => {
-    deltaCursorRef.current = undefined;
-  }, [activeChatId, degradedPoll]);
-  useEffect(() => {
-    if (!degradedPoll || !windowOpen || !activeChatId) return;
-    const chatId = activeChatId;
-    let cancelled = false;
-    const tick = async (): Promise<void> => {
-      try {
-        const res = await getAiChatMessagesDelta(chatId, deltaCursorRef.current);
-        if (cancelled) return;
-        deltaCursorRef.current = res.cursor;
-        if (res.rows.length > 0) {
-          queryClient.setQueryData(
-            AI_CHAT_MESSAGES_RQ_KEY(chatId),
-            (
-              old:
-                | {
-                    pages: { items: IAiChatMessageRow[]; meta: unknown }[];
-                    pageParams: unknown[];
-                  }
-                | undefined,
-            ) =>
-              old
-                ? { ...old, pages: mergeDeltaRowsIntoPages(old.pages, res.rows) }
-                : old,
-          );
-        }
-      } catch {
-        // Transient failure (e.g. a server restart mid-run): swallow and retry on
-        // the next tick — the poll must survive a bounce, like the old dumb refetch.
-      }
-    };
-    const id = setInterval(() => void tick(), 2500);
-    return () => {
-      cancelled = true;
-      clearInterval(id);
-    };
-  }, [degradedPoll, windowOpen, activeChatId, queryClient]);
-
  // #184 reconnect-and-live-follow. Whether detached agent runs are enabled for
  // this workspace. When the feature is off no runs are ever created, so the
  // resume attempt would only ever 204; gating ChatThread's resume on it avoids a
@@ -172,18 +172,9 @@ function resetState() {
  h.state.getRun.mockResolvedValue({ run: null, message: null });
 }

-// #491: the streaming tail carries a persisted step frontier (metadata.stepsPersisted),
-// which the tail-only attach reads as `n` in `?anchor=<id>&n=<n>`. Seeded WHOLE now.
 const streamingTail = () => [
  row("u1", "user", undefined, "hi"),
-  {
-    id: "a1",
-    role: "assistant",
-    content: "partial",
-    status: "streaming",
-    createdAt: "2026-01-01T00:00:00Z",
-    metadata: { stepsPersisted: 2 },
-  } as IAiChatMessageRow,
+  row("a1", "assistant", "streaming", "partial"),
 ];
 const settledTail = () => [
  row("u1", "user", undefined, "hi"),
@@ -344,24 +335,20 @@ describe("ChatThread — send now", () => {
    expect(screen.getAllByLabelText("Remove queued message")).toHaveLength(1);
  });

-  it("Stop then a REAL network-drop finish exits to idle (honor-in-stopping), NOT a false reconnect", async () => {
+  it("Stop then a REAL network-drop finish exits to idle (honor-in-stopping), NOT a false reconnect", () => {
    // Regression for the disconnect-first reorder: on the STOP path, even a drop-
    // form finish { isError:true, isDisconnect:true } arriving in `stopping` must be
    // HONORED (reducer) and exit to idle — it must NOT enter the reconnect ladder.
    startLocalStreamWithRun(); // live local stream, autonomous
    fireEvent.click(screen.getByLabelText("Stop")); // STOP_REQUESTED -> stopping
    h.state.error = { message: "Failed to fetch" };
-    // #491: the disconnect re-seeds from persist (async getRun) before dispatching
-    // FINISH_DISCONNECT, which the reducer HONORS in `stopping` -> idle. Flush it.
-    await act(async () => {
+    act(() => {
      h.state.onFinish?.({
        message: { id: "a1", role: "assistant", parts: [] },
        isAbort: false,
        isDisconnect: true,
        isError: true,
      });
-      await Promise.resolve();
-      await Promise.resolve();
    });
    expect(screen.queryByText(/reconnecting/i)).toBeNull();
  });
@@ -816,24 +803,19 @@ describe("ChatThread — resume (attach) machinery", () => {
    expect(h.state.resumeStream).not.toHaveBeenCalled();
  });

-  it("#491 tail-only: seeds the streaming tail WHOLE (no strip), keeps a user tail whole", () => {
+  it("strips the streaming tail from the seed, keeps a user tail whole", () => {
    renderThread({ autonomousRunsEnabled: true, initialRows: streamingTail() });
-    // MUTATION-VERIFY: re-introduce the seed-strip and this goes red — the streaming
-    // tail (steps 0..N-1) MUST be seeded so the SDK continuation appends the tail to
-    // the RIGHT message. Both rows (user + assistant) are seeded.
-    expect(h.state.seededMessages).toHaveLength(2);
+    expect(h.state.seededMessages).toHaveLength(1);
    cleanup();
    resetState();
    renderThread({ autonomousRunsEnabled: true, initialRows: userTail() });
    expect(h.state.seededMessages).toHaveLength(1);
  });

-  it("#491 tail-only: builds the attach URL with ?anchor=&n= from the persisted step frontier", () => {
+  it("builds the attach URL with expect=live&anchor only for a stripped streaming tail", () => {
    renderThread({ autonomousRunsEnabled: true, initialRows: streamingTail() });
-    // n=2 comes from a1's metadata.stepsPersisted (MUTATION-VERIFY: hardcode n=0 and
-    // this fails). No `expect=live` param anymore.
    expect(h.state.transport!.prepareReconnectToStreamRequest!().api).toBe(
-      "/api/ai-chat/runs/c1/stream?anchor=a1&n=2",
+      "/api/ai-chat/runs/c1/stream?expect=live&anchor=a1",
    );
    cleanup();
    resetState();
@@ -857,41 +839,39 @@ describe("ChatThread — resume (attach) machinery", () => {
    });
  }

-  it("204 on a streaming tail: NO restore (row kept) + invalidate + onResumeFallback(true)", async () => {
+  it("204 on a streaming tail: restore + invalidate + onResumeFallback(true)", async () => {
    const { onResumeFallback, invalidateSpy } = renderThread({
      autonomousRunsEnabled: true,
      initialRows: streamingTail(),
    });
    await attachFetch({ status: 204, ok: false });
-    // #491 tail-only: the anchor row was never stripped, so there is NOTHING to
-    // restore. MUTATION-VERIFY: re-add a restore setMessages here and it goes red.
-    expect(h.state.setMessages).not.toHaveBeenCalled();
+    expect(h.state.setMessages).toHaveBeenCalledTimes(1); // restore
    expect(invalidateSpy).toHaveBeenCalledWith({
      queryKey: ["ai-chat-messages", "c1"],
    });
    expect(onResumeFallback).toHaveBeenCalledWith(true);
  });

-  it("F7 restart-survival: a 500 attach failure arms the poll WITHOUT a restore", async () => {
+  it("F7 restart-survival: a 500 attach failure restores the row AND arms the poll", async () => {
    const { onResumeFallback, invalidateSpy } = renderThread({
      autonomousRunsEnabled: true,
      initialRows: streamingTail(),
    });
    await attachFetch({ status: 500, ok: false });
-    expect(h.state.setMessages).not.toHaveBeenCalled();
+    expect(h.state.setMessages).toHaveBeenCalledTimes(1);
    expect(invalidateSpy).toHaveBeenCalledWith({
      queryKey: ["ai-chat-messages", "c1"],
    });
    expect(onResumeFallback).toHaveBeenCalledWith(true);
  });

-  it("F7 restart-survival: a network throw arms the poll WITHOUT a restore", async () => {
+  it("F7 restart-survival: a network throw restores the row AND arms the poll", async () => {
    const { onResumeFallback, invalidateSpy } = renderThread({
      autonomousRunsEnabled: true,
      initialRows: streamingTail(),
    });
    await attachFetch(new Error("network down"), true);
-    expect(h.state.setMessages).not.toHaveBeenCalled();
+    expect(h.state.setMessages).toHaveBeenCalledTimes(1);
    expect(invalidateSpy).toHaveBeenCalledWith({
      queryKey: ["ai-chat-messages", "c1"],
    });
@@ -951,7 +931,7 @@ describe("ChatThread — resume (attach) machinery", () => {
    expect(h.state.sendMessage).not.toHaveBeenCalled();
  });

-  it("an empty resumed message (starved replay) arms the poll WITHOUT a restore", () => {
+  it("an empty resumed message (starved replay) restores the row AND arms the poll", () => {
    h.state.status = "ready";
    const { onResumeFallback } = renderThread({
      autonomousRunsEnabled: true,
@@ -967,9 +947,7 @@ describe("ChatThread — resume (attach) machinery", () => {
        isError: false,
      });
    });
-    // #491 tail-only: the seeded steps 0..N-1 are still on screen (the SDK
-    // continuation never wiped them), so there is nothing to restore — just poll.
-    expect(h.state.setMessages).not.toHaveBeenCalled();
+    expect(h.state.setMessages).toHaveBeenCalledTimes(1); // restore
    expect(onResumeFallback).toHaveBeenCalledWith(true); // arm
  });

@@ -1017,41 +995,24 @@ describe("ChatThread — live reconnect + stalled", () => {
    cleanup();
  });

-  // #491: the authoritative PERSISTED assistant row `getRun` projects on a local
-  // disconnect — the re-seed source. Its metadata.stepsPersisted becomes `n`.
-  const persistedAnchor = (steps = 3) => ({
-    run: { id: "run-1", status: "running" },
-    message: {
-      id: "a2",
-      role: "assistant",
-      content: "persisted 0..N-1",
-      status: "streaming",
-      createdAt: "2026-01-01T00:00:00Z",
-      metadata: { stepsPersisted: steps },
-    },
-  });
-
  // A REAL live SSE drop. ai@6.0.207 emits BOTH { isError:true, isDisconnect:true }
-  // for a network TypeError AND sets useChat `error`. #491: an autonomous local drop
-  // now RE-SEEDS from persist (async getRun) BEFORE entering the reconnect ladder, so
-  // this helper is async and flushes the getRun microtask before returning.
-  async function disconnect(message: unknown = liveMsg) {
+  // for a network TypeError AND sets useChat `error` — NOT the { isError:false,
+  // error:null } form the old tests fed. This is the form browser QA hit; with the
+  // buggy isError-first routing OR without the errorView render-gate these tests go
+  // red (a real drop surfaces the terminal error banner, masking the reconnect
+  // ladder). MUTATION-VERIFY of disconnect-first + the errorView phase-gate.
+  function disconnect(message: unknown = liveMsg) {
    h.state.error = { message: "Failed to fetch" }; // the SDK sets error on the drop
-    await act(async () => {
+    act(() => {
      h.state.onFinish?.({
        message,
        isAbort: false,
        isDisconnect: true,
        isError: true,
      });
-      // Flush the getRun().then re-seed + the deferred FINISH_DISCONNECT dispatch.
-      await Promise.resolve();
-      await Promise.resolve();
    });
  }
  function renderLive() {
-    // The persisted-anchor read the local disconnect performs to re-seed from persist.
-    h.state.getRun.mockResolvedValue(persistedAnchor());
    const view = renderThread({
      autonomousRunsEnabled: true,
      initialRows: settledTail(),
@@ -1071,80 +1032,35 @@ describe("ChatThread — live reconnect + stalled", () => {
    });
  }

-  it("#491: a live disconnect RE-SEEDS from persist, then backs off to reconnect with ?anchor=&n=", async () => {
+  it("a live disconnect starts a backoff reconnect (banner + resumeStream after backoff)", () => {
    renderLive();
-    await disconnect();
-    // The re-seed read the authoritative persisted row and replaced the live partial.
-    // MUTATION-VERIFY: skip the getRun re-seed (send `n` off the live message) and the
-    // n below no longer matches the PERSISTED stepsPersisted.
-    expect(h.state.getRun).toHaveBeenCalledWith("c1");
-    expect(h.state.setMessages).toHaveBeenCalled(); // re-seeded the store from persist
+    disconnect();
    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
    expect(h.state.resumeStream).not.toHaveBeenCalled();
    advanceToAttempt(1);
    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
-    // n=3 is the PERSISTED row's stepsPersisted (from getRun), NOT the live store.
    expect(h.state.transport!.prepareReconnectToStreamRequest!().api).toBe(
-      "/api/ai-chat/runs/c1/stream?anchor=a2&n=3",
+      "/api/ai-chat/runs/c1/stream?expect=live&anchor=a2",
    );
  });

-  it("#491 regression (#137/#161 dup): getRun REJECT on a live disconnect drops the live partial + nulls the anchor", async () => {
-    // The re-seed source (getRun) FAILS — a flaky-network blip (SSE + getRun both
-    // fail, network recovers in ~1s). The OLD .catch just re-entered the ladder with
-    // NO re-seed and NO filter, so the reconnect could tail-apply the registry's
-    // frames onto the live partial that ALREADY has those steps -> duplicated text.
-    renderLive();
-    h.state.getRun.mockReset();
-    h.state.getRun.mockRejectedValue(new Error("network"));
-    await disconnect(); // live partial = liveMsg (id "a2")
-    expect(h.state.getRun).toHaveBeenCalledWith("c1");
-    // THE GUARANTEE: on the getRun failure the live partial (a2) is FILTERED from the
-    // store, so the reconnect can never tail-apply already-present steps onto it.
-    // MUTATION-VERIFY: revert the .catch fix (enterReconnect only, no filter) and no
-    // setMessages call removes a2 -> this reddens.
-    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);
-    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
-    advanceToAttempt(1);
-    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
-    // Anchor was nulled -> replay-from-start (no params) / 204 -> poll; never a stale
-    // ?anchor=&n= over the live partial.
-    expect(h.state.transport!.prepareReconnectToStreamRequest!().api).toBe(
-      "/api/ai-chat/runs/c1/stream",
-    );
-  });
-
-  it("#488 (browser QA): the reconnect banner is SHOWN, not masked by the residual useChat error", async () => {
+  it("#488 (browser QA): the reconnect banner is SHOWN, not masked by the residual useChat error", () => {
    // The drop sets useChat `error` (real SDK), and the terminal errorView describes
    // it ("Lost connection to the server"). The FSM phase-gate must let the
    // `reconnecting` banner WIN over that residual error. MUTATION-VERIFY: revert the
    // errorView phase-gate (show errorView whenever error is set) and the terminal
    // banner masks "reconnecting…" -> red.
    renderLive();
-    await disconnect();
+    disconnect();
    expect(h.state.error).not.toBeNull(); // the SDK error IS set during recovery
    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
    // The terminal "Lost connection… reload" banner must NOT be showing.
    expect(screen.queryByText(/reload and try again/i)).toBeNull();
  });

-  it("#488 commit 2: a disconnect BEFORE the first assistant frame reconnects with NO anchor", async () => {
+  it("#488 commit 2: a disconnect BEFORE the first assistant frame reconnects with NO anchor", () => {
    renderLive();
-    // No persisted assistant row for a pre-first-frame break -> no anchor.
-    h.state.getRun.mockResolvedValue({ run: null, message: null });
-    await disconnect(null); // no assistant message yet (pre-first-frame break)
+    disconnect(null); // no assistant message yet (pre-first-frame break)
    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
    expect(
      screen.queryByText("Connection lost — the answer was interrupted."),
@@ -1158,7 +1074,7 @@ describe("ChatThread — live reconnect + stalled", () => {

  it("a live re-attach (2xx) clears the reconnect banner", async () => {
    renderLive();
-    await disconnect();
+    disconnect();
    advanceToAttempt(1);
    await reconnect({ status: 200, ok: true });
    expect(screen.queryByText(/reconnecting/i)).toBeNull();
@@ -1166,7 +1082,7 @@ describe("ChatThread — live reconnect + stalled", () => {

  it("a 204 arms the degraded poll and backs off to the next attempt", async () => {
    const { onResumeFallback } = renderLive();
-    await disconnect();
+    disconnect();
    advanceToAttempt(1);
    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
    await reconnect({ status: 204, ok: false });
@@ -1178,7 +1094,7 @@ describe("ChatThread — live reconnect + stalled", () => {

  it("exhausts the attempt limit into a manual Retry, which restarts the sequence", async () => {
    renderLive();
-    await disconnect();
+    disconnect();
    for (let n = 1; n <= 5; n++) {
      advanceToAttempt(n);
      expect(h.state.resumeStream).toHaveBeenCalledTimes(n);
@@ -1196,23 +1112,22 @@ describe("ChatThread — live reconnect + stalled", () => {
  it("#488 commit 3: two breaks in a row produce two reconnect cycles", async () => {
    renderLive();
    // First break -> reconnect -> re-attach live.
-    await disconnect();
+    disconnect();
    advanceToAttempt(1);
    expect(h.state.resumeStream).toHaveBeenCalledTimes(1);
    await reconnect({ status: 200, ok: true });
    expect(screen.queryByText(/reconnecting/i)).toBeNull();
-    // The re-attached observer (live-follow) stream drops AGAIN -> a SECOND reconnect
-    // cycle. #491: this too re-seeds from persist before re-attaching (never tail-
-    // applies over the live-follow partial).
-    await disconnect();
+    // The re-attached observer stream drops AGAIN -> a SECOND reconnect cycle
+    // (the old one-shot !wasResumed gate sent this to silent poll).
+    disconnect();
    expect(screen.getByText(/reconnecting/i)).toBeTruthy();
    advanceToAttempt(1);
    expect(h.state.resumeStream).toHaveBeenCalledTimes(2);
  });

-  it("does NOT reconnect when autonomous runs are disabled", async () => {
+  it("does NOT reconnect when autonomous runs are disabled", () => {
    renderThread({ autonomousRunsEnabled: false, initialRows: settledTail() });
-    await disconnect();
+    disconnect();
    expect(screen.queryByText(/reconnecting/i)).toBeNull();
    expect(
      screen.getByText("Connection lost — the answer was interrupted."),
@@ -1223,7 +1138,7 @@ describe("ChatThread — live reconnect + stalled", () => {

  it("#488 commit 4a: the poll idle cap surfaces a stalled banner + Retry (not silent)", async () => {
    renderLive();
-    await disconnect();
+    disconnect();
    advanceToAttempt(1);
    await reconnect({ status: 204, ok: false }); // arms the poll (reconnecting)
    // No activity for the whole idle cap -> stalled.
@@ -1254,88 +1169,4 @@ 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);
-  });
 });
@@ -42,7 +42,7 @@ import { assistantMessageHasVisibleContent } from "@/features/ai-chat/utils/mess
 import {
  isStreamingTail,
  isSettledAssistantTail,
-  stepsPersistedOf,
+  seedRows,
  mergeById,
 } from "@/features/ai-chat/utils/resume-helpers.ts";
 import { getRun } from "@/features/ai-chat/services/ai-chat-service.ts";
@@ -81,17 +81,6 @@ 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 {
@@ -277,36 +266,25 @@ export default function ChatThread({
  // is NOT one of the lifecycle flags the FSM replaced.
  const mountedRef = useRef(true);

-  // attachStrategy DATA (behind the resumeStream effect; #491 tail-only, WITHOUT
-  // touching the FSM). The controller is effect-owned (aborted in cleanup, I5).
-  // `anchorRef` is the PERSISTED assistant row that pins the run (server invariant
-  // 6) and its persisted step frontier N: it feeds `?anchor=<id>&n=<stepsPersisted>`
-  // so the tail-only attach returns frames for steps >= N (the seed carries 0..N-1).
-  // It is NOT a "stripped" row — the seed keeps every row (tail-only replaces the
-  // old full-replay+strip). Null when there is no streaming/active tail to resume.
+  // attachStrategy DATA (behind the resumeStream effect; #491 swaps it to tail-only
+  // WITHOUT touching the FSM). The controller is effect-owned (aborted in cleanup,
+  // I5). `stripRef`/`strippedRowRef` are the current full-replay+strip anchor.
  const attachAbortRef = useRef<AbortController | null>(null);
-  const anchorRef = useRef<{ id: string; stepsPersisted: number } | null>(
-    (() => {
-      if (chatId === null || !isStreamingTail(initialRows ?? [])) return null;
-      const rows = initialRows ?? [];
-      const tail = rows[rows.length - 1];
-      return { id: tail.id, stepsPersisted: stepsPersistedOf(tail) };
-    })(),
+  const stripRef = useRef(chatId !== null && isStreamingTail(initialRows ?? []));
+  const strippedRowRef = useRef<IAiChatMessageRow | null>(
+    stripRef.current ? (initialRows ?? [])[initialRows!.length - 1] : null,
  );
  // Effect-owned backoff timers (not lifecycle flags): the reconnect ladder and the
  // 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
-  // to it by the SDK continuation (readUIMessageStream({ message })), so it must be
-  // present in the store for the attach to continue the RIGHT message.
  const initialMessages = useMemo<UIMessage[]>(
-    () => (initialRows ?? []).map(rowToUiMessage),
+    () =>
+      seedRows(
+        initialRows ?? [],
+        stripRef.current && autonomousRunsEnabled === true,
+      ).map(rowToUiMessage),
    [initialRows],
  );

@@ -357,16 +335,21 @@ export default function ChatThread({
    (eff: RunEffect, epoch: number) => {
      switch (eff.type) {
        case "resumeStream": {
-          // The attach GET. Stamp the outcome's generation (I1). #491 tail-only: the
-          // store already holds EXACTLY the persisted steps 0..N-1 (the mount seed IS
-          // persist; a reconnect was re-seeded from persist BEFORE FINISH_DISCONNECT
-          // scheduled it — see the onFinish disconnect handler), so there is nothing
-          // to filter here: the SDK continues that seeded message, appending the tail
-          // (steps >= N) without duplicating the pre-drop partial step.
+          // The attach GET. Stamp the outcome's generation (I1). A reconnect
+          // attempt filters the pinned live row from the store first (the mount
+          // seed already stripped it), so the live replay's text-start rebuilds it
+          // without duplicating parts (#430).
          pendingAttachEpochRef.current = epoch;
          // The resumed stream's onFinish is stamped with THIS attach generation
          // (F1), so a superseded attempt's late finish is dropped.
          turnEpochRef.current = epoch;
+          if (machineRef.current.phase.name === "reconnecting") {
+            const anchor = strippedRowRef.current;
+            if (anchor)
+              setMessagesRef.current?.((prev) =>
+                prev.filter((m) => m.id !== anchor.id),
+              );
+          }
          void resumeStreamRef.current?.();
          break;
        }
@@ -481,23 +464,18 @@ export default function ChatThread({
      new DefaultChatTransport<UIMessage>({
        api: "/api/ai-chat/stream",
        credentials: "include",
-        prepareReconnectToStreamRequest: () => {
-          // #491 tail-only attach URL. When there is an anchor (a streaming/active
-          // tail to resume) build `?anchor=<assistantRowId>&n=<stepsPersisted>`: the
-          // server returns the TAIL — a synthetic `start` frame + frames for steps
-          // >= n, then live — which the SDK continuation appends to the seeded row.
-          // The server 204s (-> restore-noop + poll) when it cannot cover the
-          // frontier (overflow/rotation gap) or the anchor mismatches (a newer run).
-          // No anchor (a user tail / pre-first-frame break) => no params.
-          const anchor = anchorRef.current;
-          return {
-            api: `/api/ai-chat/runs/${chatIdRef.current}/stream${
-              anchor
-                ? `?anchor=${anchor.id}&n=${anchor.stepsPersisted}`
-                : ""
-            }`,
-          };
-        },
+        prepareReconnectToStreamRequest: () => ({
+          // Build the attach URL from the REAL chat id. ?expect=live&anchor=<row id>
+          // only when a streaming tail was stripped: expect=live opts into a
+          // finished-retained replay (safe only because the row is stripped and the
+          // replay rebuilds it), and the anchor pins the replay to OUR run — a
+          // mismatching (newer) run 204s into the restore+poll path instead.
+          api: `/api/ai-chat/runs/${chatIdRef.current}/stream${
+            stripRef.current
+              ? `?expect=live&anchor=${strippedRowRef.current!.id}`
+              : ""
+          }`,
+        }),
        fetch: async (input: RequestInfo | URL, init: RequestInit = {}) => {
          if ((init.method ?? "GET") !== "GET") {
            // Send path (POST). #488 commit 5: NO client 409 retry ladder anymore
@@ -584,9 +562,8 @@ export default function ChatThread({

  // Attach GET outcome -> FSM event. The epoch guard replaces BOTH the one-shot
  // 204 guard (noStreamHandledRef) and the unmount gate: a stale/superseded or
-  // post-DISPOSE outcome is dropped (I1). #491 tail-only: on a NONE outcome there is
-  // NOTHING to restore — the anchor row was never stripped from the view (the seed
-  // keeps it) — so we only invalidate for a fresh poll + dispatch the FSM event.
+  // post-DISPOSE outcome is dropped (I1). For a NONE outcome the attachStrategy
+  // recovery (restore the stripped row + invalidate for a fresh poll) runs first.
  const handleAttachOutcome = useCallback(
    (ep: number, wasReconnecting: boolean, live: boolean) => {
      if (ep !== epochRef.current) return; // stale generation — drop
@@ -598,6 +575,10 @@ export default function ChatThread({
        );
        return;
      }
+      if (strippedRowRef.current)
+        setMessagesRef.current?.((prev) =>
+          mergeById(prev, rowToUiMessage(strippedRowRef.current!)),
+        );
      queryClient.invalidateQueries({
        queryKey: AI_CHAT_MESSAGES_RQ_KEY(chatIdRef.current),
      });
@@ -680,155 +661,71 @@ export default function ChatThread({
      // keeps executing server-side — must win; only a NON-disconnect error (a
      // provider 500, `{ isError:true, isDisconnect:false }`) is terminal.
      if (isDisconnect) {
-        if (!mountedRef.current) {
+        if (wasObserver) {
+          // A resumed/attached OBSERVER stream dropped. Recover via the degraded
+          // poll (restore the stripped row only when there is no visible content;
+          // never clobber a fuller on-screen tail, invariant 9). The FSM decides
+          // reconnect-vs-poll from liveFollow (a live-follow drop reconnects again,
+          // #488 commit 3; a mount-resume drop polls).
+          if (mountedRef.current) {
+            const hasVisible = msgHasVisible;
+            if (!hasVisible && strippedRowRef.current)
+              setMessages((prev) =>
+                mergeById(prev, rowToUiMessage(strippedRowRef.current!)),
+              );
+            queryClient.invalidateQueries({
+              queryKey: AI_CHAT_MESSAGES_RQ_KEY(chatIdRef.current),
+            });
+            dispatch({
+              type: "FINISH_DISCONNECT",
+              hasVisibleContent: hasVisible,
+              epoch: stampEpoch,
+            });
+          }
          setStopNotice(null);
          return;
        }
-        // No detached run to recover (legacy, non-autonomous): a plain disconnect —
-        // terminal notice, no reconnect. (An observer only exists in autonomous mode,
-        // so this is always a local turn.)
-        if (autonomousRunsEnabled !== true) {
+        // A LOCAL live turn dropped. #488 commit 2: recover by the RUN-FACT, not by
+        // the presence of an assistant message — a setup-phase break (before the
+        // first frame) still leaves a detached run writing to pages. In autonomous
+        // mode a run is active for the whole turn, so seed the run-fact from the
+        // start-metadata runId when known, else a sentinel (the attach GET goes by
+        // chatId, not runId). Pin the assistant row as the strip/anchor when present.
+        if (autonomousRunsEnabled === true && mountedRef.current) {
+          const hasAnchor =
+            message?.role === "assistant" && typeof message.id === "string";
+          if (hasAnchor) {
+            strippedRowRef.current = {
+              id: message.id,
+              role: "assistant",
+              content: "",
+              status: "streaming",
+              createdAt: new Date().toISOString(),
+              metadata: { parts: message.parts },
+            };
+            stripRef.current = true;
+          } else {
+            strippedRowRef.current = null;
+            stripRef.current = false;
+          }
+          dispatch({
+            type: "RUN_FACT",
+            runFact: { runId: extractRunId(message) ?? "pending" },
+          });
+          dispatch({
+            type: "FINISH_DISCONNECT",
+            hasVisibleContent: msgHasVisible,
+            epoch: stampEpoch,
+          });
+          setStopNotice(null);
+        } else {
          dispatch({
            type: "FINISH_DISCONNECT",
            hasVisibleContent: false,
            epoch: stampEpoch,
          });
          setStopNotice("disconnect");
-          return;
        }
-        // A mount-resume OBSERVER (one-shot resume, NOT live-follow) drop falls to
-        // the degraded POLL, which merges by id — it does NOT attach, so there is
-        // nothing to re-seed. #491 tail-only: the anchor row was never removed from
-        // the view (the seed keeps it; the continuation only APPENDED), so nothing to
-        // restore either. The FSM routes this to `polling` (ownership observer,
-        // !liveFollow).
-        if (wasObserver && !machineRef.current.ctx.liveFollow) {
-          queryClient.invalidateQueries({
-            queryKey: AI_CHAT_MESSAGES_RQ_KEY(chatIdRef.current),
-          });
-          dispatch({
-            type: "FINISH_DISCONNECT",
-            hasVisibleContent: msgHasVisible,
-            epoch: stampEpoch,
-          });
-          setStopNotice(null);
-          return;
-        }
-        // We will (re-)ENTER THE RECONNECT LADDER (an attach): a LOCAL live turn's
-        // first drop, OR a live-follow observer's SUBSEQUENT drop (#488 commit 3).
-        // #488 commit 2: recover by the RUN-FACT, not by the presence of an assistant
-        // message — a setup-phase break still leaves a detached run writing to pages.
-        //
-        // #491 tail-only (THE crux): the live store holds a PARTIAL step that is AHEAD
-        // of the persisted boundary; tail-applying the reconnect's step frames over it
-        // would DUPLICATE that partial step. So entering reconnecting is ALWAYS via a
-        // RE-SEED FROM PERSIST — never the live store. Fetch the authoritative
-        // persisted assistant row (`getRun` returns the projected `message`), replace
-        // the live partial by id (mergeById -> the store now holds EXACTLY steps
-        // 0..N-1), and set the anchor to `{ id, n = stepsPersisted }`. Only AFTER the
-        // re-seed is applied do we enter the ladder (FINISH_DISCONNECT schedules the
-        // backoff) — so the attach can never tail-apply over the live partial.
-        const cid = chatIdRef.current;
-        // The live-message runId is the run-fact source (the attach GET keys on
-        // chatId, so a sentinel still recovers a setup-phase break).
-        const runId = extractRunId(message ?? undefined) ?? "pending";
-        const enterReconnect = (fact: string): void => {
-          if (!mountedRef.current) return;
-          // Epoch-stamp the run-fact too (I1): the getRun rtt widens the
-          // onFinish->dispatch window, so a concurrent SEND_LOCAL during it must be
-          // able to drop this stale RUN_FACT (else it clobbers the new turn's
-          // runFact.runId). Consistent with the postRun RUN_FACT stamp.
-          dispatch({ type: "RUN_FACT", runFact: { runId: fact }, epoch: stampEpoch });
-          dispatch({
-            type: "FINISH_DISCONNECT",
-            hasVisibleContent: msgHasVisible,
-            epoch: stampEpoch,
-          });
-        };
-        // Restore the STRUCTURAL guarantee that the live partial is never the
-        // tail-apply base: drop the live partial from the store by id and null the
-        // anchor, so the reconnect replays from step 0 into a CLEAN store (a full
-        // rebuild) or, past any rotation, 204s -> degraded poll. Used on BOTH the
-        // no-persisted-row and getRun-FAILURE paths — after this there is no path
-        // where the attach tail-applies frames onto a row that already has them
-        // (the #137/#161 duplication class).
-        const dropLivePartialAndReplayFromStart = (): void => {
-          if (message?.role === "assistant" && typeof message.id === "string") {
-            const liveId = message.id;
-            setMessagesRef.current?.((prev) =>
-              prev.filter((m) => m.id !== liveId),
-            );
-          }
-          anchorRef.current = null;
-        };
-        if (cid) {
-          // #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);
-        }
-        setStopNotice(null);
        return;
      }
      // A NON-disconnect stream error (a provider 500 etc.) -> terminal error banner.
@@ -849,10 +746,11 @@ export default function ChatThread({
        if (mountedRef.current) {
          const hasVisible = msgHasVisible;
          if (!hasVisible) {
-            // Starved replay (the tail carried no new steps). #491 tail-only: the
-            // seeded steps 0..N-1 are still on screen (the SDK continuation never
-            // wiped them — `start` does not reset parts), so there is nothing to
-            // restore; just poll to the real terminal.
+            // Starved replay: restore the stripped row + poll to the real terminal.
+            if (strippedRowRef.current)
+              setMessages((prev) =>
+                mergeById(prev, rowToUiMessage(strippedRowRef.current!)),
+              );
            queryClient.invalidateQueries({
              queryKey: AI_CHAT_MESSAGES_RQ_KEY(chatIdRef.current),
            });
@@ -948,12 +846,6 @@ 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`.
@@ -971,12 +863,12 @@ export default function ChatThread({
    const tail = rows[rows.length - 1];
    if (!tail || tail.role !== "assistant") return;
    setMessages((prev) => mergeById(prev, rowToUiMessage(tail)));
-    // Anchor-mismatch coherence: if a DIFFERENT run's row B has replaced our anchor
-    // row A as the tail, A would linger as an orphan — reconcile A by id from FRESH
-    // PERSISTED history (not the pinned live row) so no phantom row survives.
-    const anchor = anchorRef.current;
-    if (anchor && anchor.id !== tail.id) {
-      const historical = rows.find((r) => r.id === anchor.id);
+    // Anchor-mismatch coherence: a restored stripped row A that a DIFFERENT run's
+    // row B has replaced as the tail would linger as an orphan — settle A from
+    // fresh history so no phantom row survives.
+    const stripped = strippedRowRef.current;
+    if (stripped && stripped.id !== tail.id) {
+      const historical = rows.find((r) => r.id === stripped.id);
      if (historical)
        setMessages((prev) => mergeById(prev, rowToUiMessage(historical)));
    }
@@ -27,7 +27,6 @@ vi.mock("@/features/ai-chat/utils/markdown.ts", async () => {

 import MessageItem from "./message-item";
 import { messageSignature } from "@/features/ai-chat/utils/message-signature.ts";
-import { splitPlainChunks } from "./streaming-plain-text";

 // matchMedia (read by MantineProvider) is stubbed globally in vitest.setup.ts.

@@ -115,89 +114,3 @@ describe("MessageItem markdown memoization", () => {
    expect(queryByText("streamed answer")).not.toBeNull();
  });
 });
-
-// PERF SMOKE (#492): the whole point of the incremental streaming render is that
-// the ANSWER path costs O(number of markdown blocks), NOT O(number of throttled
-// ~20Hz ticks). Pre-#492 the finalized MarkdownPart re-parsed the WHOLE growing
-// answer on every delta — a synthetic ~100 KB stream measured 394 renderChatMarkdown
-// calls (one per tick). With the incremental render each STABILIZED block is parsed
-// exactly once (memoized in MarkdownChunk) and the live tail is cheap plain text, so
-// the call count collapses to ~= the block count regardless of tick granularity.
-describe("MessageItem streaming answer render is O(blocks), not O(ticks)", () => {
-  // ~100 KB answer. Each section is a heading + a paragraph — TWO blank-line
-  // delimited markdown blocks — so the safe-cut block count is ~2× the section
-  // count. The perf claim is about the BLOCK count (the memoization granularity),
-  // measured directly with splitPlainChunks below, not the section count.
-  const buildAnswer = () => {
-    const SECTIONS = 100;
-    const paragraphs: string[] = [];
-    for (let i = 0; i < SECTIONS; i++) {
-      paragraphs.push(`## Section ${i}\n\n` + "lorem ipsum dolor ".repeat(55));
-    }
-    const full = paragraphs.join("\n\n");
-    // The number of memoized markdown blocks the incremental render splits into
-    // (all but the live tail are parsed once each).
-    return { full, blocks: splitPlainChunks(full).length };
-  };
-
-  const streamMsg = (text: string, state: "streaming" | "done"): UIMessage =>
-    ({
-      id: "m1",
-      role: "assistant",
-      parts: [{ type: "text", text, state }],
-    }) as UIMessage;
-
-  it("parses each block ~once over a 100KB stream (≈blocks, ≪ ticks)", () => {
-    renderChatMarkdownSpy.mockClear();
-    const { full, blocks } = buildAnswer();
-    const CHUNK = 128; // a realistic ~20Hz throttled delta size
-    const ticks = Math.ceil(full.length / CHUNK);
-
-    let msg = streamMsg(full.slice(0, CHUNK), "streaming");
-    const { rerender } = render(
-      <MantineProvider>
-        <MessageItem
-          message={msg}
-          signature={messageSignature(msg)}
-          turnStreaming
-        />
-      </MantineProvider>,
-    );
-    for (let end = 2 * CHUNK; end < full.length; end += CHUNK) {
-      msg = streamMsg(full.slice(0, end), "streaming");
-      rerender(
-        <MantineProvider>
-          <MessageItem
-            message={msg}
-            signature={messageSignature(msg)}
-            turnStreaming
-          />
-        </MantineProvider>,
-      );
-    }
-    // Finalize: the streaming→done flip renders the whole answer through ONE
-    // canonical pass (visual parity), so the finished DOM matches the pre-#492
-    // output. This is the single extra parse on top of the per-block ones.
-    const done = streamMsg(full, "done");
-    rerender(
-      <MantineProvider>
-        <MessageItem message={done} signature={messageSignature(done)} />
-      </MantineProvider>,
-    );
-
-    const calls = renderChatMarkdownSpy.mock.calls.length;
-    // Sanity: the stream really had far more ticks than blocks (else the test is
-    // vacuous — the point is that calls scale with blocks, not ticks).
-    expect(ticks).toBeGreaterThan(blocks * 3);
-    // O(blocks): each stabilized block parsed once + the single final whole-text
-    // parse. A small constant absorbs the finalize render and the live-tail block;
-    // the load-bearing claim is the bound below.
-    expect(calls).toBeLessThanOrEqual(blocks + 2);
-    // ≪ ticks — and, non-vacuously, the blocks WERE parsed (not skipped entirely).
-    expect(calls).toBeLessThan(ticks / 3);
-    expect(calls).toBeGreaterThan(blocks / 2);
-    // MUTATION-VERIFY (documented, not run here): dropping the `memo()` wrapper on
-    // MarkdownChunk (so every stable block re-parses each tick) drives `calls`
-    // toward `ticks` (~394), reddening both upper-bound assertions above.
-  });
-});
@@ -1,112 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { render } from "@testing-library/react";
-import { MantineProvider } from "@mantine/core";
-import type { UIMessage } from "@ai-sdk/react";
-
-// Stub react-i18next (the component reads `useTranslation`). Mirrors the other
-// message-item specs.
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({ t: (key: string) => key }),
-}));
-
-import MessageItem from "./message-item";
-import { messageSignature } from "@/features/ai-chat/utils/message-signature.ts";
-// The REAL canonical renderer (NOT the spy the memo test installs): this file
-// exercises the actual markdown output so the visual-regression assertions below
-// compare against genuine HTML (incl. the schema's `<li><p>` wrappers).
-import { renderChatMarkdown } from "@/features/ai-chat/utils/markdown.ts";
-import classes from "./ai-chat.module.css";
-
-const msg = (
-  parts: UIMessage["parts"],
-  extra?: Partial<UIMessage>,
-): UIMessage =>
-  ({ id: "m1", role: "assistant", parts, ...extra }) as UIMessage;
-
-const renderRow = (message: UIMessage, turnStreaming = false) =>
-  render(
-    <MantineProvider>
-      <MessageItem
-        message={message}
-        signature={messageSignature(message)}
-        turnStreaming={turnStreaming}
-      />
-    </MantineProvider>,
-  );
-
-// A rich multi-block answer that exercises headings, a list (the `<li><p>` case
-// the scoped CSS tightens), inline emphasis, and multiple paragraphs.
-const ANSWER = [
-  "# Заголовок",
-  "",
-  "Первый абзац с **жирным** и `кодом`.",
-  "",
-  "- пункт один",
-  "- пункт два",
-  "",
-  "Второй абзац.",
-].join("\n");
-
-describe("MessageItem final render — visual parity with the canonical pipeline", () => {
-  it("a finalized text part renders exactly renderChatMarkdown(text)", () => {
-    const { container } = renderRow(
-      msg([{ type: "text", text: ANSWER, state: "done" }]),
-    );
-    const block = container.querySelector(`.${classes.markdown}`);
-    expect(block).not.toBeNull();
-    // Byte-for-byte the canonical output (the SAME whole-text pass the pre-#492
-    // MarkdownPart produced), including `<li><p>…</p></li>` wrappers.
-    expect(block!.innerHTML).toBe(renderChatMarkdown(ANSWER, {}));
-    // The list wrapper is really present (guards against a vacuous empty render).
-    expect(container.querySelectorAll("li p").length).toBe(2);
-  });
-
-  it("the streaming incremental view CONVERGES to the canonical render on finish", () => {
-    // Mount mid-stream (live tail) — the DOM here is the incremental view.
-    const { container, rerender } = render(
-      <MantineProvider>
-        <MessageItem
-          message={msg([{ type: "text", text: ANSWER, state: "streaming" }])}
-          signature={messageSignature(
-            msg([{ type: "text", text: ANSWER, state: "streaming" }]),
-          )}
-          turnStreaming
-        />
-      </MantineProvider>,
-    );
-    // Finish the turn: state flips to done AND the turn is no longer streaming.
-    const done = msg([{ type: "text", text: ANSWER, state: "done" }]);
-    rerender(
-      <MantineProvider>
-        <MessageItem message={done} signature={messageSignature(done)} />
-      </MantineProvider>,
-    );
-    // After finish there is exactly ONE canonical markdown container whose HTML is
-    // the whole-text render — identical to the non-streaming path above.
-    const blocks = container.querySelectorAll(`.${classes.markdown}`);
-    expect(blocks.length).toBe(1);
-    expect(blocks[0].innerHTML).toBe(renderChatMarkdown(ANSWER, {}));
-  });
-
-  it("neutralizeInternalLinks is honored on the finalized render", () => {
-    const linkAnswer = "См. [страницу](/p/abc).";
-    const { container } = render(
-      <MantineProvider>
-        <MessageItem
-          message={msg([{ type: "text", text: linkAnswer, state: "done" }])}
-          signature={messageSignature(
-            msg([{ type: "text", text: linkAnswer, state: "done" }]),
-          )}
-          neutralizeInternalLinks
-        />
-      </MantineProvider>,
-    );
-    const block = container.querySelector(`.${classes.markdown}`);
-    expect(block!.innerHTML).toBe(
-      renderChatMarkdown(linkAnswer, { neutralizeInternalLinks: true }),
-    );
-    // The internal link was made inert (no href) by the neutralization flag.
-    const a = container.querySelector("a");
-    expect(a?.hasAttribute("href")).toBe(false);
-  });
-});
@@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
 import type { UIMessage } from "@ai-sdk/react";
 import ToolCallCard from "@/features/ai-chat/components/tool-call-card.tsx";
 import ReasoningBlock from "@/features/ai-chat/components/reasoning-block.tsx";
-import { StreamingMarkdownText } from "@/features/ai-chat/components/streaming-markdown-text.tsx";
 import ChatErrorAlert from "@/features/ai-chat/components/chat-error-alert.tsx";
 import ChatStoppedNotice from "@/features/ai-chat/components/chat-stopped-notice.tsx";
 import { ToolUiPart, isToolPart } from "@/features/ai-chat/utils/tool-parts.tsx";
@@ -87,39 +86,17 @@ interface MessageItemProps {
 * One assistant text part rendered as sanitized markdown. Memoized on its inputs
 * so a finalized text part is NOT re-parsed on every streamed delta: during a
 * turn only the actively-growing tail part changes its `text`, so every earlier
- * part hits the memo and skips the expensive canonical parse + DOMPurify pass.
- * Props are primitives, so React.memo's default shallow compare is exactly right
- * (the `text` string is compared by value).
- *
- * Streaming gate (#492) — mirrors ReasoningBlock:
- *  - `streaming` (this is the live, actively-growing tail part of an in-flight
- *    turn): render incrementally via StreamingMarkdownText — the stabilized blocks
- *    go through the canonical pipeline (each parsed ONCE, memoized) and only the
- *    live tail is cheap plain text. This makes the per-tick cost O(new blocks),
- *    not the pre-#492 O(ticks) whole-answer re-parse on every ~20Hz delta.
- *  - finalized (the common case, and the turn-end flip): render the WHOLE text
- *    through ONE canonical pass — byte-identical to the pre-#492 output (visual
- *    parity). The row re-renders on the streaming→done flip because
- *    `messageSignature` tracks each part's `state` (and `turnStreaming` flips at
- *    turn end), so the incremental view always converges to this single render.
+ * part hits the memo and skips the expensive marked + DOMPurify pass. Props are
+ * primitives, so React.memo's default shallow compare is exactly right (the
+ * `text` string is compared by value).
 */
 const MarkdownPart = memo(function MarkdownPart({
  text,
  neutralizeInternalLinks,
-  streaming,
 }: {
  text: string;
  neutralizeInternalLinks: boolean;
-  streaming: boolean;
 }) {
-  if (streaming) {
-    return (
-      <StreamingMarkdownText
-        text={text}
-        neutralizeInternalLinks={neutralizeInternalLinks}
-      />
-    );
-  }
  const html = renderChatMarkdown(text, { neutralizeInternalLinks });
  if (html) {
    return (
@@ -202,10 +179,47 @@ function MessageItem({
        {resolveAssistantName(assistantName) ?? t("AI agent")}
      </Text>
      {message.parts.map((part, index) => {
-        // Tool parts (`tool-*` / `dynamic-tool`) are template-literal kinds, so
-        // they cannot be a `switch` case; the runtime guard handles them, and the
-        // switch below covers every CLOSED (literal-typed) part kind with a
-        // compile-time exhaustiveness check in its default.
+        if (part.type === "reasoning") {
+          // Reasoning ("thinking") -> a collapsible block with its own token
+          // count. Empty/whitespace reasoning with no authoritative count carries
+          // nothing to show, so skip it (avoids an empty 0-token block).
+          const text = (part as { text?: string }).text ?? "";
+          if (!text.trim() && !(reasoningTokens && reasoningTokens > 0))
+            return null;
+          // Absent state (persisted rows) and "done" both mean finalized.
+          // `messageSignature` already includes each part's `state`, so the
+          // streaming→done flip changes the row signature and re-renders this
+          // row — which is what lets ReasoningBlock switch from chunked plain
+          // text to its one-time markdown parse (see reasoning-block.tsx).
+          // ALSO require the turn to be live: a part stranded at
+          // `state:"streaming"` after the turn ended (no `reasoning-end` — see
+          // the `turnStreaming` prop doc) must still finalize and parse.
+          const streaming =
+            turnStreaming && (part as { state?: string }).state === "streaming";
+          return (
+            <ReasoningBlock
+              key={index}
+              text={text}
+              tokens={reasoningTokens}
+              streaming={streaming}
+            />
+          );
+        }
+
+        if (part.type === "text") {
+          // Skip empty/whitespace-only text parts (a streaming message often
+          // starts with an empty text part before the first token arrives); the
+          // typing indicator covers that gap until real content streams in.
+          if (!part.text.trim()) return null;
+          return (
+            <MarkdownPart
+              key={index}
+              text={part.text}
+              neutralizeInternalLinks={neutralizeInternalLinks}
+            />
+          );
+        }
+
        if (isToolPart(part.type)) {
          return (
            <ToolCallCard
@@ -218,76 +232,7 @@ function MessageItem({
          );
        }

-        switch (part.type) {
-          case "reasoning": {
-            // Reasoning ("thinking") -> a collapsible block with its own token
-            // count. Empty/whitespace reasoning with no authoritative count
-            // carries nothing to show, so skip it (avoids an empty 0-token block).
-            const text = part.text ?? "";
-            if (!text.trim() && !(reasoningTokens && reasoningTokens > 0))
-              return null;
-            // Absent state (persisted rows) and "done" both mean finalized.
-            // `messageSignature` already includes each part's `state`, so the
-            // streaming→done flip changes the row signature and re-renders this
-            // row — which is what lets ReasoningBlock switch from chunked plain
-            // text to its one-time markdown parse (see reasoning-block.tsx).
-            // ALSO require the turn to be live: a part stranded at
-            // `state:"streaming"` after the turn ended (no `reasoning-end` — see
-            // the `turnStreaming` prop doc) must still finalize and parse.
-            const streaming = turnStreaming && part.state === "streaming";
-            return (
-              <ReasoningBlock
-                key={index}
-                text={text}
-                tokens={reasoningTokens}
-                streaming={streaming}
-              />
-            );
-          }
-
-          case "text": {
-            // Skip empty/whitespace-only text parts (a streaming message often
-            // starts with an empty text part before the first token arrives); the
-            // typing indicator covers that gap until real content streams in.
-            if (!part.text.trim()) return null;
-            // The live, actively-growing tail part of the in-flight turn renders
-            // incrementally (see MarkdownPart); a finalized part (persisted, or
-            // the turn-end flip) renders the whole text through one canonical
-            // pass. Same liveness rule as the reasoning branch above.
-            const streaming = turnStreaming && part.state === "streaming";
-            return (
-              <MarkdownPart
-                key={index}
-                text={part.text}
-                neutralizeInternalLinks={neutralizeInternalLinks}
-                streaming={streaming}
-              />
-            );
-          }
-
-          case "source-url":
-          case "source-document":
-          case "file":
-          case "step-start":
-            // Not surfaced in the chat bubble (v1) — same as the pre-#492 default.
-            return null;
-
-          default: {
-            // Compile-time exhaustiveness over the CLOSED union members: every
-            // literal-typed part kind is handled above, so the only kinds that
-            // can reach here are the OPEN template-literal ones (`tool-*` — caught
-            // by the guard at runtime — and `data-*`) plus `dynamic-tool`. Adding
-            // a NEW closed part kind to UIMessagePart makes this assignment fail
-            // to compile, forcing it to be handled instead of silently ignored
-            // (this replaces the pre-#492 fall-through `return null` + WARNING).
-            const _exhaustive:
-              | `tool-${string}`
-              | "dynamic-tool"
-              | `data-${string}` = part.type;
-            void _exhaustive;
-            return null;
-          }
-        }
+        return null;
      })}
      {/* A persisted turn error (server stored it in metadata.error). Rendered
          here so it survives a thread remount and shows in reopened history. */}
@@ -1,96 +0,0 @@
-import { memo, useMemo } from "react";
-import { splitPlainChunks } from "@/features/ai-chat/components/streaming-plain-text.tsx";
-import { renderChatMarkdown } from "@/features/ai-chat/utils/markdown.ts";
-import classes from "@/features/ai-chat/components/ai-chat.module.css";
-
-/**
- * One STABILIZED markdown block, rendered through the canonical pipeline and
- * memoized on its string prop. During streaming only the TAIL chunk grows (the
- * `splitPlainChunks` append-only invariant guarantees every earlier chunk is
- * byte-identical across deltas), so React skips every stable block and each one
- * is parsed by `renderChatMarkdown` EXACTLY ONCE — turning the pre-#492
- * "re-parse the whole accumulated answer on every ~20Hz tick" (O(ticks)) into
- * O(number of blocks). The markup is DOMPurify-sanitized inside renderChatMarkdown
- * before it reaches `dangerouslySetInnerHTML`.
- *
- * NOTE (transient streaming-only artifact): a safe cut is a blank-line boundary,
- * so a construct that legitimately contains a blank line (e.g. a fenced code block
- * with an empty line) can be split across chunks and render oddly WHILE it is still
- * streaming. This is cosmetic and self-heals: the moment the part finalizes,
- * MarkdownPart renders the WHOLE text through one canonical pass (visual parity
- * with the pre-#492 output). The reasoning path makes the same trade (plain text
- * while streaming, one markdown parse at the end).
- */
-const MarkdownChunk = memo(function MarkdownChunk({
-  text,
-  neutralizeInternalLinks,
-}: {
-  text: string;
-  neutralizeInternalLinks: boolean;
-}) {
-  const html = renderChatMarkdown(text, { neutralizeInternalLinks });
-  if (html) {
-    return (
-      <div
-        className={classes.markdown}
-        // Sanitized by renderChatMarkdown (DOMPurify) before insertion.
-        dangerouslySetInnerHTML={{ __html: html }}
-      />
-    );
-  }
-  // Malformed/unsupported markdown could not render synchronously: raw text.
-  return (
-    <div className={classes.markdown} style={{ whiteSpace: "pre-wrap" }}>
-      {text}
-    </div>
-  );
-});
-
-/**
- * The cheap streaming-time stand-in for the finalized answer's one-time markdown
- * parse (see MarkdownPart in message-item.tsx). Mirrors StreamingPlainText's
- * chunked-memo pattern but renders the STABILIZED prefix as real markdown (each
- * block parsed once, memoized) and only the LIVE tail as flat plain text — so the
- * user sees formatted output for everything up to the last safe cut, and the not-
- * yet-stable tail (which markdown-parsing every tick would make O(ticks)) stays a
- * single cheap escaped text node until it stabilizes into a new block.
- *
- * `splitPlainChunks` yields chunks where, under append-only growth, every chunk
- * except the LAST is immutable; the last chunk is the live tail. Index keys are
- * therefore stable (a given index never changes to a different chunk's content).
- */
-export function StreamingMarkdownText({
-  text,
-  neutralizeInternalLinks,
-}: {
-  text: string;
-  neutralizeInternalLinks: boolean;
-}) {
-  const chunks = useMemo(() => splitPlainChunks(text), [text]);
-  return (
-    <>
-      {chunks.map((chunk, index) =>
-        index < chunks.length - 1 ? (
-          <MarkdownChunk
-            key={index}
-            text={chunk}
-            neutralizeInternalLinks={neutralizeInternalLinks}
-          />
-        ) : (
-          // The live tail: flat, React-escaped plain text (no markdown parse, no
-          // sanitizer, no innerHTML). `pre-wrap` preserves its newlines; trailing
-          // separator newlines are dropped at display time so the block gap comes
-          // from the markdown margins, not a doubled empty line (mirrors
-          // PlainChunk in streaming-plain-text.tsx).
-          <div
-            key={index}
-            className={classes.markdown}
-            style={{ whiteSpace: "pre-wrap" }}
-          >
-            {chunk.replace(/\n+$/, "")}
-          </div>
-        ),
-      )}
-    </>
-  );
-}
@@ -57,31 +57,6 @@ export async function stopRun(
  return req.data;
 }

-/**
- * Delta poll (#491): the chat's message rows changed since `cursor` (a DB-clock
- * timestamp echoed from the previous poll) plus the current run fact, in ONE
- * round-trip — the degraded-poll fallback's payload, replacing the old "refetch
- * ALL infinite-query pages every 2.5s with full parts" poll. Omit `cursor` on the
- * first poll (returns just a fresh cursor, no rows, to start the chain). The
- * overlap window guarantees occasional REPEATS, so the caller MUST merge rows
- * idempotently by id (mergeById). Owner-gated server-side.
- */
-export async function getAiChatMessagesDelta(
-  chatId: string,
-  cursor?: string,
-): Promise<{
-  rows: IAiChatMessageRow[];
-  cursor: string;
-  run: { id: string; status: string } | null;
-}> {
-  const req = await api.post<{
-    rows: IAiChatMessageRow[];
-    cursor: string;
-    run: { id: string; status: string } | null;
-  }>("/ai-chat/messages/delta", { chatId, cursor });
-  return req.data;
-}
-
 /**
 * #488: the run-fact — "is a run active on this chat?" — first-class from the
 * server (POST /ai-chat/run). Called on mount to seed the client FSM's run-fact
@@ -48,7 +48,6 @@ Legend: **†** = command-transition (bumps `epoch`, I1). Effects in `[…]`.
 | `RETRY` (manual, stalled banner) | stalled | polling(attach-none) **†** | `[armPoll]` |
 | `POLL_TERMINAL` (settled tail merged) | polling, reconnecting, stopping | idle | `[disarmPoll, cancelReconnect]`, runFact←null (I4) |
 | `POLL_IDLE_CAP` (inactivity cap) | polling, reconnecting | stalled | `[disarmPoll, cancelReconnect]` (commit 4a — no more silent) |
-| `POLL_IDLE_CAP` (inactivity cap) | stopping | idle | `[disarmPoll, cancelReconnect]`, runFact←null (Review #4: a Stop-armed poll with no SDK/terminal backstop gets a bounded exit — NOT `stalled`, Stop was already pressed so nothing to retry) |
 | `RUN_FACT{null}` (POST /run → null/terminal, 204) | reconnecting/attaching/polling/stopping | idle | `[cancelReconnect, disarmPoll]`, runFact←null (I3 fresh-negative gate) |
 | `RUN_FACT{runId}` | any | (same) | runFact←runId (pessimism toward an attempt) |
 | `STOP_REQUESTED` (user Stop) | streaming, reconnecting, polling | stopping **†** | `[stopRun, abortAttach, cancelReconnect, armPoll]` (poll drives the terminal — I4 exit by data) |
@@ -122,7 +121,8 @@ holds. **Pending column: empty.**
 | 11 | `stopPendingRef` | **FSM phase `stopping`** | the deferred stop fires from the chat-id adoption effect while `stopping` |
 | 12 | `mountedRef` | **retained (React liveness)** | orthogonal to run-lifecycle; gates imperative onFinish side-effects post-unmount. Epoch (I1) handles stale COMMAND-outcomes; DISPOSE bumps it |
 | 13 | `attemptResumeRef` | **FSM `ATTACH_START` + run-fact** | mount arms attach ONLY on a confirmed active run (commit 4b: streaming-tail status, or POST /run for a user tail) |
-| 14–15 | `anchorRef {id, stepsPersisted}` | **data** (attachStrategy) | #491 tail-only: replaced `stripRef`/`strippedRowRef`. The PERSISTED assistant row that pins the run (server invariant 6) + its step frontier N; feeds `?anchor=<id>&n=<stepsPersisted>`. No strip — the seed keeps every row; entering reconnecting re-seeds from persist |
+| 14 | `stripRef` | **data** (attachStrategy) | strip+replay detail; the `resumeStream` effect reads it |
+| 15 | `strippedRowRef` | **data** (attachStrategy) | the anchor row |
 | 16 | `attachAbortRef` | **effect-owned controller** | aborted by the `abortAttach` effect in cleanup (I5) |
 | 17–25 | `chatIdRef`, `openPageRef`, `getEditorSelectionRef`, `roleIdRef`, `stableIdRef`, `queuedRef`, `sendMessageRef`, `statusRef`, `lastForwardedChatIdRef` | **data** (identity/send mirrors) | unchanged — not lifecycle flags |
 | NEW | `pendingSupersedeRef` | **data** (send-plumbing) | the runId injected into the next `POST /stream {supersede}`; the single replacement for the 3 DELETED one-shots (#8/#9/#10) — net −2 refs |
@@ -151,12 +151,8 @@ message. Sources, in the order they update `ctx.runFact`:
 3. **Attach outcomes:** `ATTACH_LIVE` (2xx) confirms active; a 204 on a non-stripped
   path is an authoritative NEGATIVE fact → the runtime dispatches `RUN_FACT{null}`,
   which cancels recovery (I3 fresh-negative gate).
-4. **Poll (#491, implemented):** the degraded poll now hits the delta endpoint
-   (`POST /ai-chat/messages/delta`), which ALREADY carries the run fact
-   (`run: {id, status} | null`) alongside the changed rows. The client does NOT yet
-   consume that run field — it still drives to a terminal ROW (merged by id),
-   dispatched as `POLL_TERMINAL` — so the run field rides the wire for a future
-   client that settles straight off it.
+4. **Poll (future resume-stack iteration #491):** the delta will carry the run field;
+   until then the poll drives to a terminal ROW, dispatched as `POLL_TERMINAL`.

 Pessimism rule: a stale-but-positive fact PERMITS entering recovery (attach); the
 204 then cuts it. A fresh negative fact gates recovery OUT immediately.
@@ -182,9 +178,6 @@ Pessimism rule: a stale-but-positive fact PERMITS entering recovery (attach); th
  /run) are effect-owned and aborted in cleanup (`abortAttach` on `DISPOSE`), not
  render-phase refs. A client abort of an already-sent POST does not cancel the
  server action, so disarming on unmount is safe.
- **attachStrategy** is behind the `resumeStream` effect; #491 swapped it to
-  tail-only (`?anchor=&n=`, `anchorRef` data) WITHOUT touching the FSM. Entering
-  reconnecting always re-seeds from persist; on a getRun failure the live partial
-  is dropped + replay-from-start so it is never the tail-apply base (no #137/#161
-  duplication).
+- **attachStrategy** (strip+replay today) is behind the `resumeStream` effect; the
+  resume-stack iteration (#491) swaps it to tail-only WITHOUT touching the FSM.
 - **Queue** stays a data structure; flush/interrupt decisions are transitions.
@@ -181,12 +181,6 @@ export interface IAiChatMessageRow {
  toolCalls?: unknown;
  metadata?: {
    parts?: UIMessage["parts"];
-    // #491 step-alignment anchor: the count of FINISHED steps whose parts are in
-    // THIS row, written atomically with `parts` server-side (flushAssistant). The
-    // resume client reads it as its persisted step frontier N — the tail-only
-    // attach asks the run-stream registry for the frames of step N onward (the
-    // seed already carries steps 0..N-1). Absent on pre-#491 rows -> read as 0.
-    stepsPersisted?: number;
    // AI SDK v6 `totalUsage` persisted on assistant rows. Legacy cumulative
    // figure (sum of every step's usage for the turn); kept for back-compat and
    // as the fallback for older rows that have no `contextTokens`.
@@ -4,8 +4,7 @@ import type { IAiChatMessageRow } from "@/features/ai-chat/types/ai-chat.types.t
 import {
  isStreamingTail,
  isSettledAssistantTail,
-  stepsPersistedOf,
-  mergeDeltaRowsIntoPages,
+  seedRows,
  mergeById,
 } from "./resume-helpers.ts";

@@ -13,18 +12,8 @@ function row(
  id: string,
  role: string,
  status?: string,
-  stepsPersisted?: number,
 ): IAiChatMessageRow {
-  return {
-    id,
-    role,
-    content: "",
-    status,
-    createdAt: "2026-01-01T00:00:00Z",
-    ...(stepsPersisted !== undefined
-      ? { metadata: { stepsPersisted } }
-      : {}),
-  };
+  return { id, role, content: "", status, createdAt: "2026-01-01T00:00:00Z" };
 }

 function makeMsg(id: string, text: string): UIMessage {
@@ -76,92 +65,23 @@ describe("isSettledAssistantTail", () => {
  });
 });

-describe("stepsPersistedOf", () => {
-  it("reads metadata.stepsPersisted", () => {
-    expect(stepsPersistedOf(row("a1", "assistant", "streaming", 3))).toBe(3);
-    expect(stepsPersistedOf(row("a1", "assistant", "streaming", 0))).toBe(0);
+describe("seedRows", () => {
+  const rows = [row("u1", "user"), row("a1", "assistant", "streaming")];
+
+  it("returns the rows unchanged when not stripping", () => {
+    expect(seedRows(rows, false)).toBe(rows);
  });

-  it("defaults to 0 for a pre-#491 row (absent), null/undefined, or a bad value", () => {
-    expect(stepsPersistedOf(row("a1", "assistant", "streaming"))).toBe(0);
-    expect(stepsPersistedOf(null)).toBe(0);
-    expect(stepsPersistedOf(undefined)).toBe(0);
-    expect(
-      stepsPersistedOf({
-        id: "a1",
-        role: "assistant",
-        content: "",
-        createdAt: "x",
-        metadata: { stepsPersisted: -2 },
-      }),
-    ).toBe(0);
+  it("drops the last row when stripping", () => {
+    const seeded = seedRows(rows, true);
+    expect(seeded).toHaveLength(1);
+    expect(seeded[0].id).toBe("u1");
  });

-  it("floors a non-integer count", () => {
-    expect(
-      stepsPersistedOf({
-        id: "a1",
-        role: "assistant",
-        content: "",
-        createdAt: "x",
-        metadata: { stepsPersisted: 2.9 },
-      }),
-    ).toBe(2);
-  });
-});
-
-describe("mergeDeltaRowsIntoPages", () => {
-  const pages = () => [
-    { items: [row("u1", "user"), row("a1", "assistant", "streaming", 1)], meta: {} },
-  ];
-
-  it("returns the pages unchanged for an empty delta", () => {
-    const p = pages();
-    expect(mergeDeltaRowsIntoPages(p, [])).toBe(p);
-  });
-
-  it("appends a genuinely new row to the last page in chronological order", () => {
-    const merged = mergeDeltaRowsIntoPages(pages(), [row("a2", "assistant", "streaming", 0)]);
-    expect(merged[0].items.map((i) => i.id)).toEqual(["u1", "a1", "a2"]);
-  });
-
-  it("replaces a grown row in place (per-step growth), never appends a duplicate", () => {
-    const merged = mergeDeltaRowsIntoPages(pages(), [
-      row("a1", "assistant", "streaming", 2),
-    ]);
-    expect(merged[0].items.map((i) => i.id)).toEqual(["u1", "a1"]);
-    // the in-place replacement carries the grown step frontier.
-    expect(stepsPersistedOf(merged[0].items[1])).toBe(2);
-  });
-
-  it("does not mutate the input pages", () => {
-    const input = pages();
-    const before = input[0].items.slice();
-    mergeDeltaRowsIntoPages(input, [row("a2", "assistant", "streaming", 0)]);
-    expect(input[0].items).toEqual(before); // untouched
-  });
-
-  // #491 CONTRACT: the delta overlap window re-delivers the same rows, so merging
-  // MUST be idempotent — applying a delta twice equals applying it once (no growth,
-  // no reorder). A regression re-introduces duplicate assistant bubbles per poll.
-  it("is idempotent: applying the same delta twice equals once", () => {
-    const delta = [
-      row("a1", "assistant", "streaming", 2), // grown existing row
-      row("a2", "assistant", "streaming", 0), // new row
-    ];
-    const once = mergeDeltaRowsIntoPages(pages(), delta);
-    const twice = mergeDeltaRowsIntoPages(once, delta);
-    const thrice = mergeDeltaRowsIntoPages(twice, delta);
-    expect(once[0].items.map((i) => i.id)).toEqual(["u1", "a1", "a2"]);
-    expect(twice[0].items.map((i) => i.id)).toEqual(["u1", "a1", "a2"]);
-    expect(twice).toEqual(once);
-    expect(thrice).toEqual(once);
-  });
-
-  it("seeds a first page when the cache is empty", () => {
-    const merged = mergeDeltaRowsIntoPages([], [row("u1", "user")]);
-    expect(merged).toHaveLength(1);
-    expect(merged[0].items.map((i) => i.id)).toEqual(["u1"]);
+  it("returns an empty list when stripping a single-row list", () => {
+    expect(seedRows([row("a1", "assistant", "streaming")], true)).toHaveLength(
+      0,
+    );
  });
 });

@@ -189,37 +109,4 @@ describe("mergeById", () => {
    expect(mergeById(prev, null)).toBe(prev);
    expect(mergeById(prev, undefined)).toBe(prev);
  });
-
-  // #491 CONTRACT: the delta poll's overlap window GUARANTEES the same row is
-  // re-delivered across close polls, so merging must be IDEMPOTENT by id — merging
-  // the same row (or an equal-length list of rows) twice must not duplicate or
-  // reorder. This is the property the whole delta-poll design leans on; a
-  // regression here would re-introduce duplicate assistant bubbles on every poll.
-  it("is idempotent by id: re-merging the same row does not duplicate or reorder", () => {
-    const seed = [makeMsg("u1", "hi"), makeMsg("a1", "step 1")];
-    const repeat = makeMsg("a1", "step 1"); // the SAME row the overlap re-delivers
-    const once = mergeById(seed, repeat);
-    const twice = mergeById(once, repeat);
-    const thrice = mergeById(twice, repeat);
-    // Length is stable (no growth), order is stable (user then assistant).
-    expect(once.map((m) => m.id)).toEqual(["u1", "a1"]);
-    expect(twice.map((m) => m.id)).toEqual(["u1", "a1"]);
-    expect(thrice.map((m) => m.id)).toEqual(["u1", "a1"]);
-    // The repeated merge converges: the row is replaced in place, never appended.
-    expect(twice[1]).toBe(repeat);
-  });
-
-  it("is idempotent across a batch of repeated + grown rows (delta re-delivery)", () => {
-    // A delta poll re-delivers a1 (unchanged) and a2 (grown one step). Applying the
-    // batch twice must equal applying it once — the poll can re-send either.
-    const start = [makeMsg("u1", "hi"), makeMsg("a1", "done")];
-    const batch = [makeMsg("a1", "done"), makeMsg("a2", "grown step 2")];
-    const apply = (list: typeof start) =>
-      batch.reduce((acc, row) => mergeById(acc, row), list);
-    const once = apply(start);
-    const twice = apply(once);
-    expect(once.map((m) => m.id)).toEqual(["u1", "a1", "a2"]);
-    expect(twice.map((m) => m.id)).toEqual(["u1", "a1", "a2"]);
-    expect(twice).toEqual(once);
-  });
 });
@@ -11,10 +11,9 @@ import type { IAiChatMessageRow } from "@/features/ai-chat/types/ai-chat.types.t

 /**
 * A STREAMING tail: the last persisted row is an assistant row still marked
- * `status === 'streaming'`. #491 (tail-only): such a tail is seeded UNCHANGED —
- * it carries the persisted steps 0..N-1 — and the run-stream registry's tail
- * (frames for steps >= N) is APPENDED to it by the SDK's `readUIMessageStream`
- * continuation. Only the presence of this tail decides WHETHER to attach.
+ * `status === 'streaming'`. Such a tail is stripped from the seed and rebuilt by
+ * the replay (`expect=live`), since the SDK's `text-start` always pushes a new
+ * part and replaying over a seeded in-progress row would duplicate its text.
 */
 export function isStreamingTail(rows: IAiChatMessageRow[]): boolean {
  const tail = rows[rows.length - 1];
@@ -33,61 +32,15 @@ export function isSettledAssistantTail(rows: IAiChatMessageRow[]): boolean {
 }

 /**
- * #491 tail-only anchor: the count of FINISHED steps whose parts are persisted in
- * THIS assistant row (`metadata.stepsPersisted`), written atomically with `parts`
- * server-side. The resume client reads it as its persisted step frontier N — the
- * tail-only attach asks the run-stream registry for the frames of step N onward
- * (the seed already carries steps 0..N-1). Absent on pre-#491 rows => 0.
+ * Seed rows for `useChat`: return the rows unchanged, or without the last row when
+ * `strip` is set (the streaming tail is stripped so the live replay rebuilds it
+ * without duplicating parts).
 */
-export function stepsPersistedOf(
-  row: IAiChatMessageRow | null | undefined,
-): number {
-  const n = row?.metadata?.stepsPersisted;
-  return typeof n === "number" && n >= 0 ? Math.floor(n) : 0;
-}
-
-/** One page of the messages infinite-query cache (`{ items, meta }`). */
-export interface IMessagePage {
-  items: IAiChatMessageRow[];
-  meta: unknown;
-}
-
-/**
- * #491 delta-poll merge: upsert the delta poll's `rows` into the messages
- * infinite-query page structure IDEMPOTENTLY by id. The delta endpoint's overlap
- * window GUARANTEES occasional REPEATS, so this MUST converge: a row already
- * present is REPLACED IN PLACE (per-step growth of an in-progress row), a new row
- * is APPENDED to the last page in chronological order (the server returns delta
- * rows oldest-first). Applying the same delta twice equals applying it once. Never
- * mutates the input pages (returns fresh page objects with cloned item arrays).
- */
-export function mergeDeltaRowsIntoPages(
-  pages: IMessagePage[],
+export function seedRows(
  rows: IAiChatMessageRow[],
-): IMessagePage[] {
-  if (rows.length === 0) return pages;
-  const next: IMessagePage[] = pages.map((p) => ({
-    ...p,
-    items: p.items.slice(),
-  }));
-  const locate = (id: string): [number, number] | null => {
-    for (let pi = 0; pi < next.length; pi++) {
-      const ii = next[pi].items.findIndex((it) => it.id === id);
-      if (ii !== -1) return [pi, ii];
-    }
-    return null;
-  };
-  for (const row of rows) {
-    const at = locate(row.id);
-    if (at) {
-      next[at[0]].items[at[1]] = row; // replace in place — idempotent by id
-    } else if (next.length > 0) {
-      next[next.length - 1].items.push(row); // append chronologically
-    } else {
-      next.push({ items: [row], meta: undefined });
-    }
-  }
-  return next;
+  strip: boolean,
+): IAiChatMessageRow[] {
+  return strip ? rows.slice(0, -1) : rows;
 }

 /**
@@ -1,83 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { readUIMessageStream, type UIMessage } from "ai";
-import pkg from "../../../../package.json";
-
-/**
- * PIN-SPEC TRIP-WIRE (#491). The tail-only attach continuation relies on THREE
- * behaviors of `ai@6.0.207`, verified line-by-line in the issue. Without this
- * test, an `ai` bump could silently break attach (the client would append the
- * live tail to the wrong message, or duplicate a step):
- *
- *   1. `readUIMessageStream({ message })` CONTINUES the passed message — it does
- *      not start a fresh one — so the tail streamed after a re-seed is appended to
- *      the seeded assistant row (the same DB id).
- *   2. A `start` frame does NOT reset the existing message's parts (so the seeded
- *      steps 0..N-1 survive; the synthetic `start` the registry prepends only
- *      carries the run-fact metadata).
- *   3. Text parts do NOT cross a `finish-step` boundary — a new `text-start` after
- *      `finish-step` is a NEW part — so the reconstructed steps stay separated and
- *      the step frontier stays meaningful.
- *
- * If an `ai` upgrade changes any of these, this test fails LOUD instead of the
- * resume path silently corrupting.
- */
-describe("ai SDK continuation trip-wire (#491, tail-only attach)", () => {
-  it("is pinned to the exact ai version the continuation was verified against", () => {
-    // A caret/range bump is exactly what would silently break attach — require an
-    // exact pin. Bumping ai MUST re-verify the behavior asserted below, then this.
-    expect((pkg as { dependencies: Record<string, string> }).dependencies.ai).toBe(
-      "6.0.207",
-    );
-  });
-
-  it("continues the seeded message: start does not reset parts, the tail appends as new parts", async () => {
-    // A seeded assistant row with ONE finished step already reconstructed.
-    const seeded: UIMessage = {
-      id: "assistant-1",
-      role: "assistant",
-      parts: [
-        { type: "step-start" },
-        { type: "text", text: "STEP0", state: "done" },
-      ],
-    } as UIMessage;
-
-    // The tail the registry delivers on re-attach: a synthetic start (run-fact),
-    // then step 1's frames, then finish. As UI-message chunks (what the SSE frames
-    // decode to).
-    const chunks = [
-      { type: "start", messageMetadata: { runId: "r1", chatId: "c1" } },
-      { type: "start-step" },
-      { type: "text-start", id: "t1" },
-      { type: "text-delta", id: "t1", delta: "STEP1" },
-      { type: "text-end", id: "t1" },
-      { type: "finish-step" },
-      { type: "finish" },
-    ];
-    const stream = new ReadableStream({
-      start(c) {
-        for (const ch of chunks) c.enqueue(ch);
-        c.close();
-      },
-    });
-
-    let last: UIMessage | undefined;
-    for await (const msg of readUIMessageStream({ message: seeded, stream })) {
-      last = msg;
-    }
-
-    expect(last).toBeDefined();
-    // Same message id (continuation, not a fresh message).
-    expect(last!.id).toBe("assistant-1");
-    // The seeded step-0 parts SURVIVED the `start` frame, and step 1 was appended
-    // as SEPARATE parts (text did not cross the finish-step boundary).
-    const shape = last!.parts.map((p) => `${p.type}:${(p as { text?: string }).text ?? ""}`);
-    expect(shape).toEqual([
-      "step-start:",
-      "text:STEP0",
-      "step-start:",
-      "text:STEP1",
-    ]);
-    // The run-fact metadata from the synthetic start frame is applied.
-    expect(last!.metadata).toMatchObject({ runId: "r1", chatId: "c1" });
-  });
-});
@@ -1,234 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import {
-  render,
-  screen,
-  fireEvent,
-  waitFor,
-  within,
-} from "@testing-library/react";
-import { MantineProvider } from "@mantine/core";
-import { ModalsProvider } from "@mantine/modals";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { Provider, createStore } from "jotai";
-import { UserRole } from "@/lib/types";
-import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
-import { IApiKey } from "@/features/api-key/types/api-key.types";
-
-// Mock the service layer so no real HTTP is attempted; every test drives the
-// component through these three functions.
-vi.mock("@/features/api-key/services/api-key-service", () => ({
-  getApiKeys: vi.fn(),
-  createApiKey: vi.fn(),
-  revokeApiKey: vi.fn(),
-}));
-
-import {
-  getApiKeys,
-  createApiKey,
-  revokeApiKey,
-} from "@/features/api-key/services/api-key-service";
-import ApiKeysManager from "./api-keys-manager";
-
-// matchMedia (read by MantineProvider) is stubbed globally in vitest.setup.ts.
-
-const ISO_SOON = new Date(Date.now() + 10 * 864e5).toISOString();
-const ISO_FAR = new Date(Date.now() + 200 * 864e5).toISOString();
-const ISO_EXPIRED = new Date(Date.now() - 3 * 864e5).toISOString();
-
-// Dump the storage stub via the Web Storage API — its data lives in a closure
-// (see vitest.setup.ts), so JSON.stringify(localStorage) would be vacuous.
-function storageDump(): string {
-  let out = "";
-  for (let i = 0; i < localStorage.length; i++) {
-    const k = localStorage.key(i) as string;
-    out += `${k}=${localStorage.getItem(k)};`;
-  }
-  return out;
-}
-
-function makeKey(overrides: Partial<IApiKey> = {}): IApiKey {
-  return {
-    id: "key-1",
-    name: "CI token",
-    expiresAt: ISO_FAR,
-    lastUsedAt: null,
-    createdAt: "2026-01-01T00:00:00.000Z",
-    creator: { id: "u1", name: "Alice", email: "a@x.io", avatarUrl: null },
-    ...overrides,
-  };
-}
-
-function renderManager(role: UserRole) {
-  const store = createStore();
-  store.set(currentUserAtom, {
-    user: { id: "me", role } as never,
-    workspace: {} as never,
-  });
-  const queryClient = new QueryClient({
-    defaultOptions: { queries: { retry: false } },
-  });
-  const utils = render(
-    <Provider store={store}>
-      <QueryClientProvider client={queryClient}>
-        <MantineProvider>
-          <ModalsProvider>
-            <ApiKeysManager />
-          </ModalsProvider>
-        </MantineProvider>
-      </QueryClientProvider>
-    </Provider>,
-  );
-  return { store, queryClient, ...utils };
-}
-
-beforeEach(() => {
-  vi.clearAllMocks();
-  localStorage.clear();
-});
-
-describe("ApiKeysManager — list rendering", () => {
-  it("renders an explicit expiry date and highlights a <30-day key (acceptance #3)", async () => {
-    vi.mocked(getApiKeys).mockResolvedValue([
-      makeKey({ id: "k-soon", name: "Soon key", expiresAt: ISO_SOON }),
-      makeKey({ id: "k-far", name: "Far key", expiresAt: ISO_FAR }),
-    ]);
-
-    renderManager(UserRole.MEMBER);
-
-    await screen.findByText("Soon key");
-    // Explicit dates, not "in N days": the year is rendered verbatim.
-    const soonYear = new Date(ISO_SOON).getFullYear().toString();
-    expect(screen.getAllByText(new RegExp(soonYear)).length).toBeGreaterThan(0);
-    // Exactly one key is inside the 30-day warning window.
-    expect(screen.getAllByText("Expiring soon")).toHaveLength(1);
-  });
-
-  it('shows "Expired" (not "Expiring soon") for an already-expired key', async () => {
-    vi.mocked(getApiKeys).mockResolvedValue([
-      makeKey({ id: "k-dead", name: "Dead key", expiresAt: ISO_EXPIRED }),
-    ]);
-    renderManager(UserRole.MEMBER);
-    await screen.findByText("Dead key");
-    // A past expiry is labelled "Expired", never the forward-looking badge.
-    expect(screen.getByText("Expired")).toBeDefined();
-    expect(screen.queryByText("Expiring soon")).toBeNull();
-  });
-
-  it('shows "Never" for an unlimited key and no highlight', async () => {
-    vi.mocked(getApiKeys).mockResolvedValue([
-      makeKey({ id: "k-forever", name: "Forever", expiresAt: null }),
-    ]);
-    renderManager(UserRole.MEMBER);
-    await screen.findByText("Forever");
-    expect(screen.getByText("Never")).toBeDefined();
-    expect(screen.queryByText("Expiring soon")).toBeNull();
-  });
-
-  it("empty list shows the empty state", async () => {
-    vi.mocked(getApiKeys).mockResolvedValue([]);
-    renderManager(UserRole.MEMBER);
-    expect(await screen.findByText("No API keys yet")).toBeDefined();
-  });
-});
-
-describe("ApiKeysManager — admin vs member view (acceptance #6)", () => {
-  it("a member does NOT see the author column", async () => {
-    vi.mocked(getApiKeys).mockResolvedValue([
-      makeKey({ creator: { id: "me", name: "Me", email: "m@x.io", avatarUrl: null } }),
-    ]);
-    renderManager(UserRole.MEMBER);
-    await screen.findByText("CI token");
-    // Author header absent + creator name not rendered (no author column).
-    expect(screen.queryByText("Author")).toBeNull();
-    expect(screen.queryByText("Me")).toBeNull();
-  });
-
-  it("an admin sees the author column with the creator's name", async () => {
-    vi.mocked(getApiKeys).mockResolvedValue([
-      makeKey({ creator: { id: "u1", name: "Alice", email: "a@x.io", avatarUrl: null } }),
-    ]);
-    renderManager(UserRole.ADMIN);
-    await screen.findByText("CI token");
-    expect(screen.getByText("Author")).toBeDefined();
-    expect(screen.getByText("Alice")).toBeDefined();
-  });
-});
-
-describe("ApiKeysManager — revoke (acceptance #4)", () => {
-  it("revoke removes the row from the list", async () => {
-    vi.mocked(getApiKeys)
-      .mockResolvedValueOnce([
-        makeKey({ id: "k1", name: "Doomed" }),
-        makeKey({ id: "k2", name: "Survivor" }),
-      ])
-      // After revoke, invalidation refetches the reduced list.
-      .mockResolvedValue([makeKey({ id: "k2", name: "Survivor" })]);
-    vi.mocked(revokeApiKey).mockResolvedValue();
-
-    renderManager(UserRole.MEMBER);
-    await screen.findByText("Doomed");
-
-    fireEvent.click(screen.getByLabelText("Revoke Doomed"));
-    // Confirm modal → click the destructive confirm button.
-    const confirm = await screen.findByRole("button", { name: "Revoke" });
-    fireEvent.click(confirm);
-
-    await waitFor(() =>
-      expect(screen.queryByText("Doomed")).toBeNull(),
-    );
-    expect(screen.getByText("Survivor")).toBeDefined();
-    expect(revokeApiKey).toHaveBeenCalledWith("k1");
-  });
-});
-
-describe("ApiKeysManager — show-once token (acceptance #1 & #2)", () => {
-  it("shows the token once, then discards it from the UI, localStorage and query cache", async () => {
-    const SECRET = "gm_secret-token-value-xyz";
-    vi.mocked(getApiKeys).mockResolvedValue([]);
-    vi.mocked(createApiKey).mockResolvedValue({
-      token: SECRET,
-      apiKey: {
-        id: "new-1",
-        name: "My key",
-        expiresAt: ISO_FAR,
-        createdAt: new Date().toISOString(),
-      },
-    });
-
-    const { queryClient } = renderManager(UserRole.MEMBER);
-    await screen.findByText("No API keys yet");
-
-    // Open create modal (use the header CTA), fill the name, submit.
-    fireEvent.click(
-      screen.getAllByRole("button", { name: "Create API key" })[0],
-    );
-    const nameInput = await screen.findByLabelText(/Name/);
-    fireEvent.change(nameInput, { target: { value: "My key" } });
-    fireEvent.click(screen.getByRole("button", { name: "Create" }));
-
-    // Token is shown exactly once in the show-once modal.
-    const tokenEl = await screen.findByTestId("api-key-token");
-    expect(tokenEl.textContent).toBe(SECRET);
-
-    // Close the modal → token discarded from the DOM.
-    fireEvent.click(screen.getByRole("button", { name: "Done" }));
-    await waitFor(() =>
-      expect(screen.queryByTestId("api-key-token")).toBeNull(),
-    );
-
-    // Acceptance #2: the secret is nowhere in localStorage or the react-query
-    // caches (query cache never carried it; the mutation copy was reset()).
-    // Non-vacuous: currentUser IS in storage, so the dump is exercised.
-    const dump = storageDump();
-    expect(dump).toContain("currentUser");
-    expect(dump).not.toContain(SECRET);
-    const cacheDump = JSON.stringify(
-      queryClient.getQueryCache().getAll().map((q) => q.state.data),
-    );
-    expect(cacheDump).not.toContain(SECRET);
-    const mutationDump = JSON.stringify(
-      queryClient.getMutationCache().getAll().map((m) => m.state.data),
-    );
-    expect(mutationDump).not.toContain(SECRET);
-  });
-});
@@ -1,264 +0,0 @@
-import { useState } from "react";
-import {
-  ActionIcon,
-  Badge,
-  Button,
-  Center,
-  Group,
-  Loader,
-  Stack,
-  Table,
-  Text,
-  Tooltip,
-} from "@mantine/core";
-import { modals } from "@mantine/modals";
-import { notifications } from "@mantine/notifications";
-import { IconAlertTriangle, IconKey, IconTrash } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import useUserRole from "@/hooks/use-user-role.tsx";
-import { formatLocalized, useDateFnsLocale } from "@/lib/date-locale";
-import { timeAgo } from "@/lib/time";
-import {
-  useApiKeysQuery,
-  useCreateApiKeyMutation,
-  useRevokeApiKeyMutation,
-} from "@/features/api-key/queries/api-key-query";
-import {
-  IApiKey,
-  ICreateApiKeyResponse,
-} from "@/features/api-key/types/api-key.types";
-import {
-  isExpired,
-  isExpiringSoon,
-  lastUsedBucket,
-} from "@/features/api-key/utils";
-import { CreateApiKeyModal } from "./create-api-key-modal";
-import { ShowTokenModal } from "./show-token-modal";
-
-export default function ApiKeysManager() {
-  const { t } = useTranslation();
-  const locale = useDateFnsLocale();
-  // Manage-on-API === Owner/Admin server-side, so the admin (workspace-wide)
-  // list + "author" column mirror exactly the roles the server serves the
-  // whole-workspace response to.
-  const { isAdmin } = useUserRole();
-
-  const { data: keys, isLoading, isError } = useApiKeysQuery();
-  const createMutation = useCreateApiKeyMutation();
-  const revokeMutation = useRevokeApiKeyMutation();
-
-  const [createOpened, setCreateOpened] = useState(false);
-  // SECURITY: the show-once token lives ONLY here, in this component's local
-  // state. It is never written to localStorage, the query cache or a log. Closing
-  // the modal sets it back to null (handleCloseToken) — discarded forever.
-  const [createdKey, setCreatedKey] = useState<ICreateApiKeyResponse | null>(
-    null,
-  );
-
-  const handleCreate = async (values: {
-    name: string;
-    expiresAt: string | null;
-  }): Promise<boolean> => {
-    try {
-      const res = await createMutation.mutateAsync(values);
-      setCreateOpened(false);
-      // Move the token into local state, then immediately purge react-query's
-      // own copy of the mutation result so the secret does not linger in the
-      // mutation cache.
-      setCreatedKey(res);
-      createMutation.reset();
-      return true;
-    } catch {
-      notifications.show({
-        message: t("Failed to create API key"),
-        color: "red",
-      });
-      return false;
-    }
-  };
-
-  const handleCloseToken = () => {
-    // Token discarded — the only copy the UI ever held is dropped here.
-    setCreatedKey(null);
-  };
-
-  const openRevokeModal = (key: IApiKey) =>
-    modals.openConfirmModal({
-      title: t("Revoke API key"),
-      centered: true,
-      children: (
-        <Text size="sm">
-          {t(
-            'Are you sure you want to revoke "{{name}}"? Any client using this key will immediately lose access. This cannot be undone.',
-            { name: key.name },
-          )}
-        </Text>
-      ),
-      labels: { confirm: t("Revoke"), cancel: t("Cancel") },
-      confirmProps: { color: "red" },
-      onConfirm: () => revokeMutation.mutate(key.id),
-    });
-
-  const formatDate = (iso: string) =>
-    formatLocalized(new Date(iso), "MMM dd, yyyy", "PP", locale);
-
-  const renderLastUsed = (lastUsedAt: string | null) => {
-    switch (lastUsedBucket(lastUsedAt)) {
-      case "never":
-        return t("Never used");
-      case "recent":
-        return t("Within the last hour");
-      case "stale":
-        // Coarse relative time — last_used_at is throttled to ~1h server-side,
-        // so we don't promise finer precision.
-        return timeAgo(new Date(lastUsedAt as string));
-    }
-  };
-
-  if (isLoading) {
-    return (
-      <Center py="xl">
-        <Loader size="sm" />
-      </Center>
-    );
-  }
-
-  const rows = (keys ?? []).map((key) => {
-    // Mutually exclusive: an already-expired key is labelled "Expired" (a past
-    // expiry) rather than the forward-looking "Expiring soon". isExpiringSoon
-    // also matches past expiries, so gate "soon" on !expired.
-    const expired = isExpired(key.expiresAt);
-    const soon = !expired && isExpiringSoon(key.expiresAt);
-    return (
-      <Table.Tr key={key.id}>
-        <Table.Td>
-          <Text fw={500}>{key.name}</Text>
-        </Table.Td>
-        <Table.Td>{formatDate(key.createdAt)}</Table.Td>
-        <Table.Td>
-          {key.expiresAt ? (
-            <Group gap={6} wrap="nowrap">
-              <Text size="sm">{formatDate(key.expiresAt)}</Text>
-              {expired && (
-                <Tooltip label={t("This key has expired")} withArrow>
-                  <Badge
-                    color="red"
-                    variant="light"
-                    size="sm"
-                    leftSection={<IconAlertTriangle size={12} />}
-                  >
-                    {t("Expired")}
-                  </Badge>
-                </Tooltip>
-              )}
-              {soon && (
-                <Tooltip
-                  label={t("This key expires within 30 days")}
-                  withArrow
-                >
-                  <Badge
-                    color="orange"
-                    variant="light"
-                    size="sm"
-                    leftSection={<IconAlertTriangle size={12} />}
-                  >
-                    {t("Expiring soon")}
-                  </Badge>
-                </Tooltip>
-              )}
-            </Group>
-          ) : (
-            <Text size="sm" c="dimmed">
-              {t("Never")}
-            </Text>
-          )}
-        </Table.Td>
-        <Table.Td>
-          <Text size="sm" c="dimmed">
-            {renderLastUsed(key.lastUsedAt)}
-          </Text>
-        </Table.Td>
-        {isAdmin && (
-          <Table.Td>
-            <Text size="sm">
-              {key.creator?.name ?? key.creator?.email ?? t("Unknown")}
-            </Text>
-          </Table.Td>
-        )}
-        <Table.Td style={{ textAlign: "right" }}>
-          <Tooltip label={t("Revoke")} withArrow>
-            <ActionIcon
-              variant="subtle"
-              color="red"
-              aria-label={t("Revoke {{name}}", { name: key.name })}
-              onClick={() => openRevokeModal(key)}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Tooltip>
-        </Table.Td>
-      </Table.Tr>
-    );
-  });
-
-  return (
-    <>
-      <Group justify="space-between" mb="md">
-        <Text size="sm" c="dimmed">
-          {isAdmin
-            ? t("API keys across the workspace.")
-            : t("Your personal API keys.")}
-        </Text>
-        <Button
-          leftSection={<IconKey size={16} />}
-          onClick={() => setCreateOpened(true)}
-        >
-          {t("Create API key")}
-        </Button>
-      </Group>
-
-      {isError ? (
-        <Text c="red" size="sm">
-          {t("Failed to load API keys.")}
-        </Text>
-      ) : rows.length === 0 ? (
-        <Stack align="center" gap="xs" py="xl">
-          <IconKey size={32} opacity={0.4} />
-          <Text c="dimmed">{t("No API keys yet")}</Text>
-          <Button
-            variant="light"
-            leftSection={<IconKey size={16} />}
-            onClick={() => setCreateOpened(true)}
-          >
-            {t("Create API key")}
-          </Button>
-        </Stack>
-      ) : (
-        <Table.ScrollContainer minWidth={600}>
-          <Table verticalSpacing="sm" highlightOnHover>
-            <Table.Thead>
-              <Table.Tr>
-                <Table.Th>{t("Name")}</Table.Th>
-                <Table.Th>{t("Created")}</Table.Th>
-                <Table.Th>{t("Expires")}</Table.Th>
-                <Table.Th>{t("Last used")}</Table.Th>
-                {isAdmin && <Table.Th>{t("Author")}</Table.Th>}
-                <Table.Th />
-              </Table.Tr>
-            </Table.Thead>
-            <Table.Tbody>{rows}</Table.Tbody>
-          </Table>
-        </Table.ScrollContainer>
-      )}
-
-      <CreateApiKeyModal
-        opened={createOpened}
-        onClose={() => setCreateOpened(false)}
-        onSubmit={handleCreate}
-        loading={createMutation.isPending}
-      />
-
-      <ShowTokenModal created={createdKey} onClose={handleCloseToken} />
-    </>
-  );
-}
@@ -1,104 +0,0 @@
-import { Button, Group, Modal, Select, Stack, TextInput } from "@mantine/core";
-import { useForm } from "@mantine/form";
-import { useTranslation } from "react-i18next";
-import {
-  ApiKeyLifetime,
-  DEFAULT_LIFETIME,
-  lifetimeToExpiresAt,
-} from "@/features/api-key/utils";
-
-interface Props {
-  opened: boolean;
-  onClose: () => void;
-  // Resolves the create request, returning true on success. The parent owns the
-  // mutation (and the token it returns); this modal only collects the name +
-  // lifetime. On failure (false) the form state is kept so the user can retry.
-  onSubmit: (values: {
-    name: string;
-    expiresAt: string | null;
-  }) => Promise<boolean>;
-  loading?: boolean;
-}
-
-interface FormValues {
-  name: string;
-  lifetime: ApiKeyLifetime;
-}
-
-export function CreateApiKeyModal({
-  opened,
-  onClose,
-  onSubmit,
-  loading,
-}: Props) {
-  const { t } = useTranslation();
-
-  const form = useForm<FormValues>({
-    initialValues: {
-      name: "",
-      lifetime: DEFAULT_LIFETIME,
-    },
-    validate: {
-      name: (value) =>
-        value.trim().length === 0 ? t("Name is required") : null,
-    },
-  });
-
-  const lifetimeOptions: { value: ApiKeyLifetime; label: string }[] = [
-    { value: "30d", label: t("30 days") },
-    { value: "90d", label: t("90 days") },
-    { value: "1y", label: t("1 year") },
-    { value: "never", label: t("No expiration") },
-  ];
-
-  const handleSubmit = form.onSubmit(async (values) => {
-    const ok = await onSubmit({
-      name: values.name.trim(),
-      expiresAt: lifetimeToExpiresAt(values.lifetime),
-    });
-    // Reset only after a successful submit so a failed create keeps the form
-    // state (the parent surfaces the error via a notification).
-    if (ok) form.reset();
-  });
-
-  const handleClose = () => {
-    form.reset();
-    onClose();
-  };
-
-  return (
-    <Modal
-      opened={opened}
-      onClose={handleClose}
-      title={t("Create API key")}
-      centered
-    >
-      <form onSubmit={handleSubmit}>
-        <Stack gap="sm">
-          <TextInput
-            label={t("Name")}
-            placeholder={t("e.g. CI deploy token")}
-            data-autofocus
-            withAsterisk
-            {...form.getInputProps("name")}
-          />
-          <Select
-            label={t("Expiration")}
-            data={lifetimeOptions}
-            allowDeselect={false}
-            checkIconPosition="right"
-            {...form.getInputProps("lifetime")}
-          />
-          <Group justify="flex-end" mt="xs">
-            <Button variant="default" onClick={handleClose} type="button">
-              {t("Cancel")}
-            </Button>
-            <Button type="submit" loading={loading}>
-              {t("Create")}
-            </Button>
-          </Group>
-        </Stack>
-      </form>
-    </Modal>
-  );
-}
@@ -1,107 +0,0 @@
-import {
-  Alert,
-  Button,
-  Code,
-  Group,
-  Modal,
-  Stack,
-  Text,
-} from "@mantine/core";
-import { IconAlertTriangle, IconCheck, IconCopy } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { CopyButton } from "@/components/common/copy-button";
-import { formatLocalized, useDateFnsLocale } from "@/lib/date-locale";
-import { ICreateApiKeyResponse } from "@/features/api-key/types/api-key.types";
-
-interface Props {
-  // The freshly-created key incl. its token. Owned by the parent; this modal
-  // only renders it and never copies it into its own persistent state.
-  created: ICreateApiKeyResponse | null;
-  // Closing MUST discard the token in the parent (set the `created` prop back to
-  // null) — the token is shown exactly once.
-  onClose: () => void;
-}
-
-export function ShowTokenModal({ created, onClose }: Props) {
-  const { t } = useTranslation();
-  const locale = useDateFnsLocale();
-
-  const expiresAt = created?.apiKey.expiresAt ?? null;
-
-  return (
-    <Modal
-      opened={created !== null}
-      onClose={onClose}
-      title={t("API key created")}
-      centered
-      // No dismiss-on-outside-click: the token is irretrievable, so closing is a
-      // deliberate act (the user confirms they have saved it).
-      closeOnClickOutside={false}
-    >
-      {created && (
-        <Stack gap="sm">
-          <Alert
-            color="orange"
-            icon={<IconAlertTriangle size={18} />}
-            variant="light"
-          >
-            {t(
-              "Copy your API key now and store it somewhere safe. For security reasons it will not be shown again.",
-            )}
-          </Alert>
-
-          <div>
-            <Text size="sm" c="dimmed" mb={4}>
-              {t("Token")}
-            </Text>
-            <Group gap="xs" wrap="nowrap" align="flex-start">
-              <Code
-                block
-                data-testid="api-key-token"
-                style={{ flex: 1, wordBreak: "break-all" }}
-              >
-                {created.token}
-              </Code>
-              <CopyButton value={created.token}>
-                {({ copied, copy }) => (
-                  <Button
-                    variant="light"
-                    size="xs"
-                    color={copied ? "teal" : "blue"}
-                    leftSection={
-                      copied ? (
-                        <IconCheck size={16} />
-                      ) : (
-                        <IconCopy size={16} />
-                      )
-                    }
-                    onClick={copy}
-                  >
-                    {copied ? t("Copied") : t("Copy")}
-                  </Button>
-                )}
-              </CopyButton>
-            </Group>
-          </div>
-
-          <Text size="sm" c="dimmed">
-            {expiresAt
-              ? t("Expires {{date}}", {
-                  date: formatLocalized(
-                    new Date(expiresAt),
-                    "MMM dd, yyyy",
-                    "PP",
-                    locale,
-                  ),
-                })
-              : t("This key never expires")}
-          </Text>
-
-          <Group justify="flex-end" mt="xs">
-            <Button onClick={onClose}>{t("Done")}</Button>
-          </Group>
-        </Stack>
-      )}
-    </Modal>
-  );
-}
@@ -1,66 +0,0 @@
-import {
-  useMutation,
-  useQuery,
-  useQueryClient,
-  UseQueryResult,
-} from "@tanstack/react-query";
-import { notifications } from "@mantine/notifications";
-import { useTranslation } from "react-i18next";
-import {
-  createApiKey,
-  getApiKeys,
-  revokeApiKey,
-} from "@/features/api-key/services/api-key-service";
-import {
-  IApiKey,
-  ICreateApiKey,
-  ICreateApiKeyResponse,
-} from "@/features/api-key/types/api-key.types";
-
-export const API_KEYS_QUERY_KEY = ["api-keys"];
-
-export function useApiKeysQuery(): UseQueryResult<IApiKey[], Error> {
-  return useQuery({
-    queryKey: API_KEYS_QUERY_KEY,
-    queryFn: () => getApiKeys(),
-  });
-}
-
-/**
- * Create mutation.
- *
- * SECURITY: the response contains the token exactly once. This hook deliberately
- * does NOT stash it anywhere — the caller reads it from `mutateAsync`'s resolved
- * value, moves it into the show-once modal's local state, then calls
- * `mutation.reset()` to purge react-query's own copy immediately. `gcTime: 0`
- * is a second belt so nothing lingers in the mutation cache after the observer
- * unmounts. The list is invalidated here (the list carries no token).
- */
-export function useCreateApiKeyMutation() {
-  const queryClient = useQueryClient();
-  return useMutation<ICreateApiKeyResponse, Error, ICreateApiKey>({
-    mutationFn: (data) => createApiKey(data),
-    gcTime: 0,
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: API_KEYS_QUERY_KEY });
-    },
-  });
-}
-
-export function useRevokeApiKeyMutation() {
-  const { t } = useTranslation();
-  const queryClient = useQueryClient();
-  return useMutation<void, Error, string>({
-    mutationFn: (id) => revokeApiKey(id),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: API_KEYS_QUERY_KEY });
-      notifications.show({ message: t("API key revoked") });
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to revoke API key"),
-        color: "red",
-      });
-    },
-  });
-}
@@ -1,78 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-
-// Mock the api-client (axios instance). vi.mock replaces the whole module, so
-// the real response interceptor — which returns `response.data`, i.e. the
-// server envelope { data, success, status } — is bypassed. Our mocked post/get
-// therefore resolve to that post-interceptor envelope shape directly, and the
-// service under test reads `.data` off it to unwrap the inner payload. This is
-// the one bug-prone line the component tests (which fully mock the service)
-// never exercise.
-const { post, get } = vi.hoisted(() => ({ post: vi.fn(), get: vi.fn() }));
-vi.mock("@/lib/api-client", () => ({
-  default: { post, get },
-}));
-
-import {
-  createApiKey,
-  getApiKeys,
-} from "@/features/api-key/services/api-key-service";
-
-beforeEach(() => {
-  vi.clearAllMocks();
-});
-
-describe("api-key-service response-contract unwrap", () => {
-  it("createApiKey unwraps the envelope to { token, apiKey }", async () => {
-    const payload = {
-      token: "gm_secret-abc",
-      apiKey: {
-        id: "key-1",
-        name: "CI token",
-        expiresAt: "2027-07-11T12:00:00.000Z",
-        createdAt: "2026-07-11T12:00:00.000Z",
-      },
-    };
-    // The server envelope as the interceptor hands it to the service.
-    post.mockResolvedValue({ data: payload, success: true, status: 200 });
-
-    const result = await createApiKey({
-      name: "CI token",
-      expiresAt: "2027-07-11T12:00:00.000Z",
-    });
-
-    // The inner payload only — not the { data, success, status } wrapper.
-    expect(result).toEqual(payload);
-    expect(result.token).toBe("gm_secret-abc");
-    expect(result.apiKey).toEqual(payload.apiKey);
-    expect(post).toHaveBeenCalledWith("/api-keys/create", {
-      name: "CI token",
-      expiresAt: "2027-07-11T12:00:00.000Z",
-    });
-  });
-
-  it("getApiKeys unwraps the envelope to the array of rows", async () => {
-    const rows = [
-      {
-        id: "key-1",
-        name: "CI token",
-        expiresAt: null,
-        lastUsedAt: null,
-        createdAt: "2026-01-01T00:00:00.000Z",
-      },
-      {
-        id: "key-2",
-        name: "Deploy token",
-        expiresAt: "2027-01-01T00:00:00.000Z",
-        lastUsedAt: null,
-        createdAt: "2026-02-01T00:00:00.000Z",
-      },
-    ];
-    post.mockResolvedValue({ data: rows, success: true, status: 200 });
-
-    const result = await getApiKeys();
-
-    expect(result).toEqual(rows);
-    expect(result).toHaveLength(2);
-    expect(post).toHaveBeenCalledWith("/api-keys/list");
-  });
-});
@@ -1,30 +0,0 @@
-import api from "@/lib/api-client";
-import {
-  IApiKey,
-  ICreateApiKey,
-  ICreateApiKeyResponse,
-} from "@/features/api-key/types/api-key.types";
-
-// Mint a new key. The response carries the token ONCE — the caller must move it
-// straight into the show-once modal's local state and never cache it. See
-// queries/api-key-query.ts (gcTime: 0 + query invalidation) and
-// components/api-keys-manager.tsx `handleCreate` (createMutation.reset() right
-// after reading the token) for the reset()-after-read pattern.
-export async function createApiKey(
-  data: ICreateApiKey,
-): Promise<ICreateApiKeyResponse> {
-  const res = await api.post<ICreateApiKeyResponse>("/api-keys/create", data);
-  return res.data as ICreateApiKeyResponse;
-}
-
-// List the caller's keys (or, for an admin, every key in the workspace with
-// creator attribution). Never returns token material.
-export async function getApiKeys(): Promise<IApiKey[]> {
-  const res = await api.post<IApiKey[]>("/api-keys/list");
-  return res.data as IApiKey[];
-}
-
-// Revocation is server-side immediate; the caller drops the row on success.
-export async function revokeApiKey(id: string): Promise<void> {
-  await api.post("/api-keys/revoke", { id });
-}
@@ -1,48 +0,0 @@
-// Compact creator attribution embedded in the admin (workspace-wide) list. A
-// normal member's list only ever contains their own keys, so the field is
-// present but redundant; the author column is only rendered for admins.
-export interface IApiKeyCreator {
-  id: string;
-  name: string;
-  email: string;
-  avatarUrl: string | null;
-}
-
-// A single api-key row as returned by `POST /api/api-keys/list`. Note: the list
-// NEVER carries token material — only metadata.
-export interface IApiKey {
-  id: string;
-  name: string;
-  // ISO string, or null for an unlimited ("never expires") key.
-  expiresAt: string | null;
-  // ISO string, or null if the key was never used. Throttled to ~1h server-side
-  // (#501), so the UI must not promise sub-hour precision.
-  lastUsedAt: string | null;
-  createdAt: string;
-  creator?: IApiKeyCreator | null;
-}
-
-// Payload for `POST /api/api-keys/create`. `expiresAt`: an ISO date string for a
-// bounded lifetime, or null for an unlimited key. (undefined would let the
-// server apply its 1-year default, but the form always sends an explicit value.)
-export interface ICreateApiKey {
-  name: string;
-  expiresAt: string | null;
-}
-
-// The metadata half of the create response. The token itself is carried
-// separately (see ICreateApiKeyResponse) and is shown exactly once.
-export interface ICreatedApiKey {
-  id: string;
-  name: string;
-  expiresAt: string | null;
-  createdAt: string;
-}
-
-// Response of `POST /api/api-keys/create`. `token` is the ONLY time the secret
-// is ever returned — it must live only in the show-once modal's local state and
-// must never be cached, persisted or logged.
-export interface ICreateApiKeyResponse {
-  token: string;
-  apiKey: ICreatedApiKey;
-}
@@ -1,100 +0,0 @@
-import { describe, it, expect } from "vitest";
-import {
-  DEFAULT_LIFETIME,
-  EXPIRY_WARNING_DAYS,
-  isExpired,
-  isExpiringSoon,
-  lastUsedBucket,
-  lifetimeToExpiresAt,
-} from "./utils";
-
-const NOW = new Date("2026-07-11T12:00:00.000Z");
-const daysFromNow = (n: number) =>
-  new Date(NOW.getTime() + n * 24 * 60 * 60 * 1000).toISOString();
-
-describe("lifetimeToExpiresAt", () => {
-  it("default lifetime is 1 year (acceptance #7)", () => {
-    expect(DEFAULT_LIFETIME).toBe("1y");
-    const iso = lifetimeToExpiresAt("1y", NOW);
-    expect(iso).toBe("2027-07-11T12:00:00.000Z");
-  });
-
-  it('"never" sends null (acceptance #7)', () => {
-    expect(lifetimeToExpiresAt("never", NOW)).toBeNull();
-  });
-
-  it("30d / 90d map to the exact future instant", () => {
-    expect(lifetimeToExpiresAt("30d", NOW)).toBe(daysFromNow(30));
-    expect(lifetimeToExpiresAt("90d", NOW)).toBe(daysFromNow(90));
-  });
-});
-
-describe("isExpiringSoon (acceptance #3 highlight)", () => {
-  it("an unlimited key is never 'soon'", () => {
-    expect(isExpiringSoon(null, NOW)).toBe(false);
-  });
-
-  it("highlights a key expiring within the 30-day window", () => {
-    expect(isExpiringSoon(daysFromNow(EXPIRY_WARNING_DAYS - 1), NOW)).toBe(true);
-    expect(isExpiringSoon(daysFromNow(10), NOW)).toBe(true);
-  });
-
-  it("does not highlight a key well outside the window", () => {
-    expect(isExpiringSoon(daysFromNow(EXPIRY_WARNING_DAYS + 1), NOW)).toBe(
-      false,
-    );
-    expect(isExpiringSoon(daysFromNow(200), NOW)).toBe(false);
-  });
-
-  it("an already-expired key is highlighted", () => {
-    expect(isExpiringSoon(daysFromNow(-3), NOW)).toBe(true);
-  });
-});
-
-describe("isExpired (past vs future expiry)", () => {
-  it("an unlimited key is never expired", () => {
-    expect(isExpired(null, NOW)).toBe(false);
-  });
-
-  it("a past expiry is expired", () => {
-    expect(isExpired(daysFromNow(-3), NOW)).toBe(true);
-    expect(isExpired(daysFromNow(-1), NOW)).toBe(true);
-  });
-
-  it("a future expiry is not expired (even within the warning window)", () => {
-    expect(isExpired(daysFromNow(1), NOW)).toBe(false);
-    expect(isExpired(daysFromNow(EXPIRY_WARNING_DAYS - 1), NOW)).toBe(false);
-    expect(isExpired(daysFromNow(200), NOW)).toBe(false);
-  });
-
-  it("an expiry exactly at 'now' counts as expired (boundary is inclusive)", () => {
-    expect(isExpired(NOW.toISOString(), NOW)).toBe(true);
-  });
-
-  it("is mutually distinguishable from isExpiringSoon: expired vs soon-but-future", () => {
-    // A key 3 days in the past: expired, and (by design) also matches
-    // isExpiringSoon — the UI resolves this by checking isExpired first.
-    expect(isExpired(daysFromNow(-3), NOW)).toBe(true);
-    // A key 10 days in the future: NOT expired, but expiring soon.
-    expect(isExpired(daysFromNow(10), NOW)).toBe(false);
-    expect(isExpiringSoon(daysFromNow(10), NOW)).toBe(true);
-  });
-});
-
-describe("lastUsedBucket (within-the-last-hour semantics)", () => {
-  const minutesAgo = (n: number) =>
-    new Date(NOW.getTime() - n * 60 * 1000).toISOString();
-
-  it("null last-used is 'never'", () => {
-    expect(lastUsedBucket(null, NOW)).toBe("never");
-  });
-
-  it("under an hour is 'recent' (no sub-hour precision promised)", () => {
-    expect(lastUsedBucket(minutesAgo(5), NOW)).toBe("recent");
-    expect(lastUsedBucket(minutesAgo(59), NOW)).toBe("recent");
-  });
-
-  it("over an hour is 'stale'", () => {
-    expect(lastUsedBucket(minutesAgo(90), NOW)).toBe("stale");
-  });
-});
@@ -1,76 +0,0 @@
-import { addDays, addYears, differenceInMinutes } from "date-fns";
-
-// The single early-warning window (#501/#506): keys whose expiry is closer than
-// this are visually highlighted in the list. Also used to classify a key as
-// already-expired (a negative "days until" is < 30 too).
-export const EXPIRY_WARNING_DAYS = 30;
-
-// last_used_at is throttled to ~1h server-side, so anything under an hour is
-// shown as the coarse "within the last hour" rather than a false-precise
-// "5 minutes ago".
-export const LAST_USED_THROTTLE_MINUTES = 60;
-
-export type ApiKeyLifetime = "30d" | "90d" | "1y" | "never";
-
-export const DEFAULT_LIFETIME: ApiKeyLifetime = "1y";
-
-// Maps a lifetime choice to the `expiresAt` payload sent to the server: an ISO
-// string for a bounded lifetime, or null for an explicit unlimited key.
-export function lifetimeToExpiresAt(
-  lifetime: ApiKeyLifetime,
-  now: Date = new Date(),
-): string | null {
-  switch (lifetime) {
-    case "30d":
-      return addDays(now, 30).toISOString();
-    case "90d":
-      return addDays(now, 90).toISOString();
-    case "1y":
-      return addYears(now, 1).toISOString();
-    case "never":
-      return null;
-  }
-}
-
-// True when a bounded key's expiry is already in the past (or exactly now). An
-// unlimited key (null) is never expired. This is distinct from "expiring soon":
-// the two states are mutually exclusive at the call site (see api-keys-manager),
-// so an already-expired key is labelled "Expired", not "Expiring soon".
-export function isExpired(
-  expiresAt: string | null,
-  now: Date = new Date(),
-): boolean {
-  if (!expiresAt) return false;
-  const expiry = new Date(expiresAt).getTime();
-  if (Number.isNaN(expiry)) return false;
-  return expiry <= now.getTime();
-}
-
-// True when a bounded key expires within the warning window (or is already
-// expired). An unlimited key (null) is never "expiring soon". Callers that need
-// to distinguish an already-past expiry should check isExpired() first, as this
-// predicate deliberately also covers the already-expired case.
-export function isExpiringSoon(
-  expiresAt: string | null,
-  now: Date = new Date(),
-): boolean {
-  if (!expiresAt) return false;
-  const expiry = new Date(expiresAt).getTime();
-  if (Number.isNaN(expiry)) return false;
-  const msLeft = expiry - now.getTime();
-  return msLeft < EXPIRY_WARNING_DAYS * 24 * 60 * 60 * 1000;
-}
-
-// Classifies last-used recency so the caller can pick the honest label without
-// promising sub-hour precision. Returns "never", "recent" (< 1h) or "stale".
-export function lastUsedBucket(
-  lastUsedAt: string | null,
-  now: Date = new Date(),
-): "never" | "recent" | "stale" {
-  if (!lastUsedAt) return "never";
-  const used = new Date(lastUsedAt);
-  if (Number.isNaN(used.getTime())) return "never";
-  return differenceInMinutes(now, used) < LAST_USED_THROTTLE_MINUTES
-    ? "recent"
-    : "stale";
-}
@@ -1,284 +0,0 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { render, screen, fireEvent } from "@testing-library/react";
-import { MantineProvider } from "@mantine/core";
-import { createInstance } from "i18next";
-import { initReactI18next, I18nextProvider } from "react-i18next";
-import { IComment } from "@/features/comment/types/comment.types";
-
-// matchMedia (read by MantineProvider) is stubbed globally in vitest.setup.ts.
-
-// The suggestion mutations reach react-query/network — stub them so the card
-// renders in isolation. We assert the Apply/Dismiss gating and that the click
-// hands the {commentId, pageId} pair to the existing mutation unchanged.
-const applyMutateAsync = vi.fn();
-const dismissMutateAsync = vi.fn();
-vi.mock("@/features/comment/queries/comment-query", () => ({
-  useApplySuggestionMutation: () => ({
-    mutateAsync: applyMutateAsync,
-    isPending: false,
-  }),
-  useDismissSuggestionMutation: () => ({
-    mutateAsync: dismissMutateAsync,
-    isPending: false,
-  }),
-}));
-
-// CommentContentView -> mention-view -> page-query/share-query pull in the app
-// entry (createRoot) as a side effect; stub the queries so the card renders in
-// isolation.
-vi.mock("@/features/page/queries/page-query.ts", () => ({
-  usePageQuery: () => ({ data: undefined, isLoading: false, isError: false }),
-}));
-vi.mock("@/features/share/queries/share-query.ts", () => ({
-  useSharePageQuery: () => ({ data: undefined }),
-}));
-// space-query.ts -> main.tsx (createRoot) is a module side effect reached via the
-// mention view; stub it so importing the card is side-effect free.
-vi.mock("@/features/space/queries/space-query.ts", () => ({
-  useSpaceQuery: () => ({ data: undefined }),
-  useGetSpaceBySlugQuery: () => ({ data: undefined }),
-}));
-
-import AgentEditCard, { RunHeader } from "./agent-edit-card";
-
-const body = (text: string) =>
-  JSON.stringify({
-    type: "doc",
-    content: [{ type: "paragraph", content: [{ type: "text", text }] }],
-  });
-
-const edit = (over?: Partial<IComment>): IComment =>
-  ({
-    id: "c-1",
-    content: body("[Существенно] tighten the wording"),
-    creatorId: "user-1",
-    pageId: "page-1",
-    workspaceId: "ws-1",
-    createdAt: new Date(),
-    createdSource: "agent",
-    aiChatId: "chat-1",
-    agent: { name: "Corrector", emoji: "✏️", avatarUrl: null },
-    launcher: { name: "Alice", avatarUrl: null },
-    creator: { id: "user-1", name: "Corrector", avatarUrl: null } as any,
-    selection: "old wording here",
-    suggestedText: "new wording here",
-    ...over,
-  }) as IComment;
-
-function renderCard(
-  comment: IComment,
-  canEdit = true,
-  canComment = true,
-  userSpaceRole?: string,
-) {
-  return render(
-    <MantineProvider>
-      <AgentEditCard
-        comment={comment}
-        canComment={canComment}
-        canEdit={canEdit}
-        userSpaceRole={userSpaceRole}
-      />
-    </MantineProvider>,
-  );
-}
-
-describe("AgentEditCard — suggested edit diff + Apply (#315)", () => {
-  it("renders the было→стало diff and an Apply button when canEdit, not applied/resolved", () => {
-    const { container } = renderCard(edit(), true);
-    // Both diff lines are present (old struck-through, new added).
-    expect(container.textContent).toContain("old wording here");
-    expect(container.textContent).toContain("new wording here");
-    // Diff line signs (aria-hidden) present for a replacement.
-    expect(container.textContent).toContain("−");
-    expect(container.textContent).toContain("+");
-    expect(screen.getByRole("button", { name: "Apply" })).toBeDefined();
-  });
-
-  it("hides Apply when canEdit is false (still shows the diff)", () => {
-    const { container } = renderCard(edit(), false);
-    expect(container.textContent).toContain("new wording here");
-    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
-  });
-
-  it("hides Apply once the thread is resolved", () => {
-    renderCard(edit({ resolvedAt: new Date() }), true);
-    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
-  });
-
-  it("hides Apply once suggestionAppliedAt is set", () => {
-    renderCard(edit({ suggestionAppliedAt: new Date() }), true);
-    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
-  });
-
-  it("shows the Applied badge for an applied suggestion, not a pending one (F1)", () => {
-    // Pending: no Applied badge.
-    const { unmount } = renderCard(edit(), true);
-    expect(screen.queryByText("Applied")).toBeNull();
-    unmount();
-    // Applied (kept alive by replies -> resolved, #329): the badge is restored.
-    renderCard(edit({ suggestionAppliedAt: new Date() }), true);
-    expect(screen.getByText("Applied")).toBeDefined();
-    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
-    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
-  });
-
-  it("calls the apply mutation with {commentId, pageId} on click", () => {
-    applyMutateAsync.mockClear();
-    renderCard(edit(), true);
-    fireEvent.click(screen.getByRole("button", { name: "Apply" }));
-    expect(applyMutateAsync).toHaveBeenCalledWith({
-      commentId: "c-1",
-      pageId: "page-1",
-    });
-  });
-
-  it("a pure insertion (empty selection) hides the removed line", () => {
-    const { container } = renderCard(
-      edit({ selection: "", suggestedText: "added text" }),
-      true,
-    );
-    // No "−" del sign — nothing was removed.
-    expect(container.textContent).not.toContain("−");
-    expect(container.textContent).toContain("+");
-  });
-
-  it("a pure deletion (empty suggestedText) hides the added line", () => {
-    const { container } = renderCard(
-      edit({ selection: "removed text", suggestedText: "" }),
-      true,
-    );
-    expect(container.textContent).not.toContain("+");
-    expect(container.textContent).toContain("−");
-  });
-});
-
-describe("AgentEditCard — Dismiss gate (#329/#338)", () => {
-  it("shows Dismiss alongside Apply for an admin who can edit/comment", () => {
-    renderCard(edit(), true, true, "admin");
-    expect(screen.getByRole("button", { name: "Apply" })).toBeDefined();
-    expect(screen.getByRole("button", { name: "Dismiss" })).toBeDefined();
-  });
-
-  it("shows Dismiss but NOT Apply for an admin commenter who cannot edit", () => {
-    renderCard(edit(), false, true, "admin");
-    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
-    expect(screen.getByRole("button", { name: "Dismiss" })).toBeDefined();
-  });
-
-  it("hides Dismiss for a non-owner non-admin (mirrors server 403, #338 F5)", () => {
-    renderCard(edit(), false, true, "member");
-    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
-  });
-
-  it("hides Dismiss when the viewer cannot comment", () => {
-    renderCard(edit(), false, false, "admin");
-    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
-  });
-
-  it("calls the dismiss mutation with {commentId, pageId} on click", () => {
-    dismissMutateAsync.mockClear();
-    renderCard(edit(), true, true, "admin");
-    fireEvent.click(screen.getByRole("button", { name: "Dismiss" }));
-    expect(dismissMutateAsync).toHaveBeenCalledWith({
-      commentId: "c-1",
-      pageId: "page-1",
-    });
-  });
-});
-
-describe("AgentEditCard — provenance", () => {
-  it("renders the agent avatar stack (provenance) for the edit author (#300)", () => {
-    renderCard(edit(), true);
-    // The agent role name is shown by the provenance stack.
-    expect(screen.getAllByText("Corrector").length).toBeGreaterThan(0);
-  });
-
-  // The owner-or-admin gate uses the currentUser atom; clear localStorage so a
-  // previous test's seed never leaks into the non-owner assertions above.
-  beforeEach(() => localStorage.clear());
-  afterEach(() => localStorage.clear());
-});
-
-// The RunHeader's "N edits · M major" is built with interpolated t() keys; the
-// default (uninitialized) react-i18next t returns the key verbatim WITHOUT
-// interpolating, so a numeric assertion needs a real, initialised i18n instance.
-// This isolated instance carries just the two count keys with escapeValue off so
-// "{{count}}" is substituted and the rendered numbers are assertable.
-const headerI18n = createInstance();
-headerI18n.use(initReactI18next).init({
-  lng: "en",
-  fallbackLng: "en",
-  resources: {
-    en: {
-      translation: {
-        "{{count}} edits": "{{count}} edits",
-        "{{count}} major": "{{count}} major",
-      },
-    },
-  },
-  interpolation: { escapeValue: false },
-});
-
-const runComment = (id: string, tag: string): IComment =>
-  edit({
-    id,
-    content: body(`${tag} some rationale`),
-  });
-
-function renderRunHeader(comments: IComment[]) {
-  return render(
-    <I18nextProvider i18n={headerI18n}>
-      <MantineProvider>
-        <RunHeader comments={comments} />
-      </MantineProvider>
-    </I18nextProvider>,
-  );
-}
-
-describe("RunHeader — agent-run series header (F3)", () => {
-  // 5 edits: 2 critical + 1 major + 1 minor + 1 unknown(verdict) => 3 "major".
-  const series = () => [
-    runComment("e1", "[Критично]"),
-    runComment("e2", "[Критично]"),
-    runComment("e3", "[Существенно]"),
-    runComment("e4", "[Незначительно]"),
-    runComment("e5", "[Неверно]"),
-  ];
-
-  it("shows the total edit count", () => {
-    renderRunHeader(series());
-    expect(screen.getByText(/5 edits/)).toBeDefined();
-  });
-
-  it("counts ONLY major+critical as major (not minor/unknown)", () => {
-    renderRunHeader(series());
-    // 2 critical + 1 major = 3; minor and the [Неверно] verdict are excluded.
-    expect(screen.getByText(/3 major/)).toBeDefined();
-    // Non-vacuous: the wrong tally (counting all 5, or 4) must NOT appear.
-    expect(screen.queryByText(/5 major/)).toBeNull();
-    expect(screen.queryByText(/4 major/)).toBeNull();
-  });
-
-  it("omits the major segment entirely when there are no significant edits", () => {
-    renderRunHeader([
-      runComment("e1", "[Незначительно]"),
-      runComment("e2", "[Неверно]"),
-    ]);
-    expect(screen.getByText(/2 edits/)).toBeDefined();
-    expect(screen.queryByText(/major/)).toBeNull();
-  });
-
-  it("renders the provenance line (agent role name)", () => {
-    renderRunHeader(series());
-    expect(screen.getAllByText("Corrector").length).toBeGreaterThan(0);
-  });
-
-  it("renders NO 'Accept all' control (rejected by product)", () => {
-    renderRunHeader(series());
-    expect(screen.queryByText(/accept all/i)).toBeNull();
-    expect(
-      screen.queryByRole("button", { name: /accept all/i }),
-    ).toBeNull();
-  });
-});
@@ -1,418 +0,0 @@
-import React, { useMemo } from "react";
-import {
-  Badge,
-  Box,
-  Button,
-  Group,
-  Stack,
-  Text,
-  useMantineColorScheme,
-  useMantineTheme,
-} from "@mantine/core";
-import { useAtom } from "jotai";
-import { useTranslation } from "react-i18next";
-import { AgentAvatarStack } from "@/components/ui/agent-avatar-stack.tsx";
-import CommentContentView from "@/features/comment/components/comment-content-view";
-import { IComment } from "@/features/comment/types/comment.types";
-import {
-  canShowApply,
-  canShowDismiss,
-  computeSuggestionDiff,
-  Segment,
-} from "@/features/comment/utils/suggestion";
-import { commentContentToText } from "@/features/comment/utils/comment-content-to-text";
-import {
-  isSignificant,
-  parseSeverity,
-  Severity,
-} from "@/features/comment/utils/severity";
-import {
-  useApplySuggestionMutation,
-  useDismissSuggestionMutation,
-} from "@/features/comment/queries/comment-query";
-import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
-import { useTimeAgo } from "@/hooks/use-time-ago";
-
-// Scroll the document to this comment's inline mark and flash it — the same
-// anchor navigation the old panel used (handleCommentClick). Used both by a card
-// click and by an explicit "Go to text" affordance.
-function scrollToCommentMark(commentId: string) {
-  const el = document.querySelector(
-    `.comment-mark[data-comment-id="${commentId}"]`,
-  );
-  if (el) {
-    el.scrollIntoView({ behavior: "smooth", block: "center" });
-    el.classList.add("comment-highlight");
-    setTimeout(() => el.classList.remove("comment-highlight"), 3000);
-  }
-}
-
-// Make otherwise-invisible edited whitespace legible inside a highlighted diff
-// fragment (a pure-space insertion/deletion would otherwise look like nothing
-// changed).
-function visibleWhitespace(s: string): string {
-  return s.replace(/ /g, "␣").replace(/\t/g, "⇥");
-}
-
-// One line of the intraline diff. `kind==="del"` is the old ("было") line drawn
-// red with a strike-through; `kind==="ins"` is the new ("стало") line drawn
-// green. Only the `changed` segments carry the emphasised mark background — the
-// common segments read as plain context (git/GitHub-style, #331).
-function DiffLine({
-  segments,
-  kind,
-}: {
-  segments: Segment[];
-  kind: "del" | "ins";
-}) {
-  const theme = useMantineTheme();
-  const { colorScheme } = useMantineColorScheme();
-  const dark = colorScheme === "dark";
-  const isDel = kind === "del";
-  const sign = isDel ? "−" : "+";
-  const signColor = isDel
-    ? theme.colors.red[dark ? 5 : 6]
-    : theme.colors.green[dark ? 5 : 6];
-  const baseColor = isDel
-    ? dark
-      ? theme.colors.gray[5]
-      : theme.colors.gray[6]
-    : dark
-      ? theme.colors.gray[1]
-      : theme.colors.dark[9];
-  const markBg = isDel
-    ? dark
-      ? "rgba(224,49,49,.22)"
-      : "#ffe3e3"
-    : dark
-      ? "rgba(47,158,68,.22)"
-      : "#d3f9d8";
-  const markFg = isDel
-    ? dark
-      ? theme.colors.red[3]
-      : theme.colors.red[8]
-    : dark
-      ? theme.colors.green[3]
-      : theme.colors.green[9];
-
-  return (
-    <Group gap={7} wrap="nowrap" align="flex-start">
-      <Text
-        ff="monospace"
-        fw={600}
-        fz={12}
-        c={signColor}
-        w={11}
-        ta="center"
-        aria-hidden
-        style={{ flex: "none", lineHeight: 1.5 }}
-      >
-        {sign}
-      </Text>
-      <Text fz={13.5} c={baseColor} style={{ lineHeight: 1.45 }}>
-        {segments.map((seg, i) =>
-          seg.changed ? (
-            <Box
-              key={i}
-              component="mark"
-              px={3}
-              fw={600}
-              style={{
-                background: markBg,
-                color: markFg,
-                borderRadius: 3,
-                textDecoration: isDel ? "line-through" : "none",
-              }}
-            >
-              {visibleWhitespace(seg.text)}
-            </Box>
-          ) : (
-            <Box
-              key={i}
-              component="span"
-              style={{ textDecoration: isDel ? "line-through" : "none" }}
-            >
-              {seg.text}
-            </Box>
-          ),
-        )}
-      </Text>
-    </Group>
-  );
-}
-
-// The "было → стало" block. A pure insertion (empty `before`) hides the old
-// line; a pure deletion (empty `after`) hides the new line.
-function DiffBlock({ before, after }: { before: Segment[]; after: Segment[] }) {
-  const pureInsert = before.length === 0;
-  const pureDelete = after.length === 0;
-  return (
-    <Stack gap={1}>
-      {!pureInsert && <DiffLine segments={before} kind="del" />}
-      {!pureDelete && <DiffLine segments={after} kind="ins" />}
-    </Stack>
-  );
-}
-
-const SEV_DOT: Record<Severity, { color: string; shade: number }> = {
-  critical: { color: "red", shade: 6 },
-  major: { color: "orange", shade: 6 },
-  minor: { color: "gray", shade: 5 },
-  // A neutral, deliberately faint dot — NOT the minor grey — so an untagged or
-  // verdict-only edit never reads as a graded severity.
-  unknown: { color: "gray", shade: 3 },
-};
-
-function SeverityDot({ severity }: { severity: Severity }) {
-  return (
-    <Box
-      w={8}
-      h={8}
-      aria-hidden
-      style={(t) => ({
-        flex: "none",
-        borderRadius: "50%",
-        background: t.colors[SEV_DOT[severity].color][SEV_DOT[severity].shade],
-      })}
-    />
-  );
-}
-
-interface AgentEditCardProps {
-  comment: IComment;
-  canComment: boolean;
-  canEdit?: boolean;
-  userSpaceRole?: string;
-  // Whether to render the per-card agent avatar + timestamp. A card inside a
-  // collapsed run omits it (the RunHeader carries the one provenance line);
-  // a standalone card shows it (#300 provenance must be visible on the card).
-  showProvenance?: boolean;
-}
-
-// Type A — the diff-first agent suggested-edit card. It carries NO TipTap editor
-// (a perf win vs. the old row, #340); the body renders through the static
-// CommentContentView. Apply/Dismiss reuse the existing mutations and gates
-// verbatim — the reskin changes presentation only, not the 409/404/400 toast
-// semantics or the authz gating.
-function AgentEditCard({
-  comment,
-  canComment,
-  canEdit,
-  userSpaceRole,
-  showProvenance = true,
-}: AgentEditCardProps) {
-  const { t } = useTranslation();
-  const [currentUser] = useAtom(currentUserAtom);
-  const applySuggestionMutation = useApplySuggestionMutation();
-  const dismissSuggestionMutation = useDismissSuggestionMutation();
-  const createdAtAgo = useTimeAgo(comment.createdAt);
-
-  const diff = useMemo(
-    () =>
-      computeSuggestionDiff(comment.selection ?? "", comment.suggestedText ?? ""),
-    [comment.selection, comment.suggestedText],
-  );
-
-  const severity = useMemo(
-    () => parseSeverity(commentContentToText(comment.content)),
-    [comment.content],
-  );
-
-  // Owner-or-space-admin gate (#338), mirrored from the old row so we never
-  // render a Dismiss the server would 403.
-  const isOwnerOrAdmin =
-    currentUser?.user?.id === comment.creatorId || userSpaceRole === "admin";
-
-  const isApplied = comment.suggestionAppliedAt != null;
-  const showApply = canShowApply(comment, canEdit);
-  const showDismiss = canShowDismiss(comment, canComment, isOwnerOrAdmin);
-  const pending =
-    applySuggestionMutation.isPending || dismissSuggestionMutation.isPending;
-
-  const handleApply = async () => {
-    try {
-      await applySuggestionMutation.mutateAsync({
-        commentId: comment.id,
-        pageId: comment.pageId,
-      });
-    } catch (error) {
-      // Errors (incl. 409 "text changed") surface via the mutation's onError.
-      console.error("Failed to apply suggestion:", error);
-    }
-  };
-
-  const handleDismiss = async () => {
-    try {
-      await dismissSuggestionMutation.mutateAsync({
-        commentId: comment.id,
-        pageId: comment.pageId,
-      });
-    } catch (error) {
-      // Idempotent 404 is reconciled to success in the mutation's onError.
-      console.error("Failed to dismiss suggestion:", error);
-    }
-  };
-
-  const sevLabel =
-    severity === "critical"
-      ? t("Critical")
-      : severity === "major"
-        ? t("Major")
-        : null;
-
-  return (
-    <Box
-      p="10px 12px"
-      role="button"
-      tabIndex={0}
-      aria-label={t("Jump to comment selection")}
-      onClick={() => scrollToCommentMark(comment.id)}
-      onKeyDown={(e) => {
-        if (e.key === "Enter" || e.key === " ") {
-          e.preventDefault();
-          scrollToCommentMark(comment.id);
-        }
-      }}
-      style={{ cursor: "pointer" }}
-    >
-      <Stack gap={8}>
-        {showProvenance && comment.agent && (
-          <Group
-            gap={8}
-            wrap="nowrap"
-            justify="space-between"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <AgentAvatarStack
-              agent={comment.agent}
-              launcher={comment.launcher}
-              aiChatId={comment.aiChatId}
-            />
-            <Text size="xs" c="dimmed" style={{ flex: "none" }}>
-              {createdAtAgo}
-            </Text>
-          </Group>
-        )}
-
-        <DiffBlock before={diff.old} after={diff.new} />
-
-        {/* Agent rationale — rendered through the static ProseMirror view, not
-            restructured into a flat string. */}
-        <Box fz="xs" c="dimmed">
-          <CommentContentView content={comment.content} />
-        </Box>
-
-        <Group gap={8} wrap="nowrap" onClick={(e) => e.stopPropagation()}>
-          <SeverityDot severity={severity} />
-          {sevLabel && (
-            <Text
-              fz={10}
-              fw={600}
-              tt="uppercase"
-              c="dimmed"
-              style={{ letterSpacing: ".06em", flex: 1 }}
-            >
-              {sevLabel}
-            </Text>
-          )}
-          <Box style={{ flex: 1 }} />
-          {/* Applied state (#315): a suggestion that was applied but kept alive by
-              its replies (so #329 resolved instead of hard-deleting it) still
-              shows it was applied — the badge the pre-redesign card carried. A
-              childless applied suggestion is gone from the list entirely, so this
-              only renders in the Resolved tab. */}
-          {isApplied && (
-            <Badge
-              size="sm"
-              color="green"
-              variant="light"
-              aria-label={t("Applied")}
-            >
-              {t("Applied")}
-            </Badge>
-          )}
-          {showDismiss && (
-            <Button
-              size="compact-sm"
-              variant="default"
-              color="gray"
-              loading={dismissSuggestionMutation.isPending}
-              disabled={pending}
-              onClick={handleDismiss}
-            >
-              {t("Dismiss")}
-            </Button>
-          )}
-          {showApply && (
-            <Button
-              size="compact-sm"
-              color="green"
-              loading={applySuggestionMutation.isPending}
-              disabled={pending}
-              onClick={handleApply}
-            >
-              {t("Apply")}
-            </Button>
-          )}
-        </Group>
-      </Stack>
-    </Box>
-  );
-}
-
-// Series header for a collapsed agent run: ONE provenance line for N edits,
-// with a "N edits · M major" tally. There is intentionally NO "Accept all"
-// button / progress / Stop (rejected by product) and NO "K applied" counter
-// (uncomputable after the #329 hard-delete). Purely visual.
-export function RunHeader({ comments }: { comments: IComment[] }) {
-  const { t } = useTranslation();
-  const head = comments[0];
-  const createdAtAgo = useTimeAgo(head?.createdAt);
-
-  const majors = useMemo(
-    () =>
-      comments.filter((c) =>
-        isSignificant(parseSeverity(commentContentToText(c.content))),
-      ).length,
-    [comments],
-  );
-
-  if (!head) return null;
-
-  return (
-    <Box
-      p="11px 13px"
-      style={{ borderBottom: "1px solid var(--mantine-color-default-border)" }}
-    >
-      <Group gap={10} wrap="nowrap" justify="space-between">
-        {head.agent ? (
-          <AgentAvatarStack
-            agent={head.agent}
-            launcher={head.launcher}
-            aiChatId={head.aiChatId}
-          />
-        ) : (
-          <Text size="sm" fw={600}>
-            {head.creator?.name}
-          </Text>
-        )}
-        <Text size="xs" c="dimmed" style={{ flex: "none" }}>
-          {createdAtAgo}
-        </Text>
-      </Group>
-      <Text fz={11.5} c="dimmed" mt={4}>
-        {t("{{count}} edits", { count: comments.length })}
-        {majors > 0 && (
-          <>
-            {" · "}
-            <Text span c="orange.7" fw={600} inherit>
-              {t("{{count}} major", { count: majors })}
-            </Text>
-          </>
-        )}
-      </Text>
-    </Box>
-  );
-}
-
-export default React.memo(AgentEditCard);
@@ -156,6 +156,125 @@ describe("CommentListItem — agent avatar stack", () => {
  // only guards the insertion gate (agent → stack, user → no stack).
 });

+describe("CommentListItem — suggested edit (#315)", () => {
+  const suggestion = (over?: Partial<IComment>): IComment =>
+    baseComment({
+      selection: "old wording here",
+      suggestedText: "new wording here",
+      ...over,
+    });
+
+  it("renders the было→стало diff and an Apply button when canEdit and not applied/resolved", () => {
+    const { container } = renderItem(suggestion(), true);
+    // Old text appears as the selection quote (a single unsplit Text node).
+    expect(screen.getAllByText("old wording here").length).toBeGreaterThan(0);
+    // The new line is now rendered as per-fragment spans (intraline diff, #331),
+    // so it is no longer a single text node — assert the concatenated content.
+    expect(container.textContent).toContain("new wording here");
+    // Apply button is present.
+    expect(screen.getByRole("button", { name: "Apply" })).toBeDefined();
+    // No Applied badge yet.
+    expect(screen.queryByText("Applied")).toBeNull();
+  });
+
+  it("hides the Apply button when canEdit is false", () => {
+    const { container } = renderItem(suggestion(), false);
+    // Diff still renders (as per-fragment spans, #331)...
+    expect(container.textContent).toContain("new wording here");
+    // ...but no Apply button.
+    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
+  });
+
+  it("shows an Applied badge (no Apply button) once suggestionAppliedAt is set", () => {
+    renderItem(suggestion({ suggestionAppliedAt: new Date() }), true);
+    expect(screen.getByText("Applied")).toBeDefined();
+    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
+  });
+
+  it("hides the Apply button once the thread is resolved", () => {
+    renderItem(suggestion({ resolvedAt: new Date() }), true);
+    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
+  });
+
+  it("calls the apply mutation when the Apply button is clicked", () => {
+    applyMutateAsync.mockClear();
+    renderItem(suggestion(), true);
+    fireEvent.click(screen.getByRole("button", { name: "Apply" }));
+    expect(applyMutateAsync).toHaveBeenCalledWith({
+      commentId: "c-1",
+      pageId: "page-1",
+    });
+  });
+
+  it("does not render the diff block for a reply (child) comment", () => {
+    renderItem(
+      suggestion({ parentCommentId: "c-0" }),
+      true,
+    );
+    expect(screen.queryByText("new wording here")).toBeNull();
+    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
+  });
+});
+
+describe("CommentListItem — dismiss suggestion (#329)", () => {
+  const suggestion = (over?: Partial<IComment>): IComment =>
+    baseComment({
+      selection: "old wording here",
+      suggestedText: "new wording here",
+      ...over,
+    });
+
+  // A space admin (userSpaceRole="admin") satisfies the owner-or-admin gate
+  // regardless of who authored the comment; the tests below use it as the lever
+  // since the currentUser atom is unseeded (null) in this harness.
+  it("renders a Dismiss button alongside Apply when canEdit and canComment (owner/admin)", () => {
+    renderItem(suggestion(), true, true, "admin");
+    expect(screen.getByRole("button", { name: "Apply" })).toBeDefined();
+    expect(screen.getByRole("button", { name: "Dismiss" })).toBeDefined();
+  });
+
+  it("shows Dismiss but NOT Apply for an admin commenter who cannot edit", () => {
+    renderItem(suggestion(), false, true, "admin");
+    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
+    expect(screen.getByRole("button", { name: "Dismiss" })).toBeDefined();
+  });
+
+  it("hides Dismiss when the viewer cannot comment", () => {
+    renderItem(suggestion(), false, false, "admin");
+    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
+    expect(screen.queryByRole("button", { name: "Apply" })).toBeNull();
+  });
+
+  it("hides Dismiss for a non-owner non-admin even with canComment (#338 F5: mirrors server 403)", () => {
+    // canComment=true but NOT a space admin and NOT the comment owner (the
+    // currentUser atom is null while the comment is authored by user-1), so the
+    // server would 403 a dismiss — the button must not be shown at all.
+    renderItem(suggestion(), false, true, "member");
+    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
+  });
+
+  it("hides Dismiss once the thread is resolved", () => {
+    renderItem(suggestion({ resolvedAt: new Date() }), true, true, "admin");
+    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
+  });
+
+  it("hides Dismiss (shows the Applied badge) once applied", () => {
+    renderItem(suggestion({ suggestionAppliedAt: new Date() }), true, true, "admin");
+    expect(screen.queryByRole("button", { name: "Dismiss" })).toBeNull();
+    expect(screen.getByText("Applied")).toBeDefined();
+  });
+
+  it("calls the dismiss mutation when the Dismiss button is clicked", () => {
+    dismissMutateAsync.mockClear();
+    renderItem(suggestion(), true, true, "admin");
+    fireEvent.click(screen.getByRole("button", { name: "Dismiss" }));
+    expect(dismissMutateAsync).toHaveBeenCalledWith({
+      commentId: "c-1",
+      pageId: "page-1",
+    });
+  });
+});
+
 describe("canShowApply predicate", () => {
  const c = (over?: Partial<IComment>): IComment =>
    ({ suggestedText: "x", ...over }) as IComment;
@@ -1,6 +1,6 @@
-import { Group, Text, Box } from "@mantine/core";
+import { Group, Text, Box, Badge, Button } from "@mantine/core";
 import { AgentAvatarStack } from "@/components/ui/agent-avatar-stack.tsx";
-import React, { useRef, useState } from "react";
+import React, { useMemo, useRef, useState } from "react";
 import classes from "./comment.module.css";
 import { useAtom, useAtomValue } from "jotai";
 import { useTimeAgo } from "@/hooks/use-time-ago";
@@ -12,11 +12,18 @@ import CommentMenu from "@/features/comment/components/comment-menu";
 import ResolveComment from "@/features/comment/components/resolve-comment";
 import { useHover } from "@mantine/hooks";
 import {
+  useApplySuggestionMutation,
  useDeleteCommentMutation,
+  useDismissSuggestionMutation,
  useResolveCommentMutation,
  useUpdateCommentMutation,
 } from "@/features/comment/queries/comment-query";
 import { IComment } from "@/features/comment/types/comment.types";
+import {
+  canShowApply,
+  canShowDismiss,
+  computeSuggestionDiff,
+} from "@/features/comment/utils/suggestion";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { useTranslation } from "react-i18next";
@@ -25,21 +32,13 @@ interface CommentListItemProps {
  comment: IComment;
  pageId: string;
  canComment: boolean;
-  // Real page-edit permission (page.permissions.canEdit). Kept on the props for
-  // parity with the container's wiring even though the thread row itself no
-  // longer renders the suggestion Apply button (that moved to AgentEditCard).
+  // Real page-edit permission (page.permissions.canEdit) — gates the suggestion
+  // "Apply" button. Distinct from `canComment`, which may be looser (viewers
+  // allowed to comment cannot apply edits).
  canEdit?: boolean;
  userSpaceRole?: string;
 }

-// Type B — the thread ROW. Renders a single human OR agent-without-edit comment
-// in the redesigned visual: provenance avatar, author + timeago, hover-revealed
-// resolve + edit/delete menu, the anchored selection quote, and the body through
-// the static CommentContentView (or the inline TipTap editor while editing). It
-// is used for both a top-level thread comment and, recursively, each reply row.
-// ALL wiring (update/delete/resolve mutations, owner/admin gate, anchor nav) is
-// the same logic the old row carried — only the presentation changed, and the
-// agent suggested-edit block was lifted out into AgentEditCard.
 function CommentListItem({
  comment,
  pageId,
@@ -56,20 +55,29 @@ function CommentListItem({
  const updateCommentMutation = useUpdateCommentMutation();
  const deleteCommentMutation = useDeleteCommentMutation(comment.pageId);
  const resolveCommentMutation = useResolveCommentMutation();
+  const applySuggestionMutation = useApplySuggestionMutation();
+  const dismissSuggestionMutation = useDismissSuggestionMutation();
  const [currentUser] = useAtom(currentUserAtom);
  const createdAtAgo = useTimeAgo(comment.createdAt);

-  // `canEdit`/`pageId` are threaded through for wiring parity with the container;
-  // the thread row does not itself gate on them (Apply lives on AgentEditCard).
-  void canEdit;
-  void pageId;
+  // Intraline "before -> after" diff (#331) for a suggested edit: only the
+  // fragments that actually changed get emphasised inside the red/green block,
+  // instead of striking through / greening the whole line. Memoised on the
+  // (selection, suggestedText) pair so it recomputes only when they change.
+  const suggestionDiff = useMemo(
+    () =>
+      comment.suggestedText != null
+        ? computeSuggestionDiff(comment.selection ?? "", comment.suggestedText)
+        : null,
+    [comment.selection, comment.suggestedText],
+  );

-  // Owner-or-space-admin gate (#338): mirrors the server authz for the comment
-  // menu (edit/delete), so we never render an action the server will 403.
+  // Owner-or-space-admin gate (#338): mirrors the server authz for both the
+  // comment menu (edit/delete) and the suggestion Dismiss button, so we never
+  // render an action the server will 403.
  const isOwnerOrAdmin =
    currentUser?.user?.id === comment.creatorId || userSpaceRole === "admin";

-  const isAgent = comment.createdSource === "agent" && !!comment.agent;

  async function handleUpdateComment() {
    try {
@@ -113,9 +121,34 @@ function CommentListItem({
    }
  }

-  function handleCommentClick(target: IComment) {
+  async function handleApplySuggestion() {
+    try {
+      await applySuggestionMutation.mutateAsync({
+        commentId: comment.id,
+        pageId: comment.pageId,
+      });
+    } catch (error) {
+      // Errors surface via the mutation's onError notification (incl. 409).
+      console.error("Failed to apply suggestion:", error);
+    }
+  }
+
+  async function handleDismissSuggestion() {
+    try {
+      await dismissSuggestionMutation.mutateAsync({
+        commentId: comment.id,
+        pageId: comment.pageId,
+      });
+    } catch (error) {
+      // Idempotent races are reconciled to success in the mutation's onError;
+      // anything else surfaces there as a notification.
+      console.error("Failed to dismiss suggestion:", error);
+    }
+  }
+
+  function handleCommentClick(comment: IComment) {
    const el = document.querySelector(
-      `.comment-mark[data-comment-id="${target.id}"]`,
+      `.comment-mark[data-comment-id="${comment.id}"]`,
    );
    if (el) {
      el.scrollIntoView({ behavior: "smooth", block: "center" });
@@ -136,10 +169,10 @@ function CommentListItem({

  return (
    <Box ref={ref} pb={6}>
-      <Group gap="xs" wrap="nowrap" align="flex-start">
-        {isAgent ? (
+      <Group gap="xs">
+        {comment.createdSource === "agent" && comment.agent ? (
          <AgentAvatarStack
-            agent={comment.agent!}
+            agent={comment.agent}
            launcher={comment.launcher}
            aiChatId={comment.aiChatId}
            showName={false}
@@ -152,13 +185,13 @@ function CommentListItem({
          />
        )}

-        <div style={{ flex: 1, minWidth: 0 }}>
+        <div style={{ flex: 1 }}>
          <Group justify="space-between" wrap="nowrap">
            <Group gap={6} wrap="nowrap" style={{ minWidth: 0 }}>
-              {isAgent ? (
+              {comment.createdSource === "agent" && comment.agent ? (
                <>
                  <Text size="xs" fw={600} lineClamp={1} lh={1.2}>
-                    {comment.agent!.name}
+                    {comment.agent.name}
                  </Text>
                  {comment.launcher && (
                    <>
@@ -229,6 +262,87 @@ function CommentListItem({
          </Box>
        )}

+        {/* Suggested-edit (#315): "было → стало" diff for a top-level comment
+            carrying a suggestion. Old text struck-through/red, new text green. */}
+        {!comment.parentCommentId && comment.suggestedText && (
+          <Box className={classes.suggestionBlock}>
+            {comment.selection && (
+              // Old line: read as removed as a whole (line-through/red); only the
+              // changed fragments carry the extra intraline emphasis.
+              <Text size="xs" className={classes.suggestionOld}>
+                {suggestionDiff?.old.map((segment, index) => (
+                  <span
+                    key={index}
+                    className={segment.changed ? classes.suggestionChanged : undefined}
+                  >
+                    {segment.text}
+                  </span>
+                ))}
+              </Text>
+            )}
+            <Text size="xs" className={classes.suggestionNew}>
+              {suggestionDiff?.new.map((segment, index) => (
+                <span
+                  key={index}
+                  className={segment.changed ? classes.suggestionChanged : undefined}
+                >
+                  {segment.text}
+                </span>
+              ))}
+            </Text>
+
+            {comment.suggestionAppliedAt ? (
+              <Badge
+                size="sm"
+                color="green"
+                variant="light"
+                mt={6}
+                aria-label={t("Applied")}
+              >
+                {t("Applied")}
+              </Badge>
+            ) : (
+              (canShowApply(comment, canEdit) ||
+                canShowDismiss(comment, canComment, isOwnerOrAdmin)) && (
+                <Group gap="xs" mt={6}>
+                  {canShowApply(comment, canEdit) && (
+                    <Button
+                      size="compact-xs"
+                      variant="light"
+                      color="green"
+                      onClick={handleApplySuggestion}
+                      loading={applySuggestionMutation.isPending}
+                      disabled={
+                        applySuggestionMutation.isPending ||
+                        dismissSuggestionMutation.isPending
+                      }
+                    >
+                      {t("Apply")}
+                    </Button>
+                  )}
+                  {/* Dismiss ("Не применять", #329): removes the suggestion
+                      without changing the page text. Gated on canComment. */}
+                  {canShowDismiss(comment, canComment, isOwnerOrAdmin) && (
+                    <Button
+                      size="compact-xs"
+                      variant="subtle"
+                      color="gray"
+                      onClick={handleDismissSuggestion}
+                      loading={dismissSuggestionMutation.isPending}
+                      disabled={
+                        applySuggestionMutation.isPending ||
+                        dismissSuggestionMutation.isPending
+                      }
+                    >
+                      {t("Dismiss")}
+                    </Button>
+                  )}
+                </Group>
+              )
+            )}
+          </Box>
+        )}
+
        {!isEditing ? (
          <CommentContentView content={comment.content} />
        ) : (
@@ -236,9 +350,7 @@ function CommentListItem({
            <CommentEditor
              defaultContent={comment.content}
              editable={true}
-              onUpdate={(newContent: any) => {
-                editContentRef.current = newContent;
-              }}
+              onUpdate={(newContent: any) => { editContentRef.current = newContent; }}
              onSave={handleUpdateComment}
              autofocus={true}
            />
@@ -27,15 +27,11 @@ vi.mock("@/features/space/queries/space-query.ts", () => ({
 import {
  buildChildrenByParent,
  CommentEditorWithActions,
-  sortResolvedByResolvedAt,
 } from "./comment-list-with-tabs";

 const c = (id: string, parentCommentId: string | null = null): IComment =>
  ({ id, parentCommentId }) as IComment;

-const resolvedAtComment = (id: string, resolvedAt: unknown): IComment =>
-  ({ id, resolvedAt }) as unknown as IComment;
-
 describe("buildChildrenByParent (childrenByParent grouping)", () => {
  it("returns an empty map for undefined or empty input", () => {
    expect(buildChildrenByParent(undefined).size).toBe(0);
@@ -75,48 +71,6 @@ describe("buildChildrenByParent (childrenByParent grouping)", () => {
  });
 });

-describe("sortResolvedByResolvedAt (Resolved tab order, #542)", () => {
-  it("orders by resolvedAt DESC — newest resolve first — with ISO-STRING values", () => {
-    // At runtime resolvedAt is an ISO string (axios JSON / WS subscription), so
-    // the sort must coerce with new Date(...) before .getTime().
-    const older = resolvedAtComment("older", "2026-07-10T10:00:00.000Z");
-    const newest = resolvedAtComment("newest", "2026-07-12T10:00:00.000Z");
-    const middle = resolvedAtComment("middle", "2026-07-11T10:00:00.000Z");
-
-    const out = sortResolvedByResolvedAt([older, newest, middle]);
-    expect(out.map((x) => x.id)).toEqual(["newest", "middle", "older"]);
-  });
-
-  it("also handles Date instances (optimistic onMutate window)", () => {
-    const older = resolvedAtComment("older", new Date("2026-01-01T00:00:00Z"));
-    const newer = resolvedAtComment("newer", new Date("2026-06-01T00:00:00Z"));
-    expect(sortResolvedByResolvedAt([older, newer]).map((x) => x.id)).toEqual([
-      "newer",
-      "older",
-    ]);
-  });
-
-  it("does not mutate the input array", () => {
-    const a = resolvedAtComment("a", "2026-01-01T00:00:00.000Z");
-    const b = resolvedAtComment("b", "2026-02-01T00:00:00.000Z");
-    const input = [a, b];
-    sortResolvedByResolvedAt(input);
-    expect(input.map((x) => x.id)).toEqual(["a", "b"]);
-  });
-
-  it("keeps stable order for equal resolvedAt timestamps", () => {
-    const ts = "2026-03-03T03:03:03.000Z";
-    const x = resolvedAtComment("x", ts);
-    const y = resolvedAtComment("y", ts);
-    const z = resolvedAtComment("z", ts);
-    expect(sortResolvedByResolvedAt([x, y, z]).map((c) => c.id)).toEqual([
-      "x",
-      "y",
-      "z",
-    ]);
-  });
-});
-
 function renderReplyEditor() {
  return render(
    <MantineProvider>
@@ -5,7 +5,7 @@ import {
  Center,
  Divider,
  Group,
-  Box,
+  Paper,
  Stack,
  Tabs,
  Badge,
@@ -14,9 +14,6 @@ import {
  Tooltip,
 } from "@mantine/core";
 import CommentListItem from "@/features/comment/components/comment-list-item";
-import AgentEditCard, {
-  RunHeader,
-} from "@/features/comment/components/agent-edit-card";
 import {
  useCommentsQuery,
  useCreateCommentMutation,
@@ -25,10 +22,6 @@ import CommentEditor from "@/features/comment/components/comment-editor";
 import CommentActions from "@/features/comment/components/comment-actions";
 import { useFocusWithin } from "@mantine/hooks";
 import { IComment } from "@/features/comment/types/comment.types.ts";
-import {
-  groupAgentRuns,
-  CommentRenderUnit,
-} from "@/features/comment/utils/group-agent-runs";
 import { usePageMetaQuery } from "@/features/page/queries/page-query.ts";
 import { extractPageSlugId } from "@/lib";
 import { useTranslation } from "react-i18next";
@@ -60,48 +53,6 @@ export function buildChildrenByParent(
  return m;
 }

-// Sort the Resolved tab by resolve time, newest first, on a COPY (never mutate
-// the react-query cache array). `resolvedAt` is typed `Date` but at runtime it
-// is an ISO STRING (from the axios-JSON onSuccess and the WS subscription) — a
-// real Date only during the optimistic onMutate window — so it MUST be coerced
-// with `new Date(...)` before `.getTime()`, or a raw `.getTime()` on the string
-// throws / yields NaN. ES2019's stable sort preserves order for equal
-// timestamps. Callers pass a list already filtered to a truthy `resolvedAt`, so
-// the non-null assertion is safe.
-// Exported for unit testing.
-export function sortResolvedByResolvedAt(resolved: IComment[]): IComment[] {
-  return [...resolved].sort(
-    (a, b) =>
-      new Date(b.resolvedAt!).getTime() - new Date(a.resolvedAt!).getTime(),
-  );
-}
-
-// The redesigned card shell: a rounded, bordered surface on the panel body. Both
-// a thread card and an agent-run group live inside one of these.
-function PanelCard({
-  children,
-  ...rest
-}: {
-  children: React.ReactNode;
-  [key: string]: unknown;
-}) {
-  return (
-    <Box
-      m="8px 10px"
-      p={0}
-      style={{
-        background: "var(--mantine-color-body)",
-        border: "1px solid var(--mantine-color-default-border)",
-        borderRadius: 10,
-        overflow: "hidden",
-      }}
-      {...rest}
-    >
-      {children}
-    </Box>
-  );
-}
-
 function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
  const { t } = useTranslation();
  const { pageSlug } = useParams();
@@ -123,8 +74,6 @@ function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
    canEdit ||
    (space?.settings?.comments?.allowViewerComments === true);

-  const userSpaceRole = space?.membership?.role;
-
  // Separate active and resolved comments
  const { activeComments, resolvedComments } = useMemo(() => {
    if (!comments?.items) {
@@ -142,23 +91,9 @@ function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
      (comment: IComment) => comment.resolvedAt,
    );

-    return {
-      activeComments: active,
-      resolvedComments: sortResolvedByResolvedAt(resolved),
-    };
+    return { activeComments: active, resolvedComments: resolved };
  }, [comments]);

-  // Collapse each tab's top-level list into render units (a lone comment or a
-  // collapsed agent run). Purely visual — the underlying data is untouched.
-  const activeUnits = useMemo(
-    () => groupAgentRuns(activeComments),
-    [activeComments],
-  );
-  const resolvedUnits = useMemo(
-    () => groupAgentRuns(resolvedComments),
-    [resolvedComments],
-  );
-
  // Index replies by their parent once, instead of an O(n^2) filter per thread.
  // The map ref changes on any comments update, so MemoizedChildComments re-runs
  // (cheap) and re-looks-up, while memoized CommentListItems skip unchanged items.
@@ -214,104 +149,56 @@ function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
    [createCommentAsync, page?.id],
  );

-  // The full subtree for ONE top-level comment: its head card (thread row or
-  // agent edit card), its nested replies, and a lazily-mounted reply editor.
-  // Shared by a standalone card and a card inside an agent-run group so the
-  // reply threading / lazy editor (#340) is wired identically in both.
-  const renderCommentSubtree = useCallback(
-    (comment: IComment, isEdit: boolean, showProvenance: boolean) => (
-      <>
-        {isEdit ? (
-          <AgentEditCard
+  const renderComments = useCallback(
+    (comment: IComment) => (
+      <Paper
+        shadow="sm"
+        radius="md"
+        p="xs"
+        mb="xs"
+        withBorder
+        key={comment.id}
+        data-comment-id={comment.id}
+      >
+        <div>
+          <CommentListItem
            comment={comment}
+            pageId={page?.id}
            canComment={canComment}
            canEdit={canEdit}
-            userSpaceRole={userSpaceRole}
-            showProvenance={showProvenance}
+            userSpaceRole={space?.membership?.role}
          />
-        ) : (
-          <Box p="xs">
-            <CommentListItem
-              comment={comment}
-              pageId={page?.id}
-              canComment={canComment}
-              canEdit={canEdit}
-              userSpaceRole={userSpaceRole}
-            />
-          </Box>
-        )}
-
-        <Box px="xs">
          <MemoizedChildComments
            childrenByParent={childrenByParent}
            parentId={comment.id}
            pageId={page?.id}
            canComment={canComment}
            canEdit={canEdit}
-            userSpaceRole={userSpaceRole}
+            userSpaceRole={space?.membership?.role}
          />
-        </Box>
+        </div>

        {!comment.resolvedAt && canComment && (
-          <Box px="xs" pb="xs">
+          <>
            <Divider my={2} />
            <CommentEditorWithActions
              commentId={comment.id}
              onSave={handleAddReply}
            />
-          </Box>
+          </>
        )}
-      </>
+      </Paper>
    ),
    [
      childrenByParent,
      handleAddReply,
      page?.id,
-      userSpaceRole,
+      space?.membership?.role,
      canComment,
      canEdit,
    ],
  );

-  // Render one collapsed unit: a standalone card (thread or lone edit) or an
-  // agent-run group (one RunHeader over N stacked edit cards).
-  const renderUnit = useCallback(
-    (unit: CommentRenderUnit) => {
-      if (unit.kind === "single") {
-        const c = unit.comment;
-        const isEdit =
-          c.createdSource === "agent" &&
-          c.suggestedText != null &&
-          !c.parentCommentId;
-        return (
-          <PanelCard key={c.id} data-comment-id={c.id}>
-            {renderCommentSubtree(c, isEdit, true)}
-          </PanelCard>
-        );
-      }
-
-      // A collapsed agent run: one header, then each edit card (provenance
-      // suppressed on the cards — the header carries the single provenance line).
-      return (
-        <PanelCard key={unit.key}>
-          <RunHeader comments={unit.comments} />
-          {unit.comments.map((c) => (
-            <Box
-              key={c.id}
-              data-comment-id={c.id}
-              style={{
-                borderTop: "1px solid var(--mantine-color-default-border)",
-              }}
-            >
-              {renderCommentSubtree(c, true, false)}
-            </Box>
-          ))}
-        </PanelCard>
-      );
-    },
-    [renderCommentSubtree],
-  );
-
  if (isCommentsLoading) {
    return <></>;
  }
@@ -320,6 +207,8 @@ function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
    return <div>{t("Error loading comments.")}</div>;
  }

+  const totalComments = activeComments.length + resolvedComments.length;
+
  const pageCommentInput = canComment ? (
    <PageCommentInput
      onSave={handleAddPageComment}
@@ -420,7 +309,7 @@ function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
                  </Stack>
                </Center>
              ) : (
-                activeUnits.map(renderUnit)
+                activeComments.map(renderComments)
              )}
            </Tabs.Panel>

@@ -439,7 +328,7 @@ function CommentListWithTabs({ onClose }: CommentListWithTabsProps) {
                  </Stack>
                </Center>
              ) : (
-                resolvedUnits.map(renderUnit)
+                resolvedComments.map(renderComments)
              )}
            </Tabs.Panel>
          </div>
@@ -21,6 +21,53 @@
    box-sizing: border-box;
 }

+/* Suggested-edit (#315) "было → стало" diff block. */
+.suggestionBlock {
+    margin-top: 8px;
+    margin-left: 6px;
+    padding: 6px;
+    border-radius: var(--mantine-radius-sm);
+    border: 1px solid var(--mantine-color-default-border);
+    overflow-wrap: break-word;
+    word-break: break-word;
+    max-width: 100%;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+}
+
+.suggestionOld {
+    text-decoration: line-through;
+    color: var(--mantine-color-red-7);
+    background: var(--mantine-color-red-light);
+    border-radius: 2px;
+    padding: 1px 3px;
+}
+
+.suggestionNew {
+    color: var(--mantine-color-green-9);
+    background: var(--mantine-color-green-light);
+    border-radius: 2px;
+    padding: 1px 3px;
+    margin-top: 4px;
+}
+
+/* Intraline diff (#331): the fragment that actually changed within the
+   red "before" / green "after" block. It inherits the surrounding red/green
+   framing and adds a stronger tint plus bold weight so the eye lands on the
+   changed letters/words (git/GitHub-style) rather than the whole line. The
+   container's line-through (old) / green (new) still marks the full line. */
+.suggestionChanged {
+    /* Stronger tint of the surrounding red/green so the changed fragment pops
+       within the block. `currentColor` follows the parent's red (old) or green
+       (new) text colour. No `text-decoration` here on purpose: the old block's
+       inherited line-through must survive on the changed letters too. */
+    background: color-mix(in srgb, currentColor 22%, transparent);
+    border-radius: 2px;
+    font-weight: 700;
+}
+
 .commentEditor {

    &[data-editable][data-surface="muted"] .ProseMirror:not(.focused) {
@@ -1,353 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import React from "react";
-import { renderHook, waitFor } from "@testing-library/react";
-import {
-  QueryClient,
-  QueryClientProvider,
-  InfiniteData,
-} from "@tanstack/react-query";
-
-/**
- * Coverage for the resolve/reopen mutation (#542): the Undo-in-toast reopen and
- * its double-click guard, the terminal 404 branch (drop from cache + clear the
- * inline mark, no rollback), and the directional error copy.
- */
-
-// A fake TipTap editor injected via the mocked pageEditorAtom, so we can assert
-// the mutation clears the inline comment mark (unsetComment / setCommentResolved).
-const editorMock = vi.hoisted(() => ({
-  current: {
-    isDestroyed: false,
-    commands: { unsetComment: vi.fn(), setCommentResolved: vi.fn() },
-  } as {
-    isDestroyed: boolean;
-    commands: {
-      unsetComment: (id: string) => void;
-      setCommentResolved: (id: string, v: boolean) => void;
-    };
-  } | null,
-}));
-
-vi.mock("@mantine/notifications", () => ({
-  notifications: { show: vi.fn(), hide: vi.fn() },
-}));
-
-vi.mock("jotai", () => ({
-  atom: (v: unknown) => v,
-  useAtomValue: () => editorMock.current,
-}));
-
-vi.mock("@/features/comment/services/comment-service", () => ({
-  applySuggestion: vi.fn(),
-  dismissSuggestion: vi.fn(),
-  createComment: vi.fn(),
-  updateComment: vi.fn(),
-  deleteComment: vi.fn(),
-  resolveComment: vi.fn(),
-  getPageComments: vi.fn(),
-}));
-
-import { notifications } from "@mantine/notifications";
-import { resolveComment } from "@/features/comment/services/comment-service";
-import {
-  useResolveCommentMutation,
-  RESOLVE_UNDO_AUTOCLOSE_MS,
-  RQ_KEY,
-} from "@/features/comment/queries/comment-query";
-import { IComment } from "@/features/comment/types/comment.types";
-
-const PAGE_ID = "page-1";
-
-function seededClient(comment: IComment) {
-  const queryClient = new QueryClient({
-    defaultOptions: { mutations: { retry: false } },
-  });
-  const seed: InfiniteData<any> = {
-    pageParams: [undefined],
-    pages: [
-      { items: [comment], meta: { hasNextPage: false, nextCursor: null } },
-    ],
-  };
-  queryClient.setQueryData(RQ_KEY(PAGE_ID), seed);
-  const wrapper = ({ children }: { children: React.ReactNode }) => (
-    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-  );
-  return { queryClient, wrapper };
-}
-
-function items(queryClient: QueryClient): IComment[] {
-  const cache = queryClient.getQueryData(RQ_KEY(PAGE_ID)) as
-    | InfiniteData<any>
-    | undefined;
-  return cache?.pages.flatMap((p) => p.items) ?? [];
-}
-
-const comment = (over?: Partial<IComment>): IComment =>
-  ({
-    id: "c-1",
-    pageId: PAGE_ID,
-    content: "{}",
-    creatorId: "u-1",
-    workspaceId: "ws-1",
-    createdAt: new Date(),
-    resolvedAt: null,
-    ...over,
-  }) as IComment;
-
-// Pull the inline Undo button's onClick out of the success toast's message tree.
-function undoOnClickFromToast(): () => void {
-  const call = vi
-    .mocked(notifications.show)
-    .mock.calls.map((c) => c[0])
-    .find((arg: any) => arg?.autoClose === RESOLVE_UNDO_AUTOCLOSE_MS);
-  expect(call).toBeTruthy();
-  const message: any = (call as any).message;
-  // message = Group( Text, Button ); grab the Button element's onClick.
-  const children = message.props.children as any[];
-  const button = children[1];
-  return button.props.onClick;
-}
-
-describe("useResolveCommentMutation — Undo toast (#542)", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    editorMock.current = {
-      isDestroyed: false,
-      commands: { unsetComment: vi.fn(), setCommentResolved: vi.fn() },
-    };
-  });
-
-  it("resolve shows an Undo toast with autoClose=10000ms; reopen shows NO Undo", async () => {
-    vi.mocked(resolveComment).mockImplementation(async (data) =>
-      comment({
-        resolvedAt: data.resolved ? (new Date() as any) : null,
-      }),
-    );
-    const { wrapper } = seededClient(comment());
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current.mutateAsync({
-      commentId: "c-1",
-      pageId: PAGE_ID,
-      resolved: true,
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const resolveToast = vi
-      .mocked(notifications.show)
-      .mock.calls.map((c) => c[0])
-      .find((a: any) => a?.autoClose === RESOLVE_UNDO_AUTOCLOSE_MS);
-    expect(resolveToast).toBeTruthy();
-    expect((resolveToast as any).id).toBe("resolve-undo-c-1");
-    expect((resolveToast as any).autoClose).toBe(10000);
-
-    // Now a reopen → plain toast, no autoClose/Undo, no id.
-    vi.clearAllMocks();
-    await result.current.mutateAsync({
-      commentId: "c-1",
-      pageId: PAGE_ID,
-      resolved: false,
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-    const calls = vi.mocked(notifications.show).mock.calls.map((c) => c[0]);
-    expect(
-      calls.some((a: any) => a?.autoClose === RESOLVE_UNDO_AUTOCLOSE_MS),
-    ).toBe(false);
-    expect(calls).toContainEqual({ message: "Comment re-opened successfully" });
-  });
-
-  it("double/fast Undo click fires reopen EXACTLY once (guard)", async () => {
-    vi.mocked(resolveComment).mockImplementation(async (data) =>
-      comment({ resolvedAt: data.resolved ? (new Date() as any) : null }),
-    );
-    const { wrapper } = seededClient(comment());
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current.mutateAsync({
-      commentId: "c-1",
-      pageId: PAGE_ID,
-      resolved: true,
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    const onClick = undoOnClickFromToast();
-    // Fire twice synchronously (notifications.hide is not synchronous).
-    onClick();
-    onClick();
-
-    await waitFor(() => {
-      const reopenCalls = vi
-        .mocked(resolveComment)
-        .mock.calls.filter(([d]) => d.resolved === false);
-      expect(reopenCalls).toHaveLength(1);
-    });
-    // The mark was cleared once via setCommentResolved(id, false).
-    expect(editorMock.current!.commands.setCommentResolved).toHaveBeenCalledWith(
-      "c-1",
-      false,
-    );
-    // The toast was hidden.
-    expect(notifications.hide).toHaveBeenCalledWith("resolve-undo-c-1");
-  });
-
-  it("404 → drops the comment from cache, clears the inline mark, no rollback, no Undo", async () => {
-    vi.mocked(resolveComment).mockRejectedValue({ response: { status: 404 } });
-    const { queryClient, wrapper } = seededClient(comment());
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current
-      .mutateAsync({ commentId: "c-1", pageId: PAGE_ID, resolved: true })
-      .catch(() => undefined);
-    await waitFor(() => expect(result.current.isError).toBe(true));
-
-    // Removed from cache (NOT rolled back to a phantom).
-    expect(items(queryClient)).toHaveLength(0);
-    // Inline mark cleared via unsetComment (mandatory — no panel row left to do it).
-    expect(editorMock.current!.commands.unsetComment).toHaveBeenCalledWith(
-      "c-1",
-    );
-    // Neutral message, red, and crucially NOT the success copy and NO Undo toast.
-    expect(notifications.show).toHaveBeenCalledWith({
-      message: "Comment no longer exists",
-      color: "red",
-    });
-    const calls = vi.mocked(notifications.show).mock.calls.map((c) => c[0]);
-    expect(
-      calls.some((a: any) => a?.autoClose === RESOLVE_UNDO_AUTOCLOSE_MS),
-    ).toBe(false);
-  });
-
-  it("404 does not crash when the editor is gone (read-only / panel closed)", async () => {
-    editorMock.current = null;
-    vi.mocked(resolveComment).mockRejectedValue({ response: { status: 404 } });
-    const { queryClient, wrapper } = seededClient(comment());
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current
-      .mutateAsync({ commentId: "c-1", pageId: PAGE_ID, resolved: true })
-      .catch(() => undefined);
-    await waitFor(() => expect(result.current.isError).toBe(true));
-    expect(items(queryClient)).toHaveLength(0);
-    expect(notifications.show).toHaveBeenCalledWith({
-      message: "Comment no longer exists",
-      color: "red",
-    });
-  });
-
-  it("non-404 error on REOPEN shows 'Failed to re-open comment' and rolls back", async () => {
-    vi.mocked(resolveComment).mockRejectedValue({ response: { status: 500 } });
-    // Seed a RESOLVED comment (the reopen target).
-    const resolved = comment({ resolvedAt: new Date() as any });
-    const { queryClient, wrapper } = seededClient(resolved);
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current
-      .mutateAsync({ commentId: "c-1", pageId: PAGE_ID, resolved: false })
-      .catch(() => undefined);
-    await waitFor(() => expect(result.current.isError).toBe(true));
-
-    expect(notifications.show).toHaveBeenCalledWith({
-      message: "Failed to re-open comment",
-      color: "red",
-    });
-    expect(notifications.show).not.toHaveBeenCalledWith(
-      expect.objectContaining({ message: "Failed to resolve comment" }),
-    );
-    // Rolled back: the comment is still present and still resolved.
-    expect(items(queryClient)).toHaveLength(1);
-    expect(items(queryClient)[0].resolvedAt).toBeTruthy();
-  });
-
-  it("reopen via Undo FAILS (non-404) → inline mark is NOT left cleared (doc↔panel stay consistent)", async () => {
-    // First resolve succeeds → produces the Undo toast (no mark change on resolve).
-    vi.mocked(resolveComment).mockResolvedValueOnce(
-      comment({ resolvedAt: new Date() as any }),
-    );
-    const { queryClient, wrapper } = seededClient(comment());
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current.mutateAsync({
-      commentId: "c-1",
-      pageId: PAGE_ID,
-      resolved: true,
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    // Now the reopen fired by Undo fails with a 500.
-    vi.mocked(resolveComment).mockRejectedValue({ response: { status: 500 } });
-    const onClick = undoOnClickFromToast();
-    onClick();
-
-    await waitFor(() => expect(result.current.isError).toBe(true));
-
-    // Core F1 guarantee: the mark-clear now lives in the reopen onSuccess, so a
-    // FAILED reopen must never flip the inline mark to unresolved — otherwise the
-    // doc would show an active highlight the panel still treats as resolved and
-    // the collab mark would diverge with nothing committed on the server.
-    expect(
-      editorMock.current!.commands.setCommentResolved,
-    ).not.toHaveBeenCalledWith("c-1", false);
-    // Cache rolled back: the comment stays resolved and present.
-    expect(items(queryClient)).toHaveLength(1);
-    expect(items(queryClient)[0].resolvedAt).toBeTruthy();
-  });
-
-  it("reopen success with a null editorRef degrades gracefully (no throw, no-op)", async () => {
-    // Read-only view / panel closed: pageEditorAtom is null on the success path.
-    editorMock.current = null;
-    vi.mocked(resolveComment).mockResolvedValue(comment({ resolvedAt: null }));
-    const resolved = comment({ resolvedAt: new Date() as any });
-    const { queryClient, wrapper } = seededClient(resolved);
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current.mutateAsync({
-      commentId: "c-1",
-      pageId: PAGE_ID,
-      resolved: false,
-    });
-    await waitFor(() => expect(result.current.isSuccess).toBe(true));
-
-    // No crash from the reopen mark-clear; the plain reopen toast is still shown.
-    expect(notifications.show).toHaveBeenCalledWith({
-      message: "Comment re-opened successfully",
-    });
-    // Cache updated to reopened (resolvedAt cleared by the server payload).
-    expect(items(queryClient)).toHaveLength(1);
-    expect(items(queryClient)[0].resolvedAt).toBeFalsy();
-  });
-
-  it("non-404 error on RESOLVE shows 'Failed to resolve comment' and rolls back", async () => {
-    vi.mocked(resolveComment).mockRejectedValue({ response: { status: 500 } });
-    const { queryClient, wrapper } = seededClient(comment());
-    const { result } = renderHook(() => useResolveCommentMutation(), {
-      wrapper,
-    });
-
-    await result.current
-      .mutateAsync({ commentId: "c-1", pageId: PAGE_ID, resolved: true })
-      .catch(() => undefined);
-    await waitFor(() => expect(result.current.isError).toBe(true));
-
-    expect(notifications.show).toHaveBeenCalledWith({
-      message: "Failed to resolve comment",
-      color: "red",
-    });
-    // Rolled back to open (previousCache), still present.
-    expect(items(queryClient)).toHaveLength(1);
-    expect(items(queryClient)[0].resolvedAt).toBeFalsy();
-  });
-});
@@ -20,19 +20,12 @@ import {
  ISuggestionOutcome,
 } from "@/features/comment/types/comment.types";
 import { notifications } from "@mantine/notifications";
-import { Button, Group, Text } from "@mantine/core";
 import { IPagination } from "@/lib/types.ts";
 import { useTranslation } from "react-i18next";
-import React, { useEffect, useMemo, useRef } from "react";
-import { useAtomValue } from "jotai";
-import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms";
+import { useEffect, useMemo } from "react";

 export const RQ_KEY = (pageId: string) => ["comments", pageId];

-// How long the resolve success toast (with its inline Undo) stays up before it
-// auto-closes. Policy constant — no env override.
-export const RESOLVE_UNDO_AUTOCLOSE_MS = 10000;
-
 export function useCommentsQuery(params: ICommentParams) {
  const query = useInfiniteQuery({
    queryKey: RQ_KEY(params.pageId),
@@ -383,25 +376,7 @@ export function useResolveCommentMutation() {
  const queryClient = useQueryClient();
  const { t } = useTranslation();

-  // Keep the live editor in a ref: the toast's Undo (and the 404 branch) must
-  // clear the inline comment mark AFTER the originating CommentListItem has
-  // unmounted (resolving pulls the comment out of the Open list, so its item is
-  // already gone by the time the 10s toast is clicked). In read-only view
-  // pageEditorAtom is null and the mark converges via the server's
-  // COMMENT_MARK_UPDATE job instead.
-  const editor = useAtomValue(pageEditorAtom);
-  const editorRef = useRef(editor);
-  editorRef.current = editor;
-
-  // Self-reference the mutation so the toast's Undo can re-invoke it (reopen)
-  // long after the triggering component unmounted. Declared BEFORE useMutation
-  // and assigned AFTER; the onClick reads mutationRef.current at CALL time, not
-  // definition time, so there is no initialization cycle.
-  const mutationRef = useRef<{
-    mutate: (vars: IResolveComment) => void;
-  } | null>(null);
-
-  const mutation = useMutation({
+  return useMutation({
    mutationFn: (data: IResolveComment) => resolveComment(data),
    onMutate: async (variables) => {
      await queryClient.cancelQueries({ queryKey: RQ_KEY(variables.pageId) });
@@ -426,39 +401,7 @@ export function useResolveCommentMutation() {

      return { previousCache };
    },
-    onError: (err: any, variables, context) => {
-      // Terminal 404: the comment was really deleted (missing comment or deleted
-      // page — access denial is 403, resolve is idempotent so no 400). Do NOT
-      // roll back (that would resurrect a phantom row in Resolved); instead drop
-      // it from the cache and clear its now-orphaned inline mark. Mirrors
-      // handleDeleteComment and the dismiss-mutation 404 branch.
-      if (err?.response?.status === 404) {
-        const cache = queryClient.getQueryData(RQ_KEY(variables.pageId)) as
-          | InfiniteData<IPagination<IComment>>
-          | undefined;
-        if (cache) {
-          queryClient.setQueryData(
-            RQ_KEY(variables.pageId),
-            removeCommentFromCache(cache, variables.commentId),
-          );
-        }
-        const ed = editorRef.current;
-        if (ed && !ed.isDestroyed) {
-          try {
-            ed.commands.unsetComment(variables.commentId);
-          } catch {
-            /* editor gone / mark already removed */
-          }
-        }
-        notifications.show({
-          message: t("Comment no longer exists"),
-          color: "red",
-        });
-        return;
-      }
-
-      // Generic failure: roll back the optimistic update and show a DIRECTIONAL
-      // error (resolve vs. reopen), not always "resolve".
+    onError: (_err, variables, context) => {
      if (context?.previousCache) {
        queryClient.setQueryData(
          RQ_KEY(variables.pageId),
@@ -466,9 +409,7 @@ export function useResolveCommentMutation() {
        );
      }
      notifications.show({
-        message: variables.resolved
-          ? t("Failed to resolve comment")
-          : t("Failed to re-open comment"),
+        message: t("Failed to resolve comment"),
        color: "red",
      });
    },
@@ -489,72 +430,11 @@ export function useResolveCommentMutation() {
        );
      }

-      // Reopen keeps the plain toast without an Undo.
-      if (!variables.resolved) {
-        // Clear the inline mark ONLY after the server confirms the reopen, so a
-        // failed reopen never leaves an active highlight the panel still treats
-        // as resolved. Mirrors the 404 branch's editor-liveness guard/try-catch.
-        // The button-triggered reopen already set the mark, so this is an
-        // idempotent no-op there.
-        const ed = editorRef.current;
-        if (ed && !ed.isDestroyed) {
-          try {
-            ed.commands.setCommentResolved(variables.commentId, false);
-          } catch {
-            /* editor gone — server COMMENT_MARK_UPDATE converges it */
-          }
-        }
-        notifications.show({ message: t("Comment re-opened successfully") });
-        return;
-      }
-
-      // Resolve: attach an inline Undo (reopen) to the success toast. Built with
-      // React.createElement because this is a .ts module (no JSX).
-      const { commentId, pageId } = variables;
-      const notificationId = `resolve-undo-${commentId}`;
-      // Double-click guard: notifications.hide is NOT synchronous, so the button
-      // stays clickable for a frame or two — without this a fast double-click
-      // would fire reopen twice.
-      let done = false;
      notifications.show({
-        id: notificationId,
-        autoClose: RESOLVE_UNDO_AUTOCLOSE_MS,
-        message: React.createElement(
-          Group,
-          { justify: "space-between", wrap: "nowrap", gap: "md" },
-          React.createElement(
-            Text,
-            { size: "sm" },
-            t("Comment resolved successfully"),
-          ),
-          React.createElement(
-            Button,
-            {
-              variant: "subtle",
-              size: "compact-sm",
-              onClick: () => {
-                if (done) return;
-                done = true;
-                // Reopen via the SAME mutation (read at click time — the
-                // originating item is already unmounted).
-                mutationRef.current?.mutate({
-                  commentId,
-                  pageId,
-                  resolved: false,
-                });
-                // The inline mark is cleared in the reopen mutation's onSuccess
-                // (bound to server confirmation), NOT here — clearing it eagerly
-                // would desync the doc from the panel if reopen then fails.
-                notifications.hide(notificationId);
-              },
-            },
-            t("Undo"),
-          ),
-        ),
+        message: variables.resolved
+          ? t("Comment resolved successfully")
+          : t("Comment re-opened successfully"),
      });
    },
  });
-
-  mutationRef.current = mutation;
-  return mutation;
 }
@@ -1,95 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { groupAgentRuns, runKey, GROUP_MIN } from "./group-agent-runs";
-import { IComment } from "@/features/comment/types/comment.types";
-
-const editComment = (id: string, over?: Partial<IComment>): IComment =>
-  ({
-    id,
-    createdSource: "agent",
-    aiChatId: "chat-1",
-    agent: { name: "Corrector" },
-    suggestedText: "new text",
-    parentCommentId: null,
-    ...over,
-  }) as unknown as IComment;
-
-const human = (id: string): IComment =>
-  ({ id, createdSource: "user", parentCommentId: null }) as unknown as IComment;
-
-describe("runKey", () => {
-  it("keys a groupable agent edit on aiChatId + agent.name", () => {
-    expect(runKey(editComment("a"))).toBe("chat-1:Corrector");
-  });
-
-  it("is null for an external MCP agent (aiChatId null)", () => {
-    expect(runKey(editComment("a", { aiChatId: null }))).toBeNull();
-  });
-
-  it("is null for a non-edit agent comment (no suggestedText)", () => {
-    expect(runKey(editComment("a", { suggestedText: null }))).toBeNull();
-  });
-
-  it("is null for a reply (has parentCommentId)", () => {
-    expect(runKey(editComment("a", { parentCommentId: "p" }))).toBeNull();
-  });
-
-  it("is null for a human comment", () => {
-    expect(runKey(human("a"))).toBeNull();
-  });
-});
-
-describe("groupAgentRuns", () => {
-  it("collapses >= GROUP_MIN same chat+role edits into one run at the first position", () => {
-    const units = groupAgentRuns([
-      editComment("e1"),
-      editComment("e2"),
-      editComment("e3"),
-    ]);
-    expect(units).toHaveLength(1);
-    expect(units[0].kind).toBe("run");
-    if (units[0].kind === "run") {
-      expect(units[0].key).toBe("chat-1:Corrector");
-      expect(units[0].comments.map((c) => c.id)).toEqual(["e1", "e2", "e3"]);
-    }
-    expect(GROUP_MIN).toBe(2);
-  });
-
-  it("renders a lone edit as a single (below the threshold)", () => {
-    const units = groupAgentRuns([editComment("e1")]);
-    expect(units).toHaveLength(1);
-    expect(units[0].kind).toBe("single");
-  });
-
-  it("never groups external MCP edits (aiChatId null) — each is a single", () => {
-    const units = groupAgentRuns([
-      editComment("m1", { aiChatId: null }),
-      editComment("m2", { aiChatId: null }),
-    ]);
-    expect(units).toHaveLength(2);
-    expect(units.every((u) => u.kind === "single")).toBe(true);
-  });
-
-  it("does not collapse two different roles sharing one chat", () => {
-    const units = groupAgentRuns([
-      editComment("a", { agent: { name: "Corrector" } as any }),
-      editComment("b", { agent: { name: "FactChecker" } as any }),
-    ]);
-    // Each key has count 1 -> both remain singles.
-    expect(units).toHaveLength(2);
-    expect(units.every((u) => u.kind === "single")).toBe(true);
-  });
-
-  it("preserves order and keeps human threads as singles interleaved with a run", () => {
-    const units = groupAgentRuns([
-      human("h1"),
-      editComment("e1"),
-      editComment("e2"),
-      human("h2"),
-    ]);
-    // h1 single, then the run (emitted at e1's position, e2 absorbed), then h2.
-    expect(units.map((u) => u.kind)).toEqual(["single", "run", "single"]);
-    if (units[1].kind === "run") {
-      expect(units[1].comments.map((c) => c.id)).toEqual(["e1", "e2"]);
-    }
-  });
-});
@@ -1,76 +0,0 @@
-import { IComment } from "@/features/comment/types/comment.types";
-
-// A visual-only series threshold: this many agent suggested-edits sharing one
-// run key collapse under a single RunHeader. A group of one renders as a plain
-// standalone card (no header). Policy constant — no env override.
-export const GROUP_MIN = 2;
-
-// One rendered unit of the top-level comment list: either a collapsed agent-run
-// group (>= GROUP_MIN suggested-edits from the same chat+role) or a single
-// comment (a human thread, an agent thread without an edit, or a lone edit).
-export interface AgentRunGroup {
-  kind: "run";
-  key: string;
-  comments: IComment[];
-}
-export interface SingleUnit {
-  kind: "single";
-  comment: IComment;
-}
-export type CommentRenderUnit = AgentRunGroup | SingleUnit;
-
-// The grouping key of a top-level agent suggested-edit, or null when the comment
-// is not a groupable edit. The key pins BOTH the AI chat and the acting role
-// (`aiChatId + ":" + agent.name`) so two roles running in the same chat do not
-// collapse under one header. A comment with `aiChatId == null` (an external MCP
-// agent) has no chat to group by — it is deliberately never groupable and always
-// renders as a single card (a time-bucketed synthetic run would split/merge runs
-// arbitrarily and choke on ISO `createdAt`). PURE.
-export function runKey(c: IComment): string | null {
-  if (
-    c.createdSource === "agent" &&
-    c.suggestedText != null &&
-    !c.parentCommentId &&
-    c.aiChatId != null &&
-    c.agent?.name
-  ) {
-    return `${c.aiChatId}:${c.agent.name}`;
-  }
-  return null;
-}
-
-// Collapse an ORDERED list of top-level comments into render units, preserving
-// list order: a run is emitted in place of its FIRST member (later members are
-// absorbed), everything else stays a single unit. Grouping is computed over the
-// snapshot handed in; a streamed page / WS update may later promote a single
-// edit into a run as more members arrive — that is acceptable (purely visual).
-// PURE — no React/DOM, no mutation of the input.
-export function groupAgentRuns(comments: IComment[]): CommentRenderUnit[] {
-  // First pass: tally groupable edits per key so we know which keys clear
-  // GROUP_MIN before we start emitting.
-  const counts = new Map<string, number>();
-  for (const c of comments) {
-    const key = runKey(c);
-    if (key) counts.set(key, (counts.get(key) ?? 0) + 1);
-  }
-
-  const emitted = new Set<string>();
-  const units: CommentRenderUnit[] = [];
-  for (const c of comments) {
-    const key = runKey(c);
-    if (key && (counts.get(key) ?? 0) >= GROUP_MIN) {
-      // Emit the whole run once, at the position of its first member; skip the
-      // absorbed later members.
-      if (emitted.has(key)) continue;
-      emitted.add(key);
-      units.push({
-        kind: "run",
-        key,
-        comments: comments.filter((x) => runKey(x) === key),
-      });
-    } else {
-      units.push({ kind: "single", comment: c });
-    }
-  }
-  return units;
-}
@@ -1,47 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { parseSeverity, isSignificant } from "./severity";
-
-describe("parseSeverity — exact importance dictionary", () => {
-  it("maps the Russian importance tags", () => {
-    expect(parseSeverity("[Критично] fix now")).toBe("critical");
-    expect(parseSeverity("[Существенно] tighten")).toBe("major");
-    expect(parseSeverity("[Незначительно] nit")).toBe("minor");
-  });
-
-  it("maps the English equivalents and is case-insensitive", () => {
-    expect(parseSeverity("[Critical] x")).toBe("critical");
-    expect(parseSeverity("[MAJOR] x")).toBe("major");
-    expect(parseSeverity("[minor] x")).toBe("minor");
-    expect(parseSeverity("[критично] x")).toBe("critical");
-  });
-
-  it("treats fact-checker verdicts as unknown, NOT a severity", () => {
-    expect(parseSeverity("[Неверно] this is wrong")).toBe("unknown");
-    expect(parseSeverity("[Не проверено] can't verify")).toBe("unknown");
-    expect(parseSeverity("[Непроверяемо] x")).toBe("unknown");
-    expect(parseSeverity("[Это мнение] x")).toBe("unknown");
-  });
-
-  it("treats a typo'd / unrecognised tag as unknown (never falls back to minor)", () => {
-    expect(parseSeverity("[Существенное] typo ending")).toBe("unknown");
-    expect(parseSeverity("[whatever] x")).toBe("unknown");
-  });
-
-  it("returns unknown for no tag or empty input", () => {
-    expect(parseSeverity("plain body, no tag")).toBe("unknown");
-    expect(parseSeverity("")).toBe("unknown");
-  });
-
-  it("finds the recognised importance tag even after a leading verdict tag", () => {
-    expect(parseSeverity("[Неверно] [Существенно] body")).toBe("major");
-  });
-});
-
-describe("isSignificant", () => {
-  it("counts only major and critical", () => {
-    expect(isSignificant("critical")).toBe(true);
-    expect(isSignificant("major")).toBe(true);
-    expect(isSignificant("minor")).toBe(false);
-    expect(isSignificant("unknown")).toBe(false);
-  });
-});
@@ -1,44 +0,0 @@
-// Severity of an agent suggested-edit, parsed CLIENT-SIDE from the importance
-// tag the editorial role prompts emit at the head of the comment body
-// (`[Критично]` / `[Существенно]` / `[Незначительно]`, or their English
-// equivalents). It is a DISPLAY-ONLY signal: it drives the coloured dot on the
-// edit card and the "M major" counter in a run header. It never gates an action.
-//
-// `unknown` is a first-class value, NOT a synonym for `minor`: any bracketed
-// text that is not in the exact dictionary — a Fact-checker verdict
-// (`[Неверно]`, `[Не проверено]`, `[Непроверяемо]`, `[Это мнение]`), a typo
-// (`[Существенное]`), or the absence of a tag — resolves to `unknown` and draws
-// a neutral dot. Passing an unrecognised tag off as `minor` would mis-label it.
-export type Severity = "critical" | "major" | "minor" | "unknown";
-
-// EXACT (case-insensitive) dictionary. Only these tokens map to a real severity;
-// everything else falls through to `unknown` on purpose.
-const SEVERITY_TAGS: Record<string, Severity> = {
-  критично: "critical",
-  существенно: "major",
-  незначительно: "minor",
-  critical: "critical",
-  major: "major",
-  minor: "minor",
-};
-
-// Parse the first RECOGNISED importance tag out of the flattened comment text
-// (use `commentContentToText` to obtain it). Scans every `[...]` token so a tag
-// that trails a verdict still counts; the first exact-dictionary hit wins. When
-// no token matches the dictionary the result is `unknown`. PURE — no React/DOM.
-export function parseSeverity(text: string): Severity {
-  if (!text) return "unknown";
-  const matches = text.matchAll(/\[([^\]]+)\]/g);
-  for (const m of matches) {
-    const tag = m[1].trim().toLowerCase();
-    const sev = SEVERITY_TAGS[tag];
-    if (sev) return sev;
-  }
-  return "unknown";
-}
-
-// Whether a severity counts toward the "M major" tally in a run header: only the
-// genuinely significant ones (major + critical). `minor` and `unknown` do not.
-export function isSignificant(severity: Severity): boolean {
-  return severity === "major" || severity === "critical";
-}
@@ -3,20 +3,11 @@ import { atom } from "jotai";
 // import would drag the whole @tiptap/core engine into the eager graph of every
 // shell component that reads one of these atoms.
 import type { Editor } from "@tiptap/core";
-import type { HocuspocusProvider } from "@hocuspocus/provider";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
 import type { DictationUnavailableReason } from "@/features/dictation/dictation-status";

 export const pageEditorAtom = atom<Editor | null>(null);

-// #370 — the active page's collab provider, published by the page editor so the
-// header menu can emit the "save-version" stateless signal (Cmd+S / button).
-// Null when the page is read-only / collab isn't connected. A typed initial
-// value (rather than an explicit generic) keeps jotai's overload resolution on
-// the writable PrimitiveAtom branch.
-const initialCollabProvider: HocuspocusProvider | null = null;
-export const collabProviderAtom = atom(initialCollabProvider);
-
 export const titleEditorAtom = atom<Editor | null>(null);

 export const readOnlyEditorAtom = atom<Editor | null>(null);
@@ -92,23 +92,13 @@
   wrapper, never in the document model) and is rendered inline at the start of
   the first content line via ::before. This keeps text and wrapped lines flush
   to the left margin — no hanging indent — while the editable contentDOM stays
-   the FIRST DOM child (#146).
-
-   The rules below target `p:first-child`, NOT `> :first-child`: tiptap-react
-   wraps the NodeViewContent children in an extra block-level div
-   (`[data-node-view-content-react]`, style="white-space: inherit"), so
-   `.definitionContent`'s first child is that wrapper, not the paragraph. An
-   inline ::before on the block wrapper (whose child is a block <p>) drops onto
-   its own line above the text — the "+1 line" regression. `p:first-child`
-   reaches the real first paragraph so the number stays inline, and it works
-   whether or not the wrapper is present (definition content is `paragraph+`,
-   so there are no nested paragraphs to mis-match). */
+   the FIRST DOM child (#146). */
 .definitionContent {
  flex: 1 1 auto;
  min-width: 0;
 }

-.definitionContent p:first-child::before {
+.definitionContent > :first-child::before {
  content: var(--footnote-number, "?") ". ";
  color: var(--mantine-color-dimmed);
  font-variant-numeric: tabular-nums;
@@ -118,13 +108,12 @@
 /* The inner editable paragraph inherits `.ProseMirror p { margin: 0.5em 0 }`.
   Drop the outer margins so the definition sits tight to the heading above and
   the ::before number aligns with the top of the row — same approach used for
-   callouts in core.css. Target the paragraphs directly (through the
-   tiptap-react content wrapper), same reasoning as the ::before rule above. */
-.definitionContent p:first-child {
+   callouts in core.css. */
+.definitionContent > :first-child {
  margin-top: 0;
 }

-.definitionContent p:last-child {
+.definitionContent > :last-child {
  margin-bottom: 0;
 }

@@ -31,18 +31,11 @@ import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import useCollaborationUrl from "@/features/editor/hooks/use-collaboration-url";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
-  collabProviderAtom,
  currentPageEditModeAtom,
  dictationAvailabilityAtom,
  pageEditorAtom,
  yjsConnectionStatusAtom,
 } from "@/features/editor/atoms/editor-atoms";
-import { notifications } from "@mantine/notifications";
-import {
-  VERSION_SAVED_MESSAGE_TYPE,
-  type VersionSavedMessage,
-  saveVersionPending,
-} from "@/features/page-history/version-messages";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom";
 import {
  activeCommentIdAtom,
@@ -131,7 +124,6 @@ export default function PageEditor({

  const [currentUser] = useAtom(currentUserAtom);
  const [, setEditor] = useAtom(pageEditorAtom);
-  const setCollabProvider = useSetAtom(collabProviderAtom);
  const [, setAsideState] = useAtom(asideStateAtom);
  const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
  const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
@@ -189,24 +181,6 @@ export default function PageEditor({
      const onStatelessHandler = ({ payload }: onStatelessParameters) => {
        try {
          const message = JSON.parse(payload);
-          // #370 — a version was saved somewhere; live-refresh the history panel
-          // on every client. Only the client that pressed Save (tracked by the
-          // module-level flag) shows the confirmation toast.
-          if (message?.type === VERSION_SAVED_MESSAGE_TYPE) {
-            const versionMsg = message as VersionSavedMessage;
-            queryClient.invalidateQueries({
-              queryKey: ["page-history-list"],
-            });
-            if (saveVersionPending.current) {
-              saveVersionPending.current = false;
-              notifications.show({
-                message: versionMsg.alreadySaved
-                  ? t("Already saved as the latest version")
-                  : t("Version saved"),
-              });
-            }
-            return;
-          }
          if (message?.type !== "page.updated" || !message.updatedAt) return;
          const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
          if (pageData) {
@@ -264,16 +238,12 @@ export default function PageEditor({

      local.on("synced", onLocalSyncedHandler);
      providersRef.current = { socket, local, remote };
-      // #370 — publish the provider so the header menu can emit save-version.
-      setCollabProvider(remote);
      setProvidersReady(true);
    } else {
-      setCollabProvider(providersRef.current.remote);
      setProvidersReady(true);
    }
    // Only destroy on final unmount
    return () => {
-      setCollabProvider(null);
      providersRef.current?.socket.destroy();
      providersRef.current?.remote.destroy();
      providersRef.current?.local.destroy();
@@ -1,11 +1,4 @@
-import {
-  Text,
-  Group,
-  UnstyledButton,
-  Avatar,
-  Tooltip,
-  Badge,
-} from "@mantine/core";
+import { Text, Group, UnstyledButton, Avatar, Tooltip } from "@mantine/core";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { AgentAvatarStack } from "@/components/ui/agent-avatar-stack.tsx";
 import { formattedDate } from "@/lib/time";
@@ -14,59 +7,36 @@ import clsx from "clsx";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { memo, useCallback } from "react";
 import { useSetAtom } from "jotai";
-import { useTranslation } from "react-i18next";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";

 const MAX_VISIBLE_AVATARS = 5;

-/**
- * #370 — map a snapshot's intentionality tier to its badge. `version: true`
- * marks the intentional points (manual / agent); autosaves (boundary / idle /
- * legacy null) are non-versions and get dimmed in the list.
- */
-type HistoryKindMeta = { labelKey: string; color: string; version: boolean };
-export function historyKindMeta(kind?: string | null): HistoryKindMeta {
-  switch (kind) {
-    case "manual":
-      return { labelKey: "Saved", color: "blue", version: true };
-    case "agent":
-      return { labelKey: "Agent version", color: "violet", version: true };
-    case "boundary":
-      return { labelKey: "Boundary", color: "gray", version: false };
-    default: // "idle" | null | undefined (legacy autosave)
-      return { labelKey: "Autosave", color: "gray", version: false };
-  }
-}
-
 interface HistoryItemProps {
  historyItem: IPageHistory;
-  // The previous snapshot for diff/restore is resolved by id from the FULL list
-  // in the parent (resolvePrevSnapshotId), so the item only needs to report its
-  // own id — never a list index (which would be the filtered-view index).
-  onSelect: (id: string) => void;
-  onHover?: (id: string) => void;
+  index: number;
+  onSelect: (id: string, index: number) => void;
+  onHover?: (id: string, index: number) => void;
  onHoverEnd?: () => void;
  isActive: boolean;
 }

 const HistoryItem = memo(function HistoryItem({
  historyItem,
+  index,
  onSelect,
  onHover,
  onHoverEnd,
  isActive,
 }: HistoryItemProps) {
  const setHistoryModalOpen = useSetAtom(historyAtoms);
-  const { t } = useTranslation();
-  const kindMeta = historyKindMeta(historyItem.kind);

  const handleClick = useCallback(() => {
-    onSelect(historyItem.id);
-  }, [onSelect, historyItem.id]);
+    onSelect(historyItem.id, index);
+  }, [onSelect, historyItem.id, index]);

  const handleMouseEnter = useCallback(() => {
-    onHover?.(historyItem.id);
-  }, [onHover, historyItem.id]);
+    onHover?.(historyItem.id, index);
+  }, [onHover, historyItem.id, index]);

  const contributors = historyItem.contributors;
  const hasContributors = contributors && contributors.length > 0;
@@ -79,20 +49,8 @@ const HistoryItem = memo(function HistoryItem({
      onMouseEnter={handleMouseEnter}
      onMouseLeave={onHoverEnd}
      className={clsx(classes.history, { [classes.active]: isActive })}
-      // #370 — dim autosnapshots so intentional versions stand out.
-      style={{ opacity: kindMeta.version ? 1 : 0.55 }}
    >
-      <Group gap={6} wrap="nowrap" justify="space-between">
-        <Text size="sm">{formattedDate(new Date(historyItem.createdAt))}</Text>
-        <Badge
-          size="xs"
-          radius="sm"
-          variant={kindMeta.version ? "filled" : "light"}
-          color={kindMeta.color}
-        >
-          {t(kindMeta.labelKey)}
-        </Badge>
-      </Group>
+      <Text size="sm">{formattedDate(new Date(historyItem.createdAt))}</Text>

      <Group gap={6} wrap="nowrap" mt={4}>
        {hasContributors ? (
@@ -2,16 +2,14 @@ import {
  usePageHistoryListQuery,
  prefetchPageHistory,
 } from "@/features/page-history/queries/page-history-query";
-import HistoryItem, {
-  historyKindMeta,
-} from "@/features/page-history/components/history-item";
+import HistoryItem from "@/features/page-history/components/history-item";
 import {
  activeHistoryIdAtom,
  activeHistoryPrevIdAtom,
  historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
 import { useAtom, useSetAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
 import {
  Button,
  ScrollArea,
@@ -19,12 +17,9 @@ import {
  Divider,
  Loader,
  Center,
-  Switch,
-  Text,
 } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { useHistoryRestore } from "@/features/page-history/hooks";
-import { resolvePrevSnapshotId } from "@/features/page-history/utils/resolve-prev-snapshot";

 const PREFETCH_DELAY_MS = 150;

@@ -52,22 +47,6 @@ function HistoryList({ pageId }: Props) {
    [pageHistoryData],
  );

-  // #370 — "only versions" filter: hide autosnapshots (idle/boundary/legacy
-  // null), keep only intentional points (manual/agent). Filtering is over the
-  // already-loaded pages; the diff/restore still targets the true previous
-  // snapshot, so items carry their index within the FULL list.
-  const [onlyVersions, setOnlyVersions] = useState(false);
-  // Reuse historyKindMeta().version — the SAME predicate the badge (HistoryItem)
-  // uses to mark intentional points — so the "Only versions" filter and the badge
-  // can never drift apart when a future intentional kind is added.
-  const visibleItems = useMemo(
-    () =>
-      onlyVersions
-        ? historyItems.filter((item) => historyKindMeta(item.kind).version)
-        : historyItems,
-    [historyItems, onlyVersions],
-  );
-
  const loadMoreRef = useRef<HTMLDivElement>(null);
  const prefetchTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);

@@ -81,13 +60,11 @@ function HistoryList({ pageId }: Props) {
  }, []);

  const handleHover = useCallback(
-    (historyId: string) => {
+    (historyId: string, index: number) => {
      clearPrefetchTimeout();
      prefetchTimeoutRef.current = setTimeout(() => {
        prefetchPageHistory(historyId);
-        // The true previous snapshot in the FULL list (not the previous visible
-        // one under the "only versions" filter).
-        const prevId = resolvePrevSnapshotId(historyItems, historyId);
+        const prevId = historyItems[index + 1]?.id;
        if (prevId) {
          prefetchPageHistory(prevId);
        }
@@ -101,11 +78,9 @@ function HistoryList({ pageId }: Props) {
  }, [clearPrefetchTimeout]);

  const handleSelect = useCallback(
-    (id: string) => {
+    (id: string, index: number) => {
      setActiveHistoryId(id);
-      // Baseline = true previous snapshot in the FULL list, so the "only
-      // versions" filter never diffs/restores against the wrong item.
-      setActiveHistoryPrevId(resolvePrevSnapshotId(historyItems, id));
+      setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
    },
    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
  );
@@ -153,27 +128,12 @@ function HistoryList({ pageId }: Props) {

  return (
    <div>
-      <Group px="xs" py={6} justify="flex-end">
-        <Switch
-          size="xs"
-          checked={onlyVersions}
-          onChange={(e) => setOnlyVersions(e.currentTarget.checked)}
-          label={t("Only versions")}
-        />
-      </Group>
-
      <ScrollArea h={620} w="100%" type="scroll" scrollbarSize={5}>
-        {onlyVersions && visibleItems.length === 0 && (
-          <Center py="md">
-            <Text size="sm" c="dimmed">
-              {t("No saved versions yet.")}
-            </Text>
-          </Center>
-        )}
-        {visibleItems.map((historyItem) => (
+        {historyItems.map((historyItem, index) => (
          <HistoryItem
            key={historyItem.id}
            historyItem={historyItem}
+            index={index}
            onSelect={handleSelect}
            onHover={handleHover}
            onHoverEnd={clearPrefetchTimeout}
@@ -24,10 +24,6 @@ export interface IPageHistory {
  updatedAt: string;
  lastUpdatedBy: IPageHistoryUser;
  contributors?: IPageHistoryUser[];
-  // #370 — intentionality tier: 'manual'/'agent' are versions (intentional
-  // points), 'idle'/'boundary' are autosnapshots; null/undefined = legacy
-  // autosave. Derived server-side, drives the history badge + "versions" filter.
-  kind?: "manual" | "agent" | "idle" | "boundary" | null;
  // Provenance markers copied off the page row when the snapshot was saved.
  // `'agent'` marks a version written by the AI agent; `lastUpdatedAiChatId`
  // (when present) deep-links to the chat that produced the edit.
@@ -1,42 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { resolvePrevSnapshotId } from "./resolve-prev-snapshot";
-
-// #370 F4 — the risky client path: with the "only versions" filter active, diff
-// and restore must still baseline against the TRUE previous snapshot in the FULL
-// list, never the previous VISIBLE version (which would skip the autosnapshots
-// between two versions). These pin that the resolution is by FULL-list order.
-describe("resolvePrevSnapshotId", () => {
-  // Newest-first, as the history list stores it: a version, then two autosaves,
-  // then an older version.
-  const full = [
-    { id: "v2", kind: "manual" },
-    { id: "a2", kind: "idle" },
-    { id: "a1", kind: "boundary" },
-    { id: "v1", kind: "manual" },
-    { id: "a0", kind: null },
-  ];
-
-  it("returns the immediate FULL-list successor, not the previous visible version", () => {
-    // Selecting v2 while filtered to versions-only must baseline against a2 (the
-    // real chronological predecessor), NOT v1 (the previous visible version).
-    expect(resolvePrevSnapshotId(full, "v2")).toBe("a2");
-  });
-
-  it("resolves an autosnapshot's predecessor by full-list order", () => {
-    expect(resolvePrevSnapshotId(full, "a1")).toBe("v1");
-  });
-
-  it("returns '' for the oldest item (no predecessor)", () => {
-    expect(resolvePrevSnapshotId(full, "a0")).toBe("");
-  });
-
-  it("returns '' for an id not in the list", () => {
-    expect(resolvePrevSnapshotId(full, "missing")).toBe("");
-  });
-
-  it("does not depend on a filtered subset — same result whatever is visible", () => {
-    // The helper only ever sees the full list; a filtered view cannot change the
-    // baseline it computes.
-    expect(resolvePrevSnapshotId(full, "v1")).toBe("a0");
-  });
-});
@@ -1,22 +0,0 @@
-/**
- * #370 — resolve the TRUE previous snapshot for a history item.
- *
- * The history panel can be filtered to "only versions" (manual/agent), but diff
- * and restore must always compare against the immediately-preceding snapshot in
- * the FULL, unfiltered list — NOT the previous VISIBLE item. Comparing against
- * the previous visible version would silently skip the autosnapshots between two
- * versions and diff/restore the wrong baseline.
- *
- * Given the full (newest-first) list and an item id, this returns the id of the
- * item right after it in the full list (its chronological predecessor), or "" if
- * it is the oldest / not found. Pure and list-order-preserving so it can be unit
- * tested without mounting the component.
- */
-export function resolvePrevSnapshotId(
-  fullItems: ReadonlyArray<{ id: string }>,
-  id: string,
-): string {
-  const index = fullItems.findIndex((item) => item.id === id);
-  if (index === -1) return "";
-  return fullItems[index + 1]?.id ?? "";
-}
@@ -1,28 +0,0 @@
-/**
- * #370 — page-version stateless wire formats. Kept in one place so the client
- * emitter (Save hotkey / button) and the client listener (page-editor) agree
- * with the server (PersistenceExtension) on the message shapes.
- */
-
-/** Client → server: "save a version now". The server derives the tier
- * (manual/agent) from the signed connection actor, never from this payload. */
-export const SAVE_VERSION_MESSAGE_TYPE = "save-version";
-
-/** Server → all clients: a version was saved (or promoted / already existed). */
-export const VERSION_SAVED_MESSAGE_TYPE = "version.saved";
-
-export interface VersionSavedMessage {
-  type: typeof VERSION_SAVED_MESSAGE_TYPE;
-  historyId: string;
-  kind: "manual" | "agent";
-  /** True when the latest snapshot was already a manual version (a no-op save). */
-  alreadySaved: boolean;
-}
-
-/**
- * Cross-component coordination flag so only the client that pressed Save shows
- * the confirmation toast, while every other client silently refreshes its
- * history panel on the broadcast. A module-level ref avoids stale-closure
- * pitfalls in the editor's long-lived stateless handler.
- */
-export const saveVersionPending = { current: false };
@@ -1,45 +0,0 @@
-import { describe, it, expect } from "vitest";
-import {
-  formatHeadline,
-  formatDayTotal,
-  formatGapMinutes,
-} from "./format-work-time";
-
-const MIN = 60 * 1000;
-// Fake translator: renders the key with {{tokens}} substituted, so the tests
-// assert the rounding + branch selection without depending on the i18n catalogue.
-const t = (key: string, opts?: Record<string, unknown>) =>
-  key.replace(/\{\{(\w+)\}\}/g, (_, k) => String(opts?.[k] ?? ""));
-
-describe("formatHeadline", () => {
-  it("prefixes ≈ and rounds to a 5-minute step", () => {
-    expect(formatHeadline(4 * 60 * MIN + 27 * MIN, t)).toBe("≈ 4h 25m");
-    expect(formatHeadline(90 * MIN, t)).toBe("≈ 1h 30m");
-  });
-
-  it("shows hours only / minutes only cleanly", () => {
-    expect(formatHeadline(120 * MIN, t)).toBe("≈ 2h");
-    expect(formatHeadline(35 * MIN, t)).toBe("≈ 35m");
-  });
-
-  it("floors a tiny non-zero estimate to 5m, never 0", () => {
-    expect(formatHeadline(2 * MIN, t)).toBe("≈ 5m");
-  });
-
-  it("empty string for zero (widget hidden)", () => {
-    expect(formatHeadline(0, t)).toBe("");
-  });
-});
-
-describe("formatDayTotal", () => {
-  it('renders "h m" and shows — for empty days', () => {
-    expect(formatDayTotal(3 * 60 * MIN + 17 * MIN, t)).toBe("3h 17m");
-    expect(formatDayTotal(0, t)).toBe("—");
-  });
-});
-
-describe("formatGapMinutes", () => {
-  it("converts the tGap ms threshold to whole minutes", () => {
-    expect(formatGapMinutes(15 * MIN)).toBe(15);
-  });
-});
@@ -1,45 +0,0 @@
-// #395 — display formatting for the work-time estimate. Pure functions that take
-// a translator so ru-RU / en-US wording lives in the i18n catalogue and the
-// rounding logic stays unit-testable.
-
-type Translate = (key: string, opts?: Record<string, unknown>) => string;
-
-const MIN = 60 * 1000;
-
-function hm(totalMinutes: number): { hours: number; minutes: number } {
-  return {
-    hours: Math.floor(totalMinutes / 60),
-    minutes: totalMinutes % 60,
-  };
-}
-
-/**
- * Headline number (§6.1): an ESTIMATE, so rounded to a coarse 5-minute step and
- * prefixed with "≈". A non-zero-but-tiny estimate floors to 5m rather than
- * rounding down to "0" (which would read as "no work"). Zero → empty string
- * (the caller hides the widget).
- */
-export function formatHeadline(workMs: number, t: Translate): string {
-  if (workMs <= 0) return "";
-  let minutes = Math.round(workMs / MIN / 5) * 5;
-  if (minutes === 0) minutes = 5;
-  const { hours, minutes: m } = hm(minutes);
-  if (hours > 0 && m > 0) return t("≈ {{hours}}h {{minutes}}m", { hours, minutes: m });
-  if (hours > 0) return t("≈ {{hours}}h", { hours });
-  return t("≈ {{minutes}}m", { minutes: m });
-}
-
-/** Per-day sum (§6.2), rounded to the minute. Zero → "—". */
-export function formatDayTotal(activeMs: number, t: Translate): string {
-  if (activeMs <= 0) return "—";
-  const minutes = Math.max(1, Math.round(activeMs / MIN));
-  const { hours, minutes: m } = hm(minutes);
-  if (hours > 0 && m > 0) return t("{{hours}}h {{minutes}}m", { hours, minutes: m });
-  if (hours > 0) return t("{{hours}}h", { hours });
-  return t("{{minutes}}m", { minutes: m });
-}
-
-/** The inactivity threshold, for the "estimate · gap = N min" caption. */
-export function formatGapMinutes(tGapMs: number): number {
-  return Math.round(tGapMs / MIN);
-}
@@ -1,25 +0,0 @@
-import { useQuery, UseQueryResult } from "@tanstack/react-query";
-import { IPageWorkTime } from "./work-time.types";
-import { getPageWorkTime, viewerTimezone } from "./work-time-service";
-
-const WORK_TIME_STALE_TIME = 5 * 60 * 1000;
-
-/**
- * #395 — the "time worked on this article" estimate + per-day punch-card
- * buckets. The buckets are computed server-side in the viewer's timezone (so a
- * midnight-crossing session lands on the right calendar day for the reader).
- * `enabled` is opt-in so the (cheap but non-trivial) projection query only fires
- * when the number is actually shown.
- */
-export function usePageWorkTime(
-  pageId: string,
-  enabled = true,
-): UseQueryResult<IPageWorkTime, Error> {
-  const tz = viewerTimezone();
-  return useQuery({
-    queryKey: ["page-work-time", pageId, tz],
-    queryFn: () => getPageWorkTime(pageId, tz),
-    enabled: enabled && !!pageId,
-    staleTime: WORK_TIME_STALE_TIME,
-  });
-}
@@ -1,168 +0,0 @@
-import { describe, it, expect } from "vitest";
-import {
-  buildRows,
-  formatBlockTooltip,
-  summaryLabels,
-  toBlocks,
-  toTimelineDay,
-  EMPTY_RUN_COLLAPSE,
-} from "./work-time-adapter";
-import { IPageWorkTime, IPerDay } from "./work-time.types";
-
-const MIN = 60 * 1000;
-const HOUR = 60 * MIN;
-const DAY_MS = 24 * HOUR;
-
-// Fake translator: renders the key with {{tokens}} substituted, so the tests
-// assert the mapping/branching without depending on the i18n catalogue.
-const t = (key: string, opts?: Record<string, unknown>) =>
-  key.replace(/\{\{(\w+)\}\}/g, (_, k) => String(opts?.[k] ?? ""));
-
-// A day midnight anchored at a fixed UTC instant (tz handled server-side; we
-// only lay out fractions of the day the server already bucketed).
-const DAY0 = Date.UTC(2026, 5, 29, 0, 0, 0); // Mon 29 Jun 2026 00:00 UTC
-
-function day(over: Partial<IPerDay> & { day: number }): IPerDay {
-  return {
-    dayISO: new Date(over.day).toISOString().slice(0, 10),
-    activeMs: 0,
-    agentMs: 0,
-    windows: [],
-    ...over,
-  };
-}
-
-const config: IPageWorkTime["config"] = {
-  tGap: 15 * MIN,
-  agentTGap: 15 * MIN,
-  pIn: 0,
-  pOut: 0,
-  pSingle: 30 * 1000,
-  excludeGit: false,
-  dedupRoundMs: 1000,
-};
-
-function payload(over: Partial<IPageWorkTime>): IPageWorkTime {
-  return {
-    workMs: 0,
-    agentOnlyMs: 0,
-    perDay: [],
-    config,
-    tz: "UTC",
-    ...over,
-  };
-}
-
-describe("toBlocks", () => {
-  it("maps work+agent windows to time-of-day segments (hour fractions)", () => {
-    const d = day({
-      day: DAY0,
-      activeMs: 90 * MIN,
-      windows: [
-        { start: DAY0 + 9 * HOUR, end: DAY0 + 10 * HOUR + 30 * MIN, class: "work" },
-        { start: DAY0 + 22 * HOUR, end: DAY0 + 23 * HOUR, class: "agent_only" },
-      ],
-    });
-    const blocks = toBlocks(d);
-    expect(blocks).toHaveLength(2);
-    expect(blocks[0]).toMatchObject({ start: 9, end: 10.5, kind: "work" });
-    expect(blocks[1]).toMatchObject({ start: 22, end: 23, kind: "agent" });
-    // real epoch preserved for the DST-safe tooltip
-    expect(blocks[0].startEpoch).toBe(DAY0 + 9 * HOUR);
-  });
-
-  it("clamps out-of-day fractions to [0,24]", () => {
-    const d = day({
-      day: DAY0,
-      windows: [{ start: DAY0 - HOUR, end: DAY0 + 25 * HOUR, class: "work" }],
-    });
-    const [b] = toBlocks(d);
-    expect(b.start).toBe(0);
-    expect(b.end).toBe(24);
-  });
-});
-
-describe("toTimelineDay", () => {
-  it("draws the now-line only on today's row", () => {
-    const today = day({ day: DAY0, activeMs: HOUR });
-    const noon = DAY0 + 12 * HOUR;
-    const asToday = toTimelineDay(today, t, noon);
-    expect(asToday.isToday).toBe(true);
-    expect(asToday.nowFraction).toBeCloseTo(0.5, 5);
-
-    const past = day({ day: DAY0 - DAY_MS, activeMs: HOUR });
-    const asPast = toTimelineDay(past, t, noon);
-    expect(asPast.isToday).toBe(false);
-    expect(asPast.nowFraction).toBeUndefined();
-  });
-
-  it("labels an empty day and totals it as —", () => {
-    const empty = day({ day: DAY0 });
-    const d = toTimelineDay(empty, t, DAY0 + 12 * HOUR);
-    expect(d.isEmpty).toBe(true);
-    expect(d.totalLabel).toBe("—");
-  });
-});
-
-describe("buildRows (empty-run collapsing)", () => {
-  it("collapses a run of >= EMPTY_RUN_COLLAPSE empty days in place", () => {
-    const perDay: IPerDay[] = [
-      day({ day: DAY0, activeMs: HOUR }),
-      ...Array.from({ length: EMPTY_RUN_COLLAPSE }, (_, i) =>
-        day({ day: DAY0 + (i + 1) * DAY_MS }),
-      ),
-      day({ day: DAY0 + (EMPTY_RUN_COLLAPSE + 1) * DAY_MS, activeMs: HOUR }),
-    ];
-    const rows = buildRows(perDay, t, 0);
-    expect(rows.map((r) => r.type)).toEqual(["day", "gap", "day"]);
-    const gap = rows[1];
-    expect(gap.type === "gap" && gap.count).toBe(EMPTY_RUN_COLLAPSE);
-  });
-
-  it("keeps a short empty run as individual dimmed day rows", () => {
-    const perDay: IPerDay[] = [
-      day({ day: DAY0, activeMs: HOUR }),
-      day({ day: DAY0 + DAY_MS }),
-      day({ day: DAY0 + 2 * DAY_MS, activeMs: HOUR }),
-    ];
-    const rows = buildRows(perDay, t, 0);
-    expect(rows.map((r) => r.type)).toEqual(["day", "day", "day"]);
-  });
-});
-
-describe("summaryLabels", () => {
-  it("derives totalLabel/agentLabel from ms via the shared formatter", () => {
-    const { total, agent } = summaryLabels(
-      payload({ workMs: 4 * HOUR + 27 * MIN, agentOnlyMs: 80 * MIN }),
-      t,
-    );
-    expect(total).toBe("≈ 4h 25m");
-    expect(agent).toBe("≈ 1h 20m");
-  });
-
-  it("agent-only page: agent estimate fills the main slot, no secondary line", () => {
-    const { total, agent } = summaryLabels(
-      payload({ workMs: 0, agentOnlyMs: 80 * MIN }),
-      t,
-    );
-    expect(total).toBe("agent: ≈ 1h 20m");
-    expect(agent).toBeUndefined();
-  });
-
-  it("human-only page: no agent line", () => {
-    const { agent } = summaryLabels(payload({ workMs: HOUR, agentOnlyMs: 0 }), t);
-    expect(agent).toBeUndefined();
-  });
-});
-
-describe("formatBlockTooltip", () => {
-  it("formats start–end from the real epoch in the data tz + duration", () => {
-    const d = day({
-      day: DAY0,
-      windows: [{ start: DAY0 + 9 * HOUR, end: DAY0 + 10 * HOUR + 30 * MIN, class: "work" }],
-    });
-    const [b] = toBlocks(d);
-    const label = formatBlockTooltip(b, "UTC", "en-US", t);
-    expect(label).toBe("09:00 – 10:30 · 1h 30m");
-  });
-});
@@ -1,168 +0,0 @@
-// #566 — adapter: real IPageWorkTime → the render-ready shape the redesigned
-// time-of-day timeline consumes. The visual prototype (NewDesign/TimeWorkedModal)
-// was written against invented props (`DaySummary[]`, pre-made `totalLabel`); the
-// real payload is IPageWorkTime. Everything below is pure so the mapping (windows
-// → time-of-day blocks, ms → labels, the "now" boundary, empty-run collapsing) is
-// unit-testable without React. No re-bucketing: the server already grouped the
-// windows by the request timezone — we only lay out the windows it returned.
-
-import { IPageWorkTime, IPerDay, IDayWindow } from "./work-time.types";
-import { formatDayTotal, formatHeadline } from "./format-work-time";
-
-type Translate = (key: string, opts?: Record<string, unknown>) => string;
-
-export const DAY_MS = 24 * 60 * 60 * 1000;
-// Collapse a run of this many (or more) consecutive edit-free days into a single
-// "× N days" separator (§6.2 long-range) — preserved from the original punch-card.
-export const EMPTY_RUN_COLLAPSE = 8;
-
-export interface TimelineBlock {
-  /** Hour fraction 0..24 within the day — drives left/width positioning. */
-  start: number;
-  end: number;
-  kind: "work" | "agent";
-  /** Real epoch ms, kept for a DST-safe tooltip (formatted in the data tz). */
-  startEpoch: number;
-  endEpoch: number;
-}
-
-export interface TimelineDay {
-  key: string;
-  label: string;
-  totalLabel: string;
-  blocks: TimelineBlock[];
-  isEmpty: boolean;
-  /** Today lives only in the last active bucket; drives the "now" boundary. */
-  isToday: boolean;
-  /** 0..1 position of "now" within today's track (undefined when not today). */
-  nowFraction?: number;
-}
-
-export type TimelineRow =
-  | { type: "day"; day: TimelineDay }
-  | { type: "gap"; count: number };
-
-/** Weekday-day-month heading in the browser locale (matches the server tz
- *  bucketing, since usePageWorkTime requests buckets in the viewer tz). */
-export function dayHeading(day: number): string {
-  return new Date(day).toLocaleDateString(undefined, {
-    weekday: "short",
-    day: "numeric",
-    month: "short",
-  });
-}
-
-/** Map one day's absolute windows into time-of-day blocks. `class` work|agent_only
- *  → kind work|agent; positions are the in-day hour fraction (epoch kept for the
- *  tooltip). Fractions are clamped to [0,24] to match the original punch-card. */
-export function toBlocks(day: IPerDay): TimelineBlock[] {
-  return day.windows.map((w: IDayWindow) => {
-    const start = clampHour((w.start - day.day) / (DAY_MS / 24));
-    const end = clampHour((w.end - day.day) / (DAY_MS / 24));
-    return {
-      start,
-      end,
-      kind: w.class === "work" ? "work" : "agent",
-      startEpoch: w.start,
-      endEpoch: w.end,
-    };
-  });
-}
-
-function clampHour(h: number): number {
-  return Math.max(0, Math.min(24, h));
-}
-
-/** Build a single render-ready day. `now` is injected for testability; the
- *  "now" boundary is drawn only when `now` falls inside this bucket's calendar
- *  day (so it appears on today's row and only when today has edits). */
-export function toTimelineDay(
-  day: IPerDay,
-  t: Translate,
-  now: number,
-): TimelineDay {
-  const isToday = now >= day.day && now < day.day + DAY_MS;
-  return {
-    key: day.dayISO,
-    label: dayHeading(day.day),
-    totalLabel: formatDayTotal(day.activeMs, t),
-    blocks: toBlocks(day),
-    isEmpty: day.activeMs === 0 && day.agentMs === 0,
-    isToday,
-    nowFraction: isToday ? (now - day.day) / DAY_MS : undefined,
-  };
-}
-
-/** Collapse long edit-free runs (≥ EMPTY_RUN_COLLAPSE) into an in-place "gap"
- *  row; short runs stay as (dimmed, "—") day rows. Preserved from the original
- *  punch-card so a page edited over months does not render hundreds of rows. */
-export function buildRows(
-  perDay: IPerDay[],
-  t: Translate,
-  now: number,
-): TimelineRow[] {
-  const rows: TimelineRow[] = [];
-  let emptyRun: IPerDay[] = [];
-  const flush = () => {
-    if (emptyRun.length >= EMPTY_RUN_COLLAPSE) {
-      rows.push({ type: "gap", count: emptyRun.length });
-    } else {
-      for (const d of emptyRun) {
-        rows.push({ type: "day", day: toTimelineDay(d, t, now) });
-      }
-    }
-    emptyRun = [];
-  };
-  for (const d of perDay) {
-    if (d.activeMs === 0 && d.agentMs === 0) {
-      emptyRun.push(d);
-    } else {
-      flush();
-      rows.push({ type: "day", day: toTimelineDay(d, t, now) });
-    }
-  }
-  flush();
-  return rows;
-}
-
-/** The big summary slot. Fail-safe for an agent-only page (#395/#551): since
- *  formatHeadline(0) === "", never leave the 22px slot empty — put the agent
- *  estimate in the main slot, and only show the secondary `agent:` line when
- *  BOTH a human and an agent estimate exist. */
-export function summaryLabels(
-  data: IPageWorkTime,
-  t: Translate,
-): { total: string; agent?: string } {
-  const total =
-    data.workMs > 0
-      ? formatHeadline(data.workMs, t)
-      : t("agent: {{value}}", { value: formatHeadline(data.agentOnlyMs, t) });
-  const agent =
-    data.workMs > 0 && data.agentOnlyMs > 0
-      ? formatHeadline(data.agentOnlyMs, t)
-      : undefined;
-  return { total, agent };
-}
-
-/** Block hover label "start – end · duration". Times come from the REAL epoch
- *  rendered in the data tz (NOT the 24h fraction) so a DST-transition day does
- *  not skew the shown clock time. Duration reuses formatDayTotal (always > 0
- *  here, so never "—"). */
-export function formatBlockTooltip(
-  block: TimelineBlock,
-  tz: string,
-  locale: string,
-  t: Translate,
-): string {
-  const fmt = new Intl.DateTimeFormat(locale || undefined, {
-    hour: "2-digit",
-    minute: "2-digit",
-    hour12: false,
-    timeZone: tz,
-  });
-  return t("{{start}} – {{end}} · {{duration}}", {
-    start: fmt.format(block.startEpoch),
-    end: fmt.format(block.endEpoch),
-    duration: formatDayTotal(block.endEpoch - block.startEpoch, t),
-  });
-}
@@ -1,196 +0,0 @@
-// #566 — redesigned "Time worked" body: daily time-of-day timelines. Each day is
-// a 24h track showing WHEN the work happened — a sticky 00/06/12/18/24 hour axis,
-// shaded night hours, per-block hover tooltip ("start – end · duration"), and a
-// "now" boundary on today's row. Presentation ported from NewDesign/TimeWorkedModal;
-// all data comes through the pure adapter over the real IPageWorkTime (zero backend
-// change). Positioning math, empty-run collapsing and the formatters are reused.
-import { Box, Group, ScrollArea, Stack, Text, Tooltip } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-import { useMemo } from "react";
-import { IPageWorkTime } from "./work-time.types";
-import { formatGapMinutes } from "./format-work-time";
-import {
-  buildRows,
-  formatBlockTooltip,
-  summaryLabels,
-  TimelineBlock,
-  TimelineDay,
-} from "./work-time-adapter";
-import classes from "./work-time.module.css";
-
-// Minimum visible width so a very short session neither vanishes nor fakes dense
-// work (§6.2); kept from the original punch-card.
-const MIN_BLOCK_WIDTH_PCT = 0.6;
-
-function ActivityBlock({
-  block,
-  tz,
-  locale,
-}: {
-  block: TimelineBlock;
-  tz: string;
-  locale: string;
-}) {
-  const { t } = useTranslation();
-  const left = (block.start / 24) * 100;
-  const width = Math.max(((block.end - block.start) / 24) * 100, MIN_BLOCK_WIDTH_PCT);
-  const cls = [
-    classes.window,
-    block.kind === "work" ? classes.windowWork : classes.windowAgent,
-  ].join(" ");
-  return (
-    <Tooltip
-      label={formatBlockTooltip(block, tz, locale, t)}
-      withArrow
-      openDelay={120}
-      fz={11}
-    >
-      <div className={cls} style={{ left: `${left}%`, width: `${width}%` }} />
-    </Tooltip>
-  );
-}
-
-function DayTrack({
-  day,
-  tz,
-  locale,
-}: {
-  day: TimelineDay;
-  tz: string;
-  locale: string;
-}) {
-  return (
-    <div className={classes.row}>
-      <span className={classes.dayLabel}>{day.label}</span>
-      <div className={`${classes.track} ${day.isEmpty ? classes.trackEmpty : ""}`}>
-        {[25, 50, 75].map((p) => (
-          <div key={p} className={classes.hourTick} style={{ left: `${p}%` }} />
-        ))}
-        {day.blocks.map((b, i) => (
-          <ActivityBlock key={i} block={b} tz={tz} locale={locale} />
-        ))}
-        {day.isToday && day.nowFraction != null && (
-          <div
-            className={classes.nowLine}
-            style={{ left: `${day.nowFraction * 100}%` }}
-          />
-        )}
-      </div>
-      <span
-        className={classes.daySum}
-        data-empty={day.totalLabel === "—" ? true : undefined}
-      >
-        {day.totalLabel}
-      </span>
-    </div>
-  );
-}
-
-interface Props {
-  data: IPageWorkTime;
-}
-
-export default function WorkTimePunchCard({ data }: Props) {
-  const { t, i18n } = useTranslation();
-  const locale = i18n.language;
-  const now = Date.now();
-  const rows = useMemo(
-    () => buildRows(data.perDay, t, now),
-    // `now` intentionally re-read on each open; excluded so the memo tracks data.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [data.perDay, t],
-  );
-  const { total, agent } = summaryLabels(data, t);
-  const gapMin = formatGapMinutes(data.config.tGap);
-
-  if (data.workMs <= 0 && data.agentOnlyMs <= 0) {
-    return (
-      <Text size="sm" c="dimmed" py="md">
-        {t("No editing activity recorded yet.")}
-      </Text>
-    );
-  }
-
-  return (
-    <Stack gap="xs">
-      {/* summary */}
-      <Group align="baseline" gap="md">
-        <Text fz={22} fw={700}>
-          {total}
-        </Text>
-        {agent && (
-          <Text size="xs" c="dimmed">
-            {t("agent: {{value}}", { value: agent })}
-          </Text>
-        )}
-      </Group>
-
-      {/* legend */}
-      <Group gap="md">
-        <Text size="xs" c="dimmed">
-          <span
-            className={`${classes.legendSwatch} ${classes.windowWork}`}
-            style={{ marginRight: 4 }}
-          />
-          {t("Work")}
-        </Text>
-        <Text size="xs" c="dimmed">
-          <span
-            className={`${classes.legendSwatch} ${classes.windowAgent}`}
-            style={{ marginRight: 4 }}
-          />
-          {t("Agent")}
-        </Text>
-      </Group>
-
-      {/* sticky hour axis */}
-      <div className={`${classes.row} ${classes.axisRow}`}>
-        <span />
-        <div className={classes.axis}>
-          {[
-            ["0%", "00", "start"],
-            ["25%", "06", "center"],
-            ["50%", "12", "center"],
-            ["75%", "18", "center"],
-            ["100%", "24", "end"],
-          ].map(([l, label, align]) => (
-            <span
-              key={label}
-              className={classes.axisTick}
-              data-align={align}
-              style={{ left: l }}
-            >
-              {label}
-            </span>
-          ))}
-        </div>
-        <span />
-      </div>
-
-      {/* day rows */}
-      <ScrollArea.Autosize mah="60vh" type="hover">
-        {rows.map((row, i) =>
-          row.type === "day" ? (
-            <DayTrack
-              key={row.day.key}
-              day={row.day}
-              tz={data.tz}
-              locale={locale}
-            />
-          ) : (
-            <Box key={`gap-${i}`} className={classes.gapRow}>
-              {t("× {{count}} days without edits", { count: row.count })}
-            </Box>
-          ),
-        )}
-      </ScrollArea.Autosize>
-
-      <Text size="xs" c="dimmed" mt="xs">
-        {t("Estimate · timezone {{tz}} · inactivity gap {{gap}} min", {
-          tz: data.tz,
-          gap: gapMin,
-        })}
-      </Text>
-    </Stack>
-  );
-}
@@ -1,23 +0,0 @@
-import api from "@/lib/api-client";
-import { IPageWorkTime } from "./work-time.types";
-
-/** The viewer's IANA timezone (browser locale) — the punch-card lays days out
- *  in "my evenings", per §6.3/§10. Falls back to UTC if the runtime hides it. */
-export function viewerTimezone(): string {
-  try {
-    return Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
-  } catch {
-    return "UTC";
-  }
-}
-
-export async function getPageWorkTime(
-  pageId: string,
-  tz: string,
-): Promise<IPageWorkTime> {
-  const req = await api.post<IPageWorkTime>("/pages/history/time", {
-    pageId,
-    tz,
-  });
-  return req.data;
-}
@@ -1,69 +0,0 @@
-import { Modal, Text, Tooltip, UnstyledButton } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
-import { IconClockHour4 } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { usePageWorkTime } from "./use-page-work-time";
-import { formatGapMinutes, formatHeadline } from "./format-work-time";
-import WorkTimePunchCard from "./work-time-punch-card";
-
-interface Props {
-  pageId: string;
-}
-
-/**
- * #395 — the clickable "time worked on this article" headline (§6.1). Renders
- * the `work` estimate with a "≈" sign and the inactivity threshold in a tooltip
- * (it is an estimate, not a stopwatch). Clicking opens the daily punch-card
- * (§6.2). Renders nothing until there is a non-zero human OR agent estimate, so a
- * brand-new / never-edited page shows no widget. For an agent-only-edited page
- * (workMs===0, agentOnlyMs>0) the headline shows the agent estimate (labelled
- * `agent:`, matching the punch-card) so the punch-card stays reachable (#395:
- * "how much a HUMAN and separately the AGENT").
- */
-export default function WorkTimeStat({ pageId }: Props) {
-  const { t } = useTranslation();
-  const [opened, { open, close }] = useDisclosure(false);
-  const { data } = usePageWorkTime(pageId);
-
-  if (!data || (data.workMs <= 0 && data.agentOnlyMs <= 0)) return null;
-
-  const agentOnly = data.workMs <= 0;
-  const label = agentOnly
-    ? t("agent: {{value}}", { value: formatHeadline(data.agentOnlyMs, t) })
-    : formatHeadline(data.workMs, t);
-  const gapMin = formatGapMinutes(data.config.tGap);
-
-  return (
-    <>
-      <Tooltip
-        label={t("Estimated time worked (inactivity gap {{gap}} min)", {
-          gap: gapMin,
-        })}
-        position="bottom"
-      >
-        <UnstyledButton
-          onClick={open}
-          aria-label={t("Show time worked on this page")}
-        >
-          <Text
-            size="xs"
-            c="dimmed"
-            style={{ display: "inline-flex", alignItems: "center", gap: 4 }}
-          >
-            <IconClockHour4 size={14} />
-            {label}
-          </Text>
-        </UnstyledButton>
-      </Tooltip>
-
-      <Modal
-        opened={opened}
-        onClose={close}
-        title={t("Time worked on this article")}
-        size="46rem"
-      >
-        <WorkTimePunchCard data={data} />
-      </Modal>
-    </>
-  );
-}
@@ -1,136 +0,0 @@
-/* #566 — time-of-day timeline. Custom CSS segments on a fixed 24-hour track
-   (position = offset-in-day / 24h, width = duration / 24h), no chart library.
-   Night hours (0–6, 21–24) are shaded so the eye reads morning-vs-evening; a
-   sticky hour axis labels 00/06/12/18/24. Theme-aware via Mantine tokens. */
-
-.row {
-  display: grid;
-  grid-template-columns: 96px 1fr 64px;
-  align-items: center;
-  gap: 12px;
-  padding: 3px 0;
-}
-
-.dayLabel {
-  font-size: var(--mantine-font-size-xs);
-  color: var(--mantine-color-dimmed);
-  white-space: nowrap;
-}
-
-.track {
-  --wt-night: rgba(90, 100, 130, 0.16);
-  --wt-day: rgba(90, 100, 130, 0.03);
-  position: relative;
-  height: 20px;
-  border-radius: 5px;
-  overflow: hidden;
-  /* base fill + night shading: 0–6h and 21–24h (87.5%) darker than daytime */
-  background:
-    linear-gradient(
-      90deg,
-      var(--wt-night) 0 25%,
-      var(--wt-day) 25% 87.5%,
-      var(--wt-night) 87.5% 100%
-    ),
-    light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6));
-}
-
-/* Short (< EMPTY_RUN_COLLAPSE) edit-free days: dimmed, empty track. */
-.trackEmpty {
-  opacity: 0.5;
-}
-
-/* Quarter-day grid divisions (06/12/18) inside the track. */
-.hourTick {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  width: 1px;
-  background-color: light-dark(
-    var(--mantine-color-gray-3),
-    var(--mantine-color-dark-4)
-  );
-}
-
-.window {
-  position: absolute;
-  top: 3px;
-  height: 14px;
-  border-radius: 3px;
-  min-width: 3px;
-  cursor: default;
-}
-
-.windowWork {
-  background-color: var(--mantine-color-blue-5);
-}
-
-.windowAgent {
-  background-color: var(--mantine-color-grape-5);
-}
-
-/* The "now" boundary on today's row. */
-.nowLine {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  width: 2px;
-  background-color: var(--mantine-color-red-6);
-}
-
-.daySum {
-  font-size: var(--mantine-font-size-xs);
-  font-weight: 500;
-  text-align: right;
-  white-space: nowrap;
-}
-
-.daySum[data-empty] {
-  color: var(--mantine-color-dimmed);
-  font-weight: 400;
-}
-
-/* Sticky hour axis header aligned to the track column. */
-.axisRow {
-  position: sticky;
-  top: 0;
-  z-index: 2;
-  background-color: var(--mantine-color-body);
-  padding-bottom: 2px;
-}
-
-.axis {
-  position: relative;
-  height: 14px;
-}
-
-.axisTick {
-  position: absolute;
-  top: 0;
-  font-size: 10px;
-  font-weight: 500;
-  color: var(--mantine-color-dimmed);
-}
-
-.axisTick[data-align="center"] {
-  transform: translateX(-50%);
-}
-
-.axisTick[data-align="end"] {
-  transform: translateX(-100%);
-}
-
-.gapRow {
-  padding: 6px 0 6px 108px;
-  font-size: var(--mantine-font-size-xs);
-  color: var(--mantine-color-dimmed);
-  font-style: italic;
-}
-
-.legendSwatch {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  border-radius: 3px;
-  vertical-align: middle;
-}
@@ -1,37 +0,0 @@
-// #395 — client-side mirror of the server work-time payload
-// (apps/server/src/core/page/work-time). Shapes returned by POST /pages/history/time.
-
-export type WorkSessionClass = "work" | "agent_only";
-
-export interface IDayWindow {
-  start: number;
-  end: number;
-  class: WorkSessionClass;
-}
-
-export interface IPerDay {
-  day: number;
-  dayISO: string;
-  activeMs: number;
-  agentMs: number;
-  windows: IDayWindow[];
-}
-
-export interface IWorkTimeConfig {
-  tGap: number;
-  agentTGap: number;
-  pIn: number;
-  pOut: number;
-  pSingle: number;
-  excludeGit: boolean;
-  burstCapMs?: number;
-  dedupRoundMs: number;
-}
-
-export interface IPageWorkTime {
-  workMs: number;
-  agentOnlyMs: number;
-  perDay: IPerDay[];
-  config: IWorkTimeConfig;
-  tz: string;
-}
@@ -3,7 +3,6 @@ import {
  IconArrowRight,
  IconArrowsHorizontal,
  IconClockHour4,
-  IconDeviceFloppy,
  IconDots,
  IconEye,
  IconEyeOff,
@@ -18,7 +17,7 @@ import {
  IconTrash,
  IconWifiOff,
 } from "@tabler/icons-react";
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useAsideTriggerProps } from "@/hooks/use-toggle-aside.tsx";
 import { useAtom, useAtomValue } from "jotai";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";
@@ -40,18 +39,12 @@ import { Trans, useTranslation } from "react-i18next";
 import ExportModal from "@/components/common/export-modal";
 import { convertProseMirrorToMarkdown } from "@docmost/prosemirror-markdown/browser";
 import {
-  collabProviderAtom,
  pageEditorAtom,
  yjsConnectionStatusAtom,
 } from "@/features/editor/atoms/editor-atoms.ts";
-import {
-  SAVE_VERSION_MESSAGE_TYPE,
-  saveVersionPending,
-} from "@/features/page-history/version-messages.ts";
 import { formattedDate } from "@/lib/time.ts";
 import { PageEditModeToggle } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
-import WorkTimeStat from "@/features/page-history/work-time/work-time-stat.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import {
  useFavoriteIds,
@@ -79,34 +72,9 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
  });
  const isDeleted = !!page?.deletedAt;
  const [workspace] = useAtom(workspaceAtom);
-  const collabProvider = useAtomValue(collabProviderAtom);
  // Community public-sharing entry point (replaces the removed EE PageShareModal)
  const workspaceSharingDisabled = workspace?.settings?.sharing?.disabled === true;

-  // #370 — explicit "save a version" (Cmd+S / Save button). One path for the
-  // human; the server derives the tier from the signed actor. Readers can't save
-  // (the button is hidden and the collab connection is read-only server-side).
-  const handleSaveVersion = useCallback(() => {
-    if (readOnly || !collabProvider) return;
-    // Flag this client as the initiator so only it shows the confirmation toast;
-    // a safety timeout clears it if no broadcast comes back (e.g. offline).
-    saveVersionPending.current = true;
-    window.setTimeout(() => {
-      saveVersionPending.current = false;
-    }, 5000);
-    collabProvider.sendStateless(
-      JSON.stringify({ type: SAVE_VERSION_MESSAGE_TYPE }),
-    );
-  }, [readOnly, collabProvider]);
-
-  // mod+S must also block the browser's "Save page" dialog. `triggerOnContent-
-  // Editable` + empty ignore-list so it fires while typing in the editor/title.
-  useHotkeys(
-    [["mod+S", handleSaveVersion, { preventDefault: true }]],
-    [],
-    true,
-  );
-
  useHotkeys(
    [
      [
@@ -165,16 +133,15 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
        </ActionIcon>
      </Tooltip>

-      <PageActionMenu readOnly={readOnly} onSaveVersion={handleSaveVersion} />
+      <PageActionMenu readOnly={readOnly} />
    </>
  );
 }

 interface PageActionMenuProps {
  readOnly?: boolean;
-  onSaveVersion?: () => void;
 }
-function PageActionMenu({ readOnly, onSaveVersion }: PageActionMenuProps) {
+function PageActionMenu({ readOnly }: PageActionMenuProps) {
  const { t } = useTranslation();
  const [, setHistoryModalOpen] = useAtom(historyAtoms);
  const clipboard = useClipboard({ timeout: 500 });
@@ -266,8 +233,6 @@ function PageActionMenu({ readOnly, onSaveVersion }: PageActionMenuProps) {

  return (
    <>
-      {page?.id && <WorkTimeStat pageId={page.id} />}
-
      <Menu
        shadow="xl"
        position="bottom-end"
@@ -338,20 +303,6 @@ function PageActionMenu({ readOnly, onSaveVersion }: PageActionMenuProps) {
            </Group>
          </Menu.Item>

-          {!readOnly && (
-            <Menu.Item
-              leftSection={<IconDeviceFloppy size={16} />}
-              onClick={onSaveVersion}
-              rightSection={
-                <Text size="xs" c="dimmed">
-                  {t("Ctrl+S")}
-                </Text>
-              }
-            >
-              {t("Save version")}
-            </Menu.Item>
-          )}
-
          <Menu.Item
            leftSection={<IconHistory size={16} />}
            onClick={openHistoryModal}
@@ -1,6 +1,6 @@
 import { Spotlight } from "@mantine/spotlight";
 import { IconSearch } from "@tabler/icons-react";
-import { Group, Text, VisuallyHidden } from "@mantine/core";
+import { Group, VisuallyHidden } from "@mantine/core";
 import { useState, useMemo } from "react";
 import { useDebouncedValue } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
@@ -84,11 +84,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
            onFiltersChange={handleFiltersChange}
            spaceId={spaceId}
          />
-          {/* #529: operator hint — matches ANY word by default; "…" for an exact
-              phrase, +term to require, -term to exclude. */}
-          <Text size="xs" c="dimmed" mt={4}>
-            {t('Tip: "exact phrase", +required, -excluded')}
-          </Text>
        </div>

        <VisuallyHidden role="status" aria-live="polite">
@@ -5,9 +5,6 @@ import { IPage } from "@/features/page/types/page.types.ts";

 export interface IPageSearch {
  id: string;
-  // #529 A7 superset: `pageId` aliases `id`; `rank`/`highlight` are null for
-  // substring-only hits (the UI already falls back to the title/snippet).
-  pageId?: string;
  title: string;
  icon: string;
  parentPageId: string;
@@ -15,36 +12,9 @@ export interface IPageSearch {
  creatorId: string;
  createdAt: Date;
  updatedAt: Date;
-  rank: string | number | null;
-  highlight: string | null;
+  rank: string;
+  highlight: string;
  space: Partial<ISpace>;
-  // New #529 fields (present from the native Postgres search driver).
-  snippet?: string;
-  score?: number;
-  path?: string[];
-  matchedFields?: string[];
-  matchedTerms?: string[];
-}
-
-// #529 A5 pagination envelope returned by POST /search (native driver). The web
-// list helpers read `items`; these travel alongside for pagination + diagnostics.
-export interface IPageSearchResponse {
-  items: IPageSearch[];
-  total: number;
-  hasMore: boolean;
-  truncatedAtCap: boolean;
-  offset: number;
-  query?: {
-    raw: string;
-    parsed: {
-      positive: string[];
-      required: string[];
-      excluded: string[];
-      reason?: string;
-    };
-    mode: "or" | "and";
-    match: string;
-  };
 }

 export interface SearchSuggestionParams {
@@ -67,10 +37,6 @@ export interface IPageSearchParams {
  query: string;
  spaceId?: string;
  shareId?: string;
-  // #529 A9: match mode (auto default) + pagination.
-  match?: "auto" | "word" | "prefix" | "substring";
-  limit?: number;
-  offset?: number;
 }

 export interface IAttachmentSearch {
@@ -1,195 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
-import { render, act, cleanup } from "@testing-library/react";
-import { MemoryRouter, useNavigate } from "react-router-dom";
-
-// Mocks for the dirty shell's side-effecting collaborators.
-vi.mock("@mantine/notifications", () => ({
-  notifications: { show: vi.fn() },
-}));
-vi.mock("@/i18n.ts", () => ({ default: { t: (k: string) => k } }));
-vi.mock("@/lib/reload-guard", () => ({
-  hasAutoReloaded: vi.fn(() => false),
-  markAutoReloaded: vi.fn(() => true),
-  recordReloadBreadcrumb: vi.fn(),
-  takeReloadBreadcrumb: vi.fn(() => null),
-}));
-
-import { notifications } from "@mantine/notifications";
-import { hasAutoReloaded, markAutoReloaded } from "@/lib/reload-guard";
-import {
-  triggerGuardedReload,
-  useVersionReloadOnNavigation,
-  __resetGuardedReloadForTests,
-} from "./guarded-reload";
-
-const show = notifications.show as unknown as ReturnType<typeof vi.fn>;
-const mockHasAutoReloaded = hasAutoReloaded as unknown as ReturnType<
-  typeof vi.fn
->;
-const mockMarkAutoReloaded = markAutoReloaded as unknown as ReturnType<
-  typeof vi.fn
->;
-
-let reload: ReturnType<typeof vi.fn>;
-let visibility: DocumentVisibilityState;
-
-// Test harness mounted inside a router: it installs the navigation hook and
-// exposes `navigate` so a test can drive an in-app router navigation.
-let doNavigate: (to: string) => void;
-function Harness() {
-  useVersionReloadOnNavigation();
-  const navigate = useNavigate();
-  doNavigate = navigate;
-  return null;
-}
-
-function mountHarness() {
-  render(
-    <MemoryRouter initialEntries={["/start"]}>
-      <Harness />
-    </MemoryRouter>,
-  );
-}
-
-function navigateTo(path: string) {
-  act(() => {
-    doNavigate(path);
-  });
-}
-
-beforeEach(() => {
-  __resetGuardedReloadForTests();
-  vi.clearAllMocks();
-  mockHasAutoReloaded.mockReturnValue(false);
-  mockMarkAutoReloaded.mockReturnValue(true);
-
-  vi.stubGlobal("APP_VERSION", "test-A");
-
-  reload = vi.fn();
-  Object.defineProperty(window, "location", {
-    configurable: true,
-    value: { reload },
-  });
-
-  visibility = "visible";
-  Object.defineProperty(document, "visibilityState", {
-    configurable: true,
-    get: () => visibility,
-  });
-});
-
-afterEach(() => {
-  cleanup();
-  vi.unstubAllGlobals();
-});
-
-describe("triggerGuardedReload (variant C)", () => {
-  it("noop when versions match: no banner, no reload", () => {
-    triggerGuardedReload("test-A");
-    expect(show).not.toHaveBeenCalled();
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("noop when the server version is empty (fail-safe)", () => {
-    triggerGuardedReload("");
-    triggerGuardedReload(undefined);
-    expect(show).not.toHaveBeenCalled();
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("real mismatch shows the banner but does NOT reload immediately", () => {
-    mountHarness();
-    triggerGuardedReload("test-B");
-    expect(show).toHaveBeenCalledTimes(1);
-    expect(show.mock.calls[0][0]).toMatchObject({
-      id: "app-version-reload",
-      autoClose: false,
-      withCloseButton: true,
-    });
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("reloads EXACTLY ONCE on the first in-app navigation after a mismatch", () => {
-    mountHarness();
-    triggerGuardedReload("test-B");
-    expect(reload).not.toHaveBeenCalled();
-
-    navigateTo("/next");
-    expect(reload).toHaveBeenCalledTimes(1);
-
-    // A second navigation must NOT reload again (one-shot was consumed).
-    navigateTo("/again");
-    expect(reload).toHaveBeenCalledTimes(1);
-  });
-
-  it("does NOT reload on a 2nd mismatch after the first was armed/consumed (one-shot)", () => {
-    mountHarness();
-    triggerGuardedReload("test-B");
-    navigateTo("/next");
-    expect(reload).toHaveBeenCalledTimes(1);
-
-    // Another app-version mismatch arrives (reconnect): must not re-arm.
-    triggerGuardedReload("test-C");
-    navigateTo("/again");
-    expect(reload).toHaveBeenCalledTimes(1);
-  });
-
-  it("does NOT reload merely from the tab going to the background", () => {
-    mountHarness();
-    triggerGuardedReload("test-B");
-    expect(reload).not.toHaveBeenCalled();
-
-    visibility = "hidden";
-    act(() => {
-      document.dispatchEvent(new Event("visibilitychange"));
-    });
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("a hidden-at-receipt tab is also NOT reloaded immediately (variant C uniform); reloads on next navigation", () => {
-    visibility = "hidden";
-    mountHarness();
-    triggerGuardedReload("test-B");
-    expect(reload).not.toHaveBeenCalled();
-    expect(show).toHaveBeenCalledTimes(1);
-
-    navigateTo("/next");
-    expect(reload).toHaveBeenCalledTimes(1);
-  });
-
-  it("the banner's Update button reloads immediately", () => {
-    triggerGuardedReload("test-B");
-    const message = show.mock.calls[0][0].message as {
-      props: { onClick: () => void };
-    };
-    message.props.onClick();
-    expect(reload).toHaveBeenCalledTimes(1);
-  });
-
-  it("banner-only (auto-reload already spent): banner, never auto-reload on navigation", () => {
-    mockHasAutoReloaded.mockReturnValue(true);
-    mountHarness();
-    triggerGuardedReload("test-B");
-    expect(show).toHaveBeenCalledTimes(1);
-
-    navigateTo("/next");
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("does NOT reload when the flag write fails; falls back to the banner", () => {
-    mockMarkAutoReloaded.mockReturnValue(false);
-    mountHarness();
-    triggerGuardedReload("test-B");
-    navigateTo("/next");
-    expect(reload).not.toHaveBeenCalled();
-    // performAutoReload falls back to showing the banner (initial + fallback).
-    expect(show).toHaveBeenCalled();
-  });
-
-  it("is idempotent within a tab-load: repeated emits do not stack banners", () => {
-    triggerGuardedReload("test-B");
-    triggerGuardedReload("test-B");
-    triggerGuardedReload("test-C");
-    expect(show).toHaveBeenCalledTimes(1);
-  });
-});
@@ -1,188 +0,0 @@
-import { useEffect, useRef } from "react";
-import { useLocation } from "react-router-dom";
-import { Button } from "@mantine/core";
-import { notifications } from "@mantine/notifications";
-import i18n from "@/i18n.ts";
-import {
-  hasAutoReloaded,
-  markAutoReloaded,
-  recordReloadBreadcrumb,
-  takeReloadBreadcrumb,
-} from "@/lib/reload-guard";
-import { decideVersionAction } from "@/features/user/version-coherence";
-
-// Dirty shell around the pure `decideVersionAction`: it reads globals
-// (APP_VERSION), touches sessionStorage via the shared reload-guard, drives the
-// Mantine notification, and arms the router-navigation reload hook. Kept
-// separate from the pure module so the decision stays unit-testable without a
-// DOM.
-
-// One fixed id so repeated app-version signals (e.g. every reconnect) update a
-// single banner instead of stacking a new one each time.
-const BANNER_ID = "app-version-reload";
-
-// Module-level idempotency for the current tab-load: once a mismatch has been
-// handled we don't re-arm the navigation reload or re-show the banner on
-// subsequent app-version emits.
-let handled = false;
-
-// Variant C: on a real mismatch we do NOT reload the tab when it merely goes to
-// the background (that would silently drop a half-written comment/form). Instead
-// we arm a one-shot reload for the NEXT in-app router navigation — a point where
-// the user is already leaving the current page, so an in-app navigation would
-// discard that unsaved component-state anyway and the reload adds no extra loss.
-let pendingNavReload = false;
-
-// Remembered from the last detected mismatch for the pre-reload breadcrumb and
-// the (already-visible) banner.
-let lastServerVersion = "";
-let lastClientVersion = "";
-
-// Read the build version baked into THIS bundle. The `typeof` guard avoids a
-// ReferenceError where the `APP_VERSION` global is absent (e.g. under vitest,
-// where Vite's `define` did not run) — an unknown client version makes the
-// pure decision no-op (fail-safe).
-function readClientVersion(): string {
-  return (typeof APP_VERSION !== "undefined" ? APP_VERSION : "").trim();
-}
-
-// Perform the actual reload — but only after the shared one-shot flag is
-// persisted. If the write fails (storage unavailable) we must NOT reload
-// (mirrors the reactive chunk-load boundary's `catch → return`), and fall back
-// to the manual banner so the user can still recover.
-function performAutoReload(): void {
-  if (!markAutoReloaded()) {
-    showReloadBanner();
-    return;
-  }
-  // Trace right before the reload (which clears the console): a persistent
-  // breadcrumb + a log line so the auto-reload is observable in a field report.
-  recordReloadBreadcrumb({
-    path: "proactive",
-    serverVersion: lastServerVersion,
-    clientVersion: lastClientVersion,
-  });
-  console.warn(
-    `[version-coherence] auto-reloading: client=${lastClientVersion} -> server=${lastServerVersion}`,
-  );
-  window.location.reload();
-}
-
-function showReloadBanner(): void {
-  notifications.show({
-    id: BANNER_ID,
-    title: i18n.t("A new version is available"),
-    message: (
-      <Button size="xs" mt="xs" onClick={() => performAutoReload()}>
-        {i18n.t("Update")}
-      </Button>
-    ),
-    autoClose: false,
-    withCloseButton: true,
-  });
-}
-
-/**
- * Handle a server `app-version` announcement: compare it to this bundle's
- * version and, on a real mismatch, show the banner and arm a guarded reload for
- * the next in-app navigation (variant C).
- *
- * - real mismatch (window budget available) → banner + arm navigation reload.
- *   The banner's "Update" button reloads immediately (same shared window guard).
- *   The tab is NOT reloaded on visibility change.
- * - auto-reload already used this window / storage error → banner only (no arm),
- *   so there is at most one automatic reload per RELOAD_WINDOW_MS window (loop
- *   safety).
- * - in sync / unknown version → noop (fail-safe).
- */
-export function triggerGuardedReload(
-  rawServerVersion: string | undefined | null,
-): void {
-  const serverVersion = (rawServerVersion ?? "").trim();
-  const clientVersion = readClientVersion();
-
-  // A storage read error surfaces as autoReloadUsed=true → fail toward NOT
-  // reloading (banner only).
-  const autoReloadUsed = hasAutoReloaded();
-
-  const action = decideVersionAction({
-    serverVersion,
-    clientVersion,
-    autoReloadUsed,
-  });
-  if (action === "noop") return;
-
-  // Idempotent per tab-load: don't re-arm or re-stack the banner across repeated
-  // emits (reconnects) once we've already acted.
-  if (handled) return;
-  handled = true;
-
-  lastServerVersion = serverVersion;
-  lastClientVersion = clientVersion;
-
-  if (action === "banner") {
-    // Entered banner-only (permanent skew, node oscillation, or the window's
-    // auto-reload budget already spent). Log for diagnosability; show the banner.
-    console.warn(
-      `[version-coherence] server=${serverVersion} client=${clientVersion}: ` +
-        "auto-reload budget already spent this window — showing manual banner",
-    );
-    showReloadBanner();
-    return;
-  }
-
-  // action === "reload" (variant C): show the banner and defer the auto-reload
-  // to the next in-app navigation instead of reloading now / on visibility.
-  showReloadBanner();
-  pendingNavReload = true;
-}
-
-/**
- * Consume the armed one-shot navigation reload, if any. Called by
- * `useVersionReloadOnNavigation` on each in-app router navigation.
- */
-export function consumeNavigationReload(): void {
-  if (!pendingNavReload) return;
-  pendingNavReload = false;
-  performAutoReload();
-}
-
-/**
- * Hook (mounted inside the Router) that fires the armed one-shot reload on the
- * NEXT in-app router navigation after a version mismatch. Skips the initial
- * render so it only reacts to real navigations, not the first location.
- */
-export function useVersionReloadOnNavigation(): void {
-  const location = useLocation();
-  const firstRender = useRef(true);
-  useEffect(() => {
-    if (firstRender.current) {
-      firstRender.current = false;
-      return;
-    }
-    consumeNavigationReload();
-  }, [location.key]);
-}
-
-/**
- * Surface (log once) the breadcrumb left by an auto-reload in the previous page
- * load — the reload cleared the console, so this makes a "tab reloaded itself"
- * report diagnosable. Call once on app startup.
- */
-export function surfacePreviousReloadBreadcrumb(): void {
-  const crumb = takeReloadBreadcrumb();
-  if (!crumb) return;
-  console.info(
-    `[version-coherence] previous auto-reload: path=${crumb.path} ` +
-      `client=${crumb.clientVersion ?? ""} -> server=${crumb.serverVersion ?? ""} ` +
-      `at=${new Date(crumb.at).toISOString()}`,
-  );
-}
-
-// Test-only: reset module-level latches between cases.
-export function __resetGuardedReloadForTests(): void {
-  handled = false;
-  pendingNavReload = false;
-  lastServerVersion = "";
-  lastClientVersion = "";
-}
@@ -1,171 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
-import { render, act, cleanup } from "@testing-library/react";
-import { MemoryRouter, useNavigate } from "react-router-dom";
-
-// Integration test for the SHARED, window-based auto-reload budget (invariant a):
-// the reactive chunk-load boundary and the proactive version-coherence path both
-// route through the REAL @/lib/reload-guard, so at most one automatic reload
-// happens per RELOAD_WINDOW_MS across BOTH paths combined. Only the two paths'
-// side-effecting collaborators are mocked — the reload guard is intentionally
-// REAL so this exercises the actual shared sessionStorage budget.
-vi.mock("@mantine/notifications", () => ({
-  notifications: { show: vi.fn() },
-}));
-vi.mock("@/i18n.ts", () => ({ default: { t: (k: string) => k } }));
-
-import { handleError } from "@/components/chunk-load-error-boundary";
-import {
-  triggerGuardedReload,
-  useVersionReloadOnNavigation,
-  __resetGuardedReloadForTests,
-} from "./guarded-reload";
-import { RELOAD_WINDOW_MS } from "@/lib/reload-guard";
-
-const CHUNK_ERROR = { name: "ChunkLoadError", message: "boom" };
-const T0 = 1_000_000_000_000;
-
-let reload: ReturnType<typeof vi.fn>;
-let nowMock: ReturnType<typeof vi.spyOn>;
-
-// Harness mounted inside a router: installs the navigation hook and exposes
-// `navigate` so a test can drive an in-app router navigation (the point where the
-// proactive path fires its armed reload).
-let doNavigate: (to: string) => void;
-function Harness() {
-  useVersionReloadOnNavigation();
-  doNavigate = useNavigate();
-  return null;
-}
-function mountHarness() {
-  render(
-    <MemoryRouter initialEntries={["/start"]}>
-      <Harness />
-    </MemoryRouter>,
-  );
-}
-function navigateTo(path: string) {
-  act(() => {
-    doNavigate(path);
-  });
-}
-function setNow(t: number) {
-  nowMock.mockReturnValue(t);
-}
-
-beforeEach(() => {
-  sessionStorage.clear();
-  __resetGuardedReloadForTests();
-  vi.clearAllMocks();
-  nowMock = vi.spyOn(Date, "now").mockReturnValue(T0);
-  vi.stubGlobal("APP_VERSION", "test-A");
-  reload = vi.fn();
-  Object.defineProperty(window, "location", {
-    configurable: true,
-    value: { reload },
-  });
-});
-
-afterEach(() => {
-  cleanup();
-  vi.unstubAllGlobals();
-  vi.restoreAllMocks();
-  sessionStorage.clear();
-});
-
-describe("shared window-based reload budget (invariant a)", () => {
-  it("a chunk-load reload spends the budget: a version-coherence mismatch within the window shows the banner but does NOT reload", () => {
-    // Path 1 (reactive): a stale-chunk 404 auto-reloads once and stamps the window.
-    handleError(CHUNK_ERROR);
-    expect(reload).toHaveBeenCalledTimes(1);
-    reload.mockClear();
-
-    // Path 2 (proactive), 1 min later — still inside the window. The shared budget
-    // is spent, so the version mismatch degrades to the banner and never reloads.
-    setNow(T0 + 60_000);
-    mountHarness();
-    triggerGuardedReload("test-B");
-    navigateTo("/next");
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("a version-coherence reload spends the SAME budget: a chunk-load error within the window does NOT reload", () => {
-    // Path 2 (proactive) first: real mismatch → arm → fire on navigation.
-    mountHarness();
-    triggerGuardedReload("test-B");
-    navigateTo("/next");
-    expect(reload).toHaveBeenCalledTimes(1);
-    reload.mockClear();
-
-    // Path 1 (reactive), 2 min later — inside the window. Budget already spent by
-    // the proactive path, so the stale-chunk error must NOT trigger a second reload.
-    setNow(T0 + 2 * 60_000);
-    handleError(CHUNK_ERROR);
-    expect(reload).not.toHaveBeenCalled();
-  });
-
-  it("recovers after the window: a reload strictly older than the window is allowed again (second deploy)", () => {
-    // First auto-reload (reactive) stamps the window.
-    handleError(CHUNK_ERROR);
-    expect(reload).toHaveBeenCalledTimes(1);
-    reload.mockClear();
-
-    // A second deploy arrives after the window has fully elapsed → the proactive
-    // path is allowed to reload again (window, not a permanent one-shot).
-    __resetGuardedReloadForTests();
-    setNow(T0 + RELOAD_WINDOW_MS + 1);
-    mountHarness();
-    triggerGuardedReload("test-B");
-    navigateTo("/next");
-    expect(reload).toHaveBeenCalledTimes(1);
-  });
-
-  it("reactive path fails closed when storage READS but cannot WRITE (quota / Safari private): no unguarded reload", () => {
-    // getItem→null makes hasAutoReloaded() report the budget as available, so
-    // handleError passes the first guard and reaches `if (!markAutoReloaded())
-    // return;`. setItem throws → the stamp cannot stick, so markAutoReloaded()
-    // returns false and that guard MUST bail — otherwise the reactive path would
-    // reload on every stale-chunk error with no persisted budget (an unguarded
-    // loop). This is the asymmetric gap: the proactive path's equivalent is
-    // covered by guarded-reload.test.tsx "does NOT reload when the flag write
-    // fails".
-    vi.stubGlobal("sessionStorage", {
-      getItem: () => null,
-      setItem: () => {
-        throw new Error("quota exceeded");
-      },
-      removeItem: () => {},
-      clear: () => {},
-    });
-    try {
-      handleError(CHUNK_ERROR);
-      expect(reload).not.toHaveBeenCalled();
-    } finally {
-      vi.unstubAllGlobals();
-    }
-  });
-
-  it("sessionStorage unavailable: neither path performs an unguarded reload", () => {
-    // The real guard fails toward NOT reloading when storage throws.
-    vi.stubGlobal("sessionStorage", {
-      getItem: () => {
-        throw new Error("storage disabled");
-      },
-      setItem: () => {
-        throw new Error("storage disabled");
-      },
-      removeItem: () => {},
-      clear: () => {},
-    });
-    try {
-      handleError(CHUNK_ERROR);
-      expect(reload).not.toHaveBeenCalled();
-
-      mountHarness();
-      triggerGuardedReload("test-B");
-      navigateTo("/next");
-      expect(reload).not.toHaveBeenCalled();
-    } finally {
-      vi.unstubAllGlobals();
-    }
-  });
-});
@@ -13,12 +13,6 @@ import { useCollabToken } from "@/features/auth/queries/auth-query.tsx";
 import { Error404 } from "@/components/ui/error-404.tsx";
 import { queryClient } from "@/main.tsx";
 import { makeConnectHandler } from "@/features/user/connect-resync.ts";
-import {
-  triggerGuardedReload,
-  useVersionReloadOnNavigation,
-  surfacePreviousReloadBreadcrumb,
-} from "@/features/user/guarded-reload.tsx";
-import type { AppVersionSocketPayload } from "@/features/user/version-coherence.ts";

 export function UserProvider({ children }: React.PropsWithChildren) {
  const [, setCurrentUser] = useAtom(currentUserAtom);
@@ -28,16 +22,6 @@ export function UserProvider({ children }: React.PropsWithChildren) {
  // fetch collab token on load
  const { data: collab } = useCollabToken();

-  // version-coherence: fire the armed one-shot reload on the next in-app
-  // navigation (variant C — a safe point, not on tab backgrounding).
-  useVersionReloadOnNavigation();
-
-  // Surface any breadcrumb left by an auto-reload in the previous page load
-  // (the reload cleared the console) so a field report stays diagnosable.
-  useEffect(() => {
-    surfacePreviousReloadBreadcrumb();
-  }, []);
-
  useEffect(() => {
    if (isLoading || isError) {
      return;
@@ -63,16 +47,6 @@ export function UserProvider({ children }: React.PropsWithChildren) {
      handleConnect();
    });

-    // Register the version-coherence listener SYNCHRONOUSLY, before the socket
-    // connects: the server emits `app-version` immediately in handleConnection,
-    // so a listener attached after connect would miss it on a fast localhost
-    // connect. On a version mismatch the client shows a banner and defers the
-    // auto-reload to the next in-app navigation (variant C — avoids reloading a
-    // backgrounded tab that may hold unsaved input) before it hits a stale chunk.
-    newSocket.on("app-version", (payload?: AppVersionSocketPayload) => {
-      triggerGuardedReload(payload?.version);
-    });
-
    return () => {
      console.log("ws disconnected");
      newSocket.disconnect();
@@ -1,64 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { decideVersionAction } from "./version-coherence";
-
-describe("decideVersionAction", () => {
-  it("noop when the server version is empty (fail-safe)", () => {
-    expect(
-      decideVersionAction({
-        serverVersion: "",
-        clientVersion: "v1",
-        autoReloadUsed: false,
-      }),
-    ).toBe("noop");
-  });
-
-  it("noop when the client version is empty (fail-safe)", () => {
-    expect(
-      decideVersionAction({
-        serverVersion: "v1",
-        clientVersion: "",
-        autoReloadUsed: false,
-      }),
-    ).toBe("noop");
-  });
-
-  it("noop when versions are equal (in sync)", () => {
-    expect(
-      decideVersionAction({
-        serverVersion: "v1",
-        clientVersion: "v1",
-        autoReloadUsed: false,
-      }),
-    ).toBe("noop");
-  });
-
-  it("reload on a real mismatch the first time this session", () => {
-    expect(
-      decideVersionAction({
-        serverVersion: "test-B",
-        clientVersion: "test-A",
-        autoReloadUsed: false,
-      }),
-    ).toBe("reload");
-  });
-
-  it("banner on a mismatch once the session auto-reload is spent", () => {
-    expect(
-      decideVersionAction({
-        serverVersion: "test-B",
-        clientVersion: "test-A",
-        autoReloadUsed: true,
-      }),
-    ).toBe("banner");
-  });
-
-  it("equal versions stay noop even if auto-reload was already used", () => {
-    expect(
-      decideVersionAction({
-        serverVersion: "v1",
-        clientVersion: "v1",
-        autoReloadUsed: true,
-      }),
-    ).toBe("noop");
-  });
-});
@@ -1,32 +0,0 @@
-// Payload of the per-connect `app-version` socket.io event announced by the
-// server (ws.gateway.ts) after a successful auth. A dedicated event — NOT a
-// member of the room-scoped `WebSocketEvent` union (which is discriminated by
-// `operation`), so it never touches use-query-subscription.
-export type AppVersionSocketPayload = { version: string };
-
-/**
- * Pure decision for the version-coherence guard.
- *
- * All inputs are injected (no globals, no side effects) so it is unit-testable
- * without a DOM or the build-time `APP_VERSION` global (undefined under vitest).
- *
- * - `autoReloadUsed` = an automatic reload has already happened within the
- *   current ~5-min window, so we must not auto-reload again (loop safety,
- *   shared window budget with the reactive chunk-load boundary).
- *
- * Returns:
- * - "noop"   — do nothing (unknown version on either side, or already in sync).
- * - "banner" — show the manual "update available" banner only (no auto-reload).
- * - "reload" — real first-time mismatch: eligible for a guarded auto-reload.
- */
-export function decideVersionAction(args: {
-  serverVersion: string;
-  clientVersion: string;
-  autoReloadUsed: boolean;
-}): "reload" | "banner" | "noop" {
-  const { serverVersion, clientVersion, autoReloadUsed } = args;
-  if (!serverVersion || !clientVersion) return "noop"; // fail-safe: unknown version → never act
-  if (serverVersion === clientVersion) return "noop"; // in sync
-  if (autoReloadUsed) return "banner"; // one auto-reload per RELOAD_WINDOW_MS window already spent
-  return "reload"; // real mismatch, window budget available
-}
@@ -1,145 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
-import {
-  hasAutoReloaded,
-  markAutoReloaded,
-  shouldAutoReload,
-  recordReloadBreadcrumb,
-  takeReloadBreadcrumb,
-  RELOAD_WINDOW_MS,
-} from "./reload-guard";
-
-// The shared budget is a single sessionStorage timestamp keyed here; both the
-// reactive chunk-load boundary and the proactive version-coherence path read and
-// stamp it, so at most one auto-reload happens per RELOAD_WINDOW_MS across BOTH.
-const RELOAD_AT_KEY = "chunk-reload-at";
-const NOW = 1_000_000_000_000;
-
-describe("reload-guard", () => {
-  beforeEach(() => {
-    sessionStorage.clear();
-    vi.restoreAllMocks();
-  });
-
-  afterEach(() => {
-    sessionStorage.clear();
-    vi.restoreAllMocks();
-  });
-
-  it("hasAutoReloaded is false before any reload, true within the window after mark", () => {
-    expect(hasAutoReloaded(NOW)).toBe(false);
-    expect(markAutoReloaded(NOW)).toBe(true);
-    // Same key both paths share; stores the reload timestamp, not a flag.
-    expect(sessionStorage.getItem(RELOAD_AT_KEY)).toBe(String(NOW));
-    // Inside the window → budget spent → true (fall through to manual UI).
-    expect(hasAutoReloaded(NOW)).toBe(true);
-    expect(hasAutoReloaded(NOW + RELOAD_WINDOW_MS)).toBe(true);
-  });
-
-  it("hasAutoReloaded is false again once the window has elapsed (a later deploy recovers)", () => {
-    markAutoReloaded(NOW);
-    // Strictly older than the window → a new deploy's mismatch may reload again.
-    expect(hasAutoReloaded(NOW + RELOAD_WINDOW_MS + 1)).toBe(false);
-  });
-
-  it("hasAutoReloaded returns true when reading storage throws (fail toward not reloading)", () => {
-    vi.stubGlobal("sessionStorage", {
-      getItem: () => {
-        throw new Error("storage disabled");
-      },
-      setItem: () => {
-        throw new Error("storage disabled");
-      },
-    });
-    try {
-      expect(hasAutoReloaded()).toBe(true);
-    } finally {
-      vi.unstubAllGlobals();
-    }
-  });
-
-  it("hasAutoReloaded treats an unparseable stored timestamp as never-reloaded", () => {
-    sessionStorage.setItem(RELOAD_AT_KEY, "not-a-number");
-    expect(hasAutoReloaded(NOW)).toBe(false);
-  });
-
-  it("markAutoReloaded returns false when writing storage throws", () => {
-    vi.stubGlobal("sessionStorage", {
-      getItem: () => null,
-      setItem: () => {
-        throw new Error("storage disabled");
-      },
-    });
-    try {
-      expect(markAutoReloaded()).toBe(false);
-    } finally {
-      vi.unstubAllGlobals();
-    }
-  });
-
-  it("records and then takes a breadcrumb once (cleared on read)", () => {
-    recordReloadBreadcrumb({
-      path: "proactive",
-      serverVersion: "test-B",
-      clientVersion: "test-A",
-    });
-    const crumb = takeReloadBreadcrumb();
-    expect(crumb).toMatchObject({
-      path: "proactive",
-      serverVersion: "test-B",
-      clientVersion: "test-A",
-    });
-    expect(typeof crumb?.at).toBe("number");
-    // Cleared on read → a second take returns null.
-    expect(takeReloadBreadcrumb()).toBeNull();
-  });
-
-  it("takeReloadBreadcrumb returns null when nothing was recorded", () => {
-    expect(takeReloadBreadcrumb()).toBeNull();
-  });
-
-  it("recordReloadBreadcrumb swallows a storage-write error (diagnostics only)", () => {
-    vi.stubGlobal("sessionStorage", {
-      getItem: () => null,
-      setItem: () => {
-        throw new Error("storage disabled");
-      },
-      removeItem: () => {},
-    });
-    try {
-      expect(() =>
-        recordReloadBreadcrumb({ path: "chunk-boundary" }),
-      ).not.toThrow();
-    } finally {
-      vi.unstubAllGlobals();
-    }
-  });
-});
-
-// The pure window gate replaces the old one-shot flag: it must permit recovery
-// across several deploys in one tab (each > window apart) while still stopping an
-// infinite reload loop when a lazy chunk is permanently broken (a second failure
-// < window). Moved here from the chunk-load boundary now that it is the shared
-// guard both paths route through.
-describe("shouldAutoReload", () => {
-  const WINDOW = RELOAD_WINDOW_MS;
-
-  it("allows a reload when we have never auto-reloaded", () => {
-    expect(shouldAutoReload(NOW, null, WINDOW)).toBe(true);
-  });
-
-  it("allows a reload when the last one was 6 minutes ago (outside the window)", () => {
-    expect(shouldAutoReload(NOW, NOW - 6 * 60 * 1000, WINDOW)).toBe(true);
-  });
-
-  it("blocks a reload when the last one was 1 minute ago (inside the window)", () => {
-    expect(shouldAutoReload(NOW, NOW - 1 * 60 * 1000, WINDOW)).toBe(false);
-  });
-
-  it("blocks a reload exactly at the window boundary (not strictly older)", () => {
-    expect(shouldAutoReload(NOW, NOW - WINDOW, WINDOW)).toBe(false);
-  });
-
-  it("allows a reload when the stored timestamp is unparseable (NaN)", () => {
-    expect(shouldAutoReload(NOW, NaN, WINDOW)).toBe(true);
-  });
-});
@@ -1,121 +0,0 @@
-// Shared, window-based auto-reload budget.
-//
-// Both auto-reload paths — the reactive chunk-load-error-boundary (recovers
-// AFTER a stale lazy chunk 404s) and the proactive version-coherence feature
-// (reloads BEFORE the tab hits a stale chunk) — go through these functions so
-// they share ONE window-scoped reload budget: at most a single automatic
-// reload per RELOAD_WINDOW_MS across BOTH paths. A window (rather than a
-// permanent one-shot flag) lets a SECOND deploy in the same tab's lifetime
-// recover too, while a permanent skew, node oscillation, or a genuinely-missing
-// chunk still degrades to a manual banner/UI after the first reload instead of
-// looping. When sessionStorage is unavailable every mismatch degrades to the
-// manual UI — no unguarded reload.
-
-// sessionStorage key holding the epoch-ms timestamp of the last automatic reload
-// (shared by both paths).
-const RELOAD_AT_KEY = "chunk-reload-at";
-
-// Allow at most one automatic reload per this window. A stale-deploy 404 is cured
-// by a single reload, so anything inside the window is treated as a reload loop
-// (permanently-broken chunk / permanent skew) and falls through to the manual UI.
-export const RELOAD_WINDOW_MS = 5 * 60 * 1000;
-
-/**
- * Pure window decision, unit-tested in isolation: auto-reload only if we have
- * never auto-reloaded (lastReloadAt null/NaN) or the last one was strictly older
- * than the window. Anything inside the window is suppressed to break an infinite
- * reload loop.
- */
-export function shouldAutoReload(
-  now: number,
-  lastReloadAt: number | null,
-  windowMs: number,
-): boolean {
-  if (lastReloadAt === null || Number.isNaN(lastReloadAt)) return true;
-  return now - lastReloadAt > windowMs;
-}
-
-/**
- * Has an automatic reload already happened within the current window (so the
- * shared budget is spent right now)? Both paths check this before reloading; a
- * `true` return means fall through to the manual banner/UI instead of reloading.
- *
- * A storage read error (private mode / disabled) is reported as `true` so the
- * caller fails toward NOT reloading — an unguarded loop is worse than a stale
- * tab the user can reload manually. Note a window (not a permanent flag): once
- * the window elapses a later deploy's mismatch is allowed to reload again.
- */
-export function hasAutoReloaded(now: number = Date.now()): boolean {
-  try {
-    const raw = sessionStorage.getItem(RELOAD_AT_KEY);
-    const lastReloadAt = raw === null ? null : Number.parseInt(raw, 10);
-    return !shouldAutoReload(now, lastReloadAt, RELOAD_WINDOW_MS);
-  } catch {
-    return true;
-  }
-}
-
-/**
- * Stamp the shared window as consumed now — record that an automatic reload is
- * being performed within the current RELOAD_WINDOW_MS window.
- *
- * Returns whether the write succeeded. A `false` return (storage unavailable)
- * means the caller MUST NOT reload — otherwise the stamp would never stick and
- * the reload could loop.
- */
-export function markAutoReloaded(now: number = Date.now()): boolean {
-  try {
-    sessionStorage.setItem(RELOAD_AT_KEY, String(now));
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-// Diagnostic breadcrumb for an automatic reload. Written right before
-// window.location.reload() (which clears the console) and read back on the next
-// page load, so a "the tab reloaded itself / it's looping" field report is
-// diagnosable: which path fired (proactive version-coherence vs the reactive
-// chunk-load boundary) and which version pair triggered it. sessionStorage
-// survives a same-tab reload, unlike the console.
-const RELOAD_BREADCRUMB_KEY = "reload-breadcrumb";
-
-export type ReloadBreadcrumb = {
-  path: "proactive" | "chunk-boundary";
-  serverVersion?: string;
-  clientVersion?: string;
-  at: number;
-};
-
-/**
- * Persist a best-effort breadcrumb just before an automatic reload. Failures
- * (storage unavailable) are swallowed — this is diagnostics only and must never
- * block or alter the reload decision.
- */
-export function recordReloadBreadcrumb(
-  entry: Omit<ReloadBreadcrumb, "at">,
-): void {
-  try {
-    sessionStorage.setItem(
-      RELOAD_BREADCRUMB_KEY,
-      JSON.stringify({ ...entry, at: Date.now() }),
-    );
-  } catch {
-    // best-effort diagnostics only
-  }
-}
-
-/**
- * Read and clear the breadcrumb left by an auto-reload in the previous page
- * load. Cleared on read so it surfaces exactly once per reload.
- */
-export function takeReloadBreadcrumb(): ReloadBreadcrumb | null {
-  try {
-    const raw = sessionStorage.getItem(RELOAD_BREADCRUMB_KEY);
-    if (!raw) return null;
-    sessionStorage.removeItem(RELOAD_BREADCRUMB_KEY);
-    return JSON.parse(raw) as ReloadBreadcrumb;
-  } catch {
-    return null;
-  }
-}
@@ -36,7 +36,6 @@ const STATIC_ROUTES = new Set<string>([
  '/setup/register',
  '/settings/account/profile',
  '/settings/account/preferences',
-  '/settings/account/api-keys',
  '/settings/workspace',
  '/settings/ai',
  '/settings/members',
@@ -1,22 +0,0 @@
-import SettingsTitle from "@/components/settings/settings-title.tsx";
-import ApiKeysManager from "@/features/api-key/components/api-keys-manager";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
-import { useTranslation } from "react-i18next";
-
-export default function AccountApiKeys() {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <Helmet>
-        <title>
-          {t("API keys")} - {getAppName()}
-        </title>
-      </Helmet>
-      <SettingsTitle title={t("API keys")} />
-
-      <ApiKeysManager />
-    </>
-  );
-}
@@ -14,11 +14,9 @@
 */

 /*
- * Anchor the top toast containers to the very top edge of the viewport (a small
- * 8px gap), above the header/search chrome, per product request. The toast
- * (z-index 10000) therefore renders over the header/toolbar (both z-index 99)
- * for the few seconds it is visible — intentional, since it is the top-most,
- * in-the-line-of-sight surface.
+ * Push the top-anchored toast containers below the top chrome (fixed 45px
+ * header + optional 45px format toolbar + ~6px gap) so a toast (z-index 10000)
+ * neither covers nor intercepts clicks on the header/toolbar (both z-index 99).
 *
 * Scoped to [data-position^='top'] on purpose. Mantine renders ALL SIX position
 * containers simultaneously (`position` only routes toasts into one via the
@@ -36,7 +34,7 @@
 * (the :where() contributes 0), regardless of stylesheet order.
 */
 .mantine-Notifications-root[data-position^='top'] {
-  top: 8px;
+  top: 96px;
 }

 [data-mantine-color-scheme='light'] .mantine-Notification-root {
@@ -1,8 +1,7 @@
-import { defineConfig, loadEnv, type Plugin } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react";
 import { compression } from "vite-plugin-compression2";
 import * as path from "path";
-import * as fs from "node:fs";
 import { execSync } from "node:child_process";

 const envPath = path.resolve(process.cwd(), "..", "..");
@@ -25,32 +24,7 @@ function resolveAppVersion(cwd: string): string {
  }
 }

-// Emit <outDir>/version.json = { "version": appVersion } so the server can read
-// the exact same build id the bundle was compiled with. The value is the SAME
-// `appVersion` fed into `define.APP_VERSION`, so version.json and the baked-in
-// global are identical by construction — the single source of truth (no
-// runtime-env second copy that could drift and cause a false version mismatch).
-function versionJsonPlugin(version: string): Plugin {
-  let outDir = "dist";
-  return {
-    name: "emit-version-json",
-    apply: "build",
-    configResolved(config) {
-      outDir = config.build.outDir;
-    },
-    writeBundle() {
-      const root = path.resolve(process.cwd(), outDir);
-      fs.mkdirSync(root, { recursive: true });
-      fs.writeFileSync(
-        path.join(root, "version.json"),
-        JSON.stringify({ version }),
-      );
-    },
-  };
-}
-
 export default defineConfig(({ mode }) => {
-  const appVersion = resolveAppVersion(envPath);
  const {
    APP_URL,
    FILE_UPLOAD_SIZE_LIMIT,
@@ -78,11 +52,10 @@ export default defineConfig(({ mode }) => {
        POSTHOG_HOST,
        POSTHOG_KEY,
      },
-      APP_VERSION: JSON.stringify(appVersion),
+      APP_VERSION: JSON.stringify(resolveAppVersion(envPath)),
    },
    plugins: [
      react(),
-      versionJsonPlugin(appVersion),
      // Emit .br and .gz next to every built asset so the server can serve the
      // precompressed copy (see @fastify/static preCompressed in static.module.ts).
      compression({
@@ -63,15 +63,3 @@ vi.stubGlobal("matchMedia", (query: string) => ({
  removeEventListener: vi.fn(),
  dispatchEvent: vi.fn(),
 }));
-
-// Mantine's ScrollArea (used by Table.ScrollContainer, ScrollArea, etc.) reads
-// `ResizeObserver` in a layout effect on mount, which jsdom does not implement.
-// A no-op stub lets any test rendering those components mount cleanly.
-vi.stubGlobal(
-  "ResizeObserver",
-  class {
-    observe() {}
-    unobserve() {}
-    disconnect() {}
-  },
-);
@@ -23,7 +23,7 @@
    "migration:reset": "tsx src/database/migrate.ts down-to NO_MIGRATIONS",
    "migration:codegen": "kysely-codegen --dialect=postgres --camel-case --env-file=../../.env --out-file=./src/database/types/db.d.ts",
    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "pretest": "pnpm --filter @docmost/editor-ext build && pnpm --filter @docmost/prosemirror-markdown build && pnpm --filter @docmost/token-estimate build && pnpm --filter @docmost/mcp build",
+    "pretest": "pnpm --filter @docmost/editor-ext build && pnpm --filter @docmost/prosemirror-markdown build && pnpm --filter @docmost/token-estimate build",
    "test": "jest",
    "test:int": "jest --config test/jest-integration.json",
    "test:watch": "jest --watch",
@@ -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],
@@ -141,57 +141,7 @@ export function htmlToJson(html: string) {
  }
 }

-/**
- * Deterministic text-serializer overrides for the `format:"text"` page read
- * (#502). Non-text nodes render to a STABLE placeholder instead of their
- * (structure-dependent) inner text, so a machine diff of two text reads is
- * driven only by the page's actual prose — output stability across package
- * versions IS the contract (pinned by a snapshot test). Returning a string from
- * a `textSerializer` also stops `generateText` descending into the node, so a
- * table renders as ONE token rather than its flattened cell text.
- *
- * Only nodes with no meaningful flat-text form are overridden; every other node
- * (paragraph/heading/list/code/blockquote/callout/…) keeps its natural text so
- * a config written as markdown reads back byte-identical.
- */
-const TEXT_READ_SERIALIZERS: Record<string, (props: { node: any }) => string> =
-  {
-    // Image atom: no inner text -> a fixed placeholder.
-    image: () => '[image]',
-    // Table: `[table RxC]` where R = row count, C = the first row's cell count
-    // (a table's columns are uniform per the schema). Computed from the PM node,
-    // so it is independent of cell contents.
-    table: ({ node }) => {
-      const rows = node?.childCount ?? 0;
-      const cols = rows > 0 ? (node.child(0)?.childCount ?? 0) : 0;
-      return `[table ${rows}x${cols}]`;
-    },
-  };
-
-/**
- * Serialize a ProseMirror/TipTap document to plain text.
- *
- * Default (no options): the long-standing search-index behavior — bare
- * concatenated node text with `generateText`'s default `\n\n` block separator.
- * This feeds the page `textContent` tsvector and MUST NOT change.
- *
- * `deterministic:true` (#502 `format:"text"` page read): a flat, machine-diffable
- * rendering — one line per block (`\n` block separator; `hardBreak` already
- * serializes to `\n`), inline marks/anchors/autoformat dropped, and non-text
- * nodes replaced by the stable placeholders above (`[image]`, `[table RxC]`).
- */
-export function jsonToText(
-  // `any` (like jsonToHtml/jsonToMarkdown) so a loosely-typed DB `page.content`
-  // (JsonValue) can be passed straight through, as the controller does.
-  tiptapJson: any,
-  options?: { deterministic?: boolean },
-) {
-  if (options?.deterministic) {
-    return generateText(tiptapJson, tiptapExtensions, {
-      blockSeparator: '\n',
-      textSerializers: TEXT_READ_SERIALIZERS,
-    });
-  }
+export function jsonToText(tiptapJson: JSONContent) {
  return generateText(tiptapJson, tiptapExtensions);
 }

@@ -1,36 +1,10 @@
+export const HISTORY_INTERVAL = 5 * 60 * 1000;
+export const HISTORY_FAST_INTERVAL = 60 * 1000;
+export const HISTORY_FAST_THRESHOLD = 5 * 60 * 1000;
+
 // #348 — debounce window for the per-page RAG re-embed job. Repeated saves
 // within this window collapse to a single delayed job (coalesced by a stable
 // jobId), so active editing does not pile up expensive re-embeds (external API
 // + page_embeddings rewrite, concurrency 1). The worker reads the CURRENT page
 // state at run time, so the last content within the window wins.
 export const EMBED_DEBOUNCE_MS = 30 * 1000;
-
-/**
- * #370 — page-history intentionality tiers. Domain of `page_history.kind`.
- *   - 'manual' / 'agent'  → Tier 1 versions (intentional points)
- *   - 'idle' / 'boundary' → Tier 0 autosnapshots (safety net)
- * A legacy `null` kind is treated as an autosave.
- */
-export type PageHistoryKind = 'manual' | 'agent' | 'idle' | 'boundary';
-
-/**
- * #370 — trailing idle-flush windows. A page's pending idle snapshot is
- * re-armed on every store and fires this long after edits go quiet, so a burst
- * of edits collapses into a single autosnapshot instead of one-per-store. Human
- * sessions are noisier and less risky, so they flush less often than the agent.
- */
-export const IDLE_INTERVAL_USER = 60 * 60 * 1000; // 60m
-export const IDLE_INTERVAL_AGENT = 15 * 60 * 1000; // 15m
-
-/**
- * #370 — max-wait ceiling for the idle flush. Pure trailing debounce starves the
- * safety net: hocuspocus stores at least every ~45s, so a CONTINUOUS editing
- * session would re-arm the trailing timer forever and never take an idle
- * snapshot until edits finally go quiet (up to IDLE_INTERVAL_USER = 60m). This
- * ceiling bounds the actual wait from the FIRST edit of a burst, so an idle
- * snapshot fires at least this often during a long unbroken session — restoring
- * a recovery point cadence closer to the old heuristic without one-per-store
- * noise. Mirrors hocuspocus's own maxDebounce idea.
- */
-export const IDLE_MAX_WAIT_USER = 10 * 60 * 1000; // 10m
-export const IDLE_MAX_WAIT_AGENT = 5 * 60 * 1000; // 5m
@@ -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);
-    });
-  });
 });
@@ -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;

@@ -1,93 +1,84 @@
-import { computeHistoryJob, resolveSource } from './persistence.extension';
 import {
-  IDLE_INTERVAL_AGENT,
-  IDLE_INTERVAL_USER,
-  IDLE_MAX_WAIT_AGENT,
-  IDLE_MAX_WAIT_USER,
+  computeHistoryJob,
+  resolveSource,
+} from './persistence.extension';
+import {
+  HISTORY_FAST_INTERVAL,
+  HISTORY_FAST_THRESHOLD,
+  HISTORY_INTERVAL,
 } from '../constants';

+// A fixed clock + fixed createdAt make pageAge deterministic.
+const NOW = 1_700_000_000_000;
 const PAGE_ID = '550e8400-e29b-41d4-a716-446655440000';

-const page = { id: PAGE_ID };
+// Build a minimal page whose age (NOW - createdAt) is exactly `ageMs`.
+const pageAged = (ageMs: number) => ({
+  id: PAGE_ID,
+  createdAt: new Date(NOW - ageMs),
+});

-describe('computeHistoryJob (#370 — shared trailing idle pipeline)', () => {
-  it('human edit → user idle window, bare page.id job', () => {
-    // Humans and the agent now share ONE idle job per page (jobId = page.id).
-    // The agent's old delay=0 fast path is GONE — intentional agent points now
-    // arrive via the explicit save-version signal, not a zero-delay snapshot.
-    const { jobId, delay } = computeHistoryJob(page, 'user');
-    expect(delay).toBe(IDLE_INTERVAL_USER);
+describe('computeHistoryJob', () => {
+  it('agent edit → delay MUST be 0 and job id is source-keyed', () => {
+    // INVARIANT (§15 H2 / persistence.extension): the agent delay MUST stay 0.
+    // The worker re-reads the page row at run time, so any non-zero delay risks
+    // snapshotting content a later human edit has already overwritten. This is
+    // the load-bearing assertion of this spec — do not relax it.
+    const { jobId, delay } = computeHistoryJob(pageAged(0), 'agent', NOW);
+    expect(delay).toBe(0);
+    expect(jobId).toBe(`${PAGE_ID}-agent`);
+  });
+
+  it('agent edit on an OLD page is still delay 0 (age never applies to agents)', () => {
+    // Even when the page is far older than the fast threshold, the agent path
+    // must short-circuit to 0 — age-based debounce is a human-only concern.
+    const { jobId, delay } = computeHistoryJob(
+      pageAged(HISTORY_FAST_THRESHOLD + 60_000),
+      'agent',
+      NOW,
+    );
+    expect(delay).toBe(0);
+    expect(jobId).toBe(`${PAGE_ID}-agent`);
+  });
+
+  it('human edit on a YOUNG page (age < threshold) → fast interval, bare job id', () => {
+    const { jobId, delay } = computeHistoryJob(
+      pageAged(HISTORY_FAST_THRESHOLD - 1),
+      'user',
+      NOW,
+    );
+    expect(delay).toBe(HISTORY_FAST_INTERVAL);
    expect(jobId).toBe(PAGE_ID);
  });

-  it('agent edit → agent idle window (shorter), still the bare page.id job', () => {
-    const { jobId, delay } = computeHistoryJob(page, 'agent');
-    expect(delay).toBe(IDLE_INTERVAL_AGENT);
-    // No `-agent` suffix anymore: the agent joins the common idle pipeline.
+  it('human edit on an OLD page (age > threshold) → standard interval', () => {
+    const { jobId, delay } = computeHistoryJob(
+      pageAged(HISTORY_FAST_THRESHOLD + 1),
+      'user',
+      NOW,
+    );
+    expect(delay).toBe(HISTORY_INTERVAL);
    expect(jobId).toBe(PAGE_ID);
  });

-  it('agent flushes sooner than a human', () => {
-    expect(IDLE_INTERVAL_AGENT).toBeLessThan(IDLE_INTERVAL_USER);
+  it('boundary: pageAge EXACTLY === threshold takes the slow branch (the `<` is strict)', () => {
+    // Off-by-one guard: the condition is `pageAge < HISTORY_FAST_THRESHOLD`, so
+    // an age of exactly the threshold is NOT "fast" — it must use HISTORY_INTERVAL.
+    const { delay } = computeHistoryJob(
+      pageAged(HISTORY_FAST_THRESHOLD),
+      'user',
+      NOW,
+    );
+    expect(delay).toBe(HISTORY_INTERVAL);
  });

-  it('treats any non-"agent" source string as human (keys strictly on === agent)', () => {
-    const { jobId, delay } = computeHistoryJob(page, 'user');
-    expect(delay).toBe(IDLE_INTERVAL_USER);
+  it('treats any non-"agent" source string as human', () => {
+    // resolveSource only ever yields 'agent' | 'user', but guard the contract:
+    // the agent branch keys strictly on === 'agent'.
+    const { jobId, delay } = computeHistoryJob(pageAged(0), 'user', NOW);
+    expect(delay).toBe(HISTORY_FAST_INTERVAL);
    expect(jobId).toBe(PAGE_ID);
  });
-
-  // #370 review round-1 WARNING: the max-wait ceiling prevents autosnapshot
-  // starvation during a continuous editing session (the trailing timer would
-  // otherwise re-arm forever and never fire).
-  describe('max-wait ceiling', () => {
-    const T0 = 1_000_000; // arbitrary fixed epoch for deterministic tests
-
-    it('once a burst is armed, delay clamps to the remaining max-wait budget', () => {
-      // 1 minute into the burst the USER interval (60m) far exceeds the remaining
-      // max-wait budget (10m - 1m = 9m), so the delay is clamped DOWN to that
-      // remaining budget — the full interval is NOT used once a ceiling applies.
-      const { delay } = computeHistoryJob(page, 'user', T0, T0 + 60_000);
-      expect(delay).toBe(IDLE_MAX_WAIT_USER - 60_000);
-    });
-
-    it('never waits longer than the max-wait budget from the burst start', () => {
-      // A store arriving right at the ceiling → delay 0 (fire promptly).
-      const { delay } = computeHistoryJob(
-        page,
-        'user',
-        T0,
-        T0 + IDLE_MAX_WAIT_USER,
-      );
-      expect(delay).toBe(0);
-    });
-
-    it('past the ceiling never returns a negative delay', () => {
-      const { delay } = computeHistoryJob(
-        page,
-        'user',
-        T0,
-        T0 + IDLE_MAX_WAIT_USER + 5 * 60_000,
-      );
-      expect(delay).toBe(0);
-    });
-
-    it('the agent ceiling is shorter than the user ceiling', () => {
-      expect(IDLE_MAX_WAIT_AGENT).toBeLessThan(IDLE_MAX_WAIT_USER);
-      const { delay } = computeHistoryJob(
-        page,
-        'agent',
-        T0,
-        T0 + IDLE_MAX_WAIT_AGENT,
-      );
-      expect(delay).toBe(0);
-    });
-
-    it('without a burstStart there is no ceiling (backward-compatible)', () => {
-      expect(computeHistoryJob(page, 'user').delay).toBe(IDLE_INTERVAL_USER);
-      expect(computeHistoryJob(page, 'agent').delay).toBe(IDLE_INTERVAL_AGENT);
-    });
-  });
 });

 describe('resolveSource (truth table)', () => {
@@ -40,12 +40,11 @@ describe('PersistenceExtension.onStoreDocument — Approach-A boundary snapshot'
  let pageHistoryRepo: {
    saveHistory: jest.Mock;
    findPageLastHistory: jest.Mock;
-    updateHistoryKind: jest.Mock;
  };
  let aiQueue: { add: jest.Mock };
-  let historyQueue: { add: jest.Mock; remove: jest.Mock };
+  let historyQueue: { add: jest.Mock };
  let notificationQueue: { add: jest.Mock };
-  let collabHistory: { addContributors: jest.Mock; popContributors: jest.Mock };
+  let collabHistory: { addContributors: jest.Mock };
  let transclusionService: {
    syncPageTransclusions: jest.Mock;
    syncPageReferences: jest.Mock;
@@ -94,22 +93,13 @@ describe('PersistenceExtension.onStoreDocument — Approach-A boundary snapshot'
    pageHistoryRepo = {
      saveHistory: jest.fn().mockImplementation(async () => {
        callOrder.push('saveHistory');
-        return { id: 'history-1' };
      }),
      findPageLastHistory: jest.fn().mockResolvedValue(null),
-      updateHistoryKind: jest.fn().mockResolvedValue(undefined),
    };
    aiQueue = { add: jest.fn().mockResolvedValue(undefined) };
-    historyQueue = {
-      add: jest.fn().mockResolvedValue(undefined),
-      // #370 — enqueuePageHistory now removes any pending idle job before re-adding.
-      remove: jest.fn().mockResolvedValue(undefined),
-    };
+    historyQueue = { add: jest.fn().mockResolvedValue(undefined) };
    notificationQueue = { add: jest.fn().mockResolvedValue(undefined) };
-    collabHistory = {
-      addContributors: jest.fn().mockResolvedValue(undefined),
-      popContributors: jest.fn().mockResolvedValue([]),
-    };
+    collabHistory = { addContributors: jest.fn().mockResolvedValue(undefined) };
    transclusionService = {
      syncPageTransclusions: jest.fn().mockResolvedValue(undefined),
      syncPageReferences: jest.fn().mockResolvedValue(undefined),
@@ -175,50 +165,6 @@ describe('PersistenceExtension.onStoreDocument — Approach-A boundary snapshot'
    expect(pageRepo.updatePage.mock.calls[0][0].lastUpdatedSource).toBe('user');
  });

-  // #370 review round-1 SUGGESTION: the boundary was GENERALIZED from a
-  // user→agent special-case to ANY lastUpdatedSource transition. These pin the
-  // generalized behaviour it was rebuilt for.
-  describe('generalized boundary — any source transition', () => {
-    // Same persisted page but with an explicit prior source.
-    const pageWithPriorSource = (prior: string | null) => ({
-      ...persistedHumanPage('NEW CONTENT'),
-      lastUpdatedSource: prior,
-    });
-
-    it('agent→user transition fires the boundary (pins the prior agent revision)', async () => {
-      const document = ydocFor(doc('NEW CONTENT'));
-      pageRepo.findById.mockResolvedValue(pageWithPriorSource('agent'));
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue(null);
-
-      await ext.onStoreDocument(buildData(document, 'user') as any);
-
-      expect(pageHistoryRepo.saveHistory).toHaveBeenCalledTimes(1);
-      expect(callOrder).toEqual(['saveHistory', 'updatePage']);
-      expect(pageRepo.updatePage.mock.calls[0][0].lastUpdatedSource).toBe('user');
-    });
-
-    it('git→user transition fires the boundary (git-sync overwrite is a source change)', async () => {
-      const document = ydocFor(doc('NEW CONTENT'));
-      pageRepo.findById.mockResolvedValue(pageWithPriorSource('git'));
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue(null);
-
-      await ext.onStoreDocument(buildData(document, 'user') as any);
-
-      expect(pageHistoryRepo.saveHistory).toHaveBeenCalledTimes(1);
-      expect(callOrder).toEqual(['saveHistory', 'updatePage']);
-    });
-
-    it('a null prior source (first-ever edit) does NOT fire the boundary', async () => {
-      const document = ydocFor(doc('NEW CONTENT'));
-      pageRepo.findById.mockResolvedValue(pageWithPriorSource(null));
-
-      await ext.onStoreDocument(buildData(document, 'agent') as any);
-
-      expect(pageHistoryRepo.saveHistory).not.toHaveBeenCalled();
-      expect(pageRepo.updatePage).toHaveBeenCalledTimes(1);
-    });
-  });
-
  it('idempotency: unchanged content → no updatePage, no history, no queues', async () => {
    // The Y.Doc content equals the persisted content deeply → early skip.
    // A Y.Doc round-trip normalizes attrs (e.g. paragraph indent), so derive
@@ -533,278 +479,4 @@ describe('PersistenceExtension.onStoreDocument — Approach-A boundary snapshot'
    // Contributors keyed by the UUID so they match the PAGE_HISTORY job (page.id).
    expect(collabHistory.addContributors.mock.calls[0][0]).toBe(PAGE_ID);
  });
-
-  // #370 — explicit save-version (Cmd+S / agent save tool) over the stateless
-  // seam. The tier is derived from the SIGNED connection actor, the store path
-  // is reused, and promote-not-dup avoids duplicating heavy content rows.
-  describe('save-version (#370)', () => {
-    const emitSave = (document: any, actor: 'user' | 'agent') =>
-      ext.onStateless({
-        connection: {
-          readOnly: false,
-          context: { user: { id: USER_ID, name: 'Alice' }, actor },
-        } as any,
-        documentName: `page.${PAGE_ID}`,
-        document: document as any,
-        payload: JSON.stringify({ type: 'save-version' }),
-      } as any);
-
-    // findById returns a page whose content already equals the live doc, so the
-    // store path is a no-op and we isolate the versioning decision.
-    const pageMatchingDoc = (document: any) => ({
-      ...persistedHumanPage('IGNORED'),
-      content: TiptapTransformer.fromYdoc(document, 'default'),
-    });
-
-    it('human save with no prior snapshot → writes a manual version + broadcasts', async () => {
-      const document = ydocFor(doc('VERSION ME'));
-      pageRepo.findById.mockResolvedValue(pageMatchingDoc(document));
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue(null);
-
-      await emitSave(document, 'user');
-
-      expect(pageHistoryRepo.saveHistory).toHaveBeenCalledTimes(1);
-      expect(pageHistoryRepo.saveHistory.mock.calls[0][1]).toEqual(
-        expect.objectContaining({ kind: 'manual' }),
-      );
-      // The pending idle autosnapshot is cancelled by the explicit version.
-      expect(historyQueue.remove).toHaveBeenCalledWith(PAGE_ID);
-      const msg = JSON.parse(
-        (document as any).broadcastStateless.mock.calls[(document as any).broadcastStateless.mock.calls.length - 1][0],
-      );
-      expect(msg).toMatchObject({
-        type: 'version.saved',
-        kind: 'manual',
-        alreadySaved: false,
-      });
-    });
-
-    it('agent save derives kind=agent from the signed actor', async () => {
-      const document = ydocFor(doc('AGENT VERSION'));
-      pageRepo.findById.mockResolvedValue(pageMatchingDoc(document));
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue(null);
-
-      await emitSave(document, 'agent');
-
-      expect(pageHistoryRepo.saveHistory.mock.calls[pageHistoryRepo.saveHistory.mock.calls.length - 1][1]).toEqual(
-        expect.objectContaining({ kind: 'agent' }),
-      );
-    });
-
-    it('promote-not-dup: latest snapshot is an autosave with identical content → upgrades in place', async () => {
-      const document = ydocFor(doc('SAME'));
-      const page = pageMatchingDoc(document);
-      pageRepo.findById.mockResolvedValue(page);
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue({
-        id: 'auto-1',
-        content: page.content,
-        kind: 'idle',
-      });
-
-      await emitSave(document, 'user');
-
-      // No heavy new content row — the existing autosave is promoted to manual.
-      expect(pageHistoryRepo.updateHistoryKind).toHaveBeenCalledWith(
-        'auto-1',
-        'manual',
-        expect.anything(),
-      );
-      expect(pageHistoryRepo.saveHistory).not.toHaveBeenCalled();
-      const msg = JSON.parse(
-        (document as any).broadcastStateless.mock.calls[(document as any).broadcastStateless.mock.calls.length - 1][0],
-      );
-      expect(msg).toMatchObject({ historyId: 'auto-1', alreadySaved: false });
-    });
-
-    it('no-op when the latest snapshot is already a manual version of this content', async () => {
-      const document = ydocFor(doc('ALREADY SAVED'));
-      const page = pageMatchingDoc(document);
-      pageRepo.findById.mockResolvedValue(page);
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue({
-        id: 'ver-1',
-        content: page.content,
-        kind: 'manual',
-      });
-
-      await emitSave(document, 'user');
-
-      expect(pageHistoryRepo.updateHistoryKind).not.toHaveBeenCalled();
-      expect(pageHistoryRepo.saveHistory).not.toHaveBeenCalled();
-      const msg = JSON.parse(
-        (document as any).broadcastStateless.mock.calls[(document as any).broadcastStateless.mock.calls.length - 1][0],
-      );
-      expect(msg).toMatchObject({ alreadySaved: true, kind: 'manual' });
-    });
-
-    it('a read-only connection cannot save a version', async () => {
-      const document = ydocFor(doc('READER'));
-      pageRepo.findById.mockResolvedValue(pageMatchingDoc(document));
-
-      await ext.onStateless({
-        connection: {
-          readOnly: true,
-          context: { user: { id: USER_ID }, actor: 'user' },
-        } as any,
-        documentName: `page.${PAGE_ID}`,
-        document: document as any,
-        payload: JSON.stringify({ type: 'save-version' }),
-      } as any);
-
-      expect(pageHistoryRepo.saveHistory).not.toHaveBeenCalled();
-      expect(pageHistoryRepo.updateHistoryKind).not.toHaveBeenCalled();
-    });
-
-    // #370 F8-twin — a COMMIT abort (serialization/deadlock/conn-drop) rejects
-    // OUTSIDE the tx callback, AFTER the destructive popContributors (SPOP) and
-    // saveHistory ran but the INSERT rolled back. onStateless has no retry, so
-    // the outer catch MUST re-add (SADD) the popped set or attribution is lost
-    // irrecoverably. MUTATION: drop the outer catch → addContributors is never
-    // called → this reddens.
-    it('restores popped contributors when the commit aborts after the callback', async () => {
-      const document = ydocFor(doc('VERSION ME'));
-      pageRepo.findById.mockResolvedValue(pageMatchingDoc(document));
-      // No matching snapshot → fresh version branch → pops contributors.
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue(null);
-      collabHistory.popContributors.mockResolvedValue(['u1', 'u2']);
-
-      // A db whose commit REJECTS after the callback body resolved: the SPOP and
-      // saveHistory already ran, then the tx aborts. onStoreDocument's flush uses
-      // the same db but its content matches (no-op branch) and its own retry loop
-      // swallows the throw, so only the versioning tx exercises the restore.
-      const commitFailingDb = {
-        transaction: () => ({
-          execute: async (fn: (trx: any) => Promise<any>) => {
-            await fn(trxStub);
-            throw new Error('commit aborted (serialization_failure)');
-          },
-        }),
-      };
-      const ext2 = new PersistenceExtension(
-        pageRepo as any,
-        pageHistoryRepo as any,
-        commitFailingDb as any,
-        aiQueue as any,
-        historyQueue as any,
-        notificationQueue as any,
-        collabHistory as any,
-        transclusionService as any,
-      );
-      jest.spyOn(ext2['logger'], 'debug').mockImplementation(() => undefined);
-      jest.spyOn(ext2['logger'], 'warn').mockImplementation(() => undefined);
-      jest.spyOn(ext2['logger'], 'error').mockImplementation(() => undefined);
-
-      await expect(
-        ext2.onStateless({
-          connection: {
-            readOnly: false,
-            context: { user: { id: USER_ID, name: 'Alice' }, actor: 'user' },
-          } as any,
-          documentName: `page.${PAGE_ID}`,
-          document: document as any,
-          payload: JSON.stringify({ type: 'save-version' }),
-        } as any),
-      ).rejects.toThrow();
-
-      // Attribution preserved: the popped set is SADD-restored, keyed by the page
-      // UUID it was popped under.
-      expect(collabHistory.addContributors).toHaveBeenCalledWith(PAGE_ID, [
-        'u1',
-        'u2',
-      ]);
-    });
-
-    // #370 #260 — for a `page.<slugId>` document the idle job is armed under the
-    // page UUID (computeHistoryJob's jobId = page.id), so the supersede-remove
-    // must target page.id, not the raw slugId doc-name id, or it silently misses.
-    it('cancels the superseded idle job by the page UUID for a slugId doc', async () => {
-      const SLUG = 'slug-1'; // persistedHumanPage.slugId
-      const document = ydocFor(doc('VERSION ME'));
-      pageRepo.findById.mockResolvedValue(pageMatchingDoc(document));
-      pageHistoryRepo.findPageLastHistory.mockResolvedValue(null);
-
-      await ext.onStateless({
-        connection: {
-          readOnly: false,
-          context: { user: { id: USER_ID, name: 'Alice' }, actor: 'user' },
-        } as any,
-        documentName: `page.${SLUG}`,
-        document: document as any,
-        payload: JSON.stringify({ type: 'save-version' }),
-      } as any);
-
-      // remove() keyed by the UUID (the real jobId), never the slugId.
-      expect(historyQueue.remove).toHaveBeenCalledWith(PAGE_ID);
-      expect(historyQueue.remove).not.toHaveBeenCalledWith(SLUG);
-    });
-
-    // #370 F2 — an effectively-empty page is a REACHABLE no-op (agent calls
-    // save_page_version on a blank page): the version tx short-circuits with
-    // nothing to pin. The handler MUST still broadcast a TERMINAL reply
-    // (version.skipped, reason:'empty') so the client resolves at once instead of
-    // waiting out its 20s ack timeout and misreporting a healthy server as
-    // unreachable. MUTATION: drop the `else if (skipped)` broadcast → no terminal
-    // reply is sent → this reddens.
-    it('empty page → no version written, broadcasts a terminal version.skipped(empty)', async () => {
-      const emptyDoc = { type: 'doc', content: [{ type: 'paragraph' }] };
-      const document = ydocFor(emptyDoc);
-      pageRepo.findById.mockResolvedValue({
-        ...persistedHumanPage('IGNORED'),
-        content: emptyDoc,
-      });
-
-      await emitSave(document, 'agent');
-
-      // Nothing pinned.
-      expect(pageHistoryRepo.saveHistory).not.toHaveBeenCalled();
-      expect(pageHistoryRepo.updateHistoryKind).not.toHaveBeenCalled();
-      // But a terminal reply WAS sent so the client never times out. The flush
-      // (onStoreDocument) emits its own `page.updated`; the version.skipped is the
-      // LAST broadcast (dropping the skip branch leaves page.updated last → reds).
-      const calls = (document as any).broadcastStateless.mock.calls;
-      const msg = JSON.parse(calls[calls.length - 1][0]);
-      expect(msg).toEqual({ type: 'version.skipped', reason: 'empty' });
-    });
-
-    // #370 F2 — the page row is gone (deleted / never persisted). Same rule: a
-    // terminal reply MUST be sent (version.skipped, reason:'page-not-found') so the
-    // client surfaces a truthful "not found" immediately rather than a health
-    // timeout. onStoreDocument's own `!page` guard returns early without throwing,
-    // so the handler reaches the version tx and its `!page` skip branch.
-    it('page not found → broadcasts a terminal version.skipped(page-not-found)', async () => {
-      const document = ydocFor(doc('GONE'));
-      pageRepo.findById.mockResolvedValue(null);
-
-      await emitSave(document, 'agent');
-
-      expect(pageHistoryRepo.saveHistory).not.toHaveBeenCalled();
-      expect((document as any).broadcastStateless).toHaveBeenCalledTimes(1);
-      const msg = JSON.parse(
-        (document as any).broadcastStateless.mock.calls[0][0],
-      );
-      expect(msg).toEqual({ type: 'version.skipped', reason: 'page-not-found' });
-    });
-  });
-
-  // #370 — the in-memory idle-burst marker must be dropped on doc unload (like
-  // its sibling per-document maps) or it grows unbounded for every page that was
-  // edited but never manually saved. MUTATION: drop the afterUnloadDocument
-  // delete → the entry survives → this reddens.
-  describe('idleBurstStart housekeeping', () => {
-    it('afterUnloadDocument clears the idle-burst marker armed by a store', async () => {
-      const document = ydocFor(doc('EDIT'));
-      pageRepo.findById.mockResolvedValue(persistedHumanPage('EDIT'));
-
-      await ext.onStoreDocument(buildData(document, 'user') as any);
-
-      const map = ext['idleBurstStart'] as Map<string, number>;
-      // Keyed by documentName (buildData uses `page.${PAGE_ID}`).
-      expect(map.has(`page.${PAGE_ID}`)).toBe(true);
-
-      await ext.afterUnloadDocument({
-        documentName: `page.${PAGE_ID}`,
-      } as any);
-
-      expect(map.has(`page.${PAGE_ID}`)).toBe(false);
-    });
-  });
 });
@@ -37,11 +37,9 @@ import { Page } from '@docmost/db/types/entity.types';
 import { CollabHistoryService } from '../services/collab-history.service';
 import {
  EMBED_DEBOUNCE_MS,
-  IDLE_INTERVAL_AGENT,
-  IDLE_INTERVAL_USER,
-  IDLE_MAX_WAIT_AGENT,
-  IDLE_MAX_WAIT_USER,
-  PageHistoryKind,
+  HISTORY_FAST_INTERVAL,
+  HISTORY_FAST_THRESHOLD,
+  HISTORY_INTERVAL,
 } from '../constants';
 import { TransclusionService } from '../../core/page/transclusion/transclusion.service';
 import {
@@ -58,29 +56,6 @@ import { hasTransclusionFamilyNodes } from '../../core/page/transclusion/utils/t
 */
 export const INTENTIONAL_CLEAR_MESSAGE_TYPE = 'intentional-clear';

-/**
- * #370 — wire format of the client→server "save a version" signal. Sent by the
- * human (Cmd+S / Save button) and by the agent's explicit save tool over the
- * SAME stateless channel. The intentionality tier ('manual' vs 'agent') is
- * derived SERVER-SIDE from the signed connection actor, never from this
- * payload, so a version's type is unforgeable. The document is taken from the
- * connection (not the payload), so the signal cannot be aimed at another page.
- */
-export const SAVE_VERSION_MESSAGE_TYPE = 'save-version';
-
-/**
- * #370 F2 — wire format of the server→client REPLY to a save-version signal, sent
- * over the same stateless channel. `version.saved` means a version was created or
- * promoted; `version.skipped` is a TERMINAL "nothing was pinned" reply for the two
- * reachable no-op cases (an effectively-empty page, or the page row is gone) so the
- * client resolves at once instead of waiting out its ack timeout and misreporting a
- * healthy server as unreachable. EXACTLY ONE of these is broadcast per handled
- * save. The MCP client duplicates these literals (it cannot import server code) —
- * keep the two in sync (see packages/mcp/src/lib/collaboration.ts).
- */
-export const VERSION_SAVED_MESSAGE_TYPE = 'version.saved';
-export const VERSION_SKIPPED_MESSAGE_TYPE = 'version.skipped';
-
 /**
 * #251 — how long an intentional-clear signal stays "pending" before it is
 * ignored. The signal is set on the clearing keystroke but consumed by the
@@ -117,39 +92,35 @@ export function resolveSource(
 }

 /**
- * #370 — compute the BullMQ job id + delay for a page's trailing idle-flush
- * autosnapshot. Pure so the timing is unit-testable.
+ * Compute the BullMQ job id + delay for a page-history snapshot job. Pure so
+ * the data-loss-sensitive timing arithmetic is unit-testable; `now` is injected
+ * (caller passes `Date.now()`) for determinism.
 *
- * Both humans and the agent now share ONE idle pipeline (the agent's old
- * `delay=0` fast path is gone — intentional agent points arrive via the
- * explicit save-version signal instead). The job id is the bare `page.id`, so a
- * page has at most one pending idle job; the caller removes-and-re-adds it on
- * every store to keep it debounced to the trailing edge of an edit burst. The
- * window differs by source only: the agent flushes sooner than a human.
+ * - Agent edits: delay 0 and a source-keyed job id `${page.id}-agent`. The
+ *   delay MUST stay 0 — the worker re-reads the page row at run time, so any
+ *   delay risks reading content a later human edit has already overwritten
+ *   (mis-tagged snapshot). 0 minimizes that window. The `-agent` suffix keeps
+ *   the job from coalescing with the bare-page.id human job.
+ * - Human edits: age-based debounce so rapid human edits coalesce into one
+ *   snapshot; job id is the bare `page.id`.
+ *
+ * BullMQ forbids ':' in custom job ids (Redis key separator), so '-' is used;
+ * page.id is a UUID, so `${page.id}-agent` cannot collide with a human job.
 */
 export function computeHistoryJob(
-  page: Pick<Page, 'id'>,
+  page: Pick<Page, 'id' | 'createdAt'>,
  source: string,
-  // Epoch ms of the FIRST edit in the current burst (when the pending idle job
-  // was first armed). Used to enforce the max-wait ceiling so a continuous
-  // editing session cannot re-arm the trailing timer forever. `now` is injectable
-  // for tests; both default to a live clock / no ceiling when omitted.
-  burstStart?: number,
-  now: number = Date.now(),
+  now: number,
 ): { jobId: string; delay: number } {
  const isAgent = source === 'agent';
-  const interval = isAgent ? IDLE_INTERVAL_AGENT : IDLE_INTERVAL_USER;
-  const maxWait = isAgent ? IDLE_MAX_WAIT_AGENT : IDLE_MAX_WAIT_USER;
-
-  let delay = interval;
-  if (burstStart !== undefined) {
-    // Time already elapsed since the burst's first edit; the snapshot must fire
-    // no later than `maxWait` after that, so shrink the trailing delay to the
-    // remaining budget (never negative, so BullMQ fires it promptly).
-    const remaining = burstStart + maxWait - now;
-    delay = Math.max(0, Math.min(interval, remaining));
-  }
-  return { jobId: page.id, delay };
+  const pageAge = now - new Date(page.createdAt).getTime();
+  const delay = isAgent
+    ? 0
+    : pageAge < HISTORY_FAST_THRESHOLD
+      ? HISTORY_FAST_INTERVAL
+      : HISTORY_INTERVAL;
+  const jobId = isAgent ? `${page.id}-agent` : page.id;
+  return { jobId, delay };
 }

@Injectable()
@@ -161,28 +132,6 @@ export class PersistenceExtension implements Extension {
  // coalescing window" per document and OR it across all edits in the window,
  // so the snapshot is marked 'agent' regardless of who wrote last.
  private agentTouched: Map<string, boolean> = new Map();
-  // #370 — epoch ms of the FIRST edit in the current idle-flush burst. Keyed by
-  // documentName (like its sibling per-document maps above), NOT by page.id, so
-  // it can be cleaned in afterUnloadDocument alongside `contributors` /
-  // `agentTouched` / `intentionalClear` when the doc unloads — otherwise any page
-  // that was edited but never manually saved (the common case) would keep its
-  // entry forever and the Map would grow unbounded in this long-lived process.
-  // Set when the pending idle job is first armed (empty entry), read to enforce
-  // the max-wait ceiling in computeHistoryJob, and cleared on doc unload or when
-  // a manual save cancels the idle job so the next burst starts a fresh window.
-  //
-  // Single-process assumption (like `contributors` / `agentTouched` above): this
-  // lives only in THIS collab process's memory. A restart, or a page's ownership
-  // moving to another node, loses the burst-start marker. Consequence: a burst
-  // that spans the restart looks like a fresh burst to the surviving process, so
-  // its max-wait ceiling is re-anchored to the first post-restart edit — a single
-  // continuous session straddling a restart can therefore wait up to ~2× the cap
-  // for its idle snapshot (once for the lost pre-restart window, once for the new
-  // one). Bounded and benign (it only DELAYS a safety-net autosnapshot; manual
-  // saves are unaffected and the next quiet period always flushes), but the
-  // assumption and its consequence are recorded here so no one mistakes the
-  // in-memory marker for a durable, cross-process guarantee.
-  private idleBurstStart: Map<string, number> = new Map();
  // #251 — per-document "intentional clear pending" flags. Keyed by
  // documentName, value = expiry timestamp (ms). Set by onStateless when the
  // client reports a deliberate clear; consumed once by the next
@@ -414,19 +363,20 @@ export class PersistenceExtension implements Extension {
            //this.logger.debug('Contributors error:' + err?.['message']);
          }

-          // #370 — boundary snapshot on ANY source transition. When the store
-          // flips the page's provenance (user↔agent↔git), pin the OUTGOING
-          // state as its own history version BEFORE the incoming source
-          // overwrites it. `page` still holds the OLD content/provenance here,
-          // so saveHistory(page) captures the pre-transition state tagged with
-          // its own source, kind='boundary'. The incoming content is snapshotted
-          // later by the debounced idle job. Skip if the page is effectively
-          // empty or if the latest existing snapshot already equals this state
-          // (the shared isDeepStrictEqual gate — avoids duplicates). Generalizing
-          // beyond the old user→agent special-case also covers git-sync for free.
+          // Approach A — boundary snapshot before the agent's first edit.
+          // When this store is the agent's and the page's currently persisted
+          // state was authored by a human, pin that human state as its own
+          // history version BEFORE the agent overwrites it. `page` still holds
+          // the OLD content/provenance here, so saveHistory(page) captures the
+          // pre-agent state tagged 'user'. The agent's new content is
+          // snapshotted later by the debounced PAGE_HISTORY job ('agent'). Skip
+          // if the prior state is already agent-authored (boundary already
+          // pinned on the user->agent transition), if the page is effectively
+          // empty, or if the latest existing snapshot already equals this human
+          // state (avoid duplicates).
          if (
-            page.lastUpdatedSource &&
-            page.lastUpdatedSource !== lastUpdatedSource
+            lastUpdatedSource === 'agent' &&
+            page.lastUpdatedSource !== 'agent'
          ) {
            // pageHistory.pageId is uuid-typed; use page.id (never the doc-name
            // slugId) so a `page.<slugId>` doc cannot throw 22P02 here (#260).
@@ -434,13 +384,15 @@ export class PersistenceExtension implements Extension {
              page.id,
              { includeContent: true, trx },
            );
-            const baselineMissing =
+            const humanBaselineMissing =
              !lastHistory ||
              !isDeepStrictEqual(lastHistory.content, page.content);
-            if (!isEmptyParagraphDoc(page.content as any) && baselineMissing) {
+            if (
+              !isEmptyParagraphDoc(page.content as any) &&
+              humanBaselineMissing
+            ) {
              await this.pageHistoryRepo.saveHistory(page, {
                contributorIds: page.contributorIds ?? undefined,
-                kind: 'boundary',
                trx,
              });
            }
@@ -570,7 +522,7 @@ export class PersistenceExtension implements Extension {
        { jobId: `embed-${page.id}`, delay: EMBED_DEBOUNCE_MS },
      );

-      await this.enqueuePageHistory(page, documentName, lastUpdatedSource);
+      await this.enqueuePageHistory(page, lastUpdatedSource);
    }

    // #402 — report the serialized size for the store histogram's size_bucket.
@@ -602,14 +554,6 @@ export class PersistenceExtension implements Extension {
      return; // unrelated / malformed stateless message
    }

-    // #370 — explicit "save a version" (human Cmd+S / agent save tool). Edit
-    // rights are already enforced by the readOnly reject above (a reader can't
-    // create a version), exactly as intentional-clear requires.
-    if (message?.type === SAVE_VERSION_MESSAGE_TYPE) {
-      await this.handleSaveVersion(data);
-      return;
-    }
-
    if (message?.type !== INTENTIONAL_CLEAR_MESSAGE_TYPE) return;

    this.intentionalClear.set(
@@ -618,184 +562,6 @@ export class PersistenceExtension implements Extension {
    );
  }

-  /**
-   * #370 — persist an intentional version from the live in-memory ydoc.
-   *
-   * One stateless path serves BOTH the human and the agent; the tier is derived
-   * SERVER-SIDE from the signed connection actor ('agent' → 'agent', anything
-   * else → 'manual'), so the version type cannot be spoofed by the client. We
-   * take the fresh ydoc from the collab process memory and run it through the
-   * EXISTING store path first (so pages.content/ydoc reflect the exact content
-   * being versioned — a REST endpoint would race the up-to-10s-stale page row),
-   * then snapshot it into page_history with the intentional kind.
-   *
-   * Promote-not-dup: if the latest history row already holds this exact content
-   * and it is an autosave (idle/boundary/legacy-null), upgrade its kind in place
-   * instead of duplicating a heavy content row; if it is already 'manual', it is
-   * a no-op (the client shows an "already saved" toast). Otherwise a fresh
-   * version row is written, popping the aggregated contributors from Redis.
-   */
-  private async handleSaveVersion(data: onStatelessPayload): Promise<void> {
-    const { connection, document, documentName } = data;
-    const context = connection?.context;
-    const pageId = getPageId(documentName);
-    // Unforgeable: 'agent' only for a signed agent connection, else 'manual'.
-    const kind: PageHistoryKind =
-      context?.actor === 'agent' ? 'agent' : 'manual';
-
-    // Flush the live ydoc through the normal store path so the page row + ydoc
-    // hold exactly what we are about to version (also fires the idle enqueue we
-    // supersede below, plus any source-transition boundary). onStoreDocument
-    // only needs document/documentName/context.
-    await this.onStoreDocument({
-      document,
-      documentName,
-      context,
-    } as onStoreDocumentPayload);
-
-    let result:
-      | { historyId: string; kind: PageHistoryKind; alreadySaved: boolean }
-      | undefined;
-    // #370 F2 — set when there is nothing to version (empty page / page gone), so
-    // the tail broadcasts a terminal `version.skipped` instead of staying silent
-    // and forcing the client to time out. Mutually exclusive with `result`.
-    let skipped: 'empty' | 'page-not-found' | undefined;
-
-    // #370 F8-twin — the contributor set popped from Redis (destructive SPOP)
-    // must be restored if the version row does not durably land. The inner
-    // try/catch below only covers a throw INSIDE the callback; but executeTx
-    // COMMITS after the callback, so a commit-abort (serialization/deadlock/
-    // connection drop — the transient class the epic retries in the processor)
-    // rejects OUTSIDE the callback, after saveHistory already ran and the SPOP
-    // already happened, while the INSERT rolls back. onStateless does NOT retry,
-    // so an unrestored pop is a one-shot irrecoverable attribution loss (the
-    // processor got exactly this fix: poppedForRestore + an outer catch). We
-    // track the popped set here (keyed by the page UUID it was popped by — never
-    // the doc-name id, which may be a slugId, #260) and restore it in the outer
-    // catch. addContributors is an idempotent Redis SADD, so a double-restore is
-    // harmless. versionedPageId is also reused below to remove the superseded
-    // idle job by its real jobId (page.id).
-    let poppedForRestore: string[] = [];
-    let versionedPageId: string | undefined;
-
-    try {
-      await executeTx(this.db, async (trx) => {
-        const page = await this.pageRepo.findById(pageId, {
-          withLock: true,
-          includeContent: true,
-          trx,
-        });
-        if (!page) {
-          // The page row is gone (deleted/never persisted). Nothing to version —
-          // record it so the tail sends a terminal skip reply (#370 F2).
-          skipped = 'page-not-found';
-          return;
-        }
-        versionedPageId = page.id;
-        // Never version an effectively-empty page (mirrors the processor's
-        // first-history guard); there is nothing intentional to pin. Record the
-        // skip so the client gets a terminal reply rather than a timeout (#370 F2).
-        if (isEmptyParagraphDoc(page.content as any)) {
-          skipped = 'empty';
-          return;
-        }
-
-        const lastHistory = await this.pageHistoryRepo.findPageLastHistory(
-          page.id,
-          { includeContent: true, trx },
-        );
-
-        if (
-          lastHistory &&
-          isDeepStrictEqual(lastHistory.content, page.content)
-        ) {
-          // Content is already snapshotted. Promote-not-dup.
-          if (lastHistory.kind === 'manual') {
-            result = {
-              historyId: lastHistory.id,
-              kind: 'manual',
-              alreadySaved: true,
-            };
-            return;
-          }
-          await this.pageHistoryRepo.updateHistoryKind(
-            lastHistory.id,
-            kind,
-            trx,
-          );
-          result = { historyId: lastHistory.id, kind, alreadySaved: false };
-          return;
-        }
-
-        // Fresh version row. Pop the contributors aggregated since the last
-        // snapshot (SPOP); restore them if the write fails so they aren't lost.
-        const contributorIds = await this.collabHistory.popContributors(
-          page.id,
-        );
-        poppedForRestore = contributorIds;
-        try {
-          const saved = await this.pageHistoryRepo.saveHistory(page, {
-            contributorIds,
-            kind,
-            trx,
-          });
-          result = { historyId: saved.id, kind, alreadySaved: false };
-        } catch (err) {
-          await this.collabHistory.addContributors(page.id, contributorIds);
-          poppedForRestore = [];
-          throw err;
-        }
-      });
-    } catch (err) {
-      // A throw here means the tx did NOT commit (callback threw, or the commit
-      // itself failed and rolled back). If we popped contributors and the inner
-      // catch did not already restore them, restore now so attribution is not
-      // lost — onStateless has no retry to recover it. Restore by the page UUID
-      // the pop was keyed under (versionedPageId is always set before the pop).
-      if (poppedForRestore.length && versionedPageId) {
-        await this.collabHistory.addContributors(
-          versionedPageId,
-          poppedForRestore,
-        );
-      }
-      throw err;
-    }
-
-    // Housekeeping: this explicit version supersedes the page's pending idle
-    // autosnapshot, so cancel it and end the current idle burst so the next edit
-    // starts a fresh max-wait window. Remove the idle job by its REAL jobId
-    // (page.id UUID — computeHistoryJob arms it under page.id), not the raw
-    // doc-name id which may be a slugId for a `page.<slugId>` doc (#260), or the
-    // remove silently misses. The burst marker is keyed by documentName (like its
-    // sibling per-document maps), and is also cleaned in afterUnloadDocument.
-    if (versionedPageId) {
-      await this.historyQueue.remove(versionedPageId).catch(() => undefined);
-    }
-    this.idleBurstStart.delete(documentName);
-
-    // EXACTLY ONE terminal reply per handled save (#370 F2): a real save/promote
-    // broadcasts `version.saved`; the two no-op early returns (empty page / page
-    // gone) broadcast `version.skipped` so the client never waits out its ack
-    // timeout. A genuine failure threw above and rejected before reaching here.
-    if (result) {
-      document.broadcastStateless(
-        JSON.stringify({
-          type: VERSION_SAVED_MESSAGE_TYPE,
-          historyId: result.historyId,
-          kind: result.kind,
-          alreadySaved: result.alreadySaved,
-        }),
-      );
-    } else if (skipped) {
-      document.broadcastStateless(
-        JSON.stringify({
-          type: VERSION_SKIPPED_MESSAGE_TYPE,
-          reason: skipped,
-        }),
-      );
-    }
-  }
-
  async onChange(data: onChangePayload) {
    const documentName = data.documentName;
    const userId = data.context?.user?.id;
@@ -820,10 +586,6 @@ export class PersistenceExtension implements Extension {
    this.contributors.delete(documentName);
    this.agentTouched.delete(documentName);
    this.intentionalClear.delete(documentName);
-    // #370 — drop the idle-burst marker with the other per-document maps so it
-    // cannot accumulate across the process lifetime for never-manually-saved
-    // pages. The pending idle job (if any) is a self-expiring BullMQ delayed job.
-    this.idleBurstStart.delete(documentName);
  }

  private consumeContributors(documentName: string): string[] {
@@ -855,80 +617,19 @@ export class PersistenceExtension implements Extension {

  private async enqueuePageHistory(
    page: Page,
-    documentName: string,
    lastUpdatedSource: string,
  ): Promise<void> {
-    // #370 — trailing idle debounce with a max-wait ceiling. One pending idle
-    // job per page (jobId = page.id); on every store we remove the pending
-    // delayed job and re-add it, so the snapshot lands `delay` after edits go
-    // quiet rather than once per store (precedent: workspace.service.ts).
-    // remove() on a delayed job simply deletes it (0 if absent, no throw); if the
-    // job is already ACTIVE and the remove is a no-op, the add still de-dups and
-    // the processor's isDeepStrictEqual gate collapses the duplicate content.
-    //
-    // The FIRST arm of a burst records `burstStart`; computeHistoryJob shrinks
-    // the delay to the remaining max-wait budget from that point, so a continuous
-    // session cannot re-arm the trailing timer forever and starve the snapshot.
-    // A burst marker older than THIS TIER's max-wait means the previous idle job
-    // has already fired — start a fresh window instead of firing immediately on
-    // the next edit. Must use the SAME source-specific max-wait computeHistoryJob
-    // uses (agent 5m / user 10m): a hardcoded USER ceiling would leave an agent
-    // burst's marker stale for 5..10m, forcing delay=0 on every store in that
-    // window and writing one idle row per store — exactly the per-store bloat the
-    // debounce exists to prevent, on the continuous-agent path.
-    const maxWait =
-      lastUpdatedSource === 'agent' ? IDLE_MAX_WAIT_AGENT : IDLE_MAX_WAIT_USER;
-    const now = Date.now();
-    // Keyed by documentName (see the map declaration) so afterUnloadDocument can
-    // clean it; the queue jobId stays page.id (computeHistoryJob) as required.
-    let burstStart = this.idleBurstStart.get(documentName);
-    if (burstStart === undefined || now - burstStart >= maxWait) {
-      burstStart = now;
-      this.idleBurstStart.set(documentName, burstStart);
-    }
-
+    // Job id + delay arithmetic lives in the pure `computeHistoryJob` (see its
+    // doc comment for the agent-delay-0 / age-based-debounce invariants).
    const { jobId, delay } = computeHistoryJob(
      page,
      lastUpdatedSource,
-      burstStart,
-      now,
+      Date.now(),
    );

-    // remove-then-add trailing-debounce idiom, and its ONE race. We delete the
-    // pending delayed job and re-add it under the same jobId so the timer resets
-    // to the trailing edge of the burst. The race is the small window between
-    // these two awaits: if the delayed job's `delay` elapses in that gap it goes
-    // ACTIVE, and then:
-    //   - remove() on an active/locked job is a no-op (BullMQ won't yank a job a
-    //     worker holds), and our `.catch(() => undefined)` swallows that too; and
-    //   - add() with a jobId that already exists (the now-active job's id) is
-    //     DROPPED by BullMQ — a duplicate add is a no-op.
-    // So this store fails to re-arm the trailing job: the just-fired snapshot
-    // captured content up to the moment it went active, and THIS edit is left
-    // without a pending trailing job. It is bounded and self-healing — the NEXT
-    // store re-arms a fresh delayed job (the id is free again once the active job
-    // completes / removeOnComplete frees it), and the processor's
-    // isDeepStrictEqual gate collapses any content-identical duplicate. The only
-    // uncovered case is when the racing store was the LAST in the session: the
-    // tail edits made after the job went active get NO trailing snapshot until
-    // the next edit re-arms one. That is an acceptable safety-net gap (a manual
-    // Save, a source-transition boundary, or simply the next edit all still cover
-    // it), which is why the reviewer accepts documenting it here rather than
-    // adding a post-add "did the add actually arm a job?" re-check.
-    //
-    // NOTE — do NOT "unify" this with the neighbouring embed-debounce idiom
-    // (aiQueue.add of PAGE_CONTENT_UPDATED above): that one uses a STABLE jobId
-    // and NO remove(), relying purely on BullMQ coalescing a repeated add under
-    // the same id, because a re-embed only needs to eventually run once on the
-    // latest content and re-anchoring its delay on every keystroke is undesirable.
-    // THIS idiom deliberately removes-then-adds precisely to PUSH the delay back
-    // to the trailing edge on every store (a true debounce), which coalescing
-    // alone cannot do. Collapsing them would silently change the history cadence.
-    await this.historyQueue.remove(jobId).catch(() => undefined);
-
    await this.historyQueue.add(
      QueueJob.PAGE_HISTORY,
-      { pageId: page.id, kind: 'idle' } as IPageHistoryJob,
+      { pageId: page.id } as IPageHistoryJob,
      { jobId, delay },
    );
  }
@@ -1,116 +0,0 @@
-import { jsonToText } from './collaboration.util';
-
-// #502 READ contract: `jsonToText(json, { deterministic: true })` — the flat,
-// machine-diffable text rendering behind getPage `format:"text"`. Block-per-line
-// (`\n` separator), inline marks/anchors dropped, hardBreak -> `\n`, and non-text
-// nodes replaced by STABLE placeholders (`[image]`, `[table RxC]`). Output
-// stability across package versions IS the contract, so it is pinned by a
-// snapshot below. The DEFAULT (no options) path is the search-index serializer
-// and MUST be unchanged — asserted separately.
-
-const doc = (...content: any[]) => ({ type: 'doc', content });
-const para = (...content: any[]) => ({ type: 'paragraph', content });
-const text = (t: string, marks?: any[]) =>
-  marks ? { type: 'text', text: t, marks } : { type: 'text', text: t };
-
-describe('jsonToText — default (search index) behavior is unchanged', () => {
-  it('uses the `\\n\\n` block separator and drops non-text nodes to empty', () => {
-    const d = doc(para(text('alpha')), para(text('beta')));
-    expect(jsonToText(d)).toBe('alpha\n\nbeta');
-  });
-
-  it('an image contributes no text in the default (tsvector) mode', () => {
-    const d = doc(para(text('cap')), { type: 'image', attrs: { src: 's' } });
-    // No `[image]` placeholder leaks into the search index.
-    expect(jsonToText(d)).not.toContain('[image]');
-  });
-});
-
-describe('jsonToText — deterministic:true (getPage format:"text")', () => {
-  it('renders one line per block with `\\n` separators, marks dropped', () => {
-    const d = doc(
-      { type: 'heading', attrs: { level: 2 }, content: [text('Title')] },
-      para(
-        text('hello ', [{ type: 'bold' }]),
-        text('world', [{ type: 'italic' }]),
-      ),
-    );
-    expect(jsonToText(d, { deterministic: true })).toBe('Title\nhello world');
-  });
-
-  it('a hardBreak renders as a newline', () => {
-    const d = doc(para(text('a'), { type: 'hardBreak' }, text('b')));
-    expect(jsonToText(d, { deterministic: true })).toBe('a\nb');
-  });
-
-  it('an image node -> the stable `[image]` placeholder', () => {
-    const d = doc(para(text('before')), { type: 'image', attrs: { src: 's' } });
-    expect(jsonToText(d, { deterministic: true })).toBe('before\n[image]');
-  });
-
-  it('a table -> `[table RxC]` (rows x columns) and its cell text is NOT flattened in', () => {
-    const cell = (t: string) => ({
-      type: 'tableCell',
-      content: [para(text(t))],
-    });
-    const row = (...cells: any[]) => ({ type: 'tableRow', content: cells });
-    const table = {
-      type: 'table',
-      content: [
-        row(cell('CELLONE'), cell('CELLTWO'), cell('CELLTHREE')),
-        row(cell('CELLFOUR'), cell('CELLFIVE'), cell('CELLSIX')),
-      ],
-    };
-    const d = doc(para(text('grid:')), table);
-    const out = jsonToText(d, { deterministic: true });
-    expect(out).toBe('grid:\n[table 2x3]');
-    expect(out).not.toContain('CELL'); // cell text is not flattened into the read
-  });
-
-  it('SNAPSHOT: a mixed document renders to a stable, deterministic string', () => {
-    const cell = (t: string) => ({
-      type: 'tableCell',
-      content: [para(text(t))],
-    });
-    const d = doc(
-      { type: 'heading', attrs: { level: 1 }, content: [text('Config')] },
-      para(text('key = ', [{ type: 'bold' }]), text('value')),
-      {
-        type: 'bulletList',
-        content: [
-          { type: 'listItem', content: [para(text('one'))] },
-          { type: 'listItem', content: [para(text('two'))] },
-        ],
-      },
-      { type: 'image', attrs: { src: 's' } },
-      {
-        type: 'table',
-        content: [{ type: 'tableRow', content: [cell('x'), cell('y')] }],
-      },
-    );
-    expect(jsonToText(d, { deterministic: true })).toMatchInlineSnapshot(`
-     "Config
-     key = value
-
-
-     one
-
-     two
-     [image]
-     [table 1x2]"
-    `);
-  });
-
-  it('SCENARIO: a config written as a code block reads back byte-identical (diff empty)', () => {
-    const config =
-      'export TICKET_LIFETIME=$2592000\nservers:\n  - www.internal.host';
-    const d = doc({
-      type: 'codeBlock',
-      attrs: { language: 'yaml' },
-      content: [text(config)],
-    });
-    // The code block is one block; its text (dollars, bare domain, newlines) is
-    // preserved verbatim, so a read-as-text of a stored config diffs empty.
-    expect(jsonToText(d, { deterministic: true })).toBe(config);
-  });
-});
@@ -66,15 +66,6 @@ describe('HistoryProcessor.process', () => {
    notificationQueue = { add: jest.fn().mockResolvedValue(undefined) };
    generalQueue = { add: jest.fn().mockResolvedValue(undefined) };

-    // #370 F3 — the processor now serializes its find+save under a page-row lock
-    // via executeTx. A db whose transaction().execute(fn) runs fn with a trx stub
-    // drives the real executeTx() helper without a database.
-    const db = {
-      transaction: () => ({
-        execute: (fn: (trx: any) => Promise<any>) => fn({ __trx: true }),
-      }),
-    };
-
    // WorkerHost's constructor reads `this.worker`; passing repos positionally
    // matches the constructor and avoids the Nest DI container.
    proc = new HistoryProcessor(
@@ -82,7 +73,6 @@ describe('HistoryProcessor.process', () => {
      pageRepo as any,
      collabHistory as any,
      watcherService as any,
-      db as any,
      notificationQueue as any,
      generalQueue as any,
    );
@@ -136,26 +126,15 @@ describe('HistoryProcessor.process', () => {
    await proc.process(buildJob());

    expect(collabHistory.popContributors).toHaveBeenCalledWith(PAGE_ID);
-    // #370 F3/F9 — the snapshot decision runs under a page-row lock. Pin the lock
-    // structurally so a refactor that drops withLock/trx (silently reintroducing
-    // the TOCTOU double-insert) turns this red. The tx stub is { __trx: true }.
-    expect(pageRepo.findById).toHaveBeenCalledWith(
-      PAGE_ID,
-      expect.objectContaining({ withLock: true, trx: { __trx: true } }),
-    );
-    // #370 F7 — addPageWatchers MUST receive the trx, or its FK-check runs on a
-    // separate connection and self-deadlocks against our FOR UPDATE. Asserting
-    // the trx arg here is exactly what would have caught that regression.
    expect(watcherService.addPageWatchers).toHaveBeenCalledWith(
      ['u1', 'u2'],
      PAGE_ID,
      SPACE_ID,
      WORKSPACE_ID,
-      { __trx: true },
    );
    expect(pageHistoryRepo.saveHistory).toHaveBeenCalledWith(
      expect.objectContaining({ id: PAGE_ID }),
-      { contributorIds: ['u1', 'u2'], kind: 'idle', trx: { __trx: true } },
+      { contributorIds: ['u1', 'u2'] },
    );
    expect(generalQueue.add).toHaveBeenCalledWith(
      QueueJob.PAGE_BACKLINKS,
@@ -207,48 +186,6 @@ describe('HistoryProcessor.process', () => {
    ]);
  });

-  it('COMMIT failure (throw outside the tx callback) → contributors RESTORED', async () => {
-    // #370 F8 — a commit-time failure throws OUTSIDE the callback, so the inner
-    // try/catch does not run; the outer catch must restore the popped set (else a
-    // BullMQ retry writes an unattributed version). Use a db whose execute() runs
-    // the callback THEN throws, simulating a commit abort.
-    pageHistoryRepo.findPageLastHistory.mockResolvedValue({
-      content: { type: 'doc', content: [] },
-    });
-    const commitFail = {
-      transaction: () => ({
-        execute: async (fn: (trx: any) => Promise<any>) => {
-          await fn({ __trx: true }); // callback succeeds (saveHistory ok)
-          throw new Error('commit aborted'); // ...but the COMMIT fails
-        },
-      }),
-    };
-    const procCommitFail = new HistoryProcessor(
-      pageHistoryRepo as any,
-      pageRepo as any,
-      collabHistory as any,
-      watcherService as any,
-      commitFail as any,
-      notificationQueue as any,
-      generalQueue as any,
-    );
-    jest
-      .spyOn(procCommitFail['logger'], 'error')
-      .mockImplementation(() => undefined);
-
-    await expect(procCommitFail.process(buildJob())).rejects.toThrow(
-      'commit aborted',
-    );
-    // The inner catch did NOT run (save succeeded), so only the outer catch can
-    // restore — assert it did.
-    expect(collabHistory.addContributors).toHaveBeenCalledWith(PAGE_ID, [
-      'u1',
-      'u2',
-    ]);
-    // And the post-snapshot queue work must NOT have run (we rethrew).
-    expect(generalQueue.add).not.toHaveBeenCalled();
-  });
-
  it('backlinks + notification queue failures are swallowed (history still committed)', async () => {
    pageHistoryRepo.findPageLastHistory.mockResolvedValue({
      content: { type: 'doc', content: [] },
--- a/Show More
+++ b/Show More