Hey, thanks for the report. This is a known issue, a few users have reported similar bugs with file sync and Git status:
- AI Agent file review list accumulates stale files and doesn't sync with git status
- Auto-Accept on Commit setting has not been working and it is SUPER annoying. Also files changed forever ago still have pending changes all over the place
The team is working on a fix. Some workarounds that may help:
- Close and reopen the chat
- Restart Cursor after switching branches
- Try copying the whole file
Cmd+A,Cmd+C, undo the changesCmd+Z, then paste it backCmd+V. This clears the stuck state.
For investigation, could you share:
- A screenshot of the changed files list after switching branches
- The Request ID from the latest agent run (chat context menu > Copy Request ID)
- Are you using Agent mode when this happens?
Let me know if the workarounds helped.