@myvillage/cli 1.64.3 → 1.64.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.64.3",
+  "version": "1.64.6",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/commands/deploy.js

@@ -7,7 +7,7 @@ import axios from 'axios';
 import inquirer from 'inquirer';
 import { villageSpinner, brand } from '../utils/brand.js';
 import { isAuthenticated } from '../utils/auth.js';
-import { deployGame, getGameUploadUrl, confirmGameUpload, submitGameForReview } from '../utils/api.js';
+import { deployGame, getGameUploadUrl, confirmGameUpload, submitGameForReview, getGameDetail, updateGameMetadata } from '../utils/api.js';
 import { preflightBundles } from '../utils/preflight.js';
 import { selectGameVillages } from '../utils/village-resolver.js';
 
@@ -77,6 +77,52 @@ async function gatherVillages(existingIds = []) {
   return villageIds;
 }
 
+// If the target game is currently PUBLISHED, a redeploy takes it offline and
+// sends the new build back through admin review. Confirm with the developer and
+// move it to DRAFT first. Returns true to proceed with the deploy, false to abort.
+async function confirmRedeployIfPublished(gameId) {
+  if (!gameId) return true; // brand-new game — nothing live to disturb
+
+  let game;
+  try {
+    const result = await getGameDetail(gameId);
+    game = result.game;
+  } catch {
+    return true; // can't determine status — let the deploy proceed and surface real errors
+  }
+
+  if (!game || game.status !== 'PUBLISHED') return true;
+
+  console.log();
+  console.log(chalk.yellow(`  ! "${game.title}" is currently PUBLISHED (live).`));
+  console.log(brand.teal('    Redeploying takes it offline and sends the new build back through'));
+  console.log(brand.teal('    admin review before it can go live again.'));
+  console.log();
+
+  const { confirm } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'confirm',
+    message: 'Take the live game offline and redeploy?',
+    default: false,
+  }]);
+
+  if (!confirm) {
+    console.log(brand.teal('\n  Deploy cancelled — game is still live.\n'));
+    return false;
+  }
+
+  const spinner = villageSpinner('Taking game offline (returning to draft)...').start();
+  try {
+    await updateGameMetadata(gameId, { status: 'DRAFT' });
+    spinner.succeed('Game returned to draft.');
+    return true;
+  } catch (err) {
+    const message = err.response?.data?.error || err.message;
+    spinner.fail(`Could not unpublish: ${message}`);
+    return false;
+  }
+}
+
 // Recursively collect file paths from a directory
 function collectFilePaths(dir) {
   const paths = [];
@@ -151,6 +197,9 @@ async function autoSubmitForReview(gameId, deployResult) {
 // ── Three.js deploy (existing flow) ──
 
 async function deployThreeJsGame(projectDir, pkg) {
+  // If this game is already live, confirm + unpublish before we rebuild/upload.
+  if (!(await confirmRedeployIfPublished(pkg.myvillage.gameId))) return;
+
   // Village visibility is part of the submission — gather it up front (before
   // the build) so it travels in the deploy metadata.
   const villageIds = await gatherVillages(pkg.myvillage.villages || []);
@@ -196,7 +245,10 @@ async function deployThreeJsGame(projectDir, pkg) {
     formData.append('metadata', JSON.stringify(metadata));
 
     for (const fullPath of filePaths) {
-      const relPath = relative(distDir, fullPath);
+      // Force POSIX separators: path.relative() returns backslashes on Windows,
+      // which would land in the S3 key (e.g. assets\foo.js) and 404 when the
+      // browser requests assets/foo.js — a blank game. (Server normalizes too.)
+      const relPath = relative(distDir, fullPath).replace(/\\/g, '/');
       const fileBuffer = readFileSync(fullPath);
       const blob = new Blob([fileBuffer], { type: getContentType(relPath) });
       formData.append('files', blob, relPath);
@@ -213,10 +265,22 @@ async function deployThreeJsGame(projectDir, pkg) {
 
     const finalGameId = result.gameId || pkg.myvillage.gameId;
 
-    spinner.text = 'Submitting for review...';
+    spinner.succeed('Upload complete!');
+
+    saveVillages(projectDir, false, villageIds);
+
+    // Attach cover art before the final submit step. The deploy already moved the
+    // game to SUBMITTED; the platform lets the owner upload assets while a game is
+    // DRAFT/REJECTED/SUBMITTED (only APPROVED/PUBLISHED lock it), so this works
+    // for non-admin developers too — not just admins.
+    if (finalGameId) {
+      await submitCoverArt(finalGameId, projectDir, pkg.myvillage);
+    }
+
+    // Safety net: promote to SUBMITTED if the deploy left the game in DRAFT.
+    // (A normal deploy already submits, so this is usually a no-op.)
     const finalStatus = await autoSubmitForReview(finalGameId, result);
 
-    spinner.succeed('Deployment complete!');
     console.log();
     if (finalStatus === 'SUBMITTED') {
       console.log(brand.green(`  \u2713 Game "${metadata.title}" submitted for review`));
@@ -227,13 +291,6 @@ async function deployThreeJsGame(projectDir, pkg) {
     if (result.slug) console.log(brand.teal(`  Slug:    ${result.slug}`));
     if (result.gameId) console.log(brand.teal(`  Game ID: ${result.gameId}`));
 
-    saveVillages(projectDir, false, villageIds);
-
-    // Cover art is part of the submission: ship declared assets, require a thumbnail.
-    if (finalGameId) {
-      await submitCoverArt(finalGameId, projectDir, pkg.myvillage);
-    }
-
     console.log();
     console.log(brand.teal('  Run "myvillage status" to check the review status.'));
     console.log();
@@ -299,6 +356,9 @@ async function deployUnityGame(projectDir, mvConfig, options) {
 
   console.log(brand.teal(`  Deploying ${platformsToDeploy.length} platform(s): ${platformsToDeploy.join(', ')}`));
 
+  // If this game is already live, confirm + unpublish before we upload new builds.
+  if (!(await confirmRedeployIfPublished(mvConfig.gameId))) return;
+
   // Village visibility is part of the submission — gather once for the whole
   // multi-platform deploy and thread it into every platform's metadata.
   const villageIds = await gatherVillages(mvConfig.villages || []);
@@ -308,23 +368,39 @@ async function deployUnityGame(projectDir, mvConfig, options) {
   // Track final outcome across all platforms.
   let finalGameId = mvConfig.gameId || null;
   let finalSlug = null;
-  let finalStatus = null;
   let finalTitle = null;
+  let deployResultForSubmit = null;
 
   for (const platform of platformsToDeploy) {
     const outcome = await deployUnityPlatform(projectDir, mvConfig, platform, { gameIdOverride: finalGameId, villageIds });
     if (!outcome.ok) return; // bail on first platform failure; nothing else makes sense to ship
     finalGameId = outcome.gameId || finalGameId;
     finalSlug = outcome.slug || finalSlug;
-    finalStatus = outcome.status || finalStatus;
     finalTitle = outcome.title || finalTitle;
+    deployResultForSubmit = outcome.deployResult || deployResultForSubmit;
     // Reload mvConfig in case the first deploy stamped a new gameId into myvillage.json
     if (outcome.gameId && !mvConfig.gameId) {
       mvConfig.gameId = outcome.gameId;
     }
   }
 
-  // Single combined summary + one image prompt for the whole multi-platform deploy.
+  saveVillages(projectDir, true, villageIds);
+
+  // Attach cover art before the final submit step. The deploy already moved the
+  // game to SUBMITTED; the platform lets the owner upload assets while a game is
+  // DRAFT/REJECTED/SUBMITTED (only APPROVED/PUBLISHED lock it). Submit is kept
+  // out of the per-platform loop so it runs once, after every platform is up.
+  if (finalGameId) {
+    await submitCoverArt(finalGameId, projectDir, mvConfig);
+  }
+
+  // Safety net: promote to SUBMITTED if a platform deploy left it in DRAFT.
+  const finalStatus = await autoSubmitForReview(
+    finalGameId,
+    deployResultForSubmit || { status: 'DRAFT' },
+  );
+
+  // Single combined summary for the whole multi-platform deploy.
   console.log();
   console.log(brand.green(`  \u2713 Game "${finalTitle}" deployed across ${platformsToDeploy.length} platform(s)`));
   console.log(`  Status:    ${formatStatus(finalStatus)}`);
@@ -332,21 +408,15 @@ async function deployUnityGame(projectDir, mvConfig, options) {
   if (finalSlug) console.log(brand.teal(`  Slug:      ${finalSlug}`));
   if (finalGameId) console.log(brand.teal(`  Game ID:   ${finalGameId}`));
 
-  saveVillages(projectDir, true, villageIds);
-
-  // Cover art is part of the submission: ship declared assets, require a thumbnail.
-  if (finalGameId) {
-    await submitCoverArt(finalGameId, projectDir, mvConfig);
-  }
-
   console.log();
   console.log(brand.teal('  Run "myvillage status" to check the review status.'));
   console.log();
 }
 
 /**
- * Deploy one specific platform. Returns { ok, gameId, slug, status, title } or
- * { ok: false } and writes a user-readable error to the console.
+ * Deploy one specific platform. Returns { ok, gameId, slug, deployResult, title }
+ * or { ok: false } and writes a user-readable error to the console. Submit-for-
+ * review is intentionally NOT done here — see deployUnityGame.
  */
 async function deployUnityPlatform(projectDir, mvConfig, platform, { gameIdOverride, villageIds }) {
   const buildDir = join(projectDir, 'builds', platform);
@@ -408,7 +478,10 @@ async function deployUnityPlatform(projectDir, mvConfig, platform, { gameIdOverr
     formData.append('metadata', JSON.stringify(metadata));
 
     for (const fullPath of filePaths) {
-      const relPath = relative(buildDir, fullPath);
+      // Force POSIX separators: path.relative() returns backslashes on Windows,
+      // which would land in the S3 key (e.g. assets\foo.js) and 404 when the
+      // browser requests assets/foo.js — a blank game. (Server normalizes too.)
+      const relPath = relative(buildDir, fullPath).replace(/\\/g, '/');
       const fileBuffer = readFileSync(fullPath);
       const blob = new Blob([fileBuffer], { type: getContentType(relPath) });
       formData.append('files', blob, relPath);
@@ -425,16 +498,16 @@ async function deployUnityPlatform(projectDir, mvConfig, platform, { gameIdOverr
 
     const finalGameId = result.gameId || gameIdOverride || mvConfig.gameId;
 
-    spinner.text = `[${platform}] Submitting for review...`;
-    const finalStatus = await autoSubmitForReview(finalGameId, result);
-
     spinner.succeed(`[${platform}] deployed (${gameType})`);
 
+    // Submit-for-review is deferred to deployUnityGame, AFTER cover art is
+    // uploaded — non-admin developers can't attach assets once a game is
+    // SUBMITTED, and re-submitting per platform would also be redundant.
     return {
       ok: true,
       gameId: finalGameId,
       slug: result.slug,
-      status: finalStatus,
+      deployResult: result,
       title: metadata.title,
     };
   } catch (err) {

package/src/commands/game.js

@@ -693,22 +693,24 @@ export async function gameDraftCommand() {
     return;
   }
 
-  if (game.status === 'PUBLISHED') {
-    console.log(chalk.red(`\n  ✗ "${game.title}" is PUBLISHED and cannot be returned to draft.\n`));
-    return;
-  }
+  const isPublished = game.status === 'PUBLISHED';
 
   console.log();
   console.log(brand.gold(`  Return "${game.title}" to DRAFT?`));
   console.log(brand.teal(`  Current status: ${game.status}`));
-  console.log(brand.teal('  This will withdraw the game from review so you can make changes.'));
+  if (isPublished) {
+    console.log(chalk.yellow('  ! This game is LIVE. Unpublishing takes it offline immediately, and'));
+    console.log(chalk.yellow('    it must be re-reviewed by an admin before it can be published again.'));
+  } else {
+    console.log(brand.teal('  This will withdraw the game from review so you can make changes.'));
+  }
   console.log();
 
   const { confirm } = await inquirer.prompt([{
     type: 'confirm',
     name: 'confirm',
-    message: 'Return to draft?',
-    default: true,
+    message: isPublished ? 'Take the live game offline?' : 'Return to draft?',
+    default: !isPublished,
   }]);
 
   if (!confirm) {

package/src/index.js

@@ -225,7 +225,7 @@ export function run() {
 
   gameCmd
     .command('draft')
-    .description('Return a game to DRAFT status (withdraw from review)')
+    .description('Return a game to DRAFT (withdraw from review, or unpublish a live game)')
     .action(gameDraftCommand);
 
   // Game missions subcommands