@darkrei08/setup-ai 3.2.0 → 3.3.1

package/bin/setup-ai.mjs

@@ -44,6 +44,7 @@ const MODULES = [
   { name: "antigravity",  core: true,  desc: "Google Antigravity CLI (agy)" },
   { name: "opencode",     core: true,  desc: "opencode agent CLI (opencode-ai)" },
   { name: "cockpit",      core: false, desc: "cockpit-tools desktop GUI app (optional, CC BY-NC-SA)" },
+  { name: "rotator",      core: false, desc: "tuxevil-rotator multi-account Gemini/Antigravity gateway (optional, opt-in)" },
 ];
 
 // dotenv is Linux-only; drop it from the Windows menu.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkrei08/setup-ai",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "Cross-OS installer for an AI coding toolchain (pi, codex, antigravity, opencode, herdr, gentle-ai/gga, Engineering Excellence) with an interactive module menu and per-agent MCP registration.",
   "type": "module",
   "bin": {

package/setup-ai.ps1

@@ -2,7 +2,7 @@
 <#
 ==============================================================================
  AI Dev Suite — Engineering Excellence Edition (Windows)
- Version: 3.2.0
+ Version: 3.3.1
 
  Windows-native installer, sibling of setup-ai.sh. Uses each tool's official
  Windows method: winget for language runtimes, the vendor install.ps1 scripts
@@ -50,7 +50,7 @@ try {
     Write-Warning "Could not set UTF-8 console encoding: $($_.Exception.Message)"
 }
 
-$ScriptVersion = "3.2.0"
+$ScriptVersion = "3.3.1"
 $ScriptPath = $PSCommandPath
 $ScriptDir = Split-Path -Parent $ScriptPath
 $LogDir = Join-Path $ScriptDir "logs"
@@ -94,6 +94,19 @@ $SkillAgentRoots = @{
     codex = Join-Path $HOME ".codex\skills"
     opencode = Join-Path $HOME ".config\opencode\skills"
 }
+# Candidate skill roots per agent: verification passes if SKILL.md exists in any
+# of them. Every agent keeps its single existing root; Codex also accepts
+# ~/.agents/skills because upstream `skills add --global` writes Codex skills
+# there instead of ~/.codex/skills.
+$SkillAgentCandidateRoots = @{
+    pi = @($SkillAgentRoots['pi'])
+    'claude-code' = @($SkillAgentRoots['claude-code'])
+    'gemini-cli' = @($SkillAgentRoots['gemini-cli'])
+    cursor = @($SkillAgentRoots['cursor'])
+    antigravity = @($SkillAgentRoots['antigravity'])
+    codex = @($SkillAgentRoots['codex'], (Join-Path $HOME ".agents\skills"))
+    opencode = @($SkillAgentRoots['opencode'])
+}
 
 # ------------------------------------------------------------------------------
 # Logging (human + JSONL)
@@ -135,18 +148,32 @@ function Update-SessionPath {
 
 # Run a step; $Optional means failures are logged as WARN and swallowed.
 function Invoke-Step {
-    param([string]$Phase, [scriptblock]$Action, [switch]$Optional)
+    param(
+        [string]$Phase,
+        [scriptblock]$Action,
+        [switch]$Optional,
+        [int[]]$ExpectedExitCodes = @()
+    )
     Write-Log INFO $Phase "step_start" "Running step"
     try {
         $global:LASTEXITCODE = 0
         & $Action 2>&1 | Tee-Object -FilePath $HumanLog -Append | Out-Host
         $nativeExitCode = $global:LASTEXITCODE
         if ($nativeExitCode -ne 0) {
+            if ($ExpectedExitCodes -contains $nativeExitCode) {
+                Write-Log INFO $Phase "step_expected" "Step returned expected exit code $nativeExitCode" $nativeExitCode
+                return $null
+            }
             throw "Native command exited with code $nativeExitCode"
         }
         Write-Log INFO $Phase "step_ok" "Step completed"
         return $true
     } catch {
+        $nativeExitCode = $global:LASTEXITCODE
+        if ($ExpectedExitCodes -contains $nativeExitCode) {
+            Write-Log INFO $Phase "step_expected" "Step returned expected exit code $nativeExitCode" $nativeExitCode
+            return $null
+        }
         if ($Optional) {
             Write-Log WARN $Phase "step_failed_optional" "$($_.Exception.Message); continuing" 1
             return $false
@@ -159,13 +186,18 @@ function Invoke-Step {
 function Test-WingetInstalled {
     param([string]$Id, [string]$Phase)
     $probe = Join-Path ([IO.Path]::GetTempPath()) ("setup-ai-winget-" + [guid]::NewGuid().ToString("N") + ".log")
+    $wingetNoApplicationsFoundExitCode = -1978335212 # 0x8A150014: package is not installed.
     try {
         # Keep the query inside Invoke-Step so its exit status and output are
         # logged; a failed probe is treated as "not installed" and followed
         # by the mandatory install step.
-        $listed = Invoke-Step -Phase $Phase -Optional -Action {
+        $listed = Invoke-Step -Phase $Phase -Optional -ExpectedExitCodes $wingetNoApplicationsFoundExitCode -Action {
             winget list --id $Id -e | Out-File -LiteralPath $probe -Encoding utf8
         }
+        if ($null -eq $listed) {
+            Write-Log INFO $Phase "not_installed" "$Id is not installed; will install"
+            return $false
+        }
         return ($listed -and [bool](Select-String -Path $probe -SimpleMatch $Id -Quiet))
     } finally {
         if (Test-Path $probe) {
@@ -263,9 +295,9 @@ function Get-TargetSkillAgents {
 function Assert-SkillInstalledForAgents {
     param([string]$Phase, [string]$Skill, [string[]]$Agents)
     foreach ($agent in $Agents) {
-        $skillPath = Join-Path (Join-Path $SkillAgentRoots[$agent] $Skill) "SKILL.md"
-        if (-not (Test-Path $skillPath)) {
-            throw "$Skill SKILL.md missing for targeted agent '$agent' ($skillPath)"
+        $checked = @($SkillAgentCandidateRoots[$agent] | ForEach-Object { Join-Path (Join-Path $_ $Skill) "SKILL.md" })
+        if (-not ($checked | Where-Object { Test-Path $_ })) {
+            throw "$Skill SKILL.md missing for targeted agent '$agent' (checked: $($checked -join ', '))"
         }
     }
     Write-Log INFO $Phase "skill_verified" "$Skill verified for every targeted agent" 0 "agents=$($Agents -join ',')"
@@ -275,7 +307,7 @@ function Assert-SkillInstalledForAgents {
 # Module registry
 # ==============================================================================
 
-$ModuleOrder = @('base','node','bun','pi','go','dotenv','ee','skills','pi-workflows','herdr','gentle-ai','codex','antigravity','opencode','cockpit')
+$ModuleOrder = @('base','node','bun','pi','go','dotenv','ee','skills','pi-workflows','herdr','gentle-ai','codex','antigravity','opencode','cockpit','rotator')
 
 $ModuleDesc = [ordered]@{
     'base'         = 'System packages (build tools, git, gh, python, neovim, jq, imagemagick, go)'
@@ -293,8 +325,9 @@ $ModuleDesc = [ordered]@{
     'antigravity'  = 'Google Antigravity CLI (agy)'
     'opencode'     = 'opencode agent CLI (opencode-ai)'
     'cockpit'      = 'cockpit-tools desktop GUI app (optional, CC BY-NC-SA)'
+    'rotator'      = 'tuxevil-rotator multi-account Gemini/Antigravity gateway (optional, opt-in)'
 }
-$ModuleOptional = @{ 'cockpit' = $true }
+$ModuleOptional = @{ 'cockpit' = $true; 'rotator' = $true }
 
 # ==============================================================================
 # Modules
@@ -649,6 +682,78 @@ function Mod-Cockpit {
     }
 }
 
+function Mod-Rotator {
+    Write-Log INFO "rotator" "start" "tuxevil-rotator gateway"
+    # Detect a desktop cockpit-tools data dir by marker file only; never read tokens.
+    $candidates = @(
+        (Join-Path $HOME ".antigravity_cockpit")
+        (Join-Path $HOME ".local\share\cockpit-tools")
+        (Join-Path $HOME ".config\cockpit-tools")
+        (Join-Path $HOME ".wizard-ai\cockpit-tools")
+        (Join-Path $HOME "Library\Application Support\cockpit-tools")
+    )
+    if ($env:APPDATA) { $candidates += Join-Path $env:APPDATA "cockpit-tools" }
+    if ($env:LOCALAPPDATA) { $candidates += Join-Path $env:LOCALAPPDATA "cockpit-tools" }
+
+    $cockpitDir = ""
+    foreach ($dir in $candidates) {
+        if ((Test-Path -LiteralPath (Join-Path $dir "accounts.json") -PathType Leaf) -or
+            (Test-Path -LiteralPath (Join-Path $dir "account-token.key") -PathType Leaf)) {
+            $cockpitDir = $dir
+            break
+        }
+    }
+    if ($cockpitDir) {
+        Write-Log INFO "rotator" "cockpit_detected" "cockpit-tools data directory detected" 0 "dir=$cockpitDir"
+    } else {
+        Write-Log INFO "rotator" "cockpit_absent" "No cockpit-tools data directory detected; the rotator can still use its own accounts" 0
+    }
+
+    # Non-fatal health probe.
+    $gw = "http://localhost:51200/v1/models"
+    try {
+        $response = Invoke-WebRequest -Uri $gw -Headers @{ Authorization = "Bearer tuxevil" } -TimeoutSec 5
+        $body = $response.Content
+        $count = if ($body) { ([regex]::Matches($body, '"id"')).Count } else { 0 }
+        Write-Log INFO "rotator" "gateway_up" "tuxevil-rotator gateway is reachable" 0 "url=$gw;models=$count"
+    } catch {
+        Write-Log INFO "rotator" "gateway_down" "tuxevil-rotator gateway not reachable; start it with 'tuxevil-rotator start'" 0 "url=$gw"
+    }
+
+    # Install the CLI idempotently. Never runs login/start or writes secrets.
+    if (Test-Cmd tuxevil-rotator) {
+        Write-Log INFO "rotator" "already_present" "tuxevil-rotator already installed"
+    } else {
+        if (-not (Test-Cmd npm)) { throw "npm not found; tuxevil-rotator cannot be installed" }
+        Invoke-Step -Phase "rotator" -Action { npm install -g tuxevil-rotator }
+        if (-not (Test-Cmd tuxevil-rotator)) {
+            Write-Log ERROR "rotator" "install_missing" "tuxevil-rotator not found on PATH after npm install"
+            throw "tuxevil-rotator not found on PATH after npm install"
+        }
+    }
+    if (Test-Cmd pi) {
+        Invoke-Step -Phase "rotator" -Action { pi install "github:darkrei08/pi-cockpit-tools-sync" }
+        $piSettings = Join-Path $HOME ".pi\agent\settings.json"
+        if (-not (Test-Path -LiteralPath $piSettings -PathType Leaf) -or
+            -not (Select-String -LiteralPath $piSettings -SimpleMatch "github:darkrei08/pi-cockpit-tools-sync" -Quiet)) {
+            Write-Log ERROR "rotator" "pi_extension_missing" "Pi did not register cockpit sync extension" 1 "expected=$piSettings"
+            throw "Pi did not register cockpit sync extension"
+        }
+        Write-Log INFO "rotator" "pi_extension_verified" "Cockpit sync extension registered in Pi" 0 "path=$piSettings"
+    } else {
+        Write-Log INFO "rotator" "pi_extension_skipped" "pi not found; cockpit sync extension was not installed"
+    }
+    @"
+      tuxevil-rotator installed. To use the multi-account Gemini/Antigravity gateway:
+        tuxevil-rotator login     # add a Google Antigravity account (repeat to add more)
+        tuxevil-rotator import    # or bulk-import accounts from a cockpit-tools JSON
+        tuxevil-rotator start     # start the rotating proxy on http://localhost:51200
+      Pi reaches it through the 'tuxevil-rotator' provider configured in your dotenv.
+      The cockpit sync extension provides /cockpit-sync, /cockpit-provision, and /cockpit-proxy.
+      Login/start are never run by setup-ai and no tokens are read or stored.
+"@ | Tee-Object -FilePath $HumanLog -Append | Out-Host
+}
+
 $ModuleFn = @{
     'base' = ${function:Mod-Base}; 'node' = ${function:Mod-Node}; 'bun' = ${function:Mod-Bun}
     'pi' = ${function:Mod-Pi}; 'go' = ${function:Mod-Go}; 'dotenv' = ${function:Mod-Dotenv}; 'ee' = ${function:Mod-Ee}
@@ -656,7 +761,7 @@ $ModuleFn = @{
     'pi-workflows' = ${function:Mod-PiWorkflows}; 'herdr' = ${function:Mod-Herdr}
     'gentle-ai' = ${function:Mod-GentleAi}
     'codex' = ${function:Mod-Codex}; 'antigravity' = ${function:Mod-Antigravity}
-    'opencode' = ${function:Mod-Opencode}; 'cockpit' = ${function:Mod-Cockpit}
+    'opencode' = ${function:Mod-Opencode}; 'cockpit' = ${function:Mod-Cockpit}; 'rotator' = ${function:Mod-Rotator}
 }
 
 # ==============================================================================

package/setup-ai.sh

@@ -2,7 +2,7 @@
 
 # ==============================================================================
 # AI Dev Suite — Engineering Excellence Edition
-# Version: 3.2.0
+# Version: 3.3.1
 #
 # Cross-platform (macOS + all major Linux distros) installer for an AI coding
 # toolchain. Windows is handled by the sibling setup-ai.ps1; the Node launcher
@@ -26,7 +26,7 @@
 set -Eeuo pipefail
 IFS=$'\n\t'
 
-SCRIPT_VERSION="3.2.0"
+SCRIPT_VERSION="3.3.1"
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 LOG_DIR="${SCRIPT_DIR}/logs"
@@ -305,7 +305,7 @@ EOF
 # via --all or an explicit --only.
 # ==============================================================================
 
-MODULE_ORDER=(base node bun pi go dotenv ee skills pi-workflows herdr gentle-ai codex antigravity opencode cockpit)
+MODULE_ORDER=(base node bun pi go dotenv ee skills pi-workflows herdr gentle-ai codex antigravity opencode cockpit rotator)
 
 module_desc() {
     case "$1" in
@@ -324,12 +324,13 @@ module_desc() {
         antigravity) printf '%s\n' "Google Antigravity CLI (agy)" ;;
         opencode) printf '%s\n' "opencode agent CLI (opencode-ai)" ;;
         cockpit) printf '%s\n' "cockpit-tools desktop GUI app (optional, CC BY-NC-SA)" ;;
+        rotator) printf '%s\n' "tuxevil-rotator multi-account Gemini/Antigravity gateway (optional, opt-in)" ;;
         *) return 1 ;;
     esac
 }
 
 module_is_optional() {
-    [[ "$1" == "cockpit" ]]
+    [[ "$1" == "cockpit" || "$1" == "rotator" ]]
 }
 
 # ------------------------------------------------------------------------------
@@ -581,7 +582,7 @@ mod_dotenv() {
 
     # Idempotent upstream-quirk patches (no-ops once upstream merges the fixes).
     if grep_probe "dotenv" "${TMP_DIR}/monokai_hits" \
-        -RIl --exclude-dir=.git "gthelding/monokai-pro.nvim" "${DOTENV_DIR}"; then
+        -rIl --exclude-dir=.git "gthelding/monokai-pro.nvim" "${DOTENV_DIR}"; then
         while IFS= read -r file; do
             run_cmd "dotenv" sed -i 's|gthelding/monokai-pro.nvim|loctvl842/monokai-pro.nvim|g' "${file}"
             log_event "INFO" "dotenv" "reference_patched" "Updated stale monokai-pro reference" 0 "file=${file}"
@@ -589,7 +590,7 @@ mod_dotenv() {
     fi
 
     if grep_probe "dotenv" "${TMP_DIR}/sudo_npm_hits" \
-        -RIl --exclude-dir=.git 'sudo npm install -g --prefix /usr/local bun' "${DOTENV_DIR}"; then
+        -rIl --exclude-dir=.git 'sudo npm install -g --prefix /usr/local bun' "${DOTENV_DIR}"; then
         while IFS= read -r file; do
             run_cmd "dotenv" sed -i 's|sudo npm install -g --prefix /usr/local bun|sudo "$(command -v npm)" install -g --prefix /usr/local bun|g' "${file}"
             log_event "INFO" "dotenv" "reference_patched" "Patched sudo npm call to absolute path" 0 "file=${file}"
@@ -597,7 +598,7 @@ mod_dotenv() {
     fi
 
     if grep_probe "dotenv" "${TMP_DIR}/treesitter_hits" \
-        -RIl --exclude-dir=.git -e 'npm install -g --prefix "\$HOME/.local" tree-sitter-cli' "${DOTENV_DIR}"; then
+        -rIl --exclude-dir=.git -e 'npm install -g --prefix "\$HOME/.local" tree-sitter-cli' "${DOTENV_DIR}"; then
         while IFS= read -r file; do
             local marker_rc=0
             grep -q 'AI_DEV_TS_CLI_PATCH' "${file}" 2>>"${HUMAN_LOG}" || marker_rc=$?
@@ -673,15 +674,34 @@ agent_skill_root() {
     esac
 }
 
+# Candidate skill roots per agent (one per line): verification passes if
+# SKILL.md exists under any of them. Every agent keeps its single existing root;
+# Codex also accepts ${HOME}/.agents/skills because upstream `skills add
+# --global` writes Codex skills there instead of ${HOME}/.codex/skills.
+agent_skill_roots() {
+    agent_skill_root "$1" || return 1
+    if [[ "$1" == codex ]]; then
+        printf '%s\n' "${HOME}/.agents/skills"
+    fi
+}
+
 verify_skill_for_agents() {
     local phase="$1" skill="$2"; shift 2
-    local agent root
+    local agent root found checked
     for agent in "$@"; do
-        root="$(agent_skill_root "${agent}")"
-        if [[ ! -f "${root}/${skill}/SKILL.md" ]]; then
+        found=0
+        checked=""
+        while IFS= read -r root; do
+            checked="${checked:+${checked}, }${root}/${skill}/SKILL.md"
+            if [[ -f "${root}/${skill}/SKILL.md" ]]; then
+                found=1
+                break
+            fi
+        done < <(agent_skill_roots "${agent}")
+        if (( found == 0 )); then
             log_event "ERROR" "${phase}" "skill_missing" \
                 "Skill SKILL.md missing for targeted agent" 1 \
-                "agent=${agent};skill=${skill};expected=${root}/${skill}/SKILL.md"
+                "agent=${agent};skill=${skill};checked=${checked}"
             return 1
         fi
     done
@@ -1109,6 +1129,70 @@ mod_cockpit() {
     esac
 }
 
+# --- rotator (opt-in: tuxevil-rotator multi-account gateway) -----------------
+mod_rotator() {
+    section "tuxevil-rotator gateway"
+    # Detect a desktop cockpit-tools data dir by marker file only; never read tokens.
+    local -a candidates=(
+        "${HOME}/.antigravity_cockpit"
+        "${HOME}/.local/share/cockpit-tools"
+        "${HOME}/.config/cockpit-tools"
+        "${HOME}/.wizard-ai/cockpit-tools"
+        "${HOME}/Library/Application Support/cockpit-tools"
+    )
+    # Windows-only locations, appended only when set (mirrors the ps1 behavior).
+    [[ -n "${APPDATA:-}" ]] && candidates+=("${APPDATA}/cockpit-tools")
+    [[ -n "${LOCALAPPDATA:-}" ]] && candidates+=("${LOCALAPPDATA}/cockpit-tools")
+    local dir cockpit_dir=""
+    for dir in "${candidates[@]}"; do
+        if [[ -f "${dir}/accounts.json" || -f "${dir}/account-token.key" ]]; then
+            cockpit_dir="${dir}"; break
+        fi
+    done
+    if [[ -n "${cockpit_dir}" ]]; then
+        log_event "INFO" "rotator" "cockpit_detected" "cockpit-tools data directory detected" 0 "dir=${cockpit_dir}"
+    else
+        log_event "INFO" "rotator" "cockpit_absent" "No cockpit-tools data directory detected; the rotator can still use its own accounts" 0
+    fi
+    # Non-fatal health probe.
+    local gw="http://localhost:51200/v1/models" body count
+    if body="$(curl -fsS -m 5 -H 'Authorization: Bearer tuxevil' "${gw}" 2>/dev/null)"; then
+        # curl -fsS already proved reachability; the count is informational only
+        # (awk always exits 0, so no operational failure is masked here).
+        count="$(printf '%s' "${body}" | awk '{c+=gsub(/"id"/,"&")} END{print c+0}')"
+        log_event "INFO" "rotator" "gateway_up" "tuxevil-rotator gateway is reachable" 0 "url=${gw};models=${count}"
+    else
+        log_event "INFO" "rotator" "gateway_down" "tuxevil-rotator gateway not reachable; start it with 'tuxevil-rotator start'" 0 "url=${gw}"
+    fi
+    # Install the CLI idempotently. Never runs login/start or writes secrets.
+    if command -v tuxevil-rotator >/dev/null 2>&1; then
+        log_event "INFO" "rotator" "already_present" "tuxevil-rotator already installed" 0
+    else
+        run_cmd "rotator" npm install --global tuxevil-rotator
+        require_command tuxevil-rotator
+    fi
+    if command -v pi >/dev/null 2>&1; then
+        run_cmd "rotator" pi install "github:darkrei08/pi-cockpit-tools-sync"
+        local pi_settings="${PI_AGENT_DIR}/settings.json"
+        if [[ ! -f "${pi_settings}" ]] || ! grep -Fq 'github:darkrei08/pi-cockpit-tools-sync' "${pi_settings}"; then
+            log_event "ERROR" "rotator" "pi_extension_missing" "Pi did not register cockpit sync extension" 1 "expected=${pi_settings}"
+            return 1
+        fi
+        log_event "INFO" "rotator" "pi_extension_verified" "Cockpit sync extension registered in Pi" 0 "path=${pi_settings}"
+    else
+        log_event "INFO" "rotator" "pi_extension_skipped" "pi not found; cockpit sync extension was not installed" 0
+    fi
+    cat <<'HINT' | tee -a "${HUMAN_LOG}"
+      tuxevil-rotator installed. To use the multi-account Gemini/Antigravity gateway:
+        tuxevil-rotator login     # add a Google Antigravity account (repeat to add more)
+        tuxevil-rotator import    # or bulk-import accounts from a cockpit-tools JSON
+        tuxevil-rotator start     # start the rotating proxy on http://localhost:51200
+      Pi reaches it through the 'tuxevil-rotator' provider configured in your dotenv.
+      The cockpit sync extension provides /cockpit-sync, /cockpit-provision, and /cockpit-proxy.
+      Login/start are never run by setup-ai and no tokens are read or stored.
+HINT
+}
+
 # ==============================================================================
 # Shell environment
 # ==============================================================================