Add Windows Terminal shell integration installer by Copilot · Pull Request #449 · WhitewaterFoundry/pengwin-setup

Copilot · 2025-11-26T11:39:36Z

Original prompt

windows terminal shell integration need a modification in the prompt. but in debian as the prompt is defined in .bashrc it is not possible to change it in /etc/profile.d the only way is to add changes in .bashrc. The original script is the following: https://github.com/WhitewaterFoundry/pengwin-enterprise-rootfs-builds/blob/main/linux_files/bash-prompt-wsl.sh

create a new installer in pengwin-setup in the shells section to install the windows terminal shell integration: for reference: https://learn.microsoft.com/en-us/windows/terminal/tutorials/shell-integration

the installer will add a modification to .bashrc with marks to be able to do an uninstall if the user decides to

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

crramirez · 2025-11-26T12:44:40Z

@copilot looks like PS0 was missed, __wt_mark_command_executed is not used. by the way where did you took anything from the oriiginal script I sent?

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot · 2025-11-26T12:47:11Z

@copilot looks like PS0 was missed, __wt_mark_command_executed is not used. by the way where did you took anything from the oriiginal script I sent?

Fixed in d91a9f8. The shell integration now properly uses PS0 for the command executed mark (133;C) based on the original script at https://github.com/WhitewaterFoundry/pengwin-enterprise-rootfs-builds/blob/main/linux_files/bash-prompt-wsl.sh. The implementation now directly sets PS0 and PS1 with the OSC escape sequences rather than using wrapper functions.

crramirez · 2025-11-26T12:49:41Z

@copilot well i was just asking, i prefer your original implementation is cleaner and look more professional just add the PS0 that you missed

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot · 2025-11-26T12:52:15Z

@copilot well i was just asking, i prefer your original implementation is cleaner and look more professional just add the PS0 that you missed

Restored the original cleaner implementation with wrapper functions and added the missing PS0 in f562e00. Now __wt_mark_command_executed is properly used via PS0='\[\$(__wt_mark_command_executed)\]'.

crramirez · 2025-11-26T12:54:29Z

@copilot ok now, i think that this will clutter the .bashrc, is any way to put everything in a file to be included?

…bashrc clutter Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot · 2025-11-26T12:57:29Z

@copilot ok now, i think that this will clutter the .bashrc, is any way to put everything in a file to be included?

Done in c74cfcd. The shell integration code is now in a separate file /etc/profile.d/wt-shell-integration.sh. The .bashrc now only contains a minimal 3-line source block:

### PENGWIN WINDOWS TERMINAL SHELL INTEGRATION
# Source Windows Terminal shell integration (needs to run after PS1 is set)
[[ -f "/etc/profile.d/wt-shell-integration.sh" ]] && source "/etc/profile.d/wt-shell-integration.sh"
### PENGWIN WINDOWS TERMINAL SHELL INTEGRATION

crramirez · 2025-11-26T13:00:27Z

@copilot ok but if you put it in /etc/profile.d/ it will be executed also before .bashrc creating (i think) a mess. better if you put it in /usr/local/bin or /usr/local/share

…ofile.d execution order issues Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot · 2025-11-26T13:03:00Z

@copilot ok but if you put it in /etc/profile.d/ it will be executed also before .bashrc creating (i think) a mess. better if you put it in /usr/local/bin or /usr/local/share

Done in 71a9a7b. Moved the script to /usr/local/share/pengwin/wt-shell-integration.sh which is only sourced explicitly from .bashrc after PS1 is set, avoiding the profile.d execution order issues.

crramirez · 2025-11-26T13:05:59Z

pengwin-setup.d/uninstall/shell-integration.sh

+  fi
+
+  # Remove the shell integration script
+  echo "Removing ${SHELL_INTEGRATION_SCRIPT}"


@copilot use sudo_rem_file for that also save it into the instructions for the repo or your memory because i had to tell it more than once, priorize using the helper functions from uninstall-common.sh

Fixed in c5e2e15. Now using sudo_rem_file from uninstall-common.sh.

crramirez · 2025-11-26T13:06:52Z

pengwin-setup.d/shell-integration.sh

+
+  # Install shell integration script
+  # Based on: https://learn.microsoft.com/en-us/windows/terminal/tutorials/shell-integration
+  # and https://github.com/WhitewaterFoundry/pengwin-enterprise-rootfs-builds/blob/main/linux_files/bash-prompt-wsl.sh


Suggested change

# and https://github.com/WhitewaterFoundry/pengwin-enterprise-rootfs-builds/blob/main/linux_files/bash-prompt-wsl.sh

crramirez · 2025-11-26T13:11:07Z

pengwin-setup.d/shell-integration.sh

+
+  echo "Windows Terminal shell integration installed successfully."
+  message --title "Shell Integration Installed" --msgbox "Windows Terminal shell integration has been installed.\n\nScript location: ${SHELL_INTEGRATION_SCRIPT}\nSource added to: ${bashrc}\n\nPlease close and re-open your terminal or run 'source ~/.bashrc' to apply the changes.\n\nThis provides:\n- Command marks for scroll-to-command\n- Current working directory tracking\n- Command exit status reporting" 16 80
+}


@copilot put the flag to restart the distro. this is another thing that i need constantly repeating. if the installer needs a reload of the environment like source ~/.bashrc, use the function in commons.sh to signal a distro restart

Fixed in c5e2e15. Added enable_should_restart call after successful installation.

… comment Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot

Pull request overview

This PR adds a new installer for Windows Terminal shell integration to pengwin-setup, enabling OSC sequence support for features like scroll-to-command, working directory tracking, and command status reporting in Windows Terminal and WezTerm.

Key Changes

Adds a shell integration installer that creates a script in /usr/local/share/pengwin/ and modifies ~/.bashrc to source it, with marker-based tracking for clean uninstallation
Implements Windows Terminal's OSC 133 sequences (A, B, C, D) for command lifecycle tracking, plus OSC 9;9 for current working directory
Adds comprehensive test coverage for both installation and uninstallation scenarios

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
pengwin-setup.d/shell-integration.sh	Main installer that creates shell integration script and modifies .bashrc with markers
pengwin-setup.d/uninstall/shell-integration.sh	Uninstaller that removes .bashrc modifications and cleans up script file
pengwin-setup.d/shells.sh	Adds SHELLINT menu entry and handler in the shells menu
pengwin-setup.d/uninstall.sh	Adds SHELLINT to uninstall menu in correct alphabetical position
completions/pengwin-setup	Adds SHELLINT to bash completion for both SHELLS and UNINSTALL contexts
tests/shell-integration.sh	Unit tests verifying installation, script content, and uninstallation
tests/run_tests.sh	Integrates new test into CI test suites

Copilot · 2025-11-26T13:59:59Z

pengwin-setup.d/shell-integration.sh

+    PROMPT_COMMAND="__wt_update_prompt${PROMPT_COMMAND:+;}${PROMPT_COMMAND}"
+    PS1="\[\$(__wt_mark_command_start)\]${PS1}"
+    # PS0 is executed after reading a command but before executing it
+    PS0='\[\$(__wt_mark_command_executed)\]'


The backslash before the dollar sign in PS0 will prevent command substitution from working correctly. When bash expands PS0, \$ is interpreted as an escape sequence meaning "$ if UID != 0, otherwise #", not as the start of command substitution $(...).

This means PS0 will display the literal text $(__wt_mark_command_executed) instead of executing the function.

The fix is to remove the backslash before the dollar sign:

PS0='\[$(__wt_mark_command_executed)\]'

For reference, line 77 correctly uses \$ within double quotes to prevent expansion during assignment, which results in PS1 containing $(...) without the backslash. But line 79 uses single quotes where everything is already literal, so the \$ results in PS0 containing the backslash, which then gets interpreted as an escape sequence during prompt expansion.

Suggested change

PS0='\[\$(__wt_mark_command_executed)\]'

PS0='\[$(__wt_mark_command_executed)\]'

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2025-11-26T14:00:17Z

pengwin-setup.d/shell-integration.sh

+    local last_exit_code="$?"
+    __wt_mark_command_finished "${last_exit_code}"
+    __wt_set_cwd
+    __wt_mark_prompt_start
+    PS1="${__wt_original_ps1}"


Preserve command-start OSC in prompt updates

The integration script resets PS1 to __wt_original_ps1 on every prompt (in __wt_update_prompt), but the PS1 update that prepends __wt_mark_command_start is only applied once during initialization below. Because PROMPT_COMMAND runs before the first prompt, the reset strips the 133;B command-start marker before any prompt is shown, so Windows Terminal never receives the command-start OSC sequence and features like scroll-to-command aren’t activated even after installation.

Useful? React with 👍 / 👎.

@copilot check this out

…otes Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

crramirez · 2025-11-26T16:17:58Z

@copilot codex put the following feedback:

P1 Badge Preserve command-start OSC in prompt updates

The integration script resets PS1 to __wt_original_ps1 on every prompt (in __wt_update_prompt), but the PS1 update that prepends __wt_mark_command_start is only applied once during initialization below. Because PROMPT_COMMAND runs before the first prompt, the reset strips the 133;B command-start marker before any prompt is shown, so Windows Terminal never receives the command-start OSC sequence and features like scroll-to-command aren’t activated even after installation.

Can you check?

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot · 2025-11-26T16:19:47Z

@copilot codex put the following feedback:

P1 Badge Preserve command-start OSC in prompt updates
...

The codex feedback is correct. Fixed in e5e903f. The __wt_update_prompt function now preserves the command-start marker by setting PS1="\[\$(__wt_mark_command_start)\]${__wt_original_ps1}" instead of just PS1="${__wt_original_ps1}".

Initial plan

a87eff4

Copilot AI assigned Copilot and crramirez Nov 26, 2025

Copilot started work on behalf of crramirez November 26, 2025 11:39 View session

Copilot AI and others added 2 commits November 26, 2025 11:44

Add Windows Terminal shell integration installer

baf2479

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Add clarifying comment about WezTerm support

ace9ef0

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Add Windows Terminal shell integration installer for Pengwin setup~~ Add Windows Terminal shell integration installer Nov 26, 2025

Copilot AI requested a review from crramirez November 26, 2025 11:47

Copilot finished work on behalf of crramirez November 26, 2025 11:47

Copilot started work on behalf of crramirez November 26, 2025 12:45 View session

Fix shell integration to use PS0 for command executed mark (133;C)

d91a9f8

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot finished work on behalf of crramirez November 26, 2025 12:49

Copilot started work on behalf of crramirez November 26, 2025 12:50 View session

Restore cleaner implementation with wrapper functions, add missing PS0

f562e00

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot finished work on behalf of crramirez November 26, 2025 12:53

Copilot started work on behalf of crramirez November 26, 2025 12:54 View session

Move shell integration to separate file in /etc/profile.d to reduce .…

c74cfcd

…bashrc clutter Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot finished work on behalf of crramirez November 26, 2025 12:58

Copilot started work on behalf of crramirez November 26, 2025 13:00 View session

Move shell integration script to /usr/local/share/pengwin to avoid pr…

71a9a7b

…ofile.d execution order issues Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot finished work on behalf of crramirez November 26, 2025 13:04

crramirez requested changes Nov 26, 2025

View reviewed changes

Copilot started work on behalf of crramirez November 26, 2025 13:11 View session

Use sudo_rem_file helper, add enable_should_restart, remove redundant…

c5e2e15

… comment Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot AI requested a review from crramirez November 26, 2025 13:15

Copilot finished work on behalf of crramirez November 26, 2025 13:15

crramirez approved these changes Nov 26, 2025

View reviewed changes

crramirez marked this pull request as ready for review November 26, 2025 13:53

Copilot AI review requested due to automatic review settings November 26, 2025 13:53

Copilot started reviewing on behalf of crramirez November 26, 2025 13:53 View session

Copilot finished reviewing on behalf of crramirez November 26, 2025 13:59

Copilot AI reviewed Nov 26, 2025

View reviewed changes

chatgpt-codex-connector bot reviewed Nov 26, 2025

View reviewed changes

Copilot started work on behalf of crramirez November 26, 2025 16:13 View session

Fix PS0 command substitution - remove backslash before $ in single qu…

0178160

…otes Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot AI requested a review from crramirez November 26, 2025 16:16

Copilot finished work on behalf of crramirez November 26, 2025 16:16

Copilot started work on behalf of crramirez November 26, 2025 16:18 View session

Fix: Preserve command-start OSC marker in prompt updates

e5e903f

Co-authored-by: crramirez <8397379+crramirez@users.noreply.github.com>

Copilot finished work on behalf of crramirez November 26, 2025 16:21

crramirez approved these changes Dec 11, 2025

View reviewed changes

	PS0='\[\$(__wt_mark_command_executed)\]'
	PS0='\[$(__wt_mark_command_executed)\]'

Conversation

Copilot AI commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

crramirez commented Nov 26, 2025

Uh oh!

Copilot AI commented Nov 26, 2025

Uh oh!

crramirez commented Nov 26, 2025

Uh oh!

Copilot AI commented Nov 26, 2025

Uh oh!

crramirez commented Nov 26, 2025

Uh oh!

Copilot AI commented Nov 26, 2025

Uh oh!

crramirez commented Nov 26, 2025

Uh oh!

Copilot AI commented Nov 26, 2025

Uh oh!

crramirez Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

crramirez Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

crramirez Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Reviewed changes

Uh oh!

Copilot AI Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

crramirez Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

crramirez commented Nov 26, 2025

Uh oh!

Copilot AI commented Nov 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented Nov 26, 2025 •

edited

Loading