Forward mouse input to TUI applications

cmux-tui/Cargo.toml

@@ -44,6 +44,7 @@ tungstenite = { version = "0.29", default-features = false, features = ["handsha
 uds_windows = "1.2"
 regex = "1"
 bindgen = "0.72"
+smallvec = "1"
 
 [profile.release]
 lto = "thin"

cmux-tui/bindings/conformance/fixtures.json

@@ -7,7 +7,7 @@
         {
           "type": "command",
           "request": { "id": 1, "cmd": "identify" },
-          "expect": { "id": 1, "ok": true, "data": { "app": "cmux-tui", "protocol": 6 } },
+          "expect": { "id": 1, "ok": true, "data": { "app": "cmux-tui", "protocol": 7 } },
           "match": "partial"
         }
       ]
@@ -18,7 +18,7 @@
         {
           "type": "command",
           "request": { "id": 1, "cmd": "ping" },
-          "expect": { "id": 1, "ok": true, "data": { "ok": true, "protocol": 6 } },
+          "expect": { "id": 1, "ok": true, "data": { "ok": true, "protocol": 7 } },
           "match": "partial"
         },
         {
@@ -191,6 +191,82 @@
         }
       ]
     },
+    {
+      "name": "subscribe-title-changed-carries-title",
+      "steps": [
+        {
+          "type": "command",
+          "request": { "id": 1, "cmd": "new-workspace", "name": "conf-title", "cols": 80, "rows": 24 },
+          "expect": { "id": 1, "ok": true },
+          "match": "partial",
+          "bind": { "surface0": "data.surface" }
+        },
+        {
+          "type": "stream",
+          "name": "events",
+          "request": { "id": 2, "cmd": "subscribe" },
+          "expect": { "id": 2, "ok": true },
+          "match": "partial"
+        },
+        {
+          "type": "command",
+          "request": { "id": 3, "cmd": "send", "surface": "$surface0", "text": "printf '\\033]2;conformance title\\007'; sleep 30\r" },
+          "expect": { "id": 3, "ok": true },
+          "match": "partial"
+        },
+        {
+          "type": "expect_events",
+          "stream": "events",
+          "expect": [
+            { "event": "title-changed", "surface": "$surface0", "title": "conformance title" }
+          ]
+        },
+        {
+          "type": "command",
+          "request": { "id": 4, "cmd": "send", "surface": "$surface0", "text": "\u0003" },
+          "expect": { "id": 4, "ok": true },
+          "match": "partial"
+        }
+      ]
+    },
+    {
+      "name": "attach-resize-carries-replay",
+      "steps": [
+        {
+          "type": "command",
+          "request": { "id": 1, "cmd": "new-workspace", "name": "conf-attach-resize", "cols": 80, "rows": 24 },
+          "expect": { "id": 1, "ok": true },
+          "match": "partial",
+          "bind": { "surface0": "data.surface" }
+        },
+        {
+          "type": "stream",
+          "name": "attach",
+          "request": { "cmd": "attach-surface", "surface": "$surface0" },
+          "expect": { "ok": true },
+          "match": "partial"
+        },
+        {
+          "type": "command",
+          "request": { "id": 2, "cmd": "resize-surface", "surface": "$surface0", "cols": 100, "rows": 31 },
+          "expect": { "id": 2, "ok": true, "data": { "accepted": true } },
+          "match": "partial"
+        },
+        {
+          "type": "expect_events",
+          "stream": "attach",
+          "expect": [
+            {
+              "event": "resized",
+              "surface": "$surface0",
+              "cols": 100,
+              "rows": 31,
+              "replay": { "__match__": "nonempty-string" }
+            }
+          ]
+        }
+      ]
+    },
     {
       "name": "send-read-screen-round-trip",
       "steps": [
@@ -216,6 +292,17 @@
         }
       ]
     },
+    {
+      "name": "overflow-event-schema",
+      "steps": [
+        {
+          "type": "parse_event",
+          "event": { "event": "overflow", "error": "subscriber fell behind", "scope": "surface", "surface": 7 },
+          "expect": { "event": "overflow", "error": "subscriber fell behind", "scope": "surface", "surface": 7 },
+          "match": "partial"
+        }
+      ]
+    },
     {
       "name": "implemented-verbs-json",
       "requires": {

cmux-tui/bindings/conformance/runner.py

@@ -21,6 +21,7 @@
 sys.path.insert(0, str(PYTHON_BINDING))
 
 from cmux import CommandError, CmuxClient, TimeoutError as CmuxTimeoutError  # noqa: E402
+from cmux.client import _parse_event  # noqa: E402
 
 
 class FixtureFailure(Exception):
@@ -118,7 +119,11 @@ def run_fixture(fixture: Dict[str, Any], defaults: Dict[str, Any], socket_path:
     variables: Dict[str, Any] = {}
     streams: Dict[str, Any] = {}
     timeout_ms = int(fixture.get("timeout_ms", defaults.get("timeout_ms", 5000)))
-    with CmuxClient(socket_path=socket_path, timeout=max(timeout_ms / 1000.0, 1.0)) as client:
+    with CmuxClient(
+        socket_path=socket_path,
+        timeout=max(timeout_ms / 1000.0, 1.0),
+        allow_protocol_v6_attach=True,
+    ) as client:
         try:
             for step in fixture.get("steps", []):
                 step_timeout = int(step.get("timeout_ms", timeout_ms))
@@ -143,9 +148,12 @@ def run_step(
         bind_variables(response, step.get("bind", {}), variables)
     elif step_type == "stream":
         request = substitute(step["request"], variables)
-        if request.get("cmd") != "subscribe":
+        if request.get("cmd") == "subscribe":
+            stream = client.subscribe_with_request(request)
+        elif request.get("cmd") == "attach-surface":
+            stream = client.attach_surface(int(request["surface"]))
+        else:
             raise FixtureFailure(f"unsupported stream command {request.get('cmd')}")
-        stream = client.subscribe_with_request(request)
         streams[step["name"]] = stream
         response = stream.response
         assert_match(response, substitute(step.get("expect", {}), variables), step.get("match", "partial"))
@@ -156,6 +164,9 @@ def run_step(
     elif step_type == "wait_contains":
         request = substitute(step["request"], variables)
         wait_contains(client, request, step["path"], step["contains"], timeout_ms / 1000.0)
+    elif step_type == "parse_event":
+        event = dataclasses.asdict(_parse_event(substitute(step["event"], variables)))
+        assert_match(event, substitute(step.get("expect", {}), variables), step.get("match", "partial"))
     else:
         raise FixtureFailure(f"unknown step type {step_type}")
 
@@ -278,6 +289,8 @@ def assert_match(actual: Any, expected: Any, mode: str) -> None:
 
 
 def partial_match(actual: Any, expected: Any) -> bool:
+    if expected == {"__match__": "nonempty-string"}:
+        return isinstance(actual, str) and bool(actual)
     if isinstance(expected, dict):
         if not isinstance(actual, dict):
             return False

cmux-tui/bindings/generate.sh

@@ -41,7 +41,7 @@ assemble_prompt() {
     echo "- This is a temporary output directory. The harness swaps it into cmux-tui/bindings/$lang/ only after generation succeeds."
     echo "- Regeneration must overwrite stale generated files inside the temporary output directory."
     echo "- Follow the style sheet exactly."
-    echo "- Implement protocol-v5 commands marked implemented, plus consumer-side implemented move commands."
+    echo "- Implement protocol-v7 commands and events marked implemented, plus consumer-side implemented move commands."
     echo "- Preserve command names, params, result shapes, event names, and error behavior from the spec."
     echo "- Do not implement proposed commands unless the style sheet explicitly asks for version-gated stubs."
     echo

cmux-tui/bindings/go/client.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"os"
 	"path/filepath"
@@ -307,8 +308,10 @@ func (c *Client) RenameWorkspace(ctx context.Context, workspace uint64, name str
 	return c.request(ctx, "rename-workspace", map[string]any{"workspace": workspace, "name": name}, nil)
 }
 
-func (c *Client) ResizeSurface(ctx context.Context, surface uint64, cols, rows uint16) error {
-	return c.request(ctx, "resize-surface", map[string]any{"surface": surface, "cols": cols, "rows": rows}, nil)
+func (c *Client) ResizeSurface(ctx context.Context, surface uint64, cols, rows uint16) (ResizeSurfaceResult, error) {
+	var result ResizeSurfaceResult
+	err := c.request(ctx, "resize-surface", map[string]any{"surface": surface, "cols": cols, "rows": rows}, &result)
+	return result, err
 }
 
 func (c *Client) FocusPane(ctx context.Context, pane uint64) error {
@@ -352,7 +355,7 @@ func (c *Client) AttachSurface(ctx context.Context, surface uint64) (*Stream, er
 		}
 		protocol = &info.Protocol
 	}
-	if *protocol > 6 || (*protocol > 5 && !c.allowProtocolV6Attach) {
+	if *protocol > 7 || (*protocol > 5 && !c.allowProtocolV6Attach) {
 		return nil, &protocolError{msg: fmt.Sprintf("unsupported attach protocol %d", *protocol)}
 	}
 	return c.openStream(ctx, map[string]any{"id": c.nextRequestID(), "cmd": "attach-surface", "surface": surface})
@@ -398,29 +401,44 @@ type Stream struct {
 	conn     *jsonLineConn
 	timeout  time.Duration
 	buffered []Event
+	closed   atomic.Bool
 }
 
 func (s *Stream) Close() error {
+	if !s.closed.CompareAndSwap(false, true) {
+		return nil
+	}
 	return s.conn.Close()
 }
 
 func (s *Stream) Recv(ctx context.Context) (Event, error) {
+	if s.closed.Load() {
+		return nil, io.EOF
+	}
 	if len(s.buffered) > 0 {
 		event := s.buffered[0]
 		s.buffered = s.buffered[1:]
-		return event, nil
+		return s.finishTerminal(event), nil
 	}
 	for {
 		value, err := s.conn.Recv(ctx, s.timeout)
 		if err != nil {
 			return nil, err
 		}
 		if _, ok := value["event"].(string); ok {
-			return parseEvent(value), nil
+			return s.finishTerminal(parseEvent(value)), nil
 		}
 	}
 }
 
+func (s *Stream) finishTerminal(event Event) Event {
+	switch event.(type) {
+	case DetachedEvent, OverflowEvent:
+		_ = s.Close()
+	}
+	return event
+}
+
 type jsonLineConn struct {
 	conn   net.Conn
 	reader *bufio.Reader