collabmd 0.1.47 → 0.1.49

package/src/server/application/workspace-reconciliation.js

@@ -16,11 +16,7 @@ import {
 } from '../domain/workspace-state.js';
 
 function createEventId() {
-  if (globalThis.crypto?.randomUUID) {
-    return globalThis.crypto.randomUUID();
-  }
-
-  return `workspace-${Date.now()}-${Math.random().toString(16).slice(2, 10)}`;
+  return globalThis.crypto.randomUUID();
 }
 
 function countWorkspacePaths(workspaceChange = {}) {
@@ -306,7 +302,7 @@ export class WorkspaceReconciliation {
     });
   }
 
-  async writeEditableContent({ content, origin = 'api', path, requestId = null } = {}) {
+  async writeEditableContent({ content, origin = 'api', path, requestId = null, sourceRef = null } = {}) {
     const result = await this.vaultFileStore.writeEditableVaultContent(path, content);
     if (!result.ok) {
       return result;
@@ -316,6 +312,7 @@ export class WorkspaceReconciliation {
       action: 'write-file',
       origin,
       requestId,
+      sourceRef,
       workspaceChange: createWorkspaceChange({
         changedPaths: [path],
       }),
@@ -344,7 +341,7 @@ export class WorkspaceReconciliation {
     return result;
   }
 
-  async createFile({ content = '', origin = 'api', path, requestId = null } = {}) {
+  async createFile({ content = '', origin = 'api', path, requestId = null, sourceRef = null } = {}) {
     const result = await this.vaultFileStore.createFile(path, content);
     if (!result.ok) {
       return result;
@@ -354,6 +351,7 @@ export class WorkspaceReconciliation {
       action: 'create-file',
       origin,
       requestId,
+      sourceRef,
       workspaceChange: createWorkspaceChange({
         changedPaths: [path],
       }),

package/src/server/config/env.js

@@ -406,11 +406,55 @@ function loadHostedConfig(overrides = {}, { authStrategy, vaultDir } = {}) {
   };
 }
 
+function loadAgentAccessConfig(overrides = {}, { basePath, oidc, vaultDir } = {}) {
+  const enabled = overrides.enabled ?? parseBooleanFlag(
+    process.env.COLLABMD_AGENT_ACCESS_ENABLED,
+    false,
+  );
+  const publicHostname = oidc?.publicBaseUrl
+    ? new URL(oidc.publicBaseUrl).hostname.toLowerCase()
+    : '';
+  return {
+    allowedHosts: Array.from(new Set([
+      'localhost',
+      '127.0.0.1',
+      '::1',
+      publicHostname,
+      ...normalizeCsvList(
+        overrides.allowedHosts ?? process.env.COLLABMD_AGENT_ALLOWED_HOSTS,
+      ).map((host) => host.toLowerCase()),
+    ].filter(Boolean))),
+    connectionTtlMs: parsePositiveInt(
+      overrides.connectionTtlMs ?? process.env.COLLABMD_AGENT_CONNECTION_TTL_MS,
+      30 * 24 * 60 * 60 * 1000,
+    ),
+    dbPath: resolve(
+      overrides.dbPath
+        ?? process.env.COLLABMD_AGENT_METADATA_DB_PATH
+        ?? resolve(vaultDir, '.collabmd/agent-access.sqlite'),
+    ),
+    requestsPerMinute: parsePositiveInt(
+      overrides.requestsPerMinute ?? process.env.COLLABMD_AGENT_REQUESTS_PER_MINUTE,
+      120,
+    ),
+    enabled,
+    endpoint: `${basePath}/mcp`,
+  };
+}
+
+function resolvePublicDir(nodeEnv) {
+  if (nodeEnv === 'test' && process.env.COLLABMD_E2E_PUBLIC_DIR) {
+    return resolve(process.env.COLLABMD_E2E_PUBLIC_DIR);
+  }
+
+  return resolve(projectRoot, 'dist/client');
+}
+
 export function loadConfig(overrides = {}) {
   const nodeEnv = process.env.NODE_ENV || 'development';
   const vaultDir = resolveConfiguredVaultDir(overrides);
   const basePath = normalizeAppBasePath(process.env.BASE_PATH || '');
-  const publicDir = resolve(projectRoot, 'dist/client');
+  const publicDir = resolvePublicDir(nodeEnv);
   const authOverrides = overrides.auth ?? {};
   const authStrategy = normalizeAuthStrategy(
     authOverrides.strategy
@@ -427,6 +471,11 @@ export function loadConfig(overrides = {}) {
     : null;
   const git = loadGitConfig(overrides.git);
   const hosted = loadHostedConfig(overrides.hosted, { authStrategy, vaultDir });
+  const agentAccess = loadAgentAccessConfig(overrides.agentAccess, {
+    basePath,
+    oidc,
+    vaultDir,
+  });
   const structurizr = loadStructurizrConfig(overrides.structurizr, { vaultDir });
   const build = loadBuildInfo({
     explicitBuildId: process.env.COLLABMD_BUILD_ID,
@@ -435,6 +484,7 @@ export function loadConfig(overrides = {}) {
   });
 
   return {
+    agentAccess,
     auth: {
       generatedPassword: passwordWasGenerated ? password : '',
       oidc,

package/src/server/create-app-server.js

@@ -2,6 +2,8 @@ import { createServer } from 'http';
 import { resolve } from 'node:path';
 
 import { loadConfig } from './config/env.js';
+import { AgentConnectionService } from './application/agent-connection-service.js';
+import { AgentContentService } from './application/agent-content-service.js';
 import { createAuthService } from './auth/create-auth-service.js';
 import { logPerfEvent } from './config/perf-logging.js';
 import { BacklinkIndex } from './domain/backlink-index.js';
@@ -10,6 +12,7 @@ import { CollaborationDocumentStore } from './domain/collaboration/collaboration
 import { CollaborationRoom } from './domain/collaboration/collaboration-room.js';
 import { renderDocx } from './domain/docx-exporter.js';
 import { GitService } from './infrastructure/git/git-service.js';
+import { ensureCollabMetadataGitExclude } from './infrastructure/git/local-exclude.js';
 import { GitHubAppClient } from './infrastructure/github/github-app-client.js';
 import { GitHubSetupFlow } from './infrastructure/github/github-setup-flow.js';
 import { HostedWorkspaceService } from './domain/hosted-workspace.js';
@@ -18,6 +21,7 @@ import { StructurizrWorkspaceService } from './infrastructure/structurizr/struct
 import { RoomRegistry } from './domain/collaboration/room-registry.js';
 import { RipgrepSearchService } from './domain/ripgrep-search-service.js';
 import { createRequestHandler } from './infrastructure/http/create-request-handler.js';
+import { AgentConnectionStore } from './infrastructure/persistence/agent-connection-store.js';
 import { HostedMetadataStore } from './infrastructure/persistence/hosted-metadata-store.js';
 import { VaultFileStore } from './infrastructure/persistence/vault-file-store.js';
 import { attachCollaborationGateway } from './infrastructure/websocket/attach-collaboration-gateway.js';
@@ -141,6 +145,23 @@ export function createAppServer(config = loadConfig()) {
       vaultDir: vaultFileStore.vaultDir,
     }),
   });
+  const agentConnectionStore = new AgentConnectionStore({
+    dbPath: config.agentAccess.dbPath,
+  });
+  const agentConnectionService = new AgentConnectionService({
+    authStrategy: config.auth.strategy,
+    connectionTtlMs: config.agentAccess.connectionTtlMs,
+    hostedWorkspaceService,
+    store: agentConnectionStore,
+  });
+  const agentContentService = new AgentContentService({
+    backlinkIndex,
+    plantUmlRenderer,
+    roomRegistry,
+    searchService,
+    vaultFileStore,
+    workspaceMutationCoordinator,
+  });
   vaultFileStore.setManagedWriteTracker(workspaceMutationCoordinator);
   fileSystemSyncService = new FileSystemSyncService({
     mutationCoordinator: workspaceMutationCoordinator,
@@ -164,6 +185,10 @@ export function createAppServer(config = loadConfig()) {
     hostedWorkspaceService,
     githubSetupFlow,
     structurizrWorkspaceService,
+    {
+      connectionService: agentConnectionService,
+      contentService: agentContentService,
+    },
   );
   const httpServer = createServer((req, res) => {
     requestHandler(req, res).catch((error) => {
@@ -194,7 +219,13 @@ export function createAppServer(config = loadConfig()) {
   async function listen() {
     const startupStartedAt = Date.now();
 
+    if (await gitService.isGitRepo()) {
+      await ensureCollabMetadataGitExclude(config.vaultDir);
+    }
     await hostedWorkspaceService.initialize();
+    if (config.agentAccess.enabled && config.auth.strategy !== 'none') {
+      await agentConnectionService.initialize();
+    }
 
     const searchCapabilityStartedAt = Date.now();
     config.search = await searchService.initialize();
@@ -306,6 +337,9 @@ export function createAppServer(config = loadConfig()) {
         closeHttpServer(httpServer),
         config.git?.cleanup?.(),
         hostedWorkspaceService.close(),
+        config.agentAccess.enabled && config.auth.strategy !== 'none'
+          ? agentConnectionStore.close()
+          : Promise.resolve(),
       ]);
     })().then(() => undefined);
 
@@ -314,6 +348,8 @@ export function createAppServer(config = loadConfig()) {
 
   return {
     close,
+    agentConnectionService,
+    agentContentService,
     collaborationGateway,
     config,
     httpServer,

package/src/server/domain/bases/base-query-service.js

@@ -87,17 +87,13 @@ function insertSortedBounded(rows, row, {
   }
 }
 
-function escapeRegExp(value = '') {
-  return String(value ?? '').replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
-}
-
 function pruneFilterNodeForProperty(filterNode, propertyId = '') {
   if (!propertyId || !filterNode) {
     return filterNode;
   }
 
   if (typeof filterNode === 'string') {
-    const escapedPropertyId = escapeRegExp(propertyId);
+    const escapedPropertyId = RegExp.escape(String(propertyId));
     const propertyFilterPattern = new RegExp(
       `^!?${escapedPropertyId}(?:\\.(?:contains|startsWith|endsWith|isEmpty)\\(.*\\)|\\s*(?:==|!=|>=|<=|>|<)\\s*.+)$`,
       'u',

package/src/server/domain/collaboration/collaboration-room.js

@@ -4,12 +4,18 @@ import * as syncProtocol from 'y-protocols/sync';
 import * as encoding from 'lib0/encoding';
 import * as decoding from 'lib0/decoding';
 
-import { MSG_AWARENESS, MSG_SYNC } from './protocol.js';
+import {
+  MSG_AGENT_FLUSH,
+  MSG_AGENT_FLUSH_ACK,
+  MSG_AWARENESS,
+  MSG_SYNC,
+} from './protocol.js';
 import { CollaborationDocumentStore } from './collaboration-document-store.js';
 import { logPerfEvent } from '../../config/perf-logging.js';
 import { populateCommentThreads, serializeCommentThreads } from '../../../domain/comment-threads.js';
 import { getVaultFileKind } from '../../../domain/file-kind.js';
 import {
+  applySceneDiffToExcalidrawRoom,
   EXCALIDRAW_APP_STATE_KEY,
   EXCALIDRAW_ELEMENTS_KEY,
   EXCALIDRAW_FILES_KEY,
@@ -21,6 +27,7 @@ import {
   tryParseExcalidrawSceneJson,
 } from '../../../domain/excalidraw-room-codec.js';
 import { isDrawioLeaseRoom } from '../../../domain/drawio-room.js';
+import { normalizeEditableText } from '../../../domain/editable-text.js';
 import { normalizeWorkspaceEvent } from '../../../domain/workspace-change.js';
 import { WORKSPACE_EVENT_MAX_MESSAGES, WORKSPACE_ROOM_NAME } from '../../../domain/workspace-room.js';
 
@@ -130,9 +137,6 @@ function isWorkspaceRoom(name) {
   return name === WORKSPACE_ROOM_NAME;
 }
 
-function normalizeEditableText(content) {
-  return String(content ?? '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-}
 
 function isContentCleanOrigin(origin) {
   return origin === 'hydrate'
@@ -171,6 +175,34 @@ function computeTextReplacement(currentContent, nextContent) {
   };
 }
 
+function reconcileTextContent(baselineContent, currentContent, externalContent) {
+  const localReplacement = computeTextReplacement(baselineContent, currentContent);
+  const externalReplacement = computeTextReplacement(baselineContent, externalContent);
+  if (!externalReplacement) {
+    return { content: currentContent, preservesPendingChanges: true };
+  }
+
+  const localEnd = localReplacement.start + localReplacement.deleteCount;
+  const externalEnd = externalReplacement.start + externalReplacement.deleteCount;
+  let externalStart;
+  if (localEnd <= externalReplacement.start) {
+    externalStart = externalReplacement.start
+      + localReplacement.insertText.length
+      - localReplacement.deleteCount;
+  } else if (externalEnd <= localReplacement.start) {
+    externalStart = externalReplacement.start;
+  } else {
+    return { content: externalContent, preservesPendingChanges: false };
+  }
+
+  return {
+    content: currentContent.slice(0, externalStart)
+      + externalReplacement.insertText
+      + currentContent.slice(externalStart + externalReplacement.deleteCount),
+    preservesPendingChanges: true,
+  };
+}
+
 export class CollaborationRoom {
   constructor({
     documentStore = null,
@@ -504,7 +536,8 @@ export class CollaborationRoom {
         snapshot: Y.encodeStateAsUpdate(this.doc),
       });
       if (includeContent) {
-        this.resetContentBaseline();
+        this.persistedContentBaseline = content;
+        this.refreshContentDirty();
       }
     })();
 
@@ -568,29 +601,37 @@ export class CollaborationRoom {
     }
 
     const ytext = this.doc.getText('codemirror');
+    const currentContent = ytext.toString();
     const normalizedContent = normalizeEditableText(content);
-    const replacement = computeTextReplacement(ytext.toString(), normalizedContent);
-    if (!replacement && !replaceCommentThreads) {
-      this.resetContentBaseline();
-      return { highlightRange: null, ok: true, skipped: true };
-    }
-
-    this.doc.transact(() => {
-      if (replacement?.deleteCount) {
-        ytext.delete(replacement.start, replacement.deleteCount);
-      }
-      if (replacement?.insertText) {
-        ytext.insert(replacement.start, replacement.insertText);
-      }
-      if (replaceCommentThreads) {
-        if (comments.length > 0) {
-          comments.delete(0, comments.length);
+    const reconciliation = this.refreshContentDirty() && this.persistedContentBaseline !== null
+      ? reconcileTextContent(this.persistedContentBaseline, currentContent, normalizedContent)
+      : { content: normalizedContent, preservesPendingChanges: false };
+    const replacement = computeTextReplacement(currentContent, reconciliation.content);
+    const skipped = !replacement && !replaceCommentThreads;
+    if (!skipped) {
+      this.doc.transact(() => {
+        if (replacement?.deleteCount) {
+          ytext.delete(replacement.start, replacement.deleteCount);
         }
-        populateCommentThreads(comments, commentThreads);
-      }
-    }, 'workspace-reconcile');
+        if (replacement?.insertText) {
+          ytext.insert(replacement.start, replacement.insertText);
+        }
+        if (replaceCommentThreads) {
+          if (comments.length > 0) {
+            comments.delete(0, comments.length);
+          }
+          populateCommentThreads(comments, commentThreads);
+        }
+      }, 'workspace-reconcile');
+    }
 
-    this.resetContentBaseline();
+    if (reconciliation.preservesPendingChanges) {
+      this.persistedContentBaseline = normalizedContent;
+      this.refreshContentDirty();
+      this.schedulePersist();
+    } else {
+      this.resetContentBaseline();
+    }
     return {
       highlightRange: replacement
         ? {
@@ -599,6 +640,7 @@ export class CollaborationRoom {
         }
         : null,
       ok: true,
+      ...(skipped && { skipped: true }),
     };
   }
 
@@ -832,6 +874,47 @@ export class CollaborationRoom {
     return true;
   }
 
+  isHydrated() {
+    return this.hydrated;
+  }
+
+  readEditableContent() {
+    if (!this.hydrated || this.deleted || this.destroyed || isExcalidrawRoom(this.name)) {
+      return null;
+    }
+    return this.doc.getText('codemirror').toString();
+  }
+
+  applyExactTextChanges(changes, { origin = 'agent' } = {}) {
+    if (!this.hydrated || this.deleted || this.destroyed || isExcalidrawRoom(this.name)) {
+      throw new Error('The collaborative document is unavailable');
+    }
+    const ytext = this.doc.getText('codemirror');
+    this.doc.transact(() => {
+      for (let index = changes.length - 1; index >= 0; index -= 1) {
+        const change = changes[index];
+        if (change.to > change.from) {
+          ytext.delete(change.from, change.to - change.from);
+        }
+        if (change.insert) {
+          ytext.insert(change.from, change.insert);
+        }
+      }
+    }, origin);
+    return changes.length;
+  }
+
+  applyExcalidrawScene(scene, { origin = 'agent' } = {}) {
+    if (!this.hydrated || this.deleted || this.destroyed || !isExcalidrawRoom(this.name)) {
+      throw new Error('The collaborative Excalidraw document is unavailable');
+    }
+    let changed = false;
+    this.doc.transact(() => {
+      changed = applySceneDiffToExcalidrawRoom(this.doc, scene);
+    }, origin);
+    return changed;
+  }
+
   getPersistedContent() {
     if (isWorkspaceRoom(this.name)) {
       return null;
@@ -897,6 +980,19 @@ export class CollaborationRoom {
           break;
         }
 
+        case MSG_AGENT_FLUSH: {
+          const requestId = decoding.readVarString(decoder);
+          if (!requestId || requestId.length > 128) {
+            break;
+          }
+
+          const encoder = encoding.createEncoder();
+          encoding.writeVarUint(encoder, MSG_AGENT_FLUSH_ACK);
+          encoding.writeVarString(encoder, requestId);
+          sendMessage.call(this, ws, encoding.toUint8Array(encoder), this);
+          break;
+        }
+
         default:
           console.warn(`[room:${this.name}] Unsupported message type: ${messageType}`);
       }

package/src/server/domain/collaboration/protocol.js

@@ -1,2 +1,6 @@
 export const MSG_SYNC = 0;
 export const MSG_AWARENESS = 1;
+export {
+  MSG_AGENT_FLUSH,
+  MSG_AGENT_FLUSH_ACK,
+} from '../../../domain/collaboration-protocol.js';

package/src/server/domain/hosted-workspace.js

@@ -730,6 +730,27 @@ export class HostedWorkspaceService {
     return { ok: true };
   }
 
+  async recordAgentConnectionEvent({ connection, type, user }) {
+    if (!this.enabled) return;
+    const access = await this.authorizeWorkspaceAccess({ user });
+    if (!access.ok) {
+      throw createHostedError(access.statusCode, access.body.error, access.body.code);
+    }
+    await this.store.createAuditEvent(createAuditEvent({
+      actor: access.membership,
+      metadata: {
+        clientKind: connection.clientKind,
+        connectionId: connection.id,
+        expiresAt: connection.expiresAt,
+        label: connection.label,
+        scopes: connection.scopes,
+      },
+      targetRole: access.membership.role,
+      timestamp: nowMs(),
+      type,
+    }));
+  }
+
   async listAuditEvents(user) {
     await this.requireAdmin(user);
     return (await this.store.listAuditEvents()).map(publicAuditEvent);

package/src/server/domain/markdown-reference-extractor.js

@@ -130,6 +130,18 @@ export function createReferenceTargetAliasMap(renamedEntries = []) {
 
   return aliases;
 }
+export function collectMarkdownImageSources(markdownText = '') {
+  const sources = [];
+  String(markdownText ?? '').split('\n').forEach((line, lineIndex) => {
+    MARKDOWN_IMAGE_OPEN_RE.lastIndex = 0;
+    while (MARKDOWN_IMAGE_OPEN_RE.exec(line) !== null) {
+      const source = parseMarkdownImageDestination(line.slice(MARKDOWN_IMAGE_OPEN_RE.lastIndex));
+      if (source) sources.push({ line: lineIndex + 1, source });
+    }
+  });
+  return sources;
+}
+
 
 export function collectMarkdownReferences(markdownText = '', {
   sourceFilePath = '',
@@ -139,7 +151,7 @@ export function collectMarkdownReferences(markdownText = '', {
   const references = [];
   const lines = String(markdownText ?? '').split('\n');
 
-  for (const line of lines) {
+  for (const [lineIndex, line] of lines.entries()) {
     const context = line.trim();
 
     INTERNAL_LINK_RE.lastIndex = 0;
@@ -155,6 +167,7 @@ export function collectMarkdownReferences(markdownText = '', {
       references.push({
         context,
         isEmbed: Boolean(linkMatch[1]),
+        line: lineIndex + 1,
         rawTarget,
         rawTargetKey: normalizeReferenceTargetKey(rawTarget),
         resolvedPath,
@@ -176,6 +189,7 @@ export function collectMarkdownReferences(markdownText = '', {
       references.push({
         context,
         isEmbed: true,
+        line: lineIndex + 1,
         rawTarget,
         rawTargetKey: normalizeReferenceTargetKey(targetPath),
         resolvedPath,