Skip to content

refactor: extract delegates state #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zatevakhin merged 1 commit into from
Aug 21, 2026
Merged

refactor: extract delegates state #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
337 changes: 137 additions & 200 deletions src/acp_state.rs
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 22 additions & 56 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
use std::collections::{HashMap, HashSet};
use std::collections::HashSet;
use std::time::{Duration, Instant};

use crate::auth_state::AuthState;
use crate::command::Command;
use crate::composer_state::ComposerState;
use crate::connection_state::{ConnState, ConnectionState};
use crate::delegates_state::DelegatesState;
use crate::diagnostics::{AppLogEntry, DiagnosticsState, LogLevel};
use crate::domain::activity::{
ActivityState, DelegateChildState, DelegateEntry, DelegateStats, PendingDelegateToolCall,
SessionOp, SessionStatsLite,
ActivityState, DelegateChildState, DelegateStats, SessionOp, SessionStatsLite,
};
use crate::domain::chat::{ChatEntry, format_outcome_labels};
use crate::domain::elicitation::ElicitationState;
Expand Down Expand Up @@ -211,8 +211,7 @@ pub struct App {

// sessions
pub(crate) sessions: SessionsState,
/// Last rendered visible row count for the delegates tab in the popup.
pub delegate_popup_visible_rows: usize,
pub(crate) delegates: DelegatesState,

// chat
pub messages: Vec<ChatEntry>,
Expand Down Expand Up @@ -281,27 +280,6 @@ pub struct App {
// auth popup state
pub(crate) auth: AuthState,

// delegate session listing (built from event stream)
pub delegate_entries: Vec<DelegateEntry>,
pub delegate_cursor: usize,
pub delegate_filter: String,
/// Parent session ID (set when viewing a delegate child session).
pub parent_session_id: Option<String>,
/// Staging field: set by delegate popup before LoadSession, consumed by session_loaded.
pub pending_parent_session_id: Option<String>,
/// Set after DelegationCompleted/DelegationFailed; consumed by the next
/// UserMessageStored to suppress the noisy batch-result message.
pub suppress_delegation_result: bool,
/// Child-session state observed before a delegation entry can be linked.
pub pending_delegate_child_states: HashMap<String, DelegateChildState>,
pub pending_delegate_child_stats: HashMap<String, DelegateStats>,
pub delegate_child_message_ids: HashMap<String, HashSet<String>>,
/// Latest lifecycle timestamp and bounded terminal metadata by delegation ID.
pub delegation_update_times: HashMap<String, i64>,
pub delegation_result_summaries: HashMap<String, String>,
pub delegation_errors: HashMap<String, String>,
/// Parent delegate ToolCallStart records awaiting DelegationRequested linkage.
pub pending_delegate_tool_calls: Vec<PendingDelegateToolCall>,
/// While a reverted frontier turn is being suppressed, ignore any
/// follow-up assistant/tool/cancelled events until a new prompt arrives.
pub suppress_turn_output: bool,
Expand Down Expand Up @@ -349,7 +327,7 @@ impl App {
Self {
navigation: NavigationState::new(),
sessions: SessionsState::new(),
delegate_popup_visible_rows: 0,
delegates: DelegatesState::new(),
messages: Vec::new(),
pending_prompt_seq: 0,
composer: ComposerState::new(),
Expand Down Expand Up @@ -384,19 +362,6 @@ impl App {
hl: Highlighter::new(),
card_cache: CardCache::new(),
auth: AuthState::new(),
delegate_entries: Vec::new(),
delegate_cursor: 0,
delegate_filter: String::new(),
parent_session_id: None,
pending_parent_session_id: None,
suppress_delegation_result: false,
pending_delegate_child_states: HashMap::new(),
pending_delegate_child_stats: HashMap::new(),
delegate_child_message_ids: HashMap::new(),
delegation_update_times: HashMap::new(),
delegation_result_summaries: HashMap::new(),
delegation_errors: HashMap::new(),
pending_delegate_tool_calls: Vec::new(),
suppress_turn_output: false,
tick: 0,
should_quit: false,
Expand Down Expand Up @@ -1374,7 +1339,7 @@ mod reasoning_effort_tests {
#[cfg(test)]
mod delegate_entry_tests {
use super::*;
use crate::domain::activity::DelegateStatus;
use crate::domain::activity::{DelegateEntry, DelegateStatus};

fn make_entry(delegation_id: &str, objective: &str, status: DelegateStatus) -> DelegateEntry {
DelegateEntry {
Expand All @@ -1396,49 +1361,49 @@ mod delegate_entry_tests {
#[test]
fn visible_entries_empty_when_no_entries() {
let app = App::new();
assert!(app.visible_delegate_entries().is_empty());
assert!(app.delegates.visible_entries().is_empty());
}

#[test]
fn visible_entries_returns_all_when_no_filter() {
let mut app = App::new();
app.delegate_entries = vec![
app.delegates.delegate_entries = vec![
make_entry("d1", "Build feature", DelegateStatus::Completed),
make_entry("d2", "Fix tests", DelegateStatus::InProgress),
];
assert_eq!(app.visible_delegate_entries().len(), 2);
assert_eq!(app.delegates.visible_entries().len(), 2);
}

#[test]
fn visible_entries_filters_by_objective() {
let mut app = App::new();
app.delegate_entries = vec![
app.delegates.delegate_entries = vec![
make_entry("d1", "Build feature", DelegateStatus::Completed),
make_entry("d2", "Fix tests", DelegateStatus::InProgress),
];
app.delegate_filter = "build".into();
let entries = app.visible_delegate_entries();
app.delegates.delegate_filter = "build".into();
let entries = app.delegates.visible_entries();
assert_eq!(entries.len(), 1);
assert_eq!(entries[0].delegation_id, "d1");
}

#[test]
fn visible_entries_filters_by_delegation_id() {
let mut app = App::new();
app.delegate_entries = vec![
app.delegates.delegate_entries = vec![
make_entry("abc123", "Build feature", DelegateStatus::Completed),
make_entry("xyz789", "Fix tests", DelegateStatus::InProgress),
];
app.delegate_filter = "xyz".into();
let entries = app.visible_delegate_entries();
app.delegates.delegate_filter = "xyz".into();
let entries = app.delegates.visible_entries();
assert_eq!(entries.len(), 1);
assert_eq!(entries[0].delegation_id, "xyz789");
}

#[test]
fn visible_entries_filters_by_target_agent() {
let mut app = App::new();
app.delegate_entries = vec![
app.delegates.delegate_entries = vec![
DelegateEntry {
delegation_id: "d1".into(),
child_session_id: None,
Expand All @@ -1464,18 +1429,19 @@ mod delegate_entry_tests {
child_state: DelegateChildState::None,
},
];
app.delegate_filter = "planner".into();
let entries = app.visible_delegate_entries();
app.delegates.delegate_filter = "planner".into();
let entries = app.delegates.visible_entries();
assert_eq!(entries.len(), 1);
assert_eq!(entries[0].delegation_id, "d1");
}

#[test]
fn visible_entries_filter_is_case_insensitive() {
let mut app = App::new();
app.delegate_entries = vec![make_entry("d1", "Build Feature", DelegateStatus::Completed)];
app.delegate_filter = "BUILD".into();
assert_eq!(app.visible_delegate_entries().len(), 1);
app.delegates.delegate_entries =
vec![make_entry("d1", "Build Feature", DelegateStatus::Completed)];
app.delegates.delegate_filter = "BUILD".into();
assert_eq!(app.delegates.visible_entries().len(), 1);
}

// ── delegation event processing ───────────────────────────────────────────
Expand Down
Loading