@mauricode/token-derby 2.12.0 → 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";
@@ -702,10 +746,40 @@ function renderHatLabel(hats, hatChoice, initialEquipped) {
   ] });
 }
 
+// src/env/env.ts
+import { readFileSync, writeFileSync, mkdirSync } from "fs";
+import * as os from "os";
+import * as path from "path";
+var ENV_NAMES = ["prod", "staging"];
+function baseDir() {
+  return process.env.TOKEN_DERBY_BASE ?? os.homedir();
+}
+function configFile() {
+  return path.join(baseDir(), ".token-derby", "config.json");
+}
+function selectedEnv() {
+  try {
+    const raw = readFileSync(configFile(), "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed.env === "prod" || parsed.env === "staging") return parsed.env;
+    return "prod";
+  } catch {
+    return "prod";
+  }
+}
+function setSelectedEnv(env) {
+  const file = configFile();
+  mkdirSync(path.dirname(file), { recursive: true });
+  writeFileSync(file, JSON.stringify({ env }, null, 2) + "\n", "utf8");
+}
+
 // src/config.ts
-var DEFAULT_API_BASE = "https://token-derby.mauricode.co.uk/api";
+var ENVIRONMENTS = {
+  prod: { apiBase: "https://token-derby.mauricode.co.uk/api" },
+  staging: { apiBase: "https://token-derby-staging.mauricode.co.uk/api" }
+};
 function apiBase() {
-  return process.env.TOKEN_DERBY_API_BASE ?? DEFAULT_API_BASE;
+  return process.env.TOKEN_DERBY_API_BASE ?? ENVIRONMENTS[selectedEnv()].apiBase;
 }
 var HEARTBEAT_INTERVAL_MS = 6e4;
 var HEARTBEAT_RETRY_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 15e3];
@@ -713,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.0".length > 0) {
-    return "2.12.0";
+  if ("2.12.2".length > 0) {
+    return "2.12.2";
   }
   try {
     const req = createRequire(import.meta.url);
@@ -728,31 +802,34 @@ var CLI_VERSION = readVersion();
 
 // src/identity/identity.ts
 import { promises as fs } from "fs";
-import * as path2 from "path";
+import * as path3 from "path";
 
 // src/paths.ts
-import * as os from "os";
-import * as path from "path";
+import * as os2 from "os";
+import * as path2 from "path";
 function homeDir() {
-  return process.env.TOKEN_DERBY_HOME ?? path.join(os.homedir(), ".token-derby");
+  const override = process.env.TOKEN_DERBY_HOME;
+  if (override) return override;
+  const dir = selectedEnv() === "staging" ? ".token-derby-staging" : ".token-derby";
+  return path2.join(baseDir(), dir);
 }
 function identityFile() {
-  return path.join(homeDir(), "identity.json");
+  return path2.join(homeDir(), "identity.json");
 }
 function activeRaceFile(joinCode) {
-  return path.join(homeDir(), "active-races", `${joinCode}.json`);
+  return path2.join(homeDir(), "active-races", `${joinCode}.json`);
 }
 function activeRacesDir() {
-  return path.join(homeDir(), "active-races");
+  return path2.join(homeDir(), "active-races");
 }
 function claudeProjectsDir() {
-  return process.env.TOKEN_DERBY_CLAUDE_DIR ?? path.join(os.homedir(), ".claude", "projects");
+  return process.env.TOKEN_DERBY_CLAUDE_DIR ?? path2.join(os2.homedir(), ".claude", "projects");
 }
 function codexSessionsDir() {
-  return process.env.TOKEN_DERBY_CODEX_DIR ?? path.join(os.homedir(), ".codex");
+  return process.env.TOKEN_DERBY_CODEX_DIR ?? path2.join(os2.homedir(), ".codex");
 }
 function geminiTmpDir() {
-  return process.env.TOKEN_DERBY_GEMINI_DIR ?? path.join(os.homedir(), ".gemini", "tmp");
+  return process.env.TOKEN_DERBY_GEMINI_DIR ?? path2.join(os2.homedir(), ".gemini", "tmp");
 }
 
 // src/identity/identity.ts
@@ -808,8 +885,8 @@ function getIdentity() {
 function _resetIdentityCacheForTests() {
   identityCache = null;
 }
-async function request(method, path7, body, horseAuthToken, fetchImpl = fetch) {
-  const url = path7.startsWith("http") ? path7 : `${apiBase()}${path7}`;
+async function request(method, path8, body, horseAuthToken, fetchImpl = fetch) {
+  const url = path8.startsWith("http") ? path8 : `${apiBase()}${path8}`;
   const headers = {};
   headers[CLI_VERSION_HEADER] = CLI_VERSION;
   headers["user-agent"] = `token-derby/${CLI_VERSION}`;
@@ -1310,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 " : "  ",
@@ -1321,7 +1398,7 @@ function PrimaryPicker({ onPick }) {
 
 // src/stable/active-race.ts
 import * as fs2 from "fs/promises";
-import * as path3 from "path";
+import * as path4 from "path";
 async function saveActiveRace(active) {
   await fs2.mkdir(activeRacesDir(), { recursive: true });
   await fs2.writeFile(
@@ -1339,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" }) });
   }
@@ -1432,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." }) })
   ] });
 }
@@ -1512,11 +1581,11 @@ function runHeartbeatLoop(opts) {
 
 // src/tokens/transcripts.ts
 import * as fs3 from "fs/promises";
-import * as path4 from "path";
+import * as path5 from "path";
 var MAX_PROJECT_DEPTH = 8;
 function conversationId(file, root) {
-  const rel = path4.relative(root, file);
-  const [project, session] = rel.split(path4.sep);
+  const rel = path5.relative(root, file);
+  const [project, session] = rel.split(path5.sep);
   if (project === void 0 || session === void 0) return rel.replace(/\.jsonl$/, "");
   return `${project}/${session.replace(/\.jsonl$/, "")}`;
 }
@@ -1548,7 +1617,7 @@ async function listJsonlFiles(root) {
   const projects = await fs3.readdir(root);
   const out = [];
   for (const project of projects) {
-    const projectDir = path4.join(root, project);
+    const projectDir = path5.join(root, project);
     const stat3 = await fs3.stat(projectDir);
     if (!stat3.isDirectory()) continue;
     await collectJsonl(projectDir, MAX_PROJECT_DEPTH, out);
@@ -1560,9 +1629,9 @@ async function collectJsonl(dir, depth, out) {
   const entries = await fs3.readdir(dir);
   for (const entry of entries) {
     if (entry.endsWith(".jsonl")) {
-      out.push(path4.join(dir, entry));
+      out.push(path5.join(dir, entry));
     } else if (depth > 1) {
-      const child = path4.join(dir, entry);
+      const child = path5.join(dir, entry);
       const st = await fs3.stat(child);
       if (st.isDirectory()) await collectJsonl(child, depth - 1, out);
     }
@@ -1593,7 +1662,7 @@ async function sumFile(file) {
 
 // src/tokens/codex.ts
 import * as fs4 from "fs/promises";
-import * as path5 from "path";
+import * as path6 from "path";
 function num(v) {
   return typeof v === "number" && Number.isFinite(v) ? v : 0;
 }
@@ -1601,8 +1670,8 @@ async function sumCodexByConversation() {
   const root = codexSessionsDir();
   await fs4.stat(root);
   const files = [
-    ...await collectRollouts(path5.join(root, "sessions")),
-    ...await collectRollouts(path5.join(root, "archived_sessions"))
+    ...await collectRollouts(path6.join(root, "sessions")),
+    ...await collectRollouts(path6.join(root, "archived_sessions"))
   ];
   const byConv = /* @__PURE__ */ new Map();
   for (const file of files) {
@@ -1630,7 +1699,7 @@ async function collectRollouts(dir) {
   }
   const out = [];
   for (const entry of entries) {
-    const full = path5.join(dir, entry.name);
+    const full = path6.join(dir, entry.name);
     if (entry.isDirectory()) out.push(...await collectRollouts(full));
     else if (entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl")) out.push(full);
   }
@@ -1665,7 +1734,7 @@ async function lastTokenCount(file) {
 
 // src/tokens/gemini.ts
 import * as fs5 from "fs/promises";
-import * as path6 from "path";
+import * as path7 from "path";
 function num2(v) {
   return typeof v === "number" && Number.isFinite(v) ? v : 0;
 }
@@ -1691,7 +1760,7 @@ async function listChatFiles(root) {
   const entries = await fs5.readdir(root);
   const out = [];
   for (const entry of entries) {
-    const chatsDir = path6.join(root, entry, "chats");
+    const chatsDir = path7.join(root, entry, "chats");
     let files;
     try {
       files = await fs5.readdir(chatsDir);
@@ -1699,7 +1768,7 @@ async function listChatFiles(root) {
       continue;
     }
     for (const f of files) {
-      if (f.endsWith(".json") || f.endsWith(".jsonl")) out.push(path6.join(chatsDir, f));
+      if (f.endsWith(".json") || f.endsWith(".jsonl")) out.push(path7.join(chatsDir, f));
     }
   }
   return out;
@@ -1925,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);
@@ -1956,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) => {
@@ -2029,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: [
@@ -2910,6 +2969,36 @@ async function webCommand(deps = {}) {
   return 0;
 }
 
+// src/commands/env.ts
+function warnOverrides() {
+  if (process.env.TOKEN_DERBY_HOME) {
+    console.error("Warning: TOKEN_DERBY_HOME overrides the per-env data directory; `env` selection does not change where the identity is stored.");
+  }
+  if (process.env.TOKEN_DERBY_API_BASE) {
+    console.error("Warning: TOKEN_DERBY_API_BASE overrides the API base; `env` selection does not change which API is used.");
+  }
+}
+function envCommand(arg) {
+  if (!arg) {
+    console.log(`Environment: ${selectedEnv()}`);
+    console.log(`API base:    ${apiBase()}`);
+    console.log(`Data dir:    ${homeDir()}`);
+    warnOverrides();
+    return 0;
+  }
+  if (!ENV_NAMES.includes(arg)) {
+    console.error(`Unknown environment: ${arg}`);
+    console.error(`Valid environments: ${ENV_NAMES.join(", ")}`);
+    return 2;
+  }
+  setSelectedEnv(arg);
+  console.log(`Switched to ${arg}.`);
+  console.log(`API base: ${apiBase()}`);
+  console.log(`Data dir: ${homeDir()}`);
+  warnOverrides();
+  return 0;
+}
+
 // src/bin.ts
 var HELP = `token-derby v${CLI_VERSION}
 
@@ -2946,8 +3035,12 @@ Cosmetics:
                                           Earn rolls by leveling up horses.
 
 Environment:
-  TOKEN_DERBY_API_BASE                    Override API base URL (default: production)
-  TOKEN_DERBY_HOME                        Override identity/stable directory
+  token-derby env                         Show the active environment (prod|staging)
+  token-derby env <prod|staging>          Switch environment. Each env has its own
+                                          identity/stable dir, so switching never
+                                          touches the other env's account.
+  TOKEN_DERBY_API_BASE                    Hard-override API base URL (wins over env)
+  TOKEN_DERBY_HOME                        Hard-override identity/stable directory
 `;
 async function main() {
   const argv = process.argv.slice(2);
@@ -2965,6 +3058,7 @@ async function main() {
     return initCommand(reset);
   }
   if (cmd === "update") return updateCommand();
+  if (cmd === "env") return envCommand(argv[1]);
   const identity = await loadIdentity();
   if (!identity) {
     console.error("Run `token-derby init` to set up your identity before using any other command.");