Fix tests

Author: cte

src/services/checkpoints/CheckpointService.ts

@@ -242,37 +242,33 @@ export class CheckpointService {
 	 * repository. Addionally, creates a hidden branch for storing checkpoints.
 	 */
 	private static async initRepo({ taskId, git, baseDir, log }: Required<CheckpointServiceOptions>) {
-		if (!existsSync(path.join(baseDir, ".git"))) {
-			try {
-				await git.init()
-				log(`[ensureGitRepo] Initialized new Git repository at ${baseDir}`)
-
-				// We need at least one file to commit, otherwise the initial
-				// commit will fail, unless we use the `--allow-empty` flag.
-				// However, using an empty commit causes problems when restoring
-				// the checkpoint (i.e. the `git restore` command doesn't work
-				// for empty commits).
-				await fs.writeFile(path.join(baseDir, ".gitkeep"), "")
-				await git.add(".")
-				const commit = await git.commit("Initial commit")
-
-				if (!commit.commit) {
-					throw new Error("Failed to create initial commit")
-				}
-
-				log(`[ensureGitRepo] Initial commit: ${commit.commit}`)
-			} catch (err) {
-				log(
-					`[ensureGitRepo] Failed to initialize repository: ${err instanceof Error ? err.message : String(err)}`,
-				)
-
-				throw err
-			}
+		const isExistingRepo = existsSync(path.join(baseDir, ".git"))
+
+		if (!isExistingRepo) {
+			await git.init()
+			log(`[initRepo] Initialized new Git repository at ${baseDir}`)
 		}
 
 		await git.addConfig("user.name", "Roo Code")
 		await git.addConfig("user.email", "[email protected]")
 
+		if (!isExistingRepo) {
+			// We need at least one file to commit, otherwise the initial
+			// commit will fail, unless we use the `--allow-empty` flag.
+			// However, using an empty commit causes problems when restoring
+			// the checkpoint (i.e. the `git restore` command doesn't work
+			// for empty commits).
+			await fs.writeFile(path.join(baseDir, ".gitkeep"), "")
+			await git.add(".")
+			const commit = await git.commit("Initial commit")
+
+			if (!commit.commit) {
+				throw new Error("Failed to create initial commit")
+			}
+
+			log(`[initRepo] Initial commit: ${commit.commit}`)
+		}
+
 		const currentBranch = await git.revparse(["--abbrev-ref", "HEAD"])
 		const currentSha = await git.revparse(["HEAD"])
 

src/services/checkpoints/__tests__/CheckpointService.test.ts

@@ -4,7 +4,7 @@ import fs from "fs/promises"
 import path from "path"
 import os from "os"
 
-import { CommitResult, simpleGit, SimpleGit } from "simple-git"
+import { simpleGit, SimpleGit } from "simple-git"
 
 import { CheckpointService } from "../CheckpointService"
 
@@ -57,8 +57,9 @@ describe("CheckpointService", () => {
 
 		const checkpoints = await service.listCheckpoints()
 		expect(checkpoints.length).toBe(2)
-		expect(checkpoints[0].message).toBe(commitMessage)
-		expect(checkpoints[0].hash).toBe(commit?.commit)
+		const checkpoint = checkpoints.find(({ message }) => message === commitMessage)
+		expect(checkpoint).toBeDefined()
+		expect(checkpoint?.hash).toBe(commit?.commit)
 	})
 
 	it("saves and restores checkpoints", async () => {