Create SECURITY.md

.github/workflows/branches.yml

@@ -19,7 +19,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # fetch all history for all branches and tags
 

.github/workflows/build.yml

@@ -11,7 +11,7 @@ on:
     tags:
       - "v*"
   pull_request:
-    branches: [ "master", "development" ]
+    branches: [ "master" ]
 
 #---------------------------------#
 #    environment configuration    #
@@ -35,12 +35,12 @@ jobs:
       discussions: write
     steps:
     - name: Check out repository code (Action from GitHub)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v1
 
     - name: Build Cmder Launcher
       shell: pwsh
@@ -53,32 +53,32 @@ jobs:
       run: .\pack.ps1 -verbose
 
     - name: Upload artifact (cmder.zip)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v3
       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@v3
       with:
         path: build/cmder.7z
         name: cmder.7z
 
     - name: Upload artifact (cmder_mini.zip)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v3
       with:
         path: build/cmder_mini.zip
         name: cmder_mini.zip
 
     - name: Upload artifact (hashes.txt)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v3
       with:
         path: build/hashes.txt
         name: hashes.txt
 
     - name: Create Release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v1
       with:
         files: |
           build/cmder.zip

.github/workflows/codeql.yml

@@ -8,7 +8,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "development" ]
+    branches: [ "master" ]
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
@@ -16,7 +16,7 @@ on:
       - '**/.gitignore'
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "development" ]
+    branches: [ "master" ]
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
@@ -45,11 +45,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
         # queries: security-extended,security-and-quality
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v1
 
     - name: Build Cmder Launcher
       shell: pwsh
@@ -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@v2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/tests.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - development
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
@@ -13,7 +12,6 @@ on:
   pull_request:
     branches:
       - master
-      - development
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
@@ -38,7 +36,7 @@ jobs:
     continue-on-error: false
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Initialize vendors
       shell: pwsh
       working-directory: scripts
@@ -48,7 +46,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

.github/workflows/vendor.yml

@@ -24,7 +24,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -51,7 +51,7 @@ jobs:
           Set-GHVariable -Name LIST_UPDATED -Value $listUpdated.Trim(', ')
           echo "UPDATE_MESSAGE<<<EOF`n$updateMessage`n<EOF" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
 
-    - uses: peter-evans/create-pull-request@v7
+    - uses: peter-evans/create-pull-request@v5
       if: env.COUNT_UPDATED > 0
       with:
         title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies'

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

SECURITY.md

@@ -9,16 +9,14 @@
 
 ## Reporting a Vulnerability
 
-If you discover a security issue in our project, please report it to [MartiUK](https://github.com/MartiUK). We will acknowledge your email within 24 hours and provide a more detailed response within 48 hours. We will try to fix the issue as soon as possible and inform you when a new version is released.
+Please report any vulnerabilities to [MartiUK](https://github.com/MartiUK).
 
 Please include as much of the information listed below as you can to help us better understand and resolve the issue:
 
-- The nature of the issue
+The type of issue
-- The affected source file(s) with full paths
+Full paths of source file(s) related to the manifestation of the issue
-- The location of the vulnerable code (tag/branch/commit or direct URL)
+The location of the affected source code (tag/branch/commit or direct URL)
-- Any special configuration needed to reproduce the issue
+Any special configuration required to reproduce the issue
-- Detailed steps to reproduce the issue
+Step-by-step instructions to reproduce the issue
-- Proof-of-concept or exploit code (if possible)
+Proof-of-concept or exploit code (if possible)
-- The impact of the issue, including how an attacker could exploit it
+Impact of the issue, including how an attacker might exploit the issue
-
-Please do not disclose the vulnerability publicly until we have resolved it.

launcher/src/CmderLauncher.cpp

@@ -469,6 +469,9 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 		MessageBox(NULL, _T("Unable to create the ConEmu process!"), _T("Error"), MB_OK);
 		return;
 	}
+
+	LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL);
+	lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8
 }
 
 bool IsUserOnly(std::wstring opt)

launcher/src/version.rc2.sample

@@ -1,8 +1,9 @@
 
 /**
- * WARNING: This file should NOT be manually modified!
+ * WARNING: do NOT modify this file! the content of this file should be
- *          The contents will be automatically generated using the `.ps1` PowerShell scripts,
+ *          automatically genereted before AppVeyor builds using the
- *          during builds by the CI.
+ *          respective .ps1 Powershell scripts.
+ *
  */
 
 /////////////////////////////////////////////////////////////////////////////

scripts/build.ps1

@@ -27,7 +27,7 @@
 .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
@@ -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
@@ -79,7 +79,7 @@ if ($Compile) {
 
     Write-Verbose "Building the launcher..."
 
-    # Reference: https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+    # Referene: https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
     msbuild CmderLauncher.vcxproj /t:Clean,Build /p:configuration=Release /m
 
     if ($LastExitCode -ne 0) {

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

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,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")) {
+        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive") -and $info[0].tag_name) {
-            # Find the first release that matches our pre-release filtering criteria
+            for ($i = 0; $i -lt $p.Length; $i++) {
-            $selectedRelease = $null
+                if ($p[$i].Trim('/') -eq "archive") {
-            foreach ($release in $info) {
+                    $p[$i + 1] = $info[0].tag_name + ".zip"
-                # Apply the same filtering logic
+                    $downloadLinks = $url.Scheme + "://" + $url.Host + ($p -join '')
-                if (-not $includePrerelease -and (Test-IsPrerelease $release)) {
+                    return $downloadLinks
-                    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
-                    }
                 }
             }
         }
@@ -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"

scripts/utils.ps1

@@ -172,13 +172,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

vendor/bin/cmder_shell.cmd

@@ -9,5 +9,5 @@ if "%cmder_init%" == "1" (
 )
 
 pushd "%CMDER_ROOT%"
-call "%CMDER_ROOT%\vendor\init.bat" /f %*
+call "%CMDER_ROOT%\vendor\init.bat" /f
 popd

vendor/bin/excd.cmd

@@ -1,8 +1,6 @@
-@echo off
+@if "%~1"=="/?" (@cd %*)
-set excd=%*
+@set excd=%*
-set excd=%excd:"=%
+@set excd=%excd:"=%
-set excd_param=/d
+@if "%excd:~0,1%"=="~" (@set excd=%userprofile%\%excd:~1%)
-if /i "%excd:~0,2%"=="/d" set "excd=%excd:~2%"
+@if not "%~1"=="/d" (@set excd_param="/d") else (@set excd_param=)
-if "%excd:~0,1%"=="~" (set excd=%userprofile%\%excd:~1%)
+@cd %excd_param% "%excd%"
-if "%excd:~0,1%"=="/" (set excd_param=)
-cd %excd_param% %excd%

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/clink_settings.default

@@ -1,10 +1,6 @@
 # For explanation of these and other settings see:
 # https://chrisant996.github.io/clink/clink.html
 
-# name: Expand envvars when completing
-# type: boolean
-match.expand_envvars = True
-
 # name: Sets how command history expansion is applied
 # type: enum
 # options: off,on,not_squoted,not_dquoted,not_quoted

vendor/cmder_prompt_config.lua.default

@@ -38,20 +38,25 @@ 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
 -- Effects: https://github.com/cmderdev/cmder/wiki/Customization#list-of-effects
 --
--- Green:      "\x1b[1;32;49m"
+-- Green:      "\x1b[1;33;49m"
--- Yellow:     "\x1b[1;33;49m"
+-- Yellow:     "\x1b[1;32;49m"
 -- Light Grey: "\x1b[1;30;49m"
 
 -- Prompt Element Colors
-uah_color = "\x1b[1;33;49m" -- Yellow uah = [user]@[hostname]
+uah_color = "\x1b[1;33;49m" -- Green = uah = [user]@[hostname]
-cwd_color = "\x1b[1;32;49m" -- Green cwd = Current Working Directory
+cwd_color = "\x1b[1;32;49m" -- Yellow cwd = Current Working Directory
 lamb_color = "\x1b[1;30;49m" -- Light Grey = Lambda Color
 clean_color = "\x1b[37;1m"
 dirty_color = "\x1b[33;3m" -- Yellow, Italic
 conflict_color = "\x1b[31;1m" -- Red, Bold
-unknown_color = "\x1b[37;1m" -- White, Bold = No VCS Status Branch Color
+unknown_color = "\x1b[37;1m" -- White = No VCS Status Branch Color

vendor/git-prompt.sh

@@ -1,35 +1,26 @@
-# Returns 1 if git status for Cmder is disabled, otherwise returns 0
 function getGitStatusSetting() {
-  local gitConfig
+  gitStatusSetting=$(git --no-pager config -l 2>/dev/null)
 
-  # Get all git config entries for the current repository without pager
+  if [[ -n ${gitStatusSetting} ]] && [[ ${gitStatusSetting} =~ cmder.status=false ]] || [[ ${gitStatusSetting} =~ cmder.shstatus=false ]]
-  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') ]]
   then
-    return 1  # disabled
+    echo false
+  else
+    echo true
   fi
-
-  return 0
 }
 
-# Prints current branch or detached HEAD short commit hash
 function getSimpleGitBranch() {
-  local gitDir
+  gitDir=$(git rev-parse --git-dir 2>/dev/null)
-  gitDir=$(git rev-parse --git-dir 2>/dev/null) || return 0
+  if [ -z "$gitDir" ]; then
+    return 0
+  fi
 
-  local headFile="$gitDir/HEAD"
+  headContent=$(< "$gitDir/HEAD")
-  [ -f "$headFile" ] || return 0
+  if [[ "$headContent" == "ref: refs/heads/"* ]]
-
-  local headContent
-  headContent=$(< "$headFile")
-  if [[ "$headContent" =~ ^ref:\ refs/heads/(.+)$ ]]
   then
-    echo " (${BASH_REMATCH[1]})"
+    echo " (${headContent:16})"
   else
-    echo " (HEAD detached at ${headContent:0:7})"
+  echo " (HEAD detached at ${headContent:0:7})"
   fi
 }
 
@@ -42,50 +33,18 @@ fi
 
 if test -f ~/.config/git/git-prompt.sh
 then
-  if getGitStatusSetting
+  if [[ $(getGitStatusSetting) == true ]]
   then
     . ~/.config/git/git-prompt.sh
   fi
 else
-
+  PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
-  # Setup OSC 133 shell integration for Windows Terminal
+  # PS1="$PS1"'\n'                 # new line
-  if [ -n "$WT_SESSION" ]; then
+  PS1="$PS1"'\[\033[32m\]'       # change to green
-    __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
-  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)
+  # PS1="$PS1"'\[\033[35m\]'       # change to purple
-  PS1="$PS1"'\[\033[1;33m\]'     # change to dark yellow in bold
+  # PS1="$PS1"'$MSYSTEM '          # show MSYSTEM
+  PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
   PS1="$PS1"'\w'                 # current working directory
   if test -z "$WINELOADERNOEXEC"
   then
@@ -96,38 +55,20 @@ else
     if test -f "$COMPLETION_PATH/git-prompt.sh"
     then
       . "$COMPLETION_PATH/git-completion.bash"
-      if getGitStatusSetting
+      if [[ $(getGitStatusSetting) == true ]]
       then
         . "$COMPLETION_PATH/git-prompt.sh"
         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
   fi
-  PS1="$PS1"'\[\033[0m\]'        # reset color
+  PS1="$PS1"'\[\033[0m\]'        # change color
   PS1="$PS1"'\n'                 # new line
-  PS1="$PS1"'\[\033[30;1m\]'     # change color to grey in bold
+  PS1="$PS1"'λ '                 # prompt: always λ
-  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"
-then
-  for c in "$HOME"/bash_completion.d/*.bash
-  do
-    # Handle absence of any scripts (or the folder) gracefully
-    test ! -f "$c" ||
-    . "$c"
-  done
-fi

vendor/init.bat

@@ -223,9 +223,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
 
 :CLINK_FINISH
@@ -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"
         )
     )
@@ -429,7 +426,7 @@ if "%CMDER_ALIASES%" == "1" (
 )
 
 :: Add aliases to the environment
-type "%user_aliases%" | %WINDIR%\System32\findstr /b /l /i "history=cat " >nul
+type "%user_aliases%" | findstr /b /l /i "history=cat " >nul
 if "%ERRORLEVEL%" == "0" (
     echo Migrating alias 'history' to new Clink 1.x.x...
     call "%CMDER_ROOT%\vendor\bin\alias.cmd" /d history

vendor/lib/lib_base.cmd

@@ -4,14 +4,15 @@ set lib_base=call "%~dp0lib_base.cmd"
 
 if "%~1" == "/h" (
     %lib_base% help "%~0"
-) else if "%~1" neq "" (
+) else if "%1" neq "" (
     call :%*
 )
 
 exit /b
 
+:help
 :::===============================================================================
-:::help - shows all sub routines in a .bat/.cmd file with documentation
+:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
 :::.
 :::include:
 :::.
@@ -19,15 +20,16 @@ exit /b
 :::.
 :::usage:
 :::.
-:::       %lib_base% help "file"
+:::       %lib_base% show_subs "file"
 :::.
 :::options:
 :::.
 :::       file <in> full path to file containing lib_routines to display
+:::.
 :::-------------------------------------------------------------------------------
+    for /f "tokens=* delims=:" %%a in ('type "%~1" ^| %WINDIR%\System32\findstr /i /r "^:::"') do (
+        rem echo a="%%a"
 
-:help
-    for /f "tokens=* delims=:" %%a in ('%WINDIR%\System32\findstr /i /r "^:::" "%~1"') do (
         if "%%a"=="." (
             echo.
         ) else if /i "%%a" == "usage" (
@@ -42,13 +44,9 @@ exit /b
     pause
     exit /b
 
+:cmder_shell
 :::===============================================================================
-:::cmder_shell - Initializes the Cmder shell environment variables
+:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
-:::.
-:::description:
-:::.
-:::       This routine sets up the Cmder shell environment by detecting the
-:::       command shell and initializing related variables.
 :::.
 :::include:
 :::.
@@ -57,30 +55,15 @@ exit /b
 :::usage:
 :::.
 :::       %lib_base% cmder_shell
+:::.
+:::options:
+:::.
+:::       file <in> full path to file containing lib_routines to display
+:::.
 :::-------------------------------------------------------------------------------
-
-:cmder_shell
     call :detect_comspec %ComSpec%
     exit /b
 
-:::===============================================================================
-:::detect_comspec - Detects the command shell being used:::
-:::.
-:::description:
-:::.
-:::       This function sets the CMDER_SHELL variable to the name of the
-:::       detected command shell. It also initializes the CMDER_CLINK and
-:::       CMDER_ALIASES variables if they are not already defined.
-:::.
-:::include:
-:::.
-:::       call "lib_base.cmd"
-:::.
-:::usage:
-:::.
-:::       %lib_base% detect_comspec %ComSpec%
-:::-------------------------------------------------------------------------------
-
 :detect_comspec
     set CMDER_SHELL=%~n1
     if not defined CMDER_CLINK (
@@ -91,27 +74,6 @@ exit /b
     )
     exit /b
 
-:::===============================================================================
-:::update_legacy_aliases - Updates the legacy alias definitions in the user_aliases file
-:::.
-:::description:
-:::.
-:::       This function checks if the user_aliases file contains the marker
-:::       ";= Add aliases below here". If the marker is not found, it creates
-:::       an initial user_aliases store by copying the default user_aliases file
-:::       from the CMDER_ROOT directory. If the CMDER_USER_CONFIG environment
-:::       variable is defined, it creates a backup of the existing user_aliases
-:::       file before copying the default file.
-:::.
-:::include:
-:::.
-:::       call "lib_base.cmd"
-:::.
-:::usage:
-:::.
-:::       %lib_base% update_legacy_aliases
-:::-------------------------------------------------------------------------------
-
 :update_legacy_aliases
     type "%user_aliases%" | %WINDIR%\System32\findstr /i ";= Add aliases below here" >nul
     if "%errorlevel%" == "1" (

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 :%*
 )
 

vendor/lib/lib_git.cmd

@@ -1,17 +1,18 @@
 @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 :%*
 )
 
 exit /b
 
+:read_version
 :::===============================================================================
 :::read_version - Get the git.exe version
 :::.
@@ -33,7 +34,6 @@ exit /b
 :::  GIT_VERSION_[GIT SCOPE] <out> Env variable containing Git semantic version string
 :::-------------------------------------------------------------------------------
 
-:read_version
     :: clear the variables
     set GIT_VERSION_%~1=
 
@@ -55,7 +55,6 @@ exit /b
             set "GIT_VERSION=%%C"
         ) else (
             echo "'git --version' returned an improper version string!"
-            %print_debug% :read_version "returned string: '%%A %%B %%C' by executable path: %git_executable%"
             pause
             exit /b
         )
@@ -64,6 +63,7 @@ exit /b
 
     exit /b
 
+:parse_version
 :::===============================================================================
 :::parse_version - Parse semantic version string 'x.x.x.x' and return the pieces
 :::.
@@ -88,7 +88,6 @@ exit /b
 :::  [SCOPE]_BUILD <out> Scoped Build version.
 :::-------------------------------------------------------------------------------
 
-:parse_version
     :: process a `x.x.x.xxxx.x` formatted string
     %print_debug% :parse_version "ARGV[1]=%~1, ARGV[2]=%~2"
 
@@ -111,8 +110,9 @@ exit /b
 
 :endlocal_set_git_version
 
+:validate_version
 :::===============================================================================
-:::validate_version - Validate semantic version string 'x.x.x.x'
+:::validate_version - Validate semantic version string 'x.x.x.x'.
 :::.
 :::include:
 :::.
@@ -128,7 +128,6 @@ exit /b
 :::  [VERSION]   <in> Semantic version String. Ex: 1.2.3.4
 :::-------------------------------------------------------------------------------
 
-:validate_version
     :: now parse the version information into the corresponding variables
     %print_debug% :validate_version "ARGV[1]=%~1, ARGV[2]=%~2"
 
@@ -143,8 +142,9 @@ exit /b
     )
     exit /b
 
+:compare_versions
 :::===============================================================================
-:::compare_version - Compare semantic versions and return latest version
+:::compare_version - Compare semantic versions return latest version.
 :::.
 :::include:
 :::.
@@ -160,7 +160,6 @@ exit /b
 :::  [SCOPE2]    <in> Example: VENDOR
 :::-------------------------------------------------------------------------------
 
-:compare_versions
     :: checks all major, minor, patch and build variables for the given arguments.
     :: whichever binary that has the most recent version will be used based on the return code.
 
@@ -185,12 +184,7 @@ exit /b
     endlocal & exit /b 0
 
 :::===============================================================================
-:::is_git_shim - Check if the directory has a git.shim file
+:::is_git_shim
-:::.
-:::description:
-:::.
-:::  Shim is a small helper program for Scoop that calls the executable configured in git.shim file
-:::  See: github.com/ScoopInstaller/Shim and github.com/cmderdev/cmder/pull/1905
 :::.
 :::include:
 :::.
@@ -207,7 +201,7 @@ exit /b
 
 :is_git_shim
     pushd "%~1"
-    :: check if there is a shim file - if yes, read the actual executable path
+    :: check if there's shim - and if yes follow the path
     setlocal enabledelayedexpansion
     if exist git.shim (
         for /F "tokens=2 delims== " %%I in (git.shim) do (
@@ -224,7 +218,7 @@ exit /b
     exit /b
 
 :::===============================================================================
-:::compare_git_versions - Compare the user git version against the vendored version
+:::compare_git_versions
 :::.
 :::include:
 :::.
@@ -258,7 +252,7 @@ exit /b
         :: if the user provided git executable is not found
         IF ERRORLEVEL -255 IF NOT ERRORLEVEL -254 (
         :: if not exist "%git_executable%" (
-            %print_debug% ":compare_git_versions" "No git at '%git_executable%' found."
+            %print_debug% ":compare_git_versions" "No git at "%git_executable%" found."
             set test_dir=
         )
     )
@@ -267,7 +261,7 @@ exit /b
     exit /b
 
 :::===============================================================================
-:::get_user_git_version - Get the version information for the user provided git binary
+:::get_user_git_version - get the version information for the user provided git binary
 :::.
 :::include:
 :::.
@@ -283,4 +277,5 @@ exit /b
     %lib_git% read_version USER "%test_dir%" 2>nul
     %print_debug% ":get_user_git_version" "get_user_git_version GIT_VERSION_USER: %GIT_VERSION_USER%"
     %lib_git% validate_version USER %GIT_VERSION_USER%
-    exit /b
+    exit  /b
+

vendor/lib/lib_path.cmd

@@ -1,22 +1,16 @@
 @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 :%*
 )
 
-setlocal enabledelayedexpansion
-if not defined find_pathext (
-    set "find_pathext=!PATHEXT:;= !"
-    set "find_pathext=!find_pathext:.=\.!"
-)
-endlocal & set "find_pathext=%find_pathext%"
-
 exit /b
 
 :enhance_path
@@ -38,17 +32,18 @@ exit /b
 :::options:
 :::
 :::  append     <in> Append to the path env variable rather than pre-pend.
-:::
+::B
 :::
 :::output:
 :::
 :::  path       <out> Sets the path env variable if required.
 :::-------------------------------------------------------------------------------
+
     if "%~1" neq "" (
         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" (
@@ -57,8 +52,7 @@ exit /b
         set "position="
     )
 
-    dir "%add_path%" 2>NUL | findstr -i -e "%find_pathext%" >NUL
+    dir "%add_path%" | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
-
     if "%ERRORLEVEL%" == "0" (
         set "add_to_path=%add_path%"
     ) else (
@@ -72,7 +66,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,23 +78,23 @@ 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!"
+    %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!"
+        %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!"
+        %print_debug%  :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!"
     )
     endlocal & set found=%found%
 
@@ -119,8 +113,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,27 +121,21 @@ exit /b
     exit /b
 
     :toolong
-        set "_rand=%RANDOM%"
+        echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
-        if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" 2>nul 1>nul
+        echo "%PATH%">"%temp%\cmder_lib_pathB"
-        if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
+        fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
-        if exist "%temp%\%_rand%_cmder_lib_pathA" goto :toolong
+        if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
-        if exist "%temp%\%_rand%_cmder_lib_pathB" goto :toolong
+        del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
-        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="
         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%"
+        %print_debug%  :enhance_path "Env Var %find_query% - found=%found%"
         exit /b
 
     exit /b
 
+
 :set_found
     if "%ERRORLEVEL%" == "0" (
         set found=1
@@ -187,7 +174,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"
@@ -199,7 +186,7 @@ exit /b
         set "position="
     )
 
-    dir "%add_path%" 2>NUL | findstr -i -e "%find_pathext%" >NUL
+    dir "%add_path%" 2>NUL | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
 
     if "%ERRORLEVEL%" == "0" (
         set "add_to_path=%add_path%"
@@ -218,10 +205,10 @@ exit /b
         exit /b
     )
 
-    %print_debug% :enhance_path_recursive "Env Var - add_path=%add_to_path%"
+    %print_debug%  :enhance_path_recursive "Env Var - add_path=%add_to_path%"
-    %print_debug% :enhance_path_recursive "Env Var - position=%position%"
+    %print_debug%  :enhance_path_recursive "Env Var - position=%position%"
-    %print_debug% :enhance_path_recursive "Env Var - depth=%depth%"
+    %print_debug%  :enhance_path_recursive "Env Var - depth=%depth%"
-    %print_debug% :enhance_path_recursive "Env Var - max_depth=%max_depth%"
+    %print_debug%  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
 
     if %max_depth% gtr %depth% (
         if "%add_to_path%" neq "" (
@@ -236,7 +223,7 @@ exit /b
 
     exit /b
 
-:set_depth
+: set_depth
     set /a "depth=%depth%+1"
     exit /b
 
@@ -246,9 +233,10 @@ exit /b
     )
 
     for /d %%i in ("%add_path%\*") do (
-        %print_debug% :enhance_path_recursive "Env Var BEFORE - depth=%depth%"
+        %print_debug%  :enhance_path_recursive "Env Var BEFORE - depth=%depth%"
         %print_debug% :enhance_path_recursive "Found Subdirectory - '%%~fi'"
         call :enhance_path_recursive "%%~fi" %depth% %max_depth% %position%
-        %print_debug% :enhance_path_recursive "Env Var AFTER- depth=%depth%"
+        %print_debug%  :enhance_path_recursive "Env Var AFTER- depth=%depth%"
     )
     exit /b
+

vendor/lib/lib_profile.cmd

@@ -1,37 +1,37 @@
 @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 :%*
 )
 
 exit /b
 
+:run_profile_d
 :::===============================================================================
-:::run_profile_d - Run all scripts in the passed directory path
+:::run_profile_d - Run all scripts in the passed dir path
-:::.
+:::
 :::include:
-:::.
+:::
 :::  call "lib_profile.cmd"
-:::.
+:::
 :::usage:
-:::.
+:::
 :::  %lib_profile% "[dir_path]"
-:::.
+:::
 :::required:
-:::.
+:::
 :::  [dir_path] <in> Fully qualified directory path containing init *.cmd|*.bat.
 :::                  Example: "c:\bin"
-:::.
+:::
 :::  path       <out> Sets the path env variable if required.
 :::-------------------------------------------------------------------------------
 
-:run_profile_d
     if not exist "%~1" (
         mkdir "%~1"
     )
@@ -43,3 +43,4 @@ exit /b
     )
     popd
     exit /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) {
+$gitVersionVendor = (readVersion -gitPath "$ENV:CMDER_ROOT\vendor\git-for-windows\cmd")
-    Write-Verbose "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
+Write-Debug "GIT VENDOR: ${gitVersionVendor}"
-}
 
-# Read vendored Git Version
+# Get user installed Git Version[s] and Compare with vendored if found.
-$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.
 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
+    $gitDir = isGitShim -gitPath $gitDir
-    $gitVersionUser = Get-GitVersion -GitPath $gitDir
+    $gitVersionUser = (readVersion -gitPath $gitDir)
-    Write-Debug "GIT USER VERSION: ${gitVersionUser}"
+    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 " "
     }

vendor/psmodules/Cmder.ps1

@@ -1,250 +1,177 @@
-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+)') {
+    if ($gitVersion -match 'git version') {
-        return $Matches[1]
+        ($trash1, $trash2, $gitVersion) = $gitVersion.split(' ', 3)
+    } else {
+        pause
+        return $null
     }
 
-    Write-Debug "Git executable path: $gitExecutable"
+    return $gitVersion.toString()
-    Write-Error "'git --version' returned an improper version string!"
-    Write-Error "Unable to determine Git version from output: $gitVersion"
-
-    return $null
 }
 
-function Get-GitShimPath {
+function isGitShim($gitPath) {
-    param(
+    # check if there's shim - and if yes follow the path
-        [Parameter(Mandatory = $true)]
-        [string]$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 "${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,
+        return -1
-        [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) }
-        }
     }
 
+    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 {
+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
-    }
-
-    $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"
         }
+        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
+            # Add "$gitRoot\mingw[32|64]\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\mingw32\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\mingw32\bin"))) {
-        $is64Bit = [Environment]::Is64BitOperatingSystem
+                Write-Debug "Adding $gitRoot\mingw32\bin to the path"
-        $mingwDirs = if ($is64Bit) { @('mingw64', 'mingw32') } else { @('mingw32') }
+                $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) {
+            # Add "$gitRoot\usr\bin" to the path if exists and not done already
-            $mingwBin = Join-Path $GitRoot "$mingw\bin"
+            if ((Test-Path "$gitRoot\usr\bin") -and -not ($env:path -match [regex]::Escape("$gitRoot\usr\bin"))) {
-            if ((Test-Path $mingwBin) -and -not ($newPath -match [regex]::Escape($mingwBin))) {
+                Write-Debug "Adding $gitRoot\usr\bin to the path"
-                Write-Debug "Adding $mingwBin to the path"
+                $newPath = "$newPath;$gitRoot\usr\bin"
-                $newPath = "$newPath;$mingwBin"
-                break
             }
         }
 
-        # Add usr\bin directory to the path
+        return $newPath
-        $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 $env:path
 }
 
-function Import-Git {
+function Import-Git() {
-    $gitModule = Get-Module -Name Posh-Git -ListAvailable
+    $GitModule = Get-Module -Name Posh-Git -ListAvailable
-
+    if ($GitModule | Select-Object version | Where-Object version -le ([version]"0.6.1.20160330")) {
-    if (-not $gitModule) {
+        Import-Module Posh-Git > $null
-        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
     }
-
+    if ($GitModule | Select-Object version | Where-Object version -ge ([version]"1.0.0")) {
-    # Import posh-git module (works for all versions)
+        Import-Module Posh-Git > $null
-    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)) {
         $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'
+    else {
-        if (Test-Path $headFile) {
+        $headContent = Get-Content (Join-Path $Path '.git/HEAD')
-            $headContent = Get-Content $headFile -Raw
+        if ($headContent -like "ref: refs/heads/*") {
-            if ($headContent -match 'ref: refs/heads/(.+)') {
+            $branchName = $headContent.Substring(16)
-                $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 {
+            $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 $false
+        }
     }
 
     return $true

vendor/sources.json

@@ -1,27 +1,22 @@
 [
   {
     "name": "git-for-windows",
-    "version": "2.51.2.windows.1",
+    "version": "2.41.0.windows.3",
-    "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.41.0.windows.3/PortableGit-2.41.0.3-64-bit.7z.exe"
   },
   {
     "name": "clink",
-    "version": "1.8.8",
+    "version": "1.5.1",
-    "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.5.1/clink.1.5.1.1e9e51.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.4.10",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip"
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.10.zip"
   }
 ]