collabmd 0.1.40 → 0.1.42

package/src/client/styles/primitives/controls.css

@@ -28,20 +28,23 @@
 .ui-button--primary {
   background: var(--color-primary);
   color: var(--color-text-inverse);
+  box-shadow: var(--shadow-sm);
 }
 
 .ui-button--primary:hover {
   background: var(--color-primary-hover);
+  box-shadow: var(--shadow-md);
 }
 
 .ui-button--secondary {
-  background: var(--color-surface-2);
+  background: var(--color-surface);
   color: var(--color-text);
   border-color: var(--color-border);
 }
 
 .ui-button--secondary:hover {
-  background: var(--color-surface-dynamic);
+  background: var(--color-surface-offset);
+  border-color: color-mix(in oklab, var(--color-border) 72%, var(--color-text-faint) 28%);
 }
 
 .ui-button--danger {
@@ -131,8 +134,9 @@
 .ui-segmented-control {
   display: inline-flex;
   gap: 2px;
-  padding: 2px;
-  border-radius: var(--radius-md);
+  padding: 3px;
+  border: 1px solid var(--color-divider);
+  border-radius: var(--radius-lg);
   background: var(--color-surface-offset);
 }
 
@@ -149,7 +153,7 @@
   min-height: var(--control-h-xs);
   padding: 0 var(--space-3);
   border: 1px solid transparent;
-  border-radius: var(--radius-sm);
+  border-radius: var(--radius-md);
   background: transparent;
   color: var(--color-text-faint);
   white-space: nowrap;
@@ -183,7 +187,7 @@
 .ui-button:disabled,
 .ui-icon-button:disabled,
 .ui-segmented-btn:disabled {
-  opacity: 0.45;
+  opacity: 0.52;
   cursor: not-allowed;
   transform: none;
 }
@@ -197,7 +201,11 @@
   background: var(--color-surface);
   color: var(--color-text);
   font-size: var(--text-sm);
-  transition: border-color var(--transition-interactive), box-shadow var(--transition-interactive);
+  transition: border-color var(--transition-interactive), box-shadow var(--transition-interactive), background var(--transition-interactive);
+}
+
+.ui-input:hover:not(:focus) {
+  border-color: color-mix(in oklab, var(--color-border) 70%, var(--color-text-faint) 30%);
 }
 
 .ui-input:focus {
@@ -248,8 +256,8 @@
 
 .ui-list-item {
   border-radius: var(--radius-md);
-  border: var(--panel-border-width) solid var(--color-border);
-  background: var(--surface-fill-subtle);
+  border: var(--panel-border-width) solid var(--color-divider);
+  background: var(--color-surface);
 }
 
 .ui-floating-dock {

package/src/domain/yaml-frontmatter.js

@@ -1,4 +1,4 @@
-import yaml from 'js-yaml';
+import { load as loadYaml } from 'js-yaml';
 
 function getDocumentNewline(markdownText = '') {
   return String(markdownText).includes('\r\n') ? '\r\n' : '\n';
@@ -37,7 +37,7 @@ export function extractYamlFrontmatter(markdownText = '') {
 
   let parsedData;
   try {
-    parsedData = yaml.load(frontmatterSource || '{}');
+    parsedData = loadYaml(frontmatterSource || '{}');
   } catch {
     return null;
   }
@@ -56,4 +56,3 @@ export function extractYamlFrontmatter(markdownText = '') {
     startLine: 1,
   };
 }
-

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

@@ -0,0 +1,446 @@
+import { supportsBacklinksForFilePath } from '../../domain/file-kind.js';
+import {
+  createEmptyWorkspaceChange,
+  createWorkspaceChange,
+  normalizeWorkspaceEvent,
+} from '../../domain/workspace-change.js';
+import { WORKSPACE_ROOM_NAME } from '../../domain/workspace-room.js';
+import {
+  createDirectoryDeleteWorkspaceChange as createWorkspaceStateDirectoryDeleteChange,
+  createDirectoryRenameWorkspaceChange as createWorkspaceStateDirectoryRenameChange,
+  createWorkspaceTree,
+  deriveNextWorkspaceStateForApiMutation as deriveNextWorkspaceStateFromApiMutation,
+  diffWorkspaceEntries,
+  isIncrementalWorkspaceMutationAction,
+  readWorkspacePathState as readWorkspacePathStateFromAdapter,
+} 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)}`;
+}
+
+function countWorkspacePaths(workspaceChange = {}) {
+  return (
+    (workspaceChange.changedPaths?.length ?? 0)
+    + (workspaceChange.deletedPaths?.length ?? 0)
+    + (workspaceChange.renamedPaths?.length ?? 0)
+  );
+}
+
+function countBacklinkAffectedPaths(workspaceChange = {}) {
+  const affectedPaths = new Set();
+
+  (workspaceChange.changedPaths ?? []).forEach((pathValue) => {
+    if (supportsBacklinksForFilePath(pathValue)) {
+      affectedPaths.add(pathValue);
+    }
+  });
+  (workspaceChange.deletedPaths ?? []).forEach((pathValue) => {
+    if (supportsBacklinksForFilePath(pathValue)) {
+      affectedPaths.add(pathValue);
+    }
+  });
+  (workspaceChange.renamedPaths ?? []).forEach((entry) => {
+    if (supportsBacklinksForFilePath(entry?.oldPath)) {
+      affectedPaths.add(entry.oldPath);
+    }
+    if (supportsBacklinksForFilePath(entry?.newPath)) {
+      affectedPaths.add(entry.newPath);
+    }
+  });
+
+  return affectedPaths.size;
+}
+
+function normalizePaths(paths = []) {
+  return Array.from(new Set((paths ?? []).filter(Boolean)));
+}
+
+export class WorkspaceReconciliation {
+  constructor({
+    backlinkIndex,
+    baseQueryService = null,
+    roomRegistry,
+    vaultFileStore,
+    workspaceStateAdapter,
+    managedWriteWindowMs = 1200,
+  }) {
+    this.backlinkIndex = backlinkIndex ?? null;
+    this.baseQueryService = baseQueryService ?? null;
+    this.roomRegistry = roomRegistry;
+    this.vaultFileStore = vaultFileStore;
+    this.workspaceStateAdapter = workspaceStateAdapter;
+    this.managedWriteWindowMs = managedWriteWindowMs;
+    this.managedPathExpiry = new Map();
+    this.globalSuppressionUntil = 0;
+    this.workspaceState = null;
+    this.workspaceTree = [];
+  }
+
+  replaceWorkspaceState(nextState) {
+    this.workspaceState = nextState ?? null;
+    this.workspaceTree = createWorkspaceTree(nextState?.entries ?? new Map());
+    return this.workspaceState;
+  }
+
+  getWorkspaceTree() {
+    return this.workspaceTree;
+  }
+
+  isIncrementalApiAction(action) {
+    return isIncrementalWorkspaceMutationAction(action);
+  }
+
+  async readWorkspacePathState(pathValue, {
+    expectDirectory = null,
+  } = {}) {
+    return readWorkspacePathStateFromAdapter(this.workspaceStateAdapter, pathValue, {
+      expectDirectory,
+    });
+  }
+
+  async deriveNextWorkspaceStateForApiMutation(action, workspaceChange = {}) {
+    return deriveNextWorkspaceStateFromApiMutation(this.workspaceStateAdapter, {
+      action,
+      previousState: this.workspaceState,
+      workspaceChange,
+    });
+  }
+
+  getWorkspaceRoom() {
+    return this.roomRegistry?.getOrCreate?.(WORKSPACE_ROOM_NAME) ?? null;
+  }
+
+  syncWorkspaceEntries(nextState, {
+    previousState = this.workspaceState,
+  } = {}) {
+    const room = this.getWorkspaceRoom();
+    if (!room || !nextState) {
+      return false;
+    }
+
+    const patch = diffWorkspaceEntries(
+      previousState?.entries ?? new Map(),
+      nextState.entries ?? new Map(),
+    );
+    return room.applyWorkspaceEntryPatch(patch, {
+      generatedAt: nextState.scannedAt,
+    });
+  }
+
+  async initialize({ snapshot = null } = {}) {
+    const effectiveSnapshot = snapshot ?? await this.vaultFileStore.scanWorkspaceState();
+    this.replaceWorkspaceState(effectiveSnapshot);
+    await this.baseQueryService?.initializeFromWorkspaceState?.(effectiveSnapshot);
+    this.getWorkspaceRoom()?.replaceWorkspaceEntries(effectiveSnapshot.entries, {
+      generatedAt: effectiveSnapshot.scannedAt,
+    });
+    return effectiveSnapshot;
+  }
+
+  markManagedPaths(paths = [], { durationMs = this.managedWriteWindowMs } = {}) {
+    const expiresAt = Date.now() + durationMs;
+    normalizePaths(paths).forEach((pathValue) => {
+      this.managedPathExpiry.set(pathValue, expiresAt);
+    });
+  }
+
+  runManagedWrite(paths = [], operation) {
+    this.markManagedPaths(paths);
+    return Promise.resolve(operation()).finally(() => {
+      this.markManagedPaths(paths);
+    });
+  }
+
+  async runManagedWorkspaceMutation(operation) {
+    this.globalSuppressionUntil = Math.max(this.globalSuppressionUntil, Date.now() + this.managedWriteWindowMs);
+    try {
+      return await operation();
+    } finally {
+      this.globalSuppressionUntil = Math.max(this.globalSuppressionUntil, Date.now() + this.managedWriteWindowMs);
+    }
+  }
+
+  isGloballySuppressed() {
+    return Date.now() <= this.globalSuppressionUntil;
+  }
+
+  cleanupExpiredManagedPaths() {
+    const now = Date.now();
+    Array.from(this.managedPathExpiry.entries()).forEach(([pathValue, expiresAt]) => {
+      if (expiresAt <= now) {
+        this.managedPathExpiry.delete(pathValue);
+      }
+    });
+  }
+
+  isManagedPath(pathValue) {
+    this.cleanupExpiredManagedPaths();
+    const expiresAt = this.managedPathExpiry.get(pathValue);
+    return Number.isFinite(expiresAt) && expiresAt > Date.now();
+  }
+
+  filterManagedWorkspaceChange(workspaceChange = {}) {
+    if (this.isGloballySuppressed()) {
+      return null;
+    }
+
+    const filtered = createWorkspaceChange({
+      changedPaths: (workspaceChange.changedPaths ?? []).filter((pathValue) => !this.isManagedPath(pathValue)),
+      deletedPaths: (workspaceChange.deletedPaths ?? []).filter((pathValue) => !this.isManagedPath(pathValue)),
+      renamedPaths: (workspaceChange.renamedPaths ?? []).filter((entry) => (
+        entry?.oldPath
+        && entry?.newPath
+        && !this.isManagedPath(entry.oldPath)
+        && !this.isManagedPath(entry.newPath)
+      )),
+      refreshExplorer: workspaceChange.refreshExplorer !== false,
+    });
+
+    if (countWorkspacePaths(filtered) === 0) {
+      return null;
+    }
+
+    return filtered;
+  }
+
+  async getWorkspaceStateSnapshot() {
+    return this.workspaceState ?? this.vaultFileStore.scanWorkspaceState();
+  }
+
+  async createDirectoryRenameWorkspaceChange(oldPath, newPath) {
+    const workspaceState = await this.getWorkspaceStateSnapshot();
+    return createWorkspaceStateDirectoryRenameChange(workspaceState, oldPath, newPath);
+  }
+
+  async createDirectoryDeleteWorkspaceChange(pathValue) {
+    const workspaceState = await this.getWorkspaceStateSnapshot();
+    return createWorkspaceStateDirectoryDeleteChange(workspaceState, pathValue);
+  }
+
+  async reconcileBacklinks(workspaceChange, nextState, {
+    forceRebuild = false,
+  } = {}) {
+    if (!this.backlinkIndex) {
+      return;
+    }
+
+    if (
+      forceRebuild
+      || countBacklinkAffectedPaths(workspaceChange) > 25
+    ) {
+      this.backlinkIndex.scheduleBuild?.({ workspaceState: nextState });
+      return;
+    }
+    await this.backlinkIndex.applyWorkspaceChange?.(workspaceChange, {
+      nextState,
+      previousState: this.workspaceState,
+    });
+  }
+
+  async reconcileVaultChangeObservation({
+    action = 'workspace',
+    origin = 'filesystem',
+    publishEvent = true,
+    requestId = null,
+    sourceRef = null,
+    workspaceChange = createEmptyWorkspaceChange(),
+    nextState = null,
+    forceBacklinkRebuild = false,
+  } = {}) {
+    const normalizedChange = createWorkspaceChange(workspaceChange);
+    const previousState = this.workspaceState;
+    const derivedState = nextState
+      ? null
+      : await this.deriveNextWorkspaceStateForApiMutation(action, normalizedChange);
+    const resolvedState = nextState ?? derivedState ?? await this.vaultFileStore.scanWorkspaceState();
+
+    await this.vaultFileStore.reconcileSidecars?.(normalizedChange);
+    await this.vaultFileStore.reconcileCollaborationSnapshots?.(normalizedChange);
+    await this.reconcileBacklinks(normalizedChange, resolvedState, {
+      forceRebuild: forceBacklinkRebuild,
+    });
+    await this.baseQueryService?.applyWorkspaceChange?.(normalizedChange, {
+      nextState: resolvedState,
+      previousState,
+    });
+
+    const roomEffects = await this.roomRegistry?.reconcileWorkspaceChange?.(normalizedChange) ?? {};
+    const highlightRanges = normalizePaths(
+      (roomEffects.highlightRanges ?? []).map((entry) => entry?.path),
+    ).map((pathValue) => roomEffects.highlightRanges.find((entry) => entry.path === pathValue));
+    const reloadRequiredPaths = normalizePaths(roomEffects.reloadRequiredPaths ?? []);
+
+    this.syncWorkspaceEntries(resolvedState, {
+      previousState,
+    });
+    this.replaceWorkspaceState(resolvedState);
+
+    if (!publishEvent) {
+      return null;
+    }
+
+    const event = normalizeWorkspaceEvent({
+      action,
+      createdAt: Date.now(),
+      highlightRanges,
+      id: createEventId(),
+      origin,
+      reloadRequiredPaths,
+      requestId,
+      sourceRef,
+      workspaceChange: normalizedChange,
+    });
+    this.getWorkspaceRoom()?.publishWorkspaceEvent(event);
+    return event;
+  }
+
+  apply(options = {}) {
+    return this.reconcileVaultChangeObservation({
+      origin: options.origin ?? 'api',
+      ...options,
+    });
+  }
+
+  async writeEditableContent({ content, origin = 'api', path, requestId = null } = {}) {
+    const result = await this.vaultFileStore.writeEditableVaultContent(path, content);
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'write-file',
+      origin,
+      requestId,
+      workspaceChange: createWorkspaceChange({
+        changedPaths: [path],
+      }),
+    });
+    return result;
+  }
+
+  async uploadAttachment({ content, mimeType, origin = 'api', originalFileName = '', requestId = null, sourceDocumentPath } = {}) {
+    const result = await this.vaultFileStore.writeImageAttachmentForDocument(sourceDocumentPath, {
+      content,
+      mimeType,
+      originalFileName,
+    });
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'upload-attachment',
+      origin,
+      requestId,
+      workspaceChange: createWorkspaceChange({
+        changedPaths: [result.path],
+      }),
+    });
+    return result;
+  }
+
+  async createFile({ content = '', origin = 'api', path, requestId = null } = {}) {
+    const result = await this.vaultFileStore.createFile(path, content);
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'create-file',
+      origin,
+      requestId,
+      workspaceChange: createWorkspaceChange({
+        changedPaths: [path],
+      }),
+    });
+    return result;
+  }
+
+  async deleteFile({ origin = 'api', path, requestId = null } = {}) {
+    const result = await this.vaultFileStore.deleteFile(path);
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'delete-file',
+      origin,
+      requestId,
+      workspaceChange: createWorkspaceChange({
+        deletedPaths: [path],
+      }),
+    });
+    return result;
+  }
+
+  async renameFile({ newPath, oldPath, origin = 'api', requestId = null } = {}) {
+    const result = await this.vaultFileStore.renameFile(oldPath, newPath);
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'rename-file',
+      origin,
+      requestId,
+      workspaceChange: createWorkspaceChange({
+        renamedPaths: [{ oldPath, newPath }],
+      }),
+    });
+    return result;
+  }
+
+  async createDirectory({ origin = 'api', path, requestId = null } = {}) {
+    const result = await this.vaultFileStore.createDirectory(path);
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'create-directory',
+      origin,
+      requestId,
+      workspaceChange: createWorkspaceChange({
+        changedPaths: [path],
+      }),
+    });
+    return result;
+  }
+
+  async renameDirectory({ newPath, oldPath, origin = 'api', requestId = null } = {}) {
+    const workspaceChange = await this.createDirectoryRenameWorkspaceChange(oldPath, newPath);
+    const result = await this.vaultFileStore.renameDirectory(oldPath, newPath);
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'rename-directory',
+      origin,
+      requestId,
+      workspaceChange,
+    });
+    return result;
+  }
+
+  async deleteDirectory({ origin = 'api', path, recursive = false, requestId = null } = {}) {
+    const workspaceChange = await this.createDirectoryDeleteWorkspaceChange(path);
+    const result = await this.vaultFileStore.deleteDirectory(path, { recursive });
+    if (!result.ok) {
+      return result;
+    }
+
+    await this.reconcileVaultChangeObservation({
+      action: 'delete-directory',
+      origin,
+      requestId,
+      workspaceChange,
+    });
+    return result;
+  }
+}

package/src/server/config/env.js

@@ -1,4 +1,5 @@
 import { resolve } from 'path';
+import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'url';
 
 import {
@@ -47,6 +48,14 @@ function normalizeOptionalString(value) {
   return normalized.length > 0 ? normalized : '';
 }
 
+function parseBooleanFlag(value, fallbackValue = false) {
+  const normalized = String(value ?? '').trim().toLowerCase();
+  if (!normalized) {
+    return fallbackValue;
+  }
+  return ['1', 'true', 'yes', 'on'].includes(normalized);
+}
+
 function resolveDrawioBaseUrl(value) {
   return normalizeOptionalString(value) || 'https://embed.diagrams.net';
 }
@@ -273,6 +282,68 @@ function loadOidcConfig(overrides = {}, { basePath = '' } = {}) {
   };
 }
 
+function loadHostedConfig(overrides = {}, { authStrategy, vaultDir } = {}) {
+  const enabled = overrides.enabled ?? parseBooleanFlag(process.env.COLLABMD_HOSTED_ENABLED, false);
+  const metadataDbPath = resolveOptionalPath(
+    overrides.metadataDbPath
+    ?? process.env.COLLABMD_HOSTED_METADATA_DB_PATH,
+  ) || resolve(vaultDir, '.collabmd/hosted.sqlite');
+  const claimOverrides = overrides.claim ?? {};
+  const githubAppOverrides = overrides.githubApp ?? {};
+  const githubAppPrivateKeyFile = resolveOptionalPath(
+    githubAppOverrides.privateKeyFile
+    ?? process.env.COLLABMD_GITHUB_APP_PRIVATE_KEY_FILE,
+  );
+  const githubAppPrivateKeyInput = normalizeOptionalString(
+    githubAppOverrides.privateKey
+    ?? process.env.COLLABMD_GITHUB_APP_PRIVATE_KEY,
+  );
+  const githubAppPrivateKey = githubAppPrivateKeyInput
+    || (enabled && githubAppPrivateKeyFile ? readFileSync(githubAppPrivateKeyFile, 'utf8') : '');
+
+  if (enabled && authStrategy !== AUTH_STRATEGY_OIDC) {
+    throw new Error('Hosted workspace mode requires AUTH_STRATEGY=oidc.');
+  }
+
+  return {
+    claim: {
+      email: normalizeOptionalString(
+        claimOverrides.email
+        ?? process.env.COLLABMD_HOSTED_CLAIM_EMAIL,
+      ),
+      token: normalizeOptionalString(
+        claimOverrides.token
+        ?? process.env.COLLABMD_HOSTED_CLAIM_TOKEN,
+      ),
+    },
+    enabled,
+    githubApp: {
+      apiBaseUrl: normalizeOptionalString(
+        githubAppOverrides.apiBaseUrl
+        ?? process.env.COLLABMD_GITHUB_API_BASE_URL,
+      ) || 'https://api.github.com',
+      appId: normalizeOptionalString(
+        githubAppOverrides.appId
+        ?? process.env.COLLABMD_GITHUB_APP_ID,
+      ),
+      appSlug: normalizeOptionalString(
+        githubAppOverrides.appSlug
+        ?? process.env.COLLABMD_GITHUB_APP_SLUG,
+      ),
+      flowCookieName: normalizeOptionalString(
+        githubAppOverrides.flowCookieName
+        ?? process.env.COLLABMD_GITHUB_SETUP_FLOW_COOKIE_NAME,
+      ) || 'collabmd_github_setup_flow',
+      htmlBaseUrl: normalizeOptionalString(
+        githubAppOverrides.htmlBaseUrl
+        ?? process.env.COLLABMD_GITHUB_HTML_BASE_URL,
+      ) || 'https://github.com',
+      privateKey: githubAppPrivateKey,
+    },
+    metadataDbPath,
+  };
+}
+
 export function loadConfig(overrides = {}) {
   const nodeEnv = process.env.NODE_ENV || 'development';
   const vaultDir = resolveConfiguredVaultDir(overrides);
@@ -293,6 +364,7 @@ export function loadConfig(overrides = {}) {
     ? loadOidcConfig(authOverrides.oidc, { basePath })
     : null;
   const git = loadGitConfig(overrides.git);
+  const hosted = loadHostedConfig(overrides.hosted, { authStrategy, vaultDir });
   const build = loadBuildInfo({
     explicitBuildId: process.env.COLLABMD_BUILD_ID,
     projectRoot,
@@ -321,6 +393,7 @@ export function loadConfig(overrides = {}) {
     httpHeadersTimeoutMs: parsePositiveInt(process.env.HTTP_HEADERS_TIMEOUT_MS, 60_000),
     httpKeepAliveTimeoutMs: parsePositiveInt(process.env.HTTP_KEEP_ALIVE_TIMEOUT_MS, 5_000),
     httpRequestTimeoutMs: parsePositiveInt(process.env.HTTP_REQUEST_TIMEOUT_MS, 30_000),
+    hosted,
     git,
     gitEnabled: git.enabled,
     maxArchiveEntries: parsePositiveInt(process.env.COLLABMD_MAX_ARCHIVE_ENTRIES, 10_000),