mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
* fix(windows): codex and claude get a prompt's double quotes in Windows PowerShell Windows PowerShell 5.1 (and pwsh before 7.3) does not escape an embedded `"` when it builds a native program's command line, so every quote in a launch prompt was dropped, and quotes could split the prompt into extra arguments. Orca's PowerShell codex and claude wrappers now escape their arguments at runtime for the PowerShell that is actually running, through one shared __OrcaNativeArgs function. pwsh 7.3+ already escapes, so it gets the text untouched. * fix(windows): escape agent args for .cmd shims under pwsh 7.3+ too pwsh 7.3+ defaults to the Windows argument mode, which still passes .cmd/.bat targets the Legacy way, so a codex or claude .cmd shim kept dropping quotes there. The function now takes the program it escapes for and names the modes that escape by themselves, and anchors the 5.1 trailing-backslash fix at the true end of the text (`$` also matched before a final newline). Tests now run the real codex wrapper with a quoted prompt, cover pwsh's Legacy mode and the newline case, and pin the claude wrapper's call. * fix(windows): strip comment lines from the PowerShell bootstrap payload The shared escaping function pushed the encoded bootstrap to 27,324 of the 28,000-character budget, leaving almost no room for a startup command to ride in -EncodedCommand, so short commands fell back to stdin (the path #7236 broke). Comment lines document the source but only spend that budget in the payload; dropping them frees 3,732 encoded characters, more headroom than main had. * fix(windows): quote agent args with "" where cmd.exe or Windows PowerShell reads them Escaping embedded quotes as \" let pwsh 7.3+'s .cmd quoting expose a prompt's `&` to cmd.exe, which then ran the rest as a command. Where cmd.exe reads the line, or Windows PowerShell counts quotes naively, the function now quotes the argument itself and writes each quote as "", as process-host's windows-command-line.ts already does. That also delivers text 5.1 used to strip, so its special cases go away. The codex and claude wrappers now come as one fragment with the function they call, the bootstrap test pins the startup-command budget instead of restating the strip, and the cwd-restore comment leaves the payload too. --------- Co-authored-by: Orca Worker <orca-worker@localhost>
96 lines
4.8 KiB
TypeScript
96 lines
4.8 KiB
TypeScript
// Orca's `codex` shell function for every shell family: runs launch prep and adds
|
|
// --no-daemon. Pure text, so any host that writes a shell script can embed it.
|
|
// Why --no-daemon: Codex 0.156+ otherwise shares one server per CODEX_HOME that runs every tab's
|
|
// hooks with the first tab's Orca env and dies with it (#22873). These args need that server or exit 2.
|
|
export const CODEX_SHARED_SERVER_ARGS = ['agents', 'queue', '--no-daemon', '--remote'] as const
|
|
const CODEX_SHARED_SERVER_ARG_PATTERN = `^(${CODEX_SHARED_SERVER_ARGS.join('|')}|--remote=.*)$`
|
|
|
|
export function getPosixCodexShellLaunchPreflight(): string {
|
|
return `# Why: a typed alias expands inside the shell, after pane launch prep.
|
|
# Why unalias inside the substitution: an alias named codex makes command -v
|
|
# report the alias text, and the subshell leaves the user's own alias intact.
|
|
# Why || : twice — zsh alone aborts inside the substitution, but every shell's
|
|
# assignment adopts its exit status, so an absent codex trips set -e in bash too.
|
|
__orca_codex_binary="$(unalias codex 2>/dev/null || :; command -v codex 2>/dev/null || :)"
|
|
if [[ -n "\${__orca_codex_binary:-}" && -x "\${__orca_codex_binary}" ]]; then
|
|
# Why the function reserved word: it suppresses alias expansion of the name,
|
|
# which otherwise rewrites this header at parse time and aborts the whole file.
|
|
function codex {
|
|
# Why local: zsh's warn_create_global warns for each global a function creates.
|
|
local __orca_codex_arg __orca_codex_isolate="\${ORCA_CODEX_ISOLATE:-1}"
|
|
if [[ -n "\${ORCA_CODEX_LAUNCH_PREFLIGHT:-}" && -x "\${ORCA_CODEX_LAUNCH_PREFLIGHT}" ]]; then
|
|
"\${ORCA_CODEX_LAUNCH_PREFLIGHT}" agent hooks prepare-codex >/dev/null 2>&1 || :
|
|
fi
|
|
for __orca_codex_arg in "$@"; do
|
|
case "$__orca_codex_arg" in ${CODEX_SHARED_SERVER_ARGS.join('|')}|--remote=*) __orca_codex_isolate=0 ;; esac
|
|
done
|
|
# Why probe every launch: a cached answer goes stale across an upgrade, and 0.155 and older exit 2 on the flag.
|
|
if [[ "$__orca_codex_isolate" != 0 ]]; then
|
|
case "$(command codex --help 2>/dev/null </dev/null)" in *--no-daemon*) set -- --no-daemon "$@" ;; esac
|
|
fi
|
|
command codex "$@"
|
|
}
|
|
fi
|
|
unset __orca_codex_binary
|
|
`
|
|
}
|
|
|
|
export function getFishCodexShellLaunchPreflight(): string {
|
|
return `# Why captured: an unquoted (type -t codex) expands to zero words when codex is
|
|
# absent, leaving "test = file" — fish then errors instead of failing closed.
|
|
# Quoting in place is not the fix; fish never substitutes inside double quotes.
|
|
set -l __orca_codex_type (type -t codex 2>/dev/null)
|
|
if test "$__orca_codex_type" = file
|
|
function codex
|
|
if test -x "$ORCA_CODEX_LAUNCH_PREFLIGHT"
|
|
command "$ORCA_CODEX_LAUNCH_PREFLIGHT" agent hooks prepare-codex >/dev/null 2>&1; or true
|
|
end
|
|
if test "$ORCA_CODEX_ISOLATE" != 0; and not string match -qr -- '${CODEX_SHARED_SERVER_ARG_PATTERN}' $argv; and command codex --help 2>/dev/null </dev/null | string match -q -- '*--no-daemon*'
|
|
set argv --no-daemon $argv
|
|
end
|
|
command codex $argv
|
|
end
|
|
end
|
|
set -e __orca_codex_type`
|
|
}
|
|
|
|
export function getPowerShellCodexShellLaunchPreflight(): string {
|
|
return `$orcaCodexCommand = Get-Command codex -ErrorAction SilentlyContinue | Select-Object -First 1
|
|
if ($orcaCodexCommand -and
|
|
$orcaCodexCommand.CommandType -in @("Application", "ExternalScript")) {
|
|
function Global:codex {
|
|
$orcaCodexExecutable = Get-Command codex -CommandType Application,ExternalScript -ErrorAction SilentlyContinue | Select-Object -First 1
|
|
if (-not $orcaCodexExecutable) {
|
|
Write-Error "codex executable not found"
|
|
$global:LASTEXITCODE = 127
|
|
return
|
|
}
|
|
$orcaCodexFlags = @()
|
|
# Why try/catch: under the user's $ErrorActionPreference = 'Stop', a failing prep or probe must not abort the launch.
|
|
if ($env:ORCA_CODEX_LAUNCH_PREFLIGHT) {
|
|
try {
|
|
& $env:ORCA_CODEX_LAUNCH_PREFLIGHT agent hooks prepare-codex *> $null
|
|
} catch {
|
|
}
|
|
}
|
|
if ($env:ORCA_CODEX_ISOLATE -ne '0' -and -not (@($args) -cmatch '${CODEX_SHARED_SERVER_ARG_PATTERN}')) {
|
|
try {
|
|
if ((& $orcaCodexExecutable.Source --help 2>$null) -match '--no-daemon') {
|
|
$orcaCodexFlags = @('--no-daemon')
|
|
}
|
|
} catch {
|
|
}
|
|
}
|
|
$orcaCodexArgs = @(__OrcaEscapeNativeArgs $orcaCodexExecutable.Source $args)
|
|
# Why: a native command inside a function never sees the function's pipeline input on its own.
|
|
if ($MyInvocation.ExpectingInput) {
|
|
$input | & $orcaCodexExecutable.Source @orcaCodexFlags @orcaCodexArgs
|
|
} else {
|
|
& $orcaCodexExecutable.Source @orcaCodexFlags @orcaCodexArgs
|
|
}
|
|
$global:LASTEXITCODE = $LASTEXITCODE
|
|
}
|
|
}
|
|
Remove-Variable orcaCodexCommand -ErrorAction SilentlyContinue`
|
|
}
|