Skip to content

fix(mcp): timeout aborts Mocha runner so next run_test isn't blocked #5551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavertMik merged 4 commits into from
May 6, 2026
+33 −20
Merged

fix(mcp): timeout aborts Mocha runner so next run_test isn't blocked #5551

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5c3816
fix(mcp): timeout aborts Mocha runner so next run_test isn't blocked
May 6, 2026
7c56ecc
fix(mcp): drop unused runner.abort + recorder.reset hacks
May 6, 2026
736bbbf
refactor(mcp): extract raceRunOutcome helper to dedupe run_test/run_s…
May 6, 2026
3c5e2a3
refactor(mcp): rename raceRunOutcome → waitForTestResult, outcome → s…
May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions bin/mcp-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,23 @@ async function cancelRun() {
return true
}

async function waitForTestResult(runPromise, timeout) {
const pausedPromise = new Promise(resolve => pauseEvents.once('paused', () => resolve('paused')))
const completedPromise = runPromise.then(() => 'completed', () => 'completed')
let timeoutId
const timeoutPromise = new Promise((_, reject) => {
timeoutId = setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)
})
try {
return { status: await Promise.race([completedPromise, pausedPromise, timeoutPromise]) }
} catch (err) {
await cancelRun()
return { status: 'aborted', error: err.message }
} finally {
clearTimeout(timeoutId)
}
}

async function closeBrowser() {
if (!containerInitialized) return
await cancelRun()
Expand Down Expand Up @@ -1025,18 +1042,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
throw err
}
})()
pendingRunPromise = runPromise

const pausedPromise = new Promise(resolve => pauseEvents.once('paused', () => resolve('paused')))
const completedPromise = runPromise.then(() => 'completed', () => 'completed')

const which = await Promise.race([
completedPromise,
pausedPromise,
new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)),
])
const result = await waitForTestResult(runPromise, timeout)
if (result.status === 'aborted') {
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ status: 'failed', file: testFile, error: result.error }, null, 2) }] }
}

if (which === 'paused') {
pendingRunPromise = runPromise
if (result.status === 'paused') {
const page = await gatherPageBrief()
return {
content: [{
Expand All @@ -1046,6 +1060,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
}
}

pendingRunPromise = null
const final = collectRunCompletion(runError?.message)
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ ...final, file: testFile }, null, 2) }] }
Expand Down Expand Up @@ -1121,18 +1136,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
throw err
}
})()
pendingRunPromise = runPromise

const pausedPromise = new Promise(resolve => pauseEvents.once('paused', () => resolve('paused')))
const completedPromise = runPromise.then(() => 'completed', () => 'completed')

const which = await Promise.race([
completedPromise,
pausedPromise,
new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${timeout}ms`)), timeout)),
])
const result = await waitForTestResult(runPromise, timeout)
if (result.status === 'aborted') {
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ status: 'failed', file: testFile, error: result.error }, null, 2) }] }
}

if (which === 'paused') {
pendingRunPromise = runPromise
if (result.status === 'paused') {
const page = await gatherPageBrief()
return {
content: [{
Expand All @@ -1142,6 +1154,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
}
}

pendingRunPromise = null
const final = collectRunCompletion(runError?.message)
await startShellSession()
return { content: [{ type: 'text', text: JSON.stringify({ ...final, file: testFile }, null, 2) }] }
Expand Down