From d08fffdbb29580115b00cbe1a969793a62285386 Mon Sep 17 00:00:00 2001
From: Josef Prochazka <josef.prochazka@apify.com>
Date: Mon, 12 Oct 2026 11:49:28 +0000
Subject: [PATCH] fix: Print the API error body after the 404 endpoint hints in
 apify api

The "Did you mean" list came after the body and pushed the API's own error, which usually says what is
actually wrong (an unknown record rather than an unknown endpoint), out of view.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015VTFswSQJstnQ6r8QeqfgK
---
 src/commands/api.ts                         | 35 +++++++++++----------
 test/local/commands/api-suggestions.test.ts |  2 ++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/commands/api.ts b/src/commands/api.ts
index b35a2afe9..72e19155c 100644
--- a/src/commands/api.ts
+++ b/src/commands/api.ts
@@ -123,6 +123,19 @@ function formatEndpointLine(ep: Endpoint): string {
 
 const LIST_ENDPOINTS_HINT = `Run ${chalk.cyan('apify api --list-endpoints')} to see all available Apify API endpoints.`;
 
+function printResponseBody(responseText: string) {
+	if (!responseText) {
+		return;
+	}
+
+	try {
+		const parsed = JSON.parse(responseText);
+		simpleLog({ message: JSON.stringify(parsed, null, 2), stdout: true });
+	} catch {
+		simpleLog({ message: responseText, stdout: true });
+	}
+}
+
 function printSuggestions(suggestions: Endpoint[]) {
 	if (suggestions.length > 0) {
 		simpleLog({ message: `\nDid you mean:`, stdout: false });
@@ -361,30 +374,18 @@ export class ApiCommand extends ApifyCommand<typeof ApiCommand> {
 			// pipelines like `apify api ... | jq` still receive the payload on failure.
 			error({ message: `${response.status} ${response.statusText}` });
 
-			if (responseText) {
-				try {
-					const parsed = JSON.parse(responseText);
-					simpleLog({ message: JSON.stringify(parsed, null, 2), stdout: true });
-				} catch {
-					simpleLog({ message: responseText, stdout: true });
-				}
-			}
-
+			// The endpoint hints come first so the API's own error, which usually says what is actually
+			// wrong (e.g. an unknown record rather than an unknown endpoint), ends the output.
 			if (response.status === 404) {
 				await this.print404Suggestions(endpoint);
 			}
 
+			printResponseBody(responseText);
+
 			return;
 		}
 
-		if (responseText) {
-			try {
-				const parsed = JSON.parse(responseText);
-				simpleLog({ message: JSON.stringify(parsed, null, 2), stdout: true });
-			} catch {
-				simpleLog({ message: responseText, stdout: true });
-			}
-		}
+		printResponseBody(responseText);
 	}
 
 	private async getEndpoints(): Promise<Endpoint[]> {
diff --git a/test/local/commands/api-suggestions.test.ts b/test/local/commands/api-suggestions.test.ts
index b070f68fe..af6f933f7 100644
--- a/test/local/commands/api-suggestions.test.ts
+++ b/test/local/commands/api-suggestions.test.ts
@@ -57,6 +57,8 @@ describe('apify api 404 suggestions', () => {
 			expect(combined).toMatch(/404/);
 			expect(combined).toMatch(/did you mean/i);
 			expect(combined).toMatch(/--list-endpoints/);
+			// The API's own error body is still printed, after the hint and on stdout.
+			expect(logMessages.log.join('\n')).toContain('"message": "Not found"');
 		} finally {
 			fetchSpy.mockRestore();
 		}