Merge remote-tracking branch 'upstream/development' into development-dax

* upstream/development: (84 commits)
  update profile.ps1's debug output
  Make PowerShell profile.ps1's debug and verbose working correctly
  Redirect Verbose and Debug stream
  ignore git commit
  fix line endings
  adjust comments
  Update PowerShell test to set CMDER_DEBUG env variable inline
  improve CI PowrShell profile test debug/verbose output
  Modify PowerShell test command for debug output
  fix incorrect comment
  adjust comments
  adjust comments
  adjust comments
  Avoid duplicating cmd.exe prompt definition
  Consolidate terminal conditionals and add shell integration for bash and cmd.exe
  Add OSC 133;D support for command exit code tracking
  Initial plan
  adjust comments
  simplify regex
  adjust comments
  ...

Author: daxgames

.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+# List of whitespace-only commits to ignore in the Git blame;
+# to improve tracking changes and avoid noise
+58db4e3419bf1e5cc1bb61fcd7ce2ebbca89243a
+efb3338f5cf0eec21e8a75abc62ee14965cb4a7e
+3859f6ffc088b2ae78748abc84986f4adcadcd41
+d6569192fc91167f555c3eff58402ff01f1197ea
+67de97a492c9389f95499db38f9474a1c20ec585
+a0d085f93eaa69c22449d0217e8daf9eaea2b180
+1cfba25beb46c74bb1debca2bcfe7ac470e96172
+f6bc623284914489e891bbac923feb774c862b99
+abbab3f8b477e917d0a175d0de23cce121096631
+126347025f9cade241beff182738b2527da7535e
+4740b836f300658b27e6ad4d79efac63c9c24c24
+be44bac95670b1cbbc91bd657882d985989846f9
+f67e5704eda60526d495be758572181f01a6cac8

.github/workflows/branches.yml

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

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
       discussions: write
     steps:
     - name: Check out repository code (Action from GitHub)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
@@ -53,66 +53,66 @@ jobs:
       run: .\pack.ps1 -verbose -terminal all
 
     - name: Upload artifact (cmder_win_mini.zip)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/cmder_win_mini.zip
         name: cmder_win_mini.zip
         if-no-files-found: error
 
     - name: Upload artifact (cmder_win.7z)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/cmder_win.7z
         name: cmder_win.7z
         if-no-files-found: error
 
     - name: Upload artifact (cmder_win.zip)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/cmder_win.zip
         name: cmder_win.zip
         if-no-files-found: error
 
     - name: Upload artifact (cmder_wt.zip)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/cmder_wt.zip
         name: cmder_wt.zip
         if-no-files-found: error
 
     - name: Upload artifact (cmder_wt.7z)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/cmder_wt.7z
         name: cmder_wt.7z
 
     - name: Upload artifact (cmder_wt_mini.zip)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/cmder_wt_mini.zip
         name: cmder_wt_mini.zip
 
     - name: Upload artifact (cmder.zip)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/cmder.zip
         name: cmder.zip
         if-no-files-found: error
 
     - name: Upload artifact (cmder.7z)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/cmder.7z
         name: cmder.7z
 
     - name: Upload artifact (cmder_mini.zip)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/cmder_mini.zip
         name: cmder_mini.zip
 
     - name: Upload artifact (hashes.txt)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         path: build/hashes.txt
         name: hashes.txt

.github/workflows/codeql.yml

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

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
     continue-on-error: false
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Initialize vendors
       shell: pwsh
       working-directory: scripts
@@ -48,7 +48,7 @@ jobs:
           cmd /c vendor\init.bat /v /d /t
     - name: Testing PowerShell
       run: |
-          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "Invoke-Expression '. ''vendor\profile.ps1'''"
+          PowerShell.exe -ExecutionPolicy Bypass -NoLogo -NoProfile -Command "$env:CMDER_DEBUG='1'; . 'vendor\profile.ps1'"
     - name: Testing Bash
       run: |
           bash vendor/cmder.sh

.github/workflows/vendor.yml

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

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## Unreleased
+
+### Fixes
+
+- Fixes #2940
+
+### Adds
+
+- Cmder for Windows
+    - Uses Windows and Git for Windows Native Terminals.
+    - Does not contain a terminal emulator like ConEmu or Windows Terminal.
+
 ## [1.3.20](https://github.com/cmderdev/cmder/tree/v1.3.20) (2022-03-18)
 
 ### Changes

README.md

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

launcher/CmderLauncher.vcxproj

@@ -188,6 +188,9 @@
   <ItemGroup>
     <ClCompile Include="src\CmderLauncher.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\icons\cmder.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

launcher/src/CmderLauncher.cpp

@@ -105,11 +105,11 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }
 
-void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring title = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"", bool admin = false)
+void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring title = L"", std::wstring iconPath = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
 {
-#if USE_TASKBAR_API
-	wchar_t appId[MAX_PATH] = { 0 };
-#endif
+	#if USE_TASKBAR_API
+		wchar_t appId[MAX_PATH] = { 0 };
+	#endif
 	wchar_t exeDir[MAX_PATH] = { 0 };
 	wchar_t icoPath[MAX_PATH] = { 0 };
 	wchar_t cfgPath[MAX_PATH] = { 0 };
@@ -153,9 +153,9 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 
 	GetModuleFileName(NULL, exeDir, sizeof(exeDir));
 
-#if USE_TASKBAR_API
-	wcscpy_s(appId, exeDir);
-#endif
+	#if USE_TASKBAR_API
+		wcscpy_s(appId, exeDir);
+	#endif
 
 	PathRemoveFileSpec(exeDir);
 
@@ -312,7 +312,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 						MessageBox(NULL,
 							(GetLastError() == ERROR_ACCESS_DENIED)
 							? L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_%COMPUTERNAME%_settings.json! Access Denied."
-							: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_teerminal_%COMPUTERNAME%_settigns.json!", MB_TITLE, MB_ICONSTOP);
+							: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_%COMPUTERNAME%_settigns.json!", MB_TITLE, MB_ICONSTOP);
 						exit(1);
 					}
 					else if (PathFileExists(conEmuDir))
@@ -329,7 +329,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			{
 				if (!CopyFile(cpuCfgPath, cfgPath, FALSE))
 				{
-    				if (PathFileExists(windowsTerminalDir)) {
+					if (PathFileExists(windowsTerminalDir)) {
 						MessageBox(NULL,
 							(GetLastError() == ERROR_ACCESS_DENIED)
 							? L"Failed to copy config/windows_terminal_%COMPUTERNAME%_settings.json file to vendor/windows-terminal/settings/settings.json! Access Denied."
@@ -360,7 +360,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 						MessageBox(NULL,
 							(GetLastError() == ERROR_ACCESS_DENIED)
 							? L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_settings.json! Access Denied."
-							: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_teerminal_settigns.json!", MB_TITLE, MB_ICONSTOP);
+							: L"Failed to copy vendor/windows-terminal/settings/settings.json file to config/windows_terminal_settigns.json!", MB_TITLE, MB_ICONSTOP);
 						exit(1);
 					}
 					else if (PathFileExists(conEmuDir))
@@ -645,44 +645,13 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 	STARTUPINFO si = { 0 };
 
 	si.cb = sizeof(STARTUPINFO);
-#if USE_TASKBAR_API
-	si.lpTitle = appId;
-	si.dwFlags = STARTF_TITLEISAPPID;
-#endif
+	#if USE_TASKBAR_API
+		si.lpTitle = appId;
+		si.dwFlags = STARTF_TITLEISAPPID;
+	#endif
 	PROCESS_INFORMATION pi;
 
-	// MessageBox(NULL, terminalPath, _T("Error"), MB_OK);
-	// MessageBox(NULL, args, _T("Error"), MB_OK);
-	// Let's try to rerun as Administrator
-	SHELLEXECUTEINFO sei = { sizeof(sei) };
-	sei.fMask = SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS;
-	sei.lpVerb = L"runas";
-	sei.lpFile = terminalPath;
-	sei.lpParameters = args;
-	sei.nShow = SW_SHOWNORMAL;
-
-	if (admin && ShellExecuteEx(&sei))
-	{
-		if (!sei.hProcess)
-		{
-			Sleep(500);
-			_ASSERTE(sei.hProcess != nullptr);
-		}
-
-		if (sei.hProcess)
-		{
-			WaitForSingleObject(sei.hProcess, INFINITE);
-		}
-
-		// int nZone = 0;
-		// if (!HasZoneIdentifier(lsFile, nZone)
-		// 	|| (nZone != 0 /*LocalComputer*/))
-		// {
-		// 	// Assuming that elevated copy has fixed all zone problems
-		// 	break;
-		// }
-	}
-	else if (!CreateProcess(terminalPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi))
+	if (!CreateProcess(terminalPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi))
 	{
 		if (PathFileExists(windowsTerminalDir))
 		{
@@ -813,7 +782,6 @@ struct cmderOptions
 	std::wstring cmderIcon = L"";
 	std::wstring cmderRegScope = L"USER";
 	std::wstring cmderTerminalArgs = L"";
-	bool cmderAdmin = false;
 	bool cmderSingle = false;
 	bool cmderUserCfg = true;
 	bool registerApp = false;
@@ -902,10 +870,6 @@ cmderOptions GetOption()
 			{
 				cmderOptions.cmderUserCfg = false;
 			}
-			else if (_wcsicmp(L"/a", szArgList[i]) == 0 && !PathFileExists(windowsTerminalDir) && !PathFileExists(conEmuDir))
-			{
-				cmderOptions.cmderAdmin = true;
-			}
 			else if (_wcsicmp(L"/register", szArgList[i]) == 0)
 			{
 				cmderOptions.registerApp = true;
@@ -1042,7 +1006,8 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderTerminalArgs, cmderOptions.cmderAdmin);	}
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderTitle, cmderOptions.cmderIcon, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderTerminalArgs);
+	}
 
 	return 0;
 }