tmux-team 4.0.0 → 4.1.0

package/src/commands/preamble.test.ts

@@ -14,7 +14,12 @@ import { cmdPreamble } from './preamble.js';
 // Test utilities
 // ─────────────────────────────────────────────────────────────
 
-function createMockUI(): UI & { errors: string[]; warnings: string[]; infos: string[]; jsonOutput: unknown[] } {
+function createMockUI(): UI & {
+  errors: string[];
+  warnings: string[];
+  infos: string[];
+  jsonOutput: unknown[];
+} {
   const mock = {
     errors: [] as string[],
     warnings: [] as string[],
@@ -48,7 +53,8 @@ function createDefaultConfig(): ResolvedConfig {
       pollInterval: 1,
       captureLines: 100,
       maxCaptureLines: 2000,
-      preambleEvery: 3, pasteEnterDelayMs: 500,
+      preambleEvery: 3,
+      pasteEnterDelayMs: 500,
     },
     agents: {},
     paneRegistry: {
@@ -64,6 +70,13 @@ function createMockTmux(): Tmux {
     capture: vi.fn(() => ''),
     listPanes: vi.fn(() => []),
     getCurrentPaneId: vi.fn(() => null),
+    resolvePaneTarget: vi.fn((target: string) => target),
+    getAgentRegistry: vi.fn(() => ({ paneRegistry: {}, agents: {} })),
+    setAgentRegistration: vi.fn(),
+    clearAgentRegistration: vi.fn(() => false),
+    listTeams: vi.fn(() => ({})),
+    listTeamPanes: vi.fn(() => []),
+    removeTeam: vi.fn(() => ({ removed: 0, agents: [] })),
   };
 }
 

package/src/commands/preamble.ts

@@ -5,6 +5,7 @@
 import type { Context } from '../types.js';
 import { ExitCodes } from '../context.js';
 import { loadLocalConfigFile, saveLocalConfigFile } from '../config.js';
+import { getRegistryScope, registrationFromEntry } from '../registry.js';
 
 /**
  * Show preamble(s) for agent(s).
@@ -60,7 +61,7 @@ function showPreamble(ctx: Context, agentName?: string): void {
  * Set preamble for an agent (in local config).
  */
 function setPreamble(ctx: Context, agentName: string, preamble: string): void {
-  const { ui, paths, flags, config } = ctx;
+  const { ui, paths, flags, config, tmux } = ctx;
 
   // Check if agent exists in pane registry
   if (!config.paneRegistry[agentName]) {
@@ -69,15 +70,19 @@ function setPreamble(ctx: Context, agentName: string, preamble: string): void {
     ctx.exit(ExitCodes.ERROR);
   }
 
-  const localConfig = loadLocalConfigFile(paths);
-
-  // Update preamble in local config
-  const agentEntry = localConfig[agentName] as { pane: string; preamble?: string } | undefined;
-  if (agentEntry) {
-    agentEntry.preamble = preamble;
+  const pane = tmux.resolvePaneTarget(config.paneRegistry[agentName].pane);
+  if (!pane) {
+    ui.error(`Pane '${config.paneRegistry[agentName].pane}' not found. Is tmux running?`);
+    ctx.exit(ExitCodes.PANE_NOT_FOUND);
   }
 
-  saveLocalConfigFile(paths, localConfig);
+  const nextEntry = { ...config.paneRegistry[agentName], pane, preamble };
+  tmux.setAgentRegistration(
+    pane,
+    getRegistryScope(ctx),
+    registrationFromEntry(agentName, nextEntry)
+  );
+  updateLegacyPreambleIfPresent(paths, agentName, preamble);
 
   if (flags.json) {
     ui.json({ agent: agentName, preamble, status: 'set' });
@@ -90,14 +95,28 @@ function setPreamble(ctx: Context, agentName: string, preamble: string): void {
  * Clear preamble for an agent (in local config).
  */
 function clearPreamble(ctx: Context, agentName: string): void {
-  const { ui, paths, flags } = ctx;
-
-  const localConfig = loadLocalConfigFile(paths);
-  const agentEntry = localConfig[agentName] as { pane?: string; preamble?: string } | undefined;
-
-  if (agentEntry?.preamble) {
-    delete agentEntry.preamble;
-    saveLocalConfigFile(paths, localConfig);
+  const { ui, paths, flags, config, tmux } = ctx;
+
+  const entry = config.paneRegistry[agentName];
+  const hasPreamble =
+    entry?.preamble !== undefined ||
+    config.agents[agentName]?.preamble !== undefined ||
+    legacyHasPreamble(paths, agentName);
+
+  if (entry && hasPreamble) {
+    const pane = tmux.resolvePaneTarget(entry.pane);
+    if (!pane) {
+      ui.error(`Pane '${entry.pane}' not found. Is tmux running?`);
+      ctx.exit(ExitCodes.PANE_NOT_FOUND);
+    }
+    const nextEntry = { ...entry, pane };
+    delete nextEntry.preamble;
+    tmux.setAgentRegistration(
+      pane,
+      getRegistryScope(ctx),
+      registrationFromEntry(agentName, nextEntry)
+    );
+    clearLegacyPreambleIfPresent(paths, agentName);
 
     if (flags.json) {
       ui.json({ agent: agentName, status: 'cleared' });
@@ -113,6 +132,32 @@ function clearPreamble(ctx: Context, agentName: string): void {
   }
 }
 
+function updateLegacyPreambleIfPresent(
+  paths: Context['paths'],
+  agentName: string,
+  preamble: string
+): void {
+  const localConfig = loadLocalConfigFile(paths);
+  const agentEntry = localConfig[agentName] as { pane?: string; preamble?: string } | undefined;
+  if (!agentEntry) return;
+  agentEntry.preamble = preamble;
+  saveLocalConfigFile(paths, localConfig);
+}
+
+function clearLegacyPreambleIfPresent(paths: Context['paths'], agentName: string): void {
+  const localConfig = loadLocalConfigFile(paths);
+  const agentEntry = localConfig[agentName] as { pane?: string; preamble?: string } | undefined;
+  if (!agentEntry || !Object.prototype.hasOwnProperty.call(agentEntry, 'preamble')) return;
+  delete agentEntry.preamble;
+  saveLocalConfigFile(paths, localConfig);
+}
+
+function legacyHasPreamble(paths: Context['paths'], agentName: string): boolean {
+  const localConfig = loadLocalConfigFile(paths);
+  const agentEntry = localConfig[agentName] as { pane?: string; preamble?: string } | undefined;
+  return Boolean(agentEntry && Object.prototype.hasOwnProperty.call(agentEntry, 'preamble'));
+}
+
 /**
  * Preamble command entry point.
  */

package/src/commands/remove.ts

@@ -5,22 +5,26 @@
 import type { Context } from '../types.js';
 import { ExitCodes } from '../exits.js';
 import { loadLocalConfigFile, saveLocalConfigFile } from '../config.js';
+import { getRegistryScope } from '../registry.js';
 
 export function cmdRemove(ctx: Context, name: string): void {
-  const { ui, config, paths, flags, exit } = ctx;
+  const { ui, config, paths, flags, tmux, exit } = ctx;
 
   if (!config.paneRegistry[name]) {
     ui.error(`Agent '${name}' not found.`);
     exit(ExitCodes.PANE_NOT_FOUND);
   }
 
-  // Load existing config to preserve other agents' fields (preamble, deny, etc.)
-  const localConfig = loadLocalConfigFile(paths);
-  delete localConfig[name];
-  saveLocalConfigFile(paths, localConfig);
+  const removedFromTmux = tmux.clearAgentRegistration(name, getRegistryScope(ctx));
+  if (!removedFromTmux) {
+    // Legacy fallback: remove from tmux-team.json when this scope still uses it.
+    const localConfig = loadLocalConfigFile(paths);
+    delete localConfig[name];
+    saveLocalConfigFile(paths, localConfig);
+  }
 
   if (flags.json) {
-    ui.json({ removed: name });
+    ui.json({ removed: name, source: removedFromTmux ? 'tmux' : 'legacy' });
   } else {
     ui.success(`Removed agent '${name}'`);
   }

package/src/commands/talk.test.ts

@@ -43,6 +43,25 @@ function createMockTmux(): Tmux & {
     getCurrentPaneId() {
       return null;
     },
+    resolvePaneTarget(target: string) {
+      return target;
+    },
+    getAgentRegistry() {
+      return { paneRegistry: {}, agents: {} };
+    },
+    setAgentRegistration() {},
+    clearAgentRegistration() {
+      return false;
+    },
+    listTeams() {
+      return {};
+    },
+    listTeamPanes() {
+      return [];
+    },
+    removeTeam() {
+      return { removed: 0, agents: [] };
+    },
   };
   return mock;
 }
@@ -239,7 +258,8 @@ describe('buildMessage (via cmdTalk)', () => {
         pollInterval: 0.1,
         captureLines: 100,
         maxCaptureLines: 2000,
-        preambleEvery: 3, pasteEnterDelayMs: 500,
+        preambleEvery: 3,
+        pasteEnterDelayMs: 500,
       },
     };
 
@@ -551,7 +571,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -595,7 +616,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -626,7 +648,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.02,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -674,7 +697,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -710,7 +734,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -739,7 +764,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -791,7 +817,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.05,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
         paneRegistry: {
           codex: { pane: '10.1' },
@@ -837,7 +864,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.02,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
         paneRegistry: {
           codex: { pane: '10.1' },
@@ -892,7 +920,8 @@ describe('cmdTalk - --wait mode', () => {
           pollInterval: 0.02,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
         paneRegistry: {
           codex: { pane: '10.1' },
@@ -1003,7 +1032,8 @@ describe('cmdTalk - nonce collision handling', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -1058,7 +1088,8 @@ describe('cmdTalk - JSON output contract', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -1099,7 +1130,8 @@ describe('cmdTalk - JSON output contract', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -1141,7 +1173,8 @@ describe('cmdTalk - JSON output contract', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -1178,7 +1211,8 @@ describe('cmdTalk - JSON output contract', () => {
           pollInterval: 0.01,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
       },
     });
@@ -1228,7 +1262,8 @@ describe('cmdTalk - JSON output contract', () => {
           pollInterval: 0.02,
           captureLines: 100,
           maxCaptureLines: 2000,
-          preambleEvery: 3, pasteEnterDelayMs: 500,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
         },
         paneRegistry: {
           codex: { pane: '10.1' },
@@ -1310,7 +1345,16 @@ describe('cmdTalk - end marker detection', () => {
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 0.5 },
-      config: { defaults: { timeout: 0.5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3, pasteEnterDelayMs: 500 } },
+      config: {
+        defaults: {
+          timeout: 0.5,
+          pollInterval: 0.01,
+          captureLines: 100,
+          maxCaptureLines: 2000,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
+        },
+      },
     });
 
     await cmdTalk(ctx, 'claude', 'Test message');
@@ -1344,7 +1388,16 @@ describe('cmdTalk - end marker detection', () => {
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 0.5 },
-      config: { defaults: { timeout: 0.5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3, pasteEnterDelayMs: 500 } },
+      config: {
+        defaults: {
+          timeout: 0.5,
+          pollInterval: 0.01,
+          captureLines: 100,
+          maxCaptureLines: 2000,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
+        },
+      },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1378,7 +1431,16 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 0.5 },
-      config: { defaults: { timeout: 0.5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3, pasteEnterDelayMs: 500 } },
+      config: {
+        defaults: {
+          timeout: 0.5,
+          pollInterval: 0.01,
+          captureLines: 100,
+          maxCaptureLines: 2000,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
+        },
+      },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1409,7 +1471,16 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 0.5 },
-      config: { defaults: { timeout: 0.5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3, pasteEnterDelayMs: 500 } },
+      config: {
+        defaults: {
+          timeout: 0.5,
+          pollInterval: 0.01,
+          captureLines: 100,
+          maxCaptureLines: 2000,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
+        },
+      },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1446,7 +1517,16 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 0.5 },
-      config: { defaults: { timeout: 0.5, pollInterval: 0.01, captureLines: 100, maxCaptureLines: 2000, preambleEvery: 3, pasteEnterDelayMs: 500 } },
+      config: {
+        defaults: {
+          timeout: 0.5,
+          pollInterval: 0.01,
+          captureLines: 100,
+          maxCaptureLines: 2000,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
+        },
+      },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');
@@ -1482,7 +1562,16 @@ Line 4 final`;
       ui,
       paths: createTestPaths(testDir),
       flags: { wait: true, json: true, timeout: 0.5 },
-      config: { defaults: { timeout: 0.5, pollInterval: 0.01, captureLines: 200, maxCaptureLines: 2000, preambleEvery: 3, pasteEnterDelayMs: 500 } },
+      config: {
+        defaults: {
+          timeout: 0.5,
+          pollInterval: 0.01,
+          captureLines: 200,
+          maxCaptureLines: 2000,
+          preambleEvery: 3,
+          pasteEnterDelayMs: 500,
+        },
+      },
     });
 
     await cmdTalk(ctx, 'claude', 'Test');

package/src/commands/talk.ts

@@ -186,7 +186,10 @@ function extractWithExpandableCapture(
 
     if (instructionLineIndex !== -1 && instructionLineIndex < endMarkerLineIndex) {
       // Instruction visible: extract from after instruction to marker
-      const response = lines.slice(instructionLineIndex + 1, endMarkerLineIndex).join('\n').trim();
+      const response = lines
+        .slice(instructionLineIndex + 1, endMarkerLineIndex)
+        .join('\n')
+        .trim();
       return { response, truncated: false };
     }
 
@@ -619,7 +622,8 @@ export async function cmdTalk(ctx: Context, target: string, message: string): Pr
       );
 
       // Clean Gemini CLI UI artifacts
-      const response = target === 'gemini' ? cleanGeminiResponse(extractedResponse) : extractedResponse;
+      const response =
+        target === 'gemini' ? cleanGeminiResponse(extractedResponse) : extractedResponse;
 
       if (!flags.json && isTTY) {
         process.stdout.write('\r' + ' '.repeat(80) + '\r');
@@ -883,7 +887,8 @@ async function cmdTalkAllWait(
         );
 
         // Clean Gemini CLI UI artifacts
-        const response = state.agent === 'gemini' ? cleanGeminiResponse(extractedResponse) : extractedResponse;
+        const response =
+          state.agent === 'gemini' ? cleanGeminiResponse(extractedResponse) : extractedResponse;
         state.response = response;
         state.truncated = truncated;
         state.status = 'completed';

package/src/commands/team.ts

@@ -0,0 +1,172 @@
+// ─────────────────────────────────────────────────────────────
+// team command - inspect pane team/workspace scope and manage explicit shared teams
+// ─────────────────────────────────────────────────────────────
+
+import type { Context, TeamPaneInfo, TeamPaneRegistration } from '../types.js';
+import { ExitCodes } from '../exits.js';
+
+export function cmdTeam(ctx: Context, args: string[]): void {
+  const subcommand = args[0] ?? 'ls';
+
+  switch (subcommand) {
+    case 'ls':
+    case 'list':
+      listTeams(ctx, args.slice(1));
+      break;
+    case 'rm':
+    case 'remove':
+      removeTeam(ctx, args.slice(1));
+      break;
+    default:
+      ctx.ui.error(`Unknown team subcommand: ${subcommand}`);
+      ctx.ui.error('Usage: tmux-team team [ls [--summary]|rm <team> --force]');
+      ctx.exit(ExitCodes.ERROR);
+  }
+}
+
+function listTeams(ctx: Context, args: string[]): void {
+  const teams = ctx.tmux.listTeams();
+  const panes = ctx.tmux.listTeamPanes();
+  const summaryOnly = args.includes('--summary');
+
+  if (ctx.flags.json) {
+    ctx.ui.json({ teams, panes });
+    return;
+  }
+
+  if (summaryOnly) {
+    const rows = Object.entries(teams).sort(([a], [b]) => a.localeCompare(b));
+    if (rows.length === 0) {
+      ctx.ui.info('No shared teams found.');
+      return;
+    }
+    ctx.ui.table(
+      ['TEAM', 'AGENTS'],
+      rows.map(([teamName, agents]) => [teamName, agents.join(', ') || '-'])
+    );
+    return;
+  }
+
+  const groups = panesToGroups(panes);
+  if (groups.length === 0) {
+    ctx.ui.info('No tmux panes found.');
+    return;
+  }
+
+  for (const [index, group] of groups.entries()) {
+    if (index > 0) console.log('');
+    console.log(group.title);
+    ctx.ui.table(['PANE', 'TARGET', 'CWD', 'CMD'], group.rows);
+  }
+}
+
+interface PaneGroup {
+  key: string;
+  title: string;
+  agents: Set<string>;
+  rows: string[][];
+}
+
+function panesToGroups(panes: TeamPaneInfo[]): PaneGroup[] {
+  const groups = new Map<string, PaneGroup>();
+
+  for (const pane of panes) {
+    if (pane.registrations.length === 0) {
+      addPaneToGroup(groups, '2:', 'Unregistered panes', pane);
+      continue;
+    }
+
+    for (const registration of pane.registrations) {
+      addPaneToGroup(
+        groups,
+        scopeSortKey(registration),
+        groupTitle(registration),
+        pane,
+        registration
+      );
+    }
+  }
+
+  return [...groups.values()]
+    .sort((a, b) => a.key.localeCompare(b.key))
+    .map((group) => ({
+      ...group,
+      title:
+        group.agents.size > 0
+          ? `${group.title} (${[...group.agents].sort().join(', ')})`
+          : group.title,
+      rows: group.rows.sort((a, b) => a[1].localeCompare(b[1])),
+    }));
+}
+
+function addPaneToGroup(
+  groups: Map<string, PaneGroup>,
+  key: string,
+  title: string,
+  pane: TeamPaneInfo,
+  registration?: TeamPaneRegistration
+): void {
+  const group = groups.get(key) ?? { key, title, agents: new Set<string>(), rows: [] };
+  if (registration) group.agents.add(formatAgent(registration));
+  group.rows.push([pane.pane, pane.target ?? '-', pane.cwd ?? '-', pane.command || '-']);
+  groups.set(key, group);
+}
+
+function scopeSortKey(registration: TeamPaneRegistration): string {
+  if (registration.scopeType === 'team') return `0:${registration.scope}`;
+  if (registration.scopeType === 'workspace') return `1:${registration.scope}`;
+  return '2:';
+}
+
+function groupTitle(registration: TeamPaneRegistration): string {
+  if (registration.scopeType === 'team') return `Team: ${registration.scope}`;
+  return `Workspace: ${registration.scope}`;
+}
+
+function formatAgent(registration: TeamPaneRegistration): string {
+  return registration.remark
+    ? `${registration.agent} (${registration.remark})`
+    : registration.agent;
+}
+
+function removeTeam(ctx: Context, args: string[]): void {
+  const teamName = args.find((arg) => !arg.startsWith('-'));
+  const dryRun = args.includes('--dry-run');
+  const force = ctx.flags.force || args.includes('--force') || args.includes('-f');
+
+  if (!teamName) {
+    ctx.ui.error('Usage: tmux-team team rm <team> --force');
+    ctx.exit(ExitCodes.ERROR);
+  }
+
+  const teams = ctx.tmux.listTeams();
+  const agents = teams[teamName] ?? [];
+  if (agents.length === 0) {
+    ctx.ui.error(`Team '${teamName}' not found.`);
+    ctx.exit(ExitCodes.PANE_NOT_FOUND);
+  }
+
+  if (ctx.flags.json && dryRun) {
+    ctx.ui.json({ team: teamName, dryRun: true, agents, removed: 0 });
+    return;
+  }
+
+  if (dryRun) {
+    ctx.ui.info(`Would remove team '${teamName}' from ${agents.length} agent(s).`);
+    ctx.ui.table(['TEAM', 'AGENTS'], [[teamName, agents.join(', ')]]);
+    return;
+  }
+
+  if (!force) {
+    ctx.ui.error(`Refusing to remove team '${teamName}' without --force.`);
+    ctx.exit(ExitCodes.ERROR);
+  }
+
+  const result = ctx.tmux.removeTeam(teamName);
+  if (ctx.flags.json) {
+    ctx.ui.json({ team: teamName, removed: result.removed, agents: result.agents });
+    return;
+  }
+
+  ctx.ui.success(`Removed team '${teamName}' from ${result.removed} pane(s).`);
+}