@wangyaoshen/remux 0.3.8-dev.a8ceb0c

package/tui/go.mod

@@ -0,0 +1,32 @@
+module github.com/eisber/remux/tui
+
+go 1.26.1
+
+require (
+	github.com/charmbracelet/bubbletea v1.3.10
+	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/gorilla/websocket v1.5.3
+)
+
+require (
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/charmbracelet/colorprofile v0.4.1 // indirect
+	github.com/charmbracelet/x/ansi v0.11.6 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
+	github.com/charmbracelet/x/term v0.2.2 // indirect
+	github.com/clipperhouse/displaywidth v0.9.0 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/text v0.3.8 // indirect
+)

package/tui/go.sum

@@ -0,0 +1,50 @@
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
+github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
+github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
+github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
+github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
+github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
+github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
+github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
+github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
+github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
+github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
+github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
+github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
+github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
+github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
+github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+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/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
+github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
+github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=

package/tui/main.go

@@ -0,0 +1,261 @@
+// remux-tui is a cross-platform terminal client for remux servers.
+//
+// It connects to one or more remux hosts via WebSocket and provides
+// a unified terminal session view using bubbletea.
+//
+// Usage:
+//
+//	remux-tui connect <url>             Connect to a single host
+//	remux-tui connect                   Connect to all saved hosts
+//	remux-tui hosts add <name> <url>    Save a host
+//	remux-tui hosts list                List saved hosts
+//	remux-tui hosts remove <name>       Remove a saved host
+package main
+
+import (
+	"fmt"
+	"net/url"
+	"os"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/eisber/remux/tui/client"
+	"github.com/eisber/remux/tui/config"
+	"github.com/eisber/remux/tui/ui"
+)
+
+func main() {
+	if len(os.Args) < 2 {
+		printUsage()
+		os.Exit(1)
+	}
+
+	switch os.Args[1] {
+	case "connect":
+		runConnect(os.Args[2:])
+	case "hosts":
+		runHosts(os.Args[2:])
+	case "version":
+		fmt.Println("remux-tui v0.1.0")
+	case "help", "--help", "-h":
+		printUsage()
+	default:
+		// If it looks like a URL, treat it as `connect <url>`.
+		if strings.HasPrefix(os.Args[1], "http") || strings.HasPrefix(os.Args[1], "ws") {
+			runConnect(os.Args[1:])
+		} else {
+			fmt.Fprintf(os.Stderr, "unknown command: %s\n", os.Args[1])
+			printUsage()
+			os.Exit(1)
+		}
+	}
+}
+
+func printUsage() {
+	fmt.Println(`remux-tui — cross-platform terminal client for remux servers
+
+Usage:
+  remux-tui connect [url]           Connect to a host (or all saved hosts)
+  remux-tui hosts add <name> <url>  Save a host connection
+  remux-tui hosts list              List saved hosts
+  remux-tui hosts remove <name>     Remove a saved host
+  remux-tui version                 Show version
+
+Keyboard shortcuts (when connected):
+  Ctrl-O    Session picker (switch between sessions/hosts)
+  Ctrl-D    Detach (quit client, sessions keep running)
+
+Environment:
+  REMUX_PASSWORD   Password for authentication`)
+}
+
+func runConnect(args []string) {
+	manager := client.NewHostManager()
+	defer manager.Close()
+
+	password := os.Getenv("REMUX_PASSWORD")
+
+	if len(args) > 0 {
+		// Connect to a single URL.
+		rawURL := args[0]
+		host, err := parseHostURL(rawURL)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "invalid URL: %s\n", err)
+			os.Exit(1)
+		}
+
+		model := tui.NewModel(manager)
+		p := tea.NewProgram(model, tea.WithAltScreen())
+
+		if err := manager.AddHost(host, password); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to connect to %s: %s\n", host.Name, err)
+			os.Exit(1)
+		}
+
+		conn := manager.GetConnection(host.Name)
+		tui.SetupCallbacks(manager, p)
+		tui.SetupConnectionCallbacks(conn, p)
+
+		if _, err := p.Run(); err != nil {
+			fmt.Fprintf(os.Stderr, "error: %s\n", err)
+			os.Exit(1)
+		}
+		return
+	}
+
+	// Connect to all saved hosts.
+	cfgPath := config.DefaultConfigPath()
+	cfg, err := config.Load(cfgPath)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to load config: %s\n", err)
+		os.Exit(1)
+	}
+
+	if len(cfg.Hosts) == 0 {
+		fmt.Println("No saved hosts. Use:")
+		fmt.Println("  remux-tui hosts add <name> <url>")
+		fmt.Println("  remux-tui connect <url>")
+		os.Exit(0)
+	}
+
+	model := tui.NewModel(manager)
+	p := tea.NewProgram(model, tea.WithAltScreen())
+
+	for _, host := range cfg.Hosts {
+		if err := manager.AddHost(host, password); err != nil {
+			fmt.Fprintf(os.Stderr, "warning: failed to connect to %s: %s\n", host.Name, err)
+			continue
+		}
+		conn := manager.GetConnection(host.Name)
+		tui.SetupConnectionCallbacks(conn, p)
+	}
+
+	tui.SetupCallbacks(manager, p)
+
+	if _, err := p.Run(); err != nil {
+		fmt.Fprintf(os.Stderr, "error: %s\n", err)
+		os.Exit(1)
+	}
+}
+
+func runHosts(args []string) {
+	cfgPath := config.DefaultConfigPath()
+
+	if len(args) == 0 {
+		args = []string{"list"}
+	}
+
+	switch args[0] {
+	case "add":
+		if len(args) < 3 {
+			fmt.Fprintln(os.Stderr, "usage: remux-tui hosts add <name> <url>")
+			os.Exit(1)
+		}
+		name := args[1]
+		rawURL := args[2]
+		host, err := parseHostURL(rawURL)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "invalid URL: %s\n", err)
+			os.Exit(1)
+		}
+		host.Name = name
+
+		cfg, err := config.Load(cfgPath)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "failed to load config: %s\n", err)
+			os.Exit(1)
+		}
+
+		// Replace existing host with same name.
+		replaced := false
+		for i, h := range cfg.Hosts {
+			if h.Name == name {
+				cfg.Hosts[i] = host
+				replaced = true
+				break
+			}
+		}
+		if !replaced {
+			cfg.Hosts = append(cfg.Hosts, host)
+		}
+
+		if err := config.Save(cfgPath, cfg); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to save config: %s\n", err)
+			os.Exit(1)
+		}
+		fmt.Printf("saved host %q → %s\n", name, host.URL)
+
+	case "list":
+		cfg, err := config.Load(cfgPath)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "failed to load config: %s\n", err)
+			os.Exit(1)
+		}
+		if len(cfg.Hosts) == 0 {
+			fmt.Println("no saved hosts")
+			return
+		}
+		for _, h := range cfg.Hosts {
+			fmt.Printf("  %s → %s\n", h.Name, h.URL)
+		}
+
+	case "remove":
+		if len(args) < 2 {
+			fmt.Fprintln(os.Stderr, "usage: remux-tui hosts remove <name>")
+			os.Exit(1)
+		}
+		name := args[1]
+		cfg, err := config.Load(cfgPath)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "failed to load config: %s\n", err)
+			os.Exit(1)
+		}
+		filtered := cfg.Hosts[:0]
+		found := false
+		for _, h := range cfg.Hosts {
+			if h.Name == name {
+				found = true
+				continue
+			}
+			filtered = append(filtered, h)
+		}
+		if !found {
+			fmt.Fprintf(os.Stderr, "host %q not found\n", name)
+			os.Exit(1)
+		}
+		cfg.Hosts = filtered
+		if err := config.Save(cfgPath, cfg); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to save config: %s\n", err)
+			os.Exit(1)
+		}
+		fmt.Printf("removed host %q\n", name)
+
+	default:
+		fmt.Fprintf(os.Stderr, "unknown hosts command: %s\n", args[0])
+		os.Exit(1)
+	}
+}
+
+// parseHostURL extracts a Host from a URL, pulling the token from the query string.
+func parseHostURL(rawURL string) (client.Host, error) {
+	u, err := url.Parse(rawURL)
+	if err != nil {
+		return client.Host{}, err
+	}
+
+	token := u.Query().Get("token")
+	// Remove token from URL for storage.
+	q := u.Query()
+	q.Del("token")
+	u.RawQuery = q.Encode()
+
+	baseURL := fmt.Sprintf("%s://%s", u.Scheme, u.Host)
+	name := u.Hostname()
+
+	return client.Host{
+		Name:  name,
+		URL:   baseURL,
+		Token: token,
+	}, nil
+}
+

package/tui/tests/integration_test.go

@@ -0,0 +1,283 @@
+// Package tests contains integration tests that connect to a real remux server.
+//
+// These tests require:
+// - Node.js (for running the remux server)
+// - The remux repo built at ../remux (adjacent to this repo)
+//
+// Run with: go test -tags=integration ./tests/ -v
+package tests
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/gorilla/websocket"
+	"github.com/yaoshenwang/remux-tui/internal/client"
+)
+
+func findFreePort() (int, error) {
+	l, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		return 0, err
+	}
+	port := l.Addr().(*net.TCPAddr).Port
+	l.Close()
+	return port, nil
+}
+
+func findRemuxDir() string {
+	// Look for the remux repo relative to this test file.
+	candidates := []string{
+		filepath.Join("..", "..", "remux"),         // C:\work\remux from C:\work\remux-tui\tests
+		filepath.Join("..", "..", "..", "remux"),
+	}
+	for _, c := range candidates {
+		abs, _ := filepath.Abs(c)
+		if _, err := os.Stat(filepath.Join(abs, "package.json")); err == nil {
+			return abs
+		}
+	}
+	return ""
+}
+
+// startRemuxServer builds and starts a remux server on a free port.
+// Returns the port, token, password, and a cleanup function.
+func startRemuxServer(t *testing.T) (port int, token, password string, cleanup func()) {
+	t.Helper()
+
+	remuxDir := findRemuxDir()
+	if remuxDir == "" {
+		t.Skip("remux repo not found at ../remux — skipping integration test")
+	}
+
+	// Check if remux is built.
+	distCli := filepath.Join(remuxDir, "dist", "backend", "cli.js")
+	if _, err := os.Stat(distCli); os.IsNotExist(err) {
+		// Try to build it.
+		t.Log("building remux...")
+		buildCmd := exec.Command("npm", "run", "build")
+		buildCmd.Dir = remuxDir
+		if out, err := buildCmd.CombinedOutput(); err != nil {
+			t.Skipf("failed to build remux: %s\n%s", err, out)
+		}
+	}
+
+	port, err := findFreePort()
+	if err != nil {
+		t.Fatalf("find free port: %v", err)
+	}
+
+	// Start remux server with no tunnel, explicit password.
+	password = "test-password-123"
+	cmd := exec.Command("node", distCli,
+		"--port", fmt.Sprintf("%d", port),
+		"--password", password,
+		"--no-tunnel",
+		"--session", "test-session",
+	)
+	cmd.Dir = remuxDir
+	cmd.Env = append(os.Environ(), "VITE_DEV_MODE=1")
+
+	// Capture stdout to extract token.
+	stdout := &strings.Builder{}
+	cmd.Stdout = stdout
+	cmd.Stderr = stdout
+
+	if err := cmd.Start(); err != nil {
+		t.Fatalf("start remux: %v", err)
+	}
+
+	// Wait for server to be ready.
+	deadline := time.Now().Add(15 * time.Second)
+	for time.Now().Before(deadline) {
+		resp, err := http.Get(fmt.Sprintf("http://127.0.0.1:%d/api/config", port))
+		if err == nil {
+			resp.Body.Close()
+			break
+		}
+		time.Sleep(200 * time.Millisecond)
+	}
+
+	// Extract token from /api/config.
+	resp, err := http.Get(fmt.Sprintf("http://127.0.0.1:%d/api/config", port))
+	if err != nil {
+		cmd.Process.Kill()
+		t.Fatalf("server not ready: %v\nOutput: %s", err, stdout.String())
+	}
+	defer resp.Body.Close()
+
+	var configResp struct {
+		Token string `json:"token"`
+	}
+
+	// The token is in the URL printed by the server, or we can get it from
+	// the server output. For a cleaner approach, let's parse the stdout.
+	output := stdout.String()
+
+	// Token is in the URL as ?token=<value>
+	for _, line := range strings.Split(output, "\n") {
+		if idx := strings.Index(line, "token="); idx >= 0 {
+			tokenPart := line[idx+6:]
+			// Token ends at & or end of line or space
+			end := len(tokenPart)
+			for i, c := range tokenPart {
+				if c == '&' || c == ' ' || c == '\n' || c == '\r' {
+					end = i
+					break
+				}
+			}
+			configResp.Token = tokenPart[:end]
+			break
+		}
+	}
+
+	if configResp.Token == "" {
+		// Fall back: try connecting without token to see error.
+		cmd.Process.Kill()
+		t.Fatalf("could not extract token from server output:\n%s", output)
+	}
+
+	token = configResp.Token
+	t.Logf("remux server started on port %d (token=%s...)", port, token[:8])
+
+	cleanup = func() {
+		if runtime.GOOS == "windows" {
+			exec.Command("taskkill", "/pid", fmt.Sprintf("%d", cmd.Process.Pid), "/t", "/f").Run()
+		} else {
+			cmd.Process.Kill()
+		}
+		cmd.Wait()
+	}
+
+	return port, token, password, cleanup
+}
+
+func TestIntegrationConnectToRemux(t *testing.T) {
+	if os.Getenv("REMUX_INTEGRATION") != "1" {
+		t.Skip("set REMUX_INTEGRATION=1 to run integration tests")
+	}
+
+	port, token, password, cleanup := startRemuxServer(t)
+	defer cleanup()
+
+	// Test 1: Connect via our client library.
+	host := client.Host{
+		Name:  "test",
+		URL:   fmt.Sprintf("http://127.0.0.1:%d", port),
+		Token: token,
+	}
+
+	conn := client.NewConnection(host, password)
+
+	var gotTerminalData bool
+	doneCh := make(chan struct{}, 2)
+
+	conn.OnTerminalData(func(data []byte) {
+		if !gotTerminalData {
+			gotTerminalData = true
+			t.Logf("received terminal data: %d bytes", len(data))
+			doneCh <- struct{}{}
+		}
+	})
+
+	conn.OnStateUpdate(func(state *client.StateSnapshot) {
+		t.Logf("received state: %d sessions", len(state.Sessions))
+		doneCh <- struct{}{}
+	})
+
+	conn.OnError(func(err error) {
+		t.Logf("connection error: %v", err)
+	})
+
+	if err := conn.Connect(); err != nil {
+		t.Fatalf("connect failed: %v", err)
+	}
+	defer conn.Close()
+
+	// Wait for either terminal data or state update.
+	select {
+	case <-doneCh:
+		t.Log("received first message from server")
+	case <-time.After(10 * time.Second):
+		t.Fatal("timeout waiting for server messages")
+	}
+
+	// Test 2: Send input and verify it doesn't error.
+	if err := conn.SendInput("echo hello\r"); err != nil {
+		t.Fatalf("send input failed: %v", err)
+	}
+
+	// Test 3: Send resize.
+	if err := conn.SendResize(120, 40); err != nil {
+		t.Fatalf("send resize failed: %v", err)
+	}
+
+	t.Log("integration test passed")
+}
+
+func TestIntegrationRawWebSocket(t *testing.T) {
+	if os.Getenv("REMUX_INTEGRATION") != "1" {
+		t.Skip("set REMUX_INTEGRATION=1 to run integration tests")
+	}
+
+	port, token, password, cleanup := startRemuxServer(t)
+	defer cleanup()
+
+	// Test raw WebSocket protocol directly.
+	controlURL := fmt.Sprintf("ws://127.0.0.1:%d/ws/control", port)
+	controlConn, _, err := websocket.DefaultDialer.Dial(controlURL, nil)
+	if err != nil {
+		t.Fatalf("dial control: %v", err)
+	}
+	defer controlConn.Close()
+
+	// Send auth.
+	authMsg := map[string]interface{}{
+		"type":     "auth",
+		"token":    token,
+		"password": password,
+	}
+	if err := controlConn.WriteJSON(authMsg); err != nil {
+		t.Fatalf("send auth: %v", err)
+	}
+
+	// Read auth response.
+	_, raw, err := controlConn.ReadMessage()
+	if err != nil {
+		t.Fatalf("read auth response: %v", err)
+	}
+
+	var resp map[string]interface{}
+	json.Unmarshal(raw, &resp)
+
+	if resp["type"] != "auth_ok" {
+		t.Fatalf("expected auth_ok, got: %v", resp)
+	}
+
+	clientID, ok := resp["clientId"].(string)
+	if !ok || clientID == "" {
+		t.Fatal("missing clientId in auth_ok")
+	}
+
+	t.Logf("authenticated with clientId=%s", clientID)
+
+	// Read a few more messages to see state/session_picker.
+	for i := 0; i < 5; i++ {
+		controlConn.SetReadDeadline(time.Now().Add(5 * time.Second))
+		_, raw, err := controlConn.ReadMessage()
+		if err != nil {
+			break
+		}
+		json.Unmarshal(raw, &resp)
+		t.Logf("received: type=%v", resp["type"])
+	}
+}