From b02754f8b88d776c328b8a514839565be5f6e958 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Tue, 11 Aug 2026 13:20:16 +0300
Subject: [PATCH] apply tweaked version of matthieu's suggestion

---
 src/lib/xrpc-error.ts | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/lib/xrpc-error.ts b/src/lib/xrpc-error.ts
index 5ee89ca0fc..25f9a1277e 100644
--- a/src/lib/xrpc-error.ts
+++ b/src/lib/xrpc-error.ts
@@ -7,6 +7,18 @@ import {
   XrpcResponseError,
 } from '@atproto/lex'
 
+/**
+ * Same nsid means `e` was thrown for this method schema, so `e` can be
+ * treated as an `XrpcResponseError<M>` - which is what lets the SDK's
+ * `matchesSchemaErrors()` narrow `e.error` to M's declared errors.
+ */
+function isThrownFor<M extends Procedure | Query>(
+  e: XrpcResponseError,
+  schema: M,
+): e is XrpcResponseError<M> {
+  return e.method.nsid === schema.nsid
+}
+
 /**
  * The lexicon error code carried by `e`, narrowed to the errors DECLARED by
  * `method`, or `undefined` when `e` is not such an error.
@@ -39,12 +51,9 @@ export function matchXrpcError<M extends Procedure | Query>(
   if (!(e instanceof XrpcResponseError)) {
     return undefined
   }
-  const schema: Procedure | Query = getMain(method)
-  const thrownFor: Procedure | Query = e.method
-  if (thrownFor.nsid !== schema.nsid) {
-    return undefined
+  const schema = getMain(method)
+  if (isThrownFor(e, schema) && e.matchesSchemaErrors()) {
+    return e.error
   }
-  return schema.errors?.includes(e.error)
-    ? (e.error as InferMethodError<M>)
-    : undefined
+  return undefined
 }