tmux-ide 2.9.0-beta.22 → 2.9.0-beta.26

package/bin/cli.js

@@ -4960,6 +4960,7 @@ var SafeDisplayNameSchemaZ, OwnerPathSchemaZ, WorkspaceSessionCreateArgumentsSch
 var init_fleet_lifecycle = __esm({
   "packages/contracts/src/fleet-lifecycle.ts"() {
     "use strict";
+    init_workspace_catalog_resource();
     init_fleet_catalog();
     init_desktop_workspace_name();
     init_semantic_identity();
@@ -4973,6 +4974,8 @@ var init_fleet_lifecycle = __esm({
     OwnerPathSchemaZ = /* @__PURE__ */ (() => z34.string().min(1).max(4096).refine((value) => !value.includes("\0")))();
     WorkspaceSessionCreateArgumentsSchemaZ = /* @__PURE__ */ (() => z34.object({
       displayName: SafeDisplayNameSchemaZ,
+      /** Opt in to an incarnation-bearing receipt; legacy clients keep their strict result shape. */
+      includeLiveSessionId: z34.boolean().optional(),
       cwd: OwnerPathSchemaZ.optional(),
       expectedDaemonInstanceId: z34.uuid().optional()
     }).strict())();
@@ -4980,6 +4983,8 @@ var init_fleet_lifecycle = __esm({
       operationId: z34.uuid(),
       daemonInstanceId: z34.uuid(),
       outcome: z34.enum(["created", "adopted", "replayed"]),
+      /** Captured atomically by new-session; absent from older daemons and adopted routes. */
+      liveSessionId: WorkspaceCatalogLiveSessionIdSchemaZ.optional(),
       fleetSessionId: FleetSessionIdSchemaZ,
       /** Canonical registered route; displayName is presentation only. */
       workspaceName: DesktopWorkspaceNameSchemaZ,
@@ -11274,7 +11279,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "tmux-ide",
-      version: "2.9.0-beta.22",
+      version: "2.9.0-beta.26",
       description: "A visual, agent-aware IDE for any tmux session, with optional workspace presets",
       type: "module",
       bin: {
@@ -11338,7 +11343,7 @@ var require_package = __commonJS({
         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/application-shell-sidebar-catalog-renderer.test.tsx ./packages/daemon/src/tui/mirror/ui/ui-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-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",
+        "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/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-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",
         "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",
@@ -24855,6 +24860,7 @@ var MAX_REPLAY_OPERATIONS, sleep2, FleetLifecycleAuthorityError, FleetLifecycleA
 var init_fleet_lifecycle_authority = __esm({
   "packages/daemon/src/lib/fleet-lifecycle-authority.ts"() {
     "use strict";
+    init_live_session_identity();
     init_src();
     init_discovery();
     init_fleet_catalog2();
@@ -24934,10 +24940,14 @@ var init_fleet_lifecycle_authority = __esm({
           }
         }
         let created = false;
+        let liveSessionId;
         try {
-          this.#runTmux([
+          const createdId = this.#runTmux([
             "new-session",
             "-d",
+            "-P",
+            "-F",
+            "#{pid}	#{session_id}	#{session_created}",
             ...TMUX_TRUECOLOR_ENVIRONMENT_ARGS,
             "-s",
             identity2.sessionName,
@@ -24947,6 +24957,9 @@ var init_fleet_lifecycle_authority = __esm({
             cwd,
             TMUX_TRUECOLOR_INTERACTIVE_SHELL_COMMAND
           ]);
+          const [serverPid, sessionId, sessionCreated] = createdId.trim().split("	");
+          if (serverPid && /^\d+$/u.test(serverPid) && sessionId && /^\$\d+$/u.test(sessionId) && sessionCreated && /^\d+$/u.test(sessionCreated))
+            liveSessionId = liveSessionIdForNativeIdentity(serverPid, sessionId, sessionCreated);
           created = true;
           prepareTmuxTruecolorEnvironment(this.#runTmux, identity2.sessionName);
           this.#runTmux(["set-environment", "-t", identity2.sessionName, "TMUX_IDE", "1"]);
@@ -24980,6 +24993,7 @@ var init_fleet_lifecycle_authority = __esm({
           operationId,
           daemonInstanceId: this.#daemonInstanceId,
           outcome: "created",
+          ...input.includeLiveSessionId && liveSessionId ? { liveSessionId } : {},
           fleetSessionId: fleetSessionIdForName(identity2.sessionName),
           workspaceName: identity2.workspaceName,
           displayName: input.displayName
@@ -71501,6 +71515,11 @@ function mountTmuxServerRoutes(app, options) {
           workspace.sessionName,
           c.req.raw.signal
         );
+        const currentSessions = await owner.catalog();
+        if (!currentSessions.some(
+          (row) => row.sessionName === workspace.sessionName && row.liveSessionId === c.req.query("liveSessionId")
+        ))
+          throw new TmuxServerScopeError("stale-generation");
         return snapshot2 ? projectApplicationShellResource(snapshot2) : null;
       });
       return resource3 ? c.json({ version: 1, server, resource: resource3 }) : c.json({ error: { code: "workspace-not-found" } }, 404);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-ide",
-  "version": "2.9.0-beta.22",
+  "version": "2.9.0-beta.26",
   "description": "A visual, agent-aware IDE for any tmux session, with optional workspace presets",
   "type": "module",
   "bin": {
@@ -64,7 +64,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/application-shell-sidebar-catalog-renderer.test.tsx ./packages/daemon/src/tui/mirror/ui/ui-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-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",
+    "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/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-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",
     "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",

package/packages/contracts/src/fleet-lifecycle.ts

@@ -1,3 +1,4 @@
+import { WorkspaceCatalogLiveSessionIdSchemaZ } from "./workspace-catalog-resource.ts";
 import { z } from "zod";
 import {
   FleetAgentIdSchemaZ,
@@ -29,6 +30,8 @@ const OwnerPathSchemaZ = z
 export const WorkspaceSessionCreateArgumentsSchemaZ = z
   .object({
     displayName: SafeDisplayNameSchemaZ,
+    /** Opt in to an incarnation-bearing receipt; legacy clients keep their strict result shape. */
+    includeLiveSessionId: z.boolean().optional(),
     cwd: OwnerPathSchemaZ.optional(),
     expectedDaemonInstanceId: z.uuid().optional(),
   })
@@ -42,6 +45,8 @@ export const WorkspaceSessionCreateResultSchemaZ = z
     operationId: z.uuid(),
     daemonInstanceId: z.uuid(),
     outcome: z.enum(["created", "adopted", "replayed"]),
+    /** Captured atomically by new-session; absent from older daemons and adopted routes. */
+    liveSessionId: WorkspaceCatalogLiveSessionIdSchemaZ.optional(),
     fleetSessionId: FleetSessionIdSchemaZ,
     /** Canonical registered route; displayName is presentation only. */
     workspaceName: DesktopWorkspaceNameSchemaZ,

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

@@ -182,6 +182,12 @@ export function mountTmuxServerRoutes(app, options) {
                 row.liveSessionId === c.req.query("liveSessionId")))
                 throw new TmuxServerScopeError("stale-generation");
             const snapshot = await owner.terminalInventoryRuntime.discoverTerminalRuntimeSession(workspace.sessionName, c.req.raw.signal);
+            // Discovery can yield while a same-name session is replaced. Revalidate
+            // the captured incarnation before publishing agent metadata as current.
+            const currentSessions = await owner.catalog();
+            if (!currentSessions.some((row) => row.sessionName === workspace.sessionName &&
+                row.liveSessionId === c.req.query("liveSessionId")))
+                throw new TmuxServerScopeError("stale-generation");
             return snapshot ? projectApplicationShellResource(snapshot) : null;
         });
         return resource

package/packages/daemon/dist/lib/fleet-lifecycle-authority.js

@@ -1,3 +1,4 @@
+import { liveSessionIdForNativeIdentity } from "../terminal/protocol/live-session-identity.js";
 import { createHash, randomUUID } from "node:crypto";
 import { isAbsolute, resolve } from "node:path";
 import { realpath, stat } from "node:fs/promises";
@@ -79,10 +80,14 @@ export class FleetLifecycleAuthority {
             }
         }
         let created = false;
+        let liveSessionId;
         try {
-            this.#runTmux([
+            const createdId = this.#runTmux([
                 "new-session",
                 "-d",
+                "-P",
+                "-F",
+                "#{pid}\t#{session_id}\t#{session_created}",
                 ...TMUX_TRUECOLOR_ENVIRONMENT_ARGS,
                 "-s",
                 identity.sessionName,
@@ -92,6 +97,14 @@ export class FleetLifecycleAuthority {
                 cwd,
                 TMUX_TRUECOLOR_INTERACTIVE_SHELL_COMMAND,
             ]);
+            const [serverPid, sessionId, sessionCreated] = createdId.trim().split("\t");
+            if (serverPid &&
+                /^\d+$/u.test(serverPid) &&
+                sessionId &&
+                /^\$\d+$/u.test(sessionId) &&
+                sessionCreated &&
+                /^\d+$/u.test(sessionCreated))
+                liveSessionId = liveSessionIdForNativeIdentity(serverPid, sessionId, sessionCreated);
             created = true;
             prepareTmuxTruecolorEnvironment(this.#runTmux, identity.sessionName);
             this.#runTmux(["set-environment", "-t", identity.sessionName, "TMUX_IDE", "1"]);
@@ -129,6 +142,7 @@ export class FleetLifecycleAuthority {
             operationId,
             daemonInstanceId: this.#daemonInstanceId,
             outcome: "created",
+            ...(input.includeLiveSessionId && liveSessionId ? { liveSessionId } : {}),
             fleetSessionId: fleetSessionIdForName(identity.sessionName),
             workspaceName: identity.workspaceName,
             displayName: input.displayName,

package/packages/daemon/dist/tui/mirror/runtime/application-guided-tour-integration.jsx

@@ -0,0 +1,119 @@
+/* @jsxImportSource @opentui/solid */
+import { randomUUID } from "node:crypto";
+import { createEffect, createMemo, Show } from "solid-js";
+import { createApplicationGuidedTourOwner } from "./application-guided-tour-owner.js";
+import { GuidedTourCoach } from "./guided-tour-coach.jsx";
+import { createFleetSession } from "./fleet-lifecycle-client.js";
+import { applicationMachineAuthorityManager } from "./application-machine-authority.js";
+export function createApplicationGuidedTourIntegration(options) {
+    const { machines, lifecycle, generation, generationMachineId, layoutSnapshot, sessionName, focusedPane, activeSurface, appearance, paletteOpen, paletteCommands, dimensions, blocked, } = options;
+    const practiceRows = () => machines.catalog
+        .getSnapshot()
+        .groups.filter((group) => group.id === "local" || group.routeIds?.includes("local"))
+        .flatMap((group) => group.sessions)
+        .filter((row) => !row.disabled);
+    const practiceIdentity = (row) => {
+        const daemon = applicationMachineAuthorityManager.getMachine("local")?.read();
+        if (!row.liveSessionId || !daemon)
+            return null;
+        return {
+            machineId: "local",
+            serverId: row.server?.serverId ?? "default",
+            generation: row.server?.generation ?? daemon.instanceId,
+            sessionId: row.liveSessionId,
+            sessionName: row.name,
+        };
+    };
+    const tour = createApplicationGuidedTourOwner({
+        async createPractice() {
+            const handle = applicationMachineAuthorityManager.getMachine("local");
+            if (!handle || handle.endpoint().state !== "ready")
+                throw new Error("Connect this machine before creating a practice session.");
+            const created = await createFleetSession(handle, `tmux-ide-practice-${randomUUID().slice(0, 8)}`, undefined, { includeLiveSessionId: true });
+            if (!created || created.outcome !== "created")
+                throw new Error("Could not create a fresh practice session. Try again.");
+            if (!created.liveSessionId)
+                throw new Error("Update the local tmux-ide daemon to use the guided practice session, then restart the tour.");
+            return await new Promise((resolve, reject) => {
+                let done = false;
+                let stop = () => { };
+                const abort = () => {
+                    clearTimeout(timer);
+                    stop();
+                    reject(new Error("Tour closed."));
+                };
+                const timer = setTimeout(() => {
+                    lifecycle.signal.removeEventListener("abort", abort);
+                    stop();
+                    reject(new Error("Practice session was created but has not appeared yet. Find it in the local session list."));
+                }, 10_000);
+                lifecycle.signal.addEventListener("abort", abort, { once: true });
+                const check = () => {
+                    const rows = practiceRows().filter((row) => row.name === created.workspaceName && row.liveSessionId === created.liveSessionId);
+                    const identity = rows.length === 1 ? practiceIdentity(rows[0]) : null;
+                    if (!identity || identity.generation !== created.daemonInstanceId)
+                        return;
+                    done = true;
+                    lifecycle.signal.removeEventListener("abort", abort);
+                    clearTimeout(timer);
+                    stop();
+                    resolve(identity);
+                };
+                stop = machines.catalog.subscribe(check);
+                if (done)
+                    stop();
+                else if (lifecycle.signal.aborted)
+                    abort();
+                else
+                    check();
+            });
+        },
+        openPractice(practice) {
+            if (practice.machineId !== "local")
+                throw new Error("Practice sessions must belong to this machine. Restart the tour.");
+            const row = practiceRows().find((row) => {
+                const identity = practiceIdentity(row);
+                return (identity &&
+                    identity.serverId === practice.serverId &&
+                    identity.generation === practice.generation &&
+                    identity.sessionId === practice.sessionId);
+            });
+            if (!row)
+                throw new Error("That practice session is unavailable or has been replaced. Replay the tour to create a new one.");
+            machines.sidebar.onOpen("local", row.name, "mouse", row.id);
+        },
+    });
+    const committedTourTheme = createMemo((previous) => appearance.pickerOpen()
+        ? (previous ?? JSON.stringify(appearance.theme().canonical))
+        : JSON.stringify(appearance.theme().canonical));
+    createEffect(() => {
+        const current = generation();
+        const connection = current?.status === "live" ? current.connection : null;
+        const machineId = generationMachineId();
+        const practice = connection?.liveSessionId && current?.daemonGeneration && machineId
+            ? {
+                machineId,
+                serverId: connection.server?.serverId ?? "default",
+                generation: connection.server?.generation ?? current.daemonGeneration,
+                sessionId: connection.liveSessionId,
+                sessionName: sessionName() ?? "",
+            }
+            : null;
+        tour.observe({
+            practice,
+            panes: (layoutSnapshot().current?.panes ?? []).flatMap((pane) => pane.pane ? [{ id: pane.pane, width: pane.width, height: pane.height }] : []),
+            focusedPane: focusedPane(),
+            surface: activeSurface(),
+            paletteOpen: paletteOpen(),
+            theme: committedTourTheme(),
+        });
+    });
+    return {
+        ...tour,
+        Coach: () => (<Show when={tour.state().active && !blocked()}>
+        <box position="absolute" right={1} bottom={2} width={Math.max(1, Math.min(68, dimensions().width - 2))} zIndex={30}>
+          <GuidedTourCoach height={Math.max(4, Math.min(10, dimensions().height - 4))} state={tour.state()} theme={appearance.theme()} width={Math.max(1, Math.min(68, dimensions().width - 2))} shortcuts={{ commands: "F5", home: "F1" }} error={tour.error()} busy={tour.busy()} onPause={tour.pause} onReplay={tour.replay} onWelcomeRead={tour.welcomeRead} onCreatePractice={() => void tour.createPractice()} onOpenCommands={() => paletteCommands.setOpen(true, "mouse")} onOpenAppearance={appearance.openPicker} onOpenHome={() => paletteCommands.openSurface("home", "mouse")} onOpenPractice={() => void tour.openPractice()}/>
+        </box>
+      </Show>),
+    };
+}

package/packages/daemon/dist/tui/mirror/runtime/application-guided-tour-owner.js

@@ -0,0 +1,132 @@
+import { createSignal, onCleanup } from "solid-js";
+import { initialGuidedTourState, reduceGuidedTour, sameGuidedTourPractice, } from "./guided-tour.js";
+import { readGuidedTourState, writeGuidedTourState } from "./guided-tour-storage.js";
+/** Compare confirmed snapshots; unrelated sessions and request attempts never count. */
+export function observedGuidedTourEvent(state, previous, current) {
+    if (!state.active || !previous)
+        return null;
+    if (state.step === "commands" && current.paletteOpen && !previous.paletteOpen)
+        return { type: "commands-opened" };
+    if (state.step === "theme" && current.theme !== previous.theme)
+        return { type: "theme-changed" };
+    if (state.step === "leave" && current.surface === "home")
+        return { type: "home-opened" };
+    if (!current.practice ||
+        !sameGuidedTourPractice(state.practice, current.practice) ||
+        current.surface !== "terminals")
+        return null;
+    if (state.step === "reopen" &&
+        (previous.surface !== "terminals" ||
+            !sameGuidedTourPractice(previous.practice, current.practice)))
+        return { type: "reopened", practice: current.practice };
+    if (!previous.practice || !sameGuidedTourPractice(previous.practice, current.practice))
+        return null;
+    if (state.step === "split" &&
+        previous.panes.length > 0 &&
+        current.panes.length > previous.panes.length &&
+        previous.panes.every((old) => current.panes.some((p) => p.id === old.id)) &&
+        current.panes.some((p) => !previous.panes.some((old) => old.id === p.id)))
+        return { type: "split-confirmed", practice: current.practice };
+    if (state.step === "focus" &&
+        previous.focusedPane &&
+        current.focusedPane &&
+        previous.focusedPane !== current.focusedPane &&
+        current.panes.some((p) => p.id === current.focusedPane) &&
+        current.panes.some((p) => p.id === previous.focusedPane))
+        return { type: "focus-confirmed", practice: current.practice };
+    // A divider reallocates space between the same panes: one grows while
+    // another shrinks on the same axis. Whole-app growth/shrink is not practice.
+    const samePanes = current.panes.length >= 2 &&
+        current.panes.length === previous.panes.length &&
+        previous.panes.every((old) => current.panes.some((pane) => pane.id === old.id));
+    const reallocated = ["width", "height"].some((axis) => {
+        const changes = current.panes.map((pane) => pane[axis] - (previous.panes.find((old) => old.id === pane.id)?.[axis] ?? pane[axis]));
+        return changes.some((change) => change > 0) && changes.some((change) => change < 0);
+    });
+    if (state.step === "resize" && samePanes && reallocated)
+        return { type: "resize-confirmed", practice: current.practice };
+    return null;
+}
+export function createApplicationGuidedTourOwner(options) {
+    const [state, setState] = createSignal((options.read ?? readGuidedTourState)());
+    const [busy, setBusy] = createSignal(false);
+    const [error, setError] = createSignal(null);
+    let previous = null;
+    let disposed = false;
+    onCleanup(() => {
+        disposed = true;
+    });
+    const send = (event) => {
+        const next = reduceGuidedTour(state(), event);
+        if (next === state())
+            return;
+        setState(next);
+        if (!(options.write ?? writeGuidedTourState)(next))
+            setError("Progress could not be saved. You can still continue this tour.");
+    };
+    return {
+        state,
+        busy,
+        error,
+        label: () => state().step === "complete"
+            ? "Replay walkthrough"
+            : state().step === initialGuidedTourState().step
+                ? "Learn tmux-ide"
+                : "Resume walkthrough",
+        open() {
+            previous = null;
+            send({ type: state().step === "complete" ? "replay" : "resume" });
+        },
+        replay() {
+            previous = null;
+            send({ type: "replay" });
+        },
+        pause() {
+            send({ type: "pause" });
+        },
+        welcomeRead() {
+            send({ type: "welcome-read" });
+        },
+        observe(current) {
+            const event = observedGuidedTourEvent(state(), previous, current);
+            previous = current;
+            if (event)
+                send(event);
+        },
+        async createPractice() {
+            if (busy() || state().step !== "practice")
+                return;
+            setBusy(true);
+            setError(null);
+            try {
+                const practice = await options.createPractice();
+                if (disposed)
+                    return;
+                send({ type: "practice-created", practice });
+                if (state().active)
+                    await options.openPractice(practice);
+            }
+            catch (cause) {
+                if (!disposed)
+                    setError(cause instanceof Error ? cause.message : "Could not create the practice session.");
+            }
+            finally {
+                if (!disposed)
+                    setBusy(false);
+            }
+        },
+        async openPractice() {
+            const practice = state().practice;
+            if (!practice || busy())
+                return;
+            setError(null);
+            try {
+                if (state().active)
+                    await options.openPractice(practice);
+            }
+            catch (cause) {
+                setError(cause instanceof Error ? cause.message : "Practice session is unavailable.");
+            }
+        },
+    };
+}

package/packages/daemon/dist/tui/mirror/runtime/application-home-agent-roster.jsx

@@ -23,7 +23,8 @@ export function HomeAgentRoster(props) {
     const [hovered, setHovered] = createSignal(null);
     const width = () => Math.max(0, Math.floor(props.width));
     const height = () => Math.max(0, Math.floor(props.height));
-    const stale = (row) => (props.snapshot.refreshingSessionKeys ?? []).includes(row.sessionKey) ||
+    const stale = (row) => row.disabled ||
+        (props.snapshot.refreshingSessionKeys ?? []).includes(row.sessionKey) ||
         (props.snapshot.unavailableSessionKeys ?? []).includes(row.sessionKey);
     const showRecovery = () => Boolean(((props.snapshot.phase === "unavailable" || props.snapshot.unavailableSessions > 0) &&
         props.onRetry) ||
@@ -50,8 +51,8 @@ export function HomeAgentRoster(props) {
         if (props.snapshot.phase === "live" && props.snapshot.rows.length === 0)
             return "No agents reported";
         const count = props.snapshot.rows.length;
-        const attention = props.snapshot.rows.filter((row) => row.attention || row.activity === "waiting" || row.activity === "failed").length;
-        const working = props.snapshot.rows.filter((row) => row.activity === "running").length;
+        const attention = props.snapshot.rows.filter((row) => !stale(row) && (row.attention || row.activity === "waiting" || row.activity === "failed")).length;
+        const working = props.snapshot.rows.filter((row) => !stale(row) && row.activity === "running").length;
         return `${count} observed ${count === 1 ? "agent" : "agents"} · ${attention} ${attention === 1 ? "needs" : "need"} attention · ${working} working`;
     };
     const coverage = () => `Scope: ${props.snapshot.observedSessions} of ${props.snapshot.totalSessions} sessions observed${props.snapshot.phase === "partial" ? " · partial" : ""}${props.snapshot.loadingSessions ? ` · ${props.snapshot.loadingSessions} loading` : ""}${props.snapshot.unavailableSessions ? ` · ${props.snapshot.unavailableSessions} unavailable` : ""}${props.snapshot.truncatedSessions ? ` · ${props.snapshot.truncatedSessions} not loaded` : ""}`;
@@ -69,15 +70,22 @@ export function HomeAgentRoster(props) {
             return "Enlarge the terminal to view agents.";
         const selected = props.snapshot.rows.find((row) => row.key === props.selection.selectedKey);
         if (selected && stale(selected))
-            return `${selected.sessionName} · last observed; waiting for fresh signals`;
-        if (width() < 44 && selected)
-            return `${selected.sessionName} · Enter open`;
+            return `${[selected.machineLabel, selected.serverLabel, selected.sessionName].filter(Boolean).join(" / ")} · last observed; waiting for fresh signals`;
+        if (selected?.machineLabel || (width() < 44 && selected))
+            return `${[selected?.machineLabel, selected?.serverLabel, selected?.sessionName].filter(Boolean).join(" / ")} · Enter open`;
         return `${offset() + 1}–${Math.min(props.snapshot.rows.length, offset() + visibleCount())} of ${props.snapshot.rows.length} · ↑↓ select · Enter open`;
     };
     useKeyboardRoute((event) => {
         if (!props.inputActive || event.eventType !== "press" || event.ctrl || event.meta)
             return false;
         const key = event.name.toLowerCase();
+        const filter = key === "f" ? props.onCycleMachine : key === "a" ? props.onToggleAttention : undefined;
+        if (filter) {
+            event.preventDefault();
+            event.stopPropagation();
+            filter();
+            return true;
+        }
         const retry = key === "r" &&
             (props.snapshot.phase === "unavailable" || props.snapshot.unavailableSessions > 0) &&
             props.onRetry;
@@ -120,10 +128,12 @@ export function HomeAgentRoster(props) {
       <text width={width()} height={1} flexShrink={0} fg={props.theme.roles.text.muted}>
         {clipTerminal(coverage(), width())}
       </text>
-      <box height={1} flexShrink={0}/>
+      <text width={width()} height={1} flexShrink={0} fg={props.theme.roles.text.secondary}>
+        {clipTerminal(props.filterLabel ? `${props.filterLabel} · f machine · a attention` : "", width())}
+      </text>
       <Show when={props.snapshot.rows.length > 0} fallback={<box height={Math.max(0, visibleCount() + 1)} flexShrink={0}/>}>
         <text width={width()} height={1} flexShrink={0} fg={props.theme.roles.text.muted}>
-          {clipTerminal(`  ${padCells("AGENT", columns().agent)}${padCells("SESSION", columns().session)} ${padCells("STATUS", columns().status)}`, width())}
+          {clipTerminal(`  ${padCells("AGENT", columns().agent)}${padCells(props.filterLabel ? "MACHINE / SERVER / SESSION" : "SESSION", columns().session)} ${padCells("STATUS", columns().status)}`, width())}
         </text>
         <box height={visibleCount()} width={width()} flexShrink={0} flexDirection="column" overflow="hidden">
           <For each={keys()}>
@@ -131,7 +141,9 @@ export function HomeAgentRoster(props) {
             const row = () => byKey().get(key);
             return (<box height={1} width={width()} flexShrink={0} onMouseOver={() => setHovered(key)} onMouseMove={() => setHovered(key)}>
                   <NavigationRow theme={props.theme} id={`home-agent:${key}`} width={width()} label={padCells(row().name, columns().agent) +
-                    padCells(row().sessionName, columns().session)} detail={padCells(`${row().attention ? "! " : ""}${homeAgentStatusLabel(row().activity)}${stale(row()) ? "*" : ""}`, columns().status)} detailAlign="end" marker={props.selection.selectedKey === key ? "›" : " "} selected={props.selection.selectedKey === key} focused={props.inputActive && props.selection.selectedKey === key} hovered={hovered() === key} attention={row().attention} status={statusTone(row())} disabled={row().paneId === null || stale(row())} onActivate={(source) => {
+                    padCells([row().machineLabel, row().serverLabel, row().sessionName]
+                        .filter(Boolean)
+                        .join(" / "), columns().session)} detail={padCells(`${!stale(row()) && row().attention ? "! " : ""}${stale(row()) ? "last seen" : homeAgentStatusLabel(row().activity)}`, columns().status)} detailAlign="end" marker={props.selection.selectedKey === key ? "›" : " "} selected={props.selection.selectedKey === key} focused={props.inputActive && props.selection.selectedKey === key} hovered={hovered() === key} attention={!stale(row()) && row().attention} status={stale(row()) ? "unknown" : statusTone(row())} disabled={row().paneId === null || stale(row())} onActivate={(source) => {
                     if (!props.inputActive || row().paneId === null || stale(row()))
                         return;
                     props.onSelect(key);