@@ -1301,7 +1301,7 @@
 	},
 	"services/code-index/__tests__/manager.spec.ts": {
 		"@typescript-eslint/no-explicit-any": {
-			"count": 87
+			"count": 84
 		}
 	},
 	"services/code-index/__tests__/orchestrator.spec.ts": {
 
@@ -81,6 +81,33 @@ describe("EmbedderReadinessManager", () => {
 		expect(stateManager.setSystemState).not.toHaveBeenCalled()
 	})
 
+	it.each(["invalidation", "newer validation", "status change"] as const)(
+		"ignores a pending rejection after %s",
+		async (scenario) => {
+			const { stateManager, manager, serviceFactory, embedder } = setup()
+			let rejectValidation!: (error: Error) => void
+			vi.mocked(serviceFactory.validateEmbedder).mockReturnValueOnce(
+				new Promise((_, reject) => {
+					rejectValidation = reject
+				}),
+			)
+			const validation = manager.validate(serviceFactory, embedder)
+
+			if (scenario === "invalidation") {
+				manager.invalidate()
+			} else if (scenario === "newer validation") {
+				vi.mocked(serviceFactory.validateEmbedder).mockResolvedValueOnce({ valid: true })
+				await manager.validate(serviceFactory, embedder)
+			} else {
+				stateManager.state = "Indexed"
+			}
+
+			rejectValidation(new Error("Stale rejection"))
+			await expect(validation).resolves.toBeUndefined()
+			expect(stateManager.setSystemState).not.toHaveBeenCalled()
+		},
+	)
+
 	it("ignores a pending result after invalidation", async () => {
 		const { stateManager, manager, serviceFactory, embedder } = setup()
 		let finishValidation!: (result: { valid: boolean; error?: string }) => void
 
@@ -3,6 +3,8 @@ import { makeExtensionContext } from "../../../test-utils/vscode"
 import { CodeIndexManager } from "../manager"
 import { CodeIndexManagerRegistry } from "../code-index-manager-registry"
 import { CodeIndexServiceFactory } from "../service-factory"
+import { CodeIndexOrchestrator } from "../orchestrator"
+import { CodeIndexSearchService } from "../search-service"
 import type { MockedClass } from "vitest"
 import * as path from "path"
 import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
@@ -482,13 +484,13 @@ describe("CodeIndexManager - handleSettingsChange regression", () => {
 				}),
 			)
 
-			await (manager as any)._recreateServices()
+			await manager["_recreateServices"]()
 
 			expect(mockServiceFactoryInstance.createServices).toHaveBeenCalled()
 			expect(mockServiceFactoryInstance.validateEmbedder).toHaveBeenCalledWith(mockEmbedder)
 			expect(mockStateManager.setSystemState).not.toHaveBeenCalledWith("Error", expect.any(String))
-			expect((manager as any)._orchestrator).toBeDefined()
-			expect((manager as any)._searchService).toBeDefined()
+			expect(manager["_orchestrator"]).toBeInstanceOf(CodeIndexOrchestrator)
+			expect(manager["_searchService"]).toBeInstanceOf(CodeIndexSearchService)
 
 			finishValidation({ valid: true })
 			await Promise.resolve()
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@`
`1301`	`1301`	`},`
`1302`	`1302`	`"services/code-index/__tests__/manager.spec.ts": {`
`1303`	`1303`	`"@typescript-eslint/no-explicit-any": {`
`1304`		`- "count": 87`
	`1304`	`+ "count": 84`
`1305`	`1305`	`}`
`1306`	`1306`	`},`
`1307`	`1307`	`"services/code-index/__tests__/orchestrator.spec.ts": {`