meerkat-core 0.7.2

Core agent logic for Meerkat (no I/O deps)
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
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
//! Agent runner interface.

use crate::budget::Budget;
use crate::error::{AgentError, ToolError};
use crate::event::AgentEvent;
use crate::hooks::{HookInvocation, HookPoint};
use crate::lifecycle::run_primitive::{ConversationAppend, ConversationAppendRole, CoreRenderable};
use crate::ops::{ToolDispatchOutcome, ToolDispatchTimeoutPolicy};
use crate::pending_continuation::{observe_session_tail, resolve_pending_continuation};
use crate::retry::RetryPolicy;
use crate::service::TurnToolOverlay;
use crate::session::{PendingSystemContextAppend, Session};
use crate::session_document::{
    ObservedSessionTailKind, PendingContinuationDisposition, PendingContinuationPublicTerminal,
};
use crate::state::LoopState;
#[cfg(target_arch = "wasm32")]
use crate::tokio;
use crate::tool_scope::{
    EXTERNAL_TOOL_FILTER_METADATA_KEY, ExternalToolSurfaceBaseState,
    ExternalToolSurfaceDeltaOperation, ExternalToolSurfaceDeltaPhase,
    ExternalToolSurfaceEntrySnapshot, ExternalToolSurfaceSnapshot, ToolFilter, ToolScopeRevision,
    ToolScopeStageError,
};
use crate::turn_execution_authority::{
    TurnPrimitiveKind, TurnTerminalCauseKind, TurnTerminalOutcome,
};
use crate::types::{ContentInput, Message, RunInput, RunResult, ToolCallView, ToolNameSet};
use async_trait::async_trait;
use serde_json::value::to_raw_value;
use std::collections::HashSet;
use std::sync::Arc;
use tokio::sync::mpsc;

use super::{Agent, AgentBuilder, AgentLlmClient, AgentSessionStore, AgentToolDispatcher};

fn user_message_from_operator_renderable(
    content: CoreRenderable,
) -> Result<crate::types::UserMessage, AgentError> {
    match content {
        CoreRenderable::Text { text } => Ok(crate::types::UserMessage::text(text)),
        CoreRenderable::Blocks { blocks } => Ok(crate::types::UserMessage::with_blocks(blocks)),
        CoreRenderable::SystemNotice { .. }
        | CoreRenderable::Json { .. }
        | CoreRenderable::Reference { .. } => Err(AgentError::ConfigError(
            "role=user transcript append only accepts operator text or content blocks".to_string(),
        )),
    }
}

fn run_input_from_admitted_pending_tail(
    messages: &[Message],
    admitted_tail: ObservedSessionTailKind,
) -> Result<RunInput, AgentError> {
    match (admitted_tail, messages.last()) {
        (ObservedSessionTailKind::User, Some(Message::User(user)))
            if user.has_non_text_content() =>
        {
            Ok(RunInput::Content {
                content: ContentInput::Blocks(user.content.clone()),
            })
        }
        (ObservedSessionTailKind::User, Some(Message::User(user))) => Ok(RunInput::Content {
            content: ContentInput::Text(user.text_content()),
        }),
        (ObservedSessionTailKind::ToolResults, Some(Message::ToolResults { .. })) => {
            // The pending tail is staged tool results: that fact travels as
            // its own typed variant — never as a fabricated empty prompt.
            Ok(RunInput::PendingToolResults)
        }
        _ => Err(AgentError::InternalError(format!(
            "generated pending-continuation authority admitted tail {admitted_tail:?}, but transcript tail no longer matches"
        ))),
    }
}

fn dispatcher_knows_tool<T>(dispatcher: &T, name: &str) -> bool
where
    T: AgentToolDispatcher + ?Sized,
{
    if dispatcher.tool_catalog_capabilities().exact_catalog {
        dispatcher
            .tool_catalog()
            .iter()
            .any(|entry| entry.tool.name == name)
    } else {
        dispatcher.tools().iter().any(|tool| tool.name == name)
    }
}

fn precheck_visible_tool_call<T>(
    dispatcher: &T,
    visible_names: &ToolNameSet,
    name: &str,
) -> Result<(), ToolError>
where
    T: AgentToolDispatcher + ?Sized,
{
    if visible_names.contains(name) {
        return Ok(());
    }
    if dispatcher_knows_tool(dispatcher, name) {
        return Err(ToolError::access_denied(name));
    }
    Err(ToolError::not_found(name))
}

/// Typed failure projecting a runtime turn-state handle into an
/// [`crate::AgentExecutionSnapshot`].
///
/// The handle stores wide (`u64`) counters; the snapshot exposes them as
/// `u32`. A counter that does not fit is a genuine projection fault, never a
/// reason to fabricate a missing snapshot (`None`) or a default running state.
#[derive(Debug, Clone, thiserror::Error, PartialEq, Eq)]
pub enum SnapshotProjectionError {
    /// A wide turn-state counter overflowed the snapshot's `u32` field.
    #[error("turn-state counter `{field}` ({value}) does not fit the snapshot u32 projection")]
    CounterOverflow {
        /// Name of the snapshot field whose source counter overflowed.
        field: &'static str,
        /// The source counter value that failed to project.
        value: u64,
    },
}

fn project_counter(field: &'static str, value: u64) -> Result<u32, SnapshotProjectionError> {
    u32::try_from(value).map_err(|_| SnapshotProjectionError::CounterOverflow { field, value })
}

/// Typed failure serializing shared runtime control state into session metadata.
///
/// Projecting the system-context control state or the authorized tool-visibility
/// state into the canonical session metadata map can fail to serialize. That
/// failure must surface as a typed fault, never be laundered into a silent
/// partial snapshot that drops the state while reporting success.
#[derive(Debug, thiserror::Error)]
pub enum SystemContextStateError {
    /// Serializing the system-context control state into session metadata failed.
    #[error("failed to serialize system-context state into session: {0}")]
    SystemContext(#[source] serde_json::Error),
    /// Serializing the authorized tool-visibility state into session metadata failed.
    #[error("failed to serialize tool visibility state into session: {0}")]
    ToolVisibility(#[source] serde_json::Error),
}

fn runtime_execution_snapshot(
    handle: &dyn crate::TurnStateHandle,
    applied_cursor: crate::completion_feed::CompletionSeq,
) -> Result<crate::AgentExecutionSnapshot, SnapshotProjectionError> {
    let snapshot = handle.snapshot();
    let turn_phase = snapshot.turn_phase;
    // Typed handle contract: primitive_kind / terminal_outcome are
    // `Option<TurnPrimitiveKind>` / `Option<TurnTerminalOutcome>`. `None`
    // on the handle means "no primitive / no terminal outcome recorded
    // yet"; collapse to the typed `None` variant for downstream
    // consumers.
    let primitive_kind = snapshot.primitive_kind.unwrap_or(TurnPrimitiveKind::None);
    let terminal_outcome = snapshot
        .terminal_outcome
        .unwrap_or(TurnTerminalOutcome::None);
    let pending_operation_ids = if snapshot.pending_op_refs.is_empty() {
        None
    } else {
        Some(
            snapshot
                .pending_op_refs
                .iter()
                .map(|op_ref| op_ref.operation_id.clone())
                .collect(),
        )
    };
    let barrier_operation_ids = snapshot.barrier_operation_ids.iter().cloned().collect();

    Ok(crate::AgentExecutionSnapshot {
        loop_state: snapshot.loop_state,
        turn_phase,
        turn_terminal: snapshot.turn_terminal,
        active_run_id: snapshot.active_run_id,
        primitive_kind,
        admitted_content_shape: snapshot.admitted_content_shape,
        vision_enabled: snapshot.vision_enabled,
        image_tool_results_enabled: snapshot.image_tool_results_enabled,
        tool_calls_pending: project_counter("tool_calls_pending", snapshot.tool_calls_pending)?,
        pending_operation_ids,
        barrier_operation_ids,
        has_barrier_ops: snapshot.has_barrier_ops,
        barrier_satisfied: snapshot.barrier_satisfied,
        boundary_count: project_counter("boundary_count", snapshot.boundary_count)?,
        cancel_after_boundary: snapshot.cancel_after_boundary,
        terminal_outcome,
        terminal_cause_kind: snapshot.terminal_cause_kind,
        extraction_attempts: project_counter("extraction_attempts", snapshot.extraction_attempts)?,
        max_extraction_retries: project_counter(
            "max_extraction_retries",
            snapshot.max_extraction_retries,
        )?,
        applied_cursor,
    })
}

fn runtime_external_tool_surface_snapshot(
    handle: &dyn crate::ExternalToolSurfaceHandle,
) -> Option<ExternalToolSurfaceSnapshot> {
    let snapshot = handle.diagnostic_snapshot();
    let phase = snapshot.surface_phase;
    let visible_surfaces = snapshot.visible_surfaces;
    let snapshot_epoch = snapshot.snapshot_epoch;
    let snapshot_aligned_epoch = snapshot.snapshot_aligned_epoch;
    let mut entries = Vec::with_capacity(snapshot.entries.len());
    for entry in snapshot.entries {
        entries.push(ExternalToolSurfaceEntrySnapshot {
            visible: visible_surfaces.contains(&entry.surface_id),
            surface_id: entry.surface_id,
            // Typed handle contract: DSL projects a typed enum. `None`
            // means the DSL never recorded a value for this surface, so
            // the projection defaults to `Absent` / `None` per the
            // contract invariants (no state is equivalent to the zero
            // variant).
            base_state: entry
                .base_state
                .unwrap_or(ExternalToolSurfaceBaseState::Absent),
            has_removal_timing: entry.removal_draining_since_ms.is_some()
                || entry.removal_timeout_at_ms.is_some()
                || entry.removal_applied_at_turn.is_some(),
            pending_op: entry.pending_op,
            staged_op: entry.staged_op,
            staged_intent_sequence: entry.staged_intent_sequence.unwrap_or(0),
            pending_task_sequence: entry.pending_task_sequence.unwrap_or(0),
            pending_lineage_sequence: entry.pending_lineage_sequence.unwrap_or(0),
            inflight_call_count: entry.inflight_calls,
            last_delta_operation: entry
                .last_delta_operation
                .unwrap_or(ExternalToolSurfaceDeltaOperation::None),
            last_delta_phase: entry
                .last_delta_phase
                .unwrap_or(ExternalToolSurfaceDeltaPhase::None),
        });
    }
    Some(ExternalToolSurfaceSnapshot {
        phase,
        snapshot_epoch,
        snapshot_aligned_epoch,
        entries,
    })
}

/// Minimal runner interface for an Agent.
#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
pub trait AgentRunner: Send {
    async fn run(&mut self, prompt: ContentInput) -> Result<RunResult, AgentError>;

    async fn run_with_events(
        &mut self,
        prompt: ContentInput,
        tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, AgentError>;
}

impl<C, T, S> Agent<C, T, S>
where
    C: AgentLlmClient + ?Sized,
    T: AgentToolDispatcher + ?Sized + 'static,
    S: AgentSessionStore + ?Sized,
{
    /// Stage an external tool visibility filter update for subsequent turns.
    pub fn stage_external_tool_filter(
        &mut self,
        filter: ToolFilter,
    ) -> Result<ToolScopeRevision, ToolScopeStageError> {
        // Durable visibility intent is machine-owned (or owned by the local
        // fallback owner for standalone builds). ToolScope only routes the
        // staging request and rebuilds the visible-tool projection.
        let handle = self.tool_scope.handle();
        let revision = handle.stage_external_filter(filter)?;
        let _ = handle.staged_revision();
        if self.tool_scope.owns_durable_visibility_projection() {
            let visibility_state =
                self.tool_scope
                    .authorized_visibility_state()
                    .map_err(|err| ToolScopeStageError::Owner {
                        message: err.to_string(),
                    })?;
            self.session
                .set_tool_visibility_state(visibility_state)
                .map_err(|err| ToolScopeStageError::DurableProjectionPersist {
                    message: err.to_string(),
                })?;
            // Only remove the legacy fallback AFTER the canonical write
            // committed — a failed canonical persist must never destroy the
            // legacy recovery source (which would leave both sources gone).
            self.session
                .remove_metadata(EXTERNAL_TOOL_FILTER_METADATA_KEY);
        }
        Ok(revision)
    }

    /// Set or clear a per-turn flow tool overlay.
    pub fn set_flow_tool_overlay(
        &mut self,
        overlay: Option<TurnToolOverlay>,
    ) -> Result<(), ToolScopeStageError> {
        let handle = self.tool_scope.handle();
        if let Some(overlay) = overlay {
            let dispatch_context = overlay.dispatch_context;
            let allow = overlay
                .allowed_tools
                .map(|tools| tools.into_iter().collect::<HashSet<_>>());
            let deny = overlay
                .blocked_tools
                .unwrap_or_default()
                .into_iter()
                .collect::<HashSet<_>>();
            handle.set_turn_overlay(allow, deny)?;
            self.turn_tool_dispatch_metadata = dispatch_context;
        } else {
            self.turn_tool_dispatch_metadata.clear();
            handle.clear_turn_overlay()?;
        }
        Ok(())
    }

    pub fn set_runtime_execution_kind(
        &mut self,
        execution_kind: Option<crate::lifecycle::RuntimeExecutionKind>,
    ) {
        self.runtime_execution_kind = execution_kind;
    }

    fn clear_runtime_execution_kind(&mut self) {
        self.runtime_execution_kind = None;
    }

    fn require_runtime_execution_kind(&self) -> Result<(), AgentError> {
        if self.runtime_execution_kind_required && self.runtime_execution_kind.is_none() {
            return Err(AgentError::InternalError(
                "runtime_execution_kind not set: turn-state handle is attached but \
                 the runtime did not stamp RuntimeTurnMetadata.execution_kind"
                    .to_string(),
            ));
        }
        Ok(())
    }

    /// Apply accumulated session effects from tool dispatch.
    ///
    /// Called by the agent loop after each parallel tool batch completes.
    /// State-mutating effects are applied before `Message::ToolResults`; effects
    /// that append assistant transcript blocks are applied after tool results so
    /// provider tool-call adjacency remains intact.
    ///
    /// Mob authority effects must carry the generated authority seal. The
    /// session `build_state` is a durable projection; the shared
    /// `mob_authority_handle` (if present) is updated from the validated
    /// in-memory effect after the projection write succeeds.
    pub(crate) fn apply_session_effects(
        &mut self,
        effects: &[crate::ops::SessionEffect],
    ) -> Result<(), crate::error::AgentError> {
        use crate::error::AgentError;

        let mut build_state = self.session.build_state().ok_or_else(|| {
            AgentError::InternalError(format!(
                "session {} is missing session build state",
                self.session.id()
            ))
        })?;
        let mut build_state_changed = false;
        let mut visibility_changed = false;
        let mut latest_mob_authority_context = None;

        for effect in effects {
            match effect {
                crate::ops::SessionEffect::ReplaceMobToolAuthorityContext { authority_context } => {
                    if !authority_context.is_generated_authority_context() {
                        return Err(AgentError::InternalError(
                            "refusing to apply mob authority context not minted by generated authority"
                                .to_string(),
                        ));
                    }
                    build_state.mob_tool_authority_context = Some(authority_context.clone());
                    latest_mob_authority_context = Some(authority_context.clone());
                    build_state_changed = true;
                }
                crate::ops::SessionEffect::RequestDeferredTools { authorities } => {
                    self.tool_scope
                        .add_requested_deferred_authorities(authorities)
                        .map_err(|err| {
                            AgentError::InternalError(format!(
                                "failed to record requested deferred tool authorities: {err}"
                            ))
                        })?;
                    visibility_changed = true;
                }
                crate::ops::SessionEffect::AppendAssistantBlocks { blocks } => {
                    self.session.push(crate::types::Message::BlockAssistant(
                        crate::types::BlockAssistantMessage::new(
                            blocks.clone(),
                            crate::types::StopReason::EndTurn,
                        ),
                    ));
                }
            }
        }

        if build_state_changed {
            self.session.set_build_state(build_state).map_err(|e| {
                AgentError::InternalError(format!(
                    "failed to persist session effects into build state: {e}"
                ))
            })?;
        }

        if visibility_changed && let Err(err) = self.publish_committed_visible_set() {
            return Err(AgentError::InternalError(format!(
                "failed to persist session effects into tool visibility state: {err}"
            )));
        }

        // Update the shared effective-authority handle so mob tools in
        // subsequent batches see the widened scope. Serialization drops the
        // generated authority seal, so the handle is updated only from the
        // already-validated in-memory effect.
        if build_state_changed
            && let Some(ref handle) = self.mob_authority_handle
            && let Some(authority) = latest_mob_authority_context
        {
            *handle
                .write()
                .unwrap_or_else(std::sync::PoisonError::into_inner) = authority;
        }

        Ok(())
    }

    /// Set the shared mob authority handle for session-effect application.
    ///
    /// The agent updates this handle after merging `SessionEffect`s from tool
    /// dispatch. Mob tools read from it for authorization checks.
    pub fn set_mob_authority_handle(
        &mut self,
        handle: Arc<std::sync::RwLock<crate::service::MobToolAuthorityContext>>,
    ) {
        self.mob_authority_handle = Some(handle);
    }

    /// Replace the LLM client for subsequent turns.
    ///
    /// Enables hot-swapping the model/provider on a live session without
    /// rebuilding the agent. The new client takes effect on the next
    /// `run()` / `run_with_events()` call.
    pub fn replace_client(&mut self, client: Arc<C>) {
        self.client = client;
    }

    /// Apply the live LLM request policy paired with an identity hot-swap.
    pub fn apply_llm_request_policy(&mut self, policy: crate::SessionLlmRequestPolicy) {
        self.config.model = policy.model;
        self.config.provider_params = crate::lifecycle::run_primitive::ProviderParamsCarrier {
            params: policy.provider_params.unwrap_or_default(),
            tool_defaults: policy.provider_tool_defaults,
        };
    }

    /// Replace the LLM client and its next-turn request policy together.
    pub fn replace_client_with_request_policy(
        &mut self,
        client: Arc<C>,
        policy: crate::SessionLlmRequestPolicy,
    ) {
        self.replace_client(client);
        self.apply_llm_request_policy(policy);
    }

    /// Rotate runtime auth-lease tracking alongside a live LLM identity swap.
    pub fn rotate_auth_lease_auth_binding(
        &self,
        previous: Option<&crate::AuthBindingRef>,
        target: Option<&crate::AuthBindingRef>,
    ) -> Result<(), AgentError> {
        let Some(handle) = self.auth_lease_handle.as_deref() else {
            return Ok(());
        };
        if previous == target {
            return Ok(());
        }
        if let Some(previous) = previous {
            let previous_key = crate::handles::LeaseKey::from_auth_binding(previous);
            handle.release_lease(&previous_key).map_err(|err| {
                AgentError::ConfigError(format!(
                    "failed to release previous auth lease {previous_key} during rotation: {err}"
                ))
            })?;
        }
        if let Some(target) = target {
            let target_key = crate::handles::LeaseKey::from_auth_binding(target);
            let target_snapshot = handle.snapshot(&target_key);
            if target_snapshot.credential_present && target_snapshot.phase.is_some() {
                return Ok(());
            }
            handle.acquire_lease(&target_key, u64::MAX).map_err(|err| {
                AgentError::ConfigError(format!(
                    "failed to rotate auth lease to auth_binding {target_key}: {err}"
                ))
            })?;
        }
        Ok(())
    }

    /// Cloneable producer handle for boundary-only cancellation requests.
    ///
    /// Returns a sender on the typed cancel-after-boundary command channel.
    /// The requesting surface sends a [`CancelAfterBoundaryCommand`]; the agent
    /// loop observes it at the next turn boundary.
    pub fn cancel_after_boundary_handle(&self) -> super::CancelAfterBoundarySender {
        self.cancel_after_boundary_tx.clone()
    }

    /// Get the runtime-backed turn-state handle, when this agent was built with one.
    pub fn turn_state_handle(&self) -> Option<Arc<dyn crate::TurnStateHandle>> {
        self.turn_state_handle.clone()
    }

    /// Persist the currently committed visible tool set into canonical session metadata.
    pub(crate) fn publish_committed_visible_set(&mut self) -> Result<(), AgentError> {
        // Session metadata is a durable projection/export of the canonical
        // visibility owner state so checkpoint/recovery stays aligned. The
        // projection only exists when a generated MeerkatMachine authority owns
        // it; standalone builds use a read-only local projection with nothing to
        // persist, so this is a no-op there (not a durable-write fault). When
        // the projection IS owned, a write failure is a genuine fault that must
        // propagate — never be swallowed while a boundary-applied success is
        // reported, which would diverge the recovery source from in-memory
        // authority.
        if !self.tool_scope.owns_durable_visibility_projection() {
            return Ok(());
        }
        let authorized_visibility_state =
            self.tool_scope
                .authorized_visibility_state()
                .map_err(|err| {
                    AgentError::InternalError(format!(
                        "failed to authorize canonical tool visibility state: {err}"
                    ))
                })?;
        self.session
            .set_tool_visibility_state(authorized_visibility_state)
            .map_err(|err| {
                AgentError::InternalError(format!(
                    "failed to persist canonical tool visibility state: {err}"
                ))
            })
    }

    /// Dispatch one external tool call through the canonical tool dispatcher.
    ///
    /// This reuses the same visibility owner and session-effect application path
    /// as ordinary LLM-driven tool batches, but without synthesizing a full turn.
    pub async fn dispatch_external_tool_call(
        &mut self,
        call: crate::types::ToolCall,
    ) -> Result<ToolDispatchOutcome, AgentError> {
        self.dispatch_external_tool_call_with_timeout_policy(
            call,
            ToolDispatchTimeoutPolicy::Disabled,
        )
        .await
    }

    /// Dispatch an external product/runtime tool call with an optional
    /// caller-owned timeout. Timeout terminalization is still canonical:
    /// timeout expiry becomes `ToolError::Timeout`, then flows through
    /// `terminal_tool_outcome_for_error` like normal tool execution failures.
    pub async fn dispatch_external_tool_call_with_timeout_policy(
        &mut self,
        call: crate::types::ToolCall,
        timeout_policy: ToolDispatchTimeoutPolicy,
    ) -> Result<ToolDispatchOutcome, AgentError> {
        let visible_tool_names = self
            .tool_scope
            .visible_tool_names()
            .map_err(|err| AgentError::InternalError(err.to_string()))?
            .into_iter()
            .collect::<ToolNameSet>();
        if let Err(error) =
            precheck_visible_tool_call(self.tools.as_ref(), &visible_tool_names, call.name.as_str())
        {
            return Ok(crate::ops::terminal_tool_outcome_for_error(call.id, error));
        }
        let args = to_raw_value(&call.args).map_err(|err| {
            AgentError::InternalError(format!(
                "failed to serialize external tool-call arguments: {err}"
            ))
        })?;
        let view = ToolCallView {
            id: &call.id,
            name: &call.name,
            args: args.as_ref(),
        };
        let dispatch_context = self.tool_dispatch_context.clone();
        let dispatch_result = match timeout_policy.timeout() {
            Some(timeout) => {
                match tokio::time::timeout(
                    timeout,
                    self.tools.dispatch_with_context(view, &dispatch_context),
                )
                .await
                {
                    Ok(result) => result,
                    Err(_) => Err(crate::error::ToolError::timeout(
                        call.name.clone(),
                        timeout_policy.timeout_ms().unwrap_or(u64::MAX),
                    )),
                }
            }
            None => {
                self.tools
                    .dispatch_with_context(view, &dispatch_context)
                    .await
            }
        };

        match dispatch_result {
            Ok(mut outcome) => {
                outcome.clear_terminal_cause();
                if outcome.result.tool_use_id.is_empty() {
                    outcome.result.tool_use_id = call.id;
                }
                if !outcome.session_effects.is_empty() {
                    self.apply_session_effects(&outcome.session_effects)?;
                }
                Ok(outcome)
            }
            Err(crate::error::ToolError::CallbackPending { tool_name, args }) => {
                Err(AgentError::CallbackPending { tool_name, args })
            }
            Err(error) => Ok(crate::ops::terminal_tool_outcome_for_error(call.id, error)),
        }
    }

    #[cfg(test)]
    pub(crate) fn inject_tool_scope_boundary_failure_once_for_test(&self) {
        self.tool_scope.inject_boundary_failure_once_for_test();
    }
}

impl<C, T, S> Agent<C, T, S>
where
    C: AgentLlmClient + ?Sized + 'static,
    T: AgentToolDispatcher + ?Sized + 'static,
    S: AgentSessionStore + ?Sized + 'static,
{
    /// Create a new agent builder
    pub fn builder() -> AgentBuilder {
        AgentBuilder::new()
    }

    /// Get the current session
    pub fn session(&self) -> &Session {
        &self.session
    }

    /// Get mutable access to the session (for setting metadata)
    pub fn session_mut(&mut self) -> &mut Session {
        &mut self.session
    }

    /// Get the current budget
    pub fn budget(&self) -> &Budget {
        &self.budget
    }

    /// Get the current loop state.
    ///
    /// Returns the snapshotted [`LoopState`] when a runtime-backed turn-state
    /// handle is attached, `Ok(LoopState::CallingLlm)` when the agent runs
    /// standalone (no handle, so no machine-owned loop state to project), and a
    /// typed [`SnapshotProjectionError`] when the handle is present but its
    /// counters cannot be projected. A projection fault is never laundered into
    /// a fabricated running state.
    pub fn state(&self) -> Result<LoopState, SnapshotProjectionError> {
        match self.execution_snapshot()? {
            Some(snapshot) => Ok(snapshot.loop_state),
            // No runtime handle attached: standalone/ephemeral execution has no
            // machine-owned loop state, so report the default entry state. This
            // is a genuine "no handle" case, distinct from a projection failure.
            None => Ok(LoopState::CallingLlm),
        }
    }

    /// Snapshot the agent's live execution state for diagnostics and mapping.
    ///
    /// Returns `Ok(None)` when the agent has no runtime-backed turn-state
    /// handle attached (standalone/ephemeral execution paths), and a typed
    /// [`SnapshotProjectionError`] when the handle is present but a turn-state
    /// counter overflows the snapshot projection.
    pub fn execution_snapshot(
        &self,
    ) -> Result<Option<crate::AgentExecutionSnapshot>, SnapshotProjectionError> {
        let Some(handle) = self.turn_state_handle.as_deref() else {
            return Ok(None);
        };
        runtime_execution_snapshot(handle, self.applied_cursor).map(Some)
    }

    /// Snapshot the agent's live tool-scope state for diagnostics and mapping.
    pub fn tool_scope_snapshot(&self) -> Option<crate::ToolScopeSnapshot> {
        let mut snapshot = self.tool_scope.snapshot()?;
        let capability_filter =
            crate::ToolScope::compose(&[self.client.active_capability_base_filter()]);
        snapshot
            .visible_names
            .retain(|name| capability_filter.allows(name.as_str()));
        snapshot.capability_base_filter = self.client.active_capability_base_filter();
        Some(snapshot)
    }

    /// Snapshot the provider-visible tool definitions for the active LLM model.
    pub fn visible_tool_defs(&self) -> Vec<crate::ToolDef> {
        let capability_filter =
            crate::ToolScope::compose(&[self.client.active_capability_base_filter()]);
        self.tool_scope
            .visible_tools()
            .iter()
            .filter(|tool| capability_filter.allows(tool.name.as_str()))
            .map(|tool| tool.as_ref().clone())
            .collect()
    }

    /// Snapshot the live external tool-surface state, if supported by the dispatcher chain.
    pub fn external_tool_surface_snapshot(&self) -> Option<crate::ExternalToolSurfaceSnapshot> {
        if let Some(handle) = self.external_tool_surface_handle.as_deref() {
            if let Some(snapshot) = runtime_external_tool_surface_snapshot(handle) {
                return Some(snapshot);
            }
            tracing::warn!(
                "failed to convert runtime external-tool-surface snapshot; falling back to dispatcher snapshot"
            );
        }
        self.tools.external_tool_surface_snapshot()
    }

    /// Get the retry policy
    pub fn retry_policy(&self) -> &RetryPolicy {
        &self.retry_policy
    }

    /// Get the current nesting depth
    pub fn depth(&self) -> u32 {
        self.depth
    }

    /// Get the event tap for interaction-scoped streaming.
    pub fn event_tap(&self) -> &crate::event_tap::EventTap {
        &self.event_tap
    }

    /// Access the live tool-scope projection bridge.
    pub fn tool_scope(&self) -> &crate::ToolScope {
        &self.tool_scope
    }

    /// Get shared runtime system-context control state.
    pub fn system_context_state(&self) -> crate::session::SystemContextStateHandle {
        crate::session::SystemContextStateHandle::from_shared_authority_state(Arc::clone(
            &self.system_context_state,
        ))
    }

    /// Clone the current session with the latest shared system-context state merged into metadata.
    ///
    /// A serialize failure projecting either the system-context control state or
    /// the authorized tool-visibility state into session metadata is a typed
    /// fault, not a silent partial snapshot: it propagates as
    /// [`SystemContextStateError`] rather than being laundered through a
    /// `tracing::warn!` that would hand back a session missing the state.
    pub fn session_with_system_context_state(&self) -> Result<Session, SystemContextStateError> {
        let mut session = self.session.clone();
        let state = self.system_context_state().snapshot();
        session
            .set_system_context_state(state)
            .map_err(SystemContextStateError::SystemContext)?;
        if let Ok(visibility_state) = self.tool_scope.authorized_visibility_state() {
            session
                .set_tool_visibility_state(visibility_state)
                .map_err(SystemContextStateError::ToolVisibility)?;
        }
        Ok(session)
    }

    /// Synchronize the shared system-context state into the in-memory session metadata.
    ///
    /// A serialize failure is a typed fault, not a silent partial sync: it
    /// propagates as [`SystemContextStateError`] rather than being laundered
    /// through a `tracing::warn!` that would leave canonical session metadata
    /// stale while reporting success to the caller.
    #[doc(hidden)]
    pub fn sync_system_context_state_to_session(&mut self) -> Result<(), SystemContextStateError> {
        let state = self.system_context_state().snapshot();
        self.session
            .set_system_context_state(state)
            .map_err(SystemContextStateError::SystemContext)
    }

    /// Consume all pending system-context appends for the next LLM boundary.
    ///
    /// The returned appends are intended for transient request composition only;
    /// they must not be written back into the canonical session prompt.
    pub(crate) fn take_pending_system_context_boundary(
        &mut self,
    ) -> Result<Vec<PendingSystemContextAppend>, SystemContextStateError> {
        let pending = {
            let mut state = match self.system_context_state.lock() {
                Ok(guard) => guard,
                Err(poisoned) => {
                    tracing::warn!("system-context state lock poisoned while applying boundary");
                    poisoned.into_inner()
                }
            };
            if state.pending().is_empty() {
                return Ok(Vec::new());
            }
            let pending = state.pending().to_vec();
            state.mark_pending_applied();
            pending
        };

        if !pending.is_empty() {
            tracing::debug!(
                pending_count = pending.len(),
                "applying pending runtime system context at model boundary"
            );
        }
        self.sync_system_context_state_to_session()?;
        Ok(pending)
    }

    pub(crate) fn llm_messages_with_runtime_system_context(
        &self,
        appends: &[PendingSystemContextAppend],
    ) -> Vec<Message> {
        if appends.is_empty() {
            return self.session.messages().to_vec();
        }

        let mut session = self.session.clone();
        session.append_system_context_blocks(appends);
        session.messages().to_vec()
    }

    /// Persist the current session through the configured checkpointer after syncing control state.
    ///
    /// A serialize failure syncing system-context state surfaces as a typed
    /// [`AgentError::InternalError`] rather than being swallowed, so the
    /// checkpoint never persists a session whose control-state projection
    /// silently failed.
    #[doc(hidden)]
    pub async fn checkpoint_current_session(&mut self) -> Result<(), AgentError> {
        self.sync_system_context_state_to_session()
            .map_err(|err| AgentError::InternalError(err.to_string()))?;
        if let Some(ref cp) = self.checkpointer {
            cp.checkpoint(&self.session).await;
        }
        Ok(())
    }

    async fn run_started_hooks(
        &self,
        input: &RunInput,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) -> Result<(), AgentError> {
        let report = self
            .execute_hooks(
                HookInvocation::run_started(self.session.id().clone(), input.clone()),
                event_tx,
            )
            .await?;

        if let Some(error) = report.denial_error(HookPoint::RunStarted) {
            return Err(error);
        }
        Ok(())
    }

    pub(super) async fn run_completed_hooks(
        &mut self,
        result: &mut RunResult,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) -> Result<(), AgentError> {
        let report = self
            .execute_hooks(
                HookInvocation::run_completed(self.session.id().clone(), result.turns),
                event_tx,
            )
            .await?;

        if let Some(error) = report.denial_error(HookPoint::RunCompleted) {
            return Err(error);
        }

        self.run_completed_hooks_applied = true;
        Ok(())
    }

    pub(super) async fn emit_run_completed_event(
        &self,
        result: &RunResult,
        extraction_required: bool,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) {
        let _ = crate::event_tap::tap_emit(
            &self.event_tap,
            event_tx,
            AgentEvent::RunCompleted {
                session_id: self.session.id().clone(),
                result: result.text.clone(),
                structured_output: result.structured_output.clone(),
                extraction_required,
                usage: result.usage.clone(),
                terminal_cause_kind: result.terminal_cause_kind,
            },
        )
        .await;
    }

    pub(super) async fn emit_extraction_succeeded_event(
        &self,
        structured_output: serde_json::Value,
        schema_warnings: Option<Vec<crate::schema::SchemaWarning>>,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) {
        let _ = crate::event_tap::tap_emit(
            &self.event_tap,
            event_tx,
            AgentEvent::ExtractionSucceeded {
                session_id: self.session.id().clone(),
                structured_output,
                schema_warnings,
            },
        )
        .await;
    }

    pub(super) async fn emit_extraction_failed_event(
        &self,
        error: &crate::types::ExtractionError,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) {
        let _ = crate::event_tap::tap_emit(
            &self.event_tap,
            event_tx,
            AgentEvent::ExtractionFailed {
                session_id: self.session.id().clone(),
                last_output: error.last_output.clone(),
                attempts: error.attempts,
                reason: error.reason.clone(),
            },
        )
        .await;
    }

    async fn emit_run_started_event(
        &self,
        input: RunInput,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) {
        let _ = crate::event_tap::tap_emit(
            &self.event_tap,
            event_tx,
            AgentEvent::RunStarted {
                session_id: self.session.id().clone(),
                input,
            },
        )
        .await;
    }

    async fn emit_run_failed_event(
        &self,
        error: &AgentError,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) {
        let error_report = crate::event::AgentErrorReport::from_agent_error(error);
        let terminal_cause_kind = match error {
            AgentError::TerminalFailure { cause_kind, .. }
                if cause_kind.is_specific_failure_cause() =>
            {
                Some(*cause_kind)
            }
            _ => match self.execution_snapshot() {
                Ok(snapshot) => snapshot
                    .and_then(|snapshot| snapshot.terminal_cause_kind)
                    .filter(|cause_kind| *cause_kind != TurnTerminalCauseKind::Unknown),
                Err(err) => {
                    // The run is already terminalizing into a failure event; a
                    // snapshot projection fault here only means we cannot
                    // recover a more specific terminal cause kind. Surface the
                    // typed fault rather than laundering it, but still emit the
                    // failure event with no derived cause kind.
                    tracing::warn!(
                        error = %err,
                        "failed to project execution snapshot while emitting run-failed event"
                    );
                    None
                }
            },
        };
        let _ = crate::event_tap::tap_emit(
            &self.event_tap,
            event_tx,
            AgentEvent::RunFailed {
                session_id: self.session.id().clone(),
                error_report,
                terminal_cause_kind,
            },
        )
        .await;
    }

    async fn handle_run_failure(
        &self,
        error: &AgentError,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) {
        if let Err(hook_err) = self.run_failed_hooks(error, event_tx).await {
            tracing::warn!(?hook_err, "run_failed hook execution failed");
        }
        self.emit_run_failed_event(error, event_tx).await;
    }

    async fn run_failed_hooks(
        &self,
        error: &AgentError,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) -> Result<(), AgentError> {
        let report = self
            .execute_hooks(
                HookInvocation::run_failed(self.session.id().clone(), error),
                event_tx,
            )
            .await?;

        if let Some(error) = report.denial_error(HookPoint::RunFailed) {
            return Err(error);
        }
        Ok(())
    }

    /// Run the agent with a user message.
    pub async fn run(&mut self, user_input: ContentInput) -> Result<RunResult, AgentError> {
        self.run_inner(user_input, Vec::new(), None).await
    }

    /// Run the agent with events streamed to the provided channel.
    pub async fn run_with_events(
        &mut self,
        user_input: ContentInput,
        event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, AgentError> {
        self.run_inner(user_input, Vec::new(), Some(event_tx)).await
    }

    /// Run the agent with provider-facing prompt content derived from typed
    /// runtime appends, while persisting those appends according to their roles.
    pub async fn run_with_events_and_typed_turn_appends(
        &mut self,
        user_input: ContentInput,
        typed_turn_appends: Vec<ConversationAppend>,
        event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, AgentError> {
        self.run_inner(user_input, typed_turn_appends, Some(event_tx))
            .await
    }

    /// Run the agent using the pending continuation boundary already in the session.
    ///
    /// This is useful when the session has been pre-populated with a continuation
    /// boundary (for example a deferred first-turn user message or staged callback
    /// tool results). Unlike `run()`, this method does NOT add a new user message;
    /// it runs directly from the session's current state.
    ///
    /// Returns `NoPendingBoundary` when generated pending-continuation
    /// authority does not admit the current transcript tail.
    pub async fn run_pending(&mut self) -> Result<RunResult, AgentError> {
        self.run_pending_inner(None).await
    }

    /// Run the agent using the pending continuation boundary, with event streaming.
    ///
    /// Like `run_pending()`, but emits events to the provided channel.
    pub async fn run_pending_with_events(
        &mut self,
        event_tx: mpsc::Sender<AgentEvent>,
    ) -> Result<RunResult, AgentError> {
        self.run_pending_inner(Some(event_tx)).await
    }

    fn push_transcript_append(&mut self, append: ConversationAppend) -> Result<(), AgentError> {
        match append.role {
            ConversationAppendRole::User => {
                let message = user_message_from_operator_renderable(append.content)?;
                self.session.push(Message::User(message));
            }
            ConversationAppendRole::SystemNotice => {
                let notice = match append.content {
                    CoreRenderable::SystemNotice { kind, body, blocks } => {
                        crate::types::SystemNoticeMessage::with_blocks(kind, body, blocks)
                    }
                    CoreRenderable::Text { text } => crate::types::SystemNoticeMessage::with_block(
                        crate::types::SystemNoticeKind::Generic,
                        Some(text.clone()),
                        crate::types::SystemNoticeBlock::RuntimeNotice {
                            category: "runtime_notice".to_string(),
                            detail: Some(text),
                            payload: None,
                        },
                    ),
                    CoreRenderable::Blocks { blocks } => {
                        crate::types::SystemNoticeMessage::with_block(
                            crate::types::SystemNoticeKind::Generic,
                            None,
                            crate::types::SystemNoticeBlock::RuntimeNotice {
                                category: "runtime_notice".to_string(),
                                detail: Some(crate::types::text_content(&blocks)),
                                payload: None,
                            },
                        )
                    }
                    CoreRenderable::Json { value } => {
                        crate::types::SystemNoticeMessage::with_block(
                            crate::types::SystemNoticeKind::Generic,
                            None,
                            crate::types::SystemNoticeBlock::RuntimeNotice {
                                category: "runtime_notice".to_string(),
                                detail: None,
                                payload: Some(value),
                            },
                        )
                    }
                    CoreRenderable::Reference { uri, label } => {
                        crate::types::SystemNoticeMessage::with_block(
                            crate::types::SystemNoticeKind::Generic,
                            label,
                            crate::types::SystemNoticeBlock::RuntimeNotice {
                                category: "runtime_notice".to_string(),
                                detail: Some(uri),
                                payload: None,
                            },
                        )
                    }
                };
                self.session.push(Message::SystemNotice(notice));
            }
            ConversationAppendRole::Assistant | ConversationAppendRole::Tool => {
                return Err(AgentError::ConfigError(
                    "runtime transcript append role is not supported for turn start".to_string(),
                ));
            }
        }
        Ok(())
    }

    /// Core run implementation shared by `run()` and `run_with_events()`.
    ///
    /// Adds user_input as a user message, emits lifecycle events when `event_tx`
    /// is provided, and delegates to `run_loop`.
    async fn run_inner(
        &mut self,
        user_input: ContentInput,
        typed_turn_appends: Vec<ConversationAppend>,
        event_tx: Option<mpsc::Sender<AgentEvent>>,
    ) -> Result<RunResult, AgentError> {
        let event_tx = event_tx.or_else(|| self.default_event_tx.clone());

        self.require_runtime_execution_kind()?;

        // Reset state for new run (allows multi-turn on same agent).
        self.extraction_state.reset();
        self.terminal_error_detail = None;
        self.run_completed_hooks_applied = false;
        self.run_completed_event_emitted = false;

        // Apply canonical per-turn skill references staged by the surface.
        // Resolved activations travel as typed `SkillContext` blocks prepended
        // to the turn input, preserving activation provenance in the durable
        // transcript instead of folding skill bodies into operator text.
        let skill_blocks = self.resolve_pending_skill_context(event_tx.as_ref()).await;
        let user_input = if skill_blocks.is_empty() {
            user_input
        } else {
            let mut blocks = skill_blocks;
            match user_input {
                ContentInput::Text(text) if text.is_empty() => {}
                other => blocks.extend(other.into_blocks()),
            }
            ContentInput::Blocks(blocks)
        };

        // Hooks/events receive the typed run input; the external hook wire
        // envelope derives its text projection at serialization time only.
        let run_prompt_input = RunInput::from(user_input.clone());

        // Run-start hooks own the start veto. They must run — and be able to
        // deny — BEFORE we publish `RunStarted` or commit the user message to
        // the transcript. Otherwise observers see a `RunStarted` for a run that
        // immediately fails at run-start (a false-start window), and the denied
        // run leaves a stray user message in the session. On denial we emit a
        // terminal-failure event with no preceding `RunStarted`.
        if let Err(err) = self
            .run_started_hooks(&run_prompt_input, event_tx.as_ref())
            .await
        {
            self.handle_run_failure(&err, event_tx.as_ref()).await;
            self.clear_runtime_execution_kind();
            return Err(err);
        }

        if typed_turn_appends.is_empty() {
            // Add user message — preserve image blocks when present.
            let user_message = if user_input.has_non_text_content() {
                crate::types::UserMessage::with_blocks(user_input.into_blocks())
            } else {
                crate::types::UserMessage::text(user_input.text_content())
            };
            self.session.push(Message::User(user_message));
        } else {
            for append in typed_turn_appends {
                self.push_transcript_append(append)?;
            }
        }

        self.emit_run_started_event(run_prompt_input.clone(), event_tx.as_ref())
            .await;

        self.tool_dispatch_context = crate::ToolDispatchContext::from_run_input(&run_prompt_input)
            .with_turn_metadata(self.turn_tool_dispatch_metadata.clone());
        let loop_result = self.run_loop(event_tx.clone()).await;
        self.tool_dispatch_context = crate::ToolDispatchContext::default();

        match loop_result {
            Ok(mut result) => {
                if !self.run_completed_hooks_applied
                    && let Err(err) = self
                        .run_completed_hooks(&mut result, event_tx.as_ref())
                        .await
                {
                    self.handle_run_failure(&err, event_tx.as_ref()).await;
                    self.clear_runtime_execution_kind();
                    return Err(err);
                }
                if !self.run_completed_event_emitted {
                    self.emit_run_completed_event(&result, false, event_tx.as_ref())
                        .await;
                    self.run_completed_event_emitted = true;
                }
                if let Err(err) = self.checkpoint_current_session().await {
                    self.handle_run_failure(&err, event_tx.as_ref()).await;
                    self.clear_runtime_execution_kind();
                    return Err(err);
                }
                self.clear_runtime_execution_kind();
                Ok(result)
            }
            Err(err) => {
                self.handle_run_failure(&err, event_tx.as_ref()).await;
                self.clear_runtime_execution_kind();
                Err(err)
            }
        }
    }

    /// Core run-pending implementation shared by `run_pending()` and
    /// `run_pending_with_events()`.
    ///
    /// Uses the existing pending continuation boundary in the session (does NOT
    /// push a new user message). Emits lifecycle events when `event_tx` is
    /// provided. Also used by continuation paths after response injection or
    /// staged callback tool-result admission.
    pub(super) async fn run_pending_inner(
        &mut self,
        event_tx: Option<mpsc::Sender<AgentEvent>>,
    ) -> Result<RunResult, AgentError> {
        let event_tx = event_tx.or_else(|| self.default_event_tx.clone());

        let session_tail = observe_session_tail(self.session.messages());
        let pending_resolution =
            resolve_pending_continuation(session_tail, 0).map_err(|error| {
                AgentError::InternalError(format!(
                    "generated pending-continuation authority rejected run_pending: {error}"
                ))
            })?;
        let prompt = match pending_resolution.disposition {
            PendingContinuationDisposition::RunPending => {
                if let Some(terminal) = pending_resolution.public_terminal {
                    self.clear_runtime_execution_kind();
                    return Err(AgentError::InternalError(format!(
                        "generated pending-continuation authority emitted terminal {terminal:?} for runnable continuation"
                    )));
                }
                match run_input_from_admitted_pending_tail(self.session.messages(), session_tail) {
                    Ok(prompt) => prompt,
                    Err(error) => {
                        self.clear_runtime_execution_kind();
                        return Err(error);
                    }
                }
            }
            PendingContinuationDisposition::NoPendingBoundary => {
                self.clear_runtime_execution_kind();
                return if pending_resolution.public_terminal
                    == Some(PendingContinuationPublicTerminal::NoPendingBoundary)
                {
                    Err(AgentError::NoPendingBoundary)
                } else {
                    Err(AgentError::InternalError(
                        "generated pending-continuation authority omitted NoPendingBoundary terminal witness".to_string(),
                    ))
                };
            }
        };

        self.require_runtime_execution_kind()?;

        // Reset state for new run (allows multi-turn on same agent).
        self.extraction_state.reset();
        self.terminal_error_detail = None;
        self.run_completed_hooks_applied = false;
        self.run_completed_event_emitted = false;

        // Run-start hooks own the start veto on the pending-continuation path
        // too: they must run — and be able to deny — BEFORE we publish
        // `RunStarted`, mirroring `run_inner`. Otherwise observers see a
        // `RunStarted` for a run that immediately fails at run-start (a
        // false-start window).
        if let Err(err) = self.run_started_hooks(&prompt, event_tx.as_ref()).await {
            self.handle_run_failure(&err, event_tx.as_ref()).await;
            self.clear_runtime_execution_kind();
            return Err(err);
        }

        self.emit_run_started_event(prompt.clone(), event_tx.as_ref())
            .await;

        self.tool_dispatch_context = crate::ToolDispatchContext::from_run_input(&prompt)
            .with_turn_metadata(self.turn_tool_dispatch_metadata.clone());
        let loop_result = self.run_loop(event_tx.clone()).await;
        self.tool_dispatch_context = crate::ToolDispatchContext::default();

        match loop_result {
            Ok(mut result) => {
                if !self.run_completed_hooks_applied
                    && let Err(err) = self
                        .run_completed_hooks(&mut result, event_tx.as_ref())
                        .await
                {
                    self.handle_run_failure(&err, event_tx.as_ref()).await;
                    self.clear_runtime_execution_kind();
                    return Err(err);
                }
                if !self.run_completed_event_emitted {
                    self.emit_run_completed_event(&result, false, event_tx.as_ref())
                        .await;
                    self.run_completed_event_emitted = true;
                }
                if let Err(err) = self.checkpoint_current_session().await {
                    self.handle_run_failure(&err, event_tx.as_ref()).await;
                    self.clear_runtime_execution_kind();
                    return Err(err);
                }
                self.clear_runtime_execution_kind();
                Ok(result)
            }
            Err(err) => {
                self.handle_run_failure(&err, event_tx.as_ref()).await;
                self.clear_runtime_execution_kind();
                Err(err)
            }
        }
    }

    /// Cancel the current run
    pub fn cancel(&mut self) {
        use crate::turn_execution_authority::TurnExecutionInput;

        self.clear_runtime_execution_kind();
        let snapshot = self
            .turn_state_handle
            .as_deref()
            .map(crate::handles::TurnStateHandle::snapshot);
        let input = match snapshot.and_then(|s| s.active_run_id) {
            Some(run_id) => TurnExecutionInput::CancelNow { run_id },
            None => TurnExecutionInput::ForceCancelNoRun,
        };
        let _ = self.apply_turn_input(input);
    }

    /// Consume canonical pending `skill_references` staged by the surface and
    /// resolve them into typed [`ContentBlock::SkillContext`] blocks for the
    /// next user input.
    ///
    /// Per-turn skill activation is a typed operational effect, not operator
    /// text: a successful resolution emits the typed
    /// [`AgentEvent::SkillsResolved`] (carrying the canonical [`SkillKey`]s and
    /// injection byte count) AND yields typed skill-context blocks that the
    /// durable transcript preserves with their activation provenance — the
    /// rendered body is never folded into anonymous operator text. A failed
    /// resolution emits the typed [`AgentEvent::SkillResolutionFailed`]
    /// (carrying the typed `SkillKey` and typed
    /// [`SkillResolutionFailureReason`]) rather than being swallowed by a log
    /// line.
    ///
    /// Compatibility slash refs are handled at transport/resolver boundaries;
    /// core runtime no longer parses slash refs directly.
    ///
    /// [`SkillKey`]: crate::skills::SkillKey
    /// [`SkillResolutionFailureReason`]: crate::event::SkillResolutionFailureReason
    async fn resolve_pending_skill_context(
        &mut self,
        event_tx: Option<&mpsc::Sender<AgentEvent>>,
    ) -> Vec<crate::types::ContentBlock> {
        let engine = match &self.skill_engine {
            Some(e) => e.clone(),
            None => return Vec::new(),
        };

        let mut skill_blocks: Vec<crate::types::ContentBlock> = Vec::new();

        // Consume pending_skill_references (from wire format / API)
        if let Some(refs) = self.pending_skill_references.take()
            && !refs.is_empty()
        {
            let canonical_keys: Vec<crate::skills::SkillKey> = refs.into_iter().collect();
            match engine.resolve_and_render(&canonical_keys).await {
                Ok(resolved) => {
                    // Typed activation effect: resolved skills are observable as
                    // a structured event carrying the canonical keys, distinct
                    // from any operator-typed text. The rendered bodies travel
                    // as typed skill-context blocks, not folded prompt text.
                    let mut injection_bytes = 0usize;
                    let mut activated_keys: Vec<crate::skills::SkillKey> =
                        Vec::with_capacity(resolved.len());
                    for skill in &resolved {
                        tracing::info!(
                            skill_key = %skill.key,
                            "Per-turn skill activation via skill_references"
                        );
                        injection_bytes = injection_bytes.saturating_add(skill.byte_size);
                        activated_keys.push(skill.key.clone());
                        skill_blocks.push(crate::types::ContentBlock::SkillContext {
                            skill_key: skill.key.clone(),
                            text: skill.rendered_body.clone(),
                        });
                    }
                    if !activated_keys.is_empty() {
                        let _ = crate::event_tap::tap_emit(
                            &self.event_tap,
                            event_tx,
                            AgentEvent::SkillsResolved {
                                skills: activated_keys,
                                injection_bytes,
                            },
                        )
                        .await;
                    }
                }
                Err(e) => {
                    // Fail-explicit: emit the typed resolution failure carrying
                    // the typed reason and the canonical key we attempted to
                    // resolve, instead of swallowing the signal in a log line.
                    let reason = crate::event::SkillResolutionFailureReason::from_skill_error(&e);
                    let skill_key = canonical_keys.first().cloned();
                    tracing::warn!(
                        error = %e,
                        "Failed to resolve source-pinned skill_references"
                    );
                    let _ = crate::event_tap::tap_emit(
                        &self.event_tap,
                        event_tx,
                        AgentEvent::SkillResolutionFailed { skill_key, reason },
                    )
                    .await;
                }
            }
        }

        skill_blocks
    }
}

#[cfg(test)]
#[allow(clippy::panic)]
mod typed_transcript_contract_tests {
    use super::*;

    #[test]
    fn user_role_accepts_only_operator_text_or_blocks() {
        assert!(
            user_message_from_operator_renderable(CoreRenderable::Text {
                text: "hello".to_string(),
            })
            .is_ok()
        );
        assert!(
            user_message_from_operator_renderable(CoreRenderable::Blocks {
                blocks: vec![crate::types::ContentBlock::Text {
                    text: "hello".to_string(),
                }],
            })
            .is_ok()
        );
    }

    #[test]
    fn user_role_rejects_runtime_authored_renderables() {
        for content in [
            CoreRenderable::SystemNotice {
                kind: crate::types::SystemNoticeKind::Comms,
                body: Some("runtime".to_string()),
                blocks: Vec::new(),
            },
            CoreRenderable::Json {
                value: serde_json::json!({"runtime": true}),
            },
            CoreRenderable::Reference {
                uri: "artifact://runtime".to_string(),
                label: Some("runtime".to_string()),
            },
        ] {
            let err = match user_message_from_operator_renderable(content) {
                Ok(message) => {
                    panic!("runtime renderable must not become user text: {message:?}")
                }
                Err(err) => err,
            };
            assert!(
                matches!(err, AgentError::ConfigError(ref message) if message.contains("role=user")),
                "unexpected error: {err:?}"
            );
        }
    }
}

/// Gate tests for per-turn skill activation as a typed operational effect.
///
/// Row #65: a failing per-turn `skill_references` resolution must emit the
/// typed [`AgentEvent::SkillResolutionFailed`] carrying the typed `SkillKey`
/// and typed [`crate::event::SkillResolutionFailureReason`], not just a
/// `tracing::warn` log line (the old behavior swallowed the signal after
/// consuming the refs).
///
/// Row #84: a successful per-turn activation must produce a typed activation
/// record — the typed [`AgentEvent::SkillsResolved`] carrying the canonical
/// `SkillKey`s — distinct from any operator-typed text smuggled into the user
/// input.
#[cfg(test)]
#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
mod skill_activation_effect_tests {
    use super::*;
    use crate::skills::{
        ResolvedSkill, SkillCollection, SkillDescriptor, SkillEngine, SkillError, SkillFilter,
        SkillKey, SkillName, SkillRuntime, SourceUuid,
    };
    use crate::types::{AssistantBlock, StopReason, ToolDef, Usage};
    use std::future::Future;

    fn fixture_skill_key(name: &str) -> SkillKey {
        SkillKey::new(
            SourceUuid::parse("dc256086-0d2f-4f61-a307-320d4148107f")
                .expect("valid fixture source uuid"),
            SkillName::parse(name).expect("valid fixture skill name"),
        )
    }

    struct StaticLlmClient;

    #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
    #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
    impl AgentLlmClient for StaticLlmClient {
        async fn stream_response(
            &self,
            _messages: &[Message],
            _tools: &[Arc<ToolDef>],
            _max_tokens: u32,
            _temperature: Option<f32>,
            _provider_params: Option<&crate::lifecycle::run_primitive::ProviderParamsOverride>,
        ) -> Result<super::super::LlmStreamResult, AgentError> {
            Ok(super::super::LlmStreamResult::new(
                vec![AssistantBlock::Text {
                    text: "ok".to_string(),
                    meta: None,
                }],
                StopReason::EndTurn,
                Usage::default(),
            ))
        }

        fn provider(&self) -> crate::provider::Provider {
            crate::provider::Provider::Other
        }

        fn model(&self) -> &'static str {
            "mock-model"
        }
    }

    struct NoTools;

    #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
    #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
    impl AgentToolDispatcher for NoTools {
        fn tools(&self) -> Arc<[Arc<ToolDef>]> {
            Arc::new([])
        }

        async fn dispatch(
            &self,
            call: crate::types::ToolCallView<'_>,
        ) -> Result<crate::ops::ToolDispatchOutcome, ToolError> {
            Err(ToolError::NotFound {
                name: call.name.into(),
            })
        }
    }

    struct NoopStore;

    #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
    #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
    impl AgentSessionStore for NoopStore {
        async fn save(&self, _session: &crate::session::Session) -> Result<(), AgentError> {
            Ok(())
        }

        async fn load(&self, _id: &str) -> Result<Option<crate::session::Session>, AgentError> {
            Ok(None)
        }
    }

    /// A `SkillEngine` whose `resolve_and_render` always fails with a typed
    /// `NotFound` error carrying the requested key.
    struct FailingSkillEngine;

    // Test mock mirrors the `SkillEngine` trait's `-> impl Future + Send`
    // method shapes verbatim; the manual-future form keeps the mock aligned
    // with the trait signatures it implements.
    #[allow(clippy::manual_async_fn)]
    impl SkillEngine for FailingSkillEngine {
        fn inventory_section(&self) -> impl Future<Output = Result<String, SkillError>> + Send {
            async move { Ok(String::new()) }
        }

        fn resolve_and_render(
            &self,
            keys: &[SkillKey],
        ) -> impl Future<Output = Result<Vec<ResolvedSkill>, SkillError>> + Send {
            let missing = keys
                .first()
                .cloned()
                .unwrap_or_else(|| fixture_skill_key("unknown"));
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn collections(
            &self,
        ) -> impl Future<Output = Result<Vec<SkillCollection>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn list_skills(
            &self,
            _filter: &SkillFilter,
        ) -> impl Future<Output = Result<Vec<SkillDescriptor>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn quarantined_diagnostics(
            &self,
        ) -> impl Future<Output = Result<Vec<crate::skills::SkillQuarantineDiagnostic>, SkillError>> + Send
        {
            async move { Ok(Vec::new()) }
        }

        fn health_snapshot(
            &self,
        ) -> impl Future<Output = Result<crate::skills::SourceHealthSnapshot, SkillError>> + Send
        {
            async move { Ok(crate::skills::SourceHealthSnapshot::default()) }
        }

        fn list_artifacts(
            &self,
            key: &SkillKey,
        ) -> impl Future<Output = Result<Vec<crate::skills::SkillArtifact>, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn read_artifact(
            &self,
            key: &SkillKey,
            _artifact_path: &str,
        ) -> impl Future<Output = Result<crate::skills::SkillArtifactContent, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn invoke_function(
            &self,
            key: &SkillKey,
            _function_name: &crate::skills::SkillFunctionName,
            _arguments: crate::event::ToolCallArguments,
        ) -> impl Future<Output = Result<crate::skills::SkillFunctionOutput, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }
    }

    /// A `SkillEngine` whose `resolve_and_render` always succeeds, returning a
    /// single rendered skill keyed by the first requested key.
    struct SucceedingSkillEngine;

    // Test mock mirrors the `SkillEngine` trait's `-> impl Future + Send`
    // method shapes verbatim (see `FailingSkillEngine` above).
    #[allow(clippy::manual_async_fn)]
    impl SkillEngine for SucceedingSkillEngine {
        fn inventory_section(&self) -> impl Future<Output = Result<String, SkillError>> + Send {
            async move { Ok(String::new()) }
        }

        fn resolve_and_render(
            &self,
            keys: &[SkillKey],
        ) -> impl Future<Output = Result<Vec<ResolvedSkill>, SkillError>> + Send {
            let key = keys
                .first()
                .cloned()
                .unwrap_or_else(|| fixture_skill_key("email-extractor"));
            async move {
                Ok(vec![ResolvedSkill {
                    key,
                    name: "email-extractor".into(),
                    rendered_body: "<skill>injected canonical skill</skill>".to_string(),
                    byte_size: 34,
                }])
            }
        }

        fn collections(
            &self,
        ) -> impl Future<Output = Result<Vec<SkillCollection>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn list_skills(
            &self,
            _filter: &SkillFilter,
        ) -> impl Future<Output = Result<Vec<SkillDescriptor>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn quarantined_diagnostics(
            &self,
        ) -> impl Future<Output = Result<Vec<crate::skills::SkillQuarantineDiagnostic>, SkillError>> + Send
        {
            async move { Ok(Vec::new()) }
        }

        fn health_snapshot(
            &self,
        ) -> impl Future<Output = Result<crate::skills::SourceHealthSnapshot, SkillError>> + Send
        {
            async move { Ok(crate::skills::SourceHealthSnapshot::default()) }
        }

        fn list_artifacts(
            &self,
            key: &SkillKey,
        ) -> impl Future<Output = Result<Vec<crate::skills::SkillArtifact>, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn read_artifact(
            &self,
            key: &SkillKey,
            _artifact_path: &str,
        ) -> impl Future<Output = Result<crate::skills::SkillArtifactContent, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn invoke_function(
            &self,
            key: &SkillKey,
            _function_name: &crate::skills::SkillFunctionName,
            _arguments: crate::event::ToolCallArguments,
        ) -> impl Future<Output = Result<crate::skills::SkillFunctionOutput, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }
    }

    async fn build_agent_with_engine<E: SkillEngine + 'static>(
        engine: E,
    ) -> Agent<StaticLlmClient, NoTools, NoopStore> {
        let skill_runtime = Arc::new(SkillRuntime::new(Arc::new(engine)));
        AgentBuilder::new()
            .with_skill_engine(skill_runtime)
            .build_standalone(
                Arc::new(StaticLlmClient),
                Arc::new(NoTools),
                Arc::new(NoopStore),
            )
            .await
    }

    /// Row #65: a failing `skill_references` resolution emits the typed
    /// `SkillResolutionFailed` event (carrying the typed `SkillKey` + typed
    /// reason). The old behavior only logged and returned the input untouched,
    /// so no event reaches the channel — this test fails on that behavior.
    #[tokio::test]
    async fn failed_skill_resolution_emits_typed_failure_event() {
        let mut agent = build_agent_with_engine(FailingSkillEngine).await;
        let key = fixture_skill_key("email-extractor");
        agent.pending_skill_references = Some(vec![key.clone()]);

        let (tx, mut rx) = mpsc::channel::<AgentEvent>(8);
        let out = agent.resolve_pending_skill_context(Some(&tx)).await;
        drop(tx);

        // Resolution failed, so no skill-context blocks are produced.
        assert!(out.is_empty());

        let mut events = Vec::new();
        while let Ok(event) = rx.try_recv() {
            events.push(event);
        }

        let failure = events
            .iter()
            .find_map(|event| match event {
                AgentEvent::SkillResolutionFailed {
                    skill_key, reason, ..
                } => Some((skill_key.clone(), reason.clone())),
                _ => None,
            })
            .expect("failed resolution must emit a typed SkillResolutionFailed event");

        assert_eq!(
            failure.0,
            Some(key.clone()),
            "event must carry the typed SkillKey we attempted to resolve"
        );
        assert_eq!(
            failure.1,
            crate::event::SkillResolutionFailureReason::NotFound { key },
            "event must carry the typed failure reason, not a stringified log"
        );
        assert!(
            !events
                .iter()
                .any(|event| matches!(event, AgentEvent::SkillsResolved { .. })),
            "a failed resolution must not also report a successful activation"
        );
    }

    /// Row #84: a successful activation produces a typed activation record (the
    /// `SkillsResolved` event carrying the canonical `SkillKey`s), distinct
    /// from the operator text. The old behavior folded activation purely into
    /// the prompt string and emitted no typed effect — this test fails on that
    /// behavior because no `SkillsResolved` event reaches the channel.
    #[tokio::test]
    async fn successful_skill_activation_emits_typed_activation_record() {
        let mut agent = build_agent_with_engine(SucceedingSkillEngine).await;
        let key = fixture_skill_key("email-extractor");
        agent.pending_skill_references = Some(vec![key.clone()]);

        let (tx, mut rx) = mpsc::channel::<AgentEvent>(8);
        let out = agent.resolve_pending_skill_context(Some(&tx)).await;
        drop(tx);

        // The activation yields a typed skill-context block carrying both the
        // canonical key and the rendered body — never an anonymous text fold.
        assert_eq!(out.len(), 1, "one activation yields one typed block");
        let crate::types::ContentBlock::SkillContext { skill_key, text } = &out[0] else {
            panic!("activation must yield a typed SkillContext block, got {out:?}");
        };
        assert_eq!(skill_key, &key, "block must carry the canonical SkillKey");
        assert!(
            text.contains("<skill>injected canonical skill</skill>"),
            "rendered body should reach the typed block, saw: {text}"
        );

        let mut events = Vec::new();
        while let Ok(event) = rx.try_recv() {
            events.push(event);
        }

        let resolved = events
            .iter()
            .find_map(|event| match event {
                AgentEvent::SkillsResolved {
                    skills,
                    injection_bytes,
                } => Some((skills.clone(), *injection_bytes)),
                _ => None,
            })
            .expect("successful activation must emit a typed SkillsResolved record");

        assert_eq!(
            resolved.0,
            vec![key],
            "typed activation record must carry the canonical SkillKey, distinct from operator text"
        );
        assert_eq!(
            resolved.1, 34,
            "typed activation record must carry the injection byte size"
        );
    }

    /// A `SkillEngine` whose health snapshot fails with a typed error.
    struct HealthFaultSkillEngine;

    // Test mock mirrors the `SkillEngine` trait's `-> impl Future + Send`
    // method shapes verbatim (see `FailingSkillEngine` above).
    #[allow(clippy::manual_async_fn)]
    impl SkillEngine for HealthFaultSkillEngine {
        fn inventory_section(&self) -> impl Future<Output = Result<String, SkillError>> + Send {
            async move { Ok(String::new()) }
        }

        fn resolve_and_render(
            &self,
            _keys: &[SkillKey],
        ) -> impl Future<Output = Result<Vec<ResolvedSkill>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn collections(
            &self,
        ) -> impl Future<Output = Result<Vec<SkillCollection>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn list_skills(
            &self,
            _filter: &SkillFilter,
        ) -> impl Future<Output = Result<Vec<SkillDescriptor>, SkillError>> + Send {
            async move { Ok(Vec::new()) }
        }

        fn quarantined_diagnostics(
            &self,
        ) -> impl Future<Output = Result<Vec<crate::skills::SkillQuarantineDiagnostic>, SkillError>> + Send
        {
            async move { Ok(Vec::new()) }
        }

        fn health_snapshot(
            &self,
        ) -> impl Future<Output = Result<crate::skills::SourceHealthSnapshot, SkillError>> + Send
        {
            async move {
                Err(SkillError::NotFound {
                    key: fixture_skill_key("health-fault"),
                })
            }
        }

        fn list_artifacts(
            &self,
            key: &SkillKey,
        ) -> impl Future<Output = Result<Vec<crate::skills::SkillArtifact>, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn read_artifact(
            &self,
            key: &SkillKey,
            _artifact_path: &str,
        ) -> impl Future<Output = Result<crate::skills::SkillArtifactContent, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }

        fn invoke_function(
            &self,
            key: &SkillKey,
            _function_name: &crate::skills::SkillFunctionName,
            _arguments: crate::event::ToolCallArguments,
        ) -> impl Future<Output = Result<crate::skills::SkillFunctionOutput, SkillError>> + Send
        {
            let missing = key.clone();
            async move { Err(SkillError::NotFound { key: missing }) }
        }
    }

    /// Dogma row #239: a skill-diagnostics collection fault at run terminality
    /// is recorded as a typed `collection_fault` inside the run result —
    /// surfaces never receive absent or healthy-looking diagnostics in place
    /// of failure truth.
    #[tokio::test]
    async fn skill_diagnostics_collection_fault_is_recorded_in_run_result() {
        let skill_runtime = Arc::new(SkillRuntime::new(Arc::new(HealthFaultSkillEngine)));
        let mut agent = AgentBuilder::new()
            .with_skill_engine(skill_runtime)
            .with_turn_state_handle(Arc::new(
                crate::agent::test_turn_state_handle::TestTurnStateHandle::new(),
            ))
            .build_standalone(
                Arc::new(StaticLlmClient),
                Arc::new(NoTools),
                Arc::new(NoopStore),
            )
            .await;

        let result = agent
            .run("hello".to_string().into())
            .await
            .expect("run should complete despite diagnostics collection fault");

        let diagnostics = result
            .skill_diagnostics
            .expect("collection fault must yield fault-carrying diagnostics, not None");
        let fault = diagnostics
            .collection_fault
            .expect("diagnostics must carry the typed collection fault");
        assert!(
            matches!(
                fault,
                crate::event::SkillResolutionFailureReason::NotFound { .. }
            ),
            "fault must preserve the typed failure reason, got {fault:?}"
        );
    }
}

/// Gate tests for typed execution-snapshot projection (row #309).
///
/// A wide (`u64`) turn-state counter that overflows the snapshot's `u32`
/// projection must surface a typed [`SnapshotProjectionError`] — never a
/// fabricated missing snapshot (`None`) or a default running `LoopState`.
#[cfg(test)]
#[allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
mod snapshot_projection_tests {
    use super::*;
    use crate::handles::{DslTransitionError, TurnStateHandle, TurnStateSnapshot};
    use crate::lifecycle::RunId;
    use crate::ops::{AsyncOpRef, OperationId};
    use crate::retry::LlmRetrySchedule;
    use crate::turn_execution_authority::{
        ContentShape, TurnExecutionEffect, TurnExecutionInput, TurnFailureReason, TurnFailureSource,
    };
    use std::collections::BTreeSet;

    /// Minimal `TurnStateHandle` that returns a caller-supplied snapshot.
    ///
    /// Only `snapshot()` is exercised by the projection path under test; the
    /// remaining transition methods are never called and report a transition
    /// refusal rather than panicking.
    struct StubTurnStateHandle {
        snapshot: TurnStateSnapshot,
    }

    fn refused() -> DslTransitionError {
        DslTransitionError::no_matching(
            "stub-turn-state-handle",
            "transition not exercised in test",
        )
    }

    impl TurnStateHandle for StubTurnStateHandle {
        fn apply_turn_input(
            &self,
            _input: TurnExecutionInput,
        ) -> Result<Vec<TurnExecutionEffect>, DslTransitionError> {
            Err(refused())
        }
        fn start_conversation_run(
            &self,
            _run_id: RunId,
            _primitive_kind: TurnPrimitiveKind,
            _admitted_content_shape: ContentShape,
            _vision_enabled: bool,
            _image_tool_results_enabled: bool,
            _max_extraction_retries: u64,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn start_immediate_append(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn start_immediate_context(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn primitive_applied(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn llm_returned_tool_calls(
            &self,
            _run_id: RunId,
            _tool_count: u64,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn llm_returned_terminal(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn register_pending_ops(
            &self,
            _run_id: RunId,
            _op_refs: BTreeSet<AsyncOpRef>,
            _barrier_operation_ids: BTreeSet<OperationId>,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn tool_calls_resolved(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn ops_barrier_satisfied(
            &self,
            _run_id: RunId,
            _operation_ids: BTreeSet<OperationId>,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn boundary_continue(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn boundary_complete(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn enter_extraction(
            &self,
            _run_id: RunId,
            _max_retries: u32,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn extraction_start(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn extraction_validation_passed(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn extraction_validation_failed(
            &self,
            _run_id: RunId,
            _error: String,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn extraction_failed(
            &self,
            _run_id: RunId,
            _error: String,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn recoverable_failure(
            &self,
            _run_id: RunId,
            _retry: LlmRetrySchedule,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn fatal_failure(
            &self,
            _run_id: RunId,
            _failure: TurnFailureSource,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn retry_requested(
            &self,
            _run_id: RunId,
            _retry_attempt: u32,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn cancel_now(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn request_cancel_after_boundary(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn cancellation_observed(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn acknowledge_terminal(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn turn_limit_reached(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn budget_exhausted(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn time_budget_exceeded(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn force_cancel_no_run(&self) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn run_completed(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn run_failed(
            &self,
            _run_id: RunId,
            _reason: TurnFailureReason,
        ) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn run_cancelled(&self, _run_id: RunId) -> Result<(), DslTransitionError> {
            Err(refused())
        }
        fn snapshot(&self) -> TurnStateSnapshot {
            self.snapshot.clone()
        }
    }

    fn base_snapshot() -> TurnStateSnapshot {
        TurnStateSnapshot {
            active_run_id: None,
            loop_state: LoopState::WaitingForOps,
            turn_phase: crate::TurnPhase::WaitingForOps,
            turn_terminal: false,
            primitive_kind: None,
            admitted_content_shape: None,
            vision_enabled: false,
            image_tool_results_enabled: false,
            tool_calls_pending: 0,
            pending_op_refs: BTreeSet::new(),
            barrier_operation_ids: BTreeSet::new(),
            has_barrier_ops: false,
            barrier_satisfied: false,
            boundary_count: 0,
            cancel_after_boundary: false,
            terminal_outcome: None,
            terminal_cause_kind: None,
            extraction_attempts: 0,
            max_extraction_retries: 0,
            extraction_active: false,
            llm_retry_attempt: 0,
            llm_retry_max_retries: 0,
            llm_retry_selected_delay_ms: 0,
        }
    }

    #[test]
    fn well_formed_counters_project_cleanly() {
        let mut snapshot = base_snapshot();
        snapshot.tool_calls_pending = 3;
        snapshot.boundary_count = 7;
        let handle = StubTurnStateHandle { snapshot };

        let projected = runtime_execution_snapshot(&handle, 0)
            .expect("in-range counters must project without error");
        assert_eq!(projected.tool_calls_pending, 3);
        assert_eq!(projected.boundary_count, 7);
        assert_eq!(projected.loop_state, LoopState::WaitingForOps);
    }

    #[test]
    fn overflowing_counter_yields_typed_projection_error() {
        let overflow = u64::from(u32::MAX) + 1;
        let mut snapshot = base_snapshot();
        snapshot.tool_calls_pending = overflow;
        let handle = StubTurnStateHandle { snapshot };

        match runtime_execution_snapshot(&handle, 0) {
            Ok(snapshot) => panic!(
                "overflow must not fabricate a snapshot: {:?}",
                snapshot.loop_state
            ),
            Err(SnapshotProjectionError::CounterOverflow { field, value }) => {
                assert_eq!(field, "tool_calls_pending");
                assert_eq!(value, overflow);
            }
        }
    }

    #[test]
    fn each_wide_counter_field_reports_its_own_overflow() {
        let overflow = u64::from(u32::MAX) + 1;
        let cases: [(&str, fn(&mut TurnStateSnapshot, u64)); 4] = [
            ("tool_calls_pending", |s, v| s.tool_calls_pending = v),
            ("boundary_count", |s, v| s.boundary_count = v),
            ("extraction_attempts", |s, v| s.extraction_attempts = v),
            ("max_extraction_retries", |s, v| {
                s.max_extraction_retries = v;
            }),
        ];
        for (field, set) in cases {
            let mut snapshot = base_snapshot();
            set(&mut snapshot, overflow);
            let handle = StubTurnStateHandle { snapshot };
            match runtime_execution_snapshot(&handle, 0) {
                Err(SnapshotProjectionError::CounterOverflow {
                    field: reported,
                    value,
                }) => {
                    assert_eq!(reported, field);
                    assert_eq!(value, overflow);
                }
                Ok(_) => panic!("{field} overflow must yield a typed projection error"),
            }
        }
    }
}

#[cfg(test)]
#[allow(clippy::expect_used, clippy::panic)]
mod run_input_pending_tail_tests {
    use super::*;
    use crate::types::{ToolResult, UserMessage};

    /// K3 invariant: a pending tool-results tail resolves to the typed
    /// `RunInput::PendingToolResults` variant — never to a fabricated
    /// empty-string prompt.
    #[test]
    fn pending_tool_results_tail_is_typed_variant_not_empty_prompt() {
        let messages = vec![Message::tool_results(vec![ToolResult::new(
            "tc-1".to_string(),
            "ok".to_string(),
            false,
        )])];
        let input =
            run_input_from_admitted_pending_tail(&messages, ObservedSessionTailKind::ToolResults)
                .expect("admitted tool-results tail resolves");
        assert_eq!(input, RunInput::PendingToolResults);
        assert_eq!(
            input.prompt_text(),
            None,
            "pending-tail runs have no prompt; nothing may fabricate an empty string"
        );
    }

    #[test]
    fn user_tail_resolves_to_typed_content() {
        let messages = vec![Message::User(UserMessage::text("hello".to_string()))];
        let input = run_input_from_admitted_pending_tail(&messages, ObservedSessionTailKind::User)
            .expect("admitted user tail resolves");
        assert_eq!(
            input,
            RunInput::Content {
                content: ContentInput::Text("hello".to_string())
            }
        );
    }
}