turul-a2a 0.1.17

A2A Protocol v1.0 server framework
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
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
//! SQLite storage backend for A2A tasks, push configs, events, and atomic operations.

use async_trait::async_trait;
use sqlx::sqlite::{SqlitePool, SqlitePoolOptions};
use turul_a2a_types::{Artifact, Message, Task, TaskState, TaskStatus};

use super::atomic::A2aAtomicStore;
use super::error::A2aStorageError;
use super::event_store::A2aEventStore;
use super::filter::{PushConfigListPage, TaskFilter, TaskListPage};
use super::traits::{A2aPushNotificationStorage, A2aTaskStorage};
use crate::push::{
    A2aPushDeliveryStore, AbandonedReason, ClaimStatus, DeliveryClaim, DeliveryErrorClass,
    DeliveryOutcome, FailedDelivery, GaveUpReason,
};
use crate::streaming::StreamEvent;

/// SQLite storage configuration.
#[derive(Debug, Clone)]
pub struct SqliteConfig {
    pub database_url: String,
    pub max_connections: u32,
}

impl Default for SqliteConfig {
    fn default() -> Self {
        Self {
            database_url: "sqlite::memory:".into(),
            max_connections: 5,
        }
    }
}

/// SQLite-backed A2A storage.
#[derive(Clone)]
pub struct SqliteA2aStorage {
    pool: SqlitePool,
    /// opt-in — see `InMemoryA2aStorage::push_dispatch_enabled`.
    push_dispatch_enabled: bool,
}

impl SqliteA2aStorage {
    pub async fn new(config: SqliteConfig) -> Result<Self, A2aStorageError> {
        let pool = SqlitePoolOptions::new()
            .max_connections(config.max_connections)
            .connect(&config.database_url)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let storage = Self {
            pool,
            push_dispatch_enabled: false,
        };
        storage.create_tables().await?;
        Ok(storage)
    }

    /// Opt in to atomic pending-dispatch marker writes.
    pub fn with_push_dispatch_enabled(mut self, enabled: bool) -> Self {
        self.push_dispatch_enabled = enabled;
        self
    }

    async fn create_tables(&self) -> Result<(), A2aStorageError> {
        sqlx::query(
            "CREATE TABLE IF NOT EXISTS a2a_tasks (
                tenant TEXT NOT NULL DEFAULT '',
                task_id TEXT NOT NULL,
                owner TEXT NOT NULL,
                task_json TEXT NOT NULL,
                context_id TEXT NOT NULL DEFAULT '',
                status_state TEXT NOT NULL DEFAULT '',
                cancel_requested INTEGER NOT NULL DEFAULT 0,
                created_at TEXT NOT NULL DEFAULT (datetime('now')),
                updated_at TEXT NOT NULL DEFAULT (datetime('now')),
                PRIMARY KEY (tenant, task_id)
            )",
        )
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Additive migration for pre-0.1.4 deployments: add the ADR-012
        // cancel_requested column if the table already exists without it.
        // SQLite has no conditional ADD COLUMN, so we attempt the ALTER
        // and ignore the duplicate-column error. This is the standard
        // idempotent migration pattern for SQLite.
        let alter_result = sqlx::query(
            "ALTER TABLE a2a_tasks ADD COLUMN cancel_requested INTEGER NOT NULL DEFAULT 0",
        )
        .execute(&self.pool)
        .await;
        match alter_result {
            Ok(_) => {}
            Err(e) if e.to_string().contains("duplicate column") => {
                // Column already present — expected on fresh installs.
            }
            Err(e) => return Err(A2aStorageError::DatabaseError(e.to_string())),
        }

        // unconditional latest_event_sequence column.
        // Legacy rows default to 0; the first post-migration commit
        // extends it monotonically via MAX(existing, new).
        let alter_latest = sqlx::query(
            "ALTER TABLE a2a_tasks ADD COLUMN latest_event_sequence INTEGER NOT NULL DEFAULT 0",
        )
        .execute(&self.pool)
        .await;
        match alter_latest {
            Ok(_) => {}
            Err(e) if e.to_string().contains("duplicate column") => {}
            Err(e) => return Err(A2aStorageError::DatabaseError(e.to_string())),
        }

        sqlx::query(
            "CREATE TABLE IF NOT EXISTS a2a_push_configs (
                tenant TEXT NOT NULL DEFAULT '',
                task_id TEXT NOT NULL,
                config_id TEXT NOT NULL,
                config_json TEXT NOT NULL,
                registered_after_event_sequence INTEGER NOT NULL DEFAULT 0,
                PRIMARY KEY (tenant, task_id, config_id)
            )",
        )
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // additive migration for pre-0.1.4 push config
        // rows — default 0 is permissive by design (legacy configs
        // become eligible for any event with seq > 0).
        let alter_registered = sqlx::query(
            "ALTER TABLE a2a_push_configs \
             ADD COLUMN registered_after_event_sequence INTEGER NOT NULL DEFAULT 0",
        )
        .execute(&self.pool)
        .await;
        match alter_registered {
            Ok(_) => {}
            Err(e) if e.to_string().contains("duplicate column") => {}
            Err(e) => return Err(A2aStorageError::DatabaseError(e.to_string())),
        }

        // Index to make eligibility scans cheap.
        let _ = sqlx::query(
            "CREATE INDEX IF NOT EXISTS idx_a2a_push_configs_eligibility \
             ON a2a_push_configs (tenant, task_id, registered_after_event_sequence)",
        )
        .execute(&self.pool)
        .await;

        sqlx::query(
            "CREATE TABLE IF NOT EXISTS a2a_task_events (
                tenant TEXT NOT NULL DEFAULT '',
                task_id TEXT NOT NULL,
                event_sequence INTEGER NOT NULL,
                event_data TEXT NOT NULL,
                created_at TEXT NOT NULL DEFAULT (datetime('now')),
                PRIMARY KEY (tenant, task_id, event_sequence)
            )",
        )
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Push-delivery claim table. One row per
        // `(tenant, task_id, event_sequence, config_id)` tuple. The
        // status column is the enum Debug form; timestamps are
        // epoch micros for deterministic ordering without TZ ambiguity.
        sqlx::query(
            "CREATE TABLE IF NOT EXISTS a2a_push_deliveries (
                tenant TEXT NOT NULL,
                task_id TEXT NOT NULL,
                event_sequence INTEGER NOT NULL,
                config_id TEXT NOT NULL,
                claimant TEXT NOT NULL,
                owner TEXT NOT NULL DEFAULT '',
                generation INTEGER NOT NULL,
                claimed_at_micros INTEGER NOT NULL,
                expires_at_micros INTEGER NOT NULL,
                delivery_attempt_count INTEGER NOT NULL DEFAULT 0,
                status TEXT NOT NULL,
                first_attempted_at_micros INTEGER,
                last_attempted_at_micros INTEGER,
                last_http_status INTEGER,
                last_error_class TEXT,
                gave_up_at_micros INTEGER,
                gave_up_reason TEXT,
                abandoned_reason TEXT,
                PRIMARY KEY (tenant, task_id, event_sequence, config_id)
            )",
        )
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        sqlx::query(
            "CREATE TABLE IF NOT EXISTS a2a_push_pending_dispatches (
                tenant TEXT NOT NULL,
                task_id TEXT NOT NULL,
                event_sequence INTEGER NOT NULL,
                owner TEXT NOT NULL,
                recorded_at_micros INTEGER NOT NULL,
                PRIMARY KEY (tenant, task_id, event_sequence)
            )",
        )
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        Ok(())
    }

    fn task_to_json(task: &Task) -> Result<String, A2aStorageError> {
        serde_json::to_string(task).map_err(|e| A2aStorageError::SerializationError(e.to_string()))
    }

    fn task_from_json(json: &str) -> Result<Task, A2aStorageError> {
        let proto: turul_a2a_proto::Task = serde_json::from_str(json)
            .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;
        Task::try_from(proto).map_err(A2aStorageError::TypeError)
    }

    fn status_state_str(task: &Task) -> String {
        task.status()
            .and_then(|s| s.state().ok())
            .map(|s| format!("{s:?}"))
            .unwrap_or_default()
    }

    /// Apply history_length trimming to a task.
    fn trim_task(task: Task, history_length: Option<i32>, include_artifacts: bool) -> Task {
        let mut proto = task.into_proto();
        if let Some(0) = history_length {
            proto.history.clear();
        } else if let Some(n) = history_length {
            if n > 0 {
                let n = n as usize;
                let start = proto.history.len().saturating_sub(n);
                proto.history = proto.history[start..].to_vec();
            }
        }
        if !include_artifacts {
            proto.artifacts.clear();
        }
        Task::try_from(proto)
            .unwrap_or_else(|_| Task::new("err", TaskStatus::new(TaskState::Failed)))
    }
}

#[async_trait]
impl A2aTaskStorage for SqliteA2aStorage {
    fn backend_name(&self) -> &'static str {
        "sqlite"
    }

    async fn create_task(
        &self,
        tenant: &str,
        owner: &str,
        task: Task,
    ) -> Result<Task, A2aStorageError> {
        let json = Self::task_to_json(&task)?;
        let state_str = Self::status_state_str(&task);
        sqlx::query(
            "INSERT INTO a2a_tasks (tenant, task_id, owner, task_json, context_id, status_state, updated_at)
             VALUES (?, ?, ?, ?, ?, ?, datetime('now'))",
        )
        .bind(tenant)
        .bind(task.id())
        .bind(owner)
        .bind(&json)
        .bind(task.context_id())
        .bind(&state_str)
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(task)
    }

    async fn get_task(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
        history_length: Option<i32>,
    ) -> Result<Option<Task>, A2aStorageError> {
        let row: Option<(String,)> = sqlx::query_as(
            "SELECT task_json FROM a2a_tasks WHERE tenant = ? AND task_id = ? AND owner = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(owner)
        .fetch_optional(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        match row {
            Some((json,)) => {
                let task = Self::task_from_json(&json)?;
                Ok(Some(Self::trim_task(task, history_length, true)))
            }
            None => Ok(None),
        }
    }

    async fn update_task(
        &self,
        tenant: &str,
        owner: &str,
        task: Task,
    ) -> Result<(), A2aStorageError> {
        let json = Self::task_to_json(&task)?;
        let state_str = Self::status_state_str(&task);
        let result = sqlx::query(
            "UPDATE a2a_tasks SET task_json = ?, status_state = ?, context_id = ?, updated_at = datetime('now')
             WHERE tenant = ? AND task_id = ? AND owner = ?",
        )
        .bind(&json)
        .bind(&state_str)
        .bind(task.context_id())
        .bind(tenant)
        .bind(task.id())
        .bind(owner)
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        if result.rows_affected() == 0 {
            return Err(A2aStorageError::TaskNotFound(task.id().to_string()));
        }
        Ok(())
    }

    async fn delete_task(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
    ) -> Result<bool, A2aStorageError> {
        let result =
            sqlx::query("DELETE FROM a2a_tasks WHERE tenant = ? AND task_id = ? AND owner = ?")
                .bind(tenant)
                .bind(task_id)
                .bind(owner)
                .execute(&self.pool)
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(result.rows_affected() > 0)
    }

    async fn list_tasks(&self, filter: TaskFilter) -> Result<TaskListPage, A2aStorageError> {
        let tenant = filter.tenant.as_deref().unwrap_or("");
        let owner = filter.owner.as_deref().unwrap_or("");

        // Build WHERE clause
        let mut conditions = vec!["tenant = ?".to_string(), "owner = ?".to_string()];
        if filter.context_id.is_some() {
            conditions.push("context_id = ?".to_string());
        }
        if filter.status.is_some() {
            conditions.push("status_state = ?".to_string());
        }

        let where_clause = conditions.join(" AND ");

        // Count total
        let count_sql = format!("SELECT COUNT(*) FROM a2a_tasks WHERE {where_clause}");
        let mut count_query = sqlx::query_scalar::<_, i64>(&count_sql)
            .bind(tenant)
            .bind(owner);
        if let Some(ref ctx) = filter.context_id {
            count_query = count_query.bind(ctx);
        }
        if let Some(ref status) = filter.status {
            count_query = count_query.bind(format!("{status:?}"));
        }
        let total_size: i64 = count_query
            .fetch_one(&self.pool)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let page_size = filter.page_size.map(|ps| ps.clamp(1, 100)).unwrap_or(50);

        // Fetch page — sorted by updated_at DESC, task_id DESC (spec §3.1.4)
        // Cursor token: "updated_at|task_id" of last item on previous page
        let (select_sql, cursor_parts) = if let Some(ref token) = filter.page_token {
            let parts: Vec<&str> = token.splitn(2, '|').collect();
            let (cursor_time, cursor_id) = if parts.len() == 2 {
                (parts[0].to_string(), parts[1].to_string())
            } else {
                // Legacy cursor — treat as task_id
                (String::new(), token.clone())
            };
            (
                format!(
                    "SELECT task_json, updated_at FROM a2a_tasks WHERE {where_clause} \
                     AND (updated_at < ? OR (updated_at = ? AND task_id < ?)) \
                     ORDER BY updated_at DESC, task_id DESC LIMIT ?"
                ),
                Some((cursor_time, cursor_id)),
            )
        } else {
            (
                format!(
                    "SELECT task_json, updated_at FROM a2a_tasks WHERE {where_clause} \
                     ORDER BY updated_at DESC, task_id DESC LIMIT ?"
                ),
                None,
            )
        };

        let mut select_query = sqlx::query_as::<_, (String, String)>(&select_sql)
            .bind(tenant)
            .bind(owner);
        if let Some(ref ctx) = filter.context_id {
            select_query = select_query.bind(ctx);
        }
        if let Some(ref status) = filter.status {
            select_query = select_query.bind(format!("{status:?}"));
        }
        if let Some((ref ct, ref ci)) = cursor_parts {
            select_query = select_query.bind(ct).bind(ct).bind(ci);
        }
        select_query = select_query.bind(page_size);

        let rows: Vec<(String, String)> = select_query
            .fetch_all(&self.pool)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let include_artifacts = filter.include_artifacts.unwrap_or(false);
        let tasks_with_times: Vec<(Task, String)> = rows
            .iter()
            .filter_map(|(json, updated_at)| {
                Self::task_from_json(json).ok().map(|t| {
                    (
                        Self::trim_task(t, filter.history_length, include_artifacts),
                        updated_at.clone(),
                    )
                })
            })
            .collect();

        let tasks: Vec<Task> = tasks_with_times.iter().map(|(t, _)| t.clone()).collect();

        let next_page_token = if tasks.len() as i32 >= page_size {
            tasks_with_times
                .last()
                .map(|(t, updated_at)| format!("{}|{}", updated_at, t.id()))
                .unwrap_or_default()
        } else {
            String::new()
        };

        Ok(TaskListPage {
            tasks,
            next_page_token,
            page_size,
            total_size: total_size as i32,
        })
    }

    async fn update_task_status(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
        new_status: TaskStatus,
    ) -> Result<Task, A2aStorageError> {
        let task = self
            .get_task(tenant, task_id, owner, None)
            .await?
            .ok_or_else(|| A2aStorageError::TaskNotFound(task_id.to_string()))?;

        let current_state = task
            .status()
            .ok_or_else(|| A2aStorageError::TaskNotFound(task_id.to_string()))?
            .state()
            .map_err(A2aStorageError::TypeError)?;

        let new_state = new_status.state().map_err(A2aStorageError::TypeError)?;

        turul_a2a_types::state_machine::validate_transition(current_state, new_state).map_err(
            |e| match e {
                turul_a2a_types::A2aTypeError::InvalidTransition { current, requested } => {
                    A2aStorageError::InvalidTransition { current, requested }
                }
                turul_a2a_types::A2aTypeError::TerminalState(s) => {
                    A2aStorageError::TerminalState(s)
                }
                other => A2aStorageError::TypeError(other),
            },
        )?;

        let mut proto = task.as_proto().clone();
        proto.status = Some(new_status.into_proto());
        let updated = Task::try_from(proto).map_err(A2aStorageError::TypeError)?;

        self.update_task(tenant, owner, updated.clone()).await?;
        Ok(updated)
    }

    async fn append_message(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
        message: Message,
    ) -> Result<(), A2aStorageError> {
        let task = self
            .get_task(tenant, task_id, owner, None)
            .await?
            .ok_or_else(|| A2aStorageError::TaskNotFound(task_id.to_string()))?;

        let mut proto = task.into_proto();
        proto.history.push(message.into_proto());
        let updated = Task::try_from(proto).map_err(A2aStorageError::TypeError)?;
        self.update_task(tenant, owner, updated).await
    }

    async fn append_artifact(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
        artifact: Artifact,
        append: bool,
        _last_chunk: bool,
    ) -> Result<(), A2aStorageError> {
        let task = self
            .get_task(tenant, task_id, owner, None)
            .await?
            .ok_or_else(|| A2aStorageError::TaskNotFound(task_id.to_string()))?;

        let mut proto = task.into_proto();
        if append {
            if let Some(existing) = proto
                .artifacts
                .iter_mut()
                .find(|a| a.artifact_id == artifact.as_proto().artifact_id)
            {
                existing.parts.extend(artifact.into_proto().parts);
                let updated = Task::try_from(proto).map_err(A2aStorageError::TypeError)?;
                return self.update_task(tenant, owner, updated).await;
            }
        }
        proto.artifacts.push(artifact.into_proto());
        let updated = Task::try_from(proto).map_err(A2aStorageError::TypeError)?;
        self.update_task(tenant, owner, updated).await
    }

    async fn task_count(&self) -> Result<usize, A2aStorageError> {
        let count: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM a2a_tasks")
            .fetch_one(&self.pool)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(count.0 as usize)
    }

    async fn maintenance(&self) -> Result<(), A2aStorageError> {
        Ok(())
    }

    async fn set_cancel_requested(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
    ) -> Result<(), A2aStorageError> {
        // Single SQL round-trip: only update if the row exists with this
        // owner AND is non-terminal. rows_affected == 0 requires a second
        // SELECT to classify (not-found/wrong-owner vs terminal).
        let result = sqlx::query(
            "UPDATE a2a_tasks SET cancel_requested = 1
             WHERE tenant = ? AND task_id = ? AND owner = ?
               AND status_state NOT IN ('Completed', 'Failed', 'Canceled', 'Rejected')",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(owner)
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        if result.rows_affected() > 0 {
            return Ok(());
        }

        // Classify the zero-rows case: read the row (ignoring owner) to
        // decide between TaskNotFound and TerminalState.
        let row: Option<(String, String)> = sqlx::query_as(
            "SELECT owner, status_state FROM a2a_tasks
             WHERE tenant = ? AND task_id = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .fetch_optional(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        match row {
            None => Err(A2aStorageError::TaskNotFound(task_id.to_string())),
            Some((row_owner, _)) if row_owner != owner => {
                // Anti-enumeration: wrong owner surfaces as TaskNotFound.
                Err(A2aStorageError::TaskNotFound(task_id.to_string()))
            }
            Some((_, state_str)) => {
                // Owner matched but state was terminal.
                let state = match state_str.as_str() {
                    "Completed" => turul_a2a_types::TaskState::Completed,
                    "Failed" => turul_a2a_types::TaskState::Failed,
                    "Canceled" => turul_a2a_types::TaskState::Canceled,
                    "Rejected" => turul_a2a_types::TaskState::Rejected,
                    // Idempotent no-op on a non-terminal row (this arm
                    // is reachable if the UPDATE affected 0 rows because
                    // cancel_requested was already set AND... no actually
                    // the UPDATE sets = 1 regardless of prior value, so
                    // rows_affected is 1 as long as WHERE matches. Falling
                    // here implies something odd; return generic error.
                    other => {
                        return Err(A2aStorageError::DatabaseError(format!(
                            "unexpected status_state on set_cancel_requested classify: {other}"
                        )));
                    }
                };
                Err(A2aStorageError::TerminalState(state))
            }
        }
    }
}

#[async_trait]
impl crate::storage::A2aCancellationSupervisor for SqliteA2aStorage {
    fn backend_name(&self) -> &'static str {
        "sqlite"
    }

    async fn supervisor_get_cancel_requested(
        &self,
        tenant: &str,
        task_id: &str,
    ) -> Result<bool, A2aStorageError> {
        let row: Option<(i64,)> = sqlx::query_as(
            "SELECT cancel_requested FROM a2a_tasks
             WHERE tenant = ? AND task_id = ?
               AND status_state NOT IN ('Completed', 'Failed', 'Canceled', 'Rejected')",
        )
        .bind(tenant)
        .bind(task_id)
        .fetch_optional(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(row.map(|(v,)| v != 0).unwrap_or(false))
    }

    async fn supervisor_list_cancel_requested(
        &self,
        tenant: &str,
        task_ids: &[String],
    ) -> Result<Vec<String>, A2aStorageError> {
        if task_ids.is_empty() {
            return Ok(Vec::new());
        }
        // Build an `IN (?,?,?...)` clause of the right width. sqlx does
        // not support Vec binding directly for SQLite; explicit parameter
        // expansion is the supported pattern.
        let placeholders = task_ids.iter().map(|_| "?").collect::<Vec<_>>().join(",");
        let sql = format!(
            "SELECT task_id FROM a2a_tasks
             WHERE tenant = ? AND task_id IN ({placeholders})
               AND cancel_requested = 1
               AND status_state NOT IN ('Completed', 'Failed', 'Canceled', 'Rejected')"
        );
        let mut query = sqlx::query_as::<_, (String,)>(&sql).bind(tenant);
        for id in task_ids {
            query = query.bind(id);
        }
        let rows = query
            .fetch_all(&self.pool)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(rows.into_iter().map(|(id,)| id).collect())
    }
}

#[async_trait]
impl A2aPushNotificationStorage for SqliteA2aStorage {
    fn backend_name(&self) -> &'static str {
        "sqlite"
    }

    async fn create_config(
        &self,
        tenant: &str,
        mut config: turul_a2a_proto::TaskPushNotificationConfig,
    ) -> Result<turul_a2a_proto::TaskPushNotificationConfig, A2aStorageError> {
        if config.id.is_empty() {
            config.id = uuid::Uuid::now_v7().to_string();
        }
        let json = serde_json::to_string(&config)
            .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;

        // -floor CAS: read `latest_event_sequence`
        // and INSERT the config row with
        // `registered_after_event_sequence = seq_read` in the SAME
        // transaction, conditional on `latest_event_sequence` still
        // equalling `seq_read`. SQLite serialises writers, so the
        // conditional UPDATE that re-writes `latest_event_sequence`
        // to itself within the tx is a cheap detection: if another
        // writer committed a concurrent event commit between our
        // read and our insert, our follow-up zero-row UPDATE surfaces
        // it as a ConcurrentModification signal; the outer retry loop
        // backs off and re-reads.
        const MAX_ATTEMPTS: u32 = 5;
        let backoffs_ms: [u64; 4] = [10, 50, 250, 1000];
        for attempt in 0..MAX_ATTEMPTS {
            let mut tx = self
                .pool
                .begin()
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            let latest: Option<(i64,)> = sqlx::query_as(
                "SELECT latest_event_sequence FROM a2a_tasks
                 WHERE tenant = ? AND task_id = ?",
            )
            .bind(tenant)
            .bind(&config.task_id)
            .fetch_optional(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            let seq_read = latest.map(|(s,)| s).unwrap_or(0);

            sqlx::query(
                "INSERT OR REPLACE INTO a2a_push_configs
                    (tenant, task_id, config_id, config_json, registered_after_event_sequence)
                 VALUES (?, ?, ?, ?, ?)",
            )
            .bind(tenant)
            .bind(&config.task_id)
            .bind(&config.id)
            .bind(&json)
            .bind(seq_read)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            // CAS: succeed only if latest_event_sequence still matches
            // what we read. The UPDATE rewrites the same value (idempotent)
            // but the WHERE clause detects a concurrent advance.
            let cas = sqlx::query(
                "UPDATE a2a_tasks SET latest_event_sequence = latest_event_sequence
                 WHERE tenant = ? AND task_id = ? AND latest_event_sequence = ?",
            )
            .bind(tenant)
            .bind(&config.task_id)
            .bind(seq_read)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            // If the task row is missing (seq_read=0, no task yet),
            // cas.rows_affected()=0 is not a CAS loss — it's just
            // "no task row". Accept the insert.
            let task_exists = sqlx::query_scalar::<_, i64>(
                "SELECT COUNT(*) FROM a2a_tasks WHERE tenant = ? AND task_id = ?",
            )
            .bind(tenant)
            .bind(&config.task_id)
            .fetch_one(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            if task_exists > 0 && cas.rows_affected() == 0 {
                // Concurrent event commit advanced latest_event_sequence.
                // Roll back and retry.
                drop(tx);
                if attempt + 1 >= MAX_ATTEMPTS {
                    return Err(A2aStorageError::CreateConfigCasTimeout {
                        tenant: tenant.into(),
                        task_id: config.task_id.clone(),
                    });
                }
                let ms = backoffs_ms[attempt as usize];
                tokio::time::sleep(std::time::Duration::from_millis(ms)).await;
                continue;
            }

            tx.commit()
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            return Ok(config);
        }
        // Unreachable — loop returns on every path.
        Err(A2aStorageError::CreateConfigCasTimeout {
            tenant: tenant.into(),
            task_id: config.task_id.clone(),
        })
    }

    async fn get_config(
        &self,
        tenant: &str,
        task_id: &str,
        config_id: &str,
    ) -> Result<Option<turul_a2a_proto::TaskPushNotificationConfig>, A2aStorageError> {
        let row: Option<(String,)> = sqlx::query_as(
            "SELECT config_json FROM a2a_push_configs
             WHERE tenant = ? AND task_id = ? AND config_id = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(config_id)
        .fetch_optional(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        match row {
            Some((json,)) => {
                let config = serde_json::from_str(&json)
                    .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;
                Ok(Some(config))
            }
            None => Ok(None),
        }
    }

    async fn list_configs(
        &self,
        tenant: &str,
        task_id: &str,
        page_token: Option<&str>,
        page_size: Option<i32>,
    ) -> Result<PushConfigListPage, A2aStorageError> {
        let page_size = page_size.map(|ps| ps.clamp(1, 100)).unwrap_or(50);

        let (sql, has_token) = if page_token.is_some() {
            (
                "SELECT config_json FROM a2a_push_configs
                 WHERE tenant = ? AND task_id = ? AND config_id > ?
                 ORDER BY config_id LIMIT ?",
                true,
            )
        } else {
            (
                "SELECT config_json FROM a2a_push_configs
                 WHERE tenant = ? AND task_id = ?
                 ORDER BY config_id LIMIT ?",
                false,
            )
        };

        let mut query = sqlx::query_as::<_, (String,)>(sql)
            .bind(tenant)
            .bind(task_id);
        if has_token {
            query = query.bind(page_token.unwrap_or(""));
        }
        query = query.bind(page_size);

        let rows: Vec<(String,)> = query
            .fetch_all(&self.pool)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let configs: Vec<turul_a2a_proto::TaskPushNotificationConfig> = rows
            .iter()
            .filter_map(|(json,)| serde_json::from_str(json).ok())
            .collect();

        let next_page_token = if configs.len() as i32 >= page_size {
            configs.last().map(|c| c.id.clone()).unwrap_or_default()
        } else {
            String::new()
        };

        Ok(PushConfigListPage {
            configs,
            next_page_token,
        })
    }

    async fn delete_config(
        &self,
        tenant: &str,
        task_id: &str,
        config_id: &str,
    ) -> Result<(), A2aStorageError> {
        sqlx::query(
            "DELETE FROM a2a_push_configs WHERE tenant = ? AND task_id = ? AND config_id = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(config_id)
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(())
    }

    async fn list_configs_eligible_at_event(
        &self,
        tenant: &str,
        task_id: &str,
        event_sequence: u64,
        page_token: Option<&str>,
        page_size: Option<i32>,
    ) -> Result<PushConfigListPage, A2aStorageError> {
        let page_size = page_size.map(|ps| ps.clamp(1, 100)).unwrap_or(50);
        let (sql, has_token) = if page_token.is_some() {
            (
                "SELECT config_json FROM a2a_push_configs
                 WHERE tenant = ? AND task_id = ?
                   AND registered_after_event_sequence < ?
                   AND config_id > ?
                 ORDER BY config_id LIMIT ?",
                true,
            )
        } else {
            (
                "SELECT config_json FROM a2a_push_configs
                 WHERE tenant = ? AND task_id = ?
                   AND registered_after_event_sequence < ?
                 ORDER BY config_id LIMIT ?",
                false,
            )
        };

        let mut q = sqlx::query_as::<_, (String,)>(sql)
            .bind(tenant)
            .bind(task_id)
            .bind(event_sequence as i64);
        if has_token {
            q = q.bind(page_token.unwrap_or(""));
        }
        q = q.bind(page_size);

        let rows: Vec<(String,)> = q
            .fetch_all(&self.pool)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let configs: Vec<turul_a2a_proto::TaskPushNotificationConfig> = rows
            .iter()
            .filter_map(|(json,)| serde_json::from_str(json).ok())
            .collect();

        let next_page_token = if configs.len() as i32 >= page_size {
            configs.last().map(|c| c.id.clone()).unwrap_or_default()
        } else {
            String::new()
        };

        Ok(PushConfigListPage {
            configs,
            next_page_token,
        })
    }
}

#[async_trait]
impl A2aEventStore for SqliteA2aStorage {
    fn backend_name(&self) -> &'static str {
        "sqlite"
    }

    async fn append_event(
        &self,
        tenant: &str,
        task_id: &str,
        event: StreamEvent,
    ) -> Result<u64, A2aStorageError> {
        let event_data = serde_json::to_string(&event)
            .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;

        // Single transaction: allocate sequence + insert event.
        // SQLite single-writer model makes MAX+1 safe.
        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let seq: (i64,) = sqlx::query_as(
            "SELECT COALESCE(MAX(event_sequence), 0) + 1 FROM a2a_task_events
             WHERE tenant = ? AND task_id = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .fetch_one(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        sqlx::query(
            "INSERT INTO a2a_task_events (tenant, task_id, event_sequence, event_data)
             VALUES (?, ?, ?, ?)",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(seq.0)
        .bind(&event_data)
        .execute(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        Ok(seq.0 as u64)
    }

    async fn get_events_after(
        &self,
        tenant: &str,
        task_id: &str,
        after_sequence: u64,
    ) -> Result<Vec<(u64, StreamEvent)>, A2aStorageError> {
        let rows: Vec<(i64, String)> = sqlx::query_as(
            "SELECT event_sequence, event_data FROM a2a_task_events
             WHERE tenant = ? AND task_id = ? AND event_sequence > ?
             ORDER BY event_sequence",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(after_sequence as i64)
        .fetch_all(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let mut events = Vec::with_capacity(rows.len());
        for (seq, data) in rows {
            let event: StreamEvent = serde_json::from_str(&data)
                .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;
            events.push((seq as u64, event));
        }
        Ok(events)
    }

    async fn latest_sequence(&self, tenant: &str, task_id: &str) -> Result<u64, A2aStorageError> {
        let row: (i64,) = sqlx::query_as(
            "SELECT COALESCE(MAX(event_sequence), 0) FROM a2a_task_events
             WHERE tenant = ? AND task_id = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .fetch_one(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(row.0 as u64)
    }

    async fn cleanup_expired(&self) -> Result<u64, A2aStorageError> {
        // SQLite has no TTL tracking; cleanup is a no-op.
        Ok(0)
    }
}

#[async_trait]
impl A2aAtomicStore for SqliteA2aStorage {
    fn backend_name(&self) -> &'static str {
        "sqlite"
    }

    fn push_dispatch_enabled(&self) -> bool {
        self.push_dispatch_enabled
    }

    async fn create_task_with_events(
        &self,
        tenant: &str,
        owner: &str,
        task: Task,
        events: Vec<StreamEvent>,
    ) -> Result<(Task, Vec<u64>), A2aStorageError> {
        let task_json = Self::task_to_json(&task)?;
        let state_str = Self::status_state_str(&task);

        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Insert task
        sqlx::query(
            "INSERT INTO a2a_tasks (tenant, task_id, owner, task_json, context_id, status_state, updated_at)
             VALUES (?, ?, ?, ?, ?, ?, datetime('now'))",
        )
        .bind(tenant)
        .bind(task.id())
        .bind(owner)
        .bind(&task_json)
        .bind(task.context_id())
        .bind(&state_str)
        .execute(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Append events with sequence allocation
        let mut sequences = Vec::with_capacity(events.len());
        for event in &events {
            let seq: (i64,) = sqlx::query_as(
                "SELECT COALESCE(MAX(event_sequence), 0) + 1 FROM a2a_task_events
                 WHERE tenant = ? AND task_id = ?",
            )
            .bind(tenant)
            .bind(task.id())
            .fetch_one(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            let event_data = serde_json::to_string(event)
                .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;

            sqlx::query(
                "INSERT INTO a2a_task_events (tenant, task_id, event_sequence, event_data)
                 VALUES (?, ?, ?, ?)",
            )
            .bind(tenant)
            .bind(task.id())
            .bind(seq.0)
            .bind(&event_data)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            sequences.push(seq.0 as u64);
        }

        // maintain latest_event_sequence UNCONDITIONALLY.
        if let Some(&max_seq) = sequences.iter().max() {
            sqlx::query(
                "UPDATE a2a_tasks SET latest_event_sequence = ?
                 WHERE tenant = ? AND task_id = ? AND latest_event_sequence < ?",
            )
            .bind(max_seq as i64)
            .bind(tenant)
            .bind(task.id())
            .bind(max_seq as i64)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        }

        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        Ok((task, sequences))
    }

    async fn update_task_status_with_events(
        &self,
        tenant: &str,
        task_id: &str,
        owner: &str,
        new_status: TaskStatus,
        events: Vec<StreamEvent>,
    ) -> Result<(Task, Vec<u64>), A2aStorageError> {
        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Read current task within transaction
        let row: Option<(String,)> = sqlx::query_as(
            "SELECT task_json FROM a2a_tasks WHERE tenant = ? AND task_id = ? AND owner = ?",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(owner)
        .fetch_optional(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let task = match row {
            Some((json,)) => Self::task_from_json(&json)?,
            None => return Err(A2aStorageError::TaskNotFound(task_id.to_string())),
        };

        // Validate state machine transition
        let current_state = task
            .status()
            .ok_or_else(|| A2aStorageError::TaskNotFound(task_id.to_string()))?
            .state()
            .map_err(A2aStorageError::TypeError)?;

        let new_state = new_status.state().map_err(A2aStorageError::TypeError)?;

        turul_a2a_types::state_machine::validate_transition(current_state, new_state).map_err(
            |e| match e {
                turul_a2a_types::A2aTypeError::InvalidTransition { current, requested } => {
                    A2aStorageError::InvalidTransition { current, requested }
                }
                turul_a2a_types::A2aTypeError::TerminalState(s) => {
                    A2aStorageError::TerminalStateAlreadySet {
                        task_id: task_id.to_string(),
                        current_state: crate::storage::terminal_cas::task_state_wire_name(s)
                            .to_string(),
                    }
                }
                other => A2aStorageError::TypeError(other),
            },
        )?;

        // Update task status
        let mut proto = task.as_proto().clone();
        proto.status = Some(new_status.into_proto());
        let updated_task = Task::try_from(proto).map_err(A2aStorageError::TypeError)?;

        let task_json = Self::task_to_json(&updated_task)?;
        let state_str = Self::status_state_str(&updated_task);

        // Terminal-write CAS: the UPDATE's WHERE clause
        // rejects a row whose status_state is already terminal. If rows
        // affected == 0 AFTER we established existence + owner above, a
        // concurrent transaction raced us to commit a terminal first —
        // return TerminalStateAlreadySet (with the current persisted
        // state) and let the transaction roll back; no events persisted.
        let result = sqlx::query(
            "UPDATE a2a_tasks
               SET task_json = ?, status_state = ?, context_id = ?, updated_at = datetime('now')
             WHERE tenant = ? AND task_id = ? AND owner = ?
               AND status_state NOT IN ('Completed', 'Failed', 'Canceled', 'Rejected')",
        )
        .bind(&task_json)
        .bind(&state_str)
        .bind(updated_task.context_id())
        .bind(tenant)
        .bind(task_id)
        .bind(owner)
        .execute(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        if result.rows_affected() == 0 {
            // Concurrent terminal write won. Re-read the now-terminal state
            // for the error. The transaction is dropped without commit.
            let current: Option<(String,)> = sqlx::query_as(
                "SELECT status_state FROM a2a_tasks WHERE tenant = ? AND task_id = ?",
            )
            .bind(tenant)
            .bind(task_id)
            .fetch_optional(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            let current_state_str = current
                .map(|(s,)| crate::storage::terminal_cas::debug_state_to_wire_name(&s))
                .unwrap_or_else(|| "TASK_STATE_UNKNOWN".to_string());
            return Err(A2aStorageError::TerminalStateAlreadySet {
                task_id: task_id.to_string(),
                current_state: current_state_str,
            });
        }

        // Append events and, when the push_dispatch opt-in is on,
        // insert a pending-dispatch marker row for each terminal
        // StatusUpdate in the SAME transaction.
        let mut sequences = Vec::with_capacity(events.len());
        for event in &events {
            let seq: (i64,) = sqlx::query_as(
                "SELECT COALESCE(MAX(event_sequence), 0) + 1 FROM a2a_task_events
                 WHERE tenant = ? AND task_id = ?",
            )
            .bind(tenant)
            .bind(task_id)
            .fetch_one(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            let event_data = serde_json::to_string(event)
                .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;

            sqlx::query(
                "INSERT INTO a2a_task_events (tenant, task_id, event_sequence, event_data)
                 VALUES (?, ?, ?, ?)",
            )
            .bind(tenant)
            .bind(task_id)
            .bind(seq.0)
            .bind(&event_data)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            if self.push_dispatch_enabled
                && event.is_terminal()
                && matches!(event, StreamEvent::StatusUpdate { .. })
            {
                // §Pending-dispatch optimization: skip the
                // marker write if no push configs exist for the task.
                // A config registered after terminal is not eligible
                // for that terminal event anyway (ADR-009
                // `registered_after_event_sequence`), so skipping is
                // correctness-neutral and avoids steady-state row
                // accumulation on deployments that never register
                // webhooks.
                let config_count: i64 = sqlx::query_scalar(
                    "SELECT COUNT(*) FROM a2a_push_configs \
                     WHERE tenant = ?1 AND task_id = ?2",
                )
                .bind(tenant)
                .bind(task_id)
                .fetch_one(&mut *tx)
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

                if config_count > 0 {
                    let now_micros = systime_to_micros(std::time::SystemTime::now());
                    sqlx::query(
                        "INSERT INTO a2a_push_pending_dispatches \
                            (tenant, task_id, event_sequence, owner, recorded_at_micros) \
                         VALUES (?1, ?2, ?3, ?4, ?5) \
                         ON CONFLICT (tenant, task_id, event_sequence) DO UPDATE SET \
                            owner = excluded.owner, \
                            recorded_at_micros = excluded.recorded_at_micros",
                    )
                    .bind(tenant)
                    .bind(task_id)
                    .bind(seq.0)
                    .bind(owner)
                    .bind(now_micros)
                    .execute(&mut *tx)
                    .await
                    .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
                }
            }

            sequences.push(seq.0 as u64);
        }

        // maintain latest_event_sequence UNCONDITIONALLY.
        if let Some(&max_seq) = sequences.iter().max() {
            sqlx::query(
                "UPDATE a2a_tasks SET latest_event_sequence = ?
                 WHERE tenant = ? AND task_id = ? AND latest_event_sequence < ?",
            )
            .bind(max_seq as i64)
            .bind(tenant)
            .bind(task_id)
            .bind(max_seq as i64)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        }

        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        Ok((updated_task, sequences))
    }

    async fn update_task_with_events(
        &self,
        tenant: &str,
        owner: &str,
        task: Task,
        events: Vec<StreamEvent>,
    ) -> Result<Vec<u64>, A2aStorageError> {
        let task_json = Self::task_to_json(&task)?;
        let state_str = Self::status_state_str(&task);

        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Terminal-preservation CAS: the UPDATE's
        // WHERE clause excludes terminal status_state values. If the
        // persisted row is terminal the update matches zero rows;
        // a follow-up SELECT disambiguates "task missing" vs "already
        // terminal" so the caller gets the right error.
        let result = sqlx::query(
            "UPDATE a2a_tasks
               SET task_json = ?, status_state = ?, context_id = ?, updated_at = datetime('now')
             WHERE tenant = ? AND task_id = ? AND owner = ?
               AND status_state NOT IN ('Completed', 'Failed', 'Canceled', 'Rejected')",
        )
        .bind(&task_json)
        .bind(&state_str)
        .bind(task.context_id())
        .bind(tenant)
        .bind(task.id())
        .bind(owner)
        .execute(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        if result.rows_affected() == 0 {
            // Disambiguate: not-found vs terminal-already-set.
            let current: Option<(String,)> = sqlx::query_as(
                "SELECT status_state FROM a2a_tasks WHERE tenant = ? AND task_id = ? AND owner = ?",
            )
            .bind(tenant)
            .bind(task.id())
            .bind(owner)
            .fetch_optional(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            return match current {
                Some((state,)) => Err(A2aStorageError::TerminalStateAlreadySet {
                    task_id: task.id().to_string(),
                    current_state: crate::storage::terminal_cas::debug_state_to_wire_name(&state),
                }),
                None => Err(A2aStorageError::TaskNotFound(task.id().to_string())),
            };
        }

        // Append events
        let mut sequences = Vec::with_capacity(events.len());
        for event in &events {
            let seq: (i64,) = sqlx::query_as(
                "SELECT COALESCE(MAX(event_sequence), 0) + 1 FROM a2a_task_events
                 WHERE tenant = ? AND task_id = ?",
            )
            .bind(tenant)
            .bind(task.id())
            .fetch_one(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            let event_data = serde_json::to_string(event)
                .map_err(|e| A2aStorageError::SerializationError(e.to_string()))?;

            sqlx::query(
                "INSERT INTO a2a_task_events (tenant, task_id, event_sequence, event_data)
                 VALUES (?, ?, ?, ?)",
            )
            .bind(tenant)
            .bind(task.id())
            .bind(seq.0)
            .bind(&event_data)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

            sequences.push(seq.0 as u64);
        }

        // maintain latest_event_sequence UNCONDITIONALLY.
        if let Some(&max_seq) = sequences.iter().max() {
            sqlx::query(
                "UPDATE a2a_tasks SET latest_event_sequence = ?
                 WHERE tenant = ? AND task_id = ? AND latest_event_sequence < ?",
            )
            .bind(max_seq as i64)
            .bind(tenant)
            .bind(task.id())
            .bind(max_seq as i64)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        }

        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        Ok(sequences)
    }
}

// ===========================================================================
// A2aPushDeliveryStore
// ===========================================================================

/// Convert `SystemTime` to epoch micros; stored as `INTEGER` so
/// ordering and arithmetic are cheap and deterministic across
/// timezones.
fn systime_to_micros(t: std::time::SystemTime) -> i64 {
    t.duration_since(std::time::UNIX_EPOCH)
        .map(|d| d.as_micros() as i64)
        .unwrap_or(0)
}

fn micros_to_systime(micros: i64) -> std::time::SystemTime {
    std::time::UNIX_EPOCH + std::time::Duration::from_micros(micros.max(0) as u64)
}

// Symmetric encoder to `claim_status_from_str`. Currently unused on the
// SQLite path (status writes go through the INSERT/UPDATE SQL column
// values directly rather than a typed formatter) but kept for parity
// with the PostgreSQL and DynamoDB backends so future status-column
// changes have the encoder available.
#[allow(dead_code)]
fn claim_status_to_str(s: ClaimStatus) -> &'static str {
    match s {
        ClaimStatus::Pending => "Pending",
        ClaimStatus::Attempting => "Attempting",
        ClaimStatus::Succeeded => "Succeeded",
        ClaimStatus::GaveUp => "GaveUp",
        ClaimStatus::Abandoned => "Abandoned",
    }
}

fn claim_status_from_str(s: &str) -> Result<ClaimStatus, A2aStorageError> {
    match s {
        "Pending" => Ok(ClaimStatus::Pending),
        "Attempting" => Ok(ClaimStatus::Attempting),
        "Succeeded" => Ok(ClaimStatus::Succeeded),
        "GaveUp" => Ok(ClaimStatus::GaveUp),
        "Abandoned" => Ok(ClaimStatus::Abandoned),
        other => Err(A2aStorageError::DatabaseError(format!(
            "unknown claim status: {other}"
        ))),
    }
}

fn error_class_to_json(c: DeliveryErrorClass) -> String {
    serde_json::to_string(&ErrorClassWire::from(c)).unwrap_or_else(|_| "{}".into())
}

fn error_class_from_json(s: &str) -> Option<DeliveryErrorClass> {
    serde_json::from_str::<ErrorClassWire>(s)
        .ok()
        .map(Into::into)
}

/// Wire shape for persisting `DeliveryErrorClass` without coupling
/// the trait enum to serde. SQLite-local.
#[derive(serde::Serialize, serde::Deserialize)]
#[serde(tag = "t", content = "s")]
enum ErrorClassWire {
    NetworkError,
    Timeout,
    HttpError4xx(u16),
    HttpError5xx(u16),
    HttpError429,
    SSRFBlocked,
    PayloadTooLarge,
    ConfigDeleted,
    TaskDeleted,
    TlsRejected,
}
impl From<DeliveryErrorClass> for ErrorClassWire {
    fn from(c: DeliveryErrorClass) -> Self {
        match c {
            DeliveryErrorClass::NetworkError => Self::NetworkError,
            DeliveryErrorClass::Timeout => Self::Timeout,
            DeliveryErrorClass::HttpError4xx { status } => Self::HttpError4xx(status),
            DeliveryErrorClass::HttpError5xx { status } => Self::HttpError5xx(status),
            DeliveryErrorClass::HttpError429 => Self::HttpError429,
            DeliveryErrorClass::SSRFBlocked => Self::SSRFBlocked,
            DeliveryErrorClass::PayloadTooLarge => Self::PayloadTooLarge,
            DeliveryErrorClass::ConfigDeleted => Self::ConfigDeleted,
            DeliveryErrorClass::TaskDeleted => Self::TaskDeleted,
            DeliveryErrorClass::TlsRejected => Self::TlsRejected,
        }
    }
}
impl From<ErrorClassWire> for DeliveryErrorClass {
    fn from(w: ErrorClassWire) -> Self {
        match w {
            ErrorClassWire::NetworkError => DeliveryErrorClass::NetworkError,
            ErrorClassWire::Timeout => DeliveryErrorClass::Timeout,
            ErrorClassWire::HttpError4xx(s) => DeliveryErrorClass::HttpError4xx { status: s },
            ErrorClassWire::HttpError5xx(s) => DeliveryErrorClass::HttpError5xx { status: s },
            ErrorClassWire::HttpError429 => DeliveryErrorClass::HttpError429,
            ErrorClassWire::SSRFBlocked => DeliveryErrorClass::SSRFBlocked,
            ErrorClassWire::PayloadTooLarge => DeliveryErrorClass::PayloadTooLarge,
            ErrorClassWire::ConfigDeleted => DeliveryErrorClass::ConfigDeleted,
            ErrorClassWire::TaskDeleted => DeliveryErrorClass::TaskDeleted,
            ErrorClassWire::TlsRejected => DeliveryErrorClass::TlsRejected,
        }
    }
}

fn gave_up_reason_to_str(r: GaveUpReason) -> &'static str {
    match r {
        GaveUpReason::MaxAttemptsExhausted => "MaxAttemptsExhausted",
        GaveUpReason::NonRetryableHttpStatus => "NonRetryableHttpStatus",
        GaveUpReason::SsrfBlocked => "SsrfBlocked",
        GaveUpReason::PayloadTooLarge => "PayloadTooLarge",
        GaveUpReason::TlsRejected => "TlsRejected",
    }
}

fn abandoned_reason_to_str(r: AbandonedReason) -> &'static str {
    match r {
        AbandonedReason::ConfigDeleted => "ConfigDeleted",
        AbandonedReason::TaskDeleted => "TaskDeleted",
        AbandonedReason::NonHttpsUrlInProduction => "NonHttpsUrlInProduction",
    }
}

#[async_trait]
impl A2aPushDeliveryStore for SqliteA2aStorage {
    fn backend_name(&self) -> &'static str {
        "sqlite"
    }

    async fn claim_delivery(
        &self,
        tenant: &str,
        task_id: &str,
        event_sequence: u64,
        config_id: &str,
        claimant: &str,
        owner: &str,
        claim_expiry: std::time::Duration,
    ) -> Result<DeliveryClaim, A2aStorageError> {
        let now = std::time::SystemTime::now();
        let expires_at = now + claim_expiry;
        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let existing: Option<(
            String,
            String,
            i64,
            i64,
            i64,
            i64,
            String,
            Option<i64>,
            Option<i64>,
            Option<i64>,
            Option<String>,
        )> = sqlx::query_as(
            "SELECT claimant, owner, generation, claimed_at_micros, expires_at_micros, \
                    delivery_attempt_count, status, first_attempted_at_micros, \
                    last_attempted_at_micros, last_http_status, last_error_class \
                 FROM a2a_push_deliveries \
                 WHERE tenant = ?1 AND task_id = ?2 AND event_sequence = ?3 AND config_id = ?4",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .bind(config_id)
        .fetch_optional(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let now_micros = systime_to_micros(now);
        let expires_micros = systime_to_micros(expires_at);

        if let Some((
            _prev_claimant,
            prev_owner,
            prev_gen,
            _prev_claimed,
            prev_expires,
            prev_count,
            prev_status_s,
            prev_first,
            prev_last,
            prev_http,
            prev_err,
        )) = existing
        {
            let prev_status = claim_status_from_str(&prev_status_s)?;
            let is_terminal = matches!(
                prev_status,
                ClaimStatus::Succeeded | ClaimStatus::GaveUp | ClaimStatus::Abandoned
            );
            let still_live = prev_expires > now_micros;
            if is_terminal || still_live {
                return Err(A2aStorageError::ClaimAlreadyHeld {
                    tenant: tenant.to_string(),
                    task_id: task_id.to_string(),
                    event_sequence,
                    config_id: config_id.to_string(),
                });
            }
            // Re-claim. Conditional update: the row must still be in
            // a non-terminal status AND still expired AND at the
            // generation we just read. Without these guards, a
            // stale read followed by a concurrent terminal commit
            // would let the re-claim UPDATE clobber the terminal.
            // Owner is preserved from the original claim — a re-claim
            // is a recovery hand-off, not a new registration.
            let new_gen = prev_gen + 1;
            let update_result = sqlx::query(
                "UPDATE a2a_push_deliveries SET \
                    claimant = ?1, generation = ?2, claimed_at_micros = ?3, \
                    expires_at_micros = ?4, status = 'Pending', \
                    gave_up_at_micros = NULL, gave_up_reason = NULL, abandoned_reason = NULL \
                 WHERE tenant = ?5 AND task_id = ?6 AND event_sequence = ?7 AND config_id = ?8 \
                   AND generation = ?9 AND status IN ('Pending', 'Attempting') \
                   AND expires_at_micros < ?10",
            )
            .bind(claimant)
            .bind(new_gen)
            .bind(now_micros)
            .bind(expires_micros)
            .bind(tenant)
            .bind(task_id)
            .bind(event_sequence as i64)
            .bind(config_id)
            .bind(prev_gen)
            .bind(now_micros)
            .execute(&mut *tx)
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            if update_result.rows_affected() == 0 {
                // Someone raced us — terminal commit, another
                // re-claim, or a late recovery. From our caller's
                // perspective, the claim is no longer ours to take.
                return Err(A2aStorageError::ClaimAlreadyHeld {
                    tenant: tenant.to_string(),
                    task_id: task_id.to_string(),
                    event_sequence,
                    config_id: config_id.to_string(),
                });
            }
            tx.commit()
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            let _ = (prev_count, prev_first, prev_last, prev_http, prev_err);
            return Ok(DeliveryClaim {
                claimant: claimant.to_string(),
                owner: prev_owner,
                generation: new_gen as u64,
                claimed_at: now,
                delivery_attempt_count: prev_count as u32,
                status: ClaimStatus::Pending,
            });
        }

        // Fresh claim. ON CONFLICT DO NOTHING collapses concurrent
        // fresh inserts into a one-winner race — the loser sees
        // `rows_affected == 0` and returns `ClaimAlreadyHeld`
        // rather than surfacing a UNIQUE constraint violation.
        let result = sqlx::query(
            "INSERT INTO a2a_push_deliveries \
                (tenant, task_id, event_sequence, config_id, claimant, owner, generation, \
                 claimed_at_micros, expires_at_micros, delivery_attempt_count, status) \
             VALUES (?1, ?2, ?3, ?4, ?5, ?6, 1, ?7, ?8, 0, 'Pending') \
             ON CONFLICT (tenant, task_id, event_sequence, config_id) DO NOTHING",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .bind(config_id)
        .bind(claimant)
        .bind(owner)
        .bind(now_micros)
        .bind(expires_micros)
        .execute(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        if result.rows_affected() == 0 {
            return Err(A2aStorageError::ClaimAlreadyHeld {
                tenant: tenant.to_string(),
                task_id: task_id.to_string(),
                event_sequence,
                config_id: config_id.to_string(),
            });
        }
        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        Ok(DeliveryClaim {
            claimant: claimant.to_string(),
            owner: owner.to_string(),
            generation: 1,
            claimed_at: now,
            delivery_attempt_count: 0,
            status: ClaimStatus::Pending,
        })
    }

    async fn record_attempt_started(
        &self,
        tenant: &str,
        task_id: &str,
        event_sequence: u64,
        config_id: &str,
        claimant: &str,
        claim_generation: u64,
    ) -> Result<u32, A2aStorageError> {
        let now = std::time::SystemTime::now();
        let now_micros = systime_to_micros(now);
        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        // Conditional update fenced on identity AND non-terminal
        // status: a terminal row is frozen and cannot restart an
        // attempt, so the UPDATE filters to {Pending, Attempting}.
        let result = sqlx::query(
            "UPDATE a2a_push_deliveries SET \
                delivery_attempt_count = delivery_attempt_count + 1, \
                status = CASE WHEN status = 'Pending' THEN 'Attempting' ELSE status END, \
                first_attempted_at_micros = COALESCE(first_attempted_at_micros, ?1), \
                last_attempted_at_micros = ?1 \
             WHERE tenant = ?2 AND task_id = ?3 AND event_sequence = ?4 \
               AND config_id = ?5 AND claimant = ?6 AND generation = ?7 \
               AND status IN ('Pending', 'Attempting')",
        )
        .bind(now_micros)
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .bind(config_id)
        .bind(claimant)
        .bind(claim_generation as i64)
        .execute(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        if result.rows_affected() == 0 {
            return Err(A2aStorageError::StaleDeliveryClaim {
                tenant: tenant.to_string(),
                task_id: task_id.to_string(),
                event_sequence,
                config_id: config_id.to_string(),
            });
        }
        let count: (i64,) = sqlx::query_as(
            "SELECT delivery_attempt_count FROM a2a_push_deliveries \
             WHERE tenant = ?1 AND task_id = ?2 AND event_sequence = ?3 AND config_id = ?4",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .bind(config_id)
        .fetch_one(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(count.0 as u32)
    }

    async fn record_delivery_outcome(
        &self,
        tenant: &str,
        task_id: &str,
        event_sequence: u64,
        config_id: &str,
        claimant: &str,
        claim_generation: u64,
        outcome: DeliveryOutcome,
    ) -> Result<(), A2aStorageError> {
        let now = std::time::SystemTime::now();
        let now_micros = systime_to_micros(now);
        let mut tx = self
            .pool
            .begin()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        // Fetch current row to validate identity and idempotency.
        let row: Option<(String, i64, String, Option<i64>)> = sqlx::query_as(
            "SELECT claimant, generation, status, claimed_at_micros \
             FROM a2a_push_deliveries \
             WHERE tenant = ?1 AND task_id = ?2 AND event_sequence = ?3 AND config_id = ?4",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .bind(config_id)
        .fetch_optional(&mut *tx)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let (cur_claimant, cur_gen, cur_status_s, cur_claimed) = match row {
            Some(r) => r,
            None => {
                return Err(A2aStorageError::StaleDeliveryClaim {
                    tenant: tenant.to_string(),
                    task_id: task_id.to_string(),
                    event_sequence,
                    config_id: config_id.to_string(),
                });
            }
        };
        if cur_claimant != claimant || cur_gen as u64 != claim_generation {
            return Err(A2aStorageError::StaleDeliveryClaim {
                tenant: tenant.to_string(),
                task_id: task_id.to_string(),
                event_sequence,
                config_id: config_id.to_string(),
            });
        }
        let cur_status = claim_status_from_str(&cur_status_s)?;

        // Terminal-frozen gate: once Succeeded/GaveUp/Abandoned,
        // further outcomes (same terminal OR any other) are silent
        // no-ops. The row is never mutated away from its terminal.
        if matches!(
            cur_status,
            ClaimStatus::Succeeded | ClaimStatus::GaveUp | ClaimStatus::Abandoned
        ) {
            tx.commit()
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            return Ok(());
        }

        match outcome {
            DeliveryOutcome::Succeeded { http_status } => {
                sqlx::query(
                    "UPDATE a2a_push_deliveries SET status = 'Succeeded', \
                        last_http_status = ?1, \
                        first_attempted_at_micros = COALESCE(first_attempted_at_micros, ?2), \
                        last_attempted_at_micros = ?2 \
                     WHERE tenant = ?3 AND task_id = ?4 AND event_sequence = ?5 AND config_id = ?6",
                )
                .bind(http_status as i64)
                .bind(now_micros)
                .bind(tenant)
                .bind(task_id)
                .bind(event_sequence as i64)
                .bind(config_id)
                .execute(&mut *tx)
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            }
            DeliveryOutcome::Retry {
                http_status,
                error_class,
                next_attempt_at: _,
            } => {
                sqlx::query(
                    "UPDATE a2a_push_deliveries SET status = 'Attempting', \
                        last_http_status = ?1, last_error_class = ?2, \
                        last_attempted_at_micros = ?3 \
                     WHERE tenant = ?4 AND task_id = ?5 AND event_sequence = ?6 AND config_id = ?7",
                )
                .bind(http_status.map(|s| s as i64))
                .bind(error_class_to_json(error_class))
                .bind(now_micros)
                .bind(tenant)
                .bind(task_id)
                .bind(event_sequence as i64)
                .bind(config_id)
                .execute(&mut *tx)
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            }
            DeliveryOutcome::GaveUp {
                reason,
                last_error_class,
                last_http_status,
            } => {
                sqlx::query(
                    "UPDATE a2a_push_deliveries SET status = 'GaveUp', \
                        gave_up_at_micros = ?1, gave_up_reason = ?2, \
                        last_error_class = ?3, last_http_status = ?4, \
                        first_attempted_at_micros = COALESCE(first_attempted_at_micros, ?5), \
                        last_attempted_at_micros = COALESCE(last_attempted_at_micros, ?1) \
                     WHERE tenant = ?6 AND task_id = ?7 AND event_sequence = ?8 AND config_id = ?9",
                )
                .bind(now_micros)
                .bind(gave_up_reason_to_str(reason))
                .bind(error_class_to_json(last_error_class))
                .bind(last_http_status.map(|s| s as i64))
                .bind(cur_claimed.unwrap_or(now_micros))
                .bind(tenant)
                .bind(task_id)
                .bind(event_sequence as i64)
                .bind(config_id)
                .execute(&mut *tx)
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            }
            DeliveryOutcome::Abandoned { reason } => {
                sqlx::query(
                    "UPDATE a2a_push_deliveries SET status = 'Abandoned', \
                        abandoned_reason = ?1 \
                     WHERE tenant = ?2 AND task_id = ?3 AND event_sequence = ?4 AND config_id = ?5",
                )
                .bind(abandoned_reason_to_str(reason))
                .bind(tenant)
                .bind(task_id)
                .bind(event_sequence as i64)
                .bind(config_id)
                .execute(&mut *tx)
                .await
                .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
            }
        }
        tx.commit()
            .await
            .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(())
    }

    async fn sweep_expired_claims(&self) -> Result<u64, A2aStorageError> {
        let now_micros = systime_to_micros(std::time::SystemTime::now());
        let row: (i64,) = sqlx::query_as(
            "SELECT COUNT(*) FROM a2a_push_deliveries \
             WHERE expires_at_micros < ?1 AND status IN ('Pending', 'Attempting')",
        )
        .bind(now_micros)
        .fetch_one(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(row.0.max(0) as u64)
    }

    async fn list_reclaimable_claims(
        &self,
        limit: usize,
    ) -> Result<Vec<crate::push::claim::ReclaimableClaim>, A2aStorageError> {
        let now_micros = systime_to_micros(std::time::SystemTime::now());
        let rows: Vec<(String, String, String, i64, String)> = sqlx::query_as(
            "SELECT tenant, owner, task_id, event_sequence, config_id \
             FROM a2a_push_deliveries \
             WHERE expires_at_micros < ?1 AND status IN ('Pending', 'Attempting') \
             LIMIT ?2",
        )
        .bind(now_micros)
        .bind(limit as i64)
        .fetch_all(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(rows
            .into_iter()
            .map(|(tenant, owner, task_id, event_sequence, config_id)| {
                crate::push::claim::ReclaimableClaim {
                    tenant,
                    owner,
                    task_id,
                    event_sequence: event_sequence.max(0) as u64,
                    config_id,
                }
            })
            .collect())
    }

    async fn record_pending_dispatch(
        &self,
        tenant: &str,
        owner: &str,
        task_id: &str,
        event_sequence: u64,
    ) -> Result<(), A2aStorageError> {
        let now_micros = systime_to_micros(std::time::SystemTime::now());
        // Idempotent insert-or-refresh: a repeat write on the same
        // tuple updates recorded_at + owner. Using ON CONFLICT DO
        // UPDATE keeps the call cheap for the in-progress dispatch
        // path where the marker may already exist.
        sqlx::query(
            "INSERT INTO a2a_push_pending_dispatches \
                (tenant, task_id, event_sequence, owner, recorded_at_micros) \
             VALUES (?1, ?2, ?3, ?4, ?5) \
             ON CONFLICT (tenant, task_id, event_sequence) DO UPDATE SET \
                owner = excluded.owner, \
                recorded_at_micros = excluded.recorded_at_micros",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .bind(owner)
        .bind(now_micros)
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(())
    }

    async fn delete_pending_dispatch(
        &self,
        tenant: &str,
        task_id: &str,
        event_sequence: u64,
    ) -> Result<(), A2aStorageError> {
        sqlx::query(
            "DELETE FROM a2a_push_pending_dispatches \
             WHERE tenant = ?1 AND task_id = ?2 AND event_sequence = ?3",
        )
        .bind(tenant)
        .bind(task_id)
        .bind(event_sequence as i64)
        .execute(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(())
    }

    async fn list_stale_pending_dispatches(
        &self,
        older_than_recorded_at: std::time::SystemTime,
        limit: usize,
    ) -> Result<Vec<crate::push::claim::PendingDispatch>, A2aStorageError> {
        let cutoff_micros = systime_to_micros(older_than_recorded_at);
        let rows: Vec<(String, String, String, i64, i64)> = sqlx::query_as(
            "SELECT tenant, owner, task_id, event_sequence, recorded_at_micros \
             FROM a2a_push_pending_dispatches \
             WHERE recorded_at_micros <= ?1 \
             LIMIT ?2",
        )
        .bind(cutoff_micros)
        .bind(limit as i64)
        .fetch_all(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;
        Ok(rows
            .into_iter()
            .map(
                |(tenant, owner, task_id, event_sequence, recorded_at_micros)| {
                    crate::push::claim::PendingDispatch {
                        tenant,
                        owner,
                        task_id,
                        event_sequence: event_sequence.max(0) as u64,
                        recorded_at: micros_to_systime(recorded_at_micros),
                    }
                },
            )
            .collect())
    }

    async fn list_failed_deliveries(
        &self,
        tenant: &str,
        since: std::time::SystemTime,
        limit: usize,
    ) -> Result<Vec<FailedDelivery>, A2aStorageError> {
        let since_micros = systime_to_micros(since);
        let rows: Vec<(
            String,
            String,
            i64,
            i64,
            Option<i64>,
            Option<i64>,
            Option<i64>,
            i64,
            Option<i64>,
            Option<String>,
        )> = sqlx::query_as(
            "SELECT task_id, config_id, event_sequence, claimed_at_micros, \
                    first_attempted_at_micros, last_attempted_at_micros, \
                    gave_up_at_micros, delivery_attempt_count, \
                    last_http_status, last_error_class \
             FROM a2a_push_deliveries \
             WHERE tenant = ?1 AND status = 'GaveUp' AND gave_up_at_micros >= ?2 \
             ORDER BY gave_up_at_micros DESC \
             LIMIT ?3",
        )
        .bind(tenant)
        .bind(since_micros)
        .bind(limit as i64)
        .fetch_all(&self.pool)
        .await
        .map_err(|e| A2aStorageError::DatabaseError(e.to_string()))?;

        let mut out = Vec::with_capacity(rows.len());
        for (task_id, config_id, seq, claimed, first, last, gave_up, count, http, err) in rows {
            let gave_up = gave_up.unwrap_or(claimed);
            out.push(FailedDelivery {
                task_id,
                config_id,
                event_sequence: seq.max(0) as u64,
                first_attempted_at: micros_to_systime(first.unwrap_or(claimed)),
                last_attempted_at: micros_to_systime(last.unwrap_or(gave_up)),
                gave_up_at: micros_to_systime(gave_up),
                delivery_attempt_count: count.max(0) as u32,
                last_http_status: http.map(|s| s as u16),
                last_error_class: err
                    .as_deref()
                    .and_then(error_class_from_json)
                    .unwrap_or(DeliveryErrorClass::NetworkError),
            });
        }
        Ok(out)
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::storage::parity_tests;

    async fn storage() -> SqliteA2aStorage {
        // Single-connection in-memory SQLite. The pool is capped at 1 so
        // all queries serialize on one connection — this matches SQLite's
        // actual multi-writer model (one writer at a time) and avoids
        // SQLITE_LOCKED deadlocks on concurrent `BEGIN DEFERRED`
        // transactions. The conditional-UPDATE CAS is still exercised
        // because the test issues multiple SEQUENTIAL tx attempts: once
        // a terminal writer commits, subsequent transactions see the
        // terminal and the conditional UPDATE affects zero rows, returning
        // TerminalStateAlreadySet as required.
        SqliteA2aStorage::new(SqliteConfig {
            database_url: "sqlite::memory:".into(),
            max_connections: 1,
        })
        .await
        .unwrap()
    }

    #[tokio::test]
    async fn test_create_and_retrieve() {
        parity_tests::test_create_and_retrieve(&storage().await).await;
    }

    #[tokio::test]
    async fn test_state_machine_enforcement() {
        parity_tests::test_state_machine_enforcement(&storage().await).await;
    }

    #[tokio::test]
    async fn test_terminal_state_rejection() {
        parity_tests::test_terminal_state_rejection(&storage().await).await;
    }

    #[tokio::test]
    async fn test_tenant_isolation() {
        parity_tests::test_tenant_isolation(&storage().await).await;
    }

    #[tokio::test]
    async fn test_owner_isolation() {
        parity_tests::test_owner_isolation(&storage().await).await;
    }

    #[tokio::test]
    async fn test_history_length() {
        parity_tests::test_history_length(&storage().await).await;
    }

    #[tokio::test]
    async fn test_list_pagination() {
        parity_tests::test_list_pagination(&storage().await).await;
    }

    #[tokio::test]
    async fn test_list_filter_by_status() {
        parity_tests::test_list_filter_by_status(&storage().await).await;
    }

    #[tokio::test]
    async fn test_list_filter_by_context_id() {
        parity_tests::test_list_filter_by_context_id(&storage().await).await;
    }

    #[tokio::test]
    async fn test_append_message() {
        parity_tests::test_append_message(&storage().await).await;
    }

    #[tokio::test]
    async fn test_append_artifact() {
        parity_tests::test_append_artifact(&storage().await).await;
    }

    #[tokio::test]
    async fn test_task_count() {
        parity_tests::test_task_count(&storage().await).await;
    }

    #[tokio::test]
    async fn test_owner_isolation_mutations() {
        parity_tests::test_owner_isolation_mutations(&storage().await).await;
    }

    #[tokio::test]
    async fn test_artifact_chunk_semantics() {
        parity_tests::test_artifact_chunk_semantics(&storage().await).await;
    }

    #[tokio::test]
    async fn test_push_config_crud() {
        parity_tests::test_push_config_crud(&storage().await).await;
    }

    #[tokio::test]
    async fn test_push_config_idempotent_delete() {
        parity_tests::test_push_config_idempotent_delete(&storage().await).await;
    }

    #[tokio::test]
    async fn test_push_config_tenant_isolation() {
        parity_tests::test_push_config_tenant_isolation(&storage().await).await;
    }

    #[tokio::test]
    async fn test_push_config_list_pagination() {
        parity_tests::test_push_config_list_pagination(&storage().await).await;
    }

    // Event store parity tests

    #[tokio::test]
    async fn test_event_append_and_retrieve() {
        parity_tests::test_event_append_and_retrieve(&storage().await).await;
    }

    #[tokio::test]
    async fn test_event_monotonic_ordering() {
        parity_tests::test_event_monotonic_ordering(&storage().await).await;
    }

    #[tokio::test]
    async fn test_event_per_task_isolation() {
        parity_tests::test_event_per_task_isolation(&storage().await).await;
    }

    #[tokio::test]
    async fn test_event_tenant_isolation() {
        parity_tests::test_event_tenant_isolation(&storage().await).await;
    }

    #[tokio::test]
    async fn test_event_latest_sequence() {
        parity_tests::test_event_latest_sequence(&storage().await).await;
    }

    #[tokio::test]
    async fn test_event_empty_task() {
        parity_tests::test_event_empty_task(&storage().await).await;
    }

    // Atomic store parity tests

    #[tokio::test]
    async fn test_atomic_create_task_with_events() {
        let s = storage().await;
        parity_tests::test_atomic_create_task_with_events(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_update_status_with_events() {
        let s = storage().await;
        parity_tests::test_atomic_update_status_with_events(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_read_your_writes_across_traits() {
        let s = storage().await;
        parity_tests::test_read_your_writes_across_traits(&s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_status_rejects_invalid_transition() {
        let s = storage().await;
        parity_tests::test_atomic_status_rejects_invalid_transition(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_update_task_with_events() {
        let s = storage().await;
        parity_tests::test_atomic_update_task_with_events(&s, &s, &s).await;
    }

    // Terminal-write CAS parity tests.

    #[tokio::test]
    async fn test_terminal_cas_single_winner_on_concurrent_terminals() {
        let s = std::sync::Arc::new(storage().await);
        parity_tests::test_terminal_cas_single_winner_on_concurrent_terminals(
            s.clone(),
            s.clone(),
            s,
        )
        .await;
    }

    #[tokio::test]
    async fn test_terminal_cas_single_winner_from_submitted_includes_rejected() {
        let s = std::sync::Arc::new(storage().await);
        parity_tests::test_terminal_cas_single_winner_from_submitted_includes_rejected(
            s.clone(),
            s.clone(),
            s,
        )
        .await;
    }

    #[tokio::test]
    async fn test_terminal_cas_rejects_sequential_second_terminal() {
        let s = storage().await;
        parity_tests::test_terminal_cas_rejects_sequential_second_terminal(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_update_task_with_events_rejects_terminal_already_set() {
        let s = storage().await;
        parity_tests::test_update_task_with_events_rejects_terminal_already_set(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_invalid_transition_distinct_from_terminal_already_set() {
        let s = storage().await;
        parity_tests::test_invalid_transition_distinct_from_terminal_already_set(&s, &s).await;
    }

    // Cancel-marker parity.

    #[tokio::test]
    async fn test_cancel_marker_roundtrip() {
        let s = storage().await;
        parity_tests::test_cancel_marker_roundtrip(&s, &s).await;
    }

    #[tokio::test]
    async fn test_supervisor_list_cancel_requested_parity() {
        let s = storage().await;
        parity_tests::test_supervisor_list_cancel_requested_parity(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_owner_isolation() {
        let s = storage().await;
        parity_tests::test_atomic_owner_isolation(&s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_tenant_isolation() {
        let s = storage().await;
        parity_tests::test_atomic_tenant_isolation(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_create_with_empty_events() {
        let s = storage().await;
        parity_tests::test_atomic_create_with_empty_events(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_sequence_continuity() {
        let s = storage().await;
        parity_tests::test_atomic_sequence_continuity(&s, &s).await;
    }

    // =========================================================
    // A2aPushDeliveryStore parity.
    // =========================================================

    #[tokio::test]
    async fn test_push_claim_is_exclusive() {
        let s = storage().await;
        parity_tests::test_push_claim_is_exclusive(&s).await;
    }

    #[tokio::test]
    async fn test_push_claim_expired_is_reclaimable() {
        let s = storage().await;
        parity_tests::test_push_claim_expired_is_reclaimable(&s).await;
    }

    #[tokio::test]
    async fn test_push_outcome_fenced_to_current_claim() {
        let s = storage().await;
        parity_tests::test_push_outcome_fenced_to_current_claim(&s).await;
    }

    #[tokio::test]
    async fn test_push_claim_terminal_succeeded_blocks_reclaim() {
        let s = storage().await;
        parity_tests::test_push_claim_terminal_succeeded_blocks_reclaim(&s).await;
    }

    #[tokio::test]
    async fn test_push_claim_terminal_gaveup_blocks_reclaim() {
        let s = storage().await;
        parity_tests::test_push_claim_terminal_gaveup_blocks_reclaim(&s).await;
    }

    #[tokio::test]
    async fn test_push_claim_terminal_abandoned_blocks_reclaim_and_not_listed() {
        let s = storage().await;
        parity_tests::test_push_claim_terminal_abandoned_blocks_reclaim_and_not_listed(&s).await;
    }

    #[tokio::test]
    async fn test_push_attempt_started_advances_count_and_status() {
        let s = storage().await;
        parity_tests::test_push_attempt_started_advances_count_and_status(&s).await;
    }

    #[tokio::test]
    async fn test_push_attempt_started_is_fenced() {
        let s = storage().await;
        parity_tests::test_push_attempt_started_is_fenced(&s).await;
    }

    #[tokio::test]
    async fn test_push_retry_outcome_keeps_claim_open() {
        let s = storage().await;
        parity_tests::test_push_retry_outcome_keeps_claim_open(&s).await;
    }

    #[tokio::test]
    async fn test_push_outcome_idempotent_on_terminal() {
        let s = storage().await;
        parity_tests::test_push_outcome_idempotent_on_terminal(&s).await;
    }

    #[tokio::test]
    async fn test_push_sweep_counts_expired_nonterminal_and_preserves_status() {
        let s = storage().await;
        parity_tests::test_push_sweep_counts_expired_nonterminal_and_preserves_status(&s).await;
    }

    #[tokio::test]
    async fn test_push_list_reclaimable_filters_and_returns_identity() {
        let s = storage().await;
        parity_tests::test_push_list_reclaimable_filters_and_returns_identity(&s).await;
    }

    #[tokio::test]
    async fn test_push_list_failed_filters_and_orders() {
        let s = storage().await;
        parity_tests::test_push_list_failed_filters_and_orders(&s).await;
    }

    #[tokio::test]
    async fn test_push_list_failed_is_tenant_scoped() {
        let s = storage().await;
        parity_tests::test_push_list_failed_is_tenant_scoped(&s).await;
    }

    #[tokio::test]
    async fn test_push_failed_delivery_diagnostics_roundtrip() {
        let s = storage().await;
        parity_tests::test_push_failed_delivery_diagnostics_roundtrip(&s).await;
    }

    #[tokio::test]
    async fn test_push_attempt_started_rejected_after_terminal() {
        let s = storage().await;
        parity_tests::test_push_attempt_started_rejected_after_terminal(&s).await;
    }

    #[tokio::test]
    async fn test_push_outcome_does_not_overwrite_terminal() {
        let s = storage().await;
        parity_tests::test_push_outcome_does_not_overwrite_terminal(&s).await;
    }

    #[tokio::test]
    async fn test_push_concurrent_claim_race() {
        let s = std::sync::Arc::new(storage().await);
        parity_tests::test_push_concurrent_claim_race(s).await;
    }

    // Atomic pending-dispatch marker parity (ADR-013 §4.3 / §10.1).

    async fn opted_in_storage() -> SqliteA2aStorage {
        storage().await.with_push_dispatch_enabled(true)
    }

    #[tokio::test]
    async fn test_atomic_marker_written_for_terminal_status() {
        let s = opted_in_storage().await;
        parity_tests::test_atomic_marker_written_for_terminal_status(&s, &s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_marker_skipped_for_non_terminal_status() {
        let s = opted_in_storage().await;
        parity_tests::test_atomic_marker_skipped_for_non_terminal_status(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_marker_skipped_for_artifact_event() {
        let s = opted_in_storage().await;
        parity_tests::test_atomic_marker_skipped_for_artifact_event(&s, &s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_atomic_marker_absent_when_opt_in_off() {
        let s = storage().await; // default: push_dispatch_enabled=false
        parity_tests::test_atomic_marker_absent_when_opt_in_off(&s, &s, &s).await;
    }

    // Causal-floor eligibility parity (ADR-013 §4.5 / §10.3 / §10.4).

    #[tokio::test]
    async fn test_config_registered_at_or_after_event_not_eligible() {
        let s = storage().await;
        parity_tests::test_config_registered_at_or_after_event_not_eligible(&s, &s, &s).await;
    }

    #[tokio::test]
    async fn test_late_create_config_stamps_advanced_sequence() {
        let s = storage().await;
        parity_tests::test_late_create_config_stamps_advanced_sequence(&s, &s, &s).await;
    }
}