@zgeoff/atc 0.1.8 → 0.1.10

package/src/ui.ts

@@ -1,5 +1,8 @@
+import type { AgentKind } from './agent-adapter';
 import { formatDir } from './dirs';
+import { formatOverlayAgentMark } from './format-overlay-agent-mark';
 import { RESET_INPUT_MODES } from './reset-input-modes';
+import { PINNED_GROUP_KEY } from './sessions';
 import type { SessionState } from './sessions';
 
 // The slice of a session the drawing layer needs; satisfied by both the
@@ -158,9 +161,11 @@ function dimRow(width: number, text: string): Row {
 // Selection-dependent hints need the liveness facts of each row.
 export interface OverlaySessionView extends SessionView {
   readonly alive: boolean;
-  readonly kind: 'pty' | 'jsonl';
+  readonly kind: 'pty' | 'headless';
   readonly resumable: boolean;
-  readonly group?: string;
+  readonly agent: AgentKind;
+  readonly pinned: boolean;
+  readonly repoRoot: string;
 }
 
 export interface OverlayView {
@@ -169,6 +174,7 @@ export interface OverlayView {
   confirmKill: boolean;
   filter: string | null;
   stale: boolean;
+  grouped: boolean;
 }
 
 export function drawOverlay(view: OverlayView) {
@@ -181,32 +187,36 @@ export function drawOverlay(view: OverlayView) {
     rowsList.push(dimRow(width, empty));
   }
 
-  // Sessions cluster under dim headers when more than one group exists: an
-  // explicit group wins, sessions without one fall back to their spawn
-  // directory. The rows keep the sorted order, so urgent groups lead.
-  const grouped = new Set(view.sessions.map((s) => s.group ?? s.cwd)).size > 1;
+  // The grouped view clusters sessions under dim repository headers, with
+  // pinned sessions leading in their own cluster; the flat view shows a
+  // directory column instead. The rows keep the sorted order either way.
   let lastKey: string | null = null;
 
   for (const [i, s] of view.sessions.entries()) {
-    const key = s.group ?? s.cwd;
+    const key = s.pinned ? PINNED_GROUP_KEY : s.repoRoot;
 
-    if (grouped && key !== lastKey) {
+    if (view.grouped && key !== lastKey) {
       lastKey = key;
 
-      rowsList.push(dimRow(width, `▸ ${s.group ?? formatDir(s.cwd)}`));
+      rowsList.push(dimRow(width, `▸ ${s.pinned ? 'pinned' : formatDir(s.repoRoot)}`));
     }
 
     const sel = i === view.selected;
     const name = truncate(s.name, 16).padEnd(16);
     const state = STATE_LABEL[s.state].padEnd(9);
-    const dir = grouped ? '' : ` ${truncate(formatDir(s.cwd), 18).padEnd(18)}`;
-    const msgWidth = Math.max(4, width - 4 - 2 - 17 - 10 - (grouped ? 0 : 19));
+    const dir = view.grouped ? '' : ` ${truncate(formatDir(s.cwd), 18).padEnd(18)}`;
+    const msgWidth = Math.max(4, width - 4 - 4 - 17 - 10 - (view.grouped ? 0 : 19));
     const msg = truncate(s.lastMsg, msgWidth).padEnd(msgWidth);
     const unread = s.unread ? `${ESC}[1;33m!${ESC}[0m` : ' ';
+    const pin = s.pinned ? `${ESC}[93m⋆${ESC}[0m` : ' ';
+    const mark = formatOverlayAgentMark(s.agent);
+    const styledMark = mark === 'g' ? `${ESC}[90m${mark}${ESC}[0m` : mark;
     const body = `${name} ${state}${dir} ${msg}`;
     const styledBody = sel ? `${ESC}[7m${body}${ESC}[0m` : body;
 
-    rowsList.push(boxRow(width, `${GLYPH[s.state]}${unread}${styledBody}`, 2 + body.length));
+    rowsList.push(
+      boxRow(width, `${GLYPH[s.state]}${unread}${pin}${styledMark}${styledBody}`, 4 + body.length),
+    );
   }
 
   rowsList.push(boxDivider(width));
@@ -239,18 +249,18 @@ export function drawOverlay(view: OverlayView) {
   drawBox(rowsList);
 }
 
-const GLOBAL_HINT = 'n new · ? keys';
+const GLOBAL_HINT = 'g groups · n new · ? keys';
 
 // Only the actions valid for the selected row appear; the full reference
-// lives behind ?.
-function buildOverlayHint(s: OverlaySessionView | undefined): string {
+// lives behind ?. Grok has no headless handoff, so H is omitted there.
+export function buildOverlayHint(s: OverlaySessionView | undefined): string {
   if (s === undefined) {
     return GLOBAL_HINT;
   }
 
   const actions: string[] = [];
 
-  if (s.kind === 'jsonl' && s.alive) {
+  if (s.kind === 'headless' && s.alive) {
     actions.push('P reattach', 'K kill');
   } else if (s.alive) {
     actions.push('⏎ attach');
@@ -259,7 +269,11 @@ function buildOverlayHint(s: OverlaySessionView | undefined): string {
       actions.push('a ack');
     }
 
-    actions.push('H headless', 'y yank', 'Y eject', 'K kill');
+    if (s.agent !== 'grok') {
+      actions.push('H headless');
+    }
+
+    actions.push('y yank', 'Y eject', 'K kill');
   } else {
     if (s.resumable) {
       actions.push('P revive', 'y yank');
@@ -268,6 +282,10 @@ function buildOverlayHint(s: OverlaySessionView | undefined): string {
     actions.push('K forget');
   }
 
+  const pinAction = s.pinned ? 'p unpin' : 'p pin';
+
+  actions.push(pinAction);
+
   return `${actions.join(' · ')} ▏ ${GLOBAL_HINT}`;
 }
 
@@ -278,11 +296,14 @@ export function drawHelp() {
     '⏎  attach the selected session',
     '⇥  attach the most urgent needs-you, else latest done',
     'a  ack its notification without attaching',
-    'H  eject to a headless run',
+    'H  eject to a headless run (Claude only)',
     'P  revive a dead or headless session',
     'y  yank the resume command to the clipboard',
     'Y  yank the resume command, then kill here',
     'K  kill (K again on a dead session forgets it)',
+    'p  pin or unpin — pinned sessions stay on top',
+    'g  toggle grouping by repository',
+    '    Grok rows show a dim g after the pin mark',
     'n  new session',
     'r  adopt an external session',
     '/  filter · ↑↓/jk move · q quit',
@@ -350,10 +371,10 @@ export function drawHome(fleetCount = 0, leaderLabel = '^Space') {
   out(ansi.clear + ansi.hideCursor);
 
   const msgs = [
-    'atc — control tower for claude sessions',
+    'atc — control tower for Claude and Grok sessions',
     '',
     'n       spawn a session',
-    'r       adopt an existing session (claude --resume)',
+    'r       adopt an existing session',
     ...(fleetCount > 0 ? [`R       restore last fleet (${fleetCount} sessions)`] : []),
     `${leaderLabel.padEnd(7)} session list`,
     'q       quit',