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
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
//! Global task join ownership (v2 §7.3).
//!
//! Every runtime task is registered before its start gate is released. Abort
//! retains the join until the result is observed. Live `JoinHandle` values are
//! never dropped.
use futures_util::FutureExt;
use monoloop_contracts::{ExchangeId, ToolExecutionId, TransactionId};
use std::collections::{HashMap, HashSet};
use std::future::Future;
use std::panic::AssertUnwindSafe;
use tokio::task::{AbortHandle, Id as TokioTaskId, JoinSet};
/// Stable task id within one runtime owner.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub struct TaskId(pub u64);
/// Classification for every supervised spawn.
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum TaskClass {
/// Per-transaction coordinator.
TransactionCoordinator(TransactionId),
/// Event publisher task for one transaction.
EventPublisher(TransactionId),
/// Connector ownership task.
ConnectorOwner(TransactionId, ExchangeId),
/// Interpreter pump task.
InterpreterOwner(TransactionId, ExchangeId),
/// Tool worker.
ToolWorker(TransactionId, ToolExecutionId),
/// Inner LoopRuntime owner for one transaction (M5).
LoopRuntime(TransactionId),
/// MCP request task.
McpRequest(TransactionId),
/// Post-terminal finalizer (Seal + completion publish) for one transaction.
Finalizer(TransactionId),
/// Runtime-wide service (MCP listener, etc.).
RuntimeService,
}
impl TaskClass {
/// Owning transaction when task-scoped.
pub fn transaction_id(&self) -> Option<TransactionId> {
match self {
Self::TransactionCoordinator(t)
| Self::EventPublisher(t)
| Self::ConnectorOwner(t, _)
| Self::InterpreterOwner(t, _)
| Self::ToolWorker(t, _)
| Self::LoopRuntime(t)
| Self::McpRequest(t)
| Self::Finalizer(t) => Some(*t),
Self::RuntimeService => None,
}
}
}
/// Observed task exit kind.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum TaskExit {
/// Future completed normally.
Completed,
/// Task was aborted / cancelled.
Cancelled,
/// Join observed a panic.
Panicked,
}
#[derive(Debug)]
struct TaskMeta {
class: TaskClass,
abort: AbortHandle,
abort_requested: bool,
tokio_id: TokioTaskId,
}
/// Retains every runtime join until observed complete.
#[derive(Debug)]
pub struct TaskSupervisor {
joins: JoinSet<(TaskId, TaskExit)>,
meta: HashMap<TaskId, TaskMeta>,
by_transaction: HashMap<TransactionId, HashSet<TaskId>>,
/// Maps Tokio task id → supervisor TaskId so cancelled joins never leak meta.
by_tokio_id: HashMap<TokioTaskId, TaskId>,
next_id: u64,
}
impl Default for TaskSupervisor {
fn default() -> Self {
Self::new()
}
}
impl TaskSupervisor {
/// Empty supervisor.
pub fn new() -> Self {
Self {
joins: JoinSet::new(),
meta: HashMap::new(),
by_transaction: HashMap::new(),
by_tokio_id: HashMap::new(),
next_id: 1,
}
}
/// Number of tasks still registered (including abort-requested).
pub fn registered_count(&self) -> usize {
self.meta.len()
}
/// Whether stopped proof can assert zero owned tasks.
pub fn is_empty(&self) -> bool {
self.meta.is_empty() && self.joins.is_empty()
}
/// Tasks still associated with a transaction.
pub fn tasks_for(&self, tx: &TransactionId) -> Vec<TaskId> {
self.by_transaction
.get(tx)
.map(|s| s.iter().copied().collect())
.unwrap_or_default()
}
/// Register then spawn. The future does not run until after registration
/// completes (start-gate released at the end of this method).
pub fn spawn<F>(&mut self, class: TaskClass, future: F) -> TaskId
where
F: Future<Output = ()> + Send + 'static,
{
let id = TaskId(self.next_id);
self.next_id = self.next_id.saturating_add(1);
let (gate_tx, gate_rx) = tokio::sync::oneshot::channel::<()>();
let abort = self.joins.spawn(async move {
// Fail closed if the gate is dropped before release (abort-before-start).
match gate_rx.await {
Ok(()) => match AssertUnwindSafe(future).catch_unwind().await {
Ok(()) => (id, TaskExit::Completed),
Err(_) => (id, TaskExit::Panicked),
},
Err(_) => (id, TaskExit::Cancelled),
}
});
let tokio_id = abort.id();
if let Some(tx) = class.transaction_id() {
self.by_transaction.entry(tx).or_default().insert(id);
}
self.by_tokio_id.insert(tokio_id, id);
self.meta.insert(
id,
TaskMeta {
class,
abort,
abort_requested: false,
tokio_id,
},
);
// Release start gate only after registration is complete.
let _ = gate_tx.send(());
id
}
/// Request abort; task remains registered until join is observed.
pub fn abort(&mut self, id: TaskId) {
if let Some(meta) = self.meta.get_mut(&id) {
meta.abort_requested = true;
meta.abort.abort();
}
}
/// Abort all tasks for a transaction.
pub fn abort_transaction(&mut self, tx: &TransactionId) {
let ids = self.tasks_for(tx);
for id in ids {
self.abort(id);
}
}
/// Abort residual tx work but keep [`TaskClass::Finalizer`] and
/// [`TaskClass::EventPublisher`] alive so Seal + completion publication can
/// finish (one completion per admission).
pub fn abort_transaction_residuals(&mut self, tx: &TransactionId) {
let ids = self.tasks_for(tx);
for id in ids {
let keep = self.meta.get(&id).is_some_and(|m| {
matches!(
m.class,
TaskClass::Finalizer(_) | TaskClass::EventPublisher(_)
)
});
if !keep {
self.abort(id);
}
}
}
/// Hard-grace abort: keep only [`TaskClass::Finalizer`] so Seal→completion
/// can finish; abort a stuck EventPublisher that already Sealed or timed out.
pub fn abort_transaction_except_finalizer(&mut self, tx: &TransactionId) {
let ids = self.tasks_for(tx);
for id in ids {
let keep = self
.meta
.get(&id)
.is_some_and(|m| matches!(m.class, TaskClass::Finalizer(_)));
if !keep {
self.abort(id);
}
}
}
/// Abort every registered task (shutdown).
pub fn abort_all(&mut self) {
let ids: Vec<_> = self.meta.keys().copied().collect();
for id in ids {
self.abort(id);
}
}
/// Abort all tasks and observe joins until the set is empty.
///
/// Returns `false` if joins do not complete within the bound — caller MUST
/// remain `Quiescing` (never report `Stopped` while owned work remains).
/// Live `JoinHandle`s are retained (§7.3 / §21: no drop on deadline).
pub async fn abort_and_drain(&mut self) -> bool {
self.abort_all();
let drain = async { while self.join_next().await.is_some() {} };
if tokio::time::timeout(std::time::Duration::from_secs(2), drain)
.await
.is_err()
{
return false;
}
self.meta.clear();
self.by_transaction.clear();
self.by_tokio_id.clear();
true
}
/// Poll for the next finished task and deregister it.
pub async fn join_next(&mut self) -> Option<(TaskId, TaskClass, TaskExit)> {
let finished = self.joins.join_next_with_id().await?;
self.reap_finished(finished)
}
/// Non-blocking reap of already-finished joins.
pub fn try_reap_finished(&mut self) -> Vec<(TaskId, TaskClass, TaskExit)> {
let mut out = Vec::new();
while let Some(finished) = self.joins.try_join_next_with_id() {
if let Some(item) = self.reap_finished(finished) {
out.push(item);
}
}
out
}
fn reap_finished(
&mut self,
finished: Result<(TokioTaskId, (TaskId, TaskExit)), tokio::task::JoinError>,
) -> Option<(TaskId, TaskClass, TaskExit)> {
match finished {
Ok((tokio_id, (id, exit))) => {
self.by_tokio_id.remove(&tokio_id);
let exit = if self.meta.get(&id).is_some_and(|m| m.abort_requested)
&& matches!(exit, TaskExit::Completed)
{
TaskExit::Cancelled
} else {
exit
};
let class = self.deregister(id)?;
Some((id, class, exit))
}
Err(err) => {
// Abort/panic dropped the future before it returned our tuple.
let exit = if err.is_cancelled() {
TaskExit::Cancelled
} else {
TaskExit::Panicked
};
let tokio_id = err.id();
let id = self
.by_tokio_id
.remove(&tokio_id)
.or_else(|| self.find_finished_meta())?;
let class = self.deregister(id)?;
Some((id, class, exit))
}
}
}
fn find_finished_meta(&self) -> Option<TaskId> {
self.meta
.iter()
.find(|(_, m)| m.abort.is_finished())
.map(|(id, _)| *id)
}
fn deregister(&mut self, id: TaskId) -> Option<TaskClass> {
let meta = self.meta.remove(&id)?;
self.by_tokio_id.remove(&meta.tokio_id);
if let Some(tx) = meta.class.transaction_id() {
if let Some(set) = self.by_transaction.get_mut(&tx) {
set.remove(&id);
if set.is_empty() {
self.by_transaction.remove(&tx);
}
}
}
Some(meta.class)
}
}