aidevops 3.1.387 → 3.1.389

package/VERSION

@@ -1 +1 @@
-3.1.387
+3.1.389

package/aidevops.sh

@@ -3,7 +3,7 @@
 # AI DevOps Framework CLI
 # Usage: aidevops <command> [options]
 #
-# Version: 3.1.387
+# Version: 3.1.389
 
 set -euo pipefail
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aidevops",
-  "version": "3.1.387",
+  "version": "3.1.389",
   "description": "AI DevOps Framework - AI-assisted development workflows, code quality, and deployment automation",
   "type": "module",
   "bin": {

package/setup-modules/plugins.sh

@@ -402,79 +402,102 @@ check_skill_updates() {
 	return 0
 }
 
-scan_imported_skills() {
-	# Check prerequisites before announcing setup (GH#5240)
-	local security_helper="$HOME/.aidevops/agents/scripts/security-helper.sh"
-
-	if [[ ! -f "$security_helper" ]]; then
-		print_skip "Skill security scan" "security-helper.sh not found" "Deploy agents first (setup.sh), then re-run"
-		setup_track_skipped "Skill security scan" "security-helper.sh not found"
-		return 0
-	fi
+# Find the skill-scanner binary on PATH or in known install locations.
+# Prints the path to the binary if found, empty string otherwise.
+# PATH note: uv/pipx install to ~/.local/bin which may not be on PATH in all shells.
+_find_skill_scanner_bin() {
+	local bin
+	bin=$(command -v skill-scanner 2>/dev/null || echo "")
+	# Fallback: check the known install path directly
+	if [[ -z "$bin" && -x "$HOME/.local/bin/skill-scanner" ]]; then
+		bin="$HOME/.local/bin/skill-scanner"
+	fi
+	echo "$bin"
+	return 0
+}
 
-	# Prerequisites met — proceed with setup
-	print_info "Running security scan on imported skills..."
+# Find the first Python >= 3.10 interpreter available on this system.
+# Prints the interpreter path if found, empty string otherwise.
+# Checks the same candidates as check_python_for_skill_scanner() so the
+# venv method uses the same interpreter that passed validation.
+_find_python_for_skill_scanner() {
+	local py_bin
+	for py_bin in python3 python3.13 python3.12 python3.11 python3.10; do
+		if command -v "$py_bin" &>/dev/null; then
+			local ver_output
+			ver_output=$("$py_bin" --version 2>/dev/null) || continue
+			if [[ "$ver_output" != Python\ * ]]; then continue; fi
+			local version major remainder minor
+			version="${ver_output#Python }"
+			major="${version%%.*}"
+			remainder="${version#*.}"
+			minor="${remainder%%.*}"
+			if [[ ! "$major" =~ ^[0-9]+$ || ! "$minor" =~ ^[0-9]+$ ]]; then continue; fi
+			if [[ "$major" -gt 3 ]] || { [[ "$major" -eq 3 ]] && [[ "$minor" -ge 10 ]]; }; then
+				echo "$py_bin"
+				return 0
+			fi
+		fi
+	done
+	echo ""
+	return 1
+}
 
-	# Install skill-scanner if not present
-	# Pre-check: cisco-ai-skill-scanner requires Python >= 3.10
-	# Fallback chain: uv -> pipx -> venv+symlink -> pip3 --user (legacy)
-	# PEP 668 (Ubuntu 24.04+) blocks pip3 --user, so we try isolated methods first
-	#
-	# PATH note: uv installs to ~/.local/bin which may not be on PATH in all shells.
-	# Check both command -v and the known install path to avoid spurious reinstalls.
-	local skill_scanner_bin
-	skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "")
-	# Fallback: uv/pipx install to ~/.local/bin which may not be on PATH
-	if [[ -z "$skill_scanner_bin" && -x "$HOME/.local/bin/skill-scanner" ]]; then
-		skill_scanner_bin="$HOME/.local/bin/skill-scanner"
+# Install cisco-ai-skill-scanner using a 4-method fallback chain.
+# Fallback order: uv -> pipx -> venv+symlink -> pip3 --user (legacy)
+# PEP 668 (Ubuntu 24.04+) blocks pip3 --user, so isolated methods are tried first.
+# Prints the path to the installed binary on success, empty string on failure.
+_install_skill_scanner() {
+	# Verify Python >= 3.10 is available (or install it via uv)
+	if ! check_python_for_skill_scanner; then
+		print_warning "Skipping Cisco Skill Scanner install (Python >= 3.10 required)"
+		return 1
 	fi
 
-	if [[ -z "$skill_scanner_bin" ]]; then
-		# Verify Python >= 3.10 is available (or install it via uv)
-		if ! check_python_for_skill_scanner; then
-			print_warning "Skipping Cisco Skill Scanner install (Python >= 3.10 required)"
-			return 0
+	local installed=false
+	local skill_scanner_bin=""
+
+	# 1. uv tool install (preferred - fast, isolated, manages its own Python)
+	# Uses --force to handle two known failure modes:
+	#   a) Dangling/corrupted environment: uv detects "Invalid environment" and
+	#      exits 2. Detect via warning in `uv tool list` and uninstall first.
+	#   b) Executable conflict: skill-scanner already exists (e.g. from pipx).
+	#      --force overwrites the existing executable.
+	if [[ "$installed" == "false" ]] && command -v uv &>/dev/null && uv tool --help &>/dev/null; then
+		print_info "Installing Cisco Skill Scanner via uv..."
+		# Detect and remove dangling uv environment before attempting install
+		if uv tool list 2>&1 | grep -q "Ignoring malformed tool.*cisco-ai-skill-scanner"; then
+			print_info "Removing dangling uv environment for cisco-ai-skill-scanner..."
+			uv tool uninstall cisco-ai-skill-scanner 2>/dev/null || true
 		fi
-
-		local installed=false
-
-		# 1. uv tool install (preferred - fast, isolated, manages its own Python)
-		# Uses --force to handle two known failure modes:
-		#   a) Dangling/corrupted environment: uv detects "Invalid environment" and
-		#      exits 2. Detect via warning in `uv tool list` and uninstall first.
-		#   b) Executable conflict: skill-scanner already exists (e.g. from pipx).
-		#      --force overwrites the existing executable.
-		if [[ "$installed" == "false" ]] && command -v uv &>/dev/null && uv tool --help &>/dev/null; then
-			print_info "Installing Cisco Skill Scanner via uv..."
-			# Detect and remove dangling uv environment before attempting install
-			if uv tool list 2>&1 | grep -q "Ignoring malformed tool.*cisco-ai-skill-scanner"; then
-				print_info "Removing dangling uv environment for cisco-ai-skill-scanner..."
-				uv tool uninstall cisco-ai-skill-scanner 2>/dev/null || true
-			fi
-			if run_with_spinner "Installing cisco-ai-skill-scanner" uv tool install --force cisco-ai-skill-scanner; then
-				print_success "Cisco Skill Scanner installed via uv"
-				installed=true
-				# uv installs to ~/.local/bin — update skill_scanner_bin for use below
-				skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "$HOME/.local/bin/skill-scanner")
-			fi
+		if run_with_spinner "Installing cisco-ai-skill-scanner" uv tool install --force cisco-ai-skill-scanner; then
+			print_success "Cisco Skill Scanner installed via uv"
+			installed=true
+			skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "$HOME/.local/bin/skill-scanner")
 		fi
+	fi
 
-		# 2. pipx install (designed for isolated app installs)
-		if [[ "$installed" == "false" ]] && command -v pipx &>/dev/null; then
-			print_info "Installing Cisco Skill Scanner via pipx..."
-			if run_with_spinner "Installing cisco-ai-skill-scanner" pipx install cisco-ai-skill-scanner; then
-				print_success "Cisco Skill Scanner installed via pipx"
-				installed=true
-				skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "$HOME/.local/bin/skill-scanner")
-			fi
+	# 2. pipx install (designed for isolated app installs)
+	if [[ "$installed" == "false" ]] && command -v pipx &>/dev/null; then
+		print_info "Installing Cisco Skill Scanner via pipx..."
+		if run_with_spinner "Installing cisco-ai-skill-scanner" pipx install cisco-ai-skill-scanner; then
+			print_success "Cisco Skill Scanner installed via pipx"
+			installed=true
+			skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "$HOME/.local/bin/skill-scanner")
 		fi
+	fi
 
-		# 3. venv + symlink (works on PEP 668 systems without uv/pipx)
-		if [[ "$installed" == "false" ]] && command -v python3 &>/dev/null; then
+	# 3. venv + symlink (works on PEP 668 systems without uv/pipx)
+	# Use the validated interpreter (same candidates as check_python_for_skill_scanner)
+	# so venv creation succeeds even when python3 itself is < 3.10.
+	if [[ "$installed" == "false" ]]; then
+		local py_interp
+		py_interp=$(_find_python_for_skill_scanner) || true
+		if [[ -n "$py_interp" ]]; then
 			local venv_dir="$HOME/.aidevops/.agent-workspace/work/cisco-scanner-env"
 			local bin_dir="$HOME/.local/bin"
 			print_info "Installing Cisco Skill Scanner in isolated venv..."
-			if python3 -m venv "$venv_dir" 2>/dev/null &&
+			if "$py_interp" -m venv "$venv_dir" 2>/dev/null &&
 				"$venv_dir/bin/pip" install cisco-ai-skill-scanner 2>/dev/null; then
 				mkdir -p "$bin_dir"
 				ln -sf "$venv_dir/bin/skill-scanner" "$bin_dir/skill-scanner"
@@ -485,26 +508,61 @@ scan_imported_skills() {
 				rm -rf "$venv_dir" 2>/dev/null || true
 			fi
 		fi
+	fi
 
-		# 4. pip3 --user (legacy fallback, fails on PEP 668 systems)
-		if [[ "$installed" == "false" ]] && command -v pip3 &>/dev/null; then
-			print_info "Installing Cisco Skill Scanner via pip3 --user..."
-			if run_with_spinner "Installing cisco-ai-skill-scanner" pip3 install --user cisco-ai-skill-scanner 2>/dev/null; then
-				print_success "Cisco Skill Scanner installed via pip3"
-				installed=true
-				skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "$HOME/.local/bin/skill-scanner")
-			fi
+	# 4. pip3 --user (legacy fallback, fails on PEP 668 systems)
+	if [[ "$installed" == "false" ]] && command -v pip3 &>/dev/null; then
+		print_info "Installing Cisco Skill Scanner via pip3 --user..."
+		if run_with_spinner "Installing cisco-ai-skill-scanner" pip3 install --user cisco-ai-skill-scanner 2>/dev/null; then
+			print_success "Cisco Skill Scanner installed via pip3"
+			installed=true
+			skill_scanner_bin=$(command -v skill-scanner 2>/dev/null || echo "$HOME/.local/bin/skill-scanner")
 		fi
+	fi
 
-		if [[ "$installed" == "false" ]]; then
-			print_warning "Failed to install Cisco Skill Scanner - skipping security scan"
-			print_info "Install manually with: uv tool install cisco-ai-skill-scanner"
-			print_info "Or: pipx install cisco-ai-skill-scanner"
-			return 0
-		fi
+	if [[ "$installed" == "false" ]]; then
+		print_warning "Failed to install Cisco Skill Scanner - skipping security scan"
+		print_info "Install manually with: uv tool install cisco-ai-skill-scanner"
+		print_info "Or: pipx install cisco-ai-skill-scanner"
+		return 1
+	fi
+
+	echo "$skill_scanner_bin"
+	return 0
+}
+
+scan_imported_skills() {
+	# Check prerequisites before announcing setup (GH#5240)
+	local security_helper="$HOME/.aidevops/agents/scripts/security-helper.sh"
+
+	if [[ ! -f "$security_helper" ]]; then
+		print_skip "Skill security scan" "security-helper.sh not found" "Deploy agents first (setup.sh), then re-run"
+		setup_track_skipped "Skill security scan" "security-helper.sh not found"
+		return 0
+	fi
+
+	# Prerequisites met — proceed with setup
+	print_info "Running security scan on imported skills..."
+
+	# Locate or install skill-scanner binary
+	local skill_scanner_bin
+	skill_scanner_bin=$(_find_skill_scanner_bin)
+
+	if [[ -z "$skill_scanner_bin" ]]; then
+		# _install_skill_scanner prints the binary path on success
+		skill_scanner_bin=$(_install_skill_scanner) || return 0
+	fi
+
+	if [[ ! -x "$skill_scanner_bin" ]]; then
+		print_warning "skill-scanner not executable at: $skill_scanner_bin"
+		return 0
 	fi
 
-	if bash "$security_helper" skill-scan all 2>/dev/null; then
+	# Prepend the scanner's directory to PATH so security-helper.sh can resolve
+	# skill-scanner even when ~/.local/bin is not in the caller's PATH.
+	local scanner_dir
+	scanner_dir=$(dirname "$skill_scanner_bin")
+	if PATH="$scanner_dir:$PATH" bash "$security_helper" skill-scan all 2>/dev/null; then
 		print_success "All imported skills passed security scan"
 	else
 		print_warning "Some imported skills have security findings - review with: aidevops skill scan"

package/setup.sh

@@ -10,7 +10,7 @@ shopt -s inherit_errexit 2>/dev/null || true
 # AI Assistant Server Access Framework Setup Script
 # Helps developers set up the framework for their infrastructure
 #
-# Version: 3.1.387
+# Version: 3.1.389
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)