starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-04 05:35:20 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #14341] [MERGED] Implement the rest of the FTCS marks #30056

New Issue
Open
opened 2026-01-31 09:38:24 +00:00 by claunia · 0 comments
claunia commented 2026-01-31 09:38:24 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/14341
Author: @zadjii-msft
Created: 11/4/2022
Status: ✅ Merged
Merged: 12/1/2022
Merged by: @undefined

Base: main ← Head: dev/migrie/f/11000-more-ftcs-marks

📝 Commits (10+)

  • 58b5d99 I think this is all the FTCS marks from dev/migrie/fhl/more-shell-integration
  • 63ffcc0 clarify notes
  • f1a96c4 scrolling is important
  • a1b9dac notes
  • a3ede80 Merge remote-tracking branch 'origin/main' into dev/migrie/f/11000-more-ftcs-marks
  • b3c523c Merge remote-tracking branch 'origin/main' into dev/migrie/f/11000-more-ftcs-marks
  • b02d222 nits, not the hard stuff
  • 43875fd commit before I get to demolition
  • 609e354 this is more resilient
  • 2317192 cleanup

📊 Changes

10 files changed (+243 additions, -29 deletions)

View changed files

📝 src/cascadia/TerminalControl/ControlCore.cpp (+1 -1)
📝 src/cascadia/TerminalCore/Terminal.cpp (+45 -11)
📝 src/cascadia/TerminalCore/Terminal.hpp (+14 -2)
📝 src/cascadia/TerminalCore/TerminalApi.cpp (+96 -2)
📝 src/host/outputStream.cpp (+16 -1)
📝 src/host/outputStream.hpp (+4 -1)
📝 src/terminal/adapter/DispatchTypes.hpp (+3 -0)
📝 src/terminal/adapter/ITerminalApi.hpp (+4 -1)
📝 src/terminal/adapter/adaptDispatch.cpp (+46 -8)
📝 src/terminal/adapter/ut_adapter/adapterTest.cpp (+14 -2)

📄 Description

As noted in #11000.

This adds support for FTCS_COMMAND_START, FTCS_COMMAND_EXECUTED and FTCS_COMMAND_FINISHED, which allow a shell to more clearly markup parts of the buffer.

As a trick, I'm also making the experimental.autoMarkPrompts setting act like a FTCS_COMMAND_EXECUTED if it comes after a FTCS_COMMAND_START. This lets the whole sequence work for cmd.exe (which wouldn't otherwise be possible).

  • My cmd prompt

    PROMPT $e]133;D$e\$e]133;A$e\$e]9;9;$P$e\[$T]$e[97;46m%_seperator%$P$e[36;49m%_seperator%$e[0m$_$e[0m%_GITPROMPT%$e[94m%username%$e[0m@$e[32m%computername%$e[0m$G$e]133;B$e\

  • pwsh profile, heavily cribbed from vscode

    
  $Global:__LastHistoryId = -1

  function Global:__Terminal-Get-LastExitCode {
    if ($? -eq $True) {
      return 0
    }
    # TODO: Should we just return a string instead?
    # return -1
    if ("$LastExitCode" -ne "") { return $LastExitCode }
    return -1
  }

  function prompt {
    # $gle = $LastExitCode


    $gle = $(__Terminal-Get-LastExitCode);
    $LastHistoryEntry = $(Get-History -Count 1)
    # Skip finishing the command if the first command has not yet started
    if ($Global:__LastHistoryId -ne -1) {
      if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
        # Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command)
        $out += "`e]133;D`a"
      } else {
        # Command finished exit code
        # OSC 633 ; D [; <ExitCode>] ST
        $out += "`e]133;D;$gle`a"
      }
    }


    $loc = $($executionContext.SessionState.Path.CurrentLocation);
    # IMPORTANT: Make sure there's a printable charater _last_ in the prompt.
    # Otherwise, PSReadline is gonna use the terminating `\` here and colorize
    # that if it detects a syntax error
    $out += "`e]133;A$([char]07)";
    $out += "`e]9;9;`"$loc`"$([char]07)";
    $out += "PWSH $loc$('>' * ($nestedPromptLevel + 1)) ";
    $out += "`e]133;B$([char]07)";

    $Global:__LastHistoryId = $LastHistoryEntry.Id

    return $out
  }

  • Doesn't close any issues, because this was always just an element in #11000

  • I work here

  • From FHL code

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/14341 **Author:** [@zadjii-msft](https://github.com/zadjii-msft) **Created:** 11/4/2022 **Status:** ✅ Merged **Merged:** 12/1/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/migrie/f/11000-more-ftcs-marks` --- ### 📝 Commits (10+) - [`58b5d99`](https://github.com/microsoft/terminal/commit/58b5d99c9be8297e6e287b8e3b1055be99d8357e) I think this is all the FTCS marks from `dev/migrie/fhl/more-shell-integration` - [`63ffcc0`](https://github.com/microsoft/terminal/commit/63ffcc044b9fdd1f21bc942e67bd4320060c3f4b) clarify notes - [`f1a96c4`](https://github.com/microsoft/terminal/commit/f1a96c4cb5f7855b68c748a25d666a6c5ebf2528) scrolling is important - [`a1b9dac`](https://github.com/microsoft/terminal/commit/a1b9dac49cf050aa6ae7309c168cf87299420699) notes - [`a3ede80`](https://github.com/microsoft/terminal/commit/a3ede801e613f7ca5b612f3fe33d02e941118442) Merge remote-tracking branch 'origin/main' into dev/migrie/f/11000-more-ftcs-marks - [`b3c523c`](https://github.com/microsoft/terminal/commit/b3c523c7678f80d1921579d2be1b4d82f55f0d2c) Merge remote-tracking branch 'origin/main' into dev/migrie/f/11000-more-ftcs-marks - [`b02d222`](https://github.com/microsoft/terminal/commit/b02d222e89ab97b022bb91745fd9b4b367cebc54) nits, not the hard stuff - [`43875fd`](https://github.com/microsoft/terminal/commit/43875fdb52d45b60e6910396994e1c2f0f2ff11d) commit before I get to demolition - [`609e354`](https://github.com/microsoft/terminal/commit/609e354a21f13c4041709222211e1dac38b23be5) this is more resilient - [`2317192`](https://github.com/microsoft/terminal/commit/23171926fdba0b05798e130c11a24baac3dde9a9) cleanup ### 📊 Changes **10 files changed** (+243 additions, -29 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalControl/ControlCore.cpp` (+1 -1) 📝 `src/cascadia/TerminalCore/Terminal.cpp` (+45 -11) 📝 `src/cascadia/TerminalCore/Terminal.hpp` (+14 -2) 📝 `src/cascadia/TerminalCore/TerminalApi.cpp` (+96 -2) 📝 `src/host/outputStream.cpp` (+16 -1) 📝 `src/host/outputStream.hpp` (+4 -1) 📝 `src/terminal/adapter/DispatchTypes.hpp` (+3 -0) 📝 `src/terminal/adapter/ITerminalApi.hpp` (+4 -1) 📝 `src/terminal/adapter/adaptDispatch.cpp` (+46 -8) 📝 `src/terminal/adapter/ut_adapter/adapterTest.cpp` (+14 -2) </details> ### 📄 Description As noted in #11000. This adds support for `FTCS_COMMAND_START`, `FTCS_COMMAND_EXECUTED` and `FTCS_COMMAND_FINISHED`, which allow a shell to more clearly markup parts of the buffer. As a trick, I'm also making the `experimental.autoMarkPrompts` setting act like a `FTCS_COMMAND_EXECUTED` if it comes after a `FTCS_COMMAND_START`. This lets the whole sequence work for cmd.exe (which wouldn't otherwise be possible). * My cmd prompt ```bat PROMPT $e]133;D$e\$e]133;A$e\$e]9;9;$P$e\[$T]$e[97;46m%_seperator%$P$e[36;49m%_seperator%$e[0m$_$e[0m%_GITPROMPT%$e[94m%username%$e[0m@$e[32m%computername%$e[0m$G$e]133;B$e\ ``` * pwsh profile, heavily cribbed from vscode ```pwsh $Global:__LastHistoryId = -1 function Global:__Terminal-Get-LastExitCode { if ($? -eq $True) { return 0 } # TODO: Should we just return a string instead? # return -1 if ("$LastExitCode" -ne "") { return $LastExitCode } return -1 } function prompt { # $gle = $LastExitCode $gle = $(__Terminal-Get-LastExitCode); $LastHistoryEntry = $(Get-History -Count 1) # Skip finishing the command if the first command has not yet started if ($Global:__LastHistoryId -ne -1) { if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) { # Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command) $out += "`e]133;D`a" } else { # Command finished exit code # OSC 633 ; D [; <ExitCode>] ST $out += "`e]133;D;$gle`a" } } $loc = $($executionContext.SessionState.Path.CurrentLocation); # IMPORTANT: Make sure there's a printable charater _last_ in the prompt. # Otherwise, PSReadline is gonna use the terminating `\` here and colorize # that if it detects a syntax error $out += "`e]133;A$([char]07)"; $out += "`e]9;9;`"$loc`"$([char]07)"; $out += "PWSH $loc$('>' * ($nestedPromptLevel + 1)) "; $out += "`e]133;B$([char]07)"; $Global:__LastHistoryId = $LastHistoryEntry.Id return $out } ``` * Doesn't close any issues, because this was always just an element in #11000 * I work here * From FHL code --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:38:24 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
⛺ Reserved
A11yCO
A11yMAS
A11ySev1
A11ySev2
A11ySev3
A11yTTValidated
A11yUsable
A11yVoiceAccess
A11yWCAG
Area-Accessibility
Area-AtlasEngine
Area-AzureShell
Area-Build
Area-Build
Area-Chat
Area-CmdPal
Area-CodeHealth
Area-Commandline
Area-CookedRead
Area-DefApp
Area-Extensibility
Area-Fonts
Area-GroupPolicy
Area-i18n
Area-Input
Area-Interaction
Area-Interop
Area-Localization
Area-Output
Area-Performance
Area-Portable
Area-Quality
Area-Remoting
Area-Rendering
Area-Schema
Area-Server
Area-Settings
Area-SettingsUI
Area-ShellExtension
Area-ShellExtension
Area-ShellExtension
Area-Suggestions
Area-Suggestions
Area-TerminalConnection
Area-TerminalControl
Area-Theming
Area-UserInterface
Area-VT
Area-Windowing
Area-WPFControl
AutoMerge
Blocking-Ingestion
Culprit-Centennial
Culprit-WinUI
Disability-All
Disability-Blind
Disability-LowVision
Disability-Mobility
External-Blocked-WinUI3
Fixed
Gathering-Data
good first issue
HCL-E+D
HCL-WindowsTerminal
Help Wanted
Impact-Compatibility
Impact-Compliance
Impact-Correctness
Impact-Visual
In-PR
InclusionBacklog
InclusionBacklog-Windows TerminalWin32
InclusionCommitted-202206
Issue-Bug
Issue-Docs
Issue-Feature
Issue-Feature
Issue-Question
Issue-Samples
Issue-Scenario
Issue-Task
Needs-Attention
Needs-Author-Feedback
Needs-Bisect
Needs-Discussion
Needs-Repro
Needs-Tag-Fix
Needs-Tag-Fix
Needs-Triage
No-Recent-Activity
Priority-0
Priority-1
Priority-2
Priority-3
Product-Cmd.exe
Product-Colortool
Product-Colortool
Product-Colortool
Product-Conhost
Product-Conpty
Product-Meta
Product-Powershell
Product-Terminal
Product-WSL
pull-request
Mirrored from GitHub Pull Request
 Resolution-Answered
Resolution-By-Design
Resolution-Duplicate
Resolution-External
Resolution-Fix-Available
Resolution-Fix-Committed
Resolution-No-Repro
Resolution-Won't-Fix
Severity-Blocking
Severity-Crash
Severity-DataLoss
spam
this-will-be-a-breaking-change
Tracking-External
WindowsTerminal_Win32
Work-Item
zAskModeBug
zInbox-Bug
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#30056
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?