collabmd 0.1.43 → 0.1.45

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

@@ -106,7 +106,7 @@ function createRipgrepArgs(query, {
     '--max-filesize',
     String(maxFileSize || DEFAULT_MAX_FILE_SIZE),
     '--max-count',
-    String(maxSnippetsPerFile),
+    String(Math.max(Number(maxSnippetsPerFile) || DEFAULT_MAX_SNIPPETS_PER_FILE, 1) + 1),
     '--glob',
     '!.git/**',
     '--glob',
@@ -171,6 +171,7 @@ export function parseRipgrepJson(stdout, {
         kind: getVaultFileKind(filePath) ?? 'text',
         matchCount: 0,
         snippets: [],
+        truncated: false,
       };
       filesByPath.set(filePath, fileGroup);
       files.push(fileGroup);
@@ -187,6 +188,7 @@ export function parseRipgrepJson(stdout, {
       matchCount += 1;
 
       if (fileGroup.snippets.length >= maxSnippetsPerFile) {
+        fileGroup.truncated = true;
         truncated = true;
         continue;
       }

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

@@ -42,6 +42,20 @@ export function createWorkspaceMetadata(pathValue, type, info = {}) {
   };
 }
 
+function enrichWorkspaceEntries(entries, metadata) {
+  const enrichedEntries = new Map(entries);
+  metadata.forEach((entryMetadata, pathValue) => {
+    const entry = enrichedEntries.get(pathValue);
+    const mtimeMs = Number(entryMetadata?.mtimeMs);
+    if (!entry || !Number.isFinite(mtimeMs) || entry.mtimeMs === mtimeMs) {
+      return;
+    }
+
+    enrichedEntries.set(pathValue, { ...entry, mtimeMs });
+  });
+  return enrichedEntries;
+}
+
 export function collectWorkspaceStateStats(entries = new Map(), metadata = new Map()) {
   const filePaths = [];
   const markdownPaths = [];
@@ -75,8 +89,11 @@ export function collectWorkspaceStateStats(entries = new Map(), metadata = new M
 export function createWorkspaceStateSnapshot(entries = new Map(), metadata = new Map(), {
   scannedAt = Date.now(),
 } = {}) {
-  const normalizedEntries = entries instanceof Map ? entries : new Map(entries ?? []);
   const normalizedMetadata = metadata instanceof Map ? metadata : new Map(metadata ?? []);
+  const normalizedEntries = enrichWorkspaceEntries(
+    entries instanceof Map ? entries : new Map(entries ?? []),
+    normalizedMetadata,
+  );
   const stats = collectWorkspaceStateStats(normalizedEntries, normalizedMetadata);
 
   return {
@@ -385,21 +402,24 @@ export function createWorkspaceTree(entries = new Map()) {
       return;
     }
 
-    if (entry?.type === 'directory' || entry?.nodeType === 'directory') {
-      nodesByPath.set(normalizedPath, {
+    const mtimeMs = Number(entry?.mtimeMs);
+    const node = entry?.type === 'directory' || entry?.nodeType === 'directory'
+      ? {
         children: [],
         name: entry?.name ?? basename(normalizedPath),
         path: normalizedPath,
         type: 'directory',
-      });
-      return;
-    }
+      }
+      : {
+        name: entry?.name ?? basename(normalizedPath),
+        path: normalizedPath,
+        type: entry?.type ?? getVaultTreeNodeType(normalizedPath),
+      };
 
-    nodesByPath.set(normalizedPath, {
-      name: entry?.name ?? basename(normalizedPath),
-      path: normalizedPath,
-      type: entry?.type ?? getVaultTreeNodeType(normalizedPath),
-    });
+    if (node.type !== 'directory' && Number.isFinite(mtimeMs)) {
+      node.mtimeMs = mtimeMs;
+    }
+    nodesByPath.set(normalizedPath, node);
   });
 
   nodesByPath.forEach((node, pathValue) => {
@@ -423,6 +443,7 @@ export function workspaceEntriesEqual(left = {}, right = {}) {
     && left.nodeType === right.nodeType
     && left.parentPath === right.parentPath
     && left.path === right.path
+    && left.mtimeMs === right.mtimeMs
     && left.type === right.type
   );
 }
@@ -654,14 +675,6 @@ export function detectWorkspaceStateChange(previousState, nextState) {
   });
 }
 
-export function hasWorkspaceStatePaths(workspaceChange = {}) {
-  return (
-    (workspaceChange.changedPaths?.length ?? 0) > 0
-    || (workspaceChange.deletedPaths?.length ?? 0) > 0
-    || (workspaceChange.renamedPaths?.length ?? 0) > 0
-  );
-}
-
 export function isIncrementalWorkspaceMutationAction(action) {
   return action === 'create-directory'
     || action === 'create-file'

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

@@ -1,5 +1,5 @@
 import { countPatchLines, parseNumstatOutput, parseUnifiedDiff } from './parsers.js';
-import { createDiffResponse, createEmptyStats } from './responses.js';
+import { createEmptyStats } from './responses.js';
 
 function createSectionMap(sections = []) {
   return new Map(sections.map((section) => [section.key, section]));
@@ -162,12 +162,18 @@ export class GitDiffService {
   async getDiff({ allowLargePatch = false, metaOnly = false, path = null, scope = 'working-tree' } = {}) {
     const isGitRepo = await this.commandRunner.isGitRepo();
     if (!isGitRepo) {
-      return createDiffResponse({
+      return {
         files: [],
         isGitRepo: false,
         metaOnly,
+        path: null,
         scope,
-      });
+        summary: {
+          additions: 0,
+          deletions: 0,
+          filesChanged: 0,
+        },
+      };
     }
 
     const resolvedScope = scope === 'staged' || scope === 'all'
@@ -214,13 +220,14 @@ export class GitDiffService {
         scope,
       });
 
-      return createDiffResponse({
+      return {
         files: scopedFiles,
+        isGitRepo: true,
         metaOnly: true,
         path,
         scope,
         summary: scopeSummary,
-      });
+      };
     }
 
     const isSinglePathRequest = Boolean(path);
@@ -234,7 +241,7 @@ export class GitDiffService {
       };
 
       if (!allowLargePatch && fileLineCount > this.maxInitialPatchLines) {
-        return createDiffResponse({
+        return {
           files: [{
             ...currentFile,
             canLoadFullPatch: true,
@@ -246,11 +253,12 @@ export class GitDiffService {
             },
             tooLarge: true,
           }],
+          isGitRepo: true,
           metaOnly: false,
           path,
           scope,
           summary,
-        });
+        };
       }
 
       const syntheticFiles = await this.untrackedFileService.buildSyntheticDiffs([currentFile]);
@@ -263,7 +271,7 @@ export class GitDiffService {
         },
       };
 
-      return createDiffResponse({
+      return {
         files: [{
           ...currentFile,
           ...detail,
@@ -271,11 +279,12 @@ export class GitDiffService {
           patchLineCount: countPatchLines(detail),
           tooLarge: false,
         }],
+        isGitRepo: true,
         metaOnly: false,
         path,
         scope,
         summary,
-      });
+      };
     }
 
     let singleFileSummary = null;
@@ -293,7 +302,7 @@ export class GitDiffService {
         && singleFileSummary.filesChanged > 0
         && (singleFileSummary.additions + singleFileSummary.deletions) > this.maxInitialPatchLines
       ) {
-        return createDiffResponse({
+        return {
           files: [{
             ...currentFile,
             canLoadFullPatch: true,
@@ -305,11 +314,12 @@ export class GitDiffService {
             },
             tooLarge: true,
           }],
+          isGitRepo: true,
           metaOnly: false,
           path,
           scope,
           summary: singleFileSummary,
-        });
+        };
       }
     }
 
@@ -378,12 +388,13 @@ export class GitDiffService {
       filesChanged: 0,
     });
 
-    return createDiffResponse({
+    return {
       files: mergedFiles,
+      isGitRepo: true,
       metaOnly: false,
       path,
       scope,
       summary: isSinglePathRequest ? singleFileSummary ?? summary : summary,
-    });
+    };
   }
 }

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

@@ -1,14 +1,20 @@
-import { createGitRequestError } from './errors.js';
+import { execFile as execFileCallback } from 'node:child_process';
+import { access } from 'node:fs/promises';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+
+import { createRequestError as createGitRequestError } from '../http/http-errors.js';
 import { normalizeRelativeGitPath } from './path-utils.js';
-import { GitCommandRunner } from './command-runner.js';
 import { GitDiffService } from './diff-service.js';
 import { GitHistoryService } from './history-service.js';
 import { parseNameStatusOutput } from './parsers.js';
-import { createEmptyWorkspaceChange, createWorkspaceChange } from './responses.js';
+import { createEmptyWorkspaceChange, createWorkspaceChange } from '../../../domain/workspace-change.js';
 import { GitStatusService } from './status-service.js';
 import { GitUntrackedFileService } from './untracked-files.js';
 import { PullBackupStore } from '../persistence/pull-backup-store.js';
 
+const execFile = promisify(execFileCallback);
+
 function buildAuthorEnv(author = null) {
   const name = String(author?.name ?? '').trim();
   const email = String(author?.email ?? '').trim();
@@ -35,12 +41,36 @@ export class GitService {
     statusCacheTtlMs = 2_000,
     vaultDir,
   }) {
-    this.commandRunner = new GitCommandRunner({
-      commandEnv,
-      enabled,
-      execFileImpl,
-      vaultDir,
-    });
+    const gitExecFile = execFileImpl ?? execFile;
+    this.commandRunner = {
+      async isGitRepo() {
+        if (!enabled) {
+          return false;
+        }
+
+        try {
+          await access(join(vaultDir, '.git'));
+          return true;
+        } catch {
+          return false;
+        }
+      },
+      async execGit(args, { env = null } = {}) {
+        const result = await gitExecFile('git', ['-c', 'core.quotepath=false', ...args], {
+          cwd: vaultDir,
+          encoding: 'utf8',
+          env: {
+            ...process.env,
+            ...(commandEnv ?? {}),
+            ...(env ?? {}),
+          },
+          maxBuffer: 5 * 1024 * 1024,
+          timeout: 10_000,
+        });
+
+        return String(result.stdout ?? '');
+      },
+    };
     this.untrackedFileService = new GitUntrackedFileService({ vaultDir });
     this.statusService = new GitStatusService({
       commandRunner: this.commandRunner,
@@ -165,7 +195,7 @@ export class GitService {
       throw createGitRequestError(409, 'No upstream branch is configured for pull');
     }
 
-    const beforeRef = await this.getHeadRef();
+    const beforeRef = await this.resolveRef('HEAD');
     await this.fetchUpstream(status.branch.upstream);
 
     const targetRef = await this.resolveRef(status.branch.upstream);
@@ -177,7 +207,7 @@ export class GitService {
       throw createGitRequestError(
         409,
         'Cannot pull because local and remote commits have diverged; fast-forward only pull is not possible.',
-        'pull_diverged_ff_only',
+        { requestCode: 'pull_diverged_ff_only' },
       );
     }
 
@@ -205,7 +235,7 @@ export class GitService {
       throw await this.classifyPullError(error);
     }
 
-    const afterRef = await this.getHeadRef();
+    const afterRef = await this.resolveRef('HEAD');
     this.invalidateStatusCache();
     return {
       afterRef,
@@ -220,31 +250,15 @@ export class GitService {
   async resetFileToHead(path) {
     const normalizedPath = normalizeRelativeGitPath(path);
     const sourceRef = 'HEAD';
-    const existsOnSource = await this.pathExistsAtRef(sourceRef, normalizedPath);
-
-    if (existsOnSource) {
-      await this.commandRunner.execGit(['restore', '--source', sourceRef, '--staged', '--worktree', '--', normalizedPath]);
-      this.invalidateStatusCache();
-      return {
-        ok: true,
-        path: normalizedPath,
-        sourceRef,
-        workspaceChange: createWorkspaceChange({
-          changedPaths: [normalizedPath],
-        }),
-      };
-    }
-
-    await this.commandRunner.execGit(['rm', '-f', '--ignore-unmatch', '--', normalizedPath]);
-    await this.commandRunner.execGit(['clean', '-f', '--', normalizedPath]);
+    const existsOnSource = await this.restorePathToHead(normalizedPath);
     this.invalidateStatusCache();
     return {
       ok: true,
       path: normalizedPath,
       sourceRef,
-      workspaceChange: createWorkspaceChange({
-        deletedPaths: [normalizedPath],
-      }),
+      workspaceChange: createWorkspaceChange(existsOnSource
+        ? { changedPaths: [normalizedPath] }
+        : { deletedPaths: [normalizedPath] }),
     };
   }
 
@@ -279,15 +293,6 @@ export class GitService {
     return this.historyService.getFileSnapshot({ hash, path });
   }
 
-  async getHeadRef() {
-    try {
-      const output = await this.commandRunner.execGit(['rev-parse', 'HEAD']);
-      return output.trim() || null;
-    } catch {
-      return null;
-    }
-  }
-
   async pathExistsAtRef(ref, path) {
     try {
       await this.commandRunner.execGit(['cat-file', '-e', `${ref}:${path}`]);
@@ -314,7 +319,7 @@ export class GitService {
   }
 
   async canFastForwardTo(targetRef) {
-    const headRef = await this.getHeadRef();
+    const headRef = await this.resolveRef('HEAD');
     if (!headRef || !targetRef || headRef === targetRef) {
       return true;
     }
@@ -436,11 +441,12 @@ export class GitService {
 
     if (existsOnSource) {
       await this.commandRunner.execGit(['restore', '--source', sourceRef, '--staged', '--worktree', '--', normalizedPath]);
-      return;
+      return true;
     }
 
     await this.commandRunner.execGit(['rm', '-f', '--ignore-unmatch', '--', normalizedPath]);
     await this.commandRunner.execGit(['clean', '-f', '--', normalizedPath]);
+    return false;
   }
 
   async hasConflictedStatus() {
@@ -455,7 +461,7 @@ export class GitService {
       return createGitRequestError(
         409,
         'Pull applied remote updates, but reapplying local changes caused conflicts. Review the conflicted files and the pull backup summary.',
-        'pull_conflicted_after_autostash',
+        { requestCode: 'pull_conflicted_after_autostash' },
       );
     }