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
|
use std::collections::{HashMap, HashSet};
use std::path::PathBuf;
use std::sync::Arc;
use ratatui::layout::Direction;
use tokio::sync::{mpsc, Notify};
use tracing::{error, warn};
use crate::detect::AgentState;
use crate::events::AppEvent;
use crate::layout::{Node, PaneId, TileLayout};
use crate::pane::{PaneLaunchEnv, PaneState};
use crate::render_signal::RenderSignal;
use crate::terminal::{TerminalId, TerminalRuntime, TerminalState};
use crate::workspace::Workspace;
use super::snapshot::{
PaneAgentSessionSnapshot, PaneHistorySnapshot, TabHistorySnapshot, WorkspaceHistorySnapshot,
};
use super::{
DirectionSnapshot, LayoutSnapshot, SessionHistorySnapshot, SessionSnapshot, TabSnapshot,
WorkspaceSnapshot,
};
struct AgentRestoreState<'a> {
enabled: bool,
resumed_sessions: &'a mut HashSet<String>,
}
struct PaneRestoreStartup<'a> {
restore_plan: Option<crate::agent_resume::AgentResumePlan>,
initial_history_ansi: Option<&'a str>,
duplicate_agent_session: bool,
reserved_agent_session: Option<String>,
}
struct RestoreRuntimeContext<'a> {
scrollback_limit_bytes: usize,
shell_config: crate::pane::PaneShellConfig<'a>,
resume_agents_on_restore: bool,
events: mpsc::Sender<AppEvent>,
render_notify: Arc<Notify>,
render_dirty: Arc<RenderSignal>,
}
type RestoredSession = (
Vec<Workspace>,
HashMap<TerminalId, TerminalState>,
HashMap<TerminalId, TerminalRuntime>,
);
type RestoredWorkspace = (
Workspace,
Vec<TerminalState>,
HashMap<TerminalId, TerminalRuntime>,
);
type RestoredTab = (
crate::workspace::Tab,
Vec<TerminalState>,
HashMap<TerminalId, TerminalRuntime>,
HashMap<PaneId, u32>,
);
type RestoreFailures<T> = (T, usize);
/// Restore workspaces from a snapshot. Each pane gets a fresh shell in its saved cwd.
pub fn restore(
snapshot: &SessionSnapshot,
history: Option<&SessionHistorySnapshot>,
rows: u16,
cols: u16,
scrollback_limit_bytes: usize,
default_shell: &str,
shell_mode: crate::config::ShellModeConfig,
resume_agents_on_restore: bool,
events: mpsc::Sender<AppEvent>,
render_notify: Arc<Notify>,
render_dirty: Arc<RenderSignal>,
) -> RestoredSession {
let mut imported_panes = HashMap::new();
restore_with_imports(
snapshot,
history,
rows,
cols,
scrollback_limit_bytes,
crate::pane::PaneShellConfig::new(default_shell, shell_mode),
resume_agents_on_restore,
&mut imported_panes,
events,
render_notify,
render_dirty,
)
}
#[cfg(unix)]
pub fn restore_handoff(
snapshot: &SessionSnapshot,
scrollback_limit_bytes: usize,
default_shell: &str,
shell_mode: crate::config::ShellModeConfig,
imports: &mut HashMap<u32, crate::handoff_runtime::ImportedHandoffRuntime>,
events: mpsc::Sender<AppEvent>,
render_notify: Arc<Notify>,
render_dirty: Arc<RenderSignal>,
) -> std::io::Result<RestoredSession> {
restore_with_imports_strict(
snapshot,
None,
24,
80,
scrollback_limit_bytes,
crate::pane::PaneShellConfig::new(default_shell, shell_mode),
true,
imports,
events,
render_notify,
render_dirty,
)
}
#[cfg(unix)]
pub fn handoff_pane_aliases(
snapshot: &SessionSnapshot,
workspaces: &[Workspace],
) -> HashMap<u32, PaneId> {
let mut aliases = HashMap::new();
for (ws_snap, workspace) in snapshot.workspaces.iter().zip(workspaces) {
for (tab_snap, tab) in ws_snap.tabs.iter().zip(&workspace.tabs) {
let old_ids = collect_snapshot_pane_ids(&tab_snap.layout);
let new_ids = tab.layout.pane_ids();
for (old_id, new_id) in old_ids.into_iter().zip(new_ids) {
if old_id != new_id.raw() {
aliases.insert(old_id, new_id);
}
}
}
}
aliases
}
#[cfg(unix)]
fn collect_snapshot_pane_ids(node: &LayoutSnapshot) -> Vec<u32> {
let mut ids = Vec::new();
collect_snapshot_ids_inner(node, &mut ids);
ids
}
#[cfg(unix)]
fn collect_snapshot_ids_inner(node: &LayoutSnapshot, ids: &mut Vec<u32>) {
match node {
LayoutSnapshot::Pane(id) => ids.push(*id),
LayoutSnapshot::Split { first, second, .. } => {
collect_snapshot_ids_inner(first, ids);
collect_snapshot_ids_inner(second, ids);
}
}
}
fn migrated_public_pane_numbers_by_old_raw(
snap: &WorkspaceSnapshot,
next_public_pane_number: &mut usize,
) -> HashMap<u32, usize> {
let mut public_numbers = snap.public_pane_numbers.clone();
for tab in &snap.tabs {
let mut pane_ids = Vec::new();
collect_layout_snapshot_pane_ids(&tab.layout, &mut pane_ids);
for old_raw in pane_ids {
public_numbers.entry(old_raw).or_insert_with(|| {
let number = *next_public_pane_number;
*next_public_pane_number += 1;
number
});
}
}
public_numbers
}
fn collect_layout_snapshot_pane_ids(node: &LayoutSnapshot, ids: &mut Vec<u32>) {
match node {
LayoutSnapshot::Pane(id) => ids.push(*id),
LayoutSnapshot::Split { first, second, .. } => {
collect_layout_snapshot_pane_ids(first, ids);
collect_layout_snapshot_pane_ids(second, ids);
}
}
}
#[cfg(unix)]
fn restore_with_imports_strict(
snapshot: &SessionSnapshot,
history: Option<&SessionHistorySnapshot>,
rows: u16,
cols: u16,
scrollback_limit_bytes: usize,
shell_config: crate::pane::PaneShellConfig<'_>,
resume_agents_on_restore: bool,
imported_panes: &mut HashMap<u32, crate::handoff_runtime::ImportedHandoffRuntime>,
events: mpsc::Sender<AppEvent>,
render_notify: Arc<Notify>,
render_dirty: Arc<RenderSignal>,
) -> std::io::Result<RestoredSession> {
let (restored, failed_imports) = restore_with_imports_and_failures(
snapshot,
history,
rows,
cols,
scrollback_limit_bytes,
shell_config,
resume_agents_on_restore,
imported_panes,
events,
render_notify,
render_dirty,
);
if failed_imports > 0 {
return Err(std::io::Error::other(format!(
"handoff failed to restore {failed_imports} imported pane runtime(s)"
)));
}
if !imported_panes.is_empty() {
return Err(std::io::Error::other(format!(
"handoff import did not consume {} pane runtime(s)",
imported_panes.len()
)));
}
Ok(restored)
}
fn restore_with_imports(
snapshot: &SessionSnapshot,
history: Option<&SessionHistorySnapshot>,
rows: u16,
cols: u16,
scrollback_limit_bytes: usize,
shell_config: crate::pane::PaneShellConfig<'_>,
resume_agents_on_restore: bool,
imported_panes: &mut HashMap<u32, crate::handoff_runtime::ImportedHandoffRuntime>,
events: mpsc::Sender<AppEvent>,
render_notify: Arc<Notify>,
render_dirty: Arc<RenderSignal>,
) -> RestoredSession {
restore_with_imports_and_failures(
snapshot,
history,
rows,
cols,
scrollback_limit_bytes,
shell_config,
resume_agents_on_restore,
imported_panes,
events,
render_notify,
render_dirty,
)
.0
}
fn restore_with_imports_and_failures(
snapshot: &SessionSnapshot,
history: Option<&SessionHistorySnapshot>,
rows: u16,
cols: u16,
scrollback_limit_bytes: usize,
shell_config: crate::pane::PaneShellConfig<'_>,
resume_agents_on_restore: bool,
imported_panes: &mut HashMap<u32, crate::handoff_runtime::ImportedHandoffRuntime>,
events: mpsc::Sender<AppEvent>,
render_notify: Arc<Notify>,
render_dirty: Arc<RenderSignal>,
) -> RestoreFailures<RestoredSession> {
let history = history.filter(|history| {
let matches = history.layout_fingerprint.is_some()
&& history.layout_fingerprint == super::snapshot::layout_fingerprint(snapshot);
if !matches {
tracing::warn!("Ignoring pane history without a matching session layout");
}
matches
});
let mut workspaces = Vec::new();
let mut terminals = HashMap::new();
let mut terminal_runtimes = HashMap::new();
let mut resumed_agent_sessions = HashSet::new();
let mut failed_imports = 0;
for (idx, ws_snap) in snapshot.workspaces.iter().enumerate() {
let runtime_context = RestoreRuntimeContext {
scrollback_limit_bytes,
shell_config,
resume_agents_on_restore,
events: events.clone(),
render_notify: render_notify.clone(),
render_dirty: render_dirty.clone(),
};
let (restored, workspace_failed_imports) = restore_workspace(
ws_snap,
history.and_then(|history| history.workspaces.get(idx)),
rows,
cols,
&runtime_context,
&mut resumed_agent_sessions,
imported_panes,
);
failed_imports += workspace_failed_imports;
if let Some((workspace, restored_terminals, restored_runtimes)) = restored {
for terminal in restored_terminals {
terminals.insert(terminal.id.clone(), terminal);
}
terminal_runtimes.extend(restored_runtimes);
workspaces.push(workspace);
}
}
crate::workspace::reserve_workspace_ids(&workspaces);
((workspaces, terminals, terminal_runtimes), failed_imports)
}
fn restore_workspace(
snap: &WorkspaceSnapshot,
history: Option<&WorkspaceHistorySnapshot>,
rows: u16,
cols: u16,
runtime_context: &RestoreRuntimeContext<'_>,
resumed_agent_sessions: &mut HashSet<String>,
imported_panes: &mut HashMap<u32, crate::handoff_runtime::ImportedHandoffRuntime>,
) -> RestoreFailures<Option<RestoredWorkspace>> {
let mut tabs = Vec::new();
let mut terminals = Vec::new();
let mut terminal_runtimes = HashMap::new();
let workspace_id = snap
.id
.clone()
.unwrap_or_else(crate::workspace::generate_workspace_id);
let mut next_public_pane_number = snap
.public_pane_numbers
.values()
.copied()
.max()
.and_then(|max| max.checked_add(1))
.unwrap_or(1)
.max(snap.next_public_pane_number);
let public_pane_numbers_by_old_raw =
migrated_public_pane_numbers_by_old_raw(snap, &mut next_public_pane_number);
let public_pane_ids_by_old_raw: HashMap<u32, String> = public_pane_numbers_by_old_raw
.iter()
.map(|(old_raw, public_number)| {
(
*old_raw,
format!(
"{}:p{}",
workspace_id,
crate::workspace::encode_public_number(*public_number)
),
)
})
.collect();
let mut public_pane_numbers = HashMap::new();
let mut next_public_tab_number = snap
.public_tab_numbers
.iter()
.copied()
.max()
.and_then(|max| max.checked_add(1))
.unwrap_or(1)
.max(snap.next_public_tab_number);
let mut failed_imports = 0;
for (idx, tab_snap) in snap.tabs.iter().enumerate() {
let tab_number = snap.public_tab_numbers.get(idx).copied().unwrap_or(idx + 1);
let (restored_tab, tab_failed_imports) = restore_tab(
tab_snap,
history.and_then(|history| history.tabs.get(idx)),
tab_number,
&workspace_id,
rows,
cols,
runtime_context,
resumed_agent_sessions,
imported_panes,
&public_pane_ids_by_old_raw,
);
failed_imports += tab_failed_imports;
let Some((mut tab, restored_terminals, restored_runtimes, reverse_id_map)) = restored_tab
else {
continue;
};
if let Some(public_tab_number) = snap.public_tab_numbers.get(idx).copied() {
tab.number = public_tab_number;
}
next_public_tab_number = next_public_tab_number.max(tab.number + 1);
for pane_id in tab.layout.pane_ids() {
let public_number = public_pane_numbers_by_old_raw
.get(
&reverse_id_map
.get(&pane_id)
.copied()
.unwrap_or(pane_id.raw()),
)
.copied()
.unwrap_or_else(|| {
let number = next_public_pane_number;
next_public_pane_number += 1;
number
});
public_pane_numbers.insert(pane_id, public_number);
next_public_pane_number = next_public_pane_number.max(public_number + 1);
}
terminals.extend(restored_terminals);
terminal_runtimes.extend(restored_runtimes);
tabs.push(tab);
}
if tabs.is_empty() {
return (None, failed_imports);
}
let worktree_space = restored_worktree_space_membership(snap.worktree_space.clone());
let (cached_git_space, cached_auto_label, cached_git_status_key) =
crate::workspace::discover_workspace_git_identity(&snap.identity_cwd);
(
Some(Workspace {
id: workspace_id,
custom_name: snap.custom_name.clone(),
identity_cwd: snap.identity_cwd.clone(),
cached_identity_cwd: snap.identity_cwd.clone(),
cached_auto_label,
cached_git_status_key,
cached_git_branch: crate::workspace::git_branch(&snap.identity_cwd),
cached_git_ahead_behind: None,
cached_git_space,
worktree_space,
metadata_tokens: crate::metadata_tokens::MetadataTokens::default(),
metadata_token_sequences: HashMap::new(),
public_pane_numbers,
next_public_pane_number,
next_public_tab_number,
active_tab: snap.active_tab.min(tabs.len().saturating_sub(1)),
tabs,
#[cfg(test)]
test_runtimes: HashMap::new(),
})
.map(|workspace| (workspace, terminals, terminal_runtimes)),
failed_imports,
)
}
fn unavailable_restored_terminal(
pane: Option<&super::snapshot::PaneSnapshot>,
cwd: PathBuf,
reason: String,
) -> TerminalState {
warn!(cwd = %cwd.display(), reason = %reason, "preserving unavailable restored pane");
let mut terminal = TerminalState::new(TerminalId::alloc(), cwd);
terminal.restore_error = Some(reason);
if let Some(pane) = pane {
terminal.manual_label = pane.label.clone();
terminal.launch_argv = pane.launch_argv.clone();
if let Some(session) = restored_terminal_agent_session(pane.agent_session.as_ref(), false) {
terminal.set_persisted_agent_session(session);
}
match (
pane.agent_name.as_ref(),
pane.managed_agent_kind
.as_deref()
.and_then(crate::detect::parse_canonical_agent_label),
) {
(Some(name), Some(agent)) => terminal.restore_managed_agent(name.clone(), agent),
(Some(name), None) => terminal.set_agent_name(name.clone()),
_ => {}
}
}
terminal
}
fn restored_worktree_space_membership(
space: Option<crate::workspace::WorktreeSpaceMembership>,
) -> Option<crate::workspace::WorktreeSpaceMembership> {
space.filter(|space| {
space.checkout_path.exists()
&& crate::workspace::git_space_metadata(&space.checkout_path)
.is_some_and(|current| current.key == space.key)
})
}
fn restore_tab(
snap: &TabSnapshot,
history: Option<&TabHistorySnapshot>,
number: usize,
workspace_id: &str,
rows: u16,
cols: u16,
runtime_context: &RestoreRuntimeContext<'_>,
resumed_agent_sessions: &mut HashSet<String>,
imported_panes: &mut HashMap<u32, crate::handoff_runtime::ImportedHandoffRuntime>,
public_pane_ids_by_old_raw: &HashMap<u32, String>,
) -> RestoreFailures<Option<RestoredTab>> {
let (node, id_map) = restore_node_remapped(&snap.layout);
let reverse_id_map: HashMap<PaneId, u32> = id_map
.iter()
.map(|(&old_id, &new_id)| (new_id, old_id))
.collect();
let pane_ids = collect_pane_ids(&node);
let mut panes = HashMap::new();
let mut terminals = Vec::new();
let mut terminal_runtimes = HashMap::new();
let mut failed_imports = 0;
for id in &pane_ids {
let old_id = reverse_id_map.get(id);
let saved_pane = old_id.and_then(|old_id| snap.panes.get(old_id));
let saved_cwd = saved_pane
.map(|p| p.cwd.clone())
.unwrap_or_else(|| std::env::current_dir().unwrap_or_else(|_| "/".into()));
let cwd = saved_cwd;
let has_import = old_id.is_some_and(|old_id| imported_panes.contains_key(old_id));
if !has_import && !cwd.is_dir() {
let terminal = unavailable_restored_terminal(
saved_pane,
cwd,
"Saved directory is unavailable. Restore the directory and restart this session."
.into(),
);
panes.insert(*id, PaneState::new(terminal.id.clone()));
terminals.push(terminal);
continue;
}
let saved_label = saved_pane.and_then(|p| p.label.clone());
let saved_agent_name = saved_pane.and_then(|p| p.agent_name.clone());
let saved_managed_agent = saved_pane
.and_then(|pane| pane.managed_agent_kind.as_deref())
.and_then(crate::detect::parse_canonical_agent_label);
let saved_launch_argv = saved_pane.and_then(|p| p.launch_argv.clone());
let saved_agent_session = saved_pane.and_then(|p| p.agent_session.as_ref());
let saved_history =
old_id.and_then(|old_id| history.and_then(|history| history.panes.get(old_id)));
let startup = {
let mut agent_restore = AgentRestoreState {
enabled: runtime_context.resume_agents_on_restore,
resumed_sessions: resumed_agent_sessions,
};
pane_restore_startup(saved_agent_session, saved_history, &mut agent_restore)
};
let restored_agent_session =
restored_terminal_agent_session(saved_agent_session, startup.duplicate_agent_session);
let initial_restore_agent = startup
.restore_plan
.as_ref()
.and_then(|plan| crate::detect::parse_agent_label(&plan.agent));
let old_pane_id = reverse_id_map.get(id).copied();
let public_pane_id = old_pane_id
.and_then(|old_id| public_pane_ids_by_old_raw.get(&old_id))
.map(String::as_str);
let launch_env = public_pane_id
.map(|pane_id| {
PaneLaunchEnv::from_extra(Vec::new()).with_identity(
workspace_id.to_string(),
crate::workspace::public_tab_id_for_number(workspace_id, number),
pane_id.to_string(),
)
})
.unwrap_or_default();
let imported_runtime = old_pane_id.and_then(|old_id| imported_panes.remove(&old_id));
let was_imported = imported_runtime.is_some();
#[cfg(unix)]
let handoff_agent_state = imported_runtime
.as_ref()
.and_then(|imported| imported.state.agent_state.clone());
let pending_native_agent_restore = if was_imported {
None
} else {
startup.restore_plan.clone()
};
if let Some(plan) = pending_native_agent_restore {
let terminal_id = TerminalId::alloc();
let mut terminal = TerminalState::new(terminal_id.clone(), cwd.clone())
.with_pending_agent_resume_plan(plan);
if let Some(label) = saved_label {
terminal.set_manual_label(label);
}
if let Some(session) = restored_agent_session {
terminal.set_persisted_agent_session(session);
}
match (saved_agent_name, saved_managed_agent) {
(Some(agent_name), Some(agent)) => {
terminal.restore_managed_agent(agent_name, agent)
}
(Some(_), None) => {}
(None, _) => {}
}
if let Some(agent) = initial_restore_agent {
let _ = terminal.set_detected_state_with_screen_signals_at(
Some(agent),
AgentState::Idle,
false,
false,
false,
false,
std::time::Instant::now(),
);
}
panes.insert(*id, PaneState::new(terminal_id));
terminals.push(terminal);
continue;
}
#[cfg(not(unix))]
if imported_runtime.is_some() {
failed_imports += 1;
continue;
}
let runtime_result = {
#[cfg(unix)]
if let Some(imported) = imported_runtime {
TerminalRuntime::from_handoff_fd(
crate::handoff_runtime::ImportedHandoffRuntime {
master_fd: imported.master_fd,
state: imported.state.with_pane_id(*id),
},
runtime_context.scrollback_limit_bytes,
crate::terminal_theme::TerminalTheme::default(),
None,
runtime_context.events.clone(),
runtime_context.render_notify.clone(),
runtime_context.render_dirty.clone(),
)
} else {
TerminalRuntime::spawn_with_initial_history(
*id,
rows,
cols,
cwd.clone(),
runtime_context.scrollback_limit_bytes,
crate::terminal_theme::TerminalTheme::default(),
None,
runtime_context.shell_config,
&launch_env,
startup.initial_history_ansi,
runtime_context.events.clone(),
runtime_context.render_notify.clone(),
runtime_context.render_dirty.clone(),
)
}
#[cfg(not(unix))]
{
TerminalRuntime::spawn_with_initial_history(
*id,
rows,
cols,
cwd.clone(),
runtime_context.scrollback_limit_bytes,
crate::terminal_theme::TerminalTheme::default(),
None,
runtime_context.shell_config,
&launch_env,
startup.initial_history_ansi,
runtime_context.events.clone(),
runtime_context.render_notify.clone(),
runtime_context.render_dirty.clone(),
)
}
};
match runtime_result {
Ok(runtime) => {
let terminal_id = TerminalId::alloc();
let mut terminal = TerminalState::new(terminal_id.clone(), cwd.clone());
if was_imported {
if let Some(argv) = saved_launch_argv {
terminal = terminal.with_launch_argv(argv).with_respawn_shell_on_exit();
}
}
if let Some(label) = saved_label {
terminal.set_manual_label(label);
}
if let Some(session) = restored_agent_session {
terminal.set_persisted_agent_session(session);
}
match (saved_agent_name, saved_managed_agent) {
(Some(agent_name), Some(agent)) if was_imported => {
terminal.restore_managed_agent(agent_name, agent)
}
(Some(_), Some(_)) => {}
(Some(agent_name), None) if was_imported => terminal.set_agent_name(agent_name),
(Some(_), None) => {}
(None, _) => {}
}
if let Some(agent) = initial_restore_agent {
let _ = terminal.set_detected_state_with_screen_signals_at(
Some(agent),
AgentState::Idle,
false,
false,
false,
false,
std::time::Instant::now(),
);
}
#[cfg(unix)]
if let Some(agent_state) = handoff_agent_state {
terminal.restore_handoff_agent_state(agent_state);
}
panes.insert(*id, PaneState::new(terminal_id.clone()));
terminal_runtimes.insert(terminal_id, runtime);
terminals.push(terminal);
}
Err(e) => {
if let Some(key) = startup.reserved_agent_session.as_deref() {
resumed_agent_sessions.remove(key);
}
if was_imported {
failed_imports += 1;
error!(
tab = ?snap.custom_name,
pane_id = id.raw(),
err = %e,
"failed to restore imported pane"
);
}
error!(
tab = ?snap.custom_name,
pane_id = id.raw(),
err = %e,
"failed to restore pane"
);
if !was_imported {
let terminal = unavailable_restored_terminal(
saved_pane, cwd,
format!("Could not start the saved shell: {e}. Fix the shell configuration and restart this session."),
);
panes.insert(*id, PaneState::new(terminal.id.clone()));
terminals.push(terminal);
}
}
}
}
if panes.is_empty() {
warn!(
tab = ?snap.custom_name,
"no panes could be restored for tab, dropping it"
);
return (None, failed_imports);
}
let surviving: HashSet<PaneId> = panes.keys().copied().collect();
let Some(node) = prune_restored_node(node, &surviving) else {
warn!(
tab = ?snap.custom_name,
"restored tab lost all panes after pruning missing layout nodes"
);
return (None, failed_imports);
};
let pane_ids = collect_pane_ids(&node);
let Some(focus) = resolve_restored_pane(snap.focused, &id_map, &surviving, &pane_ids) else {
return (None, failed_imports);
};
let Some(root_pane) = resolve_restored_pane(snap.root_pane, &id_map, &surviving, &pane_ids)
else {
return (None, failed_imports);
};
let layout = TileLayout::from_saved(node, focus);
(
Some((
crate::workspace::Tab {
custom_name: snap.custom_name.clone(),
number,
root_pane,
layout,
panes,
#[cfg(test)]
runtimes: HashMap::new(),
zoomed: snap.zoomed,
events: runtime_context.events.clone(),
render_notify: runtime_context.render_notify.clone(),
render_dirty: runtime_context.render_dirty.clone(),
},
terminals,
terminal_runtimes,
reverse_id_map,
)),
failed_imports,
)
}
fn pane_restore_startup<'a>(
session: Option<&PaneAgentSessionSnapshot>,
history: Option<&'a PaneHistorySnapshot>,
agent_restore: &mut AgentRestoreState<'_>,
) -> PaneRestoreStartup<'a> {
// Native agent resume owns the conversation history. If a pane has a
// resumable agent session and resume is enabled, do not replay saved pane
// presentation history into that terminal, even when this pane is a
// duplicate suppressed by session de-duplication.
let restore_plan =
session.and_then(|session| restore_plan_for_snapshot(session, agent_restore.enabled));
let has_native_agent_restore = restore_plan.is_some();
// Reserve before spawning so later panes in the same restore pass cannot
// launch the same native agent session. The caller rolls this reservation
// back if runtime spawn fails before any agent process is started.
let mut reserved_agent_session = None;
let duplicate_agent_session = restore_plan.as_ref().is_some_and(|plan| {
if agent_restore
.resumed_sessions
.insert(plan.dedupe_key.clone())
{
reserved_agent_session = Some(plan.dedupe_key.clone());
false
} else {
true
}
});
let restore_plan = if duplicate_agent_session {
None
} else {
restore_plan
};
PaneRestoreStartup {
restore_plan,
initial_history_ansi: if has_native_agent_restore {
None
} else {
history.map(|history| history.ansi.as_str())
},
duplicate_agent_session,
reserved_agent_session,
}
}
fn restore_plan_for_snapshot(
session: &PaneAgentSessionSnapshot,
resume_agents_on_restore: bool,
) -> Option<crate::agent_resume::AgentResumePlan> {
if !resume_agents_on_restore {
return None;
}
let persisted = persisted_agent_session_from_snapshot(session)?;
crate::agent_resume::plan(&session.source, &session.agent, &persisted.session_ref)
}
fn persisted_agent_session_from_snapshot(
session: &PaneAgentSessionSnapshot,
) -> Option<crate::agent_resume::PersistedAgentSession> {
crate::agent_resume::session_ref_from_snapshot(
&session.source,
&session.agent,
session.kind,
&session.value,
)
}
fn restored_terminal_agent_session(
session: Option<&PaneAgentSessionSnapshot>,
duplicate_agent_session: bool,
) -> Option<crate::agent_resume::PersistedAgentSession> {
if duplicate_agent_session {
return None;
}
session.and_then(persisted_agent_session_from_snapshot)
}
#[cfg(test)]
fn take_restore_plan_for_snapshot(
session: &PaneAgentSessionSnapshot,
resume_agents_on_restore: bool,
resumed_agent_sessions: &mut HashSet<String>,
) -> Option<crate::agent_resume::AgentResumePlan> {
restore_plan_for_snapshot(session, resume_agents_on_restore)
.filter(|plan| resumed_agent_sessions.insert(plan.dedupe_key.clone()))
}
pub(super) fn prune_restored_node(node: Node, surviving: &HashSet<PaneId>) -> Option<Node> {
match node {
Node::Pane(id) => surviving.contains(&id).then_some(Node::Pane(id)),
Node::Split {
direction,
ratio,
first,
second,
} => {
let first = prune_restored_node(*first, surviving);
let second = prune_restored_node(*second, surviving);
match (first, second) {
(Some(first), Some(second)) => Some(Node::Split {
direction,
ratio,
first: Box::new(first),
second: Box::new(second),
}),
(Some(remaining), None) | (None, Some(remaining)) => Some(remaining),
(None, None) => None,
}
}
}
}
pub(super) fn resolve_restored_pane(
saved_old_id: Option<u32>,
id_map: &HashMap<u32, PaneId>,
surviving: &HashSet<PaneId>,
pane_ids: &[PaneId],
) -> Option<PaneId> {
saved_old_id
.and_then(|old_id| id_map.get(&old_id).copied())
.filter(|pane_id| surviving.contains(pane_id))
.or_else(|| pane_ids.first().copied())
}
/// Restore a layout tree, remapping every pane ID to a fresh globally unique one.
/// Returns the new tree and a map of old_raw_id → new PaneId.
pub(super) fn restore_node_remapped(snap: &LayoutSnapshot) -> (Node, HashMap<u32, PaneId>) {
let mut id_map = HashMap::new();
let node = remap_inner(snap, &mut id_map);
(node, id_map)
}
fn remap_inner(snap: &LayoutSnapshot, id_map: &mut HashMap<u32, PaneId>) -> Node {
match snap {
LayoutSnapshot::Pane(old_id) => {
let new_id = PaneId::alloc();
id_map.insert(*old_id, new_id);
Node::Pane(new_id)
}
LayoutSnapshot::Split {
direction,
ratio,
first,
second,
} => {
let first_node = remap_inner(first, id_map);
let second_node = remap_inner(second, id_map);
let dir = match direction {
DirectionSnapshot::Horizontal => Direction::Horizontal,
DirectionSnapshot::Vertical => Direction::Vertical,
};
Node::Split {
direction: dir,
ratio: *ratio,
first: Box::new(first_node),
second: Box::new(second_node),
}
}
}
}
pub(super) fn collect_pane_ids(node: &Node) -> Vec<PaneId> {
let mut ids = Vec::new();
collect_ids_inner(node, &mut ids);
ids
}
fn collect_ids_inner(node: &Node, ids: &mut Vec<PaneId>) {
match node {
Node::Pane(id) => ids.push(*id),
Node::Split { first, second, .. } => {
collect_ids_inner(first, ids);
collect_ids_inner(second, ids);
}
}
}
#[cfg(test)]
mod tests {
use super::*;
fn test_session_path(name: &str) -> String {
std::env::current_dir()
.unwrap()
.join(name)
.display()
.to_string()
}
#[cfg(windows)]
fn test_restore_shell() -> &'static str {
"C:\\Windows\\System32\\whoami.exe"
}
#[cfg(not(windows))]
fn test_restore_shell() -> &'static str {
"/bin/sh"
}
#[test]
fn capture_and_restore_node_round_trip() {
let node = Node::Split {
direction: Direction::Horizontal,
ratio: 0.5,
first: Box::new(Node::Pane(PaneId::from_raw(0))),
second: Box::new(Node::Split {
direction: Direction::Vertical,
ratio: 0.3,
first: Box::new(Node::Pane(PaneId::from_raw(1))),
second: Box::new(Node::Pane(PaneId::from_raw(2))),
}),
};
let snap = super::super::snapshot::capture_node(&node);
let (restored, id_map) = restore_node_remapped(&snap);
assert_eq!(id_map.len(), 3);
let ids = collect_pane_ids(&restored);
assert_eq!(ids.len(), 3);
let unique: std::collections::HashSet<u32> = ids.iter().map(|id| id.raw()).collect();
assert_eq!(unique.len(), 3);
}
#[test]
fn prune_restored_node_collapses_missing_branch() {
let keep = PaneId::from_raw(11);
let missing = PaneId::from_raw(12);
let node = Node::Split {
direction: Direction::Horizontal,
ratio: 0.5,
first: Box::new(Node::Pane(keep)),
second: Box::new(Node::Pane(missing)),
};
let surviving = std::collections::HashSet::from([keep]);
let pruned = prune_restored_node(node, &surviving).expect("remaining pane should survive");
assert!(matches!(pruned, Node::Pane(id) if id == keep));
}
#[test]
fn resolve_restored_pane_prefers_surviving_saved_id_and_falls_back_to_first_remaining() {
let first = PaneId::from_raw(21);
let second = PaneId::from_raw(22);
let id_map = HashMap::from([(0_u32, first), (1_u32, second)]);
let surviving = std::collections::HashSet::from([first]);
let pane_ids = vec![first];
assert_eq!(
resolve_restored_pane(Some(0), &id_map, &surviving, &pane_ids),
Some(first)
);
assert_eq!(
resolve_restored_pane(Some(1), &id_map, &surviving, &pane_ids),
Some(first)
);
}
#[test]
fn restored_worktree_space_membership_drops_missing_checkout() {
let missing =
std::env::temp_dir().join(format!("herdr-missing-worktree-{}", std::process::id()));
let membership = crate::workspace::WorktreeSpaceMembership {
key: "repo-key".into(),
label: "herdr".into(),
repo_root: missing.join("repo"),
checkout_path: missing.join("checkout"),
is_linked_worktree: true,
};
assert_eq!(restored_worktree_space_membership(Some(membership)), None);
}
#[test]
fn restore_plan_respects_opt_in_and_allowlist() {
let pi_session_path = test_session_path("pi-session.jsonl");
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:pi".into(),
agent: "pi".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: pi_session_path.clone(),
};
assert!(restore_plan_for_snapshot(&session, false).is_none());
assert_eq!(
restore_plan_for_snapshot(&session, true).unwrap().argv,
vec!["pi", "--session", pi_session_path.as_str()]
);
let unsupported_path = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:claude".into(),
agent: "claude".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: test_session_path("claude-session"),
};
assert!(restore_plan_for_snapshot(&unsupported_path, true).is_none());
}
#[test]
fn restore_plan_selection_suppresses_duplicates() {
let pi_session_path = test_session_path("pi-session.jsonl");
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:pi".into(),
agent: "pi".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: pi_session_path.clone(),
};
let mut resumed = HashSet::new();
assert!(take_restore_plan_for_snapshot(&session, false, &mut resumed).is_none());
assert!(resumed.is_empty());
let first = take_restore_plan_for_snapshot(&session, true, &mut resumed)
.expect("first restore should get a plan");
assert_eq!(
first.argv,
vec!["pi", "--session", pi_session_path.as_str()]
);
assert!(take_restore_plan_for_snapshot(&session, true, &mut resumed).is_none());
}
#[test]
fn pane_restore_startup_suppresses_history_for_native_agent_resume() {
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:pi".into(),
agent: "pi".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: test_session_path("pi-session.jsonl"),
};
let history = super::super::snapshot::PaneHistorySnapshot {
ansi: "RESTORED_HISTORY\r\n".into(),
lines: 1,
};
let mut resumed = HashSet::new();
let mut agent_restore = AgentRestoreState {
enabled: true,
resumed_sessions: &mut resumed,
};
let startup = pane_restore_startup(Some(&session), Some(&history), &mut agent_restore);
assert!(startup.restore_plan.is_some());
assert!(startup.initial_history_ansi.is_none());
assert!(!startup.duplicate_agent_session);
}
#[test]
fn pane_restore_startup_suppresses_history_for_duplicate_native_agent_session() {
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:pi".into(),
agent: "pi".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: test_session_path("pi-session.jsonl"),
};
let history = super::super::snapshot::PaneHistorySnapshot {
ansi: "RESTORED_HISTORY\r\n".into(),
lines: 1,
};
let mut resumed = HashSet::new();
let mut agent_restore = AgentRestoreState {
enabled: true,
resumed_sessions: &mut resumed,
};
let first = pane_restore_startup(Some(&session), Some(&history), &mut agent_restore);
let duplicate = pane_restore_startup(Some(&session), Some(&history), &mut agent_restore);
assert!(first.restore_plan.is_some());
assert!(first.initial_history_ansi.is_none());
assert!(duplicate.restore_plan.is_none());
assert!(duplicate.initial_history_ansi.is_none());
assert!(duplicate.duplicate_agent_session);
}
#[test]
fn pane_restore_startup_keeps_history_without_native_agent_resume() {
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:pi".into(),
agent: "pi".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: test_session_path("pi-session.jsonl"),
};
let history = super::super::snapshot::PaneHistorySnapshot {
ansi: "RESTORED_HISTORY\r\n".into(),
lines: 1,
};
let mut resumed = HashSet::new();
let mut agent_restore = AgentRestoreState {
enabled: false,
resumed_sessions: &mut resumed,
};
let startup = pane_restore_startup(Some(&session), Some(&history), &mut agent_restore);
assert!(startup.restore_plan.is_none());
assert_eq!(startup.initial_history_ansi, Some("RESTORED_HISTORY\r\n"));
assert!(!startup.duplicate_agent_session);
assert!(resumed.is_empty());
}
#[test]
fn restore_rehydrates_agent_session_metadata() {
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:hermes".into(),
agent: "hermes".into(),
kind: crate::agent_resume::AgentSessionRefKind::Id,
value: "hermes-session".into(),
};
let preserved = restored_terminal_agent_session(Some(&session), false)
.expect("restore should preserve metadata");
assert_eq!(preserved.source, "herdr:hermes");
assert_eq!(preserved.agent, "hermes");
assert_eq!(preserved.session_ref.value, "hermes-session");
}
#[test]
fn restore_does_not_rehydrate_duplicate_agent_session_metadata() {
let session = super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:pi".into(),
agent: "pi".into(),
kind: crate::agent_resume::AgentSessionRefKind::Path,
value: test_session_path("pi-session.jsonl"),
};
let mut resumed = HashSet::new();
assert!(take_restore_plan_for_snapshot(&session, true, &mut resumed).is_some());
assert!(take_restore_plan_for_snapshot(&session, true, &mut resumed).is_none());
assert!(restored_terminal_agent_session(Some(&session), true).is_none());
}
#[tokio::test]
async fn failed_cold_restore_preserves_panes_and_saved_directories() {
for missing_shell in [false, true] {
let mut snapshot: SessionSnapshot = serde_json::from_str(include_str!(
"../../tests/fixtures/session/current-herdr-session.json"
))
.unwrap();
let cwd = std::env::current_dir().unwrap();
let missing = cwd.join("__herdr_missing_restore_directory__");
assert!(!missing.exists());
for workspace in &mut snapshot.workspaces {
workspace.identity_cwd = cwd.clone();
for tab in &mut workspace.tabs {
for pane in tab.panes.values_mut() {
pane.cwd = cwd.clone();
}
}
}
let failed = snapshot.workspaces[0].tabs[0].panes.get_mut(&1).unwrap();
failed.cwd = missing.clone();
failed.label = Some("keep my pane".into());
failed.agent_session = Some(super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:opencode".into(),
agent: "opencode".into(),
kind: crate::agent_resume::AgentSessionRefKind::Id,
value: "keep-my-session".into(),
});
let (events, _rx) = mpsc::channel(32);
let (workspaces, terminals, runtimes) = restore(
&snapshot,
None,
24,
80,
0,
if missing_shell {
"__herdr_missing_restore_shell__"
} else {
test_restore_shell()
},
crate::config::ShellModeConfig::NonLogin,
false,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let runtimes = crate::terminal::TerminalRuntimeRegistry::from(runtimes);
let captured = crate::persist::capture(&workspaces, &terminals, &runtimes, Some(0), 0);
assert_eq!(
captured.workspaces.len(),
2,
"a launch failure must not delete a workspace"
);
assert_eq!(captured.workspaces[0].tabs.len(), 2);
let pane = captured.workspaces[0].tabs[0]
.panes
.values()
.next()
.unwrap();
assert_eq!(
pane.cwd, missing,
"fallback cwd must not replace saved intent"
);
assert_eq!(pane.label.as_deref(), Some("keep my pane"));
assert_eq!(
pane.agent_session.as_ref().unwrap().value,
"keep-my-session"
);
let root = workspaces[0].tabs[0].root_pane;
let terminal_id = workspaces[0].tabs[0].terminal_id(root).unwrap();
assert!(
runtimes.get(terminal_id).is_none(),
"do not open a replacement shell elsewhere"
);
let healthy = workspaces[1].tabs[0]
.terminal_id(workspaces[1].tabs[0].root_pane)
.unwrap();
assert_eq!(runtimes.get(healthy).is_some(), !missing_shell);
assert!(terminals[terminal_id].restore_error.is_some());
let mut state = crate::app::AppState::test_new();
state.workspaces = workspaces;
state.terminals = terminals;
state.active = Some(0);
state.assert_invariants_for_test();
}
}
#[tokio::test]
async fn restore_carries_persisted_agent_session_metadata() {
let cwd = std::env::current_dir().unwrap();
let snapshot = SessionSnapshot {
version: super::super::snapshot::SNAPSHOT_VERSION,
workspaces: vec![WorkspaceSnapshot {
id: Some("workspace".into()),
custom_name: None,
identity_cwd: cwd.clone(),
worktree_space: None,
public_pane_numbers: HashMap::new(),
next_public_pane_number: 0,
public_tab_numbers: Vec::new(),
next_public_tab_number: 0,
tabs: vec![TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(0),
panes: HashMap::from([(
0,
super::super::snapshot::PaneSnapshot {
cwd,
label: Some("reviewer".into()),
agent_name: Some("reviewer".into()),
managed_agent_kind: Some("opencode".into()),
agent_session: Some(super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:opencode".into(),
agent: "opencode".into(),
kind: crate::agent_resume::AgentSessionRefKind::Id,
value: "opencode-session".into(),
}),
launch_argv: None,
},
)]),
zoomed: false,
focused: Some(0),
root_pane: Some(0),
}],
active_tab: 0,
}],
active: Some(0),
selected: 0,
sidebar_width: None,
sidebar_section_split: None,
collapsed_space_keys: Default::default(),
};
let (events, _event_rx) = mpsc::channel(4);
let (_workspaces, terminals, _runtimes) = restore(
&snapshot,
None,
24,
80,
0,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let terminal = terminals
.values()
.next()
.expect("restored terminal should exist");
assert!(
!terminal.respawn_shell_on_exit,
"agent sessions should not use native restore lifecycle when resume_agents_on_restore is disabled"
);
assert_eq!(terminal.agent_name, None);
assert_eq!(terminal.manual_label.as_deref(), Some("reviewer"));
let session = terminal
.persisted_agent_session
.as_ref()
.expect("persisted agent session should survive restore");
assert_eq!(session.source, "herdr:opencode");
assert_eq!(session.agent, "opencode");
assert_eq!(session.session_ref.value, "opencode-session");
}
#[tokio::test]
async fn restore_preserves_public_id_mapping_after_pane_id_remap() {
let cwd = std::env::current_dir().unwrap();
let snapshot = SessionSnapshot {
version: super::super::snapshot::SNAPSHOT_VERSION,
workspaces: vec![WorkspaceSnapshot {
id: Some("w1".into()),
custom_name: None,
identity_cwd: cwd.clone(),
worktree_space: None,
public_pane_numbers: HashMap::from([(10, 1), (20, 3)]),
next_public_pane_number: 4,
public_tab_numbers: vec![5],
next_public_tab_number: 6,
tabs: vec![TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Split {
direction: super::super::snapshot::DirectionSnapshot::Horizontal,
ratio: 0.5,
first: Box::new(LayoutSnapshot::Pane(10)),
second: Box::new(LayoutSnapshot::Pane(20)),
},
panes: HashMap::from([
(
10,
super::super::snapshot::PaneSnapshot {
cwd: cwd.clone(),
label: None,
agent_name: None,
managed_agent_kind: None,
agent_session: None,
launch_argv: None,
},
),
(
20,
super::super::snapshot::PaneSnapshot {
cwd: cwd.clone(),
label: None,
agent_name: None,
managed_agent_kind: None,
agent_session: None,
launch_argv: None,
},
),
]),
zoomed: false,
focused: Some(10),
root_pane: Some(10),
}],
active_tab: 0,
}],
active: Some(0),
selected: 0,
sidebar_width: None,
sidebar_section_split: None,
collapsed_space_keys: Default::default(),
};
let (events, _event_rx) = mpsc::channel(4);
let (workspaces, _terminals, _runtimes) = restore(
&snapshot,
None,
24,
80,
0,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let workspace = workspaces.first().expect("workspace should restore");
let mut public_numbers: Vec<_> = workspace.public_pane_numbers.values().copied().collect();
public_numbers.sort_unstable();
assert_eq!(public_numbers, vec![1, 3]);
assert_eq!(workspace.next_public_pane_number, 4);
assert_eq!(workspace.tabs[0].number, 5);
assert_eq!(workspace.next_public_tab_number, 6);
}
#[tokio::test]
async fn cold_restore_with_gapped_public_tab_numbers_drops_unmanaged_agent_name() {
let cwd = std::env::current_dir().unwrap();
let pane_snap = |id: &str| {
(
id.parse::<u32>().unwrap(),
super::super::snapshot::PaneSnapshot {
cwd: cwd.clone(),
label: None,
agent_name: None,
managed_agent_kind: None,
agent_session: None,
launch_argv: None,
},
)
};
let final_pane = super::super::snapshot::PaneSnapshot {
cwd: cwd.clone(),
label: Some("planner".into()),
agent_name: Some("planner".into()),
managed_agent_kind: None,
agent_session: Some(super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:codex".into(),
agent: "codex".into(),
kind: crate::agent_resume::AgentSessionRefKind::Id,
value: "codex-session".into(),
}),
launch_argv: None,
};
let snapshot = SessionSnapshot {
version: super::super::snapshot::SNAPSHOT_VERSION,
workspaces: vec![WorkspaceSnapshot {
id: Some("w1".into()),
custom_name: None,
identity_cwd: cwd.clone(),
worktree_space: None,
public_pane_numbers: HashMap::from([(10, 1), (11, 2), (12, 3), (13, 4)]),
next_public_pane_number: 5,
public_tab_numbers: vec![1, 3, 4, 5],
next_public_tab_number: 6,
tabs: vec![
TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(10),
panes: HashMap::from([pane_snap("10")]),
zoomed: false,
focused: Some(10),
root_pane: Some(10),
},
TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(11),
panes: HashMap::from([pane_snap("11")]),
zoomed: false,
focused: Some(11),
root_pane: Some(11),
},
TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(12),
panes: HashMap::from([pane_snap("12")]),
zoomed: false,
focused: Some(12),
root_pane: Some(12),
},
TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(13),
panes: HashMap::from([(13, final_pane)]),
zoomed: false,
focused: Some(13),
root_pane: Some(13),
},
],
active_tab: 3,
}],
active: Some(0),
selected: 0,
sidebar_width: None,
sidebar_section_split: None,
collapsed_space_keys: Default::default(),
};
let (events, _event_rx) = mpsc::channel(4);
let (workspaces, terminals, _runtimes) = restore(
&snapshot,
None,
24,
80,
0,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let workspace = workspaces.first().expect("workspace should restore");
assert_eq!(workspace.active_tab, 3);
assert_eq!(workspace.tabs[3].number, 5);
let agent_pane = workspace.tabs[3].root_pane;
let terminal_id = &workspace.tabs[3].panes[&agent_pane].attached_terminal_id;
assert!(terminals[terminal_id].agent_name.is_none());
assert_eq!(terminals[terminal_id].managed_agent_kind(), None);
assert!(workspace
.pane_details(&terminals)
.into_iter()
.all(|detail| detail.pane_id != agent_pane));
}
#[test]
fn legacy_restore_precomputes_missing_public_pane_numbers() {
let cwd = std::env::current_dir().unwrap();
let snapshot = WorkspaceSnapshot {
id: Some("w1".into()),
custom_name: None,
identity_cwd: cwd,
worktree_space: None,
public_pane_numbers: HashMap::new(),
next_public_pane_number: 0,
public_tab_numbers: Vec::new(),
next_public_tab_number: 0,
tabs: vec![TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Split {
direction: super::super::snapshot::DirectionSnapshot::Horizontal,
ratio: 0.5,
first: Box::new(LayoutSnapshot::Pane(10)),
second: Box::new(LayoutSnapshot::Pane(20)),
},
panes: HashMap::new(),
zoomed: false,
focused: Some(10),
root_pane: Some(10),
}],
active_tab: 0,
};
let mut next_public_pane_number = 1;
let public_numbers =
migrated_public_pane_numbers_by_old_raw(&snapshot, &mut next_public_pane_number);
assert_eq!(public_numbers, HashMap::from([(10, 1), (20, 2)]));
assert_eq!(next_public_pane_number, 3);
}
#[tokio::test]
#[cfg(unix)]
async fn native_agent_restore_defers_runtime_launch() {
let cwd = std::env::current_dir().unwrap();
let snapshot = SessionSnapshot {
version: super::super::snapshot::SNAPSHOT_VERSION,
workspaces: vec![WorkspaceSnapshot {
id: Some("workspace".into()),
custom_name: None,
identity_cwd: cwd.clone(),
worktree_space: None,
public_pane_numbers: HashMap::new(),
next_public_pane_number: 0,
public_tab_numbers: Vec::new(),
next_public_tab_number: 0,
tabs: vec![TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(0),
panes: HashMap::from([(
0,
super::super::snapshot::PaneSnapshot {
cwd,
label: None,
agent_name: None,
managed_agent_kind: None,
agent_session: Some(super::super::snapshot::PaneAgentSessionSnapshot {
source: "herdr:codex".into(),
agent: "codex".into(),
kind: crate::agent_resume::AgentSessionRefKind::Id,
value: "codex-session".into(),
}),
launch_argv: None,
},
)]),
zoomed: false,
focused: Some(0),
root_pane: Some(0),
}],
active_tab: 0,
}],
active: Some(0),
selected: 0,
sidebar_width: None,
sidebar_section_split: None,
collapsed_space_keys: Default::default(),
};
let (events, _event_rx) = mpsc::channel(4);
let (_workspaces, terminals, runtimes) = restore(
&snapshot,
None,
24,
80,
0,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
true,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let terminal = terminals
.values()
.next()
.expect("native agent restore should create terminal state");
assert!(
terminal.pending_agent_resume_plan.is_some(),
"restored native agent panes should defer resume until client terminal context is known"
);
assert!(
!terminal.respawn_shell_on_exit,
"deferred agent resume should not use native restore lifecycle before launch"
);
assert!(
runtimes.is_empty(),
"native agent restore should not spawn a fallback-size runtime during snapshot restore"
);
let mut imports = HashMap::new();
let (_handoff_workspaces, handoff_terminals, handoff_runtimes) = restore_handoff(
&snapshot,
0,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
&mut imports,
mpsc::channel(4).0,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
)
.expect("handoff restore should preserve pending native agent resume");
let handoff_terminal = handoff_terminals
.values()
.next()
.expect("handoff restore should create terminal state");
assert!(
handoff_terminal.pending_agent_resume_plan.is_some(),
"handoff restore should preserve pending native agent resume intent"
);
assert!(
handoff_runtimes.is_empty(),
"handoff restore should not replace pending native agent resume with a shell runtime"
);
}
#[tokio::test]
#[cfg(unix)]
async fn live_handoff_preserves_hook_status_until_next_report() {
for state_before_handoff in [AgentState::Working, AgentState::Blocked] {
let (snapshot, _) = snapshot_with_saved_pane_history();
let (events, _events_rx) = mpsc::channel(32);
let (workspaces, mut terminals, runtimes) = restore(
&snapshot,
None,
24,
80,
4096,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events.clone(),
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let terminal = terminals.values_mut().next().unwrap();
terminal
.set_detected_agent_process_at(crate::detect::Agent::Pi, std::time::Instant::now());
terminal.set_persisted_agent_session(crate::agent_resume::PersistedAgentSession {
source: "herdr:pi".into(),
agent: "pi".into(),
session_ref: crate::agent_resume::AgentSessionRef::path(
"/var/tmp/handoff-test.jsonl",
)
.unwrap(),
});
terminal.set_hook_authority_with_session_ref(
"herdr:pi".into(),
"pi".into(),
state_before_handoff,
None,
Some(
crate::agent_resume::AgentSessionRef::path("/var/tmp/handoff-test.jsonl")
.unwrap(),
),
Some(1),
);
assert_eq!(terminal.state, state_before_handoff);
let runtimes = crate::terminal::TerminalRuntimeRegistry::from(runtimes);
let snapshot = crate::persist::capture(&workspaces, &terminals, &runtimes, Some(0), 0);
let pane_id = workspaces[0].tabs[0].panes.keys().next().copied().unwrap();
let runtime = runtimes.values().next().unwrap();
runtime
.pause_handoff_reader(std::time::Duration::from_secs(2))
.unwrap();
let mut state = runtime.handoff_runtime_state(pane_id.raw());
state.agent_state = terminals.values().next().unwrap().handoff_agent_state();
let state = serde_json::from_value(serde_json::to_value(state).unwrap()).unwrap();
let mut imports = HashMap::from([(
pane_id.raw(),
crate::handoff_runtime::ImportedHandoffRuntime {
master_fd: runtime.duplicate_handoff_fd().unwrap(),
state,
},
)]);
let (_, mut restored_terminals, restored_runtimes) = restore_handoff(
&snapshot,
4096,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
&mut imports,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
)
.unwrap();
drop(restored_runtimes);
drop(runtimes);
let terminal = restored_terminals.values_mut().next().unwrap();
assert_eq!(terminal.state, state_before_handoff);
terminal.set_detected_state(Some(crate::detect::Agent::Pi), AgentState::Idle);
assert_eq!(
terminal.state, state_before_handoff,
"screen fallback must not erase the transferred hook status"
);
terminal.set_hook_authority_with_session_ref(
"herdr:pi".into(),
"pi".into(),
AgentState::Idle,
None,
Some(
crate::agent_resume::AgentSessionRef::path("/var/tmp/handoff-test.jsonl")
.unwrap(),
),
Some(2),
);
assert_eq!(
terminal.state,
AgentState::Idle,
"the next hook report must take effect immediately"
);
assert_eq!(
terminal.finish_agent_process_acquisition(),
state_before_handoff == AgentState::Blocked
);
}
}
#[tokio::test]
async fn restore_seeds_saved_pane_history_into_runtime() {
let (snapshot, history) = snapshot_with_saved_pane_history();
let (events, _events_rx) = mpsc::channel(8);
let render_notify = Arc::new(Notify::new());
let render_dirty = Arc::new(RenderSignal::new());
let (_workspaces, _terminals, runtimes) = restore(
&snapshot,
Some(&history),
5,
40,
4096,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events,
render_notify,
render_dirty,
);
let runtime = runtimes
.values()
.next()
.expect("restored runtime should exist");
let restored_text = runtime.recent_unwrapped_text(10);
assert!(
restored_text.contains("RESTORED_HISTORY 👨👩👧 LINK"),
"styled Unicode and hyperlink text should survive history replay"
);
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);
while runtime.cwd().is_none() && std::time::Instant::now() < deadline {
std::thread::sleep(std::time::Duration::from_millis(10));
}
let _ = runtime.try_send_bytes(bytes::Bytes::from_static(b"exit\n"));
}
#[tokio::test]
async fn restore_without_history_snapshot_keeps_pane_contents_empty() {
let (snapshot, _history) = snapshot_with_saved_pane_history();
let (events, _events_rx) = mpsc::channel(8);
let render_notify = Arc::new(Notify::new());
let render_dirty = Arc::new(RenderSignal::new());
let (_workspaces, _terminals, runtimes) = restore(
&snapshot,
None,
5,
40,
4096,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events,
render_notify,
render_dirty,
);
let runtime = runtimes
.values()
.next()
.expect("restored runtime should exist");
assert!(
!runtime
.recent_unwrapped_text(10)
.contains("RESTORED_HISTORY"),
"pane history should not restore unless a history snapshot is supplied"
);
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);
while runtime.cwd().is_none() && std::time::Instant::now() < deadline {
std::thread::sleep(std::time::Duration::from_millis(10));
}
let _ = runtime.try_send_bytes(bytes::Bytes::from_static(b"exit\n"));
}
#[tokio::test]
async fn restore_rejects_history_from_another_layout_or_without_provenance() {
for legacy in [false, true] {
let (mut snapshot, history) = snapshot_with_saved_pane_history();
let mut value = serde_json::to_value(history).unwrap();
if legacy {
value.as_object_mut().unwrap().remove("layout_fingerprint");
} else {
snapshot.workspaces[0].tabs[0]
.panes
.get_mut(&0)
.unwrap()
.cwd = std::env::temp_dir();
}
let history = serde_json::from_value(value).unwrap();
let (events, _rx) = mpsc::channel(8);
let (_, _, runtimes) = restore(
&snapshot,
Some(&history),
5,
80,
4096,
test_restore_shell(),
crate::config::ShellModeConfig::NonLogin,
false,
events,
Arc::new(Notify::new()),
Arc::new(RenderSignal::new()),
);
let runtime = runtimes.values().next().unwrap();
assert!(
!runtime
.recent_unwrapped_text(10)
.contains("RESTORED_HISTORY"),
"screen history must belong to the exact saved layout"
);
for (_, runtime) in runtimes {
runtime.shutdown();
}
}
}
fn snapshot_with_saved_pane_history() -> (SessionSnapshot, SessionHistorySnapshot) {
let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("/"));
let mut panes = HashMap::new();
panes.insert(
0,
super::super::snapshot::PaneSnapshot {
cwd: cwd.clone(),
label: None,
agent_name: None,
managed_agent_kind: None,
agent_session: None,
launch_argv: None,
},
);
let mut history = SessionHistorySnapshot {
version: super::super::snapshot::SNAPSHOT_VERSION,
layout_fingerprint: None,
workspaces: vec![WorkspaceHistorySnapshot {
tabs: vec![super::super::snapshot::TabHistorySnapshot {
panes: HashMap::from([(
0,
super::super::snapshot::PaneHistorySnapshot {
ansi: concat!(
"\x1b[31mRESTORED_HISTORY 👨👩👧\x1b[0m ",
"\x1b]8;;https://example.com\x1b\\LINK\x1b]8;;\x1b\\\r\n"
)
.to_string(),
lines: 1,
},
)]),
}],
}],
};
let snapshot = SessionSnapshot {
version: super::super::snapshot::SNAPSHOT_VERSION,
workspaces: vec![WorkspaceSnapshot {
id: Some("workspace".into()),
custom_name: None,
identity_cwd: cwd,
worktree_space: None,
public_pane_numbers: HashMap::new(),
next_public_pane_number: 0,
public_tab_numbers: Vec::new(),
next_public_tab_number: 0,
tabs: vec![TabSnapshot {
custom_name: None,
layout: LayoutSnapshot::Pane(0),
panes,
zoomed: false,
focused: Some(0),
root_pane: Some(0),
}],
active_tab: 0,
}],
active: Some(0),
selected: 0,
sidebar_width: Some(26),
sidebar_section_split: Some(0.5),
collapsed_space_keys: Default::default(),
};
history.layout_fingerprint = super::super::snapshot::layout_fingerprint(&snapshot);
(snapshot, history)
}
}
|