@jswork/ushell-module-git 1.0.66 → 1.0.68

package/index.sh

@@ -8,7 +8,7 @@ source $ROOT_PATH/modules/07-git-rebase.sh
 source $ROOT_PATH/modules/11-lazygit.sh
 source $ROOT_PATH/modules/14-gr.sh
 source $ROOT_PATH/modules/15-ignore-file.sh
-source $ROOT_PATH/modules/16-wt.sh
+# source $ROOT_PATH/modules/16-wt.sh
 
 ## git base:
 alias gl='git pull'

package/modules/16-wt.sh

@@ -1,19 +1,22 @@
 #!/usr/bin/env bash
 
-# wt CLI - Git Worktree Directory Switching
+# wtt CLI - Git Worktree Directory Switching (wtt = worktree-tool)
 # https://github.com/yourusername/worktree-cli
 
 # Check if wt binary exists
 if command -v wt >/dev/null 2>&1; then
 
-    # 🚀 wt function for true directory switching
-    # This function overrides the wt binary to support real directory switching
-    wt() {
+    # Find the actual wt binary path
+    WT_BIN=$(command -v wt)
+
+    # 🚀 wtt function for true directory switching
+    # wtt (worktree-tool) provides directory switching without conflicting with wt binary
+    wtt() {
         case "$1" in
             switch|co)
                 # Handle switch/co commands for true directory switching
                 shift
-                local wt_cli="wt"  # Use wt from PATH
+                local wt_cli="$WT_BIN"  # Use the actual binary path
 
                 # Get the path from wt switch command
                 local path
@@ -29,21 +32,17 @@ if command -v wt >/dev/null 2>&1; then
                 fi
                 ;;
             *)
-                # Pass all other commands to wt binary
-                wt "$@"
+                # Pass all other commands to wt binary (use full path to avoid recursion)
+                "$WT_BIN" "$@"
                 ;;
         esac
     }
 
-    # Convenience alias
-    alias wtco='wt co'  # Quick switch to worktree
-    alias wtl='wt switch --list'  # List all worktrees
-
 else
     # wt binary not found - show installation message once
-    if [[ -z "$WT_SHOWN_MISSING" ]]; then
+    if [[ -z "$WTT_SHOWN_MISSING" ]]; then
         echo "⚠️  wt CLI not found in PATH"
         echo "Install: go build -o wt main.go && sudo mv wt /usr/local/bin/wt"
-        export WT_SHOWN_MISSING=1
+        export WTT_SHOWN_MISSING=1
     fi
 fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jswork/ushell-module-git",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "Unix like shell module for git.",
   "main": "index.sh",
   "repository": {