forked from hyphen-2025/cyber-pilot
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathtest_diff_engine.py
More file actions
1338 lines (1123 loc) · 55.4 KB
/
test_diff_engine.py
File metadata and controls
1338 lines (1123 loc) · 55.4 KB
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
"""
Tests for utils/diff_engine.py — Resource Diff Engine.
Covers: DiffReport, show_file_diff.
"""
import io
import sys
import tempfile
import unittest
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import patch
sys.path.insert(0, str(Path(__file__).parent.parent / "skills" / "cypilot" / "scripts"))
from cypilot.utils.diff_engine import (
DiffReport,
show_file_diff,
)
# =========================================================================
# DiffReport
# =========================================================================
class TestDiffReport(unittest.TestCase):
"""DiffReport properties."""
def test_has_changes_empty(self):
r = DiffReport()
self.assertFalse(r.has_changes)
def test_has_changes_with_added(self):
r = DiffReport(added=["a.md"])
self.assertTrue(r.has_changes)
# =========================================================================
# show_file_diff
# =========================================================================
class TestShowFileDiff(unittest.TestCase):
"""show_file_diff prints unified diff to stderr."""
def test_shows_diff(self):
old = b"line1\nline2\n"
new = b"line1\nmodified\n"
buf = io.StringIO()
with patch("sys.stderr", buf):
show_file_diff("test.md", old, new)
output = buf.getvalue()
self.assertIn("line2", output)
self.assertIn("modified", output)
def test_binary_file(self):
old = b"\x00\x01\x02"
new = b"\x03\x04\x05"
buf = io.StringIO()
with patch("sys.stderr", buf):
show_file_diff("binary.bin", old, new)
output = buf.getvalue()
self.assertIn("binary", output)
def test_identical_files_silent(self):
content = b"same\n"
buf = io.StringIO()
with patch("sys.stderr", buf):
show_file_diff("same.md", content, content)
self.assertEqual(buf.getvalue(), "")
# =========================================================================
# _open_editor_for_file
# =========================================================================
class TestOpenEditorForFile(unittest.TestCase):
"""Cover _open_editor_for_file helper."""
def test_binary_content_returns_none(self):
from cypilot.utils.diff_engine import _open_editor_for_file
result = _open_editor_for_file("bin.dat", b"\x00\x01", b"\x02\x03")
self.assertIsNone(result)
def test_editor_not_found_returns_none(self):
from cypilot.utils.diff_engine import _open_editor_for_file
with patch.dict("os.environ", {"VISUAL": "nonexistent_editor_xyz", "EDITOR": "nonexistent_editor_xyz"}):
result = _open_editor_for_file("test.md", b"old\n", b"new\n")
self.assertIsNone(result)
def test_successful_edit_resolved(self):
"""Editor resolves conflict markers → returns edited bytes."""
from cypilot.utils.diff_engine import _open_editor_for_file
def fake_editor(cmd):
path = cmd[-1]
# Resolve by writing content without conflict markers
with open(path, "w") as f:
f.write("manually edited\n")
with patch("subprocess.check_call", side_effect=fake_editor):
with patch.dict("os.environ", {"VISUAL": "cat"}):
result = _open_editor_for_file("test.md", b"old\n", b"new\n")
self.assertIsNotNone(result)
self.assertEqual(result, b"manually edited\n")
def test_empty_result_returns_none(self):
"""If user deletes all content → returns None (abort)."""
from cypilot.utils.diff_engine import _open_editor_for_file
def fake_editor(cmd):
path = cmd[-1]
with open(path, "w") as f:
f.write("\n")
with patch("subprocess.check_call", side_effect=fake_editor):
with patch.dict("os.environ", {"VISUAL": "cat"}):
result = _open_editor_for_file("test.md", b"old\n", b"new\n")
self.assertIsNone(result)
def test_unresolved_markers_accept(self):
"""Conflict markers remain after editing → prompt → accept upstream."""
from cypilot.utils.diff_engine import _open_editor_for_file
def fake_editor(cmd):
# Leave conflict markers in place (don't resolve)
pass
with patch("subprocess.check_call", side_effect=fake_editor):
with patch.dict("os.environ", {"VISUAL": "cat"}):
with patch("cypilot.utils.diff_engine._prompt_unresolved", return_value="accept"):
result = _open_editor_for_file("test.md", b"old\n", b"new\n")
self.assertEqual(result, b"new\n")
def test_unresolved_markers_decline(self):
"""Conflict markers remain after editing → prompt → decline."""
from cypilot.utils.diff_engine import _open_editor_for_file
def fake_editor(cmd):
pass # Leave conflict markers
with patch("subprocess.check_call", side_effect=fake_editor):
with patch.dict("os.environ", {"VISUAL": "cat"}):
with patch("cypilot.utils.diff_engine._prompt_unresolved", return_value="decline"):
result = _open_editor_for_file("test.md", b"old\n", b"new\n")
self.assertIsNone(result)
def test_editor_exception_returns_none(self):
"""Editor raises exception → returns None."""
from cypilot.utils.diff_engine import _open_editor_for_file
with patch("subprocess.check_call", side_effect=OSError("editor crash")):
with patch.dict("os.environ", {"VISUAL": "cat"}):
result = _open_editor_for_file("test.md", b"old\n", b"new\n")
self.assertIsNone(result)
def test_identical_content_no_conflict_markers(self):
"""When old == new, no conflict markers are produced."""
from cypilot.utils.diff_engine import _open_editor_for_file
def fake_editor(cmd):
path = cmd[-1]
with open(path) as f:
content = f.read()
# No conflict markers when content is identical
self.assertNotIn("<<<<<<<", content)
self.assertNotIn(">>>>>>>", content)
# Write resolved content
with open(path, "w") as f:
f.write("kept\n")
with patch("subprocess.check_call", side_effect=fake_editor):
with patch.dict("os.environ", {"VISUAL": "cat"}):
result = _open_editor_for_file("test.md", b"same\n", b"same\n")
self.assertEqual(result, b"kept\n")
# =========================================================================
# _get_editor
# =========================================================================
class TestGetEditor(unittest.TestCase):
"""Cover _get_editor helper."""
def test_visual_preferred(self):
from cypilot.utils.diff_engine import _get_editor
with patch.dict("os.environ", {"VISUAL": "code", "EDITOR": "vim"}):
self.assertEqual(_get_editor(), "code")
def test_editor_fallback(self):
from cypilot.utils.diff_engine import _get_editor
with patch.dict("os.environ", {"EDITOR": "nano"}, clear=True):
self.assertEqual(_get_editor(), "nano")
def test_default_vi(self):
from cypilot.utils.diff_engine import _get_editor
with patch.dict("os.environ", {}, clear=True):
self.assertEqual(_get_editor(), "vi")
# =========================================================================
# _build_conflict_content
# =========================================================================
class TestBuildConflictContent(unittest.TestCase):
"""Cover _build_conflict_content — delete/insert/replace opcodes."""
def test_replace_opcode(self):
from cypilot.utils.diff_engine import _build_conflict_content
result = _build_conflict_content("f.md", "old line\n", "new line\n")
self.assertIn("<<<<<<<", result)
self.assertIn("=======", result)
self.assertIn(">>>>>>>", result)
self.assertIn("old line", result)
self.assertIn("new line", result)
def test_delete_opcode(self):
from cypilot.utils.diff_engine import _build_conflict_content
result = _build_conflict_content("f.md", "line1\nline2\n", "line1\n")
self.assertIn("<<<<<<<", result)
self.assertIn("line2", result)
def test_insert_opcode(self):
from cypilot.utils.diff_engine import _build_conflict_content
result = _build_conflict_content("f.md", "line1\n", "line1\ninserted\n")
self.assertIn("<<<<<<<", result)
self.assertIn("inserted", result)
def test_identical_no_markers(self):
from cypilot.utils.diff_engine import _build_conflict_content
result = _build_conflict_content("f.md", "same\n", "same\n")
self.assertNotIn("<<<<<<<", result)
self.assertEqual(result, "same\n")
# =========================================================================
# _prompt_kit_file
# =========================================================================
class TestPromptKitFile(unittest.TestCase):
"""Cover _prompt_kit_file — all response paths."""
def test_accept_all_flag(self):
from cypilot.utils.diff_engine import _prompt_kit_file
state = {"accept_all": True}
self.assertEqual(_prompt_kit_file("f.md", state), "accept")
def test_decline_all_flag(self):
from cypilot.utils.diff_engine import _prompt_kit_file
state = {"decline_all": True}
self.assertEqual(_prompt_kit_file("f.md", state), "decline")
def test_accept_single(self):
from cypilot.utils.diff_engine import _prompt_kit_file
with patch("builtins.input", return_value="a"):
self.assertEqual(_prompt_kit_file("f.md", {}), "accept")
def test_decline_single(self):
from cypilot.utils.diff_engine import _prompt_kit_file
with patch("builtins.input", return_value="d"):
self.assertEqual(_prompt_kit_file("f.md", {}), "decline")
def test_accept_all_sets_flag(self):
from cypilot.utils.diff_engine import _prompt_kit_file
state = {}
with patch("builtins.input", return_value="A"):
result = _prompt_kit_file("f.md", state)
self.assertEqual(result, "accept")
self.assertTrue(state["accept_all"])
def test_decline_all_sets_flag(self):
from cypilot.utils.diff_engine import _prompt_kit_file
state = {}
with patch("builtins.input", return_value="D"):
result = _prompt_kit_file("f.md", state)
self.assertEqual(result, "decline")
self.assertTrue(state["decline_all"])
def test_modify(self):
from cypilot.utils.diff_engine import _prompt_kit_file
with patch("builtins.input", return_value="m"):
self.assertEqual(_prompt_kit_file("f.md", {}), "modify")
def test_eof_declines(self):
from cypilot.utils.diff_engine import _prompt_kit_file
with patch("builtins.input", side_effect=EOFError):
self.assertEqual(_prompt_kit_file("f.md", {}), "decline")
def test_unknown_input_declines(self):
from cypilot.utils.diff_engine import _prompt_kit_file
with patch("builtins.input", return_value="x"):
self.assertEqual(_prompt_kit_file("f.md", {}), "decline")
# =========================================================================
# _show_kit_update_summary
# =========================================================================
class TestShowKitUpdateSummary(unittest.TestCase):
"""Cover _show_kit_update_summary display."""
def test_summary_with_all_change_types(self):
from cypilot.utils.diff_engine import _show_kit_update_summary, DiffReport
report = DiffReport(
added=["new.md"],
removed=["old.md"],
modified=["changed.md"],
unchanged=["same.md"],
)
err = io.StringIO()
with patch("sys.stderr", err):
_show_kit_update_summary(report)
out = err.getvalue()
self.assertIn("1 added", out)
self.assertIn("1 removed", out)
self.assertIn("1 modified", out)
self.assertIn("1 unchanged", out)
self.assertIn("new.md", out)
self.assertIn("old.md", out)
self.assertIn("changed.md", out)
# =========================================================================
# show_file_diff — binary content
# =========================================================================
class TestShowFileDiffBinary(unittest.TestCase):
def test_binary_content(self):
err = io.StringIO()
# Invalid UTF-8 sequences trigger UnicodeDecodeError
with patch("sys.stderr", err):
show_file_diff("bin.dat", b"\x80\x81\xff", b"\xfe\xfd")
self.assertIn("binary", err.getvalue())
# =========================================================================
# _enumerate_kit_files
# =========================================================================
class TestEnumerateKitFiles(unittest.TestCase):
"""Cover _enumerate_kit_files — include and exclude modes."""
def test_include_mode(self):
from cypilot.utils.diff_engine import _enumerate_kit_files
with TemporaryDirectory() as td:
kit = Path(td)
(kit / "artifacts" / "DESIGN").mkdir(parents=True)
(kit / "artifacts" / "DESIGN" / "t.md").write_text("x\n", encoding="utf-8")
(kit / "SKILL.md").write_text("s\n", encoding="utf-8")
(kit / "conf.toml").write_text("v=1\n", encoding="utf-8")
files = _enumerate_kit_files(kit, content_dirs=("artifacts",), content_files=("SKILL.md",))
self.assertIn("SKILL.md", files)
self.assertTrue(any("DESIGN" in k for k in files))
# conf.toml not in content_files, so excluded
self.assertNotIn("conf.toml", files)
def test_exclude_mode(self):
from cypilot.utils.diff_engine import _enumerate_kit_files
with TemporaryDirectory() as td:
kit = Path(td)
(kit / "SKILL.md").write_text("s\n", encoding="utf-8")
(kit / "conf.toml").write_text("v=1\n", encoding="utf-8")
(kit / "__pycache__").mkdir()
(kit / "__pycache__" / "x.pyc").write_bytes(b"\x00")
files = _enumerate_kit_files(kit) # default exclude mode
self.assertIn("SKILL.md", files)
self.assertNotIn("conf.toml", files)
self.assertFalse(any("__pycache__" in k for k in files))
def test_nonexistent_dir(self):
from cypilot.utils.diff_engine import _enumerate_kit_files
files = _enumerate_kit_files(Path("/nonexistent"))
self.assertEqual(files, {})
# =========================================================================
# file_level_kit_update
# =========================================================================
class TestFileLevelKitUpdate(unittest.TestCase):
"""Cover file_level_kit_update — auto_approve, non-interactive, force."""
def test_no_changes(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
for d in (src, usr):
d.mkdir()
(d / "SKILL.md").write_text("same\n", encoding="utf-8")
result = file_level_kit_update(src, usr, content_files=("SKILL.md",))
self.assertEqual(result["status"], "current")
self.assertEqual(result["accepted"], [])
def test_auto_approve(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("new\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
result = file_level_kit_update(src, usr, auto_approve=True, content_files=("SKILL.md",))
self.assertEqual(result["status"], "updated")
self.assertIn("SKILL.md", result["accepted"])
# File should be updated on disk
self.assertEqual((usr / "SKILL.md").read_text(), "new\n")
def test_non_interactive_declines(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("new\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
result = file_level_kit_update(src, usr, interactive=False, content_files=("SKILL.md",))
self.assertEqual(result["status"], "updated")
self.assertIn("SKILL.md", result["declined"])
# File should NOT be changed
self.assertEqual((usr / "SKILL.md").read_text(), "old\n")
def test_force_overwrites(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("forced\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
result = file_level_kit_update(src, usr, force=True, content_files=("SKILL.md",))
self.assertEqual(result["status"], "updated")
self.assertIn("SKILL.md", result["accepted"])
def test_added_file_auto_approve(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "NEW.md").write_text("brand new\n", encoding="utf-8")
result = file_level_kit_update(src, usr, auto_approve=True, content_files=("NEW.md",))
self.assertEqual(result["status"], "updated")
self.assertTrue((usr / "NEW.md").is_file())
def test_removed_file_auto_approve(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(usr / "OLD.md").write_text("gone upstream\n", encoding="utf-8")
result = file_level_kit_update(src, usr, auto_approve=True, content_files=("OLD.md",))
self.assertEqual(result["status"], "updated")
self.assertFalse((usr / "OLD.md").is_file())
def test_interactive_accept(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("new\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
with patch("cypilot.utils.diff_engine._prompt_kit_file", return_value="accept"):
result = file_level_kit_update(src, usr, interactive=True, content_files=("SKILL.md",))
self.assertIn("SKILL.md", result["accepted"])
def test_interactive_modify(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("new\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
with patch("cypilot.utils.diff_engine._prompt_kit_file", return_value="modify"):
with patch("cypilot.utils.diff_engine._open_editor_for_file", return_value=b"edited\n"):
result = file_level_kit_update(src, usr, interactive=True, content_files=("SKILL.md",))
self.assertIn("SKILL.md", result["accepted"])
self.assertEqual((usr / "SKILL.md").read_text(), "edited\n")
def test_interactive_modify_abort(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("new\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
with patch("cypilot.utils.diff_engine._prompt_kit_file", return_value="modify"):
with patch("cypilot.utils.diff_engine._open_editor_for_file", return_value=None):
result = file_level_kit_update(src, usr, interactive=True, content_files=("SKILL.md",))
self.assertIn("SKILL.md", result["declined"])
def test_interactive_added_file(self):
"""Interactive prompt for newly added files."""
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "NEW.md").write_text("new file\n", encoding="utf-8")
with patch("cypilot.utils.diff_engine._prompt_kit_file", return_value="accept"):
file_level_kit_update(src, usr, interactive=True, content_files=("NEW.md",))
self.assertTrue((usr / "NEW.md").is_file())
def test_interactive_removed_file(self):
"""Interactive prompt for removed files."""
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(usr / "OLD.md").write_text("old\n", encoding="utf-8")
with patch("cypilot.utils.diff_engine._prompt_kit_file", return_value="accept"):
file_level_kit_update(src, usr, interactive=True, content_files=("OLD.md",))
self.assertFalse((usr / "OLD.md").is_file())
def test_dry_run_does_not_write(self):
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "SKILL.md").write_text("new\n", encoding="utf-8")
(usr / "SKILL.md").write_text("old\n", encoding="utf-8")
file_level_kit_update(src, usr, auto_approve=True, dry_run=True, content_files=("SKILL.md",))
# File should NOT be updated
self.assertEqual((usr / "SKILL.md").read_text(), "old\n")
# =========================================================================
# file_level_kit_update with resource bindings
# =========================================================================
class TestFileLevelKitUpdateResourceBindings(unittest.TestCase):
"""Test file_level_kit_update with resource bindings for manifest-driven kits."""
def test_file_resource_binding_redirect(self):
"""File resource is written to bound path, not user_dir."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has a file
(src / "artifacts").mkdir()
(src / "artifacts" / "template.md").write_text("new template\n", encoding="utf-8")
# Resource bindings redirect to different location
resource_bindings = {
"adr_template": redirect_dir / "template.md",
}
source_to_resource_id = {
"artifacts/template.md": "adr_template",
}
resource_info = {
"adr_template": ResourceInfo(type="file", source_base="artifacts/template.md"),
}
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
self.assertEqual(result["status"], "updated")
# File should be at redirected path
self.assertTrue((redirect_dir / "template.md").is_file())
self.assertEqual((redirect_dir / "template.md").read_text(), "new template\n")
# File should NOT be at default path
self.assertFalse((usr / "artifacts" / "template.md").exists())
def test_directory_resource_binding_redirect(self):
"""Directory resource files are written to bound directory with relative paths."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has a directory with files
(src / "artifacts" / "ADR").mkdir(parents=True)
(src / "artifacts" / "ADR" / "template.md").write_text("ADR template\n", encoding="utf-8")
(src / "artifacts" / "ADR" / "checklist.md").write_text("ADR checklist\n", encoding="utf-8")
# Resource bindings redirect entire directory
resource_bindings = {
"adr_artifacts": redirect_dir / "ADR",
}
source_to_resource_id = {
"artifacts/ADR/template.md": "adr_artifacts",
"artifacts/ADR/checklist.md": "adr_artifacts",
}
resource_info = {
"adr_artifacts": ResourceInfo(type="directory", source_base="artifacts/ADR"),
}
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
self.assertEqual(result["status"], "updated")
# Files should be at redirected paths
self.assertTrue((redirect_dir / "ADR" / "template.md").is_file())
self.assertTrue((redirect_dir / "ADR" / "checklist.md").is_file())
self.assertEqual((redirect_dir / "ADR" / "template.md").read_text(), "ADR template\n")
# Files should NOT be at default paths
self.assertFalse((usr / "artifacts" / "ADR" / "template.md").exists())
def test_mixed_bound_and_unbound_files(self):
"""Files without bindings go to user_dir, bound files go to binding path."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has bound and unbound files
(src / "artifacts").mkdir()
(src / "artifacts" / "template.md").write_text("bound file\n", encoding="utf-8")
(src / "SKILL.md").write_text("unbound file\n", encoding="utf-8")
resource_bindings = {
"adr_template": redirect_dir / "template.md",
}
source_to_resource_id = {
"artifacts/template.md": "adr_template",
# SKILL.md has no binding
}
resource_info = {
"adr_template": ResourceInfo(type="file", source_base="artifacts/template.md"),
}
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
content_files=("SKILL.md",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
self.assertEqual(result["status"], "updated")
# Bound file at redirect path
self.assertTrue((redirect_dir / "template.md").is_file())
# Unbound file at default path
self.assertTrue((usr / "SKILL.md").is_file())
self.assertEqual((usr / "SKILL.md").read_text(), "unbound file\n")
def test_update_existing_bound_file(self):
"""Existing file at bound path is correctly detected and updated."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has updated content
(src / "artifacts").mkdir()
(src / "artifacts" / "template.md").write_text("updated content\n", encoding="utf-8")
# Existing file at bound location
(redirect_dir / "template.md").write_text("old content\n", encoding="utf-8")
resource_bindings = {
"adr_template": redirect_dir / "template.md",
}
source_to_resource_id = {
"artifacts/template.md": "adr_template",
}
resource_info = {
"adr_template": ResourceInfo(type="file", source_base="artifacts/template.md"),
}
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
self.assertEqual(result["status"], "updated")
self.assertIn("artifacts/template.md", result["accepted"])
# File should be updated at bound path
self.assertEqual((redirect_dir / "template.md").read_text(), "updated content\n")
def test_no_resource_bindings_uses_default_paths(self):
"""Without resource bindings, files go to user_dir (backward compatibility)."""
from cypilot.utils.diff_engine import file_level_kit_update
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
src.mkdir(); usr.mkdir()
(src / "artifacts").mkdir()
(src / "artifacts" / "template.md").write_text("content\n", encoding="utf-8")
# No resource bindings passed
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
)
self.assertEqual(result["status"], "updated")
# File at default path
self.assertTrue((usr / "artifacts" / "template.md").is_file())
def test_file_resource_binding_to_directory(self):
"""File resource with binding pointing to a directory appends filename."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has example.md inside examples/ subdirectory
(src / "artifacts" / "ADR" / "examples").mkdir(parents=True)
(src / "artifacts" / "ADR" / "examples" / "example.md").write_text("new example\n", encoding="utf-8")
# Existing file at bound directory (binding points to directory, not file)
(redirect_dir / "example.md").write_text("old example\n", encoding="utf-8")
# Binding points to directory, but manifest resource is a file
resource_bindings = {
"adr_example": redirect_dir, # Directory, not file!
}
source_to_resource_id = {
"artifacts/ADR/examples/example.md": "adr_example",
}
resource_info = {
"adr_example": ResourceInfo(type="file", source_base="artifacts/ADR/examples/example.md"),
}
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
self.assertEqual(result["status"], "updated")
# File should be updated at redirect_dir/example.md (filename appended)
self.assertEqual((redirect_dir / "example.md").read_text(), "new example\n")
def test_file_resource_binding_to_directory_detects_existing(self):
"""File resource with directory binding detects existing file (not shown as 'new')."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has example.md
(src / "artifacts" / "ADR" / "examples").mkdir(parents=True)
(src / "artifacts" / "ADR" / "examples" / "example.md").write_text("same content\n", encoding="utf-8")
# Existing file at bound directory with SAME content
(redirect_dir / "example.md").write_text("same content\n", encoding="utf-8")
resource_bindings = {
"adr_example": redirect_dir,
}
source_to_resource_id = {
"artifacts/ADR/examples/example.md": "adr_example",
}
resource_info = {
"adr_example": ResourceInfo(type="file", source_base="artifacts/ADR/examples/example.md"),
}
result = file_level_kit_update(
src, usr,
auto_approve=True,
content_dirs=("artifacts",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
# Should be "current" since file exists with same content
self.assertEqual(result["status"], "current")
# File should NOT be in added list
self.assertNotIn("artifacts/ADR/examples/example.md", result.get("accepted", []))
def test_existing_file_in_bound_directory_not_in_source(self):
"""Files existing in bound directory but not in source are detected as 'removed'."""
from cypilot.utils.diff_engine import file_level_kit_update
from cypilot.utils.manifest import ResourceInfo
with TemporaryDirectory() as td:
src = Path(td) / "src"
usr = Path(td) / "usr"
redirect_dir = Path(td) / "redirect"
src.mkdir()
usr.mkdir()
redirect_dir.mkdir()
# Source has template.md but NOT example.md
(src / "artifacts").mkdir()
(src / "artifacts" / "template.md").write_text("template content\n", encoding="utf-8")
# Bound directory has BOTH template.md and example.md (example.md is user-only)
(redirect_dir / "template.md").write_text("template content\n", encoding="utf-8")
(redirect_dir / "example.md").write_text("user example\n", encoding="utf-8")
resource_bindings = {
"adr_artifacts": redirect_dir,
}
source_to_resource_id = {
"artifacts/template.md": "adr_artifacts",
}
resource_info = {
"adr_artifacts": ResourceInfo(type="directory", source_base="artifacts"),
}
result = file_level_kit_update(
src, usr,
interactive=False, # Non-interactive declines changes
content_dirs=("artifacts",),
resource_bindings=resource_bindings,
source_to_resource_id=source_to_resource_id,
resource_info=resource_info,
)
# example.md should be detected as existing in bound dir
# Since it's not in source, it would be classified as "removed"
# With interactive=False, it should be declined (not deleted)
self.assertTrue((redirect_dir / "example.md").is_file())
self.assertEqual((redirect_dir / "example.md").read_text(), "user example\n")
# Verify example.md was detected and declined
self.assertIn("artifacts/example.md", result["declined"])
# =========================================================================
# _has_conflict_markers
# =========================================================================
class TestHasConflictMarkers(unittest.TestCase):
def test_has_markers(self):
from cypilot.utils.diff_engine import _has_conflict_markers
self.assertTrue(_has_conflict_markers("<<<<<<< installed (yours)\nfoo\n=======\nbar\n>>>>>>> upstream (source)\n"))
def test_no_markers(self):
from cypilot.utils.diff_engine import _has_conflict_markers
self.assertFalse(_has_conflict_markers("just normal text\n"))
# ---------------------------------------------------------------------------
# TOC handling during kit update
# ---------------------------------------------------------------------------
class TestStripTocForDiff(unittest.TestCase):
"""Tests for _strip_toc_for_diff."""
def test_no_toc(self):
from cypilot.utils.diff_engine import _strip_toc_for_diff
content = b"# Title\n\n## Section A\n\nSome text.\n"
stripped, fmt = _strip_toc_for_diff(content)
self.assertEqual(stripped, content)
self.assertEqual(fmt, "")
def test_marker_toc(self):
from cypilot.utils.diff_engine import _strip_toc_for_diff
content = (
"# Title\n\n"
"<!-- toc -->\n\n"
"- [Section A](#section-a)\n"
"- [Section B](#section-b)\n\n"
"<!-- /toc -->\n\n"
"## Section A\n\nText A.\n"
).encode("utf-8")
stripped, fmt = _strip_toc_for_diff(content)
self.assertEqual(fmt, "markers")
text = stripped.decode("utf-8")
self.assertNotIn("<!-- toc -->", text)
self.assertNotIn("Section A](#section-a)", text)
self.assertIn("## Section A", text)
self.assertIn("Text A.", text)
def test_heading_toc(self):
from cypilot.utils.diff_engine import _strip_toc_for_diff
content = (
"# Title\n\n"
"## Table of Contents\n\n"
"1. [Section A](#section-a)\n"
"2. [Section B](#section-b)\n\n"
"## Section A\n\nText A.\n"
).encode("utf-8")
stripped, fmt = _strip_toc_for_diff(content)
self.assertEqual(fmt, "heading")
text = stripped.decode("utf-8")
self.assertNotIn("Table of Contents", text)
self.assertNotIn("Section A](#section-a)", text)
self.assertIn("## Section A", text)
def test_binary_content(self):
from cypilot.utils.diff_engine import _strip_toc_for_diff
content = b"\x80\x81\x82\xff\xfe"
stripped, fmt = _strip_toc_for_diff(content)
self.assertEqual(stripped, content)
self.assertEqual(fmt, "")
def test_heading_toc_at_end_of_file(self):
"""Heading TOC with no following heading — strips to end."""
from cypilot.utils.diff_engine import _strip_toc_for_diff
content = (
"# Title\n\n"
"## Table of Contents\n\n"
"1. [A](#a)\n"
).encode("utf-8")
stripped, fmt = _strip_toc_for_diff(content)
self.assertEqual(fmt, "heading")
text = stripped.decode("utf-8")
self.assertNotIn("Table of Contents", text)
self.assertIn("# Title", text)
class TestPromptTocRegen(unittest.TestCase):
"""Tests for _prompt_toc_regen."""
@patch("builtins.input", return_value="y")
def test_yes(self, _mock):
from cypilot.utils.diff_engine import _prompt_toc_regen
self.assertEqual(_prompt_toc_regen("foo.md"), "yes")
@patch("builtins.input", return_value="yes")
def test_yes_long_form(self, _mock):
from cypilot.utils.diff_engine import _prompt_toc_regen
self.assertEqual(_prompt_toc_regen("foo.md"), "yes")
@patch("builtins.input", return_value="n")
def test_no(self, _mock):
from cypilot.utils.diff_engine import _prompt_toc_regen
self.assertEqual(_prompt_toc_regen("foo.md"), "no")
def test_returns_no_for_empty_or_eof(self):
from cypilot.utils.diff_engine import _prompt_toc_regen
cases = [
("empty input", patch("builtins.input", return_value="")),
("EOF", patch("builtins.input", side_effect=EOFError)),
]
for label, mock_input in cases:
with self.subTest(label):
with mock_input:
self.assertEqual(_prompt_toc_regen("foo.md"), "no")
class TestPromptTocErrorContinue(unittest.TestCase):
"""Tests for _prompt_toc_error_continue."""
@patch("builtins.input", return_value="c")
def test_continue(self, _mock):
from cypilot.utils.diff_engine import _prompt_toc_error_continue
self.assertTrue(_prompt_toc_error_continue("foo.md", RuntimeError("oops")))