tmux-ide 2.9.6 → 2.9.8

package/packages/daemon/dist/lib/canonical-daemon-bootstrap.js

@@ -32,6 +32,13 @@ function spawnOwner(entryPath, cwd) {
         });
     });
 }
+class ShutdownTransportError extends Error {
+    original;
+    constructor(original) {
+        super("Canonical daemon shutdown transport failed.", { cause: original });
+        this.original = original;
+    }
+}
 async function shutdownOlderOwner(info) {
     const headers = { "content-type": "application/json" };
     if (info.authToken)
@@ -45,6 +52,8 @@ async function shutdownOlderOwner(info) {
             expectedInstanceId: info.instanceId,
         }),
         signal: AbortSignal.timeout(2_000),
+    }).catch((error) => {
+        throw new ShutdownTransportError(error);
     });
     const envelope = (await response.json().catch(() => null));
     // The authenticated handler verifies expectedInstanceId before reporting this
@@ -141,7 +150,18 @@ async function replaceOlderCanonicalDaemon(deps, info, timeoutMs, expectedProduc
             "tmux-ide --headless --supervised <id> before restarting it. " +
             "The existing daemon has been left running.", { reason: "canonical-record-invalid" });
     }
-    await deps.shutdownOlderOwner(info);
+    let transportFailure;
+    try {
+        await deps.shutdownOlderOwner(info);
+    }
+    catch (error) {
+        if (!(error instanceof ShutdownTransportError))
+            throw error;
+        transportFailure = error;
+    }
+    // A competing upgrader may close the authenticated owner's listener before
+    // removing its record. Observe retirement, without repeating the mutation.
+    // A transport failure alone never authorizes starting a replacement.
     const deadline = deps.now() + timeoutMs;
     while (deps.now() < deadline) {
         const state = deps.inspect();
@@ -153,6 +173,8 @@ async function replaceOlderCanonicalDaemon(deps, info, timeoutMs, expectedProduc
             return;
         await deps.sleep(25);
     }
+    if (transportFailure)
+        throw transportFailure.original;
     throw new DaemonBootstrapError("control-timeout", "The older canonical daemon did not retire after accepting the version upgrade.", { reason: "protocol-mismatch" });
 }
 async function assertServerIntent(deps, info, identity, intent) {

package/packages/daemon/dist/lib/daemon-embed.js

@@ -6,6 +6,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
+import { TmuxServerVersionSchemaZ } from "@tmux-ide/contracts";
 import { createNativeSplitCapabilityProbe, createNativeSplitReadiness, } from "./native-split-capability.js";
 import { executeCanonicalSplitMutation } from "./canonical-split-mutation.js";
 import { createGuardedNativeSplitResize } from "./guarded-native-split-resize.js";
@@ -956,6 +957,7 @@ async function startEmbeddedDaemonGeneration(opts) {
         let paneStreamRuntime = null;
         let serverOwners = null;
         let defaultEditorContextRetired = false;
+        const defaultDiagnosticsLifetime = new AbortController();
         const defaultSessionCreator = createNativeTmuxSessionCreator({
             generation: instanceId,
             registry: workspaceRegistry,
@@ -1287,6 +1289,24 @@ async function startEmbeddedDaemonGeneration(opts) {
                 stateDirectory: resolveRuntimeNamespace().runtimeDir,
                 webSocketBaseUrl: canonicalDaemonUrl("ws", bindHostname, port),
                 defaultOwner: {
+                    readServerVersion: async (signal) => {
+                        const assertCurrent = () => {
+                            if (defaultEditorContextRetired ||
+                                serverOwners?.defaultRetired ||
+                                !initialNativeServerIdentity)
+                                throw new Error("Default tmux diagnostics owner is unavailable");
+                        };
+                        assertCurrent();
+                        const combined = AbortSignal.any([
+                            defaultDiagnosticsLifetime.signal,
+                            ...(signal ? [signal] : []),
+                        ]);
+                        combined.throwIfAborted();
+                        const output = await fleetFactsTmuxRunner(["display-message", "-p", "#{version}"], combined);
+                        combined.throwIfAborted();
+                        assertCurrent();
+                        return TmuxServerVersionSchemaZ.parse(output.trim());
+                    },
                     get interactionObservation() {
                         return interactionObservation;
                     },
@@ -1375,6 +1395,7 @@ async function startEmbeddedDaemonGeneration(opts) {
                     paneStreamRuntime,
                     dispose: async () => {
                         defaultEditorContextRetired = true;
+                        defaultDiagnosticsLifetime.abort();
                         sessionMonitor?.stop();
                         paneSourceCredentials.dispose();
                         const transportResults = await Promise.allSettled([

package/packages/daemon/dist/lib/tmux-server-owner.js

@@ -17,7 +17,7 @@ import { createNativeTmuxSessionOpener } from "./tmux-server-session-open.js";
 import { observedAgentSchema } from "./tmux-server-agent-admission.js";
 import { createPaneEditorContextResolver } from "./tmux-pane-editor-context.js";
 import { createHash, randomUUID } from "node:crypto";
-import { WorkspaceIdSchemaZ, WindowLinkTargetSchemaZ, } from "@tmux-ide/contracts";
+import { TmuxServerVersionSchemaZ, WorkspaceIdSchemaZ, WindowLinkTargetSchemaZ, } from "@tmux-ide/contracts";
 import { WindowSplitLayoutUnavailable } from "../terminal/mirror/window-split-authority.js";
 import { mkdirSync } from "node:fs";
 import { z } from "zod";
@@ -483,6 +483,15 @@ export async function createNativeTmuxServerOwner(options) {
         throw error;
     }
     return {
+        readServerVersion: async (signal) => {
+            assertOpen();
+            const combined = AbortSignal.any([credentialLifetime.signal, ...(signal ? [signal] : [])]);
+            combined.throwIfAborted();
+            const output = await generationRunAsync(["display-message", "-p", "#{version}"], combined);
+            combined.throwIfAborted();
+            assertOpen();
+            return TmuxServerVersionSchemaZ.parse(output.trim());
+        },
         serverId: options.serverId,
         generation,
         resolvePaneEditorContext,

package/packages/daemon/dist/lib/tmux-session-mutation-fence.js

@@ -23,7 +23,8 @@ export function createTmuxSessionMutationFence() {
                 const output = run([
                     "if-shell",
                     "-t",
-                    `=${selected.name}`,
+                    // if-shell resolves a pane target: the colon selects this exact session.
+                    `=${selected.name}:`,
                     "-F",
                     `#{&&:#{==:#{session_id},${selected.id}},#{==:#{session_created},${selected.created}}}`,
                     args.map((arg) => (arg === ";" ? ";" : shellEscape(arg))).join(" "),

package/packages/daemon/dist/native/TmuxIdeNotifier.app/Contents/Info.plist

@@ -21,9 +21,9 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>2.9.6</string>
+  <string>2.9.8</string>
   <key>CFBundleVersion</key>
-  <string>2.9.6</string>
+  <string>2.9.8</string>
   <key>LSMinimumSystemVersion</key>
   <string>11.0</string>
   <key>LSUIElement</key>

package/packages/daemon/dist/native/TmuxIdeNotifier.app/Contents/_CodeSignature/CodeResources

@@ -10,7 +10,7 @@
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		EvwqetqXdPImCl5x7nS2kIPD49Y=
+		l0+pnfS5aykXdUJ9hqLbM8D+kxA=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -26,7 +26,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			SkyYNOjv6tCr/MP0BYaswjWbcppNxwnvXBYKtGTpF4w=
+			w7jEtdTuow3Sd//xEnaf1qdzU3Mu7zdDF3IKDCN08Yw=
 			</data>
 		</dict>
 	</dict>

package/packages/daemon/dist/native/tmux/darwin-arm64/manifest.json

@@ -22,6 +22,14 @@
     {
       "patch": "split-resize.patch",
       "patchSha256": "4d010271fb4eb52cf36fd29b66e7b3c52c44f6ba90296b944014d74bf3d4222a"
+    },
+    {
+      "patch": "kitty-graphics.patch",
+      "patchSha256": "1ff7b3022aa2a3d7014b7339c0f2ae868292d5d6df3c668cefa403509ecbc1f6"
+    },
+    {
+      "patch": "precise-cell-pixels.patch",
+      "patchSha256": "11b2f09f347d0369a744be5aef14e7be3407f4bfa6cae2047b9477234a01ba24"
     }
   ],
   "experimentalExtensions": [
@@ -40,12 +48,12 @@
   "platform": "darwin",
   "arch": "arm64",
   "files": {
-    "tmux": "83024593f485cd4ed363aff6f898823f4401fc7e34c9a46e5732ae6fb8588666",
-    "lib/libutf8proc.3.2.3.dylib": "9d044f05ab5e8b19ae954485cfd8b7dd06e0cb66f0e02fe80be99533b21168ae",
+    "tmux": "78b5efc7cb7308e892487a0ea046c531a271680c812c8b8851796dbdf57b0fe8",
+    "lib/libutf8proc.3.3.0.dylib": "da17133f84767a9873ff61402ac1a9d6a19ddfc1efb90cffc7c894df68532ce2",
     "lib/libncursesw.6.dylib": "c9b3c77b5874b0c694590774f7b7b1568b2bb13e82707bdf29cb7296446fe596",
-    "lib/libevent_core-2.1.7.dylib": "5d8dc45957013ce78a17dbacd6f5ed80cec148983d8c7eeeb4408d2f7f74743e",
+    "lib/libevent_core-2.1.7.dylib": "65a205eee103b07356c1d6b1102b6b6ca08b0abaad44d960a0dad809722d0a9d",
     "licenses/interaction-journal.txt": "9f02e74957c4c5efb1b65cf35d14b291a7e83807d89e8afedf6e9cb5dbfed39c",
-    "licenses/libutf8proc.3.2.3.dylib.txt": "3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256",
+    "licenses/libutf8proc.3.3.0.dylib.txt": "3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256",
     "licenses/libncursesw.6.dylib.txt": "708999f95527e1ffa670c6fce288c6c600cb477dd04afcc1171422b3dd4ee226",
     "licenses/libevent_core-2.1.7.dylib.txt": "ff02effc9b331edcdac387d198691bfa3e575e7d244ad10cb826aa51ef085670",
     "share/terminfo/31/1178": "e7172b912d33529169b2f877bf18009c2947d7045a845ec2178ada7bba2b8b48",

package/packages/daemon/dist/native/tmux/linux-arm64/manifest.json

@@ -22,6 +22,14 @@
     {
       "patch": "split-resize.patch",
       "patchSha256": "4d010271fb4eb52cf36fd29b66e7b3c52c44f6ba90296b944014d74bf3d4222a"
+    },
+    {
+      "patch": "kitty-graphics.patch",
+      "patchSha256": "1ff7b3022aa2a3d7014b7339c0f2ae868292d5d6df3c668cefa403509ecbc1f6"
+    },
+    {
+      "patch": "precise-cell-pixels.patch",
+      "patchSha256": "11b2f09f347d0369a744be5aef14e7be3407f4bfa6cae2047b9477234a01ba24"
     }
   ],
   "experimentalExtensions": [
@@ -68,7 +76,7 @@
   "platform": "linux",
   "arch": "arm64",
   "files": {
-    "tmux": "eb7c528ae08224bde1142be8b904d62cbf9e8dcba303fcc782c32acabb860938",
+    "tmux": "23ce24278d4c778f6ce974c492e46fcc09e20de577125a841f1d5f91b21a79ce",
     "lib/libutf8proc.so.3": "83cd7bce65037a46494b154b0f7bfd2479bc1659f56321b9ec896f4b64fb490c",
     "lib/libtinfo.so.6": "22952a4f434fd0f356fad23b92de42084e6666d8a594eadd11511b059cc5bb66",
     "lib/libevent_core-2.1.so.7": "80ad9f14cdea14f65c7a778fef4d831d51d23edc55efd263d7f265587eab73d4",

package/packages/daemon/dist/native/tmux/linux-x64/manifest.json

@@ -22,6 +22,14 @@
     {
       "patch": "split-resize.patch",
       "patchSha256": "4d010271fb4eb52cf36fd29b66e7b3c52c44f6ba90296b944014d74bf3d4222a"
+    },
+    {
+      "patch": "kitty-graphics.patch",
+      "patchSha256": "1ff7b3022aa2a3d7014b7339c0f2ae868292d5d6df3c668cefa403509ecbc1f6"
+    },
+    {
+      "patch": "precise-cell-pixels.patch",
+      "patchSha256": "11b2f09f347d0369a744be5aef14e7be3407f4bfa6cae2047b9477234a01ba24"
     }
   ],
   "experimentalExtensions": [
@@ -68,7 +76,7 @@
   "platform": "linux",
   "arch": "x64",
   "files": {
-    "tmux": "4fc64502841e5944e6f26a0afed510203d0dfeb3ea63844366c4ee036da8583e",
+    "tmux": "ef3549656f724cb37e5e94f718d9997570fb3cf55bdafa2585fa1f827e66ba3c",
     "lib/libutf8proc.so.3": "a5aa10c99ac2e9a30c4e01fa4baa85a03dadf71eb73119c76fb3f9f54798962d",
     "lib/libtinfo.so.6": "170db4dd0c324ee73d8d5440a38708726066e1288aba942d57191c6f002240d9",
     "lib/libevent_core-2.1.so.7": "adf343350b739d3dba2b8a6cccbe0729cd9e9ee32b38ba69c08bd14f24a8431e",

package/packages/daemon/dist/terminal/attachments/native-runtime.js

@@ -583,6 +583,9 @@ function parsePaneSnapshot(stdout, expected) {
  * application-shell inventory. Names are resolved exactly to `$session_id`
  * before any pane query, and a second identity/topology snapshot closes races.
  */
+const INVENTORY_FENCE_ATTEMPTS = 4;
+/** 25, 50, 100 ms: enough for a mutation's identity stamps, bounded for every reader. */
+const settleDelay = (attempt) => new Promise((resolve) => setTimeout(resolve, 25 * 2 ** (attempt - 1)));
 export async function discoverWorkspaceRegistryTerminalInventory(registry, runner, signal) {
     const workspaces = registry.list();
     if (workspaces.length > MAX_DISCOVERED_WORKSPACES) {
@@ -604,13 +607,6 @@ export async function discoverWorkspaceRegistryTerminalInventory(registry, runne
         const before = await requiredTmuxResult(runner, argv, signal);
         if (before === null)
             continue;
-        const first = parsePaneSnapshot(before, identity);
-        const panes = first.panes;
-        const after = await requiredTmuxResult(runner, argv, signal);
-        if (after === null)
-            throw new NativeTerminalAttachmentRuntimeError("discovery-failed");
-        const second = parsePaneSnapshot(after, identity);
-        const latest = second.panes;
         // Foreground commands, titles, focus and paths can change while the same
         // pane remains valid. Fence binding/topology only, then publish one complete
         // latest snapshot rather than mixing presentation values across reads.
@@ -625,12 +621,29 @@ export async function discoverWorkspaceRegistryTerminalInventory(registry, runne
             "windowStamp",
             "index",
         ];
-        if (first.linksProof !== second.linksProof ||
-            panes.length !== latest.length ||
-            panes.some((pane, index) => proofKeys.some((key) => pane[key] !== latest[index][key]))) {
-            throw new NativeTerminalAttachmentRuntimeError("discovery-failed");
+        const matches = (first, second) => first.linksProof === second.linksProof &&
+            first.panes.length === second.panes.length &&
+            first.panes.every((pane, index) => proofKeys.every((key) => pane[key] === second.panes[index][key]));
+        // A just-created window or split is still being stamped, so topology can
+        // move between two reads. Let it settle for a bounded number of re-reads;
+        // only two consecutive matching reads are ever published.
+        let previous = parsePaneSnapshot(before, identity);
+        let stable = null;
+        for (let attempt = 0; attempt < INVENTORY_FENCE_ATTEMPTS && !stable; attempt += 1) {
+            if (attempt > 0)
+                await settleDelay(attempt);
+            const after = await requiredTmuxResult(runner, argv, signal);
+            if (after === null)
+                throw new NativeTerminalAttachmentRuntimeError("discovery-failed");
+            const next = parsePaneSnapshot(after, identity);
+            if (matches(previous, next))
+                stable = next;
+            else
+                previous = next;
         }
-        bySessionName.set(sessionName, latest);
+        if (!stable)
+            throw new NativeTerminalAttachmentRuntimeError("discovery-failed");
+        bySessionName.set(sessionName, stable.panes);
     }
     const panes = [];
     for (const workspace of workspaces) {