@brimveyn/aimux 1.19.2 → 1.19.4

package/src/pty/assistant-status-detector.ts

@@ -6,7 +6,7 @@
  * `src/detect.rs` in that repo.
  *
  * The detector classifies a terminal session as `working`, `waiting-input`,
- * or `idle`. Built-in CLIs (claude, codex, opencode) use per-CLI substring
+ * or `idle`. Built-in CLIs (claude, codex, opencode, grok) have dedicated classify* functions.
  * tables. Custom CLIs fall back to a generic heuristic that (a) recognises
  * common shells as always-idle and (b) uses pane-tail change velocity plus
  * generic y/n / confirm prompt patterns.
@@ -95,7 +95,7 @@ export class AssistantStatusDetector {
 export function extractTailLines(viewport: TerminalSnapshot, lineCount: number): string[] {
   const isScrolledToBottom = viewport.viewportY === viewport.baseY
   const lines = isScrolledToBottom ? viewport.lines : (viewport.tailLines ?? viewport.lines)
-  // Full-screen TUIs (claude, opencode) paint in the alternate buffer and
+  // Full-screen TUIs (claude, opencode, grok) paint in the alternate buffer and
   // often leave the last rows blank, putting their status bar higher up.
   // Skip trailing blank rows before taking the last `lineCount`.
   let end = lines.length
@@ -138,6 +138,8 @@ function classifyBuiltin(
       return classifyCodex(haystack)
     case 'opencode':
       return classifyOpencode(haystack)
+    case 'grok':
+      return classifyGrok(haystack, rawTail)
     default:
       return null
   }
@@ -212,6 +214,47 @@ function classifyOpencode(haystack: string): TabActivity {
   return 'idle'
 }
 
+function classifyGrok(haystack: string, _rawTail: string): TabActivity {
+  // Waiting for user decision / input (plan approval, Q&A, permissions, confirms).
+  // These are the distinctive Grok Build TUI states that must produce 'waiting-input'
+  // so the rest of the system (turn lifecycle, question events, UI chips, orchestrators)
+  // treats grok the same as claude/codex/opencode.
+  if (
+    haystack.includes('waiting on answers') ||
+    haystack.includes('pprove') || // stylized "[ a ] pprove [ c ] omment [ q ] uit plan"
+    haystack.includes('omment') ||
+    haystack.includes('uit plan') ||
+    (haystack.includes('approve') &&
+      (haystack.includes('comment') || haystack.includes('quit') || haystack.includes('plan'))) ||
+    haystack.includes('enter :select') ||
+    haystack.includes('enter to select') ||
+    haystack.includes('enter submit') ||
+    haystack.includes('do you want') ||
+    haystack.includes('would you like') ||
+    haystack.includes('permission required') ||
+    haystack.includes('permission to') ||
+    haystack.includes('approve?') ||
+    haystack.includes('allow?')
+  ) {
+    return 'waiting-input'
+  }
+
+  // Agent actively reasoning or executing (mirrors claude spinner + interrupt logic).
+  // "Thought for Xs" is the primary visible trace while Grok thinks/plans.
+  if (
+    haystack.includes('thought for') || // "Thought for 3.4s", etc.
+    haystack.includes('thinking…') ||
+    haystack.includes('thinking ...') ||
+    haystack.includes('esc to interrupt') ||
+    haystack.includes('esc interrupt') ||
+    haystack.includes('esc: interrupt')
+  ) {
+    return 'working'
+  }
+
+  return 'idle'
+}
+
 const GENERIC_WAITING_PATTERNS: string[] = [
   '[y/n]',
   '(y/n)',

package/src/pty/command-registry.ts

@@ -1,10 +1,27 @@
 import type { AssistantId } from '../state/types'
 
+/**
+ * How an assistant renders a vendor-neutral model / reasoning-effort selection
+ * into its own CLI args. Vendor flag syntax lives here on the assistant
+ * definition — the source of truth — rather than in a separate resolver, so
+ * there's exactly one place that knows `claude` takes `--effort` while `codex`
+ * takes `-c model_reasoning_effort=…`. An absent builder means the CLI has no
+ * control for that dimension, and passing `--model` / `--effort` for it is an
+ * error (see `buildAssistantModelArgs`). Values themselves are passed through
+ * unvalidated: the worker CLI is the source of truth for its own vocabulary and
+ * rejects a bad value with its own clear startup error.
+ */
+export interface AssistantModelSpec {
+  buildModelArgs?: (model: string) => string[]
+  buildEffortArgs?: (effort: string) => string[]
+}
+
 export interface AssistantOption {
   id: AssistantId
   label: string
   command: string
   description: string
+  model?: AssistantModelSpec
 }
 
 const DEFAULT_SHELL =
@@ -17,18 +34,41 @@ export const ASSISTANT_OPTIONS: AssistantOption[] = [
     description: 'Anthropic Claude CLI',
     id: 'claude',
     label: 'Claude',
+    model: {
+      buildEffortArgs: (effort) => ['--effort', effort],
+      buildModelArgs: (model) => ['--model', model],
+    },
   },
   {
     command: 'codex',
     description: 'OpenAI Codex CLI',
     id: 'codex',
     label: 'Codex',
+    model: {
+      buildEffortArgs: (effort) => ['-c', `model_reasoning_effort=${effort}`],
+      buildModelArgs: (model) => ['--model', model],
+    },
   },
   {
     command: 'opencode',
     description: 'OpenCode CLI',
     id: 'opencode',
     label: 'OpenCode',
+    // OpenCode takes a `provider/model` selector but has no reasoning-effort flag.
+    model: {
+      buildModelArgs: (model) => ['--model', model],
+    },
+  },
+  {
+    command: 'grok',
+    description: 'xAI Grok Build CLI',
+    id: 'grok',
+    label: 'Grok',
+    model: {
+      // Grok supports -m (and likely --model) plus --effort (alias --reasoning-effort).
+      buildEffortArgs: (effort) => ['--effort', effort],
+      buildModelArgs: (model) => ['-m', model],
+    },
   },
   {
     command: 'agy',
@@ -74,3 +114,34 @@ export function parseCommand(commandString: string): { executable: string; args:
   const parts = commandString.trim().split(/\s+/).filter(Boolean)
   return { args: parts.slice(1), executable: parts[0] ?? '' }
 }
+
+/**
+ * Translate a vendor-neutral `{ model, effort }` selection into the extra CLI
+ * args to append to an assistant's default command. Throws if the assistant has
+ * no control for a requested dimension (e.g. `--effort` on OpenCode, anything on
+ * `terminal`) — that combination is unrepresentable, so we fail at the CLI
+ * boundary rather than spawn a worker that silently ignores the request.
+ */
+export function buildAssistantModelArgs(
+  option: AssistantOption,
+  selection: { model?: string; effort?: string }
+): string[] {
+  const args: string[] = []
+  const { effort, model } = selection
+
+  if (model !== undefined && model !== '') {
+    if (!option.model?.buildModelArgs) {
+      throw new Error(`assistant '${option.id}' does not support --model`)
+    }
+    args.push(...option.model.buildModelArgs(model))
+  }
+
+  if (effort !== undefined && effort !== '') {
+    if (!option.model?.buildEffortArgs) {
+      throw new Error(`assistant '${option.id}' does not support --effort`)
+    }
+    args.push(...option.model.buildEffortArgs(effort))
+  }
+
+  return args
+}

package/src/state/types.ts

@@ -4,7 +4,13 @@ import type { ThemedToken } from 'shiki'
 import type { WorktreeTemplate } from '../config'
 import type { LayoutNode, SplitDirection } from './layout-tree'
 
-export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal' | 'antigravity'
+export type BuiltinAssistantId =
+  | 'claude'
+  | 'codex'
+  | 'opencode'
+  | 'grok'
+  | 'terminal'
+  | 'antigravity'
 
 export type AssistantId = BuiltinAssistantId | (string & {})