collabmd 0.1.19 → 0.1.21

package/public/index.html

@@ -364,16 +364,26 @@
             <div class="preview-body">
               <div id="previewContainer" class="preview-container">
                 <div id="previewContent" class="preview-content"></div>
-
-                <!-- Backlinks (Linked Mentions) -->
-                <div id="backlinksPanel" class="backlinks-panel hidden">
+                <div id="backlinksInlinePanel" class="backlinks-panel backlinks-panel-inline hidden">
+                  <div class="backlinks-header" role="button" tabindex="0" aria-expanded="false">
+                    <svg class="backlinks-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"/></svg>
+                    <span class="backlinks-toggle">0 Linked Mentions</span>
+                    <span class="backlinks-count"></span>
+                  </div>
+                  <div class="backlinks-body" aria-hidden="true" inert>
+                    <div class="backlinks-list"></div>
+                  </div>
+                </div>
+              </div>
+              <div id="backlinksPanel" class="backlinks-panel-layer hidden">
+                <div class="backlinks-panel backlinks-panel-dock" data-backlinks-variant="dock">
                   <div class="backlinks-header" role="button" tabindex="0" aria-expanded="false">
                     <svg class="backlinks-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"/></svg>
                     <span class="backlinks-toggle">0 Linked Mentions</span>
                     <span class="backlinks-count"></span>
                   </div>
                   <div class="backlinks-body" aria-hidden="true" inert>
-                    <div class="backlinks-list" id="backlinksList"></div>
+                    <div class="backlinks-list"></div>
                   </div>
                 </div>
               </div>

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

@@ -1,17 +1,30 @@
+import { createWorkspaceChange } from '../../../domain/workspace-change.js';
 import { resolveApiUrl } from '../../domain/runtime-paths.js';
 
 function normalizeWorkspaceChange(workspaceChange = {}) {
-  return {
-    changedPaths: Array.isArray(workspaceChange.changedPaths) ? workspaceChange.changedPaths.filter(Boolean) : [],
-    deletedPaths: Array.isArray(workspaceChange.deletedPaths) ? workspaceChange.deletedPaths.filter(Boolean) : [],
-    refreshExplorer: workspaceChange.refreshExplorer !== false,
-    renamedPaths: Array.isArray(workspaceChange.renamedPaths)
-      ? workspaceChange.renamedPaths.filter((entry) => entry?.oldPath && entry?.newPath)
-      : [],
-  };
+  return createWorkspaceChange(workspaceChange);
+}
+
+function createWorkspaceRequestId() {
+  if (globalThis.crypto?.randomUUID) {
+    return globalThis.crypto.randomUUID();
+  }
+
+  return `workspace-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
 }
 
 export const gitFeature = {
+  formatPullBackupToast(pullBackup = null) {
+    const fileCount = Number(pullBackup?.fileCount || 0);
+    if (fileCount === 1) {
+      return 'Pulled latest changes. 1 overlapping local file was backed up.';
+    }
+    if (fileCount > 1) {
+      return `Pulled latest changes. ${fileCount} overlapping local files were backed up.`;
+    }
+    return 'Pulled latest changes. Overlapping local changes were recorded in a pull backup.';
+  },
+
   setGitOperationStatus(message = '') {
     const badge = this.elements.gitOperationStatus;
     if (!badge) {
@@ -83,16 +96,24 @@ export const gitFeature = {
   },
 
   async postGitAction(endpoint, payload) {
+    const requestId = createWorkspaceRequestId();
+    this.pendingWorkspaceRequestIds?.add(requestId);
     const response = await fetch(endpoint, {
       body: JSON.stringify(payload),
       headers: {
         'Content-Type': 'application/json',
+        'X-CollabMD-Request-Id': requestId,
       },
       method: 'POST',
     });
     const data = await response.json();
     if (!response.ok) {
-      throw new Error(data.error || 'Git action failed');
+      this.pendingWorkspaceRequestIds?.delete(requestId);
+      const error = new Error(data.error || 'Git action failed');
+      if (typeof data?.code === 'string') {
+        error.code = data.code;
+      }
+      throw error;
     }
     return data;
   },
@@ -130,11 +151,6 @@ export const gitFeature = {
     const workspaceChange = normalizeWorkspaceChange(result.workspaceChange);
     await this.refreshWorkspaceAfterGitAction({ filePath, preferredScope });
     this.handleWorkspaceChangeForCurrentFile(workspaceChange, { action, local: true, showToast: showLocalFileToast });
-    this.lobby.sendWorkspaceEvent({
-      action,
-      sourceRef: result.sourceRef ?? null,
-      workspaceChange,
-    });
     return workspaceChange;
   },
 
@@ -150,21 +166,27 @@ export const gitFeature = {
       return false;
     }
 
-    this.navigation.navigateToFile(null);
     if (!showToast) {
+      if (renameEntry) {
+        this.navigation.navigateToFile(renameEntry.newPath);
+      } else {
+        this.navigation.navigateToFile(null);
+      }
       return true;
     }
 
     const displayName = this.getDisplayName(currentFilePath);
     if (renameEntry) {
+      this.navigation.navigateToFile(renameEntry.newPath);
       this.toastController.show(
         local
-          ? `${displayName} was reset away from this branch path`
-          : `${displayName} moved after a ${action} operation`,
+          ? `${displayName} moved to ${this.getDisplayName(renameEntry.newPath)}`
+          : `${displayName} moved on disk`,
       );
       return true;
     }
 
+    this.navigation.navigateToFile(null);
     this.toastController.show(
       local
         ? `${displayName} was removed by ${action}`
@@ -178,13 +200,45 @@ export const gitFeature = {
       return;
     }
 
+    if (event.requestId && this.pendingWorkspaceRequestIds?.has(event.requestId)) {
+      this.pendingWorkspaceRequestIds.delete(event.requestId);
+      return;
+    }
+
     const workspaceChange = normalizeWorkspaceChange(event.workspaceChange);
-    await this.refreshWorkspaceAfterGitAction();
+    if (event.origin === 'git') {
+      await this.refreshGitAfterAction();
+    }
     this.handleWorkspaceChangeForCurrentFile(workspaceChange, {
-      action: event.action || 'git',
+      action: event.action || event.origin || 'workspace',
       local: false,
       showToast: true,
     });
+
+    if (
+      event.origin === 'filesystem'
+      && this.currentFilePath
+      && workspaceChange.changedPaths.includes(this.currentFilePath)
+    ) {
+      const canUseInlineCue = workspaceChange.changedPaths.length === 1;
+      const highlightRange = canUseInlineCue && Array.isArray(event.highlightRanges)
+        ? event.highlightRanges.find((entry) => entry.path === this.currentFilePath)
+        : null;
+      const didFlash = highlightRange
+        ? this.session?.flashExternalUpdate?.(highlightRange)
+        : false;
+      if (!didFlash) {
+        this.toastController.show(`${this.getDisplayName(this.currentFilePath)} updated from disk`);
+      }
+    }
+
+    if (
+      this.currentFilePath
+      && Array.isArray(event.reloadRequiredPaths)
+      && event.reloadRequiredPaths.includes(this.currentFilePath)
+    ) {
+      this.toastController.show(`${this.getDisplayName(this.currentFilePath)} needs a manual reload`);
+    }
   },
 
   async stageGitFile(filePath, { scope = 'working-tree' } = {}) {
@@ -242,7 +296,20 @@ export const gitFeature = {
           result,
           showLocalFileToast: true,
         });
+        if (result.pullBackup) {
+          this.toastController.show(this.formatPullBackupToast(result.pullBackup), 5000);
+        }
       } catch (error) {
+        if (error?.code === 'pull_diverged_ff_only') {
+          this.toastController.show('Cannot pull because local and remote commits have diverged. Fast-forward only pull is not possible.', 5000);
+          return;
+        }
+
+        if (error?.code === 'pull_conflicted_after_autostash') {
+          this.toastController.show('Pull updated the branch, but reapplying local changes caused conflicts. Review the conflicted files and the pull backup summary.', 6000);
+          return;
+        }
+
         this.toastController.show(error.message || 'Failed to pull branch');
       }
     });

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

@@ -534,6 +534,9 @@ export const uiFeature = {
     if (!this.lobby.provider) {
       this.lobby.connect();
     }
+    if (!this.workspaceSync.provider) {
+      this.workspaceSync.connect();
+    }
 
     if (wasInactive) {
       if (this.fileExplorerReady) {
@@ -554,6 +557,7 @@ export const uiFeature = {
       this.elements.displayNameDialog.close();
     }
     this.lobby.disconnect();
+    this.workspaceSync.disconnect();
     this.globalUsers = [];
     this.chatMessages = [];
     this.chatMessageIds.clear();

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

@@ -61,6 +61,7 @@ export function bindAppShellElements(doc = document) {
     emptyStateNewFileBtn: doc.getElementById('emptyStateNewFileBtn'),
     emptyStateSearchBtn: doc.getElementById('emptyStateSearchBtn'),
     backlinksPanel: doc.getElementById('backlinksPanel'),
+    backlinksInlinePanel: doc.getElementById('backlinksInlinePanel'),
     commentSelectionButton: doc.getElementById('commentSelectionBtn'),
     commentsDrawer: doc.getElementById('commentsDrawer'),
     commentsDrawerEmpty: doc.getElementById('commentsDrawerEmpty'),

package/src/client/bootstrap/collabmd-app-shell.js

@@ -18,6 +18,7 @@ import { BrowserPreferencesPort } from '../infrastructure/browser-preferences-po
 import { getRuntimeConfig } from '../infrastructure/runtime-config.js';
 import { TabActivityLock } from '../infrastructure/tab-activity-lock.js';
 import { vaultApiClient } from '../infrastructure/vault-api-client.js';
+import { WorkspaceSyncClient } from '../infrastructure/workspace-sync-client.js';
 import { BacklinksPanel } from '../presentation/backlinks-panel.js';
 import { CommentUiController } from '../presentation/comment-ui-controller.js';
 import { ExcalidrawEmbedController } from '../presentation/excalidraw-embed-controller.js';
@@ -111,11 +112,22 @@ export class CollabMdAppShell {
     this.quickSwitcherModulePromise = null;
     this.fileExplorerReadyPromise = Promise.resolve();
     this.mobileBreakpointQuery = window.matchMedia('(max-width: 768px)');
+    this.pendingWorkspaceRequestIds = new Set();
 
     this.lobby = new LobbyPresence({
       preferredUserName: this.getStoredUserName(),
       onChange: (users) => this.updateGlobalUsers(users),
       onChatChange: (messages, meta) => this.updateChatMessages(messages, meta),
+    });
+    this.workspaceSync = new WorkspaceSyncClient({
+      onTreeChange: (tree, metadata = {}) => {
+        const wasReady = this.fileExplorerReady;
+        this.fileExplorer.setTree(tree, metadata);
+        this.fileExplorerReady = true;
+        if (!wasReady && this.isTabActive) {
+          void this.handleHashChange();
+        }
+      },
       onWorkspaceEvent: (event) => {
         void this.handleIncomingWorkspaceEvent(event);
       },
@@ -131,6 +143,7 @@ export class CollabMdAppShell {
     this.gitPanel = new GitPanelController({
       enabled: this.runtimeConfig.gitEnabled !== false,
       onCommitStaged: () => this.openGitCommitDialog(),
+      onOpenPullBackup: (filePath) => filePath && this.navigation.navigateToFile(filePath),
       onPullBranch: () => this.pullGitBranch(),
       onPushBranch: () => this.pushGitBranch(),
       onRepoChange: (isGitRepo, status) => this.handleGitRepoChange(isGitRepo, status),
@@ -149,6 +162,7 @@ export class CollabMdAppShell {
         this.scrollSyncController.suspendSync(250);
         this.session?.scrollToLine(sourceLine, 0);
       },
+      onWillOpen: () => this.commentUi?.closeDrawer(),
     });
     this.videoEmbed = new VideoEmbedController({
       previewElement: this.elements.previewContent,
@@ -196,6 +210,7 @@ export class CollabMdAppShell {
       scrollEditorToLine: (lineNumber, viewportRatio) => this.session?.scrollToLine(lineNumber, viewportRatio),
     });
     this.backlinksPanel = new BacklinksPanel({
+      inlinePanelElement: this.elements.backlinksInlinePanel,
       onFileSelect: (filePath) => this.handleFileSelection(filePath, { closeSidebarOnMobile: true }),
       panelElement: this.elements.backlinksPanel,
     });
@@ -214,6 +229,7 @@ export class CollabMdAppShell {
       commentsDrawerList: this.elements.commentsDrawerList,
       commentsToggleButton: this.elements.commentsToggleButton,
       editorContainer: this.elements.editorContainer,
+      onWillOpenDrawer: () => this.outlineController.close(),
       previewContainer: this.elements.previewContainer,
       previewElement: this.elements.previewContent,
       onCreateThread: ({ anchor, body }) => this.session?.createCommentThread({ anchor, body }),

package/src/client/domain/vault-utils.js

@@ -25,8 +25,8 @@ export function escapeHtml(text) {
  *
  * Matching rules (in order):
  *   1. Exact path match (with .md appended if missing)
- *   2. Filename match at any directory depth
- *   3. Path without .md extension matches the target
+ *   2. Exact path without .md extension matches the target
+ *   3. Filename/path suffix match at any directory depth
  *
  * @param {string} target — the raw wiki-link target text
  * @param {string[]} files — list of vault file paths

package/src/client/excalidraw-editor.js

@@ -149,6 +149,7 @@ if (isTestMode) {
       && collabReady
       && roomClient.canWriteToRoom === true
       && roomClient.waitingForAuthoritativeSync === false
+      && roomClient.isApplyingSharedSnapshot() === false
     ),
     isReady: () => collabReady && Boolean(excalidrawAPI) && Boolean(getNativeHistoryButton('undo')) && Boolean(getNativeHistoryButton('redo')),
     redoShared: () => triggerNativeHistory('redo'),
@@ -506,7 +507,7 @@ window.addEventListener('message', (event) => {
 });
 
 function scheduleSyncToRoom(elements, appState, files) {
-  if (!collabReady || suppressOnChange || roomClient.isApplyingSharedSnapshot()) {
+  if (!collabReady || suppressOnChange) {
     return;
   }
 

package/src/client/infrastructure/editor-session.js

@@ -229,6 +229,10 @@ export class EditorSession {
     return this.viewAdapter.insertText(text);
   }
 
+  flashExternalUpdate(range) {
+    return this.viewAdapter.flashRemoteRange(range);
+  }
+
   waitForInitialSync(timeoutMs = 1500) {
     return this.collaborationClient.waitForInitialSync(timeoutMs);
   }