shipthis 0.1.30 → 0.1.32

package/dist/commands/game/wizard.js

@@ -1,53 +1,79 @@
-import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { Args } from '@oclif/core';
-import { Text, Box, useInput, useFocus, measureElement, render } from 'ink';
-import { p as getAuthedHeaders, q as API_URL, I as castArrayObjectDates, K as queryClient, a8 as updateProject, u as getGodotVersion, t as GameEngine, v as createProject, w as DEFAULT_IGNORED_FILES_GLOBS, x as DEFAULT_SHIPPED_FILES_GLOBS, P as Platform, J as JobStatus, W as WEB_URL, F as getProject, C as CredentialsType, R as getGoogleStatus, B as BaseAuthenticatedCommand, j as isCWDGodotGame } from '../../index-DxzXU9Hd.js';
-import React, { useState, useContext, useEffect, useRef, useReducer } from 'react';
-import { d as CommandContext, b as GameContext, M as Markdown, u as useBuilds, q as queryBuilds, G as GameProvider, f as CreateGooglePlayGame } from '../../index-BTAL7EB_.js';
+import { useScreenSize, withFullScreen } from 'fullscreen-ink';
+import { K as queryClient, p as getAuthedHeaders, o as API_URL, I as castArrayObjectDates, a9 as updateProject, t as getGodotVersion, s as GameEngine, u as createProject, v as DEFAULT_SHIPPED_FILES_GLOBS, w as DEFAULT_IGNORED_FILES_GLOBS, P as Platform, J as JobStatus, W as WEB_URL, E as getProject, C as CredentialsType, Q as getGoogleStatus, B as BaseAuthenticatedCommand, j as isCWDGodotGame } from '../../index-BhhiXbey.js';
+import { Box, Text, useInput } from 'ink';
 import Spinner from 'ink-spinner';
-import { Alert, TextInput } from '@inkjs/ui';
-import axios from 'axios';
-import 'crypto-js';
-import 'uuid';
-import fs__default from 'fs';
-import 'luxon';
-import { useQuery, useMutation } from '@tanstack/react-query';
-import 'yazl';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
+import 'node:crypto';
+import fs__default from 'node:fs';
 import 'node:path';
+import 'node:readline';
 import 'node:url';
+import 'readline-sync';
+import 'luxon';
+import axios from 'axios';
 import 'isomorphic-git';
+import { useMutation, useQuery } from '@tanstack/react-query';
+import React, { useState, useContext, useEffect, useRef } from 'react';
+import 'crypto-js';
+import 'uuid';
 import 'fast-glob';
+import 'yazl';
 import 'socket.io-client';
+import 'string-length';
+import 'strip-ansi';
 import 'open';
+import { C as ConnectGoogle } from '../../index-C03TV1_J.js';
+import { C as CommandContext, G as GameContext, u as useBuilds, M as Markdown, q as queryBuilds, c as GameProvider, f as CreateGooglePlayGame } from '../../index-C66Dd8Xc.js';
+import { TextInput, Alert } from '@inkjs/ui';
 import 'marked';
 import 'marked-terminal';
-import 'path';
 import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
-import { C as CreateKeystore } from '../../Create-1xAdntNl.js';
-import { I as ImportKeystore } from '../../Import-CzC-M4ln.js';
-import { C as ConnectGoogle } from '../../index-OZi8bvu8.js';
-import { C as CreateServiceAccountKey } from '../../index--EbYyBAZ.js';
-import { g as getShortUUID } from '../../index-35Eswf6F.js';
-import { u as useShip, J as JobProgress } from '../../JobProgress-BjNgtIjm.js';
-import { c as cacheKeys, f as fetchKeyTestResult, K as KeyTestStatus, a as KeyTestError } from '../../useAndroidServiceAccountTestResult-CJLIEYmA.js';
-import { J as JobLogTail } from '../../JobLogTail-CZxoMSd5.js';
-import { a as getProjectCredentials } from '../../index-u1aj1OQW.js';
+import { g as getShortUUID } from '../../index-CGBdOm1q.js';
+import { J as JobLogTail } from '../../JobLogTail-0CBLoG8N.js';
+import { c as cacheKeys, f as fetchKeyTestResult, K as KeyTestStatus, a as KeyTestError } from '../../useAndroidServiceAccountTestResult-DZk5SMxI.js';
+import { u as useShip, J as JobProgress } from '../../JobProgress-lKqVT88m.js';
+import { C as CreateServiceAccountKey } from '../../index-CS9Gwcb0.js';
+import { C as CreateKeystore } from '../../Create-3Ob8sjik.js';
+import { I as ImportKeystore } from '../../Import-CFuPDI0K.js';
+import { a as getProjectCredentials } from '../../index-CtTI85m-.js';
 import { T as Title } from '../../Title-BCQtayg6.js';
-import { C as Command } from '../../Command-1p5alCz3.js';
+import { C as Command } from '../../Command-WPpmLPkL.js';
 import '@expo/apple-utils/build/index.js';
-import 'ini';
 import 'deepmerge';
-import '../../RunWithSpinner-BVXNWGD3.js';
-import '../../import-CRMaNBVF.js';
-import '../../useWebSocket-BOCa8v6o.js';
-import '../../useProjectCredentials-DX3e_PPc.js';
-import '../../ProgressSpinner-6pw1T8Iw.js';
-import '../../git-DREGq-jc.js';
+import 'ini';
+import '../../useWebSocket-5PYa2QER.js';
+import '../../git-BpsfNFZ_.js';
+import '../../ProgressSpinner-DGcakQSK.js';
+import '../../useProjectCredentials-BEphqa18.js';
+import '../../RunWithSpinner-gMVA07bZ.js';
+import '../../import-DGvG5REx.js';
+
+const useInviteServiceAccount = () => useMutation({
+  async mutationFn({ developerId, projectId }) {
+    try {
+      const headers = getAuthedHeaders();
+      const { data } = await axios.post(
+        `${API_URL}/projects/${projectId}/credentials/android/key/invite/`,
+        { developerId },
+        {
+          headers
+        }
+      );
+      return data;
+    } catch (error) {
+      console.error("useInviteMutation Error", error);
+      throw error;
+    }
+  },
+  async onSuccess(data) {
+    const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    await sleep(1e3);
+    queryClient.invalidateQueries({
+      queryKey: cacheKeys.androidKeyTestResult({ projectId: data.projectId })
+    });
+  }
+});
 
 async function queryJobs({ projectId, ...pageAndSortParams }) {
   try {
@@ -65,39 +91,30 @@ async function queryJobs({ projectId, ...pageAndSortParams }) {
 }
 const useJobs = (props) => {
   const queryResult = useQuery({
-    queryKey: cacheKeys.jobs(props),
-    queryFn: async () => queryJobs(props)
+    queryFn: async () => queryJobs(props),
+    queryKey: cacheKeys.jobs(props)
   });
   return queryResult;
 };
 
-const useInviteServiceAccount = () => {
-  return useMutation({
-    mutationFn: async ({ projectId, developerId }) => {
-      try {
-        const headers = getAuthedHeaders();
-        const { data } = await axios.post(
-          `${API_URL}/projects/${projectId}/credentials/android/key/invite/`,
-          { developerId },
-          {
-            headers
-          }
-        );
-        return data;
-      } catch (error) {
-        console.error("useInviteMutation Error", error);
-        throw error;
-      }
-    },
-    onSuccess: async (data) => {
-      const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-      await sleep(1e3);
-      queryClient.invalidateQueries({
-        queryKey: cacheKeys.androidKeyTestResult({ projectId: data.projectId })
-      });
-    }
-  });
-};
+const WIDE_BREAKPOINT = 100;
+const TALL_BREAKPOINT = 35;
+function useResponsive() {
+  const { height, width } = useScreenSize();
+  const isWide = width >= WIDE_BREAKPOINT;
+  const isTall = height >= TALL_BREAKPOINT;
+  return {
+    height,
+    isTall,
+    isWide,
+    width
+  };
+}
+
+const FormTextInput = ({ label, labelProps, ...rest }) => /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+  /* @__PURE__ */ jsx(Text, { ...labelProps, children: label }),
+  /* @__PURE__ */ jsx(TextInput, { ...rest })
+] });
 
 const GameInfoForm = ({ gameInfo, onSubmit }) => {
   const [activeInput, setActiveInput] = useState("name");
@@ -114,18 +131,18 @@ const GameInfoForm = ({ gameInfo, onSubmit }) => {
   };
   const handleSubmitPackageName = () => {
     setError(null);
-    const packageRegex = /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/;
+    const packageRegex = /^[A-Za-z]\w*(\.[A-Za-z]\w*)+$/;
     if (!packageRegex.test(`${androidPackageName}`)) {
       setError("Please enter a valid package name e.g. com.flappy.souls");
       return;
     }
     onSubmit({
       ...gameInfo,
-      name,
       details: {
         ...gameInfo.details,
         androidPackageName
-      }
+      },
+      name
     });
   };
   return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -135,23 +152,23 @@ const GameInfoForm = ({ gameInfo, onSubmit }) => {
       /* @__PURE__ */ jsx(
         FormTextInput,
         {
-          label: "Game name:",
-          isDisabled: activeInput !== "name",
           defaultValue: name,
-          placeholder: "Enter the name of your game...",
+          isDisabled: activeInput !== "name",
+          label: "Game name:",
           onChange: setName,
-          onSubmit: handleSubmitName
+          onSubmit: handleSubmitName,
+          placeholder: "Enter the name of your game..."
         }
       ),
       /* @__PURE__ */ jsx(
         FormTextInput,
         {
-          label: "Android package name :",
-          isDisabled: activeInput !== "androidPackageName",
           defaultValue: androidPackageName,
-          placeholder: "e.g. com.flappy.souls",
+          isDisabled: activeInput !== "androidPackageName",
+          label: "Android package name :",
           onChange: setAndroidPackageName,
-          onSubmit: handleSubmitPackageName
+          onSubmit: handleSubmitPackageName,
+          placeholder: "e.g. com.flappy.souls"
         }
       )
     ] })
@@ -161,11 +178,11 @@ const GameInfoForm = ({ gameInfo, onSubmit }) => {
 const getGameInfo = (flagValues, project) => {
   const androidPackageName = flagValues.androidPackageName || project?.details?.androidPackageName || "";
   const gameInfo = {
-    name: project?.name || flagValues.name || "",
     details: {
       ...project?.details,
       androidPackageName
-    }
+    },
+    name: project?.name || flagValues.name || ""
   };
   return gameInfo;
 };
@@ -174,11 +191,11 @@ const CreateGame = (props) => {
   const [gameInfo, setGameInfo] = useState(null);
   const [showForm, setShowForm] = useState(false);
   const { command } = useContext(CommandContext);
-  const { setGameId, game } = useContext(GameContext);
+  const { game, setGameId } = useContext(GameContext);
   const handleLoad = async () => {
     if (!command) throw new Error("No command");
     const flags = command.getDetailsFlagsValues();
-    const config = await command.getProjectConfigSafe();
+    const config = command.getProjectConfigSafe();
     setShowForm(true);
     setIsLoading(false);
     const info = getGameInfo(flags, config.project);
@@ -192,7 +209,7 @@ const CreateGame = (props) => {
       setShowForm(false);
       setIsLoading(true);
       if (!command) throw new Error("No command");
-      const projectConfig = await command.getProjectConfigSafe();
+      const projectConfig = command.getProjectConfigSafe();
       const existingGame = projectConfig.project;
       const isNew = !existingGame;
       if (!isNew) {
@@ -204,142 +221,40 @@ const CreateGame = (props) => {
         await command.setProjectConfig(updatedConfig);
         return props.onComplete();
       }
-      const { name, details } = gameInfo2;
+      const { details, name } = gameInfo2;
       const projectDetails = {
         ...details,
         gameEngine: GameEngine.GODOT,
         gameEngineVersion: getGodotVersion()
       };
-      const project = await createProject({ name, details: projectDetails });
+      const project = await createProject({ details: projectDetails, name });
       await command.setProjectConfig({
+        ignoredFilesGlobs: DEFAULT_IGNORED_FILES_GLOBS,
         project,
-        shippedFilesGlobs: DEFAULT_SHIPPED_FILES_GLOBS,
-        ignoredFilesGlobs: DEFAULT_IGNORED_FILES_GLOBS
+        shippedFilesGlobs: DEFAULT_SHIPPED_FILES_GLOBS
       });
       setGameId(project.id);
       props.onComplete();
-    } catch (e) {
-      props.onError(e);
+    } catch (error) {
+      props.onError(error);
     }
   };
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, borderStyle: "single", margin: 1, children: [
+  return /* @__PURE__ */ jsxs(Box, { borderStyle: "single", flexDirection: "column", gap: 1, margin: 1, children: [
     isLoading && /* @__PURE__ */ jsx(Spinner, {}),
     showForm && gameInfo && /* @__PURE__ */ jsx(GameInfoForm, { gameInfo, onSubmit: handleSubmitForm })
   ] });
 };
 
-const FormTextInput = ({ label, labelProps, ...rest }) => /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
-  /* @__PURE__ */ jsx(Text, { ...labelProps, children: label }),
-  /* @__PURE__ */ jsx(TextInput, { ...rest })
-] });
-
-const ImportForm = ({ importKeystoreProps, onSubmit }) => {
-  const [activeInput, setActiveInput] = useState("jksFilePath" /* jksFilePath */);
-  const [error, setError] = useState(null);
-  const [jksFilePath, setJksFilePath] = useState(importKeystoreProps.jksFilePath);
-  const [password, setPassword] = useState(importKeystoreProps.keyPassword);
-  const handleSubmitJksFilePath = () => {
-    setError(null);
-    if (!jksFilePath || jksFilePath.length === 0) {
-      setError("Please enter a path to your jks file");
-      return;
-    }
-    if (!fs__default.existsSync(jksFilePath)) {
-      setError("The file does not exist");
-      return;
-    }
-    setActiveInput("password" /* password */);
-  };
-  const handleSubmitPassword = () => {
-    setError(null);
-    if (!password || password.length === 0) {
-      setError("Please enter a password");
-      return;
-    }
-    onSubmit({
-      ...importKeystoreProps,
-      jksFilePath,
-      keyPassword: password,
-      keystorePassword: password
-    });
-  };
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    error && /* @__PURE__ */ jsx(Alert, { variant: "error", children: error }),
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [
-      /* @__PURE__ */ jsx(
-        FormTextInput,
-        {
-          label: "Path to your jks file:",
-          isDisabled: activeInput !== "jksFilePath" /* jksFilePath */,
-          defaultValue: jksFilePath,
-          placeholder: "Enter the path to your jks file...",
-          onChange: setJksFilePath,
-          onSubmit: handleSubmitJksFilePath
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        FormTextInput,
-        {
-          label: "Password:",
-          isDisabled: activeInput !== "password" /* password */,
-          defaultValue: password,
-          placeholder: "Enter the password for your jks file...",
-          onChange: setPassword,
-          onSubmit: handleSubmitPassword
-        }
-      )
-    ] })
-  ] });
-};
-
-const CreateOrImport = ({ onComplete, onError, ...boxProps }) => {
-  const [stage, setStage] = useState(0 /* Choose */);
-  const [importKeystoreProps, setImportKeystoreProps] = useState({
-    jksFilePath: "",
-    keyPassword: "",
-    keystorePassword: ""
-  });
-  useInput(async (input) => {
-    if (stage !== 0 /* Choose */) return;
-    if (input === "c") return setStage(1 /* Create */);
-    if (input === "i") return setStage(2 /* ImportForm */);
-  });
-  const handleImportFormSubmit = (newImportProps) => {
-    setImportKeystoreProps(newImportProps);
-    setStage(3 /* ImportKeystore */);
-  };
-  const renderStage = () => {
-    switch (stage) {
-      case 0 /* Choose */:
-        return /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(Text, { children: "Would you like to create a new keystore or import an existing one?" }),
-          /* @__PURE__ */ jsx(Text, { bold: true, children: "Press C to create a new keystore" }),
-          /* @__PURE__ */ jsx(Text, { bold: true, children: "Press I to import an existing keystore" })
-        ] });
-      case 1 /* Create */:
-        return /* @__PURE__ */ jsx(CreateKeystore, { onComplete, onError });
-      case 2 /* ImportForm */:
-        return /* @__PURE__ */ jsx(ImportForm, { onSubmit: handleImportFormSubmit, importKeystoreProps });
-      case 3 /* ImportKeystore */:
-        return /* @__PURE__ */ jsx(ImportKeystore, { onComplete, onError, importKeystoreProps });
-    }
-  };
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
-    /* @__PURE__ */ jsx(Markdown, { filename: "create-or-import-keystore.md", templateVars: {} }),
-    renderStage()
-  ] });
-};
-
 const CreateInitialBuild = (props) => {
   const { gameId } = useContext(GameContext);
   return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(CreateForGame, { gameId, ...props }) });
 };
-const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
+const CreateForGame = ({ gameId, onComplete, onError, ...boxProps }) => {
   const { command } = useContext(CommandContext);
-  const { data: buildData, isLoading: isLoadingBuilds } = useBuilds({ projectId: gameId, pageNumber: 0 });
+  const { data: buildData, isLoading: isLoadingBuilds } = useBuilds({ pageNumber: 0, projectId: gameId });
   const { data: jobData, isLoading: isLoadingJobs } = useJobs({
-    projectId: gameId,
-    pageNumber: 0
+    pageNumber: 0,
+    projectId: gameId
   });
   const prevHasBuild = useRef(false);
   const shipMutation = useShip();
@@ -360,7 +275,11 @@ const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
     if (shouldRun)
       shipMutation.mutateAsync({
         command,
-        log: setShipLog
+        log: setShipLog,
+        shipFlags: {
+          platform: "android",
+          skipPublish: true
+        }
       }).catch(onError);
   }, [buildData, jobData, command]);
   const androidJob = jobData?.data.find(
@@ -388,7 +307,7 @@ const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
           }
         }
       ),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(JobLogTail, { jobId: failedJob.id, projectId: gameId, isWatching: false, length: 10 }) })
+      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(JobLogTail, { isWatching: false, jobId: failedJob.id, length: 10, projectId: gameId }) })
     ] })
   ] }) });
 };
@@ -409,12 +328,12 @@ const InviteForm = ({ onSubmit }) => {
     /* @__PURE__ */ jsx(
       FormTextInput,
       {
+        defaultValue: accountId,
         label: "Please enter your Google Play Account ID:",
         labelProps: { bold: true },
-        defaultValue: accountId,
-        placeholder: "e.g. 8110853839480950872",
         onChange: setAccountId,
-        onSubmit: handleSubmitAccountId
+        onSubmit: handleSubmitAccountId,
+        placeholder: "e.g. 8110853839480950872"
       }
     ),
     error && /* @__PURE__ */ jsx(Alert, { variant: "error", children: error })
@@ -427,7 +346,7 @@ const InviteServiceAccount = ({ onComplete, onError, ...boxProps }) => {
   const handleSubmit = async (developerId) => {
     try {
       if (!gameId) return;
-      await inviteMutation.mutateAsync({ projectId: gameId, developerId });
+      await inviteMutation.mutateAsync({ developerId, projectId: gameId });
       onComplete();
     } catch (error) {
       onError(error);
@@ -445,11 +364,112 @@ const InviteServiceAccount = ({ onComplete, onError, ...boxProps }) => {
   ] }) });
 };
 
+const ImportForm = ({ importKeystoreProps, onSubmit }) => {
+  const [activeInput, setActiveInput] = useState("jksFilePath" /* jksFilePath */);
+  const [error, setError] = useState(null);
+  const [jksFilePath, setJksFilePath] = useState(importKeystoreProps.jksFilePath);
+  const [password, setPassword] = useState(importKeystoreProps.keyPassword);
+  const handleSubmitJksFilePath = () => {
+    setError(null);
+    if (!jksFilePath || jksFilePath.length === 0) {
+      setError("Please enter a path to your jks file");
+      return;
+    }
+    if (!fs__default.existsSync(jksFilePath)) {
+      setError("The file does not exist");
+      return;
+    }
+    setActiveInput("password" /* password */);
+  };
+  const handleSubmitPassword = () => {
+    setError(null);
+    if (!password || password.length === 0) {
+      setError("Please enter a password");
+      return;
+    }
+    onSubmit({
+      ...importKeystoreProps,
+      jksFilePath,
+      keyPassword: password,
+      keystorePassword: password
+    });
+  };
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    error && /* @__PURE__ */ jsx(Alert, { variant: "error", children: error }),
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [
+      /* @__PURE__ */ jsx(
+        FormTextInput,
+        {
+          defaultValue: jksFilePath,
+          isDisabled: activeInput !== "jksFilePath" /* jksFilePath */,
+          label: "Path to your jks file:",
+          onChange: setJksFilePath,
+          onSubmit: handleSubmitJksFilePath,
+          placeholder: "Enter the path to your jks file..."
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        FormTextInput,
+        {
+          defaultValue: password,
+          isDisabled: activeInput !== "password" /* password */,
+          label: "Password:",
+          onChange: setPassword,
+          onSubmit: handleSubmitPassword,
+          placeholder: "Enter the password for your jks file..."
+        }
+      )
+    ] })
+  ] });
+};
+
+const CreateOrImport = ({ onComplete, onError, ...boxProps }) => {
+  const [stage, setStage] = useState(0 /* Choose */);
+  const [importKeystoreProps, setImportKeystoreProps] = useState({
+    jksFilePath: "",
+    keyPassword: "",
+    keystorePassword: ""
+  });
+  useInput(async (input) => {
+    if (stage !== 0 /* Choose */) return;
+    if (input === "c") return setStage(1 /* Create */);
+    if (input === "i") return setStage(2 /* ImportForm */);
+  });
+  const handleImportFormSubmit = (newImportProps) => {
+    setImportKeystoreProps(newImportProps);
+    setStage(3 /* ImportKeystore */);
+  };
+  const renderStage = () => {
+    switch (stage) {
+      case 0 /* Choose */: {
+        return /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Text, { children: "Would you like to create a new keystore or import an existing one?" }),
+          /* @__PURE__ */ jsx(Text, { bold: true, children: "Press C to create a new keystore" }),
+          /* @__PURE__ */ jsx(Text, { bold: true, children: "Press I to import an existing keystore" })
+        ] });
+      }
+      case 1 /* Create */: {
+        return /* @__PURE__ */ jsx(CreateKeystore, { onComplete, onError });
+      }
+      case 2 /* ImportForm */: {
+        return /* @__PURE__ */ jsx(ImportForm, { importKeystoreProps, onSubmit: handleImportFormSubmit });
+      }
+      case 3 /* ImportKeystore */: {
+        return /* @__PURE__ */ jsx(ImportKeystore, { importKeystoreProps, onComplete, onError });
+      }
+    }
+  };
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
+    /* @__PURE__ */ jsx(Markdown, { filename: "create-or-import-keystore.md", templateVars: {} }),
+    renderStage()
+  ] });
+};
+
 var StepStatus = /* @__PURE__ */ ((StepStatus2) => {
+  StepStatus2["FAILURE"] = "FAILURE";
   StepStatus2["PENDING"] = "PENDING";
   StepStatus2["RUNNING"] = "RUNNING";
   StepStatus2["SUCCESS"] = "SUCCESS";
-  StepStatus2["FAILURE"] = "FAILURE";
   StepStatus2["WARN"] = "WARN";
   return StepStatus2;
 })(StepStatus || {});
@@ -474,20 +494,20 @@ const getStepInitialStatus = (step, statusFlags) => {
   }
   const base = {
     createGame: statusFlags.hasGameName && statusFlags.hasAndroidPackageName,
+    createGooglePlayGame: statusFlags.hasGooglePlayGame,
     createKeystore: statusFlags.hasAndroidKeystore,
     createServiceAccount: statusFlags.hasServiceAccountKey,
-    createGooglePlayGame: statusFlags.hasGooglePlayGame,
     inviteServiceAccount: statusFlags.hasInvitedServiceAccount
   };
   return base[step] ? "SUCCESS" /* SUCCESS */ : "PENDING" /* PENDING */;
 };
 const getStatusFlags = async (cmd) => {
-  const projectConfig = await cmd.getProjectConfigSafe();
+  const projectConfig = cmd.getProjectConfigSafe();
   const projectId = projectConfig.project?.id;
-  const project = !!projectId && await getProject(projectId);
-  const hasShipThisProject = !!project;
-  const hasGameName = project && !!project?.name;
-  const hasAndroidPackageName = project && !!project?.details?.androidPackageName;
+  const project = Boolean(projectId) && await getProject(projectId);
+  const hasShipThisProject = Boolean(project);
+  const hasGameName = project && Boolean(project?.name);
+  const hasAndroidPackageName = project && Boolean(project?.details?.androidPackageName);
   const projectCredentials = hasShipThisProject ? await getProjectCredentials(project.id) : [];
   const hasAndroidKeystore = projectCredentials.some(
     (cred) => cred.isActive && cred.platform === Platform.ANDROID && cred.type == CredentialsType.CERTIFICATE
@@ -497,35 +517,37 @@ const getStatusFlags = async (cmd) => {
   const hasServiceAccountKey = projectCredentials.some(
     (cred) => cred.isActive && cred.platform == Platform.ANDROID && cred.type == CredentialsType.KEY
   );
-  const buildsResponse = !!projectId && hasShipThisProject && await queryBuilds({ projectId, pageNumber: 0 });
-  const hasInitialBuild = !!buildsResponse && buildsResponse.data.some((build) => build.platform === Platform.ANDROID);
+  const buildsResponse = Boolean(projectId) && hasShipThisProject && await queryBuilds({ pageNumber: 0, projectId });
+  const hasInitialBuild = Boolean(buildsResponse) && buildsResponse.data.some((build) => build.platform === Platform.ANDROID);
   const testResult = projectId ? await fetchKeyTestResult({ projectId }) : null;
   const hasGooglePlayGame = testResult && testResult?.status === KeyTestStatus.SUCCESS || testResult?.status === KeyTestStatus.ERROR && testResult?.error === KeyTestError.NOT_INVITED;
   const hasInvitedServiceAccount = testResult ? testResult?.status === KeyTestStatus.SUCCESS : false;
   return {
-    hasShipThisProject,
-    hasGameName,
-    hasAndroidPackageName,
     hasAndroidKeystore,
+    hasAndroidPackageName,
+    hasGameName,
     hasGoogleConnection,
-    hasServiceAccountKey,
-    hasInitialBuild,
     hasGooglePlayGame,
-    hasInvitedServiceAccount
+    hasInitialBuild,
+    hasInvitedServiceAccount,
+    hasServiceAccountKey,
+    hasShipThisProject
   };
 };
 
 const StepLabels = {
+  connectGoogle: "Connect ShipThis with Google",
   createGame: "Create game in ShipThis",
+  createGooglePlayGame: "Create the game in Google Play",
+  createInitialBuild: "Create an initial build",
   createKeystore: "Create or import an Android Keystore",
-  connectGoogle: "Connect ShipThis with Google",
   createServiceAccount: "Create a Service Account & API Key",
-  createInitialBuild: "Create an initial build",
-  createGooglePlayGame: "Create the game in Google Play",
   inviteServiceAccount: "Invite the Service Account"
 };
-const StepWithStatus = ({ position, title, status }) => {
+const StepWithStatus = ({ position, status, title }) => {
   const indicator = {
+    [StepStatus.FAILURE]: "\u274C",
+    // this is 2 wide?
     [StepStatus.PENDING]: "  ",
     // double space
     [StepStatus.RUNNING]: /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -534,8 +556,6 @@ const StepWithStatus = ({ position, title, status }) => {
     ] }),
     [StepStatus.SUCCESS]: "\u2705",
     // this is 2 wide?
-    [StepStatus.FAILURE]: "\u274C",
-    // this is 2 wide?
     [StepStatus.WARN]: "\u26A0\uFE0F "
     // double
   }[status];
@@ -548,37 +568,47 @@ const StepWithStatus = ({ position, title, status }) => {
     title
   ] });
 };
-const StepStatusTable = ({ stepStatuses }) => {
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginLeft: 1, children: Steps.map((step, index) => {
-    return /* @__PURE__ */ jsx(StepWithStatus, { position: index + 1, title: StepLabels[step], status: stepStatuses[index] }, step);
-  }) });
+const StepStatusTable = ({ stepStatuses }) => /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginLeft: 1, children: Steps.map((step, index) => /* @__PURE__ */ jsx(StepWithStatus, { position: index + 1, status: stepStatuses[index], title: StepLabels[step] }, step)) });
+
+const WizardHeader = ({ currentStepIndex, stepStatuses }) => {
+  const { isTall } = useResponsive();
+  const stepCount = stepStatuses ? stepStatuses.length : 0;
+  const currentStep = currentStepIndex === null ? null : currentStepIndex + 1;
+  const title = isTall ? "ShipThis Android Wizard" : `ShipThis Android Wizard (step ${currentStep} of ${stepCount})`;
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsx(Title, { children: title }) }),
+    stepStatuses && isTall && /* @__PURE__ */ jsx(StepStatusTable, { stepStatuses })
+  ] });
 };
 
 const stepComponentMap = {
+  connectGoogle: ConnectGoogle,
   createGame: CreateGame,
+  createGooglePlayGame: CreateGooglePlayGame,
+  createInitialBuild: CreateInitialBuild,
   createKeystore: CreateOrImport,
-  connectGoogle: ConnectGoogle,
   createServiceAccount: CreateServiceAccountKey,
-  createInitialBuild: CreateInitialBuild,
-  createGooglePlayGame: CreateGooglePlayGame,
   inviteServiceAccount: InviteServiceAccount
 };
 const ON_COMPLETE_DELAY_MS = 500;
 const AndroidWizard = (props) => {
   const { command } = React.useContext(CommandContext);
+  const { isTall, isWide } = useResponsive();
   const [currentStep, setCurrentStep] = useState(null);
+  const [currentStepIndex, setCurrentStepIndex] = useState(null);
   const [stepStatuses, setStepStatuses] = useState(null);
   const [showSuccess, setShowSuccess] = useState(false);
   const determineStep = async () => {
     if (!command) return;
     const statusFlags = await getStatusFlags(command);
     const initStatuses = Steps.map((step) => getStepInitialStatus(step, statusFlags));
-    const firstPending = initStatuses.findIndex((status) => status === StepStatus.PENDING);
+    const firstPending = initStatuses.indexOf(StepStatus.PENDING);
     const pendingStep = firstPending === -1 ? null : Steps[firstPending];
     const withPending = initStatuses.map((status, index) => {
       if (index === firstPending) return StepStatus.RUNNING;
       return status;
     });
+    setCurrentStepIndex(firstPending);
     setCurrentStep(pendingStep);
     setStepStatuses(withPending);
     const isAllDone = firstPending === -1;
@@ -591,97 +621,31 @@ const AndroidWizard = (props) => {
   const handleStepComplete = () => determineStep().catch(props.onError);
   const StepInterface = currentStep ? stepComponentMap[currentStep] : null;
   const templateVars = {
-    iosSetupURL: new URL("/docs/ios", WEB_URL).toString(),
-    docsURL: new URL("/docs", WEB_URL).toString()
+    docsURL: new URL("/docs", WEB_URL).toString(),
+    iosSetupURL: new URL("/docs/ios", WEB_URL).toString()
   };
-  return /* @__PURE__ */ jsx(GameProvider, { children: /* @__PURE__ */ jsxs(ScrollArea, { height: process.stdout.rows || 24, children: [
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsx(Title, { children: "ShipThis Android Wizard" }) }),
-      stepStatuses && /* @__PURE__ */ jsx(StepStatusTable, { stepStatuses })
-    ] }),
+  return /* @__PURE__ */ jsxs(GameProvider, { children: [
+    /* @__PURE__ */ jsx(WizardHeader, { currentStepIndex, stepStatuses }),
     StepInterface && /* @__PURE__ */ jsx(
       StepInterface,
       {
+        borderStyle: isTall && isWide ? "single" : void 0,
+        margin: isTall && isWide ? 1 : 0,
         onComplete: handleStepComplete,
         onError: props.onError,
-        margin: 1,
-        borderStyle: "single",
-        padding: 1
+        padding: isTall && isWide ? 1 : 0
       }
     ),
     showSuccess && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Markdown, { filename: "android-success.md", templateVars }) })
-  ] }) });
-};
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case "SET_INNER_HEIGHT":
-      return {
-        ...state,
-        innerHeight: action.innerHeight
-      };
-    case "SET_HEIGHT":
-      return {
-        ...state,
-        height: action.height
-      };
-    case "SCROLL_DOWN":
-      return {
-        ...state,
-        scrollTop: Math.min(
-          state.innerHeight <= state.height ? 0 : state.innerHeight - state.height,
-          state.scrollTop + 1
-        )
-      };
-    case "SCROLL_UP":
-      return {
-        ...state,
-        scrollTop: Math.max(0, state.scrollTop - 1)
-      };
-    default:
-      return state;
-  }
+  ] });
 };
-function ScrollArea({ height, children }) {
-  useFocus();
-  const [state, dispatch] = useReducer(reducer, {
-    height,
-    scrollTop: 0,
-    innerHeight: 0
-  });
-  const innerRef = useRef(null);
-  useEffect(() => {
-    dispatch({ type: "SET_HEIGHT", height });
-  }, [height]);
-  useEffect(() => {
-    if (!innerRef.current) return;
-    const dimensions = measureElement(innerRef.current);
-    dispatch({
-      type: "SET_INNER_HEIGHT",
-      innerHeight: dimensions.height
-    });
-  }, []);
-  useInput((_input, key) => {
-    if (key.downArrow) {
-      dispatch({
-        type: "SCROLL_DOWN"
-      });
-    }
-    if (key.upArrow) {
-      dispatch({
-        type: "SCROLL_UP"
-      });
-    }
-  });
-  return /* @__PURE__ */ jsx(Box, { height, flexDirection: "column", flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ jsx(Box, { ref: innerRef, flexShrink: 0, flexDirection: "column", marginTop: -state.scrollTop, children }) });
-}
 
 class GameWizard extends BaseAuthenticatedCommand {
   static args = {
     platform: Args.string({
       description: 'The platform to run the wizard for. This can be "android" or "ios"',
-      required: true,
-      options: ["android", "ios"]
+      options: ["android", "ios"],
+      required: true
     })
   };
   static description = "Runs all the steps for the specific platform";
@@ -695,9 +659,9 @@ class GameWizard extends BaseAuthenticatedCommand {
     if (args.platform === "ios") {
       return this.config.runCommand("game:ios:wizard");
     }
-    render(
+    withFullScreen(
       /* @__PURE__ */ jsx(Command, { command: this, children: /* @__PURE__ */ jsx(AndroidWizard, { onComplete: () => process.exit(0), onError: (e) => this.error(e) }) })
-    );
+    ).start();
   }
 }