collabmd 0.1.49 → 0.1.51

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

@@ -6,32 +6,18 @@ import { AgentConnectionService } from './application/agent-connection-service.j
 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';
-import { BaseQueryService } from './domain/bases/base-query-service.js';
-import { CollaborationDocumentStore } from './domain/collaboration/collaboration-document-store.js';
-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';
 import { PlantUmlRenderer } from './infrastructure/plantuml/plantuml-renderer.js';
 import { StructurizrWorkspaceService } from './infrastructure/structurizr/structurizr-workspace-service.js';
-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';
-import { isDrawioLeaseRoom } from '../domain/drawio-room.js';
-import { WORKSPACE_ROOM_NAME } from '../domain/workspace-room.js';
-import { FileSystemSyncService } from './infrastructure/workspace/file-system-sync-service.js';
-import { WorkspaceReconciliation } from './application/workspace-reconciliation.js';
-import { createWorkspaceStateFileSystemAdapter } from './infrastructure/workspace/workspace-state-file-system-adapter.js';
 import { createSignedCookieManager } from './auth/session-cookie.js';
-import { workspaceStateMetadataEqual } from './domain/workspace-state.js';
+import { createVaultRegistry } from './vault-registry.js';
 
 function getDisplayHost(host) {
   return host === '127.0.0.1' ? 'localhost' : host;
@@ -76,16 +62,20 @@ export function createAppServer(config = loadConfig()) {
         githubAppClient,
       })
     : null;
-  const vaultFileStore = new VaultFileStore({ vaultDir: config.vaultDir });
-  const backlinkIndex = new BacklinkIndex({ vaultFileStore });
-  let fileSystemSyncService = null;
-  let workspaceMutationCoordinator = null;
-  const baseQueryService = new BaseQueryService({
-    maxResultRows: config.maxBaseQueryRows,
-    vaultFileStore,
-    workspaceStateProvider: () => workspaceMutationCoordinator?.workspaceState ?? null,
-    workspaceStateSynchronizer: () => fileSystemSyncService?.flushPendingChanges?.(),
-  });
+  const testControls = {
+    wsRoomHydrateDelayMs: Math.max(0, Number(config.testWsRoomHydrateDelayMs || 0)),
+  };
+  // ponytail: one live context per vault; agent/hosted/structurizr stay on the primary this slice
+  const vaultRegistry = createVaultRegistry({ config, testControls });
+  const primary = vaultRegistry.getPrimaryContext();
+  const vaultFileStore = primary.vaultFileStore;
+  const backlinkIndex = primary.backlinkIndex;
+  const baseQueryService = primary.baseQueryService;
+  const gitService = primary.gitService;
+  const searchService = primary.searchService;
+  const roomRegistry = primary.roomRegistry;
+  const workspaceMutationCoordinator = primary.workspaceMutationCoordinator;
+  const fileSystemSyncService = primary.fileSystemSyncService;
   const plantUmlRenderer = new PlantUmlRenderer({
     serverUrl: config.plantumlServerUrl,
   });
@@ -95,56 +85,6 @@ export function createAppServer(config = loadConfig()) {
     trustedExecutableDsl: config.structurizr?.trustedExecutableDsl,
     vaultDir: config.vaultDir,
   });
-  const gitService = new GitService({
-    commandEnv: config.git?.commandEnv,
-    enabled: config.gitEnabled,
-    vaultDir: config.vaultDir,
-  });
-  const searchService = new RipgrepSearchService({
-    maxBufferBytes: config.searchMaxBufferBytes,
-    maxFileSize: config.searchMaxFileSize,
-    perfLoggingEnabled: config.perfLoggingEnabled,
-    vaultDir: config.vaultDir,
-  });
-  const testControls = {
-    wsRoomHydrateDelayMs: Math.max(0, Number(config.testWsRoomHydrateDelayMs || 0)),
-  };
-  const roomRegistry = new RoomRegistry({
-    createRoom: ({ name, onEmpty }) => {
-      const isTransientRoom = name === '__lobby__' || name === WORKSPACE_ROOM_NAME || isDrawioLeaseRoom(name);
-      const room = new CollaborationRoom({
-        documentStore: new CollaborationDocumentStore({
-          backlinkIndex: isTransientRoom ? null : backlinkIndex,
-          name,
-          vaultFileStore: isTransientRoom ? null : vaultFileStore,
-        }),
-        getHydrateDelayMs: () => testControls.wsRoomHydrateDelayMs,
-        idleGraceMs: config.wsRoomIdleGraceMs,
-        maxInitialSyncBytes: config.maxInitialSyncBytes,
-        maxBufferedAmountBytes: config.wsMaxBufferedAmountBytes,
-        name,
-        onEmpty,
-        perfLoggingEnabled: config.perfLoggingEnabled,
-      });
-
-      if (name === WORKSPACE_ROOM_NAME && workspaceMutationCoordinator?.workspaceState) {
-        room.replaceWorkspaceEntries(workspaceMutationCoordinator.workspaceState.entries, {
-          generatedAt: workspaceMutationCoordinator.workspaceState.scannedAt,
-        });
-      }
-
-      return room;
-    },
-  });
-  workspaceMutationCoordinator = new WorkspaceReconciliation({
-    backlinkIndex,
-    baseQueryService,
-    roomRegistry,
-    vaultFileStore,
-    workspaceStateAdapter: createWorkspaceStateFileSystemAdapter({
-      vaultDir: vaultFileStore.vaultDir,
-    }),
-  });
   const agentConnectionStore = new AgentConnectionStore({
     dbPath: config.agentAccess.dbPath,
   });
@@ -156,18 +96,13 @@ export function createAppServer(config = loadConfig()) {
   });
   const agentContentService = new AgentContentService({
     backlinkIndex,
+    baseQueryService,
     plantUmlRenderer,
     roomRegistry,
     searchService,
     vaultFileStore,
     workspaceMutationCoordinator,
   });
-  vaultFileStore.setManagedWriteTracker(workspaceMutationCoordinator);
-  fileSystemSyncService = new FileSystemSyncService({
-    mutationCoordinator: workspaceMutationCoordinator,
-    perfLoggingEnabled: config.perfLoggingEnabled,
-    vaultFileStore,
-  });
   const requestHandler = createRequestHandler(
     config,
     authService,
@@ -189,6 +124,7 @@ export function createAppServer(config = loadConfig()) {
       connectionService: agentConnectionService,
       contentService: agentContentService,
     },
+    vaultRegistry,
   );
   const httpServer = createServer((req, res) => {
     requestHandler(req, res).catch((error) => {
@@ -211,6 +147,7 @@ export function createAppServer(config = loadConfig()) {
     roomRegistry,
     wsBasePath: config.wsBasePath,
     hostedWorkspaceService,
+    vaultRegistry,
   });
 
   let shutdownPromise = null;
@@ -219,81 +156,14 @@ 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();
-    logPerfEvent(config.perfLoggingEnabled, 'startup', {
-      available: config.search.available,
-      durationMs: Date.now() - searchCapabilityStartedAt,
-      phase: 'search-capability',
-    });
-
-    const initialWorkspaceScanStartedAt = Date.now();
-    const initialWorkspaceSnapshot = await vaultFileStore.scanWorkspaceState();
-    vaultFileCount = initialWorkspaceSnapshot.vaultFileCount ?? 0;
-    logPerfEvent(config.perfLoggingEnabled, 'startup', {
-      durationMs: Date.now() - initialWorkspaceScanStartedAt,
-      phase: 'workspace-scan',
-      vaultFileCount,
-    });
-
-    const backlinkBuildStartedAt = Date.now();
-    await backlinkIndex.build({ workspaceState: initialWorkspaceSnapshot });
-    logPerfEvent(config.perfLoggingEnabled, 'startup', {
-      durationMs: Date.now() - backlinkBuildStartedAt,
-      markdownFileCount: initialWorkspaceSnapshot.markdownPaths?.length ?? 0,
-      phase: 'backlink-build',
-    });
-
-    const liveWorkspaceScanStartedAt = Date.now();
-    const liveWorkspaceSnapshot = await vaultFileStore.scanWorkspaceState();
-    const workspaceChangedDuringStartup = !workspaceStateMetadataEqual(initialWorkspaceSnapshot, liveWorkspaceSnapshot);
-    vaultFileCount = liveWorkspaceSnapshot.vaultFileCount ?? vaultFileCount;
-    logPerfEvent(config.perfLoggingEnabled, 'startup', {
-      changedDuringStartup: workspaceChangedDuringStartup,
-      durationMs: Date.now() - liveWorkspaceScanStartedAt,
-      phase: 'workspace-rescan',
-      vaultFileCount,
-    });
-
-    if (workspaceChangedDuringStartup) {
-      const backlinkRebuildStartedAt = Date.now();
-      await backlinkIndex.build({ workspaceState: liveWorkspaceSnapshot });
-      logPerfEvent(config.perfLoggingEnabled, 'startup', {
-        durationMs: Date.now() - backlinkRebuildStartedAt,
-        markdownFileCount: liveWorkspaceSnapshot.markdownPaths?.length ?? 0,
-        phase: 'backlink-rebuild',
-      });
-    }
-
-    const workspaceInitStartedAt = Date.now();
-    await workspaceMutationCoordinator.initialize({ snapshot: liveWorkspaceSnapshot });
-    logPerfEvent(config.perfLoggingEnabled, 'startup', {
-      durationMs: Date.now() - workspaceInitStartedAt,
-      phase: 'workspace-init',
-    });
-
-    if (config.fileWatcherEnabled !== false) {
-      const watcherStartStartedAt = Date.now();
-      await fileSystemSyncService.start({ snapshot: liveWorkspaceSnapshot });
-      logPerfEvent(config.perfLoggingEnabled, 'startup', {
-        durationMs: Date.now() - watcherStartStartedAt,
-        phase: 'watcher-start',
-      });
-    } else {
-      fileSystemSyncService.initializeFromSnapshot({ snapshot: liveWorkspaceSnapshot });
-      logPerfEvent(config.perfLoggingEnabled, 'startup', {
-        durationMs: 0,
-        phase: 'watcher-skipped',
-      });
-    }
+    const { searchCapability, snapshot: liveWorkspaceSnapshot, vaultFileCount: primaryFileCount } = await vaultRegistry.initializePrimary();
+    config.search = searchCapability;
+    vaultFileCount = primaryFileCount;
 
     return new Promise((resolve, reject) => {
       const listenStartedAt = Date.now();
@@ -331,8 +201,7 @@ export function createAppServer(config = loadConfig()) {
 
     shutdownPromise = (async () => {
       await collaborationGateway.close();
-      await fileSystemSyncService.close();
-      await roomRegistry.reset();
+      await vaultRegistry.closeAll();
       await Promise.all([
         closeHttpServer(httpServer),
         config.git?.cleanup?.(),
@@ -367,6 +236,7 @@ export function createAppServer(config = loadConfig()) {
       testControls.wsRoomHydrateDelayMs = Math.max(0, Number(delayMs) || 0);
     },
     vaultFileStore,
+    vaultRegistry,
     get vaultFileCount() { return vaultFileCount; },
   };
 }

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

@@ -381,7 +381,7 @@ export class HostedWorkspaceService {
     };
   }
 
-  async completeWorkspaceSetup() {
+  async completeWorkspaceSetup({ user = null } = {}) {
     await this.initialize();
     const team = await this.store.getTeam();
     if (!team) {
@@ -394,6 +394,15 @@ export class HostedWorkspaceService {
       setupCompletedAt: team.setupCompletedAt || timestamp,
     };
     await this.store.updateTeam(updatedTeam);
+    if (!team.setupCompletedAt) {
+      await this.store.createAuditEvent(createAuditEvent({
+        actor: user,
+        targetEmail: user?.email ?? '',
+        targetRole: user?.role ?? '',
+        timestamp,
+        type: 'workspace_setup_completed',
+      }));
+    }
     return updatedTeam;
   }
 

package/src/server/domain/ripgrep-search-service.js

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { promisify } from 'node:util';
 
 import { getVaultFileKind } from '../../domain/file-kind.js';
+import { isWholeWordMatch } from '../../domain/literal-text-search.js';
 import { logPerfEvent } from '../config/perf-logging.js';
 
 const execFile = promisify(execFileCallback);
@@ -108,6 +109,7 @@ function createSnippet(lineText = '', matchStart = 0, matchEnd = matchStart) {
 function createRipgrepArgs(query, {
   maxFileSize = DEFAULT_MAX_FILE_SIZE,
   maxSnippetsPerFile = DEFAULT_MAX_SNIPPETS_PER_FILE,
+  wholeWord = false,
 } = {}) {
   const args = [
     '--json',
@@ -130,6 +132,7 @@ function createRipgrepArgs(query, {
     '--glob',
     '!.trash/**',
   ];
+  if (wholeWord) args.push('--word-regexp');
 
   TEXT_SEARCH_GLOBS.forEach((glob) => {
     args.push('--glob', glob);
@@ -140,10 +143,13 @@ function createRipgrepArgs(query, {
 }
 
 export function parseRipgrepJson(stdout, {
+  kinds = [],
   maxFiles = DEFAULT_MAX_FILES,
   maxSnippetsPerFile = DEFAULT_MAX_SNIPPETS_PER_FILE,
+  prefix = '',
   query = '',
 } = {}) {
+  const kindFilter = new Set(Array.isArray(kinds) ? kinds : []);
   const files = [];
   const filesByPath = new Map();
   let matchCount = 0;
@@ -167,7 +173,12 @@ export function parseRipgrepJson(stdout, {
     }
 
     const filePath = String(event?.data?.path?.text ?? '').replace(/^\.\//u, '');
-    if (!filePath) {
+    const kind = getVaultFileKind(filePath) ?? 'text';
+    if (
+      !filePath
+      || (prefix && filePath !== prefix && !filePath.startsWith(`${prefix}/`))
+      || (kindFilter.size > 0 && !kindFilter.has(kind))
+    ) {
       continue;
     }
 
@@ -180,7 +191,7 @@ export function parseRipgrepJson(stdout, {
 
       fileGroup = {
         file: filePath,
-        kind: getVaultFileKind(filePath) ?? 'text',
+        kind,
         matchCount: 0,
         snippets: [],
         truncated: false,
@@ -226,7 +237,21 @@ export function parseRipgrepJson(stdout, {
   };
 }
 
-async function searchExcalidrawText({ maxFileSize, maxFiles, maxSnippetsPerFile, query, signal, vaultDir }) {
+async function searchExcalidrawText({
+  kinds = [],
+  maxFileSize,
+  maxFiles,
+  maxSnippetsPerFile,
+  prefix = '',
+  query,
+  wholeWord = false,
+  signal,
+  vaultDir,
+}) {
+  const kindFilter = new Set(Array.isArray(kinds) ? kinds : []);
+  if (kindFilter.size > 0 && !kindFilter.has('excalidraw')) {
+    return { files: [], matchCount: 0, truncated: false };
+  }
   const files = [];
   let matchCount = 0;
   let truncated = false;
@@ -237,6 +262,8 @@ async function searchExcalidrawText({ maxFileSize, maxFiles, maxSnippetsPerFile,
   });
 
   for await (const filePath of paths) {
+    const normalizedPath = filePath.replaceAll('\\', '/');
+    if (prefix && normalizedPath !== prefix && !normalizedPath.startsWith(`${prefix}/`)) continue;
     signal?.throwIfAborted?.();
     const absolutePath = join(vaultDir, filePath);
     if ((await stat(absolutePath)).size > parseByteLimit(maxFileSize)) continue;
@@ -256,19 +283,21 @@ async function searchExcalidrawText({ maxFileSize, maxFiles, maxSnippetsPerFile,
       const normalizedText = text.toLocaleLowerCase();
       let matchStart = normalizedText.indexOf(normalizedQuery);
       while (matchStart >= 0) {
-        fileMatchCount += 1;
-        matchCount += 1;
-        if (snippets.length < maxSnippetsPerFile) {
-          const snippet = createSnippet(text, matchStart, matchStart + query.length);
-          snippets.push({
-            column: matchStart + 1,
-            line: 1,
-            matchEnd: snippet.matchEnd,
-            matchStart: snippet.matchStart,
-            text: snippet.text,
-          });
-        } else {
-          truncated = true;
+        if (!wholeWord || isWholeWordMatch(normalizedText, matchStart, matchStart + normalizedQuery.length)) {
+          fileMatchCount += 1;
+          matchCount += 1;
+          if (snippets.length < maxSnippetsPerFile) {
+            const snippet = createSnippet(text, matchStart, matchStart + query.length);
+            snippets.push({
+              column: matchStart + 1,
+              line: 1,
+              matchEnd: snippet.matchEnd,
+              matchStart: snippet.matchStart,
+              text: snippet.text,
+            });
+          } else {
+            truncated = true;
+          }
         }
         matchStart = normalizedText.indexOf(normalizedQuery, matchStart + Math.max(query.length, 1));
       }
@@ -280,7 +309,7 @@ async function searchExcalidrawText({ maxFileSize, maxFiles, maxSnippetsPerFile,
         continue;
       }
       files.push({
-        file: filePath.replaceAll('\\', '/'),
+        file: normalizedPath,
         kind: 'excalidraw',
         matchCount: fileMatchCount,
         snippets,
@@ -354,11 +383,19 @@ export class RipgrepSearchService {
   }
 
   async search({
+    kinds = [],
     limit = DEFAULT_MAX_FILES,
+    maxSnippetsPerFile = DEFAULT_MAX_SNIPPETS_PER_FILE,
+    prefix = '',
     query = '',
     signal = null,
+    wholeWord = false,
   } = {}) {
     const normalizedQuery = String(query ?? '').trim();
+    const snippetLimit = normalizePositiveInt(maxSnippetsPerFile, this.maxSnippetsPerFile, {
+      max: 10,
+      min: 1,
+    });
     const maxFiles = normalizePositiveInt(limit, this.maxFiles, {
       max: this.maxFiles,
       min: 1,
@@ -381,7 +418,8 @@ export class RipgrepSearchService {
     const startedAt = Date.now();
     const args = createRipgrepArgs(normalizedQuery, {
       maxFileSize: this.maxFileSize,
-      maxSnippetsPerFile: this.maxSnippetsPerFile,
+      maxSnippetsPerFile: snippetLimit,
+      wholeWord,
     });
     let parsed;
     try {
@@ -393,8 +431,10 @@ export class RipgrepSearchService {
         timeout: this.timeoutMs,
       });
       parsed = parseRipgrepJson(result.stdout, {
+        kinds,
         maxFiles,
-        maxSnippetsPerFile: this.maxSnippetsPerFile,
+        maxSnippetsPerFile: snippetLimit,
+        prefix,
         query: normalizedQuery,
       });
     } catch (error) {
@@ -406,8 +446,10 @@ export class RipgrepSearchService {
       } else {
         const isMaxBuffer = error?.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER';
         parsed = parseRipgrepJson(error?.stdout ?? '', {
+          kinds,
           maxFiles,
-          maxSnippetsPerFile: this.maxSnippetsPerFile,
+          maxSnippetsPerFile: snippetLimit,
+          prefix,
           query: normalizedQuery,
         });
         if (isMaxBuffer && parsed.files.length > 0) {
@@ -421,16 +463,21 @@ export class RipgrepSearchService {
 
     if (parsed.files.length < maxFiles) {
       const excalidraw = await searchExcalidrawText({
+        kinds,
         maxFileSize: this.maxFileSize,
         maxFiles: maxFiles - parsed.files.length,
-        maxSnippetsPerFile: this.maxSnippetsPerFile,
+        maxSnippetsPerFile: snippetLimit,
+        prefix,
         query: normalizedQuery,
+        wholeWord,
         signal,
         vaultDir: this.vaultDir,
       });
       parsed.files.push(...excalidraw.files);
       parsed.matchCount += excalidraw.matchCount;
       parsed.truncated ||= excalidraw.truncated;
+    } else if (kinds.length === 0 || kinds.includes('excalidraw')) {
+      parsed.truncated = true;
     }
     parsed.search = this.getClientConfig();
     logPerfEvent(this.perfLoggingEnabled, 'search-query', {

package/src/server/infrastructure/git/local-exclude.js

@@ -1,8 +1,20 @@
+import { execFile as execFileCallback } from 'node:child_process';
 import { readFile, writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
+import { promisify } from 'node:util';
+
+const execFile = promisify(execFileCallback);
 
 export async function ensureCollabMetadataGitExclude(vaultDir) {
-  const excludePath = resolve(vaultDir, '.git/info/exclude');
+  let excludePath = resolve(vaultDir, '.git/info/exclude');
+  try {
+    const { stdout } = await execFile('git', ['rev-parse', '--git-path', 'info/exclude'], {
+      cwd: vaultDir,
+    });
+    excludePath = resolve(vaultDir, String(stdout).trim());
+  } catch {
+    // Preserve support for repositories represented by a local .git directory.
+  }
   let existingContent = '';
 
   try {

package/src/server/infrastructure/http/create-agent-api-handler.js

@@ -63,7 +63,7 @@ async function createWebMcpActor({ agentConnectionService, authService, config,
 }
 
 async function mapWebMcpResult(definition, value) {
-  if (definition.resultKind === 'image' && value.svg) {
+  if (value.svg && ['image', 'optional-image'].includes(definition.resultKind)) {
     const { data, mimeType, structuredContent } = await encodeAgentToolImage(value);
     return {
       ...structuredContent,

package/src/server/infrastructure/http/create-hosted-api-handler.js

@@ -43,6 +43,11 @@ export function createHostedApiHandler({
         user,
       }));
     }],
+    ['POST /api/hosted/setup/complete', async ({ req, res, user }) => {
+      const admin = await hostedWorkspaceService.requireAdmin(user);
+      const team = await hostedWorkspaceService.completeWorkspaceSetup({ user: admin });
+      jsonResponse(req, res, 200, { ok: true, setupComplete: true, team });
+    }],
     ['GET /api/hosted/vault-source', async ({ req, res, user }) => {
       jsonResponse(req, res, 200, { vaultSource: await hostedWorkspaceService.getVaultSource(user) });
     }],