@theia/dev-container 1.76.0-next.7 → 1.77.0-next.0

package/lib/electron-node/remote-container-connection-provider.js

@@ -204,7 +204,7 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
                 const context = { containerId: container.id };
                 const devContainerConfig = await this.devContainerFileService.getConfiguration(options.devcontainerFile, context);
                 report('Connecting to remote system...');
-                const result = await this.setupRemoteConnection(container, docker, devContainerConfig, options.nodeDownloadTemplate, report);
+                const result = await this.setupRemoteConnection(container, docker, devContainerConfig, options.nodeDownloadTemplate, report, options.additionalArgs);
                 remote = result.remote;
                 await this.containerService.postConnect(options.devcontainerFile, remote, this.outputProvider, context);
                 return {
@@ -243,7 +243,11 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
     async attachToContainer(options) {
         const progress = await this.messageService.showProgress({ text: 'Attaching to container' });
         try {
-            const report = message => progress.report({ message });
+            const report = message => {
+                progress.report({ message });
+                // Mirror the status to the frontend so the CLI "attaching" screen can show live progress.
+                this.outputProvider?.onRemoteStatus?.(message);
+            };
             const docker = await this.createDockerConnection();
             const container = docker.getContainer(options.containerId);
             const containerInfo = await container.inspect();
@@ -262,7 +266,7 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
             let remote;
             try {
                 report('Connecting to remote system...');
-                const result = await this.setupRemoteConnection(container, docker, config, options.nodeDownloadTemplate, report);
+                const result = await this.setupRemoteConnection(container, docker, config, options.nodeDownloadTemplate, report, options.additionalArgs);
                 remote = result.remote;
                 if (options.devcontainerFile) {
                     await this.containerService.postConnect(options.devcontainerFile, remote, this.outputProvider, context);
@@ -318,7 +322,7 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
      *
      * @returns the local proxy port and the remote connection
      */
-    async setupRemoteConnection(container, docker, config, nodeDownloadTemplate, report) {
+    async setupRemoteConnection(container, docker, config, nodeDownloadTemplate, report, additionalArgs) {
         const remote = new remote_docker_container_connection_1.RemoteDockerContainerConnection({
             id: (0, core_1.generateUuid)(),
             name: config.name ?? 'dev-container',
@@ -333,7 +337,8 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
             result = await this.remoteSetup.setup({
                 connection: remote,
                 report,
-                nodeDownloadTemplate
+                nodeDownloadTemplate,
+                additionalArgs
             });
         }
         catch (e) {

package/lib/electron-node/remote-container-connection-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-container-connection-provider.js","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.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;;;;AAGhF,mCAAqC;AAKrC,yGAAoG;AACpG,qGAAgG;AAChG,+GAAyG;AAEzG,sCAAoF;AACpF,4DAAyE;AACzE,oCAAoC;AACpC,6EAAuE;AACvE,yEAAoE;AAEpE,qFAA+E;AAC/E,6FAAuF;AACvF,yGAAyG;AACzG,2FAAyH;AAAhH,qJAAA,+BAA+B,OAAA;AAExC,2DAA6E;AAItE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IA4BvC,SAAS,CAAC,MAA+B;QACrC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,MAAM,aAAa,GAAyB,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QAE3C,IAAI,CAAC;YACD,IAAI,UAAU,EAAE,CAAC;gBACb,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE1C,IAAI,aAAa,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACrC,aAAa,CAAC,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC;gBACtD,CAAC;qBAAM,CAAC;oBACJ,IAAI,aAAa,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;wBACrC,aAAa,CAAC,QAAQ,GAAG,MAAM,CAAC;oBACpC,CAAC;yBAAM,IAAI,aAAa,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;wBAC7C,aAAa,CAAC,QAAQ,GAAG,OAAO,CAAC;oBACrC,CAAC;yBAAM,IAAI,aAAa,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;wBAC3C,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;oBACnC,CAAC;yBAAM,CAAC;wBACJ,aAAa,CAAC,QAAQ,GAAG,SAAS,CAAC;oBACvC,CAAC;oBACD,aAAa,CAAC,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;oBAC/D,aAAa,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,IAAI,SAAS,CAAC;gBACjE,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,UAAU,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,aAAa,CAAC,CAAC;QACnD,MAAM,gBAAgB,CAAC,OAAO,EAAE;aAC3B,KAAK,CAAC,CAAC,CAAC,EAAE;YACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEP,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,MAAM,KAAK,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;QAE/D,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAChC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;YACjC,IAAI,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACnD,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,OAAO,EAAE,SAAS,CAAC,OAAO;SAC7B,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,WAAmB,EAAE,MAAe;QAC7D,MAAM,KAAK,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,UAAU,GAAyB,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAE/B,kFAAkF;QAClF,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,uBAAuB,CAAC,CAAC;QACpE,IAAI,aAAa,EAAE,CAAC;YAChB,IAAI,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC1B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;wBAC3B,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC;4BACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;4BACtC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,qBAAqB,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;wBACzF,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACL,4BAA4B;YAChC,CAAC;QACL,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,2BAA2B,CAAC,CAAC;QAC3E,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,UAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAC9D,IAAI,QAAQ,EAAE,CAAC;gBACX,MAAM,aAAa,GAAG,eAAe,QAAQ,EAAE,CAAC;gBAChD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBACxB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;gBAC3E,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAChG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACjC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,IAAA,sCAAkB,EAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC5B,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YACvE,CAAC;QACL,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,WAAmB,EAAE,aAAqB,EAAE,MAAe;QACvF,MAAM,KAAK,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAEnD,yDAAyD;QACzD,gDAAgD;QAChD,mCAAmC;QACnC,4DAA4D;QAC5D,iEAAiE;QACjE,IAAI,CAAC;YACD,gEAAgE;YAChE,6EAA6E;YAC7E,iDAAiD;YACjD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC;gBACnC,GAAG,EAAE;oBACD,MAAM;oBACN,GAAG,aAAa,gBAAgB,EAAE,GAAG,aAAa,qBAAqB;oBACvE,WAAW,EAAE,GAAG;oBAChB,GAAG,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG;oBAC3E,OAAO,EAAE,GAAG;iBACf;gBACD,YAAY,EAAE,IAAI;gBAClB,YAAY,EAAE,IAAI;aACrB,CAAC,CAAC;YAEH,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,iBAAiB,GAAG,IAAI,oBAAW,EAAE,CAAC;YAC5C,MAAM,iBAAiB,GAAG,IAAI,oBAAW,EAAE,CAAC;YAC5C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC;YACH,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YAE1E,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACxC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YACH,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAC5B,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAE5B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACxE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrB,OAAO,SAAS,CAAC;YACrB,CAAC;YAED,wEAAwE;YACxE,MAAM,YAAY,GAAG,GAAG,aAAa,kCAAkC,CAAC;YACxE,MAAM,QAAQ,GAAG,GAAG,aAAa,qBAAqB,CAAC;YACvD,KAAK,MAAM,SAAS,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/C,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC5B,OAAO,SAAS,CAAC;gBACrB,CAAC;YACL,CAAC;YACD,0CAA0C;YAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,uDAAuD;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,CAAC,CAAC,CAAC;YAC3E,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAmC;QACxD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC;YACD,MAAM,MAAM,GAAuB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAEnD,IAAI,MAAmD,CAAC;YACxD,IAAI,CAAC;gBACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;gBACzG,MAAM,OAAO,GAAoB,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;gBAC/D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;gBAElH,MAAM,CAAC,gCAAgC,CAAC,CAAC;gBAEzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;gBAC7H,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBAEvB,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAExG,OAAO;oBACH,WAAW,EAAE,SAAS,CAAC,EAAE;oBACzB,aAAa,EAAE,kBAAkB,CAAC,eAAe,IAAI,IAAA,sCAAkB,EAAC,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;oBAClG,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;iBACpC,CAAC;YACN,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,EAAE,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,MAAM,CAAC,CAAC;YACZ,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,CAAC,CAAC;QACZ,CAAC;gBAAS,CAAC;YACP,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;IAED,oBAAoB,CAAC,aAAqB;QACtC,OAAO,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,wBAAwB,EAAE,CAAC;QACpE,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO;YACH,WAAW;YACX,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE;SAC9D,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC;YACD,MAAM,MAAM,GAAuB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE3D,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;YAChD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,aAAa,OAAO,CAAC,WAAW,iBAAiB,CAAC,CAAC;YACvE,CAAC;YAED,MAAM,OAAO,GAAoB,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;YACtE,IAAI,MAAiC,CAAC;YACtC,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBAC3B,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;gBAChG,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,cAAc,EAAE,MAAM,EAA+B,CAAC;YAClH,CAAC;YAED,IAAI,MAAmD,CAAC;YACxD,IAAI,CAAC;gBACD,MAAM,CAAC,gCAAgC,CAAC,CAAC;gBAEzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;gBACjH,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBAEvB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;oBAC3B,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAC5G,CAAC;gBAED,OAAO;oBACH,WAAW,EAAE,SAAS,CAAC,EAAE;oBACzB,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;iBACpC,CAAC;YACN,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,EAAE,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,MAAM,CAAC,CAAC;YACZ,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,CAAC,CAAC;QACZ,CAAC;gBAAS,CAAC;YACP,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,IAAY;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,YAAY,oEAA+B,CAAC,EAAE,CAAC;YAC1E,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,MAAe;QAClE,MAAM,KAAK,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACrB,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3B,CAAC;YACD,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC;QAC7B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,qBAAqB,CACjC,SAA2B,EAAE,MAAc,EAAE,MAAiC,EAC9E,oBAAwC,EAAE,MAA0B;QAEpE,MAAM,MAAM,GAAG,IAAI,oEAA+B,CAAC;YAC/C,EAAE,EAAE,IAAA,mBAAY,GAAE;YAClB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,eAAe;YACpC,IAAI,EAAE,eAAe;YACrB,MAAM;YACN,SAAS;YACT,MAAM;YACN,MAAM,EAAE,IAAI,CAAC,MAAM;SACtB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACD,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAClC,UAAU,EAAE,MAAM;gBAClB,MAAM;gBACN,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC;QAElC,IAAI,YAA6C,CAAC;QAClD,IAAI,MAA8B,CAAC;QACnC,IAAI,CAAC;YACD,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7D,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;gBACvD,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,EAAE,KAAK,EAAE,CAAC;YAChB,YAAY,EAAE,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE;YACxB,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAI,MAAM,CAAC,OAAO,EAAsB,CAAC,IAAI,CAAC;QAC7D,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,OAAO;QACH,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;IACpC,CAAC;CACJ,CAAA;AAtYY,wEAA8B;AAGpB;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;+EAAC;AAGjD;IADlB,IAAA,kBAAM,EAAC,yCAAkB,CAAC;sCACK,yCAAkB;mEAAC;AAGhC;IADlB,IAAA,kBAAM,EAAC,wDAAyB,CAAC;sCACC,wDAAyB;sEAAC;AAG1C;IADlB,IAAA,kBAAM,EAAC,iDAAsB,CAAC;sCACM,iDAAsB;wEAAC;AAGzC;IADlB,IAAA,kBAAM,EAAC,oDAAuB,CAAC;sCACY,oDAAuB;+EAAC;AAGjD;IADlB,IAAA,kBAAM,EAAC,4DAA2B,CAAC;sCACA,4DAA2B;uEAAC;AAG7C;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,8CAA8C,CAAC;;8DACpC;AAGhB;IADlB,IAAA,kBAAM,EAAC,qBAAc,CAAC;sCACY,qBAAc;sEAAC;yCAxBzC,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAsY1C"}
+{"version":3,"file":"remote-container-connection-provider.js","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@theia/dev-container",
-  "version": "1.76.0-next.7+7c303b183",
+  "version": "1.77.0-next.0+d8106d7ff",
   "description": "Theia - Dev Container Extension",
   "dependencies": {
-    "@theia/core": "1.76.0-next.7+7c303b183",
-    "@theia/output": "1.76.0-next.7+7c303b183",
-    "@theia/remote": "1.76.0-next.7+7c303b183",
-    "@theia/workspace": "1.76.0-next.7+7c303b183",
+    "@theia/core": "1.77.0-next.0+d8106d7ff",
+    "@theia/output": "1.77.0-next.0+d8106d7ff",
+    "@theia/remote": "1.77.0-next.0+d8106d7ff",
+    "@theia/workspace": "1.77.0-next.0+d8106d7ff",
     "dockerode": "^5.0.1",
     "jsonc-parser": "^3.3.1"
   },
@@ -16,7 +16,8 @@
   "theiaExtensions": [
     {
       "frontendElectron": "lib/electron-browser/dev-container-frontend-module",
-      "backendElectron": "lib/electron-node/dev-container-backend-module"
+      "backendElectron": "lib/electron-node/dev-container-backend-module",
+      "electronMain": "lib/electron-main/dev-container-electron-main-module"
     }
   ],
   "keywords": [
@@ -44,11 +45,11 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.75.0",
+    "@theia/ext-scripts": "1.76.0",
     "@types/dockerode": "^3.3.47"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7c303b1836421183d7013f0bd679a9a30ff0b5dc"
+  "gitHead": "d8106d7ffa62b3413ff1ca5b63a0e6c2fe0b0649"
 }

package/src/electron-browser/container-connection-contribution.ts

@@ -24,6 +24,7 @@ import { WorkspaceStorageService } from '@theia/workspace/lib/browser/workspace-
 import { Command, ILogger, MaybePromise, MessageService, nls, QuickInputService, URI } from '@theia/core';
 import { WorkspaceInput, WorkspaceOpenHandlerContribution, WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { ContainerOutputProvider } from './container-output-provider';
+import { RemoteCliArgsCollector } from '@theia/remote/lib/electron-browser/remote-cli-args-collector';
 import { WorkspaceServer } from '@theia/workspace/lib/common';
 import { DEV_CONTAINER_PATH_QUERY, DEV_CONTAINER_WORKSPACE_SCHEME } from '../electron-common/dev-container-workspaces';
 import { RemotePreferences } from '@theia/remote/lib/electron-common/remote-preferences';
@@ -89,6 +90,9 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
     @inject(ContainerOutputProvider)
     protected readonly containerOutputProvider: ContainerOutputProvider;
 
+    @inject(RemoteCliArgsCollector)
+    protected readonly remoteCliArgsCollector: RemoteCliArgsCollector;
+
     @inject(DevContainerPreferences)
     protected readonly devContainerPreferences: DevContainerPreferences;
 
@@ -261,7 +265,10 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
             nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
             lastContainerInfo,
             devcontainerFile: devcontainerFile.path,
-            workspacePath: hostWorkspacePath
+            workspacePath: hostWorkspacePath,
+            // Forward per-window CLI options (e.g. session preferences of a second-instance window),
+            // consistent with the attach flows, so "Reopen in Container" applies the same overrides.
+            additionalArgs: await this.remoteCliArgsCollector.collect()
         });
 
         await this.storageService.setData<LastContainerInfo>(lastContainerInfoKey, {
@@ -394,6 +401,9 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
                     workspacePath: selectedPath,
                     nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
                     devcontainerFile,
+                    // Forward per-window CLI options (e.g. session preferences of a second-instance window),
+                    // consistent with the CLI startup attach, so a manual attach applies the same overrides.
+                    additionalArgs: await this.remoteCliArgsCollector.collect(),
                 });
 
                 // Store context so rebuild works from inside the container

package/src/electron-browser/container-output-provider.ts

@@ -15,6 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject } from '@theia/core/shared/inversify';
+import { Emitter, Event } from '@theia/core';
 import { OutputChannel, OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 
 @injectable()
@@ -25,6 +26,10 @@ export class ContainerOutputProvider implements ContainerOutputProvider {
 
     protected currentChannel?: OutputChannel;
 
+    protected readonly onDidReportStatusEmitter = new Emitter<string>();
+    /** Fires with each curated attach status message (from {@link RemoteStatusReport}). */
+    readonly onDidReportStatus: Event<string> = this.onDidReportStatusEmitter.event;
+
     openChannel(): void {
         this.currentChannel = this.outputChannelManager.getChannel('Container');
         this.currentChannel.show();
@@ -35,4 +40,10 @@ export class ContainerOutputProvider implements ContainerOutputProvider {
             this.currentChannel?.appendLine(output);
         }
     }
+
+    onRemoteStatus(message: string): void {
+        if (message) {
+            this.onDidReportStatusEmitter.fire(message);
+        }
+    }
 }

package/src/electron-browser/dev-container-attach-screen.spec.ts

@@ -0,0 +1,60 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+
+let disableJSDOM = enableJSDOM();
+
+import { expect } from 'chai';
+import { DevContainerAttachScreen } from './dev-container-attach-screen';
+
+disableJSDOM();
+
+describe('DevContainerAttachScreen.resolveSplashUrl', () => {
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
+
+    // The frontend HTML lives at `<appRoot>/lib/frontend/index.html`; splash content is resolved
+    // from `<appRoot>`, i.e. two levels up.
+    const base = 'file:///app/lib/frontend/index.html?port=3000#!empty';
+
+    it('resolves the splash content relative to the application root', () => {
+        expect(DevContainerAttachScreen.resolveSplashUrl('resources/theia-logo.svg', base))
+            .to.equal('file:///app/resources/theia-logo.svg');
+    });
+
+    it('uses an absolute path as-is, without the "../../" prefix', () => {
+        expect(DevContainerAttachScreen.resolveSplashUrl('/opt/app/logo.svg', base))
+            .to.equal('file:///opt/app/logo.svg');
+    });
+
+    it('uses an already-absolute URL as-is', () => {
+        expect(DevContainerAttachScreen.resolveSplashUrl('https://example.com/logo.svg', base))
+            .to.equal('https://example.com/logo.svg');
+        expect(DevContainerAttachScreen.resolveSplashUrl('data:image/svg+xml,<svg/>', base))
+            .to.equal('data:image/svg+xml,<svg/>');
+    });
+
+    it('returns undefined when no splash content is configured', () => {
+        expect(DevContainerAttachScreen.resolveSplashUrl(undefined, base)).to.be.undefined;
+        expect(DevContainerAttachScreen.resolveSplashUrl('', base)).to.be.undefined;
+    });
+
+    it('returns undefined when the base href is not a valid URL', () => {
+        expect(DevContainerAttachScreen.resolveSplashUrl('resources/logo.svg', 'not a url')).to.be.undefined;
+    });
+});

package/src/electron-browser/dev-container-attach-screen.tsx

@@ -0,0 +1,180 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { injectable, postConstruct } from '@theia/core/shared/inversify';
+import { codicon, ReactWidget, Widget } from '@theia/core/lib/browser';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
+import { MaybePromise, nls } from '@theia/core';
+
+export interface AttachScreenErrorActions {
+    /** Re-run the attach. May be asynchronous; callers/tests can await it, the button handler ignores the result. */
+    retry: () => MaybePromise<void>;
+    /** Dismiss the screen and reveal the (empty) local window. */
+    close: () => void;
+}
+
+/**
+ * Full-window, interaction-blocking "attaching" screen shown during a CLI-driven dev-container
+ * attach. It hides the transient local workbench (which is discarded once the window reloads into
+ * the container) so the user is never left interacting with the wrong window, and it surfaces the
+ * attach progress and any failure with a clear retry/close choice.
+ */
+@injectable()
+export class DevContainerAttachScreen extends ReactWidget {
+
+    static readonly ID = 'dev-container-attach-screen';
+
+    protected containerName: string | undefined;
+    protected stage: string = nls.localize('theia/remote/dev-container/attachScreen/preparing', 'Preparing to attach...');
+    protected error: { message: string, actions: AttachScreenErrorActions } | undefined;
+
+    /** URL of the application's configured splash image, reused here for consistent startup branding. */
+    protected splashUrl: string | undefined;
+    protected splashFailed = false;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = DevContainerAttachScreen.ID;
+        this.addClass('theia-dev-container-attach-screen');
+        this.splashUrl = DevContainerAttachScreen.resolveSplashUrl(
+            FrontendApplicationConfigProvider.get().electron?.splashScreenOptions?.content,
+            location.href
+        );
+    }
+
+    /** Shows the screen (attaching it to the document on first use) and optionally sets the target name. */
+    showAttaching(containerName?: string): void {
+        if (containerName) {
+            this.containerName = containerName;
+        }
+        this.error = undefined;
+        if (!this.isAttached) {
+            Widget.attach(this, document.body);
+        }
+        this.update();
+    }
+
+    /** Updates the current progress line, e.g. from a {@link RemoteStatusReport} message. */
+    reportStage(message: string): void {
+        if (message) {
+            this.stage = message;
+            this.update();
+        }
+    }
+
+    /** Switches the screen to an error state offering retry and close. */
+    reportError(message: string, actions: AttachScreenErrorActions): void {
+        this.error = { message, actions };
+        if (!this.isAttached) {
+            Widget.attach(this, document.body);
+        }
+        this.update();
+    }
+
+    override dispose(): void {
+        if (this.isAttached) {
+            Widget.detach(this);
+        }
+        super.dispose();
+    }
+
+    protected render(): React.ReactNode {
+        return <div className='theia-dev-container-attach-screen-content'>
+            {this.renderSplash()}
+            {this.error ? this.renderError(this.error.message, this.error.actions) : this.renderProgress()}
+        </div>;
+    }
+
+    protected renderSplash(): React.ReactNode {
+        if (!this.splashUrl || this.splashFailed) {
+            return undefined;
+        }
+        return <img className='theia-dev-container-attach-screen-logo' src={this.splashUrl} alt='' onError={this.onSplashError} />;
+    }
+
+    protected onSplashError = () => {
+        // The image may be blocked (e.g. by CSP) or the content may not be an image; fall back to the spinner only.
+        this.splashFailed = true;
+        this.update();
+    };
+
+    protected renderProgress(): React.ReactNode {
+        const title = this.containerName
+            ? nls.localize('theia/remote/dev-container/attachScreen/titleNamed', 'Attaching to {0}', this.containerName)
+            : nls.localize('theia/remote/dev-container/attachScreen/title', 'Attaching to container');
+        return <React.Fragment>
+            <span className={`${codicon('loading')} theia-animation-spin theia-dev-container-attach-screen-spinner`} />
+            <h1 className='theia-dev-container-attach-screen-title'>{title}</h1>
+            <div className='theia-dev-container-attach-screen-stage'>{this.stage}</div>
+            <div className='theia-dev-container-attach-screen-note'>
+                {nls.localize('theia/remote/dev-container/attachScreen/firstStartNote',
+                    'The first start for a container can take a minute or two. Later starts are much faster.')}
+            </div>
+        </React.Fragment>;
+    }
+
+    protected renderError(message: string, actions: AttachScreenErrorActions): React.ReactNode {
+        return <React.Fragment>
+            <div className='theia-dev-container-attach-screen-alert'>
+                <AlertMessage
+                    type='ERROR'
+                    header={nls.localize('theia/remote/dev-container/attachScreen/errorHeader', 'Failed to attach to container')}
+                >
+                    {message}
+                </AlertMessage>
+            </div>
+            <div className='theia-dev-container-attach-screen-actions'>
+                <button className='theia-button' onClick={actions.retry}>
+                    {nls.localizeByDefault('Retry')}
+                </button>
+                <button className='theia-button secondary' onClick={actions.close}>
+                    {nls.localizeByDefault('Close')}
+                </button>
+            </div>
+        </React.Fragment>;
+    }
+}
+
+export namespace DevContainerAttachScreen {
+    /**
+     * Resolves the application's splash screen `content` (as configured in
+     * `electron.splashScreenOptions`) to a URL loadable from the frontend, given the frontend
+     * document's `baseHref`. A relative path is resolved against the application root: the frontend
+     * HTML lives at `<appRoot>/lib/frontend/`, so it is two levels up. An absolute path or an
+     * already-absolute URL is used as-is (mirroring the main process, which passes `content` through
+     * `path.resolve`). Returns `undefined` when no content is configured or the URL cannot be built.
+     */
+    export function resolveSplashUrl(content: string | undefined, baseHref: string): string | undefined {
+        if (!content) {
+            return undefined;
+        }
+        // A relative path is anchored below `lib/frontend/`; anything already absolute (an absolute
+        // filesystem path or a full URL) must not get the `../../` prefix or it would be mangled.
+        const specifier = isAbsolute(content) ? content : `../../${content}`;
+        try {
+            return new URL(specifier, baseHref).toString();
+        } catch {
+            return undefined;
+        }
+    }
+
+    function isAbsolute(content: string): boolean {
+        // POSIX/UNC path, Windows drive path (e.g. `C:\...`), or a URL with a scheme (e.g. `file:`, `https:`, `data:`).
+        return content.startsWith('/') || content.startsWith('\\') || /^[a-zA-Z]:[\\/]/.test(content) || /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(content);
+    }
+}

package/src/electron-browser/dev-container-frontend-module.ts

@@ -13,8 +13,10 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
+import '../../src/electron-browser/style/dev-container-attach-screen.css';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { RemoteRegistryContribution } from '@theia/remote/lib/electron-browser/remote-registry-contribution';
+import { DevContainerAttachScreen } from './dev-container-attach-screen';
 import { RemoteContainerConnectionProvider, RemoteContainerConnectionProviderPath } from '../electron-common/remote-container-connection-provider';
 import { ContainerConnectionContribution } from './container-connection-contribution';
 import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
@@ -48,6 +50,7 @@ export default new ContainerModule(bind => {
     bind(DevContainerSuggestionContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(DevContainerSuggestionContribution);
 
+    bind(DevContainerAttachScreen).toSelf().inSingletonScope();
     bind(DevContainerStartupContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(DevContainerStartupContribution);
 });