Fix remote terminal focus snapping during agent runs by Jinwoo-H · Pull Request #5435 · stablyai/orca

Jinwoo-H · 2026-06-16T00:30:06Z

Summary

Preserve a valid local remote-session tab selection when runtime snapshots only repeat stale host active metadata
Preserve local split-pane focus and active pane title/PTY while remote agent status/title snapshots continue publishing
Add regression coverage for remote terminal tab and split-pane focus stealing

Testing

pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/runtime/web-session-tabs-sync.test.ts
pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/rpc/methods/session-tabs.test.ts src/main/runtime/runtime-rpc.test.ts src/main/runtime/orca-runtime.test.ts src/renderer/src/runtime/web-session-tabs-sync.test.ts src/renderer/src/components/tab-group/useTabGroupWorkspaceModel.focus.test.ts src/renderer/src/store/slices/terminals.test.ts
pnpm exec oxlint --format github
pnpm run typecheck

Note: typecheck passed with the existing local Node engine warning because this shell is on Node v26 while the repo requests Node 24.

Made with Orca 🐋

ghost · 2026-06-16T00:30:32Z

Ready to review this PR? Stage has broken it down into 3 individual chapters for you:

	Title
1	Preserve local split-pane focus during remote snapshots
2	Maintain local tab selection across remote updates
3	Add regression tests for focus preservation

_{Chapters generated by Stage for commit abd4869 on Jun 16, 2026 5:52am UTC.}

coderabbitai · 2026-06-16T00:34:30Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 72789054-fa14-48cf-b579-3863d8da60bd

📥 Commits

Reviewing files that changed from the base of the PR and between 352ce6dbaba6ea903e119c98bd0fb6342b70ef6c and 85938562ec26b777008bfbac3bc7f4f292abac4e.

📒 Files selected for processing (8)

src/renderer/src/components/cmd-j/palette-host-badge.test.ts
src/renderer/src/components/settings/RepositoryHostSetupsSection.test.tsx
src/renderer/src/components/settings/cli-source-control-integration-cards.test.tsx
src/renderer/src/components/settings/provider-rate-limit-scope-panels.test.tsx
src/renderer/src/components/settings/task-tracker-integration-cards.test.tsx
src/renderer/src/components/sidebar/worktree-list-groups.test.ts
src/renderer/src/components/task-source-context-summary.test.ts
src/renderer/src/lib/project-host-setup-options.test.ts

✅ Files skipped from review due to trivial changes (1)

src/renderer/src/components/sidebar/worktree-list-groups.test.ts

📝 Walkthrough

Walkthrough

The change addresses two independent concerns. First, web-session-tabs-sync.ts is updated to preserve local focus state when applying remote session snapshots: chooseRemoteTerminalLayout now accepts an optional existingLayout and reuses its activeLeafId when still valid; buildMirroredTerminalTabs accepts existingLayoutsByTabId to derive activeSurface and pass the existing layout to the layout chooser; and applyWebSessionTabsSnapshot introduces findCurrentVisibleUnifiedTabId to resolve the currently visible unified tab id, adds "current still exists" checks to active tab derivation, prioritises group selection by matching nextActiveUnifiedTabId, and prefers the validated current visible type before snapshot-derived defaults. Two new tests verify these invariants. Second, eight test files across the renderer components are updated to derive the local host display label dynamically from getLocalExecutionHostLabel() instead of hardcoding strings, ensuring test assertions reflect actual runtime values.

🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (2 warnings)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The description covers Summary, Testing, and mentions AI review, but Screenshots and Security Audit sections are missing from the required template sections.	Add Screenshots section (state 'No visual change' if applicable) and Security Audit section with basic security review from AI agent.
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly and concisely describes the main fix: preventing remote terminal focus from snapping during agent runs, which directly addresses the core issue being resolved.
Linked Issues check	✅ Passed	The code changes directly address issue `#5418` by preventing tab focus stealing and preserving local split-pane focus during remote agent operations through improved snapshot reconciliation logic.
Out of Scope Changes check	✅ Passed	All changes are within scope: core fix to web-session-tabs-sync logic, comprehensive test updates, and test file modifications to use dynamic local host labels instead of hardcoded strings.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

Co-authored-by: Orca <help@stably.ai>

A newly created remote terminal/browser tab did not get focus: #5435 made the session-tab reconcile keep the CURRENT active tab over the snapshot's active tab (to stop agent-run status echoes from stealing focus), which also blocked genuine create/activate from taking focus. A transient 'is this tab new' signal couldn't fix it because racing/duplicate snapshots re-applied and snapped focus back. Root cause: the snapshot's activeTabId is overloaded — it means both user-intended focus (on create/activate) and server-side active surface (echoed during agent runs). The client can't tell them apart from the snapshot alone. Fix — client-initiated focus intent (the durable version of what mobile already does with pendingActiveSessionTabIdRef): - web-session-focus-intent.ts: a small per-worktree store of the host tab id the client expects to focus, persisting until a snapshot matches it. - createWebRuntimeSessionTerminal / createWebRuntimeSessionBrowserTab record the intent when they create with activate. - applyWebSessionTabsSnapshot honors the snapshot's active tab over sticky-current ONLY when it matches a pending intent (then consumes it); otherwise keeps current focus, so unsolicited server-active (agent echoes) still never steals focus — #5435 preserved. Tests: new 'focuses a brand-new remote terminal' test (intent set) passes; both #5435 'does not let repeated snapshots steal focus' tests (no intent) stay green. Verified live via the electron skill against a headless serve: creating a terminal (or a second/back-to-back terminal, or a browser tab) on a remote worktree focuses the new tab immediately AND it stays focused after snapshots settle (no snap-back); opening a new terminal still focuses the terminal. Co-authored-by: Orca <help@stably.ai>

AmethystLiang · 2026-08-26T05:55:11Z

thanks for reporting. looking into it

Co-authored-by: Orca <help@stably.ai>

…0828) `orca agent launch --focus` and `worktree create --agent --activate` left a chat launch unselected: main marked the chat active only in its tab listing, which the window follows solely on its own focus intent (#5435). Send the existing focusEditorTab for that chat; when its tab is not listed yet, record the focus intent so the listing selects it unless the user moved on. Co-authored-by: Manuel Meurer <manuel@meurer.io>

Jinwoo-H changed the title ~~Fix remote session tab focus stealing~~ Fix remote terminal focus snapping during agent runs Jun 16, 2026

Fix remote session tab focus stealing

abd4869

Co-authored-by: Orca <help@stably.ai>

Jinwoo-H force-pushed the Jinwoo-H/remote-server-split-focus-5418 branch from 8593856 to abd4869 Compare June 16, 2026 05:52

Jinwoo-H merged commit 413fb31 into main Jun 16, 2026
1 check passed

brennanb2025 mentioned this pull request Aug 18, 2026

fix(tabs): keep an open diff focused while agents stream (STA-4697) #15390

Merged

9 tasks done

grp-chiheon-song mentioned this pull request Aug 26, 2026

[Bug]: Cmd+D split in a paired remote session leaves focus on the source pane #16508

Closed

This was referenced Aug 26, 2026

[Bug]: Cmd+D split in a paired remote session leaves focus on the source pane #16510

Closed

fix(remote): focus the pane a host-delegated split creates #16513

Closed

AmethystLiang assigned Jinwoo-H Aug 26, 2026

Jinwoo-H mentioned this pull request Aug 27, 2026

fix(remote): focus host-delegated split panes #16886

Merged

8 of 9 tasks

ZhongNing1 mentioned this pull request Sep 10, 2026

[Bug]: SSH remote sessions steal tab focus while another tab is in use #19697

Closed

nwparker mentioned this pull request Sep 10, 2026

fix(runtime): a host frame's active tab is a report, not this client's focus #19878

Closed

enrick-dev pushed a commit to enrick-dev/orca that referenced this pull request Oct 15, 2026

Fix remote terminal focus snapping during agent runs (stablyai#5435)

9dd7e54

Co-authored-by: Orca <help@stably.ai>

AmoabaKelvin mentioned this pull request Oct 20, 2026

fix(mobile): open a worktree on the tab the desktop is showing #31215

Merged

8 of 9 tasks

nyamaguchi111 mentioned this pull request Oct 21, 2026

[Feature]: open files and browser tabs in a chosen editor group from the CLI #22759

Open

manuelmeurer mentioned this pull request Nov 10, 2026

fix(agent-launch): select a focused CLI chat launch in the window #40746

Closed

10 of 11 tasks

AmoabaKelvin mentioned this pull request Nov 10, 2026

fix(agent-launch): switch to the chat tab on agent launch --focus and worktree create --activate #40828

Merged

11 tasks done

Navigation Menu

Repository navigation

Fix remote terminal focus snapping during agent runs - #5435

Fix remote terminal focus snapping during agent runs#5435
Jinwoo-H merged 1 commit into
mainfrom
Jinwoo-H/remote-server-split-focus-5418

Jinwoo-H commented Jun 16, 2026 •

edited by ghost

Loading

Uh oh!

ghost commented Jun 16, 2026 •

edited by ghost

Loading

Uh oh!

coderabbitai Bot commented Jun 16, 2026 •

edited

Loading

Walkthrough

❌ Failed checks (2 warnings)

Uh oh!

Uh oh!

AmethystLiang commented Aug 26, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Jinwoo-H commented Jun 16, 2026 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Testing

Uh oh!

ghost commented Jun 16, 2026 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Jun 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

❌ Failed checks (2 warnings)

Uh oh!

Uh oh!

AmethystLiang commented Aug 26, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Jinwoo-H commented Jun 16, 2026 •

edited by ghost

Loading

ghost commented Jun 16, 2026 •

edited by ghost

Loading

coderabbitai Bot commented Jun 16, 2026 •

edited

Loading