gitbash 0.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Matthias Jäggli
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,194 @@
+# gitbash
+
+Interactive git utilities for bash with fzf-powered menus.
+
+## Installation
+
+### Via npm
+
+```bash
+npm i -g gitbash
+```
+
+Run `gitbash --help` for more options.
+
+### Shell Aliases
+
+Add these aliases to your `.zshrc` or `.bashrc` for individual command access:
+
+```bash
+alias branch="gitbash branch"
+alias cleanstash="gitbash cleanstash"
+alias cleanup="gitbash cleanup"
+alias commit="gitbash commit"
+alias commits="gitbash commits"
+alias create="gitbash create"
+alias pr="gitbash pr"
+alias stale="gitbash stale"
+alias stash="gitbash stash"
+alias stashes="gitbash stashes"
+alias status="gitbash status"
+alias switch="gitbash switch"
+alias unstash="gitbash unstash"
+alias update="gitbash update"
+```
+
+Or use the built-in shell integration, for all commands:
+
+```bash
+eval "$(gitbash --init)"
+```
+
+### Dependencies
+
+```bash
+# Required
+brew install fzf
+
+# Optional (recommended)
+brew install git-delta  # Better diff highlighting
+brew install bat        # File preview with syntax highlighting
+```
+
+## Commands
+
+### branch
+
+Interactive menu for branch operations (create/switch/update).
+
+### create
+
+```bash
+create [JIRA_LINK|ISSUE] [TITLE...]
+```
+
+Create feature branch with Jira parsing. Updates main first, pushes and tracks.
+
+```bash
+create PROJ-123 fix login bug  # → feature/PROJ-123-fix-login-bug
+create                          # Interactive mode
+```
+
+### switch
+
+```bash
+switch [FILTER...]
+```
+
+Switch branches with fzf. Shows local first, then remotes (deduped). Preview shows commit history.
+
+```bash
+switch              # Browse all branches
+switch captcha      # Pre-filter for "captcha"
+```
+
+### commit
+
+```bash
+commit [MESSAGE] [-p|--push] [-s|--staged]
+```
+
+Commit with optional push. Smart staging: prompts if both staged/unstaged exist.
+
+```bash
+commit fix bug           # Commit all
+commit -s fix bug        # Commit staged only
+commit -p add feature    # Commit and push
+```
+
+### status
+
+Interactive staging with fzf. Toggle files with Enter, ESC to exit. Shows diffs in preview.
+
+### pr
+
+```bash
+pr [-p|--push]
+```
+
+Open PR in browser. `-p` pushes first.
+
+### update
+
+```bash
+update [-p|--push]
+```
+
+Merge latest main/master into current branch. Opens merge tool on conflicts.
+
+### stale
+
+```bash
+stale [-m|--my] [--json] [FILTER...]
+```
+
+List remote branches >3 months old (oldest first). Multi-select with TAB to delete.
+
+- `Ctrl-A` toggles showing all branches
+- `--my` filters by your git username
+- `--json` outputs JSON for scripting (same format as cleanup)
+
+### stashes
+
+Interactive stash menu: create, apply, or delete stashes.
+
+### stash
+
+```bash
+stash [NAME...]
+```
+
+Create named stash (includes untracked files).
+
+### unstash
+
+Apply stash with fzf picker. Optionally drop after applying.
+
+### cleanstash
+
+Delete stashes (multi-select with TAB).
+
+### cleanup
+
+```bash
+cleanup [--json]
+```
+
+Find and delete leftover local branches. Shows all local branches categorized:
+
+- **[MERGED]** - Remote was deleted (pre-selected)
+- **[STALE]** - No commits in 7+ days (pre-selected)
+- **[RECENT]** - Recent activity (not selected)
+
+Switches to main/master first if current branch is selected for deletion.
+
+`--json` outputs non-interactive JSON for scripting:
+
+```json
+[
+  {
+    "last_change_timestamp": 1733123456,
+    "author_email": "dev@example.com",
+    "author_name": "Dev",
+    "name": "feature/old",
+    "last_change_relative": "2 weeks ago"
+  }
+]
+```
+
+### commits
+
+```bash
+commits [COUNT]
+```
+
+List recent commits with option to revert. Multi-select with TAB to revert multiple.
+
+```bash
+commits        # Show last 20 commits
+commits 50     # Show last 50 commits
+```
+
+## License
+
+See [LICENSE](LICENSE) file for details.

package/bin/gitbash

@@ -0,0 +1,124 @@
+#!/usr/bin/env bash
+# gitbash - Interactive git utilities for bash with fzf-powered menus
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+COMMANDS_DIR="$SCRIPT_DIR/commands"
+
+# Available commands
+COMMANDS=(
+    "branch"
+    "cleanstash"
+    "cleanup"
+    "commit"
+    "commits"
+    "create"
+    "pr"
+    "stale"
+    "stash"
+    "stashes"
+    "status"
+    "switch"
+    "unstash"
+    "update"
+)
+
+show_help() {
+    cat << 'EOF'
+gitbash - Interactive git utilities for bash
+
+Usage:
+  gitbash <command> [args...]
+  gitbash --help
+  gitbash --init
+
+Commands:
+  branch      Interactive menu for branch operations
+  cleanstash  Delete stashes (multi-select)
+  cleanup     Find and delete leftover local branches
+  commit      Commit with optional push
+  commits     List recent commits with revert option
+  create      Create feature branch with Jira parsing
+  pr          Open PR in browser
+  stale       List stale remote branches
+  stash       Create named stash
+  stashes     Interactive stash menu
+  status      Interactive staging with fzf
+  switch      Switch branches with fzf
+  unstash     Apply stash with fzf picker
+  update      Merge latest main/master into current branch
+
+Options:
+  -h, --help  Show this help message
+  --init      Print shell initialization code (for sourcing)
+
+Examples:
+  gitbash commit fix bug -p     # Commit and push
+  gitbash switch feature        # Switch to branch containing "feature"
+  gitbash create PROJ-123 fix   # Create feature/PROJ-123-fix
+
+Shell Integration:
+  Add to your .bashrc or .bash_profile:
+    eval "$(gitbash --init)"
+
+  This enables calling commands directly:
+    commit fix bug -p
+    switch feature
+
+Dependencies:
+  brew install fzf           # Required
+  brew install git-delta     # Optional: better diffs
+  brew install bat           # Optional: syntax highlighting
+EOF
+}
+
+show_init() {
+    cat << EOF
+# gitbash shell integration
+# Add this to your .bashrc or .bash_profile:
+#   eval "\$(gitbash --init)"
+
+GITBASH_COMMANDS_DIR="$COMMANDS_DIR"
+
+EOF
+    # Output source commands for each script
+    for cmd in "${COMMANDS[@]}"; do
+        if [[ -f "$COMMANDS_DIR/$cmd.sh" ]]; then
+            echo "source \"\$GITBASH_COMMANDS_DIR/$cmd.sh\""
+        fi
+    done
+}
+
+# Main entry point
+main() {
+    case "${1:-}" in
+        -h|--help|"")
+            show_help
+            exit 0
+            ;;
+        --init)
+            show_init
+            exit 0
+            ;;
+        *)
+            local cmd="$1"
+            shift
+            
+            # Check if command exists
+            if [[ -f "$COMMANDS_DIR/$cmd.sh" ]]; then
+                # Source the command file and execute the function
+                source "$COMMANDS_DIR/$cmd.sh"
+                "$cmd" "$@"
+            else
+                echo "Error: Unknown command '$cmd'" >&2
+                echo "Run 'gitbash --help' for available commands." >&2
+                exit 1
+            fi
+            ;;
+    esac
+}
+
+main "$@"
+
+

package/commands/branch.sh

@@ -0,0 +1,184 @@
+branch() {
+    # -----------------------------
+    # 0. Check for help flag
+    # -----------------------------
+    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+        cat << 'EOF'
+Usage: branch [OPTIONS]
+
+Interactive menu to manage git branches.
+Choose between creating, switching, or updating branches.
+
+Options:
+  -h, --help    Show this help message
+
+Features:
+  - Interactive action selection
+  - Create: Create a new branch with Jira issue parsing
+  - Switch: Switch between branches with fzf selector
+  - Update: Update current branch with latest main/master
+
+Navigation:
+  ↑/↓ or j/k    Navigate through options
+  Enter         Select action
+  ESC/Ctrl-C    Abort
+
+Examples:
+  $ branch
+  Branch action >
+  > 🌿 Create - Create a new feature branch
+    🔀 Switch - Switch to another branch
+    ⬆️  Update - Update current branch with main/master
+    ✖ Abort
+
+  # Select "Create" and press Enter
+  Enter Jira link (e.g., https://jira.company.com/browse/PROJ-123):
+  > PROJ-123
+  Parsed issue number: PROJ-123
+
+  Enter branch title (will be converted to lowercase with dashes):
+  > add new feature
+
+  Branch name: feature/PROJ-123-add-new-feature
+  Updating 'main' from origin...
+  ✓ 'main' is up to date.
+  ✓ Successfully created and switched to branch: feature/PROJ-123-add-new-feature (from main)
+
+  ---
+
+  $ branch
+  Branch action >
+  > 🌿 Create - Create a new feature branch
+    🔀 Switch - Switch to another branch
+    ⬆️  Update - Update current branch with main/master
+    ✖ Abort
+
+  # Select "Switch" and press Enter
+  Select branch: 
+  Current: main
+  > local: main
+    local: feature/PROJ-123-add-new-feature
+    remote: origin/develop
+
+  ---
+
+  $ branch
+  Branch action >
+  > 🌿 Create - Create a new feature branch
+    🔀 Switch - Switch to another branch
+    ⬆️  Update - Update current branch with main/master
+    ✖ Abort
+
+  # Select "Update" and press Enter
+  Fetching latest 'main' from origin...
+  Merging updated 'main' into 'feature/PROJ-123-add-new-feature'...
+  ✓ 'feature/PROJ-123-add-new-feature' is now up-to-date with 'main'.
+
+Actions:
+  🌿 Create  - Create a new feature branch with Jira parsing
+  🔀 Switch  - Switch to another branch using fzf
+  ⬆️  Update - Update current branch with latest main/master
+
+Requirements:
+  - fzf (fuzzy finder) - will prompt to install if not found
+  - create, switch, and update functions must be available
+
+See also:
+  create -h    Show help for create command
+  switch -h    Show help for switch command
+  update -h    Show help for update command
+
+EOF
+        return 0
+    fi
+
+    # -----------------------------
+    # 1. Check for fzf
+    # -----------------------------
+    if ! command -v fzf >/dev/null 2>&1; then
+        echo "fzf is not installed."
+
+        # Ask whether to install with Homebrew
+        read -rp "Install fzf with Homebrew? (y/N): " ans
+        case "$ans" in
+            [yY][eE][sS]|[yY])
+                echo "Installing fzf with brew..."
+                if ! command -v brew >/dev/null 2>&1; then
+                    echo "Homebrew is not installed. Aborting."
+                    return 1
+                fi
+                brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
+                # Optional: install shell integrations automatically
+                if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
+                    echo "Running fzf install script..."
+                    yes | "$(brew --prefix)/opt/fzf/install"
+                fi
+                ;;
+            *)
+                echo "Aborted (skipped fzf installation)."
+                return 1
+                ;;
+        esac
+    fi
+
+    # -----------------------------
+    # 2. Build action menu
+    # -----------------------------
+    local create_option="🌿 Create - Create a new feature branch"
+    local switch_option="🔀 Switch - Switch to another branch"
+    local update_option="⬆️  Update - Update current branch with main/master"
+    local abort_label="✖ Abort"
+
+    local choices
+    choices=$(
+        {
+            echo "$create_option"
+            echo "$switch_option"
+            echo "$update_option"
+            echo "$abort_label"
+        }
+    )
+
+    # -----------------------------
+    # 3. Run fzf menu
+    # -----------------------------
+    local selection
+    selection=$(printf "%s\n" "$choices" \
+        | fzf --prompt="Branch action > " \
+              -i \
+              --reverse \
+              --border \
+              --header="What would you like to do?" \
+              --no-multi \
+              --bind=enter:accept
+    )
+
+    # ESC or Ctrl-C
+    if [[ -z "$selection" ]]; then
+        echo "Aborted."
+        return 1
+    fi
+
+    # -----------------------------
+    # 4. Execute based on selection
+    # -----------------------------
+    case "$selection" in
+        "$create_option")
+            create
+            ;;
+        "$switch_option")
+            switch
+            ;;
+        "$update_option")
+            update
+            ;;
+        "$abort_label")
+            echo "Aborted."
+            return 1
+            ;;
+        *)
+            echo "Unknown selection."
+            return 1
+            ;;
+    esac
+}

package/commands/cleanstash.sh

@@ -0,0 +1,187 @@
+cleanstash() {
+    # -----------------------------
+    # 0. Check for help flag
+    # -----------------------------
+    if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
+        cat << 'EOF'
+Usage: cleanstash [OPTIONS]
+
+Delete git stashes without applying them.
+Interactive fuzzy finder (fzf) with preview and multi-select support.
+
+Options:
+  -h, --help    Show this help message
+
+Features:
+  - Multi-select support (use TAB to select multiple stashes)
+  - Preview stash contents before deletion
+  - Confirmation prompt before deletion
+  - Safe deletion (deletes in reverse order to maintain indices)
+
+Navigation:
+  ↑/↓ or j/k    Navigate through stashes
+  TAB           Select/deselect stash (multi-select)
+  Enter         Confirm selection
+  ESC/Ctrl-C    Abort
+
+Examples:
+  $ cleanstash
+  Available stashes >
+  > stash@{0}: WIP on main: 1a2b3c4 commit message
+    stash@{1}: WIP on feature: 5d6e7f8 another commit
+    stash@{2}: On dev: 9a8b7c6 old work
+    ✖ Abort
+
+  # Select stash@{0} and stash@{2} using TAB, then press Enter
+  
+  Selected stashes to delete:
+    - stash@{0}
+    - stash@{2}
+
+  Delete these 2 stash(es)? (y/N): y
+  Deleting stashes...
+  Dropping stash@{2} ...
+  ✓ Deleted stash@{2}
+  Dropping stash@{0} ...
+  ✓ Deleted stash@{0}
+
+Requirements:
+  - fzf (fuzzy finder) - will prompt to install if not found
+  - git stash list with at least one stash
+
+Notes:
+  - Stashes are deleted in reverse order to prevent index shifts
+  - Preview shows the full diff of the selected stash
+  - No changes are applied to your working directory
+
+EOF
+        return 0
+    fi
+
+    # -----------------------------
+    # 1. Check for fzf
+    # -----------------------------
+    if ! command -v fzf >/dev/null 2>&1; then
+        echo "fzf is not installed."
+
+        # Ask whether to install with Homebrew
+        read -r -p "Install fzf with Homebrew? (y/N): " ans
+        case "$ans" in
+            [yY][eE][sS]|[yY])
+                echo "Installing fzf with brew..."
+                if ! command -v brew >/dev/null 2>&1; then
+                    echo "Homebrew is not installed. Aborting."
+                    return 1
+                fi
+                brew install fzf || { echo "fzf install failed. Aborting."; return 1; }
+                # Optional: install shell integrations automatically
+                if [[ -f "$(brew --prefix)/opt/fzf/install" ]]; then
+                    echo "Running fzf install script..."
+                    yes | "$(brew --prefix)/opt/fzf/install"
+                fi
+                ;;
+            *)
+                echo "Aborted (skipped fzf installation)."
+                return 1
+                ;;
+        esac
+    fi
+
+    # -----------------------------
+    # 2. Build menu entries
+    # -----------------------------
+    local abort_label="✖ Abort"
+
+    local choices
+    choices=$(
+        {
+            git stash list
+            echo "$abort_label"
+        }
+    )
+
+    # -----------------------------
+    # 3. Run fzf full-screen picker with preview (multi-select)
+    # -----------------------------
+    local selection
+    selection=$(printf "%s\n" "$choices" \
+        | fzf --prompt="Available stashes > " \
+              -i \
+              --reverse \
+              --border \
+              --header="Select stashes to delete (TAB for multi-select)" \
+              --multi \
+              --bind=enter:accept \
+              --preview='
+                    sel=$(echo {} | grep -o "stash@{[0-9]\+}" || true);
+                    if [[ -n "$sel" ]]; then
+                        git stash show -p "$sel";
+                    else
+                        echo "No preview";
+                    fi
+              '
+    )
+
+    # ESC or Ctrl-C
+    if [[ -z "$selection" ]]; then
+        echo "Aborted."
+        return 1
+    fi
+
+    # Abort option
+    if echo "$selection" | grep -q "^$abort_label$"; then
+        echo "Aborted."
+        return 1
+    fi
+
+    # -----------------------------
+    # 4. Extract stash IDs safely
+    # -----------------------------
+    local stash_ids=()
+    while IFS= read -r line; do
+        local stash_id
+        stash_id=$(echo "$line" | grep -o 'stash@{[0-9]\+}')
+        if [[ -n "$stash_id" ]]; then
+            stash_ids+=("$stash_id")
+        fi
+    done <<< "$selection"
+
+    if [[ ${#stash_ids[@]} -eq 0 ]]; then
+        echo "Error: Could not determine any stash IDs."
+        return 1
+    fi
+
+    # -----------------------------
+    # 5. Confirm before deletion
+    # -----------------------------
+    echo "Selected stashes to delete:"
+    for stash_id in "${stash_ids[@]}"; do
+        echo "  - $stash_id"
+    done
+    echo
+
+    read -rp "Delete these ${#stash_ids[@]} stash(es)? (y/N): " confirm_ans
+    case "$confirm_ans" in
+        [yY][eE][sS]|[yY])
+            # -----------------------------
+            # 6. Delete stashes (in reverse order to maintain indices)
+            # -----------------------------
+            echo "Deleting stashes..."
+            # Sort by stash number in descending order to delete safely
+            local sorted_ids
+            mapfile -t sorted_ids < <(printf '%s\n' "${stash_ids[@]}" | sort -t'{' -k2 -rn)
+            
+            for stash_id in "${sorted_ids[@]}"; do
+                echo "Dropping $stash_id ..."
+                if git stash drop "$stash_id"; then
+                    echo "✓ Deleted $stash_id"
+                else
+                    echo "✗ Failed to delete $stash_id"
+                fi
+            done
+            ;;
+        *)
+            echo "Deletion cancelled. No stashes were removed."
+            ;;
+    esac
+}