Initial plan

Refactor path enhancement logic for clarity and robustness.

README.md

@@ -352,10 +352,6 @@ Cmder by default comes with a vendored ConEmu installation as the underlying ter
 
 However, Cmder can in fact run in a variety of other terminal emulators, and even integrated IDEs. Assuming you have the latest version of Cmder, follow the following instructions to get Cmder working with your own terminal emulator.
 
-⚠ *Note:* Cmder includes built-in support for Windows Terminal directory tracking via OSC 9;9 sequences. This enables "Duplicate Tab" and "Split Pane" features to preserve the current working directory for both `cmd.exe` and PowerShell sessions.
-
-⚠ *Note:* Cmder also includes built-in support for [Windows Terminal shell integration](https://learn.microsoft.com/en-us/windows/terminal/tutorials/shell-integration) via OSC 133 sequences (A, B, C) for PowerShell sessions. This enables features like command navigation (jump between commands), command selection, visual command separators, and improved command history management in Windows Terminal.
-
 For instructions on how to integrate Cmder with your IDE, please read our [Wiki section](https://github.com/cmderdev/cmder/wiki#cmder-integration).
 
 ## Upgrading

scripts/update.ps1

@@ -32,11 +32,7 @@ Param(
     # -whatif switch to not actually make changes
 
     # Path to the vendor configuration source file
-    [string]$sourcesPath = "$PSScriptRoot\..\vendor\sources.json",
+    [string]$sourcesPath = "$PSScriptRoot\..\vendor\sources.json"
-
-    # Include pre-release versions (RC, beta, alpha, etc.)
-    # By default, only stable releases are considered
-    [switch]$IncludePrerelease = $false
 )
 
 # Get the root directory of the cmder project.
@@ -83,39 +79,11 @@ function Match-Filenames {
     return $position
 }
 
-# Checks if a release is a pre-release based on GitHub API flag and version tag keywords
-# Pre-release keywords include: -rc (release candidate), -beta, -alpha, -preview, -pre
-function Test-IsPrerelease {
-    param (
-        [Parameter(Mandatory = $true)]
-        $release
-    )
-
-    # Check if marked as pre-release by GitHub
-    if ($release.prerelease -eq $true) {
-        return $true
-    }
-
-    # Check for common pre-release keywords in tag name
-    # This catches versions like v2.50.0-rc, v1.0.0-beta, v1.0.0-alpha, etc.
-    $prereleaseKeywords = @('-rc', '-beta', '-alpha', '-preview', '-pre')
-    foreach ($keyword in $prereleaseKeywords) {
-        if ($release.tag_name -ilike "*$keyword*") {
-            return $true
-        }
-    }
-
-    return $false
-}
-
 # Uses the GitHub api in order to fetch the current download links for the latest releases of the repo.
 function Fetch-DownloadUrl {
     param (
         [Parameter(Mandatory = $true)]
-        $urlStr,
+        $urlStr
-
-        [Parameter(Mandatory = $false)]
-        [bool]$includePrerelease = $false
     )
 
     $url = [uri] $urlStr
@@ -159,13 +127,6 @@ function Fetch-DownloadUrl {
     }
 
     :loop foreach ($i in $info) {
-        # Skip pre-release versions unless explicitly included
-        # Pre-releases include RC (Release Candidate), beta, alpha, and other test versions
-        if (-not $includePrerelease -and (Test-IsPrerelease $i)) {
-            Write-Verbose "Skipping pre-release version: $($i.tag_name)"
-            continue
-        }
-
         if (-not ($i.assets -is [array])) {
             continue
         }
@@ -203,29 +164,15 @@ function Fetch-DownloadUrl {
 
     # Special case for archive downloads of repository
     if (($null -eq $downloadLinks) -or (-not $downloadLinks)) {
-        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive")) {
+        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive") -and $info[0].tag_name) {
-            # Find the first release that matches our pre-release filtering criteria
-            $selectedRelease = $null
-            foreach ($release in $info) {
-                # Apply the same filtering logic
-                if (-not $includePrerelease -and (Test-IsPrerelease $release)) {
-                    continue
-                }
-                # Use the first release that passes the filter
-                $selectedRelease = $release
-                break
-            }
-
-            if ($selectedRelease -and $selectedRelease.tag_name) {
             for ($i = 0; $i -lt $p.Length; $i++) {
                 if ($p[$i].Trim('/') -eq "archive") {
-                        $p[$i + 1] = $selectedRelease.tag_name + ".zip"
+                    $p[$i + 1] = $info[0].tag_name + ".zip"
                     $downloadLinks = $url.Scheme + "://" + $url.Host + ($p -join '')
                     return $downloadLinks
                 }
             }
         }
-        }
         return ''
     }
 
@@ -268,7 +215,7 @@ foreach ($s in $sources) {
 
     Write-Verbose "Old Link: $($s.url)"
 
-    $downloadUrl = Fetch-DownloadUrl $s.url -includePrerelease $IncludePrerelease
+    $downloadUrl = Fetch-DownloadUrl $s.url
 
     if (($null -eq $downloadUrl) -or ($downloadUrl -eq '')) {
         Write-Verbose "No new links were found"

vendor/clink.lua

@@ -7,7 +7,7 @@
 -- luacheck: globals uah_color cwd_color lamb_color clean_color dirty_color conflict_color unknown_color
 -- luacheck: globals prompt_homeSymbol prompt_lambSymbol prompt_type prompt_useHomeSymbol prompt_useUserAtHost
 -- luacheck: globals prompt_singleLine prompt_includeVersionControl
--- luacheck: globals prompt_overrideGitStatusOptIn
+-- luacheck: globals prompt_overrideGitStatusOptIn prompt_overrideSvnStatusOptIn
 -- luacheck: globals clink io.popenyield os.isdir settings.get
 
 -- At first, load the original clink.lua file
@@ -350,8 +350,13 @@ end
 -- @return {false|mercurial branch information}
 ---
 local function get_hg_branch()
-    -- Return the branch information.
+    -- Return the branch information. The default is to get just the
-    local file = io.popen("hg branch 2>nul")
+    -- branch name, but you could e.g. use the "hg-prompt" extension to
+    -- get more information, such as any applied mq patches. Here's an
+    -- example of that:
+    -- local cmd = "hg prompt \"{branch}{status}{|{patch}}{update}\""
+    local cmd = "hg branch 2>nul"
+    local file = io.popen(cmd)
     if not file then
         return false
     end
@@ -419,33 +424,12 @@ local function get_git_status()
     return { status = is_status, conflict = conflict_found }
 end
 
----
--- Get the status of working dir
--- @return {bool}
----
-local function get_hg_status()
-    -- The default is to just use the branch name, but you could e.g. use the
-    -- "hg-prompt" extension to get more information, such as any applied mq
-    -- patches.  Here's an example of that:
-    -- "hg prompt \"{branch}{status}{|{patch}}{update}\""
-    local pipe = io_popenyield("hg status -amrd 2>&1")
-    if not pipe then
-        return { error = true }
-    end
-
-    local output = pipe:read('*all')
-    pipe:close()
-
-    local dirty = (output ~= nil and output ~= "")
-    return { clean = not dirty }
-end
-
 ---
 -- Get the status of working dir
 -- @return {bool}
 ---
 local function get_svn_status()
-    local file = io_popenyield("svn status -q 2>nul")
+    local file = io_popenyield("svn status -q")
     if not file then
         return { error = true }
     end
@@ -536,6 +520,14 @@ local function git_prompt_filter()
         return false
     end
 
+    -- Colors for git status
+    local colors = {
+        clean = get_clean_color(),
+        dirty = get_dirty_color(),
+        conflict = get_conflict_color(),
+        nostatus = get_unknown_color()
+    }
+
     local git_dir = get_git_dir()
     local color
     if git_dir then
@@ -555,19 +547,18 @@ local function git_prompt_filter()
             local gitConflict = gitInfo.conflict
 
             if gitStatus == nil then
-                color = get_unknown_color()
+                color = colors.nostatus
             elseif gitStatus then
-                color = get_clean_color()
+                color = colors.clean
             else
-                color = get_dirty_color()
+                color = colors.dirty
             end
 
             if gitConflict then
-                color = get_conflict_color()
+                color = colors.conflict
             end
 
-            local result = " "..color.."("..branch..")"
+            clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", " "..color.."("..branch..")")
-            clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", result)
             return false
         end
     end
@@ -577,18 +568,6 @@ local function git_prompt_filter()
     return false
 end
 
-local function get_hg_info_table()
-    local info = clink_promptcoroutine(function ()
-        return get_hg_status() or {}
-    end)
-    if not info then
-        info = cached_info.hg_info or {}
-    else
-        cached_info.hg_info = info
-    end
-    return info
-end
-
 local function hg_prompt_filter()
 
     -- Don't do any hg processing if the prompt doesn't want to show hg info.
@@ -598,30 +577,33 @@ local function hg_prompt_filter()
 
     local hg_dir = get_hg_dir()
     if hg_dir then
-        local branch = get_hg_branch()
+        -- Colors for mercurial status
-        if branch and
+        local colors = {
+            clean = get_clean_color(),
+            dirty = get_dirty_color(),
+            nostatus = get_unknown_color()
+        }
+        local output = get_hg_branch()
+
+        -- strip the trailing newline from the branch name
+        local n = #output
+        while n > 0 and output:find("^%s", n) do n = n - 1 end
+        local branch = output:sub(1, n)
+
+        if branch ~= nil and
            string.sub(branch,1,7) ~= "abort: " and             -- not an HG working copy
            (not string.find(branch, "is not recognized")) then -- 'hg' not in path
-            -- If in a different repo or branch than last time, discard cached info
+            local color = colors.clean
-            if cached_info.hg_dir ~= hg_dir or cached_info.hg_branch ~= branch then
+
-                cached_info.hg_info = nil
+            local pipe = io.popen("hg status -amrd 2>&1")
-                cached_info.hg_dir = hg_dir
+            if pipe then
-                cached_info.hg_branch = branch
+                output = pipe:read('*all')
+                pipe:close()
+                if output ~= nil and output ~= "" then color = colors.dirty end
             end
 
-            local hgInfo = get_hg_info_table()
+            local result = color .. "(" .. branch .. ")"
-
+            clink.prompt.value = gsub_plain(clink.prompt.value, "{hg}", " "..result)
-            local color
-            if not hgInfo or hgInfo.error then
-                color = get_unknown_color()
-            elseif hgInfo.clean then
-                color = get_clean_color()
-            else
-                color = get_dirty_color()
-            end
-
-            local result = " "..color.."("..branch..")"
-            clink.prompt.value = gsub_plain(clink.prompt.value, "{hg}", result)
             return false
         end
     end
@@ -630,18 +612,6 @@ local function hg_prompt_filter()
     clink.prompt.value = gsub_plain(clink.prompt.value, "{hg}", "")
 end
 
-local function get_svn_info_table()
-    local info = clink_promptcoroutine(function ()
-        return get_svn_status() or {}
-    end)
-    if not info then
-        info = cached_info.svn_info or {}
-    else
-        cached_info.svn_info = info
-    end
-    return info
-end
-
 local function svn_prompt_filter()
 
     -- Don't do any svn processing if the prompt doesn't want to show svn info.
@@ -649,6 +619,13 @@ local function svn_prompt_filter()
         return false
     end
 
+    -- Colors for svn status
+    local colors = {
+        clean = get_clean_color(),
+        dirty = get_dirty_color(),
+        nostatus = get_unknown_color()
+    }
+
     local svn_dir = get_svn_dir()
     if svn_dir then
         -- if we're inside of svn repo then try to detect current branch
@@ -660,16 +637,29 @@ local function svn_prompt_filter()
                 cached_info.svn_dir = svn_dir
                 cached_info.svn_branch = branch
             end
-
+            -- Get the svn status using coroutine if available and option is enabled. Otherwise use a blocking call
-            local svnInfo = get_svn_info_table()
+            local svnStatus
+            if clink.promptcoroutine and io.popenyield and settings.get("prompt.async") and prompt_overrideSvnStatusOptIn then -- luacheck: no max line length
+                svnStatus = clink_promptcoroutine(function ()
+                    return get_svn_status()
+                end)
+                -- If the status result is pending, use the cached version instead, otherwise store it to the cache
+                if svnStatus == nil then
+                    svnStatus = cached_info.svn_info
+                else
+                    cached_info.svn_info = svnStatus
+                end
+            else
+                svnStatus = get_svn_status()
+            end
 
             local color
-            if not svnInfo or svnInfo.error then
+            if not svnStatus or svnStatus.error then
-                color = get_unknown_color()
+                color = colors.nostatus
-            elseif svnInfo.clean then
+            elseif svnStatus.clean then
-                color = get_clean_color()
+                color = colors.clean
             else
-                color = get_dirty_color()
+                color = colors.dirty
             end
 
             clink.prompt.value = gsub_plain(clink.prompt.value, "{svn}", " "..color.."("..branch..")")

vendor/cmder_prompt_config.lua.default

@@ -38,6 +38,11 @@ prompt_includeVersionControl = true
  -- NOTE: This only takes effect if using Clink v1.2.10 or higher.
 prompt_overrideGitStatusOptIn = false
 
+-- OPTIONAL. If true then always ignore the cmder.status and cmder.cmdstatus svn config settings and run the svn prompt commands in the background.
+ -- default is false
+ -- NOTE: This only takes effect if using Clink v1.2.10 or higher.
+prompt_overrideSvnStatusOptIn = false
+
 -- Prompt Attributes
 --
 -- Colors: https://github.com/cmderdev/cmder/wiki/Customization#list-of-colors

vendor/init.bat

@@ -355,7 +355,7 @@ setlocal enabledelayedexpansion
 if defined git_locale (
     REM %print_debug% init.bat "Env Var - git_locale=!git_locale!"
     if not defined LANG (
-        for /F "delims=" %%F in ('"!git_locale!" -uU 2') do (
+        for /F "delims=" %%F in ('!git_locale! -uU 2') do (
             set "LANG=%%F"
         )
     )

vendor/lib/lib_path.cmd

@@ -91,13 +91,13 @@ exit /b
 
     if /i "!position!" == "append" (
         if "!found!" == "0" (
-            echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!\"$"
+            echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!$"
             call :set_found
         )
         %print_debug% :enhance_path "Env Var END PATH !find_query! - found=!found!"
     ) else (
         if "!found!" == "0" (
-            echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:"^\"!find_query!;"
+            echo "!PATH!"|!WINDIR!\System32\findstr >nul /I /R /C:"^!find_query!;"
             call :set_found
         )
         %print_debug% :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!"
@@ -190,13 +190,28 @@ exit /b
         exit /b 1
     )
 
+    rem Parse arguments robustly:
+    rem Accept either public form: "[dir_path]" [max_depth] [append]
+    rem or internal recursive form: "[dir_path]" [depth] [max_depth] [append]
     set "depth=%~2"
     set "max_depth=%~3"
-
-    if "%~4" neq "" if /i "%~4" == "append" (
-        set "position=%~4"
-    ) else (
     set "position="
+
+    if /i "%~4" == "append" set "position=append"
+    if /i "%~3" == "append" (
+        set "position=append"
+        set "max_depth="
+    )
+
+    if not defined depth set "depth=0"
+    if not defined max_depth (
+        if defined depth (
+            rem If only one numeric argument provided, treat it as max_depth
+            set "max_depth=%depth%"
+            set "depth=0"
+        ) else (
+            set "max_depth=1"
+        )
     )
 
     dir "%add_path%" 2>NUL | findstr -i -e "%find_pathext%" >NUL
@@ -232,8 +247,6 @@ exit /b
         call :loop_depth
     )
 
-    set "PATH=%PATH%"
-
     exit /b
 
 :set_depth

vendor/profile.ps1

@@ -28,34 +28,31 @@ if (!$ENV:CMDER_ROOT) {
 # Remove trailing '\'
 $ENV:CMDER_ROOT = ($ENV:CMDER_ROOT).TrimEnd("\")
 
-# Recent PowerShell versions include PowerShellGet out of the box
+# -> recent PowerShell versions include PowerShellGet out of the box
 $moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue)
 
 # Add Cmder modules directory to the autoload path.
 $CmderModulePath = Join-path $PSScriptRoot "psmodules/"
 
-# Import Cmder functions
 $CmderFunctions  = Join-Path $CmderModulePath "Cmder.ps1"
 . $CmderFunctions
 
-# Configure PSModulePath to include Cmder modules if not already present
 if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ) {
     $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }
 
-# Read vendored Git Version
+$gitVersionVendor = (readVersion -gitPath "$ENV:CMDER_ROOT\vendor\git-for-windows\cmd")
-$gitVersionVendor = Get-GitVersion -GitPath "$ENV:CMDER_ROOT\vendor\git-for-windows\cmd"
 Write-Debug "GIT VENDOR: ${gitVersionVendor}"
 
-# Get user installed Git version(s) if found, and compare them with vendored version.
+# Get user installed Git Version[s] and Compare with vendored if found.
 foreach ($git in (Get-Command -ErrorAction SilentlyContinue 'git')) {
     Write-Debug "GIT PATH: {$git.Path}"
     $gitDir = Split-Path -Path $git.Path
-    $gitDir = Get-GitShimPath -GitPath $gitDir
+    $gitDir = isGitShim -gitPath $gitDir
-    $gitVersionUser = Get-GitVersion -GitPath $gitDir
+    $gitVersionUser = (readVersion -gitPath $gitDir)
     Write-Debug "GIT USER: ${gitVersionUser}"
 
-    $useGitVersion = Compare-GitVersion -UserVersion $gitVersionUser -VendorVersion $gitVersionVendor
+    $useGitVersion = compare_git_versions -userVersion $gitVersionUser -vendorVersion $gitVersionVendor
     Write-Debug "Using Git Version: ${useGitVersion}"
 
     # Use user installed Git
@@ -75,7 +72,7 @@ foreach ($git in (Get-Command -ErrorAction SilentlyContinue 'git')) {
     }
 }
 
-# Use vendored Git if no user Git found or user Git is older than vendored Git
+# User vendored Git.
 if ($null -eq $ENV:GIT_INSTALL_ROOT -and $null -ne $gitVersionVendor) {
     $ENV:GIT_INSTALL_ROOT = "$ENV:CMDER_ROOT\vendor\git-for-windows"
     $ENV:GIT_INSTALL_TYPE = 'VENDOR'
@@ -85,44 +82,23 @@ Write-Debug "GIT_INSTALL_ROOT: ${ENV:GIT_INSTALL_ROOT}"
 Write-Debug "GIT_INSTALL_TYPE: ${ENV:GIT_INSTALL_TYPE}"
 
 if ($null -ne $ENV:GIT_INSTALL_ROOT) {
-    $env:Path = Set-GitPath -GitRoot "$ENV:GIT_INSTALL_ROOT" -GitType $ENV:GIT_INSTALL_TYPE -GitPathUser $gitPathUser
+    $env:Path = Configure-Git -gitRoot "$ENV:GIT_INSTALL_ROOT" -gitType $ENV:GIT_INSTALL_TYPE -gitPathUser $gitPathUser
 }
 
-# Create 'vi' alias for 'vim' if vim is available
 if (Get-Command -Name "vim" -ErrorAction SilentlyContinue) {
     New-Alias -name "vi" -value vim
 }
 
-# PSReadline configuration
 if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
-    # Display an extra prompt line between the prompt and the command input
     Set-PSReadlineOption -ExtraPromptLineCount 1
-    
-    # Add OSC 133;C support for Windows Terminal shell integration
-    # This marks the start of command output (emitted when Enter is pressed)
-    if ($env:WT_SESSION) {
-        Set-PSReadLineKeyHandler -Key Enter -ScriptBlock {
-            # Get the current command line
-            $line = $null
-            $cursor = $null
-            [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$line, [ref]$cursor)
-            
-            # Accept the line first
-            [Microsoft.PowerShell.PSConsoleReadLine]::AcceptLine()
-            
-            # Emit OSC 133;C sequence to mark start of command output
-            # This is written directly to the console after the command is accepted
-            [Console]::Write("$([char]0x1B)]133;C$([char]7)")
-        }
-    }
 }
 
-# Pre-assign default prompt hooks so the first run of Cmder gets a working prompt
+# Pre-assign default prompt hooks so the first run of cmder gets a working prompt.
 $env:gitLoaded = $null
 [ScriptBlock]$PrePrompt = {}
 [ScriptBlock]$PostPrompt = {}
 [ScriptBlock]$CmderPrompt = {
-    # Check if we're currently running under Admin privileges
+    # Check if we're currently running under Admin privileges.
     $identity = [Security.Principal.WindowsIdentity]::GetCurrent()
     $principal = [Security.Principal.WindowsPrincipal] $identity
     $adminRole = [Security.Principal.WindowsBuiltInRole]::Administrator
@@ -131,7 +107,7 @@ $env:gitLoaded = $null
     $Host.UI.RawUI.ForegroundColor = "White"
     Microsoft.PowerShell.Utility\Write-Host "PS " -NoNewline -ForegroundColor $color
     Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
-    Show-GitStatus -Path $pwd.ProviderPath
+    checkGit($pwd.ProviderPath)
     Microsoft.PowerShell.Utility\Write-Host "`nλ" -NoNewLine -ForegroundColor "DarkGray"
 }
 
@@ -220,23 +196,6 @@ if ( $(Get-Command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
     [ScriptBlock]$Prompt = {
         $lastSUCCESS = $?
         $realLastExitCode = $LastExitCode
-        
-        # Emit OSC 9;9 sequence for Windows Terminal directory tracking
-        # This enables "Duplicate Tab" and "Split Pane" to preserve the working directory
-        # Only active in Windows Terminal ($env:WT_SESSION) or ConEmu ($env:ConEmuPID)
-        $loc = $executionContext.SessionState.Path.CurrentLocation
-        if (($env:WT_SESSION -or $env:ConEmuPID) -and $loc.Provider.Name -eq "FileSystem") {
-            Microsoft.PowerShell.Utility\Write-Host -NoNewline "$([char]0x1B)]9;9;`"$($loc.ProviderPath)`"$([char]0x1B)\"
-        }
-        
-        # Emit OSC 133;A sequence for Windows Terminal shell integration
-        # This marks the start of the prompt
-        # Enables features like command navigation, selection, and visual separators
-        # Only active in Windows Terminal ($env:WT_SESSION)
-        if ($env:WT_SESSION) {
-            Microsoft.PowerShell.Utility\Write-Host -NoNewline "$([char]0x1B)]133;A$([char]7)"
-        }
-        
         $host.UI.RawUI.WindowTitle = Microsoft.PowerShell.Management\Split-Path $pwd.ProviderPath -Leaf
         Microsoft.PowerShell.Utility\Write-Host -NoNewline "$([char]0x200B)`r$([char]0x1B)[K"
         if ($lastSUCCESS -or ($LastExitCode -ne 0)) {
@@ -245,13 +204,6 @@ if ( $(Get-Command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
         PrePrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
         CmderPrompt
         PostPrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
-        
-        # Emit OSC 133;B sequence for Windows Terminal shell integration
-        # This marks the start of command input (after prompt, before user types)
-        if ($env:WT_SESSION) {
-            Microsoft.PowerShell.Utility\Write-Host -NoNewline "$([char]0x1B)]133;B$([char]7)"
-        }
-        
         $global:LastExitCode = $realLastExitCode
         return " "
     }

vendor/psmodules/Cmder.ps1

@@ -1,251 +1,179 @@
-function Get-GitVersion {
+function readVersion($gitPath) {
-    param(
+    $gitExecutable = "${gitPath}\git.exe"
-        [Parameter(Mandatory = $true)]
-        [string]$GitPath
-    )
 
-    $gitExecutable = Join-Path $GitPath "git.exe"
+    if (-not (Test-Path "$gitExecutable")) {
-
-    if (-not (Test-Path $gitExecutable)) {
         return $null
     }
 
-    # Execute 'git --version' and capture output
+    $gitVersion = (cmd /c "${gitExecutable}" --version)
-    $gitVersion = & $gitExecutable --version 2>$null
-
-    if ($gitVersion -match 'git version\s+(\S+)') {
-        return $Matches[1]
-    }
-
-    Write-Debug "Git executable path: $gitExecutable"
-    Write-Error "'git --version' returned an improper version string!"
-    Write-Error "Unable to determine Git version from output: $gitVersion"
 
+    if ($gitVersion -match 'git version') {
+        ($trash1, $trash2, $gitVersion) = $gitVersion.split(' ', 3)
+    } else {
+        pause
         return $null
     }
 
-function Get-GitShimPath {
+    return $gitVersion.toString()
-    param(
+}
-        [Parameter(Mandatory = $true)]
+
-        [string]$GitPath
+function isGitShim($gitPath) {
-    )
+    # check if there is a shim file - if yes, read the actual executable path
-    # Check if there is a shim file - if yes, read the actual executable path
     # See: github.com/ScoopInstaller/Shim
 
-    $shimFile = Join-Path $GitPath "git.shim"
+    if (Test-Path "${gitPath}\git.shim") {
-    if (Test-Path $shimFile) {
+        $shim = (get-content "${gitPath}\git.shim")
-        $shimContent = Get-Content $shimFile -Raw
+        ($trash, $gitPath) = $shim.replace(' ', '').split('=')
-        if ($shimContent -match '^\s*path\s*=\s*(.+)\s*$') {
+
-            $GitPath = $Matches[1].Trim().Replace('\git.exe', '')
+        $gitPath = $gitPath.replace('\git.exe', '')
-        }
     }
 
-    return $GitPath
+    return $gitPath.toString()
 }
 
-function Compare-Version {
+function compareVersions($userVersion, $vendorVersion) {
-    param(
+    if ($null -ne $userVersion) {
-        [Parameter(Mandatory = $false)]
+        ($userMajor, $userMinor, $userPatch, $userBuild) = $userVersion.split('.', 4)
-        [AllowNull()]
+    } else {
-        [string]$UserVersion,
-        [Parameter(Mandatory = $false)]
-        [AllowNull()]
-        [string]$VendorVersion
-    )
-
-    if ([string]::IsNullOrEmpty($UserVersion)) { return -1 }
-    if ([string]::IsNullOrEmpty($VendorVersion)) { return 1 }
-
-    # Split version strings by dots to compare segment by segment
-    # For "2.49.0.windows.1", we get: ["2", "49", "0", "windows", "1"]
-    $userParts = $UserVersion -split '\.'
-    $vendorParts = $VendorVersion -split '\.'
-
-    $maxLength = [Math]::Max($userParts.Count, $vendorParts.Count)
-
-    for ($i = 0; $i -lt $maxLength; $i++) {
-        $userPart = if ($i -lt $userParts.Count) { $userParts[$i] } else { '' }
-        $vendorPart = if ($i -lt $vendorParts.Count) { $vendorParts[$i] } else { '' }
-
-        # Check if both parts are purely numeric
-        $userIsNumeric = $userPart -match '^\d+$'
-        $vendorIsNumeric = $vendorPart -match '^\d+$'
-
-        if ($userIsNumeric -and $vendorIsNumeric) {
-            # Both numeric: compare as integers (so 49 > 5, not lexicographic)
-            $userNum = [int]$userPart
-            $vendorNum = [int]$vendorPart
-
-            if ($userNum -gt $vendorNum) { return 1 }
-            if ($userNum -lt $vendorNum) { return -1 }
-        }
-        elseif ($userIsNumeric -and -not $vendorIsNumeric) {
-            # Numeric segment comes before text segment (e.g., "2.0" < "2.0.rc1")
         return -1
     }
-        elseif (-not $userIsNumeric -and $vendorIsNumeric) {
+
-            # Text segment comes after numeric segment
+    if ($null -ne $vendorVersion) {
+        ($vendorMajor, $vendorMinor, $vendorPatch, $vendorBuild) = $vendorVersion.split('.', 4)
+    } else {
         return 1
     }
-        else {
+
-            # Both are text: use case-insensitive lexicographic comparison
+    if (($userMajor -eq $vendorMajor) -and ($userMinor -eq $vendorMinor) -and ($userPatch -eq $vendorPatch) -and ($userBuild -eq $vendorBuild)) {
-            $cmp = [string]::Compare($userPart, $vendorPart, $true)
+        return 1
-            if ($cmp -ne 0) { return [Math]::Sign($cmp) }
-        }
     }
 
+    if ($userMajor -gt $vendorMajor) { return 1 }
+    if ($userMajor -lt $vendorMajor) { return -1 }
+
+    if ($userMinor -gt $vendorMinor) { return 1 }
+    if ($userMinor -lt $vendorMinor) { return -1 }
+
+    if ($userPatch -gt $vendorPatch) { return 1 }
+    if ($userPatch -lt $vendorPatch) { return -1 }
+
+    if ($userBuild -gt $vendorBuild) { return 1 }
+    if ($userBuild -lt $vendorBuild) { return -1 }
+
     return 0
 }
 
-function Compare-GitVersion {
+function compare_git_versions($userVersion, $vendorVersion) {
-    param(
+    $result = compareVersions -userVersion $userVersion -vendorVersion $vendorVersion
-        [Parameter(Mandatory = $false)]
-        [AllowNull()]
-        [string]$UserVersion,
-        [Parameter(Mandatory = $false)]
-        [AllowNull()]
-        [string]$VendorVersion
-    )
 
-    $result = Compare-Version -UserVersion $UserVersion -VendorVersion $VendorVersion
+    Write-Debug "Compare Versions Result: ${result}"
-
-    Write-Debug "Compare Versions Result: $result"
     if ($result -ge 0) {
-        return $UserVersion
+        return $userVersion
+    }
+    else {
+        return $vendorVersion
     }
-    return $VendorVersion
 }
 
-function Set-GitPath {
+function Configure-Git($gitRoot, $gitType, $gitPathUser) {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$GitRoot,
-        [Parameter(Mandatory = $true)]
-        [string]$GitType,
-        [Parameter(Mandatory = $false)]
-        [string]$GitPathUser
-    )
-
     # Proposed Behavior
 
     # Modify the path if we are using VENDORED Git, do nothing if using USER Git.
     # If User Git is installed but is older, match its path config adding paths
     # in the same path positions allowing a user to configure Cmder Git path
     # using locally installed Git Path Config.
+    if ($gitType -eq 'VENDOR') {
+        # If User Git is installed replace its path config with Newer Vendored Git Path
+        if (($null -ne $gitPathUser) -and ($gitPathUser -ne '')) {
+            Write-Verbose "Cmder 'profile.ps1': Replacing older user Git path '$gitPathUser' with newer vendored Git path '$gitRoot' in the system path..."
 
-    if ($GitType -ne 'VENDOR') {
+            $newPath = ($env:path -ireplace [regex]::Escape($gitPathUser), $gitRoot)
-        return $env:Path
+        }
+        else {
+            if (-not ($env:Path -match [regex]::Escape("$gitRoot\cmd"))) {
+                Write-Debug "Adding $gitRoot\cmd to the path"
+                $newPath = $($gitRoot + "\cmd" + ";" + $env:Path)
             }
 
-    $newPath = $env:Path
+            # Add "$gitRoot\mingw[32|64]\bin" to the path if exists and not done already
-
+            if ((Test-Path "$gitRoot\mingw32\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\mingw32\bin"))) {
-    # Replace user Git path with vendored Git if user path exists
+                Write-Debug "Adding $gitRoot\mingw32\bin to the path"
-    if ($GitPathUser) {
+                $newPath = "$newPath;$gitRoot\mingw32\bin"
-        Write-Verbose "Cmder 'profile.ps1': Replacing older user Git path '$GitPathUser' with newer vendored Git path '$GitRoot' in the system path..."
+            }
-        $newPath = $newPath -ireplace [regex]::Escape($GitPathUser), $GitRoot
+            elseif ((Test-Path "$gitRoot\mingw64\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\mingw64\bin"))) {
-    } else {
+                Write-Debug "Adding $gitRoot\mingw64\bin to the path"
-        # Add Git cmd directory to the path
+                $newPath = "$newPath;$gitRoot\mingw64\bin"
-        $gitCmd = Join-Path $GitRoot "cmd"
-        if (-not ($newPath -match [regex]::Escape($gitCmd))) {
-            Write-Debug "Adding $gitCmd to the path"
-            $newPath = "$gitCmd;$newPath"
             }
 
-        # Add mingw[32|64]\bin directories to the path, if they exist and not already present
+            # Add "$gitRoot\usr\bin" to the path if exists and not done already
-        # Prefer mingw64 on 64-bit systems, mingw32 on 32-bit systems
+            if ((Test-Path "$gitRoot\usr\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\usr\bin"))) {
-        $is64Bit = [Environment]::Is64BitOperatingSystem
+                Write-Debug "Adding $gitRoot\usr\bin to the path"
-        $mingwDirs = if ($is64Bit) { @('mingw64', 'mingw32') } else { @('mingw32') }
+                $newPath = "$newPath;$gitRoot\usr\bin"
-
-        foreach ($mingw in $mingwDirs) {
-            $mingwBin = Join-Path $GitRoot "$mingw\bin"
-            if ((Test-Path $mingwBin) -and -not ($newPath -match [regex]::Escape($mingwBin))) {
-                Write-Debug "Adding $mingwBin to the path"
-                $newPath = "$newPath;$mingwBin"
-                break
-            }
-        }
-
-        # Add usr\bin directory to the path
-        $usrBin = Join-Path $GitRoot "usr\bin"
-        if ((Test-Path $usrBin) -and -not ($newPath -match [regex]::Escape($usrBin))) {
-            Write-Debug "Adding $usrBin to the path"
-            $newPath = "$newPath;$usrBin"
             }
         }
 
         return $newPath
     }
 
-function Import-Git {
+    return $env:path
-    $gitModule = Get-Module -Name Posh-Git -ListAvailable
-
-    if (-not $gitModule) {
-        Microsoft.PowerShell.Utility\Write-Host -NoNewline "`r`n"
-        Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart Cmder."
-        Microsoft.PowerShell.Utility\Write-Host -NoNewline "`r$([char]0x1B)[A"
-        return $false
 }
 
-    # Import posh-git module (works for all versions)
+function Import-Git() {
-    Import-Module Posh-Git -ErrorAction SilentlyContinue | Out-Null
+    $GitModule = Get-Module -Name Posh-Git -ListAvailable
-
+    if ($GitModule | Select-Object version | Where-Object version -le ([version]"0.6.1.20160330")) {
-    # Apply version-specific settings for posh-git 1.0.0+
+        Import-Module Posh-Git > $null
-    if (($gitModule.Version -ge [version]"1.0.0") -and (Get-Variable -Name GitPromptSettings -ErrorAction SilentlyContinue)) {
+    }
+    if ($GitModule | Select-Object version | Where-Object version -ge ([version]"1.0.0")) {
+        Import-Module Posh-Git > $null
         $GitPromptSettings.AnsiConsole = $false
     }
-
+    if (-not $GitModule) {
+        Write-Host -NoNewline "`r`n"
+        Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart Cmder."
+        Write-Host -NoNewline "`r$([char]0x1B)[A"
+        return $false
+    }
+    # Make sure we only run once by always returning true
     return $true
 }
 
-function Show-GitStatus {
+function checkGit($Path) {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$Path
-    )
-
     if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
         return
     }
-
+    if (-not (Test-Path -Path (Join-Path $Path '.git'))) {
-    $gitDir = Join-Path $Path '.git'
+        $SplitPath = Split-Path $path
-    if (-not (Test-Path $gitDir)) {
+        if ($SplitPath) { checkGit($SplitPath) }
-        $parentPath = Split-Path $Path
-        if ($parentPath) {
-            Show-GitStatus -Path $parentPath
-        }
         return
     }
-
+    if (getGitStatusSetting -eq $true) {
-    if (Get-GitStatusSetting) {
         if ($null -eq $env:gitLoaded) {
             $env:gitLoaded = Import-Git
         }
         if ($env:gitLoaded -eq $true) {
             Write-VcsStatus
         }
-    } else {
-        $headFile = Join-Path $gitDir 'HEAD'
-        if (Test-Path $headFile) {
-            $headContent = Get-Content $headFile -Raw
-            if ($headContent -match 'ref: refs/heads/(.+)') {
-                $branchName = $Matches[1].Trim()
-            } else {
-                $shortHash = $headContent.Substring(0, [Math]::Min(7, $headContent.Length))
-                $branchName = "HEAD detached at $shortHash"
     }
-            Microsoft.PowerShell.Utility\Write-Host " [$branchName]" -NoNewline -ForegroundColor White
+    else {
+        $headContent = Get-Content (Join-Path $Path '.git/HEAD')
+        if ($headContent -like "ref: refs/heads/*") {
+            $branchName = $headContent.Substring(16)
         }
+        else {
+            $branchName = "HEAD detached at $($headContent.Substring(0, 7))"
+        }
+        Write-Host " [$branchName]" -NoNewline -ForegroundColor White
     }
 }
 
-function Get-GitStatusSetting {
+function getGitStatusSetting() {
-    $gitConfig = git --no-pager config -l 2>$null | Out-String
+    $gitStatus = (git --no-pager config -l) | Out-String
 
-    # Check if git status display is disabled via config
+    foreach ($line in $($gitStatus -split "`r`n")) {
-    # Matches: cmder.status=false or cmder.psstatus=false (PowerShell-specific)
+        if (($line -match 'cmder.status=false') -or ($line -match 'cmder.psstatus=false')) {
-    if ($gitConfig -match '(?m)^cmder\.(ps)?status=false$') {
             return $false
         }
+    }
 
     return $true
 }

vendor/sources.json

@@ -1,27 +1,22 @@
 [
   {
     "name": "git-for-windows",
-    "version": "2.51.2.windows.1",
+    "version": "2.49.0.windows.1",
-    "url": "https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/PortableGit-2.51.2-64-bit.7z.exe"
+    "url": "https://github.com/git-for-windows/git/releases/download/v2.49.0.windows.1/PortableGit-2.49.0-64-bit.7z.exe"
   },
   {
     "name": "clink",
-    "version": "1.8.8",
+    "version": "1.7.14",
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip"
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.7.14/clink.1.7.14.843933.zip"
   },
   {
     "name": "conemu-maximus5",
     "version": "23.07.24",
-    "url": "https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
+    "url": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
-  },
-  {
-    "name": "windows-terminal",
-    "version": "1.23.12811.0",
-    "url": "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.WindowsTerminal_1.23.12811.0_x64.zip"
   },
   {
     "name": "clink-completions",
-    "version": "0.6.6",
+    "version": "0.6.2",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip"
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.2.zip"
   }
 ]