fix: interactive inputs with existing config/cli options

Author: chenasraf

src/cmd.ts

@@ -10,7 +10,7 @@ import { log } from "./logger"
 import { MassargCommand } from "massarg/command"
 import { getUniqueTmpPath as generateUniqueTmpPath } from "./file"
 import { colorize } from "./colors"
-import { promptForMissingConfig, resolveInputs } from "./prompts"
+import { promptBeforeConfig, promptAfterConfig, resolveInputs } from "./prompts"
 import { initScaffold } from "./init"
 
 export async function parseCliArgs(args = process.argv.slice(2)) {
@@ -33,8 +33,10 @@ export async function parseCliArgs(args = process.argv.slice(2)) {
       log(config, LogLevel.debug, `Simple Scaffold v${pkg.version}`)
       config.tmpDir = generateUniqueTmpPath()
       try {
-        // Auto-detect config file in cwd if not explicitly provided
-        if (!config.config && !config.git) {
+        // Auto-detect config file in cwd — but only if the user didn't
+        // explicitly provide templates/output (which signals a one-time run)
+        const isOneTimeRun = config.templates?.length > 0 || config.output
+        if (!config.config && !config.git && !isOneTimeRun) {
           try {
             config.config = await findConfigFile(process.cwd())
             log(config, LogLevel.debug, `Auto-detected config file: ${config.config}`)
@@ -43,19 +45,24 @@ export async function parseCliArgs(args = process.argv.slice(2)) {
           }
         }
 
-        // Load config early so we can prompt for template key
+        // Load config map early so we can prompt for name and template key
         const hasConfigSource = Boolean(config.config || config.git)
         let configMap: ScaffoldConfigMap | undefined
         if (hasConfigSource) {
           configMap = await getConfigFile(config)
         }
 
-        // Prompt for missing values interactively
-        config = await promptForMissingConfig(config, configMap)
+        // Phase 1: prompt for name + key (needed before parseConfigFile)
+        config = await promptBeforeConfig(config, configMap)
 
+        // Parse and merge the config file
         log(config, LogLevel.debug, "Parsing config file...", config)
         const parsed = await parseConfigFile(config)
-        const resolved = await resolveInputs(parsed)
+
+        // Phase 2: prompt for anything still missing after config merge
+        const prompted = await promptAfterConfig(parsed)
+
+        const resolved = await resolveInputs(prompted)
         await Scaffold(resolved)
       } catch (e) {
         const message = "message" in (e as object) ? (e as Error).message : e?.toString()

src/prompts.ts

@@ -156,10 +156,10 @@ export function isInteractive(): boolean {
 }
 
 /**
- * Fills in missing config values by prompting the user interactively.
- * Only prompts when running in a TTY — in non-interactive mode, returns config as-is.
+ * Prompts for name and template key before the config file is parsed.
+ * These are needed by parseConfigFile to know which template to load.
  */
-export async function promptForMissingConfig(
+export async function promptBeforeConfig(
   config: ScaffoldCmdConfig,
   configMap?: ScaffoldConfigMap,
 ): Promise<ScaffoldCmdConfig> {
@@ -178,7 +178,19 @@ export async function promptForMissingConfig(
     }
   }
 
-  if (!config.output) {
+  return config
+}
+
+/**
+ * Prompts for any values still missing after the config file has been parsed.
+ * Only prompts in interactive mode.
+ */
+export async function promptAfterConfig(config: ScaffoldConfig): Promise<ScaffoldConfig> {
+  if (!isInteractive()) {
+    return config
+  }
+
+  if (!config.output || (typeof config.output === "string" && !config.output)) {
     config.output = await promptForOutput()
   }
 
@@ -189,6 +201,30 @@ export async function promptForMissingConfig(
   return config
 }
 
+/**
+ * @deprecated Use {@link promptBeforeConfig} and {@link promptAfterConfig} instead.
+ */
+export async function promptForMissingConfig(
+  config: ScaffoldCmdConfig,
+  configMap?: ScaffoldConfigMap,
+): Promise<ScaffoldCmdConfig> {
+  const afterPre = await promptBeforeConfig(config, configMap)
+
+  if (!isInteractive()) {
+    return afterPre
+  }
+
+  if (!afterPre.output) {
+    afterPre.output = await promptForOutput()
+  }
+
+  if (!afterPre.templates || afterPre.templates.length === 0) {
+    afterPre.templates = await promptForTemplates()
+  }
+
+  return afterPre
+}
+
 /**
  * Prompts for any required inputs defined in the scaffold config and merges them into data.
  * Only prompts in interactive mode; in non-interactive mode, only applies defaults.