bimagic 1.5.0 → 1.6.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Bimbok
+Copyright (c) 2026 orion-kernel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
 # Bimagic - Git Wizard
 
 <p align="center">
-  <img width="400" style="border-radius: 12px;" alt="Image" src="https://github.com/user-attachments/assets/d74de26d-949b-4aa9-9b2e-c25de5b25b42" />
+  <img width="400" style="border-radius: 12px;" alt="Image" src="./Sample/logo.png" />
 </p>
 
 <p align="center">By Bimbok and adityapaul26</p>
@@ -42,6 +42,8 @@ Bimagic is an interactive command-line tool that streamlines common Git operatio
 - 🎨 Theme Customization (ANSI and Hex color support)
 - ⏳ Time Turner (Undo last commit)
 - 🗃️ Stash operations (Push, Pop, List, Apply, Drop, Clear)
+- 🔍 The Scrying Glass (Quick file preview with optional syntax highlighting)
+- ⚡ Command Transparency (Displays the exact Git command being executed)
 
 ## Installation
 
@@ -153,6 +155,8 @@ export PATH="$HOME/bin:$PATH"  # For user-local installation
   - If not installed, the tool will not work.
 - Node.js **v16 or higher**
 - npm **v8+**
+- [bat](https://github.com/sharkdp/bat) (optional; used for syntax highlighting in The Scrying Glass)
+- [fzf](https://github.com/junegunn/fzf) (optional; used for side-by-side preview in The Scrying Glass)
 
 ## Configuration
 
@@ -371,7 +375,8 @@ At the top of the interface, a status box summarizes:
 16. **Summon the Resurrection Stone (Recover lost code)** - Recover deleted commits or branches using Git reflog
 17. **Revert commit(s)** - Revert one or more commits (multi-select)
 18. **Stash operations** - Manage stashes (push, pop, list, apply, drop, clear)
-19. **Exit** - Quit the wizard
+19. **The Scrying Glass (Quick View)** - Browse and preview any file in the repository instantly
+20. **Exit** - Quit the wizard
 
 ### Clone repository (Option 1)
 
@@ -543,6 +548,24 @@ Manage your git stashes with a comprehensive menu.
 - **Drop**: Delete a specific stash
 - **Clear**: Remove all stashes (with safety confirmation)
 
+### The Scrying Glass (Option 19)
+
+"The Scrying Glass" provides an instant, scrollable preview of any file in your repository—whether it's tracked by Git or just a new, untracked file.
+
+#### Features:
+
+- **Interactive Selection**: Quickly find files using an interactive filter.
+- **Side-by-Side Preview**: Uses `fzf` (if installed) to provide a real-time preview of the file content while you browse the list.
+- **Circular Selection**: Seamlessly wrap around from the last file to the first with infinite scrolling.
+- **Themed Experience**: Selection and preview interface fully respect your custom `theme.wz` colors.
+- **Scrollable Pager**: Uses `gum pager` for smooth reading of long files after selection.
+- **Magic Highlight**: If `bat` is installed, it automatically provides syntax highlighting for a superior viewing experience.
+- **Deep Integration**: Access it standalone from the main menu, or use it while adding/removing files to ensure you're acting on the right code.
+
+### Command Transparency ⚡
+
+Bimagic now shows you exactly what "spells" are being cast. Every time you perform a Git action through the wizard, the exact Git command is displayed in a vibrant, easy-to-read format. This ensures transparency, helps you learn Git commands, and provides confidence that the tool is doing exactly what you expect.
+
 ## Why Sudo Might Be Required
 
 ### Understanding the Need for Elevated Privileges

package/bimagic

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="v1.5.0"
+VERSION="v1.6.2"
 
 if [[ "$1" == "--version" || "$1" == "-v" ]]; then
   echo "Bimagic Git Wizard $VERSION"
@@ -118,6 +118,11 @@ play_sound() {
     ;;
   esac
 }
+
+print_command() {
+  echo -e "${GRAY} ${PURPLE}Command:${NC} ${WHITE}$*${NC}"
+}
+
 print_status() {
   gum style --foreground "$BIMAGIC_PRIMARY" "$1"
   play_sound "success"
@@ -185,7 +190,9 @@ setup_remote() {
   fi
 
   if gum confirm "Set remote '$remote_name' to $remote_url?"; then
+    print_command "git remote remove \"$remote_name\""
     git remote remove "$remote_name" 2>/dev/null
+    print_command "git remote add \"$remote_name\" \"$remote_url\""
     git remote add "$remote_name" "$remote_url"
     print_status " Remote '$remote_name' set to $remote_url"
     return 0
@@ -447,6 +454,7 @@ clone_repo() {
     print_status "Initializing interactive clone for $repo_name..."
 
     # 1. Clone with --no-checkout and --filter=blob:none (downloads commits/trees, no file contents)
+    print_command "git clone --filter=blob:none --no-checkout $depth_arg \"$url\" \"$repo_name\""
     print_status "Cloning structure for $repo_name..."
     (
       set -o pipefail
@@ -485,14 +493,8 @@ clone_repo() {
     # FIX: Add --no-cone so Git accepts individual file paths
     gum spin --title "Configuring sparse checkout..." -- git sparse-checkout init --no-cone
 
-    # We use 'set' with the selected paths.
-    # Note: --cone mode works best with directories, but for specific files we might rely on the fact
-    # that sparse-checkout patterns handle full paths.
-    # However, 'git sparse-checkout set' treats arguments as patterns.
-    # We turn off cone for precise file selection transparency if needed, but standard 'set' often works.
-    # To be safe for exact file paths, we simply pass them.
-    # If the list is huge, this might fail on command line length.
-    # Ideally we pipe to 'git sparse-checkout set --stdin', but gum returns newline separated.
+    # Set the selected paths
+    echo "$selected_paths" | git sparse-checkout set --stdin
 
     print_status "Downloading selected files..."
     (
@@ -510,6 +512,7 @@ clone_repo() {
 
   else
     # Standard clone with progress bar
+    print_command "git clone $depth_arg \"$url\" \"$repo_name\""
     print_status "Cloning $url into $repo_name..."
 
     # Use a subshell with pipefail to catch git clone errors
@@ -579,6 +582,7 @@ summon_gitignore() {
 
   local url="https://raw.githubusercontent.com/github/gitignore/main/${template}.gitignore"
 
+  print_command "curl -sL \"$url\" -o .gitignore"
   if gum spin --title "Fetching template..." -- curl -sL "$url" -o .gitignore; then
     # Verify the file is not empty (curl might return 404 text if URL is wrong)
     if grep -q "404: Not Found" .gitignore; then
@@ -653,6 +657,7 @@ ${body}"
   echo
 
   if gum confirm "Commit with this message?"; then
+    print_command "git commit -m \"$commit_msg\""
     git commit -m "$commit_msg"
     print_status "󱝁 Mischief managed! (Commit successful)"
   else
@@ -662,6 +667,7 @@ ${body}"
 
 #function to display git graph
 pretty_git_log() {
+  print_command "git log --graph --oneline --decorate --all"
   git log --graph \
     --abbrev-commit \
     --decorate \
@@ -756,6 +762,7 @@ if [[ "$CLI_MODE" == "pull" ]]; then
   fi
 
   # 1. Fetch
+  print_command "git fetch --all"
   if gum spin --title "Fetching updates..." -- git fetch --all; then
     print_status "Fetch complete."
   else
@@ -763,11 +770,11 @@ if [[ "$CLI_MODE" == "pull" ]]; then
   fi
 
   # 2. Pull
+  print_command "git pull --all"
   if gum spin --title "Pulling all..." -- git pull --all; then
     print_status "Pull all complete."
   else
     print_error "Pull failed. There might be conflicts or no upstream set."
-    exit 1
   fi
   exit 0
 fi
@@ -812,17 +819,22 @@ if [[ "$CLI_MODE" == "undo" ]]; then
   case "$undo_type" in
   "Soft"*)
     if [[ "$is_initial_commit" == "true" ]]; then
+      print_command "git update-ref -d HEAD"
       git update-ref -d HEAD
     else
+      print_command "git reset --soft HEAD~1"
       git reset --soft HEAD~1
     fi
     print_status "✨ Success! I undid the commit, but kept your files ready to commit again."
     ;;
   "Mixed"*)
     if [[ "$is_initial_commit" == "true" ]]; then
+      print_command "git update-ref -d HEAD"
       git update-ref -d HEAD
+      print_command "git rm --cached -r -q ."
       git rm --cached -r -q .
     else
+      print_command "git reset HEAD~1"
       git reset HEAD~1
     fi
     print_status "󱞈 Success! I undid the commit and unstaged the files."
@@ -831,10 +843,14 @@ if [[ "$CLI_MODE" == "undo" ]]; then
     if gum confirm " DANGER: This deletes your work forever. Are you sure?"; then
       if [[ "$is_initial_commit" == "true" ]]; then
         # Unstage everything first, then clean to ensure files are deleted
+        print_command "git update-ref -d HEAD"
         git update-ref -d HEAD
+        print_command "git rm --cached -r -q ."
         git rm --cached -r -q . >/dev/null 2>&1
+        print_command "git clean -fd"
         git clean -fd
       else
+        print_command "git reset --hard HEAD~1"
         git reset --hard HEAD~1
       fi
       print_status "󱠇 Obliviate! The last commit and its changes are destroyed."
@@ -864,6 +880,7 @@ if [[ "$CLI_MODE" == "lazy" ]]; then
   print_status "  Lazy Wizard invoked!"
 
   # 1. Add all changes
+  print_command "git add ."
   if gum spin --title "Adding files..." -- git add .; then
     print_status "Files added."
   else
@@ -872,6 +889,7 @@ if [[ "$CLI_MODE" == "lazy" ]]; then
   fi
 
   # 2. Commit
+  print_command "git commit -m \"$CLI_MSG\""
   if git commit -m "$CLI_MSG"; then
     print_status "Committed: $CLI_MSG"
   else
@@ -883,11 +901,13 @@ if [[ "$CLI_MODE" == "lazy" ]]; then
   branch=$(get_current_branch)
   print_status "Pushing to $branch..."
 
+  print_command "git push"
   if gum spin --title "Pushing..." -- git push; then
     print_status "󱝂 Magic complete!"
   else
     # Try setting upstream if standard push failed
     print_warning "Standard push failed. Trying to set upstream..."
+    print_command "git push -u origin \"$branch\""
     if gum spin --title "Pushing (upstream)..." -- git push -u origin "$branch"; then
       print_status "󱝂 Magic complete (upstream set)!"
     else
@@ -934,15 +954,18 @@ resurrect_commit() {
   "󰔱 Create a new branch here (Safest)")
     local new_branch=$(gum input --placeholder "Enter new branch name (e.g., recovered-code)")
     if [[ -n "$new_branch" ]]; then
+      print_command "git checkout -b \"$new_branch\" \"$target_hash\""
       git checkout -b "$new_branch" "$target_hash"
       print_status "󱝁 Timeline restored! You are now on branch: $new_branch"
     fi
     ;;
   "  Hard Reset current branch to here (Dangerous)")
     if gum confirm "This will overwrite your CURRENT work. Are you absolutely sure?"; then
+      print_command "git reset --hard $target_hash"
       git reset --hard "$target_hash"
-      print_status " Timeline overwritten. Welcome back."
+      print_status "󱝁 Timeline restored via hard reset!"
     fi
+
     ;;
   *)
     print_status "The stone goes dormant."
@@ -950,6 +973,62 @@ resurrect_commit() {
   esac
 }
 
+scrying_glass() {
+  print_status "󰈈 Summoning the Scrying Glass..."
+
+  # Check if fzf is installed for the side-by-side preview experience
+  if command -v fzf &>/dev/null; then
+    local preview_cmd="cat {}"
+    if command -v bat &>/dev/null; then
+      preview_cmd="bat --color=always --style=numbers {}"
+    fi
+
+    # 1. Use fzf for interactive selection with side-by-side preview
+    # Map fzf colors to our theme variables
+    local file=$(git ls-files --cached --others --exclude-standard |
+      fzf --preview "$preview_cmd" \
+        --preview-window=right:60% \
+        --height=80% \
+        --layout=reverse \
+        --border \
+        --cycle \
+        --prompt="󰈈 Peer into: " \
+        --color="bg+:-1,fg+:$BIMAGIC_PRIMARY,hl:$BIMAGIC_SECONDARY,hl+:$BIMAGIC_SECONDARY,prompt:$BIMAGIC_INFO,pointer:$BIMAGIC_PRIMARY,marker:$BIMAGIC_SUCCESS,header:$BIMAGIC_PRIMARY,spinner:$BIMAGIC_PRIMARY,info:$BIMAGIC_MUTED")
+
+    if [[ -z "$file" ]]; then
+      print_status "The glass goes dark (Cancelled)."
+      return 0
+    fi
+
+    # After selection, we can optionally open it in a full pager if they want to read the whole thing
+    if gum confirm "Open in full pager?"; then
+      if command -v bat &>/dev/null; then
+        bat --color=always "$file" | gum pager
+      else
+        gum pager <"$file"
+      fi
+    fi
+  else
+    # Fallback to standard gum behavior if fzf is missing
+    # 1. Select the file using existing filter style
+    local file=$(git ls-files --cached --others --exclude-standard |
+      gum filter --placeholder "Select a file to peer into...")
+
+    if [[ -z "$file" ]]; then
+      print_status "The glass goes dark (Cancelled)."
+      return 0
+    fi
+
+    # 2. Check for syntax highlighting capability
+    print_status "Peering into: $file"
+    if command -v bat &>/dev/null; then
+      bat --color=always "$file" | gum pager
+    else
+      gum pager <"$file"
+    fi
+  fi
+}
+
 show_welcome_banner() {
   clear
   echo -e "$(get_ansi_esc "$BANNER_COLOR_1")▗▖   ▄ ▄▄▄▄   ▗▄▖  ▗▄▄▖▄  ▗▄▄▖\033[0m"
@@ -1009,6 +1088,7 @@ while true; do
       "󰔪 Summon the Resurrection Stone (Recover lost code)" \
       "󰁯 Revert commit(s)" \
       "󰓗 Stash operations" \
+      "󰈈 The Scrying Glass (Quick View)" \
       "󰿅 Exit"
   )
   echo
@@ -1049,6 +1129,7 @@ while true; do
           include_untracked=""
         fi
 
+        print_command "git stash push $include_untracked -m \"$msg\""
         if git stash push $include_untracked -m "$msg"; then
           print_status "Changes stashed successfully!"
         else
@@ -1056,6 +1137,7 @@ while true; do
         fi
         ;;
       "󱉙 Pop latest stash")
+        print_command "git stash pop"
         if git stash pop; then
           print_status "Stash popped successfully!"
         else
@@ -1078,6 +1160,7 @@ while true; do
         stash_entry=$(git stash list | gum filter --placeholder "Select stash to apply")
         if [[ -n "$stash_entry" ]]; then
           stash_id=$(echo "$stash_entry" | cut -d: -f1)
+          print_command "git stash apply $stash_id"
           if git stash apply "$stash_id"; then
             print_status "Applied $stash_id"
           else
@@ -1095,6 +1178,7 @@ while true; do
         if [[ -n "$stash_entry" ]]; then
           stash_id=$(echo "$stash_entry" | cut -d: -f1)
           if gum confirm "Are you sure you want to drop $stash_id?"; then
+            print_command "git stash drop $stash_id"
             if git stash drop "$stash_id"; then
               print_status "Dropped $stash_id"
             else
@@ -1110,6 +1194,7 @@ while true; do
         fi
 
         if gum confirm "DANGER: This will delete ALL stashes. Continue?"; then
+          print_command "git stash clear"
           if git stash clear; then
             print_status "All stashes cleared."
           else
@@ -1136,6 +1221,7 @@ while true; do
     fi
 
     if [[ "$dirname" == "." ]]; then
+      print_command "git init"
       git init
       print_status "Repo initialized in current directory: $(pwd)"
     else
@@ -1143,9 +1229,11 @@ while true; do
       # Run init and rename in a subshell to avoid directory tracking issues
       (
         cd "$dirname" || exit 1
+        print_command "git init"
         git init
         current_branch=$(git symbolic-ref --short HEAD 2>/dev/null)
         if [[ "$current_branch" == "master" ]]; then
+          print_command "git branch -M main"
           git branch -M main
           echo "Default branch renamed from 'master' to 'main' in $dirname"
         fi
@@ -1154,30 +1242,49 @@ while true; do
     fi
     ;;
   " Add files")
-    # Show untracked + modified files, plus an [ALL] option
-    files=$( (
-      echo "[ALL]"
-      git ls-files --others --modified --exclude-standard
-    ) | gum filter --no-limit --placeholder "Select files to add")
-
-    if [[ -z "$files" ]]; then
-      print_warning "No files selected."
-    else
-      # gum filter returns selected items separated by newlines.
-      # We need to handle the case where [ALL] is selected along with other files.
-      if echo "$files" | grep -q "\[ALL\]"; then
-        git add .
-        print_status "All files staged."
+    while true; do
+      add_choice=$(gum choose " Stage Files" "󰷊 Preview Files" "󰌍 Back")
+
+      if [[ "$add_choice" == "󰌍 Back" ]]; then
+        break
+      fi
+
+      if [[ "$add_choice" == "󰷊 Preview Files" ]]; then
+        scrying_glass
+        continue
+      fi
+
+      # Stage Files logic
+      # Show untracked + modified files, plus an [ALL] option
+      files=$( (
+        echo "[ALL]"
+        git ls-files --others --modified --exclude-standard
+      ) | gum filter --no-limit --placeholder "Select files to add")
+
+      if [[ -z "$files" ]]; then
+        print_warning "No files selected."
       else
-        # Correctly handle filenames with spaces by reading line by line
-        echo "$files" | while read -r f; do
-          [[ -n "$f" ]] && git add "$f"
-        done
-        print_status "Selected files staged."
-        # Optionally, list the files that were staged
-        echo "$files"
+        # gum filter returns selected items separated by newlines.
+        # We need to handle the case where [ALL] is selected along with other files.
+        if echo "$files" | grep -q "\[ALL\]"; then
+          print_command "git add ."
+          git add .
+          print_status "All files staged."
+        else
+          # Correctly handle filenames with spaces by reading line by line
+          echo "$files" | while read -r f; do
+            if [[ -n "$f" ]]; then
+              print_command "git add \"$f\""
+              git add "$f"
+            fi
+          done
+          print_status "Selected files staged."
+          # Optionally, list the files that were staged
+          echo "$files"
+        fi
       fi
-    fi
+      break
+    done
     ;;
   " Commit changes")
     commit_mode=$(gum choose "󰦥 Magic Commit (Builder)" "󱐋 Quick Commit (One-line)")
@@ -1192,6 +1299,7 @@ while true; do
       fi
 
       if gum confirm "Commit changes?"; then
+        print_command "git commit -m \"$msg\""
         git commit -m "$msg"
         print_status "Commit done!"
       else
@@ -1225,6 +1333,7 @@ while true; do
 
     if gum confirm "Push branch '$branch' to '$remote'?"; then
       echo "Pushing branch '$branch' to '$remote'..."
+      print_command "git push -u \"$remote\" \"$branch\""
       gum spin --title "Pushing..." -- git push -u "$remote" "$branch"
     else
       print_status "Push cancelled."
@@ -1245,6 +1354,7 @@ while true; do
     case "$pull_choice" in
     "Pull all")
       if gum confirm "Run 'git pull --all'?"; then
+        print_command "git pull --all"
         gum spin --title "Pulling all..." -- git pull --all
         print_status "Pull all complete."
       else
@@ -1268,6 +1378,7 @@ while true; do
 
         if [[ -n "$remote" ]]; then
           if gum confirm "Pull branch '$branch' from '$remote'?"; then
+            print_command "git pull \"$remote\" \"$branch\""
             gum spin --title "Pulling..." -- git pull "$remote" "$branch"
           else
             print_status "Pull cancelled."
@@ -1296,6 +1407,7 @@ while true; do
       # Use gum filter to select from existing branches
       existing_branch=$(git branch --format='%(refname:short)' | gum filter --placeholder "Select branch to switch to")
       if [[ -n "$existing_branch" ]]; then
+        print_command "git checkout \"$existing_branch\""
         git checkout "$existing_branch"
         print_status "Switched to branch: $existing_branch"
       else
@@ -1305,6 +1417,7 @@ while true; do
     "Create new branch")
       new_branch=$(gum input --placeholder "Enter new branch name")
       if [[ -n "$new_branch" ]]; then
+        print_command "git checkout -b \"$new_branch\""
         git checkout -b "$new_branch"
         print_status "Created and switched to new branch: $new_branch"
       else
@@ -1323,40 +1436,57 @@ while true; do
     git status
     ;;
   "󰮘 Remove files/folders (rm)")
-    # List tracked + untracked files for removal
-    files=$(git ls-files --cached --others --exclude-standard |
-      gum filter --no-limit --placeholder "Select files/folders to remove")
+    while true; do
+      remove_choice=$(gum choose "Remove Files" "Preview Files" "Back")
 
-    if [[ -z "$files" ]]; then
-      print_warning "No files selected."
-      continue # Use continue to go back to the main menu
-    fi
+      if [[ "$remove_choice" == "Back" ]]; then
+        break
+      fi
 
-    echo "Files selected for removal:"
-    # Use 'tput' for better visual separation and color
-    tput setaf 3
-    echo "$files"
-    tput sgr0
-    echo
+      if [[ "$remove_choice" == "Preview Files" ]]; then
+        scrying_glass
+        continue
+      fi
 
-    if gum confirm "Confirm removal? This cannot be undone."; then
-      # Use a 'while read' loop to correctly handle filenames with spaces
-      echo "$files" | while read -r f; do
-        if [[ -z "$f" ]]; then continue; fi # Skip empty lines
+      # Remove Files logic
+      # List tracked + untracked files for removal
+      files=$(git ls-files --cached --others --exclude-standard |
+        gum filter --no-limit --placeholder "Select files/folders to remove")
 
-        # Check if the file is tracked by git
-        if git ls-files --error-unmatch "$f" >/dev/null 2>&1; then
-          # It's a tracked file, use 'git rm'
-          git rm -rf "$f"
-        else
-          # It's an untracked file, use 'rm'
-          rm -rf "$f"
-        fi
-      done
-      print_status "Selected files/folders have been removed."
-    else
-      print_status "Operation cancelled."
-    fi
+      if [[ -z "$files" ]]; then
+        print_warning "No files selected."
+        break
+      fi
+
+      echo "Files selected for removal:"
+      # Use 'tput' for better visual separation and color
+      tput setaf 3
+      echo "$files"
+      tput sgr0
+      echo
+
+      if gum confirm "Confirm removal? This cannot be undone."; then
+        # Use a 'while read' loop to correctly handle filenames with spaces
+        echo "$files" | while read -r f; do
+          if [[ -z "$f" ]]; then continue; fi # Skip empty lines
+
+          # Check if the file is tracked by git
+          if git ls-files --error-unmatch "$f" >/dev/null 2>&1; then
+            # It's a tracked file, use 'git rm'
+            print_command "git rm -rf \"$f\""
+            git rm -rf "$f"
+          else
+            # It's an untracked file, use 'rm'
+            print_command "rm -rf \"$f\""
+            rm -rf "$f"
+          fi
+        done
+        print_status "Selected files/folders have been removed."
+      else
+        print_status "Operation cancelled."
+      fi
+      break
+    done
     ;;
   " Uninitialize repo")
     print_warning "This will completely uninitialize the Git repository in this folder."
@@ -1365,6 +1495,7 @@ while true; do
 
     if gum confirm "Are you sure you want to continue?"; then
       if [ -d ".git" ]; then
+        print_command "rm -rf .git"
         rm -rf .git
         print_status "Git repository has been uninitialized."
       else
@@ -1374,6 +1505,9 @@ while true; do
       print_status "Operation cancelled."
     fi
     ;;
+  "󰈈 The Scrying Glass (Quick View)")
+    scrying_glass
+    ;;
   "󰿅 Exit")
     if gum confirm "Are you sure you want to exit?"; then
       echo "Git Wizard vanishes in a puff of smoke..."
@@ -1397,6 +1531,7 @@ while true; do
     else
       if gum confirm "Merge branch '$merge_branch' into '$current_branch'?"; then
         echo "Merging branch '$merge_branch' into '$current_branch'..."
+        print_command "git merge \"$merge_branch\""
         if gum spin --title "Merging..." -- git merge "$merge_branch"; then
           print_status "Merge successful!"
         else
@@ -1440,6 +1575,7 @@ while true; do
     if gum confirm "Confirm revert?"; then
       for c in $commits; do
         echo "Reverting commit $c..."
+        print_command "git revert --no-edit $c"
         if git revert --no-edit "$c"; then
           print_status "Commit $c reverted."
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bimagic",
-  "version": "1.5.0",
+  "version": "1.6.2",
   "description": "A powerful Bash-based Git automation tool that simplifies your GitHub workflow.",
   "bin": {
     "bimagic": "./bimagic",