collabmd 0.1.46 → 0.1.48

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

@@ -38,6 +38,7 @@ body[data-surface='excalidraw-editor'][data-document-mode='preview'] .disable-vi
   pointer-events: none;
 }
 
+.excalidraw-editor-toolbar,
 .diagram-comments-toolbar {
   display: inline-flex;
   align-items: center;
@@ -45,6 +46,47 @@ body[data-surface='excalidraw-editor'][data-document-mode='preview'] .disable-vi
   pointer-events: auto;
 }
 
+.excalidraw-presentation-toggle {
+  width: var(--control-h-md);
+  min-width: var(--control-h-md);
+  height: var(--control-h-md);
+}
+
+.excalidraw-presentation-navigation {
+  position: absolute;
+  z-index: 30;
+  bottom: var(--space-4);
+  left: 50%;
+  display: flex;
+  align-items: center;
+  gap: var(--space-2);
+  padding: var(--space-2);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-lg);
+  background: var(--color-surface-raised);
+  box-shadow: var(--shadow-md);
+  color: var(--color-text);
+  transform: translateX(-50%);
+}
+
+.excalidraw-presentation-navigation .diagram-comment-button {
+  width: var(--control-h-sm);
+  min-width: var(--control-h-sm);
+  height: var(--control-h-sm);
+  padding: 0;
+}
+
+.excalidraw-presentation-status {
+  min-width: 7rem;
+  max-width: min(20rem, 55vw);
+  color: var(--color-text-muted);
+  font-size: var(--text-ui-sm);
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .diagram-comment-button,
 .diagram-comment-close,
 .diagram-comment-back,

package/src/domain/file-kind.js

@@ -1,4 +1,5 @@
 const MARKDOWN_FILE_EXTENSIONS = Object.freeze(['.md', '.markdown', '.mdx']);
+const HTML_FILE_EXTENSIONS = Object.freeze(['.html', '.htm']);
 const BASE_FILE_EXTENSION = '.base';
 const EXCALIDRAW_FILE_EXTENSION = '.excalidraw';
 const DRAWIO_FILE_EXTENSION = '.drawio';
@@ -17,12 +18,13 @@ const DIAGRAM_FILE_EXTENSIONS = Object.freeze([
 ]);
 const VAULT_FILE_EXTENSIONS = Object.freeze([
   ...MARKDOWN_FILE_EXTENSIONS,
+  ...HTML_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|dsl|pdf|png|jpe?g|webp|gif|svg)$/i;
+const STRIP_VAULT_EXTENSION_PATTERN = /\.(?:md|markdown|mdx|html?|base|excalidraw|drawio|mmd|mermaid|puml|plantuml|dsl|pdf|png|jpe?g|webp|gif|svg)$/i;
 
 function normalizeFilePath(filePath) {
   return String(filePath ?? '').trim().toLowerCase();
@@ -38,6 +40,7 @@ export {
   DIAGRAM_FILE_EXTENSIONS,
   DRAWIO_FILE_EXTENSION,
   EXCALIDRAW_FILE_EXTENSION,
+  HTML_FILE_EXTENSIONS,
   IMAGE_ATTACHMENT_EXTENSIONS,
   MARKDOWN_FILE_EXTENSIONS,
   MERMAID_FILE_EXTENSIONS,
@@ -53,6 +56,10 @@ export function getVaultFileKind(filePath) {
     return 'markdown';
   }
 
+  if (hasFileExtension(filePath, HTML_FILE_EXTENSIONS)) {
+    return 'html';
+  }
+
   if (hasFileExtension(filePath, [BASE_FILE_EXTENSION])) {
     return 'base';
   }
@@ -114,6 +121,10 @@ export function isMarkdownFilePath(filePath) {
   return getVaultFileKind(filePath) === 'markdown';
 }
 
+export function isHtmlFilePath(filePath) {
+  return getVaultFileKind(filePath) === 'html';
+}
+
 export function isExcalidrawFilePath(filePath) {
   return getVaultFileKind(filePath) === 'excalidraw';
 }

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

@@ -1,4 +1,6 @@
 import { execFile as execFileCallback } from 'node:child_process';
+import { glob, readFile, stat } from 'node:fs/promises';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 
 import { getVaultFileKind } from '../../domain/file-kind.js';
@@ -17,6 +19,8 @@ const TEXT_SEARCH_GLOBS = Object.freeze([
   '*.md',
   '*.markdown',
   '*.mdx',
+  '*.html',
+  '*.htm',
   '*.base',
   '*.mmd',
   '*.mermaid',
@@ -24,9 +28,15 @@ const TEXT_SEARCH_GLOBS = Object.freeze([
   '*.plantuml',
   '*.dsl',
   '*.drawio',
-  '*.excalidraw',
 ]);
 
+function parseByteLimit(value) {
+  const match = String(value ?? '').trim().match(/^(\d+)([KMG])?$/iu);
+  if (!match) return 1024 * 1024;
+  const multipliers = { K: 1024, M: 1024 ** 2, G: 1024 ** 3 };
+  return Number(match[1]) * (multipliers[match[2]?.toUpperCase()] ?? 1);
+}
+
 function normalizePositiveInt(value, fallback, { min = 1, max = Number.MAX_SAFE_INTEGER } = {}) {
   const parsed = Number.parseInt(value ?? '', 10);
   if (!Number.isInteger(parsed) || parsed < min) {
@@ -216,6 +226,72 @@ export function parseRipgrepJson(stdout, {
   };
 }
 
+async function searchExcalidrawText({ maxFileSize, maxFiles, maxSnippetsPerFile, query, signal, vaultDir }) {
+  const files = [];
+  let matchCount = 0;
+  let truncated = false;
+  const normalizedQuery = query.toLocaleLowerCase();
+  const paths = glob('**/*.excalidraw', {
+    cwd: vaultDir,
+    exclude: ['**/.*', '**/node_modules/**'],
+  });
+
+  for await (const filePath of paths) {
+    signal?.throwIfAborted?.();
+    const absolutePath = join(vaultDir, filePath);
+    if ((await stat(absolutePath)).size > parseByteLimit(maxFileSize)) continue;
+
+    let scene;
+    try {
+      scene = JSON.parse(await readFile(absolutePath, 'utf8'));
+    } catch {
+      continue;
+    }
+
+    const snippets = [];
+    let fileMatchCount = 0;
+    for (const element of Array.isArray(scene?.elements) ? scene.elements : []) {
+      if (element?.isDeleted || element?.type !== 'text' || typeof element.text !== 'string') continue;
+      const text = element.text;
+      const normalizedText = text.toLocaleLowerCase();
+      let matchStart = normalizedText.indexOf(normalizedQuery);
+      while (matchStart >= 0) {
+        fileMatchCount += 1;
+        matchCount += 1;
+        if (snippets.length < maxSnippetsPerFile) {
+          const snippet = createSnippet(text, matchStart, matchStart + query.length);
+          snippets.push({
+            column: matchStart + 1,
+            line: 1,
+            matchEnd: snippet.matchEnd,
+            matchStart: snippet.matchStart,
+            text: snippet.text,
+          });
+        } else {
+          truncated = true;
+        }
+        matchStart = normalizedText.indexOf(normalizedQuery, matchStart + Math.max(query.length, 1));
+      }
+    }
+
+    if (fileMatchCount > 0) {
+      if (files.length >= maxFiles) {
+        truncated = true;
+        continue;
+      }
+      files.push({
+        file: filePath.replaceAll('\\', '/'),
+        kind: 'excalidraw',
+        matchCount: fileMatchCount,
+        snippets,
+        truncated: fileMatchCount > snippets.length,
+      });
+    }
+  }
+
+  return { files, matchCount, truncated };
+}
+
 export class RipgrepSearchService {
   constructor({
     execFileImpl = execFile,
@@ -307,7 +383,7 @@ export class RipgrepSearchService {
       maxFileSize: this.maxFileSize,
       maxSnippetsPerFile: this.maxSnippetsPerFile,
     });
-
+    let parsed;
     try {
       const result = await this.execFileImpl('rg', args, {
         cwd: this.vaultDir,
@@ -316,56 +392,53 @@ export class RipgrepSearchService {
         ...(signal ? { signal } : {}),
         timeout: this.timeoutMs,
       });
-      const parsed = parseRipgrepJson(result.stdout, {
+      parsed = parseRipgrepJson(result.stdout, {
         maxFiles,
         maxSnippetsPerFile: this.maxSnippetsPerFile,
         query: normalizedQuery,
       });
-      parsed.search = this.getClientConfig();
-
-      logPerfEvent(this.perfLoggingEnabled, 'search-query', {
-        durationMs: Date.now() - startedAt,
-        fileCount: parsed.files.length,
-        matchCount: parsed.matchCount,
-        truncated: parsed.truncated,
-      });
-      return parsed;
     } catch (error) {
       if (error?.code === 1) {
-        const empty = createEmptySearchResult({
+        parsed = createEmptySearchResult({
           query: normalizedQuery,
           searchAvailable: this.available,
         });
-        empty.search = this.getClientConfig();
-        logPerfEvent(this.perfLoggingEnabled, 'search-query', {
-          durationMs: Date.now() - startedAt,
-          fileCount: 0,
-          matchCount: 0,
-          truncated: false,
+      } else {
+        const isMaxBuffer = error?.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER';
+        parsed = parseRipgrepJson(error?.stdout ?? '', {
+          maxFiles,
+          maxSnippetsPerFile: this.maxSnippetsPerFile,
+          query: normalizedQuery,
         });
-        return empty;
+        if (isMaxBuffer && parsed.files.length > 0) {
+          parsed.truncated = true;
+        } else {
+          error.statusCode = error?.signal === 'SIGTERM' ? 504 : 500;
+          throw error;
+        }
       }
+    }
 
-      const isMaxBuffer = error?.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER';
-      const parsed = parseRipgrepJson(error?.stdout ?? '', {
-        maxFiles,
+    if (parsed.files.length < maxFiles) {
+      const excalidraw = await searchExcalidrawText({
+        maxFileSize: this.maxFileSize,
+        maxFiles: maxFiles - parsed.files.length,
         maxSnippetsPerFile: this.maxSnippetsPerFile,
         query: normalizedQuery,
+        signal,
+        vaultDir: this.vaultDir,
       });
-      if (isMaxBuffer && parsed.files.length > 0) {
-        parsed.search = this.getClientConfig();
-        parsed.truncated = true;
-        logPerfEvent(this.perfLoggingEnabled, 'search-query', {
-          durationMs: Date.now() - startedAt,
-          fileCount: parsed.files.length,
-          matchCount: parsed.matchCount,
-          truncated: true,
-        });
-        return parsed;
-      }
-
-      error.statusCode = error?.signal === 'SIGTERM' ? 504 : 500;
-      throw error;
+      parsed.files.push(...excalidraw.files);
+      parsed.matchCount += excalidraw.matchCount;
+      parsed.truncated ||= excalidraw.truncated;
     }
+    parsed.search = this.getClientConfig();
+    logPerfEvent(this.perfLoggingEnabled, 'search-query', {
+      durationMs: Date.now() - startedAt,
+      fileCount: parsed.files.length,
+      matchCount: parsed.matchCount,
+      truncated: parsed.truncated,
+    });
+    return parsed;
   }
 }

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

@@ -203,7 +203,7 @@ export class GitService {
     };
   }
 
-  async pullBranch() {
+  async pullBranch({ author = null } = {}) {
     const status = await this.getStatus({ force: true });
     if (status.branch?.detached) {
       throw createGitRequestError(409, 'Cannot pull from a detached HEAD');
@@ -220,16 +220,22 @@ export class GitService {
       throw createGitRequestError(409, 'Unable to resolve upstream branch for pull');
     }
 
-    if (!(await this.canFastForwardTo(targetRef))) {
+    const mergeBaseRef = beforeRef
+      ? await this.resolveMergeBase(beforeRef, targetRef)
+      : null;
+    if (beforeRef && !mergeBaseRef) {
+      throw createGitRequestError(409, 'Cannot pull because local and remote histories are unrelated');
+    }
+    if (beforeRef && !(await this.canMergeWith(targetRef))) {
       throw createGitRequestError(
         409,
-        'Cannot pull because local and remote commits have diverged; fast-forward only pull is not possible.',
-        { requestCode: 'pull_diverged_ff_only' },
+        'Cannot pull automatically because local and remote commits conflict.',
+        { requestCode: 'pull_conflicted_commits' },
       );
     }
 
     const dirtyEntries = this.collectDirtyEntries(status);
-    const upstreamWorkspaceChange = await this.createWorkspaceChangeFromRefs(beforeRef, targetRef);
+    const upstreamWorkspaceChange = await this.createWorkspaceChangeFromRefs(mergeBaseRef, targetRef);
     const overlappingEntries = this.findOverlappingDirtyEntries({
       dirtyEntries,
       workspaceChange: upstreamWorkspaceChange,
@@ -247,7 +253,9 @@ export class GitService {
 
     let output;
     try {
-      output = await this.commandRunner.execGit(['pull', '--ff-only', '--autostash']);
+      output = await this.commandRunner.execGit(['merge', '--no-edit', '--autostash', targetRef], {
+        env: buildAuthorEnv(author),
+      });
     } catch (error) {
       throw await this.classifyPullError(error);
     }
@@ -339,14 +347,18 @@ export class GitService {
       : ['fetch', '--prune']);
   }
 
-  async canFastForwardTo(targetRef) {
-    const headRef = await this.resolveRef('HEAD');
-    if (!headRef || !targetRef || headRef === targetRef) {
-      return true;
+  async resolveMergeBase(leftRef, rightRef) {
+    try {
+      const output = await this.commandRunner.execGit(['merge-base', leftRef, rightRef]);
+      return output.trim() || null;
+    } catch {
+      return null;
     }
+  }
 
+  async canMergeWith(targetRef) {
     try {
-      await this.commandRunner.execGit(['merge-base', '--is-ancestor', headRef, targetRef]);
+      await this.commandRunner.execGit(['merge-tree', '--write-tree', '--quiet', 'HEAD', targetRef]);
       return true;
     } catch (error) {
       if (error?.code === 1) {

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

@@ -130,7 +130,9 @@ export function createGitApiCommandHandler({
           action: 'pull',
           req,
           responsePayload: await workspaceMutationCoordinator.runManagedWorkspaceMutation(
-            () => gitService.pullBranch(),
+            () => gitService.pullBranch({
+              author: authService?.getAuthenticatedUser?.(req) ?? null,
+            }),
           ),
           workspaceMutationCoordinator,
         }));

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

@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 
 import { getRequestErrorStatusCode } from './http-errors.js';
 import { jsonResponse, sendResponse, textResponse } from './http-response.js';
-import { parseJsonBody } from './request-body.js';
+import { parseJsonBody, readBinaryRequestBody } from './request-body.js';
 
 const EMBED_STYLESHEET_PATH = new URL('../structurizr/structurizr-embed.css', import.meta.url);
 
@@ -101,13 +101,15 @@ export function createStructurizrApiHandler({ basePath = '', service = null } =
       return false;
     }
 
-    if (req.method !== 'GET' && req.method !== 'HEAD') {
+    const isThumbnailPut = req.method === 'PUT' && service.isThumbnailPath(requestUrl.pathname);
+    if (req.method !== 'GET' && req.method !== 'HEAD' && !isThumbnailPut) {
       textResponse(req, res, 405, 'Method Not Allowed', { Allow: 'GET, HEAD' });
       return true;
     }
 
     try {
       const response = await service.proxy(requestUrl, {
+        body: isThumbnailPut ? await readBinaryRequestBody(req) : null,
         headers: req.headers,
         method: req.method,
       });

package/src/server/infrastructure/persistence/path-utils.js

@@ -3,7 +3,7 @@ import { isAbsolute, normalize, relative, resolve } from 'path';
 import { isVaultFilePath } from '../../../domain/file-kind.js';
 
 export const IGNORED_DIRECTORIES = new Set(['.git', '.obsidian', '.trash', 'node_modules', '.DS_Store']);
-export const VAULT_FILE_PATH_REQUIREMENT = '.md, .markdown, .mdx, .base, .excalidraw, .drawio, .mmd, .mermaid, .puml, .plantuml, .dsl, .png, .jpg, .jpeg, .webp, .gif, or .svg';
+export const VAULT_FILE_PATH_REQUIREMENT = '.md, .markdown, .mdx, .html, .htm, .base, .excalidraw, .drawio, .mmd, .mermaid, .puml, .plantuml, .dsl, .pdf, .png, .jpg, .jpeg, .webp, .gif, or .svg';
 export const INVALID_VAULT_FILE_PATH_ERROR = `Invalid file path — must end in ${VAULT_FILE_PATH_REQUIREMENT}`;
 export const INVALID_DIRECTORY_PATH_ERROR = 'Invalid directory path';
 
@@ -12,12 +12,18 @@ export function isIgnoredVaultEntry(name) {
 }
 
 function normalizeRequestedPath(requestedPath) {
-  const normalized = normalize(String(requestedPath ?? '').trim().replace(/\\/g, '/'));
-  if (!normalized || normalized === '.') {
+  const value = String(requestedPath ?? '').trim().replace(/\\/g, '/');
+  const segments = value.split('/');
+  if (
+    !value
+    || isAbsolute(value)
+    || segments.some((segment) => segment === '.' || segment === '..')
+  ) {
     return '';
   }
 
-  return normalized;
+  const normalized = normalize(value);
+  return normalized === '.' ? '' : normalized;
 }
 
 export function sanitizeVaultPath(vaultDir, requestedPath) {

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

@@ -28,6 +28,7 @@ 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',
+  html: 'Invalid file path — must end in .html or .htm',
   markdown: 'Invalid file path',
   mermaid: 'Invalid file path — must end in .mmd or .mermaid',
   plantuml: 'Invalid file path — must end in .puml or .plantuml',
@@ -66,6 +67,7 @@ const TEXT_FILE_MIME_TYPES = Object.freeze({
   base: 'text/yaml; charset=utf-8',
   drawio: 'application/xml; charset=utf-8',
   excalidraw: 'application/json; charset=utf-8',
+  html: 'text/html; charset=utf-8',
   markdown: 'text/markdown; charset=utf-8',
   mermaid: 'text/plain; charset=utf-8',
   pdf: 'application/pdf',

package/src/server/infrastructure/structurizr/structurizr-workspace-service.js

@@ -12,6 +12,7 @@ const MANIFEST_FILE_NAME = '.collabmd-manifest.json';
 const WORKSPACE_DSL_FILE_NAME = 'workspace.dsl';
 const WORKSPACE_JSON_FILE_NAME = 'workspace.json';
 const SIDECAR_TIMEOUT_MS = 15_000;
+const THUMBNAIL_FALLBACK_PATH = '/static/img/thumbnail-not-available.png';
 
 function createServiceError(message, statusCode, code) {
   const error = new Error(message);
@@ -193,6 +194,10 @@ export class StructurizrWorkspaceService {
     );
   }
 
+  isThumbnailPath(pathname) {
+    return /^\/workspace\/1\/images\/(?:[^/]+-)?thumbnail(?:-dark)?\.png$/u.test(pathname);
+  }
+
   async sync({ content, rootPath }) {
     if (!this.isEnabled()) {
       throw createServiceError('Structurizr renderer is not configured.', 503, 'STRUCTURIZR_NOT_CONFIGURED');
@@ -336,21 +341,26 @@ export class StructurizrWorkspaceService {
     }
   }
 
-  async proxy(requestUrl, { method = 'GET', headers = {} } = {}) {
+  async proxy(requestUrl, { body = null, method = 'GET', headers = {} } = {}) {
     if (!this.isProxyPath(requestUrl.pathname)) {
       return null;
     }
 
     const upstreamUrl = `${this.serverUrl}${requestUrl.pathname}${requestUrl.search}`;
     let response;
+    const proxyHeaders = {
+      Accept: headers.accept || '*/*',
+    };
+    if (headers['content-type']) {
+      proxyHeaders['Content-Type'] = headers['content-type'];
+    }
+    if (headers.range) {
+      proxyHeaders.Range = headers.range;
+    }
+
     try {
-      const proxyHeaders = {
-        Accept: headers.accept || '*/*',
-      };
-      if (headers.range) {
-        proxyHeaders.Range = headers.range;
-      }
       response = await fetch(upstreamUrl, {
+        body,
         headers: proxyHeaders,
         method,
         redirect: 'follow',
@@ -364,6 +374,22 @@ export class StructurizrWorkspaceService {
       );
     }
 
+    if (response.status === 404 && method === 'GET' && this.isThumbnailPath(requestUrl.pathname)) {
+      try {
+        const fallbackResponse = await fetch(`${this.serverUrl}${THUMBNAIL_FALLBACK_PATH}`, {
+          headers: { Accept: 'image/png' },
+          method: 'GET',
+          redirect: 'follow',
+          signal: AbortSignal.timeout(SIDECAR_TIMEOUT_MS),
+        });
+        if (fallbackResponse.ok) {
+          response = fallbackResponse;
+        }
+      } catch {
+        // Keep the original 404 when the optional placeholder is unavailable.
+      }
+    }
+
     return {
       body: Buffer.from(await response.arrayBuffer()),
       contentType: response.headers.get('content-type') || 'application/octet-stream',

package/dist/client/assets/architecture-TIHT7OUA-CsHfPErM.js

@@ -1 +0,0 @@
-import"./chunk-KEIR6QF5-BICK3FdT.js";import{n as e}from"./chunk-MOZMSUNE-XVucA-n6.js";export{e as createArchitectureServices};

package/dist/client/assets/base-CxPEiHuy.js

@@ -1 +0,0 @@
-var e=``+new URL(`github.min-D2BCvnWf.css`,import.meta.url).href;export{e as t};