Files
orca/src/main/pty/omp-shell-wrapper.ts
T
Neil fc4519cda4 fix(omp): preserve zsh startup with global aliases (#20621)
Validated and independently reviewed OMP integration fix.
2026-09-14 13:56:22 -07:00

145 lines
4.8 KiB
TypeScript

// Why: OMP 15.x discovers built-in user extensions from ~/.omp/agent, but a
// typed `omp` in an existing terminal still needs Orca's status extension
// passed explicitly. Do not redirect PI_CODING_AGENT_DIR here: that variable
// is OMP's mutable home, so config/auth/session commands must keep the user's
// normal source of truth.
const OMP_SUBCOMMANDS = [
'__complete',
'acp',
'agents',
'auth-broker',
'auth-gateway',
'bench',
'commit',
'completions',
'config',
'dry-balance',
'gallery',
'grep',
'grievances',
'install',
'join',
'models',
'plugin',
'read',
'say',
'search',
'setup',
'shell',
'ssh',
'stats',
'tiny-models',
'token',
'ttsr',
'update',
'usage',
'worktree',
'q',
'wt'
] as const
export function getPosixOmpShellWrapper(): string {
const subcommands = OMP_SUBCOMMANDS.map((value) => `'${value}'`).join('|')
return `# Why: OMP does not auto-load Orca's managed status extension; wrap only
# interactive launch invocations so subcommands such as \`omp config\` keep
# their normal argv shape.
__orca_omp_should_skip_extension() {
case "\${1:-}" in
'help'|'--help'|'-h'|'--version'|'-v') return 0 ;;
${subcommands}) return 0 ;;
esac
return 1
}
__orca_omp_cwd_is_usable() {
local __orca_physical_cwd
[[ -x . ]] || return 1
if [[ -n "\${PWD:-}" && -d "\${PWD:-}" ]]; then
[[ "\${PWD}" -ef . ]]
else
# Why compare the path: shell builtins can print a cached path for a deleted cwd.
__orca_physical_cwd="$(builtin pwd -P 2>/dev/null)" || return 1
[[ -d "$__orca_physical_cwd" && "$__orca_physical_cwd" -ef . ]]
fi
}
__orca_omp_invoke() {
local __orca_use_extension="$1"
shift
if [[ $__orca_use_extension -eq 1 && -n "\${ORCA_OMP_STATUS_EXTENSION:-}" && -f "\${ORCA_OMP_STATUS_EXTENSION}" ]]; then
if [[ "\${1:-}" == "launch" ]]; then
shift
command omp launch --extension "\${ORCA_OMP_STATUS_EXTENSION}" "$@"
else
command omp --extension "\${ORCA_OMP_STATUS_EXTENSION}" "$@"
fi
else
command omp "$@"
fi
}
__orca_omp() {
local __orca_use_extension=1
__orca_omp_should_skip_extension "\${1:-}" && __orca_use_extension=0
if ! __orca_omp_cwd_is_usable; then
local __orca_logical_cwd="\${PWD:-\${ORCA_WORKTREE_PATH:-\${ORCA_ROOT_PATH:-}}}"
# Why: a restored shell can retain the deleted directory inode after its path is recreated.
(
if [[ -z "$__orca_logical_cwd" ]]; then
printf 'Orca: OMP cannot start because no terminal working directory is available. Open a new terminal in an existing directory.\\n' >&2
return 1
fi
if ! builtin cd -P -- "$__orca_logical_cwd" 2>/dev/null; then
printf 'Orca: OMP cannot access the terminal working directory "%s". Open a new terminal in an existing directory.\\n' "$__orca_logical_cwd" >&2
return 1
fi
__orca_omp_invoke "$__orca_use_extension" "$@"
)
else
__orca_omp_invoke "$__orca_use_extension" "$@"
fi
}
if [[ -n "\${ORCA_OMP_STATUS_EXTENSION:-}" ]]; then
# Why the function reserved word: it suppresses alias expansion of the name, which
# an \`alias omp\` otherwise rewrites at parse time, aborting the rest of the file.
function omp { __orca_omp "$@"; }
fi
`
}
export function getPowerShellOmpShellWrapper(): string {
const subcommands = OMP_SUBCOMMANDS.map((value) => `'${value}'`).join(', ')
return `# Why: OMP does not auto-load Orca's managed status extension; wrap only
# interactive launch invocations so subcommands such as \`omp config\` keep
# their normal argv shape.
function Global:__OrcaOmpShouldSkipExtension {
param([string]$Name)
$skip = @("help", "--help", "-h", "--version", "-v") + @(${subcommands})
return $skip -contains $Name
}
if ($env:ORCA_OMP_STATUS_EXTENSION) {
function Global:omp {
$orcaUseExtension = -not (__OrcaOmpShouldSkipExtension -Name ([string]($args[0])))
$orcaStatus = 0
$orcaCommand = Get-Command omp -CommandType Application,ExternalScript -ErrorAction SilentlyContinue | Select-Object -First 1
if (-not $orcaCommand) {
Write-Error "omp executable not found"
$orcaStatus = 127
} elseif ($orcaUseExtension -and $env:ORCA_OMP_STATUS_EXTENSION -and
(Test-Path -LiteralPath $env:ORCA_OMP_STATUS_EXTENSION)) {
if ($args.Count -gt 0 -and $args[0] -eq "launch") {
$orcaLaunchArgs = @($args | Select-Object -Skip 1)
& $orcaCommand.Source launch --extension $env:ORCA_OMP_STATUS_EXTENSION @orcaLaunchArgs
} else {
& $orcaCommand.Source --extension $env:ORCA_OMP_STATUS_EXTENSION @args
}
$orcaStatus = $LASTEXITCODE
} else {
& $orcaCommand.Source @args
$orcaStatus = $LASTEXITCODE
}
$global:LASTEXITCODE = $orcaStatus
}
}
`
}