[oleg68]

Summary

• Reported symptom (GrandOrgue project): a choice dialog (e.g. Bash-command permission prompt) flickers — after it appears, the remaining terminal area resizes, a "different" dialog is detected and shown, it resizes again, and so on in a loop.
• Root cause: ChoiceMenuPanel resizes the terminal to fit itself. That resize makes Claude Code's Ink renderer re-wrap the same dialog at the new column width (confirmed against the existing git-commit-bash-dialog / git-commit-bash-dialog-narrow fixtures, where only one option's wrapped text differs). The controller applied any detected difference immediately, so the reflowed variant replaced the menu just shown, triggering another resize → another reflow → loop. (Scrollback/history-buffer access was not the issue — detectChoiceMenu only ever needs the live viewport, which was already read under JediTerm's buffer lock.)
• Fix: ClaudeSessionController now requires a replacement candidate that differs from the currently active menu to be seen on two consecutive polls before it replaces the active menu. A first-time show (no menu currently active) is still applied immediately — only replacing an already-shown menu is debounced. Since withholding the replacement prevents the resize that caused the divergence, the screen naturally reverts to the original menu on the next poll for one-off reflow artifacts, while genuinely new dialogs still get applied once confirmed.

Test plan

• Added a regression test reproducing the flicker using the real git-commit-bash-dialog / -narrow dialog text (confirmed failing before the fix, passing after)
• Added a test confirming a genuinely different menu is still applied after two consecutive confirmations (debounce doesn't block legitimate replacements)
• mvn test — full suite green
• mvn package — full build succeeds

🤖 Generated with Claude Code