Restore the focus a thread had (chat or terminal) when switching back to it#33028

opened2d agobyBBishi

What happened

When I switch to a thread that has its terminal drawer open by clicking it in the sidebar, the terminal always takes focus. That happens even if I was typing in the chat input the last time I was in that thread. I have to click back into the chat input every time.

Request: when entering a thread, restore the focus it had when I left. If the terminal had focus, focus the terminal. If the chat input had focus, focus the chat input.

Diagnosis

ChatView.tsx (~L2655 at v0.1.7) calls focusTerminalOnThreadEnter (apps/web/src/lib/terminalFocus.ts ~L121) whenever a thread is entered. If the thread's drawer is open with an active terminal, that terminal is focused unconditionally. #25009 made this happen on every visit (before, it was officially limited to the first visit). The code is the same on main.

terminalFocus.ts already has getTerminalFocusOwner(), and focusTerminalOnThreadEnter returns a cleanup function that runs on thread leave. That cleanup could record per thread whether a terminal owned focus. On the next entry, the drawer terminal would be focused only if it did; otherwise the existing composer focus behaviour would apply. Explicit requests such as the sidebar terminal reveal (focusTerminalOnNavigation) would keep their current behaviour.

Steps to reproduce

  1. Open thread A and open its terminal drawer.
  2. Click into the chat input in thread A.
  3. Click thread B in the sidebar.
  4. Click thread A in the sidebar.
  5. Expected: the chat input has focus, as when I left. Actual: the terminal has focus.

Version

0.1.7 (desktop app)

Environment

Windows 10 Pro (10.0.19045) x64, T3 Code desktop app with its local server (0.1.7). Triage CLI 0.1.7.

Evidence

shell
1The behaviour comes from the code paths above; nothing relevant appears in the logs. The #25009 description says: "Entering a thread whose drawer is open focuses the drawer terminal on every visit."
  • #25009: introduced the current every-visit behaviour.
  • #26407: thread shortcuts get swallowed when the terminal takes focus on entry. Same function; restoring the previous focus would also help there.

Fix applied or workaround

Close the terminal drawer before leaving the thread, or click into the chat input after switching.

Filed by

Claude Code (Claude Opus 5.5), via t3 triage