Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dev-infra): harden gate runner execution

Browse Source
This commit is contained in:
Tianyi Cui
2026-07-28 00:12:16 +08:00
parent 3e6fbccffa
commit 55d6ab5220
5 changed files with 103 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
scripts/run-gates.spec.ts
View File

@@ -1,4 +1,6 @@
import { spawnSync } from 'node:child_process'
import { mkdtempSync, rmSync, symlinkSync } from 'node:fs'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { afterEach, describe, expect, it, vi } from 'vitest'
import {
@@ -12,7 +14,6 @@ import {
listedGatePlan,
parseCliRequest,
replayCommand,
resolveGateEnvironment,
resolvePlanConcurrency,
runGate,
validateGatePlan,
@@ -89,6 +90,7 @@ describe('gate plan validation', () => {
it.each([
['empty', plan([]), /plan has no gates/],
['duplicate ids', plan([gate('same'), gate('same')]), /duplicate gate id "same"/],
['unsafe ids', plan([gate('unsafe id')]), /gate id "unsafe id" must contain only lowercase letters/],
['unknown dependencies', plan([gate('subject', { needs: ['missing'] })]), /depends on unknown gate "missing"/],
['cycles', plan([gate('first', { needs: ['second'] }), gate('second', { needs: ['first'] })]), /dependency cycle: first -> second -> first/],
])('rejects %s before starting a child', async (_label, invalid, message) => {
@@ -138,6 +140,27 @@ describe('gate plan validation', () => {
expect(observed).toEqual(['first:failed', 'second:passed'])
})
it('propagates dependency skips in causal order', async () => {
const leaf = gate('leaf', { needs: ['middle'] })
const middle = gate('middle', { needs: ['root'] })
const rootGate = gate('root')
const execute = vi.fn(async (subject: Gate) => resultFor(subject, 'failed'))
const observed: string[] = []
const results = await executeGatePlan(
plan([leaf, middle, rootGate]),
1,
execute,
result => observed.push(`${result.gate.id}:${result.status}`),
)
expect(execute).toHaveBeenCalledOnce()
expect(execute).toHaveBeenCalledWith(rootGate)
expect(observed).toEqual(['root:failed', 'middle:skipped', 'leaf:skipped'])
expect(results.find(result => result.gate === middle)?.error).toBe('dependency failed or skipped: root')
expect(results.find(result => result.gate === leaf)?.error).toBe('dependency failed or skipped: middle')
})
it('selects a target with its transitive dependencies in canonical plan order', () => {
const subject = plan([
gate('prepare'),
@@ -235,6 +258,32 @@ describe('gate plan inspection and replay', () => {
})
})
it.skipIf(process.platform === 'win32')('executes when the script entry path is a symlink', () => {
const temporary = mkdtempSync(join(tmpdir(), 'dsh-run-gates-entry-'))
const entry = join(temporary, 'run-gates.ts')
try {
symlinkSync(join(repositoryRoot, 'scripts/run-gates.ts'), entry)
const result = spawnSync(process.execPath, [
'--import',
'tsx',
entry,
'ci-consumers',
'--list',
'--json',
], {
cwd: repositoryRoot,
encoding: 'utf8',
env: { ...process.env, npm_execpath: process.env.npm_execpath ?? '/private/pnpm.cjs' },
timeout: 10_000,
})
expect(result.status, result.stderr).toBe(0)
expect(JSON.parse(result.stdout)).toMatchObject({ mode: 'ci-consumers', maxWorkers: 7 })
} finally {
rmSync(temporary, { recursive: true, force: true })
}
})
it('renders a cross-platform scheduler replay and labels focused evidence', () => {
const subject = plan([gate('snapshot')])
expect(replayCommand(subject, 'snapshot')).toBe('pnpm run check:all -- --only snapshot')
@@ -243,17 +292,22 @@ describe('gate plan inspection and replay', () => {
)
})
it('resolves append and set operations only when spawning', () => {
const resolved = resolveGateEnvironment(gate('subject', {
it('applies append and set operations through the child spawn environment', async () => {
vi.stubEnv('NODE_OPTIONS', '--trace-warnings')
vi.stubEnv('INHERITED', 'kept')
const result = await runGate(gate('subject', {
args: ['-e', 'process.stdout.write(JSON.stringify({ nodeOptions: process.env.NODE_OPTIONS, mode: process.env.MODE, inherited: process.env.INHERITED }))'],
env: {
NODE_OPTIONS: { operation: 'append', value: '--max-old-space-size=8192' },
MODE: { operation: 'set', value: 'lib' },
},
}), { NODE_OPTIONS: '--trace-warnings', INHERITED: 'kept' })
expect(resolved).toEqual({
NODE_OPTIONS: '--trace-warnings --max-old-space-size=8192',
MODE: 'lib',
INHERITED: 'kept',
}))
expect(result.status).toBe('passed')
expect(JSON.parse(result.stdout)).toEqual({
nodeOptions: '--trace-warnings --max-old-space-size=8192',
mode: 'lib',
inherited: 'kept',
})
})

47
scripts/run-gates.ts
View File

@@ -9,7 +9,6 @@ import { spawn } from 'node:child_process'
import { availableParallelism } from 'node:os'
import { resolve } from 'node:path'
import { performance } from 'node:perf_hooks'
import { pathToFileURL } from 'node:url'
const MODE_SCRIPTS = {
'ci-primary': 'check:ci',
@@ -121,8 +120,7 @@ type GateExecutor = (gate: Gate) => Promise<GateResult>
type ResultObserver = (result: GateResult) => void
const root = resolve(import.meta.dirname, '..')
const entry = process.argv[1]
if (entry !== undefined && import.meta.url === pathToFileURL(resolve(entry)).href) {
if (import.meta.main) {
process.exitCode = await main(process.argv.slice(2))
}
@@ -833,21 +831,31 @@ export function formatOnlyNotice(plan: GatePlan, gateId: string): string {
* @param inherited - environment inherited by the runner.
* @returns the child environment without mutating the inherited object.
*/
export function resolveGateEnvironment(gate: Gate, inherited: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
function resolveGateEnvironment(gate: Gate, inherited: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
const resolved = { ...inherited }
for (const [name, override] of Object.entries(gate.env ?? {})) {
if (override.operation === 'set') {
resolved[name] = override.value
} else {
const current = resolved[name]
resolved[name] = current === undefined || current === ''
? override.value
: `${current} ${override.value}`
switch (override.operation) {
case 'set':
resolved[name] = override.value
break
case 'append': {
const current = resolved[name]
resolved[name] = current === undefined || current === ''
? override.value
: `${current} ${override.value}`
break
}
default:
assertNever(override)
}
}
return resolved
}
function assertNever(value: never): never {
throw new Error(`run-gates: unreachable value ${JSON.stringify(value)}.`)
}
/**
* Run a validated plan; invalid input rejects before the injected executor can start a child.
* @param plan - complete or diagnostic plan to execute.
@@ -894,9 +902,17 @@ async function runGates(
}
if (running.length === 0) {
const pending = allGates.filter(gate => states.get(gate.id) === 'pending')
for (const gate of pending) {
const failedDeps = (gate.needs ?? []).filter(id => states.get(id) !== 'passed')
let pending = allGates.filter(gate => states.get(gate.id) === 'pending')
while (pending.length > 0) {
const gate = pending.find(item => (item.needs ?? []).some((id) => {
const state = states.get(id)
return state === 'failed' || state === 'skipped'
}))
if (gate === undefined) throw new Error('run-gates: validated plan stalled without a failed dependency.')
const failedDeps = (gate.needs ?? []).filter((id) => {
const state = states.get(id)
return state === 'failed' || state === 'skipped'
})
const result: GateResult = {
gate,
status: 'skipped',
@@ -911,6 +927,7 @@ async function runGates(
states.set(gate.id, 'skipped')
results.set(gate.id, result)
observe(result)
pending = pending.filter(item => item !== gate)
}
break
}
@@ -1031,10 +1048,10 @@ function printResult(plan: GatePlan, result: GateResult): void {
const environment = listedGate(result.gate).env
console.error(`command: ${result.gate.displayCommand}`)
if (Object.keys(environment).length > 0) console.error(`scheduler environment: ${JSON.stringify(environment)}`)
console.error(`outcome: ${formatGateResultReason(result)}`)
console.error(`replay: ${replayCommand(plan, result.gate.id)}`)
}
printOutput(result.output)
if (result.error !== undefined) console.error(result.error)
}
function printSummary(plan: GatePlan, results: GateResult[], durationMs: number): void {