aidevops 3.8.71 → 3.8.73

package/VERSION

@@ -1 +1 @@
-3.8.71
+3.8.73

package/aidevops.sh

@@ -5,7 +5,7 @@
 # AI DevOps Framework CLI
 # Usage: aidevops <command> [options]
 #
-# Version: 3.8.71
+# Version: 3.8.73
 
 set -euo pipefail
 
@@ -61,11 +61,31 @@ _timeout_cmd() {
 	fi
 }
 
-print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
-print_success() { echo -e "${GREEN}[OK]${NC} $1"; }
-print_warning() { echo -e "${YELLOW}[WARN]${NC} $1"; }
-print_error() { echo -e "${RED}[ERROR]${NC} $1"; }
-print_header() { echo -e "${BOLD}${CYAN}$1${NC}"; }
+print_info() {
+	local msg="$1"
+	echo -e "${BLUE}[INFO]${NC} $msg"
+	return 0
+}
+print_success() {
+	local msg="$1"
+	echo -e "${GREEN}[OK]${NC} $msg"
+	return 0
+}
+print_warning() {
+	local msg="$1"
+	echo -e "${YELLOW}[WARN]${NC} $msg"
+	return 0
+}
+print_error() {
+	local msg="$1"
+	echo -e "${RED}[ERROR]${NC} $msg"
+	return 0
+}
+print_header() {
+	local msg="$1"
+	echo -e "${BOLD}${CYAN}$msg${NC}"
+	return 0
+}
 
 # Get current version
 get_version() {
@@ -106,17 +126,20 @@ get_public_release_tag() {
 
 # Check if a command exists
 check_cmd() {
-	command -v "$1" >/dev/null 2>&1
+	local cmd="$1"
+	command -v "$cmd" >/dev/null 2>&1
 }
 
 # Check if a directory exists
 check_dir() {
-	[[ -d "$1" ]]
+	local dir="$1"
+	[[ -d "$dir" ]]
 }
 
 # Check if a file exists
 check_file() {
-	[[ -f "$1" ]]
+	local file="$1"
+	[[ -f "$file" ]]
 }
 
 # Ensure file ends with a trailing newline (prevents malformed appends)
@@ -268,6 +291,61 @@ _compute_repo_registration_defaults() {
 	return 0
 }
 
+# Resolve a worktree path to its canonical main-worktree path, if applicable.
+# Usage: resolve_canonical_repo_path <path>
+# Prints the canonical path to stdout. If the input is already the main
+# worktree, a non-git path, or git is unavailable, prints the input unchanged.
+#
+# Why this exists: `find ~/Git -name .aidevops.json` in auto-discovery and
+# similar scans pick up .aidevops.json files that exist in linked worktrees
+# (because worktrees inherit the working tree contents), and without this
+# guard each worktree gets registered as a separate repo. That's what caused
+# tabby-profile-sync to emit a profile for a worktree directory.
+resolve_canonical_repo_path() {
+	local input_path="$1"
+	local common_dir
+	common_dir=$(git -C "$input_path" rev-parse --git-common-dir 2>/dev/null) || {
+		printf '%s\n' "$input_path"
+		return 0
+	}
+	local own_git_dir
+	own_git_dir=$(git -C "$input_path" rev-parse --git-dir 2>/dev/null) || {
+		printf '%s\n' "$input_path"
+		return 0
+	}
+
+	# Resolve both to absolute paths for a reliable comparison.
+	# git -C <path> returns paths relative to <path> when they are relative.
+	local common_abs own_abs
+	if [[ "$common_dir" = /* ]]; then
+		common_abs=$(cd "$common_dir" 2>/dev/null && pwd -P)
+	else
+		common_abs=$(cd "$input_path/$common_dir" 2>/dev/null && pwd -P)
+	fi
+	if [[ "$own_git_dir" = /* ]]; then
+		own_abs=$(cd "$own_git_dir" 2>/dev/null && pwd -P)
+	else
+		own_abs=$(cd "$input_path/$own_git_dir" 2>/dev/null && pwd -P)
+	fi
+
+	if [[ -z "$common_abs" || -z "$own_abs" || "$common_abs" == "$own_abs" ]]; then
+		# Main worktree or degraded resolution — pass through.
+		printf '%s\n' "$input_path"
+		return 0
+	fi
+
+	# Linked worktree — ask git for the main worktree's working tree path.
+	local main_path
+	main_path=$(git -C "$input_path" worktree list --porcelain 2>/dev/null | awk '/^worktree /{print $2; exit}')
+	if [[ -n "$main_path" && "$main_path" != "$input_path" && -d "$main_path" ]]; then
+		printf '%s\n' "$main_path"
+		return 0
+	fi
+
+	printf '%s\n' "$input_path"
+	return 0
+}
+
 # Register a repo in repos.json
 # Usage: register_repo <path> <version> <features>
 register_repo() {
@@ -283,6 +361,20 @@ register_repo() {
 		return 1
 	fi
 
+	# Resolve linked worktrees to their canonical main-worktree path.
+	# Every registration path (cmd_init, auto-discovery, scan) runs through
+	# register_repo, so the guard here catches all of them — not just the
+	# cmd_init path that previously checked only when WORKTREE_PATH was set.
+	local canonical_path
+	canonical_path=$(resolve_canonical_repo_path "$repo_path")
+	if [[ -n "$canonical_path" && "$canonical_path" != "$repo_path" ]]; then
+		print_info "Resolved worktree to canonical repo: $repo_path → $canonical_path"
+		if ! repo_path=$(cd "$canonical_path" 2>/dev/null && pwd -P); then
+			print_warning "Cannot access canonical path: $canonical_path"
+			return 1
+		fi
+	fi
+
 	if ! command -v jq &>/dev/null; then
 		print_warning "jq not installed - repo tracking disabled"
 		return 0

package/package.json

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

package/setup-modules/migrations.sh

@@ -308,6 +308,62 @@ cleanup_stale_bun_opencode() {
 # by the 4-layer role resolution in stats-functions.sh.
 #
 # Gated by a flag file so it runs exactly once per install.
+cleanup_worktree_entries_in_repos_json() {
+	# t2250: `find ~/Git -name .aidevops.json` during auto-discovery picks up
+	# files that exist inside linked worktrees (because worktrees inherit the
+	# working tree). Before the register_repo guard, each worktree ended up as
+	# a separate entry in repos.json — confusing tabby-profile-sync, pulse,
+	# cross-repo tooling, and anything that enumerates `initialized_repos`.
+	#
+	# One-shot migration: scan `initialized_repos[].path`, detect entries that
+	# are linked worktrees (git rev-parse --git-dir != --git-common-dir), and
+	# remove them. Safe to re-run; a flag file suppresses re-execution once
+	# the cleanup has been done on this machine.
+	local flag_file="${HOME}/.aidevops/logs/.migrated-worktree-repos-json-t2250"
+	[[ -f "$flag_file" ]] && return 0
+
+	local repos_json="${HOME}/.config/aidevops/repos.json"
+	[[ -f "$repos_json" ]] || return 0
+
+	command -v jq &>/dev/null || return 0
+	command -v git &>/dev/null || return 0
+
+	local stale_paths=()
+	local path git_dir common_dir
+
+	while IFS= read -r path; do
+		[[ -n "$path" && -d "$path" ]] || continue
+		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.
+		[[ "$git_dir" = /* ]] || git_dir="$path/$git_dir"
+		[[ "$common_dir" = /* ]] || common_dir="$path/$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=""
+		if [[ -n "$git_dir" && -n "$common_dir" && "$git_dir" != "$common_dir" ]]; then
+			stale_paths+=("$path")
+		fi
+	done < <(jq -r '.initialized_repos[].path // empty' "$repos_json" 2>/dev/null)
+
+	if [[ ${#stale_paths[@]} -gt 0 ]]; then
+		local temp_file="${repos_json}.tmp"
+		local paths_json
+		paths_json=$(printf '%s\n' "${stale_paths[@]}" | jq -R . | jq -s .)
+		jq --argjson stale "$paths_json" \
+			'.initialized_repos |= map(select(.path as $p | ($stale | index($p)) | not))' \
+			"$repos_json" >"$temp_file" && mv "$temp_file" "$repos_json"
+		print_info "Removed ${#stale_paths[@]} worktree entry/entries from repos.json (t2250):"
+		local p
+		for p in "${stale_paths[@]}"; do
+			print_info "  - $p"
+		done
+	fi
+
+	mkdir -p "$(dirname "$flag_file")"
+	date -u +"%Y-%m-%dT%H:%M:%SZ" >"$flag_file"
+	return 0
+}
+
 cleanup_stale_health_issue_caches() {
 	local flag_file="${HOME}/.aidevops/logs/.migrated-health-issue-caches-t1929"
 	[[ -f "$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.8.71
+# Version: 3.8.73
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)
@@ -915,6 +915,7 @@ _setup_run_non_interactive() {
 	cleanup_deprecated_mcps
 	cleanup_stale_bun_opencode
 	cleanup_stale_health_issue_caches
+	cleanup_worktree_entries_in_repos_json
 	_cleanup_legacy_model_config
 	validate_opencode_config
 	deploy_aidevops_agents
@@ -1030,8 +1031,8 @@ _setup_run_interactive() {
 	confirm_step "Backfill GitHub issue relationships (blocked-by, sub-issues)" && backfill_issue_relationships
 	confirm_step "Cleanup deprecated MCP entries (hetzner, serper, etc.)" && cleanup_deprecated_mcps
 	confirm_step "Cleanup stale bun opencode install" && cleanup_stale_bun_opencode
-	cleanup_stale_health_issue_caches
-	_cleanup_legacy_model_config
+	# Silent one-shot migrations (idempotent, flag-guarded — no prompt needed).
+	cleanup_stale_health_issue_caches; cleanup_worktree_entries_in_repos_json; _cleanup_legacy_model_config
 	confirm_step "Validate and repair OpenCode config schema" && validate_opencode_config
 	confirm_step "Extract OpenCode prompts" && extract_opencode_prompts
 	confirm_step "Check OpenCode prompt drift" && check_opencode_prompt_drift