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
158
159
160
161
162
163
164
165
166
167
168
169
170
|
use super::{api_helpers::pane_agent_status, App};
// Staged for #00f: the agent CLI will use this resolver once #00e provides terminal ids.
#[allow(dead_code)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct TerminalTarget {
pub ws_idx: usize,
pub tab_idx: usize,
pub pane_id: crate::layout::PaneId,
pub terminal_id: String,
}
// Staged for #00f: ambiguity details are produced before the agent facade consumes them.
#[allow(dead_code)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct TerminalTargetCandidate {
pub terminal_id: String,
pub pane_id: String,
pub workspace_id: String,
pub tab_id: String,
pub cwd: Option<String>,
pub agent_status: crate::api::schema::AgentStatus,
}
// Staged for #00f: target errors are specified now and surfaced by agent commands next.
#[allow(dead_code)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) enum TerminalTargetError {
NotFound {
target: String,
},
Ambiguous {
target: String,
candidates: Vec<TerminalTargetCandidate>,
},
}
impl App {
// Staged for #00f: current pane APIs stay pane-targeted while agent APIs will call this.
#[allow(dead_code)]
pub(crate) fn resolve_terminal_target(
&self,
target: &str,
) -> Result<TerminalTarget, TerminalTargetError> {
let terminal_matches: Vec<_> = self
.terminal_targets()
.into_iter()
.filter(|candidate| candidate.terminal_id == target)
.collect();
if let Some(resolved) = self.single_terminal_match(target, terminal_matches)? {
return Ok(resolved);
}
if let Some((ws_idx, pane_id)) = self.parse_pane_id(target) {
if let Some(resolved) = self.terminal_target_for_pane(ws_idx, pane_id) {
return Ok(resolved);
}
}
let name_matches: Vec<_> = self
.terminal_targets()
.into_iter()
.filter(|candidate| {
self.state
.terminals
.values()
.find(|terminal| terminal.id.to_string() == candidate.terminal_id)
.is_some_and(|terminal| {
terminal.agent_name.as_deref() == Some(target)
|| terminal.effective_agent_label() == Some(target)
})
})
.collect();
if let Some(resolved) = self.single_terminal_match(target, name_matches)? {
return Ok(resolved);
}
Err(TerminalTargetError::NotFound {
target: target.to_string(),
})
}
// Staged for #00f with resolve_terminal_target.
#[allow(dead_code)]
fn single_terminal_match(
&self,
target: &str,
matches: Vec<TerminalTarget>,
) -> Result<Option<TerminalTarget>, TerminalTargetError> {
match matches.len() {
0 => Ok(None),
1 => Ok(matches.into_iter().next()),
_ => Err(TerminalTargetError::Ambiguous {
target: target.to_string(),
candidates: matches
.into_iter()
.filter_map(|candidate| {
self.terminal_target_candidate(candidate.ws_idx, candidate.pane_id)
})
.collect(),
}),
}
}
// Staged for #00f with resolve_terminal_target.
#[allow(dead_code)]
fn terminal_targets(&self) -> Vec<TerminalTarget> {
self.state
.workspaces
.iter()
.enumerate()
.flat_map(|(ws_idx, ws)| {
ws.tabs.iter().enumerate().flat_map(move |(tab_idx, tab)| {
tab.layout
.pane_ids()
.into_iter()
.filter_map(move |pane_id| {
tab.terminal_id(pane_id).map(|terminal_id| TerminalTarget {
ws_idx,
tab_idx,
pane_id,
terminal_id: terminal_id.to_string(),
})
})
})
})
.collect()
}
// Staged for #00f with resolve_terminal_target.
#[allow(dead_code)]
fn terminal_target_for_pane(
&self,
ws_idx: usize,
pane_id: crate::layout::PaneId,
) -> Option<TerminalTarget> {
let ws = self.state.workspaces.get(ws_idx)?;
let tab_idx = ws.find_tab_index_for_pane(pane_id)?;
let terminal_id = ws.terminal_id(pane_id)?.to_string();
Some(TerminalTarget {
ws_idx,
tab_idx,
pane_id,
terminal_id,
})
}
// Staged for #00f with resolve_terminal_target.
#[allow(dead_code)]
fn terminal_target_candidate(
&self,
ws_idx: usize,
pane_id: crate::layout::PaneId,
) -> Option<TerminalTargetCandidate> {
let ws = self.state.workspaces.get(ws_idx)?;
let tab_idx = ws.find_tab_index_for_pane(pane_id)?;
let pane = ws.pane_state(pane_id)?;
let terminal = self.state.terminals.get(&pane.attached_terminal_id)?;
Some(TerminalTargetCandidate {
terminal_id: terminal.id.to_string(),
pane_id: self.public_pane_id(ws_idx, pane_id)?,
workspace_id: self.public_workspace_id(ws_idx),
tab_id: self.public_tab_id(ws_idx, tab_idx)?,
cwd: ws.tabs[tab_idx]
.cwd_for_pane(pane_id, &self.state.terminals, &self.terminal_runtimes)
.map(|cwd| cwd.display().to_string()),
agent_status: pane_agent_status(terminal.state, pane.seen),
})
}
}
|
