@microsoft/inshellisense 0.0.1-rc.14 → 0.0.1-rc.16

package/LICENSE

@@ -1,21 +1,21 @@
-    MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

package/README.md

@@ -47,6 +47,8 @@ is init xonsh >> ~/.xonshrc
 is init nu >> $nu.env-path
 ```
 
+When updating your shell configuration in the future, make sure the inshellisense plugin is the last command in the file.
+
 ### Usage
 
 | Action                                | Command | Description                                      |
@@ -81,7 +83,7 @@ inshellisense supports the following shells:
 
 ## Configuration
 
-All configuration is done through a [toml](https://toml.io/) file located at `~/.inshellisenserc`. The [JSON schema](https://json-schema.org/) for the configuration file can be found [here](https://github.com/microsoft/inshellisense/blob/main/src/utils/config.ts).
+All configuration is done through a [toml](https://toml.io/) file. You can create this file at `~/.inshellisenserc` or, for XDG compliance, at `~/.config/inshellisense/rc.toml`. The [JSON schema](https://json-schema.org/) for the configuration file can be found [here](https://github.com/microsoft/inshellisense/blob/main/src/utils/config.ts).
 
 ### Keybindings
 
@@ -106,18 +108,6 @@ key = "escape"
 
 Key names are matched against the Node.js [keypress](https://nodejs.org/api/readline.html#readlineemitkeypresseventsstream-interface) events.
 
-### Custom Prompts (Windows)
-
-If you are using a custom prompt in your shell (anything that is not the default PS1), you will need to set up a custom prompt in the inshellisense config file. This is because Windows strips details from your prompt which are required for inshellisense to work. To do this, update your config file in your home directory and add the following configuration:
-
-```toml
-[[prompt.bash]]
-regex = "(?<prompt>^>\\s*)" # the prompt match group will be used to detect the prompt
-postfix = ">" # the postfix is the last expected character in your prompt
-```
-
-This example adds custom prompt detection for bash where the prompt is expected to be only `> `. You can add similar configurations for other shells as well as well as multiple configurations for each shell.
-
 ## Contributing
 
 This project welcomes contributions and suggestions. Most contributions require you to agree to a

package/SECURITY.md

@@ -1,41 +1,41 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
-
-## Security
-
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
-
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
-
-## Reporting Security Issues
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
-
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
-
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/build/commands/shellenv.js

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { Command } from "commander";
+import { shellEnvSupportedShells as shells, getShellConfig } from "../utils/shell.js";
+const supportedShells = shells.join(", ");
+const action = (program) => async (shell) => {
+    if (!shells.map((s) => s.valueOf()).includes(shell)) {
+        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
+    }
+    const config = getShellConfig(shell);
+    process.stdout.write(`\n\n# ---------------- inshellisense shell plugin ----------------\n${config}`);
+    process.exit(0);
+};
+const cmd = new Command("shellenv");
+cmd.description(`generates shell configurations for the provided shell`);
+cmd.argument("<shell>", `shell to generate configuration for, supported shells: ${supportedShells}`);
+cmd.action(action(cmd));
+export default cmd;

package/build/isterm/commandManager.js

@@ -4,19 +4,21 @@ import convert from "color-convert";
 import os from "node:os";
 import { getShellPromptRewrites, Shell } from "../utils/shell.js";
 import log from "../utils/log.js";
-import { getConfig } from "../utils/config.js";
 const maxPromptPollDistance = 10;
 export class CommandManager {
     #activeCommand;
     #terminal;
     #previousCommandLines;
+    #maxCursorY;
     #shell;
     #promptRewrites;
     #supportsProperOscPlacements = os.platform() !== "win32";
+    promptTerminator = "";
     constructor(terminal, shell) {
         this.#terminal = terminal;
         this.#shell = shell;
         this.#activeCommand = {};
+        this.#maxCursorY = 0;
         this.#previousCommandLines = new Set();
         this.#promptRewrites = getShellPromptRewrites(shell);
         if (this.#supportsProperOscPlacements) {
@@ -45,17 +47,9 @@ export class CommandManager {
     }
     handleClear() {
         this.handlePromptStart();
+        this.#maxCursorY = 0;
         this.#previousCommandLines = new Set();
     }
-    _extractPrompt(lineText, patterns) {
-        for (const { regex, postfix } of patterns) {
-            const customPrompt = lineText.match(new RegExp(regex))?.groups?.prompt;
-            const adjustedPrompt = this._adjustPrompt(customPrompt, lineText, postfix);
-            if (adjustedPrompt) {
-                return adjustedPrompt;
-            }
-        }
-    }
     _getWindowsPrompt(y) {
         const line = this.#terminal.buffer.active.getLine(y);
         if (!line) {
@@ -65,15 +59,16 @@ export class CommandManager {
         if (!lineText) {
             return;
         }
+        // dynamic prompt terminator
+        if (this.promptTerminator && lineText.trim().endsWith(this.promptTerminator)) {
+            const adjustedPrompt = this._adjustPrompt(lineText, lineText, this.promptTerminator);
+            if (adjustedPrompt) {
+                return adjustedPrompt;
+            }
+        }
         // User defined prompt
-        const inshellisenseConfig = getConfig();
         if (this.#shell == Shell.Bash) {
-            if (inshellisenseConfig?.prompt?.bash != null) {
-                const extractedPrompt = this._extractPrompt(lineText, inshellisenseConfig.prompt.bash);
-                if (extractedPrompt)
-                    return extractedPrompt;
-            }
-            const bashPrompt = lineText.match(/^(?<prompt>.*\$\s?)/)?.groups?.prompt;
+            const bashPrompt = lineText.match(/^(?<prompt>\$\s?)/)?.groups?.prompt;
             if (bashPrompt) {
                 const adjustedPrompt = this._adjustPrompt(bashPrompt, lineText, "$");
                 if (adjustedPrompt) {
@@ -81,12 +76,16 @@ export class CommandManager {
                 }
             }
         }
-        if (this.#shell == Shell.Nushell) {
-            if (inshellisenseConfig?.prompt?.nu != null) {
-                const extractedPrompt = this._extractPrompt(lineText, inshellisenseConfig.prompt.nu);
-                if (extractedPrompt)
-                    return extractedPrompt;
+        if (this.#shell == Shell.Fish) {
+            const fishPrompt = lineText.match(/(?<prompt>.*>\s?)/)?.groups?.prompt;
+            if (fishPrompt) {
+                const adjustedPrompt = this._adjustPrompt(fishPrompt, lineText, ">");
+                if (adjustedPrompt) {
+                    return adjustedPrompt;
+                }
             }
+        }
+        if (this.#shell == Shell.Nushell) {
             const nushellPrompt = lineText.match(/(?<prompt>.*>\s?)/)?.groups?.prompt;
             if (nushellPrompt) {
                 const adjustedPrompt = this._adjustPrompt(nushellPrompt, lineText, ">");
@@ -96,11 +95,6 @@ export class CommandManager {
             }
         }
         if (this.#shell == Shell.Xonsh) {
-            if (inshellisenseConfig?.prompt?.xonsh != null) {
-                const extractedPrompt = this._extractPrompt(lineText, inshellisenseConfig.prompt.xonsh);
-                if (extractedPrompt)
-                    return extractedPrompt;
-            }
             let xonshPrompt = lineText.match(/(?<prompt>.*@\s?)/)?.groups?.prompt;
             if (xonshPrompt) {
                 const adjustedPrompt = this._adjustPrompt(xonshPrompt, lineText, "@");
@@ -117,16 +111,6 @@ export class CommandManager {
             }
         }
         if (this.#shell == Shell.Powershell || this.#shell == Shell.Pwsh) {
-            if (inshellisenseConfig?.prompt?.powershell != null) {
-                const extractedPrompt = this._extractPrompt(lineText, inshellisenseConfig.prompt.powershell);
-                if (extractedPrompt)
-                    return extractedPrompt;
-            }
-            if (inshellisenseConfig?.prompt?.pwsh != null) {
-                const extractedPrompt = this._extractPrompt(lineText, inshellisenseConfig.prompt.pwsh);
-                if (extractedPrompt)
-                    return extractedPrompt;
-            }
             const pwshPrompt = lineText.match(/(?<prompt>(\(.+\)\s)?(?:PS.+>\s?))/)?.groups?.prompt;
             if (pwshPrompt) {
                 const adjustedPrompt = this._adjustPrompt(pwshPrompt, lineText, ">");
@@ -170,12 +154,9 @@ export class CommandManager {
         const dim = (cell?.isDim() ?? 0) > 0;
         const italic = (cell?.isItalic() ?? 0) > 0;
         const dullColor = color == 8 || color == 7 || (color ?? 0) > 235 || (color == 15 && dim);
-        const dullItalic = (color ?? 0) > 235 || (dullColor && italic);
-        if (this.#shell == Shell.Powershell) {
-            return false;
-        }
-        else if (this.#shell == Shell.Pwsh) {
-            return dullItalic;
+        const dimItalic = dim || italic;
+        if (this.#shell == Shell.Pwsh || this.#shell == Shell.Powershell) {
+            return dimItalic;
         }
         return dullColor;
     }
@@ -191,13 +172,78 @@ export class CommandManager {
     clearActiveCommand() {
         this.#activeCommand = {};
     }
+    _getCommandLines() {
+        const lines = [];
+        let lineY = this.#activeCommand.promptEndMarker.line;
+        let line = this.#terminal.buffer.active.getLine(this.#activeCommand.promptEndMarker.line);
+        const absoluteY = this.#terminal.buffer.active.baseY + this.#terminal.buffer.active.cursorY;
+        for (; lineY < this.#terminal.buffer.active.baseY + this.#terminal.rows;) {
+            if (line)
+                lines.push(line);
+            lineY += 1;
+            line = this.#terminal.buffer.active.getLine(lineY);
+            const lineWrapped = line?.isWrapped;
+            const cursorWrapped = absoluteY > lineY - 1;
+            const wrapped = lineWrapped || cursorWrapped;
+            if (!wrapped)
+                break;
+        }
+        return lines;
+    }
+    _getCommandText(commandLines) {
+        const absoluteY = this.#terminal.buffer.active.baseY + this.#terminal.buffer.active.cursorY;
+        const cursorLine = Math.max(absoluteY - this.#activeCommand.promptEndMarker.line, 0);
+        let preCursorCommand = "";
+        let postCursorCommand = "";
+        let suggestion = "";
+        for (const [y, line] of commandLines.entries()) {
+            const startX = y == 0 ? this.#activeCommand.promptText?.length ?? 0 : 0;
+            for (let x = startX; x < this.#terminal.cols; x++) {
+                if (postCursorCommand.endsWith("    "))
+                    break; // assume that a command that ends with 4 spaces is terminated, avoids capturing right prompts
+                const cell = line.getCell(x);
+                if (cell == null)
+                    continue;
+                const chars = cell.getChars() == "" ? " " : cell.getChars();
+                const beforeCursor = y < cursorLine || (y == cursorLine && x < this.#terminal.buffer.active.cursorX);
+                const isCommand = !this._isSuggestion(cell) && suggestion.length == 0;
+                if (isCommand && beforeCursor) {
+                    preCursorCommand += chars;
+                }
+                else if (isCommand) {
+                    postCursorCommand += chars;
+                }
+                else {
+                    suggestion += chars;
+                }
+            }
+        }
+        log.debug({ msg: "command text", preCursorCommand, postCursorCommand, suggestion });
+        return { suggestion, preCursorCommand, postCursorCommand };
+    }
+    _getCommandOutputStatus(commandLines) {
+        const outputLineY = this.#activeCommand.promptEndMarker.line + commandLines;
+        const maxLineY = this.#terminal.buffer.active.baseY + this.#terminal.rows;
+        if (outputLineY >= maxLineY)
+            return false;
+        const line = this.#terminal.buffer.active.getLine(outputLineY);
+        let cell = undefined;
+        for (let i = 0; i < this.#terminal.cols; i++) {
+            cell = line?.getCell(i, cell);
+            if (cell?.getChars() != "") {
+                return true;
+            }
+        }
+        return false;
+    }
     termSync() {
         if (this.#activeCommand.promptEndMarker == null || this.#activeCommand.promptStartMarker == null) {
             return;
         }
         const globalCursorPosition = this.#terminal.buffer.active.baseY + this.#terminal.buffer.active.cursorY;
         const withinPollDistance = globalCursorPosition < this.#activeCommand.promptEndMarker.line + 5;
-        if (globalCursorPosition < this.#activeCommand.promptStartMarker.line) {
+        this.#maxCursorY = Math.max(this.#maxCursorY, globalCursorPosition);
+        if (globalCursorPosition < this.#activeCommand.promptStartMarker.line || globalCursorPosition < this.#maxCursorY) {
             this.handleClear();
             this.#activeCommand.promptEndMarker = this.#terminal.registerMarker(0);
             return;
@@ -221,60 +267,15 @@ export class CommandManager {
         }
         // if the prompt is set, now parse out the values from the terminal
         if (this.#activeCommand.promptText != null) {
-            let lineY = this.#activeCommand.promptEndMarker.line;
-            let line = this.#terminal.buffer.active.getLine(this.#activeCommand.promptEndMarker.line);
-            let command = "";
-            let wrappedCommand = "";
-            let suggestions = "";
-            let isWrapped = false;
-            for (; lineY < this.#terminal.buffer.active.baseY + this.#terminal.rows;) {
-                for (let i = lineY == this.#activeCommand.promptEndMarker.line ? this.#activeCommand.promptText.length : 0; i < this.#terminal.cols; i++) {
-                    if (command.endsWith("    "))
-                        break; // assume that a command that ends with 4 spaces is terminated, avoids capturing right prompts
-                    const cell = line?.getCell(i);
-                    if (cell == null)
-                        continue;
-                    const chars = cell.getChars();
-                    const cleanedChars = chars == "" ? " " : chars;
-                    if (!this._isSuggestion(cell) && suggestions.length == 0) {
-                        command += cleanedChars;
-                        wrappedCommand += cleanedChars;
-                    }
-                    else {
-                        suggestions += cleanedChars;
-                    }
-                }
-                lineY += 1;
-                line = this.#terminal.buffer.active.getLine(lineY);
-                const wrapped = line?.isWrapped || this.#terminal.buffer.active.cursorY + this.#terminal.buffer.active.baseY != lineY - 1;
-                isWrapped = isWrapped || wrapped;
-                if (!wrapped) {
-                    break;
-                }
-                wrappedCommand = "";
-            }
-            const cursorAtEndOfInput = isWrapped
-                ? wrappedCommand.trim().length % this.#terminal.cols <= this.#terminal.buffer.active.cursorX
-                : (this.#activeCommand.promptText.length + command.trimEnd().length) % this.#terminal.cols <= this.#terminal.buffer.active.cursorX;
-            let hasOutput = false;
-            let cell = undefined;
-            for (let i = 0; i < this.#terminal.cols; i++) {
-                cell = line?.getCell(i, cell);
-                if (cell == null)
-                    continue;
-                hasOutput = cell.getChars() != "";
-                if (hasOutput) {
-                    break;
-                }
-            }
-            const postfixActive = isWrapped
-                ? wrappedCommand.trim().length < this.#terminal.buffer.active.cursorX
-                : this.#activeCommand.promptText.length + command.trimEnd().length < this.#terminal.buffer.active.cursorX;
-            const commandPostfix = postfixActive ? " " : "";
+            const commandLines = this._getCommandLines();
+            const { suggestion, preCursorCommand, postCursorCommand } = this._getCommandText(commandLines);
+            const command = preCursorCommand + postCursorCommand.trim();
+            const cursorAtEndOfInput = postCursorCommand.trim() == "";
+            const hasOutput = this._getCommandOutputStatus(commandLines.length);
             this.#activeCommand.persistentOutput = this.#activeCommand.hasOutput && hasOutput;
             this.#activeCommand.hasOutput = hasOutput;
-            this.#activeCommand.suggestionsText = suggestions.trim();
-            this.#activeCommand.commandText = command.trim() + commandPostfix;
+            this.#activeCommand.suggestionsText = suggestion;
+            this.#activeCommand.commandText = command;
             this.#activeCommand.cursorTerminated = cursorAtEndOfInput;
         }
         log.debug({
@@ -282,6 +283,8 @@ export class CommandManager {
             ...this.#activeCommand,
             promptEndMarker: this.#activeCommand.promptEndMarker?.line,
             promptStartMarker: this.#activeCommand.promptStartMarker?.line,
+            cursorX: this.#terminal.buffer.active.cursorX,
+            cursorY: globalCursorPosition,
         });
     }
 }

package/build/isterm/pty.js

@@ -6,6 +6,8 @@ import os from "node:os";
 import path from "node:path";
 import url from "node:url";
 import fs from "node:fs";
+import stripAnsi from "strip-ansi";
+import { Unicode11Addon } from "@xterm/addon-unicode11";
 import pty from "@homebridge/node-pty-prebuilt-multiarch";
 import { Shell, userZdotdir, zdotdir } from "../utils/shell.js";
 import { IsTermOscPs, IstermOscPt, IstermPromptStart, IstermPromptEnd } from "../utils/ansi.js";
@@ -13,8 +15,8 @@ import xterm from "@xterm/headless";
 import { CommandManager } from "./commandManager.js";
 import log from "../utils/log.js";
 import { gitBashPath } from "../utils/shell.js";
-import ansi from "ansi-escapes";
 import styles from "ansi-styles";
+import * as ansi from "../utils/ansi.js";
 const ISTermOnDataEvent = "data";
 export class ISTerm {
     pid;
@@ -43,7 +45,10 @@ export class ISTerm {
         this.cols = this.#pty.cols;
         this.rows = this.#pty.rows;
         this.process = this.#pty.process;
+        const unicode11Addon = new Unicode11Addon();
         this.#term = new xterm.Terminal({ allowProposedApi: true, rows, cols });
+        this.#term.loadAddon(unicode11Addon);
+        this.#term.unicode.activeVersion = "11";
         this.#term.parser.registerOscHandler(IsTermOscPs, (data) => this._handleIsSequence(data));
         this.#commandManager = new CommandManager(this.#term, shell);
         this.#shell = shell;
@@ -84,6 +89,11 @@ export class ISTerm {
         }
         return cwd;
     }
+    _sanitizedPrompt(prompt) {
+        // eslint-disable-next-line no-control-regex -- strip OSC control sequences
+        const oscStrippedPrompt = prompt.replace(/\x1b\][0-9]+;.*\x07/g, "");
+        return stripAnsi(oscStrippedPrompt);
+    }
     _handleIsSequence(data) {
         const argsIndex = data.indexOf(";");
         const sequence = argsIndex === -1 ? data : data.substring(0, argsIndex);
@@ -101,6 +111,19 @@ export class ISTerm {
                 }
                 break;
             }
+            case IstermOscPt.Prompt: {
+                const prompt = data.split(";").slice(1).join(";");
+                if (prompt != null) {
+                    const sanitizedPrompt = this._sanitizedPrompt(this._deserializeIsMessage(prompt));
+                    const lastPromptLine = sanitizedPrompt.substring(sanitizedPrompt.lastIndexOf("\n")).trim();
+                    const promptTerminator = lastPromptLine.substring(lastPromptLine.lastIndexOf(" ")).trim();
+                    if (promptTerminator) {
+                        this.#commandManager.promptTerminator = promptTerminator;
+                        log.debug({ msg: "prompt terminator", promptTerminator });
+                    }
+                }
+                break;
+            }
             default:
                 return false;
         }
@@ -216,7 +239,7 @@ export class ISTerm {
         const currentCursorPosition = this.#term.buffer.active.cursorY + this.#term.buffer.active.baseY;
         const writeLine = (y) => {
             const line = this.#term.buffer.active.getLine(y);
-            const ansiLine = ["\x1b[0m"];
+            const ansiLine = [ansi.resetColor, ansi.resetLine];
             if (line == null)
                 return "";
             let prevCell;
@@ -226,7 +249,7 @@ export class ISTerm {
                 const sameColor = this._sameColor(prevCell, cell);
                 const sameAccents = this._sameAccent(prevCell, cell);
                 if (!sameColor || !sameAccents) {
-                    ansiLine.push("\x1b[0m");
+                    ansiLine.push(ansi.resetColor);
                 }
                 if (!sameColor) {
                     ansiLine.push(this._getAnsiColors(cell));
@@ -234,7 +257,7 @@ export class ISTerm {
                 if (!sameAccents) {
                     ansiLine.push(this._getAnsiAccents(cell));
                 }
-                ansiLine.push(chars == "" ? " " : chars);
+                ansiLine.push(chars == "" ? ansi.cursorForward() : chars);
                 prevCell = cell;
             }
             return ansiLine.join("");
@@ -275,7 +298,10 @@ const convertToPtyTarget = async (shell, underTest, login) => {
             shellArgs = ["-noexit", "-command", `try { . "${path.join(shellFolderPath, "shellIntegration.ps1")}" } catch {}`];
             break;
         case Shell.Fish:
-            shellArgs = ["--init-command", `. ${path.join(shellFolderPath, "shellIntegration.fish").replace(/(\s+)/g, "\\$1")}`];
+            shellArgs =
+                platform == "win32"
+                    ? ["--init-command", `. "$(cygpath -u '${path.join(shellFolderPath, "shellIntegration.fish")}')"`]
+                    : ["--init-command", `. ${path.join(shellFolderPath, "shellIntegration.fish").replace(/(\s+)/g, "\\$1")}`];
             break;
         case Shell.Xonsh: {
             const sharedConfig = os.platform() == "win32" ? path.join("C:\\ProgramData", "xonsh", "xonshrc") : path.join("etc", "xonsh", "xonshrc");

package/build/runtime/suggestion.js

@@ -17,10 +17,10 @@ var SuggestionIcons;
     SuggestionIcons["Default"] = "\uD83D\uDCC0";
 })(SuggestionIcons || (SuggestionIcons = {}));
 const getIcon = (icon, suggestionType) => {
-    // TODO: enable fig icons once spacing is better
-    // if (icon && /[^\u0000-\u00ff]/.test(icon)) {
-    //   return icon;
-    // }
+    // eslint-disable-next-line no-control-regex
+    if (icon && /[^\u0000-\u00ff]/.test(icon)) {
+        return icon;
+    }
     switch (suggestionType) {
         case "arg":
             return SuggestionIcons.Argument;

package/build/runtime/utils.js

@@ -6,14 +6,14 @@ import fsAsync from "node:fs/promises";
 import { getPathSeperator } from "../utils/shell.js";
 import log from "../utils/log.js";
 export const buildExecuteShellCommand = (timeout) => async ({ command, env, args, cwd }) => {
-    const child = spawn(command, args, { cwd, env: { ...env, ISTERM: "1" } });
+    const child = spawn(command, args, { cwd, env: { ...process.env, ...env, ISTERM: "1" } });
     setTimeout(() => child.kill("SIGKILL"), timeout);
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (data) => (stdout += data));
     child.stderr.on("data", (data) => (stderr += data));
     child.on("error", (err) => {
-        log.debug({ msg: "shell command failed", e: err.message });
+        log.debug({ msg: "shell command failed", command, args, e: err.message });
     });
     return new Promise((resolve) => {
         child.on("close", (code) => {

package/build/ui/suggestionManager.js

@@ -19,6 +19,7 @@ export class SuggestionManager {
     #activeSuggestionIdx;
     #suggestBlob;
     #shell;
+    #hideSuggestions = false;
     constructor(terminal, shell) {
         this.#term = terminal;
         this.#suggestBlob = { suggestions: [] };
@@ -28,7 +29,7 @@ export class SuggestionManager {
     }
     async _loadSuggestions() {
         const commandText = this.#term.getCommandState().commandText;
-        if (!commandText) {
+        if (!commandText || this.#hideSuggestions) {
             this.#suggestBlob = undefined;
             this.#activeSuggestionIdx = 0;
             return;
@@ -125,12 +126,17 @@ export class SuggestionManager {
         if (name == "return") {
             this.#term.clearCommand(); // clear the current command on enter
         }
+        // if suggestions are hidden, keep them hidden until during command navigation
+        if (this.#hideSuggestions) {
+            this.#hideSuggestions = name == "up" || name == "down";
+        }
         if (!this.#suggestBlob) {
             return false;
         }
         const { dismissSuggestions: { key: dismissKey, shift: dismissShift, control: dismissCtrl }, acceptSuggestion: { key: acceptKey, shift: acceptShift, control: acceptCtrl }, nextSuggestion: { key: nextKey, shift: nextShift, control: nextCtrl }, previousSuggestion: { key: prevKey, shift: prevShift, control: prevCtrl }, } = getConfig().bindings;
         if (name == dismissKey && shift == !!dismissShift && ctrl == !!dismissCtrl) {
             this.#suggestBlob = undefined;
+            this.#hideSuggestions = true;
         }
         else if (name == prevKey && shift == !!prevShift && ctrl == !!prevCtrl) {
             this.#activeSuggestionIdx = Math.max(0, this.#activeSuggestionIdx - 1);

package/build/ui/utils.js

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import ansi from "ansi-escapes";
+import { resetColor } from "../utils/ansi.js";
 import wrapAnsi from "wrap-ansi";
 import chalk from "chalk";
 import wcwidth from "wcwidth";
@@ -12,7 +13,7 @@ import wcwidth from "wcwidth";
  */
 export const renderBox = (rows, width, x, borderColor) => {
     const result = [];
-    const setColor = (text) => (borderColor ? chalk.hex(borderColor).apply(text) : text);
+    const setColor = (text) => resetColor + (borderColor ? chalk.hex(borderColor).apply(text) : text);
     result.push(ansi.cursorTo(x) + setColor("┌" + "─".repeat(width - 2) + "┐") + ansi.cursorTo(x));
     rows.forEach((row) => {
         result.push(ansi.cursorDown() + setColor("│") + row + setColor("│") + ansi.cursorTo(x));

package/build/utils/ansi.js

@@ -11,6 +11,7 @@ export var IstermOscPt;
     IstermOscPt["PromptStarted"] = "PS";
     IstermOscPt["PromptEnded"] = "PE";
     IstermOscPt["CurrentWorkingDirectory"] = "CWD";
+    IstermOscPt["Prompt"] = "PROMPT";
 })(IstermOscPt || (IstermOscPt = {}));
 export const IstermPromptStart = IS_OSC + IstermOscPt.PromptStarted + BEL;
 export const IstermPromptEnd = IS_OSC + IstermOscPt.PromptEnded + BEL;
@@ -18,7 +19,10 @@ export const cursorHide = CSI + "?25l";
 export const cursorShow = CSI + "?25h";
 export const cursorNextLine = CSI + "E";
 export const eraseLine = CSI + "2K";
+export const resetColor = CSI + "0m";
+export const resetLine = CSI + "2K";
 export const cursorBackward = (count = 1) => CSI + count + "D";
+export const cursorForward = (count = 1) => CSI + count + "C";
 export const cursorTo = ({ x, y }) => {
     return CSI + (y ?? "") + ";" + (x ?? "") + "H";
 };

package/build/utils/config.js

@@ -49,6 +49,7 @@ const configSchema = {
                 acceptSuggestion: bindingSchema,
             },
         },
+        // DEPRECATED: prompt patterns are no longer used
         prompt: {
             type: "object",
             nullable: true,
@@ -58,6 +59,7 @@ const configSchema = {
                 powershell: promptPatternsSchema,
                 xonsh: promptPatternsSchema,
                 nu: promptPatternsSchema,
+                fish: promptPatternsSchema,
             },
         },
         specs: {
@@ -70,9 +72,12 @@ const configSchema = {
     },
     additionalProperties: false,
 };
-const configFile = ".inshellisenserc";
+const rcFile = ".inshellisenserc";
+const xdgFile = "rc.toml";
 const cachePath = path.join(os.homedir(), ".inshellisense");
-const configPath = path.join(os.homedir(), configFile);
+const rcPath = path.join(os.homedir(), rcFile);
+const xdgPath = path.join(os.homedir(), ".config", "inshellisense", xdgFile);
+const configPaths = [rcPath, xdgPath];
 let globalConfig = {
     bindings: {
         nextSuggestion: { key: "down" },
@@ -83,38 +88,42 @@ let globalConfig = {
 };
 export const getConfig = () => globalConfig;
 export const loadConfig = async (program) => {
-    if (fs.existsSync(configPath)) {
-        let config;
-        try {
-            config = toml.parse((await fsAsync.readFile(configPath)).toString());
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    configPaths.forEach(async (configPath) => {
+        if (fs.existsSync(configPath)) {
+            let config;
+            try {
+                config = toml.parse((await fsAsync.readFile(configPath)).toString());
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (e) {
+                program.error(`${configPath} is invalid toml. Parsing error on line ${e.line}, column ${e.column}: ${e.message}`);
+            }
+            const isValid = ajv.validate(configSchema, config);
+            if (!isValid) {
+                program.error(`${configPath} is invalid: ${ajv.errorsText()}`);
+            }
+            globalConfig = {
+                bindings: {
+                    nextSuggestion: config?.bindings?.nextSuggestion ?? globalConfig.bindings.nextSuggestion,
+                    previousSuggestion: config?.bindings?.previousSuggestion ?? globalConfig.bindings.previousSuggestion,
+                    acceptSuggestion: config?.bindings?.acceptSuggestion ?? globalConfig.bindings.acceptSuggestion,
+                    dismissSuggestions: config?.bindings?.dismissSuggestions ?? globalConfig.bindings.dismissSuggestions,
+                },
+                prompt: {
+                    bash: config.prompt?.bash ?? globalConfig?.prompt?.bash,
+                    powershell: config.prompt?.powershell ?? globalConfig?.prompt?.powershell,
+                    xonsh: config.prompt?.xonsh ?? globalConfig?.prompt?.xonsh,
+                    pwsh: config.prompt?.pwsh ?? globalConfig?.prompt?.pwsh,
+                    nu: config.prompt?.nu ?? globalConfig?.prompt?.nu,
+                    fish: config.prompt?.fish ?? globalConfig?.prompt?.fish,
+                },
+                specs: {
+                    path: [...(config?.specs?.path ?? []), ...(config?.specs?.path ?? [])],
+                },
+            };
         }
-        catch (e) {
-            program.error(`${configFile} is invalid toml. Parsing error on line ${e.line}, column ${e.column}: ${e.message}`);
-        }
-        const isValid = ajv.validate(configSchema, config);
-        if (!isValid) {
-            program.error(`${configFile} is invalid: ${ajv.errorsText()}`);
-        }
-        globalConfig = {
-            bindings: {
-                nextSuggestion: config?.bindings?.nextSuggestion ?? globalConfig.bindings.nextSuggestion,
-                previousSuggestion: config?.bindings?.previousSuggestion ?? globalConfig.bindings.previousSuggestion,
-                acceptSuggestion: config?.bindings?.acceptSuggestion ?? globalConfig.bindings.acceptSuggestion,
-                dismissSuggestions: config?.bindings?.dismissSuggestions ?? globalConfig.bindings.dismissSuggestions,
-            },
-            prompt: {
-                bash: config.prompt?.bash,
-                powershell: config.prompt?.powershell,
-                xonsh: config.prompt?.xonsh,
-                pwsh: config.prompt?.pwsh,
-                nu: config.prompt?.nu,
-            },
-            specs: {
-                path: [`${os.homedir()}/.fig/autocomplete/build`, ...(config?.specs?.path ?? [])],
-            },
-        };
-    }
+    });
+    globalConfig.specs = { path: [`${os.homedir()}/.fig/autocomplete/build`, ...(globalConfig.specs?.path ?? [])] };
 };
 export const deleteCacheFolder = async () => {
     const cliConfigPath = path.join(os.homedir(), cachePath);

package/build/utils/shell.js

@@ -8,6 +8,7 @@ import fs from "node:fs";
 import url from "node:url";
 import os from "node:os";
 import fsAsync from "node:fs/promises";
+import log from "./log.js";
 export var Shell;
 (function (Shell) {
     Shell["Bash"] = "bash";
@@ -49,7 +50,32 @@ export const setupZshDotfiles = async () => {
     await fsAsync.cp(path.join(shellFolderPath, "shellIntegration-env.zsh"), path.join(zdotdir, ".zshenv"));
     await fsAsync.cp(path.join(shellFolderPath, "shellIntegration-login.zsh"), path.join(zdotdir, ".zlogin"));
 };
+const findPareentProcess = async () => {
+    try {
+        return (await find("pid", process.ppid)).at(0);
+    }
+    catch (e) {
+        log.debug({ msg: `error finding parent process: ${e}` });
+    }
+};
 export const inferShell = async () => {
+    // try getting shell from shell specific env variables
+    if (process.env.NU_VERSION != null) {
+        return Shell.Nushell;
+    }
+    else if (process.env.XONSHRC != null) {
+        return Shell.Xonsh;
+    }
+    else if (process.env.FISH_VERSION != null) {
+        return Shell.Fish;
+    }
+    else if (process.env.ZSH_VERSION != null) {
+        return Shell.Zsh;
+    }
+    else if (process.env.BASH_VERSION != null) {
+        return Shell.Bash;
+    }
+    // try getting shell from env
     try {
         const name = path.parse(process.env.SHELL ?? "").name;
         const shellName = supportedShells.find((shell) => name.includes(shell));
@@ -59,7 +85,8 @@ export const inferShell = async () => {
     catch {
         /* empty */
     }
-    const processResult = (await find("pid", process.ppid)).at(0);
+    // try getting shell from parent process
+    const processResult = await findPareentProcess();
     const name = processResult?.name;
     return name != null ? supportedShells.find((shell) => name.includes(shell)) : undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.14",
+  "version": "0.0.1-rc.16",
   "description": "IDE style command line auto complete",
   "type": "module",
   "engines": {
@@ -41,6 +41,7 @@
   "dependencies": {
     "@homebridge/node-pty-prebuilt-multiarch": "^0.11.12",
     "@withfig/autocomplete": "2.651.0",
+    "@xterm/addon-unicode11": "^0.8.0",
     "@xterm/headless": "^5.5.0",
     "ajv": "^8.12.0",
     "ansi-escapes": "^6.2.0",
@@ -49,6 +50,7 @@
     "color-convert": "^2.0.1",
     "commander": "^11.0.0",
     "find-process": "^1.4.7",
+    "strip-ansi": "^7.1.0",
     "toml": "^3.0.0",
     "wcwidth": "^1.0.1",
     "which": "^4.0.0",

package/shell/shellIntegration-env.zsh

@@ -1,9 +1,12 @@
 if [[ -f $USER_ZDOTDIR/.zshenv ]]; then
+	IS_ZDOTDIR=$ZDOTDIR
 	ZDOTDIR=$USER_ZDOTDIR
 
 	# prevent recursion
-	if [[ $USER_ZDOTDIR != $ZDOTDIR ]]; then
-		ZDOTDIR=$USER_ZDOTDIR
+	if [[ $USER_ZDOTDIR != $IS_ZDOTDIR ]]; then
 		. $USER_ZDOTDIR/.zshenv
 	fi
+
+	USER_ZDOTDIR=$ZDOTDIR
+	ZDOTDIR=$IS_ZDOTDIR
 fi

package/shell/shellIntegration-rc.zsh

@@ -1,3 +1,5 @@
+autoload -U add-zsh-hook
+
 if [[ -f $USER_ZDOTDIR/.zshrc ]]; then
 	ZDOTDIR=$USER_ZDOTDIR
 	. $USER_ZDOTDIR/.zshrc
@@ -25,6 +27,12 @@ __is_escape_value() {
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then
 			token="\\x3b"
+		elif [ "$byte" = $'\n' ]; then
+			token="\x0a"
+		elif [ "$byte" = $'\e' ]; then
+			token="\\x1b"
+		elif [ "$byte" = $'\a' ]; then
+			token="\\x07"
 		else
 			token="$byte"
 		fi

package/shell/shellIntegration.bash

@@ -40,6 +40,12 @@ __is_escape_value() {
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then
 			token="\\x3b"
+		elif [ "$byte" = $'\n' ]; then
+			token="\x0a"
+		elif [ "$byte" = $'\e' ]; then
+			token="\\x1b"
+		elif [ "$byte" = $'\a' ]; then
+			token="\\x07"
 		else
 			token="$byte"
 		fi
@@ -54,6 +60,16 @@ __is_update_cwd() {
 	builtin printf '\e]6973;CWD;%s\a' "$(__is_escape_value "$PWD")"
 }
 
+__is_report_prompt() {
+	if ((BASH_VERSINFO[0] >= 4)); then
+		__is_prompt=${__is_original_PS1@P}
+	else
+		__is_prompt=${__is_original_PS1}
+	fi
+	__is_prompt="$(builtin printf "%s" "${__is_prompt//[$'\001'$'\002']}")"
+	builtin printf "\e]6973;PROMPT;%s\a" "$(__is_escape_value "${__is_prompt}")"
+}
+
 if [[ -n "${bash_preexec_imported:-}" ]]; then
     precmd_functions+=(__is_precmd)
 fi
@@ -61,6 +77,7 @@ fi
 __is_precmd() {
 	__is_update_cwd
 	__is_update_prompt
+	__is_report_prompt
 }
 
 __is_update_prompt() {

package/shell/shellIntegration.fish

@@ -2,15 +2,19 @@ function __is_copy_function; functions $argv[1] | sed "s/^function $argv[1]/func
 function __is_prompt_start; printf '\e]6973;PS\a'; end
 function __is_prompt_end; printf '\e]6973;PE\a'; end
 
+__is_copy_function fish_prompt is_user_prompt
+
 function __is_escape_value
 	echo $argv \
-	| string replace --all '\\' '\\\\' \
-	| string replace --all ';' '\\x3b' \
+	| string replace -a '\\' '\\\\' \
+	| string replace -a ';' '\\x3b' \
+	| string replace -a \e '\\x1b' \
+	| string replace -a \a '\\x07' \
+	| string split \n | string join '\x0a' \
 	;
 end
-function __is_update_cwd --on-event fish_prompt; set __is_cwd (__is_escape_value "$PWD"); printf "\e]6973;CWD;$__is_cwd\a"; end
-
-__is_copy_function fish_prompt is_user_prompt
+function __is_update_cwd --on-event fish_prompt; set __is_cwd (__is_escape_value "$PWD"); printf "\e]6973;CWD;%s\a" $__is_cwd; end
+function __is_report_prompt --on-event fish_prompt; set __is_prompt (__is_escape_value (is_user_prompt)); printf "\e]6973;PROMPT;%s\a" $__is_prompt; end
 
 if [ "$ISTERM_TESTING" = "1" ]
 	function is_user_prompt; printf '> '; end

package/shell/shellIntegration.nu

@@ -1,18 +1,26 @@
-let __is_escape_value = {|x| $x | str replace --all "\\" "\\\\" | str replace --all ";" "\\x3b" }
+let __is_escape_value = {|x| $x | str replace --all "\\" "\\\\" | str replace --all ";" "\\x3b" | str replace --all "\n" '\x0a' | str replace --all "\e" "\\x1b" | str replace --all "\a" "\\x07" }
+let __is_original_PROMPT_COMMAND = if 'PROMPT_COMMAND' in $env { $env.PROMPT_COMMAND } else { "" }
+let __is_original_PROMPT_INDICATOR = if 'PROMPT_INDICATOR' in $env { $env.PROMPT_INDICATOR } else { "" }
 
 let __is_update_cwd = { 
     let pwd = do $__is_escape_value $env.PWD
     $"\e]6973;CWD;($pwd)\a" 
 }
-let __is_original_PROMPT_COMMAND = if 'PROMPT_COMMAND' in $env { $env.PROMPT_COMMAND } else { "" }
+let __is_report_prompt = { 
+    let __is_indicatorCommandType = $__is_original_PROMPT_INDICATOR | describe
+    mut __is_prompt_ind = if $__is_indicatorCommandType == "closure" { do $__is_original_PROMPT_INDICATOR } else { $__is_original_PROMPT_INDICATOR }
+    let __is_esc_prompt_ind = do $__is_escape_value $__is_prompt_ind
+    $"\e]6973;PROMPT;($__is_esc_prompt_ind)\a"
+}
 let __is_custom_PROMPT_COMMAND = {
     let promptCommandType = $__is_original_PROMPT_COMMAND | describe
     mut cmd = if $promptCommandType == "closure" { do $__is_original_PROMPT_COMMAND } else { $__is_original_PROMPT_COMMAND }
     let pwd = do $__is_update_cwd
+    let prompt = do $__is_report_prompt
     if 'ISTERM_TESTING' in $env {
         $cmd = ""
     }
-    $"\e]6973;PS\a($cmd)($pwd)"
+    $"\e]6973;PS\a($cmd)($pwd)($prompt)"
 }
 $env.PROMPT_COMMAND = $__is_custom_PROMPT_COMMAND
 

package/shell/shellIntegration.ps1

@@ -8,7 +8,7 @@ if ($env:ISTERM_TESTING -eq "1") {
 }
 
 function Global:__IS-Escape-Value([string]$value) {
-    [regex]::Replace($value, '[\\\n;]', { param($match)
+    [regex]::Replace($value, "[$([char]0x1b)$([char]0x07)\\\n;]", { param($match)
             -Join (
                 [System.Text.Encoding]::UTF8.GetBytes($match.Value) | ForEach-Object { '\x{0:x2}' -f $_ }
             )
@@ -17,8 +17,11 @@ function Global:__IS-Escape-Value([string]$value) {
 
 function Global:Prompt() {
     $Result = "$([char]0x1b)]6973;PS`a"
-    $Result += $Global:__IsOriginalPrompt.Invoke()
+    $OriginalPrompt += $Global:__IsOriginalPrompt.Invoke()
+    $Result += $OriginalPrompt
     $Result += "$([char]0x1b)]6973;PE`a"
+
+    $Result += "$([char]0x1b)]6973;PROMPT;$(__IS-Escape-Value $OriginalPrompt)`a"
     $Result += if ($pwd.Provider.Name -eq 'FileSystem') { "$([char]0x1b)]6973;CWD;$(__IS-Escape-Value $pwd.ProviderPath)`a" }
     return $Result
 }

package/shell/shellIntegration.xsh

@@ -1,4 +1,5 @@
 import os
+from xonsh.main import XSH
 
 def __is_prompt_start() -> str:
     return "\001" + "\x1b]6973;PS\x07"
@@ -7,23 +8,30 @@ def __is_prompt_start() -> str:
 def __is_prompt_end() -> str:
     return "\001" + "\x1b]6973;PE\x07" + "\002"
 
-
 def __is_escape_value(value: str) -> str:
     byte_list = [bytes([byte]).decode("utf-8") for byte in list(value.encode("utf-8"))]
     return "".join(
         [
-            "\\x3b" if byte == ";" else "\\\\" if byte == "\\" else byte
+            "\\x3b" if byte == ";" else "\\\\" if byte == "\\" else "\\x1b" if byte == "\x1b" else "\x0a" if byte == "\n"else "\\x07" if byte == "\x07" else byte
             for byte in byte_list
         ]
     )
 
 def __is_update_cwd() -> str:
-    return f"\x1b]6973;CWD;{__is_escape_value(os.getcwd())}\x07" + "\002"
+    return f"\x1b]6973;CWD;{__is_escape_value(os.getcwd())}\x07"
+
+__is_original_prompt = $PROMPT
+def __is_report_prompt() -> str:
+    prompt = ""
+    formatted_prompt = XSH.shell.prompt_formatter(__is_original_prompt)
+    prompt = "".join([text for  _, text in XSH.shell.format_color(formatted_prompt)])
+    return f"\x1b]6973;PROMPT;{__is_escape_value(prompt)}\x07" + "\002"
 
 $PROMPT_FIELDS['__is_prompt_start'] = __is_prompt_start
 $PROMPT_FIELDS['__is_prompt_end'] = __is_prompt_end
 $PROMPT_FIELDS['__is_update_cwd'] = __is_update_cwd
+$PROMPT_FIELDS['__is_report_prompt'] = __is_report_prompt
 if 'ISTERM_TESTING' in ${...}:
     $PROMPT = "> "
 
-$PROMPT = "{__is_prompt_start}{__is_update_cwd}" + $PROMPT + "{__is_prompt_end}"
+$PROMPT = "{__is_prompt_start}{__is_update_cwd}{__is_report_prompt}" + $PROMPT + "{__is_prompt_end}"

package/todo.md

@@ -0,0 +1,4 @@
+- [x] improve wrapping handling
+`const wrapped = line?.isWrapped || (this.#terminal.buffer.active.cursorY + this.#terminal.buffer.active.baseY) != lineY`
+`lineY < this.#terminal.rows`
+- [ ] handle paths with spaces in them on bash (ignore pwsh for now as it fails cd anyway)