collabmd 0.1.45 → 0.1.47

package/src/client/styles/surfaces/excalidraw-editor.css

@@ -31,6 +31,300 @@ body[data-surface='excalidraw-editor'][data-document-mode='preview'] .disable-vi
   pointer-events: none;
 }
 
+.diagram-comments-overlay {
+  position: absolute;
+  z-index: 25;
+  inset: 0;
+  pointer-events: none;
+}
+
+.diagram-comments-toolbar {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--space-2);
+  pointer-events: auto;
+}
+
+.diagram-comment-button,
+.diagram-comment-close,
+.diagram-comment-back,
+.diagram-comment-marker {
+  border: 0;
+  font: inherit;
+  cursor: pointer;
+}
+
+.diagram-comment-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: var(--space-2);
+  min-height: var(--control-h-sm);
+  padding: 0 var(--space-3);
+  border: 1px solid transparent;
+  border-radius: var(--radius-md);
+  background: transparent;
+  color: var(--color-text);
+  box-shadow: none;
+  transition: transform var(--transition-interactive), background var(--transition-interactive), border-color var(--transition-interactive), color var(--transition-interactive);
+}
+
+.diagram-comment-button:hover:not(:disabled),
+.diagram-comment-back:hover {
+  border-color: var(--color-comment);
+}
+
+.diagram-comment-button:hover:not(:disabled),
+.diagram-comment-button.is-active {
+  background: var(--color-surface-raised);
+}
+
+.diagram-comment-button:active:not(:disabled),
+.diagram-comment-add:active:not(:disabled) {
+  transform: translateY(1px);
+}
+
+.diagram-comment-button:focus-visible,
+.diagram-comment-add:focus-visible,
+.diagram-comment-close:focus-visible,
+.diagram-comment-back:focus-visible,
+.diagram-comment-marker:focus-visible {
+  outline: 2px solid var(--color-primary);
+  outline-offset: 2px;
+}
+
+.diagram-comment-icon {
+  width: 15px;
+  height: 15px;
+  flex: 0 0 auto;
+}
+
+.diagram-comments-toolbar .diagram-comment-button,
+.diagram-comments-toolbar .diagram-comment-add {
+  position: relative;
+}
+
+.diagram-comment-count {
+  position: absolute;
+  top: -4px;
+  right: -4px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  min-width: 1.125rem;
+  height: 1.125rem;
+  padding: 0 0.25rem;
+  border: 2px solid var(--color-surface);
+  border-radius: var(--radius-full);
+  background: var(--color-comment);
+  color: var(--color-primary-contrast);
+  font-family: inherit;
+  font-size: var(--text-caption);
+  font-variant-numeric: tabular-nums;
+  font-weight: 700;
+  line-height: 1;
+  text-align: center;
+  pointer-events: none;
+}
+
+.diagram-comment-add {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: var(--control-h-sm);
+  min-width: var(--control-h-sm);
+  height: var(--control-h-sm);
+  padding: 0;
+  border: 1px solid var(--border-comment-soft);
+  border-radius: var(--radius-md);
+  background: var(--color-comment-soft);
+  color: var(--color-comment-text);
+  cursor: pointer;
+  transition: transform var(--transition-interactive), background var(--transition-interactive), border-color var(--transition-interactive), color var(--transition-interactive);
+}
+
+.diagram-comment-add:hover:not(:disabled) {
+  border-color: var(--border-comment-active);
+  background: var(--surface-comment-offset-active);
+}
+
+.diagram-comment-button.is-primary {
+  border-color: var(--color-primary);
+  background: var(--color-primary);
+  color: var(--color-primary-contrast);
+}
+
+.diagram-comment-button.is-danger {
+  color: var(--color-error);
+}
+
+.diagram-comment-button:disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+
+.diagram-comment-add:disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+
+.diagram-comment-markers {
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+}
+
+.diagram-comment-marker {
+  position: absolute;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  padding: 0;
+  border: 2px solid var(--color-surface);
+  border-radius: 50%;
+  background: var(--color-comment);
+  color: var(--color-primary-contrast);
+  box-shadow: var(--shadow-accent-ring);
+  pointer-events: auto;
+  transform: translate(-50%, -50%);
+}
+
+.diagram-comment-marker.is-active {
+  box-shadow: var(--shadow-accent-ring-strong);
+}
+
+.diagram-comments-drawer {
+  position: absolute;
+  top: 4.5rem;
+  right: var(--space-3);
+  bottom: var(--space-3);
+  display: flex;
+  flex-direction: column;
+  width: min(22rem, calc(100vw - (2 * var(--space-3))));
+  border: 1px solid var(--color-divider);
+  border-radius: var(--radius-lg);
+  background: var(--color-surface);
+  box-shadow: var(--shadow-lg);
+  color: var(--color-text);
+  pointer-events: auto;
+  overflow: hidden;
+}
+
+.diagram-comments-drawer-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: var(--space-3);
+  border-bottom: 1px solid var(--color-divider);
+  background: var(--color-surface);
+}
+
+.diagram-comments-drawer-header-actions {
+  display: flex;
+  align-items: center;
+  gap: var(--space-1);
+}
+
+.diagram-comment-close {
+  width: 28px;
+  height: 28px;
+  border-radius: var(--radius-full);
+  background: transparent;
+  color: var(--color-text-muted);
+  font-size: 22px;
+}
+
+.diagram-comments-drawer-content {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  gap: var(--space-3);
+  padding: var(--space-3);
+  overflow: auto;
+}
+
+.diagram-comment-message-body {
+  margin: 0;
+  color: var(--color-text-muted);
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
+.diagram-comment-message-meta {
+  color: var(--color-comment-text);
+  font-weight: 650;
+}
+
+.diagram-comments-drawer-content.is-list {
+  gap: 0;
+  padding: var(--space-2) var(--space-2) var(--space-4);
+}
+
+.diagram-comment-anchor-label {
+  margin: 0;
+  color: var(--color-text-muted);
+  font-size: var(--text-ui-sm);
+}
+
+.diagram-comment-back {
+  align-self: flex-start;
+  padding: 0;
+  background: transparent;
+  color: var(--color-comment-text);
+}
+
+.diagram-comment-messages {
+  display: grid;
+  gap: var(--space-2);
+}
+
+.diagram-comment-message {
+  padding: var(--space-3);
+  border: 1px solid var(--border-comment-soft);
+  border-radius: var(--radius-md);
+  background: var(--color-surface-2);
+}
+
+.diagram-comment-form {
+  display: grid;
+  gap: var(--space-3);
+}
+
+.diagram-comment-input {
+  width: 100%;
+  box-sizing: border-box;
+  resize: vertical;
+  padding: var(--space-2) var(--space-3);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  background: var(--color-surface);
+  color: var(--color-text);
+  font: inherit;
+}
+
+.diagram-comment-input:focus {
+  border-color: var(--color-primary);
+  outline: none;
+  box-shadow: var(--shadow-focus-compact);
+}
+
+.diagram-comment-form-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: var(--space-2);
+}
+
+@media (max-width: 600px) {
+  .diagram-comments-drawer {
+    top: var(--space-3);
+    right: var(--space-3);
+    bottom: 4.25rem;
+  }
+}
+
 .loading-state {
   display: flex;
   align-items: center;

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 = '',