@zgeoff/atc 0.1.12 → 1.0.1

package/src/{index.ts → client/index.ts}

@@ -1,52 +1,21 @@
-import { basename } from 'node:path';
+import { match } from 'ts-pattern';
+import { createActor } from 'xstate';
+import type { AgentID } from '../agents/agent-adapter';
+import { countSessionStates, sortGroupedSessionViews, sortSessionViews } from '../daemon/sessions';
+import type { EventMsg } from '../protocol/protocol';
+import { loadConfig } from '../shared/config';
 import { bootDaemonClient } from './boot-daemon';
+import { buildClientMachine } from './build-client-machine';
 import { buildLeaderChords } from './build-leader-chords';
-import { loadConfig } from './config';
-import { collectDirs, findFuzzyScore, formatDir, pickMatches } from './dirs';
+import { findFuzzyScore, formatDir } from './dirs';
+import { KEY, isDown, isUp, planTextEdit } from './keys';
+import { parseDaemonEvent } from './parse-daemon-event';
 import { pickTabTarget } from './pick-tab-target';
-import type { EventMsg } from './protocol';
-import { isRecord } from './report';
-import { countSessionStates, sortGroupedSessionViews, sortSessionViews } from './sessions';
-import type { SessionState } from './sessions';
+import { SpawnPicker } from './spawn-picker';
+import { toMirrorSession } from './to-mirror-session';
+import type { MirrorSession } from './to-mirror-session';
 import { ansi, cols, drawHelp, drawHome, drawOverlay, drawPicker, drawStatusBar, rows } from './ui';
 
-type AgentKind = 'claude' | 'grok' | 'codex';
-
-type Mode =
-  | 'home'
-  | 'attached'
-  | 'overlay'
-  | 'help'
-  | 'picker-agent'
-  | 'picker-dir'
-  | 'picker-name'
-  | 'picker-prompt'
-  | 'picker-eject';
-
-const AGENT_PICKS = [
-  { agent: 'claude' as const, label: 'Claude' },
-  { agent: 'grok' as const, label: 'Grok' },
-  { agent: 'codex' as const, label: 'Codex' },
-];
-
-interface MirrorSession {
-  id: string;
-  name: string;
-  cwd: string;
-  pinned: boolean;
-  lastAttachedAt: number;
-  repoRoot: string;
-  state: SessionState;
-  unread: boolean;
-  lastMsg: string;
-  createdAt: number;
-  kind: 'pty' | 'headless';
-  alive: boolean;
-  resumable: boolean;
-  agent: AgentKind;
-}
-
-let mode: Mode = 'home';
 let overlaySelected = 0;
 let confirmKill = false;
 
@@ -60,16 +29,14 @@ const doneAt = new Map<string, number>();
 
 let focusedID: string | null = null;
 let fleetCount = 0;
+let lastUsedAgent: AgentID = 'claude';
+
+// Read once at start, like the leader key: a newly configured backend gets
+// its overlay letter on the next client run.
+const agentMarks: Readonly<Record<AgentID, string>> = Object.fromEntries(
+  loadConfig().gateways.map((g) => [g.id, g.mark]),
+);
 
-// picker state carried across the dir -> name -> prompt steps
-let allDirs: string[] = [];
-let pickerInput = '';
-let pickerSelected = 0;
-let spawnDir = '';
-let spawnName = '';
-let spawnResume = false;
-let spawnAgent: AgentKind = 'claude';
-let lastUsedAgent: AgentKind = 'claude';
 const stdout = process.stdout;
 
 // Full height: the atc status bar only exists on home/overlay screens;
@@ -82,6 +49,19 @@ function findFocused(): MirrorSession | null {
   return fleet.find((s) => s.id === focusedID) ?? null;
 }
 
+function openHome() {
+  drawHome(fleetCount, leader.label);
+  scheduleStatus();
+}
+
+function openAttached(sessionID: string) {
+  focusedID = sessionID;
+
+  stdout.write(ansi.clear + ansi.showCursor);
+
+  scheduleStatus();
+}
+
 let statusTimer: ReturnType<typeof setTimeout> | null = null;
 
 function scheduleStatus() {
@@ -92,7 +72,7 @@ function scheduleStatus() {
   statusTimer = setTimeout(() => {
     statusTimer = null;
 
-    if (mode !== 'attached') {
+    if (service.getSnapshot().value !== 'attached') {
       const focused = findFocused();
       const urgent = sortSessionViews(fleet).find((s) => s.state === 'needs_you');
 
@@ -114,10 +94,7 @@ async function sendQuiet(m: string, p?: Readonly<Record<string, unknown>>) {
 }
 
 async function attach(sessionID: string) {
-  focusedID = sessionID;
-  mode = 'attached';
-
-  stdout.write(ansi.clear + ansi.showCursor);
+  service.send({ type: 'ATTACH', sessionID });
 
   try {
     await client.sendRequest('session.attach', {
@@ -126,14 +103,8 @@ async function attach(sessionID: string) {
       rows: ptyRows(),
     });
   } catch {
-    mode = 'overlay';
-
-    openOverlay();
-
-    return;
+    service.send({ type: 'OVERLAY' });
   }
-
-  scheduleStatus();
 }
 
 function detachFocused() {
@@ -146,20 +117,15 @@ function toBase() {
   const f = findFocused();
 
   if (f !== null && f.alive) {
-    mode = 'attached';
-
-    stdout.write(ansi.clear + ansi.showCursor);
+    service.send({ type: 'ATTACH', sessionID: f.id });
     void sendQuiet('session.attach', { session: f.id, cols: cols(), rows: ptyRows() });
   } else {
-    mode = 'home';
-
-    drawHome(fleetCount, leader.label);
+    service.send({ type: 'HOME' });
   }
-
-  scheduleStatus();
 }
 
 let ejectTarget = '';
+let ejectInput = '';
 
 async function yankToHeadless(instruction: string) {
   try {
@@ -171,7 +137,7 @@ async function yankToHeadless(instruction: string) {
     recordActionFailure(ejectTarget, error);
   }
 
-  openOverlay();
+  service.send({ type: 'OVERLAY' });
 }
 
 async function adoptSession(id: string) {
@@ -181,7 +147,8 @@ async function adoptSession(id: string) {
     await attach(id);
   } catch (error) {
     recordActionFailure(id, error);
-    openOverlay();
+
+    service.send({ type: 'OVERLAY' });
   }
 }
 
@@ -196,8 +163,6 @@ function recordActionFailure(id: string, error: unknown) {
 }
 
 function openHelp() {
-  mode = 'help';
-
   stdout.write(ansi.clear);
 
   drawHelp();
@@ -207,7 +172,7 @@ function applyHelpKey(buf: Buffer) {
   const ch = buf.toString();
 
   if (buf[0] === KEY.esc || ch === '?' || ch === 'q' || isLeaderKey(buf)) {
-    openOverlay();
+    service.send({ type: 'OVERLAY' });
   }
 }
 
@@ -236,6 +201,7 @@ function renderOverlay() {
 
   drawOverlay({
     sessions,
+    agentMarks,
     selected: overlaySelected,
     confirmKill,
     filter: overlayFilter,
@@ -247,7 +213,6 @@ function renderOverlay() {
 }
 
 function openOverlay() {
-  mode = 'overlay';
   confirmKill = false;
   overlayFilter = null;
 
@@ -260,102 +225,50 @@ function openOverlay() {
   renderOverlay();
 }
 
-function renderPicker() {
-  const verb = spawnResume ? 'adopt' : 'spawn';
-
-  if (mode === 'picker-agent') {
-    pickerSelected = Math.min(pickerSelected, AGENT_PICKS.length - 1);
-
-    drawPicker({
-      title: `${verb}: agent`,
-      items: AGENT_PICKS.map((pick) => pick.label),
-      selected: pickerSelected,
-      input: pickerInput,
-      hint: '↑↓ move · ⏎ select · esc cancel',
-    });
-  } else if (mode === 'picker-dir') {
-    const items = pickMatches(allDirs, pickerInput).map((d) => formatDir(d));
-
-    pickerSelected = Math.min(pickerSelected, Math.max(0, Math.min(items.length, 10) - 1));
-
-    drawPicker({
-      title: `${verb}: directory`,
-      items,
-      selected: pickerSelected,
-      input: pickerInput,
-      hint: 'type to filter · ↑↓ move · ⏎ select · esc cancel',
-    });
-  } else if (mode === 'picker-name') {
-    drawPicker({
-      title: `${verb}: name`,
-      items: [],
-      selected: -1,
-      input: pickerInput,
-      placeholder: basename(spawnDir),
-      hint: `session name for ${formatDir(spawnDir)} · ⏎ accept · esc back`,
-    });
-  } else if (mode === 'picker-eject') {
-    drawPicker({
-      title: 'eject: headless instruction',
-      items: [],
-      selected: -1,
-      input: pickerInput,
-      placeholder: 'continue the task autonomously',
-      hint: 'instruction for the headless run · ⏎ eject · esc back',
-    });
-  } else {
-    drawPicker({
-      title: 'spawn: initial prompt',
-      items: [],
-      selected: -1,
-      input: pickerInput,
-      placeholder: 'optional — ⏎ to start interactive',
-      hint: 'first message for the session · ⏎ spawn · esc back',
-    });
-  }
+function renderEject() {
+  drawPicker({
+    title: 'eject: headless instruction',
+    items: [],
+    selected: -1,
+    input: ejectInput,
+    placeholder: 'continue the task autonomously',
+    hint: 'instruction for the headless run · ⏎ eject · esc back',
+  });
 
   scheduleStatus();
 }
 
-function openAgentPicker(resume = false) {
-  spawnResume = resume;
-  spawnAgent = lastUsedAgent;
-  pickerInput = '';
-
-  pickerSelected = Math.max(
-    0,
-    AGENT_PICKS.findIndex((p) => p.agent === lastUsedAgent),
-  );
-
-  mode = 'picker-agent';
+function openEject(sessionID: string) {
+  ejectTarget = sessionID;
+  ejectInput = '';
 
   stdout.write(ansi.clear);
 
-  renderPicker();
+  renderEject();
 }
 
-async function openDirPicker() {
-  let recent: string[] = [];
-
-  try {
-    const answer = await client.sendRequest('dirs.list');
-
-    const dirs = answer['dirs'];
-
-    if (Array.isArray(dirs)) {
-      recent = dirs.filter((d): d is string => typeof d === 'string');
-    }
-  } catch {}
-
-  allDirs = await collectDirs(recent);
+const picker = new SpawnPicker<MirrorSession>({
+  sendRequest,
+  ptyRows,
+  isLeaderKey,
+  getLastUsedAgent,
+  scheduleStatus,
+  toBase,
+  attach,
+  toMirrorSession,
+  upsertMirror,
+});
 
-  pickerInput = '';
-  pickerSelected = 0;
-  mode = 'picker-dir';
+function openPicker(resume: boolean) {
+  picker.open(resume);
+}
 
-  stdout.write(ansi.clear);
+function sendRequest(m: string, p?: Readonly<Record<string, unknown>>) {
+  return client.sendRequest(m, p);
+}
 
-  renderPicker();
+function getLastUsedAgent(): AgentID {
+  return lastUsedAgent;
 }
 
 async function restoreFleet() {
@@ -372,32 +285,6 @@ async function restoreFleet() {
   }
 }
 
-async function spawnFromPicker(prompt: string) {
-  try {
-    const ok = await client.sendRequest('session.spawn', {
-      cwd: spawnDir,
-      name: spawnName,
-      prompt,
-      cols: cols(),
-      rows: ptyRows(),
-      ...(spawnResume ? { resume: true } : {}),
-      agent: spawnAgent,
-    });
-
-    const spawned = toMirrorSession(ok['session']);
-
-    if (spawned !== null) {
-      upsertMirror(spawned);
-
-      await attach(spawned.id);
-
-      return;
-    }
-  } catch {}
-
-  toBase();
-}
-
 function quit(code = 0): never {
   detachFocused();
 
@@ -411,47 +298,6 @@ function quit(code = 0): never {
   process.exit(code);
 }
 
-const SESSION_STATES: readonly SessionState[] = ['running', 'needs_you', 'done', 'exited'];
-
-function toMirrorSession(value: unknown): MirrorSession | null {
-  if (!isRecord(value)) {
-    return null;
-  }
-
-  const state = SESSION_STATES.find((x) => x === value['state']);
-
-  if (
-    typeof value['id'] !== 'string' ||
-    typeof value['name'] !== 'string' ||
-    typeof value['cwd'] !== 'string' ||
-    state === undefined ||
-    typeof value['unread'] !== 'boolean' ||
-    typeof value['lastMsg'] !== 'string' ||
-    typeof value['createdAt'] !== 'number' ||
-    typeof value['alive'] !== 'boolean'
-  ) {
-    return null;
-  }
-
-  return {
-    id: value['id'],
-    name: value['name'],
-    cwd: value['cwd'],
-    pinned: value['pinned'] === true,
-    lastAttachedAt:
-      typeof value['lastAttachedAt'] === 'number' ? value['lastAttachedAt'] : value['createdAt'],
-    repoRoot: typeof value['repoRoot'] === 'string' ? value['repoRoot'] : value['cwd'],
-    state,
-    unread: value['unread'],
-    lastMsg: value['lastMsg'],
-    createdAt: value['createdAt'],
-    kind: value['kind'] === 'headless' ? 'headless' : 'pty',
-    alive: value['alive'],
-    resumable: typeof value['agentSessionID'] === 'string',
-    agent: value['agent'] === 'grok' || value['agent'] === 'codex' ? value['agent'] : 'claude',
-  };
-}
-
 function upsertMirror(d: Readonly<MirrorSession>) {
   const existing = fleet.find((s) => s.id === d.id);
 
@@ -468,132 +314,92 @@ function upsertMirror(d: Readonly<MirrorSession>) {
     existing.kind = d.kind;
     existing.alive = d.alive;
     existing.resumable = d.resumable;
+    existing.canEject = d.canEject;
     existing.agent = d.agent;
   }
 }
 
 function refreshScreens() {
-  if (mode === 'overlay') {
+  const currentMode = service.getSnapshot().value;
+
+  if (currentMode === 'overlay') {
     renderOverlay();
   }
 
   // Focused session died under us: surface the list instead of a dead screen.
   const f = findFocused();
 
-  if (mode === 'attached' && f !== null && f.state === 'exited') {
-    openOverlay();
+  if (currentMode === 'attached' && f !== null && f.state === 'exited') {
+    service.send({ type: 'OVERLAY' });
   }
 
   scheduleStatus();
 }
 
-function applyDaemonEvent(e: EventMsg) {
-  switch (e.ev) {
-    case 'session.output': {
-      if (mode === 'attached' && e['s'] === focusedID && typeof e['d'] === 'string') {
-        stdout.write(e['d']);
-      }
+function applyDaemonEvent(raw: EventMsg) {
+  const event = parseDaemonEvent(raw);
 
-      return;
-    }
-    case 'session.added': {
-      const d = toMirrorSession(e['session']);
+  if (event === null) {
+    return;
+  }
 
-      if (d !== null) {
-        upsertMirror(d);
+  match(event)
+    .with({ ev: 'session.output' }, (e) => {
+      if (service.getSnapshot().value === 'attached' && e.s === focusedID) {
+        stdout.write(e.d);
       }
-
+    })
+    .with({ ev: 'session.added' }, (e) => {
+      upsertMirror(e.session);
       refreshScreens();
+    })
+    .with({ ev: 'session.state' }, (e) => {
+      const existing = fleet.find((x) => x.id === e.session.id);
 
-      return;
-    }
-    case 'session.state': {
-      const s = fleet.find((x) => x.id === e['s']);
-
-      if (s !== undefined) {
-        const next = SESSION_STATES.find((x) => x === e['state']);
-
-        if (next === 'done' && s.state !== 'done') {
-          doneAt.set(s.id, Date.now());
-        }
-
-        if (next !== undefined) {
-          s.state = next;
-        }
-
-        if (typeof e['alive'] === 'boolean') {
-          s.alive = e['alive'];
-        } else if (next === 'exited') {
-          s.alive = false;
-        }
-
-        if (e['kind'] === 'pty' || e['kind'] === 'headless') {
-          s.kind = e['kind'];
-        }
-
-        if (typeof e['pinned'] === 'boolean') {
-          s.pinned = e['pinned'];
-        }
-
-        if (typeof e['lastAttachedAt'] === 'number') {
-          s.lastAttachedAt = e['lastAttachedAt'];
-        }
-
-        if (typeof e['unread'] === 'boolean') {
-          s.unread = e['unread'];
-        }
-
-        if (typeof e['lastMsg'] === 'string') {
-          s.lastMsg = e['lastMsg'];
-        }
-
-        if (e['agent'] === 'grok' || e['agent'] === 'codex' || e['agent'] === 'claude') {
-          s.agent = e['agent'];
+      if (existing !== undefined) {
+        if (e.session.state === 'done' && existing.state !== 'done') {
+          doneAt.set(e.session.id, Date.now());
         }
 
-        if (typeof e['agentSessionID'] === 'string') {
-          if (!s.resumable) {
-            lastUsedAgent = s.agent;
-          }
-
-          s.resumable = true;
+        if (e.session.resumable && !existing.resumable) {
+          lastUsedAgent = e.session.agent;
         }
       }
 
+      upsertMirror(e.session);
       refreshScreens();
+    })
+    .with({ ev: 'session.renamed' }, (e) => {
+      const s = fleet.find((x) => x.id === e.s);
 
-      return;
-    }
-    case 'session.renamed': {
-      const s = fleet.find((x) => x.id === e['s']);
-
-      if (s !== undefined && typeof e['name'] === 'string') {
-        s.name = e['name'];
+      if (s !== undefined) {
+        s.name = e.name;
       }
 
       refreshScreens();
+    })
+    .with({ ev: 'session.removed' }, (e) => {
+      fleet = fleet.filter((x) => x.id !== e.s);
 
-      return;
-    }
-    case 'session.removed': {
-      fleet = fleet.filter((x) => x.id !== e['s']);
-
-      if (typeof e['s'] === 'string') {
-        doneAt.delete(e['s']);
-      }
+      doneAt.delete(e.s);
 
-      if (focusedID === e['s']) {
+      if (focusedID === e.s) {
         focusedID = null;
       }
 
       refreshScreens();
-      break;
-    }
+    })
 
-    // Desync recovery arrives as ordinary repaint output; permission
-    // events matter to structured clients, not this passthrough TUI.
-    default:
-  }
+    // Desync recovery arrives as ordinary repaint output; permission and
+    // resize events matter to structured clients, not this passthrough TUI.
+    .with(
+      { ev: 'session.resized' },
+      { ev: 'session.desync' },
+      { ev: 'permission.requested' },
+      { ev: 'permission.resolved' },
+      () => {},
+    )
+    .exhaustive();
 }
 
 // Best-effort clipboard: OSC 52 (works through zellij/tmux/ssh) plus any
@@ -617,23 +423,6 @@ function copyToClipboard(text: string) {
 const leader = loadConfig().leader;
 const leaderChords = buildLeaderChords(leader.code);
 
-const KEY = {
-  tab: 0x09,
-  ctrlC: 0x03,
-  ctrlU: 0x15,
-  esc: 0x1b,
-  enter: 0x0d,
-  backspace: 0x7f,
-} as const;
-
-function isUp(buf: Buffer): boolean {
-  return buf.toString() === '\u001B[A' || buf.toString() === '\u001BOA';
-}
-
-function isDown(buf: Buffer): boolean {
-  return buf.toString() === '\u001B[B' || buf.toString() === '\u001BOB';
-}
-
 // A fullscreen session can leave the terminal in an enhanced keyboard
 // encoding, so the leader arrives as a CSI chord instead of its bare byte.
 function isLeaderKey(buf: Buffer): boolean {
@@ -783,7 +572,7 @@ function applyOverlayKey(buf: Buffer) {
   }
 
   if (ch === 'n') {
-    openAgentPicker();
+    service.send({ type: 'SPAWN', resume: false });
 
     return;
   }
@@ -809,7 +598,7 @@ function applyOverlayKey(buf: Buffer) {
   }
 
   if (ch === '?') {
-    openHelp();
+    service.send({ type: 'HELP' });
 
     return;
   }
@@ -820,20 +609,8 @@ function applyOverlayKey(buf: Buffer) {
     return;
   }
 
-  if (
-    ch === 'H' &&
-    sel !== undefined &&
-    sel.kind === 'pty' &&
-    sel.alive &&
-    sel.agent === 'claude'
-  ) {
-    ejectTarget = sel.id;
-    pickerInput = '';
-    mode = 'picker-eject';
-
-    stdout.write(ansi.clear);
-
-    renderPicker();
+  if (ch === 'H' && sel !== undefined && sel.kind === 'pty' && sel.alive && sel.canEject) {
+    service.send({ type: 'EJECT', sessionID: sel.id });
 
     return;
   }
@@ -845,7 +622,7 @@ function applyOverlayKey(buf: Buffer) {
   }
 
   if (ch === 'r') {
-    openAgentPicker(true);
+    service.send({ type: 'SPAWN', resume: true });
 
     return;
   }
@@ -892,96 +669,55 @@ async function yankResume(sessionID: string, eject: boolean) {
       void sendQuiet('session.kill', { session: sessionID });
     }
 
-    if (mode === 'overlay') {
+    if (service.getSnapshot().value === 'overlay') {
       renderOverlay();
     }
   } catch {}
 }
 
-function applyTextKey(buf: Buffer, onSubmit: () => void, onCancel: () => void) {
-  // Pasted chunks arrive as one buffer: split into per-char events so a
-  // trailing newline still submits. Escape sequences stay intact.
-  if (buf.length > 1 && buf[0] !== KEY.esc) {
-    for (const ch of buf.toString()) {
-      applyTextKey(Buffer.from(ch), onSubmit, onCancel);
+function applyEjectKey(buf: Buffer) {
+  const edit = planTextEdit(buf, ejectInput, { isLeaderKey, moves: false });
 
-      if (mode === 'attached' || ch === '\r') {
-        return;
-      }
+  switch (edit.kind) {
+    case 'none':
+    case 'move': {
+      return;
     }
-
-    return;
-  }
-
-  if (buf[0] === KEY.esc && buf.length === 1) {
-    onCancel();
-
-    return;
-  }
-
-  if (isLeaderKey(buf)) {
-    toBase();
-
-    return;
-  }
-
-  if (buf[0] === KEY.enter) {
-    onSubmit();
-
-    return;
-  }
-
-  if (buf[0] === KEY.backspace) {
-    pickerInput = pickerInput.slice(0, -1);
-
-    renderPicker();
-
-    return;
-  }
-
-  if (buf[0] === KEY.ctrlU) {
-    pickerInput = '';
-
-    renderPicker();
-
-    return;
-  }
-
-  if (mode === 'picker-dir' || mode === 'picker-agent') {
-    if (isDown(buf)) {
-      pickerSelected++;
-
-      renderPicker();
+    case 'cancel': {
+      service.send({ type: 'OVERLAY' });
 
       return;
     }
-
-    if (isUp(buf)) {
-      pickerSelected = Math.max(0, pickerSelected - 1);
-
-      renderPicker();
+    case 'leader': {
+      toBase();
 
       return;
     }
-  }
-
-  const text = buf.toString();
-  let printable = true;
+    case 'submit': {
+      ejectInput = edit.value;
+      void yankToHeadless(ejectInput.trim());
 
-  for (const c of text) {
-    if (c < ' ' || c === '\u007F') {
-      printable = false;
-      break;
+      return;
     }
-  }
+    case 'input': {
+      ejectInput = edit.value;
 
-  if (printable) {
-    pickerInput += text;
-
-    renderPicker();
+      renderEject();
+    }
   }
 }
 
+const service = createActor(
+  buildClientMachine({
+    openHome,
+    openAttached,
+    openOverlay,
+    openHelp,
+    openPicker,
+    openEject,
+  }),
+);
+
 const boot = await bootDaemonClient();
 
 let client = boot.client;
@@ -1050,7 +786,7 @@ async function restartDaemon() {
   await sendQuiet('fleet.restore', { cols: cols(), rows: ptyRows() });
   await refreshMirror().catch(() => {});
 
-  openOverlay();
+  service.send({ type: 'OVERLAY' });
 }
 
 process.stdin.setRawMode(true);
@@ -1061,10 +797,10 @@ process.stdin.resume();
 const stdinDecoder = new TextDecoder('utf-8');
 
 process.stdin.on('data', (buf: Buffer) => {
-  switch (mode) {
+  switch (service.getSnapshot().value) {
     case 'attached': {
       if (isLeaderKey(buf)) {
-        openOverlay();
+        service.send({ type: 'OVERLAY' });
 
         return;
       }
@@ -1080,7 +816,7 @@ process.stdin.on('data', (buf: Buffer) => {
     }
     case 'home': {
       if (isLeaderKey(buf)) {
-        openOverlay();
+        service.send({ type: 'OVERLAY' });
 
         return;
       }
@@ -1088,13 +824,13 @@ process.stdin.on('data', (buf: Buffer) => {
       const ch = buf.toString();
 
       if (ch === 'n') {
-        openAgentPicker();
+        service.send({ type: 'SPAWN', resume: false });
 
         return;
       }
 
       if (ch === 'r') {
-        openAgentPicker(true);
+        service.send({ type: 'SPAWN', resume: true });
 
         return;
       }
@@ -1121,146 +857,43 @@ process.stdin.on('data', (buf: Buffer) => {
 
       return;
     }
-    case 'picker-agent': {
-      applyTextKey(
-        buf,
-        () => {
-          spawnAgent = AGENT_PICKS[pickerSelected]?.agent ?? 'claude';
-          void openDirPicker();
-        },
-        () => {
-          toBase();
-        },
-      );
-
-      return;
-    }
-    case 'picker-dir': {
-      applyTextKey(
-        buf,
-        () => {
-          const items = pickMatches(allDirs, pickerInput);
-          const raw = pickerInput.trim();
-          let chosen = items[pickerSelected] ?? null;
-
-          if (chosen === null && (raw.startsWith('/') || raw.startsWith('~'))) {
-            chosen = raw.replace(/^~/u, process.env['HOME'] ?? '~');
-          }
-
-          if (chosen === null) {
-            return;
-          }
-
-          spawnDir = chosen;
-          pickerInput = '';
-          mode = 'picker-name';
-
-          stdout.write(ansi.clear);
-
-          renderPicker();
-        },
-        () => {
-          pickerInput = '';
-
-          pickerSelected = Math.max(
-            0,
-            AGENT_PICKS.findIndex((p) => p.agent === spawnAgent),
-          );
-
-          mode = 'picker-agent';
-
-          stdout.write(ansi.clear);
-
-          renderPicker();
-        },
-      );
-
-      return;
-    }
-    case 'picker-name': {
-      applyTextKey(
-        buf,
-        () => {
-          spawnName = pickerInput.trim();
-          pickerInput = '';
-
-          // Adopt skips the prompt step: claude --resume opens its own
-          // session picker inside the new PTY.
-          if (spawnResume) {
-            void spawnFromPicker('');
-
-            return;
-          }
-
-          mode = 'picker-prompt';
-
-          stdout.write(ansi.clear);
-
-          renderPicker();
-        },
-        () => {
-          pickerInput = '';
-          mode = 'picker-dir';
-
-          stdout.write(ansi.clear);
-
-          renderPicker();
-        },
-      );
-
-      return;
-    }
-    case 'picker-prompt': {
-      applyTextKey(
-        buf,
-        () => {
-          void spawnFromPicker(pickerInput.trim());
-        },
-        () => {
-          pickerInput = '';
-          mode = 'picker-name';
-
-          stdout.write(ansi.clear);
-
-          renderPicker();
-        },
-      );
+    case 'picker': {
+      picker.applyKey(buf);
 
       return;
     }
     case 'picker-eject': {
-      applyTextKey(
-        buf,
-        () => {
-          void yankToHeadless(pickerInput.trim());
-        },
-        () => {
-          openOverlay();
-        },
-      );
+      applyEjectKey(buf);
     }
   }
 });
 
 stdout.on('resize', () => {
-  if (mode === 'attached' && focusedID !== null) {
+  const currentMode = service.getSnapshot().value;
+
+  if (currentMode === 'attached' && focusedID !== null) {
     void sendQuiet('session.resize', { session: focusedID, cols: cols(), rows: ptyRows() });
   }
 
-  if (mode === 'home') {
+  if (currentMode === 'home') {
     drawHome(fleetCount, leader.label);
   }
 
-  if (mode === 'overlay') {
+  if (currentMode === 'overlay') {
     stdout.write(ansi.clear);
 
     renderOverlay();
   }
 
-  if (mode.startsWith('picker')) {
+  if (currentMode === 'picker') {
+    stdout.write(ansi.clear);
+    picker.render();
+  }
+
+  if (currentMode === 'picker-eject') {
     stdout.write(ansi.clear);
 
-    renderPicker();
+    renderEject();
   }
 
   scheduleStatus();
@@ -1282,6 +915,4 @@ process.on('SIGHUP', () => quit());
 
 // ---- start ----
 stdout.write(ansi.altScreenOn);
-
-drawHome(fleetCount, leader.label);
-scheduleStatus();
+service.start();