mirror of
https://github.com/stablyai/orca.git
synced 2026-10-31 00:57:45 +00:00
* refactor(shell): one shell-argument-quoting module for the duplicated quote copies Each former copy now calls the canonical function with its exact spelling; a table test pins byte-identical output for every copy over hostile inputs. Distinct spellings stay distinct functions: '\'' vs '"'"', the two plain-word sets, and the cmd.exe doubled quote. Co-Authored-By: Claude <noreply@anthropic.com> * style: keep the quoting import at the top of two import-less files Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
143 lines
5.3 KiB
TypeScript
143 lines
5.3 KiB
TypeScript
import { quoteCmdDoubleQuoted, quotePosixShellUnlessPlainNoAt } from './shell-argument-quoting'
|
|
import { isWindowsAbsolutePathLike } from './cross-platform-path'
|
|
import {
|
|
buildWindowsCmdRunnerDelayedLaunchCommand,
|
|
windowsRunnerPathNeedsCmdGuard
|
|
} from './windows-cmd-runner-delayed-launch'
|
|
|
|
export type SetupRunnerCommandPlatform = 'windows' | 'posix'
|
|
export type SetupRunnerShellFamily = 'posix' | 'cmd'
|
|
export type SetupRunnerCommandShell = 'posix' | 'windows'
|
|
export type SetupRunnerShell = {
|
|
family: SetupRunnerShellFamily
|
|
executable?: string
|
|
}
|
|
|
|
export type SetupRunnerCommandResolution = {
|
|
command: string
|
|
runnerScriptPathForShell: string
|
|
shell: SetupRunnerCommandShell
|
|
}
|
|
|
|
export function buildSetupRunnerCommand(
|
|
runnerScriptPath: string,
|
|
platform: SetupRunnerCommandPlatform,
|
|
shell?: SetupRunnerShell
|
|
): string {
|
|
return resolveSetupRunnerCommand(runnerScriptPath, platform, shell).command
|
|
}
|
|
|
|
export function getSetupRunnerCommandPlatformForPath(
|
|
runnerScriptPath: string,
|
|
fallbackPlatform: SetupRunnerCommandPlatform
|
|
): SetupRunnerCommandPlatform {
|
|
if (isWindowsAbsolutePathLike(runnerScriptPath)) {
|
|
return 'windows'
|
|
}
|
|
if (runnerScriptPath.startsWith('/')) {
|
|
return 'posix'
|
|
}
|
|
return fallbackPlatform
|
|
}
|
|
|
|
export function resolveSetupRunnerCommand(
|
|
runnerScriptPath: string,
|
|
platform: SetupRunnerCommandPlatform,
|
|
shell?: SetupRunnerShell
|
|
): SetupRunnerCommandResolution {
|
|
if (platform === 'windows') {
|
|
if (isWslUncPath(runnerScriptPath)) {
|
|
const linuxPath = wslUncToLinuxPath(runnerScriptPath)
|
|
return {
|
|
command: `bash ${quotePosixShellUnlessPlainNoAt(linuxPath)}`,
|
|
runnerScriptPathForShell: linuxPath,
|
|
shell: 'posix'
|
|
}
|
|
}
|
|
if (runnerScriptPath.startsWith('/') && !isWindowsAbsolutePathLike(runnerScriptPath)) {
|
|
return {
|
|
command: `bash ${quotePosixShellUnlessPlainNoAt(runnerScriptPath)}`,
|
|
runnerScriptPathForShell: runnerScriptPath,
|
|
shell: 'posix'
|
|
}
|
|
}
|
|
// Why: `shell` is the shell that types the command; the runner file's own extension decides
|
|
// what can execute it. A batch runner never goes to bash even from a Git Bash pane.
|
|
const cmdRunnerFile = isWindowsCmdRunnerPath(runnerScriptPath)
|
|
if (!cmdRunnerFile && (shell?.family === 'posix' || /\.sh$/i.test(runnerScriptPath))) {
|
|
// Why: WSL shells need /mnt/... paths, while Git Bash expects /c/... when replaying deferred setup scripts.
|
|
if (isWslExecutable(shell?.executable)) {
|
|
const wslPath = nativeWindowsPathToWslShellPath(runnerScriptPath)
|
|
return {
|
|
command: `bash ${quotePosixShellUnlessPlainNoAt(wslPath)}`,
|
|
runnerScriptPathForShell: wslPath,
|
|
shell: 'posix'
|
|
}
|
|
}
|
|
// Why: queued setup launches can outlive the process that generated them, so convert native paths before handing off to POSIX shells.
|
|
const posixPath = nativeWindowsPathToPosixShellPath(runnerScriptPath)
|
|
return {
|
|
command: `bash ${quotePosixShellUnlessPlainNoAt(posixPath)}`,
|
|
runnerScriptPathForShell: posixPath,
|
|
shell: 'posix'
|
|
}
|
|
}
|
|
return {
|
|
// Why: some path characters survive no amount of quoting on a cmd command line, and a Git
|
|
// Bash pane rewrites the bare `/c` switch itself into a drive path (issue #6896) so cmd
|
|
// opens interactively and the runner never starts. Both take the delayed-expansion
|
|
// launcher, which passes the switch through a PowerShell ProcessStartInfo instead. Every
|
|
// other case keeps the plain form.
|
|
command:
|
|
shell?.family === 'posix' || windowsRunnerPathNeedsCmdGuard(runnerScriptPath)
|
|
? buildWindowsCmdRunnerDelayedLaunchCommand(runnerScriptPath)
|
|
: `cmd.exe /c ${quoteCmdDoubleQuoted(runnerScriptPath)}`,
|
|
runnerScriptPathForShell: runnerScriptPath,
|
|
shell: 'windows'
|
|
}
|
|
}
|
|
|
|
return {
|
|
command: `bash ${quotePosixShellUnlessPlainNoAt(runnerScriptPath)}`,
|
|
runnerScriptPathForShell: runnerScriptPath,
|
|
shell: 'posix'
|
|
}
|
|
}
|
|
|
|
/** True when the runner file is a batch script, which only cmd can execute. */
|
|
export function isWindowsCmdRunnerPath(runnerScriptPath: string): boolean {
|
|
return /\.(cmd|bat)$/i.test(runnerScriptPath)
|
|
}
|
|
|
|
export function isWslUncPath(path: string): boolean {
|
|
const normalized = path.replace(/\\/g, '/')
|
|
return /^\/\/(wsl\.localhost|wsl\$)\//i.test(normalized)
|
|
}
|
|
|
|
export function wslUncToLinuxPath(windowsPath: string): string {
|
|
const normalized = windowsPath.replace(/\\/g, '/')
|
|
const match = normalized.match(/^\/\/(wsl\.localhost|wsl\$)\/[^/]+(\/.*)?$/i)
|
|
return match?.[2] || '/'
|
|
}
|
|
|
|
export function nativeWindowsPathToPosixShellPath(value: string): string {
|
|
const driveMatch = value.match(/^([A-Za-z]):[\\/](.*)$/)
|
|
if (driveMatch) {
|
|
return `/${driveMatch[1].toLowerCase()}/${driveMatch[2].replace(/\\/g, '/')}`
|
|
}
|
|
return value.replace(/\\/g, '/')
|
|
}
|
|
|
|
function nativeWindowsPathToWslShellPath(value: string): string {
|
|
const driveMatch = value.match(/^([A-Za-z]):[\\/](.*)$/)
|
|
if (driveMatch) {
|
|
return `/mnt/${driveMatch[1].toLowerCase()}/${driveMatch[2].replace(/\\/g, '/')}`
|
|
}
|
|
return value.replace(/\\/g, '/')
|
|
}
|
|
|
|
function isWslExecutable(value: string | undefined): boolean {
|
|
const basename = value?.trim().replaceAll('\\', '/').split('/').pop()?.toLowerCase() ?? ''
|
|
return basename === 'wsl.exe' || basename === 'wsl'
|
|
}
|