diff --git a/BACKLOG.md b/BACKLOG.md index b7e9b3f3..3055a52d 100644 --- a/BACKLOG.md +++ b/BACKLOG.md @@ -59,3 +59,4 @@ This is the git-tracked backlog for this workstream. Keep local next steps here; - [ ] Terminal frame-timing probe: short-circuit sampling on isEnabled() before any per-frame work; gate the web-vitals dynamic import on the perf flag (Wave-5 review LOWs). - [ ] Window-strip arrow-key navigation dispatches live select_window per keypress (valid ARIA auto-activation but can burst commands) — consider focus-only + Enter-to-activate (Wave-5 review INFO). - [ ] Commit a refreshed docs-site screenshot of the Command Center (acceptance checklist residual NOT-MET). +- [ ] Wave-6 batch-2 review LOWs: prune command-mark seenRef on marker disposal; 4px selection-handle offset; double-tap vs touch-scroll listener ordering; thumbnail "live capture" wording; scroll-freeze anchor drift at 10k scrollback saturation; heuristic ❯/› prompt-glyph tuning; stuck suppressClickRef edge (touch tap then BT-keyboard click). diff --git a/CHANGELOG.md b/CHANGELOG.md index 85233e3d..7d181c5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.1] - 2026-07-20 + +### Added + +- A full-bleed mobile tmux workspace with a compact status row and window strip, + one configurable terminal rail, sticky Ctrl modes, per-host prefix keys, + swipe-up bindings, touch cursor drag, momentum scrollback, and 11–18 px pinch + font sizing. +- Attach-everywhere pane navigation, zero-tap cold-open restore of the last + attached pane, 30-minute warm terminal switching, and **New window here** + launches prefilled from the current host, tmux session, directory, and provider. +- Desktop-attached terminal letterboxing, stable grid behavior across the mobile + keyboard transition, window swipes and spatial pane navigation, scroll-freeze + reading, exact-range history copy, and command-mark navigation. +- Cross-viewport journeys for cold restore, window retargeting and keyboard + activation, letterboxing, sticky Ctrl, per-host prefix bytes, and window-here + launches, plus an owner-run Galaxy S25 Ultra/Brave device checklist. + +### Changed + +- Replaced the Command Center's overlapping mobile key strips with a single + Minimal, Expanded, or JSON-defined rail whose input follows the terminal's + control/read-only guard. +- Made launch and tmux-open API responses emit canonical `/` Command Center URLs + while retaining `/tmux` as a query-preserving compatibility redirect. +- Made client frame timing and Web Vitals probes opt-in through `?perf=1` or + `window.__sessionsPerf`, avoiding sampler and dynamic-import work by default. +- Changed window-strip arrow, Home, and End keys to move focus only; Enter or + Space now activates the focused window. + +### Fixed + +- Activated captured touch rail taps on pointer-up, kept the Playwright Next + dev-tools overlay from intercepting taps, and carried `hostId` through the + persistent terminal descriptor so custom per-host prefixes reach the terminal. +- Kept the terminal attention card above the key rail, prevented letterbox resize + feedback loops, preserved the rail-height inset across responsive mounts, and + released orphaned terminal sizes during crash cleanup. +- Preserved scroll position during incoming output, reconciled command results + after reconnect, and prevented one-shot Ctrl from leaking into subsequent IME + text. + ## [0.4.0] - 2026-07-20 ### Added @@ -135,7 +177,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - agentd daemon for tmux session management - Alerts and notifications (browser, audio, toasts, OpenClaw) -[Unreleased]: https://github.com/cvsloane/agent-commander/compare/v0.4.0...HEAD +[Unreleased]: https://github.com/cvsloane/agent-commander/compare/v0.4.1...HEAD +[0.4.1]: https://github.com/cvsloane/agent-commander/compare/v0.4.0...v0.4.1 [0.4.0]: https://github.com/cvsloane/agent-commander/compare/v0.3.0...v0.4.0 [0.3.0]: https://github.com/cvsloane/agent-commander/compare/v0.2.1...v0.3.0 [0.2.1]: https://github.com/cvsloane/agent-commander/compare/v0.2.0...v0.2.1 diff --git a/agents/agentd/cmd/agentd/main.go b/agents/agentd/cmd/agentd/main.go index 38605cd3..eb99dae6 100644 --- a/agents/agentd/cmd/agentd/main.go +++ b/agents/agentd/cmd/agentd/main.go @@ -5397,6 +5397,7 @@ func (a *Agent) handleTerminalAttach(payload json.RawMessage) { Cols: req.Cols, Rows: req.Rows, ResumeToken: req.ResumeToken, + Letterbox: req.Letterbox, }) if err != nil { log.Printf("Failed to attach terminal: %v", err) diff --git a/agents/agentd/cmd/agentd/main_tmux_test.go b/agents/agentd/cmd/agentd/main_tmux_test.go index a15ea706..222874b2 100644 --- a/agents/agentd/cmd/agentd/main_tmux_test.go +++ b/agents/agentd/cmd/agentd/main_tmux_test.go @@ -66,7 +66,7 @@ func TestSyncPanesIncludesExtendedTmuxMetadata(t *testing.T) { func TestBuildTmuxTopologySortsSessionsWindowsAndPanes(t *testing.T) { panes := []tmux.Pane{ - {SessionName: "zeta", SessionAttached: true, WindowIndex: 2, WindowName: "later", PaneID: "%9", PaneIndex: 1}, + {SessionName: "zeta", SessionAttached: true, SessionAttachedClients: 2, WindowIndex: 2, WindowName: "later", PaneID: "%9", PaneIndex: 1}, {SessionName: "alpha", WindowIndex: 1, WindowName: "main", WindowActive: true, WindowZoomed: true, WindowLayout: "tiled", WindowBell: true, PaneID: "%2", PaneIndex: 1, PaneWidth: 90, PaneHeight: 30, PaneTitle: "second", CurrentCommand: "bash", CurrentPath: "/tmp/two"}, {SessionName: "alpha", WindowIndex: 1, WindowName: "main", WindowActive: true, WindowZoomed: true, WindowLayout: "tiled", WindowBell: true, PaneID: "%1", PaneIndex: 0, PaneActive: true, PaneWidth: 100, PaneHeight: 30, PaneTitle: "first", CurrentCommand: "codex", CurrentPath: "/tmp/one"}, {SessionName: "alpha", WindowIndex: 0, WindowName: "early", PaneID: "%0", PaneIndex: 0}, @@ -93,6 +93,9 @@ func TestBuildTmuxTopologySortsSessionsWindowsAndPanes(t *testing.T) { if !mainWindow.Panes[0].Active || mainWindow.Panes[0].Width != 100 || mainWindow.Panes[0].CurrentCommand != "codex" { t.Fatalf("pane topology=%+v", mainWindow.Panes[0]) } + if got.TmuxSessions[1].AttachedClients != 2 { + t.Fatalf("zeta attached clients=%d, want 2", got.TmuxSessions[1].AttachedClients) + } } func TestQueueTmuxTopologyDebouncesHooksAndPollsOnlyOnDrift(t *testing.T) { diff --git a/agents/agentd/cmd/agentd/tmux_topology.go b/agents/agentd/cmd/agentd/tmux_topology.go index 332cb4e8..a88f8ca3 100644 --- a/agents/agentd/cmd/agentd/tmux_topology.go +++ b/agents/agentd/cmd/agentd/tmux_topology.go @@ -30,6 +30,9 @@ func buildTmuxTopology(reason string, panes []tmux.Pane) protocol.TmuxTopologyPa sessionsByName[pane.SessionName] = session } session.Attached = session.Attached || pane.SessionAttached + if pane.SessionAttachedClients > session.AttachedClients { + session.AttachedClients = pane.SessionAttachedClients + } key := windowKey{sessionName: pane.SessionName, windowIndex: pane.WindowIndex} windowIndex, exists := windowsByKey[key] diff --git a/agents/agentd/internal/protocol/terminal.go b/agents/agentd/internal/protocol/terminal.go index 51970a2a..9f9387d7 100644 --- a/agents/agentd/internal/protocol/terminal.go +++ b/agents/agentd/internal/protocol/terminal.go @@ -7,6 +7,7 @@ type TerminalAttachPayload struct { Cols int `json:"cols,omitempty"` Rows int `json:"rows,omitempty"` ResumeToken string `json:"resume_token,omitempty"` + Letterbox bool `json:"letterbox,omitempty"` } type TerminalInputPayload struct { diff --git a/agents/agentd/internal/protocol/tmux.go b/agents/agentd/internal/protocol/tmux.go index 50341b47..ee4cb81d 100644 --- a/agents/agentd/internal/protocol/tmux.go +++ b/agents/agentd/internal/protocol/tmux.go @@ -6,9 +6,10 @@ type TmuxTopologyPayload struct { } type TmuxTopologySession struct { - SessionName string `json:"session_name"` - Attached bool `json:"attached"` - Windows []TmuxTopologyWindow `json:"windows"` + SessionName string `json:"session_name"` + Attached bool `json:"attached"` + AttachedClients int `json:"attached_clients,omitempty"` + Windows []TmuxTopologyWindow `json:"windows"` } type TmuxTopologyWindow struct { diff --git a/agents/agentd/internal/providers/launch.go b/agents/agentd/internal/providers/launch.go index 3e52fde3..1d45101f 100644 --- a/agents/agentd/internal/providers/launch.go +++ b/agents/agentd/internal/providers/launch.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "os/exec" + "path/filepath" "regexp" "sort" "strings" @@ -16,8 +17,9 @@ const promptPlaceholder = "{{prompt}}" var environmentNamePattern = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`) type LaunchSpec struct { - Argv []string - Env map[string]string + Argv []string + Env map[string]string + Preamble []string } type LaunchTemplates struct { @@ -29,6 +31,10 @@ func NewLaunchTemplates(cfg *config.Config) *LaunchTemplates { if cfg != nil && strings.TrimSpace(cfg.Providers.Codex.ExecPath) != "" { codexPath = cfg.Providers.Codex.ExecPath } + shellPath := "/bin/bash" + if cfg != nil && strings.TrimSpace(cfg.Spawn.DefaultShell) != "" { + shellPath = cfg.Spawn.DefaultShell + } templates := map[string]config.ProviderLaunchTemplate{ "claude_code": { Argv: []string{"claude"}, @@ -43,7 +49,7 @@ func NewLaunchTemplates(cfg *config.Config) *LaunchTemplates { "aider": {Argv: []string{"aider"}}, "cursor": {Argv: []string{"cursor"}}, "continue": {Argv: []string{"continue"}}, - "shell": {}, + "shell": {Argv: []string{shellPath, "-i"}}, } if cfg != nil { for provider, override := range cfg.Providers.LaunchTemplates { @@ -58,7 +64,8 @@ func NewLaunchTemplates(cfg *config.Config) *LaunchTemplates { } func (t *LaunchTemplates) Interactive(provider string, flags []string, requestEnv map[string]string) (LaunchSpec, error) { - template, ok := t.templates[normalizeLaunchProvider(provider)] + normalizedProvider := normalizeLaunchProvider(provider) + template, ok := t.templates[normalizedProvider] if !ok { return LaunchSpec{}, fmt.Errorf("unsupported provider %q", provider) } @@ -66,7 +73,27 @@ func (t *LaunchTemplates) Interactive(provider string, flags []string, requestEn if len(argv) > 0 { argv = append(argv, flags...) } - return LaunchSpec{Argv: argv, Env: mergeEnv(template.Env, requestEnv)}, nil + env := mergeEnv(template.Env, requestEnv) + var preamble []string + if normalizedProvider == "shell" && len(argv) > 0 && filepath.Base(argv[0]) == "bash" { + env = mergeEnv(env, bashCommandMarkEnv(env)) + preamble = []string{"tmux set-option -p allow-passthrough on >/dev/null 2>&1 || true"} + } + return LaunchSpec{Argv: argv, Env: env, Preamble: preamble}, nil +} + +func bashCommandMarkEnv(existing map[string]string) map[string]string { + const passthroughStart = "\x1bPtmux;\x1b" + const passthroughEnd = "\x1b\\" + promptCommand := "__ac_status=$?; printf '\\033Ptmux;\\033\\033]133;D;%s\\007\\033\\\\' \"$__ac_status\"; printf '\\033Ptmux;\\033\\033]133;A\\007\\033\\\\'" + if previous := strings.TrimSpace(existing["PROMPT_COMMAND"]); previous != "" { + promptCommand += "; " + previous + } + return map[string]string{ + "AC_COMMAND_MARKS": "osc133", + "PROMPT_COMMAND": promptCommand, + "PS0": passthroughStart + "\x1b]133;C\a" + passthroughEnd, + } } func (t *LaunchTemplates) Headless(provider, prompt string, requestEnv map[string]string) (LaunchSpec, error) { @@ -99,7 +126,12 @@ func (s LaunchSpec) ShellCommand() (string, error) { } sort.Strings(keys) - parts := make([]string, 0, 2) + parts := make([]string, 0, len(s.Preamble)+2) + for _, command := range s.Preamble { + if strings.TrimSpace(command) != "" { + parts = append(parts, "("+command+")") + } + } if len(keys) > 0 { exports := make([]string, 0, len(keys)) for _, key := range keys { diff --git a/agents/agentd/internal/providers/launch_test.go b/agents/agentd/internal/providers/launch_test.go index 29fae405..668be15a 100644 --- a/agents/agentd/internal/providers/launch_test.go +++ b/agents/agentd/internal/providers/launch_test.go @@ -65,3 +65,44 @@ func TestLaunchTemplatesAreConfigOverridableAndSupportHeadless(t *testing.T) { t.Fatalf("headless argv=%q", got) } } + +func TestOwnedBashShellLaunchEnablesOSC133Passthrough(t *testing.T) { + templates := NewLaunchTemplates(&config.Config{ + Spawn: config.SpawnConfig{DefaultShell: "/bin/bash"}, + }) + spec, err := templates.Interactive("shell", nil, map[string]string{ + "PROMPT_COMMAND": "history -a", + }) + if err != nil { + t.Fatal(err) + } + if got := strings.Join(spec.Argv, "|"); got != "/bin/bash|-i" { + t.Fatalf("shell argv=%q", got) + } + if spec.Env["AC_COMMAND_MARKS"] != "osc133" { + t.Fatalf("command mark env=%v", spec.Env) + } + if !strings.Contains(spec.Env["PROMPT_COMMAND"], "]133;A") || !strings.Contains(spec.Env["PROMPT_COMMAND"], "history -a") { + t.Fatalf("prompt command=%q", spec.Env["PROMPT_COMMAND"]) + } + command, err := spec.ShellCommand() + if err != nil { + t.Fatal(err) + } + if !strings.Contains(command, "set-option -p allow-passthrough on") { + t.Fatalf("shell command did not enable tmux passthrough: %q", command) + } +} + +func TestCustomNonBashShellDoesNotInjectBashCommandMarks(t *testing.T) { + templates := NewLaunchTemplates(&config.Config{ + Spawn: config.SpawnConfig{DefaultShell: "/bin/zsh"}, + }) + spec, err := templates.Interactive("shell", nil, nil) + if err != nil { + t.Fatal(err) + } + if _, ok := spec.Env["AC_COMMAND_MARKS"]; ok || len(spec.Preamble) != 0 { + t.Fatalf("non-bash shell received bash integration: %+v", spec) + } +} diff --git a/agents/agentd/internal/tmux/pty_bridge_test.go b/agents/agentd/internal/tmux/pty_bridge_test.go index e91386eb..fdfb1328 100644 --- a/agents/agentd/internal/tmux/pty_bridge_test.go +++ b/agents/agentd/internal/tmux/pty_bridge_test.go @@ -4,6 +4,7 @@ import ( "encoding/base64" "io" "reflect" + "strings" "sync" "testing" "time" @@ -43,6 +44,75 @@ func TestPtyBridgeCreatesGroupedReadOnlyViewerAtRequestedSize(t *testing.T) { } } +func TestViewerPTYBridgePinsAndReleasesLetterboxedWindow(t *testing.T) { + runner := newFakeTmuxRunner() + runner.outputs["display-message -p -t %7 #{session_name}\t#{window_index}\t#{pane_index}"] = []byte("agents\t2\t1\n") + + bridge, err := newViewerPTYBridge(runner, viewerPTYOptions{ + ChannelID: "channel-1", + PaneID: "%7", + Cols: 160, + Rows: 50, + Letterbox: true, + ResumeToken: "resume-1", + }) + if err != nil { + t.Fatalf("newViewerPTYBridge: %v", err) + } + if !runner.hasRun([]string{"set-option", "-w", "-t", "ac-view-channel-1:2", "window-size", "manual"}) { + t.Fatal("letterboxed window was not pinned to manual sizing") + } + if !runner.hasRun([]string{"resize-window", "-t", "ac-view-channel-1:2", "-x", "160", "-y", "50"}) { + t.Fatal("letterboxed window was not resized to the requested grid") + } + + bridge.close(false) + if !runner.hasRun([]string{"set-option", "-w", "-t", "ac-view-channel-1:2", "window-size", "latest"}) { + t.Fatal("letterboxed window did not release latest sizing on close") + } +} + +func TestViewerPTYBridgeLetterboxUsesPrivateTmuxSocket(t *testing.T) { + client, _ := newPrivateTmuxClient(t) + panes, err := client.ListPanes() + if err != nil { + t.Fatalf("list private panes: %v", err) + } + if len(panes) != 1 { + t.Fatalf("private pane count=%d, want 1", len(panes)) + } + runner := newExecTmuxRunner(client) + bridge, err := newViewerPTYBridge(runner, viewerPTYOptions{ + ChannelID: "letterbox-integration", + PaneID: panes[0].PaneID, + Cols: 120, + Rows: 40, + Letterbox: true, + ResumeToken: "resume-integration", + }) + if err != nil { + t.Fatalf("newViewerPTYBridge on private socket: %v", err) + } + + if output, err := runner.Output("show-options", "-w", "-v", "-t", "hook-test:0", "window-size"); err != nil { + t.Fatalf("show pinned window-size: %v", err) + } else if got := strings.TrimSpace(string(output)); got != "manual" { + t.Fatalf("pinned window-size=%q, want manual", got) + } + if output, err := runner.Output("display-message", "-p", "-t", "hook-test:0", "#{window_width}x#{window_height}"); err != nil { + t.Fatalf("show pinned dimensions: %v", err) + } else if got := strings.TrimSpace(string(output)); got != "120x40" { + t.Fatalf("pinned dimensions=%q, want 120x40", got) + } + + bridge.close(false) + if output, err := runner.Output("show-options", "-w", "-v", "-t", "hook-test:0", "window-size"); err != nil { + t.Fatalf("show released window-size: %v", err) + } else if got := strings.TrimSpace(string(output)); got != "latest" { + t.Fatalf("released window-size=%q, want latest", got) + } +} + func TestViewerSessionNameAvoidsSanitizationCollisions(t *testing.T) { first := viewerSessionName("channel/one") second := viewerSessionName("channel:one") diff --git a/agents/agentd/internal/tmux/terminal.go b/agents/agentd/internal/tmux/terminal.go index 4793213a..b4b61eb3 100644 --- a/agents/agentd/internal/tmux/terminal.go +++ b/agents/agentd/internal/tmux/terminal.go @@ -81,6 +81,7 @@ type terminalViewer struct { sessionID string resumeToken string readOnly bool + letterbox bool bridge *viewerPTYBridge detachedAt time.Time stale bool @@ -93,6 +94,7 @@ type AttachOptions struct { Cols int Rows int ResumeToken string + Letterbox bool } // AttachResult describes the selected terminal transport and viewer role. @@ -234,6 +236,13 @@ func (m *TerminalManager) sweepOrphanViewerSessions() { if owned { continue } + // A hard crash can leave a letterbox window-size pin on the windows of + // this orphan. The windows are SHARED with the origin session (grouped + // sessions), so release the pin before reaping or the origin stays + // frozen at the crashed viewer's dimensions. + if err := m.runner.Run("set-option", "-w", "-t", name+":", "window-size", "latest"); err != nil { + log.Printf("Failed to release window-size on orphan viewer session %s: %v", name, err) + } if err := m.runner.Run("kill-session", "-t", name); err != nil { log.Printf("Failed to reap orphan terminal viewer session %s: %v", name, err) } @@ -389,6 +398,7 @@ func (m *TerminalManager) attachViewerPTY(channelID, paneID string, opts AttachO ReadOnly: readonly, Cols: uint16(opts.Cols), Rows: uint16(opts.Rows), + Letterbox: opts.Letterbox, ResumeToken: resumeToken, InitialOutput: initialOutput, OnOutput: m.onOutput, @@ -411,6 +421,7 @@ func (m *TerminalManager) attachViewerPTY(channelID, paneID string, opts AttachO viewer.sessionID = opts.SessionID viewer.resumeToken = resumeToken viewer.readOnly = readonly + viewer.letterbox = opts.Letterbox viewer.bridge = bridge viewer.detachedAt = time.Time{} viewer.stale = false @@ -593,9 +604,16 @@ func (m *TerminalManager) Detach(channelID string) (string, bool) { viewer.detachedAt = time.Now() viewer.stale = false viewer.staleAt = time.Time{} + bridge := viewer.bridge + if viewer.letterbox { + viewer.bridge = nil + } m.mu.Unlock() - viewer.bridge.DetachChannel(channelID) + bridge.DetachChannel(channelID) + if viewer.letterbox { + bridge.close(false) + } if m.onStatus != nil { m.onStatus(channelID, "detached", "") } @@ -903,6 +921,7 @@ func (m *TerminalManager) replaceViewerBridge(viewer *terminalViewer, readonly b ReadOnly: readonly, Cols: size.Cols, Rows: size.Rows, + Letterbox: viewer.letterbox, ResumeToken: viewer.resumeToken, OnOutput: m.onOutput, OnStatus: m.onStatus, diff --git a/agents/agentd/internal/tmux/tmux.go b/agents/agentd/internal/tmux/tmux.go index 06e055d9..41814243 100644 --- a/agents/agentd/internal/tmux/tmux.go +++ b/agents/agentd/internal/tmux/tmux.go @@ -14,27 +14,28 @@ import ( ) type Pane struct { - PaneID string - PanePID int - SessionName string - WindowName string - WindowIndex int - PaneIndex int - CurrentPath string - CurrentCommand string - PaneTitle string - ProviderOverride string - SessionID string - ParentSessionID string - PaneActive bool - WindowActive bool - WindowZoomed bool - WindowLayout string - PaneWidth int - PaneHeight int - WindowBell bool - WindowActivity bool - SessionAttached bool + PaneID string + PanePID int + SessionName string + WindowName string + WindowIndex int + PaneIndex int + CurrentPath string + CurrentCommand string + PaneTitle string + ProviderOverride string + SessionID string + ParentSessionID string + PaneActive bool + WindowActive bool + WindowZoomed bool + WindowLayout string + PaneWidth int + PaneHeight int + WindowBell bool + WindowActivity bool + SessionAttached bool + SessionAttachedClients int } type Client struct { @@ -144,6 +145,7 @@ func parsePaneLine(line string) (Pane, bool) { var attachedClients int fmt.Sscanf(fields[20], "%d", &attachedClients) pane.SessionAttached = attachedClients > 0 + pane.SessionAttachedClients = attachedClients } return pane, true } diff --git a/agents/agentd/internal/tmux/tmux_test.go b/agents/agentd/internal/tmux/tmux_test.go index 8c4b502b..ac9c6928 100644 --- a/agents/agentd/internal/tmux/tmux_test.go +++ b/agents/agentd/internal/tmux/tmux_test.go @@ -292,4 +292,7 @@ func TestParsePaneLineIncludesTopologyFields(t *testing.T) { if !pane.SessionAttached { t.Fatalf("session attached=%v, want true", pane.SessionAttached) } + if pane.SessionAttachedClients != 2 { + t.Fatalf("session attached clients=%d, want 2", pane.SessionAttachedClients) + } } diff --git a/agents/agentd/internal/tmux/viewer_pty.go b/agents/agentd/internal/tmux/viewer_pty.go index 7446c28b..a8882b2d 100644 --- a/agents/agentd/internal/tmux/viewer_pty.go +++ b/agents/agentd/internal/tmux/viewer_pty.go @@ -103,6 +103,7 @@ type viewerPTYOptions struct { ReadOnly bool Cols uint16 Rows uint16 + Letterbox bool ResumeToken string InitialOutput []byte BufferChunks int @@ -117,9 +118,11 @@ type viewerPTYBridge struct { paneID string sessionName string viewSession string + windowTarget string resumeToken string resumeOption string readonly bool + letterbox bool size TerminalSize process PTYProcess fanout *terminalFanout @@ -169,6 +172,27 @@ func newViewerPTYBridge(runner TmuxRunner, opts viewerPTYOptions) (*viewerPTYBri if err := runner.Run("select-pane", "-t", viewSession+":"+parts[1]+"."+parts[2]); err != nil { return nil, fmt.Errorf("select viewer pane: %w", err) } + windowTarget := viewSession + ":" + parts[1] + letterboxPinned := false + if opts.Letterbox { + if err := runner.Run("set-option", "-w", "-t", windowTarget, "window-size", "manual"); err != nil { + return nil, fmt.Errorf("pin viewer window sizing: %w", err) + } + letterboxPinned = true + if err := runner.Run( + "resize-window", + "-t", windowTarget, + "-x", fmt.Sprintf("%d", opts.Cols), + "-y", fmt.Sprintf("%d", opts.Rows), + ); err != nil { + return nil, fmt.Errorf("size letterboxed viewer window: %w", err) + } + } + defer func() { + if cleanupGroup && letterboxPinned { + _ = runner.Run("set-option", "-w", "-t", windowTarget, "window-size", "latest") + } + }() resumeOption := resumeOptionName(opts.ResumeToken) if err := runner.Run("set-option", "-p", "-t", opts.PaneID, resumeOption, opts.ResumeToken); err != nil { @@ -206,9 +230,11 @@ func newViewerPTYBridge(runner TmuxRunner, opts viewerPTYOptions) (*viewerPTYBri paneID: opts.PaneID, sessionName: parts[0], viewSession: viewSession, + windowTarget: windowTarget, resumeToken: opts.ResumeToken, resumeOption: resumeOption, readonly: opts.ReadOnly, + letterbox: opts.Letterbox, size: size, process: process, fanout: fanout, @@ -268,6 +294,9 @@ func (b *viewerPTYBridge) close(removeResumeToken bool) { _ = b.process.Kill() } b.mu.Unlock() + if b.letterbox { + _ = b.runner.Run("set-option", "-w", "-t", b.windowTarget, "window-size", "latest") + } _ = b.runner.Run("kill-session", "-t", b.viewSession) if b.fanout != nil { b.fanout.Close() diff --git a/agents/agentd/internal/ws/protocol_fixtures_test.go b/agents/agentd/internal/ws/protocol_fixtures_test.go index b55cc6b2..063881f0 100644 --- a/agents/agentd/internal/ws/protocol_fixtures_test.go +++ b/agents/agentd/internal/ws/protocol_fixtures_test.go @@ -6,6 +6,7 @@ import ( "path/filepath" "reflect" "sort" + "strings" "testing" "github.com/agent-command/agentd/internal/protocol" @@ -28,6 +29,9 @@ func TestProtocolFixtureMatrixRoundTripsProductionTypes(t *testing.T) { seenTypes := make(map[string]bool) seenCommands := make(map[string]bool) for _, path := range paths { + if strings.HasPrefix(filepath.Base(path), "ui-") { + continue + } path := path t.Run(filepath.Base(path), func(t *testing.T) { data, err := os.ReadFile(path) diff --git a/apps/dashboard/src/app/(dashboard)/tmux/TmuxPageClient.tsx b/apps/dashboard/src/app/(dashboard)/tmux/TmuxPageClient.tsx index 7e787944..2607db45 100644 --- a/apps/dashboard/src/app/(dashboard)/tmux/TmuxPageClient.tsx +++ b/apps/dashboard/src/app/(dashboard)/tmux/TmuxPageClient.tsx @@ -32,6 +32,7 @@ export default function TmuxPageClient() { const { setSessionIdle, isSessionIdlePending } = useSessionIdle(); const { terminateSession, isTerminating } = useTerminateSession(); const [workbenchViewMode, setWorkbenchViewMode] = useState<'console' | 'terminal'>('terminal'); + const [mobileTerminalAttached, setMobileTerminalAttached] = useState(false); const [sendToDialogOpen, setSendToDialogOpen] = useState(false); const [sendToTargetId, setSendToTargetId] = useState(undefined); const terminalModeRequested = searchParams.get('mode') === 'terminal'; @@ -48,6 +49,7 @@ export default function TmuxPageClient() { sessionsError, sessionsFetching, filteredSessions, + quickSwitchSessions, groups, allHostsSelected, partialHostFailureCount, @@ -173,13 +175,14 @@ export default function TmuxPageClient() { session={selectedSession} snapshot={snapshot} events={events} + onSelectTmuxSession={selectSession} onAssignGroup={handleAssignGroup} onSendToLinkedSession={handleSendToFromLinks} viewMode={workbenchViewMode} onViewModeChange={setWorkbenchViewMode} initialView="terminal" showDetails={!options?.mobileTerminalOnly} - terminalCardClassName={options?.mobileTerminalOnly ? 'h-[calc(100dvh-15rem)] min-h-[420px]' : undefined} + fullBleedMobileTerminal={Boolean(options?.mobileTerminalOnly && mobileTerminalAttached)} autoAttachTerminal={autoAttachRequested} terminalControllerRef={terminalControllerRef} /> @@ -206,8 +209,17 @@ export default function TmuxPageClient() { } return ( -
-
+
+
@@ -237,6 +249,7 @@ export default function TmuxPageClient() { onFilterChange={(nextFilter) => updateTmuxParams({ filter: nextFilter === 'all' ? null : nextFilter })} groups={groups} filteredSessions={filteredSessions} + quickSwitchSessions={quickSwitchSessions} sessionsLoading={sessionsLoading} sessionsError={sessionsError} sessionsFetching={sessionsFetching} @@ -259,6 +272,7 @@ export default function TmuxPageClient() { onLaunchChange={handleRefresh} terminalControllerRef={terminalControllerRef} initialMode={terminalModeRequested && selectedSessionId ? 'terminal' : 'roster'} + onAttachedModeChange={setMobileTerminalAttached} terminal={renderWorkbench({ mobileTerminalOnly: true })} emptyTerminal={emptyWorkbench} /> diff --git a/apps/dashboard/src/app/globals.css b/apps/dashboard/src/app/globals.css index 2fd9f07f..0505b410 100644 --- a/apps/dashboard/src/app/globals.css +++ b/apps/dashboard/src/app/globals.css @@ -96,6 +96,11 @@ max-height: 100%; } +.terminal-key-rail { + bottom: max(env(keyboard-inset-height, 0px), var(--keyboard-inset-height, 0px)); + padding-bottom: max(0.25rem, env(safe-area-inset-bottom)); +} + @keyframes command-center-mode-view-in { from { opacity: 0; @@ -111,6 +116,23 @@ animation: command-center-mode-view-in 180ms ease-out; } +@media (max-width: 1023px) { + html[data-mobile-terminal-attached='true'] body > div > header:first-child { + display: none; + } + + html[data-mobile-terminal-attached='true'] main { + min-height: 0; + overflow: hidden; + padding-bottom: 0; + } + + html[data-mobile-terminal-attached='true'] nav[aria-label='Primary mobile navigation'], + html[data-mobile-terminal-attached='true'] [data-terminal-toolbar] { + display: none; + } +} + @media (prefers-reduced-motion: reduce) { .command-center-mode-view { animation: none; @@ -126,10 +148,6 @@ } } -html[data-virtual-keyboard-open='true'] [data-terminal-key-controls] { - display: none; -} - /* Mobile text selection support */ @media (max-width: 767px) { /* Enable text selection on xterm screen */ diff --git a/apps/dashboard/src/components/TerminalView.tsx b/apps/dashboard/src/components/TerminalView.tsx index b86b7288..59857933 100644 --- a/apps/dashboard/src/components/TerminalView.tsx +++ b/apps/dashboard/src/components/TerminalView.tsx @@ -5,16 +5,26 @@ import { cn } from '@/lib/utils'; import type { SelectionPopupHandle } from '@/components/mobile'; import { TerminalSurface } from '@/components/terminal/TerminalSurface'; import { TerminalToolbar } from '@/components/terminal/TerminalToolbar'; +import { ScrollbackPager } from '@/components/terminal/ScrollbackPager'; import type { TerminalController, XSearchResult, XTerminal } from '@/components/terminal/types'; +import { + applyStickyCtrl, + reduceStickyCtrl, + type StickyCtrlEvent, + type StickyCtrlMode, +} from '@/components/mobile/stickyCtrl'; import { useIsMobile } from '@/hooks/useIsMobile'; import { useTerminalClipboard } from '@/hooks/useTerminalClipboard'; import { useTerminalConnection } from '@/hooks/useTerminalConnection'; import { useTerminalScrollAnchor } from '@/hooks/useTerminalScrollAnchor'; import { useTerminalTouchScroll } from '@/hooks/useTerminalTouchScroll'; +import { useTerminalCommandMarks } from '@/hooks/useTerminalCommandMarks'; import { useXtermTerminal } from '@/hooks/useXtermTerminal'; +import { useSettingsStore } from '@/stores/settings'; interface TerminalViewProps { sessionId: string; + hostId?: string; paneId?: string; className?: string; autoAttach?: boolean; @@ -29,6 +39,7 @@ export type { TerminalController } from '@/components/terminal/types'; export function TerminalView({ sessionId, + hostId, paneId, className, autoAttach = false, @@ -42,8 +53,9 @@ export function TerminalView({ const sendInputRef = useRef<(data: string) => void>(() => undefined); const controllerInstanceRef = useRef(null); const controllerReadOnlyRef = useRef(false); - const [hasCommittedSelection, setHasCommittedSelection] = useState(false); const [searchOpen, setSearchOpen] = useState(false); + const [historyOpen, setHistoryOpen] = useState(false); + const [stickyCtrlMode, setStickyCtrlMode] = useState('inactive'); const [searchQuery, setSearchQuery] = useState(''); const [searchResults, setSearchResults] = useState({ resultIndex: -1, @@ -53,12 +65,17 @@ export function TerminalView({ const selectionAnchorRef = useRef<{ x: number; y: number } | null>(null); const selectionPopupRef = useRef(null); const hasCommittedSelectionRef = useRef(false); + const stickyCtrlModeRef = useRef('inactive'); const isMobile = useIsMobile(); + const terminalFontSize = useSettingsStore((state) => state.terminalFontSize); + const setTerminalFontSize = useSettingsStore((state) => state.setTerminalFontSize); + const tmuxPrefix = useSettingsStore((state) => ( + hostId ? state.tmuxPrefixByHost[hostId] : undefined + )); const handleTerminalSelectionChange = useCallback((selection: string) => { selectionTextRef.current = selection; if (selection || !hasCommittedSelectionRef.current) return; hasCommittedSelectionRef.current = false; - setHasCommittedSelection(false); selectionPopupRef.current?.hide(); }, []); @@ -71,7 +88,33 @@ export function TerminalView({ setSearchResults(results); }, []); - const scrollAnchor = useTerminalScrollAnchor(); + const { + jumpToLiveButtonRef, + jumpToLiveLabelRef, + handleViewportScroll, + handleOutputStart, + handleOutputWritten: handleScrollOutputWritten, + jumpToLive, + } = useTerminalScrollAnchor(); + const { + bindTerminal: bindCommandMarks, + handleOutputWritten: handleCommandMarksOutput, + previousMark, + nextMark, + hasMarks, + currentMark, + } = useTerminalCommandMarks(); + const handleTerminalInstanceChange = useCallback((terminal: XTerminal | null) => { + bindCommandMarks(terminal); + onTerminalInstanceChange(terminal); + }, [bindCommandMarks, onTerminalInstanceChange]); + const handleTerminalOutputWritten = useCallback(( + terminal: XTerminal, + data: string | Uint8Array + ) => { + handleScrollOutputWritten(terminal); + handleCommandMarksOutput(terminal, data); + }, [handleCommandMarksOutput, handleScrollOutputWritten]); const { terminalRef, ensureTerminal, @@ -86,8 +129,8 @@ export function TerminalView({ wsRef, sendInputRef, onSelectionChange: handleTerminalSelectionChange, - onViewportScroll: scrollAnchor.handleViewportScroll, - onTerminalInstanceChange, + onViewportScroll: handleViewportScroll, + onTerminalInstanceChange: handleTerminalInstanceChange, onSearchRequested: openSearch, onSearchResultsChange: handleSearchResultsChange, }); @@ -131,7 +174,6 @@ export function TerminalView({ const hasSelection = selection.length > 0; if (hasCommittedSelectionRef.current !== hasSelection) { hasCommittedSelectionRef.current = hasSelection; - setHasCommittedSelection(hasSelection); } if (hasSelection) { selectionPopupRef.current?.showSelection(selection, selectionAnchorRef.current ?? undefined); @@ -160,16 +202,45 @@ export function TerminalView({ ensureTerminal, fitAndResize, getDimensions, - onOutputWritten: scrollAnchor.handleOutputWritten, + onOutputStart: handleOutputStart, + onOutputWritten: handleTerminalOutputWritten, }); controllerReadOnlyRef.current = readOnly; - useEffect(() => { - sendInputRef.current = sendInput; + const dispatchStickyCtrl = useCallback((event: StickyCtrlEvent) => { + const nextMode = reduceStickyCtrl(stickyCtrlModeRef.current, event); + stickyCtrlModeRef.current = nextMode; + setStickyCtrlMode(nextMode); + }, []); + const handlePhysicalInput = useCallback((data: string) => { + const result = applyStickyCtrl(stickyCtrlModeRef.current, data); + if (result.mode !== stickyCtrlModeRef.current) { + stickyCtrlModeRef.current = result.mode; + setStickyCtrlMode(result.mode); + } + sendInput(result.data); }, [sendInput]); + useEffect(() => { + sendInputRef.current = handlePhysicalInput; + }, [handlePhysicalInput]); + useEffect(() => { + if (status === 'connected') return; + stickyCtrlModeRef.current = 'inactive'; + setStickyCtrlMode('inactive'); + }, [status]); const touchScrollRef = useTerminalTouchScroll({ enabled: isMobile, termRef, terminalRef, + fontSize: terminalFontSize, + onFontSizeChange: setTerminalFontSize, + cursorEnabled: status === 'connected' && !readOnly, + onCursorInput: sendInput, + onHorizontalSwipe: (direction) => { + termRef.current?.dispatchEvent(new CustomEvent('terminal-window-swipe', { + bubbles: true, + detail: { direction, sessionId }, + })); + }, }); // Virtual keyboard handlers @@ -177,10 +248,6 @@ export function TerminalView({ sendInput(data); }, [sendInput]); - const handleVirtualInterrupt = useCallback(() => { - sendInput('\x03'); - }, [sendInput]); - const terminalClipboard = useTerminalClipboard({ terminalRef, sendInput, @@ -195,6 +262,7 @@ export function TerminalView({ useEffect(() => { if (!controllerRef && !onControllerChange) return; const controller: TerminalController = { + status, readOnly: controllerReadOnlyRef.current, attach: () => void connect(), detach: disconnect, @@ -232,14 +300,16 @@ export function TerminalView({ terminalRef, suspend, takeControl, + status, ]); useEffect(() => { const controller = controllerInstanceRef.current; - if (!controller || controller.readOnly === readOnly) return; + if (!controller || (controller.readOnly === readOnly && controller.status === status)) return; controller.readOnly = readOnly; + controller.status = status; onControllerChange?.(controller); - }, [onControllerChange, readOnly]); + }, [onControllerChange, readOnly, status]); useEffect(() => { const touchState = touchScrollRef.current; @@ -282,24 +352,35 @@ export function TerminalView({ isMobile={isMobile} status={status} readOnly={readOnly} - paneId={paneId} - hasSelection={hasCommittedSelection} selectionTextRef={selectionTextRef} selectionPopupRef={selectionPopupRef} onSelectionStart={handleSelectionStart} onSelectionCommit={handleSelectionCommit} onVirtualInput={handleVirtualInput} - onVirtualInterrupt={handleVirtualInterrupt} + stickyCtrlMode={stickyCtrlMode} + onStickyCtrlEvent={dispatchStickyCtrl} + onOpenHistory={() => setHistoryOpen(true)} + tmuxPrefix={tmuxPrefix} + onPreviousMark={previousMark} + onNextMark={nextMark} + hasCommandMarks={hasMarks} + currentCommandMark={currentMark} onCopySelection={terminalClipboard.copySelection} onCopyLastLines={terminalClipboard.copyLastLines} onCopyAll={terminalClipboard.copyAll} onPaste={terminalClipboard.paste} onClear={terminalClipboard.clear} onCopySelectionText={terminalClipboard.copyText} - jumpToLiveButtonRef={scrollAnchor.jumpToLiveButtonRef} - onJumpToLive={() => scrollAnchor.jumpToLive(terminalRef.current)} + jumpToLiveButtonRef={jumpToLiveButtonRef} + jumpToLiveLabelRef={jumpToLiveLabelRef} + onJumpToLive={() => jumpToLive(terminalRef.current)} search={searchControls} /> + setHistoryOpen(false)} + />
); } diff --git a/apps/dashboard/src/components/launch/MobileLaunchSheet.tsx b/apps/dashboard/src/components/launch/MobileLaunchSheet.tsx index 97014a1a..bf350e16 100644 --- a/apps/dashboard/src/components/launch/MobileLaunchSheet.tsx +++ b/apps/dashboard/src/components/launch/MobileLaunchSheet.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useRouter } from 'next/navigation'; -import { Bot, ChevronRight, Folder, Loader2, Play, Server, TerminalSquare, X } from 'lucide-react'; +import { Bot, ChevronRight, Folder, Loader2, Play, Plus, Server, TerminalSquare, X } from 'lucide-react'; import type { LaunchTarget, MobileLaunchProvider } from '@agent-command/schema'; import { useLaunchTargets } from '@/hooks/useLaunchTargets'; import { launchAgent, openTmuxTarget } from '@/lib/api'; @@ -16,14 +16,16 @@ import { useRecentLaunch, writeRecentLaunch, } from './recentLaunchStore'; +import type { WindowHereLaunchContext } from './windowHere'; -type LaunchMode = 'new' | 'existing'; +type LaunchMode = 'new' | 'existing' | 'window'; export type LaunchSheetView = LaunchMode | 'recent'; interface MobileLaunchSheetProps { open: boolean; initialView?: LaunchSheetView; selectedHostId?: string; + windowHere?: WindowHereLaunchContext; onClose: () => void; onLaunched?: () => void; } @@ -44,6 +46,7 @@ export function MobileLaunchSheet({ open, initialView = 'new', selectedHostId, + windowHere, onClose, onLaunched, }: MobileLaunchSheetProps) { @@ -86,10 +89,22 @@ export function MobileLaunchSheet({ useEffect(() => { if (!open) return; - setMode(initialView === 'existing' ? 'existing' : 'new'); + setMode(initialView === 'existing' ? 'existing' : initialView === 'window' && windowHere ? 'window' : 'new'); setProvider(defaultMobileLaunchProvider); setTmuxTarget(defaultMobileLaunchTmuxTarget || ''); - }, [defaultMobileLaunchProvider, defaultMobileLaunchTmuxTarget, initialView, open]); + }, [defaultMobileLaunchProvider, defaultMobileLaunchTmuxTarget, initialView, open, windowHere]); + + useEffect(() => { + if (!open || mode !== 'window') return; + if (!windowHere) { + setMode('new'); + return; + } + setHostId(windowHere.hostId); + setWorkingDirectory(windowHere.workingDirectory); + setTmuxTarget(windowHere.tmuxSession); + if (windowHere.provider) setProvider(windowHere.provider); + }, [mode, open, windowHere]); useEffect(() => { if (!selectedTarget) return; @@ -246,7 +261,7 @@ export function MobileLaunchSheet({
-
+
+ {windowHere && ( + + )}
@@ -339,7 +367,7 @@ export function MobileLaunchSheet({ ) : null} -
+ {mode !== 'window' &&
Machine @@ -366,7 +394,7 @@ export function MobileLaunchSheet({ ))}
- + } {mode === 'existing' ? (
@@ -429,6 +457,36 @@ export function MobileLaunchSheet({
)} + ) : mode === 'window' && windowHere ? ( + <> +
+
+ + New window in {windowHere.tmuxSession} +
+
+ {selectedTarget?.alias || 'Attached machine'} · {windowHere.workingDirectory} +
+
+ {providerLabel(provider)} will open in this tmux session. +
+
+
+
Prompt
+