@puzzmo/cli 1.0.40 → 1.0.42

package/lib/util/config.d.ts

@@ -1,13 +1,43 @@
+export declare const defaultSource = "https://api.puzzmo.com";
+export type TokenEntry = {
+    /** Server identifier (e.g. "api.puzzmo.com" or "localhost:8911") */
+    source: string;
+    /** The pzt- prefixed JWT issued by that server */
+    token: string;
+};
 type Config = {
-    token?: string;
-    apiURL?: string;
+    tokens: TokenEntry[];
 };
-/** Reads the CLI config from ~/.puzzmo/config.json */
+/** Reads ~/.puzzmo/config.json. Returns an empty token list if the file doesn't exist. */
 export declare const readConfig: () => Config;
-/** Writes the CLI config to ~/.puzzmo/config.json */
-export declare const writeConfig: (config: Config) => void;
-/** Returns the auth token from config or PUZZMO_TOKEN env var */
-export declare const getToken: () => string | undefined;
-/** Returns the API base URL */
-export declare const getAPIURL: () => string;
+/** Saves a token for `source`, replacing any existing entry for that same source */
+export declare const addToken: (source: string, token: string) => void;
+/** Removes any saved token for `source`. Returns true if something was removed. */
+export declare const removeToken: (source: string) => boolean;
+/** Returns saved tokens. PUZZMO_TOKEN env var (with optional PUZZMO_API_URL) overrides everything. */
+export declare const getTokens: () => TokenEntry[];
+/** Best-guess token for clients that don't care which server it points at (e.g. .mcp.json scaffolding) */
+export declare const getDefaultToken: () => string | undefined;
+type TokenPayload = {
+    teamID?: string;
+    createdByID?: string;
+    iat?: number;
+};
+/** Decodes a `pzt-<jwt>` token (without verifying) and returns its payload, or null on failure */
+export declare const decodeTokenPayload: (token: string) => TokenPayload | null;
+/** Strips protocol and trailing slashes so two spellings of the same server compare equal */
+export declare const normalizeSource: (source: string) => string;
+/** Re-attaches a protocol to a normalized source. Localhost defaults to http, everything else to https. */
+export declare const sourceToURL: (source: string) => string;
+/** Sorts saved tokens by upload preference: localhost > *.puzzmo.com > anything else */
+export declare const sortByServerPriority: (tokens: TokenEntry[]) => TokenEntry[];
+/** Returns saved tokens whose JWT teamID matches the given teamID */
+export declare const findTokensForTeam: (teamID: string) => TokenEntry[];
+/** True if a quick fetch to `${source}/graphql` returns any HTTP response within `timeoutMs` */
+export declare const isServerReachable: (source: string, timeoutMs?: number) => Promise<boolean>;
+/**
+ * Picks the (source, token) pair to use for `teamID`. Prefers localhost when reachable,
+ * then *.puzzmo.com, then any other matching source. Returns null if no token matches.
+ */
+export declare const resolveServerForTeam: (teamID: string) => Promise<TokenEntry | null>;
 export {};

package/lib/util/config.js

@@ -3,27 +3,121 @@ import os from "node:os";
 import path from "node:path";
 const configDir = path.join(os.homedir(), ".puzzmo");
 const configPath = path.join(configDir, "config.json");
-/** Reads the CLI config from ~/.puzzmo/config.json */
+export const defaultSource = "https://api.puzzmo.com";
+/** Reads ~/.puzzmo/config.json. Returns an empty token list if the file doesn't exist. */
 export const readConfig = () => {
     try {
-        const raw = fs.readFileSync(configPath, "utf-8");
-        return JSON.parse(raw);
+        const parsed = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+        return { tokens: parsed.tokens ?? [] };
     }
     catch {
-        return {};
+        return { tokens: [] };
     }
 };
-/** Writes the CLI config to ~/.puzzmo/config.json */
-export const writeConfig = (config) => {
+const writeConfig = (config) => {
     fs.mkdirSync(configDir, { recursive: true });
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
 };
-/** Returns the auth token from config or PUZZMO_TOKEN env var */
-export const getToken = () => {
-    return process.env.PUZZMO_TOKEN || readConfig().token;
+/** Saves a token for `source`, replacing any existing entry for that same source */
+export const addToken = (source, token) => {
+    const normalized = normalizeSource(source);
+    const { tokens } = readConfig();
+    const remaining = tokens.filter((t) => normalizeSource(t.source) !== normalized);
+    remaining.push({ source: normalized, token });
+    writeConfig({ tokens: remaining });
 };
-/** Returns the API base URL */
-export const getAPIURL = () => {
-    return process.env.PUZZMO_API_URL || readConfig().apiURL || "https://api.puzzmo.com";
+/** Removes any saved token for `source`. Returns true if something was removed. */
+export const removeToken = (source) => {
+    const normalized = normalizeSource(source);
+    const { tokens } = readConfig();
+    const remaining = tokens.filter((t) => normalizeSource(t.source) !== normalized);
+    if (remaining.length === tokens.length)
+        return false;
+    writeConfig({ tokens: remaining });
+    return true;
+};
+/** Returns saved tokens. PUZZMO_TOKEN env var (with optional PUZZMO_API_URL) overrides everything. */
+export const getTokens = () => {
+    const envToken = process.env.PUZZMO_TOKEN;
+    if (envToken) {
+        const source = normalizeSource(process.env.PUZZMO_API_URL ?? defaultSource);
+        return [{ source, token: envToken }];
+    }
+    return readConfig().tokens;
+};
+/** Best-guess token for clients that don't care which server it points at (e.g. .mcp.json scaffolding) */
+export const getDefaultToken = () => getTokens()[0]?.token;
+/** Decodes a `pzt-<jwt>` token (without verifying) and returns its payload, or null on failure */
+export const decodeTokenPayload = (token) => {
+    try {
+        const stripped = token.startsWith("pzt-") ? token.slice(4) : token;
+        const parts = stripped.split(".");
+        if (parts.length < 2)
+            return null;
+        const payload = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+        const padded = payload + "=".repeat((4 - (payload.length % 4)) % 4);
+        return JSON.parse(Buffer.from(padded, "base64").toString("utf-8"));
+    }
+    catch {
+        return null;
+    }
+};
+/** Strips protocol and trailing slashes so two spellings of the same server compare equal */
+export const normalizeSource = (source) => source
+    .trim()
+    .replace(/^https?:\/\//, "")
+    .replace(/\/+$/, "");
+/** Re-attaches a protocol to a normalized source. Localhost defaults to http, everything else to https. */
+export const sourceToURL = (source) => {
+    const trimmed = source.trim().replace(/\/+$/, "");
+    if (/^https?:\/\//.test(trimmed))
+        return trimmed;
+    const normalized = normalizeSource(trimmed);
+    if (isLocalhost(normalized))
+        return `http://${normalized}`;
+    return `https://${normalized}`;
+};
+const isLocalhost = (source) => {
+    const n = normalizeSource(source);
+    return n.startsWith("localhost") || n.startsWith("127.0.0.1") || n.startsWith("0.0.0.0");
+};
+const isPuzzmoCom = (source) => /(^|\.)puzzmo\.com(:|\/|$)/.test(normalizeSource(source));
+/** Sorts saved tokens by upload preference: localhost > *.puzzmo.com > anything else */
+export const sortByServerPriority = (tokens) => {
+    const priority = (t) => (isLocalhost(t.source) ? 0 : isPuzzmoCom(t.source) ? 1 : 2);
+    return [...tokens].sort((a, b) => priority(a) - priority(b));
+};
+/** Returns saved tokens whose JWT teamID matches the given teamID */
+export const findTokensForTeam = (teamID) => getTokens().filter((t) => decodeTokenPayload(t.token)?.teamID === teamID);
+/** True if a quick fetch to `${source}/graphql` returns any HTTP response within `timeoutMs` */
+export const isServerReachable = async (source, timeoutMs = 1500) => {
+    const url = `${sourceToURL(source)}/graphql`;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+        await fetch(url, { method: "GET", signal: controller.signal });
+        return true;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        clearTimeout(timer);
+    }
+};
+/**
+ * Picks the (source, token) pair to use for `teamID`. Prefers localhost when reachable,
+ * then *.puzzmo.com, then any other matching source. Returns null if no token matches.
+ */
+export const resolveServerForTeam = async (teamID) => {
+    const matches = sortByServerPriority(findTokensForTeam(teamID));
+    if (matches.length === 0)
+        return null;
+    for (const candidate of matches) {
+        if (isLocalhost(candidate.source) && !(await isServerReachable(candidate.source)))
+            continue;
+        return candidate;
+    }
+    return null;
 };
 //# sourceMappingURL=config.js.map

package/lib/util/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/util/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;AAOtD,sDAAsD;AACtD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAW,EAAE,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAChD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AAAA,CACF,CAAA;AAED,qDAAqD;AACrD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC;IAC7C,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5C,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;AAAA,CACrE,CAAA;AAED,iEAAiE;AACjE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAuB,EAAE,CAAC;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,UAAU,EAAE,CAAC,KAAK,CAAA;AAAA,CACtD,CAAA;AAED,+BAA+B;AAC/B,MAAM,CAAC,MAAM,SAAS,GAAG,GAAW,EAAE,CAAC;IACrC,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,UAAU,EAAE,CAAC,MAAM,IAAI,wBAAwB,CAAA;AAAA,CACrF,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/util/config.ts"],"names":[],"mappings":"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"}

package/lib/util/createGame.d.ts

@@ -1,4 +1,6 @@
 export type CreateUserGameOptions = {
+    /** Base URL of the API server to call (e.g. "https://api.puzzmo.com") */
+    apiURL: string;
     /** A teamAccessToken (the same token saved by `puzzmo login`). The mutation uses it to identify the team. */
     teamAccessToken: string;
     displayName: string;

package/lib/util/createGame.js

@@ -1,4 +1,3 @@
-import { getAPIURL } from "./config.js";
 const createUserGameMutation = `
   mutation cliCreateUserGameMutation($teamAccessToken: String!, $input: CreateUserGameInput!) {
     createUserGame(teamAccessToken: $teamAccessToken, input: $input) {
@@ -9,7 +8,7 @@ const createUserGameMutation = `
 `;
 /** Calls the createUserGame mutation using a teamAccessToken for auth. */
 export const createUserGame = async (options) => {
-    const url = `${getAPIURL()}/graphql`;
+    const url = `${options.apiURL}/graphql`;
     const response = await fetch(url, {
         method: "POST",
         headers: { "Content-Type": "application/json" },

package/lib/util/createGame.js.map

@@ -1 +1 @@
-{"version":3,"file":"createGame.js","sourceRoot":"","sources":["../../src/util/createGame.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,sBAAsB,GAAG;;;;;;;CAO9B,CAAA;AAsBD,0EAA0E;AAC1E,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAA8B,EAAwB,EAAE,CAAC;IAC5F,MAAM,GAAG,GAAG,GAAG,SAAS,EAAE,UAAU,CAAA;IAEpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,KAAK,EAAE,sBAAsB;YAC7B,SAAS,EAAE;gBACT,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE;aAC5C;SACF,CAAC;KACH,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;IAE7G,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA2B,CAAA;IAEhE,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9D,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAA;IACtD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAEpF,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAC3D,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,CAAA;AAAA,CACvF,CAAA"}
+{"version":3,"file":"createGame.js","sourceRoot":"","sources":["../../src/util/createGame.ts"],"names":[],"mappings":"AAAA,MAAM,sBAAsB,GAAG;;;;;;;CAO9B,CAAA;AAwBD,0EAA0E;AAC1E,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAA8B,EAAwB,EAAE,CAAC;IAC5F,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,UAAU,CAAA;IAEvC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,KAAK,EAAE,sBAAsB;YAC7B,SAAS,EAAE;gBACT,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,KAAK,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE;aAC5C;SACF,CAAC;KACH,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;IAE7G,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA2B,CAAA;IAEhE,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9D,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAA;IACtD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAEpF,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAA;IAC3D,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,CAAA;AAAA,CACvF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@puzzmo/cli",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "type": "module",
   "bin": {
     "puzzmo": "./lib/index.js"
@@ -24,6 +24,7 @@
     "@cfworker/json-schema": "^4.1.1",
     "@clack/prompts": "^1.1.0",
     "@opencode-ai/sdk": "1.14.20",
-    "@puzzmo/agent-cli-detect": "*"
+    "@puzzmo/agent-cli-detect": "*",
+    "citty": "^0.2.2"
   }
 }

package/src/commands/game/create.ts

@@ -10,12 +10,12 @@ import { downloadPage } from "../../download/page-downloader.js"
 import { runCommand, gitCommit } from "../../util/exec.js"
 import { runSkillsPipelineTUI, runAgentWithBuildLoop } from "../../skills/runner.js"
 import { login } from "../login.js"
-import { getToken } from "../../util/config.js"
+import { getDefaultToken } from "../../util/config.js"
 import { detectRepoContext, type RepoType } from "./detectRepo.js"
 
-type Strategy = "import" | "blank" | "prompt"
+export type Strategy = "import" | "blank" | "prompt"
 
-type CreateOptions = {
+export type CreateOptions = {
   name?: string
   url?: string
   agent?: string
@@ -25,29 +25,6 @@ type CreateOptions = {
   prompt?: string
 }
 
-/** Parses CLI args into CreateOptions */
-const parseArgs = (args: string[]): CreateOptions => {
-  const opts: CreateOptions = {}
-  let i = 0
-
-  while (i < args.length) {
-    const arg = args[i]
-    if (arg === "--name" && args[i + 1]) opts.name = args[++i]
-    else if (arg === "--url" && args[i + 1]) opts.url = args[++i]
-    else if (arg === "--agent" && args[i + 1]) opts.agent = args[++i]
-    else if (arg === "--token" && args[i + 1]) opts.accessToken = args[++i]
-    else if (arg === "--pm" && args[i + 1]) opts.pm = args[++i]
-    else if (arg === "--prompt" && args[i + 1]) opts.prompt = args[++i]
-    else if (arg === "--strategy" && args[i + 1]) {
-      const v = args[++i]
-      if (v === "import" || v === "blank" || v === "prompt") opts.strategy = v
-    }
-    i++
-  }
-
-  return opts
-}
-
 /** Converts a string to a URL-friendly slug (matches packages/shared/slugify.ts) */
 const slugify = (text: string) =>
   text
@@ -62,7 +39,7 @@ const slugify = (text: string) =>
 
 /** Writes .mcp.json with dev server config */
 const writeMcpConfig = (dir: string) => {
-  const token = getToken()
+  const token = getDefaultToken()
   const mcpConfig = {
     mcpServers: {
       "dev.puzzmo.com": {
@@ -227,9 +204,7 @@ const buildPromptStrategyMessage = (userPrompt: string, displayName: string): st
   ].join("\n")
 
 /** Main game create wizard */
-export const gameCreate = async (args: string[]) => {
-  const opts = parseArgs(args)
-
+export const gameCreate = async (opts: CreateOptions) => {
   const require = createRequire(import.meta.url)
   const { version } = require("../../../package.json")
   p.intro(`Puzzmo Game Creator v${version}`)

package/src/commands/login.ts

@@ -1,17 +1,21 @@
 import * as p from "@clack/prompts"
 
-import { writeConfig, readConfig } from "../util/config.js"
+import { defaultSource, addToken, decodeTokenPayload, normalizeSource } from "../util/config.js"
 
-/** Saves a CLI token to ~/.puzzmo/config.json */
-export const login = (token: string) => {
+/** Saves a CLI token to ~/.puzzmo/config.json under the given source server */
+export const login = (token: string, source: string = defaultSource) => {
   if (!token.startsWith("pzt-")) {
     p.log.error("Invalid CLI token. Generate one from dev.puzzmo.com.")
     process.exit(1)
   }
 
-  const config = readConfig()
-  config.token = token
-  writeConfig(config)
+  const payload = decodeTokenPayload(token)
+  if (!payload?.teamID) {
+    p.log.error("Could not decode the team from this token. Make sure you're using a token from dev.puzzmo.com.")
+    process.exit(1)
+  }
 
-  p.log.success("Logged in successfully. Token saved to ~/.puzzmo/config.json")
+  const normalized = normalizeSource(source)
+  addToken(normalized, token)
+  p.log.success(`Logged in to ${normalized} for team ${payload.teamID}. Token saved to ~/.puzzmo/config.json`)
 }

package/src/commands/upload.ts

@@ -5,7 +5,7 @@ import path from "node:path"
 import * as p from "@clack/prompts"
 
 import { GameNotFoundError, uploadFiles } from "../util/api.js"
-import { getAPIURL, getToken } from "../util/config.js"
+import { type TokenEntry, findTokensForTeam, getTokens, resolveServerForTeam, sourceToURL } from "../util/config.js"
 import { createUserGame } from "../util/createGame.js"
 import { discoverGames, type DiscoveredGame } from "../util/discoverGames.js"
 
@@ -16,6 +16,7 @@ type UploadOptions = {
 type GameSuccess = {
   ok: true
   slug: string
+  source: string
   fileCount: number
   totalBytes: number
   versionID: string
@@ -33,8 +34,8 @@ type GameResult = GameSuccess | GameFailure
 /** Uploads game build artifacts to Puzzmo by discovering puzzmo.json files in `dir` */
 export const upload = async (dir: string, options: UploadOptions = {}) => {
   const { verbose = false } = options
-  const token = getToken()
-  if (!token) {
+
+  if (getTokens().length === 0) {
     console.error("Not logged in. Run `puzzmo login <token>` or set PUZZMO_TOKEN.")
     process.exit(1)
   }
@@ -70,10 +71,6 @@ export const upload = async (dir: string, options: UploadOptions = {}) => {
   if (description) console.log(`\nMessage: ${description}`)
   if (repoURL) console.log(`Repo: ${repoURL}`)
 
-  const apiURL = getAPIURL()
-  const defaultURL = "https://api.puzzmo.com"
-  if (apiURL !== defaultURL) console.log(`API: ${apiURL}`)
-
   const results: GameResult[] = []
   for (const err of discoveryErrors) {
     results.push({ ok: false, slug: err.slug ?? path.relative(rootDir, err.puzzmoJsonPath), error: err.errors.join("; ") })
@@ -81,22 +78,40 @@ export const upload = async (dir: string, options: UploadOptions = {}) => {
 
   for (let i = 0; i < games.length; i++) {
     const game = games[i]
-    console.log(`\n[${i + 1}/${games.length}] Uploading ${game.puzzmoFile.game.slug}`)
+    const slug = game.puzzmoFile.game.slug
+    console.log(`\n[${i + 1}/${games.length}] Uploading ${slug}`)
+
+    const teamID = game.puzzmoFile.game.teamID
+    const credential = await resolveServerForTeam(teamID)
+    if (!credential) {
+      const matches = findTokensForTeam(teamID)
+      const message =
+        matches.length === 0
+          ? `No saved token for team ${teamID}. Run \`puzzmo login <token>\` (use \`--source\` if the token is for a non-default server).`
+          : `Token for team ${teamID} is registered against ${matches.map((m) => m.source).join(", ")} but none of those servers are reachable.`
+      console.error(`  ${message}`)
+      results.push({ ok: false, slug, error: message })
+      continue
+    }
+
+    const apiURL = sourceToURL(credential.source)
+    console.log(`  Server: ${credential.source}`)
+
     try {
       let result: GameSuccess
       try {
-        result = await uploadOneGame(game, { token, sha, description, repoURL, verbose, rootDir })
+        result = await uploadOneGame(game, { credential, apiURL, sha, description, repoURL, verbose, rootDir })
       } catch (e) {
         if (!(e instanceof GameNotFoundError)) throw e
-        const created = await maybeCreateMissingGame(e, game, { teamAccessToken: token })
+        const created = await maybeCreateMissingGame(e, game, { apiURL, teamAccessToken: credential.token })
         if (!created) throw e
-        result = await uploadOneGame(game, { token, sha, description, repoURL, verbose, rootDir })
+        result = await uploadOneGame(game, { credential, apiURL, sha, description, repoURL, verbose, rootDir })
       }
       results.push(result)
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e)
       console.error(`  Failed: ${message}`)
-      results.push({ ok: false, slug: game.puzzmoFile.game.slug, error: message })
+      results.push({ ok: false, slug, error: message })
     }
   }
 
@@ -107,7 +122,8 @@ export const upload = async (dir: string, options: UploadOptions = {}) => {
 }
 
 type UploadOneOptions = {
-  token: string
+  credential: TokenEntry
+  apiURL: string
   sha: string
   description: string | null
   repoURL: string | null
@@ -117,7 +133,7 @@ type UploadOneOptions = {
 
 /** Uploads a single discovered game; throws on failure */
 const uploadOneGame = async (game: DiscoveredGame, opts: UploadOneOptions): Promise<GameSuccess> => {
-  const { token, sha, description, repoURL, verbose, rootDir } = opts
+  const { credential, apiURL, sha, description, repoURL, verbose, rootDir } = opts
   const { puzzmoFile, distDir } = game
   const gameSlug = puzzmoFile.game.slug
 
@@ -130,7 +146,8 @@ const uploadOneGame = async (game: DiscoveredGame, opts: UploadOneOptions): Prom
   console.log(`  ${files.length} file(s), ${formatBytes(totalBytes)} total (sha ${sha.slice(0, 8)})`)
 
   const result = await uploadFiles(
-    token,
+    apiURL,
+    credential.token,
     gameSlug,
     sha,
     files,
@@ -146,6 +163,7 @@ const uploadOneGame = async (game: DiscoveredGame, opts: UploadOneOptions): Prom
   return {
     ok: true,
     slug: gameSlug,
+    source: credential.source,
     fileCount: files.length,
     totalBytes,
     versionID: result.versionID,
@@ -159,7 +177,7 @@ const printReport = (results: GameResult[]) => {
   const successes = results.filter((r): r is GameSuccess => r.ok)
   const failures = results.filter((r): r is GameFailure => !r.ok)
   for (const r of successes) {
-    console.log(`  OK   ${r.slug.padEnd(24)} ${formatBytes(r.totalBytes).padStart(8)}  ${r.versionID}`)
+    console.log(`  OK   ${r.slug.padEnd(24)} ${formatBytes(r.totalBytes).padStart(8)}  ${r.source.padEnd(20)} ${r.versionID}`)
   }
   for (const r of failures) {
     console.log(`  FAIL ${r.slug.padEnd(24)} ${r.error}`)
@@ -241,7 +259,7 @@ const hashGames = (games: DiscoveredGame[]): string => {
 const maybeCreateMissingGame = async (
   err: GameNotFoundError,
   game: DiscoveredGame,
-  opts: { teamAccessToken: string },
+  opts: { apiURL: string; teamAccessToken: string },
 ): Promise<boolean> => {
   const slug = err.slug
   const displayName = game.puzzmoFile.game.displayName
@@ -258,7 +276,7 @@ const maybeCreateMissingGame = async (
   if (p.isCancel(consent) || !consent) return false
 
   try {
-    const created = await createUserGame({ displayName, teamAccessToken: opts.teamAccessToken })
+    const created = await createUserGame({ apiURL: opts.apiURL, displayName, teamAccessToken: opts.teamAccessToken })
     console.log(`  Created game ${created.slug} (${created.id})`)
     if (created.slug !== slug) {
       console.warn(`  Server picked slug "${created.slug}" but your puzzmo.json uses "${slug}". Update puzzmo.json before re-uploading.`)