mise 2026.9.11

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
//! All-or-nothing application of incoming changes: `mise dot pull`.
//! The complete setup is preflighted; an incoming configuration file is validated
//! before it is written; a path with unsaved local edits, staged git
//! changes, or a genuine local edit is held for a decision. Application
//! is the same recoverable transaction as a rollback: the write set is
//! planned, its preimages captured in a protective checkpoint, every file
//! written one at a time and journaled, and reload hooks run only once
//! everything succeeded.

use std::collections::BTreeSet;
use std::path::{Path, PathBuf};

use eyre::{Result, bail};

use super::layout::Roots;
use super::reconcile::{Conflict, Object};
use super::run::{self, PendingApplication};
use super::state;
use crate::file::display_path;
use crate::system::history::checkpoint::Store;
use crate::system::history::journal;
use crate::system::history::replay;
use crate::system::history::scope::OperationScope;
use crate::system::history::store::{OperationKind, Summary};
use crate::system::history::tracked::{TrackedSet, normalize_target};
use crate::ui::table::MiseTable;

#[derive(Clone, Debug)]
pub(crate) struct ApplyRequest {
    /// Only these local paths (empty: everything pending).
    pub paths: Vec<PathBuf>,
    pub dry_run: bool,
    pub yes: bool,
    /// Resolve these conflicts with the upstream version.
    pub take_remote: Vec<PathBuf>,
    /// Resolve these conflicts by publishing the local version next.
    pub keep_local: Vec<PathBuf>,
    /// Resolve every conflict not named above with the upstream version.
    pub take_remote_all: bool,
    /// Resolve every conflict not named above by keeping the local version.
    pub keep_local_all: bool,
    /// The watcher applying in the background: no prompt, no plan on
    /// stdout, and held paths are a count, not a failure.
    pub automatic: bool,
    /// With `dry_run`: the plan is shown before a question, so no
    /// "nothing was changed" note.
    pub plan_only: bool,
}

impl ApplyRequest {
    pub(crate) fn automatic() -> Self {
        Self {
            paths: vec![],
            dry_run: false,
            yes: true,
            take_remote: vec![],
            keep_local: vec![],
            take_remote_all: false,
            keep_local_all: false,
            automatic: true,
            plan_only: false,
        }
    }
}

/// What an application did.
#[derive(Debug, Default, Clone)]
pub(crate) struct ApplyOutcome {
    /// Files written or removed.
    pub written: usize,
    /// Paths held for a decision (with their groups).
    pub held: usize,
    /// A configuration file was written: declarations may have changed.
    pub configuration: bool,
}

/// Why a pending application is not written now.
#[derive(Clone, Debug)]
struct Hold {
    path: PathBuf,
    reason: String,
}

struct Step {
    pending: PendingApplication,
    path: PathBuf,
    group: String,
    exists: bool,
    /// The complete live object when planned, verified before each write.
    before: Option<Object>,
    permissions: Option<std::fs::Permissions>,
    before_mode: Option<u32>,
    desired_mode: Option<u32>,
}

pub(crate) async fn apply(
    store: &Store,
    tracked: &TrackedSet,
    req: &ApplyRequest,
) -> Result<ApplyOutcome> {
    let _sync_lock = run::lock(store)?;
    apply_locked(store, tracked, req).await
}

/// Applies a prepared synchronization while the caller holds the sync lock.
pub(crate) async fn apply_locked(
    store: &Store,
    tracked: &TrackedSet,
    req: &ApplyRequest,
) -> Result<ApplyOutcome> {
    apply_locked_with_scope(store, tracked, req, None).await
}

pub(crate) async fn apply_locked_with_scope(
    store: &Store,
    tracked: &TrackedSet,
    req: &ApplyRequest,
    mut operation_scope: Option<OperationScope>,
) -> Result<ApplyOutcome> {
    if !req.paths.is_empty() {
        bail!("partial pulls are not supported: apply the complete setup without PATH arguments");
    }
    let repo = store
        .repo()
        .ok_or_else(|| eyre::eyre!("applying requires git"))?;
    let state_dir = store.state_dir();
    let planned_head = repo.ref_oid(crate::system::history::shadow::HistoryRepo::HISTORY_REF)?;
    let incoming = run::incoming_tracking(repo, tracked)?;
    let tracked = &incoming;
    // Metadata changes must advance the same complete Git tree after live
    // application. They cannot be reduced to this machine's selected paths.
    let mut inventory_tree = run::incoming_repository_tree(repo, tracked)?;
    let mut status = run::read_status(state_dir)?;
    if req.automatic && status.application_failure.is_some() {
        return Ok(ApplyOutcome {
            held: status.pending_applications.len().max(1),
            ..Default::default()
        });
    }
    run::refresh_with_interaction(
        store,
        tracked,
        &mut status,
        !req.automatic && console::user_attended_stderr(),
    )?;
    let roots = Roots::current();
    let mut take_remote: BTreeSet<PathBuf> = req
        .take_remote
        .iter()
        .map(|path| normalize_target(path))
        .collect();
    let mut keep_local: BTreeSet<PathBuf> = req
        .keep_local
        .iter()
        .map(|path| normalize_target(path))
        .collect();
    // Which conflicts a blanket choice spoke for, and why it could not speak
    // for the rest.
    let mut blanket_chosen: BTreeSet<PathBuf> = BTreeSet::new();
    let mut blanket_held: Vec<String> = vec![];
    // A blanket choice covers the conflicts nothing else decided, so
    // `--take-remote-all --keep-local <path>` keeps that one exception.
    if req.take_remote_all || req.keep_local_all {
        let decided: BTreeSet<PathBuf> = req
            .take_remote
            .iter()
            .chain(req.keep_local.iter())
            .map(|path| normalize_target(path))
            .collect();
        for conflict in &status.conflicts {
            if let Some(path) = roots.locate(&conflict.branch_path).path()
                && !decided.contains(path)
            {
                blanket_chosen.insert(path.to_path_buf());
            }
        }
        let blanket = if req.take_remote_all {
            &mut take_remote
        } else {
            &mut keep_local
        };
        blanket.extend(blanket_chosen.iter().cloned());
    }

    // Store choices without publishing or applying any part of the setup.
    let mut sync_state = state::load(repo)?;
    let shared = super::share::current(repo, tracked)?.objects();
    let encrypted = super::files::encrypted_paths(repo, status.upstream_commit.as_deref())?;
    for conflict in &status.conflicts {
        let Some(local) = roots
            .locate(&conflict.branch_path)
            .path()
            .map(Path::to_path_buf)
        else {
            continue;
        };
        if take_remote.contains(&local) || keep_local.contains(&local) {
            if take_remote.contains(&local) && keep_local.contains(&local) {
                bail!("choose only one resolution for {}", display_path(&local));
            }
            // A blanket choice cannot speak for a path whose live side is not
            // a file or symlink, and failing here would discard every other
            // decision this pass makes. Hold that one path and keep going; a
            // path named on the command line still reports the failure. The
            // check belongs on this read, so a path that changed since the
            // blanket choice was made is held too rather than aborting it.
            // Only the path's own fault is held: a repository failure on an
            // otherwise sound file is nobody's to fix by hand, so it stops
            // the pass with its own error.
            let live = match live_object(repo, &local) {
                Ok(live) => live,
                Err(err)
                    if blanket_chosen.contains(&local)
                        && err.downcast_ref::<UnusableLive>().is_some() =>
                {
                    blanket_held.push(err.to_string());
                    take_remote.remove(&local);
                    keep_local.remove(&local);
                    continue;
                }
                Err(err) => return Err(err),
            };
            let saved = shared.get(&conflict.branch_path).cloned();
            let saved_mode = permissions_at(
                repo,
                planned_head.as_deref(),
                &conflict.branch_path,
                saved.as_ref(),
            )?;
            if keep_local.contains(&local)
                && (live != saved || live_permissions(&local)? != saved_mode)
            {
                // Keeping the local side resolves the conflict by publishing
                // this machine's *saved* version, so there must be one, and it
                // must be the file as it stands now. A freshly adopted machine
                // has no baseline at all; an edited file has a stale one.
                let reason = if saved.is_none() {
                    "has no saved version on this machine yet"
                } else {
                    "has unsaved changes"
                };
                // The refusal stands either way, but as with an unusable live
                // side a blanket choice holds just this path rather than
                // discarding every decision it made alongside it. A path named
                // on the command line is the user's own instruction, so it
                // still fails the pass.
                if blanket_chosen.contains(&local) {
                    blanket_held.push(format!(
                        "{path} {reason}, so run `mise dot save {path}` first",
                        path = display_path(&local)
                    ));
                    keep_local.remove(&local);
                    continue;
                }
                bail!(
                    "run `mise dot save {path}` first: --keep-local publishes this machine's saved version of {path}, and it {reason}",
                    path = display_path(&local)
                );
            }
            let remote = match status.upstream_commit.as_deref() {
                Some(head) => repo
                    .object_at(head, &conflict.branch_path)?
                    .map(|object| {
                        if !encrypted.contains(&conflict.branch_path) {
                            return Ok(object);
                        }
                        super::files::decrypt(
                            repo,
                            &conflict.branch_path,
                            &object,
                            !req.automatic && console::user_attended_stderr(),
                        )
                    })
                    .transpose()?,
                None => None,
            };
            status.resolutions.insert(
                conflict.branch_path.clone(),
                run::Resolution {
                    local_mode: saved_mode,
                    remote_mode: permissions_at(
                        repo,
                        status.upstream_commit.as_deref(),
                        &conflict.branch_path,
                        remote.as_ref(),
                    )?,
                    live_mode: live_permissions(&local)?,
                    local: saved,
                    remote,
                    live,
                    take_remote: take_remote.contains(&local),
                },
            );
        }
    }
    for path in take_remote.iter().chain(keep_local.iter()) {
        if !status
            .conflicts
            .iter()
            .any(|conflict| roots.locate(&conflict.branch_path).path() == Some(path.as_path()))
        {
            bail!("{} is not a conflict", display_path(path));
        }
    }
    run::refresh(store, tracked, &mut status)?;
    if !req.dry_run {
        run::write_status(state_dir, &status)?;
    }
    if !status.conflicts.is_empty() {
        if req.dry_run {
            // Preview the whole paused setup even when reconciliation
            // cannot yet produce an applicable write set.
            let mut table = MiseTable::new(false, &["Path", "Action", "Group"]);
            for conflict in &status.conflicts {
                if let Some(path) = roots.locate(&conflict.branch_path).path() {
                    table.add_row(vec![
                        display_path(path),
                        "held: unresolved conflict".to_string(),
                        conflict.branch_path.clone(),
                    ]);
                }
            }
            for pending in &status.pending_applications {
                if let Some(path) = roots.locate(&pending.branch_path).path() {
                    table.add_row(vec![
                        display_path(path),
                        "held: sharing paused for the entire setup".to_string(),
                        pending.branch_path.clone(),
                    ]);
                }
            }
            table.print()?;
        }
        // A blanket choice promises to decide every conflict, so it has not
        // succeeded while one is still held -- whatever it decided alongside.
        // Those decisions are recorded above; naming the rest is what is left.
        if !blanket_held.is_empty() {
            if !req.dry_run && !req.automatic {
                bail!(
                    "sync paused: resolve all {count} conflict(s) before sharing resumes; a blanket choice cannot decide them all: {held}. Fix each of those paths, then pull again",
                    count = status.conflicts.len(),
                    held = blanket_held.join("; "),
                );
            }
            // A preview and a background pass both carry on, so this is the
            // only chance either gets to say why a path went undecided.
            warn!(
                "a blanket choice cannot decide {held}",
                held = blanket_held.join("; "),
            );
        }
        if take_remote.is_empty() && keep_local.is_empty() && !req.dry_run && !req.automatic {
            bail!(
                "sync paused: resolve all {} conflict(s) before sharing resumes; `mise dot pull --take-remote-all` chooses the repository's version for every conflict at once, and `mise dot status` says whether any path still needs a different fix",
                status.conflicts.len()
            );
        }
        info!(
            "sync paused: {} conflict(s) remain; no files applied or published",
            status.conflicts.len()
        );
        return Ok(ApplyOutcome {
            held: status.conflicts.len(),
            ..Default::default()
        });
    }

    // Only after all version-bound choices are valid may they replace Git's
    // conflict objects in the complete tree. Use the committed ciphertext,
    // never the decrypted comparison objects held by the resolution record.
    if let Some(tree) = &inventory_tree {
        let mut overlays = vec![];
        for (path, choice) in &status.resolutions {
            let head = if choice.take_remote {
                status.upstream_commit.as_deref()
            } else {
                planned_head.as_deref()
            };
            overlays.push(crate::system::history::shadow::Overlay {
                path: path.clone(),
                object: head
                    .map(|head| repo.object_at(head, path))
                    .transpose()?
                    .flatten(),
            });
        }
        inventory_tree = Some(repo.compose(tree, &overlays)?);
    }

    // the write set
    let directory_tree = inventory_tree
        .as_deref()
        .or(status.upstream_commit.as_deref())
        .or(planned_head.as_deref());
    let mut directories = directory_tree
        .map(|tree| super::directories::plan(repo, tracked, tree))
        .transpose()?
        .unwrap_or_default();
    let mut steps = vec![];
    let mut holds: Vec<Hold> = vec![];
    for pending in &status.pending_applications {
        let Some(path) = roots
            .locate(&pending.branch_path)
            .path()
            .map(Path::to_path_buf)
        else {
            continue;
        };
        let group = if pending.configuration || pending.branch_path.starts_with("sources/") {
            "configuration".to_string()
        } else {
            pending.branch_path.clone()
        };
        steps.push(Step {
            before_mode: live_permissions(&path)?,
            desired_mode: tracked
                .manifest
                .file_permissions(&pending.branch_path, pending.object.as_ref()),
            pending: pending.clone(),
            exists: path.exists() || path.is_symlink(),
            before: live_object(repo, &path)?,
            permissions: std::fs::symlink_metadata(&path)
                .ok()
                .map(|meta| meta.permissions()),
            path,
            group,
        });
    }
    let fresh_adoption = planned_head.is_none() && status.upstream_commit.is_some();
    if steps.is_empty() && !fresh_adoption && inventory_tree.is_none() {
        if !req.dry_run && !req.automatic {
            status.application_failure = None;
            run::write_status(state_dir, &status)?;
        }
        if !req.automatic {
            info!("history: nothing to apply");
        }
        return Ok(ApplyOutcome::default());
    }

    let staged = staged_paths(steps.iter().map(|step| step.path.as_path()))?;
    // Validate the complete batch before writing any member.
    for step in &steps {
        let take_remote = status
            .resolutions
            .get(&step.pending.branch_path)
            .is_some_and(|choice| choice.take_remote);
        if let Some(reason) = hold_reason(repo, tracked, step, take_remote, &staged)? {
            holds.push(Hold {
                path: step.path.clone(),
                reason,
            });
        }
    }
    // One unsafe path holds the complete batch; there is no partial apply.
    let (ready, held): (Vec<&Step>, Vec<&Step>) = if holds.is_empty() {
        (steps.iter().collect(), vec![])
    } else {
        (vec![], steps.iter().collect())
    };
    if held.is_empty()
        && let Some(tree) = &inventory_tree
    {
        let parents: Vec<_> = planned_head
            .as_deref()
            .into_iter()
            .chain(status.upstream_commit.as_deref())
            .collect();
        let overlays = ready
            .iter()
            .map(|step| {
                Ok(crate::system::history::shadow::Overlay {
                    path: step.pending.branch_path.clone(),
                    object: step
                        .pending
                        .object
                        .as_ref()
                        .map(|object| {
                            super::files::commit_object(
                                repo,
                                &step.pending.branch_path,
                                object,
                                &tracked.manifest,
                                &parents,
                                !req.automatic && console::user_attended_stderr(),
                            )
                        })
                        .transpose()?,
                })
            })
            .collect::<Result<Vec<_>>>()?;
        inventory_tree = Some(repo.compose(tree, &overlays)?);
    }

    // the plan
    let mut table = MiseTable::new(false, &["Path", "Action", "Group"]);
    for step in &ready {
        let action = match (&step.pending.object, step.exists) {
            (Some(_), true) => "write",
            (Some(_), false) => "create",
            (None, _) => "delete",
        };
        table.add_row(vec![
            display_path(&step.path),
            action.to_string(),
            step.group.clone(),
        ]);
    }
    for directory in &directories {
        table.add_row(vec![
            display_path(&directory.path),
            "permissions".into(),
            "setup".into(),
        ]);
    }
    for step in &held {
        let reason = holds
            .iter()
            .find(|hold| hold.path == step.path)
            .map(|hold| hold.reason.clone())
            .unwrap_or_else(|| "sharing paused for the entire setup".to_string());
        table.add_row(vec![
            display_path(&step.path),
            format!("held: {reason}"),
            step.group.clone(),
        ]);
    }
    if !req.automatic {
        table.print()?;
    }
    if req.dry_run {
        if !req.plan_only {
            miseprintln!("history: dry run; nothing was changed");
        }
        return Ok(ApplyOutcome::default());
    }
    if ready.is_empty() && !((fresh_adoption || inventory_tree.is_some()) && held.is_empty()) {
        if req.automatic {
            return Ok(ApplyOutcome {
                held: held.len(),
                ..Default::default()
            });
        }
        bail!("nothing can be applied until the held paths are decided");
    }
    if !req.automatic
        && !super::origin::confirmed(req.yes, "history: apply these incoming changes?")?
    {
        info!("history: skipped");
        return Ok(ApplyOutcome::default());
    }

    // the transaction
    let reload = crate::system::history::config::reload_commands()?;
    let scope = if let Some(scope) = operation_scope.take() {
        scope
    } else if req.automatic {
        OperationScope::begin_automatic_apply().await?
    } else {
        OperationScope::begin_kind(OperationKind::Apply, "dotfiles pull", false).await?
    };
    scope.with_operation(|op| {
        op.applied = status.upstream_commit.clone();
    });
    let application_head =
        repo.ref_oid(crate::system::history::shadow::HistoryRepo::HISTORY_REF)?;
    let mut touched = vec![];
    let result = (|| -> Result<()> {
        scope.validate_starting_head(planned_head.as_deref())?;
        if let (Some(tree), Some(local)) = (&inventory_tree, &planned_head) {
            let heads = super::graph::Heads::read(repo)?;
            let current = heads
                .local
                .as_deref()
                .ok_or_else(|| eyre::eyre!("local history disappeared"))?;
            // The operation's own protective commit may save the unsaved
            // versions that an explicit --take-remote decision will replace.
            // Permit only changes at those preflighted paths; any other saved
            // change requires a fresh complete plan.
            let restore_planned = ready
                .iter()
                .map(|step| {
                    Ok(crate::system::history::shadow::Overlay {
                        path: step.pending.branch_path.clone(),
                        object: repo.object_at(local, &step.pending.branch_path)?,
                    })
                })
                .collect::<Result<Vec<_>>>()?;
            if repo.compose(&repo.output_tree_of(current)?, &restore_planned)?
                != repo.output_tree_of(local)?
            {
                bail!("local files were saved after enrollment planning; retry pull");
            }
            // Do not let a divergent text merge or a stale resolution differ
            // from the complete tree that will be adopted.
            for step in &ready {
                if repo.restored_object_at(tree, &step.pending.branch_path)? != step.pending.object
                {
                    bail!(
                        "{} changed in the complete repository merge; reconcile again",
                        display_path(&step.path)
                    );
                }
            }
            let candidate = heads
                .candidate(repo, tree)?
                .ok_or_else(|| eyre::eyre!("setup branch disappeared"))?;
            audit_incoming_history(repo, &candidate.commit)?;
        }
        // Validate the complete batch again after acquiring the operation
        // lock, before the first write.
        for directory in &directories {
            directory.validate()?;
        }
        for step in &ready {
            if live_object(repo, &step.path)? != step.before
                || live_permissions(&step.path)? != step.before_mode
            {
                bail!(
                    "{} changed before application; nothing was written",
                    display_path(&step.path)
                );
            }
        }
        for directory in &mut directories {
            directory.apply()?;
        }
        for step in &ready {
            // the file may have changed since the plan was made: an edit
            // that landed meanwhile is never overwritten (undo would bring
            // back the planned version, not it)
            if live_object(repo, &step.path)? != step.before
                || live_permissions(&step.path)? != step.before_mode
            {
                bail!(
                    "{} changed while the changes were being applied; nothing more was written. Run `mise dot pull` again",
                    display_path(&step.path)
                );
            }
            let pending =
                journal::begin_changes("history", &display_path(&step.path), [step.path.clone()])?;
            touched.push(step.path.clone());
            let affected = display_path(&step.path);
            scope.with_operation(|op| op.affected.push(affected.clone()));
            match &step.pending.object {
                Some((mode, oid)) => {
                    replay::write_path_with_mode(repo, &step.path, mode, oid, step.desired_mode)?
                }
                None => replay::remove(&step.path)?,
            }
            journal::commit_changes(pending);
            let mut next = step.pending.next.clone();
            let oid = step.pending.object.clone();
            next.applied = oid.clone();
            next.acknowledged = oid;
            sync_state.insert(step.pending.branch_path.clone(), next);
        }
        if fresh_adoption || inventory_tree.is_some() {
            // Verify the whole written batch again before advancing Git. A
            // concurrent edit must not become an apparently applied setup.
            for step in &ready {
                if live_object(repo, &step.path)? != step.pending.object
                    || live_permissions(&step.path)? != step.desired_mode
                {
                    bail!(
                        "{} changed during setup adoption; retry pull",
                        display_path(&step.path)
                    );
                }
            }
            for directory in &directories {
                directory.verify_written()?;
            }
            let heads = super::graph::Heads::read(repo)?;
            if heads.local != application_head || heads.remote != status.upstream_commit {
                bail!("setup history changed during adoption; retry pull");
            }
            let remote = heads.remote.as_deref().unwrap();
            audit_incoming_history(repo, remote)?;
            let tree = inventory_tree
                .clone()
                .unwrap_or(repo.output_tree_of(remote)?);
            let candidate = heads
                .candidate(repo, &tree)?
                .ok_or_else(|| eyre::eyre!("setup branch disappeared during adoption"))?;
            candidate.adopt(repo)?;
        }
        Ok(())
    })();
    if let Err(error) = &result {
        let mut recovery_errors = vec![];
        for step in ready
            .iter()
            .rev()
            .filter(|step| touched.contains(&step.path))
        {
            if let Err(err) = recover_step(repo, step) {
                recovery_errors.push(format!("{err:#}"));
            }
        }
        for directory in directories.iter().rev() {
            if let Err(err) = directory.recover() {
                recovery_errors.push(format!("{err:#}"));
            }
        }
        status.application_failure = Some(format!(
            "application failed ({:#}); {}. Sharing is paused. Inspect `mise dot history` and retry `mise dot pull`",
            error,
            if recovery_errors.is_empty() {
                "previous files restored".into()
            } else {
                recovery_errors.join("; ")
            }
        ));
        run::write_status(state_dir, &status)?;
        let summary = Some(Summary {
            message: Some("apply failed; recovery attempted".into()),
        });
        if recovery_errors.is_empty() {
            scope.finish(status.application_failure.clone(), summary);
        } else {
            scope.finish_incomplete(status.application_failure.clone(), summary);
        }
        return result.map(|()| ApplyOutcome::default());
    }
    let written = touched.len() + directories.len();
    scope.promote(&touched);
    let summary = Summary {
        message: Some(format!("applied {written} incoming change(s)")),
    };
    state::save(repo, &sync_state, "applied")?;
    let applied: BTreeSet<String> = ready
        .iter()
        .filter(|step| touched.contains(&step.path))
        .map(|step| step.pending.branch_path.clone())
        .collect();
    status
        .pending_applications
        .retain(|pending| !applied.contains(&pending.branch_path));
    status.resolutions.retain(|path, _| !applied.contains(path));
    status.application_failure = None;
    status.pending_repository = false;
    status.conflict_pause_observed = false;
    // the live declarations changed now: said until `mise bootstrap` ran
    let configuration_written = ready
        .iter()
        .any(|step| step.pending.configuration && touched.contains(&step.path));
    status.declarations_changed = status.declarations_changed
        || configuration_written
        || status
            .pending_applications
            .iter()
            .any(|pending| pending.configuration);
    if !touched.is_empty() || inventory_tree.is_some() || fresh_adoption {
        status.last_apply = Some(crate::system::history::store::now_rfc3339());
    }
    run::write_status(state_dir, &status)?;
    scope.finish(None, Some(summary));
    replay::run_reload(&reload, &touched);
    let configuration = ready.iter().any(|step| step.pending.configuration);
    if configuration && !req.automatic {
        info!(
            "history: configuration changed; declarations may differ from the applied setup: run `mise bootstrap --dry-run`"
        );
    }
    if !req.automatic {
        info!("history: applied {written} incoming change(s)");
    }
    let outcome = ApplyOutcome {
        written,
        held: held.len(),
        configuration,
    };
    Ok(outcome)
}

fn audit_incoming_history(
    repo: &crate::system::history::shadow::HistoryRepo,
    head: &str,
) -> Result<()> {
    if crate::config::Settings::get()
        .history
        .allow_plaintext_history
    {
        return Ok(());
    }
    super::files::audit_history(repo, head, &Default::default())
}

fn recover_step(repo: &crate::system::history::shadow::HistoryRepo, step: &Step) -> Result<()> {
    let current = live_object(repo, &step.path)?;
    if current == step.before && live_permissions(&step.path)? == step.before_mode {
        return Ok(());
    }
    if current != step.pending.object || live_permissions(&step.path)? != step.desired_mode {
        bail!(
            "{} changed during recovery; left untouched",
            display_path(&step.path)
        );
    }
    match &step.before {
        Some((mode, oid)) => {
            #[cfg(unix)]
            let bits = {
                use std::os::unix::fs::PermissionsExt;
                step.permissions.as_ref().map(|p| p.mode() & 0o777)
            };
            #[cfg(not(unix))]
            let bits = None;
            replay::write_path_with_mode(repo, &step.path, mode, oid, bits)?;
        }
        None => replay::remove(&step.path)?,
    }
    if !step.path.is_symlink()
        && let Some(permissions) = &step.permissions
    {
        std::fs::set_permissions(&step.path, permissions.clone())?;
    }
    Ok(())
}

/// Why a step must wait: unsaved local edits, git changes in a user
/// checkout, an invalid incoming configuration file.
fn hold_reason(
    repo: &crate::system::history::shadow::HistoryRepo,
    tracked: &TrackedSet,
    step: &Step,
    take_remote: bool,
    staged: &BTreeSet<PathBuf>,
) -> Result<Option<String>> {
    let expected = step.pending.local.clone();
    if saved_object(repo, tracked, &step.path)? != expected {
        return Ok(Some(
            "local saved version changed since planning; run sync again".into(),
        ));
    }
    let live = live_object(repo, &step.path)?;
    let identical_adoption = repo
        .ref_oid(crate::system::history::shadow::HistoryRepo::HISTORY_REF)?
        .is_none()
        && live == step.pending.object;
    let local_head = repo.ref_oid(crate::system::history::shadow::HistoryRepo::HISTORY_REF)?;
    let expected_mode = permissions_at(
        repo,
        local_head.as_deref(),
        &step.pending.branch_path,
        expected.as_ref(),
    )?;
    if !take_remote
        && (live != expected || live_permissions(&step.path)? != expected_mode)
        && !identical_adoption
    {
        return Ok(Some(
            "local file changed since planning; save or resolve it first".into(),
        ));
    }
    // an incoming configuration file must at least parse
    if step.pending.configuration
        && step.path.extension().is_some_and(|ext| ext == "toml")
        && let Some((_, oid)) = &step.pending.object
    {
        let bytes = repo.cat_object(oid)?;
        if let Err(err) = toml::from_str::<toml::Value>(&String::from_utf8_lossy(&bytes)) {
            return Ok(Some(format!("invalid merge: {err}")));
        }
    }
    if !step.exists {
        return Ok(None);
    }
    // a directory is never replaced by a file from the repository
    if step.path.is_dir() && !step.path.is_symlink() {
        return Ok(Some(
            "needs decision: a directory stands where the repository has a file; move it away first"
                .into(),
        ));
    }
    // Saved/live comparison above is authoritative; preserve staged changes
    // independently, without consulting a machine's old application cache.
    if has_staged_changes(staged, &step.path) {
        return Ok(Some("needs decision: staged git changes".into()));
    }
    Ok(None)
}

fn permissions_at(
    repo: &crate::system::history::shadow::HistoryRepo,
    commit: Option<&str>,
    path: &str,
    object: Option<&Object>,
) -> Result<Option<u32>> {
    Ok(commit
        .map(|head| crate::system::history::manifest::Manifest::read(repo, head))
        .transpose()?
        .flatten()
        .unwrap_or_default()
        .file_permissions(path, object))
}

pub(super) fn live_permissions(path: &Path) -> Result<Option<u32>> {
    #[cfg(unix)]
    {
        use std::os::unix::fs::PermissionsExt;
        match std::fs::symlink_metadata(path) {
            Ok(meta) if meta.is_file() => Ok(Some(meta.permissions().mode() & 0o777)),
            Ok(_) => Ok(None),
            Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(None),
            Err(err) => Err(err.into()),
        }
    }
    #[cfg(not(unix))]
    {
        let _ = path;
        Ok(None)
    }
}

/// The live side of a path cannot stand in for a shared object. The file is
/// the problem, not the machinery, so a blanket resolution may hold just this
/// path; every other failure is the repository's and must stop the pass.
#[derive(Debug)]
pub(super) struct UnusableLive(String);

impl std::fmt::Display for UnusableLive {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        f.write_str(&self.0)
    }
}

impl std::error::Error for UnusableLive {}

/// Each of these names the path, because a blanket resolution repeats the
/// reason it could not decide one and by then the path is all it still has.
fn unusable(path: &Path, what: impl std::fmt::Display) -> eyre::Report {
    eyre::Report::new(UnusableLive(format!("{} {what}", display_path(path))))
}

pub(super) fn live_object(
    repo: &crate::system::history::shadow::HistoryRepo,
    path: &Path,
) -> Result<Option<Object>> {
    let meta = match std::fs::symlink_metadata(path) {
        Ok(meta) => meta,
        Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(None),
        Err(err) => return Err(unusable(path, format_args!("cannot be read: {err}"))),
    };
    if meta.file_type().is_symlink() {
        let target = std::fs::read_link(path)
            .map_err(|err| unusable(path, format_args!("cannot be read: {err}")))?;
        return Ok(Some((
            "120000".into(),
            repo.transient_blob_id(crate::system::history::shadow::path_bytes(&target).as_ref())?,
        )));
    }
    if !meta.is_file() {
        return Err(unusable(path, "is not a regular file or symlink"));
    }
    #[cfg(unix)]
    let executable = {
        use std::os::unix::fs::PermissionsExt;
        meta.permissions().mode() & 0o111 != 0
    };
    #[cfg(not(unix))]
    let executable = false;
    let contents =
        std::fs::read(path).map_err(|err| unusable(path, format_args!("cannot be read: {err}")))?;
    Ok(Some((
        if executable { "100755" } else { "100644" }.into(),
        repo.transient_blob_id(&contents)?,
    )))
}

fn saved_object(
    repo: &crate::system::history::shadow::HistoryRepo,
    tracked: &TrackedSet,
    path: &Path,
) -> Result<Option<Object>> {
    let Some(head) = repo.ref_oid(crate::system::history::shadow::HistoryRepo::HISTORY_REF)? else {
        return Ok(None);
    };
    let Some(entry) = tracked.entry_for(path) else {
        return Ok(None);
    };
    repo.restored_object_at(&head, &entry.tree_path(path)?)
}

/// Read each containing checkout's index once per preflight, not once per
/// incoming file. Never retain this observation across subsequent validation.
pub(super) fn staged_paths<'a>(paths: impl Iterator<Item = &'a Path>) -> Result<BTreeSet<PathBuf>> {
    let roots: BTreeSet<_> = paths
        .filter_map(|path| {
            path.ancestors()
                .find(|dir| dir.join(".git").exists())
                .map(Path::to_path_buf)
        })
        .collect();
    let mut staged = BTreeSet::new();
    if roots.is_empty() {
        return Ok(staged);
    }
    let Some(git) = crate::git::plumbing_binary() else {
        bail!("cannot check staged changes: git is unavailable");
    };
    for root in roots {
        let mut command = std::process::Command::new(git);
        crate::git::sanitize_git_command(&mut command);
        let output = command
            .arg("-C")
            .arg(&root)
            .args([
                "-c",
                "core.fsmonitor=false",
                "diff",
                "--cached",
                "--name-only",
                "-z",
                "--no-renames",
                "--no-ext-diff",
                "--no-textconv",
                "--",
            ])
            .env("GIT_OPTIONAL_LOCKS", "0")
            .stdin(std::process::Stdio::null())
            .output()?;
        if !output.status.success() {
            bail!(
                "cannot check staged changes in {}: {}",
                display_path(&root),
                String::from_utf8_lossy(&output.stderr).trim()
            );
        }
        for name in output
            .stdout
            .split(|byte| *byte == 0)
            .filter(|name| !name.is_empty())
        {
            #[cfg(unix)]
            let relative = {
                use std::os::unix::ffi::OsStrExt;
                PathBuf::from(std::ffi::OsStr::from_bytes(name))
            };
            #[cfg(not(unix))]
            let relative = PathBuf::from(std::str::from_utf8(name)?);
            staged.insert(normalize_target(&root.join(relative)));
        }
    }
    Ok(staged)
}

pub(super) fn has_staged_changes(staged: &BTreeSet<PathBuf>, path: &Path) -> bool {
    staged
        .range(path.to_path_buf()..)
        .next()
        .is_some_and(|entry| entry.starts_with(path))
}

/// The conflicts as rows for `mise dot status`.
pub(crate) fn describe_conflicts(conflicts: &[Conflict]) -> Vec<(String, String)> {
    let roots = Roots::current();
    conflicts
        .iter()
        .map(|conflict| {
            let path = roots
                .locate(&conflict.branch_path)
                .path()
                .map(display_path)
                .unwrap_or_else(|| conflict.branch_path.clone());
            (path, conflict.kind.describe().to_string())
        })
        .collect()
}

pub(crate) fn resolution_advice(path: &str, reason: &str) -> String {
    if reason == super::reconcile::ConflictKind::Repository.describe() {
        "inspect the validation error, reconcile the repository with Git, then run `mise dot sync`"
            .into()
    } else if reason == super::reconcile::ConflictKind::UnusableLive.describe() {
        // Neither side of the repository is in question, so neither
        // resolution can be applied: the path itself is what has to change.
        format!(
            "move {path} away or make it a readable file, then run `mise dot pull`; --take-remote and --keep-local cannot decide it"
        )
    } else {
        format!(
            "inspect with `mise dot conflicts {path}`; resolve with `mise dot pull --take-remote {path}` or `mise dot pull --keep-local {path}`"
        )
    }
}

#[cfg(test)]
mod tests {
    #[test]
    fn staged_lookup_batches_checkouts_and_preserves_filename_boundaries() -> eyre::Result<()> {
        let temp = tempfile::tempdir()?;
        let root = crate::system::history::tracked::normalize_target(temp.path());
        let git = crate::git::plumbing_binary().expect("git is required for history tests");
        let run = |args: &[&str]| -> eyre::Result<()> {
            let mut command = std::process::Command::new(git);
            crate::git::sanitize_git_command(&mut command);
            let output = command.arg("-C").arg(&root).args(args).output()?;
            eyre::ensure!(
                output.status.success(),
                "{}",
                String::from_utf8_lossy(&output.stderr)
            );
            Ok(())
        };
        run(&["init", "--quiet"])?;
        std::fs::create_dir(root.join("configs"))?;
        let staged_file = root.join("configs/with spaces");
        let untracked = root.join("configs/untracked");
        std::fs::write(&staged_file, "staged")?;
        std::fs::write(&untracked, "not staged")?;
        run(&["add", "--", "configs/with spaces"])?;
        #[cfg(unix)]
        {
            std::fs::write(root.join("configs/with\nnewline"), "staged")?;
            run(&["add", "--", "configs/with\nnewline"])?;
        }
        let paths = [&staged_file, &untracked];
        let staged = super::staged_paths(paths.into_iter().map(|path| path.as_path()))?;
        assert!(super::has_staged_changes(&staged, &staged_file));
        assert!(super::has_staged_changes(&staged, &root.join("configs")));
        assert!(!super::has_staged_changes(&staged, &untracked));
        #[cfg(unix)]
        assert!(staged.contains(&root.join("configs/with\nnewline")));
        // A fresh validation must observe changes to the index.
        run(&["rm", "--cached", "--", "configs/with spaces"])?;
        let staged = super::staged_paths(std::iter::once(staged_file.as_path()))?;
        assert!(!super::has_staged_changes(&staged, &staged_file));
        Ok(())
    }

    use super::*;
    use crate::system::history::shadow::HistoryRepo;

    #[test]
    fn recovery_restores_preimage_but_preserves_concurrent_edits() -> Result<()> {
        let dir = tempfile::tempdir()?;
        let repo = HistoryRepo::open_or_init_in(dir.path())?.expect("git available");
        let path = dir.path().join("config");
        std::fs::write(&path, "before")?;
        #[cfg(unix)]
        {
            use std::os::unix::fs::PermissionsExt;
            std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o600))?;
        }
        let step = Step {
            before_mode: live_permissions(&path)?,
            desired_mode: cfg!(unix).then_some(0o644),
            before: live_object(&repo, &path)?,
            permissions: Some(std::fs::metadata(&path)?.permissions()),
            path: path.clone(),
            group: "setup".into(),
            exists: true,
            pending: PendingApplication {
                branch_path: "home/config".into(),
                object: Some(("100644".into(), repo.hash_blob(b"incoming")?)),
                configuration: false,
                next: Default::default(),
                local: None,
            },
        };
        let (mode, oid) = step.pending.object.as_ref().unwrap();
        replay::write_path_with_mode(&repo, &path, mode, oid, step.desired_mode)?;
        #[cfg(unix)]
        {
            use std::os::unix::fs::PermissionsExt;
            std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o400))?;
            assert!(recover_step(&repo, &step).is_err());
            assert_eq!(std::fs::read_to_string(&path)?, "incoming");
            assert_eq!(live_permissions(&path)?, Some(0o400));
            std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o644))?;
        }
        recover_step(&repo, &step)?;
        assert_eq!(std::fs::read_to_string(&path)?, "before");
        #[cfg(unix)]
        {
            use std::os::unix::fs::PermissionsExt;
            assert_eq!(
                std::fs::metadata(&path)?.permissions().mode() & 0o777,
                0o600
            );
        }
        // Recovery is idempotent after an earlier successful attempt.
        recover_step(&repo, &step)?;
        std::fs::write(&path, "concurrent edit")?;
        assert!(recover_step(&repo, &step).is_err());
        assert_eq!(std::fs::read_to_string(&path)?, "concurrent edit");
        Ok(())
    }
}