@evident-ai/cli 3.1.1-dev.019c4e9 → 3.1.1-dev.0d69ecc

package/dist/index.js

@@ -1548,6 +1548,42 @@ function messageError(messages, userMessageId) {
   }
   return "The agent run failed.";
 }
+function messageFailure(messages, userMessageId) {
+  const reply = findLastAssistantReplyFor(messages, userMessageId);
+  const error2 = errorOf(reply);
+  if (error2 == null || typeof error2 !== "object") return null;
+  const e = error2;
+  const replyProviderId = reply?.info?.providerID ?? null;
+  const replyModelId = reply?.info?.modelID ?? null;
+  if (e.name === "ProviderAuthError") {
+    const data = e.data;
+    const providerId = typeof data?.providerID === "string" && data.providerID || replyProviderId;
+    return { kind: "model_auth", providerId, modelId: replyModelId, reason: "missing" };
+  }
+  if (e.name === "APIError") {
+    const data = e.data;
+    const statusCode = data?.statusCode;
+    if (statusCode === 401 || statusCode === 403) {
+      return {
+        kind: "model_auth",
+        providerId: replyProviderId,
+        modelId: replyModelId,
+        reason: "rejected"
+      };
+    }
+  }
+  return null;
+}
+function applyZeroProviderFallback(classified, hasConfiguredProvider, replyProviderId, replyModelId = null) {
+  if (classified != null) return classified;
+  if (hasConfiguredProvider !== false) return null;
+  return {
+    kind: "model_auth",
+    providerId: replyProviderId,
+    modelId: replyModelId,
+    reason: "missing"
+  };
+}
 function hasRunningAssistantExcept(messages, exceptUserMessageId) {
   if (!messages || messages.length === 0) return false;
   return messages.some(
@@ -3598,8 +3634,16 @@ var ChannelDriver = class _ChannelDriver {
           message_id: inFlight.evidentMessageId
         });
         const usage = messageUsage(messages, inFlight.opencodeMessageId);
+        const failure = await this.classifyModelAuthFailure(messages, inFlight.opencodeMessageId);
         try {
-          await this.markFailed(conv.id, inFlight.evidentMessageId, sessionId, error2, usage);
+          await this.markFailed(
+            conv.id,
+            inFlight.evidentMessageId,
+            sessionId,
+            error2,
+            usage,
+            failure
+          );
         } catch (err) {
           if (err instanceof ChannelAuthError) throw err;
           if (err instanceof ChannelTerminalError) {
@@ -3980,6 +4024,7 @@ var ChannelDriver = class _ChannelDriver {
     if (state === "failed") {
       const error2 = messageError(messages, ocId ?? "") ?? void 0;
       const usage = messageUsage(messages, ocId ?? "");
+      const failure = await this.classifyModelAuthFailure(messages, ocId ?? "");
       this.log({
         level: "error",
         message: `Re-adopt: message ${row.id.slice(0, 8)} errored while unwatched \u2014 marking failed: ${error2 ?? "(no error text)"}`,
@@ -3987,7 +4032,7 @@ var ChannelDriver = class _ChannelDriver {
         message_id: row.id
       });
       try {
-        await this.markFailed(row.conversation_id, row.id, sessionId, error2, usage);
+        await this.markFailed(row.conversation_id, row.id, sessionId, error2, usage, failure);
       } catch (err) {
         if (err instanceof ChannelAuthError) throw err;
         if (err instanceof ChannelTerminalError) {
@@ -4965,7 +5010,7 @@ var ChannelDriver = class _ChannelDriver {
    *     exists but is wedged, so the next attempt must get a fresh one
    *     instead of reusing it — see WI-1's server-side null-clearing PATCH).
    */
-  async markFailed(conversationId, messageId, sessionId, error2, usage) {
+  async markFailed(conversationId, messageId, sessionId, error2, usage, failure) {
     const body = { status: "failed" };
     if (sessionId === null) {
       body.opencode_session_id = null;
@@ -4974,6 +5019,12 @@ var ChannelDriver = class _ChannelDriver {
     }
     if (error2 !== void 0) body.error = error2;
     if (usage) Object.assign(body, usage);
+    if (failure) {
+      body.failure_kind = failure.kind;
+      body.failure_provider_id = failure.providerId;
+      body.failure_model_id = failure.modelId;
+      body.failure_reason = failure.reason;
+    }
     await this.callWithRetry(
       "marking message as failed",
       () => this.fetchImpl(
@@ -4986,6 +5037,29 @@ var ChannelDriver = class _ChannelDriver {
       )
     );
   }
+  /**
+   * Classify an errored turn as a model-auth failure (#736 P1-4), for `markFailed`.
+   *
+   * `messageFailure` alone (structured OpenCode error → `model_auth`) covers
+   * most cases; when it returns `null` on this ALREADY-FAILED turn, fall back
+   * to the P1-2b zero-provider check — one extra loopback call to
+   * `hasAnyConfiguredProvider`, only reached when the structured classifier
+   * couldn't place it. Fails open (never throws): a fallback probe failure
+   * (`null`/indeterminate) leaves the classification `null`, which produces
+   * today's byte-identical PATCH body via `markFailed`'s `if (failure)` guard.
+   */
+  async classifyModelAuthFailure(messages, userMessageId) {
+    const classified = messageFailure(messages, userMessageId);
+    if (classified != null) return classified;
+    const reply = findLastAssistantReplyFor(messages, userMessageId);
+    const hasProvider = await hasAnyConfiguredProvider(this.port);
+    return applyZeroProviderFallback(
+      classified,
+      hasProvider,
+      reply?.info?.providerID ?? null,
+      reply?.info?.modelID ?? null
+    );
+  }
   /**
    * Best-effort, SINGLE-ATTEMPT runner→server telemetry ping
    * (queued-followup-redrive). `POST .../messages/:id/signal {signal, ...extra}`