hyperforge 3.3.0

Multi-forge repository management
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
use async_trait::async_trait;
use async_stream::stream;
use futures::Stream;
use serde_json::Value;
use std::collections::HashSet;
use std::path::PathBuf;
use std::sync::Arc;

use hub_core::plexus::{
    Activation, ChildRouter, PlexusStream, PlexusError,
    ChildSummary,
};
use hub_macro::hub_methods;

use crate::bridge::{GitRemoteBridge, KeychainBridge};
use crate::storage::{HyperforgePaths, OrgStorage, GlobalConfig, OrgConfig};
use crate::events::{ConvergeResult, DiffStatus, PulumiEvent};
use crate::types::{RepoSummary, RepoConfig, Visibility, Forge};

use super::events::{
    RepoListEvent, RepoCreateEvent, RepoAdoptEvent, RepoSyncEvent,
    RepoRemoveEvent, RepoRefreshEvent, RepoDiffEvent, RepoConvergeEvent,
    RepoCloneEvent,
};

use super::RepoChildRouter;

/// Repository info discovered from a forge API
struct ForgeRepo {
    name: String,
    #[allow(dead_code)]
    url: String,
}

/// Query forge API for list of repositories
async fn query_forge_repos(
    forge: &Forge,
    owner: &str,
    token: &str,
) -> Result<Vec<ForgeRepo>, String> {
    let client = reqwest::Client::new();

    match forge {
        Forge::GitHub => {
            let url = format!("https://api.github.com/users/{}/repos?per_page=100", owner);
            let response = client
                .get(&url)
                .header("Authorization", format!("Bearer {}", token))
                .header("User-Agent", "hyperforge")
                .header("Accept", "application/vnd.github+json")
                .send()
                .await
                .map_err(|e| e.to_string())?;

            if !response.status().is_success() {
                return Err(format!("API returned {}", response.status()));
            }

            let repos: Vec<serde_json::Value> = response
                .json()
                .await
                .map_err(|e| e.to_string())?;

            Ok(repos.iter().filter_map(|r| {
                Some(ForgeRepo {
                    name: r.get("name")?.as_str()?.to_string(),
                    url: r.get("html_url")?.as_str()?.to_string(),
                })
            }).collect())
        }
        Forge::Codeberg => {
            let url = format!("https://codeberg.org/api/v1/users/{}/repos", owner);
            let response = client
                .get(&url)
                .header("Authorization", format!("token {}", token))
                .send()
                .await
                .map_err(|e| e.to_string())?;

            if !response.status().is_success() {
                return Err(format!("API returned {}", response.status()));
            }

            let repos: Vec<serde_json::Value> = response
                .json()
                .await
                .map_err(|e| e.to_string())?;

            Ok(repos.iter().filter_map(|r| {
                Some(ForgeRepo {
                    name: r.get("name")?.as_str()?.to_string(),
                    url: r.get("html_url")?.as_str()?.to_string(),
                })
            }).collect())
        }
        Forge::GitLab => {
            Err("GitLab refresh not yet implemented".into())
        }
    }
}

pub struct ReposActivation {
    paths: Arc<HyperforgePaths>,
    org_name: String,
    /// Organization configuration passed from parent - avoids reloading from disk
    org_config: OrgConfig,
}

impl ReposActivation {
    pub fn new(paths: Arc<HyperforgePaths>, org_name: String, org_config: OrgConfig) -> Self {
        Self { paths, org_name, org_config }
    }

    fn storage(&self) -> OrgStorage {
        OrgStorage::new((*self.paths).clone(), self.org_name.clone())
    }
}

#[hub_methods(
    namespace = "repos",
    version = "1.0.0",
    description = "Repository management",
    crate_path = "hub_core",
    hub
)]
impl ReposActivation {
    /// List repositories in this organization
    #[hub_method(
        description = "List repositories",
        params(staged = "Show staged repos instead of committed")
    )]
    pub async fn list(&self, staged: Option<bool>) -> impl Stream<Item = RepoListEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let show_staged = staged.unwrap_or(false);

        stream! {
            let config = if show_staged {
                storage.load_staged().await
            } else {
                storage.load_repos().await
            };

            match config {
                Ok(repos_config) => {
                    let repos: Vec<RepoSummary> = repos_config.repos
                        .iter()
                        .filter(|(_, cfg)| !cfg.delete)
                        .map(|(name, cfg)| RepoSummary {
                            name: name.clone(),
                            visibility: cfg.visibility.unwrap_or_default(),
                            forges: cfg.forges.clone().unwrap_or_default(),
                            synced: !show_staged,
                        })
                        .collect();

                    yield RepoListEvent::Listed {
                        org_name,
                        repos,
                        staged: show_staged,
                    };
                }
                Err(e) => {
                    yield RepoListEvent::Error {
                        org_name,
                        repo_name: None,
                        message: e.to_string(),
                    };
                }
            }
        }
    }

    /// Create/update a repository configuration
    #[hub_method(
        description = "Create or update a repository",
        params(
            repo_name = "Repository name",
            description = "Repository description",
            visibility = "public or private",
            forges = "Comma-separated forge list",
            init_local = "Initialize local git repo with .gitignore",
            path = "Local path for init_local (defaults to workspace path)"
        )
    )]
    pub async fn create(
        &self,
        repo_name: String,
        description: Option<String>,
        visibility: Option<String>,
        forges: Option<String>,
        init_local: Option<bool>,
        path: Option<String>,
    ) -> impl Stream<Item = RepoCreateEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();
        let paths = self.paths.clone();
        let should_init = init_local.unwrap_or(false);
        let custom_path = path;

        stream! {
            // Parse visibility
            let vis = match visibility.as_deref() {
                Some("private") => Some(Visibility::Private),
                Some("public") => Some(Visibility::Public),
                None => None,
                Some(v) => {
                    yield RepoCreateEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Invalid visibility: {}", v),
                    };
                    return;
                }
            };

            // Parse forges
            let forge_list: Option<Vec<Forge>> = match forges {
                Some(f) => {
                    let parsed: Result<Vec<Forge>, _> = f
                        .split(',')
                        .map(|s| s.trim().parse())
                        .collect();

                    match parsed {
                        Ok(list) => Some(list),
                        Err(e) => {
                            yield RepoCreateEvent::Error {
                                org_name: org_name.clone(),
                                repo_name: Some(repo_name.clone()),
                                message: e,
                            };
                            return;
                        }
                    }
                }
                None => {
                    // Use org defaults from parent-injected config
                    Some(org_config.forges.all_forges())
                }
            };

            let config = RepoConfig {
                description: description.clone(),
                visibility: vis,
                forges: forge_list.clone(),
                protected: false,
                delete: false,
                synced: None,
                discovered: None,
                packages: vec![],
                build: None,
            };

            match storage.stage_repo(repo_name.clone(), config).await {
                Ok(()) => {
                    yield RepoCreateEvent::Staged {
                        org_name: org_name.clone(),
                        repo_name: repo_name.clone(),
                    };
                }
                Err(e) => {
                    yield RepoCreateEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: e.to_string(),
                    };
                    return;
                }
            }

            // Initialize local repo if requested
            if should_init {
                // Determine the local path
                let local_path = if let Some(p) = custom_path {
                    PathBuf::from(p).join(&repo_name)
                } else {
                    // Find workspace path for this org
                    let global_config = match GlobalConfig::load(&paths).await {
                        Ok(cfg) => cfg,
                        Err(e) => {
                            yield RepoCreateEvent::Error {
                                org_name: org_name.clone(),
                                repo_name: Some(repo_name.clone()),
                                message: format!("Failed to load config: {}", e),
                            };
                            return;
                        }
                    };

                    // Find first workspace bound to this org
                    let workspace_path = global_config.workspaces
                        .iter()
                        .find(|(_, org)| *org == &org_name)
                        .map(|(path, _)| path.clone());

                    match workspace_path {
                        Some(ws) => ws.join(&repo_name),
                        None => {
                            yield RepoCreateEvent::Error {
                                org_name: org_name.clone(),
                                repo_name: Some(repo_name.clone()),
                                message: "No workspace bound to this org. Use --path to specify location.".to_string(),
                            };
                            return;
                        }
                    }
                };

                // Check if directory already exists
                if local_path.exists() {
                    yield RepoCreateEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Directory already exists: {}", local_path.display()),
                    };
                    return;
                }

                // Create directory
                if let Err(e) = tokio::fs::create_dir_all(&local_path).await {
                    yield RepoCreateEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Failed to create directory: {}", e),
                    };
                    return;
                }

                // Run git init
                let git_init = tokio::process::Command::new("git")
                    .current_dir(&local_path)
                    .args(["init"])
                    .output()
                    .await;

                match git_init {
                    Ok(output) if output.status.success() => {
                        yield RepoCreateEvent::LocalInitialized {
                            org_name: org_name.clone(),
                            repo_name: repo_name.clone(),
                            path: local_path.clone(),
                        };
                    }
                    Ok(output) => {
                        let stderr = String::from_utf8_lossy(&output.stderr);
                        yield RepoCreateEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("git init failed: {}", stderr),
                        };
                        return;
                    }
                    Err(e) => {
                        yield RepoCreateEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("Failed to run git: {}", e),
                        };
                        return;
                    }
                }

                // Write .gitignore
                let gitignore_path = local_path.join(".gitignore");
                if let Err(e) = tokio::fs::write(&gitignore_path, crate::templates::DEFAULT_GITIGNORE).await {
                    yield RepoCreateEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Failed to write .gitignore: {}", e),
                    };
                    return;
                }

                yield RepoCreateEvent::GitignoreCreated {
                    org_name: org_name.clone(),
                    repo_name: repo_name.clone(),
                    path: gitignore_path,
                };

                // Set up hyperforge.org and core.sshCommand
                let git_bridge = GitRemoteBridge::new(
                    local_path.clone(),
                    org_name.clone(),
                    org_config.owner.clone(),
                );

                if let Err(e) = git_bridge.ensure_ssh_config().await {
                    yield RepoCreateEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Failed to configure SSH: {}", e),
                    };
                    // Non-fatal, continue
                }

                // Set up remotes for configured forges
                let forges_to_setup = forge_list.unwrap_or_else(|| org_config.forges.all_forges());
                match git_bridge.setup_forge_remotes(&forges_to_setup, &repo_name).await {
                    Ok(added) => {
                        for remote_info in added {
                            if let Some((name, url)) = remote_info.split_once('=') {
                                yield RepoCreateEvent::RemoteAdded {
                                    org_name: org_name.clone(),
                                    repo_name: repo_name.clone(),
                                    remote: name.to_string(),
                                    url: url.to_string(),
                                };
                            }
                        }
                    }
                    Err(e) => {
                        yield RepoCreateEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("Failed to setup remotes: {}", e),
                        };
                        // Non-fatal, continue
                    }
                }

                yield RepoCreateEvent::LocalSetupComplete {
                    org_name,
                    repo_name,
                    path: local_path,
                };
            }
        }
    }

    /// Adopt an existing directory as a hyperforge-managed repository
    #[hub_method(
        description = "Adopt an existing directory as a hyperforge repository",
        params(
            repo_name = "Repository name",
            path = "Path to the existing directory",
            git_init = "Initialize as git repository if not already one",
            scan_packages = "Automatically detect and configure packages",
            description = "Repository description",
            visibility = "Repository visibility: 'public' or 'private'",
            forges = "Comma-separated list of forges (e.g., 'github,codeberg')"
        )
    )]
    pub async fn adopt(
        &self,
        repo_name: String,
        path: String,
        git_init: Option<bool>,
        scan_packages: Option<bool>,
        description: Option<String>,
        visibility: Option<String>,
        forges: Option<String>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();
        let should_git_init = git_init.unwrap_or(false);
        let should_scan = scan_packages.unwrap_or(true);

        stream! {
            // Parse path
            let repo_path = PathBuf::from(&path);

            // Check if path exists
            if !repo_path.exists() {
                yield RepoEvent::Error {
                    org_name: org_name.clone(),
                    repo_name: Some(repo_name.clone()),
                    message: format!("Path does not exist: {}", path),
                };
                return;
            }

            if !repo_path.is_dir() {
                yield RepoEvent::Error {
                    org_name: org_name.clone(),
                    repo_name: Some(repo_name.clone()),
                    message: format!("Path is not a directory: {}", path),
                };
                return;
            }

            yield RepoEvent::AdoptStarted {
                org_name: org_name.clone(),
                repo_name: repo_name.clone(),
                path: repo_path.clone(),
            };

            let git_dir = repo_path.join(".git");
            let is_git_repo = git_dir.exists();

            // Initialize git if requested and not already a repo
            if should_git_init && !is_git_repo {
                use tokio::process::Command;

                let output = Command::new("git")
                    .arg("init")
                    .current_dir(&repo_path)
                    .output()
                    .await;

                match output {
                    Ok(out) if out.status.success() => {
                        yield RepoEvent::GitInitialized {
                            org_name: org_name.clone(),
                            repo_name: repo_name.clone(),
                            path: repo_path.clone(),
                        };
                    }
                    Ok(out) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("git init failed: {}", String::from_utf8_lossy(&out.stderr)),
                        };
                        return;
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("Failed to run git init: {}", e),
                        };
                        return;
                    }
                }
            }

            // Detect git remotes if it's a git repo
            let mut detected_forges = Vec::new();
            if is_git_repo || should_git_init {
                use tokio::process::Command;

                if let Ok(output) = Command::new("git")
                    .args(["remote", "-v"])
                    .current_dir(&repo_path)
                    .output()
                    .await
                {
                    if output.status.success() {
                        let remotes = String::from_utf8_lossy(&output.stdout);
                        for line in remotes.lines() {
                            if line.contains("github.com") && !detected_forges.contains(&Forge::GitHub) {
                                detected_forges.push(Forge::GitHub);
                            } else if line.contains("codeberg.org") && !detected_forges.contains(&Forge::Codeberg) {
                                detected_forges.push(Forge::Codeberg);
                            }
                        }

                        if !detected_forges.is_empty() {
                            yield RepoEvent::RemotesDetected {
                                org_name: org_name.clone(),
                                repo_name: repo_name.clone(),
                                forges: detected_forges.clone(),
                            };
                        }
                    }
                }
            }

            // Scan for packages if requested
            let mut packages = Vec::new();
            if should_scan {
                use crate::types::{PackageConfig, PackageType};

                // Check for Cargo.toml
                if repo_path.join("Cargo.toml").exists() {
                    if let Ok(content) = tokio::fs::read_to_string(repo_path.join("Cargo.toml")).await {
                        if let Ok(toml) = content.parse::<toml_edit::DocumentMut>() {
                            if let Some(name) = toml.get("package")
                                .and_then(|p: &toml_edit::Item| p.get("name"))
                                .and_then(|n: &toml_edit::Item| n.as_str())
                            {
                                packages.push(PackageConfig {
                                    name: name.to_string(),
                                    package_type: PackageType::Crate,
                                    path: PathBuf::from("."),
                                    registry: None,
                                    publish: true,
                                    publish_command: None,
                                });
                            }
                        }
                    }
                }

                // Check for package.json
                if repo_path.join("package.json").exists() {
                    if let Ok(content) = tokio::fs::read_to_string(repo_path.join("package.json")).await {
                        if let Ok(json) = serde_json::from_str::<serde_json::Value>(&content) {
                            if let Some(name) = json.get("name").and_then(|n| n.as_str()) {
                                packages.push(PackageConfig {
                                    name: name.to_string(),
                                    package_type: PackageType::Npm,
                                    path: PathBuf::from("."),
                                    registry: None,
                                    publish: true,
                                    publish_command: None,
                                });
                            }
                        }
                    }
                }

                // Check for mix.exs
                if repo_path.join("mix.exs").exists() {
                    if let Ok(content) = tokio::fs::read_to_string(repo_path.join("mix.exs")).await {
                        // Simple regex to extract app name
                        if let Ok(re) = regex::Regex::new(r#"app:\s*:(\w+)"#) {
                            if let Some(caps) = re.captures(&content) {
                                if let Some(name) = caps.get(1) {
                                    packages.push(PackageConfig {
                                        name: name.as_str().to_string(),
                                        package_type: PackageType::Hex,
                                        path: PathBuf::from("."),
                                        registry: None,
                                        publish: true,
                                        publish_command: None,
                                    });
                                }
                            }
                        }
                    }
                }

                // Check for pyproject.toml or setup.py
                let has_pyproject = repo_path.join("pyproject.toml").exists();
                let has_setup_py = repo_path.join("setup.py").exists();

                if has_pyproject {
                    if let Ok(content) = tokio::fs::read_to_string(repo_path.join("pyproject.toml")).await {
                        if let Ok(toml) = content.parse::<toml_edit::DocumentMut>() {
                            let name = toml.get("project")
                                .and_then(|p: &toml_edit::Item| p.get("name"))
                                .and_then(|n: &toml_edit::Item| n.as_str())
                                .or_else(|| {
                                    toml.get("tool")
                                        .and_then(|t: &toml_edit::Item| t.get("poetry"))
                                        .and_then(|p: &toml_edit::Item| p.get("name"))
                                        .and_then(|n: &toml_edit::Item| n.as_str())
                                });

                            if let Some(n) = name {
                                packages.push(PackageConfig {
                                    name: n.to_string(),
                                    package_type: PackageType::PyPi,
                                    path: PathBuf::from("."),
                                    registry: None,
                                    publish: true,
                                    publish_command: None,
                                });
                            }
                        }
                    }
                } else if has_setup_py {
                    if let Ok(content) = tokio::fs::read_to_string(repo_path.join("setup.py")).await {
                        if let Ok(re) = regex::Regex::new(r#"name\s*=\s*["']([^"']+)["']"#) {
                            if let Some(caps) = re.captures(&content) {
                                if let Some(name) = caps.get(1) {
                                    packages.push(PackageConfig {
                                        name: name.as_str().to_string(),
                                        package_type: PackageType::PyPi,
                                        path: PathBuf::from("."),
                                        registry: None,
                                        publish: true,
                                        publish_command: None,
                                    });
                                }
                            }
                        }
                    }
                }

                if !packages.is_empty() {
                    yield RepoEvent::PackagesDetected {
                        org_name: org_name.clone(),
                        repo_name: repo_name.clone(),
                        packages: packages.clone(),
                    };
                }
            }

            // Parse visibility
            let vis = match visibility.as_deref() {
                Some("private") => Some(Visibility::Private),
                Some("public") => Some(Visibility::Public),
                None => None,
                Some(v) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Invalid visibility: {}", v),
                    };
                    return;
                }
            };

            // Parse forges - use detected if not specified
            let forge_list: Option<Vec<Forge>> = match forges {
                Some(f) => {
                    let parsed: Result<Vec<Forge>, _> = f
                        .split(',')
                        .map(|s| s.trim().parse())
                        .collect();

                    match parsed {
                        Ok(list) => Some(list),
                        Err(e) => {
                            yield RepoEvent::Error {
                                org_name: org_name.clone(),
                                repo_name: Some(repo_name.clone()),
                                message: e,
                            };
                            return;
                        }
                    }
                }
                None if !detected_forges.is_empty() => {
                    Some(detected_forges)
                }
                None => {
                    // Use org defaults
                    Some(org_config.forges.all_forges())
                }
            };

            // Create repo config
            let config = RepoConfig {
                description: description.clone(),
                visibility: vis,
                forges: forge_list,
                protected: false,
                delete: false,
                synced: None,
                discovered: None,
                packages,
                build: None,
            };

            // Stage the repo
            match storage.stage_repo(repo_name.clone(), config).await {
                Ok(()) => {
                    yield RepoEvent::AdoptComplete {
                        org_name: org_name.clone(),
                        repo_name: repo_name.clone(),
                        path: repo_path,
                    };
                }
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Failed to adopt repo: {}", e),
                    };
                }
            }
        }
    }

    /// Sync repositories to forges
    #[hub_method(
        description = "Sync repositories to forges via Pulumi",
        params(
            repo_name = "Specific repo to sync (optional, syncs all if omitted)",
            dry_run = "Preview changes without applying",
            yes = "Skip confirmation prompts"
        )
    )]
    pub async fn sync(
        &self,
        repo_name: Option<String>,
        dry_run: Option<bool>,
        yes: Option<bool>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();
        let paths = self.paths.clone();
        let is_dry_run = dry_run.unwrap_or(false);
        let auto_yes = yes.unwrap_or(false);
        let target_repo = repo_name;

        stream! {
            // Load global config for workspace bindings (org config comes from parent)
            let global_config = match GlobalConfig::load(&paths).await {
                Ok(cfg) => cfg,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: format!("Failed to load config: {}", e),
                    };
                    return;
                }
            };

            // Merge staged into committed
            let repos_config = match storage.merge_staged().await {
                Ok(cfg) => cfg,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: e.to_string(),
                    };
                    return;
                }
            };

            // Filter repos if target specified
            let repos_to_sync: Vec<_> = repos_config.repos
                .iter()
                .filter(|(name, _)| {
                    match &target_repo {
                        Some(target) => name.as_str() == target.as_str(),
                        None => true,
                    }
                })
                .collect();

            // Validate target exists if specified
            if let Some(ref target) = target_repo {
                if repos_to_sync.is_empty() {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(target.clone()),
                        message: format!("Repository not found: {}", target),
                    };
                    return;
                }
            }

            let repo_count = repos_to_sync.len();

            // Determine which forges should be synced vs skipped
            // Origin forge is always synced regardless of the sync flag
            let all_forges = org_config.forges.all_forges();
            let synced_forges = org_config.forges.synced_forges();
            let origin_forge = &org_config.origin;

            // Emit warnings for skipped forges (except origin which is always synced)
            for forge in &all_forges {
                if !synced_forges.contains(forge) && forge != origin_forge {
                    yield RepoEvent::ForgeSkipped {
                        org_name: org_name.clone(),
                        forge: forge.clone(),
                        reason: "sync: false in org config".to_string(),
                    };
                }
            }

            // Calculate effective synced forges (synced + origin)
            let mut effective_synced_forges: Vec<Forge> = synced_forges.clone();
            if !effective_synced_forges.contains(origin_forge) {
                effective_synced_forges.push(origin_forge.clone());
            }

            yield RepoEvent::SyncStarted {
                org_name: org_name.clone(),
                repo_count,
            };

            // Find workspace paths bound to this org
            let workspace_paths: Vec<PathBuf> = global_config.workspaces
                .iter()
                .filter(|(_, org)| *org == &org_name)
                .map(|(path, _)| path.clone())
                .collect();

            // Validate git remotes for each repo that exists locally
            for (repo_name, repo_config) in &repos_to_sync {
                if repo_config.delete {
                    continue;
                }

                // Find local repo path in any workspace
                let local_repo_path = workspace_paths
                    .iter()
                    .map(|ws| ws.join(repo_name))
                    .find(|path| path.join(".git").exists());

                if let Some(repo_path) = local_repo_path {
                    // Get forges for this repo (use repo-specific or org default)
                    let org_forges = org_config.forges.all_forges();
                    let forges = repo_config.forges.as_ref()
                        .unwrap_or(&org_forges);

                    let git_bridge = GitRemoteBridge::new(
                        repo_path,
                        org_name.clone(),
                        org_config.owner.clone(),
                    );

                    // Validate/setup remotes
                    match git_bridge.setup_forge_remotes(forges, repo_name).await {
                        Ok(added_remotes) => {
                            // Emit events for any remotes that were added
                            for remote_info in &added_remotes {
                                // Format is "name=url"
                                if let Some((name, url)) = remote_info.split_once('=') {
                                    yield RepoEvent::RemoteAdded {
                                        org_name: org_name.clone(),
                                        repo_name: repo_name.to_string(),
                                        remote: name.to_string(),
                                        url: url.to_string(),
                                    };
                                }
                            }

                            // Always emit validation event with all configured remotes
                            let all_remotes: Vec<String> = forges
                                .iter()
                                .map(|f| f.to_string())
                                .collect();

                            yield RepoEvent::RemotesValidated {
                                org_name: org_name.clone(),
                                repo_name: repo_name.to_string(),
                                remotes: all_remotes,
                            };
                        }
                        Err(e) => {
                            yield RepoEvent::Error {
                                org_name: org_name.clone(),
                                repo_name: Some(repo_name.to_string()),
                                message: format!("Failed to setup git remotes: {}", e),
                            };
                            // Continue with other repos even if one fails
                        }
                    }
                }
            }

            let repos_file = paths.repos_file(&org_name);
            let staged_file = paths.staged_repos_file(&org_name);

            let bridge = crate::bridge::PulumiBridge::new(&paths);

            // Select/create stack for this org
            if let Err(e) = bridge.select_stack(&org_name).await {
                yield RepoEvent::Error {
                    org_name: org_name.clone(),
                    repo_name: None,
                    message: format!("Failed to select Pulumi stack: {}", e),
                };
                return;
            }

            // Convert PulumiEvent to RepoEvent
            use futures::StreamExt;
            use std::pin::Pin;

            let mut pulumi_stream: Pin<Box<dyn Stream<Item = crate::events::PulumiEvent> + Send>> = if is_dry_run {
                Box::pin(bridge.preview(&org_name, &repos_file, &staged_file))
            } else {
                Box::pin(bridge.up(&org_name, &repos_file, &staged_file, auto_yes))
            };

            let mut up_success = false;

            while let Some(event) = pulumi_stream.next().await {
                match event {
                    crate::events::PulumiEvent::PreviewStarted { .. } |
                    crate::events::PulumiEvent::UpStarted { .. } => {
                        yield RepoEvent::SyncStarted {
                            org_name: org_name.clone(),
                            repo_count: 0, // Unknown at this point
                        };
                    }
                    crate::events::PulumiEvent::ResourcePlanned { resource_name, .. } |
                    crate::events::PulumiEvent::ResourceApplied { resource_name, .. } => {
                        yield RepoEvent::SyncProgress {
                            org_name: org_name.clone(),
                            repo_name: resource_name,
                            stage: "pulumi".into(),
                        };
                    }
                    crate::events::PulumiEvent::PreviewComplete { creates, .. } => {
                        yield RepoEvent::SyncComplete {
                            org_name: org_name.clone(),
                            success: true,
                            synced_count: creates,
                        };
                    }
                    crate::events::PulumiEvent::UpComplete { success, creates, .. } => {
                        up_success = success;
                        yield RepoEvent::SyncComplete {
                            org_name: org_name.clone(),
                            success,
                            synced_count: creates,
                        };
                    }
                    crate::events::PulumiEvent::Error { message } => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message,
                        };
                    }
                    _ => {}
                }
            }

            // Capture outputs after successful apply (not dry_run)
            if !is_dry_run && up_success {
                match bridge.get_outputs(&org_name).await {
                    Ok(outputs) => {
                        for (repo_name, repo_output) in outputs.repos {
                            if let Some(url) = repo_output.github_url.clone() {
                                // Persist to storage
                                let _ = storage.update_synced(
                                    &repo_name,
                                    Forge::GitHub,
                                    url.clone(),
                                    repo_output.github_id.clone(),
                                ).await;

                                yield RepoEvent::OutputsCaptured {
                                    org_name: org_name.clone(),
                                    repo_name: repo_name.clone(),
                                    forge: Forge::GitHub,
                                    url,
                                    id: repo_output.github_id,
                                };
                            }
                            if let Some(url) = repo_output.codeberg_url.clone() {
                                // Persist to storage
                                let _ = storage.update_synced(
                                    &repo_name,
                                    Forge::Codeberg,
                                    url.clone(),
                                    repo_output.codeberg_id.clone(),
                                ).await;

                                yield RepoEvent::OutputsCaptured {
                                    org_name: org_name.clone(),
                                    repo_name: repo_name.clone(),
                                    forge: Forge::Codeberg,
                                    url,
                                    id: repo_output.codeberg_id,
                                };
                            }
                        }
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: format!("Failed to capture outputs: {}", e),
                        };
                    }
                }
            }
        }
    }

    /// Mark a repository for deletion
    #[hub_method(
        description = "Remove a repository",
        params(
            repo_name = "Repository to remove",
            force = "Force removal of protected repos"
        )
    )]
    pub async fn remove(
        &self,
        repo_name: String,
        force: Option<bool>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let force_delete = force.unwrap_or(false);

        stream! {
            // Load repos to check protection status
            let repos = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: e.to_string(),
                    };
                    return;
                }
            };

            // Check if repo exists and is protected
            if let Some(config) = repos.repos.get(&repo_name) {
                if config.protected && !force_delete {
                    yield RepoEvent::ProtectionError {
                        org_name,
                        repo_name,
                        message: "Repository is protected. Use --force true to delete.".into(),
                    };
                    return;
                }
            }

            // Proceed with deletion
            match storage.stage_deletion(repo_name.clone()).await {
                Ok(()) => {
                    yield RepoEvent::MarkedForDeletion {
                        org_name,
                        repo_name,
                    };
                }
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name,
                        repo_name: Some(repo_name),
                        message: e.to_string(),
                    };
                }
            }
        }
    }

    /// Refresh local state from forge APIs
    #[hub_method(
        description = "Query forges and update local discovered state",
        params(
            force = "Refresh even if recently updated"
        )
    )]
    pub async fn refresh(
        &self,
        _force: Option<bool>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();
        let storage = self.storage();

        stream! {
            // Org config comes from parent - no need to reload

            yield RepoEvent::RefreshStarted {
                org_name: org_name.clone(),
                forges: org_config.forges.all_forges(),
            };

            // Track all discovered repo names across forges
            let mut discovered_repos: HashSet<String> = HashSet::new();

            // Query each forge
            for forge in org_config.forges.all_forges() {
                let keychain = KeychainBridge::new(&org_name);
                let token_key = match &forge {
                    Forge::GitHub => "github-token",
                    Forge::Codeberg => "codeberg-token",
                    Forge::GitLab => "gitlab-token",
                };

                let token = match keychain.get(token_key).await {
                    Ok(Some(t)) => t,
                    Ok(None) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: format!("No token configured for {}", forge),
                        };
                        continue;
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: e,
                        };
                        continue;
                    }
                };

                // Query forge API
                let repos = query_forge_repos(&forge, &org_config.owner, &token).await;

                match repos {
                    Ok(forge_repos) => {
                        yield RepoEvent::RefreshProgress {
                            org_name: org_name.clone(),
                            forge: forge.clone(),
                            repos_found: forge_repos.len(),
                        };

                        for repo in forge_repos {
                            discovered_repos.insert(repo.name);
                        }
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: format!("{} query failed: {}", forge, e),
                        };
                    }
                }
            }

            // Load current repos to calculate matched vs untracked
            let repos_config = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: e.to_string(),
                    };
                    return;
                }
            };

            let local_repo_names: HashSet<String> = repos_config.repos.keys().cloned().collect();

            let matched = discovered_repos.intersection(&local_repo_names).count();
            let untracked = discovered_repos.difference(&local_repo_names).count();

            yield RepoEvent::RefreshComplete {
                org_name,
                discovered: discovered_repos.len(),
                matched,
                untracked,
            };
        }
    }

    /// Compare local desired state vs remote actual state
    #[hub_method(
        description = "Show differences between local and remote state",
        params(
            refresh = "Refresh from forges before diffing"
        )
    )]
    pub async fn diff(
        &self,
        refresh: Option<bool>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();
        let should_refresh = refresh.unwrap_or(false);

        // If refresh is requested, we need to capture refresh events first
        // For simplicity, we just do the diff without inline refresh for now
        // (User can call refresh() first if they want fresh data)
        let _ = should_refresh; // TODO: implement inline refresh

        stream! {
            // Load repos config (committed)
            let mut repos = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: e.to_string(),
                    };
                    return;
                }
            };

            // Also include staged repos (pending changes)
            if let Ok(staged) = storage.load_staged().await {
                for (name, config) in staged.repos {
                    if config.delete {
                        // Mark for deletion in existing entry
                        if let Some(existing) = repos.repos.get_mut(&name) {
                            existing.delete = true;
                        }
                    } else {
                        // Add or replace with staged version
                        repos.repos.insert(name, config);
                    }
                }
            }

            // Org config comes from parent - no need to reload
            // Determine which forges should be synced vs skipped
            // Origin forge is always synced regardless of the sync flag
            let all_forges = org_config.forges.all_forges();
            let synced_forges_list = org_config.forges.synced_forges();
            let origin_forge = &org_config.origin;

            // Emit warnings for skipped forges (except origin which is always synced)
            for forge in &all_forges {
                if !synced_forges_list.contains(forge) && forge != origin_forge {
                    yield RepoEvent::ForgeSkipped {
                        org_name: org_name.clone(),
                        forge: forge.clone(),
                        reason: "sync: false in org config (excluded from diff)".to_string(),
                    };
                }
            }

            // Calculate effective synced forges set (synced + origin)
            let mut effective_synced_set: HashSet<Forge> = synced_forges_list.into_iter().collect();
            effective_synced_set.insert(origin_forge.clone());

            let mut to_create = 0;
            let mut to_update = 0;
            let mut to_delete = 0;
            let mut in_sync = 0;

            for (name, repo_config) in &repos.repos {
                // Get desired forges from repo config, filtered by effective synced forges
                let repo_forges: HashSet<_> = repo_config.forges
                    .as_ref()
                    .map(|f| f.iter().cloned().collect())
                    .unwrap_or_else(|| org_config.forges.all_forges().into_iter().collect());

                // Filter to only forges that are actually synced (desired & effective_synced)
                let desired_forges: HashSet<_> = repo_forges
                    .intersection(&effective_synced_set)
                    .cloned()
                    .collect();

                // Get actually synced forges, filtered to only those we're tracking
                let actual_synced: HashSet<_> = repo_config.synced
                    .as_ref()
                    .map(|s| s.forges.keys().cloned().collect())
                    .unwrap_or_default();

                // Only count forges in our effective sync set
                let synced_forges: HashSet<_> = actual_synced
                    .intersection(&effective_synced_set)
                    .cloned()
                    .collect();

                // Determine status and build details
                let (status, details) = if repo_config.delete {
                    to_delete += 1;
                    let forges_list: Vec<_> = synced_forges.iter().map(|f| f.to_string()).collect();
                    (DiffStatus::ToDelete, vec![
                        format!("Marked for deletion on: [{}]", forges_list.join(", ")),
                    ])
                } else if synced_forges.is_empty() {
                    to_create += 1;
                    let forges_list: Vec<_> = desired_forges.iter().map(|f| f.to_string()).collect();
                    (DiffStatus::ToCreate, vec![
                        format!("Will create on: [{}]", forges_list.join(", ")),
                    ])
                } else if desired_forges != synced_forges {
                    to_update += 1;
                    let missing: Vec<_> = desired_forges.difference(&synced_forges)
                        .map(|f| f.to_string())
                        .collect();
                    let extra: Vec<_> = synced_forges.difference(&desired_forges)
                        .map(|f| f.to_string())
                        .collect();
                    let mut details = vec![];
                    if !missing.is_empty() {
                        details.push(format!("Missing on: [{}]", missing.join(", ")));
                    }
                    if !extra.is_empty() {
                        details.push(format!("Extra on: [{}]", extra.join(", ")));
                    }
                    (DiffStatus::ToUpdate, details)
                } else {
                    in_sync += 1;
                    let forges_list: Vec<_> = synced_forges.iter().map(|f| f.to_string()).collect();
                    (DiffStatus::InSync, vec![
                        format!("Synced on: [{}]", forges_list.join(", ")),
                    ])
                };

                yield RepoEvent::RepoDiff {
                    org_name: org_name.clone(),
                    repo_name: name.clone(),
                    status,
                    details,
                };
            }

            // Note: Untracked repos would require scanning _discovered state
            // across all repos or doing a fresh forge query. For now we report 0
            // and users can run refresh() to populate _discovered state.
            let untracked = 0;

            yield RepoEvent::DiffSummary {
                org_name,
                to_create,
                to_update,
                to_delete,
                in_sync,
                untracked,
            };
        }
    }

    /// Full bidirectional sync with convergence verification
    #[hub_method(
        description = "Full bidirectional sync: refresh, diff, apply, capture, verify",
        params(
            dry_run = "Preview all phases without applying",
            yes = "Skip confirmation prompts"
        )
    )]
    pub async fn converge(
        &self,
        dry_run: Option<bool>,
        yes: Option<bool>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();
        let paths = self.paths.clone();
        let is_dry_run = dry_run.unwrap_or(false);
        let auto_yes = yes.unwrap_or(false);

        stream! {
            let phases = vec![
                "refresh".to_string(),
                "diff".to_string(),
                "apply".to_string(),
                "capture".to_string(),
                "verify".to_string(),
            ];

            yield RepoEvent::ConvergeStarted {
                org_name: org_name.clone(),
                phases: phases.clone(),
            };

            // ============================================================
            // Phase 1: REFRESH - Query forges for current state
            // ============================================================
            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "refresh".into(),
                status: "started".into(),
            };

            // Org config comes from parent - no need to reload

            // Track discovered repos across forges
            let mut discovered_repos: HashSet<String> = HashSet::new();

            for forge in org_config.forges.all_forges() {
                let keychain = KeychainBridge::new(&org_name);
                let token_key = match &forge {
                    Forge::GitHub => "github-token",
                    Forge::Codeberg => "codeberg-token",
                    Forge::GitLab => "gitlab-token",
                };

                let token = match keychain.get(token_key).await {
                    Ok(Some(t)) => t,
                    Ok(None) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: format!("No token configured for {}", forge),
                        };
                        continue;
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: e,
                        };
                        continue;
                    }
                };

                // Query forge API
                let repos = query_forge_repos(&forge, &org_config.owner, &token).await;

                match repos {
                    Ok(forge_repos) => {
                        for repo in forge_repos {
                            discovered_repos.insert(repo.name);
                        }
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message: format!("{} query failed: {}", forge, e),
                        };
                    }
                }
            }

            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "refresh".into(),
                status: format!("discovered {} repos", discovered_repos.len()),
            };

            // ============================================================
            // Phase 2: DIFF - Compare local vs remote
            // ============================================================
            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "diff".into(),
                status: "started".into(),
            };

            // Load repos config and compute diff
            let repos_config = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: e.to_string(),
                    };
                    return;
                }
            };

            // Also load staged repos to include pending changes
            let staged_config = match storage.load_staged().await {
                Ok(s) => s,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: e.to_string(),
                    };
                    return;
                }
            };

            // Calculate effective synced forges (synced + origin)
            let synced_forges_list = org_config.forges.synced_forges();
            let origin_forge = &org_config.origin;
            let mut effective_synced_set: HashSet<Forge> = synced_forges_list.into_iter().collect();
            effective_synced_set.insert(origin_forge.clone());

            let mut to_create = 0usize;
            let mut to_update = 0usize;
            let mut to_delete = 0usize;

            // Check committed repos
            for (_, repo_config) in &repos_config.repos {
                // Get desired forges, filtered by effective synced set
                let repo_forges: HashSet<_> = repo_config.forges
                    .as_ref()
                    .map(|f| f.iter().cloned().collect())
                    .unwrap_or_else(|| org_config.forges.all_forges().into_iter().collect());

                let desired_forges: HashSet<_> = repo_forges
                    .intersection(&effective_synced_set)
                    .cloned()
                    .collect();

                // Get actually synced forges, filtered to effective set
                let actual_synced: HashSet<_> = repo_config.synced
                    .as_ref()
                    .map(|s| s.forges.keys().cloned().collect())
                    .unwrap_or_default();

                let synced_forges: HashSet<_> = actual_synced
                    .intersection(&effective_synced_set)
                    .cloned()
                    .collect();

                if repo_config.delete {
                    to_delete += 1;
                } else if synced_forges.is_empty() {
                    to_create += 1;
                } else if desired_forges != synced_forges {
                    to_update += 1;
                }
            }

            // Check staged repos (new or modified)
            for (name, repo_config) in &staged_config.repos {
                if repo_config.delete {
                    // Only count if it exists in committed (would be a deletion)
                    if repos_config.repos.contains_key(name) {
                        to_delete += 1;
                    }
                } else if !repos_config.repos.contains_key(name) {
                    // New repo being created
                    to_create += 1;
                } else {
                    // Update to existing repo
                    to_update += 1;
                }
            }

            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "diff".into(),
                status: format!("create={}, update={}, delete={}", to_create, to_update, to_delete),
            };

            // If nothing to do, we're converged
            if to_create == 0 && to_update == 0 && to_delete == 0 {
                yield RepoEvent::ConvergeComplete {
                    org_name,
                    success: true,
                    changes_applied: 0,
                    final_state: ConvergeResult {
                        converged: true,
                        repos_synced: 0,
                        repos_created: 0,
                        repos_deleted: 0,
                        drift_detected: false,
                    },
                };
                return;
            }

            if is_dry_run {
                yield RepoEvent::ConvergePhase {
                    org_name: org_name.clone(),
                    phase: "apply".into(),
                    status: "skipped (dry run)".into(),
                };

                yield RepoEvent::ConvergeComplete {
                    org_name,
                    success: true,
                    changes_applied: 0,
                    final_state: ConvergeResult {
                        converged: false,
                        repos_synced: to_create + to_update,
                        repos_created: to_create,
                        repos_deleted: to_delete,
                        drift_detected: false,
                    },
                };
                return;
            }

            // ============================================================
            // Phase 3: APPLY - Run Pulumi to make changes
            // ============================================================
            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "apply".into(),
                status: "started".into(),
            };

            // Merge staged into committed
            if let Err(e) = storage.merge_staged().await {
                yield RepoEvent::Error {
                    org_name: org_name.clone(),
                    repo_name: None,
                    message: e.to_string(),
                };
                return;
            }

            let bridge = crate::bridge::PulumiBridge::new(&paths);

            // Select/create stack for this org
            if let Err(e) = bridge.select_stack(&org_name).await {
                yield RepoEvent::Error {
                    org_name: org_name.clone(),
                    repo_name: None,
                    message: format!("Failed to select Pulumi stack: {}", e),
                };
                return;
            }

            let repos_file = paths.repos_file(&org_name);
            let staged_file = paths.staged_repos_file(&org_name);

            let pulumi_stream = bridge.up(&org_name, &repos_file, &staged_file, auto_yes);

            let mut changes_applied = 0usize;

            use futures::StreamExt;
            let mut pulumi_stream = Box::pin(pulumi_stream);

            while let Some(event) = pulumi_stream.next().await {
                match event {
                    PulumiEvent::UpComplete { success, creates, updates, deletes } => {
                        changes_applied = creates + updates + deletes;

                        if !success {
                            yield RepoEvent::Error {
                                org_name: org_name.clone(),
                                repo_name: None,
                                message: "Pulumi apply failed".into(),
                            };
                            return;
                        }

                        yield RepoEvent::ConvergePhase {
                            org_name: org_name.clone(),
                            phase: "apply".into(),
                            status: format!("applied {} changes", changes_applied),
                        };
                    }
                    PulumiEvent::Error { message } => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: None,
                            message,
                        };
                        return;
                    }
                    _ => {}
                }
            }

            // ============================================================
            // Phase 4: CAPTURE - Store outputs in local state
            // ============================================================
            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "capture".into(),
                status: "started".into(),
            };

            match bridge.get_outputs(&org_name).await {
                Ok(outputs) => {
                    for (repo_name, repo_output) in outputs.repos {
                        if let Some(url) = repo_output.github_url {
                            let _ = storage.update_synced(
                                &repo_name,
                                Forge::GitHub,
                                url,
                                repo_output.github_id,
                            ).await;
                        }
                        if let Some(url) = repo_output.codeberg_url {
                            let _ = storage.update_synced(
                                &repo_name,
                                Forge::Codeberg,
                                url,
                                repo_output.codeberg_id,
                            ).await;
                        }
                    }

                    yield RepoEvent::ConvergePhase {
                        org_name: org_name.clone(),
                        phase: "capture".into(),
                        status: "outputs captured".into(),
                    };
                }
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: format!("Capture failed: {}", e),
                    };
                    // Continue to verify phase even if capture failed
                }
            }

            // ============================================================
            // Phase 5: VERIFY - Re-diff to confirm convergence
            // ============================================================
            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "verify".into(),
                status: "started".into(),
            };

            // Re-load repos to check for drift
            let final_repos = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: format!("Failed to verify: {}", e),
                    };
                    // Return with drift detected since we can't verify
                    yield RepoEvent::ConvergeComplete {
                        org_name,
                        success: false,
                        changes_applied,
                        final_state: ConvergeResult {
                            converged: false,
                            repos_synced: to_create + to_update,
                            repos_created: to_create,
                            repos_deleted: to_delete,
                            drift_detected: true,
                        },
                    };
                    return;
                }
            };

            // Re-compute diff to check for remaining drift
            // effective_synced_set is already defined above
            let mut verify_create = 0usize;
            let mut verify_update = 0usize;
            let mut verify_delete = 0usize;

            for (_, repo_config) in &final_repos.repos {
                // Get desired forges, filtered by effective synced set
                let repo_forges: HashSet<_> = repo_config.forges
                    .as_ref()
                    .map(|f| f.iter().cloned().collect())
                    .unwrap_or_else(|| org_config.forges.all_forges().into_iter().collect());

                let desired_forges: HashSet<_> = repo_forges
                    .intersection(&effective_synced_set)
                    .cloned()
                    .collect();

                // Get actually synced forges, filtered to effective set
                let actual_synced: HashSet<_> = repo_config.synced
                    .as_ref()
                    .map(|s| s.forges.keys().cloned().collect())
                    .unwrap_or_default();

                let synced_forges: HashSet<_> = actual_synced
                    .intersection(&effective_synced_set)
                    .cloned()
                    .collect();

                if repo_config.delete {
                    verify_delete += 1;
                } else if synced_forges.is_empty() {
                    verify_create += 1;
                } else if desired_forges != synced_forges {
                    verify_update += 1;
                }
            }

            let drift_detected = verify_create > 0 || verify_update > 0 || verify_delete > 0;

            yield RepoEvent::ConvergePhase {
                org_name: org_name.clone(),
                phase: "verify".into(),
                status: if drift_detected {
                    "drift detected!".into()
                } else {
                    "converged".into()
                },
            };

            // ============================================================
            // Complete
            // ============================================================
            yield RepoEvent::ConvergeComplete {
                org_name,
                success: !drift_detected,
                changes_applied,
                final_state: ConvergeResult {
                    converged: !drift_detected,
                    repos_synced: to_create + to_update,
                    repos_created: to_create,
                    repos_deleted: to_delete,
                    drift_detected,
                },
            };
        }
    }

    /// Clone a repository from forges and configure remotes
    #[hub_method(
        description = "Clone a repository from forges and configure all remotes",
        params(
            repo_name = "Repository to clone",
            target = "Target directory (defaults to current dir / repo_name)"
        )
    )]
    pub async fn clone(
        &self,
        repo_name: String,
        target: Option<String>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();

        stream! {
            // Org config comes from parent - no need to reload

            // Load repos config to get synced URLs
            let repos = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: e.to_string(),
                    };
                    return;
                }
            };

            // Find the repo config
            let repo_config = match repos.repos.get(&repo_name) {
                Some(cfg) => cfg.clone(),
                None => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Repository not found in config: {}", repo_name),
                    };
                    return;
                }
            };

            // Determine target path
            let target_path = match target {
                Some(t) => PathBuf::from(t),
                None => std::env::current_dir()
                    .unwrap_or_else(|_| PathBuf::from("."))
                    .join(&repo_name),
            };

            yield RepoEvent::CloneStarted {
                org_name: org_name.clone(),
                repo_name: repo_name.clone(),
                target_path: target_path.clone(),
            };

            // Determine which forge to clone from (prefer origin/primary)
            let org_forges = org_config.forges.all_forges();
            let forges = repo_config.forges.as_ref()
                .unwrap_or(&org_forges);

            let origin_forge = &org_config.origin;
            let origin_url = org_config.origin_url(&org_name, &repo_name);

            yield RepoEvent::CloneProgress {
                org_name: org_name.clone(),
                repo_name: repo_name.clone(),
                forge: origin_forge.clone(),
                stage: "cloning".into(),
            };

            // Run git clone
            let clone_output = tokio::process::Command::new("git")
                .args(["clone", &origin_url, target_path.to_str().unwrap_or(".")])
                .output()
                .await;

            match clone_output {
                Ok(output) if output.status.success() => {
                    yield RepoEvent::CloneProgress {
                        org_name: org_name.clone(),
                        repo_name: repo_name.clone(),
                        forge: origin_forge.clone(),
                        stage: "cloned".into(),
                    };
                }
                Ok(output) => {
                    let stderr = String::from_utf8_lossy(&output.stderr);
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("git clone failed: {}", stderr),
                    };
                    return;
                }
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: Some(repo_name.clone()),
                        message: format!("Failed to run git: {}", e),
                    };
                    return;
                }
            }

            // Add remotes for other forges
            let mut remotes = vec!["origin".to_string()];

            for forge in forges {
                if forge == origin_forge {
                    continue; // Already the origin
                }

                let forge_name = forge.to_string().to_lowercase();
                let remote_url = org_config.ssh_url(forge, &org_name, &repo_name);

                yield RepoEvent::CloneProgress {
                    org_name: org_name.clone(),
                    repo_name: repo_name.clone(),
                    forge: forge.clone(),
                    stage: format!("adding remote '{}'", forge_name),
                };

                let add_remote = tokio::process::Command::new("git")
                    .current_dir(&target_path)
                    .args(["remote", "add", &forge_name, &remote_url])
                    .output()
                    .await;

                match add_remote {
                    Ok(output) if output.status.success() => {
                        remotes.push(forge_name.clone());
                        yield RepoEvent::CloneRemoteAdded {
                            org_name: org_name.clone(),
                            repo_name: repo_name.clone(),
                            remote_name: forge_name,
                            url: remote_url,
                        };
                    }
                    Ok(output) => {
                        let stderr = String::from_utf8_lossy(&output.stderr);
                        // Non-fatal: remote might already exist
                        yield RepoEvent::CloneProgress {
                            org_name: org_name.clone(),
                            repo_name: repo_name.clone(),
                            forge: forge.clone(),
                            stage: format!("remote add warning: {}", stderr.trim()),
                        };
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("Failed to add remote: {}", e),
                        };
                    }
                }
            }

            // Fetch all remotes
            yield RepoEvent::CloneProgress {
                org_name: org_name.clone(),
                repo_name: repo_name.clone(),
                forge: origin_forge.clone(),
                stage: "fetching all remotes".into(),
            };

            let _ = tokio::process::Command::new("git")
                .current_dir(&target_path)
                .args(["fetch", "--all"])
                .output()
                .await;

            // Check sync status across remotes
            let mut sync_details = Vec::new();
            let mut all_in_sync = true;

            // Get default branch
            let default_branch_output = tokio::process::Command::new("git")
                .current_dir(&target_path)
                .args(["symbolic-ref", "--short", "HEAD"])
                .output()
                .await;

            let default_branch = default_branch_output
                .ok()
                .and_then(|o| String::from_utf8(o.stdout).ok())
                .map(|s| s.trim().to_string())
                .unwrap_or_else(|| "main".to_string());

            // Compare refs for each remote
            for remote in &remotes {
                let ref_output = tokio::process::Command::new("git")
                    .current_dir(&target_path)
                    .args(["rev-parse", &format!("{}/{}", remote, default_branch)])
                    .output()
                    .await;

                if let Ok(output) = ref_output {
                    if output.status.success() {
                        let commit = String::from_utf8_lossy(&output.stdout).trim().to_string();
                        let short_commit = commit.chars().take(7).collect::<String>();
                        sync_details.push(format!("{}/{} = {}", remote, default_branch, short_commit));
                    } else {
                        sync_details.push(format!("{}/{} = (not found)", remote, default_branch));
                        all_in_sync = false;
                    }
                }
            }

            // Check if all refs match
            if remotes.len() > 1 {
                let first_ref = tokio::process::Command::new("git")
                    .current_dir(&target_path)
                    .args(["rev-parse", &format!("origin/{}", default_branch)])
                    .output()
                    .await
                    .ok()
                    .and_then(|o| String::from_utf8(o.stdout).ok())
                    .map(|s| s.trim().to_string());

                for remote in &remotes[1..] {
                    let remote_ref = tokio::process::Command::new("git")
                        .current_dir(&target_path)
                        .args(["rev-parse", &format!("{}/{}", remote, default_branch)])
                        .output()
                        .await
                        .ok()
                        .and_then(|o| String::from_utf8(o.stdout).ok())
                        .map(|s| s.trim().to_string());

                    if first_ref != remote_ref {
                        all_in_sync = false;
                    }
                }
            }

            yield RepoEvent::RemoteSyncStatus {
                org_name: org_name.clone(),
                repo_name: repo_name.clone(),
                branch: default_branch,
                in_sync: all_in_sync,
                details: sync_details,
            };

            yield RepoEvent::CloneComplete {
                org_name,
                repo_name,
                target_path,
                remotes,
            };
        }
    }

    /// Clone all repositories for an organization
    #[hub_method(
        description = "Clone all repositories for this org, configuring remotes for each",
        params(
            target = "Target directory (repos will be cloned as subdirectories)"
        )
    )]
    pub async fn clone_all(
        &self,
        target: Option<String>,
    ) -> impl Stream<Item = RepoEvent> + Send + 'static {
        let storage = self.storage();
        let org_name = self.org_name.clone();
        let org_config = self.org_config.clone();

        stream! {
            // Org config comes from parent - no need to reload

            // Determine target directory
            let target_dir = match target {
                Some(t) => PathBuf::from(t),
                None => std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")),
            };

            // Ensure target directory exists
            if !target_dir.exists() {
                if let Err(e) = std::fs::create_dir_all(&target_dir) {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: format!("Failed to create target directory: {}", e),
                    };
                    return;
                }
            }

            // Load repos config
            let repos = match storage.load_repos().await {
                Ok(r) => r,
                Err(e) => {
                    yield RepoEvent::Error {
                        org_name: org_name.clone(),
                        repo_name: None,
                        message: e.to_string(),
                    };
                    return;
                }
            };

            let origin_forge = &org_config.origin;

            // Clone each repo
            for (repo_name, repo_config) in &repos.repos {
                if repo_config.delete {
                    continue; // Skip repos marked for deletion
                }

                let repo_path = target_dir.join(repo_name);

                // Skip if already exists
                if repo_path.exists() {
                    yield RepoEvent::CloneProgress {
                        org_name: org_name.clone(),
                        repo_name: repo_name.clone(),
                        forge: origin_forge.clone(),
                        stage: "skipped (already exists)".into(),
                    };
                    continue;
                }

                yield RepoEvent::CloneStarted {
                    org_name: org_name.clone(),
                    repo_name: repo_name.clone(),
                    target_path: repo_path.clone(),
                };

                // Get forges for this repo
                let org_forges = org_config.forges.all_forges();
                let forges = repo_config.forges.as_ref()
                    .unwrap_or(&org_forges);

                let origin_url = org_config.origin_url(&org_name, repo_name);

                yield RepoEvent::CloneProgress {
                    org_name: org_name.clone(),
                    repo_name: repo_name.clone(),
                    forge: origin_forge.clone(),
                    stage: "cloning".into(),
                };

                // Run git clone
                let clone_output = tokio::process::Command::new("git")
                    .args(["clone", &origin_url, repo_path.to_str().unwrap_or(".")])
                    .output()
                    .await;

                match clone_output {
                    Ok(output) if output.status.success() => {
                        yield RepoEvent::CloneProgress {
                            org_name: org_name.clone(),
                            repo_name: repo_name.clone(),
                            forge: origin_forge.clone(),
                            stage: "cloned".into(),
                        };
                    }
                    Ok(output) => {
                        let stderr = String::from_utf8_lossy(&output.stderr);
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("git clone failed: {}", stderr),
                        };
                        continue; // Skip to next repo
                    }
                    Err(e) => {
                        yield RepoEvent::Error {
                            org_name: org_name.clone(),
                            repo_name: Some(repo_name.clone()),
                            message: format!("Failed to run git: {}", e),
                        };
                        continue;
                    }
                }

                // Add remotes for other forges
                let mut remotes = vec!["origin".to_string()];

                for forge in forges {
                    if forge == origin_forge {
                        continue;
                    }

                    let forge_name = forge.to_string().to_lowercase();
                    let remote_url = org_config.ssh_url(forge, &org_name, repo_name);

                    let add_remote = tokio::process::Command::new("git")
                        .current_dir(&repo_path)
                        .args(["remote", "add", &forge_name, &remote_url])
                        .output()
                        .await;

                    if let Ok(output) = add_remote {
                        if output.status.success() {
                            remotes.push(forge_name.clone());
                            yield RepoEvent::CloneRemoteAdded {
                                org_name: org_name.clone(),
                                repo_name: repo_name.clone(),
                                remote_name: forge_name,
                                url: remote_url,
                            };
                        }
                    }
                }

                // Fetch all remotes
                let _ = tokio::process::Command::new("git")
                    .current_dir(&repo_path)
                    .args(["fetch", "--all"])
                    .output()
                    .await;

                yield RepoEvent::CloneComplete {
                    org_name: org_name.clone(),
                    repo_name: repo_name.clone(),
                    target_path: repo_path,
                    remotes,
                };
            }
        }
    }

    pub fn plugin_children(&self) -> Vec<ChildSummary> {
        vec![]  // Dynamic children loaded from config
    }
}

#[async_trait]
impl ChildRouter for ReposActivation {
    fn router_namespace(&self) -> &str {
        "repos"
    }

    async fn router_call(&self, method: &str, params: Value) -> Result<PlexusStream, PlexusError> {
        Activation::call(self, method, params).await
    }

    async fn get_child(&self, name: &str) -> Option<Box<dyn ChildRouter>> {
        // Check if repo exists in config
        let storage = self.storage();
        let repos = storage.load_repos().await.ok()?;

        if repos.repos.contains_key(name) {
            Some(Box::new(RepoChildRouter::new(
                self.paths.clone(),
                self.org_name.clone(),
                name.to_string(),
                self.org_config.clone(),
            )))
        } else {
            None
        }
    }
}