Address Copilot review: remove rate-limit duplication, fix header read order, add test

- throwApiError: read x-ratelimit-reset header before the try block so it is
  available even when the response body is malformed JSON
- Team-repos loop: replace duplicated rate-limit detection block with a direct
  call to throwApiError (removes the duplication highlighted by Copilot)
- api.test.ts: add test covering 403 rate-limit response in the team repos
  endpoint, verifying the clean error message with wait time is thrown

Author: shouze

src/api.test.ts

@@ -308,7 +308,7 @@ describe("fetchAllResults", () => {
   });
 });
 
-// ─── fetchRepoTeams ───────────────────────────────────────────────────────────
+// ─── fetchRepoTeams ──────────────────────────────────────────────────────────
 
 describe("fetchRepoTeams", () => {
   afterEach(() => {
@@ -458,6 +458,35 @@ describe("fetchRepoTeams", () => {
     expect(result.has("myorg/repo-0")).toBe(true);
   });
 
+  it("throws a clean rate-limit error when the team repo list returns 403 rate-limit", async () => {
+    const resetTimestamp = Math.ceil((Date.now() + 300_000) / 1_000); // 5 minutes from now
+    globalThis.fetch = (async (url: string | URL | Request) => {
+      const urlStr = url.toString();
+      if (urlStr.includes("/teams?")) {
+        return new Response(JSON.stringify([{ slug: "frontend-web", name: "FE" }]), {
+          status: 200,
+          headers: { "content-type": "application/json" },
+        });
+      }
+      // Team repos endpoint → rate-limited
+      return new Response(
+        JSON.stringify({ message: "API rate limit exceeded for user ID 1234.", status: "403" }),
+        {
+          status: 403,
+          headers: {
+            "content-type": "application/json",
+            "x-ratelimit-remaining": "0",
+            "x-ratelimit-reset": String(resetTimestamp),
+          },
+        },
+      );
+    }) as typeof fetch;
+
+    await expect(fetchRepoTeams("myorg", "tok", ["frontend"], false)).rejects.toThrow(
+      /GitHub API rate limit exceeded\. Please retry in \d+ minute/,
+    );
+  });
+
   it("prefix matching is case-insensitive", async () => {
     globalThis.fetch = (async (url: string | URL | Request) => {
       const urlStr = url.toString();

src/api.ts

@@ -45,11 +45,12 @@ interface RawRepo {
  */
 async function throwApiError(res: Response, context?: string): Promise<never> {
   let apiMsg = "";
-  let resetHeader: string | null = null;
+  // Read rate-limit headers before consuming the body so they are always
+  // available even when the response body is malformed JSON.
+  const resetHeader = res.headers.get("x-ratelimit-reset");
   try {
     const body = (await res.json()) as { message?: string };
     apiMsg = body.message ?? "";
-    resetHeader = res.headers.get("x-ratelimit-reset");
   } catch {
     // Ignore JSON parse errors; fall through to generic message
   }
@@ -288,35 +289,10 @@ export async function fetchRepoTeams(
         );
         if (!res.ok) {
           // 404 is expected for nested/secret teams — skip silently.
-          if (res.status === 404) {
-            break;
-          }
-          // Rate-limit 403: throw a clean error like every other rate-limit hit.
-          const bodyJson = await res.json().catch(() => ({}) as { message?: string });
-          const apiMsg: string = (bodyJson as { message?: string }).message ?? "";
-          if (
-            res.status === 403 &&
-            (res.headers.get("x-ratelimit-remaining") === "0" ||
-              apiMsg.toLowerCase().includes("rate limit"))
-          ) {
-            const resetHeader = res.headers.get("x-ratelimit-reset");
-            let wait = "";
-            if (resetHeader !== null) {
-              const resetMs = parseInt(resetHeader, 10) * 1_000 - Date.now();
-              if (resetMs > 0) wait = ` Please retry in ${formatRetryWait(resetMs)}.`;
-            }
-            throw new Error(`GitHub API rate limit exceeded.${wait}`);
-          }
-          // Other errors are unexpected: log a warning and skip this team.
-          let bodyText = apiMsg || JSON.stringify(bodyJson);
-          if (bodyText.length > 200) bodyText = bodyText.slice(0, 200) + "…";
-          const message = bodyText ? `; body: ${bodyText}` : "";
-          process.stderr.write(
-            pc.dim(
-              `Warning: could not fetch repos for team "${slug}" (HTTP ${res.status}${message})\n`,
-            ),
-          );
-          break;
+          if (res.status === 404) break;
+          // All other errors (rate-limit included) delegate to throwApiError
+          // which detects rate-limits and produces a clean message.
+          await throwApiError(res);
         }
         const repos = (await res.json()) as RawRepo[];
         for (const r of repos) {