Split pane_group orchestration code into submodules#12039
Conversation
|
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 Powered by Oz |
There was a problem hiding this comment.
Overview
This PR splits the pane_group orchestration restoration code into ambient pane restoration, remote child hydration, and child restoration submodules while keeping the existing PaneGroup orchestration behavior intact.
Concerns
- No blocking concerns found in the annotated diff.
- The spec context attachment reports that no approved or repository spec context was found, so there was no material implementation-vs-spec drift to evaluate.
Verdict
Found: 0 critical, 0 important, 0 suggestions
Approve
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
|
Will review once your other PR is merged and this is rebased, since this is containing that PR's changes currently |
Pure rename to make room for new submodules. No content changes. Co-Authored-By: Oz <oz-agent@warp.dev>
Move orchestration-specific code out of pane_group/mod.rs into three
new submodules to reduce the size of mod.rs (~9k → ~8k lines).
No behavioral changes — purely a mechanical move.
New file structure under app/src/pane_group/:
- ambient_pane_restoration.rs (new)
* AmbientRestoreKind enum
* register_pending_ambient_restorations
* process_pending_ambient_restorations
* replace_pane_with_new_cloud_conversation
* fetch_and_load_transcript
- child_agent/hydration.rs (new)
* RemoteChildHydrationAction enum
* decide_remote_child_hydration_action fn
* hydrate_task_backed_hidden_child_pane
* attempt_remote_child_hydration
* apply_existing_ambient_task_to_pane
* hydrate_remote_child_transcript_in_place
* attach_ambient_session_and_maybe_tombstone
* process_pending_remote_child_hydrations
- child_agent/restoration.rs (new)
* create_hidden_child_agent_pane
* restore_missing_child_agent_panes_for_parent
* restore_missing_child_agent_panes_for_terminal_pane_if_needed
* ensure_hidden_child_agent_pane_for_conversation
* ensure_shared_session_viewer_child_pane
mod.rs still owns the shared subscription wiring
(ensure_pending_ambient_restoration_subscription and
handle_pending_ambient_restoration_event) plus all PaneGroup struct
fields.
Co-Authored-By: Oz <oz-agent@warp.dev>
d1941ec to
b2f1ea2
Compare
|
Sorry for the noise - should be rebased now |
Description
Follow-up to PR #11722 (orch-restore Phase 1) addressing Roland's review nit that
pane_group/mod.rsis too long (~9k lines).Mechanical move only — no behavioral changes. Moves orchestration-specific code into three new submodules under
app/src/pane_group/:ambient_pane_restoration.rs(new) — top-level ambient pane pending-restoration:AmbientRestoreKind,register_pending_ambient_restorations,process_pending_ambient_restorations,replace_pane_with_new_cloud_conversation,fetch_and_load_transcript.child_agent/hydration.rs(new) — remote-child cloud-transcript hydration:RemoteChildHydrationAction,decide_remote_child_hydration_action,hydrate_task_backed_hidden_child_pane,attempt_remote_child_hydration,apply_existing_ambient_task_to_pane,hydrate_remote_child_transcript_in_place,attach_ambient_session_and_maybe_tombstone,process_pending_remote_child_hydrations.child_agent/restoration.rs(new) — hidden child pane materialization:create_hidden_child_agent_pane,restore_missing_child_agent_panes_for_parent,restore_missing_child_agent_panes_for_terminal_pane_if_needed,ensure_hidden_child_agent_pane_for_conversation,ensure_shared_session_viewer_child_pane.mod.rsretains the shared subscription wiring (ensure_pending_ambient_restoration_subscription,handle_pending_ambient_restoration_event) and allPaneGroupstruct fields. Line count drops from 8946 → 7996.pane_group/child_agent.rswas converted to a directory (child_agent/mod.rs) in commit 1 (pure rename); commit 2 adds the new submodules and removes the moved code frommod.rs.Testing
cargo fmt --all -- --checkcargo clippy -p warp --all-targets --features local_fs -- -D warningscargo nextest run -p warp --features local_fs 'pane_group::'— 106/106 tests passAgent Mode
Conversation: https://staging.warp.dev/conversation/d3b66223-bbbf-4a8f-9e12-7b31b9d5202e
Run: https://oz.staging.warp.dev/runs/019e85b3-6634-74c5-a0e2-1bc9797cb37a
This PR was generated with Oz.