Skip to content

Handle terminal resizing #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjmiller609 merged 1 commit into from
Jan 29, 2026
Merged

Handle terminal resizing #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion pkg/cmd/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"os"
"os/signal"
"strings"
"sync"
"syscall"

"github.com/gorilla/websocket"
Expand All @@ -35,6 +36,8 @@ type execRequest struct {
Env map[string]string `json:"env,omitempty"`
Cwd string `json:"cwd,omitempty"`
Timeout int32 `json:"timeout,omitempty"`
Rows uint32 `json:"rows,omitempty"`
Cols uint32 `json:"cols,omitempty"`
}

var execCmd = cli.Command{
Expand Down Expand Up @@ -127,6 +130,17 @@ func handleExec(ctx context.Context, cmd *cli.Command) error {
execReq.Timeout = int32(timeout)
}

// Get terminal size for TTY mode (only if stdout is actually a terminal)
if tty && term.IsTerminal(int(os.Stdout.Fd())) {
cols, rows, _ := term.GetSize(int(os.Stdout.Fd()))
if rows > 0 {
execReq.Rows = uint32(rows)
}
if cols > 0 {
execReq.Cols = uint32(cols)
}
}

reqBody, err := json.Marshal(execReq)
if err != nil {
return fmt.Errorf("failed to marshal request: %w", err)
Expand Down Expand Up @@ -213,9 +227,30 @@ func runExecInteractive(ws *websocket.Conn) (int, error) {
signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
defer signal.Stop(sigCh)

// Handle SIGWINCH for terminal resize
sigwinch := make(chan os.Signal, 1)
signal.Notify(sigwinch, syscall.SIGWINCH)
defer signal.Stop(sigwinch)

// Mutex to protect WebSocket writes from concurrent access
var wsMu sync.Mutex

errCh := make(chan error, 2)
exitCodeCh := make(chan int, 1)

// Handle terminal resize events
go func() {
for range sigwinch {
cols, rows, _ := term.GetSize(int(os.Stdout.Fd()))
if rows > 0 && cols > 0 {
msg := fmt.Sprintf(`{"resize":{"rows":%d,"cols":%d}}`, rows, cols)
wsMu.Lock()
ws.WriteMessage(websocket.TextMessage, []byte(msg))
wsMu.Unlock()
}
}
}()

// Forward stdin to WebSocket
go func() {
buf := make([]byte, 32*1024)
Expand All @@ -228,7 +263,10 @@ func runExecInteractive(ws *websocket.Conn) (int, error) {
return
}
if n > 0 {
if err := ws.WriteMessage(websocket.BinaryMessage, buf[:n]); err != nil {
wsMu.Lock()
err := ws.WriteMessage(websocket.BinaryMessage, buf[:n])
wsMu.Unlock()
if err != nil {
errCh <- fmt.Errorf("websocket write error: %w", err)
return
}
Expand Down