collabmd 0.1.43 → 0.1.45

package/src/server/infrastructure/git/history-service.js

@@ -1,18 +1,15 @@
-import { createGitRequestError } from './errors.js';
+import { createRequestError as createGitRequestError } from '../http/http-errors.js';
 import { getVaultFileKind, isImageAttachmentFilePath } from '../../../domain/file-kind.js';
 import { normalizeRelativeGitPath } from './path-utils.js';
 import {
   countPatchLines,
+  parseGitLogHeader,
   parseNumstatEntries,
   parseNameStatusEntries,
   parseUnifiedDiff,
 } from './parsers.js';
 import {
-  createCommitDiffResponse,
   createEmptyStats,
-  createFileHistoryResponse,
-  createFileSnapshotResponse,
-  createHistoryResponse,
 } from './responses.js';
 
 const EMPTY_TREE_HASH = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
@@ -126,13 +123,13 @@ export class GitHistoryService {
     const normalizedOffset = normalizeHistoryOffset(offset);
 
     if (!isGitRepo) {
-      return createHistoryResponse({
+      return {
         commits: [],
         hasMore: false,
         isGitRepo: false,
         limit: normalizedLimit,
         offset: normalizedOffset,
-      });
+      };
     }
 
     const cacheKey = JSON.stringify({
@@ -148,12 +145,13 @@ export class GitHistoryService {
     return this.runRequest(cacheKey, async () => {
       const hasHeadCommit = await this.hasHeadCommit();
       if (!hasHeadCommit) {
-        return setCachedValue(this.historyCache, cacheKey, createHistoryResponse({
+        return setCachedValue(this.historyCache, cacheKey, {
           commits: [],
           hasMore: false,
+          isGitRepo: true,
           limit: normalizedLimit,
           offset: normalizedOffset,
-        }), this.responseCacheTtlMs);
+        }, this.responseCacheTtlMs);
       }
 
       const output = await this.commandRunner.execGit([
@@ -174,12 +172,13 @@ export class GitHistoryService {
         .map((chunk) => this.parseHistoryChunk(chunk));
 
       const hasMore = commits.length > normalizedLimit;
-      const response = createHistoryResponse({
+      const response = {
         commits: commits.slice(0, normalizedLimit),
         hasMore,
+        isGitRepo: true,
         limit: normalizedLimit,
         offset: normalizedOffset,
-      });
+      };
 
       return setCachedValue(this.historyCache, cacheKey, response, this.responseCacheTtlMs);
     });
@@ -192,14 +191,14 @@ export class GitHistoryService {
     const normalizedPath = normalizeRelativeGitPath(path);
 
     if (!isGitRepo) {
-      return createFileHistoryResponse({
+      return {
         commits: [],
         hasMore: false,
         isGitRepo: false,
         limit: normalizedLimit,
         offset: normalizedOffset,
         path: normalizedPath,
-      });
+      };
     }
 
     const cacheKey = JSON.stringify({
@@ -216,13 +215,14 @@ export class GitHistoryService {
     return this.runRequest(cacheKey, async () => {
       const hasHeadCommit = await this.hasHeadCommit();
       if (!hasHeadCommit) {
-        return setCachedValue(this.historyCache, cacheKey, createFileHistoryResponse({
+        return setCachedValue(this.historyCache, cacheKey, {
           commits: [],
           hasMore: false,
+          isGitRepo: true,
           limit: normalizedLimit,
           offset: normalizedOffset,
           path: normalizedPath,
-        }), this.responseCacheTtlMs);
+        }, this.responseCacheTtlMs);
       }
 
       const logArgs = [
@@ -253,13 +253,14 @@ export class GitHistoryService {
 
       const commits = this.mergeFileHistoryChunks(nameStatusOutput, numstatOutput);
       const hasMore = commits.length > normalizedLimit;
-      const response = createFileHistoryResponse({
+      const response = {
         commits: commits.slice(0, normalizedLimit),
         hasMore,
+        isGitRepo: true,
         limit: normalizedLimit,
         offset: normalizedOffset,
         path: normalizedPath,
-      });
+      };
 
       return setCachedValue(this.historyCache, cacheKey, response, this.responseCacheTtlMs);
     });
@@ -268,13 +269,19 @@ export class GitHistoryService {
   async getCommit({ allowLargePatch = false, hash, metaOnly = false, path = null } = {}) {
     const isGitRepo = await this.commandRunner.isGitRepo();
     if (!isGitRepo) {
-      return createCommitDiffResponse({
+      return {
         commit: null,
         files: [],
         isGitRepo: false,
         metaOnly,
         path: null,
-      });
+        source: 'commit',
+        summary: {
+          additions: 0,
+          deletions: 0,
+          filesChanged: 0,
+        },
+      };
     }
 
     const normalizedHash = this.normalizeCommitHash(hash);
@@ -300,13 +307,15 @@ export class GitHistoryService {
       const summary = createSummaryFromFiles(meta.files);
 
       if (metaOnly) {
-        const metaResponse = createCommitDiffResponse({
+        const metaResponse = {
           commit: meta.commit,
           files: meta.files,
+          isGitRepo: true,
           metaOnly: true,
           path: normalizedPath,
+          source: 'commit',
           summary,
-        });
+        };
         return setCachedValue(this.commitCache, cacheKey, metaResponse, this.responseCacheTtlMs);
       }
 
@@ -325,7 +334,7 @@ export class GitHistoryService {
         !allowLargePatch
         && (fileSummary.additions + fileSummary.deletions) > this.maxInitialPatchLines
       ) {
-        const guardedResponse = createCommitDiffResponse({
+        const guardedResponse = {
           commit: meta.commit,
           files: [{
             ...baseFile,
@@ -334,10 +343,12 @@ export class GitHistoryService {
             patchLineCount: fileSummary.additions + fileSummary.deletions,
             tooLarge: true,
           }],
+          isGitRepo: true,
           metaOnly: false,
           path: normalizedPath,
+          source: 'commit',
           summary,
-        });
+        };
         return setCachedValue(this.commitCache, cacheKey, guardedResponse, this.responseCacheTtlMs);
       }
 
@@ -384,13 +395,15 @@ export class GitHistoryService {
           tooLarge: false,
         };
 
-      const response = createCommitDiffResponse({
+      const response = {
         commit: meta.commit,
         files: [detailedFile],
+        isGitRepo: true,
         metaOnly: false,
         path: normalizedPath,
+        source: 'commit',
         summary,
-      });
+      };
       return setCachedValue(this.commitCache, cacheKey, response, this.responseCacheTtlMs);
     });
   }
@@ -401,13 +414,13 @@ export class GitHistoryService {
     const normalizedPath = normalizeRelativeGitPath(path);
 
     if (!isGitRepo) {
-      return createFileSnapshotResponse({
+      return {
         content: '',
         fileKind: getVaultFileKind(normalizedPath),
         hash: normalizedHash,
         isGitRepo: false,
         path: normalizedPath,
-      });
+      };
     }
 
     if (isImageAttachmentFilePath(normalizedPath)) {
@@ -437,12 +450,13 @@ export class GitHistoryService {
         throw createGitRequestError(404, 'Commit file not found');
       }
 
-      return setCachedValue(this.commitCache, cacheKey, createFileSnapshotResponse({
+      return setCachedValue(this.commitCache, cacheKey, {
         content,
         fileKind,
         hash: normalizedHash,
+        isGitRepo: true,
         path: normalizedPath,
-      }), this.responseCacheTtlMs);
+      }, this.responseCacheTtlMs);
     });
   }
 
@@ -484,22 +498,21 @@ export class GitHistoryService {
     const [headerLine = '', ...statLines] = String(chunk ?? '')
       .split(/\r?\n/u)
       .filter((line) => line.length > 0);
-    const [
-      hash = '',
-      shortHash = '',
-      subject = '',
-      authorName = '',
-      authorEmail = '',
-      authoredAt = '',
-      rawParents = '',
-    ] = headerLine.split('\x1f');
-    const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
-
-    const summary = statLines.reduce((result, line) => {
-      const [rawAdditions = '0', rawDeletions = '0'] = line.split('\t');
+    const {
+      authorEmail,
+      authorName,
+      authoredAt,
+      hash,
+      isMergeCommit,
+      parentCount,
+      shortHash,
+      subject,
+    } = parseGitLogHeader(headerLine);
+
+    const summary = parseNumstatEntries(statLines.join('\n')).reduce((result, entry) => {
       return {
-        additions: result.additions + (rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0),
-        deletions: result.deletions + (rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0),
+        additions: result.additions + entry.additions,
+        deletions: result.deletions + entry.deletions,
         filesChanged: result.filesChanged + 1,
       };
     }, {
@@ -516,8 +529,8 @@ export class GitHistoryService {
       deletions: summary.deletions,
       filesChanged: summary.filesChanged,
       hash,
-      isMergeCommit: parentHashes.length > 1,
-      parentCount: parentHashes.length,
+      isMergeCommit,
+      parentCount,
       relativeDateLabel: formatRelativeDate(authoredAt),
       shortHash,
       subject,
@@ -528,16 +541,16 @@ export class GitHistoryService {
     const [headerLine = '', ...detailLines] = String(chunk ?? '')
       .split(/\r?\n/u)
       .filter((line) => line.length > 0);
-    const [
-      hash = '',
-      shortHash = '',
-      subject = '',
-      authorName = '',
-      authorEmail = '',
-      authoredAt = '',
-      rawParents = '',
-    ] = headerLine.split('\x1f');
-    const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
+    const {
+      authorEmail,
+      authorName,
+      authoredAt,
+      hash,
+      isMergeCommit,
+      parentCount,
+      shortHash,
+      subject,
+    } = parseGitLogHeader(headerLine);
 
     return {
       authorEmail,
@@ -545,8 +558,8 @@ export class GitHistoryService {
       authoredAt,
       detailLines,
       hash,
-      isMergeCommit: parentHashes.length > 1,
-      parentCount: parentHashes.length,
+      isMergeCommit,
+      parentCount,
       relativeDateLabel: formatRelativeDate(authoredAt),
       shortHash,
       subject,
@@ -605,21 +618,20 @@ export class GitHistoryService {
       throw createGitRequestError(404, 'Commit not found');
     });
 
-    const [
-      commitHash = '',
-      shortHash = '',
-      subject = '',
-      authorName = '',
-      authorEmail = '',
-      authoredAt = '',
-      rawParents = '',
-    ] = String(headerOutput ?? '').trim().split('\x1f');
+    const {
+      authorEmail,
+      authorName,
+      authoredAt,
+      hash: commitHash,
+      parentHashes,
+      shortHash,
+      subject,
+    } = parseGitLogHeader(String(headerOutput ?? '').trim());
 
     if (!commitHash) {
       throw createGitRequestError(404, 'Commit not found');
     }
 
-    const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
     const baseRef = parentHashes[0] || EMPTY_TREE_HASH;
     const nameStatusOutput = await this.commandRunner.execGit([
       'diff',
@@ -661,23 +673,19 @@ export class GitHistoryService {
   }
 
   mergeCommitMetadataFiles(nameStatusEntries, numstatOutput) {
-    const statsByPath = new Map();
-    const numstatLines = String(numstatOutput ?? '')
-      .split(/\r?\n/u)
-      .filter(Boolean);
-
-    for (let index = 0; index < nameStatusEntries.length; index += 1) {
-      const line = numstatLines[index] ?? '';
-      const [rawAdditions = '0', rawDeletions = '0'] = line.split('\t');
-      statsByPath.set(nameStatusEntries[index].path, {
-        additions: rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0,
-        deletions: rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0,
-      });
-    }
+    const numstatEntries = parseNumstatEntries(numstatOutput);
 
-    return nameStatusEntries.map((entry) => ({
-      ...entry,
-      stats: statsByPath.get(entry.path) ?? createEmptyStats(),
-    }));
+    return nameStatusEntries.map((entry, index) => {
+      const numstatEntry = numstatEntries[index];
+      return {
+        ...entry,
+        stats: numstatEntry
+          ? {
+            additions: numstatEntry.additions,
+            deletions: numstatEntry.deletions,
+          }
+          : createEmptyStats(),
+      };
+    });
   }
 }

package/src/server/infrastructure/git/parsers.js

@@ -165,37 +165,55 @@ export function parseStatusOutput(output) {
   };
 }
 
-export function parseNumstatOutput(output) {
-  return String(output ?? '')
-    .split(/\r?\n/u)
-    .filter(Boolean)
-    .reduce((summary, line) => {
-      const [rawAdditions = '0', rawDeletions = '0'] = line.split('\t');
-      const additions = rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0;
-      const deletions = rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0;
+export function parseGitLogHeader(headerLine) {
+  const [
+    hash = '',
+    shortHash = '',
+    subject = '',
+    authorName = '',
+    authorEmail = '',
+    authoredAt = '',
+    rawParents = '',
+  ] = String(headerLine ?? '').split('\x1f');
+  const parentHashes = rawParents.split(' ').map((value) => value.trim()).filter(Boolean);
 
-      return {
-        additions: summary.additions + additions,
-        deletions: summary.deletions + deletions,
-      };
-    }, {
-      additions: 0,
-      deletions: 0,
-    });
+  return {
+    authorEmail,
+    authorName,
+    authoredAt,
+    hash,
+    isMergeCommit: parentHashes.length > 1,
+    parentCount: parentHashes.length,
+    parentHashes,
+    shortHash,
+    subject,
+  };
+}
+
+function parseNumstatLine(line) {
+  const [rawAdditions = '0', rawDeletions = '0', ...rest] = String(line ?? '').split('\t');
+  return {
+    additions: rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0,
+    deletions: rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0,
+    rawPath: rest.join('\t'),
+  };
+}
+
+export function parseNumstatOutput(output) {
+  return parseNumstatEntries(output).reduce((summary, entry) => ({
+    additions: summary.additions + entry.additions,
+    deletions: summary.deletions + entry.deletions,
+  }), {
+    additions: 0,
+    deletions: 0,
+  });
 }
 
 export function parseNumstatEntries(output) {
   return String(output ?? '')
     .split(/\r?\n/u)
     .filter(Boolean)
-    .map((line) => {
-      const [rawAdditions = '0', rawDeletions = '0', ...rest] = line.split('\t');
-      return {
-        additions: rawAdditions === '-' ? 0 : Number.parseInt(rawAdditions, 10) || 0,
-        deletions: rawDeletions === '-' ? 0 : Number.parseInt(rawDeletions, 10) || 0,
-        rawPath: rest.join('\t'),
-      };
-    });
+    .map((line) => parseNumstatLine(line));
 }
 
 export function parseNameStatusOutput(output) {

package/src/server/infrastructure/git/path-utils.js

@@ -1,4 +1,4 @@
-import { createGitRequestError } from './errors.js';
+import { createRequestError as createGitRequestError } from '../http/http-errors.js';
 
 export function decodeQuotedPath(pathValue) {
   const rawValue = String(pathValue ?? '').trim();

package/src/server/infrastructure/git/responses.js

@@ -1,8 +1,3 @@
-import {
-  createEmptyWorkspaceChange as createSharedEmptyWorkspaceChange,
-  createWorkspaceChange as createSharedWorkspaceChange,
-} from '../../../domain/workspace-change.js';
-
 const STATUS_MAP = {
   A: { code: 'A', label: 'added', status: 'added' },
   C: { code: 'C', label: 'copied', status: 'copied' },
@@ -47,10 +42,6 @@ export function createEmptyBranchStatus() {
   };
 }
 
-export function createEmptyWorkspaceChange() {
-  return createSharedEmptyWorkspaceChange();
-}
-
 export function createEmptyStatusResponse() {
   return {
     branch: createEmptyBranchStatus(),
@@ -63,112 +54,3 @@ export function createEmptyStatusResponse() {
     summary: createEmptySummary(),
   };
 }
-
-export function createDiffResponse({
-  files = [],
-  isGitRepo = true,
-  metaOnly = false,
-  path = null,
-  scope = 'working-tree',
-  summary = {
-    additions: 0,
-    deletions: 0,
-    filesChanged: 0,
-  },
-} = {}) {
-  return {
-    files,
-    isGitRepo,
-    metaOnly,
-    path,
-    scope,
-    summary,
-  };
-}
-
-export function createHistoryResponse({
-  commits = [],
-  hasMore = false,
-  isGitRepo = true,
-  limit = 30,
-  offset = 0,
-} = {}) {
-  return {
-    commits,
-    hasMore,
-    isGitRepo,
-    limit,
-    offset,
-  };
-}
-
-export function createFileHistoryResponse({
-  commits = [],
-  hasMore = false,
-  isGitRepo = true,
-  limit = 30,
-  offset = 0,
-  path = null,
-} = {}) {
-  return {
-    commits,
-    hasMore,
-    isGitRepo,
-    limit,
-    offset,
-    path,
-  };
-}
-
-export function createCommitDiffResponse({
-  commit = null,
-  files = [],
-  isGitRepo = true,
-  metaOnly = false,
-  path = null,
-  summary = {
-    additions: 0,
-    deletions: 0,
-    filesChanged: 0,
-  },
-} = {}) {
-  return {
-    commit,
-    files,
-    isGitRepo,
-    metaOnly,
-    path,
-    source: 'commit',
-    summary,
-  };
-}
-
-export function createFileSnapshotResponse({
-  content = '',
-  fileKind = null,
-  hash = null,
-  isGitRepo = true,
-  path = null,
-} = {}) {
-  return {
-    content,
-    fileKind,
-    hash,
-    isGitRepo,
-    path,
-  };
-}
-
-export function createWorkspaceChange({
-  changedPaths = [],
-  deletedPaths = [],
-  refreshExplorer = true,
-  renamedPaths = [],
-} = {}) {
-  return createSharedWorkspaceChange({
-    changedPaths,
-    deletedPaths,
-    refreshExplorer,
-    renamedPaths,
-  });
-}

package/src/server/infrastructure/git/untracked-files.js

@@ -2,7 +2,7 @@ import { createReadStream } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
-import { mapWithConcurrency } from './concurrency.js';
+import { mapWithConcurrency } from '../../shared/async-utils.js';
 import { createEmptyStats } from './responses.js';
 import { splitContentLines } from './parsers.js';