extract orchestration edit state into a frontend-neutral module by harryalbert · Pull Request #13707 · warpdotdev/warp

harryalbert · 2026-07-14T18:08:03Z

Description

Extracts the orchestration run-config editing domain out of the GUI-only orchestration_controls.rs into a frontend-neutral app/src/ai/orchestration/ module, so the TUI orchestration card (upstack in this stack) can share the exact same state, transitions, and validation as the GUI confirmation card and plan-card config block. No behavior change intended.

The module is split into:

config_state.rs — OrchestrationConfigState (the run-wide model/harness/execution-mode/auth fields; renamed from the old OrchestrationEditState) and AuthSecretSelection.
edit_state.rs — the new OrchestrationEditState (config state + per-harness model memory) and the apply_execution_mode_change / apply_harness_change / revalidate_after_catalog_change transitions, consolidated from loose GUI helper functions into state methods. Each has a _core variant with injected catalog callbacks so transitions are unit-testable without app singletons.
validation.rs — Accept gating and picker-visibility predicates, plus harness_is_selectable (extracted from inline picker filtering so both frontends filter identically).
providers.rs — AppContext-backed catalog lookups, default host/environment/auth-secret resolution, and persistence helpers.

Review guide

New code:

app/src/ai/orchestration/edit_state.rs — the only substantially new code: the consolidated transitions and the config-state/model-memory split. Previously this logic was interleaved with picker repopulation in apply_harness_change / apply_execution_mode_change / repopulate_all_pickers in orchestration_controls.rs; behavior should be identical.
app/src/ai/blocklist/inline_action/run_agents_card_view.rs — the card's RunAgentsEditState is split into run-wide config vs card-only fields, and per-harness model memory moves off the view onto OrchestrationEditState. Mostly mechanical, but this is where a behavior regression would hide.

Skim (moved code, bodies unchanged):

app/src/ai/orchestration/config_state.rs, providers.rs, and most of validation.rs — cut/paste from orchestration_controls.rs (and can_execute_with_auth_secret / populate_default_auth_secret_for_execution from the run_agents.rs executor), with GUI-typed ViewContext params relaxed to AppContext.
app/src/ai/blocklist/inline_action/orchestration_controls.rs — almost entirely deletions plus re-exports of the moved items; what remains is GUI rendering/picker population only.

Skim (mechanical caller churn):

orchestration_config_block.rs, run_agents.rs, queued_query_tests.rs, run_agents_card_view_tests.rs — renames to the new paths/field names.
app/src/ai/mod.rs, orchestration/mod.rs, tui_export.rs — wiring/exports.
specs/code-1822-edit-state/TECH.md — the tech spec for this slice.

Testing

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

Agent Mode

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

harryalbert · 2026-07-14T18:08:19Z

add reusable TUI option selector over shared option snapshots #13716 : 2 dependent PRs (#13717 , #13830 )
add reusable TUI editor view #13817
route TUI editor input by owning-view focus #13771
add option snapshots and adapt GUI orchestration pickers onto them #13714
extract orchestration edit state into a frontend-neutral module #13707 👈 (View in Graphite)
master

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

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

Compose RunAgentsEditState from config state + card fields, rename transitions module to edit_state, drop the constant should_show_harness_picker seam, and trim doc comments. Co-Authored-By: Oz <oz-agent@warp.dev>

Drop constructor-mapping, setter, and selectability tests whose behavior is covered by the accept-gate and snapshot-level tests; keep transition, gating, and catalog-revalidation policy tests. Co-Authored-By: Oz <oz-agent@warp.dev>

oz-for-oss · 2026-07-14T23:27:58Z

@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 extracts orchestration run-config edit state and validation into a frontend-neutral module and updates the GUI confirmation card, plan-card config block, executor helpers, exports, and tests to use the new shared types.

Concerns

For this user-facing change, please include screenshots or a screen recording demonstrating the orchestration confirmation card and plan-card config block still working end to end. The diff changes the rendered picker/editor paths for those UI surfaces, but the PR description only mentions manual ./script/run testing and does not include visual evidence.

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

moirahuang

phew this was more just moving around code than logic change but i got scared by the LOC changed

…arpdotdev#13707/warpdotdev#13714) Upstream sync (merge f71f181) extracted orchestration UI config into app/src/ai/orchestration/ with raw English literals — our menu_label wraps regressed in 4 files. Restore ~14 sites. Keys exist in en.yml. - snapshots.rs: 4 const->fn (DEFAULT_MODEL_LABEL, AUTH_SECRET_INHERIT_LABEL, CUSTOM_HOST_LABEL, AUTH_SECRETS_LOAD_FAILED_MESSAGE) + 5 inline wraps - providers.rs: ORCHESTRATION_ENV_NONE_LABEL const->pub fn (snake_case, lint-clean) - validation.rs: 3 inline fn-return wraps (.to_string() preserved) - config_state.rs: 1 inline method-return wrap (Option<&'static str>, no .to_string()) - mod.rs + tui_export.rs: re-exports updated (const->fn rename) - orchestration_controls.rs + snapshots_tests.rs: consumer call-sites updated - en/ru.yml: 3 new keys (custom_host, no_harnesses_available, no_models_available) Russian: custom_host=Свой хост… (custom_inference precedent ru.yml:1513), no_harnesses_available=Среды исполнения недоступны (no_tools_available precedent), no_models_available=Модели недоступны. Plans: 28ae0e1e + 215807cc (2 plan-review cycles — P 🔴=0; 2 code-review cycles — 🔴=0 🟡=0 🔵=2 cosmetic dismissed). Gate: cargo check 0 NEW warnings (5 baseline mcp/), cargo test -p i18n 12/12, orchestration tests 34/34, rustfmt clean, en/ru parity 23/23. Deferred: host_picker.rs:54 separate CUSTOM_HOST_LABEL (different module, micro-plan TBD).

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

harryalbert force-pushed the harry/code-1822-edit-state branch from a117f6e to 22bc7be Compare July 14, 2026 18:55

This was referenced Jul 14, 2026

add option snapshots and adapt GUI orchestration pickers onto them #13714

Merged

add reusable TUI option selector over shared option snapshots #13716

Open

add TUI orchestration permission and configuration card #13717

Open

harryalbert and others added 2 commits July 14, 2026 18:26

extract orchestration edit state into a frontend-neutral module

bfd821d

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

address review feedback on edit-state extraction

97993fd

Compose RunAgentsEditState from config state + card fields, rename transitions module to edit_state, drop the constant should_show_harness_picker seam, and trim doc comments. Co-Authored-By: Oz <oz-agent@warp.dev>

harryalbert force-pushed the harry/code-1822-edit-state branch from 22bc7be to 97993fd Compare July 14, 2026 22:30

prune trivial pure-fn tests from orchestration domain

b6be72f

Drop constructor-mapping, setter, and selectability tests whose behavior is covered by the accept-gate and snapshot-level tests; keep transition, gating, and catalog-revalidation policy tests. Co-Authored-By: Oz <oz-agent@warp.dev>

harryalbert marked this pull request as ready for review July 14, 2026 23:27

harryalbert requested a review from cephalonaut July 14, 2026 23:27

harryalbert requested review from moirahuang and removed request for cephalonaut July 14, 2026 23:27

oz-for-oss Bot reviewed Jul 14, 2026

View reviewed changes

moirahuang approved these changes Jul 15, 2026

View reviewed changes

revert test renames

932a2bf

harryalbert force-pushed the harry/code-1822-edit-state branch from 23b2eb1 to 932a2bf Compare July 15, 2026 13:35

harryalbert mentioned this pull request Jul 15, 2026

route TUI editor input by owning-view focus #13771

Merged

2 tasks

harryalbert merged commit 9bc9919 into master Jul 15, 2026
40 of 42 checks passed

harryalbert deleted the harry/code-1822-edit-state branch July 15, 2026 16:34

This was referenced Jul 15, 2026

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

Open

Add local child agents to TUI #13776

Open

rich message component #13777

Open

add reusable TUI editor view #13817

Merged

ianhodge mentioned this pull request Jul 16, 2026

Add AskUserQuestion support to the TUI #13830

Open

12 tasks

This was referenced Jul 16, 2026

add reusable TUI tab bar component #13831

Open

Add TUI orchestration tab bar specs #13832

Draft

harryalbert mentioned this pull request Jul 16, 2026

add product and tech spec #13855

Draft

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

extract orchestration edit state into a frontend-neutral module#13707

extract orchestration edit state into a frontend-neutral module#13707
harryalbert merged 4 commits into
masterfrom
harry/code-1822-edit-state

harryalbert commented Jul 14, 2026 •

edited

Loading

Uh oh!

harryalbert commented Jul 14, 2026 •

edited by ianhodge

Loading

Uh oh!

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

edited

Loading

Uh oh!

oz-for-oss Bot left a comment

Uh oh!

moirahuang left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

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

Uh oh!

Description

Review guide

Testing

Agent Mode

Uh oh!

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

Uh oh!

Uh oh!

oz-for-oss Bot commented Jul 14, 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!

moirahuang left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

harryalbert commented Jul 14, 2026 •

edited

Loading

harryalbert commented Jul 14, 2026 •

edited by ianhodge

Loading

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

edited

Loading