@microsoft/inshellisense 0.0.1-rc.7 → 0.0.1-rc.9

package/README.md

@@ -8,8 +8,7 @@
 
 ### Requirements
 
-- `node >= 16.x`
-- node-gyp dependencies installed for your platform (see [node-gyp](https://github.com/nodejs/node-gyp) for more details)
+- Node.js 20.X, 18.X, 16.X (16.6.0 >=)
 
 ### Installation
 
@@ -31,7 +30,7 @@ After completing the installation, you can run `is` to start the autocomplete se
 
 #### Keybindings
 
-All other keys are passed through to the shell. The keybindings below are only captured when the inshellisense suggestions are visible, otherwise they are passed through to the shell as well.
+All other keys are passed through to the shell. The keybindings below are only captured when the inshellisense suggestions are visible, otherwise they are passed through to the shell as well. These can be customized in the [config](#configuration).
 
 | Action                    | Keybinding     |
 | ------------------------- | -------------- |
@@ -50,6 +49,46 @@ inshellisense supports the following shells:
 - [pwsh](https://github.com/PowerShell/PowerShell)
 - [powershell](https://learn.microsoft.com/en-us/powershell/scripting/windows-powershell/starting-windows-powershell) (Windows Powershell)
 - [cmd](https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/cmd) _(experimental)_
+- [xonsh](https://xon.sh/)
+
+## 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).
+
+### Keybindings
+
+You can customize the keybindings for inshellisense by adding a `bindings` section to your config file. The following is the default configuration for the [keybindings](#keybindings):
+
+```toml
+[bindings.acceptSuggestion]
+key = "tab"
+# shift and tab are optional and default to false
+shift = false
+ctrl = false
+
+[bindings.nextSuggestion]
+key = "down"
+
+[bindings.previousSuggestion]
+key = "up"
+
+[bindings.dismissSuggestions]
+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
 

package/build/commands/complete.js

@@ -7,6 +7,7 @@ import { Shell } from "../utils/shell.js";
 const action = async (input) => {
     const suggestions = await getSuggestions(input, process.cwd(), os.platform() === "win32" ? Shell.Cmd : Shell.Bash);
     process.stdout.write(JSON.stringify(suggestions));
+    process.exit(0);
 };
 const cmd = new Command("complete");
 cmd.description(`generates a completion for the provided input`);

package/build/commands/root.js

@@ -28,5 +28,5 @@ export const action = (program) => async (options) => {
     else if (shell == Shell.Bash) {
         await setupBashPreExec();
     }
-    await render(shell);
+    await render(shell, options.test ?? false);
 };

package/build/index.js

@@ -2,12 +2,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 /* eslint-disable header/header */
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import complete from "./commands/complete.js";
 import uninstall from "./commands/uninstall.js";
 import { action, supportedShells } from "./commands/root.js";
 import { getVersion } from "./utils/version.js";
 const program = new Command();
+const hiddenOption = (flags, description) => {
+    const option = new Option(flags, description);
+    option.hidden = true;
+    return option;
+};
 program
     .name("inshellisense")
     .description("IDE style command line auto complete")
@@ -15,6 +20,7 @@ program
     .action(action(program))
     .option("-s, --shell <shell>", `shell to use for command execution, supported shells: ${supportedShells}`)
     .option("-c, --check", `check if shell is in an inshellisense session`)
+    .addOption(hiddenOption("-T, --test", "used to make e2e tests reproducible across machines"))
     .option("-V, --verbose", `enable verbose logging`)
     .showHelpAfterError("(add --help for additional information)");
 program.addCommand(complete);

package/build/isterm/commandManager.js

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import convert from "color-convert";
 import os from "node:os";
 import { Shell } from "../utils/shell.js";
 import log from "../utils/log.js";
@@ -57,11 +58,13 @@ export class CommandManager {
         // User defined prompt
         const inshellisenseConfig = getConfig();
         if (this.#shell == Shell.Bash) {
-            if (inshellisenseConfig.promptRegex?.bash != null) {
-                const customBashPrompt = lineText.match(new RegExp(inshellisenseConfig.promptRegex?.bash.regex))?.groups?.prompt;
-                const adjustedPrompt = this._adjustPrompt(customBashPrompt, lineText, inshellisenseConfig.promptRegex?.bash.postfix);
-                if (adjustedPrompt) {
-                    return adjustedPrompt;
+            if (inshellisenseConfig?.prompt?.bash != null) {
+                for (const { regex, postfix } of inshellisenseConfig.prompt.bash) {
+                    const customPrompt = lineText.match(new RegExp(regex))?.groups?.prompt;
+                    const adjustedPrompt = this._adjustPrompt(customPrompt, lineText, postfix);
+                    if (adjustedPrompt) {
+                        return adjustedPrompt;
+                    }
                 }
             }
             const bashPrompt = lineText.match(/^(?<prompt>.*\$\s?)/)?.groups?.prompt;
@@ -72,21 +75,50 @@ export class CommandManager {
                 }
             }
         }
-        if (this.#shell == Shell.Powershell || this.#shell == Shell.Pwsh) {
-            if (inshellisenseConfig.promptRegex?.pwsh != null && this.#shell == Shell.Pwsh) {
-                const customPwshPrompt = lineText.match(new RegExp(inshellisenseConfig.promptRegex?.pwsh.regex))?.groups?.prompt;
-                const adjustedPrompt = this._adjustPrompt(customPwshPrompt, lineText, inshellisenseConfig.promptRegex?.pwsh.postfix);
+        if (this.#shell == Shell.Xonsh) {
+            if (inshellisenseConfig?.prompt?.xonsh != null) {
+                for (const { regex, postfix } of inshellisenseConfig.prompt.xonsh) {
+                    const customPrompt = lineText.match(new RegExp(regex))?.groups?.prompt;
+                    const adjustedPrompt = this._adjustPrompt(customPrompt, lineText, postfix);
+                    if (adjustedPrompt) {
+                        return adjustedPrompt;
+                    }
+                }
+            }
+            let xonshPrompt = lineText.match(/(?<prompt>.*@\s?)/)?.groups?.prompt;
+            if (xonshPrompt) {
+                const adjustedPrompt = this._adjustPrompt(xonshPrompt, lineText, "@");
                 if (adjustedPrompt) {
                     return adjustedPrompt;
                 }
             }
-            if (inshellisenseConfig.promptRegex?.powershell != null && this.#shell == Shell.Powershell) {
-                const customPowershellPrompt = lineText.match(new RegExp(inshellisenseConfig.promptRegex?.powershell.regex))?.groups?.prompt;
-                const adjustedPrompt = this._adjustPrompt(customPowershellPrompt, lineText, inshellisenseConfig.promptRegex?.powershell.postfix);
+            xonshPrompt = lineText.match(/(?<prompt>.*>\s?)/)?.groups?.prompt;
+            if (xonshPrompt) {
+                const adjustedPrompt = this._adjustPrompt(xonshPrompt, lineText, ">");
                 if (adjustedPrompt) {
                     return adjustedPrompt;
                 }
             }
+        }
+        if (this.#shell == Shell.Powershell || this.#shell == Shell.Pwsh) {
+            if (inshellisenseConfig?.prompt?.powershell != null) {
+                for (const { regex, postfix } of inshellisenseConfig.prompt.powershell) {
+                    const customPrompt = lineText.match(new RegExp(regex))?.groups?.prompt;
+                    const adjustedPrompt = this._adjustPrompt(customPrompt, lineText, postfix);
+                    if (adjustedPrompt) {
+                        return adjustedPrompt;
+                    }
+                }
+            }
+            if (inshellisenseConfig?.prompt?.pwsh != null) {
+                for (const { regex, postfix } of inshellisenseConfig.prompt.pwsh) {
+                    const customPrompt = lineText.match(new RegExp(regex))?.groups?.prompt;
+                    const adjustedPrompt = this._adjustPrompt(customPrompt, lineText, postfix);
+                    if (adjustedPrompt) {
+                        return adjustedPrompt;
+                    }
+                }
+            }
             const pwshPrompt = lineText.match(/(?<prompt>(\(.+\)\s)?(?:PS.+>\s?))/)?.groups?.prompt;
             if (pwshPrompt) {
                 const adjustedPrompt = this._adjustPrompt(pwshPrompt, lineText, ">");
@@ -96,7 +128,7 @@ export class CommandManager {
             }
         }
         if (this.#shell == Shell.Cmd) {
-            return lineText.match(/^(?<prompt>(\(.+\)\s)?(?:[A-Z]:\\.*>))/)?.groups?.prompt;
+            return lineText.match(/^(?<prompt>(\(.+\)\s)?(?:[A-Z]:\\.*>)|(> ))/)?.groups?.prompt;
         }
         // Custom prompts like starship end in the common \u276f character
         const customPrompt = lineText.match(/.*\u276f(?=[^\u276f]*$)/g)?.[0];
@@ -117,14 +149,25 @@ export class CommandManager {
         }
         return prompt;
     }
+    _getFgPaletteColor(cell) {
+        if (cell?.isFgDefault())
+            return 0;
+        if (cell?.isFgPalette())
+            return cell.getFgColor();
+        if (cell?.isFgRGB())
+            return convert.hex.ansi256(cell.getFgColor().toString(16));
+    }
     _isSuggestion(cell) {
-        const color = cell?.getFgColor();
-        const dullColor = color == 8 || (color ?? 0) > 235;
+        const color = this._getFgPaletteColor(cell);
+        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 (color ?? 0) > 235;
+            return dullItalic;
         }
         return dullColor;
     }
@@ -141,16 +184,15 @@ export class CommandManager {
         if (this.#activeCommand.promptEndMarker == null || this.#activeCommand.promptStartMarker == null) {
             return;
         }
-        const promptEndMarker = this.#activeCommand.promptEndMarker;
-        const promptStartMarker = this.#activeCommand.promptStartMarker;
         const globalCursorPosition = this.#terminal.buffer.active.baseY + this.#terminal.buffer.active.cursorY;
         const withinPollDistance = globalCursorPosition < this.#activeCommand.promptEndMarker.line + 5;
-        if (globalCursorPosition < promptStartMarker.line) {
+        if (globalCursorPosition < this.#activeCommand.promptStartMarker.line) {
             this.handleClear();
+            this.#activeCommand.promptEndMarker = this.#terminal.registerMarker(0);
         }
         // if we haven't fond the prompt yet, poll over the next 5 lines searching for it
         if (this.#activeCommand.promptText == null && withinPollDistance) {
-            for (let i = globalCursorPosition; i < promptEndMarker.line + maxPromptPollDistance; i++) {
+            for (let i = globalCursorPosition; i < this.#activeCommand.promptEndMarker.line + maxPromptPollDistance; i++) {
                 if (this.#previousCommandLines.has(i))
                     continue;
                 const promptResult = this._getWindowsPrompt(i);
@@ -159,17 +201,18 @@ export class CommandManager {
                     this.#activeCommand.promptEndX = promptResult.length;
                     this.#activeCommand.promptText = promptResult;
                     this.#previousCommandLines.add(i);
+                    break;
                 }
             }
         }
         // if the prompt is set, now parse out the values from the terminal
         if (this.#activeCommand.promptText != null) {
-            let lineY = promptEndMarker.line;
-            let line = this.#terminal.buffer.active.getLine(promptEndMarker.line);
+            let lineY = this.#activeCommand.promptEndMarker.line;
+            let line = this.#terminal.buffer.active.getLine(this.#activeCommand.promptEndMarker.line);
             let command = "";
             let suggestions = "";
             for (;;) {
-                for (let i = lineY == promptEndMarker.line ? this.#activeCommand.promptText.length : 0; i < this.#terminal.cols; i++) {
+                for (let i = lineY == this.#activeCommand.promptEndMarker.line ? this.#activeCommand.promptText.length : 0; i < this.#terminal.cols; i++) {
                     const cell = line?.getCell(i);
                     if (cell == null)
                         continue;

package/build/isterm/pty.js

@@ -5,8 +5,9 @@ import process from "node:process";
 import os from "node:os";
 import path from "node:path";
 import url from "node:url";
-import pty from "node-pty";
-import { Shell, userZdotdir, zdotdir } from "../utils/shell.js";
+import fs from "node:fs";
+import pty from "@homebridge/node-pty-prebuilt-multiarch";
+import { Shell, getPythonPath, userZdotdir, zdotdir } from "../utils/shell.js";
 import { IsTermOscPs, IstermOscPt, IstermPromptStart, IstermPromptEnd } from "../utils/ansi.js";
 import xterm from "xterm-headless";
 import { CommandManager } from "./commandManager.js";
@@ -30,13 +31,13 @@ export class ISTerm {
     #term;
     #commandManager;
     #shell;
-    constructor({ shell, cols, rows, env, shellTarget, shellArgs }) {
+    constructor({ shell, cols, rows, env, shellTarget, shellArgs, underTest }) {
         this.#pty = pty.spawn(shellTarget, shellArgs ?? [], {
             name: "xterm-256color",
             cols,
             rows,
             cwd: process.cwd(),
-            env: { ...convertToPtyEnv(shell), ...env },
+            env: { ...convertToPtyEnv(shell, underTest), ...env },
         });
         this.pid = this.#pty.pid;
         this.cols = this.#pty.cols;
@@ -62,6 +63,10 @@ export class ISTerm {
         };
         this.onExit = this.#pty.onExit;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    on(_event, _listener) {
+        throw new Error("Method not implemented as deprecated in node-pty.");
+    }
     _deserializeIsMessage(message) {
         return message.replaceAll(/\\(\\|x([0-9a-f]{2}))/gi, (_match, op, hex) => (hex ? String.fromCharCode(parseInt(hex, 16)) : op));
     }
@@ -214,29 +219,46 @@ export const spawn = async (options) => {
 };
 const convertToPtyTarget = async (shell) => {
     const platform = os.platform();
-    const shellTarget = shell == Shell.Bash && platform == "win32" ? await gitBashPath() : platform == "win32" ? `${shell}.exe` : shell;
+    let shellTarget = shell == Shell.Bash && platform == "win32" ? await gitBashPath() : platform == "win32" ? `${shell}.exe` : shell;
     const shellFolderPath = path.join(path.dirname(url.fileURLToPath(import.meta.url)), "..", "..", "shell");
     let shellArgs = [];
     switch (shell) {
         case Shell.Bash:
             shellArgs = ["--init-file", path.join(shellFolderPath, "shellIntegration.bash")];
             break;
-        case (Shell.Powershell, Shell.Pwsh):
+        case Shell.Powershell:
+        case Shell.Pwsh:
             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")}`];
             break;
+        case Shell.Xonsh: {
+            const sharedConfig = os.platform() == "win32" ? path.join("C:\\ProgramData", "xonsh", "xonshrc") : path.join("etc", "xonsh", "xonshrc");
+            const userConfigs = [
+                path.join(os.homedir(), ".xonshrc"),
+                path.join(os.homedir(), ".config", "xonsh", "rc.xsh"),
+                path.join(os.homedir(), ".config", "xonsh", "rc.d"),
+            ];
+            const configs = [sharedConfig, ...userConfigs].filter((config) => fs.existsSync(config));
+            shellArgs = ["-m", "xonsh", "--rc", ...configs, path.join(shellFolderPath, "shellIntegration.xsh")];
+            shellTarget = await getPythonPath();
+            break;
+        }
     }
     return { shellTarget, shellArgs };
 };
-const convertToPtyEnv = (shell) => {
+const convertToPtyEnv = (shell, underTest) => {
     const env = {
         ...process.env,
         ISTERM: "1",
+        ISTERM_TESTING: underTest ? "1" : undefined,
     };
     switch (shell) {
         case Shell.Cmd: {
+            if (underTest) {
+                return { ...env, PROMPT: `${IstermPromptStart}$G ${IstermPromptEnd}` };
+            }
             const prompt = process.env.PROMPT ? process.env.PROMPT : "$P$G";
             return { ...env, PROMPT: `${IstermPromptStart}${prompt}${IstermPromptEnd}` };
         }

package/build/runtime/generator.js

@@ -23,13 +23,14 @@ export const runGenerator = async (generator, tokens, cwd) => {
         if (script) {
             const shellInput = typeof script === "function" ? script(tokens) : script;
             const scriptOutput = Array.isArray(shellInput)
-                ? await executeShellCommand({ command: shellInput.at(0) ?? "", args: shellInput.slice(1) })
-                : await executeShellCommand(shellInput);
+                ? await executeShellCommand({ command: shellInput.at(0) ?? "", args: shellInput.slice(1), cwd })
+                : await executeShellCommand({ ...shellInput, cwd });
+            const scriptStdout = scriptOutput.stdout.trim();
             if (postProcess) {
-                suggestions.push(...postProcess(scriptOutput.stdout, tokens));
+                suggestions.push(...postProcess(scriptStdout, tokens));
             }
             else if (splitOn) {
-                suggestions.push(...scriptOutput.stdout.split(splitOn).map((s) => ({ name: s })));
+                suggestions.push(...scriptStdout.split(splitOn).map((s) => ({ name: s })));
             }
         }
         if (custom) {
@@ -47,7 +48,8 @@ export const runGenerator = async (generator, tokens, cwd) => {
         return suggestions;
     }
     catch (e) {
-        log.debug({ msg: "generator failed", e, script, splitOn, template });
+        const err = typeof e === "string" ? e : e instanceof Error ? e.message : e;
+        log.debug({ msg: "generator failed", err, script, splitOn, template });
     }
     return suggestions;
 };

package/build/runtime/runtime.js

@@ -14,6 +14,9 @@ speclist.forEach((s) => {
     let activeSet = specSet;
     const specRoutes = s.split("/");
     specRoutes.forEach((route, idx) => {
+        if (typeof activeSet !== "object") {
+            return;
+        }
         if (idx === specRoutes.length - 1) {
             const prefix = versionedSpeclist.includes(s) ? "/index.js" : `.js`;
             activeSet[route] = `@withfig/autocomplete/build/${s}${prefix}`;
@@ -93,12 +96,12 @@ const getSubcommand = (spec) => {
 };
 const executeShellCommand = buildExecuteShellCommand(5000);
 const genSubcommand = async (command, parentCommand) => {
-    const subcommandIdx = parentCommand.subcommands?.findIndex((s) => s.name === command);
-    if (subcommandIdx == null)
+    if (!parentCommand.subcommands || parentCommand.subcommands.length === 0)
         return;
-    const subcommand = parentCommand.subcommands?.at(subcommandIdx);
-    if (subcommand == null)
+    const subcommandIdx = parentCommand.subcommands.findIndex((s) => (Array.isArray(s.name) ? s.name.includes(command) : s.name === command));
+    if (subcommandIdx === -1)
         return;
+    const subcommand = parentCommand.subcommands[subcommandIdx];
     // this pulls in the spec from the load spec and overwrites the subcommand in the parent with the loaded spec.
     // then it returns the subcommand and clears the loadSpec field so that it doesn't get called again
     switch (typeof subcommand.loadSpec) {

package/build/runtime/suggestion.js

@@ -15,7 +15,11 @@ var SuggestionIcons;
     SuggestionIcons["Special"] = "\u2B50";
     SuggestionIcons["Default"] = "\uD83D\uDCC0";
 })(SuggestionIcons || (SuggestionIcons = {}));
-const getIcon = (suggestionType) => {
+const getIcon = (icon, suggestionType) => {
+    // TODO: enable fig icons once spacing is better
+    // if (icon && /[^\u0000-\u00ff]/.test(icon)) {
+    //   return icon;
+    // }
     switch (suggestionType) {
         case "arg":
             return SuggestionIcons.Argument;
@@ -45,7 +49,7 @@ const toSuggestion = (suggestion, name, type) => {
     return {
         name: name ?? getLong(suggestion.name),
         description: suggestion.description,
-        icon: getIcon(type ?? suggestion.type),
+        icon: getIcon(suggestion.icon, type ?? suggestion.type),
         allNames: suggestion.name instanceof Array ? suggestion.name : [suggestion.name],
         priority: suggestion.priority ?? 50,
         insertValue: suggestion.insertValue,
@@ -66,7 +70,7 @@ function filter(suggestions, filterStrategy, partialCmd, suggestionType) {
                         ? {
                             name: matchedName,
                             description: s.description,
-                            icon: getIcon(s.type ?? suggestionType),
+                            icon: getIcon(s.icon, s.type ?? suggestionType),
                             allNames: s.name,
                             priority: s.priority ?? 50,
                             insertValue: s.insertValue,
@@ -77,7 +81,7 @@ function filter(suggestions, filterStrategy, partialCmd, suggestionType) {
                     ? {
                         name: s.name,
                         description: s.description,
-                        icon: getIcon(s.type ?? suggestionType),
+                        icon: getIcon(s.icon, s.type ?? suggestionType),
                         allNames: [s.name],
                         priority: s.priority ?? 50,
                         insertValue: s.insertValue,
@@ -96,7 +100,7 @@ function filter(suggestions, filterStrategy, partialCmd, suggestionType) {
                         ? {
                             name: matchedName,
                             description: s.description,
-                            icon: getIcon(s.type ?? suggestionType),
+                            icon: getIcon(s.icon, s.type ?? suggestionType),
                             allNames: s.name,
                             insertValue: s.insertValue,
                             priority: s.priority ?? 50,
@@ -107,7 +111,7 @@ function filter(suggestions, filterStrategy, partialCmd, suggestionType) {
                     ? {
                         name: s.name,
                         description: s.description,
-                        icon: getIcon(s.type ?? suggestionType),
+                        icon: getIcon(s.icon, s.type ?? suggestionType),
                         allNames: [s.name],
                         insertValue: s.insertValue,
                         priority: s.priority ?? 50,
@@ -120,8 +124,10 @@ function filter(suggestions, filterStrategy, partialCmd, suggestionType) {
 const generatorSuggestions = async (generator, acceptedTokens, filterStrategy, partialCmd, cwd) => {
     const generators = generator instanceof Array ? generator : generator ? [generator] : [];
     const tokens = acceptedTokens.map((t) => t.token);
+    if (partialCmd)
+        tokens.push(partialCmd);
     const suggestions = (await Promise.all(generators.map((gen) => runGenerator(gen, tokens, cwd)))).flat();
-    return filter(suggestions, filterStrategy, partialCmd, undefined);
+    return filter(suggestions.map((suggestion) => ({ ...suggestion, priority: suggestion.priority ?? 60 })), filterStrategy, partialCmd, undefined);
 };
 const templateSuggestions = async (templates, filterStrategy, partialCmd, cwd) => {
     return filter(await runTemplates(templates ?? [], cwd), filterStrategy, partialCmd, undefined);

package/build/runtime/template.js

@@ -4,11 +4,11 @@ import fsAsync from "node:fs/promises";
 import log from "../utils/log.js";
 const filepathsTemplate = async (cwd) => {
     const files = await fsAsync.readdir(cwd, { withFileTypes: true });
-    return files.filter((f) => f.isFile() || f.isDirectory()).map((f) => ({ name: f.name, priority: 90, context: { templateType: "filepaths" } }));
+    return files.filter((f) => f.isFile() || f.isDirectory()).map((f) => ({ name: f.name, priority: 55, context: { templateType: "filepaths" } }));
 };
 const foldersTemplate = async (cwd) => {
     const files = await fsAsync.readdir(cwd, { withFileTypes: true });
-    return files.filter((f) => f.isDirectory()).map((f) => ({ name: f.name, priority: 90, context: { templateType: "folders" } }));
+    return files.filter((f) => f.isDirectory()).map((f) => ({ name: f.name, priority: 55, context: { templateType: "folders" } }));
 };
 // TODO: implement history template
 const historyTemplate = () => {

package/build/ui/suggestionManager.js

@@ -4,7 +4,8 @@ import { getSuggestions } from "../runtime/runtime.js";
 import { renderBox, truncateText, truncateMultilineText } from "./utils.js";
 import ansi from "ansi-escapes";
 import chalk from "chalk";
-import { parseKeystroke } from "../utils/ansi.js";
+import log from "../utils/log.js";
+import { getConfig } from "../utils/config.js";
 const maxSuggestions = 5;
 const suggestionWidth = 40;
 const descriptionWidth = 30;
@@ -29,6 +30,7 @@ export class SuggestionManager {
         const commandText = this.#term.getCommandState().commandText;
         if (!commandText) {
             this.#suggestBlob = undefined;
+            this.#activeSuggestionIdx = 0;
             return;
         }
         if (commandText == this.#command) {
@@ -37,6 +39,7 @@ export class SuggestionManager {
         this.#command = commandText;
         const suggestionBlob = await getSuggestions(commandText, this.#term.cwd, this.#shell);
         this.#suggestBlob = suggestionBlob;
+        this.#activeSuggestionIdx = 0;
     }
     _renderArgumentDescription(description, x) {
         if (!description)
@@ -55,15 +58,20 @@ export class SuggestionManager {
     }
     _renderSuggestions(suggestions, activeSuggestionIdx, x) {
         return renderBox(suggestions.map((suggestion, idx) => {
-            const suggestionText = `${suggestion.icon} ${suggestion.name}`.padEnd(suggestionWidth - borderWidth, " ");
+            const suggestionText = `${suggestion.icon} ${suggestion.name}`;
             const truncatedSuggestion = truncateText(suggestionText, suggestionWidth - 2);
             return idx == activeSuggestionIdx ? chalk.bgHex(activeSuggestionBackgroundColor)(truncatedSuggestion) : truncatedSuggestion;
         }), suggestionWidth, x);
     }
+    validate(suggestion) {
+        const commandText = this.#term.getCommandState().commandText;
+        return !commandText ? { data: "", rows: 0 } : suggestion;
+    }
     async render(remainingLines) {
         await this._loadSuggestions();
-        if (!this.#suggestBlob)
+        if (!this.#suggestBlob) {
             return { data: "", rows: 0 };
+        }
         const { suggestions, argumentDescription } = this.#suggestBlob;
         const page = Math.min(Math.floor(this.#activeSuggestionIdx / maxSuggestions) + 1, Math.floor(suggestions.length / maxSuggestions) + 1);
         const pagedSuggestions = suggestions.filter((_, idx) => idx < page * maxSuggestions && idx >= (page - 1) * maxSuggestions);
@@ -112,20 +120,22 @@ export class SuggestionManager {
             rows,
         };
     }
-    update(input) {
-        const keyStroke = parseKeystroke(input);
-        if (keyStroke == null)
+    update(keyPress) {
+        const { name, shift, ctrl } = keyPress;
+        if (!this.#suggestBlob) {
             return false;
-        if (keyStroke == "esc") {
+        }
+        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;
         }
-        else if (keyStroke == "up") {
+        else if (name == prevKey && shift == !!prevShift && ctrl == !!prevCtrl) {
             this.#activeSuggestionIdx = Math.max(0, this.#activeSuggestionIdx - 1);
         }
-        else if (keyStroke == "down") {
+        else if (name == nextKey && shift == !!nextShift && ctrl == !!nextCtrl) {
             this.#activeSuggestionIdx = Math.min(this.#activeSuggestionIdx + 1, (this.#suggestBlob?.suggestions.length ?? 1) - 1);
         }
-        else if (keyStroke == "tab") {
+        else if (name == acceptKey && shift == !!acceptShift && ctrl == !!acceptCtrl) {
             const removals = "\u007F".repeat(this.#suggestBlob?.charactersToDrop ?? 0);
             const suggestion = this.#suggestBlob?.suggestions.at(this.#activeSuggestionIdx);
             const chars = suggestion?.insertValue ?? suggestion?.name + " ";
@@ -134,6 +144,10 @@ export class SuggestionManager {
             }
             this.#term.write(removals + chars);
         }
-        return "handled";
+        else {
+            return false;
+        }
+        log.debug({ msg: "handled keypress", ...keyPress });
+        return true;
     }
 }

package/build/ui/ui-root.js

@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import readline from "node:readline";
 import ansi from "ansi-escapes";
 import chalk from "chalk";
-import { inputModifier } from "./input.js";
 import log from "../utils/log.js";
+import { Shell } from "../utils/shell.js";
 import isterm from "../isterm/index.js";
 import { eraseLinesBelow } from "../utils/ansi.js";
 import { SuggestionManager, MAX_LINES } from "./suggestionManager.js";
@@ -11,12 +12,14 @@ export const renderConfirmation = (live) => {
     const statusMessage = live ? chalk.green("live") : chalk.red("not found");
     return `inshellisense session [${statusMessage}]\n`;
 };
-export const render = async (shell) => {
-    const term = await isterm.spawn({ shell, rows: process.stdout.rows, cols: process.stdout.columns });
+export const render = async (shell, underTest) => {
+    const term = await isterm.spawn({ shell, rows: process.stdout.rows, cols: process.stdout.columns, underTest });
     const suggestionManager = new SuggestionManager(term, shell);
     let hasActiveSuggestions = false;
     let previousSuggestionsRows = 0;
-    process.stdin.setRawMode(true);
+    if (process.stdin.isTTY)
+        process.stdin.setRawMode(true);
+    readline.emitKeypressEvents(process.stdin);
     const writeOutput = (data) => {
         log.debug({ msg: "writing data", data });
         process.stdout.write(data);
@@ -27,7 +30,7 @@ export const render = async (shell) => {
             // Considers when data includes newlines which have shifted the cursor position downwards
             const newlines = Math.max((data.match(/\r/g) || []).length, (data.match(/\n/g) || []).length);
             const linesOfInterest = MAX_LINES + newlines;
-            if (term.getCursorState().remainingLines <= previousSuggestionsRows) {
+            if (term.getCursorState().remainingLines <= MAX_LINES) {
                 // handles when suggestions get loaded before shell output so you need to always clear below output as a precaution
                 if (term.getCursorState().remainingLines != 0) {
                     writeOutput(ansi.cursorHide + ansi.cursorSavePosition + eraseLinesBelow(linesOfInterest + 1) + ansi.cursorRestorePosition);
@@ -47,12 +50,13 @@ export const render = async (shell) => {
         else {
             writeOutput(data);
         }
-        setImmediate(async () => {
-            const suggestion = await suggestionManager.render(term.getCursorState().remainingLines);
+        process.nextTick(async () => {
+            // validate result to prevent stale suggestion being provided
+            const suggestion = suggestionManager.validate(await suggestionManager.render(term.getCursorState().remainingLines));
             const commandState = term.getCommandState();
             if (suggestion.data != "" && commandState.cursorTerminated && !commandState.hasOutput) {
                 if (hasActiveSuggestions) {
-                    if (term.getCursorState().remainingLines < suggestion.rows) {
+                    if (term.getCursorState().remainingLines < MAX_LINES) {
                         writeOutput(ansi.cursorHide +
                             ansi.cursorSavePosition +
                             ansi.cursorPrevLine.repeat(MAX_LINES) +
@@ -76,7 +80,7 @@ export const render = async (shell) => {
                     }
                 }
                 else {
-                    if (term.getCursorState().remainingLines < suggestion.rows) {
+                    if (term.getCursorState().remainingLines < MAX_LINES) {
                         writeOutput(ansi.cursorHide + ansi.cursorSavePosition + ansi.cursorUp() + suggestion.data + ansi.cursorRestorePosition + ansi.cursorShow);
                     }
                     else {
@@ -92,7 +96,7 @@ export const render = async (shell) => {
             }
             else {
                 if (hasActiveSuggestions) {
-                    if (term.getCursorState().remainingLines <= previousSuggestionsRows) {
+                    if (term.getCursorState().remainingLines <= MAX_LINES) {
                         writeOutput(ansi.cursorHide +
                             ansi.cursorSavePosition +
                             ansi.cursorPrevLine.repeat(MAX_LINES) +
@@ -109,13 +113,19 @@ export const render = async (shell) => {
             previousSuggestionsRows = suggestion.rows;
         });
     });
-    process.stdin.on("data", (d) => {
-        const suggestionResult = suggestionManager.update(d);
-        if (previousSuggestionsRows > 0 && suggestionResult == "handled") {
+    process.stdin.on("keypress", (...keyPress) => {
+        const press = keyPress[1];
+        const inputHandled = suggestionManager.update(press);
+        if (previousSuggestionsRows > 0 && inputHandled) {
             term.noop();
         }
-        else if (suggestionResult != "fully-handled") {
-            term.write(inputModifier(d));
+        else if (!inputHandled) {
+            if (press.name == "backspace" && (shell === Shell.Pwsh || shell === Shell.Powershell || shell === Shell.Cmd)) {
+                term.write("\u007F");
+            }
+            else {
+                term.write(press.sequence);
+            }
         }
     });
     term.onExit(({ exitCode }) => {

package/build/ui/ui-uninstall.js

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import chalk from "chalk";
-import { deleteConfigFolder } from "../utils/config.js";
+import { deleteCacheFolder } from "../utils/config.js";
 export const render = async () => {
-    deleteConfigFolder();
-    process.stdout.write(chalk.green("✓") + " successfully deleted the .inshellisense config folder \n");
+    deleteCacheFolder();
+    process.stdout.write(chalk.green("✓") + " successfully deleted the .inshellisense cache folder \n");
     process.stdout.write(chalk.magenta("•") + " to complete the uninstall, run the the command: " + chalk.underline(chalk.cyan("npm uninstall -g @microsoft/inshellisense")) + "\n");
 };

package/build/ui/utils.js

@@ -3,6 +3,7 @@
 import ansi from "ansi-escapes";
 import wrapAnsi from "wrap-ansi";
 import chalk from "chalk";
+import wcwdith from "wcwidth";
 /**
  * Renders a box around the given rows
  * @param rows the text content to be included in the box, must be <= width - 2
@@ -36,6 +37,7 @@ export const truncateMultilineText = (description, width, maxHeight) => {
  */
 export const truncateText = (text, width) => {
     const textPoints = [...text];
-    const slicedText = textPoints.slice(0, width - 1);
+    const wcOffset = Math.max(wcwdith(text) - textPoints.length, 0);
+    const slicedText = textPoints.slice(0, width - 1 - wcOffset);
     return slicedText.length == textPoints.length ? text.padEnd(width) : (slicedText.join("") + "…").padEnd(width);
 };

package/build/utils/ansi.js

@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 const ESC = "\u001B";
-const CSI = "\u001B[";
+const CSI = ESC + "[";
 const OSC = "\u001B]";
 const BEL = "\u0007";
-const SS3 = "\u001BO";
 export const IsTermOscPs = 6973;
 const IS_OSC = OSC + IsTermOscPs + ";";
 export var IstermOscPt;
@@ -32,25 +31,3 @@ export const scrollDown = (count = 1) => CSI + count + "T";
 export const eraseLinesBelow = (count = 1) => {
     return [...Array(count).keys()].map(() => cursorNextLine + eraseLine).join("");
 };
-export const parseKeystroke = (b) => {
-    let s;
-    if (b[0] > 127 && b[1] === undefined) {
-        b[0] -= 128;
-        s = "\u001B" + String(b);
-    }
-    else {
-        s = String(b);
-    }
-    if (s == ESC) {
-        return "esc";
-    }
-    else if (s == CSI + "A" || s == SS3 + "A") {
-        return "up";
-    }
-    else if (s == CSI + "B" || s == SS3 + "B") {
-        return "down";
-    }
-    else if (s == "\t") {
-        return "tab";
-    }
-};

package/build/utils/config.js

@@ -4,64 +4,103 @@ import os from "node:os";
 import path from "node:path";
 import fs from "node:fs";
 import fsAsync from "node:fs/promises";
+import toml from "toml";
 import _Ajv from "ajv";
 const Ajv = _Ajv;
 const ajv = new Ajv();
+const bindingSchema = {
+    type: "object",
+    nullable: true,
+    properties: {
+        shift: { type: "boolean", nullable: true },
+        control: { type: "boolean", nullable: true },
+        key: { type: "string" },
+    },
+    required: ["key"],
+};
+const promptPatternsSchema = {
+    type: "array",
+    nullable: true,
+    items: {
+        type: "object",
+        properties: {
+            regex: { type: "string" },
+            postfix: { type: "string" },
+        },
+        required: ["regex", "postfix"],
+    },
+};
 const configSchema = {
     type: "object",
+    nullable: true,
     properties: {
-        promptRegex: {
+        bindings: {
             type: "object",
+            nullable: true,
             properties: {
-                bash: {
-                    type: "object",
-                    nullable: true,
-                    properties: {
-                        regex: { type: "string" },
-                        postfix: { type: "string" },
-                    },
-                    required: ["regex", "postfix"],
-                },
-                pwsh: {
-                    type: "object",
-                    nullable: true,
-                    properties: {
-                        regex: { type: "string" },
-                        postfix: { type: "string" },
-                    },
-                    required: ["regex", "postfix"],
-                },
-                powershell: {
-                    type: "object",
-                    nullable: true,
-                    properties: {
-                        regex: { type: "string" },
-                        postfix: { type: "string" },
-                    },
-                    required: ["regex", "postfix"],
-                },
+                nextSuggestion: bindingSchema,
+                previousSuggestion: bindingSchema,
+                dismissSuggestions: bindingSchema,
+                acceptSuggestion: bindingSchema,
             },
+        },
+        prompt: {
+            type: "object",
             nullable: true,
+            properties: {
+                bash: promptPatternsSchema,
+                pwsh: promptPatternsSchema,
+                powershell: promptPatternsSchema,
+                xonsh: promptPatternsSchema,
+            },
         },
     },
     additionalProperties: false,
 };
-const configFolder = ".inshellisense";
-const cachePath = path.join(os.homedir(), configFolder, "config.json");
-let globalConfig = {};
+const configFile = ".inshellisenserc";
+const cachePath = path.join(os.homedir(), ".inshellisense");
+const configPath = path.join(os.homedir(), configFile);
+let globalConfig = {
+    bindings: {
+        nextSuggestion: { key: "down" },
+        previousSuggestion: { key: "up" },
+        acceptSuggestion: { key: "tab" },
+        dismissSuggestions: { key: "escape" },
+    },
+};
 export const getConfig = () => globalConfig;
 export const loadConfig = async (program) => {
-    if (fs.existsSync(cachePath)) {
-        const config = JSON.parse((await fsAsync.readFile(cachePath)).toString());
+    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(`${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("inshellisense config is invalid: " + ajv.errorsText());
+            program.error(`${configFile} is invalid: ${ajv.errorsText()}`);
         }
-        globalConfig = config;
+        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,
+            },
+        };
     }
 };
-export const deleteConfigFolder = async () => {
-    const cliConfigPath = path.join(os.homedir(), configFolder);
+export const deleteCacheFolder = async () => {
+    const cliConfigPath = path.join(os.homedir(), cachePath);
     if (fs.existsSync(cliConfigPath)) {
         fs.rmSync(cliConfigPath, { recursive: true });
     }

package/build/utils/shell.js

@@ -16,6 +16,7 @@ export var Shell;
     Shell["Zsh"] = "zsh";
     Shell["Fish"] = "fish";
     Shell["Cmd"] = "cmd";
+    Shell["Xonsh"] = "xonsh";
 })(Shell || (Shell = {}));
 export const supportedShells = [
     Shell.Bash,
@@ -24,6 +25,7 @@ export const supportedShells = [
     Shell.Zsh,
     Shell.Fish,
     process.platform == "win32" ? Shell.Cmd : null,
+    Shell.Xonsh,
 ].filter((shell) => shell != null);
 export const userZdotdir = process.env?.ZDOTDIR ?? os.homedir() ?? `~`;
 export const zdotdir = path.join(os.tmpdir(), `is-zsh`);
@@ -66,6 +68,9 @@ export const gitBashPath = async () => {
     }
     throw new Error("unable to find a git bash executable installed");
 };
+export const getPythonPath = async () => {
+    return await which("python", { nothrow: true });
+};
 const getGitBashPaths = async () => {
     const gitDirs = new Set();
     const gitExePath = await which("git.exe", { nothrow: true });

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.7",
+  "version": "0.0.1-rc.9",
   "description": "IDE style command line auto complete",
   "type": "module",
+  "engines": {
+    "node": ">=16.6.0 <21.0.0"
+  },
   "bin": {
     "inshellisense": "./build/index.js",
     "is": "./build/index.js"
@@ -17,9 +20,11 @@
     "build": "tsc",
     "dev": "node --loader ts-node/esm src/index.ts -V",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test:e2e": "tui-test",
     "lint": "eslint src/ --ext .ts,.tsx && prettier src/ --check",
     "lint:fix": "eslint src/ --ext .ts,.tsx --fix && prettier src/ --write",
-    "debug": "node --inspect --loader ts-node/esm src/index.ts -V"
+    "debug": "node --inspect --loader ts-node/esm src/index.ts -V",
+    "pre-commit": "lint-staged"
   },
   "repository": {
     "type": "git",
@@ -34,22 +39,28 @@
   },
   "homepage": "https://github.com/microsoft/inshellisense#readme",
   "dependencies": {
-    "@withfig/autocomplete": "2.648.2",
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.11.12",
+    "@withfig/autocomplete": "2.651.0",
     "ajv": "^8.12.0",
     "ansi-escapes": "^6.2.0",
     "ansi-styles": "^6.2.1",
     "chalk": "^5.3.0",
+    "color-convert": "^2.0.1",
     "commander": "^11.0.0",
     "find-process": "^1.4.7",
-    "node-pty": "^1.0.0",
+    "toml": "^3.0.0",
+    "wcwidth": "^1.0.1",
     "which": "^4.0.0",
     "wrap-ansi": "^8.1.0",
     "xterm-headless": "^5.3.0"
   },
   "devDependencies": {
+    "@microsoft/tui-test": "^0.0.1-rc.3",
     "@tsconfig/node18": "^18.2.2",
+    "@types/color-convert": "^2.0.3",
     "@types/jest": "^29.5.5",
     "@types/react": "^18.2.24",
+    "@types/wcwidth": "^1.0.2",
     "@types/which": "^3.0.3",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
@@ -58,10 +69,18 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-react": "^7.33.2",
+    "husky": "^9.0.11",
     "jest": "^29.7.0",
+    "lint-staged": "^15.2.2",
     "prettier": "3.0.3",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.2.2"
+  },
+  "lint-staged": {
+    "{,src/**/}*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ]
   }
 }

package/shell/shellIntegration-rc.zsh

@@ -41,10 +41,16 @@ __is_update_cwd() {
 
 __is_update_prompt() {
 	__is_prior_prompt="$PS1"
-	PS1="%{$(__is_prompt_start)%}$PS1%{$(__is_prompt_end)%}"
+	if [[ $ISTERM_TESTING == "1" ]]; then
+		__is_prior_prompt="> "
+	fi
+	PS1="%{$(__is_prompt_start)%}$__is_prior_prompt%{$(__is_prompt_end)%}"
 }
 
 __is_precmd() {
+	if [[ $PS1 != *"$(__is_prompt_start)"* ]]; then
+		__is_update_prompt
+	fi
 	__is_update_cwd
 }
 

package/shell/shellIntegration.bash

@@ -57,6 +57,9 @@ fi
 __is_update_prompt() {
 	if [[ "$__is_custom_PS1" == "" || "$__is_custom_PS1" != "$PS1" ]]; then
         __is_original_PS1=$PS1
+		if [ $ISTERM_TESTING == "1" ]; then
+			__is_original_PS1="> "
+		fi
         __is_custom_PS1="\[$(__is_prompt_start)\]$__is_original_PS1\[$(__is_prompt_end)\]"
         export PS1="$__is_custom_PS1"
     fi

package/shell/shellIntegration.fish

@@ -11,4 +11,9 @@ 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
+
+if [ "$ISTERM_TESTING" = "1" ]
+	function is_user_prompt; printf '> '; end
+end
+
 function fish_prompt; printf (__is_prompt_start); printf (is_user_prompt); printf (__is_prompt_end); end

package/shell/shellIntegration.ps1

@@ -1,5 +1,12 @@
 $Global:__IsOriginalPrompt = $function:Prompt
 
+function Global:__IsTestingPrompt() {
+    return "PS > "
+}
+if ($env:ISTERM_TESTING -eq "1") {
+    $Global:__IsOriginalPrompt = $function:__IsTestingPrompt
+}
+
 function Global:__IS-Escape-Value([string]$value) {
     [regex]::Replace($value, '[\\\n;]', { param($match)
             -Join (

package/shell/shellIntegration.xsh

@@ -0,0 +1,29 @@
+import os
+
+def __is_prompt_start() -> str:
+    return "\001" + "\x1b]6973;PS\x07"
+
+
+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
+            for byte in byte_list
+        ]
+    )
+
+def __is_update_cwd() -> str:
+    return f"\x1b]6973;CWD;{__is_escape_value(os.getcwd())}\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
+if $ISTERM_TESTING:
+    $PROMPT = "> "
+
+$PROMPT = "{__is_prompt_start}{__is_update_cwd}" + $PROMPT + "{__is_prompt_end}"

package/build/ui/input.js

@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-export const inputModifier = (input) => {
-    switch (input.toString()) {
-        case "\b":
-            return "\u007F"; // DEL
-    }
-    return input.toString();
-};