@mauricode/token-derby 1.1.0 → 2.0.1

package/dist/bin.js

@@ -250,7 +250,7 @@ function defaultColors() {
 
 // src/ui/HorseCreator.tsx
 import { jsx as jsx2, jsxs } from "react/jsx-runtime";
-function HorseCreator({ onSubmit, onCancel, initialColors, initialName, lockName }) {
+function HorseCreator({ onSubmit, onCancel, initialColors, initialName, lockName, initialLevel }) {
   const [colors, setColors] = useState(initialColors ?? defaultColors());
   const [slotIdx, setSlotIdx] = useState(0);
   const [namingMode, setNamingMode] = useState(false);
@@ -296,6 +296,14 @@ function HorseCreator({ onSubmit, onCancel, initialColors, initialName, lockName
     onSubmit(value.trim(), colors);
   };
   return /* @__PURE__ */ jsxs(Box2, { flexDirection: "column", children: [
+    lockName && initialName && /* @__PURE__ */ jsxs(Box2, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsx2(Text2, { bold: true, children: initialName }),
+      typeof initialLevel === "number" && /* @__PURE__ */ jsxs(Text2, { color: "cyan", children: [
+        " [Lvl. ",
+        initialLevel,
+        "]"
+      ] })
+    ] }),
     /* @__PURE__ */ jsx2(Box2, { marginBottom: 1, children: /* @__PURE__ */ jsx2(HorseSprite, { sprite: MAIN_SPRITE, colors }) }),
     /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: SLOTS.map((s, i) => /* @__PURE__ */ jsxs(Text2, { children: [
       i === slotIdx ? "\u25BA" : " ",
@@ -318,9 +326,72 @@ function HorseCreator({ onSubmit, onCancel, initialColors, initialName, lockName
   ] });
 }
 
-// src/stable/stable.ts
-import * as fs from "fs/promises";
-import { randomUUID } from "crypto";
+// src/config.ts
+var DEFAULT_API_BASE = "https://token-derby.mauricode.co.uk/api";
+function apiBase() {
+  return process.env.TOKEN_DERBY_API_BASE ?? DEFAULT_API_BASE;
+}
+var HEARTBEAT_INTERVAL_MS = 6e4;
+var HEARTBEAT_RETRY_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 15e3];
+
+// src/version.ts
+import { createRequire } from "module";
+function readVersion() {
+  if ("2.0.1".length > 0) {
+    return "2.0.1";
+  }
+  try {
+    const req = createRequire(import.meta.url);
+    const pkg = req("../package.json");
+    if (typeof pkg.version === "string") return pkg.version;
+  } catch {
+  }
+  return "0.0.0-dev";
+}
+var CLI_VERSION = readVersion();
+
+// ../shared/dist/constants.js
+var CLI_VERSION_HEADER = "x-cli-version";
+var USER_ID_HEADER = "x-user-id";
+var USER_TOKEN_HEADER = "x-user-token";
+var USER_NAME_MAX_LENGTH = 40;
+var ORG_NAME_MAX_LENGTH = 12;
+var ORG_NAME_PATTERN = /^[A-Za-z0-9]{1,12}$/;
+
+// ../shared/dist/levels.js
+var MAX_LEVEL = 30;
+function xpForLevel(n) {
+  return 2.5 * n ** 3 + 20 * n ** 2 + 50 * n - 22.5;
+}
+function thresholdForLevel(level) {
+  if (level <= 1)
+    return 0;
+  return Math.round(xpForLevel(level - 1));
+}
+var XP_THRESHOLDS = Array.from({ length: MAX_LEVEL }, (_, i) => thresholdForLevel(i + 1));
+function levelFromXp(xp) {
+  const v = Math.max(0, Math.floor(xp));
+  let level = 1;
+  while (level < MAX_LEVEL && v >= thresholdForLevel(level + 1)) {
+    level++;
+  }
+  return level;
+}
+function levelInfo(xp) {
+  const v = Math.max(0, Math.floor(xp));
+  const level = levelFromXp(v);
+  const level_start_xp = thresholdForLevel(level);
+  const isMax = level >= MAX_LEVEL;
+  const next_level_xp = isMax ? null : thresholdForLevel(level + 1);
+  const xp_into_level = v - level_start_xp;
+  const xp_for_level = isMax ? null : next_level_xp - level_start_xp;
+  const progress = isMax ? 1 : Math.min(1, xp_into_level / Math.max(1, xp_for_level));
+  return { level, xp: v, level_start_xp, next_level_xp, xp_into_level, xp_for_level, progress };
+}
+
+// src/identity/identity.ts
+import { promises as fs } from "fs";
+import * as path2 from "path";
 
 // src/paths.ts
 import * as os from "os";
@@ -328,9 +399,6 @@ import * as path from "path";
 function homeDir() {
   return process.env.TOKEN_DERBY_HOME ?? path.join(os.homedir(), ".token-derby");
 }
-function stableFile() {
-  return path.join(homeDir(), "stable.json");
-}
 function identityFile() {
   return path.join(homeDir(), "identity.json");
 }
@@ -344,78 +412,185 @@ function claudeProjectsDir() {
   return process.env.TOKEN_DERBY_CLAUDE_DIR ?? path.join(os.homedir(), ".claude", "projects");
 }
 
-// src/stable/stable.ts
-function newStableHorseId() {
-  return randomUUID();
-}
-async function loadStable() {
+// src/identity/identity.ts
+async function loadIdentity() {
   try {
-    const raw = await fs.readFile(stableFile(), "utf8");
+    const raw = await fs.readFile(identityFile(), "utf8");
     const parsed = JSON.parse(raw);
-    if (!parsed || !Array.isArray(parsed.horses)) return { horses: [] };
-    const stable = parsed;
-    let mutated = false;
-    const horses = stable.horses.map((h) => {
-      if (typeof h.stable_horse_id === "string" && h.stable_horse_id.length > 0) {
-        return h;
-      }
-      mutated = true;
-      return { ...h, stable_horse_id: newStableHorseId() };
-    });
-    const result = { horses };
-    if (mutated) await saveStable(result);
-    return result;
+    if (typeof parsed.user_id === "string" && typeof parsed.display_name === "string" && typeof parsed.secret_token === "string" && typeof parsed.created_at === "string") {
+      return parsed;
+    }
+    return null;
   } catch (e) {
-    if (e?.code === "ENOENT") return { horses: [] };
-    if (e instanceof SyntaxError) return { horses: [] };
-    throw e;
+    if (e?.code === "ENOENT") return null;
+    return null;
   }
 }
-async function saveStable(stable) {
+async function saveIdentity(identity) {
   await fs.mkdir(homeDir(), { recursive: true });
-  await fs.writeFile(stableFile(), JSON.stringify(stable, null, 2) + "\n", "utf8");
+  await fs.writeFile(identityFile(), JSON.stringify(identity, null, 2) + "\n", "utf8");
 }
-async function upsertHorse(horse) {
-  const stable = await loadStable();
-  const idx = stable.horses.findIndex((h) => h.name === horse.name);
-  if (idx >= 0) stable.horses[idx] = horse;
-  else stable.horses.push(horse);
-  await saveStable(stable);
+async function deleteIdentity() {
+  try {
+    await fs.unlink(identityFile());
+  } catch (e) {
+    if (e?.code !== "ENOENT") throw e;
+  }
 }
-async function removeHorse(name) {
-  const stable = await loadStable();
-  stable.horses = stable.horses.filter((h) => h.name !== name);
-  await saveStable(stable);
+function validateDisplayName(name) {
+  const trimmed = name.trim();
+  if (trimmed.length < 1) return { ok: false, error: "Name cannot be empty." };
+  if (trimmed.length > USER_NAME_MAX_LENGTH) {
+    return { ok: false, error: `Name must be ${USER_NAME_MAX_LENGTH} characters or fewer.` };
+  }
+  return { ok: true, name: trimmed };
 }
-function findHorse(stable, name) {
-  return stable.horses.find((h) => h.name === name);
+
+// src/api/client.ts
+var ApiError = class extends Error {
+  constructor(code, message, status) {
+    super(message);
+    this.code = code;
+    this.status = status;
+    this.name = "ApiError";
+  }
+  code;
+  status;
+};
+var identityCache = null;
+function getIdentity() {
+  if (!identityCache) identityCache = loadIdentity();
+  return identityCache;
+}
+function _resetIdentityCacheForTests() {
+  identityCache = null;
+}
+async function request(method, path5, body, horseAuthToken, fetchImpl = fetch) {
+  const url = path5.startsWith("http") ? path5 : `${apiBase()}${path5}`;
+  const headers = {};
+  headers[CLI_VERSION_HEADER] = CLI_VERSION;
+  headers["user-agent"] = `token-derby/${CLI_VERSION}`;
+  const identity = await getIdentity();
+  if (identity) {
+    headers[USER_ID_HEADER] = identity.user_id;
+    headers[USER_TOKEN_HEADER] = identity.secret_token;
+  }
+  if (horseAuthToken) headers["authorization"] = `Bearer ${horseAuthToken}`;
+  if (body !== void 0) headers["content-type"] = "application/json";
+  let res;
+  try {
+    res = await fetchImpl(url, {
+      method,
+      headers,
+      body: body !== void 0 ? JSON.stringify(body) : void 0
+    });
+  } catch (e) {
+    throw new ApiError("NETWORK_ERROR", e?.message ?? "fetch failed", 0);
+  }
+  const text = await res.text();
+  const contentType = res.headers.get("content-type") ?? "";
+  let parsed = null;
+  if (contentType.includes("application/json") && text.length > 0) {
+    try {
+      parsed = JSON.parse(text);
+    } catch {
+      parsed = null;
+    }
+  }
+  if (!res.ok) {
+    if (parsed && typeof parsed.code === "string") {
+      throw new ApiError(parsed.code, parsed.message ?? "API error", res.status);
+    }
+    throw new ApiError("NETWORK_ERROR", `HTTP ${res.status}`, res.status);
+  }
+  return parsed;
+}
+
+// src/api/endpoints.ts
+function createRace(body) {
+  return request("POST", "/races", body, void 0);
+}
+function getRace(joinCode) {
+  return request("GET", `/races/${encodeURIComponent(joinCode)}`, void 0, void 0);
+}
+function joinRace(joinCode, body) {
+  return request("POST", `/races/${encodeURIComponent(joinCode)}/join`, body, void 0);
+}
+function heartbeat(joinCode, horseId, token, body) {
+  return request(
+    "POST",
+    `/races/${encodeURIComponent(joinCode)}/horses/${encodeURIComponent(horseId)}/heartbeat`,
+    body,
+    token
+  );
+}
+function endRace(adminCode) {
+  return request("DELETE", `/races/admin/${encodeURIComponent(adminCode)}`, void 0, void 0);
+}
+function createOrganisation(body) {
+  return request("POST", "/organisations", body, void 0);
+}
+function joinOrganisation(body) {
+  return request("POST", "/organisations/join", body, void 0);
+}
+function listOrganisations() {
+  return request("GET", "/organisations", void 0, void 0);
+}
+function getOrganisation(name) {
+  return request("GET", `/organisations/${encodeURIComponent(name)}`, void 0, void 0);
+}
+function initJockey(body) {
+  return request("POST", "/jockey/init", body, void 0);
+}
+function updateJockey(body) {
+  return request("PUT", "/jockey/me", body, void 0);
+}
+function listStable() {
+  return request("GET", "/jockey/me/horses", void 0, void 0);
+}
+function createStableHorse(body) {
+  return request("POST", "/jockey/me/horses", body, void 0);
+}
+function updateStableHorse(stableHorseId, body) {
+  return request(
+    "PUT",
+    `/jockey/me/horses/${encodeURIComponent(stableHorseId)}`,
+    body,
+    void 0
+  );
+}
+function deleteStableHorse(stableHorseId) {
+  return request(
+    "DELETE",
+    `/jockey/me/horses/${encodeURIComponent(stableHorseId)}`,
+    void 0,
+    void 0
+  );
 }
 
 // src/commands/stable-create.ts
-import * as readline from "readline/promises";
-import { stdin, stdout } from "process";
 async function stableCreateCommand() {
   let exitCode = 0;
   const app = render(
     React2.createElement(HorseCreator, {
       onSubmit: async (name, colors) => {
-        const stable = await loadStable();
-        const existing = findHorse(stable, name);
-        if (existing) {
+        try {
+          await createStableHorse({ name, colors });
           app.unmount();
-          const rl = readline.createInterface({ input: stdin, output: stdout });
-          const answer = (await rl.question(`Horse "${name}" already exists. Overwrite? [y/N] `)).trim().toLowerCase();
-          rl.close();
-          if (answer !== "y" && answer !== "yes") {
-            console.log("Cancelled.");
+          console.log(`\u2713 Saved "${name}" to your stable.`);
+        } catch (e) {
+          app.unmount();
+          if (e instanceof ApiError) {
+            if (e.code === "STABLE_HORSE_NAME_TAKEN") {
+              console.error(`A horse named "${name}" already exists. Pick a different name or use \`token-derby stable edit ${name}\` to modify it.`);
+            } else {
+              console.error(`Error: ${e.code} ${e.message}`);
+            }
             exitCode = 1;
             return;
           }
+          throw e;
         }
-        const stable_horse_id = existing?.stable_horse_id ?? newStableHorseId();
-        await upsertHorse({ stable_horse_id, name, colors, created_at: (/* @__PURE__ */ new Date()).toISOString() });
-        app.unmount();
-        console.log(`\u2713 Saved "${name}" to your stable.`);
       },
       onCancel: () => {
         app.unmount();
@@ -433,13 +608,23 @@ import React3 from "react";
 import { render as render2, Box as Box3, Text as Text3 } from "ink";
 import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
 async function stableListCommand() {
-  const stable = await loadStable();
-  if (stable.horses.length === 0) {
+  let horses;
+  try {
+    const resp = await listStable();
+    horses = resp.horses;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return 1;
+    }
+    throw e;
+  }
+  if (horses.length === 0) {
     console.log("Your stable is empty. Run `token-derby stable create` to add a horse.");
     return 0;
   }
   const app = render2(
-    React3.createElement(StableList, { horses: stable.horses })
+    React3.createElement(StableList, { horses })
   );
   await app.waitUntilExit();
   return 0;
@@ -458,269 +643,127 @@ function StableList({ horses }) {
       /* @__PURE__ */ jsx3(HorseSprite, { sprite: MINI_SPRITE, colors: h.colors }),
       /* @__PURE__ */ jsxs2(Text3, { children: [
         "  ",
-        h.name
+        h.name,
+        " ",
+        /* @__PURE__ */ jsxs2(Text3, { color: "cyan", children: [
+          "[Lvl. ",
+          levelFromXp(h.xp),
+          "]"
+        ] })
       ] })
-    ] }, h.name))
+    ] }, h.stable_horse_id))
   ] });
 }
 
 // src/commands/stable-delete.ts
-import * as readline2 from "readline/promises";
-import { stdin as stdin2, stdout as stdout2 } from "process";
-
-// src/stable/active-race.ts
-import * as fs2 from "fs/promises";
-import * as path2 from "path";
-async function loadActiveRace(joinCode) {
-  try {
-    const raw = await fs2.readFile(activeRaceFile(joinCode), "utf8");
-    return JSON.parse(raw);
-  } catch (e) {
-    if (e?.code === "ENOENT") return null;
-    throw e;
-  }
-}
-async function saveActiveRace(active) {
-  await fs2.mkdir(activeRacesDir(), { recursive: true });
-  await fs2.writeFile(
-    activeRaceFile(active.join_code),
-    JSON.stringify(active, null, 2) + "\n",
-    "utf8"
-  );
-}
-async function listActiveRaces() {
-  try {
-    const entries = await fs2.readdir(activeRacesDir());
-    return entries.filter((f) => f.endsWith(".json")).map((f) => path2.basename(f, ".json"));
-  } catch (e) {
-    if (e?.code === "ENOENT") return [];
-    throw e;
-  }
-}
-
-// src/commands/stable-delete.ts
+import * as readline from "readline/promises";
+import { stdin, stdout } from "process";
 async function stableDeleteCommand(name) {
   if (!name) {
     console.error("Usage: token-derby stable delete <name>");
     return 2;
   }
-  const stable = await loadStable();
-  const horse = findHorse(stable, name);
-  if (!horse) {
-    console.error(`No horse named "${name}" in your stable.`);
-    return 1;
-  }
-  const codes = await listActiveRaces();
-  for (const code of codes) {
-    const active = await loadActiveRace(code);
-    if (active?.horse_name === name) {
-      console.error(`"${name}" is currently running in race ${code}. Close that terminal first.`);
+  let horses;
+  try {
+    horses = (await listStable()).horses;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
       return 1;
     }
+    throw e;
   }
-  const rl = readline2.createInterface({ input: stdin2, output: stdout2 });
-  const answer = (await rl.question(`Delete "${name}" from your stable? [y/N] `)).trim().toLowerCase();
-  rl.close();
-  if (answer !== "y" && answer !== "yes") {
-    console.log("Cancelled.");
-    return 1;
-  }
-  await removeHorse(name);
-  console.log(`\u2713 Deleted "${name}".`);
-  return 0;
-}
-
-// src/commands/stable-edit.ts
-import React4 from "react";
-import { render as render3 } from "ink";
-async function stableEditCommand(name) {
-  if (!name) {
-    console.error("Usage: token-derby stable edit <name>");
-    return 2;
-  }
-  const stable = await loadStable();
-  const existing = findHorse(stable, name);
-  if (!existing) {
+  const horse = horses.find((h) => h.name === name);
+  if (!horse) {
     console.error(`No horse named "${name}" in your stable.`);
     return 1;
   }
-  let exitCode = 0;
-  const app = render3(
-    React4.createElement(HorseCreator, {
-      initialColors: existing.colors,
-      initialName: existing.name,
-      lockName: true,
-      onSubmit: async (_name, colors) => {
-        await upsertHorse({
-          stable_horse_id: existing.stable_horse_id,
-          name: existing.name,
-          colors,
-          created_at: existing.created_at
-        });
-        app.unmount();
-        console.log(`\u2713 Updated "${existing.name}".`);
-      },
-      onCancel: () => {
-        app.unmount();
-        console.log("Cancelled.");
-        exitCode = 1;
-      }
-    })
-  );
-  await app.waitUntilExit();
-  return exitCode;
-}
-
-// src/commands/create.ts
-import * as readline3 from "readline/promises";
-import { stdin as stdin3, stdout as stdout3 } from "process";
-
-// src/config.ts
-var DEFAULT_API_BASE = "https://token-derby.mauricode.co.uk/api";
-function apiBase() {
-  return process.env.TOKEN_DERBY_API_BASE ?? DEFAULT_API_BASE;
-}
-var HEARTBEAT_INTERVAL_MS = 6e4;
-var POLL_INTERVAL_MS = 3e3;
-var HEARTBEAT_RETRY_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 15e3];
-
-// src/version.ts
-import { createRequire } from "module";
-function readVersion() {
-  if ("1.1.0".length > 0) {
-    return "1.1.0";
-  }
-  try {
-    const req = createRequire(import.meta.url);
-    const pkg = req("../package.json");
-    if (typeof pkg.version === "string") return pkg.version;
-  } catch {
-  }
-  return "0.0.0-dev";
-}
-var CLI_VERSION = readVersion();
-
-// ../shared/dist/constants.js
-var CLI_VERSION_HEADER = "x-cli-version";
-var USER_ID_HEADER = "x-user-id";
-var USER_NAME_HEADER = "x-user-name";
-var USER_NAME_MAX_LENGTH = 40;
-
-// src/identity/identity.ts
-import { promises as fs3 } from "fs";
-import * as path3 from "path";
-import * as crypto from "crypto";
-async function loadIdentity() {
-  try {
-    const raw = await fs3.readFile(identityFile(), "utf8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed.user_id === "string" && typeof parsed.display_name === "string" && typeof parsed.created_at === "string") {
-      return parsed;
-    }
-    return null;
-  } catch (e) {
-    if (e?.code === "ENOENT") return null;
-    return null;
-  }
-}
-async function saveIdentity(identity) {
-  await fs3.mkdir(homeDir(), { recursive: true });
-  await fs3.writeFile(identityFile(), JSON.stringify(identity, null, 2) + "\n", "utf8");
-}
-function generateUserId() {
-  return crypto.randomUUID();
-}
-function validateDisplayName(name) {
-  const trimmed = name.trim();
-  if (trimmed.length < 1) return { ok: false, error: "Name cannot be empty." };
-  if (trimmed.length > USER_NAME_MAX_LENGTH) {
-    return { ok: false, error: `Name must be ${USER_NAME_MAX_LENGTH} characters or fewer.` };
-  }
-  return { ok: true, name: trimmed };
-}
-
-// src/api/client.ts
-var ApiError = class extends Error {
-  constructor(code, message, status) {
-    super(message);
-    this.code = code;
-    this.status = status;
-    this.name = "ApiError";
-  }
-  code;
-  status;
-};
-var identityCache = null;
-function getIdentity() {
-  if (!identityCache) identityCache = loadIdentity();
-  return identityCache;
-}
-async function request(method, path5, body, authToken, fetchImpl = fetch) {
-  const url = path5.startsWith("http") ? path5 : `${apiBase()}${path5}`;
-  const headers = {};
-  headers[CLI_VERSION_HEADER] = CLI_VERSION;
-  const identity = await getIdentity();
-  if (identity) {
-    headers[USER_ID_HEADER] = identity.user_id;
-    headers[USER_NAME_HEADER] = identity.display_name;
+  const rl = readline.createInterface({ input: stdin, output: stdout });
+  const answer = (await rl.question(`Delete "${name}" from your stable? [y/N] `)).trim().toLowerCase();
+  rl.close();
+  if (answer !== "y" && answer !== "yes") {
+    console.log("Cancelled.");
+    return 1;
   }
-  if (authToken) headers["authorization"] = `Bearer ${authToken}`;
-  if (body !== void 0) headers["content-type"] = "application/json";
-  let res;
   try {
-    res = await fetchImpl(url, {
-      method,
-      headers,
-      body: body !== void 0 ? JSON.stringify(body) : void 0
-    });
+    await deleteStableHorse(horse.stable_horse_id);
+    console.log(`\u2713 Deleted "${name}".`);
+    return 0;
   } catch (e) {
-    throw new ApiError("NETWORK_ERROR", e?.message ?? "fetch failed", 0);
-  }
-  const text = await res.text();
-  const contentType = res.headers.get("content-type") ?? "";
-  let parsed = null;
-  if (contentType.includes("application/json") && text.length > 0) {
-    try {
-      parsed = JSON.parse(text);
-    } catch {
-      parsed = null;
-    }
-  }
-  if (!res.ok) {
-    if (parsed && typeof parsed.code === "string") {
-      throw new ApiError(parsed.code, parsed.message ?? "API error", res.status);
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return 1;
     }
-    throw new ApiError("NETWORK_ERROR", `HTTP ${res.status}`, res.status);
+    throw e;
   }
-  return parsed;
 }
 
-// src/api/endpoints.ts
-function createRace(body) {
-  return request("POST", "/races", body, void 0);
-}
-function getRace(joinCode) {
-  return request("GET", `/races/${encodeURIComponent(joinCode)}`, void 0, void 0);
-}
-function joinRace(joinCode, body) {
-  return request("POST", `/races/${encodeURIComponent(joinCode)}/join`, body, void 0);
-}
-function heartbeat(joinCode, horseId, token, body) {
-  return request(
-    "POST",
-    `/races/${encodeURIComponent(joinCode)}/horses/${encodeURIComponent(horseId)}/heartbeat`,
-    body,
-    token
+// src/commands/stable-edit.ts
+import React4 from "react";
+import { render as render3 } from "ink";
+async function stableEditCommand(name) {
+  if (!name) {
+    console.error("Usage: token-derby stable edit <name>");
+    return 2;
+  }
+  const horses = await fetchStable();
+  if (!horses) return 1;
+  const existing = horses.find((h) => h.name === name);
+  if (!existing) {
+    console.error(`No horse named "${name}" in your stable.`);
+    return 1;
+  }
+  let exitCode = 0;
+  const app = render3(
+    React4.createElement(HorseCreator, {
+      initialColors: existing.colors,
+      initialName: existing.name,
+      lockName: true,
+      initialLevel: levelFromXp(existing.xp),
+      onSubmit: async (_name, colors) => {
+        try {
+          await updateStableHorse(existing.stable_horse_id, { colors });
+          app.unmount();
+          console.log(`\u2713 Updated "${existing.name}".`);
+        } catch (e) {
+          app.unmount();
+          if (e instanceof ApiError) {
+            console.error(`Error: ${e.code} ${e.message}`);
+            exitCode = 1;
+            return;
+          }
+          throw e;
+        }
+      },
+      onCancel: () => {
+        app.unmount();
+        console.log("Cancelled.");
+        exitCode = 1;
+      }
+    })
   );
+  await app.waitUntilExit();
+  return exitCode;
 }
-function endRace(adminCode) {
-  return request("DELETE", `/races/admin/${encodeURIComponent(adminCode)}`, void 0, void 0);
+async function fetchStable() {
+  try {
+    const resp = await listStable();
+    return resp.horses;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return null;
+    }
+    throw e;
+  }
 }
 
 // src/commands/create.ts
+import * as readline2 from "readline/promises";
+import { stdin as stdin2, stdout as stdout2 } from "process";
 var DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
-async function createRaceCommand() {
-  const rl = readline3.createInterface({ input: stdin3, output: stdout3 });
+async function createRaceCommand(organisationName) {
+  const rl = readline2.createInterface({ input: stdin2, output: stdout2 });
   try {
     const name = (await rl.question("Race name: ")).trim();
     if (!name) {
@@ -747,12 +790,22 @@ async function createRaceCommand() {
       console.error("Max participants must be a positive number.");
       return 1;
     }
+    let org = organisationName;
+    if (org === void 0) {
+      const raw = (await rl.question("Organisation (blank for none): ")).trim();
+      if (raw) org = raw;
+    }
+    if (org !== void 0 && !ORG_NAME_PATTERN.test(org)) {
+      console.error("Organisation name must be 1\u201312 alphanumeric characters.");
+      return 1;
+    }
     const resp = await createRace({
       name,
       start_time: start,
       end_time: end,
       tz,
-      ...max !== void 0 ? { max_participants: max } : {}
+      ...max !== void 0 ? { max_participants: max } : {},
+      ...org ? { organisation_name: org } : {}
     });
     console.log("");
     console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
@@ -762,6 +815,9 @@ async function createRaceCommand() {
     console.log(`  Admin code:  ${resp.admin_code}`);
     console.log("  \u26A0  Save the admin code \u2014 you need it to end the race early.");
     console.log("");
+    if (org) {
+      console.log(`  Restricted to organisation: ${org}`);
+    }
     console.log(`  Share with participants:  token-derby join ${resp.join_code}`);
     return 0;
   } catch (e) {
@@ -821,17 +877,44 @@ function HorsePicker({ horses, onPick, onCancel }) {
       /* @__PURE__ */ jsx4(Box4, { flexDirection: "row", children: /* @__PURE__ */ jsxs3(Text4, { children: [
         i === idx ? "\u25BA" : " ",
         " ",
-        h.name
+        h.name,
+        " ",
+        /* @__PURE__ */ jsxs3(Text4, { color: "cyan", children: [
+          "[Lvl. ",
+          levelFromXp(h.xp),
+          "]"
+        ] })
       ] }) }),
       /* @__PURE__ */ jsxs3(Box4, { flexDirection: "row", children: [
         /* @__PURE__ */ jsx4(Text4, { children: "  " }),
         /* @__PURE__ */ jsx4(HorseSprite, { sprite: MINI_SPRITE, colors: h.colors })
       ] })
-    ] }, h.name)),
+    ] }, h.stable_horse_id)),
     /* @__PURE__ */ jsx4(Box4, { marginTop: 1, children: /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "\u2191/\u2193 choose \xB7 Enter pick \xB7 Esc cancel" }) })
   ] });
 }
 
+// src/stable/active-race.ts
+import * as fs2 from "fs/promises";
+import * as path3 from "path";
+async function loadActiveRace(joinCode) {
+  try {
+    const raw = await fs2.readFile(activeRaceFile(joinCode), "utf8");
+    return JSON.parse(raw);
+  } catch (e) {
+    if (e?.code === "ENOENT") return null;
+    throw e;
+  }
+}
+async function saveActiveRace(active) {
+  await fs2.mkdir(activeRacesDir(), { recursive: true });
+  await fs2.writeFile(
+    activeRaceFile(active.join_code),
+    JSON.stringify(active, null, 2) + "\n",
+    "utf8"
+  );
+}
+
 // src/runtime/run-race.tsx
 import { useEffect, useRef, useState as useState3 } from "react";
 import { Box as Box6, Text as Text6, useApp } from "ink";
@@ -848,6 +931,7 @@ function StatusScreen(props) {
   const leader = race.horses[0];
   const elapsedPct = elapsed(race);
   const timeLeft = formatDuration(race.time_left_seconds);
+  const lvl = levelInfo(own?.xp ?? 0);
   return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", borderStyle: "round", paddingX: 1, children: [
     /* @__PURE__ */ jsxs4(Text5, { children: [
       "\u{1F3C7} TOKEN DERBY \u2500\u2500\u2500 ",
@@ -860,7 +944,13 @@ function StatusScreen(props) {
       /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
         /* @__PURE__ */ jsxs4(Text5, { children: [
           "  ",
-          ownHorseName
+          ownHorseName,
+          " ",
+          /* @__PURE__ */ jsxs4(Text5, { color: "cyan", children: [
+            "[Lvl. ",
+            lvl.level,
+            "]"
+          ] })
         ] }),
         /* @__PURE__ */ jsxs4(Text5, { children: [
           "  ",
@@ -897,6 +987,10 @@ function StatusScreen(props) {
         "Time left:      ",
         timeLeft
       ] }),
+      /* @__PURE__ */ jsxs4(Text5, { children: [
+        "XP:             ",
+        lvl.next_level_xp === null ? `${lvl.xp} (max level)  ${bar(1, 20)}` : `${lvl.xp_into_level}/${lvl.xp_for_level} \u2192 Lvl. ${lvl.level + 1}  ${bar(lvl.progress, 20)}`
+      ] }),
       /* @__PURE__ */ jsxs4(Text5, { children: [
         "Last heartbeat: ",
         lastHeartbeatAgoSec === null ? "\u2014" : `${lastHeartbeatAgoSec}s ago`,
@@ -970,31 +1064,8 @@ function runHeartbeatLoop(opts) {
   schedule(0);
 }
 
-// src/runtime/poll-loop.ts
-function runPollLoop(opts) {
-  let timer = null;
-  let stopped = false;
-  const stop = () => {
-    stopped = true;
-    if (timer) clearTimeout(timer);
-    timer = null;
-  };
-  opts.abortSignal.addEventListener("abort", stop, { once: true });
-  const tick = async () => {
-    if (stopped) return;
-    try {
-      const race = await opts.fetchRace();
-      if (!stopped) opts.onSnapshot(race);
-    } catch (err) {
-      if (!stopped) opts.onError(err);
-    }
-    if (!stopped) timer = setTimeout(tick, opts.intervalMs);
-  };
-  timer = setTimeout(tick, 0);
-}
-
 // src/tokens/transcripts.ts
-import * as fs4 from "fs/promises";
+import * as fs3 from "fs/promises";
 import * as path4 from "path";
 async function sumTokens() {
   const root = claudeProjectsDir();
@@ -1010,12 +1081,18 @@ async function sumTokens() {
 }
 async function sumOutputTokens() {
   const { input, output } = await sumTokens();
-  return input + output;
+  return countInputTokens() ? input + output : output;
+}
+function countInputTokens() {
+  const v = process.env.TOKEN_DERBY_COUNT_INPUT_TOKENS;
+  if (!v) return false;
+  const s = v.toLowerCase();
+  return s === "1" || s === "true" || s === "yes" || s === "on";
 }
 async function listJsonlFiles(root) {
   let projects;
   try {
-    projects = await fs4.readdir(root);
+    projects = await fs3.readdir(root);
   } catch (e) {
     if (e?.code === "ENOENT") return [];
     throw e;
@@ -1025,12 +1102,17 @@ async function listJsonlFiles(root) {
     const projectDir = path4.join(root, project);
     let stat2;
     try {
-      stat2 = await fs4.stat(projectDir);
+      stat2 = await fs3.stat(projectDir);
     } catch {
       continue;
     }
     if (!stat2.isDirectory()) continue;
-    const entries = await fs4.readdir(projectDir);
+    let entries;
+    try {
+      entries = await fs3.readdir(projectDir);
+    } catch {
+      continue;
+    }
     for (const entry of entries) {
       if (entry.endsWith(".jsonl")) out.push(path4.join(projectDir, entry));
     }
@@ -1043,7 +1125,7 @@ function addNum(value) {
 async function sumFile(file) {
   let raw;
   try {
-    raw = await fs4.readFile(file, "utf8");
+    raw = await fs3.readFile(file, "utf8");
   } catch {
     return { input: 0, output: 0 };
   }
@@ -1096,14 +1178,6 @@ function RunRace({ active, startingBaseline, pendingMode, ownUserName }) {
     }
   }, [race?.status]);
   useEffect(() => {
-    runPollLoop({
-      fetchRace: () => getRace(active.join_code),
-      intervalMs: POLL_INTERVAL_MS,
-      onSnapshot: (r) => setRace(r),
-      onError: () => {
-      },
-      abortSignal: ctrl.current.signal
-    });
     runHeartbeatLoop({
       sendHeartbeat: async (currentTokens) => {
         const resp = await heartbeat(
@@ -1129,6 +1203,7 @@ function RunRace({ active, startingBaseline, pendingMode, ownUserName }) {
       onSuccess: (resp) => {
         setLastHbAt(/* @__PURE__ */ new Date());
         setLastHbOk(true);
+        setRace(raceViewFrom(resp));
         if (resp.race_status === "finished") exit();
       },
       onError: (err) => {
@@ -1146,13 +1221,13 @@ function RunRace({ active, startingBaseline, pendingMode, ownUserName }) {
     const sampler = setInterval(async () => {
       try {
         lastTokenSampleRef.current = await sumOutputTokens();
-      } catch {
+      } catch (e) {
+        console.error("[token-derby] token sampler failed:", e);
       }
     }, 5e3);
     sumOutputTokens().then((t) => {
       lastTokenSampleRef.current = t;
-    }).catch(() => {
-    });
+    }).catch((e) => console.error("[token-derby] token sampler prime failed:", e));
     const controller = ctrl.current;
     return () => {
       clearInterval(sampler);
@@ -1179,6 +1254,15 @@ function RunRace({ active, startingBaseline, pendingMode, ownUserName }) {
     }
   );
 }
+function raceViewFrom(resp) {
+  return {
+    ...resp.race,
+    status: resp.race_status,
+    horses: resp.horses,
+    server_time: resp.server_time,
+    time_left_seconds: resp.time_left_seconds
+  };
+}
 async function buildInitialState(args) {
   const runningTotal = await sumOutputTokens();
   if (args.rejoin) {
@@ -1231,12 +1315,21 @@ async function joinCommand(joinCode) {
     chosenColors = ownHorse.colors;
     isResume = true;
   } else {
-    const stable = await loadStable();
-    if (stable.horses.length === 0) {
+    let horses;
+    try {
+      horses = (await listStable()).horses;
+    } catch (e) {
+      if (e instanceof ApiError) {
+        console.error(`Error: ${e.code} ${e.message}`);
+        return 1;
+      }
+      throw e;
+    }
+    if (horses.length === 0) {
       console.error("Your stable is empty. Run `token-derby stable create` first.");
       return 1;
     }
-    const picked = await pickHorse(stable.horses);
+    const picked = await pickHorse(horses);
     if (!picked) {
       console.log("Cancelled.");
       return 1;
@@ -1248,9 +1341,7 @@ async function joinCommand(joinCode) {
   }
   let joinResp;
   try {
-    joinResp = await joinRace(code, {
-      horse: { stable_horse_id: chosenStableHorseId, name: chosenName, colors: chosenColors }
-    });
+    joinResp = await joinRace(code, { stable_horse_id: chosenStableHorseId });
   } catch (e) {
     if (e instanceof ApiError) {
       if (e.code === "RACE_FULL") console.error("This race is full.");
@@ -1258,7 +1349,9 @@ async function joinCommand(joinCode) {
       else if (e.code === "RACE_NOT_FOUND") console.error(`No race with join code ${code}.`);
       else if (e.code === "VERSION_MISMATCH") console.error(e.message);
       else if (e.code === "DUPLICATE_HORSE") console.error(e.message);
-      else if (e.code === "IDENTITY_REQUIRED") console.error(`Error: ${e.message}`);
+      else if (e.code === "STABLE_HORSE_NOT_FOUND") {
+        console.error("That horse no longer exists in your stable. Try again.");
+      } else if (e.code === "NOT_ORG_MEMBER") console.error(e.message);
       else console.error(`Error: ${e.code} ${e.message}`);
       return 1;
     }
@@ -1303,14 +1396,14 @@ async function pickHorse(horses) {
 }
 
 // src/commands/end.ts
-import * as readline4 from "readline/promises";
-import { stdin as stdin4, stdout as stdout4 } from "process";
+import * as readline3 from "readline/promises";
+import { stdin as stdin3, stdout as stdout3 } from "process";
 async function endCommand(adminCode) {
   if (!adminCode) {
     console.error("Usage: token-derby end <admin-code>");
     return 2;
   }
-  const rl = readline4.createInterface({ input: stdin4, output: stdout4 });
+  const rl = readline3.createInterface({ input: stdin3, output: stdout3 });
   const answer = (await rl.question("End the race now and freeze final tokens? [y/N] ")).trim().toLowerCase();
   rl.close();
   if (answer !== "y" && answer !== "yes") {
@@ -1332,11 +1425,16 @@ async function endCommand(adminCode) {
 }
 
 // src/commands/init.ts
-import * as readline5 from "readline/promises";
-import { stdin as stdin5, stdout as stdout5 } from "process";
-async function initCommand() {
+import * as readline4 from "readline/promises";
+import { stdin as stdin4, stdout as stdout4 } from "process";
+async function initCommand(reset = false) {
+  if (reset) {
+    await deleteIdentity();
+    _resetIdentityCacheForTests();
+    console.log("Removed local identity. Creating a new one\u2026");
+  }
   const existing = await loadIdentity();
-  const rl = readline5.createInterface({ input: stdin5, output: stdout5 });
+  const rl = readline4.createInterface({ input: stdin4, output: stdout4 });
   try {
     if (existing) {
       console.log(`Current jockey name: ${existing.display_name}`);
@@ -1350,10 +1448,25 @@ async function initCommand() {
         console.error(v2.error);
         return 1;
       }
-      const updated = { ...existing, display_name: v2.name };
-      await saveIdentity(updated);
-      console.log(`Updated jockey name to: ${updated.display_name}`);
-      return 0;
+      try {
+        const resp = await updateJockey({ display_name: v2.name });
+        const updated = { ...existing, display_name: resp.display_name };
+        await saveIdentity(updated);
+        console.log(`Updated jockey name to: ${updated.display_name}`);
+        return 0;
+      } catch (e) {
+        if (e instanceof ApiError) {
+          if (e.code === "UNAUTHENTICATED") {
+            console.error(
+              "Server does not recognise this identity. Your account may have been wiped. Run `token-derby init --reset` to start fresh."
+            );
+          } else {
+            console.error(`Error: ${e.code} ${e.message}`);
+          }
+          return 1;
+        }
+        throw e;
+      }
     }
     const raw = (await rl.question("Jockey Name (use your real name please): ")).trim();
     const v = validateDisplayName(raw);
@@ -1361,26 +1474,152 @@ async function initCommand() {
       console.error(v.error);
       return 1;
     }
-    const identity = {
-      user_id: generateUserId(),
-      display_name: v.name,
-      created_at: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    await saveIdentity(identity);
+    try {
+      const resp = await initJockey({ display_name: v.name });
+      const identity = {
+        user_id: resp.user_id,
+        display_name: resp.display_name,
+        secret_token: resp.secret_token,
+        created_at: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      await saveIdentity(identity);
+      _resetIdentityCacheForTests();
+      console.log("");
+      console.log(`Welcome, ${identity.display_name}!`);
+      console.log("Your identity has been created on the server.");
+      console.log("You can now create a stable and join races.");
+      console.log("");
+      console.log("  \u26A0  Your secret token is stored locally in identity.json.");
+      console.log("     If you lose it, you cannot recover this account \u2014 you would");
+      console.log("     need to run `token-derby init --reset` and rebuild your stable.");
+      return 0;
+    } catch (e) {
+      if (e instanceof ApiError) {
+        console.error(`Error: ${e.code} ${e.message}`);
+        return 1;
+      }
+      throw e;
+    }
+  } finally {
+    rl.close();
+  }
+}
+
+// src/commands/org-create.ts
+import * as readline5 from "readline/promises";
+import { stdin as stdin5, stdout as stdout5 } from "process";
+async function orgCreateCommand() {
+  const rl = readline5.createInterface({ input: stdin5, output: stdout5 });
+  try {
+    const name = (await rl.question(`Organisation name (1\u2013${ORG_NAME_MAX_LENGTH} alphanumeric chars): `)).trim();
+    if (!ORG_NAME_PATTERN.test(name)) {
+      console.error(`Name must be 1\u2013${ORG_NAME_MAX_LENGTH} alphanumeric characters (no spaces or symbols).`);
+      return 1;
+    }
+    const resp = await createOrganisation({ name });
     console.log("");
-    console.log(`Welcome, ${identity.display_name}!`);
-    console.log(`Your identity is saved. You can now create a stable and join races.`);
+    console.log(`  Organisation created: ${resp.org_name}`);
+    console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
+    console.log(`  \u2551  JOIN TOKEN:  ${resp.org_join_token.padEnd(43)}\u2551`);
+    console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
+    console.log("  \u26A0  Share this token to invite members. Treat it as a secret.");
+    console.log("");
+    console.log(`  Members join with:  token-derby organisation join ${resp.org_join_token}`);
+    console.log(`  Create org races:   token-derby create --organisation ${resp.org_name}`);
     return 0;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return 1;
+    }
+    throw e;
   } finally {
     rl.close();
   }
 }
 
+// src/commands/org-join.ts
+async function orgJoinCommand(token) {
+  if (!token) {
+    console.error("Usage: token-derby organisation join <join-token>");
+    return 2;
+  }
+  try {
+    const resp = await joinOrganisation({ join_token: token });
+    console.log(`Joined organisation: ${resp.org_name}`);
+    return 0;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return 1;
+    }
+    throw e;
+  }
+}
+
+// src/commands/org-list.ts
+async function orgListCommand() {
+  try {
+    const resp = await listOrganisations();
+    if (resp.organisations.length === 0) {
+      console.log("You are not in any organisations.");
+      console.log("Create one with:  token-derby organisation create");
+      console.log("Or join one with: token-derby organisation join <token>");
+      return 0;
+    }
+    console.log(`Your organisations (${resp.organisations.length}):`);
+    for (const o of resp.organisations) {
+      console.log(`  \u2022 ${o.org_name}`);
+    }
+    return 0;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return 1;
+    }
+    throw e;
+  }
+}
+
+// src/commands/org-info.ts
+async function orgInfoCommand(name) {
+  if (!name) {
+    console.error("Usage: token-derby organisation info <name>");
+    return 2;
+  }
+  if (!ORG_NAME_PATTERN.test(name)) {
+    console.error("Organisation name must be 1\u201312 alphanumeric characters.");
+    return 2;
+  }
+  try {
+    const resp = await getOrganisation(name);
+    console.log(`Organisation: ${resp.org_name}`);
+    console.log(`Created:      ${resp.created_at} by ${resp.creator_user_name}`);
+    console.log("");
+    console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
+    console.log(`  \u2551  JOIN TOKEN:  ${resp.org_join_token.padEnd(43)}\u2551`);
+    console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
+    console.log("  \u26A0  Treat the token as a secret \u2014 anyone with it can join.");
+    console.log("");
+    console.log(`  Members join with:  token-derby organisation join ${resp.org_join_token}`);
+    return 0;
+  } catch (e) {
+    if (e instanceof ApiError) {
+      console.error(`Error: ${e.code} ${e.message}`);
+      return 1;
+    }
+    throw e;
+  }
+}
+
 // src/bin.ts
 var HELP = `token-derby v${CLI_VERSION}
 
 Identity:
   token-derby init                        Set up your jockey identity (run this first)
+                                          Re-running renames you on the server.
+  token-derby init --reset                Wipe local identity and create a fresh account.
+                                          Your previous stable is abandoned on the server.
 
 Stable management:
   token-derby stable create               Make a new horse (interactive)
@@ -1388,8 +1627,17 @@ Stable management:
   token-derby stable edit <name>          Edit an existing horse's colors
   token-derby stable delete <name>        Remove a horse from your stable
 
+Organisations:
+  token-derby organisation create         Create a new organisation (interactive)
+  token-derby organisation join <token>   Join an organisation with a join token
+  token-derby organisation info <name>    Show an org's join token (members only)
+  token-derby organisation list           Show organisations you're a member of
+
 Races:
-  token-derby create                      Create a new race (interactive)
+  token-derby create [--organisation <name>]
+                                          Create a new race (interactive). When
+                                          --organisation is set, only members of
+                                          that org can join.
   token-derby join <join-code>            Join (or resume) a race
   token-derby end <admin-code>            End a race early
 
@@ -1408,7 +1656,10 @@ async function main() {
     console.log(CLI_VERSION);
     return 0;
   }
-  if (cmd === "init") return initCommand();
+  if (cmd === "init") {
+    const reset = argv.slice(1).includes("--reset");
+    return initCommand(reset);
+  }
   const identity = await loadIdentity();
   if (!identity) {
     console.error("Run `token-derby init` to set up your identity before using any other command.");
@@ -1424,13 +1675,34 @@ async function main() {
     console.error("Try: stable create | stable list | stable edit <name> | stable delete <name>");
     return 2;
   }
-  if (cmd === "create") return createRaceCommand();
+  if (cmd === "organisation" || cmd === "org") {
+    const sub = argv[1];
+    if (sub === "create") return orgCreateCommand();
+    if (sub === "join") return orgJoinCommand(argv[2]);
+    if (sub === "info") return orgInfoCommand(argv[2]);
+    if (sub === "list") return orgListCommand();
+    console.error(`Unknown organisation subcommand: ${sub ?? "(none)"}`);
+    console.error("Try: organisation create | organisation join <token> | organisation info <name> | organisation list");
+    return 2;
+  }
+  if (cmd === "create") {
+    const orgName = parseFlag(argv.slice(1), "--organisation");
+    return createRaceCommand(orgName);
+  }
   if (cmd === "join") return joinCommand(argv[1]);
   if (cmd === "end") return endCommand(argv[1]);
   console.error(`Unknown command: ${cmd}`);
   console.error(HELP);
   return 2;
 }
+function parseFlag(args, flag) {
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === flag) return args[i + 1];
+    const eq = `${flag}=`;
+    if (args[i]?.startsWith(eq)) return args[i].slice(eq.length);
+  }
+  return void 0;
+}
 main().then(
   (code) => process.exit(code),
   (err) => {