multiple fixes

Author: nagypeterjob

pkg/cmd/buildctl/proxy.go

@@ -996,6 +996,21 @@ type HealthProxy struct {
 	state func() *ProxyState
 }
 
+func (p *HealthProxy) List(ctx context.Context, in *health.HealthListRequest) (*health.HealthListResponse, error) {
+	md, ok := metadata.FromIncomingContext(ctx)
+	if ok {
+		ctx = metadata.NewOutgoingContext(ctx, md)
+	}
+
+	state := p.state()
+	if state.Err != nil {
+		return nil, state.Err
+	}
+
+	client := health.NewHealthClient(state.Conn)
+	return client.List(ctx, in)
+}
+
 func (p *HealthProxy) Check(ctx context.Context, in *health.HealthCheckRequest) (*health.HealthCheckResponse, error) {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if ok {

pkg/cmd/compute/exec.go

@@ -75,7 +75,7 @@ func newComputeExec() *cobra.Command {
 				case *civ1.ExecuteCommandResponse_Stdout:
 					fmt.Fprint(os.Stdout, v.Stdout)
 				case *civ1.ExecuteCommandResponse_Stderr:
-					fmt.Fprint(os.Stdout, v.Stderr)
+					fmt.Fprint(os.Stderr, v.Stderr)
 				case *civ1.ExecuteCommandResponse_ExitCode:
 					if v.ExitCode != 0 {
 						os.Exit(int(v.ExitCode))

pkg/cmd/compute/pty.go

@@ -1,6 +1,7 @@
 package compute
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -85,6 +86,16 @@ func newComputePty() *cobra.Command {
 			}
 			defer term.Restore(fd, oldState) //nolint:errcheck
 
+			// Restore terminal on signals that would otherwise leave it raw.
+			sigCh := make(chan os.Signal, 1)
+			signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+			go func() {
+				<-sigCh
+				term.Restore(fd, oldState) //nolint:errcheck
+				os.Exit(1)
+			}()
+			defer signal.Stop(sigCh)
+
 			client := api.NewComputeClient()
 			stream := client.OpenPtySession(ctx)
 			stream.RequestHeader().Set("Authorization", "Bearer "+token)
@@ -105,40 +116,44 @@ func newComputePty() *cobra.Command {
 				return fmt.Errorf("send pty init: %w", err)
 			}
 
-			// Handle SIGWINCH for terminal resize.
-			sigwinch := make(chan os.Signal, 1)
-			signal.Notify(sigwinch, syscall.SIGWINCH)
-			defer signal.Stop(sigwinch)
+			ctx, cancel := context.WithCancel(ctx)
+			defer cancel()
+
+			sendCh := make(chan *civ1.OpenPtySessionRequest, 1)
 
 			go func() {
-				for range sigwinch {
-					w, h, err := term.GetSize(fd)
-					if err != nil {
-						continue
+				for {
+					select {
+					case msg := <-sendCh:
+						_ = stream.Send(msg)
+					case <-ctx.Done():
+						_ = stream.CloseRequest()
+						return
 					}
-					_ = stream.Send(&civ1.OpenPtySessionRequest{
-						Message: &civ1.OpenPtySessionRequest_WindowResize{
-							WindowResize: &civ1.WindowResize{
-								Rows: uint32(h),
-								Cols: uint32(w),
-							},
-						},
-					})
 				}
 			}()
 
+			// Watch for terminal resize events (no-op on Windows).
+			stopResize := watchTerminalResize(ctx, fd, sendCh)
+			defer stopResize()
+
 			// Forward stdin to the stream.
 			go func() {
 				buf := make([]byte, 4096) //nolint:mnd
 				for {
 					n, err := os.Stdin.Read(buf)
 					if n > 0 {
-						_ = stream.Send(&civ1.OpenPtySessionRequest{
-							Message: &civ1.OpenPtySessionRequest_Stdin{Stdin: buf[:n]},
-						})
+						data := make([]byte, n)
+						copy(data, buf[:n])
+						select {
+						case sendCh <- &civ1.OpenPtySessionRequest{
+							Message: &civ1.OpenPtySessionRequest_Stdin{Stdin: data},
+						}:
+						case <-ctx.Done():
+							return
+						}
 					}
 					if err != nil {
-						_ = stream.CloseRequest()
 						return
 					}
 				}
@@ -159,6 +174,7 @@ func newComputePty() *cobra.Command {
 				case *civ1.OpenPtySessionResponse_ExitCode:
 					fmt.Fprintf(os.Stderr, "\r\n[exit %d]\r\n", m.ExitCode)
 					if m.ExitCode != 0 {
+						term.Restore(fd, oldState) //nolint:errcheck
 						os.Exit(int(m.ExitCode))
 					}
 					return nil

pkg/cmd/compute/pty_resize_unix.go

@@ -0,0 +1,55 @@
+//go:build !windows
+
+package compute
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	civ1 "github.com/depot/cli/pkg/proto/depot/ci/v1"
+	"golang.org/x/term"
+)
+
+// watchTerminalResize listens for SIGWINCH and sends resize messages via sendCh.
+// Stops when ctx is cancelled. Returns a cleanup function to stop watching.
+func watchTerminalResize(
+	ctx context.Context,
+	fd int,
+	sendCh chan<- *civ1.OpenPtySessionRequest,
+) func() {
+	sigwinch := make(chan os.Signal, 1)
+	signal.Notify(sigwinch, syscall.SIGWINCH)
+
+	go func() {
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case _, ok := <-sigwinch:
+				if !ok {
+					return
+				}
+				w, h, err := term.GetSize(fd)
+				if err != nil {
+					continue
+				}
+				select {
+				case sendCh <- &civ1.OpenPtySessionRequest{
+					Message: &civ1.OpenPtySessionRequest_WindowResize{
+						WindowResize: &civ1.WindowResize{
+							Rows: uint32(h),
+							Cols: uint32(w),
+						},
+					},
+				}:
+				case <-ctx.Done():
+					return
+				}
+			}
+		}
+	}()
+
+	return func() { signal.Stop(sigwinch) }
+}

pkg/cmd/compute/pty_resize_windows.go

@@ -0,0 +1,16 @@
+package compute
+
+import (
+	"context"
+
+	civ1 "github.com/depot/cli/pkg/proto/depot/ci/v1"
+)
+
+// watchTerminalResize is a no-op on Windows since SIGWINCH is not available.
+func watchTerminalResize(
+	_ context.Context,
+	_ int,
+	_ chan<- *civ1.OpenPtySessionRequest,
+) func() {
+	return func() {}
+}