1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
use crate::app;
use crate::app::state::AppState;
use crate::config;
use crate::detect::AgentState;
use crate::layout::PaneId;
use crate::protocol;
use crate::terminal::TerminalRuntimeRegistry;
pub(crate) fn should_forward_toast_to_clients(delivery: config::ToastDelivery) -> bool {
toast_notify_kind(delivery).is_some()
}
pub(crate) fn toast_notify_kind(delivery: config::ToastDelivery) -> Option<protocol::NotifyKind> {
match delivery {
config::ToastDelivery::Terminal => Some(protocol::NotifyKind::Toast),
config::ToastDelivery::System => Some(protocol::NotifyKind::SystemToast),
config::ToastDelivery::Off | config::ToastDelivery::Herdr => None,
}
}
pub(crate) fn toast_message_from_state_change(
state: &AppState,
terminal_runtimes: &TerminalRuntimeRegistry,
pane_id: PaneId,
suppress_active_tab_notifications: bool,
prev_state: AgentState,
new_state: AgentState,
previous_agent_label: Option<&str>,
) -> Option<String> {
state
.workspaces
.iter()
.enumerate()
.find_map(|(ws_idx, ws)| {
ws.tabs.iter().find_map(|tab| {
let pane = tab.panes.get(&pane_id)?;
let agent_label = state
.terminals
.get(&pane.attached_terminal_id)
.and_then(|terminal| terminal.effective_agent_label())?;
let kind = app::actions::notification_toast_for_state_change_with_agent_labels(
suppress_active_tab_notifications,
prev_state,
new_state,
previous_agent_label,
Some(agent_label),
)?;
let workspace_label = ws.display_name_from(&state.terminals, terminal_runtimes);
Some(format!(
"{} {}: {}",
agent_label,
toast_event_text(kind),
app::actions::notification_context(ws, &workspace_label, ws_idx, pane_id)
))
})
})
}
fn toast_event_text(kind: app::state::ToastKind) -> &'static str {
match kind {
app::state::ToastKind::NeedsAttention => "needs attention",
app::state::ToastKind::Finished => "finished",
app::state::ToastKind::UpdateInstalled => "updated",
}
}
#[cfg(test)]
mod tests {
#[cfg(unix)]
use super::*;
#[cfg(unix)]
use crate::detect::Agent;
#[cfg(unix)]
use crate::terminal::TerminalState;
#[cfg(unix)]
fn init_repo(path: &std::path::Path) {
let status = std::process::Command::new("git")
.args(["init", "-q"])
.current_dir(path)
.status()
.unwrap();
assert!(status.success(), "git init failed for {}", path.display());
}
#[cfg(unix)]
#[tokio::test]
async fn toast_message_uses_live_root_runtime_cwd_label() {
let mut state = AppState::test_new();
state
.workspaces
.push(crate::workspace::Workspace::test_new("stale"));
state.ensure_test_terminals();
let root = state.workspaces[0].tabs[0].root_pane;
let terminal_id = state.workspaces[0].terminal_id(root).cloned().unwrap();
let temp_root = std::env::temp_dir().join(format!(
"herdr-forwarded-toast-context-{}-{}",
std::process::id(),
std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos()
));
let stale_cwd = temp_root.join("__herdr_original__");
let live_cwd = temp_root.join("__herdr_projects__");
std::fs::create_dir_all(&stale_cwd).unwrap();
std::fs::create_dir_all(&live_cwd).unwrap();
init_repo(&stale_cwd);
init_repo(&live_cwd);
state.workspaces[0].custom_name = None;
state.workspaces[0].identity_cwd = stale_cwd.clone();
let mut terminal = TerminalState::new(terminal_id.clone(), stale_cwd);
terminal.set_detected_state(Some(Agent::Codex), AgentState::Idle);
state.terminals.insert(terminal_id.clone(), terminal);
let (events, _) = tokio::sync::mpsc::channel(4);
let runtime = crate::terminal::TerminalRuntime::spawn(
root,
24,
80,
live_cwd.clone(),
0,
crate::terminal_theme::TerminalTheme::default(),
crate::pane::PaneShellConfig::new("/bin/sh", crate::config::ShellModeConfig::NonLogin),
&crate::pane::PaneLaunchEnv::default(),
events,
std::sync::Arc::new(tokio::sync::Notify::new()),
std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false)),
)
.unwrap();
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);
while runtime.cwd() != Some(live_cwd.clone()) && std::time::Instant::now() < deadline {
tokio::time::sleep(std::time::Duration::from_millis(10)).await;
}
let mut terminal_runtimes = TerminalRuntimeRegistry::new();
terminal_runtimes.insert(terminal_id, runtime);
let message = toast_message_from_state_change(
&state,
&terminal_runtimes,
root,
false,
AgentState::Working,
AgentState::Idle,
Some("codex"),
);
assert_eq!(
message.as_deref(),
Some("codex finished: __herdr_projects__ · 1")
);
for (_, runtime) in terminal_runtimes.drain() {
runtime.shutdown();
}
let _ = std::fs::remove_dir_all(temp_root);
}
}
|
