automata-cli 0.9.0-develop.382 → 0.9.0-develop.388

package/README.md

@@ -71,7 +71,7 @@ Checks that the PR exists and is merged, the working tree is clean, and the remo
 
 ### `automata git publish-release`
 
-Execute the full GitFlow release sequence and push to `origin`. Only requires `git`.
+Execute the release sequence — GitFlow, or trunk-based for a repository without `develop` — and push to `origin`. Only requires `git`.
 
 ```bash
 automata git publish-release            # auto-detect version from the trunk tag

package/dist/{ConfigWizard-T7N4CZFT.js → ConfigWizard-RGXIC7OS.js}

@@ -40,6 +40,11 @@ var DUMP_ON_BLOCK_OPTIONS = [
   { label: "Yes \u2014 print the full health report when a tick does nothing", value: true },
   { label: "No \u2014 print only the one-line reason", value: false }
 ];
+var RELEASE_FLOW_OPTIONS = [
+  { label: "Detect from origin (gitflow if origin/develop exists)", value: void 0 },
+  { label: "GitFlow", value: "gitflow" },
+  { label: "Trunk-based", value: "trunk" }
+];
 var MAIN_MENU_OPTIONS = ["Remote / Mode", "Implement-Next", "Prompts", "Issue Watch", "Do Work", "Git"];
 var PROMPTS_MENU_OPTIONS = [
   "Sonar",
@@ -186,6 +191,8 @@ function ConfigWizard() {
     existing.doWork?.prompts?.prOrphan ?? DEFAULT_DO_WORK_PR_ORPHAN_PROMPT
   );
   const [gitTrunkBranch, setGitTrunkBranch] = useState(existing.git?.trunkBranch ?? "");
+  const initialReleaseFlowIndex = RELEASE_FLOW_OPTIONS.findIndex((o) => o.value === existing.git?.releaseFlow);
+  const [releaseFlowIndex, setReleaseFlowIndex] = useState(Math.max(initialReleaseFlowIndex, 0));
   const [pendingRemote, setPendingRemote] = useState(existing.remoteType ?? "gh");
   const [pendingTechnique, setPendingTechnique] = useState(
     existing.issueDiscoveryTechnique ?? "label"
@@ -374,12 +381,7 @@ function ConfigWizard() {
     },
     "git-trunk-branch": {
       setValue: setGitTrunkBranch,
-      onSubmit: () => {
-        const branch = gitTrunkBranch.trim();
-        const current = readRawConfig();
-        writeConfig({ ...current, git: { ...current.git, trunkBranch: branch || void 0 } });
-        exit();
-      },
+      onSubmit: () => setScreen("git-release-flow"),
       onBack: () => setScreen("main")
     }
   };
@@ -464,6 +466,25 @@ function ConfigWizard() {
         exit();
       },
       onBack: () => setScreen("do-work-lock-stale")
+    },
+    "git-release-flow": {
+      index: releaseFlowIndex,
+      length: RELEASE_FLOW_OPTIONS.length,
+      setIndex: setReleaseFlowIndex,
+      onSelect: () => {
+        const branch = gitTrunkBranch.trim();
+        const current = readRawConfig();
+        writeConfig({
+          ...current,
+          git: {
+            ...current.git,
+            trunkBranch: branch || void 0,
+            releaseFlow: RELEASE_FLOW_OPTIONS[releaseFlowIndex].value
+          }
+        });
+        exit();
+      },
+      onBack: () => setScreen("git-trunk-branch")
     }
   };
   useInput((input, key) => {
@@ -591,7 +612,7 @@ function ConfigWizard() {
       title: "Git \u2014 Trunk Branch",
       label: "Branch publish-release releases to (blank = detect it from the remote):",
       value: gitTrunkBranch,
-      hint: `Type branch \xB7 Enter to save \xB7 ${BACK}`
+      hint: `Type branch \xB7 Enter to continue \xB7 ${BACK}`
     }
   };
   const menuViews = {
@@ -630,6 +651,12 @@ function ConfigWizard() {
       options: DUMP_ON_BLOCK_OPTIONS.map((o) => o.label),
       index: doWorkDumpOnBlockIndex,
       hint: `\u2191/\u2193 to move \xB7 Enter to save and exit \xB7 ${BACK}`
+    },
+    "git-release-flow": {
+      title: "Git \u2014 Release Flow",
+      options: RELEASE_FLOW_OPTIONS.map((o) => o.label),
+      index: releaseFlowIndex,
+      hint: `\u2191/\u2193 to move \xB7 Enter to save \xB7 ${BACK}`
     }
   };
   const textView = textViews[screen];

package/dist/index.js

@@ -26,6 +26,60 @@ var version = packageJson.version;
 
 // src/commands/config.ts
 import { Command } from "commander";
+
+// src/git/releaseFlow.ts
+var RELEASE_FLOWS = ["gitflow", "trunk"];
+var RELEASE_FLOW_CONFIG_KEY = "git.releaseFlow";
+function isReleaseFlow(value) {
+  return typeof value === "string" && RELEASE_FLOWS.includes(value);
+}
+function describeReleaseFlowSource(source) {
+  switch (source) {
+    case "config":
+      return `configured as ${RELEASE_FLOW_CONFIG_KEY}`;
+    case "develop-present":
+      return "detected: origin/develop exists";
+    case "develop-absent":
+      return "detected: origin/develop does not exist";
+  }
+}
+function invalidReleaseFlowMessage(value) {
+  return `Invalid ${RELEASE_FLOW_CONFIG_KEY} ${JSON.stringify(value)} in .automata/config.json; expected one of: ${RELEASE_FLOWS.join(", ")}.
+Fix it with: automata config set git-release-flow <gitflow|trunk>`;
+}
+function planRelease(flow, version2, trunk, trunkIsLocal) {
+  if (flow === "trunk") {
+    const message = `chore(release): ${version2}`;
+    return [
+      { args: ["commit", "--allow-empty", "-m", message], desc: `git commit --allow-empty -m "${message}"` },
+      { args: ["tag", version2], desc: `git tag ${version2}` },
+      {
+        args: ["push", "--atomic", "origin", trunk, version2],
+        desc: `git push --atomic origin ${trunk} ${version2}`
+      }
+    ];
+  }
+  const releaseBranch = `release/${version2}`;
+  const checkoutTrunk = trunkIsLocal ? { args: ["checkout", trunk], desc: `git checkout ${trunk}` } : {
+    args: ["checkout", "-b", trunk, `origin/${trunk}`],
+    desc: `git checkout -b ${trunk} origin/${trunk}`
+  };
+  return [
+    { args: ["checkout", "-b", releaseBranch], desc: `git checkout -b ${releaseBranch}` },
+    checkoutTrunk,
+    { args: ["merge", "--no-ff", releaseBranch], desc: `git merge --no-ff ${releaseBranch}` },
+    { args: ["tag", version2], desc: `git tag ${version2}` },
+    { args: ["checkout", "develop"], desc: `git checkout develop` },
+    { args: ["merge", "--no-ff", releaseBranch], desc: `git merge --no-ff ${releaseBranch}` },
+    { args: ["branch", "-d", releaseBranch], desc: `git branch -d ${releaseBranch}` },
+    {
+      args: ["push", "origin", "develop", trunk, version2],
+      desc: `git push origin develop ${trunk} ${version2}`
+    }
+  ];
+}
+
+// src/commands/config.ts
 var VALID_TYPES = ["gh", "azdo"];
 var VALID_TECHNIQUES = ["label", "assignee", "title-contains"];
 var VALID_EXECUTORS = ["claude", "codex"];
@@ -239,12 +293,24 @@ var configSetGitTrunkBranch = new Command("git-trunk-branch").description("Pin t
   process.stdout.write(`git trunk branch set to: ${branch}
 `);
 });
-var configSet = new Command("set").description("Set a configuration value").addCommand(configSetType).addCommand(configSetIssueDiscoveryTechnique).addCommand(configSetIssueDiscoveryValue).addCommand(configSetClaudeSystemPrompt).addCommand(configSetAllowedUsers).addCommand(configSetAgentUser).addCommand(configSetDoWorkBaseBranch).addCommand(configSetDoWorkProtectedBranches).addCommand(configSetDoWorkExecutor).addCommand(configSetDoWorkModel).addCommand(configSetDoWorkEffort).addCommand(configSetDoWorkMaxRuns).addCommand(configSetDoWorkLockStaleMinutes).addCommand(configSetDoWorkDumpOnBlock).addCommand(configSetDoWorkPrompt).addCommand(configSetGitTrunkBranch);
+var configSetGitReleaseFlow = new Command("git-release-flow").description("Pin the release procedure `publish-release` runs, instead of detecting it").argument("<value>", `Release flow: ${RELEASE_FLOWS.join(" | ")} (when the key is absent, the flow is detected from origin/develop)`).action((value) => {
+  const flow = value.trim();
+  if (!isReleaseFlow(flow)) {
+    process.stderr.write(`Error: invalid release flow "${value}". Must be one of: ${RELEASE_FLOWS.join(", ")}
+`);
+    process.exit(1);
+  }
+  const current = readRawConfig();
+  writeConfig({ ...current, git: { ...current.git, releaseFlow: flow } });
+  process.stdout.write(`git release flow set to: ${flow}
+`);
+});
+var configSet = new Command("set").description("Set a configuration value").addCommand(configSetType).addCommand(configSetIssueDiscoveryTechnique).addCommand(configSetIssueDiscoveryValue).addCommand(configSetClaudeSystemPrompt).addCommand(configSetAllowedUsers).addCommand(configSetAgentUser).addCommand(configSetDoWorkBaseBranch).addCommand(configSetDoWorkProtectedBranches).addCommand(configSetDoWorkExecutor).addCommand(configSetDoWorkModel).addCommand(configSetDoWorkEffort).addCommand(configSetDoWorkMaxRuns).addCommand(configSetDoWorkLockStaleMinutes).addCommand(configSetDoWorkDumpOnBlock).addCommand(configSetDoWorkPrompt).addCommand(configSetGitTrunkBranch).addCommand(configSetGitReleaseFlow);
 var configCommand = new Command("config").description("Configure automata settings").addCommand(configSet).action(async () => {
   const [{ render }, React, { ConfigWizard }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./ConfigWizard-T7N4CZFT.js")
+    import("./ConfigWizard-RGXIC7OS.js")
   ]);
   const { waitUntilExit } = render(React.createElement(ConfigWizard));
   await waitUntilExit();
@@ -1147,17 +1213,44 @@ ${stderr.trim()}`);
   }
   return stdout.trim().length > 0;
 }
-function checkReleasePreconditions() {
+function probeRemoteBranch(branch) {
+  const ref = `refs/heads/${branch}`;
+  const { status, stderr } = run2("git", ["ls-remote", "--exit-code", "origin", ref]);
+  if (status === 0) return { ok: true, exists: true };
+  if (status === 2) return { ok: true, exists: false };
+  return {
+    ok: false,
+    message: stderr.trim() || `git ls-remote --exit-code origin ${ref} failed.`
+  };
+}
+function resolveReleaseFlow() {
+  const configured = readRawConfig().git?.releaseFlow;
+  if (configured !== void 0) {
+    if (!isReleaseFlow(configured)) return { ok: false, message: invalidReleaseFlowMessage(configured) };
+    return { ok: true, flow: configured, source: "config" };
+  }
+  const develop = probeRemoteBranch("develop");
+  if (!develop.ok) {
+    return {
+      ok: false,
+      message: `Could not check whether origin has a 'develop' branch to choose the release flow.
+${develop.message}
+Set it explicitly with: automata config set git-release-flow <gitflow|trunk>`
+    };
+  }
+  return develop.exists ? { ok: true, flow: "gitflow", source: "develop-present" } : { ok: true, flow: "trunk", source: "develop-absent" };
+}
+function checkReleasePreconditions(expectedBranch) {
   let branch;
   try {
     branch = getCurrentBranch();
   } catch (err) {
     return { ok: false, message: err.message };
   }
-  if (branch !== "develop") {
+  if (branch !== expectedBranch) {
     return {
       ok: false,
-      message: `publish-release must be run from the 'develop' branch (currently on '${branch}').`
+      message: `publish-release must be run from the '${expectedBranch}' branch (currently on '${branch}').`
     };
   }
   if (hasUncommittedChanges()) {
@@ -1168,25 +1261,8 @@ function checkReleasePreconditions() {
   }
   return { ok: true };
 }
-function publishRelease(version2, dryRun, trunk) {
-  const releaseBranch = `release/${version2}`;
-  const checkoutTrunk = localBranchExists(trunk) ? { args: ["checkout", trunk], desc: `git checkout ${trunk}` } : {
-    args: ["checkout", "-b", trunk, `origin/${trunk}`],
-    desc: `git checkout -b ${trunk} origin/${trunk}`
-  };
-  const steps = [
-    { args: ["checkout", "-b", releaseBranch], desc: `git checkout -b ${releaseBranch}` },
-    checkoutTrunk,
-    { args: ["merge", "--no-ff", releaseBranch], desc: `git merge --no-ff ${releaseBranch}` },
-    { args: ["tag", version2], desc: `git tag ${version2}` },
-    { args: ["checkout", "develop"], desc: `git checkout develop` },
-    { args: ["merge", "--no-ff", releaseBranch], desc: `git merge --no-ff ${releaseBranch}` },
-    { args: ["branch", "-d", releaseBranch], desc: `git branch -d ${releaseBranch}` },
-    {
-      args: ["push", "origin", "develop", trunk, version2],
-      desc: `git push origin develop ${trunk} ${version2}`
-    }
-  ];
+function publishRelease(version2, dryRun, trunk, flow) {
+  const steps = planRelease(flow, version2, trunk, flow === "gitflow" && localBranchExists(trunk));
   for (const step of steps) {
     if (dryRun) {
       process.stdout.write(`[dry-run] ${step.desc}
@@ -1614,10 +1690,13 @@ var finishFeatureCmd = new Command2("finish-feature").description("Clean up a me
     process.exit(1);
   }
 });
-var publishReleaseCmd = new Command2("publish-release").description("Execute the full GitFlow release sequence and push to origin").argument("[version]", "Release version in X.Y.Z format (auto-detected from the trunk tag if omitted)").option("--dry-run", "Print git commands without executing them").addHelpText(
+var publishReleaseCmd = new Command2("publish-release").description("Execute the release sequence (GitFlow or trunk-based) and push to origin").argument("[version]", "Release version in X.Y.Z format (auto-detected from the trunk tag if omitted)").option("--dry-run", "Print git commands without executing them").addHelpText(
   "after",
   `
-Release sequence:
+Release flow: git.releaseFlow in .automata/config.json if set, else detected \u2014
+gitflow when origin has a 'develop' branch, trunk when it does not.
+
+GitFlow sequence (run from develop):
   1. git checkout -b release/<version>
   2. git checkout <trunk> && git merge --no-ff release/<version>
   3. git tag <version>
@@ -1625,6 +1704,11 @@ Release sequence:
   5. git branch -d release/<version>
   6. git push origin develop <trunk> <version>
 
+Trunk sequence (run from <trunk>; it may be ahead of origin, not behind):
+  1. git commit --allow-empty -m "chore(release): <version>"
+  2. git tag <version>
+  3. git push --atomic origin <trunk> <version>
+
 <trunk> is resolved from origin \u2014 git.trunkBranch in .automata/config.json if
 set, else origin/HEAD, the remote's advertised HEAD, or a probe of main/master.
 Tags are fetched from origin first, in --dry-run too, so the version a dry run
@@ -1635,16 +1719,10 @@ and the minor segment is incremented (e.g. 1.2.0 \u2192 1.3.0).
 
 CHANGELOG.md must already carry a '## [<version>] - YYYY-MM-DD' section for the
 version being released; the release is refused otherwise, in --dry-run too, and
-before any branch, merge or tag is created. A repository with no CHANGELOG.md is
-not subject to the check.`
+before any commit, branch, merge or tag is created. A repository with no
+CHANGELOG.md is not subject to the check.`
 ).action((version2, options) => {
   const dryRun = options.dryRun ?? false;
-  const preconditions = checkReleasePreconditions();
-  if (!preconditions.ok) {
-    process.stderr.write(`Error: ${preconditions.message}
-`);
-    process.exit(1);
-  }
   const trunk = resolveTrunkBranch();
   if (!trunk.ok) {
     process.stderr.write(`Error: ${unresolvedTrunkMessage(trunk.attempted)}
@@ -1653,7 +1731,22 @@ not subject to the check.`
   }
   const trunkBranch = trunk.branch;
   const trunkRef = `origin/${trunkBranch}`;
+  const flow = resolveReleaseFlow();
+  if (!flow.ok) {
+    process.stderr.write(`Error: ${flow.message}
+`);
+    process.exit(1);
+  }
+  const releaseFlow = flow.flow;
+  const preconditions = checkReleasePreconditions(releaseFlow === "gitflow" ? "develop" : trunkBranch);
+  if (!preconditions.ok) {
+    process.stderr.write(`Error: ${preconditions.message}
+`);
+    process.exit(1);
+  }
   process.stdout.write(`Trunk branch: ${trunkBranch} (${describeTrunkSource(trunk.source, trunkBranch)})
+`);
+  process.stdout.write(`Release flow: ${releaseFlow} (${describeReleaseFlowSource(flow.source)})
 `);
   const fetched = fetchTrunkAndTags(trunkBranch);
   if (!fetched.ok) {
@@ -1700,7 +1793,7 @@ ${fetched.message}
 `);
   }
   try {
-    publishRelease(resolvedVersion, dryRun, trunkBranch);
+    publishRelease(resolvedVersion, dryRun, trunkBranch, releaseFlow);
   } catch (err) {
     process.stderr.write(`Error: ${err.message}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.9.0-develop.382",
+  "version": "0.9.0-develop.388",
   "description": "Automata CLI tool",
   "type": "module",
   "engines": {