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

package/packages/daemon/dist/tui/mirror/runtime/application-terminal-interaction-controller.js

@@ -54,6 +54,29 @@ export function createApplicationTerminalInteractionController(options) {
     let previousCurrentWindow = null;
     let pendingResizeGuide = null;
     let pendingPaneResize = null;
+    let paneResizeFrame = null;
+    let resizePaneIdentity = null;
+    const captureResizePaneIdentity = (semanticPaneId) => {
+        const identity = options.generation()?.adapter?.paneCanonicalIdentity(semanticPaneId);
+        resizePaneIdentity = identity
+            ? {
+                semanticPaneId,
+                incarnation: identity.incarnation,
+                generation: identity.generation,
+                sourceEpoch: identity.sourceEpoch,
+            }
+            : null;
+    };
+    const resizePaneIdentityCurrent = () => {
+        if (!resizePaneIdentity)
+            return false;
+        const current = options
+            .generation()
+            ?.adapter?.paneCanonicalIdentity(resizePaneIdentity.semanticPaneId);
+        return (current?.incarnation === resizePaneIdentity.incarnation &&
+            current?.generation === resizePaneIdentity.generation &&
+            current?.sourceEpoch === resizePaneIdentity.sourceEpoch);
+    };
     let lastResizeGuidePresentationDigest = null;
     let lastWindowPresentationDigest = null;
     let diagnosticWindowFrame = null;
@@ -144,22 +167,35 @@ export function createApplicationTerminalInteractionController(options) {
     };
     const maybeRequestPaneResizeFrame = () => {
         const pending = pendingPaneResize;
-        if (!pending ||
-            pending.frameRequested ||
-            pending.receiptCells === null ||
-            pending.layoutCells !== pending.receiptCells)
+        if (!pending || pending.receiptCells === null || pending.layoutCells !== pending.receiptCells)
             return;
-        if (!options.diagnosticsEnabled) {
+        if (!resizePaneIdentityCurrent()) {
             pendingPaneResize = null;
+            resizeTransaction.retire();
             return;
         }
-        pending.frameRequested = true;
-        try {
-            options.requestRender?.();
-        }
-        catch {
-            pendingPaneResize = null;
+        // Detach before settlement: it can synchronously dispatch the latest target.
+        pendingPaneResize = null;
+        if (options.diagnosticsEnabled && pending.receiptOutcome !== "unchanged") {
+            if (paneResizeFrame)
+                diagnose("pane-resize-frame-superseded", { operationId: paneResizeFrame.operationId });
+            paneResizeFrame = pending;
+            pending.frameRequested = true;
+            try {
+                options.requestRender?.();
+            }
+            catch {
+                paneResizeFrame = null;
+            }
         }
+        resizeTransaction.observeLayout({
+            operationId: pending.operationId,
+            authorityGeneration: pending.daemonGeneration,
+            workspaceName: pending.workspaceName,
+            semanticPaneId: pending.semanticPaneId,
+            axis: pending.axis,
+            cells: pending.receiptCells,
+        });
     };
     const dispatchPaneResize = (preview, source, operationId, beforeCells) => {
         const expected = liveResizeTarget();
@@ -205,6 +241,7 @@ export function createApplicationTerminalInteractionController(options) {
             layoutCells: null,
             frameRequested: false,
         };
+        diagnose("pane-resize-dispatch", resizeDiagnosticDetails(pendingPaneResize));
         const failure = { current: null };
         void resizeTerminalPane(expected, liveResizeTarget, {
             operationId,
@@ -238,32 +275,15 @@ export function createApplicationTerminalInteractionController(options) {
                 ...resizeDiagnosticDetails(pending),
                 verb: "workspace.pane.resize",
             });
-            if (receipt.outcome === "unchanged" && receipt.cells === pending.beforeCells) {
-                pending.layoutCells = receipt.cells;
-                resizeTransaction.observeLayout({
-                    operationId,
-                    authorityGeneration: pending.daemonGeneration,
-                    workspaceName: pending.workspaceName,
-                    semanticPaneId: pending.semanticPaneId,
-                    axis: pending.axis,
-                    cells: receipt.cells,
-                });
+            // A clamp/no-op still needs current canonical truth, not the guide.
+            const observed = paneCells(options.layout(), pending.semanticPaneId, pending.axis);
+            if (observed === receipt.cells)
+                pending.layoutCells = observed;
+            if (receipt.outcome === "unchanged")
                 diagnoseCritical(`pane-resize:${operationId}:unchanged`, "pane-resize-unchanged", {
                     ...resizeDiagnosticDetails(pending),
                     changed: false,
                 });
-                pendingPaneResize = null;
-                return;
-            }
-            if (pending.layoutCells === receipt.cells)
-                resizeTransaction.observeLayout({
-                    operationId,
-                    authorityGeneration: pending.daemonGeneration,
-                    workspaceName: pending.workspaceName,
-                    semanticPaneId: pending.semanticPaneId,
-                    axis: pending.axis,
-                    cells: receipt.cells,
-                });
             maybeRequestPaneResizeFrame();
         })
             .catch(() => {
@@ -288,8 +308,15 @@ export function createApplicationTerminalInteractionController(options) {
         submit: ({ operationId, intent }) => {
             const state = resizeTransaction.state();
             const context = resizeCommitContext;
-            if (state.phase !== "pending" || state.operationId !== operationId || !context)
-                return;
+            const live = liveResizeTarget();
+            if (state.phase !== "pending" ||
+                state.operationId !== operationId ||
+                !context ||
+                !resizePaneIdentityCurrent() ||
+                live?.daemonGeneration !== state.authorityGeneration ||
+                live.workspaceName !== state.workspaceName ||
+                !options.layout().current?.panes.some((pane) => pane.pane === intent.semanticPaneId))
+                throw new Error("resize target retired");
             dispatchPaneResize({
                 semanticPaneId: intent.semanticPaneId,
                 axis: intent.axis,
@@ -299,6 +326,8 @@ export function createApplicationTerminalInteractionController(options) {
             }, context.source, operationId, state.canonicalCells);
         },
         onState: (state) => {
+            if (state.phase === "idle" && state.outcome?.kind === "settled")
+                resizeCommitContext = null;
             if (state.phase === "idle" && state.outcome?.kind === "reverted") {
                 diagnose("pane-resize-transaction-reverted", {
                     operationId: state.outcome.operationId,
@@ -516,6 +545,7 @@ export function createApplicationTerminalInteractionController(options) {
                 pendingWindowRename = null;
                 diagnosticWindowFrame = null;
                 pendingPaneResize = null;
+                paneResizeFrame = null;
                 pendingResizeGuide = null;
                 resizeCommitContext = null;
                 resizeTransaction.retire();
@@ -586,20 +616,20 @@ export function createApplicationTerminalInteractionController(options) {
                     });
                 }
             }
+            const resizeState = resizeTransaction.state();
+            if (resizeState.phase !== "idle" &&
+                !snapshot.current?.panes.some((pane) => pane.pane === resizeState.semanticPaneId)) {
+                resizeTransaction.retire();
+                pendingPaneResize = null;
+                pendingResizeGuide = null;
+            }
             if (pendingPaneResize) {
                 const cells = paneCells(snapshot, pendingPaneResize.semanticPaneId, pendingPaneResize.axis);
-                if (cells !== null && cells !== pendingPaneResize.beforeCells) {
+                if (cells !== null &&
+                    cells !== pendingPaneResize.layoutCells &&
+                    cells !== pendingPaneResize.beforeCells) {
                     pendingPaneResize.layoutCells = cells;
                     diagnose("pane-resize-layout", resizeDiagnosticDetails(pendingPaneResize));
-                    if (pendingPaneResize.receiptCells === cells)
-                        resizeTransaction.observeLayout({
-                            operationId: pendingPaneResize.operationId,
-                            authorityGeneration: pendingPaneResize.daemonGeneration,
-                            workspaceName: pendingPaneResize.workspaceName,
-                            semanticPaneId: pendingPaneResize.semanticPaneId,
-                            axis: pendingPaneResize.axis,
-                            cells,
-                        });
                 }
             }
             maybeRequestWindowSwitchFrame();
@@ -639,7 +669,9 @@ export function createApplicationTerminalInteractionController(options) {
             const live = liveResizeTarget();
             const canonicalCells = paneCells(options.layout(), preview.semanticPaneId, preview.axis);
             const state = resizeTransaction.state();
-            if (live && canonicalCells !== null && state.phase === "idle")
+            if (!resizeCommitContext && live && canonicalCells !== null && state.phase === "idle") {
+                resizeCommitContext = { source: "pointer", pointerIngress: preview.pointerIngress ?? null };
+                captureResizePaneIdentity(preview.semanticPaneId);
                 resizeTransaction.begin({
                     authorityGeneration: live.daemonGeneration,
                     workspaceName: live.workspaceName,
@@ -647,6 +679,9 @@ export function createApplicationTerminalInteractionController(options) {
                     axis: preview.axis,
                     canonicalCells,
                 });
+            }
+            if (resizeCommitContext?.source === "pointer")
+                resizeCommitContext = { source: "pointer", pointerIngress: preview.pointerIngress ?? null };
             resizeTransaction.move(preview.cells);
             if (!options.diagnosticsEnabled)
                 return;
@@ -691,6 +726,7 @@ export function createApplicationTerminalInteractionController(options) {
                     startedAtMicros,
                     preview,
                     guideDigest,
+                    workspaceName: active.connection.workspaceName,
                     daemonGeneration: active.daemonGeneration,
                     clientGeneration: clientGeneration,
                     rendererEpoch: active.rendererEpoch,
@@ -722,17 +758,42 @@ export function createApplicationTerminalInteractionController(options) {
         resizePane(preview) {
             pendingResizeGuide = null;
             lastResizeGuidePresentationDigest = null;
+            if (!resizeCommitContext || resizeCommitContext.source !== "pointer")
+                return;
+            resizeCommitContext = { source: "pointer", pointerIngress: preview.pointerIngress ?? null };
             resizeTransaction.move(preview.cells);
-            resizeCommitContext = {
-                source: "pointer",
-                pointerIngress: preview.pointerIngress?.action === "up" ? preview.pointerIngress : null,
-            };
-            try {
-                resizeTransaction.release();
-            }
-            finally {
+            resizeTransaction.release();
+            if (options.diagnosticsEnabled)
+                try {
+                    const active = options.generation();
+                    const identity = active?.adapter?.paneCanonicalIdentity(preview.semanticPaneId);
+                    diagnose("pane-resize-release", {
+                        semanticPaneId: preview.semanticPaneId,
+                        axis: preview.axis,
+                        requestedCells: preview.cells,
+                        pointerIngress: preview.pointerIngress ?? null,
+                        transactionPhase: resizeTransaction.state().phase,
+                        workspaceName: active?.connection?.workspaceName,
+                        daemonGeneration: active?.daemonGeneration,
+                        clientGeneration: active?.client?.getSnapshot().generation,
+                        rendererEpoch: active?.rendererEpoch,
+                        sourceEpoch: identity?.sourceEpoch,
+                        generation: identity?.generation,
+                        incarnation: identity?.incarnation,
+                    });
+                }
+                catch {
+                    /* Diagnostics never own gesture completion. */
+                }
+            // Retain context while a coalesced final target awaits dispatch.
+            if (resizeTransaction.state().phase === "idle")
+                resizeCommitContext = null;
+        },
+        cancelPaneResize() {
+            resizeTransaction.cancelDrag();
+            pendingResizeGuide = null;
+            if (resizeTransaction.state().phase === "idle")
                 resizeCommitContext = null;
-            }
         },
         keyboardResize(axis, direction) {
             const paneId = options.focusedPane?.() ?? null;
@@ -752,13 +813,15 @@ export function createApplicationTerminalInteractionController(options) {
                 canonicalCells: beforeCells,
             }))
                 return;
-            resizeTransaction.move(Math.max(1, beforeCells + direction));
             resizeCommitContext = { source: "keyboard", pointerIngress: null };
+            captureResizePaneIdentity(paneId);
+            resizeTransaction.move(Math.max(1, beforeCells + direction));
             try {
                 resizeTransaction.release();
             }
             finally {
-                resizeCommitContext = null;
+                if (resizeTransaction.state().phase === "idle")
+                    resizeCommitContext = null;
             }
         },
         routeWorkspaceKey(event) {
@@ -1235,12 +1298,14 @@ export function createApplicationTerminalInteractionController(options) {
                 pendingResizeGuide = null;
                 const settledAtMicros = diagnosticNowMicros();
                 let identityExact;
+                let canonicalAfter = null;
                 try {
                     const active = options.generation();
                     const identity = active?.adapter?.paneCanonicalIdentity(settled.preview.semanticPaneId);
                     const clientGeneration = active?.client?.getSnapshot().generation;
                     const layoutWindow = options.layout().current;
                     const layoutPane = layoutWindow?.panes.find(({ pane }) => pane === settled.preview.semanticPaneId);
+                    canonicalAfter = identity ?? null;
                     identityExact =
                         active?.status === "live" &&
                             active.daemonGeneration === settled.daemonGeneration &&
@@ -1250,14 +1315,11 @@ export function createApplicationTerminalInteractionController(options) {
                             identity?.sourceEpoch === settled.sourceEpoch &&
                             identity.generation === settled.generation &&
                             identity.incarnation === settled.incarnation &&
-                            identity.revision === settled.revision &&
-                            identity.stateHash === settled.stateHash &&
-                            identity.cols === settled.cols &&
-                            identity.rows === settled.rows &&
-                            layoutPane?.width === settled.cols &&
+                            identity.revision >= settled.revision &&
+                            layoutPane?.width === identity.cols &&
                             layoutWindow !== undefined &&
                             layoutWindow !== null &&
-                            nativePaneResizeCells(layoutPane, "rows", layoutWindow.paneBorderStatus, layoutWindow.rows) === settled.rows;
+                            nativePaneResizeCells(layoutPane, "rows", layoutWindow.paneBorderStatus, layoutWindow.rows) === identity.rows;
                 }
                 catch {
                     identityExact = false;
@@ -1277,6 +1339,7 @@ export function createApplicationTerminalInteractionController(options) {
                         settled.presentationBeforeDigest.length === 64 &&
                         presentationDigest !== settled.presentationBeforeDigest,
                     identityExact,
+                    canonicalAfter,
                     durationMicros: settledAtMicros === null ? null : settledAtMicros - settled.startedAtMicros,
                 };
                 diagnoseCritical(`resize-guide:${settled.traceId}:settled`, "resize-guide-settled", {
@@ -1294,10 +1357,9 @@ export function createApplicationTerminalInteractionController(options) {
                     writerHealth,
                 });
             }
-            const pending = pendingPaneResize;
+            const pending = paneResizeFrame;
             if (!pending?.frameRequested)
                 return;
-            pendingPaneResize = null;
             let canonicalAfter = null;
             let identityLineageExact = false;
             try {
@@ -1315,14 +1377,23 @@ export function createApplicationTerminalInteractionController(options) {
                             identity.sourceEpoch === pending.sourceEpoch &&
                             identity.generation === pending.generation &&
                             identity.incarnation === pending.incarnation &&
-                            identity.revision >= pending.revision &&
-                            layoutCells === pending.layoutCells;
+                            identity.revision >= pending.revision;
+                    // Layout publication can precede the canonical terminal snapshot. Keep
+                    // the bounded diagnostic slot until a coherent frame consumes both.
+                    // A newer operation explicitly supersedes it; diagnostics never hold
+                    // the resize transaction or request a polling render loop.
+                    if (identityLineageExact &&
+                        (identity.cols !== paneCells(options.layout(), pending.semanticPaneId, "cols") ||
+                            identity.rows !== paneCells(options.layout(), pending.semanticPaneId, "rows") ||
+                            layoutCells !== pending.layoutCells))
+                        return;
                 }
             }
             catch {
                 canonicalAfter = null;
                 identityLineageExact = false;
             }
+            paneResizeFrame = null;
             const presentationDigest = resizePresentationDigest(null);
             const details = {
                 ...resizeDiagnosticDetails(pending),

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

@@ -1,3 +1,4 @@
+import { parseTerminalHostColor, terminalHostMode } from "../../../lib/terminal-host-color.js";
 const PALETTE_SIZE = 16;
 const QUERY_TIMEOUT_MS = 1_000;
 const FOLLOW_UP_DELAYS_MS = [250, 1_000];
@@ -6,7 +7,7 @@ function normalizeColor(value) {
     if (typeof value !== "string")
         return null;
     const normalized = value.trim().toLowerCase();
-    return normalized.length > 0 ? normalized : null;
+    return parseTerminalHostColor(normalized) ? normalized : null;
 }
 function normalizePalette(values) {
     const palette = Array(PALETTE_SIZE).fill(null);
@@ -31,19 +32,6 @@ function immutableCapabilities(value) {
         return null;
     return immutableValue(value);
 }
-function detectedMode(background, fallback) {
-    if (!background)
-        return fallback;
-    const match = /^#([\da-f]{3}|[\da-f]{6})$/iu.exec(background);
-    if (!match)
-        return fallback;
-    const hex = match[1];
-    const expanded = hex.length === 3 ? `${hex[0]}${hex[0]}${hex[1]}${hex[1]}${hex[2]}${hex[2]}` : hex;
-    const red = Number.parseInt(expanded.slice(0, 2), 16) / 255;
-    const green = Number.parseInt(expanded.slice(2, 4), 16) / 255;
-    const blue = Number.parseInt(expanded.slice(4, 6), 16) / 255;
-    return 0.299 * red + 0.587 * green + 0.114 * blue > 0.5 ? "light" : "dark";
-}
 function snapshotSignature(input) {
     return JSON.stringify(input);
 }
@@ -81,7 +69,7 @@ function availableSnapshot(result, fallbackMode, capabilities) {
         tekBackground: normalizeColor(result.tekBackground),
         highlightBackground: normalizeColor(result.highlightBackground),
         highlightForeground: normalizeColor(result.highlightForeground),
-        detectedMode: detectedMode(defaultBackground, fallbackMode),
+        detectedMode: terminalHostMode(defaultBackground) ?? fallbackMode,
         capabilities,
     });
 }
@@ -103,6 +91,9 @@ export function createApplicationTerminalPaletteOwner(renderer, options = {}) {
     let lastValid = null;
     let active = null;
     let queued = false;
+    let modeHint = null;
+    let modeGeneration = 0;
+    let awaitingModePalette = false;
     let disposed = false;
     const publish = (next) => {
         if (disposed || next.signature === snapshot.signature)
@@ -119,24 +110,31 @@ export function createApplicationTerminalPaletteOwner(renderer, options = {}) {
             return active;
         }
         renderer.clearPaletteCache();
+        const requestedModeGeneration = modeGeneration;
+        const guardModeForQuery = awaitingModePalette;
         const generation = Promise.resolve()
             .then(() => renderer.getPalette({ size: PALETTE_SIZE, timeout: queryTimeoutMs }))
             .then((result) => {
-            if (disposed)
+            if (disposed || requestedModeGeneration !== modeGeneration)
+                return;
+            const reportedMode = terminalHostMode(result.defaultBackground);
+            // A terminal can still answer with its previous palette while switching.
+            // Queries issued during the transition wait for a matching reply.
+            if (guardModeForQuery && modeHint && reportedMode && reportedMode !== modeHint)
                 return;
             if (!hasReportedColor(result)) {
                 if (!lastValid)
-                    publish(fallbackSnapshot("unavailable", renderer.themeMode ?? "dark", capabilities));
+                    publish(fallbackSnapshot("unavailable", modeHint ?? renderer.themeMode ?? "dark", capabilities));
                 return;
             }
-            const next = availableSnapshot(result, renderer.themeMode ?? "dark", capabilities);
+            const next = availableSnapshot(result, modeHint ?? renderer.themeMode ?? "dark", capabilities);
             lastValid = next;
             publish(next);
         })
             .catch(() => {
-            if (disposed || lastValid)
+            if (disposed || requestedModeGeneration !== modeGeneration || lastValid)
                 return;
-            publish(fallbackSnapshot("unavailable", renderer.themeMode ?? "dark", capabilities));
+            publish(fallbackSnapshot("unavailable", modeHint ?? renderer.themeMode ?? "dark", capabilities));
         })
             .finally(() => {
             if (active !== generation)
@@ -152,20 +150,39 @@ export function createApplicationTerminalPaletteOwner(renderer, options = {}) {
     };
     const scheduleFollowUps = () => {
         if (disposed)
-            return;
-        void refresh();
+            return Promise.resolve();
+        const first = refresh();
+        // A burst owns only one bounded pair of retries, never one pair per event.
+        for (const timer of timers)
+            cancelTimeout(timer);
+        timers.clear();
         for (const delay of FOLLOW_UP_DELAYS_MS) {
             const timer = scheduleTimeout(() => {
                 timers.delete(timer);
+                // After the bounded transition window, a fresh measured OSC 11 color
+                // wins even when a custom theme's luminance disagrees with its hint.
+                if (delay === FOLLOW_UP_DELAYS_MS[FOLLOW_UP_DELAYS_MS.length - 1])
+                    awaitingModePalette = false;
                 if (!disposed)
                     void refresh();
             }, delay);
             timers.add(timer);
         }
+        return first;
     };
-    const onThemeMode = () => {
+    const onThemeMode = (mode) => {
+        const changed = modeHint !== mode;
+        if (changed)
+            modeGeneration += 1;
+        modeHint = mode;
+        if (changed && snapshot.detectedMode !== mode) {
+            awaitingModePalette = true;
+            // Track hints even while locked, so unlocking cannot resurrect old colors.
+            lastValid = null;
+            publish(fallbackSnapshot("unavailable", mode, capabilities));
+        }
         if (isThemeModeUnlocked())
-            scheduleFollowUps();
+            void scheduleFollowUps();
     };
     const onCapabilities = (next) => {
         capabilities = immutableCapabilities(next);
@@ -176,13 +193,12 @@ export function createApplicationTerminalPaletteOwner(renderer, options = {}) {
             publish(lastValid);
             return;
         }
-        publish(fallbackSnapshot(snapshot.availability === "pending" ? "pending" : "unavailable", renderer.themeMode ?? "dark", capabilities));
+        publish(fallbackSnapshot(snapshot.availability === "pending" ? "pending" : "unavailable", modeHint ?? renderer.themeMode ?? "dark", capabilities));
     };
     const onThemeNotification = (sequence) => {
         if (sequence !== "\x1b[?997;1n" && sequence !== "\x1b[?997;2n")
             return false;
-        if (isThemeModeUnlocked())
-            scheduleFollowUps();
+        onThemeMode(sequence === "\x1b[?997;1n" ? "dark" : "light");
         return false;
     };
     renderer.on("theme_mode", onThemeMode);
@@ -198,7 +214,7 @@ export function createApplicationTerminalPaletteOwner(renderer, options = {}) {
             listeners.add(listener);
             return () => listeners.delete(listener);
         },
-        refresh,
+        refresh: scheduleFollowUps,
         dispose() {
             if (disposed)
                 return;

package/packages/daemon/dist/tui/mirror/runtime/application-terminal-workspace.jsx

@@ -1,6 +1,6 @@
 /* @jsxImportSource @opentui/solid */
 import { clampTerminalViewportOrigin, terminalLiveViewportOrigin, reflowTerminalPosition, } from "../terminal-viewport.js";
-import { For, Show, createMemo, createRenderEffect, createSignal, onCleanup, untrack, } from "solid-js";
+import { For, Show, createMemo, createEffect, createRenderEffect, createSignal, onCleanup, untrack, } from "solid-js";
 import { PaneScopedTerminalSurface } from "./pane-scoped-terminal-surface.jsx";
 import { nativePaneGeometries, projectOpenTuiPaneFrames, } from "./terminal-layout-projection.js";
 import { TerminalWindowStrip, } from "../workspace/terminal-window-strip.jsx";
@@ -228,6 +228,28 @@ export function ApplicationTerminalWorkspace(props) {
     };
     let forwardedPointer = null;
     let drag = null;
+    const cancelResize = () => {
+        if (!drag)
+            return;
+        drag = null;
+        setResizePreview(null);
+        setHoveredSeparator(null);
+        props.onCancelResize?.();
+    };
+    createEffect(() => {
+        const current = layout().current;
+        const epoch = props.rendererEpoch;
+        const adapter = props.adapter;
+        const interactive = props.interactive;
+        if (drag &&
+            (interactive === false ||
+                epoch !== drag.rendererEpoch ||
+                adapter !== drag.adapter ||
+                (current?.semanticWindowId ?? current?.windowName) !== drag.windowId ||
+                !current?.panes.some((pane) => pane.pane === drag?.preview.semanticPaneId)))
+            cancelResize();
+    });
+    onCleanup(cancelResize);
     const terminalPoint = (event) => ({
         x: event.x - (props.originX ?? 0),
         y: event.y - (props.originY ?? 0) - topOffset(),
@@ -688,7 +710,14 @@ export function ApplicationTerminalWorkspace(props) {
         });
         return true;
     };
-    props.onSelectionKeyOwner?.(handlePaneMenuKey, () => props.interactive !== false && (paneMenu.ownsInput() || keyboardCopy() !== null), () => {
+    props.onSelectionKeyOwner?.((name, event) => {
+        if (drag && name === "escape") {
+            cancelResize();
+            return true;
+        }
+        return handlePaneMenuKey(name, event);
+    }, () => props.interactive !== false &&
+        (drag !== null || paneMenu.ownsInput() || keyboardCopy() !== null), () => {
         // Called only after global shortcuts, copy, and local navigation decline
         // the event, immediately before terminal key or paste delivery.
         const paneId = retainedSelectionPane() ?? props.focusedPane;
@@ -702,6 +731,8 @@ export function ApplicationTerminalWorkspace(props) {
         props.onSelectionCopyOwner?.(null);
         props.onSelectionKeyOwner?.(null);
     });
+    // Register this router only as onMouse. OpenTUI invokes both the general
+    // listener and the typed listener on a target, even after stopPropagation.
     const routePointer = (event) => {
         if (event.type === "down")
             wheelGesture.reset();
@@ -775,15 +806,13 @@ export function ApplicationTerminalWorkspace(props) {
                 }
                 if (isRelease) {
                     const completed = drag.preview;
-                    const changed = completed.cells !== drag.separator.initialCells;
                     drag = null;
                     setResizePreview(null);
                     setHoveredSeparator(null);
-                    if (changed)
-                        props.onResizePane?.(globalPreview(Object.freeze({
-                            ...completed,
-                            ...(ingress ? { pointerIngress: ingress } : {}),
-                        })));
+                    props.onResizePane?.(globalPreview(Object.freeze({
+                        ...completed,
+                        ...(ingress ? { pointerIngress: ingress } : {}),
+                    })));
                 }
             }
             return;
@@ -918,7 +947,16 @@ export function ApplicationTerminalWorkspace(props) {
                 const ingress = resizeIngress();
                 const origin = separator.axis === "x" ? point.x : point.y;
                 const preview = terminalPaneResizePreview(separator, origin, origin);
-                drag = { separator, origin, preview, gestureId: ingress?.gestureId ?? null };
+                drag = {
+                    separator,
+                    origin,
+                    preview,
+                    gestureId: ingress?.gestureId ?? null,
+                    rendererEpoch: props.rendererEpoch,
+                    adapter: props.adapter,
+                    windowId: layout().current?.semanticWindowId ?? layout().current?.windowName,
+                };
+                props.onResizePreview?.(globalPreview(preview));
                 setHoveredSeparator(null);
                 setResizePreview(preview);
                 return;
@@ -1136,7 +1174,7 @@ export function ApplicationTerminalWorkspace(props) {
         return Object.freeze(cells);
     });
     return (<>
-      <box position="absolute" left={0} top={topOffset()} width={props.width} height={props.height} onMouse={routePointer} onMouseDown={routePointer} onMouseUp={routePointer}/>
+      <box position="absolute" left={0} top={topOffset()} width={props.width} height={props.height} onMouse={routePointer}/>
       <box position="absolute" left={0} top={topOffset() - 1} width={props.width} height={1} backgroundColor={props.theme.roles.surfaces.panel} flexDirection="row" onMouse={routePointer}>
         <Show when={layout().windows.length > 0} fallback={<text fg={props.theme.roles.text.muted}> no terminal windows </text>}>
           <TerminalWindowStrip theme={props.theme} width={props.width} tabs={terminalWindowTabs} hoveredIndex={null} onActivate={(index) => {
@@ -1200,7 +1238,7 @@ export function ApplicationTerminalWorkspace(props) {
         }}
       </For>
       <For each={terminalPaneSeparators(visibleFrames(), layout().current?.paneBorderStatus ?? "off")}>
-        {(separator) => (<box position="absolute" left={separator.axis === "x" ? separator.position : separator.start} top={(separator.axis === "x" ? separator.start : separator.position) + topOffset()} width={1} height={separator.axis === "x" ? Math.max(1, separator.end - separator.start) : 1} backgroundColor={props.theme.colors.accentMuted} onMouse={routePointer} onMouseDown={routePointer} onMouseUp={routePointer}>
+        {(separator) => (<box position="absolute" left={separator.axis === "x" ? separator.position : separator.start} top={(separator.axis === "x" ? separator.start : separator.position) + topOffset()} width={1} height={separator.axis === "x" ? Math.max(1, separator.end - separator.start) : 1} backgroundColor={props.theme.colors.accentMuted} onMouse={routePointer}>
             <Show when={separator.axis === "y"}>
               <text fg={props.theme.roles.text.primary}>↕</text>
             </Show>