tmux-ide 2.9.0-beta.48 → 2.9.0-beta.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-ide",
-  "version": "2.9.0-beta.48",
+  "version": "2.9.0-beta.49",
   "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/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",
+    "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-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/cohesion-fixture.ts

@@ -1,3 +1,4 @@
+import { PaneTeamMembershipSchemaZ } from "./pane-team.ts";
 import { z } from "zod";
 import { CommandIdSchemaZ } from "./commands.ts";
 import {
@@ -42,6 +43,7 @@ const SessionSidebarItemSchemaZ = z
 
 const AgentSidebarItemSchemaZ = z
   .object({
+    team: PaneTeamMembershipSchemaZ.optional(),
     id: SemanticProductIdSchemaZ,
     name: LabelSchemaZ,
     harness: z.enum(["codex", "claude-code", "custom"]),

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

@@ -1,3 +1,4 @@
+import { PaneTeamMembershipSchemaZ } from "./pane-team.ts";
 import {
   InteractionPaneEndpointSchemaZ,
   NativePaneIdentitySchemaZ,
@@ -121,6 +122,7 @@ export type FleetAgentHarness = z.infer<typeof FleetAgentHarnessSchemaZ>;
 export const FleetCatalogAgentEntryV1SchemaZ = z
   .object({
     agentId: FleetAgentIdSchemaZ,
+    team: PaneTeamMembershipSchemaZ.optional(),
     name: FleetLabelSchemaZ,
     harness: FleetAgentHarnessSchemaZ,
     activity: AgentActivitySchemaZ,

package/packages/contracts/src/index.ts

@@ -106,3 +106,5 @@ export * from "./tmux-server-interaction-events.ts";
 export * from "./automation-operations.ts";
 export * from "./native-interaction-journal.ts";
 export * from "./native-operation-identity.ts";
+
+export * from "./pane-team.ts";

package/packages/contracts/src/pane-team.ts

@@ -0,0 +1,32 @@
+import { z } from "zod";
+
+/** Presentation membership; never grants control of a pane or a harness team. */
+export const PaneTeamMembershipSchemaZ = z
+  .object({
+    id: z.string().regex(/^team\.[a-zA-Z0-9_-]{16,64}$/u),
+    name: z
+      .string()
+      .min(1)
+      .max(80)
+      .refine(
+        (value) =>
+          value === value.trim() &&
+          Array.from(value).every((character) => {
+            const code = character.codePointAt(0)!;
+            return code > 31 && (code < 127 || code > 159);
+          }),
+      ),
+    source: z.enum(["manual", "claude-code"]),
+  })
+  .strict();
+export type PaneTeamMembership = z.infer<typeof PaneTeamMembershipSchemaZ>;
+
+/** Scope imported identities to their machine and live server, not session/layout. */
+export function paneTeamGroupKey(
+  team: PaneTeamMembership,
+  machineId: string,
+  serverId: string,
+  generation: string,
+): string {
+  return JSON.stringify([machineId, serverId, generation, team.source, team.id]);
+}

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

@@ -1,3 +1,4 @@
+import { readManualPaneTeam } from "../terminal/attachments/manual-pane-team.js";
 import { decodeTmuxArgument } from "../terminal/protocol/session-descriptor-discovery.js";
 import { nativePaneIdentity } from "../lib/native-pane-identity.js";
 import { liveSessionIdForNativeIdentity } from "../terminal/protocol/live-session-identity.js";
@@ -201,6 +202,7 @@ const FLEET_PANE_FORMAT = [
     "#{qa:pane_title}",
     "#{qa:@ide_name}",
     "#{qa:@tmux_ide_name_source}",
+    "#{@tmux_ide_team}",
     FLEET_LINE_SENTINEL,
 ].join(FLEET_FIELD_SEPARATOR);
 function emptyToNull(value) {
@@ -239,7 +241,7 @@ export function readAdoptedFleet(registry = getDefaultWorkspaceRegistry(), runTm
         const fields = line.split(FLEET_FIELD_SEPARATOR);
         // session, pane, semantic pane, incarnation pid, active, command, path, state,
         // statusText, displayName, hint, birth ID, quoted title/name/source, sentinel
-        if (fields.length !== 16 || fields[15] !== FLEET_LINE_SENTINEL)
+        if (![16, 17].includes(fields.length) || fields.at(-1) !== FLEET_LINE_SENTINEL)
             continue;
         const sessionName = fields[0];
         if (!adoptedSet.has(sessionName))
@@ -256,6 +258,7 @@ export function readAdoptedFleet(registry = getDefaultWorkspaceRegistry(), runTm
             panesBySession.set(sessionName, panes);
         }
         panes.push({
+            team: fields.length === 17 ? readManualPaneTeam(fields[15], incarnation) : undefined,
             nameSource: emptyToNull(decodeTmuxArgument(fields[14])),
             title: decodeTmuxArgument(fields[12]),
             name: emptyToNull(decodeTmuxArgument(fields[13])),

package/packages/daemon/dist/command-center/resources/application-shell.js

@@ -254,7 +254,7 @@ export function resolvedAgentLabel(pane, presentation, index) {
 }
 const AGENT_STATE_STAMP = /^(?:working|blocked|done|idle):\d+$/u;
 export function isAgentPane(pane) {
-    if (pane.teamMemberName)
+    if (pane.teamMemberName || pane.team)
         return true;
     // A well-formed @agent_state stamp IS the agent contract: any pane that
     // self-reports is an agent pane, even when its command is a bare shell and
@@ -416,6 +416,7 @@ function projectApplicationShellResourceV1Core(session, paneIds, nowSec) {
                 // labels such as `Terminal` with the canonical harness name.
                 name: resolvedAgentLabel(pane, presentation, index),
                 harness: harnessForPane(pane),
+                ...(pane.team ? { team: pane.team } : {}),
                 activity: presentation.activity,
                 paneId,
                 attention: presentation.attention,

package/packages/daemon/dist/command-center/resources/fleet-catalog.js

@@ -106,6 +106,7 @@ function toPresentationPane(pane, index) {
         agentStatusTextRaw: pane.agentStatusTextRaw,
         agentDisplayNameRaw: pane.agentDisplayNameRaw,
         teamMemberName: pane.teamMemberName,
+        team: pane.team,
         // Authority-only: the fleet never scrapes an unopened session. `null` (not
         // `undefined`) keeps `resolveAgentPresentation` on the ground-truth path
         // while its scrape verdict resolves to `unknown` without any capture.
@@ -126,6 +127,7 @@ function projectSession(session, nowSec, remainingAgentBudget) {
             agentId: fleetAgentIdForPane(session.name, pane),
             name: fleetLabel(resolvedAgentLabel(presentationPane, presentation, index), `Agent ${index + 1}`),
             harness: harnessForPane(presentationPane),
+            ...(pane.team ? { team: pane.team } : {}),
             activity: presentation.activity,
             attention: presentation.attention,
             statusSource: presentation.statusSource,

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

@@ -7,7 +7,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     return path;
 };
 import { join } from "node:path";
-import { createClaudeTeamNameReader } from "../terminal/attachments/claude-team-names.js";
+import { createClaudeTeamMembershipReader } from "../terminal/attachments/claude-team-names.js";
 import { PaneSourceDiscovery } from "./pane-source-discovery.js";
 import { createBackgroundNativeCapture } from "./background-native-capture.js";
 import { createOwnedViewerAdapterFactory } from "./owned-viewer-factory.js";
@@ -709,7 +709,7 @@ async function startEmbeddedDaemonGeneration(opts) {
         // observe one daemon-generation authority rather than whichever server a
         // caller's ambient TMUX/PATH happens to select.
         const tmuxAuthority = resolveWorkspacePaneTmuxAuthority();
-        const readTeamNames = createClaudeTeamNameReader(join(resolveRuntimeNamespace().claudeDir, "teams"));
+        const readTeamMemberships = createClaudeTeamMembershipReader(join(resolveRuntimeNamespace().claudeDir, "teams"));
         const catalogTmuxRunner = createPinnedWorkspaceTmuxRunner(tmuxAuthority);
         const initialTmuxProof = captureTmuxServerProof(catalogTmuxRunner);
         const initialNativeIdentityParts = initialTmuxProof
@@ -1148,7 +1148,7 @@ async function startEmbeddedDaemonGeneration(opts) {
                 },
                 agentStatusProbeFactory: ({ run }) => createTmuxAgentStatusProbe({
                     run,
-                    readTeamNames,
+                    readTeamMemberships,
                     captureNative: (pane, signal) => backgroundCapture?.({
                         paneId: pane.runtimePaneId,
                         nativeIdentity: pane.nativeIdentity ?? null,
@@ -1393,7 +1393,7 @@ async function startEmbeddedDaemonGeneration(opts) {
                         : null, () => observationSelector?.nativeServerEpoch ?? null);
                     if (!fleet)
                         return null;
-                    const names = await readTeamNames(fleet.flatMap((session) => session.panes.map((pane) => ({
+                    const names = await readTeamMemberships(fleet.flatMap((session) => session.panes.map((pane) => ({
                         runtimePaneId: pane.runtimePaneId,
                         pid: pane.incarnation,
                     }))));
@@ -1401,7 +1401,9 @@ async function startEmbeddedDaemonGeneration(opts) {
                         ...session,
                         panes: session.panes.map((pane) => {
                             const name = names.get(pane.runtimePaneId);
-                            return name ? { ...pane, teamMemberName: name } : pane;
+                            return name
+                                ? { ...pane, teamMemberName: name.name, team: pane.team ?? name.team }
+                                : pane;
                         }),
                     }));
                 },

package/packages/daemon/dist/pane-team.js

@@ -0,0 +1,28 @@
+import { execFileSync } from "node:child_process";
+import { isAbsolute } from "node:path";
+import { runtimeTmuxArgs } from "./lib/runtime-namespace.js";
+import { manualPaneTeamStamp, PANE_TEAM_OPTION } from "./terminal/attachments/manual-pane-team.js";
+/** Explicit membership only. Never launches, stops, or messages an agent. */
+export function assignPaneTeam(options, run = (args) => execFileSync("tmux", args, { encoding: "utf8", timeout: 5000 })) {
+    if (!/^%\d+$/u.test(options.paneId))
+        throw new Error("Use an exact pane ID such as %3");
+    if (options.socketPath && options.socketName)
+        throw new Error("Choose one tmux socket selector");
+    if (options.socketPath && !isAbsolute(options.socketPath))
+        throw new Error("Socket path must be absolute");
+    if (options.socketName && !/^[a-zA-Z0-9_.-]+$/u.test(options.socketName))
+        throw new Error("Invalid socket name");
+    const args = (command) => options.socketPath
+        ? ["-S", options.socketPath, ...command]
+        : options.socketName
+            ? ["-L", options.socketName, ...command]
+            : runtimeTmuxArgs(command);
+    const pid = Number(run(args(["display-message", "-p", "-t", options.paneId, "#{pane_pid}"])).trim());
+    if (!Number.isSafeInteger(pid) || pid < 1)
+        throw new Error("Pane is no longer available");
+    const stamp = options.name === null ? null : manualPaneTeamStamp(options.name, pid);
+    run(args(stamp === null
+        ? ["set-option", "-p", "-u", "-t", options.paneId, PANE_TEAM_OPTION]
+        : ["set-option", "-p", "-t", options.paneId, PANE_TEAM_OPTION, stamp]));
+    return { paneId: options.paneId, team: options.name, source: stamp === null ? null : "manual" };
+}

package/packages/daemon/dist/terminal/attachments/agent-status-probe.js

@@ -1,3 +1,4 @@
+import { readManualPaneTeam } from "./manual-pane-team.js";
 /**
  * Agent-status probe for the application-shell inventory — the IO half of the
  * desktop projection's ground-truth agent detection.
@@ -40,6 +41,7 @@ const AGENT_OPTIONS_FORMAT = [
     "#{@agent_display_name}",
     "#{@agent_hint}",
     "#{pane_pid}",
+    "#{@tmux_ide_team}",
     AGENT_LINE_SENTINEL,
 ].join(AGENT_FIELD_SEPARATOR);
 /** Trailing non-empty lines captured for the scrape fallback. */
@@ -69,7 +71,7 @@ function parseAgentOptions(stdout) {
             continue;
         const fields = line.split(AGENT_FIELD_SEPARATOR);
         // paneId, state, statusText, displayName, hint, pid, sentinel
-        if (fields.length !== 7 || fields[6] !== AGENT_LINE_SENTINEL)
+        if (![7, 8].includes(fields.length) || fields.at(-1) !== AGENT_LINE_SENTINEL)
             continue;
         const runtimePaneId = fields[0];
         if (!RUNTIME_PANE_ID.test(runtimePaneId))
@@ -77,6 +79,7 @@ function parseAgentOptions(stdout) {
         const pidText = fields[5];
         const pid = /^[0-9]+$/u.test(pidText) ? Number(pidText) : null;
         result.set(runtimePaneId, {
+            team: fields.length === 8 ? readManualPaneTeam(fields[6], pid) : undefined,
             stateRaw: emptyToNull(fields[1]),
             statusTextRaw: emptyToNull(fields[2]),
             displayNameRaw: emptyToNull(fields[3]),
@@ -166,6 +169,7 @@ export function createTmuxAgentStatusProbe(deps) {
         const candidates = [];
         const emit = (pane, raw, scrape, agentKind) => {
             facts.set(pane.runtimePaneId, {
+                ...(raw?.team ? { team: raw.team } : {}),
                 agentKind,
                 agentStateRaw: raw?.stateRaw ?? null,
                 agentStatusTextRaw: raw?.statusTextRaw ?? null,
@@ -280,6 +284,22 @@ export function createTmuxAgentStatusProbe(deps) {
             });
             emit(pane, raw, verdict, manifest.id);
         }
+        if (deps.readTeamMemberships) {
+            const memberships = await deps.readTeamMemberships(input.panes.flatMap((pane) => {
+                const pid = options.get(pane.runtimePaneId)?.pid;
+                return pid ? [{ runtimePaneId: pane.runtimePaneId, pid }] : [];
+            }));
+            throwIfAborted(signal);
+            for (const [paneId, member] of memberships) {
+                const fact = facts.get(paneId);
+                if (fact)
+                    facts.set(paneId, {
+                        ...fact,
+                        teamMemberName: member.name,
+                        team: fact.team ?? member.team,
+                    });
+            }
+        }
         if (deps.readTeamNames) {
             const names = await deps.readTeamNames(input.panes.flatMap((pane) => {
                 const pid = options.get(pane.runtimePaneId)?.pid;

package/packages/daemon/dist/terminal/attachments/claude-team-names.js

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 /** Read-only compatibility adapter for Claude Code's runtime team metadata.
  * Names are presentation evidence, never agent identity or permission authority.
  */
@@ -53,12 +54,15 @@ function matchesProcess(command, member) {
     }
     return true;
 }
-export function resolveClaudeTeamName(pane, members, processes) {
+export function resolveClaudeTeamMember(pane, members, processes) {
     // A native pane id alone cannot bind a team: different servers reuse %N.
     // Its live shell PID scopes the match to this host and this pane's subtree.
     const subtree = subtreeEntries(processes, pane.pid);
     const matches = members.filter((m) => m.paneId === pane.runtimePaneId && subtree.some((p) => matchesProcess(p.command, m)));
-    return matches.length === 1 ? matches[0].name : null;
+    return matches.length === 1 ? matches[0] : null;
+}
+export function resolveClaudeTeamName(pane, members, processes) {
+    return resolveClaudeTeamMember(pane, members, processes)?.name ?? null;
 }
 async function readMembers(directory) {
     try {
@@ -94,7 +98,7 @@ async function readMembers(directory) {
         return [];
     }
 }
-export function createClaudeTeamNameReader(directory, deps = {}) {
+export function createClaudeTeamMembershipReader(directory, deps = {}) {
     const now = deps.now ?? Date.now;
     let snapshot = null;
     let pending = null;
@@ -121,10 +125,22 @@ export function createClaudeTeamNameReader(directory, deps = {}) {
         const current = snapshot;
         const names = new Map();
         for (const pane of panes) {
-            const name = resolveClaudeTeamName(pane, current.members, current.processes);
-            if (name)
-                names.set(pane.runtimePaneId, name);
+            const member = resolveClaudeTeamMember(pane, current.members, current.processes);
+            if (member)
+                names.set(pane.runtimePaneId, {
+                    name: member.name,
+                    team: {
+                        id: `team.${createHash("sha256").update(member.team).digest("hex").slice(0, 32)}`,
+                        name: member.team.slice(0, 80),
+                        source: "claude-code",
+                    },
+                });
         }
         return names;
     };
 }
+/** Compatibility API for callers interested only in the shared display name. */
+export function createClaudeTeamNameReader(directory, deps = {}) {
+    const read = createClaudeTeamMembershipReader(directory, deps);
+    return async (panes) => new Map([...(await read(panes))].map(([id, value]) => [id, value.name]));
+}

package/packages/daemon/dist/terminal/attachments/manual-pane-team.js

@@ -0,0 +1,30 @@
+import { createHash } from "node:crypto";
+import { PaneTeamMembershipSchemaZ } from "@tmux-ide/contracts";
+export const PANE_TEAM_OPTION = "@tmux_ide_team";
+/** Pane-local metadata survives layout moves, but never a replacement process. */
+export function manualPaneTeamStamp(name, pid) {
+    if (!Number.isSafeInteger(pid) || pid < 1)
+        throw new Error("Invalid pane process");
+    const team = PaneTeamMembershipSchemaZ.parse({
+        id: `team.${createHash("sha256").update(name).digest("hex").slice(0, 32)}`,
+        name,
+        source: "manual",
+    });
+    return `v1.${Buffer.from(JSON.stringify({ version: 1, pid, team })).toString("base64url")}`;
+}
+export function readManualPaneTeam(raw, pid) {
+    if (!raw || raw.length > 2048 || !pid)
+        return undefined;
+    try {
+        if (!/^v1\.[A-Za-z0-9_-]+$/u.test(raw))
+            return undefined;
+        const value = JSON.parse(Buffer.from(raw.slice(3), "base64url").toString("utf8"));
+        if (value.version !== 1 || value.pid !== pid)
+            return undefined;
+        const parsed = PaneTeamMembershipSchemaZ.safeParse(value.team);
+        return parsed.success && parsed.data.source === "manual" ? parsed.data : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}

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

@@ -189,7 +189,7 @@ export function HomeAgentRoster(props) {
             {(key) => {
             const row = () => byKey().get(key);
             return (<box height={rowHeight()} width={width()} flexShrink={0} onMouseOver={() => setHovered(key)} onMouseMove={() => setHovered(key)}>
-                  <AgentRow surface="canvas" theme={props.theme} id={`home-agent:${key}`} name={row().name} context={[row().machineLabel, row().serverLabel, row().sessionName]
+                  <AgentRow surface="canvas" theme={props.theme} id={`home-agent:${key}`} name={row().name} team={row().team} context={[row().machineLabel, row().serverLabel, row().sessionName]
                     .filter(Boolean)
                     .join(" · ")} width={width()} compact={rowHeight() === 1} interaction={props.interactionForAgent?.(row())} paneName={props.paneName} activity={row().activity} attention={row().attention} unavailable={row().paneId === null || stale(row())} selected={props.selection.selectedKey === key} focused={props.inputActive && !editing() && props.selection.selectedKey === key} hovered={hovered() === key} onOpen={(source) => {
                     if (!props.inputActive || row().paneId === null || stale(row()))

package/packages/daemon/dist/tui/mirror/runtime/application-home-agents.js

@@ -30,6 +30,7 @@ export function projectHomeAgentRows(session, shell) {
         windowId: shell.resource.terminalInventory?.resources.find((resource) => resource.attachability.status === "available" &&
             resource.attachability.semanticPaneId === agent.paneId)?.windowResourceId ?? null,
         name: agent.name,
+        ...(agent.team ? { team: agent.team } : {}),
         harness: agent.harness,
         activity: agent.activity,
         attention: agent.attention,

package/packages/daemon/dist/tui/mirror/runtime/application-home-fleet.js

@@ -1,3 +1,4 @@
+import { groupApplicationTeamRows } from "./application-team-groups.js";
 import { createEffect, createMemo, createSignal, onCleanup } from "solid-js";
 import { createHomeAgentSelectionOwner } from "./application-home-agent-selection.js";
 export function projectHomeFleet(catalog, groups, filter) {
@@ -52,6 +53,7 @@ export function projectHomeFleet(catalog, groups, filter) {
     const matching = query
         ? rows.filter((row) => [
             row.name,
+            row.team?.name,
             row.harness,
             row.projectName,
             row.sessionName,
@@ -67,7 +69,7 @@ export function projectHomeFleet(catalog, groups, filter) {
                     ? "loading"
                     : "unavailable"
             : "live",
-        rows: matching,
+        rows: groupApplicationTeamRows(matching),
         observedSessions,
         totalSessions,
         loadingSessions,

package/packages/daemon/dist/tui/mirror/runtime/application-machine-sidebar.jsx

@@ -1,3 +1,4 @@
+import { groupApplicationTeamRows } from "./application-team-groups.js";
 import { CHROME_ACTIONS, SIDEBAR_ACTIONS } from "../workspace/application-action-descriptions.js";
 import { AgentRow } from "../ui/agent-row.jsx";
 import { fleetHostColor } from "./fleet-presentation.js";
@@ -45,7 +46,7 @@ export function ApplicationMachineSidebar(props) {
                 : row.session?.name === props.model.activeSessionName());
     const preferenceKey = (group) => group.environmentId ?? group.id;
     const rows = createMemo(() => [
-        ...props.model.groups().flatMap((group) => (group.agents ?? []).map((agent) => ({
+        ...props.model.groups().flatMap((group) => groupApplicationTeamRows(group.agents ?? []).map((agent) => ({
             key: JSON.stringify([
                 group.id,
                 "agent",
@@ -374,7 +375,7 @@ export function ApplicationMachineSidebar(props) {
                             : row.group.state === "ready"
                                 ? undefined
                                 : connectionDetail(row.group)} selected={Boolean(row.session && active(row))} focused={focused() && row.key === selectedKey()} onActivate={(source) => activate(row, source)}/>}>
-                  {(agent) => (<AgentRow theme={props.theme} id={`machine:${row.key}`} name={agent().name} context={[
+                  {(agent) => (<AgentRow theme={props.theme} id={`machine:${row.key}`} name={agent().name} team={agent().team} context={[
                         row.group.label,
                         row.group.sessions.find((session) => session.server?.serverId === agent().server?.serverId)?.serverLabel,
                         friendlySessionLabel(agent().sessionName),

package/packages/daemon/dist/tui/mirror/runtime/application-team-groups.js

@@ -0,0 +1,22 @@
+import { paneTeamGroupKey, } from "@tmux-ide/contracts";
+export function applicationTeamKey(row) {
+    return row.team
+        ? paneTeamGroupKey(row.team, row.machineId ?? "local", row.server?.serverId ?? "default", row.server?.generation ?? row.daemonInstanceId ?? "")
+        : null;
+}
+/** Group by membership, never by name, activity, or current tmux window. Stable within groups. */
+export function groupApplicationTeamRows(rows) {
+    const groups = new Map();
+    const ungrouped = [];
+    for (const row of rows) {
+        const key = applicationTeamKey(row);
+        if (key === null) {
+            ungrouped.push(row);
+            continue;
+        }
+        const group = groups.get(key) ?? [];
+        group.push(row);
+        groups.set(key, group);
+    }
+    return [...groups.values()].flat().concat(ungrouped);
+}

package/packages/daemon/dist/tui/mirror/ui/agent-row.jsx

@@ -40,7 +40,7 @@ export function AgentRow(props) {
             event.stopPropagation();
             props.onOpen("mouse");
         }}>
-      <NavigationRow surface={props.surface} theme={props.theme} id={props.id} width={props.width} label={props.name} marker={receipt()
+      <NavigationRow surface={props.surface} theme={props.theme} id={props.id} width={props.width} label={props.compact && props.team ? `${props.team.name} / ${props.name}` : props.name} marker={receipt()
             ? receiptMarker()
             : props.activity === "idle" && !props.attention && !props.unavailable
                 ? " "
@@ -53,7 +53,7 @@ export function AgentRow(props) {
                     : status()?.label} selected={props.selected} focused={props.focused} hovered={props.hovered} disabled={props.unavailable} tone={status()?.tone === "blocked" ? "warning" : "neutral"} onActivate={props.onOpen}/>
       <Show when={!props.compact}>
         <text height={1} width={props.width} fg={props.selected ? palette().foreground : props.theme.roles.text.muted}>
-          {clipTerminal(`  ${props.context}`, props.width)}
+          {clipTerminal(`  ${[props.team?.name, props.context].filter(Boolean).join(" · ")}`, props.width)}
         </text>
       </Show>
     </box>);

package/packages/daemon/src/command-center/discovery.ts

@@ -1,3 +1,5 @@
+import { readManualPaneTeam } from "../terminal/attachments/manual-pane-team.ts";
+import type { PaneTeamMembership } from "@tmux-ide/contracts";
 import { decodeTmuxArgument } from "../terminal/protocol/session-descriptor-discovery.ts";
 import type { NativePaneIdentity } from "@tmux-ide/contracts";
 import { nativePaneIdentity } from "../lib/native-pane-identity.ts";
@@ -224,6 +226,7 @@ export function readAdoptedSessionNames(runTmux: TmuxRunner = _tmuxRunner): stri
 
 /** One live pane, with the raw agent-authority options gathered for the fleet. */
 export interface FleetPaneFacts {
+  readonly team?: PaneTeamMembership;
   readonly title?: string;
   readonly name?: string | null;
   readonly nameSource?: string | null;
@@ -279,6 +282,7 @@ const FLEET_PANE_FORMAT = [
   "#{qa:pane_title}",
   "#{qa:@ide_name}",
   "#{qa:@tmux_ide_name_source}",
+  "#{@tmux_ide_team}",
   FLEET_LINE_SENTINEL,
 ].join(FLEET_FIELD_SEPARATOR);
 
@@ -325,7 +329,7 @@ export function readAdoptedFleet(
     const fields = line.split(FLEET_FIELD_SEPARATOR);
     // session, pane, semantic pane, incarnation pid, active, command, path, state,
     // statusText, displayName, hint, birth ID, quoted title/name/source, sentinel
-    if (fields.length !== 16 || fields[15] !== FLEET_LINE_SENTINEL) continue;
+    if (![16, 17].includes(fields.length) || fields.at(-1) !== FLEET_LINE_SENTINEL) continue;
     const sessionName = fields[0]!;
     if (!adoptedSet.has(sessionName)) continue;
     const runtimePaneId = fields[1]!;
@@ -338,6 +342,7 @@ export function readAdoptedFleet(
       panesBySession.set(sessionName, panes);
     }
     panes.push({
+      team: fields.length === 17 ? readManualPaneTeam(fields[15], incarnation) : undefined,
       nameSource: emptyToNull(decodeTmuxArgument(fields[14]!)),
       title: decodeTmuxArgument(fields[12]!),
       name: emptyToNull(decodeTmuxArgument(fields[13]!)),

package/packages/daemon/src/command-center/resources/application-shell.ts

@@ -1,3 +1,4 @@
+import type { PaneTeamMembership } from "@tmux-ide/contracts";
 import { resolvePaneDisplayName } from "../../terminal/protocol/pane-display-name.ts";
 import type { NativePaneIdentity } from "@tmux-ide/contracts";
 import { hostname } from "node:os";
@@ -72,6 +73,7 @@ export interface ApplicationShellPanePresentationFacts {
   /** Raw `@agent_display_name`; sanitized + freshness-gated in the pure layer. */
   readonly agentDisplayNameRaw?: string | null;
   readonly teamMemberName?: string;
+  readonly team?: PaneTeamMembership;
   /**
    * Screen-scrape fallback verdict the discovery layer resolved for panes
    * WITHOUT fresh authority. `null` means authority was fresh (scrape skipped);
@@ -431,7 +433,7 @@ export function resolvedAgentLabel(
 const AGENT_STATE_STAMP = /^(?:working|blocked|done|idle):\d+$/u;
 
 export function isAgentPane(pane: ApplicationShellPanePresentationFacts): boolean {
-  if (pane.teamMemberName) return true;
+  if (pane.teamMemberName || pane.team) return true;
   // A well-formed @agent_state stamp IS the agent contract: any pane that
   // self-reports is an agent pane, even when its command is a bare shell and
   // no @ide_type/role metadata exists. Staleness only affects the status, not
@@ -630,6 +632,7 @@ function projectApplicationShellResourceV1Core(
         // labels such as `Terminal` with the canonical harness name.
         name: resolvedAgentLabel(pane, presentation, index),
         harness: harnessForPane(pane),
+        ...(pane.team ? { team: pane.team } : {}),
         activity: presentation.activity,
         paneId,
         attention: presentation.attention,

package/packages/daemon/src/command-center/resources/fleet-catalog.ts

@@ -136,6 +136,7 @@ function toPresentationPane(
     agentStatusTextRaw: pane.agentStatusTextRaw,
     agentDisplayNameRaw: pane.agentDisplayNameRaw,
     teamMemberName: pane.teamMemberName,
+    team: pane.team,
     // Authority-only: the fleet never scrapes an unopened session. `null` (not
     // `undefined`) keeps `resolveAgentPresentation` on the ground-truth path
     // while its scrape verdict resolves to `unknown` without any capture.
@@ -163,6 +164,7 @@ function projectSession(
         `Agent ${index + 1}`,
       ),
       harness: harnessForPane(presentationPane),
+      ...(pane.team ? { team: pane.team } : {}),
       activity: presentation.activity,
       attention: presentation.attention,
       statusSource: presentation.statusSource,

package/packages/daemon/src/lib/daemon-embed.ts

@@ -1,5 +1,5 @@
 import { join } from "node:path";
-import { createClaudeTeamNameReader } from "../terminal/attachments/claude-team-names.ts";
+import { createClaudeTeamMembershipReader } from "../terminal/attachments/claude-team-names.ts";
 import { PaneSourceDiscovery } from "./pane-source-discovery.ts";
 import { createBackgroundNativeCapture } from "./background-native-capture.ts";
 import { createOwnedViewerAdapterFactory } from "./owned-viewer-factory.ts";
@@ -1131,7 +1131,7 @@ async function startEmbeddedDaemonGeneration(
     // observe one daemon-generation authority rather than whichever server a
     // caller's ambient TMUX/PATH happens to select.
     const tmuxAuthority = resolveWorkspacePaneTmuxAuthority();
-    const readTeamNames = createClaudeTeamNameReader(
+    const readTeamMemberships = createClaudeTeamMembershipReader(
       join(resolveRuntimeNamespace().claudeDir, "teams"),
     );
     const catalogTmuxRunner = createPinnedWorkspaceTmuxRunner(tmuxAuthority);
@@ -1628,7 +1628,7 @@ async function startEmbeddedDaemonGeneration(
         agentStatusProbeFactory: ({ run }) =>
           createTmuxAgentStatusProbe({
             run,
-            readTeamNames,
+            readTeamMemberships,
             captureNative: (pane, signal) =>
               backgroundCapture?.(
                 {
@@ -1923,7 +1923,7 @@ async function startEmbeddedDaemonGeneration(
             () => observationSelector?.nativeServerEpoch ?? null,
           );
           if (!fleet) return null;
-          const names = await readTeamNames(
+          const names = await readTeamMemberships(
             fleet.flatMap((session) =>
               session.panes.map((pane) => ({
                 runtimePaneId: pane.runtimePaneId,
@@ -1935,7 +1935,9 @@ async function startEmbeddedDaemonGeneration(
             ...session,
             panes: session.panes.map((pane) => {
               const name = names.get(pane.runtimePaneId);
-              return name ? { ...pane, teamMemberName: name } : pane;
+              return name
+                ? { ...pane, teamMemberName: name.name, team: pane.team ?? name.team }
+                : pane;
             }),
           }));
         },