tmux-ide 2.9.3 → 2.9.5

package/packages/daemon/dist/terminal/mirror/mirror-service.js

@@ -328,6 +328,46 @@ export class MirrorService {
     flowSnapshot(session) {
         return this.channels.get(session)?.channel.flowSnapshot() ?? null;
     }
+    // Cumulative scalar totals sampled after each retired channel finishes disposal.
+    // Keep evidence of residual listeners without retaining retired channel objects.
+    retiredListenerCounts = {
+        channels: 0,
+        failures: 0,
+        pane: 0,
+        layout: 0,
+        layoutAuthority: 0,
+    };
+    qualificationListeners() {
+        const active = { pane: 0, layout: 0, layoutAuthority: 0 };
+        for (const entry of this.channels.values()) {
+            const counts = entry.channel.qualificationListeners();
+            active.pane += counts.pane;
+            active.layout += counts.layout;
+            active.layoutAuthority += counts.layoutAuthority;
+        }
+        return Object.freeze({
+            active: Object.freeze(active),
+            retired: Object.freeze({ ...this.retiredListenerCounts }),
+            pendingDisposals: this.pendingDisposals.size,
+            sessionExit: this.sessionExitListeners.size,
+        });
+    }
+    async disposeObservedChannel(channel) {
+        try {
+            await channel.dispose();
+        }
+        catch (error) {
+            this.retiredListenerCounts.failures += 1;
+            throw error;
+        }
+        finally {
+            const counts = channel.qualificationListeners();
+            this.retiredListenerCounts.channels += 1;
+            this.retiredListenerCounts.pane += counts.pane;
+            this.retiredListenerCounts.layout += counts.layout;
+            this.retiredListenerCounts.layoutAuthority += counts.layoutAuthority;
+        }
+    }
     activeChannelCount() {
         return this.channels.size;
     }
@@ -342,7 +382,7 @@ export class MirrorService {
             this.updateWindowMembership(entry.channel, []);
             this.channelSessions.delete(entry.channel);
             try {
-                await entry.channel.dispose();
+                await this.disposeObservedChannel(entry.channel);
             }
             finally {
                 entry.releaseAuthority();
@@ -446,6 +486,7 @@ export class MirrorService {
                         }
                     },
                     onNativeClientActivity: () => this.opts.onNativeClientActivity?.(session),
+                    captureInputWrite: (action, semanticPaneId) => this.opts.captureInputWrite?.(session, action, semanticPaneId),
                     onInputWrite: (action, startedAtMicros, endedAtMicros, pendingBeforeSend) => this.opts.onInputWrite?.(session, action, startedAtMicros, endedAtMicros, pendingBeforeSend),
                     onInputAccepted: (action, acceptedAtMicros, ok) => this.opts.onInputAccepted?.(session, action, acceptedAtMicros, ok),
                     onOutputObserved: (semanticPaneId, ageMs, timing) => this.opts.onOutputObserved?.(session, semanticPaneId, ageMs, timing),
@@ -500,8 +541,7 @@ export class MirrorService {
         this.channelSessions.delete(entry.channel);
         if (this.channels.get(session) === entry)
             this.channels.delete(session);
-        const disposal = entry.channel
-            .dispose()
+        const disposal = this.disposeObservedChannel(entry.channel)
             .catch(() => { })
             .finally(() => entry.releaseAuthority());
         this.drainingChannels.set(session, disposal);

package/packages/daemon/dist/terminal/mirror/native-grid-projection.js

@@ -1,16 +1,11 @@
+import { TERMINAL_REPLICA_EMPTY_CELL, TERMINAL_REPLICA_SPACE_CELL } from "@tmux-ide/core";
 const rowSources = new WeakMap();
 const paintCache = new WeakMap();
 export function nativeProjectedRowSource(row) {
     return rowSources.get(row);
 }
 const defaultColor = Object.freeze({ kind: "default" });
-const empty = Object.freeze({
-    grapheme: "",
-    width: 1,
-    foreground: defaultColor,
-    background: defaultColor,
-    attributes: 0,
-});
+const empty = TERMINAL_REPLICA_EMPTY_CELL;
 const acsKeys = [..."+,-.0`abcdefghijklmnopqrstuvwxyz{|}~"];
 const acsValues = [..."→←↑↓▮◆▒␉␌␍␊°±␤␋┘┐┌└┼⎺⎻─⎼⎽├┤┴┬│≤≥π≠£·"];
 const acs = new Map(acsKeys.map((key, index) => [key, acsValues[index]]));
@@ -29,7 +24,7 @@ function color(value) {
 }
 function paint(cell) {
     const bits = cell.attributes;
-    return Object.freeze({
+    return {
         grapheme: bits & 0x80 ? (acs.get(cell.text) ?? cell.text) : cell.text,
         width: cell.width === 2 ? 2 : 1,
         foreground: color(cell.foreground),
@@ -41,7 +36,21 @@ function paint(cell) {
             (bits & 0x10 ? 32 : 0) |
             (bits & 0x20 ? 64 : 0) |
             (bits & 0x100 ? 128 : 0),
-    });
+    };
+}
+// Only normalized, internally constructed paint can reuse trusted core values.
+// Foreign native fields have already been read in the original paint order.
+function freezePaint(cell) {
+    if (cell.width === 1 &&
+        cell.attributes === 0 &&
+        cell.foreground === defaultColor &&
+        cell.background === defaultColor) {
+        if (cell.grapheme === "")
+            return TERMINAL_REPLICA_EMPTY_CELL;
+        if (cell.grapheme === " ")
+            return TERMINAL_REPLICA_SPACE_CELL;
+    }
+    return Object.freeze(cell);
 }
 /**
  * Clean, column-preserving paint for a retained native row. This is a viewport
@@ -76,13 +85,13 @@ export function projectNativeGridRow(source, columns, startColumn = 0, wrapped =
             native.width > 2 ||
             x + native.width > columns) {
             const span = native.flags & 0x80 ? Math.max(1, Math.min(native.width, columns - x)) : 1;
-            const blank = Object.freeze({ ...styled, grapheme: "", width: 1 });
+            const blank = freezePaint({ ...styled, grapheme: "", width: 1 });
             for (let offset = 0; offset < span; offset++)
                 cells[x + offset] = blank;
             x += span - 1;
             continue;
         }
-        cells[x] = styled;
+        cells[x] = freezePaint(styled);
         if (native.width === 2) {
             cells[++x] = Object.freeze({ ...styled, grapheme: "", width: 0 });
         }