phora 0.6.0

A git-based artifact package manager and multiplexer for content-addressed file distribution
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
//! Take resolution: projects a binding's `take` directive over a sealed offer
//! set into the deployed-leaf set.

use std::collections::{BTreeMap, BTreeSet};

use unicode_normalization::UnicodeNormalization;

use crate::diagnostic::SelectionDiagnostic;
use crate::error::Result;
use crate::projection::offer::compile_take_glob;

/// A take entry is a glob iff it ends in `/` or carries any of `* ? [ ]`;
/// brace expansion (`{a,b}`) is not a glob marker.
#[must_use]
pub fn is_take_glob(s: &str) -> bool {
    s.ends_with('/') || s.contains(['*', '?', '[', ']'])
}

/// A classified take directive. `config`'s `TakeEntry` maps onto this; the
/// kernel never depends on `config`.
#[derive(Debug, Clone)]
pub enum Take<'a> {
    /// A literal leaf; it must be present in the offer set.
    Literal(&'a str),
    /// A gitignore glob; it expands over the OFFER set only.
    Glob(&'a str),
    /// A destructive rename: literal `src` is consumed out, emitted at `dest`.
    Rename { src: &'a str, dest: &'a str },
    /// A subtree rename: every offered leaf under `prefix` (ending in `/`) is
    /// re-rooted at `dest`; `dest = "."` is the deploy root.
    Subtree { prefix: &'a str, dest: &'a str },
}

impl<'a> Take<'a> {
    /// Classifies a rename pair: a `src` ending in `/` names a subtree.
    #[must_use]
    pub fn rename(src: &'a str, dest: &'a str) -> Self {
        if src.ends_with('/') {
            Self::Subtree { prefix: src, dest }
        } else {
            Self::Rename { src, dest }
        }
    }
}

/// A kept published-leaf mapping: `source` (an offered leaf) deploys at `dest`.
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub struct ResolvedTake {
    pub source: String,
    pub dest: String,
}

/// Non-fatal resolution outcomes.
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum TakeWarning {
    /// A take glob matched zero offered leaves.
    NoMatchGlob(String),
}

/// The result of projecting a take directive over an offer: `kept` is sorted by
/// `dest`.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct TakeResolution {
    pub kept: Vec<ResolvedTake>,
    pub warnings: Vec<TakeWarning>,
}

/// Projects `take` over the sorted, root-relative `offer` leaf set.
///
/// `None` = take everything (identity over the whole offer). `Some(&[])` =
/// take nothing.
///
/// # Errors
///
/// Returns an error when a literal/rename-src is not offered, when a subtree
/// prefix covers no offered leaf, when a leaf is both literal and rename-src,
/// when two sources resolve to the same dest, or when a rename dest fails
/// `safe_relpath`.
pub fn resolve_take(offer: &[String], take: Option<&[Take]>) -> Result<TakeResolution> {
    let Some(directives) = take else {
        return Ok(identity(offer));
    };

    let offered: BTreeSet<&str> = offer.iter().map(String::as_str).collect();
    let literals = collect_literals(directives, &offered)?;
    let renames = collect_renames(directives, &offered, &literals)?;

    let mut consumed: BTreeSet<&str> = literals
        .iter()
        .copied()
        .chain(renames.iter().map(|(src, _)| *src))
        .collect();
    let subtrees = collect_subtrees(directives, offer, &consumed)?;
    consumed.extend(subtrees.iter().map(|(src, _)| *src));

    let mut kept = Vec::new();
    for &leaf in &literals {
        kept.push(mapping(leaf, leaf));
    }
    for &(src, dest) in &renames {
        kept.push(mapping(src, dest));
    }
    for (src, dest) in &subtrees {
        kept.push(mapping(src, dest));
    }

    let warnings = expand_globs(directives, offer, &consumed, &mut kept)?;

    reject_duplicate_dest(&kept)?;
    kept.sort_by(|a, b| a.dest.cmp(&b.dest));
    Ok(TakeResolution { kept, warnings })
}

fn identity(offer: &[String]) -> TakeResolution {
    let mut kept: Vec<ResolvedTake> = offer.iter().map(|leaf| mapping(leaf, leaf)).collect();
    kept.sort_by(|a, b| a.dest.cmp(&b.dest));
    TakeResolution {
        kept,
        warnings: Vec::new(),
    }
}

fn mapping(source: &str, dest: &str) -> ResolvedTake {
    ResolvedTake {
        source: source.to_string(),
        dest: dest.to_string(),
    }
}

fn collect_literals<'a>(
    directives: &[Take<'a>],
    offered: &BTreeSet<&str>,
) -> Result<BTreeSet<&'a str>> {
    let mut literals = BTreeSet::new();
    for directive in directives {
        if let Take::Literal(leaf) = directive {
            require_offered(leaf, offered)?;
            literals.insert(*leaf);
        }
    }
    Ok(literals)
}

fn collect_renames<'a>(
    directives: &[Take<'a>],
    offered: &BTreeSet<&str>,
    literals: &BTreeSet<&str>,
) -> Result<Vec<(&'a str, &'a str)>> {
    let mut renames = Vec::new();
    let mut dest_of: BTreeMap<&str, &str> = BTreeMap::new();
    for directive in directives {
        let Take::Rename { src, dest } = directive else {
            continue;
        };
        require_offered(src, offered)?;
        if literals.contains(src) {
            return Err(literal_and_rename_diagnostic(src));
        }
        crate::source::safe_relpath(dest).map_err(|_| unsafe_dest_diagnostic(dest))?;
        match dest_of.insert(src, dest) {
            Some(prior) if prior != *dest => {
                return Err(rename_fan_out_diagnostic(src, prior, dest));
            }
            Some(_) => {}
            None => renames.push((*src, *dest)),
        }
    }
    Ok(renames)
}

/// Re-roots every offered leaf under a subtree prefix not already consumed by a
/// literal or leaf rename; the longest matching prefix wins.
fn collect_subtrees<'o>(
    directives: &[Take],
    offer: &'o [String],
    consumed: &BTreeSet<&str>,
) -> Result<Vec<(&'o str, String)>> {
    let mut roots: BTreeMap<&str, (&str, String)> = BTreeMap::new();
    for directive in directives {
        let Take::Subtree { prefix, dest } = directive else {
            continue;
        };
        if !offer.iter().any(|leaf| leaf.starts_with(prefix)) {
            return Err(non_offered_subtree_diagnostic(prefix, offer));
        }
        let root = subtree_root(dest)?;
        match roots.get(prefix) {
            Some((prior, prior_root)) if *prior_root != root => {
                return Err(rename_fan_out_diagnostic(prefix, prior, dest));
            }
            Some(_) => {}
            None => {
                roots.insert(prefix, (dest, root));
            }
        }
    }
    let mut subtrees = Vec::new();
    for leaf in offer {
        if consumed.contains(leaf.as_str()) {
            continue;
        }
        let longest = roots
            .iter()
            .filter(|(prefix, _)| leaf.starts_with(*prefix))
            .max_by_key(|(prefix, _)| prefix.len());
        if let Some((prefix, (_, root))) = longest {
            subtrees.push((leaf.as_str(), format!("{root}{}", &leaf[prefix.len()..])));
        }
    }
    Ok(subtrees)
}

/// The dest prefix a subtree re-roots under: empty for `.`, else `dest/`.
fn subtree_root(dest: &str) -> Result<String> {
    let trimmed = dest.strip_suffix('/').unwrap_or(dest);
    if trimmed == "." {
        return Ok(String::new());
    }
    crate::source::safe_relpath(trimmed).map_err(|_| unsafe_dest_diagnostic(dest))?;
    Ok(format!("{trimmed}/"))
}

fn expand_globs(
    directives: &[Take],
    offer: &[String],
    consumed: &BTreeSet<&str>,
    kept: &mut Vec<ResolvedTake>,
) -> Result<Vec<TakeWarning>> {
    let mut warnings = Vec::new();
    let mut matched: BTreeSet<&str> = BTreeSet::new();
    for directive in directives {
        let Take::Glob(pattern) = directive else {
            continue;
        };
        let globset = compile_take_glob(pattern)?;
        let hits: Vec<&str> = offer
            .iter()
            .map(String::as_str)
            .filter(|leaf| globset.is_match(leaf))
            .collect();
        if hits.is_empty() {
            warnings.push(TakeWarning::NoMatchGlob((*pattern).to_string()));
            continue;
        }
        for leaf in hits {
            if !consumed.contains(leaf) && matched.insert(leaf) {
                kept.push(mapping(leaf, leaf));
            }
        }
    }
    warnings.sort_by(|a, b| {
        let TakeWarning::NoMatchGlob(pa) = a;
        let TakeWarning::NoMatchGlob(pb) = b;
        pa.cmp(pb)
    });
    Ok(warnings)
}

fn reject_duplicate_dest(kept: &[ResolvedTake]) -> Result<()> {
    let mut seen: BTreeMap<String, &str> = BTreeMap::new();
    for entry in kept {
        if let Some(first) = seen.insert(fold_dest(&entry.dest), &entry.dest) {
            return Err(duplicate_dest_diagnostic(first, &entry.dest));
        }
    }
    Ok(())
}

// NFC + simple lowercase, NOT full Unicode case-folding: macOS (APFS) and
// Windows (NTFS) collide names by simple-fold only, so `straße` and `strasse`
// remain distinct files there — full folding would over-reject them.
pub(crate) fn fold_dest(dest: &str) -> String {
    dest.nfc().collect::<String>().to_lowercase()
}

fn require_offered(entry: &str, offered: &BTreeSet<&str>) -> Result<()> {
    if offered.contains(entry) {
        Ok(())
    } else {
        Err(non_offered_diagnostic(entry, offered))
    }
}

const KERNEL_ATTRIBUTION_HINT: &str = "phora explain <target> <source> <path>";

fn non_offered_diagnostic(entry: &str, offered: &BTreeSet<&str>) -> crate::error::Error {
    SelectionDiagnostic {
        entry: entry.to_string(),
        matched_against: "the offer set".to_string(),
        why: "not present in the offer; `take` may not widen the offer".to_string(),
        did_you_mean: crate::diagnostic::did_you_mean(entry, offered.iter().copied()),
        remedy: "name a leaf the source offers, or add it to the source's include".to_string(),
        debug_hint: Some(KERNEL_ATTRIBUTION_HINT.to_string()),
        details: Vec::new(),
    }
    .sync()
}

fn non_offered_subtree_diagnostic(prefix: &str, offer: &[String]) -> crate::error::Error {
    let dirs: BTreeSet<&str> = offer
        .iter()
        .flat_map(|leaf| leaf.match_indices('/').map(|(cut, _)| &leaf[..=cut]))
        .collect();
    SelectionDiagnostic {
        entry: prefix.to_string(),
        matched_against: "the offer set".to_string(),
        why: "no offered leaf lies under this subtree; `take` may not widen the offer".to_string(),
        did_you_mean: crate::diagnostic::did_you_mean(prefix, dirs.iter().copied()),
        remedy: "name a directory the source offers, or add it to the source's include".to_string(),
        debug_hint: Some(KERNEL_ATTRIBUTION_HINT.to_string()),
        details: Vec::new(),
    }
    .sync()
}

fn literal_and_rename_diagnostic(leaf: &str) -> crate::error::Error {
    SelectionDiagnostic {
        entry: leaf.to_string(),
        matched_against: "the offer set".to_string(),
        why: "named both as a literal `take` and as a rename source".to_string(),
        did_you_mean: None,
        remedy: "keep the leaf either literally or as a rename source, not both".to_string(),
        debug_hint: Some(KERNEL_ATTRIBUTION_HINT.to_string()),
        details: Vec::new(),
    }
    .sync()
}

fn rename_fan_out_diagnostic(src: &str, first: &str, second: &str) -> crate::error::Error {
    let (a, b) = if first <= second {
        (first, second)
    } else {
        (second, first)
    };
    SelectionDiagnostic {
        entry: src.to_string(),
        matched_against: "the offer set".to_string(),
        why: "renamed to two different destinations".to_string(),
        did_you_mean: None,
        remedy: format!("keep one rename of `{src}`: either `{a}` or `{b}`, not both"),
        debug_hint: Some(KERNEL_ATTRIBUTION_HINT.to_string()),
        details: Vec::new(),
    }
    .sync()
}

fn unsafe_dest_diagnostic(dest: &str) -> crate::error::Error {
    SelectionDiagnostic {
        entry: dest.to_string(),
        matched_against: "the deploy root".to_string(),
        why: "rename destination is not a portable relative path".to_string(),
        did_you_mean: None,
        remedy: "use a forward-slashed relative path inside the deploy root".to_string(),
        debug_hint: Some(KERNEL_ATTRIBUTION_HINT.to_string()),
        details: Vec::new(),
    }
    .sync()
}

fn duplicate_dest_diagnostic(first: &str, second: &str) -> crate::error::Error {
    let entry = if first == second {
        first.to_string()
    } else if first <= second {
        format!("{first} / {second}")
    } else {
        format!("{second} / {first}")
    };
    SelectionDiagnostic {
        entry,
        matched_against: "the binding's kept destinations".to_string(),
        why: "two distinct sources resolve to the same destination".to_string(),
        did_you_mean: None,
        remedy: "rename one source so each kept leaf lands at a distinct path".to_string(),
        debug_hint: Some(KERNEL_ATTRIBUTION_HINT.to_string()),
        details: Vec::new(),
    }
    .sync()
}

#[cfg(test)]
mod take_resolution_tests {
    use super::{Take, TakeWarning, is_take_glob, resolve_take};
    use crate::diagnostic::{DID_YOU_MEAN, MATCHED_AGAINST, REMEDY, SELECTION, TO_DEBUG};

    fn offer(leaves: &[&str]) -> Vec<String> {
        leaves.iter().map(|s| (*s).to_string()).collect()
    }

    fn resolve(offer: &[String], take: &[Take]) -> super::TakeResolution {
        resolve_take(offer, Some(take)).expect("take resolves")
    }

    fn pairs(res: &super::TakeResolution) -> Vec<(String, String)> {
        res.kept
            .iter()
            .map(|r| (r.source.clone(), r.dest.clone()))
            .collect()
    }

    fn assert_kept(res: &super::TakeResolution, expected: &[(&str, &str)]) {
        let got: Vec<(String, String)> = pairs(res);
        let want: Vec<(String, String)> = expected
            .iter()
            .map(|(s, d)| ((*s).to_string(), (*d).to_string()))
            .collect();
        assert_eq!(
            got, want,
            "exact kept mapping (sorted by dest) mismatch: extras, duplicates, \
             or omissions all fail here"
        );
    }

    fn dests(res: &super::TakeResolution) -> Vec<String> {
        res.kept.iter().map(|r| r.dest.clone()).collect()
    }

    fn assert_warnings(res: &super::TakeResolution, expected: &[&str]) {
        let want: Vec<TakeWarning> = expected
            .iter()
            .map(|p| TakeWarning::NoMatchGlob((*p).to_string()))
            .collect();
        assert_eq!(
            res.warnings, want,
            "exact warnings set (sorted by pattern) mismatch"
        );
    }

    fn rendered_error(offer: &[String], take: &[Take]) -> String {
        resolve_take(offer, Some(take))
            .expect_err("this take directive must be rejected")
            .to_string()
    }

    fn assert_named_diagnostic(rendered: &str, entry: &str) {
        for phrase in [SELECTION, MATCHED_AGAINST, REMEDY, TO_DEBUG] {
            assert!(
                rendered.contains(phrase),
                "the rejection must render the named phrase `{phrase}`; got:\n{rendered}"
            );
        }
        assert!(
            rendered.contains(entry),
            "the rejection must name the offending entry `{entry}`; got:\n{rendered}"
        );
        assert!(
            rendered.contains("to debug: phora explain <target> <source> <path>"),
            "every kernel take rejection must point at the attribution command with explicit \
             placeholders the kernel cannot fill; got:\n{rendered}"
        );
    }

    #[test]
    fn each_take_rejection_ends_with_the_attribution_debug_command() {
        let offer = offer(&["present.md"]);
        let renderings = [
            rendered_error(&offer, &[Take::Literal("absent.md")]),
            rendered_error(
                &offer,
                &[Take::Rename {
                    src: "present.md",
                    dest: "../escape",
                }],
            ),
        ];
        for rendered in renderings {
            let to_debug = rendered
                .lines()
                .find(|line| line.starts_with(TO_DEBUG))
                .unwrap_or_else(|| panic!("a `{TO_DEBUG}` line must exist; got:\n{rendered}"));
            assert_eq!(
                to_debug, "to debug: phora explain <target> <source> <path>",
                "kernel-site debug hints must use the placeholder attribution form verbatim"
            );
        }
    }

    // ---- 1. set composition is order-independent ----

    #[test]
    fn resolving_the_same_entries_in_any_permutation_yields_the_identical_kept_set() {
        let offer = offer(&["a.md", "b.md", "c.md", "ignored.md"]);
        let forward = resolve(
            &offer,
            &[
                Take::Literal("a.md"),
                Take::Literal("b.md"),
                Take::Literal("c.md"),
            ],
        );
        let reversed = resolve(
            &offer,
            &[
                Take::Literal("c.md"),
                Take::Literal("b.md"),
                Take::Literal("a.md"),
            ],
        );
        let shuffled = resolve(
            &offer,
            &[
                Take::Literal("b.md"),
                Take::Literal("a.md"),
                Take::Literal("c.md"),
            ],
        );
        assert_kept(
            &forward,
            &[("a.md", "a.md"), ("b.md", "b.md"), ("c.md", "c.md")],
        );
        assert_eq!(
            pairs(&forward),
            pairs(&reversed),
            "reversal must not change the kept set"
        );
        assert_eq!(
            pairs(&forward),
            pairs(&shuffled),
            "shuffling must not change the kept set"
        );
    }

    #[test]
    fn a_mixed_glob_literal_rename_set_resolves_identically_under_reversal() {
        let offer = offer(&["a/x.md", "a/y.md", "keep.md"]);
        let forward = resolve(
            &offer,
            &[
                Take::Glob("a/**"),
                Take::Literal("keep.md"),
                Take::Rename {
                    src: "a/x.md",
                    dest: "renamed/x.md",
                },
            ],
        );
        let reversed = resolve(
            &offer,
            &[
                Take::Rename {
                    src: "a/x.md",
                    dest: "renamed/x.md",
                },
                Take::Literal("keep.md"),
                Take::Glob("a/**"),
            ],
        );
        assert_kept(
            &forward,
            &[
                ("a/y.md", "a/y.md"),
                ("keep.md", "keep.md"),
                ("a/x.md", "renamed/x.md"),
            ],
        );
        assert_eq!(
            pairs(&forward),
            pairs(&reversed),
            "permuting a mixed glob/literal/rename set must not change the kept set"
        );
    }

    // ---- 2. globs expand over the OFFER, never the tree (no-widen / sealed offer) ----

    #[test]
    fn a_take_glob_matches_only_offered_leaves_and_never_introduces_an_unoffered_one() {
        let offer = offer(&["skills/a/SKILL.md", "skills/b/SKILL.md"]);
        let res = resolve(&offer, &[Take::Glob("skills/**")]);
        assert_kept(
            &res,
            &[
                ("skills/a/SKILL.md", "skills/a/SKILL.md"),
                ("skills/b/SKILL.md", "skills/b/SKILL.md"),
            ],
        );
        assert!(
            res.kept.iter().all(|r| offer.contains(&r.source)),
            "every kept source must already be in the offer; a glob may not widen it"
        );
    }

    // ---- 3. explicit consumes its leaf out of overlapping globs ----

    #[test]
    fn explicit_literal_consumes_its_leaf_out_of_an_overlapping_glob() {
        let offer = offer(&["skills/a/SKILL.md", "skills/b/SKILL.md"]);
        let res = resolve(
            &offer,
            &[Take::Glob("skills/**"), Take::Literal("skills/a/SKILL.md")],
        );
        assert_kept(
            &res,
            &[
                ("skills/a/SKILL.md", "skills/a/SKILL.md"),
                ("skills/b/SKILL.md", "skills/b/SKILL.md"),
            ],
        );
    }

    #[test]
    fn rename_src_is_consumed_out_of_an_overlapping_glob_and_not_re_emitted_at_identity() {
        let offer = offer(&["a/x.md", "a/y.md"]);
        let res = resolve(
            &offer,
            &[
                Take::Glob("a/**"),
                Take::Rename {
                    src: "a/x.md",
                    dest: "renamed/x.md",
                },
            ],
        );
        assert_kept(&res, &[("a/y.md", "a/y.md"), ("a/x.md", "renamed/x.md")]);
    }

    // ---- 4. rename is destructive ----

    #[test]
    fn rename_emits_the_leaf_only_at_its_destination() {
        let offer = offer(&["x", "untouched"]);
        let res = resolve(
            &offer,
            &[Take::Rename {
                src: "x",
                dest: "a",
            }],
        );
        assert_kept(&res, &[("x", "a")]);
        assert!(
            !dests(&res).iter().any(|d| d == "x"),
            "a destructive rename must NOT also emit the leaf at its original path `x`"
        );
    }

    // ---- 5. duplicate literal is idempotent ----

    #[test]
    fn two_identical_literal_entries_keep_one_pair_without_error() {
        let offer = offer(&["dup.md", "other.md"]);
        let res = resolve(&offer, &[Take::Literal("dup.md"), Take::Literal("dup.md")]);
        assert_kept(&res, &[("dup.md", "dup.md")]);
        assert!(
            res.warnings.is_empty(),
            "an idempotent duplicate literal must not warn"
        );
    }

    // ---- 5b. same src renamed twice: identical dest is idempotent, divergent is a hard error ----

    #[test]
    fn two_identical_rename_entries_keep_one_pair_without_error() {
        let offer = offer(&["a.md", "other.md"]);
        let res = resolve(
            &offer,
            &[
                Take::Rename {
                    src: "a.md",
                    dest: "b.md",
                },
                Take::Rename {
                    src: "a.md",
                    dest: "b.md",
                },
            ],
        );
        assert_kept(&res, &[("a.md", "b.md")]);
        assert!(
            res.warnings.is_empty(),
            "an idempotent identical rename must not warn"
        );
    }

    #[test]
    fn one_src_renamed_to_two_different_dests_is_a_hard_error_naming_both() {
        let offer = offer(&["a.md", "other.md"]);
        let rendered = rendered_error(
            &offer,
            &[
                Take::Rename {
                    src: "a.md",
                    dest: "b.md",
                },
                Take::Rename {
                    src: "a.md",
                    dest: "c.md",
                },
            ],
        );
        assert_named_diagnostic(&rendered, "a.md");
        assert!(
            rendered.contains("b.md") && rendered.contains("c.md"),
            "the rejection must name both divergent destinations; got:\n{rendered}"
        );
    }

    // ---- 6. non-offered literal / rename-src is a hard error (the seal) ----

    #[test]
    fn a_literal_not_in_the_offer_is_a_hard_error_naming_the_entry() {
        let offer = offer(&["present.md"]);
        let rendered = rendered_error(&offer, &[Take::Literal("absent.md")]);
        assert_named_diagnostic(&rendered, "absent.md");
    }

    #[test]
    fn a_rename_src_not_in_the_offer_is_a_hard_error_naming_the_src() {
        let offer = offer(&["present.md"]);
        let rendered = rendered_error(
            &offer,
            &[Take::Rename {
                src: "absent.md",
                dest: "x.md",
            }],
        );
        assert_named_diagnostic(&rendered, "absent.md");
    }

    #[test]
    fn a_non_offered_literal_close_to_an_offered_leaf_suggests_it() {
        let offer = offer(&["editor/init.lua", "editor/keymaps.lua"]);
        let rendered = rendered_error(&offer, &[Take::Literal("editor/inti.lua")]);
        assert!(
            rendered.contains(DID_YOU_MEAN) && rendered.contains("editor/init.lua"),
            "a typo'd non-offered literal must suggest the closest offered leaf via the \
             `did you mean` line; got:\n{rendered}"
        );
        assert!(
            !rendered.contains("editor/keymaps.lua"),
            "a far-off offered leaf must NOT be suggested (bounded edit distance); got:\n{rendered}"
        );
    }

    // ---- 7. a no-match glob warns, it does not error ----

    #[test]
    fn a_glob_matching_zero_offered_leaves_warns_and_resolution_still_succeeds() {
        let offer = offer(&["kept.md"]);
        let res = resolve(
            &offer,
            &[Take::Literal("kept.md"), Take::Glob("nomatch/**")],
        );
        assert_kept(&res, &[("kept.md", "kept.md")]);
        assert_warnings(&res, &["nomatch/**"]);
    }

    #[test]
    fn no_match_warnings_are_sorted_by_pattern_independent_of_directive_order() {
        let offer = offer(&["kept.md"]);
        let forward = resolve(
            &offer,
            &[
                Take::Literal("kept.md"),
                Take::Glob("zeta/**"),
                Take::Glob("alpha/**"),
            ],
        );
        assert_warnings(&forward, &["alpha/**", "zeta/**"]);
        let reversed = resolve(
            &offer,
            &[
                Take::Literal("kept.md"),
                Take::Glob("alpha/**"),
                Take::Glob("zeta/**"),
            ],
        );
        assert_eq!(
            forward.warnings, reversed.warnings,
            "permuting no-match globs must not reorder the warnings"
        );
    }

    #[test]
    fn a_glob_whose_hits_are_all_already_consumed_keeps_nothing_and_does_not_warn() {
        let offer = offer(&["a.md"]);
        let res = resolve(
            &offer,
            &[
                Take::Rename {
                    src: "a.md",
                    dest: "renamed.md",
                },
                Take::Glob("*.md"),
            ],
        );
        assert_kept(&res, &[("a.md", "renamed.md")]);
        assert_warnings(&res, &[]);
    }

    // ---- 8. literal + rename of the SAME source leaf is a hard error ----

    #[test]
    fn a_leaf_used_as_both_literal_and_rename_src_is_a_hard_error() {
        let offer = offer(&["a.md"]);
        let rendered = rendered_error(
            &offer,
            &[
                Take::Literal("a.md"),
                Take::Rename {
                    src: "a.md",
                    dest: "b.md",
                },
            ],
        );
        assert_named_diagnostic(&rendered, "a.md");
    }

    // ---- 9. single-binding duplicate DESTINATION is a hard error (case-insensitive + NFC) ----

    #[test]
    fn two_distinct_sources_resolving_to_the_same_dest_is_a_hard_error() {
        let offer = offer(&["a", "x"]);
        let rendered = rendered_error(
            &offer,
            &[
                Take::Rename {
                    src: "a",
                    dest: "x",
                },
                Take::Literal("x"),
            ],
        );
        assert_named_diagnostic(&rendered, "x");
    }

    #[test]
    fn case_insensitively_colliding_dests_are_a_hard_error() {
        let offer = offer(&["a", "b"]);
        let rendered = rendered_error(
            &offer,
            &[
                Take::Rename {
                    src: "a",
                    dest: "C",
                },
                Take::Rename {
                    src: "b",
                    dest: "c",
                },
            ],
        );
        assert_named_diagnostic(&rendered, "C");
    }

    #[test]
    fn nfc_equivalent_unicode_dests_collide_as_a_hard_error() {
        let offer = offer(&["a", "b"]);
        let precomposed = "café";
        let decomposed = "cafe\u{0301}";
        assert_ne!(
            precomposed, decomposed,
            "the two dests differ byte-for-byte before NFC"
        );
        let rendered = rendered_error(
            &offer,
            &[
                Take::Rename {
                    src: "a",
                    dest: precomposed,
                },
                Take::Rename {
                    src: "b",
                    dest: decomposed,
                },
            ],
        );
        for phrase in [SELECTION, MATCHED_AGAINST, REMEDY] {
            assert!(
                rendered.contains(phrase),
                "NFC-equivalent dest collision must render the named phrase `{phrase}`; got:\n{rendered}"
            );
        }
        assert!(
            rendered.contains("café"),
            "the collision diagnostic must name the offending dest `café`; got:\n{rendered}"
        );
    }

    // ---- 10. rename dest portability (safe_relpath portion of D22) ----

    #[test]
    fn a_rename_dest_escaping_the_root_is_a_hard_error() {
        let offer = offer(&["a"]);
        let rendered = rendered_error(
            &offer,
            &[Take::Rename {
                src: "a",
                dest: "../escape",
            }],
        );
        assert_named_diagnostic(&rendered, "../escape");
    }

    #[test]
    fn an_absolute_rename_dest_is_a_hard_error() {
        let offer = offer(&["a"]);
        let rendered = rendered_error(
            &offer,
            &[Take::Rename {
                src: "a",
                dest: "/abs/x",
            }],
        );
        assert_named_diagnostic(&rendered, "/abs/x");
    }

    #[test]
    fn a_backslash_rename_dest_is_a_hard_error() {
        let offer = offer(&["a"]);
        let rendered = rendered_error(
            &offer,
            &[Take::Rename {
                src: "a",
                dest: "a\\b",
            }],
        );
        assert_named_diagnostic(&rendered, "a\\b");
    }

    // ---- 11. take = [] keeps nothing ----

    #[test]
    fn an_empty_take_keeps_nothing_with_no_warnings() {
        let offer = offer(&["a", "b", "c"]);
        let res = resolve_take(&offer, Some(&[])).expect("empty take resolves");
        assert!(
            res.kept.is_empty(),
            "`take = []` must keep nothing; got: {:?}",
            res.kept
        );
        assert!(res.warnings.is_empty(), "`take = []` must not warn");
    }

    // ---- 12. omitted take keeps everything at identity ----

    #[test]
    fn an_omitted_take_keeps_every_offered_leaf_at_its_identity_dest() {
        let offer = offer(&["a", "nested/b", "c"]);
        let res = resolve_take(&offer, None).expect("None take resolves");
        assert_kept(&res, &[("a", "a"), ("c", "c"), ("nested/b", "nested/b")]);
        assert!(res.warnings.is_empty(), "identity projection must not warn");
    }

    // ---- 13. D21 classification (consolidated) ----

    #[test]
    fn trailing_slash_classifies_as_a_glob() {
        assert!(
            is_take_glob("build/"),
            "a trailing slash makes a take entry a glob"
        );
    }

    #[test]
    fn star_question_and_bracket_classify_as_globs() {
        assert!(is_take_glob("skills/**"));
        assert!(is_take_glob("*.bak"));
        assert!(is_take_glob("file?.md"));
        assert!(is_take_glob("file[0-9].md"));
    }

    #[test]
    fn a_plain_nested_path_classifies_as_a_literal() {
        assert!(
            !is_take_glob("skills/gestalt/skill.md"),
            "a plain nested path with no glob metacharacters is a literal"
        );
    }

    #[test]
    fn brace_expansion_classifies_as_a_literal_not_a_glob() {
        assert!(
            !is_take_glob("{a,b}"),
            "brace expansion is NOT a glob marker in the take classifier"
        );
    }

    // ---- 14. dotfile matching (no opt-in, consistent with OfferSelection) ----

    #[test]
    fn a_star_glob_matches_offered_dotfiles_with_no_opt_in() {
        let offer = offer(&[".zshrc", ".config/nvim/init.lua", "plain.txt"]);
        let res = resolve(&offer, &[Take::Glob("*")]);
        assert_kept(
            &res,
            &[
                (".config/nvim/init.lua", ".config/nvim/init.lua"),
                (".zshrc", ".zshrc"),
                ("plain.txt", "plain.txt"),
            ],
        );
    }

    #[test]
    fn a_double_star_glob_matches_nested_offered_dotfiles() {
        let offer = offer(&[".config/nvim/init.lua", "plain.txt"]);
        let res = resolve(&offer, &[Take::Glob("**")]);
        assert_kept(
            &res,
            &[
                (".config/nvim/init.lua", ".config/nvim/init.lua"),
                ("plain.txt", "plain.txt"),
            ],
        );
    }

    // ---- 15. path-identity: full relative path is the unit, basenames may collide ----

    #[test]
    fn leaves_sharing_a_basename_are_distinct_and_both_kept_by_a_glob() {
        let offer = offer(&["a/SKILL.md", "b/SKILL.md"]);
        let res = resolve(&offer, &[Take::Glob("**")]);
        assert_kept(
            &res,
            &[("a/SKILL.md", "a/SKILL.md"), ("b/SKILL.md", "b/SKILL.md")],
        );
    }

    #[test]
    fn a_literal_keeps_the_full_relative_path_not_the_basename() {
        let offer = offer(&["a/SKILL.md", "b/SKILL.md"]);
        let res = resolve(&offer, &[Take::Literal("a/SKILL.md")]);
        assert_kept(&res, &[("a/SKILL.md", "a/SKILL.md")]);
    }

    // ---- 16. CLIFF-UNIFOLD-005: non-ASCII dest case-collision + casefold divergence ----

    #[test]
    fn cyrillic_case_colliding_dests_are_a_hard_error() {
        let offer = offer(&["a", "b"]);
        let rendered = rendered_error(
            &offer,
            &[
                Take::Rename {
                    src: "a",
                    dest: "\u{0401}.txt", // Ё.txt
                },
                Take::Rename {
                    src: "b",
                    dest: "\u{0451}.txt", // ё.txt
                },
            ],
        );
        assert_named_diagnostic(&rendered, "\u{0401}.txt");
    }

    #[test]
    fn latin_accented_case_colliding_dests_are_a_hard_error() {
        let offer = offer(&["a", "b"]);
        let rendered = rendered_error(
            &offer,
            &[
                Take::Rename {
                    src: "a",
                    dest: "\u{00c9}", // É
                },
                Take::Rename {
                    src: "b",
                    dest: "\u{00e9}", // é
                },
            ],
        );
        assert_named_diagnostic(&rendered, "\u{00c9}");
    }

    #[test]
    fn fold_dest_keeps_eszett_and_ss_distinct_documented_limitation() {
        assert_ne!(
            super::fold_dest("stra\u{00df}e"),
            super::fold_dest("strasse"),
            "documented UNIFOLD limitation: fold_dest is simple lowercase, not full case-folding; \
             `stra\u{00df}e` and `strasse` stay DISTINCT so the dup-dest check matches APFS/NTFS \
             simple-fold collision and does not over-reject"
        );
    }

    #[test]
    fn fold_dest_keeps_final_sigma_distinct_but_folds_capital_sigma() {
        assert_ne!(
            super::fold_dest("\u{03c2}"), // ς final sigma
            super::fold_dest("\u{03c3}"), // σ small sigma
            "documented UNIFOLD limitation: final sigma `\u{03c2}` stays DISTINCT from `\u{03c3}` \
             under simple lowercase; only full case-folding would merge them"
        );
        assert_eq!(
            super::fold_dest("\u{03a3}"), // Σ capital sigma
            super::fold_dest("\u{03c3}"), // σ small sigma
            "the fold IS full-Unicode for ordinary case pairs: `\u{03a3}` lowercases to \
             `\u{03c3}`; only the final-sigma special case diverges from full folding"
        );
    }

    fn subtree<'a>(prefix: &'a str, dest: &'a str) -> Take<'a> {
        Take::rename(prefix, dest)
    }

    #[test]
    fn a_subtree_rename_to_dot_re_roots_leaves_at_the_deploy_root() {
        let offer = offer(&[
            "claude/CLAUDE.md",
            "claude/skills/a/SKILL.md",
            "codex/AGENTS.md",
        ]);
        let res = resolve(&offer, &[subtree("claude/", ".")]);
        assert_kept(
            &res,
            &[
                ("claude/CLAUDE.md", "CLAUDE.md"),
                ("claude/skills/a/SKILL.md", "skills/a/SKILL.md"),
            ],
        );
    }

    #[test]
    fn a_subtree_rename_to_a_prefix_re_roots_leaves_under_it() {
        let offer = offer(&["claude/skills/a/SKILL.md", "other.md"]);
        for dest in ["x/", "x"] {
            let res = resolve(&offer, &[subtree("claude/", dest)]);
            assert_kept(&res, &[("claude/skills/a/SKILL.md", "x/skills/a/SKILL.md")]);
        }
    }

    #[test]
    fn a_subtree_prefix_covering_no_offered_leaf_is_rejected_with_a_suggestion() {
        let offer = offer(&["claude/skills/a/SKILL.md"]);
        let rendered = rendered_error(&offer, &[subtree("claud/", ".")]);
        assert_named_diagnostic(&rendered, "claud/");
        assert!(
            rendered.contains(DID_YOU_MEAN) && rendered.contains("claude/"),
            "the rejection must suggest the closest offered directory; got:\n{rendered}"
        );
    }

    #[test]
    fn an_escaping_or_absolute_subtree_dest_is_rejected() {
        let offer = offer(&["claude/a.md"]);
        for dest in ["../up", "x/../../up", "/abs", ""] {
            let rendered = rendered_error(&offer, &[subtree("claude/", dest)]);
            assert!(
                rendered.contains("rename destination is not a portable relative path"),
                "dest `{dest}` must be rejected as unsafe; got:\n{rendered}"
            );
        }
    }

    #[test]
    fn a_glob_overlapping_a_subtree_does_not_emit_its_leaves_twice() {
        let offer = offer(&["claude/a.md", "top.md"]);
        let res = resolve(&offer, &[Take::Glob("**/*.md"), subtree("claude/", "c/")]);
        assert_kept(&res, &[("claude/a.md", "c/a.md"), ("top.md", "top.md")]);
    }

    #[test]
    fn a_leaf_rename_inside_a_subtree_wins_for_that_leaf() {
        let offer = offer(&["claude/a.md", "claude/b.md"]);
        let res = resolve(
            &offer,
            &[
                subtree("claude/", "."),
                Take::Rename {
                    src: "claude/b.md",
                    dest: "renamed/b.md",
                },
            ],
        );
        assert_kept(
            &res,
            &[("claude/a.md", "a.md"), ("claude/b.md", "renamed/b.md")],
        );
    }

    #[test]
    fn the_longest_subtree_prefix_wins() {
        let offer = offer(&["claude/a.md", "claude/skills/s.md"]);
        let res = resolve(
            &offer,
            &[subtree("claude/", "."), subtree("claude/skills/", "s/")],
        );
        assert_kept(
            &res,
            &[("claude/a.md", "a.md"), ("claude/skills/s.md", "s/s.md")],
        );
    }

    #[test]
    fn a_subtree_colliding_with_another_kept_leaf_is_a_duplicate_dest() {
        let offer = offer(&["claude/a.md", "a.md"]);
        let rendered = rendered_error(&offer, &[subtree("claude/", "."), Take::Literal("a.md")]);
        assert!(
            rendered.contains("two distinct sources resolve to the same destination"),
            "a subtree dest colliding with a literal must fail the dup-dest check; got:\n{rendered}"
        );
    }
}