@rodyssey/cli 0.1.6 → 0.1.9

package/dist/cli.js

@@ -2071,7 +2071,7 @@ var {
 // package.json
 var package_default = {
   name: "@rodyssey/cli",
-  version: "0.1.6",
+  version: "0.1.9",
   description: "Scaffold new projects from airconcepts templates",
   repository: {
     type: "git",
@@ -2211,7 +2211,7 @@ function storeSession(session) {
 function resolveSessionToken(env) {
   const token = process.env.CMS_TOKEN || getStoredSession(env)?.token;
   if (!token) {
-    throw new Error(`No CMS auth token found for [${env}]. Run \`ro app auth login --env ${env}\` first.`);
+    throw new Error(`No CMS auth token found for [${env}]. Run \`ro auth login --env ${env}\` first.`);
   }
   return token;
 }
@@ -2312,7 +2312,7 @@ async function me(options) {
   const storedSession = getStoredSession(options.env);
   if (!options.remote) {
     if (!storedSession) {
-      throw new Error(`No local CMS session found for [${options.env}]. Run \`ro app auth login --env ${options.env}\` first.`);
+      throw new Error(`No local CMS session found for [${options.env}]. Run \`ro auth login --env ${options.env}\` first.`);
     }
     return {
       env: storedSession.env,
@@ -2377,12 +2377,13 @@ function replaceInFiles(dir, filenames, search, replace) {
     } catch {}
   }
 }
-function loadEnv(envName) {
+function loadEnv(envName, options = {}) {
   const files = [];
   if (envName) {
     files.push(`.env.${envName}`);
   }
   files.push(".env");
+  const loaded = {};
   for (const file of files) {
     if (!existsSync2(file))
       continue;
@@ -2400,11 +2401,16 @@ function loadEnv(envName) {
       if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
         value = value.slice(1, -1);
       }
-      if (process.env[key] === undefined) {
-        process.env[key] = value;
+      if (loaded[key] === undefined) {
+        loaded[key] = value;
       }
     }
   }
+  for (const [key, value] of Object.entries(loaded)) {
+    if (options.override || process.env[key] === undefined) {
+      process.env[key] = value;
+    }
+  }
 }
 
 // src/create.ts
@@ -4019,26 +4025,13 @@ async function getWebappConfig(options) {
   const CONFIG_URL = getConfigUrl(options);
   if (!CONFIG_URL)
     return;
-  ensureDeployToken(options.env);
   const url = new URL(CONFIG_URL);
   url.searchParams.set("webappId", webappId);
   console.log(`⚙️ Pulling webapp config for [${options.env}] environment...`);
   console.log(`\uD83D\uDCCD Config URL: ${url.toString()}`);
   console.log(`\uD83D\uDCCD Webapp ID: ${webappId}
 `);
-  const response = await fetch(url, {
-    method: "GET",
-    headers: {
-      Authorization: `Bearer ${process.env.DEPLOY_TOKEN}`,
-      Accept: "application/json"
-    }
-  });
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`Config fetch failed: ${response.status} ${response.statusText}
-${errorText}`);
-  }
-  const config = await response.json();
+  const config = await fetchWebappConfig(options);
   const output = JSON.stringify(config, null, 2);
   if (options.out) {
     writeFileSync3(options.out, `${output}
@@ -4155,7 +4148,59 @@ function isAffirmative(answer) {
   const trimmed = answer.trim().toLowerCase();
   return trimmed === "" || trimmed === "y" || trimmed === "yes";
 }
+function isExplicitYes(answer) {
+  const trimmed = answer.trim().toLowerCase();
+  return trimmed === "y" || trimmed === "yes";
+}
+function assertDeployOptions(options) {
+  if (options.deploy && options.skipDeploy) {
+    console.error("❌ Error: Use either --deploy or --skip-deploy, not both.");
+    process.exit(1);
+  }
+}
+async function maybeDeployProduction(options, webappId, deployToken) {
+  const deployRequested = options.deploy === true;
+  const deploySkipped = options.skipDeploy === true;
+  if (deploySkipped) {
+    console.log(`
+↷ Skipping production deploy.`);
+    console.log(`Deploy later with:
+`);
+    console.log(`    ro app deploy -e production
+`);
+    return;
+  }
+  let shouldDeploy = deployRequested;
+  if (!shouldDeploy) {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+      console.log(`
+✨ Promotion complete! Deploy to production with:
+`);
+      console.log(`    ro app deploy -e production
+`);
+      return;
+    }
+    const answer = await prompt(`
+Deploy to production now? (y/N): `);
+    shouldDeploy = isExplicitYes(answer);
+  }
+  if (!shouldDeploy) {
+    console.log(`
+✨ Promotion complete! Deploy to production with:
+`);
+    console.log(`    ro app deploy -e production
+`);
+    return;
+  }
+  console.log(`
+\uD83D\uDE80 Deploying promoted webapp to production...`);
+  loadEnv(PROD_ENV, { override: true });
+  process.env.WEBAPP_ID = webappId;
+  process.env.DEPLOY_TOKEN = deployToken;
+  await deploy(PROD_ENV);
+}
 async function promote(options) {
+  assertDeployOptions(options);
   loadEnv();
   const webappId = process.env.WEBAPP_ID;
   if (!webappId) {
@@ -4207,11 +4252,14 @@ async function promote(options) {
   console.log(`✅ Logged in to ${session.cmsUrl}`);
   const cmsUrl = resolveCmsUrl(PROD_ENV, options.cmsUrl);
   const promoteUrl = options.promoteUrl || `${cmsUrl}/api/cli/webapps/promote`;
+  const promoteBody = { webappId, details };
   console.log(`
 \uD83D\uDE80 Promoting webapp to ${PROD_ENV}...`);
   console.log(`\uD83D\uDCCD Promote URL: ${promoteUrl}`);
-  console.log(`\uD83D\uDCCD Webapp ID: ${webappId}
-`);
+  console.log(`\uD83D\uDCCD Webapp ID: ${webappId}`);
+  console.log("\uD83D\uDCE6 Promote body:");
+  console.log(JSON.stringify(promoteBody, null, 2));
+  console.log();
   const response = await fetch(promoteUrl, {
     method: "POST",
     headers: {
@@ -4219,7 +4267,7 @@ async function promote(options) {
       Authorization: `Bearer ${session.token}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify({ webappId, details })
+    body: JSON.stringify(promoteBody)
   });
   const payload = await readResponsePayload(response);
   if (response.status === 409) {
@@ -4241,11 +4289,7 @@ ${JSON.stringify(payload, null, 2)}`);
   });
   console.log(`✅ Wrote WEBAPP_ID and DEPLOY_TOKEN to ${PROD_ENV_FILE}`);
   console.log(`\uD83D\uDCCD Webapp ID: ${webappId}`);
-  console.log(`
-✨ Promotion complete! Deploy to production with:
-`);
-  console.log(`    ro app deploy -e production
-`);
+  await maybeDeployProduction(options, webappId, deployToken);
 }
 
 // src/upgrade-template.ts
@@ -4603,6 +4647,28 @@ function addConfigTargetOptions(command) {
 function addConfigSetOptions(command) {
   return addConfigTargetOptions(command).option("--title <title>", "Webapp title (pass the literal 'null' to clear)").option("--description <description>", "Webapp description (pass the literal 'null' to clear)").option("--cover-img <url>", "Cover image URL (pass the literal 'null' to clear)").option("--localization <json-or-file>", "Localization JSON object, path to a JSON file, or 'null' to clear").option("--details <json-or-file>", "Partial WebappDetails JSON or path to a JSON file. Sent as a delta — only include keys you want to change. Do NOT echo a full GET response here, or empty defaults like 'tags: []' will clobber real data.").option("--dry-run", "Print the request payload without sending it");
 }
+function addAuthCommands(parent) {
+  const auth = parent.command("auth").description("Authenticate with the CMS");
+  auth.command("login").description("Log in to the CMS using a browser callback").option("-e, --env <environment>", "CMS environment (local | development | staging | production)", "development").option("--cms-url <url>", "CMS base URL. Defaults to the selected environment").option("--login-url <url>", "Full browser login URL. Defaults to <cms-url>/auth/cli-login").option("--token-url <url>", "Full token exchange URL. Defaults to <cms-url>/api/auth/cli-token").option("--callback-port <port>", "Local callback port. Defaults to a random free port", parseInt).option("--timeout <seconds>", "Seconds to wait for the browser callback", parseInt, 300).option("--no-open", "Print the login URL without opening a browser").action(async (options) => {
+    const session = await login({
+      env: options.env,
+      cmsUrl: options.cmsUrl,
+      loginUrl: options.loginUrl,
+      tokenUrl: options.tokenUrl,
+      callbackPort: options.callbackPort,
+      open: options.open,
+      timeoutMs: (options.timeout ?? 300) * 1000
+    });
+    console.log(`✅ Logged in to CMS [${session.env}]`);
+    console.log(`\uD83D\uDCCD CMS URL: ${session.cmsUrl}`);
+  });
+  auth.command("me").description("Show the locally stored CMS login session").option("-e, --env <environment>", "CMS environment (local | development | staging | production)", "development").option("--remote", "Call the CMS /me endpoint instead of only reading the local session").option("--cms-url <url>", "CMS base URL for --remote. Defaults to the selected environment or stored session").option("--me-url <url>", "Full me endpoint URL for --remote. Defaults to <cms-url>/api/auth/me").action(async (options) => {
+    const currentUser = await me(options);
+    console.log(JSON.stringify(currentUser, null, 2));
+  });
+  return auth;
+}
+addAuthCommands(program);
 app.command("create").argument("<project-name>", "Name of the project to create").option("-t, --template <template>", "Template to use (webapp | webapp-fullstack)").option("--auto", "Create a CMS webapp and write WEBAPP_ID/DEPLOY_TOKEN to .env").option("-e, --env <environment>", "CMS environment for --auto (local | development | staging | production)", "development").option("--cms-url <url>", "CMS base URL for --auto. Defaults to the selected environment").option("--create-url <url>", "Full CMS create endpoint for --auto. Defaults to <cms-url>/api/cli/webapps/create").description("Create a new project from a template").action(async (projectName, options) => {
   let templateName;
   if (options.template) {
@@ -4622,13 +4688,15 @@ app.command("create").argument("<project-name>", "Name of the project to create"
     createUrl: options.createUrl
   });
 });
-app.command("promote").description("Promote the current webapp to production (creates a prod record with the same WEBAPP_ID)").option("--details <json-or-file>", "Full WebappDetails JSON object or path to a JSON file. Skips the source-pull and confirmation prompts when provided.").option("-y, --yes", "Auto-accept pulling the latest details from development").option("--cms-url <url>", "Production CMS base URL. Defaults to the production environment").option("--promote-url <url>", "Full CMS promote endpoint. Defaults to <cms-url>/api/cli/webapps/promote").option("--from <env>", "Source environment to pull details from (testing override). Defaults to development", "development").action(async (options) => {
+app.command("promote").description("Promote the current webapp to production (creates a prod record with the same WEBAPP_ID)").option("--details <json-or-file>", "Full WebappDetails JSON object or path to a JSON file. Skips the source-pull and confirmation prompts when provided.").option("-y, --yes", "Auto-accept pulling the latest details from development").option("--cms-url <url>", "Production CMS base URL. Defaults to the production environment").option("--promote-url <url>", "Full CMS promote endpoint. Defaults to <cms-url>/api/cli/webapps/promote").option("--from <env>", "Source environment to pull details from (testing override). Defaults to development", "development").option("--deploy", "Deploy to production immediately after promotion").option("--skip-deploy", "Do not ask to deploy after promotion").action(async (options) => {
   await promote({
     details: options.details,
     yes: options.yes,
     cmsUrl: options.cmsUrl,
     promoteUrl: options.promoteUrl,
-    from: options.from
+    from: options.from,
+    deploy: options.deploy,
+    skipDeploy: options.skipDeploy
   });
 });
 app.command("update-game-sdk").description("Download and update the GameSDK library, types, and documentation").action(async () => {
@@ -4637,24 +4705,6 @@ app.command("update-game-sdk").description("Download and update the GameSDK libr
 app.command("deploy").description("Build and deploy the webapp to the server").option("-e, --env <environment>", "Target environment (local | development | staging | production)", "development").option("--host <host>", "Override the deploy host").option("--port <port>", "Override the deploy port", parseInt).action(async (options) => {
   await deploy(options.env, { host: options.host, port: options.port });
 });
-var auth = app.command("auth").description("Authenticate with the CMS");
-auth.command("login").description("Log in to the CMS using a browser callback").option("-e, --env <environment>", "CMS environment (local | development | staging | production)", "development").option("--cms-url <url>", "CMS base URL. Defaults to the selected environment").option("--login-url <url>", "Full browser login URL. Defaults to <cms-url>/auth/cli-login").option("--token-url <url>", "Full token exchange URL. Defaults to <cms-url>/api/auth/cli-token").option("--callback-port <port>", "Local callback port. Defaults to a random free port", parseInt).option("--timeout <seconds>", "Seconds to wait for the browser callback", parseInt, 300).option("--no-open", "Print the login URL without opening a browser").action(async (options) => {
-  const session = await login({
-    env: options.env,
-    cmsUrl: options.cmsUrl,
-    loginUrl: options.loginUrl,
-    tokenUrl: options.tokenUrl,
-    callbackPort: options.callbackPort,
-    open: options.open,
-    timeoutMs: (options.timeout ?? 300) * 1000
-  });
-  console.log(`✅ Logged in to CMS [${session.env}]`);
-  console.log(`\uD83D\uDCCD CMS URL: ${session.cmsUrl}`);
-});
-auth.command("me").description("Show the locally stored CMS login session").option("-e, --env <environment>", "CMS environment (local | development | staging | production)", "development").option("--remote", "Call the CMS /me endpoint instead of only reading the local session").option("--cms-url <url>", "CMS base URL for --remote. Defaults to the selected environment or stored session").option("--me-url <url>", "Full me endpoint URL for --remote. Defaults to <cms-url>/api/auth/me").action(async (options) => {
-  const currentUser = await me(options);
-  console.log(JSON.stringify(currentUser, null, 2));
-});
 var config = app.command("config").description("Manage webapp metadata config");
 addConfigTargetOptions(config.command("get").description("Pull the current webapp metadata config from the CMS").option("--out <file>", "Write the config JSON to a file")).action(async (options) => {
   await getWebappConfig(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rodyssey/cli",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Scaffold new projects from airconcepts templates",
   "repository": {
     "type": "git",