aidevops 3.13.56 → 3.13.57

package/VERSION

@@ -1 +1 @@
-3.13.56
+3.13.57

package/aidevops.sh

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

package/package.json

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

package/setup-modules/migrations.sh

@@ -952,6 +952,34 @@ disable_ondemand_mcps() {
 	return 0
 }
 
+# Run bounded opencode --version probe to detect config schema errors (GH#22079).
+# Returns 0 when config looks valid (or opencode is unavailable / probe timed out),
+# 1 when opencode explicitly reports "Configuration is invalid".
+# Uses AIDEVOPS_OPENCODE_VERSION_TIMEOUT (default 5s) so a hung Node.js process
+# cannot stall the non-interactive deploy path indefinitely.
+_validate_opencode_config_schema() {
+	command -v opencode &>/dev/null || return 0
+	local validation_output
+	local _oc_timeout
+	local _oc_rc
+	_oc_timeout="${AIDEVOPS_OPENCODE_VERSION_TIMEOUT:-5}"
+	_oc_rc=0
+	# Prefer the shared helper sourced from _services.sh (always available when
+	# called from setup.sh); fall back to system timeout; last resort: unbounded.
+	if declare -F _setup_opencode_timeout_cmd >/dev/null 2>&1; then
+		validation_output=$(_setup_opencode_timeout_cmd "$_oc_timeout" opencode --version 2>&1) || _oc_rc=$?
+	elif command -v timeout >/dev/null 2>&1; then
+		validation_output=$(timeout "$_oc_timeout" opencode --version 2>&1) || _oc_rc=$?
+	else
+		validation_output=$(opencode --version 2>&1) || _oc_rc=$?
+	fi
+	# Exit 124 = timed out — not a config-invalid signal.
+	if [[ "$_oc_rc" -ne 0 && "$_oc_rc" -ne 124 ]] && [[ "$validation_output" == *"Configuration is invalid"* ]]; then
+		return 1
+	fi
+	return 0
+}
+
 # Validate and repair OpenCode config schema
 # Fixes common issues from manual editing or AI-generated configs:
 # - MCP entries missing "type": "local" field
@@ -1010,16 +1038,10 @@ validate_opencode_config() {
 		issues="${issues}\n  - tools entries as objects instead of booleans: $(echo "$tools_as_objects" | tr '\n' ', ' | sed 's/,$//')"
 	fi
 
-	# Check 3: Try to parse with opencode (if available) to catch other schema issues
-	if command -v opencode &>/dev/null; then
-		local validation_output
-		if ! validation_output=$(opencode --version 2>&1); then
-			# If opencode fails to start, config might be invalid
-			if [[ "$validation_output" == *"Configuration is invalid"* ]]; then
-				needs_repair=true
-				issues="${issues}\n  - OpenCode reports invalid configuration"
-			fi
-		fi
+	# Check 3: bounded opencode --version probe to catch other schema issues (GH#22079).
+	if ! _validate_opencode_config_schema; then
+		needs_repair=true
+		issues="${issues}\n  - OpenCode reports invalid configuration"
 	fi
 
 	if [[ "$needs_repair" == "true" ]]; then

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.56
+# Version: 3.13.57
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)
@@ -1218,7 +1218,27 @@ _setup_acquire_noninteractive_setup_lock() {
 		fi
 		if _setup_lock_pid_alive "$owner_pid"; then
 			[[ -r "$lock_dir/command" ]] && owner_cmd=$(tr '\n' ' ' <"$lock_dir/command" 2>/dev/null || true)
-			print_error "Another setup.sh --non-interactive process is already running (pid ${owner_pid}, lock ${lock_dir}). Exiting to avoid overlapping deployments. ${owner_cmd:+Command: ${owner_cmd}}"
+			# Build actionable diagnostics: elapsed time since lock was acquired
+			# and the currently-executing setup stage from the timing log.
+			local _diag_elapsed="" _diag_stage=""
+			local _diag_stl="$HOME/.aidevops/logs/setup-stage-timings.log"
+			if [[ -r "$lock_dir/started_at" ]]; then
+				local _diag_started_str="" _diag_started="" _diag_now="" _diag_secs=""
+				_diag_started_str=$(tr -d '[:space:]' <"$lock_dir/started_at" 2>/dev/null || true)
+				_diag_started=$(date -d "$_diag_started_str" +%s 2>/dev/null || \
+					date -jf '%Y-%m-%dT%H:%M:%SZ' "$_diag_started_str" +%s 2>/dev/null || true)
+				_diag_now=$(date +%s 2>/dev/null || true)
+				if [[ "$_diag_started" =~ ^[0-9]+$ && "$_diag_now" =~ ^[0-9]+$ && "$_diag_now" -ge "$_diag_started" ]]; then
+					_diag_secs=$((_diag_now - _diag_started))
+					_diag_elapsed="elapsed ${_diag_secs}s; "
+				fi
+			fi
+			if [[ -r "$_diag_stl" ]]; then
+				local _diag_cur_stage=""
+				_diag_cur_stage=$(awk -F'\t' '$4=="RUNNING"{s=$2} END{if(s)printf "%s",s}' "$_diag_stl" 2>/dev/null || true)
+				[[ -n "$_diag_cur_stage" ]] && _diag_stage="stage: ${_diag_cur_stage}; "
+			fi
+			print_error "Another setup.sh --non-interactive is already running (pid ${owner_pid}; ${_diag_elapsed}${_diag_stage}lock: ${lock_dir}). Exiting to avoid overlapping deployments.${owner_cmd:+ Command: ${owner_cmd}} Diagnose: ${_diag_stl}"
 			return 75
 		fi