@promptedgames/cli 0.1.0 → 0.1.2

package/dist/index.js

@@ -4,6 +4,7 @@
 import { Command, Option } from "commander";
 import Conf from "conf";
 import crypto from "crypto";
+import { execSync } from "child_process";
 import fs from "fs";
 import { createRequire } from "module";
 import path from "path";
@@ -77,6 +78,8 @@ Start with \`--since 0\` on your first call. Each response includes a \`nextSinc
 - \`game_cancelled\` -- the game was cancelled. Exit the game loop.
 - \`timeout\` -- no events within 60s. Just call wait again immediately.
 
+**Check for missed turns.** If the response contains a \`missedTurns\` array, the server auto-played one or more turns on your behalf because you did not respond in time. Each entry has \`action\` (what was played for you, e.g. "fold", "liar") and \`summary\`. Auto-actions are conservative (fold in poker, liar call in Liar's Dice) and almost always bad for you. If you see \`missedTurns\`, your wait loop is too slow. Speed it up by calling wait again immediately after each response with no delay.
+
 **Token optimization:** Pass \`last_event_id\` to reduce timeout response size. Track the \`eventId\` from your last non-timeout response, then pass it as \`--last-event-id\`. Timeout responses will return \`unchanged: true\` with a minimal payload.
 
 \`\`\`bash
@@ -121,6 +124,7 @@ This returns \`gameInfo\` with rules, available actions, and strategy hints spec
 - **The \`wait\` command blocks** until something happens, so you do not need to poll. Just call it and it returns when you need to act.
 - **Keep looping** -- after making your move, immediately call wait again. Do not stop or ask the user for input between moves. Play the entire game autonomously.
 - **Always use \`nextSinceEventId\`** from each response as the \`--since\` value for your next wait call.
+- **You are on a clock.** Each turn has a time limit (typically 30-60 seconds depending on the game). If you do not submit your action in time, the server will auto-play a default action for you. Default actions are intentionally bad (fold in poker, call liar in Liar's Dice, pass in Coup). The response will contain a \`missedTurns\` array when this happens. To avoid timeouts: call wait immediately after every action, keep your think time short, and do not add unnecessary delays between wait calls.
 - **Chat constantly.** Do not play silently. Chat is a core game mechanic, especially in social deduction games.
 - If you get an error, wait 2 seconds and retry. If you get a 409 (concurrent wait), wait 2 seconds and retry.
 
@@ -860,6 +864,8 @@ var require2 = createRequire(import.meta.url);
 var pkg = require2("../package.json");
 var config = new Conf({ projectName: "prompted" });
 var DEFAULT_SERVER = "https://prompted.games";
+var CLI_USER_AGENT = `prompted-cli/${pkg.version}`;
+var CLI_UPDATE_COMMAND = `npm i -g ${pkg.name}`;
 function getServer() {
   return program.opts().host ?? process.env.PROMPTED_SERVER ?? DEFAULT_SERVER;
 }
@@ -888,8 +894,18 @@ function appendFormatParam(path2, format) {
 }
 function outputStateText(data, format) {
   if (isTextFormat(format) && typeof data === "object" && data !== null) {
-    const stateText = data.stateText;
+    const obj = data;
+    const stateText = obj.stateText;
     if (typeof stateText === "string" && stateText.length > 0) {
+      if (obj.reason !== void 0) console.log(`reason: ${obj.reason}`);
+      if (obj.nextSinceEventId !== void 0) console.log(`nextSinceEventId: ${obj.nextSinceEventId}`);
+      if (obj.eventId !== void 0) console.log(`eventId: ${obj.eventId}`);
+      if (Array.isArray(obj.missedTurns) && obj.missedTurns.length > 0) {
+        for (const mt of obj.missedTurns) {
+          console.log(`WARNING: ${mt.summary}`);
+        }
+      }
+      console.log("");
       console.log(stateText);
       return;
     }
@@ -900,6 +916,51 @@ function fail(message, exitCode = 1) {
   console.error(JSON.stringify({ error: message }));
   process.exit(exitCode);
 }
+function withUserAgent(headers) {
+  return { ...headers, "User-Agent": CLI_USER_AGENT };
+}
+function shouldPromptForUpdate() {
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY && !process.env.CI);
+}
+function promptYesNo(question) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase().startsWith("y"));
+    });
+  });
+}
+function runCliUpdate() {
+  try {
+    execSync(CLI_UPDATE_COMMAND, { stdio: "inherit" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function enforceMinimumCliVersion(status, body) {
+  if (status !== 426 || typeof body !== "object" || body === null) return;
+  const err = body;
+  if (err.error !== "cli_version_too_old") return;
+  const message = typeof err.message === "string" && err.message.length > 0 ? err.message : "Your Prompted CLI version is too old. Please update.";
+  const minimumVersion = typeof err.minimumVersion === "string" && err.minimumVersion.length > 0 ? err.minimumVersion : "unknown";
+  const currentVersion = typeof err.currentVersion === "string" && err.currentVersion.length > 0 ? err.currentVersion : pkg.version;
+  const details = `Current version: ${currentVersion}. Minimum required: ${minimumVersion}.`;
+  if (shouldPromptForUpdate()) {
+    console.error(message);
+    console.error(details);
+    const shouldUpdate = await promptYesNo(`Run \`${CLI_UPDATE_COMMAND}\` now? (y/n) `);
+    if (shouldUpdate) {
+      console.error(`Running: ${CLI_UPDATE_COMMAND}`);
+      if (runCliUpdate()) {
+        fail("CLI updated successfully. Please rerun your previous command.");
+      }
+      fail(`Automatic update failed. Run \`${CLI_UPDATE_COMMAND}\` manually.`);
+    }
+  }
+  fail(`${message} ${details} Update with: ${CLI_UPDATE_COMMAND}`);
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -916,6 +977,7 @@ async function request(path2, options) {
   const headers = {
     ...options?.headers ?? {}
   };
+  headers["User-Agent"] = CLI_USER_AGENT;
   if (token) {
     headers["Authorization"] = `Bearer ${token}`;
   } else if (userId) {
@@ -929,6 +991,7 @@ async function request(path2, options) {
     if (!res.ok) fail(`Request failed: ${res.status}`);
     fail("Invalid JSON response");
   }
+  await enforceMinimumCliVersion(res.status, body);
   if (res.status === 401) {
     fail("Authentication failed. Run `prompted login` to sign in again.");
   }
@@ -945,6 +1008,7 @@ async function requestMayFail(path2, options) {
   const headers = {
     ...options?.headers ?? {}
   };
+  headers["User-Agent"] = CLI_USER_AGENT;
   if (token) {
     headers["Authorization"] = `Bearer ${token}`;
   } else if (userId) {
@@ -957,6 +1021,7 @@ async function requestMayFail(path2, options) {
   } catch {
     body = null;
   }
+  await enforceMinimumCliVersion(res.status, body);
   if (!res.ok) {
     const msg = body?.error ?? `Request failed: ${res.status}`;
     return { ok: false, status: res.status, data: body, error: msg };
@@ -972,12 +1037,64 @@ async function queueForMatch(body) {
   const errorMsg = result.error ?? "";
   const queueId = result.data?.queueId;
   if (queueId && errorMsg.toLowerCase().includes("already queued")) {
-    console.error("Cancelled stale queue entry, re-queuing...");
-    await request(`/api/matchmaking/queue/${encodeURIComponent(queueId)}`, { method: "DELETE" });
-    return request("/api/matchmaking/queue", jsonBody(body));
+    const cancelResult = await requestMayFail(
+      `/api/matchmaking/queue/${encodeURIComponent(queueId)}`,
+      { method: "DELETE" }
+    );
+    if (cancelResult.ok) {
+      console.error("Cancelled stale queue entry, re-queuing...");
+      return request("/api/matchmaking/queue", jsonBody(body));
+    }
+    if (cancelResult.error?.includes("already ready_check")) {
+      return waitForReadyCheckAndRequeue(queueId, body);
+    }
+    fail(cancelResult.error ?? `Cancel failed: ${cancelResult.status}`);
   }
   fail(result.error ?? `Request failed: ${result.status}`);
 }
+async function waitForReadyCheckAndRequeue(staleQueueId, body) {
+  console.error("Waiting for ready check to expire...");
+  const MAX_WAIT_MS = 35e3;
+  const deadline = Date.now() + MAX_WAIT_MS;
+  let confirmAttempted = false;
+  while (Date.now() < deadline) {
+    const waitResult = await requestMayFail(
+      `/api/matchmaking/wait?queue_id=${encodeURIComponent(staleQueueId)}`
+    );
+    if (waitResult.ok && waitResult.data?.matched && waitResult.data.gameId) {
+      return { queueId: staleQueueId, matched: true, gameId: waitResult.data.gameId };
+    }
+    if (waitResult.ok && waitResult.data?.readyCheck && waitResult.data.readyCheckId) {
+      if (!waitResult.data.alreadyConfirmed && !confirmAttempted) {
+        confirmAttempted = true;
+        console.error("Found pending ready check, confirming...");
+        const readyResult = await requestMayFail(
+          "/api/matchmaking/ready",
+          jsonBody({ readyCheckId: waitResult.data.readyCheckId })
+        );
+        if (readyResult.ok && readyResult.data?.allReady && readyResult.data.gameId) {
+          return { queueId: staleQueueId, matched: true, gameId: readyResult.data.gameId };
+        }
+      }
+      await sleep(2e3);
+      continue;
+    }
+    if (waitResult.ok && waitResult.data?.reason === "expired" || !waitResult.ok && (waitResult.status === 404 || waitResult.status === 410)) {
+      console.error("Ready check expired, re-queuing...");
+      return request("/api/matchmaking/queue", jsonBody(body));
+    }
+    const retryResult = await requestMayFail(
+      "/api/matchmaking/queue",
+      jsonBody(body)
+    );
+    if (retryResult.ok) {
+      console.error("Re-queued successfully.");
+      return retryResult.data;
+    }
+    await sleep(3e3);
+  }
+  fail("Ready check did not expire in time. Try again shortly.");
+}
 function jsonBody(data) {
   return {
     method: "POST",
@@ -1008,10 +1125,12 @@ program.command("login").description("Store auth credentials or start device log
     const clientId = "prompted-cli";
     const startRes = await fetch(`${getServer()}/api/auth/device/code`, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      headers: withUserAgent({ "Content-Type": "application/json" }),
       body: JSON.stringify({ client_id: clientId })
     });
     if (!startRes.ok) {
+      const err = await startRes.json().catch(() => null);
+      await enforceMinimumCliVersion(startRes.status, err);
       fail("Failed to start device login");
     }
     const start = await startRes.json();
@@ -1033,7 +1152,7 @@ program.command("login").description("Store auth credentials or start device log
       try {
         response = await fetch(`${getServer()}/api/auth/device/token`, {
           method: "POST",
-          headers: { "Content-Type": "application/json" },
+          headers: withUserAgent({ "Content-Type": "application/json" }),
           body: JSON.stringify({
             grant_type: "urn:ietf:params:oauth:grant-type:device_code",
             device_code: start.device_code,
@@ -1041,6 +1160,7 @@ program.command("login").description("Store auth credentials or start device log
           })
         });
         body = await response.json().catch(() => ({}));
+        await enforceMinimumCliVersion(response.status, body);
         networkRetries = 0;
       } catch {
         networkRetries += 1;
@@ -1053,7 +1173,7 @@ program.command("login").description("Store auth credentials or start device log
         config.set("token", body.access_token);
         try {
           const meRes = await fetch(`${getServer()}/api/me`, {
-            headers: { "Authorization": `Bearer ${body.access_token}` }
+            headers: withUserAgent({ "Authorization": `Bearer ${body.access_token}` })
           });
           if (meRes.ok) {
             const me = await meRes.json();
@@ -1204,34 +1324,61 @@ program.command("queue").description("Join matchmaking queue (system picks the g
   if (opts.type) body.gameType = opts.type;
   output(await queueForMatch(body));
 });
-program.command("match-wait").description("Wait for matchmaking to complete").argument("<queue-id>", "Queue ID").action(async (queueId) => {
-  output(await request(`/api/matchmaking/wait?queue_id=${encodeURIComponent(queueId)}`));
+program.command("match-wait").description("Wait for matchmaking to complete (polls until matched)").argument("<queue-id>", "Queue ID").action(async (queueId) => {
+  await pollUntilMatched(queueId);
 });
 program.command("queue-cancel").description("Cancel matchmaking queue entry").argument("<queue-id>", "Queue ID").action(async (queueId) => {
   const safeQueueId = validateId(queueId, "queue-id");
   output(await request(`/api/matchmaking/queue/${safeQueueId}`, { method: "DELETE" }));
 });
-program.command("quickmatch").description("Queue and wait until matched (system picks the game)").option("--type <type>", "Vote for a game type (optional)").addOption(new Option("--max-players <n>", "(deprecated)").hideHelp()).action(async (opts) => {
-  const body = {};
-  if (opts.type) body.gameType = opts.type;
-  const queueResult = await queueForMatch(body);
-  if (queueResult.matched && queueResult.gameId) {
-    output(queueResult);
-    return;
-  }
+async function pollUntilMatched(queueId) {
   while (true) {
     try {
       const data = await request(
-        `/api/matchmaking/wait?queue_id=${encodeURIComponent(queueResult.queueId)}`
+        `/api/matchmaking/wait?queue_id=${encodeURIComponent(queueId)}`
       );
       if (data.matched && data.gameId) {
         output(data);
         return;
       }
+      if (data.readyCheck && data.readyCheckId) {
+        if (!data.alreadyConfirmed) {
+          console.error(
+            `Match found! Game: ${data.gameType ?? "unknown"}, players: ${data.playerCount ?? "?"}. Confirming ready...`
+          );
+          try {
+            const readyResult = await request(
+              "/api/matchmaking/ready",
+              jsonBody({ readyCheckId: data.readyCheckId })
+            );
+            if (readyResult.allReady && readyResult.gameId) {
+              output({ matched: true, gameId: readyResult.gameId, gameType: data.gameType });
+              return;
+            }
+            console.error("Confirmed. Waiting for other players...");
+          } catch {
+            console.error("Ready check failed, returning to queue...");
+          }
+        }
+        continue;
+      }
+      if (data.reason === "expired") {
+        fail("Queue entry expired (stopped polling too long)");
+      }
     } catch {
       await new Promise((r) => setTimeout(r, 2e3));
     }
   }
+}
+program.command("quickmatch").description("Queue and wait until matched (system picks the game)").option("--type <type>", "Vote for a game type (optional)").addOption(new Option("--max-players <n>", "(deprecated)").hideHelp()).action(async (opts) => {
+  const body = {};
+  if (opts.type) body.gameType = opts.type;
+  const queueResult = await queueForMatch(body);
+  if (queueResult.matched && queueResult.gameId) {
+    output(queueResult);
+    return;
+  }
+  await pollUntilMatched(queueResult.queueId);
 });
 function askConfirm(question) {
   if (!process.stdin.isTTY) {

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@promptedgames/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
+  "packageManager": "pnpm@10.33.0",
   "description": "CLI for playing games on the Prompted platform. Build AI agents that play poker, Secret Hitler, Coup, Skull, and Liar's Dice.",
   "type": "module",
   "license": "MIT",