Merge branch 'main' into claude/issue-17-20251210-1410

Author: shyndman

lib/lazy-loader.zsh

@@ -85,6 +85,18 @@ _zush_do_tool_initialization() {
 zush_lazy_load() {
     local tool=$1
     local init_command=$2
+
+    # Validate required parameters
+    if [[ -z "$tool" ]]; then
+        zush_error "zush_lazy_load: tool name is required (got: '$tool')"
+        return 1
+    fi
+
+    if [[ -z "$init_command" ]]; then
+        zush_error "zush_lazy_load: init command is required (got: '$init_command')"
+        return 1
+    fi
+
     shift 2
     local -a commands=("$@")
 

lib/plugin.zsh

@@ -76,8 +76,17 @@ _zushp_add_to_manifest() {
 # Main plugin function
 zushp() {
     local user_repo="$1"
-    
-    [[ -z "$user_repo" ]] && { echo "Usage: zushp <user/repo>"; return 1; }
+
+    # Validate user/repo format
+    if [[ -z "$user_repo" ]]; then
+        zush_error "Usage: zushp <user/repo> (got: '$user_repo')"
+        return 1
+    fi
+
+    if [[ ! "$user_repo" =~ ^[a-zA-Z0-9_-]+/[a-zA-Z0-9_.-]+$ ]]; then
+        zush_error "Invalid format. Use: zushp <user/repo> (got: '$user_repo')"
+        return 1
+    fi
 
     local plugin_name="${user_repo##*/}"
     local plugin_dir="${ZUSH_PLUGINS_DIR}/${plugin_name}"

rc.d/50-editor.zsh

@@ -2,7 +2,7 @@
 # Sets up editor preferences based on environment
 
 # Use VS Code if local (with -w to wait), vim if remote
-if [[ -z "$SSH_CONNECTION" ]] && command -v code >/dev/null 2>&1; then
+if [[ -z "$SSH_CONNECTION" ]] && (( ${+commands[code]} )); then
     export EDITOR="code -w"
     export VISUAL="code -w"
 else

rc.d/84-git-worktrees.zsh

@@ -107,7 +107,7 @@ _gwt_message() {
 }
 
 _gwt_require_git() {
-    if ! command -v git >/dev/null 2>&1; then
+    if ! (( ${+commands[git]} )); then
         _gwt_error "git is not available"
         return 1
     fi