fix(code-index): dispose all scope resources

Author: WebMad

src/services/code-index/__tests__/code-index-scope.spec.ts

@@ -59,22 +59,31 @@ describe("CodeIndexScope", () => {
 		expect(manager.initialize).toHaveBeenCalledExactlyOnceWith(contextProxy)
 	})
 
-	it("disposes its manager", async () => {
+	it("disposes its resources", async () => {
 		const { scope } = createScope()
 		const codeIndexManager = getManager(scope)
+		const stateManager = vi.mocked(CodeIndexStateManager).mock.results[0].value
 		await scope.dispose()
 		expect(codeIndexManager.dispose).toHaveBeenCalledExactlyOnceWith()
+		expect(stateManager.dispose).toHaveBeenCalledExactlyOnceWith()
 	})
 
-	it("disposes state when manager disposal rejects", async () => {
+	it("continues disposing resources when a disposal rejects", async () => {
 		const { scope } = createScope()
 		const codeIndexManager = getManager(scope)
 		const stateManager = vi.mocked(CodeIndexStateManager).mock.results[0].value
 		const error = new Error("disposal failed")
 		vi.mocked(codeIndexManager.dispose).mockRejectedValue(error)
 
-		await expect(scope.dispose()).rejects.toThrow(error)
+		let caught: unknown
+		try {
+			await scope.dispose()
+		} catch (error) {
+			caught = error
+		}
 
+		expect(caught).toBeInstanceOf(AggregateError)
+		expect((caught as AggregateError).errors).toEqual([error])
 		expect(codeIndexManager.dispose).toHaveBeenCalledOnce()
 		expect(stateManager.dispose).toHaveBeenCalledOnce()
 	})

src/services/code-index/code-index-scope.ts

@@ -4,6 +4,10 @@ import type { ContextProxy } from "../../core/config/ContextProxy"
 import { CodeIndexManager } from "./manager"
 import { CodeIndexStateManager } from "./state-manager"
 
+type Disposable = {
+	dispose(): void | Promise<void>
+}
+
 /** Owns the code-index resources associated with one workspace. */
 export class CodeIndexScope {
 	public readonly codeIndexManager: CodeIndexManager
@@ -20,10 +24,19 @@ export class CodeIndexScope {
 	}
 
 	public async dispose(): Promise<void> {
-		try {
-			await this.codeIndexManager.dispose()
-		} finally {
-			this.stateManager.dispose()
+		const disposables: Disposable[] = [this.codeIndexManager, this.stateManager]
+		const errors: unknown[] = []
+
+		for (const disposable of disposables) {
+			try {
+				await disposable.dispose()
+			} catch (error) {
+				errors.push(error)
+			}
+		}
+
+		if (errors.length > 0) {
+			throw new AggregateError(errors, "Failed to dispose code index scope resources")
 		}
 	}
 }