ts-procedures 10.3.0 → 11.0.0

package/src/client/resolve-options.ts

@@ -27,7 +27,7 @@ export function resolveBasePath(
  * - `timeoutMs`: the resolved timeout value (may be 0 if per-call explicitly disables)
  * - `combined`: `AbortSignal.any([...])` of all active signals, or undefined if none
  *
- * Per-call `timeout: 0` disables an inherited default timeout (same as `resolveSignal`).
+ * Per-call `timeout: 0` disables an inherited default timeout.
  * Both `defaults.signal` and `options.signal` are included in `combined` when present.
  */
 export interface SignalSources {
@@ -60,25 +60,6 @@ export function resolveSignalSources(
   return { combined, timeoutSignal, userSignal, timeoutMs }
 }
 
-/**
- * Resolves the effective AbortSignal by combining (via `AbortSignal.any`):
- *   - default signal (if any)
- *   - per-call signal (if any)
- *   - timeout signal (if resolved timeout > 0)
- *
- * Returns undefined when none apply. Per-call `timeout: 0` disables an
- * inherited default timeout.
- *
- * @deprecated Prefer `resolveSignalSources` when you need access to individual
- * signal references (e.g. for abort-cause classification).
- */
-export function resolveSignal(
-  defaults: ProcedureCallDefaults | undefined,
-  options: ProcedureCallOptions | undefined,
-): AbortSignal | undefined {
-  return resolveSignalSources(defaults, options).combined
-}
-
 /**
  * Resolves a `ClientHeadersInit` value: a static record passes through, a
  * function is invoked and (if async) awaited — re-evaluated on every call so

package/src/client/stream.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from 'vitest'
 import { createTypedStream, executeStream } from './stream.js'
-import { ClientRequestError, ClientNetworkError, ClientStreamError } from './errors.js'
+import { ClientHttpError, ClientNetworkError, ClientStreamError } from './errors.js'
 import type {
   ClientAdapter,
   AdapterRequest,
@@ -298,7 +298,7 @@ describe('executeStream', () => {
     expect(order).toEqual(['adapter', 'afterResponse'])
   })
 
-  it('throws ClientRequestError on non-2xx status', async () => {
+  it('throws ClientHttpError on non-2xx status', async () => {
     const adapter: ClientAdapter = {
       request: vi.fn(async (): Promise<never> => { throw new Error('not expected') }),
       stream: vi.fn(async (): Promise<AdapterStreamResponse> => ({
@@ -307,7 +307,7 @@ describe('executeStream', () => {
         body: makeAsyncIterable([]),
       })),
     }
-    await expect(run({ adapter })).rejects.toThrow(ClientRequestError)
+    await expect(run({ adapter })).rejects.toThrow(ClientHttpError)
   })
 
   it('runs onError on adapter failure and re-throws', async () => {

package/src/client/typed-error-dispatch.test.ts

@@ -4,7 +4,7 @@ import { Type } from 'typebox'
 import { Procedures } from '../core/procedures.js'
 import { HonoAppBuilder, defineErrorTaxonomy } from '../adapters/hono/index.js'
 import { createClient } from './index.js'
-import { ClientRequestError } from './errors.js'
+import { ClientHttpError } from './errors.js'
 import type { ClientAdapter, ErrorRegistry } from './types.js'
 
 // ---------------------------------------------------------------------------
@@ -113,7 +113,7 @@ describe('typed error dispatch — end-to-end', () => {
   test.todo('server-thrown UseCaseError arrives on client as a typed class instance')
 
   // migrated to schema.req in Phase 3+ (CreateHttp)
-  test.todo('unregistered error body falls back to ClientRequestError')
+  test.todo('unregistered error body falls back to ClientHttpError')
 
   // migrated to schema.req in Phase 3+ (CreateHttp)
   test.todo('success responses are not disturbed by dispatch logic')

package/src/codegen/__goldens__/ts-default--models/_client.ts

@@ -59,13 +59,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 
@@ -305,7 +298,7 @@ export function resolveBasePath(
  * - `timeoutMs`: the resolved timeout value (may be 0 if per-call explicitly disables)
  * - `combined`: `AbortSignal.any([...])` of all active signals, or undefined if none
  *
- * Per-call `timeout: 0` disables an inherited default timeout (same as `resolveSignal`).
+ * Per-call `timeout: 0` disables an inherited default timeout.
  * Both `defaults.signal` and `options.signal` are included in `combined` when present.
  */
 export interface SignalSources {
@@ -338,25 +331,6 @@ export function resolveSignalSources(
   return { combined, timeoutSignal, userSignal, timeoutMs }
 }
 
-/**
- * Resolves the effective AbortSignal by combining (via `AbortSignal.any`):
- *   - default signal (if any)
- *   - per-call signal (if any)
- *   - timeout signal (if resolved timeout > 0)
- *
- * Returns undefined when none apply. Per-call `timeout: 0` disables an
- * inherited default timeout.
- *
- * @deprecated Prefer `resolveSignalSources` when you need access to individual
- * signal references (e.g. for abort-cause classification).
- */
-export function resolveSignal(
-  defaults: ProcedureCallDefaults | undefined,
-  options: ProcedureCallOptions | undefined,
-): AbortSignal | undefined {
-  return resolveSignalSources(defaults, options).combined
-}
-
 /**
  * Resolves a `ClientHeadersInit` value: a static record passes through, a
  * function is invoked and (if async) awaited — re-evaluated on every call so
@@ -599,19 +573,32 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
       procedureName: descriptor.name,
       scope: descriptor.scope,
     })
+    let httpError: Error
     if (typed) {
       // Tag so executeSafeCall can distinguish typed registry errors from plain
       // ClientHttpError without re-inspecting the registry.
       ;(typed as unknown as { __tsProceduresTyped?: boolean }).__tsProceduresTyped = true
-      throw typed
+      httpError = typed
+    } else {
+      httpError = new ClientHttpError({
+        status: response.status,
+        headers: response.headers,
+        body: response.body,
+        procedureName: descriptor.name,
+        scope: descriptor.scope,
+      })
     }
-    throw new ClientHttpError({
-      status: response.status,
-      headers: response.headers,
-      body: response.body,
-      procedureName: descriptor.name,
-      scope: descriptor.scope,
-    })
+    // A non-2xx response is not a thrown adapter error (fetch resolves it), so
+    // it bypasses the catch block above. Fire onError here too so the hook is a
+    // uniform cross-cutting failure signal across adapter throws AND HTTP error
+    // statuses (401/403/5xx). Runs after onAfterResponse, which had its chance
+    // to swallow the error by mutating status back into the 2xx range.
+    await runOnError(
+      { procedureName: descriptor.name, scope: descriptor.scope, request, error: httpError },
+      hooks,
+      options,
+    )
+    throw httpError
   }
 
   // 8. Return the body (or { body, headers } when the route declares res.headers)
@@ -629,7 +616,8 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
  *   2. Adapter throw, classified → `kind: 'network' | 'timeout' | 'aborted' | <custom> | 'unknown'`
  *   3. Adapter returns non-2xx → `kind: 'typed'` (registry match) or `kind: 'http'`
  *
- * `onError` hook fires on path 2 and 3 (cross-cutting telemetry); NOT on
+ * `onError` hook fires on path 2 and 3 (cross-cutting telemetry) — including
+ * plain non-2xx `ClientHttpError` and typed registry errors — but NOT on
  * path 1 (usage errors bypass the classifier and onError entirely).
  */
 export async function executeSafeCall<TResponse, ETyped = never>(

package/src/codegen/__goldens__/ts-default--models/_types.ts

@@ -29,13 +29,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 

package/src/codegen/__goldens__/ts-default--models/index.ts

@@ -7,6 +7,16 @@ import * as _billing from './billing'
 import * as _billingReports from './billing-reports'
 import * as _errorsModule from './_errors'
 
+export {
+  ClientHttpError,
+  ClientPathParamError,
+  ClientStreamError,
+  ClientNetworkError,
+  ClientTimeoutError,
+  ClientAbortError,
+  ClientParseError,
+} from './_client'
+
 export namespace Api {
   export import Orders = _orders.Orders
   export import Billing = _billing.Billing

package/src/codegen/__goldens__/ts-default--users/_client.ts

@@ -59,13 +59,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 
@@ -305,7 +298,7 @@ export function resolveBasePath(
  * - `timeoutMs`: the resolved timeout value (may be 0 if per-call explicitly disables)
  * - `combined`: `AbortSignal.any([...])` of all active signals, or undefined if none
  *
- * Per-call `timeout: 0` disables an inherited default timeout (same as `resolveSignal`).
+ * Per-call `timeout: 0` disables an inherited default timeout.
  * Both `defaults.signal` and `options.signal` are included in `combined` when present.
  */
 export interface SignalSources {
@@ -338,25 +331,6 @@ export function resolveSignalSources(
   return { combined, timeoutSignal, userSignal, timeoutMs }
 }
 
-/**
- * Resolves the effective AbortSignal by combining (via `AbortSignal.any`):
- *   - default signal (if any)
- *   - per-call signal (if any)
- *   - timeout signal (if resolved timeout > 0)
- *
- * Returns undefined when none apply. Per-call `timeout: 0` disables an
- * inherited default timeout.
- *
- * @deprecated Prefer `resolveSignalSources` when you need access to individual
- * signal references (e.g. for abort-cause classification).
- */
-export function resolveSignal(
-  defaults: ProcedureCallDefaults | undefined,
-  options: ProcedureCallOptions | undefined,
-): AbortSignal | undefined {
-  return resolveSignalSources(defaults, options).combined
-}
-
 /**
  * Resolves a `ClientHeadersInit` value: a static record passes through, a
  * function is invoked and (if async) awaited — re-evaluated on every call so
@@ -599,19 +573,32 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
       procedureName: descriptor.name,
       scope: descriptor.scope,
     })
+    let httpError: Error
     if (typed) {
       // Tag so executeSafeCall can distinguish typed registry errors from plain
       // ClientHttpError without re-inspecting the registry.
       ;(typed as unknown as { __tsProceduresTyped?: boolean }).__tsProceduresTyped = true
-      throw typed
+      httpError = typed
+    } else {
+      httpError = new ClientHttpError({
+        status: response.status,
+        headers: response.headers,
+        body: response.body,
+        procedureName: descriptor.name,
+        scope: descriptor.scope,
+      })
     }
-    throw new ClientHttpError({
-      status: response.status,
-      headers: response.headers,
-      body: response.body,
-      procedureName: descriptor.name,
-      scope: descriptor.scope,
-    })
+    // A non-2xx response is not a thrown adapter error (fetch resolves it), so
+    // it bypasses the catch block above. Fire onError here too so the hook is a
+    // uniform cross-cutting failure signal across adapter throws AND HTTP error
+    // statuses (401/403/5xx). Runs after onAfterResponse, which had its chance
+    // to swallow the error by mutating status back into the 2xx range.
+    await runOnError(
+      { procedureName: descriptor.name, scope: descriptor.scope, request, error: httpError },
+      hooks,
+      options,
+    )
+    throw httpError
   }
 
   // 8. Return the body (or { body, headers } when the route declares res.headers)
@@ -629,7 +616,8 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
  *   2. Adapter throw, classified → `kind: 'network' | 'timeout' | 'aborted' | <custom> | 'unknown'`
  *   3. Adapter returns non-2xx → `kind: 'typed'` (registry match) or `kind: 'http'`
  *
- * `onError` hook fires on path 2 and 3 (cross-cutting telemetry); NOT on
+ * `onError` hook fires on path 2 and 3 (cross-cutting telemetry) — including
+ * plain non-2xx `ClientHttpError` and typed registry errors — but NOT on
  * path 1 (usage errors bypass the classifier and onError entirely).
  */
 export async function executeSafeCall<TResponse, ETyped = never>(

package/src/codegen/__goldens__/ts-default--users/_types.ts

@@ -29,13 +29,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 

package/src/codegen/__goldens__/ts-default--users/index.ts

@@ -5,6 +5,16 @@ import type { ClientInstance, CreateClientConfig } from './_types'
 import * as _users from './users'
 import * as _errorsModule from './_errors'
 
+export {
+  ClientHttpError,
+  ClientPathParamError,
+  ClientStreamError,
+  ClientNetworkError,
+  ClientTimeoutError,
+  ClientAbortError,
+  ClientParseError,
+} from './_client'
+
 export namespace Api {
   export import Users = _users.Users
   export import Errors = _errorsModule.ApiErrors

package/src/codegen/__goldens__/ts-external-runtime--models/index.ts

@@ -7,6 +7,16 @@ import * as _billing from './billing'
 import * as _billingReports from './billing-reports'
 import * as _errorsModule from './_errors'
 
+export {
+  ClientHttpError,
+  ClientPathParamError,
+  ClientStreamError,
+  ClientNetworkError,
+  ClientTimeoutError,
+  ClientAbortError,
+  ClientParseError,
+} from 'ts-procedures/client'
+
 export namespace Api {
   export import Orders = _orders.Orders
   export import Billing = _billing.Billing

package/src/codegen/__goldens__/ts-external-runtime--users/index.ts

@@ -5,6 +5,16 @@ import type { ClientInstance, CreateClientConfig } from 'ts-procedures/client'
 import * as _users from './users'
 import * as _errorsModule from './_errors'
 
+export {
+  ClientHttpError,
+  ClientPathParamError,
+  ClientStreamError,
+  ClientNetworkError,
+  ClientTimeoutError,
+  ClientAbortError,
+  ClientParseError,
+} from 'ts-procedures/client'
+
 export namespace Api {
   export import Users = _users.Users
   export import Errors = _errorsModule.ApiErrors

package/src/codegen/__goldens__/ts-flat--models/_client.ts

@@ -59,13 +59,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 
@@ -305,7 +298,7 @@ export function resolveBasePath(
  * - `timeoutMs`: the resolved timeout value (may be 0 if per-call explicitly disables)
  * - `combined`: `AbortSignal.any([...])` of all active signals, or undefined if none
  *
- * Per-call `timeout: 0` disables an inherited default timeout (same as `resolveSignal`).
+ * Per-call `timeout: 0` disables an inherited default timeout.
  * Both `defaults.signal` and `options.signal` are included in `combined` when present.
  */
 export interface SignalSources {
@@ -338,25 +331,6 @@ export function resolveSignalSources(
   return { combined, timeoutSignal, userSignal, timeoutMs }
 }
 
-/**
- * Resolves the effective AbortSignal by combining (via `AbortSignal.any`):
- *   - default signal (if any)
- *   - per-call signal (if any)
- *   - timeout signal (if resolved timeout > 0)
- *
- * Returns undefined when none apply. Per-call `timeout: 0` disables an
- * inherited default timeout.
- *
- * @deprecated Prefer `resolveSignalSources` when you need access to individual
- * signal references (e.g. for abort-cause classification).
- */
-export function resolveSignal(
-  defaults: ProcedureCallDefaults | undefined,
-  options: ProcedureCallOptions | undefined,
-): AbortSignal | undefined {
-  return resolveSignalSources(defaults, options).combined
-}
-
 /**
  * Resolves a `ClientHeadersInit` value: a static record passes through, a
  * function is invoked and (if async) awaited — re-evaluated on every call so
@@ -599,19 +573,32 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
       procedureName: descriptor.name,
       scope: descriptor.scope,
     })
+    let httpError: Error
     if (typed) {
       // Tag so executeSafeCall can distinguish typed registry errors from plain
       // ClientHttpError without re-inspecting the registry.
       ;(typed as unknown as { __tsProceduresTyped?: boolean }).__tsProceduresTyped = true
-      throw typed
+      httpError = typed
+    } else {
+      httpError = new ClientHttpError({
+        status: response.status,
+        headers: response.headers,
+        body: response.body,
+        procedureName: descriptor.name,
+        scope: descriptor.scope,
+      })
     }
-    throw new ClientHttpError({
-      status: response.status,
-      headers: response.headers,
-      body: response.body,
-      procedureName: descriptor.name,
-      scope: descriptor.scope,
-    })
+    // A non-2xx response is not a thrown adapter error (fetch resolves it), so
+    // it bypasses the catch block above. Fire onError here too so the hook is a
+    // uniform cross-cutting failure signal across adapter throws AND HTTP error
+    // statuses (401/403/5xx). Runs after onAfterResponse, which had its chance
+    // to swallow the error by mutating status back into the 2xx range.
+    await runOnError(
+      { procedureName: descriptor.name, scope: descriptor.scope, request, error: httpError },
+      hooks,
+      options,
+    )
+    throw httpError
   }
 
   // 8. Return the body (or { body, headers } when the route declares res.headers)
@@ -629,7 +616,8 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
  *   2. Adapter throw, classified → `kind: 'network' | 'timeout' | 'aborted' | <custom> | 'unknown'`
  *   3. Adapter returns non-2xx → `kind: 'typed'` (registry match) or `kind: 'http'`
  *
- * `onError` hook fires on path 2 and 3 (cross-cutting telemetry); NOT on
+ * `onError` hook fires on path 2 and 3 (cross-cutting telemetry) — including
+ * plain non-2xx `ClientHttpError` and typed registry errors — but NOT on
  * path 1 (usage errors bypass the classifier and onError entirely).
  */
 export async function executeSafeCall<TResponse, ETyped = never>(

package/src/codegen/__goldens__/ts-flat--models/_types.ts

@@ -29,13 +29,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 

package/src/codegen/__goldens__/ts-flat--models/index.ts

@@ -7,6 +7,16 @@ import * as _billing from './billing'
 import * as _billingReports from './billing-reports'
 import * as _errorsModule from './_errors'
 
+export {
+  ClientHttpError,
+  ClientPathParamError,
+  ClientStreamError,
+  ClientNetworkError,
+  ClientTimeoutError,
+  ClientAbortError,
+  ClientParseError,
+} from './_client'
+
 
 export function createApiBindings(client: ClientInstance) {
   return {

package/src/codegen/__goldens__/ts-flat--users/_client.ts

@@ -59,13 +59,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 
@@ -305,7 +298,7 @@ export function resolveBasePath(
  * - `timeoutMs`: the resolved timeout value (may be 0 if per-call explicitly disables)
  * - `combined`: `AbortSignal.any([...])` of all active signals, or undefined if none
  *
- * Per-call `timeout: 0` disables an inherited default timeout (same as `resolveSignal`).
+ * Per-call `timeout: 0` disables an inherited default timeout.
  * Both `defaults.signal` and `options.signal` are included in `combined` when present.
  */
 export interface SignalSources {
@@ -338,25 +331,6 @@ export function resolveSignalSources(
   return { combined, timeoutSignal, userSignal, timeoutMs }
 }
 
-/**
- * Resolves the effective AbortSignal by combining (via `AbortSignal.any`):
- *   - default signal (if any)
- *   - per-call signal (if any)
- *   - timeout signal (if resolved timeout > 0)
- *
- * Returns undefined when none apply. Per-call `timeout: 0` disables an
- * inherited default timeout.
- *
- * @deprecated Prefer `resolveSignalSources` when you need access to individual
- * signal references (e.g. for abort-cause classification).
- */
-export function resolveSignal(
-  defaults: ProcedureCallDefaults | undefined,
-  options: ProcedureCallOptions | undefined,
-): AbortSignal | undefined {
-  return resolveSignalSources(defaults, options).combined
-}
-
 /**
  * Resolves a `ClientHeadersInit` value: a static record passes through, a
  * function is invoked and (if async) awaited — re-evaluated on every call so
@@ -599,19 +573,32 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
       procedureName: descriptor.name,
       scope: descriptor.scope,
     })
+    let httpError: Error
     if (typed) {
       // Tag so executeSafeCall can distinguish typed registry errors from plain
       // ClientHttpError without re-inspecting the registry.
       ;(typed as unknown as { __tsProceduresTyped?: boolean }).__tsProceduresTyped = true
-      throw typed
+      httpError = typed
+    } else {
+      httpError = new ClientHttpError({
+        status: response.status,
+        headers: response.headers,
+        body: response.body,
+        procedureName: descriptor.name,
+        scope: descriptor.scope,
+      })
     }
-    throw new ClientHttpError({
-      status: response.status,
-      headers: response.headers,
-      body: response.body,
-      procedureName: descriptor.name,
-      scope: descriptor.scope,
-    })
+    // A non-2xx response is not a thrown adapter error (fetch resolves it), so
+    // it bypasses the catch block above. Fire onError here too so the hook is a
+    // uniform cross-cutting failure signal across adapter throws AND HTTP error
+    // statuses (401/403/5xx). Runs after onAfterResponse, which had its chance
+    // to swallow the error by mutating status back into the 2xx range.
+    await runOnError(
+      { procedureName: descriptor.name, scope: descriptor.scope, request, error: httpError },
+      hooks,
+      options,
+    )
+    throw httpError
   }
 
   // 8. Return the body (or { body, headers } when the route declares res.headers)
@@ -629,7 +616,8 @@ export async function executeCall<TResponse>(config: ExecuteCallConfig): Promise
  *   2. Adapter throw, classified → `kind: 'network' | 'timeout' | 'aborted' | <custom> | 'unknown'`
  *   3. Adapter returns non-2xx → `kind: 'typed'` (registry match) or `kind: 'http'`
  *
- * `onError` hook fires on path 2 and 3 (cross-cutting telemetry); NOT on
+ * `onError` hook fires on path 2 and 3 (cross-cutting telemetry) — including
+ * plain non-2xx `ClientHttpError` and typed registry errors — but NOT on
  * path 1 (usage errors bypass the classifier and onError entirely).
  */
 export async function executeSafeCall<TResponse, ETyped = never>(

package/src/codegen/__goldens__/ts-flat--users/_types.ts

@@ -29,13 +29,6 @@ export class ClientHttpError extends Error {
   }
 }
 
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
- 
-export const ClientRequestError = ClientHttpError
-/** @deprecated Renamed to `ClientHttpError`. The alias is retained for one minor release after the 7.0.0 major bump and will be removed in a subsequent minor (e.g. 7.1.0). Migrate to `ClientHttpError` now. */
-// eslint-disable-next-line no-redeclare
-export type ClientRequestError = ClientHttpError
-
 export class ClientPathParamError extends Error {
   readonly name = 'ClientPathParamError'
 

package/src/codegen/__goldens__/ts-flat--users/index.ts

@@ -5,6 +5,16 @@ import type { ClientInstance, CreateClientConfig } from './_types'
 import * as _users from './users'
 import * as _errorsModule from './_errors'
 
+export {
+  ClientHttpError,
+  ClientPathParamError,
+  ClientStreamError,
+  ClientNetworkError,
+  ClientTimeoutError,
+  ClientAbortError,
+  ClientParseError,
+} from './_client'
+
 
 export function createApiBindings(client: ClientInstance) {
   return {