fix(mcp): close project operation races

Julius Marminge committed 2 months ago

Commit e3f2cda1 parent 93b21576 files · +257 −29Browse files

Showing the changes to apps/server/src/sourceControl/SourceControlRepositoryService.ts (1 of 6 files). Show all

Unified · Split

       );
     if (headCommit === null) return false;
-    const remoteCommits = yield* git
+    const remoteCommit = yield* git
       .execute({
         operation: "SourceControlRepositoryService.cloneRepository.verifyRemoteRefs",
         cwd: destinationPath,
-        args: ["for-each-ref", "--format=%(objectname)", "refs/remotes/origin"],
+        args: [
+          "for-each-ref",
+          "--count=1",
+          "--format=%(objectname)",
+          `--points-at=${headCommit}`,
+          "refs/remotes/origin",
+        ],
         timeoutMs: 5_000,
-        maxOutputBytes: 64 * 1024,
+        maxOutputBytes: 1024,
       })
       .pipe(
-        Effect.map((result) => new Set(result.stdout.split("\n").map((line) => line.trim()))),
+        Effect.map((result) => result.stdout.trim() || null),
-        Effect.orElseSucceed(() => new Set<string>()),
+        Effect.orElseSucceed(() => null),
       );
-    if (!remoteCommits.has(headCommit)) return false;
+    if (remoteCommit !== headCommit) return false;
     return yield* git
       .execute({