aidevops 3.32.30 → 3.32.32

package/README.md

@@ -60,7 +60,7 @@ The result: an AI operations platform that manages projects across every busines
 [![Copyright](https://img.shields.io/badge/Copyright-Marcus%20Quinn%202025--2026-blue.svg)](https://github.com/marcusquinn)
 
 <!-- Release & Version Info -->
-[![Version](https://img.shields.io/badge/Version-3.32.30-blue.svg)](https://github.com/marcusquinn/aidevops/releases)
+[![Version](https://img.shields.io/badge/Version-3.32.32-blue.svg)](https://github.com/marcusquinn/aidevops/releases)
 [![npm version](https://img.shields.io/npm/v/aidevops)](https://www.npmjs.com/package/aidevops)
 [![Homebrew](https://img.shields.io/badge/homebrew-marcusquinn%2Ftap-orange)](https://github.com/marcusquinn/homebrew-tap)
 [![GitHub repository](https://img.shields.io/badge/github-repository-181717.svg?logo=github)](https://github.com/marcusquinn/aidevops)

package/VERSION

@@ -1 +1 @@
-3.32.30
+3.32.32

package/aidevops.sh

@@ -5,7 +5,7 @@
 # AI DevOps Framework CLI
 # Usage: aidevops <command> [options]
 #
-# Version: 3.32.30
+# Version: 3.32.32
 
 set -euo pipefail
 
@@ -54,8 +54,18 @@ if [[ -n "$_AIDEVOPS_SOURCE_DIR" && -L "$_AIDEVOPS_SOURCE_PATH" ]]; then
 		[[ -n "$_AIDEVOPS_LINK_DIR" ]] && _AIDEVOPS_SOURCE_DIR="$_AIDEVOPS_LINK_DIR"
 	fi
 fi
+_AIDEVOPS_CLI_ROOT="$INSTALL_DIR"
+_AIDEVOPS_CLI_MODULES_SUBDIR=".agents/scripts/aidevops-cli"
 if [[ -n "$_AIDEVOPS_SOURCE_DIR" && -f "$_AIDEVOPS_SOURCE_DIR/.agents/scripts/aidevops-cli/aidevops-repos-lib.sh" ]]; then
 	INSTALL_DIR="$_AIDEVOPS_SOURCE_DIR"
+	_AIDEVOPS_CLI_ROOT="$_AIDEVOPS_SOURCE_DIR"
+elif [[ -n "$_AIDEVOPS_SOURCE_DIR" && -f "$_AIDEVOPS_SOURCE_DIR/scripts/aidevops-cli/aidevops-repos-lib.sh" ]]; then
+	# setup.sh deploys the orchestrator at the agents root and its modules under
+	# scripts/. Keep repository operations pointed at INSTALL_DIR, but load the
+	# CLI and VERSION from this coherent atomic deployment instead of a stale
+	# canonical checkout.
+	_AIDEVOPS_CLI_ROOT="$_AIDEVOPS_SOURCE_DIR"
+	_AIDEVOPS_CLI_MODULES_SUBDIR="scripts/aidevops-cli"
 fi
 unset _AIDEVOPS_SOURCE_PATH _AIDEVOPS_SOURCE_DIR _AIDEVOPS_LINK_TARGET _AIDEVOPS_LINK_DIR
 AGENTS_DIR="$_AIDEVOPS_REAL_HOME/.aidevops/agents"
@@ -63,7 +73,7 @@ CONFIG_DIR="$_AIDEVOPS_REAL_HOME/.config/aidevops"
 REPOS_FILE="$CONFIG_DIR/repos.json"
 # shellcheck disable=SC2034  # Used in fresh install fallback
 REPO_URL="https://github.com/marcusquinn/aidevops.git"
-VERSION_FILE="$INSTALL_DIR/VERSION"
+VERSION_FILE="$_AIDEVOPS_CLI_ROOT/VERSION"
 
 # Portable sed in-place edit (macOS BSD sed vs GNU sed)
 sed_inplace() { if [[ "$(uname)" == "Darwin" ]]; then sed -i '' "$@"; else sed -i "$@"; fi; }
@@ -181,12 +191,11 @@ ensure_trailing_newline() {
 	return 0
 }
 
-# Source CLI implementation modules from the namespaced module tree.
-# INSTALL_DIR is the canonical location of aidevops.sh (set above). Using
-# INSTALL_DIR rather than BASH_SOURCE[0] preserves installed symlink support:
-# /usr/local/bin/aidevops → $INSTALL_DIR/aidevops.sh would otherwise resolve
-# BASH_SOURCE[0] to /usr/local/bin instead of the checkout/deployed tree.
-AIDEVOPS_CLI_MODULES_DIR="${INSTALL_DIR}/.agents/scripts/aidevops-cli"
+# Source CLI implementation modules from the coherent canonical or deployed
+# tree selected above. The launcher executes the deployed orchestrator as a
+# regular file, while local development and package snapshots use .agents/.
+AIDEVOPS_CLI_MODULES_DIR="${_AIDEVOPS_CLI_ROOT}/${_AIDEVOPS_CLI_MODULES_SUBDIR}"
+unset _AIDEVOPS_CLI_ROOT _AIDEVOPS_CLI_MODULES_SUBDIR
 # shellcheck source=.agents/scripts/aidevops-cli/aidevops-repos-lib.sh
 # shellcheck disable=SC1091  # module path resolved at runtime via $INSTALL_DIR
 source "${AIDEVOPS_CLI_MODULES_DIR}/aidevops-repos-lib.sh"

package/bin/aidevops

@@ -13,9 +13,24 @@
 
 set -euo pipefail
 
-REPO_DIR="$HOME/Git/aidevops"
+REAL_HOME="$HOME"
+if [[ -n "${SUDO_USER:-}" && "$(id -u)" -eq 0 ]]; then
+	_tmp_real_home=""
+	if command -v getent &>/dev/null; then
+		_tmp_real_home=$(getent passwd "$SUDO_USER" | cut -d: -f6)
+	elif command -v dscl &>/dev/null; then
+		_tmp_real_home=$(dscl . -read "/Users/${SUDO_USER}" NFSHomeDirectory 2>/dev/null | awk '{print $2; exit}' || true)
+	elif [[ -d "/Users/${SUDO_USER}" ]]; then
+		_tmp_real_home="/Users/${SUDO_USER}"
+	fi
+	if [[ -n "$_tmp_real_home" ]]; then
+		REAL_HOME="$_tmp_real_home"
+	fi
+fi
+
+REPO_DIR="${REAL_HOME:+$REAL_HOME/Git/aidevops}"
 REPO_URL="https://github.com/marcusquinn/aidevops.git"
-DEPLOYED_CLI="$HOME/.aidevops/agents/aidevops.sh"
+DEPLOYED_CLI="${REAL_HOME:+$REAL_HOME/.aidevops/agents/aidevops.sh}"
 
 # 1. Prefer the setup-deployed copy. It is released atomically with its modules,
 # so a stale or dirty canonical checkout cannot split the CLI version from them.
@@ -30,7 +45,7 @@ fi
 
 # 3. Git repo not found — bootstrap it automatically
 # This runs once on first use after a package manager install (npm/brew/bun).
-# After this, step 1 will always match and the git repo runs directly.
+# After this, step 1 will always match and the deployed copy runs directly.
 if command -v git >/dev/null 2>&1; then
     echo "[aidevops] First run — cloning git repo to $REPO_DIR for transparent updates..."
     mkdir -p "$(dirname "$REPO_DIR")"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aidevops",
-  "version": "3.32.30",
+  "version": "3.32.32",
   "description": "AI DevOps Framework - AI-assisted development workflows, code quality, and deployment automation",
   "type": "module",
   "workspaces": [

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.32.30
+# Version: 3.32.32
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)
@@ -68,7 +68,8 @@ REPO_URL="https://github.com/marcusquinn/aidevops.git"
 # INSTALL_DIR: resolve from the directory where setup.sh is executed (supports worktrees)
 # For bootstrap (curl install), this will be /dev/fd/NN and trigger re-exec after clone
 INSTALL_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-export REPO_URL INSTALL_DIR
+AGENTS_DIR="${AIDEVOPS_AGENTS_DIR:-${HOME:+$HOME/.aidevops/agents}}"
+export REPO_URL INSTALL_DIR AGENTS_DIR
 
 # Source modular setup functions (t316.2)
 # These modules are sourced only when setup.sh is run from the repo directory
@@ -1620,7 +1621,6 @@ _setup_run_interactive() {
 	confirm_step "Setup SSH key" && setup_ssh_key
 	confirm_step "Setup configuration files" && setup_configs
 	confirm_step "Set secure permissions on config files" && set_permissions
-	confirm_step "Install aidevops CLI command" && install_aidevops_cli
 	confirm_step "Setup shell aliases" && setup_aliases
 	confirm_step "Setup terminal title integration" && setup_terminal_title
 	confirm_step "Deploy AI templates to home directories" && deploy_ai_templates
@@ -1640,6 +1640,9 @@ _setup_run_interactive() {
 	confirm_step "Extract OpenCode prompts" && extract_opencode_prompts
 	confirm_step "Check OpenCode prompt drift" && check_opencode_prompt_drift
 	confirm_step "Deploy aidevops agents to ~/.aidevops/agents/" && { deploy_aidevops_agents; _deploy_hotfix_config; }
+	# Launcher verification reads the deployed VERSION, so it must follow agent
+	# deployment on first-run interactive setup as it already does non-interactively.
+	confirm_step "Install and verify aidevops CLI command" && install_aidevops_cli
 	confirm_step "Sync agents from private repositories" && sync_agent_sources
 	confirm_step "Set up routines repo (private repo for recurring operational jobs)" && setup_routines
 	is_feature_enabled safety_hooks 2>/dev/null && confirm_step "Install Claude Code safety hooks (block destructive commands)" && setup_safety_hooks
@@ -1902,6 +1905,11 @@ main() {
 	fi
 
 	if [[ "$NON_INTERACTIVE" == "true" ]]; then
+		# Full-loop release deployment uses this mutex. It remains held through
+		# deploy_aidevops_agents and install_aidevops_cli, so agent and CLI
+		# convergence are one serialized non-interactive deployment interval.
+		# Direct interactive setup is intentionally outside this guarantee: holding
+		# the mutex across prompts can block unattended full-loop deployments.
 		_setup_acquire_noninteractive_setup_lock "$@" || exit $?
 	fi