npm - @theia/plugin-dev - Versions diffs - 1.70.0-next.26 → 1.70.0-next.34 - Mend

@theia/plugin-dev 1.70.0-next.26 → 1.70.0-next.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/lib/browser/hosted-plugin-controller.d.ts +2 -1
package/lib/browser/hosted-plugin-controller.d.ts.map +1 -1
package/lib/browser/hosted-plugin-controller.js +17 -0
package/lib/browser/hosted-plugin-controller.js.map +1 -1
package/lib/browser/hosted-plugin-manager-client.d.ts +2 -0
package/lib/browser/hosted-plugin-manager-client.d.ts.map +1 -1
package/lib/browser/hosted-plugin-manager-client.js +45 -10
package/lib/browser/hosted-plugin-manager-client.js.map +1 -1
package/lib/common/hosted-plugin-preferences.js +1 -1
package/lib/common/hosted-plugin-preferences.js.map +1 -1
package/lib/node/hosted-instance-manager.d.ts +2 -0
package/lib/node/hosted-instance-manager.d.ts.map +1 -1
package/lib/node/hosted-instance-manager.js +27 -20
package/lib/node/hosted-instance-manager.js.map +1 -1
package/package.json +8 -8
package/src/browser/hosted-plugin-controller.ts +18 -1
package/src/browser/hosted-plugin-manager-client.ts +51 -11
package/src/common/hosted-plugin-preferences.ts +1 -1
package/src/node/hosted-instance-manager.ts +27 -19

package/lib/browser/hosted-plugin-controller.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { StatusBar } from '@theia/core/lib/browser/status-bar/status-bar';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { FrontendApplicationContribution, OnWillStopAction } from '@theia/core/lib/browser';
 import { MessageService, PreferenceChange, PreferenceServiceImpl } from '@theia/core/lib/common';
 import { CommandRegistry } from '@theia/core/shared/@lumino/commands';
 import { Menu } from '@theia/core/shared/@lumino/widgets';
@@ -29,6 +29,7 @@ export declare class HostedPluginController implements FrontendApplicationContri
     private pluginState;
     private watcherSuccess;
     private entry;
+    onWillStop(): OnWillStopAction | undefined;
     initialize(): void;
     /**
      * Display status bar element for stopped plugin.

package/lib/browser/hosted-plugin-controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-plugin-controller.d.ts","sourceRoot":"","sources":["../../src/browser/hosted-plugin-controller.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAsC,+BAA+B,EAAW,MAAM,yBAAyB,CAAC;~~AACvH~~,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAC1D,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,uBAAuB,EAAoB,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAA6C,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC1I,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E;;;GAGG;AACH,qBACa,sBAAuB,YAAW,+BAA+B;IAE1E,gBAAuB,aAAa,mBAAmB;IACvD,gBAAuB,qBAAqB,2BAA2B;IACvE,gBAAuB,oBAAoB,0BAA0B;IAGrE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,+BAA+B,EAAE,+BAA+B,CAAC;IAGpF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,eAAe,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,OAAO,CAAC,WAAW,CAAoD;IAEvE,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,KAAK,CAA6B;~~IAEnC~~,UAAU,IAAI,IAAI;IAqCzB;;OAEG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBtD;;OAEG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAevD;;OAEG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBtD;;OAEG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;cAgBrC,oBAAoB,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBjF;;;;OAIG;cACa,cAAc,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YAqB1D,mBAAmB;IAWjC,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA2BjC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IAe9C;;OAEG;IACH,SAAS,CAAC,2BAA2B,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IAwBlF;;OAEG;IACH,SAAS,CAAC,2BAA2B,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;CAwBrF"}
1	+ {"version":3,"file":"hosted-plugin-controller.d.ts","sourceRoot":"","sources":["../../src/browser/hosted-plugin-controller.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAsC,+BAA+B,EAAE,gBAAgB,EAAW,MAAM,yBAAyB,CAAC;AACzI,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAC1D,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,uBAAuB,EAAoB,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAA6C,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC1I,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E;;;GAGG;AACH,qBACa,sBAAuB,YAAW,+BAA+B;IAE1E,gBAAuB,aAAa,mBAAmB;IACvD,gBAAuB,qBAAqB,2BAA2B;IACvE,gBAAuB,oBAAoB,0BAA0B;IAGrE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,+BAA+B,EAAE,+BAA+B,CAAC;IAGpF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,eAAe,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,OAAO,CAAC,WAAW,CAAoD;IAEvE,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,KAAK,CAA6B;IAE1C,UAAU,IAAI,gBAAgB,GAAG,SAAS;IAiBnC,UAAU,IAAI,IAAI;IAqCzB;;OAEG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBtD;;OAEG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAevD;;OAEG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBtD;;OAEG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;cAgBrC,oBAAoB,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBjF;;;;OAIG;cACa,cAAc,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YAqB1D,mBAAmB;IAWjC,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA2BjC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IAe9C;;OAEG;IACH,SAAS,CAAC,2BAA2B,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IAwBlF;;OAEG;IACH,SAAS,CAAC,2BAA2B,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;CAwBrF"}

package/lib/browser/hosted-plugin-controller.js CHANGED Viewed

@@ -43,6 +43,23 @@ let HostedPluginController = class HostedPluginController {
     static { this.HOSTED_PLUGIN = 'hosted-plugin'; }
     static { this.HOSTED_PLUGIN_OFFLINE = 'hosted-plugin-offline'; }
     static { this.HOSTED_PLUGIN_FAILED = 'hosted-plugin-failed'; }
+    onWillStop() {
+        if (this.pluginState === hosted_plugin_manager_client_1.HostedInstanceState.RUNNING || this.pluginState === hosted_plugin_manager_client_1.HostedInstanceState.STARTING) {
+            return {
+                reason: 'Hosted plugin instance is still running',
+                action: async () => {
+                    try {
+                        await this.hostedPluginManagerClient.stop(false);
+                    }
+                    catch {
+                        // Best effort — don't block shutdown if termination fails
+                    }
+                    return true;
+                }
+            };
+        }
+        return undefined;
+    }
     initialize() {
         this.hostedPluginServer.getHostedPlugin().then(pluginMetadata => {
             if (!pluginMetadata) {

package/lib/browser/hosted-plugin-controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-plugin-controller.js","sourceRoot":"","sources":["../../src/browser/hosted-plugin-controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"hosted-plugin-controller.js","sourceRoot":"","sources":["../../src/browser/hosted-plugin-controller.ts"],"names":[],"mappings":"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"}

package/lib/browser/hosted-plugin-manager-client.d.ts CHANGED Viewed

@@ -41,8 +41,10 @@ export interface HostedInstanceData {
 export declare class HostedPluginManagerClient {
     private openNewTabAskDialog;
     private connection;
+    protected hostedPluginSessionId: string | undefined;
     protected pluginLocation: URI | undefined;
     protected pluginInstanceURL: string | undefined;
+    protected hostedWindowId: number | undefined;
     protected isDebug: boolean;
     protected readonly stateChanged: Emitter<HostedInstanceData>;
     get onStateChanged(): Event<HostedInstanceData>;

package/lib/browser/hosted-plugin-manager-client.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-plugin-manager-client.d.ts","sourceRoot":"","sources":["../../src/browser/hosted-plugin-manager-client.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,aAAa,EAA4B,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAwB,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAC5H,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAG3F;;GAEG;AACH,yBAAiB,oBAAoB,CAAC;IAG3B,MAAM,KAAK,SAI8C,CAAC;IAE1D,MAAM,KAAK,SAI8C,CAAC;IAE1D,MAAM,IAAI,SAI8C,CAAC;IAEzD,MAAM,OAAO,SAI8C,CAAC;IAE5D,MAAM,WAAW,SAIqC,CAAC;CACjE;AAED;;GAEG;AACH,oBAAY,mBAAmB;IAC3B,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,kBAAkB;IAC/B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,cAAc,EAAE,GAAG,CAAC;CACvB;AAED;;GAEG;AACH,qBACa,yBAAyB;IAClC,OAAO,CAAC,mBAAmB,CAA+B;IAE1D,OAAO,CAAC,UAAU,CAAyB;IAG3C,SAAS,CAAC,cAAc,EAAE,GAAG,GAAG,SAAS,CAAC;IAG1C,SAAS,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;~~IAEhD~~,SAAS,CAAC,OAAO,UAAS;IAE1B,SAAS,CAAC,QAAQ,CAAC,YAAY,8BAAqC;IAEpE,IAAI,cAAc,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAE9C;IAGD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,eAAe,CAAC;IAEvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAEpD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,IAAI,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAK3C;IAEK,KAAK,CAAC,WAAW,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC5D,KAAK,CAAC,MAAM,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOrE,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAyBzC~~,IAAI,CAAC,YAAY,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;~~IAiBjD~~,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0C9B;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBvC,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,GAAG,IAAI;~~IAYtE~~;;OAEG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;~~cAgBjC~~,YAAY,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BvG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAI7C,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,oBAAoB;CAY/B"}
1	+ {"version":3,"file":"hosted-plugin-manager-client.d.ts","sourceRoot":"","sources":["../../src/browser/hosted-plugin-manager-client.ts"],"names":[],"mappings":"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"}

package/lib/browser/hosted-plugin-manager-client.js CHANGED Viewed

@@ -158,7 +158,9 @@ let HostedPluginManagerClient = class HostedPluginManagerClient {
                 name,
                 smartStep: true,
                 sourceMaps: !!outFiles,
-                outFiles
+                outFiles,
+                parentSessionId: this.hostedPluginSessionId,
+                lifecycleManagedByParent: true,
             }
         });
     }
@@ -170,6 +172,20 @@ let HostedPluginManagerClient = class HostedPluginManagerClient {
         try {
             this.stateChanged.fire({ state: HostedInstanceState.STOPPING, pluginLocation: this.pluginLocation });
             await this.hostedPluginServer.terminateHostedPluginInstance();
+            if (this.hostedWindowId !== undefined) {
+                this.windowService.closeWindow(this.hostedWindowId);
+                this.hostedWindowId = undefined;
+            }
+            // Terminate the parent pwa-extensionHost debug session (and its children)
+            // so that stopping the hosted instance also ends all related debug sessions,
+            // matching VS Code's behavior where they are tightly coupled.
+            if (this.hostedPluginSessionId) {
+                const session = this.debugSessionManager.sessions.find(s => s.id === this.hostedPluginSessionId);
+                if (session) {
+                    this.debugSessionManager.terminateSession(session);
+                }
+                this.hostedPluginSessionId = undefined;
+            }
             this.messageService.info((this.pluginInstanceURL
                 ? nls_1.nls.localize('theia/plugin-dev/instanceTerminated', '{0} has been terminated', this.pluginInstanceURL)
                 : nls_1.nls.localize('theia/plugin-dev/unknownTerminated', 'The instance has been terminated')));
@@ -249,28 +265,47 @@ let HostedPluginManagerClient = class HostedPluginManagerClient {
     register(configType, connection) {
         if (configType === 'pwa-extensionHost') {
             this.connection = connection;
+            this.hostedPluginSessionId = connection.sessionId;
             this.connection.onRequest('launchVSCode', (request) => this.launchVSCode(request));
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             this.connection.on('exited', async (args) => {
                 await this.stop();
             });
+            // Stop the hosted instance when the parent pwa-extensionHost session or any
+            // of its child sessions (e.g. "Hosted Plugin: Remote Process") are destroyed.
+            // The 'exited' event may not fire because the hosted backend process is not a
+            // child of the debug adapter.
+            const onDestroy = this.debugSessionManager.onDidDestroyDebugSession(async (session) => {
+                const isParent = session.id === this.hostedPluginSessionId;
+                const isChild = session.parentSession?.id === this.hostedPluginSessionId;
+                if ((isParent || isChild) && await this.hostedPluginServer.isHostedPluginInstanceRunning()) {
+                    onDestroy.dispose();
+                    await this.stop(false);
+                }
+            });
         }
     }
     /**
      * Opens window with URL to the running plugin instance.
      */
     async openPluginWindow() {
-        // do nothing for electron browser
-        if (browser_1.isNative) {
-            return;
-        }
         if (this.pluginInstanceURL) {
-            try {
-                this.windowService.openNewWindow(this.pluginInstanceURL);
+            if (browser_1.isNative) {
+                // In Electron, the hosted backend is a headless Node.js server process.
+                // Open a new default window (file:// URL) pointing to the hosted backend's
+                // port, just like normal Electron windows. This ensures the origin is
+                // file:// which passes the ElectronWsOriginValidator.
+                const port = new URL(this.pluginInstanceURL).port;
+                this.hostedWindowId = await this.windowService.openNewDefaultWindow({ search: { port } });
             }
-            catch (err) {
-                // browser blocked opening of a new tab
-                this.openNewTabAskDialog.showOpenNewTabAskDialog(this.pluginInstanceURL);
+            else {
+                try {
+                    this.windowService.openNewWindow(this.pluginInstanceURL);
+                }
+                catch (err) {
+                    // browser blocked opening of a new tab
+                    this.openNewTabAskDialog.showOpenNewTabAskDialog(this.pluginInstanceURL);
+                }
             }
         }
     }

package/lib/browser/hosted-plugin-manager-client.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-plugin-manager-client.js","sourceRoot":"","sources":["../../src/browser/hosted-plugin-manager-client.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"hosted-plugin-manager-client.js","sourceRoot":"","sources":["../../src/browser/hosted-plugin-manager-client.ts"],"names":[],"mappings":"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"}

package/lib/common/hosted-plugin-preferences.js CHANGED Viewed

@@ -59,7 +59,7 @@ exports.HostedPluginConfigSchema = {
                     }
                 },
             },
-            default: undefined,
+            default: [],
             description: nls_1.nls.localize('theia/plugin-dev/debugPorts', 'Port configuration per server for Node.js debug'),
         }
     }

package/lib/common/hosted-plugin-preferences.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-plugin-preferences.js","sourceRoot":"","sources":["../../src/common/hosted-plugin-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAmEhF,gEAEC;AAED,kEAQC;AA5ED,mDAA6I;AAC7I,oDAAiD;AAGpC,QAAA,wBAAwB,GAAqB;IACtD,UAAU,EAAE;QACR,yBAAyB,EAAE;YACvB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,yCAAyC,CAAC;YAClG,OAAO,EAAE,IAAI;SAChB;QACD,yBAAyB,EAAE;YACvB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,gDAAgD,CAAC;YACzG,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;SACnC;QACD,8BAA8B,EAAE;YAC5B,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;YACD,mBAAmB,EAAE,SAAG,CAAC,QAAQ,CAC7B,iCAAiC,EACjC,0HAA0H,CAC7H;YACD,OAAO,EAAE,CAAC,2BAA2B,CAAC;SACzC;QACD,0BAA0B,EAAE;YACxB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,YAAY,EAAE;wBACV,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,wCAAwC,EAC9D,qFAAqF;4BACrF,uEAAuE,CAAC;qBAC/E;oBACD,WAAW,EAAE;wBACT,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,CAAC;wBACV,OAAO,EAAE,KAAK;wBACd,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,uCAAuC,EAAE,8CAA8C,CAAC;qBACrH;iBACJ;aACJ;YACD,OAAO,EAAE,~~SAAS~~;~~YAClB~~,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,6BAA6B,EAAE,iDAAiD,CAAC;SAC9G;KACJ;CACJ,CAAC;AASW,QAAA,kCAAkC,GAAG,MAAM,CAAC,oCAAoC,CAAC,CAAC;AAClF,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAGzE,SAAgB,0BAA0B,CAAC,WAA8B,EAAE,SAA2B,gCAAwB;IAC1H,OAAO,IAAA,8BAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,2BAA2B,CAAC,IAAqB;IAC7D,IAAI,CAAC,+BAAuB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,0BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,0CAAkC,CAAC,CAAC;QACnG,OAAO,0BAA0B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,0CAAkC,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,gCAAwB,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,+BAAsB,CAAC,CAAC,SAAS,CAAC,0CAAkC,CAAC,CAAC;AAC/E,CAAC"}
1	+ {"version":3,"file":"hosted-plugin-preferences.js","sourceRoot":"","sources":["../../src/common/hosted-plugin-preferences.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAmEhF,gEAEC;AAED,kEAQC;AA5ED,mDAA6I;AAC7I,oDAAiD;AAGpC,QAAA,wBAAwB,GAAqB;IACtD,UAAU,EAAE;QACR,yBAAyB,EAAE;YACvB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,yCAAyC,CAAC;YAClG,OAAO,EAAE,IAAI;SAChB;QACD,yBAAyB,EAAE;YACvB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,gDAAgD,CAAC;YACzG,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;SACnC;QACD,8BAA8B,EAAE;YAC5B,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;YACD,mBAAmB,EAAE,SAAG,CAAC,QAAQ,CAC7B,iCAAiC,EACjC,0HAA0H,CAC7H;YACD,OAAO,EAAE,CAAC,2BAA2B,CAAC;SACzC;QACD,0BAA0B,EAAE;YACxB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,YAAY,EAAE;wBACV,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,wCAAwC,EAC9D,qFAAqF;4BACrF,uEAAuE,CAAC;qBAC/E;oBACD,WAAW,EAAE;wBACT,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,CAAC;wBACV,OAAO,EAAE,KAAK;wBACd,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,uCAAuC,EAAE,8CAA8C,CAAC;qBACrH;iBACJ;aACJ;YACD,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,6BAA6B,EAAE,iDAAiD,CAAC;SAC9G;KACJ;CACJ,CAAC;AASW,QAAA,kCAAkC,GAAG,MAAM,CAAC,oCAAoC,CAAC,CAAC;AAClF,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAGzE,SAAgB,0BAA0B,CAAC,WAA8B,EAAE,SAA2B,gCAAwB;IAC1H,OAAO,IAAA,8BAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,2BAA2B,CAAC,IAAqB;IAC7D,IAAI,CAAC,+BAAuB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,0BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,0CAAkC,CAAC,CAAC;QACnG,OAAO,0BAA0B,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,0CAAkC,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,gCAAwB,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,+BAAsB,CAAC,CAAC,SAAS,CAAC,0CAAkC,CAAC,CAAC;AAC/E,CAAC"}

package/lib/node/hosted-instance-manager.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import * as cp from 'child_process';
 import URI from '@theia/core/lib/common/uri';
 import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import { HostedPluginUriPostProcessor } from './hosted-plugin-uri-postprocessor';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin';
 import { MetadataScanner } from '@theia/plugin-ext/lib/hosted/node/metadata-scanner';
 import { PluginDebugConfiguration } from '../common/plugin-dev-protocol';
@@ -63,6 +64,7 @@ export declare abstract class AbstractHostedInstanceManager implements HostedIns
     protected readonly metadata: MetadataScanner;
     protected readonly hostedPluginProcess: HostedPluginProcess;
     protected readonly request: RequestService;
+    protected readonly envVariablesServer: EnvVariablesServer;
     isRunning(): boolean;
     run(pluginUri: URI, port?: number): Promise<URI>;
     debug(pluginUri: URI, debugConfig: PluginDebugConfiguration): Promise<URI>;

package/lib/node/hosted-instance-manager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-instance-manager.d.ts","sourceRoot":"","sources":["../../src/node/hosted-instance-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnF,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAIpC,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,4BAA4B,EAA0C,MAAM,mCAAmC,CAAC;~~AAIzH~~,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAK9F,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,SAAS,IAAI,OAAO,CAAC;IAErB;;;;;;OAMG;IACH,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3E;;;OAGG;IACH,SAAS,IAAI,IAAI,CAAC;IAElB;;;OAGG;IACH,cAAc,IAAI,GAAG,CAAC;IAEtB;;;OAGG;IACH,YAAY,IAAI,GAAG,CAAC;IAEpB;;;;OAIG;IACH,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7C;~~AASD~~,8BACsB,6BAA8B,YAAW,qBAAqB;IAChF,SAAS,CAAC,qBAAqB,EAAE,EAAE,CAAC,YAAY,CAAC;IACjD,SAAS,CAAC,eAAe,EAAE,OAAO,CAAS;IAC3C,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC;IAC3B,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC;IACzB,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;~~IAE3C~~,SAAS,IAAI,OAAO;IAId,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIhD,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC;YAIlE,KAAK;~~IAgCnB~~,SAAS,IAAI,IAAI;IAUjB,cAAc,IAAI,GAAG;IAOrB,YAAY,IAAI,GAAG;IAOnB;;OAEG;IACU,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAInD;;;;;OAKG;YACW,QAAQ;IAetB;;OAEG;YACW,IAAI;IAWZ,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;cAc/B,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;~~cA6CzF~~,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;cAI9C,0BAA0B,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAItH,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;cA0CjF,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAcvD;AAED,qBACa,sBAAuB,SAAQ,6BAA6B;IAErE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;cAEhE,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;cAO9C,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAO5D,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAQrH;AAED,qBACa,8BAA+B,SAAQ,6BAA6B;CAEhF"}
1	+ {"version":3,"file":"hosted-instance-manager.d.ts","sourceRoot":"","sources":["../../src/node/hosted-instance-manager.ts"],"names":[],"mappings":"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"}

package/lib/node/hosted-instance-manager.js CHANGED Viewed

@@ -28,6 +28,7 @@ const contribution_provider_1 = require("@theia/core/lib/common/contribution-pro
 const hosted_plugin_uri_postprocessor_1 = require("./hosted-plugin-uri-postprocessor");
 const core_1 = require("@theia/core");
 const file_uri_1 = require("@theia/core/lib/common/file-uri");
+const env_variables_1 = require("@theia/core/lib/common/env-variables");
 const types_1 = require("@theia/plugin-ext/lib/common/types");
 const hosted_plugin_1 = require("@theia/plugin-ext/lib/hosted/node/hosted-plugin");
 const metadata_scanner_1 = require("@theia/plugin-ext/lib/hosted/node/metadata-scanner");
@@ -39,7 +40,6 @@ const HOSTED_INSTANCE_START_TIMEOUT_MS = 30000;
 const THEIA_INSTANCE_REGEX = /.*Theia app listening on (.*).*\./;
 const PROCESS_OPTIONS = {
     cwd: process.cwd(),
-    env: { ...process.env }
 };
 let AbstractHostedInstanceManager = class AbstractHostedInstanceManager {
     constructor() {
@@ -62,11 +62,23 @@ let AbstractHostedInstanceManager = class AbstractHostedInstanceManager {
         let command;
         let processOptions;
         if (pluginUri.scheme === 'file') {
-            processOptions = { ...PROCESS_OPTIONS };
+            processOptions = { ...PROCESS_OPTIONS, env: { ...process.env } };
             // get filesystem path that work cross operating systems
             processOptions.env.HOSTED_PLUGIN = file_uri_1.FileUri.fsPath(pluginUri.toString());
-            // Disable all the other plugins on this instance
-            processOptions.env.THEIA_PLUGINS = '';
+            // Use an isolated config directory for the hosted instance so that its
+            // workspace state (recentworkspace.json, etc.) does not overwrite the
+            // main application's state.
+            const configDirUri = await this.envVariablesServer.getConfigDirUri();
+            const configDirPath = file_uri_1.FileUri.fsPath(configDirUri);
+            const hostedConfigDir = path.join(configDirPath, 'hosted-instance');
+            await fs.ensureDir(hostedConfigDir);
+            processOptions.env.THEIA_CONFIG_DIR = hostedConfigDir;
+            if (core_1.environment.electron.is()) {
+                // When running in Electron, the backend process uses the Electron binary as its
+                // Node.js runtime. Set ELECTRON_RUN_AS_NODE so the spawned backend instance runs
+                // as a plain Node.js process rather than launching a new Electron app window.
+                processOptions.env.ELECTRON_RUN_AS_NODE = '1';
+            }
             command = await this.getStartCommand(port, debugConfig);
         }
         else {
@@ -160,22 +172,13 @@ let AbstractHostedInstanceManager = class AbstractHostedInstanceManager {
     }
     async getStartCommand(port, debugConfig) {
         const processArguments = process.argv;
-        let command;
-        if (core_1.environment.electron.is()) {
-            command = ['npm', 'run', 'theia', 'start'];
-        }
-        else {
-            command = processArguments.filter((arg, index, args) => {
-                // remove --port=X and --port X arguments if set
-                // remove --plugins arguments
-                if (arg.startsWith('--port') || args[index - 1] === '--port') {
-                    return;
-                }
-                else {
-                    return arg;
-                }
-            });
-        }
+        const command = processArguments.filter((arg, index, args) => {
+            // remove --port=X and --port X arguments if set
+            if (arg.startsWith('--port') || args[index - 1] === '--port') {
+                return false;
+            }
+            return true;
+        });
         if (process.env.HOSTED_PLUGIN_HOSTNAME) {
             command.push('--hostname=' + process.env.HOSTED_PLUGIN_HOSTNAME);
         }
@@ -286,6 +289,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(request_1.RequestService),
     tslib_1.__metadata("design:type", Object)
 ], AbstractHostedInstanceManager.prototype, "request", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(env_variables_1.EnvVariablesServer),
+    tslib_1.__metadata("design:type", Object)
+], AbstractHostedInstanceManager.prototype, "envVariablesServer", void 0);
 exports.AbstractHostedInstanceManager = AbstractHostedInstanceManager = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], AbstractHostedInstanceManager);

package/lib/node/hosted-instance-manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hosted-instance-manager.js","sourceRoot":"","sources":["../../src/node/hosted-instance-manager.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"hosted-instance-manager.js","sourceRoot":"","sources":["../../src/node/hosted-instance-manager.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,16 +1,16 @@
 {
   "name": "@theia/plugin-dev",
-  "version": "1.70.0-next.26+b40555ef6",
+  "version": "1.70.0-next.34+86ff81264",
   "description": "Theia - Plugin Development Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/core": "1.70.0-next.26+b40555ef6",
-    "@theia/debug": "1.70.0-next.26+b40555ef6",
-    "@theia/filesystem": "1.70.0-next.26+b40555ef6",
-    "@theia/output": "1.70.0-next.26+b40555ef6",
-    "@theia/plugin-ext": "1.70.0-next.26+b40555ef6",
-    "@theia/workspace": "1.70.0-next.26+b40555ef6",
+    "@theia/core": "1.70.0-next.34+86ff81264",
+    "@theia/debug": "1.70.0-next.34+86ff81264",
+    "@theia/filesystem": "1.70.0-next.34+86ff81264",
+    "@theia/output": "1.70.0-next.34+86ff81264",
+    "@theia/plugin-ext": "1.70.0-next.34+86ff81264",
+    "@theia/workspace": "1.70.0-next.34+86ff81264",
     "tslib": "^2.6.2"
   },
   "publishConfig": {
@@ -53,5 +53,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "b40555ef601736234983a8381eb2da6504994aaa"
+  "gitHead": "86ff81264416872843cdfca6aebb2bd855e2ab6a"
 }

package/src/browser/hosted-plugin-controller.ts CHANGED Viewed

@@ -16,7 +16,7 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { StatusBar } from '@theia/core/lib/browser/status-bar/status-bar';
-import { StatusBarAlignment, StatusBarEntry, FrontendApplicationContribution, codicon } from '@theia/core/lib/browser';
+import { StatusBarAlignment, StatusBarEntry, FrontendApplicationContribution, OnWillStopAction, codicon } from '@theia/core/lib/browser';
 import { MessageService, PreferenceChange, PreferenceServiceImpl } from '@theia/core/lib/common';
 import { CommandRegistry } from '@theia/core/shared/@lumino/commands';
 import { Menu } from '@theia/core/shared/@lumino/widgets';
@@ -71,6 +71,23 @@ export class HostedPluginController implements FrontendApplicationContribution {
     private watcherSuccess: boolean;
     private entry: StatusBarEntry | undefined;
+    onWillStop(): OnWillStopAction | undefined {
+        if (this.pluginState === HostedInstanceState.RUNNING || this.pluginState === HostedInstanceState.STARTING) {
+            return {
+                reason: 'Hosted plugin instance is still running',
+                action: async () => {
+                    try {
+                        await this.hostedPluginManagerClient.stop(false);
+                    } catch {
+                        // Best effort — don't block shutdown if termination fails
+                    }
+                    return true;
+                }
+            };
+        }
+        return undefined;
+    }
     public initialize(): void {
         this.hostedPluginServer.getHostedPlugin().then(pluginMetadata => {
             if (!pluginMetadata) {

package/src/browser/hosted-plugin-manager-client.ts CHANGED Viewed

@@ -93,12 +93,18 @@ export class HostedPluginManagerClient {
     private connection: DebugSessionConnection;
+    // Session ID of the parent pwa-extensionHost debug session
+    protected hostedPluginSessionId: string | undefined;
     // path to the plugin on the file system
     protected pluginLocation: URI | undefined;
     // URL to the running plugin instance
     protected pluginInstanceURL: string | undefined;
+    // Electron window ID of the hosted plugin window, for closing on shutdown
+    protected hostedWindowId: number | undefined;
     protected isDebug = false;
     protected readonly stateChanged = new Emitter<HostedInstanceData>();
@@ -212,7 +218,9 @@ export class HostedPluginManagerClient {
                 name,
                 smartStep: true,
                 sourceMaps: !!outFiles,
-                outFiles
+                outFiles,
+                parentSessionId: this.hostedPluginSessionId,
+                lifecycleManagedByParent: true,
             }
         });
     }
@@ -225,6 +233,20 @@ export class HostedPluginManagerClient {
         try {
             this.stateChanged.fire({ state: HostedInstanceState.STOPPING, pluginLocation: this.pluginLocation! });
             await this.hostedPluginServer.terminateHostedPluginInstance();
+            if (this.hostedWindowId !== undefined) {
+                this.windowService.closeWindow(this.hostedWindowId);
+                this.hostedWindowId = undefined;
+            }
+            // Terminate the parent pwa-extensionHost debug session (and its children)
+            // so that stopping the hosted instance also ends all related debug sessions,
+            // matching VS Code's behavior where they are tightly coupled.
+            if (this.hostedPluginSessionId) {
+                const session = this.debugSessionManager.sessions.find(s => s.id === this.hostedPluginSessionId);
+                if (session) {
+                    this.debugSessionManager.terminateSession(session);
+                }
+                this.hostedPluginSessionId = undefined;
+            }
             this.messageService.info((this.pluginInstanceURL
                 ? nls.localize('theia/plugin-dev/instanceTerminated', '{0} has been terminated', this.pluginInstanceURL)
                 : nls.localize('theia/plugin-dev/unknownTerminated', 'The instance has been terminated')));
@@ -306,12 +328,26 @@ export class HostedPluginManagerClient {
     register(configType: string, connection: DebugSessionConnection): void {
         if (configType === 'pwa-extensionHost') {
             this.connection = connection;
+            this.hostedPluginSessionId = connection.sessionId;
             this.connection.onRequest('launchVSCode', (request: LaunchVSCodeRequest) => this.launchVSCode(request));
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             this.connection.on('exited', async (args: any) => {
                 await this.stop();
             });
+            // Stop the hosted instance when the parent pwa-extensionHost session or any
+            // of its child sessions (e.g. "Hosted Plugin: Remote Process") are destroyed.
+            // The 'exited' event may not fire because the hosted backend process is not a
+            // child of the debug adapter.
+            const onDestroy = this.debugSessionManager.onDidDestroyDebugSession(async session => {
+                const isParent = session.id === this.hostedPluginSessionId;
+                const isChild = session.parentSession?.id === this.hostedPluginSessionId;
+                if ((isParent || isChild) && await this.hostedPluginServer.isHostedPluginInstanceRunning()) {
+                    onDestroy.dispose();
+                    await this.stop(false);
+                }
+            });
         }
     }
@@ -319,17 +355,21 @@ export class HostedPluginManagerClient {
      * Opens window with URL to the running plugin instance.
      */
     protected async openPluginWindow(): Promise<void> {
-        // do nothing for electron browser
-        if (isNative) {
-            return;
-        }
         if (this.pluginInstanceURL) {
-            try {
-                this.windowService.openNewWindow(this.pluginInstanceURL);
-            } catch (err) {
-                // browser blocked opening of a new tab
-                this.openNewTabAskDialog.showOpenNewTabAskDialog(this.pluginInstanceURL);
+            if (isNative) {
+                // In Electron, the hosted backend is a headless Node.js server process.
+                // Open a new default window (file:// URL) pointing to the hosted backend's
+                // port, just like normal Electron windows. This ensures the origin is
+                // file:// which passes the ElectronWsOriginValidator.
+                const port = new URL(this.pluginInstanceURL).port;
+                this.hostedWindowId = await this.windowService.openNewDefaultWindow({ search: { port } });
+            } else {
+                try {
+                    this.windowService.openNewWindow(this.pluginInstanceURL);
+                } catch (err) {
+                    // browser blocked opening of a new tab
+                    this.openNewTabAskDialog.showOpenNewTabAskDialog(this.pluginInstanceURL);
+                }
             }
         }
     }

package/src/common/hosted-plugin-preferences.ts CHANGED Viewed

@@ -62,7 +62,7 @@ export const HostedPluginConfigSchema: PreferenceSchema = {
                     }
                 },
             },
-            default: undefined,
+            default: [],
             description: nls.localize('theia/plugin-dev/debugPorts', 'Port configuration per server for Node.js debug'),
         }
     }

package/src/node/hosted-instance-manager.ts CHANGED Viewed

@@ -25,6 +25,7 @@ import { ContributionProvider } from '@theia/core/lib/common/contribution-provid
 import { HostedPluginUriPostProcessor, HostedPluginUriPostProcessorSymbolName } from './hosted-plugin-uri-postprocessor';
 import { environment, isWindows } from '@theia/core';
 import { FileUri } from '@theia/core/lib/common/file-uri';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { LogType } from '@theia/plugin-ext/lib/common/types';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/node/hosted-plugin';
 import { MetadataScanner } from '@theia/plugin-ext/lib/hosted/node/metadata-scanner';
@@ -92,7 +93,6 @@ const HOSTED_INSTANCE_START_TIMEOUT_MS = 30000;
 const THEIA_INSTANCE_REGEX = /.*Theia app listening on (.*).*\./;
 const PROCESS_OPTIONS = {
     cwd: process.cwd(),
-    env: { ...process.env }
 };
 @injectable()
@@ -115,6 +115,9 @@ export abstract class AbstractHostedInstanceManager implements HostedInstanceMan
     @inject(RequestService)
     protected readonly request: RequestService;
+    @inject(EnvVariablesServer)
+    protected readonly envVariablesServer: EnvVariablesServer;
     isRunning(): boolean {
         return this.isPluginRunning;
     }
@@ -136,12 +139,25 @@ export abstract class AbstractHostedInstanceManager implements HostedInstanceMan
         let command: string[];
         let processOptions: cp.SpawnOptions;
         if (pluginUri.scheme === 'file') {
-            processOptions = { ...PROCESS_OPTIONS };
+            processOptions = { ...PROCESS_OPTIONS, env: { ...process.env } };
             // get filesystem path that work cross operating systems
             processOptions.env!.HOSTED_PLUGIN = FileUri.fsPath(pluginUri.toString());
-            // Disable all the other plugins on this instance
-            processOptions.env!.THEIA_PLUGINS = '';
+            // Use an isolated config directory for the hosted instance so that its
+            // workspace state (recentworkspace.json, etc.) does not overwrite the
+            // main application's state.
+            const configDirUri = await this.envVariablesServer.getConfigDirUri();
+            const configDirPath = FileUri.fsPath(configDirUri);
+            const hostedConfigDir = path.join(configDirPath, 'hosted-instance');
+            await fs.ensureDir(hostedConfigDir);
+            processOptions.env!.THEIA_CONFIG_DIR = hostedConfigDir;
+            if (environment.electron.is()) {
+                // When running in Electron, the backend process uses the Electron binary as its
+                // Node.js runtime. Set ELECTRON_RUN_AS_NODE so the spawned backend instance runs
+                // as a plain Node.js process rather than launching a new Electron app window.
+                processOptions.env!.ELECTRON_RUN_AS_NODE = '1';
+            }
             command = await this.getStartCommand(port, debugConfig);
         } else {
             throw new Error('Not supported plugin location: ' + pluginUri.toString());
@@ -242,21 +258,13 @@ export abstract class AbstractHostedInstanceManager implements HostedInstanceMan
     protected async getStartCommand(port?: number, debugConfig?: PluginDebugConfiguration): Promise<string[]> {
         const processArguments = process.argv;
-        let command: string[];
-        if (environment.electron.is()) {
-            command = ['npm', 'run', 'theia', 'start'];
-        } else {
-            command = processArguments.filter((arg, index, args) => {
-                // remove --port=X and --port X arguments if set
-                // remove --plugins arguments
-                if (arg.startsWith('--port') || args[index - 1] === '--port') {
-                    return;
-                } else {
-                    return arg;
-                }
-            });
-        }
+        const command = processArguments.filter((arg, index, args) => {
+            // remove --port=X and --port X arguments if set
+            if (arg.startsWith('--port') || args[index - 1] === '--port') {
+                return false;
+            }
+            return true;
+        });
         if (process.env.HOSTED_PLUGIN_HOSTNAME) {
             command.push('--hostname=' + process.env.HOSTED_PLUGIN_HOSTNAME);
         }