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
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
//! Dedicated persistence actor for session save / checkpoint I/O.
//!
//! ## Motivation
//!
//! Before this module, `persist_checkpoint` and `persist_session_snapshot` ran
//! synchronously on the tokio worker thread that drives the TUI event loop.
//! Each call serialised all API messages to JSON, wrote a temp file, and
//! renamed it atomically — blocking keyboard input for the duration.
//! `save_session` additionally called `cleanup_old_sessions`, which listed all
//! session files, parsed metadata from every one, sorted, and deleted the
//! oldest — scaling O(session-bytes + file-count) with every turn.
//!
//! ## Design
//!
//! - **One dedicated tokio task** spawned at TUI startup. All disk I/O moves
//! to this task. The UI merely `try_send`s a request (non-blocking,
//! bounded-channel drop) and returns immediately — keystrokes are never
//! gated on write completion.
//! - **Latest-wins coalescing**: when multiple `Checkpoint`,
//! `SessionSnapshot`, or offline-queue requests pile up before the actor's
//! next write cycle, only the most recent one is written. `ClearCheckpoint`
//! requests accumulate normally (they're cheap and commutative).
//! - **Unbounded channel** for `try_send` to always succeed; the actor
//! naturally backpressures via the spawn pool. A few outstanding
//! `SavedSession` values in the channel (< 1 MB) is negligible pressure.
use std::collections::BTreeMap;
use std::sync::OnceLock;
use tokio::sync::mpsc;
use crate::session_manager::{OfflineQueueState, SavedSession, SessionManager};
use crate::utils::spawn_supervised;
// ---------------------------------------------------------------------------
// Request type
// ---------------------------------------------------------------------------
/// Persistence work item sent to the actor.
#[derive(Debug)]
pub enum PersistRequest {
/// Write a crash-recovery checkpoint (in-flight turn state).
Checkpoint(SavedSession),
/// Write a full session snapshot (completed turn, durable save).
SessionSnapshot(SavedSession),
/// Write queued/draft offline input for crash recovery.
OfflineQueue {
state: OfflineQueueState,
session_id: Option<String>,
},
/// Remove the queued/draft offline input file.
ClearOfflineQueue,
/// Remove the crash-recovery checkpoint file.
ClearCheckpoint,
/// Graceful shutdown — flush pending writes, then exit the actor loop.
Shutdown,
}
#[derive(Debug)]
enum PendingOfflineQueue {
Save {
state: OfflineQueueState,
session_id: Option<String>,
},
Clear,
}
// ---------------------------------------------------------------------------
// Handle (held by the TUI)
// ---------------------------------------------------------------------------
/// Lightweight handle that the UI holds to queue persistence work.
#[derive(Debug, Clone)]
pub struct PersistActorHandle {
tx: mpsc::UnboundedSender<PersistRequest>,
}
impl PersistActorHandle {
/// Queue a persistence request without blocking. If the actor's channel is
/// closed (shutdown has already happened) the request is silently dropped.
pub fn try_send(&self, request: PersistRequest) {
let _ = self.tx.send(request);
}
}
// ---------------------------------------------------------------------------
// Global singleton (avoid threading through App)
// ---------------------------------------------------------------------------
static ACTOR_TX: OnceLock<PersistActorHandle> = OnceLock::new();
/// Initialise the global persistence actor handle. Must be called once at
/// startup, before the event loop starts.
pub fn init_actor(handle: PersistActorHandle) {
let _ = ACTOR_TX.set(handle);
}
/// Queue a persistence request through the global handle. No-op (silently
/// ignored) when the actor hasn't been initialised yet — this can happen in
/// tests or early startup before the actor is ready.
pub fn persist(request: PersistRequest) {
if let Some(handle) = ACTOR_TX.get() {
handle.try_send(request);
}
}
// ---------------------------------------------------------------------------
// Actor spawn
// ---------------------------------------------------------------------------
/// Spawn the persistence actor task and return a handle for the caller to
/// store and initialise.
///
/// The returned handle should be passed to [`init_actor`] so that the
/// `persist()` free function can reach it from anywhere in the TUI.
pub fn spawn_persistence_actor(
manager: SessionManager,
) -> (PersistActorHandle, tokio::task::JoinHandle<()>) {
let (tx, mut rx) = mpsc::unbounded_channel::<PersistRequest>();
let handle = PersistActorHandle { tx };
let task = spawn_supervised(
"persistence-actor",
std::panic::Location::caller(),
async move {
let mut latest_checkpoint: Option<SavedSession> = None;
// Latest-wins per session id. Coalescing into one global slot can
// drop session A when an immediate `/new` queues session B before
// the actor drains.
let mut latest_sessions: BTreeMap<String, SavedSession> = BTreeMap::new();
let mut latest_offline_queue: Option<PendingOfflineQueue> = None;
let mut should_clear: bool = false;
loop {
// Drain everything waiting, keeping only the latest of each kind.
while let Ok(req) = rx.try_recv() {
match req {
PersistRequest::Checkpoint(session) => {
// Last-writer-wins: a fresh checkpoint supersedes a
// pending clear so the two never both apply in one
// drain (which previously cleared then re-wrote the
// stale checkpoint, undoing the clear).
latest_checkpoint = Some(session);
should_clear = false;
}
PersistRequest::SessionSnapshot(session) => {
latest_sessions.insert(session.metadata.id.clone(), session);
}
PersistRequest::OfflineQueue { state, session_id } => {
latest_offline_queue =
Some(PendingOfflineQueue::Save { state, session_id });
}
PersistRequest::ClearOfflineQueue => {
latest_offline_queue = Some(PendingOfflineQueue::Clear);
}
PersistRequest::ClearCheckpoint => {
// A clear supersedes a pending checkpoint write.
should_clear = true;
latest_checkpoint = None;
}
PersistRequest::Shutdown => {
flush_inner(
&manager,
latest_checkpoint.as_ref(),
&latest_sessions,
latest_offline_queue.as_ref(),
should_clear,
);
return;
}
}
}
// Write coalesced work.
if should_clear {
let _ = manager.clear_checkpoint();
should_clear = false;
}
if let Some(ref session) = latest_checkpoint.take() {
let _ = manager.save_checkpoint(session);
}
for (_, session) in std::mem::take(&mut latest_sessions) {
let _ = manager.save_session(&session);
}
if let Some(ref request) = latest_offline_queue.take() {
apply_offline_queue_request(&manager, request);
}
// Block until the next request arrives.
match rx.recv().await {
Some(PersistRequest::Checkpoint(session)) => {
latest_checkpoint = Some(session);
should_clear = false;
}
Some(PersistRequest::SessionSnapshot(session)) => {
latest_sessions.insert(session.metadata.id.clone(), session);
}
Some(PersistRequest::OfflineQueue { state, session_id }) => {
latest_offline_queue =
Some(PendingOfflineQueue::Save { state, session_id });
}
Some(PersistRequest::ClearOfflineQueue) => {
latest_offline_queue = Some(PendingOfflineQueue::Clear);
}
Some(PersistRequest::ClearCheckpoint) => {
should_clear = true;
latest_checkpoint = None;
}
Some(PersistRequest::Shutdown) => {
flush_inner(
&manager,
latest_checkpoint.as_ref(),
&latest_sessions,
latest_offline_queue.as_ref(),
should_clear,
);
return;
}
None => {
// Channel closed — final flush and exit.
flush_inner(
&manager,
latest_checkpoint.as_ref(),
&latest_sessions,
latest_offline_queue.as_ref(),
should_clear,
);
return;
}
}
}
},
);
(handle, task)
}
/// Write any pending work to disk (used on shutdown).
fn flush_inner(
manager: &SessionManager,
checkpoint: Option<&SavedSession>,
sessions: &BTreeMap<String, SavedSession>,
offline_queue: Option<&PendingOfflineQueue>,
should_clear: bool,
) {
if should_clear {
let _ = manager.clear_checkpoint();
}
if let Some(s) = checkpoint {
let _ = manager.save_checkpoint(s);
}
for s in sessions.values() {
let _ = manager.save_session(s);
}
if let Some(request) = offline_queue {
apply_offline_queue_request(manager, request);
}
}
fn apply_offline_queue_request(manager: &SessionManager, request: &PendingOfflineQueue) {
match request {
PendingOfflineQueue::Save { state, session_id } => {
let _ = manager.save_offline_queue_state(state, session_id.as_deref());
}
PendingOfflineQueue::Clear => {
let _ = manager.clear_offline_queue_state();
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use std::time::Duration;
use crate::session_manager::{OfflineQueueState, QueuedSessionMessage};
async fn wait_until(mut predicate: impl FnMut() -> bool) {
let deadline = tokio::time::Instant::now() + Duration::from_secs(2);
loop {
if predicate() {
return;
}
assert!(
tokio::time::Instant::now() < deadline,
"timed out waiting for persistence actor"
);
tokio::time::sleep(Duration::from_millis(10)).await;
}
}
#[tokio::test]
async fn actor_persists_and_clears_offline_queue_requests() {
let tmp = tempfile::tempdir().expect("tempdir");
let sessions_dir = tmp.path().join("sessions");
let manager = SessionManager::new(sessions_dir.clone()).expect("manager");
let queue_path = sessions_dir.join("checkpoints").join("offline_queue.json");
let (handle, task) = spawn_persistence_actor(manager);
let state = OfflineQueueState {
messages: vec![QueuedSessionMessage {
display: "queued from enter".to_string(),
skill_instruction: None,
}],
..OfflineQueueState::default()
};
handle.try_send(PersistRequest::OfflineQueue {
state,
session_id: Some("session-A".to_string()),
});
wait_until(|| {
std::fs::read_to_string(&queue_path)
.is_ok_and(|body| body.contains("queued from enter"))
})
.await;
handle.try_send(PersistRequest::ClearOfflineQueue);
wait_until(|| !queue_path.exists()).await;
handle.try_send(PersistRequest::Shutdown);
task.await.expect("persistence actor join");
}
#[tokio::test]
async fn shutdown_wait_flushes_queued_session_before_returning() {
let tmp = tempfile::tempdir().expect("tempdir");
let sessions_dir = tmp.path().join("sessions");
let manager = SessionManager::new(sessions_dir.clone()).expect("manager");
let verification_manager = SessionManager::new(sessions_dir).expect("verification manager");
let session = crate::session_manager::create_saved_session_with_mode(
&[],
"deepseek-v4-pro",
tmp.path(),
0,
None,
Some("agent"),
);
let session_id = session.metadata.id.clone();
let (handle, task) = spawn_persistence_actor(manager);
handle.try_send(PersistRequest::SessionSnapshot(session));
handle.try_send(PersistRequest::Shutdown);
task.await.expect("persistence actor join");
let loaded = verification_manager
.load_session(&session_id)
.expect("shutdown must flush queued session");
assert_eq!(loaded.metadata.id, session_id);
}
#[tokio::test]
async fn shutdown_flushes_latest_snapshot_for_each_session_id() {
let tmp = tempfile::tempdir().expect("tempdir");
let sessions_dir = tmp.path().join("sessions");
let manager = SessionManager::new(sessions_dir.clone()).expect("manager");
let verification_manager = SessionManager::new(sessions_dir).expect("verification manager");
let mut first = crate::session_manager::create_saved_session_with_mode(
&[],
"deepseek-v4-pro",
tmp.path(),
0,
None,
Some("agent"),
);
first.metadata.title = "Session A".to_string();
let mut second = crate::session_manager::create_saved_session_with_mode(
&[],
"deepseek-v4-pro",
tmp.path(),
0,
None,
Some("agent"),
);
second.metadata.title = "Session B".to_string();
let first_id = first.metadata.id.clone();
let second_id = second.metadata.id.clone();
let (handle, task) = spawn_persistence_actor(manager);
handle.try_send(PersistRequest::SessionSnapshot(first));
handle.try_send(PersistRequest::SessionSnapshot(second));
handle.try_send(PersistRequest::Shutdown);
task.await.expect("persistence actor join");
assert_eq!(
verification_manager
.load_session(&first_id)
.expect("session A flushed")
.metadata
.title,
"Session A"
);
assert_eq!(
verification_manager
.load_session(&second_id)
.expect("session B flushed")
.metadata
.title,
"Session B"
);
}
}