From 35074cae19f702d7c72e20780ca57bdde55dcce1 Mon Sep 17 00:00:00 2001
From: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
Date: Sat, 15 Nov 2025 06:56:43 +0100
Subject: [PATCH] fix(cli): prevent double @ prefix when using --scope flag

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
---
 packages/cli/src/modules/new/commands/new.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/modules/new/commands/new.ts b/packages/cli/src/modules/new/commands/new.ts
index 9d09f42cf3..a38316dd62 100644
--- a/packages/cli/src/modules/new/commands/new.ts
+++ b/packages/cli/src/modules/new/commands/new.ts
@@ -42,7 +42,10 @@ export default async (opts: ArgOptions) => {
   let pluginInfix: string | undefined = undefined;
   let packagePrefix: string | undefined = undefined;
   if (scope) {
-    packagePrefix = scope.includes('/') ? `@${scope}` : `@${scope}/`;
+    const normalizedScope = scope.startsWith('@') ? scope : `@${scope}`;
+    packagePrefix = normalizedScope.includes('/')
+      ? normalizedScope
+      : `${normalizedScope}/`;
     pluginInfix = scope.includes('backstage') ? 'plugin-' : 'backstage-plugin-';
   }