Add fallback to detect CMDER_ROOT from script location

Co-authored-by: DRSDavidSoft <4673812+DRSDavidSoft@users.noreply.github.com>

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

.github/workflows/codeql.yml

@@ -3,20 +3,25 @@
 #
 # You may wish to alter this file to override the set of languages analyzed,
 # or to provide custom queries or build logic.
-#
+
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "development" ]
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+      - '.github/**'
+      - '**/.gitignore'
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "master", "development" ]
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+      - '.github/**'
+      - '**/.gitignore'
   schedule:
     - cron: '30 19 * * 0'
 
@@ -40,11 +45,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +60,7 @@ jobs:
         # queries: security-extended,security-and-quality
 
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1
+      uses: microsoft/setup-msbuild@v2
 
     - name: Build Cmder Launcher
       shell: pwsh
@@ -63,6 +68,6 @@ jobs:
       run: .\build.ps1 -Compile -verbose
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/tests.yml

@@ -4,9 +4,21 @@ on:
   push:
     branches:
       - master
+      - development
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+      - '.github/**'
+      - '**/.gitignore'
   pull_request:
     branches:
       - master
+      - development
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+      - '.github/**'
+      - '**/.gitignore'
 
 defaults:
   run:
@@ -26,7 +38,7 @@ jobs:
     continue-on-error: false
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
     - name: Initialize vendors
       shell: pwsh
       working-directory: scripts
@@ -36,7 +48,7 @@ jobs:
           cmd /c vendor\init.bat /v /d /t
     - name: Testing PowerShell
       run: |
-          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "Invoke-Expression '. ''vendor\profile.ps1'''"
+          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$env:CMDER_DEBUG='1'; . '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@v3
+    - uses: actions/checkout@v5
       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@v5
+    - uses: peter-evans/create-pull-request@v7
       if: env.COUNT_UPDATED > 0
       with:
         title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies'

README.md

@@ -352,6 +352,10 @@ 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

@@ -0,0 +1,24 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.3.x   | :white_check_mark: |
+| < 1.3   | ❎ |
+
+## 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 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 affected source file(s) with full paths
+- The location of the vulnerable code (tag/branch/commit or direct URL)
+- Any special configuration needed to reproduce the issue
+- Detailed steps to reproduce the issue
+- Proof-of-concept or exploit code (if possible)
+- The impact of the issue, including how an attacker could exploit it
+
+Please do not disclose the vulnerability publicly until we have resolved it.

launcher/src/CmderLauncher.cpp

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

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..."
 
-    # Referene: https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+    # Reference: 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,7 +32,11 @@ 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.
@@ -79,11 +83,39 @@ 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
@@ -127,6 +159,13 @@ 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
         }
@@ -164,12 +203,26 @@ function Fetch-DownloadUrl {
 
     # Special case for archive downloads of repository
     if (($null -eq $downloadLinks) -or (-not $downloadLinks)) {
-        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive") -and $info[0].tag_name) {
+        if ((($p | ForEach-Object { $_.Trim('/') }) -contains "archive")) {
-            for ($i = 0; $i -lt $p.Length; $i++) {
+            # Find the first release that matches our pre-release filtering criteria
-                if ($p[$i].Trim('/') -eq "archive") {
+            $selectedRelease = $null
-                    $p[$i + 1] = $info[0].tag_name + ".zip"
+            foreach ($release in $info) {
-                    $downloadLinks = $url.Scheme + "://" + $url.Host + ($p -join '')
+                # Apply the same filtering logic
-                    return $downloadLinks
+                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
+                    }
                 }
             }
         }
@@ -215,7 +268,7 @@ foreach ($s in $sources) {
 
     Write-Verbose "Old Link: $($s.url)"
 
-    $downloadUrl = Fetch-DownloadUrl $s.url
+    $downloadUrl = Fetch-DownloadUrl $s.url -includePrerelease $IncludePrerelease
 
     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,6 +1,8 @@
-@if "%~1"=="/?" (@cd %*)
+@echo off
-@set excd=%*
+set excd=%*
-@set excd=%excd:"=%
+set excd=%excd:"=%
-@if "%excd:~0,1%"=="~" (@set excd=%userprofile%\%excd:~1%)
+set excd_param=/d
-@if not "%~1"=="/d" (@set excd_param="/d") else (@set excd_param=)
+if /i "%excd:~0,2%"=="/d" set "excd=%excd:~2%"
-@cd %excd_param% "%excd%"
+if "%excd:~0,1%"=="~" (set excd=%userprofile%\%excd:~1%)
+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 prompt_overrideSvnStatusOptIn
+-- luacheck: globals prompt_overrideGitStatusOptIn
 -- luacheck: globals clink io.popenyield os.isdir settings.get
 
 -- At first, load the original clink.lua file
@@ -51,11 +51,37 @@ local function get_unknown_color()
 end
 
 ---
--- Makes a string safe to use as the replacement in string.gsub
+-- Escapes special characters in a string.gsub `find` parameter, so that it
+-- can be matched as a literal plain text string, i.e. disable Lua pattern
+-- matching.  See "Patterns" (https://www.lua.org/manual/5.2/manual.html#6.4.1).
+-- @param {string} text Text to escape
+-- @returns {string} Escaped text
 ---
-local function verbatim(s)
+local function escape_gsub_find_arg(text)
-    s = string.gsub(s, "%%", "%%%%")
+    return text and text:gsub("([-+*?.%%()%[%]$^])", "%%%1") or ""
-    return s
+end
+
+---
+-- Escapes special characters in a string.gsub `replace` parameter, so that it
+-- can be replaced as a literal plain text string, i.e. disable Lua pattern
+-- matching.  See "Patterns" (https://www.lua.org/manual/5.2/manual.html#6.4.1).
+-- @param {string} text Text to escape
+-- @returns {string} Escaped text
+---
+local function escape_gsub_replace_arg(text)
+    return text and text:gsub("%%", "%%%%") or ""
+end
+
+---
+-- Perform string.sub, but disable Lua pattern matching and just treat both
+-- the `find` and `replace` parameters as a literal plain text replacement.
+-- @param {string} str Text in which to perform find and replace
+-- @param {string} find Text to find (plain text; not a Lua pattern)
+-- @param {string} replace Replacement text (plain text; not a Lua pattern)
+-- @returns {string} Copy of the input `str` with `find` replaced by `replace`
+---
+local function gsub_plain(str, find, replace)
+    return string.gsub(str, escape_gsub_find_arg(find), escape_gsub_replace_arg(replace))
 end
 
 -- Extracts only the folder name from the input Path
@@ -153,7 +179,7 @@ local function set_prompt_filter()
     end
 
     if prompt_useHomeSymbol and string.find(cwd, clink.get_env("HOME")) then
-        cwd = string.gsub(cwd, clink.get_env("HOME"), prompt_homeSymbol)
+        cwd = gsub_plain(cwd, clink.get_env("HOME"), prompt_homeSymbol)
     end
 
     local uah = ''
@@ -176,14 +202,14 @@ local function set_prompt_filter()
     local version_control = prompt_includeVersionControl and "{git}{hg}{svn}" or ""
 
     local prompt = "{uah}{cwd}" .. version_control .. cr .. get_lamb_color() .. "{env}{lamb}\x1b[0m "
-    prompt = string.gsub(prompt, "{uah}", uah)
+    prompt = gsub_plain(prompt, "{uah}", uah)
-    prompt = string.gsub(prompt, "{cwd}", cwd)
+    prompt = gsub_plain(prompt, "{cwd}", cwd)
-    prompt = string.gsub(prompt, "{env}", env)
+    prompt = gsub_plain(prompt, "{env}", env)
-    clink.prompt.value = string.gsub(prompt, "{lamb}", prompt_lambSymbol)
+    clink.prompt.value = gsub_plain(prompt, "{lamb}", prompt_lambSymbol)
 end
 
 local function percent_prompt_filter()
-    clink.prompt.value = string.gsub(clink.prompt.value, "{percent}", "%%")
+    clink.prompt.value = gsub_plain(clink.prompt.value, "{percent}", "%")
 end
 
 ---
@@ -324,13 +350,8 @@ end
 -- @return {false|mercurial branch information}
 ---
 local function get_hg_branch()
-    -- Return the branch information. The default is to get just the
+    -- Return the branch information.
-    -- branch name, but you could e.g. use the "hg-prompt" extension to
+    local file = io.popen("hg branch 2>nul")
-    -- 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
@@ -398,12 +419,33 @@ 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")
+    local file = io_popenyield("svn status -q 2>nul")
     if not file then
         return { error = true }
     end
@@ -494,14 +536,6 @@ 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
@@ -521,27 +555,40 @@ local function git_prompt_filter()
             local gitConflict = gitInfo.conflict
 
             if gitStatus == nil then
-                color = colors.nostatus
+                color = get_unknown_color()
             elseif gitStatus then
-                color = colors.clean
+                color = get_clean_color()
             else
-                color = colors.dirty
+                color = get_dirty_color()
             end
 
             if gitConflict then
-                color = colors.conflict
+                color = get_conflict_color()
             end
 
-            clink.prompt.value = string.gsub(clink.prompt.value, "{git}", " "..color.."("..verbatim(branch)..")")
+            local result = " "..color.."("..branch..")"
+            clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", result)
             return false
         end
     end
 
     -- No git present or not in git file
-    clink.prompt.value = string.gsub(clink.prompt.value, "{git}", "")
+    clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", "")
     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.
@@ -551,39 +598,48 @@ local function hg_prompt_filter()
 
     local hg_dir = get_hg_dir()
     if hg_dir then
-        -- Colors for mercurial status
+        local branch = get_hg_branch()
-        local colors = {
+        if branch and
-            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
-            local color = colors.clean
+            -- 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
-            local pipe = io.popen("hg status -amrd 2>&1")
+                cached_info.hg_info = nil
-            if pipe then
+                cached_info.hg_dir = hg_dir
-                output = pipe:read('*all')
+                cached_info.hg_branch = branch
-                pipe:close()
-                if output ~= nil and output ~= "" then color = colors.dirty end
             end
 
-            local result = color .. "(" .. branch .. ")"
+            local hgInfo = get_hg_info_table()
-            clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", " "..verbatim(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
 
     -- No hg present or not in hg repo
-    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", "")
+    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()
@@ -593,13 +649,6 @@ 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
@@ -611,38 +660,25 @@ 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 svnStatus
+            local svnInfo = get_svn_info_table()
-            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 svnStatus or svnStatus.error then
+            if not svnInfo or svnInfo.error then
-                color = colors.nostatus
+                color = get_unknown_color()
-            elseif svnStatus.clean then
+            elseif svnInfo.clean then
-                color = colors.clean
+                color = get_clean_color()
             else
-                color = colors.dirty
+                color = get_dirty_color()
             end
 
-            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", " "..color.."("..verbatim(branch)..")")
+            clink.prompt.value = gsub_plain(clink.prompt.value, "{svn}", " "..color.."("..branch..")")
             return false
         end
     end
 
     -- No svn present or not in svn file
-    clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", "")
+    clink.prompt.value = gsub_plain(clink.prompt.value, "{svn}", "")
     return false
 end
 

vendor/clink_settings.default

@@ -1,6 +1,10 @@
 # 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.sh

@@ -1,3 +1,4 @@
+#!/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,
@@ -7,93 +8,130 @@
 # Add system specific users customizations to $HOME/.bashrc, these
 # customizations will not follow Cmder to another machine.
 
-function runProfiled {
+# Source all .sh scripts in a given directory
-  unset profile_d_scripts
+# Args: $1 - directory path containing .sh scripts to source
-  pushd "${1}" >/dev/null
+run_profile_d() {
+  local profile_d_scripts
+  pushd "${1}" >/dev/null || return
+  # shellcheck disable=SC2035
   profile_d_scripts=$(ls *.sh 2>/dev/null)
 
-  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+  if [ -n "${profile_d_scripts}" ]; then
-    for x in ${profile_d_scripts} ; do
+    for script in ${profile_d_scripts}; do
-      # echo Sourcing "${1}/${x}"...
+      # echo Sourcing "${1}/${script}"...
-      . "${1}/${x}"
+      # shellcheck disable=SC1090
+      . "${1}/${script}"
     done
   fi
-  popd >/dev/null
+  popd >/dev/null || return
 }
 
-# We do this for bash as admin sessions since $CMDER_ROOT is not being set
+# Detect and set CMDER_ROOT for bash admin sessions
-if [ "$CMDER_ROOT" == "" ] ; then
+# Converts Windows paths to Unix paths if needed
-    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
+# 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
 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 '/'
+# Remove any trailing '/' from CMDER_ROOT
-CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::')
+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
 
 export CMDER_ROOT
 
-if [ -f "/c/Program Files/Git/cmd/git.exe" ] ; then
+# Detect Git installation location
+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
+elif [ -f "${CMDER_ROOT}/vendor/git-for-windows/cmd/git.exe" ]; then
-    GIT_INSTALL_ROOT=${CMDER_ROOT}/vendor/git-for-windows
+    GIT_INSTALL_ROOT="${CMDER_ROOT}/vendor/git-for-windows"
 fi
 
-if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then
+# Add Git to PATH if not already present
+if [[ -n "${GIT_INSTALL_ROOT}" && ! "$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
 
-# Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
+# Create profile.d directory if it doesn't exist
-# to source them at startup.
+if [ ! -d "${CMDER_ROOT}/config/profile.d" ]; then
-if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
   mkdir -p "${CMDER_ROOT}/config/profile.d"
 fi
 
-if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
+# Source all .sh scripts in profile.d directories
-  runProfiled  "${CMDER_ROOT}/config/profile.d"
+if [ -d "${CMDER_ROOT}/config/profile.d" ]; then
+  run_profile_d "${CMDER_ROOT}/config/profile.d"
 fi
 
-if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
+if [ -d "${CMDER_USER_CONFIG}/profile.d" ]; then
-  runProfiled  "${CMDER_USER_CONFIG}/profile.d"
+  run_profile_d "${CMDER_USER_CONFIG}/profile.d"
 fi
 
 
-# Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+# Rename legacy user-profile.sh to user_profile.sh for consistency
-if [ -f "$CMDER_ROOT/config/user-profile.sh" ] ; then
+if [ -f "$CMDER_ROOT/config/user-profile.sh" ]; then
   mv "$CMDER_ROOT/config/user-profile.sh" "$CMDER_ROOT/config/user_profile.sh"
 fi
 
-CmderUserProfilePath="${CMDER_ROOT}/config/user_profile.sh"
+# Source user profile from CMDER_ROOT config
-if [ -f "${CMDER_ROOT}/config/user_profile.sh" ] ; then
+if [ -f "${CMDER_ROOT}/config/user_profile.sh" ]; then
     . "${CMDER_ROOT}/config/user_profile.sh"
 fi
 
-if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+# Handle CMDER_USER_CONFIG if set
-  # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+if [ -n "${CMDER_USER_CONFIG}" ]; then
-  if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ] ; then
+  # Rename legacy 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"
 
-  CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
+  # Source user profile from CMDER_USER_CONFIG
-  if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
+  if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ]; then
+    # shellcheck disable=SC1091
     . "${CMDER_USER_CONFIG}/user_profile.sh"
   fi
 fi
 
-if [ ! -f "${CmderUserProfilePath}" ] ; then
+# Determine the user profile path for creation if needed
-    echo Creating user startup file: "${CmderUserProfilePath}"
+if [ -n "${CMDER_USER_CONFIG}" ]; then
-    cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${CmderUserProfilePath}"
+  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}"
 fi
 
 # Source the users .bashrc file if it exists
-if [ -f "${HOME}/.bashrc" ] ; then
+if [ -f "${HOME}/.bashrc" ]; then
+    # shellcheck disable=SC1091
     . "${HOME}/.bashrc"
 fi

vendor/cmder_exinit

@@ -1,3 +1,4 @@
+#!/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
@@ -22,92 +23,130 @@
 # # from outside Cmder.
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
 
-function runProfiled {
+# Source all .sh or .zsh scripts in a given directory based on shell type
-  unset profile_d_scripts
+# Args: $1 - directory path containing shell scripts to source
-  pushd "${1}" >/dev/null
+run_profile_d() {
+  local profile_d_scripts
+  pushd "${1}" >/dev/null || return
 
-  if [ ! "x${ZSH_VERSION}" = "x"  ]; then
+  if [ -n "${ZSH_VERSION}" ]; then
+    # shellcheck disable=SC2035
     profile_d_scripts=$(ls *.zsh 2>/dev/null)
-  elif [ ! "x${BASH_VERSION}" = "x"  ]; then
+  elif [ -n "${BASH_VERSION}" ]; then
+    # shellcheck disable=SC2035
     profile_d_scripts=$(ls *.sh 2>/dev/null)
   fi
 
-  if [ ! "x${profile_d_scripts}" = "x" ] ; then
+  if [ -n "${profile_d_scripts}" ]; then
-    for x in ${profile_d_scripts} ; do
+    for script in ${profile_d_scripts}; do
-      echo Sourcing "${1}/${x}"...
+      echo "Sourcing ${1}/${script}..."
-      . "${1}/${x}"
+      # shellcheck disable=SC1090
+      . "${1}/${script}"
     done
   fi
-  popd >/dev/null
+  popd >/dev/null || return
 }
 
-# Check that we haven't already been sourced.
+# Check that we haven't already been sourced
 [[ -z ${CMDER_EXINIT} ]] && CMDER_EXINIT="1" || return
 
-# We do this for bash as admin sessions since $CMDER_ROOT is not being set
+# Detect and set CMDER_ROOT for bash admin sessions
-if [ "$CMDER_ROOT" = "" -a "$ConEmuDir" != "" ] ; then
+# Converts Windows paths to Unix paths if needed
-  if [ -d "${ConEmuDir}../../vendor" ] ; then
+# ConEmuDir is set by ConEmu/Cmder environment
-    case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac
+if [ -z "$CMDER_ROOT" ] && [ -n "$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 [ "$CMDER_ROOT" != "" ] ; then
+elif [ -n "$CMDER_ROOT" ]; then
-  case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac
+  case "$CMDER_ROOT" in 
+    *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";;
+  esac
 fi
 
-if [ ! "$CMDER_ROOT" = "" ] ; then
+# If CMDER_ROOT is still not set, try to derive from script location
-  # Remove any trailing '/'
+# Note: This only works if cmder_exinit is in its original location (vendor/)
-  CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::')
+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
 
-  echo "Using \"CMDER_ROOT\" at \"${CMDER_ROOT}\"."
+if [ -n "$CMDER_ROOT" ]; then
+  # Remove any trailing '/' from CMDER_ROOT
+  CMDER_ROOT="${CMDER_ROOT%/}"
+
+  echo "Using CMDER_ROOT at \"${CMDER_ROOT}\"."
 
   export CMDER_ROOT
 
-  PATH=${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}
+  # Add Cmder directories to PATH
+  PATH="${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}"
 
   export PATH
 
-  # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
+  # Create profile.d directory if it doesn't exist
-  # to source them at startup.
+  if [ ! -d "${CMDER_ROOT}/config/profile.d" ]; then
-  if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
     mkdir -p "${CMDER_ROOT}/config/profile.d"
   fi
 
-  if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
+  # Source all shell scripts in profile.d directories
-    runProfiled  "${CMDER_ROOT}/config/profile.d"
+  if [ -d "${CMDER_ROOT}/config/profile.d" ]; then
+    run_profile_d "${CMDER_ROOT}/config/profile.d"
   fi
 
-  if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
+  if [ -d "${CMDER_USER_CONFIG}/profile.d" ]; then
-    runProfiled  "${CMDER_USER_CONFIG}/profile.d"
+    run_profile_d "${CMDER_USER_CONFIG}/profile.d"
   fi
 
 
-  # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+  # Rename legacy user-profile.sh to user_profile.sh for consistency
-  if [ -f "$CMDER_ROOT/config/user-profile.sh" ] ; then
+  if [ -f "$CMDER_ROOT/config/user-profile.sh" ]; then
     mv "$CMDER_ROOT/config/user-profile.sh" "$CMDER_ROOT/config/user_profile.sh"
   fi
 
-  CmderUserProfilePath="${CMDER_ROOT}/config/user_profile.sh"
+  # Source user profile from CMDER_ROOT config
-  if [ -f "${CMDER_ROOT}/config/user_profile.sh" ] ; then
+  if [ -f "${CMDER_ROOT}/config/user_profile.sh" ]; then
+      # shellcheck disable=SC1091
       . "${CMDER_ROOT}/config/user_profile.sh"
   fi
 
-  if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+  # Handle CMDER_USER_CONFIG if set
-    # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+  if [ -n "${CMDER_USER_CONFIG}" ]; then
-    if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ] ; then
+    # Rename legacy 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"
 
-    CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
+    # Source user profile from CMDER_USER_CONFIG
-    if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
+    if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ]; then
+      # shellcheck disable=SC1091
       . "${CMDER_USER_CONFIG}/user_profile.sh"
     fi
   fi
 
-  if [ ! -f "${CmderUserProfilePath}" ] ; then
+  # Determine the user profile path for creation if needed
-      echo Creating user startup file: "${CmderUserProfilePath}"
+  if [ -n "${CMDER_USER_CONFIG}" ]; then
-      cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${CmderUserProfilePath}"
+    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}"
   fi
 fi

vendor/cmder_prompt_config.lua.default

@@ -38,25 +38,20 @@ 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;33;49m"
+-- Green:      "\x1b[1;32;49m"
--- Yellow:     "\x1b[1;32;49m"
+-- Yellow:     "\x1b[1;33;49m"
 -- Light Grey: "\x1b[1;30;49m"
 
 -- Prompt Element Colors
-uah_color = "\x1b[1;33;49m" -- Green = uah = [user]@[hostname]
+uah_color = "\x1b[1;33;49m" -- Yellow uah = [user]@[hostname]
-cwd_color = "\x1b[1;32;49m" -- Yellow cwd = Current Working Directory
+cwd_color = "\x1b[1;32;49m" -- Green 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 = No VCS Status Branch Color
+unknown_color = "\x1b[37;1m" -- White, Bold = No VCS Status Branch Color

vendor/git-prompt.sh

@@ -1,26 +1,35 @@
+# Returns 1 if git status for Cmder is disabled, otherwise returns 0
 function getGitStatusSetting() {
-  gitStatusSetting=$(git --no-pager config -l 2>/dev/null)
+  local gitConfig
 
-  if [[ -n ${gitStatusSetting} ]] && [[ ${gitStatusSetting} =~ cmder.status=false ]] || [[ ${gitStatusSetting} =~ cmder.shstatus=false ]]
+  # 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') ]]
   then
-    echo false
+    return 1  # disabled
-  else
-    echo true
   fi
+
+  return 0
 }
 
+# Prints current branch or detached HEAD short commit hash
 function getSimpleGitBranch() {
-  gitDir=$(git rev-parse --git-dir 2>/dev/null)
+  local gitDir
-  if [ -z "$gitDir" ]; then
+  gitDir=$(git rev-parse --git-dir 2>/dev/null) || return 0
-    return 0
-  fi
 
-  headContent=$(< "$gitDir/HEAD")
+  local headFile="$gitDir/HEAD"
-  if [[ "$headContent" == "ref: refs/heads/"* ]]
+  [ -f "$headFile" ] || return 0
+
+  local headContent
+  headContent=$(< "$headFile")
+  if [[ "$headContent" =~ ^ref:\ refs/heads/(.+)$ ]]
   then
-    echo " (${headContent:16})"
+    echo " (${BASH_REMATCH[1]})"
   else
-  echo " (HEAD detached at ${headContent:0:7})"
+    echo " (HEAD detached at ${headContent:0:7})"
   fi
 }
 
@@ -33,18 +42,50 @@ fi
 
 if test -f ~/.config/git/git-prompt.sh
 then
-  if [[ $(getGitStatusSetting) == true ]]
+  if getGitStatusSetting
   then
     . ~/.config/git/git-prompt.sh
   fi
 else
-  PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
+
-  # PS1="$PS1"'\n'                 # new line
+  # Setup OSC 133 shell integration for Windows Terminal
-  PS1="$PS1"'\[\033[32m\]'       # change to green
+  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
+  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"'\[\033[35m\]'       # change to purple
+  PS1="$PS1${MSYSTEM:+\[\033[35m\]$MSYSTEM }" # show MSYSTEM in purple (if set)
-  # PS1="$PS1"'$MSYSTEM '          # show MSYSTEM
+  PS1="$PS1"'\[\033[1;33m\]'     # change to dark yellow in bold
-  PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
   PS1="$PS1"'\w'                 # current working directory
   if test -z "$WINELOADERNOEXEC"
   then
@@ -55,20 +96,38 @@ else
     if test -f "$COMPLETION_PATH/git-prompt.sh"
     then
       . "$COMPLETION_PATH/git-completion.bash"
-      if [[ $(getGitStatusSetting) == true ]]
+      if getGitStatusSetting
       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\]'        # change color
+  PS1="$PS1"'\[\033[0m\]'        # reset color
   PS1="$PS1"'\n'                 # new line
-  PS1="$PS1"'λ '                 # prompt: always λ
+  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"
+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,6 +223,9 @@ 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
@@ -355,7 +358,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"
         )
     )
@@ -426,7 +429,7 @@ if "%CMDER_ALIASES%" == "1" (
 )
 
 :: Add aliases to the environment
-type "%user_aliases%" | findstr /b /l /i "history=cat " >nul
+type "%user_aliases%" | %WINDIR%\System32\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,15 +4,14 @@ 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
 :::===============================================================================
-:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
+:::help - shows all sub routines in a .bat/.cmd file with documentation
 :::.
 :::include:
 :::.
@@ -20,16 +19,15 @@ exit /b
 :::.
 :::usage:
 :::.
-:::       %lib_base% show_subs "file"
+:::       %lib_base% help "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" (
@@ -44,9 +42,13 @@ exit /b
     pause
     exit /b
 
-:cmder_shell
 :::===============================================================================
-:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
+:::cmder_shell - Initializes the Cmder shell environment variables
+:::.
+:::description:
+:::.
+:::       This routine sets up the Cmder shell environment by detecting the
+:::       command shell and initializing related variables.
 :::.
 :::include:
 :::.
@@ -55,15 +57,30 @@ 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 (
@@ -74,6 +91,27 @@ 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,18 +1,17 @@
 @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
 :::.
@@ -34,6 +33,7 @@ exit /b
 :::  GIT_VERSION_[GIT SCOPE] <out> Env variable containing Git semantic version string
 :::-------------------------------------------------------------------------------
 
+:read_version
     :: clear the variables
     set GIT_VERSION_%~1=
 
@@ -55,6 +55,7 @@ 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
         )
@@ -63,7 +64,6 @@ exit /b
 
     exit /b
 
-:parse_version
 :::===============================================================================
 :::parse_version - Parse semantic version string 'x.x.x.x' and return the pieces
 :::.
@@ -88,6 +88,7 @@ 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"
 
@@ -110,9 +111,8 @@ 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,6 +128,7 @@ 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"
 
@@ -142,9 +143,8 @@ exit /b
     )
     exit /b
 
-:compare_versions
 :::===============================================================================
-:::compare_version - Compare semantic versions return latest version.
+:::compare_version - Compare semantic versions and return latest version
 :::.
 :::include:
 :::.
@@ -160,6 +160,7 @@ 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.
 
@@ -184,7 +185,12 @@ exit /b
     endlocal & exit /b 0
 
 :::===============================================================================
-:::is_git_shim
+:::is_git_shim - Check if the directory has a git.shim file
+:::.
+:::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:
 :::.
@@ -201,7 +207,7 @@ exit /b
 
 :is_git_shim
     pushd "%~1"
-    :: check if there's shim - and if yes follow the path
+    :: check if there is a shim file - if yes, read the actual executable path
     setlocal enabledelayedexpansion
     if exist git.shim (
         for /F "tokens=2 delims== " %%I in (git.shim) do (
@@ -218,7 +224,7 @@ exit /b
     exit /b
 
 :::===============================================================================
-:::compare_git_versions
+:::compare_git_versions - Compare the user git version against the vendored version
 :::.
 :::include:
 :::.
@@ -252,7 +258,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=
         )
     )
@@ -261,7 +267,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:
 :::.
@@ -277,5 +283,4 @@ 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,16 +1,22 @@
 @echo off
 
-
 call "%~dp0lib_base.cmd"
-call "%%~dp0lib_console"
+call "%~dp0lib_console.cmd"
 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
@@ -32,18 +38,17 @@ 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 1
+        exit /b 1
     )
 
     if "%~2" neq "" if /i "%~2" == "append" (
@@ -52,7 +57,8 @@ exit /b
         set "position="
     )
 
-    dir "%add_path%" | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
+    dir "%add_path%" 2>NUL | findstr -i -e "%find_pathext%" >NUL
+
     if "%ERRORLEVEL%" == "0" (
         set "add_to_path=%add_path%"
     ) else (
@@ -66,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
     )
 
@@ -78,23 +84,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%
 
@@ -113,7 +119,8 @@ exit /b
     :end_enhance_path
     set "PATH=%PATH:;;=;%"
 
-    REM echo %path%|"C:\Users\dgames\cmder - dev\vendor\git-for-windows\usr\bin\wc" -c
+    REM echo %path%|wc -c
+
     if "%fast_init%" == "1" exit /b
 
     if not "%OLD_PATH:~0,3000%" == "%OLD_PATH:~0,3001%" goto :toolong
@@ -121,21 +128,27 @@ exit /b
     exit /b
 
     :toolong
-        echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
+        set "_rand=%RANDOM%"
-        echo "%PATH%">"%temp%\cmder_lib_pathB"
+        if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" 2>nul 1>nul
-        fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
+        if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
-        if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
+        if exist "%temp%\%_rand%_cmder_lib_pathA" goto :toolong
-        del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
+        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="
         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
@@ -174,7 +187,7 @@ exit /b
         set "add_path=%~1"
     ) else (
         %print_error% "You must specify a directory to add to the path!"
-        exit 1
+        exit /b 1
     )
 
     set "depth=%~2"
@@ -186,7 +199,7 @@ exit /b
         set "position="
     )
 
-    dir "%add_path%" 2>NUL | findstr -i "\.COM \.EXE \.BAT \.CMD \.PS1 \.VBS" >NUL
+    dir "%add_path%" 2>NUL | findstr -i -e "%find_pathext%" >NUL
 
     if "%ERRORLEVEL%" == "0" (
         set "add_to_path=%add_path%"
@@ -205,10 +218,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 "" (
@@ -223,7 +236,7 @@ exit /b
 
     exit /b
 
-: set_depth
+:set_depth
     set /a "depth=%depth%+1"
     exit /b
 
@@ -233,10 +246,9 @@ 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"
+call "%~dp0lib_console.cmd"
 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 dir path
+:::run_profile_d - Run all scripts in the passed directory 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,4 +43,3 @@ exit /b
     )
     popd
     exit /b
-

vendor/profile.ps1

@@ -7,15 +7,11 @@
 
 $CMDER_INIT_START = Get-Date
 
-# Compatibility with PS major versions <= 2
+# Determine the script root if not already set
 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) {
@@ -28,40 +24,61 @@ 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
 
-if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ) {
+# Configure PSModulePath to include Cmder modules if not already present
+if (-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ) {
     $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }
 
-$gitVersionVendor = (readVersion -gitPath "$ENV:CMDER_ROOT\vendor\git-for-windows\cmd")
+if ($env:CMDER_USER_CONFIG) {
-Write-Debug "GIT VENDOR: ${gitVersionVendor}"
+    Write-Verbose "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '$ENV:CMDER_USER_CONFIG'!"
+}
 
-# Get user installed Git Version[s] and Compare with vendored if found.
+# 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.
 foreach ($git in (Get-Command -ErrorAction SilentlyContinue 'git')) {
-    Write-Debug "GIT PATH: {$git.Path}"
+    Write-Debug "GIT USER PATH: $($git.Path)"
     $gitDir = Split-Path -Path $git.Path
-    $gitDir = isGitShim -gitPath $gitDir
+    $gitDir = Get-GitShimPath -GitPath $gitDir
-    $gitVersionUser = (readVersion -gitPath $gitDir)
+    $gitVersionUser = Get-GitVersion -GitPath $gitDir
-    Write-Debug "GIT USER: ${gitVersionUser}"
+    Write-Debug "GIT USER VERSION: ${gitVersionUser}"
 
-    $useGitVersion = compare_git_versions -userVersion $gitVersionUser -vendorVersion $gitVersionVendor
+    $useGitVersion = Compare-GitVersion -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) {
@@ -72,7 +89,7 @@ foreach ($git in (Get-Command -ErrorAction SilentlyContinue 'git')) {
     }
 }
 
-# User vendored Git.
+# Use vendored Git if no user Git found or user Git is older than 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'
@@ -82,23 +99,43 @@ 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 = Configure-Git -gitRoot "$ENV:GIT_INSTALL_ROOT" -gitType $ENV:GIT_INSTALL_TYPE -gitPathUser $gitPathUser
+    $env:Path = Set-GitPath -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
@@ -107,7 +144,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
-    checkGit($pwd.ProviderPath)
+    Show-GitStatus -Path $pwd.ProviderPath
     Microsoft.PowerShell.Utility\Write-Host "`nλ" -NoNewLine -ForegroundColor "DarkGray"
 }
 
@@ -196,6 +233,28 @@ 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)) {
@@ -204,6 +263,12 @@ 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,177 +1,250 @@
-function readVersion($gitPath) {
+function Get-GitVersion {
-    $gitExecutable = "${gitPath}\git.exe"
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$GitPath
+    )
 
-    if (-not (Test-Path "$gitExecutable")) {
+    $gitExecutable = Join-Path $GitPath "git.exe"
+
+    if (-not (Test-Path $gitExecutable)) {
         return $null
     }
 
-    $gitVersion = (cmd /c "${gitExecutable}" --version)
+    # Execute 'git --version' and capture output
+    $gitVersion = & $gitExecutable --version 2>$null
 
-    if ($gitVersion -match 'git version') {
+    if ($gitVersion -match 'git version\s+(\S+)') {
-        ($trash1, $trash2, $gitVersion) = $gitVersion.split(' ', 3)
+        return $Matches[1]
-    } else {
-        pause
-        return $null
     }
 
-    return $gitVersion.toString()
+    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
 }
 
-function isGitShim($gitPath) {
+function Get-GitShimPath {
-    # check if there's shim - and if yes follow the path
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$GitPath
+    )
+    # Check if there is a shim file - if yes, read the actual executable path
+    # See: github.com/ScoopInstaller/Shim
 
-    if (Test-Path "${gitPath}\git.shim") {
+    $shimFile = Join-Path $GitPath "git.shim"
-        $shim = (get-content "${gitPath}\git.shim")
+    if (Test-Path $shimFile) {
-        ($trash, $gitPath) = $shim.replace(' ', '').split('=')
+        $shimContent = Get-Content $shimFile -Raw
-
+        if ($shimContent -match '^\s*path\s*=\s*(.+)\s*$') {
-        $gitPath = $gitPath.replace('\git.exe', '')
+            $GitPath = $Matches[1].Trim().Replace('\git.exe', '')
+        }
     }
 
-    return $gitPath.toString()
+    return $GitPath
 }
 
-function compareVersions($userVersion, $vendorVersion) {
+function Compare-Version {
-    if ($null -ne $userVersion) {
+    param(
-        ($userMajor, $userMinor, $userPatch, $userBuild) = $userVersion.split('.', 4)
+        [Parameter(Mandatory = $false)]
-    } else {
+        [AllowNull()]
-        return -1
+        [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) }
+        }
     }
 
-    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_git_versions($userVersion, $vendorVersion) {
+function Compare-GitVersion {
-    $result = compareVersions -userVersion $userVersion -vendorVersion $vendorVersion
+    param(
+        [Parameter(Mandatory = $false)]
+        [AllowNull()]
+        [string]$UserVersion,
+        [Parameter(Mandatory = $false)]
+        [AllowNull()]
+        [string]$VendorVersion
+    )
 
-    Write-Debug "Compare Versions Result: ${result}"
+    $result = Compare-Version -UserVersion $UserVersion -VendorVersion $VendorVersion
+
+    Write-Debug "Compare Versions Result: $result"
     if ($result -ge 0) {
-        return $userVersion
+        return $UserVersion
-    }
-    else {
-        return $vendorVersion
     }
+    return $VendorVersion
 }
 
-function Configure-Git($gitRoot, $gitType, $gitPathUser) {
+function Set-GitPath {
+    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..."
 
-            $newPath = ($env:path -ireplace [regex]::Escape($gitPathUser), $gitRoot)
+    if ($GitType -ne 'VENDOR') {
-        }
+        return $env:Path
-        else {
-            if (-not ($env:Path -match [regex]::Escape("$gitRoot\cmd"))) {
-                Write-Debug "Adding $gitRoot\cmd to the path"
-                $newPath = $($gitRoot + "\cmd" + ";" + $env:Path)
-            }
-
-            # 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"
-            }
-
-            # 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"
-            }
-        }
-
-        return $newPath
     }
 
-    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"
+        }
+
+        # 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') }
+
+        foreach ($mingw in $mingwDirs) {
+            $mingwBin = Join-Path $GitRoot "$mingw\bin"
+            if ((Test-Path $mingwBin) -and -not ($newPath -match [regex]::Escape($mingwBin))) {
+                Write-Debug "Adding $mingwBin to the path"
+                $newPath = "$newPath;$mingwBin"
+                break
+            }
+        }
+
+        # Add usr\bin directory to the path
+        $usrBin = Join-Path $GitRoot "usr\bin"
+        if ((Test-Path $usrBin) -and -not ($newPath -match [regex]::Escape($usrBin))) {
+            Write-Debug "Adding $usrBin to the path"
+            $newPath = "$newPath;$usrBin"
+        }
+    }
+
+    return $newPath
 }
 
-function Import-Git() {
+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")) {
+
-        Import-Module Posh-Git > $null
+    if (-not $gitModule) {
-    }
+        Microsoft.PowerShell.Utility\Write-Host -NoNewline "`r`n"
-    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"
+        Microsoft.PowerShell.Utility\Write-Host -NoNewline "`r$([char]0x1B)[A"
         return $false
     }
-    # Make sure we only run once by always returning true
+
+    # 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)) {
+        $GitPromptSettings.AnsiConsole = $false
+    }
+
     return $true
 }
 
-function checkGit($Path) {
+function Show-GitStatus {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$Path
+    )
+
     if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
         return
     }
-    if (-not (Test-Path -Path (Join-Path $Path '.git'))) {
+
-        $SplitPath = Split-Path $path
+    $gitDir = Join-Path $Path '.git'
-        if ($SplitPath) { checkGit($SplitPath) }
+    if (-not (Test-Path $gitDir)) {
+        $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 {
-    else {
+        $headFile = Join-Path $gitDir 'HEAD'
-        $headContent = Get-Content (Join-Path $Path '.git/HEAD')
+        if (Test-Path $headFile) {
-        if ($headContent -like "ref: refs/heads/*") {
+            $headContent = Get-Content $headFile -Raw
-            $branchName = $headContent.Substring(16)
+            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 {
-            $branchName = "HEAD detached at $($headContent.Substring(0, 7))"
-        }
-        Write-Host " [$branchName]" -NoNewline -ForegroundColor White
     }
 }
 
-function getGitStatusSetting() {
+function Get-GitStatusSetting {
-    $gitStatus = (git --no-pager config -l) | Out-String
+    $gitConfig = git --no-pager config -l 2>$null | Out-String
 
-    foreach ($line in $($gitStatus -split "`r`n")) {
+    # Check if git status display is disabled via config
-        if (($line -match 'cmder.status=false') -or ($line -match 'cmder.psstatus=false')) {
+    # Matches: cmder.status=false or cmder.psstatus=false (PowerShell-specific)
-            return $false
+    if ($gitConfig -match '(?m)^cmder\.(ps)?status=false$') {
-        }
+        return $false
     }
 
     return $true

vendor/sources.json

@@ -1,22 +1,27 @@
 [
   {
     "name": "git-for-windows",
-    "version": "2.41.0.windows.3",
+    "version": "2.51.2.windows.1",
-    "url": "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/PortableGit-2.41.0.3-64-bit.7z.exe"
+    "url": "https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/PortableGit-2.51.2-64-bit.7z.exe"
   },
   {
     "name": "clink",
-    "version": "1.5.1",
+    "version": "1.8.8",
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.5.1/clink.1.5.1.1e9e51.zip"
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip"
   },
   {
     "name": "conemu-maximus5",
     "version": "23.07.24",
-    "url": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
+    "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"
   },
   {
     "name": "clink-completions",
-    "version": "0.4.10",
+    "version": "0.6.6",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.10.zip"
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip"
   }
 ]