@theia/plugin-ext 1.73.0-next.3 → 1.73.0-next.31

package/src/main/browser/debug/plugin-debug-session-factory.ts

@@ -14,53 +14,32 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import { injectable, inject, interfaces } from '@theia/core/shared/inversify';
 import { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
-import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
-import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
-import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
-import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { MessageClient } from '@theia/core/lib/common/message-service-protocol';
-import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
-import { DebugPreferences } from '@theia/debug/lib/common/debug-preferences';
-import { DebugConfigurationSessionOptions, TestRunReference } from '@theia/debug/lib/browser/debug-session-options';
-import { DebugSession } from '@theia/debug/lib/browser/debug-session';
+import { DebugConfigurationSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugSession, DebugSessionData } from '@theia/debug/lib/browser/debug-session';
 import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
 import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
-import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { PluginChannel } from '../../../common/connection';
-import { TestService } from '@theia/test/lib/browser/test-service';
-import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-import { CommandService } from '@theia/core';
 
+export const PluginTerminalOptionsExt = Symbol('PluginTerminalOptionsExt');
+
+@injectable()
 export class PluginDebugSession extends DebugSession {
-    constructor(
-        override readonly id: string,
-        override readonly options: DebugConfigurationSessionOptions,
-        override readonly parentSession: DebugSession | undefined,
-        testService: TestService,
-        testRun: TestRunReference | undefined,
-        sessionManager: DebugSessionManager,
-        protected override readonly connection: DebugSessionConnection,
-        protected override readonly terminalServer: TerminalService,
-        protected override readonly editorManager: EditorManager,
-        protected override readonly breakpoints: BreakpointManager,
-        protected override readonly labelProvider: LabelProvider,
-        protected override readonly messages: MessageClient,
-        protected override readonly fileService: FileService,
-        protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
-        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
-        protected override readonly workspaceService: WorkspaceService,
-        debugPreferences: DebugPreferences,
-        protected override readonly commandService: CommandService) {
-        super(id, options, parentSession, testService, testRun, sessionManager, connection, terminalServer, editorManager, breakpoints,
-            labelProvider, messages, fileService, debugContributionProvider,
-            workspaceService, debugPreferences, commandService);
+
+    static override createContainer(
+        parent: interfaces.Container, data: DebugSessionData, connection: DebugSessionConnection, terminalOptionsExt?: TerminalOptionsExt
+    ): interfaces.Container {
+        const child = DebugSession.createContainer(parent, data, connection);
+        child.rebind(DebugSession).to(PluginDebugSession);
+        child.bind(PluginTerminalOptionsExt).toConstantValue(terminalOptionsExt);
+        return child;
     }
 
+    @inject(PluginTerminalOptionsExt)
+    protected readonly terminalOptionsExt: TerminalOptionsExt | undefined;
+
     protected override async doCreateTerminal(terminalWidgetOptions: TerminalWidgetOptions): Promise<TerminalWidget> {
         terminalWidgetOptions = Object.assign({}, terminalWidgetOptions, this.terminalOptionsExt);
         return super.doCreateTerminal(terminalWidgetOptions);
@@ -73,49 +52,24 @@ export class PluginDebugSession extends DebugSession {
  */
 export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
     constructor(
-        protected override readonly terminalService: TerminalService,
-        protected override readonly editorManager: EditorManager,
-        protected override readonly breakpoints: BreakpointManager,
-        protected override readonly labelProvider: LabelProvider,
-        protected override readonly messages: MessageClient,
-        protected override readonly outputChannelManager: OutputChannelManager,
-        protected override readonly debugPreferences: DebugPreferences,
         protected readonly connectionFactory: (sessionId: string) => Promise<PluginChannel>,
-        protected override readonly fileService: FileService,
         protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
-        protected override readonly debugContributionProvider: ContributionProvider<DebugContribution>,
-        protected override readonly testService: TestService,
-        protected override readonly workspaceService: WorkspaceService,
-        protected override readonly commandService: CommandService,
+        container: interfaces.Container,
     ) {
-        super();
+        super(container);
     }
 
-    override get(manager: DebugSessionManager, sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
+    override createSession(sessionId: string, options: DebugConfigurationSessionOptions, parentSession?: DebugSession): DebugSession {
         const connection = new DebugSessionConnection(
             sessionId,
             this.connectionFactory,
             this.getTraceOutputChannel());
-
-        return new PluginDebugSession(
-            sessionId,
+        const data: DebugSessionData = {
+            id: sessionId,
             options,
             parentSession,
-            this.testService,
-            options.testRun,
-            manager,
-            connection,
-            this.terminalService,
-            this.editorManager,
-            this.breakpoints,
-            this.labelProvider,
-            this.messages,
-            this.fileService,
-            this.terminalOptionsExt,
-            this.debugContributionProvider,
-            this.workspaceService,
-            this.debugPreferences,
-            this.commandService
-        );
+        };
+        const child = PluginDebugSession.createContainer(this.container, data, connection, this.terminalOptionsExt);
+        return child.get(DebugSession);
     }
 }

package/src/main/browser/languages-main.ts

@@ -39,7 +39,7 @@ import {
     IdentifiableInlineCompletions,
     HoverWithId
 } from '../../common/plugin-api-rpc';
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import {
     SerializedDocumentFilter, MarkerData, Range, RelatedInformation,
     MarkerSeverity, DocumentLink, WorkspaceSymbolParams, CodeAction, CompletionDto,
@@ -86,6 +86,7 @@ import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model
 import { CodeActionTriggerKind } from '../../plugin/types-impl';
 import { IReadonlyVSDataTransfer } from '@theia/monaco-editor-core/esm/vs/base/common/dataTransfer';
 import { FileUploadService } from '@theia/filesystem/lib/common/upload/file-upload';
+import { ILogger } from '@theia/core';
 
 @injectable()
 export class LanguagesMainImpl implements LanguagesMain, Disposable {
@@ -108,6 +109,9 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
     @inject(FileUploadService)
     protected readonly fileUploadService: FileUploadService;
 
+    @inject(ILogger) @named('plugin-ext:LanguagesMainImpl')
+    protected readonly logger: ILogger;
+
     private readonly proxy: LanguagesExt;
     private readonly services = new Map<number, Disposable>();
     private readonly toDispose = new DisposableCollection();
@@ -958,7 +962,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
                 dispose: () => this.proxy.$releaseCodeActions(handle, actions.map(a => a.cacheId))
             };
         } catch (e) {
-            console.error(e);
+            this.logger.error(e);
             return undefined;
         }
     }

package/src/main/browser/lm-main.ts

@@ -64,7 +64,7 @@ export class McpServerDefinitionRegistryMainImpl implements McpServerDefinitionR
         try {
             const definitions = await this.$getServerDefinitions(handle);
             for (const definition of definitions) {
-                this.mcpServerManager.removeServer(definition.label);
+                await this.mcpServerManager.removeServer(definition.label);
             }
         } catch (error) {
             console.error('Error getting server definitions for removal:', error);
@@ -107,7 +107,7 @@ export class McpServerDefinitionRegistryMainImpl implements McpServerDefinitionR
 
             for (const definition of definitions) {
                 const mcpServerDescription = this.convertToMcpServerDescription(handle, definition);
-                this.mcpServerManager.addOrUpdateServer(mcpServerDescription);
+                await this.mcpServerManager.addOrUpdateServer(mcpServerDescription);
             }
         } catch (error) {
             console.error('Error loading MCP server definitions:', error);

package/src/main/browser/plugin-contribution-handler.ts

@@ -52,6 +52,7 @@ import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { LanguageService } from '@theia/core/lib/browser/language-service';
 import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 import { JSONObject, JSONValue } from '@theia/core/shared/@lumino/coreutils';
+import { ILogger } from '@theia/core';
 
 // The enum export is missing from `vscode-textmate@9.2.0`
 const enum StandardTokenType {
@@ -147,6 +148,9 @@ export class PluginContributionHandler {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
+    @inject(ILogger) @named('plugin-ext:PluginContributionHandler')
+    protected readonly logger: ILogger;
+
     protected readonly commandHandlers = new Map<string, CommandHandler['execute'] | undefined>();
 
     protected readonly onDidRegisterCommandHandlerEmitter = new Emitter<string>();
@@ -164,8 +168,8 @@ export class PluginContributionHandler {
         }
         const toDispose = new DisposableCollection(Disposable.create(() => { /* mark as not disposed */ }));
         /* eslint-disable @typescript-eslint/no-explicit-any */
-        const logError = (message: string, ...args: any[]) => console.error(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
-        const logWarning = (message: string, ...args: any[]) => console.warn(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
+        const logError = (message: string, ...args: any[]) => this.logger.error(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
+        const logWarning = (message: string, ...args: any[]) => this.logger.warn(`[${clientId}][${plugin.metadata.model.id}]: ${message}`, ...args);
         const pushContribution = (id: string, contribute: () => Disposable) => {
             if (toDispose.disposed) {
                 return;
@@ -517,7 +521,7 @@ export class PluginContributionHandler {
 
     registerCommand(command: Command, enablement?: string): Disposable {
         if (this.hasCommand(command.id)) {
-            console.warn(`command '${command.id}' already registered`);
+            this.logger.warn(`command '${command.id}' already registered`);
             return Disposable.NULL;
         }
 
@@ -565,7 +569,7 @@ export class PluginContributionHandler {
 
     registerCommandHandler(id: string, execute: CommandHandler['execute']): Disposable {
         if (this.hasCommandHandler(id)) {
-            console.warn(`command handler '${id}' already registered`);
+            this.logger.warn(`command handler '${id}' already registered`);
             return Disposable.NULL;
         }
 

package/src/main/browser/view/plugin-view-registry.spec.ts

@@ -0,0 +1,105 @@
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+// PluginViewRegistry transitively imports browser widgets (Lumino) that touch `document` at load time.
+const disableJSDOM = enableJSDOM();
+
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+// Some transitively imported modules read the frontend config at load time.
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { Disposable } from '@theia/core/lib/common';
+import { PluginViewRegistry, ViewContainerInfo } from './plugin-view-registry';
+
+disableJSDOM();
+
+interface RegisteredMenuAction {
+    commandId: string;
+    label: string;
+    when?: string;
+}
+
+/**
+ * Minimal stand-in for {@link MenuModelRegistry} that records the menu actions registered for the
+ * "Views" menu and removes them again when the returned disposable is disposed. This lets us assert
+ * on the labels {@link PluginViewRegistry} ends up showing without wiring the full DI container.
+ */
+class RecordingMenuModelRegistry {
+    readonly actions = new Map<string, RegisteredMenuAction>();
+
+    registerMenuAction(_menuPath: unknown, action: RegisteredMenuAction): Disposable {
+        this.actions.set(action.commandId, { ...action });
+        return Disposable.create(() => this.actions.delete(action.commandId));
+    }
+}
+
+describe('PluginViewRegistry - view menu labels', () => {
+
+    let registry: PluginViewRegistry;
+    let menus: RecordingMenuModelRegistry;
+
+    const toggleCommandId = (id: string): string => `plugin.view-container.${id}.toggle`;
+    const internals = (): {
+        viewContainers: Map<string, ViewContainerInfo>;
+        registerViewMenuAction(containerId: string, label: string): Disposable;
+    } => registry as unknown as {
+        viewContainers: Map<string, ViewContainerInfo>;
+        registerViewMenuAction(containerId: string, label: string): Disposable;
+    };
+
+    function registerContainer(id: string, label: string, location: string): Disposable {
+        internals().viewContainers.set(id, { id, location, options: { label }, onViewAdded: () => { } });
+        return internals().registerViewMenuAction(id, label);
+    }
+
+    beforeEach(() => {
+        registry = new PluginViewRegistry();
+        menus = new RecordingMenuModelRegistry();
+        (registry as unknown as { menus: unknown }).menus = menus;
+    });
+
+    it('uses the plain label for a single container', () => {
+        registerContainer('a', 'Claude Code', 'left');
+        expect(menus.actions.get(toggleCommandId('a'))?.label).to.equal('Claude Code');
+    });
+
+    it('leaves distinct labels unsuffixed', () => {
+        registerContainer('a', 'Explorer', 'left');
+        registerContainer('b', 'Claude Code', 'right');
+        expect(menus.actions.get(toggleCommandId('a'))?.label).to.equal('Explorer');
+        expect(menus.actions.get(toggleCommandId('b'))?.label).to.equal('Claude Code');
+    });
+
+    it('suffixes the location when two containers share a label', () => {
+        registerContainer('a', 'Claude Code', 'left');
+        registerContainer('b', 'Claude Code', 'right');
+        expect(menus.actions.get(toggleCommandId('a'))?.label).to.equal('Claude Code (Side Bar)');
+        expect(menus.actions.get(toggleCommandId('b'))?.label).to.equal('Claude Code (Secondary Side Bar)');
+    });
+
+    it('drops the suffix from the remaining container once the duplicate is removed', () => {
+        registerContainer('a', 'Claude Code', 'left');
+        const disposeB = registerContainer('b', 'Claude Code', 'right');
+
+        disposeB.dispose();
+
+        expect(menus.actions.get(toggleCommandId('a'))?.label).to.equal('Claude Code');
+        expect(menus.actions.has(toggleCommandId('b'))).to.equal(false);
+    });
+
+});

package/src/main/browser/view/plugin-view-registry.ts

@@ -111,6 +111,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     private readonly viewClauseContexts = new Map<string, Set<string> | undefined>();
     private readonly viewContainerClauseContexts = new Map<string, Set<string> | undefined>();
 
+    private readonly viewMenuLabelToContainerIds = new Map<string, Set<string>>();
+    private readonly viewMenuDisposables = new Map<string, Disposable>();
+
     private readonly viewDataProviders = new Map<string, ViewDataProvider>();
     private readonly viewDataState = new Map<string, object>();
 
@@ -374,13 +377,10 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             }, {
                 execute: () => this.toggleViewContainer(id)
             }));
-            toDispose.push(this.menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
-                commandId: toggleCommandId,
-                label: options.label,
-                when
-            }));
+            toDispose.push(this.registerViewMenuAction(id, options.label));
             toDispose.push(this.quickView?.registerItem({
                 label: options.label,
+                description: this.getLocationDescription(location),
                 when,
                 open: async () => {
                     const widget = await this.openViewContainer(id);
@@ -408,6 +408,88 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         return toDispose;
     }
 
+    protected getLocationDescription(location: string | undefined): string | undefined {
+        switch (location) {
+            case 'left': return nls.localizeByDefault('Side Bar');
+            case 'right': return nls.localizeByDefault('Secondary Side Bar');
+            case 'bottom': return nls.localizeByDefault('Panel');
+            default: return undefined;
+        }
+    }
+
+    protected getContainerLocation(viewContainerId: string): string | undefined {
+        if (PluginViewRegistry.BUILTIN_VIEW_CONTAINERS.has(viewContainerId)) {
+            return 'left';
+        }
+        return this.viewContainers.get(viewContainerId)?.location;
+    }
+
+    protected getViewQuickPickDescription(viewContainerId: string): string | undefined {
+        const locationDescription = this.getLocationDescription(this.getContainerLocation(viewContainerId));
+        const containerLabel = this.viewContainers.get(viewContainerId)?.options.label;
+        if (locationDescription && containerLabel) {
+            return `${locationDescription} / ${containerLabel}`;
+        }
+        return locationDescription;
+    }
+
+    protected registerViewMenuAction(containerId: string, label: string): Disposable {
+        let ids = this.viewMenuLabelToContainerIds.get(label);
+        if (!ids) {
+            ids = new Set();
+            this.viewMenuLabelToContainerIds.set(label, ids);
+        }
+        ids.add(containerId);
+        this.refreshViewMenuLabel(label);
+        return Disposable.create(() => {
+            const set = this.viewMenuLabelToContainerIds.get(label);
+            if (set) {
+                set.delete(containerId);
+                if (set.size === 0) {
+                    this.viewMenuLabelToContainerIds.delete(label);
+                }
+            }
+            const disposable = this.viewMenuDisposables.get(containerId);
+            if (disposable) {
+                disposable.dispose();
+                this.viewMenuDisposables.delete(containerId);
+            }
+            this.refreshViewMenuLabel(label);
+        });
+    }
+
+    protected refreshViewMenuLabel(label: string): void {
+        const ids = this.viewMenuLabelToContainerIds.get(label);
+        if (!ids) {
+            return;
+        }
+        const useSuffix = ids.size > 1;
+        for (const id of ids) {
+            const existing = this.viewMenuDisposables.get(id);
+            if (existing) {
+                existing.dispose();
+                this.viewMenuDisposables.delete(id);
+            }
+            const containerInfo = this.viewContainers.get(id);
+            if (!containerInfo) {
+                continue;
+            }
+            let menuLabel = label;
+            if (useSuffix) {
+                const description = this.getLocationDescription(containerInfo.location);
+                if (description) {
+                    menuLabel = `${label} (${description})`;
+                }
+            }
+            const disposable = this.menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
+                commandId: `plugin.view-container.${id}.toggle`,
+                label: menuLabel,
+                when: containerInfo.when
+            });
+            this.viewMenuDisposables.set(id, disposable);
+        }
+    }
+
     protected isViewContainerVisible(containerId: string): boolean {
         const info = this.viewContainers.get(containerId);
         if (!info) {
@@ -471,6 +553,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         }
         toDispose.push(this.quickView?.registerItem({
             label: view.name,
+            description: this.getViewQuickPickDescription(viewContainerId),
             when: view.when,
             open: () => this.openView(view.id, { activate: true })
         }));
@@ -560,7 +643,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                 });
                 return _pendingResolution;
             },
-            show: webview.show
+            show: (preserveFocus: boolean) => {
+                this.openView(viewId, preserveFocus ? { reveal: true } : { activate: true });
+            }
         };
 
         const toDispose = this.onNewResolverRegistered(resolver => {

package/src/main/browser/webview/webview-resource-cache.ts

@@ -14,9 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { MaybePromise } from '@theia/core/lib/common/types';
+import { ILogger } from '@theia/core';
 
 export interface WebviewResourceResponse {
     eTag: string | undefined,
@@ -29,6 +30,9 @@ export interface WebviewResourceResponse {
 @injectable()
 export class WebviewResourceCache {
 
+    @inject(ILogger) @named('plugin-ext:WebviewResourceCache')
+    protected readonly logger: ILogger;
+
     protected readonly cache = new Deferred<Cache | undefined>();
 
     constructor() {
@@ -39,7 +43,7 @@ export class WebviewResourceCache {
         try {
             this.cache.resolve(await caches.open('webview:v1'));
         } catch (e) {
-            console.error('Failed to enable webview caching: ', e);
+            this.logger.error('Failed to enable webview caching: ', e);
             this.cache.resolve(undefined);
         }
     }

package/src/main/browser/webview/webview.ts

@@ -22,7 +22,7 @@
 
 import * as mime from 'mime';
 import { JSONExt } from '@theia/core/shared/@lumino/coreutils';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
 import { WebviewPanelOptions, WebviewPortMapping } from '@theia/plugin';
 import { BaseWidget, Message, codicon } from '@theia/core/lib/browser/widgets/widget';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
@@ -49,7 +49,7 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileOperationError, FileOperationResult } from '@theia/filesystem/lib/common/files';
 import { BinaryBufferReadableStream } from '@theia/core/lib/common/buffer';
 import { ExtractableWidget } from '@theia/core/lib/browser/widgets/extractable-widget';
-import { MenuPath } from '@theia/core';
+import { MenuPath, ILogger } from '@theia/core';
 import { ContextMenuRenderer } from '@theia/core/lib/browser';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { PluginViewWidget } from '../view/plugin-view-widget';
@@ -166,6 +166,9 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
+    @inject(ILogger) @named('plugin-ext:WebviewWidget')
+    protected readonly logger: ILogger;
+
     viewState: WebviewPanelViewState = {
         visible: false,
         active: false,
@@ -626,7 +629,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
             await this.ready.promise;
             this.postMessage(channel, data);
         } catch (e) {
-            console.error(e);
+            this.logger.error(e);
         }
     }
 

package/src/main/node/plugin-deployer-impl.ts

@@ -42,7 +42,7 @@ export class PluginDeployerImpl implements PluginDeployer {
     protected readonly onDidDeployEmitter = new Emitter<void>();
     readonly onDidDeploy = this.onDidDeployEmitter.event;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:PluginDeployerImpl')
     protected readonly logger: ILogger;
 
     @inject(PluginDeployerHandler)
@@ -215,7 +215,7 @@ export class PluginDeployerImpl implements PluginDeployer {
                         }
                     }
                 } catch (e) {
-                    console.error(`Failed to resolve plugins from '${entry.id}'`, e);
+                    this.logger.error(`Failed to resolve plugins from '${entry.id}'`, e);
                     errors.push(e instanceof Error ? e : new Error(String(e)));
                 }
             }));

package/src/plugin/languages/diagnostics.ts

@@ -30,6 +30,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
     ];
 
     private collectionName: string;
+    private ownerId: string;
     private diagnosticsLimitPerResource: number;
     private proxy: LanguagesMain;
     private onDidChangeDiagnosticsEmitter: Emitter<theia.DiagnosticChangeEvent>;
@@ -38,8 +39,9 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
     private isDisposed: boolean;
     private onDisposeCallback: (() => void) | undefined;
 
-    constructor(name: string, maxCountPerFile: number, proxy: LanguagesMain, onDidChangeDiagnosticsEmitter: Emitter<theia.DiagnosticChangeEvent>) {
+    constructor(name: string, owner: string, maxCountPerFile: number, proxy: LanguagesMain, onDidChangeDiagnosticsEmitter: Emitter<theia.DiagnosticChangeEvent>) {
         this.collectionName = name;
+        this.ownerId = owner;
         this.diagnosticsLimitPerResource = maxCountPerFile;
         this.proxy = proxy;
         this.onDidChangeDiagnosticsEmitter = onDidChangeDiagnosticsEmitter;
@@ -53,6 +55,10 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
         return this.collectionName;
     }
 
+    get owner(): string {
+        return this.ownerId;
+    }
+
     set(uri: theia.Uri, diagnostics: theia.Diagnostic[] | undefined): void;
     set(entries: [theia.Uri, theia.Diagnostic[] | undefined][]): void;
     set(arg: theia.Uri | [theia.Uri, theia.Diagnostic[] | undefined][], diagnostics?: theia.Diagnostic[] | undefined): void {
@@ -115,7 +121,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
         if (this.has(uri)) {
             this.fireDiagnosticChangeEvent(uri);
             this.diagnostics.delete(uri.toString());
-            this.proxy.$changeDiagnostics(this.name, [[uri.toString(), []]]);
+            this.proxy.$changeDiagnostics(this.ownerId, [[uri.toString(), []]]);
         }
     }
 
@@ -123,7 +129,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
         this.ensureNotDisposed();
         this.fireDiagnosticChangeEvent(this.getAllResourcesUris());
         this.diagnostics.clear();
-        this.proxy.$clearDiagnostics(this.name);
+        this.proxy.$clearDiagnostics(this.ownerId);
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -247,7 +253,7 @@ export class DiagnosticCollection implements theia.DiagnosticCollection {
             }
         }
 
-        this.proxy.$changeDiagnostics(this.name, markers);
+        this.proxy.$changeDiagnostics(this.ownerId, markers);
     }
 }
 
@@ -256,7 +262,12 @@ export class Diagnostics {
     private static GENERATED_DIAGNOSTIC_COLLECTION_NAME_PREFIX = '_generated_diagnostic_collection_name_#';
 
     private proxy: LanguagesMain;
-    private diagnosticCollections: Map<string, DiagnosticCollection>; // id -> diagnostic collection
+    // Collections are keyed by their unique `owner` id (which is the same as `name` for the first
+    // collection with that name, but is suffixed when a duplicate name is requested). This matches
+    // VS Code's behavior and prevents collisions on the main side's marker owner namespace as well
+    // as a latent bug where disposing the first collection would evict the second from the map.
+    private diagnosticCollections: Map<string, DiagnosticCollection>;
+    private nextOwnerSuffix = 1;
 
     private diagnosticsChangedEmitter = new Emitter<theia.DiagnosticChangeEvent>();
     public readonly onDidChangeDiagnostics: Event<theia.DiagnosticChangeEvent> = this.diagnosticsChangedEmitter.event;
@@ -278,19 +289,26 @@ export class Diagnostics {
     }
 
     createDiagnosticCollection(name?: string): theia.DiagnosticCollection {
+        let owner: string;
         if (!name) {
             do {
                 name = Diagnostics.GENERATED_DIAGNOSTIC_COLLECTION_NAME_PREFIX + this.getNextId();
             } while (this.diagnosticCollections.has(name));
-        } else if (this.diagnosticCollections.has(name)) {
-            console.warn(`Diagnostic collection with name '${name}' already exist.`);
+            owner = name;
+        } else if (!this.diagnosticCollections.has(name)) {
+            owner = name;
+        } else {
+            console.warn(`Diagnostic collection with name '${name}' already exists.`);
+            do {
+                owner = name + this.nextOwnerSuffix++;
+            } while (this.diagnosticCollections.has(owner));
         }
 
-        const diagnosticCollection = new DiagnosticCollection(name, Diagnostics.MAX_DIAGNOSTICS_PER_FILE, this.proxy, this.diagnosticsChangedEmitter);
+        const diagnosticCollection = new DiagnosticCollection(name, owner, Diagnostics.MAX_DIAGNOSTICS_PER_FILE, this.proxy, this.diagnosticsChangedEmitter);
         diagnosticCollection.setOnDisposeCallback(() => {
-            this.diagnosticCollections.delete(name!);
+            this.diagnosticCollections.delete(owner);
         });
-        this.diagnosticCollections.set(name, diagnosticCollection);
+        this.diagnosticCollections.set(owner, diagnosticCollection);
         return diagnosticCollection;
     }