aidevops 3.13.48 → 3.13.50

package/VERSION

@@ -1 +1 @@
-3.13.48
+3.13.50

package/aidevops.sh

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

package/package.json

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

package/setup-modules/tool-install.sh

@@ -1547,6 +1547,82 @@ setup_nodejs() {
 	return 0
 }
 
+# Bound OpenCode setup probes/installers so non-interactive setup cannot hang
+# indefinitely when an opencode shim or package manager blocks.
+_setup_opencode_timeout_cmd() {
+	local timeout_seconds="$1"
+	shift
+
+	[[ "$timeout_seconds" =~ ^[0-9]+$ ]] || timeout_seconds=5
+	[[ "$timeout_seconds" -gt 0 ]] || timeout_seconds=5
+
+	local command_name="${1:-}"
+	if [[ -n "$command_name" ]] && ! declare -F "$command_name" >/dev/null 2>&1; then
+		if declare -F timeout_sec >/dev/null 2>&1; then
+			timeout_sec "$timeout_seconds" "$@"
+			return $?
+		fi
+
+		if command -v gtimeout >/dev/null 2>&1; then
+			gtimeout "$timeout_seconds" "$@"
+			return $?
+		fi
+
+		if command -v timeout >/dev/null 2>&1; then
+			timeout "$timeout_seconds" "$@"
+			return $?
+		fi
+	fi
+
+	local output_file=""
+	output_file=$(mktemp "${TMPDIR:-/tmp}/aidevops-opencode-timeout.XXXXXX" 2>/dev/null || printf '')
+	if [[ -z "$output_file" ]]; then
+		"$@"
+		return $?
+	fi
+
+	local pid=""
+	"$@" >"$output_file" 2>&1 &
+	pid=$!
+
+	local elapsed=0
+	while kill -0 "$pid" 2>/dev/null; do
+		if [[ "$elapsed" -ge "$timeout_seconds" ]]; then
+			kill "$pid" 2>/dev/null || true
+			wait "$pid" 2>/dev/null || true
+			rm -f "$output_file" 2>/dev/null || true
+			return 124
+		fi
+		sleep 1
+		elapsed=$((elapsed + 1))
+	done
+
+	local rc=0
+	wait "$pid" || rc=$?
+	while IFS= read -r line; do
+		printf '%s\n' "$line"
+	done <"$output_file"
+	rm -f "$output_file" 2>/dev/null || true
+	return "$rc"
+}
+
+_setup_opencode_version_output() {
+	local bin="$1"
+	local version_timeout="${AIDEVOPS_OPENCODE_VERSION_TIMEOUT:-5}"
+
+	_setup_opencode_timeout_cmd "$version_timeout" "$bin" --version
+	return $?
+}
+
+_setup_opencode_first_line() {
+	local input="$1"
+	local first_line=""
+
+	IFS= read -r first_line <<<"$input" || true
+	printf '%s\n' "$first_line"
+	return 0
+}
+
 # t2891: Validate that an opencode binary is real anomalyco/opencode.
 # Mirrors the t2887 runtime canary validator (headless-runtime-lib.sh) and
 # the t2888 setup module validator (.agents/scripts/setup/_services.sh).
@@ -1559,7 +1635,7 @@ _setup_validate_opencode_binary() {
 	command -v "$bin" >/dev/null 2>&1 || return 2
 
 	local v
-	v=$("$bin" --version 2>/dev/null || echo "")
+	v=$(_setup_opencode_version_output "$bin" 2>/dev/null || printf '')
 	[[ -n "$v" ]] || return 2
 
 	# Anthropic claude CLI signature — highest-confidence rejection.
@@ -1597,7 +1673,8 @@ _setup_opencode_force_heal() {
 		return 0
 	fi
 
-	if run_with_spinner "Reinstalling OpenCode (heal)" npm_global_install "$install_pkg"; then
+	local install_timeout="${AIDEVOPS_OPENCODE_INSTALL_TIMEOUT:-180}"
+	if run_with_spinner "Reinstalling OpenCode (heal)" _setup_opencode_timeout_cmd "$install_timeout" npm_global_install "$install_pkg"; then
 		print_success "OpenCode reinstalled via $installer"
 	else
 		print_warning "Heal install failed via $installer"
@@ -1609,13 +1686,13 @@ _setup_opencode_force_heal() {
 	new_bin=$(command -v opencode 2>/dev/null || echo "")
 	if [[ -n "$new_bin" ]] && _setup_validate_opencode_binary "$new_bin"; then
 		local new_v
-		new_v=$("$new_bin" --version 2>/dev/null | head -1 || echo "unknown")
+		new_v=$(_setup_opencode_first_line "$(_setup_opencode_version_output "$new_bin" 2>/dev/null || printf 'unknown')")
 		print_success "OpenCode CLI: $new_bin ($new_v)"
 		mkdir -p "${HOME}/.aidevops" 2>/dev/null || true
 		printf '%s\n' "$new_bin" >"${HOME}/.aidevops/.opencode-bin-resolved" 2>/dev/null || true
 	else
 		local v_after
-		v_after=$("$new_bin" --version 2>/dev/null | head -1 || echo "<missing>")
+		v_after=$(_setup_opencode_first_line "$(_setup_opencode_version_output "$new_bin" 2>/dev/null || printf '<missing>')")
 		print_warning "Post-heal validation still failing: '$new_bin' returns '$v_after'"
 		print_info "Check PATH: 'which -a opencode' — npm/bun global bin dir must come first"
 	fi
@@ -1648,7 +1725,7 @@ setup_opencode_cli() {
 	# Already valid → record + early return.
 	if [[ $validate_rc -eq 0 ]]; then
 		local oc_version
-		oc_version=$("$current_bin" --version 2>/dev/null | head -1 || echo "unknown")
+		oc_version=$(_setup_opencode_first_line "$(_setup_opencode_version_output "$current_bin" 2>/dev/null || printf 'unknown')")
 		print_success "OpenCode already installed: $oc_version"
 		mkdir -p "${HOME}/.aidevops" 2>/dev/null || true
 		printf '%s\n' "$current_bin" >"${HOME}/.aidevops/.opencode-bin-resolved" 2>/dev/null || true
@@ -1658,7 +1735,7 @@ setup_opencode_cli() {
 	# Wrong package → auto-heal (no prompt).
 	if [[ $validate_rc -eq 1 ]]; then
 		local wrong_v
-		wrong_v=$("$current_bin" --version 2>/dev/null | head -1 || echo "<unknown>")
+		wrong_v=$(_setup_opencode_first_line "$(_setup_opencode_version_output "$current_bin" 2>/dev/null || printf '<unknown>')")
 		_setup_opencode_force_heal "$install_pkg" "$current_bin" "$wrong_v"
 		return 0
 	fi
@@ -1682,7 +1759,8 @@ setup_opencode_cli() {
 	local install_oc
 	setup_prompt install_oc "Install OpenCode via $installer? [Y/n]: " "Y"
 	if [[ "$install_oc" =~ ^[Yy]?$ ]]; then
-		if run_with_spinner "Installing OpenCode" npm_global_install "$install_pkg"; then
+		local install_timeout="${AIDEVOPS_OPENCODE_INSTALL_TIMEOUT:-180}"
+		if run_with_spinner "Installing OpenCode" _setup_opencode_timeout_cmd "$install_timeout" npm_global_install "$install_pkg"; then
 			print_success "OpenCode installed"
 
 			# Persist resolved path on first-time success too (t2891).

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.48
+# Version: 3.13.50
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)
@@ -143,34 +143,40 @@ _cron_escape() {
 }
 
 # GH#21060 / t2911: Per-stage timing helper for non-interactive setup runs.
-# Wraps a function call, records start/end time, and appends one TSV line to
+# Wraps a function call, records start/end time, and appends TSV lines to
 # $HOME/.aidevops/logs/setup-stage-timings.log:
 #   iso8601_utc <TAB> stage_name <TAB> duration_seconds <TAB> exit_code
+# A RUNNING row is written before each stage starts so a tool/worker timeout
+# still leaves the currently executing phase in the timing log.
 # Usage: _time_step "stage_name" function_name [args...]
 # ShellCheck: $@ is used deliberately (SC2068 not applicable; no word-splitting
 # issue since we shift the stage-name arg first and pass the rest as a command).
+_time_step_log() {
+	local _ts_stage="$1"
+	local _ts_duration="$2"
+	local _ts_exit="$3"
+	printf '%s\t%s\t%s\t%s\n' \
+		"$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+		"$_ts_stage" \
+		"$_ts_duration" \
+		"$_ts_exit" \
+		>>"$HOME/.aidevops/logs/setup-stage-timings.log" 2>/dev/null || true
+	return 0
+}
+
 _time_step() {
 	local _ts_stage="$1"
 	shift
-	# GH#22012: In non-interactive mode, emit the stage name before running so
-	# an operator watching setup.sh output can identify which step is blocking.
-	# The TSV log entry below is written AFTER the step returns — it provides no
-	# signal during a hang. This print is the only in-flight indicator.
-	if [[ "${NON_INTERACTIVE:-false}" == "true" ]]; then
-		printf '[SETUP] stage: %s\n' "$_ts_stage"
-	fi
 	local _ts_start _ts_end _ts_duration _ts_exit
+	print_info "Starting setup stage: $_ts_stage"
+	_time_step_log "$_ts_stage" "0.00" "RUNNING"
 	_ts_start=$(date +%s.%N 2>/dev/null || date +%s)
 	_ts_exit=0
 	"$@" || _ts_exit=$?
 	_ts_end=$(date +%s.%N 2>/dev/null || date +%s)
 	_ts_duration=$(awk -v a="$_ts_start" -v b="$_ts_end" 'BEGIN { printf "%.2f", b - a }')
-	printf '%s\t%s\t%s\t%s\n' \
-		"$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
-		"$_ts_stage" \
-		"$_ts_duration" \
-		"$_ts_exit" \
-		>>"$HOME/.aidevops/logs/setup-stage-timings.log" 2>/dev/null || true
+	_time_step_log "$_ts_stage" "$_ts_duration" "$_ts_exit"
+	print_info "Finished setup stage: $_ts_stage (${_ts_duration}s, exit=${_ts_exit})"
 	return "$_ts_exit"
 }