Merge main into the PR branch and keep the top-tabs local terminal control as a fallback when the host-tree toolbar is disabled, collapsed, or not on a work surface (Codex review).