fix(git): clean up handoff artifact directories

Generated-By: PostHog Code
Task-Id: b73fc361-26b5-4bae-8c3c-6e4682d0db91

Author: tatoalo

packages/agent/src/handoff-checkpoint.test.ts

@@ -1,3 +1,5 @@
+import { readdir } from "node:fs/promises";
+import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 import { HandoffCheckpointTracker } from "./handoff-checkpoint";
 import {
@@ -147,6 +149,18 @@ describe("HandoffCheckpointTracker", () => {
     expect(checkpoint).not.toBeNull();
     if (!checkpoint) return;
     expect(Object.keys(store.artifacts).length).toBeGreaterThan(0);
+    const gitCommonDirRaw = await cloudRepo.git([
+      "rev-parse",
+      "--git-common-dir",
+    ]);
+    const gitCommonDir = path.isAbsolute(gitCommonDirRaw)
+      ? gitCommonDirRaw
+      : path.resolve(cloudRepo.path, gitCommonDirRaw);
+    expect(
+      (await readdir(gitCommonDir)).filter((entry) =>
+        entry.startsWith("posthog-code-handoff-"),
+      ),
+    ).toEqual([]);
 
     const applyTracker = createTracker(localRepo.path, apiClient);
     await applyTracker.applyFromHandoff(checkpoint);

packages/agent/src/handoff-checkpoint.ts

@@ -1,6 +1,6 @@
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import {
   type GitHandoffBranchDivergence,
   type GitHandoffCheckpoint,
@@ -101,12 +101,10 @@ export class HandoffCheckpointTracker {
         indexArtifactPath: uploads.index?.storagePath,
       };
     } finally {
-      const tempDir = capture.headPack?.path
-        ? dirname(capture.headPack.path)
-        : dirname(capture.indexFile.path);
-      await this.removeIfPresent(capture.headPack?.path);
-      await this.removeIfPresent(capture.indexFile.path);
-      await rm(tempDir, { recursive: true, force: true }).catch(() => {});
+      await rm(capture.artifactDirectory, {
+        recursive: true,
+        force: true,
+      }).catch(() => {});
     }
   }
 

packages/git/src/handoff.test.ts

@@ -103,10 +103,9 @@ async function makeCloudChanges(
 }
 
 async function cleanupCapture(capture: GitHandoffCaptureResult): Promise<void> {
-  if (capture.headPack?.path) {
-    await rm(capture.headPack.path, { force: true }).catch(() => {});
-  }
-  await rm(capture.indexFile.path, { force: true }).catch(() => {});
+  await rm(capture.artifactDirectory, { recursive: true, force: true }).catch(
+    () => {},
+  );
 }
 
 async function captureAndApply(
@@ -164,6 +163,7 @@ describe("GitHandoffTracker", () => {
       ).trim();
 
       try {
+        expect(path.dirname(capture.artifactDirectory)).toBe(gitCommonDir);
         expect(path.dirname(path.dirname(capture.indexFile.path))).toBe(
           gitCommonDir,
         );

packages/git/src/handoff.ts

@@ -25,6 +25,7 @@ export interface GitHandoffArtifactFile {
 
 export interface GitHandoffCaptureResult {
   checkpoint: GitHandoffCheckpoint;
+  artifactDirectory: string;
   headPack?: GitHandoffArtifactFile;
   indexFile: GitHandoffArtifactFile;
   totalBytes: number;
@@ -136,10 +137,14 @@ export class GitHandoffTracker {
           upstreamMergeRef: tracking.upstreamMergeRef,
           remoteUrl: tracking.remoteUrl,
         },
+        artifactDirectory: tempDir,
         headPack,
         indexFile,
         totalBytes: (headPack?.rawBytes ?? 0) + indexFile.rawBytes,
       };
+    } catch (error) {
+      await rm(tempDir, { recursive: true, force: true }).catch(() => {});
+      throw error;
     } finally {
       await deleteCheckpoint(git, checkpoint.checkpointId).catch(() => {});
     }
@@ -560,7 +565,7 @@ export class GitHandoffTracker {
       "--path-format=absolute",
       "--git-common-dir",
     ]);
-    const resolved = raw.trim();
+    const resolved = raw.trim() || ".git";
     return path.isAbsolute(resolved)
       ? resolved
       : path.resolve(this.repositoryPath, resolved);