openzoo 0.48.96 → 0.48.97

package/lib/livestatus.js

@@ -35,32 +35,41 @@ export function formatRaceStatus(back, need) {
   return `racing ${b}/${n} back…`;
 }
 
-/** Real answers count toward X. Empty and HTTP/pay/timeout notes do not. */
-export function isRaceCountable(text) {
-  const s = String(text || '').trim();
-  if (!s) return false;
-  return !/^\((?:upstream error|request failed|payment failed|rate limited|stream timed out|stream stalled)/i.test(s);
-}
+/** Race-level failure when no countable answer exists. Never a single model name. */
+export const RACE_EVERY_FAILED = '(race: every model failed — no reply)';
+
+const RACE_HTTP_NOTE = /^\((?:upstream error|request failed|payment failed|rate limited|stream timed out|stream stalled)/i;
+const RACE_MODEL_FAILED = /^\([^)]+ (?:failed:|returned nothing)/i;
+const RACE_FETCH_FAILED = /^(?:typeerror:\s*)?fetch failed$/i;
 
-function shortModel(id) {
-  const s = String(id || '');
-  if (!s) return '';
-  return s.includes('/') ? s.split('/').pop() : s;
+/**
+ * Real answers count toward X.
+ * Empty, HTTP/pay/timeout notes, TypeError `fetch failed`, `(model failed: …)`,
+ * and any arrival with `.error` do not — those racers are abandoned.
+ * Accepts a string or `{ text, error }`.
+ */
+export function isRaceCountable(textOrArrival) {
+  const arrival = textOrArrival && typeof textOrArrival === 'object' && !Array.isArray(textOrArrival)
+    ? textOrArrival
+    : { text: textOrArrival };
+  if (arrival.error) return false;
+  const s = String(arrival.text || '').trim();
+  if (!s) return false;
+  if (RACE_FETCH_FAILED.test(s)) return false;
+  if (RACE_HTTP_NOTE.test(s)) return false;
+  if (RACE_MODEL_FAILED.test(s)) return false;
+  return true;
 }
 
 /**
- * Last completion that arrived, even if empty-ish or error-y.
- * Never blank: synthesize a visible error when nobody produced text.
+ * Fallback when X never fills: one race-level error, not `(one-model failed: …)`.
+ * Failed arrivals are abandoned, not shipped as the assistant message.
  */
 export function raceLastShip(arrivals) {
   const list = Array.isArray(arrivals) ? arrivals : [];
-  const last = list[list.length - 1];
-  if (!last) return { model: '', text: '(race: every model failed — no reply)', error: true };
-  const raw = String(last.text || '');
-  if (raw.trim()) return { ...last, text: raw };
-  const who = shortModel(last.model) || 'model';
-  if (last.error) return { ...last, text: `(${who} failed: ${last.error})`, error: true };
-  return { ...last, text: `(${who} returned nothing)`, error: true };
+  const last = [...list].reverse().find((a) => isRaceCountable(a));
+  if (last) return { ...last, text: String(last.text) };
+  return { model: '', text: RACE_EVERY_FAILED, error: true };
 }
 
 /** Default bar a classified race answer must clear (0–10). Overridable. */
@@ -147,7 +156,7 @@ export function createRaceFeed(onDelta, onStatus, need) {
       settled = true;
       const text = String(winner?.text || '').trim()
         ? winner.text
-        : '(race: every model failed — no reply)';
+        : RACE_EVERY_FAILED;
       // Live stream already showing this answer — keep going, do not re-dump.
       if (winner?.model && live === winner.model && !winner.error) return;
       live = winner?.model || live;

package/lib/podagent.mjs

@@ -641,9 +641,9 @@ export async function tierModels(tier, n = 1, random = false) {
  * (correctness, completeness, actually did the asked thing — a RUN:/DONE:
  * directive is success, not a flaw). Highest score that clears the bar wins;
  * a tie is pairwise-broken. If nobody clears, the last of the X is shipped
- * anyway. If X never fills (every entrant empty/5xx), ship the last
- * completion that arrived — even if empty-ish or error-y. If nobody produced
- * any text, surface a real error in the bubble. Never blank, never hang.
+ * anyway. If X never fills (every entrant empty/5xx/fetch-failed), ship a
+ * race-level error — never a single model's `(name failed: fetch failed)` as
+ * if it won. Never blank, never hang.
  *
  * Every entrant is paid for, including the abandoned one — this trades money
  * for latency and quality, which is why it is opt-in and capped.
@@ -679,9 +679,10 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
   const attempts = list.map((m) => stream(messages, (chunk) => feed.onToken(m, chunk), contextId, m, maxTokens)
     .then((text) => {
       const raw = text == null ? '' : String(text);
-      arrivals.push({ model: m, text: raw });
-      if (isRaceCountable(raw)) {
-        done.push({ model: m, text: raw });
+      const arrival = { model: m, text: raw };
+      arrivals.push(arrival);
+      if (isRaceCountable(arrival)) {
+        done.push(arrival);
         feed.onBack();
       } else {
         feed.onFail(m);
@@ -704,8 +705,8 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
 
   await enough;
   // Completion order, so this really is the first X back — not the first X
-  // launched. A slow 3rd never enters this set. Empty/5xx stay in arrivals
-  // so we can still ship the last one if X never fills.
+  // launched. A slow 3rd never enters this set. Empty/5xx/fetch-failed stay
+  // in arrivals only so an all-fail race can ship one race-level error.
   const cands = done.slice(0, want);
   if (!cands.length) return ship(raceLastShip(arrivals));
   // One real answer — nothing to compare. Ship it; do not spend a classify

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.48.96",
+  "version": "0.48.97",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun \u2014 point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",