DavidAPierce · Oct 1, 2026 · Sep 30, 2026 · Sep 30, 2026 · Sep 30, 2026 · Sep 30, 2026
@@ -336,4 +336,16 @@ describe('GeminiAgent - RPC Dispatcher', () => {
       }),
     ).rejects.toThrow('Session not found: unknown');
   });
+
+  it('should delegate dispose to sessionManager', async () => {
+    const disposeMock = vi.fn().mockResolvedValue(undefined);
+    (agent as unknown as { sessionManager: { dispose: Mock } }).sessionManager =
+      {
+        dispose: disposeMock,
+      };
+
+    await agent.dispose();
+
+    expect(disposeMock).toHaveBeenCalledTimes(1);
+  });
 });
@@ -33,8 +33,8 @@ export class GeminiAgent {
     this.sessionManager = new AcpSessionManager(settings, argv, connection);
   }
 
-  dispose(): void {
-    this.sessionManager.dispose();
+  async dispose(): Promise<void> {
+    await this.sessionManager.dispose();
   }
 
   async initialize(

@@ -1366,4 +1366,18 @@ describe('Session', () => {
       );
     });
   });
+
+  describe('dispose', () => {
+    it('should safely dispose without throwing when config.dispose is undefined', async () => {
+      delete (mockConfig as { dispose?: unknown }).dispose;
+      await expect(session.dispose()).resolves.toBeUndefined();
+    });
+
+    it('should catch rejection when config.dispose rejects', async () => {
+      mockConfig.dispose = vi
+        .fn()
+        .mockRejectedValue(new Error('Disposal failed'));
+      await expect(session.dispose()).resolves.toBeUndefined();
+    });
+  });
 });
@@ -188,12 +188,19 @@ export class Session {
     }
   };
 
-  dispose(): void {
+  async dispose(): Promise<void> {
     coreEvents.off(
       CoreEvent.ApprovalModeChanged,
       this.handleApprovalModeChanged,
     );
     this.disposeController.abort();
+    if (this.context.config?.dispose) {
+      try {
+        await this.context.config.dispose();
+      } catch (err) {
+        debugLogger.error(`Error disposing config: ${err}`);
+      }
+    }
   }
 
   async cancelPendingPrompt(): Promise<void> {