collabmd 0.1.54 → 0.1.56

package/src/client/infrastructure/comment-thread-store.js

@@ -2,10 +2,13 @@ import * as Y from 'yjs';
 
 import {
   createCommentId,
+  createCommentReactionKey,
   createCommentThreadSharedType,
   normalizeCommentAnchor,
   normalizeCommentBody,
   normalizeCommentQuote,
+  normalizeCommentReactionEmoji,
+  serializeCommentThread,
   serializeCommentThreads,
   summarizeCommentExcerpt,
 } from '../../domain/comment-threads.js';
@@ -22,30 +25,6 @@ function createCommentMessage({ body, user }) {
   };
 }
 
-function readRecordValue(record, key) {
-  if (record instanceof Y.Map) {
-    return record.get(key);
-  }
-
-  return record?.[key];
-}
-
-function cloneReactionGroups(source = []) {
-  return Array.isArray(source)
-    ? source.map((group) => ({
-      emoji: typeof group?.emoji === 'string' ? group.emoji : '',
-      users: Array.isArray(group?.users)
-        ? group.users.map((user) => ({
-          reactedAt: Number.isFinite(user?.reactedAt) ? user.reactedAt : Date.now(),
-          userColor: typeof user?.userColor === 'string' ? user.userColor : '',
-          userId: typeof user?.userId === 'string' ? user.userId : '',
-          userName: typeof user?.userName === 'string' && user.userName ? user.userName : 'Anonymous',
-        })).filter((user) => user.userId)
-        : [],
-    })).filter((group) => group.emoji && group.users.length > 0)
-    : [];
-}
-
 function normalizeSelectionAnchorPayload(payload, state) {
   const doc = state?.doc;
   if (!doc) {
@@ -239,7 +218,11 @@ export class CommentThreadStore {
   }
 
   toggleCommentReaction(threadId, messageId, emoji) {
-    if (!this.ydoc || !threadId || !messageId || typeof emoji !== 'string' || !emoji.trim()) {
+    if (!this.canWrite() || !this.ydoc || !threadId || !messageId || typeof emoji !== 'string') {
+      return false;
+    }
+    const normalizedEmoji = normalizeCommentReactionEmoji(emoji);
+    if (!normalizedEmoji) {
       return false;
     }
 
@@ -250,62 +233,21 @@ export class CommentThreadStore {
     }
 
     const thread = this.findSharedCommentThread(threadId);
-    const messages = thread?.get('messages');
-    if (!(messages instanceof Y.Array)) {
-      return false;
-    }
-
-    const items = messages.toArray();
-    const messageIndex = items.findIndex((message) => readRecordValue(message, 'id') === messageId);
-    if (messageIndex < 0) {
+    const message = serializeCommentThread(thread)?.messages.find((entry) => entry.id === messageId);
+    if (!message) {
       return false;
     }
-
-    const messageRecord = items[messageIndex] instanceof Y.Map
-      ? items[messageIndex].toJSON()
-      : { ...items[messageIndex] };
-    const reactions = cloneReactionGroups(messageRecord.reactions);
-    const reactionIndex = reactions.findIndex((reaction) => reaction.emoji === emoji);
-
-    if (reactionIndex >= 0) {
-      const nextUsers = reactions[reactionIndex].users.filter((user) => user.userId !== localUserId);
-      if (nextUsers.length === reactions[reactionIndex].users.length) {
-        nextUsers.push({
-          reactedAt: Date.now(),
-          userColor: localUser?.color ?? '',
-          userId: localUserId,
-          userName: localUser?.name ?? 'Anonymous',
-        });
-      }
-
-      if (nextUsers.length === 0) {
-        reactions.splice(reactionIndex, 1);
-      } else {
-        reactions[reactionIndex] = {
-          ...reactions[reactionIndex],
-          users: nextUsers,
-        };
-      }
-    } else {
-      reactions.push({
-        emoji,
-        users: [{
-          reactedAt: Date.now(),
-          userColor: localUser?.color ?? '',
-          userId: localUserId,
-          userName: localUser?.name ?? 'Anonymous',
-        }],
-      });
-    }
-
-    const nextMessage = {
-      ...messageRecord,
-      reactions,
-    };
+    const hasReaction = message.reactions.some((group) => group.emoji === normalizedEmoji
+      && group.users.some((user) => user.userId === localUserId));
 
     this.ydoc.transact(() => {
-      messages.delete(messageIndex, 1);
-      messages.insert(messageIndex, [nextMessage]);
+      // Keep the message identity intact; different users change independent keys.
+      thread.set(createCommentReactionKey(messageId, normalizedEmoji, localUserId), hasReaction ? null : {
+        reactedAt: Date.now(),
+        userColor: localUser?.color ?? '',
+        userId: localUserId,
+        userName: localUser?.name ?? 'Anonymous',
+      });
     }, 'comment-reaction-toggle');
 
     return true;

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

@@ -935,36 +935,6 @@ export class EditorViewAdapter {
     };
   }
 
-  normalizeLineRange({ endLine, startLine }) {
-    const state = this.editorView?.state;
-    if (!state) {
-      return { endLine: 1, startLine: 1 };
-    }
-
-    const lineCount = state.doc.lines;
-    const normalizedStart = Math.min(Math.max(Math.round(startLine ?? 1), 1), lineCount);
-    const normalizedEnd = Math.min(Math.max(Math.round(endLine ?? normalizedStart), normalizedStart), lineCount);
-
-    return {
-      endLine: normalizedEnd,
-      startLine: normalizedStart,
-    };
-  }
-
-  getLineInfoAt(position) {
-    const state = this.editorView?.state;
-    if (!state) {
-      return null;
-    }
-
-    const clampedPosition = Math.min(Math.max(position, 0), state.doc.length);
-    const line = state.doc.lineAt(clampedPosition);
-    return {
-      line,
-      lineNumber: line.number,
-    };
-  }
-
   getAnchorClientRect(anchor) {
     const state = this.editorView?.state;
     const editorView = this.editorView;

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

@@ -644,11 +644,13 @@ export class ExcalidrawRoomClient {
     replaceExcalidrawRoomScene(this.ydoc, nextScene);
   }
 
-  mergeLocallyChangedAppState(appState, baseSceneJson) {
-    const baseScene = parseSceneJson(baseSceneJson);
-    const roomScene = parseSceneJson(this.lastSceneJson || this.getStructuredSceneJson());
+  mergeLocallyChangedAppState(appState, baseSceneJson, roomScene = null) {
+    const currentScene = roomScene ?? parseSceneJson(this.lastSceneJson || this.getStructuredSceneJson());
+    const baseScene = baseSceneJson && baseSceneJson === this.lastSceneJson
+      ? currentScene
+      : parseSceneJson(baseSceneJson);
     const nextAppState = {
-      ...roomScene.appState,
+      ...currentScene.appState,
     };
 
     ['gridSize', 'viewBackgroundColor'].forEach((key) => {
@@ -670,7 +672,7 @@ export class ExcalidrawRoomClient {
   } = {}) {
     const roomSceneJson = this.lastSceneJson || this.getStructuredSceneJson() || baseSceneJson;
     const roomScene = parseSceneJson(roomSceneJson);
-    const nextAppState = this.mergeLocallyChangedAppState(appState, baseSceneJson);
+    const nextAppState = this.mergeLocallyChangedAppState(appState, baseSceneJson, roomScene);
     const roomElementsById = new Map(roomScene.elements.map((element) => [element.id, element]));
     const changedElements = (Array.isArray(elements) ? elements : []).filter((element) => (
       shouldSyncElementToRoom(element, roomElementsById.get(element?.id))
@@ -781,9 +783,8 @@ export class ExcalidrawRoomClient {
       return false;
     }
 
-    const json = JSON.stringify(sceneData);
     this.lastSceneSyncAt = this.now();
-    this.commitSceneJson(json, {
+    this.commitSceneDelta(sceneData, {
       origin: 'excalidraw-local-change',
     });
 
@@ -947,7 +948,8 @@ export class ExcalidrawRoomClient {
       return false;
     }
 
-    const normalizedJson = JSON.stringify(parseSceneJson(nextJson));
+    const scene = parseSceneJson(nextJson);
+    const normalizedJson = JSON.stringify(scene);
     if (!this.ydoc) {
       const didChange = normalizedJson !== this.lastSceneJson;
       this.lastSceneJson = normalizedJson;
@@ -959,17 +961,27 @@ export class ExcalidrawRoomClient {
       return false;
     }
 
+    return this.commitSceneDelta(scene, { origin });
+  }
+
+  commitSceneDelta(scene, {
+    origin = 'excalidraw-room-write',
+  } = {}) {
+    if (!this.canWriteToRoom || !this.ydoc) {
+      return false;
+    }
+
     let didChange = false;
     this.suppressStructuredSceneUpdateDepth += 1;
     try {
       this.ydoc.transact(() => {
-        didChange = applySceneDiffToExcalidrawRoom(this.ydoc, parseSceneJson(normalizedJson));
+        didChange = applySceneDiffToExcalidrawRoom(this.ydoc, scene);
       }, origin);
     } finally {
       this.suppressStructuredSceneUpdateDepth = Math.max(0, this.suppressStructuredSceneUpdateDepth - 1);
     }
 
-    this.lastSceneJson = JSON.stringify(parseSceneJson(this.getStructuredSceneJson() || normalizedJson));
+    this.lastSceneJson = this.getStructuredSceneJson();
     return didChange;
   }
 

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

@@ -30,8 +30,10 @@ export const hostedApiClient = {
     return request('/hosted/status', { fallback: 'Failed to load workspace status' });
   },
 
-  listAuditEvents() {
-    return request('/hosted/audit', { fallback: 'Failed to load access history' });
+  listAuditEvents({ cursor = '', limit = 50 } = {}) {
+    const query = new URLSearchParams({ limit: String(limit) });
+    if (cursor) query.set('cursor', cursor);
+    return request(`/hosted/audit?${query}`, { fallback: 'Failed to load access history' });
   },
 
   listInvitations() {

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

@@ -27,8 +27,8 @@ async function triggerDownload(url, {
 }
 
 export const vaultApiClient = {
-  async readTree() {
-    const response = await fetch(resolveApiUrl('/files'));
+  async readTree(config) {
+    const response = await fetch(resolveApiUrl('/files', config));
     return parseApiResponse(response, 'Failed to load file tree');
   },
   async callAgentTool(name, input, { signal } = {}) {
@@ -46,8 +46,8 @@ export const vaultApiClient = {
     return parseApiResponse(response, 'Failed to load comment overview');
   },
 
-  async readFile(path) {
-    const response = await fetch(resolveApiUrl(`/file?path=${encodeURIComponent(path)}`));
+  async readFile(path, config) {
+    const response = await fetch(resolveApiUrl(`/file?path=${encodeURIComponent(path)}`, config));
     return parseApiResponse(response, 'Failed to read file');
   },
 

package/src/client/infrastructure/webmcp-tool-registry.js

@@ -14,27 +14,24 @@ async function renderExactExcalidrawScene(scene, {
   padding = 32,
   scale = 1,
 } = {}) {
-  const {
-    exportToBlob,
-    exportToSvg,
-  } = await import('@excalidraw/excalidraw');
+  const { exportScene } = await import('@excalidraw/excalidraw');
   const options = createExcalidrawExportOptions(scene, { padding, scale });
   let data;
   let height;
   let mimeType;
   let width;
   if (format === 'svg') {
-    const svg = await exportToSvg(options);
+    const svg = await exportScene({ ...options, type: 'svg' });
     const markup = svg.outerHTML;
     data = new TextEncoder().encode(markup).toBase64();
     height = Math.max(1, Math.ceil(Number.parseFloat(svg.getAttribute('height')) || 1));
     mimeType = 'image/svg+xml';
     width = Math.max(1, Math.ceil(Number.parseFloat(svg.getAttribute('width')) || 1));
   } else {
-    const blob = await exportToBlob({
+    const blob = await exportScene({
       ...options,
-      maxWidthOrHeight: MAX_RENDER_DIMENSION,
-      mimeType: 'image/png',
+      config: { ...options.config, maxWidthOrHeight: MAX_RENDER_DIMENSION },
+      type: 'png',
     });
     const bitmap = await createImageBitmap(blob);
     data = new Uint8Array(await blob.arrayBuffer()).toBase64();