@zgeoff/atc 0.1.8 → 0.1.10

package/src/index.ts

@@ -10,29 +10,39 @@ import { countSessionStates, sortGroupedSessionViews, sortSessionViews } from '.
 import type { SessionState } from './sessions';
 import { ansi, cols, drawHelp, drawHome, drawOverlay, drawPicker, drawStatusBar, rows } from './ui';
 
+type AgentKind = 'claude' | 'grok';
+
 type Mode =
   | 'home'
   | 'attached'
   | 'overlay'
   | 'help'
+  | 'picker-agent'
   | 'picker-dir'
   | 'picker-name'
-  | 'picker-group'
   | 'picker-prompt'
   | 'picker-eject';
 
+const AGENT_PICKS = [
+  { agent: 'claude' as const, label: 'Claude' },
+  { agent: 'grok' as const, label: 'Grok' },
+];
+
 interface MirrorSession {
   id: string;
   name: string;
   cwd: string;
-  group?: string;
+  pinned: boolean;
+  lastAttachedAt: number;
+  repoRoot: string;
   state: SessionState;
   unread: boolean;
   lastMsg: string;
   createdAt: number;
-  kind: 'pty' | 'jsonl';
+  kind: 'pty' | 'headless';
   alive: boolean;
   resumable: boolean;
+  agent: AgentKind;
 }
 
 let mode: Mode = 'home';
@@ -56,8 +66,9 @@ let pickerInput = '';
 let pickerSelected = 0;
 let spawnDir = '';
 let spawnName = '';
-let spawnGroup = '';
 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;
@@ -202,8 +213,11 @@ function applyHelpKey(buf: Buffer) {
 // fzf-style overlay search: null when inactive, the pattern while active.
 let overlayFilter: string | null = null;
 
+// Flat list by default; g toggles clustering under repository headers.
+let overlayGrouped = false;
+
 function pickOverlaySessions(): MirrorSession[] {
-  const sorted = sortGroupedSessionViews(fleet);
+  const sorted = overlayGrouped ? sortGroupedSessionViews(fleet) : sortSessionViews(fleet);
 
   if (overlayFilter === null || overlayFilter === '') {
     return sorted;
@@ -211,9 +225,7 @@ function pickOverlaySessions(): MirrorSession[] {
 
   const f = overlayFilter;
 
-  return sorted.filter(
-    (s) => findFuzzyScore(`${s.name} ${s.group ?? ''} ${formatDir(s.cwd)}`, f) !== null,
-  );
+  return sorted.filter((s) => findFuzzyScore(`${s.name} ${formatDir(s.cwd)}`, f) !== null);
 }
 
 function renderOverlay() {
@@ -227,6 +239,7 @@ function renderOverlay() {
     confirmKill,
     filter: overlayFilter,
     stale: daemonStale,
+    grouped: overlayGrouped,
   });
 
   scheduleStatus();
@@ -237,7 +250,7 @@ function openOverlay() {
   confirmKill = false;
   overlayFilter = null;
 
-  const focusedIndex = sortGroupedSessionViews(fleet).findIndex((s) => s.id === focusedID);
+  const focusedIndex = pickOverlaySessions().findIndex((s) => s.id === focusedID);
 
   overlaySelected = Math.max(0, focusedIndex);
 
@@ -249,7 +262,17 @@ function openOverlay() {
 function renderPicker() {
   const verb = spawnResume ? 'adopt' : 'spawn';
 
-  if (mode === 'picker-dir') {
+  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));
@@ -270,18 +293,6 @@ function renderPicker() {
       placeholder: basename(spawnDir),
       hint: `session name for ${formatDir(spawnDir)} · ⏎ accept · esc back`,
     });
-  } else if (mode === 'picker-group') {
-    const groups = [...new Set(fleet.map((s) => s.group).filter((g) => g !== undefined))];
-    const known = groups.length === 0 ? '' : ` · existing: ${groups.slice(0, 4).join(', ')}`;
-
-    drawPicker({
-      title: `${verb}: group`,
-      items: [],
-      selected: -1,
-      input: pickerInput,
-      placeholder: 'optional — ⏎ to skip',
-      hint: `group for the overlay hierarchy${known} · ⏎ accept · esc back`,
-    });
   } else if (mode === 'picker-eject') {
     drawPicker({
       title: 'eject: headless instruction',
@@ -305,10 +316,19 @@ function renderPicker() {
   scheduleStatus();
 }
 
-async function openDirPicker(resume = false) {
+function openAgentPicker(resume = false) {
   spawnResume = resume;
-  spawnGroup = '';
+  spawnAgent = lastUsedAgent;
+  pickerInput = '';
+  pickerSelected = lastUsedAgent === 'grok' ? 1 : 0;
+  mode = 'picker-agent';
+
+  stdout.write(ansi.clear);
+
+  renderPicker();
+}
 
+async function openDirPicker() {
   let recent: string[] = [];
 
   try {
@@ -355,7 +375,7 @@ async function spawnFromPicker(prompt: string) {
       cols: cols(),
       rows: ptyRows(),
       ...(spawnResume ? { resume: true } : {}),
-      ...(spawnGroup === '' ? {} : { group: spawnGroup }),
+      agent: spawnAgent,
     });
 
     const spawned = toMirrorSession(ok['session']);
@@ -411,14 +431,18 @@ function toMirrorSession(value: unknown): MirrorSession | null {
     id: value['id'],
     name: value['name'],
     cwd: value['cwd'],
-    ...(typeof value['group'] === 'string' ? { group: value['group'] } : {}),
+    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'] === 'jsonl' ? 'jsonl' : 'pty',
+    kind: value['kind'] === 'headless' ? 'headless' : 'pty',
     alive: value['alive'],
-    resumable: typeof value['claudeId'] === 'string',
+    resumable: typeof value['agentSessionID'] === 'string',
+    agent: value['agent'] === 'grok' ? 'grok' : 'claude',
   };
 }
 
@@ -429,12 +453,16 @@ function upsertMirror(d: Readonly<MirrorSession>) {
     fleet.push({ ...d });
   } else {
     existing.name = d.name;
+    existing.pinned = d.pinned;
+    existing.lastAttachedAt = d.lastAttachedAt;
+    existing.repoRoot = d.repoRoot;
     existing.state = d.state;
     existing.unread = d.unread;
     existing.lastMsg = d.lastMsg;
     existing.kind = d.kind;
     existing.alive = d.alive;
     existing.resumable = d.resumable;
+    existing.agent = d.agent;
   }
 }
 
@@ -493,16 +521,16 @@ function applyDaemonEvent(e: EventMsg) {
           s.alive = false;
         }
 
-        if (e['kind'] === 'pty' || e['kind'] === 'jsonl') {
+        if (e['kind'] === 'pty' || e['kind'] === 'headless') {
           s.kind = e['kind'];
         }
 
-        if (typeof e['group'] === 'string') {
-          if (e['group'] === '') {
-            delete s.group;
-          } else {
-            s.group = e['group'];
-          }
+        if (typeof e['pinned'] === 'boolean') {
+          s.pinned = e['pinned'];
+        }
+
+        if (typeof e['lastAttachedAt'] === 'number') {
+          s.lastAttachedAt = e['lastAttachedAt'];
         }
 
         if (typeof e['unread'] === 'boolean') {
@@ -513,7 +541,15 @@ function applyDaemonEvent(e: EventMsg) {
           s.lastMsg = e['lastMsg'];
         }
 
-        if (typeof e['claudeId'] === 'string') {
+        if (e['agent'] === 'grok' || e['agent'] === 'claude') {
+          s.agent = e['agent'];
+        }
+
+        if (typeof e['agentSessionID'] === 'string') {
+          if (!s.resumable) {
+            lastUsedAgent = s.agent;
+          }
+
           s.resumable = true;
         }
       }
@@ -741,7 +777,27 @@ function applyOverlayKey(buf: Buffer) {
   }
 
   if (ch === 'n') {
-    void openDirPicker();
+    openAgentPicker();
+
+    return;
+  }
+
+  if (ch === 'g') {
+    overlayGrouped = !overlayGrouped;
+
+    stdout.write(ansi.clear);
+
+    renderOverlay();
+
+    return;
+  }
+
+  if (ch === 'p' && sel !== undefined) {
+    // Flipped locally too so the repaint is immediate; the daemon's state
+    // event confirms it.
+    sel.pinned = !sel.pinned;
+    void sendQuiet('session.update', { session: sel.id, pinned: sel.pinned });
+    renderOverlay();
 
     return;
   }
@@ -758,7 +814,7 @@ function applyOverlayKey(buf: Buffer) {
     return;
   }
 
-  if (ch === 'H' && sel !== undefined && sel.kind === 'pty' && sel.alive) {
+  if (ch === 'H' && sel !== undefined && sel.kind === 'pty' && sel.alive && sel.agent !== 'grok') {
     ejectTarget = sel.id;
     pickerInput = '';
     mode = 'picker-eject';
@@ -770,14 +826,14 @@ function applyOverlayKey(buf: Buffer) {
     return;
   }
 
-  if (ch === 'P' && sel !== undefined && sel.resumable && (sel.kind === 'jsonl' || !sel.alive)) {
+  if (ch === 'P' && sel !== undefined && sel.resumable && (sel.kind === 'headless' || !sel.alive)) {
     void adoptSession(sel.id);
 
     return;
   }
 
   if (ch === 'r') {
-    void openDirPicker(true);
+    openAgentPicker(true);
 
     return;
   }
@@ -879,7 +935,7 @@ function applyTextKey(buf: Buffer, onSubmit: () => void, onCancel: () => void) {
     return;
   }
 
-  if (mode === 'picker-dir') {
+  if (mode === 'picker-dir' || mode === 'picker-agent') {
     if (isDown(buf)) {
       pickerSelected++;
 
@@ -919,6 +975,7 @@ const boot = await bootDaemonClient();
 let client = boot.client;
 let daemonStale = boot.stale;
 
+lastUsedAgent = boot.lastUsedAgent;
 client.onEvent = applyDaemonEvent;
 
 await refreshMirror();
@@ -975,6 +1032,7 @@ async function restartDaemon() {
 
   client = next.client;
   daemonStale = next.stale;
+  lastUsedAgent = next.lastUsedAgent;
   client.onEvent = applyDaemonEvent;
 
   await sendQuiet('fleet.restore', { cols: cols(), rows: ptyRows() });
@@ -1018,13 +1076,13 @@ process.stdin.on('data', (buf: Buffer) => {
       const ch = buf.toString();
 
       if (ch === 'n') {
-        void openDirPicker();
+        openAgentPicker();
 
         return;
       }
 
       if (ch === 'r') {
-        void openDirPicker(true);
+        openAgentPicker(true);
 
         return;
       }
@@ -1051,6 +1109,20 @@ 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,
@@ -1075,28 +1147,10 @@ process.stdin.on('data', (buf: Buffer) => {
 
           renderPicker();
         },
-        () => {
-          toBase();
-        },
-      );
-
-      return;
-    }
-    case 'picker-name': {
-      applyTextKey(
-        buf,
-        () => {
-          spawnName = pickerInput.trim();
-          pickerInput = '';
-          mode = 'picker-group';
-
-          stdout.write(ansi.clear);
-
-          renderPicker();
-        },
         () => {
           pickerInput = '';
-          mode = 'picker-dir';
+          pickerSelected = spawnAgent === 'grok' ? 1 : 0;
+          mode = 'picker-agent';
 
           stdout.write(ansi.clear);
 
@@ -1106,11 +1160,11 @@ process.stdin.on('data', (buf: Buffer) => {
 
       return;
     }
-    case 'picker-group': {
+    case 'picker-name': {
       applyTextKey(
         buf,
         () => {
-          spawnGroup = pickerInput.trim();
+          spawnName = pickerInput.trim();
           pickerInput = '';
 
           // Adopt skips the prompt step: claude --resume opens its own
@@ -1129,7 +1183,7 @@ process.stdin.on('data', (buf: Buffer) => {
         },
         () => {
           pickerInput = '';
-          mode = 'picker-name';
+          mode = 'picker-dir';
 
           stdout.write(ansi.clear);
 
@@ -1147,7 +1201,7 @@ process.stdin.on('data', (buf: Buffer) => {
         },
         () => {
           pickerInput = '';
-          mode = 'picker-group';
+          mode = 'picker-name';
 
           stdout.write(ansi.clear);
 

package/src/mcp-server.ts

@@ -43,13 +43,18 @@ const TOOLS: readonly MCPTool[] = [
   {
     name: 'atc_session_spawn',
     description:
-      'Spawn a new Claude Code session in a directory. Returns the new session descriptor. Give it a prompt to start it working immediately.',
+      'Spawn a new session in a directory. Optional agent is claude or grok; omitted agent is always Claude, never the TUI last-used value. Returns the new session descriptor. Give it a prompt to start it working immediately.',
     inputSchema: {
       type: 'object',
       properties: {
         cwd: { type: 'string', description: 'Absolute path of the working directory' },
         name: { type: 'string', description: 'Session name; defaults to the directory basename' },
         prompt: { type: 'string', description: 'First message for the session' },
+        agent: {
+          type: 'string',
+          enum: ['claude', 'grok'],
+          description: 'Which agent CLI to spawn; defaults to claude',
+        },
       },
       required: ['cwd'],
       additionalProperties: false,
@@ -72,13 +77,13 @@ const TOOLS: readonly MCPTool[] = [
   {
     name: 'atc_session_update',
     description:
-      'Rename and/or regroup a session. Renames stick against auto-summaries; an empty group clears the grouping. Use this to organise the fleet: name sessions after their task and group related work.',
+      'Rename and/or pin a session. Renames stick against auto-summaries; pinned sessions lead every list. Use this to organise the fleet: name sessions after their task.',
     inputSchema: {
       type: 'object',
       properties: {
         session: { type: 'string', description: 'The atc session id' },
         name: { type: 'string', description: 'New display name; omit to keep' },
-        group: { type: 'string', description: 'New group; empty string clears, omit to keep' },
+        pinned: { type: 'boolean', description: 'Pin or unpin; omit to keep' },
       },
       required: ['session'],
       additionalProperties: false,
@@ -236,10 +241,17 @@ async function runTool(
       return JSON.stringify(ok['sessions'], null, 2);
     }
     case 'atc_session_spawn': {
+      const rawAgent = args['agent'];
+
+      if (rawAgent !== undefined && rawAgent !== 'claude' && rawAgent !== 'grok') {
+        throw new Error("agent must be 'claude' or 'grok'");
+      }
+
       const ok = await client.sendRequest('session.spawn', {
         cwd: args['cwd'],
         ...(typeof args['name'] === 'string' ? { name: args['name'] } : {}),
         ...(typeof args['prompt'] === 'string' ? { prompt: args['prompt'] } : {}),
+        ...(rawAgent === 'claude' || rawAgent === 'grok' ? { agent: rawAgent } : {}),
         cols: 100,
         rows: 30,
       });
@@ -258,7 +270,7 @@ async function runTool(
       await client.sendRequest('session.update', {
         session: args['session'],
         ...(typeof args['name'] === 'string' ? { name: args['name'] } : {}),
-        ...(typeof args['group'] === 'string' ? { group: args['group'] } : {}),
+        ...(typeof args['pinned'] === 'boolean' ? { pinned: args['pinned'] } : {}),
       });
 
       return 'updated';

package/src/normalize-hook-event.ts

@@ -0,0 +1,11 @@
+/**
+ * Canonicalize a hook event name to PascalCase. Claude already sends
+ * PascalCase (`SessionStart`); Grok sends snake_case (`session_start`).
+ * Restore stagger and the adapter switch compare the PascalCase form.
+ */
+export function normalizeHookEventName(raw: string): string {
+  return raw
+    .split('_')
+    .map((part) => `${part.charAt(0).toUpperCase()}${part.slice(1)}`)
+    .join('');
+}

package/src/pick-tab-target.ts

@@ -4,9 +4,11 @@ import { sortSessionViews } from './sessions';
 interface TabCandidate {
   readonly id: string;
   readonly state: SessionState;
+  readonly pinned: boolean;
+  readonly lastAttachedAt: number;
   readonly createdAt: number;
   readonly alive: boolean;
-  readonly kind: 'pty' | 'jsonl';
+  readonly kind: 'pty' | 'headless';
 }
 
 /**

package/src/print-grok-hook-file.ts

@@ -0,0 +1,27 @@
+import { buildCLICommand } from './build-cli-command';
+
+const GROK_HOOK_EVENTS = [
+  'SessionStart',
+  'SessionEnd',
+  'UserPromptSubmit',
+  'Stop',
+  'StopFailure',
+  'StopCancelled',
+  'Notification',
+] as const;
+
+/**
+ * Print the Grok hook file to stdout. The operator copies it to
+ * `$GROK_HOME/hooks/atc-reporter.json`; atc never writes that path.
+ */
+export function printGrokHookFile(): void {
+  process.stdout.write(buildGrokHookFile());
+}
+
+function buildGrokHookFile(): string {
+  const cmd = buildCLICommand('hook-report');
+  const entry = [{ hooks: [{ type: 'command', command: cmd, timeout: 5 }] }];
+  const hooks = Object.fromEntries(GROK_HOOK_EVENTS.map((event) => [event, entry]));
+
+  return `${JSON.stringify({ hooks }, null, 2)}\n`;
+}

package/src/protocol.ts

@@ -5,7 +5,7 @@ import { isRecord } from './report';
  * per line. Three message kinds, distinguished by which fields are present —
  * request (id + m), response (id + ok or err), event (ev).
  */
-export const PROTOCOL_V = 1;
+export const PROTOCOL_V = 2;
 
 // Control lines are capped before buffering; PTY output is split into chunks
 // so a queued response is delayed by at most one chunk.

package/src/resolve-repo-root.ts

@@ -0,0 +1,51 @@
+import { readFileSync, statSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+
+/**
+ * The repository a directory belongs to, for clustering sessions in the
+ * overlay. Walks toward the filesystem root looking for a `.git` entry: a
+ * directory marks the repository root itself, and a linked worktree's `.git`
+ * file points back at the main repository, so worktrees cluster with it. A
+ * directory outside any repository resolves to itself.
+ */
+export function resolveRepoRoot(cwd: string): string {
+  let dir = cwd;
+
+  while (true) {
+    const marker = join(dir, '.git');
+    const stat = statSync(marker, { throwIfNoEntry: false });
+
+    if (stat !== undefined && stat.isDirectory()) {
+      return dir;
+    }
+
+    if (stat !== undefined && stat.isFile()) {
+      return findMainRoot(marker) ?? dir;
+    }
+
+    const parent = dirname(dir);
+
+    if (parent === dir) {
+      return cwd;
+    }
+
+    dir = parent;
+  }
+}
+
+// A linked worktree's `.git` file reads `gitdir: <main>/.git/worktrees/<name>`.
+function findMainRoot(gitFile: string): string | null {
+  try {
+    const gitdir = /^gitdir:\s*(?<dir>.+)$/mu
+      .exec(readFileSync(gitFile, 'utf8'))
+      ?.groups?.['dir']?.trim();
+
+    if (gitdir === undefined) {
+      return null;
+    }
+
+    return /^(?<root>.+)\/\.git\/worktrees\/[^/]+$/u.exec(gitdir)?.groups?.['root'] ?? null;
+  } catch {
+    return null;
+  }
+}