collabmd 0.1.43 → 0.1.44

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);
-  }
 }

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

@@ -6,7 +6,6 @@ import * as decoding from 'lib0/decoding';
 
 import { MSG_AWARENESS, MSG_SYNC } from './protocol.js';
 import { CollaborationDocumentStore } from './collaboration-document-store.js';
-import { RoomClientStateStore } from './room-client-state-store.js';
 import { RoomPersistenceController } from './room-persistence-controller.js';
 import { logPerfEvent } from '../../config/perf-logging.js';
 import { populateCommentThreads, serializeCommentThreads } from '../../../domain/comment-threads.js';
@@ -200,7 +199,7 @@ export class CollaborationRoom {
     this.doc = new Y.Doc({ gc: true });
     this.awareness = new awarenessProtocol.Awareness(this.doc);
     this.clients = new Set();
-    this.clientStates = new RoomClientStateStore();
+    this.clientStates = new WeakMap();
     this.hydrated = false;
     this.hydratePromise = null;
     this.deleted = false;
@@ -240,6 +239,7 @@ export class CollaborationRoom {
         const startedAt = Date.now();
         let hydrateSource = 'empty';
         let snapshotExists = false;
+        let snapshotNeedsReplacement = false;
         let snapshotValid = false;
         let commentThreadCount = 0;
         let snapshotReadDurationMs = 0;
@@ -280,9 +280,9 @@ export class CollaborationRoom {
                 return;
               } catch (error) {
                 console.warn(
-                  `[room:${this.name}] Discarding invalid collaboration snapshot: ${error.message}`,
+                  `[room:${this.name}] Ignoring invalid collaboration snapshot until durable content is rehydrated: ${error.message}`,
                 );
-                await this.documentStore.deleteSnapshot?.();
+                snapshotNeedsReplacement = true;
               }
             }
 
@@ -311,9 +311,14 @@ export class CollaborationRoom {
                 populateCommentThreads(comments, commentThreads);
               }, 'hydrate');
 
-              void this.documentStore.writeSnapshot(Y.encodeStateAsUpdate(this.doc)).catch((error) => {
-                console.error(`[room:${this.name}] Failed to prime collaboration snapshot: ${error.message}`);
-              });
+              const replacementSnapshot = Y.encodeStateAsUpdate(this.doc);
+              if (snapshotNeedsReplacement) {
+                await this.documentStore.writeSnapshot(replacementSnapshot);
+              } else {
+                void this.documentStore.writeSnapshot(replacementSnapshot).catch((error) => {
+                  console.error(`[room:${this.name}] Failed to prime collaboration snapshot: ${error.message}`);
+                });
+              }
             }
           }
 
@@ -427,7 +432,7 @@ export class CollaborationRoom {
   }
 
   getClientState(ws) {
-    return this.clientStates.get(ws);
+    return this.clientStates.get(ws) ?? null;
   }
 
   ensureClientState(ws) {
@@ -438,11 +443,17 @@ export class CollaborationRoom {
       return existingState;
     }
 
-    return this.clientStates.register(ws);
+    const state = {
+      backpressureCloseIssued: false,
+      controlledClientIds: new Set(),
+      transportCloseIssued: false,
+    };
+    this.clientStates.set(ws, state);
+    return state;
   }
 
   deleteClientState(ws) {
-    this.clientStates.unregister(ws);
+    this.clientStates.delete(ws);
   }
 
   broadcastToClients(message, { excludeClient = null, failureLabel = 'frame' } = {}) {

package/src/server/domain/markdown-reference-extractor.js

@@ -3,6 +3,7 @@ import {
   isImageAttachmentFilePath,
   isMarkdownFilePath,
 } from '../../domain/file-kind.js';
+import { resolveVaultRelativePath } from '../../domain/vault-paths.js';
 import { resolveWikiTargetWithIndex } from '../../domain/wiki-link-resolver.js';
 
 const INTERNAL_LINK_RE = /(!)?\[\[([^\]|#]+)(?:#[^\]|]+)?(?:\|[^\]]+)?\]\]/g;
@@ -21,52 +22,6 @@ function isAbsoluteOrExternalUrl(source = '') {
   );
 }
 
-function normalizePathSegments(pathValue = '') {
-  return String(pathValue ?? '')
-    .replace(/\\/g, '/')
-    .split('/')
-    .filter(Boolean);
-}
-
-function resolveVaultRelativePath(fromFilePath = '', relativePath = '') {
-  const sourceSegments = normalizePathSegments(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('/');
-}
-
 function parseMarkdownImageDestination(sourceText = '') {
   const text = String(sourceText ?? '');
   let index = 0;

package/src/server/domain/workspace-state.js

@@ -654,14 +654,6 @@ export function detectWorkspaceStateChange(previousState, nextState) {
   });
 }
 
-export function hasWorkspaceStatePaths(workspaceChange = {}) {
-  return (
-    (workspaceChange.changedPaths?.length ?? 0) > 0
-    || (workspaceChange.deletedPaths?.length ?? 0) > 0
-    || (workspaceChange.renamedPaths?.length ?? 0) > 0
-  );
-}
-
 export function isIncrementalWorkspaceMutationAction(action) {
   return action === 'create-directory'
     || action === 'create-file'

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

@@ -4,7 +4,7 @@ import { GitCommandRunner } from './command-runner.js';
 import { GitDiffService } from './diff-service.js';
 import { GitHistoryService } from './history-service.js';
 import { parseNameStatusOutput } from './parsers.js';
-import { createEmptyWorkspaceChange, createWorkspaceChange } from './responses.js';
+import { createEmptyWorkspaceChange, createWorkspaceChange } from '../../../domain/workspace-change.js';
 import { GitStatusService } from './status-service.js';
 import { GitUntrackedFileService } from './untracked-files.js';
 import { PullBackupStore } from '../persistence/pull-backup-store.js';
@@ -165,7 +165,7 @@ export class GitService {
       throw createGitRequestError(409, 'No upstream branch is configured for pull');
     }
 
-    const beforeRef = await this.getHeadRef();
+    const beforeRef = await this.resolveRef('HEAD');
     await this.fetchUpstream(status.branch.upstream);
 
     const targetRef = await this.resolveRef(status.branch.upstream);
@@ -205,7 +205,7 @@ export class GitService {
       throw await this.classifyPullError(error);
     }
 
-    const afterRef = await this.getHeadRef();
+    const afterRef = await this.resolveRef('HEAD');
     this.invalidateStatusCache();
     return {
       afterRef,
@@ -220,31 +220,15 @@ export class GitService {
   async resetFileToHead(path) {
     const normalizedPath = normalizeRelativeGitPath(path);
     const sourceRef = 'HEAD';
-    const existsOnSource = await this.pathExistsAtRef(sourceRef, normalizedPath);
-
-    if (existsOnSource) {
-      await this.commandRunner.execGit(['restore', '--source', sourceRef, '--staged', '--worktree', '--', normalizedPath]);
-      this.invalidateStatusCache();
-      return {
-        ok: true,
-        path: normalizedPath,
-        sourceRef,
-        workspaceChange: createWorkspaceChange({
-          changedPaths: [normalizedPath],
-        }),
-      };
-    }
-
-    await this.commandRunner.execGit(['rm', '-f', '--ignore-unmatch', '--', normalizedPath]);
-    await this.commandRunner.execGit(['clean', '-f', '--', normalizedPath]);
+    const existsOnSource = await this.restorePathToHead(normalizedPath);
     this.invalidateStatusCache();
     return {
       ok: true,
       path: normalizedPath,
       sourceRef,
-      workspaceChange: createWorkspaceChange({
-        deletedPaths: [normalizedPath],
-      }),
+      workspaceChange: createWorkspaceChange(existsOnSource
+        ? { changedPaths: [normalizedPath] }
+        : { deletedPaths: [normalizedPath] }),
     };
   }
 
@@ -279,15 +263,6 @@ export class GitService {
     return this.historyService.getFileSnapshot({ hash, path });
   }
 
-  async getHeadRef() {
-    try {
-      const output = await this.commandRunner.execGit(['rev-parse', 'HEAD']);
-      return output.trim() || null;
-    } catch {
-      return null;
-    }
-  }
-
   async pathExistsAtRef(ref, path) {
     try {
       await this.commandRunner.execGit(['cat-file', '-e', `${ref}:${path}`]);
@@ -314,7 +289,7 @@ export class GitService {
   }
 
   async canFastForwardTo(targetRef) {
-    const headRef = await this.getHeadRef();
+    const headRef = await this.resolveRef('HEAD');
     if (!headRef || !targetRef || headRef === targetRef) {
       return true;
     }
@@ -436,11 +411,12 @@ export class GitService {
 
     if (existsOnSource) {
       await this.commandRunner.execGit(['restore', '--source', sourceRef, '--staged', '--worktree', '--', normalizedPath]);
-      return;
+      return true;
     }
 
     await this.commandRunner.execGit(['rm', '-f', '--ignore-unmatch', '--', normalizedPath]);
     await this.commandRunner.execGit(['clean', '-f', '--', normalizedPath]);
+    return false;
   }
 
   async hasConflictedStatus() {

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

@@ -3,6 +3,7 @@ import { getVaultFileKind, isImageAttachmentFilePath } from '../../../domain/fil
 import { normalizeRelativeGitPath } from './path-utils.js';
 import {
   countPatchLines,
+  parseGitLogHeader,
   parseNumstatEntries,
   parseNameStatusEntries,
   parseUnifiedDiff,
@@ -484,22 +485,21 @@ export class GitHistoryService {
     const [headerLine = '', ...statLines] = String(chunk ?? '')
       .split(/\r?\n/u)
       .filter((line) => line.length > 0);
-    const [
-      hash = '',
-      shortHash = '',
-      subject = '',
-      authorName = '',
-      authorEmail = '',
-      authoredAt = '',
-      rawParents = '',
-    ] = headerLine.split('\x1f');
-    const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
-
-    const summary = statLines.reduce((result, line) => {
-      const [rawAdditions = '0', rawDeletions = '0'] = line.split('\t');
+    const {
+      authorEmail,
+      authorName,
+      authoredAt,
+      hash,
+      isMergeCommit,
+      parentCount,
+      shortHash,
+      subject,
+    } = parseGitLogHeader(headerLine);
+
+    const summary = parseNumstatEntries(statLines.join('\n')).reduce((result, entry) => {
       return {
-        additions: result.additions + (rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0),
-        deletions: result.deletions + (rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0),
+        additions: result.additions + entry.additions,
+        deletions: result.deletions + entry.deletions,
         filesChanged: result.filesChanged + 1,
       };
     }, {
@@ -516,8 +516,8 @@ export class GitHistoryService {
       deletions: summary.deletions,
       filesChanged: summary.filesChanged,
       hash,
-      isMergeCommit: parentHashes.length > 1,
-      parentCount: parentHashes.length,
+      isMergeCommit,
+      parentCount,
       relativeDateLabel: formatRelativeDate(authoredAt),
       shortHash,
       subject,
@@ -528,16 +528,16 @@ export class GitHistoryService {
     const [headerLine = '', ...detailLines] = String(chunk ?? '')
       .split(/\r?\n/u)
       .filter((line) => line.length > 0);
-    const [
-      hash = '',
-      shortHash = '',
-      subject = '',
-      authorName = '',
-      authorEmail = '',
-      authoredAt = '',
-      rawParents = '',
-    ] = headerLine.split('\x1f');
-    const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
+    const {
+      authorEmail,
+      authorName,
+      authoredAt,
+      hash,
+      isMergeCommit,
+      parentCount,
+      shortHash,
+      subject,
+    } = parseGitLogHeader(headerLine);
 
     return {
       authorEmail,
@@ -545,8 +545,8 @@ export class GitHistoryService {
       authoredAt,
       detailLines,
       hash,
-      isMergeCommit: parentHashes.length > 1,
-      parentCount: parentHashes.length,
+      isMergeCommit,
+      parentCount,
       relativeDateLabel: formatRelativeDate(authoredAt),
       shortHash,
       subject,
@@ -605,21 +605,20 @@ export class GitHistoryService {
       throw createGitRequestError(404, 'Commit not found');
     });
 
-    const [
-      commitHash = '',
-      shortHash = '',
-      subject = '',
-      authorName = '',
-      authorEmail = '',
-      authoredAt = '',
-      rawParents = '',
-    ] = String(headerOutput ?? '').trim().split('\x1f');
+    const {
+      authorEmail,
+      authorName,
+      authoredAt,
+      hash: commitHash,
+      parentHashes,
+      shortHash,
+      subject,
+    } = parseGitLogHeader(String(headerOutput ?? '').trim());
 
     if (!commitHash) {
       throw createGitRequestError(404, 'Commit not found');
     }
 
-    const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
     const baseRef = parentHashes[0] || EMPTY_TREE_HASH;
     const nameStatusOutput = await this.commandRunner.execGit([
       'diff',
@@ -661,23 +660,19 @@ export class GitHistoryService {
   }
 
   mergeCommitMetadataFiles(nameStatusEntries, numstatOutput) {
-    const statsByPath = new Map();
-    const numstatLines = String(numstatOutput ?? '')
-      .split(/\r?\n/u)
-      .filter(Boolean);
-
-    for (let index = 0; index < nameStatusEntries.length; index += 1) {
-      const line = numstatLines[index] ?? '';
-      const [rawAdditions = '0', rawDeletions = '0'] = line.split('\t');
-      statsByPath.set(nameStatusEntries[index].path, {
-        additions: rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0,
-        deletions: rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0,
-      });
-    }
+    const numstatEntries = parseNumstatEntries(numstatOutput);
 
-    return nameStatusEntries.map((entry) => ({
-      ...entry,
-      stats: statsByPath.get(entry.path) ?? createEmptyStats(),
-    }));
+    return nameStatusEntries.map((entry, index) => {
+      const numstatEntry = numstatEntries[index];
+      return {
+        ...entry,
+        stats: numstatEntry
+          ? {
+            additions: numstatEntry.additions,
+            deletions: numstatEntry.deletions,
+          }
+          : createEmptyStats(),
+      };
+    });
   }
 }

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

@@ -165,37 +165,55 @@ export function parseStatusOutput(output) {
   };
 }
 
-export function parseNumstatOutput(output) {
-  return String(output ?? '')
-    .split(/\r?\n/u)
-    .filter(Boolean)
-    .reduce((summary, line) => {
-      const [rawAdditions = '0', rawDeletions = '0'] = line.split('\t');
-      const additions = rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0;
-      const deletions = rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0;
+export function parseGitLogHeader(headerLine) {
+  const [
+    hash = '',
+    shortHash = '',
+    subject = '',
+    authorName = '',
+    authorEmail = '',
+    authoredAt = '',
+    rawParents = '',
+  ] = String(headerLine ?? '').split('\x1f');
+  const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
 
-      return {
-        additions: summary.additions + additions,
-        deletions: summary.deletions + deletions,
-      };
-    }, {
-      additions: 0,
-      deletions: 0,
-    });
+  return {
+    authorEmail,
+    authorName,
+    authoredAt,
+    hash,
+    isMergeCommit: parentHashes.length > 1,
+    parentCount: parentHashes.length,
+    parentHashes,
+    shortHash,
+    subject,
+  };
+}
+
+function parseNumstatLine(line) {
+  const [rawAdditions = '0', rawDeletions = '0', ...rest] = String(line ?? '').split('\t');
+  return {
+    additions: rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0,
+    deletions: rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0,
+    rawPath: rest.join('\t'),
+  };
+}
+
+export function parseNumstatOutput(output) {
+  return parseNumstatEntries(output).reduce((summary, entry) => ({
+    additions: summary.additions + entry.additions,
+    deletions: summary.deletions + entry.deletions,
+  }), {
+    additions: 0,
+    deletions: 0,
+  });
 }
 
 export function parseNumstatEntries(output) {
   return String(output ?? '')
     .split(/\r?\n/u)
     .filter(Boolean)
-    .map((line) => {
-      const [rawAdditions = '0', rawDeletions = '0', ...rest] = line.split('\t');
-      return {
-        additions: rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0,
-        deletions: rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0,
-        rawPath: rest.join('\t'),
-      };
-    });
+    .map((line) => parseNumstatLine(line));
 }
 
 export function parseNameStatusOutput(output) {