@codingame/monaco-vscode-api 13.1.7 → 14.0.0

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

@@ -6,20 +6,24 @@ import { toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { isToolInvocationContext } from '../../contrib/chat/common/languageModelToolsService.js';
+import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
 import { LanguageModelToolResult, LanguageModelToolDescription, MarkdownString } from './extHostTypeConverters.js';
+import { EditToolData, EditToolInputProcessor } from '../../contrib/chat/common/tools/editFileTool.js';
 
 class ExtHostLanguageModelTools {
     constructor(mainContext) {
         this._registeredTools = ( new Map());
         this._tokenCountFuncs = ( new Map());
         this._allTools = ( new Map());
+        this._toolInputProcessors = ( new Map());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadLanguageModelTools));
         this._proxy.$getTools().then(tools => {
             for (const tool of tools) {
                 this._allTools.set(tool.id, revive(tool));
             }
         });
+        this._toolInputProcessors.set(EditToolData.id, ( new EditToolInputProcessor()));
     }
     async $countTokensForInvocation(callId, input, token) {
         const fn = this._tokenCountFuncs.get(callId);
@@ -28,21 +32,26 @@ class ExtHostLanguageModelTools {
         }
         return await fn(input, token);
     }
-    async invokeTool(toolId, options, token) {
+    async invokeTool(extension, toolId, options, token) {
         const callId = generateUuid();
         if (options.tokenizationOptions) {
             this._tokenCountFuncs.set(callId, options.tokenizationOptions.countTokens);
         }
-        if (options.toolInvocationToken && !isToolInvocationContext(options.toolInvocationToken)) {
-            throw ( new Error(`Invalid tool invocation token`));
-        }
         try {
+            if (options.toolInvocationToken && !isToolInvocationContext(options.toolInvocationToken)) {
+                throw ( new Error(`Invalid tool invocation token`));
+            }
+            if (toolId === 'vscode_editFile' && !isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
+                throw ( new Error(`Invalid tool: ${toolId}`));
+            }
+            const processedInput = this._toolInputProcessors.get(toolId)?.processInput(options.input) ?? options.input;
             const result = await this._proxy.$invokeTool({
                 toolId,
                 callId,
-                parameters: options.input,
+                parameters: processedInput,
                 tokenBudget: options.tokenizationOptions?.tokenBudget,
                 context: options.toolInvocationToken,
+                chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,
             }, token);
             return LanguageModelToolResult.to(result);
         }
@@ -56,16 +65,26 @@ class ExtHostLanguageModelTools {
             this._allTools.set(tool.id, tool);
         }
     }
-    get tools() {
+    getTools(extension) {
         return ( Array.from(( this._allTools.values()))
-            .map(tool => LanguageModelToolDescription.to(tool)));
+            .map(tool => LanguageModelToolDescription.to(tool)))
+            .filter(tool => {
+            if (tool.name === 'vscode_editFile') {
+                return isProposedApiEnabled(extension, 'chatParticipantPrivate');
+            }
+            return true;
+        });
     }
     async $invokeTool(dto, token) {
         const item = this._registeredTools.get(dto.toolId);
         if (!item) {
             throw ( new Error(`Unknown tool ${dto.toolId}`));
         }
-        const options = { input: dto.parameters, toolInvocationToken: dto.context };
+        const options = {
+            input: dto.parameters,
+            toolInvocationToken: dto.context,
+            chatRequestId: dto.chatRequestId,
+        };
         if (dto.tokenBudget !== undefined) {
             options.tokenizationOptions = {
                 tokenBudget: dto.tokenBudget,
@@ -91,16 +110,17 @@ class ExtHostLanguageModelTools {
         if (!result) {
             return undefined;
         }
+        if (result.pastTenseMessage || result.tooltip) {
+            checkProposedApiEnabled(item.extension, 'chatParticipantPrivate');
+        }
         return {
             confirmationMessages: result.confirmationMessages ? {
                 title: result.confirmationMessages.title,
                 message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : MarkdownString.from(result.confirmationMessages.message),
             } : undefined,
-            invocationMessage: typeof result.invocationMessage === 'string' ?
-                result.invocationMessage :
-                (result.invocationMessage ?
-                    MarkdownString.from(result.invocationMessage) :
-                    undefined),
+            invocationMessage: MarkdownString.fromStrict(result.invocationMessage),
+            pastTenseMessage: MarkdownString.fromStrict(result.pastTenseMessage),
+            tooltip: result.tooltip ? MarkdownString.fromStrict(result.tooltip) : undefined,
         };
     }
     registerTool(extension, id, tool) {

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

@@ -142,6 +142,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             targetExtensions: metadata.extensions,
             isDefault: metadata.isDefault,
             isUserSelectable: metadata.isUserSelectable,
+            capabilities: metadata.capabilities,
         });
         const responseReceivedListener = provider.onDidReceiveLanguageModelResponse2?.(({ extensionId, participant, tokenCount }) => {
             this._proxy.$whenLanguageModelChatRequestMade(identifier, ( new ExtensionIdentifier(extensionId)), participant, tokenCount);
@@ -324,7 +325,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         this._pendingRequest.delete(requestId);
         if (error) {
-            data.res.reject(transformErrorFromSerialization(error));
+            data.res.reject(LanguageModelError.tryDeserialize(error) ?? transformErrorFromSerialization(error));
         }
         else {
             data.res.resolve();
@@ -342,7 +343,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2439, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2480, "Justification: {1}", to.displayName, justification))
                 : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);

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

@@ -8,7 +8,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? 'remoteexthost' : isWorker ? 'workerexthost' : 'exthost';
-        const name = initData.remote.isRemote ? ( localize(2440, "Extension Host (Remote)")) : isWorker ? ( localize(2441, "Extension Host (Worker)")) : ( localize(2442, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2481, "Extension Host (Remote)")) : isWorker ? ( localize(2482, "Extension Host (Worker)")) : ( localize(2483, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };

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

@@ -48,7 +48,12 @@ class ExtensionMemento {
         return value;
     }
     update(key, value) {
-        this._value[key] = value;
+        if (value !== null && typeof value === 'object') {
+            this._value[key] = JSON.parse(JSON.stringify(value));
+        }
+        else {
+            this._value[key] = value;
+        }
         const record = this._deferredPromises.get(key);
         if (record !== undefined) {
             return record.p;

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

@@ -260,7 +260,7 @@ class ExtHostNotebookController {
             throw ( new Error('Document version mismatch'));
         }
         if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
-            throw new FileOperationError(( localize(2443, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
+            throw new FileOperationError(( localize(2484, "Unable to modify read-only file '{0}'", this._resourceForError(uri))), FileOperationResult.FILE_PERMISSION_DENIED);
         }
         const data = {
             metadata: filter(document.apiNotebook.metadata, key => !(serializer.options?.transientDocumentMetadata ?? {})[key]),
@@ -432,7 +432,7 @@ class ExtHostNotebookController {
         if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
             typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
             options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime , size: stat.size })) {
-            throw new FileOperationError(( localize(2444, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
+            throw new FileOperationError(( localize(2485, "File Modified Since")), FileOperationResult.FILE_MODIFIED_SINCE, options);
         }
         return;
     }

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

@@ -61,10 +61,11 @@ function getHistoryItemIconDto(icon) {
     }
 }
 function toSCMHistoryItemDto(historyItem) {
+    const authorIcon = getHistoryItemIconDto(historyItem.authorIcon);
     const references = historyItem.references?.map(r => ({
         ...r, icon: getHistoryItemIconDto(r.icon)
     }));
-    return { ...historyItem, references };
+    return { ...historyItem, authorIcon, references };
 }
 function toSCMHistoryItemRefDto(historyItemRef) {
     return historyItemRef ? { ...historyItemRef, icon: getHistoryItemIconDto(historyItemRef.icon) } : undefined;

package/vscode/src/vs/workbench/api/common/extHostStatusBar.d.ts

@@ -3,8 +3,10 @@ import type * as vscode from "vscode";
 import { MainThreadStatusBarShape, IMainContext, ExtHostStatusBarShape, StatusBarItemDto } from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+import * as htmlContent from "../../../base/common/htmlContent.js";
 export declare class ExtHostStatusBarEntry implements vscode.StatusBarItem {
     #private;
+    private _onDispose?;
     private static ID_GEN;
     private static ALLOWED_BACKGROUND_COLORS;
     private readonly _entryId;
@@ -16,6 +18,7 @@ export declare class ExtHostStatusBarEntry implements vscode.StatusBarItem {
     private _visible?;
     private _text;
     private _tooltip?;
+    private _tooltip2?;
     private _name?;
     private _color?;
     private _backgroundColor?;
@@ -24,15 +27,17 @@ export declare class ExtHostStatusBarEntry implements vscode.StatusBarItem {
     private _command?;
     private _timeoutHandle;
     private _accessibilityInformation?;
-    constructor(proxy: MainThreadStatusBarShape, commands: CommandsConverter, staticItems: ReadonlyMap<string, StatusBarItemDto>, extension: IExtensionDescription, id?: string, alignment?: ExtHostStatusBarAlignment, priority?: number);
-    constructor(proxy: MainThreadStatusBarShape, commands: CommandsConverter, staticItems: ReadonlyMap<string, StatusBarItemDto>, extension: IExtensionDescription | undefined, id: string, alignment?: ExtHostStatusBarAlignment, priority?: number);
+    constructor(proxy: MainThreadStatusBarShape, commands: CommandsConverter, staticItems: ReadonlyMap<string, StatusBarItemDto>, extension: IExtensionDescription, id?: string, alignment?: ExtHostStatusBarAlignment, priority?: number, _onDispose?: () => void);
+    constructor(proxy: MainThreadStatusBarShape, commands: CommandsConverter, staticItems: ReadonlyMap<string, StatusBarItemDto>, extension: IExtensionDescription | undefined, id: string, alignment?: ExtHostStatusBarAlignment, priority?: number, _onDispose?: () => void);
     private validatePriority;
     get id(): string;
+    get entryId(): string;
     get alignment(): vscode.StatusBarAlignment;
     get priority(): number | undefined;
     get text(): string;
     get name(): string | undefined;
     get tooltip(): vscode.MarkdownString | string | undefined;
+    get tooltip2(): vscode.MarkdownString | string | undefined | ((token: vscode.CancellationToken) => Promise<vscode.MarkdownString | string | undefined>);
     get color(): string | ThemeColor | undefined;
     get backgroundColor(): ThemeColor | undefined;
     get command(): string | vscode.Command | undefined;
@@ -40,6 +45,7 @@ export declare class ExtHostStatusBarEntry implements vscode.StatusBarItem {
     set text(text: string);
     set name(name: string | undefined);
     set tooltip(tooltip: vscode.MarkdownString | string | undefined);
+    set tooltip2(tooltip: vscode.MarkdownString | string | undefined | ((token: vscode.CancellationToken) => Promise<vscode.MarkdownString | string | undefined>));
     set color(color: string | ThemeColor | undefined);
     set backgroundColor(color: ThemeColor | undefined);
     set command(command: string | vscode.Command | undefined);
@@ -53,9 +59,11 @@ export declare class ExtHostStatusBar implements ExtHostStatusBarShape {
     private readonly _proxy;
     private readonly _commands;
     private readonly _statusMessage;
+    private readonly _entries;
     private readonly _existingItems;
     constructor(mainContext: IMainContext, commands: CommandsConverter);
     $acceptStaticEntries(added: StatusBarItemDto[]): void;
+    $provideTooltip(entryId: string, cancellation: vscode.CancellationToken): Promise<string | htmlContent.IMarkdownString | undefined>;
     createStatusBarEntry(extension: IExtensionDescription | undefined, id: string, alignment?: ExtHostStatusBarAlignment, priority?: number): vscode.StatusBarItem;
     createStatusBarEntry(extension: IExtensionDescription, id?: string, alignment?: ExtHostStatusBarAlignment, priority?: number): vscode.StatusBarItem;
     setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): Disposable;

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

@@ -5,6 +5,7 @@ import { localize } from '../../../nls.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { MarkdownString } from './extHostTypeConverters.js';
 import { isNumber } from '../../../base/common/types.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 class ExtHostStatusBarEntry {
     static { this.ID_GEN = 0; }
@@ -14,7 +15,8 @@ class ExtHostStatusBarEntry {
     ])); }
     #proxy;
     #commands;
-    constructor(proxy, commands, staticItems, extension, id, alignment = StatusBarAlignment.Left, priority) {
+    constructor(proxy, commands, staticItems, extension, id, alignment = StatusBarAlignment.Left, priority, _onDispose) {
+        this._onDispose = _onDispose;
         this._disposed = false;
         this._text = '';
         this._staleCommandRegistrations = ( new DisposableStore());
@@ -57,6 +59,9 @@ class ExtHostStatusBarEntry {
     get id() {
         return this._id ?? this._extension.identifier.value;
     }
+    get entryId() {
+        return this._entryId;
+    }
     get alignment() {
         return this._alignment;
     }
@@ -72,6 +77,12 @@ class ExtHostStatusBarEntry {
     get tooltip() {
         return this._tooltip;
     }
+    get tooltip2() {
+        if (this._extension) {
+            checkProposedApiEnabled(this._extension, 'statusBarItemTooltip');
+        }
+        return this._tooltip2;
+    }
     get color() {
         return this._color;
     }
@@ -96,6 +107,13 @@ class ExtHostStatusBarEntry {
         this._tooltip = tooltip;
         this.update();
     }
+    set tooltip2(tooltip) {
+        if (this._extension) {
+            checkProposedApiEnabled(this._extension, 'statusBarItemTooltip');
+        }
+        this._tooltip2 = tooltip;
+        this.update();
+    }
     set color(color) {
         this._color = color;
         this.update();
@@ -170,7 +188,7 @@ class ExtHostStatusBarEntry {
             }
             else {
                 name = ( localize(
-                    2445,
+                    2486,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -179,13 +197,23 @@ class ExtHostStatusBarEntry {
             if (this._backgroundColor) {
                 color = ExtHostStatusBarEntry.ALLOWED_BACKGROUND_COLORS.get(this._backgroundColor.id);
             }
-            const tooltip = MarkdownString.fromStrict(this._tooltip);
-            this.#proxy.$setEntry(this._entryId, id, this._extension?.identifier.value, name, this._text, tooltip, this._command?.internal, color, this._backgroundColor, this._alignment === StatusBarAlignment.Left, this._priority, this._accessibilityInformation);
+            let tooltip;
+            let hasTooltipProvider;
+            if (typeof this._tooltip2 === 'function') {
+                tooltip = MarkdownString.fromStrict(this._tooltip);
+                hasTooltipProvider = true;
+            }
+            else {
+                tooltip = MarkdownString.fromStrict(this._tooltip2 ?? this._tooltip);
+                hasTooltipProvider = false;
+            }
+            this.#proxy.$setEntry(this._entryId, id, this._extension?.identifier.value, name, this._text, tooltip, hasTooltipProvider, this._command?.internal, color, this._backgroundColor, this._alignment === StatusBarAlignment.Left, this._priority, this._accessibilityInformation);
             this._staleCommandRegistrations.clear();
         }, 0);
     }
     dispose() {
         this.hide();
+        this._onDispose?.();
         this._disposed = true;
     }
 }
@@ -193,7 +221,7 @@ class StatusBarMessage {
     constructor(statusBar) {
         this._messages = [];
         this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
-        this._item.name = ( localize(2446, "Extension Status"));
+        this._item.name = ( localize(2487, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;
@@ -223,6 +251,7 @@ class StatusBarMessage {
 }
 class ExtHostStatusBar {
     constructor(mainContext, commands) {
+        this._entries = ( new Map());
         this._existingItems = ( new Map());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadStatusBar));
         this._commands = commands;
@@ -233,16 +262,27 @@ class ExtHostStatusBar {
             this._existingItems.set(item.entryId, item);
         }
     }
+    async $provideTooltip(entryId, cancellation) {
+        const entry = this._entries.get(entryId);
+        if (!entry) {
+            return undefined;
+        }
+        const tooltip = typeof entry.tooltip2 === 'function' ? await entry.tooltip2(cancellation) : entry.tooltip2;
+        return !cancellation.isCancellationRequested ? MarkdownString.fromStrict(tooltip) : undefined;
+    }
     createStatusBarEntry(extension, id, alignment, priority) {
-        return ( new ExtHostStatusBarEntry(
+        const entry = ( new ExtHostStatusBarEntry(
             this._proxy,
             this._commands,
             this._existingItems,
             extension,
             id,
             alignment,
-            priority
+            priority,
+            () => this._entries.delete(entry.entryId)
         ));
+        this._entries.set(entry.entryId, entry);
+        return entry;
     }
     setStatusBarMessage(text, timeoutOrThenable) {
         const d = this._statusMessage.setMessage(text);

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

@@ -8,7 +8,7 @@ import { ILoggerService } from '../../../platform/log/common/log.service.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
 import { getRemoteName } from '../../../platform/remote/common/remoteHosts.js';
-import { extensionTelemetryLogChannelId, cleanRemoteAuthority, cleanData } from '../../../platform/telemetry/common/telemetryUtils.js';
+import { TelemetryLogGroup, extensionTelemetryLogChannelId, cleanRemoteAuthority, cleanData } from '../../../platform/telemetry/common/telemetryUtils.js';
 import { mixin } from '../../../base/common/objects.js';
 import { URI } from '../../../base/common/uri.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
@@ -30,19 +30,22 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         this._telemetryLoggers = ( new Map());
         this.extHostTelemetryLogFile = URI.revive(this.initData.environment.extensionTelemetryLogResource);
         this._inLoggingOnlyMode = this.initData.environment.isExtensionTelemetryLoggingOnly;
-        this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, { id: extensionTelemetryLogChannelId, name: ( localize(
-            2447,
-            "Extension Telemetry{0}",
-            this._inLoggingOnlyMode ? ' (Not Sent)' : ''
-        )), hidden: true });
+        this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, {
+            id: extensionTelemetryLogChannelId,
+            name: ( localize(
+                2488,
+                "Extension Telemetry{0}",
+                this._inLoggingOnlyMode ? ' (Not Sent)' : ''
+            )),
+            hidden: true,
+            group: TelemetryLogGroup,
+        });
         this._register(this._outputLogger);
         this._register(loggerService.onDidChangeLogLevel(arg => {
             if (isLogLevel(arg)) {
                 this.updateLoggerVisibility();
             }
         }));
-        this._outputLogger.info('Below are logs for extension telemetry events sent to the telemetry output channel API once the log level is set to trace.');
-        this._outputLogger.info('===========================================================');
     }
     updateLoggerVisibility() {
         this.loggerService.setVisibility(this.extHostTelemetryLogFile, this._telemetryIsSupported && this.loggerService.getLogLevel() === LogLevel.Trace);
@@ -84,6 +87,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         commonProperties['common.extversion'] = extension.version;
         commonProperties['common.vscodemachineid'] = this.initData.telemetryInfo.machineId;
         commonProperties['common.vscodesessionid'] = this.initData.telemetryInfo.sessionId;
+        commonProperties['common.vscodecommithash'] = this.initData.commit;
         commonProperties['common.sqmid'] = this.initData.telemetryInfo.sqmId;
         commonProperties['common.devDeviceId'] = this.initData.telemetryInfo.devDeviceId;
         commonProperties['common.vscodeversion'] = this.initData.version;

package/vscode/src/vs/workbench/api/common/extHostTerminalService.d.ts

@@ -7,7 +7,7 @@ import { IDisposable, Disposable } from "../../../base/common/lifecycle.js";
 import { TerminalExitReason, TerminalCompletionItem } from "./extHostTypes.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator, ISerializableEnvironmentVariableCollection } from "@codingame/monaco-vscode-terminal-service-override/vscode/vs/platform/terminal/common/environmentVariable";
-import { ICreateContributedTerminalProfileOptions, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation } from "../../../platform/terminal/common/terminal.js";
+import { ICreateContributedTerminalProfileOptions, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, TerminalShellType } from "../../../platform/terminal/common/terminal.js";
 import { ThemeColor } from "../../../base/common/themables.js";
 import { IExtHostCommands } from "./extHostCommands.js";
 export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, IDisposable {
@@ -81,6 +81,7 @@ export declare class ExtHostTerminal extends Disposable {
     setExitStatus(code: number | undefined, reason: TerminalExitReason): void;
     setDimensions(cols: number, rows: number): boolean;
     setInteractedWith(): boolean;
+    setShellType(shellType: TerminalShellType | undefined): boolean;
     setSelection(selection: string | undefined): void;
     _setProcessId(processId: number | undefined): void;
 }
@@ -162,6 +163,7 @@ export declare abstract class BaseExtHostTerminalService extends Disposable impl
     registerProfileProvider(extension: IExtensionDescription, id: string, provider: vscode.TerminalProfileProvider): vscode.Disposable;
     registerTerminalCompletionProvider(extension: IExtensionDescription, provider: vscode.TerminalCompletionProvider<TerminalCompletionItem>, ...triggerCharacters: string[]): vscode.Disposable;
     $provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto): Promise<vscode.TerminalCompletionItem[] | vscode.TerminalCompletionList | undefined>;
+    $acceptTerminalShellType(id: number, shellType: TerminalShellType | undefined): void;
     registerTerminalQuickFixProvider(id: string, extensionId: string, provider: vscode.TerminalQuickFixProvider): vscode.Disposable;
     $provideTerminalQuickFixes(id: string, matchResult: TerminalCommandMatchResultDto): Promise<(ITerminalQuickFixTerminalCommandDto | ITerminalQuickFixOpenerDto | ICommandDto)[] | ITerminalQuickFixTerminalCommandDto | ITerminalQuickFixOpenerDto | ICommandDto | undefined>;
     $createContributedProfileTerminal(id: string, options: ICreateContributedTerminalProfileOptions): Promise<void>;

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

@@ -6,13 +6,13 @@ import { createDecorator } from '../../../platform/instantiation/common/instanti
 import { URI } from '../../../base/common/uri.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
-import { Disposable as Disposable$1, EnvironmentVariableMutatorType } from './extHostTypes.js';
+import { TerminalShellType, Disposable as Disposable$1, EnvironmentVariableMutatorType } from './extHostTypes.js';
 import { localize } from '../../../nls.js';
 import { NotSupportedError } from '../../../base/common/errors.js';
 import { serializeEnvironmentVariableCollection, serializeEnvironmentDescriptionMap } from '../../../platform/terminal/common/environmentVariableShared.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { generateUuid } from '../../../base/common/uuid.js';
-import { ProcessPropertyType } from '../../../platform/terminal/common/terminal.js';
+import { GeneralShellType, WindowsShellType, PosixShellType, ProcessPropertyType } from '../../../platform/terminal/common/terminal.js';
 import { TerminalDataBufferer } from '../../../platform/terminal/common/terminalDataBuffering.js';
 import { ThemeColor } from '../../../base/common/themables.js';
 import { Promises } from '../../../base/common/async.js';
@@ -29,7 +29,7 @@ class ExtHostTerminal extends Disposable {
         this._creationOptions = _creationOptions;
         this._name = _name;
         this._disposed = false;
-        this._state = { isInteractedWith: false };
+        this._state = { isInteractedWith: false, shellType: undefined };
         this.isOpen = false;
         this._onWillDispose = this._register(( new Emitter()));
         this.onWillDispose = this._onWillDispose.event;
@@ -167,7 +167,62 @@ class ExtHostTerminal extends Disposable {
     }
     setInteractedWith() {
         if (!this._state.isInteractedWith) {
-            this._state = { isInteractedWith: true };
+            this._state = {
+                ...this._state,
+                isInteractedWith: true
+            };
+            return true;
+        }
+        return false;
+    }
+    setShellType(shellType) {
+        let extHostType;
+        switch (shellType) {
+            case PosixShellType.Sh:
+                extHostType = TerminalShellType.Sh;
+                break;
+            case PosixShellType.Bash:
+                extHostType = TerminalShellType.Bash;
+                break;
+            case PosixShellType.Fish:
+                extHostType = TerminalShellType.Fish;
+                break;
+            case PosixShellType.Csh:
+                extHostType = TerminalShellType.Csh;
+                break;
+            case PosixShellType.Ksh:
+                extHostType = TerminalShellType.Ksh;
+                break;
+            case PosixShellType.Zsh:
+                extHostType = TerminalShellType.Zsh;
+                break;
+            case WindowsShellType.CommandPrompt:
+                extHostType = TerminalShellType.CommandPrompt;
+                break;
+            case WindowsShellType.GitBash:
+                extHostType = TerminalShellType.GitBash;
+                break;
+            case GeneralShellType.PowerShell:
+                extHostType = TerminalShellType.PowerShell;
+                break;
+            case GeneralShellType.Python:
+                extHostType = TerminalShellType.Python;
+                break;
+            case GeneralShellType.Julia:
+                extHostType = TerminalShellType.Julia;
+                break;
+            case GeneralShellType.NuShell:
+                extHostType = TerminalShellType.NuShell;
+                break;
+            default:
+                extHostType = undefined;
+                break;
+        }
+        if (this._state.shellType !== shellType) {
+            this._state = {
+                ...this._state,
+                shellType: extHostType
+            };
             return true;
         }
         return false;
@@ -469,7 +524,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localize(2448, "Could not find the terminal with id {0} on the extension host", id)) };
+            return { message: ( localize(2489, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( new Promise(r => {
@@ -578,6 +633,12 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         }
         return completions;
     }
+    $acceptTerminalShellType(id, shellType) {
+        const terminal = this.getTerminalById(id);
+        if (terminal?.setShellType(shellType)) {
+            this._onDidChangeTerminalState.fire(terminal.value);
+        }
+    }
     registerTerminalQuickFixProvider(id, extensionId, provider) {
         if (( this._quickFixProviders.has(id))) {
             throw ( new Error(`Terminal quick fix provider "${id}" is already registered`));

package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.d.ts

@@ -29,6 +29,7 @@ export declare class ExtHostTerminalShellIntegration extends Disposable implemen
     $shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: UriComponents | undefined): void;
     $shellExecutionEnd(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, exitCode: number | undefined): void;
     $shellExecutionData(instanceId: number, data: string): void;
+    $shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[]): void;
     $cwdChange(instanceId: number, cwd: UriComponents | undefined): void;
     $closeTerminal(instanceId: number): void;
 }

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

@@ -73,6 +73,9 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
     $shellExecutionData(instanceId, data) {
         this._activeShellIntegrations.get(instanceId)?.emitData(data);
     }
+    $shellEnvChange(instanceId, shellEnvKeys, shellEnvValues) {
+        this._activeShellIntegrations.get(instanceId)?.setEnv(shellEnvKeys, shellEnvValues);
+    }
     $cwdChange(instanceId, cwd) {
         this._activeShellIntegrations.get(instanceId)?.setCwd(URI.revive(cwd));
     }
@@ -104,6 +107,9 @@ class InternalTerminalShellIntegration extends Disposable {
             get cwd() {
                 return that._cwd;
             },
+            get env() {
+                return that._env;
+            },
             executeCommand(commandLineOrExecutable, args) {
                 let commandLineValue = commandLineOrExecutable;
                 if (args) {
@@ -158,6 +164,14 @@ class InternalTerminalShellIntegration extends Disposable {
             this._currentExecution = undefined;
         }
     }
+    setEnv(keys, values) {
+        const env = {};
+        for (let i = 0; i < keys.length; i++) {
+            env[keys[i]] = values[i];
+        }
+        this._env = env;
+        this._fireChangeEvent();
+    }
     setCwd(cwd) {
         let wasChanged = false;
         if (URI.isUri(this._cwd)) {
@@ -168,9 +182,12 @@ class InternalTerminalShellIntegration extends Disposable {
         }
         if (wasChanged) {
             this._cwd = cwd;
-            this._onDidRequestChangeShellIntegration.fire({ terminal: this._terminal, shellIntegration: this.value });
+            this._fireChangeEvent();
         }
     }
+    _fireChangeEvent() {
+        this._onDidRequestChangeShellIntegration.fire({ terminal: this._terminal, shellIntegration: this.value });
+    }
 }
 class InternalTerminalShellExecution {
     constructor(_commandLine, cwd) {

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

@@ -5,9 +5,9 @@ import { MainContext } from './extHost.protocol.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { ThemeIcon, MarkdownString } from './extHostTypes.js';
 import { MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
-import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isString } from '../../../base/common/types.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 class ExtHostTimeline {
     constructor(mainContext, commands) {
@@ -17,7 +17,7 @@ class ExtHostTimeline {
         commands.registerArgumentProcessor({
             processArgument: (arg, extension) => {
                 if (arg && arg.$mid === MarshalledId.TimelineActionContext) {
-                    if (this._providers.get(arg.source) && ExtensionIdentifier.equals(extension, this._providers.get(arg.source)?.extension)) {
+                    if (this._providers.get(arg.source) && extension && isProposedApiEnabled(extension, 'timeline')) {
                         const uri = arg.uri === undefined ? undefined : URI.revive(arg.uri);
                         return this._itemsBySourceAndUriMap.get(arg.source)?.get(getUriKey(uri))?.get(arg.handle);
                     }