meerkat-session 0.6.21

Session service orchestration for Meerkat
Documentation
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
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
//! Regression tests for EphemeralSessionService lifecycle invariants.
//!
//! These tests lock down create/turn/read/archive/interrupt/event/label
//! semantics using mock agents. Deterministic — no API keys, no `#[ignore]`.

#![allow(clippy::unwrap_used, clippy::expect_used)]

use async_trait::async_trait;
use futures::StreamExt;
use meerkat_core::AgentExecutionSnapshot;
use meerkat_core::event::AgentEvent;
use meerkat_core::lifecycle::RunId;
use meerkat_core::ops::OperationId;
use meerkat_core::service::{
    AppendSystemContextRequest, AppendSystemContextStatus, CreateSessionRequest,
    DeferredPromptPolicy, InitialTurnPolicy, SessionError, SessionQuery, SessionService,
    SessionServiceControlExt, StartTurnRequest, TurnToolOverlay,
};
use meerkat_core::types::{
    HandlingMode, RenderClass, RenderMetadata, RenderSalience, RunResult, SessionId, Usage,
};
#[cfg(all(feature = "session-store", not(target_arch = "wasm32")))]
use meerkat_session::PersistentSessionService;
use meerkat_session::ephemeral::SessionSnapshot;
use meerkat_session::{EphemeralSessionService, SessionAgent, SessionAgentBuilder};
#[cfg(all(feature = "session-store", not(target_arch = "wasm32")))]
use meerkat_store::{MemoryStore, SessionStore};
use std::collections::BTreeMap;
use std::sync::Arc;
use std::time::SystemTime;
use tokio::sync::mpsc;

// ---------------------------------------------------------------------------
// Mock agent (copied from ephemeral_contract.rs pattern)
// ---------------------------------------------------------------------------

struct MockAgent {
    session_id: SessionId,
    message_count: usize,
    delay_ms: Option<u64>,
    should_fail: bool,
    total_input_tokens: u64,
    total_output_tokens: u64,
    system_context_state: Arc<std::sync::Mutex<meerkat_core::SessionSystemContextState>>,
}

#[derive(Clone, Debug, PartialEq, Eq)]
struct RecordedTurnMetadata {
    handling_mode: HandlingMode,
    render_metadata: Option<RenderMetadata>,
}

struct RecordingTurnAgent {
    session_id: SessionId,
    recorded: Arc<std::sync::Mutex<Vec<RecordedTurnMetadata>>>,
    system_context_state: Arc<std::sync::Mutex<meerkat_core::SessionSystemContextState>>,
}

struct SnapshotAgent {
    session_id: SessionId,
    execution_snapshot: AgentExecutionSnapshot,
    tool_scope_snapshot: meerkat_core::ToolScopeSnapshot,
    external_tool_surface_snapshot: Option<meerkat_core::ExternalToolSurfaceSnapshot>,
    system_context_state: Arc<std::sync::Mutex<meerkat_core::SessionSystemContextState>>,
}

#[async_trait]
impl SessionAgent for MockAgent {
    async fn run_with_events(
        &mut self,
        _prompt: meerkat_core::types::ContentInput,
        event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, meerkat_core::error::AgentError> {
        if let Some(delay) = self.delay_ms {
            tokio::time::sleep(tokio::time::Duration::from_millis(delay)).await;
        }

        if self.should_fail {
            let _ = event_tx
                .send(AgentEvent::RunFailed {
                    session_id: self.session_id.clone(),
                    error_class: meerkat_core::event::AgentErrorClass::Internal,
                    error: "simulated failure".to_string(),
                    error_report: None,
                    terminal_cause_kind: None,
                })
                .await;
            return Err(meerkat_core::error::AgentError::InternalError(
                "simulated agent failure".to_string(),
            ));
        }

        let _ = event_tx
            .send(AgentEvent::RunStarted {
                session_id: self.session_id.clone(),
                prompt: meerkat_core::ContentInput::Text("test".to_string()),
            })
            .await;

        self.message_count += 2; // user + assistant
        self.total_input_tokens += 10;
        self.total_output_tokens += 5;

        let usage = Usage {
            input_tokens: 10,
            output_tokens: 5,
            cache_creation_tokens: None,
            cache_read_tokens: None,
        };

        let _ = event_tx
            .send(AgentEvent::RunCompleted {
                session_id: self.session_id.clone(),
                result: "Hello from mock".to_string(),
                structured_output: None,
                extraction_required: false,
                usage: usage.clone(),
                terminal_cause_kind: None,
            })
            .await;

        Ok(RunResult {
            text: "Hello from mock".to_string(),
            session_id: self.session_id.clone(),
            usage,
            turns: 1,
            tool_calls: 0,
            terminal_cause_kind: None,
            structured_output: None,
            extraction_error: None,
            schema_warnings: None,
            skill_diagnostics: None,
        })
    }

    fn set_skill_references(&mut self, _refs: Option<Vec<meerkat_core::skills::SkillKey>>) {}

    fn set_flow_tool_overlay(
        &mut self,
        _overlay: Option<TurnToolOverlay>,
    ) -> Result<(), meerkat_core::error::AgentError> {
        Ok(())
    }

    fn cancel(&mut self) {}

    fn hot_swap_llm_identity(
        &mut self,
        _client: Arc<dyn meerkat_core::AgentLlmClient>,
        _identity: meerkat_core::SessionLlmIdentity,
        _request_policy: meerkat_core::SessionLlmRequestPolicy,
    ) -> Result<(), meerkat_core::error::AgentError> {
        Ok(())
    }

    fn session_id(&self) -> SessionId {
        self.session_id.clone()
    }

    fn snapshot(&self) -> SessionSnapshot {
        SessionSnapshot {
            created_at: SystemTime::now(),
            updated_at: SystemTime::now(),
            message_count: self.message_count,
            total_tokens: self.total_input_tokens + self.total_output_tokens,
            usage: Usage {
                input_tokens: self.total_input_tokens,
                output_tokens: self.total_output_tokens,
                cache_creation_tokens: None,
                cache_read_tokens: None,
            },
            last_assistant_text: Some("Hello from mock".to_string()),
        }
    }

    fn session_clone(&self) -> meerkat_core::Session {
        let mut session = meerkat_core::Session::with_id(self.session_id.clone());
        session
            .set_system_context_state(
                self.system_context_state
                    .lock()
                    .expect("system-context lock poisoned")
                    .clone(),
            )
            .expect("serialize system-context state");
        session
    }

    fn apply_runtime_system_context(
        &mut self,
        appends: &[meerkat_core::PendingSystemContextAppend],
    ) {
        let mut session = self.session_clone();
        session.append_system_context_blocks(appends);
        self.message_count = session.messages().len();
    }

    fn system_context_state(
        &self,
    ) -> Arc<std::sync::Mutex<meerkat_core::SessionSystemContextState>> {
        Arc::clone(&self.system_context_state)
    }
}

#[async_trait]
impl SessionAgent for SnapshotAgent {
    async fn run_with_events(
        &mut self,
        _prompt: meerkat_core::types::ContentInput,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, meerkat_core::error::AgentError> {
        Ok(RunResult {
            text: "snapshot".to_string(),
            session_id: self.session_id.clone(),
            usage: Usage::default(),
            turns: 0,
            tool_calls: 0,
            terminal_cause_kind: None,
            structured_output: None,
            extraction_error: None,
            schema_warnings: None,
            skill_diagnostics: None,
        })
    }

    fn set_skill_references(&mut self, _refs: Option<Vec<meerkat_core::skills::SkillKey>>) {}

    fn set_flow_tool_overlay(
        &mut self,
        _overlay: Option<TurnToolOverlay>,
    ) -> Result<(), meerkat_core::error::AgentError> {
        Ok(())
    }

    fn cancel(&mut self) {}

    fn hot_swap_llm_identity(
        &mut self,
        _client: Arc<dyn meerkat_core::AgentLlmClient>,
        _identity: meerkat_core::SessionLlmIdentity,
        _request_policy: meerkat_core::SessionLlmRequestPolicy,
    ) -> Result<(), meerkat_core::error::AgentError> {
        Ok(())
    }

    fn session_id(&self) -> SessionId {
        self.session_id.clone()
    }

    fn snapshot(&self) -> SessionSnapshot {
        SessionSnapshot {
            created_at: SystemTime::now(),
            updated_at: SystemTime::now(),
            message_count: 0,
            total_tokens: 0,
            usage: Usage::default(),
            last_assistant_text: None,
        }
    }

    fn execution_snapshot(&self) -> Option<AgentExecutionSnapshot> {
        Some(self.execution_snapshot.clone())
    }

    fn tool_scope_snapshot(&self) -> Option<meerkat_core::ToolScopeSnapshot> {
        Some(self.tool_scope_snapshot.clone())
    }

    fn external_tool_surface_snapshot(&self) -> Option<meerkat_core::ExternalToolSurfaceSnapshot> {
        self.external_tool_surface_snapshot.clone()
    }

    fn session_clone(&self) -> meerkat_core::Session {
        let mut session = meerkat_core::Session::with_id(self.session_id.clone());
        session
            .set_system_context_state(
                self.system_context_state
                    .lock()
                    .expect("system-context lock poisoned")
                    .clone(),
            )
            .expect("serialize system-context state");
        session
    }

    fn apply_runtime_system_context(
        &mut self,
        _appends: &[meerkat_core::PendingSystemContextAppend],
    ) {
    }

    fn system_context_state(
        &self,
    ) -> Arc<std::sync::Mutex<meerkat_core::SessionSystemContextState>> {
        Arc::clone(&self.system_context_state)
    }
}

// ---------------------------------------------------------------------------
// Mock builders
// ---------------------------------------------------------------------------

struct MockAgentBuilder;

#[async_trait]
impl SessionAgentBuilder for MockAgentBuilder {
    type Agent = MockAgent;

    async fn build_agent(
        &self,
        _req: &CreateSessionRequest,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<MockAgent, SessionError> {
        Ok(MockAgent {
            session_id: SessionId::new(),
            message_count: 0,
            delay_ms: None,
            should_fail: false,
            total_input_tokens: 0,
            total_output_tokens: 0,
            system_context_state: Arc::new(std::sync::Mutex::new(Default::default())),
        })
    }
}

struct SnapshotAgentBuilder {
    execution_snapshot: AgentExecutionSnapshot,
    tool_scope_snapshot: meerkat_core::ToolScopeSnapshot,
    external_tool_surface_snapshot: Option<meerkat_core::ExternalToolSurfaceSnapshot>,
}

#[async_trait]
impl SessionAgentBuilder for SnapshotAgentBuilder {
    type Agent = SnapshotAgent;

    async fn build_agent(
        &self,
        _req: &CreateSessionRequest,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<SnapshotAgent, SessionError> {
        Ok(SnapshotAgent {
            session_id: SessionId::new(),
            execution_snapshot: self.execution_snapshot.clone(),
            tool_scope_snapshot: self.tool_scope_snapshot.clone(),
            external_tool_surface_snapshot: self.external_tool_surface_snapshot.clone(),
            system_context_state: Arc::new(std::sync::Mutex::new(Default::default())),
        })
    }
}

/// Builder that produces agents with a configurable delay per turn.
struct SlowMockAgentBuilder {
    delay_ms: u64,
}

#[async_trait]
impl SessionAgentBuilder for SlowMockAgentBuilder {
    type Agent = MockAgent;

    async fn build_agent(
        &self,
        _req: &CreateSessionRequest,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<MockAgent, SessionError> {
        Ok(MockAgent {
            session_id: SessionId::new(),
            message_count: 0,
            delay_ms: Some(self.delay_ms),
            should_fail: false,
            total_input_tokens: 0,
            total_output_tokens: 0,
            system_context_state: Arc::new(std::sync::Mutex::new(Default::default())),
        })
    }
}

/// Builder that produces agents which always error on run.
struct FailingMockAgentBuilder;

#[async_trait]
impl SessionAgentBuilder for FailingMockAgentBuilder {
    type Agent = MockAgent;

    async fn build_agent(
        &self,
        _req: &CreateSessionRequest,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<MockAgent, SessionError> {
        Ok(MockAgent {
            session_id: SessionId::new(),
            message_count: 0,
            delay_ms: None,
            should_fail: true,
            total_input_tokens: 0,
            total_output_tokens: 0,
            system_context_state: Arc::new(std::sync::Mutex::new(Default::default())),
        })
    }
}

struct RecordingTurnAgentBuilder {
    recorded: Arc<std::sync::Mutex<Vec<RecordedTurnMetadata>>>,
}

#[async_trait]
impl SessionAgentBuilder for RecordingTurnAgentBuilder {
    type Agent = RecordingTurnAgent;

    async fn build_agent(
        &self,
        _req: &CreateSessionRequest,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RecordingTurnAgent, SessionError> {
        Ok(RecordingTurnAgent {
            session_id: SessionId::new(),
            recorded: Arc::clone(&self.recorded),
            system_context_state: Arc::new(std::sync::Mutex::new(Default::default())),
        })
    }
}

#[async_trait]
impl SessionAgent for RecordingTurnAgent {
    async fn run_with_events(
        &mut self,
        _prompt: meerkat_core::types::ContentInput,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, meerkat_core::error::AgentError> {
        Ok(RunResult {
            text: "recorded".to_string(),
            session_id: self.session_id.clone(),
            usage: Usage::default(),
            turns: 1,
            tool_calls: 0,
            terminal_cause_kind: None,
            structured_output: None,
            extraction_error: None,
            schema_warnings: None,
            skill_diagnostics: None,
        })
    }

    async fn run_turn_with_events(
        &mut self,
        _prompt: meerkat_core::types::ContentInput,
        handling_mode: HandlingMode,
        render_metadata: Option<RenderMetadata>,
        _typed_turn_appends: Vec<meerkat_core::lifecycle::run_primitive::ConversationAppend>,
        _execution_kind: Option<meerkat_core::lifecycle::RuntimeExecutionKind>,
        _event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, meerkat_core::error::AgentError> {
        self.recorded
            .lock()
            .expect("recorded-turn lock poisoned")
            .push(RecordedTurnMetadata {
                handling_mode,
                render_metadata,
            });
        Ok(RunResult {
            text: "recorded".to_string(),
            session_id: self.session_id.clone(),
            usage: Usage::default(),
            turns: 1,
            tool_calls: 0,
            terminal_cause_kind: None,
            structured_output: None,
            extraction_error: None,
            schema_warnings: None,
            skill_diagnostics: None,
        })
    }

    fn set_skill_references(&mut self, _refs: Option<Vec<meerkat_core::skills::SkillKey>>) {}

    fn set_flow_tool_overlay(
        &mut self,
        _overlay: Option<TurnToolOverlay>,
    ) -> Result<(), meerkat_core::error::AgentError> {
        Ok(())
    }

    fn cancel(&mut self) {}

    fn hot_swap_llm_identity(
        &mut self,
        _client: Arc<dyn meerkat_core::AgentLlmClient>,
        _identity: meerkat_core::SessionLlmIdentity,
        _request_policy: meerkat_core::SessionLlmRequestPolicy,
    ) -> Result<(), meerkat_core::error::AgentError> {
        Ok(())
    }

    fn session_id(&self) -> SessionId {
        self.session_id.clone()
    }

    fn snapshot(&self) -> SessionSnapshot {
        SessionSnapshot {
            created_at: SystemTime::now(),
            updated_at: SystemTime::now(),
            message_count: 0,
            total_tokens: 0,
            usage: Usage::default(),
            last_assistant_text: Some("recorded".to_string()),
        }
    }

    fn session_clone(&self) -> meerkat_core::Session {
        let mut session = meerkat_core::Session::with_id(self.session_id.clone());
        session
            .set_system_context_state(
                self.system_context_state
                    .lock()
                    .expect("system-context lock poisoned")
                    .clone(),
            )
            .expect("serialize system-context state");
        session
    }

    fn apply_runtime_system_context(
        &mut self,
        _appends: &[meerkat_core::PendingSystemContextAppend],
    ) {
    }

    fn system_context_state(
        &self,
    ) -> Arc<std::sync::Mutex<meerkat_core::SessionSystemContextState>> {
        Arc::clone(&self.system_context_state)
    }
}

// ---------------------------------------------------------------------------
// Helpers
// ---------------------------------------------------------------------------

fn make_service(builder: MockAgentBuilder) -> Arc<EphemeralSessionService<MockAgentBuilder>> {
    Arc::new(EphemeralSessionService::new(builder, 10))
}

fn make_slow_service(delay_ms: u64) -> Arc<EphemeralSessionService<SlowMockAgentBuilder>> {
    Arc::new(EphemeralSessionService::new(
        SlowMockAgentBuilder { delay_ms },
        10,
    ))
}

fn make_failing_service() -> Arc<EphemeralSessionService<FailingMockAgentBuilder>> {
    Arc::new(EphemeralSessionService::new(FailingMockAgentBuilder, 10))
}

fn make_recording_service(
    recorded: Arc<std::sync::Mutex<Vec<RecordedTurnMetadata>>>,
) -> Arc<EphemeralSessionService<RecordingTurnAgentBuilder>> {
    Arc::new(EphemeralSessionService::new(
        RecordingTurnAgentBuilder { recorded },
        10,
    ))
}

fn make_snapshot_service(
    execution_snapshot: AgentExecutionSnapshot,
    tool_scope_snapshot: meerkat_core::ToolScopeSnapshot,
    external_tool_surface_snapshot: Option<meerkat_core::ExternalToolSurfaceSnapshot>,
) -> Arc<EphemeralSessionService<SnapshotAgentBuilder>> {
    Arc::new(EphemeralSessionService::new(
        SnapshotAgentBuilder {
            execution_snapshot,
            tool_scope_snapshot,
            external_tool_surface_snapshot,
        },
        10,
    ))
}

fn create_req(prompt: &str) -> CreateSessionRequest {
    CreateSessionRequest {
        model: "mock".to_string(),
        prompt: prompt.to_string().into(),
        render_metadata: None,
        system_prompt: None,
        max_tokens: None,
        event_tx: None,

        skill_references: None,
        initial_turn: InitialTurnPolicy::RunImmediately,
        deferred_prompt_policy: DeferredPromptPolicy::Discard,
        build: None,
        labels: None,
    }
}

fn create_req_deferred(prompt: &str) -> CreateSessionRequest {
    CreateSessionRequest {
        initial_turn: InitialTurnPolicy::Defer,
        deferred_prompt_policy: DeferredPromptPolicy::Stage,
        ..create_req(prompt)
    }
}

fn create_req_with_labels(prompt: &str, labels: BTreeMap<String, String>) -> CreateSessionRequest {
    CreateSessionRequest {
        labels: Some(labels),
        ..create_req(prompt)
    }
}

fn turn_req(prompt: &str) -> StartTurnRequest {
    StartTurnRequest {
        prompt: prompt.to_string().into(),
        system_prompt: None,
        event_tx: None,
        runtime: meerkat_core::service::StartTurnRuntimeSemantics::default(),
    }
}

// ---------------------------------------------------------------------------
// 1. Full lifecycle: create -> turn -> turn -> read -> archive -> list -> read
// ---------------------------------------------------------------------------

#[tokio::test]
async fn full_lifecycle_create_turns_read_archive_gone() {
    let service = make_service(MockAgentBuilder);

    // Create session (runs first turn)
    let r1 = service.create_session(create_req("Hello")).await.unwrap();
    let sid = r1.session_id.clone();

    // Second turn
    let _r2 = service
        .start_turn(&sid, turn_req("Follow up"))
        .await
        .unwrap();

    // Read — at least 4 messages (2 turns * 2 messages each)
    let view = service.read(&sid).await.unwrap();
    assert!(
        view.state.message_count >= 4,
        "expected >= 4 messages after 2 turns, got {}",
        view.state.message_count
    );

    // Archive
    service.archive(&sid).await.unwrap();

    // List should be empty (active sessions)
    let sessions = service.list(SessionQuery::default()).await.unwrap();
    assert!(
        sessions.is_empty(),
        "archived session should not appear in list"
    );

    // Read after archive still works (returns archived view)
    let archived_view = service.read(&sid).await;
    assert!(
        archived_view.is_ok(),
        "read after archive should return the archived view"
    );
    let archived_view = archived_view.unwrap();
    assert!(!archived_view.state.is_active);
}

// ---------------------------------------------------------------------------
// 2. Read returns all SessionView fields
// ---------------------------------------------------------------------------

#[tokio::test]
async fn read_returns_all_session_view_fields() {
    let service = make_service(MockAgentBuilder);

    let result = service
        .create_session(create_req("Check fields"))
        .await
        .unwrap();
    let sid = result.session_id.clone();

    let view = service.read(&sid).await.unwrap();

    // SessionInfo fields
    assert_eq!(view.state.session_id, sid);
    assert!(view.state.created_at <= SystemTime::now());
    assert!(view.state.updated_at <= SystemTime::now());
    assert!(
        view.state.message_count > 0,
        "message_count should be > 0 after a turn"
    );
    assert!(
        !view.state.is_active,
        "session should be idle after turn completes"
    );
    assert!(
        view.state.last_assistant_text.is_some(),
        "last_assistant_text should be set after a turn"
    );

    // SessionUsage fields
    assert!(view.billing.total_tokens > 0, "total_tokens should be > 0");
    assert!(
        view.billing.usage.input_tokens > 0,
        "input_tokens should be > 0"
    );
    assert!(
        view.billing.usage.output_tokens > 0,
        "output_tokens should be > 0"
    );
}

// ---------------------------------------------------------------------------
// 3. Usage accumulates across turns
// ---------------------------------------------------------------------------

#[tokio::test]
async fn usage_accumulates_across_turns() {
    let service = make_service(MockAgentBuilder);

    let r1 = service.create_session(create_req("Turn 1")).await.unwrap();
    let sid = r1.session_id.clone();

    let view1 = service.read(&sid).await.unwrap();
    let tokens_after_1 = view1.billing.total_tokens;
    assert!(tokens_after_1 > 0, "should have tokens after first turn");

    // Second turn
    let _r2 = service.start_turn(&sid, turn_req("Turn 2")).await.unwrap();

    let view2 = service.read(&sid).await.unwrap();
    let tokens_after_2 = view2.billing.total_tokens;
    assert!(
        tokens_after_2 > tokens_after_1,
        "tokens should accumulate: {tokens_after_2} should be > {tokens_after_1}"
    );
}

// ---------------------------------------------------------------------------
// 4. Interrupt during slow turn returns promptly
// ---------------------------------------------------------------------------

#[tokio::test]
async fn interrupt_during_slow_turn_returns_promptly() {
    let service = make_slow_service(500);

    // Defer initial turn so we can control the slow turn
    let created = service
        .create_session(create_req_deferred("slow"))
        .await
        .unwrap();
    let sid = created.session_id;

    // Start the slow turn in the background
    let svc = service.clone();
    let sid2 = sid.clone();
    let turn_handle =
        tokio::spawn(async move { svc.start_turn(&sid2, turn_req("Slow turn")).await });

    // Give the turn time to start
    tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;

    // Interrupt and measure how quickly it returns
    let start = tokio::time::Instant::now();
    let interrupt_result = service.interrupt(&sid).await;
    let elapsed = start.elapsed();

    assert!(interrupt_result.is_ok(), "interrupt should succeed");
    assert!(
        elapsed < tokio::time::Duration::from_millis(200),
        "interrupt should return promptly, took {elapsed:?}"
    );

    // The turn result should be an error (cancelled)
    let turn_result = turn_handle.await.unwrap();
    assert!(turn_result.is_err(), "interrupted turn should return error");
}

// ---------------------------------------------------------------------------
// 5. Interrupt idle session returns NotRunning
// ---------------------------------------------------------------------------

#[tokio::test]
async fn interrupt_idle_session_returns_not_running() {
    let service = make_service(MockAgentBuilder);

    let result = service
        .create_session(create_req("Idle test"))
        .await
        .unwrap();
    let sid = result.session_id;

    // Session is idle now — interrupt should fail
    let err = service.interrupt(&sid).await.unwrap_err();
    assert_eq!(err.code(), "SESSION_NOT_RUNNING");
}

// ---------------------------------------------------------------------------
// 7. Concurrent turn on busy session returns Busy
// ---------------------------------------------------------------------------

#[tokio::test]
async fn concurrent_turn_on_busy_session_returns_busy() {
    let service = make_slow_service(200);

    let created = service
        .create_session(create_req_deferred("busy"))
        .await
        .unwrap();
    let sid = created.session_id;

    // Start a slow turn
    let svc = service.clone();
    let sid2 = sid.clone();
    let _handle = tokio::spawn(async move { svc.start_turn(&sid2, turn_req("Slow")).await });

    // Give the turn time to start
    tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;

    // Second turn should be rejected
    let result = service.start_turn(&sid, turn_req("Fast")).await;
    assert!(result.is_err());
    let err = result.unwrap_err();
    assert_eq!(err.code(), "SESSION_BUSY");
}

#[tokio::test]
async fn read_during_active_turn_returns_cached_view() {
    let service = make_slow_service(200);

    let created = service
        .create_session(create_req_deferred("read during active turn"))
        .await
        .unwrap();
    let sid = created.session_id;

    let svc = service.clone();
    let sid2 = sid.clone();
    let turn = tokio::spawn(async move { svc.start_turn(&sid2, turn_req("Slow")).await });

    tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;

    let view = tokio::time::timeout(tokio::time::Duration::from_millis(50), service.read(&sid))
        .await
        .expect("read should not wait for the running turn")
        .expect("read should succeed while the turn is active");

    assert!(
        view.state.is_active,
        "live read should reflect that the session is currently running",
    );

    turn.await.unwrap().unwrap();
}

#[tokio::test]
async fn archive_during_running_turn_gracefully_drains_current_turn() {
    let service = make_slow_service(150);

    let created = service
        .create_session(create_req_deferred("archive during run"))
        .await
        .unwrap();
    let sid = created.session_id;

    let svc = service.clone();
    let sid2 = sid.clone();
    let turn = tokio::spawn(async move { svc.start_turn(&sid2, turn_req("Slow")).await });

    tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
    service.archive(&sid).await.unwrap();

    let turn_result = turn.await.unwrap();
    assert!(
        turn_result.is_ok(),
        "archive should gracefully drain the admitted/running turn"
    );

    let archived = service.read(&sid).await.unwrap();
    assert!(
        !archived.state.is_active,
        "archived session must be inactive"
    );

    let err = service
        .start_turn(&sid, turn_req("after archive"))
        .await
        .unwrap_err();
    assert_eq!(err.code(), "SESSION_NOT_FOUND");
}

// ---------------------------------------------------------------------------
// 8. Event stream emits RunStarted and RunCompleted
// ---------------------------------------------------------------------------

#[tokio::test]
async fn event_stream_emits_run_started_and_completed() {
    let service = make_service(MockAgentBuilder);

    // Create deferred so we can subscribe before the turn
    let created = service
        .create_session(create_req_deferred("event test"))
        .await
        .unwrap();
    let sid = created.session_id;

    // Subscribe to events
    let mut stream = service
        .subscribe_session_events(&sid)
        .await
        .expect("should subscribe to session events");

    // Run a turn
    service
        .start_turn(&sid, turn_req("trigger events"))
        .await
        .unwrap();

    // Collect events with a timeout
    let mut events = Vec::new();
    let deadline = tokio::time::Instant::now() + tokio::time::Duration::from_secs(2);
    while let Ok(Some(envelope)) = tokio::time::timeout_at(deadline, stream.next()).await {
        events.push(envelope);
    }

    let has_run_started = events
        .iter()
        .any(|e| matches!(e.payload, AgentEvent::RunStarted { .. }));
    let has_run_completed = events
        .iter()
        .any(|e| matches!(e.payload, AgentEvent::RunCompleted { .. }));

    assert!(
        has_run_started,
        "events should contain RunStarted: {events:?}"
    );
    assert!(
        has_run_completed,
        "events should contain RunCompleted: {events:?}"
    );
}

// ---------------------------------------------------------------------------
// 9. Event ordering: RunStarted before RunCompleted
// ---------------------------------------------------------------------------

#[tokio::test]
async fn event_ordering_run_started_before_completed() {
    let service = make_service(MockAgentBuilder);

    let created = service
        .create_session(create_req_deferred("order test"))
        .await
        .unwrap();
    let sid = created.session_id;

    let mut stream = service
        .subscribe_session_events(&sid)
        .await
        .expect("should subscribe to session events");

    service.start_turn(&sid, turn_req("trigger")).await.unwrap();

    let mut events = Vec::new();
    let deadline = tokio::time::Instant::now() + tokio::time::Duration::from_secs(2);
    while let Ok(Some(envelope)) = tokio::time::timeout_at(deadline, stream.next()).await {
        events.push(envelope);
    }

    let started_idx = events
        .iter()
        .position(|e| matches!(e.payload, AgentEvent::RunStarted { .. }));
    let completed_idx = events
        .iter()
        .position(|e| matches!(e.payload, AgentEvent::RunCompleted { .. }));

    assert!(started_idx.is_some(), "RunStarted should be present");
    assert!(completed_idx.is_some(), "RunCompleted should be present");
    assert!(
        started_idx.unwrap() < completed_idx.unwrap(),
        "RunStarted (idx={}) should come before RunCompleted (idx={})",
        started_idx.unwrap(),
        completed_idx.unwrap()
    );

    // Also verify monotonic seq ordering
    if let (Some(si), Some(ci)) = (started_idx, completed_idx) {
        assert!(
            events[si].seq < events[ci].seq,
            "RunStarted seq ({}) should be < RunCompleted seq ({})",
            events[si].seq,
            events[ci].seq
        );
    }
}

// ---------------------------------------------------------------------------
// 10. Concurrent creates produce distinct sessions
// ---------------------------------------------------------------------------

#[tokio::test]
async fn concurrent_creates_produce_distinct_sessions() {
    let service = Arc::new(EphemeralSessionService::new(MockAgentBuilder, 10));

    let mut handles = Vec::new();
    for i in 0..5 {
        let svc = service.clone();
        handles.push(tokio::spawn(async move {
            svc.create_session(create_req(&format!("concurrent-{i}")))
                .await
        }));
    }

    let mut session_ids = Vec::new();
    for handle in handles {
        let result = handle.await.unwrap().unwrap();
        session_ids.push(result.session_id);
    }

    // All IDs should be distinct
    let unique: std::collections::HashSet<_> = session_ids.iter().collect();
    assert_eq!(
        unique.len(),
        5,
        "all 5 sessions should have distinct IDs, got: {session_ids:?}"
    );

    // List should return all 5
    let sessions = service.list(SessionQuery::default()).await.unwrap();
    assert_eq!(sessions.len(), 5);
}

// ---------------------------------------------------------------------------
// 11. Labels: create and filter
// ---------------------------------------------------------------------------

#[tokio::test]
async fn labels_create_and_filter() {
    let service = make_service(MockAgentBuilder);

    let mut test_labels = BTreeMap::new();
    test_labels.insert("env".to_string(), "test".to_string());
    let _ = service
        .create_session(create_req_with_labels("test session", test_labels))
        .await
        .unwrap();

    let mut prod_labels = BTreeMap::new();
    prod_labels.insert("env".to_string(), "prod".to_string());
    let _ = service
        .create_session(create_req_with_labels("prod session", prod_labels))
        .await
        .unwrap();

    // Filter for env=test
    let mut filter = BTreeMap::new();
    filter.insert("env".to_string(), "test".to_string());
    let results = service
        .list(SessionQuery {
            limit: None,
            offset: None,
            labels: Some(filter),
        })
        .await
        .unwrap();

    assert_eq!(results.len(), 1, "should only return the test session");
    assert_eq!(results[0].labels.get("env").unwrap(), "test");
}

// ---------------------------------------------------------------------------
// 12. Labels preserved in read
// ---------------------------------------------------------------------------

#[tokio::test]
async fn labels_preserved_in_read() {
    let service = make_service(MockAgentBuilder);

    let mut labels = BTreeMap::new();
    labels.insert("team".to_string(), "platform".to_string());
    labels.insert("tier".to_string(), "critical".to_string());

    let result = service
        .create_session(create_req_with_labels("labeled session", labels.clone()))
        .await
        .unwrap();
    let sid = result.session_id;

    let view = service.read(&sid).await.unwrap();
    assert_eq!(
        view.state.labels, labels,
        "labels should be preserved in read"
    );
}

// ---------------------------------------------------------------------------
// 13. Inject context applied when idle
// ---------------------------------------------------------------------------

#[tokio::test]
async fn inject_context_applied_when_idle() {
    let service = make_service(MockAgentBuilder);

    let created = service
        .create_session(create_req_deferred("context test"))
        .await
        .unwrap();
    let sid = created.session_id;

    let result = service
        .append_system_context(
            &sid,
            AppendSystemContextRequest {
                text: "New runtime context".to_string(),
                source: Some("test".to_string()),
                idempotency_key: Some("ctx-idle-1".to_string()),
            },
        )
        .await
        .expect("append should succeed on idle session");

    // When idle, context is staged (pending for next turn boundary)
    assert_eq!(
        result.status,
        AppendSystemContextStatus::Staged,
        "context on idle session should be staged"
    );
}

// ---------------------------------------------------------------------------
// 14. Inject context duplicate idempotent
// ---------------------------------------------------------------------------

#[tokio::test]
async fn inject_context_duplicate_idempotent() {
    let service = make_service(MockAgentBuilder);

    let created = service
        .create_session(create_req_deferred("dedup test"))
        .await
        .unwrap();
    let sid = created.session_id;

    let req = AppendSystemContextRequest {
        text: "Idempotent context".to_string(),
        source: Some("test".to_string()),
        idempotency_key: Some("ctx-dedup-1".to_string()),
    };

    // First append
    let first = service
        .append_system_context(&sid, req.clone())
        .await
        .expect("first append should succeed");
    assert_eq!(first.status, AppendSystemContextStatus::Staged);

    // Second append with same key and same content
    let second = service
        .append_system_context(&sid, req.clone())
        .await
        .expect("duplicate append should succeed");
    assert_eq!(
        second.status,
        AppendSystemContextStatus::Duplicate,
        "second append with same key should be duplicate"
    );
}

// ---------------------------------------------------------------------------
// 15. start_turn forwards handling/render metadata
// ---------------------------------------------------------------------------

#[tokio::test]
async fn start_turn_forwards_handling_mode_and_render_metadata() {
    let recorded = Arc::new(std::sync::Mutex::new(Vec::<RecordedTurnMetadata>::new()));
    let service = make_recording_service(Arc::clone(&recorded));
    let created = service
        .create_session(create_req_deferred("record"))
        .await
        .expect("create session");

    service
        .start_turn(
            &created.session_id,
            StartTurnRequest {
                prompt: "steer me".into(),
                system_prompt: None,
                event_tx: None,
                runtime: meerkat_core::service::StartTurnRuntimeSemantics::new(
                    Some(RenderMetadata {
                        class: RenderClass::ExternalEvent,
                        salience: RenderSalience::Urgent,
                    }),
                    HandlingMode::Steer,
                    None,
                    None,
                    Vec::new(),
                    None,
                ),
            },
        )
        .await
        .expect("start turn");

    let recorded = recorded.lock().expect("recorded-turn lock poisoned");
    assert_eq!(recorded.len(), 1);
    assert_eq!(recorded[0].handling_mode, HandlingMode::Steer);
    assert_eq!(
        recorded[0].render_metadata,
        Some(RenderMetadata {
            class: RenderClass::ExternalEvent,
            salience: RenderSalience::Urgent,
        })
    );
}

// ---------------------------------------------------------------------------
// 15. Failed turn returns agent error
// ---------------------------------------------------------------------------

#[tokio::test]
async fn failed_turn_returns_agent_error() {
    let service = make_failing_service();

    // Defer so we can control the failing turn
    let created = service
        .create_session(create_req_deferred("will fail"))
        .await
        .unwrap();
    let sid = created.session_id;

    let result = service.start_turn(&sid, turn_req("fail")).await;
    assert!(result.is_err(), "failing agent should produce an error");

    let err = result.unwrap_err();
    assert_eq!(
        err.code(),
        "AGENT_ERROR",
        "error code should be AGENT_ERROR, got: {}",
        err.code()
    );
}

#[tokio::test]
async fn execution_snapshot_returns_live_agent_execution_state() {
    let expected = AgentExecutionSnapshot {
        loop_state: meerkat_core::state::LoopState::WaitingForOps,
        turn_phase: meerkat_core::turn_execution_authority::TurnPhase::WaitingForOps,
        active_run_id: Some(RunId::new()),
        primitive_kind: meerkat_core::turn_execution_authority::TurnPrimitiveKind::ConversationTurn,
        admitted_content_shape: Some(
            meerkat_core::turn_execution_authority::ContentShape::Conversation,
        ),
        vision_enabled: true,
        image_tool_results_enabled: false,
        tool_calls_pending: 2,
        pending_operation_ids: Some(vec![OperationId::new(), OperationId::new()]),
        barrier_operation_ids: vec![OperationId::new()],
        has_barrier_ops: true,
        barrier_satisfied: false,
        boundary_count: 1,
        cancel_after_boundary: true,
        terminal_outcome: meerkat_core::turn_execution_authority::TurnTerminalOutcome::Cancelled,
        terminal_cause_kind: None,
        extraction_attempts: 1,
        max_extraction_retries: 3,
        applied_cursor: 17,
    };
    let expected_tool_scope = meerkat_core::ToolScopeSnapshot {
        known_base_names: vec!["alpha".to_string(), "beta".to_string()],
        visible_names: vec!["beta".to_string()],
        base_filter: meerkat_core::ToolFilter::All,
        active_external_filter: meerkat_core::ToolFilter::Deny(
            ["alpha".to_string()].into_iter().collect(),
        ),
        active_turn_allow: Some(vec!["beta".to_string()]),
        active_turn_deny: Vec::new(),
        active_revision: meerkat_core::ToolScopeRevision(3),
        staged_external_filter: meerkat_core::ToolFilter::Deny(
            ["alpha".to_string()].into_iter().collect(),
        ),
        staged_revision: meerkat_core::ToolScopeRevision(3),
        capability_base_filter: meerkat_core::ToolFilter::All,
    };
    let service = make_snapshot_service(expected.clone(), expected_tool_scope, None);

    let created = service
        .create_session(create_req_deferred("snapshot"))
        .await
        .expect("create snapshot-backed session");

    let actual = service
        .execution_snapshot(&created.session_id)
        .await
        .expect("execution snapshot query should succeed")
        .expect("snapshot should be present");

    assert_eq!(actual, expected);
}

#[tokio::test]
async fn tool_scope_snapshot_returns_live_agent_tool_scope_state() {
    let expected_execution = AgentExecutionSnapshot {
        loop_state: meerkat_core::state::LoopState::CallingLlm,
        turn_phase: meerkat_core::turn_execution_authority::TurnPhase::Ready,
        active_run_id: None,
        primitive_kind: meerkat_core::turn_execution_authority::TurnPrimitiveKind::ConversationTurn,
        admitted_content_shape: None,
        vision_enabled: false,
        image_tool_results_enabled: false,
        tool_calls_pending: 0,
        pending_operation_ids: None,
        barrier_operation_ids: Vec::new(),
        has_barrier_ops: false,
        barrier_satisfied: true,
        boundary_count: 0,
        cancel_after_boundary: false,
        terminal_outcome: meerkat_core::turn_execution_authority::TurnTerminalOutcome::None,
        terminal_cause_kind: None,
        extraction_attempts: 0,
        max_extraction_retries: 2,
        applied_cursor: 0,
    };
    let expected = meerkat_core::ToolScopeSnapshot {
        known_base_names: vec![
            "read_file".to_string(),
            "search".to_string(),
            "write_file".to_string(),
        ],
        visible_names: vec!["read_file".to_string(), "search".to_string()],
        base_filter: meerkat_core::ToolFilter::All,
        active_external_filter: meerkat_core::ToolFilter::Deny(
            ["write_file".to_string()].into_iter().collect(),
        ),
        active_turn_allow: None,
        active_turn_deny: vec!["write_file".to_string()],
        active_revision: meerkat_core::ToolScopeRevision(4),
        staged_external_filter: meerkat_core::ToolFilter::Allow(
            ["read_file".to_string(), "search".to_string()]
                .into_iter()
                .collect(),
        ),
        staged_revision: meerkat_core::ToolScopeRevision(5),
        capability_base_filter: meerkat_core::ToolFilter::All,
    };
    let service = make_snapshot_service(expected_execution, expected.clone(), None);

    let created = service
        .create_session(create_req_deferred("tool-scope snapshot"))
        .await
        .expect("create snapshot-backed session");

    let actual = service
        .tool_scope_snapshot(&created.session_id)
        .await
        .expect("tool-scope snapshot query should succeed")
        .expect("tool-scope snapshot should be present");

    assert_eq!(actual, expected);
}

#[tokio::test]
async fn external_tool_surface_snapshot_returns_live_agent_tool_surface_state() {
    let expected_execution = AgentExecutionSnapshot {
        loop_state: meerkat_core::state::LoopState::CallingLlm,
        turn_phase: meerkat_core::turn_execution_authority::TurnPhase::Ready,
        active_run_id: None,
        primitive_kind: meerkat_core::turn_execution_authority::TurnPrimitiveKind::ConversationTurn,
        admitted_content_shape: None,
        vision_enabled: false,
        image_tool_results_enabled: false,
        tool_calls_pending: 0,
        pending_operation_ids: None,
        barrier_operation_ids: Vec::new(),
        has_barrier_ops: false,
        barrier_satisfied: true,
        boundary_count: 0,
        cancel_after_boundary: false,
        terminal_outcome: meerkat_core::turn_execution_authority::TurnTerminalOutcome::None,
        terminal_cause_kind: None,
        extraction_attempts: 0,
        max_extraction_retries: 0,
        applied_cursor: 0,
    };
    let expected_tool_scope = meerkat_core::ToolScopeSnapshot {
        known_base_names: vec!["mcp__planner".to_string()],
        visible_names: vec!["mcp__planner".to_string()],
        base_filter: meerkat_core::ToolFilter::All,
        active_external_filter: meerkat_core::ToolFilter::All,
        active_turn_allow: None,
        active_turn_deny: Vec::new(),
        active_revision: meerkat_core::ToolScopeRevision(0),
        staged_external_filter: meerkat_core::ToolFilter::All,
        staged_revision: meerkat_core::ToolScopeRevision(0),
        capability_base_filter: meerkat_core::ToolFilter::All,
    };
    let expected_surface = meerkat_core::ExternalToolSurfaceSnapshot {
        phase: meerkat_core::ExternalToolSurfaceGlobalPhase::Operating,
        snapshot_epoch: 0,
        snapshot_aligned_epoch: 0,
        entries: vec![meerkat_core::ExternalToolSurfaceEntrySnapshot {
            surface_id: "planner".to_string(),
            visible: false,
            base_state: meerkat_core::ExternalToolSurfaceBaseState::Absent,
            has_removal_timing: false,
            pending_op: meerkat_core::ExternalToolSurfacePendingOp::None,
            staged_op: meerkat_core::ExternalToolSurfaceStagedOp::Add,
            staged_intent_sequence: 1,
            pending_task_sequence: 0,
            pending_lineage_sequence: 0,
            inflight_call_count: 0,
            last_delta_operation: meerkat_core::ExternalToolSurfaceDeltaOperation::None,
            last_delta_phase: meerkat_core::ExternalToolSurfaceDeltaPhase::None,
        }],
    };
    let service = make_snapshot_service(
        expected_execution,
        expected_tool_scope,
        Some(expected_surface.clone()),
    );

    let created = service
        .create_session(create_req_deferred("tool-surface snapshot"))
        .await
        .expect("create snapshot-backed session");

    let actual = service
        .external_tool_surface_snapshot(&created.session_id)
        .await
        .expect("tool-surface snapshot query should succeed")
        .expect("tool-surface snapshot should be present");

    assert_eq!(actual, expected_surface);
}

#[cfg(all(feature = "session-store", not(target_arch = "wasm32")))]
#[tokio::test]
async fn persistent_start_turn_recovers_after_discarding_stale_live_session() {
    let store: Arc<dyn SessionStore> = Arc::new(MemoryStore::new());
    let service = PersistentSessionService::new(
        MockAgentBuilder,
        4,
        Arc::clone(&store),
        None,
        Arc::new(meerkat_store::MemoryBlobStore::new()),
    );

    let created = service
        .create_session(create_req_deferred("seed"))
        .await
        .expect("create deferred session");
    let session_id = created.session_id.clone();

    let mut stored = store
        .load(&session_id)
        .await
        .expect("load should succeed")
        .expect("persisted session should exist");
    tokio::time::sleep(tokio::time::Duration::from_millis(5)).await;
    stored.touch();
    store.save(&stored).await.expect("save updated session");

    let result = service
        .start_turn(&session_id, turn_req("follow up"))
        .await
        .expect("start_turn should recover a stale discarded live session");
    assert_eq!(result.session_id, session_id);
    assert!(
        service
            .has_live_session(&session_id)
            .await
            .expect("live session query should succeed"),
        "recovered session should be live again after start_turn",
    );
}

#[cfg(all(feature = "session-store", not(target_arch = "wasm32")))]
#[tokio::test]
async fn persistent_start_turn_rejects_archived_stored_only_session() {
    let store: Arc<dyn SessionStore> = Arc::new(MemoryStore::new());
    let service = PersistentSessionService::new(
        MockAgentBuilder,
        4,
        Arc::clone(&store),
        None,
        Arc::new(meerkat_store::MemoryBlobStore::new()),
    );

    let created = service
        .create_session(create_req_deferred("seed"))
        .await
        .expect("create deferred session");
    let session_id = created.session_id.clone();

    service
        .archive(&session_id)
        .await
        .expect("archive should succeed");

    let err = service
        .start_turn(&session_id, turn_req("after archive"))
        .await
        .expect_err("archived stored-only sessions must stay read-only");
    assert_eq!(err.code(), "SESSION_NOT_FOUND");
    assert!(
        !service
            .has_live_session(&session_id)
            .await
            .expect("live session query should succeed"),
        "archived session must not be recreated as live",
    );
}

#[cfg(all(feature = "session-store", not(target_arch = "wasm32")))]
#[tokio::test]
async fn persistent_concurrent_start_turn_recovery_never_surfaces_duplicate_id() {
    let store: Arc<dyn SessionStore> = Arc::new(MemoryStore::new());
    let service = Arc::new(PersistentSessionService::new(
        MockAgentBuilder,
        4,
        Arc::clone(&store),
        None,
        Arc::new(meerkat_store::MemoryBlobStore::new()),
    ));

    let created = service
        .create_session(create_req_deferred("seed"))
        .await
        .expect("create deferred session");
    let session_id = created.session_id.clone();

    let mut stored = store
        .load(&session_id)
        .await
        .expect("load should succeed")
        .expect("persisted session should exist");
    tokio::time::sleep(tokio::time::Duration::from_millis(5)).await;
    stored.touch();
    store.save(&stored).await.expect("save updated session");

    let service_a = Arc::clone(&service);
    let session_id_a = session_id.clone();
    let first =
        tokio::spawn(async move { service_a.start_turn(&session_id_a, turn_req("first")).await });

    let service_b = Arc::clone(&service);
    let session_id_b = session_id.clone();
    let second = tokio::spawn(async move {
        service_b
            .start_turn(&session_id_b, turn_req("second"))
            .await
    });

    let outcomes = [
        first.await.expect("first start_turn task should join"),
        second.await.expect("second start_turn task should join"),
    ];
    let outcome_codes: Vec<String> = outcomes
        .iter()
        .map(|result| match result {
            Ok(_) => "OK".to_string(),
            Err(err) => err.code().to_string(),
        })
        .collect();
    let outcome_debug: Vec<String> = outcomes
        .iter()
        .map(|result| match result {
            Ok(run) => format!("OK({})", run.session_id),
            Err(err) => format!("{err:?}"),
        })
        .collect();
    assert!(
        outcomes.iter().any(Result::is_ok),
        "at least one concurrent start_turn should succeed after recovery; got {outcome_codes:?} {outcome_debug:?}",
    );
    for result in outcomes {
        if let Err(err) = result {
            assert_eq!(
                err.code(),
                "SESSION_BUSY",
                "concurrent recovery must degrade to normal busy semantics; got {outcome_codes:?} {outcome_debug:?}",
            );
        }
    }
}