collabmd 0.1.54 → 0.1.55

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');
   },