@theia/preferences 1.76.0-next.7 → 1.77.0-next.0

package/lib/common/cli-preferences.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-preferences.spec.js","sourceRoot":"","sources":["../../src/common/cli-preferences.spec.ts"],"names":[],"mappings":"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"}

package/lib/node/preference-cli-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preference-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,yBAA0B,YAAW,eAAe,EAAE,cAAc,EAAE,qBAAqB;IAGpG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAM;IAChD,SAAS,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAM;IAEvD,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI;IAW/B,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IASjD,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI;IAqB9D,cAAc,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAI9C,qBAAqB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAI3D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;CAOpD"}
+{"version":3,"file":"preference-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,yBAA0B,YAAW,eAAe,EAAE,cAAc,EAAE,qBAAqB;IAGpG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAM;IAChD,SAAS,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAM;IAEvD,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI;IAW/B,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IASjD,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI;IAK9D,cAAc,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAI9C,qBAAqB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAI3D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;CAIpD"}

package/lib/node/preference-cli-contribution.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreferenceCliContribution = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
+const cli_preferences_1 = require("../common/cli-preferences");
 const core_1 = require("@theia/core");
 let PreferenceCliContribution = class PreferenceCliContribution {
     constructor() {
@@ -44,24 +45,7 @@ let PreferenceCliContribution = class PreferenceCliContribution {
     }
     parseInto(raw, target) {
         const entries = raw instanceof Array ? raw : [raw];
-        for (const entry of entries) {
-            const firstEqualIndex = entry.indexOf('=');
-            if (firstEqualIndex <= 0) {
-                this.logger.warn(`Ignoring preference CLI argument "${entry}": expected KEY=JSONVALUE.`);
-                continue;
-            }
-            let rawValue = entry.substring(firstEqualIndex + 1);
-            if (rawValue.startsWith('base64:')) {
-                rawValue = Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8');
-            }
-            try {
-                target.push([entry.substring(0, firstEqualIndex), JSON.parse(rawValue)]);
-            }
-            catch (e) {
-                const reason = e instanceof Error ? e.message : String(e);
-                this.logger.warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
-            }
-        }
+        target.push(...cli_preferences_1.CliPreferenceEntry.parseAll(entries, message => this.logger.warn(message)));
     }
     async getPreferences() {
         return this.preferences;
@@ -75,10 +59,7 @@ let PreferenceCliContribution = class PreferenceCliContribution {
      * shell argument parsing intact.
      */
     enhanceArgs(_context) {
-        return this.sessionPreferences.map(([key, value]) => {
-            const encoded = Buffer.from(JSON.stringify(value), 'utf-8').toString('base64');
-            return `--session-preference=${key}=base64:${encoded}`;
-        });
+        return this.sessionPreferences.map(entry => cli_preferences_1.CliPreferenceEntry.toArg('session-preference', entry));
     }
 };
 exports.PreferenceCliContribution = PreferenceCliContribution;

package/lib/node/preference-cli-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"preference-cli-contribution.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preference-cli-contribution.js","sourceRoot":"","sources":["../../src/node/preference-cli-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,4DAAyE;AAIzE,+DAA+E;AAC/E,sCAAsC;AAG/B,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QAKO,gBAAW,GAAwB,EAAE,CAAC;QACtC,uBAAkB,GAAwB,EAAE,CAAC;IA4C3D,CAAC;IA1CG,SAAS,CAAC,IAAc;QACpB,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC1B,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,4DAA4D;SACrE,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;YAC9B,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,gFAAgF;SACzF,CAAC,CAAC;IACP,CAAC;IAED,YAAY,CAAC,IAA6B;QACtC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IAES,SAAS,CAAC,GAAY,EAAE,MAA2B;QACzD,MAAM,OAAO,GAAa,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAa,CAAC,CAAC;QACvE,MAAM,CAAC,IAAI,CAAC,GAAG,oCAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,qBAAqB;QACvB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,QAA0B;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,oCAAkB,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC,CAAC;IACvG,CAAC;CAEJ,CAAA;AAlDY,8DAAyB;AAGf;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,uCAAuC,CAAC;;yDAC7B;oCAH1B,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAkDrC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/preferences",
-  "version": "1.76.0-next.7+7c303b183",
+  "version": "1.77.0-next.0+d8106d7ff",
   "description": "Theia - Preferences Extension",
   "dependencies": {
-    "@theia/core": "1.76.0-next.7+7c303b183",
-    "@theia/editor": "1.76.0-next.7+7c303b183",
-    "@theia/filesystem": "1.76.0-next.7+7c303b183",
-    "@theia/monaco": "1.76.0-next.7+7c303b183",
+    "@theia/core": "1.77.0-next.0+d8106d7ff",
+    "@theia/editor": "1.77.0-next.0+d8106d7ff",
+    "@theia/filesystem": "1.77.0-next.0+d8106d7ff",
+    "@theia/monaco": "1.77.0-next.0+d8106d7ff",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/userstorage": "1.76.0-next.7+7c303b183",
-    "@theia/workspace": "1.76.0-next.7+7c303b183",
+    "@theia/userstorage": "1.77.0-next.0+d8106d7ff",
+    "@theia/workspace": "1.77.0-next.0+d8106d7ff",
     "async-mutex": "^0.3.2",
     "fast-deep-equal": "^3.1.3",
     "jsonc-parser": "^3.3.1",
@@ -50,10 +50,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.75.0"
+    "@theia/ext-scripts": "1.76.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "7c303b1836421183d7013f0bd679a9a30ff0b5dc"
+  "gitHead": "d8106d7ffa62b3413ff1ca5b63a0e6c2fe0b0649"
 }

package/src/browser/preference-frontend-contribution.spec.ts

@@ -0,0 +1,92 @@
+// *****************************************************************************
+// 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 { expect } from 'chai';
+import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
+
+const launchArgs = (values: Record<string, string[]>): LaunchArguments => ({ values, negated: [] });
+import { PreferenceFrontendContribution } from './preference-frontend-contribution';
+
+class TestPreferenceFrontendContribution extends PreferenceFrontendContribution {
+
+    forwardedArgs: LaunchArguments | undefined;
+    sessionBackendCalls = 0;
+    persistentBackendCalls = 0;
+
+    resolve(): Promise<{ session: [string, unknown][], persistent: [string, unknown][] }> {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (this as any).launchArgs = { getLaunchArgs: () => this.forwardedArgs };
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (this as any).CliPreferences = {
+            getSessionPreferences: async () => {
+                this.sessionBackendCalls++;
+                return [['backend.session', 1]] as [string, unknown][];
+            },
+            getPreferences: async () => {
+                this.persistentBackendCalls++;
+                return [['backend.persistent', 2]] as [string, unknown][];
+            }
+        };
+        return this.resolveCliPreferences();
+    }
+}
+
+describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
+
+    let contribution: TestPreferenceFrontendContribution;
+
+    beforeEach(() => {
+        contribution = new TestPreferenceFrontendContribution();
+    });
+
+    it('reads preferences from the backend on a cold-start window (no forwarded options)', async () => {
+        contribution.forwardedArgs = undefined;
+
+        const result = await contribution.resolve();
+
+        expect(result.session).to.deep.equal([['backend.session', 1]]);
+        expect(result.persistent).to.deep.equal([['backend.persistent', 2]]);
+        expect(contribution.sessionBackendCalls).to.equal(1);
+    });
+
+    it('layers --session-preference from the forwarded options on top of the backend values', async () => {
+        contribution.forwardedArgs = launchArgs({ 'session-preference': ['editor.fontSize=20'], 'attach-container': ['B'] });
+
+        const result = await contribution.resolve();
+
+        // Process-wide backend values are kept (base) and the forwarded value is added on top.
+        expect(result.session).to.deep.equal([['backend.session', 1], ['editor.fontSize', 20]]);
+        expect(result.persistent).to.deep.equal([['backend.persistent', 2]]);
+        expect(contribution.sessionBackendCalls).to.equal(1);
+    });
+
+    it('layers --set-preference from the forwarded options on top of the backend values', async () => {
+        contribution.forwardedArgs = launchArgs({ 'set-preference': ['editor.tabSize=2'] });
+
+        const result = await contribution.resolve();
+
+        expect(result.persistent).to.deep.equal([['backend.persistent', 2], ['editor.tabSize', 2]]);
+        expect(result.session).to.deep.equal([['backend.session', 1]]);
+    });
+
+    it('lets a forwarded value override a same-key backend value', async () => {
+        contribution.forwardedArgs = launchArgs({ 'session-preference': ['backend.session=99'] });
+
+        const result = await contribution.resolve();
+
+        expect(result.session).to.deep.equal([['backend.session', 99]]);
+    });
+});

package/src/browser/preference-frontend-contribution.ts

@@ -16,7 +16,9 @@
 
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { CliPreferences } from '../common/cli-preferences';
+import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
+import { WindowLaunchArgs } from '@theia/core/lib/browser/window/window-launch-args';
+import { CliPreferences, CliPreferenceEntry } from '../common/cli-preferences';
 import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
 import { ILogger } from '@theia/core';
 
@@ -31,23 +33,15 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
     @inject(ILogger) @named('preferences:PreferenceFrontendContribution')
     protected readonly logger: ILogger;
 
+    @inject(WindowLaunchArgs)
+    protected readonly launchArgs: WindowLaunchArgs;
+
     onStart(): void {
         this.applyCliPreferences();
     }
 
     protected async applyCliPreferences(): Promise<void> {
-        // Fetch both buckets in parallel; both are RPC hops to the same backend and
-        // can overlap with the preference service initialising its providers.
-        const [session, persistent] = await Promise.all([
-            this.CliPreferences.getSessionPreferences().catch(e => {
-                this.logger.warn('Failed to fetch --session-preference values:', e);
-                return [] as [string, unknown][];
-            }),
-            this.CliPreferences.getPreferences().catch(e => {
-                this.logger.warn('Failed to fetch --set-preference values:', e);
-                return [] as [string, unknown][];
-            })
-        ]);
+        const { session, persistent } = await this.resolveCliPreferences();
 
         // `preferenceService.set()` needs the target provider registered in the providers
         // map, which only happens once `initializeProviders()` has walked every scope and
@@ -70,6 +64,49 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
         await this.applyAll(persistent, PreferenceScope.User);
     }
 
+    /**
+     * Resolves the CLI-provided preferences to apply to this window.
+     *
+     * The shared backend reflects the original cold-start launch (it cannot distinguish between
+     * windows), so it supplies the process-wide CLI preferences. A forwarded (second-instance)
+     * window additionally carries its own options, provided by the trusted main process, and layers
+     * them on top, overriding by key. Merging (rather than replacing) means a plain
+     * second-instance window keeps the process-wide values instead of dropping them, while an attach
+     * window still gets its own overrides.
+     */
+    protected async resolveCliPreferences(): Promise<{ session: [string, unknown][], persistent: [string, unknown][] }> {
+        // Fetch both buckets in parallel; both are RPC hops to the same backend and
+        // can overlap with the preference service initialising its providers.
+        const [session, persistent] = await Promise.all([
+            this.CliPreferences.getSessionPreferences().catch(e => {
+                this.logger.warn('Failed to fetch --session-preference values:', e);
+                return [] as [string, unknown][];
+            }),
+            this.CliPreferences.getPreferences().catch(e => {
+                this.logger.warn('Failed to fetch --set-preference values:', e);
+                return [] as [string, unknown][];
+            })
+        ]);
+        const forwarded = this.launchArgs.getLaunchArgs();
+        if (forwarded === undefined) {
+            return { session, persistent };
+        }
+        const warn = (message: string) => this.logger.warn(message);
+        return {
+            session: this.mergeEntries(session, CliPreferenceEntry.parseAll(LaunchArguments.values(forwarded, 'session-preference'), warn)),
+            persistent: this.mergeEntries(persistent, CliPreferenceEntry.parseAll(LaunchArguments.values(forwarded, 'set-preference'), warn))
+        };
+    }
+
+    /** Overlays `overrides` onto `base`, later entries winning per key while preserving order (base first). */
+    protected mergeEntries(base: ReadonlyArray<[string, unknown]>, overrides: ReadonlyArray<[string, unknown]>): [string, unknown][] {
+        const merged = new Map<string, unknown>();
+        for (const [key, value] of [...base, ...overrides]) {
+            merged.set(key, value);
+        }
+        return [...merged];
+    }
+
     /**
      * Applies a batch of CLI-provided preferences sequentially. A rejection from an
      * individual write (bad key, invalid scope, etc.) is logged and does not abort the

package/src/browser/preference-frontend-module.ts

@@ -32,6 +32,8 @@ import { PreferenceOpenHandler } from './preference-open-handler';
 import { CliPreferences, CliPreferencesPath } from '../common/cli-preferences';
 import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
 import { PreferenceFrontendContribution } from './preference-frontend-contribution';
+import { RemoteCliArgsContribution } from '@theia/core/lib/common/remote-cli-args-contribution';
+import { SessionPreferenceRemoteCliContribution } from './session-preference-remote-cli-contribution';
 import { SessionPreferenceStatusBarContribution } from './session-preference-status-bar-contribution';
 import { PreferenceLayoutProvider } from './util/preference-layout';
 import { PreferencesWidget } from './views/preference-widget';
@@ -71,6 +73,8 @@ export function bindPreferences(bind: interfaces.Bind, unbind: interfaces.Unbind
     bind(CliPreferences).toDynamicValue(ctx => ServiceConnectionProvider.createProxy<CliPreferences>(ctx.container, CliPreferencesPath)).inSingletonScope();
     bind(PreferenceFrontendContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(PreferenceFrontendContribution);
+    bind(SessionPreferenceRemoteCliContribution).toSelf().inSingletonScope();
+    bind(RemoteCliArgsContribution).toService(SessionPreferenceRemoteCliContribution);
     bind(SessionPreferenceStatusBarContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(SessionPreferenceStatusBarContribution);
 

package/src/browser/session-preference-remote-cli-contribution.spec.ts

@@ -0,0 +1,59 @@
+// *****************************************************************************
+// 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 { expect } from 'chai';
+import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
+
+const launchArgs = (values: Record<string, string[]>): LaunchArguments => ({ values, negated: [] });
+import { CliPreferenceEntry } from '../common/cli-preferences';
+import { SessionPreferenceRemoteCliContribution } from './session-preference-remote-cli-contribution';
+
+class TestContribution extends SessionPreferenceRemoteCliContribution {
+    set forwardedArgs(args: LaunchArguments | undefined) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (this as any).launchArgs = { getLaunchArgs: () => args };
+    }
+}
+
+describe('SessionPreferenceRemoteCliContribution#getRemoteCliArgs', () => {
+
+    let contribution: TestContribution;
+
+    beforeEach(() => {
+        contribution = new TestContribution();
+    });
+
+    it('returns no args for a cold-start window (no forwarded options)', async () => {
+        contribution.forwardedArgs = undefined;
+        expect(await contribution.getRemoteCliArgs()).to.deep.equal([]);
+    });
+
+    it('returns no args for a forwarded window without --session-preference', async () => {
+        contribution.forwardedArgs = launchArgs({ 'attach-container': ['B'] });
+        expect(await contribution.getRemoteCliArgs()).to.deep.equal([]);
+    });
+
+    it('formats forwarded --session-preference values for the remote backend', async () => {
+        contribution.forwardedArgs = launchArgs({ 'attach-container': ['B'], 'session-preference': ['editor.fontSize=20'] });
+
+        const args = await contribution.getRemoteCliArgs();
+
+        expect(args).to.have.lengthOf(1);
+        // The produced arg must parse back to the original entry on the remote.
+        const value = args[0].substring('--session-preference='.length);
+        expect(CliPreferenceEntry.parse(value)).to.deep.equal(['editor.fontSize', 20]);
+    });
+});

package/src/browser/session-preference-remote-cli-contribution.ts

@@ -0,0 +1,49 @@
+// *****************************************************************************
+// 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { RemoteCliArgsContribution } from '@theia/core/lib/common/remote-cli-args-contribution';
+import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
+import { WindowLaunchArgs } from '@theia/core/lib/browser/window/window-launch-args';
+import { CliPreferenceEntry } from '../common/cli-preferences';
+
+/**
+ * Re-applies `--session-preference` values on a remote backend that is started for a *forwarded*
+ * (second-instance) window.
+ *
+ * The shared local backend only knows the preferences of the original cold-start launch, so its
+ * `RemoteCliContribution#enhanceArgs` cannot supply the right values for a window opened by a
+ * later launch. This frontend contribution reads the session preferences forwarded to the current
+ * window (provided by the trusted main process) and formats them as CLI arguments for the remote
+ * backend.
+ */
+@injectable()
+export class SessionPreferenceRemoteCliContribution implements RemoteCliArgsContribution {
+
+    @inject(WindowLaunchArgs)
+    protected readonly launchArgs: WindowLaunchArgs;
+
+    async getRemoteCliArgs(): Promise<string[]> {
+        const forwarded = this.launchArgs.getLaunchArgs();
+        if (forwarded === undefined) {
+            // Cold-start window: the shared backend already forwards its session preferences.
+            return [];
+        }
+        return CliPreferenceEntry
+            .parseAll(LaunchArguments.values(forwarded, 'session-preference'))
+            .map(entry => CliPreferenceEntry.toArg('session-preference', entry));
+    }
+}

package/src/common/cli-preferences.spec.ts

@@ -0,0 +1,73 @@
+// *****************************************************************************
+// 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 { expect } from 'chai';
+import { CliPreferenceEntry } from './cli-preferences';
+
+describe('CliPreferenceEntry.parse', () => {
+
+    it('parses a KEY=JSONVALUE assignment', () => {
+        expect(CliPreferenceEntry.parse('editor.fontSize=14')).to.deep.equal(['editor.fontSize', 14]);
+    });
+
+    it('parses boolean and string JSON values', () => {
+        expect(CliPreferenceEntry.parse('foo.enabled=true')).to.deep.equal(['foo.enabled', true]);
+        expect(CliPreferenceEntry.parse('foo.label="hello"')).to.deep.equal(['foo.label', 'hello']);
+    });
+
+    it('keeps "=" characters that are part of the value', () => {
+        expect(CliPreferenceEntry.parse('foo.expr="a=b"')).to.deep.equal(['foo.expr', 'a=b']);
+    });
+
+    it('decodes a base64-encoded value', () => {
+        // base64 of the JSON value `42`
+        expect(CliPreferenceEntry.parse('foo.num=base64:NDI=')).to.deep.equal(['foo.num', 42]);
+    });
+
+    it('returns undefined when there is no key', () => {
+        expect(CliPreferenceEntry.parse('=1')).to.be.undefined;
+    });
+
+    it('returns undefined when there is no "="', () => {
+        expect(CliPreferenceEntry.parse('noequals')).to.be.undefined;
+    });
+
+    it('returns undefined for an invalid JSON value', () => {
+        expect(CliPreferenceEntry.parse('foo.bar=not json')).to.be.undefined;
+    });
+
+    describe('parseAll', () => {
+        it('parses and filters a list, dropping invalid entries', () => {
+            const result = CliPreferenceEntry.parseAll(['a=1', 'bad', 'b="x"']);
+            expect(result).to.deep.equal([['a', 1], ['b', 'x']]);
+        });
+    });
+
+    describe('toArg', () => {
+        it('formats an entry as a base64-encoded CLI argument', () => {
+            // base64 of the JSON value `42`
+            expect(CliPreferenceEntry.toArg('session-preference', ['foo.num', 42])).to.equal('--session-preference=foo.num=base64:NDI=');
+        });
+
+        it('round-trips a value with shell-special characters through toArg + parse', () => {
+            const entry: [string, unknown] = ['foo.expr', '$HOME && "quoted"'];
+            const arg = CliPreferenceEntry.toArg('session-preference', entry);
+            // The value part of `--session-preference=<value>` must parse back to the original entry.
+            const value = arg.substring('--session-preference='.length);
+            expect(CliPreferenceEntry.parse(value)).to.deep.equal(entry);
+        });
+    });
+});

package/src/common/cli-preferences.ts

@@ -21,3 +21,78 @@ export interface CliPreferences {
     getPreferences(): Promise<[string, unknown][]>;
     getSessionPreferences(): Promise<[string, unknown][]>;
 }
+
+export namespace CliPreferenceEntry {
+
+    /**
+     * Sink for warnings about malformed entries. Callers running in an Inversify context should
+     * pass their named `ILogger`, since these helpers live in `common` and cannot inject one
+     * themselves. Defaults to `console.warn`.
+     */
+    export type WarningSink = (message: string) => void;
+
+    const defaultWarn: WarningSink = message => console.warn(message);
+
+    /**
+     * Parses a single `KEY=JSONVALUE` preference assignment as accepted by `--set-preference`
+     * and `--session-preference`. The value may be `base64:`-prefixed (used when forwarding
+     * values that must survive shell/URL transport intact). Returns `undefined` (after logging a
+     * warning to {@link warn}) when the entry has no key or the value is not valid JSON.
+     */
+    export function parse(entry: string, warn: WarningSink = defaultWarn): [string, unknown] | undefined {
+        const firstEqualIndex = entry.indexOf('=');
+        if (firstEqualIndex <= 0) {
+            warn(`Ignoring preference CLI argument "${entry}": expected KEY=JSONVALUE.`);
+            return undefined;
+        }
+        const rawValue = entry.substring(firstEqualIndex + 1);
+        try {
+            // Decoding happens inside the `try` so that a malformed `base64:` payload is reported
+            // like any other invalid value instead of throwing out of `parse`.
+            const value = rawValue.startsWith('base64:') ? decodeBase64(rawValue.substring('base64:'.length)) : rawValue;
+            return [entry.substring(0, firstEqualIndex), JSON.parse(value)];
+        } catch (e) {
+            const reason = e instanceof Error ? e.message : String(e);
+            warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
+            return undefined;
+        }
+    }
+
+    /**
+     * Formats a preference entry as a CLI argument of the form
+     * `--<optionName>=<key>=base64:<base64(JSON(value))>`, the inverse of {@link parse}.
+     *
+     * The value is base64-encoded so it survives shell/URL transport intact (e.g. when the
+     * argument is passed to a remote backend over an SSH command line).
+     */
+    export function toArg(optionName: string, [key, value]: [string, unknown]): string {
+        return `--${optionName}=${key}=base64:${encodeBase64(JSON.stringify(value))}`;
+    }
+
+    /**
+     * Parses a list of `KEY=JSONVALUE` assignments, dropping any invalid entries and reporting
+     * them to {@link warn}.
+     */
+    export function parseAll(entries: readonly string[], warn: WarningSink = defaultWarn): [string, unknown][] {
+        const result: [string, unknown][] = [];
+        for (const entry of entries) {
+            const parsed = parse(entry, warn);
+            if (parsed) {
+                result.push(parsed);
+            }
+        }
+        return result;
+    }
+
+    // `Buffer` is available on the backend and is polyfilled into the frontend bundle by the
+    // esbuild generator, so a single implementation covers both. It also handles UTF-8 directly,
+    // unlike `atob`/`btoa`, which only deal in binary strings.
+
+    function decodeBase64(value: string): string {
+        return Buffer.from(value, 'base64').toString('utf-8');
+    }
+
+    function encodeBase64(value: string): string {
+        return Buffer.from(value, 'utf-8').toString('base64');
+    }
+}

package/src/node/preference-cli-contribution.ts

@@ -18,7 +18,7 @@ import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { Argv } from '@theia/core/shared/yargs';
 import { CliContribution } from '@theia/core/lib/node/cli';
 import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
-import { CliPreferences } from '../common/cli-preferences';
+import { CliPreferences, CliPreferenceEntry } from '../common/cli-preferences';
 import { ILogger } from '@theia/core';
 
 @injectable()
@@ -52,23 +52,7 @@ export class PreferenceCliContribution implements CliContribution, CliPreference
 
     protected parseInto(raw: unknown, target: [string, unknown][]): void {
         const entries: string[] = raw instanceof Array ? raw : [raw as string];
-        for (const entry of entries) {
-            const firstEqualIndex = entry.indexOf('=');
-            if (firstEqualIndex <= 0) {
-                this.logger.warn(`Ignoring preference CLI argument "${entry}": expected KEY=JSONVALUE.`);
-                continue;
-            }
-            let rawValue = entry.substring(firstEqualIndex + 1);
-            if (rawValue.startsWith('base64:')) {
-                rawValue = Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8');
-            }
-            try {
-                target.push([entry.substring(0, firstEqualIndex), JSON.parse(rawValue)]);
-            } catch (e) {
-                const reason = e instanceof Error ? e.message : String(e);
-                this.logger.warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
-            }
-        }
+        target.push(...CliPreferenceEntry.parseAll(entries, message => this.logger.warn(message)));
     }
 
     async getPreferences(): Promise<[string, unknown][]> {
@@ -85,10 +69,7 @@ export class PreferenceCliContribution implements CliContribution, CliPreference
      * shell argument parsing intact.
      */
     enhanceArgs(_context: RemoteCliContext): string[] {
-        return this.sessionPreferences.map(([key, value]) => {
-            const encoded = Buffer.from(JSON.stringify(value), 'utf-8').toString('base64');
-            return `--session-preference=${key}=base64:${encoded}`;
-        });
+        return this.sessionPreferences.map(entry => CliPreferenceEntry.toArg('session-preference', entry));
     }
 
 }