fix: make prompt alias resolution cross-platform

- add cmdlet-based fallback map for aliased entries so suggestions still resolve when bash alias names (rm/ls/cp/mv) are not present on the host OS
- keep reverse alias lookup for environments where those aliases exist
- clear cmdlet fallback cache on unregister
- make reverse lookup tests platform-agnostic by validating alias-or-cmdlet fallback behavior

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: ericchansen

PSCommandHelper/Public/Register-PSCommandHelperPrompt.ps1

@@ -23,14 +23,24 @@ function Register-PSCommandHelperPrompt {
     # Build the aliased-command lookup from the map
     $map = Get-BashToPowerShellMap
     $aliasedMap = @{}
+    $aliasedCmdletMap = @{}
     foreach ($entry in ($map | Where-Object { $_.Type -eq 'Aliased' })) {
         $baseCmd = ($entry.Bash -split '\s+')[0]
         if (-not $aliasedMap.ContainsKey($baseCmd)) {
             $aliasedMap[$baseCmd] = @()
         }
         $aliasedMap[$baseCmd] += $entry
+
+        $psCmdlet = ($entry.PowerShell -split '\s+')[0]
+        if ($psCmdlet) {
+            if (-not $aliasedCmdletMap.ContainsKey($psCmdlet)) {
+                $aliasedCmdletMap[$psCmdlet] = @()
+            }
+            $aliasedCmdletMap[$psCmdlet] += $entry
+        }
     }
     $script:AliasedCommandMap = $aliasedMap
+    $script:AliasedCmdletMap = $aliasedCmdletMap
     $script:FormatFunc = Get-Command Format-Suggestion
 
     $function:global:prompt = {
@@ -69,7 +79,16 @@ function Register-PSCommandHelperPrompt {
                         }
                     }
 
+                    $entries = $null
                     if ($lookupName -and $script:AliasedCommandMap.ContainsKey($lookupName)) {
+                        $entries = $script:AliasedCommandMap[$lookupName]
+                    }
+                    elseif ($script:AliasedCmdletMap -and $script:AliasedCmdletMap.ContainsKey($cmdName)) {
+                        $entries = $script:AliasedCmdletMap[$cmdName]
+                        $lookupName = $cmdName
+                    }
+
+                    if ($entries) {
                         $errString = $lastErr.ToString()
                         # Only show for parameter-binding or argument errors (bash-style flags)
                         $isParamError = $lastErr.Exception -is [System.Management.Automation.ParameterBindingException] -or
@@ -80,7 +99,6 @@ function Register-PSCommandHelperPrompt {
                         if ($isParamError) {
                             # Find the best matching entry using flag-aware comparison
                             $line = if ($lastErr.InvocationInfo) { $lastErr.InvocationInfo.Line.Trim() } else { $lookupName }
-                            $entries = $script:AliasedCommandMap[$lookupName]
 
                             # Extract and normalize flags from the typed line
                             $lineFlags = [System.Collections.Generic.HashSet[char]]::new()

PSCommandHelper/Public/Unregister-PSCommandHelperPrompt.ps1

@@ -10,5 +10,6 @@ function Unregister-PSCommandHelperPrompt {
         $function:global:prompt = $script:OriginalPrompt
         $script:OriginalPrompt = $null
         $script:AliasedCommandMap = $null
+        $script:AliasedCmdletMap = $null
     }
 }

tests/PSCommandHelper.Tests.ps1

@@ -155,12 +155,21 @@ Describe 'Prompt handler: reverse alias lookup' {
         InModuleScope PSCommandHelper {
             $map = Get-BashToPowerShellMap
             $script:TestAliasedMap = @{}
+            $script:TestAliasedCmdletMap = @{}
             foreach ($entry in ($map | Where-Object { $_.Type -eq 'Aliased' })) {
                 $baseCmd = ($entry.Bash -split '\s+')[0]
                 if (-not $script:TestAliasedMap.ContainsKey($baseCmd)) {
                     $script:TestAliasedMap[$baseCmd] = @()
                 }
                 $script:TestAliasedMap[$baseCmd] += $entry
+
+                $psCmdlet = ($entry.PowerShell -split '\s+')[0]
+                if ($psCmdlet) {
+                    if (-not $script:TestAliasedCmdletMap.ContainsKey($psCmdlet)) {
+                        $script:TestAliasedCmdletMap[$psCmdlet] = @()
+                    }
+                    $script:TestAliasedCmdletMap[$psCmdlet] += $entry
+                }
             }
         }
     }
@@ -171,43 +180,66 @@ Describe 'Prompt handler: reverse alias lookup' {
         }
     }
 
-    It 'Remove-Item reverse-resolves to rm which is in the aliased map' {
-        $aliases = Get-Alias -Definition 'Remove-Item' -ErrorAction SilentlyContinue
-        $aliasNames = $aliases | ForEach-Object { $_.Name }
-        $aliasNames | Should -Contain 'rm'
-    }
-
-    It 'Get-ChildItem reverse-resolves to ls which is in the aliased map' {
-        $aliases = Get-Alias -Definition 'Get-ChildItem' -ErrorAction SilentlyContinue
-        $aliasNames = $aliases | ForEach-Object { $_.Name }
-        $aliasNames | Should -Contain 'ls'
+    It 'has cmdlet fallback entries for Remove-Item and Get-ChildItem' {
+        InModuleScope PSCommandHelper {
+            $script:TestAliasedCmdletMap.ContainsKey('Remove-Item') | Should -BeTrue
+            $script:TestAliasedCmdletMap.ContainsKey('Get-ChildItem') | Should -BeTrue
+        }
     }
 
-    It 'Copy-Item reverse-resolves to cp which is in the aliased map' {
+    It 'resolves Remove-Item to aliased suggestions by alias or cmdlet fallback' {
         InModuleScope PSCommandHelper {
-            $aliases = Get-Alias -Definition 'Copy-Item' -ErrorAction SilentlyContinue
-            $found = $false
+            $resolvedEntries = $null
+            $aliases = Get-Alias -Definition 'Remove-Item' -ErrorAction SilentlyContinue
             foreach ($a in $aliases) {
                 if ($script:TestAliasedMap.ContainsKey($a.Name)) {
-                    $found = $true
+                    $resolvedEntries = $script:TestAliasedMap[$a.Name]
                     break
                 }
             }
-            $found | Should -BeTrue
+            if (-not $resolvedEntries) {
+                $resolvedEntries = $script:TestAliasedCmdletMap['Remove-Item']
+            }
+
+            $resolvedEntries | Should -Not -BeNullOrEmpty
         }
     }
 
-    It 'Move-Item reverse-resolves to mv which is in the aliased map' {
+    It 'resolves Get-ChildItem to aliased suggestions by alias or cmdlet fallback' {
         InModuleScope PSCommandHelper {
-            $aliases = Get-Alias -Definition 'Move-Item' -ErrorAction SilentlyContinue
-            $found = $false
+            $resolvedEntries = $null
+            $aliases = Get-Alias -Definition 'Get-ChildItem' -ErrorAction SilentlyContinue
             foreach ($a in $aliases) {
                 if ($script:TestAliasedMap.ContainsKey($a.Name)) {
-                    $found = $true
+                    $resolvedEntries = $script:TestAliasedMap[$a.Name]
                     break
                 }
             }
-            $found | Should -BeTrue
+            if (-not $resolvedEntries) {
+                $resolvedEntries = $script:TestAliasedCmdletMap['Get-ChildItem']
+            }
+
+            $resolvedEntries | Should -Not -BeNullOrEmpty
+        }
+    }
+
+    It 'resolves Copy-Item and Move-Item by alias or cmdlet fallback' {
+        InModuleScope PSCommandHelper {
+            foreach ($cmdlet in @('Copy-Item', 'Move-Item')) {
+                $resolvedEntries = $null
+                $aliases = Get-Alias -Definition $cmdlet -ErrorAction SilentlyContinue
+                foreach ($a in $aliases) {
+                    if ($script:TestAliasedMap.ContainsKey($a.Name)) {
+                        $resolvedEntries = $script:TestAliasedMap[$a.Name]
+                        break
+                    }
+                }
+                if (-not $resolvedEntries) {
+                    $resolvedEntries = $script:TestAliasedCmdletMap[$cmdlet]
+                }
+
+                $resolvedEntries | Should -Not -BeNullOrEmpty
+            }
         }
     }
 }