tmux-ide 2.9.3 → 2.9.5

package/packages/daemon/src/lib/tmux-server-owner.ts

@@ -19,7 +19,8 @@ import { createNativeTmuxSessionCreator } from "./tmux-server-session-create.ts"
 import type { WorkspacePaneCreateMutationRequest } from "@tmux-ide/contracts";
 import { createTmuxSessionMutationFence } from "./tmux-session-mutation-fence.ts";
 import { createNativeTmuxSessionOpener } from "./tmux-server-session-open.ts";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
+import { WorkspaceIdSchemaZ } from "@tmux-ide/contracts";
 import { mkdirSync } from "node:fs";
 import { z } from "zod";
 import type { WorkspaceMultiplexerBackend } from "../command-center/actions/handlers/workspace-multiplexer.ts";
@@ -61,6 +62,22 @@ export interface NativeTmuxServerOwnerOptions {
   readonly nativeServerIdentity?: NativeTmuxServerIdentity;
 }
 
+/** Native display names are not necessarily valid shared-contract record identities. */
+function discoveredWorkspaceName(registry: WorkspaceRegistry, sessionName: string): string {
+  if (WorkspaceIdSchemaZ.safeParse(sessionName).success && !registry.has(sessionName))
+    return sessionName;
+  // Existing intent wins even if it occupies a derived ID. Each candidate is
+  // deterministic; repeated refreshes retain the already-adopted session alias.
+  for (let suffix = 0; suffix <= registry.list().length; suffix += 1) {
+    const digest = createHash("sha256")
+      .update(`tmux-ide.discovered-workspace.v1\0${sessionName}\0${suffix}`)
+      .digest("hex");
+    const name = `session-${digest}`;
+    if (!registry.has(name)) return name;
+  }
+  throw new Error("Unable to allocate discovered workspace identity");
+}
+
 /** Refresh discovered live membership without changing durable workspace intent or aliases. */
 export function createNativeTmuxServerCatalog(
   workspaceRegistry: WorkspaceRegistry,
@@ -114,11 +131,10 @@ export function createNativeTmuxServerCatalog(
         workspaceRegistry.remove(workspace.name);
     for (const { summary, dir } of rows.values())
       if (
-        !workspaceRegistry.has(summary.sessionName) &&
         !workspaceRegistry.list().some((workspace) => workspace.sessionName === summary.sessionName)
       )
         workspaceRegistry.add({
-          name: summary.sessionName,
+          name: discoveredWorkspaceName(workspaceRegistry, summary.sessionName),
           sessionName: summary.sessionName,
           projectDir: dir,
           persistence: "volatile",

package/packages/daemon/src/terminal/attachments/native-runtime.ts

@@ -620,6 +620,7 @@ function analyzeInventoryPanes(panes: readonly NativeTerminalInventoryPaneSnapsh
         active: _active,
         role: _role,
         name: _name,
+        nameSource: _nameSource,
         type: _type,
         missionStamp: _missionStamp,
         dir: _dir,
@@ -989,6 +990,7 @@ export async function discoverWorkspaceRegistryTerminalInventory(
         active: _active,
         role: _role,
         name: _name,
+        nameSource: _nameSource,
         type: _type,
         missionStamp: _missionStamp,
         dir: _dir,
@@ -1018,6 +1020,7 @@ export async function discoverWorkspaceRegistrySemanticPanes(
       active: _active,
       role: _role,
       name: _name,
+      nameSource: _nameSource,
       type: _type,
       missionStamp: _missionStamp,
       dir: _dir,
@@ -1349,6 +1352,7 @@ export class WorkspaceTerminalInventoryRuntime {
               active: _active,
               role: _role,
               name: _name,
+              nameSource: _nameSource,
               type: _type,
               missionStamp: _missionStamp,
               dir: _dir,
@@ -2066,6 +2070,7 @@ export class NativeTerminalAttachmentRuntime {
               active: _active,
               role: _role,
               name: _name,
+              nameSource: _nameSource,
               type: _type,
               missionStamp: _missionStamp,
               dir: _dir,
@@ -2341,6 +2346,7 @@ export class NativeTerminalAttachmentRuntime {
           active: _active,
           role: _role,
           name: _name,
+          nameSource: _nameSource,
           type: _type,
           missionStamp: _missionStamp,
           dir: _dir,