@theia/plugin-ext 1.46.0-next.196 → 1.46.0-next.226

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

@@ -25,7 +25,7 @@ import { RPCProtocol } from '../../../common/rpc-protocol';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
 import { PluginCustomEditorRegistry } from './plugin-custom-editor-registry';
 import { CustomEditorWidget } from './custom-editor-widget';
-import { Emitter, UNTITLED_SCHEME } from '@theia/core';
+import { Emitter } from '@theia/core';
 import { UriComponents } from '../../../common/uri-components';
 import { URI } from '@theia/core/shared/vscode-uri';
 import TheiaURI from '@theia/core/lib/common/uri';
@@ -189,7 +189,7 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
                 return this.customEditorService.models.add(resource, viewType, model);
             }
             case CustomEditorModelType.Custom: {
-                const model = MainCustomEditorModel.create(this.proxy, viewType, resource, this.undoRedoService, this.fileService, this.editorPreferences, cancellationToken);
+                const model = MainCustomEditorModel.create(this.proxy, viewType, resource, this.undoRedoService, this.fileService, cancellationToken);
                 return this.customEditorService.models.add(resource, viewType, model);
             }
         }
@@ -297,8 +297,8 @@ export class MainCustomEditorModel implements CustomEditorModel {
     private readonly onDirtyChangedEmitter = new Emitter<void>();
     readonly onDirtyChanged = this.onDirtyChangedEmitter.event;
 
-    autoSave: 'off' | 'afterDelay' | 'onFocusChange' | 'onWindowChange';
-    autoSaveDelay: number;
+    private readonly onContentChangedEmitter = new Emitter<void>();
+    readonly onContentChanged = this.onContentChangedEmitter.event;
 
     static async create(
         proxy: CustomEditorsExt,
@@ -306,11 +306,10 @@ export class MainCustomEditorModel implements CustomEditorModel {
         resource: TheiaURI,
         undoRedoService: UndoRedoService,
         fileService: FileService,
-        editorPreferences: EditorPreferences,
         cancellation: CancellationToken,
     ): Promise<MainCustomEditorModel> {
         const { editable } = await proxy.$createCustomDocument(resource.toComponents(), viewType, {}, cancellation);
-        return new MainCustomEditorModel(proxy, viewType, resource, editable, undoRedoService, fileService, editorPreferences);
+        return new MainCustomEditorModel(proxy, viewType, resource, editable, undoRedoService, fileService);
     }
 
     constructor(
@@ -319,22 +318,8 @@ export class MainCustomEditorModel implements CustomEditorModel {
         private readonly editorResource: TheiaURI,
         private readonly editable: boolean,
         private readonly undoRedoService: UndoRedoService,
-        private readonly fileService: FileService,
-        private readonly editorPreferences: EditorPreferences
+        private readonly fileService: FileService
     ) {
-        this.autoSave = this.editorPreferences.get('files.autoSave', undefined, editorResource.toString());
-        this.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, editorResource.toString());
-
-        this.toDispose.push(
-            this.editorPreferences.onPreferenceChanged(event => {
-                if (event.preferenceName === 'files.autoSave') {
-                    this.autoSave = this.editorPreferences.get('files.autoSave', undefined, editorResource.toString());
-                }
-                if (event.preferenceName === 'files.autoSaveDelay') {
-                    this.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, editorResource.toString());
-                }
-            })
-        );
         this.toDispose.push(this.onDirtyChangedEmitter);
     }
 
@@ -505,13 +490,7 @@ export class MainCustomEditorModel implements CustomEditorModel {
         if (this.dirty !== wasDirty) {
             this.onDirtyChangedEmitter.fire();
         }
-
-        if (this.autoSave !== 'off' && this.dirty && this.resource.scheme !== UNTITLED_SCHEME) {
-            const handle = window.setTimeout(() => {
-                this.save();
-                window.clearTimeout(handle);
-            }, this.autoSaveDelay);
-        }
+        this.onContentChangedEmitter.fire();
     }
 
 }
@@ -521,6 +500,8 @@ export class CustomTextEditorModel implements CustomEditorModel {
     private readonly toDispose = new DisposableCollection();
     private readonly onDirtyChangedEmitter = new Emitter<void>();
     readonly onDirtyChanged = this.onDirtyChangedEmitter.event;
+    private readonly onContentChangedEmitter = new Emitter<void>();
+    readonly onContentChanged = this.onContentChangedEmitter.event;
 
     static async create(
         viewType: string,
@@ -544,15 +525,13 @@ export class CustomTextEditorModel implements CustomEditorModel {
                 this.onDirtyChangedEmitter.fire();
             })
         );
+        this.toDispose.push(
+            this.editorTextModel.onContentChanged(e => {
+                this.onContentChangedEmitter.fire();
+            })
+        );
         this.toDispose.push(this.onDirtyChangedEmitter);
-    }
-
-    get autoSave(): 'off' | 'afterDelay' | 'onFocusChange' | 'onWindowChange' {
-        return this.editorTextModel.autoSave;
-    }
-
-    get autoSaveDelay(): number {
-        return this.editorTextModel.autoSaveDelay;
+        this.toDispose.push(this.onContentChangedEmitter);
     }
 
     dispose(): void {

package/src/main/browser/editors-and-documents-main.ts

@@ -32,7 +32,7 @@ import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { TextEditorMain } from './text-editor-main';
 import { DisposableCollection, Emitter, URI } from '@theia/core';
 import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
-import { SaveResourceService } from '@theia/core/lib/browser/save-resource-service';
+import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 
 export class EditorsAndDocumentsMain implements Disposable {
 
@@ -43,7 +43,7 @@ export class EditorsAndDocumentsMain implements Disposable {
 
     private readonly modelService: EditorModelService;
     private readonly editorManager: EditorManager;
-    private readonly saveResourceService: SaveResourceService;
+    private readonly saveResourceService: SaveableService;
 
     private readonly onTextEditorAddEmitter = new Emitter<TextEditorMain[]>();
     private readonly onTextEditorRemoveEmitter = new Emitter<string[]>();
@@ -64,7 +64,7 @@ export class EditorsAndDocumentsMain implements Disposable {
 
         this.editorManager = container.get(EditorManager);
         this.modelService = container.get(EditorModelService);
-        this.saveResourceService = container.get(SaveResourceService);
+        this.saveResourceService = container.get(SaveableService);
 
         this.stateComputer = new EditorAndDocumentStateComputer(d => this.onDelta(d), this.editorManager, this.modelService);
         this.toDispose.push(this.stateComputer);

package/src/main/browser/notebooks/renderers/cell-output-webview.tsx

@@ -187,6 +187,7 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
         }
 
         this.webviewWidget = await this.widgetManager.getOrCreateWidget(WebviewWidget.FACTORY_ID, { id: this.id });
+        this.webviewWidget.parent = this.editor ?? null;
         this.webviewWidget.setContentOptions({
             allowScripts: true,
             // eslint-disable-next-line max-len

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

@@ -47,7 +47,6 @@ import { PluginDebugService } from './debug/plugin-debug-service';
 import { DebugService } from '@theia/debug/lib/common/debug-service';
 import { PluginSharedStyle } from './plugin-shared-style';
 import { SelectionProviderCommandContribution } from './selection-provider-command';
-import { ViewColumnService } from './view-column-service';
 import { ViewContextKeyService } from './view/view-context-key-service';
 import { PluginViewWidget, PluginViewWidgetIdentifier } from './view/plugin-view-widget';
 import { TreeViewWidgetOptions, VIEW_ITEM_CONTEXT_MENU, PluginTree, TreeViewWidget, PluginTreeModel } from './view/tree-view-widget';
@@ -244,8 +243,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(PluginDebugSessionContributionRegistry).toSelf().inSingletonScope();
     rebind(DebugSessionContributionRegistry).toService(PluginDebugSessionContributionRegistry);
 
-    bind(ViewColumnService).toSelf().inSingletonScope();
-
     bind(CommentsService).to(PluginCommentService).inSingletonScope();
     bind(CommentingRangeDecorator).toSelf().inSingletonScope();
     bind(CommentsContribution).toSelf().inSingletonScope();

package/src/main/browser/quick-open-main.ts

@@ -35,6 +35,7 @@ import {
     QuickInputButtonHandle,
     QuickInputService,
     QuickPickItem,
+    QuickPickItemOrSeparator,
     codiconArray
 } from '@theia/core/lib/browser';
 import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
@@ -46,10 +47,11 @@ import { UriComponents } from '../../common/uri-components';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 import { isUriComponents } from '@theia/monaco-editor-core/esm/vs/base/common/uri';
+import { QuickPickSeparator } from '@theia/core';
 
 export interface QuickInputSession {
     input: QuickInput;
-    handlesToItems: Map<number, QuickPickItem>;
+    handlesToItems: Map<number, QuickPickItemOrSeparator>;
 }
 
 interface IconPath {
@@ -63,7 +65,7 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
     private proxy: QuickOpenExt;
     private delegate: MonacoQuickInputService;
     private readonly items: Record<number, {
-        resolve(items: QuickPickItem[]): void;
+        resolve(items: QuickPickItemOrSeparator[]): void;
         reject(error: Error): void;
     }> = {};
 
@@ -80,7 +82,7 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
     }
 
     async $show(instance: number, options: TransferQuickPickOptions<TransferQuickPickItem>, token: CancellationToken): Promise<number | number[] | undefined> {
-        const contents = new Promise<QuickPickItem[]>((resolve, reject) => {
+        const contents = new Promise<QuickPickItemOrSeparator[]>((resolve, reject) => {
             this.items[instance] = { resolve, reject };
         });
 
@@ -92,7 +94,7 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
                     this.proxy.$onItemSelected(Number.parseInt((<QuickPickItem>el).id!));
                 }
             },
-            activeItem: activeItem ? this.toQuickPickItem(activeItem) : undefined
+            activeItem: this.isItem(activeItem) ? this.toQuickPickItem(activeItem) : undefined
         };
 
         const result = await this.delegate.pick(contents, transformedOptions, token);
@@ -105,6 +107,10 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
         return undefined;
     }
 
+    private isItem(item?: TransferQuickPickItem): item is TransferQuickPickItem & { kind: 'item' } {
+        return item?.kind === 'item';
+    }
+
     private normalizeIconPath(path: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon | undefined): {
         iconPath?: IconPath
         iconClasses?: string[]
@@ -127,10 +133,17 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
     }
 
     private toQuickPickItem(item: undefined): undefined;
-    private toQuickPickItem(item: TransferQuickPickItem): QuickPickItem
-    private toQuickPickItem(item: TransferQuickPickItem | undefined): QuickPickItem | undefined {
+    private toQuickPickItem(item: TransferQuickPickItem & { kind: 'item' }): QuickPickItem;
+    private toQuickPickItem(item: TransferQuickPickItem & { kind: 'separator' }): QuickPickSeparator;
+    private toQuickPickItem(item: TransferQuickPickItem): QuickPickItemOrSeparator;
+    private toQuickPickItem(item: TransferQuickPickItem | undefined): QuickPickItemOrSeparator | undefined {
         if (!item) {
             return undefined;
+        } else if (item.kind === 'separator') {
+            return {
+                type: 'separator',
+                label: item.label
+            };
         }
         return {
             ...this.normalizeIconPath(item.iconPath),
@@ -309,7 +322,7 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
                     }
                 } else if (param === 'items') {
                     handlesToItems.clear();
-                    const items: QuickPickItem[] = [];
+                    const items: QuickPickItemOrSeparator[] = [];
                     params[param].forEach((transferItem: TransferQuickPickItem) => {
                         const item = this.toQuickPickItem(transferItem);
                         items.push(item);

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

@@ -24,6 +24,8 @@ import { MonacoDiffEditor } from '@theia/monaco/lib/browser/monaco-diff-editor';
 import { toUriComponents } from '../hierarchy/hierarchy-types-converters';
 import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
 import { DisposableCollection } from '@theia/core';
+import { NotebookEditorWidget } from '@theia/notebook/lib/browser';
+import { ViewColumnService } from '@theia/core/lib/browser/shell/view-column-service';
 
 interface TabInfo {
     tab: TabDto;
@@ -46,6 +48,14 @@ export class TabsMainImpl implements TabsMain, Disposable {
     private currentActiveGroup: TabGroupDto;
 
     private tabGroupChanged: boolean = false;
+    private viewColumnService: ViewColumnService;
+
+    private readonly defaultTabGroup: TabGroupDto = {
+        groupId: 0,
+        tabs: [],
+        isActive: true,
+        viewColumn: 0
+    };
 
     constructor(
         rpc: RPCProtocol,
@@ -54,6 +64,7 @@ export class TabsMainImpl implements TabsMain, Disposable {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.TABS_EXT);
 
         this.applicationShell = container.get(ApplicationShell);
+        this.viewColumnService = container.get(ViewColumnService);
         this.createTabsModel();
 
         const tabBars = this.applicationShell.mainPanel.tabBars();
@@ -100,15 +111,20 @@ export class TabsMainImpl implements TabsMain, Disposable {
     }
 
     protected createTabsModel(): void {
+        if (this.applicationShell.mainAreaTabBars.length === 0) {
+            this.proxy.$acceptEditorTabModel([this.defaultTabGroup]);
+            return;
+        }
         const newTabGroupModel = new Map<TabBar<Widget>, TabGroupDto>();
         this.tabInfoLookup.clear();
         this.disposableTabBarListeners.dispose();
-        this.applicationShell.mainAreaTabBars.forEach(tabBar => {
-            this.attachListenersToTabBar(tabBar);
-            const groupDto = this.createTabGroupDto(tabBar);
-            tabBar.titles.forEach((title, index) => this.tabInfoLookup.set(title, { group: groupDto, tab: groupDto.tabs[index], tabIndex: index }));
-            newTabGroupModel.set(tabBar, groupDto);
-        });
+        this.applicationShell.mainAreaTabBars
+            .forEach((tabBar, i) => {
+                this.attachListenersToTabBar(tabBar);
+                const groupDto = this.createTabGroupDto(tabBar, i);
+                tabBar.titles.forEach((title, index) => this.tabInfoLookup.set(title, { group: groupDto, tab: groupDto.tabs[index], tabIndex: index }));
+                newTabGroupModel.set(tabBar, groupDto);
+            });
         if (newTabGroupModel.size > 0 && Array.from(newTabGroupModel.values()).indexOf(this.currentActiveGroup) < 0) {
             this.currentActiveGroup = this.tabInfoLookup.get(this.applicationShell.mainPanel.currentTitle!)?.group ?? newTabGroupModel.values().next().value;
             this.currentActiveGroup.isActive = true;
@@ -134,15 +150,17 @@ export class TabsMainImpl implements TabsMain, Disposable {
         return `${groupId}~${tabTitle.owner.id}`;
     }
 
-    protected createTabGroupDto(tabBar: TabBar<Widget>): TabGroupDto {
-        const oldDto = this.tabGroupModel.get(tabBar);
+    protected createTabGroupDto(tabBar: TabBar<Widget>, index: number): TabGroupDto {
+        const oldDto = index === 0 ? this.defaultTabGroup : this.tabGroupModel.get(tabBar);
         const groupId = oldDto?.groupId ?? this.groupIdCounter++;
         const tabs = tabBar.titles.map(title => this.createTabDto(title, groupId));
+        const viewColumn = this.viewColumnService.getViewColumn(tabBar.id)
+            ?? this.applicationShell.allTabBars.indexOf(tabBar);
         return {
             groupId,
             tabs,
             isActive: false,
-            viewColumn: 1
+            viewColumn
         };
     }
 
@@ -182,6 +200,12 @@ export class TabsMainImpl implements TabsMain, Disposable {
             return {
                 kind: TabInputKind.TerminalEditorInput
             };
+        } else if (widget instanceof NotebookEditorWidget) {
+            return {
+                kind: TabInputKind.NotebookInput,
+                notebookType: widget.notebookType,
+                uri: toUriComponents(widget.model?.uri.toString() ?? '')
+            };
         }
 
         return { kind: TabInputKind.UnknownInput };
@@ -232,6 +256,9 @@ export class TabsMainImpl implements TabsMain, Disposable {
         }
         const oldTabDto = tabInfo.tab;
         const newTabDto = this.createTabDto(title, tabInfo.group.groupId);
+        if (!oldTabDto.isActive && newTabDto.isActive) {
+            this.currentActiveGroup.tabs.filter(tab => tab.isActive).forEach(tab => tab.isActive = false);
+        }
         if (newTabDto.isActive && !tabInfo.group.isActive) {
             tabInfo.group.isActive = true;
             this.currentActiveGroup.isActive = false;

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

@@ -23,7 +23,7 @@ import { ViewBadge, WebviewOptions, WebviewPanelOptions, WebviewPanelShowOptions
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 import { WebviewWidget, WebviewWidgetIdentifier } from './webview/webview';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ViewColumnService } from './view-column-service';
+import { ViewColumnService } from '@theia/core/lib/browser/shell/view-column-service';
 import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
 import { JSONExt } from '@theia/core/shared/@phosphor/coreutils';
 import { Mutable } from '@theia/core/lib/common/types';

package/src/main/browser/window-activity-tracker.ts

@@ -0,0 +1,96 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { Disposable, Emitter, Event } from '@theia/core';
+
+const CHECK_INACTIVITY_LIMIT = 30;
+const CHECK_INACTIVITY_INTERVAL = 1000;
+
+const eventListenerOptions: AddEventListenerOptions = {
+    passive: true,
+    capture: true
+};
+export class WindowActivityTracker implements Disposable {
+
+    private inactivityCounter = 0; // number of times inactivity was checked since last reset
+    private readonly inactivityLimit = CHECK_INACTIVITY_LIMIT; // number of inactivity checks done before sending inactive signal
+    private readonly checkInactivityInterval = CHECK_INACTIVITY_INTERVAL; // check interval in milliseconds
+    private interval: NodeJS.Timeout | undefined;
+
+    protected readonly onDidChangeActiveStateEmitter = new Emitter<boolean>();
+    private _activeState: boolean = true;
+
+    constructor(readonly win: Window) {
+        this.initializeListeners(this.win);
+    }
+
+    get onDidChangeActiveState(): Event<boolean> {
+        return this.onDidChangeActiveStateEmitter.event;
+    }
+
+    private set activeState(newState: boolean) {
+        if (this._activeState !== newState) {
+            this._activeState = newState;
+            this.onDidChangeActiveStateEmitter.fire(this._activeState);
+        }
+    }
+
+    private initializeListeners(win: Window): void {
+        // currently assumes activity based on key/mouse/touch pressed, not on mouse move or scrolling.
+        win.addEventListener('mousedown', this.resetInactivity, eventListenerOptions);
+        win.addEventListener('keydown', this.resetInactivity, eventListenerOptions);
+        win.addEventListener('touchstart', this.resetInactivity, eventListenerOptions);
+    }
+
+    dispose(): void {
+        this.stopTracking();
+        this.win.removeEventListener('mousedown', this.resetInactivity);
+        this.win.removeEventListener('keydown', this.resetInactivity);
+        this.win.removeEventListener('touchstart', this.resetInactivity);
+
+    }
+
+    // Reset inactivity time
+    private resetInactivity = (): void => {
+        this.inactivityCounter = 0;
+        if (!this.interval) {
+            // it was not active. Set as active and restart tracking inactivity
+            this.activeState = true;
+            this.startTracking();
+        }
+    };
+
+    // Check inactivity status
+    private checkInactivity = (): void => {
+        this.inactivityCounter++;
+        if (this.inactivityCounter >= this.inactivityLimit) {
+            this.activeState = false;
+            this.stopTracking();
+        }
+    };
+
+    public startTracking(): void {
+        this.stopTracking();
+        this.interval = setInterval(this.checkInactivity, this.checkInactivityInterval);
+    }
+
+    public stopTracking(): void {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = undefined;
+        }
+    }
+}

package/src/main/browser/window-state-main.ts

@@ -23,6 +23,7 @@ import { UriComponents } from '../../common/uri-components';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
 import { ExternalUriService } from '@theia/core/lib/browser/external-uri-service';
+import { WindowActivityTracker } from './window-activity-tracker';
 
 export class WindowStateMain implements WindowMain, Disposable {
 
@@ -46,6 +47,10 @@ export class WindowStateMain implements WindowMain, Disposable {
         const fireDidBlur = () => this.onFocusChanged(false);
         window.addEventListener('blur', fireDidBlur);
         this.toDispose.push(Disposable.create(() => window.removeEventListener('blur', fireDidBlur)));
+
+       const tracker = new WindowActivityTracker(window);
+       this.toDispose.push(tracker.onDidChangeActiveState(isActive => this.onActiveStateChanged(isActive)));
+       this.toDispose.push(tracker);
     }
 
     dispose(): void {
@@ -53,7 +58,11 @@ export class WindowStateMain implements WindowMain, Disposable {
     }
 
     private onFocusChanged(focused: boolean): void {
-        this.proxy.$onWindowStateChanged(focused);
+        this.proxy.$onDidChangeWindowFocus(focused);
+    }
+
+    private onActiveStateChanged(isActive: boolean): void {
+        this.proxy.$onDidChangeWindowActive(isActive);
     }
 
     async $openUri(uriComponent: UriComponents): Promise<boolean> {

package/src/main/node/plugin-ext-backend-module.ts

@@ -42,6 +42,10 @@ import { PluginUninstallationManager } from './plugin-uninstallation-manager';
 import { LocalizationServerImpl } from '@theia/core/lib/node/i18n/localization-server';
 import { PluginLocalizationServer } from './plugin-localization-server';
 import { PluginMgmtCliContribution } from './plugin-mgmt-cli-contribution';
+import { PluginRemoteCliContribution } from './plugin-remote-cli-contribution';
+import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { PluginRemoteCopyContribution } from './plugin-remote-copy-contribution';
+import { RemoteCopyContribution } from '@theia/core/lib/node/remote/remote-copy-contribution';
 
 export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
     bind(PluginApiContribution).toSelf().inSingletonScope();
@@ -89,6 +93,11 @@ export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind
     bind(PluginMgmtCliContribution).toSelf().inSingletonScope();
     bind(CliContribution).toService(PluginMgmtCliContribution);
 
+    bind(PluginRemoteCliContribution).toSelf().inSingletonScope();
+    bind(RemoteCliContribution).toService(PluginRemoteCliContribution);
+    bind(PluginRemoteCopyContribution).toSelf().inSingletonScope();
+    bind(RemoteCopyContribution).toService(PluginRemoteCopyContribution);
+
     bind(WebviewBackendSecurityWarnings).toSelf().inSingletonScope();
     bind(BackendApplicationContribution).toService(WebviewBackendSecurityWarnings);
 

package/src/main/node/plugin-remote-cli-contribution.ts

@@ -0,0 +1,36 @@
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox 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 { MaybePromise } from '@theia/core';
+import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { PluginCliContribution } from './plugin-cli-contribution';
+
+@injectable()
+export class PluginRemoteCliContribution implements RemoteCliContribution {
+
+    @inject(PluginCliContribution)
+    protected readonly pluginCliContribution: PluginCliContribution;
+
+    enhanceArgs(context: RemoteCliContext): MaybePromise<string[]> {
+        const pluginsFolder = this.pluginCliContribution.localDir();
+        if (!pluginsFolder) {
+            return [];
+        } else {
+            return ['--plugins=local-dir:./plugins'];
+        }
+    }
+}

package/src/main/node/plugin-remote-copy-contribution.ts

@@ -0,0 +1,36 @@
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox 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 { RemoteCopyContribution, RemoteCopyRegistry } from '@theia/core/lib/node/remote/remote-copy-contribution';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { PluginCliContribution } from './plugin-cli-contribution';
+import { FileUri } from '@theia/core/lib/common/file-uri';
+
+@injectable()
+export class PluginRemoteCopyContribution implements RemoteCopyContribution {
+
+    @inject(PluginCliContribution)
+    protected readonly pluginCliContribution: PluginCliContribution;
+
+    async copy(registry: RemoteCopyRegistry): Promise<void> {
+        const localDir = this.pluginCliContribution.localDir();
+        if (localDir) {
+            const fsPath = FileUri.fsPath(localDir);
+            await registry.directory(fsPath, 'plugins');
+        }
+
+    }
+}

package/src/main/node/plugin-service.ts

@@ -26,7 +26,7 @@ import { environment } from '@theia/core/shared/@theia/application-package/lib/e
 import { WsRequestValidatorContribution } from '@theia/core/lib/node/ws-request-validators';
 import { MaybePromise } from '@theia/core/lib/common';
 import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
-import { BackendRemoteService } from '@theia/core/lib/node/backend-remote-service';
+import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
 
 @injectable()
 export class PluginApiContribution implements BackendApplicationContribution, WsRequestValidatorContribution {

package/src/plugin/custom-editors.ts

@@ -121,7 +121,7 @@ export class CustomEditorsExtImpl implements CustomEditorsExt {
         handler: string,
         viewType: string,
         title: string,
-        widgetOpenerOptions: T | undefined,
+        widgetOpenerOptions: object | undefined,
         options: theia.WebviewPanelOptions & theia.WebviewOptions,
         cancellation: CancellationToken
     ): Promise<void> {

package/src/plugin/plugin-context.ts

@@ -200,6 +200,7 @@ import {
     DocumentPasteEdit,
     DocumentPasteEditKind,
     DocumentPasteTriggerKind,
+    DocumentDropOrPasteEditKind,
     ExternalUriOpenerPriority,
     EditSessionIdentityMatch,
     TerminalOutputAnchor,
@@ -1302,6 +1303,7 @@ export function createAPIFactory(
             MultiDocumentHighlight,
             DocumentLink,
             DocumentDropEdit,
+            DocumentDropOrPasteEditKind,
             CodeLens,
             CodeActionKind,
             CodeActionTrigger,

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 Severity from '@theia/monaco-editor-core/esm/vs/base/common/severity';
 import { ThemeIcon as MonacoThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
+import { Severity } from '@theia/core/lib/common/severity';
 
 const canceledName = 'Canceled';
 /**

package/src/plugin/tabs.ts

@@ -325,8 +325,13 @@ export class TabsExtImpl implements TabsExt {
                 this.activeGroupId = activeTabGroupId;
             }
         }
-        this.onDidChangeTabGroups.fire(Object.freeze({ opened, closed, changed }));
-        this.onDidChangeTabs.fire({ opened: tabsOpened, changed: [], closed: [] });
+
+        if (closed.length > 0 || opened.length > 0 || changed.length > 0) {
+            this.onDidChangeTabGroups.fire(Object.freeze({ opened, closed, changed }));
+        }
+        if (tabsOpened.length > 0) {
+            this.onDidChangeTabs.fire({ opened: tabsOpened, changed: [], closed: [] });
+        }
     }
 
     $acceptTabGroupUpdate(groupDto: TabGroupDto): void {