Merge pull request #701 from ibuildthecloud/main

ibuildthecloud · web-flow · commit 5c3ce9080170 · 2024-08-02T16:34:59.000-07:00
bug: don't also abort the program on double ctrl+c
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86
 	github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379
-	github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d
+	github.com/gptscript-ai/cmd v0.0.0-20240802230653-326b7baf6fcb
 	github.com/gptscript-ai/go-gptscript v0.9.4-0.20240801203434-840b14393b17
 	github.com/gptscript-ai/tui v0.0.0-20240802053758-038d3eed9502
 	github.com/hexops/autogold/v2 v2.2.1
diff --git a/go.sum b/go.sum
@@ -169,8 +169,8 @@ github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86 h1:m9yLtI
 github.com/gptscript-ai/broadcaster v0.0.0-20240625175512-c43682019b86/go.mod h1:lK3K5EZx4dyT24UG3yCt0wmspkYqrj4D/8kxdN3relk=
 github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379 h1:vYnXoIyCXzaCEw0sYifQ4bDpsv3/fO/dZ2suEsTwCIo=
 github.com/gptscript-ai/chat-completion-client v0.0.0-20240531200700-af8e7ecf0379/go.mod h1:7P/o6/IWa1KqsntVf68hSnLKuu3+xuqm6lYhch1w4jo=
-github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d h1:sKf7T7twhGXs6AVbvD9pKDVewykkwSAPwEpmIEQIR/4=
-github.com/gptscript-ai/cmd v0.0.0-20240625175447-4250b42feb7d/go.mod h1:DJAo1xTht1LDkNYFNydVjTHd576TC7MlpsVRl3oloVw=
+github.com/gptscript-ai/cmd v0.0.0-20240802230653-326b7baf6fcb h1:ky2J2CzBOskC7Jgm2VJAQi2x3p7FVGa+2/PcywkFJuc=
+github.com/gptscript-ai/cmd v0.0.0-20240802230653-326b7baf6fcb/go.mod h1:DJAo1xTht1LDkNYFNydVjTHd576TC7MlpsVRl3oloVw=
 github.com/gptscript-ai/go-gptscript v0.9.4-0.20240801203434-840b14393b17 h1:BTfJ6ls31Roq42lznlZnuPzRf0wrT8jT+tWcvq7wDXY=
 github.com/gptscript-ai/go-gptscript v0.9.4-0.20240801203434-840b14393b17/go.mod h1:Dh6vYRAiVcyC3ElZIGzTvNF1FxtYwA07BHfSiFKQY7s=
 github.com/gptscript-ai/tui v0.0.0-20240802053758-038d3eed9502 h1:172DJthLtMUqXrODC/wGd0Vmj6adn9YiP9KnlrZpD+4=
diff --git a/pkg/cli/main.go b/pkg/cli/main.go
@@ -1,7 +1,9 @@
 package cli
 
 import (
+	"context"
 	"os"
+	"os/signal"
 
 	"github.com/gptscript-ai/cmd"
 	"github.com/gptscript-ai/gptscript/pkg/daemon"
@@ -18,5 +20,7 @@ func Main() {
 		}
 		os.Exit(0)
 	}
-	cmd.Main(New())
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer cancel()
+	cmd.MainCtx(ctx, New())
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`package cli`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "context"`
`4`	`5`	`"os"`
	`6`	`+ "os/signal"`
`5`	`7`
`6`	`8`	`"github.com/gptscript-ai/cmd"`
`7`	`9`	`"github.com/gptscript-ai/gptscript/pkg/daemon"`
`@@ -18,5 +20,7 @@ func Main() {`
`18`	`20`	`}`
`19`	`21`	`os.Exit(0)`
`20`	`22`	`}`
`21`		`- cmd.Main(New())`
	`23`	`+ ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)`
	`24`	`+ defer cancel()`
	`25`	`+ cmd.MainCtx(ctx, New())`
`22`	`26`	`}`