Fix tests

Author: cte

src/core/Cline.ts

@@ -3411,8 +3411,15 @@ export class Cline {
 
 			service.on("initialize", () => {
 				try {
+					const isCheckpointNeeded =
+						typeof this.clineMessages.find(({ say }) => say === "checkpoint_saved") === "undefined"
+
 					this.checkpointService = service
-					this.checkpointSave()
+
+					if (isCheckpointNeeded) {
+						log("[Cline#initializeCheckpoints] no checkpoints found, saving initial checkpoint")
+						this.checkpointSave()
+					}
 				} catch (err) {
 					log("[Cline#initializeCheckpoints] caught error in on('initialize'), disabling checkpoints")
 					this.enableCheckpoints = false

src/services/checkpoints/RepoPerWorkspaceCheckpointService.ts

@@ -31,15 +31,26 @@ export class RepoPerWorkspaceCheckpointService extends ShadowCheckpointService {
 	}
 
 	override async initShadowGit() {
-		await super.initShadowGit()
+		const result = await super.initShadowGit()
 		await this.checkoutTaskBranch()
+		return result
+	}
+
+	override async saveCheckpoint(message: string) {
+		await this.checkoutTaskBranch()
+		return super.saveCheckpoint(message)
 	}
 
 	override async restoreCheckpoint(commitHash: string) {
 		await this.checkoutTaskBranch()
 		await super.restoreCheckpoint(commitHash)
 	}
 
+	override async getDiff({ from, to }: { from?: string; to?: string }) {
+		await this.checkoutTaskBranch()
+		return super.getDiff({ from, to })
+	}
+
 	public static create({ taskId, workspaceDir, shadowDir, log = console.log }: CheckpointServiceOptions) {
 		const workspaceHash = crypto.createHash("sha256").update(workspaceDir).digest("hex").toString()
 

src/services/checkpoints/ShadowCheckpointService.ts

@@ -57,7 +57,7 @@ export abstract class ShadowCheckpointService extends EventEmitter {
 
 	public async initShadowGit() {
 		if (this.git) {
-			return
+			throw new Error("Shadow git repo already initialized")
 		}
 
 		await fs.mkdir(this.checkpointsDir, { recursive: true })
@@ -119,7 +119,7 @@ export abstract class ShadowCheckpointService extends EventEmitter {
 			await fs.mkdir(path.join(this.dotGitDir, "info"), { recursive: true })
 			const excludesPath = path.join(this.dotGitDir, "info", "exclude")
 			await fs.writeFile(excludesPath, [...GIT_EXCLUDES, ...lfsPatterns].join("\n"))
-			await this.stageAll()
+			await this.stageAll(git)
 			const { commit } = await git.commit("initial commit", { "--allow-empty": null })
 			this.baseHash = commit
 			this.log(`[${this.constructor.name}#initShadowGit] base commit is ${commit}`)
@@ -139,18 +139,16 @@ export abstract class ShadowCheckpointService extends EventEmitter {
 			created,
 			duration,
 		})
-	}
 
-	private async stageAll() {
-		if (!this.git) {
-			throw new Error("Shadow git repo not initialized")
-		}
+		return { created, duration }
+	}
 
+	private async stageAll(git: SimpleGit) {
 		// await writeExcludesFile(gitPath, await getLfsPatterns(this.cwd)).
 		await this.renameNestedGitRepos(true)
 
 		try {
-			await this.git.add(".")
+			await git.add(".")
 		} catch (error) {
 			this.log(
 				`[${this.constructor.name}#stageAll] failed to add files to git: ${error instanceof Error ? error.message : String(error)}`,
@@ -222,7 +220,7 @@ export abstract class ShadowCheckpointService extends EventEmitter {
 			}
 
 			const startTime = Date.now()
-			await this.stageAll()
+			await this.stageAll(this.git)
 			const result = await this.git.commit(message)
 			const isFirst = this._checkpoints.length === 0
 			const fromHash = this._checkpoints[this._checkpoints.length - 1] ?? this.baseHash!
@@ -282,7 +280,7 @@ export abstract class ShadowCheckpointService extends EventEmitter {
 		}
 
 		// Stage all changes so that untracked files appear in diff summary.
-		await this.stageAll()
+		await this.stageAll(this.git)
 
 		const { files } = to ? await this.git.diffSummary([`${from}..${to}`]) : await this.git.diffSummary([from])
 

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

@@ -14,7 +14,7 @@ jest.mock("globby", () => ({
 	globby: jest.fn().mockResolvedValue([]),
 }))
 
-const tmpDir = path.join(os.tmpdir(), "test-ShadowCheckpointService")
+const tmpDir = path.join(os.tmpdir(), "CheckpointService")
 
 const initRepo = async ({
 	workspaceDir,
@@ -311,10 +311,11 @@ describe.each([
 			expect(await fs.readFile(newTestFile, "utf-8")).toBe("Hello, world!")
 
 			// Ensure the git repository was initialized.
-			const gitDir = path.join(shadowDir, "tasks", taskId, "checkpoints", ".git")
-			await expect(fs.stat(gitDir)).rejects.toThrow()
 			const newService = await klass.create({ taskId, shadowDir, workspaceDir, log: () => {} })
-			await newService.initShadowGit()
+			const { created } = await newService.initShadowGit()
+			expect(created).toBeTruthy()
+
+			const gitDir = path.join(newService.checkpointsDir, ".git")
 			expect(await fs.stat(gitDir)).toBeTruthy()
 
 			// Save a new checkpoint: Ahoy, world!