@mauricode/token-derby 2.12.1 → 2.12.2

package/dist/bin.js

@@ -26,19 +26,10 @@ import TextInput from "ink-text-input";
 
 // ../shared/dist/models.js
 var MODEL_KEYS = ["claude", "codex", "gemini"];
-var SECONDARY_WEIGHT = 0.1;
+var SECONDARY_WEIGHT = 0.5;
 function isModelKey(v) {
   return typeof v === "string" && MODEL_KEYS.includes(v);
 }
-function weightFor(primary, key) {
-  return key === primary ? 1 : SECONDARY_WEIGHT;
-}
-function weightedTotal(primary, perSource) {
-  let total = 0;
-  for (const key of MODEL_KEYS)
-    total += perSource[key] * weightFor(primary, key);
-  return total;
-}
 
 // ../shared/dist/constants.js
 var CLI_VERSION_HEADER = "x-cli-version";
@@ -208,6 +199,59 @@ var HATS = [
 // ../shared/dist/series-transform.js
 var PACE_WINDOW_MS = 15 * 6e4;
 
+// ../shared/dist/sprite-grid.js
+var ROWS = [
+  "................................",
+  "................................",
+  "..........................MMM...",
+  "..........................MMM...",
+  ".........................MBBEBB.",
+  ".........................MBBEBB.",
+  "........................MBBBBBBB",
+  "........................MBBBBBBB",
+  "..................MMMMMMMBBB....",
+  "..................MMMMMMMBBB....",
+  "....BBBBBBBBSSSSSSMMBBBBBB......",
+  "...BBBBBBBBBSSSSSSMMBBBBBB......",
+  ".TTBBBBBBBBBSSSSSSBBBBBBBB......",
+  ".TTBBBBBBBBBSSSSSSBBBBBBBB......",
+  "TTTBBBBBBBBBBBBBBBBBBBBBBB......",
+  "TTTBBBBBBBBBBBBBBBBBBBBB........",
+  "...BBB.BBB.....BBB.BBB..........",
+  "...BBB.BBB.....BBB.BBB..........",
+  "....BB..BB......BB..BB..........",
+  "....BB..BB......BB..BB..........",
+  "....BB..BB......BB..BB..........",
+  "....BB..BB......BB..BB..........",
+  "....BB..BB......BB..BB..........",
+  "...HHH.HHH.....HHH.HHH.........."
+];
+var GRID = ROWS.map((row, y) => {
+  if (row.length !== 32)
+    throw new Error(`sprite row ${y} has length ${row.length}, expected 32`);
+  return [...row].map((c) => toTag(c, y));
+});
+function toTag(c, y) {
+  switch (c) {
+    case "B":
+      return "B";
+    case "M":
+      return "M";
+    case "T":
+      return "T";
+    case "S":
+      return "S";
+    case "H":
+      return "H";
+    case "E":
+      return "B";
+    case ".":
+      return null;
+    default:
+      throw new Error(`unknown sprite char '${c}' at y=${y}`);
+  }
+}
+
 // src/ui/HorseSprite.tsx
 import { Box, Text } from "ink";
 
@@ -258,10 +302,10 @@ function parse(rows, width, height) {
     if (row.length !== width) {
       throw new Error(`sprite row ${y} has length ${row.length}, expected ${width}`);
     }
-    return [...row].map((c) => toTag(c));
+    return [...row].map((c) => toTag2(c));
   });
 }
-function toTag(c) {
+function toTag2(c) {
   switch (c) {
     case "B":
       return "B";
@@ -743,8 +787,8 @@ var HEARTBEAT_RETRY_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 15e3];
 // src/version.ts
 import { createRequire } from "module";
 function readVersion() {
-  if ("2.12.1".length > 0) {
-    return "2.12.1";
+  if ("2.12.2".length > 0) {
+    return "2.12.2";
   }
   try {
     const req = createRequire(import.meta.url);
@@ -1343,7 +1387,7 @@ function PrimaryPicker({ onPick }) {
     else if (key.return) onPick(MODEL_KEYS[i]);
   });
   return /* @__PURE__ */ jsxs4(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx6(Text6, { bold: true, children: "Pick your primary model for this race (counts 1:1; the others count at 10%)." }),
+    /* @__PURE__ */ jsx6(Text6, { bold: true, children: "Pick your primary model for this race (counts 1:1; the others count at 50%)." }),
     /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "This is locked for the whole race \u2014 you can't change it, even by rejoining." }),
     MODEL_KEYS.map((m, idx) => /* @__PURE__ */ jsxs4(Text6, { color: idx === i ? "cyan" : void 0, children: [
       idx === i ? "\u276F " : "  ",
@@ -1372,20 +1416,20 @@ import { Box as Box8, Text as Text8, useApp } from "ink";
 import { Box as Box7, Text as Text7 } from "ink";
 import { jsx as jsx7, jsxs as jsxs5 } from "react/jsx-runtime";
 var MODEL_LABELS = { claude: "Claude", codex: "Codex", gemini: "Gemini" };
-function TokenBreakdown(props) {
-  const { primaryModel, perSource, raceScore, primaryCapped } = props;
-  const primaryTag = primaryCapped ? "(primary \xB7 top 5/beat)" : "(primary)";
-  return /* @__PURE__ */ jsxs5(Box7, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsx7(Text7, { bold: true, children: "Tokens by model (since join)" }),
-    MODEL_KEYS.map((m) => /* @__PURE__ */ jsxs5(Text7, { children: [
-      `  ${MODEL_LABELS[m].padEnd(10)} ${perSource[m].toLocaleString().padStart(12)}  `,
-      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: m === primaryModel ? primaryTag : "(10%)" })
-    ] }, m)),
-    /* @__PURE__ */ jsx7(Text7, { children: `  ${"Race score".padEnd(10)} ${Math.round(raceScore).toLocaleString().padStart(12)}` })
-  ] });
+function ModelList(props) {
+  const { primaryModel } = props;
+  const secondaryTag = ` (${Math.round(SECONDARY_WEIGHT * 100)}%)`;
+  return /* @__PURE__ */ jsx7(Box7, { marginTop: 1, children: /* @__PURE__ */ jsxs5(Text7, { children: [
+    "Models:  ",
+    MODEL_KEYS.map((m, i) => /* @__PURE__ */ jsxs5(Text7, { children: [
+      i > 0 ? " \xB7 " : "",
+      MODEL_LABELS[m],
+      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: m === primaryModel ? " (primary)" : secondaryTag })
+    ] }, m))
+  ] }) });
 }
 function StatusScreen(props) {
-  const { race, ownHorseId, ownHorseName, ownColors, ownUserName, lastHeartbeatAgoSec, lastHeartbeatOk, stalled, stallReason, primaryModel, perSource, primaryCapped } = props;
+  const { race, ownHorseId, ownHorseName, ownColors, ownUserName, lastHeartbeatAgoSec, lastHeartbeatOk, stalled, stallReason, primaryModel } = props;
   if (!race) {
     return /* @__PURE__ */ jsx7(Box7, { flexDirection: "column", children: /* @__PURE__ */ jsx7(Text7, { children: "Joining race\u2026" }) });
   }
@@ -1465,15 +1509,7 @@ function StatusScreen(props) {
         ". Your race continues."
       ] })
     ] }),
-    primaryModel && perSource && /* @__PURE__ */ jsx7(
-      TokenBreakdown,
-      {
-        primaryModel,
-        perSource,
-        raceScore: own?.current_tokens ?? weightedTotal(primaryModel, perSource),
-        primaryCapped
-      }
-    ),
+    primaryModel && /* @__PURE__ */ jsx7(ModelList, { primaryModel }),
     /* @__PURE__ */ jsx7(Box7, { marginTop: 1, children: /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "Press Ctrl+C to crash out of the race." }) })
   ] });
 }
@@ -1958,8 +1994,6 @@ function RunRace({ active, initialState, pendingMode, ownUserName }) {
   const ctrl = useRef(new AbortController());
   const [stalled, setStalled] = useState5(false);
   const [stallReason, setStallReason] = useState5(null);
-  const baselineRef = useRef(initialState.acked);
-  const [perSource, setPerSource] = useState5({ claude: 0, codex: 0, gemini: 0 });
   useEffect2(() => {
     const t = setInterval(() => setTickNow(/* @__PURE__ */ new Date()), 1e3);
     return () => clearInterval(t);
@@ -1989,12 +2023,6 @@ function RunRace({ active, initialState, pendingMode, ownUserName }) {
         if (pendingRef.current && !isStall(reading)) tracker.reprime();
         setStalled(tracker.stalled);
         setStallReason(tracker.stalled ? tracker.stallReason : null);
-        const since = tracker.secondarySinceJoin(baselineRef.current);
-        const ps = { claude: 0, codex: 0, gemini: 0 };
-        for (const k of MODEL_KEYS) {
-          ps[k] = k === active.primary_model ? tracker.primaryCounted() : since[k];
-        }
-        setPerSource(ps);
         return tracker.nextBeat();
       },
       sendBeat: async (snapshot) => {
@@ -2062,9 +2090,7 @@ function RunRace({ active, initialState, pendingMode, ownUserName }) {
         lastHeartbeatOk: lastHbOk,
         stalled,
         stallReason,
-        primaryModel: active.primary_model,
-        perSource,
-        primaryCapped: primaryConversationCap(active.primary_top5 ?? false) !== Infinity
+        primaryModel: active.primary_model
       }
     ),
     achievements.length > 0 && /* @__PURE__ */ jsxs6(Box8, { flexDirection: "column", marginTop: 1, children: [