fix: improve api error messages

src/common/atlas/apiClientError.ts

@@ -1,21 +1,48 @@
-export class ApiClientError extends Error {
-    response?: Response;
+import { ApiError } from "./openapi.js";
 
-    constructor(message: string, response: Response | undefined = undefined) {
+export class ApiClientError extends Error {
+    private constructor(
+        message: string,
+        public readonly response?: Response,
+        public readonly body?: ApiError
+    ) {
         super(message);
         this.name = "ApiClientError";
-        this.response = response;
     }
 
     static async fromResponse(
         response: Response,
         message: string = `error calling Atlas API`
     ): Promise<ApiClientError> {
+        const { errorMessage, body } = await this.extractErrorMessage(response);
+
+        return new ApiClientError(`${message}: ${errorMessage}`, response, body);
+    }
+
+    private static async extractErrorMessage(
+        response: Response
+    ): Promise<{ errorMessage: string; body: ApiError | undefined }> {
+        let errorMessage: string = "";
+        let body: ApiError | undefined = undefined;
         try {
-            const text = await response.text();
-            return new ApiClientError(`${message}: [${response.status} ${response.statusText}] ${text}`, response);
+            body = (await response.json()) as ApiError;
+            errorMessage = body.reason || "unknown error";
+            if (body.detail && body.detail.length > 0) {
+                errorMessage = `${errorMessage}; ${body.detail}`;
+            }
         } catch {
-            return new ApiClientError(`${message}: ${response.status} ${response.statusText}`, response);
+            try {
+                errorMessage = await response.text();
+            } catch {
+                errorMessage = "unknown error";
+            }
         }
+
+        errorMessage = `[${response.status} ${response.statusText}] ${errorMessage.trim()}`;
+
+        return {
+            errorMessage,
+            body,
+        };
     }
 }

src/tools/tool.ts

@@ -126,9 +126,9 @@ export abstract class ToolBase {
                 {
                     type: "text",
                     text: `Error running ${this.name}: ${error instanceof Error ? error.message : String(error)}`,
-                    isError: true,
                 },
             ],
+            isError: true,
         };
     }