skillpull 0.4.2 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillpull",
-  "version": "0.4.2",
+  "version": "0.4.5",
   "description": "Sync AI agent skills from Git repositories to Claude, Codex, Kiro, and Cursor",
   "bin": {
     "skillpull": "./skillpull"

package/skillpull

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-VERSION="0.4.2"
+VERSION="0.4.5"
 MANIFEST_FILE=".skillpull.json"
 TMPDIR_PREFIX="skillpull"
 CONFIG_DIR="$HOME/.config/skillpull"
@@ -60,6 +60,20 @@ sedi() {
 # Sets SELECTED_ITEMS=("item1" "item3") with user's choices
 SELECTED_ITEMS=()
 
+_read_key() {
+  local old_settings; old_settings="$(stty -g 2>/dev/null)" || true
+  stty -icanon -echo min 1 time 0 2>/dev/null || true
+  local char; char="$(dd bs=1 count=1 2>/dev/null)"
+  # Check for escape sequence
+  if [[ "$char" == $'\033' ]]; then
+    stty -icanon -echo min 0 time 1 2>/dev/null || true
+    local seq; seq="$(dd bs=2 count=1 2>/dev/null)"
+    char="${char}${seq}"
+  fi
+  [[ -n "$old_settings" ]] && stty "$old_settings" 2>/dev/null || true
+  printf '%s' "$char"
+}
+
 select_menu() {
   local prompt="$1"; shift
   local items=("$@")
@@ -75,15 +89,12 @@ select_menu() {
 
   SELECTED_ITEMS=()
 
-  # Save terminal state
-  local old_stty; old_stty="$(stty -g 2>/dev/null)" || true
-
   # Hide cursor
   printf '\033[?25l' >&2
 
   # Print prompt
   printf "\n  ${CYAN}%s${RESET}\n" "$prompt" >&2
-  printf "  ${DIM}↑↓ move  Space select  Enter confirm${RESET}\n\n" >&2
+  printf "  ${DIM}j/k move  Space select  Enter confirm${RESET}\n\n" >&2
 
   # Draw initial list
   for ((i=0; i<count; i++)); do
@@ -98,17 +109,7 @@ select_menu() {
 
   # Input loop
   while true; do
-    # Read single key
-    local key=""
-    IFS= read -rsn1 key 2>/dev/null || true
-
-    # Handle escape sequences (arrow keys)
-    if [[ "$key" == $'\033' ]]; then
-      local seq1="" seq2=""
-      IFS= read -rsn1 -t 0.1 seq1 2>/dev/null || true
-      IFS= read -rsn1 -t 0.1 seq2 2>/dev/null || true
-      key="${key}${seq1}${seq2}"
-    fi
+    local key; key="$(_read_key)"
 
     case "$key" in
       $'\033[A'|k) # Up
@@ -124,7 +125,7 @@ select_menu() {
           selected="${selected:0:$cursor}0${selected:$((cursor+1))}"
         fi
         ;;
-      '') # Enter - confirm
+      ''|$'\n'|$'\r') # Enter - confirm
         break
         ;;
     esac
@@ -147,9 +148,6 @@ select_menu() {
   # Show cursor
   printf '\033[?25h' >&2
 
-  # Restore terminal
-  [[ -n "$old_stty" ]] && stty "$old_stty" 2>/dev/null || true
-
   # Collect selected items
   for ((i=0; i<count; i++)); do
     if [[ "${selected:$i:1}" == "1" ]]; then
@@ -211,8 +209,9 @@ remove_alias() {
     err "Alias '$name' not found"
     return 1
   fi
-  # Remove the alias entry
-  sedi "s|\"${name}\":\"[^\"]*\",\?||" "$CONFIG_FILE"
+  # Remove the alias entry (try with trailing comma first, then without)
+  sedi "s|\"${name}\":\"[^\"]*\",||" "$CONFIG_FILE"
+  sedi "s|\"${name}\":\"[^\"]*\"||" "$CONFIG_FILE"
   # Clean up double commas and trailing commas
   sedi 's/,,/,/g; s/,}/}/g; s/{,/{/g' "$CONFIG_FILE"
   info "Alias '$name' removed"
@@ -403,12 +402,26 @@ write_manifest_entry() {
     ' "$manifest" > "$tmp"
     mv "$tmp" "$manifest"
   else
-    # Append before closing braces
-    sedi '/"skills":/,$ {
-      /^  }/ i\'"$entry"',
-    }' "$manifest"
+    # Append new entry before closing braces using awk
+    awk -v new="$entry" '
+      /^  }/ && !done { printf "%s,\n", new; done=1 }
+      { print }
+    ' "$manifest" > "$tmp"
+    mv "$tmp" "$manifest"
     # Fix trailing comma before closing brace
-    sedi ':a;N;$!ba;s/,\n  }/\n  }/g' "$manifest"
+    local tmp2; tmp2="$(mktemp)"
+    awk '
+      { lines[NR] = $0; n = NR }
+      END {
+        for (i=1; i<=n; i++) {
+          if (i < n && lines[i] ~ /,$/ && lines[i+1] ~ /^  }/) {
+            sub(/,$/, "", lines[i])
+          }
+          print lines[i]
+        }
+      }
+    ' "$manifest" > "$tmp2"
+    mv "$tmp2" "$manifest"
   fi
 }
 
@@ -479,28 +492,6 @@ cmd_pull() {
       return 1
     fi
     skills=("${matched[@]}")
-  elif [[ ${#skills[@]} -gt 1 && -t 0 ]]; then
-    # Multiple skills, no filter, interactive terminal -> let user choose
-    local names=()
-    for sd in "${skills[@]}"; do
-      names+=("$(skill_display_name "$sd")")
-    done
-    select_menu "Select skills to install:" "${names[@]}"
-    if [[ ${#SELECTED_ITEMS[@]} -eq 0 ]]; then
-      warn "No skills selected"
-      return 0
-    fi
-    local matched=()
-    for sd in "${skills[@]}"; do
-      local sn; sn="$(skill_display_name "$sd")"
-      for sel in "${SELECTED_ITEMS[@]}"; do
-        if [[ "$sn" == "$sel" ]]; then
-          matched+=("$sd")
-          break
-        fi
-      done
-    done
-    skills=("${matched[@]}")
   fi
 
   mkdir -p "$target_dir"
@@ -690,7 +681,20 @@ cmd_remove() {
     local tmp; tmp="$(mktemp)"
     grep -v "\"${skill_name}\"" "$manifest" > "$tmp" || true
     mv "$tmp" "$manifest"
-    sedi ':a;N;$!ba;s/,\n  }/\n  }/g' "$manifest"
+    # Fix trailing comma before closing brace
+    local tmp2; tmp2="$(mktemp)"
+    awk '
+      { lines[NR] = $0; n = NR }
+      END {
+        for (i=1; i<=n; i++) {
+          if (i < n && lines[i] ~ /,$/ && lines[i+1] ~ /^  }/) {
+            sub(/,$/, "", lines[i])
+          }
+          print lines[i]
+        }
+      }
+    ' "$manifest" > "$tmp2"
+    mv "$tmp2" "$manifest"
   fi
 
   info "Removed: $skill_name from $target_dir"
@@ -1053,7 +1057,7 @@ HELP
 # ── Argument parsing & dispatch ──
 main() {
   local cmd="" repo_url="" skill_name="" custom_path=""
-  local force=0 dry_run=0 is_global=0 use_all=0
+  local force=0 dry_run=0 is_global=0 use_all=0 agent_explicit=0
   local agents=()
   local alias_args=()
   QUIET=0; BRANCH=""
@@ -1091,11 +1095,11 @@ main() {
       --force|-f)   force=1; shift ;;
       --dry-run)    dry_run=1; shift ;;
       --quiet|-q)   QUIET=1; shift ;;
-      --claude)     agents+=("claude"); shift ;;
-      --codex)      agents+=("codex"); shift ;;
-      --kiro)       agents+=("kiro"); shift ;;
-      --cursor)     agents+=("cursor"); shift ;;
-      --all)        use_all=1; shift ;;
+      --claude)     agents+=("claude"); agent_explicit=1; shift ;;
+      --codex)      agents+=("codex"); agent_explicit=1; shift ;;
+      --kiro)       agents+=("kiro"); agent_explicit=1; shift ;;
+      --cursor)     agents+=("cursor"); agent_explicit=1; shift ;;
+      --all)        use_all=1; agent_explicit=1; shift ;;
       list)         cmd="list"; shift ;;
       installed)    cmd="installed"; shift ;;
       remove)       cmd="remove"; shift ;;
@@ -1136,7 +1140,20 @@ main() {
   if [[ "$use_all" == "1" ]]; then
     agents=("claude" "codex" "kiro" "cursor")
   elif [[ ${#agents[@]} -eq 0 ]]; then
-    agents=("$DEFAULT_AGENT")
+    if [[ "$agent_explicit" == "0" && -t 0 && "$cmd" != "installed" && "$cmd" != "update" ]]; then
+      # Interactive terminal, no agent flag -> let user choose
+      select_menu "Install to which tools?" "claude (.claude/skills)" "codex (.codex/skills)" "kiro (.kiro/skills)" "cursor (.cursor/rules)"
+      if [[ ${#SELECTED_ITEMS[@]} -eq 0 ]]; then
+        warn "No tools selected"
+        exit 0
+      fi
+      for sel in "${SELECTED_ITEMS[@]}"; do
+        local agent_name; agent_name="$(echo "$sel" | awk '{print $1}')"
+        agents+=("$agent_name")
+      done
+    else
+      agents=("$DEFAULT_AGENT")
+    fi
   fi
 
   case "${cmd:-}" in