Conversation
…3859) * fix: command rewriting issues when terminal sandboxing is enabled Fixes two issues with sandboxed terminal commands: 1. Sandboxed commands end up in shell history (#303769): The PreventHistoryRewriter was running before SandboxRewriter, so the leading space was applied to the inner command but not the final sandbox-wrapped command. Moved PreventHistoryRewriter to run last. 2. cd CWD prefix not stripped in sandbox mode (#303848): The SandboxedCommandLinePresenter was using the original (un-rewritten) command for display, bypassing cd prefix stripping. Changed to use forDisplay instead. 3. Fixed forDisplay being clobbered: The rewriter loop unconditionally overwrote forDisplay, so later rewriters without a forDisplay (like PreventHistoryRewriter) would clear the sandbox's display value. Changed to only update when explicitly provided. Fixes #303769 Fixes #303848 * update doc comment for SandboxedCommandLinePresenter * improve execute strategy logging for CI diagnostics Upgrade strategy selection and completion logs to info level in runInTerminalTool. In richExecuteStrategy, log at info level when running in CI (for diagnosing shell integration race conditions) and debug otherwise. * fix: include ignorespace in bash shell integration history verification When VSCODE_PREVENT_SHELL_HISTORY=1 is set (which it is for all tool terminals created by the run_in_terminal tool), the bash shell integration script sets HISTCONTROL="ignorespace" (line 67). This causes bash to exclude space-prefixed commands from history. Later in the same script (line 200), a regex decides whether to use `history 1` or $BASH_COMMAND to capture the current command in __vsc_preexec. The regex checks for erasedups, ignoreboth, and ignoredups — but NOT ignorespace. This is a bug because: 1. The same script sets HISTCONTROL=ignorespace 130 lines earlier 2. ignoreboth (which IS in the regex) is defined by bash as "ignorespace + ignoredups" — so the compound form was handled but the simple form was not The consequence: with HISTCONTROL=ignorespace and __vsc_history_verify=1, __vsc_preexec calls `history 1` to get the current command. But the command has a leading space (added by PreventHistoryRewriter), so bash history never recorded it. `history 1` returns the PREVIOUS command or nothing. This causes __vsc_current_command to be wrong or empty. In __vsc_command_complete, when __vsc_current_command is empty, the script sends the OSC sequence 633;D WITHOUT an exit code (line 373). The VS Code side then receives onCommandFinished with exitCode=undefined, breaking exit code detection for ALL tool terminal commands on bash. The fix adds ignorespace to the existing regex, so bash falls back to $BASH_COMMAND (which always works regardless of history settings). This matches the behavior already provided when ignoreboth is set. * docs: improve fix-ci-failures skill with faster log retrieval workflow
fix #303645. handle uint8array in addition to vsbuffer
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )