@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/contrib/terminal/common/history.js

@@ -0,0 +1,378 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { env } from '../../../../base/common/process.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { FileOperationError } from '../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.service.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.service.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { join } from '../../../../base/common/path.js';
+let commandHistory = undefined;
+function getCommandHistory(accessor) {
+    if (!commandHistory) {
+        commandHistory = accessor.get(IInstantiationService).createInstance(TerminalPersistedHistory, 'commands');
+    }
+    return commandHistory;
+}
+let directoryHistory = undefined;
+function getDirectoryHistory(accessor) {
+    if (!directoryHistory) {
+        directoryHistory = accessor.get(IInstantiationService).createInstance(TerminalPersistedHistory, 'dirs');
+    }
+    return directoryHistory;
+}
+const shellFileHistory = ( new Map());
+async function getShellFileHistory(accessor, shellType) {
+    const cached = shellFileHistory.get(shellType);
+    if (cached === null) {
+        return [];
+    }
+    if (cached !== undefined) {
+        return cached;
+    }
+    let result;
+    switch (shellType) {
+        case "bash" :
+            result = await fetchBashHistory(accessor);
+            break;
+        case "pwsh" :
+            result = await fetchPwshHistory(accessor);
+            break;
+        case "zsh" :
+            result = await fetchZshHistory(accessor);
+            break;
+        case "fish" :
+            result = await fetchFishHistory(accessor);
+            break;
+        case "python" :
+            result = await fetchPythonHistory(accessor);
+            break;
+        default: return [];
+    }
+    if (result === undefined) {
+        shellFileHistory.set(shellType, null);
+        return [];
+    }
+    const array = Array.from(result);
+    shellFileHistory.set(shellType, array);
+    return array;
+}
+function clearShellFileHistory() {
+    shellFileHistory.clear();
+}
+let TerminalPersistedHistory = class TerminalPersistedHistory extends Disposable {
+    get entries() {
+        this._ensureUpToDate();
+        return this._entries.entries();
+    }
+    constructor(_storageDataKey, _configurationService, _storageService) {
+        super();
+        this._storageDataKey = _storageDataKey;
+        this._configurationService = _configurationService;
+        this._storageService = _storageService;
+        this._timestamp = 0;
+        this._isReady = false;
+        this._isStale = true;
+        this._entries = ( new LRUCache(this._getHistoryLimit()));
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration("terminal.integrated.shellIntegration.history" )) {
+                this._entries.limit = this._getHistoryLimit();
+            }
+        }));
+        this._register(this._storageService.onDidChangeValue(-1 , this._getTimestampStorageKey(), this._store)(() => {
+            if (!this._isStale) {
+                this._isStale = this._storageService.getNumber(this._getTimestampStorageKey(), -1 , 0) !== this._timestamp;
+            }
+        }));
+    }
+    add(key, value) {
+        this._ensureUpToDate();
+        this._entries.set(key, value);
+        this._saveState();
+    }
+    remove(key) {
+        this._ensureUpToDate();
+        this._entries.delete(key);
+        this._saveState();
+    }
+    clear() {
+        this._ensureUpToDate();
+        this._entries.clear();
+        this._saveState();
+    }
+    _ensureUpToDate() {
+        if (!this._isReady) {
+            this._loadState();
+            this._isReady = true;
+        }
+        if (this._isStale) {
+            this._entries.clear();
+            this._loadState();
+            this._isStale = false;
+        }
+    }
+    _loadState() {
+        this._timestamp = this._storageService.getNumber(this._getTimestampStorageKey(), -1 , 0);
+        const serialized = this._loadPersistedState();
+        if (serialized) {
+            for (const entry of serialized.entries) {
+                this._entries.set(entry.key, entry.value);
+            }
+        }
+    }
+    _loadPersistedState() {
+        const raw = this._storageService.get(this._getEntriesStorageKey(), -1 );
+        if (raw === undefined || raw.length === 0) {
+            return undefined;
+        }
+        let serialized = undefined;
+        try {
+            serialized = JSON.parse(raw);
+        }
+        catch {
+            return undefined;
+        }
+        return serialized;
+    }
+    _saveState() {
+        const serialized = { entries: [] };
+        this._entries.forEach((value, key) => serialized.entries.push({ key, value }));
+        this._storageService.store(this._getEntriesStorageKey(), JSON.stringify(serialized), -1 , 1 );
+        this._timestamp = Date.now();
+        this._storageService.store(this._getTimestampStorageKey(), this._timestamp, -1 , 1 );
+    }
+    _getHistoryLimit() {
+        const historyLimit = this._configurationService.getValue("terminal.integrated.shellIntegration.history" );
+        return typeof historyLimit === 'number' ? historyLimit : 100 ;
+    }
+    _getTimestampStorageKey() {
+        return `${"terminal.history.timestamp" }.${this._storageDataKey}`;
+    }
+    _getEntriesStorageKey() {
+        return `${"terminal.history.entries" }.${this._storageDataKey}`;
+    }
+};
+TerminalPersistedHistory = ( __decorate([
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IStorageService))
+], TerminalPersistedHistory));
+async function fetchBashHistory(accessor) {
+    const fileService = accessor.get(IFileService);
+    const remoteAgentService = accessor.get(IRemoteAgentService);
+    const remoteEnvironment = await remoteAgentService.getEnvironment();
+    if (remoteEnvironment?.os === 1  || !remoteEnvironment && isWindows) {
+        return undefined;
+    }
+    const content = await fetchFileContents(env['HOME'], '.bash_history', false, fileService, remoteAgentService);
+    if (content === undefined) {
+        return undefined;
+    }
+    const fileLines = content.split('\n');
+    const result = ( new Set());
+    let currentLine;
+    let currentCommand = undefined;
+    let wrapChar = undefined;
+    for (let i = 0; i < fileLines.length; i++) {
+        currentLine = fileLines[i];
+        if (currentCommand === undefined) {
+            currentCommand = currentLine;
+        }
+        else {
+            currentCommand += `\n${currentLine}`;
+        }
+        for (let c = 0; c < currentLine.length; c++) {
+            if (wrapChar) {
+                if (currentLine[c] === wrapChar) {
+                    wrapChar = undefined;
+                }
+            }
+            else {
+                if (currentLine[c].match(/['"]/)) {
+                    wrapChar = currentLine[c];
+                }
+            }
+        }
+        if (wrapChar === undefined) {
+            if (currentCommand.length > 0) {
+                result.add(currentCommand.trim());
+            }
+            currentCommand = undefined;
+        }
+    }
+    return ( result.values());
+}
+async function fetchZshHistory(accessor) {
+    const fileService = accessor.get(IFileService);
+    const remoteAgentService = accessor.get(IRemoteAgentService);
+    const remoteEnvironment = await remoteAgentService.getEnvironment();
+    if (remoteEnvironment?.os === 1  || !remoteEnvironment && isWindows) {
+        return undefined;
+    }
+    const content = await fetchFileContents(env['HOME'], '.zsh_history', false, fileService, remoteAgentService);
+    if (content === undefined) {
+        return undefined;
+    }
+    const fileLines = content.split(/\:\s\d+\:\d+;/);
+    const result = ( new Set());
+    for (let i = 0; i < fileLines.length; i++) {
+        const sanitized = fileLines[i].replace(/\\\n/g, '\n').trim();
+        if (sanitized.length > 0) {
+            result.add(sanitized);
+        }
+    }
+    return ( result.values());
+}
+async function fetchPythonHistory(accessor) {
+    const fileService = accessor.get(IFileService);
+    const remoteAgentService = accessor.get(IRemoteAgentService);
+    const content = await fetchFileContents(env['HOME'], '.python_history', false, fileService, remoteAgentService);
+    if (content === undefined) {
+        return undefined;
+    }
+    const fileLines = content.split('\n');
+    const result = ( new Set());
+    fileLines.forEach(line => {
+        if (line.trim().length > 0) {
+            result.add(line.trim());
+        }
+    });
+    return ( result.values());
+}
+async function fetchPwshHistory(accessor) {
+    const fileService = accessor.get(IFileService);
+    const remoteAgentService = accessor.get(IRemoteAgentService);
+    let folderPrefix;
+    let filePath;
+    const remoteEnvironment = await remoteAgentService.getEnvironment();
+    const isFileWindows = remoteEnvironment?.os === 1  || !remoteEnvironment && isWindows;
+    if (isFileWindows) {
+        folderPrefix = env['APPDATA'];
+        filePath = 'Microsoft\\Windows\\PowerShell\\PSReadLine\\ConsoleHost_history.txt';
+    }
+    else {
+        folderPrefix = env['HOME'];
+        filePath = '.local/share/powershell/PSReadline/ConsoleHost_history.txt';
+    }
+    const content = await fetchFileContents(folderPrefix, filePath, isFileWindows, fileService, remoteAgentService);
+    if (content === undefined) {
+        return undefined;
+    }
+    const fileLines = content.split('\n');
+    const result = ( new Set());
+    let currentLine;
+    let currentCommand = undefined;
+    let wrapChar = undefined;
+    for (let i = 0; i < fileLines.length; i++) {
+        currentLine = fileLines[i];
+        if (currentCommand === undefined) {
+            currentCommand = currentLine;
+        }
+        else {
+            currentCommand += `\n${currentLine}`;
+        }
+        if (!currentLine.endsWith('`')) {
+            const sanitized = currentCommand.trim();
+            if (sanitized.length > 0) {
+                result.add(sanitized);
+            }
+            currentCommand = undefined;
+            continue;
+        }
+        for (let c = 0; c < currentLine.length; c++) {
+            if (wrapChar) {
+                if (currentLine[c] === wrapChar) {
+                    wrapChar = undefined;
+                }
+            }
+            else {
+                if (currentLine[c].match(/`/)) {
+                    wrapChar = currentLine[c];
+                }
+            }
+        }
+        if (!wrapChar) {
+            const sanitized = currentCommand.trim();
+            if (sanitized.length > 0) {
+                result.add(sanitized);
+            }
+            currentCommand = undefined;
+        }
+        else {
+            currentCommand = currentCommand.replace(/`$/, '');
+            wrapChar = undefined;
+        }
+    }
+    return ( result.values());
+}
+async function fetchFishHistory(accessor) {
+    const fileService = accessor.get(IFileService);
+    const remoteAgentService = accessor.get(IRemoteAgentService);
+    const remoteEnvironment = await remoteAgentService.getEnvironment();
+    if (remoteEnvironment?.os === 1  || !remoteEnvironment && isWindows) {
+        return undefined;
+    }
+    const overridenDataHome = env['XDG_DATA_HOME'];
+    const content = await (overridenDataHome
+        ? fetchFileContents(env['XDG_DATA_HOME'], 'fish/fish_history', false, fileService, remoteAgentService)
+        : fetchFileContents(env['HOME'], '.local/share/fish/fish_history', false, fileService, remoteAgentService));
+    if (content === undefined) {
+        return undefined;
+    }
+    const result = ( new Set());
+    const cmds = ( content.split('\n')
+        .filter(x => x.startsWith('- cmd:'))
+        .map(x => x.substring(6).trimStart()));
+    for (let i = 0; i < cmds.length; i++) {
+        const sanitized = sanitizeFishHistoryCmd(cmds[i]).trim();
+        if (sanitized.length > 0) {
+            result.add(sanitized);
+        }
+    }
+    return ( result.values());
+}
+function sanitizeFishHistoryCmd(cmd) {
+    return repeatedReplace(/(^|[^\\])((?:\\\\)*)(\\n)/g, cmd, '$1$2\n');
+}
+function repeatedReplace(pattern, value, replaceValue) {
+    let last;
+    let current = value;
+    while (true) {
+        last = current;
+        current = current.replace(pattern, replaceValue);
+        if (current === last) {
+            return current;
+        }
+    }
+}
+async function fetchFileContents(folderPrefix, filePath, isFileWindows, fileService, remoteAgentService) {
+    if (!folderPrefix) {
+        return undefined;
+    }
+    const connection = remoteAgentService.getConnection();
+    const isRemote = !!connection?.remoteAuthority;
+    const historyFileUri = ( URI.from({
+        scheme: isRemote ? Schemas.vscodeRemote : Schemas.file,
+        authority: isRemote ? connection.remoteAuthority : undefined,
+        path: URI.file(join(folderPrefix, filePath)).path
+    }));
+    let content;
+    try {
+        content = await fileService.readFile(historyFileUri);
+    }
+    catch (e) {
+        if (e instanceof FileOperationError && e.fileOperationResult === 1 ) {
+            return undefined;
+        }
+        throw e;
+    }
+    if (content === undefined) {
+        return undefined;
+    }
+    return ( content.value.toString());
+}
+export { TerminalPersistedHistory, clearShellFileHistory, fetchBashHistory, fetchFishHistory, fetchPwshHistory, fetchPythonHistory, fetchZshHistory, getCommandHistory, getDirectoryHistory, getShellFileHistory, sanitizeFishHistoryCmd };

package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js

@@ -1,6 +1,5 @@
 import { isLinux } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
-import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { defaultTerminalAccessibilityCommandsToSkipShell } from '../../terminalContrib/accessibility/common/terminal.accessibility.js';
 import { defaultTerminalFindCommandToSkipShell } from '../../terminalContrib/find/common/terminal.find.js';
 import { defaultTerminalSuggestCommandsToSkipShell } from '../../terminalContrib/suggest/common/terminal.suggest.js';
@@ -16,163 +15,61 @@ const DEFAULT_FONT_WEIGHT = 'normal';
 const DEFAULT_BOLD_FONT_WEIGHT = 'bold';
 const SUGGESTIONS_FONT_WEIGHT = ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'];
 const isTerminalProcessManager = (t) => typeof t.write === 'function';
-var ProcessState;
-( ((function(ProcessState) {
-    ProcessState[ProcessState["Uninitialized"] = 1] = "Uninitialized";
-    ProcessState[ProcessState["Launching"] = 2] = "Launching";
-    ProcessState[ProcessState["Running"] = 3] = "Running";
-    ProcessState[ProcessState["KilledDuringLaunch"] = 4] = "KilledDuringLaunch";
-    ProcessState[ProcessState["KilledByUser"] = 5] = "KilledByUser";
-    ProcessState[ProcessState["KilledByProcess"] = 6] = "KilledByProcess";
-})(ProcessState || (ProcessState = {}))));
-var TerminalCommandId;
-( ((function(TerminalCommandId) {
-    TerminalCommandId["Toggle"] = "workbench.action.terminal.toggleTerminal";
-    TerminalCommandId["Kill"] = "workbench.action.terminal.kill";
-    TerminalCommandId["KillViewOrEditor"] = "workbench.action.terminal.killViewOrEditor";
-    TerminalCommandId["KillEditor"] = "workbench.action.terminal.killEditor";
-    TerminalCommandId["KillActiveTab"] = "workbench.action.terminal.killActiveTab";
-    TerminalCommandId["KillAll"] = "workbench.action.terminal.killAll";
-    TerminalCommandId["QuickKill"] = "workbench.action.terminal.quickKill";
-    TerminalCommandId["ConfigureTerminalSettings"] = "workbench.action.terminal.openSettings";
-    TerminalCommandId["ShellIntegrationLearnMore"] = "workbench.action.terminal.learnMore";
-    TerminalCommandId["RunRecentCommand"] = "workbench.action.terminal.runRecentCommand";
-    TerminalCommandId["CopyLastCommand"] = "workbench.action.terminal.copyLastCommand";
-    TerminalCommandId["CopyLastCommandOutput"] = "workbench.action.terminal.copyLastCommandOutput";
-    TerminalCommandId["CopyLastCommandAndLastCommandOutput"] = "workbench.action.terminal.copyLastCommandAndLastCommandOutput";
-    TerminalCommandId["GoToRecentDirectory"] = "workbench.action.terminal.goToRecentDirectory";
-    TerminalCommandId["CopyAndClearSelection"] = "workbench.action.terminal.copyAndClearSelection";
-    TerminalCommandId["CopySelection"] = "workbench.action.terminal.copySelection";
-    TerminalCommandId["CopySelectionAsHtml"] = "workbench.action.terminal.copySelectionAsHtml";
-    TerminalCommandId["SelectAll"] = "workbench.action.terminal.selectAll";
-    TerminalCommandId["DeleteWordLeft"] = "workbench.action.terminal.deleteWordLeft";
-    TerminalCommandId["DeleteWordRight"] = "workbench.action.terminal.deleteWordRight";
-    TerminalCommandId["DeleteToLineStart"] = "workbench.action.terminal.deleteToLineStart";
-    TerminalCommandId["MoveToLineStart"] = "workbench.action.terminal.moveToLineStart";
-    TerminalCommandId["MoveToLineEnd"] = "workbench.action.terminal.moveToLineEnd";
-    TerminalCommandId["New"] = "workbench.action.terminal.new";
-    TerminalCommandId["NewWithCwd"] = "workbench.action.terminal.newWithCwd";
-    TerminalCommandId["NewLocal"] = "workbench.action.terminal.newLocal";
-    TerminalCommandId["NewInActiveWorkspace"] = "workbench.action.terminal.newInActiveWorkspace";
-    TerminalCommandId["NewWithProfile"] = "workbench.action.terminal.newWithProfile";
-    TerminalCommandId["Split"] = "workbench.action.terminal.split";
-    TerminalCommandId["SplitActiveTab"] = "workbench.action.terminal.splitActiveTab";
-    TerminalCommandId["SplitInActiveWorkspace"] = "workbench.action.terminal.splitInActiveWorkspace";
-    TerminalCommandId["Unsplit"] = "workbench.action.terminal.unsplit";
-    TerminalCommandId["JoinActiveTab"] = "workbench.action.terminal.joinActiveTab";
-    TerminalCommandId["Join"] = "workbench.action.terminal.join";
-    TerminalCommandId["Relaunch"] = "workbench.action.terminal.relaunch";
-    TerminalCommandId["FocusPreviousPane"] = "workbench.action.terminal.focusPreviousPane";
-    TerminalCommandId["CreateTerminalEditor"] = "workbench.action.createTerminalEditor";
-    TerminalCommandId["CreateTerminalEditorSameGroup"] = "workbench.action.createTerminalEditorSameGroup";
-    TerminalCommandId["CreateTerminalEditorSide"] = "workbench.action.createTerminalEditorSide";
-    TerminalCommandId["FocusTabs"] = "workbench.action.terminal.focusTabs";
-    TerminalCommandId["FocusNextPane"] = "workbench.action.terminal.focusNextPane";
-    TerminalCommandId["ResizePaneLeft"] = "workbench.action.terminal.resizePaneLeft";
-    TerminalCommandId["ResizePaneRight"] = "workbench.action.terminal.resizePaneRight";
-    TerminalCommandId["ResizePaneUp"] = "workbench.action.terminal.resizePaneUp";
-    TerminalCommandId["SizeToContentWidth"] = "workbench.action.terminal.sizeToContentWidth";
-    TerminalCommandId["SizeToContentWidthActiveTab"] = "workbench.action.terminal.sizeToContentWidthActiveTab";
-    TerminalCommandId["ResizePaneDown"] = "workbench.action.terminal.resizePaneDown";
-    TerminalCommandId["Focus"] = "workbench.action.terminal.focus";
-    TerminalCommandId["FocusNext"] = "workbench.action.terminal.focusNext";
-    TerminalCommandId["FocusPrevious"] = "workbench.action.terminal.focusPrevious";
-    TerminalCommandId["Paste"] = "workbench.action.terminal.paste";
-    TerminalCommandId["PasteSelection"] = "workbench.action.terminal.pasteSelection";
-    TerminalCommandId["SelectDefaultProfile"] = "workbench.action.terminal.selectDefaultShell";
-    TerminalCommandId["RunSelectedText"] = "workbench.action.terminal.runSelectedText";
-    TerminalCommandId["RunActiveFile"] = "workbench.action.terminal.runActiveFile";
-    TerminalCommandId["SwitchTerminal"] = "workbench.action.terminal.switchTerminal";
-    TerminalCommandId["ScrollDownLine"] = "workbench.action.terminal.scrollDown";
-    TerminalCommandId["ScrollDownPage"] = "workbench.action.terminal.scrollDownPage";
-    TerminalCommandId["ScrollToBottom"] = "workbench.action.terminal.scrollToBottom";
-    TerminalCommandId["ScrollUpLine"] = "workbench.action.terminal.scrollUp";
-    TerminalCommandId["ScrollUpPage"] = "workbench.action.terminal.scrollUpPage";
-    TerminalCommandId["ScrollToTop"] = "workbench.action.terminal.scrollToTop";
-    TerminalCommandId["Clear"] = "workbench.action.terminal.clear";
-    TerminalCommandId["ClearSelection"] = "workbench.action.terminal.clearSelection";
-    TerminalCommandId["ChangeIcon"] = "workbench.action.terminal.changeIcon";
-    TerminalCommandId["ChangeIconActiveTab"] = "workbench.action.terminal.changeIconActiveTab";
-    TerminalCommandId["ChangeColor"] = "workbench.action.terminal.changeColor";
-    TerminalCommandId["ChangeColorActiveTab"] = "workbench.action.terminal.changeColorActiveTab";
-    TerminalCommandId["Rename"] = "workbench.action.terminal.rename";
-    TerminalCommandId["RenameActiveTab"] = "workbench.action.terminal.renameActiveTab";
-    TerminalCommandId["RenameWithArgs"] = "workbench.action.terminal.renameWithArg";
-    TerminalCommandId["QuickOpenTerm"] = "workbench.action.quickOpenTerm";
-    TerminalCommandId["ScrollToPreviousCommand"] = "workbench.action.terminal.scrollToPreviousCommand";
-    TerminalCommandId["ScrollToNextCommand"] = "workbench.action.terminal.scrollToNextCommand";
-    TerminalCommandId["SelectToPreviousCommand"] = "workbench.action.terminal.selectToPreviousCommand";
-    TerminalCommandId["SelectToNextCommand"] = "workbench.action.terminal.selectToNextCommand";
-    TerminalCommandId["SelectToPreviousLine"] = "workbench.action.terminal.selectToPreviousLine";
-    TerminalCommandId["SelectToNextLine"] = "workbench.action.terminal.selectToNextLine";
-    TerminalCommandId["SendSequence"] = "workbench.action.terminal.sendSequence";
-    TerminalCommandId["AttachToSession"] = "workbench.action.terminal.attachToSession";
-    TerminalCommandId["DetachSession"] = "workbench.action.terminal.detachSession";
-    TerminalCommandId["MoveToEditor"] = "workbench.action.terminal.moveToEditor";
-    TerminalCommandId["MoveToTerminalPanel"] = "workbench.action.terminal.moveToTerminalPanel";
-    TerminalCommandId["MoveIntoNewWindow"] = "workbench.action.terminal.moveIntoNewWindow";
-    TerminalCommandId["SetDimensions"] = "workbench.action.terminal.setDimensions";
-    TerminalCommandId["ClearPreviousSessionHistory"] = "workbench.action.terminal.clearPreviousSessionHistory";
-    TerminalCommandId["FocusHover"] = "workbench.action.terminal.focusHover";
-    TerminalCommandId["ShowEnvironmentContributions"] = "workbench.action.terminal.showEnvironmentContributions";
-    TerminalCommandId["StartVoice"] = "workbench.action.terminal.startVoice";
-    TerminalCommandId["StopVoice"] = "workbench.action.terminal.stopVoice";
-})(TerminalCommandId || (TerminalCommandId = {}))));
 const DEFAULT_COMMANDS_TO_SKIP_SHELL = [
-    TerminalCommandId.ClearSelection,
-    TerminalCommandId.Clear,
-    TerminalCommandId.CopyAndClearSelection,
-    TerminalCommandId.CopySelection,
-    TerminalCommandId.CopySelectionAsHtml,
-    TerminalCommandId.CopyLastCommand,
-    TerminalCommandId.CopyLastCommandOutput,
-    TerminalCommandId.CopyLastCommandAndLastCommandOutput,
-    TerminalCommandId.DeleteToLineStart,
-    TerminalCommandId.DeleteWordLeft,
-    TerminalCommandId.DeleteWordRight,
-    TerminalCommandId.GoToRecentDirectory,
-    TerminalCommandId.FocusNextPane,
-    TerminalCommandId.FocusNext,
-    TerminalCommandId.FocusPreviousPane,
-    TerminalCommandId.FocusPrevious,
-    TerminalCommandId.Focus,
-    TerminalCommandId.SizeToContentWidth,
-    TerminalCommandId.Kill,
-    TerminalCommandId.KillEditor,
-    TerminalCommandId.MoveToEditor,
-    TerminalCommandId.MoveToLineEnd,
-    TerminalCommandId.MoveToLineStart,
-    TerminalCommandId.MoveToTerminalPanel,
-    TerminalCommandId.NewInActiveWorkspace,
-    TerminalCommandId.New,
-    TerminalCommandId.Paste,
-    TerminalCommandId.PasteSelection,
-    TerminalCommandId.ResizePaneDown,
-    TerminalCommandId.ResizePaneLeft,
-    TerminalCommandId.ResizePaneRight,
-    TerminalCommandId.ResizePaneUp,
-    TerminalCommandId.RunActiveFile,
-    TerminalCommandId.RunSelectedText,
-    TerminalCommandId.RunRecentCommand,
-    TerminalCommandId.ScrollDownLine,
-    TerminalCommandId.ScrollDownPage,
-    TerminalCommandId.ScrollToBottom,
-    TerminalCommandId.ScrollToNextCommand,
-    TerminalCommandId.ScrollToPreviousCommand,
-    TerminalCommandId.ScrollToTop,
-    TerminalCommandId.ScrollUpLine,
-    TerminalCommandId.ScrollUpPage,
-    TerminalCommandId.SendSequence,
-    TerminalCommandId.SelectAll,
-    TerminalCommandId.SelectToNextCommand,
-    TerminalCommandId.SelectToNextLine,
-    TerminalCommandId.SelectToPreviousCommand,
-    TerminalCommandId.SelectToPreviousLine,
-    TerminalCommandId.SplitInActiveWorkspace,
-    TerminalCommandId.Split,
-    TerminalCommandId.Toggle,
-    TerminalCommandId.FocusHover,
-    AccessibilityCommandId.OpenAccessibilityHelp,
+    "workbench.action.terminal.clearSelection" ,
+    "workbench.action.terminal.clear" ,
+    "workbench.action.terminal.copyAndClearSelection" ,
+    "workbench.action.terminal.copySelection" ,
+    "workbench.action.terminal.copySelectionAsHtml" ,
+    "workbench.action.terminal.copyLastCommand" ,
+    "workbench.action.terminal.copyLastCommandOutput" ,
+    "workbench.action.terminal.copyLastCommandAndLastCommandOutput" ,
+    "workbench.action.terminal.deleteToLineStart" ,
+    "workbench.action.terminal.deleteWordLeft" ,
+    "workbench.action.terminal.deleteWordRight" ,
+    "workbench.action.terminal.goToRecentDirectory" ,
+    "workbench.action.terminal.focusNextPane" ,
+    "workbench.action.terminal.focusNext" ,
+    "workbench.action.terminal.focusPreviousPane" ,
+    "workbench.action.terminal.focusPrevious" ,
+    "workbench.action.terminal.focus" ,
+    "workbench.action.terminal.sizeToContentWidth" ,
+    "workbench.action.terminal.kill" ,
+    "workbench.action.terminal.killEditor" ,
+    "workbench.action.terminal.moveToEditor" ,
+    "workbench.action.terminal.moveToLineEnd" ,
+    "workbench.action.terminal.moveToLineStart" ,
+    "workbench.action.terminal.moveToTerminalPanel" ,
+    "workbench.action.terminal.newInActiveWorkspace" ,
+    "workbench.action.terminal.new" ,
+    "workbench.action.terminal.paste" ,
+    "workbench.action.terminal.pasteSelection" ,
+    "workbench.action.terminal.resizePaneDown" ,
+    "workbench.action.terminal.resizePaneLeft" ,
+    "workbench.action.terminal.resizePaneRight" ,
+    "workbench.action.terminal.resizePaneUp" ,
+    "workbench.action.terminal.runActiveFile" ,
+    "workbench.action.terminal.runSelectedText" ,
+    "workbench.action.terminal.runRecentCommand" ,
+    "workbench.action.terminal.scrollDown" ,
+    "workbench.action.terminal.scrollDownPage" ,
+    "workbench.action.terminal.scrollToBottom" ,
+    "workbench.action.terminal.scrollToNextCommand" ,
+    "workbench.action.terminal.scrollToPreviousCommand" ,
+    "workbench.action.terminal.scrollToTop" ,
+    "workbench.action.terminal.scrollUp" ,
+    "workbench.action.terminal.scrollUpPage" ,
+    "workbench.action.terminal.sendSequence" ,
+    "workbench.action.terminal.selectAll" ,
+    "workbench.action.terminal.selectToNextCommand" ,
+    "workbench.action.terminal.selectToNextLine" ,
+    "workbench.action.terminal.selectToPreviousCommand" ,
+    "workbench.action.terminal.selectToPreviousLine" ,
+    "workbench.action.terminal.splitInActiveWorkspace" ,
+    "workbench.action.terminal.split" ,
+    "workbench.action.terminal.toggleTerminal" ,
+    "workbench.action.terminal.focusHover" ,
+    "editor.action.accessibilityHelp" ,
     'editor.action.toggleTabFocusMode',
     'notifications.hideList',
     'notifications.hideToasts',
@@ -272,12 +169,12 @@ const terminalContributionsDescriptor = {
         }
     },
     jsonSchema: {
-        description: ( localize(8966, 'Contributes terminal functionality.')),
+        description: ( localize(9027, 'Contributes terminal functionality.')),
         type: 'object',
         properties: {
             profiles: {
                 type: 'array',
-                description: ( localize(8967, "Defines additional terminal profiles that the user can create.")),
+                description: ( localize(9028, "Defines additional terminal profiles that the user can create.")),
                 items: {
                     type: 'object',
                     required: ['id', 'title'],
@@ -289,16 +186,16 @@ const terminalContributionsDescriptor = {
                         }],
                     properties: {
                         id: {
-                            description: ( localize(8968, "The ID of the terminal profile provider.")),
+                            description: ( localize(9029, "The ID of the terminal profile provider.")),
                             type: 'string',
                         },
                         title: {
-                            description: ( localize(8969, "Title for this terminal profile.")),
+                            description: ( localize(9030, "Title for this terminal profile.")),
                             type: 'string',
                         },
                         icon: {
                             description: ( localize(
-                                8970,
+                                9031,
                                 "A codicon, URI, or light and dark URIs to associate with this terminal type."
                             )),
                             anyOf: [{
@@ -308,11 +205,11 @@ const terminalContributionsDescriptor = {
                                     type: 'object',
                                     properties: {
                                         light: {
-                                            description: ( localize(8971, 'Icon path when a light theme is used')),
+                                            description: ( localize(9032, 'Icon path when a light theme is used')),
                                             type: 'string'
                                         },
                                         dark: {
-                                            description: ( localize(8972, 'Icon path when a dark theme is used')),
+                                            description: ( localize(9033, 'Icon path when a dark theme is used')),
                                             type: 'string'
                                         }
                                     }
@@ -324,4 +221,4 @@ const terminalContributionsDescriptor = {
         },
     },
 };
-export { DEFAULT_BOLD_FONT_WEIGHT, DEFAULT_COMMANDS_TO_SKIP_SHELL, DEFAULT_FONT_WEIGHT, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MINIMUM_LETTER_SPACING, ProcessState, SUGGESTIONS_FONT_WEIGHT, TERMINAL_CONFIG_SECTION, TERMINAL_CREATION_COMMANDS, TERMINAL_VIEW_ID, TerminalCommandId, isTerminalProcessManager, terminalContributionsDescriptor };
+export { DEFAULT_BOLD_FONT_WEIGHT, DEFAULT_COMMANDS_TO_SKIP_SHELL, DEFAULT_FONT_WEIGHT, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MINIMUM_LETTER_SPACING, SUGGESTIONS_FONT_WEIGHT, TERMINAL_CONFIG_SECTION, TERMINAL_CREATION_COMMANDS, TERMINAL_VIEW_ID, isTerminalProcessManager, terminalContributionsDescriptor };