collabmd 0.1.42 → 0.1.44

package/src/client/styles/features/comment-overlays.css

@@ -34,6 +34,21 @@
   position: absolute;
 }
 
+.comment-preview-selection-chip {
+  --ui-chip-color: var(--color-comment);
+  position: absolute;
+  z-index: 2;
+  box-shadow: var(--shadow-sm);
+  pointer-events: auto;
+}
+
+@media (pointer: coarse) {
+  .comment-preview-selection-chip {
+    min-height: 44px;
+    padding-inline: var(--space-3);
+  }
+}
+
 .comment-preview-highlight {
   position: absolute;
   border: 1px solid oklch(from var(--color-comment) l c h / 0.16);

package/src/client/styles/features/comment-overview.css

@@ -87,11 +87,16 @@
     box-shadow var(--transition-interactive);
 }
 
-.comment-overview-thread:hover,
-.comment-overview-thread:focus-visible {
+.comment-overview-thread:hover {
   border-color: transparent;
-  background: var(--color-surface-offset);
-  box-shadow: inset 3px 0 0 var(--color-comment);
+  background: var(--surface-comment-record-hover);
+  box-shadow: none;
+}
+
+.comment-overview-thread:focus-visible {
+  border-color: var(--border-comment-strong);
+  background: var(--surface-comment-record-hover);
+  box-shadow: var(--shadow-focus-compact);
   outline: none;
 }
 

package/src/client/styles/features/comments-drawer.css

@@ -46,7 +46,6 @@
   --ui-record-bg-hover: var(--color-surface-offset);
   --ui-record-border-active: var(--border-comment-active);
   --ui-record-bg-active: var(--color-surface-offset);
-  --ui-record-shadow-active: inset 3px 0 0 var(--color-comment);
 }
 
 .comments-drawer-item-header {

package/src/client/styles/features/diagram-preview.css

@@ -49,6 +49,26 @@
   background: var(--color-surface-offset);
 }
 
+.diagram-preview-error-card {
+  align-items: flex-start;
+  border-top: 1px solid var(--color-divider);
+  background: var(--color-error-highlight);
+  color: var(--color-error);
+  font-size: var(--text-xs);
+}
+
+.diagram-preview-error-card .diagram-preview-placeholder-copy details {
+  color: var(--color-text-muted);
+}
+
+.diagram-preview-error-card .diagram-preview-placeholder-copy code {
+  display: block;
+  max-width: min(60ch, 100%);
+  margin-top: var(--space-2);
+  overflow-wrap: anywhere;
+  white-space: pre-wrap;
+}
+
 .diagram-preview-toolbar {
   display: flex;
   align-items: center;

package/src/client/styles/features/diff-commit.css

@@ -80,7 +80,6 @@
   --ui-record-bg-hover: var(--color-surface-offset);
   --ui-record-border-active: transparent;
   --ui-record-bg-active: var(--color-surface-offset);
-  --ui-record-shadow-active: inset 3px 0 0 var(--color-primary);
 }
 
 .diff-index-item-top,
@@ -121,7 +120,6 @@
 
 .diff-commit-section.active {
   border-color: var(--border-accent-strong);
-  box-shadow: inset 3px 0 0 var(--color-primary);
 }
 
 .diff-commit-section-header {

package/src/client/styles/features/git-history.css

@@ -16,7 +16,6 @@
   --ui-record-bg-hover: var(--color-surface-offset);
   --ui-record-border-active: transparent;
   --ui-record-bg-active: var(--color-surface-offset);
-  --ui-record-shadow-active: inset 3px 0 0 var(--color-primary);
 }
 
 .git-history-subject {
@@ -152,7 +151,6 @@
   --ui-record-bg-hover: var(--color-surface-offset);
   --ui-record-border-active: transparent;
   --ui-record-bg-active: var(--color-surface-offset);
-  --ui-record-shadow-active: inset 3px 0 0 var(--color-primary);
   box-sizing: border-box;
   display: block;
   max-width: 100%;

package/src/client/styles/features/quick-switcher.css

@@ -179,10 +179,6 @@
 .qs-result-item:hover,
 .qs-result-item.selected {
   background: var(--color-surface-offset);
-}
-
-.qs-result-item.selected {
-  box-shadow: inset 3px 0 0 var(--color-primary);
   color: var(--color-text);
 }
 
@@ -286,10 +282,6 @@
   background: var(--color-surface-offset);
 }
 
-.qs-text-item.selected {
-  box-shadow: inset 3px 0 0 var(--color-primary);
-}
-
 .qs-text-line {
   color: var(--color-text-faint);
   font-family: var(--font-mono);

package/src/client/styles/foundation/themes.css

@@ -68,11 +68,8 @@
   --surface-success-soft: color-mix(in oklab, var(--color-success) 14%, transparent);
   --surface-warning-soft: color-mix(in oklab, var(--color-warning) 14%, transparent);
   --surface-danger-soft: color-mix(in oklab, var(--color-error) 14%, transparent);
-  --surface-comment-shell: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.035), transparent 120px), color-mix(in srgb, var(--color-surface) 96%, var(--color-comment) 4%);
   --surface-comment-shell-header: color-mix(in srgb, var(--color-surface) 97%, var(--color-comment) 3%);
-  --surface-comment-record: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.028), transparent 70%), color-mix(in srgb, var(--color-surface-2) 95%, var(--color-comment) 5%);
-  --surface-comment-record-hover: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.042), transparent 70%), color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
-  --surface-comment-record-active: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.055), transparent 72%), color-mix(in srgb, var(--color-surface-2) 90%, var(--color-comment) 10%);
+  --surface-comment-record-hover: color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
   --surface-comment-subtle: color-mix(in srgb, var(--color-surface-2) 95%, var(--color-comment) 5%);
   --surface-comment-subtle-strong: color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
   --surface-comment-card: color-mix(in srgb, var(--color-surface) 94%, var(--color-comment) 6%);
@@ -90,10 +87,10 @@
   --border-comment-strong: color-mix(in srgb, var(--color-border) 82%, var(--color-comment) 18%);
   --border-comment-active: color-mix(in srgb, var(--color-border) 78%, var(--color-comment) 22%);
   --shadow-comment-outline: 0 0 0 1px oklch(from var(--color-comment) l c h / 0.14);
-  --surface-warning-toast: linear-gradient(135deg, color-mix(in oklab, #fcd34d 42%, white 58%), color-mix(in oklab, white 94%, #fff7ed 6%) 42%), #fff8e7;
+  --surface-warning-toast: var(--color-warning-highlight);
   --border-warning-toast: color-mix(in oklab, #f59e0b 84%, #b45309 16%);
   --text-warning-toast: #422006;
-  --shadow-warning-toast: 0 16px 30px rgb(84 46 10 / 0.18), 0 0 0 1px rgb(245 158 11 / 0.12);
+  --shadow-warning-toast: var(--shadow-md);
   --border-accent-soft: color-mix(in oklab, var(--color-primary) 22%, transparent);
   --border-accent-muted: color-mix(in oklab, var(--color-primary) 24%, var(--color-border));
   --border-accent-strong: color-mix(in oklab, var(--color-primary) 34%, var(--color-border));
@@ -189,11 +186,8 @@
   --surface-success-soft: color-mix(in oklab, var(--color-success) 14%, transparent);
   --surface-warning-soft: color-mix(in oklab, var(--color-warning) 14%, transparent);
   --surface-danger-soft: color-mix(in oklab, var(--color-error) 14%, transparent);
-  --surface-comment-shell: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.035), transparent 120px), color-mix(in srgb, var(--color-surface) 96%, var(--color-comment) 4%);
   --surface-comment-shell-header: color-mix(in srgb, var(--color-surface) 97%, var(--color-comment) 3%);
-  --surface-comment-record: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.028), transparent 70%), color-mix(in srgb, var(--color-surface-2) 95%, var(--color-comment) 5%);
-  --surface-comment-record-hover: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.042), transparent 70%), color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
-  --surface-comment-record-active: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.055), transparent 72%), color-mix(in srgb, var(--color-surface-2) 90%, var(--color-comment) 10%);
+  --surface-comment-record-hover: color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
   --surface-comment-subtle: color-mix(in srgb, var(--color-surface-2) 95%, var(--color-comment) 5%);
   --surface-comment-subtle-strong: color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
   --surface-comment-card: color-mix(in srgb, var(--color-surface) 94%, var(--color-comment) 6%);
@@ -211,10 +205,10 @@
   --border-comment-strong: color-mix(in srgb, var(--color-border) 82%, var(--color-comment) 18%);
   --border-comment-active: color-mix(in srgb, var(--color-border) 78%, var(--color-comment) 22%);
   --shadow-comment-outline: 0 0 0 1px oklch(from var(--color-comment) l c h / 0.14);
-  --surface-warning-toast: linear-gradient(135deg, color-mix(in oklab, #f59e0b 32%, transparent), color-mix(in oklab, var(--color-surface) 86%, #0b1022 14%) 42%), color-mix(in oklab, var(--color-surface) 74%, #1b1320 26%);
+  --surface-warning-toast: var(--color-warning-highlight);
   --border-warning-toast: color-mix(in oklab, #f59e0b 78%, white 10%);
   --text-warning-toast: color-mix(in oklab, white 92%, #fef3c7 8%);
-  --shadow-warning-toast: 0 18px 34px rgb(0 0 0 / 0.38), 0 0 0 1px color-mix(in oklab, #f59e0b 18%, transparent);
+  --shadow-warning-toast: var(--shadow-md);
   --border-accent-soft: color-mix(in oklab, var(--color-primary) 22%, transparent);
   --border-accent-muted: color-mix(in oklab, var(--color-primary) 24%, var(--color-border));
   --border-accent-strong: color-mix(in oklab, var(--color-primary) 34%, var(--color-border));
@@ -296,11 +290,8 @@
     --surface-success-soft: color-mix(in oklab, var(--color-success) 14%, transparent);
     --surface-warning-soft: color-mix(in oklab, var(--color-warning) 14%, transparent);
     --surface-danger-soft: color-mix(in oklab, var(--color-error) 14%, transparent);
-    --surface-comment-shell: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.035), transparent 120px), color-mix(in srgb, var(--color-surface) 96%, var(--color-comment) 4%);
     --surface-comment-shell-header: color-mix(in srgb, var(--color-surface) 97%, var(--color-comment) 3%);
-    --surface-comment-record: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.028), transparent 70%), color-mix(in srgb, var(--color-surface-2) 95%, var(--color-comment) 5%);
-    --surface-comment-record-hover: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.042), transparent 70%), color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
-    --surface-comment-record-active: linear-gradient(180deg, oklch(from var(--color-comment) l c h / 0.055), transparent 72%), color-mix(in srgb, var(--color-surface-2) 90%, var(--color-comment) 10%);
+    --surface-comment-record-hover: color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
     --surface-comment-subtle: color-mix(in srgb, var(--color-surface-2) 95%, var(--color-comment) 5%);
     --surface-comment-subtle-strong: color-mix(in srgb, var(--color-surface-2) 92%, var(--color-comment) 8%);
     --surface-comment-card: color-mix(in srgb, var(--color-surface) 94%, var(--color-comment) 6%);
@@ -318,10 +309,10 @@
     --border-comment-strong: color-mix(in srgb, var(--color-border) 82%, var(--color-comment) 18%);
     --border-comment-active: color-mix(in srgb, var(--color-border) 78%, var(--color-comment) 22%);
     --shadow-comment-outline: 0 0 0 1px oklch(from var(--color-comment) l c h / 0.14);
-    --surface-warning-toast: linear-gradient(135deg, color-mix(in oklab, #f59e0b 32%, transparent), color-mix(in oklab, var(--color-surface) 86%, #0b1022 14%) 42%), color-mix(in oklab, var(--color-surface) 74%, #1b1320 26%);
+    --surface-warning-toast: var(--color-warning-highlight);
     --border-warning-toast: color-mix(in oklab, #f59e0b 78%, white 10%);
     --text-warning-toast: color-mix(in oklab, white 92%, #fef3c7 8%);
-    --shadow-warning-toast: 0 18px 34px rgb(0 0 0 / 0.38), 0 0 0 1px color-mix(in oklab, #f59e0b 18%, transparent);
+    --shadow-warning-toast: var(--shadow-md);
     --border-accent-soft: color-mix(in oklab, var(--color-primary) 22%, transparent);
     --border-accent-muted: color-mix(in oklab, var(--color-primary) 24%, var(--color-border));
     --border-accent-strong: color-mix(in oklab, var(--color-primary) 34%, var(--color-border));

package/src/client/styles/layout/responsive.css

@@ -196,7 +196,7 @@
   }
 
   .ui-nav-tabs {
-    padding: var(--space-2) var(--space-2) 0;
+    padding: var(--space-1) var(--space-2) 0;
   }
 
   .ui-nav-tab {

package/src/client/styles/layout/sidebar.css

@@ -410,38 +410,34 @@ body.is-file-tree-dragging * {
   min-height: 44px;
 }
 
-.create-action-sheet-option {
+.ui-button.create-action-sheet-option {
   gap: 10px;
   min-height: 60px;
   padding: 0 14px;
   border: 1px solid var(--color-border);
   border-radius: var(--radius-lg);
-  background:
-    linear-gradient(180deg, oklch(from var(--color-surface-offset) calc(l + 0.02) c h / 0.9), var(--color-surface-offset)),
-    var(--color-surface-offset);
+  background: var(--color-surface-offset);
   color: var(--color-text);
-  box-shadow:
-    inset 0 1px 0 oklch(from var(--color-text) l c h / 0.03),
-    0 10px 24px oklch(from var(--color-bg) l c h / 0.08);
+  box-shadow: var(--shadow-sm);
   transition:
     border-color var(--transition-interactive),
     background var(--transition-interactive),
-    box-shadow var(--transition-interactive),
-    transform var(--transition-interactive);
-}
-
-.create-action-sheet-option:hover,
-.create-action-sheet-option:focus-visible {
-  border-color: oklch(from var(--color-primary) calc(l + 0.06) c h / 0.4);
-  background:
-    linear-gradient(180deg, oklch(from var(--color-primary-highlight) calc(l + 0.02) c h / 0.72), var(--color-surface-offset)),
-    var(--color-surface-offset);
-  box-shadow:
-    inset 0 1px 0 oklch(from var(--color-text) l c h / 0.04),
-    0 14px 30px oklch(from var(--color-bg) l c h / 0.12);
+    box-shadow var(--transition-interactive);
+}
+
+.ui-button.create-action-sheet-option:hover {
+  border-color: var(--border-accent-muted);
+  background: var(--surface-accent-subtle);
+  box-shadow: var(--shadow-sm);
+  color: var(--color-text);
+}
+
+.ui-button.create-action-sheet-option:focus-visible {
+  border-color: var(--border-accent-strong);
+  background: var(--surface-accent-subtle);
+  box-shadow: var(--shadow-focus-compact);
   color: var(--color-text);
   outline: none;
-  transform: translateY(-1px);
 }
 
 .create-action-sheet-option .create-menu-item-icon {

package/src/client/styles/style.css

@@ -5,17 +5,35 @@
 @import './layout/sidebar.css';
 @import './layout/editor-page.css';
 @import './layout/shell.css';
+@import './primitives/controls.css';
+@import './components/actions.css';
+@import './components/navigation.css';
+@import './components/states.css';
 @import './components/surfaces.css';
 @import './components/scrollbars.css';
-@import './features/git.css';
-@import './features/diff.css';
-@import './features/collaboration-ui.css';
-@import './features/preview-content.css';
-@import './features/comments.css';
-@import './features/preview-sidebars.css';
+@import './features/git-branch.css';
+@import './features/git-files.css';
+@import './features/git-history.css';
+@import './features/diff-toolbar.css';
+@import './features/diff-commit.css';
+@import './features/diff-lines.css';
+@import './features/collaboration-presence.css';
+@import './features/collaboration-chat.css';
+@import './features/collaboration-dialogs.css';
+@import './features/preview-markdown.css';
+@import './features/media-lightbox.css';
+@import './features/embedded-preview.css';
+@import './features/comments-drawer.css';
+@import './features/comment-overview.css';
+@import './features/comment-overlays.css';
+@import './features/comment-card.css';
+@import './features/comment-markdown.css';
+@import './features/backlinks.css';
+@import './features/outline.css';
 @import './layout/view-modes.css';
 @import './components/feedback.css';
 @import './layout/responsive.css';
-@import './overrides/vendor.css';
+@import './overrides/highlightjs.css';
+@import './overrides/codemirror.css';
 @import './features/quick-switcher.css';
 @import './features/diagram-preview.css';

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

@@ -6,6 +6,31 @@ body[data-surface='excalidraw-editor'][data-document-mode='preview'] .disable-vi
   display: none !important;
 }
 
+.excalidraw-editor-shell {
+  position: relative;
+  width: 100%;
+  height: 100vh;
+}
+
+.excalidraw-authority-banner {
+  position: absolute;
+  z-index: 20;
+  top: var(--space-3);
+  left: 50%;
+  max-width: min(36rem, calc(100vw - (2 * var(--space-4))));
+  padding: var(--space-2) var(--space-3);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  background: var(--color-surface-raised);
+  box-shadow: var(--shadow-md);
+  color: var(--color-text-muted);
+  font-size: var(--text-ui-sm);
+  line-height: 1.4;
+  text-align: center;
+  transform: translateX(-50%);
+  pointer-events: none;
+}
+
 .loading-state {
   display: flex;
   align-items: center;

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

@@ -221,15 +221,7 @@ export function isExcalidrawRoomDocStructured(ydoc) {
   }
 
   const meta = ydoc.getMap(EXCALIDRAW_META_KEY);
-  if (Number(meta.get(EXCALIDRAW_SCHEMA_VERSION_KEY)) === EXCALIDRAW_ROOM_SCHEMA_VERSION) {
-    return true;
-  }
-
-  return (
-    ydoc.getMap(EXCALIDRAW_ELEMENTS_KEY).size > 0
-    || ydoc.getMap(EXCALIDRAW_FILES_KEY).size > 0
-    || ydoc.getMap(EXCALIDRAW_APP_STATE_KEY).size > 0
-  );
+  return Number(meta.get(EXCALIDRAW_SCHEMA_VERSION_KEY)) === EXCALIDRAW_ROOM_SCHEMA_VERSION;
 }
 
 export function ensureExcalidrawRoomSchema(ydoc) {

package/src/domain/vault-paths.js

@@ -0,0 +1,41 @@
+export function resolveVaultRelativePath(fromFilePath = '', relativePath = '') {
+  const sourceSegments = String(fromFilePath ?? '')
+    .replace(/\\/g, '/')
+    .split('/')
+    .filter(Boolean);
+  const targetSegments = String(relativePath ?? '')
+    .split('/')
+    .map((segment) => {
+      try {
+        return decodeURIComponent(segment);
+      } catch {
+        return segment;
+      }
+    });
+
+  if (targetSegments.length === 0) {
+    return '';
+  }
+
+  sourceSegments.pop();
+  const resolvedSegments = [...sourceSegments];
+
+  for (const rawSegment of targetSegments) {
+    const segment = String(rawSegment ?? '').trim();
+    if (!segment || segment === '.') {
+      continue;
+    }
+
+    if (segment === '..') {
+      if (resolvedSegments.length === 0) {
+        return '';
+      }
+      resolvedSegments.pop();
+      continue;
+    }
+
+    resolvedSegments.push(segment);
+  }
+
+  return resolvedSegments.join('/');
+}

package/src/server/config/env.js

@@ -39,10 +39,6 @@ function parseOptionalPositiveInt(rawValue, {
   throw new Error(`${variableName} must be a positive integer.`);
 }
 
-function parsePort(rawPort, fallbackPort) {
-  return parsePositiveInt(rawPort, fallbackPort);
-}
-
 function normalizeOptionalString(value) {
   const normalized = String(value ?? '').trim();
   return normalized.length > 0 ? normalized : '';
@@ -401,7 +397,7 @@ export function loadConfig(overrides = {}) {
     maxDownloadFileBytes: parsePositiveInt(process.env.COLLABMD_MAX_DOWNLOAD_FILE_BYTES, 268_435_456),
     maxInitialSyncBytes: parsePositiveInt(process.env.COLLABMD_MAX_INITIAL_SYNC_BYTES, 16_777_216),
     perfLoggingEnabled: overrides.perfLoggingEnabled ?? isPerfLoggingEnabled(process.env.COLLABMD_PERF_LOGGING),
-    port: parsePort(process.env.PORT, 1234),
+    port: parsePositiveInt(process.env.PORT, 1234),
     nodeEnv,
     plantumlServerUrl: process.env.PLANTUML_SERVER_URL || 'https://www.plantuml.com/plantuml',
     publicDir,

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

@@ -1,55 +1,10 @@
 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]';
 }
 
-function normalizeVaultPathSegments(pathValue = '') {
-  return String(pathValue ?? '')
-    .replace(/\\/g, '/')
-    .split('/')
-    .filter(Boolean);
-}
-
-function resolveVaultRelativePath(fromFilePath, relativePath) {
-  const sourceSegments = normalizeVaultPathSegments(fromFilePath);
-  const targetSegments = String(relativePath ?? '')
-    .split('/')
-    .map((segment) => {
-      try {
-        return decodeURIComponent(segment);
-      } catch {
-        return segment;
-      }
-    });
-
-  if (targetSegments.length === 0) {
-    return '';
-  }
-
-  sourceSegments.pop();
-  const resolvedSegments = [...sourceSegments];
-
-  for (const rawSegment of targetSegments) {
-    const segment = String(rawSegment ?? '').trim();
-    if (!segment || segment === '.') {
-      continue;
-    }
-
-    if (segment === '..') {
-      if (resolvedSegments.length === 0) {
-        return '';
-      }
-      resolvedSegments.pop();
-      continue;
-    }
-
-    resolvedSegments.push(segment);
-  }
-
-  return resolvedSegments.join('/');
-}
-
 export function createLinkValue(target, {
   display = '',
   exists = false,

package/src/server/domain/collaboration/collaboration-document-store.js

@@ -1,11 +1,4 @@
-import {
-  isBaseFilePath,
-  isDrawioFilePath,
-  isExcalidrawFilePath,
-  isMarkdownFilePath,
-  isMermaidFilePath,
-  isPlantUmlFilePath,
-} from '../../../domain/file-kind.js';
+import { isMarkdownFilePath } from '../../../domain/file-kind.js';
 
 function assertWriteSucceeded(result, operation, filePath) {
   if (!result || result.ok !== false) {
@@ -39,47 +32,15 @@ export class CollaborationDocumentStore {
   }
 
   async readSnapshot() {
-    if (!this.vaultFileStore || typeof this.vaultFileStore.readCollaborationSnapshot !== 'function') {
-      return null;
-    }
-
-    return this.vaultFileStore.readCollaborationSnapshot(this.name);
+    return this.vaultFileStore?.readCollaborationSnapshot?.(this.name) ?? null;
   }
 
   async readContent() {
-    if (!this.vaultFileStore) {
-      return null;
-    }
-
-    if (isExcalidrawFilePath(this.name) && typeof this.vaultFileStore.readExcalidrawFile === 'function') {
-      return this.vaultFileStore.readExcalidrawFile(this.name);
-    }
-
-    if (isBaseFilePath(this.name) && typeof this.vaultFileStore.readBaseFile === 'function') {
-      return this.vaultFileStore.readBaseFile(this.name);
-    }
-
-    if (isDrawioFilePath(this.name) && typeof this.vaultFileStore.readDrawioFile === 'function') {
-      return this.vaultFileStore.readDrawioFile(this.name);
-    }
-
-    if (isMermaidFilePath(this.name) && typeof this.vaultFileStore.readMermaidFile === 'function') {
-      return this.vaultFileStore.readMermaidFile(this.name);
-    }
-
-    if (isPlantUmlFilePath(this.name) && typeof this.vaultFileStore.readPlantUmlFile === 'function') {
-      return this.vaultFileStore.readPlantUmlFile(this.name);
-    }
-
-    return this.vaultFileStore.readMarkdownFile(this.name);
+    return this.vaultFileStore?.readEditableVaultContent(this.name) ?? null;
   }
 
   async readCommentThreads() {
-    if (!this.vaultFileStore || typeof this.vaultFileStore.readCommentThreads !== 'function') {
-      return [];
-    }
-
-    return this.vaultFileStore.readCommentThreads(this.name);
+    return this.vaultFileStore?.readCommentThreads?.(this.name) ?? [];
   }
 
   async persistState({
@@ -92,69 +53,21 @@ export class CollaborationDocumentStore {
       return;
     }
 
-    if (typeof this.vaultFileStore.persistCollaborationState === 'function') {
-      const result = await this.vaultFileStore.persistCollaborationState(this.name, {
-        commentThreads,
-        content,
-        includeContent,
-        snapshot,
-      });
-      assertWriteSucceeded(result, 'persist collaboration state', this.name);
-    } else {
-      if (includeContent) {
-        await this.writeContent(content);
-      }
-      await this.writeCommentThreads(commentThreads);
-      await this.writeSnapshot(snapshot);
-    }
+    const result = await this.vaultFileStore.persistCollaborationState(this.name, {
+      commentThreads,
+      content,
+      includeContent,
+      snapshot,
+    });
+    assertWriteSucceeded(result, 'persist collaboration state', this.name);
 
     if (includeContent && this.backlinkIndex && isMarkdownFilePath(this.name)) {
       this.backlinkIndex.updateFile(this.name, content);
     }
   }
 
-  async writeContent(content) {
-    if (!this.vaultFileStore) {
-      return;
-    }
-
-    const options = { invalidateCollaborationSnapshot: false };
-    if (isExcalidrawFilePath(this.name) && typeof this.vaultFileStore.writeExcalidrawFile === 'function') {
-      const result = await this.vaultFileStore.writeExcalidrawFile(this.name, content, options);
-      assertWriteSucceeded(result, 'write content', this.name);
-      return;
-    }
-
-    if (isDrawioFilePath(this.name) && typeof this.vaultFileStore.writeDrawioFile === 'function') {
-      const result = await this.vaultFileStore.writeDrawioFile(this.name, content, options);
-      assertWriteSucceeded(result, 'write content', this.name);
-      return;
-    }
-
-    if (isBaseFilePath(this.name) && typeof this.vaultFileStore.writeBaseFile === 'function') {
-      const result = await this.vaultFileStore.writeBaseFile(this.name, content, options);
-      assertWriteSucceeded(result, 'write content', this.name);
-      return;
-    }
-
-    if (isMermaidFilePath(this.name) && typeof this.vaultFileStore.writeMermaidFile === 'function') {
-      const result = await this.vaultFileStore.writeMermaidFile(this.name, content, options);
-      assertWriteSucceeded(result, 'write content', this.name);
-      return;
-    }
-
-    if (isPlantUmlFilePath(this.name) && typeof this.vaultFileStore.writePlantUmlFile === 'function') {
-      const result = await this.vaultFileStore.writePlantUmlFile(this.name, content, options);
-      assertWriteSucceeded(result, 'write content', this.name);
-      return;
-    }
-
-    const result = await this.vaultFileStore.writeMarkdownFile(this.name, content, options);
-    assertWriteSucceeded(result, 'write content', this.name);
-  }
-
   async writeSnapshot(snapshot) {
-    if (!snapshot || !this.vaultFileStore || typeof this.vaultFileStore.writeCollaborationSnapshot !== 'function') {
+    if (!snapshot || !this.vaultFileStore?.writeCollaborationSnapshot) {
       return;
     }
 
@@ -162,20 +75,4 @@ export class CollaborationDocumentStore {
     assertWriteSucceeded(result, 'write collaboration snapshot', this.name);
   }
 
-  async deleteSnapshot() {
-    if (!this.vaultFileStore || typeof this.vaultFileStore.deleteCollaborationSnapshot !== 'function') {
-      return;
-    }
-
-    await this.vaultFileStore.deleteCollaborationSnapshot(this.name);
-  }
-
-  async writeCommentThreads(threads) {
-    if (!this.vaultFileStore || typeof this.vaultFileStore.writeCommentThreads !== 'function') {
-      return;
-    }
-
-    const result = await this.vaultFileStore.writeCommentThreads(this.name, threads);
-    assertWriteSucceeded(result, 'write comment threads', this.name);
-  }
 }