@ucsandman/legcli 0.7.0 → 0.8.0

package/src/attach.mjs

@@ -15,7 +15,7 @@ import { fileURLToPath } from 'node:url'
 import { sanitizeEnv } from './env.mjs'
 import { home } from './store.mjs'
 import { get as getAdapter } from './adapters/index.mjs'
-import { AGENTS, HANDOFF_ORDER_CAPABILITY, newSessionId, createSession, readSession, updateSession, appendEvent, takeControl, sessionDir, listSessions, reapLost, isActive, workRoot } from './sessions.mjs'
+import { SUPERVISED_AGENTS, HANDOFF_ORDER_CAPABILITY, newSessionId, createSession, readSession, updateSession, appendEvent, takeControl, sessionDir, listSessions, reapLost, isActive, workRoot } from './sessions.mjs'
 import { ensure as ensureWorktree, remove as removeWorktree } from './worktree.mjs'
 import { canonPath, realPath } from './fsx.mjs'
 import { whoami, readShare, isOn as shareIsOn } from './share.mjs'
@@ -26,6 +26,7 @@ import { writeSettings, userStatusLine, transcriptTail as claudeTail } from './t
 import { ensureTrust, trustLine } from './trust.mjs'
 import { findRollout, createTail, parseLines, readCodexUsage, transcriptTail as codexTail } from './taps/codex.mjs'
 import { scanLog, promptsSince, logSize } from './taps/agy.mjs'
+import { fetchGrokUsage, scanLog as scanGrokLog, promptsSince as grokPromptsSince } from './taps/grok.mjs'
 import { fetchClaudeUsage } from './taps/claude-usage.mjs'
 import { saveSessionBundle, resumePrompt } from './bundle.mjs'
 import { endSessionPointer } from './resume.mjs'
@@ -33,7 +34,7 @@ import { openBoard, pidfile } from './launcher.mjs'
 import { LAYOUT } from './accounts.mjs'
 import { captureLive } from './live-capture.mjs'
 import { waitForReset, fmtCountdown } from './wait.mjs'
-import { readPreferences, normalizeHandoffOrder } from './preferences.mjs'
+import { readPreferences, normalizeHandoffOrder, resolveAutoApprove } from './preferences.mjs'
 
 const SRC = dirname(fileURLToPath(import.meta.url))
 const SERVER = join(SRC, 'server.mjs')
@@ -56,7 +57,7 @@ export function isCurrentLeg(session, { pid, agent, account }) {
 // ---- board ----
 function health(port, host = '127.0.0.1') {
   return new Promise((res) => {
-    const req = http.get({ host, port, path: '/api/health', timeout: 1500 }, (r) => {
+    const req = http.get({ host, port, path: '/api/health', timeout: 4000 }, (r) => {
       let d = ''
       r.on('data', (c) => { d += c })
       r.on('end', () => {
@@ -84,11 +85,12 @@ export async function ensureBoard({ open = true } = {}) {
   child.unref()
   const t0 = Date.now()
   while (Date.now() - t0 < 15000) {
-    if (await health(port, host)) {
+    const h = await health(port, host)
+    if (h) {
       // only claim the pidfile for a child we actually started: under a race,
       // another `baton` won the port and ours died on EADDRINUSE — writing our
       // dead pid would make `baton down` kill nothing and report "not running"
-      const ours = child.exitCode === null && Boolean(child.pid)
+      const ours = h.pid ? h.pid === child.pid : (child.exitCode === null && Boolean(child.pid))
       if (ours) writeFileSync(pidfile(), JSON.stringify({ pid: child.pid, port, bind: host, children: [child.pid], detached: true, started_by: 'attach', started_at: new Date().toISOString() }, null, 2) + '\n')
       if (open) openBoard(url)
       return { url, started: ours }
@@ -138,13 +140,18 @@ export function isolate({ g, cwd, sid, sessions = reapLost(listSessions()) }) {
 // a binary that is not installed (that spawned ENOENT and killed the session
 // with exit 127 instead of waiting for a reset). Resolves each adapter the way
 // the runner would spawn it (native exe, npm entry, or BATON_<AGENT>_BIN).
+async function loadAdapter(name) {
+  if (name === 'grok') return (await import('./adapters/grok.mjs')).default
+  return getAdapter(name)
+}
+
 let installedCache = null
 async function installedAgents() {
   if (installedCache) return installedCache
   const out = {}
-  for (const name of AGENTS) {
+  for (const name of SUPERVISED_AGENTS) {
     try {
-      const { bin, viaNode, entry } = (await getAdapter(name)).resolve()
+      const { bin, viaNode, entry } = (await loadAdapter(name)).resolve()
       const target = viaNode ? (entry ?? bin) : bin
       if (/[\\/]/.test(target)) out[name] = existsSync(target)
       else { const r = spawnSync(target, ['--version'], { windowsHide: true, encoding: 'utf8', timeout: 8000 }); out[name] = !r.error && r.status === 0 }
@@ -182,26 +189,36 @@ function restoreTerminal() {
 }
 
 // ---- spawn spec per agent ----
-export async function spawnSpec(agent, { account, args, sessionId, prompt, cwd }) {
-  const adapter = await getAdapter(agent)
+export async function spawnSpec(agent, { account, args, sessionId, prompt, cwd, autoApprove = resolveAutoApprove() }) {
+  const adapter = await loadAdapter(agent)
   const { bin, viaNode, entry } = adapter.resolve()
   const argv = []
   // viaNode: either an npm entry (codex bin/codex.js) or a BATON_<AGENT>_BIN that names a .mjs (tests)
   if (viaNode) argv.push(entry ?? bin)
   // a leg Baton starts on its own (after a hand-off) takes BATON_<AGENT>_ARGS,
   // e.g. BATON_CODEX_ARGS="-m gpt-5-mini" to keep a test chain on cheap models
-  if (prompt) args = [...(process.env[`BATON_${agent.toUpperCase()}_ARGS`] ?? '').split(/\s+/).filter(Boolean), ...args]
+  if (prompt) args = [...(process.env[`LEG_${agent.toUpperCase()}_ARGS`] ?? process.env[`BATON_${agent.toUpperCase()}_ARGS`] ?? '').split(/\s+/).filter(Boolean), ...args]
   if (agent === 'claude') {
     const settings = writeSettings(sessionId, { statusLine: userStatusLine(process.env.CLAUDE_CONFIG_DIR || (account !== 'default' ? envFor('claude', account).CLAUDE_CONFIG_DIR : undefined)) })
-    argv.push(...args, '--settings', settings)
+    const autoFlags = autoApprove && !args.includes('--dangerously-skip-permissions') ? ['--dangerously-skip-permissions'] : [] // auto-approve: not forbidden for interactive sessions
+    argv.push(...args, ...autoFlags, '--settings', settings)
     if (prompt) argv.push(prompt)
   } else if (agent === 'codex') {
-    argv.push(...args)
+    const hasApproval = args.includes('--ask-for-approval') || args.includes('-a') || args.some((x) => typeof x === 'string' && x.startsWith('--ask-for-approval='))
+    const autoFlags = autoApprove && !hasApproval ? ['--ask-for-approval', 'never'] : []
+    argv.push(...args, ...autoFlags)
     if (prompt) argv.push(prompt)
   } else if (agent === 'agy') {
     const log = join(sessionDir(sessionId), 'agy.log')
-    argv.push(...args, '--log-file', log)
+    const autoFlags = autoApprove && !args.includes('--dangerously-skip-permissions') ? ['--dangerously-skip-permissions'] : [] // auto-approve: not forbidden for interactive sessions
+    argv.push(...args, ...autoFlags, '--log-file', log)
     if (prompt) argv.push('-i', prompt)
+  } else if (agent === 'grok') {
+    const log = join(sessionDir(sessionId), 'grok.log')
+    const hasApprove = args.includes('--always-approve') || args.includes('--yolo') || args.includes('--approval-mode=yolo') // auto-approve check: not forbidden for interactive sessions
+    const autoFlags = autoApprove && !hasApprove ? ['--always-approve'] : [] // auto-approve: not forbidden for interactive sessions
+    argv.push(...args, ...autoFlags, '--debug-file', log)
+    if (prompt) argv.push(prompt)
   }
   const env = { ...sanitizeEnv(process.env, { interactive: true }), ...envFor(agent, account), LEG_SESSION: sessionId, BATON_SESSION: sessionId }
   return { bin: viaNode ? process.execPath : bin, args: argv, env, cwd }
@@ -209,7 +226,7 @@ export async function spawnSpec(agent, { account, args, sessionId, prompt, cwd }
 
 // ---- one agent leg ----
 // Returns { reason: 'exit'|'limit'|'handoff', code }
-async function runLeg({ agent, account, args, session, prompt, boardUrl }) {
+async function runLeg({ agent, account, args, session, prompt, boardUrl, autoApprove = resolveAutoApprove() }) {
   const sid = session.session_id
   refreshAccount(agent, account)
   // A handoff happens when the limit hits, which is usually when nobody is
@@ -219,7 +236,7 @@ async function runLeg({ agent, account, args, session, prompt, boardUrl }) {
   const trust = ensureTrust(agent, session.cwd, { cwd: session.cwd })
   const trusted = trustLine(trust)
   if (trusted) { say(trusted); appendEvent(sid, { type: 'trust', summary: trusted }) }
-  const spec = await spawnSpec(agent, { account, args, sessionId: sid, prompt, cwd: session.cwd })
+  const spec = await spawnSpec(agent, { account, args, sessionId: sid, prompt, cwd: session.cwd, autoApprove })
   appendEvent(sid, { type: 'leg', summary: `${agent} (${account}) starting${prompt ? ' from the handoff bundle' : ''}` })
   const startedMs = Date.now()
   const turnsAtLegStart = session.turns ?? 0
@@ -227,6 +244,8 @@ async function runLeg({ agent, account, args, session, prompt, boardUrl }) {
   // the end of what the first one wrote, or it walls itself on that leg's line
   const agyLog = agent === 'agy' ? join(sessionDir(sid), 'agy.log') : null
   const agyTail = agyLog ? createTail(agyLog, { from: logSize(agyLog) }) : null
+  const grokLog = agent === 'grok' ? join(sessionDir(sid), 'grok.log') : null
+  const grokTail = grokLog ? createTail(grokLog, { from: logSize(grokLog) }) : null
   let child
   try {
     child = spawn(spec.bin, spec.args, { cwd: spec.cwd, env: spec.env, stdio: 'inherit', windowsHide: false })
@@ -289,6 +308,24 @@ async function runLeg({ agent, account, args, session, prompt, boardUrl }) {
     pollUsage().catch(() => {})
     usageTimer = setInterval(() => pollUsage().catch(() => {}), USAGE_MS)
     usageTimer.unref?.()
+  } else if (agent === 'grok') {
+    const pollUsage = async () => {
+      const configDir = spec.env.GROK_HOME || LAYOUT.grok.home()
+      const r = await fetchGrokUsage({ configDir })
+      const s = readSession(sid)
+      if (!isCurrentLeg(s, { pid: child.pid, agent, account })) return
+      const usable = r.ok && r.limits && (r.limits.five_hour || r.limits.seven_day)
+      if (usable) {
+        recordUsage('grok', account, r.limits, 'grok billing proxy')
+        updateSession(sid, { limits: r.limits, usage_source: 'grok billing proxy', usage_error: null })
+      } else if (!s.usage_error) {
+        const why = r.error ?? 'the usage endpoint answered with no window'
+        updateSession(sid, { usage_error: why }, { event: { type: 'status', summary: `grok usage unavailable: ${why}` } })
+      }
+    }
+    pollUsage().catch(() => {})
+    usageTimer = setInterval(() => pollUsage().catch(() => {}), USAGE_MS)
+    usageTimer.unref?.()
   }
 
   const timer = setInterval(() => {
@@ -351,6 +388,25 @@ async function runLeg({ agent, account, args, session, prompt, boardUrl }) {
           if (s.status === 'starting') patch.status = 'running'
         }
       }
+      // grok: log text + prompts
+      if (agent === 'grok') {
+        const text = grokTail ? grokTail.read().join('\n') : ''
+        const hit = text ? scanGrokLog(text) : null
+        if (hit && s.status !== 'limit') {
+          const u = markLimited('grok', account, { resets_at: hit.resets_at, reason: hit.signal, source: 'grok log' })
+          patch.status = 'limit'; patch.limit = { reason: hit.signal, detail: hit.detail, resets_at: hit.resets_at ?? u.limited_until, at: new Date().toISOString() }
+          appendEvent(sid, { type: 'limit', summary: `grok limit (${hit.signal}): ${hit.detail.slice(0, 160)}` })
+          try { captureLive('grok', hit.signal, { log_excerpt: hit.detail, resets_at: hit.resets_at }, { sessionId: sid }) } catch {}
+        }
+        const prompts = grokPromptsSince({ grokHome: spec.env.GROK_HOME || LAYOUT.grok.home(), cwd: s.cwd, sinceMs: startedMs })
+        const turns = turnsAtLegStart + prompts.length
+        if (prompts.length && turns !== (s.turns ?? 0)) {
+          patch.turns = turns; patch.last_activity = new Date().toISOString()
+          if (!s.task) patch.task = prompts[0].text.slice(0, 500)
+          if (!s.agent_session_id && prompts[0].sessionId) patch.agent_session_id = prompts[0].sessionId
+          if (s.status === 'starting') patch.status = 'running'
+        }
+      }
       // warning threshold (every agent; claude's limits arrive via the usage poller)
       {
         const lim = patch.limits ?? s.limits
@@ -456,7 +512,7 @@ export function claimHandoffChoice({ sid, agent, account, installed, bundle = nu
 
 // ---- the command ----
 export async function attach(agent, args = [], { open = true } = {}) {
-  if (!AGENTS.includes(agent)) throw new Error(`unknown agent "${agent}" (claude|codex|agy)`)
+  if (!SUPERVISED_AGENTS.includes(agent)) throw new Error(`unknown agent "${agent}" (claude|codex|agy|grok)`)
   // the paid gate: a valid key, or no session (exit 4). The bare agent is never
   // affected; only what Baton adds is licensed.
   const ent = entitlement()
@@ -464,13 +520,22 @@ export async function attach(agent, args = [], { open = true } = {}) {
   // --no-worktree is Baton's flag, not the agent's: it never passes through
   const shareCheckout = args.includes('--no-worktree')
   args = args.filter((a) => a !== '--no-worktree')
+  let autoApproveCli = null
+  if (args.includes('--no-auto-approve')) {
+    autoApproveCli = false
+    args = args.filter((a) => a !== '--no-auto-approve')
+  } else if (args.includes('--auto-approve')) {
+    autoApproveCli = true
+    args = args.filter((a) => a !== '--auto-approve')
+  }
+  const autoApprove = resolveAutoApprove({ cliFlag: autoApproveCli })
   const cwd = process.cwd()
   const board = await ensureBoard({ open })
   let accounts = readAccounts()
   const installed = await installedAgents()
   const handoffOrder = readPreferences().handoff_order
   let account = process.env.LEG_ACCOUNT || process.env.BATON_ACCOUNT || 'default'
-  if (!accounts[agent].includes(account)) { say(`no ${agent} account "${account}"; using default`); account = 'default' }
+  if (!(accounts[agent] ?? ['default']).includes(account)) { say(`no ${agent} account "${account}"; using default`); account = 'default' }
   // A persisted wall is only a cache. Ask Codex's read-only account endpoint
   // before using it to skip this login; an explicit true can clear an older
   // wall, false refreshes it, and unknown preserves it.
@@ -478,6 +543,10 @@ export async function attach(agent, args = [], { open = true } = {}) {
     const codexHome = envFor('codex', account).CODEX_HOME || LAYOUT.codex.home()
     await refreshCodexUsage(account, codexHome).catch(() => {})
   }
+  if (agent === 'grok' && installed.grok && !process.env.BATON_GROK_BIN) {
+    const grokHome = envFor('grok', account).GROK_HOME || LAYOUT.grok.home()
+    await fetchGrokUsage({ configDir: grokHome }).catch(() => {})
+  }
   // Start on an account that is not at its wall, if we already know one is.
   const nowS = Math.floor(Date.now() / 1000)
   const u0 = readUsage(agent, account)
@@ -513,7 +582,7 @@ export async function attach(agent, args = [], { open = true } = {}) {
   // bounds a wait; a normal session runs one leg and exits
   for (let leg = 0; ; leg++) {
     const s = readSession(sid)
-    const r = await runLeg({ agent, account, args: legArgs, session: s, prompt, boardUrl: board.url })
+    const r = await runLeg({ agent, account, args: legArgs, session: s, prompt, boardUrl: board.url, autoApprove })
     if (r.reason === 'exit') { exit = r.code ?? 0; break }
     // limit or handoff: bundle, choose next, go again in this terminal
     const cur = readSession(sid)

package/src/board/board.css

@@ -129,6 +129,7 @@
   --id-claude: #FCA169;  /* oklch(0.790 0.130 52) warm */
   --id-codex: #69DBBA;   /* oklch(0.815 0.115 172) cool green */
   --id-agy: #CC97F3;     /* oklch(0.760 0.140 310) violet, 46 degrees clear of the accent */
+  --id-grok: #70B8FF;    /* oklch(0.750 0.130 240) azure blue */
   --id-fake: #A0A6AE;    /* oklch(0.720 0.010 258) the scripted adapter, neutral in hue */
 
   /* type scale. Fixed rem, range 13 to 52. The old board ran 13 to 21, which
@@ -188,10 +189,10 @@ code { font-family: var(--mono); font-size: 0.94em; }
 
 .banner { background: var(--e1); border-bottom: 1px solid var(--edge); color: var(--text-2); font-size: var(--t-0); padding: 10px clamp(20px, 4vw, 40px); padding-top: calc(10px + env(safe-area-inset-top, 0px)); }
 
-.masthead { display: flex; align-items: baseline; justify-content: space-between; gap: 16px; flex-wrap: wrap; padding-block: 28px 0; }
+.masthead { position: relative; z-index: 10; display: flex; align-items: center; justify-content: space-between; gap: 16px; flex-wrap: wrap; padding-block: 28px 24px; }
 .brand { font-size: var(--t-1); font-weight: var(--w-head); letter-spacing: -.01em; }
 .brand-glyph { display: inline-block; margin-right: 4px; }
-.masthead-right { display: flex; align-items: baseline; gap: 18px; flex-wrap: wrap; font-size: var(--t-0); color: var(--text-3); }
+.masthead-right { display: flex; align-items: center; gap: 18px; flex-wrap: wrap; font-size: var(--t-0); color: var(--text-3); }
 .floor-link { color: var(--text-2); text-decoration: none; border-bottom: 1px solid var(--line-strong); padding-bottom: 1px; }
 .floor-link:hover { color: var(--text); border-bottom-color: var(--text-2); }
 
@@ -220,6 +221,7 @@ code { font-family: var(--mono); font-size: 0.94em; }
 .dot.id-claude { background: var(--id-claude); }
 .dot.id-codex { background: var(--id-codex); }
 .dot.id-agy { background: var(--id-agy); }
+.dot.id-grok { background: var(--id-grok); }
 
 /* ---- logins ------------------------------------------------------------- */
 .logins { display: grid; gap: 20px; }
@@ -304,6 +306,14 @@ code { font-family: var(--mono); font-size: 0.94em; }
 .file.is-overlap { color: var(--warn-text); }
 .blocker { margin-top: 10px; font-size: var(--t-0); color: var(--text-3); max-width: 64ch; }
 .blocker.is-hoisted { position: absolute; width: 1px; height: 1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; }
+.why-cant-land { margin-top: 10px; font-size: var(--t-0); color: var(--text-3); max-width: 64ch; }
+.why-cant-land-summary { cursor: pointer; color: var(--text-2); font-weight: var(--w-head); user-select: none; }
+.why-cant-land-summary:hover { color: var(--text-1); }
+.blocker-list { list-style: none; margin: 8px 0 0 0; padding: 0; display: flex; flex-direction: column; gap: 8px; }
+.blocker-item { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 8px; padding: 6px 10px; background: var(--surface-2); border-radius: var(--r-control); font-size: var(--t--1); }
+.blocker-msg { color: var(--text-2); flex: 1 1 auto; }
+.blocker-fixes { display: inline-flex; gap: 6px; }
+.btn-sm { min-height: 26px; padding: 0 10px; font-size: var(--t--1); }
 
 /* the flat inline data token. Not a capsule: a chip here is a word set in the
    meta colour beside the thing it qualifies */
@@ -312,6 +322,7 @@ code { font-family: var(--mono); font-size: 0.94em; }
 .chip-id-claude { color: var(--id-claude); }
 .chip-id-codex { color: var(--id-codex); }
 .chip-id-agy { color: var(--id-agy); }
+.chip-id-grok { color: var(--id-grok); }
 .chip-id-fake { color: var(--id-fake); }
 .chip-state-ok { color: var(--ok-text); }
 .chip-state-warn { color: var(--warn-text); }
@@ -320,6 +331,7 @@ code { font-family: var(--mono); font-size: 0.94em; }
 .acct-name.id-claude { color: var(--id-claude); }
 .acct-name.id-codex { color: var(--id-codex); }
 .acct-name.id-agy { color: var(--id-agy); }
+.acct-name.id-grok { color: var(--id-grok); }
 .acct-name.id-fake { color: var(--id-fake); }
 
 /* ---- controls ----------------------------------------------------------- */
@@ -345,14 +357,17 @@ code { font-family: var(--mono); font-size: 0.94em; }
 /* the four scroll boxes board-drawer.test.mjs scans for by line prefix. Each
    class is the first token on its line, in this order, and no earlier line in
    this file begins with any of the four */
-.drawer-task { max-height: 22rem; overflow: auto; font-size: var(--t-0); color: var(--text-2); }
-.drawer-msg p { max-height: 18rem; overflow-y: auto; font-size: var(--t-0); color: var(--text-2); }
-.drawer-timeline { max-height: 22rem; overflow: auto; font-size: var(--t-0); }
-.drawer-diff { max-height: 26rem; overflow: auto; font-family: var(--mono); font-size: var(--t--1); }
-
-.drawer-msg { margin-top: 14px; }
-.drawer-msg-role { font-size: var(--t--1); color: var(--text-3); font-weight: var(--w-head); }
-.drawer-msg-when { font-size: var(--t--1); color: var(--text-3); }
+.drawer-task { max-height: 22rem; overflow: auto; font-size: var(--t-0); color: var(--text); background: var(--e0); border: 1px solid var(--edge); border-radius: var(--r-control); padding: 14px 18px; line-height: 1.55; }
+.drawer-msg p { max-height: 18rem; overflow-y: auto; font-size: var(--t-0); color: var(--text); line-height: 1.55; margin: 0; }
+.drawer-timeline { max-height: 22rem; overflow: auto; font-size: var(--t-0); background: var(--e0); border: 1px solid var(--edge); border-radius: var(--r-control); padding: 8px 16px; }
+.drawer-diff { max-height: 26rem; overflow: auto; font-family: var(--mono); font-size: var(--t--1); background: var(--e0); border-top: 1px solid var(--line); margin-top: 10px; padding-top: 10px; }
+
+.drawer-msg { margin-top: 12px; background: var(--e0); border: 1px solid var(--edge); border-radius: var(--r-control); padding: 14px 18px; }
+.drawer-msg.is-human { border-left: 3px solid var(--accent); }
+.drawer-msg.is-agent { border-left: 3px solid var(--ok-text); }
+.drawer-msg-head { display: flex; align-items: center; justify-content: space-between; gap: 8px; margin-bottom: 8px; }
+.drawer-msg-role { font-size: var(--t--1); color: var(--text-2); font-weight: var(--w-head); text-transform: uppercase; letter-spacing: 0.04em; }
+.drawer-msg-when { font-size: var(--t--1); color: var(--text-3); font-family: var(--mono); }
 
 /* ---- ledger: on the ground, unpanelled --------------------------------- */
 .ledger { margin-top: 56px; display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 40px; padding-top: 32px; border-top: 1px solid var(--edge); }
@@ -418,20 +433,32 @@ code { font-family: var(--mono); font-size: 0.94em; }
 .worktree { color: var(--text-3); }
 
 /* ---- detail panes ------------------------------------------------------- */
-.detail { margin-top: 22px; background: var(--e1); border-radius: var(--r-well); box-shadow: var(--sink); }
+.detail { margin-top: 22px; background: var(--e1); border-radius: var(--r-well); box-shadow: var(--sink); border: 1px solid var(--edge); }
 .detail-inner { padding: 24px; }
-.detail-heading { display: flex; align-items: baseline; flex-wrap: wrap; gap: 8px; font-size: var(--t-1); font-weight: var(--w-head); margin-bottom: 12px; }
-.detail-section { margin-top: 20px; }
-.detail-sub { font-size: var(--t-0); color: var(--text-3); margin-bottom: 8px; }
+.detail-masthead { display: flex; align-items: center; justify-content: space-between; gap: 16px; flex-wrap: wrap; padding-bottom: 18px; border-bottom: 1px solid var(--line); margin-bottom: 22px; }
+.detail-brand { display: flex; align-items: center; gap: 10px; font-size: var(--t-1); }
+.detail-ctrls { display: flex; align-items: center; gap: 10px; }
+.detail-heading { display: flex; align-items: baseline; justify-content: space-between; flex-wrap: wrap; gap: 12px; font-size: var(--t-1); font-weight: var(--w-head); margin-bottom: 14px; letter-spacing: -.01em; }
+.detail-section { margin-top: 26px; padding-top: 22px; border-top: 1px solid var(--line); }
+.detail-section:first-of-type { margin-top: 0; padding-top: 0; border-top: 0; }
+.detail-sub { font-size: var(--t-0); color: var(--text-3); font-weight: var(--w-text); }
 .kv { display: grid; grid-template-columns: 148px 1fr; gap: 10px 20px; font-size: var(--t-0); }
 .kv-key { color: var(--text-3); }
 .kv-val { color: var(--text); }
-.well { background: var(--e0); border-radius: var(--r-control); padding: 14px; }
+.detail .kv { margin-top: 14px; padding-top: 12px; border-top: 1px solid var(--line); }
+.well { background: var(--e0); border-radius: var(--r-control); padding: 14px 18px; border: 1px solid var(--edge); }
 .log-pre { font-family: var(--mono); font-size: var(--t--1); white-space: pre-wrap; color: var(--text-2); max-height: 26rem; overflow: auto; }
 .hunk { font-family: var(--mono); font-size: var(--t--1); white-space: pre-wrap; }
-.file-row { display: inline-flex; align-items: baseline; flex-wrap: wrap; gap: 8px; text-align: left; }
+.drawer-file-item { background: var(--e0); border: 1px solid var(--edge); border-radius: var(--r-control); padding: 10px 14px; margin-bottom: 8px; }
+.drawer-file-item:hover { border-color: var(--line-strong); }
+.file-row { display: flex; align-items: center; justify-content: space-between; width: 100%; gap: 10px; text-align: left; }
 .turn { padding: 12px 0; }
 .turn + .turn { border-top: 1px solid var(--line); }
+.timeline-item { padding: 10px 0; display: grid; grid-template-columns: 80px 140px 1fr; gap: 12px; align-items: baseline; }
+.timeline-item + .timeline-item { border-top: 1px solid var(--line); }
+.timeline-item .turn-when { color: var(--text-3); font-size: var(--t--1); }
+.timeline-item .turn-role { color: var(--accent); font-size: var(--t--1); font-weight: var(--w-head); }
+.timeline-summary { color: var(--text-2); margin: 0; font-size: var(--t-0); }
 .turn-role { font-size: var(--t--1); color: var(--text-3); font-weight: var(--w-head); }
 .turn-when { font-size: var(--t--1); color: var(--text-3); }
 /* the kind word sits beside the clock, not welded to it: `10:40 AMstarted` */
@@ -448,9 +475,10 @@ code { font-family: var(--mono); font-size: 0.94em; }
 .actions { display: flex; gap: 10px; flex-wrap: wrap; }
 
 /* ---- the floor: the scheduler's view, tables on the same ground --------- */
-.masthead-left { display: flex; align-items: baseline; gap: 18px; flex-wrap: wrap; }
+.masthead-left { display: flex; align-items: center; gap: 18px; flex-wrap: wrap; }
 .repos-status, .counts-status { color: var(--text-3); }
 .counts-status span { color: var(--text-2); font-weight: var(--w-head); margin-left: 2px; }
+#floor-accounts { margin-top: 16px; }
 .region-floor { margin-top: 12px; }
 .ftable { width: 100%; border-collapse: collapse; background: var(--e2); border: 1px solid var(--edge); border-radius: var(--r-panel); box-shadow: var(--lift); overflow: hidden; font-size: var(--t-0); }
 .ftable th, .ftable td { text-align: left; vertical-align: top; padding: 14px 18px; }

package/src/board/board.js

@@ -56,7 +56,7 @@
     'read-only': 'read only',
     plan: 'plan only',
   }
-  const AGENT_IDS = ['claude', 'codex', 'agy']
+  const AGENT_IDS = ['claude', 'codex', 'agy', 'grok']
   const DEFAULT_BIND = '127.0.0.1:4747'
   const TIMELINE_CAP = 12
   // mirrors LOOPBACK in src/auth.mjs; state.bind is "<host>:<port>" and an IPv6

package/src/board/floor.js

@@ -130,7 +130,7 @@
   // the same commit.
 
   const WIN_WORDS = { '5h': '5 hour', '7d': '7 day' }
-  const IDS = ['claude', 'codex', 'agy', 'fake']
+  const IDS = ['claude', 'codex', 'agy', 'grok', 'fake']
 
   // ---- times. The head prints `Times are local.` once, so no row repeats it ----
   // THIS FILE OWNS THE TIME GRAMMAR FOR THE WHOLE BOARD. ago(), clockAt(),
@@ -600,7 +600,7 @@
     if (s === 'reconnecting') {
       banner.textContent = state.lastReadingAt ? `Reconnecting to Leg. Last reading ${clockAt(state.lastReadingAt.getTime())}.` : `Reconnecting to Leg on ${state.bind}.`
     } else if (s === 'connecting') {
-      banner.textContent = `Connecting to Baton on ${state.bind}.`
+      banner.textContent = `Connecting to Leg on ${state.bind}.`
     }
   }
 

package/src/board/sessions.js

@@ -22,7 +22,7 @@
     handing_off: ['handing off', 'warn'], waiting: ['waiting for reset', 'warn'], handed_off: ['handed off', 'idle'], ended: ['ended', 'idle'], lost: ['lost', 'danger'],
   }
   const WIN_WORDS = { '5h': '5 hour', '7d': '7 day' }
-  const IDS = ['claude', 'codex', 'agy', 'fake']
+  const IDS = ['claude', 'codex', 'agy', 'grok', 'fake']
 
   let view = null
   const NO_BRANCH_BLOCKER = 'this terminal works in the checkout itself: there is no branch of its own to land'
@@ -643,15 +643,15 @@
   // A result that belongs to a terminal is written into that terminal's sentence
   // slot, where the reader is already looking. Only a result that belongs to no
   // object on this page goes to the one system message.
-  async function act(id, action, btn) {
+  async function act(id, action, btn, body = null) {
     btn.disabled = true
     actionNotes.delete(id)
     try {
       if (action.startsWith('requests/')) {
-        await api(`/api/sessions/${encodeURIComponent(id)}/${action}`, { method: 'POST' })
+        await api(`/api/sessions/${encodeURIComponent(id)}/${action}`, { method: 'POST', body })
         actionNotes.set(id, { at: Date.now(), tone: 'ok', text: action.endsWith('approve') ? 'approved; this terminal hands off in a few seconds' : 'the request was dismissed' })
       } else if (action === 'request-handoff') {
-        await api(`/api/sessions/${encodeURIComponent(id)}/request-handoff`, { method: 'POST' })
+        await api(`/api/sessions/${encodeURIComponent(id)}/request-handoff`, { method: 'POST', body })
         sysMessage('asked; the owner of that terminal decides', 'ok')
       } else if (action === 'remove') {
         const r = await api(`/api/sessions/${encodeURIComponent(id)}`, { method: 'DELETE' })
@@ -660,9 +660,10 @@
         await api(`/api/sessions/${encodeURIComponent(id)}?force=1&keep_worktree=1`, { method: 'DELETE' })
         sysMessage('removed the Leg record; the worktree and the branch are kept', 'ok')
       } else {
-        await api(`/api/sessions/${encodeURIComponent(id)}/${action}`, { method: 'POST' })
+        await api(`/api/sessions/${encodeURIComponent(id)}/${action}`, { method: 'POST', body })
         if (action === 'handoff') actionNotes.set(id, { at: Date.now(), tone: 'warn', text: 'hand-off requested; this terminal switches agents in a few seconds' })
         else if (action === 'end') actionNotes.set(id, { at: Date.now(), tone: 'warn', text: 'end requested; the agent stops after its current turn' })
+        else if (action === 'land/fix') actionNotes.set(id, { at: Date.now(), tone: 'ok', text: 'applied fix' })
       }
       refresh()
     } catch (err) {
@@ -849,25 +850,63 @@
     // G10: the order is Land, Hand off now, Details, End, and it never reflows
     // by availability. A button that does not apply is omitted, never moved.
     const landing = Boolean(s.land && s.land.state === 'landing')
-    const blocker = s.worktree ? s.land_blocker : NO_BRANCH_BLOCKER
-    // G10 is disabled-with-its-reason, so the reason is attached to the control
-    // as well as printed: the title used to be on the inverse condition, giving
-    // the tooltip to the button that explains itself and none to the one that
-    // needs it, and nothing connected the sentence below to the button above.
+    const cl = s.can_land || (s.worktree ? (s.land_blocker ? { ok: false, blockers: [{ code: 'legacy', message: s.land_blocker }] } : { ok: true, blockers: [] }) : { ok: false, blockers: [{ code: 'no_worktree', message: NO_BRANCH_BLOCKER }] })
+    const isOnTarget = cl.blockers && cl.blockers.some((b) => b.code === 'on_target_branch')
+    const targetLocked = cl.blockers && cl.blockers.find((b) => b.code === 'target_locked')
+    const blocker = !cl.ok ? (cl.blockers[0]?.message || NO_BRANCH_BLOCKER) : null
     const blockerId = blocker ? `land-blocker-${s.session_id}` : null
-    // Land is the primary action only when it can actually run. A disabled
-    // button painted in the one accent colour spends the loudest thing in the
-    // design on something the reader cannot do.
-    const land = el('button', {
-      type: 'button',
-      class: `btn ${blocker ? 'btn-secondary' : 'btn-primary'}${landing ? ' is-loading' : ''}`,
-      disabled: blocker || landing ? '' : null,
-      'data-focus-key': `land:${s.session_id}`,
-      'aria-describedby': blockerId,
-      title: blocker || `commit this terminal's work on ${s.worktree.branch}, rebase it onto ${s.worktree.base}, run the tests, fast-forward ${s.worktree.base}; a bounce says why`,
-    }, [landing ? 'Landing…' : 'Land'])
-    land.addEventListener('click', () => act(s.session_id, 'land', land))
-    actions.appendChild(land)
+
+    if (isOnTarget) {
+      const commitDirect = el('button', {
+        type: 'button',
+        class: 'btn btn-secondary',
+        'data-focus-key': `commit-direct:${s.session_id}`,
+        title: `Commit directly on ${s.branch || s.worktree?.base || 'main'}`,
+      }, ['Commit directly'])
+      commitDirect.addEventListener('click', () => act(s.session_id, 'land/fix', commitDirect, { action: 'commit_directly' }))
+      actions.appendChild(commitDirect)
+    } else {
+      const landLabel = landing ? 'Landing…' : targetLocked ? targetLocked.message : 'Land'
+      const landDisabled = !cl.ok || landing
+      const land = el('button', {
+        type: 'button',
+        class: `btn ${landDisabled ? 'btn-secondary' : 'btn-primary'}${landing ? ' is-loading' : ''}`,
+        disabled: landDisabled ? '' : null,
+        'data-focus-key': `land:${s.session_id}`,
+        'aria-describedby': blockerId,
+        title: blocker || (s.worktree ? `commit work on ${s.worktree.branch}, rebase onto ${s.worktree.base}, test, and fast-forward ${s.worktree.base}` : 'Land'),
+      }, [landLabel])
+      if (!landDisabled) {
+        land.addEventListener('click', async () => {
+          land.disabled = true
+          land.classList.add('is-loading')
+          land.textContent = 'Preparing…'
+          try {
+            const res = await api(`/api/sessions/${encodeURIComponent(s.session_id)}/land/prepare`, { method: 'POST' })
+            land.classList.remove('is-loading')
+            if (!res.ok) {
+              actionNotes.set(s.session_id, { at: Date.now(), tone: 'danger', text: res.error || 'Prepare failed' })
+              refresh()
+              return
+            }
+            const statText = res.diff_stat || `${res.files?.length || 0} files changed`
+            const question = `Prepared: ${statText} · tests green. Land onto ${s.worktree?.base || 'main'} and ship to GitHub?`
+            pendingConfirm = {
+              id: s.session_id,
+              question,
+              verb: 'Land',
+              action: 'land',
+            }
+            renderSessions(view)
+          } catch (err) {
+            land.classList.remove('is-loading')
+            actionNotes.set(s.session_id, { at: Date.now(), tone: 'danger', text: err.message })
+            refresh()
+          }
+        })
+      }
+      actions.appendChild(land)
+    }
     if (s.active) {
       const h = el('button', { type: 'button', class: `btn ${blocker ? 'btn-primary' : 'btn-secondary'}`, title: 'save the bundle, stop this agent, start the next option in the same terminal', 'data-focus-key': `handoff:${s.session_id}` }, ['Hand off now'])
       h.addEventListener('click', () => act(s.session_id, 'handoff', h))
@@ -901,8 +940,33 @@
     }
     row.appendChild(actions)
     term.appendChild(row)
-    // the reason a disabled control is disabled is printed, never left in a title
-    if (blocker) term.appendChild(el('p', { class: 'blocker', id: blockerId }, [blocker]))
+
+    // Why can't I land expander or fallback blocker message
+    if (!cl.ok && !isOnTarget && s.worktree) {
+      const list = el('ul', { class: 'blocker-list' })
+      for (const b of cl.blockers) {
+        const item = el('li', { class: 'blocker-item' })
+        item.appendChild(el('span', { class: 'blocker-msg' }, [b.message]))
+        const fixes = b.fixes || (b.fix ? [b.fix] : [])
+        if (fixes.length) {
+          const grp = el('span', { class: 'blocker-fixes' })
+          for (const f of fixes) {
+            const fBtn = el('button', { type: 'button', class: 'btn btn-sm btn-secondary', title: f.label }, [f.label])
+            fBtn.addEventListener('click', () => act(s.session_id, 'land/fix', fBtn, { action: f.action, target_session: f.target_session }))
+            grp.appendChild(fBtn)
+          }
+          item.appendChild(grp)
+        }
+        list.appendChild(item)
+      }
+      const expander = el('details', { class: 'why-cant-land', id: blockerId }, [
+        el('summary', { class: 'why-cant-land-summary' }, ["Why can't I land?"]),
+        list,
+      ])
+      term.appendChild(expander)
+    } else if (blocker) {
+      term.appendChild(el('p', { class: 'blocker', id: blockerId }, [blocker]))
+    }
     return term
   }
 
@@ -1014,9 +1078,12 @@
   }
 
   function messageRow(m, key) {
-    return el('div', { class: 'turn drawer-msg' }, [
-      el('span', { class: 'turn-role drawer-msg-role' }, [m.role === 'user' ? 'human' : 'agent']),
-      m.ts ? el('span', { class: 'turn-when drawer-msg-when' }, [whenAgo(m.ts)]) : null,
+    const isUser = m.role === 'user'
+    return el('div', { class: `turn drawer-msg ${isUser ? 'is-human' : 'is-agent'}` }, [
+      el('div', { class: 'drawer-msg-head' }, [
+        el('span', { class: `turn-role drawer-msg-role ${isUser ? '' : 'chip-state-ok'}` }, [isUser ? 'human' : 'agent']),
+        m.ts ? el('span', { class: 'turn-when drawer-msg-when' }, [whenAgo(m.ts)]) : null,
+      ]),
       // every box that can scroll carries a key, so where the reader had
       // scrolled to survives the rebuild three seconds later
       el('p', { 'data-scroll-key': `msg:${key}` }, [m.text]),
@@ -1024,7 +1091,7 @@
   }
 
   function fileRow(f) {
-    const wrap = el('div', {})
+    const wrap = el('div', { class: 'drawer-file-item' })
     const pre = el('pre', { class: 'drawer-diff', hidden: '', 'data-scroll-key': `diff:${f.path}` })
     const row = el('button', { type: 'button', class: 'btn btn-text file-row', 'aria-expanded': 'false', 'data-focus-key': `file:${f.path}` }, [
       el('span', { class: 'mono', title: f.path }, [f.path]),
@@ -1115,16 +1182,18 @@
       return
     }
     const [label] = STATUS[s.status] || [s.status]
-    const controls = el('div', { class: 'cap-line' }, [
+    const left = el('div', { class: 'detail-brand' }, [
+      el('span', { class: `dot id-${idOf(s.agent)}` }),
       el('span', { class: `acct-name chip-id-${idOf(s.agent)}` }, [s.agent]),
-      el('span', { class: 'chip' }, [tail(s.session_id)]),
+      el('span', { class: 'chip mono' }, [tail(s.session_id)]),
+      el('span', { class: s.active ? 'chip chip-state-ok' : 'chip is-stale' }, [s.active ? (label || 'running') : (label || s.status)]),
     ])
     const pause = el('button', { type: 'button', class: 'btn btn-secondary', id: 'session-drawer-pause', 'data-focus-key': 'drawer-pause' }, [drawer.paused ? 'Resume updates' : 'Pause updates'])
     pause.addEventListener('click', () => { drawer.paused = !drawer.paused; if (!drawer.paused) loadDrawer(); else renderDrawer() })
     const close = el('button', { type: 'button', class: 'btn btn-secondary', id: 'session-drawer-close', 'data-focus-key': 'drawer-close' }, ['Close'])
     close.addEventListener('click', closeSessionDrawer)
-    controls.append(pause, close)
-    box.appendChild(controls)
+    const header = el('div', { class: 'detail-masthead' }, [left, el('div', { class: 'detail-ctrls' }, [pause, close])])
+    box.appendChild(header)
     if (drawer.error) box.appendChild(el('p', { class: 'sentence tone-danger' }, [drawer.error]))
 
     const last = d && d.messages ? [...d.messages].reverse().find((m) => m.role === 'assistant') : null
@@ -1171,10 +1240,10 @@
       // header on the same panel printing the same instant as 11:04 PM. The
       // summary is a block, as board.js:754 builds the same row, or the kind
       // word and the sentence render glued: `lostrunner pid 999002 is gone`.
-      timeline.appendChild(el('div', { class: 'turn' }, [
+      timeline.appendChild(el('div', { class: 'turn timeline-item' }, [
         el('span', { class: 'mono turn-when' }, [clockAt(Date.parse(e.ts))]),
         el('span', { class: 'turn-role' }, [e.type]),
-        el('p', {}, [e.summary || '']),
+        el('p', { class: 'timeline-summary' }, [e.summary || '']),
       ]))
     }
     if (!events.length) timeline.appendChild(el('p', { class: 'sentence tone-muted' }, [d ? 'nothing recorded yet' : 'reading the timeline']))