[theontho]

Summary

Adding an SSH host whose Herdr is missing or too old ("The Herdr on … is too old for this app. Should we update it?" → Update) failed with:

Open a local workspace: surface_inactive: this method requires an active client shell surface

The setup continues in a workspace on this computer's Herdr. When the window was showing another device, Local's connection had an inactive surface, and Herdr refuses workspace.create from such a connection.

Approach

• After verifying the claim, the dialog switches the window to Local (where it ends up anyway once the setup opens). Switching endpoints resets every dialog, so the Add Device page and form are carried across the switch.
• A new Step::Activating waits until the window's poll has queued Local's surface activation (surface_requested()); poll_device_setup then sends workspace.create, which follows the activation on the same ordered connection.
• If Local is disconnected or the selection changed, the dialog returns to the question with Open a local workspace: …, keeping the host claim for a retry, instead of waiting.
• When the window was already on Local with an active surface, behaviour is unchanged: the request goes out immediately.

Validation

Run on Linux x86_64 (Arch/Omarchy) with the pinned Rust 1.96.1, at ef1c819 (base 92f4398). just is not installed on this machine, so each just ci step was run directly:

• cargo fmt --all -- --check: passed
• scripts/check-file-size.sh, scripts/test_check_sorted.py, scripts/check-sorted.py: passed
• cargo clippy --locked --workspace --all-targets --all-features -- -D warnings: passed
• cargo clippy --locked --workspace --all-targets --no-default-features -- -D warnings: passed
• cargo test --locked --workspace: 3 failures, all unrelated to this change and reproduced on a clean origin/main (26443bc) on the same machine:
  • config::tests::loading::{local_overrides_merge_tables_replace_arrays_and_refresh_defaults, managed_headers_accept_lf_and_crlf_without_migrating_defaults} read the host's Omarchy theme; they pass with an isolated HOME/XDG_CONFIG_HOME.
  • cloud::install::tests::the_probe_finds_herdr_where_the_bridge_looks fails because this host has /usr/bin/herdr, which the test's PATH searches but its "already installed" skip list omits.
• cargo test --locked --workspace --all-features: 4591 passed, same 3 unrelated failures
• .claude/skills/gpui-mockup/scripts/test_wait.py: passed
• New tests in menu/devices/tests/setup_activation.rs: with another device selected, nothing is sent until Local's surface is requested, the dialog stays open, then workspace.create is sent; with Local disconnected, the dialog returns to the question with the error. All 124 menu::devices tests pass.
• just lint-linux / just lint-windows: not run (no cfg gates touched)

Manual QA

No screenshots: the only visible change is that the error no longer appears; the status text ("Opening a local workspace…") is unchanged.

• With a remote device selected in the window, open Add Device → SSH host, enter a host with an outdated Herdr, choose Update: the window switches to this computer, a "Set up …" workspace opens, and the update runs in it.
• Same with a host that has no Herdr (Install).
• With Local selected already, the same flow still opens the setup workspace immediately.
• With this computer's Herdr stopped, choosing Update shows "Open a local workspace: …" and Update can be retried after it starts.

🤖 Generated with Claude Code

https://claude.ai/code/session_016Zvsmb8t18dhXWMf3nu2sU

[greptile-apps]

Confidence Score: 5/5

[Medium impact] The PR appears safe to merge; no actionable issues remain.

Summary

SSH setup now switches to Local before opening its workspace and waits until Local's surface activation is queued.

• SSH setup waits for Local's surface before opening its workspace.
• Sidebar layout probes measure child labels at their full width.

Diagram

sequenceDiagram
    participant Dialog as Add Device
    participant Window
    participant Local
    Dialog->>Window: Select Local and restore form
    Window->>Local: "client_shell.surface.set(active=true)"
    Dialog->>Local: workspace.create
    Local-->>Dialog: Created workspace and root pane
    Dialog->>Local: Type setup command
    Dialog->>Window: Close dialog and show workspace

Loading

_{Reviews (2) · Last reviewed commit: "test(devices): check setup activation re..." · Reviewed by Greptile}

[theontho]

just ci ran locally and passed on c914e52aa215935e0fc5611aec82accc43f5662d (macOS arm64).

[penso]

@greptileai review