diff --git a/packages/cli/src/lib/api/seer.ts b/packages/cli/src/lib/api/seer.ts
index 505ad6a4a..5bbb6c346 100644
--- a/packages/cli/src/lib/api/seer.ts
+++ b/packages/cli/src/lib/api/seer.ts
@@ -6,7 +6,11 @@
  * which returns blocks instead of steps.
  */
 
-import type { AutofixResponse, AutofixState } from "../../types/seer.js";
+import {
+  type AutofixResponse,
+  AutofixResponseSchema,
+  type AutofixState,
+} from "../../types/seer.js";
 
 import { resolveOrgRegion } from "../region.js";
 
@@ -96,6 +100,7 @@ export async function getAutofixState(
     `/organizations/${orgSlug}/issues/${issueId}/autofix/`,
     {
       params: EXPLORER_MODE_PARAMS,
+      schema: AutofixResponseSchema,
     }
   );
 
diff --git a/packages/cli/test/lib/api-client.seer.test.ts b/packages/cli/test/lib/api-client.seer.test.ts
index ba5ade22b..d76a69b58 100644
--- a/packages/cli/test/lib/api-client.seer.test.ts
+++ b/packages/cli/test/lib/api-client.seer.test.ts
@@ -12,6 +12,7 @@ import {
 } from "../../src/lib/api-client.js";
 import { setAuthToken } from "../../src/lib/db/auth.js";
 import { setOrgRegion } from "../../src/lib/db/regions.js";
+import { ApiError } from "../../src/lib/errors.js";
 import { useTestConfigDir } from "../helpers.js";
 
 useTestConfigDir("test-seer-api-");
@@ -231,7 +232,50 @@ describe("getAutofixState", () => {
     expect(result).toBeNull();
   });
 
+  test.each([
+    { name: "a null response", payload: null },
+    { name: "a missing status", payload: { autofix: { run_id: 1 } } },
+    {
+      name: "a non-string status",
+      payload: { autofix: { run_id: 1, status: 123 } },
+    },
+  ])("throws a validation ApiError for $name", async ({ payload }) => {
+    globalThis.fetch = async () =>
+      new Response(JSON.stringify(payload), {
+        status: 200,
+        headers: { "Content-Type": "application/json" },
+      });
+
+    const request = getAutofixState("test-org", "123456789");
+
+    await expect(request).rejects.toBeInstanceOf(ApiError);
+    await expect(request).rejects.toMatchObject({
+      message:
+        "Unexpected response format from /organizations/test-org/issues/123456789/autofix/",
+      status: 200,
+      detail: expect.any(String),
+    });
+  });
+
   test("returns completed state with blocks", async () => {
+    const blocks = [
+      {
+        id: "block-1",
+        message: { role: "assistant", content: "Found the root cause" },
+        timestamp: "2025-01-01T00:00:00Z",
+        artifacts: [
+          {
+            key: "root_cause",
+            data: {
+              one_line_description: "Test cause",
+              five_whys: ["Why 1"],
+            },
+            reason: "",
+          },
+        ],
+      },
+    ];
+
     globalThis.fetch = async () =>
       new Response(
         JSON.stringify({
@@ -239,23 +283,7 @@ describe("getAutofixState", () => {
             run_id: 12_345,
             status: "completed",
             updated_at: "2025-01-01T00:00:00Z",
-            blocks: [
-              {
-                id: "block-1",
-                message: { role: "assistant", content: "Found the root cause" },
-                timestamp: "2025-01-01T00:00:00Z",
-                artifacts: [
-                  {
-                    key: "root_cause",
-                    data: {
-                      one_line_description: "Test cause",
-                      five_whys: ["Why 1"],
-                    },
-                    reason: "",
-                  },
-                ],
-              },
-            ],
+            blocks,
           },
         }),
         {
@@ -266,6 +294,7 @@ describe("getAutofixState", () => {
 
     const result = await getAutofixState("test-org", "123456789");
     expect(result?.status).toBe("COMPLETED");
+    expect(result?.blocks).toEqual(blocks);
   });
 });