@cats-inc/cats-platform 0.2.8 → 0.3.4

package/scripts/windows/Install-Antigravity.ps1

@@ -28,6 +28,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 . (Join-Path $PSScriptRoot '_PackagedUninstall.ps1')
 
 function Write-StructuredResult {
@@ -36,6 +37,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -274,7 +279,15 @@ if ($CheckOnly) {
   Write-StructuredResult -Result $result -ExitCode 0
 }
 
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+if ($Upgrade -and -not $Force -and $detected.installed -and -not $SkipInstaller -and -not $DryRun) {
+  $versionGate = Test-CatsNativeUpgrade -Provider 'antigravity' -InstalledVersion $detected.detectedVersion
+  $shouldInstall = $versionGate.shouldInstall
+  if (-not $versionGate.known) { $warnings.Add('Could not compare the published version; the official installer will verify the update.') }
+  if (-not $shouldInstall) { $plannedActions.Clear() }
+}
 $installFailed = $false
 $installSkipped = $false
 if ($shouldInstall) {
@@ -282,8 +295,11 @@ if ($shouldInstall) {
     $warnings.Add('Dry-run requested; Antigravity installer invocation was skipped.')
     $installSkipped = $true
   } else {
-    if (($Force -or $Upgrade) -and (Test-Path -LiteralPath (Resolve-AntigravityExecutablePath) -PathType Leaf)) {
+    $previousBinary = $null
+    if (($Force -or $Upgrade) -and -not $SkipInstaller -and (Test-Path -LiteralPath (Resolve-AntigravityExecutablePath) -PathType Leaf)) {
       try {
+        $previousBinary = Join-Path ([IO.Path]::GetTempPath()) ('cats-agy-' + [guid]::NewGuid().ToString('N') + '.exe')
+        Copy-Item -LiteralPath (Resolve-AntigravityExecutablePath) -Destination $previousBinary -ErrorAction Stop
         Remove-Item -LiteralPath (Resolve-AntigravityExecutablePath) -Force -ErrorAction Stop
       } catch {
         $warnings.Add("Unable to remove existing agy.exe before refresh: $($_.Exception.Message)")
@@ -308,12 +324,19 @@ if ($shouldInstall) {
     }
 
     Start-Sleep -Seconds 2
-    Add-AntigravityToUserPath
+    if (-not $SkipInstaller) { Add-AntigravityToUserPath }
     $detected = Detect-AntigravityInstall
     if (-not $detected.installed -and -not $installSkipped -and -not $installFailed) {
       $warnings.Add('Antigravity installation completed but agy.exe was not detected at the expected path.')
       $installFailed = $true
     }
+    if ($previousBinary) {
+      if ($installFailed) {
+        Copy-Item -LiteralPath $previousBinary -Destination (Resolve-AntigravityExecutablePath) -Force
+        $detected = Detect-AntigravityInstall
+      }
+      Remove-Item -LiteralPath $previousBinary -Force -ErrorAction SilentlyContinue
+    }
   }
 
   if ($installFailed -or ($DryRun -and $shouldInstall)) {
@@ -332,7 +355,7 @@ $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall -and -not $installFailed -and -not $DryRun) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Antigravity install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Antigravity install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false

package/scripts/windows/Install-ClaudeCode.ps1

@@ -74,6 +74,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 
 function Write-StructuredResult {
   param(
@@ -81,6 +82,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -250,7 +255,8 @@ function Invoke-ClaudeInstaller {
 
   try {
     $installScript = Invoke-RestMethod 'https://claude.ai/install.ps1'
-    Invoke-Expression $installScript
+    $child = Invoke-CatsRemoteInstaller -ScriptText $installScript
+    if (-not $child.success) { throw $child.stderr }
     return [pscustomobject]@{
       usedWingetFallback = $false
       skipped = $false
@@ -493,6 +499,10 @@ if ($CheckOnly) {
   Write-StructuredResult -Result $result -ExitCode 0
 }
 
+if ($DryRun) {
+  Write-CatsNativePreview -Helper 'windows-claude-native-installer' -Mode $executionMode -Detected $detected -Actions $plannedActions.ToArray() -EmitJson ([bool]$Json)
+}
+
 $cleanedNpmShim = $false
 if ($npmShimPresent) {
   $cleanedNpmShim = Remove-ClaudeNpmShim
@@ -503,9 +513,16 @@ if ($npmShimPresent) {
   }
 }
 
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+$installFailed = $false
 if ($shouldInstall) {
-  $installResult = Invoke-ClaudeInstaller
+  $installResult = try { Invoke-ClaudeInstaller } catch { [pscustomobject]@{ skipped = $false; success = $false; stderr = [string]$_.Exception.Message; usedPowerShell51Fallback = $false; usedWingetFallback = $false } }
+  if ($installResult.PSObject.Properties['success'] -and -not $installResult.success) {
+    $installFailed = $true
+    $warnings.Add($installResult.stderr)
+  }
   $usedWingetFallback = [bool]$installResult.usedWingetFallback
   if ($usedWingetFallback) {
     $warnings.Add('Claude Code installer required the winget fallback path.')
@@ -516,8 +533,9 @@ if ($shouldInstall) {
 
   Start-Sleep -Seconds 2
   $detected = Detect-ClaudeInstall
-  if (-not $detected.installed -and -not $SkipInstaller) {
-    throw 'Claude Code installation completed but claude was still not detected.'
+  if (-not $detected.installed -and -not $SkipInstaller -and -not $installFailed) {
+    $warnings.Add('Claude Code installation completed but claude was still not detected.')
+    $installFailed = $true
   }
 
   if ($Force) {
@@ -535,7 +553,7 @@ $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall -or $cleanedNpmShim) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Claude Code install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Claude Code install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false
@@ -555,7 +573,7 @@ $restartRequired = $false
 $result = [pscustomobject]@{
   helper = 'windows-claude-native-installer'
   mode = $executionMode
-  status = if ($interruptions.Count -gt 0) { [string]$interruptions[0].kind } else { 'ready' }
+  status = if ($installFailed) { 'failed' } elseif ($interruptions.Count -gt 0) { [string]$interruptions[0].kind } else { 'ready' }
   installed = [bool]$detected.installed
   detectedVersion = if ($detected.detectedVersion) { $detected.detectedVersion } else { $null }
   commandPath = $detected.commandPath
@@ -568,4 +586,4 @@ $result = [pscustomobject]@{
   cleanedNpmShim = $cleanedNpmShim
   usedWingetFallback = $usedWingetFallback
 }
-Write-StructuredResult -Result $result -ExitCode 0
+Write-StructuredResult -Result $result -ExitCode $(if ($installFailed) { 1 } else { 0 })

package/scripts/windows/Install-CursorAgent.ps1

@@ -59,6 +59,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 . (Join-Path $PSScriptRoot '_PackagedUninstall.ps1')
 
 function Write-StructuredResult {
@@ -67,6 +68,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -88,7 +93,13 @@ function Write-StructuredResult {
 }
 
 function Resolve-CursorExecutablePath {
-  return Join-Path $env:USERPROFILE '.local\bin\cursor-agent.exe'
+  foreach ($name in @('cursor-agent.exe', 'cursor-agent.cmd', 'agent.exe', 'agent.cmd')) {
+    $candidate = Join-Path $env:LOCALAPPDATA "cursor-agent\$name"
+    if (Test-Path -LiteralPath $candidate -PathType Leaf) { return $candidate }
+  }
+  $legacy = Join-Path $env:USERPROFILE '.local\bin\cursor-agent.exe'
+  if (Test-Path -LiteralPath $legacy -PathType Leaf) { return $legacy }
+  return Join-Path $env:LOCALAPPDATA 'cursor-agent\cursor-agent.cmd'
 }
 
 function Refresh-UserPath {
@@ -133,6 +144,10 @@ function Detect-CursorInstall {
     }
   }
 
+  if ($installed -and -not $version -and $commandPath -match '\.(cmd|bat)$') {
+    $version = Get-CatsShimVersionText -Path $commandPath
+  }
+
   return [pscustomobject]@{
     installed = $installed
     commandPath = $commandPath
@@ -161,30 +176,11 @@ function Invoke-CursorInstaller {
     }
   }
 
-  try {
-    $installScript = Invoke-RestMethod 'https://cursor.com/install?win32=true'
-    Invoke-Expression $installScript
-    return [pscustomobject]@{
-      usedPowerShell51Fallback = $false
-      skipped = $false
-    }
-  } catch {
-    $isPowerShell7 = $PSVersionTable.PSVersion.Major -ge 7
-    $ps51Path = Join-Path $env:SystemRoot 'System32\WindowsPowerShell\v1.0\powershell.exe'
-    if (-not $isPowerShell7 -or -not (Test-Path -LiteralPath $ps51Path -PathType Leaf)) {
-      throw
-    }
-
-    & $ps51Path -NoProfile -ExecutionPolicy Bypass -Command "irm 'https://cursor.com/install?win32=true' | iex"
-    if ($LASTEXITCODE -ne 0) {
-      throw 'Cursor Agent installer fallback via Windows PowerShell 5.1 failed.'
-    }
+  $installScript = Invoke-RestMethod 'https://cursor.com/install?win32=true' -TimeoutSec 30 -UseBasicParsing
+  $result = Invoke-CatsRemoteInstaller -ScriptText $installScript
+  $result | Add-Member -NotePropertyName usedPowerShell51Fallback -NotePropertyValue $true
+  return $result
 
-    return [pscustomobject]@{
-      usedPowerShell51Fallback = $true
-      skipped = $false
-    }
-  }
 }
 
 if (-not $CheckOnly -and -not $Apply -and -not $Upgrade -and -not $Force -and -not $Uninstall) {
@@ -219,6 +215,7 @@ if ($Uninstall) {
   Invoke-PackagedProviderUninstall `
     -HelperId 'windows-cursor-native-installer' `
     -UserBinaryPath (Resolve-CursorExecutablePath) `
+    -ExtraUserOwnedPaths @((Join-Path $env:LOCALAPPDATA 'cursor-agent')) `
     -RedetectCommand { Detect-CursorInstall } `
     -EmitJson:$Json `
     -DryRun:$DryRun
@@ -289,9 +286,26 @@ if ($CheckOnly) {
   Write-StructuredResult -Result $result -ExitCode 0
 }
 
+if ($DryRun) {
+  Write-CatsNativePreview -Helper 'windows-cursor-native-installer' -Mode $executionMode -Detected $detected -Actions $plannedActions.ToArray() -EmitJson ([bool]$Json)
+}
+
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+if ($Upgrade -and -not $Force -and $detected.installed -and -not $SkipInstaller -and -not $DryRun) {
+  $versionGate = Test-CatsNativeUpgrade -Provider 'cursor' -InstalledVersion $detected.detectedVersion
+  $shouldInstall = $versionGate.shouldInstall
+  if (-not $versionGate.known) { $warnings.Add('Could not compare the published version; the official installer will verify the update.') }
+  if (-not $shouldInstall) { $plannedActions.Clear() }
+}
+$installFailed = $false
 if ($shouldInstall) {
-  $installResult = Invoke-CursorInstaller
+  $installResult = try { Invoke-CursorInstaller } catch { [pscustomobject]@{ skipped = $false; success = $false; stderr = [string]$_.Exception.Message; usedPowerShell51Fallback = $false; usedWingetFallback = $false } }
+  if ($installResult.PSObject.Properties['success'] -and -not $installResult.success) {
+    $installFailed = $true
+    $warnings.Add($installResult.stderr)
+  }
   $usedPowerShell51Fallback = [bool]$installResult.usedPowerShell51Fallback
   if ($usedPowerShell51Fallback) {
     $warnings.Add('Cursor installer required the Windows PowerShell 5.1 fallback.')
@@ -302,8 +316,9 @@ if ($shouldInstall) {
 
   Start-Sleep -Seconds 2
   $detected = Detect-CursorInstall
-  if (-not $detected.installed -and -not $SkipInstaller) {
-    throw 'Cursor Agent installation completed but cursor-agent was still not detected.'
+  if (-not $detected.installed -and -not $SkipInstaller -and -not $installFailed) {
+    $warnings.Add('Cursor Agent installation completed but cursor-agent was still not detected.')
+    $installFailed = $true
   }
 
   if ($Force) {
@@ -320,7 +335,7 @@ $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Cursor Agent install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Cursor Agent install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false
@@ -339,7 +354,7 @@ if (-not $authSatisfied) {
 $result = [pscustomobject]@{
   helper = 'windows-cursor-native-installer'
   mode = $executionMode
-  status = if ($interruptions.Count -gt 0) { [string]$interruptions[0].kind } else { 'ready' }
+  status = if ($installFailed) { 'failed' } elseif ($interruptions.Count -gt 0) { [string]$interruptions[0].kind } else { 'ready' }
   installed = [bool]$detected.installed
   detectedVersion = if ($detected.detectedVersion) { $detected.detectedVersion } else { $null }
   commandPath = $detected.commandPath
@@ -350,4 +365,4 @@ $result = [pscustomobject]@{
   interruptions = $interruptions.ToArray()
   usedPowerShell51Fallback = $usedPowerShell51Fallback
 }
-Write-StructuredResult -Result $result -ExitCode 0
+Write-StructuredResult -Result $result -ExitCode $(if ($installFailed) { 1 } else { 0 })

package/scripts/windows/Install-Devin.ps1

@@ -31,6 +31,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 . (Join-Path $PSScriptRoot '_PackagedUninstall.ps1')
 
 function Write-StructuredResult {
@@ -39,6 +40,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -126,12 +131,6 @@ function Invoke-DevinInstaller {
     return [pscustomobject]@{ skipped = $true; success = $true; exitCode = 0; stderr = '' }
   }
 
-  $tempScript = [System.IO.Path]::Combine(
-    [System.IO.Path]::GetTempPath(),
-    "cats-devin-install-$([System.Guid]::NewGuid().ToString('N')).ps1"
-  )
-  $stdoutPath = "$tempScript.stdout"
-  $stderrPath = "$tempScript.stderr"
   # Devin's setup.ps1 ends by launching the interactive `devin setup` wizard.
   # Packaged setup runs with no console a prompt can reach, so an unstripped
   # installer would stall the step rather than fail.
@@ -174,46 +173,8 @@ function Invoke-DevinInstaller {
   }
   $bootstrap = ($patchedLines -join [Environment]::NewLine)
 
-  try {
-    [System.IO.File]::WriteAllText(
-      $tempScript,
-      $bootstrap,
-      [System.Text.UTF8Encoding]::new($false)
-    )
-    $powerShellExe = if (Get-Command pwsh.exe -ErrorAction SilentlyContinue) {
-      'pwsh.exe'
-    } else {
-      'powershell.exe'
-    }
-    $process = Start-Process -FilePath $powerShellExe `
-      -ArgumentList @('-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', $tempScript) `
-      -Wait -PassThru -NoNewWindow `
-      -RedirectStandardOutput $stdoutPath `
-      -RedirectStandardError $stderrPath
-    $stderrRaw = if (Test-Path -LiteralPath $stderrPath -PathType Leaf) {
-      Get-Content -LiteralPath $stderrPath -Raw -ErrorAction SilentlyContinue
-    } else { $null }
+  return Invoke-CatsRemoteInstaller -ScriptText $bootstrap -RetrySharingViolation
 
-    return [pscustomobject]@{
-      skipped = $false
-      success = ($process.ExitCode -eq 0)
-      exitCode = $process.ExitCode
-      stderr = if ($null -eq $stderrRaw) { '' } else { [string]$stderrRaw }
-    }
-  } catch {
-    return [pscustomobject]@{
-      skipped = $false
-      success = $false
-      exitCode = -1
-      stderr = "Failed to invoke Devin installer: $($_.Exception.Message)"
-    }
-  } finally {
-    foreach ($path in @($tempScript, $stdoutPath, $stderrPath)) {
-      if (Test-Path -LiteralPath $path -PathType Leaf) {
-        Remove-Item -LiteralPath $path -Force -ErrorAction SilentlyContinue
-      }
-    }
-  }
 }
 
 if (-not $CheckOnly -and -not $Apply -and -not $Upgrade -and -not $Force -and -not $Uninstall) {
@@ -303,7 +264,15 @@ if ($CheckOnly) {
     }) -ExitCode 0
 }
 
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+if ($Upgrade -and -not $Force -and $detected.installed -and -not $SkipInstaller -and -not $DryRun) {
+  $versionGate = Test-CatsNativeUpgrade -Provider 'devin' -InstalledVersion $detected.detectedVersion
+  $shouldInstall = $versionGate.shouldInstall
+  if (-not $versionGate.known) { $warnings.Add('Could not compare the published version; the official installer will verify the update.') }
+  if (-not $shouldInstall) { $plannedActions.Clear() }
+}
 $installFailed = $false
 $installSkipped = $false
 if ($shouldInstall) {
@@ -347,12 +316,12 @@ if ($shouldInstall) {
   }
 }
 
-$manualSteps.Add('Run `devin login` or set XAI_API_KEY before first use.')
+$manualSteps.Add('Run `devin auth login` to authenticate; check with `devin auth status`. The interactive setup wizard is skipped.')
 $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall -and -not $installFailed -and -not $DryRun) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Devin install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Devin install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false

package/scripts/windows/Install-GitHubCli.ps1

@@ -179,6 +179,10 @@ $mode = if ($CheckOnly) {
   'apply'
 }
 
+# Desktop can outlive an installation. A fresh check must include the registry
+# PATH, while retaining caller-provided command locations in this process.
+$env:Path = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' +
+  [System.Environment]::GetEnvironmentVariable('Path', 'User') + ';' + $env:Path
 $installed = Test-GhInstalled
 $detected = Get-GhDetectedVersion -Override $DetectedVersion
 $commandPath = if ($SkipGhProbe) { '' } else { Resolve-GhCommandPath }

package/scripts/windows/Install-Goose.ps1

@@ -59,6 +59,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 . (Join-Path $PSScriptRoot '_PackagedUninstall.ps1')
 
 function Write-StructuredResult {
@@ -67,6 +68,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -364,7 +369,19 @@ if ($CheckOnly) {
   Write-StructuredResult -Result $result -ExitCode 0
 }
 
+if ($DryRun) {
+  Write-CatsNativePreview -Helper 'windows-goose-native-installer' -Mode $executionMode -Detected $detected -Actions $plannedActions.ToArray() -EmitJson ([bool]$Json)
+}
+
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+if ($Upgrade -and -not $Force -and $detected.installed -and -not $SkipInstaller -and -not $DryRun) {
+  $versionGate = Test-CatsNativeUpgrade -Provider 'goose' -InstalledVersion $detected.detectedVersion
+  $shouldInstall = $versionGate.shouldInstall
+  if (-not $versionGate.known) { $warnings.Add('Could not compare the published version; the official installer will verify the update.') }
+  if (-not $shouldInstall) { $plannedActions.Clear() }
+}
 $installFailed = $false
 $installSkipped = $false
 if ($shouldInstall) {
@@ -410,7 +427,7 @@ $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall -and -not $installFailed) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Goose install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Goose install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false

package/scripts/windows/Install-Grok.ps1

@@ -28,6 +28,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 . (Join-Path $PSScriptRoot '_PackagedUninstall.ps1')
 
 function Write-StructuredResult {
@@ -36,6 +37,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -273,7 +278,15 @@ if ($CheckOnly) {
     }) -ExitCode 0
 }
 
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+if ($Upgrade -and -not $Force -and $detected.installed -and -not $SkipInstaller -and -not $DryRun) {
+  $versionGate = Test-CatsNativeUpgrade -Provider 'grok' -InstalledVersion $detected.detectedVersion
+  $shouldInstall = $versionGate.shouldInstall
+  if (-not $versionGate.known) { $warnings.Add('Could not compare the published version; the official installer will verify the update.') }
+  if (-not $shouldInstall) { $plannedActions.Clear() }
+}
 $installFailed = $false
 $installSkipped = $false
 if ($shouldInstall) {
@@ -322,7 +335,7 @@ $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall -and -not $installFailed -and -not $DryRun) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Grok install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Grok install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false

package/scripts/windows/Install-Junie.ps1

@@ -59,6 +59,7 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 . (Join-Path $PSScriptRoot '_HiddenProcess.ps1')
+. (Join-Path $PSScriptRoot '_NativeInstallerSupport.ps1')
 . (Join-Path $PSScriptRoot '_PackagedUninstall.ps1')
 
 function Write-StructuredResult {
@@ -67,6 +68,10 @@ function Write-StructuredResult {
     [int]$ExitCode
   )
 
+  if (Get-Variable -Name catsInitialObservation -Scope Script -ErrorAction SilentlyContinue) {
+    Add-CatsNativeObservation -Result $Result -Before $script:catsInitialObservation -Attempted ([bool]$script:shouldInstall) -Skipped ([bool]$SkipInstaller)
+  }
+
   if ($Json) {
     $Result | ConvertTo-Json -Depth 10
   } else {
@@ -136,6 +141,7 @@ function Detect-JunieInstall {
     }
   }
 
+  if ($installed -and -not $version -and $commandPath -match '\.(cmd|bat)$') { $version = Get-CatsShimVersionText -Path $commandPath }
   return [pscustomobject]@{
     installed = $installed
     commandPath = $commandPath
@@ -165,11 +171,8 @@ function Invoke-JunieInstaller {
     }
   }
 
-  $installScript = Invoke-RestMethod 'https://junie.jetbrains.com/install.ps1'
-  Invoke-Expression $installScript
-  return [pscustomobject]@{
-    skipped = $false
-  }
+  $installScript = Invoke-RestMethod -TimeoutSec 30 -UseBasicParsing 'https://junie.jetbrains.com/install.ps1'
+  return Invoke-CatsRemoteInstaller -ScriptText $installScript
 }
 
 if (-not $CheckOnly -and -not $Apply -and -not $Upgrade -and -not $Force -and -not $Uninstall) {
@@ -278,17 +281,35 @@ if ($CheckOnly) {
   Write-StructuredResult -Result $result -ExitCode 0
 }
 
+if ($DryRun) {
+  Write-CatsNativePreview -Helper 'windows-junie-native-installer' -Mode $executionMode -Detected $detected -Actions $plannedActions.ToArray() -EmitJson ([bool]$Json)
+}
+
+$installFailed = $false
+$catsInitialObservation = $detected.PSObject.Copy()
 $shouldInstall = $Force -or $Upgrade -or -not $detected.installed
+if ($Upgrade -and -not $Force -and $detected.installed -and -not $SkipInstaller -and -not $DryRun) {
+  $versionGate = Test-CatsNativeUpgrade -Provider 'junie' -InstalledVersion $detected.detectedVersion
+  $shouldInstall = $versionGate.shouldInstall
+  if (-not $versionGate.known) { $warnings.Add('Could not compare the published version; the official installer will verify the update.') }
+  if (-not $shouldInstall) { $plannedActions.Clear() }
+}
+$installFailed = $false
 if ($shouldInstall) {
-  $installResult = Invoke-JunieInstaller
+  $installResult = try { Invoke-JunieInstaller } catch { [pscustomobject]@{ skipped = $false; success = $false; stderr = [string]$_.Exception.Message; usedPowerShell51Fallback = $false; usedWingetFallback = $false } }
+  if ($installResult.PSObject.Properties['success'] -and -not $installResult.success) {
+    $installFailed = $true
+    $warnings.Add($installResult.stderr)
+  }
   if ($installResult.skipped) {
     $warnings.Add('Installer invocation was skipped by request.')
   }
 
   Start-Sleep -Seconds 2
   $detected = Detect-JunieInstall
-  if (-not $detected.installed -and -not $SkipInstaller) {
-    throw 'Junie installation completed but junie was still not detected.'
+  if (-not $detected.installed -and -not $SkipInstaller -and -not $installFailed) {
+    $warnings.Add('Junie installation completed but junie was still not detected.')
+    $installFailed = $true
   }
 
   if ($Force) {
@@ -306,7 +327,7 @@ $interruptions = [System.Collections.Generic.List[object]]::new()
 if ($shouldInstall) {
   $interruptions.Add([pscustomobject]@{
       kind = 'relaunch_required'
-      summary = 'Relaunch Cats Desktop Host after the Junie install step, then rerun the packaged setup check.'
+      summary = 'Run Detect Again after the Junie install step if the command is not visible yet.'
       resumable = $true
       requiresRestart = $false
       requiresElevation = $false
@@ -325,7 +346,7 @@ if (-not $authSatisfied) {
 $result = [pscustomobject]@{
   helper = 'windows-junie-native-installer'
   mode = $executionMode
-  status = if ($interruptions.Count -gt 0) { [string]$interruptions[0].kind } else { 'ready' }
+  status = if ($installFailed) { 'failed' } elseif ($interruptions.Count -gt 0) { [string]$interruptions[0].kind } else { 'ready' }
   installed = [bool]$detected.installed
   detectedVersion = if ($detected.detectedVersion) { $detected.detectedVersion } else { $null }
   commandPath = $detected.commandPath
@@ -336,4 +357,4 @@ $result = [pscustomobject]@{
   manualSteps = $manualSteps.ToArray()
   interruptions = $interruptions.ToArray()
 }
-Write-StructuredResult -Result $result -ExitCode 0
+Write-StructuredResult -Result $result -ExitCode $(if ($installFailed) { 1 } else { 0 })