chore: apply pr-reviewer fixes for #143

Author: agent-relay-code[bot]

src/main/broker.test.ts

@@ -192,6 +192,7 @@ vi.mock('./burn', () => ({
 
 import {
   BrokerManager,
+  isCommandAvailableWithAugmentedPath,
   parseBrokerInitCliFlags,
   resolveAgentRelayMcpCommand,
   resolveBundledBrokerBinary
@@ -209,6 +210,7 @@ const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, 'pla
 const originalPublicEnv = process.env.PUBLIC
 const originalProgramDataEnv = process.env.ProgramData
 const originalPersonaHarnessReadyTimeoutEnv = process.env.PEAR_PERSONA_HARNESS_READY_TIMEOUT_MS
+const originalPathEnv = process.env.PATH
 
 function setProcessPlatform(platform: NodeJS.Platform): void {
   Object.defineProperty(process, 'platform', {
@@ -2342,3 +2344,28 @@ describe('BrokerManager spawnAgent CLI preflight', () => {
     await manager.shutdown()
   })
 })
+
+describe('isCommandAvailableWithAugmentedPath', () => {
+  let tempDir: string | null = null
+
+  afterEach(async () => {
+    process.env.PATH = originalPathEnv
+    if (tempDir) await rm(tempDir, { recursive: true, force: true })
+    tempDir = null
+  })
+
+  it('resolves commands without mutating PATH', async () => {
+    tempDir = await mkdtemp(join(tmpdir(), 'pear-cli-path-'))
+    const toolPath = join(tempDir, 'opencode')
+    await writeFile(toolPath, '#!/bin/sh\nexit 0\n')
+    await chmod(toolPath, 0o755)
+    process.env.PATH = tempDir
+
+    expect(isCommandAvailableWithAugmentedPath('opencode')).toBe(true)
+    expect(process.env.PATH).toBe(tempDir)
+  })
+
+  it('returns false for blank commands', () => {
+    expect(isCommandAvailableWithAugmentedPath('   ')).toBe(false)
+  })
+})

src/main/broker.ts

@@ -114,6 +114,15 @@ export function resolveCommandWithAugmentedPath(command: string): string | undef
   return undefined
 }
 
+export function isCommandAvailableWithAugmentedPath(command: string): boolean {
+  const trimmed = command.trim()
+  if (!trimmed) return false
+  return Boolean(resolveCommandOnPath(trimmed, {
+    ...process.env,
+    PATH: augmentedPath()
+  }))
+}
+
 function executableCliPath(input: SpawnPtyInput): string {
   return isAbsolute(input.cli)
     ? input.cli

src/main/ipc-handlers.test.ts

@@ -47,6 +47,7 @@ const mock = vi.hoisted(() => {
       detachCloudSandbox: vi.fn(),
       onBrokerEvent: vi.fn()
     },
+    isCommandAvailableWithAugmentedPath: vi.fn(),
     integrationsManager: {
       notifyAgentState: vi.fn(async () => undefined),
       initialSpawnInstructions: vi.fn(),
@@ -105,7 +106,8 @@ vi.mock('./store', () => ({
 }))
 
 vi.mock('./broker', () => ({
-  brokerManager: mock.brokerManager
+  brokerManager: mock.brokerManager,
+  isCommandAvailableWithAugmentedPath: mock.isCommandAvailableWithAugmentedPath
 }))
 
 vi.mock('./git', () => ({
@@ -208,10 +210,14 @@ describe('registerIpcHandlers broker:spawn-agent', () => {
 })
 
 describe('registerIpcHandlers broker:list-personas', () => {
+=======
+describe('registerIpcHandlers broker:check-cli-available', () => {
+>>>>>>> ed6285c (chore: apply pr-reviewer fixes for #143)
   beforeEach(() => {
     mock.handlers.clear()
     mock.ipcMain.handle.mockClear()
     mock.ipcMain.on.mockClear()
+<<<<<<< HEAD
     mock.brokerManager.listPersonas.mockReset()
     vi.mocked(loadStore).mockReset()
     vi.mocked(loadStore).mockReturnValue({ projects: [], activeProjectId: null })
@@ -347,3 +353,34 @@ describe('registerIpcHandlers git:generate-commit-message', () => {
     expect(mock.brokerManager.generateCommitDraft).not.toHaveBeenCalled()
   })
 })
+
+describe('registerIpcHandlers broker:check-cli-available', () => {
+  beforeEach(() => {
+    mock.handlers.clear()
+    mock.ipcMain.handle.mockClear()
+    mock.ipcMain.on.mockClear()
+    mock.isCommandAvailableWithAugmentedPath.mockReset()
+    registerIpcHandlers()
+  })
+
+  it('returns whether the requested CLI can be resolved', () => {
+    const handler = mock.handlers.get('broker:check-cli-available')
+    expect(handler).toBeTypeOf('function')
+    mock.isCommandAvailableWithAugmentedPath.mockReturnValueOnce(true)
+
+    const result = handler?.({}, 'opencode')
+
+    expect(result).toBe(true)
+    expect(mock.isCommandAvailableWithAugmentedPath).toHaveBeenCalledWith('opencode')
+  })
+
+  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()
+  })
+})

src/main/ipc-handlers.ts

@@ -17,7 +17,7 @@ import {
   addProjectIntegration,
   removeProjectIntegration
 } from './store'
-import { brokerManager, resolveCommandWithAugmentedPath } from './broker'
+import { brokerManager, isCommandAvailableWithAugmentedPath } from './broker'
 import * as git from './git'
 import * as filesystem from './filesystem'
 import * as auth from './auth'
@@ -387,7 +387,7 @@ export function registerIpcHandlers(): void {
   })
 
   ipcMain.handle('broker:check-cli-available', (_, cli: string) => {
-    return Boolean(resolveCommandWithAugmentedPath(cli))
+    return typeof cli === 'string' && isCommandAvailableWithAugmentedPath(cli)
   })
 
   ipcMain.handle('broker:list-details', async () => {

src/renderer/src/components/sidebar/SpawnAgentDialog.tsx

@@ -2,7 +2,7 @@ import type React from 'react'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { Loader2, X } from 'lucide-react'
 import { ClaudeIcon, CodexIcon, GrokIcon, OpenCodeIcon } from '@/components/common/AgentIcons'
-import { listProjectPersonas, spawnProjectAgent, spawnProjectPersona, type SpawnAgentCli } from '@/lib/spawn-agent'
+import { SPAWN_AGENT_CLI_INSTALL_COMMANDS, listProjectPersonas, spawnProjectAgent, spawnProjectPersona, type SpawnAgentCli } from '@/lib/spawn-agent'
 import { pear, type WorkforcePersona } from '@/lib/ipc'
 import { useProjectStore, type ProjectRoot } from '@/stores/project-store'
 import { useUIStore } from '@/stores/ui-store'
@@ -231,7 +231,7 @@ export function SpawnAgentDialog(): React.ReactNode {
                     className="flex min-h-[92px] flex-col items-center justify-center gap-2 rounded-lg border border-[var(--pear-border)] text-sm text-[var(--pear-text-dim)] hover:border-[var(--pear-accent-dim)] hover:text-[var(--pear-text)] disabled:cursor-not-allowed disabled:opacity-40"
                     title={
                       !root?.pathExists ? `Path not found: ${root?.path || project.rootPath}`
-                      : cliAvailability[cli] === false ? `${label} is not installed — run: npm install -g ${cli}`
+                      : cliAvailability[cli] === false ? `${label} is not installed - run: ${SPAWN_AGENT_CLI_INSTALL_COMMANDS[cli]}`
                       : `Spawn ${label}`
                     }
                   >

src/renderer/src/components/terminal/TerminalPane.tsx

@@ -3,7 +3,7 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { AlertTriangle, ChevronLeft, ChevronRight, Columns2, CornerUpLeft, Loader2, Network, PanelTop, X } from 'lucide-react'
 import { AgentHarnessIcon, ClaudeIcon, CodexIcon, GrokIcon, OpenCodeIcon } from '@/components/common/AgentIcons'
 import { ChatComposerInput } from '@/components/chat/ChatComposerInput'
-import { spawnProjectAgent, type SpawnAgentCli } from '@/lib/spawn-agent'
+import { SPAWN_AGENT_CLI_INSTALL_COMMANDS, spawnProjectAgent, type SpawnAgentCli } from '@/lib/spawn-agent'
 import { formatTokenCount } from '@/lib/format'
 import { pear, type BurnAgentInput, type BurnAgentSummary, type TerminalAttachMode } from '@/lib/ipc'
 import { getAgentKeyForAgent, type Agent, useAgentStore } from '@/stores/agent-store'
@@ -803,7 +803,7 @@ export function TerminalPane(): React.ReactNode {
                 className="flex items-center justify-center gap-2 rounded-lg border border-[var(--pear-border)] px-4 py-3 text-sm text-[var(--pear-text-dim)] hover:border-[var(--pear-accent-dim)] hover:text-[var(--pear-text)] disabled:cursor-not-allowed disabled:opacity-40"
                 title={
                   !activeRoot?.pathExists ? `Path not found: ${activeRoot?.path || activeProject.rootPath}`
-                  : cliAvailability[cli] === false ? `${label} is not installed`
+                  : cliAvailability[cli] === false ? `${label} is not installed - run: ${SPAWN_AGENT_CLI_INSTALL_COMMANDS[cli]}`
                   : `Spawn ${label}`
                 }
               >

src/renderer/src/lib/spawn-agent.ts

@@ -5,6 +5,13 @@ import { useUIStore } from '@/stores/ui-store'
 
 export type SpawnAgentCli = 'claude' | 'codex' | 'grok' | 'opencode'
 
+export const SPAWN_AGENT_CLI_INSTALL_COMMANDS: Record<SpawnAgentCli, string> = {
+  claude: 'npm install -g @anthropic-ai/claude-code',
+  codex: 'npm install -g @openai/codex',
+  grok: 'npm install -g grok-ai',
+  opencode: 'npm install -g opencode-ai'
+}
+
 function nextAgentName(cli: SpawnAgentCli, projectId: string, liveNames: string[]): string {
   const existingNames = new Set([
     ...liveNames,