collabmd 0.1.39 → 0.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "collabmd",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "type": "module",
   "description": "Collaborative markdown vault — like Obsidian, but online. Serve any directory of markdown files for realtime collaborative editing.",
   "repository": {
@@ -63,7 +63,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@codemirror/autocomplete": "^6.20.2",
+    "@codemirror/autocomplete": "^6.20.3",
     "@codemirror/commands": "^6.10.3",
     "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/lang-yaml": "^6.1.3",
@@ -72,27 +72,27 @@
     "@codemirror/search": "^6.7.0",
     "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.42.0",
-    "@excalidraw/excalidraw": "0.18.0-b1c6bfc",
+    "@codemirror/view": "^6.43.1",
+    "@excalidraw/excalidraw": "0.18.0-699826",
     "@fontsource-variable/inter": "^5.2.8",
     "@fontsource/jetbrains-mono": "^5.2.8",
-    "@turbodocx/html-to-docx": "^1.20.1",
-    "archiver": "^7.0.1",
+    "@turbodocx/html-to-docx": "^1.21.0",
+    "archiver": "^8.0.0",
     "highlight.js": "^11.11.1",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^4.2.0",
     "lib0": "^0.2.117",
-    "lit-html": "^3.3.2",
-    "markdown-it": "^14.1.1",
-    "mermaid": "^11.14.0",
+    "lit-html": "^3.3.3",
+    "markdown-it": "^14.2.0",
+    "mermaid": "^11.15.0",
     "openid-client": "^6.8.4",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
-    "sharp": "^0.34.5",
-    "ws": "^8.20.0",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "sharp": "^0.35.1",
+    "ws": "^8.21.0",
     "y-codemirror.next": "^0.3.5",
     "y-protocols": "^1.0.7",
     "y-websocket": "^3.0.0",
-    "yjs": "^13.6.30"
+    "yjs": "^13.6.31"
   },
   "overrides": {
     "@excalidraw/excalidraw": {
@@ -101,12 +101,12 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@playwright/test": "^1.59.1",
-    "@vitest/browser": "^4.1.5",
-    "@vitest/browser-playwright": "^4.1.5",
-    "eslint": "^10.3.0",
+    "@playwright/test": "^1.60.0",
+    "@vitest/browser": "^4.1.8",
+    "@vitest/browser-playwright": "^4.1.8",
+    "eslint": "^10.5.0",
     "globals": "^17.6.0",
-    "vite": "^8.0.10",
-    "vitest": "^4.1.5"
+    "vite": "^8.0.16",
+    "vitest": "^4.1.8"
   }
 }

package/src/client/application/app-shell/comments-feature.js

@@ -1,6 +1,30 @@
 import { getVaultFileKind, supportsCommentsForFilePath } from '../../../domain/file-kind.js';
 
 export const commentsFeature = {
+  createCommentThread(payload) {
+    const threadId = this.session?.createCommentThread(payload);
+    if (threadId) {
+      this.scheduleCommentOverviewRefresh();
+    }
+    return threadId;
+  },
+
+  replyToCommentThread(threadId, body) {
+    const messageId = this.session?.replyToCommentThread(threadId, body);
+    if (messageId) {
+      this.scheduleCommentOverviewRefresh();
+    }
+    return messageId;
+  },
+
+  resolveCommentThread(threadId) {
+    const didResolve = this.session?.deleteCommentThread(threadId);
+    if (didResolve) {
+      this.scheduleCommentOverviewRefresh();
+    }
+    return didResolve;
+  },
+
   getCommentFileKind(filePath = this.currentFilePath) {
     return getVaultFileKind(filePath) || 'markdown';
   },
@@ -21,6 +45,7 @@ export const commentsFeature = {
 
   handleCommentThreadsChange(threads = []) {
     this.commentUi.setThreads(threads);
+    this.focusPendingCommentOverviewThread();
   },
 
   handleCommentEditorContentChange() {
@@ -30,4 +55,87 @@ export const commentsFeature = {
   refreshCommentUiLayout() {
     this.commentUi.refreshLayout();
   },
+
+  scheduleCommentOverviewRefresh({ delayMs = 900 } = {}) {
+    clearTimeout(this._commentOverviewRefreshTimer);
+    this._commentOverviewRefreshTimer = setTimeout(() => {
+      this._commentOverviewRefreshTimer = null;
+      this._commentOverviewStale = false;
+      void this.commentsOverview?.refresh?.();
+    }, delayMs);
+  },
+
+  handleCommentOverviewWorkspaceTreeChange() {
+    this._commentOverviewStale = true;
+    if (this.activeSidebarTab === 'comments') {
+      this.scheduleCommentOverviewRefresh({ delayMs: 0 });
+    }
+  },
+
+  refreshCommentOverviewForSidebarOpen() {
+    this._commentOverviewStale = false;
+    void this.commentsOverview?.refresh?.();
+  },
+
+  async openCommentOverviewThread({ anchor = null, filePath, threadId } = {}) {
+    if (!filePath || !threadId) {
+      return;
+    }
+
+    const line = Number.isFinite(anchor?.startLine) ? anchor.startLine : null;
+    this._pendingCommentOverviewFocus = {
+      attempts: 0,
+      filePath,
+      line,
+      threadId,
+    };
+    this.setSidebarTab('comments');
+    this.setSidebarVisibility(true);
+    this.workspaceRouteController?.preserveSidebarTabForNextFileRoute?.(filePath);
+    this.navigation.navigateToFile(filePath, {
+      line,
+    });
+
+    if (this.currentFilePath !== filePath || !this.session) {
+      await this.openFile(filePath);
+    }
+
+    this.setSidebarTab('comments');
+    this.setSidebarVisibility(true);
+    this.focusPendingCommentOverviewThread();
+  },
+
+  focusPendingCommentOverviewThread() {
+    const pending = this._pendingCommentOverviewFocus;
+    if (!pending || pending.filePath !== this.currentFilePath) {
+      return false;
+    }
+
+    if (Number.isFinite(pending.line)) {
+      this.session?.scrollToLine?.(pending.line, 0.2);
+    }
+
+    const didFocus = this.commentUi.openThreadFromOverview?.(pending.threadId);
+    if (didFocus) {
+      this._pendingCommentOverviewFocus = null;
+      this.setSidebarTab('comments');
+      this.setSidebarVisibility(true);
+      return true;
+    }
+
+    if (pending.attempts >= 8) {
+      this._pendingCommentOverviewFocus = null;
+      this.setSidebarTab('comments');
+      this.setSidebarVisibility(true);
+      return false;
+    }
+
+    pending.attempts += 1;
+    clearTimeout(this._commentOverviewFocusTimer);
+    this._commentOverviewFocusTimer = setTimeout(() => {
+      this._commentOverviewFocusTimer = null;
+      this.focusPendingCommentOverviewThread();
+    }, 120);
+    return false;
+  },
 };

package/src/client/application/app-shell/git-feature.js

@@ -87,7 +87,7 @@ export const gitFeature = {
 
   handleGitRepoChange(isGitRepo, status = null) {
     this.gitRepoAvailable = Boolean(isGitRepo);
-    this.elements.sidebarTabs?.classList.toggle('hidden', !this.gitRepoAvailable);
+    this.elements.sidebarTabs?.classList.remove('hidden');
     this.elements.gitSidebarTab?.classList.toggle('hidden', !this.gitRepoAvailable);
     
     const hasChanges = isGitRepo && status?.summary?.changedFiles > 0;
@@ -169,6 +169,7 @@ export const gitFeature = {
   },
 
   async showGitDiff({ filePath = null, scope = 'all' } = {}) {
+    await this.ensureGitControllers?.();
     this.clearStaticPreviewDocument?.();
     this.gitPanel.setSelection(filePath ? { path: filePath, scope, source: 'workspace' } : {});
     this.gitPanel.setMode('changes');
@@ -183,6 +184,7 @@ export const gitFeature = {
   },
 
   async showGitCommit({ hash, path = null, historyFilePath = null } = {}) {
+    await this.ensureGitControllers?.();
     this.clearStaticPreviewDocument?.();
     this.gitPanel.setMode('history');
     this.gitPanel.setSelection(hash ? { commitHash: hash, path, source: 'commit' } : { source: 'commit' });
@@ -197,6 +199,7 @@ export const gitFeature = {
   },
 
   async showGitHistory() {
+    await this.ensureGitControllers?.();
     this.clearStaticPreviewDocument?.();
     this.gitPanel.setMode('history');
     this.gitPanel.setSelection({ source: 'commit' });
@@ -209,6 +212,7 @@ export const gitFeature = {
   },
 
   async showGitFileHistory({ filePath = null } = {}) {
+    await this.ensureGitControllers?.();
     if (!filePath) {
       this.workspaceRouteController?.showEmptyState?.();
       return;
@@ -336,6 +340,7 @@ export const gitFeature = {
   },
 
   async refreshGitAfterAction({ filePath = null, preferredScope = null } = {}) {
+    await this.ensureGitControllers?.();
     await this.gitPanel.refresh({ force: true });
 
     const route = this.navigation.getHashRoute();

package/src/client/application/app-shell/ui-feature-shell.js

@@ -53,9 +53,7 @@ function initialize() {
   this.layoutController.initialize();
   this.scrollSyncController.initialize();
   this.fileExplorer.initialize();
-  this.gitPanel.initialize();
-  this.gitDiffView.initialize();
-  this.fileHistoryView.initialize();
+  this.commentsOverview?.initialize?.();
   this.initializePreviewLayoutObserver();
   this.syncIdentityManagementUi();
   this.syncCurrentUserName();
@@ -64,7 +62,6 @@ function initialize() {
   this.syncChatNotificationButton();
   this.syncFileHistoryButton({ mode: 'empty' });
   this.renderChat();
-  void this.gitPanel.refresh({ force: true });
   this.elements.chatInput?.setAttribute('maxlength', String(this.lobbyChatMessageMaxLength));
   this.bindEvents();
   this.restoreSidebarState();
@@ -81,6 +78,8 @@ function initialize() {
 
   this.fileExplorerReadyPromise = this.fileExplorer.refresh().then(() => {
     this.fileExplorerReady = true;
+    void this.commentsOverview?.refresh?.();
+    this.scheduleGitControllerPrewarm?.();
     if (this.isTabActive) {
       return this.handleHashChange();
     }
@@ -326,6 +325,10 @@ function bindEvents() {
     this.setSidebarTab('git');
   });
 
+  this.elements.commentsSidebarTab?.addEventListener('click', () => {
+    this.setSidebarTab('comments');
+  });
+
   document.addEventListener('pointerdown', (event) => {
     this.handleDocumentPointerDown(event);
   });

package/src/client/application/app-shell/ui-feature-sidebar.js

@@ -1,7 +1,7 @@
 /**
  * @typedef {object} UiSidebarContext
  * @property {string} activeSidebarTab
- * @property {{ sidebar?: HTMLElement | null, filesSidebarTab?: HTMLElement | null, gitSidebarTab?: HTMLElement | null, fileSearch?: HTMLElement | null, gitSearch?: HTMLElement | null }} elements
+ * @property {{ sidebar?: HTMLElement | null, filesSidebarTab?: HTMLElement | null, commentsSidebarTab?: HTMLElement | null, gitSidebarTab?: HTMLElement | null, fileSearch?: HTMLElement | null, gitSearch?: HTMLElement | null, commentOverviewPanel?: HTMLElement | null }} elements
  * @property {{ setSidebarVisible(showSidebar: boolean): void, getSidebarVisible(): string | null | undefined }} preferences
  * @property {{ setActive(active: boolean): void }} gitPanel
  * @property {boolean} gitRepoAvailable
@@ -74,17 +74,26 @@ function applySidebarVisibility(showSidebar) {
 
 /** @this {UiSidebarContext} */
 function setSidebarTab(tab) {
-  const nextTab = tab === 'git' && this.gitRepoAvailable ? 'git' : 'files';
+  const nextTab = tab === 'git' && this.gitRepoAvailable
+    ? 'git'
+    : tab === 'comments'
+      ? 'comments'
+      : 'files';
   this.activeSidebarTab = nextTab;
 
   this.elements.filesSidebarTab?.classList.toggle('active', nextTab === 'files');
+  this.elements.commentsSidebarTab?.classList.toggle('active', nextTab === 'comments');
   this.elements.gitSidebarTab?.classList.toggle('active', nextTab === 'git');
   document.getElementById('fileTree')?.classList.toggle('hidden', nextTab !== 'files');
   this.elements.fileSearch?.classList.toggle('hidden', nextTab !== 'files');
+  this.elements.commentOverviewPanel?.classList.toggle('hidden', nextTab !== 'comments');
   this.elements.gitSearch?.classList.toggle('hidden', nextTab !== 'git');
   document.getElementById('gitPanel')?.classList.toggle('active', nextTab === 'git');
   document.getElementById('gitPanel')?.classList.toggle('hidden', nextTab !== 'git');
   this.gitPanel.setActive(nextTab === 'git');
+  if (nextTab === 'comments') {
+    this.refreshCommentOverviewForSidebarOpen?.();
+  }
 }
 
 export const uiFeatureSidebarMethods = {

package/src/client/application/app-shell-elements.js

@@ -77,7 +77,9 @@ export function bindAppShellElements(doc = document) {
     commentsDrawer: doc.getElementById('commentsDrawer'),
     commentsDrawerEmpty: doc.getElementById('commentsDrawerEmpty'),
     commentsDrawerList: doc.getElementById('commentsDrawerList'),
+    commentsSidebarTab: doc.getElementById('commentsSidebarTab'),
     commentsToggleButton: doc.getElementById('commentsToggle'),
+    commentOverviewPanel: doc.getElementById('commentOverviewPanel'),
     outlineToggle: doc.getElementById('outlineToggle'),
     tabLockCopy: doc.getElementById('tabLockCopy'),
     tabLockOverlay: doc.getElementById('tabLockOverlay'),