@@ -820,6 +820,7 @@ export class ClineProvider
 	*/
 	private clearWebviewResources() {
 		this.rejectPendingThemeFixtureProbes(new Error("Webview was disposed before the theme fixture probe completed"))
+		this.stopWebviewWatchdog()
 		while (this.webviewDisposables.length) {
 			const x = this.webviewDisposables.pop()
 			if (x) {
@@ -846,10 +847,7 @@ export class ClineProvider
 
 		this._disposed = true
 		this._postStateToWebviewThrottled.cancel()
-		if (this.webviewWatchdogInterval) {
-			clearInterval(this.webviewWatchdogInterval)
-			this.webviewWatchdogInterval = null
-		}
+		this.stopWebviewWatchdog()
 		this.log("Disposing ClineProvider...")
 
 		// Reject any tasks still waiting for a scheduler permit so they don't
@@ -1143,6 +1141,11 @@ export class ClineProvider
 				} else {
 					this.log("Clearing webview resources for sidebar view")
 					this.clearWebviewResources()
+					if (this.view === webviewView) {
+						// Drop the disposed view so nothing keeps polling it
+						// (e.g. the recovery watchdog) for the provider's lifetime.
+						this.view = undefined
+					}
 					// Reset current workspace manager reference when view is disposed
 					this.codeIndexManager = undefined
 				}
@@ -3421,6 +3424,14 @@ export class ClineProvider
 		}, ClineProvider.WEBVIEW_WATCHDOG_TICK_MS)
 	}
 
+	/** Stops the renderer heartbeat watchdog; the webview it watches is gone. */
+	private stopWebviewWatchdog(): void {
+		if (this.webviewWatchdogInterval) {
+			clearInterval(this.webviewWatchdogInterval)
+			this.webviewWatchdogInterval = null
+		}
+	}
+
 	/**
 	 * Reloads only this provider's own webview by regenerating its HTML (fresh
 	 * nonce) and reassigning `webview.html`, which forces VS Code to reload that
 
@@ -527,10 +527,7 @@ describe("ClineProvider", () => {
 				cspSource: "vscode-webview://test-csp-source",
 			},
 			visible: true,
-			onDidDispose: vi.fn().mockImplementation((callback) => {
-				callback()
-				return { dispose: vi.fn() }
-			}),
+			onDidDispose: vi.fn(),
 			onDidChangeVisibility: vi.fn().mockImplementation(() => {
 				return { dispose: vi.fn() }
 			}),
@@ -665,6 +662,7 @@ describe("ClineProvider", () => {
 
 	describe("webview heartbeat watchdog", () => {
 		let visibilityCallback: () => void
+		let disposeCallback: () => void
 
 		beforeEach(() => {
 			// Fake timers must be active before resolveWebviewView so the
@@ -674,6 +672,10 @@ describe("ClineProvider", () => {
 				visibilityCallback = cb
 				return { dispose: vi.fn() }
 			})
+			mockWebviewView.onDidDispose = vi.fn().mockImplementation((cb: () => void) => {
+				disposeCallback = cb
+				return { dispose: vi.fn() }
+			})
 		})
 
 		afterEach(async () => {
@@ -743,6 +745,23 @@ describe("ClineProvider", () => {
 			expect(mockWebviewView.webview.html).toBe(htmlAfterResolve)
 		})
 
+		test("stops watching and clears the view when the sidebar webview is disposed", async () => {
+			await provider.resolveWebviewView(mockWebviewView)
+			const htmlAfterResolve = mockWebviewView.webview.html
+
+			// The provider outlives a disposed sidebar view; VS Code re-resolves
+			// a fresh view later. Disposal must stop the watchdog and drop the
+			// stale view reference so no recovery reload targets the dead view.
+			disposeCallback()
+			expect(provider["webviewWatchdogInterval"]).toBeNull()
+			// @ts-ignore - accessing private property for testing
+			expect(provider.view).toBeUndefined()
+
+			await vi.advanceTimersByTimeAsync(180_000)
+
+			expect(mockWebviewView.webview.html).toBe(htmlAfterResolve)
+		})
+
 		test("does not stack watchdog intervals when resolveWebviewView runs again", async () => {
 			await provider.resolveWebviewView(mockWebviewView)
 			await provider.resolveWebviewView(mockWebviewView)
@@ -781,10 +800,7 @@ describe("ClineProvider", () => {
 					cspSource: "vscode-webview://test-csp-source",
 				},
 				visible: true,
-				onDidDispose: vi.fn().mockImplementation((callback: () => void) => {
-					callback()
-					return { dispose: vi.fn() }
-				}),
+				onDidDispose: vi.fn(),
 				onDidChangeVisibility: vi.fn().mockImplementation(() => ({ dispose: vi.fn() })),
 			} as unknown as vscode.WebviewView
 			const providerB = new ClineProvider(
@@ -801,7 +817,8 @@ describe("ClineProvider", () => {
 				const htmlBeforeB = mockWebviewViewB.webview.html
 
 				await vi.advanceTimersByTimeAsync(119_000)
-				// Keep provider B's heartbeat fresh so only A's watchdog fires.
+				// B's view is still alive; refresh its heartbeat so a stale one
+				// would reload it too, leaving only A's watchdog to fire.
 				await webviewMessageHandler(providerB, { type: "webviewHeartbeat", timestamp: Date.now() })
 				await vi.advanceTimersByTimeAsync(1_000)
 
@@ -3867,10 +3884,7 @@ describe("ClineProvider - Router Models", () => {
 				asWebviewUri: vi.fn(),
 			},
 			visible: true,
-			onDidDispose: vi.fn().mockImplementation((callback) => {
-				callback()
-				return { dispose: vi.fn() }
-			}),
+			onDidDispose: vi.fn(),
 			onDidChangeVisibility: vi.fn().mockImplementation(() => {
 				return { dispose: vi.fn() }
 			}),
@@ -4221,10 +4235,7 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 				asWebviewUri: vi.fn(),
 			},
 			visible: true,
-			onDidDispose: vi.fn().mockImplementation((callback) => {
-				callback()
-				return { dispose: vi.fn() }
-			}),
+			onDidDispose: vi.fn(),
 			onDidChangeVisibility: vi.fn().mockImplementation(() => {
 				return { dispose: vi.fn() }
 			}),