mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
* chore(lint): upgrade oxlint to 1.71 and enable 7 new rules Upgrade oxlint 1.67.0 -> 1.71.0 (1.72 was blocked by the repo's 3-day minimum-release-age supply-chain guard; nothing here needs it). The bump is a no-op on the existing config. Enable 3 error rules (backlog autofixed to zero in this commit) and 4 warn rules (surface signal without gating CI): error (autofixed, behavior-preserving): - unicorn/prefer-node-protocol (~1531 sites: bare builtin -> node:) - typescript/no-import-type-side-effects (~36: all-inline-type -> import type) - unicorn/no-array-reverse (19: copy-then-reverse -> toReversed) warn (real signal, current fires are test-only/correct): - unicorn/no-array-fill-with-reference-type (aliasing footgun guard) - typescript/no-unsafe-function-type (bans bare Function type) - unicorn/prefer-array-flat-map (map().flat() -> flatMap()) - unicorn/prefer-regexp-test (.match() in bool ctx -> .test()) mobile/.oxlintrc.json extends root, so it inherits all 7; the autofix ran from root and covered mobile/ too. Verification (all green): oxlint 0 errors (root+mobile+aux configs), oxfmt clean, typecheck (node+cli+web), vitest 22795 passed / 0 failed, builds (electron-vite + web + cli) succeed. node: rewrites confirmed to skip embedded SSH/CLI string payloads (AST-only); all toReversed sites verified to operate on fresh copies or write-once locals. * chore(lint): bump mobile oxlint to 1.71 so inherited rules parse mobile/ is a standalone pnpm project pinning its own oxlint@1.67, which lacks unicorn/no-array-fill-with-reference-type (needs >=1.70). Since mobile/.oxlintrc.json extends the root config, mobile CI's 'cd mobile && oxlint' failed to parse the new rule. Bump mobile to match root (1.71). Verified in mobile/: oxlint 0 errors, oxfmt --check clean, tsc --noEmit pass, vitest 978 passed / 0 failed. Co-authored-by: Orca <help@stably.ai> --------- Co-authored-by: Orca <help@stably.ai>
341 lines
9.9 KiB
TypeScript
341 lines
9.9 KiB
TypeScript
import { exec, spawn } from 'node:child_process'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import type * as ChildProcess from 'node:child_process'
|
|
import { createFakeChild, createHandlers, requestContext } from './agent-exec-handler-test-harness'
|
|
|
|
vi.mock('child_process', async (importOriginal) => {
|
|
const actual = await importOriginal<typeof ChildProcess>()
|
|
return {
|
|
...actual,
|
|
exec: vi.fn(),
|
|
spawn: vi.fn()
|
|
}
|
|
})
|
|
|
|
const spawnMock = vi.mocked(spawn)
|
|
const execMock = vi.mocked(exec)
|
|
|
|
type AgentExecResult = { exitCode: number | null; timedOut: boolean }
|
|
|
|
describe('AgentExecHandler', () => {
|
|
beforeEach(() => {
|
|
spawnMock.mockReset()
|
|
execMock.mockReset()
|
|
})
|
|
|
|
it('executes a non-interactive command with captured output and stdin', async () => {
|
|
const child = createFakeChild()
|
|
spawnMock.mockReturnValue(child as never)
|
|
const handlers = createHandlers()
|
|
|
|
const pending = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: ['--flag', 42],
|
|
cwd: '/repo',
|
|
stdin: 'PROMPT',
|
|
timeoutMs: 5_000
|
|
},
|
|
requestContext()
|
|
)
|
|
|
|
child.stdout.emit('data', Buffer.from('message'))
|
|
child.stderr.emit('data', Buffer.from('warning'))
|
|
child.emit('close', 0)
|
|
|
|
await expect(pending).resolves.toEqual({
|
|
stdout: 'message',
|
|
stderr: 'warning',
|
|
exitCode: 0,
|
|
timedOut: false,
|
|
canceled: false
|
|
})
|
|
expect(spawnMock).toHaveBeenCalledWith('agent', ['--flag', '42'], {
|
|
cwd: '/repo',
|
|
env: process.env,
|
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
windowsHide: true
|
|
})
|
|
expect(child.stdin.end).toHaveBeenCalledWith('PROMPT')
|
|
})
|
|
|
|
it('merges caller-supplied provider environment into the spawned command environment', async () => {
|
|
const child = createFakeChild()
|
|
spawnMock.mockReturnValue(child as never)
|
|
const handlers = createHandlers()
|
|
|
|
const pending = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'codex',
|
|
args: ['exec'],
|
|
cwd: '/repo',
|
|
stdin: 'PROMPT',
|
|
timeoutMs: 5_000,
|
|
env: {
|
|
CODEX_HOME: '/managed/codex-home',
|
|
PATH: '/managed/bin'
|
|
}
|
|
},
|
|
requestContext()
|
|
)
|
|
|
|
child.emit('close', 0)
|
|
|
|
await expect(pending).resolves.toMatchObject({
|
|
exitCode: 0,
|
|
timedOut: false
|
|
})
|
|
expect(spawnMock).toHaveBeenCalledWith('codex', ['exec'], {
|
|
cwd: '/repo',
|
|
env: expect.objectContaining({
|
|
...process.env,
|
|
CODEX_HOME: '/managed/codex-home',
|
|
PATH: '/managed/bin'
|
|
}),
|
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
windowsHide: true
|
|
})
|
|
})
|
|
|
|
it('cancels the in-flight command for the requested cwd', async () => {
|
|
const child = createFakeChild()
|
|
spawnMock.mockReturnValue(child as never)
|
|
const handlers = createHandlers()
|
|
|
|
const pending = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: [],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000
|
|
},
|
|
requestContext()
|
|
)
|
|
|
|
await expect(
|
|
handlers.get('agent.cancelExec')!({ cwd: '/repo' }, requestContext())
|
|
).resolves.toEqual({ canceled: true })
|
|
|
|
if (process.platform === 'win32') {
|
|
expect(execMock).toHaveBeenCalledWith('taskkill /pid 12345 /T /F', expect.any(Function))
|
|
} else {
|
|
expect(child.kill).toHaveBeenCalledWith('SIGKILL')
|
|
}
|
|
|
|
child.emit('close', null)
|
|
await expect(pending).resolves.toMatchObject({
|
|
exitCode: null,
|
|
timedOut: false,
|
|
canceled: true
|
|
})
|
|
})
|
|
|
|
it('cancels only the matching operation lane for a cwd', async () => {
|
|
const commitChild = createFakeChild()
|
|
const pullRequestChild = createFakeChild()
|
|
pullRequestChild.pid = 12346
|
|
spawnMock
|
|
.mockReturnValueOnce(commitChild as never)
|
|
.mockReturnValueOnce(pullRequestChild as never)
|
|
const handlers = createHandlers()
|
|
|
|
const commit = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: [],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000,
|
|
operation: 'commit-message'
|
|
},
|
|
requestContext()
|
|
)
|
|
const pullRequest = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: [],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000,
|
|
operation: 'pull-request-fields'
|
|
},
|
|
requestContext()
|
|
)
|
|
|
|
await expect(
|
|
handlers.get('agent.cancelExec')!(
|
|
{ cwd: '/repo', operation: 'commit-message' },
|
|
requestContext()
|
|
)
|
|
).resolves.toEqual({ canceled: true })
|
|
|
|
if (process.platform === 'win32') {
|
|
expect(execMock).toHaveBeenCalledWith('taskkill /pid 12345 /T /F', expect.any(Function))
|
|
expect(execMock).not.toHaveBeenCalledWith('taskkill /pid 12346 /T /F', expect.any(Function))
|
|
} else {
|
|
expect(commitChild.kill).toHaveBeenCalledWith('SIGKILL')
|
|
expect(pullRequestChild.kill).not.toHaveBeenCalled()
|
|
}
|
|
|
|
commitChild.emit('close', null)
|
|
pullRequestChild.stdout.emit(
|
|
'data',
|
|
Buffer.from('{"base":"main","title":"Update README","body":"Details","draft":false}')
|
|
)
|
|
pullRequestChild.emit('close', 0)
|
|
|
|
await expect(commit).resolves.toMatchObject({
|
|
exitCode: null,
|
|
timedOut: false,
|
|
canceled: true
|
|
})
|
|
await expect(pullRequest).resolves.toMatchObject({
|
|
exitCode: 0,
|
|
timedOut: false,
|
|
canceled: false
|
|
})
|
|
})
|
|
|
|
it('kills the active command when the request aborts', async () => {
|
|
const child = createFakeChild()
|
|
spawnMock.mockReturnValue(child as never)
|
|
const handlers = createHandlers()
|
|
const controller = new AbortController()
|
|
|
|
const pending = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: [],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000
|
|
},
|
|
{ clientId: 1, isStale: () => controller.signal.aborted, signal: controller.signal }
|
|
)
|
|
|
|
controller.abort()
|
|
|
|
if (process.platform === 'win32') {
|
|
expect(execMock).toHaveBeenCalledWith('taskkill /pid 12345 /T /F', expect.any(Function))
|
|
} else {
|
|
expect(child.kill).toHaveBeenCalledWith('SIGKILL')
|
|
}
|
|
|
|
child.emit('close', null)
|
|
await expect(pending).resolves.toMatchObject({
|
|
exitCode: null,
|
|
timedOut: false,
|
|
canceled: true
|
|
})
|
|
expect(child.stdout.listenerCount('data')).toBe(0)
|
|
expect(child.stderr.listenerCount('data')).toBe(0)
|
|
expect(child.listenerCount('error')).toBe(0)
|
|
expect(child.listenerCount('close')).toBe(0)
|
|
})
|
|
|
|
it('cancels a superseded command in the same operation lane', async () => {
|
|
const firstChild = createFakeChild()
|
|
const secondChild = createFakeChild()
|
|
secondChild.pid = 12346
|
|
spawnMock.mockReturnValueOnce(firstChild as never).mockReturnValueOnce(secondChild as never)
|
|
const handlers = createHandlers()
|
|
|
|
const first = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: ['first'],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000,
|
|
operation: 'commit-message'
|
|
},
|
|
requestContext()
|
|
)
|
|
const second = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: ['second'],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000,
|
|
operation: 'commit-message'
|
|
},
|
|
requestContext()
|
|
)
|
|
|
|
if (process.platform === 'win32') {
|
|
expect(execMock).toHaveBeenCalledWith('taskkill /pid 12345 /T /F', expect.any(Function))
|
|
expect(execMock).not.toHaveBeenCalledWith('taskkill /pid 12346 /T /F', expect.any(Function))
|
|
} else {
|
|
expect(firstChild.kill).toHaveBeenCalledWith('SIGKILL')
|
|
expect(secondChild.kill).not.toHaveBeenCalled()
|
|
}
|
|
|
|
await expect(
|
|
handlers.get('agent.cancelExec')!(
|
|
{ cwd: '/repo', operation: 'commit-message' },
|
|
requestContext()
|
|
)
|
|
).resolves.toEqual({ canceled: true })
|
|
|
|
if (process.platform === 'win32') {
|
|
expect(execMock).toHaveBeenCalledWith('taskkill /pid 12346 /T /F', expect.any(Function))
|
|
} else {
|
|
expect(secondChild.kill).toHaveBeenCalledWith('SIGKILL')
|
|
}
|
|
|
|
firstChild.emit('close', null)
|
|
secondChild.emit('close', null)
|
|
await expect(first).resolves.toMatchObject({ canceled: true })
|
|
await expect(second).resolves.toMatchObject({ canceled: true })
|
|
})
|
|
|
|
it('reports when cancellation has no matching in-flight command', async () => {
|
|
const handlers = createHandlers()
|
|
|
|
await expect(
|
|
handlers.get('agent.cancelExec')!({ cwd: '/repo' }, requestContext())
|
|
).resolves.toEqual({ canceled: false })
|
|
})
|
|
|
|
it('settles timed-out commands even when the killed child does not close', async () => {
|
|
vi.useFakeTimers()
|
|
try {
|
|
const child = createFakeChild()
|
|
spawnMock.mockReturnValue(child as never)
|
|
const handlers = createHandlers()
|
|
|
|
const pending = handlers.get('agent.execNonInteractive')!(
|
|
{
|
|
binary: 'agent',
|
|
args: [],
|
|
cwd: '/repo',
|
|
stdin: null,
|
|
timeoutMs: 5_000
|
|
},
|
|
requestContext()
|
|
) as Promise<AgentExecResult>
|
|
const outcomePromise = pending.then((result) =>
|
|
result.timedOut ? `timed-out:${result.exitCode}` : 'not-timed-out'
|
|
)
|
|
|
|
await vi.advanceTimersByTimeAsync(5_000)
|
|
const outcome = await Promise.race([outcomePromise, Promise.resolve('pending')])
|
|
|
|
expect(outcome).toBe('timed-out:null')
|
|
if (process.platform === 'win32') {
|
|
expect(execMock).toHaveBeenCalledWith('taskkill /pid 12345 /T /F', expect.any(Function))
|
|
} else {
|
|
expect(child.kill).toHaveBeenCalledWith('SIGKILL')
|
|
}
|
|
expect(child.stdout.listenerCount('data')).toBe(0)
|
|
expect(child.stderr.listenerCount('data')).toBe(0)
|
|
expect(child.listenerCount('error')).toBe(0)
|
|
expect(child.listenerCount('close')).toBe(0)
|
|
} finally {
|
|
vi.useRealTimers()
|
|
}
|
|
})
|
|
})
|