[Maxaubert]

Closes #477

Pure refactor of FocusTracker::run (src/focus_track.cpp, 411 lines) from the 2026-10-13 repo review ("Second-tier oversized functions"). Move-only: same side-effect order, same early returns, same logging and timing (slow resolve, rs0/rs1/fc0/fc1), same thread (everything still runs on the tracker thread).

Shape

run()'s locals become members of a private helper struct FocusRun (same declarations, same order, same comments; h1..h3 now start null and are assigned in setUp). Its five lambdas become member functions with unchanged bodies. The tracker members the moved code uses (tid_, active_, wantCaret_, wantFocus_, log_, publish) are aliased in FocusRun, so the moved lines are byte-identical. FocusTracker gets friend struct FocusRun;.

Functions (line ranges in the new src/focus_track.cpp)

Function	Lines	Size	Was
FocusRun (struct: aliases, state, steps)	307-673		run()'s locals
FocusRun::retune	332-338	7	retune lambda
FocusRun::fixLineWide	387-404	18	lambda
FocusRun::focusClass	423-437	15	lambda
FocusRun::editContextCaret	440-458	19	lambda
FocusRun::findCaret	460-514	55	lambda
FocusRun::readJavaCaret	518-543	26	Java bridge block at the top of resolve
FocusRun::resolve	548-594	47 (was 143)	lambda
FocusRun::followCaret	596-672	77	step 2 of resolve (find caret, trim/hold, baseline or publish)
FocusRun::setUp	675-696	22	COM, UIA timeouts, FocusLookup, focus handler, WinEvent hooks, first retune
FocusRun::messageLoop	698-735	38	the GetMessageW loop
FocusRun::tearDown	737-745	9	unhook, release, CoUninitialize
FocusTracker::run	747-758	12 (was 411)	queue + thread-id prologue, setUp/messageLoop/tearDown, tid_ = 0

Construction and destruction order are unchanged in effect: FocusRun is built after the stop check and before CoInitializeEx (its members have no side-effecting constructors; JavaBridge has none), and it is destroyed at the end of run() after tid_ = 0, where the locals used to be.

How move-only was checked

Per commit, the diff was taken with --color-moved=plain (moved lines coloured separately) and only the non-moved +/- lines listed. What remained was only: the struct header and aliases, auto x = [&](...) -> R { to R x(...) { (and }; to }), HWINEVENTHOOK hN = SetWinEventHook(...) to hN = SetWinEventHook(...), the new function heads and braces, return java;, and the call sites (const bool java = readJavaCaret(fg, fromPoll);, followCaret(el, b, fg, java, fromPoll, rs0, rs1);, r.setUp(); r.messageLoop(m); r.tearDown();). Review with --color-moved=zebra --color-moved-ws=allow-indentation-change.

Commits: one for the struct move, one per resolve extraction, one for docs (docs/architecture/07-cursor.md now names the steps).

Gates

• build.bat check: pass (only the existing fopen C4996 warnings)
• build.bat test: exit 0, 643/643 test cases
• build.bat: links Wind.exe and WindTray.exe
• src/config_ui and ui/ untouched, so no config build or Playwright run

Not deployed or run (no runtime change intended).

🤖 Generated with Claude Code

https://claude.ai/code/session_01TdjopXZfsUiesYxYLYHEdH