Merge remote-tracking branch 'upstream/master' into copilot/improve-vendor-ci-cd-messaging

* upstream/master:
  trigger
  trigger

.github/dependabot.yml

@@ -5,7 +5,11 @@
 
 version: 2
 updates:
+  # Enable version updates for GitHub Actions
   - package-ecosystem: "github-actions" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    labels:
+      - "👆 Dependencies"
+      - "🔄️ GitHub Actions"

.github/workflows/branches.yml

@@ -19,10 +19,25 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0 # fetch all history for all branches and tags
 
+      - name: Summary - Merge operation started
+        shell: bash
+        run: |
+          echo "## 🔀 Update Branches - Workflow Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Merge Operation" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "| Property | Value |" >> $GITHUB_STEP_SUMMARY
+          echo "| --- | --- |" >> $GITHUB_STEP_SUMMARY
+          echo "| Source Branch | \`master\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| Target Branch | \`development\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| Triggered by | @${{ github.actor }} |" >> $GITHUB_STEP_SUMMARY
+          echo "| Commit | \`${{ github.sha }}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
       # Runs a single command using the runners shell
       - name: Merge master into development
         run: |
@@ -31,3 +46,15 @@ jobs:
           git checkout development
           git merge --no-ff master
           git push origin development
+
+      - name: Summary - Merge completed
+        if: success()
+        shell: bash
+        run: |
+          echo "### ✅ Merge Successful" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "The \`master\` branch has been successfully merged into \`development\`." >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Merge type:** No fast-forward merge" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "> The development branch is now synchronized with the latest changes from master." >> $GITHUB_STEP_SUMMARY

.github/workflows/build.yml

@@ -35,10 +35,32 @@ jobs:
       discussions: write
     steps:
     - name: Check out repository code (Action from GitHub)
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
+    - name: Summary - Repository checkout
+      shell: pwsh
+      run: |
+        $summary = @"
+        ## 📦 Build Cmder - Workflow Summary
+
+        <small>Build started: $buildTime</small>
+
+        ### Repository Information
+        | Property | Value |
+        | --- | --- |
+        | Repository | [``${{ github.repository }}``](https://github.com/${{ github.repository }}) |
+        | Branch | [``$branchName``]($branchLink) |
+        | Commit | [``${{ github.sha }}``](https://github.com/${{ github.repository }}/commit/${{ github.sha }}) |
+        | Actor | [@${{ github.actor }}](https://github.com/${{ github.actor }}) |
+        | Workflow | ``${{ github.workflow }}`` |
+        | Cmder Version | **$cmderVersion** |
+        "@
+        $summary += "`n"
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
+
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v2
 
@@ -47,36 +69,85 @@ jobs:
       working-directory: scripts
       run: .\build.ps1 -Compile -verbose
 
+    - name: Summary - Build completed
+      if: success()
+      shell: pwsh
+      run: |
+        $summary = @"
+
+        ---
+
+        ### Build Status
+
+        ✅ Cmder built successfully.
+
+        "@
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
+
     - name: Pack the built files
       shell: pwsh
       working-directory: scripts
       run: .\pack.ps1 -verbose
 
+    - name: Summary - Package artifacts
+      if: success()
+      shell: pwsh
+      run: |
+        echo "### 📦 Artifacts Created" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Artifact | Size | Hash (SHA256) |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| --- | --- | --- |" >> $env:GITHUB_STEP_SUMMARY
+        $artifacts = @("cmder.zip", "cmder.7z", "cmder_mini.zip")
+        foreach ($artifact in $artifacts) {
+          $path = "build/$artifact"
+          if (Test-Path $path) {
+            $size = (Get-Item $path).Length / 1MB
+            # Truncate hash to first 16 chars for summary readability (full hash in hashes.txt)
+            $hash = (Get-FileHash $path -Algorithm SHA256).Hash.Substring(0, 16)
+            echo "| \`$artifact\` | $([math]::Round($size, 2)) MB | \`$hash...\` |" >> $env:GITHUB_STEP_SUMMARY
+          }
+        }
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+
     - name: Upload artifact (cmder.zip)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       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@v6
       with:
         path: build/cmder.7z
         name: cmder.7z
 
     - name: Upload artifact (cmder_mini.zip)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         path: build/cmder_mini.zip
         name: cmder_mini.zip
 
     - name: Upload artifact (hashes.txt)
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         path: build/hashes.txt
         name: hashes.txt
 
+    - name: Summary - Artifacts uploaded
+      if: success()
+      shell: pwsh
+      run: |
+        echo "### ☁️ Upload Status" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "All artifacts successfully uploaded to GitHub Actions:" >> $env:GITHUB_STEP_SUMMARY
+        echo '- ✅ `cmder.zip`' >> $env:GITHUB_STEP_SUMMARY
+        echo '- ✅ `cmder.7z`' >> $env:GITHUB_STEP_SUMMARY
+        echo '- ✅ `cmder_mini.zip`' >> $env:GITHUB_STEP_SUMMARY
+        echo '- ✅ `hashes.txt`' >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+
     - name: Create Release
       uses: softprops/action-gh-release@v2
       with:
@@ -88,3 +159,19 @@ jobs:
         draft: true
         generate_release_notes: true
       if: startsWith(github.ref, 'refs/tags/')
+
+    - name: Summary - Release created
+      if: startsWith(github.ref, 'refs/tags/')
+      shell: pwsh
+      run: |
+        echo "### 🚀 Release Information" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "Draft release created for tag: **\`${{ github.ref_name }}\`**" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "Release includes:" >> $env:GITHUB_STEP_SUMMARY
+        echo "- Full version (\`cmder.zip\`, \`cmder.7z\`)" >> $env:GITHUB_STEP_SUMMARY
+        echo "- Mini version (\`cmder_mini.zip\`)" >> $env:GITHUB_STEP_SUMMARY
+        echo "- File hashes (\`hashes.txt\`)" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "> ⚠️ Release is in **draft** mode. Please review and publish manually." >> $env:GITHUB_STEP_SUMMARY
+

.github/workflows/codeql.yml

@@ -45,7 +45,26 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
+
+    - name: Summary - CodeQL analysis started
+      shell: pwsh
+      run: |
+        $summary = @"
+          ## 🔒 CodeQL Security Analysis - Workflow Summary
+
+          ### Analysis Configuration
+
+          | Property | Value |
+          | --- | --- |
+          | Repository | ``${{ github.repository }}`` |
+          | Branch | ``${{ github.ref_name }}`` |
+          | Language | ``${{ matrix.language }}`` |
+          | Commit | ``${{ github.sha }}`` |
+
+        "@
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -67,7 +86,36 @@ jobs:
       working-directory: scripts
       run: .\build.ps1 -Compile -verbose
 
+    - name: Summary - Build status
+      if: success()
+      shell: pwsh
+      run: |
+        $summary = @"
+          ### ✅ Build Completed
+
+          Cmder launcher built successfully for CodeQL analysis.
+
+        "@
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"
+
+    - name: Summary - Analysis completed
+      if: success()
+      shell: pwsh
+      run: |
+        $summary = @"
+          ### 🔍 CodeQL Analysis Results
+
+          ✅ CodeQL security analysis completed successfully.
+
+          **Language analyzed:** ``${{ matrix.language }}``
+
+          > Check the Security tab for detailed findings and recommendations.
+        "@
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8

.github/workflows/tests.yml

@@ -38,17 +38,80 @@ jobs:
     continue-on-error: false
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    - name: Summary - Test execution started
+      shell: pwsh
+      run: |
+        echo "## 🧪 Run Tests - Workflow Summary" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "### Test Environment" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Property | Value |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| --- | --- |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Repository | \`${{ github.repository }}\` |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Branch | \`${{ github.ref_name }}\` |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Commit | \`${{ github.sha }}\` |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Runner OS | \`${{ runner.os }}\` |" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+
     - name: Initialize vendors
       shell: pwsh
       working-directory: scripts
       run: .\build.ps1 -verbose
+
+    - name: Summary - Vendor initialization
+      if: success()
+      shell: pwsh
+      run: |
+        echo "### ⚙️ Vendor Initialization" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "✅ Vendor dependencies initialized successfully." >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+
+    - name: Summary - Test results table header
+      if: success()
+      shell: pwsh
+      run: |
+        echo "### 📋 Test Results" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "| Test | Status |" >> $env:GITHUB_STEP_SUMMARY
+        echo "| --- | --- |" >> $env:GITHUB_STEP_SUMMARY
+
     - name: Testing Clink Shell
       run: |
           cmd /c vendor\init.bat /v /d /t
+
+    - name: Summary - Clink Shell test
+      if: success()
+      shell: pwsh
+      run: |
+        echo "| Clink Shell | ✅ Passed |" >> $env:GITHUB_STEP_SUMMARY
     - name: Testing PowerShell
       run: |
           PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$env:CMDER_DEBUG='1'; . 'vendor\profile.ps1'"
+
+    - name: Summary - PowerShell test
+      if: success()
+      shell: pwsh
+      run: |
+        echo "| PowerShell | ✅ Passed |" >> $env:GITHUB_STEP_SUMMARY
     - name: Testing Bash
       run: |
           bash vendor/cmder.sh
+
+    - name: Summary - Bash test
+      if: success()
+      shell: pwsh
+      run: |
+        echo "| Bash | ✅ Passed |" >> $env:GITHUB_STEP_SUMMARY
+
+    - name: Summary - All tests completed
+      if: success()
+      shell: pwsh
+      run: |
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "### ✅ All Tests Completed" >> $env:GITHUB_STEP_SUMMARY
+        echo "" >> $env:GITHUB_STEP_SUMMARY
+        echo "All shell environments tested successfully!" >> $env:GITHUB_STEP_SUMMARY

.github/workflows/vendor.yml

@@ -24,10 +24,22 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
+    - name: Summary - Workflow started
+      shell: pwsh
+      run: |
+        $summary = @(
+          '## 📦 Update Vendor - Workflow Summary'
+          ''
+          '🔍 Checking for vendor dependency updates...'
+          ''
+        )
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
+
     - id: make-changes
       name: Checking for updates
       env:
@@ -35,31 +47,256 @@ jobs:
       run: |
           $currentVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json)
           . .\scripts\update.ps1 -verbose
+
+          # Export count of updated packages (update.ps1 is expected to set $count)
+          if (-not ($count)) { $count = 0 }
           Set-GHVariable -Name COUNT_UPDATED -Value $count
+
           $newVersion = (Get-Content .\vendor\sources.json | ConvertFrom-Json)
           $listUpdated = ""
-          $updateMessage = "| Name | Old Version | New Version |`n| :--- | ---- | ---- |`n"
+          $updateMessage = "| Name | Old Version | New Version |`n| :--- | :---: | :---: |`n"
+          $majorUpdates = @()
+          $singleDepName = ""
+          $singleDepOldVersion = ""
+          $singleDepNewVersion = ""
           foreach ($s in $newVersion) {
             $oldVersion = ($currentVersion | Where-Object {$_.name -eq $s.name}).version
             if ($s.version -ne $oldVersion) {
               $repoUrl = ($repoUrl = $s.Url.Replace("/archive/", "/releases/")).Substring(0, $repoUrl.IndexOf("/releases/")) + "/releases"
+
+              # Store single dependency info for messages (only if this is the only update)
+              if ($count -eq 1) {
+                $singleDepName = $s.name
+                $singleDepOldVersion = $oldVersion
+                $singleDepNewVersion = $s.version
+              }
+
+              # Determine change type and emoji
+              $changeType = "unknown"
+              $emoji = "🔄"
+              $isMajor = $false
+              try {
+                # Handle versions with more than 4 parts
+                $oldVerStr = $oldVersion.Split('-')[0]
+                $newVerStr = $s.version.Split('-')[0]
+
+                # Split by dots and take only numeric parts, first 4 max
+                $oldParts = $oldVerStr.Split('.') | Where-Object { $_ -match '^\d+$' } | Select-Object -First 4
+                $newParts = $newVerStr.Split('.') | Where-Object { $_ -match '^\d+$' } | Select-Object -First 4
+
+                # Ensure we have at least 2 parts (major.minor)
+                if ($oldParts.Count -ge 2 -and $newParts.Count -ge 2) {
+                  $oldVerParseable = $oldParts -join '.'
+                  $newVerParseable = $newParts -join '.'
+
+                  $oldVer = [System.Version]::Parse($oldVerParseable)
+                  $newVer = [System.Version]::Parse($newVerParseable)
+
+                  if ($newVer.Major -gt $oldVer.Major) {
+                    $changeType = "major"
+                    $emoji = "🔥"
+                    $isMajor = $true
+                  } elseif ($newVer.Minor -gt $oldVer.Minor) {
+                    $changeType = "minor"
+                    $emoji = "🚀"
+                  } else {
+                    $changeType = "patch"
+                    $emoji = "⬆️"
+                  }
+                }
+              } catch {
+                $changeType = "unknown"
+                $emoji = "🔄"
+              }
+
+              # Track major updates for changelog section
+              if ($isMajor) {
+                $compareUrl = "$repoUrl/compare/v$oldVersion...v$($s.version)"
+                $majorUpdates += @{
+                  name = $s.name
+                  oldVersion = $oldVersion
+                  newVersion = $s.version
+                  compareUrl = $compareUrl
+                  repoUrl = $repoUrl
+                }
+              }
+
               $listUpdated += "$($s.name) v$($s.version), "
-              $updateMessage += "| **[$($s.name)]($repoUrl)** | $oldVersion | **$($s.version)** |`n"
+              $updateMessage += "| $emoji **[$($s.name)]($repoUrl)** | \`$oldVersion\` | **\`$($s.version)\`** |`n"
             }
           }
-          if ($count -eq 0) { return }
-          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
+          if ($count -eq 0) { return }
-      if: env.COUNT_UPDATED > 0
+
+          Set-GHVariable -Name LIST_UPDATED -Value $listUpdated.Trim(', ')
+          # Set single dependency variables (they will only be used if COUNT_UPDATED is 1)
+          # Use safe fallback values in case variables weren't set (shouldn't happen but prevents errors)
+          if ([string]::IsNullOrEmpty($singleDepName) -and $count -eq 1) {
+            # This shouldn't happen, but if it does, log a warning
+            Write-Warning "Single dependency name not set despite count being 1"
+            $singleDepName = "unknown-package"
+            $singleDepOldVersion = "unknown"
+            $singleDepNewVersion = "unknown"
+          } elseif ([string]::IsNullOrEmpty($singleDepName)) {
+            # For multiple dependencies, set placeholder values (won't be used)
+            $singleDepName = ""
+            $singleDepOldVersion = ""
+            $singleDepNewVersion = ""
+          }
+
+          Set-GHVariable -Name SINGLE_DEP_NAME -Value $singleDepName
+          Set-GHVariable -Name SINGLE_DEP_OLD_VERSION -Value $singleDepOldVersion
+          Set-GHVariable -Name SINGLE_DEP_NEW_VERSION -Value $singleDepNewVersion
+
+          # Write multiline UPDATE_MESSAGE to GITHUB_ENV
+          Add-Content -Path $env:GITHUB_ENV -Value "UPDATE_MESSAGE<<EOF"
+          Add-Content -Path $env:GITHUB_ENV -Value $updateMessage
+          Add-Content -Path $env:GITHUB_ENV -Value "EOF"
+
+          # Generate major updates changelog section and export
+          if ($majorUpdates.Count -gt 0) {
+            $changelogSection = "`n<details>`n<summary>🔥 Major version updates - View changelog</summary>`n`n"
+            foreach ($update in $majorUpdates) {
+              $changelogSection += "### [$($update.name)]($($update.repoUrl))`n"
+              $changelogSection += "**$($update.oldVersion)** → **$($update.newVersion)**`n`n"
+              $changelogSection += "- [View full changelog]($($update.compareUrl))`n"
+              $changelogSection += "- [Release notes]($($update.repoUrl)/tag/v$($update.newVersion))`n`n"
+            }
+            $changelogSection += "</details>`n"
+
+            Add-Content -Path $env:GITHUB_ENV -Value "CHANGELOG_SECTION<<EOF"
+            Add-Content -Path $env:GITHUB_ENV -Value $changelogSection
+            Add-Content -Path $env:GITHUB_ENV -Value "EOF"
+            Add-Content -Path $env:GITHUB_ENV -Value "HAS_BREAKING_CHANGES=True"
+          } else {
+            Add-Content -Path $env:GITHUB_ENV -Value "CHANGELOG_SECTION="
+            Add-Content -Path $env:GITHUB_ENV -Value "HAS_BREAKING_CHANGES=False"
+          }
+
+    - name: Summary - Update check results
+      shell: pwsh
+      run: |
+        $count = [int]$env:COUNT_UPDATED
+
+        if ($count -eq 0) {
+          $summary = @(
+          '### ✅ No Updates Available'
+          ''
+          'All vendor dependencies are up to date! 🎉'
+          ''
+          )
+        } else {
+          $word = if ($count -eq 1) { 'dependency' } else { 'dependencies' }
+          $summary = @(
+          '### 🔄 Updates Found'
+          ''
+          )
+          $summary += '📦 **' + $env:SINGLE_DEP_NAME + '** updated from `' + $env:SINGLE_DEP_OLD_VERSION + '` to `' + $env:SINGLE_DEP_NEW_VERSION + '`' + [Environment]::NewLine + [Environment]::NewLine
+          $summary += '📦 **' + $count + '** vendor ' + $word + ' updated:' + [Environment]::NewLine + [Environment]::NewLine
+        }
+
+        $summary += $env:UPDATE_MESSAGE + [Environment]::NewLine
+
+        # Check if we can auto-merge (only minor/patch changes)
+        $hasBreaking = $env:HAS_BREAKING_CHANGES -eq 'True'
+        if ($hasBreaking) {
+          $summary += '> ⚠️ **Note:** This update contains major version changes that may include breaking changes.'
+        } else {
+          $summary += '> ℹ️ **Note:** This update only contains minor or patch changes.'
+        }
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8
+
+    - name: Auto-merge minor updates
+      if: env.COUNT_UPDATED > 0 && env.HAS_BREAKING_CHANGES != 'True'
+      shell: pwsh
+      run: |
+        try {
+          echo "### 🚀 Auto-merging Updates" >> $env:GITHUB_STEP_SUMMARY
+          echo "" >> $env:GITHUB_STEP_SUMMARY
+          echo "Attempting to automatically merge non-breaking changes to master..." >> $env:GITHUB_STEP_SUMMARY
+
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+          # Commit the changes
+          git add vendor/sources.json
+          $commitResult = git commit -m "⬆️ Update dependencies ($env:LIST_UPDATED)"
+
+          # Push directly to master
+          git push origin HEAD:master
+
+          echo "" >> $env:GITHUB_STEP_SUMMARY
+          echo "✅ **Success!** Updates have been automatically merged to master." >> $env:GITHUB_STEP_SUMMARY
+          echo "" >> $env:GITHUB_STEP_SUMMARY
+          echo "**Updated dependencies:** $env:LIST_UPDATED" >> $env:GITHUB_STEP_SUMMARY
+
+          # Set a flag to skip PR creation
+          echo "AUTO_MERGED=true" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+        } catch {
+          echo "" >> $env:GITHUB_STEP_SUMMARY
+          echo "⚠️ **Warning:** Unable to automatically merge updates." >> $env:GITHUB_STEP_SUMMARY
+          echo "" >> $env:GITHUB_STEP_SUMMARY
+          echo "**Error:** $($_.Exception.Message)" >> $env:GITHUB_STEP_SUMMARY
+          echo "" >> $env:GITHUB_STEP_SUMMARY
+          echo "Falling back to creating a pull request..." >> $env:GITHUB_STEP_SUMMARY
+
+          Write-Warning "Failed to auto-merge: $($_.Exception.Message)"
+
+          # Reset the commit if one was made
+          if ($commitResult) {
+            git reset --hard HEAD~1
+          }
+
+          # Set flag to create PR instead
+          echo "AUTO_MERGED=false" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+        }
+
+    - uses: peter-evans/create-pull-request@v8
+      if: env.COUNT_UPDATED > 0 && (env.HAS_BREAKING_CHANGES == 'True' || env.AUTO_MERGED == 'false')
       with:
-        title: 'Updates to `${{ env.COUNT_UPDATED }}` vendored dependencies'
+        title: ${{ env.COUNT_UPDATED == '1' && format('⬆️ Update {0}', env.LIST_UPDATED) || format('⬆️ Update {0} vendored dependencies', env.COUNT_UPDATED) }}
         body: |
-          ### Automatically updated `${{ env.COUNT_UPDATED }}` dependencies:
+          ### ${{ env.COUNT_UPDATED == 1 && format('📦 Updated {0} from `{1}` to `{2}`', env.SINGLE_DEP_NAME, env.SINGLE_DEP_OLD_VERSION, env.SINGLE_DEP_NEW_VERSION) || format('📦 Automatically updated `{0}` dependencies', env.COUNT_UPDATED) }}
+
           ${{ env.UPDATE_MESSAGE }}
+
+          ${{ env.CHANGELOG_SECTION }}
+
           ---
-          Please verify and then **Merge** the pull request to update.
+
+          ${{ env.HAS_BREAKING_CHANGES == 'True' && '⚠️ **This update contains major version changes that may include breaking changes.**' || 'ℹ️ This update only contains minor or patch changes.' }}
+
+          Please verify and then **Merge** the pull request to apply the updates.
         commit-message: '⬆️ Update dependencies (${{ env.LIST_UPDATED }})'
         branch: update-vendor
         base: master
+
+    - name: Summary - Pull request created
+      if: env.COUNT_UPDATED > 0 && (env.HAS_BREAKING_CHANGES == 'True' || env.AUTO_MERGED == 'false')
+      shell: pwsh
+      run: |
+        $updatedLine = if (-not [string]::IsNullOrEmpty($env:LIST_UPDATED)) { "**Updated dependencies:** $env:LIST_UPDATED" } else { "**Updated dependencies:** " }
+        $summary = @"
+        ### 🎉 Pull Request Created
+
+        A pull request has been created to update the vendor dependencies.
+
+        **Branch:** `update-vendor`
+
+        $updatedLine
+
+        "@
+
+        if ($env:HAS_BREAKING_CHANGES -eq 'True') {
+          $summary += "> ⚠️ **Manual review required:** This update contains major version changes."
+        } else {
+          $summary += "> ℹ️ **Note:** Auto-merge failed, manual review required."
+        }
+
+        $summary += @"
+        > Please review and merge the pull request to apply the updates.
+
+        "@
+
+        $summary | Add-Content -Path $env:GITHUB_STEP_SUMMARY -Encoding utf8

CHANGELOG.md

@@ -1,5 +1,84 @@
 # Change Log
 
+## [1.3.25](https://github.com/cmderdev/cmder/tree/v1.3.25) (2024-05-31)
+
+### Changes
+
+- Component Updates
+    - Update Git for Windows to 2.45.1.windows.1.
+    - Update ConEmu to 24.05.31.
+    - Clink 1.6.14.
+    - clink-completions 0.5.2.
+
+- Add `SECURITY.md` and refresh CI workflows and actions.
+- Enable `match.expand_envvars` and improve git diagnostics for improper versions.
+
+### Fixes
+
+- Fix #2944.
+- Fix script error when the working directory contains `%`.
+- Remove environment refresh race condition.
+
+## [1.3.24](https://github.com/cmderdev/cmder/tree/v1.3.24) (2023-07-24)
+
+### Changes
+
+- Update `build.yml` workflow.
+
+## [1.3.23](https://github.com/cmderdev/cmder/tree/v1.3.23) (2023-07-24)
+
+### Changes
+
+- Update ConEmu (conemu-maximus5) to 23.07.24.
+
+## [1.3.22](https://github.com/cmderdev/cmder/tree/v1.3.22) (2023-07-24)
+
+### Changes
+
+- Handle Clink injction differently in `init.bat`.
+- Changes to `clink_settings.lua.default`.
+    - Do not add commands to Clink Command Line History that begin with whitespace as a default.
+        - This can be changed to the old behavior by setting `history_ignore_space` to `0` in `config\clink_settings.lua`.
+    - `history.max_lines` is now defaults to `25000` instead of `10000`.
+        - This can be changed back to the old behavior by setting `history_max_lines` to `10000` in `config\clink_settings.lua`.
+    - `history.shared` now defaults to `False` instead of `True`.
+        - The previous default of `True` was causing issues with some users when using Cmder in multiple sessions.
+        - This can be changed back to the old behavior by setting `history_shared` to `1` in `config\clink_settings.lua`.
+
+- Component Updates
+    - Git for Windows to 2.41.0.windows.3
+    - Clink to 1.5.1
+    - ConEmu to 23.07.23
+    - clink-completions to 0.4.10
+
+- Remove AppVeyor configuration and add CodeQL scanning and Dependabot updates.
+
+### Fixes
+
+- Fix `/task "<taskName>"` handling.
+- Skip clink injection when initialization fails fatally.
+- Fix errors when git/svn/hg are not installed and in profile.d PowerShell scripts.
+
+## [1.3.21](https://github.com/cmderdev/cmder/tree/v1.3.21) (2022-12-19)
+
+### Fixes
+
+- Fix #2789.
+- Fix Git Bash `GIT_INSTALL_ROOT` handling.
+
+### Changes
+
+- Refactor `clink.lua` to speed up the prompt.
+- Refactor and Cleanup `init.bat` and related scripts.
+- Refactor and Cleanup `profile.ps1` and related scripts.
+- Remove handling of `clink` and `tcc` incompatibility.
+- Update ConEmu to mitigate CVE-2022-46387.
+- Update Git for Windows to 2.39.0.windows.1 and Clink to 1.4.4.
+
+### Adds
+
+- Add `show_warning` function to `vendor\lib\lib_console.cmd` for showing warning messages in yellow.
+
 ## [1.3.20](https://github.com/cmderdev/cmder/tree/v1.3.20) (2022-03-18)
 
 ### Changes

scripts/update.ps1

@@ -259,6 +259,8 @@ function Fetch-DownloadUrl {
 }
 
 $count = 0
+$hasBreakingChanges = $false
+$updateDetails = @()
 
 # Read the current sources content
 $sources = Get-Content $sourcesPath | Out-String | ConvertFrom-Json
@@ -301,6 +303,52 @@ foreach ($s in $sources) {
         # }
 
         $count++
+
+        # Analyze version change type
+        $changeType = "unknown"
+        try {
+            # Try parsing as semantic version
+            # Handle versions with more than 4 parts by taking only the first 3-4 parts
+            $oldVerStr = $s.version.Split('-')[0]
+            $newVerStr = $version.Split('-')[0]
+
+            # Split by dots and take only numeric parts, first 4 max
+            $oldParts = $oldVerStr.Split('.') | Where-Object { $_ -match '^\d+$' } | Select-Object -First 4
+            $newParts = $newVerStr.Split('.') | Where-Object { $_ -match '^\d+$' } | Select-Object -First 4
+
+            # Ensure we have at least 2 parts (major.minor)
+            if ($oldParts.Count -ge 2 -and $newParts.Count -ge 2) {
+                $oldVerParseable = $oldParts -join '.'
+                $newVerParseable = $newParts -join '.'
+
+                $oldVer = [System.Version]::Parse($oldVerParseable)
+                $newVer = [System.Version]::Parse($newVerParseable)
+
+                if ($newVer.Major -gt $oldVer.Major) {
+                    $changeType = "major"
+                    $hasBreakingChanges = $true
+                } elseif ($newVer.Minor -gt $oldVer.Minor) {
+                    $changeType = "minor"
+                } else {
+                    $changeType = "patch"
+                }
+            } else {
+                # Not enough numeric parts for semantic versioning
+                throw "Not enough numeric version parts"
+            }
+        } catch {
+            # If semantic versioning fails, treat as unknown (potentially breaking)
+            $changeType = "unknown"
+            $hasBreakingChanges = $true
+            Write-Verbose "Could not parse version as semantic version, treating as potentially breaking"
+        }
+
+        $updateDetails += @{
+            name = $s.name
+            oldVersion = $s.version
+            newVersion = $version
+            changeType = $changeType
+        }
     }
 
     $s.url = $downloadUrl
@@ -314,12 +362,16 @@ if ($count -eq 0) {
     return
 }
 
+# Export update details for GitHub Actions
+if ($Env:GITHUB_ACTIONS -eq 'true') {
+    $updateDetailsJson = $updateDetails | ConvertTo-Json -Compress
+    Write-Output "UPDATE_DETAILS=$updateDetailsJson" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+    Write-Output "HAS_BREAKING_CHANGES=$hasBreakingChanges" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+    Write-Output "::notice title=Task Complete::Successfully updated $count dependencies."
+}
+
 if ($Env:APPVEYOR -eq 'True') {
     Add-AppveyorMessage -Message "Successfully updated $count dependencies." -Category Information
 }
 
-if ($Env:GITHUB_ACTIONS -eq 'true') {
-    Write-Output "::notice title=Task Complete::Successfully updated $count dependencies."
-}
-
 Write-Host -ForegroundColor green "Successfully updated $count dependencies."

vendor/clink.lua

@@ -324,7 +324,7 @@ end
 -- Find out current branch
 -- @return {nil|git branch name}
 ---
-local function get_git_branch(git_dir)
+local function get_git_branch(git_dir, fast)
     git_dir = git_dir or get_git_dir()
 
     -- If git directory not found then we're probably outside of repo
@@ -341,8 +341,90 @@ local function get_git_branch(git_dir)
     -- 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/(.+)')
+    if os.getenv("CLINK_DEBUG_GIT_REFTABLE") then
+        branch_name = '.invalid'
+    end
 
-    return branch_name or 'HEAD detached at '..HEAD:sub(1, 7)
+    -- If the branch name is ".invalid" and the fast method wasn't requested,
+    -- then invoke git.exe to get accurate current branch info (slow method).
+    if branch_name == ".invalid" and not fast then
+        local file
+        branch_name = nil
+
+        -- Handle the most common case first.
+        if not branch_name then
+            file = io_popenyield("git --no-optional-locks branch 2>nul")
+            if file then
+                for line in file:lines() do
+                    local b = line:match("^%*%s+(.*)")
+                    if b then
+                        b = b:match("^%((HEAD detached at .*)%)") or b
+                        branch_name = b
+                        break
+                    end
+                end
+                file:close()
+            end
+        end
+
+        -- Handle the cases where "git branch" output is empty, but "git
+        -- branch --show-current" shows the branch name (e.g. a new repo).
+        if not branch_name then
+            file = io_popenyield("git --no-optional-locks branch --show-current 2>nul")
+            if file then
+                for line in file:lines() do -- luacheck: ignore 512
+                    branch_name = line
+                    break
+                end
+                file:close()
+            end
+        end
+    else
+        branch_name = branch_name or 'HEAD detached at '..HEAD:sub(1, 7)
+    end
+
+    return branch_name
+end
+
+local function get_git_remote(git_dir, branch)
+    if not git_dir then return nil end
+    if not branch then return nil end
+
+    local file = io.open(git_dir.."/config", 'r')
+    if not file then return nil end
+
+    local git_config = {}
+
+    local function get_git_config_value(section, param)
+        return git_config[section] and git_config[section][param] or nil
+    end
+
+    local section
+    for line in file:lines() do
+        if (line:sub(1,1) == "[" and line:sub(-1) == "]") then
+            if (line:sub(2,5) == "lfs ") then
+                section = nil -- skip LFS entries as there can be many and we never use them
+            else
+                section = line:sub(2,-2)
+                git_config[section] = git_config[section] or {}
+            end
+        elseif section then
+            local param, value = line:match('^%s-([%w|_]+)%s-=%s+(.+)$')
+            if (param and value ~= nil) then
+                git_config[section][param] = value
+            end
+        end
+    end
+    file:close()
+
+    local remote_to_push = get_git_config_value('branch "'..branch..'"', 'remote') or ''
+    local remote_ref = get_git_config_value('remote "'..remote_to_push..'"', 'push') or
+            get_git_config_value('push', 'default')
+
+    local text = remote_to_push
+    if remote_ref then text = text..'/'..remote_ref end
+
+    return text ~= '' and text or nil
 end
 
 ---
@@ -394,7 +476,7 @@ end
 -- Get the status and conflict status of working dir
 -- @return {bool <status>, bool <is_conflict>}
 ---
-local function get_git_status()
+local function get_git_status(git_dir)
     local file = io_popenyield("git --no-optional-locks status --porcelain 2>nul")
     if not file then
         return {}
@@ -416,7 +498,10 @@ local function get_git_status()
     end
     file:close()
 
-    return { status = is_status, conflict = conflict_found }
+    local branch = get_git_branch(git_dir, false--[[fast]])
+    local remote = get_git_remote(git_dir, branch)
+
+    return { status = is_status, branch = branch, remote = remote, conflict = conflict_found }
 end
 
 ---
@@ -515,11 +600,11 @@ end
 -- Use a prompt coroutine to get git status in the background.
 -- Cache the info so we can reuse it next time to reduce flicker.
 ---
-local function get_git_info_table()
+local function get_git_info_table(git_dir)
     local info = clink_promptcoroutine(function ()
         -- Use git status if allowed.
         local cmderGitStatusOptIn = get_git_status_setting()
-        return cmderGitStatusOptIn and get_git_status() or {}
+        return cmderGitStatusOptIn and get_git_status(git_dir) or {}
     end)
     if not info then
         info = cached_info.git_info or {}
@@ -539,10 +624,11 @@ local function git_prompt_filter()
     local git_dir = get_git_dir()
     local color
     if git_dir then
-        local branch = get_git_branch(git_dir)
+        local branch = get_git_branch(git_dir, true--[[fast]])
         if branch then
             -- If in a different repo or branch than last time, discard cached info.
-            if cached_info.git_dir ~= git_dir or cached_info.git_branch ~= branch then
+            if cached_info.git_dir ~= git_dir or
+                    (branch ~= ".invalid" and cached_info.git_branch ~= branch) then
                 cached_info.git_info = nil
                 cached_info.git_dir = git_dir
                 cached_info.git_branch = branch
@@ -550,10 +636,22 @@ local function git_prompt_filter()
 
             -- If we're inside of git repo then try to detect current branch
             -- Has branch => therefore it is a git folder, now figure out status
-            local gitInfo = get_git_info_table()
+            local gitInfo = get_git_info_table(git_dir)
             local gitStatus = gitInfo.status
             local gitConflict = gitInfo.conflict
 
+            -- Compensate for git reftables.
+            branch = gitInfo.branch or branch
+            if branch == ".invalid" then
+                branch = "Loading..."
+            elseif gitInfo.remote then
+                branch = branch.." -> "..gitInfo.remote
+            end
+
+            -- Prevent an older clink-completions git_prompt.lua scripts from
+            -- modifying the prompt.
+            branch = "\x1b[10m"..branch
+
             if gitStatus == nil then
                 color = get_unknown_color()
             elseif gitStatus then

vendor/sources.json

@@ -1,13 +1,13 @@
 [
   {
     "name": "git-for-windows",
-    "version": "2.51.2.windows.1",
+    "version": "2.52.0.windows.1",
-    "url": "https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/PortableGit-2.51.2-64-bit.7z.exe"
+    "url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/PortableGit-2.52.0-64-bit.7z.exe"
   },
   {
     "name": "clink",
-    "version": "1.8.8",
+    "version": "1.9.5",
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.8.8/clink.1.8.8.a63364.zip"
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.9.5/clink.1.9.5.ee6b4f.zip"
   },
   {
     "name": "conemu-maximus5",
@@ -21,7 +21,7 @@
   },
   {
     "name": "clink-completions",
-    "version": "0.6.6",
+    "version": "0.6.7",
-    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.6.zip"
+    "url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.6.7.zip"
   }
 ]