@theia/dev-container 1.55.1 → 1.57.0-next.112

package/README.md

@@ -17,6 +17,7 @@ The `@theia/dev-container` extension provides functionality to create, start and
 
 The full devcontainer.json Schema can be found [here](https://containers.dev/implementors/json_reference/).
 Currently only a small number of configuration file properties are implemented. Those include the following:
+
 - name
 - Image
 - dockerfile/build.dockerfile
@@ -25,8 +26,7 @@ Currently only a small number of configuration file properties are implemented.
 - forwardPorts
 - mounts
 
-see `main-container-creation-contributions.ts` for how to implementations or how to implement additional ones. 
-
+see `main-container-creation-contributions.ts` for how to implementations or how to implement additional ones.
 
 ## Additional Information
 
@@ -39,5 +39,6 @@ see `main-container-creation-contributions.ts` for how to implementations or how
 - [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
 
 ## Trademark
+
 "Theia" is a trademark of the Eclipse Foundation
-https://www.eclipse.org/theia
+<https://www.eclipse.org/theia>

package/lib/electron-browser/container-connection-contribution.d.ts

@@ -1,22 +1,28 @@
 import { AbstractRemoteRegistryContribution, RemoteRegistry } from '@theia/remote/lib/electron-browser/remote-registry-contribution';
-import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
+import { DevContainerFile, RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
 import { RemotePreferences } from '@theia/remote/lib/electron-browser/remote-preferences';
 import { WorkspaceStorageService } from '@theia/workspace/lib/browser/workspace-storage-service';
-import { Command, QuickInputService } from '@theia/core';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { Command, MaybePromise, QuickInputService, URI } from '@theia/core';
+import { WorkspaceInput, WorkspaceOpenHandlerContribution, WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { ContainerOutputProvider } from './container-output-provider';
+import { WorkspaceServer } from '@theia/workspace/lib/common';
 export declare namespace RemoteContainerCommands {
     const REOPEN_IN_CONTAINER: Command;
 }
-export declare class ContainerConnectionContribution extends AbstractRemoteRegistryContribution {
+export declare class ContainerConnectionContribution extends AbstractRemoteRegistryContribution implements WorkspaceOpenHandlerContribution {
     protected readonly connectionProvider: RemoteContainerConnectionProvider;
     protected readonly remotePreferences: RemotePreferences;
     protected readonly workspaceStorageService: WorkspaceStorageService;
     protected readonly workspaceService: WorkspaceService;
+    protected readonly workspaceServer: WorkspaceServer;
     protected readonly quickInputService: QuickInputService;
     protected readonly containerOutputProvider: ContainerOutputProvider;
     registerRemoteCommands(registry: RemoteRegistry): void;
+    canHandle(uri: URI): MaybePromise<boolean>;
+    openWorkspace(uri: URI, options?: WorkspaceInput | undefined): Promise<void>;
+    getWorkspaceLabel(uri: URI): Promise<string | undefined>;
     openInContainer(): Promise<void>;
-    getOrSelectDevcontainerFile(): Promise<string | undefined>;
+    doOpenInContainer(devcontainerFile: DevContainerFile, workspaceUri?: string): Promise<void>;
+    getOrSelectDevcontainerFile(): Promise<DevContainerFile | undefined>;
 }
 //# sourceMappingURL=container-connection-contribution.d.ts.map

package/lib/electron-browser/container-connection-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAC/H,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIC,CAAC;CACrC;AAGD,qBACa,+BAAgC,SAAQ,kCAAkC;IAGnF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAMhD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBhC,2BAA2B,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAiBnE"}
+{"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAE,gBAAgB,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AACjJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIC,CAAC;CACrC;AAGD,qBACa,+BAAgC,SAAQ,kCAAmC,YAAW,gCAAgC;IAG/H,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAMtD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;IAIpC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5E,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3F,2BAA2B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAqB7E"}

package/lib/electron-browser/container-connection-contribution.js

@@ -25,6 +25,8 @@ const workspace_storage_service_1 = require("@theia/workspace/lib/browser/worksp
 const core_1 = require("@theia/core");
 const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
 const container_output_provider_1 = require("./container-output-provider");
+const common_1 = require("@theia/workspace/lib/common");
+const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
 var RemoteContainerCommands;
 (function (RemoteContainerCommands) {
     RemoteContainerCommands.REOPEN_IN_CONTAINER = core_1.Command.toLocalizedCommand({
@@ -40,36 +42,71 @@ let ContainerConnectionContribution = class ContainerConnectionContribution exte
             execute: () => this.openInContainer()
         });
     }
+    canHandle(uri) {
+        return uri.scheme === dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME;
+    }
+    async openWorkspace(uri, options) {
+        const filePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
+        if (!filePath) {
+            throw new Error('No devcontainer file specified for workspace');
+        }
+        const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
+        const devcontainerFile = devcontainerFiles.find(file => file.path === filePath);
+        if (!devcontainerFile) {
+            throw new Error(`Devcontainer file at ${filePath} not found in workspace`);
+        }
+        return this.doOpenInContainer(devcontainerFile, uri.toString());
+    }
+    async getWorkspaceLabel(uri) {
+        const containerFilePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
+        if (!containerFilePath) {
+            return;
+        }
+        ;
+        const files = await this.connectionProvider.getDevContainerFiles(uri.path.toString());
+        const devcontainerFile = files.find(file => file.path === containerFilePath);
+        return `${uri.path.base} [Dev Container: ${devcontainerFile === null || devcontainerFile === void 0 ? void 0 : devcontainerFile.name}]`;
+    }
     async openInContainer() {
         const devcontainerFile = await this.getOrSelectDevcontainerFile();
         if (!devcontainerFile) {
             return;
         }
-        const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile}`;
+        this.doOpenInContainer(devcontainerFile);
+    }
+    async doOpenInContainer(devcontainerFile, workspaceUri) {
+        var _a;
+        const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
         const lastContainerInfo = await this.workspaceStorageService.getData(lastContainerInfoKey);
         this.containerOutputProvider.openChannel();
         const connectionResult = await this.connectionProvider.connectToContainer({
             nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
             lastContainerInfo,
-            devcontainerFile
+            devcontainerFile: devcontainerFile.path,
+            workspaceUri
         });
         this.workspaceStorageService.setData(lastContainerInfoKey, {
             id: connectionResult.containerId,
             lastUsed: Date.now()
         });
+        this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${(_a = this.workspaceService.workspace) === null || _a === void 0 ? void 0 : _a.resource.path}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
         this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
     }
     async getOrSelectDevcontainerFile() {
         var _a;
-        const devcontainerFiles = await this.connectionProvider.getDevContainerFiles();
+        const workspace = this.workspaceService.workspace;
+        if (!workspace) {
+            return;
+        }
+        const devcontainerFiles = await this.connectionProvider.getDevContainerFiles(workspace.resource.path.toString());
         if (devcontainerFiles.length === 1) {
-            return devcontainerFiles[0].path;
+            return devcontainerFiles[0];
         }
         return (_a = (await this.quickInputService.pick(devcontainerFiles.map(file => ({
             type: 'item',
             label: file.name,
             description: file.path,
-            file: file.path,
+            file: file,
         })), {
             title: 'Select a devcontainer.json file'
         }))) === null || _a === void 0 ? void 0 : _a.file;
@@ -92,6 +129,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(workspace_service_1.WorkspaceService),
     tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
 ], ContainerConnectionContribution.prototype, "workspaceService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(common_1.WorkspaceServer),
+    tslib_1.__metadata("design:type", Object)
+], ContainerConnectionContribution.prototype, "workspaceServer", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(core_1.QuickInputService),
     tslib_1.__metadata("design:type", Object)

package/lib/electron-browser/container-connection-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAEhF,4DAAkE;AAClE,kHAAqI;AACrI,kHAA+H;AAC/H,8FAA0F;AAC1F,sGAAiG;AACjG,sCAAyD;AACzD,sFAAkF;AAClF,2EAAsE;AAEtE,IAAiB,uBAAuB,CAMvC;AAND,WAAiB,uBAAuB;IACvB,2CAAmB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC1D,EAAE,EAAE,mCAAmC;QACvC,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,eAAe;KAC5B,EAAE,6BAA6B,CAAC,CAAC;AACtC,CAAC,EANgB,uBAAuB,uCAAvB,uBAAuB,QAMvC;AAED,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEzC,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,iEAAkC;IAoBnF,sBAAsB,CAAC,QAAwB;QAC3C,QAAQ,CAAC,eAAe,CAAC,uBAAuB,CAAC,mBAAmB,EAAE;YAClE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;SACxC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAClE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,OAAO;QACX,CAAC;QACD,MAAM,oBAAoB,GAAG,GAAG,mBAAmB,IAAI,gBAAgB,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAgC,oBAAoB,CAAC,CAAC;QAE1H,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,CAAC;QAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;YACtE,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,CAAC,6BAA6B,CAAC;YAC3E,iBAAiB;YACjB,gBAAgB;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAoB,oBAAoB,EAAE;YAC1E,EAAE,EAAE,gBAAgB,CAAC,WAAW;YAChC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,2BAA2B;;QAC7B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,EAAE,CAAC;QAE/E,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,CAAC;QAED,OAAO,MAAA,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI,CAAC,IAAI;SAClB,CAAC,CAAC,EAAE;YACD,KAAK,EAAE,iCAAiC;SAC3C,CAAC,CAAC,0CAAE,IAAI,CAAC;IACd,CAAC;CAEJ,CAAA;AAnEY,0EAA+B;AAGrB;IADlB,IAAA,kBAAM,EAAC,wEAAiC,CAAC;;2EAC+B;AAGtD;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;;0EAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;AAGjD;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCACY,oCAAgB;yEAAC;AAGnC;IADlB,IAAA,kBAAM,EAAC,wBAAiB,CAAC;;0EAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;0CAlB3D,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAmE3C"}
+{"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/container-info-contribution.d.ts

@@ -1,11 +1,20 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { WindowTitleContribution } from '@theia/core/lib/browser/window/window-title-service';
+import { RemoteStatus, RemoteStatusService } from '@theia/remote/lib/electron-common/remote-status-service';
+import { FrontendApplicationContribution, LabelProviderContribution } from '@theia/core/lib/browser';
 import type { ContainerInspectInfo } from 'dockerode';
 import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
 import { PortForwardingService } from '@theia/remote/lib/electron-browser/port-forwarding/port-forwarding-service';
-export declare class ContainerInfoContribution implements FrontendApplicationContribution {
+import { URI } from '@theia/core';
+export declare class ContainerInfoContribution implements FrontendApplicationContribution, WindowTitleContribution, LabelProviderContribution {
     protected readonly connectionProvider: RemoteContainerConnectionProvider;
     protected readonly portForwardingService: PortForwardingService;
-    containerInfo: ContainerInspectInfo | undefined;
+    protected readonly remoteStatusService: RemoteStatusService;
+    protected status: RemoteStatus | undefined;
+    protected containerInfo: ContainerInspectInfo | undefined;
+    protected containerFilePath: string | undefined;
     onStart(): Promise<void>;
+    enhanceTitle(title: string, parts: Map<string, string | undefined>): string;
+    canHandle(element: object): number;
+    getName(element: URI): string | undefined;
 }
 //# sourceMappingURL=container-info-contribution.d.ts.map

package/lib/electron-browser/container-info-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container-info-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,4EAA4E,CAAC;AAEnH,qBACa,yBAA0B,YAAW,+BAA+B;IAG7E,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAEhE,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAE1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAYjC"}
+{"version":3,"file":"container-info-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,+BAA+B,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACrG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAC5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,4EAA4E,CAAC;AAEnH,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,qBACa,yBAA0B,YAAW,+BAA+B,EAAE,uBAAuB,EAAE,yBAAyB;IAEjI,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IAC3C,SAAS,CAAC,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC1D,SAAS,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAc9B,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM;IAQ3E,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAelC,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;CAK5C"}

package/lib/electron-browser/container-info-contribution.js

@@ -18,13 +18,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContainerInfoContribution = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
+const remote_status_service_1 = require("@theia/remote/lib/electron-common/remote-status-service");
 const remote_container_connection_provider_1 = require("../electron-common/remote-container-connection-provider");
 const port_forwarding_service_1 = require("@theia/remote/lib/electron-browser/port-forwarding/port-forwarding-service");
+const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
+const core_1 = require("@theia/core");
 let ContainerInfoContribution = class ContainerInfoContribution {
     async onStart() {
-        var _a, _b, _c;
-        this.containerInfo = await this.connectionProvider.getCurrentContainerInfo(parseInt((_a = new URLSearchParams(location.search).get('port')) !== null && _a !== void 0 ? _a : '0'));
-        this.portForwardingService.forwardedPorts = Object.entries((_c = (_b = this.containerInfo) === null || _b === void 0 ? void 0 : _b.NetworkSettings.Ports) !== null && _c !== void 0 ? _c : {}).flatMap(([_, ports]) => (ports.map(port => {
+        var _a, _b;
+        const containerPort = parseInt((_a = new URLSearchParams(location.search).get('port')) !== null && _a !== void 0 ? _a : '0');
+        const containerInfo = await this.connectionProvider.getCurrentContainerInfo(containerPort);
+        this.status = await this.remoteStatusService.getStatus(containerPort);
+        this.portForwardingService.forwardedPorts = Object.entries((_b = containerInfo === null || containerInfo === void 0 ? void 0 : containerInfo.NetworkSettings.Ports) !== null && _b !== void 0 ? _b : {}).flatMap(([_, ports]) => (ports.map(port => {
             var _a, _b;
             return ({
                 editing: false,
@@ -34,6 +39,32 @@ let ContainerInfoContribution = class ContainerInfoContribution {
             });
         })));
     }
+    enhanceTitle(title, parts) {
+        if (this.status && this.status.alive) {
+            const devcontainerName = this.status.name;
+            title = `${title} [Dev Container${devcontainerName ? ': ' + devcontainerName : ''}]`;
+        }
+        return title;
+    }
+    canHandle(element) {
+        if ('query' in element) {
+            let containerFilePath = new URLSearchParams(element.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
+            if (containerFilePath) {
+                if (containerFilePath.startsWith(element.path.toString())) {
+                    containerFilePath = containerFilePath.replace(element.path.toString(), '');
+                }
+                this.containerFilePath = containerFilePath;
+                return 100;
+            }
+            ;
+            return 0;
+        }
+        return 0;
+    }
+    getName(element) {
+        const dir = new core_1.URI(this.containerFilePath).path.dir.base;
+        return `${element.path.base} [Dev Container${dir && dir !== '.devcontainer' ? `: ${dir}` : ''}]`;
+    }
 };
 exports.ContainerInfoContribution = ContainerInfoContribution;
 tslib_1.__decorate([
@@ -44,6 +75,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(port_forwarding_service_1.PortForwardingService),
     tslib_1.__metadata("design:type", port_forwarding_service_1.PortForwardingService)
 ], ContainerInfoContribution.prototype, "portForwardingService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(remote_status_service_1.RemoteStatusService),
+    tslib_1.__metadata("design:type", Object)
+], ContainerInfoContribution.prototype, "remoteStatusService", void 0);
 exports.ContainerInfoContribution = ContainerInfoContribution = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], ContainerInfoContribution);

package/lib/electron-browser/container-info-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"container-info-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAEhF,4DAAkE;AAGlE,kHAA4G;AAC5G,wHAAmH;AAG5G,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAUlC,KAAK,CAAC,OAAO;;QACT,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,MAAA,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,mCAAI,GAAG,CAAC,CAAC,CAAC;QAE9I,IAAI,CAAC,qBAAqB,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,eAAe,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAChI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;;YAAC,OAAA,CAAC;gBACf,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;gBAC1B,SAAS,EAAE,QAAQ,CAAC,MAAA,IAAI,CAAC,QAAQ,mCAAI,GAAG,CAAC;gBACzC,MAAM,EAAE,WAAW;aACtB,CAAC,CAAA;SAAA,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;CAEJ,CAAA;AAtBY,8DAAyB;AAGf;IADlB,IAAA,kBAAM,EAAC,wEAAiC,CAAC;;qEAC+B;AAGtD;IADlB,IAAA,kBAAM,EAAC,+CAAqB,CAAC;sCACY,+CAAqB;wEAAC;oCANvD,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAsBrC"}
+{"version":3,"file":"container-info-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/dev-container-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAS/D,wBAaG"}
+{"version":3,"file":"dev-container-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAW/D,wBAgBG"}

package/lib/electron-browser/dev-container-frontend-module.js

@@ -23,9 +23,12 @@ const service_connection_provider_1 = require("@theia/core/lib/browser/messaging
 const container_output_provider_1 = require("./container-output-provider");
 const container_info_contribution_1 = require("./container-info-contribution");
 const browser_1 = require("@theia/core/lib/browser");
+const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
+const window_title_service_1 = require("@theia/core/lib/browser/window/window-title-service");
 exports.default = new inversify_1.ContainerModule(bind => {
     bind(container_connection_contribution_1.ContainerConnectionContribution).toSelf().inSingletonScope();
     bind(remote_registry_contribution_1.RemoteRegistryContribution).toService(container_connection_contribution_1.ContainerConnectionContribution);
+    bind(workspace_service_1.WorkspaceOpenHandlerContribution).toService(container_connection_contribution_1.ContainerConnectionContribution);
     bind(container_output_provider_1.ContainerOutputProvider).toSelf().inSingletonScope();
     bind(remote_container_connection_provider_1.RemoteContainerConnectionProvider).toDynamicValue(ctx => {
         const outputProvider = ctx.container.get(container_output_provider_1.ContainerOutputProvider);
@@ -33,5 +36,7 @@ exports.default = new inversify_1.ContainerModule(bind => {
     }).inSingletonScope();
     bind(container_info_contribution_1.ContainerInfoContribution).toSelf().inSingletonScope();
     bind(browser_1.FrontendApplicationContribution).toService(container_info_contribution_1.ContainerInfoContribution);
+    bind(window_title_service_1.WindowTitleContribution).toService(container_info_contribution_1.ContainerInfoContribution);
+    bind(browser_1.LabelProviderContribution).toService(container_info_contribution_1.ContainerInfoContribution);
 });
 //# sourceMappingURL=dev-container-frontend-module.js.map

package/lib/electron-browser/dev-container-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":";;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;AAChF,4DAA+D;AAC/D,kHAA6G;AAC7G,kHAAmJ;AACnJ,2FAAsF;AACtF,+GAA0G;AAC1G,2EAAsE;AACtE,+EAA0E;AAC1E,qDAA0E;AAE1E,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,yDAA0B,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAE5E,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,wEAAiC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,mDAAuB,CAAC,CAAC;QAClE,OAAO,uDAAyB,CAAC,gBAAgB,CAAoC,GAAG,CAAC,SAAS,EAAE,4EAAqC,EAAE,cAAc,CAAC,CAAC;IAC/J,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dev-container-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-frontend-module.ts"],"names":[],"mappings":";;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;AAChF,4DAA+D;AAC/D,kHAA6G;AAC7G,kHAAmJ;AACnJ,2FAAsF;AACtF,+GAA0G;AAC1G,2EAAsE;AACtE,+EAA0E;AAC1E,qDAAqG;AACrG,sFAAkG;AAClG,8FAA8F;AAE9F,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,mEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,yDAA0B,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAC5E,IAAI,CAAC,oDAAgC,CAAC,CAAC,SAAS,CAAC,mEAA+B,CAAC,CAAC;IAElF,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,wEAAiC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACzD,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,mDAAuB,CAAC,CAAC;QAClE,OAAO,uDAAyB,CAAC,gBAAgB,CAAoC,GAAG,CAAC,SAAS,EAAE,4EAAqC,EAAE,cAAc,CAAC,CAAC;IAC/J,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEtB,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IAC3E,IAAI,CAAC,8CAAuB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IACnE,IAAI,CAAC,mCAAyB,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC"}

package/lib/electron-common/dev-container-workspaces.d.ts

@@ -0,0 +1,3 @@
+export declare const DEV_CONTAINER_WORKSPACE_SCHEME = "devcontainer";
+export declare const DEV_CONTAINER_PATH_QUERY = "containerfile";
+//# sourceMappingURL=dev-container-workspaces.d.ts.map

package/lib/electron-common/dev-container-workspaces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-workspaces.d.ts","sourceRoot":"","sources":["../../src/electron-common/dev-container-workspaces.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,8BAA8B,iBAAiB,CAAC;AAC7D,eAAO,MAAM,wBAAwB,kBAAkB,CAAC"}

package/lib/electron-common/dev-container-workspaces.js

@@ -0,0 +1,21 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2024 Typefox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEV_CONTAINER_PATH_QUERY = exports.DEV_CONTAINER_WORKSPACE_SCHEME = void 0;
+exports.DEV_CONTAINER_WORKSPACE_SCHEME = 'devcontainer';
+exports.DEV_CONTAINER_PATH_QUERY = 'containerfile';
+//# sourceMappingURL=dev-container-workspaces.js.map

package/lib/electron-common/dev-container-workspaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-workspaces.js","sourceRoot":"","sources":["../../src/electron-common/dev-container-workspaces.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;AAEnE,QAAA,8BAA8B,GAAG,cAAc,CAAC;AAChD,QAAA,wBAAwB,GAAG,eAAe,CAAC"}

package/lib/electron-common/remote-container-connection-provider.d.ts

@@ -7,6 +7,7 @@ export interface ContainerConnectionOptions {
     nodeDownloadTemplate?: string;
     lastContainerInfo?: LastContainerInfo;
     devcontainerFile: string;
+    workspaceUri?: string;
 }
 export interface LastContainerInfo {
     id: string;
@@ -23,7 +24,7 @@ export interface DevContainerFile {
 }
 export interface RemoteContainerConnectionProvider extends RpcServer<ContainerOutputProvider> {
     connectToContainer(options: ContainerConnectionOptions): Promise<ContainerConnectionResult>;
-    getDevContainerFiles(): Promise<DevContainerFile[]>;
+    getDevContainerFiles(workspacePath: string): Promise<DevContainerFile[]>;
     getCurrentContainerInfo(port: number): Promise<ContainerInspectInfo | undefined>;
 }
 //# sourceMappingURL=remote-container-connection-provider.d.ts.map

package/lib/electron-common/remote-container-connection-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACpD,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;CACpF"}
+{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;CACpF"}

package/lib/electron-node/dev-container-backend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAa/D,eAAO,MAAM,sBAAsB,iBAgBjC,CAAC;;AAEH,wBAUG"}
+{"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAe/D,eAAO,MAAM,sBAAsB,iBAgBjC,CAAC;;AAEH,wBAaG"}

package/lib/electron-node/dev-container-backend-module.js

@@ -27,6 +27,8 @@ const dev_container_file_service_1 = require("./dev-container-file-service");
 const cli_enhancing_creation_contributions_1 = require("./devcontainer-contributions/cli-enhancing-creation-contributions");
 const remote_cli_contribution_1 = require("@theia/core/lib/node/remote/remote-cli-contribution");
 const profile_file_modification_contribution_1 = require("./devcontainer-contributions/profile-file-modification-contribution");
+const dev_container_workspace_handler_1 = require("./dev-container-workspace-handler");
+const default_workspace_server_1 = require("@theia/workspace/lib/node/default-workspace-server");
 exports.remoteConnectionModule = connection_container_module_1.ConnectionContainerModule.create(({ bind, bindBackendService }) => {
     (0, core_1.bindContributionProvider)(bind, docker_container_service_1.ContainerCreationContribution);
     (0, main_container_creation_contributions_1.registerContainerCreationContributions)(bind);
@@ -50,5 +52,7 @@ exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind
     bind(cli_enhancing_creation_contributions_1.SettingsContribution).toSelf().inSingletonScope();
     bind(remote_cli_contribution_1.RemoteCliContribution).toService(cli_enhancing_creation_contributions_1.ExtensionsContribution);
     bind(remote_cli_contribution_1.RemoteCliContribution).toService(cli_enhancing_creation_contributions_1.SettingsContribution);
+    bind(dev_container_workspace_handler_1.DevContainerWorkspaceHandler).toSelf().inSingletonScope();
+    bind(default_workspace_server_1.WorkspaceHandlerContribution).toService(dev_container_workspace_handler_1.DevContainerWorkspaceHandler);
 });
 //# sourceMappingURL=dev-container-backend-module.js.map

package/lib/electron-node/dev-container-backend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;AAEhF,4DAA+D;AAC/D,4GAAuG;AACvG,iGAAwF;AACxF,kHAAmJ;AACnJ,yEAAmG;AACnG,sCAAgG;AAChG,8HAA4H;AAC5H,6EAAuE;AAEvE,4HAAyK;AACzK,iGAA4F;AAC5F,gIAA0H;AAE7G,QAAA,sBAAsB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE;IACpG,IAAA,+BAAwB,EAAC,IAAI,EAAE,wDAA6B,CAAC,CAAC;IAC9D,IAAA,8EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,6EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,4EAAmC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,4EAAmC,CAAC,CAAC;IAEnF,IAAI,CAAC,qEAA8B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjE,IAAI,CAAC,wEAAiC,CAAC,CAAC,SAAS,CAAC,qEAA8B,CAAC,CAAC;IAClF,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,2BAAoB,CAA0B,4EAAqC,EAAE,MAAM,CAAC,EAAE;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoC,wEAAiC,CAAC,CAAC;QACvG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,8BAAsB,CAAC,CAAC;IAExE,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,6DAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,2DAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,6DAAsB,CAAC,CAAC;IAC9D,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,2DAAoB,CAAC,CAAC;AAChE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;AAEhF,4DAA+D;AAC/D,4GAAuG;AACvG,iGAAwF;AACxF,kHAAmJ;AACnJ,yEAAmG;AACnG,sCAAgG;AAChG,8HAA4H;AAC5H,6EAAuE;AAEvE,4HAAyK;AACzK,iGAA4F;AAC5F,gIAA0H;AAC1H,uFAAiF;AACjF,iGAAkG;AAErF,QAAA,sBAAsB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE;IACpG,IAAA,+BAAwB,EAAC,IAAI,EAAE,wDAA6B,CAAC,CAAC;IAC9D,IAAA,8EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,6EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,4EAAmC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,4EAAmC,CAAC,CAAC;IAEnF,IAAI,CAAC,qEAA8B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjE,IAAI,CAAC,wEAAiC,CAAC,CAAC,SAAS,CAAC,qEAA8B,CAAC,CAAC;IAClF,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,2BAAoB,CAA0B,4EAAqC,EAAE,MAAM,CAAC,EAAE;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoC,wEAAiC,CAAC,CAAC;QACvG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,8BAAsB,CAAC,CAAC;IAExE,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,6DAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,2DAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,6DAAsB,CAAC,CAAC;IAC9D,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,2DAAoB,CAAC,CAAC;IAE5D,IAAI,CAAC,8DAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,uDAA4B,CAAC,CAAC,SAAS,CAAC,8DAA4B,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC"}

package/lib/electron-node/dev-container-file-service.d.ts

@@ -4,7 +4,7 @@ import { DevContainerConfiguration } from './devcontainer-file';
 export declare class DevContainerFileService {
     protected readonly workspaceServer: WorkspaceServer;
     getConfiguration(path: string): Promise<DevContainerConfiguration>;
-    getAvailableFiles(): Promise<DevContainerFile[]>;
+    getAvailableFiles(workspace: string): Promise<DevContainerFile[]>;
     protected searchForDevontainerJsonFiles(directory: string, depth: number): Promise<string[]>;
 }
 //# sourceMappingURL=dev-container-file-service.d.ts.map

package/lib/electron-node/dev-container-file-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAKhE,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAE9C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAUlE,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAetC,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
+{"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAKhE,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAE9C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAUlE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}

package/lib/electron-node/dev-container-file-service.js

@@ -31,11 +31,7 @@ let DevContainerFileService = class DevContainerFileService {
         configuration.location = path;
         return configuration;
     }
-    async getAvailableFiles() {
-        const workspace = await this.workspaceServer.getMostRecentlyUsedWorkspace();
-        if (!workspace) {
-            return [];
-        }
+    async getAvailableFiles(workspace) {
         const devcontainerPath = new core_1.URI(workspace).path.join('.devcontainer').fsPath();
         return (await this.searchForDevontainerJsonFiles(devcontainerPath, 1)).map(file => {
             var _a;
@@ -46,7 +42,7 @@ let DevContainerFileService = class DevContainerFileService {
         });
     }
     async searchForDevontainerJsonFiles(directory, depth) {
-        if (depth < 0) {
+        if (depth < 0 || !await fs.pathExists(directory)) {
             return [];
         }
         const filesPaths = (await fs.readdir(directory)).map(file => new core_1.Path(directory).join(file).fsPath());

package/lib/electron-node/dev-container-file-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAEhF,4DAAkE;AAClE,wDAA8D;AAG9D,+CAAqC;AACrC,kDAAkD;AAClD,sCAAwC;AAGjC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAKhC,KAAK,CAAC,gBAAgB,CAAC,IAAY;QAC/B,MAAM,aAAa,GAA8B,IAAA,oBAAK,EAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAA8B,CAAC;QACvI,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,sBAAsB,CAAC,CAAC;QACrE,CAAC;QAED,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC9B,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,EAAE,CAAC;QAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,UAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QAEhF,OAAO,CAAC,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;;YAAC,OAAA,CAAC;gBAChF,IAAI,EAAE,MAAA,IAAA,oBAAK,EAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,mCAAI,cAAc;gBAClE,IAAI,EAAE,IAAI;aACb,CAAC,CAAA;SAAA,CAAC,CAAC;IAER,CAAC;IAES,KAAK,CAAC,6BAA6B,CAAC,SAAiB,EAAE,KAAa;QAC1E,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,WAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAEtG,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACrC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;iBAAM,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC7C,iBAAiB,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YACzF,CAAC;QACL,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ,CAAA;AA9CY,0DAAuB;AAGb;IADlB,IAAA,kBAAM,EAAC,wBAAe,CAAC;;gEAC4B;kCAH3C,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA8CnC"}
+{"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAEhF,4DAAkE;AAClE,wDAA8D;AAG9D,+CAAqC;AACrC,kDAAkD;AAClD,sCAAwC;AAGjC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAKhC,KAAK,CAAC,gBAAgB,CAAC,IAAY;QAC/B,MAAM,aAAa,GAA8B,IAAA,oBAAK,EAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAA8B,CAAC;QACvI,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,sBAAsB,CAAC,CAAC;QACrE,CAAC;QAED,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC9B,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAiB;QACrC,MAAM,gBAAgB,GAAG,IAAI,UAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QAEhF,OAAO,CAAC,MAAM,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;;YAAC,OAAA,CAAC;gBAChF,IAAI,EAAE,MAAA,IAAA,oBAAK,EAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,mCAAI,cAAc;gBAClE,IAAI,EAAE,IAAI;aACb,CAAC,CAAA;SAAA,CAAC,CAAC;IAER,CAAC;IAES,KAAK,CAAC,6BAA6B,CAAC,SAAiB,EAAE,KAAa;QAC1E,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/C,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,WAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAEtG,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACrC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;iBAAM,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC7C,iBAAiB,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YACzF,CAAC;QACL,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ,CAAA;AAzCY,0DAAuB;AAGb;IADlB,IAAA,kBAAM,EAAC,wBAAe,CAAC;;gEAC4B;kCAH3C,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAyCnC"}

package/lib/electron-node/dev-container-workspace-handler.d.ts

@@ -0,0 +1,7 @@
+import { URI } from '@theia/core';
+import { WorkspaceHandlerContribution } from '@theia/workspace/lib/node/default-workspace-server';
+export declare class DevContainerWorkspaceHandler implements WorkspaceHandlerContribution {
+    canHandle(uri: URI): boolean;
+    workspaceStillExists(uri: URI): Promise<boolean>;
+}
+//# sourceMappingURL=dev-container-workspace-handler.d.ts.map

package/lib/electron-node/dev-container-workspace-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-workspace-handler.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-workspace-handler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAGlC,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAGlG,qBACa,4BAA6B,YAAW,4BAA4B;IAE7E,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAItB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAIzD"}

package/lib/electron-node/dev-container-workspace-handler.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DevContainerWorkspaceHandler = void 0;
+const tslib_1 = require("tslib");
+const fs = require("@theia/core/shared/fs-extra");
+const inversify_1 = require("@theia/core/shared/inversify");
+const dev_container_workspaces_1 = require("../electron-common/dev-container-workspaces");
+let DevContainerWorkspaceHandler = class DevContainerWorkspaceHandler {
+    canHandle(uri) {
+        return uri.scheme === dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME;
+    }
+    async workspaceStillExists(uri) {
+        const devcontainerFile = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
+        return await fs.pathExists(uri.path.fsPath()) && !!devcontainerFile && fs.pathExists(devcontainerFile);
+    }
+};
+exports.DevContainerWorkspaceHandler = DevContainerWorkspaceHandler;
+exports.DevContainerWorkspaceHandler = DevContainerWorkspaceHandler = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], DevContainerWorkspaceHandler);
+//# sourceMappingURL=dev-container-workspace-handler.js.map

package/lib/electron-node/dev-container-workspace-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-workspace-handler.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-workspace-handler.ts"],"names":[],"mappings":";;;;AAgBA,kDAAkD;AAClD,4DAA0D;AAE1D,0FAAuH;AAGhH,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAErC,SAAS,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,MAAM,KAAK,yDAA8B,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAQ;QAC/B,MAAM,gBAAgB,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QACtF,OAAO,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC3G,CAAC;CACJ,CAAA;AAVY,oEAA4B;uCAA5B,4BAA4B;IADxC,IAAA,sBAAU,GAAE;GACA,4BAA4B,CAUxC"}

package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts

@@ -26,6 +26,9 @@ export declare class RemoteUserContribution implements ContainerCreationContribu
 export declare class PostCreateCommandContribution implements ContainerCreationContribution {
     handlePostCreate?(containerConfig: DevContainerConfiguration, container: Docker.Container, api: Docker, outputprovider: ContainerOutputProvider): Promise<void>;
 }
+export declare class ContainerEnvContribution implements ContainerCreationContribution {
+    handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration): Promise<void>;
+}
 export declare namespace OutputHelper {
     interface Progress {
         id?: string;

package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-container-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAsB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAE1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mEAAmE,CAAC;AACjH,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAOlF;AAED,qBACa,qBAAsB,YAAW,6BAA6B;IACjE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,cAAc,EACvG,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAc3E;AAED,qBACa,sBAAuB,YAAW,6BAA6B;IAClE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,mBAAmB,EAC5G,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAmC3E;AAED,qBACa,wBAAyB,YAAW,6BAA6B;IAG1E,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAElE,iBAAiB,CAAC,eAAe,EAAE,yBAAyB,EAAE,UAAU,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBlI;AAED,qBACa,kBAAmB,YAAW,6BAA6B;IAC9D,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnJ,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,aAAa;CAQxD;AAED,qBACa,sBAAuB,YAAW,6BAA6B;IAClE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAKtJ;AAED,qBACa,6BAA8B,YAAW,6BAA6B;IACzE,gBAAgB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBxK;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,QAAQ;QACrB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB;IAED,SAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;CACJ"}
+{"version":3,"file":"main-container-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAsB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAE1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mEAAmE,CAAC;AACjH,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQlF;AAED,qBACa,qBAAsB,YAAW,6BAA6B;IACjE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,cAAc,EACvG,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB3E;AAED,qBACa,sBAAuB,YAAW,6BAA6B;IAClE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,mBAAmB,EAC5G,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAmC3E;AAED,qBACa,wBAAyB,YAAW,6BAA6B;IAG1E,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAElE,iBAAiB,CAAC,eAAe,EAAE,yBAAyB,EAAE,UAAU,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBlI;AAED,qBACa,kBAAmB,YAAW,6BAA6B;IAC9D,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnJ,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,aAAa;CAQxD;AAED,qBACa,sBAAuB,YAAW,6BAA6B;IAClE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAKtJ;AAED,qBACa,6BAA8B,YAAW,6BAA6B;IACzE,gBAAgB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBxK;AAED,qBACa,wBAAyB,YAAW,6BAA6B;IACpE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;CAUzI;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,QAAQ;QACrB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB;IAED,SAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;CACJ"}

package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutputHelper = exports.PostCreateCommandContribution = exports.RemoteUserContribution = exports.MountsContribution = exports.ForwardPortsContribution = exports.DockerFileContribution = exports.ImageFileContribution = exports.registerContainerCreationContributions = void 0;
+exports.OutputHelper = exports.ContainerEnvContribution = exports.PostCreateCommandContribution = exports.RemoteUserContribution = exports.MountsContribution = exports.ForwardPortsContribution = exports.DockerFileContribution = exports.ImageFileContribution = exports.registerContainerCreationContributions = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const docker_container_service_1 = require("../docker-container-service");
@@ -14,15 +14,22 @@ function registerContainerCreationContributions(bind) {
     bind(docker_container_service_1.ContainerCreationContribution).to(MountsContribution).inSingletonScope();
     bind(docker_container_service_1.ContainerCreationContribution).to(RemoteUserContribution).inSingletonScope();
     bind(docker_container_service_1.ContainerCreationContribution).to(PostCreateCommandContribution).inSingletonScope();
+    bind(docker_container_service_1.ContainerCreationContribution).to(ContainerEnvContribution).inSingletonScope();
 }
 exports.registerContainerCreationContributions = registerContainerCreationContributions;
 let ImageFileContribution = class ImageFileContribution {
     async handleContainerCreation(createOptions, containerConfig, api, outputprovider) {
         if (containerConfig.image) {
-            await new Promise((res, rej) => api.pull(containerConfig.image, {}, (err, stream) => {
+            const platform = process.platform;
+            const arch = process.arch;
+            const options = platform === 'darwin' && arch === 'arm64' ? { platform: 'amd64' } : {};
+            await new Promise((res, rej) => api.pull(containerConfig.image, options, (err, stream) => {
                 if (err) {
                     rej(err);
                 }
+                else if (stream === undefined) {
+                    rej('Stream is undefined');
+                }
                 else {
                     api.modem.followProgress(stream, (error, output) => error ?
                         rej(error) :
@@ -175,6 +182,22 @@ exports.PostCreateCommandContribution = PostCreateCommandContribution;
 exports.PostCreateCommandContribution = PostCreateCommandContribution = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], PostCreateCommandContribution);
+let ContainerEnvContribution = class ContainerEnvContribution {
+    async handleContainerCreation(createOptions, containerConfig) {
+        if (containerConfig.containerEnv) {
+            if (createOptions.Env === undefined) {
+                createOptions.Env = [];
+            }
+            for (const [key, value] of Object.entries(containerConfig.containerEnv)) {
+                createOptions.Env.push(`${key}=${value}`);
+            }
+        }
+    }
+};
+exports.ContainerEnvContribution = ContainerEnvContribution;
+exports.ContainerEnvContribution = ContainerEnvContribution = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], ContainerEnvContribution);
 var OutputHelper;
 (function (OutputHelper) {
     function parseProgress(progress) {