Migrate PTY from creack/pty to go-pty for Windows support

  - Replace creack/pty with aymanbagabas/go-pty v0.2.2 (ConPTY on Windows)
  - Refactor startPTY to use pty.New() + Command() + Start() pattern
  - Update ptmx type from *os.File to pty.Pty interface
  - Simplify resizePTY to use ptmx.Resize() instead of pty.Setsize()
  - Bump Go version to 1.22 in CI and release workflows
  - Add error trap in install.ps1 to keep window open on failure

Author: hhfrancois

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Download dependencies
         run: go mod download

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Get version from tag
         id: version

go.mod

@@ -1,14 +1,18 @@
 module github.com/softwarity/aipilot-cli
 
-go 1.19
+go 1.20
 
 require (
-	github.com/creack/pty v1.1.24
+	github.com/aymanbagabas/go-pty v0.2.2
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	golang.org/x/crypto v0.17.0
 	golang.org/x/term v0.27.0
 )
 
-require golang.org/x/sys v0.28.0 // indirect
+require (
+	github.com/creack/pty v1.1.21 // indirect
+	github.com/u-root/u-root v0.11.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+)

go.sum

@@ -1,11 +1,16 @@
-github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
-github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
+github.com/aymanbagabas/go-pty v0.2.2 h1:YZREB4eSj+1xdbbItIokX0ekjjeifgJOA+ZvxU4/WM8=
+github.com/aymanbagabas/go-pty v0.2.2/go.mod h1:gfvlwH+0U66BCwxJREjJaAOEs9H1OFf3YFjI9WSiZ04=
+github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
+github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
+github.com/u-root/gobusybox/src v0.0.0-20221229083637-46b2883a7f90 h1:zTk5683I9K62wtZ6eUa6vu6IWwVHXPnoKK5n2unAwv0=
+github.com/u-root/u-root v0.11.0 h1:6gCZLOeRyevw7gbTwMj3fKxnr9+yHFlgF3N7udUVNO8=
+github.com/u-root/u-root v0.11.0/go.mod h1:DBkDtiZyONk9hzVEdB/PWI9B4TxDkElWlVTHseglrZY=
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=

install.ps1

@@ -10,6 +10,7 @@
 #>
 
 $ErrorActionPreference = "Stop"
+trap { Write-Host "`n$_" -ForegroundColor Red; Read-Host "Press Enter to exit"; exit 1 }
 
 $Repo = "softwarity/aipilot-cli"
 $BinaryName = "aipilot-cli.exe"

main.go

@@ -6,15 +6,14 @@ import (
 	"io"
 	"log"
 	"os"
-	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
-	"github.com/creack/pty"
+	pty "github.com/aymanbagabas/go-pty"
 	"golang.org/x/term"
 )
 
@@ -280,14 +279,18 @@ func displayHeader(daemon *Daemon, session, command, workDir, agentVersion strin
 }
 
 // startPTY starts the PTY and returns the pty master and command
-func startPTY(command, workDir string) (*os.File, *exec.Cmd) {
+func startPTY(command, workDir string) (pty.Pty, *pty.Cmd) {
 	fmt.Printf("Starting %s...\n", command)
-	cmd := exec.Command(command)
+	ptmx, err := pty.New()
+	if err != nil {
+		log.Fatal("Failed to create PTY:", err)
+	}
+	cmd := ptmx.Command(command)
 	cmd.Dir = workDir
 	cmd.Env = append(os.Environ(), "TERM=xterm-256color")
 
-	ptmx, err := pty.Start(cmd)
-	if err != nil {
+	if err := cmd.Start(); err != nil {
+		ptmx.Close()
 		log.Fatal("Failed to start PTY:", err)
 	}
 	return ptmx, cmd
@@ -450,7 +453,7 @@ func startResizeHandler(daemon *Daemon, resizeChan <-chan os.Signal) {
 }
 
 // waitForTermination waits for either a signal or process exit, then cleans up
-func waitForTermination(sigChan <-chan os.Signal, cmd *exec.Cmd, daemon *Daemon) {
+func waitForTermination(sigChan <-chan os.Signal, cmd *pty.Cmd, daemon *Daemon) {
 	var exitMsg string
 
 	select {
@@ -581,7 +584,7 @@ func main() {
 	waitForTermination(sigChan, cmd, daemon)
 }
 
-func waitForProcess(cmd *exec.Cmd) <-chan error {
+func waitForProcess(cmd *pty.Cmd) <-chan error {
 	ch := make(chan error, 1)
 	go func() {
 		ch <- cmd.Wait()

terminal.go

@@ -2,8 +2,6 @@ package main
 
 import (
 	"time"
-
-	"github.com/creack/pty"
 )
 
 // schedulePCSwitch schedules a debounced switch to PC mode
@@ -120,10 +118,7 @@ func (d *Daemon) resizePTY(rows, cols uint16) error {
 	}
 
 	d.ptyMu.Lock()
-	err := pty.Setsize(ptmx, &pty.Winsize{
-		Cols: cols,
-		Rows: rows,
-	})
+	err := ptmx.Resize(int(cols), int(rows))
 	d.ptyMu.Unlock()
 	return err
 }

types.go

@@ -3,10 +3,10 @@ package main
 import (
 	"context"
 	"crypto/cipher"
-	"os"
 	"sync"
 	"time"
 
+	pty "github.com/aymanbagabas/go-pty"
 	"github.com/gorilla/websocket"
 	"golang.org/x/term"
 )
@@ -58,7 +58,7 @@ type Daemon struct {
 	relayConnected  bool
 
 	// PTY
-	ptmx *os.File
+	ptmx pty.Pty
 
 	// Session info
 	session   string