@codingame/monaco-vscode-api 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/api/common/extHostTerminalService.js

@@ -16,7 +16,8 @@ import { ThemeColor } from '../../../base/common/themables.js';
 import { Promises } from '../../../base/common/async.js';
 import { TerminalQuickFix, ViewColumn } from './extHostTypeConverters.js';
 import { IExtHostCommands } from './extHostCommands.js';
-const IExtHostTerminalService = ( createDecorator('IExtHostTerminalService'));
+const _moduleId = "vs/workbench/api/common/extHostTerminalService";
+const IExtHostTerminalService = ( (createDecorator('IExtHostTerminalService')));
 class ExtHostTerminal extends Disposable {
     constructor(_proxy, _id, _creationOptions, _name) {
         super();
@@ -27,10 +28,10 @@ class ExtHostTerminal extends Disposable {
         this._disposed = false;
         this._state = { isInteractedWith: false };
         this.isOpen = false;
-        this._onWillDispose = this._register(( new Emitter()));
+        this._onWillDispose = this._register(( (new Emitter())));
         this.onWillDispose = this._onWillDispose.event;
-        this._creationOptions = ( Object.freeze(this._creationOptions));
-        this._pidPromise = ( new Promise(c => this._pidPromiseComplete = c));
+        this._creationOptions = ( (Object.freeze(this._creationOptions)));
+        this._pidPromise = ( (new Promise(c => this._pidPromiseComplete = c)));
         const that = this;
         this.value = {
             get name() {
@@ -89,7 +90,7 @@ class ExtHostTerminal extends Disposable {
     }
     async create(options, internalOptions) {
         if (typeof this._id !== 'string') {
-            throw new Error('Terminal has already been created');
+            throw ( (new Error('Terminal has already been created')));
         }
         await this._proxy.$createTerminal(this._id, {
             name: options.name,
@@ -112,7 +113,7 @@ class ExtHostTerminal extends Disposable {
     }
     async createExtensionTerminal(location, internalOptions, parentTerminal, iconPath, color) {
         if (typeof this._id !== 'string') {
-            throw new Error('Terminal has already been created');
+            throw ( (new Error('Terminal has already been created')));
         }
         await this._proxy.$createTerminal(this._id, {
             name: this._name,
@@ -123,7 +124,7 @@ class ExtHostTerminal extends Disposable {
             isTransient: true
         });
         if (typeof this._id === 'string') {
-            throw new Error('Terminal creation failed');
+            throw ( (new Error('Terminal creation failed')));
         }
         return this._id;
     }
@@ -141,14 +142,14 @@ class ExtHostTerminal extends Disposable {
     }
     _checkDisposed() {
         if (this._disposed) {
-            throw new Error('Terminal has already been disposed');
+            throw ( (new Error('Terminal has already been disposed')));
         }
     }
     set name(name) {
         this._name = name;
     }
     setExitStatus(code, reason) {
-        this._exitStatus = ( Object.freeze({ code, reason }));
+        this._exitStatus = ( (Object.freeze({ code, reason })));
     }
     setDimensions(cols, rows) {
         if (cols === this._cols && rows === this._rows) {
@@ -191,19 +192,23 @@ class ExtHostPseudoterminal {
         this._pty = _pty;
         this.id = 0;
         this.shouldPersist = false;
-        this._onProcessData = ( new Emitter());
+        this._onProcessData = ( (new Emitter()));
         this.onProcessData = this._onProcessData.event;
-        this._onProcessReady = ( new Emitter());
-        this._onDidChangeProperty = ( new Emitter());
+        this._onProcessReady = ( (new Emitter()));
+        this._onDidChangeProperty = ( (new Emitter()));
         this.onDidChangeProperty = this._onDidChangeProperty.event;
-        this._onProcessExit = ( new Emitter());
+        this._onProcessExit = ( (new Emitter()));
         this.onProcessExit = this._onProcessExit.event;
     }
     refreshProperty(property) {
-        throw new Error(`refreshProperty is not suppported in extension owned terminals. property: ${property}`);
+        throw ( (new Error(
+            `refreshProperty is not suppported in extension owned terminals. property: ${property}`
+        )));
     }
     updateProperty(property, value) {
-        throw new Error(`updateProperty is not suppported in extension owned terminals. property: ${property}, value: ${value}`);
+        throw ( (new Error(
+            `updateProperty is not suppported in extension owned terminals. property: ${property}, value: ${value}`
+        )));
     }
     async start() {
         return undefined;
@@ -254,46 +259,48 @@ class ExtHostPseudoterminal {
 let nextLinkId = 1;
 let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Disposable {
     get activeTerminal() { return this._activeTerminal?.value; }
-    get terminals() { return ( this._terminals.map(term => term.value)); }
+    get terminals() { return (
+         (this._terminals.map(term => term.value))
+    ); }
     constructor(supportsProcesses, _extHostCommands, extHostRpc) {
         super();
         this._extHostCommands = _extHostCommands;
         this._terminals = [];
-        this._terminalProcesses = ( new Map());
+        this._terminalProcesses = ( (new Map()));
         this._terminalProcessDisposables = {};
         this._extensionTerminalAwaitingStart = {};
         this._getTerminalPromises = {};
-        this._environmentVariableCollections = ( new Map());
-        this._lastQuickFixCommands = this._register(( new MutableDisposable()));
-        this._linkProviders = ( new Set());
-        this._profileProviders = ( new Map());
-        this._quickFixProviders = ( new Map());
-        this._terminalLinkCache = ( new Map());
-        this._terminalLinkCancellationSource = ( new Map());
-        this._onDidCloseTerminal = ( new Emitter());
+        this._environmentVariableCollections = ( (new Map()));
+        this._lastQuickFixCommands = this._register(( (new MutableDisposable())));
+        this._linkProviders = ( (new Set()));
+        this._profileProviders = ( (new Map()));
+        this._quickFixProviders = ( (new Map()));
+        this._terminalLinkCache = ( (new Map()));
+        this._terminalLinkCancellationSource = ( (new Map()));
+        this._onDidCloseTerminal = ( (new Emitter()));
         this.onDidCloseTerminal = this._onDidCloseTerminal.event;
-        this._onDidOpenTerminal = ( new Emitter());
+        this._onDidOpenTerminal = ( (new Emitter()));
         this.onDidOpenTerminal = this._onDidOpenTerminal.event;
-        this._onDidChangeActiveTerminal = ( new Emitter());
+        this._onDidChangeActiveTerminal = ( (new Emitter()));
         this.onDidChangeActiveTerminal = this._onDidChangeActiveTerminal.event;
-        this._onDidChangeTerminalDimensions = ( new Emitter());
+        this._onDidChangeTerminalDimensions = ( (new Emitter()));
         this.onDidChangeTerminalDimensions = this._onDidChangeTerminalDimensions.event;
-        this._onDidChangeTerminalState = ( new Emitter());
+        this._onDidChangeTerminalState = ( (new Emitter()));
         this.onDidChangeTerminalState = this._onDidChangeTerminalState.event;
-        this._onDidChangeShell = ( new Emitter());
+        this._onDidChangeShell = ( (new Emitter()));
         this.onDidChangeShell = this._onDidChangeShell.event;
-        this._onDidWriteTerminalData = ( new Emitter({
+        this._onDidWriteTerminalData = ( (new Emitter({
             onWillAddFirstListener: () => this._proxy.$startSendingDataEvents(),
             onDidRemoveLastListener: () => this._proxy.$stopSendingDataEvents()
-        }));
+        })));
         this.onDidWriteTerminalData = this._onDidWriteTerminalData.event;
-        this._onDidExecuteCommand = ( new Emitter({
+        this._onDidExecuteCommand = ( (new Emitter({
             onWillAddFirstListener: () => this._proxy.$startSendingCommandEvents(),
             onDidRemoveLastListener: () => this._proxy.$stopSendingCommandEvents()
-        }));
+        })));
         this.onDidExecuteTerminalCommand = this._onDidExecuteCommand.event;
-        this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadTerminalService));
-        this._bufferer = ( new TerminalDataBufferer(this._proxy.$sendProcessData));
+        this._proxy = ( (extHostRpc.getProxy(MainContext.MainThreadTerminalService)));
+        this._bufferer = ( (new TerminalDataBufferer(this._proxy.$sendProcessData)));
         this._proxy.$registerProcessSupport(supportsProcesses);
         this._extHostCommands.registerArgumentProcessor({
             processArgument: arg => {
@@ -336,8 +343,8 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         return profile?.args || [];
     }
     createExtensionTerminal(options, internalOptions) {
-        const terminal = ( new ExtHostTerminal(this._proxy, generateUuid(), options, options.name));
-        const p = ( new ExtHostPseudoterminal(options.pty));
+        const terminal = ( (new ExtHostTerminal(this._proxy, generateUuid(), options, options.name)));
+        const p = ( (new ExtHostPseudoterminal(options.pty)));
         terminal.createExtensionTerminal(options.location, internalOptions, this._serializeParentTerminal(options, internalOptions).resolvedExtHostIdentifier, asTerminalIcon(options.iconPath), asTerminalColor(options.color)).then(id => {
             const disposable = this._setupExtHostProcessListeners(id, p);
             this._terminalProcessDisposables[id] = disposable;
@@ -367,9 +374,9 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     attachPtyToTerminal(id, pty) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            throw new Error(`Cannot resolve terminal with id ${id} for virtual process`);
+            throw ( (new Error(`Cannot resolve terminal with id ${id} for virtual process`)));
         }
-        const p = ( new ExtHostPseudoterminal(pty));
+        const p = ( (new ExtHostPseudoterminal(pty)));
         const disposable = this._setupExtHostProcessListeners(id, p);
         this._terminalProcessDisposables[id] = disposable;
     }
@@ -448,7 +455,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
             env: shellLaunchConfigDto.env,
             hideFromUser: shellLaunchConfigDto.hideFromUser
         };
-        const terminal = ( new ExtHostTerminal(this._proxy, id, creationOptions, name));
+        const terminal = ( (new ExtHostTerminal(this._proxy, id, creationOptions, name)));
         this._terminals.push(terminal);
         this._onDidOpenTerminal.fire(terminal.value);
         terminal.isOpen = true;
@@ -461,21 +468,21 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         const terminal = this.getTerminalById(id);
         if (!terminal) {
             return { message: ( localizeWithPath(
-                'vs/workbench/api/common/extHostTerminalService',
-                'launchFail.idMissingOnExtHost',
+                _moduleId,
+                0,
                 "Could not find the terminal with id {0} on the extension host",
                 id
             )) };
         }
         if (!terminal.isOpen) {
-            await ( new Promise(r => {
+            await ( (new Promise(r => {
                 const listener = this.onDidOpenTerminal(async (e) => {
                     if (e === terminal.value) {
                         listener.dispose();
                         r();
                     }
                 });
-            }));
+            })));
         }
         const terminalProcess = this._terminalProcesses.get(id);
         if (terminalProcess) {
@@ -487,7 +494,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         return undefined;
     }
     _setupExtHostProcessListeners(id, p) {
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         disposables.add(p.onProcessReady(e => this._proxy.$sendProcessReady(id, e.pid, e.cwd, e.windowsPty)));
         disposables.add(p.onDidChangeProperty(property => this._proxy.$sendProcessProperty(id, property)));
         this._bufferer.startBuffering(id, p.onProcessData);
@@ -542,37 +549,43 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         if (this._linkProviders.size === 1) {
             this._proxy.$startLinkProvider();
         }
-        return ( new Disposable$1(() => {
-            this._linkProviders.delete(provider);
-            if (this._linkProviders.size === 0) {
-                this._proxy.$stopLinkProvider();
-            }
-        }));
+        return (
+             (new Disposable$1(() => {
+                this._linkProviders.delete(provider);
+                if (this._linkProviders.size === 0) {
+                    this._proxy.$stopLinkProvider();
+                }
+            }))
+        );
     }
     registerProfileProvider(extension, id, provider) {
-        if (( this._profileProviders.has(id))) {
-            throw new Error(`Terminal profile provider "${id}" already registered`);
+        if (( (this._profileProviders.has(id)))) {
+            throw ( (new Error(`Terminal profile provider "${id}" already registered`)));
         }
         this._profileProviders.set(id, provider);
         this._proxy.$registerProfileProvider(id, extension.identifier.value);
-        return ( new Disposable$1(() => {
-            this._profileProviders.delete(id);
-            this._proxy.$unregisterProfileProvider(id);
-        }));
+        return (
+             (new Disposable$1(() => {
+                this._profileProviders.delete(id);
+                this._proxy.$unregisterProfileProvider(id);
+            }))
+        );
     }
     registerTerminalQuickFixProvider(id, extensionId, provider) {
-        if (( this._quickFixProviders.has(id))) {
-            throw new Error(`Terminal quick fix provider "${id}" is already registered`);
+        if (( (this._quickFixProviders.has(id)))) {
+            throw ( (new Error(`Terminal quick fix provider "${id}" is already registered`)));
         }
         this._quickFixProviders.set(id, provider);
         this._proxy.$registerQuickFixProvider(id, extensionId);
-        return ( new Disposable$1(() => {
-            this._quickFixProviders.delete(id);
-            this._proxy.$unregisterQuickFixProvider(id);
-        }));
+        return (
+             (new Disposable$1(() => {
+                this._quickFixProviders.delete(id);
+                this._proxy.$unregisterQuickFixProvider(id);
+            }))
+        );
     }
     async $provideTerminalQuickFixes(id, matchResult) {
-        const token = ( new CancellationTokenSource()).token;
+        const token = ( (new CancellationTokenSource())).token;
         if (token.isCancellationRequested) {
             return;
         }
@@ -584,7 +597,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         if (quickFixes === null || (Array.isArray(quickFixes) && quickFixes.length === 0)) {
             return undefined;
         }
-        const store = ( new DisposableStore());
+        const store = ( (new DisposableStore()));
         this._lastQuickFixCommands.value = store;
         if (!Array.isArray(quickFixes)) {
             return quickFixes ? TerminalQuickFix.from(quickFixes, this._extHostCommands.converter, store) : undefined;
@@ -599,7 +612,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         return result;
     }
     async $createContributedProfileTerminal(id, options) {
-        const token = ( new CancellationTokenSource()).token;
+        const token = ( (new CancellationTokenSource())).token;
         let profile = await this._profileProviders.get(id)?.provideTerminalProfile(token);
         if (token.isCancellationRequested) {
             return;
@@ -608,7 +621,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
             profile = { options: profile };
         }
         if (!profile || !('options' in profile)) {
-            throw new Error(`No terminal profile options provided for id "${id}"`);
+            throw ( (new Error(`No terminal profile options provided for id "${id}"`)));
         }
         if ('pty' in profile.options) {
             this.createExtensionTerminal(profile.options, options);
@@ -624,7 +637,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         this._terminalLinkCache.delete(terminalId);
         const oldToken = this._terminalLinkCancellationSource.get(terminalId);
         oldToken?.dispose(true);
-        const cancellationSource = ( new CancellationTokenSource());
+        const cancellationSource = ( (new CancellationTokenSource()));
         this._terminalLinkCancellationSource.set(terminalId, cancellationSource);
         const result = [];
         const context = { terminal: terminal.value, line };
@@ -642,10 +655,10 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         if (cancellationSource.token.isCancellationRequested) {
             return [];
         }
-        const cacheLinkMap = ( new Map());
+        const cacheLinkMap = ( (new Map()));
         for (const provideResult of provideResults) {
             if (provideResult && provideResult.links.length > 0) {
-                result.push(...( provideResult.links.map(providerLink => {
+                result.push(...( (provideResult.links.map(providerLink => {
                     const link = {
                         id: nextLinkId++,
                         startIndex: providerLink.startIndex,
@@ -657,7 +670,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
                         link: providerLink
                     });
                     return link;
-                })));
+                }))));
             }
         }
         this._terminalLinkCache.set(terminalId, cacheLinkMap);
@@ -703,7 +716,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     getEnvironmentVariableCollection(extension) {
         let collection = this._environmentVariableCollections.get(extension.identifier.value);
         if (!collection) {
-            collection = ( new UnifiedEnvironmentVariableCollection());
+            collection = ( (new UnifiedEnvironmentVariableCollection()));
             this._setEnvironmentVariableCollection(extension.identifier.value, collection);
         }
         return collection.getScopedEnvironmentVariableCollection(undefined);
@@ -716,7 +729,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     $initEnvironmentVariableCollections(collections) {
         collections.forEach(entry => {
             const extensionIdentifier = entry[0];
-            const collection = ( new UnifiedEnvironmentVariableCollection(entry[1]));
+            const collection = ( (new UnifiedEnvironmentVariableCollection(entry[1])));
             this._setEnvironmentVariableCollection(extensionIdentifier, collection);
         });
     }
@@ -735,10 +748,10 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         });
     }
 };
-BaseExtHostTerminalService = ( __decorate([
-    ( __param(1, IExtHostCommands)),
-    ( __param(2, IExtHostRpcService))
-], BaseExtHostTerminalService));
+BaseExtHostTerminalService = ( (__decorate([
+    ( (__param(1, IExtHostCommands))),
+    ( (__param(2, IExtHostRpcService)))
+], BaseExtHostTerminalService)));
 class UnifiedEnvironmentVariableCollection {
     get persistent() { return this._persistent; }
     set persistent(value) {
@@ -747,18 +760,18 @@ class UnifiedEnvironmentVariableCollection {
     }
     get onDidChangeCollection() { return this._onDidChangeCollection && this._onDidChangeCollection.event; }
     constructor(serialized) {
-        this.map = ( new Map());
-        this.scopedCollections = ( new Map());
-        this.descriptionMap = ( new Map());
+        this.map = ( (new Map()));
+        this.scopedCollections = ( (new Map()));
+        this.descriptionMap = ( (new Map()));
         this._persistent = true;
-        this._onDidChangeCollection = ( new Emitter());
-        this.map = ( new Map(serialized));
+        this._onDidChangeCollection = ( (new Emitter()));
+        this.map = ( (new Map(serialized)));
     }
     getScopedEnvironmentVariableCollection(scope) {
         const scopedCollectionKey = this.getScopeKey(scope);
         let scopedCollection = this.scopedCollections.get(scopedCollectionKey);
         if (!scopedCollection) {
-            scopedCollection = ( new ScopedEnvironmentVariableCollection(this, scope));
+            scopedCollection = ( (new ScopedEnvironmentVariableCollection(this, scope)));
             this.scopedCollections.set(scopedCollectionKey, scopedCollection);
             scopedCollection.onDidChangeCollection(() => this._onDidChangeCollection.fire());
         }
@@ -775,7 +788,9 @@ class UnifiedEnvironmentVariableCollection {
     }
     _setIfDiffers(variable, mutator) {
         if (mutator.options && mutator.options.applyAtProcessCreation === false && !mutator.options.applyAtShellIntegration) {
-            throw new Error('EnvironmentVariableMutatorOptions must apply at either process creation or shell integration');
+            throw ( (new Error(
+                'EnvironmentVariableMutatorOptions must apply at either process creation or shell integration'
+            )));
         }
         const key = this.getKey(variable, mutator.scope);
         const current = this.map.get(key);
@@ -814,10 +829,10 @@ class UnifiedEnvironmentVariableCollection {
         return this.getWorkspaceKey(scope?.workspaceFolder) ?? '';
     }
     getWorkspaceKey(workspaceFolder) {
-        return workspaceFolder ? ( workspaceFolder.uri.toString()) : undefined;
+        return workspaceFolder ? ( (workspaceFolder.uri.toString())) : undefined;
     }
     getVariableMap(scope) {
-        const map = ( new Map());
+        const map = ( (new Map()));
         for (const [_, value] of this.map) {
             if (this.getScopeKey(value.scope) === this.getScopeKey(scope)) {
                 map.set(value.variable, convertMutator(value));
@@ -879,7 +894,7 @@ class ScopedEnvironmentVariableCollection {
     constructor(collection, scope) {
         this.collection = collection;
         this.scope = scope;
-        this._onDidChangeCollection = ( new Emitter());
+        this._onDidChangeCollection = ( (new Emitter()));
     }
     getScoped(scope) {
         return this.collection.getScopedEnvironmentVariableCollection(scope);
@@ -921,16 +936,16 @@ let WorkerExtHostTerminalService = class WorkerExtHostTerminalService extends Ba
         super(false, extHostCommands, extHostRpc);
     }
     createTerminal(name, shellPath, shellArgs) {
-        throw new NotSupportedError();
+        throw ( (new NotSupportedError()));
     }
     createTerminalFromOptions(options, internalOptions) {
-        throw new NotSupportedError();
+        throw ( (new NotSupportedError()));
     }
 };
-WorkerExtHostTerminalService = ( __decorate([
-    ( __param(0, IExtHostCommands)),
-    ( __param(1, IExtHostRpcService))
-], WorkerExtHostTerminalService));
+WorkerExtHostTerminalService = ( (__decorate([
+    ( (__param(0, IExtHostCommands))),
+    ( (__param(1, IExtHostRpcService)))
+], WorkerExtHostTerminalService)));
 function asTerminalIcon(iconPath) {
     if (!iconPath || typeof iconPath === 'string') {
         return undefined;

package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.js

@@ -1,11 +1,12 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { IExtHostTerminalService } from './extHostTerminalService.js';
 import { Emitter } from '../../../base/common/event.js';
-import { URI } from '../../../base/common/uri.js';
+import { isUriComponents, URI } from '../../../base/common/uri.js';
 import { AsyncIterableObject, Barrier } from '../../../base/common/async.js';
 const IExtHostTerminalShellIntegration = ( createDecorator('IExtHostTerminalShellIntegration'));
 let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration extends Disposable {
@@ -39,7 +40,7 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
             this._activeShellIntegrations.set(instanceId, shellIntegration);
             shellIntegration.store.add(terminal.onWillDispose(() => this._activeShellIntegrations.get(instanceId)?.dispose()));
             shellIntegration.store.add(shellIntegration.onDidRequestShellExecution(commandLine => this._proxy.$executeCommand(instanceId, commandLine)));
-            shellIntegration.store.add(shellIntegration.onDidRequestEndExecution(e => this._onDidEndTerminalShellExecution.fire(e.value)));
+            shellIntegration.store.add(shellIntegration.onDidRequestEndExecution(e => this._onDidEndTerminalShellExecution.fire(e)));
             shellIntegration.store.add(shellIntegration.onDidRequestChangeShellIntegration(e => this._onDidChangeTerminalShellIntegration.fire(e)));
             terminal.shellIntegration = shellIntegration.value;
         }
@@ -48,20 +49,30 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
             shellIntegration: shellIntegration.value
         });
     }
-    $shellExecutionStart(instanceId, commandLine, cwd) {
+    $shellExecutionStart(instanceId, commandLineValue, commandLineConfidence, isTrusted, cwd) {
         if (!( this._activeShellIntegrations.has(instanceId))) {
             this.$shellIntegrationChange(instanceId);
         }
+        const commandLine = {
+            value: commandLineValue,
+            confidence: commandLineConfidence,
+            isTrusted
+        };
         this._activeShellIntegrations.get(instanceId)?.startShellExecution(commandLine, cwd);
     }
-    $shellExecutionEnd(instanceId, commandLine, exitCode) {
+    $shellExecutionEnd(instanceId, commandLineValue, commandLineConfidence, isTrusted, exitCode) {
+        const commandLine = {
+            value: commandLineValue,
+            confidence: commandLineConfidence,
+            isTrusted
+        };
         this._activeShellIntegrations.get(instanceId)?.endShellExecution(commandLine, exitCode);
     }
     $shellExecutionData(instanceId, data) {
         this._activeShellIntegrations.get(instanceId)?.emitData(data);
     }
     $cwdChange(instanceId, cwd) {
-        this._activeShellIntegrations.get(instanceId)?.setCwd(cwd);
+        this._activeShellIntegrations.get(instanceId)?.setCwd(isUriComponents(cwd) ? URI.revive(cwd) : cwd);
     }
     $closeTerminal(instanceId) {
         this._activeShellIntegrations.get(instanceId)?.dispose();
@@ -91,25 +102,39 @@ class InternalTerminalShellIntegration extends Disposable {
             get cwd() {
                 return that._cwd;
             },
-            executeCommand(commandLine) {
-                that._onDidRequestShellExecution.fire(commandLine);
-                const execution = that.startShellExecution(commandLine, that._cwd).value;
+            executeCommand(commandLineOrExecutable, args) {
+                let commandLineValue = commandLineOrExecutable;
+                if (args) {
+                    commandLineValue += ` "${( args.map(e => `${e.replaceAll('"', '\\"')}`)).join('" "')}"`;
+                }
+                that._onDidRequestShellExecution.fire(commandLineValue);
+                const commandLine = {
+                    value: commandLineValue,
+                    confidence: TerminalShellExecutionCommandLineConfidence.High,
+                    isTrusted: true
+                };
+                const execution = that.startShellExecution(commandLine, that._cwd, true).value;
                 that._ignoreNextExecution = true;
                 return execution;
             }
         };
     }
-    startShellExecution(commandLine, cwd) {
+    startShellExecution(commandLine, cwd, fireEventInMicrotask) {
         if (this._ignoreNextExecution && this._currentExecution) {
             this._ignoreNextExecution = false;
         }
         else {
             if (this._currentExecution) {
-                this._currentExecution.endExecution(undefined, undefined);
-                this._onDidRequestEndExecution.fire(this._currentExecution);
+                this._currentExecution.endExecution(undefined);
+                this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
+            }
+            const currentExecution = this._currentExecution = ( new InternalTerminalShellExecution(commandLine, cwd));
+            if (fireEventInMicrotask) {
+                queueMicrotask(() => this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value }));
+            }
+            else {
+                this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value });
             }
-            this._currentExecution = ( new InternalTerminalShellExecution(this._terminal, commandLine, cwd));
-            this._onDidStartTerminalShellExecution.fire(this._currentExecution.value);
         }
         return this._currentExecution;
     }
@@ -118,17 +143,15 @@ class InternalTerminalShellIntegration extends Disposable {
     }
     endShellExecution(commandLine, exitCode) {
         if (this._currentExecution) {
-            this._currentExecution.endExecution(commandLine, exitCode);
-            this._onDidRequestEndExecution.fire(this._currentExecution);
+            this._currentExecution.endExecution(commandLine);
+            this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode });
             this._currentExecution = undefined;
         }
     }
     setCwd(cwd) {
         let wasChanged = false;
         if (URI.isUri(this._cwd)) {
-            if (( this._cwd.toString()) !== ( cwd.toString())) {
-                wasChanged = true;
-            }
+            wasChanged = !URI.isUri(cwd) || ( this._cwd.toString()) !== ( cwd.toString());
         }
         else if (this._cwd !== cwd) {
             wasChanged = true;
@@ -140,35 +163,26 @@ class InternalTerminalShellIntegration extends Disposable {
     }
 }
 class InternalTerminalShellExecution {
-    constructor(terminal, _commandLine, cwd) {
-        this.terminal = terminal;
+    constructor(_commandLine, cwd) {
         this._commandLine = _commandLine;
         this.cwd = cwd;
-        this._exitCode = ( new Promise(resolve => {
-            this._exitCodeResolve = resolve;
-        }));
+        this._ended = false;
         const that = this;
         this.value = {
-            get terminal() {
-                return terminal;
-            },
             get commandLine() {
                 return that._commandLine;
             },
             get cwd() {
-                return cwd;
+                return that.cwd;
             },
-            get exitCode() {
-                return that._exitCode;
-            },
-            createDataStream() {
+            read() {
                 return that._createDataStream();
             }
         };
     }
     _createDataStream() {
         if (!this._dataStream) {
-            if (this._exitCodeResolve === undefined) {
+            if (this._ended) {
                 return AsyncIterableObject.EMPTY;
             }
             this._dataStream = ( new ShellExecutionDataStream());
@@ -178,14 +192,13 @@ class InternalTerminalShellExecution {
     emitData(data) {
         this._dataStream?.emitData(data);
     }
-    endExecution(commandLine, exitCode) {
+    endExecution(commandLine) {
         if (commandLine) {
             this._commandLine = commandLine;
         }
         this._dataStream?.endExecution();
         this._dataStream = undefined;
-        this._exitCodeResolve?.(exitCode);
-        this._exitCodeResolve = undefined;
+        this._ended = true;
     }
 }
 class ShellExecutionDataStream extends Disposable {
@@ -194,7 +207,10 @@ class ShellExecutionDataStream extends Disposable {
         this._emitters = [];
     }
     createIterable() {
-        const barrier = this._barrier = ( new Barrier());
+        if (!this._barrier) {
+            this._barrier = ( new Barrier());
+        }
+        const barrier = this._barrier;
         const iterable = ( new AsyncIterableObject(async (emitter) => {
             this._emitters.push(emitter);
             await barrier.wait();