tmux-ide 2.9.15 → 2.9.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-ide",
-  "version": "2.9.15",
+  "version": "2.9.17",
   "description": "The open-source workspace for coding agents: run Claude Code, Codex and other agents in tmux with live status",
   "type": "module",
   "bin": {
@@ -70,6 +70,7 @@
     "postinstall": "node scripts/postinstall.js",
     "docs": "turbo run dev --filter=@tmux-ide/docs",
     "demo:tui": "bun --preload @opentui/solid/preload docs/scripts/render-tui-demo.tsx",
+    "demo:themes": "bun --preload @opentui/solid/preload docs/scripts/render-theme-gallery.tsx && node docs/scripts/rasterize-theme-gallery.mjs",
     "demo:font": "node docs/scripts/tui-demo-font/build.mjs",
     "readme:media": "node docs/scripts/readme-media.mjs",
     "test:tui-renderer": "bun test --preload @opentui/solid/preload --preload ./packages/daemon/test-support/opentui-renderer-preload.ts ./packages/daemon/src/tui/mirror/automatic-contrast-renderer.test.tsx ./packages/daemon/src/tui/mirror/pane-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/native-grid-projection-renderer.test.tsx ./packages/daemon/src/tui/mirror/widget-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/missions-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/recipes-gallery-renderer.test.tsx ./packages/daemon/src/tui/mirror/shell-chrome-renderer.test.tsx ./packages/daemon/src/tui/mirror/sidebar-renderer.test.tsx ./packages/daemon/src/tui/mirror/home-files-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/changes-terminal-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/activity-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/features/files/session-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-terminal-workspace-renderer.test.tsx ./packages/daemon/src/tui/mirror/testing/styled-frame-oracle.test.tsx ./packages/daemon/src/tui/mirror/runtime/terminal-transient-frame-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/terminal-draw-failure-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-shell-view-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-root-error-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-backpressure-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-demand-cadence-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/files-optional-feature-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/changes-optional-feature-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/missions-activity-optional-feature-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/dialogs-optional-feature-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/optional-feature-registry-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/palette-optional-feature-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/pane-scoped-terminal-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/features/rich-preview/feature.test.ts ./packages/daemon/src/tui/mirror/runtime/rich-preview-optional-feature-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/application-shell-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/pane-frame-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/terminal-pane-chrome-view.test.tsx ./packages/daemon/src/tui/mirror/workspace/terminal-window-strip-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/workbench-shell-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/workbench-dock-dual-host-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/agent-terminal-canvas-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/command-palette-surface-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/opentui-insertion-stability-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-shell-home-renderer.test.tsx ./packages/daemon/src/tui/mirror/workspace/terminal-pane-header-polish-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-home-agent-roster-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-home-agent-flow-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/guided-tour-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-shell-sidebar-catalog-renderer.test.tsx ./packages/daemon/src/tui/mirror/ui/ui-renderer.test.tsx ./packages/daemon/src/tui/mirror/ui/pane-interaction-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-machine-sidebar-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-add-machine-dialog-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-new-agent-dialog-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-fleet-switcher-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-palette-preview-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-fleet-palette-renderer.test.tsx ./packages/daemon/src/tui/mirror/runtime/application-fleet-session-actions-renderer.test.tsx ./packages/daemon/src/tui/mirror/ui/agent-team-renderer.test.tsx ./scripts/solid-conditional-props.test.tsx",

package/packages/contracts/src/tmux-server-scope.ts

@@ -151,6 +151,60 @@ export const TmuxServerSessionsResourceSchemaZ = z
   })
   .strict();
 
+/** Raw (decoded) byte limit for one session favicon on the sessions resource. */
+export const TMUX_SERVER_SESSION_FAVICON_MAX_BYTES = 32_768;
+export const TmuxServerSessionFaviconMimeSchemaZ = z.enum([
+  "image/png",
+  "image/svg+xml",
+  "image/x-icon",
+  "image/jpeg",
+  "image/webp",
+  "image/gif",
+]);
+export type TmuxServerSessionFaviconMime = z.infer<typeof TmuxServerSessionFaviconMimeSchemaZ>;
+function base64DecodedLength(data: string): number {
+  const padding = data.endsWith("==") ? 2 : data.endsWith("=") ? 1 : 0;
+  return (data.length / 4) * 3 - padding;
+}
+export const TmuxServerSessionFaviconSchemaZ = z
+  .object({
+    mime: TmuxServerSessionFaviconMimeSchemaZ,
+    data: z
+      .string()
+      .regex(/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u)
+      .refine(
+        (data) => base64DecodedLength(data) <= TMUX_SERVER_SESSION_FAVICON_MAX_BYTES,
+        "favicon exceeds 32 KiB",
+      ),
+  })
+  .strict();
+export type TmuxServerSessionFavicon = z.infer<typeof TmuxServerSessionFaviconSchemaZ>;
+
+/**
+ * Version 2 of the sessions resource, served only for `?version=2`. Version 1
+ * stays byte-for-byte for clients that parse it with unknown fields denied.
+ */
+export const TmuxServerSessionsResourceV2SchemaZ = z
+  .object({
+    version: z.literal(2),
+    server: TmuxServerScopeSchemaZ,
+    sessions: z.array(
+      z
+        .object({
+          liveSessionId: WorkspaceCatalogLiveSessionIdSchemaZ,
+          sessionName: z.string().min(1).max(160),
+          workspaceName: z.string().min(1).max(160).nullable(),
+          paneCount: z.number().int().nonnegative(),
+          windowCount: z.number().int().min(1),
+          lastActivity: z.number().int().nonnegative().nullable(),
+          favicon: TmuxServerSessionFaviconSchemaZ.nullable(),
+        })
+        .strict(),
+    ),
+  })
+  .strict();
+export type TmuxServerSessionsResourceV2 = z.infer<typeof TmuxServerSessionsResourceV2SchemaZ>;
+
 /** Selector intent is interpreted only by the daemon on its own host. */
 export const TmuxServerRegistrationRequestSchemaZ = z
   .object({

package/packages/core/src/terminal-fnv64-wasm.ts

@@ -10,7 +10,7 @@ export interface BufferedFnv64 {
   digest(): string;
 }
 
-interface NativeHasher {
+export interface NativeHasher {
   readonly scratch: Uint8Array;
   readonly update: (state: bigint, length: number) => bigint;
 }
@@ -49,6 +49,13 @@ function initialize(): NativeHasher | null {
   return native;
 }
 
+/** Direct access to the WASM scratch buffer and its update, for one synchronous
+ * hash at a time. Callers must not yield between filling the scratch and update. */
+export function nativeFnv64(): NativeHasher | null {
+  return initialize();
+}
+export const FNV64_OFFSET_BASIS = OFFSET_BASIS;
+
 /** Internal optional accelerator. Canonical serialization remains the caller's responsibility. */
 export function createBufferedFnv64(initialState = OFFSET_BASIS): BufferedFnv64 | null {
   const hasher = initialize();

package/packages/core/src/terminal-replica-hash-cache.ts

@@ -1,9 +1,15 @@
 import {
+  isOwnedTerminalReplicaRow,
   isSchemaValidProjectedTerminalReplicaRow,
   TERMINAL_REPLICA_DEFAULT_COLOR,
 } from "./terminal-replica-owned-row.ts";
 import type { TerminalReplicaColor, TerminalReplicaRow } from "@tmux-ide/contracts";
-import { createBufferedFnv64, type BufferedFnv64 } from "./terminal-fnv64-wasm.ts";
+import {
+  createBufferedFnv64,
+  FNV64_OFFSET_BASIS,
+  nativeFnv64,
+  type BufferedFnv64,
+} from "./terminal-fnv64-wasm.ts";
 
 const ROW_HASH_CACHE = new WeakMap<object, string>();
 const DEEPLY_FROZEN_ROWS = new WeakSet<object>();
@@ -425,6 +431,12 @@ export function hashTerminalReplicaRowCached(
   const cached = ROW_HASH_CACHE.get(row);
   if (cached) return cached;
   onMiss?.();
+  const native = nativeFnv64();
+  if (native) {
+    const digest = hashRowBytes(row, native);
+    if (isTerminalReplicaRowDeeplyFrozen(row)) ROW_HASH_CACHE.set(row, digest);
+    return digest;
+  }
   const hash = encodingCache?.createHash() ?? new CanonicalFnv64();
   let canonicalBytes = 10 + String(row.cells.length).length;
   hash.ascii("a2:");
@@ -631,6 +643,11 @@ export function primeTerminalReplicaRowHash(row: TerminalReplicaRow, digest: str
 
 export function isTerminalReplicaRowDeeplyFrozen(row: TerminalReplicaRow): boolean {
   if (DEEPLY_FROZEN_ROWS.has(row)) return true;
+  // Every owned-row constructor freezes the row, its cells and their colors.
+  if (isOwnedTerminalReplicaRow(row as unknown)) {
+    DEEPLY_FROZEN_ROWS.add(row);
+    return true;
+  }
   if (!Object.isFrozen(row) || !Object.isFrozen(row.cells)) return false;
   for (const cell of row.cells) {
     if (
@@ -643,3 +660,93 @@ export function isTerminalReplicaRowDeeplyFrozen(row: TerminalReplicaRow): boole
   DEEPLY_FROZEN_ROWS.add(row);
   return true;
 }
+
+// #708: the same canonical row bytes as hashTerminalReplicaRowCached's
+// CanonicalFnv64 path, assembled from per-cell byte strings and hashed in
+// WASM in 4 KiB chunks instead of several small JS writes per cell.
+const ASCII_ENCODER = new TextEncoder();
+const CELL_BYTES_LIMIT = 4_096;
+const PLAIN_CELL_BYTES = new Map<string, Uint8Array>();
+const STYLED_CELL_BYTES = new Map<string, Uint8Array>();
+const ROW_TRAILER = ASCII_ENCODER.encode(";;");
+
+function canonicalNumber(value: number): string {
+  const text = String(value);
+  return `d${text.length}:${text};`;
+}
+
+function canonicalColor(color: TerminalReplicaColor): string {
+  if (color.kind === "default") return "o1:s4:kind;s7:default;;";
+  if (color.kind === "indexed")
+    return `o2:s5:index;${canonicalNumber(color.index)}s4:kind;s7:indexed;;`;
+  return `o2:s4:kind;s3:rgb;s5:value;${canonicalNumber(color.value)};`;
+}
+
+function encodeCell(cell: TerminalReplicaRow["cells"][number]): Uint8Array {
+  const grapheme = cell.grapheme;
+  let length = grapheme.length;
+  for (let index = 0; index < grapheme.length; index += 1)
+    if (grapheme.charCodeAt(index) > 0x7f) {
+      length = UTF8_ENCODER.encode(grapheme).byteLength;
+      break;
+    }
+  return UTF8_ENCODER.encode(
+    `a5:s${length}:${grapheme};${canonicalNumber(cell.width)}${canonicalColor(
+      cell.foreground,
+    )}${canonicalColor(cell.background)}${canonicalNumber(cell.attributes)};`,
+  );
+}
+
+function remember(cache: Map<string, Uint8Array>, key: string, bytes: Uint8Array): Uint8Array {
+  if (cache.size >= CELL_BYTES_LIMIT) cache.clear();
+  cache.set(key, bytes);
+  return bytes;
+}
+
+function cellBytes(cell: TerminalReplicaRow["cells"][number]): Uint8Array {
+  const { grapheme, width, attributes, foreground, background } = cell;
+  if (
+    width === 1 &&
+    attributes === 0 &&
+    foreground.kind === "default" &&
+    background.kind === "default"
+  )
+    return PLAIN_CELL_BYTES.get(grapheme) ?? remember(PLAIN_CELL_BYTES, grapheme, encodeCell(cell));
+  const key = `${width}\u0000${attributes}\u0000${canonicalColor(foreground)}\u0000${canonicalColor(
+    background,
+  )}\u0000${grapheme}`;
+  return STYLED_CELL_BYTES.get(key) ?? remember(STYLED_CELL_BYTES, key, encodeCell(cell));
+}
+
+function hashRowBytes(
+  row: TerminalReplicaRow,
+  native: NonNullable<ReturnType<typeof nativeFnv64>>,
+): string {
+  const scratch = native.scratch;
+  const capacity = scratch.byteLength;
+  let state = FNV64_OFFSET_BASIS;
+  let length = 0;
+  const write = (bytes: Uint8Array) => {
+    if (bytes.byteLength <= capacity - length) {
+      scratch.set(bytes, length);
+      length += bytes.byteLength;
+      return;
+    }
+    let offset = 0;
+    while (offset < bytes.byteLength) {
+      const count = Math.min(capacity - length, bytes.byteLength - offset);
+      scratch.set(bytes.subarray(offset, offset + count), length);
+      length += count;
+      offset += count;
+      if (length === capacity) {
+        state = BigInt.asUintN(64, native.update(state, length));
+        length = 0;
+      }
+    }
+  };
+  write(ASCII_ENCODER.encode(`a2:${row.wrapped ? "b1;" : "b0;"}a${row.cells.length}:`));
+  for (const cell of row.cells) write(cellBytes(cell));
+  write(ROW_TRAILER);
+  state = BigInt.asUintN(64, native.update(state, length));
+  return state.toString(16).padStart(16, "0");
+}

package/packages/core/src/terminal-replica.ts

@@ -581,15 +581,19 @@ export async function applyTerminalReplicaUpdateCooperatively(
   }
   const authenticated = options.authenticatedFrameHash;
   const frameStart = readProfileClock(options.instrumentation);
-  const frameHash =
-    authenticated && /^[0-9a-f]{16}$/u.test(authenticated)
-      ? authenticated
-      : await hashCanonicalTerminalValueCooperatively(
-          { ...admitted, snapshot },
-          yieldControl,
-          // Bound frame hashing without scheduling a task per few cells.
-          32 * 1024,
-        );
+  const reuseAuthenticated = Boolean(authenticated && /^[0-9a-f]{16}$/u.test(authenticated));
+  if (!reuseAuthenticated) {
+    await primeTerminalReplicaRowsHashCooperatively(snapshot.grid, yieldControl);
+    await primeTerminalReplicaRowsHashCooperatively(snapshot.history, yieldControl);
+  }
+  const frameHash = reuseAuthenticated
+    ? authenticated!
+    : await hashCanonicalTerminalValueCooperatively(
+        terminalReplicaFrameIdentity({ ...admitted, snapshot }),
+        yieldControl,
+        // Bound frame hashing without scheduling a task per few cells.
+        32 * 1024,
+      );
   if (profile)
     profile.reusedAuthenticatedFrameHash = Boolean(
       authenticated && /^[0-9a-f]{16}$/u.test(authenticated),
@@ -984,11 +988,43 @@ function resolveFrameHash(
     return authenticated;
   }
   const started = readProfileClock(options.instrumentation);
-  const hash = hashStable(update);
+  const hash = hashStable(terminalReplicaFrameIdentity(update));
   addProfileDuration(profile, "updateHash", started, options.instrumentation);
   return hash;
 }
 
+/**
+ * What a frame hash covers. A seed's rows enter as their row-sequence hashes,
+ * which the replica caches per frozen row, so a seed carrying a pane's whole
+ * history is not walked cell by cell a second time (#706). Every other field
+ * enters as is. The cooperative and ordinary paths must agree: a redelivered
+ * seed whose frame hash differs is a protocol conflict, not idempotent.
+ */
+function terminalReplicaFrameIdentity(update: CanonicalTerminalReplicaUpdate): unknown {
+  if (update.type === "terminal.patch") {
+    // #708: a flood patch appends many history rows the interpreter has just
+    // hashed; enter them, and the changed screen rows, by their row hashes.
+    const { rows, history, historyDelta, ...rest } = update.patch;
+    return [
+      "terminal-replica-patch-frame-v2",
+      { ...update, patch: rest },
+      rows.map(({ index, row }) => [index, hashTerminalReplicaRow(row)]),
+      history === undefined ? null : hashTerminalReplicaRows(history),
+      historyDelta === undefined
+        ? null
+        : [historyDelta.trim, hashTerminalReplicaRows(historyDelta.append)],
+    ];
+  }
+  if (update.type !== "terminal.seed") return update;
+  const { grid, history, ...rest } = update.snapshot;
+  return [
+    "terminal-replica-frame-v2",
+    { ...update, snapshot: rest },
+    hashTerminalReplicaRows(grid),
+    hashTerminalReplicaRows(history),
+  ];
+}
+
 function readProfileClock(
   instrumentation: TerminalReplicaApplyOptions["instrumentation"] | undefined,
 ): number | undefined {

package/packages/daemon/dist/command-center/daemon-fleet-facts-observer.js

@@ -30,7 +30,7 @@ export class DaemonFleetFactsObserver {
     #diagnosticActiveOperations = 0;
     constructor(options) {
         this.#options = options;
-        this.#intervalMs = options.intervalMs ?? 2_000;
+        this.#intervalMs = options.intervalMs ?? FLEET_FACTS_POLL_MS;
         this.#setTimer =
             options.setTimer ??
                 ((callback, delayMs) => {
@@ -461,6 +461,13 @@ export function createDefaultFleetFactsReaders() {
     };
     return createSharedFleetFactsReaders(execute);
 }
+/**
+ * How often subscribed clients' tmux facts (sessions, panes, agent stamps) are
+ * read. Hook-stamped agent changes reach clients within one tick, so 500 ms
+ * keeps a state flip visible within 1 s (#716). One `list-panes -a` per tick,
+ * only while a client is subscribed.
+ */
+export const FLEET_FACTS_POLL_MS = 500;
 export const SESSION_COMPOSITION_TMUX_ARGS = [
     "list-panes",
     "-a",

package/packages/daemon/dist/command-center/discovery.js

@@ -160,11 +160,15 @@ export function isVisibleFleetSession(name) {
 export function readAdoptedSessionNames(runTmux = _tmuxRunner) {
     let raw;
     try {
-        raw = runTmux(["list-sessions", "-F", `#{session_name}\t#{${ADOPTED_OPTION}}`]);
+        raw = runTmux(ADOPTED_SESSIONS_ARGS);
     }
     catch {
         return null;
     }
+    return parseAdoptedSessionNames(raw);
+}
+const ADOPTED_SESSIONS_ARGS = ["list-sessions", "-F", `#{session_name}\t#{${ADOPTED_OPTION}}`];
+function parseAdoptedSessionNames(raw) {
     const names = [];
     for (const line of raw.split("\n")) {
         if (!line)
@@ -223,18 +227,47 @@ export function readAdoptedFleet(registry = getDefaultWorkspaceRegistry(), runTm
     const adopted = readAdoptedSessionNames(runTmux);
     if (adopted === null)
         return null;
-    const adoptedSet = new Set(adopted);
-    if (adoptedSet.size === 0)
+    if (adopted.length === 0)
+        return [];
+    let panesRaw;
+    try {
+        panesRaw = runTmux(FLEET_PANES_ARGS);
+    }
+    catch {
+        panesRaw = "";
+    }
+    return assembleAdoptedFleet(adopted, panesRaw, registry, nativeEpoch, resolveInteractionEndpoint, nativeServerEpoch);
+}
+/**
+ * {@link readAdoptedFleet} over an asynchronous tmux runner: the same two reads
+ * in the same order, without blocking the event loop while tmux answers (#709).
+ */
+export async function readAdoptedFleetAsync(registry, runTmux, resolveInteractionEndpoint, nativeServerEpoch) {
+    const nativeEpoch = nativeServerEpoch?.() ?? null;
+    let sessionsRaw;
+    try {
+        sessionsRaw = await runTmux(ADOPTED_SESSIONS_ARGS);
+    }
+    catch {
+        return null;
+    }
+    const adopted = parseAdoptedSessionNames(sessionsRaw);
+    if (adopted.length === 0)
         return [];
-    const appCreatedSessions = new Set(registry.list().map((workspace) => workspace.sessionName));
-    const panesBySession = new Map();
     let panesRaw;
     try {
-        panesRaw = runTmux(["list-panes", "-a", "-F", FLEET_PANE_FORMAT]);
+        panesRaw = await runTmux(FLEET_PANES_ARGS);
     }
     catch {
         panesRaw = "";
     }
+    return assembleAdoptedFleet(adopted, panesRaw, registry, nativeEpoch, resolveInteractionEndpoint, nativeServerEpoch);
+}
+const FLEET_PANES_ARGS = ["list-panes", "-a", "-F", FLEET_PANE_FORMAT];
+function assembleAdoptedFleet(adopted, panesRaw, registry, nativeEpoch, resolveInteractionEndpoint, nativeServerEpoch) {
+    const adoptedSet = new Set(adopted);
+    const appCreatedSessions = new Set(registry.list().map((workspace) => workspace.sessionName));
+    const panesBySession = new Map();
     for (const line of panesRaw.split("\n")) {
         if (!line)
             continue;

package/packages/daemon/dist/command-center/tmux-servers.js

@@ -10,13 +10,16 @@ import { streamSSE } from "hono/streaming";
 import { projectApplicationShellResource } from "./resources/application-shell.js";
 import { fleetSessionIdForName } from "./resources/fleet-catalog.js";
 import { z } from "zod";
-import { TmuxAgentOpenRequestSchemaZ, TmuxAgentOpenResponseSchemaZ, WorkspaceCatalogLiveSessionIdSchemaZ, WindowLinkTargetSchemaZ, WindowSplitLayoutResourceSchemaZ, TMUX_SERVERS_API_PATH, PANE_STREAM_ISSUE_PATH, TmuxServerIdSchemaZ, TmuxServerScopeSchemaZ, TmuxServersResourceSchemaZ, TmuxServerSessionsResourceSchemaZ, WorkspaceMultiplexerMutationRequestSchemaZ, WorkspacePaneCreateMutationRequestSchemaZ, WorkspaceSessionCreateArgumentsSchemaZ, } from "@tmux-ide/contracts";
+import { TmuxAgentOpenRequestSchemaZ, TmuxAgentOpenResponseSchemaZ, WorkspaceCatalogLiveSessionIdSchemaZ, WindowLinkTargetSchemaZ, WindowSplitLayoutResourceSchemaZ, TMUX_SERVERS_API_PATH, PANE_STREAM_ISSUE_PATH, TmuxServerIdSchemaZ, TmuxServerScopeSchemaZ, TmuxServersResourceSchemaZ, TmuxServerSessionsResourceSchemaZ, TmuxServerSessionsResourceV2SchemaZ, WorkspaceMultiplexerMutationRequestSchemaZ, WorkspacePaneCreateMutationRequestSchemaZ, WorkspaceSessionCreateArgumentsSchemaZ, } from "@tmux-ide/contracts";
 import { TmuxServerRegistrationSchemaZ, TmuxServerScopeError, } from "../lib/tmux-server-owners.js";
+import { createSessionFaviconResolver } from "../lib/session-favicon.js";
 import { WorkspaceMultiplexerError } from "../lib/workspace-multiplexer-verbs.js";
 import { WorkspacePaneCreationError } from "../lib/workspace-pane-creation.js";
 import { ownerBearerMatches } from "./owner-authority.js";
 import { mountPaneStreamIssueRoute } from "./pane-stream-issue.js";
 import { projectTerminalRuntimeInventory } from "./resources/terminal-runtime-inventory.js";
+/** Total raw favicon bytes one version 2 sessions response may carry. */
+export const SESSIONS_RESOURCE_FAVICON_BUDGET_BYTES = 512 * 1024;
 const registrationSchema = TmuxServerRegistrationSchemaZ.omit({ serverId: true }).strict();
 const workspaceSchema = z
     .string()
@@ -69,6 +72,7 @@ function failure(c, error) {
 /** Owner capability is mandatory even when the ordinary local HTTP surface is open. */
 export function mountTmuxServerRoutes(app, options) {
     const base = TMUX_SERVERS_API_PATH;
+    const resolveSessionFavicon = options.resolveSessionFavicon ?? createSessionFaviconResolver();
     const authorize = async (c, next) => {
         c.header("Cache-Control", "no-store");
         if (!ownerBearerMatches(c.req.header("Authorization"), options.ownerToken))
@@ -185,16 +189,48 @@ export function mountTmuxServerRoutes(app, options) {
     }));
     app.get(`${scoped}/sessions`, route(async (c) => {
         const server = scope(c);
-        return c.json(TmuxServerSessionsResourceSchemaZ.parse({
-            version: 1,
+        const v2 = c.req.query("version") === "2";
+        const { rows, favicons } = await options.owners.withOwner(server, async (owner) => {
+            const sessions = await owner.catalog();
+            const workspaces = owner.workspaceRegistry.list();
+            const rows = sessions.map((session) => {
+                const aliases = workspaces.filter((workspace) => workspace.sessionName === session.sessionName);
+                return { session, workspaceName: aliases.length === 1 ? aliases[0].name : null };
+            });
+            const favicons = v2
+                ? await Promise.all(sessions.map((session) => resolveSessionFavicon(session.sessionPath).catch(() => null)))
+                : [];
+            return { rows, favicons };
+        });
+        if (!v2)
+            return c.json(TmuxServerSessionsResourceSchemaZ.parse({
+                version: 1,
+                server,
+                sessions: rows.map(({ session, workspaceName }) => ({
+                    liveSessionId: session.liveSessionId,
+                    sessionName: session.sessionName,
+                    paneCount: session.paneCount,
+                    workspaceName,
+                })),
+            }));
+        let budget = SESSIONS_RESOURCE_FAVICON_BUDGET_BYTES;
+        return c.json(TmuxServerSessionsResourceV2SchemaZ.parse({
+            version: 2,
             server,
-            sessions: await options.owners.withOwner(server, async (owner) => {
-                const sessions = await owner.catalog();
-                const workspaces = owner.workspaceRegistry.list();
-                return sessions.map((session) => {
-                    const aliases = workspaces.filter((workspace) => workspace.sessionName === session.sessionName);
-                    return { ...session, workspaceName: aliases.length === 1 ? aliases[0].name : null };
-                });
+            sessions: rows.map(({ session, workspaceName }, index) => {
+                const found = favicons[index] ?? null;
+                const favicon = found && found.size <= budget ? found : null;
+                if (favicon)
+                    budget -= favicon.size;
+                return {
+                    liveSessionId: session.liveSessionId,
+                    sessionName: session.sessionName,
+                    workspaceName,
+                    paneCount: session.paneCount,
+                    windowCount: session.windowCount,
+                    lastActivity: session.lastActivity,
+                    favicon: favicon ? { mime: favicon.mime, data: favicon.data } : null,
+                };
             }),
         }));
     }));

package/packages/daemon/dist/lib/catalog-fleet-read.js

@@ -0,0 +1,10 @@
+import { readAdoptedFleet, readAdoptedFleetAsync, } from "../command-center/discovery.js";
+/**
+ * Read the catalog fleet without blocking the event loop (#709), except inside
+ * a session mutation, where the read keeps the fence's synchronous runner.
+ */
+export async function readCatalogFleet(registry, runners, resolveInteractionEndpoint, nativeServerEpoch) {
+    return runners.fence.active
+        ? readAdoptedFleet(registry, runners.fencedSync, resolveInteractionEndpoint, nativeServerEpoch)
+        : readAdoptedFleetAsync(registry, runners.generationFencedAsync, resolveInteractionEndpoint, nativeServerEpoch);
+}

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

@@ -68,7 +68,8 @@ import { setDaemonShutdownBackend, setDaemonRestartBackend, } from "../command-c
 import { readAppSettings } from "./app-settings.js";
 import { getDefaultWorkspaceRegistry, readWorkspaceRegistrySessionInventory, WORKSPACE_REGISTRY_TMUX_TIMEOUT_MS, } from "./workspace-registry.js";
 import { createPinnedWorkspaceTmuxRunner, createPinnedWorkspaceTmuxAsyncRunner, resolveWorkspacePaneTmuxAuthority, WorkspacePaneCreationAuthority, } from "./workspace-pane-creation.js";
-import { discoverLiveSessionSummaries, readAdoptedFleet } from "../command-center/discovery.js";
+import { discoverLiveSessionSummaries, readAdoptedFleet, } from "../command-center/discovery.js";
+import { readCatalogFleet } from "./catalog-fleet-read.js";
 import { WorkspaceOpenAuthority } from "./workspace-open.js";
 import { WorkspacePromotionAuthority } from "./workspace-promotion.js";
 import { WorkspaceOpenHandoffCoordinator } from "./workspace-open-handoff.js";
@@ -1542,9 +1543,19 @@ async function startEmbeddedDaemonGeneration(opts) {
                 paneStreamRuntime,
                 catalogLiveSessions: () => discoverLiveSessionSummaries(catalogTmuxRunner),
                 catalogFleet: async () => {
-                    const fleet = readAdoptedFleet(workspaceRegistry, nativeGenerationTmuxRunner, (sessionName, pane) => pane.semanticPaneId
+                    const endpoint = (sessionName, pane) => pane.semanticPaneId
                         ? (interactionEvidence?.captureInventoryEndpoint(sessionName, pane.runtimePaneId, pane.semanticPaneId) ?? null)
-                        : null, () => observationSelector?.nativeServerEpoch ?? null);
+                        : null;
+                    const epoch = () => observationSelector?.nativeServerEpoch ?? null;
+                    // Same pinned server generation either way. Outside a session
+                    // mutation the read must not block the event loop: every concurrent
+                    // catalog request queued behind its spawnSync (#709). Inside one,
+                    // keep the fenced synchronous runner the mutation relies on.
+                    const fleet = await readCatalogFleet(workspaceRegistry, {
+                        fence: sessionMutationFence,
+                        fencedSync: nativeGenerationTmuxRunner,
+                        generationFencedAsync: (args) => fleetFactsTmuxRunner(args),
+                    }, endpoint, epoch);
                     if (!fleet)
                         return null;
                     const names = await readTeamMemberships(fleet.flatMap((session) => session.panes.map((pane) => ({

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

@@ -106,13 +106,18 @@ export async function manageDaemonService(action, executable, deps = defaults())
             refused("The service manager loaded a different definition; refusing to control it");
         return state;
     };
-    const ready = async (previousInstance) => {
+    // `retiredPid` is the process this restart terminated. It can publish a record
+    // while it shuts down (a KeepAlive relaunch just before the restart), so it is
+    // never the replacement, whatever its instance id.
+    const ready = async (previousInstance, retiredPid) => {
         const deadline = Date.now() + deps.waitMs;
         do {
             const state = deps.inspect();
             if (!boundTo(state, plan.supervisionId))
                 refused("Service reservation changed during startup");
-            if (state.status === "valid" && state.info.instanceId !== previousInstance) {
+            if (state.status === "valid" &&
+                state.info.instanceId !== previousInstance &&
+                state.info.pid !== retiredPid) {
                 const identity = await deps.probe(state.info);
                 const service = await inspectManager();
                 if (identity &&
@@ -236,11 +241,14 @@ export async function manageDaemonService(action, executable, deps = defaults())
         const before = deps.inspect();
         if (action === "install" && service.active)
             return await ready();
-        if (service.loaded)
-            await manager.restart(service.pid !== null);
+        // Read the manager again: a relaunch may have replaced the process while this
+        // waited for the lock, and the restart terminates whichever one runs now.
+        const current = service.loaded ? await inspectManager() : service;
+        if (current.loaded)
+            await manager.restart(current.pid !== null);
         else
             await manager.install();
-        return await ready(before.status === "valid" ? before.info.instanceId : undefined);
+        return await ready(before.status === "valid" ? before.info.instanceId : undefined, current.loaded ? current.pid : null);
     }
     catch (error) {
         // Never discard ownership after an uncertain OS activation. The retained