polygram 0.7.9 → 0.8.0-rc.10

package/lib/error-classify.js

@@ -97,7 +97,10 @@ const USER_MESSAGES = {
   missingToolInput: '⚠️ Session history looks corrupted. Try /new.',
   timeout:          '⏳ I went quiet too long without finishing. Try resending or simplifying.',
   format:           '⚠️ Invalid request format. Try rephrasing or /new.',
-  transient5xx:     '☁️ Anthropic is temporarily unavailable. Retrying once…',
+  // Used both for in-flight retry attempts AND for the post-retry-failed
+  // bubble-up message. Avoid promising "retrying once" since by the
+  // time the user reads it pm has already retried and given up.
+  transient5xx:     '☁️ Server hiccup — please try again in a moment.',
 };
 
 // Auto-recovery actions for kinds where the session is irrecoverable
@@ -183,15 +186,16 @@ function classify(err) {
   }
 
   // SDKAssistantMessage.error is a short string code from a fixed
-  // union — match those directly, not via regex.
+  // union — match those directly, not via regex. Result subtypes
+  // are checked LATER (after pattern matching) so a more-specific
+  // pattern in the message text (e.g. 'HTTP 401' inside an
+  // error_during_execution subtype) wins over the generic subtype
+  // mapping that defaults the entire error_during_execution class
+  // to transient.
   if (typeof err === 'string') {
     const sdkMessageError = matchSdkMessageError(err);
     if (sdkMessageError) return sdkMessageError;
   }
-  if (err?.subtype && typeof err.subtype === 'string') {
-    const sdkResultSubtype = matchSdkResultSubtype(err.subtype);
-    if (sdkResultSubtype) return sdkResultSubtype;
-  }
 
   const msg = extractMessage(err);
   for (const [kind, re] of Object.entries(PATTERNS)) {
@@ -205,6 +209,20 @@ function classify(err) {
     }
   }
 
+  // After pattern matching: try SDK result subtypes. A bare string
+  // like 'error_during_execution' (no message context) lands here
+  // and gets the friendly transient5xx kind. Object inputs with a
+  // subtype field also land here when their message text didn't
+  // match a more specific pattern.
+  if (typeof err === 'string') {
+    const sdkResultSubtype = matchSdkResultSubtype(err);
+    if (sdkResultSubtype) return sdkResultSubtype;
+  }
+  if (err?.subtype && typeof err.subtype === 'string') {
+    const sdkResultSubtype = matchSdkResultSubtype(err.subtype);
+    if (sdkResultSubtype) return sdkResultSubtype;
+  }
+
   // Fall-through: surface a snippet of the raw error so users at
   // least know SOMETHING happened. Same shape as before, just
   // routed through the classifier so callers get a uniform return.
@@ -252,8 +270,15 @@ function matchSdkMessageError(s) {
 
 // SDKResultMessage.subtype values (sdk.d.ts:3121). Most are
 // terminal-error indicators that don't have a clean pattern equivalent.
+//
+// `error_during_execution` is the SDK's catch-all for "something went
+// wrong mid-turn" — could be a transient stream/network blip OR a
+// systemic model issue. We treat it as transient (1 retry is cheap;
+// if it's systemic the second attempt fails fast). Pre-rc.5 this was
+// mapped to 'unknown' which fell through to the default "Hit a snag:
+// error_during_execution" template — leaking the SDK enum to users.
 const SDK_RESULT_SUBTYPE_MAP = {
-  error_during_execution:           'unknown',
+  error_during_execution:           'transient5xx',
   error_max_turns:                  'format',
   error_max_budget_usd:             'billing',
   error_max_structured_output_retries: 'format',
@@ -265,8 +290,12 @@ function matchSdkResultSubtype(s) {
   return {
     kind,
     userMessage: USER_MESSAGES[kind] ?? null,
-    isTransient: false, // result subtypes don't auto-retry; the
-                        // turn already burned its budget.
+    // Derive transience from the kind so error_during_execution →
+    // transient5xx → isTransient=true, matching the pattern-match
+    // branch's behaviour. pm guards retry with firstAssistantSeen=
+    // false, which prevents budget waste when the turn already had
+    // billable assistant output.
+    isTransient: kind === 'transient5xx' || kind === 'rateLimit',
     autoRecover: AUTO_RECOVER[kind] ?? null,
   };
 }