mirror of
https://github.com/stablyai/orca.git
synced 2026-10-18 08:03:22 +00:00
BingZandJinwoo Hong
5b1b8cc61f
* fix(preflight): resolve WSL/SSH agent paths past shell aliases LeanCTX and similar tools wrap claude/codex as interactive shell aliases. command -v then returns alias text, which fails absolute-path detection and hides installed agents (#7816). Prefer bash type -P, then zsh type -p, then command -v for dash/sh fallback in WSL agent discovery, WSL isCommandOnPath, and remote relay probes. * fix(preflight): harden alias-safe PATH lookup chain Require non-empty results between type -P, type -p, and command -v so bash type -p empty success cannot skip later lookups. * fix(preflight): resolve agent executables directly from PATH --------- Co-authored-by: Jinwoo Hong <73622457+Jinwoo-H@users.noreply.github.com>
57 lines
1.9 KiB
TypeScript
57 lines
1.9 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { buildPosixCommandPathLookupScript } from '../../shared/posix-command-path-lookup'
|
|
|
|
const { runPreflightCommandInWslMock } = vi.hoisted(() => ({
|
|
runPreflightCommandInWslMock: vi.fn()
|
|
}))
|
|
|
|
vi.mock('./preflight-wsl-command', () => ({
|
|
runPreflightCommandInWsl: runPreflightCommandInWslMock
|
|
}))
|
|
|
|
import { isCommandOnPath } from './preflight-command-exec'
|
|
|
|
describe('isCommandOnPath', () => {
|
|
const sentinel = '__ORCA_PREFLIGHT_COMMAND_PATH__'
|
|
|
|
beforeEach(() => {
|
|
runPreflightCommandInWslMock.mockReset()
|
|
})
|
|
|
|
afterEach(() => {
|
|
vi.restoreAllMocks()
|
|
})
|
|
|
|
it('uses the shared literal lookup and accepts a sentinel-prefixed POSIX path', async () => {
|
|
vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
|
|
runPreflightCommandInWslMock.mockResolvedValue({
|
|
stdout: `shell startup chatter\n${sentinel}/home/user/.local/bin/codex\n`,
|
|
stderr: ''
|
|
})
|
|
|
|
const found = await isCommandOnPath('codex', { distro: 'Ubuntu' })
|
|
|
|
expect(found).toBe(true)
|
|
expect(runPreflightCommandInWslMock).toHaveBeenCalledOnce()
|
|
const [, command] = runPreflightCommandInWslMock.mock.calls[0] as [{ distro: string }, string]
|
|
expect(command).toContain(
|
|
buildPosixCommandPathLookupScript({ kind: 'literal', value: 'codex' })
|
|
)
|
|
expect(command).toContain(
|
|
['if [ -n "$resolved" ]; then', `printf '${sentinel}%s\\n' "$resolved"`, 'fi'].join('\n')
|
|
)
|
|
})
|
|
|
|
it.each([
|
|
['/absolute/startup/chatter', false],
|
|
[`${sentinel}relative/path`, false],
|
|
['codex', false],
|
|
["alias codex='codex --wrapped'", false]
|
|
])('parses WSL lookup output %s as available: %s', async (stdout, expected) => {
|
|
vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
|
|
runPreflightCommandInWslMock.mockResolvedValue({ stdout: `${stdout}\n`, stderr: '' })
|
|
|
|
await expect(isCommandOnPath('codex', { distro: 'Ubuntu' })).resolves.toBe(expected)
|
|
})
|
|
})
|