tmux-ide 2.9.2 → 2.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-ide",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "description": "A visual, agent-aware IDE for any tmux session, with optional workspace presets",
   "type": "module",
   "bin": {
@@ -25,7 +25,15 @@
     "packages/presentation/package.json",
     "packages/tmux-bridge/src",
     "packages/tmux-bridge/package.json",
-    "packages/contracts/package.json"
+    "packages/contracts/package.json",
+    "!packages/*/src/**/*.test.*",
+    "!packages/*/src/**/*.spec.*",
+    "!packages/*/src/**/__tests__/**",
+    "!packages/*/src/**/__snapshots__/**",
+    "!packages/daemon/dist/**/*.test.*",
+    "!packages/daemon/dist/**/*.spec.*",
+    "!packages/daemon/dist/**/__tests__/**",
+    "!packages/daemon/dist/**/__snapshots__/**"
   ],
   "scripts": {
     "build": "pnpm build:cli",
@@ -41,8 +49,8 @@
     "dev:instance": "node scripts/development-instance.mjs",
     "dev:pilotty": "node scripts/pilotty-dev.mjs",
     "dev:web": "node scripts/dev-web.mjs",
-    "test": "pnpm -r --workspace-concurrency=1 --filter @tmux-ide/daemon --filter @tmux-ide/contracts --filter @tmux-ide/core --filter @tmux-ide/daemon-client --filter @tmux-ide/sdk --filter @tmux-ide/desktop-renderer --filter @tmux-ide/web-workspace --filter @tmux-ide/electron-shell run test",
-    "test:unit": "pnpm -r --workspace-concurrency=1 --filter @tmux-ide/daemon --filter @tmux-ide/contracts --filter @tmux-ide/core --filter @tmux-ide/daemon-client --filter @tmux-ide/sdk --filter @tmux-ide/desktop-renderer --filter @tmux-ide/web-workspace --filter @tmux-ide/electron-shell run test",
+    "test": "pnpm run test:unit",
+    "test:unit": "pnpm run build:cli && pnpm -r --workspace-concurrency=1 --filter @tmux-ide/daemon --filter @tmux-ide/contracts --filter @tmux-ide/core --filter @tmux-ide/daemon-client --filter @tmux-ide/sdk --filter @tmux-ide/desktop-renderer --filter @tmux-ide/electron-shell run test",
     "test:daemon-bun": "bun test ./packages/daemon/src/lib/canonical-daemon-supervision.test.ts ./packages/daemon/src/lib/canonical-daemon.test.ts ./packages/daemon/src/lib/auth/middleware.test.ts ./packages/daemon/src/command-center/actions/handlers/daemon-shutdown.test.ts ./packages/daemon/src/command-center/resources/application-shell.test.ts ./packages/daemon/src/command-center/resources/agent-graph-overlay.test.ts ./packages/daemon/src/tui/mirror/runtime/runtime-layout-presentation.test.ts ./packages/daemon/src/tui/mirror/runtime/terminal-fast-lane-renderer-adapter.test.ts ./packages/daemon/src/tui/mirror/runtime/terminal-pane-input-router.test.ts",
     "lint": "eslint bin scripts packages/contracts/src packages/core/src packages/daemon-client/src packages/sdk/src packages/tmux-bridge/src packages/daemon/src",
     "lint:workspace": "turbo run lint",
@@ -64,7 +72,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",
-    "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/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",
+    "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/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",
     "test:tui-smoke": "bun scripts/smoke-tui-missions.mjs",
     "test:tui-live": "node scripts/tui-testdrive.mjs smoke",
     "test:tui-testdrive": "node --test scripts/lib/tui-testdrive-clipboard-hook.test.mjs scripts/lib/tui-testdrive-input.test.mjs",
@@ -139,6 +147,7 @@
     "@eslint/js": "^10.0.1",
     "@opentui/core": "^0.5.1",
     "@opentui/solid": "^0.5.1",
+    "@tmux-ide/contracts": "workspace:*",
     "@tsconfig/bun": "^1.0.10",
     "@types/node": "^25.5.0",
     "@types/ws": "^8.18.1",

package/packages/contracts/src/desktop-host.ts

@@ -691,6 +691,9 @@ export const DesktopEnvironmentSummarySchemaZ = z
         "incompatible",
         "daemon-missing",
         "identity-mismatch",
+        "ssh-authentication",
+        "ssh-host-key",
+        "remote-cli-missing",
       ])
       .nullable(),
   })

package/packages/contracts/src/saved-machines.ts

@@ -53,3 +53,22 @@ export const SavedMachineRegistrySchema = z
     });
   });
 export type SavedMachineRegistry = z.infer<typeof SavedMachineRegistrySchema>;
+
+/** Local owner actions; never a request to stop a remote daemon or tmux session. */
+export const SavedMachineMutationSchema = z.discriminatedUnion("operation", [
+  z.strictObject({
+    id: SavedMachineIdSchema,
+    operation: z.enum(["enable", "disable", "remove"]),
+  }),
+  z.strictObject({
+    id: SavedMachineIdSchema,
+    operation: z.literal("edit"),
+    patch: SavedMachineSchema.pick({ label: true, sshTarget: true })
+      .partial()
+      .refine(
+        (patch) => patch.label !== undefined || patch.sshTarget !== undefined,
+        "Provide a label or SSH target",
+      ),
+  }),
+]);
+export type SavedMachineMutation = z.infer<typeof SavedMachineMutationSchema>;

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

@@ -13,7 +13,7 @@ export type TerminalReplicaCellAttributes = z.infer<typeof TerminalReplicaCellAt
 export const TerminalReplicaCellSchemaZ = z
   .object({
     grapheme: z.string(),
-    width: z.union([z.literal(0), z.literal(1), z.literal(2)]),
+    width: z.literal([0, 1, 2]),
     foreground: TerminalReplicaColorSchemaZ,
     background: TerminalReplicaColorSchemaZ,
     attributes: TerminalReplicaCellAttributesSchemaZ,

package/packages/core/package.json

@@ -24,10 +24,11 @@
   "scripts": {
     "lint": "eslint src",
     "typecheck": "tsc --noEmit",
-    "test": "vitest run"
+    "test": "vitest run --exclude src/terminal-compact-cold.test.ts && vitest run src/terminal-compact-cold.test.ts --maxWorkers=1"
   },
   "dependencies": {
-    "@tmux-ide/contracts": "workspace:*"
+    "@tmux-ide/contracts": "workspace:*",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "typescript": "^5.9.3",

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

@@ -1,3 +1,5 @@
+import { z } from "zod";
+import { isOwnedTerminalReplicaRow } from "./terminal-replica-owned-row.ts";
 import {
   TERMINAL_DELIVERY_CHUNK_BYTES,
   TERMINAL_DELIVERY_MAX_REPRESENTATION_BYTES,
@@ -209,6 +211,43 @@ type CompactColor = 0 | readonly [1 | 2, number];
 type CompactCellRun = [number, string, 0 | 1 | 2, CompactColor, CompactColor, number];
 type CompactRow = readonly [0 | 1, readonly CompactCellRun[]];
 
+// Repeated seeds share immutable core-owned rows. Validate each such row
+// with the strict contract before remembering it; ownership alone is not enough.
+// External rows still use the ordinary schema and detached parse result.
+const validatedOwnedEncodingRows = new WeakSet<TerminalReplicaRow>();
+const CompactEncodingRowSchema = z.union([
+  z.custom<TerminalReplicaRow>((input) => {
+    if (!isOwnedTerminalReplicaRow(input)) return false;
+    if (validatedOwnedEncodingRows.has(input)) return true;
+    if (!TerminalReplicaRowSchemaZ.safeParse(input).success) return false;
+    validatedOwnedEncodingRows.add(input);
+    return true;
+  }),
+  TerminalReplicaRowSchemaZ,
+]);
+const CompactEncodingPayloadSchema = z.discriminatedUnion("frame", [
+  TerminalSemanticDeliveryPayloadSchemaZ.options[0].extend({
+    snapshot: TerminalReplicaSnapshotSchemaZ.extend({
+      grid: z.array(CompactEncodingRowSchema),
+      history: z.array(CompactEncodingRowSchema),
+    }),
+  }),
+  TerminalSemanticDeliveryPayloadSchemaZ.options[1],
+  TerminalSemanticDeliveryPayloadSchemaZ.options[2],
+]);
+
+function hasOwnedSeedRow(input: TerminalSemanticDeliveryPayload): boolean {
+  // Select the optimized schema without reading user accessors. Its row union
+  // still validates every unowned row if a seed mixes owned and external data.
+  const snapshot = Object.getOwnPropertyDescriptor(input, "snapshot")?.value;
+  if (typeof snapshot !== "object" || snapshot === null) return false;
+  const grid = Object.getOwnPropertyDescriptor(snapshot, "grid")?.value;
+  return (
+    Array.isArray(grid) &&
+    isOwnedTerminalReplicaRow(Object.getOwnPropertyDescriptor(grid, "0")?.value)
+  );
+}
+
 /**
  * A negotiated exact semantic representation. It changes only the wire shape:
  * decode always returns the same strict canonical payload and hash authority.
@@ -216,7 +255,9 @@ type CompactRow = readonly [0 | 1, readonly CompactCellRun[]];
 export function encodeCompactSemanticTerminalUpdate(
   input: TerminalSemanticDeliveryPayload,
 ): Uint8Array {
-  const update = TerminalSemanticDeliveryPayloadSchemaZ.parse(input);
+  const update = (
+    hasOwnedSeedRow(input) ? CompactEncodingPayloadSchema : TerminalSemanticDeliveryPayloadSchemaZ
+  ).parse(input);
   // Compact payloads contain only arrays and primitives below this object.
   // Insert root keys in canonical order so the native serializer emits exactly
   // the same representation without recursively allocating JSON fragments.
@@ -344,7 +385,10 @@ export async function encodeCompactSemanticTerminalUpdateCooperatively(
   for (const rows of [grid, history]) {
     write("[");
     for (let index = 0; index < rows.length; index++) {
-      const { cells, ...rowHeaderInput } = rows[index]!;
+      const row = rows[index]!;
+      const owned = isOwnedTerminalReplicaRow(row);
+      const validatedRow = owned && validatedOwnedEncodingRows.has(row);
+      const { cells, ...rowHeaderInput } = row;
       const rowHeader = CompactRowHeaderSchema.parse(rowHeaderInput);
       if (++rowCount > COMPACT_MAX_ROWS || !Array.isArray(cells) || cells.length !== metadata.cols)
         compactEncodingLimit();
@@ -361,7 +405,8 @@ export async function encodeCompactSemanticTerminalUpdateCooperatively(
         wroteRun = true;
       };
       for (let offset = 0; offset < cells.length; offset += 256) {
-        const validated = CompactCellSliceSchema.parse(cells.slice(offset, offset + 256));
+        const slice = cells.slice(offset, offset + 256);
+        const validated = validatedRow ? slice : CompactCellSliceSchema.parse(slice);
         for (const cell of validated) {
           const encoded = compactCell(cell);
           if (prior && compactRunCellEqual(prior, encoded)) prior[0]++;
@@ -381,6 +426,9 @@ export async function encodeCompactSemanticTerminalUpdateCooperatively(
       }
       emitRun();
       write("]]");
+      // Header and every cell have passed the strict row contract, in bounded
+      // slices. Only a completed immutable row may be reused by either encoder.
+      if (owned) validatedOwnedEncodingRows.add(row);
     }
     write("],");
   }

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

@@ -50,9 +50,9 @@ function initialize(): NativeHasher | null {
 }
 
 /** Internal optional accelerator. Canonical serialization remains the caller's responsibility. */
-export function createBufferedFnv64(): BufferedFnv64 | null {
+export function createBufferedFnv64(initialState = OFFSET_BASIS): BufferedFnv64 | null {
   const hasher = initialize();
-  return hasher ? new BufferedHasher(hasher) : null;
+  return hasher ? new BufferedHasher(hasher, initialState) : null;
 }
 
 class BufferedHasher implements BufferedFnv64 {
@@ -61,8 +61,9 @@ class BufferedHasher implements BufferedFnv64 {
   #length = 0;
   #state = OFFSET_BASIS;
 
-  constructor(hasher: NativeHasher) {
+  constructor(hasher: NativeHasher, initialState: bigint) {
     this.#native = hasher;
+    this.#state = BigInt.asUintN(64, initialState);
   }
 
   #flush(): void {

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

@@ -1,12 +1,18 @@
 import type { TerminalReplicaColor, TerminalReplicaRow } from "@tmux-ide/contracts";
-import { createBufferedFnv64 } from "./terminal-fnv64-wasm.ts";
+import { createBufferedFnv64, type BufferedFnv64 } from "./terminal-fnv64-wasm.ts";
 
 const ROW_HASH_CACHE = new WeakMap<object, string>();
 const DEEPLY_FROZEN_ROWS = new WeakSet<object>();
 const UTF8_ENCODER = new TextEncoder();
 
+interface CanonicalKeyOrder {
+  readonly original: string[];
+  readonly sorted: string[];
+  readonly tokens: readonly (string | null)[] | null;
+}
+
 /**
- * Allocation-free FNV-1a64 writer for the canonical terminal encoding.
+ * Streaming FNV-1a64 writer for the canonical terminal encoding.
  *
  * Keep the two 32-bit limbs: BigInt per byte made a unique 5k-row compact
  * delivery monopolize the OpenTUI event loop for almost a second.
@@ -14,6 +20,58 @@ const UTF8_ENCODER = new TextEncoder();
 class CanonicalFnv64 {
   #high = 0xcbf29ce4;
   #low = 0x84222325;
+  #remainingJsBytes: number;
+  #accelerator: BufferedFnv64 | null = null;
+
+  constructor(accelerateLargeFrame = false) {
+    this.#remainingJsBytes = accelerateLargeFrame ? 64 * 1024 : 0;
+  }
+
+  #considerAcceleration(bytes: number): void {
+    if (this.#remainingJsBytes <= 0) return;
+    this.#remainingJsBytes -= bytes;
+    if (this.#remainingJsBytes <= 0) {
+      // Transfer the exact rolling state once; never restart or reserialize.
+      // Each writer owns its buffer across cooperative yields. Blocked WASM
+      // keeps the original JS path, without repeated initialization attempts.
+      this.#accelerator = createBufferedFnv64((BigInt(this.#high) << 32n) | BigInt(this.#low));
+    }
+  }
+  // Per-hash only: terminal objects repeat a handful of small field layouts.
+  // Reuse sorted keys and short ASCII key tokens without retaining records,
+  // values, or future calls. Tokens share the 16-layout/32-key cache bound.
+  #keyOrders: CanonicalKeyOrder[] | null = null;
+
+  keyOrder(record: Record<string, unknown>): CanonicalKeyOrder {
+    const keys = Object.keys(record);
+    if (keys.length > 32) return { original: keys, sorted: keys.sort(), tokens: null };
+    for (const order of this.#keyOrders ?? []) {
+      if (order.original.length !== keys.length) continue;
+      let matches = true;
+      for (let index = 0; index < keys.length; index++) {
+        if (order.original[index] !== keys[index]) {
+          matches = false;
+          break;
+        }
+      }
+      if (matches) return order;
+    }
+    if ((this.#keyOrders?.length ?? 0) >= 16)
+      return { original: keys, sorted: keys.sort(), tokens: null };
+    const sorted = keys.length < 2 ? keys : keys.slice().sort();
+    const order = {
+      original: keys,
+      sorted,
+      tokens: sorted.map((key) => {
+        if (key.length > 32) return null;
+        for (let index = 0; index < key.length; index++)
+          if (key.charCodeAt(index) > 0x7f) return null;
+        return `s${key.length}:${key};`;
+      }),
+    };
+    (this.#keyOrders ??= []).push(order);
+    return order;
+  }
 
   #byte(value: number): void {
     const low = (this.#low ^ value) >>> 0;
@@ -24,6 +82,8 @@ class CanonicalFnv64 {
   }
 
   ascii(value: string): number {
+    this.#considerAcceleration(value.length);
+    if (this.#accelerator) return this.#accelerator.ascii(value);
     // Canonical color/field tags dominate full-row hashing. Keep the limbs
     // local through each fragment instead of reading/writing fields per byte.
     let high = this.#high;
@@ -40,7 +100,9 @@ class CanonicalFnv64 {
   }
 
   bytes(value: Uint8Array): void {
-    for (const byte of value) this.#byte(byte);
+    this.#considerAcceleration(value.byteLength);
+    if (this.#accelerator) this.#accelerator.bytes(value);
+    else for (const byte of value) this.#byte(byte);
   }
 
   string(value: string): number {
@@ -56,13 +118,13 @@ class CanonicalFnv64 {
     if (ascii) {
       this.ascii(`s${value.length}:`);
       this.ascii(value);
-      this.#byte(0x3b);
+      this.ascii(";");
       return value.length;
     }
     const bytes = UTF8_ENCODER.encode(value);
     this.ascii(`s${bytes.byteLength}:`);
-    for (const byte of bytes) this.#byte(byte);
-    this.#byte(0x3b);
+    this.bytes(bytes);
+    this.ascii(";");
     return bytes.byteLength;
   }
 
@@ -99,22 +161,26 @@ class CanonicalFnv64 {
       return;
     }
     const record = value as Record<string, unknown>;
-    const keys = Object.keys(record).sort();
+    const { sorted: keys, tokens } = this.keyOrder(record);
     this.ascii(`o${keys.length}:`);
-    for (const key of keys) {
-      this.string(key);
+    for (let index = 0; index < keys.length; index++) {
+      const key = keys[index]!;
+      const token = tokens?.[index];
+      if (token !== null && token !== undefined) this.ascii(token);
+      else this.string(key);
       this.value(record[key]);
     }
     this.ascii(";");
   }
 
   digest(): string {
+    if (this.#accelerator) return this.#accelerator.digest();
     return `${this.#high.toString(16).padStart(8, "0")}${this.#low.toString(16).padStart(8, "0")}`;
   }
 }
 
 export function hashCanonicalTerminalValue(value: unknown): string {
-  const hash = new CanonicalFnv64();
+  const hash = new CanonicalFnv64(true);
   hash.value(value);
   return hash.digest();
 }
@@ -124,7 +190,7 @@ export async function hashCanonicalTerminalValueCooperatively(
   yieldControl: () => Promise<void>,
   workPerSlice = 4 * 1_024,
 ): Promise<string> {
-  const hash = new CanonicalFnv64();
+  const hash = new CanonicalFnv64(true);
   let work = 0;
   const checkpoint = (amount: number): boolean => {
     work += amount;
@@ -175,7 +241,7 @@ export async function hashCanonicalTerminalValueCooperatively(
       continue;
     }
     const record = entry as Record<string, unknown>;
-    const keys = Object.keys(record).sort();
+    const keys = hash.keyOrder(record).sorted;
     if (checkpoint(hash.ascii(`o${keys.length}:`) + keys.length)) await yieldControl();
     stack.push({ kind: "ascii", value: ";" });
     for (let index = keys.length - 1; index >= 0; index -= 1) {
@@ -215,6 +281,8 @@ const compactColorKey = (color: TerminalReplicaColor): number =>
 /** Package-private per-decode cache for exact canonical cell byte segments. */
 export class TerminalReplicaRunEncodingCache {
   #canonicalBytes = 0;
+  #cachedCells = 0;
+  #retainedEncodingBytes = 0;
 
   createHash(): CanonicalFnv64 | NonNullable<ReturnType<typeof createBufferedFnv64>> {
     // Small deliveries benefit more from row reuse than from crossing into
@@ -238,17 +306,14 @@ export class TerminalReplicaRunEncodingCache {
     readonly allocatedBytes: number;
     readonly cacheMiss: boolean;
   } {
-    const widths = this.#entries.get(cell.grapheme) ?? new Map();
-    this.#entries.set(cell.grapheme, widths);
     const foregroundKey = compactColorKey(cell.foreground);
-    const foregrounds = widths.get(cell.width) ?? new Map();
-    widths.set(cell.width, foregrounds);
     const backgroundKey = compactColorKey(cell.background);
-    const backgrounds = foregrounds.get(foregroundKey) ?? new Map();
-    foregrounds.set(foregroundKey, backgrounds);
-    const attributes = backgrounds.get(backgroundKey) ?? new Map();
-    backgrounds.set(backgroundKey, attributes);
-    const cached = attributes.get(cell.attributes);
+    const cached = this.#entries
+      .get(cell.grapheme)
+      ?.get(cell.width)
+      ?.get(foregroundKey)
+      ?.get(backgroundKey)
+      ?.get(cell.attributes);
     if (cached) return { prepared: cached, allocatedBytes: 0, cacheMiss: false };
     const graphemeBytes = UTF8_ENCODER.encode(cell.grapheme);
     const numberText = (value: number): string => {
@@ -268,30 +333,63 @@ export class TerminalReplicaRunEncodingCache {
         cell.background,
       )}${numberText(cell.attributes)};`,
     });
-    attributes.set(cell.attributes, prepared);
+    // A transaction may contain arbitrary text and RGB values. Bound both
+    // entry count and retained string/byte payload; uncached cells hash identically.
+    const retainedBytes =
+      graphemeBytes.byteLength +
+      2 * (cell.grapheme.length + prepared.prefix.length + prepared.suffix.length);
+    if (this.#cachedCells < 1_024 && this.#retainedEncodingBytes + retainedBytes <= 64 * 1_024) {
+      const widths = this.#entries.get(cell.grapheme) ?? new Map();
+      this.#entries.set(cell.grapheme, widths);
+      const foregrounds = widths.get(cell.width) ?? new Map();
+      widths.set(cell.width, foregrounds);
+      const backgrounds = foregrounds.get(foregroundKey) ?? new Map();
+      foregrounds.set(foregroundKey, backgrounds);
+      const attributes = backgrounds.get(backgroundKey) ?? new Map();
+      backgrounds.set(backgroundKey, attributes);
+      attributes.set(cell.attributes, prepared);
+      this.#cachedCells++;
+      this.#retainedEncodingBytes += retainedBytes;
+    }
     return { prepared, allocatedBytes: graphemeBytes.byteLength, cacheMiss: true };
   }
 }
 
-export function hashTerminalReplicaRowCached(row: TerminalReplicaRow, onMiss?: () => void): string {
+export function hashTerminalReplicaRowCached(
+  row: TerminalReplicaRow,
+  onMiss?: () => void,
+  encodingCache?: TerminalReplicaRunEncodingCache,
+): string {
   const cached = ROW_HASH_CACHE.get(row);
   if (cached) return cached;
   onMiss?.();
-  const hash = new CanonicalFnv64();
+  const hash = encodingCache?.createHash() ?? new CanonicalFnv64();
+  let canonicalBytes = 10 + String(row.cells.length).length;
   hash.ascii("a2:");
   hash.boolean(row.wrapped);
   hash.ascii(`a${row.cells.length}:`);
   for (const cell of row.cells) {
-    hash.ascii("a5:");
-    hash.string(cell.grapheme);
-    hash.number(cell.width);
-    writeColor(hash, cell.foreground);
-    writeColor(hash, cell.background);
-    hash.number(cell.attributes);
-    hash.ascii(";");
+    if (encodingCache) {
+      const { prepared } = encodingCache.prepare(cell);
+      hash.ascii(prepared.prefix);
+      hash.bytes(prepared.graphemeBytes);
+      hash.ascii(prepared.suffix);
+      canonicalBytes +=
+        prepared.prefix.length + prepared.graphemeBytes.length + prepared.suffix.length;
+    } else {
+      const direct = hash as CanonicalFnv64;
+      direct.ascii("a5:");
+      direct.string(cell.grapheme);
+      direct.number(cell.width);
+      writeColor(direct, cell.foreground);
+      writeColor(direct, cell.background);
+      direct.number(cell.attributes);
+      direct.ascii(";");
+    }
   }
   hash.ascii(";;");
   const digest = hash.digest();
+  encodingCache?.recordCanonicalBytes(canonicalBytes);
   if (isTerminalReplicaRowDeeplyFrozen(row)) {
     DEEPLY_FROZEN_ROWS.add(row);
     ROW_HASH_CACHE.set(row, digest);

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

@@ -0,0 +1,27 @@
+import type { TerminalReplicaRow } from "@tmux-ide/contracts";
+
+// Ownership proves immutable, ordinary data properties, not schema validity.
+// There is no registration API: callers can only obtain ownership by copying.
+const OWNED_ROWS = new WeakSet<TerminalReplicaRow>();
+
+export function isOwnedTerminalReplicaRow(row: unknown): row is TerminalReplicaRow {
+  return typeof row === "object" && row !== null && OWNED_ROWS.has(row as TerminalReplicaRow);
+}
+
+export function freezeOwnedTerminalReplicaRow(row: TerminalReplicaRow): TerminalReplicaRow {
+  if (OWNED_ROWS.has(row)) return row;
+  const frozen = Object.freeze({
+    wrapped: row.wrapped,
+    cells: Object.freeze(
+      Array.from(row.cells, (cell) =>
+        Object.freeze({
+          ...cell,
+          foreground: Object.freeze({ ...cell.foreground }),
+          background: Object.freeze({ ...cell.background }),
+        }),
+      ),
+    ),
+  }) as unknown as TerminalReplicaRow;
+  OWNED_ROWS.add(frozen);
+  return frozen;
+}

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

@@ -10,12 +10,14 @@ import type {
   TerminalReplicaTombstonePayload,
 } from "@tmux-ide/contracts";
 import { consumeCompactReplicaCapability } from "./terminal-compact-capability.ts";
+import { freezeOwnedTerminalReplicaRow as freezeRow } from "./terminal-replica-owned-row.ts";
 import {
   hashCanonicalTerminalValue,
   hashCanonicalTerminalValueCooperatively,
   hashTerminalReplicaRowCached,
   hashTerminalReplicaRowCooperatively,
   isTerminalReplicaRowDeeplyFrozen,
+  TerminalReplicaRunEncodingCache,
 } from "./terminal-replica-hash-cache.ts";
 
 // Only rows validated and copied by this module can bypass a repeated copy.
@@ -835,27 +837,11 @@ function blankRow(cols: number): TerminalReplicaRow {
   }) as unknown as TerminalReplicaRow;
 }
 
-function freezeRow(row: TerminalReplicaRow): TerminalReplicaRow {
-  return Object.freeze({
-    wrapped: row.wrapped,
-    cells: Object.freeze(
-      row.cells.map((cell) =>
-        Object.freeze({
-          ...cell,
-          foreground: Object.freeze({ ...cell.foreground }),
-          background: Object.freeze({ ...cell.background }),
-        }),
-      ),
-    ),
-  }) as unknown as TerminalReplicaRow;
-}
-
 function validateAndFreezeRow(
   row: TerminalReplicaRow,
   profile?: MutableTerminalReplicaApplyProfile,
 ): TerminalReplicaRow {
   if (VALIDATED_PATCH_ROWS.has(row)) return row;
-  const cells = new Array(row.cells.length);
   for (let index = 0; index < row.cells.length; index += 1) {
     const cell = row.cells[index]!;
     if (profile) profile.counts.validatedCells += 1;
@@ -863,17 +849,11 @@ function validateAndFreezeRow(
       throw new TypeError("Malformed terminal replica row");
     if (cell.width === 0 && (index === 0 || row.cells[index - 1]?.width !== 2))
       throw new TypeError("Malformed terminal replica row");
-    cells[index] = Object.freeze({
-      ...cell,
-      foreground: Object.freeze({ ...cell.foreground }),
-      background: Object.freeze({ ...cell.background }),
-    });
-    if (profile) profile.counts.frozenCells += 1;
   }
-  const frozen = Object.freeze({
-    wrapped: row.wrapped,
-    cells: Object.freeze(cells),
-  }) as unknown as TerminalReplicaRow;
+  // Use the same copy owner as seed admission and encoding. Already owned rows
+  // retain identity; external rows still receive an immutable detached copy.
+  const frozen = freezeRow(row);
+  if (profile && frozen !== row) profile.counts.frozenCells += row.cells.length;
   VALIDATED_PATCH_ROWS.add(frozen);
   return frozen;
 }
@@ -1034,11 +1014,13 @@ function hashTerminalReplicaRow(
   row: TerminalReplicaRow,
   profile?: MutableTerminalReplicaApplyProfile,
   instrumentation?: TerminalReplicaApplyOptions["instrumentation"],
+  encodingCache?: TerminalReplicaRunEncodingCache,
 ): string {
   const started = readProfileClock(instrumentation);
   const hash = hashTerminalReplicaRowCached(
     row,
     profile ? () => (profile.counts.rowHashMisses += 1) : undefined,
+    encodingCache,
   );
   addProfileDuration(profile, "rowHash", started, instrumentation);
   return hash;
@@ -1051,12 +1033,13 @@ function hashTerminalReplicaRows(
 ): string {
   const cached = ROW_ARRAY_HASH_CACHE.get(rows);
   if (cached) return cached.hash.toString(16).padStart(16, "0");
+  const encodingCache = rows.length >= 64 ? new TerminalReplicaRunEncodingCache() : undefined;
   let hash = 0n;
   for (const row of rows)
     hash = BigInt.asUintN(
       64,
       hash * ROW_SEQUENCE_BASE +
-        BigInt(`0x${hashTerminalReplicaRow(row, profile, instrumentation)}`),
+        BigInt(`0x${hashTerminalReplicaRow(row, profile, instrumentation, encodingCache)}`),
     );
   if (Object.isFrozen(rows) && rows.every(isTerminalReplicaRowDeeplyFrozen))
     ROW_ARRAY_HASH_CACHE.set(rows, { hash, length: rows.length });
@@ -1099,10 +1082,12 @@ export function registerTerminalReplicaRowsDeltaHash(
     );
     hash = BigInt.asUintN(64, hash - contribution);
   }
+  const encodingCache = append.length >= 64 ? new TerminalReplicaRunEncodingCache() : undefined;
   for (const row of append)
     hash = BigInt.asUintN(
       64,
-      hash * ROW_SEQUENCE_BASE + BigInt(`0x${hashTerminalReplicaRow(row)}`),
+      hash * ROW_SEQUENCE_BASE +
+        BigInt(`0x${hashTerminalReplicaRow(row, undefined, undefined, encodingCache)}`),
     );
   if (Object.isFrozen(next) && next.every(isTerminalReplicaRowDeeplyFrozen))
     ROW_ARRAY_HASH_CACHE.set(next, { hash, length: next.length });