Sync packages from monorepo (8c5fa9b)

Author: github-actions[bot]

packages/cli/src/commands/game/create.ts

@@ -10,7 +10,7 @@ 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"
@@ -62,7 +62,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": {

packages/cli/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`)
 }

packages/cli/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,33 +71,47 @@ 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("; ") })
   }
 
   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.`)

packages/cli/src/index.ts

@@ -11,23 +11,32 @@ const [command, ...args] = process.argv.slice(2)
 
 const printUsage = () => {
   console.log(`Usage:
-  puzzmo login <token>            Save a CLI auth token
-  puzzmo game create [token]      Create a new Puzzmo game project
+  puzzmo login <token> [--source <url>]  Save a CLI auth token. You can have many stored tokens for different teams. 
+                                         --source defaults to https://api.puzzmo.com;
 
-  puzzmo upload [dir] [-v]        Discover puzzmo.json files in [dir] (default: .) and upload each game's build. -v/--verbose prints request URLs and full error bodies. If a game does not exist on your account and stdin is a TTY, you'll be asked whether to create it (using your saved CLI token).
-  puzzmo validate [dir]           Discover and validate every puzzmo.json under [dir] (default: .)
-  puzzmo migrate                  List and select migration skills from dev.puzzmo.com`)
+  puzzmo game create [token]             Create a new Puzzmo game project
+
+  puzzmo upload [dir] [-v]               Discover puzzmo.json files in [dir] (default: .) and upload each game's build.
+  puzzmo validate [dir]                  Discover and validate every puzzmo.json under [dir] (default: .)
+  puzzmo migrate                         List and select migration skills from dev.puzzmo.com`)
 }
 
 const run = async () => {
   switch (command) {
     case "login": {
-      const token = args[0]
+      const sourceIndex = args.findIndex((a) => a === "--source")
+      const source = sourceIndex >= 0 ? args[sourceIndex + 1] : undefined
+      if (sourceIndex >= 0 && !source) {
+        console.error("Usage: puzzmo login <token> [--source <url>]")
+        process.exit(1)
+      }
+      const sourceValueIndex = sourceIndex >= 0 ? sourceIndex + 1 : -1
+      const token = args.find((a, i) => !a.startsWith("-") && i !== sourceValueIndex)
       if (!token) {
-        console.error("Usage: puzzmo login <token>")
+        console.error("Usage: puzzmo login <token> [--source <url>]")
         process.exit(1)
       }
-      login(token)
+      login(token, source)
       break
     }
     case "upload": {

packages/cli/src/util/api.ts

@@ -1,8 +1,6 @@
 import fs from "node:fs"
 import path from "node:path"
 
-import { getAPIURL } from "./config.js"
-
 /** The schema for a puzzmo.json file - mirrors PuzzmoFile from @puzzmo-com/shared/hostAPI */
 export type PuzzmoFile = {
   game: {
@@ -132,6 +130,7 @@ const formatBytes = (bytes: number): string => {
 
 /** Multi-step upload: init -> batched file uploads -> complete */
 export const uploadFiles = async (
+  apiURL: string,
   token: string,
   gameSlug: string,
   sha: string,
@@ -142,7 +141,6 @@ export const uploadFiles = async (
   options: UploadFilesOptions = {},
 ): Promise<CompleteResponse> => {
   const { verbose = false, description, repoURL } = options
-  const apiURL = getAPIURL()
   if (verbose) console.log(`  API URL: ${apiURL}`)
 
   // Step 1: Init session (includes puzzmo.json metadata)