aidevops 3.13.79 → 3.13.80

package/VERSION

@@ -1 +1 @@
-3.13.79
+3.13.80

package/aidevops.sh

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aidevops",
-  "version": "3.13.79",
+  "version": "3.13.80",
   "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

@@ -331,10 +331,18 @@ 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 path git_dir common_dir resolved_path
+
+	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 +351,10 @@ 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" ]]; 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 +373,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.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.80
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)