collabmd 0.1.43 → 0.1.44

package/src/server/infrastructure/git/responses.js

@@ -1,8 +1,3 @@
-import {
-  createEmptyWorkspaceChange as createSharedEmptyWorkspaceChange,
-  createWorkspaceChange as createSharedWorkspaceChange,
-} from '../../../domain/workspace-change.js';
-
 const STATUS_MAP = {
   A: { code: 'A', label: 'added', status: 'added' },
   C: { code: 'C', label: 'copied', status: 'copied' },
@@ -47,10 +42,6 @@ export function createEmptyBranchStatus() {
   };
 }
 
-export function createEmptyWorkspaceChange() {
-  return createSharedEmptyWorkspaceChange();
-}
-
 export function createEmptyStatusResponse() {
   return {
     branch: createEmptyBranchStatus(),
@@ -158,17 +149,3 @@ export function createFileSnapshotResponse({
     path,
   };
 }
-
-export function createWorkspaceChange({
-  changedPaths = [],
-  deletedPaths = [],
-  refreshExplorer = true,
-  renamedPaths = [],
-} = {}) {
-  return createSharedWorkspaceChange({
-    changedPaths,
-    deletedPaths,
-    refreshExplorer,
-    renamedPaths,
-  });
-}

package/src/server/infrastructure/git/untracked-files.js

@@ -2,7 +2,7 @@ import { createReadStream } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
-import { mapWithConcurrency } from './concurrency.js';
+import { mapWithConcurrency } from '../../shared/async-utils.js';
 import { createEmptyStats } from './responses.js';
 import { splitContentLines } from './parsers.js';
 

package/src/server/infrastructure/http/create-git-api-command-handler.js

@@ -1,4 +1,4 @@
-import { getRequestErrorStatusCode } from './http-errors.js';
+import { handleApiError, readRequestId } from './http-request-helpers.js';
 import { jsonResponse } from './http-response.js';
 import { parseJsonBody } from './request-body.js';
 import { createEmptyWorkspaceChange, hasWorkspaceMutation } from '../../../domain/workspace-change.js';
@@ -13,27 +13,6 @@ async function parseRequiredBody(req, res, fieldName) {
   return body;
 }
 
-function handleGitError(req, res, error, logMessage, fallbackMessage) {
-  const statusCode = getRequestErrorStatusCode(error);
-  if (statusCode) {
-    const payload = { error: error.message };
-    if (typeof error?.requestCode === 'string') {
-      payload.code = error.requestCode;
-    }
-    jsonResponse(req, res, statusCode, payload);
-    return true;
-  }
-
-  console.error(logMessage, error.message);
-  jsonResponse(req, res, 500, { error: fallbackMessage });
-  return true;
-}
-
-function readRequestId(req) {
-  const value = String(req.headers['x-collabmd-request-id'] || '').trim();
-  return value ? value.slice(0, 120) : null;
-}
-
 async function applyWorkspaceMutationEffects({
   action,
   req,
@@ -79,7 +58,7 @@ export function createGitApiCommandHandler({
           workspaceMutationCoordinator,
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to stage git file:', 'Failed to stage git file');
+        handleApiError(req, res, error, '[api] Failed to stage git file:', 'Failed to stage git file');
       }
       return true;
     }
@@ -100,7 +79,7 @@ export function createGitApiCommandHandler({
           workspaceMutationCoordinator,
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to unstage git file:', 'Failed to unstage git file');
+        handleApiError(req, res, error, '[api] Failed to unstage git file:', 'Failed to unstage git file');
       }
       return true;
     }
@@ -124,7 +103,7 @@ export function createGitApiCommandHandler({
           workspaceMutationCoordinator,
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to commit staged changes:', 'Failed to commit staged changes');
+        handleApiError(req, res, error, '[api] Failed to commit staged changes:', 'Failed to commit staged changes');
       }
       return true;
     }
@@ -140,7 +119,7 @@ export function createGitApiCommandHandler({
           workspaceMutationCoordinator,
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to push git branch:', 'Failed to push git branch');
+        handleApiError(req, res, error, '[api] Failed to push git branch:', 'Failed to push git branch');
       }
       return true;
     }
@@ -156,7 +135,7 @@ export function createGitApiCommandHandler({
           workspaceMutationCoordinator,
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to pull git branch:', 'Failed to pull git branch');
+        handleApiError(req, res, error, '[api] Failed to pull git branch:', 'Failed to pull git branch');
       }
       return true;
     }
@@ -177,7 +156,7 @@ export function createGitApiCommandHandler({
           workspaceMutationCoordinator,
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to reset git file:', 'Failed to reset git file');
+        handleApiError(req, res, error, '[api] Failed to reset git file:', 'Failed to reset git file');
       }
       return true;
     }

package/src/server/infrastructure/http/create-git-api-query-handler.js

@@ -1,4 +1,4 @@
-import { getRequestErrorStatusCode } from './http-errors.js';
+import { handleApiError } from './http-request-helpers.js';
 import { jsonResponse } from './http-response.js';
 
 function resolveDiffScope(requestUrl) {
@@ -28,22 +28,6 @@ function readHistoryOffset(value) {
   return Number.isFinite(parsed) ? parsed : 0;
 }
 
-function handleGitError(req, res, error, message, fallback) {
-  const statusCode = getRequestErrorStatusCode(error);
-  if (statusCode) {
-    const payload = { error: error.message };
-    if (typeof error?.requestCode === 'string') {
-      payload.code = error.requestCode;
-    }
-    jsonResponse(req, res, statusCode, payload);
-    return true;
-  }
-
-  console.error(message, error.message);
-  jsonResponse(req, res, 500, { error: fallback });
-  return true;
-}
-
 export function createGitApiQueryHandler({ gitService }) {
   return async function handleGitApiQuery(req, res, requestUrl) {
     if (requestUrl.pathname === '/api/git/status' && req.method === 'GET') {
@@ -52,7 +36,7 @@ export function createGitApiQueryHandler({ gitService }) {
           force: isTruthyParam(requestUrl.searchParams.get('force')),
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read git status:', 'Failed to read git status');
+        handleApiError(req, res, error, '[api] Failed to read git status:', 'Failed to read git status');
       }
       return true;
     }
@@ -66,7 +50,7 @@ export function createGitApiQueryHandler({ gitService }) {
           scope: resolveDiffScope(requestUrl),
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read git diff:', 'Failed to read git diff');
+        handleApiError(req, res, error, '[api] Failed to read git diff:', 'Failed to read git diff');
       }
       return true;
     }
@@ -78,7 +62,7 @@ export function createGitApiQueryHandler({ gitService }) {
           offset: readHistoryOffset(requestUrl.searchParams.get('offset')),
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read git history:', 'Failed to read git history');
+        handleApiError(req, res, error, '[api] Failed to read git history:', 'Failed to read git history');
       }
       return true;
     }
@@ -91,7 +75,7 @@ export function createGitApiQueryHandler({ gitService }) {
           path: requestUrl.searchParams.get('path'),
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read git file history:', 'Failed to read git file history');
+        handleApiError(req, res, error, '[api] Failed to read git file history:', 'Failed to read git file history');
       }
       return true;
     }
@@ -105,7 +89,7 @@ export function createGitApiQueryHandler({ gitService }) {
           path: requestUrl.searchParams.get('path'),
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read git commit:', 'Failed to read git commit');
+        handleApiError(req, res, error, '[api] Failed to read git commit:', 'Failed to read git commit');
       }
       return true;
     }
@@ -117,7 +101,7 @@ export function createGitApiQueryHandler({ gitService }) {
           path: requestUrl.searchParams.get('path'),
         }));
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read git file snapshot:', 'Failed to read git file snapshot');
+        handleApiError(req, res, error, '[api] Failed to read git file snapshot:', 'Failed to read git file snapshot');
       }
       return true;
     }
@@ -128,7 +112,7 @@ export function createGitApiQueryHandler({ gitService }) {
           backups: await gitService.listPullBackups(),
         });
       } catch (error) {
-        handleGitError(req, res, error, '[api] Failed to read pull backups:', 'Failed to read pull backups');
+        handleApiError(req, res, error, '[api] Failed to read pull backups:', 'Failed to read pull backups');
       }
       return true;
     }

package/src/server/infrastructure/http/create-request-handler.js

@@ -1,9 +1,12 @@
 import { createAuthApiHandler } from './create-auth-api-handler.js';
-import { createGitApiHandler } from './create-git-api-handler.js';
+import { createGitApiCommandHandler } from './create-git-api-command-handler.js';
+import { createGitApiQueryHandler } from './create-git-api-query-handler.js';
 import { createHostedApiHandler } from './create-hosted-api-handler.js';
 import { createEsmProxyHandler } from './create-esm-proxy-handler.js';
+import { createPlantUmlApiHandler } from './create-plantuml-api-handler.js';
 import { createStaticHandler } from './create-static-handler.js';
-import { createVaultApiHandler } from './create-vault-api-handler.js';
+import { createVaultApiCommandHandler } from './create-vault-api-command-handler.js';
+import { createVaultApiQueryHandler } from './create-vault-api-query-handler.js';
 import { parseJsonBody } from './request-body.js';
 import {
   applyCorsHeaders,
@@ -61,25 +64,28 @@ export function createRequestHandler(
     githubSetupFlow,
     hostedWorkspaceService,
   });
-  const handleGitApi = createGitApiHandler({
+  const handleGitApiQuery = createGitApiQueryHandler({ gitService });
+  const handleGitApiCommand = createGitApiCommandHandler({
     authService,
-    backlinkIndex,
     gitService,
-    roomRegistry,
-    vaultFileStore,
     workspaceMutationCoordinator,
   });
-  const handleVaultApi = createVaultApiHandler({
+  const handleVaultApiQuery = createVaultApiQueryHandler({
     baseQueryService,
     backlinkIndex,
     config,
+    searchService,
+    vaultFileStore,
+    workspaceMutationCoordinator,
+  });
+  const handleVaultApiCommand = createVaultApiCommandHandler({
+    backlinkIndex,
     docxExporter,
-    plantUmlRenderer,
     roomRegistry,
-    searchService,
     vaultFileStore,
     workspaceMutationCoordinator,
   });
+  const handlePlantUmlApi = createPlantUmlApiHandler({ plantUmlRenderer });
 
   function handleBasePathRedirect(req, res, originalRequestUrl) {
     if (
@@ -209,11 +215,30 @@ export function createRequestHandler(
       }
     }
 
-    if (await handleVaultApi(req, res, requestUrl)) {
-      return;
+    if (requestUrl.pathname.startsWith('/api/')) {
+      if (await handleVaultApiQuery(req, res, requestUrl)) {
+        return;
+      }
+      if (await handleVaultApiCommand(req, res, requestUrl)) {
+        return;
+      }
+      if (await handlePlantUmlApi(req, res, requestUrl)) {
+        return;
+      }
     }
 
-    if (await handleGitApi(req, res, requestUrl)) {
+    if (requestUrl.pathname.startsWith('/api/git')) {
+      if (!gitService) {
+        jsonResponse(req, res, 503, { error: 'Git integration is not configured' });
+        return;
+      }
+      if (await handleGitApiQuery(req, res, requestUrl)) {
+        return;
+      }
+      if (await handleGitApiCommand(req, res, requestUrl)) {
+        return;
+      }
+      jsonResponse(req, res, 404, { error: 'Git API endpoint not found' });
       return;
     }
 

package/src/server/infrastructure/http/create-vault-api-command-handler.js

@@ -1,30 +1,23 @@
 import { basename } from 'node:path';
-import { createRequestError, getRequestErrorStatusCode } from './http-errors.js';
-import { jsonResponse, sendResponse } from './http-response.js';
+import { createRequestError } from './http-errors.js';
+import { handleApiError, readRequestId } from './http-request-helpers.js';
+import {
+  createSafeAsciiFilename,
+  encodeContentDispositionFilename,
+  jsonResponse,
+  sendResponse,
+} from './http-response.js';
 import { parseJsonBody, readBinaryRequestBody } from './request-body.js';
 
 const DOCX_EXPORT_REQUEST_LIMIT_BYTES = 33_554_432;
 const DOCX_MIME_TYPE = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
 
-function encodeContentDispositionFilename(fileName) {
-  return encodeURIComponent(String(fileName ?? ''))
-    .replace(/['()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
-}
-
-function createSafeAsciiFilename(fileName) {
-  const fallback = String(fileName ?? '')
-    .replace(/[^\x20-\x7E]+/g, '_')
-    .replace(/["\\]/g, '_')
-    .trim();
-  return fallback || 'document';
-}
-
 function createDocxDownloadHeaders(filePath) {
   const fileName = basename(String(filePath ?? 'document')).replace(/\.[^.]+$/u, '') || 'document';
   const exportFileName = `${fileName}.docx`;
   return {
     'Cache-Control': 'no-store',
-    'Content-Disposition': `attachment; filename="${createSafeAsciiFilename(exportFileName)}"; filename*=UTF-8''${encodeContentDispositionFilename(exportFileName)}`,
+    'Content-Disposition': `attachment; filename="${createSafeAsciiFilename(exportFileName, 'document')}"; filename*=UTF-8''${encodeContentDispositionFilename(exportFileName)}`,
     'Content-Type': DOCX_MIME_TYPE,
     'X-Content-Type-Options': 'nosniff',
   };
@@ -43,23 +36,6 @@ function decodeHeaderMetadata(value) {
   }
 }
 
-function readRequestId(req) {
-  const value = String(req.headers['x-collabmd-request-id'] || '').trim();
-  return value ? value.slice(0, 120) : null;
-}
-
-function handleVaultError(req, res, error, logMessage, fallbackMessage) {
-  const statusCode = getRequestErrorStatusCode(error);
-  if (statusCode) {
-    jsonResponse(req, res, statusCode, { error: error.message });
-    return true;
-  }
-
-  console.error(logMessage, error.message);
-  jsonResponse(req, res, 500, { error: fallbackMessage });
-  return true;
-}
-
 function getDirectoryDeleteStatusCode(message = '') {
   return String(message).includes('Directory is not empty') ? 409 : 400;
 }
@@ -88,7 +64,7 @@ async function handleExportDocx({ docxExporter }, req, res) {
       statusCode: 200,
     });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to export DOCX:', 'Failed to export DOCX');
+    handleApiError(req, res, error, '[api] Failed to export DOCX:', 'Failed to export DOCX');
   }
   return true;
 }
@@ -113,7 +89,7 @@ async function handleWriteFile({ workspaceMutationCoordinator }, req, res) {
 
     jsonResponse(req, res, 200, { ok: true });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to write file:', 'Failed to write file');
+    handleApiError(req, res, error, '[api] Failed to write file:', 'Failed to write file');
   }
   return true;
 }
@@ -148,7 +124,7 @@ async function handleUploadAttachment({ workspaceMutationCoordinator }, req, res
       path: result.path,
     });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to upload attachment:', 'Failed to upload attachment');
+    handleApiError(req, res, error, '[api] Failed to upload attachment:', 'Failed to upload attachment');
   }
   return true;
 }
@@ -172,7 +148,7 @@ async function handleCreateFile({ workspaceMutationCoordinator }, req, res) {
     }
     jsonResponse(req, res, 201, { ok: true, path: body.path });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to create file:', 'Failed to create file');
+    handleApiError(req, res, error, '[api] Failed to create file:', 'Failed to create file');
   }
   return true;
 }
@@ -220,7 +196,7 @@ async function handleRenameFile({ workspaceMutationCoordinator }, req, res) {
     }
     jsonResponse(req, res, 200, { ok: true, path: body.newPath });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to rename file:', 'Failed to rename file');
+    handleApiError(req, res, error, '[api] Failed to rename file:', 'Failed to rename file');
   }
   return true;
 }
@@ -244,7 +220,7 @@ async function handleCreateDirectory({ workspaceMutationCoordinator }, req, res)
 
     jsonResponse(req, res, 201, { ok: true });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to create directory:', 'Failed to create directory');
+    handleApiError(req, res, error, '[api] Failed to create directory:', 'Failed to create directory');
   }
   return true;
 }
@@ -269,7 +245,7 @@ async function handleRenameDirectory({ workspaceMutationCoordinator }, req, res)
 
     jsonResponse(req, res, 200, { ok: true, path: body.newPath });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to rename directory:', 'Failed to rename directory');
+    handleApiError(req, res, error, '[api] Failed to rename directory:', 'Failed to rename directory');
   }
   return true;
 }
@@ -295,7 +271,7 @@ async function handleDeleteDirectory({ workspaceMutationCoordinator }, req, res,
 
     jsonResponse(req, res, 200, { ok: true });
   } catch (error) {
-    handleVaultError(req, res, error, '[api] Failed to delete directory:', 'Failed to delete directory');
+    handleApiError(req, res, error, '[api] Failed to delete directory:', 'Failed to delete directory');
   }
   return true;
 }

package/src/server/infrastructure/http/create-vault-api-query-handler.js

@@ -6,26 +6,19 @@ import { join } from 'node:path';
 import { isImageAttachmentFilePath } from '../../../domain/file-kind.js';
 import { isIgnoredVaultEntry } from '../persistence/path-utils.js';
 import { parseJsonBody } from './request-body.js';
-import { jsonResponse, sendResponse, sendStreamResponse } from './http-response.js';
+import {
+  createSafeAsciiFilename,
+  encodeContentDispositionFilename,
+  jsonResponse,
+  sendResponse,
+  sendStreamResponse,
+} from './http-response.js';
 
 const SVG_MIME_TYPE = 'image/svg+xml';
 const SVG_ATTACHMENT_CSP = "default-src 'none'; img-src 'self' data: blob:; style-src 'unsafe-inline'; sandbox";
 const DEFAULT_MAX_ARCHIVE_ENTRIES = 10_000;
 const DEFAULT_MAX_DOWNLOAD_FILE_BYTES = 268_435_456;
 
-function encodeContentDispositionFilename(fileName) {
-  return encodeURIComponent(String(fileName ?? ''))
-    .replace(/['()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
-}
-
-function createSafeAsciiFilename(fileName) {
-  const fallback = String(fileName ?? '')
-    .replace(/[^\x20-\x7E]+/g, '_')
-    .replace(/["\\]/g, '_')
-    .trim();
-  return fallback || 'attachment';
-}
-
 function createAttachmentHeaders(attachment) {
   const fileName = basename(String(attachment?.path ?? 'attachment'));
   const headers = {

package/src/server/infrastructure/http/http-request-helpers.js

@@ -0,0 +1,23 @@
+import { getRequestErrorStatusCode } from './http-errors.js';
+import { jsonResponse } from './http-response.js';
+
+export function readRequestId(req) {
+  const value = String(req.headers['x-collabmd-request-id'] || '').trim();
+  return value ? value.slice(0, 120) : null;
+}
+
+export function handleApiError(req, res, error, logMessage, fallbackMessage) {
+  const statusCode = getRequestErrorStatusCode(error);
+  if (statusCode) {
+    const payload = { error: error.message };
+    if (typeof error?.requestCode === 'string') {
+      payload.code = error.requestCode;
+    }
+    jsonResponse(req, res, statusCode, payload);
+    return true;
+  }
+
+  console.error(logMessage, error.message);
+  jsonResponse(req, res, 500, { error: fallbackMessage });
+  return true;
+}

package/src/server/infrastructure/http/http-response.js

@@ -7,6 +7,19 @@ import {
 const COMPRESSIBLE_CONTENT_TYPE_PATTERN = /^(?:text\/|application\/(?:javascript|json|xml)|image\/svg\+xml)/i;
 const MIN_COMPRESSIBLE_BYTES = 1024;
 
+export function encodeContentDispositionFilename(fileName) {
+  return encodeURIComponent(String(fileName ?? ''))
+    .replace(/['()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
+}
+
+export function createSafeAsciiFilename(fileName, fallback = 'attachment') {
+  const normalized = String(fileName ?? '')
+    .replace(/[^\x20-\x7E]+/g, '_')
+    .replace(/["\\]/g, '_')
+    .trim();
+  return normalized || fallback;
+}
+
 export const SECURITY_HEADERS = {
   'Referrer-Policy': 'strict-origin-when-cross-origin',
   'X-Content-Type-Options': 'nosniff',

package/src/server/infrastructure/persistence/vault-file-store.js

@@ -13,7 +13,6 @@ import {
 } from '../../../domain/file-kind.js';
 import { createCommentOverview } from '../../domain/comment-overview.js';
 import { scanWorkspaceState as scanWorkspaceStateFromAdapter } from '../../domain/workspace-state.js';
-import { getEditableVaultContentKind } from './vault-content-adapter.js';
 import {
   INVALID_VAULT_FILE_PATH_ERROR,
   isIgnoredVaultEntry,
@@ -24,6 +23,22 @@ import {
   sanitizeVaultPath,
   toVaultRelativePath,
 } from './path-utils.js';
+
+const EDITABLE_VAULT_CONTENT_PATH_ERRORS = {
+  base: 'Invalid file path — must end in .base',
+  drawio: 'Invalid file path — must end in .drawio',
+  excalidraw: 'Invalid file path — must end in .excalidraw',
+  markdown: 'Invalid file path',
+  mermaid: 'Invalid file path — must end in .mmd or .mermaid',
+  plantuml: 'Invalid file path — must end in .puml or .plantuml',
+};
+
+function getEditableVaultContentKind(filePath) {
+  const kind = getVaultFileKind(filePath);
+  return EDITABLE_VAULT_CONTENT_PATH_ERRORS[kind]
+    ? { invalidPathError: EDITABLE_VAULT_CONTENT_PATH_ERRORS[kind], kind }
+    : null;
+}
 import { SidecarStore } from './sidecar-store.js';
 import { createWorkspaceStateFileSystemAdapter } from '../workspace/workspace-state-file-system-adapter.js';
 
@@ -376,9 +391,9 @@ export class VaultFileStore {
     return { absolute, adapter };
   }
 
-  async readContentFile(filePath, expectedKind) {
+  async readContentFile(filePath, expectedKind = null) {
     const resolved = this.resolveAdapter(filePath);
-    if (!resolved || resolved.adapter.kind !== expectedKind) {
+    if (!resolved || (expectedKind && resolved.adapter.kind !== expectedKind)) {
       return null;
     }
 
@@ -394,20 +409,7 @@ export class VaultFileStore {
   }
 
   async readEditableVaultContent(filePath) {
-    const resolved = this.resolveAdapter(filePath);
-    if (!resolved) {
-      return null;
-    }
-
-    try {
-      return await readFile(resolved.absolute, 'utf-8');
-    } catch (error) {
-      if (error.code === 'ENOENT') {
-        return null;
-      }
-
-      throw error;
-    }
+    return this.readContentFile(filePath);
   }
 
   async writeResolvedContentFile(resolved, filePath, content, { invalidateCollaborationSnapshot = true } = {}) {
@@ -425,9 +427,9 @@ export class VaultFileStore {
     }
   }
 
-  async writeContentFile(filePath, content, expectedKind, { invalidateCollaborationSnapshot = true } = {}) {
+  async writeContentFile(filePath, content, expectedKind = null, { invalidateCollaborationSnapshot = true } = {}) {
     const resolved = this.resolveAdapter(filePath);
-    if (!resolved || resolved.adapter.kind !== expectedKind) {
+    if (!resolved || (expectedKind && resolved.adapter.kind !== expectedKind)) {
       return {
         ok: false,
         error: resolved?.adapter?.invalidPathError ?? getEditableVaultContentKind(filePath)?.invalidPathError ?? INVALID_VAULT_FILE_PATH_ERROR,
@@ -438,15 +440,7 @@ export class VaultFileStore {
   }
 
   async writeEditableVaultContent(filePath, content, { invalidateCollaborationSnapshot = true } = {}) {
-    const resolved = this.resolveAdapter(filePath);
-    if (!resolved) {
-      return {
-        ok: false,
-        error: getEditableVaultContentKind(filePath)?.invalidPathError ?? INVALID_VAULT_FILE_PATH_ERROR,
-      };
-    }
-
-    return this.writeResolvedContentFile(resolved, filePath, content, { invalidateCollaborationSnapshot });
+    return this.writeContentFile(filePath, content, null, { invalidateCollaborationSnapshot });
   }
 
   async readMarkdownFile(filePath) {
@@ -457,22 +451,6 @@ export class VaultFileStore {
     return this.readContentFile(filePath, 'base');
   }
 
-  async readExcalidrawFile(filePath) {
-    return this.readContentFile(filePath, 'excalidraw');
-  }
-
-  async readDrawioFile(filePath) {
-    return this.readContentFile(filePath, 'drawio');
-  }
-
-  async readMermaidFile(filePath) {
-    return this.readContentFile(filePath, 'mermaid');
-  }
-
-  async readPlantUmlFile(filePath) {
-    return this.readContentFile(filePath, 'plantuml');
-  }
-
   async readImageAttachmentFile(filePath) {
     const absolute = this.resolveContentPath(filePath, { requireVaultFile: false });
     if (!absolute || !isImageAttachmentFilePath(filePath)) {
@@ -533,22 +511,6 @@ export class VaultFileStore {
     return this.writeContentFile(filePath, content, 'base', options);
   }
 
-  async writeExcalidrawFile(filePath, content, options = {}) {
-    return this.writeContentFile(filePath, content, 'excalidraw', options);
-  }
-
-  async writeDrawioFile(filePath, content, options = {}) {
-    return this.writeContentFile(filePath, content, 'drawio', options);
-  }
-
-  async writeMermaidFile(filePath, content, options = {}) {
-    return this.writeContentFile(filePath, content, 'mermaid', options);
-  }
-
-  async writePlantUmlFile(filePath, content, options = {}) {
-    return this.writeContentFile(filePath, content, 'plantuml', options);
-  }
-
   async writeImageAttachmentForDocument(sourceDocumentPath, {
     content,
     mimeType,