anomalyco
diff --git a/‎.changeset/sixty-timers-walk.md‎
Lines changed: 6 additions & 0 deletions b/‎.changeset/sixty-timers-walk.md‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎packages/cli/bin/scripts.mjs‎
Lines changed: 23 additions & 9 deletions b/‎packages/cli/bin/scripts.mjs‎
Lines changed: 23 additions & 9 deletions
diff --git a/‎packages/core/src/state/index.ts‎
Lines changed: 4 additions & 0 deletions b/‎packages/core/src/state/index.ts‎
Lines changed: 4 additions & 0 deletions
@@ -0,0 +1,6 @@
+---
+"@serverless-stack/cli": patch
+"@serverless-stack/core": patch
+---
+
+Cli: check for invalid stages names
@@ -261,21 +261,35 @@ async function getStage(argv, config) {
 
   if (process.env.__TEST__ === "true") return DEFAULT_STAGE;
 
+  // Generate a suggested stage name as the default
   const suggested = await State.suggestStage();
+  const question = `Please enter a stage name you’d like to use locally. Or hit enter to use the one based on your AWS credentials (${suggested}): `;
+
+  // Prompt to enter a stage name
+  const input = await questionSync(`Look like you’re running sst for the first time in this directory. ${question}`);
+  let final = input.trim() || suggested;
+
+  // Re-prompt if stage name is invalid
+  while(!State.validateStage(final)) {
+    logger.error(chalk.red("Stage names must start with a letter, and contain only letters, numbers, and hyphens."));
+    const input = await questionSync(`\n${question}`);
+    final = input.trim() || suggested;
+  }
+
+  State.setStage(paths.appPath, final);
+  return final;
+}
+
+function questionSync(question) {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
   });
   return new Promise((resolve) => {
-    rl.question(
-      `Look like you’re running sst for the first time in this directory. Please enter a stage name you’d like to use locally. Or hit enter to use the one based on your AWS credentials (${suggested}): `,
-      (input) => {
-        const final = input.trim() || suggested;
-        State.setStage(paths.appPath, final);
-        rl.close();
-        resolve(final);
-      }
-    );
+    rl.question(question, (input) => {
+      rl.close();
+      resolve(input);
+    });
   });
 }
 
 
@@ -52,3 +52,7 @@ export async function suggestStage() {
     .catch(() => os.userInfo().username);
   return result.replace(/[^A-Za-z0-9]/g, "-");
 }
+
+export function validateStage(stage: string) {
+  return stage.match(/^[A-Za-z][A-Za-z0-9-]*$/);
+}
Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,7 @@ export async function suggestStage() {`
`52`	`52`	`.catch(() => os.userInfo().username);`
`53`	`53`	`return result.replace(/[^A-Za-z0-9]/g, "-");`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+export function validateStage(stage: string) {`
	`57`	`+ return stage.match(/^[A-Za-z][A-Za-z0-9-]*$/);`
	`58`	`+}`