@theia/plugin-ext 1.71.0-next.8 → 1.71.0

package/package.json

@@ -1,55 +1,55 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.71.0-next.8+8ec70800c",
+  "version": "1.71.0",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/ai-mcp": "1.71.0-next.8+8ec70800c",
-    "@theia/bulk-edit": "1.71.0-next.8+8ec70800c",
-    "@theia/callhierarchy": "1.71.0-next.8+8ec70800c",
-    "@theia/console": "1.71.0-next.8+8ec70800c",
-    "@theia/core": "1.71.0-next.8+8ec70800c",
-    "@theia/debug": "1.71.0-next.8+8ec70800c",
-    "@theia/editor": "1.71.0-next.8+8ec70800c",
-    "@theia/editor-preview": "1.71.0-next.8+8ec70800c",
-    "@theia/file-search": "1.71.0-next.8+8ec70800c",
-    "@theia/filesystem": "1.71.0-next.8+8ec70800c",
-    "@theia/markers": "1.71.0-next.8+8ec70800c",
-    "@theia/messages": "1.71.0-next.8+8ec70800c",
-    "@theia/monaco": "1.71.0-next.8+8ec70800c",
+    "@theia/ai-mcp": "1.71.0",
+    "@theia/bulk-edit": "1.71.0",
+    "@theia/callhierarchy": "1.71.0",
+    "@theia/console": "1.71.0",
+    "@theia/core": "1.71.0",
+    "@theia/debug": "1.71.0",
+    "@theia/editor": "1.71.0",
+    "@theia/editor-preview": "1.71.0",
+    "@theia/file-search": "1.71.0",
+    "@theia/filesystem": "1.71.0",
+    "@theia/markers": "1.71.0",
+    "@theia/messages": "1.71.0",
+    "@theia/monaco": "1.71.0",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/navigator": "1.71.0-next.8+8ec70800c",
-    "@theia/notebook": "1.71.0-next.8+8ec70800c",
-    "@theia/output": "1.71.0-next.8+8ec70800c",
-    "@theia/plugin": "1.71.0-next.8+8ec70800c",
-    "@theia/preferences": "1.71.0-next.8+8ec70800c",
-    "@theia/scm": "1.71.0-next.8+8ec70800c",
-    "@theia/search-in-workspace": "1.71.0-next.8+8ec70800c",
-    "@theia/task": "1.71.0-next.8+8ec70800c",
-    "@theia/terminal": "1.71.0-next.8+8ec70800c",
-    "@theia/test": "1.71.0-next.8+8ec70800c",
-    "@theia/timeline": "1.71.0-next.8+8ec70800c",
-    "@theia/typehierarchy": "1.71.0-next.8+8ec70800c",
-    "@theia/variable-resolver": "1.71.0-next.8+8ec70800c",
-    "@theia/workspace": "1.71.0-next.8+8ec70800c",
-    "@types/mime": "^2.0.1",
-    "@vscode/debugprotocol": "^1.51.0",
+    "@theia/navigator": "1.71.0",
+    "@theia/notebook": "1.71.0",
+    "@theia/output": "1.71.0",
+    "@theia/plugin": "1.71.0",
+    "@theia/preferences": "1.71.0",
+    "@theia/scm": "1.71.0",
+    "@theia/search-in-workspace": "1.71.0",
+    "@theia/task": "1.71.0",
+    "@theia/terminal": "1.71.0",
+    "@theia/test": "1.71.0",
+    "@theia/timeline": "1.71.0",
+    "@theia/typehierarchy": "1.71.0",
+    "@theia/variable-resolver": "1.71.0",
+    "@theia/workspace": "1.71.0",
+    "@types/mime": "^2.0.3",
+    "@vscode/debugprotocol": "^1.68.0",
     "@vscode/proxy-agent": "^0.13.2",
-    "async-mutex": "^0.4.0",
+    "async-mutex": "^0.4.1",
     "decompress": "^4.2.1",
     "escape-html": "^1.0.3",
-    "filenamify": "^4.1.0",
+    "filenamify": "^4.3.0",
     "is-electron": "^2.2.0",
-    "jsonc-parser": "^2.2.0",
+    "jsonc-parser": "^2.3.1",
     "lodash.clonedeep": "^4.5.0",
-    "macaddress": "^0.5.3",
-    "mime": "^2.4.4",
+    "macaddress": "^0.5.4",
+    "mime": "^2.6.0",
     "node-pty": "1.2.0-beta.12",
-    "semver": "^7.5.4",
+    "semver": "^7.7.4",
     "tslib": "^2.6.2",
     "vhost": "^3.0.2",
-    "vscode-textmate": "^9.2.0"
+    "vscode-textmate": "^9.3.2"
   },
   "publishConfig": {
     "access": "public"
@@ -89,7 +89,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.70.0",
+    "@theia/ext-scripts": "1.71.0",
     "@types/decompress": "^4.2.2",
     "@types/escape-html": "^0.0.20",
     "@types/lodash.clonedeep": "^4.5.3"
@@ -97,5 +97,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "8ec70800c488b9fc44915e8896636628b7cb8636"
+  "gitHead": "d8a596fc99f0a8e68b466828ed162569d79e3a71"
 }

package/src/common/plugin-api-rpc.ts

@@ -962,6 +962,17 @@ export namespace ScmCommandArg {
     }
 }
 
+export interface ScmHistoryItemCommandArg {
+    sourceControlHandle: number;
+    id: string;
+    type: 'historyItem' | 'historyItemRef';
+}
+export namespace ScmHistoryItemCommandArg {
+    export function is(arg: unknown): arg is ScmHistoryItemCommandArg {
+        return isObject(arg) && 'sourceControlHandle' in arg && 'id' in arg && 'type' in arg;
+    }
+}
+
 export interface ScmExt {
     createSourceControl(plugin: Plugin, id: string, label: string, rootUri?: theia.Uri): theia.SourceControl;
     getLastInputBox(plugin: Plugin): theia.SourceControlInputBox | undefined;
@@ -970,6 +981,11 @@ export interface ScmExt {
     $validateInput(sourceControlHandle: number, value: string, cursorPosition: number): Promise<[string, number] | undefined>;
     $setSelectedSourceControl(selectedSourceControlHandle: number | undefined): Promise<void>;
     $provideOriginalResource(sourceControlHandle: number, uri: string, token: theia.CancellationToken): Promise<UriComponents | undefined>;
+    $provideHistoryItemRefs(sourceControlHandle: number, historyItemRefs: string[] | undefined, token: theia.CancellationToken): Promise<ScmHistoryItemRefDto[] | undefined>;
+    $provideHistoryItems(sourceControlHandle: number, options: ScmHistoryOptionsDto, token: theia.CancellationToken): Promise<ScmHistoryItemDto[] | undefined>;
+    $provideHistoryItemChanges(sourceControlHandle: number, historyItemId: string, historyItemParentId: string | undefined, token: theia.CancellationToken): Promise<ScmHistoryItemChangeDto[] | undefined>;
+    $resolveHistoryItem(sourceControlHandle: number, historyItemId: string, token: theia.CancellationToken): Promise<ScmHistoryItemDto | undefined>;
+    $resolveHistoryItemRefsCommonAncestor(sourceControlHandle: number, historyItemRefs: string[], token: theia.CancellationToken): Promise<string | undefined>;
 }
 
 export namespace TimelineCommandArg {
@@ -1054,6 +1070,8 @@ export interface ScmMain {
     $setInputBoxEnabled(sourceControlHandle: number, enabled: boolean): void;
 
     $setActionButton(sourceControlHandle: number, actionButton: ScmActionButton | undefined): void;
+    $onDidChangeCurrentHistoryItemRefs(sourceControlHandle: number): void;
+    $onDidChangeHistoryItemRefs(sourceControlHandle: number, event: ScmHistoryItemRefsChangeEventDto): void;
 }
 
 export interface SourceControlProviderFeatures {
@@ -1063,6 +1081,10 @@ export interface SourceControlProviderFeatures {
     acceptInputCommand?: Command;
     statusBarCommands?: Command[];
     contextValue?: string;
+    hasHistoryProvider?: boolean;
+    currentHistoryItemRef?: ScmHistoryItemRefDto;
+    currentHistoryItemRemoteRef?: ScmHistoryItemRefDto;
+    currentHistoryItemBaseRef?: ScmHistoryItemRefDto;
 }
 
 export interface SourceControlGroupFeatures {
@@ -1099,6 +1121,56 @@ export interface ScmRawResourceSplices {
     splices: ScmRawResourceSplice[]
 }
 
+export interface ScmHistoryItemRefDto {
+    id: string;
+    name: string;
+    description?: string;
+    revision?: string;
+    icon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+    category?: string;
+}
+
+export interface ScmHistoryItemRefsChangeEventDto {
+    added: ScmHistoryItemRefDto[];
+    removed: ScmHistoryItemRefDto[];
+    modified: ScmHistoryItemRefDto[];
+}
+
+export interface ScmHistoryItemStatisticsDto {
+    files: number;
+    insertions: number;
+    deletions: number;
+}
+
+export interface ScmHistoryItemDto {
+    id: string;
+    parentIds?: string[];
+    subject: string;
+    message?: string | MarkdownString;
+    author?: string;
+    authorEmail?: string;
+    authorIcon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+    displayId?: string;
+    timestamp?: number;
+    tooltip?: string | MarkdownString;
+    statistics?: ScmHistoryItemStatisticsDto;
+    references?: ScmHistoryItemRefDto[];
+}
+
+export interface ScmHistoryItemChangeDto {
+    uri: UriComponents;
+    originalUri?: UriComponents;
+    modifiedUri?: UriComponents;
+    renameUri?: UriComponents;
+}
+
+export interface ScmHistoryOptionsDto {
+    skip?: number;
+    limit?: number | { id?: string };
+    historyItemRefs?: string[];
+    filterText?: string;
+}
+
 export interface SourceControlResourceState {
     readonly handle: number
     /**
@@ -2120,6 +2192,11 @@ export interface ExtHostFileSystemEventServiceShape {
     $onDidRunFileOperation(operation: files.FileOperation, target: UriComponents, source: UriComponents | undefined): void;
 }
 
+export interface MainFileSystemEventServiceShape {
+    $watch(session: number, resource: UriComponents, opts: files.WatchOptions): void;
+    $unwatch(session: number): void;
+}
+
 export interface ClipboardMain {
     $readText(): Promise<string>;
     $writeText(value: string): Promise<void>;
@@ -2384,6 +2461,7 @@ export const PLUGIN_RPC_CONTEXT = {
     TASKS_MAIN: createProxyIdentifier<TasksMain>('TasksMain'),
     DEBUG_MAIN: createProxyIdentifier<DebugMain>('DebugMain'),
     FILE_SYSTEM_MAIN: createProxyIdentifier<FileSystemMain>('FileSystemMain'),
+    FILE_SYSTEM_EVENT_SERVICE_MAIN: createProxyIdentifier<MainFileSystemEventServiceShape>('FileSystemEventServiceMain'),
     SCM_MAIN: createProxyIdentifier<ScmMain>('ScmMain'),
     SECRETS_MAIN: createProxyIdentifier<SecretsMain>('SecretsMain'),
     DECORATIONS_MAIN: createProxyIdentifier<DecorationsMain>('DecorationsMain'),

package/src/hosted/browser/hosted-plugin.ts

@@ -267,10 +267,12 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
     }
 
     protected override async beforeLoadContributions(toDisconnect: DisposableCollection): Promise<void> {
-        // make sure that the previous state, including plugin widgets, is restored
-        // and core layout is initialized, i.e. explorer, scm, debug views are already added to the shell
-        // but shell is not yet revealed
-        await this.appState.reachedState('initialized_layout');
+        // Make sure the shell is attached so that registries (commands, menus, views, etc.)
+        // are ready to accept contributions. We intentionally do NOT wait for initialized_layout
+        // here, because layout restoration may depend on plugin-provided file system providers
+        // (e.g. git: scheme for merge editors), and those providers are registered during
+        // startPlugins which runs after this point. Waiting for initialized_layout would deadlock.
+        await this.appState.reachedState('attached_shell');
         this.workspaceTrusted = await this.workspaceTrustService.getWorkspaceTrust();
     }
 
@@ -464,12 +466,17 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
     }
 
     protected ensureFileSystemActivation(event: FileSystemProviderActivationEvent): void {
-        event.waitUntil(this.activateByFileSystem(event).then(() => {
+        event.waitUntil((async () => {
+            // Wait until plugins are synced so that activation events are recorded
+            // and will be replayed when managers start. This does not depend on
+            // layout initialization, so it cannot deadlock.
+            await this.willStart;
+            await this.activateByFileSystem(event);
             if (!this.fileService.hasProvider(event.scheme)) {
                 return waitForEvent(Event.filter(this.fileService.onDidChangeFileSystemProviderRegistrations,
                     ({ added, scheme }) => added && scheme === event.scheme), 3000);
             }
-        }));
+        })());
     }
 
     protected ensureCommandHandlerRegistration(event: WillExecuteCommandEvent): void {

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

@@ -171,15 +171,11 @@ export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container
     rpc.set(PLUGIN_RPC_CONTEXT.DEBUG_MAIN, debugMain);
 
     const fs = new FileSystemMainImpl(rpc, container);
-    const fsEventService = new MainFileSystemEventService(rpc, container);
-    const disposeFS = fs.dispose.bind(fs);
-    fs.dispose = () => {
-        fsEventService.dispose();
-        disposeFS();
-    };
-
     rpc.set(PLUGIN_RPC_CONTEXT.FILE_SYSTEM_MAIN, fs);
 
+    const fsEventService = new MainFileSystemEventService(rpc, container);
+    rpc.set(PLUGIN_RPC_CONTEXT.FILE_SYSTEM_EVENT_SERVICE_MAIN, fsEventService);
+
     const scmMain = new ScmMainImpl(rpc, container);
     rpc.set(PLUGIN_RPC_CONTEXT.SCM_MAIN, scmMain);
 

package/src/main/browser/main-file-system-event-service.ts

@@ -21,21 +21,24 @@
 
 import { interfaces } from '@theia/core/shared/inversify';
 import { RPCProtocol } from '../../common/rpc-protocol';
-import { MAIN_RPC_CONTEXT, FileSystemEvents } from '../../common/plugin-api-rpc';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { MAIN_RPC_CONTEXT, FileSystemEvents, MainFileSystemEventServiceShape } from '../../common/plugin-api-rpc';
+import { UriComponents } from '../../common/uri-components';
+import { URI } from '@theia/core';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { FileChangeType } from '@theia/filesystem/lib/common/files';
+import { FileChangeType, WatchOptions } from '@theia/filesystem/lib/common/files';
 
-export class MainFileSystemEventService {
+export class MainFileSystemEventService implements MainFileSystemEventServiceShape {
 
     private readonly toDispose = new DisposableCollection();
+    private readonly watches = new Map<number, Disposable>();
 
     constructor(
         rpc: RPCProtocol,
-        container: interfaces.Container
+        container: interfaces.Container,
+        private readonly fileService = container.get(FileService)
     ) {
         const proxy = rpc.getProxy(MAIN_RPC_CONTEXT.ExtHostFileSystemEventService);
-        const fileService = container.get(FileService);
 
         this.toDispose.push(fileService.onDidFilesChange(event => {
             // file system events - (changes the editor and others make)
@@ -73,4 +76,21 @@ export class MainFileSystemEventService {
     dispose(): void {
         this.toDispose.dispose();
     }
+
+    $watch(session: number, resource: UriComponents, options: WatchOptions): void {
+        if (this.watches.has(session)) {
+            throw new Error(`There is already a watch request for the key ${session}`);
+        }
+        const watch = this.fileService.watch(URI.fromComponents(resource), options);
+        this.toDispose.push(watch);
+        this.watches.set(session, watch);
+    }
+
+    $unwatch(session: number): void {
+        const watch = this.watches.get(session);
+        if (watch) {
+            watch.dispose();
+            this.watches.delete(session);
+        }
+    }
 }

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

@@ -23,6 +23,7 @@ import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-too
 import { DeployedPlugin, IconUrl, Menu } from '../../../common';
 import { ScmWidget } from '@theia/scm/lib/browser/scm-widget';
 import { ScmRepositoriesWidget, SCM_SOURCE_CONTROL_TITLE_MENU } from '@theia/scm/lib/browser/scm-repositories-widget';
+import { ScmHistoryGraphWidget, SCM_HISTORY_TITLE_MENU } from '@theia/scm/lib/browser/scm-history-graph-widget';
 import { KeybindingRegistry, QuickCommandService, codicon } from '@theia/core/lib/browser';
 import {
     CodeEditorWidgetUtil, codeToTheiaMappings, ContributionPoint,
@@ -63,6 +64,7 @@ export class MenusContributionPointHandler {
         });
         this.tabBarToolbar.registerMenuDelegate(PLUGIN_SCM_TITLE_MENU, widget => widget instanceof ScmWidget);
         this.tabBarToolbar.registerMenuDelegate(SCM_SOURCE_CONTROL_TITLE_MENU, widget => widget instanceof ScmRepositoriesWidget);
+        this.tabBarToolbar.registerMenuDelegate(SCM_HISTORY_TITLE_MENU, widget => widget instanceof ScmHistoryGraphWidget);
         this.tabBarToolbar.registerMenuDelegate(PLUGIN_VIEW_TITLE_MENU, widget => !CodeEditorWidgetUtil.is(widget));
     }
 

package/src/main/browser/menus/plugin-menu-command-adapter.ts

@@ -25,7 +25,7 @@ import { DirtyDiffWidget } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-wi
 import { Change, LineRange } from '@theia/scm/lib/browser/dirty-diff/diff-computer';
 import { IChange } from '@theia/monaco-editor-core/esm/vs/editor/common/diff/legacyLinesDiffComputer';
 import { TimelineItem } from '@theia/timeline/lib/common/timeline-model';
-import { ScmCommandArg, TimelineCommandArg, TreeViewItemReference } from '../../../common';
+import { ScmCommandArg, ScmHistoryItemCommandArg, TimelineCommandArg, TreeViewItemReference } from '../../../common';
 import { TestItemReference, TestMessageArg } from '../../../common/test-types';
 import { PluginScmProvider, PluginScmResource, PluginScmResourceGroup } from '../scm-main';
 import { TreeViewWidget } from '../view/tree-view-widget';
@@ -69,9 +69,12 @@ export class PluginMenuCommandAdapter {
             ['scm/resourceFolder/context', toScmArgs],
             ['scm/resourceGroup/context', toScmArgs],
             ['scm/resourceState/context', toScmArgs],
+            ['scm/repository', toScmArgs],
+            ['scm/history/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
+            ['scm/historyItem/context', (...args) => this.toScmHistoryArgs(...args)],
+            ['scm/historyItemRef/context', (...args) => this.toScmHistoryArgs(...args)],
             ['scm/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
             ['scm/sourceControl', toScmArgs],
-            ['scm/sourceControl/context', toScmArgs],
             ['scm/sourceControl/title', () => [this.toScmArg(this.scmService.selectedRepository)]],
             ['testing/message/context', toTestMessageArgs],
             ['testing/profiles/context', noArgs],
@@ -148,6 +151,16 @@ export class PluginMenuCommandAdapter {
         return scmArgs;
     }
 
+    protected toScmHistoryArgs(...args: any[]): any[] {
+        const result: any[] = [];
+        for (const arg of args) {
+            if (ScmHistoryItemCommandArg.is(arg) || ScmCommandArg.is(arg)) {
+                result.push(arg);
+            }
+        }
+        return result;
+    }
+
     protected toScmArg(arg: any): ScmCommandArg | undefined {
         if (arg instanceof ScmRepository && arg.provider instanceof PluginScmProvider) {
             return {

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

@@ -27,8 +27,11 @@ import { NAVIGATOR_CONTEXT_MENU } from '@theia/navigator/lib/browser/navigator-c
 import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
 import { PLUGIN_SCM_CHANGE_TITLE_MENU } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-widget';
 import {
-    SCM_SOURCE_CONTROL_CONTEXT_MENU, SCM_SOURCE_CONTROL_MENU, SCM_SOURCE_CONTROL_TITLE_MENU, SCM_TITLE_MENU
+    SCM_REPOSITORY_MENU, SCM_SOURCE_CONTROL_MENU, SCM_SOURCE_CONTROL_TITLE_MENU, SCM_TITLE_MENU
 } from '@theia/scm/lib/browser/scm-repositories-widget';
+import {
+    SCM_HISTORY_TITLE_MENU, SCM_HISTORY_ITEM_CONTEXT_MENU, SCM_HISTORY_ITEM_REF_CONTEXT_MENU
+} from '@theia/scm/lib/browser/scm-history-graph-widget';
 import { TIMELINE_ITEM_CONTEXT_MENU } from '@theia/timeline/lib/browser/timeline-tree-widget';
 import { COMMENT_CONTEXT, COMMENT_THREAD_CONTEXT, COMMENT_TITLE } from '../comments/comment-thread-widget';
 import { VIEW_ITEM_CONTEXT_MENU } from '../view/tree-view-widget';
@@ -62,9 +65,12 @@ export const implementedVSCodeContributionPoints = [
     'scm/resourceFolder/context',
     'scm/resourceGroup/context',
     'scm/resourceState/context',
+    'scm/repository',
     'scm/sourceControl',
-    'scm/sourceControl/context',
     'scm/sourceControl/title',
+    'scm/history/title',
+    'scm/historyItem/context',
+    'scm/historyItemRef/context',
     'scm/title',
     'timeline/item/context',
     'testing/item/context',
@@ -100,9 +106,12 @@ export const codeToTheiaMappings = new Map<string, MenuPath[]>([
     ['scm/resourceFolder/context', [ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU]],
     ['scm/resourceGroup/context', [ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU]],
     ['scm/resourceState/context', [ScmTreeWidget.RESOURCE_CONTEXT_MENU]],
+    ['scm/repository', [SCM_REPOSITORY_MENU]],
     ['scm/sourceControl', [SCM_SOURCE_CONTROL_MENU]],
-    ['scm/sourceControl/context', [SCM_SOURCE_CONTROL_CONTEXT_MENU]],
     ['scm/sourceControl/title', [SCM_SOURCE_CONTROL_TITLE_MENU]],
+    ['scm/history/title', [SCM_HISTORY_TITLE_MENU]],
+    ['scm/historyItem/context', [SCM_HISTORY_ITEM_CONTEXT_MENU]],
+    ['scm/historyItemRef/context', [SCM_HISTORY_ITEM_REF_CONTEXT_MENU]],
     ['scm/title', [SCM_TITLE_MENU]],
     ['testing/item/context', [TEST_VIEW_CONTEXT_MENU]],
     ['testing/message/context', [TEST_RUNS_CONTEXT_MENU]],

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

@@ -0,0 +1,105 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 { expect } from 'chai';
+import { ScmService } from '@theia/scm/lib/browser/scm-service';
+import { ScmMainImpl } from './scm-main';
+
+interface ScmMainInternals {
+    repositories: Map<number, unknown>;
+    repositoryDisposables: Map<number, { dispose(): void }>;
+}
+
+function createScmMainImpl(scmService: ScmService): ScmMainImpl {
+    // Bypass the constructor's RPC/container wiring. ScmMainImpl's $register and
+    // $unregister only touch the proxy for input box validation and selection
+    // forwarding — not exercised in this test — so we can stub those safely.
+    const proxy = new Proxy({}, {
+        get: () => (): unknown => undefined
+    });
+    const impl = Object.create(ScmMainImpl.prototype) as ScmMainImpl;
+    const anyImpl = impl as unknown as Record<string, unknown>;
+    anyImpl.proxy = proxy;
+    anyImpl.scmService = scmService;
+    anyImpl.repositories = new Map();
+    anyImpl.repositoryDisposables = new Map();
+    anyImpl.disposables = { push: (): void => { } };
+    anyImpl.colors = { toCssVariableName: (x: string) => x };
+    anyImpl.sharedStyle = { toIconClass: () => ({ object: { iconClass: '' }, dispose: () => { } }) };
+    return impl;
+}
+
+describe('ScmMainImpl - cascade dispose of children on $unregisterSourceControl', () => {
+    let scmService: ScmService;
+    let impl: ScmMainImpl;
+
+    beforeEach(() => {
+        scmService = new ScmService();
+        // Stub the optional context key dependency used by ScmService.
+        (scmService as unknown as Record<string, unknown>).contextKeys = {};
+        impl = createScmMainImpl(scmService);
+    });
+
+    it('should unregister worktree children when their parent is unregistered', async () => {
+        // Parent
+        await impl.$registerSourceControl(1, 'git', 'Main', { scheme: 'file', path: '/repo', authority: '', query: '', fragment: '' });
+        // Two worktree children pointing at the parent
+        await impl.$registerSourceControl(2, 'git', 'WT-A', { scheme: 'file', path: '/wt-a', authority: '', query: '', fragment: '' }, 1);
+        await impl.$registerSourceControl(3, 'git', 'WT-B', { scheme: 'file', path: '/wt-b', authority: '', query: '', fragment: '' }, 1);
+
+        expect(scmService.repositories).to.have.length(3);
+
+        const removed: unknown[] = [];
+        scmService.onDidRemoveRepository(r => removed.push(r));
+
+        await impl.$unregisterSourceControl(1);
+
+        // Parent and both children must be removed from the service.
+        expect(scmService.repositories).to.have.length(0);
+        expect(removed).to.have.length(3);
+
+        // Internal bookkeeping must be clean.
+        const internals = impl as unknown as ScmMainInternals;
+        expect(internals.repositories.size).to.equal(0);
+        expect(internals.repositoryDisposables.size).to.equal(0);
+    });
+
+    it('should leave unrelated repositories untouched when a parent is unregistered', async () => {
+        await impl.$registerSourceControl(1, 'git', 'Main', { scheme: 'file', path: '/repo', authority: '', query: '', fragment: '' });
+        await impl.$registerSourceControl(2, 'git', 'WT-A', { scheme: 'file', path: '/wt-a', authority: '', query: '', fragment: '' }, 1);
+        // An independent repository (no parent)
+        await impl.$registerSourceControl(3, 'git', 'Other', { scheme: 'file', path: '/other', authority: '', query: '', fragment: '' });
+
+        await impl.$unregisterSourceControl(1);
+
+        const remaining = scmService.repositories;
+        expect(remaining).to.have.length(1);
+        expect(remaining[0].provider.rootUri).to.include('/other');
+    });
+
+    it('should not crash when the child was already unregistered before the parent', async () => {
+        await impl.$registerSourceControl(1, 'git', 'Main', { scheme: 'file', path: '/repo', authority: '', query: '', fragment: '' });
+        await impl.$registerSourceControl(2, 'git', 'WT-A', { scheme: 'file', path: '/wt-a', authority: '', query: '', fragment: '' }, 1);
+
+        // Plugin-side unregister for the child arrives first (race scenario).
+        await impl.$unregisterSourceControl(2);
+        expect(scmService.repositories).to.have.length(1);
+
+        // Now the parent is unregistered — cascade should find no child and succeed.
+        await impl.$unregisterSourceControl(1);
+        expect(scmService.repositories).to.have.length(0);
+    });
+});