cleanup

.github/workflows/branches.yml

@@ -1,33 +0,0 @@
-name: Update branches
-
-# Controls when the action will run.
-on:
-  # Triggers the workflow on push events for the development branch
-  push:
-    branches: [ master ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This job updates the development branch with the master branch
-  update-development:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # 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
-        with:
-          fetch-depth: 0 # fetch all history for all branches and tags
-
-      # Runs a single command using the runners shell
-      - name: Merge master into development
-        run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
-          git checkout development
-          git merge --no-ff master
-          git push origin development

.github/workflows/build.yml

@@ -11,7 +11,7 @@ on:
     tags:
       - "v*"
   pull_request:
-    branches: [ "master", "development" ]
+    branches: [ "master" ]
 
 #---------------------------------#
 #    environment configuration    #
@@ -30,17 +30,15 @@ jobs:
   build:
     name: Build Project
     runs-on: windows-latest
-    permissions:
-      contents: write
-      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 +51,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

@@ -3,25 +3,20 @@
 #
 # 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", "development" ]
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-      - '.github/**'
-      - '**/.gitignore'
+    branches: [ "master" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "development" ]
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-      - '.github/**'
-      - '**/.gitignore'
+    branches: [ "master" ]
   schedule:
     - cron: '30 19 * * 0'
 
@@ -45,11 +40,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 +55,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 +63,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,21 +4,9 @@ on:
   push:
     branches:
       - master
-      - development
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-      - '.github/**'
-      - '**/.gitignore'
   pull_request:
     branches:
       - master
-      - development
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.txt'
-      - '.github/**'
-      - '**/.gitignore'
 
 defaults:
   run:
@@ -38,7 +26,7 @@ jobs:
     continue-on-error: false
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v3
     - name: Initialize vendors
       shell: pwsh
       working-directory: scripts

.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@v4
       if: env.COUNT_UPDATED > 0
       with:
         title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies'

.gitignore

@@ -31,3 +31,4 @@ launcher/src/version.rc2
 .vs/*
 .vscode
 .idea
+.vagrant/

README.md

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

SECURITY.md

@@ -1,24 +0,0 @@
-# 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.

Vagrantfile

@@ -0,0 +1,64 @@
+Vagrant.configure("2") do |config|
+  required_plugins = %w( vagrant-vbguest )
+  required_plugins.each do |plugin|
+    system "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin
+  end
+
+  # config.vbguest.iso_path = "../../../../usr/share/virtualbox/VBoxGuestAdditions.iso"
+  config.vbguest.allow_downgrade = true
+
+  config.vm.define "cmderdev-10" do |win10|
+    win10.vm.hostname = "cmderdev-10"
+    win10.vm.box = "cmderdev-10"
+
+    # win10.vm.network :private_network, ip: "192.168.56.101"
+
+    win10.vm.provider :virtualbox do |v|
+      # v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+      v.customize ["modifyvm", :id, "--name", "cmderdev-10"]
+      v.customize ["modifyvm", :id, "--ostype", "Windows10_64"]
+      v.customize ["modifyvm", :id, "--graphicscontroller", "vboxsvga"]
+      v.customize ["modifyvm", :id, "--memory", 8192]
+      v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
+      #v.customize ["setextradata", :id, "GUI/ScaleFactor", "1.75"]
+    end
+  end
+
+  config.vm.define "cmderdev-11" do |win11|
+    win11.vm.hostname = "cmderdev-11"
+    win11.vm.box = "cmderdev-11"
+
+    # win11.vm.network :private_network, ip: "192.168.56.111"
+
+    win11.vm.provider :virtualbox do |v|
+      # v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+      v.customize ["modifyvm", :id, "--name", "cmderdev-11"]
+      v.customize ["modifyvm", :id, "--ostype", "Windows11_64"]
+      v.customize ["modifyvm", :id, "--graphicscontroller", "vboxvga"]
+      v.customize ["modifyvm", :id, "--memory", 8192]
+      v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
+      #v.customize ["setextradata", :id, "GUI/ScaleFactor", "1.75"]
+    end
+  end
+
+  config.vm.define "cmderdev-10-pro-scaled" do |cmderdev|
+    cmderdev.vm.hostname = 'cmderdev-10-pro'
+    cmderdev.vm.box = "cmderdev-10"
+
+    cmderdev.vm.provider :virtualbox do |v|
+      # v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+      v.customize ["modifyvm", :id, "--name", "cmderdev-pro"]
+      v.customize ["modifyvm", :id, "--graphicscontroller", "vboxsvga"]
+      v.customize ["modifyvm", :id, "--memory", 8192]
+      v.customize ["modifyvm", :id, "--clipboard", "bidirectional"]
+      v.customize ["setextradata", :id, "GUI/ScaleFactor", "1.75"]
+    end
+  end
+
+  config.vm.provision "file", source: "./scripts/vagrant/windows_terminal_settings.json.default", destination: "windows_terminal_settings.json.default"
+  config.vm.provision "file", source: "./scripts/vagrant/windows_terminal_state.json.default", destination: "windows_terminal_state.json.default"
+  config.vm.provision "shell", path: './scripts/vagrant/add-cmder.ps1'
+  config.vm.provision "shell", path: './vendor/bin/add-vscodeprofile.ps1'
+  config.vm.provision "shell", path: './vendor/bin/add-windowsterminalprofiles.ps1'
+  config.vm.provision "shell", path: './vendor/bin/add-cmdertodesktop.ps1'
+end

appveyor.yml

@@ -0,0 +1,60 @@
+#---------------------------------#
+#      general configuration      #
+#---------------------------------#
+
+version: 1.0.{build}-{branch}
+
+# branches to build
+branches:
+  # blacklist
+  except:
+    - gh-pages
+
+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+# Operating system (build VM template)
+os: Visual Studio 2022
+
+#---------------------------------#
+#       build configuration       #
+#---------------------------------#
+
+build_script:
+  - ps: cd scripts; .\build.ps1 -Compile -verbose
+
+after_build:
+  - ps: .\pack.ps1 -verbose
+
+# Disable test search, since we don't have any.
+test: off
+
+#---------------------------------#
+#           artifacts             #
+#---------------------------------#
+
+artifacts:
+  - path: build\cmder.zip
+    name: cmderzip
+
+  - path: build\cmder.7z
+    name: cmder7z
+
+  - path: build\cmder_mini.zip
+    name: cmdermini
+
+  - path: build\hashes.txt
+    name: hashes
+
+#---------------------------------#
+#         notifications           #
+#---------------------------------#
+
+notifications:
+  # Webhook
+  - provider: Webhook
+    url: https://webhooks.gitter.im/e/d673abb1b2e659dcd625
+    on_build_success: true
+    on_build_failure: true
+    on_build_status_changed: true

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

scripts/build.ps1

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

scripts/vagrant/add-cmder.ps1

@@ -0,0 +1,40 @@
+choco install -y --force 7zip 7zip.install
+choco install -y --force cmder
+
+$env:path = "$env:path;c:/tools/cmder/vendor/git-for-windows/cmd"
+c:
+cd $env:userprofile
+git clone https://github.com/cmderdev/cmder cmderdev
+write-host "USERNAME: $env:USERNAME"
+
+if ("$env:USERNAME" -eq "vagrant" -and -not (test-path "$env:userprofile/cmderdev/vendor/git-for-windows")) {
+  invoke-expression -command "TAKEOWN /F `"$env:userprofile/cmderdev`" /R /D y /s localhost /u vagrant /p vagrant"
+}
+
+cd cmderdev
+git checkout vagrant
+git pull origin vagrant
+git remote add upstream  https://github.com/cmderdev/cmder
+git pull upstream master
+
+# cmd.exe "/K" '"C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvars64.bat" && powershell -command "& ''$env:userprofile/cmderdev/scripts/build.ps1'' -verbose -compile" && exit'
+# copy $env:userprofile/cmderdev/launcher/x64/release/cmder.exe $env:userprofile/cmderdev
+# cmd.exe "/K" '"C:/Program Files (x86)/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvars64.bat" && powershell -noexit -command "& ''build.ps1 -verbose -compile''"'
+
+cd scripts
+./build.ps1 -verbose
+
+copy C:/Tools/Cmder/Cmder.exe $env:userprofile/cmderdev
+
+# tabby
+setx cmder_root "${env:userprofile}\cmderdev"
+
+# C:\Users\vagrant\AppData\Roaming\Hyper
+#         // shell: '',
+#         shell: 'cmd.exe',
+#         // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`)
+#         // by default `['--login']` will be used
+#         // shellArgs: ['--login'],
+#         shellArgs: ['/k', 'C:\\users\\vagrant\\cmderdev\\vendor\\init.bat'],
+
+

scripts/vagrant/windows_terminal_settings.json.default

@@ -0,0 +1,283 @@
+{
+    "$help": "https://aka.ms/terminal-documentation",
+    "$schema": "https://aka.ms/terminal-profiles-schema",
+    "actions": 
+    [
+        {
+            "command": 
+            {
+                "action": "copy",
+                "singleLine": false
+            },
+            "keys": "ctrl+c"
+        },
+        {
+            "command": "paste",
+            "keys": "ctrl+v"
+        },
+        {
+            "command": "find",
+            "keys": "ctrl+shift+f"
+        },
+        {
+            "command": 
+            {
+                "action": "splitPane",
+                "split": "auto",
+                "splitMode": "duplicate"
+            },
+            "keys": "alt+shift+d"
+        }
+    ],
+    "copyFormatting": "none",
+    "copyOnSelect": false,
+    "defaultProfile": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "profiles": 
+    {
+        "defaults": {},
+        "list": 
+        [
+            {
+                "commandline": "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "hidden": false,
+                "name": "Windows PowerShell"
+            },
+            {
+                "commandline": "%SystemRoot%\\System32\\cmd.exe",
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "hidden": false,
+                "name": "Command Prompt"
+            },
+            {
+                "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
+                "hidden": false,
+                "name": "Azure Cloud Shell",
+                "source": "Windows.Terminal.Azure"
+            },
+            {
+                "guid": "{3b26d644-1d3b-5a0c-ab09-39d4dd9ae00e}",
+                "hidden": false,
+                "name": "Developer Command Prompt for VS 2022",
+                "source": "Windows.Terminal.VisualStudio"
+            },
+            {
+                "guid": "{589cd367-e65f-5e6a-a1c7-2b8d6f250da8}",
+                "hidden": false,
+                "name": "Developer PowerShell for VS 2022",
+                "source": "Windows.Terminal.VisualStudio"
+            }
+        ]
+    },
+    "schemes": 
+    [
+        {
+            "background": "#0C0C0C",
+            "black": "#0C0C0C",
+            "blue": "#0037DA",
+            "brightBlack": "#767676",
+            "brightBlue": "#3B78FF",
+            "brightCyan": "#61D6D6",
+            "brightGreen": "#16C60C",
+            "brightPurple": "#B4009E",
+            "brightRed": "#E74856",
+            "brightWhite": "#F2F2F2",
+            "brightYellow": "#F9F1A5",
+            "cursorColor": "#FFFFFF",
+            "cyan": "#3A96DD",
+            "foreground": "#CCCCCC",
+            "green": "#13A10E",
+            "name": "Campbell",
+            "purple": "#881798",
+            "red": "#C50F1F",
+            "selectionBackground": "#FFFFFF",
+            "white": "#CCCCCC",
+            "yellow": "#C19C00"
+        },
+        {
+            "background": "#012456",
+            "black": "#0C0C0C",
+            "blue": "#0037DA",
+            "brightBlack": "#767676",
+            "brightBlue": "#3B78FF",
+            "brightCyan": "#61D6D6",
+            "brightGreen": "#16C60C",
+            "brightPurple": "#B4009E",
+            "brightRed": "#E74856",
+            "brightWhite": "#F2F2F2",
+            "brightYellow": "#F9F1A5",
+            "cursorColor": "#FFFFFF",
+            "cyan": "#3A96DD",
+            "foreground": "#CCCCCC",
+            "green": "#13A10E",
+            "name": "Campbell Powershell",
+            "purple": "#881798",
+            "red": "#C50F1F",
+            "selectionBackground": "#FFFFFF",
+            "white": "#CCCCCC",
+            "yellow": "#C19C00"
+        },
+        {
+            "background": "#282C34",
+            "black": "#282C34",
+            "blue": "#61AFEF",
+            "brightBlack": "#5A6374",
+            "brightBlue": "#61AFEF",
+            "brightCyan": "#56B6C2",
+            "brightGreen": "#98C379",
+            "brightPurple": "#C678DD",
+            "brightRed": "#E06C75",
+            "brightWhite": "#DCDFE4",
+            "brightYellow": "#E5C07B",
+            "cursorColor": "#FFFFFF",
+            "cyan": "#56B6C2",
+            "foreground": "#DCDFE4",
+            "green": "#98C379",
+            "name": "One Half Dark",
+            "purple": "#C678DD",
+            "red": "#E06C75",
+            "selectionBackground": "#FFFFFF",
+            "white": "#DCDFE4",
+            "yellow": "#E5C07B"
+        },
+        {
+            "background": "#FAFAFA",
+            "black": "#383A42",
+            "blue": "#0184BC",
+            "brightBlack": "#4F525D",
+            "brightBlue": "#61AFEF",
+            "brightCyan": "#56B5C1",
+            "brightGreen": "#98C379",
+            "brightPurple": "#C577DD",
+            "brightRed": "#DF6C75",
+            "brightWhite": "#FFFFFF",
+            "brightYellow": "#E4C07A",
+            "cursorColor": "#4F525D",
+            "cyan": "#0997B3",
+            "foreground": "#383A42",
+            "green": "#50A14F",
+            "name": "One Half Light",
+            "purple": "#A626A4",
+            "red": "#E45649",
+            "selectionBackground": "#FFFFFF",
+            "white": "#FAFAFA",
+            "yellow": "#C18301"
+        },
+        {
+            "background": "#002B36",
+            "black": "#002B36",
+            "blue": "#268BD2",
+            "brightBlack": "#073642",
+            "brightBlue": "#839496",
+            "brightCyan": "#93A1A1",
+            "brightGreen": "#586E75",
+            "brightPurple": "#6C71C4",
+            "brightRed": "#CB4B16",
+            "brightWhite": "#FDF6E3",
+            "brightYellow": "#657B83",
+            "cursorColor": "#FFFFFF",
+            "cyan": "#2AA198",
+            "foreground": "#839496",
+            "green": "#859900",
+            "name": "Solarized Dark",
+            "purple": "#D33682",
+            "red": "#DC322F",
+            "selectionBackground": "#FFFFFF",
+            "white": "#EEE8D5",
+            "yellow": "#B58900"
+        },
+        {
+            "background": "#FDF6E3",
+            "black": "#002B36",
+            "blue": "#268BD2",
+            "brightBlack": "#073642",
+            "brightBlue": "#839496",
+            "brightCyan": "#93A1A1",
+            "brightGreen": "#586E75",
+            "brightPurple": "#6C71C4",
+            "brightRed": "#CB4B16",
+            "brightWhite": "#FDF6E3",
+            "brightYellow": "#657B83",
+            "cursorColor": "#002B36",
+            "cyan": "#2AA198",
+            "foreground": "#657B83",
+            "green": "#859900",
+            "name": "Solarized Light",
+            "purple": "#D33682",
+            "red": "#DC322F",
+            "selectionBackground": "#FFFFFF",
+            "white": "#EEE8D5",
+            "yellow": "#B58900"
+        },
+        {
+            "background": "#000000",
+            "black": "#000000",
+            "blue": "#3465A4",
+            "brightBlack": "#555753",
+            "brightBlue": "#729FCF",
+            "brightCyan": "#34E2E2",
+            "brightGreen": "#8AE234",
+            "brightPurple": "#AD7FA8",
+            "brightRed": "#EF2929",
+            "brightWhite": "#EEEEEC",
+            "brightYellow": "#FCE94F",
+            "cursorColor": "#FFFFFF",
+            "cyan": "#06989A",
+            "foreground": "#D3D7CF",
+            "green": "#4E9A06",
+            "name": "Tango Dark",
+            "purple": "#75507B",
+            "red": "#CC0000",
+            "selectionBackground": "#FFFFFF",
+            "white": "#D3D7CF",
+            "yellow": "#C4A000"
+        },
+        {
+            "background": "#FFFFFF",
+            "black": "#000000",
+            "blue": "#3465A4",
+            "brightBlack": "#555753",
+            "brightBlue": "#729FCF",
+            "brightCyan": "#34E2E2",
+            "brightGreen": "#8AE234",
+            "brightPurple": "#AD7FA8",
+            "brightRed": "#EF2929",
+            "brightWhite": "#EEEEEC",
+            "brightYellow": "#FCE94F",
+            "cursorColor": "#000000",
+            "cyan": "#06989A",
+            "foreground": "#555753",
+            "green": "#4E9A06",
+            "name": "Tango Light",
+            "purple": "#75507B",
+            "red": "#CC0000",
+            "selectionBackground": "#FFFFFF",
+            "white": "#D3D7CF",
+            "yellow": "#C4A000"
+        },
+        {
+            "background": "#000000",
+            "black": "#000000",
+            "blue": "#000080",
+            "brightBlack": "#808080",
+            "brightBlue": "#0000FF",
+            "brightCyan": "#00FFFF",
+            "brightGreen": "#00FF00",
+            "brightPurple": "#FF00FF",
+            "brightRed": "#FF0000",
+            "brightWhite": "#FFFFFF",
+            "brightYellow": "#FFFF00",
+            "cursorColor": "#FFFFFF",
+            "cyan": "#008080",
+            "foreground": "#C0C0C0",
+            "green": "#008000",
+            "name": "Vintage",
+            "purple": "#800080",
+            "red": "#800000",
+            "selectionBackground": "#FFFFFF",
+            "white": "#C0C0C0",
+            "yellow": "#808000"
+        }
+    ],
+    "themes": []
+}

scripts/vagrant/windows_terminal_state.json.default

@@ -0,0 +1,9 @@
+{
+	"generatedProfiles" : 
+	[
+		"{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
+		"{589cd367-e65f-5e6a-a1c7-2b8d6f250da8}",
+		"{3b26d644-1d3b-5a0c-ab09-39d4dd9ae00e}"
+	],
+	"settingsHash" : "6e0f2330b78337f3-01d95614596b3f65"
+}

vendor/bin/add-cmderrootenvar.ps1

@@ -0,0 +1 @@
+setx cmder_root "${env:cmder_root}"

vendor/bin/add-cmdertodesktop.ps1

@@ -0,0 +1,30 @@
+if (test-path "${env:USERPROFILE}\cmderdev") {
+  $env:cmder_root = "${env:USERPROFILE}\cmderdev"
+  write-host "Creating '${env:USERPROFILE}\Desktop\Cmderdev.lnk'..."
+
+  $setShortcut = "$env:cmder_root\vendor\bin\set-shortcut.ps1"
+
+  start-process -NoNewWindow -filePath "powershell.exe" -ArgumentList "-file `"${setShortcut}`" -sourceexe `"${env:cmder_root}\Cmder.exe`" -DestinationPath `"${env:USERPROFILE}\Desktop\Cmderdev.lnk`" -WorkingDirectory `"${env:cmder_root}`""
+}
+
+if (test-path "${env:USERPROFILE}\cmder") {
+  $env:cmder_root = "${env:USERPROFILE}\cmder"
+
+  if (test-path "${cmder_root}\vendor\bin\set-shortcut.ps1") {
+    $setShortcut = "$env:cmder_root\vendor\bin\set-shortcut.ps1"
+  }
+
+  write-host "Creating '${env:USERPROFILE}\Desktop\Cmder.lnk'..."
+  start-process -NoNewWindow -filePath "powershell.exe" -ArgumentList "-file `"${setShortcut}`" -sourceexe `"$env:cmder_root\Cmder.exe`" -DestinationPath `"${env:USERPROFILE}\Desktop\Cmder.lnk`" -WorkingDirectory `"${env:USERPROFILE}`""
+} elseif (test-path "C:\tools\cmder") {
+  $env:cmder_root = "C:\tools\cmder"
+
+  if (test-path "${cmder_root}\vendor\bin\set-shortcut.ps1") {
+    $setShortcut = "$env:cmder_root\vendor\bin\set-shortcut.ps1"
+  }
+
+  write-host "Creating '${env:USERPROFILE}\Desktop\Cmder.lnk'..."
+  start-process -NoNewWindow -filePath "powershell.exe" -ArgumentList "-file `"${setShortcut}`" -sourceexe `"$env:cmder_root\Cmder.exe`" -DestinationPath `"${env:USERPROFILE}\Desktop\Cmder.lnk`" -WorkingDirectory `"${env:USERPROFILE}`""
+}
+
+

vendor/bin/add-vscodeprofile.ps1

@@ -0,0 +1,39 @@
+# VSCode
+$VSCodeUserSettings = "$env:APPDATA/Code/User"
+$VSCodeSettings = "$VSCodeUserSettings/settings.json";
+$VSCodeSettingsNew = $VSCodeSettings.replace('.json', '-new.json')
+
+if (test-path $VSCodeSettings) {
+    $data = get-content -path $VSCodeSettings -ErrorAction silentlycontinue | out-string | ConvertFrom-Json
+}
+else {
+    New-Item -ItemType directory $VSCodeUserSettings -force
+    $data = @{}
+}
+
+write-host $data
+
+$data | Add-Member -force -Name 'terminal.integrated.defaultProfile.windows' -MemberType NoteProperty -Value "Cmder"
+
+if ($null -eq $data.'terminal.integrated.profiles.windows') {
+  write-host "Adding 'terminal.integrated.profiles.windows'..."
+  $data | Add-Member -force -Name 'terminal.integrated.profiles.windows' -MemberType NoteProperty -Value @{}
+} 
+
+write-host "Adding 'terminal.integrated.profiles.windows.Cmder' profile..."
+$data.'terminal.integrated.profiles.windows'.'Cmder' = @{
+  "name" = "Cmder";
+  "path" = @(
+    "`${env:windir}/Sysnative/cmd.exe";
+    "`${env:windir}/System32/cmd.exe";
+  );
+  "args" = @(
+    "/k";
+    "`${env:USERPROFILE}/cmderdev/vendor/bin/vscode_init.cmd");
+  "icon" = "terminal-cmd";
+  "color" = "terminal.ansiGreen";
+};
+
+$data | ConvertTo-Json -depth 100 | set-content $VSCodeSettings
+
+

vendor/bin/add-windowsterminalprofiles.ps1

@@ -0,0 +1,74 @@
+# Windows Terminal
+$windowsTerminalFolder = (dir "$env:userprofile/AppData/Local/Packages/Microsoft.WindowsTerminal_*").name
+$windowsTerminalPath = "$env:userprofile/AppData/Local/Packages/$windowsTerminalFolder"
+$windowsTerminalSettings = $windowsTerminalPath + '/localState/settings.json'
+$windowsTerminalSettingsNew = $windowsTerminalPath + '/localState/settings-new.json'
+
+if (test-path "$env:userprofile/Documents/windows_terminal_settings.json.default") {
+  if (test-path "$windowsTerminalPath/LocalState/settings.json") {
+    del "$env:userprofile/Documents/windows_terminal_settings.json.default"
+  } else {
+    move-item -path $env:userprofile/Documents/windows_terminal_settings.json.default -destination $windowsTerminalPath/LocalState/settings.json
+  }
+}
+
+if (test-path "$env:userprofile/Documents/windows_terminal_state.json.default") {
+  if (test-path "$windowsTerminalPath/LocalState/state.json") {
+    del "$env:userprofile/Documents/windows_terminal_state.json.default"
+  } else {
+    move-item -path $env:userprofile/Documents/windows_terminal_state.json.default -destination $windowsTerminalPath/LocalState/state.json
+  }
+}
+
+if (test-path "$windowsTerminalPath/LocalState/state.json") {
+  $json = get-content $windowsTerminalSettings | ConvertFrom-Json
+
+  $json.defaultProfile="{00000000-0000-0000-ba54-000000000132}"
+
+  $cmderFound = $false
+  $cmderAsAdminFound = $false
+
+  foreach ($profile in $json.profiles.list) {
+    if ($profile.Name -eq "Cmder") {
+      $cmderFound = $true
+    }
+    elseIf ($profile.Name -eq "Cmder as Admin") {
+      $cmderAsAdminFound = $true
+    }
+  }
+
+  if (-not $cmderFound) {
+    write-host "Adding 'Cmder' to Windows Terminal..."
+
+    $json.profiles.list += @{
+      commandline="cmd.exe /k `"%USERPROFILE%/cmderdev/vendor/init.bat`"";
+      startingDirectory="%USERPROFILE%/cmderdev";
+      icon="%USERPROFILE%/cmderdev/icons/cmder.ico";
+      closeOnExit="graceful";
+      guid="{00000000-0000-0000-ba54-000000000132}";
+      hidden=$false;
+      name="Cmder"
+    }
+  }
+
+  if (-not $cmderAsAdminFound) {
+    write-host "Adding 'Cmder as Admin' to Windows Terminal..."
+
+    $json.profiles.list += @{
+      commandline="cmd.exe /k `"%USERPROFILE%/cmderdev/vendor/init.bat`"";
+      startingDirectory="%USERPROFILE%/cmderdev";
+      icon="%USERPROFILE%/cmderdev/icons/cmder_red.ico";
+      closeOnExit="graceful";
+      guid="{00000000-0000-0000-ba54-000000000133}";
+      hidden=$false;
+      elevate=$true;
+      name="Cmder as Admin"
+    }
+  }
+
+  $json | ConvertTo-Json -depth 100 | set-content $windowsTerminalSettings
+}
+else {
+  write-host "Cannot add profiles for Windows Terminal.  The Windows Terminal settings file does not exist!"
+}
+

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
-set excd=%*
-set excd=%excd:"=%
-set excd_param=/d
-if /i "%excd:~0,2%"=="/d" set "excd=%excd:~2%"
-if "%excd:~0,1%"=="~" (set excd=%userprofile%\%excd:~1%)
-if "%excd:~0,1%"=="/" (set excd_param=)
-cd %excd_param% %excd%
+@if "%~1"=="/?" (@cd %*)
+@set excd=%*
+@set excd=%excd:"=%
+@if "%excd:~0,1%"=="~" (@set excd=%userprofile%\%excd:~1%)
+@if not "%~1"=="/d" (@set excd_param="/d") else (@set excd_param=)
+@cd %excd_param% "%excd%"

vendor/bin/set-shortcut.ps1

@@ -0,0 +1,21 @@
+[CmdletBinding()]
+param(
+    [Parameter()]
+    [string]$SourceExe,
+    [string]$Arguments,
+    [string]$DestinationPath,
+    [string]$WorkingDirectory,
+    [String]$IconLocation
+)
+
+if ($IconLocation -eq '') {
+    $IconLocation = $SourceExe
+}
+
+$WshShell = New-Object -comObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut($destinationPath)
+$Shortcut.TargetPath = $SourceExe
+$Shortcut.Arguments = $Arguments
+$shortcut.WorkingDirectory = $WorkingDirectory
+$shortcut.IconLocation = $IconLocation
+$Shortcut.Save()

vendor/clink.lua

@@ -3,12 +3,7 @@
 -- !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 -- !!! Use "%CMDER_ROOT%\config\<whatever>.lua" to add your lua startup scripts
 
--- luacheck: globals CMDER_SESSION
--- 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 clink io.popenyield os.isdir settings.get
+-- luacheck: globals clink
 
 -- At first, load the original clink.lua file
 -- this is needed as we set the script path to this dir and therefore the original
@@ -51,37 +46,11 @@ local function get_unknown_color()
 end
 
 ---
--- 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
+-- Makes a string safe to use as the replacement in string.gsub
 ---
-local function escape_gsub_find_arg(text)
-    return text and text:gsub("([-+*?.%%()%[%]$^])", "%%%1") or ""
-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))
+local function verbatim(s)
+    s = string.gsub(s, "%%", "%%%%")
+    return s
 end
 
 -- Extracts only the folder name from the input Path
@@ -179,15 +148,15 @@ local function set_prompt_filter()
     end
 
     if prompt_useHomeSymbol and string.find(cwd, clink.get_env("HOME")) then
-        cwd = gsub_plain(cwd, clink.get_env("HOME"), prompt_homeSymbol)
+        cwd = string.gsub(cwd, clink.get_env("HOME"), prompt_homeSymbol)
     end
 
-    local uah = ''
+    uah = ''
     if prompt_useUserAtHost then
         uah = clink.get_env("USERNAME") .. "@" .. clink.get_env("COMPUTERNAME") .. ' '
     end
 
-    local cr = "\n"
+    cr = "\n"
     if prompt_singleLine then
         cr = ' '
     end
@@ -201,15 +170,15 @@ 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 = gsub_plain(prompt, "{uah}", uah)
-    prompt = gsub_plain(prompt, "{cwd}", cwd)
-    prompt = gsub_plain(prompt, "{env}", env)
-    clink.prompt.value = gsub_plain(prompt, "{lamb}", prompt_lambSymbol)
+    prompt = "{uah}{cwd}" .. version_control .. cr .. get_lamb_color() .. "{env}{lamb}\x1b[0m "
+    prompt = string.gsub(prompt, "{uah}", uah)
+    prompt = string.gsub(prompt, "{cwd}", cwd)
+    prompt = string.gsub(prompt, "{env}", env)
+    clink.prompt.value = string.gsub(prompt, "{lamb}", prompt_lambSymbol)
 end
 
 local function percent_prompt_filter()
-    clink.prompt.value = gsub_plain(clink.prompt.value, "{percent}", "%")
+    clink.prompt.value = string.gsub(clink.prompt.value, "{percent}", "%%")
 end
 
 ---
@@ -222,7 +191,7 @@ end
 local function get_dir_contains(path, dirname)
 
     -- return parent path for specified entry (either file or directory)
-    local function pathname(path) -- luacheck: ignore 432
+    local function pathname(path)
         local prefix = ""
         local i = path:find("[\\/:][^\\/:]*$")
         if i then
@@ -232,14 +201,14 @@ local function get_dir_contains(path, dirname)
     end
 
     -- Navigates up one level
-    local function up_one_level(path) -- luacheck: ignore 432
+    local function up_one_level(path)
         if path == nil then path = '.' end
         if path == '.' then path = clink.get_cwd() end
         return pathname(path)
     end
 
     -- Checks if provided directory contains git directory
-    local function has_specified_dir(path, specified_dir) -- luacheck: ignore 432
+    local function has_specified_dir(path, specified_dir)
         if path == nil then path = '.' end
         local found_dirs = clink.find_dirs(path..'/'..specified_dir)
         if #found_dirs > 0 then return true end
@@ -267,7 +236,7 @@ end
 local function get_git_dir(path)
 
     -- return parent path for specified entry (either file or directory)
-    local function pathname(path) -- luacheck: ignore 432
+    local function pathname(path)
         local prefix = ""
         local i = path:find("[\\/:][^\\/:]*$")
         if i then
@@ -286,8 +255,7 @@ local function get_git_dir(path)
         local gitfile = io.open(dir..'/.git')
         if not gitfile then return false end
 
-        local line = gitfile:read() or ''
-        local git_dir = line:match('gitdir: (.*)')
+        local git_dir = gitfile:read():match('gitdir: (.*)')
         gitfile:close()
 
         if os.isdir then -- only available in Clink v1.0.0 and higher
@@ -335,9 +303,6 @@ local function get_git_branch(git_dir)
     local HEAD = head_file:read()
     head_file:close()
 
-    -- If HEAD is missing, something is wrong.
-    if not HEAD then return end
-
     -- if HEAD matches branch expression, then we're on named branch
     -- otherwise it is a detached commit
     local branch_name = HEAD:match('ref: refs/heads/(.+)')
@@ -350,11 +315,13 @@ end
 -- @return {false|mercurial branch information}
 ---
 local function get_hg_branch()
-    -- Return the branch information.
-    local file = io.popen("hg branch 2>nul")
-    if not file then
-        return false
-    end
+    -- Return the branch information. The default is to get just the
+    -- branch name, but you could e.g. use the "hg-prompt" extension to
+    -- get more information, such as any applied mq patches. Here's an
+    -- example of that:
+    -- local cmd = "hg prompt \"{branch}{status}{|{patch}}{update}\""
+    local cmd = "hg branch 2>nul"
+    local file = io.popen(cmd)
 
     for line in file:lines() do
         local m = line:match("(.+)$")
@@ -372,12 +339,8 @@ end
 -- Find out current branch
 -- @return {false|svn branch name}
 ---
-local function get_svn_branch()
+local function get_svn_branch(svn_dir)
     local file = io_popenyield("svn info 2>nul")
-    if not file then
-        return false
-    end
-
     for line in file:lines() do
         local m = line:match("^Relative URL:")
         if m then
@@ -396,16 +359,12 @@ end
 ---
 local function get_git_status()
     local file = io_popenyield("git --no-optional-locks status --porcelain 2>nul")
-    if not file then
-        return {}
-    end
-
     local conflict_found = false
     local is_status = true
     for line in file:lines() do
         local code = line:sub(1, 2)
         -- print (string.format("code: %s, line: %s", code, line))
-        if code == "DD" or code == "AU" or code == "UD" or code == "UA" or code == "DU" or code == "AA" or code == "UU" then -- luacheck: no max line length
+        if code == "DD" or code == "AU" or code == "UD" or code == "UA" or code == "DU" or code == "AA" or code == "UU" then
             is_status = false
             conflict_found = true
             break
@@ -415,29 +374,23 @@ local function get_git_status()
         end
     end
     file:close()
-
     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 }
+    local file = io.popen("hg status -0")
+    for line in file:lines() do
+        file:close()
+        return false
     end
+    file:close()
 
-    local output = pipe:read('*all')
-    pipe:close()
-
-    local dirty = (output ~= nil and output ~= "")
-    return { clean = not dirty }
+    return true
 end
 
 ---
@@ -445,18 +398,14 @@ end
 -- @return {bool}
 ---
 local function get_svn_status()
-    local file = io_popenyield("svn status -q 2>nul")
-    if not file then
-        return { error = true }
-    end
-
-    for line in file:lines() do -- luacheck: ignore 512, no unused
+    local file = io_popenyield("svn status -q")
+    for line in file:lines() do
         file:close()
-        return { clean = false }
+        return false
     end
     file:close()
 
-    return { clean = true }
+    return true
 end
 
 ---
@@ -484,28 +433,24 @@ local function get_git_status_setting()
     end
 
     local gitStatusConfig = io_popenyield("git --no-pager config cmder.status 2>nul")
-    if gitStatusConfig then
-        for line in gitStatusConfig:lines() do
-            if string.match(line, 'false') then
-                gitStatusConfig:close()
-                last_git_status_setting = false
-                return false
-            end
+    for line in gitStatusConfig:lines() do
+        if string.match(line, 'false') then
+            gitStatusConfig:close()
+            last_git_status_setting = false
+            return false
         end
-        gitStatusConfig:close()
     end
+    gitStatusConfig:close()
 
     local gitCmdStatusConfig = io_popenyield("git --no-pager config cmder.cmdstatus 2>nul")
-    if gitCmdStatusConfig then
-        for line in gitCmdStatusConfig:lines() do
-            if string.match(line, 'false') then
-                gitCmdStatusConfig:close()
-                last_git_status_setting = false
-                return false
-            end
+    for line in gitCmdStatusConfig:lines() do
+        if string.match(line, 'false') then
+            gitCmdStatusConfig:close()
+            last_git_status_setting = false
+            return false
         end
-        gitCmdStatusConfig:close()
     end
+    gitCmdStatusConfig:close()
 
     last_git_status_setting = true
     return true
@@ -536,6 +481,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,40 +508,27 @@ local function git_prompt_filter()
             local gitConflict = gitInfo.conflict
 
             if gitStatus == nil then
-                color = get_unknown_color()
+                color = colors.nostatus
             elseif gitStatus then
-                color = get_clean_color()
+                color = colors.clean
             else
-                color = get_dirty_color()
+                color = colors.dirty
             end
 
             if gitConflict then
-                color = get_conflict_color()
+                color = colors.conflict
             end
 
-            local result = " "..color.."("..branch..")"
-            clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", result)
+            clink.prompt.value = string.gsub(clink.prompt.value, "{git}", " "..color.."("..verbatim(branch)..")")
             return false
         end
     end
 
     -- No git present or not in git file
-    clink.prompt.value = gsub_plain(clink.prompt.value, "{git}", "")
+    clink.prompt.value = string.gsub(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.
@@ -596,50 +536,39 @@ local function hg_prompt_filter()
         return false
     end
 
+    local result = ""
+
     local hg_dir = get_hg_dir()
     if hg_dir then
-        local branch = get_hg_branch()
-        if branch and
+        -- Colors for mercurial status
+        local colors = {
+            clean = get_clean_color(),
+            dirty = get_dirty_color(),
+            nostatus = get_unknown_color()
+        }
+        local output = get_hg_branch()
+
+        -- strip the trailing newline from the branch name
+        local n = #output
+        while n > 0 and output:find("^%s", n) do n = n - 1 end
+        local branch = output:sub(1, n)
+
+        if branch ~= nil and
            string.sub(branch,1,7) ~= "abort: " and             -- not an HG working copy
            (not string.find(branch, "is not recognized")) then -- 'hg' not in path
-            -- If in a different repo or branch than last time, discard cached info
-            if cached_info.hg_dir ~= hg_dir or cached_info.hg_branch ~= branch then
-                cached_info.hg_info = nil
-                cached_info.hg_dir = hg_dir
-                cached_info.hg_branch = branch
-            end
+            local color = colors.clean
 
-            local hgInfo = get_hg_info_table()
+            local pipe = io.popen("hg status -amrd 2>&1")
+            local output = pipe:read('*all')
+            local rc = { pipe:close() }
 
-            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
+            if output ~= nil and output ~= "" then color = colors.dirty end
+            result = color .. "(" .. branch .. ")"
         end
     end
 
-    -- No hg present or not in hg repo
-    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
+    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", " "..verbatim(result))
+    return false
 end
 
 local function svn_prompt_filter()
@@ -649,10 +578,18 @@ 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
         local branch = get_svn_branch()
+        local color
         if branch then
             -- If in a different repo or branch than last time, discard cached info
             if cached_info.svn_dir ~= svn_dir or cached_info.svn_branch ~= branch then
@@ -660,25 +597,37 @@ local function svn_prompt_filter()
                 cached_info.svn_dir = svn_dir
                 cached_info.svn_branch = branch
             end
-
-            local svnInfo = get_svn_info_table()
-
-            local color
-            if not svnInfo or svnInfo.error then
-                color = get_unknown_color()
-            elseif svnInfo.clean then
-                color = get_clean_color()
+            -- Get the svn status using coroutine if available and option is enabled. Otherwise use a blocking call
+            local svnStatus
+            if clink.promptcoroutine and io.popenyield and settings.get("prompt.async") and prompt_overrideSvnStatusOptIn then
+                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
-                color = get_dirty_color()
+                svnStatus = get_svn_status()
             end
 
-            clink.prompt.value = gsub_plain(clink.prompt.value, "{svn}", " "..color.."("..branch..")")
+            if svnStatus == nil then
+                color = colors.nostatus
+            elseif svnStatus then
+                color = colors.clean
+            else
+                color = colors.dirty
+            end
+
+            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", " "..color.."("..verbatim(branch)..")")
             return false
         end
     end
 
     -- No svn present or not in svn file
-    clink.prompt.value = gsub_plain(clink.prompt.value, "{svn}", "")
+    clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", "")
     return false
 end
 

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"
--- Yellow:     "\x1b[1;33;49m"
+-- Green:      "\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]
-cwd_color = "\x1b[1;32;49m" -- Green cwd = Current Working Directory
+uah_color = "\x1b[1;33;49m" -- Green = uah = [user]@[hostname]
+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
-  gitConfig=$(git --no-pager config -l 2>/dev/null) || return 0  # treat failure as enabled
-
-  # Check if git status for Cmder is disabled
-  if [[ $gitConfig =~ (^|$'\n')cmder\.status=false($|$'\n') ]] || \
-     [[ $gitConfig =~ (^|$'\n')cmder\.shstatus=false($|$'\n') ]]
+  if [[ -n ${gitStatusSetting} ]] && [[ ${gitStatusSetting} =~ cmder.status=false ]] || [[ ${gitStatusSetting} =~ cmder.shstatus=false ]]
   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) || return 0
+  gitDir=$(git rev-parse --git-dir 2>/dev/null)
+  if [ -z "$gitDir" ]; then
+    return 0
+  fi
 
-  local headFile="$gitDir/HEAD"
-  [ -f "$headFile" ] || return 0
-
-  local headContent
-  headContent=$(< "$headFile")
-  if [[ "$headContent" =~ ^ref:\ refs/heads/(.+)$ ]]
+  headContent=$(< "$gitDir/HEAD")
+  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,18 +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
-  # Taken parts from https://github.com/git-for-windows/build-extra/blob/main/git-extra/git-prompt.sh
-  PS1='\[\033]0;${TITLEPREFIX:+$TITLEPREFIX:}${PWD//[^[:ascii:]]/?}\007\]' # set window title to TITLEPREFIX (if set) and current working directory
-  # PS1="$PS1"'\n'               # new line (disabled)
-  PS1="$PS1"'\[\033[32m\]'       # change to green and bold
+  PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
+  # PS1="$PS1"'\n'                 # new line
+  PS1="$PS1"'\[\033[32m\]'       # change to green
   PS1="$PS1"'\u@\h '             # user@host<space>
-  PS1="$PS1${MSYSTEM:+\[\033[35m\]$MSYSTEM }" # show MSYSTEM in purple (if set)
-  PS1="$PS1"'\[\033[1;33m\]'     # change to dark yellow in bold
+  # PS1="$PS1"'\[\033[35m\]'       # change to purple
+  # PS1="$PS1"'$MSYSTEM '          # show MSYSTEM
+  PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
   PS1="$PS1"'\w'                 # current working directory
   if test -z "$WINELOADERNOEXEC"
   then
@@ -64,7 +55,7 @@ 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
@@ -75,22 +66,9 @@ else
       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: Cmder uses λ
-  PS1="$PS1"'\[\033[0m\]'        # reset color
+  PS1="$PS1"'λ '                 # prompt: always λ
 fi
 
-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
+MSYS2_PS1="$PS1"               # for detection by MSYS2 SDK's bash.basrc

vendor/init.bat

@@ -153,8 +153,7 @@ if not "%CMDER_SHELL%" == "cmd" (
     set CMDER_ALIASES=0
 )
 
-:: Pick the right version of Clink
-:: TODO: Support for ARM
+:: Pick right version of Clink
 if "%PROCESSOR_ARCHITECTURE%"=="x86" (
     set clink_architecture=x86
     set architecture_bits=32
@@ -167,7 +166,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
 )
 
 if "%CMDER_CLINK%" == "1" (
-    REM TODO: Detect if clink is already injected, if so goto :CLINK_FINISH
+    REM TODO: If clink is already injected, goto :CLINK_FINISH
     goto :INJECT_CLINK
 )
 
@@ -206,10 +205,8 @@ goto :SKIP_CLINK
 
     "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_CONFIG_DIR%" --scripts "%CMDER_ROOT%\vendor"
 
-    :: Check if a fatal error occurred when trying to inject Clink
-    if errorlevel 2 (
-        REM %print_error% "Clink injection has failed with error code: %errorlevel%"
-        goto :SKIP_CLINK
+    if errorlevel 1 (
+        %print_error% "Clink initialization has failed with error code: %errorlevel%"
     )
 
     goto :CLINK_FINISH
@@ -240,8 +237,8 @@ if "%CMDER_CONFIGURED%" GTR "1" (
 :: Prepare for git-for-windows
 
 :: Detect which git.exe version to use
-:: * if the user points to a specific git, use that
-:: * test if git is in path and if yes, use that
+:: * if the users points as to a specific git, use that
+:: * test if a git is in path and if yes, use that
 :: * last, use our vendored git
 :: also check that we have a recent enough version of git by examining the version string
 if defined GIT_INSTALL_ROOT (
@@ -355,7 +352,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 +423,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
-:::.
-:::description:
-:::.
-:::       This routine sets up the Cmder shell environment by detecting the
-:::       command shell and initializing related variables.
+:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
 :::.
 :::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
-:::.
-:::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
+:::is_git_shim
 :::.
 :::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%"
-        if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" 2>nul 1>nul
-        if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
-        if exist "%temp%\%_rand%_cmder_lib_pathA" goto :toolong
-        if exist "%temp%\%_rand%_cmder_lib_pathB" goto :toolong
-        echo "%OLD_PATH%">"%temp%\%_rand%_cmder_lib_pathA"
-        if errorlevel 1 ( if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" & goto :toolong )
-        echo "%PATH%">"%temp%\%_rand%_cmder_lib_pathB"
-        if errorlevel 1 ( if exist "%temp%\%_rand%_cmder_lib_pathA" del "%temp%\%_rand%_cmder_lib_pathA" & if exist "%temp%\%_rand%_cmder_lib_pathB" del "%temp%\%_rand%_cmder_lib_pathB" & goto :toolong )
-        fc /b "%temp%\%_rand%_cmder_lib_pathA" "%temp%\%_rand%_cmder_lib_pathB" 2>nul 1>nul
-        if errorlevel 1 ( del "%temp%\%_rand%_cmder_lib_pathA" & del "%temp%\%_rand%_cmder_lib_pathB" & set "_rand=" & goto :changed )
-        del "%temp%\%_rand%_cmder_lib_pathA" & del "%temp%\%_rand%_cmder_lib_pathB" & set "_rand="
+        echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
+        echo "%PATH%">"%temp%\cmder_lib_pathB"
+        fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
+        if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
+        del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
         exit /b
 
     :changed
-        %print_debug% :enhance_path "END Env Var - PATH=%PATH%"
-        %print_debug% :enhance_path "Env Var %find_query% - found=%found%"
+        %print_debug%  :enhance_path "END Env Var - PATH=%path%"
+        %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 - position=%position%"
-    %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 - add_path=%add_to_path%"
+    %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 - 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

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

vendor/psmodules/Cmder.ps1

@@ -1,4 +1,4 @@
-function readGitVersion($gitPath) {
+function readVersion($gitPath) {
     $gitExecutable = "${gitPath}\git.exe"
 
     if (-not (Test-Path "$gitExecutable")) {
@@ -18,8 +18,7 @@ function readGitVersion($gitPath) {
 }
 
 function isGitShim($gitPath) {
-    # Check if there is a shim file - if yes, read the actual executable path
-    # See: github.com/ScoopInstaller/Shim
+    # check if there's shim - and if yes follow the path
 
     if (Test-Path "${gitPath}\git.shim") {
         $shim = (get-content "${gitPath}\git.shim")

vendor/sources.json

@@ -1,27 +1,22 @@
 [
   {
     "name": "git-for-windows",
-    "version": "2.51.2.windows.1",
-    "url": "https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/PortableGit-2.51.2-64-bit.7z.exe"
+    "version": "2.40.0-rc2.windows.1",
+    "url": "https://github.com/git-for-windows/git/releases/download/v2.40.0-rc2.windows.1/PortableGit-2.40.0-rc2-64-bit.7z.exe"
   },
   {
     "name": "clink",
-    "version": "1.8.8",
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip"
+    "version": "1.4.22",
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.4.22/clink.1.4.22.33f515.zip"
   },
   {
     "name": "conemu-maximus5",
-    "version": "23.07.24",
-    "url": "https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
-  },
-  {
-    "name": "windows-terminal",
-    "version": "1.23.12811.0",
-    "url": "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.WindowsTerminal_1.23.12811.0_x64.zip"
+    "version": "22.12.18",
+    "url": "https://github.com/Maximus5/ConEmu/releases/download/v22.12.18/ConEmuPack.221218.7z"
   },
   {
     "name": "clink-completions",
-    "version": "0.6.6",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip"
+    "version": "0.4.7",
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.7.zip"
   }
 ]