merge: query-failure cap SQL errors only review-comment fixes

Author: kathiekiwi

internal-packages/dashboard-agent/src/tool-api.ts

@@ -351,11 +351,14 @@ export function buildApiTools(args: {
         const result = await postQuery(query, period);
         if (isEnvUnavailable(result)) return envUnavailableError(result, "query");
         if (!result.ok) {
-          consecutiveQueryFailures++;
-          if (consecutiveQueryFailures >= MAX_CONSECUTIVE_QUERY_FAILURES) {
-            return {
-              error: `${result.error} That is ${consecutiveQueryFailures} queries in a row that failed. Stop querying and answer the user with what you already have.`,
-            };
+          // Only SQL errors count toward the cap; transport errors are transient.
+          if (result.kind === "query") {
+            consecutiveQueryFailures++;
+            if (consecutiveQueryFailures >= MAX_CONSECUTIVE_QUERY_FAILURES) {
+              return {
+                error: `${result.error} That is ${consecutiveQueryFailures} queries in a row that failed. Stop querying and answer the user with what you already have.`,
+              };
+            }
           }
           return { error: result.error };
         }

internal-packages/dashboard-agent/src/tool-query-retry-cap.test.ts

@@ -30,6 +30,11 @@ const failure = {
   kind: "query" as const,
   error: "Unknown expression identifier 'createdAt'.",
 };
+const transportFailure = {
+  ok: false as const,
+  kind: "transport" as const,
+  error: "The environment is temporarily unavailable.",
+};
 const success = { ok: true as const, rows: [{ n: 1 }] };
 
 describe("run_query's consecutive-failure cap", () => {
@@ -70,4 +75,16 @@ describe("run_query's consecutive-failure cap", () => {
 
     expect(result.error).toBe(failure.error);
   });
+
+  it("does not count transport errors toward the cap", async () => {
+    const run = queryTool(async () => transportFailure);
+
+    let result: { error: string } = { error: "" };
+    for (let attempt = 0; attempt < MAX_CONSECUTIVE_QUERY_FAILURES + 2; attempt++) {
+      result = await run("SELECT createdAt FROM runs");
+    }
+
+    expect(result.error).toBe(transportFailure.error);
+    expect(result.error).not.toContain("answer the user with what you already have");
+  });
 });