cmux-tui: preserve smallest sizing through web reattach

.github/workflows/cmux-tui.yml

@@ -111,6 +111,9 @@ jobs:
           # otherwise-correct build; the guarded regression (events serialized
           # behind a 100ms read poll) inflates far past this bound anyway.
           CMUX_TEST_WS_LATENCY_BUDGET_MS: "2000"
+          # Process-exit and PTY-reader tests also use bounded polling. Keep
+          # their normal deadlines strict while allowing for instrumentation.
+          CMUX_TEST_TIMEOUT_SCALE: "4"
         run: |
           while IFS= read -r bin; do
             [ -n "$bin" ] || continue

cmux-tui/bindings/rust/src/lib.rs

@@ -497,6 +497,10 @@ impl CmuxClient {
         self.request("resize-surface", params)
     }
 
+    pub fn release_surface_size(&mut self, surface: u64) -> Result<()> {
+        self.request::<Empty>("release-surface-size", surface_params(surface)).map(|_| ())
+    }
+
     pub fn focus_pane(&mut self, pane: u64) -> Result<()> {
         let mut params = Map::new();
         params.insert("pane".to_string(), Value::from(pane));

cmux-tui/bindings/typescript/src/client.ts

@@ -405,6 +405,15 @@ export class CmuxClient {
   }
   listClients(): Promise<ListClientsResult> { return this.request("list-clients"); }
   detachClient(client: Id): Promise<EmptyResult> { return this.request("detach-client", { client }); }
+  setClientSizing(client: Id, enabled: boolean): Promise<EmptyResult> {
+    return this.request("set-client-sizing", { client, enabled });
+  }
+  useOnlyClientSizing(client: Id): Promise<EmptyResult> {
+    return this.request("set-client-sizing", { client, enabled: true, exclusive: true });
+  }
+  useAllClientSizing(): Promise<EmptyResult> {
+    return this.request("set-client-sizing", { enabled: true });
+  }
   reloadConfig(): Promise<ReloadConfigResult> { return this.request("reload-config"); }
   setWindowTitle(title: string): Promise<EmptyResult> { return this.request("set-window-title", { title }); }
   clearWindowTitle(): Promise<EmptyResult> { return this.request("clear-window-title"); }
@@ -464,6 +473,9 @@ export class CmuxClient {
     const result = await this.request("resize-surface", { surface, cols, rows });
     return { ...result, accepted: result.accepted ?? true };
   }
+  releaseSurfaceSize(surface: Id): Promise<EmptyResult> {
+    return this.request("release-surface-size", { surface });
+  }
   focusPane(pane: Id): Promise<EmptyResult> { return this.request("focus-pane", { pane }); }
   selectTab(options: SelectTabOptions = {}): Promise<EmptyResult> { return this.request("select-tab", options); }
   selectScreen(options: SelectOptions = {}): Promise<EmptyResult> { return this.request("select-screen", options); }

cmux-tui/bindings/typescript/src/protocol/commands.ts

@@ -28,7 +28,7 @@ export interface SetClientInfoRequest extends CmuxRequestBase {
 }
 
 export interface ListClientsRequest extends CmuxRequestBase { cmd: "list-clients" }
-export type ClientTransport = "unix" | "ws";
+export type ClientTransport = "local" | "unix" | "ws";
 export interface ClientSize {
   surface: Id;
   cols: number | null;
@@ -43,10 +43,17 @@ export interface ClientInfo {
   attached: Id[];
   sizes: ClientSize[];
   self: boolean;
+  size_participating: boolean;
 }
 export type ListClientsResult = ClientInfo[];
 
 export interface DetachClientRequest extends CmuxRequestBase { cmd: "detach-client"; client: Id }
+export interface SetClientSizingRequest extends CmuxRequestBase {
+  cmd: "set-client-sizing";
+  client?: Id;
+  enabled: boolean;
+  exclusive?: boolean;
+}
 
 export interface ReloadConfigRequest extends CmuxRequestBase { cmd: "reload-config" }
 export interface ReloadConfigResult { reloaded: true; path: string | null }
@@ -209,6 +216,10 @@ export interface ResizeSurfaceRequest extends CmuxRequestBase {
   rows: number;
 }
 export interface ResizeSurfaceResult { accepted: boolean; reservation_id?: number | null }
+export interface ReleaseSurfaceSizeRequest extends CmuxRequestBase {
+  cmd: "release-surface-size";
+  surface: Id;
+}
 
 export interface FocusPaneRequest extends CmuxRequestBase { cmd: "focus-pane"; pane: Id }
 
@@ -321,6 +332,7 @@ export type CmuxRequest =
   | SetClientInfoRequest
   | ListClientsRequest
   | DetachClientRequest
+  | SetClientSizingRequest
   | ReloadConfigRequest
   | SetWindowTitleRequest
   | ClearWindowTitleRequest
@@ -353,6 +365,7 @@ export type CmuxRequest =
   | RenameScreenRequest
   | RenameWorkspaceRequest
   | ResizeSurfaceRequest
+  | ReleaseSurfaceSizeRequest
   | FocusPaneRequest
   | SelectTabRequest
   | SelectScreenRequest
@@ -378,6 +391,7 @@ export interface CmuxResponseDataMap {
   "set-client-info": EmptyResult;
   "list-clients": ListClientsResult;
   "detach-client": EmptyResult;
+  "set-client-sizing": EmptyResult;
   "reload-config": ReloadConfigResult;
   "set-window-title": EmptyResult;
   "clear-window-title": EmptyResult;
@@ -410,6 +424,7 @@ export interface CmuxResponseDataMap {
   "rename-screen": EmptyResult;
   "rename-workspace": EmptyResult;
   "resize-surface": ResizeSurfaceResult;
+  "release-surface-size": EmptyResult;
   "focus-pane": EmptyResult;
   "select-tab": EmptyResult;
   "select-screen": EmptyResult;

cmux-tui/bindings/typescript/src/protocol/events.ts

@@ -341,7 +341,8 @@ export type KnownRenderAttachEvent =
   | RenderStateEvent
   | RenderDeltaEvent
   | ScrollChangedEvent
-  | DetachedEvent;
+  | DetachedEvent
+  | OverflowEvent;
 
 /** Render attachment events, including unknown future event names. */
 export type RenderAttachEvent = KnownRenderAttachEvent | UnknownEvent;

cmux-tui/bindings/typescript/test/client.test.ts

@@ -437,6 +437,7 @@ test("listClients returns the exact client presence response shape", async () =>
     attached: [31],
     sizes: [{ surface: 31, cols: 126, rows: 38 }],
     self: true,
+    size_participating: true,
   }];
   const transport = new ScriptedTransport((request, connection) => {
     assert.deepEqual(request, { id: 1, cmd: "list-clients" });
@@ -448,6 +449,39 @@ test("listClients returns the exact client presence response shape", async () =>
   await client.close();
 });
 
+test("setClientSizing serializes client participation", async () => {
+  const transport = new ScriptedTransport((request, connection) => {
+    assert.deepEqual(request, {
+      id: 1,
+      cmd: "set-client-sizing",
+      client: 7,
+      enabled: false,
+    });
+    connection.emit({ id: request.id, ok: true, data: {} });
+  });
+  const client = new CmuxClient({ transport });
+
+  await client.setClientSizing(7, false);
+  await client.close();
+});
+
+test("client sizing modes serialize as one atomic command", async () => {
+  const expected = [
+    { id: 1, cmd: "set-client-sizing", client: 7, enabled: true, exclusive: true },
+    { id: 2, cmd: "set-client-sizing", enabled: true },
+  ];
+  const transport = new ScriptedTransport((request, connection) => {
+    assert.deepEqual(request, expected.shift());
+    connection.emit({ id: request.id, ok: true, data: {} });
+  });
+  const client = new CmuxClient({ transport });
+
+  await client.useOnlyClientSizing(7);
+  await client.useAllClientSizing();
+  assert.equal(expected.length, 0);
+  await client.close();
+});
+
 test("readScrollback serializes the request and returns styled rows", async () => {
   const response = {
     rows: [{ row: 0, runs: [{ text: "cargo test", fg: null, bg: null, attrs: 0 }] }],

cmux-tui/bindings/typescript/test/protocol-types.ts

@@ -18,6 +18,7 @@ const requests = [
   { cmd: "set-client-info", name: "browser", kind: "web" },
   { cmd: "list-clients" },
   { cmd: "detach-client", client: 2 },
+  { cmd: "set-client-sizing", client: 2, enabled: false },
   { cmd: "reload-config" },
   { cmd: "set-window-title", title: "cmux" },
   { cmd: "clear-window-title" },
@@ -51,6 +52,7 @@ const requests = [
   { cmd: "rename-screen", screen: 1, name: "screen" },
   { cmd: "rename-workspace", workspace: 1, name: "workspace" },
   { cmd: "resize-surface", surface: 1, cols: 80, rows: 24 },
+  { cmd: "release-surface-size", surface: 1 },
   { cmd: "focus-pane", pane: 1 },
   { cmd: "select-tab", pane: 1, index: 0 },
   { cmd: "select-screen", delta: 1 },