Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e194491
docs(program): FW6-CHAT ship + rollout receipt
cvsloane Jul 22, 2026
cc6885b
chore: update project status
cvsloane Jul 22, 2026
46e26eb
fix(terminal): make pane focus transactional
cvsloane Jul 22, 2026
6f47918
docs: calibrate personal app acceptance
cvsloane Jul 22, 2026
232346a
docs: preserve shared terminal architecture
cvsloane Jul 22, 2026
e337828
docs: record autonomous project authority
cvsloane Jul 22, 2026
058c268
docs: constrain sol project scope
cvsloane Jul 22, 2026
d3416a9
docs: constrain native MVP scope
cvsloane Jul 22, 2026
1719c8c
docs: draft Android terminal daily-driver program
cvsloane Jul 22, 2026
93512c3
docs: approve Android terminal program
cvsloane Jul 22, 2026
697c0b6
docs(program): launch W1 shared terminal repair
cvsloane Jul 22, 2026
fc38798
docs(program): record W1 builder pickup
cvsloane Jul 22, 2026
5bccf2d
docs(program): record W1 one-row reproduction
cvsloane Jul 22, 2026
f82d82e
docs(program): update Homelinux Codex runtime
cvsloane Jul 22, 2026
799ec9e
docs(program): launch W1 terminal review
cvsloane Jul 22, 2026
06d3e49
docs(program): record W1 reviewer pickup
cvsloane Jul 22, 2026
fefc73d
docs(program): constrain W1 reviewer dispatch
cvsloane Jul 22, 2026
e84826d
docs(android): review W1 shared terminal candidate
cvsloane Jul 22, 2026
10920e3
docs(program): launch W1 pane convergence correction
cvsloane Jul 22, 2026
180e154
docs(program): record W1-R2 builder pickup
cvsloane Jul 22, 2026
20d5c2f
docs(program): launch W1-R2 fresh review
cvsloane Jul 22, 2026
a3e0b75
docs(program): record W1-R2 reviewer pickup
cvsloane Jul 22, 2026
479c196
test(terminal): lock desktop local-fit viewport
cvsloane Jul 22, 2026
a25cab4
docs(android): hand off W1 shared terminal repair
cvsloane Jul 22, 2026
97b33ca
fix(terminal): reconcile selected pane on resume
cvsloane Jul 22, 2026
6906582
docs(android): hand off W1-R2 convergence fix
cvsloane Jul 22, 2026
59daa0e
docs(android): review W1-R2 convergence fix
cvsloane Jul 22, 2026
2fbac22
docs(program): record W1 integration pass
cvsloane Jul 22, 2026
9e8eaf3
test(terminal): acknowledge focus in smoke fixture
cvsloane Jul 22, 2026
49f84cd
fix(terminal): fail correlated navigation dispatch
cvsloane Jul 22, 2026
f9eabc6
Merge remote-tracking branch 'origin/main' into refactor/frontend-com…
cvsloane Jul 22, 2026
dd00148
docs(android): clarify execution status
cvsloane Jul 22, 2026
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
45 changes: 45 additions & 0 deletions agents/agentd/cmd/agentd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5526,6 +5526,51 @@ func (a *Agent) handleTerminalNavigate(payload json.RawMessage) {

navigation := tmux.TerminalNavigation{Op: tmux.TerminalNavigationOp(req.Op)}
switch navigation.Op {
case "viewer_state":
result := protocol.TerminalNavigationResultPayload{
ChannelID: req.ChannelID,
RequestID: req.RequestID,
}
if strings.TrimSpace(req.RequestID) == "" {
result.Message = "viewer_state requires request_id"
_ = a.send(protocol.TypeTerminalNavigationResult, result)
return
}
state, err := a.terminalManager.ViewerState(req.ChannelID)
result.PaneID = state.PaneID
result.WindowIndex = state.WindowIndex
result.Zoomed = state.Zoomed
if err != nil {
result.Message = err.Error()
log.Printf("Failed to read terminal viewer state for request %s: %v", req.RequestID, err)
} else {
result.OK = true
}
_ = a.send(protocol.TypeTerminalNavigationResult, result)
return
case "focus_pane":
result := protocol.TerminalNavigationResultPayload{
ChannelID: req.ChannelID,
RequestID: req.RequestID,
PaneID: req.PaneID,
}
if strings.TrimSpace(req.RequestID) == "" || strings.TrimSpace(req.PaneID) == "" || req.Zoom == nil {
result.Message = "focus_pane requires request_id, pane_id, and zoom"
_ = a.send(protocol.TypeTerminalNavigationResult, result)
return
}
state, err := a.terminalManager.FocusPane(req.ChannelID, req.PaneID, *req.Zoom)
result.PaneID = state.PaneID
result.WindowIndex = state.WindowIndex
result.Zoomed = state.Zoomed
if err != nil {
result.Message = err.Error()
log.Printf("Failed to focus terminal pane for request %s: %v", req.RequestID, err)
} else {
result.OK = true
}
_ = a.send(protocol.TypeTerminalNavigationResult, result)
return
case tmux.NavigateSelectWindow:
if req.WindowIndex == nil {
log.Printf("Failed to parse terminal.navigate: select_window requires window_index")
Expand Down
96 changes: 96 additions & 0 deletions agents/agentd/cmd/agentd/main_terminal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,102 @@ func TestHandleTerminalNavigateRoutesToGroupedViewerOnPrivateSocket(t *testing.T
}
}

func TestHandleTerminalFocusPaneReportsVerifiedViewerState(t *testing.T) {
tmuxClient := newPrivateCommandTmux(t)
panes, err := tmuxClient.ListPanes()
if err != nil || len(panes) != 1 {
t.Fatalf("initial panes=%+v err=%v", panes, err)
}
target, err := tmuxClient.SplitPaneWithOptions(panes[0].PaneID, "horizontal", nil, "")
if err != nil {
t.Fatalf("split pane: %v", err)
}

manager := tmux.NewTerminalManager(tmuxClient, t.TempDir())
manager.SetPerViewerPTY(true)
defer manager.Close()
if _, err := manager.AttachWithOptions("focus-channel", panes[0].PaneID, tmux.AttachOptions{SessionID: "session-1"}); err != nil {
t.Fatalf("attach viewer: %v", err)
}

var gotType string
var gotPayload any
agent := &Agent{
terminalManager: manager,
sendMessage: func(msgType string, payload any) error {
gotType = msgType
gotPayload = payload
return nil
},
}
payload, err := json.Marshal(protocol.TerminalNavigatePayload{
ChannelID: "focus-channel",
Op: "focus_pane",
RequestID: "44444444-4444-4444-8444-444444444444",
PaneID: target.PaneID,
Zoom: boolPointer(true),
})
if err != nil {
t.Fatal(err)
}
agent.handleMessage(protocol.TypeTerminalNavigate, payload)

result, ok := gotPayload.(protocol.TerminalNavigationResultPayload)
if gotType != protocol.TypeTerminalNavigationResult || !ok {
t.Fatalf("message=(%q, %#v), want terminal navigation result", gotType, gotPayload)
}
if !result.OK || result.PaneID != target.PaneID || result.WindowIndex != 0 || !result.Zoomed {
t.Fatalf("navigation result=%+v", result)
}
}

func TestHandleTerminalViewerStateReportsCurrentViewerState(t *testing.T) {
tmuxClient := newPrivateCommandTmux(t)
panes, err := tmuxClient.ListPanes()
if err != nil || len(panes) != 1 {
t.Fatalf("initial panes=%+v err=%v", panes, err)
}

manager := tmux.NewTerminalManager(tmuxClient, t.TempDir())
manager.SetPerViewerPTY(true)
defer manager.Close()
if _, err := manager.AttachWithOptions("state-channel", panes[0].PaneID, tmux.AttachOptions{SessionID: "session-1"}); err != nil {
t.Fatalf("attach viewer: %v", err)
}

var gotType string
var gotPayload any
agent := &Agent{
terminalManager: manager,
sendMessage: func(msgType string, payload any) error {
gotType = msgType
gotPayload = payload
return nil
},
}
payload, err := json.Marshal(protocol.TerminalNavigatePayload{
ChannelID: "state-channel",
Op: "viewer_state",
RequestID: "66666666-6666-4666-8666-666666666666",
})
if err != nil {
t.Fatal(err)
}
agent.handleMessage(protocol.TypeTerminalNavigate, payload)

result, ok := gotPayload.(protocol.TerminalNavigationResultPayload)
if gotType != protocol.TypeTerminalNavigationResult || !ok {
t.Fatalf("message=(%q, %#v), want terminal navigation result", gotType, gotPayload)
}
if !result.OK || result.PaneID != panes[0].PaneID || result.WindowIndex != 0 || result.Zoomed {
t.Fatalf("viewer state result=%+v", result)
}
}

func boolPointer(value bool) *bool {
return &value
}

func TestTerminalAttachSupersedesStaleChannelAfterControlPlaneReconnect(t *testing.T) {
tmuxClient := newPrivateCommandTmux(t)
panes, err := tmuxClient.ListPanes()
Expand Down
75 changes: 38 additions & 37 deletions agents/agentd/internal/protocol/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,44 @@ import "encoding/json"
const Version = 1

const (
TypeAgentHello = "agent.hello"
TypeAgentAck = "agent.ack"
TypeSessionsUpsert = "sessions.upsert"
TypeSessionsPrune = "sessions.prune"
TypeSessionsSnapshot = "sessions.snapshot"
TypeEventsAppend = "events.append"
TypeCommandsDispatch = "commands.dispatch"
TypeCommandsResult = "commands.result"
TypeConsoleChunk = "console.chunk"
TypeToolEventStarted = "tool.event.started"
TypeToolEventCompleted = "tool.event.completed"
TypeProviderUsage = "provider.usage"
TypeSessionUsage = "session.usage"
TypeApprovalsDecision = "approvals.decision"
TypeMCPListServers = "mcp.list_servers"
TypeMCPGetConfig = "mcp.get_config"
TypeMCPUpdateConfig = "mcp.update_config"
TypeMCPGetProjectConfig = "mcp.get_project_config"
TypeMCPUpdateProject = "mcp.update_project_config"
TypeMCPServers = "mcp.servers"
TypeMCPConfig = "mcp.config"
TypeMCPProjectConfig = "mcp.project_config"
TypeMCPUpdateResult = "mcp.update_result"
TypeTerminalAttach = "terminal.attach"
TypeTerminalInput = "terminal.input"
TypeTerminalResize = "terminal.resize"
TypeTerminalNavigate = "terminal.navigate"
TypeTerminalDetach = "terminal.detach"
TypeTerminalControl = "terminal.control"
TypeTerminalOutput = "terminal.output"
TypeTerminalAttached = "terminal.attached"
TypeTerminalDetached = "terminal.detached"
TypeTerminalError = "terminal.error"
TypeTerminalReadOnly = "terminal.readonly"
TypeTerminalLag = "terminal.lag"
TypeTerminalAudit = "terminal.audit"
TypeTmuxTopology = "tmux.topology"
TypeAgentHello = "agent.hello"
TypeAgentAck = "agent.ack"
TypeSessionsUpsert = "sessions.upsert"
TypeSessionsPrune = "sessions.prune"
TypeSessionsSnapshot = "sessions.snapshot"
TypeEventsAppend = "events.append"
TypeCommandsDispatch = "commands.dispatch"
TypeCommandsResult = "commands.result"
TypeConsoleChunk = "console.chunk"
TypeToolEventStarted = "tool.event.started"
TypeToolEventCompleted = "tool.event.completed"
TypeProviderUsage = "provider.usage"
TypeSessionUsage = "session.usage"
TypeApprovalsDecision = "approvals.decision"
TypeMCPListServers = "mcp.list_servers"
TypeMCPGetConfig = "mcp.get_config"
TypeMCPUpdateConfig = "mcp.update_config"
TypeMCPGetProjectConfig = "mcp.get_project_config"
TypeMCPUpdateProject = "mcp.update_project_config"
TypeMCPServers = "mcp.servers"
TypeMCPConfig = "mcp.config"
TypeMCPProjectConfig = "mcp.project_config"
TypeMCPUpdateResult = "mcp.update_result"
TypeTerminalAttach = "terminal.attach"
TypeTerminalInput = "terminal.input"
TypeTerminalResize = "terminal.resize"
TypeTerminalNavigate = "terminal.navigate"
TypeTerminalNavigationResult = "terminal.navigation_result"
TypeTerminalDetach = "terminal.detach"
TypeTerminalControl = "terminal.control"
TypeTerminalOutput = "terminal.output"
TypeTerminalAttached = "terminal.attached"
TypeTerminalDetached = "terminal.detached"
TypeTerminalError = "terminal.error"
TypeTerminalReadOnly = "terminal.readonly"
TypeTerminalLag = "terminal.lag"
TypeTerminalAudit = "terminal.audit"
TypeTmuxTopology = "tmux.topology"
)

// EnvelopeHeader supports direction-agnostic inspection before decoding a
Expand Down
12 changes: 12 additions & 0 deletions agents/agentd/internal/protocol/terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,24 @@ type TerminalResizePayload struct {
type TerminalNavigatePayload struct {
ChannelID string `json:"channel_id"`
Op string `json:"op"`
RequestID string `json:"request_id,omitempty"`
WindowIndex *int `json:"window_index,omitempty"`
PaneID string `json:"pane_id,omitempty"`
On *bool `json:"on,omitempty"`
Zoom *bool `json:"zoom,omitempty"`
Lines *int `json:"lines,omitempty"`
}

type TerminalNavigationResultPayload struct {
ChannelID string `json:"channel_id"`
RequestID string `json:"request_id"`
OK bool `json:"ok"`
PaneID string `json:"pane_id,omitempty"`
WindowIndex int `json:"window_index"`
Zoomed bool `json:"zoomed"`
Message string `json:"message,omitempty"`
}

type TerminalChannelPayload struct {
ChannelID string `json:"channel_id"`
}
Expand Down
70 changes: 70 additions & 0 deletions agents/agentd/internal/tmux/pty_bridge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,76 @@ func TestTerminalNavigateSelectPaneUsesViewerSessionOnPrivateTmuxSocket(t *testi
}
}

func TestTerminalFocusPaneSelectsAndZoomsVerifiedTargetOnPrivateTmuxSocket(t *testing.T) {
client, _ := newPrivateTmuxClient(t)
panes, err := client.ListPanes()
if err != nil || len(panes) != 1 {
t.Fatalf("initial private panes=%+v err=%v", panes, err)
}
target, err := client.SplitPaneWithOptions(panes[0].PaneID, "horizontal", nil, "")
if err != nil {
t.Fatalf("split private pane: %v", err)
}

manager := newTerminalManagerWithRunner(client, newExecTmuxRunner(client), t.TempDir())
defer manager.Close()
if _, err := manager.AttachWithOptions("focus-pane", panes[0].PaneID, AttachOptions{SessionID: "session-1"}); err != nil {
t.Fatalf("attach viewer: %v", err)
}

state, err := manager.FocusPane("focus-pane", target.PaneID, true)
if err != nil {
t.Fatalf("focus viewer pane: %v", err)
}
if state.PaneID != target.PaneID || state.WindowIndex != 0 || !state.Zoomed {
t.Fatalf("verified viewer state=%+v, want pane=%s window=0 zoomed", state, target.PaneID)
}
}

type failFirstZoomRunner struct {
TmuxRunner
failed bool
}

func (r *failFirstZoomRunner) Run(args ...string) error {
if !r.failed && len(args) >= 2 && args[0] == "resize-pane" && args[1] == "-Z" {
r.failed = true
return errors.New("injected zoom failure")
}
return r.TmuxRunner.Run(args...)
}

func TestTerminalFocusPaneRollsBackWhenZoomFails(t *testing.T) {
client, _ := newPrivateTmuxClient(t)
panes, err := client.ListPanes()
if err != nil || len(panes) != 1 {
t.Fatalf("initial private panes=%+v err=%v", panes, err)
}
originPaneID := panes[0].PaneID
target, err := client.SplitPaneWithOptions(originPaneID, "horizontal", nil, "")
if err != nil {
t.Fatalf("split private pane: %v", err)
}

runner := &failFirstZoomRunner{TmuxRunner: newExecTmuxRunner(client)}
manager := newTerminalManagerWithRunner(client, runner, t.TempDir())
defer manager.Close()
if _, err := manager.AttachWithOptions("focus-rollback", originPaneID, AttachOptions{SessionID: "session-1"}); err != nil {
t.Fatalf("attach viewer: %v", err)
}

if _, err := manager.FocusPane("focus-rollback", target.PaneID, true); err == nil {
t.Fatal("focus unexpectedly succeeded")
}
state, err := manager.viewerByChannel["focus-rollback"].bridge.State()
if err != nil {
t.Fatalf("read rolled-back viewer state: %v", err)
}
if state.PaneID != originPaneID || state.Zoomed {
t.Fatalf("viewer state after failed focus=%+v, want pane=%s unzoomed", state, originPaneID)
}
}

func TestTerminalNavigateZoomSetsRequestedStateOnPrivateTmuxSocket(t *testing.T) {
client, _ := newPrivateTmuxClient(t)
panes, err := client.ListPanes()
Expand Down
Loading
Loading