tmux-ide 2.9.0-beta.21 → 2.9.0-beta.26

package/packages/daemon/src/tui/mirror/runtime/semantic-shell-viewport-resize.ts

@@ -41,7 +41,7 @@ export function createSemanticShellViewportResizeOwner(
   type ScopedTarget = Readonly<{ cols: number; rows: number; semanticWindowId?: string }>;
   let desired: Readonly<{ identity: ResizeIdentity; targets: readonly ScopedTarget[] }> | null =
     null;
-  let scopedFlight = false;
+  let scopedFlight: object | null = null;
   let scopedEpoch = 0;
   let authorityClient: OpenTuiGenerationHostSnapshot["authorityClient"] = null;
   let stopAuthority: (() => void) | null = null;
@@ -53,7 +53,8 @@ export function createSemanticShellViewportResizeOwner(
   const targetSize = (target: ScopedTarget) => `${target.cols}x${target.rows}`;
   const drain = async (): Promise<void> => {
     if (scopedFlight || disposed || authoritySuspended) return;
-    scopedFlight = true;
+    const flight = {};
+    scopedFlight = flight;
     try {
       while (desired && !disposed && !authoritySuspended) {
         const owner = desired;
@@ -70,7 +71,7 @@ export function createSemanticShellViewportResizeOwner(
           .resize(target)
           .catch(() => ({ status: "failed" as const }));
         if (disposed || !desired) break;
-        if (epoch !== scopedEpoch) continue;
+        if (epoch !== scopedEpoch) break;
         const stillDesired = desired.targets.some(
           (entry) =>
             targetKey(entry) === targetKey(target) && targetSize(entry) === targetSize(target),
@@ -85,7 +86,7 @@ export function createSemanticShellViewportResizeOwner(
           scopedApplied.set(targetKey(target), targetSize(target));
       }
     } finally {
-      scopedFlight = false;
+      if (scopedFlight === flight) scopedFlight = null;
     }
   };
   const sameAuthority = (left: ResizeIdentity, right: ResizeIdentity): boolean =>
@@ -122,6 +123,7 @@ export function createSemanticShellViewportResizeOwner(
         pending = null;
         desired = null;
         scopedEpoch += 1;
+        scopedFlight = null;
         scopedApplied.clear();
         return;
       }
@@ -150,6 +152,7 @@ export function createSemanticShellViewportResizeOwner(
             pending = null;
             scopedApplied.clear();
             scopedEpoch += 1;
+            scopedFlight = null;
             if (!authoritySuspended) retry?.();
           }) ?? null;
       }
@@ -174,6 +177,8 @@ export function createSemanticShellViewportResizeOwner(
         pending = null;
         if (!desired || !sameAuthority(desired.identity, target)) {
           scopedEpoch += 1;
+          // A retired lane must not hold a replacement lane behind its receipt.
+          scopedFlight = null;
           scopedApplied.clear();
         }
         const retainedWindows = new Set(["", ...windows.map((window) => window.semanticWindowId!)]);
@@ -199,6 +204,7 @@ export function createSemanticShellViewportResizeOwner(
       if (desired) {
         desired = null;
         scopedEpoch += 1;
+        scopedFlight = null;
         scopedApplied.clear();
         applied = null;
         pending = null;
@@ -228,6 +234,7 @@ export function createSemanticShellViewportResizeOwner(
       stopAuthority = null;
       authorityClient = null;
       desired = null;
+      scopedFlight = null;
       scopedApplied.clear();
       applied = null;
       pending = null;

package/packages/daemon/src/tui/mirror/runtime/terminal-pane-input-router.ts

@@ -44,14 +44,25 @@ export class TerminalPaneInputRouter<Input> {
     if (this.#pending?.selected === true) this.#pending = null;
   }
 
-  selectPane(paneId: string, options: { readonly presentOptimistically?: boolean } = {}): void {
-    if (this.#pending?.paneId === paneId) return;
-    if (this.#pending === null && this.#canonicalPane === paneId && this.#focusedPane === paneId)
+  selectPane(
+    paneId: string,
+    options: {
+      readonly presentOptimistically?: boolean;
+      readonly selection?: () => Promise<boolean>;
+    } = {},
+  ): void {
+    if (!options.selection && this.#pending?.paneId === paneId) return;
+    if (
+      !options.selection &&
+      this.#pending === null &&
+      this.#canonicalPane === paneId &&
+      this.#focusedPane === paneId
+    )
       return;
     const token = ++this.#selectionToken;
     const presentOptimistically = options.presentOptimistically !== false;
     if (presentOptimistically) this.#setFocusedPane(paneId);
-    const settled = this.#options.select(paneId);
+    const settled = options.selection ? options.selection() : this.#options.select(paneId);
     this.#pending = { token, paneId, presentOptimistically, settled, selected: null };
     void settled.then((selected) => {
       if (this.#pending?.token !== token) return;

package/packages/daemon/src/tui/mirror/workspace/application-command-description.ts

@@ -1,7 +1,9 @@
+import type { TmuxServerScope } from "@tmux-ide/contracts";
 import { fuzzyTermsMatch as commandSearchMatch } from "../../team/fuzzy.ts";
 export { fuzzyTermsMatch as commandSearchMatch } from "../../team/fuzzy.ts";
 import { PANE_ACTION_MENU_ITEMS } from "./pane-action-menu-model.ts";
 export interface FleetPaletteTarget {
+  readonly server?: TmuxServerScope;
   readonly machineId: string;
   readonly liveSessionId: string;
   readonly hostLabel: string;
@@ -51,8 +53,14 @@ export type ApplicationPaletteCommand =
 export function applicationCommandDescription(command: ApplicationPaletteCommand) {
   if (typeof command === "object" && command.kind === "open-machine")
     return {
-      id: JSON.stringify([command.kind, command.fleet.machineId]),
-      label: `Machine · ${command.label}`,
+      id: JSON.stringify([
+        command.kind,
+        command.fleet.machineId,
+        ...(command.fleet.server
+          ? [command.fleet.server.serverId, command.fleet.server.generation]
+          : []),
+      ]),
+      label: `${command.fleet.server ? "Server" : "Machine"} · ${command.label}`,
       detail: command.fleet.disabled ? "Unavailable" : "Browse sessions or create on this host",
     };
   if (typeof command === "object") {
@@ -63,6 +71,9 @@ export function applicationCommandDescription(command: ApplicationPaletteCommand
           ? [
               command.kind,
               command.fleet.machineId,
+              ...(command.fleet.server
+                ? [command.fleet.server.serverId, command.fleet.server.generation]
+                : []),
               command.fleet.liveSessionId,
               session ? null : command.paneId,
             ]

package/packages/daemon/src/tui/mirror/workspace/terminal-window-strip.tsx

@@ -14,6 +14,8 @@ import {
 } from "../ui/index.ts";
 
 export interface TerminalWindowTab {
+  linkId?: string;
+  disabled?: boolean;
   index: number;
   name: string;
   active: boolean;
@@ -414,10 +416,12 @@ function agentStatus(status: string | undefined): AgentBadgeStatus | undefined {
  */
 export function TerminalWindowStrip(props: TerminalWindowStripProps) {
   const tabs = () => (typeof props.tabs === "function" ? props.tabs() : props.tabs);
-  const tabId = (tab: TerminalWindowTab) => tab.semanticWindowId ?? `window:${tab.index}`;
+  const tabId = (tab: TerminalWindowTab) =>
+    tab.linkId ?? tab.semanticWindowId ?? `window:${tab.index}`;
   const items = createMemo<readonly WindowTabItem[]>(() =>
     tabs().map((tab) => ({
       id: tabId(tab),
+      disabled: tab.disabled,
       windowIndex: tab.index,
       title: tab.name,
       agentStatus: agentStatus(tab.status),

package/packages/daemon-client/package.json

@@ -26,7 +26,9 @@
     "./runtime-resource-ledger": "./src/runtime-resource-ledger.ts",
     "./fleet-dial-scheduler": "./src/fleet-dial-scheduler.ts",
     "./fleet-connection-status": "./src/fleet-connection-status.ts",
-    "./fleet-environments": "./src/fleet-environments.ts"
+    "./fleet-environments": "./src/fleet-environments.ts",
+    "./tmux-server-client": "./src/tmux-server-client.ts",
+    "./scoped-tmux-server-transport": "./src/scoped-tmux-server-transport.ts"
   },
   "main": "src/index.ts",
   "scripts": {

package/packages/daemon-client/src/index.ts

@@ -27,3 +27,5 @@ export * from "./first-latest-coordinator.ts";
 export * from "./fleet-dial-scheduler.ts";
 export * from "./fleet-connection-status.ts";
 export * from "./fleet-environments.ts";
+export * from "./tmux-server-client.ts";
+export * from "./scoped-tmux-server-transport.ts";

package/packages/daemon-client/src/pane-stream-client.test.ts

@@ -13,7 +13,7 @@ const INSTANCE = "11111111-1111-4111-8111-111111111111";
 const REQUEST = "22222222-2222-4222-8222-222222222222";
 const TRANSACTION = "33333333-3333-4333-8333-333333333333";
 const OPERATION = "44444444-4444-4444-8444-444444444444";
-const TICKET = `ps1_${"a".repeat(43)}`;
+const TICKET = `ps2_${"a".repeat(43)}`;
 
 class FakeSocket implements PaneStreamClientSocket {
   readyState = 1;
@@ -51,9 +51,9 @@ class FakeSocket implements PaneStreamClientSocket {
 
 function descriptor(viewerMode: "interactive" | "read-only" = "interactive") {
   return {
-    protocolVersion: 1,
-    webSocketUrl: "ws://127.0.0.1:6060/v1/terminal/pane-streams/redeem",
-    subprotocol: "tmux-ide-pane-stream.v1",
+    protocolVersion: 2,
+    webSocketUrl: "ws://127.0.0.1:6060/v2/terminal/pane-streams/redeem",
+    subprotocol: "tmux-ide-pane-stream.v2",
     redemptionTicket: TICKET,
     daemonInstanceId: INSTANCE,
     requestId: REQUEST,
@@ -72,7 +72,7 @@ function options(socket: FakeSocket, overrides: Record<string, unknown> = {}) {
     hostClientId: "tui:one",
     requestId: REQUEST,
     stream: {
-      protocolVersion: 1 as const,
+      protocolVersion: 2 as const,
       workspaceName: "alpha",
       panes: ["pane.editor"],
       viewerMode: "interactive" as const,
@@ -114,7 +114,7 @@ function acceptInteractiveHandshake(socket: FakeSocket): void {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -172,6 +172,18 @@ describe("semantic pane-stream runtime client", () => {
     const frame = {
       type: "layout-snapshot",
       topologyEpoch: 4,
+      windowLinks: {
+        liveSessionId: "live-session." + "a".repeat(20),
+        linkRevision: 1,
+        activeLinkId: "window-link." + "a".repeat(32),
+        links: [
+          {
+            linkId: "window-link." + "a".repeat(32),
+            semanticWindowId: "window.one",
+            displayIndex: 0,
+          },
+        ],
+      },
       layouts: [
         {
           type: "layout",
@@ -203,6 +215,64 @@ describe("semantic pane-stream runtime client", () => {
     expect(socket.closed).toMatchObject({ code: 1008, reason: "protocol-error" });
   });
 
+  it.each(["session", "revision", "membership", "index"])(
+    "rejects %s link authority changes before publication",
+    async (change) => {
+      const socket = new FakeSocket();
+      acceptInteractiveHandshake(socket);
+      const published = mock();
+      const faults = mock();
+      const client = await openPaneStreamRuntimeClient(
+        options(socket, { onLayoutSnapshot: published, onFault: faults }),
+      );
+      const firstId = `window-link.${"a".repeat(32)}`;
+      const secondId = `window-link.${"b".repeat(32)}`;
+      const windowLinks = {
+        liveSessionId: `live-session.${"a".repeat(20)}`,
+        linkRevision: 3,
+        activeLinkId: firstId,
+        links: [
+          { linkId: firstId, semanticWindowId: "window.one", displayIndex: 0 },
+          { linkId: secondId, semanticWindowId: "window.one", displayIndex: 1 },
+        ],
+      };
+      const frame = {
+        type: "layout-snapshot",
+        topologyEpoch: 1,
+        windowLinks,
+        layouts: [
+          {
+            type: "layout",
+            semanticWindowId: "window.one",
+            windowName: "work",
+            currentWindow: true,
+            cols: 80,
+            rows: 24,
+            zoomed: false,
+            paneBorderStatus: "off",
+            panes: [{ pane: "pane.editor", left: 0, top: 0, width: 80, height: 24, active: true }],
+          },
+        ],
+      };
+      socket.message(frame);
+      socket.message({
+        ...frame,
+        topologyEpoch: 2,
+        windowLinks: { ...windowLinks, activeLinkId: secondId },
+      });
+      expect(published).toHaveBeenCalledTimes(2);
+      const changed = structuredClone(windowLinks);
+      if (change === "session") changed.liveSessionId = `live-session.${"b".repeat(20)}`;
+      if (change === "revision") changed.linkRevision = 2;
+      if (change === "membership") changed.links.pop();
+      if (change === "index") changed.links[1]!.displayIndex = 9;
+      socket.message({ ...frame, topologyEpoch: 3, windowLinks: changed });
+      expect(published).toHaveBeenCalledTimes(2);
+      expect(faults).toHaveBeenCalledTimes(1);
+      client.close();
+    },
+  );
+
   it("calibrates five bounded clock probes before readiness and never exposes raw origins", async () => {
     const socket = new FakeSocket();
     const calibrations: unknown[] = [];
@@ -213,7 +283,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             connectionClientId: "tui:one",
@@ -311,7 +381,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -367,7 +437,7 @@ describe("semantic pane-stream runtime client", () => {
           queueMicrotask(() =>
             socket.message({
               type: "ready",
-              protocolVersion: 1,
+              protocolVersion: 2,
               daemonInstanceId: INSTANCE,
               requestId: REQUEST,
               panes: ["pane.editor"],
@@ -431,7 +501,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -478,7 +548,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -527,7 +597,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -578,7 +648,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           failOpenSocket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -657,7 +727,7 @@ describe("semantic pane-stream runtime client", () => {
           queueMicrotask(() =>
             socket.message({
               type: "ready",
-              protocolVersion: 1,
+              protocolVersion: 2,
               daemonInstanceId: INSTANCE,
               requestId: REQUEST,
               panes: ["pane.editor"],
@@ -706,7 +776,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           duplicateSocket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -758,7 +828,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           clockSocket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -1152,7 +1222,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -1200,7 +1270,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             connectionClientId: "tui:one",
@@ -1278,7 +1348,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -1324,7 +1394,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -1428,7 +1498,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -1498,7 +1568,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -1587,7 +1657,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -1628,7 +1698,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -1691,7 +1761,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -1733,7 +1803,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -1961,7 +2031,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -2055,7 +2125,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -2202,7 +2272,7 @@ describe("semantic pane-stream runtime client", () => {
           queueMicrotask(() =>
             socket.message({
               type: "ready",
-              protocolVersion: 1,
+              protocolVersion: 2,
               daemonInstanceId: INSTANCE,
               requestId: REQUEST,
               panes: ["pane.editor"],
@@ -2279,7 +2349,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -2340,7 +2410,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -2420,7 +2490,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -2493,7 +2563,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -2546,7 +2616,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           panes: ["pane.editor"],
@@ -2567,7 +2637,7 @@ describe("semantic pane-stream runtime client", () => {
       queueMicrotask(() =>
         socket.message({
           type: "ready",
-          protocolVersion: 1,
+          protocolVersion: 2,
           daemonInstanceId: INSTANCE,
           requestId: REQUEST,
           connectionClientId: "web:foreign",
@@ -2589,7 +2659,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],
@@ -2648,7 +2718,7 @@ describe("semantic pane-stream runtime client", () => {
 
     socket.message({
       type: "error",
-      protocolVersion: 1,
+      protocolVersion: 2,
       code: "topology-changed",
       retryable: true,
     });
@@ -2669,7 +2739,7 @@ describe("semantic pane-stream runtime client", () => {
         queueMicrotask(() =>
           socket.message({
             type: "ready",
-            protocolVersion: 1,
+            protocolVersion: 2,
             daemonInstanceId: INSTANCE,
             requestId: REQUEST,
             panes: ["pane.editor"],

package/packages/daemon-client/src/pane-stream-client.ts

@@ -32,6 +32,7 @@ import {
   type TerminalDeliveryServerMessage,
   type TerminalDeliveryVisibility,
   type WorkspaceMultiplexerMutationResult,
+  type WindowLinkTopology,
 } from "@tmux-ide/contracts";
 import {
   calibratePaneStreamClocks,
@@ -449,6 +450,7 @@ export async function connectIssuedPaneStreamRuntimeClient(
   let closed = false;
   let verified = false;
   let layoutTopologyEpoch = -1;
+  let windowLinks: WindowLinkTopology | null = null;
   let resolveReady!: (client: PaneStreamRuntimeClient) => void;
   let rejectReady!: (error: Error) => void;
   const ready = new Promise<PaneStreamRuntimeClient>((resolve, reject) => {
@@ -1446,6 +1448,30 @@ export async function connectIssuedPaneStreamRuntimeClient(
     if (frame.type === "layout-snapshot") {
       if (frame.topologyEpoch <= layoutTopologyEpoch)
         return fail("Pane-stream layout topology epoch did not advance");
+      const incoming = frame.windowLinks;
+      if (windowLinks) {
+        if (
+          incoming.liveSessionId !== windowLinks.liveSessionId ||
+          incoming.linkRevision < windowLinks.linkRevision
+        )
+          return fail("Pane-stream window link authority regressed or changed session");
+        if (incoming.linkRevision === windowLinks.linkRevision) {
+          const previous = new Map(windowLinks.links.map((link) => [link.linkId, link]));
+          if (
+            incoming.links.length !== previous.size ||
+            incoming.links.some((link) => {
+              const observed = previous.get(link.linkId);
+              return (
+                !observed ||
+                observed.semanticWindowId !== link.semanticWindowId ||
+                observed.displayIndex !== link.displayIndex
+              );
+            })
+          )
+            return fail("Pane-stream link membership changed without a revision advance");
+        }
+      }
+      windowLinks = incoming;
       layoutTopologyEpoch = frame.topologyEpoch;
     }
     routeFrame(options, frame, fail);