@theia/plugin-ext 1.19.0 → 1.21.0-next.14

package/lib/plugin/tasks/tasks.js

@@ -19,7 +19,6 @@ exports.TasksExtImpl = void 0;
 const plugin_api_rpc_1 = require("../../common/plugin-api-rpc");
 const converter = require("../type-converters");
 const types_impl_1 = require("../types-impl");
-const rpc_protocol_1 = require("../../common/rpc-protocol");
 const task_provider_1 = require("./task-provider");
 const event_1 = require("@theia/core/lib/common/event");
 const coreutils_1 = require("@theia/core/shared/@phosphor/coreutils");
@@ -37,12 +36,7 @@ class TasksExtImpl {
         this.onDidTerminateTask = new event_1.Emitter();
         this.onDidExecuteTaskProcess = new event_1.Emitter();
         this.onDidTerminateTaskProcess = new event_1.Emitter();
-        this.disposed = false;
         this.proxy = rpc.getProxy(plugin_api_rpc_1.PLUGIN_RPC_CONTEXT.TASKS_MAIN);
-        this.fetchTaskExecutions();
-    }
-    dispose() {
-        this.disposed = true;
     }
     get taskExecutions() {
         return [...this.executions.values()];
@@ -181,17 +175,9 @@ class TasksExtImpl {
             this.proxy.$unregister(callId);
         });
     }
-    async fetchTaskExecutions() {
-        try {
-            const taskExecutions = await this.proxy.$taskExecutions();
-            taskExecutions.forEach(execution => this.getTaskExecution(execution));
-        }
-        catch (error) {
-            if (this.disposed && rpc_protocol_1.ConnectionClosedError.is(error)) {
-                return;
-            }
-            console.error(`Can not fetch running tasks: ${error}`);
-        }
+    // Initial `this.executions` map with the running tasks from the previous session
+    async $initLoadedTasks(taskExecutions) {
+        taskExecutions.forEach(execution => this.getTaskExecution(execution));
     }
     getTaskExecution(execution) {
         const executionId = execution.id;

package/lib/plugin/tasks/tasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/plugin/tasks/tasks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/plugin/tasks/tasks.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,gEAMqC;AAErC,gDAAgD;AAChD,8CAA4D;AAE5D,mDAAsD;AACtD,wDAA8D;AAE9D,sEAA8D;AAC9D,sEAAwE;AAGxE,MAAa,YAAY;IAiBrB,YAAY,GAAgB,EAAW,WAAmC;QAAnC,gBAAW,GAAX,WAAW,CAAwB;QAdlE,WAAM,GAAG,CAAC,CAAC;QACX,gBAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;QACrD,eAAU,GAAG,IAAI,GAAG,EAA+B,CAAC;QAClD,mBAAc,GAAW,gBAAI,CAAC,KAAK,EAAE,CAAC;QAEtC,uBAAkB,GAAmC,IAAI,GAAG,EAAE,CAAC;QAC/D,6BAAwB,GAAmC,IAAI,GAAG,EAAE,CAAC;QAG9D,qBAAgB,GAAkC,IAAI,eAAO,EAAwB,CAAC;QACtF,uBAAkB,GAAgC,IAAI,eAAO,EAAsB,CAAC;QACpF,4BAAuB,GAAyC,IAAI,eAAO,EAA+B,CAAC;QAC3G,8BAAyB,GAAuC,IAAI,eAAO,EAA6B,CAAC;QAGtH,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,mCAAkB,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,cAAc;QACd,OAAO,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAA2B,EAAE,UAAkB;QACjE,MAAM,eAAe,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAC5F,IAAI,eAAe,EAAE;YACjB,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC;YACnE,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,CAAC;YAClD,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACtD,IAAI,GAAG,CAAC,UAAU,EAAE;gBAChB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,IAAmB,SAAS,EAAE,EAAE;oBAC/D,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,mCAAmC;oBACnC,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpF,CAAC,CAAC,CAAC;aACN;SACJ;QACD,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,EAAE,CAAC;QAEpC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACvB,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;SAC9C,CAAC,CAAC;IACP,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IACzC,CAAC;IAED,aAAa,CAAC,EAAU;QACpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,EAAE,eAAe,CAAC,CAAC;SAChE;QAED,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE3B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;YACzB,SAAS,EAAE,aAAa;SAC3B,CAAC,CAAC;IACP,CAAC;IAED,IAAI,qBAAqB;QACrB,OAAO,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;IAC9C,CAAC;IAED,sBAAsB,CAAC,SAAiB,EAAE,YAA8B;QACpE,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC;YAC9B,SAAS;YACT,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;SACjD,CAAC,CAAC;IACP,CAAC;IAED,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;IAChD,CAAC;IAED,oBAAoB,CAAC,QAAgB,EAAE,MAAc;QACjD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,eAAe,CAAC,CAAC;SACpE;QAED,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAChC,SAAS,EAAE,aAAa;YACxB,QAAQ;SACX,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAAC,IAAY,EAAE,QAA4B;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAyB;QACtC,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAgB;QAC9B,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE;YACT,mEAAmE;YACnE,oEAAoE;YACpE,oBAAoB;YACpB,IAAI,4BAAe,CAAC,EAAE,CAAC,IAAI,CAAC,SAAU,CAAC,EAAE;gBACrC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAU,CAAC,QAAQ,CAAC,CAAC;aAC3E;YACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC5D,IAAI,YAAY,EAAE;gBACd,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAC1D,OAAO,aAAa,CAAC;aACxB;YACD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;SAC1E;QACD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAChF,CAAC;IAED,aAAa,CAAC,MAAc;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC,YAAY,CAAC,gCAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAC7D,IAAI,KAAK,EAAE;oBACP,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACtB,IAAI,IAAI,CAAC,QAAQ,KAAK,iBAAiB,EAAE;4BACrC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAC1D,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;yBAC7B;qBACJ;iBACJ;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAC;SACN;aAAM;YACH,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC;SACzE;IACL,CAAC;IAED,YAAY,CAAC,MAAc,EAAE,IAAa,EAAE,KAA8B;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACxD,IAAI,YAAY,IAAI,YAAY,CAAC,QAAQ,KAAK,iBAAiB,EAAE;oBAC7D,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;oBAC1E,YAAY,CAAC,QAAQ,GAAG,SAAS,CAAC;iBACrC;gBACD,OAAO,YAAY,CAAC;YACxB,CAAC,CAAC,CAAC;SACN;aAAM;YACH,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;SACxE;IACL,CAAC;IAEO,aAAa,CAAC,OAA4B;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,UAAU;QACd,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACnC,OAAO,IAAI,uBAAU,CAAC,GAAG,EAAE;YACvB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iFAAiF;IACjF,KAAK,CAAC,gBAAgB,CAAC,cAAkC;QACrD,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEO,gBAAgB,CAAC,SAA2B;QAChD,MAAM,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;QACjC,IAAI,MAAM,GAAoC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/E,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,CAAC;SACjB;QAED,MAAM,GAAG;YACL,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACtC,SAAS,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAC3C,CAAC;SACJ,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACzC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,kBAAkB,CAAC,QAA2B;QAClD,IAAI,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,EAAE,EAAE;YACL,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;SACnD;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,cAAc;QAClB,OAAO,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACnD,CAAC;CACJ;AApND,oCAoNC"}

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.19.0",
+  "version": "1.21.0-next.14+afd980a4d4f",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.19.0",
-    "@theia/callhierarchy": "1.19.0",
-    "@theia/console": "1.19.0",
-    "@theia/core": "1.19.0",
-    "@theia/debug": "1.19.0",
-    "@theia/editor": "1.19.0",
-    "@theia/file-search": "1.19.0",
-    "@theia/filesystem": "1.19.0",
-    "@theia/markers": "1.19.0",
-    "@theia/messages": "1.19.0",
-    "@theia/monaco": "1.19.0",
-    "@theia/navigator": "1.19.0",
-    "@theia/output": "1.19.0",
-    "@theia/plugin": "1.19.0",
-    "@theia/preferences": "1.19.0",
-    "@theia/scm": "1.19.0",
-    "@theia/search-in-workspace": "1.19.0",
-    "@theia/task": "1.19.0",
-    "@theia/terminal": "1.19.0",
-    "@theia/timeline": "1.19.0",
-    "@theia/workspace": "1.19.0",
+    "@theia/bulk-edit": "1.21.0-next.14+afd980a4d4f",
+    "@theia/callhierarchy": "1.21.0-next.14+afd980a4d4f",
+    "@theia/console": "1.21.0-next.14+afd980a4d4f",
+    "@theia/core": "1.21.0-next.14+afd980a4d4f",
+    "@theia/debug": "1.21.0-next.14+afd980a4d4f",
+    "@theia/editor": "1.21.0-next.14+afd980a4d4f",
+    "@theia/file-search": "1.21.0-next.14+afd980a4d4f",
+    "@theia/filesystem": "1.21.0-next.14+afd980a4d4f",
+    "@theia/markers": "1.21.0-next.14+afd980a4d4f",
+    "@theia/messages": "1.21.0-next.14+afd980a4d4f",
+    "@theia/monaco": "1.21.0-next.14+afd980a4d4f",
+    "@theia/navigator": "1.21.0-next.14+afd980a4d4f",
+    "@theia/output": "1.21.0-next.14+afd980a4d4f",
+    "@theia/plugin": "1.21.0-next.14+afd980a4d4f",
+    "@theia/preferences": "1.21.0-next.14+afd980a4d4f",
+    "@theia/scm": "1.21.0-next.14+afd980a4d4f",
+    "@theia/search-in-workspace": "1.21.0-next.14+afd980a4d4f",
+    "@theia/task": "1.21.0-next.14+afd980a4d4f",
+    "@theia/terminal": "1.21.0-next.14+afd980a4d4f",
+    "@theia/timeline": "1.21.0-next.14+afd980a4d4f",
+    "@theia/workspace": "1.21.0-next.14+afd980a4d4f",
     "@types/markdown-it": "*",
     "@types/mime": "^2.0.1",
     "decompress": "^4.2.1",
@@ -82,7 +82,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.19.0",
+    "@theia/ext-scripts": "1.20.0",
     "@types/decompress": "^4.2.2",
     "@types/escape-html": "^0.0.20",
     "@types/lodash.clonedeep": "^4.5.3",
@@ -92,5 +92,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "cebb5417bb40e320178e3a4e66070af514f0525f"
+  "gitHead": "afd980a4d4ff6b48d70fc0ce1e459f6496c62624"
 }

package/src/common/connection.ts

@@ -13,69 +13,126 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Disposable } from './disposable-util';
-import { PluginMessageReader } from './plugin-message-reader';
-import { PluginMessageWriter } from './plugin-message-writer';
-import { IWebSocket, MessageReader, MessageWriter, Message } from '@theia/core/shared/vscode-ws-jsonrpc';
+import { Channel } from '@theia/debug/lib/common/debug-service';
+import { ConnectionExt, ConnectionMain } from './plugin-api-rpc';
+import { Emitter } from '@theia/core/lib/common/event';
 
 /**
- * The interface for describing the connection between plugins and main side.
+ * A channel communicating with a counterpart in a plugin host.
  */
-export interface Connection extends Disposable {
-    readonly reader: MessageReader;
-    readonly writer: MessageWriter;
-    /**
-     * Allows to forward messages to another connection.
-     *
-     * @param to the connection to forward messages
-     * @param map the function in which the message can be changed before forwarding
-     */
-    forward(to: Connection, map?: (message: Message) => Message): void;
-}
+export class PluginChannel implements Channel {
+    private messageEmitter: Emitter<string> = new Emitter();
+    private errorEmitter: Emitter<unknown> = new Emitter();
+    private closedEmitter: Emitter<void> = new Emitter();
 
-/**
- * The container for message reader and writer which can be used to create connection between plugins and main side.
- */
-export class PluginConnection implements Connection {
     constructor(
-        readonly reader: PluginMessageReader,
-        readonly writer: PluginMessageWriter,
-        readonly dispose: () => void) {
+        protected readonly id: string,
+        protected readonly connection: ConnectionExt | ConnectionMain) { }
+
+    send(content: string): void {
+        this.connection.$sendMessage(this.id, content);
     }
 
-    forward(to: Connection, map: (message: Message) => Message = message => message): void {
-        this.reader.listen(input => {
-            const output = map(input);
-            to.writer.write(output);
-        });
+    fireMessageReceived(msg: string): void {
+        this.messageEmitter.fire(msg);
     }
-}
 
-/**
- * [IWebSocket](#IWebSocket) implementation over RPC.
- */
-export class PluginWebSocketChannel implements IWebSocket {
-    constructor(protected readonly connection: PluginConnection) { }
+    fireError(error: unknown): void {
+        this.errorEmitter.fire(error);
+    }
 
-    send(content: string): void {
-        this.connection.writer.write(content);
+    fireClosed(): void {
+        this.closedEmitter.fire();
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     onMessage(cb: (data: any) => void): void {
-        this.connection.reader.listen(cb);
+        this.messageEmitter.event(cb);
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     onError(cb: (reason: any) => void): void {
-        this.connection.reader.onError(e => cb(e));
+        this.errorEmitter.event(cb);
     }
 
     onClose(cb: (code: number, reason: string) => void): void {
-        this.connection.reader.onClose(() => cb(-1, 'closed'));
+        this.closedEmitter.event(() => cb(-1, 'closed'));
+    }
+
+    close(): void {
+        this.connection.$deleteConnection(this.id);
+    }
+}
+
+export class ConnectionImpl implements ConnectionMain, ConnectionExt {
+    private readonly proxy: ConnectionExt | ConnectionExt;
+    private readonly connections = new Map<string, PluginChannel>();
+
+    constructor(proxy: ConnectionMain | ConnectionExt) {
+        this.proxy = proxy;
+    }
+
+    /**
+     * Gets the connection between plugin by id and sends string message to it.
+     *
+     * @param id connection's id
+     * @param message incoming message
+     */
+    async $sendMessage(id: string, message: string): Promise<void> {
+        if (this.connections.has(id)) {
+            this.connections.get(id)!.fireMessageReceived(message);
+        } else {
+            console.warn(`Received message for unknown connection: ${id}`);
+        }
+    }
+
+    /**
+     * Instantiates a new connection by the given id.
+     * @param id the connection id
+     */
+    async $createConnection(id: string): Promise<void> {
+        console.debug(`Creating plugin connection: ${id}`);
+
+        await this.doEnsureConnection(id);
+    }
+
+    /**
+     * Deletes a connection.
+     * @param id the connection id
+     */
+    async $deleteConnection(id: string): Promise<void> {
+        console.debug(`Deleting plugin connection: ${id}`);
+        const connection = this.connections.get(id);
+        if (connection) {
+            this.connections.delete(id);
+            connection.fireClosed();
+        }
+    }
+
+    /**
+     * Returns existed connection or creates a new one.
+     * @param id the connection id
+     */
+    async ensureConnection(id: string): Promise<PluginChannel> {
+        console.debug(`Creating local connection: ${id}`);
+        const connection = await this.doEnsureConnection(id);
+        await this.proxy.$createConnection(id);
+        return connection;
+    }
+
+    /**
+     * Returns existed connection or creates a new one.
+     * @param id the connection id
+     */
+    async doEnsureConnection(id: string): Promise<PluginChannel> {
+        const connection = this.connections.get(id) || await this.doCreateConnection(id);
+        this.connections.set(id, connection);
+        return connection;
     }
 
-    dispose(): void {
-        this.connection.dispose();
+    protected async doCreateConnection(id: string): Promise<PluginChannel> {
+        const channel = new PluginChannel(id, this.proxy);
+        channel.onClose(() => this.connections.delete(id));
+        return channel;
     }
 }

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

@@ -91,8 +91,7 @@ import type {
     TimelineProviderDescriptor
 } from '@theia/timeline/lib/common/timeline-model';
 import { SerializableEnvironmentVariableCollection } from '@theia/terminal/lib/common/base-terminal-protocol';
-// eslint-disable-next-line @theia/runtime-import-check
-import { ThemeType } from '@theia/core/lib/browser/theming';
+import { ThemeType } from '@theia/core/lib/common/theme';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { PickOptions, QuickInputButtonHandle, QuickPickItem } from '@theia/core/lib/browser';
 
@@ -266,8 +265,6 @@ export interface ConnectionMain {
     $createConnection(id: string): Promise<void>;
     $deleteConnection(id: string): Promise<void>;
     $sendMessage(id: string, message: string): void;
-    $createConnection(id: string): Promise<void>;
-    $deleteConnection(id: string): Promise<void>;
 }
 
 export interface ConnectionExt {
@@ -1794,6 +1791,7 @@ export const MAIN_RPC_CONTEXT = {
 };
 
 export interface TasksExt {
+    $initLoadedTasks(executions: TaskExecutionDto[]): Promise<void>;
     $provideTasks(handle: number): Promise<TaskDto[] | undefined>;
     $resolveTask(handle: number, task: TaskDto, token?: CancellationToken): Promise<TaskDto | undefined>;
     $onDidStartTask(execution: TaskExecutionDto, terminalId: number): void;

package/src/common/plugin-protocol.ts

@@ -23,8 +23,7 @@ import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-sch
 import { RecursivePartial } from '@theia/core/lib/common/types';
 import { PreferenceSchema, PreferenceSchemaProperties } from '@theia/core/lib/common/preferences/preference-schema';
 import { ProblemMatcherContribution, ProblemPatternContribution, TaskDefinition } from '@theia/task/lib/common';
-// eslint-disable-next-line @theia/runtime-import-check
-import { ColorDefinition } from '@theia/core/lib/browser/color-registry';
+import { ColorDefinition } from '@theia/core/lib/common/color';
 import { ResourceLabelFormatter } from '@theia/core/lib/common/label-protocol';
 
 export const hostedServicePath = '/services/hostedPlugin';
@@ -682,6 +681,7 @@ export interface ViewContainer {
     id: string;
     title: string;
     iconUrl: string;
+    themeIcon?: string;
 }
 
 /**

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

@@ -542,7 +542,7 @@ export class HostedPluginSupport {
 
         // Make sure that folder by the path exists
         if (!await this.fileService.exists(globalStorageFolderUri)) {
-            await this.fileService.createFolder(globalStorageFolderUri);
+            await this.fileService.createFolder(globalStorageFolderUri, { fromUserGesture: false });
         }
         const globalStorageFolderFsPath = await this.fileService.fsPath(globalStorageFolderUri);
         if (!globalStorageFolderFsPath) {

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

@@ -73,8 +73,7 @@ import {
     ProblemPatternContribution,
     TaskDefinition
 } from '@theia/task/lib/common/task-protocol';
-// eslint-disable-next-line @theia/runtime-import-check
-import { ColorDefinition } from '@theia/core/lib/browser/color-registry';
+import { ColorDefinition } from '@theia/core/lib/common/color';
 import { ResourceLabelFormatter } from '@theia/core/lib/common/label-protocol';
 import { PluginUriFactory } from './plugin-uri-factory';
 
@@ -555,10 +554,13 @@ export class TheiaPluginScanner implements PluginScanner {
     }
 
     private readViewContainer(rawViewContainer: PluginPackageViewContainer, pck: PluginPackage): ViewContainer {
+        const themeIcon = rawViewContainer.icon.startsWith('$(') ? rawViewContainer.icon : undefined;
+        const iconUrl = this.toPluginUrl(pck, rawViewContainer.icon);
         return {
             id: rawViewContainer.id,
             title: rawViewContainer.title,
-            iconUrl: this.toPluginUrl(pck, rawViewContainer.icon)
+            iconUrl,
+            themeIcon,
         };
     }
 

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

@@ -32,7 +32,6 @@ import { DebugSourceBreakpoint } from '@theia/debug/lib/browser/model/debug-sour
 import { URI as Uri } from '@theia/core/shared/vscode-uri';
 import { SourceBreakpoint, FunctionBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
 import { DebugConfiguration, DebugSessionOptions } from '@theia/debug/lib/common/debug-configuration';
-import { ConnectionMainImpl } from '../connection-main';
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
 import { DebugProtocol } from 'vscode-debugprotocol';
 import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
@@ -44,7 +43,6 @@ import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribut
 import { PluginDebugSessionContributionRegistrator, PluginDebugSessionContributionRegistry } from './plugin-debug-session-contribution-registry';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { PluginDebugSessionFactory } from './plugin-debug-session-factory';
-import { PluginWebSocketChannel } from '../../../common/connection';
 import { PluginDebugAdapterContributionRegistrator, PluginDebugService } from './plugin-debug-service';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
 import { DebugFunctionBreakpoint } from '@theia/debug/lib/browser/model/debug-function-breakpoint';
@@ -53,6 +51,7 @@ import { ConsoleSessionManager } from '@theia/console/lib/browser/console-sessio
 import { DebugConsoleSession } from '@theia/debug/lib/browser/console/debug-console-session';
 import { ContributionProvider } from '@theia/core/lib/common';
 import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
+import { ConnectionImpl } from '../../../common/connection';
 
 export class DebugMainImpl implements DebugMain, Disposable {
     private readonly debugExt: DebugExt;
@@ -76,7 +75,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
     private readonly debuggerContributions = new Map<string, DisposableCollection>();
     private readonly toDispose = new DisposableCollection();
 
-    constructor(rpc: RPCProtocol, readonly connectionMain: ConnectionMainImpl, container: interfaces.Container) {
+    constructor(rpc: RPCProtocol, readonly connectionMain: ConnectionImpl, container: interfaces.Container) {
         this.debugExt = rpc.getProxy(MAIN_RPC_CONTEXT.DEBUG_EXT);
         this.sessionManager = container.get(DebugSessionManager);
         this.labelProvider = container.get(LabelProvider);
@@ -149,7 +148,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
             this.debugPreferences,
             async (sessionId: string) => {
                 const connection = await this.connectionMain.ensureConnection(sessionId);
-                return new PluginWebSocketChannel(connection);
+                return connection;
             },
             this.fileService,
             terminalOptionsExt,

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

@@ -25,12 +25,12 @@ import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences';
 import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugSession } from '@theia/debug/lib/browser/debug-session';
 import { DebugSessionConnection } from '@theia/debug/lib/browser/debug-session-connection';
-import { IWebSocket } from '@theia/core/shared/vscode-ws-jsonrpc';
 import { TerminalWidgetOptions, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
 import { TerminalOptionsExt } from '../../../common/plugin-api-rpc';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { DebugContribution } from '@theia/debug/lib/browser/debug-contribution';
 import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { Channel } from '@theia/debug/lib/common/debug-service';
 
 export class PluginDebugSession extends DebugSession {
     constructor(
@@ -57,7 +57,7 @@ export class PluginDebugSession extends DebugSession {
 
 /**
  * Session factory for a client debug session that communicates with debug adapter contributed as plugin.
- * The main difference is to use a connection factory that creates [IWebSocket](#IWebSocket) over Rpc channel.
+ * The main difference is to use a connection factory that creates [Channel](#Channel) over Rpc channel.
  */
 export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
     constructor(
@@ -68,7 +68,7 @@ export class PluginDebugSessionFactory extends DefaultDebugSessionFactory {
         protected readonly messages: MessageClient,
         protected readonly outputChannelManager: OutputChannelManager,
         protected readonly debugPreferences: DebugPreferences,
-        protected readonly connectionFactory: (sessionId: string) => Promise<IWebSocket>,
+        protected readonly connectionFactory: (sessionId: string) => Promise<Channel>,
         protected readonly fileService: FileService,
         protected readonly terminalOptionsExt: TerminalOptionsExt | undefined,
         protected readonly debugContributionProvider: ContributionProvider<DebugContribution>

package/src/main/browser/file-system-main-impl.ts

@@ -123,7 +123,7 @@ export class FileSystemMainImpl implements FileSystemMain, Disposable {
     }
 
     $mkdir(uri: UriComponents): Promise<void> {
-        return this._fileService.createFolder(new CoreURI(URI.revive(uri)))
+        return this._fileService.createFolder(new CoreURI(URI.revive(uri)), { fromUserGesture: false })
             .then(() => undefined).catch(FileSystemMainImpl._handleError);
     }
 

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

@@ -18,7 +18,7 @@ import { CommandRegistryMainImpl } from './command-registry-main';
 import { PreferenceRegistryMainImpl } from './preference-registry-main';
 import { QuickOpenMainImpl } from './quick-open-main';
 import { RPCProtocol } from '../../common/rpc-protocol';
-import { PLUGIN_RPC_CONTEXT, LanguagesMainFactory, OutputChannelRegistryFactory } from '../../common/plugin-api-rpc';
+import { PLUGIN_RPC_CONTEXT, LanguagesMainFactory, OutputChannelRegistryFactory, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
 import { MessageRegistryMainImpl } from './message-registry-main';
 import { WindowStateMain } from './window-state-main';
 import { WorkspaceMainImpl } from './workspace-main';
@@ -29,7 +29,7 @@ import { TerminalServiceMainImpl } from './terminal-main';
 import { DialogsMainImpl } from './dialogs-main';
 import { TreeViewsMainImpl } from './view/tree-views-main';
 import { NotificationMainImpl } from './notification-main';
-import { ConnectionMainImpl } from './connection-main';
+import { ConnectionImpl } from '../../common/connection';
 import { WebviewsMainImpl } from './webviews-main';
 import { TasksMainImpl } from './tasks-main';
 import { StorageMainImpl } from './plugin-storage';
@@ -130,7 +130,7 @@ export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container
     const storageMain = new StorageMainImpl(container);
     rpc.set(PLUGIN_RPC_CONTEXT.STORAGE_MAIN, storageMain);
 
-    const connectionMain = new ConnectionMainImpl(rpc);
+    const connectionMain = new ConnectionImpl(rpc.getProxy(MAIN_RPC_CONTEXT.CONNECTION_EXT));
     rpc.set(PLUGIN_RPC_CONTEXT.CONNECTION_MAIN, connectionMain);
 
     const tasksMain = new TasksMainImpl(rpc, container);

package/src/main/browser/style/tree.css

@@ -40,3 +40,7 @@
     margin-bottom: 10px;
     margin-left: 17px;
 }
+
+.theia-tree-view .theia-TreeNode:not(:hover):not(.theia-mod-selected) .theia-tree-view-inline-action {
+    display: none;
+}

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

@@ -97,6 +97,13 @@ export class TasksMainImpl implements TasksMain, Disposable {
                 this.proxy.$onDidEndTaskProcess(event.code, event.taskId);
             }
         }));
+
+        // Inform proxy about running tasks form previous session
+        this.$taskExecutions().then(executions => {
+            if (executions.length > 0) {
+                this.proxy.$initLoadedTasks(executions);
+            }
+        });
     }
 
     dispose(): void {

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

@@ -218,15 +218,28 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         }
         const toDispose = new DisposableCollection();
         const containerClass = 'theia-plugin-view-container';
+        let themeIconClass = '';
         const iconClass = 'plugin-view-container-icon-' + viewContainer.id;
-        const iconUrl = PluginSharedStyle.toExternalIconUrl(viewContainer.iconUrl);
-        toDispose.push(this.style.insertRule('.' + containerClass + '.' + iconClass, () => `
+
+        if (viewContainer.themeIcon) {
+            const icon = monaco.theme.ThemeIcon.fromString(viewContainer.themeIcon);
+            if (icon) {
+                themeIconClass = monaco.theme.ThemeIcon.asClassName(icon) ?? '';
+            }
+        }
+
+        if (!themeIconClass) {
+            const iconUrl = PluginSharedStyle.toExternalIconUrl(viewContainer.iconUrl);
+            toDispose.push(this.style.insertRule('.' + containerClass + '.' + iconClass, () => `
                 mask: url('${iconUrl}') no-repeat 50% 50%;
                 -webkit-mask: url('${iconUrl}') no-repeat 50% 50%;
             `));
+        }
+
         toDispose.push(this.doRegisterViewContainer(viewContainer.id, location, {
             label: viewContainer.title,
-            iconClass: containerClass + ' ' + iconClass,
+            // The container class automatically sets a mask; if we're using a theme icon, we don't want one.
+            iconClass: (themeIconClass || containerClass) + ' ' + iconClass,
             closeable: true
         }));
         return toDispose;

package/src/main/browser/view/tree-view-widget.tsx

@@ -37,7 +37,7 @@ import { MenuPath, MenuModelRegistry, ActionMenuNode } from '@theia/core/lib/com
 import * as React from '@theia/core/shared/react';
 import { PluginSharedStyle } from '../plugin-shared-style';
 import { ViewContextKeyService } from './view-context-key-service';
-import { Widget } from '@theia/core/lib/browser/widgets/widget';
+import { ACTION_ITEM, Widget } from '@theia/core/lib/browser/widgets/widget';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { View } from '../../../common/plugin-protocol';
@@ -327,9 +327,6 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     protected renderTailDecorations(node: TreeViewNode, props: NodeProps): React.ReactNode {
-        if (this.model.selectedNodes.every(selected => selected.id !== node.id) && node.id !== this.hoverNodeId) {
-            return false;
-        }
         return this.contextKeys.with({ view: this.id, viewItem: node.contextValue }, () => {
             const menu = this.menus.getMenu(VIEW_ITEM_INLINE_MENU);
             const arg = this.toTreeViewSelection(node);
@@ -349,27 +346,13 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         if (!icon || !this.commands.isVisible(node.action.commandId, arg) || !this.contextKeys.match(node.action.when)) {
             return false;
         }
-        const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, icon, 'theia-tree-view-inline-action'].join(' ');
+        const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, icon, ACTION_ITEM, 'theia-tree-view-inline-action'].join(' ');
         return <div key={index} className={className} title={node.label} onClick={e => {
             e.stopPropagation();
             this.commands.executeCommand(node.action.commandId, arg);
         }} />;
     }
 
-    protected hoverNodeId: string | undefined;
-    protected setHoverNodeId(hoverNodeId: string | undefined): void {
-        this.hoverNodeId = hoverNodeId;
-        this.update();
-    }
-
-    protected createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
-        return {
-            ...super.createNodeAttributes(node, props),
-            onMouseOver: () => this.setHoverNodeId(node.id),
-            onMouseOut: () => this.setHoverNodeId(undefined)
-        };
-    }
-
     protected toContextMenuArgs(node: SelectableTreeNode): [TreeViewSelection] {
         return [this.toTreeViewSelection(node)];
     }

package/src/plugin/message-registry.ts

@@ -55,12 +55,11 @@ export class MessageRegistryExt {
                     }
                 }
             }
-            for (const item of rest) {
-                pushItem(item);
-            }
-            const actionHandle = await this.proxy.$showMessage(type, message, options, actions);
-            return actionHandle !== undefined ? items[actionHandle] : undefined;
         }
-
+        for (const item of rest) {
+            pushItem(item);
+        }
+        const actionHandle = await this.proxy.$showMessage(type, message, options, actions);
+        return actionHandle !== undefined ? items[actionHandle] : undefined;
     }
 }