fix(provider): normalize terminal failures

packages/junior-evals/tests/integration/eval-ai-gateway-dispatcher.test.ts

@@ -2,7 +2,6 @@ import http from "node:http";
 import { afterEach, describe, expect, it } from "vitest";
 import {
   getModel,
-  isRetryableAssistantError,
   streamAnthropic,
   type Message as PiAiMessage,
 } from "@/chat/pi/sdk";
@@ -84,12 +83,11 @@ describe("eval AI Gateway dispatcher", () => {
         stopReason: "error",
         errorMessage: "terminated",
       });
-      expect(isRetryableAssistantError(failedAssistant)).toBe(true);
       expect(
         nextProviderRetry({
           attempt: 0,
+          failure: failedAssistant,
           messages: [userMessage as PiMessage, failedAssistant as PiMessage],
-          retryableFailure: isRetryableAssistantError(failedAssistant),
         }),
       ).toEqual({ delayMs: 2_000, messages: [userMessage as PiMessage] });
     } finally {

packages/junior/src/chat/agent/index.ts

@@ -11,7 +11,6 @@
  * completion.
  */
 import { Agent, type AgentLoopTurnUpdate } from "@earendil-works/pi-agent-core";
-import { isRetryableAssistantError } from "@earendil-works/pi-ai";
 import type { FileUpload } from "chat";
 import { botConfig } from "@/chat/config";
 import {
@@ -74,10 +73,8 @@ import {
   buildTurnResult,
   getAssistantMessageText,
 } from "@/chat/services/turn-result";
-import {
-  isProviderRetryError,
-  nextProviderRetry,
-} from "@/chat/services/provider-retry";
+import { isProviderRetryError } from "@/chat/services/provider-error";
+import { nextProviderRetry } from "@/chat/services/provider-retry";
 import { annotateTurnDeadlineToolResult } from "@/chat/tool-support/turn-deadline-result";
 import {
   configuredTurnRoute,
@@ -1111,10 +1108,8 @@ async function executeAgentRunInPrivacyContext(
 
               const providerRetry = nextProviderRetry({
                 attempt,
+                failure: lastAssistant,
                 messages: agent!.state.messages,
-                retryableFailure:
-                  lastAssistant !== undefined &&
-                  isRetryableAssistantError(lastAssistant),
               });
               if (!providerRetry) {
                 break;

packages/junior/src/chat/pi/client.ts

@@ -44,7 +44,7 @@ import {
 import {
   createProviderError,
   isProviderRetryError,
-} from "@/chat/services/provider-retry";
+} from "@/chat/services/provider-error";
 import { hasCompactedConversationContext } from "@/chat/services/context-compaction-marker";
 
 const GATEWAY_PROVIDER = "vercel-ai-gateway" as const;
@@ -201,7 +201,7 @@ export async function completeText(params: {
           },
         );
       } catch (error) {
-        throw createProviderError(error);
+        throw createProviderError(error, { modelId: params.modelId });
       }
       const outputText = extractText(message);
       const outputMessagesAttribute = serializeGenAiAttribute(
@@ -244,7 +244,7 @@ export async function completeText(params: {
           },
           "AI completion returned provider error",
         );
-        throw createProviderError(providerMessage);
+        throw createProviderError(providerMessage, { modelId: params.modelId });
       }
 
       return {
@@ -343,7 +343,9 @@ export async function completeObject<TSchema extends ZodTypeAny>(params: {
     );
     return { object: result.object as z.infer<TSchema> };
   } catch (error) {
-    const providerError = createProviderError(error);
+    const providerError = createProviderError(error, {
+      modelId: params.modelId,
+    });
     if (isProviderRetryError(providerError)) {
       throw providerError;
     }
@@ -402,7 +404,13 @@ export async function embedTexts(params: {
             (embedding) => embedding.length === dimensions,
           )
         ) {
-          throw new Error("Embedding provider returned invalid vectors.");
+          throw createProviderError(
+            "Embedding provider returned invalid vectors.",
+            {
+              kind: "invalid_response",
+              modelId: params.modelId,
+            },
+          );
         }
         setSpanAttributes({
           "gen_ai.embeddings.dimension.count": dimensions,
@@ -425,7 +433,9 @@ export async function embedTexts(params: {
       vectors: result.result.embeddings,
     };
   } catch (error) {
-    const providerError = createProviderError(error);
+    const providerError = createProviderError(error, {
+      modelId: params.modelId,
+    });
     if (isProviderRetryError(providerError)) {
       throw providerError;
     }

packages/junior/src/chat/runtime/slack-runtime.ts

@@ -9,7 +9,7 @@
 import type { Message, MessageContext, Thread } from "chat";
 import type { Destination } from "@sentry/junior-plugin-api";
 import { getSubscribedReplyPreflightDecision } from "@/chat/services/subscribed-decision";
-import { isProviderRetryError } from "@/chat/services/provider-retry";
+import { isProviderRetryError } from "@/chat/services/provider-error";
 import { AuthorizationFlowDisabledError } from "@/chat/services/auth-pause";
 import { SlackActionError } from "@/chat/slack/client";
 import {