collabmd 0.1.51 → 0.1.52

package/src/client/export/export-host.js

@@ -26,7 +26,6 @@ function createBootstrapPayload({
   format,
   jobId,
   markdownText = '',
-  theme = 'light',
   title = '',
 }) {
   return {
@@ -39,7 +38,8 @@ function createBootstrapPayload({
     jobId,
     markdownText: String(markdownText ?? ''),
     source: EXPORT_HOST_SOURCE,
-    theme: theme === 'dark' ? 'dark' : 'light',
+    // Exports always render light so HTML, DOCX, and PDF output stays consistent.
+    theme: 'light',
     title: String(title ?? ''),
     type: 'bootstrap',
   };
@@ -154,11 +154,7 @@ async function startExport(payload) {
         notifyError: true,
       });
     }, EXPORT_JOB_CLOSE_POLL_MS),
-    payload: createBootstrapPayload({
-      ...payload,
-      jobId,
-      theme: document.documentElement.dataset.theme,
-    }),
+    payload: createBootstrapPayload({ ...payload, jobId }),
     timeoutId: window.setTimeout(() => {
       finishPendingJob(jobId, {
         message: 'Export timed out before it completed',

package/src/client/export/export-pipeline.js

@@ -1,5 +1,3 @@
-import { exportToSvg as exportExcalidrawToSvg } from '@excalidraw/excalidraw';
-
 import baseStyles from '../styles/base.css?inline';
 import tokenStyles from '../styles/foundation/tokens.css?inline';
 import themeStyles from '../styles/foundation/themes.css?inline';
@@ -7,18 +5,39 @@ import previewStyles from '../styles/features/preview-markdown.css?inline';
 import highlightOverrideStyles from '../styles/overrides/highlightjs.css?inline';
 import exportStyles from '../styles/export-document.css?inline';
 import highlightStyles from '../assets/vendor/highlight/github.min.css?inline';
+import katexExportCss from 'katex/dist/katex.min.css?inline';
+import katexFontAmsRegular from 'katex/dist/fonts/KaTeX_AMS-Regular.woff2?url';
+import katexFontCaligraphicBold from 'katex/dist/fonts/KaTeX_Caligraphic-Bold.woff2?url';
+import katexFontCaligraphicRegular from 'katex/dist/fonts/KaTeX_Caligraphic-Regular.woff2?url';
+import katexFontFrakturBold from 'katex/dist/fonts/KaTeX_Fraktur-Bold.woff2?url';
+import katexFontFrakturRegular from 'katex/dist/fonts/KaTeX_Fraktur-Regular.woff2?url';
+import katexFontMainBold from 'katex/dist/fonts/KaTeX_Main-Bold.woff2?url';
+import katexFontMainBoldItalic from 'katex/dist/fonts/KaTeX_Main-BoldItalic.woff2?url';
+import katexFontMainItalic from 'katex/dist/fonts/KaTeX_Main-Italic.woff2?url';
+import katexFontMainRegular from 'katex/dist/fonts/KaTeX_Main-Regular.woff2?url';
+import katexFontMathBoldItalic from 'katex/dist/fonts/KaTeX_Math-BoldItalic.woff2?url';
+import katexFontMathItalic from 'katex/dist/fonts/KaTeX_Math-Italic.woff2?url';
+import katexFontSansSerifBold from 'katex/dist/fonts/KaTeX_SansSerif-Bold.woff2?url';
+import katexFontSansSerifItalic from 'katex/dist/fonts/KaTeX_SansSerif-Italic.woff2?url';
+import katexFontSansSerifRegular from 'katex/dist/fonts/KaTeX_SansSerif-Regular.woff2?url';
+import katexFontScriptRegular from 'katex/dist/fonts/KaTeX_Script-Regular.woff2?url';
+import katexFontSize1Regular from 'katex/dist/fonts/KaTeX_Size1-Regular.woff2?url';
+import katexFontSize2Regular from 'katex/dist/fonts/KaTeX_Size2-Regular.woff2?url';
+import katexFontSize3Regular from 'katex/dist/fonts/KaTeX_Size3-Regular.woff2?url';
+import katexFontSize4Regular from 'katex/dist/fonts/KaTeX_Size4-Regular.woff2?url';
+import katexFontTypewriterRegular from 'katex/dist/fonts/KaTeX_Typewriter-Regular.woff2?url';
 import {
   encodeSvgDataUrl,
   loadImage,
   resolveSvgDimensions,
   sanitizeSvgMarkup,
 } from '../application/preview-diagram-utils.js';
-import { compilePreviewDocument } from '../application/preview-render-compiler.js';
 import { isMarkdownFilePath, stripVaultFileExtension } from '../../domain/file-kind.js';
 import { resolveVaultRelativePath } from '../../domain/vault-paths.js';
 import { resolveWikiTargetPath } from '../../domain/wiki-link-resolver.js';
 import { createExcalidrawExportOptions, parseSceneJson } from '../domain/excalidraw-scene.js';
 import { escapeHtml } from '../domain/vault-utils.js';
+import { hasRenderedMath } from '../domain/markdown-math.js';
 import { downloadBlob } from '../browser-utils.js';
 import { resolveApiUrl, resolveAppUrl } from '../infrastructure/runtime-config.js';
 import { parseApiResponse } from '../infrastructure/api-client-utils.js';
@@ -40,6 +59,7 @@ const EXPORT_MERMAID_CONFIG = Object.freeze({
 const EXPORT_ASSET_FETCH_TIMEOUT_MS = 10_000;
 const EXPORT_ASSET_MAX_BYTES = 10 * 1024 * 1024;
 const EXPORT_RENDER_SETTLE_TIMEOUT_MS = 10_000;
+const EXPORT_PRINT_FONT_TIMEOUT_MS = 3000;
 const VIDEO_POSTER_CAPTURE_TIMEOUT_MS = 10_000;
 const VIDEO_POSTER_CAPTURE_SEEK_SECONDS = 1;
 const DOCX_COMPATIBLE_IMAGE_MIME_TYPES = new Set([
@@ -71,7 +91,63 @@ const HTML_EXPORT_STYLES = [
   }`,
 ].join('\n');
 
+const KATEX_EXPORT_FONT_URLS = {
+  'KaTeX_AMS-Regular.woff2': katexFontAmsRegular,
+  'KaTeX_Caligraphic-Bold.woff2': katexFontCaligraphicBold,
+  'KaTeX_Caligraphic-Regular.woff2': katexFontCaligraphicRegular,
+  'KaTeX_Fraktur-Bold.woff2': katexFontFrakturBold,
+  'KaTeX_Fraktur-Regular.woff2': katexFontFrakturRegular,
+  'KaTeX_Main-Bold.woff2': katexFontMainBold,
+  'KaTeX_Main-BoldItalic.woff2': katexFontMainBoldItalic,
+  'KaTeX_Main-Italic.woff2': katexFontMainItalic,
+  'KaTeX_Main-Regular.woff2': katexFontMainRegular,
+  'KaTeX_Math-BoldItalic.woff2': katexFontMathBoldItalic,
+  'KaTeX_Math-Italic.woff2': katexFontMathItalic,
+  'KaTeX_SansSerif-Bold.woff2': katexFontSansSerifBold,
+  'KaTeX_SansSerif-Italic.woff2': katexFontSansSerifItalic,
+  'KaTeX_SansSerif-Regular.woff2': katexFontSansSerifRegular,
+  'KaTeX_Script-Regular.woff2': katexFontScriptRegular,
+  'KaTeX_Size1-Regular.woff2': katexFontSize1Regular,
+  'KaTeX_Size2-Regular.woff2': katexFontSize2Regular,
+  'KaTeX_Size3-Regular.woff2': katexFontSize3Regular,
+  'KaTeX_Size4-Regular.woff2': katexFontSize4Regular,
+  'KaTeX_Typewriter-Regular.woff2': katexFontTypewriterRegular,
+};
+
+// Standalone HTML exports must carry KaTeX fonts as data URLs to render
+// math offline. Fonts load once per session, only for math exports.
+let katexExportStylesPromise = null;
+
+// Bundler output rewrites the stylesheet's font paths (hashed names, absolute
+// URLs, sometimes pre-inlined), so match each font by basename instead.
+function loadKatexExportStyles() {
+  return (katexExportStylesPromise ??= (async () => {
+    let css = katexExportCss;
+    await Promise.all(
+      Object.entries(KATEX_EXPORT_FONT_URLS).map(async ([fontFile, fontUrl]) => {
+        const base = fontFile
+          .replace(/\.woff2$/, '')
+          .replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const pattern = new RegExp(`url\\((?!data:)[^)]*${base}[^)]*?\\.woff2\\)`, 'g');
+        if (!pattern.test(css)) {
+          return;
+        }
+
+        const response = await fetch(fontUrl);
+        const bytes = new Uint8Array(await response.arrayBuffer());
+        let binary = '';
+        for (let index = 0; index < bytes.length; index += 0x8000) {
+          binary += String.fromCharCode(...bytes.subarray(index, index + 0x8000));
+        }
+        css = css.replace(pattern, `url(data:font/woff2;base64,${btoa(binary)})`);
+      }),
+    );
+    return css.replace(/,url\((?!data:)[^)]+?\)\s*format\("(?:woff|truetype)"\)/gu, '');
+  })());
+}
+
 let mermaidLoaderPromise = null;
+let excalidrawLoaderPromise = null;
 let assetCounter = 0;
 
 function createAssetId(prefix = 'asset') {
@@ -152,6 +228,47 @@ function replaceChildrenFromHtml(target, html) {
   target.replaceChildren(...parsed.body.childNodes);
 }
 
+const DOCX_WHITESPACE_BLOCK_TAGS = new Set([
+  'BLOCKQUOTE', 'BR', 'DD', 'DIV', 'DL', 'DT', 'FIGURE', 'H1', 'H2', 'H3',
+  'H4', 'H5', 'H6', 'HR', 'LI', 'OL', 'P', 'PRE', 'SECTION', 'TABLE',
+  'TBODY', 'TD', 'TH', 'THEAD', 'TR', 'UL',
+]);
+
+// The converter turns every surviving whitespace text node into document
+// content, so inter-block newlines become phantom empty paragraphs and empty
+// bullets. Collapse insignificant whitespace the way HTML rendering does.
+function normalizeDocxWhitespace(root) {
+  const walker = root.ownerDocument.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+  const whitespaceNodes = [];
+  while (walker.nextNode()) {
+    if (/^\s*$/.test(walker.currentNode.data)) {
+      whitespaceNodes.push(walker.currentNode);
+    }
+  }
+
+  for (const node of whitespaceNodes) {
+    if (node.parentElement?.closest('pre,textarea')) {
+      continue;
+    }
+
+    const siblings = node.parentElement ? Array.from(node.parentElement.childNodes) : [];
+    if (siblings[0] === node || siblings[siblings.length - 1] === node) {
+      node.remove();
+      continue;
+    }
+
+    const previousIsBlock = !!node.previousElementSibling
+      && DOCX_WHITESPACE_BLOCK_TAGS.has(node.previousElementSibling.tagName);
+    const nextIsBlock = !!node.nextElementSibling
+      && DOCX_WHITESPACE_BLOCK_TAGS.has(node.nextElementSibling.tagName);
+    if (previousIsBlock || nextIsBlock) {
+      node.remove();
+    } else {
+      node.data = ' ';
+    }
+  }
+}
+
 function encodeSvgBase64DataUrl(svgMarkup) {
   const bytes = new TextEncoder().encode(String(svgMarkup ?? ''));
   const chunkSize = 0x8000;
@@ -746,6 +863,23 @@ async function ensureMermaidRuntime() {
   return mermaidLoaderPromise;
 }
 
+async function ensureExcalidrawRuntime() {
+  if (excalidrawLoaderPromise) {
+    return excalidrawLoaderPromise;
+  }
+
+  excalidrawLoaderPromise = import('@excalidraw/excalidraw').then((module) => {
+    const exportToSvg = module?.exportToSvg;
+    if (typeof exportToSvg !== 'function') {
+      throw new Error('Excalidraw runtime failed to initialize');
+    }
+
+    return exportToSvg;
+  });
+
+  return excalidrawLoaderPromise;
+}
+
 function prepareMermaidSource(source) {
   let text = String(source ?? '');
 
@@ -817,7 +951,8 @@ async function renderPlantUmlToSvgMarkup(source) {
 async function renderExcalidrawToSvgMarkup(filePath) {
   const rawScene = await fetchTextFile(filePath);
   const scene = parseSceneJson(rawScene);
-  const svgElement = await exportExcalidrawToSvg(createExcalidrawExportOptions(scene));
+  const exportToSvg = await ensureExcalidrawRuntime();
+  const svgElement = await exportToSvg(createExcalidrawExportOptions(scene));
   return normalizeExportSvgMarkup(svgElement.outerHTML, { padding: 24 });
 }
 
@@ -1236,6 +1371,7 @@ export async function prepareExportSnapshot({
     warnings: [],
   };
 
+  const { compilePreviewDocument } = await import('../application/preview-render-compiler.js');
   const compiled = compilePreviewDocument({
     attachmentApiPath: resolveApiUrl('/attachment'),
     fileList,
@@ -1468,6 +1604,46 @@ export function buildDocxHtmlDocument(snapshot) {
   const template = document.createElement('template');
   replaceChildrenFromHtml(template.content, snapshot.html);
 
+
+  normalizeDocxWhitespace(template.content);
+
+  // The converter drops label content, which would erase every task list
+  // item. Flatten task labels to ballot-box text first.
+  Array.from(template.content.querySelectorAll('label.task-list-label')).forEach((label) => {
+    const checkbox = label.querySelector('input[data-task-checkbox]');
+    const box = checkbox?.hasAttribute('checked') ? '\u2611' : '\u2610';
+    const kept = Array.from(label.childNodes).filter((node) => node.tagName !== 'INPUT');
+    if (kept[0]?.nodeType === 3) {
+      kept[0].textContent = kept[0].textContent.replace(/^\s+/, '');
+    }
+    label.replaceWith(`${box} `, ...kept);
+  });
+
+  // KaTeX lays math out as positioned spans that read out of order as
+  // plain text (a stacked fraction extracts as "ba" instead of "a/b").
+  // The server swaps these markers for native OMML equations, so Word
+  // renders them as real editable math.
+  // A lone math block inside a list item would detach from its bullet,
+  // so hoist the marker to keep the equation on the bullet paragraph.
+  Array.from(template.content.querySelectorAll('.katex')).forEach((mathElement, docxMathIndex) => {
+    const mathml = mathElement.querySelector('.katex-mathml')?.innerHTML ?? '';
+    if (!mathml.includes('<math')) {
+      return;
+    }
+
+    const displayWrapper = mathElement.parentElement;
+    let replaceTarget = displayWrapper?.classList?.contains('katex-display') ? displayWrapper : mathElement;
+    const blockParagraph = mathElement.closest('p.katex-block');
+    if (blockParagraph && blockParagraph.parentElement?.tagName === 'LI') {
+      replaceTarget = blockParagraph;
+    }
+
+    const marker = template.content.ownerDocument.createElement('span');
+    marker.className = 'export-math';
+    marker.dataset.mml = encodeURIComponent(mathml);
+    marker.textContent = `COLLABMD-MATH-${docxMathIndex}`;
+    replaceTarget.replaceWith(marker);
+  });
   Array.from(template.content.querySelectorAll('.table-wrapper')).forEach((wrapper) => {
     const table = wrapper.querySelector(':scope > table');
     if (!table) {
@@ -1595,12 +1771,11 @@ export function buildDocxHtmlDocument(snapshot) {
     }));
   });
 
-  return `<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>${snapshot.title}</title>
-  <style>
+  // Compact wrapper: with HTML minification skipped, the converter turns
+  // every surviving whitespace text node into document content, so the
+  // doctype and any inter-tag whitespace here would become phantom empty
+  // paragraphs. Body content is normalized by normalizeDocxWhitespace above.
+  return `<html lang="en"><head><meta charset="UTF-8"><title>${escapeHtml(snapshot.title)}</title><style>
     body { font-family: Arial, sans-serif; color: #111827; line-height: 1.6; }
     main { max-width: 760px; margin: 0 auto; }
     h1, h2, h3, h4, h5, h6 { color: #111827; margin: 1.3em 0 0.6em; line-height: 1.2; }
@@ -1623,15 +1798,10 @@ export function buildDocxHtmlDocument(snapshot) {
     .export-video-poster-meta { display: block; color: #6b7280; font-size: 12px; margin-top: 4px; }
     .export-video-link { display: block; margin-top: 8px; word-break: break-word; }
     .export-warning { color: #b45309; }
-  </style>
-</head>
-<body>
-  <main>${template.innerHTML}</main>
-</body>
-</html>`;
+  </style></head><body><main>${template.innerHTML}</main></body></html>`;
 }
 
-export function buildHtmlDocument(snapshot) {
+export function buildHtmlDocument(snapshot, extraStyles = '') {
   const template = document.createElement('template');
   replaceChildrenFromHtml(template.content, snapshot.html);
   Array.from(template.content.querySelectorAll('[data-export-docx-src]')).forEach((element) => {
@@ -1645,7 +1815,7 @@ export function buildHtmlDocument(snapshot) {
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>${escapeHtml(snapshot.title)}</title>
-  <style>${HTML_EXPORT_STYLES.replace(/<\/style/giu, '<\\/style')}</style>
+  <style>${HTML_EXPORT_STYLES.replace(/<\/style/giu, '<\\/style')}${extraStyles.replace(/<\/style/giu, '<\\/style')}</style>
 </head>
 <body data-theme="${theme}">
   <main class="export-page-shell">
@@ -1655,9 +1825,10 @@ export function buildHtmlDocument(snapshot) {
 </html>`;
 }
 
-export function htmlAdapter(snapshot) {
+export async function htmlAdapter(snapshot) {
+  const mathStyles = hasRenderedMath(snapshot.html) ? await loadKatexExportStyles() : '';
   downloadBlob(
-    new Blob([buildHtmlDocument(snapshot)], { type: 'text/html;charset=utf-8' }),
+    new Blob([buildHtmlDocument(snapshot, mathStyles)], { type: 'text/html;charset=utf-8' }),
     `${createDocumentTitle(snapshot.filePath, snapshot.title)}.html`,
     { removeDelayMs: 0, revokeDelayMs: 1000 },
   );
@@ -1688,10 +1859,26 @@ export async function docxAdapter(snapshot) {
   });
 }
 
+// document.fonts.ready can resolve before lazy KaTeX faces start loading,
+// which prints blank glyphs. Force-load the families and bound the wait so
+// a missing font cannot hang the export.
+async function waitForKatexPrintFonts() {
+  if (!document.fonts) {
+    return;
+  }
+
+  const families = [...new Set(Object.keys(KATEX_EXPORT_FONT_URLS).map((file) => file.replace(/-[^-]+\.woff2$/u, '')))];
+  const loads = families.map((family) => document.fonts.load(`16px "${family}"`).catch(() => []));
+  await Promise.race([
+    Promise.allSettled(loads),
+    new Promise((resolve) => window.setTimeout(resolve, EXPORT_PRINT_FONT_TIMEOUT_MS)),
+  ]);
+}
+
 export async function printPdfAdapter() {
+  await waitForKatexPrintFonts();
   await waitForAnimationFrame();
   await waitForAnimationFrame();
-
   await new Promise((resolve) => {
     const timeoutId = window.setTimeout(resolve, 1500);
     const handleAfterPrint = () => {

package/src/client/infrastructure/browser-preferences-port.js

@@ -62,6 +62,14 @@ export class BrowserPreferencesPort {
     writeStorage(this.storage, this.lineWrappingKey, String(enabled));
   }
 
+  getCursorNamesVisible() {
+    return readStorage(this.storage, 'collabmd-editor-cursor-names', null) !== 'false';
+  }
+
+  setCursorNamesVisible(visible) {
+    writeStorage(this.storage, 'collabmd-editor-cursor-names', String(visible));
+  }
+
   getVimModeEnabled() {
     return readStorage(this.storage, this.vimModeKey, null) === 'true';
   }

package/src/client/infrastructure/editor-session.js

@@ -1,5 +1,7 @@
 import * as Y from 'yjs';
 
+import { createEditableContentRevision } from '../../domain/editable-content-revision.js';
+
 import { CommentThreadStore } from './comment-thread-store.js';
 import { EditorCollaborationClient } from './editor-collaboration-client.js';
 import { EditorViewAdapter } from './editor-view-adapter.js';
@@ -172,6 +174,24 @@ export class EditorSession {
     return this.collaborationClient.ytext;
   }
 
+  async getAgentContext() {
+    const state = this.viewAdapter.getState();
+    if (!this.isInitialSyncComplete() || !state || state.doc.length > 1_000_000) return null;
+    const { from, to } = state.selection.main;
+    const end = to > from ? to - 1 : to;
+    return {
+      localRevision: await createEditableContentRevision(state.doc.toString()),
+      selection: {
+        endLine: state.doc.lineAt(end).number,
+        from,
+        startLine: state.doc.lineAt(from).number,
+        text: state.doc.sliceString(from, Math.min(to, from + 2000)),
+        to,
+        truncated: to - from > 2000,
+      },
+    };
+  }
+
   getCurrentSelectionLineRange() {
     return this.viewAdapter.getCurrentSelectionLineRange();
   }

package/src/client/infrastructure/editor-view-adapter.js

@@ -13,6 +13,7 @@ import {
   defaultHighlightStyle,
   foldGutter,
   foldKeymap,
+  forceParsing,
   indentOnInput,
   syntaxHighlighting,
 } from '@codemirror/language';
@@ -251,9 +252,6 @@ function createEditorTheme(theme) {
   const selectionBackground = theme === 'dark'
     ? 'oklch(from var(--color-primary) l c h / 0.4)'
     : 'oklch(from var(--color-primary) l c h / 0.26)';
-  const selectionBorder = theme === 'dark'
-    ? 'oklch(from var(--color-primary) l c h / 0.65)'
-    : 'oklch(from var(--color-primary) l c h / 0.5)';
   const caretColor = theme === 'dark'
     ? 'color-mix(in oklab, var(--color-primary) 78%, white)'
     : 'color-mix(in oklab, var(--color-primary) 84%, black)';
@@ -303,6 +301,10 @@ function createEditorTheme(theme) {
       backgroundColor: activeLineBackground,
       boxShadow: `inset 3px 0 0 ${activeLineAccent}`,
     },
+    '&:has(.cm-selectionBackground) .cm-activeLine': {
+      backgroundColor: 'transparent',
+      boxShadow: 'none',
+    },
     '.cm-activeLineGutter': {
       backgroundColor: activeLineBackground,
       boxShadow: `inset 3px 0 0 ${activeLineAccent}`,
@@ -356,10 +358,6 @@ function createEditorTheme(theme) {
     '&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
       backgroundColor: selectionBackground,
     },
-    '&.cm-focused .cm-selectionLayer .cm-selectionBackground': {
-      border: `1px solid ${selectionBorder}`,
-      borderRadius: '2px',
-    },
     '@keyframes collabmd-remote-update-flash': {
       '0%': {
         backgroundColor: theme === 'dark'
@@ -585,6 +583,9 @@ export class EditorViewAdapter {
       parent: this.editorContainer,
       state,
     });
+    // Parse beyond the viewport so diagram syntax does not recolor during scrolling.
+    // ponytail: cap startup work at 50ms; larger documents retain background parsing.
+    forceParsing(this.editorView, state.doc.length, 50);
 
     this.editorContainer.dataset.editorMode = editorMode;
     this.editorView.scrollDOM.addEventListener('scroll', this.handleScroll, { passive: true });

package/src/client/infrastructure/excalidraw-room-client.js

@@ -23,6 +23,7 @@ import {
 import {
   buildCollaboratorsMap,
   mergeAwarenessUserPatch,
+  normalizeCollaboratorViewport,
 } from '../domain/excalidraw-collaboration.js';
 import {
   buildLiveCollaborationScene,
@@ -370,23 +371,6 @@ export class ExcalidrawRoomClient {
     });
   }
 
-  getHistoryState() {
-    return {
-      canRedo: false,
-      canUndo: false,
-      head: null,
-      length: null,
-    };
-  }
-
-  canRedo() {
-    return this.getHistoryState().canRedo;
-  }
-
-  canUndo() {
-    return this.getHistoryState().canUndo;
-  }
-
   isApplyingSharedSnapshot() {
     return this.applyingSharedSnapshotDepth > 0;
   }
@@ -399,14 +383,6 @@ export class ExcalidrawRoomClient {
     this.applyingSharedSnapshotDepth = Math.max(0, this.applyingSharedSnapshotDepth - 1);
   }
 
-  subscribeHistoryState(listener) {
-    if (typeof listener === 'function') {
-      listener(this.getHistoryState());
-    }
-
-    return () => {};
-  }
-
   setLocalUser(nextUser = {}) {
     this.localUser = mergeAwarenessUserPatch({
       currentUser: this.localUser,
@@ -892,25 +868,6 @@ export class ExcalidrawRoomClient {
     this.pendingPointerPayload = null;
   }
 
-  normalizeViewportAwareness(viewport) {
-    if (!viewport || typeof viewport !== 'object') {
-      return null;
-    }
-
-    const scrollX = Number(viewport.scrollX);
-    const scrollY = Number(viewport.scrollY);
-    const zoom = Number(viewport.zoom);
-    if (!Number.isFinite(scrollX) || !Number.isFinite(scrollY) || !Number.isFinite(zoom) || zoom <= 0) {
-      return null;
-    }
-
-    return {
-      scrollX,
-      scrollY,
-      zoom,
-    };
-  }
-
   scheduleLocalPointerAwareness(payload) {
     if (!this.awareness || !payload?.pointer) {
       return;
@@ -948,7 +905,7 @@ export class ExcalidrawRoomClient {
       return;
     }
 
-    const normalizedViewport = this.normalizeViewportAwareness(viewport);
+    const normalizedViewport = normalizeCollaboratorViewport(viewport);
     if (!normalizedViewport) {
       return;
     }

package/src/client/infrastructure/git-api-client.js

@@ -28,6 +28,11 @@ export const gitApiClient = {
     return parseApiResponse(response, 'Failed to load git status');
   },
 
+  getPullBackupSummaryUrl(backupId) {
+    const params = createSearchParams({ id: backupId });
+    return resolveApiUrl(`/git/pull-backup-summary?${params.toString()}`);
+  },
+
   async readPullBackups() {
     const response = await fetch(resolveApiUrl('/git/pull-backups'));
     return parseApiResponse(response, 'Failed to load pull backups');

package/src/client/infrastructure/tab-activity-lock.js

@@ -38,13 +38,17 @@ export class TabActivityLock {
     this.channel = null;
     this.heartbeatTimer = null;
     this.isOwner = false;
+    this.listenerController = null;
     this.handleStorageEvent = this.handleStorageEvent.bind(this);
     this.handlePageHide = this.handlePageHide.bind(this);
   }
 
   initialize() {
-    window.addEventListener('storage', this.handleStorageEvent);
-    window.addEventListener('pagehide', this.handlePageHide);
+    this.listenerController?.abort();
+    this.listenerController = new AbortController();
+    const { signal } = this.listenerController;
+    window.addEventListener('storage', this.handleStorageEvent, { signal });
+    window.addEventListener('pagehide', this.handlePageHide, { signal });
 
     if ('BroadcastChannel' in globalThis) {
       this.channel = new BroadcastChannel(CHANNEL_NAME);
@@ -56,8 +60,8 @@ export class TabActivityLock {
 
   destroy() {
     this.release();
-    window.removeEventListener('storage', this.handleStorageEvent);
-    window.removeEventListener('pagehide', this.handlePageHide);
+    this.listenerController?.abort();
+    this.listenerController = null;
     this.channel?.close();
     this.channel = null;
   }

package/src/client/infrastructure/webmcp-tool-registry.js

@@ -1,3 +1,4 @@
+import { getVaultFileKind } from '../../domain/file-kind.js';
 import {
   listWebMcpToolDefinitions,
   toWebMcpToolName,
@@ -128,10 +129,15 @@ function createActiveContextResult(context = {}) {
   return {
     activeDiagramPath,
     activePath,
+    kind: getVaultFileKind(activePath),
+    localRevision: context.localRevision ?? null,
+    selection: context.selection ?? null,
     preferredDiagramPath: activeDiagramPath,
     workflow: activeDiagramPath
       ? `Current diagram is ${activeDiagramPath}. Inspect it, edit with the returned exact revision, request inline verification, then use the returned canvas paint acknowledgement.`
-      : 'No diagram is active. Use create_excalidraw with a new .excalidraw path and request inline verification. Inspect then revision-edit any existing path; do not retry stale edits without rereading.',
+      : activePath
+        ? 'Read the active document before editing. Selection offsets are UTF-16 and refer to localRevision; compare it with the fresh server revision and reconsider the selection if they differ. Batch unique exact replacements; reread on conflict. Request Markdown validation when changing references.'
+        : 'No diagram is active. Use create_excalidraw with a new .excalidraw path and request inline verification. Inspect then revision-edit any existing path; do not retry stale edits without rereading.',
   };
 }
 
@@ -158,10 +164,10 @@ function createActiveContextTool(getActiveContext) {
   return {
     annotations: {
       readOnlyHint: true,
-      untrustedContentHint: false,
+      untrustedContentHint: true,
     },
-    description: 'Return current CollabMD file and active-diagram context plus the safe create-or-edit workflow. Call before Excalidraw tools.',
-    execute: async () => createActiveContextResult(getActiveContext?.()),
+    description: 'Return the active file kind, bounded primary editor selection (up to 2000 characters), local snapshot revision, and diagram context. Call for edits referring to this document or selection. Local revision does not confirm server synchronization; read_document supplies the edit revision.',
+    execute: async () => createActiveContextResult(await getActiveContext?.()),
     inputSchema: {
       additionalProperties: false,
       properties: {},
@@ -213,7 +219,8 @@ export class WebMcpToolRegistry {
     try {
       const tools = listWebMcpToolDefinitions().map((definition) => ({
         annotations: {
-          ...definition.annotations,
+          consequentialHint: !definition.annotations.readOnlyHint,
+          readOnlyHint: Boolean(definition.annotations.readOnlyHint),
           untrustedContentHint: Boolean(definition.untrustedContentHint),
         },
         description: getWebMcpDescription(definition),

package/src/client/presentation/bases-preview-controller.js

@@ -7,7 +7,8 @@ import { segmentedButtonClassNames, segmentedControlClassNames } from './compone
 import { downloadBlob, parseDownloadFileName } from '../browser-utils.js';
 
 function createShellKey() {
-  return `base-${Math.random().toString(36).slice(2, 10)}`;
+  const id = globalThis.crypto?.randomUUID?.() ?? `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+  return `base-${id}`;
 }
 
 function replaceChildrenFromHtml(target, html) {

package/src/client/presentation/comment-markdown-renderer.js

@@ -1,4 +1,5 @@
 import markdownIt from 'markdown-it';
+import { enableMarkdownMath } from '../domain/markdown-math.js';
 
 import { escapeHtml } from '../domain/vault-utils.js';
 
@@ -21,6 +22,7 @@ function createCommentMarkdownRenderer() {
     linkify: true,
     typographer: true,
   });
+  enableMarkdownMath(markdown);
 
   const fallbackLinkOpen = markdown.renderer.rules.link_open;
   const fallbackTableOpen = markdown.renderer.rules.table_open;