collabmd 0.1.45 → 0.1.46

package/src/domain/comment-threads.js

@@ -5,7 +5,7 @@ export const COMMENT_EXCERPT_MAX_LENGTH = 160;
 export const COMMENT_ANCHOR_QUOTE_MAX_LENGTH = 280;
 export const COMMENT_REACTION_EMOJI_MAX_LENGTH = 16;
 
-const COMMENT_ANCHOR_KINDS = new Set(['line', 'text']);
+const COMMENT_ANCHOR_KINDS = new Set(['diagram-element', 'line', 'text']);
 
 function asFiniteNumber(value) {
   return Number.isFinite(value) ? value : null;
@@ -55,6 +55,38 @@ function normalizeAnchorKind(value) {
   return COMMENT_ANCHOR_KINDS.has(value) ? value : null;
 }
 
+function normalizeDiagramElementId(value) {
+  const normalized = asString(value).trim().slice(0, 240);
+  return normalized || null;
+}
+
+function normalizeDiagramAnchorPoint(value) {
+  const point = asObject(value);
+  const x = asFiniteNumber(point?.x);
+  const y = asFiniteNumber(point?.y);
+  return x === null || y === null ? null : { x, y };
+}
+
+function normalizeDiagramAnchorSnapshot(value) {
+  const snapshot = asObject(value);
+  const x = asFiniteNumber(snapshot?.x);
+  const y = asFiniteNumber(snapshot?.y);
+  const width = asFiniteNumber(snapshot?.width);
+  const height = asFiniteNumber(snapshot?.height);
+  if (x === null || y === null || width === null || height === null) {
+    return null;
+  }
+
+  return {
+    height,
+    text: normalizeCommentQuote(snapshot?.text),
+    type: asString(snapshot?.type).trim() || 'element',
+    width,
+    x,
+    y,
+  };
+}
+
 export function normalizeCommentBody(value) {
   const normalized = String(value ?? '')
     .replace(/\r\n?/g, '\n')
@@ -196,6 +228,23 @@ export function createCommentId(prefix = 'comment') {
 
 export function normalizeCommentAnchor(record = {}) {
   const anchorKind = normalizeAnchorKind(record.anchorKind);
+  if (anchorKind === 'diagram-element') {
+    const anchorPoint = normalizeDiagramAnchorPoint(record.anchorPoint);
+    const anchorSnapshot = normalizeDiagramAnchorSnapshot(record.anchorSnapshot);
+    const elementId = normalizeDiagramElementId(record.elementId);
+    if (!anchorPoint || !anchorSnapshot || !elementId) {
+      return null;
+    }
+
+    return {
+      anchorKind,
+      anchorPoint,
+      anchorQuote: normalizeCommentQuote(record.anchorQuote || anchorSnapshot.text),
+      anchorSnapshot,
+      elementId,
+    };
+  }
+
   const anchorStart = asObject(record.anchorStart);
   const anchorEnd = asObject(record.anchorEnd);
   const anchorStartLine = asFiniteNumber(record.anchorStartLine);
@@ -235,12 +284,18 @@ export function createCommentThreadSharedType(record = {}) {
   messages.push(normalizedMessages.length > 0 ? normalizedMessages : [initialMessage]);
 
   const thread = new Y.Map();
-  thread.set('anchorEnd', anchor.anchorEnd);
-  thread.set('anchorEndLine', anchor.anchorEndLine);
   thread.set('anchorKind', anchor.anchorKind);
   thread.set('anchorQuote', anchor.anchorQuote);
-  thread.set('anchorStart', anchor.anchorStart);
-  thread.set('anchorStartLine', anchor.anchorStartLine);
+  if (anchor.anchorKind === 'diagram-element') {
+    thread.set('anchorPoint', anchor.anchorPoint);
+    thread.set('anchorSnapshot', anchor.anchorSnapshot);
+    thread.set('elementId', anchor.elementId);
+  } else {
+    thread.set('anchorEnd', anchor.anchorEnd);
+    thread.set('anchorEndLine', anchor.anchorEndLine);
+    thread.set('anchorStart', anchor.anchorStart);
+    thread.set('anchorStartLine', anchor.anchorStartLine);
+  }
   thread.set('createdAt', asFiniteNumber(record.createdAt) ?? Date.now());
   thread.set('createdByColor', asString(record.createdByColor));
   thread.set('createdByName', asString(record.createdByName) || initialMessage.userName);
@@ -266,6 +321,9 @@ export function serializeCommentThread(thread) {
     anchorQuote: readThreadValue(thread, 'anchorQuote'),
     anchorStart: readThreadValue(thread, 'anchorStart'),
     anchorStartLine: readThreadValue(thread, 'anchorStartLine'),
+    anchorPoint: readThreadValue(thread, 'anchorPoint'),
+    anchorSnapshot: readThreadValue(thread, 'anchorSnapshot'),
+    elementId: readThreadValue(thread, 'elementId'),
   });
   const messages = serializeMessages(readThreadValue(thread, 'messages'));
 

package/src/domain/excalidraw-room-codec.js

@@ -98,13 +98,15 @@ function compareElementVersions(left, right) {
 }
 
 function compareElementIndex(left, right) {
-  const leftIndex = left?.index ?? '';
-  const rightIndex = right?.index ?? '';
+  const leftIndex = String(left?.index ?? '');
+  const rightIndex = String(right?.index ?? '');
   if (leftIndex !== rightIndex) {
-    return String(leftIndex).localeCompare(String(rightIndex));
+    return leftIndex < rightIndex ? -1 : 1;
   }
 
-  return String(left?.id || '').localeCompare(String(right?.id || ''));
+  const leftId = String(left?.id || '');
+  const rightId = String(right?.id || '');
+  return leftId < rightId ? -1 : leftId > rightId ? 1 : 0;
 }
 
 function getNestedMapValue(map, key, { create = false } = {}) {

package/src/domain/file-kind.js

@@ -4,20 +4,25 @@ const EXCALIDRAW_FILE_EXTENSION = '.excalidraw';
 const DRAWIO_FILE_EXTENSION = '.drawio';
 const MERMAID_FILE_EXTENSIONS = Object.freeze(['.mmd', '.mermaid']);
 const PLANTUML_FILE_EXTENSIONS = Object.freeze(['.puml', '.plantuml']);
+const STRUCTURIZR_FILE_EXTENSION = '.dsl';
+const STRUCTURIZR_FILE_EXTENSIONS = Object.freeze([STRUCTURIZR_FILE_EXTENSION]);
+const PDF_FILE_EXTENSION = '.pdf';
 const IMAGE_ATTACHMENT_EXTENSIONS = Object.freeze(['.png', '.jpg', '.jpeg', '.webp', '.gif', '.svg']);
 const DIAGRAM_FILE_EXTENSIONS = Object.freeze([
   EXCALIDRAW_FILE_EXTENSION,
   DRAWIO_FILE_EXTENSION,
   ...MERMAID_FILE_EXTENSIONS,
   ...PLANTUML_FILE_EXTENSIONS,
+  ...STRUCTURIZR_FILE_EXTENSIONS,
 ]);
 const VAULT_FILE_EXTENSIONS = Object.freeze([
   ...MARKDOWN_FILE_EXTENSIONS,
   BASE_FILE_EXTENSION,
   ...DIAGRAM_FILE_EXTENSIONS,
+  PDF_FILE_EXTENSION,
   ...IMAGE_ATTACHMENT_EXTENSIONS,
 ]);
-const STRIP_VAULT_EXTENSION_PATTERN = /\.(?:md|markdown|mdx|base|excalidraw|drawio|mmd|mermaid|puml|plantuml|png|jpe?g|webp|gif|svg)$/i;
+const STRIP_VAULT_EXTENSION_PATTERN = /\.(?:md|markdown|mdx|base|excalidraw|drawio|mmd|mermaid|puml|plantuml|dsl|pdf|png|jpe?g|webp|gif|svg)$/i;
 
 function normalizeFilePath(filePath) {
   return String(filePath ?? '').trim().toLowerCase();
@@ -36,7 +41,10 @@ export {
   IMAGE_ATTACHMENT_EXTENSIONS,
   MARKDOWN_FILE_EXTENSIONS,
   MERMAID_FILE_EXTENSIONS,
+  PDF_FILE_EXTENSION,
   PLANTUML_FILE_EXTENSIONS,
+  STRUCTURIZR_FILE_EXTENSION,
+  STRUCTURIZR_FILE_EXTENSIONS,
   VAULT_FILE_EXTENSIONS,
 };
 
@@ -65,6 +73,14 @@ export function getVaultFileKind(filePath) {
     return 'plantuml';
   }
 
+  if (hasFileExtension(filePath, STRUCTURIZR_FILE_EXTENSIONS)) {
+    return 'structurizr';
+  }
+
+  if (hasFileExtension(filePath, [PDF_FILE_EXTENSION])) {
+    return 'pdf';
+  }
+
   if (hasFileExtension(filePath, IMAGE_ATTACHMENT_EXTENSIONS)) {
     return 'image';
   }
@@ -118,13 +134,25 @@ export function isPlantUmlFilePath(filePath) {
   return getVaultFileKind(filePath) === 'plantuml';
 }
 
+export function isStructurizrFilePath(filePath) {
+  return getVaultFileKind(filePath) === 'structurizr';
+}
+
+export function isPdfFilePath(filePath) {
+  return getVaultFileKind(filePath) === 'pdf';
+}
+
 export function isImageAttachmentFilePath(filePath) {
   return getVaultFileKind(filePath) === 'image';
 }
 
 export function isDiagramFilePath(filePath) {
   const kind = getVaultFileKind(filePath);
-  return kind === 'excalidraw' || kind === 'drawio' || kind === 'mermaid' || kind === 'plantuml';
+  return kind === 'excalidraw'
+    || kind === 'drawio'
+    || kind === 'mermaid'
+    || kind === 'plantuml'
+    || kind === 'structurizr';
 }
 
 export function isVaultFilePath(filePath) {
@@ -133,7 +161,11 @@ export function isVaultFilePath(filePath) {
 
 export function supportsCommentsForFilePath(filePath) {
   const kind = getVaultFileKind(filePath);
-  return kind === 'markdown' || kind === 'mermaid' || kind === 'plantuml';
+  return kind === 'markdown'
+    || kind === 'mermaid'
+    || kind === 'plantuml'
+    || kind === 'structurizr'
+    || kind === 'excalidraw';
 }
 
 export function supportsBacklinksForFilePath(filePath) {

package/src/server/config/env.js

@@ -13,11 +13,28 @@ import {
 import { loadBuildInfo } from './build-info.js';
 import { isPerfLoggingEnabled } from './perf-logging.js';
 
+const DEFAULT_SEARCH_MAX_BUFFER_BYTES = 2 * 1024 * 1024;
+const DEFAULT_SEARCH_MAX_FILE_SIZE = '1M';
+const DEFAULT_PDF_UPLOAD_BYTES = 50 * 1024 * 1024;
+
 function parsePositiveInt(rawValue, fallbackValue) {
   const parsed = Number.parseInt(rawValue ?? '', 10);
   return Number.isInteger(parsed) && parsed > 0 ? parsed : fallbackValue;
 }
 
+function normalizeSearchMaxFileSize(rawValue, fallbackValue = DEFAULT_SEARCH_MAX_FILE_SIZE) {
+  const normalized = String(rawValue ?? '').trim();
+  if (!normalized) {
+    return fallbackValue;
+  }
+
+  if (!/^[1-9]\d*(?:[KMG])?$/iu.test(normalized)) {
+    throw new Error('COLLABMD_SEARCH_MAX_FILE_SIZE must be a positive byte count with an optional K, M, or G suffix.');
+  }
+
+  return normalized.toUpperCase();
+}
+
 function parseOptionalPositiveInt(rawValue, {
   fallbackValue = null,
   variableName = 'value',
@@ -56,6 +73,30 @@ function resolveDrawioBaseUrl(value) {
   return normalizeOptionalString(value) || 'https://embed.diagrams.net';
 }
 
+function resolveStructurizrServerUrl(value) {
+  const normalized = normalizeOptionalString(value);
+  if (!normalized) {
+    return '';
+  }
+
+  let parsedUrl;
+  try {
+    parsedUrl = new URL(normalized);
+  } catch {
+    throw new Error('STRUCTURIZR_SERVER_URL must be an absolute HTTP or HTTPS URL.');
+  }
+
+  if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+    throw new Error('STRUCTURIZR_SERVER_URL must use HTTP or HTTPS.');
+  }
+
+  if (parsedUrl.search || parsedUrl.hash) {
+    throw new Error('STRUCTURIZR_SERVER_URL must not include a query string or hash.');
+  }
+
+  return normalized.replace(/\/+$/u, '');
+}
+
 function normalizeAppBasePath(basePath) {
   const normalized = normalizeOptionalString(basePath);
   if (!normalized || normalized === '/') {
@@ -278,6 +319,31 @@ function loadOidcConfig(overrides = {}, { basePath = '' } = {}) {
   };
 }
 
+function loadStructurizrConfig(overrides = {}, { vaultDir } = {}) {
+  const serverUrl = resolveStructurizrServerUrl(
+    overrides.serverUrl
+    ?? process.env.COLLABMD_STRUCTURIZR_SERVER_URL
+    ?? process.env.STRUCTURIZR_SERVER_URL,
+  );
+  const mirrorDir = resolveOptionalPath(
+    overrides.mirrorDir
+    ?? process.env.COLLABMD_STRUCTURIZR_MIRROR_DIR
+    ?? process.env.STRUCTURIZR_MIRROR_DIR,
+  ) || resolve(vaultDir, '.collabmd/structurizr');
+
+  return {
+    enabled: Boolean(serverUrl),
+    mirrorDir,
+    serverUrl,
+    trustedExecutableDsl: overrides.trustedExecutableDsl
+      ?? parseBooleanFlag(
+        process.env.COLLABMD_STRUCTURIZR_TRUSTED_EXECUTABLE_DSL
+        ?? process.env.STRUCTURIZR_TRUSTED_EXECUTABLE_DSL,
+        false,
+      ),
+  };
+}
+
 function loadHostedConfig(overrides = {}, { authStrategy, vaultDir } = {}) {
   const enabled = overrides.enabled ?? parseBooleanFlag(process.env.COLLABMD_HOSTED_ENABLED, false);
   const metadataDbPath = resolveOptionalPath(
@@ -361,6 +427,7 @@ export function loadConfig(overrides = {}) {
     : null;
   const git = loadGitConfig(overrides.git);
   const hosted = loadHostedConfig(overrides.hosted, { authStrategy, vaultDir });
+  const structurizr = loadStructurizrConfig(overrides.structurizr, { vaultDir });
   const build = loadBuildInfo({
     explicitBuildId: process.env.COLLABMD_BUILD_ID,
     projectRoot,
@@ -396,6 +463,18 @@ export function loadConfig(overrides = {}) {
     maxBaseQueryRows: parsePositiveInt(process.env.COLLABMD_MAX_BASE_QUERY_ROWS, 5_000),
     maxDownloadFileBytes: parsePositiveInt(process.env.COLLABMD_MAX_DOWNLOAD_FILE_BYTES, 268_435_456),
     maxInitialSyncBytes: parsePositiveInt(process.env.COLLABMD_MAX_INITIAL_SYNC_BYTES, 16_777_216),
+    maxPdfUploadBytes: parsePositiveInt(
+      overrides.maxPdfUploadBytes ?? process.env.COLLABMD_MAX_PDF_UPLOAD_BYTES,
+      DEFAULT_PDF_UPLOAD_BYTES,
+    ),
+    searchMaxBufferBytes: parsePositiveInt(
+      overrides.searchMaxBufferBytes ?? process.env.COLLABMD_SEARCH_MAX_BUFFER_BYTES,
+      DEFAULT_SEARCH_MAX_BUFFER_BYTES,
+    ),
+    searchMaxFileSize: normalizeSearchMaxFileSize(
+      overrides.searchMaxFileSize ?? process.env.COLLABMD_SEARCH_MAX_FILE_SIZE,
+    ),
+    structurizr,
     perfLoggingEnabled: overrides.perfLoggingEnabled ?? isPerfLoggingEnabled(process.env.COLLABMD_PERF_LOGGING),
     port: parsePositiveInt(process.env.PORT, 1234),
     nodeEnv,

package/src/server/create-app-server.js

@@ -1,4 +1,5 @@
 import { createServer } from 'http';
+import { resolve } from 'node:path';
 
 import { loadConfig } from './config/env.js';
 import { createAuthService } from './auth/create-auth-service.js';
@@ -13,6 +14,7 @@ import { GitHubAppClient } from './infrastructure/github/github-app-client.js';
 import { GitHubSetupFlow } from './infrastructure/github/github-setup-flow.js';
 import { HostedWorkspaceService } from './domain/hosted-workspace.js';
 import { PlantUmlRenderer } from './infrastructure/plantuml/plantuml-renderer.js';
+import { StructurizrWorkspaceService } from './infrastructure/structurizr/structurizr-workspace-service.js';
 import { RoomRegistry } from './domain/collaboration/room-registry.js';
 import { RipgrepSearchService } from './domain/ripgrep-search-service.js';
 import { createRequestHandler } from './infrastructure/http/create-request-handler.js';
@@ -83,12 +85,20 @@ export function createAppServer(config = loadConfig()) {
   const plantUmlRenderer = new PlantUmlRenderer({
     serverUrl: config.plantumlServerUrl,
   });
+  const structurizrWorkspaceService = new StructurizrWorkspaceService({
+    mirrorDir: config.structurizr?.mirrorDir || resolve(config.vaultDir, '.collabmd/structurizr'),
+    serverUrl: config.structurizr?.serverUrl || '',
+    trustedExecutableDsl: config.structurizr?.trustedExecutableDsl,
+    vaultDir: config.vaultDir,
+  });
   const gitService = new GitService({
     commandEnv: config.git?.commandEnv,
     enabled: config.gitEnabled,
     vaultDir: config.vaultDir,
   });
   const searchService = new RipgrepSearchService({
+    maxBufferBytes: config.searchMaxBufferBytes,
+    maxFileSize: config.searchMaxFileSize,
     perfLoggingEnabled: config.perfLoggingEnabled,
     vaultDir: config.vaultDir,
   });
@@ -153,6 +163,7 @@ export function createAppServer(config = loadConfig()) {
     fileSystemSyncService,
     hostedWorkspaceService,
     githubSetupFlow,
+    structurizrWorkspaceService,
   );
   const httpServer = createServer((req, res) => {
     requestHandler(req, res).catch((error) => {
@@ -315,6 +326,7 @@ export function createAppServer(config = loadConfig()) {
     gitService,
     hostedWorkspaceService,
     searchService,
+    structurizrWorkspaceService,
     setTestHydrateDelayMs(delayMs = 0) {
       testControls.wsRoomHydrateDelayMs = Math.max(0, Number(delayMs) || 0);
     },

package/src/server/domain/bases/base-definition.js

@@ -2,7 +2,7 @@ import { dump as dumpYaml, loadAll as loadAllYaml } from 'js-yaml';
 
 const SUPPORTED_VIEW_TYPES = new Set(['cards', 'list', 'table']);
 
-function isPlainObject(value) {
+export function isPlainObject(value) {
   return Object.prototype.toString.call(value) === '[object Object]';
 }
 

package/src/server/domain/bases/base-expression-runtime.js

@@ -1,9 +1,6 @@
 import { isImageAttachmentFilePath } from '../../../domain/file-kind.js';
 import { resolveVaultRelativePath } from '../../../domain/vault-paths.js';
-
-function isPlainObject(value) {
-  return Object.prototype.toString.call(value) === '[object Object]';
-}
+import { isPlainObject } from './base-definition.js';
 
 export function createLinkValue(target, {
   display = '',

package/src/server/domain/bases/base-index-snapshot-store.js

@@ -12,6 +12,7 @@ import {
   createReferenceTargetAliasMap,
 } from '../markdown-reference-extractor.js';
 import { mapWithConcurrency } from '../../shared/async-utils.js';
+import { isPlainObject } from './base-definition.js';
 import { createLinkValue, dedupeLinkValues } from './base-expression-runtime.js';
 
 const INLINE_TAG_RE = /(^|[\s(])#([A-Za-z0-9/_-]+)/g;
@@ -39,10 +40,6 @@ function createRowCacheKey(filePath, workspaceState, fileSetSignature) {
   ].join('\0');
 }
 
-function isPlainObject(value) {
-  return Object.prototype.toString.call(value) === '[object Object]';
-}
-
 function normalizeTags(value) {
   if (Array.isArray(value)) {
     return value

package/src/server/domain/bases/base-transform.js

@@ -2,15 +2,12 @@ import { dump as dumpYaml } from 'js-yaml';
 
 import {
   findView,
+  isPlainObject,
   normalizeBaseDefinition,
   normalizeRawDefinitionForWrite,
   parseBaseSource,
 } from './base-definition.js';
 
-function isPlainObject(value) {
-  return Object.prototype.toString.call(value) === '[object Object]';
-}
-
 function cloneRawSource(source = '') {
   const parsed = parseBaseSource(source);
   return isPlainObject(parsed) ? parsed : {};

package/src/server/domain/collaboration/collaboration-room.js

@@ -6,9 +6,9 @@ import * as decoding from 'lib0/decoding';
 
 import { MSG_AWARENESS, MSG_SYNC } from './protocol.js';
 import { CollaborationDocumentStore } from './collaboration-document-store.js';
-import { RoomPersistenceController } from './room-persistence-controller.js';
 import { logPerfEvent } from '../../config/perf-logging.js';
 import { populateCommentThreads, serializeCommentThreads } from '../../../domain/comment-threads.js';
+import { getVaultFileKind } from '../../../domain/file-kind.js';
 import {
   EXCALIDRAW_APP_STATE_KEY,
   EXCALIDRAW_ELEMENTS_KEY,
@@ -123,7 +123,7 @@ function readAwarenessEntries(update) {
 }
 
 function isExcalidrawRoom(name) {
-  return typeof name === 'string' && name.endsWith('.excalidraw');
+  return getVaultFileKind(name) === 'excalidraw';
 }
 
 function isWorkspaceRoom(name) {
@@ -214,15 +214,10 @@ export class CollaborationRoom {
       lastHydrate: null,
       lastInitialSyncAt: 0,
     };
-    this.persistence = new RoomPersistenceController({
-      idleGraceMs: this.idleGraceMs,
-      onDestroy: () => {
-        this.awareness.destroy();
-        this.doc.destroy();
-        this.onEmpty?.(this.name);
-      },
-      onPersist: () => this.persist(),
-    });
+    this.persistTimer = null;
+    this.destroyTimer = null;
+    this.finalizePromise = null;
+    this.shutdownGeneration = 0;
 
     this.awareness.setLocalState(null);
     this.registerDocListeners();
@@ -475,11 +470,12 @@ export class CollaborationRoom {
       return;
     }
 
-    this.persistence.schedulePersist(async () => {
+    clearTimeout(this.persistTimer);
+    this.persistTimer = setTimeout(() => {
       this.persist().catch((error) => {
         console.error(`[room:${this.name}] Failed to persist document:`, error.message);
       });
-    });
+    }, 500);
   }
 
   async persist() {
@@ -620,9 +616,17 @@ export class CollaborationRoom {
     this.documentStore?.rename(nextName);
   }
 
+  cancelPersistenceTimers() {
+    this.shutdownGeneration += 1;
+    clearTimeout(this.persistTimer);
+    clearTimeout(this.destroyTimer);
+    this.persistTimer = null;
+    this.destroyTimer = null;
+  }
+
   markDeleted() {
     this.deleted = true;
-    this.persistence.cancelAll();
+    this.cancelPersistenceTimers();
     if (this.clients.size === 0) {
       this.finalizeIfIdle();
     }
@@ -669,7 +673,9 @@ export class CollaborationRoom {
   }
 
   async addClient(ws, { sendInitialSync: shouldSendInitialSync = true } = {}) {
-    this.persistence.markActivity();
+    this.shutdownGeneration += 1;
+    clearTimeout(this.destroyTimer);
+    this.destroyTimer = null;
     await this.hydrate();
 
     this.ensureClientState(ws);
@@ -721,9 +727,9 @@ export class CollaborationRoom {
     }
 
     this.destroyed = true;
-    this.persistence.cancelAll();
+    this.cancelPersistenceTimers();
     await Promise.allSettled([
-      this.persistence.finalizePromise,
+      this.finalizePromise,
       this.activePersistPromise,
     ]);
 
@@ -745,12 +751,40 @@ export class CollaborationRoom {
   }
 
   finalizeIfIdle() {
-    return this.persistence.finalizeIfIdle({
-      isIdle: () => this.clients.size === 0,
-      onPersistError: (error) => {
+    if (this.clients.size > 0 || this.finalizePromise) {
+      return;
+    }
+
+    const generation = ++this.shutdownGeneration;
+    this.finalizePromise = (async () => {
+      clearTimeout(this.persistTimer);
+      this.persistTimer = null;
+
+      try {
+        await this.persist();
+      } catch (error) {
         console.error(`[room:${this.name}] Failed to persist final room state:`, error.message);
-      },
+      }
+
+      if (this.clients.size > 0 || generation !== this.shutdownGeneration) {
+        return;
+      }
+
+      this.destroyTimer = setTimeout(() => {
+        if (this.clients.size > 0 || generation !== this.shutdownGeneration) {
+          return;
+        }
+
+        this.awareness.destroy();
+        this.doc.destroy();
+        this.onEmpty?.(this.name);
+      }, this.idleGraceMs);
+      this.destroyTimer.unref?.();
+    })().finally(() => {
+      this.finalizePromise = null;
     });
+
+    return this.finalizePromise;
   }
 
   clearEphemeralExcalidrawHistory() {

package/src/server/domain/comment-overview.js

@@ -39,10 +39,16 @@ function createThreadSummary(thread) {
   }
 
   const id = asString(thread.id);
+  const anchorKind = asString(thread.anchorKind) || 'line';
+  const isDiagramElementAnchor = anchorKind === 'diagram-element';
   const anchorStartLine = asFiniteNumber(thread.anchorStartLine);
   const anchorEndLine = asFiniteNumber(thread.anchorEndLine);
   const messages = asArray(thread.messages);
-  if (!id || anchorStartLine === null || anchorEndLine === null || messages.length === 0) {
+  if (
+    !id
+    || messages.length === 0
+    || (!isDiagramElementAnchor && (anchorStartLine === null || anchorEndLine === null))
+  ) {
     return null;
   }
 
@@ -53,10 +59,14 @@ function createThreadSummary(thread) {
 
   return {
     anchor: {
-      endLine: Math.max(anchorEndLine, anchorStartLine),
-      kind: asString(thread.anchorKind) || 'line',
-      quote: asString(thread.anchorQuote),
-      startLine: Math.max(anchorStartLine, 1),
+      ...(isDiagramElementAnchor
+        ? {}
+        : {
+          endLine: Math.max(anchorEndLine, anchorStartLine),
+          startLine: Math.max(anchorStartLine, 1),
+        }),
+      kind: anchorKind,
+      quote: asString(thread.anchorQuote) || (isDiagramElementAnchor ? 'Diagram element' : ''),
     },
     createdAt: asFiniteNumber(thread.createdAt) ?? latestActivityAt,
     createdByColor: asString(thread.createdByColor),

package/src/server/domain/ripgrep-search-service.js

@@ -22,7 +22,9 @@ const TEXT_SEARCH_GLOBS = Object.freeze([
   '*.mermaid',
   '*.puml',
   '*.plantuml',
+  '*.dsl',
   '*.drawio',
+  '*.excalidraw',
 ]);
 
 function normalizePositiveInt(value, fallback, { min = 1, max = Number.MAX_SAFE_INTEGER } = {}) {
@@ -278,6 +280,7 @@ export class RipgrepSearchService {
   async search({
     limit = DEFAULT_MAX_FILES,
     query = '',
+    signal = null,
   } = {}) {
     const normalizedQuery = String(query ?? '').trim();
     const maxFiles = normalizePositiveInt(limit, this.maxFiles, {
@@ -310,6 +313,7 @@ export class RipgrepSearchService {
         cwd: this.vaultDir,
         encoding: 'utf8',
         maxBuffer: this.maxBufferBytes,
+        ...(signal ? { signal } : {}),
         timeout: this.timeoutMs,
       });
       const parsed = parseRipgrepJson(result.stdout, {

package/src/server/infrastructure/git/diff-service.js

@@ -1,5 +1,6 @@
 import { countPatchLines, parseNumstatOutput, parseUnifiedDiff } from './parsers.js';
 import { createEmptyStats } from './responses.js';
+import { getVaultFileKind } from '../../../domain/file-kind.js';
 
 function createSectionMap(sections = []) {
   return new Map(sections.map((section) => [section.key, section]));
@@ -33,6 +34,7 @@ function mergeScopedFile(existingFile, nextFile, scope) {
     return {
       ...nextFile,
       ...nextFlags,
+      fileKind: nextFile.fileKind || getVaultFileKind(nextFile.path),
       scope,
       stats: createEmptyStats(),
     };
@@ -44,6 +46,7 @@ function mergeScopedFile(existingFile, nextFile, scope) {
     return {
       ...existingFile,
       ...nextFile,
+      fileKind: existingFile.fileKind || getVaultFileKind(nextFile.path),
       hasStagedChanges: existingFile.hasStagedChanges || nextFlags.hasStagedChanges,
       hasUntrackedChanges: existingFile.hasUntrackedChanges || nextFlags.hasUntrackedChanges,
       hasWorkingTreeChanges: existingFile.hasWorkingTreeChanges || nextFlags.hasWorkingTreeChanges,
@@ -54,6 +57,7 @@ function mergeScopedFile(existingFile, nextFile, scope) {
 
   return {
     ...existingFile,
+    fileKind: existingFile.fileKind || getVaultFileKind(nextFile.path),
     hasStagedChanges: existingFile.hasStagedChanges || nextFlags.hasStagedChanges,
     hasUntrackedChanges: existingFile.hasUntrackedChanges || nextFlags.hasUntrackedChanges,
     hasWorkingTreeChanges: existingFile.hasWorkingTreeChanges || nextFlags.hasWorkingTreeChanges,
@@ -372,6 +376,7 @@ export class GitDiffService {
       return {
         ...file,
         ...detail,
+        fileKind: file.fileKind || detail.fileKind || getVaultFileKind(file.path),
         canLoadFullPatch: false,
         patchLineCount,
         tooLarge: false,