tmux-ide 2.9.2 → 2.9.3

package/packages/daemon/dist/terminal/session-runtime/registry.js

@@ -137,6 +137,11 @@ export class SessionRuntimeRegistry {
         this.#mirror = new MirrorService({
             ...options.mirror,
             ...diagnosticMirrorOptions,
+            onSharedWindowConflict: (session, conflict) => {
+                options.mirror?.onSharedWindowConflict?.(session, conflict);
+                if (conflict)
+                    this.#sessions.get(session)?.invalidateSharedWindowAuthority();
+            },
             onNativeClientActivity: (session) => {
                 options.mirror?.onNativeClientActivity?.(session);
                 this.#sessions.get(session)?.noteNativeGeometryActivity();
@@ -171,6 +176,7 @@ export class SessionRuntimeRegistry {
         signal?.throwIfAborted();
         const runtime = this.#runtime(session);
         await abortable(runtime.whenReady(), signal);
+        await abortable(this.#mirror.verifyRegisteredWindows(), signal);
         if (this.#sessions.get(session) !== runtime) {
             throw new Error(`SessionRuntime ${session} was retired while prewarming`);
         }
@@ -213,6 +219,7 @@ export class SessionRuntimeRegistry {
                 throw new Error(`SessionRuntime ${session} is attached to a different tmux identity`);
             }
             signal?.throwIfAborted();
+            await abortable(this.#mirror.verifyRegisteredWindows(), signal);
             runtime.qualifyTrustedInventory(runtimeSessionId);
         }
         finally {
@@ -235,24 +242,28 @@ export class SessionRuntimeRegistry {
         if (!runtime?.trustedInventoryQualified()) {
             throw new Error(`SessionRuntime ${session} has no proof-qualified inventory authority`);
         }
+        const epoch = runtime.trustedInventoryEpoch;
         const inventory = await this.#observeTerminalAttempt("terminal-trusted-inventory-attempt", abortable(runtime.describeTrustedInventory(), signal));
-        if (this.#sessions.get(session) !== runtime || !runtime.trustedInventoryQualified()) {
+        if (this.#sessions.get(session) !== runtime ||
+            !runtime.trustedInventoryQualified() ||
+            runtime.trustedInventoryEpoch !== epoch) {
             throw new Error(`SessionRuntime ${session} changed during trusted inventory discovery`);
         }
         if (!inventory) {
             throw new Error(`SessionRuntime ${session} lost its retained inventory authority`);
         }
         const token = Object.freeze({});
-        this.#trustedInventoryTokens.set(token, runtime);
+        this.#trustedInventoryTokens.set(token, { runtime, epoch });
         return Object.freeze({ inventory, token });
     }
     isTrustedSessionInventoryCandidateCurrent(session, token) {
         if (this.#disposed)
             return false;
-        const runtime = this.#trustedInventoryTokens.get(token);
-        return (runtime !== undefined &&
-            this.#sessions.get(session) === runtime &&
-            runtime.trustedInventoryQualified());
+        const candidate = this.#trustedInventoryTokens.get(token);
+        return (candidate !== undefined &&
+            this.#sessions.get(session) === candidate.runtime &&
+            candidate.runtime.trustedInventoryEpoch === candidate.epoch &&
+            candidate.runtime.trustedInventoryQualified());
     }
     hasProofQualifiedInventory(session) {
         return ((this.#sessions.get(session)?.trustedInventoryQualified() ?? false) &&
@@ -269,6 +280,14 @@ export class SessionRuntimeRegistry {
             return Promise.reject(new Error("Session runtime disposed"));
         return this.#mirror.executeWindowLinkAction(session, request);
     }
+    /** Resolve pending ownership before an asynchronous owner-authorized mutation. */
+    async verifyWindowOwnership() {
+        await this.#mirror.verifyRegisteredWindows();
+    }
+    /** Install the bounded registered-session membership reader. */
+    setRegisteredWindowReader(reader) {
+        return this.#mirror.setRegisteredWindowReader(reader);
+    }
     /** Retire one no-longer-registered session without disturbing siblings. */
     async retireSession(session) {
         const runtime = this.#sessions.get(session);
@@ -665,6 +684,10 @@ class SessionRuntime {
     #releasedLeases = new Set();
     #disposed = false;
     #trustedInventoryRuntimeSessionId = null;
+    #trustedInventoryEpoch = 0;
+    get trustedInventoryEpoch() {
+        return this.#trustedInventoryEpoch;
+    }
     #activeCausalCellProbes = 0;
     constructor(generation, session, mirror, createControllerToken, scheduler, observability, createTraceCorrelator, nativeGeometryHysteresisMs, submitAuthorized) {
         this.generation = generation;
@@ -725,6 +748,7 @@ class SessionRuntime {
         this.#publishAuthority();
     }
     acquireAuthority(clientId, authority) {
+        this.assertNoSharedWindow();
         if (authority === "input" && this.#controllerClientId !== clientId) {
             // Input's executable proof is the compatibility controller lease. The
             // transport synchronization seam must establish/handoff it first.
@@ -776,6 +800,7 @@ class SessionRuntime {
         });
     }
     acquireController(clientId) {
+        this.assertNoSharedWindow();
         this.#assertConnected(clientId);
         if (this.#controllerClientId === clientId) {
             this.#authority.updatePresence(clientId, "foreground");
@@ -836,6 +861,7 @@ class SessionRuntime {
         this.#authority.release(callerClientId, "geometry");
     }
     assertController(lease, callerClientId) {
+        this.assertNoSharedWindow();
         const parsedLease = this.#validatedLease(lease);
         if (parsedLease.generation !== this.generation ||
             parsedLease.session !== this.session ||
@@ -973,6 +999,7 @@ class SessionRuntime {
             this.#mirror.fitWindowViewport(this.session, semanticWindowId, cols, rows);
     }
     fitViewportWithAuthority(clientId, lease, cols, rows, semanticWindowId) {
+        this.assertNoSharedWindow();
         const parsed = SessionRuntimeAuthorityLeaseSchemaZ.parse(lease);
         let exact;
         try {
@@ -1016,13 +1043,16 @@ class SessionRuntime {
         return await this.#mirror.describeSession(this.session);
     }
     qualifyTrustedInventory(runtimeSessionId) {
+        this.assertNoSharedWindow();
         if (this.#disposed || !this.#retention) {
             throw new Error(`SessionRuntime ${this.session} is not retained`);
         }
         this.#trustedInventoryRuntimeSessionId = runtimeSessionId;
     }
     trustedInventoryQualified() {
-        return !this.#disposed && this.#trustedInventoryRuntimeSessionId !== null;
+        return (!this.#disposed &&
+            this.#trustedInventoryRuntimeSessionId !== null &&
+            !this.#mirror.hasSharedWindowConflict(this.session));
     }
     async describeTrustedInventory() {
         if (!this.trustedInventoryQualified()) {
@@ -1176,8 +1206,26 @@ class SessionRuntime {
         this.#authority.disconnect(consumer.clientId);
         this.#publishAuthority();
     }
+    assertNoSharedWindow() {
+        const message = this.#mirror.windowOwnershipMessage(this.session);
+        if (message) {
+            throw new SessionRuntimeControllerLeaseError("controller-conflict", message);
+        }
+    }
+    invalidateSharedWindowAuthority() {
+        this.#trustedInventoryRuntimeSessionId = null;
+        this.#trustedInventoryEpoch += 1;
+        this.#clearController();
+        for (const clientId of this.#consumersByClientId.keys()) {
+            for (const authority of ["input", "focus", "geometry"])
+                this.#authority.release(clientId, authority);
+        }
+        this.#completedHandoffs.clear();
+        this.#publishAuthority();
+    }
     noteControlExit() {
         this.#trustedInventoryRuntimeSessionId = null;
+        this.#trustedInventoryEpoch += 1;
         const retention = this.#retention;
         this.#retention = null;
         this.#startPromise = null;
@@ -1198,6 +1246,7 @@ class SessionRuntime {
             return;
         this.#disposed = true;
         this.#trustedInventoryRuntimeSessionId = null;
+        this.#trustedInventoryEpoch += 1;
         const consumers = [...this.#consumers];
         await Promise.allSettled(consumers.map((consumer) => consumer.close()));
         this.#clearController();

package/packages/daemon/dist/terminal/session-runtime/semantic-mutation-executor.js

@@ -276,7 +276,9 @@ export class SessionSemanticMutationExecutor {
         let trace = null;
         if (this.#observability.enabled && this.#options.traceAuthority) {
             try {
-                trace = this.#observability.beginTrace(intent.verb === "workspace.pane.select" ? "window-switch" : "semantic-mutation", this.#options.traceAuthority, operationId);
+                trace = this.#observability.beginTrace(intent.verb === "workspace.pane.select" || intent.verb === "workspace.window.link.select"
+                    ? "window-switch"
+                    : "semantic-mutation", this.#options.traceAuthority, operationId);
             }
             catch {
                 trace = null;

package/packages/daemon/dist/tui/mirror/dialog-model.js

@@ -16,6 +16,8 @@
  * Rows span the box interior in x: [left+1, left+width-1).
  */
 import { fuzzyFilter } from "../team/fuzzy.js";
+import { wrapText } from "./terminal-text.js";
+export { wrapText } from "./terminal-text.js";
 // ── Constants ────────────────────────────────────────────────────────────────
 /** Box width — matches the palette so the two overlays read as one family. */
 export const DIALOG_W = 60;
@@ -66,41 +68,6 @@ export function dialogPos(termW, termH, width) {
         top: Math.max(1, Math.floor(termH / 6)),
     };
 }
-/** PURE — greedy word-wrap for the confirm body (never returns empty for
- *  non-empty text; words longer than the width hard-break). */
-export function wrapText(text, width) {
-    if (width <= 0)
-        return [text];
-    const out = [];
-    for (const para of text.split("\n")) {
-        let line = "";
-        for (const word of para.split(/\s+/).filter(Boolean)) {
-            if (line.length === 0) {
-                let w = word;
-                while (w.length > width) {
-                    out.push(w.slice(0, width));
-                    w = w.slice(width);
-                }
-                line = w;
-            }
-            else if (line.length + 1 + word.length <= width) {
-                line += ` ${word}`;
-            }
-            else {
-                out.push(line);
-                let w = word;
-                while (w.length > width) {
-                    out.push(w.slice(0, width));
-                    w = w.slice(width);
-                }
-                line = w;
-            }
-        }
-        if (line.length > 0 || para.length === 0)
-            out.push(line);
-    }
-    return out.length > 0 ? out : [""];
-}
 /** PURE — the interior text width of the box (borders + 1-cell padding each side). */
 export function dialogInnerW(width) {
     return width - 4;

package/packages/daemon/dist/tui/mirror/runtime/application-daemon-authority-owner.js

@@ -4,6 +4,7 @@ import { watch } from "node:fs";
 import { basename, dirname } from "node:path";
 import { getCanonicalDaemonInfoPath, isCanonicalDaemonAlive, readCanonicalDaemonInfo, } from "../../../lib/canonical-daemon.js";
 import { SshConnectionError, openSshDaemonTransport, probeSshDaemonIdentity, } from "../../../lib/ssh-daemon-transport.js";
+import { tuiPerfMark } from "./application-performance-log.js";
 const defaults = {
     readLocal: readCanonicalDaemonInfo,
     isLocalAlive: isCanonicalDaemonAlive,
@@ -97,6 +98,13 @@ export function createApplicationDaemonAuthority(dependencies = defaults) {
     const statusListeners = new Set();
     const updateStatus = (next) => {
         diagnostic = Object.freeze(next);
+        tuiPerfMark("machine-connection-status", {
+            machine: label,
+            ...next,
+            instanceId: remote?.instanceId ?? null,
+            pid: remote?.pid ?? null,
+            port: remote?.port ?? null,
+        });
         for (const listener of statusListeners) {
             try {
                 listener();

package/packages/daemon/dist/tui/mirror/runtime/application-home-fleet.js

@@ -49,6 +49,23 @@ export function projectHomeFleet(catalog, groups, filter) {
     rows.sort((a, b) => a.key.localeCompare(b.key));
     const missing = machines.filter((machine) => machine.state !== "ready" ||
         !groups.find((group) => group.machineId === machine.id)?.available);
+    const activityPending = (machineId) => {
+        const observation = groups.find((group) => group.machineId === machineId)?.observation;
+        // A live observation whose binding is no longer available belongs to a
+        // retiring endpoint; its replacement must publish before it is current.
+        return !observation || observation.phase === "loading" || observation.phase === "live";
+    };
+    const coverageNotes = missing.map((machine) => {
+        if (machine.state !== "ready")
+            return `${machine.label}: ${machine.state}`;
+        const observation = groups.find((group) => group.machineId === machine.id)?.observation;
+        const status = activityPending(machine.id)
+            ? "loading agent activity"
+            : observation?.phase === "partial"
+                ? "agent activity incomplete"
+                : "agent activity unavailable";
+        return `${machine.label}: connected; ${status}`;
+    });
     const query = filter.query?.trim().toLocaleLowerCase() ?? "";
     const matching = query
         ? rows.filter((row) => [
@@ -65,7 +82,8 @@ export function projectHomeFleet(catalog, groups, filter) {
         phase: missing.length
             ? rows.length || observedSessions
                 ? "partial"
-                : machines.some((machine) => machine.state === "connecting")
+                : machines.some((machine) => machine.state === "connecting") ||
+                    missing.some((machine) => machine.state === "ready" && activityPending(machine.id))
                     ? "loading"
                     : "unavailable"
             : "live",
@@ -78,7 +96,7 @@ export function projectHomeFleet(catalog, groups, filter) {
         refreshingSessionKeys: [],
         unavailableSessionKeys: [...unavailable],
         note: missing.length
-            ? `${missing.map((machine) => `${machine.label}: ${machine.state === "ready" ? "partial observations" : machine.state}`).join(" · ")} · unavailable rows show last observed activity`
+            ? `${coverageNotes.join(" · ")}${unavailable.size > 0 ? " · unavailable rows show last observed activity" : ""}`
             : rows.length === 0 && filter.attentionOnly
                 ? "No agents need attention in this view."
                 : null,

package/packages/daemon/dist/tui/mirror/runtime/application-machine-agents.js

@@ -1,3 +1,4 @@
+import { isDeepStrictEqual } from "node:util";
 import { machineResourceKey } from "@tmux-ide/core";
 import { applicationMachineAuthorityManager, } from "./application-machine-authority.js";
 import { createApplicationHomeAgentObserver, } from "./application-home-agent-observer.js";
@@ -29,7 +30,7 @@ export function createApplicationMachineAgents(options) {
     const publish = () => {
         if (disposed)
             return;
-        snapshot = Object.freeze(catalog.groups.map((group) => {
+        const next = Object.freeze(catalog.groups.map((group) => {
             const entry = entries.get(group.id);
             const current = !!entry && entry.binding === bindingFor(entry.handle);
             return Object.freeze({
@@ -47,6 +48,11 @@ export function createApplicationMachineAgents(options) {
                 }))),
             });
         }));
+        // Fresh authority checks above still run on every observation. Identical
+        // presentation data must not invalidate the Home/sidebar/tab subscribers.
+        if (isDeepStrictEqual(snapshot, next))
+            return;
+        snapshot = next;
         for (const listener of listeners) {
             try {
                 listener(snapshot);

package/packages/daemon/dist/tui/mirror/runtime/application-machine-authority.js

@@ -14,6 +14,7 @@ export function createApplicationMachineAuthorityManager(dependencies = {
     let selectedId = LOCAL_MACHINE_ID;
     let selectedEpoch = 0;
     let disposed = false;
+    let stopProfiles = null;
     const safe = (callback) => {
         try {
             callback();
@@ -31,7 +32,7 @@ export function createApplicationMachineAuthorityManager(dependencies = {
             safe(() => listener(generation));
     };
     const changed = (machine, generation) => {
-        if (disposed)
+        if (disposed || machine.retired)
             return;
         machine.epoch++;
         for (const listener of machine.listeners)
@@ -52,7 +53,7 @@ export function createApplicationMachineAuthorityManager(dependencies = {
                 changed(machine, generation);
         })
             .then((stop) => {
-            if (disposed || machine.owner !== owner)
+            if (disposed || machine.retired || machine.owner !== owner)
                 stop();
             else
                 machine.stopObserver = stop;
@@ -80,23 +81,28 @@ export function createApplicationMachineAuthorityManager(dependencies = {
             stopObserver: null,
             observingOwner: null,
             stopStatus: null,
+            retired: false,
         };
         const handle = Object.freeze({
             id,
-            label,
+            get label() {
+                return machine.label;
+            },
             kind: machine.kind,
             ready,
-            read: () => (disposed ? null : machine.owner.read()),
-            isAlive: (info) => disposed ? Promise.resolve(false) : machine.owner.isAlive(info),
+            read: () => (disposed || machine.retired ? null : machine.owner.read()),
+            isAlive: (info) => disposed || machine.retired ? Promise.resolve(false) : machine.owner.isAlive(info),
             endpoint: () => Object.freeze({
                 ...machine.owner.endpoint(),
                 kind: machine.kind,
-                label: profile ? label : null,
+                label: machine.profile ? machine.label : null,
                 epoch: machine.epoch,
-                ...(disposed ? { state: "disconnected", remote: null, localBaseUrl: null } : {}),
+                ...(disposed || machine.retired
+                    ? { state: "disconnected", remote: null, localBaseUrl: null }
+                    : {}),
             }),
             observe: async (listener) => {
-                if (disposed)
+                if (disposed || machine.retired)
                     return () => { };
                 if (machine.kind === "local")
                     observe(machine, machine.owner);
@@ -119,7 +125,7 @@ export function createApplicationMachineAuthorityManager(dependencies = {
         });
         observe(machine, owner);
         publish();
-        void initializing.then(() => settle(!disposed), () => settle(false));
+        void initializing.then(() => settle(!disposed && !machine.retired), () => settle(false));
         return machine;
     };
     makeMachine(LOCAL_MACHINE_ID, "Local");
@@ -206,6 +212,48 @@ export function createApplicationMachineAuthorityManager(dependencies = {
                 if (profile.enabled)
                     manager.add(profile);
         },
+        reconcile(profiles) {
+            if (disposed)
+                return;
+            const next = SavedMachineRegistrySchema.parse({ version: 1, machines: profiles });
+            const previousSelection = selectedId;
+            for (const machine of [...machines.values()]) {
+                if (!machine.profile)
+                    continue;
+                const profile = next.machines.find((candidate) => candidate.id === machine.id && candidate.enabled);
+                if (profile &&
+                    profile.sshTarget === machine.profile.sshTarget &&
+                    profile.expectedEnvironmentId === machine.profile.expectedEnvironmentId) {
+                    // Labels are presentation metadata, not transport identity. Preserve
+                    // the connected owner and every consumer holding its stable handle.
+                    machine.label = profile.label;
+                    machine.profile = profile;
+                    continue;
+                }
+                if (selectedId === machine.id)
+                    manager.select(LOCAL_MACHINE_ID);
+                machine.retired = true;
+                machine.stopStatus?.();
+                machine.stopObserver?.();
+                for (const listener of machine.listeners)
+                    safe(() => listener(null));
+                machine.owner.dispose();
+                machine.listeners.clear();
+                machines.delete(machine.id);
+            }
+            for (const profile of next.machines)
+                if (profile.enabled)
+                    manager.add(profile);
+            if (machines.has(previousSelection))
+                manager.select(previousSelection);
+            publish();
+        },
+        followProfiles(subscribe) {
+            if (disposed)
+                return;
+            stopProfiles?.();
+            stopProfiles = subscribe(manager.reconcile);
+        },
         read: () => machines.get(selectedId)?.handle.read() ?? null,
         isAlive: (info) => machines.get(selectedId)?.handle.isAlive(info) ?? Promise.resolve(false),
         endpoint: () => Object.freeze({ ...machines.get(selectedId).handle.endpoint(), epoch: selectedEpoch }),
@@ -223,6 +271,8 @@ export function createApplicationMachineAuthorityManager(dependencies = {
             if (disposed)
                 return;
             disposed = true;
+            stopProfiles?.();
+            stopProfiles = null;
             lifetime.abort();
             selectedEpoch++;
             selectedGeneration(null);

package/packages/daemon/dist/tui/mirror/runtime/application-machine-navigation.js

@@ -123,7 +123,9 @@ export function createApplicationMachineNavigation(options) {
             return false;
         }
         const selected = candidates[0];
-        const sameSelection = activeSessionKey() === selected.id && options.sessionName() === name;
+        const sameSelection = manager.snapshot().selectedMachineId === id &&
+            activeSessionKey() === selected.id &&
+            options.sessionName() === name;
         setActiveSessionKey(selected.id);
         expectedLiveSessionId = selected.liveSessionId;
         server = selected.server;
@@ -222,18 +224,25 @@ export function createApplicationMachineNavigation(options) {
             tabs.observe(tab.key, tabAgents(tab));
     });
     const sidebar = {
-        groups: () => snapshot().groups.map((group) => ({
-            ...group,
-            agentsAvailable: group.sessions.some((session) => isDefaultSession(group.id, session)) &&
-                (agentGroups().find((value) => value.machineId === group.id)?.available ?? false),
-            agents: !group.sessions.some((session) => isDefaultSession(group.id, session))
-                ? []
-                : (agentGroups().find((value) => value.machineId === group.id)?.agents ?? []).map((agent) => ({
-                    ...agent,
-                    server: group.sessions.find((session) => session.liveSessionId === agent.liveSessionId &&
-                        isDefaultSession(group.id, session))?.server,
-                })),
-        })),
+        groups: () => {
+            const groupsById = new Map(agentGroups().map((group) => [group.machineId, group]));
+            return snapshot().groups.map((group) => {
+                // Read once per projection: local authority reads validate the record on disk.
+                // The next projection (and action admission) still observes replacement immediately.
+                const instanceId = manager.getMachine(group.id)?.read()?.instanceId;
+                const defaultSessions = group.sessions.filter((session) => !session.server || session.server.generation === instanceId);
+                const agents = defaultSessions.length ? groupsById.get(group.id) : undefined;
+                return {
+                    ...group,
+                    agentsAvailable: agents?.available ?? false,
+                    agents: (agents?.agents ?? []).map((agent) => ({
+                        ...agent,
+                        server: defaultSessions.find((session) => session.liveSessionId === agent.liveSessionId)
+                            ?.server,
+                    })),
+                };
+            });
+        },
         tabs: () => {
             tabRevision();
             const value = tabs.snapshot();
@@ -409,7 +418,9 @@ export function createApplicationMachineNavigation(options) {
         paletteCommands() {
             const groupsById = new Map(agentGroups().map((group) => [group.machineId, group]));
             return snapshot().groups.flatMap((group) => {
-                const agentGroup = !group.sessions.some((session) => isDefaultSession(group.id, session))
+                const daemon = manager.getMachine(group.id)?.read();
+                const isDefault = (session) => !session.server || session.server.generation === daemon?.instanceId;
+                const agentGroup = !group.sessions.some((session) => isDefault(session))
                     ? undefined
                     : groupsById.get(group.id);
                 const agentsBySession = new Map();
@@ -420,7 +431,6 @@ export function createApplicationMachineNavigation(options) {
                     list.push(agent);
                     agentsBySession.set(agent.liveSessionId, list);
                 }
-                const daemon = manager.getMachine(group.id)?.read();
                 const sessions = group.sessions.flatMap((session) => {
                     if (!session.liveSessionId)
                         return [];
@@ -433,7 +443,7 @@ export function createApplicationMachineNavigation(options) {
                         liveSessionId: session.liveSessionId,
                         server: session.server,
                         hostLabel: `${group.label}${session.serverLabel ? ` / ${session.serverLabel}` : ""}`,
-                        agentActivities: isDefaultSession(group.id, session) && agentGroup?.available
+                        agentActivities: isDefault(session) && agentGroup?.available
                             ? (agentsBySession.get(session.liveSessionId) ?? []).map((a) => ({
                                 paneId: a.paneId,
                                 attention: a.attention,
@@ -445,9 +455,7 @@ export function createApplicationMachineNavigation(options) {
                     };
                     return [
                         { kind: "open-session", sessionName: session.name, label: session.name, fleet },
-                        ...(isDefaultSession(group.id, session)
-                            ? (agentsBySession.get(session.liveSessionId) ?? [])
-                            : []).map((a) => ({
+                        ...(isDefault(session) ? (agentsBySession.get(session.liveSessionId) ?? []) : []).map((a) => ({
                             kind: "jump-agent",
                             sessionName: session.name,
                             paneId: a.paneId,

package/packages/daemon/dist/tui/mirror/runtime/application-machine-sidebar.jsx

@@ -5,13 +5,16 @@ import { fleetHostColor } from "./fleet-presentation.js";
 /* @jsxImportSource @opentui/solid */
 import { fleetConnectionMessage, } from "@tmux-ide/daemon-client/fleet-connection-status";
 import { For, Show, createEffect, createMemo, createSignal, } from "solid-js";
-import { friendlySessionLabel } from "../terminal-text.js";
+import { friendlySessionLabel, wrapText } from "../terminal-text.js";
 import { KeyHint } from "../ui/key-hint.jsx";
 import { NavigationRow } from "../ui/navigation-row.jsx";
 import { Surface } from "../ui/surface.jsx";
 import { useKeyboardRoute } from "../ui/keyboard-router.jsx";
 /** Pure machine navigation. All connection and session authority stays with the caller. */
 export function ApplicationMachineSidebar(props) {
+    // All visible sections share one projection for the current reactive inputs.
+    // Event handlers retain the model's fresh authority checks at action time.
+    const groups = createMemo(() => props.model.groups());
     const [localFocused, setLocalFocused] = createSignal(false);
     const focused = () => props.model.focused?.() ?? localFocused();
     const [localCollapsed, setCollapsed] = createSignal(new Set());
@@ -19,16 +22,14 @@ export function ApplicationMachineSidebar(props) {
     const [selectedKey, setSelectedKey] = createSignal(null);
     let scroll;
     const agentHeight = () => (props.agentRows ?? 0) > 0
-        ? Math.min((props.agentRows ?? 0) + 2, Math.max(0, Math.floor(props.height / 2)))
+        ? Math.min((props.agentRows ?? 0) + 2, Math.max(0, Math.floor(props.height / 2)), Math.max(0, props.height - fixedHeight() - controlsHeight() - 2))
         : 0;
-    const controlsHeight = () => (props.height >= 8 && controlGroup() ? 4 : 0);
+    const controlsHeight = () => (props.height >= 8 && controlGroup() ? controlTextHeight() + 2 : 0);
     const searchHeight = () => (props.model.onOpenSwitcher ? 1 : 0) + (props.model.onOpenAttention ? 1 : 0);
-    const machineHeight = () => Math.max(0, props.height -
-        1 -
-        (props.model.onAddMachine ? 1 : 0) -
-        agentHeight() -
-        controlsHeight() -
-        searchHeight());
+    const fixedHeight = () => 1 + (props.model.onAddMachine ? 1 : 0) + searchHeight();
+    // Keep both action rows and at least two machine rows available on short terminals.
+    const controlTextHeight = () => Math.min(controlTextLines().length, Math.max(1, props.height - fixedHeight() - 4));
+    const machineHeight = () => Math.max(0, props.height - fixedHeight() - agentHeight() - controlsHeight());
     const active = (row) => row.group.id === props.model.activeMachineId() &&
         (row.agent
             ? row.group.state === "ready" &&
@@ -46,7 +47,7 @@ export function ApplicationMachineSidebar(props) {
                 : row.session?.name === props.model.activeSessionName());
     const preferenceKey = (group) => group.environmentId ?? group.id;
     const rows = createMemo(() => [
-        ...props.model.groups().flatMap((group) => groupApplicationTeamRows(group.agents ?? []).map((agent) => ({
+        ...groups().flatMap((group) => groupApplicationTeamRows(group.agents ?? []).map((agent) => ({
             key: JSON.stringify([
                 group.id,
                 "agent",
@@ -57,7 +58,7 @@ export function ApplicationMachineSidebar(props) {
             group,
             agent,
         }))),
-        ...props.model.groups().flatMap((group) => [
+        ...groups().flatMap((group) => [
             { key: JSON.stringify([group.id]), group },
             ...group.sessions
                 .filter((session) => !collapsed().has(preferenceKey(group)) ||
@@ -118,6 +119,12 @@ export function ApplicationMachineSidebar(props) {
                 : "disconnected"
             : diagnostic.phase;
     };
+    const controlTextLines = createMemo(() => {
+        const group = controlGroup();
+        return group
+            ? wrapText(group.diagnostic ? fleetConnectionMessage(group.diagnostic) : connectionDetail(group), Math.max(1, props.width))
+            : [];
+    });
     const toggle = (group, value = !collapsed().has(preferenceKey(group))) => {
         const next = new Set(collapsed());
         if (value)
@@ -163,7 +170,7 @@ export function ApplicationMachineSidebar(props) {
     const sectionGap = (row) => (!row.session && !row.agent && !row.server ? 1 : 0);
     const rowHeight = (row) => (row.agent ? 2 : row.serverHeading ? 2 : 1) +
         sectionGap(row) +
-        (hasAgents() && row.key === JSON.stringify([props.model.groups()[0]?.id]) ? 1 : 0);
+        (hasAgents() && row.key === JSON.stringify([groups()[0]?.id]) ? 1 : 0);
     const revealFocusedRow = () => {
         if (!focused() || !scroll)
             return;
@@ -346,7 +353,7 @@ export function ApplicationMachineSidebar(props) {
                         props.model.onSelectServer?.(row.group.id, row.session.server);
                 }}/>
                 </Show>
-                <Show when={hasAgents() && row.key === JSON.stringify([props.model.groups()[0]?.id])}>
+                <Show when={hasAgents() && row.key === JSON.stringify([groups()[0]?.id])}>
                   <text height={1} fg={props.theme.roles.text.secondary}>
                     {" "}
                     Machines
@@ -399,14 +406,12 @@ export function ApplicationMachineSidebar(props) {
         <KeyHint theme={props.theme} keys={CHROME_ACTIONS.sessions.keys} label="Browse all sessions" width={props.width} quiet button onPress={() => props.model.onOpenSwitcher?.()}/>
       </Show>
       <Show when={props.model.onOpenAttention}>
-        <KeyHint theme={props.theme} keys={CHROME_ACTIONS.attention.keys} label={`${CHROME_ACTIONS.attention.label} (${props.model.groups().reduce((sum, group) => sum + (group.state === "ready" ? (group.agents ?? []).filter((agent) => agent.attention && !agent.disabled).length : 0), 0)})`} width={props.width} quiet button onPress={() => props.model.onOpenAttention?.()}/>
+        <KeyHint theme={props.theme} keys={CHROME_ACTIONS.attention.keys} label={`${CHROME_ACTIONS.attention.label} (${groups().reduce((sum, group) => sum + (group.state === "ready" ? (group.agents ?? []).filter((agent) => agent.attention && !agent.disabled).length : 0), 0)})`} width={props.width} quiet button onPress={() => props.model.onOpenAttention?.()}/>
       </Show>
       <Show when={controlsHeight() > 0 && controlGroup()}>
         {(group) => (<>
-            <text height={2} fg={props.theme.roles.text.secondary}>
-              {group().diagnostic
-                ? fleetConnectionMessage(group().diagnostic)
-                : connectionDetail(group())}
+            <text height={controlTextHeight()} flexShrink={0} fg={props.theme.roles.text.secondary}>
+              {controlTextLines().join("\n")}
             </text>
             <KeyHint theme={props.theme} keys={SIDEBAR_ACTIONS.retry.keys} label={SIDEBAR_ACTIONS.retry.label} width={props.width} quiet button onPress={() => props.model.onRetryMachine?.(group().id)}/>
             <KeyHint theme={props.theme} keys={SIDEBAR_ACTIONS.disconnect.keys} label={SIDEBAR_ACTIONS.disconnect.label} width={props.width} quiet button onPress={() => props.model.onDisconnectMachine?.(group().id)}/>