Don't swallow any exceptions in CheckpointService

Author: cte

src/services/checkpoints/CheckpointService.ts

@@ -61,49 +61,34 @@ export class CheckpointService {
 	) {}
 
 	private async pushStash() {
-		try {
-			const status = await this.git.status()
+		const status = await this.git.status()
 
-			if (status.files.length > 0) {
-				await this.git.stash(["-u"]) // Stash tracked and untracked files.
-				return true
-			} else {
-				return undefined
-			}
-		} catch (err) {
-			this.log(`[pushStash] Failed to stash changes: ${err instanceof Error ? err.message : String(err)}`)
+		if (status.files.length > 0) {
+			await this.git.stash(["-u"]) // Stash tracked and untracked files.
+			return true
+		} else {
 			return false
 		}
 	}
 
 	private async applyStash() {
-		try {
-			const stashList = await this.git.stashList()
+		const stashList = await this.git.stashList()
 
-			if (stashList.all.length > 0) {
-				await this.git.stash(["apply"]) // Apply the most recent stash.
-				return true
-			} else {
-				return undefined
-			}
-		} catch (err) {
-			this.log(`[applyStash] Failed to apply stash: ${err instanceof Error ? err.message : String(err)}`)
+		if (stashList.all.length > 0) {
+			await this.git.stash(["apply"]) // Apply the most recent stash.
+			return true
+		} else {
 			return false
 		}
 	}
 
 	private async popStash() {
-		try {
-			const stashList = await this.git.stashList()
+		const stashList = await this.git.stashList()
 
-			if (stashList.all.length > 0) {
-				await this.git.stash(["pop"]) // Pop the most recent stash.
-				return true
-			} else {
-				return undefined
-			}
-		} catch (err) {
-			this.log(`[popStash] Failed to pop stash: ${err instanceof Error ? err.message : String(err)}`)
+		if (stashList.all.length > 0) {
+			await this.git.stash(["pop"]) // Pop the most recent stash.
+			return true
+		} else {
 			return false
 		}
 	}
@@ -141,27 +126,31 @@ export class CheckpointService {
 			return undefined
 		}
 
-		try {
-			// Get the latest commit on the hidden branch before we reset it.
-			const latestHash = await this.git.revparse([this.hiddenBranch]) // git rev-parse <hiddenBranch>
+		// Get the latest commit on the hidden branch before we reset it.
+		const latestHash = await this.git.revparse([this.hiddenBranch]) // git rev-parse <hiddenBranch>
+		await this.git.checkout(this.hiddenBranch) // git checkout <hiddenBranch>
 
+		const reset = async () => {
+			await this.git.reset(["HEAD", "."]) // git reset HEAD .
+			await this.git.clean([CleanOptions.FORCE, CleanOptions.RECURSIVE]) // git clean -f -d
+			await this.git.reset(["--hard", latestHash]) // git reset --hard <latestHash>
+			await this.git.checkout(this.mainBranch) // git checkout <mainBranch>
+			await this.popStash() // git stash pop
+		}
+
+		try {
 			// Reset hidden branch to match main and apply the pending changes.
-			await this.git.checkout(this.hiddenBranch) // git checkout <hiddenBranch>
 			await this.git.reset(["--hard", this.mainBranch]) // git reset --hard <mainBranch>
 			await this.applyStash() // git stash apply 0
 
-			// If the diff is empty and there are no untracked files then we
-			// don't need to commit.
 			await this.git.add(["."]) // git add .
 			const diff = await this.git.diff([latestHash]) // git diff <latestHash>
 
 			if (!diff) {
+				// If the diff is empty and there are no untracked files then we
+				// don't need to commit.
 				this.log(`[saveCheckpoint] Diff is empty, no untracked files`)
-				await this.git.reset(["HEAD", "."]) // git reset HEAD .
-				await this.git.clean([CleanOptions.FORCE, CleanOptions.RECURSIVE]) // git clean -f -d
-				await this.git.reset(["--hard", latestHash]) // git reset --hard <latestHash>
-				await this.git.checkout(this.mainBranch) // git checkout <mainBranch>
-				await this.popStash() // git stash pop
+				await reset()
 				return undefined
 			}
 
@@ -173,13 +162,18 @@ export class CheckpointService {
 			await this.popStash()
 			return commit
 		} catch (err) {
-			// Ensure we return to main branch and pop stash even if something
-			// fails.
-			// @TODO: Disable checkpoints since we encountered an error.
 			this.log(`[saveCheckpoint] Failed to save checkpoint: ${err instanceof Error ? err.message : String(err)}`)
-			await this.git.reset(["HEAD", "."]) // git reset HEAD .
-			await this.git.checkout(this.mainBranch) // git checkout <mainBranch>
-			await this.popStash() // git stash pop
+
+			// If we're not on the main branch, we need to trigger a reset
+			// (equivalent to the empty diff case above).
+			// This ensures that we return to the main branch and restore the
+			// pending changes.
+			const currentBranch = await this.git.revparse(["--abbrev-ref", "HEAD"])
+
+			if (currentBranch.trim() !== this.mainBranch) {
+				await reset()
+			}
+
 			throw err
 		}
 	}

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

@@ -167,20 +167,6 @@ describe("CheckpointService", () => {
 		)
 	})
 
-	it("handles stash failures gracefully", async () => {
-		await fs.writeFile(testFile, "Stash failure incoming!")
-
-		// Mock git stash to simulate failure.
-		jest.spyOn(git, "stash").mockRejectedValue(new Error("Simulated stash failure"))
-
-		// Attempt to save checkpoint.
-		const commit = await service.saveCheckpoint("test")
-		expect(commit).toBeUndefined()
-
-		// Verify working directory is unchanged.
-		expect(await fs.readFile(testFile, "utf-8")).toEqual("Stash failure incoming!")
-	})
-
 	it("cleans up staged files if a commit fails", async () => {
 		await fs.writeFile(testFile, "Changed content")