tmux-ide 2.9.11 → 2.9.12

package/packages/daemon/dist/terminal/pane-stream/pane-stream-websocket.js

@@ -1,8 +1,9 @@
-import { PANE_STREAM_INPUT_LIFETIME_CAPABILITY_VERSION, } from "@tmux-ide/contracts";
+import { TERMINAL_PROJECTION_CAPABILITY_VERSION, TERMINAL_PROJECTION_LOCAL_CAPABILITY_VERSION, } from "@tmux-ide/contracts";
+import { PANE_STREAM_INPUT_LIFETIME_CAPABILITY_VERSION, PANE_STREAM_INPUT_BYTES_CAPABILITY_VERSION, } from "@tmux-ide/contracts";
 import { inflateSync } from "node:zlib";
 import { PaneStreamLayoutSnapshotFrameSchemaZ } from "@tmux-ide/contracts";
 import { z } from "zod";
-import { PANE_STREAM_MAX_HELD_DELTAS, PANE_STREAM_MAX_OUTPUT_BYTES, PANE_STREAM_MAX_PANES, PANE_STREAM_MAX_SEED_BYTES, PANE_STREAM_PROTOCOL_VERSION, PANE_STREAM_REDEEM_PATH, PANE_STREAM_WEBSOCKET_SUBPROTOCOL, TERMINAL_GRAPHICS_BLOB_CHUNK_BYTES, TERMINAL_GRAPHICS_CELL_PIXELS_CAPABILITY_VERSION, TERMINAL_GRAPHICS_PRECISE_PIXELS_CAPABILITY_VERSION, TERMINAL_GRAPHICS_LEGACY_MAX_IMAGE_BYTES, TERMINAL_GRAPHICS_ZLIB_CAPABILITY_VERSION, PaneStreamClientFrameSchemaZ, PaneStreamLoopbackWebSocketUrlSchemaZ, PaneStreamRedeemFrameSchemaZ, PaneStreamServerFrameSchemaZ, sharedMonotonicMicros, } from "@tmux-ide/contracts";
+import { PANE_STREAM_MAX_HELD_DELTAS, PANE_STREAM_MAX_OUTPUT_BYTES, PANE_STREAM_MAX_PANES, PANE_STREAM_MAX_SEED_BYTES, PANE_STREAM_PROTOCOL_VERSION, PANE_STREAM_REDEEM_PATH, PANE_STREAM_WEBSOCKET_SUBPROTOCOL, TERMINAL_GRAPHICS_BLOB_CHUNK_BYTES, TERMINAL_DELIVERY_BINARY_CAPABILITY_VERSION, TERMINAL_DELIVERY_BINARY_LOCAL_CAPABILITY_VERSION, TERMINAL_GRAPHICS_BINARY_CAPABILITY_VERSION, TERMINAL_GRAPHICS_LOCAL_CAPABILITY_VERSION, encodeTerminalGraphicsBinary, encodeTerminalDeliveryBinaryChunk, TERMINAL_GRAPHICS_CELL_PIXELS_CAPABILITY_VERSION, TERMINAL_GRAPHICS_PRECISE_PIXELS_CAPABILITY_VERSION, TERMINAL_GRAPHICS_LEGACY_MAX_IMAGE_BYTES, TERMINAL_GRAPHICS_ZLIB_CAPABILITY_VERSION, PaneStreamClientFrameSchemaZ, PaneStreamLoopbackWebSocketUrlSchemaZ, PaneStreamRedeemFrameSchemaZ, PaneStreamServerFrameSchemaZ, sharedMonotonicMicros, } from "@tmux-ide/contracts";
 import { canonicalOriginOrNull, digestSecret, digestsEqual, rawDataByteLength, rawDataToBuffer, safeCloseSocket, strictJsonParse, } from "../attachments/admission-util.js";
 import { SessionRuntimeControllerLeaseError } from "../session-runtime/registry.js";
 import { terminalDeliveryObservationOrdinal } from "../session-runtime/terminal-delivery-observation-identity.js";
@@ -115,6 +116,7 @@ function errorFrameCode(error) {
  * ticket digests; a daemon restart makes every prior descriptor inert.
  */
 export class PaneStreamAdmissionCoordinator {
+    #localImages;
     #instanceId;
     #webSocketUrl;
     #leaseManager;
@@ -145,6 +147,7 @@ export class PaneStreamAdmissionCoordinator {
     #shuttingDown = false;
     #shutdownPromise = null;
     constructor(options) {
+        this.#localImages = options.localImages;
         this.#instanceId = BindingIdSchemaZ.parse(options.daemonInstanceId);
         this.#webSocketUrl = PaneStreamLoopbackWebSocketUrlSchemaZ.parse(options.webSocketUrl);
         this.#leaseManager = options.leaseManager;
@@ -407,6 +410,7 @@ export class PaneStreamAdmissionCoordinator {
                 let live;
                 try {
                     live = new PaneStreamLiveConnection({
+                        localImages: this.#localImages,
                         clientId: `psc-${this.#clientCounter}`,
                         socket,
                         descriptor: structuredClone(descriptor),
@@ -614,6 +618,8 @@ export function rawGraphicsState(state) {
 }
 const GRAPHICS_SEND_WINDOW_BYTES = 2 * 1024 * 1024;
 export class PaneStreamLiveConnection {
+    #localImages;
+    #localLeases = new Map();
     #clientId;
     #socket;
     #descriptor;
@@ -701,6 +707,7 @@ export class PaneStreamLiveConnection {
         return elapsed;
     }
     constructor(options) {
+        this.#localImages = options.localImages;
         this.#clientId = options.clientId;
         this.#socket = options.socket;
         this.#descriptor = options.descriptor;
@@ -770,6 +777,10 @@ export class PaneStreamLiveConnection {
                     this.#descriptor.terminalDelivery?.protocolVersions.includes(PANE_STREAM_INPUT_LIFETIME_CAPABILITY_VERSION)
                     ? { inputLifetime: true }
                     : {}),
+                ...(this.#sessionRuntimeBinding &&
+                    this.#descriptor.terminalDelivery?.protocolVersions.includes(PANE_STREAM_INPUT_BYTES_CAPABILITY_VERSION)
+                    ? { inputBytes: true }
+                    : {}),
                 protocolVersion: PANE_STREAM_PROTOCOL_VERSION,
                 daemonInstanceId: this.#binding.daemonInstanceId,
                 requestId: this.#binding.requestId,
@@ -812,6 +823,12 @@ export class PaneStreamLiveConnection {
         this.#stopAuthoritySnapshots?.();
         this.#stopAuthoritySnapshots = null;
         const closures = [];
+        this.#localLeases.clear();
+        if (this.#localImages)
+            closures.push(this.#localImages.releaseClient({
+                generation: this.#localImages.identity.generation,
+                client: this.#descriptor.leaseId,
+            }));
         const layoutSubscription = this.#layoutSubscription;
         this.#layoutSubscription = null;
         if (layoutSubscription)
@@ -1024,7 +1041,7 @@ export class PaneStreamLiveConnection {
                 return true;
             let incarnation = null;
             for (const message of pending) {
-                if (message.type !== "terminal.delivery")
+                if (message.type !== "terminal.delivery" && message.type !== "terminal.projection")
                     continue;
                 if (message.workspaceName !== this.#descriptor.workspaceName ||
                     message.semanticPaneId !== channel.semanticPaneId ||
@@ -1132,7 +1149,15 @@ export class PaneStreamLiveConnection {
         this.#closeIfAllPanesGone();
     }
     async #sendTerminalDelivery(pane, message) {
-        if (message.type === "terminal.delivery") {
+        if (message.type === "terminal.projection") {
+            const channel = this.#panes.get(pane);
+            if (channel?.deliveryAddress)
+                channel.deliveryAddress.incarnation = message.incarnation;
+            if (channel)
+                channel.binaryCells = true;
+            this.#sendFrame(pane, { type: "terminal-projection-envelope", pane, envelope: message });
+        }
+        else if (message.type === "terminal.delivery") {
             if (!this.#diagnosticFirstSeedObserved) {
                 this.#diagnosticFirstSeedObserved = true;
                 this.#recordDiagnosticLifecycle("pane-stream-first-seed");
@@ -1140,6 +1165,8 @@ export class PaneStreamLiveConnection {
             const channel = this.#panes.get(pane);
             if (channel?.deliveryAddress)
                 channel.deliveryAddress.incarnation = message.incarnation;
+            if (channel)
+                channel.binaryCells = message.encoding === "semantic-binary-v1";
             // The trusted lease address was fixed at delivery admission; preserve the
             // exact envelope and its observation identity through transmission.
             const detailedDeliveryObservation = this.#observability?.enabled === true;
@@ -1215,13 +1242,18 @@ export class PaneStreamLiveConnection {
             }
         }
         else if (message.type === "terminal.delivery.chunk") {
-            this.#sendFrame(pane, {
-                type: "terminal-delivery-chunk",
-                pane,
-                transactionId: message.transactionId,
-                index: message.index,
-                data: Buffer.from(message.bytes).toString("base64"),
-            });
+            if (this.#panes.get(pane)?.binaryCells) {
+                this.#sendEncoded(pane, Buffer.from(encodeTerminalDeliveryBinaryChunk({ pane, transactionId: message.transactionId, index: message.index }, message.bytes)), true);
+            }
+            else {
+                this.#sendFrame(pane, {
+                    type: "terminal-delivery-chunk",
+                    pane,
+                    transactionId: message.transactionId,
+                    index: message.index,
+                    data: Buffer.from(message.bytes).toString("base64"),
+                });
+            }
         }
         else {
             this.#sendFrame(pane, { type: "terminal-delivery-fault", pane, fault: message });
@@ -1241,6 +1273,19 @@ export class PaneStreamLiveConnection {
         // when served.
         const zlib = this.#descriptor.terminalDelivery?.protocolVersions.includes(TERMINAL_GRAPHICS_ZLIB_CAPABILITY_VERSION) === true;
         channel.graphicsZlib = zlib;
+        channel.graphicsLocal =
+            !!this.#localImages &&
+                this.#descriptor.terminalDelivery?.protocolVersions.some((version) => version === TERMINAL_GRAPHICS_LOCAL_CAPABILITY_VERSION ||
+                    version === TERMINAL_DELIVERY_BINARY_LOCAL_CAPABILITY_VERSION ||
+                    version === TERMINAL_PROJECTION_LOCAL_CAPABILITY_VERSION) === true;
+        channel.graphicsInline = new Set();
+        channel.graphicsBinary =
+            this.#descriptor.terminalDelivery?.protocolVersions.some((version) => version === TERMINAL_GRAPHICS_BINARY_CAPABILITY_VERSION ||
+                version === TERMINAL_GRAPHICS_LOCAL_CAPABILITY_VERSION ||
+                version === TERMINAL_DELIVERY_BINARY_CAPABILITY_VERSION ||
+                version === TERMINAL_PROJECTION_CAPABILITY_VERSION ||
+                version === TERMINAL_DELIVERY_BINARY_LOCAL_CAPABILITY_VERSION ||
+                version === TERMINAL_PROJECTION_LOCAL_CAPABILITY_VERSION) === true;
         // Renderers that report cell pixels learn up front that this daemon
         // accepts them, before any image exists.
         const cellPixels = this.#descriptor.terminalDelivery?.protocolVersions.includes(TERMINAL_GRAPHICS_CELL_PIXELS_CAPABILITY_VERSION) === true;
@@ -1268,6 +1313,8 @@ export class PaneStreamLiveConnection {
                     ...(zlib ? state : rawGraphicsState(state)),
                     ...(cellPixels ? { cellPixels: true } : {}),
                     ...(preciseCellPixels ? { preciseCellPixels: true } : {}),
+                    ...(channel.graphicsBinary ? { binaryBlobs: true } : {}),
+                    ...(channel.graphicsLocal ? { localFiles: true } : {}),
                 },
             });
             if (pushed.length > 0)
@@ -1284,15 +1331,23 @@ export class PaneStreamLiveConnection {
                     placements: [],
                     cellPixels: true,
                     ...(preciseCellPixels ? { preciseCellPixels: true } : {}),
+                    ...(channel.graphicsBinary ? { binaryBlobs: true } : {}),
+                    ...(channel.graphicsLocal ? { localFiles: true } : {}),
                 },
             });
         }
     }
-    #requestGraphics(pane, digests) {
+    #requestGraphics(pane, digests, preferInline = false) {
         const channel = this.#panes.get(pane);
         // Requests are only meaningful after an announcement; ignore stray ones.
         if (!channel || channel.closed || !channel.graphicsAnnounced)
             return;
+        if (preferInline && channel.graphicsLocal) {
+            for (const digest of digests) {
+                if ((channel.graphicsInline?.size ?? 0) < GRAPHICS_MAX_QUEUED_DIGESTS)
+                    channel.graphicsInline?.add(digest);
+            }
+        }
         this.#queueGraphics(channel, digests);
     }
     #queueGraphics(channel, digests) {
@@ -1313,6 +1368,7 @@ export class PaneStreamLiveConnection {
         try {
             while (!this.#closed && !channel.closed && channel.graphicsQueue.length > 0) {
                 const digest = channel.graphicsQueue.shift();
+                const inline = channel.graphicsInline?.delete(digest) ?? false;
                 const graphics = channel.delivery?.graphics;
                 const image = graphics?.image(digest);
                 if (!graphics || !image)
@@ -1339,6 +1395,49 @@ export class PaneStreamLiveConnection {
                     continue;
                 const format = raw ? (image.format === "rgba-zlib" ? "rgba" : "rgb") : image.format;
                 const total = data.byteLength;
+                if (!inline && channel.graphicsLocal && !raw && this.#localImages) {
+                    for (const [id, lease] of this.#localLeases)
+                        if (lease.expiresAt <= Date.now())
+                            this.#localLeases.delete(id);
+                    if (this.#localLeases.size < 64) {
+                        try {
+                            const lease = await this.#localImages.acquire({
+                                generation: this.#localImages.identity.generation,
+                                client: this.#descriptor.leaseId,
+                                digest,
+                                bytes: data,
+                            });
+                            if (this.#closed || channel.closed || graphics.image(digest) !== image) {
+                                await this.#localImages.release(lease);
+                                continue;
+                            }
+                            this.#localLeases.set(lease.id, {
+                                pane: channel.semanticPaneId,
+                                expiresAt: lease.expiresAt,
+                            });
+                            this.#sendFrame(null, {
+                                type: "terminal-graphics-local",
+                                pane: channel.semanticPaneId,
+                                generation: lease.generation,
+                                leaseId: lease.id,
+                                path: lease.path,
+                                expiresAt: lease.expiresAt,
+                                blob: {
+                                    digest,
+                                    format,
+                                    width: image.width,
+                                    height: image.height,
+                                    total,
+                                    offset: 0,
+                                },
+                            });
+                            continue;
+                        }
+                        catch {
+                            /* Optional transport: retain the negotiated inline fallback. */
+                        }
+                    }
+                }
                 for (let offset = 0; offset < total; offset += TERMINAL_GRAPHICS_BLOB_CHUNK_BYTES) {
                     while ((this.#socket.bufferedAmount ?? 0) > GRAPHICS_SEND_WINDOW_BYTES) {
                         if (this.#closed || channel.closed)
@@ -1352,6 +1451,20 @@ export class PaneStreamLiveConnection {
                     if (offset > 0 && graphics.image(digest) !== image)
                         break;
                     const end = Math.min(total, offset + TERMINAL_GRAPHICS_BLOB_CHUNK_BYTES);
+                    if (channel.graphicsBinary) {
+                        this.#sendEncoded(null, Buffer.from(encodeTerminalGraphicsBinary({
+                            pane: channel.semanticPaneId,
+                            blob: {
+                                digest,
+                                format,
+                                width: image.width,
+                                height: image.height,
+                                total,
+                                offset,
+                            },
+                        }, data.subarray(offset, end))), true);
+                        continue;
+                    }
                     this.#sendFrame(null, {
                         type: "terminal-graphics-blob",
                         pane: channel.semanticPaneId,
@@ -1671,7 +1784,12 @@ export class PaneStreamLiveConnection {
         if (this.#closed || this.#socket.readyState !== WS_OPEN)
             return;
         const encoded = JSON.stringify(frame);
-        const bytes = Buffer.byteLength(encoded, "utf8");
+        this.#sendEncoded(pane, encoded, false);
+    }
+    #sendEncoded(pane, encoded, binary) {
+        if (this.#closed || this.#socket.readyState !== WS_OPEN)
+            return;
+        const bytes = Buffer.byteLength(encoded);
         if (pane !== null) {
             this.#ledger.take(this.#clientId, pane, "ws-send-buffer", bytes);
             if (this.#deliveryAcks)
@@ -1680,7 +1798,7 @@ export class PaneStreamLiveConnection {
         this.#sendQueue.push({ pane, remaining: bytes });
         this.#sentBytesTotal += bytes;
         try {
-            this.#socket.send(encoded, { binary: false });
+            this.#socket.send(encoded, { binary });
         }
         catch {
             this.close(1011, "stream-unavailable");
@@ -1914,6 +2032,24 @@ export class PaneStreamLiveConnection {
             });
             return;
         }
+        if (frame.type === "terminal-projection-receipt") {
+            const channel = this.#deliveryChannel(frame.receipt);
+            if (!channel)
+                return;
+            if (!channel.delivery?.projectionReceipt)
+                return this.#failProtocol("protocol-error");
+            channel.delivery.projectionReceipt(frame.receipt);
+            return;
+        }
+        if (frame.type === "terminal-projection-materialize") {
+            const channel = this.#deliveryChannel(frame.request);
+            if (!channel)
+                return;
+            if (!channel.delivery?.materialize)
+                return this.#failProtocol("protocol-error");
+            channel.delivery.materialize(frame.request);
+            return;
+        }
         if (frame.type === "terminal-delivery-ack") {
             const channel = this.#deliveryChannel(frame.ack);
             if (!channel)
@@ -1946,7 +2082,23 @@ export class PaneStreamLiveConnection {
             return;
         }
         if (frame.type === "terminal-graphics-request") {
-            this.#requestGraphics(frame.pane, frame.digests);
+            this.#requestGraphics(frame.pane, frame.digests, frame.preferInline === true);
+            return;
+        }
+        if (frame.type === "terminal-graphics-local-release") {
+            const lease = this.#localLeases.get(frame.leaseId);
+            if (lease &&
+                lease.pane === frame.pane &&
+                frame.generation === this.#localImages?.identity.generation) {
+                this.#localLeases.delete(frame.leaseId);
+                void this.#localImages
+                    ?.release({
+                    generation: frame.generation,
+                    client: this.#descriptor.leaseId,
+                    id: frame.leaseId,
+                })
+                    .catch(() => { });
+            }
             return;
         }
         if (frame.type === "terminal-cell-pixels") {
@@ -2127,6 +2279,12 @@ export class PaneStreamLiveConnection {
         this.#evaluateResume(pane);
     }
     #acceptInput(pane, seq, kind, data, frameBytes, performanceTraceId, causalProbe, ingressAtMicros = null, callbackAtSharedMicros = null, ingressAtSharedMicros = null, expectedLifetime) {
+        if (kind === "bytes" &&
+            (!this.#sessionRuntimeBinding ||
+                !this.#descriptor.terminalDelivery?.protocolVersions.includes(PANE_STREAM_INPUT_BYTES_CAPABILITY_VERSION))) {
+            this.#failProtocol("input-rejected");
+            return;
+        }
         if (expectedLifetime &&
             (!this.#sessionRuntimeBinding ||
                 !this.#descriptor.terminalDelivery?.protocolVersions.includes(PANE_STREAM_INPUT_LIFETIME_CAPABILITY_VERSION))) {
@@ -2227,8 +2385,10 @@ export class PaneStreamLiveConnection {
                     : undefined, expectedLifetime);
             else if (kind === "text")
                 channel.sub.sendText(data);
-            else
+            else if (kind === "key")
                 channel.sub.sendKey(data);
+            else
+                throw new Error("Byte input requires semantic runtime");
             let ackStartedAtMicros = null;
             let ackStartedAtSharedMicros = null;
             if (trace) {

package/packages/daemon/dist/terminal/pane-stream/runtime.js

@@ -16,6 +16,7 @@ export class PaneStreamRuntime {
         const transportBinder = new SessionRuntimeTransportBinder(options.sessionRuntimeRegistry);
         this.coordinator = new PaneStreamAdmissionCoordinator({
             ...options.admission,
+            localImages: options.localImages,
             daemonInstanceId: options.daemonInstanceId,
             webSocketUrl: options.webSocketUrl,
             leaseManager,

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

@@ -1653,6 +1653,8 @@ class SessionRuntimeConsumerImpl {
             negotiation: upstream.negotiation,
             closed: upstream.closed,
             ack: (ack) => upstream.ack(ack),
+            ...(upstream.projectionReceipt ? { projectionReceipt: upstream.projectionReceipt } : {}),
+            ...(upstream.materialize ? { materialize: upstream.materialize } : {}),
             nack: (nack) => upstream.nack(nack),
             setVisibility: (visibility) => upstream.setVisibility(visibility),
             close: async () => {