diff --git a/CLAUDE.md b/CLAUDE.md
index 9b4c9297..3d925fbc 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -22,7 +22,7 @@ Use these terms consistently in code, comments, and documentation:
 
 ## Project Overview
 
-Maestro is an Electron desktop app for managing multiple AI coding assistants (Claude Code, Aider, Qwen Coder) simultaneously with a keyboard-first interface.
+Maestro is an Electron desktop app for managing multiple AI coding assistants (Claude Code, OpenAI Codex, Gemini CLI, Qwen3 Coder) simultaneously with a keyboard-first interface.
 
 ## Quick Commands
 
@@ -205,9 +205,9 @@ The `window.maestro` API exposes:
 | ID | Name | Notes |
 |----|------|-------|
 | `claude-code` | Claude Code | Batch mode with `--print` |
-| `aider-gemini` | Aider (Gemini) | Uses gemini-2.0-flash-exp |
-| `qwen-coder` | Qwen Coder | If installed |
-| `terminal` | CLI Terminal | PTY shell session |
+| `openai-codex` | OpenAI Codex | Coming soon |
+| `gemini-cli` | Gemini CLI | Coming soon |
+| `qwen3-coder` | Qwen3 Coder | Coming soon |
 
 ## Debugging
 
diff --git a/README.md b/README.md
index 8f05d809..96178204 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 > A unified, highly-responsive developer command center for managing your fleet of AI coding agents.
 
-Maestro is a desktop application that allows you to run and manage multiple AI coding instances in parallel with a Linear/Superhuman-level responsive interface. Currently supporting Claude Code with plans for additional agentic coding tools (Aider, OpenCode, etc.) based on user demand.
+Maestro is a desktop application that allows you to run and manage multiple AI coding instances in parallel with a Linear/Superhuman-level responsive interface. Currently supporting Claude Code with plans for additional agentic coding tools (OpenAI Codex, Gemini CLI, Qwen3 Coder) based on user demand.
 
 <img width="3592" height="2302" alt="image" src="https://github.com/user-attachments/assets/ba496fb7-708f-486c-a3ed-20a4a643a958" />
 
diff --git a/src/main/agent-detector.ts b/src/main/agent-detector.ts
index ff61ee29..d46a6208 100644
--- a/src/main/agent-detector.ts
+++ b/src/main/agent-detector.ts
@@ -44,24 +44,24 @@ const AGENT_DEFINITIONS: Omit<AgentConfig, 'available' | 'path'>[] = [
     ]
   },
   {
-    id: 'aider-gemini',
-    name: 'Aider (Gemini)',
-    binaryName: 'aider',
-    command: 'aider',
-    args: ['--model', 'gemini/gemini-2.0-flash-exp'],
-  },
-  {
-    id: 'qwen-coder',
-    name: 'Qwen Coder',
-    binaryName: 'qwen-coder',
-    command: 'qwen-coder',
+    id: 'openai-codex',
+    name: 'OpenAI Codex',
+    binaryName: 'codex',
+    command: 'codex',
     args: [],
   },
   {
-    id: 'terminal',
-    name: 'CLI Terminal',
-    binaryName: 'bash',
-    command: 'bash',
+    id: 'gemini-cli',
+    name: 'Gemini CLI',
+    binaryName: 'gemini',
+    command: 'gemini',
+    args: [],
+  },
+  {
+    id: 'qwen3-coder',
+    name: 'Qwen3 Coder',
+    binaryName: 'qwen3-coder',
+    command: 'qwen3-coder',
     args: [],
   },
 ];
diff --git a/src/web/mobile/AllSessionsView.tsx b/src/web/mobile/AllSessionsView.tsx
index f2b1edfe..a6ccab88 100644
--- a/src/web/mobile/AllSessionsView.tsx
+++ b/src/web/mobile/AllSessionsView.tsx
@@ -55,9 +55,9 @@ function MobileSessionCard({ session, isActive, onSelect }: SessionCardProps) {
   const getToolTypeLabel = (): string => {
     const toolTypeMap: Record<string, string> = {
       'claude-code': 'Claude Code',
-      'aider-gemini': 'Aider (Gemini)',
-      'qwen-coder': 'Qwen Coder',
-      'terminal': 'Terminal',
+      'openai-codex': 'OpenAI Codex',
+      'gemini-cli': 'Gemini CLI',
+      'qwen3-coder': 'Qwen3 Coder',
     };
     return toolTypeMap[session.toolType] || session.toolType;
   };
diff --git a/src/web/mobile/SessionPillBar.tsx b/src/web/mobile/SessionPillBar.tsx
index 47e521fb..c30196b4 100644
--- a/src/web/mobile/SessionPillBar.tsx
+++ b/src/web/mobile/SessionPillBar.tsx
@@ -215,9 +215,9 @@ function SessionInfoPopover({ session, anchorRect, onClose }: SessionInfoPopover
   const getToolTypeLabel = (): string => {
     const toolTypeMap: Record<string, string> = {
       'claude-code': 'Claude Code',
-      'aider-gemini': 'Aider (Gemini)',
-      'qwen-coder': 'Qwen Coder',
-      'terminal': 'Terminal',
+      'openai-codex': 'OpenAI Codex',
+      'gemini-cli': 'Gemini CLI',
+      'qwen3-coder': 'Qwen3 Coder',
     };
     return toolTypeMap[session.toolType] || session.toolType;
   };