Skip to content
Navigation Menu
{{ message }}
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Expand file tree
/
Copy pathagentgit_test.go
More file actions
1668 lines (1298 loc) · 54.1 KB
/
Copy pathagentgit_test.go
File metadata and controls
1668 lines (1298 loc) · 54.1 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
package agentgit_test
import (
"context"
"fmt"
"net/http/httptest"
"os"
"os/exec"
"path/filepath"
"testing"
"time"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"cdr.dev/slog/v3/sloggers/slogtest"
"github.com/coder/coder/v2/agent/agentgit"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/wsjson"
"github.com/coder/coder/v2/testutil"
"github.com/coder/quartz"
"github.com/coder/websocket"
)
// gitCmd runs a git command in the given directory and fails the test
// on error.
func gitCmd(t *testing.T, dir string, args ...string) {
t.Helper()
cmd := exec.Command("git", args...)
cmd.Dir = dir
cmd.Env = append(os.Environ(),
"GIT_AUTHOR_NAME=Test",
"GIT_AUTHOR_EMAIL=test@test.com",
"GIT_COMMITTER_NAME=Test",
"GIT_COMMITTER_EMAIL=test@test.com",
)
out, err := cmd.CombinedOutput()
require.NoError(t, err, "git %v: %s", args, out)
}
// initTestRepo creates a temporary git repo with an initial commit
// and returns the repo root path.
func initTestRepo(t *testing.T) string {
t.Helper()
// Resolve symlinks and short (8.3) names on Windows so test
// expectations match the canonical paths returned by git.
dir := testutil.TempDirResolved(t)
gitCmd(t, dir, "init")
gitCmd(t, dir, "config", "user.name", "Test")
gitCmd(t, dir, "config", "user.email", "test@test.com")
// Create a file and commit it so the repo has HEAD.
testFile := filepath.Join(dir, "README.md")
require.NoError(t, os.WriteFile(testFile, []byte("# Test\n"), 0o600))
gitCmd(t, dir, "add", "README.md")
gitCmd(t, dir, "commit", "-m", "initial commit")
return dir
}
func TestSubscribeBulkPathsAndDedupes(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Subscribe with multiple paths in the same repo — should dedupe
// to one repo root.
filePath1 := filepath.Join(repoDir, "a.go")
filePath2 := filepath.Join(repoDir, "b.go")
added := h.Subscribe([]string{filePath1, filePath2})
require.True(t, added, "first subscribe should add a repo")
// Subscribing again with the same paths should not add new repos.
added = h.Subscribe([]string{filePath1})
require.False(t, added, "duplicate subscribe should not add repos")
}
func TestSubscribeNonGitPathsIgnored(t *testing.T) {
t.Parallel()
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
nonGitDir := t.TempDir()
added := h.Subscribe([]string{filepath.Join(nonGitDir, "file.txt")})
require.False(t, added, "non-git paths should be ignored")
}
func TestSubscribeRelativePathsIgnored(t *testing.T) {
t.Parallel()
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
added := h.Subscribe([]string{"relative/path.go"})
require.False(t, added, "relative paths should be ignored")
}
func TestSubscribeEmptyPaths(t *testing.T) {
t.Parallel()
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
added := h.Subscribe([]string{})
require.False(t, added, "empty slice should not add any repos")
added = h.Subscribe(nil)
require.False(t, added, "nil slice should not add any repos")
ctx := context.Background()
msg := h.Scan(ctx)
require.Nil(t, msg, "scan should return nil with no repos")
}
func TestScanReturnsRepoChanges(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Create a dirty file.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "new.go"), []byte("package main\n"), 0o600))
h.Subscribe([]string{filepath.Join(repoDir, "new.go")})
ctx := context.Background()
msg := h.Scan(ctx)
require.NotNil(t, msg)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg.Type)
require.Len(t, msg.Repositories, 1)
repo := msg.Repositories[0]
require.Equal(t, repoDir, repo.RepoRoot)
require.NotEmpty(t, repo.Branch)
require.NotEmpty(t, repo.UnifiedDiff)
// Verify the new file appears in the unified diff.
require.Contains(t, repo.UnifiedDiff, "new.go")
}
func TestScanRespectsGitignore(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
// Add a .gitignore that ignores *.log files and the build/ directory.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, ".gitignore"), []byte("*.log\nbuild/\n"), 0o600))
gitCmd(t, repoDir, "add", ".gitignore")
gitCmd(t, repoDir, "commit", "-m", "add gitignore")
// Create unstaged files: two normal, three matching gitignore patterns.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "main.go"), []byte("package main\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "util.go"), []byte("package util\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "debug.log"), []byte("some log output\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "error.log"), []byte("some error\n"), 0o600))
require.NoError(t, os.MkdirAll(filepath.Join(repoDir, "build"), 0o700))
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "build", "output.bin"), []byte("binary\n"), 0o600))
h := agentgit.NewHandler(logger)
h.Subscribe([]string{filepath.Join(repoDir, "main.go")})
ctx := context.Background()
msg := h.Scan(ctx)
require.NotNil(t, msg)
require.Len(t, msg.Repositories, 1)
diff := msg.Repositories[0].UnifiedDiff
// The non-ignored files should appear in the diff.
assert.Contains(t, diff, "main.go")
assert.Contains(t, diff, "util.go")
// The gitignored files must not appear in the diff.
assert.NotContains(t, diff, "debug.log")
assert.NotContains(t, diff, "error.log")
assert.NotContains(t, diff, "output.bin")
}
func TestScanRespectsGitignoreNestedNegation(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
// Add a .gitignore that ignores node_modules/.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, ".gitignore"), []byte("node_modules/\n"), 0o600))
gitCmd(t, repoDir, "add", ".gitignore")
gitCmd(t, repoDir, "commit", "-m", "add gitignore")
// Simulate the tailwindcss stubs directory which contains a nested
// .gitignore with "!*" (negation that un-ignores everything).
// Real git keeps the parent node_modules/ ignore rule, but go-git
// incorrectly lets the child negation override it.
stubsDir := filepath.Join(repoDir, "site", "node_modules", ".pnpm",
"tailwindcss@3.4.18", "node_modules", "tailwindcss", "stubs")
require.NoError(t, os.MkdirAll(stubsDir, 0o700))
require.NoError(t, os.WriteFile(filepath.Join(stubsDir, ".gitignore"), []byte("!*\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(stubsDir, "config.full.js"), []byte("module.exports = {}\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(stubsDir, "tailwind.config.js"), []byte("// tw config\n"), 0o600))
// Also create a normal file outside node_modules.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "main.go"), []byte("package main\n"), 0o600))
h := agentgit.NewHandler(logger)
h.Subscribe([]string{filepath.Join(repoDir, "main.go")})
ctx := context.Background()
msg := h.Scan(ctx)
require.NotNil(t, msg)
require.Len(t, msg.Repositories, 1)
diff := msg.Repositories[0].UnifiedDiff
// The non-ignored file should appear in the diff.
assert.Contains(t, diff, "main.go")
// Files inside node_modules must not appear even though a nested
// .gitignore contains "!*". The parent node_modules/ rule takes
// precedence in real git.
assert.NotContains(t, diff, "config.full.js")
assert.NotContains(t, diff, "tailwind.config.js")
}
func TestScanDeltaEmission(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Create a dirty file.
dirtyFile := filepath.Join(repoDir, "dirty.go")
require.NoError(t, os.WriteFile(dirtyFile, []byte("package dirty\n"), 0o600))
h.Subscribe([]string{dirtyFile})
ctx := context.Background()
// First scan — returns all files (no previous snapshot).
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
require.Len(t, msg1.Repositories, 1)
// Second scan with no changes. Should emit a heartbeat with a
// fresh ScannedAt but no repositories. This lets the UI's
// "checked Ns ago" label stay honest on an idle clean repo.
msg2 := h.Scan(ctx)
require.NotNil(t, msg2, "heartbeat should fire even with no delta")
require.NotNil(t, msg2.ScannedAt)
require.Empty(t, msg2.Repositories, "heartbeat must not report per-repo changes")
// Revert the dirty file (make repo clean).
require.NoError(t, os.Remove(dirtyFile))
// Third scan — should emit a "clean" delta for dirty.go.
msg3 := h.Scan(ctx)
require.NotNil(t, msg3)
require.Len(t, msg3.Repositories, 1)
// The file was reverted, so it should no longer appear in the diff.
require.NotContains(t, msg3.Repositories[0].UnifiedDiff, "dirty.go")
}
// TestScanHeartbeatOnCleanRepo pins the heartbeat contract: while any
// repo is subscribed, every scan emits a non-nil message with a fresh
// ScannedAt, even when no repo produced a delta. The UI's
// "checked Ns ago" label depends on this so an idle clean repo does
// not drift while the agent is still polling.
func TestScanHeartbeatOnCleanRepo(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
require.True(t, h.Subscribe([]string{repoDir}))
ctx := context.Background()
// First scan on a clean repo captures branch/remote/empty-diff.
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
require.NotNil(t, msg1.ScannedAt)
require.Len(t, msg1.Repositories, 1)
require.Empty(t, msg1.Repositories[0].UnifiedDiff)
firstScanAt := *msg1.ScannedAt
// Second scan: no delta, but heartbeat must still advance
// ScannedAt so clients can render an honest "checked Ns ago".
msg2 := h.Scan(ctx)
require.NotNil(t, msg2, "heartbeat should fire on a no-delta scan")
require.NotNil(t, msg2.ScannedAt)
require.Empty(t, msg2.Repositories, "heartbeat carries no per-repo changes")
require.False(t, msg2.ScannedAt.Before(firstScanAt),
"heartbeat ScannedAt must not go backwards")
// Third scan: also a heartbeat. Still non-nil, still empty.
msg3 := h.Scan(ctx)
require.NotNil(t, msg3)
require.Empty(t, msg3.Repositories)
}
// TestScanNoHeartbeatWithoutSubscribedRoots pins that the heartbeat
// only fires when there is at least one subscribed repo. Before any
// subscribe call, Scan() must still short-circuit to nil so the
// WebSocket handler does not spam empty messages to a client that
// has not registered any paths yet.
func TestScanNoHeartbeatWithoutSubscribedRoots(t *testing.T) {
t.Parallel()
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
msg := h.Scan(context.Background())
require.Nil(t, msg, "no subscribed roots should mean no heartbeat")
}
func TestScanDeltaDetectsContentChanges(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Modify a committed file.
readmePath := filepath.Join(repoDir, "README.md")
require.NoError(t, os.WriteFile(readmePath, []byte("# Edit 1\n"), 0o600))
h.Subscribe([]string{readmePath})
ctx := context.Background()
// First scan — returns the initial dirty state.
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
require.Len(t, msg1.Repositories, 1)
require.Contains(t, msg1.Repositories[0].UnifiedDiff, "README.md")
// Second scan with no changes: heartbeat, no repositories.
msg2 := h.Scan(ctx)
require.NotNil(t, msg2, "heartbeat should fire even with no delta")
require.Empty(t, msg2.Repositories)
// Now modify the SAME file further (still "Modified" status, but
// different content).
require.NoError(t, os.WriteFile(readmePath, []byte("# Edit 2\nMore lines\nEven more\n"), 0o600))
// Third scan — should detect the content change even though the
// status is still "Modified".
msg3 := h.Scan(ctx)
require.NotNil(t, msg3, "content change in already-dirty file should emit delta")
require.Len(t, msg3.Repositories, 1)
require.Contains(t, msg3.Repositories[0].UnifiedDiff, "README.md")
// Also test an untracked (unstaged) file — its status is "Added"
// throughout, but further edits should still emit deltas.
untrackedPath := filepath.Join(repoDir, "untracked.go")
require.NoError(t, os.WriteFile(untrackedPath, []byte("package main\n"), 0o600))
h.Subscribe([]string{untrackedPath})
msg4 := h.Scan(ctx)
require.NotNil(t, msg4)
require.Contains(t, msg4.Repositories[0].UnifiedDiff, "untracked.go")
// No changes: heartbeat, no repositories.
msg5 := h.Scan(ctx)
require.NotNil(t, msg5, "heartbeat should fire even with no delta")
require.Empty(t, msg5.Repositories)
// Modify the untracked file further.
require.NoError(t, os.WriteFile(untrackedPath, []byte("package main\n\nfunc init() {}\n"), 0o600))
msg6 := h.Scan(ctx)
require.NotNil(t, msg6, "content change in untracked file should emit delta")
require.Contains(t, msg6.Repositories[0].UnifiedDiff, "untracked.go")
}
func TestScanRateLimiting(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
h.Subscribe([]string{filepath.Join(repoDir, "file.go")})
// First scan should succeed.
ctx := context.Background()
msg1 := h.Scan(ctx)
// Even if no dirty files, the first scan always runs.
// The important thing is it doesn't panic.
_ = msg1
// Create a dirty file so the next scan has something to report.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "new.go"), []byte("package x\n"), 0o600))
msg2 := h.Scan(ctx)
require.NotNil(t, msg2, "scan with new dirty file should return changes")
}
func TestSubscribeDeeplyNestedFile(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
// Create a deeply nested directory structure inside the repo.
nestedDir := filepath.Join(repoDir, "a", "b", "c")
require.NoError(t, os.MkdirAll(nestedDir, 0o700))
nestedFile := filepath.Join(nestedDir, "deep.go")
require.NoError(t, os.WriteFile(nestedFile, []byte("package deep\n"), 0o600))
h := agentgit.NewHandler(logger)
added := h.Subscribe([]string{nestedFile})
require.True(t, added, "deeply nested file should resolve to repo root")
msg := h.Scan(context.Background())
require.NotNil(t, msg)
require.Len(t, msg.Repositories, 1)
require.Equal(t, repoDir, msg.Repositories[0].RepoRoot)
// The nested file should appear in the unified diff.
require.Contains(t, msg.Repositories[0].UnifiedDiff, "a/b/c/deep.go")
}
func TestSubscribeNestedGitRepos(t *testing.T) {
t.Parallel()
// Create an outer repo.
outerDir := initTestRepo(t)
// Create an inner repo nested inside the outer one.
innerDir := filepath.Join(outerDir, "subproject")
require.NoError(t, os.MkdirAll(innerDir, 0o700))
gitCmd(t, innerDir, "init")
gitCmd(t, innerDir, "config", "user.name", "Test")
gitCmd(t, innerDir, "config", "user.email", "test@test.com")
// Commit a file in the inner repo so it has HEAD.
innerFile := filepath.Join(innerDir, "inner.go")
require.NoError(t, os.WriteFile(innerFile, []byte("package inner\n"), 0o600))
gitCmd(t, innerDir, "add", "inner.go")
gitCmd(t, innerDir, "commit", "-m", "inner commit")
// Now create a dirty file in the inner repo.
dirtyFile := filepath.Join(innerDir, "dirty.go")
require.NoError(t, os.WriteFile(dirtyFile, []byte("package inner\n"), 0o600))
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Subscribe with the path inside the inner repo.
added := h.Subscribe([]string{dirtyFile})
require.True(t, added)
msg := h.Scan(context.Background())
require.NotNil(t, msg)
require.Len(t, msg.Repositories, 1, "should track only one repo")
// The tracked repo should be the inner repo, not the outer one.
require.Equal(t, innerDir, msg.Repositories[0].RepoRoot,
"should track the inner (nearest) repo, not the outer one")
}
func TestScanDeletedRepoEmitsRemoved(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Create a dirty file so the initial scan has something to track.
dirtyFile := filepath.Join(repoDir, "dirty.go")
require.NoError(t, os.WriteFile(dirtyFile, []byte("package dirty\n"), 0o600))
h.Subscribe([]string{dirtyFile})
ctx := context.Background()
// Initial scan — populates the snapshot with the dirty file.
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
require.Len(t, msg1.Repositories, 1)
require.False(t, msg1.Repositories[0].Removed)
// Delete the entire repo directory.
require.NoError(t, os.RemoveAll(repoDir))
// Next scan should emit a removal entry.
msg2 := h.Scan(ctx)
require.NotNil(t, msg2)
require.Len(t, msg2.Repositories, 1)
removed := msg2.Repositories[0]
require.True(t, removed.Removed, "repo should be marked as removed")
require.Equal(t, repoDir, removed.RepoRoot)
require.Empty(t, removed.Branch)
// Removed repo should have an empty diff.
require.Empty(t, removed.UnifiedDiff)
// Subsequent scan should return nil — the repo was evicted from
// the watch set.
msg3 := h.Scan(ctx)
require.Nil(t, msg3, "evicted repo should not appear in subsequent scans")
}
func TestScanDeletedGitDirEmitsRemoved(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
dirtyFile := filepath.Join(repoDir, "dirty.go")
require.NoError(t, os.WriteFile(dirtyFile, []byte("package dirty\n"), 0o600))
h.Subscribe([]string{dirtyFile})
ctx := context.Background()
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
// Remove only the .git directory (repo root still exists).
require.NoError(t, os.RemoveAll(filepath.Join(repoDir, ".git")))
msg2 := h.Scan(ctx)
require.NotNil(t, msg2)
require.Len(t, msg2.Repositories, 1)
require.True(t, msg2.Repositories[0].Removed,
"removing .git dir should trigger removal")
}
func TestScanDeletedWorktreeGitdirEmitsRemoved(t *testing.T) {
t.Parallel()
// Set up a main repo that we'll use as the source for a worktree.
mainRepoDir := initTestRepo(t)
// Create a linked worktree using git CLI.
// Resolve symlinks and short (8.3) names on Windows so test
// expectations match the canonical paths returned by git.
wtBase := testutil.TempDirResolved(t)
worktreeDir := filepath.Join(wtBase, "wt")
gitCmd(t, mainRepoDir, "branch", "worktree-branch")
gitCmd(t, mainRepoDir, "worktree", "add", worktreeDir, "worktree-branch")
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Create a dirty file so the initial scan has something to report.
dirtyFile := filepath.Join(worktreeDir, "dirty.go")
require.NoError(t, os.WriteFile(dirtyFile, []byte("package dirty\n"), 0o600))
h.Subscribe([]string{dirtyFile})
ctx := context.Background()
// Initial scan should succeed.
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
require.Len(t, msg1.Repositories, 1)
require.False(t, msg1.Repositories[0].Removed)
// Now delete the target gitdir inside .git/worktrees/. The .git
// file in the worktree still exists, but it points to a directory
// that is gone.
gitdirPath := filepath.Join(mainRepoDir, ".git", "worktrees", filepath.Base(worktreeDir))
require.NoError(t, os.RemoveAll(gitdirPath))
// Verify the .git file still exists (this is the bug scenario).
_, err := os.Stat(filepath.Join(worktreeDir, ".git"))
require.NoError(t, err, ".git file should still exist")
// Next scan should detect the broken worktree and emit removal.
msg2 := h.Scan(ctx)
require.NotNil(t, msg2)
require.Len(t, msg2.Repositories, 1)
require.True(t, msg2.Repositories[0].Removed,
"worktree with deleted gitdir should be marked as removed")
require.Equal(t, worktreeDir, msg2.Repositories[0].RepoRoot)
// Repo should be evicted — subsequent scan returns nil.
msg3 := h.Scan(ctx)
require.Nil(t, msg3, "evicted worktree should not appear in subsequent scans")
}
func TestScanTransientErrorDoesNotRemoveRepo(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
dirtyFile := filepath.Join(repoDir, "dirty.go")
require.NoError(t, os.WriteFile(dirtyFile, []byte("package dirty\n"), 0o600))
h.Subscribe([]string{dirtyFile})
ctx := context.Background()
// Initial scan succeeds.
msg1 := h.Scan(ctx)
require.NotNil(t, msg1)
require.Len(t, msg1.Repositories, 1)
require.False(t, msg1.Repositories[0].Removed)
// Corrupt the repo by replacing HEAD with invalid content.
// The directory and .git still exist, so this is a transient
// error, not a deletion.
headPath := filepath.Join(repoDir, ".git", "HEAD")
require.NoError(t, os.WriteFile(headPath, []byte("corrupt"), 0o600))
// The scan should log a warning but not emit a removal. The
// repo stays in the watch set.
msg2 := h.Scan(ctx)
// msg2 may be nil (no results) since the scan error is
// transient. Importantly, it must NOT contain a removed entry.
if msg2 != nil {
for _, repo := range msg2.Repositories {
require.False(t, repo.Removed,
"transient error should not trigger removal")
}
}
// Repair the repo and verify it's still being watched.
require.NoError(t, os.WriteFile(headPath, []byte("ref: refs/heads/master\n"), 0o600))
// Modify a file so the next scan has something new to report.
require.NoError(t, os.WriteFile(
filepath.Join(repoDir, "new.go"),
[]byte("package main\n"), 0o600,
))
msg3 := h.Scan(ctx)
require.NotNil(t, msg3, "repo should still be watched after transient error")
require.Len(t, msg3.Repositories, 1)
require.False(t, msg3.Repositories[0].Removed)
require.Equal(t, repoDir, msg3.Repositories[0].RepoRoot)
}
// --- WebSocket end-to-end tests ---
// dialGitWatch starts an httptest server with the agentgit API and
// returns a wsjson.Stream connected to it. The server and connection
// are cleaned up when the test ends.
func dialGitWatch(t *testing.T, opts ...agentgit.Option) *wsjson.Stream[
codersdk.WorkspaceAgentGitServerMessage,
codersdk.WorkspaceAgentGitClientMessage,
] {
t.Helper()
logger := slogtest.Make(t, nil)
api := agentgit.NewAPI(logger, nil, opts...)
srv := httptest.NewServer(api.Routes())
t.Cleanup(srv.Close)
wsURL := "ws" + srv.URL[len("http"):] + "/watch"
conn, _, err := websocket.Dial(context.Background(), wsURL, nil)
require.NoError(t, err)
t.Cleanup(func() { _ = conn.Close(websocket.StatusNormalClosure, "") })
return wsjson.NewStream[
codersdk.WorkspaceAgentGitServerMessage,
codersdk.WorkspaceAgentGitClientMessage,
](conn, websocket.MessageText, websocket.MessageText, logger)
}
// dialGitWatchWithPathStore starts an httptest server backed by the
// given PathStore and returns a stream connected with the given
// chat ID. The PathStore is used to feed paths into the handler
// instead of client-side subscribe messages.
func dialGitWatchWithPathStore(
t *testing.T,
ps *agentgit.PathStore,
chatID uuid.UUID,
opts ...agentgit.Option,
) *wsjson.Stream[
codersdk.WorkspaceAgentGitServerMessage,
codersdk.WorkspaceAgentGitClientMessage,
] {
t.Helper()
logger := slogtest.Make(t, nil)
api := agentgit.NewAPI(logger, ps, opts...)
srv := httptest.NewServer(api.Routes())
t.Cleanup(srv.Close)
wsURL := "ws" + srv.URL[len("http"):] + "/watch?chat_id=" + chatID.String()
conn, _, err := websocket.Dial(context.Background(), wsURL, nil)
require.NoError(t, err)
t.Cleanup(func() { _ = conn.Close(websocket.StatusNormalClosure, "") })
return wsjson.NewStream[
codersdk.WorkspaceAgentGitServerMessage,
codersdk.WorkspaceAgentGitClientMessage,
](conn, websocket.MessageText, websocket.MessageText, logger)
}
// recvMsg reads the next server message, using the provided
// context for the timeout instead of a raw time.After.
func recvMsg(ctx context.Context, t *testing.T, ch <-chan codersdk.WorkspaceAgentGitServerMessage) codersdk.WorkspaceAgentGitServerMessage {
t.Helper()
select {
case msg, ok := <-ch:
require.True(t, ok, "channel closed unexpectedly")
return msg
case <-ctx.Done():
t.Fatal("timed out waiting for server message")
return codersdk.WorkspaceAgentGitServerMessage{}
}
}
func TestWebSocketSubscribeAndReceiveChanges(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
repoDir := initTestRepo(t)
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "ws.go"), []byte("package ws\n"), 0o600))
ps := agentgit.NewPathStore()
chatID := uuid.New()
// Add paths before connecting so the handler picks them up on
// startup.
ps.AddPaths([]uuid.UUID{chatID}, []string{filepath.Join(repoDir, "ws.go")})
stream := dialGitWatchWithPathStore(t, ps, chatID)
ch := stream.Chan()
msg := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg.Type)
require.NotNil(t, msg.ScannedAt)
require.NotEmpty(t, msg.Repositories)
require.Equal(t, repoDir, msg.Repositories[0].RepoRoot)
}
func TestWebSocketMultipleRepos(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
repoA := initTestRepo(t)
repoB := initTestRepo(t)
require.NoError(t, os.WriteFile(filepath.Join(repoA, "a.go"), []byte("package a\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(repoB, "b.go"), []byte("package b\n"), 0o600))
ps := agentgit.NewPathStore()
chatID := uuid.New()
ps.AddPaths([]uuid.UUID{chatID}, []string{
filepath.Join(repoA, "a.go"),
filepath.Join(repoB, "b.go"),
})
stream := dialGitWatchWithPathStore(t, ps, chatID)
ch := stream.Chan()
msg := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg.Type)
require.Len(t, msg.Repositories, 2, "should include both repos")
roots := map[string]bool{}
for _, r := range msg.Repositories {
roots[r.RepoRoot] = true
}
require.True(t, roots[repoA], "repo A missing")
require.True(t, roots[repoB], "repo B missing")
}
func TestWebSocketIncrementalSubscribe(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
repoA := initTestRepo(t)
repoB := initTestRepo(t)
require.NoError(t, os.WriteFile(filepath.Join(repoA, "a.go"), []byte("package a\n"), 0o600))
require.NoError(t, os.WriteFile(filepath.Join(repoB, "b.go"), []byte("package b\n"), 0o600))
ps := agentgit.NewPathStore()
chatID := uuid.New()
mClock := quartz.NewMock(t)
// Seed repo A before connecting.
ps.AddPaths([]uuid.UUID{chatID}, []string{filepath.Join(repoA, "a.go")})
stream := dialGitWatchWithPathStore(t, ps, chatID, agentgit.WithClock(mClock))
ch := stream.Chan()
msg1 := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg1.Type)
require.Len(t, msg1.Repositories, 1)
require.Equal(t, repoA, msg1.Repositories[0].RepoRoot)
// Advance past the scan cooldown so the next scan fires
// immediately.
mClock.Advance(2 * time.Second).MustWait(context.Background())
// Now add repo B via the PathStore (incremental).
ps.AddPaths([]uuid.UUID{chatID}, []string{filepath.Join(repoB, "b.go")})
msg2 := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg2.Type)
// The second message should include repo B. It may or may not
// include repo A depending on delta logic (no change in A since
// last emit), but repo B must be present.
foundB := false
for _, r := range msg2.Repositories {
if r.RepoRoot == repoB {
foundB = true
}
}
require.True(t, foundB, "incremental subscribe should include repo B")
}
func TestWebSocketRefreshTriggersChanges(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
repoDir := initTestRepo(t)
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "r.go"), []byte("package r\n"), 0o600))
ps := agentgit.NewPathStore()
chatID := uuid.New()
ps.AddPaths([]uuid.UUID{chatID}, []string{filepath.Join(repoDir, "r.go")})
mClock := quartz.NewMock(t)
stream := dialGitWatchWithPathStore(t, ps, chatID, agentgit.WithClock(mClock))
ch := stream.Chan()
// Consume initial changes.
_ = recvMsg(ctx, t, ch)
// Advance past cooldown so the refresh scan fires immediately.
mClock.Advance(2 * time.Second).MustWait(context.Background())
// Modify a file, then send refresh.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "r2.go"), []byte("package r\n"), 0o600))
err := stream.Send(codersdk.WorkspaceAgentGitClientMessage{
Type: codersdk.WorkspaceAgentGitClientMessageTypeRefresh,
})
require.NoError(t, err)
msg := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg.Type)
require.NotEmpty(t, msg.Repositories)
}
func TestWebSocketUnknownMessageType(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
stream := dialGitWatch(t)
ch := stream.Chan()
err := stream.Send(codersdk.WorkspaceAgentGitClientMessage{
Type: "bogus",
})
require.NoError(t, err)
msg := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeError, msg.Type)
require.Contains(t, msg.Message, "unknown")
}
func TestGetRepoChangesStagedModifiedDeleted(t *testing.T) {
t.Parallel()
repoDir := initTestRepo(t)
logger := slogtest.Make(t, nil)
h := agentgit.NewHandler(logger)
// Modify the committed file (worktree modified).
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("# Modified\n"), 0o600))
// Stage a new file.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "staged.go"), []byte("package staged\n"), 0o600))
gitCmd(t, repoDir, "add", "staged.go")
// Create an untracked file.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "untracked.txt"), []byte("hello\n"), 0o600))
h.Subscribe([]string{filepath.Join(repoDir, "README.md")})
msg := h.Scan(context.Background())
require.NotNil(t, msg)
require.Len(t, msg.Repositories, 1)
diff := msg.Repositories[0].UnifiedDiff
// README.md was committed then modified in worktree.
require.Contains(t, diff, "README.md")
require.Contains(t, diff, "--- a/README.md")
require.Contains(t, diff, "+++ b/README.md")
require.Contains(t, diff, "-# Test")
require.Contains(t, diff, "+# Modified")
// staged.go was added to the staging area.
require.Contains(t, diff, "staged.go")
require.Contains(t, diff, "+package staged")
// untracked.txt is untracked (shown via --no-index diff).
require.Contains(t, diff, "untracked.txt")
require.Contains(t, diff, "+hello")
}
func TestFallbackPollTriggersScan(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
repoDir := initTestRepo(t)
mClock := quartz.NewMock(t)
ps := agentgit.NewPathStore()
chatID := uuid.New()
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "poll.go"), []byte("package poll\n"), 0o600))
ps.AddPaths([]uuid.UUID{chatID}, []string{filepath.Join(repoDir, "poll.go")})
// Only the fallback poll can trigger scans (no filesystem
// watcher).
stream := dialGitWatchWithPathStore(t, ps, chatID, agentgit.WithClock(mClock))
ch := stream.Chan()
// We should get an initial scan from subscribe.
msg1 := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg1.Type)
// Add a new dirty file so the next scan has a delta to report.
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "poll2.go"), []byte("package poll\n"), 0o600))
// Advance to the fallback poll interval. This should trigger a
// scan without any explicit refresh.
mClock.Advance(5 * time.Second).MustWait(context.Background())
msg2 := recvMsg(ctx, t, ch)
require.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg2.Type)
require.NotEmpty(t, msg2.Repositories)
}
func TestMultipleConcurrentConnections(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
repoDir := initTestRepo(t)
require.NoError(t, os.WriteFile(filepath.Join(repoDir, "c.go"), []byte("package c\n"), 0o600))
ps := agentgit.NewPathStore()
chatID := uuid.New()
ps.AddPaths([]uuid.UUID{chatID}, []string{filepath.Join(repoDir, "c.go")})
logger := slogtest.Make(t, nil)
api := agentgit.NewAPI(logger, ps)
srv := httptest.NewServer(api.Routes())
t.Cleanup(srv.Close)
wsURL := "ws" + srv.URL[len("http"):] + "/watch?chat_id=" + chatID.String()
// Create two independent connections.
conn1, _, err := websocket.Dial(context.Background(), wsURL, nil)
require.NoError(t, err)
t.Cleanup(func() { _ = conn1.Close(websocket.StatusNormalClosure, "") })
conn2, _, err := websocket.Dial(context.Background(), wsURL, nil)
require.NoError(t, err)
t.Cleanup(func() { _ = conn2.Close(websocket.StatusNormalClosure, "") })
stream1 := wsjson.NewStream[
codersdk.WorkspaceAgentGitServerMessage,
codersdk.WorkspaceAgentGitClientMessage,
](conn1, websocket.MessageText, websocket.MessageText, logger)
ch1 := stream1.Chan()
stream2 := wsjson.NewStream[
codersdk.WorkspaceAgentGitServerMessage,
codersdk.WorkspaceAgentGitClientMessage,
](conn2, websocket.MessageText, websocket.MessageText, logger)
ch2 := stream2.Chan()
// Both should receive independent responses.
msg1 := recvMsg(ctx, t, ch1)
msg2 := recvMsg(ctx, t, ch2)
assert.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg1.Type)
assert.Equal(t, codersdk.WorkspaceAgentGitServerMessageTypeChanges, msg2.Type)
assert.NotEmpty(t, msg1.Repositories)
assert.NotEmpty(t, msg2.Repositories)
}
func TestScanLargeFileTooLargeToDiff(t *testing.T) {
You can’t perform that action at this time.