@theia/plugin-ext 1.65.0-next.19 → 1.65.0-next.39

package/src/hosted/node/scanners/scanner-theia.ts

@@ -68,18 +68,19 @@ import {
 } from '../../../common/plugin-protocol';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import { isObject, isStringArray, RecursivePartial } from '@theia/core/lib/common/types';
+import { isObject, isStringArray } from '@theia/core/lib/common/types';
 import { GrammarsReader } from './grammars-reader';
 import { CharacterPair } from '../../../common/plugin-api-rpc';
 import { isENOENT } from '../../../common/errors';
 import * as jsoncparser from 'jsonc-parser';
 import { IJSONSchema } from '@theia/core/lib/common/json-schema';
 import { deepClone } from '@theia/core/lib/common/objects';
-import { PreferenceSchema, PreferenceSchemaProperties } from '@theia/core/lib/common/preferences/preference-schema';
+import { PreferenceSchema, PreferenceDataProperty } from '@theia/core/lib/common/preferences/preference-schema';
 import { TaskDefinition } from '@theia/task/lib/common/task-protocol';
 import { ColorDefinition } from '@theia/core/lib/common/color';
 import { CSSIcon } from '@theia/core/lib/common/markdown-rendering/icon-utilities';
 import { PluginUriFactory } from './plugin-uri-factory';
+import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
 
 const colorIdPattern = '^\\w+[.\\w+]*$';
 const iconIdPattern = `^${CSSIcon.iconNameSegment}(-${CSSIcon.iconNameSegment})+$`;
@@ -91,6 +92,52 @@ function getFileExtension(filePath: string): string {
 
 type PluginPackageWithContributes = PluginPackage & { contributes: PluginPackageContribution };
 
+type ScopeString = 'machine-overridable' | 'window' | 'resource' | 'language-overridable' | 'application' | 'machine';
+
+type EditPresentationTypes = 'multilineText' | 'singleLineText';
+export interface IConfigurationPropertySchema extends IJSONSchema {
+
+    scope?: ScopeString;
+
+    /**
+     * When `false` this property is excluded from the registry. Default is to include.
+     */
+    included?: boolean;
+
+    /**
+     * List of tags associated to the property.
+     *  - A tag can be used for filtering
+     *  - Use `experimental` tag for marking the setting as experimental.
+     *  - Use `onExP` tag for marking that the default of the setting can be changed by running experiments.
+     */
+    tags?: string[];
+
+    /**
+     * When specified, controls the presentation format of string settings.
+     * Otherwise, the presentation format defaults to `singleline`.
+     */
+    editPresentation?: EditPresentationTypes;
+
+    /**
+     * When specified, gives an order number for the setting
+     * within the settings editor. Otherwise, the setting is placed at the end.
+     */
+    order?: number;
+
+}
+
+export interface IExtensionInfo {
+    id: string;
+    displayName?: string;
+}
+
+export interface IConfigurationNode {
+    title?: string;
+    description?: string;
+    properties?: Record<string, IConfigurationPropertySchema>;
+    scope?: ScopeString;
+}
+
 @injectable()
 export abstract class AbstractPluginScanner implements PluginScanner {
 
@@ -191,6 +238,21 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
         return result;
     }
 
+    static getScope(monacoScope: string | undefined): { scope: PreferenceScope | undefined, overridable: boolean } {
+        switch (monacoScope) {
+            case 'machine-overridable':
+            case 'window':
+            case 'resource':
+                return { scope: PreferenceScope.Folder, overridable: false };
+            case 'language-overridable':
+                return { scope: PreferenceScope.Folder, overridable: true };
+            case 'application':
+            case 'machine':
+                return { scope: PreferenceScope.User, overridable: false };
+        }
+        return { scope: undefined, overridable: false };
+    }
+
     protected override async readContributions(rawPlugin: PluginPackageWithContributes, contributions: PluginContribution): Promise<PluginContribution> {
         try {
             if (rawPlugin.contributes.configuration) {
@@ -220,7 +282,7 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
         }
 
         const configurationDefaults = rawPlugin.contributes.configurationDefaults;
-        contributions.configurationDefaults = PreferenceSchemaProperties.is(configurationDefaults) ? configurationDefaults : undefined;
+        contributions.configurationDefaults = isObject(configurationDefaults) ? configurationDefaults : undefined;
 
         try {
             if (rawPlugin.contributes.submenus) {
@@ -665,8 +727,28 @@ export class TheiaPluginScanner extends AbstractPluginScanner {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    private readConfiguration(rawConfiguration: RecursivePartial<PreferenceSchema>, pluginPath: string): PreferenceSchema | undefined {
-        return PreferenceSchema.is(rawConfiguration) ? rawConfiguration : undefined;
+    private readConfiguration(rawConfiguration: IConfigurationNode, pluginPath: string): PreferenceSchema | undefined {
+        const { scope, overridable } = TheiaPluginScanner.getScope(rawConfiguration.scope);
+        const schema: PreferenceSchema = {
+            scope,
+            defaultOverridable: overridable,
+            title: rawConfiguration.title,
+            properties: {}
+        };
+
+        if (rawConfiguration.properties) {
+            for (const [key, property] of Object.entries(rawConfiguration.properties)) {
+                const scopeInfo = TheiaPluginScanner.getScope(property.scope);
+                const schemaProperty: PreferenceDataProperty = {
+                    ...property,
+                    scope: scopeInfo.scope,
+                    overridable: scopeInfo.overridable
+                };
+
+                schema.properties[key] = schemaProperty;
+            }
+        }
+        return schema;
     }
 
     private readKeybinding(rawKeybinding: PluginPackageKeybinding): Keybinding {

package/src/main/browser/custom-editors/custom-editor-opener.tsx

@@ -16,13 +16,13 @@
 
 import URI from '@theia/core/lib/common/uri';
 import {
-    ApplicationShell, DiffUris, OpenHandler, OpenerOptions, PreferenceService, SplitWidget, Widget, WidgetManager, WidgetOpenerOptions, getDefaultHandler, defaultHandlerPriority
+    ApplicationShell, DiffUris, OpenHandler, OpenerOptions, SplitWidget, Widget, WidgetManager, WidgetOpenerOptions, getDefaultHandler, defaultHandlerPriority
 } from '@theia/core/lib/browser';
 import { CustomEditor, CustomEditorPriority, CustomEditorSelector } from '../../../common';
 import { CustomEditorWidget } from './custom-editor-widget';
 import { PluginCustomEditorRegistry } from './plugin-custom-editor-registry';
 import { generateUuid } from '@theia/core/lib/common/uuid';
-import { DisposableCollection, Emitter } from '@theia/core';
+import { DisposableCollection, Emitter, PreferenceService } from '@theia/core';
 import { match } from '@theia/core/lib/common/glob';
 
 export class CustomEditorOpener implements OpenHandler {

package/src/main/browser/custom-editors/custom-editors-main.ts

@@ -40,7 +40,7 @@ import { WebviewsMainImpl } from '../webviews-main';
 import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
 import { ApplicationShell, LabelProvider, Saveable, SaveAsOptions, SaveOptions } from '@theia/core/lib/browser';
 import { WebviewPanelOptions } from '@theia/plugin';
-import { EditorPreferences } from '@theia/editor/lib/browser';
+import { EditorPreferences } from '@theia/editor/lib/common/editor-preferences';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 
 const enum CustomEditorModelType {

package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts

@@ -19,8 +19,8 @@ import { CustomEditor, DeployedPlugin } from '../../../common';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { CustomEditorOpener } from './custom-editor-opener';
-import { Emitter } from '@theia/core';
-import { ApplicationShell, DefaultOpenerService, OpenWithService, PreferenceService, WidgetManager } from '@theia/core/lib/browser';
+import { Emitter, PreferenceService } from '@theia/core';
+import { ApplicationShell, DefaultOpenerService, OpenWithService, WidgetManager } from '@theia/core/lib/browser';
 import { CustomEditorWidget } from './custom-editor-widget';
 
 @injectable()

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

@@ -39,7 +39,7 @@ import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-config
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 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/browser/debug-preferences';
+import { DebugPreferences } from '@theia/debug/lib/common/debug-preferences';
 import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribution';
 import { PluginDebugConfigurationProvider } from './plugin-debug-configuration-provider';
 import { PluginDebugSessionContributionRegistrator, PluginDebugSessionContributionRegistry } from './plugin-debug-session-contribution-registry';

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

@@ -21,7 +21,7 @@ import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoin
 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/browser/debug-preferences';
+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 { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';

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

@@ -22,7 +22,7 @@ import { MenuModelRegistry } from '@theia/core/lib/common';
 import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { DeployedPlugin, IconUrl, Menu } from '../../../common';
 import { ScmWidget } from '@theia/scm/lib/browser/scm-widget';
-import { KeybindingRegistry, QuickCommandService } from '@theia/core/lib/browser';
+import { KeybindingRegistry, QuickCommandService, codicon } from '@theia/core/lib/browser';
 import {
     CodeEditorWidgetUtil, codeToTheiaMappings, ContributionPoint,
     PLUGIN_EDITOR_TITLE_MENU, PLUGIN_EDITOR_TITLE_RUN_MENU, PLUGIN_SCM_TITLE_MENU, PLUGIN_VIEW_TITLE_MENU
@@ -54,7 +54,7 @@ export class MenusContributionPointHandler {
         this.tabBarToolbar.registerItem({
             id: this.tabBarToolbar.toElementId(PLUGIN_EDITOR_TITLE_RUN_MENU),
             menuPath: PLUGIN_EDITOR_TITLE_RUN_MENU,
-            icon: 'debug-alt',
+            icon: codicon('debug-alt'),
             text: nls.localizeByDefault('Run or Debug...'),
             command: '',
             group: 'navigation',

package/src/main/browser/menus/vscode-theia-menu-mappings.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { MenuPath } from '@theia/core';
-import { SHELL_TABBAR_CONTEXT_MENU } from '@theia/core/lib/browser';
+import { CommonMenus, SHELL_TABBAR_CONTEXT_MENU } from '@theia/core/lib/browser';
 import { Navigatable } from '@theia/core/lib/browser/navigatable';
 import { URI as CodeUri } from '@theia/core/shared/vscode-uri';
 import { DebugStackFramesWidget } from '@theia/debug/lib/browser/view/debug-stack-frames-widget';
@@ -88,6 +88,7 @@ export const codeToTheiaMappings = new Map<string, MenuPath[]>([
     ['editor/title/run', [PLUGIN_EDITOR_TITLE_RUN_MENU]],
     ['editor/lineNumber/context', [EDITOR_LINENUMBER_CONTEXT_MENU]],
     ['explorer/context', [NAVIGATOR_CONTEXT_MENU]],
+    ['file/newFile', [CommonMenus.FILE_NEW_CONTRIBUTIONS]],
     ['scm/change/title', [PLUGIN_SCM_CHANGE_TITLE_MENU]],
     ['scm/resourceFolder/context', [ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU]],
     ['scm/resourceGroup/context', [ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU]],

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

@@ -27,9 +27,7 @@ import {
 import {
     DefaultUriLabelProviderContribution,
     LabelProviderContribution,
-    PreferenceSchemaProvider
 } from '@theia/core/lib/browser';
-import { DefaultOverridesPreferenceSchemaId, PreferenceLanguageOverrideService, PreferenceSchema, PreferenceSchemaProperties } from '@theia/core/lib/browser/preferences';
 import { KeybindingsContributionPointHandler } from './keybindings/keybindings-contribution-handler';
 import { MonacoSnippetSuggestProvider } from '@theia/monaco/lib/browser/monaco-snippet-suggest-provider';
 import { PluginSharedStyle } from './plugin-shared-style';
@@ -44,7 +42,7 @@ import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-s
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { PluginIconService } from './plugin-icon-service';
 import { PluginIconThemeService } from './plugin-icon-theme-service';
-import { ContributionProvider } from '@theia/core/lib/common';
+import { ContributionProvider, isObject, OVERRIDE_PROPERTY_PATTERN, PreferenceSchemaService } from '@theia/core/lib/common';
 import * as monaco from '@theia/monaco-editor-core';
 import { ContributedTerminalProfileStore, TerminalProfileStore } from '@theia/terminal/lib/browser/terminal-profile-service';
 import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
@@ -53,6 +51,7 @@ import { PluginTerminalRegistry } from './plugin-terminal-registry';
 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';
 
 // The enum export is missing from `vscode-textmate@9.2.0`
 const enum StandardTokenType {
@@ -79,11 +78,8 @@ export class PluginContributionHandler {
     @inject(MenusContributionPointHandler)
     private readonly menusContributionHandler: MenusContributionPointHandler;
 
-    @inject(PreferenceSchemaProvider)
-    private readonly preferenceSchemaProvider: PreferenceSchemaProvider;
-
-    @inject(PreferenceLanguageOverrideService)
-    private readonly preferenceOverrideService: PreferenceLanguageOverrideService;
+    @inject(PreferenceSchemaService)
+    private readonly preferenceSchemaProvider: PreferenceSchemaService;
 
     @inject(MonacoTextmateService)
     private readonly monacoTextmateService: MonacoTextmateService;
@@ -184,7 +180,7 @@ export class PluginContributionHandler {
         const configuration = contributions.configuration;
         if (configuration) {
             for (const config of configuration) {
-                pushContribution('configuration', () => this.preferenceSchemaProvider.setSchema(config));
+                pushContribution('configuration', () => this.preferenceSchemaProvider.addSchema(config));
             }
         }
 
@@ -552,34 +548,22 @@ export class PluginContributionHandler {
         return !!this.commandHandlers.get(id);
     }
 
-    protected updateDefaultOverridesSchema(configurationDefaults: PreferenceSchemaProperties): Disposable {
-        const defaultOverrides: PreferenceSchema = {
-            id: DefaultOverridesPreferenceSchemaId,
-            title: 'Default Configuration Overrides',
-            properties: {}
-        };
+    protected updateDefaultOverridesSchema(configurationDefaults: JSONObject): Disposable {
+        const disposables = new DisposableCollection();
         // eslint-disable-next-line guard-for-in
         for (const key in configurationDefaults) {
             const defaultValue = configurationDefaults[key];
-            if (this.preferenceOverrideService.testOverrideValue(key, defaultValue)) {
-                // language specific override
-                defaultOverrides.properties[key] = {
-                    type: 'object',
-                    default: defaultValue,
-                    description: `Configure editor settings to be overridden for ${key} language.`
-                };
+            const match = key.match(OVERRIDE_PROPERTY_PATTERN);
+            if (match && isObject(defaultValue)) {
+                for (const [propertyName, value] of Object.entries(defaultValue)) {
+                    disposables.push(this.preferenceSchemaProvider.registerOverride(propertyName, match[1], value as JSONValue));
+                }
             } else {
                 // regular configuration override
-                defaultOverrides.properties[key] = {
-                    default: defaultValue,
-                    description: `Configure default setting for ${key}.`
-                };
+                disposables.push(this.preferenceSchemaProvider.registerOverride(key, undefined, defaultValue));
             }
         }
-        if (Object.keys(defaultOverrides.properties).length) {
-            return this.preferenceSchemaProvider.setSchema(defaultOverrides);
-        }
-        return Disposable.NULL;
+        return disposables;
     }
 
     private createRegex(value: string | RegExpOptions | undefined): RegExp | undefined {

package/src/main/browser/plugin-ext-argument-processor.ts

@@ -0,0 +1,39 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH.
+//
+// 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 { Widget } from '@theia/core/lib/browser';
+import { injectable } from '@theia/core/shared/inversify';
+import { ArgumentProcessor } from '../../common/commands';
+
+/**
+ * This processor handles arguments passed to commands that are contributed by plugins and available as toolbar items.
+ *
+ * When a toolbar item executes a command, it often passes the active widget as an argument. This can lead to
+ * serialization problems. To solve this issue, this processor checks if an argument is a Widget instance and if so, it extracts
+ * and returns only the widget's ID, which can be safely serialized and used to identify the widget in the plugin host.
+ */
+@injectable()
+export class PluginExtToolbarItemArgumentProcessor implements ArgumentProcessor {
+
+    processArgument(arg: unknown): unknown {
+        if (arg instanceof Widget) {
+            return arg.id;
+        }
+
+        return arg;
+    }
+
+}

package/src/main/browser/plugin-ext-frontend-module.ts

@@ -26,7 +26,7 @@ import {
     noopWidgetStatusBarContribution,
     WidgetStatusBarContribution
 } from '@theia/core/lib/browser';
-import { MaybePromise, CommandContribution, ResourceResolver, bindContributionProvider, URI, generateUuid } from '@theia/core/lib/common';
+import { MaybePromise, CommandContribution, ResourceResolver, bindContributionProvider, URI, generateUuid, PreferenceContribution } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging';
 import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
 import { HostedPluginWatcher } from '../../hosted/browser/hosted-plugin-watcher';
@@ -60,7 +60,6 @@ import { OutputChannelRegistryMainImpl } from './output-channel-registry-main';
 import { WebviewWidget } from './webview/webview';
 import { WebviewEnvironment } from './webview/webview-environment';
 import { WebviewThemeDataProvider } from './webview/webview-theme-data-provider';
-import { bindWebviewPreferences } from './webview/webview-preferences';
 import { WebviewResourceCache } from './webview/webview-resource-cache';
 import { PluginIconThemeService, PluginIconThemeFactory, PluginIconThemeDefinition, PluginIconTheme } from './plugin-icon-theme-service';
 import { PluginTreeViewNodeLabelProvider } from './view/plugin-tree-view-node-label-provider';
@@ -90,6 +89,9 @@ import { CellOutputWebviewImpl, createCellOutputWebviewContainer } from './noteb
 import { ArgumentProcessorContribution } from './command-registry-main';
 import { WebviewSecondaryWindowSupport } from './webview/webview-secondary-window-support';
 import { CustomEditorUndoRedoHandler } from './custom-editors/custom-editor-undo-redo-handler';
+import { bindWebviewPreferences } from '../common/webview-preferences';
+import { WebviewFrontendPreferenceContribution } from './webview/webview-frontend-preference-contribution';
+import { PluginExtToolbarItemArgumentProcessor } from './plugin-ext-argument-processor';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
@@ -180,6 +182,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     })).inSingletonScope();
 
     bindWebviewPreferences(bind);
+    bind(WebviewFrontendPreferenceContribution).toSelf().inSingletonScope();
+    bind(PreferenceContribution).toService(WebviewFrontendPreferenceContribution);
     bind(WebviewEnvironment).toSelf().inSingletonScope();
     bind(WebviewThemeDataProvider).toSelf().inSingletonScope();
     bind(WebviewResourceCache).toSelf().inSingletonScope();
@@ -287,4 +291,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     );
     bindContributionProvider(bind, ArgumentProcessorContribution);
 
+    bind(PluginExtToolbarItemArgumentProcessor).toSelf().inSingletonScope();
+    bind(ArgumentProcessorContribution).toService(PluginExtToolbarItemArgumentProcessor);
+
 });

package/src/main/browser/preference-registry-main.ts

@@ -19,7 +19,7 @@ import {
     PreferenceServiceImpl,
     PreferenceScope,
     PreferenceProviderProvider
-} from '@theia/core/lib/browser/preferences';
+} from '@theia/core/lib/common/preferences';
 import { interfaces } from '@theia/core/shared/inversify';
 import {
     MAIN_RPC_CONTEXT,
@@ -40,13 +40,15 @@ export function getPreferences(preferenceProviderProvider: PreferenceProviderPro
     return PreferenceScope.getScopes().reduce((result: { [key: number]: any }, scope: PreferenceScope) => {
         result[scope] = {};
         const provider = preferenceProviderProvider(scope);
-        if (scope === PreferenceScope.Folder) {
-            for (const f of folders) {
-                const folderPrefs = provider.getPreferences(f);
-                result[scope][f] = folderPrefs;
+        if (provider) {
+            if (scope === PreferenceScope.Folder) {
+                for (const f of folders) {
+                    const folderPrefs = provider.getPreferences(f);
+                    result[scope][f] = folderPrefs;
+                }
+            } else {
+                result[scope] = provider.getPreferences();
             }
-        } else {
-            result[scope] = provider.getPreferences();
         }
         return result;
     }, {} as PreferenceData);

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

@@ -426,6 +426,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         toDispose.push(this.commands.registerCommand({ id: `${view.id}.focus` }, {
             execute: async () => { await this.openView(view.id, { activate: true }); }
         }));
+        toDispose.push(this.commands.registerCommand({ id: `${view.id}.open` }, {
+            execute: async () => { await this.openView(view.id, { activate: true }); }
+        }));
         return toDispose;
     }
 

package/src/main/browser/view/tree-views-main.ts

@@ -90,7 +90,7 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
                 this.toDispose.push(Disposable.create(() => widget.model.proxy = undefined));
                 this.handleTreeEvents(widget.id, widget);
             }
-            await widget.model.refresh();
+            widget.model.refresh();
             return widget;
         }));
         this.toDispose.push(Disposable.create(() => this.$unregisterTreeDataProvider(treeViewId)));

package/src/main/browser/webview/pre/main.js

@@ -250,9 +250,11 @@ delete window.frameElement;
             }
 
             let baseElement = event.view.document.getElementsByTagName('base')[0];
-            /** @type {any} */
-            let node = event.target;
-            while (node) {
+
+            // Use composedPath to get the event path through shadow DOM
+            const path = event.composedPath ? event.composedPath() : [event.target];
+
+            for (const node of path) {
                 if (node.tagName && node.tagName.toLowerCase() === 'a' && node.href) {
                     if (node.getAttribute('href') === '#') {
                         event.view.scrollTo(0, 0);
@@ -267,7 +269,6 @@ delete window.frameElement;
                     event.preventDefault();
                     break;
                 }
-                node = node.parentNode;
             }
         };
 
@@ -282,13 +283,14 @@ delete window.frameElement;
                 }
 
                 if (event.button === 1) {
-                    let node = /** @type {any} */ (event.target);
-                    while (node) {
+                    // Use composedPath to get the event path through shadow DOM
+                    const path = event.composedPath ? event.composedPath() : [event.target];
+
+                    for (const node of path) {
                         if (node.tagName && node.tagName.toLowerCase() === 'a' && node.href) {
                             event.preventDefault();
                             break;
                         }
-                        node = node.parentNode;
                     }
                 }
             };
@@ -354,16 +356,17 @@ delete window.frameElement;
             host.postMessage('did-context-menu', {
                 clientX: e.clientX,
                 clientY: e.clientY,
-                context: findVscodeContext(e.target)
+                context: findVscodeContext(e.composedPath(), 0)
             });
         };
 
-        function findVscodeContext(node) {
+        function findVscodeContext(nodes, index) {
+            const node = nodes[index];
             if (node) {
                 if (node.dataset?.vscodeContext) {
                     return JSON.parse(node.dataset.vscodeContext);
                 }
-                return findVscodeContext(node.parentElement);
+                return findVscodeContext(nodes, ++index);
             }
             return {};
         }

package/src/main/browser/webview/webview-frontend-preference-contribution.ts

@@ -0,0 +1,37 @@
+// *****************************************************************************
+// Copyright (C) 2025 STMicroelectronics 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 { nls, PreferenceContribution, PreferenceSchema, PreferenceSchemaService, PreferenceScope } from '@theia/core';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+
+const schema: PreferenceSchema = {
+    properties: {
+        'webview.warnIfUnsecure': {
+            scope: PreferenceScope.Default,
+            type: 'boolean',
+            description: nls.localize('theia/plugin-ext/webviewWarnIfUnsecure', 'Warns users that webviews are currently deployed insecurely.'),
+            default: true,
+
+        }
+    }
+};
+
+export class WebviewFrontendPreferenceContribution implements PreferenceContribution {
+    async initSchema(service: PreferenceSchemaService): Promise<void> {
+        const frontendConfig = FrontendApplicationConfigProvider.get();
+        if (frontendConfig.securityWarnings) {
+            service.addSchema(schema);
+        }
+    }
+};

package/src/main/browser/webview/webview-theme-data-provider.ts

@@ -21,7 +21,7 @@
 
 import { inject, postConstruct, injectable } from '@theia/core/shared/inversify';
 import { Emitter } from '@theia/core/lib/common/event';
-import { EditorPreferences, EditorConfiguration } from '@theia/editor/lib/browser/editor-preferences';
+import { EditorPreferences, EditorConfiguration } from '@theia/editor/lib/common/editor-preferences';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { Theme } from '@theia/core/lib/common/theme';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';

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

@@ -41,7 +41,6 @@ import { PluginSharedStyle } from '../plugin-shared-style';
 import { WebviewThemeDataProvider } from './webview-theme-data-provider';
 import { ExternalUriService } from '@theia/core/lib/browser/external-uri-service';
 import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
-import { WebviewPreferences } from './webview-preferences';
 import { WebviewResourceCache } from './webview-resource-cache';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import { isFirefox } from '@theia/core/lib/browser/browser';
@@ -54,6 +53,7 @@ import { MenuPath } 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';
+import { WebviewPreferences } from '../../common/webview-preferences';
 
 // Style from core
 const TRANSPARENT_OVERLAY_STYLE = 'theia-transparent-overlay';

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

@@ -31,14 +31,14 @@ import { Resource } from '@theia/core/lib/common/resource';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Emitter, Event, ResourceResolver, CancellationToken, isUndefined } from '@theia/core';
 import { PluginServer } from '../../common/plugin-protocol';
-import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
+import { FileSystemPreferences } from '@theia/filesystem/lib/common';
 import { SearchInWorkspaceService } from '@theia/search-in-workspace/lib/browser/search-in-workspace-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
 import { MonacoQuickInputService } from '@theia/monaco/lib/browser/monaco-quick-input-service';
 import { RequestService } from '@theia/core/shared/@theia/request';
 import { UTF16be, UTF16le, UTF8, UTF8_with_bom } from '@theia/core/lib/common/encodings';
 import { EncodingRegistry } from '@theia/core/lib/browser/encoding-registry';
-import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
+import { PreferenceService } from '@theia/core/lib/common/preferences/preference-service';
 
 export class WorkspaceMainImpl implements WorkspaceMain, Disposable {