@theia/plugin-ext 1.50.1 → 1.52.0

package/src/plugin/debug/debug-ext.ts

@@ -18,14 +18,14 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { Path } from '@theia/core/lib/common/path';
 import * as theia from '@theia/plugin';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { Breakpoint } from '../../common/plugin-api-rpc-model';
+import { Breakpoint, DebugStackFrameDTO, DebugThreadDTO } from '../../common/plugin-api-rpc-model';
 import { DebugConfigurationProviderTriggerKind, DebugExt, DebugMain, PLUGIN_RPC_CONTEXT as Ext, TerminalOptionsExt } from '../../common/plugin-api-rpc';
 import { PluginPackageDebuggersContribution } from '../../common/plugin-protocol';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { CommandRegistryImpl } from '../command-registry';
 import { ConnectionImpl } from '../../common/connection';
 import { DEBUG_SCHEME, SCHEME_PATTERN } from '@theia/debug/lib/common/debug-uri-utils';
-import { Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range, URI as URIImpl } from '../types-impl';
+import { Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range, URI as URIImpl, DebugStackFrame, DebugThread } from '../types-impl';
 import { PluginDebugAdapterSession } from './plugin-debug-adapter-session';
 import { PluginDebugAdapterTracker } from './plugin-debug-adapter-tracker';
 import { generateUuid } from '@theia/core/lib/common/uuid';
@@ -33,7 +33,8 @@ import { DebugAdapter } from '@theia/debug/lib/common/debug-model';
 import { PluginDebugAdapterCreator } from './plugin-debug-adapter-creator';
 import { NodeDebugAdapterCreator } from '../node/debug/plugin-node-debug-adapter-creator';
 import { DebugProtocol } from '@vscode/debugprotocol';
-import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';
+import { DebugConfiguration, DebugSessionOptions } from '@theia/debug/lib/common/debug-configuration';
+import { checkTestRunInstance } from '../tests';
 
 interface ConfigurationProviderRecord {
     handle: number;
@@ -79,6 +80,9 @@ export class DebugExtImpl implements DebugExt {
     activeDebugSession: theia.DebugSession | undefined;
     activeDebugConsole: theia.DebugConsole;
 
+    _activeStackItem: theia.DebugStackFrame | theia.DebugThread | undefined;
+    private readonly onDidChangeActiveStackItemEmitter = new Emitter<theia.DebugStackFrame | theia.DebugThread | undefined>();
+
     private readonly _breakpoints = new Map<string, theia.Breakpoint>();
 
     private frontendAdapterCreator = new PluginDebugAdapterCreator();
@@ -149,6 +153,10 @@ export class DebugExtImpl implements DebugExt {
         return this.onDidStartDebugSessionEmitter.event;
     }
 
+    get onDidChangeActiveStackItem(): theia.Event<theia.DebugStackFrame | theia.DebugThread | undefined> {
+        return this.onDidChangeActiveStackItemEmitter.event;
+    }
+
     get onDidChangeBreakpoints(): theia.Event<theia.BreakpointsChangeEvent> {
         return this.onDidChangeBreakpointsEmitter.event;
     }
@@ -186,7 +194,7 @@ export class DebugExtImpl implements DebugExt {
     }
 
     startDebugging(folder: theia.WorkspaceFolder | undefined, nameOrConfiguration: string | theia.DebugConfiguration, options: theia.DebugSessionOptions): PromiseLike<boolean> {
-        return this.proxy.$startDebugging(folder, nameOrConfiguration, {
+        const optionsDto: DebugSessionOptions = {
             parentSessionId: options.parentSession?.id,
             compact: options.compact,
             consoleMode: options.consoleMode,
@@ -194,8 +202,16 @@ export class DebugExtImpl implements DebugExt {
             suppressDebugStatusbar: options.suppressDebugStatusbar,
             suppressDebugView: options.suppressDebugView,
             lifecycleManagedByParent: options.lifecycleManagedByParent,
-            noDebug: options.noDebug
-        });
+            noDebug: options.noDebug,
+        };
+        if (options.testRun) {
+            const run = checkTestRunInstance(options.testRun);
+            optionsDto.testRun = {
+                controllerId: run.controller.id,
+                runId: run.id
+            };
+        }
+        return this.proxy.$startDebugging(folder, nameOrConfiguration, optionsDto);
     }
 
     stopDebugging(session?: theia.DebugSession): PromiseLike<void> {
@@ -262,6 +278,40 @@ export class DebugExtImpl implements DebugExt {
         });
     }
 
+    set activeStackItem(stackItem: theia.DebugStackFrame | theia.DebugThread | undefined) {
+        if (this._activeStackItem === stackItem) {
+            return;
+        }
+        this._activeStackItem = stackItem;
+        this.onDidChangeActiveStackItemEmitter.fire(this.activeStackItem);
+    }
+
+    get activeStackItem(): theia.DebugStackFrame | theia.DebugThread | undefined {
+        return this._activeStackItem;
+    }
+
+    async $onDidChangeActiveThread(debugThread: DebugThreadDTO | undefined): Promise<void> {
+        if (!debugThread) {
+            this.activeStackItem = undefined;
+            return;
+        }
+        const session = this.sessions.get(debugThread.sessionId);
+        if (session) {
+            this.activeStackItem = new DebugThread(session, debugThread.threadId);
+        }
+    }
+
+    async $onDidChangeActiveFrame(debugFrame: DebugStackFrameDTO | undefined): Promise<void> {
+        if (!debugFrame) {
+            this.activeStackItem = undefined;
+            return;
+        }
+        const session = this.sessions.get(debugFrame!.sessionId);
+        if (session) {
+            this.activeStackItem = new DebugStackFrame(session, debugFrame.threadId, debugFrame.frameId);
+        }
+    }
+
     async $onSessionCustomEvent(sessionId: string, event: string, body?: any): Promise<void> {
         const session = this.sessions.get(sessionId);
         if (session) {

package/src/plugin/plugin-context.ts

@@ -19,7 +19,7 @@
 
 import type * as theia from '@theia/plugin';
 import { CommandRegistryImpl } from './command-registry';
-import { Emitter } from '@theia/core/lib/common/event';
+import { Emitter, Event } from '@theia/core/lib/common/event';
 import { CancellationError, CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { QuickOpenExtImpl } from './quick-open';
 import {
@@ -124,6 +124,8 @@ import {
     Breakpoint,
     SourceBreakpoint,
     FunctionBreakpoint,
+    DebugStackFrame,
+    DebugThread,
     FoldingRange,
     FoldingRangeKind,
     SelectionRange,
@@ -211,7 +213,22 @@ import {
     DeclarationCoverage,
     FileCoverage,
     StatementCoverage,
-    TestCoverageCount
+    TestCoverageCount,
+    ChatRequestTurn,
+    ChatResponseTurn,
+    ChatResponseAnchorPart,
+    ChatResponseCommandButtonPart,
+    ChatResponseFileTreePart,
+    ChatResponseMarkdownPart,
+    ChatResponseProgressPart,
+    ChatResponseReferencePart,
+    ChatResultFeedbackKind,
+    LanguageModelChatMessage,
+    LanguageModelChatMessageRole,
+    LanguageModelError,
+    PortAutoForwardAction,
+    PortAttributes,
+    DebugVisualization
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -469,7 +486,7 @@ export function createAPIFactory(
             },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             showQuickPick(items: any, options?: theia.QuickPickOptions, token?: theia.CancellationToken): any {
-                return quickOpenExt.showQuickPick(items, options, token);
+                return quickOpenExt.showQuickPick(plugin, items, options, token);
             },
             createQuickPick<T extends theia.QuickPickItem>(): theia.QuickPick<T> {
                 return quickOpenExt.createQuickPick(plugin);
@@ -550,7 +567,7 @@ export function createAPIFactory(
             createTerminal(nameOrOptions: theia.TerminalOptions | theia.ExtensionTerminalOptions | theia.ExtensionTerminalOptions | (string | undefined),
                 shellPath?: string,
                 shellArgs?: string[] | string): theia.Terminal {
-                return terminalExt.createTerminal(nameOrOptions, shellPath, shellArgs);
+                return terminalExt.createTerminal(plugin, nameOrOptions, shellPath, shellArgs);
             },
             onDidChangeTerminalState,
             onDidCloseTerminal,
@@ -800,7 +817,13 @@ export function createAPIFactory(
             },
             getCanonicalUri(uri: theia.Uri, options: theia.CanonicalUriRequestOptions, token: CancellationToken): theia.ProviderResult<theia.Uri> {
                 return workspaceExt.getCanonicalUri(uri, options, token);
-            }
+            },
+            /**
+             * @stubbed
+             * This is a stub implementation, that should minimally satisfy vscode extensions
+             * that currently use this proposed API.
+             */
+            registerPortAttributesProvider: () => Disposable.NULL
         };
 
         const onDidChangeLogLevel = new Emitter<theia.LogLevel>();
@@ -1078,6 +1101,12 @@ export function createAPIFactory(
             get onDidChangeBreakpoints(): theia.Event<theia.BreakpointsChangeEvent> {
                 return debugExt.onDidChangeBreakpoints;
             },
+            get activeStackItem(): DebugThread | DebugStackFrame | undefined {
+                return debugExt.activeStackItem;
+            },
+            get onDidChangeActiveStackItem(): theia.Event<DebugThread | DebugStackFrame | undefined> {
+                return debugExt.onDidChangeActiveStackItem;
+            },
             registerDebugAdapterDescriptorFactory(debugType: string, factory: theia.DebugAdapterDescriptorFactory): Disposable {
                 return debugExt.registerDebugAdapterDescriptorFactory(debugType, factory);
             },
@@ -1112,7 +1141,11 @@ export function createAPIFactory(
             },
             asDebugSourceUri(source: theia.DebugProtocolSource, session?: theia.DebugSession): theia.Uri {
                 return debugExt.asDebugSourceUri(source, session);
-            }
+            },
+            /** @stubbed Due to proposed API */
+            registerDebugVisualizationProvider: () => Disposable.NULL,
+            /** @stubbed Due to proposed API */
+            registerDebugVisualizationTreeProvider: () => Disposable.NULL
         };
 
         const tasks: typeof theia.tasks = {
@@ -1219,13 +1252,31 @@ export function createAPIFactory(
             }
         };
 
-        const chat: typeof theia.chat    = {
+        const chat: typeof theia.chat = {
             /** @stubbed MappedEditsProvider */
             registerMappedEditsProvider(documentSelector: theia.DocumentSelector, provider: theia.MappedEditsProvider): Disposable {
                 return Disposable.NULL;
+            },
+            /** @stubbed ChatRequestHandler */
+            createChatParticipant(id: string, handler: theia.ChatRequestHandler): theia.ChatParticipant {
+                return {
+                    id,
+                    requestHandler: handler,
+                    dispose() { },
+                    onDidReceiveFeedback: (listener, thisArgs?, disposables?) => Event.None(listener, thisArgs, disposables)
+                };
             }
         };
 
+        const lm: typeof theia.lm = {
+            /** @stubbed LanguageModelChat */
+            selectChatModels(selector?: theia.LanguageModelChatSelector): Thenable<theia.LanguageModelChat[]> {
+                return Promise.resolve([]);
+            },
+            /** @stubbed LanguageModelChat */
+            onDidChangeChatModels: (listener, thisArgs?, disposables?) => Event.None(listener, thisArgs, disposables)
+        };
+
         return <typeof theia>{
             version: require('../../package.json').version,
             authentication,
@@ -1244,6 +1295,7 @@ export function createAPIFactory(
             notebooks,
             l10n,
             tests,
+            lm,
             // Types
             StatusBarAlignment: StatusBarAlignment,
             Disposable: Disposable,
@@ -1341,6 +1393,8 @@ export function createAPIFactory(
             Breakpoint,
             SourceBreakpoint,
             FunctionBreakpoint,
+            DebugStackFrame,
+            DebugThread,
             Color,
             ColorInformation,
             ColorPresentation,
@@ -1426,7 +1480,22 @@ export function createAPIFactory(
             DeclarationCoverage,
             FileCoverage,
             StatementCoverage,
-            TestCoverageCount
+            TestCoverageCount,
+            ChatRequestTurn,
+            ChatResponseTurn,
+            ChatResponseAnchorPart,
+            ChatResponseCommandButtonPart,
+            ChatResponseFileTreePart,
+            ChatResponseMarkdownPart,
+            ChatResponseProgressPart,
+            ChatResponseReferencePart,
+            ChatResultFeedbackKind,
+            LanguageModelChatMessage,
+            LanguageModelChatMessageRole,
+            LanguageModelError,
+            PortAutoForwardAction,
+            PortAttributes,
+            DebugVisualization
         };
     };
 }
@@ -1508,7 +1577,7 @@ export class PluginExt<T> extends Plugin<T> implements ExtensionPlugin<T> {
 
         this.extensionPath = this.pluginPath;
         this.extensionUri = this.pluginUri;
-        this.extensionKind = ExtensionKind.UI; // stub as a local extension (not running on a remote workspace)
+        this.extensionKind = pluginManager.getPluginKind();
         this.isFromDifferentExtensionHost = isFromDifferentExtensionHost;
     }
 

package/src/plugin/plugin-icon-path.ts

@@ -24,8 +24,8 @@ export type PluginIconPath = string | URI | {
     dark: string | URI
 };
 export namespace PluginIconPath {
-    export function toUrl(iconPath: PluginIconPath | undefined, plugin: Plugin): IconUrl | undefined {
-        if (!iconPath) {
+    export function toUrl(iconPath: unknown, plugin: Plugin): IconUrl | undefined {
+        if (!is(iconPath)) {
             return undefined;
         }
         if (typeof iconPath === 'object' && 'light' in iconPath) {
@@ -36,6 +36,9 @@ export namespace PluginIconPath {
         }
         return asString(iconPath, plugin);
     }
+    export function is(item: unknown): item is PluginIconPath {
+        return typeof item === 'string' || item instanceof URI || typeof item === 'object' && !!item && 'light' in item && 'dark' in item;
+    }
     export function asString(arg: string | URI, plugin: Plugin): string {
         arg = arg instanceof URI && arg.scheme === 'file' ? arg.fsPath : arg;
         if (typeof arg !== 'string') {

package/src/plugin/plugin-manager.ts

@@ -29,7 +29,8 @@ import {
     PluginManagerInitializeParams,
     PluginManagerStartParams,
     TerminalServiceExt,
-    LocalizationExt
+    LocalizationExt,
+    ExtensionKind
 } from '../common/plugin-api-rpc';
 import { PluginMetadata, PluginJsonValidationContribution } from '../common/plugin-protocol';
 import * as theia from '@theia/plugin';
@@ -40,7 +41,7 @@ import { PreferenceRegistryExtImpl } from './preference-registry';
 import { InternalStorageExt, Memento, GlobalState } from './plugin-storage';
 import { ExtPluginApi } from '../common/plugin-ext-api-contribution';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Emitter } from '@theia/core/lib/common/event';
+import { Emitter, Event } from '@theia/core/lib/common/event';
 import { WebviewsExtImpl } from './webviews';
 import { URI as Uri } from './types-impl';
 import { InternalSecretsExt, SecretStorageExt } from '../plugin/secrets-ext';
@@ -121,6 +122,7 @@ export abstract class AbstractPluginManagerExtImpl<P extends Record<string, any>
     private notificationMain: NotificationMain;
 
     protected jsonValidation: PluginJsonValidationContribution[] = [];
+    protected pluginKind = ExtensionKind.UI;
     protected ready = new Deferred();
 
     @postConstruct()
@@ -389,7 +391,14 @@ export abstract class AbstractPluginManagerExtImpl<P extends Record<string, any>
             environmentVariableCollection: this.terminalService.getEnvironmentVariableCollection(plugin.model.id),
             extensionMode: extensionModeValue,
             extension,
-            logUri: Uri.file(logPath)
+            logUri: Uri.file(logPath),
+            languageModelAccessInformation: {
+                /** @stubbed LanguageModelChat */
+                onDidChange: (listener, thisArgs?, disposables?) => Event.None(listener, thisArgs, disposables),
+                canSendRequest(chat: theia.LanguageModelChat): boolean | undefined {
+                    return undefined;
+                }
+            }
         };
         this.pluginContextsMap.set(plugin.model.id, pluginContext);
 
@@ -410,6 +419,10 @@ export abstract class AbstractPluginManagerExtImpl<P extends Record<string, any>
         }
     }
 
+    getPluginKind(): theia.ExtensionKind {
+        return this.pluginKind;
+    }
+
     getAllPlugins(): Plugin[] {
         return Array.from(this.registry.values());
     }
@@ -477,6 +490,7 @@ export class PluginManagerExtImpl extends AbstractPluginManagerExtImpl<PluginMan
 
         this.webview.init(params.webview);
         this.jsonValidation = params.jsonValidation;
+        this.pluginKind = params.pluginKind;
 
         this.supportedActivationEvents = new Set(params.supportedActivationEvents ?? []);
     }

package/src/plugin/quick-open.ts

@@ -30,8 +30,8 @@ import { convertToTransferQuickPickItems } from './type-converters';
 import { PluginPackage } from '../common/plugin-protocol';
 import { QuickInputButtonHandle } from '@theia/core/lib/browser';
 import { MaybePromise } from '@theia/core/lib/common/types';
-import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 import { Severity } from '@theia/core/lib/common/severity';
+import { PluginIconPath } from './plugin-icon-path';
 
 const canceledName = 'Canceled';
 /**
@@ -42,27 +42,6 @@ export function isPromiseCanceledError(error: any): boolean {
     return error instanceof Error && error.name === canceledName && error.message === canceledName;
 }
 
-export function getIconUris(iconPath: theia.QuickInputButton['iconPath']): { dark: URI, light: URI } | { id: string } {
-    if (ThemeIcon.is(iconPath)) {
-        return { id: iconPath.id };
-    }
-    const dark = getDarkIconUri(iconPath as URI | { light: URI; dark: URI; });
-    const light = getLightIconUri(iconPath as URI | { light: URI; dark: URI; });
-    // Tolerate strings: https://github.com/microsoft/vscode/issues/110432#issuecomment-726144556
-    return {
-        dark: typeof dark === 'string' ? URI.file(dark) : dark,
-        light: typeof light === 'string' ? URI.file(light) : light
-    };
-}
-
-export function getLightIconUri(iconPath: URI | { light: URI; dark: URI; }): URI {
-    return typeof iconPath === 'object' && 'light' in iconPath ? iconPath.light : iconPath;
-}
-
-export function getDarkIconUri(iconPath: URI | { light: URI; dark: URI; }): URI {
-    return typeof iconPath === 'object' && 'dark' in iconPath ? iconPath.dark : iconPath;
-}
-
 type Item = theia.QuickPickItem | string;
 
 export class QuickOpenExtImpl implements QuickOpenExt {
@@ -77,10 +56,10 @@ export class QuickOpenExtImpl implements QuickOpenExt {
     }
 
     /* eslint-disable max-len */
-    showQuickPick(itemsOrItemsPromise: theia.QuickPickItem[] | Promise<theia.QuickPickItem[]>, options: theia.QuickPickOptions & { canPickMany: true; }, token?: theia.CancellationToken): Promise<Array<theia.QuickPickItem> | undefined>;
-    showQuickPick(itemsOrItemsPromise: string[] | Promise<string[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<string | undefined>;
-    showQuickPick(itemsOrItemsPromise: theia.QuickPickItem[] | Promise<theia.QuickPickItem[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<theia.QuickPickItem | undefined>;
-    showQuickPick(itemsOrItemsPromise: Item[] | Promise<Item[]>, options?: theia.QuickPickOptions, token: theia.CancellationToken = CancellationToken.None): Promise<Item | Item[] | undefined> {
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: theia.QuickPickItem[] | Promise<theia.QuickPickItem[]>, options: theia.QuickPickOptions & { canPickMany: true; }, token?: theia.CancellationToken): Promise<Array<theia.QuickPickItem> | undefined>;
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: string[] | Promise<string[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<string | undefined>;
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: theia.QuickPickItem[] | Promise<theia.QuickPickItem[]>, options?: theia.QuickPickOptions, token?: theia.CancellationToken): Promise<theia.QuickPickItem | undefined>;
+    showQuickPick(plugin: Plugin, itemsOrItemsPromise: Item[] | Promise<Item[]>, options?: theia.QuickPickOptions, token: theia.CancellationToken = CancellationToken.None): Promise<Item | Item[] | undefined> {
         this.onDidSelectItem = undefined;
 
         const itemsPromise = Promise.resolve(itemsOrItemsPromise);
@@ -104,7 +83,7 @@ export class QuickOpenExtImpl implements QuickOpenExt {
                 return undefined;
             }
             return itemsPromise.then(async items => {
-                const pickItems = convertToTransferQuickPickItems(items);
+                const pickItems = convertToTransferQuickPickItems(plugin, items);
 
                 if (options && typeof options.onDidSelectItem === 'function') {
                     this.onDidSelectItem = handle => {
@@ -398,8 +377,7 @@ export class QuickInputExt implements theia.QuickInput {
         });
         this.update({
             buttons: buttons.map<TransferQuickInputButton>((button, i) => ({
-                iconPath: getIconUris(button.iconPath),
-                iconClass: ThemeIcon.is(button.iconPath) ? MonacoThemeIcon.asClassName(button.iconPath) : undefined,
+                iconUrl: PluginIconPath.toUrl(button.iconPath, this.plugin) ?? ThemeIcon.get(button.iconPath),
                 tooltip: button.tooltip,
                 handle: button === QuickInputButtons.Back ? -1 : i,
             }))
@@ -640,15 +618,14 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
                 pickItems.push({
                     kind: 'item',
                     label: item.label,
-                    iconPath: item.iconPath ? getIconUris(item.iconPath) : undefined,
+                    iconUrl: PluginIconPath.toUrl(item.iconPath, this.plugin) ?? ThemeIcon.get(item.iconPath),
                     description: item.description,
                     handle,
                     detail: item.detail,
                     picked: item.picked,
                     alwaysShow: item.alwaysShow,
                     buttons: item.buttons?.map<TransferQuickInputButton>((button, index) => ({
-                        iconPath: getIconUris(button.iconPath),
-                        iconClass: ThemeIcon.is(button.iconPath) ? MonacoThemeIcon.asClassName(button.iconPath) : undefined,
+                        iconUrl: PluginIconPath.toUrl(button.iconPath, this.plugin) ?? ThemeIcon.get(button.iconPath),
                         tooltip: button.tooltip,
                         handle: button === QuickInputButtons.Back ? -1 : index,
                     }))

package/src/plugin/terminal-ext.ts

@@ -13,10 +13,10 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
+
 import { UUID } from '@theia/core/shared/@phosphor/coreutils';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { Terminal, TerminalOptions, PseudoTerminalOptions, ExtensionTerminalOptions, TerminalState } from '@theia/plugin';
-import { TerminalServiceExt, TerminalServiceMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
+import { TerminalServiceExt, TerminalServiceMain, PLUGIN_RPC_CONTEXT, Plugin, TerminalOptions } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { MultiKeyMap } from '@theia/core/lib/common/collections';
@@ -26,28 +26,13 @@ import * as Converter from './type-converters';
 import { Disposable, EnvironmentVariableMutatorType, TerminalExitReason, ThemeIcon } from './types-impl';
 import { NO_ROOT_URI, SerializableEnvironmentVariableCollection } from '@theia/terminal/lib/common/shell-terminal-protocol';
 import { ProvidedTerminalLink } from '../common/plugin-api-rpc-model';
-import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
-
-export function getIconUris(iconPath: theia.TerminalOptions['iconPath']): { id: string } | undefined {
-    if (ThemeIcon.is(iconPath)) {
-        return { id: iconPath.id };
-    }
-    return undefined;
-}
-
-export function getIconClass(options: theia.TerminalOptions | theia.ExtensionTerminalOptions): string | undefined {
-    const iconClass = getIconUris(options.iconPath);
-    if (iconClass) {
-        return MonacoThemeIcon.asClassName(iconClass);
-    }
-    return undefined;
-}
+import { PluginIconPath } from './plugin-icon-path';
 
 /**
  * Provides high level terminal plugin api to use in the Theia plugins.
  * This service allow(with help proxy) create and use terminal emulator.
  */
- @injectable()
+@injectable()
 export class TerminalServiceExtImpl implements TerminalServiceExt {
     private readonly proxy: TerminalServiceMain;
 
@@ -59,17 +44,17 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
     private readonly terminalLinkProviders = new Map<string, theia.TerminalLinkProvider>();
     private readonly terminalObservers = new Map<string, theia.TerminalObserver>();
     private readonly terminalProfileProviders = new Map<string, theia.TerminalProfileProvider>();
-    private readonly onDidCloseTerminalEmitter = new Emitter<Terminal>();
-    readonly onDidCloseTerminal: theia.Event<Terminal> = this.onDidCloseTerminalEmitter.event;
+    private readonly onDidCloseTerminalEmitter = new Emitter<theia.Terminal>();
+    readonly onDidCloseTerminal: theia.Event<theia.Terminal> = this.onDidCloseTerminalEmitter.event;
 
-    private readonly onDidOpenTerminalEmitter = new Emitter<Terminal>();
-    readonly onDidOpenTerminal: theia.Event<Terminal> = this.onDidOpenTerminalEmitter.event;
+    private readonly onDidOpenTerminalEmitter = new Emitter<theia.Terminal>();
+    readonly onDidOpenTerminal: theia.Event<theia.Terminal> = this.onDidOpenTerminalEmitter.event;
 
-    private readonly onDidChangeActiveTerminalEmitter = new Emitter<Terminal | undefined>();
-    readonly onDidChangeActiveTerminal: theia.Event<Terminal | undefined> = this.onDidChangeActiveTerminalEmitter.event;
+    private readonly onDidChangeActiveTerminalEmitter = new Emitter<theia.Terminal | undefined>();
+    readonly onDidChangeActiveTerminal: theia.Event<theia.Terminal | undefined> = this.onDidChangeActiveTerminalEmitter.event;
 
-    private readonly onDidChangeTerminalStateEmitter = new Emitter<Terminal>();
-    readonly onDidChangeTerminalState: theia.Event<Terminal> = this.onDidChangeTerminalStateEmitter.event;
+    private readonly onDidChangeTerminalStateEmitter = new Emitter<theia.Terminal>();
+    readonly onDidChangeTerminalState: theia.Event<theia.Terminal> = this.onDidChangeTerminalStateEmitter.event;
 
     protected environmentVariableCollections: MultiKeyMap<string, EnvironmentVariableCollectionImpl> = new MultiKeyMap(2);
 
@@ -97,9 +82,10 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
     }
 
     createTerminal(
-        nameOrOptions: TerminalOptions | PseudoTerminalOptions | ExtensionTerminalOptions | (string | undefined),
+        plugin: Plugin,
+        nameOrOptions: theia.TerminalOptions | theia.PseudoTerminalOptions | theia.ExtensionTerminalOptions | string | undefined,
         shellPath?: string, shellArgs?: string[] | string
-    ): Terminal {
+    ): theia.Terminal {
         const id = `plugin-terminal-${UUID.uuid4()}`;
         let options: TerminalOptions;
         let pseudoTerminal: theia.Pseudoterminal | undefined = undefined;
@@ -122,7 +108,6 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         }
 
         let parentId;
-
         if (options.location && typeof options.location === 'object' && 'parentTerminal' in options.location) {
             const parentTerminal = options.location.parentTerminal;
             if (parentTerminal instanceof TerminalExtImpl) {
@@ -135,6 +120,15 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
             }
         }
 
+        if (typeof nameOrOptions === 'object' && 'iconPath' in nameOrOptions) {
+            const iconPath = nameOrOptions.iconPath;
+            options.iconUrl = PluginIconPath.toUrl(iconPath, plugin) ?? ThemeIcon.get(iconPath);
+        }
+
+        if (typeof nameOrOptions === 'object' && 'color' in nameOrOptions) {
+            options.color = nameOrOptions.color;
+        }
+
         this.proxy.$createTerminal(id, options, parentId, !!pseudoTerminal);
 
         let creationOptions: theia.TerminalOptions | theia.ExtensionTerminalOptions = options;
@@ -462,7 +456,7 @@ export class EnvironmentVariableCollectionImpl implements theia.GlobalEnvironmen
     }
 }
 
-export class TerminalExtImpl implements Terminal {
+export class TerminalExtImpl implements theia.Terminal {
 
     name: string;
 
@@ -476,9 +470,9 @@ export class TerminalExtImpl implements Terminal {
         return this.deferredProcessId.promise;
     }
 
-    readonly creationOptions: Readonly<TerminalOptions | ExtensionTerminalOptions>;
+    readonly creationOptions: Readonly<theia.TerminalOptions | theia.ExtensionTerminalOptions>;
 
-    state: TerminalState = { isInteractedWith: false };
+    state: theia.TerminalState = { isInteractedWith: false };
 
     constructor(private readonly proxy: TerminalServiceMain, private readonly options: theia.TerminalOptions | theia.ExtensionTerminalOptions) {
         this.creationOptions = this.options;