From 86afffe01f6f9c28207a3c712f5cddad10332987 Mon Sep 17 00:00:00 2001 From: David Brailovsky Date: Wed, 8 Jul 2026 18:23:22 +0200 Subject: [PATCH] fix fork menu allowing user to double select an entry (#6430) in cases where forking a session was not immediate due to extensions slowing down teardown, it's possible for the user to select the message to fork more than once and then create multiple session forks. in this fix we close the forking menu before starting the fork process to not allow such behavior. fixes #6321 --- .../coding-agent/src/modes/interactive/interactive-mode.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/coding-agent/src/modes/interactive/interactive-mode.ts b/packages/coding-agent/src/modes/interactive/interactive-mode.ts index 996d6a999..e1ebf007a 100644 --- a/packages/coding-agent/src/modes/interactive/interactive-mode.ts +++ b/packages/coding-agent/src/modes/interactive/interactive-mode.ts @@ -4493,19 +4493,17 @@ export class InteractiveMode { const selector = new UserMessageSelectorComponent( userMessages.map((m) => ({ id: m.entryId, text: m.text })), async (entryId) => { + done(); try { const result = await this.runtimeHost.fork(entryId); if (result.cancelled) { - done(); this.ui.requestRender(); return; } this.editor.setText(result.selectedText ?? ""); - done(); this.showStatus("Forked to new session"); } catch (error: unknown) { - done(); this.showError(error instanceof Error ? error.message : String(error)); } },