betterstart-cli 0.0.20 → 0.0.21

package/dist/cli.js

@@ -3056,7 +3056,7 @@ async function resolvePasswordEnvValue(options) {
   options.overwriteEnvKeys.add(options.key);
   return result.trim();
 }
-async function promptResendConfig(cwd) {
+async function collectResendConfig(cwd) {
   const overwriteEnvKeys = /* @__PURE__ */ new Set();
   const apiKey = await resolvePasswordEnvValue({
     cwd,
@@ -3083,9 +3083,8 @@ async function promptResendConfig(cwd) {
       }
     }
   });
-  const envResult = appendEnvVars(
-    cwd,
-    [
+  return {
+    sections: [
       {
         header: "Email (Resend)",
         vars: [
@@ -3094,15 +3093,19 @@ async function promptResendConfig(cwd) {
         ]
       }
     ],
-    overwriteEnvKeys
-  );
+    overwriteKeys: overwriteEnvKeys
+  };
+}
+async function promptResendConfig(cwd) {
+  const collected = await collectResendConfig(cwd);
+  const envResult = appendEnvVars(cwd, collected.sections, collected.overwriteKeys);
   return {
     configured: true,
     addedEnvKeys: envResult.added,
     updatedEnvKeys: envResult.updated
   };
 }
-async function promptR2Config(cwd) {
+async function collectR2Config(cwd) {
   const overwriteEnvKeys = /* @__PURE__ */ new Set();
   const accountId = await resolveTextEnvValue({
     cwd,
@@ -3157,9 +3160,8 @@ async function promptR2Config(cwd) {
       }
     }
   });
-  const envResult = appendEnvVars(
-    cwd,
-    [
+  return {
+    sections: [
       {
         header: "Storage (Cloudflare R2)",
         vars: [
@@ -3171,14 +3173,34 @@ async function promptR2Config(cwd) {
         ]
       }
     ],
-    overwriteEnvKeys
-  );
+    overwriteKeys: overwriteEnvKeys
+  };
+}
+async function promptR2Config(cwd) {
+  const collected = await collectR2Config(cwd);
+  const envResult = appendEnvVars(cwd, collected.sections, collected.overwriteKeys);
   return {
     configured: true,
     addedEnvKeys: envResult.added,
     updatedEnvKeys: envResult.updated
   };
 }
+async function collectIntegrationConfig(cwd, integrationIds) {
+  const sections = [];
+  const overwriteKeys = /* @__PURE__ */ new Set();
+  for (const integrationId of resolveIntegrationInstallOrder(integrationIds)) {
+    const definition = getIntegrationDefinition(integrationId);
+    const collected = definition.configure === "resend" ? await collectResendConfig(cwd) : definition.configure === "r2" ? await collectR2Config(cwd) : void 0;
+    if (!collected) {
+      continue;
+    }
+    sections.push(...collected.sections);
+    for (const key of collected.overwriteKeys) {
+      overwriteKeys.add(key);
+    }
+  }
+  return { sections, overwriteKeys };
+}
 async function configureIntegration(definition, cwd, interactive) {
   if (definition.configure === "resend") {
     if (interactive) {
@@ -21130,14 +21152,14 @@ ${styleText(
         value: "resend",
         label: "Resend"
       },
-      {
-        value: "skip",
-        label: "Skip"
-      },
       {
         value: "cloudflare",
         label: `Cloudflare ${styleText("dim", "(coming soon)")}`,
         disabled: true
+      },
+      {
+        value: "skip",
+        label: "Skip"
       }
     ],
     initialValue: "resend"
@@ -23619,6 +23641,7 @@ async function runInitCommand(name, options) {
     integrations: [],
     storage: "local"
   } : await promptPlugins();
+  const collectedIntegrationConfig = !options.yes && pluginSelection.integrations.length > 0 ? await collectIntegrationConfig(cwd, pluginSelection.integrations) : { sections: [], overwriteKeys: /* @__PURE__ */ new Set() };
   let databaseUrl;
   const existingDbUrl = readExistingDbUrl(cwd);
   if (options.yes) {
@@ -23678,6 +23701,13 @@ async function runInitCommand(name, options) {
   });
   s.message("Environment variables");
   const envResult = scaffoldEnv(cwd, { databaseUrl, namespace });
+  if (collectedIntegrationConfig.sections.length > 0) {
+    appendEnvVars(
+      cwd,
+      collectedIntegrationConfig.sections,
+      collectedIntegrationConfig.overwriteKeys
+    );
+  }
   const envCount = envResult.added.length + envResult.updated.length;
   results.push({
     label: "Environment variables",
@@ -23806,7 +23836,9 @@ async function runInitCommand(name, options) {
       config: resolvedPluginInstallResult.config,
       pm,
       integrationIds: pluginSelection.integrations,
-      interactive: !options.yes,
+      // Secrets were already collected up front and written to .env.local,
+      // so the install runs without prompting (rule: no mid-scaffold input).
+      interactive: false,
       includeBiome: project2.linter.type === "none"
     });
   })() : Promise.resolve({