From 5f0daba1d53c37f90c724fb0e0df4cf6a75a455a Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Mon, 16 Mar 2026 22:57:25 +0100
Subject: [PATCH] Enhance plugin package handling by pre-populating known
 packages in collectPortableTemplateInput

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 .../collectPortableTemplateInput.ts           | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/cli-module-new/src/lib/preparation/collectPortableTemplateInput.ts b/packages/cli-module-new/src/lib/preparation/collectPortableTemplateInput.ts
index a65c5f04d2..2e7170f81f 100644
--- a/packages/cli-module-new/src/lib/preparation/collectPortableTemplateInput.ts
+++ b/packages/cli-module-new/src/lib/preparation/collectPortableTemplateInput.ts
@@ -59,12 +59,29 @@ export async function collectPortableTemplateInput(
     deprecatedParams.pluginId = prefilledParams.id;
   }
 
-  const parameters = {
+  const parameters: PortableTemplateParams = {
     ...template.values,
     ...prefilledParams,
     ...deprecatedParams,
   };
 
+  // Pre-populate pluginPackage for known plugins so the prompt is skipped
+  if (
+    (template.role === 'backend-plugin-module' ||
+      template.role === 'frontend-plugin-module') &&
+    parameters.pluginId &&
+    !parameters.pluginPackage
+  ) {
+    const knownPackages =
+      template.role === 'backend-plugin-module'
+        ? knownBackendPluginPackageNameByPluginId
+        : knownFrontendPluginPackageNameByPluginId;
+    const knownPackage = knownPackages[parameters.pluginId as string];
+    if (knownPackage) {
+      parameters.pluginPackage = knownPackage;
+    }
+  }
+
   const needsAnswer = [];
   const prefilledAnswers = {} as PortableTemplateParams;
   for (const prompt of prompts) {