fix: disable github/charmbracelete/bubbletea init()

sreya · sreya · commit 83e5db8e028d · 2024-12-10T23:53:21.000Z
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -5,6 +5,8 @@ import (
 	"os"
 	_ "time/tzdata"
 
+	tea "github.com/sreya/bubbletea"
+
 	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/cli"
 )
@@ -15,6 +17,7 @@ func main() {
 		_, _ = fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
+	tea.InitTerminal()
 	var rootCmd cli.RootCmd
 	rootCmd.RunWithSubcommands(rootCmd.AGPL())
 }
diff --git a/enterprise/cmd/coder/main.go b/enterprise/cmd/coder/main.go
@@ -5,6 +5,8 @@ import (
 	"os"
 	_ "time/tzdata"
 
+	tea "github.com/sreya/bubbletea"
+
 	"github.com/coder/coder/v2/agent/agentexec"
 	entcli "github.com/coder/coder/v2/enterprise/cli"
 )
@@ -15,7 +17,9 @@ func main() {
 		_, _ = fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-
+	// This preserves backwards compatibility with an init function that is causing grief for
+	// web terminals using agent-exec + screen.
+	tea.InitTerminal()
 	var rootCmd entcli.RootCmd
 	rootCmd.RunWithSubcommands(rootCmd.EnterpriseSubcommands())
 }
diff --git a/go.mod b/go.mod
@@ -67,6 +67,8 @@ replace github.com/pkg/sftp => github.com/mafredri/sftp v1.13.6-0.20231212144145
 // which we use in the awsiamrds package.
 replace github.com/lib/pq => github.com/coder/pq v1.10.5-0.20240813183442-0c420cb5a048
 
+replace github.com/charmbracelet/bubbletea => github.com/sreya/bubbletea v1.2.2-0.20241210232551-43ff5fc42edd
+
 require (
 	cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb
 	cloud.google.com/go/compute/metadata v0.5.2
@@ -202,7 +204,7 @@ require go.uber.org/mock v0.5.0
 require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/charmbracelet/bubbles v0.20.0
-	github.com/charmbracelet/bubbletea v1.2.1
+	github.com/charmbracelet/bubbletea v1.1.0
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/coder/serpent v0.10.0
 	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
@@ -212,6 +214,7 @@ require (
 	github.com/google/go-github/v61 v61.0.0
 	github.com/mocktools/go-smtp-mock/v2 v2.4.0
 	github.com/natefinch/atomic v1.0.1
+	github.com/sreya/bubbletea v1.2.2-0.20241210232912-64577f67745d
 	kernel.org/pub/linux/libs/security/libcap/cap v1.2.73
 )
 
diff --git a/go.sum b/go.sum
@@ -177,8 +177,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
 github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
-github.com/charmbracelet/bubbletea v1.2.1 h1:J041h57zculJKEKf/O2pS4edXGIz+V0YvojvfGXePIk=
-github.com/charmbracelet/bubbletea v1.2.1/go.mod h1:viLoDL7hG4njLJSKU2gw7kB3LSEmWsrM80rO1dBJWBI=
 github.com/charmbracelet/glamour v0.8.0 h1:tPrjL3aRcQbn++7t18wOpgLyl8wrOHUEDS7IZ68QtZs=
 github.com/charmbracelet/glamour v0.8.0/go.mod h1:ViRgmKkf3u5S7uakt2czJ272WSg2ZenlYEZXT2x7Bjw=
 github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
@@ -875,6 +873,10 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/sqlc-dev/pqtype v0.3.0 h1:b09TewZ3cSnO5+M1Kqq05y0+OjqIptxELaSayg7bmqk=
 github.com/sqlc-dev/pqtype v0.3.0/go.mod h1:oyUjp5981ctiL9UYvj1bVvCKi8OXkCa0u645hce7CAs=
+github.com/sreya/bubbletea v1.2.2-0.20241210232551-43ff5fc42edd h1:xPRu22sr8KkxW77hDVI7+LtGzkvN4VIa2B9KguAtseY=
+github.com/sreya/bubbletea v1.2.2-0.20241210232551-43ff5fc42edd/go.mod h1:viLoDL7hG4njLJSKU2gw7kB3LSEmWsrM80rO1dBJWBI=
+github.com/sreya/bubbletea v1.2.2-0.20241210232912-64577f67745d h1:quKivcS5oKQqHJrQCuwcynyZIL277p+1eMs40dVjfyM=
+github.com/sreya/bubbletea v1.2.2-0.20241210232912-64577f67745d/go.mod h1:sjEM8Zl1LP776ZK9xhLVX6fC5bDWw0HryxT8bmBfcsY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`_ "time/tzdata"`
`7`	`7`
	`8`	`+ tea "github.com/sreya/bubbletea"`
	`9`	`+`
`8`	`10`	`"github.com/coder/coder/v2/agent/agentexec"`
`9`	`11`	`"github.com/coder/coder/v2/cli"`
`10`	`12`	`)`
`@@ -15,6 +17,7 @@ func main() {`
`15`	`17`	`_, _ = fmt.Fprintln(os.Stderr, err)`
`16`	`18`	`os.Exit(1)`
`17`	`19`	`}`
	`20`	`+ tea.InitTerminal()`
`18`	`21`	`var rootCmd cli.RootCmd`
`19`	`22`	`rootCmd.RunWithSubcommands(rootCmd.AGPL())`
`20`	`23`	`}`