@theia/plugin-ext 1.71.0-next.4 → 1.71.0-next.43

package/package.json

@@ -1,55 +1,55 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.71.0-next.4+cdbc982c6",
+  "version": "1.71.0-next.43+e960af22f",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/ai-mcp": "1.71.0-next.4+cdbc982c6",
-    "@theia/bulk-edit": "1.71.0-next.4+cdbc982c6",
-    "@theia/callhierarchy": "1.71.0-next.4+cdbc982c6",
-    "@theia/console": "1.71.0-next.4+cdbc982c6",
-    "@theia/core": "1.71.0-next.4+cdbc982c6",
-    "@theia/debug": "1.71.0-next.4+cdbc982c6",
-    "@theia/editor": "1.71.0-next.4+cdbc982c6",
-    "@theia/editor-preview": "1.71.0-next.4+cdbc982c6",
-    "@theia/file-search": "1.71.0-next.4+cdbc982c6",
-    "@theia/filesystem": "1.71.0-next.4+cdbc982c6",
-    "@theia/markers": "1.71.0-next.4+cdbc982c6",
-    "@theia/messages": "1.71.0-next.4+cdbc982c6",
-    "@theia/monaco": "1.71.0-next.4+cdbc982c6",
+    "@theia/ai-mcp": "1.71.0-next.43+e960af22f",
+    "@theia/bulk-edit": "1.71.0-next.43+e960af22f",
+    "@theia/callhierarchy": "1.71.0-next.43+e960af22f",
+    "@theia/console": "1.71.0-next.43+e960af22f",
+    "@theia/core": "1.71.0-next.43+e960af22f",
+    "@theia/debug": "1.71.0-next.43+e960af22f",
+    "@theia/editor": "1.71.0-next.43+e960af22f",
+    "@theia/editor-preview": "1.71.0-next.43+e960af22f",
+    "@theia/file-search": "1.71.0-next.43+e960af22f",
+    "@theia/filesystem": "1.71.0-next.43+e960af22f",
+    "@theia/markers": "1.71.0-next.43+e960af22f",
+    "@theia/messages": "1.71.0-next.43+e960af22f",
+    "@theia/monaco": "1.71.0-next.43+e960af22f",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/navigator": "1.71.0-next.4+cdbc982c6",
-    "@theia/notebook": "1.71.0-next.4+cdbc982c6",
-    "@theia/output": "1.71.0-next.4+cdbc982c6",
-    "@theia/plugin": "1.71.0-next.4+cdbc982c6",
-    "@theia/preferences": "1.71.0-next.4+cdbc982c6",
-    "@theia/scm": "1.71.0-next.4+cdbc982c6",
-    "@theia/search-in-workspace": "1.71.0-next.4+cdbc982c6",
-    "@theia/task": "1.71.0-next.4+cdbc982c6",
-    "@theia/terminal": "1.71.0-next.4+cdbc982c6",
-    "@theia/test": "1.71.0-next.4+cdbc982c6",
-    "@theia/timeline": "1.71.0-next.4+cdbc982c6",
-    "@theia/typehierarchy": "1.71.0-next.4+cdbc982c6",
-    "@theia/variable-resolver": "1.71.0-next.4+cdbc982c6",
-    "@theia/workspace": "1.71.0-next.4+cdbc982c6",
-    "@types/mime": "^2.0.1",
-    "@vscode/debugprotocol": "^1.51.0",
+    "@theia/navigator": "1.71.0-next.43+e960af22f",
+    "@theia/notebook": "1.71.0-next.43+e960af22f",
+    "@theia/output": "1.71.0-next.43+e960af22f",
+    "@theia/plugin": "1.71.0-next.43+e960af22f",
+    "@theia/preferences": "1.71.0-next.43+e960af22f",
+    "@theia/scm": "1.71.0-next.43+e960af22f",
+    "@theia/search-in-workspace": "1.71.0-next.43+e960af22f",
+    "@theia/task": "1.71.0-next.43+e960af22f",
+    "@theia/terminal": "1.71.0-next.43+e960af22f",
+    "@theia/test": "1.71.0-next.43+e960af22f",
+    "@theia/timeline": "1.71.0-next.43+e960af22f",
+    "@theia/typehierarchy": "1.71.0-next.43+e960af22f",
+    "@theia/variable-resolver": "1.71.0-next.43+e960af22f",
+    "@theia/workspace": "1.71.0-next.43+e960af22f",
+    "@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"
@@ -97,5 +97,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "cdbc982c6456e257ba7ed8e01b8c71aa7ac67283"
+  "gitHead": "e960af22fd0721f7cd4a8f7d66e6e9d10c801962"
 }

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

@@ -2120,6 +2120,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 +2389,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/plugin-menu-command-adapter.ts

@@ -69,9 +69,9 @@ export class PluginMenuCommandAdapter {
             ['scm/resourceFolder/context', toScmArgs],
             ['scm/resourceGroup/context', toScmArgs],
             ['scm/resourceState/context', toScmArgs],
+            ['scm/repository', toScmArgs],
             ['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],

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

@@ -27,7 +27,7 @@ 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 { 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';
@@ -62,8 +62,8 @@ export const implementedVSCodeContributionPoints = [
     'scm/resourceFolder/context',
     'scm/resourceGroup/context',
     'scm/resourceState/context',
+    'scm/repository',
     'scm/sourceControl',
-    'scm/sourceControl/context',
     'scm/sourceControl/title',
     'scm/title',
     'timeline/item/context',
@@ -100,8 +100,8 @@ 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/title', [SCM_TITLE_MENU]],
     ['testing/item/context', [TEST_VIEW_CONTEXT_MENU]],

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

@@ -410,7 +410,8 @@ class TestControllerImpl implements TestController {
     private _runs = new SimpleObservableCollection<TestRunImpl>();
     readonly deltaBuilder = new AccumulatingTreeDeltaEmitter<string, TestItemImpl>(300);
     canRefresh: boolean;
-    private canResolveChildren: boolean = false;
+    canResolveChildren: boolean = false;
+    private hasTriggeredInitialResolve: boolean = false;
     readonly items = new TestItemCollection(this, item => item.path, () => this.deltaBuilder);
 
     constructor(private readonly proxy: TestingExt, readonly id: string, public label: string) {
@@ -510,6 +511,10 @@ class TestControllerImpl implements TestController {
         }
         if ('canResolve' in change) {
             this.canResolveChildren = change.canResolve!;
+            if (change.canResolve && !this.hasTriggeredInitialResolve) {
+                this.hasTriggeredInitialResolve = true;
+                this.resolveChildren();
+            }
         }
         if ('label' in change) {
             this.label = change.label!;
@@ -543,9 +548,14 @@ class TestControllerImpl implements TestController {
     }
     onItemsChanged: Event<TreeDelta<string, TestItemImpl>[]> = this.deltaBuilder.onDidFlush;
 
-    resolveChildren(item: TestItem): void {
+    resolveChildren(item?: TestItem): void {
         if (this.canResolveChildren) {
-            this.proxy.$onResolveChildren(this.id, itemToPath(item));
+            if (item) {
+                this.proxy.$onResolveChildren(this.id, itemToPath(item));
+            } else {
+                // Root-level resolve: trigger discovery of top-level test items
+                this.proxy.$onResolveChildren(this.id, []);
+            }
         }
     }
 

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

@@ -18,7 +18,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 /**
- * **IMPORTANT** this code is running in the plugin host process and should be closed as possible to VS Code counterpart:
+ * **IMPORTANT** this code is running in the plugin host process and should be close as possible to VS Code counterpart:
  * https://github.com/microsoft/vscode/blob/04c36be045a94fee58e5f8992d3e3fd980294a84/src/vs/workbench/api/common/extHostFileSystemEventService.ts
  * One should be able to diff them to see differences.
  */
@@ -28,11 +28,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/tslint/config */
 
-import { Emitter, WaitUntilEvent, AsyncEmitter, WaitUntilData } from '@theia/core/lib/common/event';
-import { IRelativePattern, parse } from '@theia/core/lib/common/glob';
+import { Emitter, Event as EventNamespace, WaitUntilEvent, AsyncEmitter, WaitUntilData } from '@theia/core/lib/common/event';
+import { GLOB_SPLIT, GLOBSTAR, parse } from '@theia/core/lib/common/glob';
 import { UriComponents } from '../common/uri-components';
-import { Disposable, URI, WorkspaceEdit } from './types-impl';
+import { Disposable, RelativePattern, URI, WorkspaceEdit } from './types-impl';
 import { EditorsAndDocumentsExtImpl as ExtHostDocumentsAndEditors } from './editors-and-documents';
+import { WorkspaceExtImpl as ExtHostWorkspace } from './workspace';
 import type * as vscode from '@theia/plugin';
 import * as typeConverter from './type-converters';
 import { FileOperation } from '@theia/filesystem/lib/common/files';
@@ -68,8 +69,9 @@ export class FileSystemWatcher implements vscode.FileSystemWatcher {
         return Boolean(this._config & 0b100);
     }
 
-    constructor(dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePattern,
-        ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean, excludes?: string[]) {
+    constructor(dispatcher: Event<FileSystemEvents>, globPattern: string | RelativePattern,
+        ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean, excludes?: string[],
+        filter: (uri: URI) => boolean = () => true, disposable: { dispose(): unknown } = Disposable.from()) {
 
         this._config = 0;
         if (ignoreCreateEvents) {
@@ -89,7 +91,7 @@ export class FileSystemWatcher implements vscode.FileSystemWatcher {
             if (!ignoreCreateEvents) {
                 for (const created of events.created) {
                     const uri = URI.revive(created);
-                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath))) {
+                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath)) && filter(uri)) {
                         this._onDidCreate.fire(uri);
                     }
                 }
@@ -97,7 +99,7 @@ export class FileSystemWatcher implements vscode.FileSystemWatcher {
             if (!ignoreChangeEvents) {
                 for (const changed of events.changed) {
                     const uri = URI.revive(changed);
-                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath))) {
+                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath)) && filter(uri)) {
                         this._onDidChange.fire(uri);
                     }
                 }
@@ -105,14 +107,14 @@ export class FileSystemWatcher implements vscode.FileSystemWatcher {
             if (!ignoreDeleteEvents) {
                 for (const deleted of events.deleted) {
                     const uri = URI.revive(deleted);
-                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath))) {
+                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath)) && filter(uri)) {
                         this._onDidDelete.fire(uri);
                     }
                 }
             }
         });
 
-        this._disposable = Disposable.from(this._onDidCreate, this._onDidChange, this._onDidDelete, subscription);
+        this._disposable = Disposable.from(disposable, this._onDidCreate, this._onDidChange, this._onDidDelete, subscription);
     }
 
     dispose(): void {
@@ -155,16 +157,40 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
     constructor(
         rpc: RPCProtocol,
         private readonly _extHostDocumentsAndEditors: ExtHostDocumentsAndEditors,
-        private readonly _mainThreadTextEditors: MainThreadTextEditorsShape = rpc.getProxy(PLUGIN_RPC_CONTEXT.TEXT_EDITORS_MAIN)
+        private readonly _extHostWorkspace: ExtHostWorkspace,
+        private readonly _mainThreadTextEditors: MainThreadTextEditorsShape = rpc.getProxy(PLUGIN_RPC_CONTEXT.TEXT_EDITORS_MAIN),
+        private readonly _mainThreadFileSystemEventService = rpc.getProxy(PLUGIN_RPC_CONTEXT.FILE_SYSTEM_EVENT_SERVICE_MAIN)
     ) {
-        //
+        // Language services often watch every component of source trees (including dependencies),
+        // which can result in hundreds of watchers in large projects.
+        // Disable the leak warning (maxListeners 0 = unbounded) to avoid false positives.
+        EventNamespace.setMaxListeners(this._onFileSystemEvent.event, 0);
     }
 
     // --- file events
 
-    createFileSystemWatcher(globPattern: string | IRelativePattern, ignoreCreateEvents?: boolean,
+    createFileSystemWatcher(globPattern: string | RelativePattern, ignoreCreateEvents?: boolean,
         ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): vscode.FileSystemWatcher {
-        return new FileSystemWatcher(this._onFileSystemEvent.event, globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
+        const filter = typeof globPattern === 'string' ? // ignore events outside the workspace when only a string pattern is provided
+            (uri: URI) => !!this._extHostWorkspace.getWorkspaceFolder(uri) : undefined;
+        return new FileSystemWatcher(this._onFileSystemEvent.event, globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents,
+            undefined, filter, this.ensureWatching(globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents));
+    }
+
+    private ensureWatching(globPattern: string | RelativePattern,
+        ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): Disposable | undefined {
+        if (typeof globPattern === 'string' || this._extHostWorkspace.getWorkspaceFolder(globPattern.baseUri)) {
+            return; // workspace is already watched by default, no need to watch again
+        }
+
+        if (ignoreChangeEvents && ignoreCreateEvents && ignoreDeleteEvents) {
+            return; // no need to watch if we ignore all events
+        }
+
+        const session = Math.random();
+        const recursive = globPattern.pattern.includes(GLOBSTAR) || globPattern.pattern.includes(GLOB_SPLIT); // only watch recursively if pattern indicates the need for it
+        this._mainThreadFileSystemEventService.$watch(session, globPattern.baseUri, { recursive, excludes: [] });
+        return Disposable.from({ dispose: () => this._mainThreadFileSystemEventService.$unwatch(session) });
     }
 
     $onFileEvent(events: FileSystemEvents) {

package/src/plugin/plugin-context.ts

@@ -257,7 +257,7 @@ import { DocumentsExtImpl } from './documents';
 import { TextEditorCursorStyle } from '../common/editor-options';
 import { PreferenceRegistryExtImpl } from './preference-registry';
 import { OutputChannelRegistryExtImpl } from './output-channel-registry';
-import { TerminalServiceExtImpl, TerminalExtImpl } from './terminal-ext';
+import { TerminalServiceExtImpl } from './terminal-ext';
 import { LanguagesExtImpl } from './languages';
 import { fromDocumentSelector, pluginToPluginInfo, fromGlobPattern } from './type-converters';
 import { DialogsExtImpl } from './dialogs';
@@ -348,7 +348,7 @@ export function createAPIFactory(
     const connectionExt = rpc.set(MAIN_RPC_CONTEXT.CONNECTION_EXT, new ConnectionImpl(rpc.getProxy(PLUGIN_RPC_CONTEXT.CONNECTION_MAIN)));
     const fileSystemExt = rpc.set(MAIN_RPC_CONTEXT.FILE_SYSTEM_EXT, new FileSystemExtImpl(rpc));
     const languagesExt = rpc.set(MAIN_RPC_CONTEXT.LANGUAGES_EXT, new LanguagesExtImpl(rpc, documents, commandRegistry, fileSystemExt));
-    const extHostFileSystemEvent = rpc.set(MAIN_RPC_CONTEXT.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpc, editorsAndDocumentsExt));
+    const extHostFileSystemEvent = rpc.set(MAIN_RPC_CONTEXT.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpc, editorsAndDocumentsExt, workspaceExt));
     const scmExt = rpc.set(MAIN_RPC_CONTEXT.SCM_EXT, new ScmExtImpl(rpc, commandRegistry));
     const decorationsExt = rpc.set(MAIN_RPC_CONTEXT.DECORATIONS_EXT, new DecorationsExtImpl(rpc));
     const labelServiceExt = rpc.set(MAIN_RPC_CONTEXT.LABEL_SERVICE_EXT, new LabelServiceExtImpl(rpc));
@@ -462,7 +462,7 @@ export function createAPIFactory(
         const showErrorMessage = messageRegistryExt.showMessage.bind(messageRegistryExt, MainMessageType.Error);
         const window: typeof theia.window = {
 
-            get activeTerminal(): TerminalExtImpl | undefined {
+            get activeTerminal(): theia.Terminal | undefined {
                 return terminalExt.activeTerminal;
             },
             get activeTextEditor(): TextEditorExt | undefined {
@@ -471,7 +471,7 @@ export function createAPIFactory(
             get visibleTextEditors(): theia.TextEditor[] {
                 return editors.getVisibleTextEditors();
             },
-            get terminals(): TerminalExtImpl[] {
+            get terminals(): theia.Terminal[] {
                 return terminalExt.terminals;
             },
             onDidChangeActiveTerminal,
@@ -633,7 +633,7 @@ export function createAPIFactory(
             createTerminal(nameOrOptions: theia.TerminalOptions | theia.ExtensionTerminalOptions | theia.ExtensionTerminalOptions | (string | undefined),
                 shellPath?: string,
                 shellArgs?: string[] | string): theia.Terminal {
-                return createAPIObject(terminalExt.createTerminal(plugin, nameOrOptions, shellPath, shellArgs));
+                return terminalExt.createTerminal(plugin, nameOrOptions, shellPath, shellArgs, createAPIObject);
             },
             onDidChangeTerminalState,
             onDidCloseTerminal,
@@ -1286,8 +1286,8 @@ export function createAPIFactory(
                     throw new Error('Input box not found!');
                 }
             },
-            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));
+            createSourceControl(id: string, label: string, rootUri?: URI, iconPath?: theia.IconPath, isHidden?: boolean, parent?: theia.SourceControl): theia.SourceControl {
+                return scmExt.createSourceControl(plugin, id, label, rootUri, iconPath, isHidden, parent);
             }
         };
 

package/src/plugin/scm.ts

@@ -543,6 +543,8 @@ class SourceControlImpl implements theia.SourceControl {
     private static handlePool: number = 0;
     private groups: Map<GroupHandle, ScmResourceGroupImpl> = new Map<GroupHandle, ScmResourceGroupImpl>();
 
+    readonly apiObject: theia.SourceControl;
+
     get id(): string {
         return this._id;
     }
@@ -702,11 +704,13 @@ class SourceControlImpl implements theia.SourceControl {
         private _label: string,
         private _rootUri?: theia.Uri,
         _iconPath?: theia.IconPath,
+        _isHidden?: boolean,
         _parent?: SourceControlImpl
     ) {
         this.inputBox = new ScmInputBoxImpl(plugin, this.proxy, this.handle);
         this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, _parent?.handle);
         this.onDidDisposeParent = _parent ? _parent.onDidDispose : Event.None;
+        this.apiObject = createAPIObject(this);
     }
 
     private createdResourceGroups = new Map<ScmResourceGroupImpl, Disposable>();
@@ -824,7 +828,7 @@ export class ScmExtImpl implements ScmExt {
                     return undefined;
                 }
                 if (typeof arg.resourceGroupHandle !== 'number') {
-                    return sourceControl;
+                    return sourceControl.apiObject;
                 }
                 const resourceGroup = sourceControl.getResourceGroup(arg.resourceGroupHandle);
                 if (typeof arg.resourceStateHandle !== 'number') {
@@ -836,17 +840,17 @@ export class ScmExtImpl implements ScmExt {
     }
 
     createSourceControl(extension: Plugin, id: string, label: string, rootUri: theia.Uri | undefined,
-        iconPath?: theia.IconPath, parent?: theia.SourceControl): theia.SourceControl {
+        iconPath?: theia.IconPath, isHidden?: boolean, parent?: theia.SourceControl): theia.SourceControl {
         const handle = ScmExtImpl.handlePool++;
         const parentImpl = parent ? this.findSourceControlImpl(parent) : undefined;
-        const sourceControl = new SourceControlImpl(extension, this.proxy, this.commands, id, label, rootUri, iconPath, parentImpl);
+        const sourceControl = new SourceControlImpl(extension, this.proxy, this.commands, id, label, rootUri, iconPath, isHidden, parentImpl);
         this.sourceControls.set(handle, sourceControl);
 
         const sourceControls = this.sourceControlsByExtension.get(extension.model.id) || [];
         sourceControls.push(sourceControl);
         this.sourceControlsByExtension.set(extension.model.id, sourceControls);
 
-        return sourceControl;
+        return sourceControl.apiObject;
     }
 
     private findSourceControlImpl(apiObject: theia.SourceControl): SourceControlImpl | undefined {