aidevops 3.13.79 → 3.13.81

package/VERSION

@@ -1 +1 @@
-3.13.79
+3.13.81

package/aidevops.sh

@@ -5,7 +5,7 @@
 # AI DevOps Framework CLI
 # Usage: aidevops <command> [options]
 #
-# Version: 3.13.79
+# Version: 3.13.81
 
 set -euo pipefail
 

package/package.json

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

package/setup-modules/agent-deploy.sh

@@ -143,7 +143,12 @@ _deploy_agents_copy() {
 		for pns in "$@"; do
 			rsync_excludes+=("--exclude=${pns}/")
 		done
-		if rsync -a "${rsync_excludes[@]}" "$source_dir/" "$target_dir/"; then
+		local rsync_timeout="${AIDEVOPS_RSYNC_TIMEOUT:-120}"
+		[[ "$rsync_timeout" =~ ^[0-9]+$ && "$rsync_timeout" -gt 0 ]] || rsync_timeout=120
+		# GH#22086: bound rsync I/O stalls so setup.sh --non-interactive can
+		# unwind via its EXIT trap instead of leaving a long-running setup owner
+		# and stale setup-noninteractive.lock.d behind.
+		if rsync -a --timeout="$rsync_timeout" "${rsync_excludes[@]}" "$source_dir/" "$target_dir/"; then
 			deploy_ok=true
 		fi
 	else

package/setup-modules/migrations.sh

@@ -304,6 +304,36 @@ cleanup_stale_bun_opencode() {
 	return 0
 }
 
+# Register the setup caller's linked worktree as owned before setup performs
+# deployment work that may restart the pulse or trigger cleanup routines.
+protect_current_setup_worktree() {
+	command -v git &>/dev/null || return 0
+	declare -F register_worktree >/dev/null 2>&1 || return 0
+
+	local current_root=""
+	local git_dir=""
+	local common_dir=""
+	local branch=""
+
+	current_root=$(git -C "${INSTALL_DIR:-.}" rev-parse --show-toplevel 2>/dev/null || true)
+	[[ -n "$current_root" ]] || return 0
+	current_root=$(cd "$current_root" 2>/dev/null && pwd -P) || return 0
+
+	git_dir=$(git -C "$current_root" rev-parse --git-dir 2>/dev/null) || return 0
+	common_dir=$(git -C "$current_root" rev-parse --git-common-dir 2>/dev/null) || return 0
+	[[ "$git_dir" = /* ]] || git_dir="$current_root/$git_dir"
+	[[ "$common_dir" = /* ]] || common_dir="$current_root/$common_dir"
+	git_dir=$(cd "$git_dir" 2>/dev/null && pwd -P) || git_dir=""
+	common_dir=$(cd "$common_dir" 2>/dev/null && pwd -P) || common_dir=""
+	[[ -n "$git_dir" && -n "$common_dir" && "$git_dir" != "$common_dir" ]] || return 0
+
+	branch=$(git -C "$current_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)
+	[[ -n "$branch" ]] || branch="HEAD"
+	register_worktree "$current_root" "$branch" --task "setup-noninteractive" --session "setup:${OPENCODE_SESSION_ID:-${CLAUDE_SESSION_ID:-manual}}" >/dev/null 2>&1 || true
+	print_info "Protected current setup worktree from cleanup: $current_root"
+	return 0
+}
+
 # t1929: Remove stale contributor/legacy health issue cache files and close
 # the corresponding GitHub issues. One-time migration — the root cause
 # (API failure in _get_runner_role defaulting to "contributor") is fixed
@@ -331,10 +361,20 @@ cleanup_worktree_entries_in_repos_json() {
 	command -v git &>/dev/null || return 0
 
 	local stale_paths=()
-	local path git_dir common_dir
+	local skipped_current_paths=()
+	local current_worktree=""
+	local current_physical_dir=""
+	local path git_dir common_dir resolved_path
+
+	current_physical_dir=$(pwd -P 2>/dev/null || pwd)
+	current_worktree=$(git rev-parse --show-toplevel 2>/dev/null || true)
+	if [[ -n "$current_worktree" ]]; then
+		current_worktree=$(cd "$current_worktree" 2>/dev/null && pwd -P) || current_worktree=""
+	fi
 
 	while IFS= read -r path; do
 		[[ -n "$path" && -d "$path" ]] || continue
+		resolved_path=$(cd "$path" 2>/dev/null && pwd -P) || resolved_path=""
 		git_dir=$(git -C "$path" rev-parse --git-dir 2>/dev/null) || continue
 		common_dir=$(git -C "$path" rev-parse --git-common-dir 2>/dev/null) || continue
 		# Normalise to absolute paths for comparison.
@@ -343,6 +383,11 @@ cleanup_worktree_entries_in_repos_json() {
 		git_dir=$(cd "$git_dir" 2>/dev/null && pwd -P) || git_dir=""
 		common_dir=$(cd "$common_dir" 2>/dev/null && pwd -P) || common_dir=""
 		if [[ -n "$git_dir" && -n "$common_dir" && "$git_dir" != "$common_dir" ]]; then
+			if [[ -n "$current_worktree" && -n "$resolved_path" && "$resolved_path" == "$current_worktree" ]] \
+				|| [[ -n "$resolved_path" && "$current_physical_dir" == "$resolved_path"/* ]]; then
+				skipped_current_paths+=("$path")
+				continue
+			fi
 			stale_paths+=("$path")
 		fi
 	done < <(jq -r '.initialized_repos[].path // empty' "$repos_json" 2>/dev/null)
@@ -361,6 +406,16 @@ cleanup_worktree_entries_in_repos_json() {
 		done
 	fi
 
+	if [[ ${#skipped_current_paths[@]} -gt 0 ]]; then
+		print_warning "Skipped ${#skipped_current_paths[@]} active current worktree entry/entries in repos.json (t2250):"
+		local skipped_path
+		for skipped_path in "${skipped_current_paths[@]}"; do
+			print_warning "  - $skipped_path"
+		done
+		print_warning "Run setup.sh from the canonical worktree later to finish the one-shot cleanup."
+		return 0
+	fi
+
 	mkdir -p "$(dirname "$flag_file")"
 	date -u +"%Y-%m-%dT%H:%M:%SZ" >"$flag_file"
 	return 0

package/setup-modules/schedulers-platform.sh

@@ -104,7 +104,7 @@ _install_cw_launchd() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_cw_home}</string>
 	</dict>
@@ -229,7 +229,7 @@ _install_complexity_scan_launchd() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_cs_home}</string>
 	</dict>
@@ -363,7 +363,7 @@ _install_pulse_merge_routine_launchd() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_pmr_home}</string>
 	</dict>
@@ -534,7 +534,7 @@ _install_profile_readme_launchd() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_pr_home}</string>
 	</dict>
@@ -740,7 +740,7 @@ _install_token_refresh_launchd() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_tr_home}</string>
 	</dict>
@@ -992,7 +992,7 @@ _install_peer_productivity_monitor_launchd() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_ppm_home}</string>
 	</dict>

package/setup-modules/schedulers-pulse.sh

@@ -693,7 +693,7 @@ _generate_pulse_plist_content() {
 	# Use neutral workspace path for PULSE_DIR so supervisor sessions
 	# are not associated with any specific managed repo (GH#5136).
 	_xml_pulse_dir=$(_xml_escape "${HOME}/.aidevops/.agent-workspace")
-	_xml_path=$(_xml_escape "$PATH")
+	_xml_path=$(_xml_escape "$(aidevops_launchd_sanitized_path "$PATH")")
 
 	local _headless_xml_env
 	_headless_xml_env=$(_build_pulse_headless_env_xml)
@@ -842,7 +842,7 @@ _generate_pulse_watchdog_plist_content() {
 	_xml_tick=$(_xml_escape "$tick_script")
 	_xml_bash=$(_xml_escape "$bash_bin")
 	_xml_home=$(_xml_escape "$HOME")
-	_xml_path=$(_xml_escape "$PATH")
+	_xml_path=$(_xml_escape "$(aidevops_launchd_sanitized_path "$PATH")")
 
 	cat <<PLIST
 <?xml version="1.0" encoding="UTF-8"?>

package/setup-modules/schedulers.sh

@@ -31,6 +31,32 @@ CRON_HOURLY="0 * * * *"
 # Kept DRY for the same reason as CRON_HOURLY.
 CRON_EVERY_MINUTE="* * * * *"
 
+# Direct unit tests source this module without setup.sh's later
+# shared-constants.sh load. Provide a small fallback; the shared helper
+# overwrites this when setup.sh sources shared-constants.sh.
+if ! declare -F aidevops_launchd_sanitized_path >/dev/null 2>&1; then
+	aidevops_launchd_sanitized_path() {
+		local input_path="${1:-${PATH:-}}"
+		local default_path="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+		local result=""
+		local seen=""
+		local dir=""
+		local old_ifs="$IFS"
+		IFS=':'
+		for dir in $default_path:$input_path; do
+			[[ -n "$dir" && -d "$dir" ]] || continue
+			case ":$seen:" in
+			*":${dir}:"*) continue ;;
+			esac
+			seen="${seen:+${seen}:}${dir}"
+			result="${result:+${result}:}${dir}"
+		done
+		IFS="$old_ifs"
+		printf '%s' "$result"
+		return 0
+	}
+fi
+
 # Shell safety baseline
 set -Eeuo pipefail
 IFS=$'\n\t'
@@ -87,7 +113,7 @@ setup_stats_wrapper() {
 			local _xml_stats_script _xml_stats_home _xml_stats_path
 			_xml_stats_script=$(_xml_escape "$stats_script")
 			_xml_stats_home=$(_xml_escape "$HOME")
-			_xml_stats_path=$(_xml_escape "$PATH")
+			_xml_stats_path=$(_xml_escape "$(aidevops_launchd_sanitized_path "$PATH")")
 			local stats_plist_content
 			stats_plist_content=$(
 				cat <<PLIST
@@ -189,7 +215,7 @@ setup_failure_miner() {
 		local _xml_miner_script _xml_miner_home _xml_miner_path _xml_miner_log
 		_xml_miner_script=$(_xml_escape "$miner_script")
 		_xml_miner_home=$(_xml_escape "$HOME")
-		_xml_miner_path=$(_xml_escape "/bin:/usr/bin:/usr/local/bin:/opt/homebrew/bin:${PATH}")
+		_xml_miner_path=$(_xml_escape "$(aidevops_launchd_sanitized_path "/bin:/usr/bin:/usr/local/bin:/opt/homebrew/bin:${PATH}")")
 		_xml_miner_log=$(_xml_escape "$miner_log")
 
 		local miner_plist_content
@@ -287,7 +313,7 @@ setup_process_guard() {
 		local _xml_guard_script _xml_guard_home _xml_guard_path
 		_xml_guard_script=$(_xml_escape "$guard_script")
 		_xml_guard_home=$(_xml_escape "$HOME")
-		_xml_guard_path=$(_xml_escape "$PATH")
+		_xml_guard_path=$(_xml_escape "$(aidevops_launchd_sanitized_path "$PATH")")
 
 		local guard_plist_content
 		guard_plist_content=$(
@@ -407,7 +433,7 @@ setup_memory_pressure_monitor() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_monitor_home}</string>
 	</dict>
@@ -496,7 +522,7 @@ setup_screen_time_snapshot() {
 	<key>EnvironmentVariables</key>
 	<dict>
 		<key>PATH</key>
-		<string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+		<string>$(aidevops_launchd_sanitized_path)</string>
 		<key>HOME</key>
 		<string>${_xml_st_home}</string>
 	</dict>

package/setup.sh

@@ -12,7 +12,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.13.79
+# Version: 3.13.81
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)
@@ -1517,6 +1517,7 @@ _setup_run_non_interactive() {
 		fi
 	fi
 
+	_time_step "protect_current_setup_worktree" protect_current_setup_worktree
 	_time_step "verify_location" verify_location
 	_time_step "check_requirements" check_requirements
 	# Run quality tool detection in non-interactive mode too (warn-only path).