diff --git a/docs/dogfooding-pull-requests.md b/docs/dogfooding-pull-requests.md
index dafd90fe7d1..12cf09188fd 100644
--- a/docs/dogfooding-pull-requests.md
+++ b/docs/dogfooding-pull-requests.md
@@ -329,9 +329,9 @@ The file is scoped to the solution directory and only affects projects under it.
 
 The Homebrew cask (`eng/homebrew/aspire.rb.template`) installs Aspire entirely
 inside the Caskroom version directory — `brew uninstall aspire` removes
-the binary and the route sidecar end-to-end. The cask intentionally carries
-no `zap` stanza, because `~/.aspire/` is a shared prefix with the script-route
-and PR-route installers and a brew-driven recursive delete would clobber state
+the binary and the source sidecar end-to-end. The cask intentionally carries
+no `zap` stanza, because `~/.aspire/` is a shared prefix with the script-source
+and PR-source installers and a brew-driven recursive delete would clobber state
 those installers still own.
 
 If you installed via the Homebrew cask before this change, you may have a
@@ -343,7 +343,7 @@ Clean it up manually once after upgrading the cask:
 rm -rf ~/.aspire/installs/brew-stable
 ```
 
-NuGet hives under `~/.aspire/hives/` and any script-route or PR-route
+NuGet hives under `~/.aspire/hives/` and any script-source or PR-source
 binaries under `~/.aspire/bin/` and `~/.aspire/dogfood/` are not touched by
 the cask in either direction; manage those with the steps above.
 
diff --git a/docs/specs/cli-output-formats.md b/docs/specs/cli-output-formats.md
index bbe2393303a..a8c02e0831f 100644
--- a/docs/specs/cli-output-formats.md
+++ b/docs/specs/cli-output-formats.md
@@ -474,6 +474,43 @@ The JSON form includes secret values. Do not redirect it to logs or files unless
 
 `status` is one of `pass`, `warning`, or `fail`. Individual checks can include `details`, `fix`, `link`, or command-specific `metadata`.
 
+### `aspire installs list`
+
+`aspire installs list --format json` emits the Aspire CLI installs and orphan package hives that the running CLI can discover:
+
+```json
+[
+  {
+    "id": "script",
+    "kind": "script",
+    "channel": "stable",
+    "path": "/home/user/.aspire/bin/aspire",
+    "hive": "/home/user/.aspire/hives/stable",
+    "status": "active"
+  },
+  {
+    "id": "pr-17400",
+    "kind": "orphan-hive",
+    "channel": "pr-17400",
+    "hive": "/home/user/.aspire/hives/pr-17400",
+    "status": "no install found",
+    "statusReason": "No discovered install reports this hive's channel."
+  },
+  {
+    "id": "stable",
+    "kind": "homebrew",
+    "channel": "stable",
+    "path": "/opt/homebrew/Caskroom/aspire/13.2.0/aspire",
+    "status": "active",
+    "managedBy": "homebrew"
+  }
+]
+```
+
+`status` uses the install-discovery status (`active`, `shadowed`, `notOnPath`, `failed: <reason>`, `notProbed: <reason>`) or `no install found` for orphan hives.
+
+`aspire installs --self --format json` is a hidden command used by the install-discovery peer-probe path so a newer CLI can ask a peer CLI to describe itself. The shape is an internal cross-version contract between Aspire CLI builds — not a stable surface for tooling — and may change without notice.
+
 ### `aspire config info`
 
 `aspire config info --json` is a hidden tooling command that emits configuration paths, feature metadata, settings schemas, and advertised CLI capabilities:
diff --git a/docs/specs/install-routes.md b/docs/specs/install-sources.md
similarity index 57%
rename from docs/specs/install-routes.md
rename to docs/specs/install-sources.md
index 4def1a0bdd5..37c13348669 100644
--- a/docs/specs/install-routes.md
+++ b/docs/specs/install-sources.md
@@ -1,8 +1,8 @@
-# Aspire CLI install-route sidecar
+# Aspire CLI install-source sidecar
 
 > Pairs with `docs/specs/bundle.md` (bundle extraction layout) and `docs/ci/native-cli-packaging.md` (how archives are produced).
 
-The CLI binary identifies its install route by reading a single
+The CLI binary identifies its install source by reading a single
 `.aspire-install.json` sidecar that lives next to the binary. The sidecar's
 `source` field selects the extract-dir shape used by `BundleService` and, for
 portable installs, the Aspire home used for hives and local state.
@@ -13,10 +13,10 @@ portable installs, the Aspire home used for hives and local state.
 (`<binaryDir>/.aspire-install.json`) and contains exactly one field:
 
 ```json
-{ "source": "<route>" }
+{ "source": "<source>" }
 ```
 
-| `source` value | Install route                                          |
+| `source` value | Install source                                          |
 |----------------|--------------------------------------------------------|
 | `brew`         | Homebrew cask                                          |
 | `winget`       | WinGet portable manifest                               |
@@ -37,26 +37,26 @@ install. `script` and `localhive` use the parent of `bin`; `pr` uses the parent
 of `dogfood/pr-<N>/bin`. Package-manager installs and sidecar-less binaries keep
 the default user-profile Aspire home.
 
-## Per-route authorship
+## Per-source authorship
 
-**The shared per-RID CLI archives (`aspire-cli-<rid>-*.zip` / `.tar.gz`) ship sidecar-free.** Those archives are reused across brew, winget, the release script, and the PR script — none of them owns the route label. Each route writes its own sidecar at install time.
+**The shared per-RID CLI archives (`aspire-cli-<rid>-*.zip` / `.tar.gz`) ship sidecar-free.** Those archives are reused across Homebrew, WinGet, the release script, and the PR script — none of them owns the source label. Each source writes its own sidecar at install time.
 
-| Route       | Archive shape                          | Sidecar writer                                                      |
+| Source       | Archive shape                          | Sidecar writer                                                      |
 |-------------|----------------------------------------|---------------------------------------------------------------------|
-| brew        | shared per-RID tarball                 | cask `postflight` block in `eng/homebrew/aspire.rb.template`        |
+| Homebrew    | shared per-RID tarball                 | cask `postflight` block in `eng/homebrew/aspire.rb.template`        |
 | winget      | shared per-RID zip                     | CLI first-run probe (`WingetFirstRunProbe`) — uses the WinGet portable ARP registry entry to confirm the running binary was placed by winget, then stamps the sidecar |
 | script      | shared per-RID archive                 | `eng/scripts/get-aspire-cli.{sh,ps1}` (post-extraction)             |
 | PR script   | shared per-RID archive                 | `eng/scripts/get-aspire-cli-pr.{sh,ps1}` (post-extraction)          |
-| dotnet-tool | route-exclusive nupkg                  | payload-embedded (staged by `Aspire.Cli.csproj` `_PreparePreBuiltCliBinaryForPackTool`) |
-| localhive   | local-only (no shared archive)         | `localhive.{sh,ps1}` writes the sidecar after copying the CLI binary into `<prefix>/bin/`. When `--output PATH` is used, the sidecar is written inside the output dir, which is appropriate because localhive archives are route-exclusive (only consumed as localhive installs). |
+| dotnet-tool | source-exclusive nupkg                  | payload-embedded (staged by `Aspire.Cli.csproj` `_PreparePreBuiltCliBinaryForPackTool`) |
+| localhive   | local-only (no shared archive)         | `localhive.{sh,ps1}` writes the sidecar after copying the CLI binary into `<prefix>/bin/`. When `--output PATH` is used, the sidecar is written inside the output dir, which is appropriate because localhive archives are source-exclusive (only consumed as localhive installs). |
 
-The dotnet-tool nupkg is the one exception that payload-embeds the sidecar: the nupkg is route-exclusive (only `dotnet tool install` consumes it), so the embedded sidecar cannot leak into another route's prefix.
+The dotnet-tool nupkg is the one exception that payload-embeds the sidecar: the nupkg is source-exclusive (only `dotnet tool install` consumes it), so the embedded sidecar cannot leak into another source's prefix.
 
 ## Why no payload-embed in shared archives
 
-Until PR 16817 the per-RID archives baked `{"source":"brew"}` (osx-*) and `{"source":"winget"}` (win-*) into the archive root via an MSBuild target. Because the osx-* tarball is also consumed by `get-aspire-cli-pr.sh`, the smuggled `brew` sidecar landed in the script-route prefix at `<prefix>/dogfood/pr-<N>/bin/.aspire-install.json`, and `BundleService` then selected `binaryDir` (the `brew` flat-layout case) as the extract dir — producing `<prefix>/dogfood/pr-<N>/bin/versions/<v>/` instead of `<prefix>/dogfood/pr-<N>/versions/<v>/`.
+Until PR 16817 the per-RID archives baked source sidecars (`osx-*` as Homebrew, `win-*` as WinGet) into the archive root via an MSBuild target. Because the `osx-*` tarball is also consumed by `get-aspire-cli-pr.sh`, the smuggled `brew` sidecar landed in the script-source prefix at `<prefix>/dogfood/pr-<N>/bin/.aspire-install.json`, and `BundleService` then selected `binaryDir` (the `brew` flat-layout case) as the extract dir — producing `<prefix>/dogfood/pr-<N>/bin/versions/<v>/` instead of `<prefix>/dogfood/pr-<N>/versions/<v>/`.
 
-Removing the MSBuild target and moving each route to author its own sidecar at install time makes the per-RID archive route-agnostic and prevents the leak by construction.
+Removing the MSBuild target and moving each source to author its own sidecar at install time makes the per-RID archive source-agnostic and prevents the leak by construction.
 
 ## Producer-side invariants (build / CI)
 
@@ -67,10 +67,10 @@ Two mechanical checks guard the contract:
 
 ## Reader-side invariants (runtime)
 
-`BundleService.ComputeDefaultExtractDir` is the single point of truth for layout selection. It performs no path-shape detection: layout is a pure function of the sidecar `source` value (or the fallback when the sidecar is absent, unreadable, malformed, or has an unknown `source`). Unknown `source` values fall back to parent-of-binary for typed bundle layout handling. Coverage lives in `tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossRouteExtractionTests.cs` as a theory over (source × prefix-shape) rows, including the cross-route case where a `brew` sidecar lands under a script-style prefix.
+`BundleService.ComputeDefaultExtractDir` is the single point of truth for layout selection. It performs no path-shape detection: layout is a pure function of the sidecar `source` value (or the fallback when the sidecar is absent, unreadable, malformed, or has an unknown `source`). Unknown `source` values fall back to parent-of-binary for typed bundle layout handling. Coverage lives in `tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossSourceExtractionTests.cs` as a theory over (source × prefix-shape) rows, including the cross-source case where a `brew` sidecar lands under a script-style prefix.
 
-`CliPathHelper.GetAspireHomeDirectory` is the single point of truth for Aspire-home selection. It reads the same sidecar but only changes home for Aspire-owned portable routes (`script`, `pr`, and `localhive`); package-manager routes use the user-profile home because their install roots are package-manager-owned. Coverage lives in `tests/Aspire.Cli.Tests/Utils/CliPathHelperTests.cs`.
+`CliPathHelper.GetAspireHomeDirectory` is the single point of truth for Aspire-home selection. It reads the same sidecar but only changes home for Aspire-owned portable sources (`script`, `pr`, and `localhive`); package-manager sources use the user-profile home because their install roots are package-manager-owned. Coverage lives in `tests/Aspire.Cli.Tests/Utils/CliPathHelperTests.cs`.
 
-> **Discovery scope (dotnet-tool route).** Install discovery walks the default `dotnet tool install -g` location at `~/.dotnet/tools/.store/aspire.cli` only. Custom `--tool-path` installs are not discovered today: the dotnet CLI has no machine-wide registry of arbitrary `--tool-path` installs to enumerate, and walking the filesystem would balloon the cost of `aspire doctor`. Users with a custom-`--tool-path` install can confirm it directly with `<tool-path>/aspire doctor --self`.
+> **Discovery scope (dotnet-tool source).** Install discovery walks the default `dotnet tool install -g` location at `~/.dotnet/tools/.store/aspire.cli` only. Custom `--tool-path` installs are not discovered today: the dotnet CLI has no machine-wide registry of arbitrary `--tool-path` installs to enumerate, and walking the filesystem would balloon the cost of `aspire installs list`. Users with a custom-`--tool-path` install can confirm it directly with `<tool-path>/aspire installs --self`.
 
-For read-only install discovery (`aspire doctor --format json`), sidecar existence is the trust signal for peer probing. A candidate with any readable sidecar is probed even when `source` is not in the known route table; the raw `source` string is surfaced as the installation `route` so future package-manager routes can appear before this consumer updates. Sidecar-less, unreadable, or malformed candidates are listed without executing the binary.
+For read-only install discovery (`aspire installs list --format json`), sidecar existence is the trust signal for peer probing. A candidate with any readable sidecar is probed even when `source` is not in the known source table; the raw `source` string is surfaced as the installation `source` so future package-manager sources can appear before this consumer updates. Sidecar-less, unreadable, or malformed candidates are listed without executing the binary.
diff --git a/eng/clipack/Common.projitems b/eng/clipack/Common.projitems
index d9bfc4e9dab..049c8403def 100644
--- a/eng/clipack/Common.projitems
+++ b/eng/clipack/Common.projitems
@@ -42,12 +42,12 @@
   </Target>
 
   <!--
-    No install-route sidecar is staged into the per-RID CLI archive. The
-    shared archives are sidecar-free by contract; each route writes its own
+    No install-source sidecar is staged into the per-RID CLI archive. The
+    shared archives are sidecar-free by contract; each source writes its own
     .aspire-install.json at install time. The dotnet-tool nupkg is the
-    exception (route-exclusive, payload-embedded by
+    exception (source-exclusive, payload-embedded by
     src/Aspire.Cli/Aspire.Cli.csproj _PreparePreBuiltCliBinaryForPackTool).
-    See docs/specs/install-routes.md for the full authorship table.
+    See docs/specs/install-sources.md for the full authorship table.
 
     _AssertNoSidecarInArchiveStaging below is the build-time guard that
     fails the build if a regression starts staging the sidecar back in.
@@ -59,7 +59,7 @@
       <_ArchiveSidecarPath>$([MSBuild]::NormalizePath($(OutputPath), '.aspire-install.json'))</_ArchiveSidecarPath>
     </PropertyGroup>
     <Error Condition="Exists('$(_ArchiveSidecarPath)')"
-           Text="Per-RID CLI archives must not contain '.aspire-install.json' — shared across install routes. See docs/specs/install-routes.md. Found smuggled sidecar at $(_ArchiveSidecarPath)." />
+           Text="Per-RID CLI archives must not contain '.aspire-install.json' — shared across install sources. See docs/specs/install-sources.md. Found smuggled sidecar at $(_ArchiveSidecarPath)." />
   </Target>
 
   <Target Name="_PublishProject">
diff --git a/eng/scripts/get-aspire-cli-pr.ps1 b/eng/scripts/get-aspire-cli-pr.ps1
index 1394a1a6d02..610679aec95 100755
--- a/eng/scripts/get-aspire-cli-pr.ps1
+++ b/eng/scripts/get-aspire-cli-pr.ps1
@@ -179,6 +179,22 @@ param(
     [Parameter(HelpMessage = "Do not add the install path to PATH environment variable (useful for portable installs)")]
     [switch]$SkipPath,
 
+    [Parameter(HelpMessage = "Clean up Aspire CLI state created by this PR script")]
+    [switch]$Uninstall,
+
+    [Parameter(HelpMessage = "Channel/hive label to clean up")]
+    [string]$Channel = "",
+
+    [Parameter(HelpMessage = "Clean pr-*, staging, and daily hives")]
+    [switch]$All,
+
+    [Parameter(HelpMessage = "Confirm uninstall without prompting")]
+    [Alias("y")]
+    [switch]$Yes,
+
+    [Parameter(HelpMessage = "Also remove shared ~/.aspire/bin plus bundle/version artifacts")]
+    [switch]$RemoveSharedInstall,
+
     [Parameter(HelpMessage = "Keep downloaded archive files after installation")]
     [switch]$KeepArchive,
 
@@ -878,6 +894,172 @@ function Get-InstallPrefix {
     return Get-DefaultInstallPrefix
 }
 
+function Remove-CleanupPath {
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Path,
+
+        [Parameter(Mandatory = $true)]
+        [string]$Description
+    )
+
+    if (-not (Test-Path -LiteralPath $Path)) {
+        Write-Message "skipped: $Path (does not exist)" -Level Info
+        return
+    }
+
+    if ($PSCmdlet.ShouldProcess($Path, "Remove $Description")) {
+        try {
+            # Without -ErrorAction Stop, Remove-Item failures (permission
+            # denied, file in use, etc.) are non-terminating errors. Without
+            # the explicit try/catch, execution would fall through to the
+            # "removed:" log line below, hiding the failure and producing a
+            # success-looking exit while the path is still on disk.
+            Remove-Item -LiteralPath $Path -Recurse -Force -ErrorAction Stop
+            Write-Message "removed: $Path" -Level Info
+        }
+        catch {
+            Write-Message "failed: $Path ($($_.Exception.Message))" -Level Error
+            throw
+        }
+    }
+    else {
+        Write-Message "What if: would remove ${Description}: $Path" -Level Info
+    }
+}
+
+# Reject channel names that contain path separators or '..' segments so
+# $ResolvedInstallPrefix\hives\<channel> cannot resolve outside
+# $ResolvedInstallPrefix\hives. Mirrors validate_channel in
+# get-aspire-cli.sh and the C# CliCleanupService.ValidateChannel.
+function Test-UninstallChannel {
+    param([string]$ChannelName)
+    if ([string]::IsNullOrWhiteSpace($ChannelName)) { return $false }
+    if ($ChannelName.Contains('/') -or $ChannelName.Contains('\')) { return $false }
+    if ($ChannelName -eq '.' -or $ChannelName -eq '..') { return $false }
+    if ($ChannelName.Contains('..')) { return $false }
+    return $true
+}
+
+function Get-BundleVersionTarget {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$InstallPrefix
+    )
+
+    $bundlePath = Join-Path $InstallPrefix "bundle"
+    if (-not (Test-Path -LiteralPath $bundlePath)) {
+        return $null
+    }
+
+    # Get-Item without -ErrorAction Stop emits non-terminating errors on
+    # permission denied / IO failure, $bundleItem becomes $null, and the
+    # function returns $null. Remove-BundleLayout would then delete just the
+    # bundle symlink and silently strand the versions/<v>/ tree — the same
+    # silent-failure pattern Remove-CleanupPath was hardened against.
+    try {
+        $bundleItem = Get-Item -LiteralPath $bundlePath -Force -ErrorAction Stop
+    }
+    catch [System.Management.Automation.ItemNotFoundException] {
+        # TOCTOU between Test-Path and Get-Item — bundle just disappeared. No-op.
+        return $null
+    }
+    if (-not $bundleItem.LinkType -or -not $bundleItem.Target) {
+        return $null
+    }
+
+    $targetPath = $bundleItem.Target
+    if (-not [System.IO.Path]::IsPathRooted($targetPath)) {
+        $targetPath = [System.IO.Path]::GetFullPath((Join-Path (Split-Path -Parent $bundlePath) $targetPath))
+    }
+
+    $versionsRoot = [System.IO.Path]::GetFullPath((Join-Path $InstallPrefix "versions"))
+    $normalizedTarget = [System.IO.Path]::GetFullPath($targetPath)
+    if ($normalizedTarget.StartsWith($versionsRoot + [System.IO.Path]::DirectorySeparatorChar, [StringComparison]::Ordinal)) {
+        return $normalizedTarget
+    }
+
+    return $null
+}
+
+function Remove-BundleLayout {
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$InstallPrefix
+    )
+
+    $versionTarget = Get-BundleVersionTarget -InstallPrefix $InstallPrefix
+    if ($versionTarget) {
+        Remove-CleanupPath -Path $versionTarget -Description "shared bundle version"
+    }
+
+    Remove-CleanupPath -Path (Join-Path $InstallPrefix "bundle") -Description "shared bundle link"
+}
+
+function Start-AspireCliUninstall {
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$ResolvedInstallPrefix
+    )
+
+    $channels = @()
+    if ($All) {
+        $hivesRoot = Join-Path $ResolvedInstallPrefix "hives"
+        if (Test-Path -LiteralPath $hivesRoot -PathType Container) {
+            $channels = Get-ChildItem -LiteralPath $hivesRoot -Directory |
+                Where-Object { $_.Name -like "pr-*" -or $_.Name -eq "staging" -or $_.Name -eq "daily" } |
+                Sort-Object Name |
+                ForEach-Object { $_.Name }
+        }
+    }
+    else {
+        $targetChannel = $Channel
+        if ([string]::IsNullOrWhiteSpace($targetChannel) -and -not [string]::IsNullOrWhiteSpace($HiveLabel)) {
+            $targetChannel = $HiveLabel
+        }
+        elseif ([string]::IsNullOrWhiteSpace($targetChannel) -and $PRNumber -gt 0) {
+            $targetChannel = "pr-$PRNumber"
+        }
+        if ([string]::IsNullOrWhiteSpace($targetChannel)) {
+            throw "Uninstall requires a PR number, -Channel, or -All when the channel cannot be inferred."
+        }
+        if (-not (Test-UninstallChannel -ChannelName $targetChannel)) {
+            throw "Invalid -Channel value '$targetChannel'. Channel names must not contain path separators or '..'."
+        }
+        $channels = @($targetChannel)
+    }
+
+    if (-not $WhatIfPreference -and -not $Yes) {
+        throw "Uninstall requires -Yes unless -WhatIf is specified."
+    }
+
+    if ($channels.Count -eq 0) {
+        Write-Message "No matching Aspire CLI cleanup targets were found." -Level Info
+        return
+    }
+
+    foreach ($targetChannel in $channels) {
+        Remove-CleanupPath -Path (Join-Path (Join-Path $ResolvedInstallPrefix "hives") $targetChannel) -Description "hive $targetChannel"
+        if ($targetChannel.StartsWith("pr-", [StringComparison]::Ordinal)) {
+            Remove-CleanupPath -Path (Join-Path (Join-Path $ResolvedInstallPrefix "dogfood") $targetChannel) -Description "dogfood install $targetChannel"
+        }
+    }
+
+    if ($RemoveSharedInstall) {
+        Remove-CleanupPath -Path (Join-Path (Join-Path $ResolvedInstallPrefix "bin") "aspire") -Description "shared script binary"
+        Remove-CleanupPath -Path (Join-Path (Join-Path $ResolvedInstallPrefix "bin") "aspire.exe") -Description "shared script binary"
+        Remove-CleanupPath -Path (Join-Path (Join-Path $ResolvedInstallPrefix "bin") ".aspire-install.json") -Description "shared script sidecar"
+        Remove-BundleLayout -InstallPrefix $ResolvedInstallPrefix
+    }
+    else {
+        Write-Message "Shared script install artifacts were left in place. Pass -RemoveSharedInstall to remove $ResolvedInstallPrefix/bin/aspire and the matching bundle/versions layout." -Level Info
+    }
+}
+
 # Function to make GitHub API calls with proper error handling
 function Invoke-GitHubAPICall {
     [CmdletBinding()]
@@ -1539,11 +1721,11 @@ function Test-InstallerModeEnvironment {
     }
 }
 
-# Writes the PR-route install-source sidecar (.aspire-install.json) next to
+# Writes the PR-source install-source sidecar (.aspire-install.json) next to
 # the installed binary. Under -WhatIf, prints the target path and skips the
 # write so a real user's sidecar is never overwritten by a describe pass.
-# Authorship contract: docs/specs/install-routes.md.
-function Write-PRRouteSidecar {
+# Authorship contract: docs/specs/install-sources.md.
+function Write-PRSourceSidecar {
     [CmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Mandatory = $true)]
@@ -1557,12 +1739,12 @@ function Write-PRRouteSidecar {
     $sidecarPath = Join-Path $sidecarDir '.aspire-install.json'
     $sidecarContent = "{""source"":""pr""}`n"
 
-    if ($PSCmdlet.ShouldProcess($sidecarPath, "Write route sidecar")) {
+    if ($PSCmdlet.ShouldProcess($sidecarPath, "Write source sidecar")) {
         [System.IO.Directory]::CreateDirectory($sidecarDir) | Out-Null
         [System.IO.File]::WriteAllText($sidecarPath, $sidecarContent)
     }
     else {
-        Write-Host "What if: Route sidecar would be written to: $sidecarPath"
+        Write-Host "What if: Source sidecar would be written to: $sidecarPath"
     }
 }
 
@@ -1701,8 +1883,8 @@ function Start-InstallFromLocalDir {
     Write-Message "Installing from local directory: $LocalDirPath" -Level Info
 
     # Set installation paths.
-    # PR-route installs are isolated under <prefix>/dogfood/pr-<N>/bin so they don't
-    # collide with the script-route prefix or with other PR installs. Hives remain shared
+    # PR-source installs are isolated under <prefix>/dogfood/pr-<N>/bin so they don't
+    # collide with the script-source prefix or with other PR installs. Hives remain shared
     # under <prefix>/hives/<label>/packages.
     $cliBinDir = if ($PRNumber -gt 0) {
         Join-Path (Join-Path (Join-Path $resolvedInstallPrefix "dogfood") "pr-$PRNumber") "bin"
@@ -1791,7 +1973,7 @@ function Start-InstallFromLocalDir {
     # PR installs from archives get a sidecar; --local-dir installs are unmanaged,
     # and dotnet-tool packages embed their own source=dotnet-tool sidecar.
     if (-not $HiveOnly -and $InstallMode -eq 'Archive' -and $PRNumber -gt 0) {
-        Write-PRRouteSidecar -InstallPrefix $resolvedInstallPrefix -PRNumber $PRNumber
+        Write-PRSourceSidecar -InstallPrefix $resolvedInstallPrefix -PRNumber $PRNumber
     }
 
     # Update PATH environment variables
@@ -1837,8 +2019,8 @@ function Start-DownloadAndInstall {
     Write-Message "Using workflow run https://github.com/$Script:Repository/actions/runs/$runId" -Level Info
 
     # Set installation paths.
-    # PR-route installs are isolated under <prefix>/dogfood/pr-<N>/bin so they don't
-    # collide with the script-route prefix or with other PR installs. Hives remain shared
+    # PR-source installs are isolated under <prefix>/dogfood/pr-<N>/bin so they don't
+    # collide with the script-source prefix or with other PR installs. Hives remain shared
     # under <prefix>/hives/<label>/packages.
     $cliBinDir = if ($PRNumber -gt 0) {
         Join-Path (Join-Path (Join-Path $resolvedInstallPrefix "dogfood") "pr-$PRNumber") "bin"
@@ -1927,7 +2109,7 @@ function Start-DownloadAndInstall {
     }
 
     if (-not $HiveOnly -and $InstallMode -eq 'Archive' -and $PRNumber -gt 0) {
-        Write-PRRouteSidecar -InstallPrefix $resolvedInstallPrefix -PRNumber $PRNumber
+        Write-PRSourceSidecar -InstallPrefix $resolvedInstallPrefix -PRNumber $PRNumber
     }
 
     # Update PATH environment variables
@@ -2038,14 +2220,21 @@ OPTIONS:
         Test-InstallerModeEnvironment
     }
 
+    # Set default install prefix if not provided. Uninstall uses only local state and
+    # must not require GitHub CLI access.
+    $resolvedInstallPrefix = Get-InstallPrefix -InstallPrefix $InstallPath
+
+    if ($Uninstall) {
+        Start-AspireCliUninstall -ResolvedInstallPrefix $resolvedInstallPrefix
+        $exitCode = 0
+        return
+    }
+
     # Check gh dependency (not needed for -LocalDir mode)
     if (-not $LocalDir) {
         Test-GitHubCLIDependency
     }
 
-    # Set default install prefix if not provided
-    $resolvedInstallPrefix = Get-InstallPrefix -InstallPrefix $InstallPath
-
     # Create a temporary directory for downloads
     $tempDir = New-TempDirectory -Prefix "aspire-cli-pr-download"
 
diff --git a/eng/scripts/get-aspire-cli-pr.sh b/eng/scripts/get-aspire-cli-pr.sh
index d7350ca3558..63635494e3b 100755
--- a/eng/scripts/get-aspire-cli-pr.sh
+++ b/eng/scripts/get-aspire-cli-pr.sh
@@ -46,6 +46,11 @@ HIVE_ONLY=false
 SKIP_EXTENSION_INSTALL=false
 USE_INSIDERS=false
 SKIP_PATH=false
+UNINSTALL=false
+UNINSTALL_CHANNEL=""
+UNINSTALL_ALL=false
+UNINSTALL_YES=false
+REMOVE_SHARED_INSTALL=false
 HOST_OS="unset"
 
 # Function to show help
@@ -98,6 +103,11 @@ USAGE:
     --skip-extension.           Skip VS Code extension download and installation
     --use-insiders              Install extension to VS Code Insiders instead of VS Code
     --skip-path                 Do not add the install path to PATH environment variable (useful for portable installs)
+    --uninstall                 Clean up Aspire CLI state created by this PR script
+    --channel CHANNEL           Channel/hive label to clean up (defaults to pr-<PR_NUMBER> when supplied)
+    --all                       Clean pr-*, staging, and daily hives
+    --yes, -y                   Confirm uninstall without prompting
+    --remove-shared-install     Also remove shared ~/.aspire/bin plus bundle/version artifacts
     -v, --verbose               Enable verbose output
     -k, --keep-archive          Keep downloaded archive files after installation
     --dry-run                   Show what would be done without performing actions
@@ -158,7 +168,9 @@ parse_args() {
     fi
 
     # First argument can be a PR number, --run-id, or --local-dir for direct artifact installation
-    if [[ "$1" == "--run-id" || "$1" == "-r" ]]; then
+    if [[ "$1" == "--uninstall" ]]; then
+        PR_NUMBER=""
+    elif [[ "$1" == "--run-id" || "$1" == "-r" ]]; then
         # No PR number — install directly from workflow run ID
         PR_NUMBER=""
     elif [[ "$1" == "--local-dir" ]]; then
@@ -282,6 +294,31 @@ parse_args() {
                 SKIP_PATH=true
                 shift
                 ;;
+            --uninstall)
+                UNINSTALL=true
+                shift
+                ;;
+            --channel)
+                if [[ $# -lt 2 || -z "$2" ]]; then
+                    say_error "Option '$1' requires a non-empty value"
+                    say_info "Use --help for usage information."
+                    exit 1
+                fi
+                UNINSTALL_CHANNEL="$2"
+                shift 2
+                ;;
+            --all)
+                UNINSTALL_ALL=true
+                shift
+                ;;
+            --yes|-y)
+                UNINSTALL_YES=true
+                shift
+                ;;
+            --remove-shared-install)
+                REMOVE_SHARED_INSTALL=true
+                shift
+                ;;
             --dry-run)
                 DRY_RUN=true
                 shift
@@ -299,6 +336,120 @@ parse_args() {
     done
 }
 
+remove_path() {
+    local path="$1"
+    local description="${2:-$path}"
+
+    if [[ ! -e "$path" ]]; then
+        say_info "skipped: $path (does not exist)"
+        return 0
+    fi
+
+    if [[ "$DRY_RUN" == true ]]; then
+        say_info "[DRY RUN] would remove $description: $path"
+        return 0
+    fi
+
+    rm -rf "$path"
+    say_info "removed: $path"
+}
+
+remove_bundle_layout() {
+    local install_prefix="$1"
+    local bundle_path="$install_prefix/bundle"
+    local versions_root="$install_prefix/versions"
+
+    if [[ -L "$bundle_path" ]]; then
+        local target
+        target="$(readlink "$bundle_path")"
+        if [[ "$target" != /* ]]; then
+            target="$(cd "$(dirname "$bundle_path")" && pwd)/$target"
+        fi
+        case "$target" in
+            "$versions_root"/*)
+                remove_path "$target" "shared bundle version"
+                ;;
+        esac
+    fi
+
+    remove_path "$bundle_path" "shared bundle link"
+}
+
+# Reject channel names that contain path separators or `..` segments so
+# `$install_prefix/hives/$channel` cannot resolve outside `$install_prefix/hives`.
+# Mirrors validate_channel in get-aspire-cli.sh and the C# CliCleanupService.ValidateChannel.
+validate_channel() {
+    local channel="$1"
+    case "$channel" in
+        ""|*/*|*\\*|..|.|*/..|../*|*/../*)
+            say_error "Invalid channel name '$channel'."
+            return 1
+            ;;
+    esac
+    if [[ "$channel" == *".."* ]]; then
+        say_error "Invalid channel name '$channel'."
+        return 1
+    fi
+    return 0
+}
+
+run_uninstall() {
+    local install_prefix="$1"
+    local -a channels=()
+    if [[ "$UNINSTALL_ALL" == true ]]; then
+        if [[ -d "$install_prefix/hives" ]]; then
+            while IFS= read -r hive; do
+                local name
+                name="$(basename "$hive")"
+                if [[ "$name" == pr-* || "$name" == "staging" || "$name" == "daily" ]]; then
+                    channels+=("$name")
+                fi
+            done < <(find "$install_prefix/hives" -mindepth 1 -maxdepth 1 -type d | sort)
+        fi
+    else
+        local channel="$UNINSTALL_CHANNEL"
+        if [[ -z "$channel" && -n "$HIVE_LABEL" ]]; then
+            channel="$HIVE_LABEL"
+        elif [[ -z "$channel" && -n "$PR_NUMBER" ]]; then
+            channel="pr-$PR_NUMBER"
+        fi
+        if [[ -z "$channel" ]]; then
+            say_error "Uninstall requires a PR number, --channel, or --all when the channel cannot be inferred."
+            return 1
+        fi
+        if ! validate_channel "$channel"; then
+            return 1
+        fi
+        channels+=("$channel")
+    fi
+
+    if [[ "$DRY_RUN" != true && "$UNINSTALL_YES" != true ]]; then
+        say_error "Uninstall requires --yes unless --dry-run is specified."
+        return 1
+    fi
+
+    if [[ ${#channels[@]} -eq 0 ]]; then
+        say_info "No matching Aspire CLI cleanup targets were found."
+        return 0
+    fi
+
+    for channel in "${channels[@]}"; do
+        remove_path "$install_prefix/hives/$channel" "hive $channel"
+        if [[ "$channel" == pr-* ]]; then
+            remove_path "$install_prefix/dogfood/$channel" "dogfood install $channel"
+        fi
+    done
+
+    if [[ "$REMOVE_SHARED_INSTALL" == true ]]; then
+        remove_path "$install_prefix/bin/aspire" "shared script binary"
+        remove_path "$install_prefix/bin/aspire.exe" "shared script binary"
+        remove_path "$install_prefix/bin/.aspire-install.json" "shared script sidecar"
+        remove_bundle_layout "$install_prefix"
+    else
+        say_info "Shared script install artifacts were left in place. Pass --remove-shared-install to remove $install_prefix/bin/aspire and the matching bundle/versions layout."
+    fi
+}
+
 # =============================================================================
 # START: Shared code
 # =============================================================================
@@ -1436,7 +1587,7 @@ install_aspire_cli_from_binary() {
 
 # Computes the CLI install directory. PR installs are isolated under
 # <prefix>/dogfood/pr-<N>/bin; without PR_NUMBER, falls back to the shared
-# script-route bin dir.
+# script-source bin dir.
 compute_cli_install_dir() {
     if [[ -n "$PR_NUMBER" ]]; then
         printf '%s' "$INSTALL_PREFIX/dogfood/pr-$PR_NUMBER/bin"
@@ -1449,13 +1600,13 @@ compute_cli_install_dir() {
 # <install_prefix>/dogfood/pr-<N>/bin/.aspire-install.json. The sidecar marks
 # the install as PR-sourced so downstream consumers (e.g. 'aspire update')
 # know not to assume the stable script source. Per-RID archives produced
-# by eng/clipack are shared across routes and ship without a baked sidecar;
-# this write is the PR-route's authoritative author. If a future or
+# by eng/clipack are shared across sources and ship without a baked sidecar;
+# this write is the PR-source's authoritative author. If a future or
 # external archive ever smuggles a sidecar at the same path, this write
 # overwrites it by design. Under --dry-run the script is describe-but-do-
 # not-do: print the path it would write to and skip the filesystem mutation
 # so a real user's sidecar is never overwritten.
-write_pr_route_sidecar() {
+write_pr_source_sidecar() {
     local install_prefix="$1"
     local pr_number="$2"
 
@@ -1464,7 +1615,7 @@ write_pr_route_sidecar() {
     local sidecar_content='{"source":"pr"}'
 
     if [[ "$DRY_RUN" == true ]]; then
-        printf 'DRYRUN: would write route sidecar to: %s\n' "$sidecar_path"
+        printf 'DRYRUN: would write source sidecar to: %s\n' "$sidecar_path"
     else
         mkdir -p "$sidecar_dir"
         printf '%s\n' "$sidecar_content" > "$sidecar_path"
@@ -1513,8 +1664,8 @@ install_from_local_dir() {
 
     say_info "Installing from local directory: $local_dir"
 
-    # PR-route installs are isolated under <prefix>/dogfood/pr-<N>/bin so they
-    # don't collide with the script-route prefix or with other PR installs.
+    # PR-source installs are isolated under <prefix>/dogfood/pr-<N>/bin so they
+    # don't collide with the script-source prefix or with other PR installs.
     # Hives remain shared under <prefix>/hives/<label>/packages.
     local cli_install_dir
     cli_install_dir="$(compute_cli_install_dir)"
@@ -1620,7 +1771,7 @@ install_from_local_dir() {
     # PR installs from archives get a sidecar. --local-dir installs are unmanaged, and
     # dotnet-tool packages embed their own source=dotnet-tool sidecar.
     if [[ "$HIVE_ONLY" != true && "$INSTALL_MODE" == "archive" && -n "$PR_NUMBER" ]]; then
-        write_pr_route_sidecar "$INSTALL_PREFIX" "$PR_NUMBER"
+        write_pr_source_sidecar "$INSTALL_PREFIX" "$PR_NUMBER"
     fi
 
 }
@@ -1661,8 +1812,8 @@ download_and_install_from_pr() {
 
     say_info "Using workflow run https://github.com/${REPO}/actions/runs/$workflow_run_id"
 
-    # PR-route installs are isolated under <prefix>/dogfood/pr-<N>/bin so they
-    # don't collide with the script-route prefix or with other PR installs.
+    # PR-source installs are isolated under <prefix>/dogfood/pr-<N>/bin so they
+    # don't collide with the script-source prefix or with other PR installs.
     # Hives remain shared under <prefix>/hives/<label>/packages.
     local cli_install_dir
     cli_install_dir="$(compute_cli_install_dir)"
@@ -1781,10 +1932,10 @@ download_and_install_from_pr() {
         fi
     fi
 
-    # Write the PR-route sidecar only for installs from archives. Tool-mode packages
+    # Write the PR-source sidecar only for installs from archives. Tool-mode packages
     # carry their own source=dotnet-tool sidecar.
     if [[ "$HIVE_ONLY" != true && "$INSTALL_MODE" == "archive" && -n "$PR_NUMBER" ]]; then
-        write_pr_route_sidecar "$INSTALL_PREFIX" "$PR_NUMBER"
+        write_pr_source_sidecar "$INSTALL_PREFIX" "$PR_NUMBER"
     fi
 
 }
@@ -1842,11 +1993,6 @@ main() {
         exit 1
     fi
 
-    # Check gh dependency (not needed for --local-dir mode)
-    if [[ -z "$LOCAL_DIR" ]]; then
-        check_gh_dependency
-    fi
-
     # Set default install prefix if not provided
     if [[ -z "$INSTALL_PREFIX" ]]; then
         INSTALL_PREFIX="$HOME/.aspire"
@@ -1855,9 +2001,19 @@ main() {
         INSTALL_PREFIX_UNEXPANDED="$INSTALL_PREFIX"
     fi
 
+    if [[ "$UNINSTALL" == true ]]; then
+        run_uninstall "$INSTALL_PREFIX"
+        exit $?
+    fi
+
+    # Check gh dependency (not needed for --local-dir mode)
+    if [[ -z "$LOCAL_DIR" ]]; then
+        check_gh_dependency
+    fi
+
     # Set paths based on install prefix.
-    # PR-route installs go under $INSTALL_PREFIX/dogfood/pr-<N>/bin to isolate them from
-    # the script-route prefix and from other PR installs.
+    # PR-source installs go under $INSTALL_PREFIX/dogfood/pr-<N>/bin to isolate them from
+    # the script-source prefix and from other PR installs.
     if [[ -n "$PR_NUMBER" ]]; then
         cli_install_dir="$INSTALL_PREFIX/dogfood/pr-$PR_NUMBER/bin"
         INSTALL_PATH_UNEXPANDED="$INSTALL_PREFIX_UNEXPANDED/dogfood/pr-$PR_NUMBER/bin"
diff --git a/eng/scripts/get-aspire-cli.ps1 b/eng/scripts/get-aspire-cli.ps1
index a147298316e..8963017f85c 100755
--- a/eng/scripts/get-aspire-cli.ps1
+++ b/eng/scripts/get-aspire-cli.ps1
@@ -32,10 +32,34 @@ param(
     [Parameter(HelpMessage = "Do not add the install path to PATH environment variable (useful for portable installs)")]
     [switch]$SkipPath,
 
+    [Parameter(HelpMessage = "Clean up Aspire CLI state created by this script")]
+    [switch]$Uninstall,
+
+    [Parameter(HelpMessage = "Channel/hive label to clean up")]
+    [string]$Channel = "",
+
+    [Parameter(HelpMessage = "Clean pr-*, staging, and daily hives")]
+    [switch]$All,
+
+    [Parameter(HelpMessage = "Confirm uninstall without prompting")]
+    [Alias("y")]
+    [switch]$Yes,
+
+    [Parameter(HelpMessage = "Also remove shared ~/.aspire/bin plus bundle/version artifacts")]
+    [switch]$RemoveSharedInstall,
+
     [Parameter(HelpMessage = "Show help message")]
     [switch]$Help
 )
 
+# Capture whether -Quality was bound by the caller before any default-fill
+# logic runs. The uninstall path infers a channel from -Quality (e.g.
+# `release` -> `stable`) and must NOT do so when -Quality was filled in by
+# the install default, or `-Uninstall -Yes` with no other arguments would
+# silently delete `~/.aspire/hives/stable`. Mirrors QUALITY_EXPLICIT in
+# get-aspire-cli.sh.
+$Script:QualityExplicit = $PSBoundParameters.ContainsKey('Quality')
+
 # Global constants
 $Script:UserAgent = "get-aspire-cli.ps1/1.0"
 $Script:IsModernPowerShell = $PSVersionTable.PSVersion.Major -ge 6 -and $PSVersionTable.PSEdition -eq "Core"
@@ -788,6 +812,172 @@ function ConvertTo-ChannelName {
     }
 }
 
+function Remove-CleanupPath {
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Path,
+
+        [Parameter(Mandatory = $true)]
+        [string]$Description
+    )
+
+    if (-not (Test-Path -LiteralPath $Path)) {
+        Write-Message "skipped: $Path (does not exist)" -Level Info
+        return
+    }
+
+    if ($PSCmdlet.ShouldProcess($Path, "Remove $Description")) {
+        try {
+            # Without -ErrorAction Stop, Remove-Item failures (permission
+            # denied, file in use, etc.) are non-terminating errors. Without
+            # the explicit try/catch, execution would fall through to the
+            # "removed:" log line below, hiding the failure and producing a
+            # success-looking exit while the path is still on disk.
+            Remove-Item -LiteralPath $Path -Recurse -Force -ErrorAction Stop
+            Write-Message "removed: $Path" -Level Info
+        }
+        catch {
+            Write-Message "failed: $Path ($($_.Exception.Message))" -Level Error
+            throw
+        }
+    }
+    else {
+        Write-Message "What if: would remove ${Description}: $Path" -Level Info
+    }
+}
+
+# Reject channel names that contain path separators or '..' segments so
+# $aspireHome\hives\<channel> cannot resolve outside $aspireHome\hives.
+# Mirrors validate_channel in get-aspire-cli.sh and the C# CliCleanupService.ValidateChannel.
+function Test-UninstallChannel {
+    param([string]$ChannelName)
+    if ([string]::IsNullOrWhiteSpace($ChannelName)) { return $false }
+    if ($ChannelName.Contains('/') -or $ChannelName.Contains('\')) { return $false }
+    if ($ChannelName -eq '.' -or $ChannelName -eq '..') { return $false }
+    if ($ChannelName.Contains('..')) { return $false }
+    return $true
+}
+
+function Get-BundleVersionTarget {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$AspireHome
+    )
+
+    $bundlePath = Join-Path $AspireHome "bundle"
+    if (-not (Test-Path -LiteralPath $bundlePath)) {
+        return $null
+    }
+
+    # Get-Item without -ErrorAction Stop emits non-terminating errors on
+    # permission denied / IO failure, $bundleItem becomes $null, and the
+    # function returns $null. Remove-BundleLayout would then delete just the
+    # bundle symlink and silently strand the versions/<v>/ tree — the same
+    # silent-failure pattern Remove-CleanupPath was hardened against.
+    try {
+        $bundleItem = Get-Item -LiteralPath $bundlePath -Force -ErrorAction Stop
+    }
+    catch [System.Management.Automation.ItemNotFoundException] {
+        # TOCTOU between Test-Path and Get-Item — bundle just disappeared. No-op.
+        return $null
+    }
+    if (-not $bundleItem.LinkType -or -not $bundleItem.Target) {
+        return $null
+    }
+
+    $targetPath = $bundleItem.Target
+    if (-not [System.IO.Path]::IsPathRooted($targetPath)) {
+        $targetPath = [System.IO.Path]::GetFullPath((Join-Path (Split-Path -Parent $bundlePath) $targetPath))
+    }
+
+    $versionsRoot = [System.IO.Path]::GetFullPath((Join-Path $AspireHome "versions"))
+    $normalizedTarget = [System.IO.Path]::GetFullPath($targetPath)
+    if ($normalizedTarget.StartsWith($versionsRoot + [System.IO.Path]::DirectorySeparatorChar, [StringComparison]::Ordinal)) {
+        return $normalizedTarget
+    }
+
+    return $null
+}
+
+function Remove-BundleLayout {
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$AspireHome
+    )
+
+    $versionTarget = Get-BundleVersionTarget -AspireHome $AspireHome
+    if ($versionTarget) {
+        Remove-CleanupPath -Path $versionTarget -Description "shared bundle version"
+    }
+
+    Remove-CleanupPath -Path (Join-Path $AspireHome "bundle") -Description "shared bundle link"
+}
+
+function Start-AspireCliUninstall {
+    [CmdletBinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$ResolvedInstallPath
+    )
+
+    $aspireHome = Split-Path -Parent $ResolvedInstallPath
+    $channels = @()
+    if ($All) {
+        $hivesRoot = Join-Path $aspireHome "hives"
+        if (Test-Path -LiteralPath $hivesRoot -PathType Container) {
+            $channels = Get-ChildItem -LiteralPath $hivesRoot -Directory |
+                Where-Object { $_.Name -like "pr-*" -or $_.Name -eq "staging" -or $_.Name -eq "daily" } |
+                Sort-Object Name |
+                ForEach-Object { $_.Name }
+        }
+    }
+    else {
+        $targetChannel = $Channel
+        # Only infer the channel from -Quality when the user passed -Quality
+        # explicitly; the install-default quality must not silently target
+        # ~/.aspire/hives/stable for `-Uninstall -Yes` with no other arguments.
+        if ([string]::IsNullOrWhiteSpace($targetChannel) -and $Script:QualityExplicit -and -not [string]::IsNullOrWhiteSpace($Quality)) {
+            $targetChannel = ConvertTo-ChannelName -Quality $Quality
+        }
+        if ([string]::IsNullOrWhiteSpace($targetChannel)) {
+            throw "Uninstall requires -Channel or -All when the channel cannot be inferred."
+        }
+        if (-not (Test-UninstallChannel -ChannelName $targetChannel)) {
+            throw "Invalid -Channel value '$targetChannel'. Channel names must not contain path separators or '..'."
+        }
+        $channels = @($targetChannel)
+    }
+
+    if (-not $WhatIfPreference -and -not $Yes) {
+        throw "Uninstall requires -Yes unless -WhatIf is specified."
+    }
+
+    if ($channels.Count -eq 0) {
+        Write-Message "No matching Aspire CLI cleanup targets were found." -Level Info
+        return
+    }
+
+    foreach ($targetChannel in $channels) {
+        Remove-CleanupPath -Path (Join-Path (Join-Path $aspireHome "hives") $targetChannel) -Description "hive $targetChannel"
+        if ($targetChannel.StartsWith("pr-", [StringComparison]::Ordinal)) {
+            Remove-CleanupPath -Path (Join-Path (Join-Path $aspireHome "dogfood") $targetChannel) -Description "dogfood install $targetChannel"
+        }
+    }
+
+    if ($RemoveSharedInstall) {
+        Remove-CleanupPath -Path (Join-Path $ResolvedInstallPath "aspire") -Description "shared script binary"
+        Remove-CleanupPath -Path (Join-Path $ResolvedInstallPath "aspire.exe") -Description "shared script binary"
+        Remove-CleanupPath -Path (Join-Path $ResolvedInstallPath ".aspire-install.json") -Description "shared script sidecar"
+        Remove-BundleLayout -AspireHome $aspireHome
+    }
+    else {
+        Write-Message "Shared script install artifacts were left in place. Pass -RemoveSharedInstall to remove $ResolvedInstallPath/aspire and the matching bundle/versions layout." -Level Info
+    }
+}
+
 # Simplified installation path determination
 function Get-InstallPath {
     [CmdletBinding()]
@@ -1180,16 +1370,16 @@ function Install-AspireCli {
             Write-Message "Aspire CLI successfully installed to: $cliPath" -Level Success
         }
 
-        # Write the script-route install-source sidecar next to the binary.
+        # Write the script-source install-source sidecar next to the binary.
         # Under -WhatIf, print the target path and skip the write.
-        # Authorship contract: docs/specs/install-routes.md.
+        # Authorship contract: docs/specs/install-sources.md.
         $sidecarPath = Join-Path $InstallPath '.aspire-install.json'
-        if ($PSCmdlet.ShouldProcess($sidecarPath, "Write route sidecar")) {
+        if ($PSCmdlet.ShouldProcess($sidecarPath, "Write source sidecar")) {
             [System.IO.Directory]::CreateDirectory($InstallPath) | Out-Null
             [System.IO.File]::WriteAllText($sidecarPath, "{""source"":""script""}`n")
         }
         else {
-            Write-Host "What if: Route sidecar would be written to: $sidecarPath"
+            Write-Host "What if: Source sidecar would be written to: $sidecarPath"
         }
 
         # Download and install VS Code extension if requested
@@ -1269,6 +1459,11 @@ function Start-AspireCliInstallation {
         # Determine the installation path
         $resolvedInstallPath = Get-InstallPath -InstallPath $InstallPath
 
+        if ($Uninstall) {
+            Start-AspireCliUninstall -ResolvedInstallPath $resolvedInstallPath
+            return 0
+        }
+
         # Ensure the installation directory exists
         if (-not (Test-Path $resolvedInstallPath)) {
             Write-Message "Creating installation directory: $resolvedInstallPath" -Level Info
diff --git a/eng/scripts/get-aspire-cli.sh b/eng/scripts/get-aspire-cli.sh
index ae83d63516a..c87f23f5820 100755
--- a/eng/scripts/get-aspire-cli.sh
+++ b/eng/scripts/get-aspire-cli.sh
@@ -28,6 +28,12 @@ DRY_RUN=false
 INSTALL_EXTENSION=false
 USE_INSIDERS=false
 SKIP_PATH=false
+UNINSTALL=false
+UNINSTALL_CHANNEL=""
+UNINSTALL_ALL=false
+UNINSTALL_YES=false
+REMOVE_SHARED_INSTALL=false
+QUALITY_EXPLICIT=false
 DEFAULT_QUALITY="release"
 EXTENSION_ARTIFACT_NAME="aspire-vscode.vsix.zip"
 
@@ -59,6 +65,11 @@ USAGE:
     --install-extension         Install VS Code extension along with the CLI
     --use-insiders              Install extension to VS Code Insiders instead of VS Code (requires --install-extension)
     --skip-path                 Do not add the install path to PATH environment variable (useful for portable installs)
+    --uninstall                 Clean up Aspire CLI state created by this script
+    --channel CHANNEL           Channel/hive label to clean up (stable, staging, daily, pr-<N>, or custom)
+    --all                       Clean pr-*, staging, and daily hives
+    --yes, -y                   Confirm uninstall without prompting
+    --remove-shared-install     Also remove ~/.aspire/bin/aspire plus bundle/version artifacts
     -k, --keep-archive          Keep downloaded archive files and temporary directory after installation
     --dry-run                   Show what would be done without actually performing any actions
     -v, --verbose               Enable verbose output
@@ -112,6 +123,7 @@ parse_args() {
                     exit 1
                 fi
                 QUALITY="$2"
+                QUALITY_EXPLICIT=true
                 shift 2
                 ;;
             --os)
@@ -144,6 +156,31 @@ parse_args() {
                 SKIP_PATH=true
                 shift
                 ;;
+            --uninstall)
+                UNINSTALL=true
+                shift
+                ;;
+            --channel)
+                if [[ $# -lt 2 || -z "$2" ]]; then
+                    say_error "Option '$1' requires a non-empty value"
+                    say_info "Use --help for usage information."
+                    exit 1
+                fi
+                UNINSTALL_CHANNEL="$2"
+                shift 2
+                ;;
+            --all)
+                UNINSTALL_ALL=true
+                shift
+                ;;
+            --yes|-y)
+                UNINSTALL_YES=true
+                shift
+                ;;
+            --remove-shared-install)
+                REMOVE_SHARED_INSTALL=true
+                shift
+                ;;
             -k|--keep-archive)
                 KEEP_ARCHIVE=true
                 shift
@@ -169,6 +206,129 @@ parse_args() {
     done
 }
 
+quality_to_channel() {
+    case "$1" in
+        release) printf "stable" ;;
+        staging) printf "staging" ;;
+        dev) printf "daily" ;;
+        *) printf "%s" "$1" ;;
+    esac
+}
+
+remove_path() {
+    local path="$1"
+    local description="${2:-$path}"
+
+    if [[ ! -e "$path" ]]; then
+        say_info "skipped: $path (does not exist)"
+        return 0
+    fi
+
+    if [[ "$DRY_RUN" == true ]]; then
+        say_info "[DRY RUN] would remove $description: $path"
+        return 0
+    fi
+
+    rm -rf "$path"
+    say_info "removed: $path"
+}
+
+remove_bundle_layout() {
+    local aspire_home="$1"
+    local bundle_path="$aspire_home/bundle"
+    local versions_root="$aspire_home/versions"
+
+    if [[ -L "$bundle_path" ]]; then
+        local target
+        target="$(readlink "$bundle_path")"
+        if [[ "$target" != /* ]]; then
+            target="$(cd "$(dirname "$bundle_path")" && pwd)/$target"
+        fi
+        case "$target" in
+            "$versions_root"/*)
+                remove_path "$target" "shared bundle version"
+                ;;
+        esac
+    fi
+
+    remove_path "$bundle_path" "shared bundle link"
+}
+
+# Reject channel names that contain path separators or `..` segments so
+# `aspire_home/hives/$channel` cannot resolve outside `aspire_home/hives`.
+validate_channel() {
+    local channel="$1"
+    case "$channel" in
+        ""|*/*|*\\*|..|.|*/..|../*|*/../*)
+            say_error "Invalid channel name '$channel'."
+            return 1
+            ;;
+    esac
+    if [[ "$channel" == *".."* ]]; then
+        say_error "Invalid channel name '$channel'."
+        return 1
+    fi
+    return 0
+}
+
+run_uninstall() {
+    local install_path="$1"
+    local aspire_home
+    aspire_home="$(dirname "$install_path")"
+
+    local -a channels=()
+    if [[ "$UNINSTALL_ALL" == true ]]; then
+        if [[ -d "$aspire_home/hives" ]]; then
+            while IFS= read -r hive; do
+                local name
+                name="$(basename "$hive")"
+                if [[ "$name" == pr-* || "$name" == "staging" || "$name" == "daily" ]]; then
+                    channels+=("$name")
+                fi
+            done < <(find "$aspire_home/hives" -mindepth 1 -maxdepth 1 -type d | sort)
+        fi
+    else
+        local channel="$UNINSTALL_CHANNEL"
+        # Only infer the channel from --quality when the user passed --quality
+        # explicitly; the default quality must not silently target ~/.aspire/hives/stable.
+        if [[ -z "$channel" && "$QUALITY_EXPLICIT" == true && -n "$QUALITY" ]]; then
+            channel="$(quality_to_channel "$QUALITY")"
+        fi
+        if [[ -z "$channel" ]]; then
+            say_error "Uninstall requires --channel or --all when the channel cannot be inferred."
+            return 1
+        fi
+        validate_channel "$channel" || return 1
+        channels+=("$channel")
+    fi
+
+    if [[ "$DRY_RUN" != true && "$UNINSTALL_YES" != true ]]; then
+        say_error "Uninstall requires --yes unless --dry-run is specified."
+        return 1
+    fi
+
+    if [[ ${#channels[@]} -eq 0 ]]; then
+        say_info "No matching Aspire CLI cleanup targets were found."
+        return 0
+    fi
+
+    for channel in "${channels[@]}"; do
+        remove_path "$aspire_home/hives/$channel" "hive $channel"
+        if [[ "$channel" == pr-* ]]; then
+            remove_path "$aspire_home/dogfood/$channel" "dogfood install $channel"
+        fi
+    done
+
+    if [[ "$REMOVE_SHARED_INSTALL" == true ]]; then
+        remove_path "$install_path/aspire" "shared script binary"
+        remove_path "$install_path/aspire.exe" "shared script binary"
+        remove_path "$install_path/.aspire-install.json" "shared script sidecar"
+        remove_bundle_layout "$aspire_home"
+    else
+        say_info "Shared script install artifacts were left in place. Pass --remove-shared-install to remove $install_path/aspire and the matching bundle/versions layout."
+    fi
+}
+
 # Function for verbose logging
 say_verbose() {
     if [[ "$VERBOSE" == true ]]; then
@@ -1019,6 +1179,11 @@ main() {
         INSTALL_PATH_UNEXPANDED="$INSTALL_PATH"
     fi
 
+    if [[ "$UNINSTALL" == true ]]; then
+        run_uninstall "$INSTALL_PATH"
+        exit $?
+    fi
+
     # Create a temporary directory for downloads
     if [[ "$DRY_RUN" == true ]]; then
         temp_dir="/tmp/aspire-cli-dry-run"
@@ -1053,13 +1218,13 @@ main() {
         exit 1
     fi
 
-    # Write the script-route install-source sidecar next to the binary.
+    # Write the script-source install-source sidecar next to the binary.
     # Under --dry-run, print the target path and skip the write.
-    # Authorship contract: docs/specs/install-routes.md.
+    # Authorship contract: docs/specs/install-sources.md.
     local sidecar_path
     sidecar_path="$INSTALL_PATH/.aspire-install.json"
     if [[ "$DRY_RUN" == true ]]; then
-        printf 'DRYRUN: would write route sidecar to: %s\n' "$sidecar_path"
+        printf 'DRYRUN: would write source sidecar to: %s\n' "$sidecar_path"
     else
         mkdir -p "$INSTALL_PATH"
         printf '{"source":"script"}\n' > "$sidecar_path"
diff --git a/eng/scripts/verify-cli-archive.ps1 b/eng/scripts/verify-cli-archive.ps1
index 370b8319fcb..13b6c0be96c 100644
--- a/eng/scripts/verify-cli-archive.ps1
+++ b/eng/scripts/verify-cli-archive.ps1
@@ -6,7 +6,7 @@
     This script:
     1. Cleans ~/.aspire to ensure no stale state
     2. Extracts the CLI archive to a temp location
-    3. Verifies the archive shape contains the native CLI payload and no install-route sidecar
+    3. Verifies the archive shape contains the native CLI payload and no install-source sidecar
     4. Runs 'aspire --version' to validate the binary executes
     5. Runs 'aspire new aspire-starter' to test C# starter creation
     6. Cleans up temp directories
@@ -96,8 +96,8 @@ function Get-ArchiveRoot {
 }
 
 function Test-ArchiveSidecar {
-    # Per-RID CLI archives must ship sidecar-free; each install route writes
-    # its own .aspire-install.json. See docs/specs/install-routes.md.
+    # Per-RID CLI archives must ship sidecar-free; each install source writes
+    # its own .aspire-install.json. See docs/specs/install-sources.md.
     param(
         [Parameter(Mandatory = $true)][string]$ExtractDir,
         [Parameter(Mandatory = $true)][string]$ArchiveFileName
@@ -112,9 +112,9 @@ function Test-ArchiveSidecar {
     $strays = Get-ChildItem -Path $ExtractDir -Recurse -File -Filter '.aspire-install.json' -Force -ErrorAction SilentlyContinue
     if ($strays) {
         $strayPaths = $strays | ForEach-Object { $_.FullName.Substring($ExtractDir.Length + 1).Replace('\', '/') }
-        throw "$ridFamily-* archive '$ArchiveFileName' must not contain '.aspire-install.json' (per-RID archives are shared across install routes; each route authors its own sidecar after extraction). Found: $($strayPaths -join ', ')"
+        throw "$ridFamily-* archive '$ArchiveFileName' must not contain '.aspire-install.json' (per-RID archives are shared across install sources; each source authors its own sidecar after extraction). Found: $($strayPaths -join ', ')"
     }
-    Write-Step "$ridFamily-* archive correctly omits the install-route sidecar."
+    Write-Step "$ridFamily-* archive correctly omits the install-source sidecar."
 }
 
 function Test-CSharpStarterProject {
diff --git a/eng/scripts/verify-cli-tool-nupkg.ps1 b/eng/scripts/verify-cli-tool-nupkg.ps1
index 05631987e78..dc5fd412074 100644
--- a/eng/scripts/verify-cli-tool-nupkg.ps1
+++ b/eng/scripts/verify-cli-tool-nupkg.ps1
@@ -226,7 +226,7 @@ try {
     }
 
     # The RID-specific tool nupkg is always installed via `dotnet tool install -g`.
-    # The sidecar's source must pin to 'dotnet-tool' so the CLI can route
+    # The sidecar's source must pin to 'dotnet-tool' so the CLI can source
     # `aspire update --self` to the correct delegating command. Other source
     # values would mis-identify the install and break self-update.
     if ([string]$sidecarJson.source -ne 'dotnet-tool') {
diff --git a/localhive.ps1 b/localhive.ps1
index bdea8c63a36..cd4ba8ec2fb 100644
--- a/localhive.ps1
+++ b/localhive.ps1
@@ -490,10 +490,10 @@ if (-not $SkipCli) {
       throw
     }
 
-    # Stamp the install-route sidecar so `aspire info` / `aspire uninstall`
+    # Stamp the install-source sidecar so install discovery
     # can identify this binary as a locally-built (`localhive`) install.
-    # The format matches docs/specs/install-routes.md exactly; localhive
-    # shares the script-route layout (binary under <prefix>/bin/, bundle
+    # The format matches docs/specs/install-sources.md exactly; localhive
+    # shares the script-source layout (binary under <prefix>/bin/, bundle
     # extracted at parent-of-bin).
     $sidecarPath = Join-Path $cliBinDir ".aspire-install.json"
     Set-Content -LiteralPath $sidecarPath -Value '{"source":"localhive"}' -Encoding UTF8 -NoNewline
@@ -526,9 +526,9 @@ if ($Archive) {
     # Compress-Archive. Compress-Archive enumerates inputs via the PowerShell
     # provider, which on non-Windows hosts treats files whose name starts with
     # '.' as hidden and excludes them from `<dir>/*` wildcard expansion. The
-    # portable layout includes bin/.aspire-install.json — the localhive route
-    # sidecar that `aspire doctor` and route-aware Aspire-home selection rely
-    # on (see docs/specs/install-routes.md) — and silently dropping it from
+    # portable layout includes bin/.aspire-install.json — the localhive source
+    # sidecar that install discovery and source-aware Aspire-home selection rely
+    # on (see docs/specs/install-sources.md) — and silently dropping it from
     # win-* zips built on Linux/macOS would produce sidecar-less installs on
     # the target machine. ZipFile walks the filesystem directly and includes
     # dotfiles unconditionally.
@@ -559,7 +559,7 @@ if ($Archive) {
         $zip.Dispose()
       }
       if (-not $hasSidecar) {
-        throw "Archive '$archivePath' is missing the install-route sidecar entry '$sidecarEntryName'. The zip creation path is dropping hidden files."
+        throw "Archive '$archivePath' is missing the install-source sidecar entry '$sidecarEntryName'. The zip creation path is dropping hidden files."
       }
     }
   } else {
diff --git a/localhive.sh b/localhive.sh
index 7f0dcff390c..ff8b5faa3f6 100755
--- a/localhive.sh
+++ b/localhive.sh
@@ -466,10 +466,10 @@ if [[ $SKIP_CLI -eq 0 ]]; then
       exit 1
     fi
 
-    # Stamp the install-route sidecar so `aspire info` / `aspire uninstall`
+    # Stamp the install-source sidecar so install discovery
     # can identify this binary as a locally-built (`localhive`) install.
-    # The format matches docs/specs/install-routes.md exactly; localhive
-    # shares the script-route layout (binary under <prefix>/bin/, bundle
+    # The format matches docs/specs/install-sources.md exactly; localhive
+    # shares the script-source layout (binary under <prefix>/bin/, bundle
     # extracted at parent-of-bin).
     printf '%s' '{"source":"localhive"}' > "$CLI_BIN_DIR/.aspire-install.json"
 
diff --git a/src/Aspire.Cli/Acquisition/HiveEnumerator.cs b/src/Aspire.Cli/Acquisition/HiveEnumerator.cs
new file mode 100644
index 00000000000..339cb68c708
--- /dev/null
+++ b/src/Aspire.Cli/Acquisition/HiveEnumerator.cs
@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Aspire.Cli.Acquisition;
+
+/// <summary>
+/// Read-only enumeration of Aspire CLI package hives under
+/// <c>$HOME/.aspire/hives/&lt;channel&gt;</c>. Hives are populated by install
+/// scripts and read by <c>aspire installs list</c> to surface orphan hives.
+/// </summary>
+internal sealed class HiveEnumerator(CliExecutionContext executionContext)
+{
+    public IReadOnlyList<HiveInfo> GetHives()
+    {
+        if (!executionContext.HivesDirectory.Exists)
+        {
+            return [];
+        }
+
+        return executionContext.HivesDirectory
+            .EnumerateDirectories()
+            .OrderBy(d => d.Name, StringComparer.Ordinal)
+            .Select(d => new HiveInfo(d.Name, d.FullName))
+            .ToList();
+    }
+
+    public string GetHivePath(string channel)
+        => GetHiveDirectory(channel).FullName;
+
+    public bool HasHive(string channel)
+        => GetHiveDirectory(channel).Exists;
+
+    private DirectoryInfo GetHiveDirectory(string channel)
+        => new(Path.Combine(executionContext.HivesDirectory.FullName, channel));
+}
+
+internal sealed record HiveInfo(string Name, string Path);
diff --git a/src/Aspire.Cli/Acquisition/IInstallSidecarReader.cs b/src/Aspire.Cli/Acquisition/IInstallSidecarReader.cs
index 17f03aa5b43..81629336788 100644
--- a/src/Aspire.Cli/Acquisition/IInstallSidecarReader.cs
+++ b/src/Aspire.Cli/Acquisition/IInstallSidecarReader.cs
@@ -4,7 +4,7 @@
 namespace Aspire.Cli.Acquisition;
 
 /// <summary>
-/// Result of reading an install-route sidecar from a binary directory.
+/// Result of reading an install-source sidecar from a binary directory.
 /// </summary>
 /// <param name="SidecarPath">
 /// Absolute path of the sidecar file that was read. Always populated for
@@ -12,8 +12,8 @@ namespace Aspire.Cli.Acquisition;
 /// resolved sidecar path.
 /// </param>
 /// <param name="Source">
-/// Parsed install route. <see cref="InstallSource.Unknown"/> when the sidecar
-/// exists but its <c>source</c> field does not match a known route.
+/// Parsed install source. <see cref="InstallSource.Unknown"/> when the sidecar
+/// exists but its <c>source</c> field does not match a known source.
 /// </param>
 /// <param name="RawSource">
 /// The literal <c>source</c> string from the sidecar (may be a value not yet
@@ -23,7 +23,7 @@ namespace Aspire.Cli.Acquisition;
 internal sealed record InstallSidecarInfo(string SidecarPath, InstallSource Source, string RawSource);
 
 /// <summary>
-/// Result of attempting to read an install-route sidecar.
+/// Result of attempting to read an install-source sidecar.
 /// </summary>
 /// <param name="SidecarPath">
 /// Path of the sidecar file that was considered. Absolute when the binary
@@ -46,14 +46,13 @@ public sealed record Invalid(string Path, string Reason) : InstallSidecarReadRes
 }
 
 /// <summary>
-/// Reads the install-route sidecar (<c>.aspire-install.json</c>) that an
-/// install route writes next to the CLI binary. The sidecar identifies the
-/// installation route so callers (e.g. <c>BundleService</c>,
-/// <c>aspire doctor</c>, <c>aspire uninstall</c>) can branch behavior without
-/// path-shape heuristics.
+/// Reads the install-source sidecar (<c>.aspire-install.json</c>) that an
+/// install source writes next to the CLI binary. The sidecar identifies the
+/// installation source so callers (e.g. <c>BundleService</c>,
+/// <c>aspire installs</c>) can branch behavior without path-shape heuristics.
 /// </summary>
 /// <remarks>
-/// See <c>docs/specs/install-routes.md</c> for the file contract. The reader
+/// See <c>docs/specs/install-sources.md</c> for the file contract. The reader
 /// is AOT-safe: parsing uses <c>JsonDocument</c> instead of reflection-based
 /// deserialization.
 /// </remarks>
diff --git a/src/Aspire.Cli/Acquisition/IInstallationDiscovery.cs b/src/Aspire.Cli/Acquisition/IInstallationDiscovery.cs
index 99e86a18295..41e0b3346b9 100644
--- a/src/Aspire.Cli/Acquisition/IInstallationDiscovery.cs
+++ b/src/Aspire.Cli/Acquisition/IInstallationDiscovery.cs
@@ -4,7 +4,7 @@
 namespace Aspire.Cli.Acquisition;
 
 /// <summary>
-/// Discovers Aspire CLI installations on this machine for <c>aspire doctor</c>.
+/// Discovers Aspire CLI installations on this machine for <c>aspire installs</c>.
 /// </summary>
 /// <remarks>
 /// Two modes:
@@ -12,13 +12,13 @@ namespace Aspire.Cli.Acquisition;
 ///   <item>
 ///     <description><see cref="DescribeSelf"/> — cheap path that describes
 ///     only the currently running CLI. No process spawning, no filesystem
-///     walks. Used by the hidden <c>aspire doctor --self</c> peer-probe path.</description>
+///     walks. Used by the hidden <c>aspire installs --self</c> peer-probe path.</description>
 ///   </item>
 ///   <item>
 ///     <description><see cref="DiscoverAllAsync"/> — walks <c>$PATH</c> plus
 ///     well-known install prefixes and asks each peer with required install
-///     metadata to self-describe via a child <c>aspire doctor --self --format json</c>
-///     call. Used by the default <c>aspire doctor</c> path.</description>
+///     metadata to self-describe via a child <c>aspire installs --self --format json</c>
+///     call. Used by <c>aspire installs list</c>.</description>
 ///   </item>
 /// </list>
 /// </remarks>
@@ -27,7 +27,7 @@ internal interface IInstallationDiscovery
     /// <summary>
     /// Describes the currently running CLI. The result always has
     /// <see cref="InstallationInfo.Status"/> = <c>ok</c> with version /
-    /// channel / route populated from in-process readers.
+    /// channel / source populated from in-process readers.
     /// </summary>
     InstallationInfo DescribeSelf();
 
diff --git a/src/Aspire.Cli/Acquisition/IPeerInstallProbe.cs b/src/Aspire.Cli/Acquisition/IPeerInstallProbe.cs
index 4f851472f41..5c4157a425e 100644
--- a/src/Aspire.Cli/Acquisition/IPeerInstallProbe.cs
+++ b/src/Aspire.Cli/Acquisition/IPeerInstallProbe.cs
@@ -5,7 +5,7 @@ namespace Aspire.Cli.Acquisition;
 
 /// <summary>
 /// Result of asking a peer Aspire CLI binary to self-describe via
-/// <c>&lt;peer&gt; doctor --self --format json</c>.
+/// <c>&lt;peer&gt; installs --self --format json</c>.
 /// </summary>
 internal abstract record PeerProbeResult
 {
@@ -20,12 +20,12 @@ public sealed record Failed(string Reason) : PeerProbeResult;
 /// Spawns a peer Aspire CLI binary to ask it to describe itself.
 /// Implementations MUST enforce a process-wide timeout, a stdout byte cap,
 /// and kill the entire process tree on timeout so a hung or runaway peer
-/// can't survive past <c>aspire doctor</c>'s lifetime.
+/// can't survive past <c>aspire installs list</c>'s lifetime.
 /// </summary>
 internal interface IPeerInstallProbe
 {
     /// <summary>
-    /// Runs <c><paramref name="binaryPath"/> doctor --self --format json</c> and
+    /// Runs <c><paramref name="binaryPath"/> installs --self --format json</c> and
     /// returns either the parsed <see cref="InstallationInfo"/> or a failure
     /// reason. <c>--self</c> bounds the peer to describing only itself so the
     /// probe does not recursively trigger a discovery walk inside the peer.
diff --git a/src/Aspire.Cli/Acquisition/InstallSidecarReader.cs b/src/Aspire.Cli/Acquisition/InstallSidecarReader.cs
index 990c747f996..ead38ec0eee 100644
--- a/src/Aspire.Cli/Acquisition/InstallSidecarReader.cs
+++ b/src/Aspire.Cli/Acquisition/InstallSidecarReader.cs
@@ -24,9 +24,9 @@ public InstallSidecarReader(ILogger<InstallSidecarReader>? logger = null)
     }
 
     /// <summary>
-    /// Well-known file name of the sidecar that each install route writes
+    /// Well-known file name of the sidecar that each install source writes
     /// next to the CLI binary. Matches the contract in
-    /// <c>docs/specs/install-routes.md</c>.
+    /// <c>docs/specs/install-sources.md</c>.
     /// </summary>
     public const string SidecarFileName = ".aspire-install.json";
 
diff --git a/src/Aspire.Cli/Acquisition/InstallSource.cs b/src/Aspire.Cli/Acquisition/InstallSource.cs
index f6f10830b53..605c8306acd 100644
--- a/src/Aspire.Cli/Acquisition/InstallSource.cs
+++ b/src/Aspire.Cli/Acquisition/InstallSource.cs
@@ -4,16 +4,16 @@
 namespace Aspire.Cli.Acquisition;
 
 /// <summary>
-/// Identifies the installation route that placed the running CLI binary.
+/// Identifies the installation source that placed the running CLI binary.
 /// The value is read from the <c>source</c> field of the
 /// <c>.aspire-install.json</c> sidecar that sits next to the binary.
-/// See <c>docs/specs/install-routes.md</c>.
+/// See <c>docs/specs/install-sources.md</c>.
 /// </summary>
 internal enum InstallSource
 {
     /// <summary>
     /// No sidecar was found, or the sidecar contained a value that does not
-    /// match any known route. Treated as legacy / pre-sidecar by callers.
+    /// match any known source. Treated as legacy / pre-sidecar by callers.
     /// </summary>
     Unknown = 0,
 
@@ -27,7 +27,7 @@ internal enum InstallSource
     Winget,
 
     /// <summary>Homebrew cask.</summary>
-    Brew,
+    Homebrew,
 
     /// <summary>.NET global tool (<c>dotnet tool install -g Aspire.Cli</c>).</summary>
     DotnetTool,
@@ -42,7 +42,7 @@ internal enum InstallSource
 /// </summary>
 internal static class InstallSourceExtensions
 {
-    // Wire strings — these match the contract in docs/specs/install-routes.md
+    // Wire strings — these match the contract in docs/specs/install-sources.md
     // exactly. They are kebab-case strings consumed by both the installer
     // scripts and BundleService.ComputeDefaultExtractDir.
     internal const string ScriptWire = "script";
@@ -65,7 +65,7 @@ public static InstallSource ParseInstallSource(string? raw)
             ScriptWire => InstallSource.Script,
             PrWire => InstallSource.Pr,
             WingetWire => InstallSource.Winget,
-            BrewWire => InstallSource.Brew,
+            BrewWire => InstallSource.Homebrew,
             DotnetToolWire => InstallSource.DotnetTool,
             LocalHiveWire => InstallSource.LocalHive,
             _ => InstallSource.Unknown,
@@ -84,7 +84,7 @@ public static InstallSource ParseInstallSource(string? raw)
             InstallSource.Script => ScriptWire,
             InstallSource.Pr => PrWire,
             InstallSource.Winget => WingetWire,
-            InstallSource.Brew => BrewWire,
+            InstallSource.Homebrew => BrewWire,
             InstallSource.DotnetTool => DotnetToolWire,
             InstallSource.LocalHive => LocalHiveWire,
             _ => null,
diff --git a/src/Aspire.Cli/Acquisition/InstallationCandidateSources.cs b/src/Aspire.Cli/Acquisition/InstallationCandidateSources.cs
index d9a573a778b..c413237d2a6 100644
--- a/src/Aspire.Cli/Acquisition/InstallationCandidateSources.cs
+++ b/src/Aspire.Cli/Acquisition/InstallationCandidateSources.cs
@@ -130,7 +130,7 @@ internal sealed class DotnetToolStoreInstallationCandidateSource : IInstallation
     // Reparse points (symlinks / junctions) are skipped so a symlink cycle anywhere
     // under the store cannot make `Directory.EnumerateFiles` walk indefinitely. The
     // legitimate tool-store layout contains no symlinks, so this loses nothing real
-    // and removes a self-DoS surface from `aspire doctor` discovery.
+    // and removes a self-DoS surface from `aspire installs list` discovery.
     private static readonly EnumerationOptions s_enumerationOptions = new()
     {
         RecurseSubdirectories = true,
diff --git a/src/Aspire.Cli/Acquisition/InstallationDiscovery.cs b/src/Aspire.Cli/Acquisition/InstallationDiscovery.cs
index 49f2f6cca3e..79530213095 100644
--- a/src/Aspire.Cli/Acquisition/InstallationDiscovery.cs
+++ b/src/Aspire.Cli/Acquisition/InstallationDiscovery.cs
@@ -11,7 +11,7 @@ namespace Aspire.Cli.Acquisition;
 /// Default <see cref="IInstallationDiscovery"/>. The self-describe path
 /// composes data already available in-process (channel from
 /// <see cref="IIdentityChannelReader"/>, version from
-/// <see cref="VersionHelper.GetDefaultTemplateVersion"/>, route from the
+/// <see cref="VersionHelper.GetDefaultTemplateVersion"/>, source from the
 /// running binary's sidecar) so it is cheap and side-effect-free.
 /// </summary>
 /// <remarks>
@@ -78,10 +78,10 @@ private InstallationInfo DescribeSelf(string? processPath, IReadOnlyList<Install
         // Use the wire string from the parsed source so callers see the same
         // identifier the install scripts wrote, not the C# enum name. For
         // sidecars with an unrecognized source value we surface the raw
-        // string so users see "(unknown: future-route)" rather than nothing.
-        // Route through the shared helper so an empty RawSource collapses to
+        // string so users see "(unknown: future-source)" rather than nothing.
+        // Funnel through the shared helper so an empty RawSource collapses to
         // null and the JSON shape of `--self` matches the full discovery walk.
-        var route = sidecar is not null ? GetRouteFromSidecar(sidecar) : null;
+        var source = sidecar is not null ? GetSourceFromSidecar(sidecar) : null;
 
         return new InstallationInfo
         {
@@ -95,7 +95,7 @@ private InstallationInfo DescribeSelf(string? processPath, IReadOnlyList<Install
             CanonicalPath = canonicalPath,
             Version = VersionHelper.GetDefaultTemplateVersion(),
             Channel = TryReadChannel(),
-            Route = route,
+            Source = source,
             PathStatus = pathStatus,
             Status = InstallationInfoStatus.Ok,
         };
@@ -218,10 +218,10 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
             {
                 case PeerProbeResult.Ok ok:
                     // Preserve the original discovered path for display and
-                    // canonical path for identity. Overlay the route from
+                    // canonical path for identity. Overlay the source from
                     // the LOCAL sidecar so older peers using the
-                    // --version fallback (which can't report route) still
-                    // surface the install route we already know about.
+                    // --version fallback (which can't report source) still
+                    // surface the install source we already know about.
                     // Also derive the channel for PR builds — the channel
                     // is structurally `pr-<N>` for a PR install, and we
                     // can recover it from the install path layout
@@ -229,7 +229,7 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
                     // version string (<x.y.z>-pr.<N>.<hash>) baked at
                     // build time, so we surface it even when the peer
                     // didn't report it.
-                    var route = ok.Info.Route ?? GetRouteFromSidecar(sidecar);
+                    var source = ok.Info.Source ?? GetSourceFromSidecar(sidecar);
                     var channel = ok.Info.Channel;
                     if (string.IsNullOrEmpty(channel) && sidecar.Source == InstallSource.Pr)
                     {
@@ -240,7 +240,7 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
                         // Final attempt: derive the channel from the peer's
                         // reported version. This is the only signal we have
                         // for older peers that don't recognize the
-                        // `doctor --self` self-describe contract — they
+                        // `installs --self` self-describe contract — they
                         // fall through to the `--version` floor in the
                         // probe and can't report their channel directly,
                         // but the assembly's InformationalVersion has it
@@ -252,20 +252,20 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
                     {
                         Path = candidate.BinaryPath,
                         CanonicalPath = canonical,
-                        Route = route,
+                        Source = source,
                         Channel = channel,
                         PathStatus = pathStatus,
                     });
                     break;
                 case PeerProbeResult.Failed failed:
                     _logger.LogDebug(
-                        "Discovery: candidate '{Canonical}' (origin: {Origin}, route: {Route}) failed peer probe: {Reason}.",
-                        canonical, candidate.Origin, GetRouteFromSidecar(sidecar), failed.Reason);
+                        "Discovery: candidate '{Canonical}' (origin: {Origin}, source: {Source}) failed peer probe: {Reason}.",
+                        canonical, candidate.Origin, GetSourceFromSidecar(sidecar), failed.Reason);
                     results.Add(new InstallationInfo
                     {
                         Path = candidate.BinaryPath,
                         CanonicalPath = canonical,
-                        Route = GetRouteFromSidecar(sidecar),
+                        Source = GetSourceFromSidecar(sidecar),
                         PathStatus = pathStatus,
                         Status = InstallationInfoStatus.Failed,
                         StatusReason = failed.Reason,
@@ -284,7 +284,7 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
     }
 
     /// <summary>
-    /// Derives the <c>pr-&lt;N&gt;</c> identity channel for a PR-route install
+    /// Derives the <c>pr-&lt;N&gt;</c> identity channel for a PR-source install
     /// from its on-disk path. The PR install layout is, by convention,
     /// <c>&lt;root&gt;/dogfood/pr-&lt;N&gt;/bin/aspire</c> (or with a
     /// <c>.exe</c>); this method walks up two directories from the binary
@@ -360,10 +360,10 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
     /// Like <see cref="TryDerivePrChannel(string)"/>, this is a purely
     /// cosmetic enrichment for the user-facing table. It rescues the
     /// channel column for peers that don't recognize the
-    /// <c>doctor --self</c> self-describe contract: those fall through to
+    /// <c>installs --self</c> self-describe contract: those fall through to
     /// the <c>--version</c> floor in the probe and can't report their
     /// channel directly, but their assembly's InformationalVersion has
-    /// the PR number baked in regardless of route.
+    /// the PR number baked in regardless of source.
     /// </remarks>
     internal static string? TryDerivePrChannelFromVersion(string? version)
     {
@@ -402,9 +402,9 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
         }
         catch (Exception ex) when (ex is not OperationCanceledException)
         {
-            // Same defensive posture as doctor: a misconfigured dev build
+            // Same defensive posture as discovery: a misconfigured dev build
             // with no AspireCliChannel assembly metadata must not break
-            // aspire doctor.
+            // `aspire installs list`.
             _logger.LogDebug(ex, "Could not read identity channel for InstallationDiscovery.");
             return null;
         }
@@ -413,12 +413,12 @@ internal async Task<IReadOnlyList<InstallationInfo>> DiscoverAllAsync(string? pr
     private static string GetNotProbedReason(InstallSidecarReadResult result)
         => result switch
         {
-            InstallSidecarReadResult.NotFound => $"No install-route sidecar found at {result.SidecarPath}; peer was not probed.",
-            InstallSidecarReadResult.Invalid => $"Install-route sidecar at {result.SidecarPath} could not be read or parsed; peer was not probed.",
-            _ => $"No install-route sidecar found at {result.SidecarPath}; peer was not probed.",
+            InstallSidecarReadResult.NotFound => $"No install-source sidecar found at {result.SidecarPath}; peer was not probed.",
+            InstallSidecarReadResult.Invalid => $"Install-source sidecar at {result.SidecarPath} could not be read or parsed; peer was not probed.",
+            _ => $"No install-source sidecar found at {result.SidecarPath}; peer was not probed.",
         };
 
-    private static string? GetRouteFromSidecar(InstallSidecarInfo sidecar)
+    private static string? GetSourceFromSidecar(InstallSidecarInfo sidecar)
         => sidecar.Source.ToWireString() ?? (string.IsNullOrEmpty(sidecar.RawSource) ? null : sidecar.RawSource);
 
     /// <summary>
diff --git a/src/Aspire.Cli/Acquisition/InstallationInfo.cs b/src/Aspire.Cli/Acquisition/InstallationInfo.cs
index ad021bf0771..c0f1cedf0c2 100644
--- a/src/Aspire.Cli/Acquisition/InstallationInfo.cs
+++ b/src/Aspire.Cli/Acquisition/InstallationInfo.cs
@@ -8,13 +8,13 @@ namespace Aspire.Cli.Acquisition;
 
 /// <summary>
 /// Describes one Aspire CLI installation, as surfaced by
-/// <c>aspire doctor --format json</c>. Each entry corresponds to a single
+/// <c>aspire installs list --format json</c>. Each entry corresponds to a single
 /// binary either running this process or discovered on the system.
 /// </summary>
 /// <remarks>
 /// <para>
-/// The JSON shape is part of the <c>installations</c> property in the
-/// <c>aspire doctor --format json</c> contract. Fields use camelCase wire names via
+/// The JSON shape is part of the <c>aspire installs --self --format json</c> and
+/// <c>aspire installs list --format json</c> contracts. Fields use camelCase wire names via
 /// <see cref="JsonPropertyNameAttribute"/> applied explicitly here so the
 /// schema stays decoupled from the project-wide camelCase policy: another
 /// process may parse this output across CLI versions and we don't want to
@@ -64,14 +64,14 @@ internal sealed record InstallationInfo
     public string? Channel { get; init; }
 
     /// <summary>
-    /// Install route as recorded by the route's own sidecar
+    /// Install source as recorded by the source's own sidecar
     /// (<c>.aspire-install.json</c>). Wire string from
     /// <see cref="InstallSourceExtensions.ToWireString"/>. May be
     /// <see langword="null"/> for PATH discoveries whose install metadata
     /// sidecar is missing or invalid — see <see cref="Status"/>.
     /// </summary>
-    [JsonPropertyName("route")]
-    public string? Route { get; init; }
+    [JsonPropertyName("source")]
+    public string? Source { get; init; }
 
     /// <summary>
     /// Relationship between this binary and the user's <c>$PATH</c>.
@@ -131,7 +131,7 @@ internal static class InstallationPathStatus
 }
 
 /// <summary>
-/// Parses rows from the doctor installation discovery wire contract.
+/// Parses rows from the install discovery wire contract.
 /// </summary>
 internal static class InstallationInfoParser
 {
@@ -161,7 +161,7 @@ string GetStringOr(string property, string fallback)
             CanonicalPath = GetOptionalString("canonicalPath"),
             Version = GetOptionalString("version"),
             Channel = GetOptionalString("channel"),
-            Route = GetOptionalString("route"),
+            Source = GetOptionalString("source"),
             PathStatus = pathStatus,
             Status = GetStringOr("status", InstallationInfoStatus.Ok),
             StatusReason = GetOptionalString("statusReason"),
diff --git a/src/Aspire.Cli/Acquisition/PeerInstallProbe.cs b/src/Aspire.Cli/Acquisition/PeerInstallProbe.cs
index c242e100cbc..b076b099e9d 100644
--- a/src/Aspire.Cli/Acquisition/PeerInstallProbe.cs
+++ b/src/Aspire.Cli/Acquisition/PeerInstallProbe.cs
@@ -12,7 +12,7 @@ namespace Aspire.Cli.Acquisition;
 
 /// <summary>
 /// Default <see cref="IPeerInstallProbe"/>. Spawns the peer with
-/// <c>doctor --self --format json</c>, enforces a hard timeout, captures stdout
+/// <c>installs --self --format json</c>, enforces a hard timeout, captures stdout
 /// up to a byte cap, and kills the entire process tree on timeout so a
 /// hung peer cannot survive past the parent's lifetime.
 /// </summary>
@@ -71,14 +71,14 @@ public async Task<PeerProbeResult> ProbeAsync(string binaryPath, CancellationTok
             return new PeerProbeResult.Failed("Binary not found.");
         }
 
-        // Primary path: ask the peer to self-describe via `doctor --self --format json`.
+        // Primary path: ask the peer to self-describe via `installs --self --format json`.
         // `--self` is required: without it the peer would run a full discovery
         // walk and probe back into us (and into every other peer it finds),
         // turning a single discovery invocation into a recursive fan-out
         // bounded only by the per-level timeout. `--format json` is
         // required so the peer emits a machine-readable row (the human
         // table layout is the default when `--format` is omitted).
-        var primary = await SpawnAndCaptureAsync(binaryPath, ["doctor", "--self", "--format", "json"], cancellationToken).ConfigureAwait(false);
+        var primary = await SpawnAndCaptureAsync(binaryPath, ["installs", "--self", "--format", "json"], cancellationToken).ConfigureAwait(false);
         if (primary.Cancelled)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -95,11 +95,11 @@ public async Task<PeerProbeResult> ProbeAsync(string binaryPath, CancellationTok
         }
 
         // Fallback path. We reach here for:
-        //   - peer exited non-zero (common: peer predates `doctor --self`
+        //   - peer exited non-zero (common: peer predates `installs --self`
         //     and System.CommandLine rejected the unknown option),
         //   - peer emitted blank/whitespace-only stdout,
         //   - peer emitted JSON we couldn't parse as the expected rich shape.
-        // Older peers without `doctor --self` can't report their channel
+        // Older peers without `installs --self` can't report their channel
         // here, but `InstallationDiscovery` recovers `pr-<N>` from the
         // reported informational version string so the user-facing table
         // still shows the channel for PR builds.
@@ -128,7 +128,7 @@ public async Task<PeerProbeResult> ProbeAsync(string binaryPath, CancellationTok
             return new PeerProbeResult.Failed(DescribePrimaryFailure(primary, alsoTriedVersion: true));
         }
 
-        // Partial install details: version only. Route is overlaid by InstallationDiscovery
+        // Partial install details: version only. Source is overlaid by InstallationDiscovery
         // from the locally-readable sidecar. Channel intentionally null — we can't
         // read assembly metadata
         // from outside an AOT binary, and the older peer has no surface that
diff --git a/src/Aspire.Cli/Acquisition/WingetFirstRunProbe.cs b/src/Aspire.Cli/Acquisition/WingetFirstRunProbe.cs
index e8a91cdf270..3be324babc1 100644
--- a/src/Aspire.Cli/Acquisition/WingetFirstRunProbe.cs
+++ b/src/Aspire.Cli/Acquisition/WingetFirstRunProbe.cs
@@ -8,8 +8,8 @@ namespace Aspire.Cli.Acquisition;
 
 /// <summary>
 /// First-run self-stamp for winget-installed CLI binaries. Writes the
-/// install-route sidecar when the OS reports the running binary as a winget
-/// portable install. See <c>docs/specs/install-routes.md</c>.
+/// install-source sidecar when the OS reports the running binary as a winget
+/// portable install. See <c>docs/specs/install-sources.md</c>.
 /// </summary>
 internal sealed class WingetFirstRunProbe
 {
diff --git a/src/Aspire.Cli/Bundles/BundleService.cs b/src/Aspire.Cli/Bundles/BundleService.cs
index 4efe2b60332..73fbf0db9ea 100644
--- a/src/Aspire.Cli/Bundles/BundleService.cs
+++ b/src/Aspire.Cli/Bundles/BundleService.cs
@@ -21,8 +21,7 @@ namespace Aspire.Cli.Bundles;
 internal sealed class BundleService(
     IBundlePayloadProvider payloadProvider,
     ILayoutDiscovery layoutDiscovery,
-    ILogger<BundleService> logger,
-    WingetFirstRunProbe? wingetFirstRunProbe = null) : IBundleService
+    ILogger<BundleService> logger) : IBundleService
 {
     /// <summary>
     /// Name of the marker file written after successful extraction.
@@ -192,19 +191,6 @@ private async Task<BundleExtractResult> ExtractAsyncCore(string destinationPath,
             return null;
         }
 
-        // The winget portable installer has no post-install hook, so the CLI
-        // self-stamps the install-route sidecar on first run. No-op on
-        // non-Windows and once the sidecar already exists.
-        if (wingetFirstRunProbe is not null && OperatingSystem.IsWindows())
-        {
-            var realBinaryPath = CliPathHelper.ResolveSymlinkOrOriginalPath(processPath, logger);
-            var binaryDir = Path.GetDirectoryName(realBinaryPath);
-            if (!string.IsNullOrEmpty(binaryDir))
-            {
-                wingetFirstRunProbe.Run(binaryDir);
-            }
-        }
-
         var extractDir = GetDefaultExtractDir(processPath);
         if (string.IsNullOrEmpty(extractDir))
         {
@@ -382,7 +368,7 @@ private async Task<bool> ExtractVersionedLayoutAsync(
 
     /// <summary>
     /// Computes the bundle extract directory from the sidecar source value.
-    /// See <c>docs/specs/install-routes.md</c> for the contract.
+    /// See <c>docs/specs/install-sources.md</c> for the contract.
     /// </summary>
     internal static string? ComputeDefaultExtractDir(string processPath)
         => ComputeDefaultExtractDir(processPath, logger: null);
diff --git a/src/Aspire.Cli/CliExecutionContext.cs b/src/Aspire.Cli/CliExecutionContext.cs
index 05585b040f9..bb99b6e6903 100644
--- a/src/Aspire.Cli/CliExecutionContext.cs
+++ b/src/Aspire.Cli/CliExecutionContext.cs
@@ -63,17 +63,17 @@ internal sealed class CliExecutionContext(DirectoryInfo workingDirectory, Direct
     public DirectoryInfo HomeDirectory { get; } = homeDirectory ?? new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
 
     /// <summary>
-    /// Gets the Aspire state root used for route-specific install layouts.
+    /// Gets the Aspire state root used for source-specific install layouts.
     /// </summary>
     /// <remarks>
     /// Production wires this explicitly via <see cref="Program.BuildCliExecutionContext"/>
     /// using <see cref="Utils.CliPathHelper.GetAspireHomeDirectory(string?, Microsoft.Extensions.Logging.ILogger?)"/>
-    /// so the install-route sidecar lookup runs. When neither <c>aspireHomeDirectory</c>
+    /// so the install-source sidecar lookup runs. When neither <c>aspireHomeDirectory</c>
     /// nor <c>homeDirectory</c> are supplied (direct construction in tests), the same
-    /// install-route lookup is performed here so route-aware code paths see a
+    /// install-source lookup is performed here so source-aware code paths see a
     /// consistent value. When <c>homeDirectory</c> is supplied without
     /// <c>aspireHomeDirectory</c>, the home stays contained within the test directory
-    /// at <c>&lt;homeDirectory&gt;/.aspire</c> — the install-route lookup is
+    /// at <c>&lt;homeDirectory&gt;/.aspire</c> — the install-source lookup is
     /// intentionally skipped because tests passing an explicit <c>homeDirectory</c>
     /// are declaring their own filesystem sandbox.
     /// </remarks>
diff --git a/src/Aspire.Cli/Commands/DoctorCommand.cs b/src/Aspire.Cli/Commands/DoctorCommand.cs
index aa546e943ff..9c61088a95e 100644
--- a/src/Aspire.Cli/Commands/DoctorCommand.cs
+++ b/src/Aspire.Cli/Commands/DoctorCommand.cs
@@ -3,14 +3,12 @@
 
 using System.CommandLine;
 using System.Globalization;
-using Aspire.Cli.Acquisition;
 using Aspire.Cli.Configuration;
 using Aspire.Cli.Interaction;
 using Aspire.Cli.Resources;
 using Aspire.Cli.Utils;
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils.EnvironmentChecker;
-using Microsoft.Extensions.Logging;
 using Spectre.Console;
 
 namespace Aspire.Cli.Commands;
@@ -26,76 +24,44 @@ internal sealed class DoctorCommand : BaseCommand
     // already used by other --format json commands (ApiGet, ApiList, DocsSearch, DocsList).
 
     private readonly IEnvironmentChecker _environmentChecker;
-    private readonly IInstallationDiscovery _installationDiscovery;
-    private readonly WingetFirstRunProbe _wingetFirstRunProbe;
     private readonly IAnsiConsole _ansiConsole;
-    private readonly ILogger<DoctorCommand> _logger;
     private static readonly Option<OutputFormat> s_formatOption = new("--format")
     {
         Description = DoctorCommandStrings.JsonOptionDescription
     };
-    private static readonly Option<bool> s_selfOption = new("--self")
-    {
-        Hidden = true,
-    };
 
     public DoctorCommand(
         IEnvironmentChecker environmentChecker,
-        IInstallationDiscovery installationDiscovery,
-        WingetFirstRunProbe wingetFirstRunProbe,
         IFeatures features,
         ICliUpdateNotifier updateNotifier,
         CliExecutionContext executionContext,
         IInteractionService interactionService,
         IAnsiConsole ansiConsole,
-        ILogger<DoctorCommand> logger,
         AspireCliTelemetry telemetry)
         : base("doctor", DoctorCommandStrings.Description, features, updateNotifier, executionContext, interactionService, telemetry)
     {
         _environmentChecker = environmentChecker;
-        _installationDiscovery = installationDiscovery;
-        _wingetFirstRunProbe = wingetFirstRunProbe;
         _ansiConsole = ansiConsole;
-        _logger = logger;
 
         Options.Add(s_formatOption);
-        Options.Add(s_selfOption);
     }
 
     protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
     {
         var format = parseResult.GetValue(s_formatOption);
-        var selfOnly = parseResult.GetValue(s_selfOption);
-
-        if (selfOnly)
-        {
-            var self = InstallationInfoOutput.DescribeSelfSafely(_installationDiscovery, _logger);
-            if (format == OutputFormat.Json)
-            {
-                OutputJson([], self);
-            }
-            else
-            {
-                InstallationInfoOutput.OutputTable(_ansiConsole, self);
-            }
-            return CommandResult.Success();
-        }
-
-        var installationsTask = InstallationInfoOutput.DiscoverAllSafelyAsync(_installationDiscovery, _wingetFirstRunProbe, _logger, cancellationToken);
 
         // Run all prerequisite checks
         var results = await InteractionService.ShowStatusAsync(
             DoctorCommandStrings.CheckingPrerequisites,
             async () => await _environmentChecker.CheckAllAsync(cancellationToken));
-        var installations = await installationsTask;
 
         if (format == OutputFormat.Json)
         {
-            OutputJson(results, installations);
+            OutputJson(results);
         }
         else
         {
-            OutputHumanReadable(results, installations);
+            OutputHumanReadable(results);
         }
 
         // Exit code: 0 if no failures (warnings are OK), 1 (InvalidCommand) if any failures
@@ -103,7 +69,7 @@ protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResul
         return CommandResult.FromExitCode(hasFailures ? CliExitCodes.InvalidCommand : CliExitCodes.Success);
     }
 
-    private void OutputJson(IReadOnlyList<EnvironmentCheckResult> results, IReadOnlyList<InstallationInfo> installations)
+    private void OutputJson(IReadOnlyList<EnvironmentCheckResult> results)
     {
         var passed = results.Count(r => r.Status == EnvironmentCheckStatus.Pass);
         var warnings = results.Count(r => r.Status == EnvironmentCheckStatus.Warning);
@@ -117,8 +83,7 @@ private void OutputJson(IReadOnlyList<EnvironmentCheckResult> results, IReadOnly
                 Passed = passed,
                 Warnings = warnings,
                 Failed = failed
-            },
-            Installations = installations.ToList()
+            }
         };
 
         var json = System.Text.Json.JsonSerializer.Serialize(response, JsonSourceGenerationContext.RelaxedEscaping.DoctorCheckResponse);
@@ -127,7 +92,7 @@ private void OutputJson(IReadOnlyList<EnvironmentCheckResult> results, IReadOnly
         InteractionService.DisplayRawText(json, ConsoleOutput.Standard);
     }
 
-    private void OutputHumanReadable(IReadOnlyList<EnvironmentCheckResult> results, IReadOnlyList<InstallationInfo> installations)
+    private void OutputHumanReadable(IReadOnlyList<EnvironmentCheckResult> results)
     {
         _ansiConsole.WriteLine();
         _ansiConsole.MarkupLine($"[bold]{DoctorCommandStrings.EnvironmentCheckHeader}[/]");
@@ -165,8 +130,6 @@ private void OutputHumanReadable(IReadOnlyList<EnvironmentCheckResult> results,
             const string prerequisitesUrl = "https://aka.ms/aspire-prerequisites";
             _ansiConsole.MarkupLine(string.Format(CultureInfo.CurrentCulture, DoctorCommandStrings.DetailedPrerequisitesLink, MarkupHelpers.SafeLink(InteractionService, prerequisitesUrl)));
         }
-
-        InstallationInfoOutput.OutputTable(_ansiConsole, installations);
     }
 
     private void OutputCheckResult(EnvironmentCheckResult result)
diff --git a/src/Aspire.Cli/Commands/HivesCommand.cs b/src/Aspire.Cli/Commands/HivesCommand.cs
new file mode 100644
index 00000000000..16408ded218
--- /dev/null
+++ b/src/Aspire.Cli/Commands/HivesCommand.cs
@@ -0,0 +1,128 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using Aspire.Cli.Acquisition;
+using Aspire.Cli.Configuration;
+using Aspire.Cli.Interaction;
+using Aspire.Cli.Telemetry;
+using Aspire.Cli.Uninstall;
+using Aspire.Cli.Utils;
+using Spectre.Console;
+
+namespace Aspire.Cli.Commands;
+
+internal sealed class HivesCommand : ParentCommand
+{
+    internal override HelpGroup HelpGroup => HelpGroup.ToolsAndConfiguration;
+
+    public HivesCommand(HiveEnumerator hives, CliCleanupService cleanupService, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry)
+        : base("hives", "Manage Aspire CLI package hives", features, updateNotifier, executionContext, interactionService, telemetry)
+    {
+        Subcommands.Add(new ListCommand(hives, interactionService, features, updateNotifier, executionContext, telemetry));
+        Subcommands.Add(new DeleteCommand(cleanupService, interactionService, features, updateNotifier, executionContext, telemetry));
+    }
+
+    private sealed class ListCommand(HiveEnumerator hives, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry)
+        : BaseCommand("list", "List Aspire CLI package hives", features, updateNotifier, executionContext, interactionService, telemetry)
+    {
+        protected override Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+        {
+            var enumeratedHives = hives.GetHives();
+            if (enumeratedHives.Count == 0)
+            {
+                InteractionService.DisplayMessage(KnownEmojis.Information, "No Aspire CLI package hives were found.");
+                return Task.FromResult(CommandResult.Success());
+            }
+
+            var dogfoodRoot = Path.Combine(ExecutionContext.HivesDirectory.Parent?.FullName ?? ExecutionContext.AspireHomeDirectory.FullName, "dogfood");
+            var table = new Table();
+            table.AddColumn("Name");
+            table.AddColumn("Path");
+            table.AddColumn("Dogfood install");
+
+            foreach (var hive in enumeratedHives)
+            {
+                var hasDogfoodInstall = Directory.Exists(Path.Combine(dogfoodRoot, hive.Name));
+                table.AddRow(hive.Name, hive.Path, hasDogfoodInstall ? "yes" : "no");
+            }
+
+            InteractionService.DisplayRenderable(table);
+            return Task.FromResult(CommandResult.Success());
+        }
+    }
+
+    private sealed class DeleteCommand : BaseCommand
+    {
+        private static readonly Argument<string> s_nameArgument = new("name")
+        {
+            Description = "The hive name to delete."
+        };
+
+        private static readonly Option<bool> s_yesOption = new("--yes", "-y")
+        {
+            Description = "Confirm deletion without prompting."
+        };
+
+        private static readonly Option<bool> s_forceOption = new("--force")
+        {
+            Description = "Delete the hive even when a matching PR dogfood install exists."
+        };
+
+        private static readonly Option<bool> s_dryRunOption = new("--dry-run")
+        {
+            Description = "Show what would be deleted without deleting it."
+        };
+
+        private readonly CliCleanupService _cleanupService;
+
+        public DeleteCommand(CliCleanupService cleanupService, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry)
+            : base("delete", "Delete an Aspire CLI package hive", features, updateNotifier, executionContext, interactionService, telemetry)
+        {
+            _cleanupService = cleanupService;
+            Arguments.Add(s_nameArgument);
+            Options.Add(s_yesOption);
+            Options.Add(s_forceOption);
+            Options.Add(s_dryRunOption);
+            AddNonInteractiveRequiresYesValidator(this, s_yesOption);
+        }
+
+        protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+        {
+            var name = parseResult.GetValue(s_nameArgument);
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                return CommandResult.Failure(CliExitCodes.InvalidCommand, "A hive name is required.");
+            }
+
+            var dryRun = parseResult.GetValue(s_dryRunOption);
+            var yes = parseResult.GetValue(s_yesOption);
+            if (!dryRun && !yes && !await InteractionService.PromptConfirmAsync($"Delete Aspire CLI hive '{name}'?", cancellationToken: cancellationToken))
+            {
+                return CommandResult.Cancelled();
+            }
+
+            var result = await _cleanupService.DeleteHiveAsync(name, parseResult.GetValue(s_forceOption), dryRun, cancellationToken);
+            HivesCommand.DisplayOperations(InteractionService, result.Operations);
+
+            return result.HasFailures ? CommandResult.Failure(CliExitCodes.InvalidCommand) : CommandResult.Success();
+        }
+    }
+
+    internal static void DisplayOperations(IInteractionService interactionService, IEnumerable<CleanupOperation> operations)
+    {
+        foreach (var operation in operations)
+        {
+            var status = operation.Status switch
+            {
+                CleanupOperationStatus.Removed => "removed",
+                CleanupOperationStatus.WouldRemove => "would remove",
+                CleanupOperationStatus.Skipped => "skipped",
+                CleanupOperationStatus.Failed => "failed",
+                _ => operation.Status.ToString()
+            };
+            var reason = string.IsNullOrWhiteSpace(operation.Reason) ? "" : $" ({operation.Reason})";
+            interactionService.DisplayPlainText($"{status}: {operation.Path}{reason}");
+        }
+    }
+}
diff --git a/src/Aspire.Cli/Commands/InstallationInfoOutput.cs b/src/Aspire.Cli/Commands/InstallationInfoOutput.cs
index f7e1e1e30cb..e6a9076fe45 100644
--- a/src/Aspire.Cli/Commands/InstallationInfoOutput.cs
+++ b/src/Aspire.Cli/Commands/InstallationInfoOutput.cs
@@ -4,45 +4,11 @@
 using Aspire.Cli.Acquisition;
 using Aspire.Cli.Resources;
 using Microsoft.Extensions.Logging;
-using Spectre.Console;
 
 namespace Aspire.Cli.Commands;
 
 internal static class InstallationInfoOutput
 {
-    public static async Task<IReadOnlyList<InstallationInfo>> DiscoverAllSafelyAsync(
-        IInstallationDiscovery discovery,
-        WingetFirstRunProbe wingetFirstRunProbe,
-        ILogger logger,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            RunWingetFirstRunProbe(wingetFirstRunProbe);
-        }
-        catch (Exception ex) when (ex is not OperationCanceledException)
-        {
-            logger.LogWarning(ex, "Could not run the winget first-run install sidecar probe before doctor installation discovery.");
-        }
-
-        try
-        {
-            logger.LogDebug("Discovering Aspire CLI installations for doctor output.");
-            var installations = await discovery.DiscoverAllAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogDebug("Discovered {InstallationCount} Aspire CLI installation(s) for doctor output.", installations.Count);
-            return installations;
-        }
-        catch (OperationCanceledException)
-        {
-            throw;
-        }
-        catch (Exception ex)
-        {
-            logger.LogWarning(ex, "Could not discover Aspire CLI installations for doctor output.");
-            return CreateFailedDiscoveryRow();
-        }
-    }
-
     public static IReadOnlyList<InstallationInfo> DescribeSelfSafely(IInstallationDiscovery discovery, ILogger logger)
     {
         try
@@ -51,112 +17,17 @@ public static IReadOnlyList<InstallationInfo> DescribeSelfSafely(IInstallationDi
         }
         catch (OperationCanceledException)
         {
-            // Symmetric with DiscoverAllSafelyAsync: cancellation must propagate
-            // so the caller can honor the cancellation token even if DescribeSelf
-            // ever becomes cancellable.
+            // Cancellation must propagate so the caller can honor the cancellation token
+            // even if DescribeSelf ever becomes cancellable.
             throw;
         }
         catch (Exception ex)
         {
-            logger.LogWarning(ex, "Could not describe the running Aspire CLI installation for doctor self-probe output.");
+            logger.LogWarning(ex, "Could not describe the running Aspire CLI installation for `aspire installs --self` output.");
             return CreateFailedDiscoveryRow();
         }
     }
 
-    public static void RunWingetFirstRunProbe(WingetFirstRunProbe wingetFirstRunProbe)
-    {
-        // Give a never-run winget install a chance to stamp its sidecar before
-        // we read it. The probe writes nothing on non-Windows hosts or when the
-        // running binary isn't a winget portable install, so this is a cheap
-        // no-op in the common case.
-        var processPath = Environment.ProcessPath;
-        if (string.IsNullOrEmpty(processPath))
-        {
-            return;
-        }
-
-        var binaryDir = Path.GetDirectoryName(processPath);
-        if (!string.IsNullOrEmpty(binaryDir))
-        {
-            wingetFirstRunProbe.Run(binaryDir);
-        }
-    }
-
-    public static void OutputTable(IAnsiConsole ansiConsole, IReadOnlyList<InstallationInfo> installs)
-    {
-        ansiConsole.WriteLine();
-        ansiConsole.MarkupLine($"[bold]{DoctorCommandStrings.HeaderInstallations.EscapeMarkup()}[/]");
-        ansiConsole.WriteLine(new string('=', DoctorCommandStrings.HeaderInstallations.Length));
-        ansiConsole.WriteLine();
-
-        var table = new Table()
-            .Border(TableBorder.Rounded)
-            .AddColumn(DoctorCommandStrings.ColumnPath)
-            .AddColumn(DoctorCommandStrings.ColumnVersion)
-            .AddColumn(DoctorCommandStrings.ColumnChannel)
-            .AddColumn(DoctorCommandStrings.ColumnRoute)
-            .AddColumn(DoctorCommandStrings.ColumnPathStatus);
-
-        // The first row is, by contract, the running CLI (enforced by
-        // InstallationDiscovery, not by ordering here). Tag installs[0]
-        // directly rather than re-resolving Environment.ProcessPath and
-        // matching CanonicalPath: that re-derivation can disagree with
-        // the discovery layer's notion of self (e.g. when ProcessPath is
-        // unresolvable at render time but was resolvable when DescribeSelf
-        // ran, or when a peer happens to share a canonical path with the
-        // running CLI).
-        for (var i = 0; i < installs.Count; i++)
-        {
-            var install = installs[i];
-            var isSelf = i == 0;
-            var pathDisplay = string.IsNullOrEmpty(install.Path)
-                ? DoctorCommandStrings.ValueUnknown
-                : install.Path;
-            pathDisplay = pathDisplay.EscapeMarkup();
-            if (isSelf)
-            {
-                pathDisplay = $"{pathDisplay} [grey]{DoctorCommandStrings.ValueCurrentMarker.EscapeMarkup()}[/]";
-            }
-
-            table.AddRow(
-                pathDisplay,
-                ValueOrPlaceholder(install.Version, install.Status),
-                ValueOrPlaceholder(install.Channel, install.Status),
-                ValueOrPlaceholder(install.Route, install.Status),
-                PathStatusDisplay(install.PathStatus));
-        }
-
-        ansiConsole.Write(table);
-    }
-
-    private static string PathStatusDisplay(string pathStatus)
-    {
-        return pathStatus switch
-        {
-            InstallationPathStatus.Active => DoctorCommandStrings.ValuePathActive,
-            InstallationPathStatus.Shadowed => DoctorCommandStrings.ValuePathShadowed,
-            InstallationPathStatus.NotOnPath => DoctorCommandStrings.ValuePathNotOnPath,
-            _ => pathStatus.EscapeMarkup(),
-        };
-    }
-
-    private static string ValueOrPlaceholder(string? value, string status)
-    {
-        if (!string.IsNullOrEmpty(value))
-        {
-            return value.EscapeMarkup();
-        }
-
-        // Missing fields mean different things for skipped rows, failed
-        // probes, and rows that responded but did not populate this value.
-        return status switch
-        {
-            InstallationInfoStatus.NotProbed => DoctorCommandStrings.ValueNotProbed,
-            InstallationInfoStatus.Failed => DoctorCommandStrings.ValueProbeFailed,
-            _ => DoctorCommandStrings.ValueUnknown,
-        };
-    }
-
     private static IReadOnlyList<InstallationInfo> CreateFailedDiscoveryRow()
     {
         return
diff --git a/src/Aspire.Cli/Commands/InstallsCommand.cs b/src/Aspire.Cli/Commands/InstallsCommand.cs
new file mode 100644
index 00000000000..3ba76c53f80
--- /dev/null
+++ b/src/Aspire.Cli/Commands/InstallsCommand.cs
@@ -0,0 +1,443 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Aspire.Cli.Acquisition;
+using Aspire.Cli.Configuration;
+using Aspire.Cli.Interaction;
+using Aspire.Cli.Telemetry;
+using Aspire.Cli.Uninstall;
+using Aspire.Cli.Utils;
+using Microsoft.Extensions.Logging;
+using Spectre.Console;
+
+namespace Aspire.Cli.Commands;
+
+internal sealed class InstallsCommand : BaseCommand
+{
+    internal override HelpGroup HelpGroup => HelpGroup.ToolsAndConfiguration;
+
+    private static readonly Option<InstallsOutputFormat> s_formatOption = new("--format")
+    {
+        Description = "The output format.",
+        Hidden = true
+    };
+
+    private static readonly Option<bool> s_selfOption = new("--self")
+    {
+        Hidden = true
+    };
+
+    private readonly IInstallationDiscovery _installationDiscovery;
+    private readonly ILogger _logger;
+
+    public InstallsCommand(HiveEnumerator hiveEnumerator, CliCleanupService cleanupService, IInstallationDiscovery installationDiscovery, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry, ILogger<InstallsCommand> logger)
+        : base("installs", "Manage Aspire CLI installs", features, updateNotifier, executionContext, interactionService, telemetry)
+    {
+        _installationDiscovery = installationDiscovery;
+        _logger = logger;
+        Options.Add(s_formatOption);
+        Options.Add(s_selfOption);
+        Subcommands.Add(new ListCommand(hiveEnumerator, installationDiscovery, interactionService, features, updateNotifier, executionContext, telemetry, logger));
+        Subcommands.Add(new UninstallSubCommand(hiveEnumerator, cleanupService, installationDiscovery, interactionService, features, updateNotifier, executionContext, telemetry, logger));
+    }
+
+    protected override Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+    {
+        if (!parseResult.GetValue(s_selfOption))
+        {
+            return Task.FromResult(CommandResult.DisplayHelp());
+        }
+
+        var self = InstallationInfoOutput.DescribeSelfSafely(_installationDiscovery, _logger);
+        if (parseResult.GetValue(s_formatOption) == InstallsOutputFormat.Json)
+        {
+            var json = JsonSerializer.Serialize(self.ToArray(), JsonSourceGenerationContext.RelaxedEscaping.InstallationInfoArray);
+            InteractionService.DisplayRawText(json, ConsoleOutput.Standard);
+        }
+        else
+        {
+            foreach (var install in self)
+            {
+                InteractionService.DisplayMarkdown("**self**");
+                DisplaySelfField("Status", install.Status);
+                DisplaySelfField("Channel", install.Channel);
+                DisplaySelfField("Source", install.Source);
+                DisplaySelfField("Version", install.Version);
+                DisplaySelfField("Path", install.Path);
+                DisplaySelfField("On PATH", install.PathStatus);
+            }
+        }
+
+        return Task.FromResult(CommandResult.Success());
+    }
+
+    private void DisplaySelfField(string name, string? value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            return;
+        }
+
+        InteractionService.DisplayPlainText($"  {name,-8} {value}");
+    }
+
+    private sealed class ListCommand : BaseCommand
+    {
+        private static readonly Option<InstallsOutputFormat> s_formatOption = new("--format")
+        {
+            Description = "The output format."
+        };
+
+        private readonly HiveEnumerator _hiveEnumerator;
+        private readonly IInstallationDiscovery _installationDiscovery;
+        private readonly ILogger _logger;
+
+        public ListCommand(HiveEnumerator hiveEnumerator, IInstallationDiscovery installationDiscovery, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry, ILogger logger)
+            : base("list", "List Aspire CLI installs and orphan hives", features, updateNotifier, executionContext, interactionService, telemetry)
+        {
+            _hiveEnumerator = hiveEnumerator;
+            _installationDiscovery = installationDiscovery;
+            _logger = logger;
+            Options.Add(s_formatOption);
+        }
+
+        protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+        {
+            var rows = await BuildRowsAsync(_hiveEnumerator, _installationDiscovery, _logger, cancellationToken);
+            if (parseResult.GetValue(s_formatOption) == InstallsOutputFormat.Json)
+            {
+                var json = JsonSerializer.Serialize(rows, JsonSourceGenerationContext.RelaxedEscaping.ListInstallListItem);
+                InteractionService.DisplayRawText(json, ConsoleOutput.Standard);
+                return CommandResult.Success();
+            }
+
+            foreach (var row in rows)
+            {
+                InteractionService.DisplayMarkdown($"**{row.Id}**  {row.Kind}");
+                DisplayField("Status", row.Status);
+                DisplayField("Channel", row.Channel);
+                DisplayField("Path", row.Path);
+                DisplayField("Hive", row.Hive);
+                if (row.StatusReason is { Length: > 0 })
+                {
+                    DisplayField("Reason", row.StatusReason);
+                }
+                DisplayField("Cleanup", row.CleanupHint);
+                InteractionService.DisplayEmptyLine();
+            }
+
+            return CommandResult.Success();
+        }
+
+        private void DisplayField(string name, string? value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return;
+            }
+
+            InteractionService.DisplayPlainText($"  {name,-8} {value}");
+        }
+    }
+
+    private static async Task<List<InstallListItem>> BuildRowsAsync(HiveEnumerator hiveEnumerator, IInstallationDiscovery installationDiscovery, ILogger logger, CancellationToken cancellationToken)
+    {
+        var discoveredInstalls = (await installationDiscovery.DiscoverAllAsync(cancellationToken))
+            .Where(i => IsDisplayableInstall(i, logger))
+            .ToList();
+        var installChannels = discoveredInstalls
+            .Select(i => i.Channel)
+            .Where(c => !string.IsNullOrEmpty(c))
+            .ToHashSet(StringComparer.Ordinal);
+        var ids = new Dictionary<string, int>(StringComparer.Ordinal);
+        var rows = new List<InstallListItem>();
+
+        foreach (var install in discoveredInstalls)
+        {
+            var baseId = GetInstallId(install);
+            var id = GetUniqueId(baseId, ids, logger);
+            var kind = GetInstallKind(install);
+            var status = GetInstallStatus(install);
+            var hive = install.Channel is { Length: > 0 } && hiveEnumerator.HasHive(install.Channel)
+                ? hiveEnumerator.GetHivePath(install.Channel)
+                : null;
+            var cleanupHint = GetCleanupHint(install, id);
+            var managedBy = GetManagedBy(install);
+            logger.LogDebug(
+                "Classified install path '{Path}' as id '{Id}', kind '{Kind}', channel '{Channel}', status '{Status}', hive '{Hive}', managedBy '{ManagedBy}', cleanup '{CleanupHint}'. Source='{Source}', pathStatus='{PathStatus}', discoveryStatus='{DiscoveryStatus}', reason='{Reason}'.",
+                install.Path,
+                id,
+                kind,
+                install.Channel ?? "(none)",
+                status,
+                hive ?? "(none)",
+                managedBy ?? "(none)",
+                cleanupHint,
+                install.Source ?? "(none)",
+                install.PathStatus,
+                install.Status,
+                install.StatusReason ?? "(none)");
+            rows.Add(new InstallListItem(id, kind, install.Channel, install.Path, hive, status, install.StatusReason, managedBy, cleanupHint));
+        }
+
+        foreach (var hive in hiveEnumerator.GetHives().Where(h => !installChannels.Contains(h.Name)))
+        {
+            var id = GetUniqueId(hive.Name, ids, logger);
+            logger.LogDebug(
+                "Classified hive '{Hive}' as orphan install row id '{Id}' because no discovered install reported channel '{Channel}'.",
+                hive.Path,
+                id,
+                hive.Name);
+            rows.Add(new InstallListItem(id, "orphan-hive", hive.Name, null, hive.Path, "no install found", "No discovered install reports this hive's channel.", null, $"Use: aspire installs uninstall {id}"));
+        }
+
+        return rows
+            .OrderBy(GetSortRank)
+            .ThenBy(row => row.Id, StringComparer.Ordinal)
+            .ToList();
+    }
+
+    private static int GetSortRank(InstallListItem row)
+        => row.Status switch
+        {
+            InstallationPathStatus.Active => 0,
+            InstallationPathStatus.Shadowed => 1,
+            InstallationPathStatus.NotOnPath => 2,
+            "no install found" => 4,
+            _ => 3
+        };
+
+    private static string GetInstallId(InstallationInfo install)
+    {
+        if (install.Source is "script")
+        {
+            return "script";
+        }
+
+        if (!string.IsNullOrEmpty(install.Channel))
+        {
+            return install.Channel;
+        }
+
+        return install.Source ?? install.Path;
+    }
+
+    private static bool IsDisplayableInstall(InstallationInfo install, ILogger logger)
+    {
+        if (!string.IsNullOrEmpty(install.Source))
+        {
+            logger.LogDebug("Including install path '{Path}' because it has source '{Source}'.", install.Path, install.Source);
+            return true;
+        }
+
+        var fileName = Path.GetFileName(install.CanonicalPath ?? install.Path);
+        var isAspireBinary = fileName is "aspire" or "aspire.exe";
+        if (!isAspireBinary)
+        {
+            logger.LogDebug("Ignoring discovery row path '{Path}' because it has no install source and the resolved filename '{FileName}' is not an Aspire CLI binary.", install.Path, fileName);
+        }
+
+        return isAspireBinary;
+    }
+
+    private static string GetUniqueId(string id, Dictionary<string, int> ids, ILogger logger)
+    {
+        var originalId = id;
+        var uniqueId = GetUniqueIdCore(id, ids);
+        if (!string.Equals(originalId, uniqueId, StringComparison.Ordinal))
+        {
+            logger.LogDebug("Disambiguated duplicate install id '{OriginalId}' as '{UniqueId}'.", originalId, uniqueId);
+        }
+
+        return uniqueId;
+    }
+
+    private static string GetUniqueIdCore(string id, Dictionary<string, int> ids)
+    {
+        if (!ids.TryGetValue(id, out var count))
+        {
+            ids[id] = 1;
+            return id;
+        }
+
+        count++;
+        ids[id] = count;
+        return $"{id}-{count}";
+    }
+
+    private static string GetInstallKind(InstallationInfo install)
+        => install.Source switch
+        {
+            // The sidecar wire string is "brew" but everywhere we surface this to
+            // a human (or tool reading our JSON output) we use the friendlier
+            // "homebrew" label so the displayed `kind` and `managedBy` agree.
+            "brew" => "homebrew",
+            null => "unknown",
+            _ => install.Source,
+        };
+
+    private static string GetCleanupHint(InstallationInfo install, string id)
+        => install.Source switch
+        {
+            "dotnet-tool" => "Managed by dotnet tool; use: dotnet tool uninstall",
+            "winget" => "Managed by WinGet; use: winget uninstall",
+            "brew" => "Managed by Homebrew; use: brew uninstall",
+            _ => $"Use: aspire installs uninstall {id}"
+        };
+
+    private static string? GetManagedBy(InstallationInfo install)
+        => install.Source switch
+        {
+            "dotnet-tool" => "dotnet-tool",
+            "winget" => "winget",
+            "brew" => "homebrew",
+            _ => null
+        };
+
+    private static string GetInstallStatus(InstallationInfo install)
+    {
+        if (install.Status != InstallationInfoStatus.Ok)
+        {
+            return install.StatusReason is { Length: > 0 }
+                ? $"{install.Status}: {install.StatusReason}"
+                : install.Status;
+        }
+
+        return install.PathStatus;
+    }
+
+    private static async Task<Dictionary<string, InstallListItem>> BuildIdToChannelMapAsync(HiveEnumerator hiveEnumerator, IInstallationDiscovery installationDiscovery, ILogger logger, CancellationToken cancellationToken)
+    {
+        var rows = await BuildRowsAsync(hiveEnumerator, installationDiscovery, logger, cancellationToken);
+        var map = new Dictionary<string, InstallListItem>(StringComparer.Ordinal);
+        foreach (var row in rows)
+        {
+            map[row.Id] = row;
+        }
+
+        return map;
+    }
+
+    private sealed class UninstallSubCommand : BaseCommand
+    {
+        private static readonly Argument<string> s_idArgument = new("id")
+        {
+            Description = "The install ID or hive label to uninstall."
+        };
+
+        private static readonly Option<bool> s_yesOption = new("--yes", "-y")
+        {
+            Description = "Confirm uninstall without prompting."
+        };
+
+        private static readonly Option<bool> s_dryRunOption = new("--dry-run")
+        {
+            Description = "Show what would be removed without deleting it."
+        };
+
+        private static readonly Option<bool> s_removeSharedInstallOption = new("--remove-shared-install")
+        {
+            Description = "Also remove the shared script install under ~/.aspire/bin and its bundle layout."
+        };
+
+        private readonly HiveEnumerator _hiveEnumerator;
+        private readonly CliCleanupService _cleanupService;
+        private readonly IInstallationDiscovery _installationDiscovery;
+        private readonly ILogger _logger;
+
+        public UninstallSubCommand(HiveEnumerator hiveEnumerator, CliCleanupService cleanupService, IInstallationDiscovery installationDiscovery, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry, ILogger logger)
+            : base("uninstall", "Uninstall an Aspire CLI install or orphan hive", features, updateNotifier, executionContext, interactionService, telemetry)
+        {
+            _hiveEnumerator = hiveEnumerator;
+            _cleanupService = cleanupService;
+            _installationDiscovery = installationDiscovery;
+            _logger = logger;
+            Arguments.Add(s_idArgument);
+            Options.Add(s_yesOption);
+            Options.Add(s_dryRunOption);
+            Options.Add(s_removeSharedInstallOption);
+            AddNonInteractiveRequiresYesValidator(this, s_yesOption);
+        }
+
+        protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+        {
+            var id = parseResult.GetValue(s_idArgument);
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                return CommandResult.Failure(CliExitCodes.InvalidCommand, "An install ID is required.");
+            }
+
+            var dryRun = parseResult.GetValue(s_dryRunOption);
+            var yes = parseResult.GetValue(s_yesOption);
+            var idToRow = await BuildIdToChannelMapAsync(_hiveEnumerator, _installationDiscovery, _logger, cancellationToken);
+            if (idToRow.TryGetValue(id, out var row) && row.ManagedBy is not null)
+            {
+                InteractionService.DisplayError($"Install '{id}' cannot be uninstalled by Aspire. {row.CleanupHint}");
+                return CommandResult.Failure(CliExitCodes.InvalidCommand);
+            }
+
+            if (!TryResolveChannelFromId(id, _hiveEnumerator, idToRow, _logger, out var channel))
+            {
+                InteractionService.DisplayError($"No Aspire CLI install or hive named '{id}' was found. Run 'aspire installs list' to see uninstallable IDs.");
+                return CommandResult.Failure(CliExitCodes.InvalidCommand);
+            }
+
+            if (!dryRun && !yes && !await InteractionService.PromptConfirmAsync($"Uninstall Aspire CLI install '{id}'?", cancellationToken: cancellationToken))
+            {
+                return CommandResult.Cancelled();
+            }
+
+            var result = await _cleanupService.UninstallAsync([channel], parseResult.GetValue(s_removeSharedInstallOption), dryRun, cancellationToken);
+            HivesCommand.DisplayOperations(InteractionService, result.Operations);
+
+            return result.HasFailures ? CommandResult.Failure(CliExitCodes.InvalidCommand) : CommandResult.Success();
+        }
+
+        private static bool TryResolveChannelFromId(string id, HiveEnumerator hiveEnumerator, IReadOnlyDictionary<string, InstallListItem> idToRow, ILogger logger, out string channel)
+        {
+            if (idToRow.TryGetValue(id, out var mappedRow) && mappedRow.Channel is { Length: > 0 } mappedChannel)
+            {
+                logger.LogDebug("Resolved install id '{Id}' to channel '{Channel}' from installs list mapping.", id, mappedChannel);
+                channel = mappedChannel;
+                return true;
+            }
+
+            if (hiveEnumerator.HasHive(id))
+            {
+                logger.LogDebug("Resolved install id '{Id}' to exact matching hive channel.", id);
+                channel = id;
+                return true;
+            }
+
+            // Require an exact match: disambiguated ids produced by
+            // BuildRowsAsync are already in `idToRow` (first branch above).
+            // Accepting a typoed-suffix id like `pr-17416-2` and stripping it
+            // to `pr-17416` would let a user typo silently delete a different
+            // hive than they named, so anything that doesn't match exactly
+            // is rejected.
+            logger.LogDebug("Could not resolve install id '{Id}' because no install mapping or hive match was found.", id);
+            channel = string.Empty;
+            return false;
+        }
+    }
+}
+
+internal sealed record InstallListItem(
+    [property: JsonPropertyName("id")] string Id,
+    [property: JsonPropertyName("kind")] string Kind,
+    [property: JsonPropertyName("channel")] string? Channel,
+    [property: JsonPropertyName("path")] string? Path,
+    [property: JsonPropertyName("hive")] string? Hive,
+    [property: JsonPropertyName("status")] string Status,
+    [property: JsonPropertyName("statusReason")] string? StatusReason,
+    [property: JsonPropertyName("managedBy")] string? ManagedBy,
+    [property: JsonPropertyName("cleanupHint")] string CleanupHint);
+
+internal enum InstallsOutputFormat
+{
+    List,
+    Json
+}
diff --git a/src/Aspire.Cli/Commands/RootCommand.cs b/src/Aspire.Cli/Commands/RootCommand.cs
index 4272341fddf..7130867e558 100644
--- a/src/Aspire.Cli/Commands/RootCommand.cs
+++ b/src/Aspire.Cli/Commands/RootCommand.cs
@@ -154,6 +154,9 @@ public RootCommand(
         DestroyCommand destroyCommand,
         DoCommand doCommand,
         ConfigCommand configCommand,
+        InstallsCommand installsCommand,
+        HivesCommand hivesCommand,
+        UninstallCommand uninstallCommand,
         CacheCommand cacheCommand,
         CertificatesCommand certificatesCommand,
         DoctorCommand doctorCommand,
@@ -250,6 +253,9 @@ public RootCommand(
         Subcommands.Add(addCommand);
         Subcommands.Add(publishCommand);
         Subcommands.Add(configCommand);
+        Subcommands.Add(installsCommand);
+        Subcommands.Add(hivesCommand);
+        Subcommands.Add(uninstallCommand);
         Subcommands.Add(cacheCommand);
         Subcommands.Add(certificatesCommand);
         Subcommands.Add(doctorCommand);
diff --git a/src/Aspire.Cli/Commands/SetupCommand.cs b/src/Aspire.Cli/Commands/SetupCommand.cs
index abdfa442a2a..f0014358ad0 100644
--- a/src/Aspire.Cli/Commands/SetupCommand.cs
+++ b/src/Aspire.Cli/Commands/SetupCommand.cs
@@ -57,9 +57,9 @@ protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResul
             return CommandResult.Failure(CliExitCodes.FailedToBuildArtifacts, "Could not determine the CLI executable path.");
         }
 
-        // `aspire setup` uses a route-independent default (parent of the binary's dir).
-        // Do not switch to `_bundleService.GetDefaultExtractDir` — that path is route-aware
-        // and reserved for auto-extract, where managed-route layouts must stay package-owned.
+        // `aspire setup` uses a source-independent default (parent of the binary's dir).
+        // Do not switch to `_bundleService.GetDefaultExtractDir` — that path is source-aware
+        // and reserved for auto-extract, where managed-source layouts must stay package-owned.
         if (string.IsNullOrEmpty(installPath))
         {
             installPath = GetDefaultInstallPath(processPath);
@@ -103,7 +103,7 @@ protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResul
 
     /// <summary>
     /// Returns the parent of <paramref name="processPath"/>'s directory, or <c>null</c> if
-    /// none. Route-independent counterpart to the route-aware <see cref="IBundleService.GetDefaultExtractDir"/>.
+    /// none. Source-independent counterpart to the source-aware <see cref="IBundleService.GetDefaultExtractDir"/>.
     /// </summary>
     internal static string? GetDefaultInstallPath(string? processPath)
     {
diff --git a/src/Aspire.Cli/Commands/UninstallCommand.cs b/src/Aspire.Cli/Commands/UninstallCommand.cs
new file mode 100644
index 00000000000..2129d329ede
--- /dev/null
+++ b/src/Aspire.Cli/Commands/UninstallCommand.cs
@@ -0,0 +1,92 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using Aspire.Cli.Configuration;
+using Aspire.Cli.Interaction;
+using Aspire.Cli.Telemetry;
+using Aspire.Cli.Uninstall;
+using Aspire.Cli.Utils;
+
+namespace Aspire.Cli.Commands;
+
+internal sealed class UninstallCommand : BaseCommand
+{
+    internal override HelpGroup HelpGroup => HelpGroup.ToolsAndConfiguration;
+
+    private static readonly Option<string?> s_channelOption = new("--channel")
+    {
+        Description = "The Aspire CLI channel or hive label to clean up."
+    };
+
+    private static readonly Option<bool> s_allOption = new("--all")
+    {
+        Description = "Clean pr-*, staging, and daily hives."
+    };
+
+    private static readonly Option<bool> s_yesOption = new("--yes", "-y")
+    {
+        Description = "Confirm cleanup without prompting."
+    };
+
+    private static readonly Option<bool> s_dryRunOption = new("--dry-run")
+    {
+        Description = "Show what would be removed without deleting it."
+    };
+
+    private static readonly Option<bool> s_removeSharedInstallOption = new("--remove-shared-install")
+    {
+        Description = "Also remove the shared script install under ~/.aspire/bin and its bundle layout."
+    };
+
+    private readonly CliCleanupService _cleanupService;
+
+    public UninstallCommand(CliCleanupService cleanupService, IInteractionService interactionService, IFeatures features, ICliUpdateNotifier updateNotifier, CliExecutionContext executionContext, AspireCliTelemetry telemetry)
+        : base("uninstall", "Clean up Aspire CLI script and PR installs", features, updateNotifier, executionContext, interactionService, telemetry)
+    {
+        _cleanupService = cleanupService;
+
+        Options.Add(s_channelOption);
+        Options.Add(s_allOption);
+        Options.Add(s_yesOption);
+        Options.Add(s_dryRunOption);
+        Options.Add(s_removeSharedInstallOption);
+        AddNonInteractiveRequiresYesValidator(this, s_yesOption);
+        Validators.Add(result =>
+        {
+            var channel = result.GetValue(s_channelOption);
+            var all = result.GetValue(s_allOption);
+            if ((string.IsNullOrWhiteSpace(channel) && !all) ||
+                (!string.IsNullOrWhiteSpace(channel) && all))
+            {
+                result.AddError("Specify exactly one of --channel or --all.");
+            }
+        });
+    }
+
+    protected override async Task<CommandResult> ExecuteAsync(ParseResult parseResult, CancellationToken cancellationToken)
+    {
+        var channel = parseResult.GetValue(s_channelOption);
+        var all = parseResult.GetValue(s_allOption);
+        var dryRun = parseResult.GetValue(s_dryRunOption);
+        var yes = parseResult.GetValue(s_yesOption);
+        var removeSharedInstall = parseResult.GetValue(s_removeSharedInstallOption);
+        var channels = _cleanupService.ExpandChannels(channel, all);
+
+        if (channels.Count == 0)
+        {
+            InteractionService.DisplayMessage(KnownEmojis.Information, "No matching Aspire CLI cleanup targets were found.");
+            return CommandResult.Success();
+        }
+
+        if (!dryRun && !yes && !await InteractionService.PromptConfirmAsync($"Clean up Aspire CLI channel(s): {string.Join(", ", channels)}?", cancellationToken: cancellationToken))
+        {
+            return CommandResult.Cancelled();
+        }
+
+        var result = await _cleanupService.UninstallAsync(channels, removeSharedInstall, dryRun, cancellationToken);
+        HivesCommand.DisplayOperations(InteractionService, result.Operations);
+
+        return result.HasFailures ? CommandResult.Failure(CliExitCodes.InvalidCommand) : CommandResult.Success();
+    }
+}
diff --git a/src/Aspire.Cli/JsonSourceGenerationContext.cs b/src/Aspire.Cli/JsonSourceGenerationContext.cs
index 1418074f283..7ff7b045e04 100644
--- a/src/Aspire.Cli/JsonSourceGenerationContext.cs
+++ b/src/Aspire.Cli/JsonSourceGenerationContext.cs
@@ -54,6 +54,8 @@ namespace Aspire.Cli;
 [JsonSerializable(typeof(CandidateAppHostDisplayInfo))]
 [JsonSerializable(typeof(List<CandidateAppHostDisplayInfo>))]
 [JsonSerializable(typeof(InstallationInfo))]
+[JsonSerializable(typeof(InstallationInfo[]))]
+[JsonSerializable(typeof(List<InstallListItem>))]
 [JsonSerializable(typeof(AppHostInfoCacheEntry))]
 [JsonSerializable(typeof(AppHostProjectInspectionOutput))]
 internal partial class JsonSourceGenerationContext : JsonSerializerContext
diff --git a/src/Aspire.Cli/Program.cs b/src/Aspire.Cli/Program.cs
index cf3d6ba7cc7..4113bddd98d 100644
--- a/src/Aspire.Cli/Program.cs
+++ b/src/Aspire.Cli/Program.cs
@@ -350,6 +350,18 @@ internal static async Task<IHost> BuildApplicationAsync(string[] args, CliStartu
         {
             var channelReader = sp.GetRequiredService<IIdentityChannelReader>();
             var channel = channelReader.ReadChannel();
+            // Self-heal the install-source sidecar before anything reads it.
+            // WingetFirstRunProbe is a one-shot writer (no-op on non-Windows or
+            // when the running binary isn't a winget portable install). Running
+            // it here, inside the CliExecutionContext factory, guarantees the
+            // sidecar is stamped before BuildCliExecutionContext below resolves
+            // the install-aware Aspire home, before BundleService computes its
+            // extract dir, and before `aspire installs --self` reads `Source`.
+            // Without this, the first invocation from a fresh winget install
+            // would fall back to the legacy user-profile home and miss the
+            // source row, even though the sidecar would appear on subsequent
+            // runs. The probe is idempotent, so the worst case here is a no-op.
+            TryRunWingetFirstRunProbe(sp);
             return BuildCliExecutionContext(startupContext.LoggingOptions.DebugMode, startupContext.LoggingOptions.LogsDirectory, startupContext.LoggingOptions.LogFilePath, channel);
         });
         builder.Services.AddSingleton(s => new ConsoleEnvironment(
@@ -528,6 +540,9 @@ internal static async Task<IHost> BuildApplicationAsync(string[] args, CliStartu
         builder.Services.AddTransient<AddCommand>();
         builder.Services.AddTransient<PublishCommand>();
         builder.Services.AddTransient<ConfigCommand>();
+        builder.Services.AddTransient<InstallsCommand>();
+        builder.Services.AddTransient<HivesCommand>();
+        builder.Services.AddTransient<UninstallCommand>();
         builder.Services.AddTransient<CacheCommand>();
         builder.Services.AddTransient<CertificatesCommand>();
         builder.Services.AddTransient<CertificatesCleanCommand>();
@@ -577,6 +592,8 @@ internal static async Task<IHost> BuildApplicationAsync(string[] args, CliStartu
 #endif
         builder.Services.AddTransient<RootCommand>();
         builder.Services.AddTransient<ExtensionInternalCommand>();
+        builder.Services.AddTransient<Acquisition.HiveEnumerator>();
+        builder.Services.AddTransient<Uninstall.CliCleanupService>();
 
         var app = builder.Build();
         return app;
@@ -607,6 +624,41 @@ internal static CliExecutionContext BuildCliExecutionContext(bool debugMode, str
         return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, sdksDirectory, new DirectoryInfo(logsDirectory), logFilePath, debugMode, packagesDirectory: packagesDirectory, identityChannel: channel, aspireHomeDirectory: aspireHomeDirectory);
     }
 
+    /// <summary>
+    /// Invokes <see cref="WingetFirstRunProbe.Run(string)"/> for the running binary's
+    /// directory, swallowing any failure so a misbehaving probe can never block CLI startup.
+    /// Called from the <see cref="CliExecutionContext"/> DI factory so the sidecar is
+    /// stamped before any code reads it.
+    /// </summary>
+    internal static void TryRunWingetFirstRunProbe(IServiceProvider sp)
+    {
+        try
+        {
+            var processPath = Environment.ProcessPath;
+            if (string.IsNullOrEmpty(processPath))
+            {
+                return;
+            }
+
+            var binaryDir = Path.GetDirectoryName(processPath);
+            if (string.IsNullOrEmpty(binaryDir))
+            {
+                return;
+            }
+
+            sp.GetRequiredService<WingetFirstRunProbe>().Run(binaryDir);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            // The probe is best-effort startup hygiene: a stamping failure must
+            // never block the rest of the CLI from starting. Log and continue —
+            // the worst case is that an unstamped winget install surfaces as an
+            // unknown source until the next invocation retries.
+            var logger = sp.GetService<ILogger<WingetFirstRunProbe>>();
+            logger?.LogWarning(ex, "Winget first-run install sidecar probe failed during CLI startup.");
+        }
+    }
+
     private static DirectoryInfo GetCacheDirectory(string? processPath = null)
     {
         var homeDirectory = GetUsersAspirePath(processPath);
@@ -699,7 +751,7 @@ internal static async Task DisplayFirstTimeUseNoticeIfNeededAsync(IServiceProvid
 
             // Don't persist the sentinel for informational commands (--version, --help, etc.)
             // or for machine-readable invocations (--format json, including the hidden
-            // `doctor --self --format json` peer probe). Otherwise an automation invocation
+            // `installs --self --format json` peer probe). Otherwise an automation invocation
             // or peer probe — which deliberately suppressed the user-facing notice — would
             // silently consume the first-run slot, and the next interactive invocation by
             // the same user would never see the telemetry notice.
@@ -712,8 +764,8 @@ internal static async Task DisplayFirstTimeUseNoticeIfNeededAsync(IServiceProvid
 
     // Machine-readable output flags should never have welcome/telemetry text
     // interleaved with the structured payload. Today the only such flag is
-    // `--format json` (consumed by `aspire doctor`); extend this scan if new
-    // options are added.
+    // `--format json` (consumed by `aspire doctor` and `aspire installs`); extend
+    // this scan if new options are added.
     private static bool HasMachineReadableOutputFormat(string[] args)
     {
         for (var i = 0; i < args.Length; i++)
diff --git a/src/Aspire.Cli/Resources/DoctorCommandStrings.Designer.cs b/src/Aspire.Cli/Resources/DoctorCommandStrings.Designer.cs
index 6da919dceb0..20559bfa13e 100644
--- a/src/Aspire.Cli/Resources/DoctorCommandStrings.Designer.cs
+++ b/src/Aspire.Cli/Resources/DoctorCommandStrings.Designer.cs
@@ -401,123 +401,6 @@ public static string DevCertsTrustLabelPartial {
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized string similar to Aspire CLI Installations.
-        /// </summary>
-        public static string HeaderInstallations {
-            get {
-                return ResourceManager.GetString("HeaderInstallations", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Path.
-        /// </summary>
-        public static string ColumnPath {
-            get {
-                return ResourceManager.GetString("ColumnPath", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Version.
-        /// </summary>
-        public static string ColumnVersion {
-            get {
-                return ResourceManager.GetString("ColumnVersion", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Channel.
-        /// </summary>
-        public static string ColumnChannel {
-            get {
-                return ResourceManager.GetString("ColumnChannel", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Route.
-        /// </summary>
-        public static string ColumnRoute {
-            get {
-                return ResourceManager.GetString("ColumnRoute", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to PATH status.
-        /// </summary>
-        public static string ColumnPathStatus {
-            get {
-                return ResourceManager.GetString("ColumnPathStatus", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to (current).
-        /// </summary>
-        public static string ValueCurrentMarker {
-            get {
-                return ResourceManager.GetString("ValueCurrentMarker", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to (unknown).
-        /// </summary>
-        public static string ValueUnknown {
-            get {
-                return ResourceManager.GetString("ValueUnknown", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to (not probed).
-        /// </summary>
-        public static string ValueNotProbed {
-            get {
-                return ResourceManager.GetString("ValueNotProbed", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to (probe failed).
-        /// </summary>
-        public static string ValueProbeFailed {
-            get {
-                return ResourceManager.GetString("ValueProbeFailed", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to active.
-        /// </summary>
-        public static string ValuePathActive {
-            get {
-                return ResourceManager.GetString("ValuePathActive", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to shadowed.
-        /// </summary>
-        public static string ValuePathShadowed {
-            get {
-                return ResourceManager.GetString("ValuePathShadowed", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to not on PATH.
-        /// </summary>
-        public static string ValuePathNotOnPath {
-            get {
-                return ResourceManager.GetString("ValuePathNotOnPath", resourceCulture);
-            }
-        }
-
         /// <summary>
         ///   Looks up a localized string similar to Install discovery failed. See the Aspire CLI logs for details..
         /// </summary>
diff --git a/src/Aspire.Cli/Resources/DoctorCommandStrings.resx b/src/Aspire.Cli/Resources/DoctorCommandStrings.resx
index 815d879d300..9f7ff7a9d1e 100644
--- a/src/Aspire.Cli/Resources/DoctorCommandStrings.resx
+++ b/src/Aspire.Cli/Resources/DoctorCommandStrings.resx
@@ -181,52 +181,6 @@
   <data name="DevCertsTrustLabelPartial" xml:space="preserve">
     <value>[partial]</value>
   </data>
-  <data name="HeaderInstallations" xml:space="preserve">
-    <value>Aspire CLI Installations</value>
-  </data>
-  <data name="ColumnPath" xml:space="preserve">
-    <value>Path</value>
-  </data>
-  <data name="ColumnVersion" xml:space="preserve">
-    <value>Version</value>
-  </data>
-  <data name="ColumnChannel" xml:space="preserve">
-    <value>Channel</value>
-  </data>
-  <data name="ColumnRoute" xml:space="preserve">
-    <value>Route</value>
-  </data>
-  <data name="ColumnPathStatus" xml:space="preserve">
-    <value>PATH status</value>
-  </data>
-  <data name="ValueCurrentMarker" xml:space="preserve">
-    <value>(current)</value>
-    <comment>Suffix appended to the running CLI's path so the user can identify which install is themselves.</comment>
-  </data>
-  <data name="ValueUnknown" xml:space="preserve">
-    <value>(unknown)</value>
-    <comment>Placeholder shown in the table when a field could not be determined for a discovered install.</comment>
-  </data>
-  <data name="ValueNotProbed" xml:space="preserve">
-    <value>(not probed)</value>
-    <comment>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</comment>
-  </data>
-  <data name="ValueProbeFailed" xml:space="preserve">
-    <value>(probe failed)</value>
-    <comment>Placeholder shown in the table when an install was probed but did not return usable data.</comment>
-  </data>
-  <data name="ValuePathActive" xml:space="preserve">
-    <value>active</value>
-    <comment>Shown when an install is the first Aspire CLI resolved from PATH.</comment>
-  </data>
-  <data name="ValuePathShadowed" xml:space="preserve">
-    <value>shadowed</value>
-    <comment>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</comment>
-  </data>
-  <data name="ValuePathNotOnPath" xml:space="preserve">
-    <value>not on PATH</value>
-    <comment>Shown when an install was not discovered from PATH.</comment>
-  </data>
   <data name="InstallationDiscoveryFailedReason" xml:space="preserve">
     <value>Install discovery failed. See the Aspire CLI logs for details.</value>
   </data>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.cs.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.cs.xlf
index 7ace9ee9b0e..5d3573e97b9 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.cs.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.cs.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Modul runtime kontejneru</target>
@@ -197,11 +172,6 @@
         <target state="translated">Kontrola prostředí Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Shrnutí – úspěšné: {0}, upozornění: {1}, selhalo: {2}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.de.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.de.xlf
index b1ee92460c2..1cd2aade788 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.de.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.de.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Containerruntime</target>
@@ -197,11 +172,6 @@
         <target state="translated">Überprüfung der Aspire-Umgebung</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Zusammenfassung: {0} erfolgreich, {1} Warnungen, {2} fehlgeschlagen</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.es.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.es.xlf
index c460c528f4d..ff2edca38c1 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.es.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.es.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Tiempo de ejecución del contenedor</target>
@@ -197,11 +172,6 @@
         <target state="translated">Comprobación del entorno de Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Resumen: {0} correctos, {1} advertencias, {2} fallos</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.fr.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.fr.xlf
index da57cb33781..8e7392f34a2 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.fr.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.fr.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Runtime de conteneur</target>
@@ -197,11 +172,6 @@
         <target state="translated">Vérification de l’environnement Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Résumé : {0} réussis, {1} avertissements, {2} échoués</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.it.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.it.xlf
index 84288f06ea6..d47b8903e5e 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.it.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.it.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Runtime del contenitore</target>
@@ -197,11 +172,6 @@
         <target state="translated">Verifica ambiente Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Riepilogo: {0} superati, {1} avvisi, {2} non superati</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ja.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ja.xlf
index 86467014737..7effce74f2c 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ja.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ja.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">コンテナー ランタイム</target>
@@ -197,11 +172,6 @@
         <target state="translated">Aspire 環境確認</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">概要: {0} 成功、{1} 警告、{2} 失敗</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ko.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ko.xlf
index 374618a94c3..7b63ef03995 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ko.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ko.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">컨테이너 런타임</target>
@@ -197,11 +172,6 @@
         <target state="translated">Aspire 환경 검사</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">요약: {0}개 통과, {1}개 경고, {2}개 실패</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pl.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pl.xlf
index c6059837b7a..beef71a3f5e 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pl.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pl.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Środowisko uruchomieniowe kontenera</target>
@@ -197,11 +172,6 @@
         <target state="translated">Sprawdzanie środowiska Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Podsumowanie: zaliczone {0}, ostrzeżenia {1}, niezaliczone {2}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pt-BR.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pt-BR.xlf
index 0fbc55e2649..57cc37fb6e2 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pt-BR.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.pt-BR.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Runtime do Contêiner</target>
@@ -197,11 +172,6 @@
         <target state="translated">Verificação de Ambiente do Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Resumo: {0} aprovado, {1} avisos, {2} falha</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ru.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ru.xlf
index c7c56da3860..97a056dea2a 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ru.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.ru.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Среда выполнения контейнера</target>
@@ -197,11 +172,6 @@
         <target state="translated">Проверка среды Aspire</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Сводка: {0} успешно, предупреждений: {1}, {2} с ошибками</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.tr.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.tr.xlf
index 684b71ccfb7..c26f0f88b04 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.tr.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.tr.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">Kapsayıcı Çalışma Zamanı</target>
@@ -197,11 +172,6 @@
         <target state="translated">Aspire Ortamı Kontrolü</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">Özet: {0} başarılı, {1} uyarı, {2} başarısız</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hans.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hans.xlf
index fc2a1cf2c0b..55406a45d0f 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hans.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hans.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">容器运行时</target>
@@ -197,11 +172,6 @@
         <target state="translated">Aspire 环境检查</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">摘要: {0} 通过,{1} 警告， {2} 失败</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hant.xlf b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hant.xlf
index 7b50606a224..17ae0025436 100644
--- a/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hant.xlf
+++ b/src/Aspire.Cli/Resources/xlf/DoctorCommandStrings.zh-Hant.xlf
@@ -57,31 +57,6 @@
         <target state="new">Could not check for Aspire CLI updates</target>
         <note />
       </trans-unit>
-      <trans-unit id="ColumnChannel">
-        <source>Channel</source>
-        <target state="new">Channel</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPath">
-        <source>Path</source>
-        <target state="new">Path</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnPathStatus">
-        <source>PATH status</source>
-        <target state="new">PATH status</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnRoute">
-        <source>Route</source>
-        <target state="new">Route</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="ColumnVersion">
-        <source>Version</source>
-        <target state="new">Version</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ContainerCategoryHeader">
         <source>Container Runtime</source>
         <target state="translated">容器執行階段</target>
@@ -197,11 +172,6 @@
         <target state="translated">Aspire 環境檢查</target>
         <note />
       </trans-unit>
-      <trans-unit id="HeaderInstallations">
-        <source>Aspire CLI Installations</source>
-        <target state="new">Aspire CLI Installations</target>
-        <note />
-      </trans-unit>
       <trans-unit id="InstallationDiscoveryFailedReason">
         <source>Install discovery failed. See the Aspire CLI logs for details.</source>
         <target state="new">Install discovery failed. See the Aspire CLI logs for details.</target>
@@ -222,41 +192,6 @@
         <target state="translated">摘要: {0} 個通過、{1} 個警告、{2} 個已失敗</target>
         <note />
       </trans-unit>
-      <trans-unit id="ValueCurrentMarker">
-        <source>(current)</source>
-        <target state="new">(current)</target>
-        <note>Suffix appended to the running CLI's path so the user can identify which install is themselves.</note>
-      </trans-unit>
-      <trans-unit id="ValueNotProbed">
-        <source>(not probed)</source>
-        <target state="new">(not probed)</target>
-        <note>Placeholder shown in the table when an install was found but not asked to self-describe (e.g., trust gate).</note>
-      </trans-unit>
-      <trans-unit id="ValuePathActive">
-        <source>active</source>
-        <target state="new">active</target>
-        <note>Shown when an install is the first Aspire CLI resolved from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathNotOnPath">
-        <source>not on PATH</source>
-        <target state="new">not on PATH</target>
-        <note>Shown when an install was not discovered from PATH.</note>
-      </trans-unit>
-      <trans-unit id="ValuePathShadowed">
-        <source>shadowed</source>
-        <target state="new">shadowed</target>
-        <note>Shown when an install is on PATH but an earlier Aspire CLI entry shadows it.</note>
-      </trans-unit>
-      <trans-unit id="ValueProbeFailed">
-        <source>(probe failed)</source>
-        <target state="new">(probe failed)</target>
-        <note>Placeholder shown in the table when an install was probed but did not return usable data.</note>
-      </trans-unit>
-      <trans-unit id="ValueUnknown">
-        <source>(unknown)</source>
-        <target state="new">(unknown)</target>
-        <note>Placeholder shown in the table when a field could not be determined for a discovered install.</note>
-      </trans-unit>
       <trans-unit id="VersionUnknown">
         <source>unknown</source>
         <target state="new">unknown</target>
diff --git a/src/Aspire.Cli/Uninstall/CliCleanupService.cs b/src/Aspire.Cli/Uninstall/CliCleanupService.cs
new file mode 100644
index 00000000000..edd2290241c
--- /dev/null
+++ b/src/Aspire.Cli/Uninstall/CliCleanupService.cs
@@ -0,0 +1,370 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Cli.Acquisition;
+using Aspire.Cli.Bundles;
+using Aspire.Cli.Configuration;
+using Aspire.Cli.Utils;
+using Aspire.Shared;
+
+namespace Aspire.Cli.Uninstall;
+
+/// <summary>
+/// Removes Aspire CLI install state: package hives, dogfood installs, the
+/// shared script install layout under <c>~/.aspire/{bin,bundle,versions}</c>,
+/// and matching global-channel settings. Read-only hive enumeration lives on
+/// <see cref="HiveEnumerator"/>.
+/// </summary>
+internal sealed class CliCleanupService(HiveEnumerator hives, CliExecutionContext executionContext, IConfigurationService configurationService)
+{
+    private static readonly StringComparison s_pathComparison = OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+
+    public IReadOnlyList<string> ExpandChannels(string? channel, bool all)
+    {
+        if (!all)
+        {
+            return string.IsNullOrWhiteSpace(channel) ? [] : [channel];
+        }
+
+        return hives.GetHives()
+            .Select(h => h.Name)
+            .Where(IsIncludedInAll)
+            .ToList();
+    }
+
+    public async Task<CleanupResult> DeleteHiveAsync(string channel, bool force, bool dryRun, CancellationToken cancellationToken)
+    {
+        ValidateChannel(channel);
+        var operations = new List<CleanupOperation>();
+        var currentProcessPath = CliPathHelper.ResolveSymlinkToFullPath(Environment.ProcessPath);
+        var hiveDirectory = GetHiveDirectory(channel);
+        var dogfoodDirectory = GetDogfoodDirectory(channel);
+
+        if (dogfoodDirectory.Exists && !force)
+        {
+            operations.Add(CleanupOperation.Skipped(
+                hiveDirectory.FullName,
+                $"A matching dogfood install exists. Run 'aspire uninstall --channel {channel}' to remove both the hive and dogfood install, or pass --force to delete only the hive."));
+            return new CleanupResult(operations, HasFailures: true);
+        }
+
+        operations.Add(await DeleteDirectoryAsync(hiveDirectory, currentProcessPath, dryRun, cancellationToken));
+        return new CleanupResult(operations, operations.Any(o => o.Status is CleanupOperationStatus.Failed));
+    }
+
+    public async Task<CleanupResult> UninstallAsync(IReadOnlyList<string> channels, bool removeSharedInstall, bool dryRun, CancellationToken cancellationToken)
+    {
+        foreach (var channel in channels)
+        {
+            ValidateChannel(channel);
+        }
+
+        var operations = new List<CleanupOperation>();
+        var currentProcessPath = CliPathHelper.ResolveSymlinkToFullPath(Environment.ProcessPath);
+
+        foreach (var channel in channels)
+        {
+            var hiveDirectory = GetHiveDirectory(channel);
+            operations.Add(await DeleteDirectoryAsync(hiveDirectory, currentProcessPath, dryRun, cancellationToken));
+
+            if (IsPrChannel(channel))
+            {
+                var dogfoodDirectory = GetDogfoodDirectory(channel);
+                if (dogfoodDirectory.Exists)
+                {
+                    operations.Add(DeleteDirectoryUnlessRunningFromTarget(dogfoodDirectory, currentProcessPath, dryRun));
+                }
+            }
+
+            await DeleteMatchingGlobalChannelAsync(channel, dryRun, operations, cancellationToken);
+        }
+
+        var sharedRemovalIncomplete = false;
+        if (removeSharedInstall)
+        {
+            sharedRemovalIncomplete = AddSharedInstallOperations(currentProcessPath, dryRun, operations);
+        }
+        else if (channels.Any(IsSharedScriptChannel) && SharedInstallExists())
+        {
+            operations.Add(CleanupOperation.Skipped(
+                GetSharedBinDirectory().FullName,
+                "Shared script install artifacts were left in place. Pass --remove-shared-install to remove ~/.aspire/bin/aspire and the matching bundle/versions layout."));
+        }
+
+        // sharedRemovalIncomplete is only honored outside dry-run: dry-run is a
+        // describe-only mode and should not fail just because a real cleanup
+        // would have been blocked by a lease at runtime.
+        var hasFailures = operations.Any(o => o.Status is CleanupOperationStatus.Failed)
+            || (sharedRemovalIncomplete && !dryRun);
+        return new CleanupResult(operations, hasFailures);
+    }
+
+    private async Task DeleteMatchingGlobalChannelAsync(string channel, bool dryRun, List<CleanupOperation> operations, CancellationToken cancellationToken)
+    {
+        var globalConfig = await configurationService.GetGlobalConfigurationAsync(cancellationToken);
+        if (globalConfig.TryGetValue("channel", out var configuredChannel) &&
+            string.Equals(configuredChannel, channel, StringComparison.Ordinal))
+        {
+            if (dryRun)
+            {
+                operations.Add(CleanupOperation.WouldRemove(configurationService.GetSettingsFilePath(isGlobal: true), "matching global channel"));
+                return;
+            }
+
+            var deleted = await configurationService.DeleteConfigurationAsync("channel", isGlobal: true, cancellationToken);
+            operations.Add(deleted
+                ? CleanupOperation.Removed(configurationService.GetSettingsFilePath(isGlobal: true), "matching global channel")
+                : CleanupOperation.Failed(configurationService.GetSettingsFilePath(isGlobal: true), "Matching global channel could not be deleted."));
+        }
+    }
+
+    private DirectoryInfo GetHiveDirectory(string channel)
+        => new(Path.Combine(executionContext.HivesDirectory.FullName, channel));
+
+    // Reject channel names that contain path separators or `..` segments so a
+    // crafted `--channel` argument cannot resolve outside the hives root and
+    // recursively delete unrelated directories.
+    private static void ValidateChannel(string channel)
+    {
+        if (string.IsNullOrWhiteSpace(channel) ||
+            channel.Contains('/', StringComparison.Ordinal) ||
+            channel.Contains('\\', StringComparison.Ordinal) ||
+            channel == "." || channel == ".." ||
+            channel.Contains("..", StringComparison.Ordinal))
+        {
+            throw new ArgumentException($"Invalid channel name '{channel}'. Channel names must not contain path separators or '..'.", nameof(channel));
+        }
+    }
+
+    // Resolve the install layout root by walking up from HivesDirectory rather
+    // than reading executionContext.AspireHomeDirectory directly. In production
+    // those two paths agree (~/.aspire), but tests can configure HivesDirectory
+    // independently from HomeDirectory; the layout root the script installer
+    // wrote into is always the parent of `hives/`.
+    private DirectoryInfo GetAspireHomeDirectory()
+        => executionContext.HivesDirectory.Parent ?? executionContext.AspireHomeDirectory;
+
+    private DirectoryInfo GetDogfoodDirectory(string channel)
+        => new(Path.Combine(GetAspireHomeDirectory().FullName, "dogfood", channel));
+
+    private DirectoryInfo GetSharedBinDirectory()
+        => new(Path.Combine(GetAspireHomeDirectory().FullName, "bin"));
+
+    private bool SharedInstallExists()
+    {
+        // Check the bin/sidecar targets and the bundle path independently so
+        // a bundle-only remnant still triggers the "shared artifacts left in
+        // place" hint even though EnumerateSharedBinTargets no longer yields
+        // the bundle path.
+        if (EnumerateSharedBinTargets().Any(t => t.Exists))
+        {
+            return true;
+        }
+
+        return GetBundleDirectory().Exists;
+    }
+
+    private IEnumerable<FileSystemInfo> EnumerateSharedBinTargets()
+    {
+        var binDirectory = GetSharedBinDirectory();
+        var binaryPath = Path.Combine(binDirectory.FullName, OperatingSystem.IsWindows() ? "aspire.exe" : "aspire");
+        yield return new FileInfo(binaryPath);
+        yield return new FileInfo(Path.Combine(binDirectory.FullName, ".aspire-install.json"));
+    }
+
+    private DirectoryInfo GetBundleDirectory()
+        => new(Path.Combine(GetAspireHomeDirectory().FullName, BundleDiscovery.BundleDirectoryName));
+
+    // Returns true when the shared-install removal could not be carried out in
+    // full (e.g. a leased bundle version was skipped). The caller promotes
+    // that to a non-zero exit so automation can tell "fully removed" from
+    // "removed everything except the leased bundle".
+    private bool AddSharedInstallOperations(string? currentProcessPath, bool dryRun, List<CleanupOperation> operations)
+    {
+        // Resolve the bundle symlink target BEFORE deleting anything: once the
+        // symlink is gone ResolveLinkTarget can no longer recover the
+        // versions/<v>/ tree, and the leased-version guard below depends on
+        // knowing the target path.
+        var bundleDirectory = GetBundleDirectory();
+        var bundleVersionResult = ResolveBundleVersionTarget(bundleDirectory);
+
+        foreach (var target in EnumerateSharedBinTargets())
+        {
+            operations.Add(DeleteFileSystemInfoUnlessRunningFromTarget(target, currentProcessPath, dryRun));
+        }
+
+        switch (bundleVersionResult)
+        {
+            case BundleVersionTargetResult.Target target:
+                // Skip both the symlink and the version directory when another
+                // aspire process holds a lease on this version. Deleting only
+                // the symlink would leave the lease holder unable to
+                // re-resolve ~/.aspire/bundle even though the version itself
+                // was preserved — silently defeating the lease guard.
+                // Matches BundleService.TryCleanupStaleVersions which refuses
+                // to touch leased entries.
+                if (BundleVersionLease.HasActiveLease(target.Directory.FullName))
+                {
+                    operations.Add(CleanupOperation.Skipped(
+                        bundleDirectory.FullName,
+                        "Another running CLI / AppHost holds an active lease on the bundle version this link points at; leaving the link in place so the lease holder can still resolve it."));
+                    operations.Add(CleanupOperation.Skipped(
+                        target.Directory.FullName,
+                        "Another running CLI / AppHost holds an active lease on this bundle version. Stop those processes and re-run cleanup."));
+                    return true;
+                }
+                operations.Add(DeleteFileSystemInfoUnlessRunningFromTarget(bundleDirectory, currentProcessPath, dryRun));
+                operations.Add(DeleteFileSystemInfoUnlessRunningFromTarget(target.Directory, currentProcessPath, dryRun));
+                break;
+            case BundleVersionTargetResult.ExternalLink:
+                // Symlink resolves outside versions/ (e.g. a dev-mode redirect).
+                // Removing just the symlink is safe; recursive delete on a
+                // symlinked directory removes the link, not the target tree.
+                operations.Add(DeleteFileSystemInfoUnlessRunningFromTarget(bundleDirectory, currentProcessPath, dryRun));
+                break;
+            case BundleVersionTargetResult.NotALinkOrMissing:
+                // No symlink (or a real directory at ~/.aspire/bundle) — fall
+                // through to recursive delete. The script installer always
+                // creates a symlink, so a real directory here is an anomalous
+                // state we still clean up; recursive delete on a missing path
+                // is a no-op via the "does not exist" skip.
+                operations.Add(DeleteFileSystemInfoUnlessRunningFromTarget(bundleDirectory, currentProcessPath, dryRun));
+                break;
+            case BundleVersionTargetResult.ResolveFailed failure:
+                // Cannot tell where the symlink points — refuse to delete it,
+                // because deleting it would silently strand whatever
+                // versions/<v>/ tree it referenced.
+                operations.Add(CleanupOperation.Failed(bundleDirectory.FullName, $"Could not resolve bundle link target to clean up versions/<v>/: {failure.Reason}"));
+                break;
+        }
+
+        return false;
+    }
+
+    private BundleVersionTargetResult ResolveBundleVersionTarget(DirectoryInfo bundleDirectory)
+    {
+        try
+        {
+            var resolvedTarget = bundleDirectory.ResolveLinkTarget(returnFinalTarget: true);
+            if (resolvedTarget is not DirectoryInfo targetDirectory)
+            {
+                // ResolveLinkTarget returns null when the path is not a reparse
+                // point/symlink (including when the path doesn't exist). Lumping
+                // these into one case is safe because both share the same
+                // downstream handling: nothing to detach from.
+                return new BundleVersionTargetResult.NotALinkOrMissing();
+            }
+
+            var versionsDirectory = new DirectoryInfo(Path.Combine(GetAspireHomeDirectory().FullName, BundleService.VersionsDirectoryName));
+            if (!IsPathUnderTarget(targetDirectory.FullName, versionsDirectory.FullName))
+            {
+                return new BundleVersionTargetResult.ExternalLink();
+            }
+
+            return new BundleVersionTargetResult.Target(targetDirectory);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or ArgumentException or NotSupportedException or System.Security.SecurityException)
+        {
+            return new BundleVersionTargetResult.ResolveFailed(ex.Message);
+        }
+    }
+
+    private abstract record BundleVersionTargetResult
+    {
+        internal sealed record Target(DirectoryInfo Directory) : BundleVersionTargetResult;
+        internal sealed record ExternalLink : BundleVersionTargetResult;
+        internal sealed record NotALinkOrMissing : BundleVersionTargetResult;
+        internal sealed record ResolveFailed(string Reason) : BundleVersionTargetResult;
+    }
+
+    private static bool IsPrChannel(string channel)
+        => channel.StartsWith("pr-", StringComparison.Ordinal);
+
+    private static bool IsSharedScriptChannel(string channel)
+        => channel is "stable" or "staging" or "daily";
+
+    private static bool IsIncludedInAll(string channel)
+        => channel is "staging" or "daily" || IsPrChannel(channel);
+
+    private static CleanupOperation DeleteDirectoryUnlessRunningFromTarget(DirectoryInfo directory, string? currentProcessPath, bool dryRun)
+        => DeleteFileSystemInfoUnlessRunningFromTarget(directory, currentProcessPath, dryRun);
+
+    private static CleanupOperation DeleteFileSystemInfoUnlessRunningFromTarget(FileSystemInfo target, string? currentProcessPath, bool dryRun)
+    {
+        if (!target.Exists)
+        {
+            return CleanupOperation.Skipped(target.FullName, "does not exist");
+        }
+
+        // Fail closed: if we cannot determine where the running CLI lives, do
+        // not delete — a successful resolution is the only signal that we're
+        // not removing ourselves out from under the current process.
+        if (currentProcessPath is null)
+        {
+            return CleanupOperation.Failed(target.FullName, "Could not determine the running CLI path; refusing to delete cleanup targets. Re-run from a fully-resolved CLI invocation.");
+        }
+
+        if (IsPathUnderTarget(currentProcessPath, target.FullName))
+        {
+            return CleanupOperation.Failed(target.FullName, "The running CLI is inside this target. Re-run cleanup after this process exits or delete it manually.");
+        }
+
+        if (dryRun)
+        {
+            return CleanupOperation.WouldRemove(target.FullName);
+        }
+
+        try
+        {
+            switch (target)
+            {
+                case DirectoryInfo directory:
+                    directory.Delete(recursive: true);
+                    break;
+                case FileInfo file:
+                    file.Delete();
+                    break;
+            }
+
+            return CleanupOperation.Removed(target.FullName);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or System.Security.SecurityException)
+        {
+            return CleanupOperation.Failed(target.FullName, ex.Message);
+        }
+    }
+
+    private static Task<CleanupOperation> DeleteDirectoryAsync(DirectoryInfo directory, string? currentProcessPath, bool dryRun, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return Task.FromResult(DeleteFileSystemInfoUnlessRunningFromTarget(directory, currentProcessPath, dryRun));
+    }
+
+    internal static bool IsPathUnderTarget(string path, string targetPath)
+    {
+        var normalizedPath = Path.TrimEndingDirectorySeparator(Path.GetFullPath(path));
+        var normalizedTarget = Path.TrimEndingDirectorySeparator(Path.GetFullPath(targetPath));
+
+        return string.Equals(normalizedPath, normalizedTarget, s_pathComparison) ||
+               normalizedPath.StartsWith(normalizedTarget + Path.DirectorySeparatorChar, s_pathComparison) ||
+               normalizedPath.StartsWith(normalizedTarget + Path.AltDirectorySeparatorChar, s_pathComparison);
+    }
+}
+
+internal sealed record CleanupResult(IReadOnlyList<CleanupOperation> Operations, bool HasFailures);
+
+internal sealed record CleanupOperation(string Path, CleanupOperationStatus Status, string Reason)
+{
+    public static CleanupOperation Removed(string path, string reason = "") => new(path, CleanupOperationStatus.Removed, reason);
+    public static CleanupOperation WouldRemove(string path, string reason = "") => new(path, CleanupOperationStatus.WouldRemove, reason);
+    public static CleanupOperation Skipped(string path, string reason) => new(path, CleanupOperationStatus.Skipped, reason);
+    public static CleanupOperation Failed(string path, string reason) => new(path, CleanupOperationStatus.Failed, reason);
+}
+
+internal enum CleanupOperationStatus
+{
+    Removed,
+    WouldRemove,
+    Skipped,
+    Failed
+}
diff --git a/src/Aspire.Cli/Utils/CliPathHelper.cs b/src/Aspire.Cli/Utils/CliPathHelper.cs
index 2497a093443..9b04f85b44d 100644
--- a/src/Aspire.Cli/Utils/CliPathHelper.cs
+++ b/src/Aspire.Cli/Utils/CliPathHelper.cs
@@ -13,11 +13,11 @@ internal static string GetAspireHomeDirectory(string? processPath = null, ILogge
     {
         var effectiveProcessPath = processPath ?? Environment.ProcessPath;
 
-        return TryGetAspireHomeDirectoryFromInstallRoute(effectiveProcessPath, logger)
+        return TryGetAspireHomeDirectoryFromInstallSource(effectiveProcessPath, logger)
             ?? Path.Combine(GetUserProfileDirectory(), ".aspire");
     }
 
-    internal static string? TryGetAspireHomeDirectoryFromInstallRoute(string? processPath, ILogger? logger = null)
+    internal static string? TryGetAspireHomeDirectoryFromInstallSource(string? processPath, ILogger? logger = null)
     {
         if (string.IsNullOrEmpty(processPath))
         {
diff --git a/src/Aspire.Cli/Utils/EnvironmentChecker/EnvironmentCheckResult.cs b/src/Aspire.Cli/Utils/EnvironmentChecker/EnvironmentCheckResult.cs
index f699dbceff5..4fdd2920919 100644
--- a/src/Aspire.Cli/Utils/EnvironmentChecker/EnvironmentCheckResult.cs
+++ b/src/Aspire.Cli/Utils/EnvironmentChecker/EnvironmentCheckResult.cs
@@ -4,7 +4,6 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using Aspire.Cli.Acquisition;
 
 namespace Aspire.Cli.Utils.EnvironmentChecker;
 
@@ -133,12 +132,6 @@ internal sealed class DoctorCheckResponse
     /// </summary>
     [JsonPropertyName("summary")]
     public required DoctorCheckSummary Summary { get; set; }
-
-    /// <summary>
-    /// Gets or sets the discovered Aspire CLI installations.
-    /// </summary>
-    [JsonPropertyName("installations")]
-    public List<InstallationInfo>? Installations { get; set; }
 }
 
 /// <summary>
diff --git a/src/Shared/PathLookupHelper.cs b/src/Shared/PathLookupHelper.cs
index bbcb10cc1f2..9036f1114ee 100644
--- a/src/Shared/PathLookupHelper.cs
+++ b/src/Shared/PathLookupHelper.cs
@@ -139,9 +139,9 @@ private static IEnumerable<string> FindAllFullPaths(string command, string? path
                 foreach (var extension in pathExtensions)
                 {
                     if (TryCombine(directory, command + extension, out var fullPathWithExt) &&
-                        FileExistsSafe(fileExists, fullPathWithExt))
+                        TryResolveExistingPath(fileExists, fullPathWithExt, out var existingPathWithExt))
                     {
-                        yield return fullPathWithExt;
+                        yield return existingPathWithExt;
                         foundExtensionMatch = true;
                         break;
                     }
@@ -155,9 +155,9 @@ private static IEnumerable<string> FindAllFullPaths(string command, string? path
 
             // Try exact match (for non-Windows, or as fallback on Windows if no extension match found in this directory).
             if (TryCombine(directory, command, out var fullPath) &&
-                FileExistsSafe(fileExists, fullPath))
+                TryResolveExistingPath(fileExists, fullPath, out var existingPath))
             {
-                yield return fullPath;
+                yield return existingPath;
             }
         }
     }
@@ -192,6 +192,53 @@ private static bool FileExistsSafe(Func<string, bool> fileExists, string path)
         }
     }
 
+    private static bool TryResolveExistingPath(Func<string, bool> fileExists, string path, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out string? existingPath)
+    {
+        existingPath = null;
+        if (!FileExistsSafe(fileExists, path))
+        {
+            return false;
+        }
+
+        // Windows PATH probing appends PATHEXT entries such as ".EXE" even when
+        // the file is named "aspire.exe"; return the filesystem spelling so
+        // user-facing output doesn't inherit PATHEXT casing.
+        existingPath = TryGetActualPathCasing(path) ?? path;
+        return true;
+    }
+
+    private static string? TryGetActualPathCasing(string path)
+    {
+        if (!OperatingSystem.IsWindows())
+        {
+            return null;
+        }
+
+        var directory = Path.GetDirectoryName(path);
+        var fileName = Path.GetFileName(path);
+        if (string.IsNullOrEmpty(directory) || string.IsNullOrEmpty(fileName))
+        {
+            return null;
+        }
+
+        try
+        {
+            foreach (var entry in Directory.EnumerateFileSystemEntries(directory, fileName))
+            {
+                if (string.Equals(Path.GetFileName(entry), fileName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return entry;
+                }
+            }
+        }
+        catch (Exception ex) when (ex is ArgumentException or DirectoryNotFoundException or IOException or NotSupportedException or PathTooLongException or UnauthorizedAccessException or System.Security.SecurityException)
+        {
+            return null;
+        }
+
+        return null;
+    }
+
     private static bool IsExplicitExecutablePath(string executablePath)
     {
         return !string.Equals(Path.GetFileName(executablePath), executablePath, StringComparison.Ordinal)
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/Common/FakeArchiveHelper.cs b/tests/Aspire.Acquisition.Tests/Scripts/Common/FakeArchiveHelper.cs
index 9d571c4238f..5ccdbc2414b 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/Common/FakeArchiveHelper.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/Common/FakeArchiveHelper.cs
@@ -84,7 +84,7 @@ public static async Task<FakeArchive> CreateFakeArchiveWithBadChecksumAsync(stri
     /// </summary>
     /// <param name="includeStraySidecar">When true, adds a <c>.aspire-install.json</c>
     /// at the archive root so the verifier's sidecar-rejection contract can be
-    /// asserted; see <c>docs/specs/install-routes.md</c>.</param>
+    /// asserted; see <c>docs/specs/install-sources.md</c>.</param>
     /// <param name="nestAspireUnderSubdir">When true, places the <c>aspire</c> binary
     /// under a single subdirectory inside the archive rather than at the root. This
     /// exercises <c>Get-ArchiveRoot</c>'s single-subdirectory branch and confirms the
@@ -119,7 +119,7 @@ public static async Task<FakeArchive> CreateFakeVerifyArchiveAsync(
 
             if (includeStraySidecar)
             {
-                // Per docs/specs/install-routes.md, per-RID archives must ship
+                // Per docs/specs/install-sources.md, per-RID archives must ship
                 // sidecar-free. The verifier rejects archives that contain a
                 // .aspire-install.json at the archive root.
                 var sidecarPath = Path.Combine(contentDir, ".aspire-install.json");
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/LocalHiveScriptFunctionTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/LocalHiveScriptFunctionTests.cs
index 2d6c59b8878..3e13b9c2fc0 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/LocalHiveScriptFunctionTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/LocalHiveScriptFunctionTests.cs
@@ -72,12 +72,22 @@ public void Source_DoesNotWriteGlobalChannel(string scriptPathName)
         Assert.DoesNotContain("aspire config set", source, StringComparison.OrdinalIgnoreCase);
     }
 
+    [Theory]
+    [InlineData(nameof(ScriptPaths.LocalHiveShell))]
+    [InlineData(nameof(ScriptPaths.LocalHivePowerShell))]
+    public void Source_DoesNotReferenceInfoCommand(string scriptPathName)
+    {
+        var source = File.ReadAllText(GetRepoPath(GetScriptPath(scriptPathName)));
+
+        Assert.DoesNotContain("aspire info", source, StringComparison.OrdinalIgnoreCase);
+    }
+
     [Fact]
     public void PowerShellSource_WindowsArchivePathDoesNotUseCompressArchive()
     {
         // Compress-Archive enumerates inputs via the PowerShell provider, which on
         // non-Windows hosts hides dotfiles from `<dir>/*` wildcard expansion. The
-        // portable layout includes bin/.aspire-install.json — the localhive route
+        // portable layout includes bin/.aspire-install.json — the localhive source
         // sidecar — and silently dropping it from a win-* zip built on Linux/macOS
         // would produce sidecar-less installs on the target. Use
         // [System.IO.Compression.ZipFile]::CreateFromDirectory instead.
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallE2ETests.cs b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallE2ETests.cs
index b69318b4d85..29ef9822a74 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallE2ETests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallE2ETests.cs
@@ -20,7 +20,7 @@ public class PRScriptInstallE2ETests(ITestOutputHelper testOutput)
     private readonly ITestOutputHelper _testOutput = testOutput;
 
     [Fact]
-    public async Task PRScript_InstallsCliAndWritesRouteSidecar()
+    public async Task PRScript_InstallsCliAndWritesSourceSidecar()
     {
         using var env = new TestEnvironment();
         var cancellationToken = TestContext.Current.CancellationToken;
@@ -57,7 +57,7 @@ public async Task PRScript_InstallsCliAndWritesRouteSidecar()
         Assert.True(File.Exists(Path.Combine(binDir, "aspire")), $"CLI binary missing under {binDir}");
 
         var sidecarPath = Path.Combine(binDir, ".aspire-install.json");
-        Assert.True(File.Exists(sidecarPath), $"Route sidecar missing at {sidecarPath}");
+        Assert.True(File.Exists(sidecarPath), $"Source sidecar missing at {sidecarPath}");
 
         var sidecarContent = await File.ReadAllTextAsync(sidecarPath, cancellationToken);
         _testOutput.WriteLine($"Sidecar content after install: {sidecarContent}");
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallerModeTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallerModeTests.cs
index 4741ada81bf..01a96c191b3 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallerModeTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptInstallerModeTests.cs
@@ -170,7 +170,7 @@ exit 0
                 ;;
             esac
 
-            echo "unexpected brew command: $*" >&2
+            echo "unexpected Homebrew command: $*" >&2
             exit 1
             """);
         FileHelper.MakeExecutable(brewPath);
@@ -471,7 +471,7 @@ public async Task Bash_WinGetMode_PrDryRun_DownloadsManifestAndNativeArchives()
         Assert.Contains("-Force", result.Output);
         Assert.Contains("built-nugets", result.Output);
         Assert.DoesNotContain("Add to your shell profile", result.Output);
-        Assert.DoesNotContain("route sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("source sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
         Assert.DoesNotContain("dogfood/pr-12345/bin", result.Output);
     }
 
@@ -496,7 +496,7 @@ public async Task Bash_HomebrewMode_PrDryRun_DownloadsCaskAndNativeArchives()
         Assert.Contains("--archive-root", result.Output);
         Assert.Contains("built-nugets", result.Output);
         Assert.DoesNotContain("Add to your shell profile", result.Output);
-        Assert.DoesNotContain("route sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("source sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
         Assert.DoesNotContain("dogfood/pr-12345/bin", result.Output);
     }
 
@@ -634,7 +634,7 @@ public async Task PowerShell_WinGetMode_WhatIf_DownloadsManifestAndNativeArchive
         Assert.Contains("-Force", result.Output);
         Assert.Contains("built-nugets", result.Output);
         Assert.DoesNotContain("Add to your shell profile", result.Output);
-        Assert.DoesNotContain("Route sidecar", result.Output);
+        Assert.DoesNotContain("Source sidecar", result.Output);
         Assert.DoesNotContain($"dogfood{Path.DirectorySeparatorChar}pr-12345{Path.DirectorySeparatorChar}bin", result.Output);
     }
 
@@ -659,7 +659,7 @@ public async Task PowerShell_HomebrewMode_WhatIf_DownloadsCaskAndNativeArchives(
         Assert.Contains("--archive-root", result.Output);
         Assert.Contains("built-nugets", result.Output);
         Assert.DoesNotContain("Add to your shell profile", result.Output);
-        Assert.DoesNotContain("Route sidecar", result.Output);
+        Assert.DoesNotContain("Source sidecar", result.Output);
         Assert.DoesNotContain($"dogfood{Path.DirectorySeparatorChar}pr-12345{Path.DirectorySeparatorChar}bin", result.Output);
     }
 
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptPowerShellTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptPowerShellTests.cs
index 769f442d673..74fc72dc519 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptPowerShellTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptPowerShellTests.cs
@@ -93,6 +93,27 @@ public async Task WhatIfWithPRNumber_ShowsSteps()
         Assert.Contains("12345", result.Output);
     }
 
+    [Fact]
+    public async Task UninstallWhatIfWithPRNumber_ShowsHiveAndDogfoodTargets()
+    {
+        using var env = new TestEnvironment();
+        var installPrefix = Path.Combine(env.TempDirectory, "aspire");
+        Directory.CreateDirectory(Path.Combine(installPrefix, "hives", "pr-12345", "packages"));
+        Directory.CreateDirectory(Path.Combine(installPrefix, "dogfood", "pr-12345", "bin"));
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+
+        var result = await cmd.ExecuteAsync(
+            "-PRNumber", "12345",
+            "-Uninstall",
+            "-InstallPath", installPrefix,
+            "-WhatIf");
+
+        result.EnsureSuccessful();
+        Assert.Contains("hive pr-12345", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("dogfood install pr-12345", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("RemoveSharedInstall", result.Output);
+    }
+
     [Fact]
     public async Task MockGhApiWithoutJqFailsLoudly()
     {
@@ -435,14 +456,14 @@ public async Task LocalDir_WhatIf_WithGitHubRunIdEnvSet_UsesLocalHiveLabel()
         Assert.DoesNotContain("run-99999", result.Output, StringComparison.OrdinalIgnoreCase);
     }
 
-    // PR-route CLI binary lands at <prefix>/dogfood/pr-<N>/bin so PR installs
-    // do not collide with the script-route prefix or with other PR installs.
+    // PR-source CLI binary lands at <prefix>/dogfood/pr-<N>/bin so PR installs
+    // do not collide with the script-source prefix or with other PR installs.
     // Under -WhatIf the script emits the absolute install path via a
     // "What if: Aspire CLI binary would be installed to: <path>" message on stdout
     // (PS-native WhatIf style); this test parses that message to verify the
     // resolved install path.
     [Fact]
-    public async Task WhatIf_PRRoute_CliInstallPath_IsUnderDogfoodPrN()
+    public async Task WhatIf_PRSource_CliInstallPath_IsUnderDogfoodPrN()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -455,14 +476,14 @@ public async Task WhatIf_PRRoute_CliInstallPath_IsUnderDogfoodPrN()
         Assert.Contains($"What if: Aspire CLI binary would be installed to: {expectedBinaryPath}", result.Output);
     }
 
-    // Under -WhatIf the PR-route script must NOT write the source=pr sidecar
+    // Under -WhatIf the PR-source script must NOT write the source=pr sidecar
     // at <prefix>/dogfood/pr-<N>/.aspire-install.json. The describe-but-do-not-do
     // contract requires the script to print a "What if:" message naming the path
     // it would write, then return without touching the filesystem. Positive
-    // sidecar content (the source field) for the PR route is covered by
+    // sidecar content (the source field) for the PR source is covered by
     // end-to-end install runs, not at this unit-test layer.
     [Fact]
-    public async Task WhatIf_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath()
+    public async Task WhatIf_PRSource_DoesNotWriteSidecar_AndAnnouncesPath()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -472,13 +493,13 @@ public async Task WhatIf_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "dogfood", "pr-99999", "bin", ".aspire-install.json");
-        Assert.Contains($"What if: Route sidecar would be written to: {sidecarPath}", result.Output);
+        Assert.Contains($"What if: Source sidecar would be written to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under -WhatIf, but found one at {sidecarPath}");
     }
 
-    // PR-route install prints the PATH-activation hint via Write-Host. The
+    // PR-source install prints the PATH-activation hint via Write-Host. The
     // OS path separator keeps the line valid on both Windows (;) and Unix (:).
     // The new-PATH expression must be double-quoted so PowerShell expands
     // `$env:PATH` when the user pastes the line into their profile — single
@@ -487,7 +508,7 @@ public async Task WhatIf_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath()
     // Separator before `$env:PATH` must be [System.IO.Path]::PathSeparator — a
     // hard-coded ":" or ";" breaks the hint on the opposite platform.
     [Fact]
-    public async Task WhatIf_PRRoute_PrintsPathHintToStdout()
+    public async Task WhatIf_PRSource_PrintsPathHintToStdout()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -510,7 +531,7 @@ public async Task WhatIf_PRRoute_PrintsPathHintToStdout()
     }
 
     [Fact]
-    public async Task WhatIf_PRRoute_PrintsPathHintWithAbsoluteInstallPath()
+    public async Task WhatIf_PRSource_PrintsPathHintWithAbsoluteInstallPath()
     {
         using var env = new TestEnvironment();
         var customPath = Path.Combine(env.TempDirectory, "custom-prefix");
@@ -541,9 +562,9 @@ private static string ExtractShellProfileHintLine(string output)
         return string.Empty;
     }
 
-    // PR-route hive location is unchanged at <prefix>/hives/pr-<N>/packages.
+    // PR-source hive location is unchanged at <prefix>/hives/pr-<N>/packages.
     [Fact]
-    public async Task WhatIf_PRRoute_HiveLocation_IsUnchanged()
+    public async Task WhatIf_PRSource_HiveLocation_IsUnchanged()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -555,12 +576,12 @@ public async Task WhatIf_PRRoute_HiveLocation_IsUnchanged()
         Assert.Contains(expectedHive, result.Output);
     }
 
-    // The PR-route script must not mutate route sidecars under -WhatIf.
-    // Companion to WhatIf_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath; kept as a
+    // The PR-source script must not mutate source sidecars under -WhatIf.
+    // Companion to WhatIf_PRSource_DoesNotWriteSidecar_AndAnnouncesPath; kept as a
     // separate test method to keep -WhatIf sidecar-absence coverage visible in
     // test inventories alongside the other -WhatIf guards.
     [Fact]
-    public async Task WhatIf_PRRoute_DoesNotWriteSidecar_AnyContentRegression()
+    public async Task WhatIf_PRSource_DoesNotWriteSidecar_AnyContentRegression()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -576,7 +597,7 @@ public async Task WhatIf_PRRoute_DoesNotWriteSidecar_AnyContentRegression()
 
     // Under -WhatIf no global aspire.config.json is created.
     [Fact]
-    public async Task WhatIf_PRRoute_DoesNotCreateGlobalAspireConfigJson()
+    public async Task WhatIf_PRSource_DoesNotCreateGlobalAspireConfigJson()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -618,7 +639,7 @@ public async Task WhatIf_LocalDir_DoesNotWriteSidecar()
         // -LocalDir without a PR number is an unmanaged install, so the script must
         // not write a sidecar; the resolver should return Unknown for these installs.
         var binSidecar = Path.Combine(env.MockHome, ".aspire", "bin", ".aspire-install.json");
-        Assert.False(File.Exists(binSidecar), $"--local-dir install must not write sidecar at {binSidecar} (unmanaged route).");
+        Assert.False(File.Exists(binSidecar), $"--local-dir install must not write sidecar at {binSidecar} (unmanaged source).");
 
         // Defensive: assert no .aspire-install.json anywhere under the install root.
         var aspireRoot = Path.Combine(env.MockHome, ".aspire");
@@ -659,7 +680,7 @@ public async Task VeryLargePRNumber_AboveIntMax_Rejected_AndCreatesNoFiles()
 
     // Non-numeric / special-char PR_NUMBER is rejected at parameter
     // binding ([int] cast or ValidateRange). This guards against path injection / command
-    // injection routes via the PR_NUMBER value.
+    // injection sources via the PR_NUMBER value.
     [Theory]
     [InlineData("../etc")]
     [InlineData("..")]
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptShellTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptShellTests.cs
index 6b778a298d2..2a07a826eee 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptShellTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptShellTests.cs
@@ -84,6 +84,23 @@ public async Task DryRunWithPRNumber_ShowsSteps()
         Assert.Contains("[DRY RUN]", result.Output);
     }
 
+    [Fact]
+    public async Task UninstallDryRunWithPRNumber_ShowsHiveAndDogfoodTargets()
+    {
+        using var env = new TestEnvironment();
+        var installPrefix = Path.Combine(env.TempDirectory, "aspire");
+        Directory.CreateDirectory(Path.Combine(installPrefix, "hives", "pr-12345", "packages"));
+        Directory.CreateDirectory(Path.Combine(installPrefix, "dogfood", "pr-12345", "bin"));
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+
+        var result = await cmd.ExecuteAsync("12345", "--uninstall", "--dry-run", "--install-path", installPrefix);
+
+        result.EnsureSuccessful();
+        Assert.Contains("hive pr-12345", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("dogfood install pr-12345", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("--remove-shared-install", result.Output);
+    }
+
     [Fact]
     public async Task MockGhApiWorkflowWithoutJqFailsLoudly()
     {
@@ -510,13 +527,13 @@ public async Task LocalDir_DryRun_WithGitHubRunIdEnvSet_UsesLocalHiveLabel()
         Assert.DoesNotContain("run-99999", result.Output, StringComparison.OrdinalIgnoreCase);
     }
 
-    // PR-route CLI binary lands at <prefix>/dogfood/pr-<N>/bin so PR installs
-    // do not collide with the script-route prefix (<prefix>/bin) or with other PR installs.
+    // PR-source CLI binary lands at <prefix>/dogfood/pr-<N>/bin so PR installs
+    // do not collide with the script-source prefix (<prefix>/bin) or with other PR installs.
     // Under --dry-run the script emits the absolute install path via a
     // "DRYRUN: would install Aspire CLI binary to: <path>" message on stdout;
     // this test parses that message to verify the resolved install path.
     [Fact]
-    public async Task DryRun_PRRoute_CliInstallPath_IsUnderDogfoodPrN()
+    public async Task DryRun_PRSource_CliInstallPath_IsUnderDogfoodPrN()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -526,18 +543,18 @@ public async Task DryRun_PRRoute_CliInstallPath_IsUnderDogfoodPrN()
         result.EnsureSuccessful();
         var expectedBinaryPath = Path.Combine(env.MockHome, ".aspire", "dogfood", "pr-99999", "bin", "aspire");
         Assert.Contains($"DRYRUN: would install Aspire CLI binary to: {expectedBinaryPath}", result.Output);
-        var scriptRouteBin = Path.Combine(env.MockHome, ".aspire", "bin", "aspire");
-        Assert.DoesNotContain($"DRYRUN: would install Aspire CLI binary to: {scriptRouteBin}", result.Output);
+        var scriptSourceBin = Path.Combine(env.MockHome, ".aspire", "bin", "aspire");
+        Assert.DoesNotContain($"DRYRUN: would install Aspire CLI binary to: {scriptSourceBin}", result.Output);
     }
 
-    // Under --dry-run the PR-route script must NOT write the source=pr sidecar
+    // Under --dry-run the PR-source script must NOT write the source=pr sidecar
     // at <prefix>/dogfood/pr-<N>/.aspire-install.json. The describe-but-do-not-do
     // contract requires the script to print a DRYRUN message naming the path it
     // would write, then return without touching the filesystem. Positive sidecar
-    // content (the source field) for the PR route is covered by end-to-end
+    // content (the source field) for the PR source is covered by end-to-end
     // install runs, not at this unit-test layer.
     [Fact]
-    public async Task DryRun_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath()
+    public async Task DryRun_PRSource_DoesNotWriteSidecar_AndAnnouncesPath()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -547,19 +564,19 @@ public async Task DryRun_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "dogfood", "pr-99999", "bin", ".aspire-install.json");
-        Assert.Contains($"DRYRUN: would write route sidecar to: {sidecarPath}", result.Output);
+        Assert.Contains($"DRYRUN: would write source sidecar to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under --dry-run, but found one at {sidecarPath}");
     }
 
-    // PR-route install prints the PATH-activation hint to stdout so users
+    // PR-source install prints the PATH-activation hint to stdout so users
     // know how to add <prefix>/dogfood/pr-<N>/bin to their shell profile.
     //
     // Hint must carry the literal "$HOME" form, not the pre-expanded absolute path,
     // so the profile line is portable across users.
     [Fact]
-    public async Task DryRun_PRRoute_PrintsPathHintToStdout()
+    public async Task DryRun_PRSource_PrintsPathHintToStdout()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -575,7 +592,7 @@ public async Task DryRun_PRRoute_PrintsPathHintToStdout()
     }
 
     [Fact]
-    public async Task DryRun_PRRoute_PrintsPathHintWithAbsoluteInstallPath()
+    public async Task DryRun_PRSource_PrintsPathHintWithAbsoluteInstallPath()
     {
         using var env = new TestEnvironment();
         var customPath = Path.Combine(env.TempDirectory, "custom-prefix");
@@ -604,9 +621,9 @@ private static string ExtractShellProfileHintLine(string output)
         return string.Empty;
     }
 
-    // PR-route hive location is unchanged at <prefix>/hives/pr-<N>/packages.
+    // PR-source hive location is unchanged at <prefix>/hives/pr-<N>/packages.
     [Fact]
-    public async Task DryRun_PRRoute_HiveLocation_IsUnchanged()
+    public async Task DryRun_PRSource_HiveLocation_IsUnchanged()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -618,12 +635,12 @@ public async Task DryRun_PRRoute_HiveLocation_IsUnchanged()
         Assert.Contains(expectedHive, result.Output);
     }
 
-    // The PR-route script must not mutate route sidecars under --dry-run.
-    // Companion to DryRun_PRRoute_DoesNotWriteSidecar_AndAnnouncesPath; kept as a
+    // The PR-source script must not mutate source sidecars under --dry-run.
+    // Companion to DryRun_PRSource_DoesNotWriteSidecar_AndAnnouncesPath; kept as a
     // separate test method to keep dry-run sidecar-absence coverage visible in
     // test inventories alongside the other dry-run guards.
     [Fact]
-    public async Task DryRun_PRRoute_DoesNotWriteSidecar_AnyContentRegression()
+    public async Task DryRun_PRSource_DoesNotWriteSidecar_AnyContentRegression()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -639,7 +656,7 @@ public async Task DryRun_PRRoute_DoesNotWriteSidecar_AnyContentRegression()
 
     // Under --dry-run no global aspire.config.json is materialized.
     [Fact]
-    public async Task DryRun_PRRoute_DoesNotCreateGlobalAspireConfigJson()
+    public async Task DryRun_PRSource_DoesNotCreateGlobalAspireConfigJson()
     {
         using var env = new TestEnvironment();
         using var cmd = await CreateCommandWithMockGhAsync(env);
@@ -683,7 +700,7 @@ public async Task DryRun_LocalDir_DoesNotWriteSidecar()
         // --local-dir without a PR number is an unmanaged install, so the script must
         // not write a sidecar; the resolver should return Unknown for these installs.
         var binSidecar = Path.Combine(env.MockHome, ".aspire", "bin", ".aspire-install.json");
-        Assert.False(File.Exists(binSidecar), $"--local-dir install must not write sidecar at {binSidecar} (unmanaged route).");
+        Assert.False(File.Exists(binSidecar), $"--local-dir install must not write sidecar at {binSidecar} (unmanaged source).");
 
         // Defensive: walk the .aspire root and assert no sidecar landed at any depth.
         var aspireRoot = Path.Combine(env.MockHome, ".aspire");
@@ -723,7 +740,7 @@ public async Task VeryLargePRNumber_AcceptedByScript_DryRunAnnouncesSidecarPath(
 
         result.EnsureSuccessful();
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "dogfood", "pr-99999999999", "bin", ".aspire-install.json");
-        Assert.Contains($"DRYRUN: would write route sidecar to: {sidecarPath}", result.Output);
+        Assert.Contains($"DRYRUN: would write source sidecar to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under --dry-run, but found one at {sidecarPath}");
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptToolModeTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptToolModeTests.cs
index f329ac83d2e..f55b0188869 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/PRScriptToolModeTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/PRScriptToolModeTests.cs
@@ -250,7 +250,7 @@ public async Task Bash_ToolMode_PrDryRun_SkipsCliNativeArchivesDownload()
         Assert.Contains("built-nugets-for-", result.Output);
         Assert.Contains("dotnet tool install --global Aspire.Cli", result.Output);
         Assert.DoesNotContain("config set channel", result.Output);
-        Assert.DoesNotContain("route sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("source sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
         Assert.DoesNotContain("dogfood/pr-12345/bin", result.Output);
         Assert.DoesNotContain(".dotnet/tools", result.Output);
     }
@@ -481,7 +481,7 @@ public async Task Bash_ToolMode_ForceUpdateFailureReportsUpdate()
 
     [Fact]
     [SkipOnPlatform(TestPlatforms.Windows, "Bash script tests require bash shell")]
-    public async Task Bash_ToolMode_PrInstall_DoesNotWritePRRouteSidecar()
+    public async Task Bash_ToolMode_PrInstall_DoesNotWritePRSourceSidecar()
     {
         using var env = new TestEnvironment();
         var mockGhPath = await env.CreateMockGhScriptAsync(_testOutput);
@@ -504,7 +504,7 @@ public async Task Bash_ToolMode_PrInstall_DoesNotWritePRRouteSidecar()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "dogfood", "pr-12345", "bin", ".aspire-install.json");
-        Assert.False(File.Exists(sidecarPath), $"Tool mode must not write the PR-route sidecar at {sidecarPath}.");
+        Assert.False(File.Exists(sidecarPath), $"Tool mode must not write the PR-source sidecar at {sidecarPath}.");
         // Tool mode now populates the PR hive so `aspire new`/`aspire run` can
         // resolve the PR version of Aspire.AppHost.Sdk and friends.
         var prHive = Path.Combine(env.MockHome, ".aspire", "hives", "pr-12345", "packages");
@@ -829,7 +829,7 @@ public async Task Ps_ToolMode_PrWhatIf_SkipsCliNativeArchivesDownload()
         Assert.Contains("built-nugets-for-", result.Output);
         Assert.Contains("dotnet tool install --global Aspire.Cli", result.Output);
         Assert.DoesNotContain("config set channel", result.Output);
-        Assert.DoesNotContain("route sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("source sidecar", result.Output, StringComparison.OrdinalIgnoreCase);
         Assert.DoesNotContain("dogfood", result.Output);
         Assert.DoesNotContain(".dotnet", result.Output);
     }
@@ -1025,7 +1025,7 @@ public async Task Ps_ToolMode_ForceUpdatesExistingToolWithAllowDowngrade()
 
     [Fact]
     [RequiresTools(["pwsh"])]
-    public async Task Ps_ToolMode_PrInstall_DoesNotWritePRRouteSidecar()
+    public async Task Ps_ToolMode_PrInstall_DoesNotWritePRSourceSidecar()
     {
         using var env = new TestEnvironment();
         var mockGhPath = await env.CreateMockGhScriptAsync(_testOutput);
@@ -1048,7 +1048,7 @@ public async Task Ps_ToolMode_PrInstall_DoesNotWritePRRouteSidecar()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "dogfood", "pr-12345", "bin", ".aspire-install.json");
-        Assert.False(File.Exists(sidecarPath), $"Tool mode must not write the PR-route sidecar at {sidecarPath}.");
+        Assert.False(File.Exists(sidecarPath), $"Tool mode must not write the PR-source sidecar at {sidecarPath}.");
         // Tool mode now populates the PR hive so `aspire new`/`aspire run` can
         // resolve the PR version of Aspire.AppHost.Sdk and friends.
         var prHive = Path.Combine(env.MockHome, ".aspire", "hives", "pr-12345", "packages");
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptPowerShellTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptPowerShellTests.cs
index cc56384473b..c1a06871dc6 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptPowerShellTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptPowerShellTests.cs
@@ -65,6 +65,51 @@ public async Task WhatIfWithCustomPath_IsRecognized()
         Assert.Contains(customPath, result.Output);
     }
 
+    [Fact]
+    public async Task UninstallWithoutChannelOrAllOrQuality_FailsWithoutSilentlyTargetingDefaultQualityChannel()
+    {
+        // Without -Channel/-All/-Quality, the script must refuse rather than
+        // infer "stable" from the install default quality and quietly delete
+        // it. The default-quality fallback in Start-AspireCliInstallation
+        // runs before the uninstall dispatch, so the script must explicitly
+        // track whether -Quality was bound (mirrors QUALITY_EXPLICIT in the
+        // shell script).
+        using var env = new TestEnvironment();
+        var aspireHome = Path.Combine(env.TempDirectory, "aspire");
+        var customPath = Path.Combine(aspireHome, "bin");
+        var stableHive = Path.Combine(aspireHome, "hives", "stable");
+        Directory.CreateDirectory(Path.Combine(stableHive, "packages"));
+
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+        var result = await cmd.ExecuteAsync(
+            "-Uninstall",
+            "-InstallPath", customPath,
+            "-Yes");
+
+        Assert.NotEqual(0, result.ExitCode);
+        Assert.Contains("-Channel or -All", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.True(Directory.Exists(stableHive));
+    }
+
+    [Fact]
+    public async Task UninstallWhatIfWithQuality_ShowsInferredChannelAndSharedInstallSkip()
+    {
+        using var env = new TestEnvironment();
+        var customPath = Path.Combine(env.TempDirectory, "aspire", "bin");
+        Directory.CreateDirectory(Path.Combine(env.TempDirectory, "aspire", "hives", "staging", "packages"));
+
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+        var result = await cmd.ExecuteAsync(
+            "-Uninstall",
+            "-Quality", "staging",
+            "-InstallPath", customPath,
+            "-WhatIf");
+
+        result.EnsureSuccessful();
+        Assert.Contains("hive staging", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("RemoveSharedInstall", result.Output);
+    }
+
     [Fact]
     public async Task AllMainParameters_ShownInHelp()
     {
@@ -263,7 +308,7 @@ public async Task Install_DryRun_DoesNotWriteGlobalChannelField()
             $"install.ps1 must not create global aspire.config.json; found at {configPath}.");
     }
 
-    // Under -WhatIf the release-route script must NOT write the script-route
+    // Under -WhatIf the release-source script must NOT write the script-source
     // sidecar at <prefix>/.aspire-install.json. The describe-but-do-not-do
     // contract requires the script to print a "What if:" message naming the path
     // it would write, then return without touching the filesystem. A previous
@@ -271,7 +316,7 @@ public async Task Install_DryRun_DoesNotWriteGlobalChannelField()
     // can leave a stale source=script marker visible to BundleService when
     // the install was never actually performed.
     [Fact]
-    public async Task WhatIf_DoesNotWriteScriptRouteSidecar_AndAnnouncesPath()
+    public async Task WhatIf_DoesNotWriteScriptSourceSidecar_AndAnnouncesPath()
     {
         using var env = new TestEnvironment();
         using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
@@ -280,16 +325,16 @@ public async Task WhatIf_DoesNotWriteScriptRouteSidecar_AndAnnouncesPath()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "bin", ".aspire-install.json");
-        Assert.Contains($"What if: Route sidecar would be written to: {sidecarPath}", result.Output);
+        Assert.Contains($"What if: Source sidecar would be written to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under -WhatIf, but found one at {sidecarPath}");
     }
 
-    // The release-route script must not mutate route sidecars under -WhatIf,
+    // The release-source script must not mutate source sidecars under -WhatIf,
     // regardless of the configured quality.
     [Fact]
-    public async Task WhatIf_DevQuality_DoesNotWriteScriptRouteSidecar()
+    public async Task WhatIf_DevQuality_DoesNotWriteScriptSourceSidecar()
     {
         using var env = new TestEnvironment();
         using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
@@ -298,7 +343,7 @@ public async Task WhatIf_DevQuality_DoesNotWriteScriptRouteSidecar()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "bin", ".aspire-install.json");
-        Assert.Contains($"What if: Route sidecar would be written to: {sidecarPath}", result.Output);
+        Assert.Contains($"What if: Source sidecar would be written to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under -WhatIf, but found one at {sidecarPath}");
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptShellTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptShellTests.cs
index 60afa22b126..21e5241306c 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptShellTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/ReleaseScriptShellTests.cs
@@ -79,6 +79,75 @@ public async Task DryRunWithCustomPath_ShowsCustomInstallPath()
         Assert.Contains(customPath, result.Output);
     }
 
+    [Fact]
+    public async Task UninstallDryRunWithQuality_ShowsInferredChannelAndSharedInstallSkip()
+    {
+        using var env = new TestEnvironment();
+        var customPath = Path.Combine(env.TempDirectory, "aspire", "bin");
+        Directory.CreateDirectory(Path.Combine(env.TempDirectory, "aspire", "hives", "staging", "packages"));
+
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+        var result = await cmd.ExecuteAsync(
+            "--uninstall",
+            "--quality", "staging",
+            "--install-path", customPath,
+            "--dry-run");
+
+        result.EnsureSuccessful();
+        Assert.Contains("hive staging", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains("--remove-shared-install", result.Output);
+    }
+
+    [Fact]
+    public async Task UninstallWithRemoveSharedInstall_DeletesSharedArtifacts()
+    {
+        using var env = new TestEnvironment();
+        var aspireHome = Path.Combine(env.TempDirectory, "aspire");
+        var customPath = Path.Combine(aspireHome, "bin");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "daily", "packages"));
+        Directory.CreateDirectory(Path.Combine(aspireHome, "bundle"));
+        Directory.CreateDirectory(Path.Combine(aspireHome, "versions", "v1"));
+        Directory.CreateDirectory(customPath);
+        var binaryPath = Path.Combine(customPath, OperatingSystem.IsWindows() ? "aspire.exe" : "aspire");
+        File.WriteAllText(binaryPath, "");
+
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+        var result = await cmd.ExecuteAsync(
+            "--uninstall",
+            "--quality", "dev",
+            "--install-path", customPath,
+            "--yes",
+            "--remove-shared-install");
+
+        result.EnsureSuccessful();
+        Assert.False(Directory.Exists(Path.Combine(aspireHome, "hives", "daily")));
+        Assert.False(File.Exists(binaryPath));
+        Assert.False(Directory.Exists(Path.Combine(aspireHome, "bundle")));
+        Assert.True(Directory.Exists(Path.Combine(aspireHome, "versions", "v1")));
+    }
+
+    [Fact]
+    public async Task UninstallWithoutChannelOrAll_FailsWithoutSilentlyTargetingDefaultQualityChannel()
+    {
+        // Without --channel/--all/--quality, the script must refuse rather than
+        // infer "stable" from the default quality and quietly delete it.
+        using var env = new TestEnvironment();
+        var aspireHome = Path.Combine(env.TempDirectory, "aspire");
+        var customPath = Path.Combine(aspireHome, "bin");
+        var stableHive = Path.Combine(aspireHome, "hives", "stable");
+        Directory.CreateDirectory(Path.Combine(stableHive, "packages"));
+
+        using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
+        var result = await cmd.ExecuteAsync(
+            "--uninstall",
+            "--install-path", customPath,
+            "--yes");
+
+        Assert.NotEqual(0, result.ExitCode);
+        Assert.Contains("--channel or --all", result.Output, StringComparison.OrdinalIgnoreCase);
+        Assert.True(Directory.Exists(stableHive));
+    }
+
     [Theory]
     [InlineData("--verbose")]
     [InlineData("-v")]
@@ -214,7 +283,7 @@ public async Task Install_DryRun_DoesNotWriteGlobalChannelField()
             $"install.sh must not create global aspire.config.json; found at {configPath}.");
     }
 
-    // Under --dry-run the release-route script must NOT write the script-route
+    // Under --dry-run the release-source script must NOT write the script-source
     // sidecar at <prefix>/.aspire-install.json. The describe-but-do-not-do
     // contract requires the script to print a DRYRUN message naming the path it
     // would write, then return without touching the filesystem. A previous
@@ -222,7 +291,7 @@ public async Task Install_DryRun_DoesNotWriteGlobalChannelField()
     // stale source=script marker visible to BundleService when the install
     // was never actually performed.
     [Fact]
-    public async Task DryRun_DoesNotWriteScriptRouteSidecar_AndAnnouncesPath()
+    public async Task DryRun_DoesNotWriteScriptSourceSidecar_AndAnnouncesPath()
     {
         using var env = new TestEnvironment();
         using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
@@ -231,18 +300,18 @@ public async Task DryRun_DoesNotWriteScriptRouteSidecar_AndAnnouncesPath()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "bin", ".aspire-install.json");
-        Assert.Contains($"DRYRUN: would write route sidecar to: {sidecarPath}", result.Output);
+        Assert.Contains($"DRYRUN: would write source sidecar to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under --dry-run, but found one at {sidecarPath}");
     }
 
-    // The release-route script must not mutate route sidecars under --dry-run,
+    // The release-source script must not mutate source sidecars under --dry-run,
     // regardless of the configured quality. This guards the dry-run contract on
     // the 'dev' quality path, which historically took a slightly different
     // code branch in the script body.
     [Fact]
-    public async Task DryRun_DevQuality_DoesNotWriteScriptRouteSidecar()
+    public async Task DryRun_DevQuality_DoesNotWriteScriptSourceSidecar()
     {
         using var env = new TestEnvironment();
         using var cmd = new ScriptToolCommand(s_scriptPath, env, _testOutput);
@@ -251,7 +320,7 @@ public async Task DryRun_DevQuality_DoesNotWriteScriptRouteSidecar()
         result.EnsureSuccessful();
 
         var sidecarPath = Path.Combine(env.MockHome, ".aspire", "bin", ".aspire-install.json");
-        Assert.Contains($"DRYRUN: would write route sidecar to: {sidecarPath}", result.Output);
+        Assert.Contains($"DRYRUN: would write source sidecar to: {sidecarPath}", result.Output);
         Assert.False(
             File.Exists(sidecarPath),
             $"Expected no sidecar to be written under --dry-run, but found one at {sidecarPath}");
diff --git a/tests/Aspire.Acquisition.Tests/Scripts/VerifyCliArchivePowerShellTests.cs b/tests/Aspire.Acquisition.Tests/Scripts/VerifyCliArchivePowerShellTests.cs
index e83ba1aeaed..db5f4c56c46 100644
--- a/tests/Aspire.Acquisition.Tests/Scripts/VerifyCliArchivePowerShellTests.cs
+++ b/tests/Aspire.Acquisition.Tests/Scripts/VerifyCliArchivePowerShellTests.cs
@@ -33,7 +33,7 @@ public async Task VerifyCliArchive_AcceptsCleanPerRidArchive()
         result.EnsureSuccessful();
         Assert.Contains("aspire mock v1.0", result.Output);
         Assert.Contains("'aspire new aspire-starter' created project successfully", result.Output);
-        Assert.Contains("linux-* archive correctly omits the install-route sidecar", result.Output);
+        Assert.Contains("linux-* archive correctly omits the install-source sidecar", result.Output);
         Assert.Contains("All verification checks passed", result.Output);
     }
 
@@ -54,7 +54,7 @@ public async Task VerifyCliArchive_RejectsArchiveWithStraySidecar()
         // The exact error wording is part of the verifier's user-facing contract; see
         // eng/scripts/verify-cli-archive.ps1 Test-ArchiveSidecar.
         Assert.Contains(".aspire-install.json", result.Output);
-        Assert.Contains("per-RID archives are shared across install routes", result.Output);
+        Assert.Contains("per-RID archives are shared across install sources", result.Output);
     }
 
     [Fact]
@@ -80,6 +80,6 @@ public async Task VerifyCliArchive_RejectsStraySidecarWhenBinaryIsNestedUnderSub
 
         Assert.NotEqual(0, result.ExitCode);
         Assert.Contains(".aspire-install.json", result.Output);
-        Assert.Contains("per-RID archives are shared across install routes", result.Output);
+        Assert.Contains("per-RID archives are shared across install sources", result.Output);
     }
 }
diff --git a/tests/Aspire.Cli.Tests/Acquisition/InstallSidecarReaderTests.cs b/tests/Aspire.Cli.Tests/Acquisition/InstallSidecarReaderTests.cs
index e8bc04232ae..e04ae6667ab 100644
--- a/tests/Aspire.Cli.Tests/Acquisition/InstallSidecarReaderTests.cs
+++ b/tests/Aspire.Cli.Tests/Acquisition/InstallSidecarReaderTests.cs
@@ -9,9 +9,9 @@ namespace Aspire.Cli.Tests.Acquisition;
 
 /// <summary>
 /// Behavior tests for <see cref="InstallSidecarReader"/>. The sidecar contract
-/// is documented in <c>docs/specs/install-routes.md</c>: a single-field JSON
+/// is documented in <c>docs/specs/install-sources.md</c>: a single-field JSON
 /// file named <c>.aspire-install.json</c> with shape
-/// <c>{ "source": "&lt;route&gt;" }</c> living next to the CLI binary.
+/// <c>{ "source": "&lt;source&gt;" }</c> living next to the CLI binary.
 /// </summary>
 public class InstallSidecarReaderTests(ITestOutputHelper outputHelper)
 {
@@ -19,7 +19,7 @@ public class InstallSidecarReaderTests(ITestOutputHelper outputHelper)
     [InlineData("script", "Script")]
     [InlineData("pr", "Pr")]
     [InlineData("winget", "Winget")]
-    [InlineData("brew", "Brew")]
+    [InlineData("brew", "Homebrew")]
     [InlineData("dotnet-tool", "DotnetTool")]
     [InlineData("localhive", "LocalHive")]
     public void TryRead_ParsesEachKnownSource(string wireValue, string expectedEnumName)
@@ -108,13 +108,13 @@ public void TryRead_MalformedJson_ReturnsInvalidWithParseReason()
 
     [Theory]
     [InlineData("{\"source\":\"\"}",          "",             "empty source string")]
-    [InlineData("{\"source\":\"future-route\"}", "future-route", "unknown but well-formed source")]
+    [InlineData("{\"source\":\"future-source\"}", "future-source", "unknown but well-formed source")]
     [InlineData("[\"script\"]",               "",             "non-object root element")]
     [InlineData("{\"source\": 42}",           "",             "non-string source field")]
     public void TryRead_UnknownOrMalformedSource_ReturnsUnknownEnumWithRawSourcePreserved(string sidecarBody, string expectedRawSource, string scenario)
     {
         // All four shapes round-trip via the parser as InstallSource.Unknown so
-        // a future-route or otherwise-unrecognized sidecar never blocks the
+        // a future-source or otherwise-unrecognized sidecar never blocks the
         // discovery walk. RawSource preserves the literal wire value so a
         // future client can re-interpret it without re-reading the file.
         _ = scenario; // surfaced in test name for debuggability
@@ -207,7 +207,7 @@ public void ReadSourceField_UnreadableSidecar_ReturnsNull()
     [InlineData("Script", "script")]
     [InlineData("Pr", "pr")]
     [InlineData("Winget", "winget")]
-    [InlineData("Brew", "brew")]
+    [InlineData("Homebrew", "brew")]
     [InlineData("DotnetTool", "dotnet-tool")]
     [InlineData("LocalHive", "localhive")]
     public void ToWireString_RoundTripsWithParseInstallSource(string enumName, string expectedWire)
diff --git a/tests/Aspire.Cli.Tests/Acquisition/InstallationDiscoveryDiscoverAllTests.cs b/tests/Aspire.Cli.Tests/Acquisition/InstallationDiscoveryDiscoverAllTests.cs
index 01a0a6f3052..deb7aac3725 100644
--- a/tests/Aspire.Cli.Tests/Acquisition/InstallationDiscoveryDiscoverAllTests.cs
+++ b/tests/Aspire.Cli.Tests/Acquisition/InstallationDiscoveryDiscoverAllTests.cs
@@ -33,7 +33,7 @@ public async Task DiscoverAllAsync_PathHit_WithoutSidecar_IsListedAsNotProbed_An
     {
         // A binary on $PATH with no .aspire-install.json next to it must not be
         // spawned. The user-installed binary on PATH is the most dangerous case:
-        // if a user runs `aspire doctor`, we cannot execute arbitrary
+        // if a user runs `aspire installs list`, we cannot execute arbitrary
         // same-named binaries we happened to find.
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var pathDir = Path.Combine(workspace.WorkspaceRoot.FullName, "no-sidecar-bin");
@@ -53,7 +53,7 @@ public async Task DiscoverAllAsync_PathHit_WithoutSidecar_IsListedAsNotProbed_An
             string.Equals(r.CanonicalPath, noSidecarBinary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal(InstallationInfoStatus.NotProbed, noSidecarRow.Status);
         var expectedSidecarPath = Path.Combine(pathDir, InstallSidecarReader.SidecarFileName);
-        Assert.Equal($"No install-route sidecar found at {expectedSidecarPath}; peer was not probed.", noSidecarRow.StatusReason);
+        Assert.Equal($"No install-source sidecar found at {expectedSidecarPath}; peer was not probed.", noSidecarRow.StatusReason);
     }
 
     [Fact]
@@ -86,7 +86,7 @@ public async Task DiscoverAllAsync_PathHit_WithUnreadableSidecar_IsListedAsNotPr
             Assert.DoesNotContain(probe.ProbedPaths, p => string.Equals(p, binary, StringComparison.Ordinal));
             var row = Assert.Single(results, r => string.Equals(r.CanonicalPath, binary, StringComparison.Ordinal));
             Assert.Equal(InstallationInfoStatus.NotProbed, row.Status);
-            Assert.Equal($"Install-route sidecar at {sidecarPath} could not be read or parsed; peer was not probed.", row.StatusReason);
+            Assert.Equal($"Install-source sidecar at {sidecarPath} could not be read or parsed; peer was not probed.", row.StatusReason);
         }
         finally
         {
@@ -114,13 +114,13 @@ public async Task DiscoverAllAsync_PathHit_WithMalformedSidecar_IsListedAsNotPro
         var row = Assert.Single(results, r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal(InstallationInfoStatus.NotProbed, row.Status);
-        Assert.Equal($"Install-route sidecar at {sidecarPath} could not be read or parsed; peer was not probed.", row.StatusReason);
+        Assert.Equal($"Install-source sidecar at {sidecarPath} could not be read or parsed; peer was not probed.", row.StatusReason);
     }
 
     [Fact]
     public async Task DiscoverAllAsync_TrustedSidecar_IsSpawnedAndDecoratedWithDiscoveredPath()
     {
-        // A binary with a script-route sidecar in its directory has enough
+        // A binary with a script-source sidecar in its directory has enough
         // install metadata to be probed. The peer probe is called, and its returned
         // InstallationInfo is merged with the discovered path so the row
         // displayed to the user matches what `which` would show.
@@ -137,7 +137,7 @@ public async Task DiscoverAllAsync_TrustedSidecar_IsSpawnedAndDecoratedWithDisco
                 Path = "/peer-says/aspire",
                 Version = "12.5.0",
                 Channel = "stable",
-                Route = "script",
+                Source = "script",
                 Status = InstallationInfoStatus.Ok,
             }),
         });
@@ -212,7 +212,7 @@ public async Task DiscoverAllAsync_PathStatusTracksActiveShadowedAndOffPathInsta
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_UnknownSidecarSource_WithSuccessfulProbe_ProbesAndSurfacesRawRoute()
+    public async Task DiscoverAllAsync_UnknownSidecarSource_WithSuccessfulProbe_ProbesAndSurfacesRawSource()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var binDir = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire", "bin");
@@ -237,13 +237,13 @@ public async Task DiscoverAllAsync_UnknownSidecarSource_WithSuccessfulProbe_Prob
         var row = results.Single(r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal(InstallationInfoStatus.Ok, row.Status);
-        Assert.Equal("apt", row.Route);
+        Assert.Equal("apt", row.Source);
         Assert.Equal("13.1.0", row.Version);
         Assert.Equal("daily", row.Channel);
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_UnknownSidecarSource_WithFailedProbe_ProbesAndSurfacesFailedWithRawRoute()
+    public async Task DiscoverAllAsync_UnknownSidecarSource_WithFailedProbe_ProbesAndSurfacesFailedWithRawSource()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var binDir = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire", "bin");
@@ -262,15 +262,15 @@ public async Task DiscoverAllAsync_UnknownSidecarSource_WithFailedProbe_ProbesAn
         var row = results.Single(r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal(InstallationInfoStatus.Failed, row.Status);
-        Assert.Equal("apt", row.Route);
+        Assert.Equal("apt", row.Source);
         Assert.Equal("simulated probe failure", row.StatusReason);
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_PeerProbeFails_RowSurvivesAsFailed_WithRouteIntact()
+    public async Task DiscoverAllAsync_PeerProbeFails_RowSurvivesAsFailed_WithSourceIntact()
     {
         // A peer that fails (timeout / non-zero exit / invalid JSON) is per-row,
-        // not whole-command. The route from the sidecar is still surfaced so the
+        // not whole-command. The source from the sidecar is still surfaced so the
         // user sees "this is a PR install but it wouldn't talk to me", not nothing.
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var prDir = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire", "dogfood", "pr-9999", "bin");
@@ -289,7 +289,7 @@ public async Task DiscoverAllAsync_PeerProbeFails_RowSurvivesAsFailed_WithRouteI
         var row = results.Single(r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal(InstallationInfoStatus.Failed, row.Status);
-        Assert.Equal("pr", row.Route);
+        Assert.Equal("pr", row.Source);
         Assert.Contains("simulated peer hang", row.StatusReason!);
     }
 
@@ -345,7 +345,7 @@ public async Task DiscoverAllAsync_ProbeFailureAndMissingInstallMetadata_Surface
         if (hasInstallMetadata)
         {
             Assert.Contains(probe.ProbedPaths, p => string.Equals(p, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
-            Assert.Equal("script", row.Route);
+            Assert.Equal("script", row.Source);
             Assert.Contains("peer returned malformed JSON", row.StatusReason!);
         }
         else
@@ -356,7 +356,7 @@ public async Task DiscoverAllAsync_ProbeFailureAndMissingInstallMetadata_Surface
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_PrRoute_DerivesChannelFromDogfoodPathWhenPeerOmits()
+    public async Task DiscoverAllAsync_PrSource_DerivesChannelFromDogfoodPathWhenPeerOmits()
     {
         // The structural channel for a PR install is `pr-<N>` regardless
         // of whether the older peer's --version output includes channel
@@ -385,12 +385,12 @@ public async Task DiscoverAllAsync_PrRoute_DerivesChannelFromDogfoodPathWhenPeer
         var prRow = results.Single(r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal("pr-12345", prRow.Channel);
-        Assert.Equal("pr", prRow.Route);
+        Assert.Equal("pr", prRow.Source);
         Assert.Equal("13.4.0-pr.12345.gabcdef", prRow.Version);
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_PrRoute_DoesNotOverwritePeerReportedChannel()
+    public async Task DiscoverAllAsync_PrSource_DoesNotOverwritePeerReportedChannel()
     {
         // When the peer DOES report a channel, the discovery layer must not overwrite it
         // with the path-derived value, even if they happen to match.
@@ -422,14 +422,14 @@ public async Task DiscoverAllAsync_PrRoute_DoesNotOverwritePeerReportedChannel()
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_BrewRoute_DerivesPrChannelFromVersionWhenPeerOmits()
+    public async Task DiscoverAllAsync_BrewSource_DerivesPrChannelFromVersionWhenPeerOmits()
     {
-        // Brew-installed PR builds (e.g. from `brew install aspire@pr-N`) live
+        // Homebrew-installed PR builds (e.g. from `homebrew install aspire@pr-N`) live
         // under a path that doesn't carry the `dogfood/pr-<N>/bin` shape, so
         // the path-based derivation can't help. The version string, on the
         // other hand, IS baked at build time as `<x.y.z>-pr.<N>.<hash>` —
-        // discovery should fall back to that signal so older brew peers,
-        // which don't recognize the `doctor --self` self-describe contract,
+        // discovery should fall back to that signal so older homebrew peers,
+        // which don't recognize the `installs --self` self-describe contract,
         // still surface their channel instead of "(unknown)".
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var brewDir = Path.Combine(workspace.WorkspaceRoot.FullName, "Caskroom", "aspire", "13.4.0-pr.17115.gcd700928");
@@ -439,7 +439,7 @@ public async Task DiscoverAllAsync_BrewRoute_DerivesPrChannelFromVersionWhenPeer
 
         var probe = new FakePeerInstallProbe(new Dictionary<string, PeerProbeResult>
         {
-            // Older brew peer: doctor --self unsupported, so the probe
+            // Older homebrew peer: installs --self unsupported, so the probe
             // took the --version fallback path and reported version only.
             [binary] = new PeerProbeResult.Ok(new InstallationInfo
             {
@@ -456,12 +456,12 @@ public async Task DiscoverAllAsync_BrewRoute_DerivesPrChannelFromVersionWhenPeer
         var brewRow = results.Single(r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Equal("pr-17115", brewRow.Channel);
-        Assert.Equal("brew", brewRow.Route);
+        Assert.Equal("brew", brewRow.Source);
         Assert.Equal("13.4.0-pr.17115.gcd700928", brewRow.Version);
     }
 
     [Fact]
-    public async Task DiscoverAllAsync_BrewRoute_LeavesChannelNullForStableVersion()
+    public async Task DiscoverAllAsync_BrewSource_LeavesChannelNullForStableVersion()
     {
         // Same shape as the previous test, but with a non-PR version. The
         // version-based derivation must return null (we can't recover the
@@ -490,7 +490,7 @@ public async Task DiscoverAllAsync_BrewRoute_LeavesChannelNullForStableVersion()
         var brewRow = results.Single(r =>
             string.Equals(r.CanonicalPath, binary, OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal));
         Assert.Null(brewRow.Channel);
-        Assert.Equal("brew", brewRow.Route);
+        Assert.Equal("brew", brewRow.Source);
     }
 
     [Theory]
@@ -568,7 +568,7 @@ public async Task DiscoverAllAsync_LogsInstallMetadataRejection_AtDebugLevel()
     {
         // When the install metadata check rejects a candidate (no sidecar), the user
         // should see why in --log-level debug output. Without this, an
-        // install that "doesn't show up correctly" in `aspire doctor`
+        // install that "doesn't show up correctly" in `aspire installs list`
         // is hard to diagnose.
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var pathDir = Path.Combine(workspace.WorkspaceRoot.FullName, "no-sidecar-bin");
@@ -763,7 +763,7 @@ public async Task DiscoverAllAsync_HonorsExecutionContextHomeDirectory_WithoutEn
                 Path = binary,
                 Version = "13.4.0",
                 Channel = "stable",
-                Route = "script",
+                Source = "script",
                 Status = InstallationInfoStatus.Ok,
             }),
         });
@@ -793,7 +793,7 @@ public async Task DiscoverAllAsync_UsesAspireHomeDirectoryForPortableInstallPref
                 Path = binary,
                 Version = "13.4.0",
                 Channel = "local",
-                Route = "localhive",
+                Source = "localhive",
                 Status = InstallationInfoStatus.Ok,
             }),
         });
@@ -861,7 +861,7 @@ public async Task DiscoverAllAsync_OnMacOS_DedupsSelfAgainstPathHit_AcrossFirmli
                 CanonicalPath = binary,
                 Version = "test-version",
                 Channel = "pr-99999",
-                Route = "pr",
+                Source = "pr",
                 Status = InstallationInfoStatus.Ok,
             }),
         });
diff --git a/tests/Aspire.Cli.Tests/Acquisition/PeerInstallProbeTests.cs b/tests/Aspire.Cli.Tests/Acquisition/PeerInstallProbeTests.cs
index 45dff134e58..b24ebf5c1f7 100644
--- a/tests/Aspire.Cli.Tests/Acquisition/PeerInstallProbeTests.cs
+++ b/tests/Aspire.Cli.Tests/Acquisition/PeerInstallProbeTests.cs
@@ -17,7 +17,7 @@ namespace Aspire.Cli.Tests.Acquisition;
 /// </summary>
 public class PeerInstallProbeTests(ITestOutputHelper outputHelper) : IDisposable
 {
-    // Route internal probe diagnostics (LogDebug for "JSON without an
+    // Forward internal probe diagnostics (LogDebug for "JSON without an
     // installation row", "invalid JSON", etc.) into the xunit test output
     // so a failure log tells us why the probe took whichever code path it
     // took. Keep the factory alive for the lifetime of the test class so
@@ -74,10 +74,10 @@ public async Task ProbeAsync_BinaryNotFound_ReturnsFailed()
     }
 
     [Fact]
-    public async Task ProbeAsync_InvokesPeerWithDoctorSelfFormatJson()
+    public async Task ProbeAsync_InvokesPeerWithInstallsSelfFormatJson()
     {
         // The peer must be asked to describe ONLY itself. Without --self,
-        // `aspire doctor` would run full installation discovery and the peer would
+        // `aspire installs` would run full installation discovery and the peer would
         // recursively probe back into us — and into every other peer it
         // finds — turning a single discovery invocation into a fan-out bounded
         // only by the per-level timeout. `--format json` selects the
@@ -92,7 +92,7 @@ public async Task ProbeAsync_InvokesPeerWithDoctorSelfFormatJson()
         Assert.NotNull(fakePeer.ArgvFile);
         Assert.True(File.Exists(fakePeer.ArgvFile), $"Expected argv recorder file at {fakePeer.ArgvFile} to exist.");
         var argv = await File.ReadAllLinesAsync(fakePeer.ArgvFile, TestContext.Current.CancellationToken);
-        Assert.Equal(["doctor", "--self", "--format", "json"], argv);
+        Assert.Equal(["installs", "--self", "--format", "json"], argv);
     }
 
     [Fact]
@@ -109,7 +109,7 @@ public async Task ProbeAsync_PeerEmitsValidJsonArray_ReturnsOk()
                           "path": "/peer/aspire",
                           "version": "12.5.0",
                           "channel": "stable",
-                          "route": "script",
+                          "source": "script",
                           "pathStatus": "shadowed",
                           "status": "ok"
                         }
@@ -124,10 +124,43 @@ public async Task ProbeAsync_PeerEmitsValidJsonArray_ReturnsOk()
         var ok = AssertProbeOk(result);
         Assert.Equal("12.5.0", ok.Info.Version);
         Assert.Equal("stable", ok.Info.Channel);
-        Assert.Equal("script", ok.Info.Route);
+        Assert.Equal("script", ok.Info.Source);
         Assert.Equal(InstallationPathStatus.Shadowed, ok.Info.PathStatus);
     }
 
+    [Fact]
+    public async Task ProbeAsync_PeerEmitsBareInstallationArray_ReturnsOk()
+    {
+        // `aspire installs --self --format json` writes a bare array of
+        // InstallationInfo rows (see src/Aspire.Cli/Commands/InstallsCommand.cs).
+        // The probe must accept that shape — not only the wrapped object form —
+        // so it stays compatible with new peers.
+        using var fakePeer = FakePeerScript.Build(
+            outputHelper,
+            stdout: """
+                    [
+                      {
+                        "path": "/peer/aspire",
+                        "version": "13.0.0",
+                        "channel": "pr-17400",
+                        "source": "pr",
+                        "pathStatus": "active",
+                        "status": "ok"
+                      }
+                    ]
+                    """,
+            exitCode: 0);
+
+        var probe = CreateProbeWithGenerousTimeout();
+        var result = await probe.ProbeAsync(fakePeer.Path, TestContext.Current.CancellationToken);
+
+        var ok = AssertProbeOk(result);
+        Assert.Equal("13.0.0", ok.Info.Version);
+        Assert.Equal("pr-17400", ok.Info.Channel);
+        Assert.Equal("pr", ok.Info.Source);
+        Assert.Equal(InstallationPathStatus.Active, ok.Info.PathStatus);
+    }
+
     [Fact]
     public async Task ProbeAsync_PeerOmitsPathStatus_DefaultsToNotOnPath()
     {
@@ -178,7 +211,7 @@ public async Task ProbeAsync_PeerEmitsInvalidPathStatus_DefaultsToNotOnPath()
     [Fact]
     public async Task ProbeAsync_PeerExitsNonZero_ReturnsFailedWhenVersionAlsoFails()
     {
-        // doctor path scripted to exit 7; --version not supported by this
+        // installs path scripted to exit 7; --version not supported by this
         // script (the default EmitExit body) → fallback path also fails
         // and the user sees the failure.
         using var fakePeer = FakePeerScript.Build(outputHelper, stdout: "{}", exitCode: 7);
@@ -262,8 +295,8 @@ public async Task ProbeAsync_PeerExitsNonZero_FallsBackToVersionAndReturnsPartia
 
         var ok = AssertProbeOk(result);
         Assert.Equal("13.4.0-pr.16817.g790d6fa3", ok.Info.Version);
-        // Fallback can't read route or channel from the older peer; the
-        // discovery layer overlays the route from the local sidecar.
+        // Fallback can't read source or channel from the older peer; the
+        // discovery layer overlays the source from the local sidecar.
         Assert.Null(ok.Info.Channel);
     }
 
@@ -290,7 +323,7 @@ public async Task ProbeAsync_BothInfoAndVersionFail_ReturnsFailed()
     [Fact]
     public async Task ProbeAsync_PeerEmitsEmptyArray_FallsBackToVersion()
     {
-        // Empty rich output is treated as "doctor didn't tell us anything useful"
+        // Empty rich output is treated as "installs didn't tell us anything useful"
         // and triggers the --version fallback. With no version response
         // scripted either, the overall probe fails.
         using var fakePeer = FakePeerScript.BuildDoctorOrVersion(
@@ -309,7 +342,7 @@ public async Task ProbeAsync_PeerEmitsEmptyArray_FallsBackToVersion()
     [Fact]
     public async Task ProbeAsync_PeerEmitsInvalidJson_FallsBackToVersion()
     {
-        // Invalid JSON on the doctor path is treated as a peer failure mode
+        // Invalid JSON on the installs path is treated as a peer failure mode
         // where the command emits help / error text, and triggers the
         // --version fallback.
         using var fakePeer = FakePeerScript.BuildDoctorOrVersion(
@@ -461,7 +494,7 @@ internal static class FakePeerScript
     /// Produces a script that writes <paramref name="stdout"/> verbatim
     /// and exits with <paramref name="exitCode"/>. The script dispatches on
     /// its first argument, so it works with both the probe's
-    /// <c>doctor --self --format json</c> invocation and the <c>--version</c>
+    /// <c>installs --self --format json</c> invocation and the <c>--version</c>
     /// fallback.
     /// </summary>
     internal static FakeScriptResult Build(ITestOutputHelper outputHelper, string stdout, int exitCode)
@@ -475,7 +508,7 @@ internal static FakeScriptResult Build(ITestOutputHelper outputHelper, string st
     }
 
     /// <summary>
-    /// Builds a script that responds differently to <c>doctor</c> vs
+    /// Builds a script that responds differently to <c>installs</c> vs
     /// <c>--version</c> arguments so PeerInstallProbeTests can exercise
     /// the rich-probe → version fallback path.
     /// </summary>
@@ -595,14 +628,14 @@ private sealed record EmitExit(string Stdout, string Stderr, int ExitCode) : Scr
         public override string RenderShell()
         {
             // The script behaves differently based on its first arg:
-            // - "doctor" → emit the scripted stdout and exit with the scripted code
+            // - "installs" → emit the scripted stdout and exit with the scripted code
             // - anything else (e.g. "--version") → emit nothing and exit 127
             // This lets PeerInstallProbeTests isolate the "rich probe failed"
             // case without the fallback `--version` accidentally succeeding
             // by virtue of the script ignoring its args.
             return $"""
                     #!/bin/sh
-                    if [ "$1" != "doctor" ]; then
+                    if [ "$1" != "installs" ]; then
                       exit 127
                     fi
                     cat <<'__ASPIRE_PEER_EOF__'
@@ -618,7 +651,7 @@ public override string RenderBatch()
             var lines = Stdout.Split('\n');
             var sb = new System.Text.StringBuilder();
             sb.AppendLine("@echo off");
-            sb.AppendLine("if not \"%~1\" == \"doctor\" exit /b 127");
+            sb.AppendLine("if not \"%~1\" == \"installs\" exit /b 127");
             foreach (var line in lines)
             {
                 sb.Append("echo ").AppendLine(line.TrimEnd('\r'));
@@ -634,7 +667,7 @@ private sealed record StderrRepeatScript(int ByteCount, int ExitCode) : ScriptBo
         public override string RenderShell() =>
             $"""
              #!/bin/sh
-             if [ "$1" != "doctor" ]; then
+             if [ "$1" != "installs" ]; then
                exit 127
              fi
              dd if=/dev/zero bs={ByteCount} count=1 2>/dev/null | LC_ALL=C tr '\000' 'x' 1>&2
@@ -645,7 +678,7 @@ public override string RenderBatch()
         {
             var sb = new StringBuilder();
             sb.AppendLine("@echo off");
-            sb.AppendLine("if not \"%~1\" == \"doctor\" exit /b 127");
+            sb.AppendLine("if not \"%~1\" == \"installs\" exit /b 127");
             sb.AppendLine($"powershell -NoProfile -ExecutionPolicy Bypass -Command \"[Console]::Error.Write(('x' * {ByteCount}))\"");
             sb.AppendLine($"exit /b {ExitCode}");
             return sb.ToString();
@@ -688,7 +721,7 @@ public override string RenderShell()
         {
             return $"""
                     #!/bin/sh
-                    if [ "$1" = "doctor" ]; then
+                    if [ "$1" = "installs" ]; then
                       cat <<'__ASPIRE_DOCTOR_EOF__'
                     {DoctorStdout}
                     __ASPIRE_DOCTOR_EOF__
@@ -708,7 +741,7 @@ public override string RenderBatch()
         {
             var sb = new System.Text.StringBuilder();
             sb.AppendLine("@echo off");
-            sb.AppendLine("if \"%~1\" == \"doctor\" goto :doctor");
+            sb.AppendLine("if \"%~1\" == \"installs\" goto :doctor");
             sb.AppendLine("if \"%~1\" == \"--version\" goto :version");
             sb.AppendLine("exit /b 127");
             sb.AppendLine(":doctor");
@@ -729,7 +762,7 @@ public override string RenderBatch()
 
     private sealed record ArgvRecorderScript(string ArgvFile) : ScriptBody
     {
-        // Minimal valid doctor JSON: enough for the probe to take the primary
+        // Minimal valid installs JSON: enough for the probe to take the primary
         // path (no fallback to --version), so the recorded argv reflects the
         // first invocation only.
         private const string DoctorJson = """{"checks":[],"summary":{"passed":0,"warnings":0,"failed":0},"installations":[{"path":"/peer/aspire","version":"1.0.0","status":"ok"}]}""";
diff --git a/tests/Aspire.Cli.Tests/Acquisition/WindowsRegistryReaderTests.cs b/tests/Aspire.Cli.Tests/Acquisition/WindowsRegistryReaderTests.cs
new file mode 100644
index 00000000000..2196249fca1
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Acquisition/WindowsRegistryReaderTests.cs
@@ -0,0 +1,264 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.Versioning;
+using Aspire.Cli.Acquisition;
+using Microsoft.Win32;
+
+namespace Aspire.Cli.Tests.Acquisition;
+
+/// <summary>
+/// Round-trip tests for <see cref="WindowsRegistryReader"/> against a real
+/// <c>HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall</c> hive. Each
+/// test writes a uniquely-named subkey, exercises the reader, and deletes the
+/// subkey in a <c>finally</c>. Crashed leftover subkeys are swept on next run
+/// by <see cref="TestUninstallEntry.SweepStaleEntries"/>.
+/// </summary>
+/// <remarks>
+/// All tests skip on non-Windows hosts via <see cref="Assert.SkipUnless(bool, string?)"/>.
+/// <see cref="SupportedOSPlatformAttribute"/> on each method also keeps the
+/// platform-compat analyzer (CA1416) happy for the <c>Microsoft.Win32</c> calls.
+/// </remarks>
+public class WindowsRegistryReaderTests
+{
+    static WindowsRegistryReaderTests()
+    {
+        // Defense in depth: if a previous test run was killed mid-test (CI
+        // timeout, OS reboot, etc.) the uninstall subkey will still be in HKCU.
+        // Sweep any "Microsoft.Aspire.Tests.*" leftovers before running so a
+        // stray entry can't cause an unrelated test to flake.
+        if (OperatingSystem.IsWindows())
+        {
+            TestUninstallEntry.SweepStaleEntries();
+        }
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_ReturnsTrue_WhenHkcuEntryMatches()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        using var binary = new TestTempDirectory();
+        var portableTarget = Path.Combine(binary.Path, "aspire.exe");
+        File.WriteAllBytes(portableTarget, []);
+
+        using var entry = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.Aspire",
+            portableTarget: portableTarget);
+
+        var reader = new WindowsRegistryReader();
+        Assert.True(reader.HasWingetAspireUninstallEntry(portableTarget));
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_ReturnsFalse_WhenIdentifierDoesNotMatch()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        using var binary = new TestTempDirectory();
+        var portableTarget = Path.Combine(binary.Path, "aspire.exe");
+        File.WriteAllBytes(portableTarget, []);
+
+        // Same shape as a real winget Aspire entry except the identifier is wrong.
+        // The reader must not match: it's specifically checking for "Microsoft.Aspire".
+        using var entry = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.NotAspire",
+            portableTarget: portableTarget);
+
+        var reader = new WindowsRegistryReader();
+        Assert.False(reader.HasWingetAspireUninstallEntry(portableTarget));
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_ReturnsFalse_WhenPortableTargetMissing()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        // A real Aspire winget portable install always writes PortableTargetFullPath;
+        // an entry that omits it is malformed and the reader must skip it rather
+        // than match on identifier alone.
+        using var entry = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.Aspire",
+            portableTarget: null);
+
+        var reader = new WindowsRegistryReader();
+        Assert.False(reader.HasWingetAspireUninstallEntry(@"C:\anything\aspire.exe"));
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_ReturnsFalse_WhenPortableTargetPointsElsewhere()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        using var binary = new TestTempDirectory();
+        var registeredTarget = Path.Combine(binary.Path, "aspire.exe");
+        var queriedTarget = Path.Combine(binary.Path, "different.exe");
+
+        using var entry = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.Aspire",
+            portableTarget: registeredTarget);
+
+        var reader = new WindowsRegistryReader();
+        Assert.False(reader.HasWingetAspireUninstallEntry(queriedTarget));
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_MatchesPathCaseInsensitively()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        // Windows filesystem paths are case-insensitive on NTFS by default. The
+        // reader documents OrdinalIgnoreCase comparison; this test pins that.
+        using var binary = new TestTempDirectory();
+        var registeredTarget = Path.Combine(binary.Path, "aspire.exe").ToLowerInvariant();
+        var queriedTarget = registeredTarget.ToUpperInvariant();
+
+        using var entry = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.Aspire",
+            portableTarget: registeredTarget);
+
+        var reader = new WindowsRegistryReader();
+        Assert.True(reader.HasWingetAspireUninstallEntry(queriedTarget));
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_ReturnsFalse_ForEmptyProcessPath()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        var reader = new WindowsRegistryReader();
+        Assert.False(reader.HasWingetAspireUninstallEntry(string.Empty));
+    }
+
+    [Fact]
+    [SupportedOSPlatform("windows")]
+    public void HasWingetAspireUninstallEntry_IgnoresUnrelatedEntries()
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "WindowsRegistryReader is Windows-only.");
+
+        // Surrounding the matching entry with unrelated identifier+target rows
+        // (mimicking the noisy real-world Uninstall hive) must not change the
+        // result. Both arms of the iterator are exercised: skip-on-identifier
+        // and skip-on-missing-target.
+        using var binary = new TestTempDirectory();
+        var portableTarget = Path.Combine(binary.Path, "aspire.exe");
+        File.WriteAllBytes(portableTarget, []);
+
+        using var unrelated1 = TestUninstallEntry.Create(
+            packageIdentifier: "Some.Other.Package",
+            portableTarget: portableTarget);
+        using var unrelated2 = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.Aspire",
+            portableTarget: null);
+        using var matching = TestUninstallEntry.Create(
+            packageIdentifier: "Microsoft.Aspire",
+            portableTarget: portableTarget);
+
+        var reader = new WindowsRegistryReader();
+        Assert.True(reader.HasWingetAspireUninstallEntry(portableTarget));
+    }
+}
+
+/// <summary>
+/// Creates a fake winget portable uninstall entry under
+/// <c>HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall</c> with a
+/// unique <c>Microsoft.Aspire.Tests.&lt;guid&gt;</c> subkey name, and deletes
+/// it on dispose. Static <see cref="SweepStaleEntries"/> removes any leftovers
+/// from crashed test runs so a stale entry can never affect a fresh run.
+/// </summary>
+file sealed class TestUninstallEntry : IDisposable
+{
+    private const string UninstallPath = @"Software\Microsoft\Windows\CurrentVersion\Uninstall";
+    // Distinctive prefix so leftover entries can be swept without affecting
+    // unrelated keys under Uninstall.
+    private const string TestSubKeyPrefix = "Microsoft.Aspire.Tests.";
+
+    private readonly string _subKeyName;
+
+    private TestUninstallEntry(string subKeyName)
+    {
+        _subKeyName = subKeyName;
+    }
+
+    [SupportedOSPlatform("windows")]
+    public static TestUninstallEntry Create(string packageIdentifier, string? portableTarget)
+    {
+        var subKeyName = TestSubKeyPrefix + Guid.NewGuid().ToString("N");
+
+        using var uninstall = Registry.CurrentUser.CreateSubKey(UninstallPath, writable: true)
+            ?? throw new InvalidOperationException($"Could not open or create HKCU\\{UninstallPath}.");
+        using var entry = uninstall.CreateSubKey(subKeyName, writable: true)
+            ?? throw new InvalidOperationException($"Could not create HKCU\\{UninstallPath}\\{subKeyName}.");
+
+        entry.SetValue("WinGetPackageIdentifier", packageIdentifier, RegistryValueKind.String);
+        if (portableTarget is not null)
+        {
+            entry.SetValue("PortableTargetFullPath", portableTarget, RegistryValueKind.String);
+        }
+
+        return new TestUninstallEntry(subKeyName);
+    }
+
+    public void Dispose()
+    {
+        if (!OperatingSystem.IsWindows())
+        {
+            return;
+        }
+
+        TryDeleteSubKey(_subKeyName);
+    }
+
+    [SupportedOSPlatform("windows")]
+    public static void SweepStaleEntries()
+    {
+        try
+        {
+            using var uninstall = Registry.CurrentUser.OpenSubKey(UninstallPath, writable: true);
+            if (uninstall is null)
+            {
+                return;
+            }
+
+            foreach (var name in uninstall.GetSubKeyNames())
+            {
+                if (name.StartsWith(TestSubKeyPrefix, StringComparison.Ordinal))
+                {
+                    try
+                    {
+                        uninstall.DeleteSubKeyTree(name, throwOnMissingSubKey: false);
+                    }
+                    catch
+                    {
+                        // Best-effort sweep; tolerate per-entry deletion failure.
+                    }
+                }
+            }
+        }
+        catch
+        {
+            // Best-effort sweep; tolerate the open failing entirely.
+        }
+    }
+
+    [SupportedOSPlatform("windows")]
+    private static void TryDeleteSubKey(string subKeyName)
+    {
+        try
+        {
+            using var uninstall = Registry.CurrentUser.OpenSubKey(UninstallPath, writable: true);
+            uninstall?.DeleteSubKeyTree(subKeyName, throwOnMissingSubKey: false);
+        }
+        catch
+        {
+            // Best-effort cleanup; stale entries are swept by the static
+            // constructor on the next run.
+        }
+    }
+}
diff --git a/tests/Aspire.Cli.Tests/Acquisition/WingetStartupProbeTests.cs b/tests/Aspire.Cli.Tests/Acquisition/WingetStartupProbeTests.cs
new file mode 100644
index 00000000000..d0f15468969
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Acquisition/WingetStartupProbeTests.cs
@@ -0,0 +1,128 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Cli.Acquisition;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Aspire.Cli.Tests.Acquisition;
+
+/// <summary>
+/// Tests the startup-time invocation contract for <see cref="WingetFirstRunProbe"/>.
+/// </summary>
+/// <remarks>
+/// <para>
+/// The probe is fired exactly once from <see cref="Program.TryRunWingetFirstRunProbe(IServiceProvider)"/>,
+/// which is itself called from the <c>CliExecutionContext</c> DI singleton factory in
+/// <c>Program.BuildApplicationAsync</c>. The "factory invokes this helper" claim is a one-line
+/// code-review check at the factory body; the helper's own contract (resolves the probe, derives
+/// the binary directory from <see cref="Environment.ProcessPath"/>, swallows failures) is what is
+/// pinned here.
+/// </para>
+/// <para>
+/// The probe early-returns when the sidecar already exists at the target binary directory.
+/// In a normal test run the test host binary directory (the dotnet install root) carries no
+/// sidecar, but a stray sidecar would silently turn these tests into no-ops. Each test checks
+/// that precondition explicitly and skips with a diagnostic message otherwise.
+/// </para>
+/// </remarks>
+public class WingetStartupProbeTests
+{
+    [Fact]
+    public void TryRunWingetFirstRunProbe_InvokesProbeAgainstProcessBinaryDirectory()
+    {
+        AssertProbeReachableFromTestRunner();
+
+        var registry = new CapturingWindowsRegistryReader();
+        using var provider = BuildMinimalProvider(registry);
+
+        Program.TryRunWingetFirstRunProbe(provider);
+
+        // The probe reached the registry-check arm exactly once, which means it
+        // resolved WingetFirstRunProbe from DI, derived the binary directory from
+        // Environment.ProcessPath, found no pre-existing sidecar, and queried our
+        // capturing reader for ARP membership. Returning false from the reader
+        // also means no sidecar was written near the test runner's binary.
+        Assert.Equal(1, registry.CallCount);
+        Assert.Equal(Environment.ProcessPath, registry.LastProcessPath);
+    }
+
+    [Fact]
+    public void TryRunWingetFirstRunProbe_SwallowsRegistryReaderException()
+    {
+        AssertProbeReachableFromTestRunner();
+
+        using var provider = BuildMinimalProvider(new ThrowingWindowsRegistryReader());
+
+        // No exception must escape: a registry probe failure during CLI startup
+        // is logged and treated as "not a winget install for this run", not a
+        // fatal error that prevents the CLI from launching.
+        var ex = Record.Exception(() => Program.TryRunWingetFirstRunProbe(provider));
+        Assert.Null(ex);
+    }
+
+    /// <summary>
+    /// Skips the test if <see cref="Environment.ProcessPath"/> is unavailable or
+    /// if a stray <c>.aspire-install.json</c> exists at the test host's binary
+    /// directory. Either condition would make the probe early-return before
+    /// reaching the registry reader, which would silently invalidate the assertion.
+    /// </summary>
+    private static void AssertProbeReachableFromTestRunner()
+    {
+        var processPath = Environment.ProcessPath;
+        Assert.SkipUnless(
+            !string.IsNullOrEmpty(processPath),
+            "Environment.ProcessPath is unavailable in this test host; the startup probe cannot run.");
+
+        var binaryDir = Path.GetDirectoryName(processPath);
+        Assert.SkipUnless(
+            !string.IsNullOrEmpty(binaryDir),
+            $"Could not derive a binary directory from Environment.ProcessPath='{processPath}'.");
+
+        var sidecarPath = Path.Combine(binaryDir, ".aspire-install.json");
+        Assert.SkipUnless(
+            !File.Exists(sidecarPath),
+            $"Test host binary directory '{binaryDir}' already contains '{InstallSidecarReader.SidecarFileName}'; the probe would early-return before consulting the registry. " +
+            "Remove the stray sidecar or run the tests from a different host to exercise this scenario.");
+    }
+
+    private static ServiceProvider BuildMinimalProvider(IWindowsRegistryReader registry)
+    {
+        var services = new ServiceCollection();
+        services.AddSingleton(registry);
+        // WingetFirstRunProbe's constructor takes ILogger<WingetFirstRunProbe>, so the
+        // registration must be against the interface — registering the concrete
+        // NullLogger<T> alone would leave DI unable to resolve the ctor parameter,
+        // and the outer try/catch in TryRunWingetFirstRunProbe would silently swallow
+        // the resolution failure instead of reaching the registry probe.
+        services.AddSingleton<ILogger<WingetFirstRunProbe>>(NullLogger<WingetFirstRunProbe>.Instance);
+        services.AddSingleton<WingetFirstRunProbe>();
+        return services.BuildServiceProvider();
+    }
+}
+
+/// <summary>
+/// Captures every <see cref="HasWingetAspireUninstallEntry"/> call and always
+/// returns <see langword="false"/> so the probe does not write a sidecar near
+/// the test host's binary.
+/// </summary>
+file sealed class CapturingWindowsRegistryReader : IWindowsRegistryReader
+{
+    private int _callCount;
+    public int CallCount => Volatile.Read(ref _callCount);
+    public string? LastProcessPath { get; private set; }
+
+    public bool HasWingetAspireUninstallEntry(string processPath)
+    {
+        Interlocked.Increment(ref _callCount);
+        LastProcessPath = processPath;
+        return false;
+    }
+}
+
+file sealed class ThrowingWindowsRegistryReader : IWindowsRegistryReader
+{
+    public bool HasWingetAspireUninstallEntry(string processPath)
+        => throw new InvalidOperationException("Simulated registry probe failure for test.");
+}
diff --git a/tests/Aspire.Cli.Tests/BundleServiceComputeDefaultExtractDirTests.cs b/tests/Aspire.Cli.Tests/BundleServiceComputeDefaultExtractDirTests.cs
index 864908f2c0c..bc3b37451c9 100644
--- a/tests/Aspire.Cli.Tests/BundleServiceComputeDefaultExtractDirTests.cs
+++ b/tests/Aspire.Cli.Tests/BundleServiceComputeDefaultExtractDirTests.cs
@@ -9,7 +9,7 @@ namespace Aspire.Cli.Tests;
 // distribution shape that ships an .aspire-install.json sidecar must land
 // extraction at the install prefix the packager owns so versions/<id>/ stays
 // inside the directory the packager actually manages. These tests construct the
-// real on-disk layout each route produces, then assert the helper picks the
+// real on-disk layout each source produces, then assert the helper picks the
 // directory whose versions/ subdirectory the bundle should populate. They are
 // the regression net against a packager moving the sidecar or the bundle
 // pipeline changing its switch on the sidecar's source field.
@@ -22,7 +22,7 @@ public class BundleServiceComputeDefaultExtractDirTests
     [InlineData("localhive")] // localhive.{sh,ps1}
     public void ComputeDefaultExtractDir_SharedPrefixSource_ReturnsParentOfBinaryDir(string source)
     {
-        // Both the get-aspire-cli script route and the localhive route lay the
+        // Both the get-aspire-cli script source and the localhive source lay the
         // CLI out at <prefix>/bin/aspire with a colocated .aspire-install.json,
         // so extraction must land at <prefix>/ (parent of the binary's dir) so
         // the eventual versions/<id>/ tree sits next to the bin/ directory
@@ -48,7 +48,7 @@ public void ComputeDefaultExtractDir_PRSource_ReturnsPRSubprefix()
         // dogfood/pr-<N>/bin subdirectory with its own colocated sidecar. The
         // sidecar value is always source=pr; the per-PR namespace lives in the
         // directory layout. Extraction must land at the dogfood/pr-<N>/ directory
-        // — not the outer install root — to keep stable and PR-route versions/
+        // — not the outer install root — to keep stable and PR-source versions/
         // trees from colliding.
         using var temp = new TestTempDirectory();
         var prDir = Path.Combine(temp.Path, "dogfood", "pr-12345");
@@ -87,13 +87,13 @@ public void ComputeDefaultExtractDir_WingetSource_ReturnsInstallDirectory()
     [Fact]
     public void ComputeDefaultExtractDir_BrewSymlinkSource_ReturnsCellarPrefix_NotSymlinkParent()
     {
-        // Regression net for the brew bug: /opt/homebrew/bin/aspire is a symlink into
+        // Regression net for the homebrew bug: /opt/homebrew/bin/aspire is a symlink into
         // the cellar (e.g. /opt/homebrew/Caskroom/aspire/<version>/aspire) where the
-        // brew cask writes the binary AND .aspire-install.json side-by-side. The helper
+        // homebrew cask writes the binary AND .aspire-install.json side-by-side. The helper
         // follows the symlink before sidecar lookup; extraction must land at the cellar
         // prefix so `brew uninstall aspire` (which wipes that prefix per the cask
         // template) cleans the versions/<id>/ tree too. Using the symlink's parent
-        // (/opt/homebrew/) would leak versions/ outside brew's ownership.
+        // (/opt/homebrew/) would leak versions/ outside homebrew's ownership.
         Assert.SkipUnless(OperatingSystem.IsLinux() || OperatingSystem.IsMacOS(),
             "Symlink resolution test only runs on Linux/macOS where unprivileged symlink creation is reliable.");
 
diff --git a/tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossRouteExtractionTests.cs b/tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossSourceExtractionTests.cs
similarity index 92%
rename from tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossRouteExtractionTests.cs
rename to tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossSourceExtractionTests.cs
index 0722a6cdc8c..3d0316dd65b 100644
--- a/tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossRouteExtractionTests.cs
+++ b/tests/Aspire.Cli.Tests/Bundles/BundleServiceCrossSourceExtractionTests.cs
@@ -7,14 +7,14 @@ namespace Aspire.Cli.Tests.Bundles;
 
 /// <summary>
 /// Verifies <see cref="BundleService.ComputeDefaultExtractDir(string)"/> against
-/// every (source × prefix shape) combination the supported install routes produce.
+/// every (source × prefix shape) combination the supported install sources produce.
 /// The matrix locks in the contract: the reader walks the sidecar's
 /// <c>source</c> field — and nothing else — to decide between
-/// <c>binaryDir</c> (winget / brew / dotnet-tool) and the parent of
+/// <c>binaryDir</c> (winget / homebrew / dotnet-tool) and the parent of
 /// <c>binaryDir</c> (script / pr / localhive). Missing, invalid, or unknown sidecars fall
 /// through to the parent-of-binary heuristic.
 /// </summary>
-public class BundleServiceCrossRouteExtractionTests
+public class BundleServiceCrossSourceExtractionTests
 {
     // The inline-data paths use forward slashes for source-readability; the test
     // method converts them to platform-native separators before constructing
@@ -23,7 +23,7 @@ public class BundleServiceCrossRouteExtractionTests
     // 1) winget canonical: WinGet places the portable binary in a per-package
     //    versioned directory; the bundle payload lives in that same directory.
     [InlineData("winget", "WinGet/Packages/Microsoft.Aspire_Microsoft.Winget.Source_8wekyb3d8bbwe/aspire.exe", "WinGet/Packages/Microsoft.Aspire_Microsoft.Winget.Source_8wekyb3d8bbwe")]
-    // 2) brew canonical: Homebrew cellar with versioned cask directory.
+    // 2) homebrew canonical: Homebrew cellar with versioned cask directory.
     [InlineData("brew", "Caskroom/aspire/13.2.0/aspire", "Caskroom/aspire/13.2.0")]
     // 3) dotnet-tool canonical: dotnet's global-tools shim at ~/.dotnet/tools/aspire
     //    delegates (apphost launch on Windows; symlink follow on Unix) to the
@@ -37,7 +37,7 @@ public class BundleServiceCrossRouteExtractionTests
     [InlineData("pr", ".aspire/dogfood/pr-16817/bin/aspire", ".aspire/dogfood/pr-16817")]
     // 6) localhive canonical: local dev hive with the same bin layout as script.
     [InlineData("localhive", ".aspire/local/bin/aspire", ".aspire/local")]
-    // 7) Cross-route smuggle case: a brew-source sidecar dropped into a
+    // 7) Cross-source smuggle case: a homebrew-source sidecar dropped into a
     //    script-layout prefix MUST resolve to binaryDir per the switch — the
     //    reader is honest about whatever the producer put on disk. When the
     //    producer side correctly suppresses the smuggled sidecar, this row's
@@ -55,7 +55,7 @@ public class BundleServiceCrossRouteExtractionTests
     // 11) Sidecar with an unknown source value: switch default arm, same as
     //     missing sidecar — parent-of-binary.
     [InlineData("github-actions", ".aspire/bin/aspire", ".aspire")]
-    public void ComputeDefaultExtractDir_RouteAndPrefixCombinations_ProduceExpectedExtractDir(
+    public void ComputeDefaultExtractDir_SourceAndPrefixCombinations_ProduceExpectedExtractDir(
         string? sourceField,
         string relativeProcessPath,
         string relativeExpectedExtractDir)
diff --git a/tests/Aspire.Cli.Tests/Commands/DoctorCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/DoctorCommandTests.cs
index b91cda7c8b5..cf3fdae0289 100644
--- a/tests/Aspire.Cli.Tests/Commands/DoctorCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/DoctorCommandTests.cs
@@ -567,7 +567,7 @@ public async Task DoctorCommand_Json_CliVersion_IncludesLatestVersionChannel_Whe
     }
 
     [Fact]
-    public async Task DoctorCommand_Json_IncludesDiscoveredInstallations()
+    public async Task DoctorCommand_Json_DoesNotIncludeDiscoveredInstallations()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         using var doc = await RunDoctorJsonAsync(workspace,
@@ -583,7 +583,7 @@ public async Task DoctorCommand_Json_IncludesDiscoveredInstallations()
                     CanonicalPath = "/home/test/.aspire/bin/aspire",
                     Version = "13.0.0",
                     Channel = "stable",
-                    Route = "script",
+                    Source = "script",
                     PathStatus = InstallationPathStatus.Active,
                     Status = InstallationInfoStatus.Ok,
                 },
@@ -595,99 +595,17 @@ public async Task DoctorCommand_Json_IncludesDiscoveredInstallations()
                         CanonicalPath = "/home/test/.aspire/dogfood/pr-1234/bin/aspire",
                         Version = "13.1.0-preview",
                         Channel = "pr-1234",
-                        Route = "pr",
+                        Source = "pr",
                         PathStatus = InstallationPathStatus.Shadowed,
                         Status = InstallationInfoStatus.Ok,
-                    },
-                ]));
-
-        var installations = doc.RootElement.GetProperty("installations").EnumerateArray().ToArray();
-        Assert.Equal(2, installations.Length);
-
-        var self = installations[0];
-        Assert.Equal("/home/test/.aspire/bin/aspire", self.GetProperty("path").GetString());
-        Assert.Equal("stable", self.GetProperty("channel").GetString());
-        Assert.Equal("script", self.GetProperty("route").GetString());
-        Assert.Equal(InstallationPathStatus.Active, self.GetProperty("pathStatus").GetString());
-
-        var peer = installations[1];
-        Assert.Equal("/home/test/.aspire/dogfood/pr-1234/bin/aspire", peer.GetProperty("path").GetString());
-        Assert.Equal("pr-1234", peer.GetProperty("channel").GetString());
-        Assert.Equal("pr", peer.GetProperty("route").GetString());
-        Assert.Equal(InstallationPathStatus.Shadowed, peer.GetProperty("pathStatus").GetString());
-    }
+                     },
+                 ]));
 
-    [Fact]
-    public async Task DoctorCommand_HumanReadable_Self_RendersOnlyRunningInstallationAndSkipsChecks()
-    {
-        // `doctor --self` is the peer-probe surface. Without --format the
-        // human-readable table is the default; with --format json the
-        // probe gets a machine-readable row. Either way, no environment
-        // checks run and only the running CLI's row is rendered.
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var output = new StringWriter();
-        var console = AnsiConsole.Create(new AnsiConsoleSettings
-        {
-            Ansi = AnsiSupport.No,
-            ColorSystem = ColorSystemSupport.NoColors,
-            Interactive = InteractionSupport.No,
-            Out = new AnsiConsoleOutput(output),
-            Enrichment = new ProfileEnrichment { UseDefaultEnrichers = false },
-        });
-        console.Profile.Width = int.MaxValue;
-
-        var services = CreateDoctorVersionServiceCollection(workspace, outputHelper, options =>
-        {
-            options.CliUpdateNotifierFactory = _ => new TestCliUpdateNotifier();
-        });
-        services.RemoveAll<IAnsiConsole>();
-        services.AddSingleton<IAnsiConsole>(console);
-        UseFakeInstallationDiscovery(
-            services,
-            self: new InstallationInfo
-            {
-                Path = "/home/test/.aspire/bin/aspire",
-                CanonicalPath = "/home/test/.aspire/bin/aspire",
-                Version = "13.4.0-pr.17115.gcd700928",
-                Channel = "pr-17115",
-                Route = "brew",
-                PathStatus = InstallationPathStatus.Active,
-                Status = InstallationInfoStatus.Ok,
-            },
-            others:
-            [
-                new InstallationInfo
-                {
-                    Path = "/peer/aspire",
-                    CanonicalPath = "/peer/aspire",
-                    Version = "13.1.0-preview",
-                    Channel = "pr-1234",
-                    Route = "pr",
-                    PathStatus = InstallationPathStatus.Shadowed,
-                    Status = InstallationInfoStatus.Ok,
-                },
-            ]);
-
-        using var provider = services.BuildServiceProvider();
-        var command = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
-        var result = command.Parse("doctor --self");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-
-        Assert.Equal(CliExitCodes.Success, exitCode);
-        var rendered = output.ToString();
-        Assert.Contains("Aspire CLI Installations", rendered, StringComparison.Ordinal);
-        Assert.Contains("13.4.0-pr.17115.gcd700928", rendered, StringComparison.Ordinal);
-        Assert.Contains("pr-17115", rendered, StringComparison.Ordinal);
-        // No environment checks ran, so no Summary line.
-        Assert.DoesNotContain("Summary:", rendered, StringComparison.Ordinal);
-        // No peer rows — --self bounds the output to the running CLI only.
-        Assert.DoesNotContain("/peer/aspire", rendered, StringComparison.Ordinal);
-        Assert.DoesNotContain("pr-1234", rendered, StringComparison.Ordinal);
+        Assert.False(doc.RootElement.TryGetProperty("installations", out _));
     }
 
     [Fact]
-    public async Task DoctorCommand_HumanReadable_AppendsInstallationsAfterSummary()
+    public async Task DoctorCommand_HumanReadable_DoesNotAppendInstallationsAfterSummary()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var output = new StringWriter();
@@ -715,7 +633,7 @@ public async Task DoctorCommand_HumanReadable_AppendsInstallationsAfterSummary()
                 CanonicalPath = "/home/test/.aspire/bin/aspire",
                 Version = "13.0.0",
                 Channel = "stable",
-                Route = "script",
+                Source = "script",
                 PathStatus = InstallationPathStatus.Active,
                 Status = InstallationInfoStatus.Ok,
             },
@@ -727,7 +645,7 @@ public async Task DoctorCommand_HumanReadable_AppendsInstallationsAfterSummary()
                     CanonicalPath = "/peer/aspire",
                     Version = "13.1.0-preview",
                     Channel = "pr-1234",
-                    Route = "pr",
+                    Source = "pr",
                     PathStatus = InstallationPathStatus.Shadowed,
                     Status = InstallationInfoStatus.Ok,
                 },
@@ -741,107 +659,35 @@ public async Task DoctorCommand_HumanReadable_AppendsInstallationsAfterSummary()
 
         Assert.Equal(CliExitCodes.Success, exitCode);
         var rendered = output.ToString();
-        var summaryIndex = rendered.IndexOf("Summary:", StringComparison.Ordinal);
-        var installationsIndex = rendered.IndexOf("Aspire CLI Installations", StringComparison.Ordinal);
-        Assert.True(summaryIndex >= 0, $"Expected doctor summary in output:{Environment.NewLine}{rendered}");
-        Assert.True(installationsIndex > summaryIndex, $"Expected installations after summary in output:{Environment.NewLine}{rendered}");
-        Assert.Contains("/peer/aspire", rendered, StringComparison.Ordinal);
-        Assert.Contains("pr-1234", rendered, StringComparison.Ordinal);
+        Assert.Contains("Summary:", rendered, StringComparison.Ordinal);
+        Assert.DoesNotContain("Aspire CLI Installations", rendered, StringComparison.Ordinal);
+        Assert.DoesNotContain("/peer/aspire", rendered, StringComparison.Ordinal);
+        Assert.DoesNotContain("pr-1234", rendered, StringComparison.Ordinal);
     }
 
     [Fact]
-    public async Task DoctorCommand_HumanReadable_EscapesUnknownPathStatus()
+    public void DoctorCommand_InfoCommandIsNotRegistered()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var output = new StringWriter();
-        var console = AnsiConsole.Create(new AnsiConsoleSettings
-        {
-            Ansi = AnsiSupport.No,
-            ColorSystem = ColorSystemSupport.NoColors,
-            Interactive = InteractionSupport.No,
-            Out = new AnsiConsoleOutput(output),
-            Enrichment = new ProfileEnrichment { UseDefaultEnrichers = false },
-        });
-        console.Profile.Width = int.MaxValue;
-
-        // pathStatus is parsed from untrusted peer-probe stdout. A peer
-        // that emits an unrecognized string must not be able to inject
-        // Spectre markup into the parent's rendered table; the default
-        // branch of PathStatusDisplay must EscapeMarkup() the value.
-        var services = CreateDoctorVersionServiceCollection(workspace, outputHelper, options =>
-        {
-            options.CliUpdateNotifierFactory = _ => new TestCliUpdateNotifier();
-        });
-        services.RemoveAll<IAnsiConsole>();
-        services.AddSingleton<IAnsiConsole>(console);
-        UseFakeInstallationDiscovery(
-            services,
-            self: new InstallationInfo
-            {
-                Path = "/home/test/.aspire/bin/aspire",
-                CanonicalPath = "/home/test/.aspire/bin/aspire",
-                Version = "13.0.0",
-                Channel = "stable",
-                Route = "script",
-                PathStatus = "custom[red]status[/]",
-                Status = InstallationInfoStatus.Ok,
-            });
-
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
-        var command = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
-        var result = command.Parse("doctor");
 
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
+        var command = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
 
-        Assert.Equal(CliExitCodes.Success, exitCode);
-        var rendered = output.ToString();
-        Assert.Contains("custom[red]status[/]", rendered, StringComparison.Ordinal);
+        Assert.DoesNotContain(command.Subcommands, subcommand => subcommand.Name == "info");
     }
 
     [Fact]
-    public void DoctorCommand_InfoCommandIsNotRegistered()
+    public void DoctorCommand_Self_IsNotRegistered()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
         using var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
+        var result = command.Parse("doctor --self --format json");
 
-        Assert.DoesNotContain(command.Subcommands, subcommand => subcommand.Name == "info");
-    }
-
-    [Fact]
-    public async Task DoctorCommand_Json_Self_ReturnsOnlyRunningInstallation()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        using var doc = await RunDoctorJsonAsync(workspace,
-            commandLine: "doctor --self --format json",
-            configureOptions: options =>
-            {
-                options.CliUpdateNotifierFactory = _ => new TestCliUpdateNotifier();
-            },
-            configureServices: services => UseFakeInstallationDiscovery(
-                services,
-                self: new InstallationInfo
-                {
-                    Path = "/usr/local/bin/aspire",
-                    CanonicalPath = "/usr/local/bin/aspire",
-                    Version = "13.0.0",
-                    Channel = "stable",
-                    Route = "script",
-                    PathStatus = InstallationPathStatus.Active,
-                    Status = InstallationInfoStatus.Ok,
-                }));
-
-        Assert.Empty(doc.RootElement.GetProperty("checks").EnumerateArray());
-        var installations = doc.RootElement.GetProperty("installations").EnumerateArray().ToArray();
-        var row = Assert.Single(installations);
-        Assert.Equal("/usr/local/bin/aspire", row.GetProperty("path").GetString());
-        Assert.Equal("13.0.0", row.GetProperty("version").GetString());
-        Assert.Equal("stable", row.GetProperty("channel").GetString());
-        Assert.Equal("script", row.GetProperty("route").GetString());
-        Assert.Equal(InstallationPathStatus.Active, row.GetProperty("pathStatus").GetString());
-        Assert.Equal(InstallationInfoStatus.Ok, row.GetProperty("status").GetString());
+        Assert.NotEmpty(result.Errors);
     }
 
     [Fact]
@@ -863,72 +709,7 @@ public async Task DoctorCommand_Json_WhenInstallDiscoveryFails_StillReturnsDocto
                 discoverAllException: new IOException("PATH lookup failed")));
 
         Assert.NotEmpty(doc.RootElement.GetProperty("checks").EnumerateArray());
-        var row = Assert.Single(doc.RootElement.GetProperty("installations").EnumerateArray());
-        Assert.Equal(InstallationInfoStatus.Failed, row.GetProperty("status").GetString());
-        Assert.Equal("Install discovery failed. See the Aspire CLI logs for details.", row.GetProperty("statusReason").GetString());
-    }
-
-    [Theory]
-    [InlineData(InstallationInfoStatus.Failed, "(probe failed)")]
-    [InlineData(InstallationInfoStatus.NotProbed, "(not probed)")]
-    [InlineData(InstallationInfoStatus.Ok, "(unknown)")]
-    public async Task DoctorCommand_HumanReadable_RendersMissingInstallationValuesBasedOnStatus(string status, string expectedPlaceholder)
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var output = new StringWriter();
-        var console = AnsiConsole.Create(new AnsiConsoleSettings
-        {
-            Ansi = AnsiSupport.No,
-            ColorSystem = ColorSystemSupport.NoColors,
-            Interactive = InteractionSupport.No,
-            Out = new AnsiConsoleOutput(output),
-            Enrichment = new ProfileEnrichment { UseDefaultEnrichers = false },
-        });
-        console.Profile.Width = int.MaxValue;
-
-        var services = CreateDoctorVersionServiceCollection(workspace, outputHelper, options =>
-        {
-            options.CliUpdateNotifierFactory = _ => new TestCliUpdateNotifier();
-        });
-        services.RemoveAll<IAnsiConsole>();
-        services.AddSingleton<IAnsiConsole>(console);
-        UseFakeInstallationDiscovery(
-            services,
-            self: new InstallationInfo
-            {
-                Path = "/home/test/.aspire/bin/aspire",
-                CanonicalPath = "/home/test/.aspire/bin/aspire",
-                Version = "13.0.0",
-                Channel = "stable",
-                Route = "script",
-                PathStatus = InstallationPathStatus.Active,
-                Status = InstallationInfoStatus.Ok,
-            },
-            others:
-            [
-                new InstallationInfo
-                {
-                    Path = $"/peer/{status}/aspire",
-                    CanonicalPath = $"/peer/{status}/aspire",
-                    Status = status,
-                },
-            ]);
-        using var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
-        var result = command.Parse("doctor");
-
-        var exitCode = await result.InvokeAsync().DefaultTimeout();
-        Assert.Equal(CliExitCodes.Success, exitCode);
-
-        var rendered = output.ToString();
-        Assert.Contains($"/peer/{status}/aspire", rendered, StringComparison.Ordinal);
-        Assert.Contains(expectedPlaceholder, rendered, StringComparison.Ordinal);
-
-        foreach (var otherPlaceholder in new[] { "(probe failed)", "(not probed)", "(unknown)" }.Where(p => p != expectedPlaceholder))
-        {
-            Assert.DoesNotContain(otherPlaceholder, rendered, StringComparison.Ordinal);
-        }
+        Assert.False(doc.RootElement.TryGetProperty("installations", out _));
     }
 
     // Centralizes the scaffolding shared by `doctor --format json` tests:
@@ -992,7 +773,7 @@ private static IServiceCollection CreateDoctorVersionServiceCollection(
                 CanonicalPath = "/test/aspire",
                 Version = "13.0.0",
                 Channel = "stable",
-                Route = "script",
+                Source = "script",
                 PathStatus = InstallationPathStatus.Active,
                 Status = InstallationInfoStatus.Ok,
             });
diff --git a/tests/Aspire.Cli.Tests/Commands/HivesCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/HivesCommandTests.cs
new file mode 100644
index 00000000000..ec689da6765
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Commands/HivesCommandTests.cs
@@ -0,0 +1,93 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Cli.Commands;
+using Aspire.Cli.Tests.Utils;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Aspire.Cli.Tests.Commands;
+
+public class HivesCommandTests(ITestOutputHelper outputHelper)
+{
+    [Fact]
+    public async Task HivesList_ShowsHivesAndMatchingDogfoodInstalls()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-123", "packages"));
+        Directory.CreateDirectory(Path.Combine(aspireHome, "dogfood", "pr-123", "bin"));
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("hives list");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains("pr-123", output);
+        Assert.Contains(Path.Combine(aspireHome, "hives", "pr-123"), output);
+        Assert.Contains("yes", output, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task HivesDelete_PrHiveWithDogfoodInstall_RefusesWithoutForce()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-123");
+        var dogfoodPath = Path.Combine(aspireHome, "dogfood", "pr-123");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        Directory.CreateDirectory(Path.Combine(dogfoodPath, "bin"));
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("hives delete pr-123 --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.InvalidCommand, exitCode);
+        Assert.True(Directory.Exists(hivePath));
+        Assert.True(Directory.Exists(dogfoodPath));
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains("aspire uninstall --channel pr-123", output);
+    }
+
+    [Fact]
+    public async Task HivesDelete_PrHiveWithForce_DeletesOnlyHive()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-123");
+        var dogfoodPath = Path.Combine(aspireHome, "dogfood", "pr-123");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        Directory.CreateDirectory(Path.Combine(dogfoodPath, "bin"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("hives delete pr-123 --yes --force");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(hivePath));
+        Assert.True(Directory.Exists(dogfoodPath));
+    }
+}
diff --git a/tests/Aspire.Cli.Tests/Commands/InstallsCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/InstallsCommandTests.cs
new file mode 100644
index 00000000000..7d8006ec3fc
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Commands/InstallsCommandTests.cs
@@ -0,0 +1,667 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Cli.Acquisition;
+using Aspire.Cli.Commands;
+using Aspire.Cli.Tests.TestServices;
+using Aspire.Cli.Tests.Utils;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+using System.Text.Json.Nodes;
+
+namespace Aspire.Cli.Tests.Commands;
+
+public class InstallsCommandTests(ITestOutputHelper outputHelper)
+{
+    [Fact]
+    public async Task InstallsSelf_Json_ReturnsOnlyRunningInstallation()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = "/usr/local/bin/aspire",
+                CanonicalPath = "/usr/local/bin/aspire",
+                Version = "13.0.0",
+                Channel = "stable",
+                Source = "script",
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok,
+            },
+            [
+                new InstallationInfo
+                {
+                    Path = "/peer/aspire",
+                    CanonicalPath = "/peer/aspire",
+                    Version = "13.1.0-preview",
+                    Channel = "pr-1234",
+                    Source = "pr",
+                    PathStatus = InstallationPathStatus.Shadowed,
+                    Status = InstallationInfoStatus.Ok,
+                }
+            ])));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs --self --format json");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var installations = JsonNode.Parse(string.Join(Environment.NewLine, outputWriter.Logs))!.AsArray();
+        var row = Assert.Single(installations);
+        Assert.Equal("/usr/local/bin/aspire", row!["path"]!.GetValue<string>());
+        Assert.Equal("13.0.0", row["version"]!.GetValue<string>());
+        Assert.Equal("stable", row["channel"]!.GetValue<string>());
+        Assert.Equal("script", row["source"]!.GetValue<string>());
+        Assert.Equal(InstallationPathStatus.Active, row["pathStatus"]!.GetValue<string>());
+        Assert.Equal(InstallationInfoStatus.Ok, row["status"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public async Task InstallsSelf_List_ReturnsOnlyRunningInstallationWithoutChecks()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = "/usr/local/bin/aspire",
+                Version = "13.0.0",
+                Channel = "stable",
+                Source = "script",
+                PathStatus = "custom[red]status[/]",
+                Status = InstallationInfoStatus.Ok,
+            },
+            [
+                new InstallationInfo
+                {
+                    Path = "/peer/aspire",
+                    Status = InstallationInfoStatus.Ok,
+                }
+            ])));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs --self");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains("/usr/local/bin/aspire", output, StringComparison.Ordinal);
+        Assert.Contains("custom[red]status[/]", output, StringComparison.Ordinal);
+        Assert.DoesNotContain("/peer/aspire", output, StringComparison.Ordinal);
+        Assert.DoesNotContain("Summary:", output, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task InstallsList_ShowsDiscoveredInstallsAndOrphanHives()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-17400", "packages"));
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, "bin", "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, "bin", "aspire"),
+                Version = "13.2.0",
+                Channel = "stable",
+                Source = "script",
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok
+            })));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains("script", output);
+        Assert.Contains("stable", output);
+        Assert.Contains("orphan-hive", output);
+        Assert.Contains("pr-17400", output);
+        Assert.Contains("no install found", output);
+        Assert.Contains("Cleanup", output);
+        Assert.DoesNotContain("│", output);
+    }
+
+    [Fact]
+    public async Task InstallsList_FormatList_IsAcceptedAndUsesVerticalOutput()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, "bin", "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, "bin", "aspire"),
+                Version = "13.2.0",
+                Channel = "stable",
+                Source = "script",
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok
+            })));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list --format list");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains("Cleanup", output);
+        Assert.DoesNotContain("│", output);
+    }
+
+    [Fact]
+    public void InstallsList_FormatTable_IsRejected()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list --format table");
+
+        Assert.NotEmpty(result.Errors);
+    }
+
+    [Fact]
+    public async Task InstallsList_Json_IncludesDiscoveredInstallsBrokenRowsAndOrphanHives()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-17400", "packages"));
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, "bin", "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, "bin", "aspire"),
+                Version = "13.2.0",
+                Channel = "stable",
+                Source = "script",
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok
+            },
+            [
+                new InstallationInfo
+                {
+                    Path = Path.Combine(aspireHome, "broken", "aspire"),
+                    CanonicalPath = Path.Combine(aspireHome, "broken", "aspire"),
+                    Channel = "daily",
+                    Source = "script",
+                    PathStatus = InstallationPathStatus.Shadowed,
+                    Status = InstallationInfoStatus.Failed,
+                    StatusReason = "peer probe failed"
+                }
+            ])));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list --format json");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var json = JsonNode.Parse(string.Join(Environment.NewLine, outputWriter.Logs))!.AsArray();
+        Assert.Collection(
+            json,
+            row =>
+            {
+                Assert.Equal("script", row!["id"]!.GetValue<string>());
+                Assert.Equal("script", row["kind"]!.GetValue<string>());
+                Assert.Equal("stable", row["channel"]!.GetValue<string>());
+                Assert.Equal("active", row["status"]!.GetValue<string>());
+            },
+            row =>
+            {
+                Assert.Equal("script-2", row!["id"]!.GetValue<string>());
+                Assert.Equal("failed: peer probe failed", row["status"]!.GetValue<string>());
+                Assert.Equal("peer probe failed", row["statusReason"]!.GetValue<string>());
+            },
+            row =>
+            {
+                Assert.Equal("pr-17400", row!["id"]!.GetValue<string>());
+                Assert.Equal("orphan-hive", row["kind"]!.GetValue<string>());
+                Assert.Equal("no install found", row["status"]!.GetValue<string>());
+            });
+    }
+
+    [Theory]
+    [InlineData("dotnet-tool", "dotnet-tool", "Managed by dotnet tool; use: dotnet tool uninstall")]
+    [InlineData("winget", "winget", "Managed by WinGet; use: winget uninstall")]
+    [InlineData("brew", "homebrew", "Managed by Homebrew; use: brew uninstall")]
+    public async Task InstallsList_ManagedInstalls_ShowPackageManagerCleanupHint(string source, string expectedManagedBy, string expectedHint)
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, source, "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, source, "aspire"),
+                Version = "13.2.0",
+                Channel = "stable",
+                Source = source,
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok
+            })));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list --format json");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var json = JsonNode.Parse(string.Join(Environment.NewLine, outputWriter.Logs))!.AsArray();
+        Assert.Equal(expectedManagedBy, json[0]!["managedBy"]!.GetValue<string>());
+        Assert.Equal(expectedHint, json[0]!["cleanupHint"]!.GetValue<string>());
+        Assert.Null(json[0]!["uninstallCommand"]);
+    }
+
+    [Theory]
+    [InlineData("script", null, "script", "Use: aspire installs uninstall script")]
+    [InlineData("pr", "pr-17416", "pr", "Use: aspire installs uninstall pr-17416")]
+    [InlineData("localhive", "local", "localhive", "Use: aspire installs uninstall local")]
+    [InlineData("future-source", "future", "future-source", "Use: aspire installs uninstall future")]
+    public async Task InstallsList_AspireOwnedAndUnknownSources_UseAspireCleanupHint(string source, string? channel, string expectedKind, string expectedHint)
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, source, "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, source, "aspire"),
+                Version = "13.2.0",
+                Channel = channel,
+                Source = source,
+                PathStatus = InstallationPathStatus.NotOnPath,
+                Status = InstallationInfoStatus.Ok
+            })));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list --format json");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var row = JsonNode.Parse(string.Join(Environment.NewLine, outputWriter.Logs))!.AsArray()[0]!;
+        Assert.Equal(expectedKind, row["kind"]!.GetValue<string>());
+        Assert.Equal(expectedHint, row["cleanupHint"]!.GetValue<string>());
+        Assert.Null(row["managedBy"]);
+    }
+
+    [Theory]
+    [InlineData("dotnet-tool", "dotnet")]
+    [InlineData("winget", "winget")]
+    [InlineData("brew", "brew")]
+    public async Task InstallsUninstall_ManagedInstalls_AreDenied(string source, string expectedCommand)
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "stable", "packages"));
+
+        var testInteractionService = new TestInteractionService();
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.InteractionServiceFactory = _ => testInteractionService;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, source, "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, source, "aspire"),
+                Version = "13.2.0",
+                Channel = "stable",
+                Source = source,
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok
+            })));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs uninstall stable --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.InvalidCommand, exitCode);
+        Assert.True(Directory.Exists(Path.Combine(aspireHome, "hives", "stable")));
+        Assert.Empty(testInteractionService.BooleanPromptCalls);
+        Assert.Contains(testInteractionService.DisplayedErrors, e => e.Contains($"use: {expectedCommand}", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public async Task InstallsUninstall_UnknownId_FailsWithoutPrompting()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var testInteractionService = new TestInteractionService();
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.InteractionServiceFactory = _ => testInteractionService;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs uninstall missing-id");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.InvalidCommand, exitCode);
+        Assert.Empty(testInteractionService.BooleanPromptCalls);
+        Assert.Contains(testInteractionService.DisplayedErrors, e => e.Contains("missing-id", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task InstallsUninstall_ValidId_PromptsBeforeDeletingWhenYesIsNotSpecified()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-17400");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        var testInteractionService = new TestInteractionService();
+        testInteractionService.SetupBooleanResponse(false);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.InteractionServiceFactory = _ => testInteractionService;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs uninstall pr-17400");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Cancelled, exitCode);
+        Assert.Single(testInteractionService.BooleanPromptCalls);
+        Assert.True(Directory.Exists(hivePath));
+    }
+
+    [Fact]
+    public async Task InstallsList_OrdersActiveFirstAndOmitsMissingHivePaths()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-17400", "packages"));
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, "daily", "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, "daily", "aspire"),
+                Version = "13.2.0",
+                Channel = "daily",
+                Source = "script",
+                PathStatus = InstallationPathStatus.Shadowed,
+                Status = InstallationInfoStatus.Ok
+            },
+            [
+                new InstallationInfo
+                {
+                    Path = Path.Combine(aspireHome, "bin", "aspire"),
+                    CanonicalPath = Path.Combine(aspireHome, "bin", "aspire"),
+                    Version = "13.2.0",
+                    Channel = "stable",
+                    Source = "script",
+                    PathStatus = InstallationPathStatus.Active,
+                    Status = InstallationInfoStatus.Ok
+                }
+            ])));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list --format json");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var json = JsonNode.Parse(string.Join(Environment.NewLine, outputWriter.Logs))!.AsArray();
+        Assert.Equal("script-2", json[0]!["id"]!.GetValue<string>());
+        Assert.Equal("active", json[0]!["status"]!.GetValue<string>());
+        Assert.Equal("script", json[1]!["id"]!.GetValue<string>());
+        Assert.Null(json[1]!["hive"]);
+        Assert.Equal("pr-17400", json[2]!["id"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public async Task InstallsList_HidesDotnetHostSelfRowAndUsesUniqueIds()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = "/opt/homebrew/Cellar/dotnet/10.0.107/libexec/dotnet",
+                CanonicalPath = "/opt/homebrew/Cellar/dotnet/10.0.107/libexec/dotnet",
+                Version = "13.2.0",
+                Channel = "local",
+                Source = null,
+                PathStatus = InstallationPathStatus.NotOnPath,
+                Status = InstallationInfoStatus.Ok
+            },
+            [
+                new InstallationInfo
+                {
+                    Path = Path.Combine(aspireHome, "bin", "aspire"),
+                    CanonicalPath = Path.Combine(aspireHome, "bin", "aspire"),
+                    Version = "13.2.0",
+                    Channel = "local",
+                    Source = "localhive",
+                    PathStatus = InstallationPathStatus.Active,
+                    Status = InstallationInfoStatus.Ok
+                },
+                new InstallationInfo
+                {
+                    Path = Path.Combine(aspireHome, "dogfood", "pr-1", "bin", "aspire"),
+                    CanonicalPath = Path.Combine(aspireHome, "dogfood", "pr-1", "bin", "aspire"),
+                    Version = "13.2.0",
+                    Channel = "local",
+                    Source = "localhive",
+                    PathStatus = InstallationPathStatus.Shadowed,
+                    Status = InstallationInfoStatus.Ok
+                }
+            ])));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.DoesNotContain("/opt/homebrew/Cellar/dotnet", output);
+        Assert.Contains("local", output);
+        Assert.Contains("local-2", output);
+    }
+
+    [Fact]
+    public async Task InstallsList_LogsClassificationReasons()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-17400", "packages"));
+        var logger = new CapturingLogger<InstallsCommand>();
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        services.Replace(ServiceDescriptor.Singleton<ILogger<InstallsCommand>>(logger));
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = "/opt/homebrew/Cellar/dotnet/10.0.107/libexec/dotnet",
+                CanonicalPath = "/opt/homebrew/Cellar/dotnet/10.0.107/libexec/dotnet",
+                Version = "13.2.0",
+                Channel = "local",
+                Source = null,
+                PathStatus = InstallationPathStatus.NotOnPath,
+                Status = InstallationInfoStatus.Ok
+            },
+            [
+                new InstallationInfo
+                {
+                    Path = Path.Combine(aspireHome, "bin", "aspire"),
+                    CanonicalPath = Path.Combine(aspireHome, "bin", "aspire"),
+                    Version = "13.2.0",
+                    Channel = "local",
+                    Source = "localhive",
+                    PathStatus = InstallationPathStatus.Active,
+                    Status = InstallationInfoStatus.Ok
+                }
+            ])));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs list");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.Contains(logger.Entries, e => e.Level == LogLevel.Debug && e.Message.Contains("Ignoring discovery row path", StringComparison.Ordinal));
+        Assert.Contains(logger.Entries, e => e.Level == LogLevel.Debug && e.Message.Contains("Classified install path", StringComparison.Ordinal) && e.Message.Contains("localhive", StringComparison.Ordinal));
+        Assert.Contains(logger.Entries, e => e.Level == LogLevel.Debug && e.Message.Contains("Classified hive", StringComparison.Ordinal) && e.Message.Contains("orphan", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task InstallsUninstall_OrphanHive_DeletesHive()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-17400");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs uninstall pr-17400 --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(hivePath));
+    }
+
+    [Fact]
+    public async Task InstallsUninstall_PrNumberId_DeletesExactHive()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-17400");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs uninstall pr-17400 --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(hivePath));
+    }
+
+    [Fact]
+    public async Task InstallsUninstall_SuffixedIdWithoutMatchingRow_RejectsRatherThanDeleteUnderlyingChannel()
+    {
+        // `aspire installs uninstall pr-17416-2` must NOT silently strip the
+        // numeric suffix and delete the unsuffixed `pr-17416` hive. A typoed
+        // id (one that BuildRowsAsync didn't actually materialize) is a
+        // user error, not a license to delete a different hive.
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-17416");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        services.Replace(ServiceDescriptor.Singleton<IInstallationDiscovery>(_ => new FakeInstallationDiscovery(
+            new InstallationInfo
+            {
+                Path = Path.Combine(aspireHome, "dogfood", "pr-17416", "bin", "aspire"),
+                CanonicalPath = Path.Combine(aspireHome, "dogfood", "pr-17416", "bin", "aspire"),
+                Version = "13.2.0",
+                Channel = "pr-17416",
+                Source = "pr",
+                PathStatus = InstallationPathStatus.Active,
+                Status = InstallationInfoStatus.Ok
+            })));
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("installs uninstall pr-17416-2 --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.NotEqual(CliExitCodes.Success, exitCode);
+        Assert.True(Directory.Exists(hivePath), "Underlying hive must not be deleted when the typoed id has no matching row.");
+    }
+}
diff --git a/tests/Aspire.Cli.Tests/Commands/SetupCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/SetupCommandTests.cs
index e5c2e481254..62fddff99a0 100644
--- a/tests/Aspire.Cli.Tests/Commands/SetupCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/SetupCommandTests.cs
@@ -6,12 +6,12 @@
 namespace Aspire.Cli.Tests.Commands;
 
 // `SetupCommand.GetDefaultInstallPath` returns parent-of-binary regardless of
-// install route — distinct from the route-aware `BundleService.GetDefaultExtractDir`
-// used by auto-extract. These tests pin the route-independent contract.
+// install source — distinct from the source-aware `BundleService.GetDefaultExtractDir`
+// used by auto-extract. These tests pin the source-independent contract.
 public class SetupCommandTests
 {
     [Fact]
-    public void GetDefaultInstallPath_ScriptRouteLayout_ReturnsParentOfBinaryDirectory()
+    public void GetDefaultInstallPath_ScriptSourceLayout_ReturnsParentOfBinaryDirectory()
     {
         var processPath = Path.Combine("home", ".aspire", "bin", "aspire");
 
@@ -21,7 +21,7 @@ public void GetDefaultInstallPath_ScriptRouteLayout_ReturnsParentOfBinaryDirecto
     }
 
     [Fact]
-    public void GetDefaultInstallPath_PRRouteLayout_ReturnsParentOfBinaryDirectory()
+    public void GetDefaultInstallPath_PRSourceLayout_ReturnsParentOfBinaryDirectory()
     {
         var processPath = Path.Combine("home", ".aspire", "dogfood", "pr-12345", "bin", "aspire");
 
@@ -31,9 +31,9 @@ public void GetDefaultInstallPath_PRRouteLayout_ReturnsParentOfBinaryDirectory()
     }
 
     [Fact]
-    public void GetDefaultInstallPath_ManagedRouteFlatLayout_ReturnsParentOfBinaryDirectory()
+    public void GetDefaultInstallPath_ManagedSourceFlatLayout_ReturnsParentOfBinaryDirectory()
     {
-        // Managed-route layout is flat (no bin/ subdir). `BundleService.GetDefaultExtractDir`
+        // Managed-source layout is flat (no bin/ subdir). `BundleService.GetDefaultExtractDir`
         // diverges here and keeps the payload inside the binary's dir so package-manager uninstall reaches it.
         var processPath = Path.Combine("Program Files", "WindowsApps", "Microsoft.Aspire_xyz", "aspire.exe");
 
diff --git a/tests/Aspire.Cli.Tests/Commands/UninstallCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/UninstallCommandTests.cs
new file mode 100644
index 00000000000..c3a3c059a21
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Commands/UninstallCommandTests.cs
@@ -0,0 +1,321 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Text.Json.Nodes;
+using Aspire.Cli.Commands;
+using Aspire.Cli.Configuration;
+using Aspire.Cli.Tests.Utils;
+using Aspire.Shared;
+using Microsoft.AspNetCore.InternalTesting;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Aspire.Cli.Tests.Commands;
+
+public class UninstallCommandTests(ITestOutputHelper outputHelper)
+{
+    [Fact]
+    public async Task Uninstall_PrChannel_DeletesHiveAndDogfoodInstall()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "pr-123");
+        var dogfoodPath = Path.Combine(aspireHome, "dogfood", "pr-123");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        Directory.CreateDirectory(Path.Combine(dogfoodPath, "bin"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --channel pr-123 --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(hivePath));
+        Assert.False(Directory.Exists(dogfoodPath));
+    }
+
+    [Fact]
+    public async Task Uninstall_MatchingGlobalChannel_DeletesGlobalChannel()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-123", "packages"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var configurationService = provider.GetRequiredService<IConfigurationService>();
+        await configurationService.SetConfigurationAsync("channel", "pr-123", isGlobal: true).DefaultTimeout();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --channel pr-123 --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var globalSettingsPath = configurationService.GetSettingsFilePath(isGlobal: true);
+        var globalSettings = JsonNode.Parse(await File.ReadAllTextAsync(globalSettingsPath).DefaultTimeout())?.AsObject();
+        Assert.NotNull(globalSettings);
+        Assert.False(globalSettings.ContainsKey("channel"));
+    }
+
+    [Fact]
+    public async Task Uninstall_StableChannel_DoesNotRemoveSharedScriptInstallWithoutExplicitOption()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "stable");
+        var binPath = Path.Combine(aspireHome, "bin");
+        var binaryPath = Path.Combine(binPath, OperatingSystem.IsWindows() ? "aspire.exe" : "aspire");
+        var bundlePath = Path.Combine(aspireHome, "bundle");
+        var versionPath = Path.Combine(aspireHome, "versions", "v1");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        Directory.CreateDirectory(binPath);
+        Directory.CreateDirectory(bundlePath);
+        Directory.CreateDirectory(versionPath);
+        File.WriteAllText(binaryPath, string.Empty);
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --channel stable --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(hivePath));
+        Assert.True(File.Exists(binaryPath));
+        Assert.True(Directory.Exists(bundlePath));
+        Assert.True(Directory.Exists(versionPath));
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains("--remove-shared-install", output);
+    }
+
+    [Fact]
+    public async Task Uninstall_All_DoesNotRemoveStableLocalCustomOrSharedScriptInstall()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivesRoot = Path.Combine(aspireHome, "hives");
+        foreach (var hive in new[] { "pr-123", "staging", "daily", "stable", "local", "custom" })
+        {
+            Directory.CreateDirectory(Path.Combine(hivesRoot, hive, "packages"));
+        }
+
+        var binPath = Path.Combine(aspireHome, "bin");
+        var binaryPath = Path.Combine(binPath, OperatingSystem.IsWindows() ? "aspire.exe" : "aspire");
+        Directory.CreateDirectory(binPath);
+        File.WriteAllText(binaryPath, string.Empty);
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --all --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(Path.Combine(hivesRoot, "pr-123")));
+        Assert.False(Directory.Exists(Path.Combine(hivesRoot, "staging")));
+        Assert.False(Directory.Exists(Path.Combine(hivesRoot, "daily")));
+        Assert.True(Directory.Exists(Path.Combine(hivesRoot, "stable")));
+        Assert.True(Directory.Exists(Path.Combine(hivesRoot, "local")));
+        Assert.True(Directory.Exists(Path.Combine(hivesRoot, "custom")));
+        Assert.True(File.Exists(binaryPath));
+    }
+
+    [Fact]
+    public async Task Uninstall_All_DryRun_DoesNotReportMissingDogfoodInstall()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "pr-123", "packages"));
+
+        var outputWriter = new TestOutputTextWriter(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper, options =>
+        {
+            options.OutputTextWriter = outputWriter;
+            options.DisableAnsi = true;
+        });
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --all --dry-run");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        var output = string.Join(Environment.NewLine, outputWriter.Logs);
+        Assert.Contains(Path.Combine(aspireHome, "hives", "pr-123"), output);
+        Assert.DoesNotContain(Path.Combine(aspireHome, "dogfood", "pr-123"), output);
+        // --dry-run must not actually delete anything.
+        Assert.True(Directory.Exists(Path.Combine(aspireHome, "hives", "pr-123")));
+    }
+
+    [Theory]
+    [InlineData("../escape")]
+    [InlineData("foo/bar")]
+    [InlineData("foo\\bar")]
+    [InlineData("..")]
+    [InlineData("a/../b")]
+    public async Task Uninstall_RejectsChannelWithPathTraversal(string maliciousChannel)
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        // Create a sibling directory that path-traversal would target. It must
+        // still exist after the uninstall attempt — the service's channel
+        // validator must reject the malicious input before any directory walk.
+        var sibling = Path.Combine(workspace.WorkspaceRoot.FullName, "escape");
+        Directory.CreateDirectory(sibling);
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse($"uninstall --channel \"{maliciousChannel}\" --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+        Assert.NotEqual(CliExitCodes.Success, exitCode);
+        Assert.True(Directory.Exists(sibling));
+    }
+
+    [Fact]
+    public async Task Uninstall_RemoveSharedInstall_LeasedBundleVersion_KeepsBothLinkAndVersionAndFailsExit()
+    {
+        // When another aspire process holds an active lease on the bundle
+        // version, --remove-shared-install must leave BOTH the symlink and the
+        // version on disk and surface a non-zero exit. Deleting the symlink
+        // while the lease holder still has the version open would silently
+        // break the live process's ability to re-resolve ~/.aspire/bundle.
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "stable");
+        var binPath = Path.Combine(aspireHome, "bin");
+        var binaryPath = Path.Combine(binPath, OperatingSystem.IsWindows() ? "aspire.exe" : "aspire");
+        var versionsRoot = Path.Combine(aspireHome, "versions");
+        var versionPath = Path.Combine(versionsRoot, "v1");
+        var bundlePath = Path.Combine(aspireHome, "bundle");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        Directory.CreateDirectory(binPath);
+        Directory.CreateDirectory(versionPath);
+        File.WriteAllText(binaryPath, string.Empty);
+
+        try
+        {
+            Directory.CreateSymbolicLink(bundlePath, versionPath);
+        }
+        catch (Exception ex) when (ex is UnauthorizedAccessException or IOException)
+        {
+            Assert.Skip("Symlink creation is not available (Developer Mode not enabled or not running as admin).");
+            return;
+        }
+
+        using var lease = BundleVersionLease.Acquire(versionPath, "test", "uninstall-lease");
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --channel stable --remove-shared-install --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.NotEqual(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(hivePath));
+        Assert.False(File.Exists(binaryPath));
+        Assert.True(Directory.Exists(bundlePath), "Bundle symlink must remain so the lease holder can still resolve it.");
+        Assert.True(Directory.Exists(versionPath), "Leased bundle version must remain on disk.");
+    }
+
+    [Fact]
+    public async Task Uninstall_RemoveSharedInstall_LeasedBundleVersion_DryRun_StillSucceeds()
+    {
+        // --dry-run is describe-only — even though the real cleanup would be
+        // incomplete due to the lease, dry-run should report success so
+        // automation that just wants a preview doesn't trip on a runtime
+        // condition.
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var hivePath = Path.Combine(aspireHome, "hives", "stable");
+        var versionsRoot = Path.Combine(aspireHome, "versions");
+        var versionPath = Path.Combine(versionsRoot, "v1");
+        var bundlePath = Path.Combine(aspireHome, "bundle");
+        Directory.CreateDirectory(Path.Combine(hivePath, "packages"));
+        Directory.CreateDirectory(versionPath);
+
+        try
+        {
+            Directory.CreateSymbolicLink(bundlePath, versionPath);
+        }
+        catch (Exception ex) when (ex is UnauthorizedAccessException or IOException)
+        {
+            Assert.Skip("Symlink creation is not available (Developer Mode not enabled or not running as admin).");
+            return;
+        }
+
+        using var lease = BundleVersionLease.Acquire(versionPath, "test", "uninstall-lease");
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --channel stable --remove-shared-install --dry-run");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.True(Directory.Exists(hivePath));
+        Assert.True(Directory.Exists(bundlePath));
+        Assert.True(Directory.Exists(versionPath));
+    }
+
+    [Fact]
+    public async Task Uninstall_RemoveSharedInstall_BundleLinkOutsideVersions_RemovesLinkOnly()
+    {
+        // When the bundle symlink points outside ~/.aspire/versions/, the
+        // service should remove the link but leave whatever it points at
+        // alone — the target is owned by something else (e.g. a dev redirect).
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var aspireHome = Path.Combine(workspace.WorkspaceRoot.FullName, ".aspire");
+        var externalTarget = Path.Combine(workspace.WorkspaceRoot.FullName, "external-bundle");
+        var bundlePath = Path.Combine(aspireHome, "bundle");
+        Directory.CreateDirectory(aspireHome);
+        Directory.CreateDirectory(externalTarget);
+
+        try
+        {
+            Directory.CreateSymbolicLink(bundlePath, externalTarget);
+        }
+        catch (Exception ex) when (ex is UnauthorizedAccessException or IOException)
+        {
+            Assert.Skip("Symlink creation is not available (Developer Mode not enabled or not running as admin).");
+            return;
+        }
+
+        // Use a hive so --channel stable has work to do; the test focuses on
+        // the bundle-link branch of AddSharedInstallOperations.
+        Directory.CreateDirectory(Path.Combine(aspireHome, "hives", "stable", "packages"));
+
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        using var provider = services.BuildServiceProvider();
+
+        var command = provider.GetRequiredService<RootCommand>();
+        var result = command.Parse("uninstall --channel stable --remove-shared-install --yes");
+
+        var exitCode = await result.InvokeAsync().DefaultTimeout();
+
+        Assert.Equal(CliExitCodes.Success, exitCode);
+        Assert.False(Directory.Exists(bundlePath), "External-link symlink should be removed.");
+        Assert.True(Directory.Exists(externalTarget), "External symlink target must not be touched.");
+    }
+}
diff --git a/tests/Aspire.Cli.Tests/Configuration/DotNetBasedAppHostServerChannelResolutionTests.cs b/tests/Aspire.Cli.Tests/Configuration/DotNetBasedAppHostServerChannelResolutionTests.cs
index f9365c651b8..e0801887199 100644
--- a/tests/Aspire.Cli.Tests/Configuration/DotNetBasedAppHostServerChannelResolutionTests.cs
+++ b/tests/Aspire.Cli.Tests/Configuration/DotNetBasedAppHostServerChannelResolutionTests.cs
@@ -18,7 +18,7 @@ namespace Aspire.Cli.Tests.Configuration;
 /// per-project channel is set. A global-channel read fallback (previously
 /// <c>IConfigurationService.GetConfigurationAsync("channel", ...)</c>) was removed in
 /// PR1; these tests pin the post-fix contract so a regression can't quietly re-introduce
-/// cross-route channel contamination.
+/// cross-source channel contamination.
 /// </summary>
 public class DotNetBasedAppHostServerChannelResolutionTests(ITestOutputHelper outputHelper)
 {
diff --git a/tests/Aspire.Cli.Tests/Packaging/TemporaryNuGetConfigTests.cs b/tests/Aspire.Cli.Tests/Packaging/TemporaryNuGetConfigTests.cs
index dcf8d9305fa..e9230348024 100644
--- a/tests/Aspire.Cli.Tests/Packaging/TemporaryNuGetConfigTests.cs
+++ b/tests/Aspire.Cli.Tests/Packaging/TemporaryNuGetConfigTests.cs
@@ -141,7 +141,7 @@ public async Task CreateAsync_PackageSourceAddKeyMatchesPackageSourceMappingKey(
         // will accept after its own internal canonicalization (e.g. on macOS the
         // upstream caller must strip /private/var → /var before constructing the
         // PackageMapping — see CliPathHelper.StripMacOSFirmlinkPrefix and the
-        // GetAspireHomeDirectory_OnMacOS_PrRouteWithFirmlinkedProcessPath test).
+        // GetAspireHomeDirectory_OnMacOS_PrSourceWithFirmlinkedProcessPath test).
         // This test only pins the writer's symmetry contract.
         var mappings = new PackageMapping[]
         {
diff --git a/tests/Aspire.Cli.Tests/Uninstall/CliCleanupServiceTests.cs b/tests/Aspire.Cli.Tests/Uninstall/CliCleanupServiceTests.cs
new file mode 100644
index 00000000000..519477dab8e
--- /dev/null
+++ b/tests/Aspire.Cli.Tests/Uninstall/CliCleanupServiceTests.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Cli.Uninstall;
+
+namespace Aspire.Cli.Tests.Uninstall;
+
+public class CliCleanupServiceTests
+{
+    [Theory]
+    [InlineData("/usr/local/bin/aspire", "/usr/local/bin/aspire", true)]
+    [InlineData("/usr/local/bin/aspire", "/usr/local/bin", true)]
+    [InlineData("/usr/local/bin/aspire", "/usr/local", true)]
+    [InlineData("/usr/local/binx/aspire", "/usr/local/bin", false)] // prefix match without separator must not count
+    [InlineData("/usr/local/aspire", "/usr/local/bin", false)]
+    [InlineData("/usr/local/bin", "/usr/local/bin/aspire", false)] // parent is not "under" child
+    public void IsPathUnderTarget_ReturnsExpected_ForUnixPaths(string path, string target, bool expected)
+    {
+        // The helper underpins the running-CLI safety check: if the current
+        // process path resolves under a cleanup target, the cleanup operation
+        // must refuse to delete that target so the live binary is not removed.
+        Assert.Equal(expected, CliCleanupService.IsPathUnderTarget(path, target));
+    }
+
+    [Theory]
+    [InlineData(@"C:\Users\Foo\.aspire\bin\aspire.exe", @"C:\Users\Foo\.aspire\bin", true)]
+    [InlineData(@"C:\Users\Foo\.aspire\bin\aspire.exe", @"c:\users\foo\.aspire\bin", true)] // Windows is case-insensitive
+    [InlineData(@"C:\Users\Foo\.aspire\binx\aspire.exe", @"C:\Users\Foo\.aspire\bin", false)]
+    public void IsPathUnderTarget_HandlesWindowsCaseAndSeparators(string path, string target, bool expected)
+    {
+        if (!OperatingSystem.IsWindows())
+        {
+            // The case-insensitive comparison branch is only exercised on Windows.
+            return;
+        }
+
+        Assert.Equal(expected, CliCleanupService.IsPathUnderTarget(path, target));
+    }
+}
diff --git a/tests/Aspire.Cli.Tests/Utils/CliPathHelperTests.cs b/tests/Aspire.Cli.Tests/Utils/CliPathHelperTests.cs
index 8552348a2f6..3577a62fc11 100644
--- a/tests/Aspire.Cli.Tests/Utils/CliPathHelperTests.cs
+++ b/tests/Aspire.Cli.Tests/Utils/CliPathHelperTests.cs
@@ -55,27 +55,27 @@ public void CreateUnixDomainSocketPath_UsesRandomizedIdentifier()
     [Theory]
     [InlineData("script")]
     [InlineData("localhive")]
-    public void TryGetAspireHomeDirectoryFromInstallRoute_SharedPrefixRoute_ReturnsInstallPrefix(string source)
+    public void TryGetAspireHomeDirectoryFromInstallSource_SharedPrefixSource_ReturnsInstallPrefix(string source)
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var installPrefix = Path.Combine(workspace.WorkspaceRoot.FullName, "aspire");
         var binDir = Path.Combine(installPrefix, "bin");
         var binaryPath = WriteBinaryWithSidecar(binDir, source);
 
-        var result = CliPathHelper.TryGetAspireHomeDirectoryFromInstallRoute(binaryPath);
+        var result = CliPathHelper.TryGetAspireHomeDirectoryFromInstallSource(binaryPath);
 
         Assert.Equal(installPrefix, result);
     }
 
     [Fact]
-    public void TryGetAspireHomeDirectoryFromInstallRoute_PrRoute_ReturnsOuterInstallPrefix()
+    public void TryGetAspireHomeDirectoryFromInstallSource_PrSource_ReturnsOuterInstallPrefix()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var installPrefix = Path.Combine(workspace.WorkspaceRoot.FullName, "aspire-pr-test");
         var binDir = Path.Combine(installPrefix, "dogfood", "pr-17159", "bin");
         var binaryPath = WriteBinaryWithSidecar(binDir, "pr");
 
-        var result = CliPathHelper.TryGetAspireHomeDirectoryFromInstallRoute(binaryPath);
+        var result = CliPathHelper.TryGetAspireHomeDirectoryFromInstallSource(binaryPath);
 
         Assert.Equal(installPrefix, result);
     }
@@ -85,18 +85,18 @@ public void TryGetAspireHomeDirectoryFromInstallRoute_PrRoute_ReturnsOuterInstal
     [InlineData("winget")]
     [InlineData("dotnet-tool")]
     [InlineData("unknown")]
-    public void TryGetAspireHomeDirectoryFromInstallRoute_PackageManagerOrUnknownRoute_ReturnsNull(string source)
+    public void TryGetAspireHomeDirectoryFromInstallSource_PackageManagerOrUnknownSource_ReturnsNull(string source)
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var binaryPath = WriteBinaryWithSidecar(workspace.WorkspaceRoot.FullName, source);
 
-        var result = CliPathHelper.TryGetAspireHomeDirectoryFromInstallRoute(binaryPath);
+        var result = CliPathHelper.TryGetAspireHomeDirectoryFromInstallSource(binaryPath);
 
         Assert.Null(result);
     }
 
     [Fact]
-    public void GetAspireHomeDirectory_PrRoute_UsesOuterInstallPrefix()
+    public void GetAspireHomeDirectory_PrSource_UsesOuterInstallPrefix()
     {
         using var workspace = TemporaryWorkspace.Create(outputHelper);
         var installPrefix = Path.Combine(workspace.WorkspaceRoot.FullName, "portable");
@@ -244,7 +244,7 @@ public void ResolveSymlinkOrOriginalPath_OnMacOS_StripsFirmlinkPrefix()
 
     [Fact]
     [SkipOnPlatform(TestPlatforms.Windows | TestPlatforms.Linux, "Firmlink propagation only applies on macOS.")]
-    public void GetAspireHomeDirectory_OnMacOS_PrRouteWithFirmlinkedProcessPath_ReturnsUnfirmlinkedPrefix()
+    public void GetAspireHomeDirectory_OnMacOS_PrSourceWithFirmlinkedProcessPath_ReturnsUnfirmlinkedPrefix()
     {
         // Bug B regression: when Environment.ProcessPath comes back firmlinked (/private/var/...),
         // every derivation hanging off it (AspireHome → HivesDirectory → PackagingService source path)
diff --git a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs
index 28adae148e8..5b4e1092a2d 100644
--- a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs
+++ b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs
@@ -3,6 +3,7 @@
 
 using System.Text;
 using Aspire.Cli.Acquisition;
+using Aspire.Cli.Uninstall;
 using Aspire.Cli.Agents;
 using Aspire.Cli.Agents.Playwright;
 using Aspire.Cli.Backchannel;
@@ -230,6 +231,9 @@ public static IServiceCollection CreateServiceCollection(TemporaryWorkspace work
         services.AddTransient<DoCommand>();
         services.AddTransient<PublishCommand>();
         services.AddTransient<ConfigCommand>();
+        services.AddTransient<InstallsCommand>();
+        services.AddTransient<HivesCommand>();
+        services.AddTransient<UninstallCommand>();
         services.AddTransient<CacheCommand>();
         services.AddTransient<CertificatesCommand>();
         services.AddTransient<CertificatesCleanCommand>();
@@ -278,6 +282,8 @@ public static IServiceCollection CreateServiceCollection(TemporaryWorkspace work
         services.AddTransient<RenderCommand>();
 #endif
         services.AddTransient(options.AppHostBackchannelFactory);
+        services.AddTransient<HiveEnumerator>();
+        services.AddTransient<CliCleanupService>();
 
         return services;
     }
diff --git a/tests/Aspire.Hosting.Tests/PathLookupHelperTests.cs b/tests/Aspire.Hosting.Tests/PathLookupHelperTests.cs
index a9bf07567a6..1c9944fed77 100644
--- a/tests/Aspire.Hosting.Tests/PathLookupHelperTests.cs
+++ b/tests/Aspire.Hosting.Tests/PathLookupHelperTests.cs
@@ -268,6 +268,31 @@ public void FindAllFullPathsFromPath_WithPathExtensions_ReturnsOneMatchPerDirect
         Assert.Equal([firstExePath, secondCmdPath], result);
     }
 
+    [Fact]
+    public void FindAllFullPathsFromPath_WithPathExtensions_ReturnsFilesystemCasingOnWindows()
+    {
+        if (!OperatingSystem.IsWindows())
+        {
+            Assert.Skip("Windows filesystem casing is only observable on Windows.");
+            return;
+        }
+
+        using var tempDirectory = new TestTempDirectory();
+        var binPath = Path.Combine(tempDirectory.Path, "bin");
+        Directory.CreateDirectory(binPath);
+        var actualPath = Path.Combine(binPath, "aspire.exe");
+        File.WriteAllText(actualPath, string.Empty);
+
+        var result = PathLookupHelper.FindAllFullPathsFromPath(
+            "aspire",
+            binPath,
+            Path.PathSeparator,
+            File.Exists,
+            [".EXE"]);
+
+        Assert.Equal([actualPath], result);
+    }
+
     [Fact]
     public void FindFullPathFromPath_UsesCorrectPathSeparator()
     {