project-auto-wizard 0.15.0 → 0.16.0

package/payload/workflows/spring/server-deploy/PROJECT-SPRING-SIMPLE-CICD.yaml

@@ -132,6 +132,7 @@ jobs:
           SSH_KEY: ${{ secrets.SSH_KEY }}
           DOCKERFILE: ${{ env.DOCKERFILE_PATH }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           MISSING=""
           for NAME in DOCKERHUB_USERNAME DOCKERHUB_TOKEN SERVER_HOST SERVER_USER; do
@@ -172,6 +173,7 @@ jobs:
       # write it to a file in the resources directory
       - name: Generate application-prod.yml
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           mkdir -p ${{ env.APPLICATION_YML_DIR }}
 
@@ -187,10 +189,10 @@ jobs:
         run: ./gradlew clean build -x test ${{ env.GRADLE_OPTS }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -205,7 +207,7 @@ jobs:
 
       # Use the branch name as the image tag to manage images per environment
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: ${{ env.PROJECT_PATH }}
           file: ${{ env.PROJECT_PATH }}/${{ env.DOCKERFILE_PATH }}
@@ -238,6 +240,7 @@ jobs:
 
       - name: Load messages
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           MSGS="$(python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" dump wf_spring_deploy. \
             | python3 -c 'import json, shlex, sys; d = json.load(sys.stdin); print("\n".join("M_%s=%s" % (k.replace(".", "_"), shlex.quote(v)) for k, v in d.items()))' \
             | base64 | tr -d '\n')"
@@ -429,7 +432,7 @@ jobs:
             m simple_summary_branch branch="$BRANCH"
             m simple_summary_container name="$CONTAINER_NAME"
             m simple_summary_port port="$PORT"
-            m simple_summary_time time="$(date '+%Y-%m-%d %H:%M:%S')"
+            m simple_summary_time time="$(date -u '+%Y-%m-%d %H:%M:%S UTC')"
             echo ""
             m simple_access_url url="http://${{ secrets.SERVER_HOST }}:${PORT}"
 

package/src/cli/args.js

@@ -2,8 +2,9 @@
 import { VALID_TYPES, VALID_MODES } from "../context.js";
 import { DEPLOY_STYLES, isDeployStyle, NO_DEPLOY_STYLE } from "../core/deploy-style.js";
 import { isValidBranchName } from "../core/branches.js";
-import { TYPES } from "../core/types.js";
+import { TYPES, canonicalTypeId } from "../core/types.js";
 import { CliError } from "../core/errors.js";
+import { OPTIONS, defaultContextFields } from "../core/options.js";
 import { normalizePath, isRepoRelativePath } from "../core/paths.js";
 import { t, DEFAULT_LANGUAGE, SUPPORTED_LANGUAGES, isSupportedLanguage, normalizeLanguage } from "../i18n/index.js";
 
@@ -11,6 +12,11 @@ import { t, DEFAULT_LANGUAGE, SUPPORTED_LANGUAGES, isSupportedLanguage, normaliz
 export { CliError, normalizePath, isRepoRelativePath };
 
 // Type-specific CLI flags (type hook cliFlags): flag name -> { field, initial, parse }. Hooks are collected in type-table order.
+// --<flag> / --no-<flag> for every registry option - a new option needs no change here.
+const OPTION_CLI_FLAGS = new Map(OPTIONS.flatMap((option) => [
+  [`--${option.flag}`, { option, value: true }],
+  [`--no-${option.flag}`, { option, value: false }],
+]));
 export const TYPE_CLI_FLAGS = TYPES.flatMap((t) => t.hooks?.cliFlags ?? []);
 const TYPE_CLI_FLAG_BY_NAME = new Map(TYPE_CLI_FLAGS.map((f) => [f.flag, f]));
 
@@ -22,7 +28,7 @@ const VALUE_FLAGS = new Set([
 const SWITCH_FLAGS = new Set([
   "--version", "--help", "--force", "--dry-run", "--purge-readme", "--purge-gitignore", "--purge-version", "--yes", "--allow-dirty",
   "--delete-develop-branch", "--keep-version-yml", "--keep-readme", "--keep-changelog", "--keep-workflows", "--keep-scripts",
-  "--semver-auto", "--no-semver-auto", "--copilot", "--no-copilot",
+  ...OPTIONS.flatMap((o) => [`--${o.flag}`, `--no-${o.flag}`]),
 ]);
 
 // `--name=value` -> `--name`, `value`, so the parser below only sees the space-separated form.
@@ -54,8 +60,7 @@ export function parseArgs(argv) {
     version: "",             // initial version of the target project (--project-version)
     types: [],
     primaryType: "",
-    includeSemverAuto: null,  // --semver-auto / --no-semver-auto (default true; resolved downstream when unset)
-    includeCopilotAi: null,   // --copilot / --no-copilot (default false; opt-in because it consumes AI Credits)
+    ...defaultContextFields(), // --<flag> / --no-<flag> per registry option (null = unset, resolved downstream)
     pathsCsv: "",            // raw "flutter=app,react=client" (normalized in the resolve step)
     mainBranch: "",          // release branch (--main-branch). empty = detected default branch
     developBranch: "",       // development branch (--develop-branch). empty = develop
@@ -86,6 +91,13 @@ export function parseArgs(argv) {
     const a = args.shift();
     const typeFlag = TYPE_CLI_FLAG_BY_NAME.get(a);
     if (typeFlag) { result[typeFlag.field] = typeFlag.parse(args.shift()); continue; }
+    const optionFlag = OPTION_CLI_FLAGS.get(a);
+    if (optionFlag) {
+      const { option, value } = optionFlag;
+      // --<flag> and --no-<flag> together are contradictory, so reject instead of letting the last one win
+      if (seenFlags.has(`--${value ? "no-" : ""}${option.flag}`)) throw new CliError(t(option.conflictKey));
+      seenFlags.add(a); result[option.ctxField] = value; continue;
+    }
     switch (a) {
       case "-m": case "--mode":
         result.mode = args.shift() ?? ""; break;
@@ -108,12 +120,15 @@ export function parseArgs(argv) {
         for (let name of csv.split(",")) {
           name = name.replace(/\s/g, "");
           if (name === "") continue;
-          if (seen.has(name)) continue;      // dedup
-          if (!VALID_TYPES.includes(name)) {
+          // The alias is resolved here, before validation and dedup (--type react,next is just react).
+          // Only registry ids are valid, so an unsupported name is reported as typed.
+          const id = canonicalTypeId(name);
+          if (seen.has(id)) continue;      // dedup
+          if (!VALID_TYPES.includes(id)) {
             throw new CliError(t("cli.args.typeUnsupported", { type: name, valid: VALID_TYPES.join(" ") }));
           }
-          seen.add(name);
-          types.push(name);
+          seen.add(id);
+          types.push(id);
         }
         if (types.length === 0) throw new CliError(t("cli.args.typeEmpty"));
         result.types = types;
@@ -153,18 +168,6 @@ export function parseArgs(argv) {
         }
         result.deployStyle = v; break;
       }
-      case "--semver-auto":
-        if (seenFlags.has("--no-semver-auto")) throw new CliError(t("cli.args.semverConflict"));
-        seenFlags.add("--semver-auto"); result.includeSemverAuto = true; break;
-      case "--no-semver-auto":
-        if (seenFlags.has("--semver-auto")) throw new CliError(t("cli.args.semverConflict"));
-        seenFlags.add("--no-semver-auto"); result.includeSemverAuto = false; break;
-      case "--copilot":
-        if (seenFlags.has("--no-copilot")) throw new CliError(t("cli.args.copilotConflict"));
-        seenFlags.add("--copilot"); result.includeCopilotAi = true; break;
-      case "--no-copilot":
-        if (seenFlags.has("--copilot")) throw new CliError(t("cli.args.copilotConflict"));
-        seenFlags.add("--no-copilot"); result.includeCopilotAi = false; break;
       case "--paths": {
         // Silently falling back to auto-detection would install to paths other than the ones the user thinks they set.
         const v = (args.shift() ?? "").trim();
@@ -193,20 +196,27 @@ export function parseArgs(argv) {
 // "flutter=app,react=client" -> Map<type, normalizedPath>. Validates types (invalid -> throw).
 export function parsePathsCsv(csv) {
   const map = new Map();
+  const spelled = new Map(); // type -> name as typed, to tell an alias clash from a plain repeat
   if (!csv) return map;
   for (const pair of csv.split(",")) {
     if (pair.trim() === "") continue;
     const eq = pair.indexOf("=");
-    const type = (eq >= 0 ? pair.slice(0, eq) : pair).replace(/\s/g, "");
+    const typeRaw = (eq >= 0 ? pair.slice(0, eq) : pair).replace(/\s/g, "");
+    const type = canonicalTypeId(typeRaw);
     const rawPath = eq >= 0 ? pair.slice(eq + 1) : "";
     if (!VALID_TYPES.includes(type)) {
-      throw new CliError(t("cli.args.pathsTypeUnsupported", { type }));
+      throw new CliError(t("cli.args.pathsTypeUnsupported", { type: typeRaw }));
     }
     const path = normalizePath(rawPath);
     if (!isRepoRelativePath(path)) {
       throw new CliError(t("cli.args.pathsRelativeOnly", { pair: `${type}=${rawPath.trim()}` }));
     }
+    // An alias and its canonical name in one list (react=a,next=b) would silently drop a folder; refuse it instead.
+    if (map.has(type) && spelled.get(type) !== typeRaw && map.get(type) !== path) {
+      throw new CliError(t("cli.args.pathsDuplicateType", { type }));
+    }
     map.set(type, path);
+    spelled.set(type, typeRaw);
   }
   return map;
 }

package/src/commands/doctor.js

@@ -14,6 +14,8 @@ import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { A, paint, colorEnabled, visualWidth } from "../ui/ansi.js";
 import { PATHS } from "../core/paths.js";
+import { findMissingScripts } from "../core/copy/simple.js";
+import { resolvePayloadRoot } from "../core/assets.js";
 import { parseExisting } from "../core/version-yml.js";
 import { hooksFor } from "../core/types.js";
 import { t } from "../i18n/index.js";
@@ -44,6 +46,15 @@ export function runDoctor(cwd = process.cwd(), { exec = defaultExec } = {}) {
   // Per-type local file checks (e.g. Flutter store deploy files): only local files are read, so this runs regardless of the gh lookup results.
   if (installed) {
     const existing = parseExisting(readFileSync(join(cwd, PATHS.versionFile), "utf8"));
+    const missing = findMissingScripts(resolvePayloadRoot(), cwd);
+    if (missing.length) {
+      add({
+        name: t("cmd.doctor.scripts.name"), label: t("cmd.doctor.scripts.label"), purpose: t("cmd.doctor.scripts.purpose"), status: "WARN",
+        value: t("cmd.doctor.scripts.missing", { files: missing.join(", ") }),
+        impact: [t("cmd.doctor.scripts.impact")],
+        actions: [t("cmd.doctor.scripts.action")],
+      });
+    }
     for (const { hook } of hooksFor(existing.types, "doctorChecks")) {
       for (const item of hook(cwd, existing, { docs: DOC })) add(item);
     }
@@ -176,6 +187,15 @@ export function runDoctor(cwd = process.cwd(), { exec = defaultExec } = {}) {
     ],
   });
 
+  // release_automerge is on unless version.yml says false (a missing key also means on), so only an explicit false is reported as off.
+  const releaseAutomerge = installed ? parseExisting(readFileSync(join(cwd, "version.yml"), "utf8")).options.releaseAutomerge : null;
+  add({
+    name: t("cmd.doctor.automerge.name"), label: t("cmd.doctor.automerge.name"), purpose: t("cmd.doctor.automerge.purpose"), status: "INFO",
+    note: releaseAutomerge === false
+      ? [t("cmd.doctor.automerge.off"), t("cmd.doctor.automerge.offHow")]
+      : [t("cmd.doctor.automerge.on"), t("cmd.doctor.automerge.onHow")],
+  });
+
   return results;
 }
 

package/src/commands/dry-run.js

@@ -6,7 +6,7 @@ import { PATHS } from "../core/paths.js";
 import { planWorkflows } from "../core/copy/workflows.js";
 import { planTypeAppFiles } from "../core/copy/app-files.js";
 import { planUninstall } from "./uninstall.js";
-import { renderVersionYml, parseExisting, sameIgnoringTimestamps } from "../core/version-yml.js";
+import { renderVersionYml, parseExisting, sameIgnoringTimestamps, droppedPathLines } from "../core/version-yml.js";
 import { readVersionYmlTemplate } from "../core/assets.js";
 import { existingMarkerInDir } from "../core/paths-resolve.js";
 import { planScripts } from "../core/copy/simple.js";
@@ -33,6 +33,11 @@ function versionYmlPreview(context, payloadRoot, targetRoot) {
   return { existed: existingRaw !== null, changed: existingRaw === null || !sameIgnoringTimestamps(existingRaw, wouldBe) };
 }
 
+function existingDroppedLines(targetRoot, paths) {
+  const vyPath = join(targetRoot, PATHS.versionFile);
+  return existsSync(vyPath) ? droppedPathLines(parseExisting(readFileSync(vyPath, "utf8")).droppedPaths, paths) : [];
+}
+
 // mode: "full" | "uninstall". Read-only: writes no file.
 export function planDryRun(mode, context, payloadRoot, targetRoot = ".") {
   if (mode === "uninstall") {
@@ -54,6 +59,8 @@ export function planDryRun(mode, context, payloadRoot, targetRoot = ".") {
     // Flutter store deploy files (Fastfile, ExportOptions.plist): existing files are kept, not overwritten.
     flutterApp: planTypeAppFiles(context, payloadRoot, targetRoot),
     versionYml: versionYmlPreview(context, payloadRoot, targetRoot),
+    // Folders the rewrite would drop from version.yml (same type listed under two names with different folders).
+    droppedPathLines: existingDroppedLines(targetRoot, context.paths),
     // Files the real install also changes; scripts that overwrite existing files in particular must be shown in advance.
     scripts: planScripts(payloadRoot, targetRoot),
     readme: planVersionSection(targetRoot),
@@ -130,6 +137,7 @@ export function printDryRun(plan) {
       // For types with a deploy block (spring etc.) say the preview may differ from the real install.
       lines.push(t("cmd.dryRun.versionYml.note"));
     }
+    if (plan.droppedPathLines?.length) lines.push(...plan.droppedPathLines.map((l) => `⚠️  ${l}`));
     if (plan.scripts) {
       const mark = { create: "+", overwrite: "~", unchanged: "=" };
       const note = {

package/src/commands/full.js

@@ -6,7 +6,7 @@ import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { writeText, findUnwritable } from "../core/fsutil.js";
 import { CliError } from "../core/errors.js";
 import { PATHS } from "../core/paths.js";
-import { renderVersionYml, parseExisting, sameIgnoringTimestamps } from "../core/version-yml.js";
+import { renderVersionYml, parseExisting, sameIgnoringTimestamps, droppedPathLines } from "../core/version-yml.js";
 import { readVersionYmlTemplate } from "../core/assets.js";
 import { existingMarkerInDir } from "../core/paths-resolve.js";
 import { addVersionSectionToReadme, README_STATUS_LABEL } from "../core/copy/readme.js";
@@ -18,6 +18,7 @@ import { readBaseline, writeBaseline, appFileHash } from "../core/baseline.js";
 import { scanUnsubstituted, classifySecrets, narrowSecretsBySshAuth } from "../core/verify.js";
 import { cleanupOtherDeployWorkflows, payloadWorkflowNames, DEFAULT_DEPLOY_STYLE } from "../core/deploy-style.js";
 import { hooksFor } from "../core/types.js";
+import { OPTIONS } from "../core/options.js";
 import { findStaleWorkflows, cleanupStaleWorkflows } from "../core/removal-plan.js";
 import { log, maskValue } from "../core/logger.js";
 import { t } from "../i18n/index.js";
@@ -70,7 +71,10 @@ export function runFull(context, payloadRoot, targetRoot = ".", hooks = {}) {
   // Preserve unknown top-level fields of an existing version.yml when regenerating it.
   const vyPath = join(targetRoot, PATHS.versionFile);
   const prevVy = existsSync(vyPath) ? readFileSync(vyPath, "utf8") : null;
-  const extraTopLevel = prevVy != null ? parseExisting(prevVy).extraTopLevel : [];
+  const prevParsed = prevVy != null ? parseExisting(prevVy) : null;
+  const extraTopLevel = prevParsed ? prevParsed.extraTopLevel : [];
+  // Folders folded into one type entry are not managed after this rewrite; leave a trace in the install log.
+  for (const line of droppedPathLines(prevParsed?.droppedPaths, paths)) log.warn("version", "paths", line);
 
   // 2. Generate version.yml (render payload/version.yml.template; full regeneration)
   //    A re-run where only the date lines differ does not rewrite it (idempotent).
@@ -204,8 +208,9 @@ export function cleanupWorkflows(context, payloadRoot, targetRoot, baseline, { j
 // Values picked interactively converge here too, so "why was it installed like this?" can later be traced from the log alone.
 function logChoices(context, types) {
   if (context.deployStyle) log.info("option", "deploy", context.deployStyle);
-  if (context.includeSemverAuto != null) log.info("option", "semver", context.includeSemverAuto ? "on" : "off");
-  if (context.includeCopilotAi != null) log.info("option", "copilot", context.includeCopilotAi ? "on" : "off");
+  for (const o of OPTIONS) {
+    if (context[o.ctxField] != null) log.info("option", o.logLabel, context[o.ctxField] ? "on" : "off");
+  }
   for (const { hook } of hooksFor(types, "logChoices")) {
     for (const [name, value] of hook(context)) log.info("option", name, value);
   }

package/src/commands/interactive.js

@@ -6,8 +6,9 @@ import { join } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { resolvePayloadRoot, assertPayload, readTemplateVersion } from "../core/assets.js";
 import { detectTypes, detectVersion, detectDefaultBranch, detectRepoName, makeResolvers, detectMarkers } from "../core/detect-fs.js";
-import { parseExisting } from "../core/version-yml.js";
+import { parseExisting, droppedPathLines } from "../core/version-yml.js";
 import { pickReleaseOptions, resolveReleaseOptions } from "../core/release-options.js";
+import { OPTIONS, askableOptions, explicitFromContext } from "../core/options.js";
 import { runBreakingCheck } from "../core/breaking-check.js";
 import { resolveProjectPaths } from "../core/paths-resolve.js";
 import {
@@ -32,9 +33,6 @@ import { t, getLanguage } from "../i18n/index.js";
 
 const CANCEL = prompts.CANCEL;
 
-// Resolved lazily so the text follows the language chosen at run time.
-const semverAutoQuestion = () => t("interactive.question.semverAuto");
-const copilotAiQuestion = () => t("interactive.question.copilotAi");
 const isCancel = (v) => v === CANCEL || typeof v === "symbol";
 
 // io defaults to the real prompts. Tests inject a stub io.
@@ -100,8 +98,8 @@ export async function runInteractive(baseCtx, { cwd = process.cwd(), payloadRoot
   const repoName = detectRepoName(cwd);
   // Initial values of optional workflows: CLI flags (--copilot etc.) -> options saved in version.yml
   // Values set by a flag skip the question - same priority as non-interactive mode.
-  let { semverAuto: includeSemverAuto, copilotAi: includeCopilotAi } = pickReleaseOptions(
-    { semverAuto: baseCtx?.includeSemverAuto, copilotAi: baseCtx?.includeCopilotAi }, existing);
+  // optionState: option name -> boolean|null (null = undecided; settled by resolveReleaseOptions below). Driven by the option registry.
+  const optionState = pickReleaseOptions(explicitFromContext(baseCtx ?? {}), existing);
   // Server deploy style - not asked again when a saved value (version.yml) exists (same convention as semver_auto).
   let deployStyle = savedDeployStyle(existing);
   const showOptional = mode === "full";
@@ -157,23 +155,22 @@ export async function runInteractive(baseCtx, { cwd = process.cwd(), payloadRoot
     // Flutter options - env mode -> store deploy targets -> per-platform deploy mode.
     await askFlutterOptions();
 
-    // Auto semver bump question (default ON). Skipped when a saved value exists.
-    // In workflows mode version.yml is not written and the answer is meaningless, so it is asked only in full.
-    if (mode === "full" && includeSemverAuto === null) {
-      const y2 = await io.askYesNo(semverAutoQuestion(), true);
-      includeSemverAuto = y2 === true;
-    }
-
-    // Copilot AI summary - consumes AI Credits, so opt-in (default No). Skipped when a saved value exists.
-    if (mode === "full" && includeCopilotAi === null) {
-      const y3 = await io.askYesNo(copilotAiQuestion(), false);
-      includeCopilotAi = y3 === true;
+    // Optional-workflow questions (auto semver bump default ON, Copilot AI summary default No - it consumes AI Credits).
+    // Each is skipped when a flag or a saved value exists. In workflows mode version.yml is not written and the answer
+    // is meaningless, so they are asked only in full. Options without `ask` in the registry are never asked.
+    for (const o of askableOptions()) {
+      if (mode === "full" && optionState[o.name] === null) {
+        const answer = await io.askYesNo(t(o.ask.questionKey), o.ask.initial);
+        optionState[o.name] = answer === true;
+      }
     }
   }
   // When a question was actually asked (the full-mode questions above) its answer is respected, and only options that were not asked
   // are filled with defaults - same function as the CLI path (index.js), hence the same rule.
-  ({ includeSemverAuto, includeCopilotAi } = resolveReleaseOptions(
-    { semverAuto: includeSemverAuto, copilotAi: includeCopilotAi }, existing));
+  // Fill undecided options with defaults; keep the whole result (also the options that are never asked) so a saved
+  // value such as release_automerge: false survives an interactive reinstall.
+  const settledOptions = resolveReleaseOptions(optionState, existing);
+  for (const o of OPTIONS) optionState[o.name] = settledOptions[o.ctxField];
   const showOptionToggles = mode === "full";
 
   // Confirm/edit loop - ESC means 'stay' (only an explicit 'No' exits)
@@ -184,12 +181,12 @@ export async function runInteractive(baseCtx, { cwd = process.cwd(), payloadRoot
     if (io.analysisCard) {
       io.analysisCard({
         mode, modeLabel: modeLabel(mode), types, version, branch, showOptional, paths, flutter, envModeDefault: flutterAsk.envModeDefault,
-        options: showOptionToggles ? { semverAuto: includeSemverAuto, copilotAi: includeCopilotAi } : null,
+        options: showOptionToggles ? { ...optionState } : null,
       });
     } else {
       io.note?.(summarize({
         mode, types, version, branch, showOptional, flutter, envModeDefault: flutterAsk.envModeDefault,
-        options: showOptionToggles ? { semverAuto: includeSemverAuto, copilotAi: includeCopilotAi } : null,
+        options: showOptionToggles ? { ...optionState } : null,
       }), t("interactive.summary.title"));
     }
     const choice = await io.confirmProjectMenu();
@@ -218,13 +215,11 @@ export async function runInteractive(baseCtx, { cwd = process.cwd(), payloadRoot
         }
       } else if (what === "branch") {
         branch = await askBranchName(io, t("interactive.edit.branchPrompt"), branch, isCancel);
-      } else if (what === "semverAuto") {
+      } else if (askableOptions().some((o) => o.name === what)) {
         // A saved value skips the first question, so this is the only place to change a value once decided.
-        const y = await io.askYesNo(semverAutoQuestion(), includeSemverAuto);
-        if (typeof y === "boolean") includeSemverAuto = y;
-      } else if (what === "copilotAi") {
-        const y = await io.askYesNo(copilotAiQuestion(), includeCopilotAi);
-        if (typeof y === "boolean") includeCopilotAi = y;
+        const o = askableOptions().find((x) => x.name === what);
+        const y = await io.askYesNo(t(o.ask.questionKey), optionState[o.name]);
+        if (typeof y === "boolean") optionState[o.name] = y;
       } else if (FLUTTER_EDIT_ITEMS.has(what)) {
         flutter = await editFlutterOption(io, what, flutter, flutterAsk.envModeDefault);
       }
@@ -294,6 +289,9 @@ export async function runInteractive(baseCtx, { cwd = process.cwd(), payloadRoot
     for (const ty of types) if (ty !== "basic" && !paths.has(ty)) paths.set(ty, existing?.paths.get(ty) || ".");
   }
 
+  // Announce merged folders only now: the message must follow the folders actually chosen, not the saved ones.
+  if (existing?.droppedPaths?.length) io.note?.(droppedPathLines(existing.droppedPaths, paths).join("\n"), t("core.versionYml.pathMergedTitle"));
+
   // In a monorepo the version/build-number files live inside the type folder - detect there now that paths are settled.
   if (versionAutoDetected && [...paths.values()].some((p) => p && p !== ".")) {
     version = detectVersion(cwd, { types, paths, warn: () => {} });
@@ -320,7 +318,7 @@ export async function runInteractive(baseCtx, { cwd = process.cwd(), payloadRoot
     // Even if the saved value is zero-downtime, a single-server deploy is installed when the chosen types lack that style - record the style actually installed.
     deployStyle: resolveDeployStyle({ payload, types, explicit: deployStyle, existing }),
     typeOptions: flutterOptions,
-    releaseOptions: { includeSemverAuto, includeCopilotAi },
+    releaseOptions: Object.fromEntries(OPTIONS.map((o) => [o.ctxField, optionState[o.name]])),
     mode, force: true, version, versionCode, branch, branches, paths,
     repoName, resolvers, envValues, envUseDefaults, now, today,
     language: baseCtx.language ?? existing?.language ?? getLanguage(),
@@ -446,8 +444,9 @@ function summarize({ mode, types, version, branch, showOptional, flutter, envMod
     }
   }
   if (options) {
-    lines.push(t("interactive.summary.semverAuto", { value: options.semverAuto ? t("interactive.summary.on") : t("interactive.summary.off") }));
-    lines.push(t("interactive.summary.copilotAi", { value: options.copilotAi ? t("interactive.summary.on") : t("interactive.summary.off") }));
+    for (const o of askableOptions()) {
+      lines.push(t(o.ask.summaryKey, { value: options[o.name] ? t("interactive.summary.on") : t("interactive.summary.off") }));
+    }
   }
   return lines.join("\n");
 }

package/src/commands/status.js

@@ -1,11 +1,13 @@
 // status command: read-only install state check. No network access (local file comparison only).
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { parseExisting } from "../core/version-yml.js";
+import { parseExisting, droppedPathLines } from "../core/version-yml.js";
+import { OPTIONS } from "../core/options.js";
 import { planWorkflows } from "../core/copy/workflows.js";
 import { makeResolvers, detectRepoName, detectDefaultBranch } from "../core/detect-fs.js";
 import { PATHS } from "../core/paths.js";
 import { isDeployStyle, DEFAULT_DEPLOY_STYLE } from "../core/deploy-style.js";
+import { findMissingScripts } from "../core/copy/simple.js";
 import { findStaleWorkflows } from "../core/removal-plan.js";
 import { readBaseline } from "../core/baseline.js";
 import { hooksFor, mergeHookResults } from "../core/types.js";
@@ -56,6 +58,9 @@ export function runStatus(payloadRoot, targetRoot = ".") {
       removed: plan.removed.map((f) => f.filename),            // deleted by the user and not restored
     },
     staleFiles: stale,
+    // Installed scripts the workflows need but the repo no longer has; the workflow comparison above cannot see them.
+    missingScripts: findMissingScripts(payloadRoot, targetRoot),
+    droppedPaths: existing.droppedPaths,
   };
 }
 
@@ -72,12 +77,12 @@ export function printStatus(status) {
   if (status.branches) {
     lines.push(t("cmd.status.branchMode", { mode: status.branches.mode, main: status.branches.main, develop: status.branches.develop }));
   }
-  const boolLabel = (v) => (v === null ? t("cmd.status.unsetDefaultFalse") : v);
-  const semverAutoLabel = status.options.semverAuto === null ? t("cmd.status.unsetDefaultFalse") : status.options.semverAuto;
-  const copilotAiLabel = boolLabel(status.options.copilotAi ?? null);
+  // An unset option is shown with the value it resolves to on this (existing) install, i.e. its legacyDefault.
+  const unsetLabel = (o) => t(o.legacyDefault ? "cmd.status.unsetDefaultTrue" : "cmd.status.unsetDefaultFalse");
+  const optionLabels = OPTIONS.map((o) => `${o.key}=${status.options[o.name] ?? unsetLabel(o)}`).join(" ");
   const typeLabels = hooksFor(status.types, "statusLabels").map(({ hook }) => hook(status.options)).join("");
   const deployLabel = status.options.deployStyle ? ` deploy_style=${status.options.deployStyle}` : "";
-  lines.push(t("cmd.status.options", { value: `semver_auto=${semverAutoLabel} copilot_ai=${copilotAiLabel}${deployLabel}${typeLabels}` }));
+  lines.push(t("cmd.status.options", { value: `${optionLabels}${deployLabel}${typeLabels}` }));
   if (status.modifiedFiles.length) {
     lines.push("", t("cmd.status.modified", { n: status.modifiedFiles.length }));
     for (const f of status.modifiedFiles) lines.push(`  - ${f}`);
@@ -90,6 +95,15 @@ export function printStatus(status) {
     for (const f of status.staleFiles) lines.push(`  - ${f}`);
   }
 
+  if (status.missingScripts?.length) {
+    lines.push("", t("cmd.status.missingScripts", { n: status.missingScripts.length, dir: PATHS.scriptsDir }));
+    for (const f of status.missingScripts) lines.push(`  - ${f}`);
+    lines.push(t("cmd.status.missingScriptsFix"));
+  }
+  if (status.droppedPaths?.length) {
+    lines.push("", ...droppedPathLines(status.droppedPaths).map((l) => `⚠️  ${l}`));
+  }
+
   // What an update would do. Installs without a baseline are all zeros, so nothing is printed.
   const b = status.buckets || { autoUpdatable: [], localKept: [], conflicts: [], removed: [] };
   if (b.autoUpdatable.length || b.localKept.length || b.conflicts.length || b.removed.length) {

package/src/context.js

@@ -1,5 +1,6 @@
 // Wizard-wide state made explicit as a single object
 import { TYPE_IDS, allHookValues } from "./core/types.js";
+import { defaultContextFields } from "./core/options.js";
 
 // --type whitelist: the display order of the type registry (core/types.js).
 export const VALID_TYPES = TYPE_IDS;
@@ -24,8 +25,9 @@ export function createContext(overrides = {}) {
     branch: "",
     branches: null,          // { main, develop, mode: "pr-flow"|"trunk-based" } - result of resolveBranchConfig
     paths: new Map(),        // type -> path
-    includeSemverAuto: null, // null = unset (resolved to true downstream), true/false = explicit
-    includeCopilotAi: null,  // null = unset (resolved to false downstream), true/false = explicit; Copilot AI summary opt-in
+    // Release option fields (includeSemverAuto, includeCopilotAi, ...): null = unset (resolved downstream), true/false = explicit.
+    // Fields and defaults come from the option registry (core/options.js).
+    ...defaultContextFields(),
     // Type-specific option fields; all ignored in projects without that type. Fields and defaults come from the type hook (contextDefaults).
     ...allHookValues("contextDefaults"),
     language: "en",          // message language (--lang / env / version.yml), default en

package/src/core/copy/simple.js

@@ -24,6 +24,37 @@ export function planScripts(payloadRoot, targetRoot = ".") {
   return out;
 }
 
+// Script -> bundled scripts it imports (`import x` / `from x import ...`), read from the payload so the
+// dependency table cannot drift from the code. Only names in SCRIPT_NAMES count; stdlib imports are ignored.
+function scriptImports(payloadRoot, name) {
+  let src = "";
+  try { src = readFileSync(join(payloadRoot, PAYLOAD.scriptsDir, name), "utf8"); } catch { return []; }
+  const mods = new Set();
+  for (const m of src.matchAll(/^[ \t]*(?:from[ \t]+(\w+)[ \t]+import\b|import[ \t]+([\w, \t]+))/gm)) {
+    if (m[1]) mods.add(m[1]);
+    else for (const x of m[2].split(",")) mods.add(x.trim().split(/\s+/)[0]);
+  }
+  return SCRIPT_NAMES.filter((n) => n !== name && mods.has(n.replace(/\.py$/, "")));
+}
+
+// Bundled scripts the installed workflows call but the repo no longer has (deleted by hand, never copied).
+// Only scripts an installed workflow actually references count: some (truncate_release_notes.py) belong to
+// workflows of one type only. Scripts those import (messages.py, issue_helper.py, ...) are required too,
+// transitively, since the called script fails at import time without them.
+export function findMissingScripts(payloadRoot, targetRoot = ".") {
+  const wfDir = join(targetRoot, PATHS.workflowsDir);
+  let text = "";
+  try {
+    for (const f of readdirSync(wfDir)) if (/\.ya?ml$/.test(f)) text += `${readFileSync(join(wfDir, f), "utf8")}\n`;
+  } catch { return []; }
+  const required = new Set(SCRIPT_NAMES.filter((n) => text.includes(n)));
+  const queue = [...required];
+  while (queue.length) {
+    for (const dep of scriptImports(payloadRoot, queue.pop())) if (!required.has(dep)) { required.add(dep); queue.push(dep); }
+  }
+  return SCRIPT_NAMES.filter((n) => required.has(n) && exists(join(payloadRoot, PAYLOAD.scriptsDir, n)) && !exists(join(targetRoot, PATHS.scriptsDir, n)));
+}
+
 // Scripts are always overwritten with the payload version (+chmod, meaningless but harmless on Windows).
 // User-edited scripts are overwritten too, so per-file results are returned for the caller to log.
 export function copyScripts(payloadRoot, targetRoot = ".") {

package/src/core/copy/workflows.js

@@ -48,7 +48,7 @@ export function readSavedDeployValues(targetRoot = ".") {
 // and status/dry-run never see different file sets. When flutterStore is not an array (null = undecided,
 // non-interactive default) no store filter is applied. It always returns a function even without filters,
 // because processDir cannot take null.
-// Some types (go/python, react/next) keep server deploy workflows directly in the type root, so the deploy style
+// Some types (go, python, react) keep server deploy workflows directly in the type root, so the deploy style
 // filter is always applied. `available` (set of payload file names) lets a type without the chosen style fall back
 // to the single server deploy.
 export function buildTypeRootFilter(type, deployStyle, flutterStore, available = null) {
@@ -64,7 +64,7 @@ export function buildTypeRootFilter(type, deployStyle, flutterStore, available =
 export function typeWorkflowSources(type, payloadRoot, { deployStyle, flutterStore = null, available = null }) {
   const [typeDir, serverDeployDir] = typeWorkflowDirs(payloadRoot, type);
   const sources = [];
-  // Some types (go/python, react/next) keep server deploy workflows directly in the type root, so filter the root by deploy style too.
+  // Some types (go, python, react) keep server deploy workflows directly in the type root, so filter the root by deploy style too.
   if (exists(typeDir)) sources.push({ srcDir: typeDir, type, filter: buildTypeRootFilter(type, deployStyle, flutterStore, available) });
   // "No deploy" excludes the whole folder
   if (exists(serverDeployDir) && deployStyle !== NO_DEPLOY_STYLE) {

package/src/core/deploy-style.js

@@ -31,7 +31,7 @@ export const isDeployWorkflow = (filename) => DEPLOY_STYLES.some((s) => filename
 
 const PREVIEW_SUFFIX = "-PR-PREVIEW.yaml";
 
-// All workflows that deploy to a server: CD bodies, single CDs (react, next) and PR preview.
+// All workflows that deploy to a server: CD bodies, the single CD (react) and PR preview.
 // "No deploy" removes all of them identically for every type. Removing only some would leave server Secret requirements behind.
 export const isServerDeployWorkflow = (filename) =>
   isDeployWorkflow(filename) || SINGLE_SERVER_CD_FILES.has(filename) || filename.endsWith(PREVIEW_SUFFIX);

package/src/core/detect.js

@@ -5,7 +5,7 @@ import {
 
 // package.json classification: compares dependency "keys" exactly. A raw substring match would misdetect an
 // export script or exponential-backoff as expo, a web app using react-native-web as react-native, and
-// "next" in keywords as next. Input is the raw package.json string. Evaluation order is the registry's detectOrder.
+// "react" in keywords as react. Input is the raw package.json string. Evaluation order is the registry's detectOrder.
 export function classifyPackageText(raw) {
   let pkg;
   try { pkg = JSON.parse(String(raw || "")); } catch { return PACKAGE_FALLBACK_TYPE; }
@@ -15,7 +15,8 @@ export function classifyPackageText(raw) {
     const d = pkg[field];
     if (d && typeof d === "object") for (const k of Object.keys(d)) deps.add(k);
   }
-  return PACKAGE_DETECTED_TYPES.find((t) => deps.has(t.packageDep))?.id ?? PACKAGE_FALLBACK_TYPE;
+  const hasDep = (t) => [t.packageDep, ...(t.extraPackageDeps || [])].some((k) => deps.has(k));
+  return PACKAGE_DETECTED_TYPES.find(hasDep)?.id ?? PACKAGE_FALLBACK_TYPE;
 }
 
 // Convenience: when given a parsed object, re-serialize it and apply the rule above.