oxi-agent 0.19.0

Agent runtime with tool-calling loop for AI coding assistants
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
/// Integration tests for oxi-agent
use crate::types::{ToolCall, ToolDefinition, ToolResult};
use crate::{Agent, AgentConfig, AgentEvent, AgentState, ToolRegistry};
use async_trait::async_trait;
use futures::Stream;
use oxi_ai::{
    transform_for_provider, Api, ContentBlock, Context, Provider, ProviderEvent, StopReason,
    TextContent, ThinkingContent,
};
use std::collections::HashMap;
use std::pin::Pin;
use std::sync::{Arc, Mutex};
use std::task::{Context as TaskContext, Poll};

/// Mock provider for testing
struct MockProvider {
    responses: Vec<MockResponse>,
    call_count: Arc<Mutex<usize>>,
}

#[derive(Clone)]
struct MockResponse {
    content: String,
}

impl MockProvider {
    fn new(responses: Vec<MockResponse>) -> Self {
        Self {
            responses,
            call_count: Arc::new(Mutex::new(0)),
        }
    }
}

#[async_trait]
impl Provider for MockProvider {
    async fn stream(
        &self,
        _model: &oxi_ai::Model,
        _context: &Context,
        _options: Option<oxi_ai::StreamOptions>,
    ) -> std::result::Result<
        std::pin::Pin<Box<dyn futures::Stream<Item = ProviderEvent> + Send>>,
        oxi_ai::ProviderError,
    > {
        let mut call_count = self.call_count.lock().unwrap();
        *call_count += 1;
        let idx = (*call_count - 1) % self.responses.len();
        let response = self.responses[idx].clone();

        let stream = MockStream {
            text: response.content,
            done: false,
        };

        Ok(Box::pin(stream)
            as Pin<
                Box<dyn futures::Stream<Item = ProviderEvent> + Send>,
            >)
    }

    fn name(&self) -> &str {
        "mock"
    }
}

struct MockStream {
    text: String,
    done: bool,
}

impl Stream for MockStream {
    type Item = ProviderEvent;

    fn poll_next(mut self: Pin<&mut Self>, _cx: &mut TaskContext<'_>) -> Poll<Option<Self::Item>> {
        if self.done {
            return Poll::Ready(None);
        }

        self.done = true;

        // Create assistant message with text content
        let mut assistant =
            oxi_ai::AssistantMessage::new(oxi_ai::Api::AnthropicMessages, "mock", "mock-model");
        assistant.content = vec![ContentBlock::Text(TextContent::new(self.text.clone()))];

        Poll::Ready(Some(ProviderEvent::Done {
            reason: StopReason::Stop,
            message: assistant,
        }))
    }
}

#[test]
fn test_agent_config_default() {
    let config = AgentConfig::default();
    assert_eq!(config.name, "oxi-agent");
    assert_eq!(config.max_iterations, 10);
    assert_eq!(config.timeout_seconds, 300);
}

#[test]
fn test_agent_config_builder() {
    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514")
        .with_name("my-agent")
        .with_system_prompt("You are helpful")
        .with_max_iterations(5);
    assert_eq!(config.model_id, "anthropic/claude-sonnet-4-20250514");
    assert_eq!(config.name, "my-agent");
    assert_eq!(config.system_prompt, Some("You are helpful".to_string()));
    assert_eq!(config.max_iterations, 5);
}

#[test]
fn test_agent_state_messages() {
    let mut state = AgentState::new();
    state.add_user_message("Hello".to_string());
    state.add_assistant_message("Hi there!".to_string());
    assert_eq!(state.messages.len(), 2);
}

#[test]
fn test_agent_state_iteration() {
    let mut state = AgentState::new();
    assert_eq!(state.iteration, 0);
    state.increment_iteration();
    assert_eq!(state.iteration, 1);
}

#[test]
fn test_agent_state_usage() {
    let mut state = AgentState::new();
    state.record_usage(100, 50);
    assert_eq!(state.input_tokens, 100);
    assert_eq!(state.output_tokens, 50);
    assert_eq!(state.total_tokens, 150);
}

#[test]
fn test_agent_state_clear() {
    let mut state = AgentState::new();
    state.add_user_message("Hello".to_string());
    state.increment_iteration();
    state.clear();
    assert_eq!(state.messages.len(), 0);
    assert_eq!(state.iteration, 0);
}

#[test]
fn test_agent_state_is_complete() {
    let mut state = AgentState::new();
    assert!(!state.is_complete());
    state.set_stop_reason(crate::types::StopReason::Stop);
    assert!(state.is_complete());
}

#[test]
fn test_shared_state() {
    use crate::state::SharedState;
    let shared = SharedState::new();
    shared.update(|s| {
        s.add_user_message("Test".to_string());
    });
    let state = shared.get_state();
    assert_eq!(state.messages.len(), 1);
    shared.reset();
    let state = shared.get_state();
    assert_eq!(state.messages.len(), 0);
}

#[tokio::test]
async fn test_agent_with_mock_provider() {
    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "Hello! How can I help you?".to_string(),
    }]));

    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514");
    let agent = Agent::new(provider.clone(), config, Arc::new(ToolRegistry::new()));

    let (response, events) = agent.run("Hi".to_string()).await.unwrap();

    assert_eq!(response.content, "Hello! How can I help you?");
    assert_eq!(*provider.call_count.lock().unwrap(), 1);
    assert!(events
        .iter()
        .any(|e| matches!(e, AgentEvent::AgentStart { .. })));
    assert!(events
        .iter()
        .any(|e| matches!(e, AgentEvent::AgentEnd { .. })));
}

#[tokio::test]
async fn test_agent_events_sequence() {
    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "Test response".to_string(),
    }]));

    let config = AgentConfig::default();
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));

    let (_, events) = agent.run("Test prompt".to_string()).await.unwrap();

    assert!(events
        .first()
        .map(|e| matches!(e, AgentEvent::AgentStart { .. }))
        .unwrap_or(false));
    assert!(events
        .iter()
        .any(|e| matches!(e, AgentEvent::AgentEnd { .. })));
}

#[test]
fn test_tool_definition() {
    let mut schema = HashMap::new();
    schema.insert(
        "query".to_string(),
        serde_json::json!({
            "type": "string",
            "description": "Search query"
        }),
    );
    let tool = ToolDefinition::new("search", "Search the web", schema);
    assert_eq!(tool.name, "search");
    assert!(tool.input_schema.contains_key("query"));
}

#[test]
fn test_tool_call() {
    let tool_call = ToolCall::new("call_1", "get_weather", r#"{"city": "NYC"}"#);
    assert_eq!(tool_call.id, "call_1");
    assert_eq!(tool_call.name, "get_weather");
}

#[test]
fn test_tool_result() {
    let success = ToolResult::success("call_1", "Sunny, 72°F");
    assert!(!success.is_error);
    let error = ToolResult::error("call_2", "City not found");
    assert!(error.is_error);
}

// ── Cross-provider handoff tests ──────────────────────────────────

#[test]
fn test_transform_for_provider_thinking_to_openai() {
    // Create an assistant message with thinking blocks (from Anthropic)
    let mut assistant = oxi_ai::AssistantMessage::new(
        Api::AnthropicMessages,
        "anthropic",
        "claude-sonnet-4-20250514",
    );
    assistant.content = vec![
        ContentBlock::Thinking(ThinkingContent::new("Let me think about this...")),
        ContentBlock::Text(TextContent::new("Here is my answer.")),
    ];

    let messages = vec![
        oxi_ai::Message::User(oxi_ai::UserMessage::new("Hello")),
        oxi_ai::Message::Assistant(assistant),
    ];

    // Transform for OpenAI
    let transformed =
        transform_for_provider(&messages, &Api::AnthropicMessages, &Api::OpenAiCompletions);

    assert_eq!(transformed.len(), 2);

    // User message should be unchanged
    assert!(matches!(&transformed[0], oxi_ai::Message::User(_)));

    // Assistant message should have thinking converted to text
    if let oxi_ai::Message::Assistant(a) = &transformed[1] {
        assert_eq!(a.content.len(), 1); // merged into single text block
        let text = a.content[0].as_text().unwrap();
        assert!(text.contains("<thinking>"));
        assert!(text.contains("Let me think about this..."));
        assert!(text.contains("Here is my answer."));
        assert_eq!(a.api, Api::OpenAiCompletions);
    } else {
        panic!("Expected Assistant message");
    }
}

#[test]
fn test_transform_for_provider_preserves_anthropic() {
    // Thinking blocks should be preserved when target is Anthropic
    let mut assistant = oxi_ai::AssistantMessage::new(
        Api::AnthropicMessages,
        "anthropic",
        "claude-sonnet-4-20250514",
    );
    assistant.content = vec![
        ContentBlock::Thinking(ThinkingContent::new("Thinking...")),
        ContentBlock::Text(TextContent::new("Answer.")),
    ];

    let messages = vec![oxi_ai::Message::Assistant(assistant)];

    let transformed =
        transform_for_provider(&messages, &Api::AnthropicMessages, &Api::AnthropicMessages);

    if let oxi_ai::Message::Assistant(a) = &transformed[0] {
        assert_eq!(a.content.len(), 2); // unchanged
        assert!(a.content[0].as_thinking().is_some());
        assert!(a.content[1].as_text().is_some());
    } else {
        panic!("Expected Assistant message");
    }
}

#[test]
fn test_transform_preserves_tool_results() {
    // Tool results should pass through unchanged
    let tool_result = oxi_ai::ToolResultMessage::new(
        "call_123",
        "read",
        vec![ContentBlock::Text(TextContent::new("file contents"))],
    );

    let messages = vec![oxi_ai::Message::ToolResult(tool_result)];

    let transformed =
        transform_for_provider(&messages, &Api::AnthropicMessages, &Api::OpenAiCompletions);

    assert_eq!(transformed.len(), 1);
    if let oxi_ai::Message::ToolResult(tr) = &transformed[0] {
        assert_eq!(tr.tool_call_id, "call_123");
        assert_eq!(tr.tool_name, "read");
    } else {
        panic!("Expected ToolResult message");
    }
}

#[test]
fn test_agent_model_id() {
    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "test".to_string(),
    }]));
    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514");
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));
    assert_eq!(agent.model_id(), "anthropic/claude-sonnet-4-20250514");
}

#[test]
fn test_agent_switch_model_invalid_format() {
    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "test".to_string(),
    }]));
    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514");
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));

    // Invalid format (no provider prefix)
    let result = agent.switch_model("gpt-4o");
    assert!(result.is_err());
}

#[test]
fn test_agent_switch_model_unknown_model() {
    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "test".to_string(),
    }]));
    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514");
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));

    let result = agent.switch_model("nonexistent/model");
    assert!(result.is_err());
}

#[test]
fn test_agent_switch_model_same_provider() {
    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "test".to_string(),
    }]));
    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514");
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));

    // Switch to another Anthropic model (same provider, same API)
    let result = agent.switch_model("anthropic/claude-3-haiku");
    assert!(result.is_ok());
    assert_eq!(agent.model_id(), "anthropic/claude-3-haiku");
}

/// Mock provider that tracks which API it was called with
struct ApiAwareMockProvider {
    responses: Vec<MockResponse>,
    call_count: Arc<Mutex<usize>>,
    last_api: Arc<Mutex<Option<Api>>>,
}

impl ApiAwareMockProvider {
    fn new(responses: Vec<MockResponse>) -> Self {
        Self {
            responses,
            call_count: Arc::new(Mutex::new(0)),
            last_api: Arc::new(Mutex::new(None)),
        }
    }
}

#[async_trait]
impl Provider for ApiAwareMockProvider {
    async fn stream(
        &self,
        model: &oxi_ai::Model,
        _context: &Context,
        _options: Option<oxi_ai::StreamOptions>,
    ) -> std::result::Result<
        std::pin::Pin<Box<dyn futures::Stream<Item = ProviderEvent> + Send>>,
        oxi_ai::ProviderError,
    > {
        let mut call_count = self.call_count.lock().unwrap();
        *call_count += 1;
        let idx = (*call_count - 1) % self.responses.len();
        let response = self.responses[idx].clone();

        *self.last_api.lock().unwrap() = Some(model.api);

        let stream = MockStream {
            text: response.content,
            done: false,
        };

        Ok(Box::pin(stream)
            as Pin<
                Box<dyn futures::Stream<Item = ProviderEvent> + Send>,
            >)
    }

    fn name(&self) -> &str {
        "mock-api-aware"
    }
}

#[tokio::test]
async fn test_cross_provider_handoff_openai_to_anthropic() {
    // Simulate a conversation that starts on OpenAI and switches to Anthropic
    // mid-conversation. We use an API-aware mock that doesn't require real keys.
    // The handoff is tested by verifying messages survive the switch.

    let provider = Arc::new(ApiAwareMockProvider::new(vec![
        MockResponse {
            content: "OpenAI response".to_string(),
        },
        MockResponse {
            content: "Continued response".to_string(),
        },
    ]));
    let config = AgentConfig::new("openai/gpt-4o");
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));

    // 1. Send a message and get a response (on OpenAI)
    let (response, _) = agent.run("Hello from OpenAI".to_string()).await.unwrap();
    assert_eq!(response.content, "OpenAI response");
    assert_eq!(agent.model_id(), "openai/gpt-4o");

    // 2. Verify we have the right message count
    let state = agent.state();
    assert_eq!(state.messages.len(), 2); // user + assistant

    // 3. Verify transform_for_provider works for the cross-provider case
    //    (this is what switch_model would call internally with a real provider)
    let transformed = transform_for_provider(
        &state.messages,
        &Api::OpenAiCompletions,
        &Api::AnthropicMessages,
    );
    assert_eq!(transformed.len(), 2); // all messages preserved

    // 4. Switch model (this fails to create the provider, but the message
    //    transformation logic was verified above)
    let result = agent.switch_model("anthropic/claude-sonnet-4-20250514");
    // The switch itself may fail due to missing API keys for the real provider,
    // but the model_id won't change since we guard the update atomically.
    // The key invariant: if the switch succeeds, messages are transformed.
    if result.is_ok() {
        assert_eq!(agent.model_id(), "anthropic/claude-sonnet-4-20250514");
    }
    // Regardless of switch result, messages should still be intact
    assert_eq!(agent.state().messages.len(), 2);
}

#[tokio::test]
async fn test_cross_provider_message_transformation_roundtrip() {
    // Build up a conversation with thinking blocks, then transform for different providers
    let provider = Arc::new(MockProvider::new(vec![
        MockResponse {
            content: "First response".to_string(),
        },
        MockResponse {
            content: "Second response".to_string(),
        },
    ]));
    let config = AgentConfig::new("anthropic/claude-sonnet-4-20250514");
    let agent = Agent::new(provider, config, Arc::new(ToolRegistry::new()));

    // Build up conversation
    agent.run("Message 1".to_string()).await.unwrap();
    agent.run("Message 2".to_string()).await.unwrap();
    assert_eq!(agent.state().messages.len(), 4);

    // Transform all messages for OpenAI (cross-provider)
    let messages = agent.state().messages.clone();
    let transformed =
        transform_for_provider(&messages, &Api::AnthropicMessages, &Api::OpenAiCompletions);

    // All messages should be preserved
    assert_eq!(transformed.len(), 4);

    // User messages should be unchanged
    assert!(matches!(&transformed[0], oxi_ai::Message::User(_)));
    assert!(matches!(&transformed[2], oxi_ai::Message::User(_)));

    // Assistant messages should have their API updated
    for msg in &transformed {
        if let oxi_ai::Message::Assistant(a) = msg {
            assert_eq!(a.api, Api::OpenAiCompletions);
            // No thinking blocks in transformed output for non-Anthropic targets
            for block in &a.content {
                assert!(!matches!(block, ContentBlock::Thinking(_)));
            }
        }
    }

    // Transform back to Anthropic (should be lossless for text-only content)
    let back = transform_for_provider(
        &transformed,
        &Api::OpenAiCompletions,
        &Api::AnthropicMessages,
    );
    assert_eq!(back.len(), 4);
}

// ── New integration tests ──────────────────────────────────────────────

/// Provider that returns tool calls on the first call and a text
/// response on the second call, simulating a multi-turn tool-use loop.
struct MultiTurnToolProvider {
    responses: Vec<MultiTurnToolResponse>,
    call_count: Arc<Mutex<usize>>,
}

#[derive(Clone)]
struct MultiTurnToolResponse {
    text: Option<String>,
    tool_calls: Vec<oxi_ai::ToolCall>,
}

impl MultiTurnToolProvider {
    fn new(responses: Vec<MultiTurnToolResponse>) -> Self {
        Self {
            responses,
            call_count: Arc::new(Mutex::new(0)),
        }
    }
}

#[async_trait]
impl Provider for MultiTurnToolProvider {
    async fn stream(
        &self,
        _model: &oxi_ai::Model,
        _context: &Context,
        _options: Option<oxi_ai::StreamOptions>,
    ) -> std::result::Result<
        Pin<Box<dyn futures::Stream<Item = ProviderEvent> + Send>>,
        oxi_ai::ProviderError,
    > {
        let mut call_count = self.call_count.lock().unwrap();
        *call_count += 1;
        let idx = (*call_count - 1).min(self.responses.len() - 1);
        let response = self.responses[idx].clone();

        let mut assistant =
            oxi_ai::AssistantMessage::new(oxi_ai::Api::AnthropicMessages, "mock", "mock-model");

        let mut content_blocks: Vec<ContentBlock> = Vec::new();
        if let Some(text) = &response.text {
            content_blocks.push(ContentBlock::Text(TextContent::new(text.clone())));
        }
        for tc in &response.tool_calls {
            content_blocks.push(ContentBlock::ToolCall(tc.clone()));
        }
        assistant.content = content_blocks;

        let stop_reason = if response.tool_calls.is_empty() {
            StopReason::Stop
        } else {
            StopReason::ToolUse
        };
        assistant.stop_reason = stop_reason;

        let events: Vec<ProviderEvent> = vec![
            ProviderEvent::Start {
                partial: assistant.clone(),
            },
            ProviderEvent::Done {
                reason: stop_reason,
                message: assistant,
            },
        ];

        Ok(Box::pin(futures::stream::iter(events)))
    }

    fn name(&self) -> &str {
        "multi-turn-tool"
    }
}

/// A simple tool that echoes its arguments back.
struct EchoTool;

#[async_trait]
impl crate::tools::AgentTool for EchoTool {
    fn name(&self) -> &str {
        "echo"
    }

    fn label(&self) -> &str {
        "Echo Tool"
    }

    fn description(&self) -> &str {
        "Echoes back the input arguments"
    }

    fn parameters_schema(&self) -> serde_json::Value {
        serde_json::json!({
            "type": "object",
            "properties": {
                "message": { "type": "string", "description": "Message to echo" }
            },
            "required": ["message"]
        })
    }

    async fn execute(
        &self,
        _tool_call_id: &str,
        params: serde_json::Value,
        _signal: Option<tokio::sync::oneshot::Receiver<()>>,
        _ctx: &crate::tools::ToolContext,
    ) -> std::result::Result<crate::tools::AgentToolResult, String> {
        let msg = params
            .get("message")
            .and_then(|v| v.as_str())
            .unwrap_or("<no message>");
        Ok(crate::tools::AgentToolResult::success(format!(
            "Echo: {}",
            msg
        )))
    }
}

/// Provider that fails the first N calls then succeeds.
struct RetryableProvider {
    fail_count: usize,
    success_response: String,
    call_count: Arc<Mutex<usize>>,
}

impl RetryableProvider {
    fn new(fail_count: usize, success_response: String) -> Self {
        Self {
            fail_count,
            success_response,
            call_count: Arc::new(Mutex::new(0)),
        }
    }
}

#[async_trait]
impl Provider for RetryableProvider {
    async fn stream(
        &self,
        _model: &oxi_ai::Model,
        _context: &Context,
        _options: Option<oxi_ai::StreamOptions>,
    ) -> std::result::Result<
        Pin<Box<dyn futures::Stream<Item = ProviderEvent> + Send>>,
        oxi_ai::ProviderError,
    > {
        let mut call_count = self.call_count.lock().unwrap();
        *call_count += 1;

        if *call_count <= self.fail_count {
            return Err(oxi_ai::ProviderError::HttpError(
                429,
                "rate limited".to_string(),
            ));
        }

        let mut assistant =
            oxi_ai::AssistantMessage::new(oxi_ai::Api::AnthropicMessages, "mock", "mock-model");
        assistant.content = vec![ContentBlock::Text(TextContent::new(
            self.success_response.clone(),
        ))];

        let stream = MockStream {
            text: self.success_response.clone(),
            done: false,
        };

        Ok(Box::pin(stream)
            as Pin<
                Box<dyn futures::Stream<Item = ProviderEvent> + Send>,
            >)
    }

    fn name(&self) -> &str {
        "retryable"
    }
}

/// Provider that always returns a provider-level error (non-retryable).
struct AlwaysErrorProvider;

#[async_trait]
impl Provider for AlwaysErrorProvider {
    async fn stream(
        &self,
        _model: &oxi_ai::Model,
        _context: &Context,
        _options: Option<oxi_ai::StreamOptions>,
    ) -> std::result::Result<
        Pin<Box<dyn futures::Stream<Item = ProviderEvent> + Send>>,
        oxi_ai::ProviderError,
    > {
        Err(oxi_ai::ProviderError::StreamError(
            "permanent error".to_string(),
        ))
    }

    fn name(&self) -> &str {
        "always-error"
    }
}

// ── Test 1: Multi-turn tool use loop ──────────────────────────────────

#[tokio::test]
async fn test_multi_turn_tool_use_loop() {
    // Simulate: user asks → LLM calls echo tool → tool result fed back → LLM responds
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    // First call: LLM wants to call the echo tool; Second call: LLM gives final answer
    let provider = Arc::new(MultiTurnToolProvider::new(vec![
        MultiTurnToolResponse {
            text: None,
            tool_calls: vec![oxi_ai::ToolCall::new(
                "call_1",
                "echo",
                serde_json::json!({"message": "hello world"}),
            )],
        },
        MultiTurnToolResponse {
            text: Some("The echo tool returned: Echo: hello world".to_string()),
            tool_calls: vec![],
        },
    ]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    tools.register(EchoTool);
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    let events = Arc::new(Mutex::new(Vec::new()));
    let events_clone = events.clone();
    let result = agent_loop
        .run("Echo hello world".to_string(), move |e| {
            events_clone.lock().unwrap().push(e)
        })
        .await;

    assert!(result.is_ok());
    let events = events.lock().unwrap();

    // Should have two turns
    let turn_starts = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::TurnStart { .. }))
        .count();
    assert_eq!(turn_starts, 2);

    // Should have tool execution start and end events
    let tool_starts = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::ToolExecutionStart { .. }))
        .count();
    assert_eq!(tool_starts, 1);

    let tool_ends = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::ToolExecutionEnd { .. }))
        .count();
    assert_eq!(tool_ends, 1);

    // Verify the tool result content
    let tool_end_event = events
        .iter()
        .find(|e| matches!(e, AgentEvent::ToolExecutionEnd { .. }));
    if let Some(AgentEvent::ToolExecutionEnd { result, .. }) = tool_end_event {
        assert_eq!(result.content, "Echo: hello world");
        assert_eq!(result.status, "success");
    }

    // Should complete with an AgentEnd event
    assert!(events
        .iter()
        .any(|e| matches!(e, AgentEvent::AgentEnd { .. })));
}

// ── Test 2: Compaction flow integration ───────────────────────────────

#[test]
fn test_compaction_event_triggers_and_completes() {
    // Verify compaction event lifecycle: Triggered → Started → Completed/Failed
    let triggered = crate::compaction::CompactionEvent::Triggered {
        context_tokens: 50000,
        iteration: 3,
    };
    let started = crate::compaction::CompactionEvent::Started { message_count: 20 };
    let completed = crate::compaction::CompactionEvent::Completed {
        result: crate::compaction::CompactedContext {
            summary: "Summary of conversation".to_string(),
            kept_messages: vec![],
            compacted_count: 15,
        },
        duration_ms: 250,
    };

    // Verify serialization round-trip (events are serialized in real use)
    let triggered_json = serde_json::to_string(&triggered).unwrap();
    assert!(triggered_json.contains("Triggered"));

    let started_json = serde_json::to_string(&started).unwrap();
    assert!(started_json.contains("Started"));

    let completed_json = serde_json::to_string(&completed).unwrap();
    assert!(completed_json.contains("Completed"));
}

#[test]
fn test_compacted_context_fields() {
    let ctx = crate::compaction::CompactedContext {
        summary: "User discussed Rust".to_string(),
        kept_messages: vec![],
        compacted_count: 10,
    };
    assert_eq!(ctx.summary, "User discussed Rust");
    assert_eq!(ctx.compacted_count, 10);
    assert!(ctx.kept_messages.is_empty());
}

#[tokio::test]
async fn test_agent_state_replace_messages_for_compaction() {
    let shared = crate::state::SharedState::new();
    shared.update(|s| {
        s.add_user_message("Long conversation part 1".to_string());
        s.add_assistant_message("Response 1".to_string());
        s.add_user_message("Long conversation part 2".to_string());
        s.add_assistant_message("Response 2".to_string());
    });

    assert_eq!(shared.get_state().messages.len(), 4);

    // Simulate compaction: replace with a summary message + last exchange
    let compacted_messages = vec![
        oxi_ai::Message::User(oxi_ai::UserMessage::new(
            "[Summary of previous conversation]".to_string(),
        )),
        oxi_ai::Message::User(oxi_ai::UserMessage::new(
            "Long conversation part 2".to_string(),
        )),
    ];

    shared.update(|s| {
        s.replace_messages(compacted_messages);
    });

    let state = shared.get_state();
    assert_eq!(state.messages.len(), 2);
}

#[tokio::test]
async fn test_compaction_strategy_config() {
    // Verify compaction strategy can be set on the agent config
    let config = crate::config::AgentConfig::new("anthropic/claude-sonnet-4-20250514")
        .with_compaction_strategy(oxi_ai::CompactionStrategy::EveryNTurns(5));

    assert!(matches!(
        config.compaction_strategy,
        oxi_ai::CompactionStrategy::EveryNTurns(5)
    ));
}

// ── Test 3: Cross-provider model switching with active tool use ──────

#[tokio::test]
async fn test_cross_provider_switch_preserves_tool_results() {
    // Build a conversation that includes tool results, then verify
    // transformation preserves them across provider switch
    let mut state = AgentState::new();
    state.add_user_message("What is the weather?".to_string());
    state.add_assistant_message("Let me check the weather.".to_string());
    state.add_tool_result("call_1".to_string(), "Sunny, 72°F".to_string());
    state.add_assistant_message("The weather is sunny, 72°F.".to_string());

    assert_eq!(state.messages.len(), 4);

    // Verify tool result message is present
    let tool_result_msg = &state.messages[2];
    assert!(matches!(tool_result_msg, oxi_ai::Message::ToolResult(_)));

    if let oxi_ai::Message::ToolResult(tr) = tool_result_msg {
        assert_eq!(tr.tool_call_id, "call_1");
    }

    // Transform for OpenAI and back — tool results should survive
    let messages = state.messages.clone();
    let to_openai =
        transform_for_provider(&messages, &Api::AnthropicMessages, &Api::OpenAiCompletions);
    assert_eq!(to_openai.len(), 4);

    // Tool result should still be there
    assert!(matches!(&to_openai[2], oxi_ai::Message::ToolResult(_)));
}

#[tokio::test]
async fn test_cross_provider_switch_with_tool_call_blocks() {
    // Create an assistant message that includes tool call content blocks
    let mut assistant = oxi_ai::AssistantMessage::new(
        Api::AnthropicMessages,
        "anthropic",
        "claude-sonnet-4-20250514",
    );
    assistant.content = vec![
        ContentBlock::Text(TextContent::new("I'll use the echo tool.")),
        ContentBlock::ToolCall(oxi_ai::ToolCall::new(
            "tc_123",
            "echo",
            serde_json::json!({"message": "test"}),
        )),
    ];

    let messages = vec![
        oxi_ai::Message::User(oxi_ai::UserMessage::new("Echo test")),
        oxi_ai::Message::Assistant(assistant),
    ];

    // Transform for OpenAI
    let transformed =
        transform_for_provider(&messages, &Api::AnthropicMessages, &Api::OpenAiCompletions);

    // Should preserve both messages
    assert_eq!(transformed.len(), 2);

    // Tool call blocks should survive in the assistant message
    if let oxi_ai::Message::Assistant(a) = &transformed[1] {
        let has_tool_call = a
            .content
            .iter()
            .any(|b| matches!(b, ContentBlock::ToolCall(_)));
        assert!(
            has_tool_call,
            "Assistant message should still contain a tool call block"
        );
    }
}

// ── Test 4: Error recovery scenarios ─────────────────────────────────

#[test]
fn test_circuit_breaker_recovery_cycle() {
    use crate::recovery::{CircuitBreaker, CircuitBreakerConfig};

    let config = CircuitBreakerConfig {
        failure_threshold: 3,
        open_duration: std::time::Duration::from_millis(100),
        half_open_successes: 1,
    };
    let cb = CircuitBreaker::new(config);

    // Initially allows requests
    assert!(cb.allow_request().is_ok());

    // Record failures up to threshold
    cb.record_failure();
    cb.record_failure();
    assert!(cb.allow_request().is_ok()); // Still below threshold
    cb.record_failure(); // Hits threshold
    assert!(cb.allow_request().is_err()); // Circuit is now open

    // Wait for open_duration to expire
    std::thread::sleep(std::time::Duration::from_millis(150));

    // Should now be in half-open state and allow request
    assert!(cb.allow_request().is_ok());

    // Record success → circuit should close
    cb.record_success();
    assert!(cb.allow_request().is_ok());
}

#[test]
fn test_partial_response_accumulator() {
    use crate::recovery::PartialResponse;

    let mut pr = PartialResponse::new();
    assert!(pr.is_empty());

    pr.push_text("Hello ");
    pr.push_text("world");
    pr.push_thinking("Let me think...");

    assert_eq!(pr.text(), "Hello world");
    assert_eq!(pr.thinking(), "Let me think...");
    assert!(pr.has_thinking());
    assert!(!pr.is_empty());

    // take_text drains the text
    let text = pr.take_text();
    assert_eq!(text, "Hello world");
    assert!(pr.text().is_empty());

    // clear resets everything
    pr.clear();
    assert!(pr.is_empty());
    assert!(!pr.has_thinking());
}

#[test]
fn test_fallback_chain() {
    use crate::recovery::FallbackChain;

    // Create using from_ids which returns Result<Self, FallbackChainError>
    let chain = FallbackChain::from_ids(&["openai/gpt-4o", "anthropic/claude-3-5-haiku-20241022"])
        .expect("valid model IDs");

    // Check first and last
    assert_eq!(chain.first().expect("has first").id, "gpt-4o");
    assert_eq!(
        chain.last().expect("has last").id,
        "claude-3-5-haiku-20241022"
    );

    // Check names
    assert_eq!(
        chain.names(),
        &["openai/gpt-4o", "anthropic/claude-3-5-haiku-20241022"]
    );
    assert!(!chain.is_empty());

    // Empty chain
    let empty = FallbackChain::new(vec![]);
    assert!(empty.is_empty());
    assert_eq!(empty.first(), None);
}

#[test]
fn test_agent_error_retryable() {
    use crate::error::AgentError;

    let rate_limited = AgentError::RateLimited {
        retry_after_secs: 30,
    };
    assert!(rate_limited.is_retryable());

    let stream_err = AgentError::Stream("connection reset".to_string());
    assert!(stream_err.is_retryable());

    let tool_err = AgentError::Tool {
        tool_name: "echo".to_string(),
        message: "failed".to_string(),
    };
    assert!(!tool_err.is_retryable());

    let config_err = AgentError::Config("bad config".to_string());
    assert!(!config_err.is_retryable());
}

#[test]
fn test_agent_error_user_friendly_messages() {
    use crate::error::AgentError;

    let errors = vec![
        AgentError::RateLimited {
            retry_after_secs: 10,
        },
        AgentError::MaxIterations { iterations: 50 },
        AgentError::FallbackFailed {
            primary_model: "anthropic/claude-sonnet-4-20250514".to_string(),
            primary_error: "timeout".to_string(),
            fallback_model: "openai/gpt-4o-mini".to_string(),
            fallback_error: "also timeout".to_string(),
        },
    ];

    for err in &errors {
        let msg = err.user_friendly();
        assert!(
            !msg.is_empty(),
            "user_friendly() should not be empty for {:?}",
            err
        );
    }
}

// ── Test 5: Steering messages injected mid-loop ───────────────────────

#[tokio::test]
async fn test_steering_messages_injected_into_loop() {
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MultiTurnToolProvider::new(vec![
        // Turn 1: initial response
        MultiTurnToolResponse {
            text: Some("Initial response".to_string()),
            tool_calls: vec![],
        },
        // Turn 2: response after steering message
        MultiTurnToolResponse {
            text: Some("Response after steering".to_string()),
            tool_calls: vec![],
        },
    ]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Inject a steering message before running
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Please be more concise",
    )));

    let events = Arc::new(Mutex::new(Vec::new()));
    let events_clone = events.clone();
    let result = agent_loop
        .run("Hello".to_string(), move |e| {
            events_clone.lock().unwrap().push(e)
        })
        .await;

    assert!(result.is_ok());
    let events = events.lock().unwrap();

    // Should have SteeringMessage events
    let steering_count = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::SteeringMessage { .. }))
        .count();
    assert_eq!(steering_count, 1);

    // Should have MessageStart/MessageEnd for the steering message
    let msg_starts = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::MessageStart { .. }))
        .count();
    assert!(
        msg_starts >= 2,
        "Expected at least 2 MessageStart events (user + steering), got {}",
        msg_starts
    );
}

#[tokio::test]
async fn test_multiple_steering_messages() {
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "Response".to_string(),
    }]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Inject multiple steering messages
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer 1")));
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer 2")));
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer 3")));

    let events = Arc::new(Mutex::new(Vec::new()));
    let events_clone = events.clone();
    let result = agent_loop
        .run("Hello".to_string(), move |e| {
            events_clone.lock().unwrap().push(e)
        })
        .await;

    assert!(result.is_ok());
    let events = events.lock().unwrap();

    let steering_count = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::SteeringMessage { .. }))
        .count();
    assert_eq!(steering_count, 3);
}

// ── Test 6: Follow-up queue processing ───────────────────────────────

#[test]
fn test_follow_up_queue_api() {
    // Verify follow_up() and queue management work correctly
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "Response".to_string(),
    }]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Queue follow-ups
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Follow-up A",
    )));
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Follow-up B",
    )));

    // Clear them individually
    agent_loop.clear_follow_up_queue();

    // Add steering and clear all
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer")));
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Follow-up C",
    )));
    agent_loop.clear_all_queues();
}

#[tokio::test]
async fn test_follow_up_processed_in_tool_use_loop() {
    // Follow-ups are drained after the tool-use while loop finishes but before
    // the outer loop breaks. To trigger this path we need a multi-turn tool loop
    // that does NOT hit should_stop_after_turn on the first iteration.
    // We use a tool call first, then a stop.
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MultiTurnToolProvider::new(vec![
        // Turn 1: LLM calls echo tool
        MultiTurnToolResponse {
            text: None,
            tool_calls: vec![oxi_ai::ToolCall::new(
                "call_1",
                "echo",
                serde_json::json!({"message": "hello"}),
            )],
        },
        // Turn 2: LLM responds after tool result
        MultiTurnToolResponse {
            text: Some("Done with tool".to_string()),
            tool_calls: vec![],
        },
        // Turn 3: LLM responds to follow-up
        MultiTurnToolResponse {
            text: Some("Follow-up handled".to_string()),
            tool_calls: vec![],
        },
    ]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    tools.register(EchoTool);
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Queue a follow-up before running.
    // The follow-up queue is drained after the tool-use while loop ends
    // but before the outer loop breaks. However, since should_stop_after_turn
    // returns true on StopReason::Stop, it exits in the inner while loop before
    // reaching the follow-up drain. We still test this to ensure the loop
    // completes successfully without panicking.
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Tell me more",
    )));

    let events = Arc::new(Mutex::new(Vec::new()));
    let events_clone = events.clone();
    let result = agent_loop
        .run("Hello".to_string(), move |e| {
            events_clone.lock().unwrap().push(e)
        })
        .await;

    assert!(result.is_ok());
    let events = events.lock().unwrap();

    // We expect 3 turns: tool call + response + follow-up
    // (Previously expected 2 when should_stop_after_turn checked StopReason::Stop.
    //  Now that check is removed, follow-ups are properly processed.)
    let turn_count = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::TurnStart { .. }))
        .count();
    assert_eq!(turn_count, 3);

    // Tool should have been called
    assert!(events
        .iter()
        .any(|e| matches!(e, AgentEvent::ToolExecutionStart { .. })));
}

#[tokio::test]
async fn test_follow_up_via_continue_loop() {
    // Use continue_loop after the initial run completes, simulating
    // how follow-ups would be processed in a real agent.
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MultiTurnToolProvider::new(vec![
        MultiTurnToolResponse {
            text: Some("Initial response".to_string()),
            tool_calls: vec![],
        },
        MultiTurnToolResponse {
            text: Some("Follow-up response".to_string()),
            tool_calls: vec![],
        },
    ]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Run initial message
    let events1 = Arc::new(Mutex::new(Vec::new()));
    let events1_clone = events1.clone();
    let result1 = agent_loop
        .run("Hello".to_string(), move |e| {
            events1_clone.lock().unwrap().push(e)
        })
        .await;
    assert!(result1.is_ok());

    // Now queue a follow-up and use steer to inject it
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Follow-up question",
    )));

    // continue_loop will pick up the steering message
    let events2 = Arc::new(Mutex::new(Vec::new()));
    let events2_clone = events2.clone();
    let result2 = agent_loop
        .continue_loop(move |e| events2_clone.lock().unwrap().push(e))
        .await;
    assert!(result2.is_ok());

    let events2 = events2.lock().unwrap();
    let steering_count = events2
        .iter()
        .filter(|e| matches!(e, AgentEvent::SteeringMessage { .. }))
        .count();
    assert_eq!(steering_count, 1);
    assert!(events2
        .iter()
        .any(|e| matches!(e, AgentEvent::TurnStart { .. })));
}

#[tokio::test]
async fn test_follow_up_queue_cleared() {
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "Response".to_string(),
    }]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Queue messages and then clear them
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Follow-up 1",
    )));
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new(
        "Follow-up 2",
    )));
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer 1")));
    agent_loop.clear_all_queues();

    // Run should only process the initial prompt, no extra turns
    let events = Arc::new(Mutex::new(Vec::new()));
    let events_clone = events.clone();
    let result = agent_loop
        .run("Hello".to_string(), move |e| {
            events_clone.lock().unwrap().push(e)
        })
        .await;

    assert!(result.is_ok());
    let events = events.lock().unwrap();

    // No steering events since queues were cleared
    let steering_count = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::SteeringMessage { .. }))
        .count();
    assert_eq!(steering_count, 0);

    // Only 1 turn (no follow-up processed)
    let turn_count = events
        .iter()
        .filter(|e| matches!(e, AgentEvent::TurnStart { .. }))
        .count();
    assert_eq!(turn_count, 1);
}

#[test]
fn test_follow_up_and_steering_queue_independent() {
    // Verify that steering and follow-up queues are independent
    use crate::agent_loop::{AgentLoop, AgentLoopConfig, ToolExecutionMode};
    use crate::state::SharedState;
    use crate::tools::ToolRegistry;
    use oxi_ai::CompactionStrategy;

    let provider = Arc::new(MockProvider::new(vec![MockResponse {
        content: "Response".to_string(),
    }]));

    let config = AgentLoopConfig {
        model_id: "anthropic/claude-sonnet-4-20250514".to_string(),
        system_prompt: None,
        temperature: 0.7,
        max_tokens: 4096,
        max_iterations: 10,
        tool_execution: ToolExecutionMode::Sequential,
        compaction_strategy: CompactionStrategy::Disabled,
        context_window: 100_000,
        compaction_instruction: None,
        session_id: None,
        transport: None,
        compact_on_start: false,
        max_retry_delay_ms: None,
        auto_retry_enabled: false,
        auto_retry_max_attempts: 3,
        auto_retry_base_delay_ms: 2000,
        api_key: None,
        workspace_dir: None,
    };

    let tools = Arc::new(ToolRegistry::new());
    let state = SharedState::new();
    let agent_loop = AgentLoop::new(provider, config, tools, state);

    // Add to both queues
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer 1")));
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new("Follow 1")));

    // Clear only follow-up — steering should remain
    agent_loop.clear_follow_up_queue();

    // Add more to both
    agent_loop.steer(oxi_ai::Message::User(oxi_ai::UserMessage::new("Steer 2")));
    agent_loop.follow_up(oxi_ai::Message::User(oxi_ai::UserMessage::new("Follow 2")));

    // Clear only steering — follow-up should remain
    agent_loop.clear_steering_queue();

    // Clear all to clean up
    agent_loop.clear_all_queues();
}

#[test]
fn test_agent_state_follow_up_tracking() {
    // Verify state can track multiple rounds of interaction
    let mut state = crate::state::AgentState::new();

    // Simulate: user → assistant → tool result → assistant
    state.add_user_message("What is 2+2?".to_string());
    state.add_assistant_message("Let me calculate.".to_string());
    state.add_tool_result("call_1".to_string(), "4".to_string());
    state.add_assistant_message("The answer is 4.".to_string());

    assert_eq!(state.messages.len(), 4);
    assert_eq!(state.tool_results.len(), 1);
    assert_eq!(state.tool_results[0].content, "4");
    assert!(!state.tool_results[0].is_error);

    // Simulate follow-up question
    state.add_user_message("And 3+3?".to_string());
    state.add_assistant_message("That's 6.".to_string());

    assert_eq!(state.messages.len(), 6);
    assert_eq!(state.iteration, 0); // Not incremented manually
    state.increment_iteration();
    assert_eq!(state.iteration, 1);
}