dalo 1.11.1

Your team's agent skills, versioned like code. Review, pin, and sync skills, instructions, and hooks into every agent.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
//! Adoption and minimal repair operations for unmanaged target skills.

use std::collections::BTreeMap;
use std::fs;
use std::io;
use std::os::unix::fs as unix_fs;
use std::os::unix::fs::PermissionsExt;
use std::path::{Path, PathBuf};

use serde::Serialize;

use crate::error::{DaloError, DaloResult};
use crate::inventory;
use crate::store::{self, OwnedSkillState, ProtectedSkillState, StorePaths};

const SKILL_FILE: &str = "SKILL.md";

/// Unmanaged skill discovered in a linked target directory.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct UnmanagedSkill {
    /// Stable CLI-facing ID. Usually the slot name, or the full path when ambiguous.
    pub id: String,
    /// Target slot name.
    pub slot_name: String,
    /// Skill directory path.
    pub path: PathBuf,
    /// Logical target IDs using the materialization directory.
    pub target_ids: Vec<String>,
    /// Whether the skill is protected from replacement.
    pub protected: bool,
}

/// Adopt command report.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct AdoptReport {
    /// Adopted slot name.
    pub slot_name: String,
    /// Original unmanaged skill path.
    pub source_path: PathBuf,
    /// Local source destination.
    pub local_path: PathBuf,
    /// Copy status.
    pub copy: AdoptCopyStatus,
    /// Optional replacement status.
    pub replacement: AdoptReplacementStatus,
    /// Action needed when the original unmanaged skill remains at the same slot.
    #[serde(skip_serializing_if = "Option::is_none")]
    pub next_step: Option<String>,
}

/// Copy status for adoption.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum AdoptCopyStatus {
    /// Copy would run in dry-run mode.
    Planned,
    /// Skill was copied into the local source.
    Copied,
    /// A local copy already existed and was reused (second step of a two-step adopt).
    Existing,
}

impl AdoptCopyStatus {
    /// Text label.
    #[must_use]
    pub fn as_str(self) -> &'static str {
        match self {
            Self::Planned => "planned",
            Self::Copied => "copied",
            Self::Existing => "existing",
        }
    }
}

/// Replacement status for adoption.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum AdoptReplacementStatus {
    /// Replacement would run in dry-run mode.
    Planned,
    /// Original unmanaged folder was replaced with an owned symlink.
    Replaced,
    /// Replacement was not requested.
    Skipped,
    /// Original skill is protected and was left untouched.
    Protected,
}

impl AdoptReplacementStatus {
    /// Text label.
    #[must_use]
    pub fn as_str(self) -> &'static str {
        match self {
            Self::Planned => "planned",
            Self::Replaced => "replaced",
            Self::Skipped => "skipped",
            Self::Protected => "protected",
        }
    }
}

/// Resolve list report.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct ResolveListReport {
    /// Unmanaged skills in linked targets.
    pub unmanaged_skills: Vec<UnmanagedSkill>,
    /// Non-fatal target directory scan warnings.
    pub target_warnings: Vec<TargetScanWarning>,
    /// Recorded owned symlinks.
    pub owned_skills: Vec<OwnedSkillSummary>,
}

/// Unmanaged target scan result.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct UnmanagedSkillScan {
    /// Unmanaged skills in linked targets.
    pub unmanaged_skills: Vec<UnmanagedSkill>,
    /// Non-fatal target directory scan warnings.
    pub warnings: Vec<TargetScanWarning>,
}

/// Non-fatal target scan warning.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct TargetScanWarning {
    /// Warning code.
    pub code: TargetScanWarningCode,
    /// Path related to the warning.
    pub path: PathBuf,
    /// Human-readable message.
    pub message: String,
}

/// Target scan warning code.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum TargetScanWarningCode {
    /// A materialization directory or child entry could not be read.
    UnreadableTargetDir,
}

impl TargetScanWarningCode {
    /// Text label.
    #[must_use]
    pub fn as_str(self) -> &'static str {
        match self {
            Self::UnreadableTargetDir => "unreadable_target_dir",
        }
    }
}

/// Recorded owned symlink summary.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct OwnedSkillSummary {
    /// Repair ID accepted by `resolve remove-owned`.
    pub id: String,
    /// Target slot name.
    pub slot_name: String,
    /// Link path.
    pub link_path: PathBuf,
    /// Store path.
    pub store_path: PathBuf,
}

/// Keep/protect report.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct KeepReport {
    /// Protected unmanaged skill.
    pub skill: UnmanagedSkill,
    /// Whether the protection already existed.
    pub existing: bool,
    /// Whether the command ran as dry-run.
    pub dry_run: bool,
    /// Warning when a managed local skill still targets the protected slot.
    #[serde(skip_serializing_if = "Option::is_none")]
    pub warning: Option<String>,
}

/// Remove-protection report.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct UnkeepReport {
    /// Selector accepted by the command.
    pub selector: String,
    /// Target-qualified protections removed.
    pub removed: Vec<String>,
    /// Whether the command ran as dry-run.
    pub dry_run: bool,
}

/// Remove-owned report.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct RemoveOwnedReport {
    /// Removed or repaired record ID.
    pub id: String,
    /// Link path.
    pub link_path: PathBuf,
    /// Status.
    pub status: RemoveOwnedStatus,
    /// Source reference stored with the removed record when the link was last
    /// materialized. This remains internal so the established JSON report
    /// contract stays unchanged.
    #[serde(skip)]
    pub(crate) recorded_source_ref: Option<String>,
    /// Store path stored with the removed record. This supports matching legacy
    /// records that predate persisted source references without changing the
    /// established JSON report contract.
    #[serde(skip)]
    pub(crate) store_path: PathBuf,
    /// Slot name stored with the removed record.
    #[serde(skip)]
    pub(crate) slot_name: String,
    /// Human-only remediation for a link whose recorded owner is still active.
    #[serde(skip)]
    pub(crate) next_step: Option<String>,
}

/// Remove-owned status.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(rename_all = "snake_case")]
pub enum RemoveOwnedStatus {
    /// Operation would run in dry-run mode.
    Planned,
    /// Owned symlink was removed and the state record was dropped.
    Removed,
    /// State record was dropped because the symlink was already absent.
    DroppedMissing,
    /// A real entry exists at the recorded path, so nothing was removed.
    BlockedRealEntry,
    /// A different symlink occupies the path, so only the stale state record was dropped.
    DroppedForeignSymlink,
}

impl RemoveOwnedStatus {
    /// Text label.
    #[must_use]
    pub fn as_str(self) -> &'static str {
        match self {
            Self::Planned => "planned",
            Self::Removed => "removed",
            Self::DroppedMissing => "dropped_missing",
            Self::BlockedRealEntry => "blocked_real_entry",
            Self::DroppedForeignSymlink => "dropped_foreign_symlink",
        }
    }
}

/// Discover unmanaged skills in configured target directories.
pub fn discover_unmanaged_skills(paths: &StorePaths) -> DaloResult<Vec<UnmanagedSkill>> {
    Ok(discover_unmanaged_skill_scan(paths)?.unmanaged_skills)
}

/// Discover unmanaged skills and non-fatal target scan warnings.
pub fn discover_unmanaged_skill_scan(paths: &StorePaths) -> DaloResult<UnmanagedSkillScan> {
    let state = store::read_state(paths)?;
    let mut found = Vec::new();
    let mut warnings = Vec::new();

    for dir in &state.materialization_dirs {
        if !dir.path.exists() {
            continue;
        }

        let entries = match fs::read_dir(&dir.path) {
            Ok(entries) => entries,
            Err(error) => {
                warnings.push(unreadable_target_warning(&dir.path, error));
                continue;
            }
        };

        for entry in entries {
            let entry = match entry {
                Ok(entry) => entry,
                Err(error) => {
                    warnings.push(unreadable_target_warning(&dir.path, error));
                    continue;
                }
            };
            let path = entry.path();
            let file_type = match entry.file_type() {
                Ok(file_type) => file_type,
                Err(error) => {
                    warnings.push(unreadable_target_warning(&path, error));
                    continue;
                }
            };
            // Dalo only ever owns symlinks. A real folder in a slot that is
            // still recorded as owned replaced Dalo's link, so it is user
            // content like any other unmanaged skill; sync already treats it
            // that way, and the stale record is dropped once it is kept,
            // adopted with `--replace`, or synced.
            if file_type.is_symlink() {
                continue;
            }
            if !path.join(SKILL_FILE).is_file() {
                continue;
            }

            let slot_name = path
                .file_name()
                .map(|name| name.to_string_lossy().into_owned())
                .unwrap_or_else(|| path.display().to_string());
            let protected = is_local_marker(&slot_name)
                || state.protected_skills.iter().any(|protected| {
                    protected.slot_name == slot_name
                        && (dir.logical_targets.contains(&protected.target_id)
                            || protected.path.as_ref() == Some(&path))
                });
            found.push(UnmanagedSkill {
                id: String::new(),
                slot_name,
                path,
                target_ids: dir.logical_targets.clone(),
                protected,
            });
        }
    }

    warnings.sort_by(|left, right| left.path.cmp(&right.path));
    Ok(UnmanagedSkillScan {
        unmanaged_skills: assign_unmanaged_ids(found),
        warnings,
    })
}

/// Adopt an unmanaged skill into the local source.
pub fn adopt_skill(
    paths: &StorePaths,
    selector: &str,
    replace_original: bool,
    dry_run: bool,
) -> DaloResult<AdoptReport> {
    let skill = find_unmanaged_skill(paths, selector)?;
    validate_adoptable_slot_name(&skill, selector)?;
    let local_path = paths.local_skills_dir.join(&skill.slot_name);
    if !dry_run {
        remove_interrupted_adoption_dirs(&local_path)?;
    }

    let copy = if local_path.exists() {
        // A local copy already exists. A plain `adopt` must never clobber it.
        if !replace_original {
            return Err(DaloError::AdoptionDestinationExists { path: local_path });
        }
        // Replacement may be the second step of a two-step flow ONLY if the
        // existing copy has the same content as the skill being adopted. If it is
        // an unrelated, pre-existing local skill, replacing the target would delete
        // the unmanaged content and link to foreign content — refuse instead.
        if !directories_match(&skill.path, &local_path)? {
            return Err(DaloError::AdoptionDestinationExists { path: local_path });
        }
        AdoptCopyStatus::Existing
    } else if dry_run {
        AdoptCopyStatus::Planned
    } else {
        copy_dir(&skill.path, &local_path)?;
        AdoptCopyStatus::Copied
    };

    let replacement = if replace_original {
        replace_with_owned_symlink(paths, &skill, &local_path, dry_run)?
    } else {
        AdoptReplacementStatus::Skipped
    };

    Ok(AdoptReport {
        next_step: (!replace_original).then(|| {
            format!(
                "the original remains at this slot; run `dalo adopt {} --replace` or remove it before the next sync",
                skill.id
            )
        }),
        slot_name: skill.slot_name,
        source_path: skill.path,
        local_path,
        copy,
        replacement,
    })
}

/// Reject an unmanaged skill whose name would degrade the local source after adoption.
pub(crate) fn validate_adoptable_slot_name(
    skill: &UnmanagedSkill,
    selector: &str,
) -> DaloResult<()> {
    if !inventory::is_valid_slot_name(&skill.slot_name) {
        return Err(DaloError::InvalidArgument {
            reason: format!(
                "cannot adopt `{}`: folder name `{}` is not a valid slot name; rename `{}` to a portable lowercase slot name (for example `my-local-skill`), then rerun `dalo adopt {selector}`",
                skill.id,
                skill.slot_name,
                skill.path.display()
            ),
        });
    }
    let Some(warning) = inventory::invalid_slot_name_warning(&skill.path)? else {
        return Ok(());
    };
    let recovery = if warning.message.starts_with("frontmatter name ") {
        format!(
            "change the frontmatter `name` in `{}` to a portable lowercase slot name",
            warning.path.display()
        )
    } else {
        format!(
            "rename `{}` to a portable lowercase slot name (for example `my-local-skill`)",
            skill.path.display()
        )
    };
    Err(DaloError::InvalidArgument {
        reason: format!(
            "cannot adopt `{}`: {}; {recovery}, then rerun `dalo adopt {selector}`",
            skill.id, warning.message
        ),
    })
}

/// List minimal resolve items.
pub fn list_resolve_items(paths: &StorePaths) -> DaloResult<ResolveListReport> {
    let state = store::read_state(paths)?;
    let mut owned_skills = state
        .owned_skills
        .iter()
        .map(|skill| OwnedSkillSummary {
            id: owned_id(skill),
            slot_name: skill.slot_name.clone(),
            link_path: skill.link_path.clone(),
            store_path: skill.store_path.clone(),
        })
        .collect::<Vec<_>>();
    owned_skills.sort_by(|left, right| left.id.cmp(&right.id));

    let scan = discover_unmanaged_skill_scan(paths)?;
    Ok(ResolveListReport {
        unmanaged_skills: scan.unmanaged_skills,
        target_warnings: scan.warnings,
        owned_skills,
    })
}

/// Mark an unmanaged skill as explicitly protected.
pub fn keep_unmanaged_skill(
    paths: &StorePaths,
    selector: &str,
    dry_run: bool,
) -> DaloResult<KeepReport> {
    let skill = find_unmanaged_skill(paths, selector)?;
    let mut state = store::read_state(paths)?;
    let existing = skill.target_ids.iter().all(|target_id| {
        state.protected_skills.iter().any(|protected| {
            protected.target_id == *target_id && protected.slot_name == skill.slot_name
        })
    });
    let stale_record = state
        .owned_skills
        .iter()
        .any(|owned| owned.link_path == skill.path);
    if stale_record && !dry_run {
        // The slot holds a real folder, so a record that it is a Dalo link is
        // stale; keeping the folder settles that.
        state
            .owned_skills
            .retain(|owned| owned.link_path != skill.path);
        if existing {
            store::write_state(paths, &state)?;
        }
    }
    if !existing && !dry_run {
        for target_id in &skill.target_ids {
            if state.protected_skills.iter().any(|protected| {
                protected.target_id == *target_id && protected.slot_name == skill.slot_name
            }) {
                continue;
            }
            state.protected_skills.push(ProtectedSkillState {
                target_id: target_id.clone(),
                slot_name: skill.slot_name.clone(),
                path: None,
                extra: Default::default(),
            });
        }
        state.protected_skills.sort_by(|left, right| {
            left.target_id
                .cmp(&right.target_id)
                .then_with(|| left.slot_name.cmp(&right.slot_name))
        });
        store::write_state(paths, &state)?;
    }

    let local_copy = paths
        .local_skills_dir
        .join(&skill.slot_name)
        .join(SKILL_FILE);
    let warning = local_copy.is_file().then(|| {
        format!(
            "a local managed skill also targets this slot; protection preserves the conflict until you run `dalo resolve adopt {} --replace` or remove the original",
            skill.id
        )
    });

    Ok(KeepReport {
        skill,
        existing,
        dry_run,
        warning,
    })
}

/// Remove explicit protection by `target:slot` or by slot name across targets.
pub fn unkeep_skill(paths: &StorePaths, selector: &str, dry_run: bool) -> DaloResult<UnkeepReport> {
    let mut state = store::read_state(paths)?;
    let matching = state
        .protected_skills
        .iter()
        .filter(|protected| {
            format!("{}:{}", protected.target_id, protected.slot_name) == selector
                || protected.slot_name == selector
                || protected
                    .path
                    .as_ref()
                    .is_some_and(|path| path == Path::new(selector))
        })
        .map(|protected| format!("{}:{}", protected.target_id, protected.slot_name))
        .collect::<Vec<_>>();

    if matching.is_empty() {
        return Err(DaloError::skill_not_found(
            selector,
            state
                .protected_skills
                .iter()
                .map(|protected| format!("{}:{}", protected.target_id, protected.slot_name))
                .collect(),
            "dalo resolve list",
        ));
    }

    if !dry_run {
        state.protected_skills.retain(|protected| {
            !matching
                .iter()
                .any(|id| *id == format!("{}:{}", protected.target_id, protected.slot_name))
        });
        store::write_state(paths, &state)?;
    }

    Ok(UnkeepReport {
        selector: selector.to_owned(),
        removed: matching,
        dry_run,
    })
}

/// Remove a recorded dalo-owned symlink by its unambiguous generated ID.
pub fn remove_owned_skill(
    paths: &StorePaths,
    selector: &str,
    dry_run: bool,
) -> DaloResult<RemoveOwnedReport> {
    let mut state = store::read_state(paths)?;
    let matches = state
        .owned_skills
        .iter()
        .enumerate()
        .filter(|(_, skill)| owned_id(skill) == selector)
        .map(|(index, _)| index)
        .collect::<Vec<_>>();
    let [index] = matches.as_slice() else {
        return Err(DaloError::skill_not_found(
            selector,
            state.owned_skills.iter().map(owned_id).collect(),
            "dalo resolve list",
        ));
    };
    let record = state.owned_skills[*index].clone();
    let status = remove_owned_link(paths, &record, dry_run)?;

    if !dry_run {
        state.owned_skills.remove(*index);
        store::write_state(paths, &state)?;
    }

    Ok(RemoveOwnedReport {
        id: owned_id(&record),
        link_path: record.link_path,
        status,
        recorded_source_ref: record
            .extra
            .get("source_ref")
            .and_then(toml::Value::as_str)
            .map(ToOwned::to_owned),
        store_path: record.store_path,
        slot_name: record.slot_name,
        next_step: None,
    })
}

/// Resolve one unmanaged skill selector without mutating it.
pub fn find_unmanaged_skill(paths: &StorePaths, selector: &str) -> DaloResult<UnmanagedSkill> {
    let skills = discover_unmanaged_skills(paths)?;
    if let Some(skill) = skills.iter().find(|skill| skill.id == selector) {
        return Ok(skill.clone());
    }
    let slot_matches = skills
        .iter()
        .filter(|skill| skill.slot_name == selector)
        .collect::<Vec<_>>();
    match slot_matches.as_slice() {
        [skill] => return Ok((*skill).clone()),
        [] => {}
        matches => {
            return Err(DaloError::AmbiguousSkillSelector {
                selector: selector.to_owned(),
                matches: matches
                    .iter()
                    .map(|skill| skill.id.as_str())
                    .collect::<Vec<_>>()
                    .join(", "),
            });
        }
    }

    let selector_path = PathBuf::from(selector);
    if selector_path.exists() {
        return unmanaged_from_path(skills, &selector_path);
    }

    Err(DaloError::skill_not_found(
        selector,
        skills.iter().map(|skill| skill.id.clone()).collect(),
        "dalo resolve list",
    ))
}

fn unmanaged_from_path(skills: Vec<UnmanagedSkill>, path: &Path) -> DaloResult<UnmanagedSkill> {
    // Candidate paths come from `entry.path()` and are absolute, but the selector
    // may be relative (`./skills/review`), carry a trailing slash, or route
    // through a symlinked component. Compare on the canonical form so those still
    // match, falling back to the raw path when canonicalization is unavailable.
    // Only skills discovered inside a materialization dir are considered, so the
    // directory boundary that `discover_unmanaged_skills` enforces still holds.
    let target = canonical_or_self(path);
    let known_skills = skills.iter().map(|skill| skill.id.clone()).collect();
    skills
        .into_iter()
        .find(|skill| canonical_or_self(&skill.path) == target)
        .ok_or_else(|| {
            DaloError::skill_not_found(
                path.display().to_string(),
                known_skills,
                "dalo resolve list",
            )
        })
}

/// Canonicalize a path, falling back to the original when it cannot be resolved.
fn canonical_or_self(path: &Path) -> PathBuf {
    path.canonicalize().unwrap_or_else(|_| path.to_path_buf())
}

fn assign_unmanaged_ids(mut skills: Vec<UnmanagedSkill>) -> Vec<UnmanagedSkill> {
    let mut counts = BTreeMap::<String, usize>::new();
    for skill in &skills {
        *counts.entry(skill.slot_name.clone()).or_default() += 1;
    }
    for skill in &mut skills {
        skill.id = if counts.get(&skill.slot_name).copied().unwrap_or_default() > 1 {
            skill.path.display().to_string()
        } else {
            skill.slot_name.clone()
        };
    }
    skills.sort_by(|left, right| {
        left.slot_name
            .cmp(&right.slot_name)
            .then_with(|| left.path.cmp(&right.path))
    });
    skills
}

fn unreadable_target_warning(path: &Path, error: std::io::Error) -> TargetScanWarning {
    TargetScanWarning {
        code: TargetScanWarningCode::UnreadableTargetDir,
        path: path.to_path_buf(),
        message: format!("target path could not be read: {error}"),
    }
}

fn replace_with_owned_symlink(
    paths: &StorePaths,
    skill: &UnmanagedSkill,
    local_path: &Path,
    dry_run: bool,
) -> DaloResult<AdoptReplacementStatus> {
    replace_with_owned_symlink_with_state_writer(
        paths,
        skill,
        local_path,
        dry_run,
        store::write_state,
    )
}

fn replace_with_owned_symlink_with_state_writer<F>(
    paths: &StorePaths,
    skill: &UnmanagedSkill,
    local_path: &Path,
    dry_run: bool,
    write_state: F,
) -> DaloResult<AdoptReplacementStatus>
where
    F: FnOnce(&StorePaths, &store::StateFile) -> DaloResult<()>,
{
    if is_local_marker(&skill.slot_name) {
        return Ok(AdoptReplacementStatus::Protected);
    }
    if dry_run {
        return Ok(AdoptReplacementStatus::Planned);
    }

    let backup_path = adopting_backup_path(&skill.path)?;
    fs::rename(&skill.path, &backup_path)?;

    if let Err(error) = unix_fs::symlink(local_path, &skill.path) {
        return Err(rollback_replacement(
            &skill.path,
            &backup_path,
            error.into(),
        ));
    }
    let mut state = match store::read_state(paths) {
        Ok(state) => state,
        Err(error) => return Err(rollback_replacement(&skill.path, &backup_path, error)),
    };
    // A record for this slot is stale: the slot held a real folder, not the
    // link the record describes.
    state
        .owned_skills
        .retain(|owned| owned.link_path != skill.path);
    state.owned_skills.push(OwnedSkillState {
        target_id: skill
            .target_ids
            .first()
            .cloned()
            .unwrap_or_else(|| "generic".to_owned()),
        slot_name: skill.slot_name.clone(),
        link_path: skill.path.clone(),
        store_path: local_path.to_path_buf(),
        extra: Default::default(),
    });
    state.owned_skills.sort_by(|left, right| {
        left.link_path
            .cmp(&right.link_path)
            .then_with(|| left.store_path.cmp(&right.store_path))
    });
    state.protected_skills.retain(|protected| {
        protected.slot_name != skill.slot_name
            || (!skill.target_ids.contains(&protected.target_id)
                && protected.path.as_ref() != Some(&skill.path))
    });
    if let Err(error) = write_state(paths, &state) {
        return Err(rollback_replacement(&skill.path, &backup_path, error));
    }
    let _ = fs::remove_dir_all(&backup_path);

    Ok(AdoptReplacementStatus::Replaced)
}

fn adopting_backup_path(path: &Path) -> DaloResult<PathBuf> {
    let parent = path.parent().ok_or_else(|| {
        DaloError::Io(io::Error::new(
            io::ErrorKind::InvalidInput,
            format!("adopt path `{}` has no parent", path.display()),
        ))
    })?;
    let name = path.file_name().ok_or_else(|| {
        DaloError::Io(io::Error::new(
            io::ErrorKind::InvalidInput,
            format!("adopt path `{}` has no file name", path.display()),
        ))
    })?;
    let candidate = parent.join(format!("{}.dalo-adopting", name.to_string_lossy()));
    if candidate.exists() {
        return Err(DaloError::Io(io::Error::new(
            io::ErrorKind::AlreadyExists,
            format!(
                "adoption backup path `{}` already exists; restore it to `{}` or remove it before retrying",
                candidate.display(),
                path.display()
            ),
        )));
    }
    Ok(candidate)
}

fn rollback_replacement(
    link_path: &Path,
    backup_path: &Path,
    original_error: DaloError,
) -> DaloError {
    match restore_replacement_backup(link_path, backup_path) {
        Ok(()) => original_error,
        Err(restore_error) => DaloError::Io(io::Error::other(format!(
            "{original_error}; also failed to restore original from `{}`: {restore_error}",
            backup_path.display()
        ))),
    }
}

fn restore_replacement_backup(link_path: &Path, backup_path: &Path) -> DaloResult<()> {
    match fs::symlink_metadata(link_path) {
        Ok(metadata) if metadata.file_type().is_symlink() => fs::remove_file(link_path)?,
        Ok(_) => {
            return Err(DaloError::Io(io::Error::new(
                io::ErrorKind::AlreadyExists,
                format!("replacement path `{}` is occupied", link_path.display()),
            )));
        }
        Err(error) if error.kind() == io::ErrorKind::NotFound => {}
        Err(error) => return Err(error.into()),
    }
    fs::rename(backup_path, link_path)?;
    Ok(())
}

fn remove_owned_link(
    paths: &StorePaths,
    record: &OwnedSkillState,
    dry_run: bool,
) -> DaloResult<RemoveOwnedStatus> {
    match fs::symlink_metadata(&record.link_path) {
        Ok(metadata) if metadata.file_type().is_symlink() => {
            let target = fs::read_link(&record.link_path)?;
            let resolved = store::resolve_link_target(&record.link_path, &target);
            if !store::path_is_same_or_descendant(&resolved, &paths.root) {
                return Ok(RemoveOwnedStatus::DroppedForeignSymlink);
            }
            if dry_run {
                Ok(RemoveOwnedStatus::Planned)
            } else {
                fs::remove_file(&record.link_path)?;
                Ok(RemoveOwnedStatus::Removed)
            }
        }
        Ok(_) => Ok(RemoveOwnedStatus::BlockedRealEntry),
        Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
            if dry_run {
                Ok(RemoveOwnedStatus::Planned)
            } else {
                Ok(RemoveOwnedStatus::DroppedMissing)
            }
        }
        Err(error) => Err(error.into()),
    }
}

fn copy_dir(source: &Path, destination: &Path) -> DaloResult<()> {
    copy_dir_with(source, destination, |source, destination| {
        fs::copy(source, destination)
    })
}

fn copy_dir_with<F>(source: &Path, destination: &Path, mut copy_file: F) -> DaloResult<()>
where
    F: FnMut(&Path, &Path) -> io::Result<u64>,
{
    let parent = destination.parent().ok_or_else(|| {
        DaloError::Io(io::Error::other(format!(
            "cannot create an adoption copy without a parent for {}",
            destination.display()
        )))
    })?;
    fs::create_dir_all(parent)?;
    let name = destination
        .file_name()
        .unwrap_or_else(|| std::ffi::OsStr::new("skill"));
    let temporary = tempfile::Builder::new()
        .prefix(&format!(".{}.dalo-adopting-", name.to_string_lossy()))
        .tempdir_in(parent)?;
    copy_dir_contents(source, temporary.path(), &mut copy_file)?;
    fs::rename(temporary.path(), destination)?;
    Ok(())
}

fn remove_interrupted_adoption_dirs(destination: &Path) -> DaloResult<()> {
    let parent = destination.parent().ok_or_else(|| {
        DaloError::Io(io::Error::other(format!(
            "cannot clean interrupted adoption directories without a parent for {}",
            destination.display()
        )))
    })?;
    let skill_name = destination
        .file_name()
        .unwrap_or_else(|| std::ffi::OsStr::new("skill"));
    let prefix = format!(".{}.dalo-adopting-", skill_name.to_string_lossy());
    for entry in fs::read_dir(parent)? {
        let entry = entry?;
        if !entry.file_name().to_string_lossy().starts_with(&prefix) {
            continue;
        }
        let metadata = fs::symlink_metadata(entry.path())?;
        if metadata.file_type().is_dir() && !metadata.file_type().is_symlink() {
            fs::remove_dir_all(entry.path())?;
        } else {
            fs::remove_file(entry.path())?;
        }
    }
    Ok(())
}

fn copy_dir_contents<F>(source: &Path, destination: &Path, copy_file: &mut F) -> DaloResult<()>
where
    F: FnMut(&Path, &Path) -> io::Result<u64>,
{
    for entry in fs::read_dir(source)? {
        let entry = entry?;
        let source_path = entry.path();
        let destination_path = destination.join(entry.file_name());
        let file_type = entry.file_type()?;
        if file_type.is_dir() {
            fs::create_dir(&destination_path)?;
            copy_dir_contents(&source_path, &destination_path, copy_file)?;
        } else if file_type.is_symlink() {
            unix_fs::symlink(fs::read_link(&source_path)?, destination_path)?;
        } else {
            copy_file(&source_path, &destination_path)?;
        }
    }
    Ok(())
}

#[derive(Debug, PartialEq, Eq)]
enum DirectoryEntryKind {
    Directory,
    File { executable: bool, content: Vec<u8> },
    Symlink(PathBuf),
    Other,
}

#[derive(Debug, PartialEq, Eq)]
struct DirectoryEntrySnapshot {
    path: PathBuf,
    kind: DirectoryEntryKind,
}

/// Whether two directories have identical content and filesystem shape: the same
/// set of relative entries, with matching file bytes, executable bits, empty
/// directories, and symlink targets. Used to confirm an existing local destination
/// is the copy a prior `adopt` made — not an unrelated pre-existing local skill —
/// before replacing (and deleting) the unmanaged original. On any doubt it returns
/// `false`, so the caller refuses rather than risk discarding unmanaged content.
fn directories_match(left: &Path, right: &Path) -> DaloResult<bool> {
    let mut left_entries = Vec::new();
    let mut right_entries = Vec::new();
    collect_relative_entries(left, left, &mut left_entries)?;
    collect_relative_entries(right, right, &mut right_entries)?;
    left_entries.sort_by(|left, right| left.path.cmp(&right.path));
    right_entries.sort_by(|left, right| left.path.cmp(&right.path));
    if left_entries != right_entries {
        return Ok(false);
    }
    Ok(!left_entries
        .iter()
        .any(|entry| entry.kind == DirectoryEntryKind::Other))
}

fn collect_relative_entries(
    root: &Path,
    dir: &Path,
    out: &mut Vec<DirectoryEntrySnapshot>,
) -> DaloResult<()> {
    for entry in fs::read_dir(dir)? {
        let entry = entry?;
        let path = entry.path();
        let relative = path
            .strip_prefix(root)
            .map_err(|error| io::Error::other(error.to_string()))?
            .to_path_buf();
        let metadata = fs::symlink_metadata(&path)?;
        let file_type = metadata.file_type();
        let kind = if file_type.is_dir() {
            DirectoryEntryKind::Directory
        } else if file_type.is_symlink() {
            DirectoryEntryKind::Symlink(fs::read_link(&path)?)
        } else if file_type.is_file() {
            DirectoryEntryKind::File {
                executable: metadata.permissions().mode() & 0o111 != 0,
                content: fs::read(&path)?,
            }
        } else {
            DirectoryEntryKind::Other
        };
        out.push(DirectoryEntrySnapshot {
            path: relative,
            kind,
        });
        if file_type.is_dir() {
            collect_relative_entries(root, &path, out)?;
        }
    }
    Ok(())
}

fn is_local_marker(slot_name: &str) -> bool {
    slot_name.ends_with(".local")
}

fn owned_id(skill: &OwnedSkillState) -> String {
    format!("{}:{}", skill.target_id, skill.slot_name)
}

#[cfg(test)]
mod tests {
    use std::fs;
    use std::io;
    use std::os::unix::fs::PermissionsExt;

    use super::*;
    use crate::store::{MaterializationDirState, StateFile, TargetState};

    #[test]
    fn discover_unmanaged_skills_should_ignore_owned_symlinks() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unmanaged = target.join("review");
        let owned = target.join("owned");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        fs::create_dir_all(store_root.join("local/skills/owned"))
            .expect("owned source should be created");
        fs::create_dir_all(&target).expect("target should be created");
        unix_fs::symlink(store_root.join("local/skills/owned"), &owned)
            .expect("owned link should be created");
        write_state(&store_root, &target, &owned);

        let skills = discover_unmanaged_skills(&StorePaths::new(store_root))
            .expect("unmanaged discovery should succeed");

        assert_eq!(skills[0].slot_name, "review");
    }

    #[test]
    fn discover_unmanaged_skill_scan_should_warn_on_unreadable_target_paths() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unreadable = temp_dir.path().join("not-a-dir");
        let unmanaged = target.join("review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        fs::write(&unreadable, "not a directory\n").expect("unreadable path should be written");
        write_state(&store_root, &target, &target.join("unused"));
        let paths = StorePaths::new(store_root);
        let mut state = store::read_state(&paths).expect("state should be readable");
        state.materialization_dirs.push(MaterializationDirState {
            path: unreadable.clone(),
            logical_targets: vec!["other".to_owned()],
            extra: Default::default(),
        });
        store::write_state(&paths, &state).expect("state should be writable");

        let scan = discover_unmanaged_skill_scan(&paths).expect("scan should be non-fatal");

        assert_eq!(scan.unmanaged_skills[0].slot_name, "review");
        assert_eq!(scan.warnings.len(), 1);
        assert_eq!(
            scan.warnings[0].code,
            TargetScanWarningCode::UnreadableTargetDir
        );
        assert_eq!(scan.warnings[0].path, unreadable);
    }

    #[test]
    fn adopt_skill_should_ignore_unrelated_unreadable_target_paths() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unreadable = temp_dir.path().join("not-a-dir");
        let unmanaged = target.join("review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        fs::write(&unreadable, "not a directory\n").expect("unreadable path should be written");
        write_state(&store_root, &target, &target.join("unused"));
        let paths = StorePaths::new(store_root.clone());
        let mut state = store::read_state(&paths).expect("state should be readable");
        state.materialization_dirs.push(MaterializationDirState {
            path: unreadable,
            logical_targets: vec!["other".to_owned()],
            extra: Default::default(),
        });
        store::write_state(&paths, &state).expect("state should be writable");

        let report = adopt_skill(&paths, "review", false, false).expect("adopt should succeed");

        assert_eq!(report.slot_name, "review");
        assert!(store_root.join("local/skills/review/SKILL.md").is_file());
    }

    #[test]
    fn adopt_skill_should_copy_before_replacing_original() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unmanaged = target.join("review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        write_state(&store_root, &target, &target.join("unused"));

        let report = adopt_skill(&StorePaths::new(store_root.clone()), "review", true, false)
            .expect("adopt should succeed");

        assert_eq!(report.replacement, AdoptReplacementStatus::Replaced);
        assert!(store_root.join("local/skills/review/SKILL.md").is_file());
        assert!(
            fs::symlink_metadata(unmanaged)
                .expect("replacement should exist")
                .file_type()
                .is_symlink()
        );
        assert!(!target.join("review.dalo-adopting").exists());
    }

    #[test]
    fn copy_dir_should_not_leave_a_partial_destination_when_copying_fails() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let source = temp_dir.path().join("source");
        let destination = temp_dir.path().join("local/review");
        fs::create_dir_all(&source).expect("source should be created");
        fs::write(source.join(SKILL_FILE), "# Review\n").expect("skill file should be written");

        let error = copy_dir_with(&source, &destination, |_, _| {
            Err(io::Error::other("injected copy failure"))
        })
        .expect_err("injected copy failure should abort adoption");

        assert!(error.to_string().contains("injected copy failure"));
        assert!(!destination.exists());
    }

    #[test]
    fn adopt_skill_should_sweep_interrupted_adoption_dirs() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unmanaged = target.join("review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill file should be written");
        write_state(&store_root, &target, &target.join("unused"));
        let stale = store_root.join("local/skills/.review.dalo-adopting-interrupted");
        fs::create_dir_all(&stale).expect("stale adoption dir should be created");
        fs::write(stale.join(SKILL_FILE), "partial\n")
            .expect("partial skill file should be written");

        let report = adopt_skill(&StorePaths::new(store_root.clone()), "review", false, false)
            .expect("adopt should succeed");

        assert_eq!(report.copy, AdoptCopyStatus::Copied);
        assert!(store_root.join("local/skills/review/SKILL.md").is_file());
        assert!(!stale.exists());
    }

    #[test]
    fn replace_with_owned_symlink_should_restore_original_when_state_read_fails() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("missing-store");
        let target = temp_dir.path().join("target");
        let unmanaged = target.join("review");
        let local_path = temp_dir.path().join("local-review");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        fs::create_dir_all(&local_path).expect("local dir should be created");
        fs::write(local_path.join(SKILL_FILE), "# Review\n")
            .expect("local skill should be written");
        let skill = UnmanagedSkill {
            id: "review".to_owned(),
            slot_name: "review".to_owned(),
            path: unmanaged.clone(),
            target_ids: vec!["generic".to_owned()],
            protected: false,
        };

        let error =
            replace_with_owned_symlink(&StorePaths::new(store_root), &skill, &local_path, false)
                .expect_err("missing state should fail replacement");

        assert!(matches!(error, DaloError::StoreNotInitialized { .. }));
        assert!(unmanaged.join(SKILL_FILE).is_file());
        assert!(
            !fs::symlink_metadata(&unmanaged)
                .expect("original should be restored")
                .file_type()
                .is_symlink()
        );
        assert!(!target.join("review.dalo-adopting").exists());
    }

    #[test]
    fn replace_with_owned_symlink_should_restore_original_when_state_write_fails() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unmanaged = target.join("review");
        let local_path = temp_dir.path().join("local-review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        fs::create_dir_all(&local_path).expect("local dir should be created");
        fs::write(local_path.join(SKILL_FILE), "# Review\n")
            .expect("local skill should be written");
        write_state(&store_root, &target, &target.join("unused"));
        let skill = UnmanagedSkill {
            id: "review".to_owned(),
            slot_name: "review".to_owned(),
            path: unmanaged.clone(),
            target_ids: vec!["generic".to_owned()],
            protected: false,
        };
        let result = replace_with_owned_symlink_with_state_writer(
            &StorePaths::new(store_root),
            &skill,
            &local_path,
            false,
            |_, _| Err(DaloError::Io(io::Error::other("state write failed"))),
        );

        let error = result.expect_err("injected state write failure should abort replacement");
        assert!(matches!(error, DaloError::Io(_)));
        assert!(unmanaged.join(SKILL_FILE).is_file());
        assert!(
            !fs::symlink_metadata(&unmanaged)
                .expect("original should be restored")
                .file_type()
                .is_symlink()
        );
        assert!(!target.join("review.dalo-adopting").exists());
    }

    #[test]
    fn rollback_replacement_should_surface_restore_failure() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let link_path = temp_dir.path().join("review");
        let backup_path = temp_dir.path().join("review.dalo-adopting");
        fs::create_dir_all(&link_path).expect("occupied link path should be created");
        fs::create_dir_all(&backup_path).expect("backup path should be created");

        let error = rollback_replacement(
            &link_path,
            &backup_path,
            DaloError::Io(io::Error::other("symlink failed")),
        );

        assert!(
            error
                .to_string()
                .contains("also failed to restore original")
        );
        assert!(backup_path.exists());
    }

    #[test]
    fn adopting_backup_path_should_name_recovery_for_leftover_backup() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let link_path = temp_dir.path().join("review");
        let backup_path = temp_dir.path().join("review.dalo-adopting");
        fs::create_dir_all(&backup_path).expect("backup path should be created");

        let error =
            adopting_backup_path(&link_path).expect_err("existing backup should block retry");

        let message = error.to_string();
        assert!(message.contains("restore it"));
        assert!(message.contains("remove it before retrying"));
        assert!(message.contains(&link_path.display().to_string()));
    }

    #[test]
    fn find_unmanaged_skill_should_reject_ambiguous_slot_selector() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let first_target = temp_dir.path().join("first");
        let second_target = temp_dir.path().join("second");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        write_state(&store_root, &first_target, &first_target.join("unused"));
        fs::create_dir_all(&second_target).expect("second target should be created");
        let paths = StorePaths::new(store_root);
        let mut state = store::read_state(&paths).expect("state should be readable");
        state.materialization_dirs.push(MaterializationDirState {
            path: second_target.clone(),
            logical_targets: vec!["second".to_owned()],
            extra: Default::default(),
        });
        store::write_state(&paths, &state).expect("state should be writable");
        for target in [&first_target, &second_target] {
            let skill = target.join("review");
            fs::create_dir_all(&skill).expect("skill directory should be created");
            fs::write(skill.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        }

        let error = find_unmanaged_skill(&paths, "review")
            .expect_err("bare slot selector should be rejected as ambiguous");

        assert!(matches!(error, DaloError::AmbiguousSkillSelector { .. }));
        let message = error.to_string();
        assert!(message.contains("ambiguous"));
        assert!(message.contains(&first_target.join("review").display().to_string()));
        assert!(message.contains(&second_target.join("review").display().to_string()));
    }

    #[test]
    fn directories_match_should_compare_executable_bits() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let left = temp_dir.path().join("left");
        let right = temp_dir.path().join("right");
        fs::create_dir_all(&left).expect("left should be created");
        fs::create_dir_all(&right).expect("right should be created");
        fs::write(left.join("run.sh"), "echo hi\n").expect("left file should be written");
        fs::write(right.join("run.sh"), "echo hi\n").expect("right file should be written");
        let mut executable = fs::metadata(left.join("run.sh"))
            .expect("left metadata should be readable")
            .permissions();
        executable.set_mode(executable.mode() | 0o111);
        fs::set_permissions(left.join("run.sh"), executable)
            .expect("left permissions should be writable");

        assert!(!directories_match(&left, &right).expect("directory comparison should succeed"));
    }

    #[test]
    fn directories_match_should_compare_empty_directories() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let left = temp_dir.path().join("left");
        let right = temp_dir.path().join("right");
        fs::create_dir_all(left.join("empty")).expect("left empty dir should be created");
        fs::create_dir_all(&right).expect("right should be created");

        assert!(!directories_match(&left, &right).expect("directory comparison should succeed"));
    }

    #[test]
    fn directories_match_should_compare_symlink_targets() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let left = temp_dir.path().join("left");
        let right = temp_dir.path().join("right");
        fs::create_dir_all(&left).expect("left should be created");
        fs::create_dir_all(&right).expect("right should be created");
        fs::write(temp_dir.path().join("left-target"), "left\n")
            .expect("left target should be written");
        fs::write(temp_dir.path().join("right-target"), "right\n")
            .expect("right target should be written");
        unix_fs::symlink("../left-target", left.join("linked"))
            .expect("left symlink should be created");
        unix_fs::symlink("../right-target", right.join("linked"))
            .expect("right symlink should be created");

        assert!(!directories_match(&left, &right).expect("directory comparison should succeed"));
    }

    #[test]
    fn adopt_skill_should_accept_non_canonical_path_selector() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let unmanaged = target.join("review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&unmanaged).expect("unmanaged dir should be created");
        fs::write(unmanaged.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        write_state(&store_root, &target, &target.join("unused"));
        // A `.`-component path (mirroring a user-supplied `./skills/review`) is a
        // valid handle for the same directory but is not byte-equal to the clean
        // absolute path stored in state; only canonicalization makes them match.
        let selector = target.join(".").join("review");

        let report = adopt_skill(
            &StorePaths::new(store_root),
            &selector.to_string_lossy(),
            false,
            false,
        )
        .expect("non-canonical path selector should resolve");

        assert_eq!(report.slot_name, "review");
    }

    #[test]
    fn adopt_skill_should_reject_path_outside_materialization_dirs() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let outside = temp_dir.path().join("outside/review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&outside).expect("outside dir should be created");
        fs::write(outside.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        write_state(&store_root, &target, &target.join("unused"));

        let error = adopt_skill(
            &StorePaths::new(store_root),
            &outside.to_string_lossy(),
            true,
            false,
        )
        .expect_err("adopt should refuse a path outside materialization dirs");

        assert!(matches!(error, DaloError::SkillNotFound { .. }));
    }

    #[test]
    fn adopt_skill_should_not_remove_path_outside_materialization_dirs() {
        let temp_dir = tempfile::tempdir().expect("tempdir should be created");
        let store_root = temp_dir.path().join("store");
        let target = temp_dir.path().join("target");
        let outside = temp_dir.path().join("outside/review");
        store::init_store(store_root.clone(), false).expect("init should succeed");
        fs::create_dir_all(&outside).expect("outside dir should be created");
        fs::write(outside.join(SKILL_FILE), "# Review\n").expect("skill should be written");
        write_state(&store_root, &target, &target.join("unused"));

        let _ = adopt_skill(
            &StorePaths::new(store_root),
            &outside.to_string_lossy(),
            true,
            false,
        );

        assert!(outside.join(SKILL_FILE).is_file());
    }

    fn write_state(store_root: &Path, target: &Path, owned: &Path) {
        fs::create_dir_all(target).expect("target should be created");
        let paths = StorePaths::new(store_root.to_path_buf());
        let state = StateFile {
            schema_version: store::STATE_SCHEMA_VERSION,
            targets: vec![TargetState {
                id: "generic".to_owned(),
                path: target.to_path_buf(),
                canonical_path: target.to_path_buf(),
                enabled: true,
                extra: Default::default(),
            }],
            materialization_dirs: vec![MaterializationDirState {
                path: target.to_path_buf(),
                logical_targets: vec!["generic".to_owned()],
                extra: Default::default(),
            }],
            owned_skills: vec![OwnedSkillState {
                target_id: "generic".to_owned(),
                slot_name: "owned".to_owned(),
                link_path: owned.to_path_buf(),
                store_path: store_root.join("local/skills/owned"),
                extra: Default::default(),
            }],
            protected_skills: Vec::new(),
            extra: Default::default(),
        };
        store::write_state(&paths, &state).expect("state should be written");
    }
}