mise 2026.9.14

Dev tools, env vars, and tasks in one CLI
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
//! Directory permissions are metadata-only writes in the same incoming batch.
use std::path::PathBuf;

use eyre::{Result, bail};

use super::layout::{Located, Roots};
use crate::system::history::{
    journal,
    manifest::Manifest,
    shadow::HistoryRepo,
    tracked::{ExcludeSet, TrackedEntry, TrackedSet, governing_key, mode_from},
};

#[derive(Clone, Debug)]
pub(super) struct Step {
    pub path: PathBuf,
    before: Option<(u64, u64, u32)>,
    desired: u32,
    written: Option<(u64, u64, u32)>,
}

#[cfg(unix)]
fn observe(path: &std::path::Path) -> Result<Option<(u64, u64, u32)>> {
    use std::os::unix::fs::MetadataExt;
    match std::fs::symlink_metadata(path) {
        Ok(meta) if meta.is_dir() => Ok(Some((meta.dev(), meta.ino(), meta.mode() & 0o777))),
        Ok(_) => bail!(
            "{} is not a directory; resolve its type before pulling",
            crate::file::display_path(path)
        ),
        Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(None),
        Err(err) => Err(err.into()),
    }
}

#[cfg(not(unix))]
fn observe(_path: &std::path::Path) -> Result<Option<(u64, u64, u32)>> {
    Ok(None)
}

/// Why a directory's recorded permissions apply here.
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
enum Claim {
    /// An enrolled path's own stream, or one below an enrolled path.
    Enrolled,
    /// The variant-less record of a directory strictly between the root and
    /// an enrolled path of any stream. The root itself is never claimed.
    Containing,
}

fn claim(
    roots: &Roots,
    tracked: &TrackedSet,
    exclude: &ExcludeSet,
    branch_path: &str,
) -> Option<Claim> {
    if super::run::eligible(roots, tracked, exclude, branch_path) {
        return Some(Claim::Enrolled);
    }
    let path = match roots.locate(branch_path) {
        Located::Tracked {
            path,
            variant: None,
        }
        | Located::Config(path) => path,
        Located::Tracked { .. } | Located::Marker | Located::Unmapped => return None,
    };
    (path != roots.home
        && path != roots.config_dir
        && tracked
            .entries
            .iter()
            .any(|entry| entry.path.starts_with(&path) && entry.path != path))
    .then_some(Claim::Containing)
}

/// Whether the tree holds the directory, decided in its governing stream
/// first: when an enrolled path covers it, a directory there means present
/// and a file or link there means it is never turned into a directory
/// because another stream holds one. When that stream has nothing there
/// (every file inside lives in a nested variant stream), or no enrolled
/// path covers it, the directory is present when some stream of a path
/// inside it holds it as a directory and none holds something else there.
fn present(
    repo: &HistoryRepo,
    tree: &str,
    roots: &Roots,
    entries: &[TrackedEntry],
    path: &std::path::Path,
) -> Result<bool> {
    let is_directory = |candidate: &str| -> Result<Option<bool>> {
        Ok(repo
            .object_at(tree, candidate)?
            .map(|(mode, _)| mode == "040000"))
    };
    let Some(governing) = governing_key(roots, entries, path) else {
        return Ok(false);
    };
    let covered = entries.iter().any(|entry| path.starts_with(&entry.path));
    if covered && let Some(is_directory) = is_directory(&governing)? {
        return Ok(is_directory);
    }
    let mut candidates = vec![governing];
    for entry in entries {
        if entry.path.starts_with(path)
            && entry.path != path
            && let Ok(stream) = entry.tree_path(path)
            && !candidates.contains(&stream)
        {
            candidates.push(stream);
        }
    }
    let mut found = false;
    for candidate in &candidates {
        match is_directory(candidate)? {
            Some(true) => found = true,
            Some(false) => return Ok(false),
            None => {}
        }
    }
    Ok(found)
}

pub(super) fn plan(repo: &HistoryRepo, tracked: &TrackedSet, tree: &str) -> Result<Vec<Step>> {
    if !cfg!(unix) {
        return Ok(vec![]);
    }
    let local = repo.ref_oid(HistoryRepo::HISTORY_REF)?;
    let saved = local
        .as_deref()
        .map(|head| Manifest::read(repo, head))
        .transpose()?
        .flatten()
        .unwrap_or_default();
    let roots = Roots::current();
    let exclude = tracked.exclude_set()?;
    let mut steps = vec![];
    let paths: std::collections::BTreeSet<_> = tracked
        .manifest
        .permissions
        .keys()
        .chain(saved.permissions.keys())
        .collect();
    // every directory some record names, when this machine's enrollment
    // covers it and the incoming tree holds it in a stream selected here
    let mut directories: std::collections::BTreeSet<PathBuf> = Default::default();
    for portable in paths {
        if claim(&roots, tracked, &exclude, portable).is_none() {
            continue;
        }
        let path = roots.locate(portable).path().unwrap().to_path_buf();
        if present(repo, tree, &roots, &tracked.entries, &path)? {
            directories.insert(path);
        }
    }
    let saved_entries = saved.selected_entries();
    for path in directories {
        let before = observe(&path)?;
        let desired = mode_from(
            &roots,
            &tracked.entries,
            &tracked.manifest.permissions,
            &path,
        )
        .unwrap_or(0o755);
        // a directory that already has the incoming mode needs nothing
        if before.map(|(_, _, bits)| bits) == Some(desired) {
            continue;
        }
        // The guard has one purpose: never overwrite a live mode the user has
        // not saved. The baseline is the mode this planner would have applied
        // from the saved manifest; a directory it does not cover has none,
        // and a directory that does not exist live has nothing to guard.
        let Some((_, _, live)) = before else {
            steps.push(Step {
                path,
                before,
                desired,
                written: None,
            });
            continue;
        };
        let baseline = mode_from(&roots, &saved_entries, &saved.permissions, &path);
        if baseline.is_some_and(|bits| bits != live) {
            bail!(
                "{} has unsaved directory permission changes; save them before pulling. Sharing is paused",
                crate::file::display_path(&path)
            );
        }
        steps.push(Step {
            path,
            before,
            desired,
            written: None,
        });
    }
    steps.sort_by_key(|step| step.path.components().count());
    Ok(steps)
}

impl Step {
    pub(super) fn validate(&self) -> Result<()> {
        if observe(&self.path)? != self.before {
            bail!(
                "{} changed after permission planning; retry pull",
                crate::file::display_path(&self.path)
            );
        }
        Ok(())
    }

    pub(super) fn apply(&mut self) -> Result<()> {
        self.validate()?;
        let pending = journal::begin_changes_with(
            "history",
            "directory permissions",
            [(self.path.clone(), journal::Capture::Shallow)],
        )?;
        if self.before.is_none() {
            crate::file::create_dir_all(&self.path)?;
        }
        set_mode(&self.path, self.desired)?;
        self.written = observe(&self.path)?;
        journal::commit_changes(pending);
        Ok(())
    }

    pub(super) fn verify_written(&self) -> Result<()> {
        if observe(&self.path)? != self.written {
            bail!(
                "{} changed during application; left untouched",
                crate::file::display_path(&self.path)
            );
        }
        Ok(())
    }

    pub(super) fn recover(&self) -> Result<()> {
        if self.written.is_none() {
            return Ok(());
        }
        self.verify_written()?;
        match self.before {
            Some((_, _, mode)) => set_mode(&self.path, mode),
            None => std::fs::remove_dir(&self.path).map_err(Into::into),
        }
    }
}

fn set_mode(path: &std::path::Path, bits: u32) -> Result<()> {
    #[cfg(unix)]
    {
        use std::os::unix::fs::PermissionsExt;
        std::fs::set_permissions(path, std::fs::Permissions::from_mode(bits))?;
    }
    #[cfg(not(unix))]
    let _ = (path, bits);
    Ok(())
}

#[cfg(all(test, unix))]
mod tests {
    use super::*;

    #[test]
    fn directories_containing_tracked_files_are_eligible() {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::tracked::TrackedEntry;
        let roots = Roots {
            home: "/home/u".into(),
            config_dir: "/config/mise".into(),
        };
        let policy = FilePolicy::for_mode(FileMode::Track);
        let mut variant = TrackedEntry::new("/home/u/.ssh/config".into(), "track", policy);
        variant.variant = Some("linux".into());
        let tracked = TrackedSet {
            entries: vec![
                TrackedEntry::new("/home/u/.claude/settings.json".into(), "track", policy),
                TrackedEntry::new("/config/mise/tasks/private/build".into(), "track", policy),
                variant,
            ],
            ..Default::default()
        };
        let exclude = tracked.exclude_set().unwrap();
        for path in [
            "home/.claude",
            "home/.claude/settings.json",
            "config/tasks",
            "config/tasks/private",
            "home/.ssh",
        ] {
            assert!(claim(&roots, &tracked, &exclude, path).is_some(), "{path}");
        }
        assert_eq!(
            claim(&roots, &tracked, &exclude, "home/.claude/settings.json"),
            Some(Claim::Enrolled)
        );
        assert_eq!(
            claim(&roots, &tracked, &exclude, "home/.ssh"),
            Some(Claim::Containing)
        );
        // a containing directory has no per-stream record
        for path in [
            "home",
            "config",
            "home/.claudia",
            "home/.claude/other",
            "home@linux/.claude",
            "home@linux/.ssh",
            "config@linux/tasks",
            "fs/etc",
        ] {
            assert!(claim(&roots, &tracked, &exclude, path).is_none(), "{path}");
        }
    }

    /// A directory that is both an enrolled stream and the parent of other
    /// enrolled paths gets one step, from its own stream: two steps for one
    /// missing directory would create it twice and abort a fresh bootstrap.
    #[test]
    fn one_step_per_directory_across_claims() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-claims-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        let policy = FilePolicy::for_mode(FileMode::Track);
        let mut directory = TrackedEntry::new(private.clone(), "track", policy);
        directory.variant = Some("linux".into());
        let file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        let own = directory.tree_path(&private)?;
        let containing = roots.branch_path(&private, None).unwrap();
        let blob = repo.hash_blob(b"{}")?;
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[
                Overlay {
                    path: directory.tree_path(&private.join("notes"))?,
                    object: Some(("100644".into(), blob.clone())),
                },
                Overlay {
                    path: file.tree_path(&file.path)?,
                    object: Some(("100644".into(), blob)),
                },
            ],
        )?;
        let variant = |os: &str| crate::system::history::select::Variant {
            os: vec![os.into()],
            ..Default::default()
        };
        let mut manifest = Manifest {
            enrollment: vec![
                Enrollment {
                    path: containing.clone(),
                    autosave: true,
                    encrypt: false,
                    variants: vec![variant("linux"), variant("macos")],
                    exclude: None,
                    include: None,
                },
                Enrollment {
                    path: file.tree_path(&file.path)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![],
                    exclude: None,
                    include: None,
                },
            ],
            permissions: std::collections::BTreeMap::from([
                (own.clone(), 0o700),
                (containing.clone(), 0o750),
            ]),
            ..Default::default()
        };
        // a fresh machine: no local history, the directory does not exist
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![directory, file],
            manifest: manifest.clone(),
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o700);
        assert!(steps[0].before.is_none());

        // the directory's own stream stays authoritative even without a
        // record: its absence is the default, and another platform's
        // containing record does not apply here
        manifest.permissions.remove(&own);
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            manifest: manifest.clone(),
            ..tracked
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].desired, 0o755);

        // the own stream stays authoritative when only the local head still
        // records it: the incoming manifest dropped it (a machine with this
        // stream saved the directory at the default), so that default wins
        // over another platform's containing record
        use crate::system::history::checkpoint::test_checkpoint;
        use std::os::unix::fs::PermissionsExt;
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o700))?;
        let mut local = manifest.clone();
        local.permissions.insert(own.clone(), 0o700);
        local
            .permissions
            .insert(own.replace("@linux/", "@macos/"), 0o700);
        let head = local.write(&repo, &files)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o755);
        Ok(())
    }

    /// Only a child was enrolled in the stream locally, so the tree already
    /// holds the directory under it while the local baseline is the
    /// containing record. An incoming change enrolling the directory itself
    /// in that stream compares the live mode with that baseline, not with a
    /// default read from a key the local enrollment never governed.
    #[test]
    fn a_newly_enrolled_parent_keeps_its_containing_baseline() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-newly-enrolled-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o700))?;
        let policy = FilePolicy::for_mode(FileMode::Track);
        let mut file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        file.variant = Some("linux".into());
        let mut directory = TrackedEntry::new(private.clone(), "track", policy);
        directory.variant = Some("linux".into());
        let containing = roots.branch_path(&private, None).unwrap();
        let own = directory.tree_path(&private)?;
        let linux = || crate::system::history::select::Variant {
            os: vec!["linux".into()],
            ..Default::default()
        };
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: file.tree_path(&file.path)?,
                object: Some(("100644".into(), repo.hash_blob(b"{}")?)),
            }],
        )?;
        // the local head: only the child is enrolled in the Linux stream,
        // the directory is a containing record
        let local = Manifest {
            enrollment: vec![Enrollment {
                path: roots.branch_path(&file.path, None).unwrap(),
                autosave: true,
                encrypt: false,
                variants: vec![
                    linux(),
                    crate::system::history::select::Variant {
                        os: vec!["macos".into()],
                        ..Default::default()
                    },
                ],
                exclude: None,
                include: None,
            }],
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o700)]),
            ..Default::default()
        };
        let head = local.write(&repo, &files)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        // incoming: the directory itself is enrolled in that stream at 0750
        let incoming = Manifest {
            enrollment: vec![Enrollment {
                path: containing.clone(),
                autosave: true,
                encrypt: false,
                variants: vec![linux()],
                exclude: None,
                include: None,
            }],
            permissions: std::collections::BTreeMap::from([(own.clone(), 0o750)]),
            ..Default::default()
        };
        let tree = incoming.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![directory],
            manifest: incoming,
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o750);
        // a chmod away from the containing baseline is still unsaved
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o711))?;
        let err = plan(&repo, &tracked, &tree).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );
        Ok(())
    }

    /// A directory that does not exist live has no mode to guard: a new
    /// private subdirectory inside an enrolled directory is created with the
    /// incoming mode, not reported as an unsaved change.
    #[test]
    fn a_new_private_subdirectory_is_created_not_guarded() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-new-subdir-")
            .tempdir_in(&roots.home)?;
        let configs = normalize(scratch.path()).join("configs");
        std::fs::create_dir(&configs)?;
        let private = configs.join("private");
        let entry = TrackedEntry::new(
            configs.clone(),
            "track",
            FilePolicy::for_mode(FileMode::Track),
        );
        let blob = repo.hash_blob(b"{}")?;
        let saved_tree = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: entry.tree_path(&configs.join("app.toml"))?,
                object: Some(("100644".into(), blob.clone())),
            }],
        )?;
        let mut manifest = Manifest {
            enrollment: vec![Enrollment {
                path: entry.tree_path(&configs)?,
                autosave: true,
                encrypt: false,
                variants: vec![],
                exclude: None,
                include: None,
            }],
            ..Default::default()
        };
        let head = manifest.write(&repo, &saved_tree)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        // incoming: a new private subdirectory with a file inside
        let incoming_tree = repo.compose(
            &saved_tree,
            &[Overlay {
                path: entry.tree_path(&private.join("settings.json"))?,
                object: Some(("100644".into(), blob)),
            }],
        )?;
        let key = entry.tree_path(&private)?;
        manifest.permissions.insert(key, 0o700);
        let tree = manifest.write(&repo, &incoming_tree)?;
        let tracked = TrackedSet {
            entries: vec![entry],
            manifest,
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o700);
        assert!(steps[0].before.is_none());
        Ok(())
    }

    /// A nested enrollment that is not selected on this machine does not
    /// hide the enclosing enrollment that governs the directory here: the
    /// baseline is still that enrollment's record (absent: the default), so
    /// an unsaved chmod is reported, not overwritten.
    #[test]
    fn an_inactive_nested_enrollment_does_not_hide_the_governing_parent() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-nested-inactive-")
            .tempdir_in(&roots.home)?;
        let configs = normalize(scratch.path()).join("configs");
        let private = configs.join("private");
        std::fs::create_dir_all(&private)?;
        // the directory was saved at the default; the chmod below is unsaved
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o700))?;
        let entry = TrackedEntry::new(
            configs.clone(),
            "track",
            FilePolicy::for_mode(FileMode::Track),
        );
        let blob = repo.hash_blob(b"{}")?;
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[
                Overlay {
                    path: entry.tree_path(&configs.join("app.toml"))?,
                    object: Some(("100644".into(), blob.clone())),
                },
                Overlay {
                    path: entry.tree_path(&private.join("settings.json"))?,
                    object: Some(("100644".into(), blob)),
                },
            ],
        )?;
        let key = entry.tree_path(&private)?;
        let mut manifest = Manifest {
            enrollment: vec![
                Enrollment {
                    path: entry.tree_path(&configs)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![],
                    exclude: None,
                    include: None,
                },
                // a nested enrollment for another platform only
                Enrollment {
                    path: key.clone(),
                    autosave: true,
                    encrypt: false,
                    variants: vec![crate::system::history::select::Variant {
                        os: vec!["windows".into()],
                        ..Default::default()
                    }],
                    exclude: None,
                    include: None,
                },
            ],
            ..Default::default()
        };
        let head = manifest.write(&repo, &files)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        manifest.permissions.insert(key, 0o750);
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![entry],
            manifest,
            ..Default::default()
        };
        let err = plan(&repo, &tracked, &tree).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );
        // saved and live agree on the default: the incoming mode is planned
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o755))?;
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].desired, 0o750);
        Ok(())
    }

    /// A path that is a file in its governing stream is never given a
    /// directory step because another stream holds a directory there: a
    /// Linux-only file `~/configs/platform` under an unqualified `~/configs`
    /// stays a file on a fresh Linux bootstrap even though macOS captured
    /// `platform/settings.json` through the outer enrollment.
    #[test]
    fn a_file_in_the_governing_stream_is_not_made_a_directory() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-mixed-types-")
            .tempdir_in(&roots.home)?;
        let configs = normalize(scratch.path()).join("configs");
        let platform = configs.join("platform");
        let policy = FilePolicy::for_mode(FileMode::Track);
        let outer = TrackedEntry::new(configs.clone(), "track", policy);
        let mut inner = TrackedEntry::new(platform.clone(), "track", policy);
        inner.variant = Some("linux".into());
        let blob = repo.hash_blob(b"{}")?;
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[
                // Linux saved `platform` as a file in its own stream
                Overlay {
                    path: inner.tree_path(&platform)?,
                    object: Some(("100644".into(), blob.clone())),
                },
                // macOS captured a directory of that name through `configs`
                Overlay {
                    path: outer.tree_path(&platform.join("settings.json"))?,
                    object: Some(("100644".into(), blob)),
                },
            ],
        )?;
        let variant = |os: &str| crate::system::history::select::Variant {
            os: vec![os.into()],
            ..Default::default()
        };
        let manifest = Manifest {
            enrollment: vec![
                Enrollment {
                    path: outer.tree_path(&configs)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![],
                    exclude: None,
                    include: None,
                },
                Enrollment {
                    path: outer.tree_path(&platform)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![variant("linux"), variant("macos")],
                    exclude: None,
                    include: None,
                },
            ],
            permissions: std::collections::BTreeMap::from([
                (inner.tree_path(&platform)?, 0o600),
                (outer.tree_path(&platform)?, 0o700),
            ]),
            ..Default::default()
        };
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![outer, inner],
            manifest,
            ..Default::default()
        };
        // a fresh machine: no directory step is planned for the file's path
        let steps = plan(&repo, &tracked, &tree)?;
        assert!(steps.iter().all(|step| step.path != platform), "{steps:?}");
        Ok(())
    }

    /// An intermediate directory under an unqualified enrollment whose files
    /// all live in a nested variant stream has no object in its governing
    /// stream; it is still present through that inner stream, so a fresh
    /// machine recreates it with its recorded mode instead of the default.
    #[test]
    fn a_covered_directory_present_only_in_an_inner_stream_is_planned() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-inner-stream-")
            .tempdir_in(&roots.home)?;
        let configs = normalize(scratch.path()).join("configs");
        let private = configs.join("private");
        let policy = FilePolicy::for_mode(FileMode::Track);
        let outer = TrackedEntry::new(configs.clone(), "track", policy);
        let mut settings = TrackedEntry::new(private.join("settings.json"), "track", policy);
        settings.variant = Some("linux".into());
        // the only file inside `private` lives in the Linux stream
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: settings.tree_path(&settings.path)?,
                object: Some(("100644".into(), repo.hash_blob(b"{}")?)),
            }],
        )?;
        assert!(
            repo.object_at(&files, &outer.tree_path(&private)?)?
                .is_none()
        );
        let variant = |os: &str| crate::system::history::select::Variant {
            os: vec![os.into()],
            ..Default::default()
        };
        let manifest = Manifest {
            enrollment: vec![
                Enrollment {
                    path: outer.tree_path(&configs)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![],
                    exclude: None,
                    include: None,
                },
                Enrollment {
                    path: outer.tree_path(&settings.path)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![variant("linux"), variant("macos")],
                    exclude: None,
                    include: None,
                },
            ],
            permissions: std::collections::BTreeMap::from([(outer.tree_path(&private)?, 0o700)]),
            ..Default::default()
        };
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![outer, settings],
            manifest,
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o700);
        assert!(steps[0].before.is_none());
        Ok(())
    }

    /// The mode adoption applied and the baseline the next pull assumes come
    /// from the same computation: a containing change after adopting a
    /// manifest is planned (or needs nothing) and never reported as an
    /// unsaved local change.
    #[test]
    fn adoption_and_the_next_pull_agree_on_the_baseline() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-adopt-agree-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        let policy = FilePolicy::for_mode(FileMode::Track);
        let file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        let mut directory = TrackedEntry::new(private.clone(), "track", policy);
        directory.variant = Some("linux".into());
        let containing = roots.branch_path(&private, None).unwrap();
        let variant = |os: &str| crate::system::history::select::Variant {
            os: vec![os.into()],
            ..Default::default()
        };
        let blob = repo.hash_blob(b"{}")?;
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[
                Overlay {
                    path: file.tree_path(&file.path)?,
                    object: Some(("100644".into(), blob.clone())),
                },
                Overlay {
                    path: directory.tree_path(&private.join("notes"))?,
                    object: Some(("100644".into(), blob)),
                },
            ],
        )?;
        let enrollment = |path: String, variants| Enrollment {
            path,
            autosave: true,
            encrypt: false,
            variants,
            exclude: None,
            include: None,
        };
        // adopted: the directory is enrolled per platform with no record of
        // its own, and carries another platform's containing record
        let adopted = Manifest {
            enrollment: vec![
                enrollment(file.tree_path(&file.path)?, vec![]),
                enrollment(containing.clone(), vec![variant("linux"), variant("macos")]),
            ],
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o750)]),
            ..Default::default()
        };
        let tree = adopted.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![file.clone(), directory.clone()],
            manifest: adopted.clone(),
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        let applied = steps[0].desired;
        // the planner's own outcome is the live state after adoption
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(applied))?;
        repo.write_checkpoint(Some(&tree), &test_checkpoint("adopted", Some(&tree)))?;
        // the next incoming change moves the containing record: no conflict
        let mut incoming = adopted.clone();
        incoming.permissions.insert(containing.clone(), 0o700);
        let tree = incoming.write(&repo, &files)?;
        let tracked = TrackedSet {
            manifest: incoming,
            ..tracked
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert!(
            steps.iter().all(|step| step.path != private) || steps[0].desired == applied,
            "an enrolled directory ignores the containing record: {steps:?}"
        );

        // with the directory not enrolled here, the containing record is
        // what adoption applied, and its change is planned without conflict
        let scratch = tempfile::Builder::new()
            .prefix(".history-adopt-agree-containing-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        let file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        let containing = roots.branch_path(&private, None).unwrap();
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: file.tree_path(&file.path)?,
                object: Some(("100644".into(), repo.hash_blob(b"{}")?)),
            }],
        )?;
        let adopted = Manifest {
            enrollment: vec![enrollment(file.tree_path(&file.path)?, vec![])],
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o750)]),
            ..Default::default()
        };
        let tree = adopted.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![file],
            manifest: adopted.clone(),
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].desired, 0o750);
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o750))?;
        let head = repo.ref_oid(HistoryRepo::HISTORY_REF)?.unwrap();
        repo.write_checkpoint(
            Some(&tree),
            &test_checkpoint("adopted-containing", Some(&tree)),
        )?;
        assert_ne!(repo.ref_oid(HistoryRepo::HISTORY_REF)?.unwrap(), head);
        let mut incoming = adopted;
        incoming.permissions.insert(containing, 0o700);
        let tree = incoming.write(&repo, &files)?;
        let tracked = TrackedSet {
            manifest: incoming,
            ..tracked
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o700);
        Ok(())
    }

    /// The inverse of a newly enrolled parent: a directory enrolled in a
    /// variant stream locally becomes a containing directory in the incoming
    /// manifest. Its baseline is the record under the variant this machine
    /// selects, so an unsaved chmod is reported, not overwritten.
    #[test]
    fn a_removed_variant_enrollment_keeps_its_baseline() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-removed-variant-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o700))?;
        let policy = FilePolicy::for_mode(FileMode::Track);
        let file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        let containing = roots.branch_path(&private, None).unwrap();
        let variant = |os: &str| crate::system::history::select::Variant {
            os: vec![os.into()],
            ..Default::default()
        };
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: file.tree_path(&file.path)?,
                object: Some(("100644".into(), repo.hash_blob(b"{}")?)),
            }],
        )?;
        // the local head: the directory itself is enrolled per platform and
        // recorded at 0700 in each stream
        let local = Manifest {
            enrollment: vec![Enrollment {
                path: containing.clone(),
                autosave: true,
                encrypt: false,
                variants: vec![variant("linux"), variant("macos")],
                exclude: None,
                include: None,
            }],
            permissions: std::collections::BTreeMap::from([
                (containing.replacen("home/", "home@linux/", 1), 0o700),
                (containing.replacen("home/", "home@macos/", 1), 0o700),
            ]),
            ..Default::default()
        };
        let head = local.write(&repo, &files)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        // incoming: only the child stays enrolled; the directory is a
        // containing record at 0750
        let incoming = Manifest {
            enrollment: vec![Enrollment {
                path: file.tree_path(&file.path)?,
                autosave: true,
                encrypt: false,
                variants: vec![],
                exclude: None,
                include: None,
            }],
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o750)]),
            ..Default::default()
        };
        let tree = incoming.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![file],
            manifest: incoming,
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].desired, 0o750);
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o711))?;
        let err = plan(&repo, &tracked, &tree).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );
        Ok(())
    }

    /// After a pull dropped the enrolled stream's record and applied the
    /// default, another platform's containing record must not be mistaken
    /// for the local saved mode: the next incoming mode for the enrolled
    /// stream is planned, not rejected as an unsaved chmod.
    #[test]
    fn a_dropped_enrolled_record_means_the_default_locally() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-dropped-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o755))?;
        let policy = FilePolicy::for_mode(FileMode::Track);
        let file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        let mut directory = TrackedEntry::new(private.clone(), "track", policy);
        directory.variant = Some("linux".into());
        let containing = roots.branch_path(&private, None).unwrap();
        let own = directory.tree_path(&private)?;
        let blob = repo.hash_blob(b"{}")?;
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[
                Overlay {
                    path: file.tree_path(&file.path)?,
                    object: Some(("100644".into(), blob.clone())),
                },
                Overlay {
                    path: directory.tree_path(&private.join("notes"))?,
                    object: Some(("100644".into(), blob)),
                },
            ],
        )?;
        let mut manifest = Manifest {
            enrollment: vec![
                Enrollment {
                    path: file.tree_path(&file.path)?,
                    autosave: true,
                    encrypt: false,
                    variants: vec![],
                    exclude: None,
                    include: None,
                },
                Enrollment {
                    path: containing.clone(),
                    autosave: true,
                    encrypt: false,
                    variants: ["linux", "macos"]
                        .map(|os| crate::system::history::select::Variant {
                            os: vec![os.into()],
                            ..Default::default()
                        })
                        .to_vec(),
                    exclude: None,
                    include: None,
                },
            ],
            // the local head: the enrolled stream's record was dropped (the
            // last pull applied 0755), another platform's containing 0700 stays
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o700)]),
            ..Default::default()
        };
        let head = manifest.write(&repo, &files)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        manifest.permissions.insert(own.clone(), 0o750);
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![file, directory],
            manifest,
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o750);
        // a real unsaved chmod on the enrolled stream is still reported
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o711))?;
        let err = plan(&repo, &tracked, &tree).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );
        Ok(())
    }

    /// A directory saved as a containing parent and since enrolled in its own
    /// stream keeps its local record: an unsaved chmod is still detected
    /// under the superseded key instead of being overwritten.
    #[test]
    fn a_superseded_key_still_guards_an_unsaved_local_change() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-superseded-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o700))?;
        let policy = FilePolicy::for_mode(FileMode::Track);
        let file = TrackedEntry::new(private.join("settings.json"), "track", policy);
        let mut directory = TrackedEntry::new(private.clone(), "track", policy);
        directory.variant = Some("linux".into());
        let containing = roots.branch_path(&private, None).unwrap();
        let own = directory.tree_path(&private)?;
        let blob = repo.hash_blob(b"{}")?;
        let plain_only = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: file.tree_path(&file.path)?,
                object: Some(("100644".into(), blob.clone())),
            }],
        )?;
        let enrollment = |path: String, variants| Enrollment {
            path,
            autosave: true,
            encrypt: false,
            variants,
            exclude: None,
            include: None,
        };
        // the local head knows the directory only as a containing parent
        let local = Manifest {
            enrollment: vec![enrollment(file.tree_path(&file.path)?, vec![])],
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o700)]),
            ..Default::default()
        };
        let head = local.write(&repo, &plain_only)?;
        repo.write_checkpoint(Some(&head), &test_checkpoint("local", Some(&head)))?;
        // since then the directory was enrolled in its own Linux stream, and
        // another machine recorded that stream at 0750
        let both = repo.compose(
            &plain_only,
            &[Overlay {
                path: directory.tree_path(&private.join("notes"))?,
                object: Some(("100644".into(), blob)),
            }],
        )?;
        let incoming = Manifest {
            enrollment: vec![
                enrollment(file.tree_path(&file.path)?, vec![]),
                enrollment(
                    containing.clone(),
                    vec![crate::system::history::select::Variant {
                        os: vec!["linux".into()],
                        ..Default::default()
                    }],
                ),
            ],
            permissions: std::collections::BTreeMap::from([
                (containing.clone(), 0o700),
                (own.clone(), 0o750),
            ]),
            ..Default::default()
        };
        let tree = incoming.write(&repo, &both)?;
        let tracked = TrackedSet {
            entries: vec![file, directory],
            manifest: incoming,
            ..Default::default()
        };
        // the live mode matches the local record under the old key: applied
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].desired, 0o750);
        // an unsaved chmod is still detected under the old key
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o711))?;
        let err = plan(&repo, &tracked, &tree).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );
        Ok(())
    }

    /// A containing record names the variant-less path, but the directory
    /// may exist in the tree only under a variant stream (every file inside
    /// it is a Linux-only file): the planner still applies it on a fresh
    /// machine.
    #[test]
    fn a_parent_present_only_in_a_variant_stream_is_planned() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let scratch = tempfile::Builder::new()
            .prefix(".history-variant-parent-")
            .tempdir_in(&roots.home)?;
        let private = normalize(scratch.path()).join("private");
        let mut file = TrackedEntry::new(
            private.join("settings.json"),
            "track",
            FilePolicy::for_mode(FileMode::Track),
        );
        file.variant = Some("linux".into());
        let stream_path = file.tree_path(&file.path)?;
        assert!(stream_path.starts_with("home@linux/"));
        let containing = roots.branch_path(&private, None).unwrap();
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: stream_path,
                object: Some(("100644".into(), repo.hash_blob(b"{}")?)),
            }],
        )?;
        // the directory exists only under the variant stream
        assert!(repo.object_at(&files, &containing)?.is_none());
        let manifest = Manifest {
            enrollment: vec![Enrollment {
                path: roots.branch_path(&file.path, None).unwrap(),
                autosave: true,
                encrypt: false,
                variants: ["linux", "macos"]
                    .map(|os| crate::system::history::select::Variant {
                        os: vec![os.into()],
                        ..Default::default()
                    })
                    .to_vec(),
                exclude: None,
                include: None,
            }],
            permissions: std::collections::BTreeMap::from([(containing.clone(), 0o700)]),
            ..Default::default()
        };
        let tree = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![file],
            manifest,
            ..Default::default()
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, private);
        assert_eq!(steps[0].desired, 0o700);
        assert!(steps[0].before.is_none());

        // the local head holds the directory only under the variant stream
        // too: an unsaved chmod is still detected before an incoming mode
        // could overwrite it
        use crate::system::history::checkpoint::test_checkpoint;
        use std::os::unix::fs::PermissionsExt;
        std::fs::create_dir(&private)?;
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o700))?;
        repo.write_checkpoint(Some(&tree), &test_checkpoint("local", Some(&tree)))?;
        let mut incoming = tracked.manifest.clone();
        incoming.permissions.insert(containing.clone(), 0o750);
        let tree = incoming.write(&repo, &files)?;
        let tracked = TrackedSet {
            manifest: incoming,
            ..tracked
        };
        let steps = plan(&repo, &tracked, &tree)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].desired, 0o750);
        std::fs::set_permissions(&private, std::fs::Permissions::from_mode(0o711))?;
        let err = plan(&repo, &tracked, &tree).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );
        Ok(())
    }

    /// A machine that already holds the parent at the incoming mode pulls
    /// without saving first, even though its own manifest (written before
    /// containing directories were captured) records nothing for it.
    #[test]
    fn matching_parent_without_a_local_record_is_not_unsaved() -> Result<()> {
        use crate::system::files::{FileMode, FilePolicy};
        use crate::system::history::checkpoint::test_checkpoint;
        use crate::system::history::manifest::Enrollment;
        use crate::system::history::shadow::Overlay;
        use crate::system::history::tracked::{TrackedEntry, normalize};
        use std::os::unix::fs::PermissionsExt;

        let state = tempfile::tempdir()?;
        let Some(repo) = HistoryRepo::open_or_init_in(state.path())? else {
            return Ok(());
        };
        let roots = Roots::current();
        let parent = tempfile::Builder::new()
            .prefix(".history-parent-")
            .tempdir_in(&roots.home)?;
        let parent_path = normalize(parent.path());
        let settings = parent_path.join("settings.json");
        std::fs::write(&settings, "{}")?;
        std::fs::set_permissions(&parent_path, std::fs::Permissions::from_mode(0o700))?;
        let policy = FilePolicy::for_mode(FileMode::Track);
        let entry = TrackedEntry::new(settings.clone(), "track", policy);
        let file = entry.tree_path(&settings)?;
        let portable = roots.branch_path(&parent_path, None).unwrap();
        let blob = repo.hash_blob(b"{}")?;
        let files = repo.compose(
            &repo.empty_object("tree")?,
            &[Overlay {
                path: file.clone(),
                object: Some(("100644".into(), blob)),
            }],
        )?;
        let mut manifest = Manifest {
            enrollment: vec![Enrollment {
                path: file,
                autosave: true,
                encrypt: false,
                variants: vec![],
                exclude: None,
                include: None,
            }],
            ..Default::default()
        };
        // the local head predates the capture of containing directories
        let local = manifest.write(&repo, &files)?;
        repo.write_checkpoint(Some(&local), &test_checkpoint("local", Some(&local)))?;
        manifest.permissions.insert(portable.clone(), 0o700);
        let incoming = manifest.write(&repo, &files)?;
        let tracked = TrackedSet {
            entries: vec![entry],
            manifest,
            ..Default::default()
        };
        assert!(plan(&repo, &tracked, &incoming)?.is_empty());

        // a different unsaved mode still pauses sharing
        std::fs::set_permissions(&parent_path, std::fs::Permissions::from_mode(0o710))?;
        let err = plan(&repo, &tracked, &incoming).unwrap_err();
        assert!(
            err.to_string().contains("unsaved directory permission"),
            "{err}"
        );

        // the default matches the missing local record: the incoming mode
        // is applied
        std::fs::set_permissions(&parent_path, std::fs::Permissions::from_mode(0o755))?;
        let steps = plan(&repo, &tracked, &incoming)?;
        assert_eq!(steps.len(), 1);
        assert_eq!(steps[0].path, parent_path);
        assert_eq!(steps[0].desired, 0o700);
        Ok(())
    }

    #[test]
    fn permission_transaction_preserves_concurrent_changes() -> Result<()> {
        let temp = tempfile::tempdir()?;
        let path = temp.path().join("private");
        std::fs::create_dir(&path)?;
        set_mode(&path, 0o755)?;
        let mut step = Step {
            path: path.clone(),
            before: observe(&path)?,
            desired: 0o700,
            written: None,
        };
        step.apply()?;
        std::fs::write(path.join("user-edit"), "keep")?;
        step.recover()?;
        assert_eq!(observe(&path)?.unwrap().2, 0o755);
        assert_eq!(std::fs::read_to_string(path.join("user-edit"))?, "keep");
        step.before = observe(&path)?;
        step.apply()?;
        set_mode(&path, 0o750)?;
        assert!(step.recover().is_err());
        assert_eq!(observe(&path)?.unwrap().2, 0o750);
        Ok(())
    }
}