@theia/plugin-ext 1.70.0-next.7 → 1.70.0-next.71

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

@@ -120,6 +120,8 @@ export class PluginScmProvider implements ScmProvider {
 
     private features: SourceControlProviderFeatures = {};
 
+    get providerContextValue(): string | undefined { return this.features.contextValue; }
+
     get handle(): number { return this._handle; }
     get label(): string { return this._label; }
     get rootUri(): string { return this._rootUri ? this._rootUri.toString() : ''; }
@@ -164,7 +166,8 @@ export class PluginScmProvider implements ScmProvider {
         private readonly _contextValue: string,
         private readonly _label: string,
         private readonly _rootUri: vscodeURI | undefined,
-        private disposables: DisposableCollection
+        private disposables: DisposableCollection,
+        readonly parentHandle?: number
     ) { }
 
     updateSourceControl(features: SourceControlProviderFeatures): void {
@@ -330,17 +333,21 @@ export class ScmMainImpl implements ScmMain {
         this.disposables.dispose();
     }
 
-    async $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined): Promise<void> {
-        const provider = new PluginScmProvider(this.proxy, this.colors, this.sharedStyle, handle, id, label, rootUri ? vscodeURI.revive(rootUri) : undefined, this.disposables);
+    async $registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined, parentHandle?: number): Promise<void> {
+        const provider = new PluginScmProvider(
+            this.proxy, this.colors, this.sharedStyle, handle, id, label,
+            rootUri ? vscodeURI.revive(rootUri) : undefined, this.disposables, parentHandle
+        );
+        const parentRepo = parentHandle !== undefined ? this.repositories.get(parentHandle) : undefined;
         const repository = this.scmService.registerScmProvider(provider, {
             input: {
                 validator: async value => {
                     const result = await this.proxy.$validateInput(handle, value, value.length);
                     return result && { message: result[0], type: result[1] };
                 }
-            }
-        }
-        );
+            },
+            parentRootUri: parentRepo?.provider.rootUri
+        });
         this.repositories.set(handle, repository);
 
         const disposables = new DisposableCollection(

package/src/main/browser/style/plugin-sidebar.css

@@ -71,3 +71,16 @@
 .plugins-tab-icon::before {
   content: "\f0fe";
 }
+
+.theia-plugins .pluginHeaderContainer.pluginDisabledByTrust {
+  opacity: 0.6;
+}
+
+.theia-plugins .pluginRestrictedBadge {
+  font-size: var(--theia-ui-font-size0);
+  color: var(--theia-statusBarItem-prominentForeground);
+  background-color: var(--theia-statusBarItem-prominentBackground);
+  border-radius: 2px;
+  padding: calc(var(--theia-ui-padding) / 3 * 2);
+  white-space: nowrap;
+}

package/src/main/browser/text-editor-main.ts

@@ -95,8 +95,16 @@ export class TextEditorMain implements Disposable {
             this.toDisposeOnEditor.push(this.editor.onSelectionChanged(_ => {
                 this.updateProperties();
             }));
-            this.toDisposeOnEditor.push(monacoEditor.onDidChangeModel(() => {
-                this.setEditor(undefined);
+            this.toDisposeOnEditor.push(monacoEditor.onDidChangeModel(e => {
+                // Ignore visibility-related model changes (null ↔ model) triggered by
+                // the setModel(null) workaround in MonacoEditor.handleVisibilityChanged().
+                // cf. https://github.com/eclipse-theia/theia/issues/14880
+                // Only react to genuine model swaps where both old and new models exist.
+                // In practice, this condition is never met because MonacoEditor instances
+                // are created with a fixed document and never swap to a different model.
+                if (e.oldModelUrl && e.newModelUrl) {
+                    this.setEditor(undefined);
+                }
             }));
             this.toDisposeOnEditor.push(monacoEditor.onDidChangeCursorSelection(e => {
                 this.updateProperties(e.source);
@@ -139,6 +147,10 @@ export class TextEditorMain implements Disposable {
         return this.editor.diffInformation;
     }
 
+    getDiffEditor(): MonacoDiffEditor | undefined {
+        return this.editor instanceof MonacoDiffEditor ? this.editor : undefined;
+    }
+
     setSelections(selections: Selection[]): void {
         if (this.editor) {
             this.editor.getControl().setSelections(selections);

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

@@ -49,6 +49,11 @@ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/stan
 import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
 import { type ILineChange } from '@theia/monaco-editor-core/esm/vs/editor/common/diff/legacyLinesDiffComputer';
 import { ArrayUtils, URI } from '@theia/core';
+import { DiffUris } from '@theia/core/lib/browser/diff-uris';
+import { TextEditorChangeKind } from '../../plugin/types-impl';
+import { Change } from '@theia/scm/lib/browser/dirty-diff/diff-computer';
+import { DirtyDiffUpdate } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-decorator';
+import { ScmDecorationsService } from '@theia/scm/lib/browser/decorations/scm-decorations-service';
 import { toNotebookWorspaceEdit } from './notebooks/notebooks-main';
 import { interfaces } from '@theia/core/shared/inversify';
 import { NotebookService } from '@theia/notebook/lib/browser';
@@ -62,6 +67,7 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
     private readonly bulkEditService: MonacoBulkEditService;
     private readonly notebookService: NotebookService;
+    private readonly scmDecorationsService: ScmDecorationsService;
 
     constructor(
         private readonly editorsAndDocuments: EditorsAndDocumentsMain,
@@ -73,10 +79,12 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
         this.bulkEditService = container.get(MonacoBulkEditService);
         this.notebookService = container.get(NotebookService);
+        this.scmDecorationsService = container.get(ScmDecorationsService);
 
         this.toDispose.push(editorsAndDocuments);
         this.toDispose.push(editorsAndDocuments.onTextEditorAdd(editors => editors.forEach(this.onTextEditorAdd, this)));
         this.toDispose.push(editorsAndDocuments.onTextEditorRemove(editors => editors.forEach(this.onTextEditorRemove, this)));
+        this.toDispose.push(this.scmDecorationsService.onDirtyDiffUpdate(update => this.onDirtyDiffUpdate(update)));
     }
 
     dispose(): void {
@@ -93,6 +101,130 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         );
         this.editorsToDispose.set(id, toDispose);
         this.toDispose.push(toDispose);
+
+        const diffEditor = editor.getDiffEditor();
+        if (diffEditor) {
+            const pushDiffEditorInfo = () => this.pushDiffEditorDiffInformation(id, editor);
+            toDispose.push(diffEditor.diffEditor.onDidUpdateDiff(pushDiffEditorInfo));
+            pushDiffEditorInfo();
+        }
+    }
+
+    private onDirtyDiffUpdate(update: DirtyDiffUpdate): void {
+        const editorUri = update.editor.uri.toString();
+        const editorIds = this.findEditorIdsByUri(editorUri, true);
+        if (editorIds.length === 0) {
+            return;
+        }
+
+        const originalUri = update.previousRevisionUri?.toComponents();
+
+        const changes = update.changes.map(change => {
+            let kind: TextEditorChangeKind;
+            if (Change.isAddition(change)) {
+                kind = TextEditorChangeKind.Addition;
+            } else if (Change.isRemoval(change)) {
+                kind = TextEditorChangeKind.Deletion;
+            } else {
+                kind = TextEditorChangeKind.Modification;
+            }
+            return {
+                original: {
+                    startLineNumber: change.previousRange.start + 1,
+                    endLineNumberExclusive: change.previousRange.end + 1
+                },
+                modified: {
+                    startLineNumber: change.currentRange.start + 1,
+                    endLineNumberExclusive: change.currentRange.end + 1
+                },
+                kind
+            };
+        });
+
+        // Push diff information to all editors with this URI (regular editors and diff editor modified sides).
+        for (const editorId of editorIds) {
+            const editor = this.editorsAndDocuments.getEditor(editorId);
+            if (!editor) {
+                continue;
+            }
+            const model = editor.getModel();
+            const modifiedUri = URI.fromComponents(model.uri).toComponents();
+            this.proxy.$acceptEditorDiffInformation(editorId, [{
+                documentVersion: model.getVersionId(),
+                original: originalUri,
+                modified: modifiedUri,
+                changes,
+                isStale: false
+            }]);
+        }
+    }
+
+    private pushDiffEditorDiffInformation(id: string, editor: TextEditorMain): void {
+        const diffEditor = editor.getDiffEditor();
+        if (!diffEditor) {
+            return;
+        }
+
+        let originalUri: UriComponents | undefined;
+        let modifiedUri: UriComponents;
+
+        try {
+            const [left, right] = DiffUris.decode(diffEditor.uri);
+            originalUri = left.toComponents();
+            modifiedUri = right.toComponents();
+        } catch {
+            // Not a valid DiffUri; fall back to model URIs
+            originalUri = new URI(diffEditor.originalModel.uri).toComponents();
+            modifiedUri = new URI(diffEditor.modifiedModel.uri).toComponents();
+        }
+
+        const lineChanges = diffEditor.diffInformation;
+
+        const changes = lineChanges.map(change => {
+            let kind: TextEditorChangeKind;
+            if (change.originalEndLineNumber === 0) {
+                kind = TextEditorChangeKind.Addition;
+            } else if (change.modifiedEndLineNumber === 0) {
+                kind = TextEditorChangeKind.Deletion;
+            } else {
+                kind = TextEditorChangeKind.Modification;
+            }
+
+            // ILineChange uses 1-based lines where 0 means empty range.
+            // TextEditorLineRange uses 1-based startLineNumber and endLineNumberExclusive.
+            const toLineRange = (start: number, end: number) => end === 0
+                ? { startLineNumber: start + 1, endLineNumberExclusive: start + 1 }
+                : { startLineNumber: start, endLineNumberExclusive: end + 1 };
+
+            return {
+                original: toLineRange(change.originalStartLineNumber, change.originalEndLineNumber),
+                modified: toLineRange(change.modifiedStartLineNumber, change.modifiedEndLineNumber),
+                kind
+            };
+        });
+
+        const model = editor.getModel();
+        this.proxy.$acceptEditorDiffInformation(id, [{
+            documentVersion: model.getVersionId(),
+            original: originalUri,
+            modified: modifiedUri,
+            changes,
+            isStale: false
+        }]);
+    }
+
+    private findEditorIdsByUri(uri: string, excludeDiffEditors = false): string[] {
+        const ids: string[] = [];
+        for (const id of this.editorsToDispose.keys()) {
+            const editor = this.editorsAndDocuments.getEditor(id);
+            if (editor && editor.getModel().uri.toString() === uri) {
+                if (excludeDiffEditors && editor.getDiffEditor()) {
+                    continue;
+                }
+                ids.push(id);
+            }
+        }
+        return ids;
     }
 
     private onTextEditorRemove(id: string): void {

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

@@ -24,7 +24,9 @@ import { ViewContainer, View, ViewWelcome, PluginViewType } from '../../../commo
 import { PluginSharedStyle } from '../plugin-shared-style';
 import { DebugWidget } from '@theia/debug/lib/browser/view/debug-widget';
 import { PluginViewWidget, PluginViewWidgetIdentifier } from './plugin-view-widget';
-import { SCM_VIEW_CONTAINER_ID, ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
+import { SCM_VIEW_CONTAINER_ID, SCM_WIDGET_FACTORY_ID, ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
+import { ScmWidget } from '@theia/scm/lib/browser/scm-widget';
+import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
 import { EXPLORER_VIEW_CONTAINER_ID, FileNavigatorWidget, FILE_NAVIGATOR_ID } from '@theia/navigator/lib/browser';
 import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
 import { DebugFrontendApplicationContribution } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
@@ -187,6 +189,17 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                 }));
                 disposable.push(event.widget.onDidDispose(() => disposable.dispose()));
             }
+            if (event.widget instanceof ScmWidget) {
+                const disposable = new DisposableCollection();
+                disposable.push(this.registerViewWelcome({
+                    view: 'scm',
+                    content: nls.localizeByDefault('None of the registered source control providers work in Restricted Mode.')
+                        + `\n[${nls.localizeByDefault('Manage Workspace Trust')}](command:workspace:manageTrust)`,
+                    when: '!isWorkspaceTrusted',
+                    order: 0
+                }));
+                disposable.push(event.widget.onDidDispose(() => disposable.dispose()));
+            }
         });
         this.contextKeyService.onDidChange(e => {
             for (const [, view] of this.views.values()) {
@@ -561,6 +574,10 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         switch (viewId) {
             case 'explorer':
                 return this.widgetManager.getWidget<TreeViewWelcomeWidget>(FILE_NAVIGATOR_ID);
+            case 'scm': {
+                const scmWidget = await this.widgetManager.getWidget<ScmWidget>(SCM_WIDGET_FACTORY_ID);
+                return scmWidget?.resourceWidget as ScmTreeWidget | undefined;
+            }
             default:
                 return this.widgetManager.getWidget<TreeViewWelcomeWidget>(PLUGIN_VIEW_DATA_FACTORY_ID, { id: viewId });
         }

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

@@ -154,29 +154,29 @@ globalThis.acquireVsCodeApi = (function() {
 
     let state = ${state ? `JSON.parse(${JSON.stringify(state)})` : undefined};
 
-    const forwardConsoleLog = (level, msg, args) => {
+    const forwardConsoleLog = (level, msg, ...args) => {
         let message, optionalParams;
         try {
             if (msg) {
                 message = JSON.stringify(msg) ?? null;
             }
-            if (args) {
+            if (args.length > 0) {
                 optionalParams = JSON.stringify(args) ?? null;
             }
         } catch (e) {
             // Log non serializable objects inside of view
-            originalConsole[level](msg, args);
+            originalConsole[level](msg, ...args);
             return;
         }
         originalPostMessage({ command: 'onconsole', data: { level, message, optionalParams } }, targetOrigin);
     };
 
-    console.log = (message, args) => forwardConsoleLog('log', message, args);
-    console.info = (message, args) => forwardConsoleLog('info', message, args);
-    console.warn = (message, args) => forwardConsoleLog('warn', message, args);
-    console.error = (message, args) => forwardConsoleLog('error', message, args);
-    console.debug = (message, args) => forwardConsoleLog('debug', message, args);
-    console.trace = (message, args) => forwardConsoleLog('trace', message, args);
+    console.log = (message, ...args) => forwardConsoleLog('log', message, ...args);
+    console.info = (message, ...args) => forwardConsoleLog('info', message, ...args);
+    console.warn = (message, ...args) => forwardConsoleLog('warn', message, ...args);
+    console.error = (message, ...args) => forwardConsoleLog('error', message, ...args);
+    console.debug = (message, ...args) => forwardConsoleLog('debug', message, ...args);
+    console.trace = (message, ...args) => forwardConsoleLog('trace', message, ...args);
 
     return () => {
         if (acquired) {

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

@@ -475,7 +475,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
     protected forwardConsoleLog(log: WebviewConsoleLog): void {
         const message = `[webview: ${this.identifier.id}] ${log.message ? JSON.parse(log.message) : undefined}`;
         if (log.optionalParams !== undefined) {
-            console[log.level](message, JSON.parse(log.optionalParams));
+            console[log.level](message, ...JSON.parse(log.optionalParams));
         } else {
             console[log.level](message);
         }

package/src/main/common/plugin-host-environment-preferences.ts

@@ -0,0 +1,48 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { interfaces } from '@theia/core/shared/inversify';
+import { PreferenceContribution, PreferenceSchema } from '@theia/core/lib/common/preferences';
+import { nls } from '@theia/core/lib/common/nls';
+
+export const SUPPORT_NODE_GLOBAL_NAVIGATOR_PREF = 'extensions.supportNodeGlobalNavigator';
+
+export const PluginHostEnvironmentPreferenceSchema: PreferenceSchema = {
+    properties: {
+        [SUPPORT_NODE_GLOBAL_NAVIGATOR_PREF]: {
+            type: 'boolean',
+            description: nls.localize('theia/plugin-ext/supportNodeGlobalNavigator',
+                'If enabled, the global navigator object in the extension host will be defined as provided by Node.js. '
+                + 'Extensions may use the presence of the navigator object as a hint that code is running in a browser. '
+                + 'Disabling this (the default) undefines the navigator in the extension host to preserve this assumption.'),
+            default: false,
+        }
+    }
+};
+
+/**
+ * Mutable state holder for the navigator preference, injected as a constant value
+ * so it can be safely resolved in connection-scoped containers (no async dependencies).
+ */
+export const PluginHostNavigatorState = Symbol('PluginHostNavigatorState');
+export interface PluginHostNavigatorState {
+    supportNodeGlobalNavigator: boolean;
+}
+
+export function bindPluginHostEnvironmentPreferences(bind: interfaces.Bind): void {
+    bind(PreferenceContribution).toConstantValue({ schema: PluginHostEnvironmentPreferenceSchema });
+    bind(PluginHostNavigatorState).toConstantValue({ supportNodeGlobalNavigator: false });
+}

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

@@ -181,6 +181,7 @@ export class PluginDeployerImpl implements PluginDeployer {
         const hasBeenVisited = (id: string) => visited.has(id) || (visited.add(id), false);
         const pluginsToDeploy = new Map<PluginIdentifiers.VersionedId, PluginDeployerEntry>();
         const unversionedIdsHandled = new Map<PluginIdentifiers.UnversionedId, string[]>();
+        const errors: Error[] = [];
 
         const queue: UnresolvedPluginEntry[] = [...plugins];
         while (queue.length) {
@@ -215,6 +216,7 @@ export class PluginDeployerImpl implements PluginDeployer {
                     }
                 } catch (e) {
                     console.error(`Failed to resolve plugins from '${entry.id}'`, e);
+                    errors.push(e instanceof Error ? e : new Error(String(e)));
                 }
             }));
             queue.length = 0;
@@ -229,6 +231,9 @@ export class PluginDeployerImpl implements PluginDeployer {
                 }
             }
         }
+        if (pluginsToDeploy.size === 0 && errors.length > 0) {
+            throw errors[0];
+        }
         return [...pluginsToDeploy.values()];
     }
 

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

@@ -47,6 +47,8 @@ import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-co
 import { PluginRemoteCopyContribution } from './plugin-remote-copy-contribution';
 import { RemoteCopyContribution } from '@theia/core/lib/node/remote/remote-copy-contribution';
 import { bindWebviewPreferences } from '../common/webview-preferences';
+import { bindPluginHostEnvironmentPreferences } from '../common/plugin-host-environment-preferences';
+import { PluginHostNavigatorStateInitializer } from './plugin-host-navigator-state-initializer';
 
 export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
     bind(PluginApiContribution).toSelf().inSingletonScope();
@@ -104,5 +106,7 @@ export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind
 
     rebind(LocalizationServerImpl).to(PluginLocalizationServer).inSingletonScope();
     bindWebviewPreferences(bind);
-
+    bindPluginHostEnvironmentPreferences(bind);
+    bind(PluginHostNavigatorStateInitializer).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(PluginHostNavigatorStateInitializer);
 }

package/src/main/node/plugin-host-navigator-state-initializer.ts

@@ -0,0 +1,47 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { PreferenceService } from '@theia/core/lib/common/preferences';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { PluginHostNavigatorState, SUPPORT_NODE_GLOBAL_NAVIGATOR_PREF } from '../common/plugin-host-environment-preferences';
+
+/**
+ * Keeps {@link PluginHostNavigatorState} in sync with the navigator preference.
+ *
+ * `PreferenceService` has async dependencies and cannot be injected in
+ * connection-scoped containers. This contribution runs in the root container
+ * and mutates the shared state object by reference so that
+ * `HostedPluginProcess` (connection-scoped) always sees the latest value.
+ */
+@injectable()
+export class PluginHostNavigatorStateInitializer implements BackendApplicationContribution {
+
+    @inject(PreferenceService)
+    protected readonly preferences: PreferenceService;
+
+    @inject(PluginHostNavigatorState)
+    protected readonly state: PluginHostNavigatorState;
+
+    onStart(): void {
+        this.state.supportNodeGlobalNavigator = this.preferences.get<boolean>(SUPPORT_NODE_GLOBAL_NAVIGATOR_PREF, false);
+        this.preferences.onPreferenceChanged(e => {
+            if (e.preferenceName === SUPPORT_NODE_GLOBAL_NAVIGATOR_PREF) {
+                this.state.supportNodeGlobalNavigator = this.preferences.get<boolean>(SUPPORT_NODE_GLOBAL_NAVIGATOR_PREF, false);
+            }
+        });
+    }
+}

package/src/plugin/command-registry.ts

@@ -22,10 +22,11 @@ import * as theia from '@theia/plugin';
 import * as model from '../common/plugin-api-rpc-model';
 import { CommandRegistryExt, PLUGIN_RPC_CONTEXT as Ext, CommandRegistryMain } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Disposable } from './types-impl';
+import { Disposable, URI } from './types-impl';
 import { DisposableCollection } from '@theia/core';
 import { KnownCommands } from './known-commands';
 import { ArgumentProcessor } from '../common/commands';
+import { isUriComponents } from './type-converters';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Handler = <T>(...args: any[]) => T | PromiseLike<T | undefined>;
@@ -42,6 +43,16 @@ export class CommandRegistryImpl implements CommandRegistryExt {
         this.proxy = rpc.getProxy(Ext.COMMAND_REGISTRY_MAIN);
         this.argumentProcessors = [];
         this.commandsConverter = new CommandsConverter(this);
+        this.registerArgumentProcessor({
+            processArgument: arg => {
+                // Revive URI-like plain objects that lost their class identity during RPC/JSON serialization
+                // (e.g. command arguments from markdown links parsed by CommandOpenHandler)
+                if (isUriComponents(arg) && !(arg instanceof URI)) {
+                    return URI.revive(arg);
+                }
+                return arg;
+            }
+        });
     }
 
     get converter(): CommandsConverter {

package/src/plugin/env.ts

@@ -108,6 +108,14 @@ export abstract class EnvExtImpl {
 
     abstract get isNewAppInstall(): boolean;
 
+    /**
+     * @stubbed
+     * Portable mode detection is not yet communicated to the plugin host.
+     */
+    get isAppPortable(): boolean {
+        return false;
+    }
+
     get appHost(): string {
         return this.host;
     }

package/src/plugin/file-system-event-service-ext-impl.ts

@@ -30,7 +30,7 @@
 
 import { Emitter, WaitUntilEvent, AsyncEmitter, WaitUntilData } from '@theia/core/lib/common/event';
 import { IRelativePattern, parse } from '@theia/core/lib/common/glob';
-import { UriComponents } from '@theia/core/shared/vscode-uri';
+import { UriComponents } from '../common/uri-components';
 import { Disposable, URI, WorkspaceEdit } from './types-impl';
 import { EditorsAndDocumentsExtImpl as ExtHostDocumentsAndEditors } from './editors-and-documents';
 import type * as vscode from '@theia/plugin';

package/src/plugin/file-system-ext-impl.ts

@@ -28,14 +28,13 @@
 /* eslint-disable @typescript-eslint/tslint/config */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { UriComponents } from '@theia/core/shared/vscode-uri';
+import { Schemes as Schemas, UriComponents } from '../common/uri-components';
 import { FileChangeType, FileSystemError, URI } from './types-impl';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { PLUGIN_RPC_CONTEXT, FileSystemExt, FileSystemMain, IFileChangeDto } from '../common/plugin-api-rpc';
 import * as vscode from '@theia/plugin';
 import * as files from '@theia/filesystem/lib/common/files';
 import * as typeConverter from './type-converters';
-import { Schemes as Schemas } from '../common/uri-components';
 import { State, StateMachine, LinkComputer, Edge } from '../common/link-computer';
 import { commonPrefixLength } from '@theia/core/lib/common/strings';
 import { CharCode } from '@theia/core/lib/common/char-code';

package/src/plugin/plugin-context.ts

@@ -930,6 +930,7 @@ export function createAPIFactory(
             get appHost(): string { return envExt.appHost; },
             get language(): string { return envExt.language; },
             get isNewAppInstall(): boolean { return envExt.isNewAppInstall; },
+            get isAppPortable(): boolean { return envExt.isAppPortable; },
             get isTelemetryEnabled(): boolean { return telemetryExt.isTelemetryEnabled; },
             get onDidChangeTelemetryEnabled(): theia.Event<boolean> {
                 return telemetryExt.onDidChangeTelemetryEnabled;
@@ -1285,8 +1286,8 @@ export function createAPIFactory(
                     throw new Error('Input box not found!');
                 }
             },
-            createSourceControl(id: string, label: string, rootUri?: URI): theia.SourceControl {
-                return createAPIObject(scmExt.createSourceControl(plugin, id, label, rootUri));
+            createSourceControl(id: string, label: string, rootUri?: URI, iconPath?: theia.IconPath, parent?: theia.SourceControl): theia.SourceControl {
+                return createAPIObject(scmExt.createSourceControl(plugin, id, label, rootUri, iconPath, parent));
             }
         };
 

package/src/plugin/scm.ts

@@ -676,12 +676,23 @@ class SourceControlImpl implements theia.SourceControl {
     private readonly onDidChangeSelectionEmitter = new Emitter<boolean>();
     readonly onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
 
+    private _contextValue: string | undefined = undefined;
+
+    get contextValue(): string | undefined {
+        return this._contextValue;
+    }
+
+    set contextValue(contextValue: string | undefined) {
+        this._contextValue = contextValue;
+        this.proxy.$updateSourceControl(this.handle, { contextValue });
+    }
+
     private readonly onDidDisposeEmitter = new Emitter<void>();
     readonly onDidDispose = this.onDidDisposeEmitter.event;
 
     readonly onDidDisposeParent: Event<void>;
 
-    private handle: number = SourceControlImpl.handlePool++;
+    readonly handle: number = SourceControlImpl.handlePool++;
 
     constructor(
         private plugin: Plugin,
@@ -694,7 +705,7 @@ class SourceControlImpl implements theia.SourceControl {
         _parent?: SourceControlImpl
     ) {
         this.inputBox = new ScmInputBoxImpl(plugin, this.proxy, this.handle);
-        this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri);
+        this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, _parent?.handle);
         this.onDidDisposeParent = _parent ? _parent.onDidDispose : Event.None;
     }
 
@@ -824,9 +835,11 @@ export class ScmExtImpl implements ScmExt {
         });
     }
 
-    createSourceControl(extension: Plugin, id: string, label: string, rootUri: theia.Uri | undefined): theia.SourceControl {
+    createSourceControl(extension: Plugin, id: string, label: string, rootUri: theia.Uri | undefined,
+        iconPath?: theia.IconPath, parent?: theia.SourceControl): theia.SourceControl {
         const handle = ScmExtImpl.handlePool++;
-        const sourceControl = new SourceControlImpl(extension, this.proxy, this.commands, id, label, rootUri);
+        const parentImpl = parent ? this.findSourceControlImpl(parent) : undefined;
+        const sourceControl = new SourceControlImpl(extension, this.proxy, this.commands, id, label, rootUri, iconPath, parentImpl);
         this.sourceControls.set(handle, sourceControl);
 
         const sourceControls = this.sourceControlsByExtension.get(extension.model.id) || [];
@@ -836,6 +849,15 @@ export class ScmExtImpl implements ScmExt {
         return sourceControl;
     }
 
+    private findSourceControlImpl(apiObject: theia.SourceControl): SourceControlImpl | undefined {
+        for (const impl of this.sourceControls.values()) {
+            if (impl.id === apiObject.id && impl.rootUri?.toString() === apiObject.rootUri?.toString()) {
+                return impl;
+            }
+        }
+        return undefined;
+    }
+
     getLastInputBox(extension: Plugin): ScmInputBoxImpl | undefined {
         const sourceControls = this.sourceControlsByExtension.get(extension.model.id);
         const sourceControl = sourceControls && sourceControls[sourceControls.length - 1];