gitbasher 5.2.0 → 5.2.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to gitbasher are generated automatically by [semantic-release](https://github.com/semantic-release/semantic-release) from [Conventional Commits](https://www.conventionalcommits.org/) on `main`. The project follows [Semantic Versioning](https://semver.org/).
 
+## [5.2.1](https://github.com/maxbolgarin/gitbasher/compare/v5.2.0...v5.2.1) (2026-07-11)
+
+### 🐛 Bug Fixes
+
+* **commit:** gate AI split by scope count and stop discarding near-complete groupings ([90becec](https://github.com/maxbolgarin/gitbasher/commit/90becec0f49a7a3e57e57e11a71b6909884ab337))
+
 ## [5.2.0](https://github.com/maxbolgarin/gitbasher/compare/v5.1.0...v5.2.0) (2026-07-07)
 
 ### 🚀 Features

package/dist/gitb

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o pipefail
-GITBASHER_VERSION="5.2.0"
+GITBASHER_VERSION="5.2.1"
 if [ "$1" == "init" ] || [ "$1" == "i" ]; then
     git init
 fi
@@ -6972,6 +6972,18 @@ function get_max_split_groups {
     [ "$v" -gt 20 ] && v=20
     printf '%s' "$v"
 }
+function should_attempt_ai_grouping {
+    local scope_count="$1" mode="$2"
+    case "$mode" in
+        always) return 0 ;;
+        never)  return 1 ;;
+    esac
+    case "$scope_count" in
+        ''|*[!0-9]*) return 1 ;;
+    esac
+    [ "$scope_count" -ge 3 ] && return 0
+    return 1
+}
 #
 #
 #
@@ -7146,6 +7158,7 @@ Read <diff> to decide which files implement the same feature. Output TSV (scope<
     local ai_response
     ai_response=$(call_ai_api "$system_prompt" "$user_prompt" "$AI_MAX_TOKENS_FULL" "" "" "low" 2>/dev/null)
     if [ $? -ne 0 ] || [ -z "$ai_response" ]; then
+        ai_grouping_fail_reason="API error"
         return 1
     fi
     ai_response=$(printf '%s' "$ai_response" | LC_ALL=C sed -e 's/^```[a-zA-Z]*$//' -e 's/^```$//')
@@ -7153,6 +7166,14 @@ Read <diff> to decide which files implement the same feature. Output TSV (scope<
     while IFS= read -r f; do
         [ -n "$f" ] && gset_add staged_set "$f"
     done <<< "$staged_files"
+    gmap_clear folder_scope_of
+    local _fk _ff
+    for _fk in "${split_group_keys[@]}"; do
+        while IFS= read -r _ff; do
+            [ -n "$_ff" ] && gmap_set folder_scope_of "$_ff" "$_fk"
+        done <<< "$(gmap_get split_groups "$_fk")"
+    done
+    gmap_clear assigned_set
     gmap_clear new_groups
     local -a new_keys=()
     local line scope file tab_count
@@ -7174,6 +7195,8 @@ Read <diff> to decide which files implement the same feature. Output TSV (scope<
         fi
         scope=$(printf '%s' "$scope" | LC_ALL=C tr '[:upper:]' '[:lower:]')
         gset_has staged_set "$file" || continue
+        gset_has assigned_set "$file" && continue
+        gset_add assigned_set "$file"
         if ! gmap_has new_groups "$scope"; then
             new_keys+=("$scope")
             gmap_set new_groups "$scope" "$file"
@@ -7181,15 +7204,44 @@ Read <diff> to decide which files implement the same feature. Output TSV (scope<
             gmap_set new_groups "$scope" "$(gmap_get new_groups "$scope")"$'\n'"$file"
         fi
     done <<< "$ai_response"
-    local total_assigned=0 total_staged
+    local total_assigned=0 total_staged unmatched
     local key
     for key in "${new_keys[@]}"; do
         total_assigned=$((total_assigned + $(printf '%s\n' "$(gmap_get new_groups "$key")" | grep -c .)))
     done
     total_staged=$(printf '%s\n' "$staged_files" | grep -c .)
-    if [ "$total_assigned" -ne "$total_staged" ] || [ ${#new_keys[@]} -lt 1 ]; then
+    if [ ${#new_keys[@]} -lt 1 ] || [ "$total_assigned" -eq 0 ]; then
+        ai_grouping_fail_reason="no usable grouping returned"
+        return 1
+    fi
+    unmatched=$((total_staged - total_assigned))
+    [ "$unmatched" -lt 0 ] && unmatched=0   # dedup should prevent this; be safe
+    if [ "$unmatched" -gt 0 ] && [ $((unmatched * 5)) -gt "$total_staged" ]; then
+        ai_grouping_fail_reason="${unmatched} of ${total_staged} files unassigned"
         return 1
     fi
+    if [ "$unmatched" -gt 0 ]; then
+        local single_group=""
+        [ ${#new_keys[@]} -eq 1 ] && single_group="${new_keys[0]}"
+        local sf leftover_scope
+        while IFS= read -r sf; do
+            [ -z "$sf" ] && continue
+            gset_has assigned_set "$sf" && continue
+            if [ -n "$single_group" ]; then
+                leftover_scope="$single_group"
+            else
+                leftover_scope=$(gmap_get folder_scope_of "$sf")
+                [ -z "$leftover_scope" ] && leftover_scope="misc"
+            fi
+            if ! gmap_has new_groups "$leftover_scope"; then
+                new_keys+=("$leftover_scope")
+                gmap_set new_groups "$leftover_scope" "$sf"
+            else
+                gmap_set new_groups "$leftover_scope" "$(gmap_get new_groups "$leftover_scope")"$'\n'"$sf"
+            fi
+            gset_add assigned_set "$sf"
+        done <<< "$staged_files"
+    fi
     gmap_clear split_groups
     split_group_keys=()
     for key in "${new_keys[@]}"; do
@@ -7606,18 +7658,17 @@ function try_offer_commit_split {
     local ai_grouping
     ai_grouping=$(get_config_value gitbasher.commit-ai-grouping "auto")
     local should_use_ai="false"
-    case "$ai_grouping" in
-        never)  should_use_ai="false" ;;
-        *)      should_use_ai="true" ;;   # auto + always: attempt AI
-    esac
-    if [ -z "$llm" ]; then
-        should_use_ai="false"
+    if [ -n "$llm" ] && should_attempt_ai_grouping "${#split_group_keys[@]}" "$ai_grouping"; then
+        should_use_ai="true"
     fi
     if [ "$should_use_ai" = "true" ] && check_ai_available 2>/dev/null; then
         echo
         echo -e "${YELLOW}Grouping changes by feature with AI...${ENDCOLOR}"
+        local ai_grouping_fail_reason=""
         if ! group_files_by_feature_with_ai; then
-            echo -e "${YELLOW}AI feature grouping failed, falling back to folder-based grouping.${ENDCOLOR}"
+            local reason_suffix=""
+            [ -n "$ai_grouping_fail_reason" ] && reason_suffix=" (${ai_grouping_fail_reason})"
+            echo -e "${YELLOW}AI feature grouping failed${reason_suffix}, using folder-based grouping.${ENDCOLOR}"
         fi
         consolidate_split_groups "$(get_max_split_groups)"
     fi

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbasher",
-    "version": "5.2.0",
+    "version": "5.2.1",
     "description": "Simple bash utility that makes git easy to use",
     "keywords": [
         "git",