Skip to content

πŸ’« Toolkit to help you get started with SDD or any other process!

fix(scripts): honor explicit -Number 0 in PowerShell create-new-feature (parity with bash) (#3196)

Ali jawwadfd185c1fd82d
diff --git a/scripts/powershell/create-new-feature.ps1 b/scripts/powershell/create-new-feature.ps1
index 12f15ba31..5826815e0 100644
--- a/scripts/powershell/create-new-feature.ps1
+++ b/scripts/powershell/create-new-feature.ps1
@@ -142,8 +142,10 @@ if ($ShortName) {
$branchSuffix = Get-BranchName -Description $featureDesc
}
-# Warn if -Number and -Timestamp are both specified
-if ($Timestamp -and $Number -ne 0) {
+# Warn if -Number and -Timestamp are both specified. Use ContainsKey (not
+# `-ne 0`) so an explicit `-Number 0` is also detected, matching the bash twin's
+# `[ -n "$BRANCH_NUMBER" ]` check.
+if ($Timestamp -and $PSBoundParameters.ContainsKey('Number')) {
Write-Warning "[specify] Warning: -Number is ignored when -Timestamp is used"
$Number = 0
}
@@ -153,8 +155,10 @@ if ($Timestamp) {
$featureNum = Get-Date -Format 'yyyyMMdd-HHmmss'
$branchName = "$featureNum-$branchSuffix"
} else {
- # Determine branch number from existing feature directories
- if ($Number -eq 0) {
+ # Determine branch number from existing feature directories. Auto-detect only
+ # when -Number was not supplied; an explicit value (including 0) is honored,
+ # matching the bash twin's `[ -z "$BRANCH_NUMBER" ]` check.
+ if (-not $PSBoundParameters.ContainsKey('Number')) {
$Number = (Get-HighestNumberFromSpecs -SpecsDir $specsDir) + 1
}
diff --git a/tests/test_timestamp_branches.py b/tests/test_timestamp_branches.py
index 93207746a..6fe0c14ed 100644
--- a/tests/test_timestamp_branches.py
+++ b/tests/test_timestamp_branches.py
@@ -275,6 +275,19 @@ class TestSequentialBranch:
branch = line.split(":", 1)[1].strip()
assert branch == "1001-next-feat", f"expected 1001-next-feat, got: {branch}"
+ def test_explicit_number_zero_is_honored(self, git_repo: Path):
+ """An explicit --number 0 is honored literally (FEATURE_NUM 000), not treated
+ as auto-detect, even when higher-numbered specs already exist. This pins the
+ canonical bash behavior the PowerShell twin must mirror."""
+ (git_repo / "specs" / "003-existing").mkdir(parents=True)
+ r = run_script(
+ git_repo, "--json", "--dry-run", "--number", "0", "--short-name", "zero", "Zero feature",
+ )
+ assert r.returncode == 0, r.stderr
+ data = json.loads(r.stdout)
+ assert data["FEATURE_NUM"] == "000"
+ assert data["BRANCH_NAME"] == "000-zero"
+
class TestSequentialBranchPowerShell:
def test_powershell_scanner_uses_long_tryparse_for_large_prefixes(self):
@@ -302,6 +315,23 @@ class TestSequentialBranchPowerShell:
assert r2.returncode == 0, r2.stderr
assert json.loads(r2.stdout)["BRANCH_NAME"] == "001-use-go-now"
+ @pytest.mark.skipif(not _has_pwsh(), reason="pwsh not installed")
+ def test_explicit_number_zero_is_honored_matching_bash(self, ps_git_repo: Path):
+ """An explicit -Number 0 must be honored (FEATURE_NUM 000) like the bash twin,
+ even when higher-numbered specs exist. Before the fix, PowerShell could not
+ distinguish -Number 0 from the default and silently auto-detected (e.g. 004)."""
+ script = ps_git_repo / "scripts" / "powershell" / "create-new-feature.ps1"
+ (ps_git_repo / "specs" / "003-existing").mkdir(parents=True)
+ result = subprocess.run(
+ ["pwsh", "-NoProfile", "-File", str(script),
+ "-Json", "-DryRun", "-Number", "0", "-ShortName", "zero", "Zero feature"],
+ cwd=ps_git_repo, capture_output=True, text=True,
+ )
+ assert result.returncode == 0, result.stderr
+ data = json.loads(result.stdout)
+ assert data["FEATURE_NUM"] == "000"
+ assert data["BRANCH_NAME"] == "000-zero"
+
# ── check_feature_branch Tests ───────────────────────────────────────────────