fix(tools): carry Sim's own status through the tool-response boundary

Author: TheodoreSpeaks

apps/sim/executor/handlers/generic/generic-handler.ts

@@ -94,6 +94,10 @@ export class GenericBlockHandler implements BlockHandler {
           blockName: block.metadata?.name || 'Unnamed Block',
           output: result.output || {},
           timestamp: new Date().toISOString(),
+          // `executeTool` flattens a thrown error into a result, so Sim's own
+          // status (hosted-key 429/503) would be lost here. Carry it onto the
+          // error so `getExecutionErrorStatus` can still reach the API caller.
+          ...(typeof result.statusCode === 'number' ? { statusCode: result.statusCode } : {}),
         })
 
         throw error

apps/sim/executor/utils/errors.test.ts

@@ -83,3 +83,50 @@ describe('buildBlockExecutionError', () => {
     expect(wrapped.cause).toBeUndefined()
   })
 })
+
+describe('hosted-key status survives the ToolResponse flattening', () => {
+  /**
+   * `executeTool` catches a thrown error and returns a `ToolResponse`, so the
+   * status has to ride `ToolResponse.statusCode` and be re-attached by
+   * `generic-handler`. This reproduces that hand-off end to end.
+   */
+  function errorFromFailedToolResponse(response: {
+    error: string
+    output: Record<string, unknown>
+    statusCode?: number
+  }): Error {
+    const error = new Error(response.error)
+    Object.assign(error, {
+      output: response.output,
+      ...(typeof response.statusCode === 'number' ? { statusCode: response.statusCode } : {}),
+    })
+    return buildBlockExecutionError({ block, error })
+  }
+
+  it('forwards a hosted-key 429 to the API caller', () => {
+    const wrapped = errorFromFailedToolResponse({
+      error: 'Rate limit exceeded',
+      output: {},
+      statusCode: 429,
+    })
+    expect(getExecutionErrorStatus(wrapped)).toBe(429)
+  })
+
+  it('forwards a hosted-key 503 to the API caller', () => {
+    const wrapped = errorFromFailedToolResponse({
+      error: 'No hosted keys configured',
+      output: {},
+      statusCode: 503,
+    })
+    expect(getExecutionErrorStatus(wrapped)).toBe(503)
+  })
+
+  it("never adopts an upstream provider's status as our own", () => {
+    // A provider 404 rides `output`, never `statusCode`, so it must not surface.
+    const wrapped = errorFromFailedToolResponse({
+      error: 'HTTP 404: Not Found',
+      output: { status: 404, statusText: 'Not Found' },
+    })
+    expect(getExecutionErrorStatus(wrapped)).toBe(500)
+  })
+})

apps/sim/tools/index.ts

@@ -18,6 +18,7 @@ import {
   validateUrlWithDNS,
 } from '@/lib/core/security/input-validation.server'
 import { PlatformEvents } from '@/lib/core/telemetry'
+import { HttpError } from '@/lib/core/utils/http-error'
 import { generateRequestId } from '@/lib/core/utils/request'
 import {
   isPayloadSizeLimitError,
@@ -1502,6 +1503,10 @@ export async function executeTool(
       success: false,
       output: errorDetails,
       error: errorMessage,
+      // Sim's own status (hosted-key 429/503) survives the flattening from a
+      // thrown error into a result object; an upstream provider's status stays
+      // on `output` where it cannot be mistaken for ours.
+      ...(error instanceof HttpError ? { statusCode: error.statusCode } : {}),
       timing: {
         startTime: startTimeISO,
         endTime: endTimeISO,

apps/sim/tools/types.ts

@@ -93,6 +93,13 @@ export interface ToolResponse {
   success: boolean // Whether the tool execution was successful
   output: Record<string, any> // The structured output from the tool
   error?: string // Error message if success is false
+  /**
+   * HTTP status owned by SIM itself (e.g. hosted-key rate limiting or
+   * exhaustion), carried so it survives the throw → `ToolResponse` flattening
+   * and can reach the API caller. Deliberately NOT the upstream provider's
+   * status — a provider's 404 must never become the workflow API's status.
+   */
+  statusCode?: number
   resources?: MothershipResource[] // Resources to auto-open/show in UI
   largeValueKeys?: string[]
   fileKeys?: string[]