Use 402 as payment required error code

Author: jahooma

cli/src/hooks/helpers/send-message.ts

@@ -3,9 +3,8 @@ import { useChatStore } from '../../state/chat-store'
 import { processBashContext } from '../../utils/bash-context-processor'
 import {
   createErrorMessage,
-  createPaymentErrorMessage,
   isOutOfCreditsError,
-  isPaymentRequiredError,
+  OUT_OF_CREDITS_MESSAGE,
 } from '../../utils/error-handling'
 import { formatElapsedTime } from '../../utils/format-elapsed-time'
 import { processImagesForMessage } from '../../utils/image-processor'
@@ -215,23 +214,11 @@ export const handleRunCompletion = (params: {
       return
     }
 
-    if (isOutOfCreditsError(output)) {
-      const { message, showUsageBanner } = createPaymentErrorMessage(output)
-      updater.setError(message)
-
-      if (showUsageBanner) {
-        useChatStore.getState().setInputMode('usage')
-        queryClient.invalidateQueries({
-          queryKey: usageQueryKeys.current(),
-        })
-      }
-    } else {
-      const partial = createErrorMessage(
-        output.message ?? 'No output from agent run',
-        aiMessageId,
-      )
-      updater.setError(partial.content ?? '')
-    }
+    const partial = createErrorMessage(
+      output.message ?? 'No output from agent run',
+      aiMessageId,
+    )
+    updater.setError(partial.content ?? '')
 
     finalizeAfterError()
     return
@@ -302,10 +289,8 @@ export const handleRunError = (params: {
   updateChainInProgress(false)
   timerController.stop('error')
 
-  if (isPaymentRequiredError(error)) {
-    const { message } = createPaymentErrorMessage(error)
-
-    updater.setError(message)
+  if (isOutOfCreditsError(error)) {
+    updater.setError(OUT_OF_CREDITS_MESSAGE)
     useChatStore.getState().setInputMode('usage')
     queryClient.invalidateQueries({ queryKey: usageQueryKeys.current() })
     return

cli/src/utils/error-handling.ts

@@ -27,37 +27,20 @@ const extractErrorMessage = (error: unknown, fallback: string): string => {
  * Standardized on statusCode === 402 for payment required detection.
  */
 export const isOutOfCreditsError = (error: unknown): boolean => {
-  if (isPaymentRequiredError(error)) {
-    return true
-  }
-
   // Check for error output with errorCode property (from agent run results)
   if (
     error &&
     typeof error === 'object' &&
-    'errorCode' in error &&
-    (error as { errorCode: unknown }).errorCode === ErrorCodes.PAYMENT_REQUIRED
+    'statusCode' in error &&
+    error.statusCode === 402
   ) {
     return true
   }
 
   return false
 }
 
-export const createPaymentErrorMessage = (
-  error: unknown,
-): {
-  message: string
-  showUsageBanner: boolean
-} => {
-  const fallback = `Out of credits. Please add credits at ${defaultAppUrl}/usage`
-  const message = extractErrorMessage(error, fallback)
-
-  return {
-    message,
-    showUsageBanner: isOutOfCreditsError(error),
-  }
-}
+export const OUT_OF_CREDITS_MESSAGE = `Out of credits. Please add credits at ${defaultAppUrl}/usage`
 
 export const createErrorMessage = (
   error: unknown,

common/src/util/error.ts

@@ -18,6 +18,8 @@ export type ErrorObject = {
   stack?: string
   /** Optional numeric HTTP status code, if available */
   status?: number
+  /** Optional numeric HTTP status code, if available */
+  statusCode?: number
   /** Optional machine-friendly error code, if available */
   code?: string
   /** Optional raw error object */
@@ -49,6 +51,10 @@ export function getErrorObject(
       message: error.message,
       stack: error.stack,
       status: typeof anyError.status === 'number' ? anyError.status : undefined,
+      statusCode:
+        typeof anyError.statusCode === 'number'
+          ? anyError.statusCode
+          : undefined,
       code: typeof anyError.code === 'string' ? anyError.code : undefined,
       rawError: options.includeRawError
         ? JSON.stringify(error, null, 2)

packages/agent-runtime/src/run-agent-step.ts

@@ -917,18 +917,6 @@ export async function loopAgentSteps(
       'Agent execution failed',
     )
 
-    // Re-throw NetworkError and PaymentRequiredError to allow SDK retry wrapper to handle it
-    if (error instanceof Error && error.name === 'NetworkError') {
-      throw error
-    }
-
-    const isPaymentRequired =
-      (error as { statusCode?: number }).statusCode === 402
-
-    if (isPaymentRequired) {
-      throw error
-    }
-
     let errorMessage = ''
     if (error instanceof APICallError) {
       errorMessage = `${error.message}`
@@ -951,6 +939,13 @@ export async function loopAgentSteps(
       errorMessage,
     })
 
+    const isPaymentRequired =
+      (error as { statusCode?: number }).statusCode === 402
+
+    if (isPaymentRequired) {
+      throw error
+    }
+
     return {
       agentState: currentAgentState,
       output: {