Fix workspace-filesystem cleanup timeout budget

cursoragent · cursoragent · commit 42a8294db82d · 2026-05-04T18:06:31.000Z
Pass STEP_TIMEOUT_MS (1000ms) as per-session timeout to cleanupOwnedWorkspaceFilesystemArtifacts instead of the step wrapper timeout. The step wrapper timeout is bulkStepTimeoutMs(count) = count * 1000 + 100, which gives enough room for count sequential operations at 1000ms each. Passing the step wrapper timeout as the per-session timeout causes total time to be count * bulkStepTimeoutMs(count), exceeding the step budget.
diff --git a/src/server/mcp-shutdown.ts b/src/server/mcp-shutdown.ts
@@ -199,7 +199,7 @@ export async function runMcpShutdown(input: {
       timeoutMs: workspaceFilesystemCleanupTimeoutMs,
       operation: () =>
         cleanupOwnedWorkspaceFilesystemArtifacts({
-          timeoutMs: workspaceFilesystemCleanupTimeoutMs,
+          timeoutMs: STEP_TIMEOUT_MS,
         }),
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ export async function runMcpShutdown(input: {`
`199`	`199`	`timeoutMs: workspaceFilesystemCleanupTimeoutMs,`
`200`	`200`	`operation: () =>`
`201`	`201`	`cleanupOwnedWorkspaceFilesystemArtifacts({`
`202`		`- timeoutMs: workspaceFilesystemCleanupTimeoutMs,`
	`202`	`+ timeoutMs: STEP_TIMEOUT_MS,`
`203`	`203`	`}),`
`204`	`204`	`},`
`205`	`205`	`{`