Add TUI orchestration conversation tab bar by harryalbert · Pull Request #13832 · warpdotdev/warp

harryalbert · 2026-07-16T18:24:28Z

Description

Adds an orchestration conversation tab bar to the Warp TUI, built on the reusable TuiTabBarView from the PR below. The bar is shown across the orchestrator and its retained child-agent sessions, highlights the active conversation, and switches directly between the existing full session views without rebuilding or moving conversation state.

TuiOrchestrationModel projects the live history topology into a semantic tab snapshot. It resolves the top-level orchestrator, reuses the GUI orchestration pill ordering, filters out conversations without navigable TUI sessions, and owns the shared page anchor and explicit-paging state. Model notifications refresh every retained session view, while lifecycle events remain reserved for materializing and removing child sessions.

The session view maps the snapshot into theme-aware tab styles and stable agent identities, retains the tab child view and its mouse state, and coordinates focus across full-session switches. Shift+Up enters the bar only from the first visual input row with no selection; Tab, arrow keys, and first/last-child bindings switch conversations while preserving tab focus, and Shift+Down returns to the session's normal interaction target. Mouse selection preserves whether the bar or input owned keyboard focus, while overflow controls change only the shared visible page.

The normal session layout now renders the full-width orchestration row above the existing padded transcript/input column. Alternate-screen applications still replace the complete surface, while normal blocking interactions remain below the tab bar. Dynamic child additions, removals, status changes, recency changes, and pin changes recompute the snapshot without stealing responder focus.

Linked Issue

CODE-1822 — Orchestration

Review guide

crates/warp_tui/src/orchestration_model.rs — topology snapshots, canonical ordering, shared page state, session navigation, and model invalidation.
crates/warp_tui/src/terminal_session_view.rs and input/view.rs — retained tab integration, focus handoff, keyboard/mouse navigation, and session rendering.
crates/warp_tui/src/session_registry.rs — authoritative conversation-to-retained-session resolution.

Testing

I have manually tested my changes locally with ./script/run

Screenshots / Videos

https://www.loom.com/share/c53869fe8e3f49bc84a660beb70b6dfd

Agent Mode

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

CHANGELOG-NONE

harryalbert · 2026-07-16T18:24:49Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

oz-for-oss · 2026-07-17T19:38:27Z

@harryalbert

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 the TUI orchestration conversation tab bar, including topology snapshots, retained tab state, input focus handoff, session switching, rendering, and tests/specs.

Concerns

Conversation-to-session lookup currently treats any conversation present in a terminal surface history as immediately navigable, but focusing the session does not select that historical conversation. This can leave stale child tabs that focus the wrong session content after a child session selects/restores another conversation.
The TUI tab snapshot invalidation ignores exchange append/recency events even though the shared GUI ordering policy sorts completed children by last_modified_at(), so retained tab ordering and keyboard navigation can diverge from the GUI pill order until another event happens to refresh it.

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-07-17T19:44:02Z

+        history: &BlocklistAIHistoryModel,
+        conversation_id: AIConversationId,
+    ) -> Option<TuiSessionId> {
+        let surface_id = history.terminal_surface_id_for_conversation(&conversation_id)?;


⚠️ [IMPORTANT] This only proves the conversation is present somewhere in the terminal surface history; focus_session does not select that historical conversation. If a child session has since selected/restored another conversation, the tab remains visible and clicking it focuses the wrong content. Filter against the retained view's selected conversation, or select/restore the target before treating it as navigable.

oz-for-oss · 2026-07-17T19:44:02Z

+                } => true,
+                BlocklistAIHistoryEvent::CreatedSubtask { .. }
+                | BlocklistAIHistoryEvent::UpgradedTask { .. }
+                | BlocklistAIHistoryEvent::AppendedExchange { .. }


⚠️ [IMPORTANT] descendant_conversation_ids_in_pill_order uses last_modified_at() for completed-child ordering, and appending an exchange changes that source of truth. Ignoring AppendedExchange here can leave the retained TUI tab order and keyboard navigation stale until an unrelated status/metadata event, diverging from the GUI pill bar. Treat exchange events that affect recency as topology changes.

is this true?

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

kevinyang372

Approving to unblock

kevinyang372 · 2026-07-17T22:22:10Z

-/// The TUI's child-agent coordinator singleton. See the module docs.
+/// One navigable child tab in an orchestration snapshot.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct TuiOrchestrationTab {


Semantically is this an actual tab (a UI concept) or a child orchestrated session?

If this is the latter I am not sure we want to couple it with the front-end tab naming

kevinyang372 · 2026-07-17T22:25:56Z

    event_consumers_by_session: HashMap<TuiSessionId, HashSet<AIConversationId>>,
+    /// Page state for the single orchestration tab bar visible at a time.
+    page_root_conversation_id: Option<AIConversationId>,
+    page_anchor: Option<AIConversationId>,


What is page_anchor and explicitly_paged?

kevinyang372 · 2026-07-17T22:26:27Z

+                } => true,
+                BlocklistAIHistoryEvent::CreatedSubtask { .. }
+                | BlocklistAIHistoryEvent::UpgradedTask { .. }
+                | BlocklistAIHistoryEvent::AppendedExchange { .. }


is this true?

kevinyang372 · 2026-07-17T22:28:00Z

+    ) {
+        self.page_root_conversation_id = Some(root_conversation_id);
+        self.page_anchor = Some(page_anchor);
+        self.explicitly_paged = true;


Hmmm seems like explicitly_paged is just page_anchor.is_some()?

kevinyang372 · 2026-07-17T22:30:14Z

    /// visibility itself is derived at render time, never stored.
    active_blocker_view_id: Option<EntityId>,
+    orchestration_tab_bar: ViewHandle<TuiTabBarView>,
+    orchestration_snapshot: Option<TuiOrchestrationSnapshot>,


Hmmm shouldn't this be derived from the orchestration model? Why are we keeping a separate snapshot here

kevinyang372 · 2026-07-17T22:30:30Z

    active_blocker_view_id: Option<EntityId>,
+    orchestration_tab_bar: ViewHandle<TuiTabBarView>,
+    orchestration_snapshot: Option<TuiOrchestrationSnapshot>,
+    orchestration_tabs_available: Rc<Cell<bool>>,


This state should also belong to the model imo

cla-bot Bot added the cla-signed label Jul 16, 2026

This was referenced Jul 16, 2026

add TUI orchestration permission and configuration card #13717

Merged

add TUI multi-session registry and focused-session root projection #13775

Merged

Add local child agents to TUI #13776

Merged

rich message component #13777

Merged

harryalbert mentioned this pull request Jul 16, 2026

add reusable TUI tab bar component #13831

Merged

7 tasks

harryalbert changed the base branch from harry/code-1822-tui-tab-bar-component to graphite-base/13832 July 16, 2026 20:42

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from 0039266 to da1366d Compare July 16, 2026 22:12

harryalbert force-pushed the graphite-base/13832 branch from 061490a to 14791bf Compare July 16, 2026 22:12

harryalbert changed the base branch from graphite-base/13832 to harry/code-1822-tui-tab-bar-component July 16, 2026 22:13

harryalbert mentioned this pull request Jul 16, 2026

Add TUI cloud orchestration children #13855

Open

2 tasks

harryalbert changed the base branch from harry/code-1822-tui-tab-bar-component to graphite-base/13832 July 16, 2026 23:09

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from da1366d to 9f29b02 Compare July 17, 2026 02:57

harryalbert force-pushed the graphite-base/13832 branch from 14791bf to 00f818b Compare July 17, 2026 02:57

harryalbert changed the base branch from graphite-base/13832 to harry/code-1822-tui-tab-bar-component July 17, 2026 02:57

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from 9f29b02 to f58a51a Compare July 17, 2026 12:40

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch 2 times, most recently from 01fc847 to e8ad459 Compare July 17, 2026 13:02

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch 2 times, most recently from 26a62c0 to f905aac Compare July 17, 2026 13:26

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch from e8ad459 to 806dc7b Compare July 17, 2026 13:26

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from f905aac to a80f9db Compare July 17, 2026 13:48

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch 2 times, most recently from 46372b9 to cffd251 Compare July 17, 2026 15:02

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch 2 times, most recently from 0adb153 to 0557ca7 Compare July 17, 2026 15:17

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch from 6cef323 to 9f1e03d Compare July 17, 2026 15:20

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch 2 times, most recently from 9d24d1a to de9dc08 Compare July 17, 2026 15:51

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from 61d7777 to 8b3e92d Compare July 17, 2026 17:51

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch from 6753de5 to 73aa9b3 Compare July 17, 2026 17:51

harryalbert changed the title ~~Add TUI orchestration tab bar specs~~ Add TUI orchestration conversation tab bar Jul 17, 2026

harryalbert marked this pull request as ready for review July 17, 2026 19:38

harryalbert requested a review from kevinyang372 July 17, 2026 19:38

oz-for-oss Bot reviewed Jul 17, 2026

View reviewed changes

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from 8b3e92d to d0dd53d Compare July 17, 2026 19:48

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch 2 times, most recently from 26257d9 to ed5ff02 Compare July 17, 2026 19:49

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from d0dd53d to e0c5b18 Compare July 17, 2026 19:49

harryalbert changed the base branch from harry/code-1822-tui-tab-bar-component to graphite-base/13832 July 17, 2026 20:31

harryalbert force-pushed the graphite-base/13832 branch from ed5ff02 to 31e0eab Compare July 17, 2026 20:45

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from e0c5b18 to 24c7de0 Compare July 17, 2026 20:45

harryalbert changed the base branch from graphite-base/13832 to harry/code-1822-tui-tab-bar-component July 17, 2026 20:45

harryalbert force-pushed the harry/code-1822-tui-tab-bar-component branch from 31e0eab to 8209665 Compare July 17, 2026 20:46

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from 24c7de0 to 9d27dc9 Compare July 17, 2026 20:46

Base automatically changed from harry/code-1822-tui-tab-bar-component to master July 17, 2026 21:23

harryalbert and others added 9 commits July 17, 2026 17:24

Add TUI orchestration tab bar specs

cc16650

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

Implement TUI orchestration conversation tabs

283f0e8

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

Preserve orchestration tab page selection

830ec73

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

address comments

44ca13c

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

update apis

bb324d5

fmt

547a493

clean up weird event structure

4e735ed

fix tab bar ordering issues

958aec1

make tui pagination more efficient

de63143

harryalbert force-pushed the harry/code-1822-orchestration-tab-bar branch from 9d27dc9 to de63143 Compare July 17, 2026 21:24

fix model preference override

a9484a0

kevinyang372 approved these changes Jul 17, 2026

View reviewed changes

Uh oh!

Conversation

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

Uh oh!

Description

Linked Issue

Review guide

Testing

Screenshots / Videos

Agent Mode

Uh oh!

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

Uh oh!

Uh oh!

oz-for-oss Bot commented Jul 17, 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 Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

oz-for-oss Bot Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kevinyang372 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

harryalbert commented Jul 16, 2026 •

edited

Loading

harryalbert commented Jul 16, 2026 •

edited

Loading

oz-for-oss Bot commented Jul 17, 2026 •

edited

Loading