gitbasher 4.0.0 → 4.1.0

package/dist/gitb

@@ -1,13 +1,28 @@
 #!/usr/bin/env bash
 set -o pipefail
-GITBASHER_VERSION="4.0.0"
+GITBASHER_VERSION="4.1.0"
 if [ "$1" == "init" ] || [ "$1" == "i" ]; then
     git init
 fi
+GITBASHER_NO_REPO=""
 git_check=$(git branch --show-current 2>&1)
 if [[ "$git_check" == *"fatal: not a git repository"* ]]; then
-    echo "You can use gitb only in a git repository"
-    exit
+    case "${1:-}" in
+        ""|help|man|--help|-h|version|--version|-v|\
+        config|cf|cfg|conf|\
+        update|up|upd|\
+        uninstall|uns|uni|\
+        clone|cl|clo|\
+        init|i)
+            GITBASHER_NO_REPO="true"
+            export GITBASHER_NO_REPO
+            ;;
+        *)
+            echo "You can use 'gitb $1' only in a git repository."
+            echo "Run 'gitb help' to see commands that work anywhere (config, update, uninstall, clone)."
+            exit 1
+            ;;
+    esac
 fi
 if ((BASH_VERSINFO[0] < 4)); then
     _gitb_candidate=$(command -v bash 2>/dev/null)
@@ -27,11 +42,15 @@ if ((BASH_VERSINFO[0] < 4)); then
     unset _gitb_candidate
     printf "Sorry, you need at least bash-4.0 to run gitbasher.\n\n"
     printf "Linux (Debian/Ubuntu):\n    sudo apt update && sudo apt install --only-upgrade bash\n\n"
-    printf "macOS:\n    1) Install Homebrew (if missing):\n       /bin/bash -c \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\"\n    2) Install newer bash:\n       brew install bash\n    3) Optional: make it your default shell (then restart Terminal):\n       sudo sh -c 'echo /opt/homebrew/bin/bash >> /etc/shells' && chsh -s /opt/homebrew/bin/bash\n\n"
+    printf "macOS:\n    1) Install Homebrew (if missing):\n       /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\"\n    2) Install newer bash:\n       brew install bash\n    3) Optional: make it your default shell (then restart Terminal):\n       sudo sh -c 'echo /opt/homebrew/bin/bash >> /etc/shells' && chsh -s /opt/homebrew/bin/bash\n\n"
     printf "Or run gitb explicitly with the newer bash when installed:\n    /opt/homebrew/bin/bash $0 \"\$@\"\n\n"
     exit 1; 
 fi
-git_dir=$(git rev-parse --git-dir 2>/dev/null)
+if [ "$GITBASHER_NO_REPO" = "true" ]; then
+    git_dir=""
+else
+    git_dir=$(git rev-parse --git-dir 2>/dev/null)
+fi
 if [ -n "$git_dir" ] && [ -e "$git_dir/index.lock" ]; then
     printf "\033[33mDetected %s/index.lock from a possibly interrupted git operation.\033[0m\n" "$git_dir"
     printf "Another git process may be running. Remove the lock and continue?\n"
@@ -383,6 +402,11 @@ function wrong_mode {
         exit
     fi
 }
+function is_network_error {
+    local output="$1"
+    echo "$output" | grep -qiE \
+        "Could not read from remote repository|Could not resolve host|Connection timed out|Operation timed out|connect to host|Connection refused|Connection reset|Network is unreachable|kex_exchange_identification|remote end hung up unexpectedly|unable to access|Failed to connect|early EOF|RPC failed|timed out|ssh: connect|Temporary failure in name resolution|[Bb]roken pipe|[Rr]ecv failure|[Ss]end failure|TLS connection|SSL connection|no route to host"
+}
 function get_repo {
     local remote_name=${origin_name:-origin}
     local repo
@@ -1189,9 +1213,9 @@ ENDCOLOR="\e[0m"
 BOLD="\033[1m"
 NORMAL="\033[0m"
 function get_config_value {
-    value=$(git config --local --get "$1")
+    value=$(git config --local --get "$1" 2>/dev/null)
     if [ "$value" == "" ]; then
-        value=$(git config --global --get "$1")
+        value=$(git config --global --get "$1" 2>/dev/null)
         if [ "$value" == "" ]; then
             value=$2
         fi
@@ -1199,7 +1223,7 @@ function get_config_value {
     echo -e "$value"
 }
 function set_config_value {
-    if [ -z "$3" ]; then
+    if [ -z "$3" ] && [ "$GITBASHER_NO_REPO" != "true" ]; then
         git config --local "$1" "$2"
     else
         git config --global "$1" "$2"
@@ -1207,6 +1231,10 @@ function set_config_value {
     echo -e "$2"
 }
 function unset_config_value {
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        git config --global --unset "$1" 2>/dev/null
+        return
+    fi
     git config --unset "$1"
     local global_config=$(git config --global --get "$1" 2>/dev/null)
     if [ -n "$global_config" ]; then
@@ -1238,9 +1266,16 @@ function validate_git_url {
     fi
     return 1
 }
+#
+_gitb_init_run_queries="true"
 if [ -n "$GITBASHER_SKIP_INIT_QUERIES" ]; then
+    _gitb_init_run_queries=""
     return 0
 fi
+if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    _gitb_init_run_queries=""
+fi
+if [ -n "$_gitb_init_run_queries" ]; then
 current_branch=$(git branch --show-current)
 main_branch=$(get_config_value gitbasher.branch "main")
 if [[ "$( git branch | grep -E "^[[:space:]*]*main[[:space:]]*$" )" == "" ]] && [[ "$( git branch | grep -E "^[[:space:]*]*master[[:space:]]*$" )" != "" ]]; then
@@ -1252,7 +1287,7 @@ if [ "$(get_config_value gitbasher.branch "")" == "" ]; then
     git config --local gitbasher.branch "$main_branch"
 fi
 origin_name=$(git remote -v | head -n 1 | sed 's/\t.*//')
-if [ "$origin_name" == "" ]; then 
+if [ "$origin_name" == "" ]; then
     if [ -z "$GITBASHER_TEST_MODE" ] && [ -t 0 ]; then
         echo -e "${YELLOW}⚠  No remote is configured in this repo.${ENDCOLOR}"
         echo
@@ -1308,6 +1343,24 @@ if [ -n "$scopes" ]; then
 fi
 is_first=$(get_config_value gitbasher.isfirst "true")
 git config --local gitbasher.isfirst "false"
+else
+    current_branch=""
+    main_branch=$(get_config_value gitbasher.branch "main")
+    origin_name=""
+    sep=$(get_config_value gitbasher.sep "-")
+    editor=$(get_config_value core.editor "vi")
+    ticket_name=$(get_config_value gitbasher.ticket "")
+    scopes=$(get_config_value gitbasher.scopes "")
+    if [ -n "$scopes" ]; then
+        if ! validate_scope_list "$scopes" >/dev/null 2>&1; then
+            scopes=""
+        else
+            scopes="$validated_scopes"
+        fi
+    fi
+    is_first="false"
+fi
+unset _gitb_init_run_queries
 readonly OPENROUTER_API_URL="https://openrouter.ai/api/v1/chat/completions"
 readonly OPENAI_API_URL="https://api.openai.com/v1/chat/completions"
 readonly OLLAMA_API_URL="http://localhost:11434/v1/chat/completions"
@@ -2131,6 +2184,11 @@ function clear_sensitive_vars {
     fi
 }
 function set_default_branch {
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        echo -e "${RED}✗ Cannot pick a default branch outside a git repository.${ENDCOLOR}" >&2
+        echo -e "Run this inside a repo, or set one directly with ${GREEN}git config --global gitbasher.branch <name>${ENDCOLOR}." >&2
+        exit 1
+    fi
     echo -e "${YELLOW}Fetching remote branches...${ENDCOLOR}"
     echo
     fetch_output=$(git fetch 2>&1)
@@ -2144,6 +2202,7 @@ function set_default_branch {
     main_branch=$(set_config_value gitbasher.branch $branch_name)
     echo -e "${GREEN}✓ Set '${branch_name}' as the default gitbasher branch in '${project_name}'${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet '${branch_name}' globally" "true"
     main_branch=$(set_config_value gitbasher.branch $branch_name "true")
@@ -2190,6 +2249,7 @@ function set_sep {
     sep=$(set_config_value gitbasher.sep $new_sep)
     echo -e "${GREEN}✓ Set '${sep}' as the branch name separator in '${project_name}'${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet '${sep}' globally" "true"
     sep=$(set_config_value gitbasher.sep "$new_sep" "true")
@@ -2218,6 +2278,7 @@ function set_editor {
     editor=$(set_config_value core.editor $choice)
     echo -e "${GREEN}✓ Using editor '$editor' (${which_output})${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet '${editor}' globally" "true"
     editor=$(set_config_value core.editor "$choice" "true")
@@ -2250,6 +2311,7 @@ function set_ticket {
     ticket_name=$(set_config_value gitbasher.ticket $ticket_name)
     echo -e "${GREEN}✓ Set '${ticket_name}' as the ticket prefix in '${project_name}'${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet '${ticket_name}' globally" "true"
     ticket_name=$(set_config_value gitbasher.ticket $ticket_name "true")
@@ -2338,6 +2400,7 @@ function configure_ai_key {
     ai_api_key=$(set_ai_api_key "$ai_key_input")
     echo -e "${GREEN}✓ Configured AI API key for '${provider}' in '${project_name}':${ENDCOLOR} ${BLUE}$(mask_api_key "$ai_api_key")${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     echo -e "${RED}⚠  Global API keys are stored in plaintext in ~/.gitconfig.${ENDCOLOR}"
     echo -e "${CYAN}💡 For better security, set ${BLUE}GITB_AI_API_KEY_${provider_upper}${CYAN} as an environment variable instead.${ENDCOLOR}"
@@ -2391,9 +2454,11 @@ function configure_ai_provider {
             ;;
     esac
     echo
-    echo -e "Do you want to set this provider ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
-    yes_no_choice "\nSet AI provider globally" "true"
-    set_config_value gitbasher.ai-provider "$new_provider" "true"
+    if [ "$GITBASHER_NO_REPO" != "true" ]; then
+        echo -e "Do you want to set this provider ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
+        yes_no_choice "\nSet AI provider globally" "true"
+        set_config_value gitbasher.ai-provider "$new_provider" "true"
+    fi
     if ai_provider_requires_api_key && [ -z "$(get_ai_api_key)" ]; then
         echo
         echo -e "${YELLOW}No API key is set for '${new_provider}'.${ENDCOLOR}"
@@ -2470,6 +2535,7 @@ function configure_ai_model {
     set_ai_model "$model_input"
     echo -e "${GREEN}✓ Set AI model to '$model_input' for '${project_name}'${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet AI model globally" "true"
     set_config_value gitbasher.ai-model "$model_input" "true"
@@ -2517,6 +2583,7 @@ function configure_ai_proxy {
     echo -e "  ${BLUE}gitb commit ai${ENDCOLOR}    - Generate commit with AI through proxy"
     echo -e "  ${BLUE}gitb commit aif${ENDCOLOR}   - Fast AI commit through proxy"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet AI proxy globally" "true"
     set_ai_proxy "$ai_proxy_input"
@@ -2560,6 +2627,7 @@ function configure_ai_history {
     set_ai_commit_history_limit "$limit_input"
     echo -e "${GREEN}✓ Set AI commit history limit to ${limit_input} for '${project_name}'${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet AI commit history limit globally" "true"
     git config --global gitbasher.ai-commit-history-limit "$limit_input"
@@ -2621,6 +2689,7 @@ function configure_ai_diff {
         exit
     fi
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to apply ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nApply AI diff settings globally" "true"
     if [ -n "$lines_input" ]; then
@@ -2658,10 +2727,17 @@ function set_scopes {
         exit 1
     fi
     scopes_raw="$validated_scopes"
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        git config --global --replace-all gitbasher.scopes "$scopes_raw"
+        scopes="$scopes_raw"
+        echo -e "${GREEN}✓ Set '${scopes}' as the global scopes list${ENDCOLOR}"
+        return
+    fi
     git config --local --replace-all gitbasher.scopes "$scopes_raw"
     scopes="$scopes_raw"
     echo -e "${GREEN}✓ Set '${scopes}' as the scopes list in '${project_name}'${ENDCOLOR}"
     echo
+    [ "$GITBASHER_NO_REPO" = "true" ] && exit
     echo -e "Do you want to set it ${YELLOW}globally${ENDCOLOR} for all projects (y/n)?"
     yes_no_choice "\nSet '${scopes}' globally" "true"
     git config --global --replace-all gitbasher.scopes "$scopes_raw"
@@ -2772,13 +2848,17 @@ function set_user {
         user_email="$validated_email"
     fi
     echo
+    local _user_scope="--local"
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        _user_scope="--global"
+    fi
     if [ "$user_name" != "" ]; then
         echo -e "${GREEN}✓ Set user name to '${user_name}'${ENDCOLOR}"
-        git config --local --replace-all user.name "$user_name"
+        git config "$_user_scope" --replace-all user.name "$user_name"
     fi
     if [ "$user_email" != "" ]; then
         echo -e "${GREEN}✓ Set user email to '${user_email}'${ENDCOLOR}"
-        git config --local --replace-all user.email "$user_email"
+        git config "$_user_scope" --replace-all user.email "$user_email"
     fi
 }
 function config_script {
@@ -5041,7 +5121,7 @@ function pull_script {
                 else
                     echo -e "${GREEN}✓ Fetched '$origin_name/$current_branch'${ENDCOLOR}"
                 fi
-                if [ "$fetch_output" != "" ]; then
+                if [ "$fetch_output" != "" ] && [ -z "$fetch_progress_shown" ]; then
                     echo
                     echo -e "$fetch_output"
                 fi
@@ -5087,19 +5167,40 @@ function pull_script {
     exit
 }
 function fetch {
-    if [ -n "$3" ]; then
-        fetch_output=$(git fetch --all 2>&1)
-        fetch_code=$?
-    else
-        fetch_output=$(git fetch "$2" "$1" 2>&1)
-        fetch_code=$?
+    fetch_progress_shown=""
+    if [ -t 1 ] && [ -t 2 ]; then
+        local tmp_file
+        tmp_file=$(mktemp 2>/dev/null)
+        if [ -n "$tmp_file" ]; then
+            if [ -n "$3" ]; then
+                git fetch --all --progress 2>&1 | tee "$tmp_file"
+                fetch_code=${PIPESTATUS[0]}
+            else
+                git fetch --progress "$2" "$1" 2>&1 | tee "$tmp_file"
+                fetch_code=${PIPESTATUS[0]}
+            fi
+            fetch_output=$(cat "$tmp_file")
+            rm -f "$tmp_file"
+            fetch_progress_shown="true"
+        fi
+    fi
+    if [ -z "$fetch_progress_shown" ]; then
+        if [ -n "$3" ]; then
+            fetch_output=$(git fetch --all 2>&1)
+            fetch_code=$?
+        else
+            fetch_output=$(git fetch "$2" "$1" 2>&1)
+            fetch_code=$?
+        fi
     fi
     if [ $fetch_code == 0 ] ; then
         return
     fi
     if [[ ${fetch_output} != *"couldn't find remote ref"* ]]; then
         echo -e "${RED}✗ Cannot fetch '$1'.${ENDCOLOR}"
-        echo -e "${fetch_output}"
+        if [ -z "$fetch_progress_shown" ]; then
+            echo -e "${fetch_output}"
+        fi
         exit $fetch_code
     fi
     echo -e "${YELLOW}Branch '$1' does not exist on $2.${ENDCOLOR}"
@@ -5190,65 +5291,84 @@ function pull {
     fi
 }
 function push {
-    push_output=$(git push "$@" "${origin_name}" "${current_branch}" 2>&1)
-    push_code=$?
-    if [ $push_code -eq 0 ] ; then
-        echo -e "${GREEN}✓ Pushed to ${origin_name}/${current_branch}${ENDCOLOR}"
-        repo=$(get_repo)
-        host=$(get_repo_host "$repo")
-        head_hash=$(git rev-parse HEAD 2>/dev/null)
-        print_link "Repo" "$repo"
-        if [ -n "$head_hash" ]; then
-            commit_url=$(get_commit_url "$head_hash" "$repo")
-            if [ -n "$commit_url" ]; then
-                print_link "Commit" "$commit_url"
-            fi
-        fi
-        if [[ ${current_branch} != ${main_branch} ]]; then
-            branch_url=$(get_branch_url "${current_branch}" "$repo")
-            if [ -n "$branch_url" ]; then
-                print_link "Branch" "$branch_url"
-            fi
-            link=$(echo "$push_output" | grep -Eo "https?://[^[:space:]]+" | head -n 1 | sed 's|^remote:[[:space:]]*||')
-            if [ "$host" = "github" ]; then
-                if [ -n "$link" ]; then
-                    print_link "New PR" "$link"
-                else
-                    new_pr_url=$(get_new_pr_url "${main_branch}" "${current_branch}" "$repo")
-                    print_link "New PR" "$new_pr_url"
+    local push_max_retries=4
+    local push_retry_delay=2
+    local push_attempt=0
+    while true; do
+        push_output=$(git push "$@" "${origin_name}" "${current_branch}" 2>&1)
+        push_code=$?
+        if [ $push_code -eq 0 ] ; then
+            echo -e "${GREEN}✓ Pushed to ${origin_name}/${current_branch}${ENDCOLOR}"
+            repo=$(get_repo)
+            host=$(get_repo_host "$repo")
+            head_hash=$(git rev-parse HEAD 2>/dev/null)
+            print_link "Repo" "$repo"
+            if [ -n "$head_hash" ]; then
+                commit_url=$(get_commit_url "$head_hash" "$repo")
+                if [ -n "$commit_url" ]; then
+                    print_link "Commit" "$commit_url"
+                fi
+            fi
+            if [[ ${current_branch} != ${main_branch} ]]; then
+                branch_url=$(get_branch_url "${current_branch}" "$repo")
+                if [ -n "$branch_url" ]; then
+                    print_link "Branch" "$branch_url"
                 fi
-            elif [ "$host" = "gitlab" ]; then
-                if [ -n "$link" ]; then
-                    is_new=$(echo "$push_output" | grep -i "create a merge request")
-                    if [ -n "$is_new" ]; then
-                        print_link "New MR" "$link"
+                link=$(echo "$push_output" | grep -Eo "https?://[^[:space:]]+" | head -n 1 | sed 's|^remote:[[:space:]]*||')
+                if [ "$host" = "github" ]; then
+                    if [ -n "$link" ]; then
+                        print_link "New PR" "$link"
                     else
-                        print_link "MR" "$link"
+                        new_pr_url=$(get_new_pr_url "${main_branch}" "${current_branch}" "$repo")
+                        print_link "New PR" "$new_pr_url"
+                    fi
+                elif [ "$host" = "gitlab" ]; then
+                    if [ -n "$link" ]; then
+                        is_new=$(echo "$push_output" | grep -i "create a merge request")
+                        if [ -n "$is_new" ]; then
+                            print_link "New MR" "$link"
+                        else
+                            print_link "MR" "$link"
+                        fi
+                    else
+                        new_mr_url=$(get_new_pr_url "${main_branch}" "${current_branch}" "$repo")
+                        print_link "New MR" "$new_mr_url"
+                    fi
+                elif [ "$host" = "bitbucket" ]; then
+                    if [ -n "$link" ]; then
+                        print_link "New PR" "$link"
+                    else
+                        new_pr_url=$(get_new_pr_url "${main_branch}" "${current_branch}" "$repo")
+                        print_link "New PR" "$new_pr_url"
                     fi
-                else
-                    new_mr_url=$(get_new_pr_url "${main_branch}" "${current_branch}" "$repo")
-                    print_link "New MR" "$new_mr_url"
-                fi
-            elif [ "$host" = "bitbucket" ]; then
-                if [ -n "$link" ]; then
-                    print_link "New PR" "$link"
-                else
-                    new_pr_url=$(get_new_pr_url "${main_branch}" "${current_branch}" "$repo")
-                    print_link "New PR" "$new_pr_url"
                 fi
             fi
+            ci_url=$(get_ci_url "${current_branch}" "$repo")
+            if [ -n "$ci_url" ]; then
+                print_link "$(get_ci_label "$repo")" "$ci_url"
+            fi
+            exit
         fi
-        ci_url=$(get_ci_url "${current_branch}" "$repo")
-        if [ -n "$ci_url" ]; then
-            print_link "$(get_ci_label "$repo")" "$ci_url"
+        if [[ $push_output == *"[rejected]"* ]]; then
+            return
+        fi
+        if is_network_error "$push_output" && [ $push_attempt -lt $push_max_retries ]; then
+            push_attempt=$((push_attempt + 1))
+            echo -e "${YELLOW}⚠  Network error while pushing — retrying in ${push_retry_delay}s (attempt ${push_attempt}/${push_max_retries})...${ENDCOLOR}"
+            echo "$push_output" | head -n 2
+            echo
+            sleep $push_retry_delay
+            push_retry_delay=$((push_retry_delay * 2))
+            continue
         fi
-        exit
-    fi
-    if [[ $push_output != *"[rejected]"* ]]; then
         echo -e "${RED}✗ Cannot push.${ENDCOLOR}"
         echo "$push_output"
+        if [ $push_attempt -gt 0 ]; then
+            echo
+            echo -e "${YELLOW}⚠  Still failing after ${push_attempt} retries — check your network/VPN, then run ${GREEN}gitb push${YELLOW} again.${ENDCOLOR}"
+        fi
         exit $push_code
-    fi
+    done
 }
 function push_script {
     case "$1" in
@@ -5502,11 +5622,16 @@ function detect_scopes_from_staged_files {
             detected_scopes_sorted=("${filename_sorted[@]}" "${directory_sorted[@]}")
             final_scopes=()
             count=0
+            declare -A seen_norm=()
             for entry in "${detected_scopes_sorted[@]}"; do
                 if [ $count -ge 9 ]; then
                     break
                 fi
                 token="${entry##*:}"  # Extract token after last colon
+                token=$(normalize_scope_name "$token")
+                [ -z "$token" ] && continue
+                [ -n "${seen_norm[$token]:-}" ] && continue
+                seen_norm["$token"]=1
                 final_scopes+=("$token")
                 count=$((count + 1))
             done
@@ -5514,6 +5639,12 @@ function detect_scopes_from_staged_files {
         fi
     fi
 }
+function normalize_scope_name {
+    local s="$1"
+    while [[ "$s" == [._-]* ]]; do s="${s#?}"; done
+    while [[ "$s" == *[._-] ]]; do s="${s%?}"; done
+    printf '%s' "$s"
+}
 function build_split_groups_from_staged {
     detect_scopes_from_staged_files
     unset split_groups split_group_keys
@@ -5542,6 +5673,8 @@ function build_split_groups_from_staged {
             comp_lower="${comp,,}"
             comp_no_ext_lower="${comp_lower%.*}"
             [ -z "$comp_no_ext_lower" ] && comp_no_ext_lower="$comp_lower"
+            comp_lower=$(normalize_scope_name "$comp_lower")
+            comp_no_ext_lower=$(normalize_scope_name "$comp_no_ext_lower")
             for scope in "${scopes_arr[@]}"; do
                 if [ "$comp_lower" = "$scope" ] || [ "$comp_no_ext_lower" = "$scope" ]; then
                     assigned="$scope"
@@ -5553,6 +5686,7 @@ function build_split_groups_from_staged {
             local stem="${comps[$last_idx_inner]}"
             stem="${stem%.*}"          # drop the extension
             stem="${stem,,}"           # lowercase
+            stem=$(normalize_scope_name "$stem")
             if [ -n "$stem" ] && [[ ! "$stem" =~ ^(index|main|mod|init|app|__init__|setup|config|types|utils|util|helpers|helper|common|shared)$ ]]; then
                 assigned="$stem"
             fi
@@ -5565,11 +5699,102 @@ function build_split_groups_from_staged {
             split_groups[$assigned]+=$'\n'"$file"
         fi
     done <<< "$staged_files"
+    consolidate_split_groups "$(get_max_split_groups)"
     if [ ${#split_group_keys[@]} -lt 2 ]; then
         return 1
     fi
     return 0
 }
+function get_max_split_groups {
+    local v
+    v=$(get_config_value gitbasher.commit-max-split-groups "7")
+    case "$v" in
+        ''|*[!0-9]*) v=7 ;;
+    esac
+    [ "$v" -lt 2 ] && v=2
+    [ "$v" -gt 20 ] && v=20
+    printf '%s' "$v"
+}
+function consolidate_split_groups {
+    local max="$1"
+    case "$max" in ''|*[!0-9]*) max=7 ;; esac
+    [ "$max" -lt 2 ] && max=2
+    [ ${#split_group_keys[@]} -le "$max" ] && return 0
+    local -A rebucket=()
+    local -a rebucket_keys=()
+    local key file bucket comp_lower i last_idx
+    local -a comps
+    for key in "${split_group_keys[@]}"; do
+        while IFS= read -r file; do
+            [ -z "$file" ] && continue
+            IFS='/' read -r -a comps <<< "$file"
+            last_idx=$((${#comps[@]} - 1))
+            bucket=""
+            for i in "${!comps[@]}"; do
+                [ "$i" -eq "$last_idx" ] && continue   # skip the filename
+                comp_lower="${comps[$i],,}"
+                [ -z "$comp_lower" ] && continue
+                if [[ "$comp_lower" =~ ^(src|lib|libs|scripts|bin|node_modules|vendor|tmp|temp|cache|logs|log|services|apps|packages|modules|components|cmd|internal)$ ]]; then
+                    continue
+                fi
+                bucket=$(normalize_scope_name "$comp_lower")   # .github -> github
+                [ -z "$bucket" ] && continue
+                break
+            done
+            [ -z "$bucket" ] && bucket="misc"
+            if [ -z "${rebucket[$bucket]:-}" ]; then
+                rebucket_keys+=("$bucket")
+                rebucket[$bucket]="$file"
+            else
+                rebucket[$bucket]+=$'\n'"$file"
+            fi
+        done <<< "${split_groups[$key]}"
+    done
+    unset split_groups split_group_keys
+    declare -gA split_groups=()
+    split_group_keys=()
+    for key in "${rebucket_keys[@]}"; do
+        split_groups[$key]="${rebucket[$key]}"
+        split_group_keys+=("$key")
+    done
+    [ ${#split_group_keys[@]} -le "$max" ] && return 0
+    local -a sized=()
+    local n
+    for key in "${split_group_keys[@]}"; do
+        n=$(printf '%s\n' "${split_groups[$key]}" | grep -c .)
+        sized+=("${n}"$'\t'"${key}")
+    done
+    IFS=$'\n' sized=($(printf '%s\n' "${sized[@]}" | sort -t$'\t' -k1,1nr -k2,2))
+    unset IFS
+    local -A kept=()
+    local -a kept_keys=()
+    local keep_limit=$((max - 1))
+    local misc_files="" idx=0 entry
+    for entry in "${sized[@]}"; do
+        key="${entry#*$'\t'}"
+        if [ "$idx" -lt "$keep_limit" ] && [ "$key" != "misc" ]; then
+            kept_keys+=("$key")
+            kept[$key]="${split_groups[$key]}"
+            idx=$((idx + 1))
+        elif [ -z "$misc_files" ]; then
+            misc_files="${split_groups[$key]}"
+        else
+            misc_files+=$'\n'"${split_groups[$key]}"
+        fi
+    done
+    unset split_groups split_group_keys
+    declare -gA split_groups=()
+    split_group_keys=()
+    for key in "${kept_keys[@]}"; do
+        split_groups[$key]="${kept[$key]}"
+        split_group_keys+=("$key")
+    done
+    if [ -n "$misc_files" ]; then
+        split_group_keys+=("misc")
+        split_groups[misc]="$misc_files"
+    fi
+    return 0
+}
 function is_heuristic_weak {
     local total
     total=$(git -c core.quotePath=false diff --name-only --cached | grep -c .)
@@ -5601,10 +5826,12 @@ function refine_groups_with_ai {
     if [ -n "$detected_scopes" ]; then
         heuristic_hint="$detected_scopes"
     fi
-    local system_prompt='You group staged git files into logical scopes for atomic commits.
+    local max_groups
+    max_groups=$(get_max_split_groups)
+    local system_prompt="You group staged git files into logical scopes for atomic commits.
 Input arrives in XML tags: a list of staged files, a diff summary, recent commit messages (for codebase scope conventions), and heuristic-detected candidate scope tokens.
-Task: assign EVERY staged file to a single scope. Use 2-5 groups when there is meaningful separation; use exactly 1 group only if all files truly belong together. Use lowercase scope names that match the style of <recent_commits>. Prefer scope names from <heuristic_candidates> when they fit the file path or change; invent new ones only when none of the candidates apply. Use "misc" for files with no clear scope (e.g., README, top-level config).
-Output format: TSV only. One line per staged file in the form <scope><TAB><file_path>. No header, no prose, no markdown fences, no surrounding quotes. Every file from <staged_files> MUST appear exactly once. The file paths must be byte-identical to those in <staged_files>.'
+Task: assign EVERY staged file to a single scope. Use 2 to ${max_groups} groups when there is meaningful separation; use exactly 1 group only if all files truly belong together. Never exceed ${max_groups} groups — when many files share a theme, prefer a single broader scope over several tiny ones. Use lowercase scope names that match the style of <recent_commits>. Prefer scope names from <heuristic_candidates> when they fit the file path or change; invent new ones only when none of the candidates apply. Use \"misc\" for files with no clear scope (e.g., README, top-level config).
+Output format: TSV only. One line per staged file in the form <scope><TAB><file_path>. No header, no prose, no markdown fences, no surrounding quotes. Every file from <staged_files> MUST appear exactly once. The file paths must be byte-identical to those in <staged_files>."
     local user_prompt="<recent_commits>
 ${recent_commits}
 </recent_commits>
@@ -6093,6 +6320,7 @@ function try_offer_commit_split {
         if ! refine_groups_with_ai; then
             echo -e "${YELLOW}AI grouping failed, falling back to heuristic.${ENDCOLOR}"
         fi
+        consolidate_split_groups "$(get_max_split_groups)"
     fi
     if [ ${#split_group_keys[@]} -lt 2 ]; then
         if [ -n "$force_split" ]; then
@@ -6286,8 +6514,8 @@ function set_commit_flag_from_token {
         fixup|fix|x)         fixup="true";;
         amend|am|a)          amend="true";;
         split|sp|sl)         split="true";;
-        last|l)              last="true";;
         revert|rev)          revert="true";;
+        last|l)              last="true";; # deprecated alias of `gitb edit`; kept for back-compat
         help|h)              help="true";;
         *) return 1;;
     esac
@@ -6295,30 +6523,26 @@ function set_commit_flag_from_token {
 }
 function validate_commit_flag_combo {
     local actions=() invalid=()
-    [ -n "$last" ]   && actions+=("last")
     [ -n "$revert" ] && actions+=("revert")
     [ -n "$fixup" ]  && actions+=("fixup")
     [ -n "$amend" ]  && actions+=("amend")
     [ -n "$split" ]  && actions+=("split")
     if [ ${#actions[@]} -gt 1 ]; then
         echo -e "${RED}✗ Cannot combine actions: ${actions[*]}${ENDCOLOR}"
-        echo -e "Pick one of: last, revert, fixup, amend, split."
+        echo -e "Pick one of: revert, fixup, amend, split."
         exit 1
     fi
-    local lone=""
-    [ -n "$last" ]   && lone="last"
-    [ -n "$revert" ] && lone="revert"
-    if [ -n "$lone" ]; then
+    if [ -n "$revert" ]; then
         [ -n "$llm" ]      && invalid+=("ai")
         [ -n "$fast" ]     && invalid+=("fast")
-        [ -n "$push" ]     && invalid+=("push")
         [ -n "$scope" ]    && invalid+=("scope")
         [ -n "$msg" ]      && invalid+=("msg")
         [ -n "$ticket" ]   && invalid+=("ticket")
         [ -n "$staged" ]   && invalid+=("staged")
         [ -n "$no_split" ] && invalid+=("no-split")
         if [ ${#invalid[@]} -gt 0 ]; then
-            echo -e "${RED}✗ '${lone}' takes no modifiers (got: ${invalid[*]})${ENDCOLOR}"
+            echo -e "${RED}✗ 'revert' does not use: ${invalid[*]}${ENDCOLOR}"
+            echo -e "Only push applies (the revert commit message is auto-generated)."
             exit 1
         fi
     fi
@@ -6347,8 +6571,6 @@ function summarize_commit_intent {
     local action="commit" mods=()
     if [ -n "$auto_accept" ]; then
         action="ultrafast commit (ai + fast + auto-accept)"
-    elif [ -n "$last" ]; then
-        action="amend last commit (reuse message)"
     elif [ -n "$revert" ]; then
         action="revert a commit"
     elif [ -n "$amend" ]; then
@@ -6403,8 +6625,9 @@ function commit_script {
         amend|am|a)         amend="true";;
         amendst|ast|sta)    amend="true"; staged="true";;
         amendf|amf|af|fa)   amend="true"; fast="true";;
-        last|l)             last="true";;
+        last|l)             last="true";; # deprecated alias of `gitb edit`; kept for back-compat
         revert|rev)         revert="true";;
+        revertp|revp|rp)    revert="true"; push="true";;
         llm|ai|i)           llm="true";;
         llmf|aif|if)        llm="true"; fast="true";;
         llmp|aip|ip)        llm="true"; push="true";;
@@ -6421,6 +6644,10 @@ function commit_script {
             wrong_mode "commit" $1
     esac
     fi
+    if [ -n "$last" ]; then
+        edit_script ""
+        exit
+    fi
     validate_commit_flag_combo
     header_msg="GIT COMMIT"
     if [ -n "${llm}" ]; then
@@ -6466,8 +6693,6 @@ function commit_script {
         header_msg="$header_msg TICKET"
     elif [ -n "${amend}" ]; then
         header_msg="$header_msg AMEND LAST"
-    elif [ -n "${last}" ]; then
-        header_msg="$header_msg LAST"
     elif [ -n "${revert}" ]; then
         header_msg="$header_msg REVERT"
     fi
@@ -6488,7 +6713,6 @@ function commit_script {
         print_help_row $PAD "split"   "sp, sl"         "Split staged changes into one commit per detected scope"
         print_help_row $PAD "fixup"   "x, fix"         "Create a ${GREEN}--fixup${ENDCOLOR} commit against an older commit"
         print_help_row $PAD "amend"   "a, am"          "Add changes into the last commit (no message edit)"
-        print_help_row $PAD "last"    "l"              "Rewrite the last commit message"
         print_help_row $PAD "revert"  "rev"            "Revert a commit (${GREEN}git revert --no-edit${ENDCOLOR})"
         print_help_row $PAD "ff"      ""               "Ultrafast: ${BOLD}ai + split + fast${NORMAL} with no prompts (use ${BOLD}ffp${NORMAL} to also push)"
         print_help_row $PAD "help"    "h, --help, -h"  "Show this help"
@@ -6519,18 +6743,13 @@ function commit_script {
         echo -e "  ${BLUE}•${ENDCOLOR} Word order doesn't matter: ${GREEN}ai fast push${ENDCOLOR} == ${GREEN}push fast ai${ENDCOLOR} == ${GREEN}aifp${ENDCOLOR}"
         echo -e "  ${BLUE}•${ENDCOLOR} Modifiers stack on actions: ${GREEN}ai+fixup${ENDCOLOR}, ${GREEN}fast+amend${ENDCOLOR}, ${GREEN}split+push${ENDCOLOR}, ${GREEN}ai+staged${ENDCOLOR}, ..."
         echo -e "  ${BLUE}•${ENDCOLOR} ${BOLD}fast${NORMAL} and ${BOLD}staged${NORMAL} are mutually exclusive (one stages all, the other uses what's staged)"
-        echo -e "  ${BLUE}•${ENDCOLOR} ${BOLD}last${NORMAL} and ${BOLD}revert${NORMAL} take no modifiers; ${BOLD}ff${NORMAL} only accepts ${BOLD}push${NORMAL} (as ${BOLD}ffp${NORMAL})"
+        echo -e "  ${BLUE}•${ENDCOLOR} ${BOLD}revert${NORMAL} and ${BOLD}ff${NORMAL} only accept ${BOLD}push${NORMAL} (as ${BOLD}revp${NORMAL}/${BOLD}ffp${NORMAL}); to rewrite the last message use ${GREEN}gitb edit${ENDCOLOR}"
         git config --unset gitbasher.cached-git-add 2>/dev/null || true
         exit 0
     fi
     summarize_commit_intent
     echo
     warn_if_detached_head "commit"
-    if [ -n "$last" ]; then
-        git config --unset gitbasher.cached-git-add 2>/dev/null
-        git commit --amend
-        exit
-    fi
     is_clean=$(LC_ALL=C git status --porcelain)
     if [ -z "$is_clean" ]; then
         if [ -z "${revert}" ]; then
@@ -6570,6 +6789,10 @@ function commit_script {
         result=$(git revert --no-edit ${commit_hash} 2>&1)
         check_code $? "$result" "revert"
         after_commit "revert"
+        if [ -n "${push}" ]; then
+            echo
+            push_script y
+        fi
         exit
     fi
     if [ -z "${fast}" ] && [ -z "${staged}" ]; then 
@@ -6773,6 +6996,10 @@ function commit_script {
         git config --unset gitbasher.cached-commit-message 2>/dev/null
         echo
         after_commit "amend"
+        if [ -n "${push}" ]; then
+            echo
+            push_script y
+        fi
         exit
     fi
     echo
@@ -7042,6 +7269,184 @@ ${staged_with_tab}
         push_script y
     fi
 }
+function edit_script {
+    local mode="amend"
+    case "$1" in
+        help|h|--help|-h)
+            echo -e "${YELLOW}GIT EDIT${ENDCOLOR}"
+            echo
+            echo -e "usage: ${YELLOW}gitb edit [mode] [arg]${ENDCOLOR}"
+            echo
+            echo -e "Rewrite a commit message or rename the current branch."
+            echo
+            echo -e "${YELLOW}Modes${ENDCOLOR}"
+            echo -e "  ${BOLD}<empty>${NORMAL}                  Reword the ${BOLD}last${NORMAL} commit (${GREEN}git commit --amend${ENDCOLOR})"
+            echo -e "  ${BOLD}pick${NORMAL}   (${BOLD}p${NORMAL}, ${BOLD}c${NORMAL})         Choose any recent commit and reword it via rebase"
+            echo -e "  ${BOLD}branch${NORMAL} (${BOLD}b${NORMAL}, ${BOLD}br${NORMAL}, ${BOLD}rename${NORMAL})  Rename the current branch (${GREEN}git branch -m${ENDCOLOR})"
+            echo -e "  ${BOLD}help${NORMAL}   (${BOLD}h${NORMAL})               Show this help"
+            echo
+            echo -e "${YELLOW}Notes${ENDCOLOR}"
+            echo -e "  ${BLUE}•${ENDCOLOR} ${BOLD}pick${NORMAL} requires a clean working tree (the rebase replays commits)."
+            echo -e "  ${BLUE}•${ENDCOLOR} Merge commits and the root commit cannot be reworded this way."
+            echo -e "  ${BLUE}•${ENDCOLOR} If a reworded commit was already pushed, run ${YELLOW}gitb push force${ENDCOLOR} afterwards."
+            echo -e "  ${BLUE}•${ENDCOLOR} ${BOLD}branch${NORMAL} accepts an optional new name: ${YELLOW}gitb edit branch feat/new-name${ENDCOLOR}."
+            echo -e "  ${BLUE}•${ENDCOLOR} To add staged changes into the last commit, use ${YELLOW}gitb commit amend${ENDCOLOR}."
+            echo -e "  ${BLUE}•${ENDCOLOR} To undo the amend/rebase, use ${YELLOW}gitb undo amend${ENDCOLOR} / ${YELLOW}gitb undo rebase${ENDCOLOR}."
+            exit 0
+            ;;
+        "")
+            ;;
+        pick|p|c|choose)
+            mode="pick"
+            ;;
+        branch|b|br|rename|ren)
+            mode="branch"
+            ;;
+        *)
+            wrong_mode "edit" "$1"
+            ;;
+    esac
+    echo -e "${YELLOW}GIT EDIT${ENDCOLOR}"
+    echo
+    warn_if_detached_head "edit"
+    if [ "$mode" = "branch" ]; then
+        edit_branch_name "$2"
+        return
+    fi
+    if ! git rev-parse --verify HEAD >/dev/null 2>&1; then
+        echo -e "${RED}✗ No commits yet — nothing to edit.${ENDCOLOR}"
+        exit 1
+    fi
+    git config --unset gitbasher.cached-git-add 2>/dev/null
+    if [ "$mode" = "amend" ]; then
+        git commit --amend
+        return
+    fi
+    local dirty
+    dirty=$(LC_ALL=C git status --porcelain)
+    if [ -n "$dirty" ]; then
+        echo -e "${RED}✗ Working tree has uncommitted changes — cannot reword via rebase.${ENDCOLOR}"
+        echo -e "Commit, stash, or save them first (try ${YELLOW}gitb wip up${ENDCOLOR})."
+        exit 1
+    fi
+    echo -e "${YELLOW}Step 1.${ENDCOLOR} Select a commit to ${YELLOW}reword${ENDCOLOR}:"
+    choose_commit 19
+    if [ -z "$commit_hash" ]; then
+        exit
+    fi
+    local head_hash
+    head_hash=$(git rev-parse --short HEAD)
+    if [ "$commit_hash" = "$head_hash" ]; then
+        echo
+        git commit --amend
+        return
+    fi
+    if git rev-parse --verify "${commit_hash}^2" >/dev/null 2>&1; then
+        echo
+        echo -e "${RED}✗ Cannot reword a merge commit via rebase.${ENDCOLOR}"
+        exit 1
+    fi
+    if ! git rev-parse --verify "${commit_hash}^" >/dev/null 2>&1; then
+        echo
+        echo -e "${RED}✗ Cannot reword the root commit this way.${ENDCOLOR}"
+        echo -e "Use ${YELLOW}git rebase -i --root${ENDCOLOR} manually."
+        exit 1
+    fi
+    local seq_script
+    seq_script=$(mktemp "${TMPDIR:-/tmp}/gitb-edit-seq.XXXXXX")
+    chmod 600 "$seq_script"
+    trap 'rm -f "$seq_script"' EXIT INT TERM
+    cat > "$seq_script" <<SEQ_EOF
+todo="\$1"
+tmpfile="\$(mktemp "\${todo}.XXXXXX")"
+awk -v target="${commit_hash}" '
+    \$1 == "pick" && (index(\$2, target) == 1 || index(target, \$2) == 1) { \$1 = "reword" }
+    { print }
+' "\$todo" > "\$tmpfile"
+mv "\$tmpfile" "\$todo"
+SEQ_EOF
+    echo
+    echo -e "${YELLOW}Rewording ${commit_hash}...${ENDCOLOR}"
+    GIT_SEQUENCE_EDITOR="bash $seq_script" git rebase -i "${commit_hash}^"
+}
+function edit_branch_name {
+    local new_name="$1"
+    local old_name="$current_branch"
+    if [ -z "$old_name" ]; then
+        echo -e "${RED}✗ Could not determine the current branch.${ENDCOLOR}"
+        exit 1
+    fi
+    if [ -z "$new_name" ]; then
+        echo -e "${YELLOW}Renaming branch ${BOLD}${old_name}${NORMAL}${ENDCOLOR}"
+        echo -e "Press Enter to keep the current name (no-op), or 0 to cancel"
+        read_editable_input new_name "New name: " "$old_name"
+        echo
+        if [ "$new_name" = "0" ] || [ -z "$new_name" ]; then
+            echo -e "${YELLOW}Cancelled.${ENDCOLOR}"
+            exit
+        fi
+    fi
+    if ! sanitize_git_name "$new_name"; then
+        show_sanitization_error "branch name" "Use only letters, numbers, dots, dashes, underscores, and slashes."
+        exit 1
+    fi
+    new_name="$sanitized_git_name"
+    if [ "$new_name" = "$old_name" ]; then
+        echo -e "${YELLOW}New name matches the current name — nothing to do.${ENDCOLOR}"
+        exit
+    fi
+    if git show-ref --verify --quiet "refs/heads/${new_name}"; then
+        echo -e "${RED}✗ A local branch named ${BOLD}${new_name}${NORMAL} already exists.${ENDCOLOR}"
+        exit 1
+    fi
+    if [ "$old_name" = "$main_branch" ]; then
+        echo -e "${YELLOW}⚠  ${BOLD}${old_name}${NORMAL} is the configured main branch.${ENDCOLOR}"
+        echo -e "Renaming it will leave ${YELLOW}gitbasher.branch${ENDCOLOR} pointing at the old name."
+        printf "Rename anyway? (y/n) "
+        yes_no_choice
+        echo
+    fi
+    local result
+    result=$(git branch -m "$old_name" "$new_name" 2>&1)
+    if [ $? -ne 0 ]; then
+        echo -e "${RED}✗ Could not rename branch.${ENDCOLOR}"
+        echo "$result"
+        exit 1
+    fi
+    current_branch="$new_name"
+    echo -e "${GREEN}✓ Renamed ${BOLD}${old_name}${NORMAL}${GREEN} → ${BOLD}${new_name}${NORMAL}${ENDCOLOR}"
+    if [ -z "$origin_name" ]; then
+        return
+    fi
+    if ! git ls-remote --exit-code --heads "$origin_name" "$old_name" >/dev/null 2>&1; then
+        echo -e "Push the renamed branch when ready: ${YELLOW}gitb push${ENDCOLOR}"
+        return
+    fi
+    echo
+    echo -e "${YELLOW}${BOLD}${old_name}${NORMAL}${YELLOW} also exists on ${origin_name}.${ENDCOLOR}"
+    echo -e "Push ${BOLD}${new_name}${NORMAL} and delete the old remote branch?"
+    printf "(y/n) "
+    yes_no_choice
+    echo
+    local push_out
+    push_out=$(git push -u "$origin_name" "$new_name" 2>&1)
+    if [ $? -ne 0 ]; then
+        echo -e "${RED}✗ Could not push ${BOLD}${new_name}${NORMAL}${RED} to ${origin_name}.${ENDCOLOR}"
+        echo "$push_out"
+        echo -e "Old remote branch ${BOLD}${old_name}${NORMAL} left intact."
+        exit 1
+    fi
+    echo -e "${GREEN}✓ Pushed ${BOLD}${new_name}${NORMAL}${GREEN} to ${origin_name}${ENDCOLOR}"
+    local del_out
+    del_out=$(git push "$origin_name" --delete "$old_name" 2>&1)
+    if [ $? -ne 0 ]; then
+        echo -e "${YELLOW}⚠  Could not delete ${BOLD}${old_name}${NORMAL}${YELLOW} on ${origin_name}.${ENDCOLOR}"
+        echo "$del_out"
+        echo -e "Delete it manually with ${YELLOW}git push ${origin_name} --delete ${old_name}${ENDCOLOR} when ready."
+        return
+    fi
+    echo -e "${GREEN}✓ Deleted ${BOLD}${old_name}${NORMAL}${GREEN} on ${origin_name}${ENDCOLOR}"
+}
 function branch_script {
     case "$1" in
         list|l)      list="true";;
@@ -11993,6 +12398,97 @@ function origin_script {
         exit
     fi
 }
+function _gitb_clone_dest_from_url {
+    local url="$1"
+    local stripped="${url%.git}"
+    local last="${stripped##*/}"
+    last="${last##*:}"
+    echo "$last"
+}
+function _gitb_print_clone_help {
+    local PAD=14
+    echo -e "usage: ${YELLOW}gitb clone <url> [destination]${ENDCOLOR}"
+    echo
+    echo -e "Clone a remote repository, show progress, and initialize gitbasher in it."
+    echo
+    print_help_header $PAD
+    print_help_row $PAD "<url>"         "" "Git URL to clone (https, ssh, or git@)"
+    print_help_row $PAD "[destination]" "" "Optional target directory (default: repo name)"
+    print_help_row $PAD "help"          "h" "Show this help"
+    echo
+    echo -e "${YELLOW}Examples${ENDCOLOR}"
+    echo -e "  ${GREEN}gitb clone https://github.com/user/repo.git${ENDCOLOR}"
+    echo -e "  ${GREEN}gitb clone git@github.com:user/repo.git my-repo${ENDCOLOR}"
+    exit
+}
+function clone_script {
+    echo -e "${YELLOW}GIT CLONE${ENDCOLOR}"
+    echo
+    case "$1" in
+        ""|help|h) _gitb_print_clone_help ;;
+    esac
+    local raw_url="$1"
+    local dest="$2"
+    if ! validate_git_url "$raw_url"; then
+        echo -e "${RED}✗ Invalid git URL format: $raw_url${ENDCOLOR}" >&2
+        echo -e "${YELLOW}Expected one of:${ENDCOLOR}" >&2
+        echo -e "  https://host/user/repo.git" >&2
+        echo -e "  git@host:user/repo.git" >&2
+        echo -e "  ssh://git@host/repo.git" >&2
+        exit 1
+    fi
+    local url="$validated_url"
+    if [ -z "$dest" ]; then
+        dest=$(_gitb_clone_dest_from_url "$url")
+    fi
+    if [ -z "$dest" ]; then
+        echo -e "${RED}✗ Could not determine target directory from URL.${ENDCOLOR}" >&2
+        echo -e "${YELLOW}Pass a destination explicitly: ${GREEN}gitb clone <url> <dir>${ENDCOLOR}" >&2
+        exit 1
+    fi
+    if ! sanitize_file_path "$dest"; then
+        echo -e "${RED}✗ Invalid destination path: $dest${ENDCOLOR}" >&2
+        exit 1
+    fi
+    dest="$sanitized_file_path"
+    if [ -e "$dest" ]; then
+        echo -e "${RED}✗ Destination '$dest' already exists.${ENDCOLOR}" >&2
+        echo -e "${YELLOW}Remove it first or pass a different destination.${ENDCOLOR}" >&2
+        exit 1
+    fi
+    echo -e "Source: ${BLUE}$url${ENDCOLOR}"
+    echo -e "Target: ${BLUE}$dest${ENDCOLOR}"
+    echo
+    if ! git clone --progress "$url" "$dest"; then
+        echo
+        echo -e "${RED}✗ Clone failed.${ENDCOLOR}" >&2
+        exit 1
+    fi
+    echo
+    echo -e "${GREEN}✓ Cloned into '$dest'${ENDCOLOR}"
+    local target_abs
+    target_abs=$(cd "$dest" 2>/dev/null && pwd)
+    if [ -z "$target_abs" ]; then
+        echo -e "${RED}✗ Failed to enter directory '$dest'.${ENDCOLOR}" >&2
+        exit 1
+    fi
+    if ! cd "$target_abs"; then
+        echo -e "${RED}✗ Failed to cd into '$target_abs'.${ENDCOLOR}" >&2
+        exit 1
+    fi
+    local cloned_branch
+    cloned_branch=$(git branch --show-current 2>/dev/null)
+    if [ -z "$cloned_branch" ]; then
+        cloned_branch="main"
+    fi
+    git config --local gitbasher.branch "$cloned_branch" 2>/dev/null
+    git config --local gitbasher.scopes "" 2>/dev/null
+    git config --local gitbasher.isfirst "true" 2>/dev/null
+    echo -e "${GREEN}✓ Initialized gitbasher in '$dest'${ENDCOLOR}"
+    echo
+    echo -e "${CYAN}💡 Enter the new repo with:${ENDCOLOR}"
+    echo -e "  ${GREEN}cd $target_abs${ENDCOLOR}"
+}
 GITBASHER_REPO="maxbolgarin/gitbasher"
 GITBASHER_RELEASES_URL="https://github.com/${GITBASHER_REPO}/releases"
 function _normalize_version {
@@ -12480,6 +12976,7 @@ function _gitb_bash_completion_content {
 cat <<'GITB_BASH_EOF'
 _gitb_commands="
 commit c co com
+edit ed ee
 push p ps pus
 pull pu pl pul
 merge m me
@@ -12508,8 +13005,8 @@ update up upd
 uninstall uns uni
 help man
 "
-_gitb_sub_commit="ai llm i fast f fasts fs sf ff ffp ffpush push pu p fastp fp pf fastsp fsp fps scope s msg m ticket jira j t staged st no-split nosplit nsp nsl fixup fix x fixupp fixp xp px fixupst xst stx fastfix fx xf fastfixp fxp xfp amend am a amendst ast sta amendf amf af fa split sp sl splitp spp slp aisplit isplit aispl ispl aisplitp isplitp aisplp isplp llmf aif if llmp aip ip llmst aist ist llmfp aifp ifp ipf llms ais is llmsf aisf isf llmsfp aisfp isfp llmm aim im llmmf aimf imf llmmfp aimfp imfp last l revert rev help h"
-_gitb_sub_commit_simple="ai llm i fast f push pu p scope s msg m ticket jira j t staged no-split nosplit nsp nsl fixup fix x amend am a split sp sl last l revert rev help h"
+_gitb_sub_commit="ai llm i fast f fasts fs sf ff ffp ffpush push pu p fastp fp pf fastsp fsp fps scope s msg m ticket jira j t staged st no-split nosplit nsp nsl fixup fix x fixupp fixp xp px fixupst xst stx fastfix fx xf fastfixp fxp xfp amend am a amendst ast sta amendf amf af fa split sp sl splitp spp slp aisplit isplit aispl ispl aisplitp isplitp aisplp isplp llmf aif if llmp aip ip llmst aist ist llmfp aifp ifp ipf llms ais is llmsf aisf isf llmsfp aisfp isfp llmm aim im llmmf aimf imf llmmfp aimfp imfp revert rev revertp revp rp help h"
+_gitb_sub_commit_simple="ai llm i fast f push pu p scope s msg m ticket jira j t staged no-split nosplit nsp nsl fixup fix x amend am a split sp sl revert rev help h"
 _gitb_sub_wip_backend="stash s branch b worktree w wt tree nopush np n"
 _gitb_sub_push="yes y force f list log l help h"
 _gitb_sub_pull="fetch fe all fa upd u ffonly ff merge m rebase r interactive ri rs dry d dr help h"
@@ -12530,10 +13027,12 @@ _gitb_sub_origin="set add new a change update c u set-url rename mv ren remove d
 _gitb_sub_log="branch b compare comp c search s help h"
 _gitb_sub_hook="list create edit toggle test show remove select install help"
 _gitb_sub_log_branch="local l remote r all a help h"
+_gitb_sub_edit="pick p c choose branch b br rename ren help h"
 _gitb_sub_config_auto="up u on install enable down d off uninstall disable remove status st print cat p help h"
 _gitb_canonical() {
     case "$1" in
         commit|c|co|com)              echo commit ;;
+        edit|ed|ee)                   echo edit ;;
         push|p|ps|pus)                echo push ;;
         pull|pu|pl|pul)               echo pull ;;
         merge|m|me)                   echo merge ;;
@@ -12564,7 +13063,6 @@ _gitb_commit_state_aware() {
     for ((i=2; i<COMP_CWORD; i++)); do
         tok="${COMP_WORDS[$i]}"
         case "$tok" in
-            last|l)                   has_action="last" ;;
             revert|rev)               has_action="revert" ;;
             fixup|fix|x)              has_action="fixup" ;;
             amend|am|a)               has_action="amend" ;;
@@ -12581,8 +13079,8 @@ _gitb_commit_state_aware() {
     done
     local candidates=()
     case "$has_action" in
-        last|revert)
-            :
+        revert)
+            [ -z "$has_push" ] && candidates+=("push")
             ;;
         amend|fixup)
             [ -z "${has_fast}${has_staged}" ] && candidates+=("fast" "staged")
@@ -12594,7 +13092,7 @@ _gitb_commit_state_aware() {
             if [ -z "$has_action" ]; then
                 candidates+=("split")
                 [ -z "$has_strict_mod" ] && candidates+=("amend" "fixup")
-                [ -z "$has_any_mod" ] && candidates+=("last" "revert")
+                [ -z "$has_any_mod" ] && candidates+=("revert")
             fi
             [ -z "$has_ai" ]                  && candidates+=("ai")
             [ -z "${has_fast}${has_staged}" ] && candidates+=("fast" "staged")
@@ -12690,7 +13188,7 @@ _gitb() {
                         'staged[only staged files]' 'no-split[disable split]'
                         'fixup[create fixup commit]' 'amend[amend last commit]'
                         'split[split into atomic commits]'
-                        'last[show last commit]' 'revert[revert a commit]' 'help[show help]'
+                        'revert[revert a commit]' 'help[show help]'
                     )
                     _values 'commit flag' $flags
                     return
@@ -12702,7 +13200,6 @@ _gitb() {
                 for ((i=3; i<CURRENT; i++)); do
                     tok="${words[$i]}"
                     case "$tok" in
-                        last|l)                   has_action="last" ;;
                         revert|rev)               has_action="revert" ;;
                         fixup|fix|x)              has_action="fixup" ;;
                         amend|am|a)               has_action="amend" ;;
@@ -12719,7 +13216,8 @@ _gitb() {
                 done
                 flags=()
                 case "$has_action" in
-                    last|revert)
+                    revert)
+                        [ -z "$has_push" ] && flags+=('push[commit and push]')
                         ;;
                     amend|fixup)
                         [ -z "${has_fast}${has_staged}" ] && flags+=('fast[fast commit (git add .)]' 'staged[only staged files]')
@@ -12731,7 +13229,7 @@ _gitb() {
                         if [ -z "$has_action" ]; then
                             flags+=('split[split into atomic commits]')
                             [ -z "$has_strict_mod" ] && flags+=('amend[amend last commit]' 'fixup[create fixup commit]')
-                            [ -z "$has_any_mod" ] && flags+=('last[reuse last message]' 'revert[revert a commit]')
+                            [ -z "$has_any_mod" ] && flags+=('revert[revert a commit]')
                         fi
                         [ -z "$has_ai" ]                  && flags+=('ai[AI-generated message]')
                         [ -z "${has_fast}${has_staged}" ] && flags+=('fast[fast commit (git add .)]' 'staged[only staged files]')
@@ -12770,6 +13268,7 @@ _gitb() {
             local -a cmds
             cmds=(
                 'commit:Interactive commit (alias: c, co, com)'
+                'edit:Rewrite the last commit message (alias: ed, ee)'
                 'push:Push current branch (alias: p, ps, pus)'
                 'pull:Pull updates (alias: pu, pl, pul)'
                 'merge:Merge a branch (alias: m, me)'
@@ -12810,7 +13309,10 @@ _gitb() {
                         'no-split[disable split]' 'fixup[create fixup commit]' \
                         'amend[amend last commit]' 'split[split into atomic commits]' \
                         'splitp[split and push]'  \
-                        'last[show last commit]' 'revert[revert a commit]' 'help[show help]'
+                        'revert[revert a commit]' 'help[show help]'
+                    ;;
+                edit|ed|ee)
+                    _values 'edit mode' 'pick[reword any recent commit]' 'branch[rename current branch]' 'help[show help]'
                     ;;
                 push|p|ps|pus)
                     _values 'push mode' 'yes[skip confirmation]' 'force[force push]' 'list[show pending pushes]' 'help[show help]'
@@ -12944,6 +13446,9 @@ complete -c gitb -n __gitb_no_subcmd -a commit       -d 'Interactive commit'
 complete -c gitb -n __gitb_no_subcmd -a c            -d 'Alias of commit'
 complete -c gitb -n __gitb_no_subcmd -a co           -d 'Alias of commit'
 complete -c gitb -n __gitb_no_subcmd -a com          -d 'Alias of commit'
+complete -c gitb -n __gitb_no_subcmd -a edit         -d 'Rewrite the last commit message'
+complete -c gitb -n __gitb_no_subcmd -a ed           -d 'Alias of edit'
+complete -c gitb -n __gitb_no_subcmd -a ee           -d 'Alias of edit'
 complete -c gitb -n __gitb_no_subcmd -a push         -d 'Push current branch'
 complete -c gitb -n __gitb_no_subcmd -a p            -d 'Alias of push'
 complete -c gitb -n __gitb_no_subcmd -a pull         -d 'Pull updates'
@@ -13004,8 +13509,10 @@ function __gitb_at_commit_extra
     test (count $tokens) -ge 3; or return 1
     contains -- $tokens[2] commit c co com
 end
-complete -c gitb -n __gitb_at_commit_pos2 -a "ai fast fasts ff ffp push fastp scope msg ticket staged no-split fixup amend split splitp aisplit aisplitp aip aif aifp last revert help"
-complete -c gitb -n __gitb_at_commit_extra -a "ai fast push scope msg ticket staged no-split fixup amend split last revert help"
+complete -c gitb -n __gitb_at_commit_pos2 -a "ai fast fasts ff ffp push fastp scope msg ticket staged no-split fixup amend split splitp aisplit aisplitp aip aif aifp revert revertp revp rp help"
+complete -c gitb -n __gitb_at_commit_extra -a "ai fast push scope msg ticket staged no-split fixup amend split revert help"
+set -l __gitb_edit "__gitb_using_cmd edit ed ee; and __gitb_at_position 2"
+complete -c gitb -n "$__gitb_edit" -a "pick branch help"
 set -l __gitb_push "__gitb_using_cmd push p ps pus; and __gitb_at_position 2"
 complete -c gitb -n "$__gitb_push" -a "yes force list help"
 set -l __gitb_pull "__gitb_using_cmd pull pu pl pul; and __gitb_at_position 2"
@@ -13330,12 +13837,19 @@ function print_help {
     echo
     echo -e "usage: ${YELLOW}gitb <command> [mode]${ENDCOLOR}"
     echo
+    if [ "$GITBASHER_NO_REPO" = "true" ]; then
+        echo -e "${YELLOW}⚠  Not inside a git repository.${ENDCOLOR}"
+        echo -e "Only ${BOLD}clone${NORMAL}, ${BOLD}init${NORMAL}, ${BOLD}config${NORMAL}, ${BOLD}update${NORMAL}, and ${BOLD}uninstall${NORMAL} are available here."
+        echo -e "Run ${GREEN}gitb clone <url>${ENDCOLOR} to clone a repo, ${GREEN}gitb init${ENDCOLOR} to start a new one, or ${GREEN}cd${ENDCOLOR} into an existing one."
+        echo
+    fi
     local CMD=26
     local hdr="${YELLOW}%s${ENDCOLOR}\n"
     local row="  ${BOLD}%-*s${NORMAL}  %s\n"
     printf "$hdr" "DAILY"
     printf "$row" "$CMD" "status (s)"              "Show repo state and changed files"
     printf "$row" "$CMD" "commit (c, co, com)"     "Create commits — interactive, AI, amend, revert"
+    printf "$row" "$CMD" "edit (ed, ee)"            "Rewrite the last commit message (${GREEN}git commit --amend${ENDCOLOR})"
     printf "$row" "$CMD" "push (p, ps, pus)"       "Push current branch safely"
     printf "$row" "$CMD" "pull (pu, pl, pul)"      "Pull from remote"
     printf "$row" "$CMD" "sync (sy)"               "Sync current branch with $main_branch"
@@ -13362,6 +13876,7 @@ function print_help {
     printf "$row" "$CMD" "wip (w)"                 "Stash work-in-progress, optionally back up remote"
     echo
     printf "$hdr" "SETUP"
+    printf "$row" "$CMD" "clone (cl, clo)"        "Clone a remote repo and initialize gitbasher in it"
     printf "$row" "$CMD" "origin (or, o, remote)"  "Manage remotes"
     printf "$row" "$CMD" "hook (ho, hk)"           "Manage git hooks"
     printf "$row" "$CMD" "worktree (wt, tree)"     "Manage git worktrees"
@@ -13372,9 +13887,14 @@ function print_help {
     echo -e "Run ${YELLOW}gitb <command> help${ENDCOLOR} for modes and examples"
     exit
 }
-project_name="$(get_repo_name)"
-repo_url="$(get_repo)"
-if [[ $is_first == "true" ]]; then 
+if [ "$GITBASHER_NO_REPO" = "true" ]; then
+    project_name="global config"
+    repo_url=""
+else
+    project_name="$(get_repo_name)"
+    repo_url="$(get_repo)"
+fi
+if [[ $is_first == "true" ]]; then
     git config --local gitbasher.scopes ""
     echo -e "${GREEN}Thanks for using gitbasher in project '$project_name'${ENDCOLOR}"
     print_configuration
@@ -13406,6 +13926,9 @@ case "$1" in
     commit|c|co|com)
         commit_script "${@:2}"
     ;;
+    edit|ed|ee)
+        edit_script "${@:2}"
+    ;;
     push|p|ps|pus)         
         push_script $2
     ;;
@@ -13457,6 +13980,9 @@ case "$1" in
     origin|or|o|remote)
         origin_script "$2" "$3"
     ;;
+    clone|cl|clo)
+        clone_script "$2" "$3"
+    ;;
     update|up|upd)
         update_script "$2"
     ;;