@git.zone/cli 4.0.0 → 6.0.0

package/ts/mod_config/index.ts

@@ -293,7 +293,7 @@ async function handleShow(mode: ICliMode): Promise<void> {
   const targets = release.targets || {};
   printConfigSection("Release Workflow", [
     ["confirmation", formatValue(release.confirmation)],
-    ["require clean tree", formatValue(release.preflight?.requireCleanTree)],
+    ["clean tree", "required"],
     ["run tests", formatValue(release.preflight?.test)],
     ["run build", formatValue(release.preflight?.build)],
     ["test command", formatValue(release.preflight?.testCommand)],
@@ -773,12 +773,6 @@ async function handleRelease(mode: ICliMode): Promise<void> {
     choices: ["prompt", "auto", "plan"],
     default: currentRelease.confirmation || "prompt",
   });
-  const requireCleanTree = await askValue<boolean>(interactInstance, {
-    type: "confirm",
-    name: "requireCleanTree",
-    message: "Require a clean git tree before release?",
-    default: currentRelease.preflight?.requireCleanTree ?? true,
-  });
   const runTests = await askValue<boolean>(interactInstance, {
     type: "confirm",
     name: "runTests",
@@ -828,18 +822,8 @@ async function handleRelease(mode: ICliMode): Promise<void> {
         message: "Git remote:",
         default: currentTargets.git?.remote || "origin",
       }),
-      pushBranch: await askValue<boolean>(interactInstance, {
-        type: "confirm",
-        name: "pushBranch",
-        message: "Push release commit branch?",
-        default: currentTargets.git?.pushBranch ?? true,
-      }),
-      pushTags: await askValue<boolean>(interactInstance, {
-        type: "confirm",
-        name: "pushTags",
-        message: "Push release tags?",
-        default: currentTargets.git?.pushTags ?? true,
-      }),
+      pushBranch: true,
+      pushTags: true,
     };
   } else {
     releaseTargets.git = { ...(currentTargets.git || {}), enabled: false };
@@ -947,12 +931,13 @@ async function handleRelease(mode: ICliMode): Promise<void> {
   }
 
   setCliConfigValueInData(smartconfigData, "schemaVersion", CURRENT_GITZONE_CLI_SCHEMA_VERSION);
+  const currentPreflight = { ...(currentRelease.preflight || {}) };
+  delete currentPreflight.requireCleanTree;
   setCliConfigValueInData(smartconfigData, "release", {
     ...currentRelease,
     confirmation,
     preflight: {
-      ...(currentRelease.preflight || {}),
-      requireCleanTree,
+      ...currentPreflight,
       test: runTests,
       build: runBuild,
       testCommand: testCommand.trim(),
@@ -1704,7 +1689,7 @@ async function validateReleaseConfig(
   if (preflight.build === true && preflight.buildCommand === "") {
     findings.push({
       level: "warn",
-      message: "Release build preflight has an empty command",
+      message: "Release build has an empty command",
       fix: "Set release.preflight.buildCommand or unset it to use pnpm build.",
     });
   }
@@ -1816,6 +1801,20 @@ async function validateGitTarget(
     });
     return;
   }
+  if (gitTarget.pushBranch !== undefined && gitTarget.pushBranch !== true) {
+    findings.push({
+      level: "error",
+      message: "Enabled Git release targets must push main",
+      fix: "Set release.targets.git.pushBranch to true or disable the Git target.",
+    });
+  }
+  if (gitTarget.pushTags !== undefined && gitTarget.pushTags !== true) {
+    findings.push({
+      level: "error",
+      message: "Enabled Git release targets must push release tags",
+      fix: "Set release.targets.git.pushTags to true or disable the Git target.",
+    });
+  }
   findings.push({
     level: "ok",
     message: `Git release target is enabled (${gitTarget.remote || "origin"})`,