mirror of
https://github.com/stablyai/orca.git
synced 2026-10-18 00:03:20 +00:00
* 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>
115 lines
3.6 KiB
TypeScript
115 lines
3.6 KiB
TypeScript
import { execFile } from 'node:child_process'
|
|
import path from 'node:path'
|
|
import { promisify } from 'node:util'
|
|
import { buildPosixCommandPathLookupScript } from '../../shared/posix-command-path-lookup'
|
|
import { buildLocalPreflightEnv } from './preflight-local-env'
|
|
import { runPreflightCommandInWsl } from './preflight-wsl-command'
|
|
import type { WslPreflightTarget } from './preflight-wsl-agent-detection'
|
|
|
|
const execFileAsync = promisify(execFile)
|
|
export const PREFLIGHT_COMMAND_TIMEOUT_MS = 5000
|
|
const WSL_COMMAND_PATH_SENTINEL = '__ORCA_PREFLIGHT_COMMAND_PATH__'
|
|
|
|
export type PreflightCommandResult = { stdout: string; stderr: string }
|
|
|
|
export function shellQuote(value: string): string {
|
|
return `'${value.replace(/'/g, "'\\''")}'`
|
|
}
|
|
|
|
async function withPreflightTimeout<T>(command: string, commandPromise: Promise<T>): Promise<T> {
|
|
let timeout: ReturnType<typeof setTimeout> | null = null
|
|
try {
|
|
return await Promise.race([
|
|
commandPromise,
|
|
new Promise<never>((_resolve, reject) => {
|
|
timeout = setTimeout(() => {
|
|
const error = Object.assign(new Error(`Timed out running ${command}`), {
|
|
code: 'ETIMEDOUT'
|
|
})
|
|
reject(error)
|
|
}, PREFLIGHT_COMMAND_TIMEOUT_MS)
|
|
if (typeof timeout.unref === 'function') {
|
|
timeout.unref()
|
|
}
|
|
})
|
|
])
|
|
} finally {
|
|
if (timeout) {
|
|
clearTimeout(timeout)
|
|
}
|
|
}
|
|
}
|
|
|
|
export async function execLocalPreflightCommand(
|
|
command: string,
|
|
args: string[]
|
|
): Promise<PreflightCommandResult> {
|
|
const env = buildLocalPreflightEnv()
|
|
const commandPromise = execFileAsync(command, args, {
|
|
encoding: 'utf-8',
|
|
timeout: PREFLIGHT_COMMAND_TIMEOUT_MS,
|
|
...(env ? { env } : {})
|
|
}) as Promise<PreflightCommandResult>
|
|
|
|
return withPreflightTimeout(command, commandPromise)
|
|
}
|
|
|
|
export async function execCommandInWsl(
|
|
target: WslPreflightTarget,
|
|
command: string
|
|
): Promise<PreflightCommandResult> {
|
|
const commandPromise = runPreflightCommandInWsl(target, command, PREFLIGHT_COMMAND_TIMEOUT_MS)
|
|
return withPreflightTimeout('wsl.exe', commandPromise)
|
|
}
|
|
|
|
export async function isCommandAvailable(
|
|
command: string,
|
|
wslTarget?: WslPreflightTarget
|
|
): Promise<boolean> {
|
|
try {
|
|
await (wslTarget
|
|
? execCommandInWsl(wslTarget, `${shellQuote(command)} --version`)
|
|
: execLocalPreflightCommand(command, ['--version']))
|
|
return true
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|
|
|
|
export async function isCommandOnPath(
|
|
command: string,
|
|
wslTarget?: WslPreflightTarget
|
|
): Promise<boolean> {
|
|
const finder = process.platform === 'win32' ? 'where' : 'which'
|
|
try {
|
|
const { stdout } = wslTarget
|
|
? // Why: preflight must validate the executable on PATH, not a shell alias or function.
|
|
await execCommandInWsl(
|
|
wslTarget,
|
|
[
|
|
buildPosixCommandPathLookupScript({ kind: 'literal', value: command }),
|
|
'if [ -n "$resolved" ]; then',
|
|
`printf '${WSL_COMMAND_PATH_SENTINEL}%s\\n' "$resolved"`,
|
|
'fi'
|
|
].join('\n')
|
|
)
|
|
: await execLocalPreflightCommand(finder, [command])
|
|
if (wslTarget) {
|
|
// Why: WSL startup chatter can contain unrelated absolute paths.
|
|
return stdout
|
|
.split(/\r?\n/)
|
|
.map((line) => line.trim())
|
|
.filter((line) => line.startsWith(WSL_COMMAND_PATH_SENTINEL))
|
|
.map((line) => line.slice(WSL_COMMAND_PATH_SENTINEL.length))
|
|
.some((line) => path.posix.isAbsolute(line))
|
|
}
|
|
|
|
return stdout
|
|
.split(/\r?\n/)
|
|
.map((line) => line.trim())
|
|
.some((line) => path.isAbsolute(line))
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|