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

package/lib/electron-browser/dev-container-startup-contribution.js

@@ -21,22 +21,65 @@ const inversify_1 = require("@theia/core/shared/inversify");
 const remote_container_connection_provider_1 = require("../electron-common/remote-container-connection-provider");
 const remote_registry_contribution_1 = require("@theia/remote/lib/electron-browser/remote-registry-contribution");
 const core_1 = require("@theia/core");
+const launch_arguments_1 = require("@theia/core/lib/common/launch-arguments");
+const window_launch_args_1 = require("@theia/core/lib/browser/window/window-launch-args");
 const remote_preferences_1 = require("@theia/remote/lib/electron-common/remote-preferences");
+const container_output_provider_1 = require("./container-output-provider");
+const dev_container_attach_screen_1 = require("./dev-container-attach-screen");
+const remote_cli_args_collector_1 = require("@theia/remote/lib/electron-browser/remote-cli-args-collector");
 let DevContainerStartupContribution = class DevContainerStartupContribution extends remote_registry_contribution_1.AbstractRemoteRegistryContribution {
     registerRemoteCommands() {
         // no commands to register — this contribution only handles startup
     }
     onStart() {
+        // For a CLI-driven attach the window is opened empty and reloads into the container once the
+        // attach completes. Show the "attaching" screen from the first paint so the user never
+        // interacts with the transient local window, before the (possibly RPC-bound) container id is
+        // even resolved.
+        if (this.isAttachPending()) {
+            this.attachScreen.showAttaching();
+        }
         this.handleStartupAttach();
     }
     async handleStartupAttach() {
+        let args;
         try {
-            const args = await this.connectionProvider.getAttachContainerArgs();
-            if (!args) {
-                return;
+            args = await this.resolveAttachArgs();
+        }
+        catch (e) {
+            // A rejection here (e.g. failing to redeem the launch args or reach the backend) must not
+            // escape as an unhandled rejection and leave the attach screen stuck on "Preparing to attach".
+            this.logger.error('CLI: Failed to resolve attach arguments during startup:', e);
+            const message = e instanceof Error ? e.message : String(e);
+            if (this.isAttachPending()) {
+                this.attachScreen.reportError(message, {
+                    retry: () => this.handleStartupAttach(),
+                    close: () => this.disposeAttachScreen()
+                });
             }
-            const { containerId, scanForDevJson } = args;
+            else {
+                // No attach screen is up, so fall back to a notification.
+                this.disposeAttachScreen();
+                this.messageService.error(core_1.nls.localize('theia/remote/dev-container/cliAttachError', 'Failed to attach to container: {0}', message));
+            }
+            return;
+        }
+        if (!args) {
+            // Not attaching after all (e.g. a second-instance window without --attach-container):
+            // make sure a preliminary screen is not left up.
+            this.disposeAttachScreen();
+            return;
+        }
+        await this.runStartupAttach(args);
+    }
+    async runStartupAttach(args) {
+        const { containerId, scanForDevJson } = args;
+        this.attachScreen.showAttaching(containerId);
+        // Surface the backend's live status messages (RemoteStatusReport) on the attach screen.
+        const statusSubscription = this.containerOutputProvider.onDidReportStatus(message => this.attachScreen.reportStage(message));
+        try {
             this.logger.info(`CLI: --attach-container ${containerId}, initiating attach from frontend...`);
+            this.attachScreen.reportStage(core_1.nls.localize('theia/remote/dev-container/attachScreen/locating', 'Locating container {0}...', containerId));
             const containers = await this.connectionProvider.listRunningContainers();
             // Match by ID prefix (either direction — user may pass a short prefix or a full 64-char ID
             // while listRunningContainers returns 12-char truncated IDs) or exact name.
@@ -46,29 +89,75 @@ let DevContainerStartupContribution = class DevContainerStartupContribution exte
             }
             const target = matches[0];
             if (!target) {
-                const msg = core_1.nls.localize('theia/remote/dev-container/cliContainerNotFound', 'Container "{0}" not found or not running.', containerId);
-                this.logger.error(`CLI: ${msg}`);
-                this.messageService.error(msg);
-                return;
+                throw new Error(core_1.nls.localize('theia/remote/dev-container/cliContainerNotFound', 'Container "{0}" not found or not running.', containerId));
             }
+            this.attachScreen.reportStage(core_1.nls.localize('theia/remote/dev-container/attachScreen/preparingWorkspace', 'Preparing workspace...'));
             const candidates = await this.connectionProvider.getWorkspaceCandidates(target.id);
             const workspacePath = candidates.length > 0 ? candidates[0].path : '/';
             const devcontainerFile = scanForDevJson
                 ? await this.connectionProvider.scanForDevContainerConfig(target.id, workspacePath)
                 : undefined;
+            this.attachScreen.reportStage(core_1.nls.localize('theia/remote/dev-container/attachScreen/starting', 'Starting the application inside the container...'));
             const result = await this.connectionProvider.attachToContainer({
                 containerId: target.id,
                 workspacePath,
                 devcontainerFile,
                 nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
+                additionalArgs: await this.remoteCliArgsCollector.collect(),
             });
             this.logger.info(`CLI: startup attach ready, proxy on port ${result.port}, workspace: ${result.workspacePath}`);
+            // Reloads the window into the container; the attach screen is torn down by the navigation.
             this.openRemote(result.port, false, result.workspacePath);
         }
         catch (e) {
             this.logger.error('CLI: Failed to attach to container during startup:', e);
-            this.messageService.error(core_1.nls.localize('theia/remote/dev-container/cliAttachError', 'Failed to attach to container: {0}', e instanceof Error ? e.message : String(e)));
+            const message = e instanceof Error ? e.message : String(e);
+            this.attachScreen.reportError(message, {
+                retry: () => this.runStartupAttach(args),
+                close: () => this.attachScreen.dispose()
+            });
         }
+        finally {
+            statusSubscription.dispose();
+        }
+    }
+    /**
+     * Whether this window was opened for a CLI-driven attach. Decided from the window's own launch
+     * options, which are available synchronously from the first paint, rather than from a flag in
+     * the URL: only `@theia/dev-container` knows what `--attach-container` means.
+     */
+    isAttachPending() {
+        const args = this.launchArgs.getLaunchArgs();
+        return args !== undefined && launch_arguments_1.LaunchArguments.lastValue(args, 'attach-container') !== undefined;
+    }
+    /**
+     * Disposes the attach screen, but only when it is actually on screen. The screen is a singleton,
+     * so disposing it on the many windows that never attach would leave a disposed widget behind
+     * that a later {@link DevContainerAttachScreen.showAttaching} could no longer attach.
+     */
+    disposeAttachScreen() {
+        if (this.attachScreen.isAttached) {
+            this.attachScreen.dispose();
+        }
+    }
+    /**
+     * Resolves the container to attach to on startup.
+     *
+     * A forwarded (second-instance) launch carries its CLI options, provided by the trusted main
+     * process. For such windows those options are the only source, because the shared backend still
+     * reflects the original cold-start launch and cannot distinguish between windows. A cold-start
+     * window has no forwarded options and reads them from the backend instead.
+     */
+    async resolveAttachArgs() {
+        const forwarded = this.launchArgs.getLaunchArgs();
+        if (forwarded !== undefined) {
+            const containerId = launch_arguments_1.LaunchArguments.lastValue(forwarded, 'attach-container');
+            if (!containerId) {
+                return undefined;
+            }
+            return { containerId, scanForDevJson: !launch_arguments_1.LaunchArguments.isNegated(forwarded, 'dev-json') };
+        }
+        return this.connectionProvider.getAttachContainerArgs();
     }
 };
 exports.DevContainerStartupContribution = DevContainerStartupContribution;
@@ -89,6 +178,22 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(remote_preferences_1.RemotePreferences),
     tslib_1.__metadata("design:type", Object)
 ], DevContainerStartupContribution.prototype, "remotePreferences", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(remote_cli_args_collector_1.RemoteCliArgsCollector),
+    tslib_1.__metadata("design:type", remote_cli_args_collector_1.RemoteCliArgsCollector)
+], DevContainerStartupContribution.prototype, "remoteCliArgsCollector", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(container_output_provider_1.ContainerOutputProvider),
+    tslib_1.__metadata("design:type", container_output_provider_1.ContainerOutputProvider)
+], DevContainerStartupContribution.prototype, "containerOutputProvider", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(dev_container_attach_screen_1.DevContainerAttachScreen),
+    tslib_1.__metadata("design:type", dev_container_attach_screen_1.DevContainerAttachScreen)
+], DevContainerStartupContribution.prototype, "attachScreen", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(window_launch_args_1.WindowLaunchArgs),
+    tslib_1.__metadata("design:type", Object)
+], DevContainerStartupContribution.prototype, "launchArgs", void 0);
 exports.DevContainerStartupContribution = DevContainerStartupContribution = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], DevContainerStartupContribution);

package/lib/electron-browser/dev-container-startup-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-container-startup-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-startup-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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,4DAAyE;AAEzE,kHAA4G;AAC5G,kHAAqH;AACrH,sCAA2D;AAC3D,6FAAyF;AAGlF,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,iEAAkC;IAcnF,sBAAsB;QAClB,mEAAmE;IACvE,CAAC;IAED,OAAO;QACH,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,mBAAmB;QAC/B,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;YACpE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,OAAO;YACX,CAAC;YAED,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,WAAW,sCAAsC,CAAC,CAAC;YAE/F,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC;YACzE,2FAA2F;YAC3F,4EAA4E;YAC5E,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YAC/H,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,WAAW,aAAa,OAAO,CAAC,MAAM,mCAAmC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChK,CAAC;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAE1B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,MAAM,GAAG,GAAG,UAAG,CAAC,QAAQ,CAAC,iDAAiD,EACtE,2CAA2C,EAAE,WAAW,CAAC,CAAC;gBAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;gBACjC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/B,OAAO;YACX,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACnF,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;YAEvE,MAAM,gBAAgB,GAAG,cAAc;gBACnC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC;gBACnF,CAAC,CAAC,SAAS,CAAC;YAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;gBAC3D,WAAW,EAAE,MAAM,CAAC,EAAE;gBACtB,aAAa;gBACb,gBAAgB;gBAChB,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,CAAC,6BAA6B,CAAC;aAC9E,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,MAAM,CAAC,IAAI,gBAAgB,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,CAAC,CAAC,CAAC;YAC3E,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,UAAG,CAAC,QAAQ,CAClC,2CAA2C,EAC3C,oCAAoC,EACpC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAC7C,CAAC,CAAC;QACP,CAAC;IACL,CAAC;CACJ,CAAA;AA1EY,0EAA+B;AAGrB;IADlB,IAAA,kBAAM,EAAC,wEAAiC,CAAC;;2EAC+B;AAGtD;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,+CAA+C,CAAC;;+DACrC;AAGhB;IADlB,IAAA,kBAAM,EAAC,qBAAc,CAAC;sCACY,qBAAc;uEAAC;AAG/B;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;;0EAC8B;0CAZ/C,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CA0E3C"}
+{"version":3,"file":"dev-container-startup-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-startup-contribution.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/dev-container-startup-contribution.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=dev-container-startup-contribution.spec.d.ts.map

package/lib/electron-browser/dev-container-startup-contribution.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-startup-contribution.spec.d.ts","sourceRoot":"","sources":["../../src/electron-browser/dev-container-startup-contribution.spec.ts"],"names":[],"mappings":""}

package/lib/electron-browser/dev-container-startup-contribution.spec.js

@@ -0,0 +1,199 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+let disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const chai_1 = require("chai");
+const launchArgs = (values) => ({ values, negated: [] });
+const dev_container_startup_contribution_1 = require("./dev-container-startup-contribution");
+disableJSDOM();
+class TestDevContainerStartupContribution extends dev_container_startup_contribution_1.DevContainerStartupContribution {
+    constructor() {
+        super(...arguments);
+        this.backendCalls = 0;
+    }
+    resolve() {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.launchArgs = { getLaunchArgs: () => this.forwardedArgs };
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.connectionProvider = {
+            getAttachContainerArgs: async () => {
+                this.backendCalls++;
+                return this.backendArgs;
+            }
+        };
+        return this.resolveAttachArgs();
+    }
+}
+describe('DevContainerStartupContribution#resolveAttachArgs', () => {
+    before(() => disableJSDOM = (0, jsdom_1.enableJSDOM)());
+    after(() => disableJSDOM());
+    let contribution;
+    beforeEach(() => {
+        contribution = new TestDevContainerStartupContribution();
+    });
+    it('reads the container from the backend on a cold-start window (no forwarded options)', async () => {
+        contribution.forwardedArgs = undefined;
+        contribution.backendArgs = { containerId: 'A', scanForDevJson: true };
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result).to.deep.equal({ containerId: 'A', scanForDevJson: true });
+        (0, chai_1.expect)(contribution.backendCalls).to.equal(1);
+    });
+    it('reads the container from the forwarded options on a second-instance window', async () => {
+        contribution.forwardedArgs = launchArgs({ 'attach-container': ['B'] });
+        contribution.backendArgs = { containerId: 'A', scanForDevJson: true };
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result).to.deep.equal({ containerId: 'B', scanForDevJson: true });
+        // The stale backend value (from the first launch) must not be consulted.
+        (0, chai_1.expect)(contribution.backendCalls).to.equal(0);
+    });
+    it('honors --no-dev-json in the forwarded options', async () => {
+        contribution.forwardedArgs = { values: { 'attach-container': ['B'] }, negated: ['dev-json'] };
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result).to.deep.equal({ containerId: 'B', scanForDevJson: false });
+    });
+    it('does not attach for a second-instance window without --attach-container', async () => {
+        contribution.forwardedArgs = launchArgs({ 'session-preference': ['foo=1'] });
+        contribution.backendArgs = { containerId: 'A', scanForDevJson: true };
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result).to.be.undefined;
+        (0, chai_1.expect)(contribution.backendCalls).to.equal(0);
+    });
+});
+class AttachHarness extends dev_container_startup_contribution_1.DevContainerStartupContribution {
+    constructor() {
+        super(...arguments);
+        this.stages = [];
+        this.errors = [];
+        this.disposeCount = 0;
+        this.showCount = 0;
+        this.openRemoteCalls = [];
+    }
+    setup(opts) {
+        /* eslint-disable @typescript-eslint/no-explicit-any */
+        this.logger = { info: () => { }, warn: () => { }, error: () => { } };
+        this.attachScreen = {
+            showAttaching: () => { this.showCount++; },
+            reportStage: (message) => this.stages.push(message),
+            reportError: (message, actions) => this.errors.push({ message, actions }),
+            dispose: () => { this.disposeCount++; }
+        };
+        this.containerOutputProvider = {
+            onDidReportStatus: (cb) => {
+                this.statusListener = cb;
+                return { dispose: () => { this.statusListener = undefined; } };
+            }
+        };
+        this.remotePreferences = {};
+        this.remoteCliArgsCollector = { collect: async () => [] };
+        this.connectionProvider = {
+            listRunningContainers: async () => opts.containers ?? [],
+            getWorkspaceCandidates: async () => [],
+            scanForDevContainerConfig: async () => undefined,
+            attachToContainer: async () => {
+                if (opts.statusDuringAttach) {
+                    this.statusListener?.(opts.statusDuringAttach);
+                }
+                if (opts.attachResult instanceof Error) {
+                    throw opts.attachResult;
+                }
+                return opts.attachResult;
+            }
+        };
+        /* eslint-enable @typescript-eslint/no-explicit-any */
+    }
+    openRemote(port) {
+        this.openRemoteCalls.push(port);
+    }
+    run(args) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.runStartupAttach(args);
+    }
+}
+describe('DevContainerStartupContribution#runStartupAttach', () => {
+    before(() => disableJSDOM = (0, jsdom_1.enableJSDOM)());
+    after(() => disableJSDOM());
+    const runningB = { id: 'abc123def456', name: 'B', image: 'img', status: 'running', created: 0 };
+    it('reloads into the container on success without showing an error', async () => {
+        const harness = new AttachHarness();
+        harness.setup({ containers: [runningB], attachResult: { port: '9000', workspacePath: '/w', containerId: 'abc123def456' } });
+        await harness.run({ containerId: 'B', scanForDevJson: false });
+        (0, chai_1.expect)(harness.openRemoteCalls).to.deep.equal(['9000']);
+        (0, chai_1.expect)(harness.errors).to.have.lengthOf(0);
+        (0, chai_1.expect)(harness.showCount).to.be.greaterThan(0);
+    });
+    it('forwards backend status messages to the attach screen', async () => {
+        const harness = new AttachHarness();
+        harness.setup({
+            containers: [runningB],
+            attachResult: { port: '9000', workspacePath: '/w', containerId: 'abc123def456' },
+            statusDuringAttach: 'Starting application on remote...'
+        });
+        await harness.run({ containerId: 'B', scanForDevJson: false });
+        (0, chai_1.expect)(harness.stages).to.include('Starting application on remote...');
+    });
+    it('shows an error with retry/close when the container is not found, without reloading', async () => {
+        const harness = new AttachHarness();
+        harness.setup({ containers: [] });
+        await harness.run({ containerId: 'missing', scanForDevJson: false });
+        (0, chai_1.expect)(harness.openRemoteCalls).to.have.lengthOf(0);
+        (0, chai_1.expect)(harness.errors).to.have.lengthOf(1);
+        (0, chai_1.expect)(harness.errors[0].message).to.match(/not found/i);
+    });
+    it('retry re-runs the attach; close dismisses the screen', async () => {
+        const harness = new AttachHarness();
+        harness.setup({ containers: [] });
+        await harness.run({ containerId: 'missing', scanForDevJson: false });
+        (0, chai_1.expect)(harness.errors).to.have.lengthOf(1);
+        await harness.errors[0].actions.retry();
+        (0, chai_1.expect)(harness.errors).to.have.lengthOf(2);
+        harness.errors[1].actions.close();
+        (0, chai_1.expect)(harness.disposeCount).to.be.greaterThan(0);
+    });
+});
+class StartupHarness extends dev_container_startup_contribution_1.DevContainerStartupContribution {
+    constructor() {
+        super(...arguments);
+        this.errors = [];
+    }
+    setup() {
+        /* eslint-disable @typescript-eslint/no-explicit-any */
+        this.logger = { info: () => { }, warn: () => { }, error: () => { } };
+        this.launchArgs = { getLaunchArgs: () => undefined };
+        this.attachScreen = { isAttached: false, dispose: () => { } };
+        this.messageService = { error: (message) => this.errors.push(message) };
+        this.connectionProvider = {
+            getAttachContainerArgs: async () => { throw new Error('backend unreachable'); }
+        };
+        /* eslint-enable @typescript-eslint/no-explicit-any */
+    }
+    run() {
+        return this.handleStartupAttach();
+    }
+}
+describe('DevContainerStartupContribution#handleStartupAttach', () => {
+    before(() => disableJSDOM = (0, jsdom_1.enableJSDOM)());
+    after(() => disableJSDOM());
+    it('reports a failure to resolve the attach arguments on a cold start', async () => {
+        const harness = new StartupHarness();
+        harness.setup();
+        await harness.run();
+        (0, chai_1.expect)(harness.errors).to.have.lengthOf(1);
+        (0, chai_1.expect)(harness.errors[0]).to.contain('backend unreachable');
+    });
+});
+//# sourceMappingURL=dev-container-startup-contribution.spec.js.map

package/lib/electron-browser/dev-container-startup-contribution.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-startup-contribution.spec.js","sourceRoot":"","sources":["../../src/electron-browser/dev-container-startup-contribution.spec.ts"],"names":[],"mappings":"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"}

package/lib/electron-common/container-output-provider.d.ts

@@ -1,4 +1,10 @@
 export interface ContainerOutputProvider {
     onRemoteOutput(output: string): void;
+    /**
+     * Receives curated status messages (from {@link RemoteStatusReport}) describing the current
+     * attach phase, e.g. "Starting application on remote...". Used to drive the "attaching" screen.
+     * Optional so that existing implementers of this interface keep compiling.
+     */
+    onRemoteStatus?(message: string): void;
 }
 //# sourceMappingURL=container-output-provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"container-output-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/container-output-provider.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,uBAAuB;IACpC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC"}
+{"version":3,"file":"container-output-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/container-output-provider.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,uBAAuB;IACpC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC;;;;OAIG;IACH,cAAc,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C"}

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

@@ -8,6 +8,11 @@ export interface ContainerConnectionOptions {
     lastContainerInfo?: LastContainerInfo;
     devcontainerFile: string;
     workspacePath?: string;
+    /**
+     * Additional CLI arguments to pass to the container's remote backend, e.g. the
+     * `--session-preference` values forwarded to a second-instance window.
+     */
+    additionalArgs?: string[];
 }
 export interface LastContainerInfo {
     id: string;
@@ -39,6 +44,11 @@ export interface AttachContainerOptions {
     workspacePath: string;
     nodeDownloadTemplate?: string;
     devcontainerFile?: string;
+    /**
+     * Additional CLI arguments to pass to the container's remote backend, e.g. the
+     * `--session-preference` values forwarded to a second-instance window.
+     */
+    additionalArgs?: string[];
 }
 export interface AttachContainerArgs {
     containerId: string;

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;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;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,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,+CAA+C;IAC/C,MAAM,EAAE,aAAa,GAAG,YAAY,GAAG,oBAAoB,GAAG,UAAU,CAAC;CAC5E;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CAC3B;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;IACjF,qBAAqB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACzD,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3E,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACnG,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IACnE,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACvF,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD"}
+{"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,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;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,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,+CAA+C;IAC/C,MAAM,EAAE,aAAa,GAAG,YAAY,GAAG,oBAAoB,GAAG,UAAU,CAAC;CAC5E;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CAC3B;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;IACjF,qBAAqB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACzD,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3E,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACnG,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IACnE,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACvF,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD"}

package/lib/electron-main/dev-container-claim-contribution.d.ts

@@ -0,0 +1,13 @@
+import { ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application';
+import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
+/**
+ * Claims windows opened for a CLI `--attach-container` launch. Such a window is opened empty and
+ * reloads into the container once the attach completes; claiming it lets core open an empty window
+ * (instead of restoring the last workspace) and flag it so the dev-container frontend can show its
+ * "attaching" screen from the first paint. Keeps the knowledge of `--attach-container` in
+ * `@theia/dev-container` rather than in core.
+ */
+export declare class DevContainerClaimContribution implements ElectronMainApplicationContribution {
+    claimsWindow(args: LaunchArguments): boolean;
+}
+//# sourceMappingURL=dev-container-claim-contribution.d.ts.map

package/lib/electron-main/dev-container-claim-contribution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-claim-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-main/dev-container-claim-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mCAAmC,EAAE,MAAM,yDAAyD,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE1E;;;;;;GAMG;AACH,qBACa,6BAA8B,YAAW,mCAAmC;IAErF,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO;CAG/C"}

package/lib/electron-main/dev-container-claim-contribution.js

@@ -0,0 +1,38 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DevContainerClaimContribution = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const launch_arguments_1 = require("@theia/core/lib/common/launch-arguments");
+/**
+ * Claims windows opened for a CLI `--attach-container` launch. Such a window is opened empty and
+ * reloads into the container once the attach completes; claiming it lets core open an empty window
+ * (instead of restoring the last workspace) and flag it so the dev-container frontend can show its
+ * "attaching" screen from the first paint. Keeps the knowledge of `--attach-container` in
+ * `@theia/dev-container` rather than in core.
+ */
+let DevContainerClaimContribution = class DevContainerClaimContribution {
+    claimsWindow(args) {
+        return launch_arguments_1.LaunchArguments.lastValue(args, 'attach-container') !== undefined;
+    }
+};
+exports.DevContainerClaimContribution = DevContainerClaimContribution;
+exports.DevContainerClaimContribution = DevContainerClaimContribution = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], DevContainerClaimContribution);
+//# sourceMappingURL=dev-container-claim-contribution.js.map

package/lib/electron-main/dev-container-claim-contribution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-claim-contribution.js","sourceRoot":"","sources":["../../src/electron-main/dev-container-claim-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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,4DAA0D;AAE1D,8EAA0E;AAE1E;;;;;;GAMG;AAEI,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAEtC,YAAY,CAAC,IAAqB;QAC9B,OAAO,kCAAe,CAAC,SAAS,CAAC,IAAI,EAAE,kBAAkB,CAAC,KAAK,SAAS,CAAC;IAC7E,CAAC;CACJ,CAAA;AALY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAKzC"}

package/lib/electron-main/dev-container-electron-main-module.d.ts

@@ -0,0 +1,4 @@
+import { ContainerModule } from '@theia/core/shared/inversify';
+declare const _default: ContainerModule;
+export default _default;
+//# sourceMappingURL=dev-container-electron-main-module.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-electron-main-module.d.ts","sourceRoot":"","sources":["../../src/electron-main/dev-container-electron-main-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAI/D,wBAGG"}

package/lib/electron-main/dev-container-electron-main-module.js

@@ -0,0 +1,25 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const inversify_1 = require("@theia/core/shared/inversify");
+const electron_main_application_1 = require("@theia/core/lib/electron-main/electron-main-application");
+const dev_container_claim_contribution_1 = require("./dev-container-claim-contribution");
+exports.default = new inversify_1.ContainerModule(bind => {
+    bind(dev_container_claim_contribution_1.DevContainerClaimContribution).toSelf().inSingletonScope();
+    bind(electron_main_application_1.ElectronMainApplicationContribution).toService(dev_container_claim_contribution_1.DevContainerClaimContribution);
+});
+//# sourceMappingURL=dev-container-electron-main-module.js.map

package/lib/electron-main/dev-container-electron-main-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-electron-main-module.js","sourceRoot":"","sources":["../../src/electron-main/dev-container-electron-main-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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,uGAA8G;AAC9G,yFAAmF;AAEnF,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,gEAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,+DAAmC,CAAC,CAAC,SAAS,CAAC,gEAA6B,CAAC,CAAC;AACvF,CAAC,CAAC,CAAC"}

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

@@ -40,7 +40,7 @@ export declare class DevContainerConnectionProvider implements RemoteContainerCo
      *
      * @returns the local proxy port and the remote connection
      */
-    protected setupRemoteConnection(container: Docker.Container, docker: Docker, config: DevContainerConfiguration, nodeDownloadTemplate: string | undefined, report: RemoteStatusReport): Promise<{
+    protected setupRemoteConnection(container: Docker.Container, docker: Docker, config: DevContainerConfiguration, nodeDownloadTemplate: string | undefined, report: RemoteStatusReport, additionalArgs?: string[]): Promise<{
         localPort: number;
         remote: RemoteDockerContainerConnection;
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.ts"],"names":[],"mappings":"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"}