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
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
//! Ticket-stamped picker deliveries. Live and headless drivers both
//! forward worker messages through the shared AppEvent channel.
use std::sync::mpsc::Receiver;
use strop_core::worker::{FailureKind, Load, Outcome, Ticket};
use strop_picker::PickerMsg;
use super::super::events::AppEvent;
use super::super::trace;
use super::super::Editor;
use super::{PickerEvent, PickerKey, PreviewEntry, PreviewResult};
/// Bridge one request's raw stream onto the app event channel, stamping
/// every message with the ticket that produced it. A disconnect before
/// the terminal event synthesizes one — streaming can never hang; after
/// the terminal event nothing else is forwarded.
pub(crate) fn forward_picker_stream(
rx: Receiver<PickerMsg>,
ticket: Ticket<PickerKey>,
tx: super::super::events::EventSender,
) -> std::io::Result<()> {
std::thread::Builder::new()
.name("picker-bridge".into())
.spawn(move || loop {
match rx.recv() {
Ok(msg) => {
let terminal = matches!(msg, PickerMsg::Finished(_));
if tx
.send(AppEvent::Picker(PickerEvent {
ticket: ticket.clone(),
msg,
}))
.is_err()
{
return; // event loop gone
}
if terminal {
return;
}
}
Err(_) => {
// the worker's channel died before any terminal
// event: synthesize one with the same ticket
let outcome =
Outcome::failed(FailureKind::Disconnected, "picker worker channel closed");
let _ = tx.send(AppEvent::Picker(PickerEvent {
ticket: ticket.clone(),
msg: PickerMsg::Finished(outcome),
}));
return;
}
}
})
.map(|_| ())
}
impl Editor {
/// One picker stream event: the TUI's AppEvent deliveries and the
/// headless drain both land here. Only the owning ticket may touch
/// the model; everything else is a trace-level rejection.
pub(crate) fn handle_picker_event(&mut self, event: PickerEvent) {
trace::services::picker(&event);
let Some(glue) = self.picker.as_mut() else {
return;
};
// RowsCurrent (0063 §6.6): the delivering ticket may touch the
// model iff it IS the active request. The request id is the
// stream's generation — decided by the verified kernel — and
// the key pins the owning instance and directory; together they
// are exactly the ticket equality this guard always was.
let owns = glue.active.as_ref().is_some_and(|active| {
strop_core::searchguard::generation_is_live(
active.request.get(),
event.ticket.request.get(),
) && active.key == event.ticket.key
});
if !owns {
trace::services::rejected("picker", "picker request superseded or completed");
return;
}
let appended = matches!(&event.msg, PickerMsg::Items(_));
let warm_scope = match &event.msg {
PickerMsg::ScopeProjects(projects) => Some(projects.clone()),
_ => None,
};
match event.msg {
PickerMsg::Items(items) => {
let items = items.into_items();
self.observe_search_items(&items);
if let Some(glue) = self.picker.as_mut() {
glue.picker.append(items);
}
}
PickerMsg::Warning(message) => glue.picker.warning = Some(message),
PickerMsg::ScopeProjects(_) => {} // handled after the match
PickerMsg::QueryError(diagnostic) => {
let range = match (&glue.query, &glue.file_scope) {
(Some(current), Some(previous)) => {
current.diagnostic_range_from(previous, &diagnostic)
}
_ => diagnostic.range.clone(),
};
glue.query_highlights
.push(strop_picker::query::HighlightSpan {
range,
role: strop_picker::query::Role::Error,
});
glue.picker.error = Some(diagnostic.message);
glue.accept_when_ranked = false;
glue.file_scope = None;
}
PickerMsg::Finished(outcome) => {
// exactly-once terminal: settle streaming, drop the
// worker (its Drop kills/reaps any live rg), keep
// whatever items already streamed — a failure never
// erases the useful partial results
glue.active = None;
glue.rx = None;
glue.picker.streaming = false;
glue.worker = None;
match outcome {
Outcome::Success(()) => {}
Outcome::Failed { failure, .. } => {
glue.picker.error = Some(failure.message);
glue.accept_when_ranked = false;
glue.file_scope = None;
}
Outcome::Cancelled(_) => {
glue.picker.error = Some("source cancelled; refresh to continue".into());
glue.accept_when_ranked = false;
glue.file_scope = None;
}
}
}
}
if let Some(projects) = warm_scope {
self.lsp_warm_scope_projects(projects);
}
if appended {
self.request_picker_ranking();
}
self.finish_search_refresh();
self.finish_pending_picker_accept();
}
/// One preview completion → cached entry. Only the exact registered
/// ticket for the path may publish; failures render blank (as
/// before) but stay owned — a reopen retries instead of caching
/// the miss forever.
pub(crate) fn handle_preview(&mut self, result: PreviewResult) {
let path = result.ticket.key.path.clone();
if !self
.preview_loads
.get(&path)
.is_some_and(|load| load.owns(&result.ticket))
{
trace::services::rejected("preview", "preview request superseded");
return;
}
self.worker_handles.remove(&result.ticket.request);
self.preview_loads.remove(&path);
if !self
.picker
.as_ref()
.is_some_and(|glue| glue.id == result.ticket.key.picker)
{
trace::services::rejected("preview", "picker closed");
return;
}
strop_trace::record_with(strop_trace::EventKind::JobFinished, || {
let outcome = match &result.outcome {
Outcome::Success(text) => {
serde_json::json!({"result":"success","bytes":text.rope.len_bytes()})
}
Outcome::Failed { failure, .. } => serde_json::json!({
"result":"failed","kind":format!("{:?}",failure.kind),
"message":failure.message}),
Outcome::Cancelled(reason) => serde_json::json!({
"result":"cancelled","reason":format!("{reason:?}")}),
};
serde_json::json!({
"service":"preview","request":result.ticket.request.get(),
"location":path,"outcome":outcome,
})
});
let key = result.ticket.key;
match result.outcome {
Outcome::Success(prepared) => {
const CACHED_PREVIEWS: usize = 32;
if self.previews.len() >= CACHED_PREVIEWS && !self.previews.contains_key(&path) {
if let Some(old) = self.previews.keys().next().cloned() {
self.previews.remove(&old);
self.preview_loads.remove(&old);
self.analysis
.forget(super::super::analysis::AnalysisTarget::Preview(old));
}
}
self.analysis
.forget(super::super::analysis::AnalysisTarget::Preview(
path.clone(),
));
self.previews.insert(
path.clone(),
PreviewEntry {
rope: prepared.rope,
},
);
self.preview_loads.insert(path, Load::Ready(key));
}
Outcome::Failed { failure, .. } => {
self.message = format!("preview: {}", failure.message);
self.preview_loads
.insert(path, Load::Failed { key, failure });
}
Outcome::Cancelled(reason) => {
self.preview_loads
.insert(path, Load::Cancelled { key, reason });
}
}
}
}