[BUG] Git diff status traps focus and feels very buggy.

Preflight Checklist

• [x] I have searched existing issues and this hasn't been reported yet
• [x] This is a single bug report (please file separate reports for different bugs)
• [x] I am using the latest version of Claude Code

What's Wrong?

When I click arrow up/down to navigate my text, it often goes directly to the git diff (even though there's still several lines of text left to navigate through)

It then traps focus and I have to press up arrow sometimes 5-10 times for it to return focus to my message, the current cursor position is then a completely different place and I never know when my arrow down will go to the git diff instead of the next line in my message. It feels EXTREMELY BUGGY and very frustrating.

What Should Happen?

Honestly I just want the git diff gone. If at all it should be there, then focus should only go to it when I am at the VERY END of my message and press down (but honestly I manage my git elsewhere and hate that it's there)

Error Messages/Logs

Steps to Reproduce

Have a git diff, write a longer message to Claude with new lines, use arrow up and down to navigate.

Claude Model

Opus

Is this a regression?

Yes, this worked in a previous version

Last Working Version

_No response_

Claude Code Version

2.1.19

Platform

Anthropic API

Operating System

Ubuntu/Debian Linux

Terminal/Shell

WSL (Windows Subsystem for Linux)

Additional Information

_No response_