💫 Toolkit to help you get started with SDD or any other process!
Fixes #975
den (work)2508d926c06f
diff --git a/scripts/bash/create-new-feature.sh b/scripts/bash/create-new-feature.shindex 53adbcef1..353acccb8 100644--- a/scripts/bash/create-new-feature.sh+++ b/scripts/bash/create-new-feature.sh@@ -87,17 +87,45 @@ cd "$REPO_ROOT"SPECS_DIR="$REPO_ROOT/specs"mkdir -p "$SPECS_DIR"-HIGHEST=0+# Get highest number from specs directory+HIGHEST_FROM_SPECS=0if [ -d "$SPECS_DIR" ]; thenfor dir in "$SPECS_DIR"/*; do[ -d "$dir" ] || continuedirname=$(basename "$dir")number=$(echo "$dirname" | grep -o '^[0-9]\+' || echo "0")number=$((10#$number))- if [ "$number" -gt "$HIGHEST" ]; then HIGHEST=$number; fi+ if [ "$number" -gt "$HIGHEST_FROM_SPECS" ]; then HIGHEST_FROM_SPECS=$number; fidonefi+# Get highest number from branch names (both local and remote)+HIGHEST_FROM_BRANCHES=0+if [ "$HAS_GIT" = true ]; then+ # Get all branches (local and remote)+ branches=$(git branch -a 2>/dev/null || echo "")++ if [ -n "$branches" ]; then+ while IFS= read -r branch; do+ # Clean branch name: remove leading markers and remote prefixes+ clean_branch=$(echo "$branch" | sed 's/^[* ]*//; s|^remotes/[^/]*/||')++ # Extract feature number if branch matches pattern ###-*+ if echo "$clean_branch" | grep -q '^[0-9]\{3\}-'; then+ number=$(echo "$clean_branch" | grep -o '^[0-9]\{3\}' || echo "0")+ number=$((10#$number))+ if [ "$number" -gt "$HIGHEST_FROM_BRANCHES" ]; then HIGHEST_FROM_BRANCHES=$number; fi+ fi+ done <<< "$branches"+ fi+fi++# Use the highest number from either source+HIGHEST=$HIGHEST_FROM_SPECS+if [ "$HIGHEST_FROM_BRANCHES" -gt "$HIGHEST" ]; then+ HIGHEST=$HIGHEST_FROM_BRANCHES+fi+NEXT=$((HIGHEST + 1))FEATURE_NUM=$(printf "%03d" "$NEXT")diff --git a/scripts/powershell/create-new-feature.ps1 b/scripts/powershell/create-new-feature.ps1index 83e286aca..f267377d4 100644--- a/scripts/powershell/create-new-feature.ps1+++ b/scripts/powershell/create-new-feature.ps1@@ -79,15 +79,40 @@ Set-Location $repoRoot$specsDir = Join-Path $repoRoot 'specs'New-Item -ItemType Directory -Path $specsDir -Force | Out-Null-$highest = 0+# Get highest number from specs directory+$highestFromSpecs = 0if (Test-Path $specsDir) {Get-ChildItem -Path $specsDir -Directory | ForEach-Object {if ($_.Name -match '^(\d{3})') {$num = [int]$matches[1]- if ($num -gt $highest) { $highest = $num }+ if ($num -gt $highestFromSpecs) { $highestFromSpecs = $num }}}}++# Get highest number from branch names (both local and remote)+$highestFromBranches = 0+try {+ $branches = git branch -a 2>$null+ if ($LASTEXITCODE -eq 0) {+ foreach ($branch in $branches) {+ # Clean branch name: remove leading markers and remote prefixes+ $cleanBranch = $branch.Trim() -replace '^\*?\s+', '' -replace '^remotes/[^/]+/', ''++ # Extract feature number if branch matches pattern ###-*+ if ($cleanBranch -match '^(\d{3})-') {+ $num = [int]$matches[1]+ if ($num -gt $highestFromBranches) { $highestFromBranches = $num }+ }+ }+ }+} catch {+ # If git command fails, just continue with specs-only check+ Write-Verbose "Could not check Git branches: $_"+}++# Use the highest number from either source+$highest = [Math]::Max($highestFromSpecs, $highestFromBranches)$next = $highest + 1$featureNum = ('{0:000}' -f $next)