Fix PowerShell script inconsistencies and documentation errors

Co-authored-by: DRSDavidSoft <4673812+DRSDavidSoft@users.noreply.github.com>
Initial plan
2025-11-09 21:59:08 +08:00 · 2025-08-12 03:02:05 +00:00 · 2025-08-12 02:51:18 +00:00
22 changed files with 366 additions and 697 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,26 +53,26 @@ jobs:
      run: .\pack.ps1 -verbose

    - name: Upload artifact (cmder.zip)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v4
      with:
        path: build/cmder.zip
        name: cmder.zip
        if-no-files-found: error

    - name: Upload artifact (cmder.7z)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v4
      with:
        path: build/cmder.7z
        name: cmder.7z

    - name: Upload artifact (cmder_mini.zip)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v4
      with:
        path: build/cmder_mini.zip
        name: cmder_mini.zip

    - name: Upload artifact (hashes.txt)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v4
      with:
        path: build/hashes.txt
        name: hashes.txt
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -49,7 +49,7 @@ jobs:

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v3
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,6 +68,6 @@ jobs:
      run: .\build.ps1 -Compile -verbose

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v3
      with:
        category: "/language:${{matrix.language}}"
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,7 +48,7 @@ jobs:
          cmd /c vendor\init.bat /v /d /t
    - name: Testing PowerShell
      run: |
-          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$env:CMDER_DEBUG='1'; . 'vendor\profile.ps1'"
+          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "Invoke-Expression '. ''vendor\profile.ps1'''"
    - name: Testing Bash
      run: |
          bash vendor/cmder.sh
--- a/README.md
+++ b/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, D) for PowerShell sessions. This enables features like command navigation (jump between commands), command selection, visual command separators, command exit code tracking, 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
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -21,19 +21,19 @@

    Skip all downloads and only build launcher.
 .EXAMPLE
-    .\build -verbose
+    .\build.ps1 -verbose

    Execute the build and see what's going on.
 .EXAMPLE
    .\build.ps1 -SourcesPath '~/custom/vendors.json'

-    Build Cmder with your own packages. See vendor/sources.json for the syntax you need to copy.
+    Build cmder with your own packages. See vendor/sources.json for the syntax you need to copy.
 .NOTES
    AUTHORS
    Samuel Vasko, Jack Bennett
    Part of the Cmder project.
 .LINK
-    http://cmder.app/ - Project Home
+    https://github.com/cmderdev/cmder - Project Home
 #>
 [CmdletBinding(SupportsShouldProcess = $true)]
 Param(
@@ -60,7 +60,7 @@ Param(
    [switch]$Compile
 )

-# Get the scripts and Cmder root dirs we are building in.
+# Get the scripts and cmder root dirs we are building in.
 $cmder_root = Resolve-Path "$PSScriptRoot\.."

 # Dot source util functions into this scope
--- a/scripts/pack.ps1
+++ b/scripts/pack.ps1
@@ -2,18 +2,18 @@
 .Synopsis
    Pack Cmder
 .DESCRIPTION
-    Use this script to pack Cmder into release archives
+    Use this script to pack cmder into release archives

    You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
    Then unblock the script for execution with UnblockFile .\pack.ps1
 .EXAMPLE
    .\pack.ps1

-    Creates default archives for Cmder
+    Creates default archives for cmder
 .EXAMPLE
    .\pack.ps1 -verbose

-    Creates default archives for Cmder with plenty of information
+    Creates default archives for cmder with plenty of information
 .NOTES
    AUTHORS
    Samuel Vasko, Jack Bennett, Martin Kemp
@@ -35,7 +35,7 @@ Param(
    [string]$saveTo = "$PSScriptRoot\..\build"
 )

-$cmderRoot = Resolve-Path $cmderRoot
+$cmder_root = Resolve-Path $cmderRoot

 . "$PSScriptRoot\utils.ps1"
 $ErrorActionPreference = "Stop"
@@ -47,10 +47,10 @@ $targets = @{
    "cmder_mini.zip" = "-xr!`"vendor\git-for-windows`"";
 }

-Push-Location -Path $cmderRoot
+Push-Location -Path $cmder_root

-Delete-Existing "$cmderRoot\Version*"
-Delete-Existing "$cmderRoot\build\*"
+Delete-Existing "$cmder_root\Version*"
+Delete-Existing "$cmder_root\build\*"

 if (-not (Test-Path -PathType container $saveTo)) {
    (New-Item -ItemType Directory -Path $saveTo) | Out-Null
@@ -59,16 +59,16 @@ if (-not (Test-Path -PathType container $saveTo)) {
 $saveTo = Resolve-Path $saveTo

 $version = Get-VersionStr
-(New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null
+(New-Item -ItemType file "$cmder_root\Version $version") | Out-Null

 if ($PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent) {
    Write-Verbose "Packing Cmder $version in $saveTo..."
-    $excluded = (Get-Content -Path "$cmderRoot\packignore") -Split [System.Environment]::NewLine | Where-Object { $_ }
-    Get-ChildItem $cmderRoot -Force -Exclude $excluded
+    $excluded = (Get-Content -Path "$cmder_root\packignore") -Split [System.Environment]::NewLine | Where-Object { $_ }
+    Get-ChildItem $cmder_root -Force -Exclude $excluded
 }

 foreach ($t in $targets.GetEnumerator()) {
-    Create-Archive "$cmderRoot" "$saveTo\$($t.Name)" $t.Value
+    Create-Archive "$cmder_root" "$saveTo\$($t.Name)" $t.Value
    $hash = (Digest-Hash "$saveTo\$($t.Name)")
    Add-Content -path "$saveTo\hashes.txt" -value ($t.Name + ' ' + $hash)
 }
--- a/scripts/update.ps1
+++ b/scripts/update.ps1
@@ -5,17 +5,17 @@
    This script updates dependencies to the latest version in vendor/sources.json file.

    You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
-    Then unblock the script for execution with UnblockFile .\build.ps1
+    Then unblock the script for execution with UnblockFile .\update.ps1
 .EXAMPLE
-    .\build.ps1
+    .\update.ps1

    Updates the dependency sources in the default location, the vendor/sources.json file.
 .EXAMPLE
-    .\build -verbose
+    .\update.ps1 -verbose

    Updates the dependency sources and see what's going on.
 .EXAMPLE
-    .\build.ps1 -SourcesPath '~/custom/vendors.json'
+    .\update.ps1 -SourcesPath '~/custom/vendors.json'

    Specify the path to update dependency sources file at.
 .NOTES
@@ -23,7 +23,7 @@
    David Refoua <David@Refoua.me>
    Part of the Cmder project.
 .LINK
-    http://cmder.app/ - Project Home
+    https://github.com/cmderdev/cmder - Project Home
 #>
 [CmdletBinding(SupportsShouldProcess = $true)]
 Param(
@@ -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",
-
-    # Include pre-release versions (RC, beta, alpha, etc.)
-    # By default, only stable releases are considered
-    [switch]$IncludePrerelease = $false
+    [string]$sourcesPath = "$PSScriptRoot\..\vendor\sources.json"
 )

 # 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,
-
-        [Parameter(Mandatory = $false)]
-        [bool]$includePrerelease = $false
+        $urlStr
    )

    $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,26 +164,12 @@ function Fetch-DownloadUrl {

    # Special case for archive downloads of repository
    if (($null -eq $downloadLinks) -or (-not $downloadLinks)) {
-        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive")) {
-            # 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"
-                        $downloadLinks = $url.Scheme + "://" + $url.Host + ($p -join '')
-                        return $downloadLinks
-                    }
+        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive") -and $info[0].tag_name) {
+            for ($i = 0; $i -lt $p.Length; $i++) {
+                if ($p[$i].Trim('/') -eq "archive") {
+                    $p[$i + 1] = $info[0].tag_name + ".zip"
+                    $downloadLinks = $url.Scheme + "://" + $url.Host + ($p -join '')
+                    return $downloadLinks
                }
            }
        }
@@ -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"
--- a/scripts/utils.ps1
+++ b/scripts/utils.ps1
@@ -1,7 +1,6 @@
 function Ensure-Exists($path) {
    if (-not (Test-Path $path)) {
-        Write-Error "Missing required $path! Ensure it is installed"
-        exit 1
+        throw "Missing required $path! Ensure it is installed"
    }
    return $true > $null
 }
@@ -16,8 +15,7 @@ function Ensure-Executable($command) {
            Set-Alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script
        }
        else {
-            Write-Error "Missing $command! Ensure it is installed and on in the PATH"
-            exit 1
+            throw "Missing $command! Ensure it is installed and on in the PATH"
        }
    }
 }
@@ -172,13 +170,13 @@ function Register-Cmder() {
        # Text for the context menu item.
        $MenuText = "Cmder Here"

-        , # Defaults to the current Cmder directory when run from Cmder.
+        , # Defaults to the current cmder directory when run from cmder.
        $PathToExe = (Join-Path $env:CMDER_ROOT "cmder.exe")

        , # Commands the context menu will execute.
        $Command = "%V"

-        , # Defaults to the icons folder in the Cmder package.
+        , # Defaults to the icons folder in the cmder package.
        $icon = (Split-Path $PathToExe | Join-Path -ChildPath 'icons/cmder.ico')
    )
    Begin
--- a/vendor/clink.lua
+++ b/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.
-    local file = io.popen("hg branch 2>nul")
+    -- Return the branch information. The default is to get just 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:
+    -- 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}", result)
+            clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", " "..color.."("..branch..")")
            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()
-        if branch and
+        -- Colors for mercurial status
+        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
-            if cached_info.hg_dir ~= hg_dir or cached_info.hg_branch ~= branch then
-                cached_info.hg_info = nil
-                cached_info.hg_dir = hg_dir
-                cached_info.hg_branch = branch
+            local color = colors.clean
+
+            local pipe = io.popen("hg status -amrd 2>&1")
+            if pipe then
+                output = pipe:read('*all')
+                pipe:close()
+                if output ~= nil and output ~= "" then color = colors.dirty end
            end

-            local hgInfo = get_hg_info_table()
-
-            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)
+            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
-
-            local svnInfo = get_svn_info_table()
+            -- Get the svn status using coroutine if available and option is enabled. Otherwise use a blocking call
+            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
-                color = get_unknown_color()
-            elseif svnInfo.clean then
-                color = get_clean_color()
+            if not svnStatus or svnStatus.error then
+                color = colors.nostatus
+            elseif svnStatus.clean then
+                color = colors.clean
            else
-                color = get_dirty_color()
+                color = colors.dirty
            end

            clink.prompt.value = gsub_plain(clink.prompt.value, "{svn}", " "..color.."("..branch..")")
--- a/vendor/cmder.sh
+++ b/vendor/cmder.sh
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # DO NOT EDIT THIS FILE IT WILL BE OVERWRITTEN ON UPDATE
 #
 # Add portable user customizations ${CMDER_ROOT}/config/user_profile.sh,
@@ -8,130 +7,93 @@
 # Add system specific users customizations to $HOME/.bashrc, these
 # customizations will not follow Cmder to another machine.

-# Source all .sh scripts in a given directory
-# Args: $1 - directory path containing .sh scripts to source
-run_profile_d() {
-  local profile_d_scripts
-  pushd "${1}" >/dev/null || return
-  # shellcheck disable=SC2035
+function runProfiled {
+  unset profile_d_scripts
+  pushd "${1}" >/dev/null
  profile_d_scripts=$(ls *.sh 2>/dev/null)

-  if [ -n "${profile_d_scripts}" ]; then
-    for script in ${profile_d_scripts}; do
-      # echo Sourcing "${1}/${script}"...
-      # shellcheck disable=SC1090
-      . "${1}/${script}"
+  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+    for x in ${profile_d_scripts} ; do
+      # echo Sourcing "${1}/${x}"...
+      . "${1}/${x}"
    done
  fi
-  popd >/dev/null || return
+  popd >/dev/null
 }

-# Detect and set CMDER_ROOT for bash admin sessions
-# Converts Windows paths to Unix paths if needed
-# ConEmuDir is set by ConEmu/Cmder environment
-if [ -z "$CMDER_ROOT" ]; then
-    # Try to get CMDER_ROOT from ConEmuDir
-    case "$ConEmuDir" in 
-        *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." && pwd );;
-    esac
-    
-    # If still not set, derive from script location (vendor -> root)
-    if [ -z "$CMDER_ROOT" ]; then
-        CMDER_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-    fi
+# We do this for bash as admin sessions since $CMDER_ROOT is not being set
+if [ "$CMDER_ROOT" == "" ] ; then
+    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
 else
-    case "$CMDER_ROOT" in 
-        *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";;
-    esac
+    case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac
 fi

-# Remove any trailing '/' from CMDER_ROOT
-CMDER_ROOT="${CMDER_ROOT%/}"
-
-# Exit early if CMDER_ROOT is not set
-if [ -z "$CMDER_ROOT" ]; then
-    echo "Warning: CMDER_ROOT is not set. Cmder integration skipped."
-    # shellcheck disable=SC2317
-    return 2>/dev/null || exit 0
-fi
+# Remove any trailing '/'
+CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::')

 export CMDER_ROOT

-# Detect Git installation location
-if [ -f "/c/Program Files/Git/cmd/git.exe" ]; then
+if [ -f "/c/Program Files/Git/cmd/git.exe" ] ; then
    GIT_INSTALL_ROOT="/c/Program Files/Git"
-elif [ -f "/c/Program Files(x86)/Git/cmd/git.exe" ]; then
+elif [ -f "/c/Program Files(x86)/Git/cmd/git.exe" ] ; then
    GIT_INSTALL_ROOT="/c/Program Files(x86)/Git"
-elif [ -f "${CMDER_ROOT}/vendor/git-for-windows/cmd/git.exe" ]; then
-    GIT_INSTALL_ROOT="${CMDER_ROOT}/vendor/git-for-windows"
+elif [ -f "${CMDER_ROOT}/vendor/git-for-windows/cmd/git.exe" ] ; then
+    GIT_INSTALL_ROOT=${CMDER_ROOT}/vendor/git-for-windows
 fi

-# Add Git to PATH if not already present
-if [[ -n "${GIT_INSTALL_ROOT}" && ! "$PATH" =~ ${GIT_INSTALL_ROOT}/bin: ]]; then
+if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then
  PATH="${GIT_INSTALL_ROOT}/bin:$PATH"
 fi

-# Add Cmder directories to PATH
 PATH="${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}"

 export PATH

-# Create profile.d directory if it doesn't exist
-if [ ! -d "${CMDER_ROOT}/config/profile.d" ]; then
+# Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
+# to source them at startup.
+if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
  mkdir -p "${CMDER_ROOT}/config/profile.d"
 fi

-# Source all .sh scripts in profile.d directories
-if [ -d "${CMDER_ROOT}/config/profile.d" ]; then
-  run_profile_d "${CMDER_ROOT}/config/profile.d"
+if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
+  runProfiled  "${CMDER_ROOT}/config/profile.d"
 fi

-if [ -d "${CMDER_USER_CONFIG}/profile.d" ]; then
-  run_profile_d "${CMDER_USER_CONFIG}/profile.d"
+if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
+  runProfiled  "${CMDER_USER_CONFIG}/profile.d"
 fi


-# Rename legacy user-profile.sh to user_profile.sh for consistency
-if [ -f "$CMDER_ROOT/config/user-profile.sh" ]; then
+# Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+if [ -f "$CMDER_ROOT/config/user-profile.sh" ] ; then
  mv "$CMDER_ROOT/config/user-profile.sh" "$CMDER_ROOT/config/user_profile.sh"
 fi

-# Source user profile from CMDER_ROOT config
-if [ -f "${CMDER_ROOT}/config/user_profile.sh" ]; then
+CmderUserProfilePath="${CMDER_ROOT}/config/user_profile.sh"
+if [ -f "${CMDER_ROOT}/config/user_profile.sh" ] ; then
    . "${CMDER_ROOT}/config/user_profile.sh"
 fi

-# Handle CMDER_USER_CONFIG if set
-if [ -n "${CMDER_USER_CONFIG}" ]; then
-  # Rename legacy user-profile.sh to user_profile.sh for consistency
-  if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ]; then
+if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+  # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+  if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ] ; then
    mv "$CMDER_USER_CONFIG/user-profile.sh" "$CMDER_USER_CONFIG/user_profile.sh"
  fi

  export PATH="${CMDER_USER_CONFIG}/bin:$PATH"

-  # Source user profile from CMDER_USER_CONFIG
-  if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ]; then
-    # shellcheck disable=SC1091
+  CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
+  if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
    . "${CMDER_USER_CONFIG}/user_profile.sh"
  fi
 fi

-# Determine the user profile path for creation if needed
-if [ -n "${CMDER_USER_CONFIG}" ]; then
-  cmder_user_profile_path="${CMDER_USER_CONFIG}/user_profile.sh"
-else
-  cmder_user_profile_path="${CMDER_ROOT}/config/user_profile.sh"
-fi
-
-# Create user profile from default template if it doesn't exist
-if [ ! -f "${cmder_user_profile_path}" ] && [ -f "${CMDER_ROOT}/vendor/user_profile.sh.default" ]; then
-    echo "Creating user startup file: ${cmder_user_profile_path}"
-    cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${cmder_user_profile_path}"
+if [ ! -f "${CmderUserProfilePath}" ] ; then
+    echo Creating user startup file: "${CmderUserProfilePath}"
+    cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${CmderUserProfilePath}"
 fi

 # Source the users .bashrc file if it exists
-if [ -f "${HOME}/.bashrc" ]; then
-    # shellcheck disable=SC1091
+if [ -f "${HOME}/.bashrc" ] ; then
    . "${HOME}/.bashrc"
 fi
--- a/vendor/cmder_exinit
+++ b/vendor/cmder_exinit
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # Copy this file to your non integrated *nix-like environment,
 # Cygwin/MSys2/Git for Windows SDK, installs '/etc/profile.d/'
 # folder to integrate the externally installed Unix like environment
@@ -23,130 +22,92 @@
 # # from outside Cmder.
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.

-# Source all .sh or .zsh scripts in a given directory based on shell type
-# Args: $1 - directory path containing shell scripts to source
-run_profile_d() {
-  local profile_d_scripts
-  pushd "${1}" >/dev/null || return
+function runProfiled {
+  unset profile_d_scripts
+  pushd "${1}" >/dev/null

-  if [ -n "${ZSH_VERSION}" ]; then
-    # shellcheck disable=SC2035
+  if [ ! "x${ZSH_VERSION}" = "x"  ]; then
    profile_d_scripts=$(ls *.zsh 2>/dev/null)
-  elif [ -n "${BASH_VERSION}" ]; then
-    # shellcheck disable=SC2035
+  elif [ ! "x${BASH_VERSION}" = "x"  ]; then
    profile_d_scripts=$(ls *.sh 2>/dev/null)
  fi

-  if [ -n "${profile_d_scripts}" ]; then
-    for script in ${profile_d_scripts}; do
-      echo "Sourcing ${1}/${script}..."
-      # shellcheck disable=SC1090
-      . "${1}/${script}"
+  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+    for x in ${profile_d_scripts} ; do
+      echo Sourcing "${1}/${x}"...
+      . "${1}/${x}"
    done
  fi
-  popd >/dev/null || return
+  popd >/dev/null
 }

-# Check that we haven't already been sourced
+# Check that we haven't already been sourced.
 [[ -z ${CMDER_EXINIT} ]] && CMDER_EXINIT="1" || return

-# Detect and set CMDER_ROOT for bash admin sessions
-# Converts Windows paths to Unix paths if needed
-# ConEmuDir is set by ConEmu/Cmder environment
-if [ -z "$CMDER_ROOT" ] && [ -n "$ConEmuDir" ]; then
-  if [ -d "${ConEmuDir}../../vendor" ]; then
-    case "$ConEmuDir" in 
-      *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." && pwd );;
-    esac
+# We do this for bash as admin sessions since $CMDER_ROOT is not being set
+if [ "$CMDER_ROOT" = "" -a "$ConEmuDir" != "" ] ; then
+  if [ -d "${ConEmuDir}../../vendor" ] ; then
+    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
  else
    echo "Running in ConEmu without Cmder, skipping Cmder integration."
  fi
-elif [ -n "$CMDER_ROOT" ]; then
-  case "$CMDER_ROOT" in 
-    *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";;
-  esac
+elif [ "$CMDER_ROOT" != "" ] ; then
+  case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac
 fi

-# If CMDER_ROOT is still not set, try to derive from script location
-# Note: This only works if cmder_exinit is in its original location (vendor/)
-if [ -z "$CMDER_ROOT" ] && [ -f "${BASH_SOURCE[0]}" ]; then
-  # Check if we're in the vendor directory
-  script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-  if [[ "$script_dir" == */vendor ]] || [[ "$script_dir" == */vendor/* ]]; then
-    # Extract the Cmder root (parent of vendor)
-    CMDER_ROOT="$( cd "$script_dir/.." && pwd )"
-    # Verify this looks like a Cmder installation
-    if [ ! -d "${CMDER_ROOT}/vendor" ]; then
-      unset CMDER_ROOT
-    fi
-  fi
-fi
+if [ ! "$CMDER_ROOT" = "" ] ; then
+  # Remove any trailing '/'
+  CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::')

-if [ -n "$CMDER_ROOT" ]; then
-  # Remove any trailing '/' from CMDER_ROOT
-  CMDER_ROOT="${CMDER_ROOT%/}"
-
-  echo "Using CMDER_ROOT at \"${CMDER_ROOT}\"."
+  echo "Using \"CMDER_ROOT\" at \"${CMDER_ROOT}\"."

  export CMDER_ROOT

-  # Add Cmder directories to PATH
-  PATH="${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}"
+  PATH=${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}

  export PATH

-  # Create profile.d directory if it doesn't exist
-  if [ ! -d "${CMDER_ROOT}/config/profile.d" ]; then
+  # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
+  # to source them at startup.
+  if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
    mkdir -p "${CMDER_ROOT}/config/profile.d"
  fi

-  # Source all shell scripts in profile.d directories
-  if [ -d "${CMDER_ROOT}/config/profile.d" ]; then
-    run_profile_d "${CMDER_ROOT}/config/profile.d"
+  if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
+    runProfiled  "${CMDER_ROOT}/config/profile.d"
  fi

-  if [ -d "${CMDER_USER_CONFIG}/profile.d" ]; then
-    run_profile_d "${CMDER_USER_CONFIG}/profile.d"
+  if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
+    runProfiled  "${CMDER_USER_CONFIG}/profile.d"
  fi


-  # Rename legacy user-profile.sh to user_profile.sh for consistency
-  if [ -f "$CMDER_ROOT/config/user-profile.sh" ]; then
+  # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+  if [ -f "$CMDER_ROOT/config/user-profile.sh" ] ; then
    mv "$CMDER_ROOT/config/user-profile.sh" "$CMDER_ROOT/config/user_profile.sh"
  fi

-  # Source user profile from CMDER_ROOT config
-  if [ -f "${CMDER_ROOT}/config/user_profile.sh" ]; then
-      # shellcheck disable=SC1091
+  CmderUserProfilePath="${CMDER_ROOT}/config/user_profile.sh"
+  if [ -f "${CMDER_ROOT}/config/user_profile.sh" ] ; then
      . "${CMDER_ROOT}/config/user_profile.sh"
  fi

-  # Handle CMDER_USER_CONFIG if set
-  if [ -n "${CMDER_USER_CONFIG}" ]; then
-    # Rename legacy user-profile.sh to user_profile.sh for consistency
-    if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ]; then
+  if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+    # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+    if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ] ; then
      mv "$CMDER_USER_CONFIG/user-profile.sh" "$CMDER_USER_CONFIG/user_profile.sh"
    fi

-    export PATH="${CMDER_USER_CONFIG}/bin:$PATH"
+    export PATH=${CMDER_USER_CONFIG}/bin:$PATH

-    # Source user profile from CMDER_USER_CONFIG
-    if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ]; then
-      # shellcheck disable=SC1091
+    CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
+    if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
      . "${CMDER_USER_CONFIG}/user_profile.sh"
    fi
  fi

-  # Determine the user profile path for creation if needed
-  if [ -n "${CMDER_USER_CONFIG}" ]; then
-    cmder_user_profile_path="${CMDER_USER_CONFIG}/user_profile.sh"
-  else
-    cmder_user_profile_path="${CMDER_ROOT}/config/user_profile.sh"
-  fi
-
-  # Create user profile from default template if it doesn't exist
-  if [ ! -f "${cmder_user_profile_path}" ] && [ -f "${CMDER_ROOT}/vendor/user_profile.sh.default" ]; then
-      echo "Creating user startup file: ${cmder_user_profile_path}"
-      cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${cmder_user_profile_path}"
+  if [ ! -f "${CmderUserProfilePath}" ] ; then
+      echo Creating user startup file: "${CmderUserProfilePath}"
+      cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${CmderUserProfilePath}"
  fi
 fi
--- a/vendor/cmder_prompt_config.lua.default
+++ b/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
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@@ -5,9 +5,9 @@ function getGitStatusSetting() {
  # Get all git config entries for the current repository without pager
  gitConfig=$(git --no-pager config -l 2>/dev/null) || return 0  # treat failure as enabled

-  # Check if git status display for Cmder is disabled via config
-  # Matches: cmder.status=false or cmder.shstatus=false (Bash-specific)
-  if [[ $gitConfig =~ (^|$'\n')cmder\.(sh)?status=false($|$'\n') ]]
+  # Check if git status for Cmder is disabled
+  if [[ $gitConfig =~ (^|$'\n')cmder\.status=false($|$'\n') ]] || \
+     [[ $gitConfig =~ (^|$'\n')cmder\.shstatus=false($|$'\n') ]]
  then
    return 1  # disabled
  fi
@@ -47,41 +47,9 @@ then
    . ~/.config/git/git-prompt.sh
  fi
 else
-
-  # Setup OSC 133 shell integration for Windows Terminal
-  if [ -n "$WT_SESSION" ]; then
-    __cmder_prompt_command() {
-      local exit_code=$?
-      # Emit OSC 133;D to mark the end of command execution with exit code
-      printf '\e]133;D;%s\a' "$exit_code"
-      return $exit_code
-    }
-
-    __cmder_preexec() {
-      # Emit OSC 133;C to mark the start of command execution
-      printf '\e]133;C\a'
-    }
-
-    # Append to PROMPT_COMMAND to emit sequences just before each prompt
-    if [ -z "$PROMPT_COMMAND" ]; then
-      PROMPT_COMMAND="__cmder_prompt_command"
-    else
-      PROMPT_COMMAND="__cmder_prompt_command;$PROMPT_COMMAND"
-    fi
-
-    # Use DEBUG trap to emit OSC 133;C before command execution
-    trap '__cmder_preexec' DEBUG
-  fi
-
-  # Source: github.com/git-for-windows/build-extra/blob/main/git-extra/git-prompt.sh
+  # Taken parts from https://github.com/git-for-windows/build-extra/blob/main/git-extra/git-prompt.sh
  PS1='\[\033]0;${TITLEPREFIX:+$TITLEPREFIX:}${PWD//[^[:ascii:]]/?}\007\]' # set window title to TITLEPREFIX (if set) and current working directory
  # PS1="$PS1"'\n'               # new line (disabled)
-
-  if [ -n "$WT_SESSION" ]; then
-    # Emit OSC 133;A to mark the start of prompt
-    PS1="$PS1"'\e]133;A\a'
-  fi
-
  PS1="$PS1"'\[\033[32m\]'       # change to green and bold
  PS1="$PS1"'\u@\h '             # user@host<space>
  PS1="$PS1${MSYSTEM:+\[\033[35m\]$MSYSTEM }" # show MSYSTEM in purple (if set)
@@ -102,7 +70,7 @@ else
        PS1="$PS1"'\[\033[36m\]'  # change color to cyan
        PS1="$PS1"'`__git_ps1`'   # bash function
      else
-        PS1="$PS1"'\[\033[37;1m\]' # change color to white
+        PS1="$PS1"'\[\033[37;1m\]'  # change color to white
        PS1="$PS1"'`getSimpleGitBranch`'
      fi
    fi
@@ -112,14 +80,9 @@ else
  PS1="$PS1"'\[\033[30;1m\]'     # change color to grey in bold
  PS1="$PS1"'λ '                 # prompt: Cmder uses λ
  PS1="$PS1"'\[\033[0m\]'        # reset color
-
-  if [ -n "$WT_SESSION" ]; then
-    # Emit OSC 133;B to mark the end of prompt
-    PS1="$PS1"'\[\e]133;B\a\]'
-  fi
 fi

-MSYS2_PS1="$PS1"                 # for detection by MSYS2 SDK's bash.basrc
+MSYS2_PS1="$PS1"               # for detection by MSYS2 SDK's bash.basrc

 # Evaluate all user-specific Bash completion scripts (if any)
 if test -z "$WINELOADERNOEXEC"
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -222,9 +222,6 @@ goto :SKIP_CLINK

    :: Revert back to plain cmd.exe prompt without clink
    prompt $E[1;32;49m$P$S$_$E[1;30;49mλ$S$E[0m
-    
-    :: Add Windows Terminal shell integration support (OSC 133 sequences)
-    if defined WT_SESSION (prompt $e]133;D$e\$e]133;A$e\$e]9;9;$P$e\%PROMPT%$e]133;B$e\)

    chcp %cp%>nul

@@ -358,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"
        )
    )
--- a/vendor/lib/lib_base.cmd
+++ b/vendor/lib/lib_base.cmd
@@ -4,7 +4,7 @@ set lib_base=call "%~dp0lib_base.cmd"

 if "%~1" == "/h" (
    %lib_base% help "%~0"
-) else if "%~1" neq "" (
+) else if "%1" neq "" (
    call :%*
 )

--- a/vendor/lib/lib_console.cmd
+++ b/vendor/lib/lib_console.cmd
@@ -14,7 +14,7 @@ if %fast_init% gtr %verbose_output% if %fast_init% gtr %debug_output% exit /b

 if "%~1" == "/h" (
    %lib_base% help "%~0"
-) else if "%~1" neq "" (
+) else if "%1" neq "" (
    call :%*
 )

--- a/vendor/lib/lib_git.cmd
+++ b/vendor/lib/lib_git.cmd
@@ -1,12 +1,12 @@
@echo off

 call "%~dp0lib_base.cmd"
-call "%~dp0lib_console.cmd"
+call "%%~dp0lib_console.cmd"
 set lib_git=call "%~dp0lib_git.cmd"

 if "%~1" == "/h" (
    %lib_base% help "%~0"
-) else if "%~1" neq "" (
+) else if "%1" neq "" (
    call :%*
 )

--- a/vendor/lib/lib_path.cmd
+++ b/vendor/lib/lib_path.cmd
@@ -1,12 +1,12 @@
@echo off

 call "%~dp0lib_base.cmd"
-call "%~dp0lib_console.cmd"
+call "%%~dp0lib_console"
 set lib_path=call "%~dp0lib_path.cmd"

 if "%~1" == "/h" (
    %lib_base% help "%~0"
-) else if "%~1" neq "" (
+) else if "%1" neq "" (
    call :%*
 )

@@ -48,7 +48,7 @@ exit /b
        set "add_path=%~1"
    ) else (
        %print_error% "You must specify a directory to add to the path!"
-        exit /b 1
+        exit 1
    )

    if "%~2" neq "" if /i "%~2" == "append" (
@@ -72,7 +72,7 @@ exit /b
            set "PATH=%add_to_path%;%PATH%"
        )
        goto :end_enhance_path
-    ) else if "%add_to_path%" equ "" (
+    ) else if "add_to_path" equ "" (
        goto :end_enhance_path
    )

@@ -84,20 +84,20 @@ exit /b

    setlocal enabledelayedexpansion
    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 INSIDE PATH !find_query! - found=!found!"

    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!"
@@ -119,8 +119,7 @@ exit /b
    :end_enhance_path
    set "PATH=%PATH:;;=;%"

-    REM echo %path%|wc -c
-
+    REM echo %path%|"C:\Users\dgames\cmder - dev\vendor\git-for-windows\usr\bin\wc" -c
    if "%fast_init%" == "1" exit /b

    if not "%OLD_PATH:~0,3000%" == "%OLD_PATH:~0,3001%" goto :toolong
@@ -128,22 +127,15 @@ exit /b
    exit /b

    :toolong
-        set "_rand=%RANDOM%"
-        if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" 2>nul 1>nul
-        if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
-        if exist "%temp%\%_rand%_cmder_lib_pathA" goto :toolong
-        if exist "%temp%\%_rand%_cmder_lib_pathB" goto :toolong
-        echo "%OLD_PATH%">"%temp%\%_rand%_cmder_lib_pathA"
-        if errorlevel 1 ( if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" & goto :toolong )
-        echo "%PATH%">"%temp%\%_rand%_cmder_lib_pathB"
-        if errorlevel 1 ( if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" & if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" & goto :toolong )
-        fc /b "%temp%\%_rand%_cmder_lib_pathA" "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
-        if errorlevel 1 ( del "%temp%\%_rand%_cmder_lib_pathA" & del "%temp%\%_rand%_cmder_lib_pathB" & set "_rand=" & goto :changed )
-        del "%temp%\%_rand%_cmder_lib_pathA" & del "%temp%\%_rand%_cmder_lib_pathB" & set "_rand="
+        echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
+        echo "%PATH%">"%temp%\cmder_lib_pathB"
+        fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
+        if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
+        del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
        exit /b

    :changed
-        %print_debug% :enhance_path "END Env Var - PATH=%PATH%"
+        %print_debug% :enhance_path "END Env Var - PATH=%path%"
        %print_debug% :enhance_path "Env Var %find_query% - found=%found%"
        exit /b

@@ -187,7 +179,7 @@ exit /b
        set "add_path=%~1"
    ) else (
        %print_error% "You must specify a directory to add to the path!"
-        exit /b 1
+        exit 1
    )

    set "depth=%~2"
--- a/vendor/lib/lib_profile.cmd
+++ b/vendor/lib/lib_profile.cmd
@@ -1,12 +1,12 @@
@echo off

 call "%~dp0lib_base.cmd"
-call "%~dp0lib_console.cmd"
+call "%%~dp0lib_console"
 set lib_profile=call "%~dp0lib_profile.cmd"

 if "%~1" == "/h" (
    %lib_base% help "%~0"
-) else if "%~1" neq "" (
+) else if "%1" neq "" (
    call :%*
 )

--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@@ -7,11 +7,15 @@

 $CMDER_INIT_START = Get-Date

-# Determine the script root if not already set
+# Compatibility with PS major versions <= 2
 if (!$PSScriptRoot) {
    $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path
 }

+if ($ENV:CMDER_USER_CONFIG) {
+    Write-Verbose "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
+}
+
 # We do this for Powershell as Admin Sessions because CMDER_ROOT is not being set.
 if (!$ENV:CMDER_ROOT) {
    if ($ENV:ConEmuDir) {
@@ -24,61 +28,40 @@ 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)

-# Enable Debug and Verbose output if CMDER_DEBUG environment variable is set to '1' or 'true'
-if ($env:CMDER_DEBUG -and ($env:CMDER_DEBUG -match '^(1|true)$')) {
-    $DebugPreference = 'Continue'
-    $VerbosePreference = 'Continue'
-}
-
 # 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) ) {
+if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ) {
    $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }

-if ($env:CMDER_USER_CONFIG) {
-    Write-Verbose "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
-}
+$gitVersionVendor = (readVersion -gitPath "$ENV:CMDER_ROOT\vendor\git-for-windows\cmd")
+Write-Debug "GIT VENDOR: ${gitVersionVendor}"

-# Read vendored Git Version
-$gitVendorPath = Join-Path $ENV:CMDER_ROOT 'vendor\git-for-windows\cmd'
-$gitVersionVendor = Get-GitVersion -GitPath $gitVendorPath
-if (-not [string]::IsNullOrEmpty($gitVersionVendor)) {
-    Write-Debug "GIT VENDOR: ${gitVersionVendor}"
-} else {
-    Write-Debug "GIT VENDOR is not present at '$gitVendorPath'"
-}
-
-# 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 USER PATH: $($git.Path)"
+    Write-Debug "GIT PATH: {$git.Path}"
    $gitDir = Split-Path -Path $git.Path
-    $gitDir = Get-GitShimPath -GitPath $gitDir
-    $gitVersionUser = Get-GitVersion -GitPath $gitDir
-    Write-Debug "GIT USER VERSION: ${gitVersionUser}"
+    $gitDir = isGitShim -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
    if ($null -eq $gitPathUser) {
-        Write-Debug "Detected Git from mingw bin directory"
-        Write-Debug "Git Dir: ${gitDir}"
        if ($gitDir -match '\\mingw32\\bin' -or $gitDir -match '\\mingw64\\bin') {
-            $gitPathUser = $gitDir.subString(0, $gitDir.Length - 12)
+            $gitPathUser = ($gitDir.subString(0,$gitDir.Length - 12))
        } else {
-            $gitPathUser = $gitDir.subString(0, $gitDir.Length - 4)
+            $gitPathUser = ($gitDir.subString(0,$gitDir.Length - 4))
        }
-        Write-Debug "Git Path User: ${gitDir}"
    }

    if ($useGitVersion -eq $gitVersionUser) {
@@ -89,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'
@@ -99,43 +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
-
-    # Invoked when Enter is pressed to submit a command
-    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 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
@@ -144,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"
 }

@@ -233,28 +196,6 @@ if ( $(Get-Command prompt).Definition -match 'PS \$\(\$executionContext.SessionS
    [ScriptBlock]$Prompt = {
        $lastSUCCESS = $?
        $realLastExitCode = $LastExitCode
-
-        # Terminal-specific escape sequences for Windows Terminal and ConEmu
-        if ($env:WT_SESSION -or $env:ConEmuPID) {
-            # Emit OSC 133;D to mark the end of command execution with exit code
-            if ($env:WT_SESSION) {
-                Microsoft.PowerShell.Utility\Write-Host -NoNewline "$([char]0x1B)]133;D;$realLastExitCode$([char]7)"
-            }
-
-            # Emit OSC 9;9 to enable directory tracking
-            # Enables "Duplicate Tab" and "Split Pane" to preserve the working directory
-            $loc = $executionContext.SessionState.Path.CurrentLocation
-            if ($loc.Provider.Name -eq "FileSystem") {
-                Microsoft.PowerShell.Utility\Write-Host -NoNewline "$([char]0x1B)]9;9;`"$($loc.ProviderPath)`"$([char]0x1B)\"
-            }
-
-            # Emit OSC 133;A to mark the start of the prompt
-            # Enables features like command navigation, selection, and visual separators
-            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)) {
@@ -263,12 +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 to mark 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 " "
    }
--- a/vendor/psmodules/Cmder.ps1
+++ b/vendor/psmodules/Cmder.ps1
@@ -1,250 +1,178 @@
-function Get-GitVersion {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$GitPath
-    )
+function readVersion($gitPath) {
+    $gitExecutable = "${gitPath}\git.exe"

-    $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 = & $gitExecutable --version 2>$null
+    $gitVersion = (cmd /c "${gitExecutable}" --version)

-    if ($gitVersion -match 'git version\s+(\S+)') {
-        return $Matches[1]
+    if ($gitVersion -match 'git version') {
+        ($trash1, $trash2, $gitVersion) = $gitVersion.split(' ', 3)
+    } else {
+        pause
+        return $null
    }

-    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"
-
-    return $null
+    return $gitVersion.toString()
 }

-function Get-GitShimPath {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$GitPath
-    )
-    # Check if there is a shim file - if yes, read the actual executable path
+function isGitShim($gitPath) {
+    # 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 $shimFile) {
-        $shimContent = Get-Content $shimFile -Raw
-        if ($shimContent -match '^\s*path\s*=\s*(.+)\s*$') {
-            $GitPath = $Matches[1].Trim().Replace('\git.exe', '')
-        }
+    if (Test-Path "${gitPath}\git.shim") {
+        $shim = (get-content "${gitPath}\git.shim")
+        ($trash, $gitPath) = $shim.replace(' ', '').split('=')
+
+        $gitPath = $gitPath.replace('\git.exe', '')
    }

-    return $GitPath
+    return $gitPath.toString()
 }

-function Compare-Version {
-    param(
-        [Parameter(Mandatory = $false)]
-        [AllowNull()]
-        [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
-            return 1
-        }
-        else {
-            # Both are text: use case-insensitive lexicographic comparison
-            $cmp = [string]::Compare($userPart, $vendorPart, $true)
-            if ($cmp -ne 0) { return [Math]::Sign($cmp) }
-        }
+function compareVersions($userVersion, $vendorVersion) {
+    if ($null -ne $userVersion) {
+        ($userMajor, $userMinor, $userPatch, $userBuild) = $userVersion.split('.', 4)
+    } else {
+        return -1
    }

+    if ($null -ne $vendorVersion) {
+        ($vendorMajor, $vendorMinor, $vendorPatch, $vendorBuild) = $vendorVersion.split('.', 4)
+    } else {
+        return 1
+    }
+
+    if (($userMajor -eq $vendorMajor) -and ($userMinor -eq $vendorMinor) -and ($userPatch -eq $vendorPatch) -and ($userBuild -eq $vendorBuild)) {
+        return 1
+    }
+
+    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 {
-    param(
-        [Parameter(Mandatory = $false)]
-        [AllowNull()]
-        [string]$UserVersion,
-        [Parameter(Mandatory = $false)]
-        [AllowNull()]
-        [string]$VendorVersion
-    )
+function compare_git_versions($userVersion, $vendorVersion) {
+    $result = compareVersions -userVersion $userVersion -vendorVersion $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 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$GitRoot,
-        [Parameter(Mandatory = $true)]
-        [string]$GitType,
-        [Parameter(Mandatory = $false)]
-        [string]$GitPathUser
-    )
-
+function Configure-Git($gitRoot, $gitType, $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') {
-        return $env:Path
-    }
-
-    $newPath = $env:Path
-
-    # Replace user Git path with vendored Git if user path exists
-    if ($GitPathUser) {
-        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
-    } else {
-        # Add Git cmd directory to the path
-        $gitCmd = Join-Path $GitRoot "cmd"
-        if (-not ($newPath -match [regex]::Escape($gitCmd))) {
-            Write-Debug "Adding $gitCmd to the path"
-            $newPath = "$gitCmd;$newPath"
+            $newPath = ($env:path -ireplace [regex]::Escape($gitPathUser), $gitRoot)
        }
+        else {
+            if (-not ($env:Path -match [regex]::Escape("$gitRoot\cmd"))) {
+                Write-Debug "Adding $gitRoot\cmd to the path"
+                $newPath = $($gitRoot + "\cmd" + ";" + $env:Path)
+            }

-        # Add mingw[32|64]\bin directories to the path, if they exist and not already present
-        # Prefer mingw64 on 64-bit systems, mingw32 on 32-bit systems
-        $is64Bit = [Environment]::Is64BitOperatingSystem
-        $mingwDirs = if ($is64Bit) { @('mingw64', 'mingw32') } else { @('mingw32') }
+            # 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"))) {
+                Write-Debug "Adding $gitRoot\mingw32\bin to the path"
+                $newPath = "$newPath;$gitRoot\mingw32\bin"
+            }
+            elseif ((Test-Path "$gitRoot\mingw64\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\mingw64\bin"))) {
+                Write-Debug "Adding $gitRoot\mingw64\bin to the path"
+                $newPath = "$newPath;$gitRoot\mingw64\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 "$gitRoot\usr\bin" to the path if exists and not done already
+            if ((Test-Path "$gitRoot\usr\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\usr\bin"))) {
+                Write-Debug "Adding $gitRoot\usr\bin to the path"
+                $newPath = "$newPath;$gitRoot\usr\bin"
            }
        }

-        # 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
    }

-    return $newPath
+    return $env:path
 }

-function Import-Git {
-    $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
+function Import-Git() {
+    $GitModule = Get-Module -Name Posh-Git -ListAvailable
+    if ($GitModule | Select-Object version | Where-Object version -le ([version]"0.6.1.20160330")) {
+        Import-Module Posh-Git > $null
    }
-
-    # Import posh-git module (works for all versions)
-    Import-Module Posh-Git -ErrorAction SilentlyContinue | Out-Null
-
-    # Apply version-specific settings for posh-git 1.0.0+
-    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 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$Path
-    )
-
+function checkGit($Path) {
    if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
        return
    }
-
-    $gitDir = Join-Path $Path '.git'
-    if (-not (Test-Path $gitDir)) {
-        $parentPath = Split-Path $Path
-        if ($parentPath) {
-            Show-GitStatus -Path $parentPath
-        }
+    if (-not (Test-Path -Path (Join-Path $Path '.git'))) {
+        $SplitPath = Split-Path $path
+        if ($SplitPath) { checkGit($SplitPath) }
        return
    }
-
-    if (Get-GitStatusSetting) {
+    if (getGitStatusSetting -eq $true) {
        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 {
-    $gitConfig = git --no-pager config -l 2>$null | Out-String
+function getGitStatusSetting() {
+    $gitStatus = (git --no-pager config -l) | Out-String

-    # Check if git status display is disabled via config
-    # Matches: cmder.status=false or cmder.psstatus=false (PowerShell-specific)
-    if ($gitConfig -match '(?m)^cmder\.(ps)?status=false$') {
-        return $false
+    foreach ($line in $($gitStatus -split "`r`n")) {
+        if (($line -match 'cmder.status=false') -or ($line -match 'cmder.psstatus=false')) {
+            return $false
+        }
    }

    return $true
--- a/vendor/sources.json
+++ b/vendor/sources.json
@@ -1,27 +1,22 @@
 [
  {
    "name": "git-for-windows",
-    "version": "2.51.2.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"
+    "version": "2.49.0.windows.1",
+    "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",
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip"
+    "version": "1.7.14",
+    "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"
-  },
-  {
-    "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"
+    "url": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
  },
  {
    "name": "clink-completions",
-    "version": "0.6.6",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip"
+    "version": "0.6.2",
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.2.zip"
  }
 ]
Author	SHA1	Message	Date
copilot-swe-agent[bot]	9d17a2f4cb	Fix PowerShell script inconsistencies and documentation errors Co-authored-by: DRSDavidSoft <4673812+DRSDavidSoft@users.noreply.github.com>	2025-08-12 03:02:05 +00:00
Copilot	5c072d47e4	Initial plan	2025-08-12 02:51:18 +00:00