@@ -510,7 +510,11 @@ export abstract class ShadowCheckpointService extends EventEmitter {
 				if (mode !== "100644" && mode !== "100755") {
 					throw new Error(`restoreFile target is not a regular file in the checkpoint: ${filePath}`)
 				}
-				await this.git.checkout([commitHash, "--", gitPath])
+				// The checkout pathspec must be literal too: a filename containing
+				// glob characters ([a].ts, foo?bar.ts) would otherwise match - or
+				// miss - other files, restoring more (or the wrong file) than the
+				// single requested path.
+				await this.git.checkout([commitHash, "--", `:(literal)${gitPath}`])
 			} else {
 				await fs.rm(path.join(this.workspaceDir, filePath), { force: true })
 			}
 
@@ -280,6 +280,28 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
 				expect(await fs.readFile(testFile, "utf-8")).toBe("Ahoy, world!")
 			})
 
+			it("restores exactly the requested file when its name contains glob characters", async () => {
+				// A plain pathspec treats [a].ts as a character class matching
+				// a.ts, so checkout would restore the wrong file and leave the
+				// requested one modified. The restore contract is exactly one
+				// path: the checkout pathspec must be literal.
+				const workspaceDir = path.dirname(testFile)
+				const globFile = path.join(workspaceDir, "[a].ts")
+				const plainFile = path.join(workspaceDir, "a.ts")
+				await fs.writeFile(globFile, "glob content")
+				await fs.writeFile(plainFile, "plain content")
+				const commit = await service.saveCheckpoint("Glob-name checkpoint")
+				expect(commit?.commit).toBeTruthy()
+
+				await fs.writeFile(globFile, "glob modified")
+				await fs.writeFile(plainFile, "plain modified")
+
+				await service.restoreFile(commit!.commit, "[a].ts")
+
+				expect(await fs.readFile(globFile, "utf-8")).toBe("glob content")
+				expect(await fs.readFile(plainFile, "utf-8")).toBe("plain modified")
+			})
+
 			it("rejects a target that escapes the workspace through a symlinked ancestor", async () => {
 				// A lexical prefix check passes for a path that goes through a
 				// symlink inside the workspace pointing outside it; the resolved
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,11 @@ export abstract class ShadowCheckpointService extends EventEmitter {`
`510`	`510`	`if (mode !== "100644" && mode !== "100755") {`
`511`	`511`	throw new Error(`restoreFile target is not a regular file in the checkpoint: ${filePath}`)
`512`	`512`	`}`
`513`		`- await this.git.checkout([commitHash, "--", gitPath])`
	`513`	`+ // The checkout pathspec must be literal too: a filename containing`
	`514`	`+ // glob characters ([a].ts, foo?bar.ts) would otherwise match - or`
	`515`	`+ // miss - other files, restoring more (or the wrong file) than the`
	`516`	`+ // single requested path.`
	`517`	+ await this.git.checkout([commitHash, "--", `:(literal)${gitPath}`])
`514`	`518`	`} else {`
`515`	`519`	`await fs.rm(path.join(this.workspaceDir, filePath), { force: true })`
`516`	`520`	`}`