collabmd 0.1.48 → 0.1.51

package/src/client/infrastructure/editor-view-adapter.js

@@ -1,4 +1,3 @@
-import { vim } from '@replit/codemirror-vim';
 import { autocompletion, closeBrackets, closeBracketsKeymap } from '@codemirror/autocomplete';
 import {
   defaultKeymap,
@@ -50,6 +49,7 @@ import {
   isPlantUmlFilePath,
   isStructurizrFilePath,
 } from '../../domain/file-kind.js';
+import { resolveExactTextChanges } from '../../domain/exact-text-edits.js';
 import { normalizeCommentQuote } from '../../domain/comment-threads.js';
 import { formatDocumentText } from '../domain/document-formatter.js';
 import { createMarkdownToolbarEdit } from '../domain/markdown-formatting.js';
@@ -59,8 +59,20 @@ import { plantUmlLanguage, plantUmlLanguageDescription } from '../domain/plantum
 import { structurizrLanguage, structurizrLanguageDescription } from '../domain/structurizr-language.js';
 import { handleImagePasteEvent } from './editor-paste-utils.js';
 
+const MARKDOWN_CODE_LANGUAGE_ALIASES = new Set([
+  'bash', 'c', 'c++', 'cpp', 'css', 'diff', 'html', 'java', 'javascript', 'js',
+  'json', 'jsx', 'markdown', 'md', 'python', 'py', 'rust', 'sh', 'shell', 'sql',
+  'ts', 'tsx', 'typescript', 'xml', 'yaml', 'yml',
+]);
+
+function isMarkdownCodeLanguage(language) {
+  const names = [language.name, ...(language.alias || [])]
+    .map((value) => String(value).toLowerCase());
+  return names.some((name) => MARKDOWN_CODE_LANGUAGE_ALIASES.has(name));
+}
+
 const markdownCodeLanguages = [
-  ...languages,
+  ...languages.filter(isMarkdownCodeLanguage),
   mermaidLanguageDescription,
   plantUmlLanguageDescription,
   structurizrLanguageDescription,
@@ -500,7 +512,7 @@ export class EditorViewAdapter {
       highlightActiveLine(),
       highlightSelectionMatches(),
       createSearchNavigationListener(),
-      this.vimModeCompartment.of(!readOnly && this.vimModeEnabled ? vim({ status: true }) : []),
+      this.vimModeCompartment.of([]),
       keymap.of([
         ...closeBracketsKeymap,
         ...defaultKeymap,
@@ -584,6 +596,10 @@ export class EditorViewAdapter {
     this.onSelectionChanged?.(this.editorView.state);
     this.emitViewportChange();
 
+    if (this.vimModeEnabled && editorMode !== 'provisional') {
+      void this.applyVimExtension();
+    }
+
     if (preserveScrollTop > 0) {
       requestAnimationFrame(() => {
         if (this.editorView?.scrollDOM) {
@@ -675,6 +691,21 @@ export class EditorViewAdapter {
     return this.vimModeEnabled;
   }
 
+  async applyVimExtension() {
+    if (!this.vimModeEnabled || !this.editorView || this.editorView.state.readOnly) {
+      return;
+    }
+
+    const { vim } = await import('@replit/codemirror-vim');
+    if (!this.vimModeEnabled || !this.editorView || this.editorView.state.readOnly) {
+      return;
+    }
+
+    this.editorView.dispatch({
+      effects: this.vimModeCompartment.reconfigure(vim({ status: true })),
+    });
+  }
+
   setVimMode(enabled) {
     const nextEnabled = Boolean(enabled);
     if (nextEnabled === this.vimModeEnabled) {
@@ -686,12 +717,17 @@ export class EditorViewAdapter {
       return nextEnabled;
     }
 
-    this.editorView.dispatch({
-      effects: this.vimModeCompartment.reconfigure(
-        nextEnabled ? vim({ status: true }) : [],
-      ),
+    if (!nextEnabled) {
+      this.editorView.dispatch({
+        effects: this.vimModeCompartment.reconfigure([]),
+      });
+      this.editorView.focus();
+      return nextEnabled;
+    }
+
+    void this.applyVimExtension().then(() => {
+      this.editorView?.focus();
     });
-    this.editorView.focus();
     return nextEnabled;
   }
 
@@ -1143,6 +1179,18 @@ export class EditorViewAdapter {
     return true;
   }
 
+  applyTextReplacements(replacements) {
+    if (!this.editorView) {
+      throw new Error('The editor is not available');
+    }
+
+    const { state } = this.editorView;
+    const changes = resolveExactTextChanges(state.doc.toString(), replacements);
+
+    this.editorView.dispatch({ changes, userEvent: 'input' });
+    return changes.length;
+  }
+
   replaceText(text) {
     if (!this.editorView) {
       return false;

package/src/client/infrastructure/excalidraw-room-client.js

@@ -1,5 +1,7 @@
 import { Doc } from 'yjs';
 import { WebsocketProvider } from 'y-websocket';
+import * as decoding from 'lib0/decoding';
+import * as encoding from 'lib0/encoding';
 import {
   EXCALIDRAW_APP_STATE_KEY,
   EXCALIDRAW_ELEMENTS_KEY,
@@ -9,9 +11,14 @@ import {
   buildExcalidrawRoomScene,
   ensureExcalidrawRoomSchema,
   isExcalidrawRoomDocStructured,
+  readExcalidrawReplaceGeneration,
   readLegacyExcalidrawRoomScene,
   replaceExcalidrawRoomScene,
 } from '../../domain/excalidraw-room-codec.js';
+import {
+  MSG_AGENT_FLUSH,
+  MSG_AGENT_FLUSH_ACK,
+} from '../../domain/collaboration-protocol.js';
 
 import {
   buildCollaboratorsMap,
@@ -33,6 +40,7 @@ import { stopReconnectOnControlledClose } from './yjs-provider-reset-guard.js';
 const DEFAULT_EMPTY_SCENE_GUARD_MS = 250;
 const DEFAULT_SAVE_THROTTLE_MS = 48;
 const DEFAULT_SYNC_TIMEOUT_MS = 4000;
+const DEFAULT_AGENT_FLUSH_TIMEOUT_MS = 1000;
 
 export const EXCALIDRAW_ROOM_CONNECTION_STATE = Object.freeze({
   AUTHORITATIVE: 'authoritative',
@@ -167,6 +175,7 @@ export class ExcalidrawRoomClient {
     this.handleProviderSync = null;
     this.handleProviderStatus = null;
     this.lastSceneJson = '';
+    this.lastReplaceGeneration = null;
     this.sceneSyncTimer = null;
     this.sceneSyncDueAt = 0;
     this.lastSceneSyncAt = 0;
@@ -178,6 +187,8 @@ export class ExcalidrawRoomClient {
     this.lastViewportSignature = '';
     this.lastSelectedIdsSignature = '';
     this.pendingEmptySceneCandidate = null;
+    this.agentFlushRequestCounter = 0;
+    this.pendingAgentFlushRequests = new Map();
     this.structuredObserversAttached = false;
     this.canWriteToRoom = false;
     this.waitingForAuthoritativeSync = false;
@@ -208,6 +219,11 @@ export class ExcalidrawRoomClient {
         return;
       }
 
+      const prevReplaceGeneration = this.lastReplaceGeneration;
+      this.lastReplaceGeneration = readExcalidrawReplaceGeneration(this.ydoc);
+      const authoritative = prevReplaceGeneration !== null
+        && this.lastReplaceGeneration > prevReplaceGeneration;
+
       const remoteJson = this.getStructuredSceneJson();
       if (!remoteJson || remoteJson === this.lastSceneJson) {
         return;
@@ -215,7 +231,7 @@ export class ExcalidrawRoomClient {
 
       this.pendingEmptySceneCandidate = null;
       this.lastSceneJson = JSON.stringify(parseSceneJson(remoteJson));
-      this.onRemoteSceneJson(this.lastSceneJson);
+      this.onRemoteSceneJson(this.lastSceneJson, { authoritative });
     };
   }
 
@@ -250,6 +266,74 @@ export class ExcalidrawRoomClient {
     return this.connectionState;
   }
 
+  installAgentFlushHandler() {
+    const messageHandlers = this.provider?.messageHandlers;
+    if (!messageHandlers || typeof messageHandlers !== 'object') {
+      return false;
+    }
+
+    messageHandlers[MSG_AGENT_FLUSH_ACK] = (_encoder, decoder) => {
+      let requestId;
+      try {
+        requestId = decoding.readVarString(decoder);
+      } catch {
+        return;
+      }
+
+      const request = this.pendingAgentFlushRequests.get(requestId);
+      if (!request) {
+        return;
+      }
+
+      request.resolve({ status: 'acknowledged' });
+    };
+    return true;
+  }
+
+  settleAgentFlushRequests(status) {
+    const requests = [...this.pendingAgentFlushRequests.values()];
+    requests.forEach((request) => request.resolve({ status }));
+  }
+
+  waitForServerFlush({ timeoutMs = DEFAULT_AGENT_FLUSH_TIMEOUT_MS } = {}) {
+    const ws = this.provider?.ws;
+    const openState = ws?.OPEN ?? globalThis.WebSocket?.OPEN ?? 1;
+    if (
+      !this.canWriteToRoom
+      || !ws
+      || ws.readyState !== openState
+      || !this.provider?.messageHandlers?.[MSG_AGENT_FLUSH_ACK]
+    ) {
+      return Promise.resolve({ status: 'unavailable' });
+    }
+
+    const requestId = `agent-flush-${this.ydoc?.clientID ?? 'client'}-${++this.agentFlushRequestCounter}`;
+    return new Promise((resolve) => {
+      const finish = (result) => {
+        const request = this.pendingAgentFlushRequests.get(requestId);
+        if (!request) {
+          return;
+        }
+        this.clearTimeoutFn(request.timeoutId);
+        this.pendingAgentFlushRequests.delete(requestId);
+        resolve(result);
+      };
+      this.pendingAgentFlushRequests.set(requestId, {
+        resolve: finish,
+        timeoutId: this.setTimeoutFn(() => finish({ status: 'timeout' }), timeoutMs),
+      });
+
+      try {
+        const encoder = encoding.createEncoder();
+        encoding.writeVarUint(encoder, MSG_AGENT_FLUSH);
+        encoding.writeVarString(encoder, requestId);
+        ws.send(encoding.toUint8Array(encoder));
+      } catch {
+        finish({ status: 'unavailable' });
+      }
+    });
+  }
+
   hasPendingWrites() {
     return Boolean(this.pendingSceneSyncPayload);
   }
@@ -368,6 +452,7 @@ export class ExcalidrawRoomClient {
       disableBc: true,
       maxBackoffTime: 5000,
     });
+    this.installAgentFlushHandler();
     stopReconnectOnControlledClose(this.provider);
 
     this.awareness = this.provider.awareness;
@@ -636,7 +721,7 @@ export class ExcalidrawRoomClient {
   }
 
   scheduleSceneSync(elements, appState, files) {
-    if (!this.canWriteToRoom) {
+    if (!this.canWriteToRoom || this.isApplyingSharedSnapshot()) {
       return false;
     }
 
@@ -933,6 +1018,7 @@ export class ExcalidrawRoomClient {
 
   disconnect() {
     this.flushSceneSync();
+    this.settleAgentFlushRequests('disconnected');
     this.setConnectionState(EXCALIDRAW_ROOM_CONNECTION_STATE.DISCONNECTING);
     this.clearTimeoutFn(this.sceneSyncTimer);
     this.sceneSyncTimer = null;
@@ -992,5 +1078,6 @@ export class ExcalidrawRoomClient {
     this.setConnectionState(EXCALIDRAW_ROOM_CONNECTION_STATE.CLOSED);
     this.applyingSharedSnapshotDepth = 0;
     this.suppressStructuredSceneUpdateDepth = 0;
+    this.lastReplaceGeneration = null;
   }
 }

package/src/client/infrastructure/git-api-client.js

@@ -13,28 +13,37 @@ function createSearchParams(values = {}) {
   return params;
 }
 
-export class GitApiClient {
+async function postJson(path, payload, { fallbackError, requestId = null } = {}) {
+  const response = await fetch(resolveApiUrl(path), {
+    body: JSON.stringify(payload),
+    headers: createRequestHeaders(requestId, { 'Content-Type': 'application/json' }),
+    method: 'POST',
+  });
+  return parseApiResponse(response, fallbackError);
+}
+
+export const gitApiClient = {
   async readStatus({ force = false } = {}) {
     const response = await fetch(resolveApiUrl(`/git/status${force ? '?force=true' : ''}`));
     return parseApiResponse(response, 'Failed to load git status');
-  }
+  },
 
   async readPullBackups() {
     const response = await fetch(resolveApiUrl('/git/pull-backups'));
     return parseApiResponse(response, 'Failed to load pull backups');
-  }
+  },
 
   async readHistory({ limit, offset } = {}) {
     const params = createSearchParams({ limit, offset });
     const response = await fetch(resolveApiUrl(`/git/history?${params.toString()}`));
     return parseApiResponse(response, 'Failed to load git history');
-  }
+  },
 
   async readFileHistory({ path, limit, offset } = {}) {
     const params = createSearchParams({ limit, offset, path });
     const response = await fetch(resolveApiUrl(`/git/file-history?${params.toString()}`));
     return parseApiResponse(response, 'Failed to load file history');
-  }
+  },
 
   async readDiff({
     allowLargePatch = false,
@@ -50,7 +59,7 @@ export class GitApiClient {
     });
     const response = await fetch(resolveApiUrl(`/git/diff?${params.toString()}`));
     return parseApiResponse(response, 'Failed to load git diff');
-  }
+  },
 
   async readCommit({
     allowLargePatch = false,
@@ -66,51 +75,48 @@ export class GitApiClient {
     });
     const response = await fetch(resolveApiUrl(`/git/commit?${params.toString()}`));
     return parseApiResponse(response, 'Failed to load git commit');
-  }
+  },
 
   async readFileSnapshot({ hash, path } = {}) {
     const params = createSearchParams({ hash, path });
     const response = await fetch(resolveApiUrl(`/git/file-snapshot?${params.toString()}`));
     return parseApiResponse(response, 'Failed to load historical file preview');
-  }
+  },
 
   getFileAttachmentUrl({ hash, path } = {}) {
     const params = createSearchParams({ hash, path });
     return resolveApiUrl(`/git/file-attachment?${params.toString()}`);
-  }
+  },
 
   async stageFile({ path, requestId = null } = {}) {
-    return this.#postJson('/git/stage', { path }, { requestId, fallbackError: 'Failed to stage file' });
-  }
+    return postJson('/git/stage', { path }, { requestId, fallbackError: 'Failed to stage file' });
+  },
 
   async unstageFile({ path, requestId = null } = {}) {
-    return this.#postJson('/git/unstage', { path }, { requestId, fallbackError: 'Failed to unstage file' });
-  }
+    return postJson('/git/unstage', { path }, { requestId, fallbackError: 'Failed to unstage file' });
+  },
+
+  async stageAll({ requestId = null } = {}) {
+    return postJson('/git/stage-all', {}, { requestId, fallbackError: 'Failed to stage all changes' });
+  },
+
+  async unstageAll({ requestId = null } = {}) {
+    return postJson('/git/unstage-all', {}, { requestId, fallbackError: 'Failed to unstage all changes' });
+  },
 
   async pushBranch({ requestId = null } = {}) {
-    return this.#postJson('/git/push', {}, { requestId, fallbackError: 'Failed to push branch' });
-  }
+    return postJson('/git/push', {}, { requestId, fallbackError: 'Failed to push branch' });
+  },
 
   async pullBranch({ requestId = null } = {}) {
-    return this.#postJson('/git/pull', {}, { requestId, fallbackError: 'Failed to pull branch' });
-  }
+    return postJson('/git/pull', {}, { requestId, fallbackError: 'Failed to pull branch' });
+  },
 
   async resetFile({ path, requestId = null } = {}) {
-    return this.#postJson('/git/reset-file', { path }, { requestId, fallbackError: 'Failed to reset file' });
-  }
+    return postJson('/git/reset-file', { path }, { requestId, fallbackError: 'Failed to reset file' });
+  },
 
   async commit({ message, requestId = null } = {}) {
-    return this.#postJson('/git/commit', { message }, { requestId, fallbackError: 'Failed to commit staged changes' });
-  }
-
-  async #postJson(path, payload, { fallbackError, requestId = null } = {}) {
-    const response = await fetch(resolveApiUrl(path), {
-      body: JSON.stringify(payload),
-      headers: createRequestHeaders(requestId, { 'Content-Type': 'application/json' }),
-      method: 'POST',
-    });
-    return parseApiResponse(response, fallbackError);
-  }
-}
-
-export const gitApiClient = new GitApiClient();
+    return postJson('/git/commit', { message }, { requestId, fallbackError: 'Failed to commit staged changes' });
+  },
+};

package/src/client/infrastructure/hosted-api-client.js

@@ -0,0 +1,60 @@
+import { resolveApiUrl } from '../domain/runtime-paths.js';
+import { parseApiResponse } from './api-client-utils.js';
+
+function request(path, { body = null, fallback = 'Request failed', method = 'GET' } = {}) {
+  return fetch(resolveApiUrl(path), {
+    ...(body === null ? {} : { body: JSON.stringify(body) }),
+    headers: { 'Content-Type': 'application/json' },
+    method,
+  }).then((response) => parseApiResponse(response, fallback));
+}
+
+export const hostedApiClient = {
+  acceptInvitation() {
+    return request('/hosted/invitations/accept', { fallback: 'Failed to accept invitation', method: 'POST' });
+  },
+
+  claimWorkspace({ teamName, token }) {
+    return request('/hosted/claim', { body: { teamName, token }, fallback: 'Failed to claim workspace', method: 'POST' });
+  },
+
+  completeSetup() {
+    return request('/hosted/setup/complete', { fallback: 'Failed to complete setup', method: 'POST' });
+  },
+
+  createInvitation({ email, role }) {
+    return request('/hosted/invitations', { body: { email, role }, fallback: 'Failed to create invitation', method: 'POST' });
+  },
+
+  getStatus() {
+    return request('/hosted/status', { fallback: 'Failed to load workspace status' });
+  },
+
+  listAuditEvents() {
+    return request('/hosted/audit', { fallback: 'Failed to load access history' });
+  },
+
+  listInvitations() {
+    return request('/hosted/invitations', { fallback: 'Failed to load invitations' });
+  },
+
+  listMemberships() {
+    return request('/hosted/memberships', { fallback: 'Failed to load collaborators' });
+  },
+
+  removeMembership(membershipId) {
+    return request(`/hosted/memberships/${encodeURIComponent(membershipId)}`, { fallback: 'Failed to remove collaborator', method: 'DELETE' });
+  },
+
+  revokeInvitation(invitationId) {
+    return request(`/hosted/invitations/${encodeURIComponent(invitationId)}`, { fallback: 'Failed to revoke invitation', method: 'DELETE' });
+  },
+
+  updateInvitationRole(invitationId, role) {
+    return request(`/hosted/invitations/${encodeURIComponent(invitationId)}`, { body: { role }, fallback: 'Failed to update invitation', method: 'PATCH' });
+  },
+
+  updateMembershipRole(membershipId, role) {
+    return request(`/hosted/memberships/${encodeURIComponent(membershipId)}`, { body: { role }, fallback: 'Failed to update role', method: 'PATCH' });
+  },
+};

package/src/client/infrastructure/lobby-presence.js

@@ -2,12 +2,12 @@ import { WebsocketProvider } from 'y-websocket';
 import * as Y from 'yjs';
 
 import { createRandomUser } from '../domain/room.js';
+import { LOBBY_CHAT_MAX_MESSAGES, LOBBY_CHAT_MESSAGE_MAX_LENGTH } from '../domain/lobby-chat.js';
 import { resolveWsBaseUrl } from './runtime-config.js';
 import { stopReconnectOnControlledClose } from './yjs-provider-reset-guard.js';
 
 const LOBBY_ROOM_NAME = '__lobby__';
-export const LOBBY_CHAT_MESSAGE_MAX_LENGTH = 280;
-export const LOBBY_CHAT_MAX_MESSAGES = 40;
+
 
 function normalizeChatMessage(value) {
   const normalized = String(value ?? '')
@@ -19,11 +19,8 @@ function normalizeChatMessage(value) {
 }
 
 function createLobbyMessageId(peerId) {
-  if (globalThis.crypto?.randomUUID) {
-    return globalThis.crypto.randomUUID();
-  }
-
-  return `${peerId || 'user'}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+  return globalThis.crypto?.randomUUID?.()
+    ?? `${peerId || 'user'}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
 }
 
 function normalizeWorkspaceEvent(event) {

package/src/client/infrastructure/runtime-config.js

@@ -1,9 +1,11 @@
 import {
+  getActiveVaultId,
   getClientRuntimeConfig,
   resolveApiUrl,
   resolveAppPath,
   resolveAppUrl,
   resolveWsBaseUrl,
+  setActiveVaultId,
 } from '../domain/runtime-paths.js';
 import {
   createFileRouteHash,
@@ -16,7 +18,7 @@ export function getRuntimeConfig() {
   return getClientRuntimeConfig();
 }
 
-export { resolveApiUrl, resolveAppPath, resolveAppUrl, resolveWsBaseUrl };
+export { getActiveVaultId, resolveApiUrl, resolveAppPath, resolveAppUrl, resolveWsBaseUrl, setActiveVaultId };
 export { createFileRouteHash, isCollabMdHashRoute };
 
 function getHashParams() {
@@ -74,7 +76,7 @@ export function getHashRoute() {
   }
 
   if (params.has(HASH_ROUTE_KEYS.file)) {
-    return {
+    const route = {
       anchor: params.get('anchor') || null,
       column: params.has('column') ? Number(params.get('column')) || null : null,
       drawioMode: params.get('drawio') || null,
@@ -83,6 +85,12 @@ export function getHashRoute() {
       matchLength: params.has('matchLength') ? Number(params.get('matchLength')) || null : null,
       type: 'file',
     };
+    const elementId = params.get('element') || '';
+    if (elementId) {
+      route.elementId = elementId;
+      route.elementType = params.get('elementType') === 'group' ? 'group' : 'element';
+    }
+    return route;
   }
 
   return { type: 'empty' };
@@ -92,6 +100,8 @@ export function navigateToFile(filePath, {
   anchor = null,
   column = null,
   drawioMode = null,
+  elementId = null,
+  elementType = null,
   line = null,
   matchLength = null,
 } = {}) {
@@ -99,6 +109,8 @@ export function navigateToFile(filePath, {
     anchor,
     column,
     drawioMode,
+    elementId,
+    elementType,
     line,
     matchLength,
   });

package/src/client/infrastructure/tab-activity-lock.js

@@ -8,11 +8,8 @@ function now() {
 }
 
 function createTabId() {
-  if (globalThis.crypto?.randomUUID) {
-    return globalThis.crypto.randomUUID();
-  }
-
-  return `tab-${now()}-${Math.random().toString(36).slice(2, 10)}`;
+  return globalThis.crypto?.randomUUID?.()
+    ?? `tab-${now()}-${Math.random().toString(36).slice(2, 10)}`;
 }
 
 function safeJsonParse(value) {