-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathmain.go
More file actions
1073 lines (1017 loc) · 37.6 KB
/
main.go
File metadata and controls
1073 lines (1017 loc) · 37.6 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 main
import (
"bufio"
"bytes"
"errors"
"flag"
"fmt"
"io"
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
"time"
"runtime/debug"
)
var (
version = "dev"
commit = "none"
date = "unknown"
quietEcho = false
// window to suppress creating a new local snapshot right after applying from remote
suppressSnapshotsUntil time.Time
)
func main() {
// Fill version info from build info when not injected (e.g., go install)
if version == "dev" {
if bi, ok := debug.ReadBuildInfo(); ok && bi != nil {
if bi.Main.Version != "" && bi.Main.Version != "(devel)" {
version = bi.Main.Version
}
// Extract VCS info if available
for _, s := range bi.Settings {
switch s.Key {
case "vcs.revision":
if commit == "none" && s.Value != "" {
commit = s.Value
}
case "vcs.time":
if date == "unknown" && s.Value != "" {
date = s.Value
}
}
}
}
}
if len(os.Args) < 2 {
printHelp()
return
}
cmd := os.Args[1]
args := os.Args[2:]
if cmd == "--version" || cmd == "version" || cmd == "-v" {
fmt.Printf("aigit %s (%s %s)\n", version, commit, date)
return
}
// Autostart background watch daemon if not already running
if cmd != "watch" {
_ = maybeAutostartWatch()
}
switch cmd {
case "checkpoint":
// Subcommand: checkpoint push
if len(args) > 0 && args[0] == "push" {
fs := flag.NewFlagSet("checkpoint push", flag.ExitOnError)
remote := fs.String("remote", defaultStr(getGitConfig("aigit.pushRemote"), "origin"), "remote name")
if err := fs.Parse(args[1:]); err != nil { fatal(err) }
if err := pushCheckpoints(*remote); err != nil { fatal(err) }
break
}
// Default: create a manual checkpoint
fs := flag.NewFlagSet("checkpoint", flag.ExitOnError)
msg := fs.String("m", "(auto)", "one-line summary message")
q := fs.Bool("q", false, "quiet (suppress local echo; shell integration will display updates)")
if err := fs.Parse(args); err != nil { fatal(err) }
quietEcho = *q
if err := doCheckpoint(*msg); err != nil { fatal(err) }
case "status":
if err := doStatus(); err != nil {
fatal(err)
}
case "tail":
fs := flag.NewFlagSet("tail", flag.ExitOnError)
lines := fs.Int("n", 100, "lines of history before following")
if err := fs.Parse(args); err != nil { fatal(err) }
if err := doTail(*lines); err != nil { fatal(err) }
case "events":
fs := flag.NewFlagSet("events", flag.ExitOnError)
sessionID := fs.String("id", "", "unique session id for state (e.g., host:tty:pid)")
back := fs.Int("n", 80, "lines to show on first run")
follow := fs.Bool("follow", false, "follow and print events as they arrive")
if err := fs.Parse(args); err != nil { fatal(err) }
if strings.TrimSpace(*sessionID) == "" { fatal(errors.New("usage: aigit events -id <session-id> [-n N] [--follow]")) }
if err := doEvents(*sessionID, *back, *follow); err != nil { fatal(err) }
case "init-shell":
fs := flag.NewFlagSet("init-shell", flag.ExitOnError)
zsh := fs.Bool("zsh", false, "install zsh integration (~/.zshrc)")
bash := fs.Bool("bash", false, "install bash integration (~/.bashrc)")
if err := fs.Parse(args); err != nil { fatal(err) }
if !*zsh && !*bash { fatal(errors.New("usage: aigit init-shell --zsh|--bash")) }
if err := doInitShell(*zsh, *bash); err != nil { fatal(err) }
case "id":
if err := doID(); err != nil { fatal(err) }
case "list":
fs := flag.NewFlagSet("list", flag.ExitOnError)
n := fs.Int("n", 20, "number of checkpoints to show")
meta := fs.Bool("meta", false, "show metadata trailers")
if err := fs.Parse(args); err != nil {
fatal(err)
}
if err := doList(*n, *meta); err != nil {
fatal(err)
}
case "sync":
if len(args) == 0 {
fmt.Println("usage: aigit sync push|pull [options]")
return
}
sub := args[0]
subArgs := args[1:]
switch sub {
case "push":
// Deprecated: use 'aigit checkpoint push' instead
fs := flag.NewFlagSet("sync push", flag.ExitOnError)
remote := fs.String("remote", defaultStr(getGitConfig("aigit.pushRemote"), "origin"), "remote name")
if err := fs.Parse(subArgs); err != nil { fatal(err) }
if err := pushCheckpoints(*remote); err != nil { fatal(err) }
case "pull":
fs := flag.NewFlagSet("sync pull", flag.ExitOnError)
remote := fs.String("remote", defaultStr(getGitConfig("aigit.pullRemote"), "origin"), "remote name")
if err := fs.Parse(subArgs); err != nil { fatal(err) }
if err := fetchCheckpoints(*remote); err != nil { fatal(err) }
default:
fmt.Println("usage: aigit sync push|pull [options]")
}
case "remote-list":
fs := flag.NewFlagSet("remote-list", flag.ExitOnError)
remote := fs.String("remote", defaultStr(getGitConfig("aigit.pullRemote"), "origin"), "remote name")
user := fs.String("user", "", "filter by user id; if empty, list users")
n := fs.Int("n", 20, "number of entries when listing a user")
meta := fs.Bool("meta", false, "show metadata trailers when listing a user")
if err := fs.Parse(args); err != nil { fatal(err) }
if err := doRemoteList(*remote, *user, *n, *meta); err != nil { fatal(err) }
case "stop":
if err := doStop(); err != nil { fatal(err) }
case "apply":
fs := flag.NewFlagSet("apply", flag.ExitOnError)
from := fs.String("from", "", "user id to apply from (required)")
remote := fs.String("remote", defaultStr(getGitConfig("aigit.pullRemote"), "origin"), "remote name")
sha := fs.String("sha", "", "checkpoint sha to apply (default latest)")
if err := fs.Parse(args); err != nil { fatal(err) }
if strings.TrimSpace(*from) == "" { fatal(errors.New("--from <user> is required")) }
if err := applyRemoteCheckpoint(*remote, *from, *sha); err != nil { fatal(err) }
case "restore":
fs := flag.NewFlagSet("restore", flag.ExitOnError)
if err := fs.Parse(args); err != nil {
fatal(err)
}
if fs.NArg() < 1 {
fatal(errors.New("usage: aigit restore <sha>"))
}
sha := fs.Arg(0)
if err := doRestore(sha); err != nil {
fatal(err)
}
case "watch":
fs := flag.NewFlagSet("watch", flag.ExitOnError)
intervalStr := fs.String("interval", defaultStr(getGitConfig("aigit.interval"), "5m"), "checkpoint interval, e.g. 30s, 2m, 1h")
settleStr := fs.String("settle", defaultStr(getGitConfig("aigit.settle"), "1.5s"), "settle window after changes, e.g. 1s")
summaryMode := fs.String("summary", defaultStr(getGitConfig("aigit.summary"), "ai"), "summary mode: ai|diff|off")
aiModel := fs.String("model", defaultStr(getGitConfig("aigit.summaryModel"), "openai/gpt-oss-20b:free"), "OpenRouter model when summary=ai")
if err := fs.Parse(args); err != nil {
fatal(err)
}
d, err := time.ParseDuration(*intervalStr)
if err != nil {
fatal(fmt.Errorf("invalid interval: %w", err))
}
settle, err := time.ParseDuration(*settleStr)
if err != nil {
fatal(fmt.Errorf("invalid settle: %w", err))
}
if err := doWatch(d, settle, *summaryMode, *aiModel); err != nil {
fatal(err)
}
default:
printHelp()
}
}
func printHelp() {
fmt.Println("Aigit commands:")
fmt.Println(" aigit checkpoint -m \"summary\" # save a manual snapshot (works during merges)")
fmt.Println(" aigit checkpoint push [-remote origin] # share manual checkpoints to remote")
fmt.Println(" aigit status # show last checkpoint summary + diff")
fmt.Println(" aigit id # show your remote user id and refs")
fmt.Println(" aigit list [-n 20] [--meta] # list recent checkpoints for this branch")
fmt.Println(" aigit restore <sha> # restore files from a checkpoint")
fmt.Println(" aigit sync pull [options] # fetch checkpoint refs via remote (manual)")
fmt.Println(" aigit remote-list [--user id] # list users or a user's remote checkpoints")
fmt.Println(" aigit apply --from <user> # apply a remote user's checkpoint to worktree")
fmt.Println(" aigit tail [-n 100] # stream watcher logs (AI summaries + checkpoints)")
fmt.Println(" aigit watch [-interval 5m] [-summary ai|diff|off] # background snapshots on change")
fmt.Println(" aigit init-shell --zsh|--bash # install shell integration so updates pop up while you work")
fmt.Println(" aigit stop # stop the background watcher for this repo")
fmt.Println("")
fmt.Println("AI summaries (OpenRouter): set OPENROUTER_API_KEY, default model openai/gpt-oss-20b:free")
fmt.Println("")
fmt.Println("Tips:")
fmt.Println(" git log --oneline $(git rev-parse --abbrev-ref HEAD | xargs -I{} echo refs/aigit/checkpoints/{})")
fmt.Println(" git show <sha>")
}
func fatal(err error) {
fmt.Fprintf(os.Stderr, "aigit: %v\n", err)
os.Exit(1)
}
// ---- Core helpers ----
func git(args ...string) (string, error) {
cmd := exec.Command("git", args...)
var out bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &out
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
if stderr.Len() > 0 {
return "", fmt.Errorf("git %v: %v: %s", strings.Join(args, " "), err, strings.TrimSpace(stderr.String()))
}
return "", fmt.Errorf("git %v: %w", strings.Join(args, " "), err)
}
return strings.TrimSpace(out.String()), nil
}
func gitEnv(env map[string]string, args ...string) (string, error) {
cmd := exec.Command("git", args...)
cmd.Env = os.Environ()
for k, v := range env {
cmd.Env = append(cmd.Env, k+"="+v)
}
var out bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &out
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
if stderr.Len() > 0 {
return "", fmt.Errorf("git %v: %v: %s", strings.Join(args, " "), err, strings.TrimSpace(stderr.String()))
}
return "", fmt.Errorf("git %v: %w", strings.Join(args, " "), err)
}
return strings.TrimSpace(out.String()), nil
}
func currentBranch() (string, error) {
s, err := git("rev-parse", "--abbrev-ref", "HEAD")
if err != nil {
return "", err
}
return s, nil
}
func ckRef() (string, error) {
br, err := currentBranch()
if err != nil {
return "", err
}
return "refs/aigit/checkpoints/" + br, nil
}
func gitDir() (string, error) {
return git("rev-parse", "--git-dir")
}
func gitTopLevel() (string, error) {
return git("rev-parse", "--show-toplevel")
}
func isMerging() bool {
dir, err := gitDir()
if err != nil {
return false
}
_, err = os.Stat(filepath.Join(dir, "MERGE_HEAD"))
return err == nil
}
// ---- Commands ----
func doCheckpoint(summary string) error {
// Write snapshot to checkpoint ref (manual share only)
ref, err := ckRef()
if err != nil { return err }
newSha, err := writeSnapshotToRef(summary, ref)
if err != nil { return err }
if !quietEcho {
fmt.Printf("update-arrived!\n")
fmt.Printf("Summary: %s\n", summary)
}
logLine("update-arrived!")
logLine("Summary: %s", summary)
// Print a concise list of changed files for this checkpoint
if files, err := git("diff-tree", "--no-commit-id", "--name-status", "-r", newSha); err == nil && strings.TrimSpace(files) != "" {
if !quietEcho { fmt.Println("Files:") }
logLine("Files:")
scanner := bufio.NewScanner(strings.NewReader(files))
count := 0
for scanner.Scan() {
line := scanner.Text()
if !quietEcho { fmt.Printf(" %s\n", line) }
logLine(" %s", line)
count++
if count >= 20 {
if !quietEcho { fmt.Println(" ...") }
logLine(" ...")
break
}
}
}
if !quietEcho { fmt.Printf("Checkpoint: %s (%s)\n", newSha, summary) }
logLine("Checkpoint: %s (%s)", newSha, summary)
// Checkpoints are manual by default; no autopush here.
return nil
}
// writeSnapshotToRef snapshots the working tree and updates targetRef to a new commit.
func writeSnapshotToRef(summary, targetRef string) (string, error) {
// Create a temp dir and point GIT_INDEX_FILE to a path inside it.
tmpdir, err := os.MkdirTemp("", "aigit-index-*")
if err != nil { return "", err }
defer os.RemoveAll(tmpdir)
idxPath := filepath.Join(tmpdir, "index")
env := map[string]string{"GIT_INDEX_FILE": idxPath}
if _, err := gitEnv(env, "add", "-A"); err != nil { return "", err }
tree, err := gitEnv(env, "write-tree")
if err != nil { return "", err }
// Parent is last commit on targetRef if exists
var parent string
if out, err := git("rev-parse", "-q", "--verify", targetRef+"^{commit}"); err == nil { parent = out }
base, err := git("rev-parse", "HEAD")
if err != nil { base = "0000000000000000000000000000000000000000" }
merging := "no"
if isMerging() { merging = "yes" }
meta := fmt.Sprintf("Aigit-Base: %s\nAigit-When: %s\nAigit-Merge: %s\n", base, time.Now().UTC().Format(time.RFC3339), merging)
// Build commit via commit-tree
var newSha string
{
args := []string{"commit-tree", tree}
if parent != "" { args = append(args, "-p", parent) }
cmd := exec.Command("git", args...)
cmd.Stdin = strings.NewReader(summary + "\n\n" + meta + "\n")
var out bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &out
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
if stderr.Len() > 0 {
return "", fmt.Errorf("git %v: %v: %s", strings.Join(args, " "), err, strings.TrimSpace(stderr.String()))
}
return "", fmt.Errorf("git %v: %w", strings.Join(args, " "), err)
}
newSha = strings.TrimSpace(out.String())
}
// Atomic update-ref
if parent != "" {
if _, err := git("update-ref", "-m", fmt.Sprintf("aigit: %s", summary), targetRef, newSha, parent); err != nil { return "", err }
} else {
if _, err := git("update-ref", "-m", fmt.Sprintf("aigit: %s", summary), targetRef, newSha); err != nil { return "", err }
}
return newSha, nil
}
func doStatus() error {
ref, err := ckRef()
if err != nil {
return err
}
br, _ := currentBranch()
last := "no checkpoints yet"
if out, err := git("log", "-1", "--format=%s", ref); err == nil && strings.TrimSpace(out) != "" {
last = out
}
fmt.Printf("Branch: %s\n", br)
fmt.Printf("Last checkpoint: %s\n", last)
if isMerging() {
if conflicts, _ := listConflicts(); len(conflicts) > 0 {
n := len(conflicts)
preview := joinPreview(conflicts)
fmt.Printf("Merge in progress: %d conflicted files (%s)\n", n, preview)
}
}
fmt.Println("")
fmt.Println("Working tree diff vs HEAD:")
if out, err := git("--no-pager", "diff", "--stat"); err == nil {
if strings.TrimSpace(out) == "" {
// Nothing changed vs HEAD
fmt.Println("nothing here yet, clean workspace")
} else {
fmt.Println(out)
// Also show a suggested one-line summary of pending changes
mode := strings.ToLower(defaultStr(getGitConfig("aigit.summary"), "ai"))
model := defaultStr(getGitConfig("aigit.summaryModel"), "openai/gpt-oss-20b:free")
if s, used := suggestSummary(mode, model); strings.TrimSpace(s) != "" {
fmt.Printf("Suggested summary (%s): %s\n", used, s)
}
}
} else {
return err
}
return nil
}
func doRestore(sha string) error {
fmt.Printf("Restoring worktree from %s (does not move HEAD)...\n", sha)
// Prefer git restore, fallback to checkout for older Git
if _, err := git("restore", "--worktree", "--source", sha, "--", "."); err != nil {
// Fallback
if _, err2 := git("checkout", sha, "--", "."); err2 != nil {
return fmt.Errorf("restore failed: %v; fallback checkout failed: %v", err, err2)
}
}
fmt.Println("Done. (Untracked files are left as-is.)")
return nil
}
func doWatch(interval, settle time.Duration, summaryMode, aiModel string) error {
root, err := gitTopLevel()
if err != nil {
return fmt.Errorf("not in a git repo: %w", err)
}
fmt.Printf("Watching %s (interval=%s, settle=%s, summary=%s)...\n", root, interval, settle, summaryMode)
recordWatchPID()
defer clearWatchPID()
fmt.Println("Tip: run 'aigit tail' in another terminal to view live summaries and checkpoints.")
// Start fsnotify-based watcher in a goroutine
events := make(chan struct{}, 1)
stop, err := startFsWatch(root, events)
if err != nil {
fmt.Fprintf(os.Stderr, "fsnotify unavailable, falling back to timer-only: %v\n", err)
}
defer func() {
if stop != nil {
_ = stop()
}
}()
ticker := time.NewTicker(interval)
defer ticker.Stop()
// idle auto-stop if no local edits for 30m
idleTimeout := 30 * time.Minute
idleTimer := time.NewTimer(idleTimeout)
defer idleTimer.Stop()
var lastEvent time.Time
active := false
for {
select {
case <-events:
if !active {
active = true
fmt.Println("Detected changes; live checkpoints activated.")
}
lastEvent = time.Now()
if !idleTimer.Stop() { select { case <-idleTimer.C: default: } }
_ = idleTimer.Reset(idleTimeout)
case <-time.After(settle):
if active && !lastEvent.IsZero() && time.Since(lastEvent) >= settle {
if err := maybeCheckpoint(summaryMode, aiModel); err != nil {
fmt.Fprintf(os.Stderr, "checkpoint error: %v\n", err)
}
lastEvent = time.Time{}
}
case <-ticker.C:
// periodic remote sync and optional apply
if err := maybePullAndAutoApply(); err != nil {
fmt.Fprintf(os.Stderr, "remote sync/apply failed: %v\n", err)
}
if !active {
// Stay idle until the first save enables local checkpointing
continue
}
// periodic safety net for local changes
if err := maybeCheckpoint(summaryMode, aiModel); err != nil {
fmt.Fprintf(os.Stderr, "checkpoint error: %v\n", err)
}
case <-idleTimer.C:
// No local file changes for idleTimeout; stop watcher
fmt.Println("No local changes for 30m; stopping watcher.")
return nil
}
}
}
func maybeCheckpoint(summaryMode, aiModel string) error {
if time.Now().Before(suppressSnapshotsUntil) {
// Recently applied from remote; skip to avoid ping-pong
return nil
}
changed, err := workingTreeChanged()
if err != nil {
return err
}
if !changed {
return nil
}
// Build summary
var summary string
var used string
switch strings.ToLower(summaryMode) {
case "off":
summary = "(auto)"
used = "off"
case "ai":
// Test/dev hook: allow AI summaries via local fake even without OPENROUTER_API_KEY
if os.Getenv("AIGIT_FAKE_AI_SUMMARY") != "" {
if s, err := summarizeWithAI(aiModel); err == nil && strings.TrimSpace(s) != "" {
summary = s
used = "AI"
break
}
}
if key := os.Getenv("OPENROUTER_API_KEY"); key != "" {
if s, err := summarizeWithAI(aiModel); err == nil && strings.TrimSpace(s) != "" {
summary = s
used = "AI"
break
} else if err != nil {
fmt.Fprintf(os.Stderr, "AI summary failed, falling back to diff: %v\n", err)
}
} else {
fmt.Fprintln(os.Stderr, "OPENROUTER_API_KEY not set; falling back to diff summaries")
}
fallthrough
default:
summary, _ = diffOneLiner()
if summary == "" {
summary = "(auto)"
}
if used == "" { used = "diff" }
}
// Echo the summary source for clarity in terminal output
if used == "AI" {
fmt.Printf("AI summary: %s\n", summary)
} else if used == "diff" {
fmt.Printf("Summary (diff): %s\n", summary)
}
// Live snapshot: update live ref and push to remote if configured/default is available
br, _ := currentBranch()
target := liveLocalRef(br)
newSha, err := writeSnapshotToRef(summary, target)
if err != nil { return err }
fmt.Printf("update-arrived!\n")
fmt.Printf("Summary: %s\n", summary)
logLine("update-arrived!")
logLine("Summary: %s", summary)
if files, err := git("diff-tree", "--no-commit-id", "--name-status", "-r", newSha); err == nil && strings.TrimSpace(files) != "" {
fmt.Println("Files:")
logLine("Files:")
scanner := bufio.NewScanner(strings.NewReader(files))
count := 0
for scanner.Scan() {
line := scanner.Text()
fmt.Printf(" %s\n", line)
logLine(" %s", line)
count++
if count >= 20 {
fmt.Println(" ...")
logLine(" ...")
break
}
}
}
fmt.Printf("Live: %s (%s)\n", newSha, summary)
logLine("Live: %s (%s)", newSha, summary)
// Attempt to push live by default: use configured pushRemote or origin if present
remote := strings.TrimSpace(getGitConfig("aigit.pushRemote"))
if remote == "" && hasRemote("origin") { remote = "origin" }
if remote != "" {
if err := pushLive(remote); err != nil {
fmt.Fprintf(os.Stderr, "push live failed: %v\n", err)
}
}
return nil
}
func workingTreeChanged() (bool, error) {
out, err := git("status", "--porcelain")
if err != nil {
return false, err
}
return strings.TrimSpace(out) != "", nil
}
func diffOneLiner() (string, error) {
out, err := git("diff", "--name-status", "-M", "-C")
if err != nil {
return "", err
}
var adds, mods, dels, renames []string
scanner := bufio.NewScanner(strings.NewReader(out))
for scanner.Scan() {
line := scanner.Text()
parts := strings.Fields(line)
if len(parts) == 0 {
continue
}
code := parts[0]
switch {
case strings.HasPrefix(code, "A"):
if len(parts) > 1 { adds = append(adds, parts[len(parts)-1]) }
case strings.HasPrefix(code, "M"):
if len(parts) > 1 { mods = append(mods, parts[len(parts)-1]) }
case strings.HasPrefix(code, "D"):
if len(parts) > 1 { dels = append(dels, parts[len(parts)-1]) }
case strings.HasPrefix(code, "R"):
if len(parts) > 2 { renames = append(renames, parts[1]+"->"+parts[2]) }
}
}
// Include untracked files as adds
if outU, err := git("ls-files", "--others", "--exclude-standard"); err == nil {
for _, ln := range strings.Split(strings.TrimSpace(outU), "\n") {
ln = strings.TrimSpace(ln)
if ln != "" {
adds = append(adds, ln)
}
}
}
var chunks []string
if len(mods) > 0 {
chunks = append(chunks, fmt.Sprintf("Edit %s", joinPreview(mods)))
}
if len(adds) > 0 {
chunks = append(chunks, fmt.Sprintf("Add %s", joinPreview(adds)))
}
if len(dels) > 0 {
chunks = append(chunks, fmt.Sprintf("Remove %s", joinPreview(dels)))
}
if len(renames) > 0 {
chunks = append(chunks, fmt.Sprintf("Rename %s", joinPreview(renames)))
}
return strings.Join(chunks, "; "), nil
}
func joinPreview(paths []string) string {
const max = 3
if len(paths) <= max {
return strings.Join(paths, ", ")
}
return strings.Join(paths[:max], ", ") + fmt.Sprintf(" (+%d)", len(paths)-max)
}
func runStream(name string, args ...string) error {
cmd := exec.Command(name, args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Stdin = os.Stdin
return cmd.Run()
}
func doTail(lines int) error {
dir, err := aigitDir()
if err != nil { return err }
logp := filepath.Join(dir, "aigit.log")
// If tail is available, use it. Otherwise, simple follow loop.
if _, err := exec.LookPath("tail"); err == nil {
args := []string{"-n", fmt.Sprint(lines), "-f", logp}
return runStream("tail", args...)
}
// Minimal fallback: print last N lines, then poll file for appends.
b, _ := os.ReadFile(logp)
out := string(b)
rows := strings.Split(out, "\n")
if len(rows) > lines {
rows = rows[len(rows)-lines:]
}
for _, r := range rows { fmt.Println(r) }
// Poll every second for new data
lastLen := len(b)
for {
time.Sleep(time.Second)
nb, _ := os.ReadFile(logp)
if len(nb) > lastLen {
os.Stdout.Write(nb[lastLen:])
lastLen = len(nb)
}
}
}
func doInitShell(zsh, bash bool) error {
home, err := os.UserHomeDir()
if err != nil { return err }
cfgDir := filepath.Join(home, ".config", "aigit")
if err := os.MkdirAll(cfgDir, 0o755); err != nil { return err }
bin := selfPath()
if zsh {
path := filepath.Join(cfgDir, "aigit-shell.zsh")
content := `# Installed by aigit init-shell --zsh
typeset -g AIGIT_EVENTS_PID=""
typeset -g AIGIT_EVENTS_ROOT=""
function _aigit_watch_repo() {
local top
top=$(git rev-parse --show-toplevel 2>/dev/null) || top=""
if [[ -z "$top" ]]; then
if [[ -n "$AIGIT_EVENTS_PID" ]]; then kill "$AIGIT_EVENTS_PID" 2>/dev/null; AIGIT_EVENTS_PID=""; AIGIT_EVENTS_ROOT=""; fi
return 0
fi
if [[ "$top" == "$AIGIT_EVENTS_ROOT" ]] && kill -0 "$AIGIT_EVENTS_PID" 2>/dev/null; then
return 0
fi
if [[ -n "$AIGIT_EVENTS_PID" ]]; then kill "$AIGIT_EVENTS_PID" 2>/dev/null; fi
AIGIT_EVENTS_ROOT="$top"
local sid
sid="zsh:${HOST}:${TTY}:${$}:$top"
(cd "$top" && "` + bin + `" events -id "$sid" -n 50 --follow) &!
AIGIT_EVENTS_PID=$!
}
autoload -Uz add-zsh-hook
add-zsh-hook precmd _aigit_watch_repo
`
if err := os.WriteFile(path, []byte(content), 0o644); err != nil { return err }
fmt.Printf("Installed zsh hook at %s\nAdd to ~/.zshrc: source %s\n", path, path)
}
if bash {
path := filepath.Join(cfgDir, "aigit-shell.bash")
content := `# Installed by aigit init-shell --bash
_AIGIT_EVENTS_PID=""
_AIGIT_EVENTS_ROOT=""
_aigit_watch_repo() {
local top
top=$(git rev-parse --show-toplevel 2>/dev/null) || top=""
if [[ -z "$top" ]]; then
if [[ -n "$_AIGIT_EVENTS_PID" ]]; then kill "$_AIGIT_EVENTS_PID" 2>/dev/null; _AIGIT_EVENTS_PID=""; _AIGIT_EVENTS_ROOT=""; fi
return 0
fi
if [[ "$top" == "$_AIGIT_EVENTS_ROOT" ]] && kill -0 "$_AIGIT_EVENTS_PID" 2>/dev/null; then
return 0
fi
if [[ -n "$_AIGIT_EVENTS_PID" ]]; then kill "$_AIGIT_EVENTS_PID" 2>/dev/null; fi
_AIGIT_EVENTS_ROOT="$top"
local sid
sid="bash:${HOSTNAME}:${TTY}:$$:$top"
(cd "$top" && "` + bin + `" events -id "$sid" -n 50 --follow) &
_AIGIT_EVENTS_PID=$!
}
if [[ -n "$PROMPT_COMMAND" ]]; then
PROMPT_COMMAND="_aigit_watch_repo; $PROMPT_COMMAND"
else
PROMPT_COMMAND="_aigit_watch_repo"
fi
`
if err := os.WriteFile(path, []byte(content), 0o644); err != nil { return err }
fmt.Printf("Installed bash hook at %s\nAdd to ~/.bashrc: source %s\n", path, path)
}
return nil
}
func selfPath() string {
p, err := os.Executable()
if err != nil || strings.TrimSpace(p) == "" {
return "aigit"
}
return p
}
func doEvents(sessionID string, back int, follow bool) error {
dir, err := aigitDir()
if err != nil { return err }
logp := filepath.Join(dir, "aigit.log")
// State dir
sdir := filepath.Join(dir, "events")
if err := os.MkdirAll(sdir, 0o755); err != nil { return err }
sid := strings.ReplaceAll(sessionID, string(os.PathSeparator), "_")
spos := filepath.Join(sdir, sid+".pos")
// Read last position
var pos int64 = 0
if b, err := os.ReadFile(spos); err == nil {
if p, perr := strconv.ParseInt(strings.TrimSpace(string(b)), 10, 64); perr == nil {
pos = p
}
}
fi, err := os.Stat(logp)
if err != nil {
// No log yet; nothing to print
return nil
}
size := fi.Size()
if pos == 0 {
if follow {
// Shell follower: start at end-of-log, do not replay history
_ = os.WriteFile(spos, []byte(fmt.Sprint(size)), 0o644)
pos = size
} else {
// Manual one-shot: show last 'back' lines, then exit
data, _ := os.ReadFile(logp)
lines := strings.Split(string(data), "\n")
if back > 0 && len(lines) > back {
lines = lines[len(lines)-back:]
}
for _, ln := range lines { if strings.TrimSpace(ln) != "" { fmt.Println(ln) } }
// Advance to end and return
_ = os.WriteFile(spos, []byte(fmt.Sprint(size)), 0o644)
return nil
}
}
if pos > size {
// Log rotated or truncated; reset
pos = 0
}
// Follow mode: print new data as it arrives
for {
f, err := os.Open(logp)
if err != nil { time.Sleep(500 * time.Millisecond); continue }
if pos > 0 { if _, err := f.Seek(pos, io.SeekStart); err != nil { pos = 0; f.Seek(0, io.SeekStart) } }
n, _ := io.Copy(os.Stdout, f)
_ = f.Close()
if n > 0 { pos += n; _ = os.WriteFile(spos, []byte(fmt.Sprint(pos)), 0o644) }
time.Sleep(500 * time.Millisecond)
}
}
// logLine appends a formatted line to the repo-scoped log file.
func logLine(format string, a ...any) {
dir, err := aigitDir()
if err != nil { return }
logp := filepath.Join(dir, "aigit.log")
f, err := os.OpenFile(logp, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil { return }
defer f.Close()
fmt.Fprintf(f, format+"\n", a...)
}
// doStop stops the background watcher for this repository if running.
func doStop() error {
dir, err := aigitDir()
if err != nil { return err }
pidPath := filepath.Join(dir, "watch.pid")
b, err := os.ReadFile(pidPath)
if err != nil {
fmt.Println("No watcher running (pid file not found).")
return nil
}
s := strings.TrimSpace(string(b))
pid, err := strconv.Atoi(s)
if err != nil {
return fmt.Errorf("invalid pid in %s: %s", pidPath, s)
}
if p, err := os.FindProcess(pid); err == nil {
_ = p.Kill()
}
_ = os.Remove(pidPath)
fmt.Printf("Stopped watcher (pid %d).\n", pid)
return nil
}
// suggestSummary returns a one-line summary and the mode used (AI or diff).
func suggestSummary(summaryMode, aiModel string) (summary string, used string) {
switch strings.ToLower(summaryMode) {
case "ai":
if os.Getenv("OPENROUTER_API_KEY") != "" {
if s, err := summarizeWithAI(aiModel); err == nil && strings.TrimSpace(s) != "" {
return s, "AI"
}
}
fallthrough
case "diff", "":
s, _ := diffOneLiner()
return s, "diff"
default:
return "", strings.ToLower(summaryMode)
}
}
func doID() error {
uid := getUserID()
br, _ := currentBranch()
local, _ := ckRef()
pushRemote := strings.TrimSpace(getGitConfig("aigit.pushRemote"))
pullRemote := strings.TrimSpace(getGitConfig("aigit.pullRemote"))
fmt.Printf("User ID: %s\n", uid)
fmt.Printf("Branch: %s\n", br)
fmt.Printf("Local ref: %s\n", local)
if pushRemote != "" {
fmt.Printf("Push target: %s %s\n", pushRemote, userRemoteRef(uid, br))
} else {
fmt.Printf("Push target: (not configured)\n")
}
if pullRemote != "" {
fmt.Printf("Pull source: %s %s\n", pullRemote, remoteTrackingRef(pullRemote, uid, br))
} else {
fmt.Printf("Pull source: (not configured)\n")
}
return nil
}
func doRemoteList(remote, user string, limit int, showMeta bool) error {
if strings.TrimSpace(remote) == "" { remote = "origin" }
// Ensure we have latest checkpoint refs
_ = fetchCheckpoints(remote)
br, err := currentBranch()
if err != nil { return err }
if strings.TrimSpace(user) == "" {
users, err := listRemoteUsers(remote, br)
if err != nil { return err }
if len(users) == 0 {
fmt.Println("No remote checkpoint users found.")
return nil
}
fmt.Println("Remote users with checkpoints:")
for _, u := range users {
fmt.Println(" -", u)
}
return nil
}
ref := remoteTrackingRef(remote, user, br)
if _, err := git("rev-parse", "-q", "--verify", ref); err != nil {
return fmt.Errorf("no checkpoints for user %s on %s", user, br)
}
format := "%h%x09%ct%x09%s"
out, err := git("--no-pager", "log", "-n", strconv.Itoa(limit), "--format="+format, ref)
if err != nil { return err }
lines := strings.Split(strings.TrimSpace(out), "\n")
for _, line := range lines {
if strings.TrimSpace(line) == "" { continue }
parts := strings.SplitN(line, "\t", 3)
if len(parts) < 3 { continue }
sha, ctStr, subj := parts[0], parts[1], parts[2]
ct, _ := strconv.ParseInt(ctStr, 10, 64)
rel := relTime(time.Since(time.Unix(ct, 0)))
fmt.Printf("%s %6s %s\n", sha, rel, subj)
if showMeta {
body, _ := git("show", "-s", "--format=%B", sha)
m := parseMeta(body)
line := ""
if m.Base != "" { line += fmt.Sprintf("base=%s ", short(m.Base)) }
if m.Merge != "" { line += fmt.Sprintf("merge=%s ", m.Merge) }
if m.When != "" { line += fmt.Sprintf("when=%s", m.When) }
if strings.TrimSpace(line) != "" { fmt.Printf(" %s\n", strings.TrimSpace(line)) }
}
}
return nil
}
func doList(limit int, showMeta bool) error {
ref, err := ckRef()
if err != nil {
return err
}
if _, err := git("rev-parse", "-q", "--verify", ref); err != nil {
fmt.Println("No checkpoints yet.")
return nil
}
format := "%h%x09%ct%x09%s"
out, err := git("--no-pager", "log", "-n", strconv.Itoa(limit), "--format="+format, ref)
if err != nil {
return err
}
lines := strings.Split(strings.TrimSpace(out), "\n")
for _, line := range lines {
if strings.TrimSpace(line) == "" {
continue
}
parts := strings.SplitN(line, "\t", 3)
if len(parts) < 3 {
continue
}
sha, ctStr, subj := parts[0], parts[1], parts[2]
ct, _ := strconv.ParseInt(ctStr, 10, 64)
rel := relTime(time.Since(time.Unix(ct, 0)))
fmt.Printf("%s %6s %s\n", sha, rel, subj)
if showMeta {
body, _ := git("show", "-s", "--format=%B", sha)
m := parseMeta(body)
line := ""
if m.Base != "" {
line += fmt.Sprintf("base=%s ", short(m.Base))
}
if m.Merge != "" {
line += fmt.Sprintf("merge=%s ", m.Merge)
}
if m.When != "" {
line += fmt.Sprintf("when=%s", m.When)
}
if strings.TrimSpace(line) != "" {
fmt.Printf(" %s\n", strings.TrimSpace(line))