feat: add OpenCode to spawn dialogs and empty-state UI#143
Conversation
- SpawnAgentCli type: 'claude' | 'codex' → 'claude' | 'codex' | 'opencode' - SpawnAgentDialog: adds OpenCode card to the spawn grid (3-col) - TerminalPane empty state: adds OpenCode quick-spawn button alongside Claude and Codex UI-only change. No relay package bump, no headless routing. https://claude.ai/code/session_01KXU1uAUwx3L82TMLnAmU4z
|
Your free trial PR review limit of 300 PRs has been reached. Please upgrade your plan to continue using CodeAnt AI. |
|
Warning Review limit reached
More reviews will be available in 46 minutes and 8 seconds. Learn how PR review limits work. Your organization has run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (3)
📝 WalkthroughWalkthroughThis PR adds CLI availability checking across the spawn agent UI. A new IPC handler queries whether CLIs ( ChangesCLI Availability Checking Feature
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces support for a new agent type, "OpenCode". It updates the SpawnAgentCli type, integrates the OpenCodeIcon, and adjusts the UI layout in both SpawnAgentDialog and TerminalPane to support a three-column grid for spawning the new agent. The feedback suggests improving type safety and maintainability in SpawnAgentDialog by typing the Icon property in AGENT_OPTIONS as a generic React.ComponentType rather than hardcoding it to typeof ClaudeIcon.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| const AGENT_OPTIONS: Array<{ cli: SpawnAgentCli; label: string; Icon: typeof ClaudeIcon }> = [ | ||
| { cli: 'claude', label: 'Claude', Icon: ClaudeIcon }, | ||
| { cli: 'codex', label: 'Codex', Icon: CodexIcon } | ||
| { cli: 'codex', label: 'Codex', Icon: CodexIcon }, | ||
| { cli: 'opencode', label: 'OpenCode', Icon: OpenCodeIcon } | ||
| ] |
There was a problem hiding this comment.
The type of the Icon property in AGENT_OPTIONS is hardcoded to typeof ClaudeIcon. While this works because all agent icons share the same signature, it is more idiomatic and maintainable to use a generic React component type. This prevents potential type issues when adding new agent icons with different implementations in the future.
| const AGENT_OPTIONS: Array<{ cli: SpawnAgentCli; label: string; Icon: typeof ClaudeIcon }> = [ | |
| { cli: 'claude', label: 'Claude', Icon: ClaudeIcon }, | |
| { cli: 'codex', label: 'Codex', Icon: CodexIcon } | |
| { cli: 'codex', label: 'Codex', Icon: CodexIcon }, | |
| { cli: 'opencode', label: 'OpenCode', Icon: OpenCodeIcon } | |
| ] | |
| const AGENT_OPTIONS: Array<{ cli: SpawnAgentCli; label: string; Icon: React.ComponentType<{ className?: string }> }> = [ | |
| { cli: 'claude', label: 'Claude', Icon: ClaudeIcon }, | |
| { cli: 'codex', label: 'Codex', Icon: CodexIcon }, | |
| { cli: 'opencode', label: 'OpenCode', Icon: OpenCodeIcon } | |
| ] |
|
ℹ️ pr-reviewer: review only — no file changes were applied to the PR (nothing to commit after review). The notes below are advisory and were not pushed. Reviewed PR #143 against I did not find a reproducible breakage in the current checkout, so I left the PR source unchanged. Verification run:
All passed locally. I cannot confirm GitHub CI status, mergeability, or pending checks from this sandbox, so I’m not marking this as READY. |
Adds a broker:check-cli-available IPC that resolves each CLI binary on PATH using the same augmented-path lookup as preflightSpawnCli. Both SpawnAgentDialog and TerminalPane check availability on mount and disable (opacity-40, not-allowed cursor) any spawn button whose CLI is not found, with a tooltip explaining it is not installed. Buttons remain enabled until the check resolves so there is no flash. https://claude.ai/code/session_01KXU1uAUwx3L82TMLnAmU4z
|
Your free trial PR review limit of 300 PRs has been reached. Please upgrade your plan to continue using CodeAnt AI. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
🧹 Nitpick comments (2)
src/main/ipc-handlers.ts (1)
354-356: ⚡ Quick winRestrict
broker:check-cli-availableto supported harness IDs.This IPC endpoint currently accepts any string and forwards it to command resolution. Normalize + whitelist (
claude/codex/opencode) before resolving to keep the boundary tight and avoid unintended command probing.♻️ Suggested hardening
+ const SUPPORTED_SPAWN_CLIS = new Set(['claude', 'codex', 'opencode'] as const) + ipcMain.handle('broker:check-cli-available', (_, cli: string) => { - return Boolean(resolveCommandWithAugmentedPath(cli)) + const normalized = typeof cli === 'string' ? cli.trim().toLowerCase() : '' + if (!SUPPORTED_SPAWN_CLIS.has(normalized as 'claude' | 'codex' | 'opencode')) { + return false + } + return Boolean(resolveCommandWithAugmentedPath(normalized)) })🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/main/ipc-handlers.ts` around lines 354 - 356, The IPC handler 'broker:check-cli-available' currently accepts any cli string; restrict it by normalizing the input and only allowing the whitelisted harness IDs "claude", "codex", and "opencode" before calling resolveCommandWithAugmentedPath. Update the handler function to map/normalize incoming cli to lowercase, check membership against the allowed set, and return false immediately for anything else; only call resolveCommandWithAugmentedPath(cli) when the value is in the whitelist to avoid unintended command probing.src/renderer/src/components/sidebar/SpawnAgentDialog.tsx (1)
50-58: ⚡ Quick winDerive CLI checks from a single shared options source.
The CLI list is hardcoded here and again in other spawn surfaces. Centralizing options (and deriving availability checks from that list) will prevent drift during future harness additions.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/renderer/src/components/sidebar/SpawnAgentDialog.tsx` around lines 50 - 58, Replace the hardcoded clis array in the useEffect with the canonical shared options list: import the centralized CLI options constant used across spawn surfaces (the shared CLI/options array), map/convert those option entries to the SpawnAgentCli values, then run the same availability checks with pear.broker.checkCliAvailable and call setCliAvailability with Object.fromEntries(results). Update the local variable referenced as clis and keep the existing promise logic (Promise.all, pear.broker.checkCliAvailable, setCliAvailability) and types (SpawnAgentCli) so availability checks are derived from the single shared source rather than the hardcoded ['claude','codex','opencode'].
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@src/main/ipc-handlers.ts`:
- Around line 354-356: The IPC handler 'broker:check-cli-available' currently
accepts any cli string; restrict it by normalizing the input and only allowing
the whitelisted harness IDs "claude", "codex", and "opencode" before calling
resolveCommandWithAugmentedPath. Update the handler function to map/normalize
incoming cli to lowercase, check membership against the allowed set, and return
false immediately for anything else; only call
resolveCommandWithAugmentedPath(cli) when the value is in the whitelist to avoid
unintended command probing.
In `@src/renderer/src/components/sidebar/SpawnAgentDialog.tsx`:
- Around line 50-58: Replace the hardcoded clis array in the useEffect with the
canonical shared options list: import the centralized CLI options constant used
across spawn surfaces (the shared CLI/options array), map/convert those option
entries to the SpawnAgentCli values, then run the same availability checks with
pear.broker.checkCliAvailable and call setCliAvailability with
Object.fromEntries(results). Update the local variable referenced as clis and
keep the existing promise logic (Promise.all, pear.broker.checkCliAvailable,
setCliAvailability) and types (SpawnAgentCli) so availability checks are derived
from the single shared source rather than the hardcoded
['claude','codex','opencode'].
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: a0094217-ed35-45f4-bae6-3e6edb02acbc
📒 Files selected for processing (7)
src/main/broker.tssrc/main/ipc-handlers.tssrc/preload/index.tssrc/renderer/src/components/sidebar/SpawnAgentDialog.tsxsrc/renderer/src/components/terminal/TerminalPane.tsxsrc/renderer/src/lib/spawn-agent.tssrc/shared/types/ipc.ts
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
There was a problem hiding this comment.
2 issues found across 6 files (changes from recent commits).
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
|
Your free trial PR review limit of 300 PRs has been reached. Please upgrade your plan to continue using CodeAnt AI. |
|
✅ pr-reviewer applied fixes — committed and pushed Fixed the PR issues I could validate in the current checkout. Changes made:
Validation run:
I’m not printing |
There was a problem hiding this comment.
🧹 Nitpick comments (2)
src/main/ipc-handlers.test.ts (1)
203-232: ⚡ Quick winAdd test case for unavailable CLI.
The test suite covers string input with an available CLI and non-string input rejection, but misses the case where a valid string CLI is provided but the command is not available. This would ensure the handler correctly returns false in that scenario.
🧪 Suggested additional test case
it('rejects non-string CLI values', () => { const handler = mock.handlers.get('broker:check-cli-available') expect(handler).toBeTypeOf('function') const result = handler?.({}, null) expect(result).toBe(false) expect(mock.isCommandAvailableWithAugmentedPath).not.toHaveBeenCalled() }) + + it('returns false when CLI is not available', () => { + const handler = mock.handlers.get('broker:check-cli-available') + expect(handler).toBeTypeOf('function') + mock.isCommandAvailableWithAugmentedPath.mockReturnValueOnce(false) + + const result = handler?.({}, 'unavailable-cli') + + expect(result).toBe(false) + expect(mock.isCommandAvailableWithAugmentedPath).toHaveBeenCalledWith('unavailable-cli') + }) })🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/main/ipc-handlers.test.ts` around lines 203 - 232, Add a test asserting that when a string CLI name is passed but mock.isCommandAvailableWithAugmentedPath returns false the IPC handler for 'broker:check-cli-available' returns false; locate the handler via mock.handlers.get('broker:check-cli-available') after calling registerIpcHandlers(), set mock.isCommandAvailableWithAugmentedPath.mockReturnValueOnce(false), invoke the handler with a string like 'opencode', and assert the result is false and that mock.isCommandAvailableWithAugmentedPath was called with the same string.src/main/broker.test.ts (1)
1164-1187: ⚡ Quick winAdd test case for command not found.
The test suite covers the happy path (command exists) and blank input, but misses the negative case where a valid string command is provided but doesn't exist on PATH. This would improve coverage of the helper's behavior.
🧪 Suggested additional test case
it('returns false for blank commands', () => { expect(isCommandAvailableWithAugmentedPath(' ')).toBe(false) }) + + it('returns false when command is not found', () => { + process.env.PATH = '/nonexistent/path' + expect(isCommandAvailableWithAugmentedPath('nonexistent-cli')).toBe(false) + }) })🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/main/broker.test.ts` around lines 1164 - 1187, Add a negative test for isCommandAvailableWithAugmentedPath that verifies a non-existing command returns false and does not mutate PATH: create a tempDir (using mkdtemp like the other test) with no executable inside (or set process.env.PATH to an empty dir), call isCommandAvailableWithAugmentedPath('nonexistent-cmd'), assert the result is false and assert process.env.PATH remains unchanged, and ensure the test uses the same cleanup pattern (rm, tempDir reset) as the existing tests.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@src/main/broker.test.ts`:
- Around line 1164-1187: Add a negative test for
isCommandAvailableWithAugmentedPath that verifies a non-existing command returns
false and does not mutate PATH: create a tempDir (using mkdtemp like the other
test) with no executable inside (or set process.env.PATH to an empty dir), call
isCommandAvailableWithAugmentedPath('nonexistent-cmd'), assert the result is
false and assert process.env.PATH remains unchanged, and ensure the test uses
the same cleanup pattern (rm, tempDir reset) as the existing tests.
In `@src/main/ipc-handlers.test.ts`:
- Around line 203-232: Add a test asserting that when a string CLI name is
passed but mock.isCommandAvailableWithAugmentedPath returns false the IPC
handler for 'broker:check-cli-available' returns false; locate the handler via
mock.handlers.get('broker:check-cli-available') after calling
registerIpcHandlers(), set
mock.isCommandAvailableWithAugmentedPath.mockReturnValueOnce(false), invoke the
handler with a string like 'opencode', and assert the result is false and that
mock.isCommandAvailableWithAugmentedPath was called with the same string.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro Plus
Run ID: 2f7fd702-f506-469a-915b-f059d413e7ed
📒 Files selected for processing (7)
src/main/broker.test.tssrc/main/broker.tssrc/main/ipc-handlers.test.tssrc/main/ipc-handlers.tssrc/renderer/src/components/sidebar/SpawnAgentDialog.tsxsrc/renderer/src/components/terminal/TerminalPane.tsxsrc/renderer/src/lib/spawn-agent.ts
🚧 Files skipped from review as they are similar to previous changes (5)
- src/main/broker.ts
- src/main/ipc-handlers.ts
- src/renderer/src/lib/spawn-agent.ts
- src/renderer/src/components/terminal/TerminalPane.tsx
- src/renderer/src/components/sidebar/SpawnAgentDialog.tsx
Both SpawnAgentDialog and TerminalPane lacked a cancelled flag in the CLI availability useEffect, allowing setCliAvailability to fire on an unmounted component if the user closed the pane before the IPC round trip completed. Pattern matches the existing loadPersonas/loadBurnSummaries guards in the same files. https://claude.ai/code/session_01KXU1uAUwx3L82TMLnAmU4z
|
Your free trial PR review limit of 300 PRs has been reached. Please upgrade your plan to continue using CodeAnt AI. |
2 participants
Summary
Adds OpenCode to the interactive spawn surfaces users touch directly. UI-only — no relay package bump, no headless routing, no architectural changes.
SpawnAgentClitype:'claude' | 'codex'→'claude' | 'codex' | 'opencode'SpawnAgentDialog: adds OpenCode card to the spawn grid (3-col: Claude / Codex / OpenCode)TerminalPaneempty state: adds OpenCode quick-spawn button alongside Claude and CodexWhat happens when you spawn OpenCode
For now, OpenCode spawns via the existing PTY path (same as Claude/Codex today). The headless routing for OpenCode is in PR #140 (held pending V1 structured output parsing work).
Conflicts to expect at merge
SpawnAgentDialog,TerminalPane, andSpawnAgentCliare also touched by PR #138 (Grok). The conflicts are trivial — the result after both merge should be all four harnesses in each location.Generated by Claude Code