Skip to content

fix(executor): preserve non-retryable tool failures #7621

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

Open
BillLeoutsakosvl346 wants to merge 2 commits into
base: staging
Choose a base branch
from
+5 −1
Open

fix(executor): preserve non-retryable tool failures #7621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a1d6f
fix(executor): preserve non-retryable tool failures
Sep 8, 2026
fb1b028
Merge staging into fix/platform-non-retryable-errors
Oct 3, 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
6 changes: 5 additions & 1 deletion apps/sim/executor/handlers/generic/generic-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { isDeepStrictEqual } from 'node:util'
import { createLogger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
import { isPlainRecord } from '@sim/utils/object'
import { NonRetryableExecutionError } from '@/lib/execution/non-retryable-error'
import { getBlock } from '@/blocks/index'
import { isMcpTool } from '@/executor/constants'
import type { BlockHandler, BlockNodeMetadata, ExecutionContext } from '@/executor/types'
Expand Down Expand Up @@ -345,7 +346,10 @@ export class GenericBlockHandler implements BlockHandler {
? errorDetails.join(' - ')
: `Block execution of ${tool?.name || block.config.tool} failed with no error message`

const error = new Error(errorMessage)
const error =
result.retryable === false
? new NonRetryableExecutionError(errorMessage)
: new Error(errorMessage)

Object.assign(error, {
toolId: block.config.tool,
Expand Down
Loading