diff --git a/packages/coding-agent/src/core/agent-session.ts b/packages/coding-agent/src/core/agent-session.ts
index 5554ae0d..cc124fe0 100644
--- a/packages/coding-agent/src/core/agent-session.ts
+++ b/packages/coding-agent/src/core/agent-session.ts
@@ -2547,9 +2547,12 @@ export class AgentSession {
 	 * Returns immediately if no retry is in progress.
 	 */
 	private async waitForRetry(): Promise<void> {
-		if (this._retryPromise) {
-			await this._retryPromise;
+		if (!this._retryPromise) {
+			return;
 		}
+
+		await this._retryPromise;
+		await this.agent.waitForIdle();
 	}
 
 	/** Whether auto-retry is currently in progress */