feat: add shortcuts for cycling orchestration subagents by oz-for-oss[bot] · Pull Request #11760 · warpdotdev/warp

oz-for-oss · 2026-05-27T16:27:26Z

Description

Adds editable Warp AI keybindings for cycling through orchestration sessions from the active agent-view pane. The new actions follow the same orchestration topology/pill-bar ordering as the UI, now cycle through both the orchestrator and its child agents, and reuse the existing reveal path so in-flight panes are preserved.

Default bindings:

Next orchestration session: ctrl-alt-tab on macOS, Linux, and Windows.
Previous orchestration session: ctrl-alt-shift-tab on macOS, Linux, and Windows.

Linked Issue

The linked issue is labeled ready-to-spec or ready-to-implement.
Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes).

Testing

cargo fmt
git --no-pager diff --check
cargo test -p warp --lib ai::blocklist::orchestration_topology — 11 passed.
cargo test -p warp adjacent_orchestration_child_navigation — 4 passed.
cargo clippy --workspace --all-targets --all-features --tests -- -D warnings — attempted, blocked by missing generated channel config JSON files when release_bundle is enabled without warp-channel-config.
cargo clippy -p warp --lib --all-features --tests -- -D warnings
I have manually tested my changes locally with ./script/run

Screenshots / Videos

warp-oss.-.Build.Simple.HTML.Game.With.Subagents.-.29.May.2026.mp4

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

CHANGELOG-IMPROVEMENT: Added keyboard shortcuts for cycling through orchestrator and subagent sessions in Agent Mode.

Co-Authored-By: Oz oz-agent@warp.dev

Co-Authored-By: Sathvik Vangavolu <113149539+vikvang@users.noreply.github.com>

oz-for-oss · 2026-05-27T22:24:00Z

@vikvang

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR adds editable keybindings for cycling through orchestration subagents and wires the actions through terminal view navigation using the orchestration topology helper.

Concerns

Cycling from nested subagents uses the immediate parent as the traversal root, so grandchildren do not cycle through the full orchestration pill-bar order.
This is a user-facing keyboard navigation change, but the PR description explicitly says no screenshots or screen recording were included. For this user-facing change, please include screenshots or a screen recording demonstrating it working end to end.

Verdict

Found: 0 critical, 2 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss · 2026-05-29T21:50:33Z

@vikvang

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Co-Authored-By: Oz <oz-agent@warp.dev>

vkodithala · 2026-05-29T21:55:12Z

Meta-nit: we should probably change the Changelog message to smth that reflects the new keybind? i.e.,

CHANGELOG-IMPROVEMENT: Added keyboard shortcuts (ctrl-]\[ on Mac, ctrl-alt-]\[ on Windows) for cycling through orchestration subagent tabs in Agent Mode.

oz-for-oss

Overview

This PR adds editable terminal actions and keybindings for cycling between orchestration agent conversations, plus topology tests for adjacent navigation.

Concerns

The navigation helper uses raw descendant spawn order, but the rendered pill bar applies pin/status/recency ordering, so the keyboard shortcuts can move to a different conversation than the visible next/previous pill.
The default shortcuts are registered as ctrl-only bindings instead of the described cmd-alt/ctrl-alt bindings; the previous shortcut also collides with the terminal Escape control chord.

Verdict

Found: 0 critical, 2 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss · 2026-05-29T21:55:29Z

+    let orchestration_root_id = history
+        .resolved_parent_conversation_id_for_conversation(active_conversation)
+        .unwrap_or(active_conversation_id);
+    let descendant_ids = descendant_conversation_ids_in_spawn_order(history, orchestration_root_id);


⚠️ [IMPORTANT] This walks raw spawn pre-order, but the pill bar renders children after pin/status/recency sorting, so next/previous won't match the visible pill order whenever those states differ. Reuse the pill-bar ordering before wiring shortcuts to it.

I think this is valid, we aren't accounting for pinned subagents. Can you TAL?

vkodithala

Looking good, left a few comments. Run a cargo fmt while you're at it to appease the formatter 🙏

vkodithala · 2026-05-29T21:57:57Z

+    let orchestration_root_id = history
+        .resolved_parent_conversation_id_for_conversation(active_conversation)
+        .unwrap_or(active_conversation_id);
+    let descendant_ids = descendant_conversation_ids_in_spawn_order(history, orchestration_root_id);


I think this is valid, we aren't accounting for pinned subagents. Can you TAL?

vkodithala · 2026-05-29T22:01:47Z

+    /// Navigate to the previous child agent conversation in the active
+    /// orchestration tree.
+    CyclePreviousOrchestrationChildAgent,
+    /// Navigate to the next child agent conversation in the active
+    /// orchestration tree.
+    CycleNextOrchestrationChildAgent,


CyclePreviousOrchestrationChildAgent isn't the best name? Also idk if this should be two different variants, why not something like NextOrchestrationChildAgent { direction }?

Co-Authored-By: Oz <oz-agent@warp.dev>

vikvang · 2026-06-01T13:54:23Z

/oz-review

oz-for-oss · 2026-06-01T13:54:42Z

@vikvang

I'm re-reviewing this pull request in response to a review request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR adds editable TerminalView actions and default shortcuts for cycling through orchestrator/subagent conversations, plus shared topology ordering helpers and tests.

Concerns

The new default shortcuts use plain ctrl-[ / ctrl-], which the existing TerminalView binding validator treats as PTY control characters and rejects unless the action or keystroke is explicitly allowlisted. As written, the advertised defaults are not valid TerminalView bindings.

Verdict

Found: 0 critical, 1 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss · 2026-06-01T14:00:18Z

+        .with_context_predicate(
+            id!("Terminal") & id!(flags::IS_ANY_AI_ENABLED) & id!(flags::ACTIVE_AGENT_VIEW),
+        )
+        .with_mac_key_binding("ctrl-]")


⚠️ [IMPORTANT] ctrl-] and the ctrl-[ binding below match CONTROL_CHARACTER_KEY_REGEX, and TerminalView registers is_binding_pty_compliant, so these defaults are rejected unless this action is explicitly allowlisted or a PTY-compliant shortcut is used.

Can you confirm?

…lidator Co-Authored-By: Oz <oz-agent@warp.dev>

Co-Authored-By: Oz <oz-agent@warp.dev>

…nflicts Co-Authored-By: Oz <oz-agent@warp.dev>

vkodithala

Generally I have a few questions, but the logic looks good!

vkodithala · 2026-06-04T21:05:24Z

        // Walk the full descendant tree in pre-order, preserving each
        // parent's child registration order so nested branches stay
        // contiguous and grandchildren remain visible in the row.


Is this comment now outdated? Can we also make sure that there's isn't downstream logic we are breaking by making this change?

vkodithala · 2026-06-04T21:09:08Z

+/// Returns descendants sorted in the same visual ordering used by the
+/// orchestration pill bar:
+///   1) pinned children
+///   2) unpinned children
+/// each bucket ordered by status priority, then done-recency, then spawn order.


If this logic is also used for ordering by the orchestration pill bar, is there an opportunity to centralize logic? We're probably reiterating the same logic 2x, can you check and see if we can reuse?

vkodithala · 2026-06-04T21:10:36Z

+        .with_context_predicate(
+            id!("Terminal") & id!(flags::IS_ANY_AI_ENABLED) & id!(flags::ACTIVE_AGENT_VIEW),
+        )
+        .with_mac_key_binding("ctrl-]")


Can you confirm?

vkodithala · 2026-06-04T21:11:52Z

+    fn cycle_orchestration_child_agent(
+        &mut self,
+        direction: OrchestrationNavigationDirection,
+        ctx: &mut ViewContext<Self>,
+    ) {
+        let active_conversation_id = self
+            .agent_view_controller
+            .as_ref(ctx)
+            .agent_view_state()
+            .active_conversation_id();
+        let Some(active_conversation_id) = active_conversation_id else {
+            return;
+        };
+        let target_conversation_id = adjacent_orchestration_child_conversation_id(
+            BlocklistAIHistoryModel::as_ref(ctx),
+            active_conversation_id,
+            direction,
+        );
+        let Some(target_conversation_id) = target_conversation_id else {
+            return;
+        };
+
+        ctx.emit(Event::RevealChildAgent {
+            conversation_id: target_conversation_id,
+        });
+    }


We use TerminalView a lot and I'm a little wary of adding onto it. This is feedback Pei gave me earlier, and something DS cares about too. Is it absolutely necessary to include this here?

vkodithala · 2026-06-04T21:12:24Z

        // on TerminalView on all platforms.
        Keystroke::parse("ctrl-c").expect("should be able to construct ctrl-c keystroke"),
+        // Orchestration conversation cycling defaults use ctrl-[ / ctrl-] on all platforms.
+        // These intentionally overlap PTY control characters and are validated here.


What does this mean? Is this what we want? I want to make sure we aren't regressing anything important here.

Co-Authored-By: Oz <oz-agent@warp.dev>

vikvang · 2026-06-04T21:57:11Z

/oz-review

oz-for-oss · 2026-06-04T21:57:26Z

@vikvang

I'm re-reviewing this pull request in response to a review request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR adds editable Warp AI keybindings for cycling through orchestration conversations, factors pill ordering into the shared topology helper, and covers the direct child navigation and binding cases with tests.

Concerns

No blocking correctness, security, or spec-drift concerns found. The attached spec context reports no approved repository spec.
The inline suggestions align the keybinding labels with the implemented behavior, which includes cycling back to the orchestrator.

Verdict

Found: 0 critical, 0 important, 2 suggestions

Approve with nits

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Co-authored-by: oz-for-oss[bot] <277970191+oz-for-oss[bot]@users.noreply.github.com>

Co-Authored-By: Oz <oz-agent@warp.dev>

feat: add orchestration subagent cycling shortcuts

3c6f314

Co-Authored-By: Sathvik Vangavolu <113149539+vikvang@users.noreply.github.com>

cla-bot Bot added the cla-signed label May 27, 2026

oz-for-oss Bot mentioned this pull request May 27, 2026

Add keyboard shortcut to cycle through orchestration subagents in a pane #11734

Open

vikvang requested a review from advait-m May 27, 2026 22:22

vikvang marked this pull request as ready for review May 27, 2026 22:23

oz-for-oss Bot commented May 27, 2026

View reviewed changes

Comment thread app/src/ai/blocklist/orchestration_topology.rs

vikvang removed the request for review from advait-m May 27, 2026 23:28

vikvang marked this pull request as draft May 29, 2026 20:56

feat: include orchestrator in orchestration session cycling

b9bc7b3

Co-Authored-By: Oz <oz-agent@warp.dev>

vikvang requested a review from vkodithala May 29, 2026 21:48

vikvang marked this pull request as ready for review May 29, 2026 21:50

chore: make orchestration cycle keybindings explicit across platforms

9c45415

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss Bot commented May 29, 2026

View reviewed changes

vkodithala requested changes May 29, 2026

View reviewed changes

fix: align orchestration cycling order with pinned pills

37aae3a

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss Bot commented Jun 1, 2026

View reviewed changes

oz-agent added 3 commits June 1, 2026 10:41

fix: allow ctrl-[ and ctrl-] orchestration keybindings in terminal va…

412ffd8

…lidator Co-Authored-By: Oz <oz-agent@warp.dev>

fix: satisfy clippy question_mark in orchestration navigation

076a757

Co-Authored-By: Oz <oz-agent@warp.dev>

Merge origin/master into oz-agent/implement-issue-11734 to resolve co…

451169f

…nflicts Co-Authored-By: Oz <oz-agent@warp.dev>

vkodithala requested review from vikvang and vkodithala June 4, 2026 21:00

vkodithala requested changes Jun 4, 2026

View reviewed changes

Centralize orchestration pill navigation

04dec8b

Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss Bot commented Jun 4, 2026

View reviewed changes

Comment thread app/src/terminal/view/init.rs Outdated

Comment thread app/src/terminal/view/init.rs Outdated

vikvang and others added 3 commits June 5, 2026 18:04

Update app/src/terminal/view/init.rs

1151d31

Co-authored-by: oz-for-oss[bot] <277970191+oz-for-oss[bot]@users.noreply.github.com>

Update app/src/terminal/view/init.rs

678a9da

Co-authored-by: oz-for-oss[bot] <277970191+oz-for-oss[bot]@users.noreply.github.com>

feat: make orchestration cycling use ctrl-alt-tab shortcuts

46fb848

Co-Authored-By: Oz <oz-agent@warp.dev>

Conversation

oz-for-oss Bot commented May 27, 2026 • edited by vikvang Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Issue

Testing

Screenshots / Videos

Agent Mode

Uh oh!

oz-for-oss Bot commented May 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

Uh oh!

oz-for-oss Bot commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vkodithala commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

oz-for-oss Bot May 29, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vkodithala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vikvang commented Jun 1, 2026

Uh oh!

oz-for-oss Bot commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

oz-for-oss Bot Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vkodithala left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vikvang commented Jun 4, 2026

Uh oh!

oz-for-oss Bot commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot commented May 27, 2026 •

edited by vikvang

Loading

oz-for-oss Bot commented May 27, 2026 •

edited

Loading

oz-for-oss Bot commented May 29, 2026 •

edited

Loading

vkodithala commented May 29, 2026 •

edited

Loading

oz-for-oss Bot commented Jun 1, 2026 •

edited

Loading

oz-for-oss Bot commented Jun 4, 2026 •

edited

Loading