mirror of
https://github.com/stablyai/orca.git
synced 2026-11-05 19:47:27 +00:00
Neil
1912c90141
Extract subprocess execution and process contracts into @orca/process-host with explicit public entry points, independent checks, and one Node 18 compatible CommonJS runtime. Migrate application consumers and integrate package builds, dependency selection, import enforcement, and runtime resource staging. Preserve daemon startup ownership and profile isolation, and qualify development rebuild recovery and concurrent output publication. Remove unnecessary aliases, test forwarding exports, and a duplicate output scan. Validation: full typechecks, changed-code quality, package and artifact checks, native Windows builds/types plus 306 runtime tests, and independent native reviews. Matched full E2E controls on original main and unchanged reviewed head both pass all 17 applicable tests (nine skips). Earlier intermittent E2E failures are documented in the PR; no assertions were weakened. The final combined-tree audit preserves both branches with no import-boundary violations.
77 lines
2.7 KiB
TypeScript
77 lines
2.7 KiB
TypeScript
import { spawnProcess } from '@orca/process-host'
|
|
import type { ChildProcessHandle, ProcessSpec } from '@orca/process-host/process-spec'
|
|
import { admitProcessTreeKill } from '@orca/process-host/process-tree-kill-gate'
|
|
|
|
/** Spawn seam for tests; production always goes through the hardened spawnProcess wrapper. */
|
|
export type CodexAppServerSpawn = (
|
|
program: string,
|
|
args: string[],
|
|
options: Record<string, unknown>
|
|
) => ChildProcessHandle
|
|
|
|
export const spawnCodexAppServerProcess: CodexAppServerSpawn = (program, args, options) =>
|
|
spawnProcess({ program, args, ...options } as ProcessSpec)
|
|
|
|
export function killCodexAppServerProcessTree(
|
|
child: Pick<ChildProcessHandle, 'pid' | 'kill'>,
|
|
options: { platform?: NodeJS.Platform; spawnImpl?: CodexAppServerSpawn } = {}
|
|
): void {
|
|
const platform = options.platform ?? process.platform
|
|
const spawnImpl = options.spawnImpl ?? spawnCodexAppServerProcess
|
|
if (platform === 'win32' && child.pid) {
|
|
if (
|
|
!admitProcessTreeKill({
|
|
pid: child.pid,
|
|
site: 'codex-app-server-session-deadline',
|
|
scope: 'win-taskkill-tree'
|
|
})
|
|
) {
|
|
// Refusal blocks the tree walk, not the termination: the root kill is
|
|
// handle-addressed, so it cannot reach the recycled pid we refused.
|
|
child.kill('SIGKILL')
|
|
return
|
|
}
|
|
try {
|
|
// Why: npm-installed Codex runs behind a launcher (node, or cmd.exe for an unresolved shim);
|
|
// killing only that wrapper leaves the app-server child alive after a timeout.
|
|
const killer = spawnImpl('taskkill', ['/pid', String(child.pid), '/t', '/f'], {
|
|
stdio: 'ignore',
|
|
windowsHide: true
|
|
})
|
|
let fellBack = false
|
|
const killDirectChild = (): void => {
|
|
if (!fellBack) {
|
|
fellBack = true
|
|
child.kill('SIGKILL')
|
|
}
|
|
}
|
|
killer.on('error', killDirectChild)
|
|
killer.on('exit', (code) => {
|
|
if (code !== 0) {
|
|
killDirectChild()
|
|
}
|
|
})
|
|
killer.unref()
|
|
return
|
|
} catch {
|
|
// Fall through to the direct-child best effort when taskkill cannot start.
|
|
}
|
|
}
|
|
if (child.pid) {
|
|
try {
|
|
// npm/package-manager launchers insert a shim child on POSIX. Reap its
|
|
// direct descendants before signalling the wrapper itself.
|
|
const descendants = spawnImpl('pkill', ['-KILL', '-P', String(child.pid)], {
|
|
stdio: 'ignore'
|
|
})
|
|
// A missing pkill surfaces as an async 'error' event, and an unhandled one
|
|
// takes down the main process.
|
|
descendants.on('error', () => undefined)
|
|
descendants.unref()
|
|
} catch {
|
|
// The direct kill below remains the fallback when pkill is unavailable.
|
|
}
|
|
}
|
|
child.kill('SIGKILL')
|
|
}
|