@theia/preferences 1.74.0-next.10 → 1.74.0-next.15

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

@@ -21,29 +21,64 @@ const inversify_1 = require("@theia/core/shared/inversify");
 let PreferenceCliContribution = class PreferenceCliContribution {
     constructor() {
         this.preferences = [];
+        this.sessionPreferences = [];
     }
     configure(conf) {
         conf.option('set-preference', {
             nargs: 1,
-            desc: 'sets the specified preference'
+            desc: 'sets the specified preference (persisted to user settings)'
+        });
+        conf.option('session-preference', {
+            nargs: 1,
+            desc: 'sets the specified preference for this process only (in-memory, not persisted)'
         });
     }
     setArguments(args) {
         if (args.setPreference) {
-            const preferences = args.setPreference instanceof Array ? args.setPreference : [args.setPreference];
-            for (const preference of preferences) {
-                const firstEqualIndex = preference.indexOf('=');
-                let rawValue = preference.substring(firstEqualIndex + 1);
-                if (rawValue.startsWith('base64:')) {
-                    rawValue = Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8');
-                }
-                this.preferences.push([preference.substring(0, firstEqualIndex), JSON.parse(rawValue)]);
+            this.parseInto(args.setPreference, this.preferences);
+        }
+        if (args.sessionPreference) {
+            this.parseInto(args.sessionPreference, this.sessionPreferences);
+        }
+    }
+    parseInto(raw, target) {
+        const entries = raw instanceof Array ? raw : [raw];
+        for (const entry of entries) {
+            const firstEqualIndex = entry.indexOf('=');
+            if (firstEqualIndex <= 0) {
+                console.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);
+                console.warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
             }
         }
     }
     async getPreferences() {
         return this.preferences;
     }
+    async getSessionPreferences() {
+        return this.sessionPreferences;
+    }
+    /**
+     * Forward `--session-preference` values to the remote backend when attaching
+     * to a remote (e.g. dev container). Values are base64-encoded JSON to survive
+     * 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}`;
+        });
+    }
 };
 exports.PreferenceCliContribution = PreferenceCliContribution;
 exports.PreferenceCliContribution = PreferenceCliContribution = tslib_1.__decorate([

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":";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,4DAA0D;AAMnD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QAEO,gBAAW,GAAwB,EAAE,CAAC;IA2BpD,CAAC;IAzBG,SAAS,CAAC,IAAc;QACpB,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC1B,KAAK,EAAE,CAAC;YACR,IAAI,EAAE,+BAA+B;SACxC,CAAC,CAAC;IACP,CAAC;IAED,YAAY,CAAC,IAA6B;QACtC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,MAAM,WAAW,GAAa,IAAI,CAAC,aAAa,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC9G,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACnC,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAChD,IAAI,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;gBACzD,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBACjC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC7F,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5F,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;CAEJ,CAAA;AA7BY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CA6BrC"}
+{"version":3,"file":"preference-cli-contribution.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"preference-cli-contribution.spec.d.ts","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.spec.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,157 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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 chai_1 = require("chai");
+const os_1 = require("@theia/core/lib/common/os");
+const preference_cli_contribution_1 = require("./preference-cli-contribution");
+const REMOTE_CLI_CONTEXT = {
+    platform: { os: os_1.OS.Type.Linux, arch: 'x64' },
+    directory: '/'
+};
+describe('PreferenceCliContribution', () => {
+    let contribution;
+    beforeEach(() => {
+        contribution = new preference_cli_contribution_1.PreferenceCliContribution();
+    });
+    describe('--set-preference', () => {
+        it('parses a single key=value entry as JSON', async () => {
+            contribution.setArguments({ setPreference: 'editor.fontSize=14' });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([['editor.fontSize', 14]]);
+            (0, chai_1.expect)(await contribution.getSessionPreferences()).to.deep.equal([]);
+        });
+        it('parses string values quoted as JSON strings', async () => {
+            contribution.setArguments({ setPreference: 'workbench.colorTheme="Dark+"' });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([['workbench.colorTheme', 'Dark+']]);
+        });
+        it('parses object values', async () => {
+            contribution.setArguments({ setPreference: 'ai-features.chat.toolConfirmation={"shellExecute":"always_allow"}' });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([
+                ['ai-features.chat.toolConfirmation', { shellExecute: 'always_allow' }]
+            ]);
+        });
+        it('accepts an array of entries', async () => {
+            contribution.setArguments({ setPreference: ['editor.fontSize=12', 'editor.tabSize=2'] });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([
+                ['editor.fontSize', 12],
+                ['editor.tabSize', 2]
+            ]);
+        });
+        it('decodes base64-prefixed JSON values', async () => {
+            const json = JSON.stringify({ nested: true, n: 1 });
+            const b64 = Buffer.from(json, 'utf-8').toString('base64');
+            contribution.setArguments({ setPreference: `my.pref=base64:${b64}` });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([
+                ['my.pref', { nested: true, n: 1 }]
+            ]);
+        });
+        it('preserves "=" characters inside the value', async () => {
+            contribution.setArguments({ setPreference: 'my.pref="a=b=c"' });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([['my.pref', 'a=b=c']]);
+        });
+        it('skips entries that do not contain "="', async () => {
+            const originalWarn = console.warn;
+            console.warn = () => { };
+            try {
+                contribution.setArguments({ setPreference: ['justAKey', 'editor.fontSize=14'] });
+            }
+            finally {
+                console.warn = originalWarn;
+            }
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([['editor.fontSize', 14]]);
+        });
+        it('skips entries whose value is not valid JSON', async () => {
+            const originalWarn = console.warn;
+            console.warn = () => { };
+            try {
+                contribution.setArguments({ setPreference: ['my.pref=notJson', 'editor.fontSize=14'] });
+            }
+            finally {
+                console.warn = originalWarn;
+            }
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([['editor.fontSize', 14]]);
+        });
+    });
+    describe('--session-preference', () => {
+        it('routes entries into the session preferences bucket', async () => {
+            contribution.setArguments({ sessionPreference: 'ai-features.chat.defaultToolConfirmation="always_allow"' });
+            (0, chai_1.expect)(await contribution.getSessionPreferences()).to.deep.equal([
+                ['ai-features.chat.defaultToolConfirmation', 'always_allow']
+            ]);
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([]);
+        });
+        it('supports multiple session entries and base64', async () => {
+            const b64 = Buffer.from('{"shellExecute":"always_allow"}', 'utf-8').toString('base64');
+            contribution.setArguments({
+                sessionPreference: [
+                    'ai-features.chat.defaultToolConfirmation="always_allow"',
+                    `ai-features.chat.toolConfirmation=base64:${b64}`
+                ]
+            });
+            (0, chai_1.expect)(await contribution.getSessionPreferences()).to.deep.equal([
+                ['ai-features.chat.defaultToolConfirmation', 'always_allow'],
+                ['ai-features.chat.toolConfirmation', { shellExecute: 'always_allow' }]
+            ]);
+        });
+        it('keeps --set-preference and --session-preference independent', async () => {
+            contribution.setArguments({
+                setPreference: 'editor.fontSize=14',
+                sessionPreference: 'editor.fontSize=20'
+            });
+            (0, chai_1.expect)(await contribution.getPreferences()).to.deep.equal([['editor.fontSize', 14]]);
+            (0, chai_1.expect)(await contribution.getSessionPreferences()).to.deep.equal([['editor.fontSize', 20]]);
+        });
+    });
+    describe('enhanceArgs (remote forwarding)', () => {
+        it('returns an empty list when no session prefs are set', () => {
+            (0, chai_1.expect)(contribution.enhanceArgs(REMOTE_CLI_CONTEXT)).to.deep.equal([]);
+        });
+        it('emits one base64-encoded --session-preference flag per entry', () => {
+            contribution.setArguments({
+                sessionPreference: [
+                    'ai-features.chat.defaultToolConfirmation="always_allow"',
+                    'ai-features.chat.toolConfirmation={"shellExecute":"always_allow"}'
+                ]
+            });
+            const args = contribution.enhanceArgs(REMOTE_CLI_CONTEXT);
+            (0, chai_1.expect)(args).to.have.lengthOf(2);
+            for (const arg of args) {
+                (0, chai_1.expect)(arg.startsWith('--session-preference=')).to.be.true;
+                const eq = arg.indexOf('=', '--session-preference='.length);
+                const key = arg.substring('--session-preference='.length, eq);
+                const rawValue = arg.substring(eq + 1);
+                (0, chai_1.expect)(rawValue.startsWith('base64:')).to.be.true;
+                const decoded = JSON.parse(Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8'));
+                if (key === 'ai-features.chat.defaultToolConfirmation') {
+                    (0, chai_1.expect)(decoded).to.equal('always_allow');
+                }
+                else {
+                    (0, chai_1.expect)(decoded).to.deep.equal({ shellExecute: 'always_allow' });
+                }
+            }
+        });
+        it('does not forward --set-preference values', () => {
+            contribution.setArguments({
+                setPreference: 'editor.fontSize=14',
+                sessionPreference: 'foo="bar"'
+            });
+            const args = contribution.enhanceArgs(REMOTE_CLI_CONTEXT);
+            (0, chai_1.expect)(args).to.have.lengthOf(1);
+            (0, chai_1.expect)(args[0]).to.match(/^--session-preference=foo=base64:/);
+        });
+    });
+});
+//# sourceMappingURL=preference-cli-contribution.spec.js.map

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

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

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/preferences",
-  "version": "1.74.0-next.10+a3326786b",
+  "version": "1.74.0-next.15+28d45f428",
   "description": "Theia - Preferences Extension",
   "dependencies": {
-    "@theia/core": "1.74.0-next.10+a3326786b",
-    "@theia/editor": "1.74.0-next.10+a3326786b",
-    "@theia/filesystem": "1.74.0-next.10+a3326786b",
-    "@theia/monaco": "1.74.0-next.10+a3326786b",
+    "@theia/core": "1.74.0-next.15+28d45f428",
+    "@theia/editor": "1.74.0-next.15+28d45f428",
+    "@theia/filesystem": "1.74.0-next.15+28d45f428",
+    "@theia/monaco": "1.74.0-next.15+28d45f428",
     "@theia/monaco-editor-core": "1.108.201",
-    "@theia/userstorage": "1.74.0-next.10+a3326786b",
-    "@theia/workspace": "1.74.0-next.10+a3326786b",
+    "@theia/userstorage": "1.74.0-next.15+28d45f428",
+    "@theia/workspace": "1.74.0-next.15+28d45f428",
     "async-mutex": "^0.3.2",
     "fast-deep-equal": "^3.1.3",
     "jsonc-parser": "^3.3.1",
@@ -55,5 +55,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "a3326786bf47e6e12172815eba3578ca4234bb23"
+  "gitHead": "28d45f4284702e106aa784d69bc3d3418243a05a"
 }

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

@@ -28,11 +28,56 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
     protected readonly preferenceService: PreferenceService;
 
     onStart(): void {
-        this.CliPreferences.getPreferences().then(async preferences => {
-            await this.preferenceService.ready;
-            for (const [key, value] of preferences) {
-                this.preferenceService.set(key, value, PreferenceScope.User);
+        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 => {
+                console.warn('Failed to fetch --session-preference values:', e);
+                return [] as [string, unknown][];
+            }),
+            this.CliPreferences.getPreferences().catch(e => {
+                console.warn('Failed to fetch --set-preference values:', e);
+                return [] as [string, unknown][];
+            })
+        ]);
+
+        // `preferenceService.set()` needs the target provider registered in the providers
+        // map, which only happens once `initializeProviders()` has walked every scope and
+        // resolved `ready`. Writing before that returns `undefined` from `getProvider()`
+        // and the call throws "Unable to write to ... Settings".
+        await this.preferenceService.ready;
+
+        // Session writes go first and are awaited sequentially so that when the same key
+        // appears in both `--session-preference` and `--set-preference`, the persistent
+        // write in the next block sees a settled session provider (and correctly triggers
+        // `evictSessionOverride`) rather than racing with the session write.
+        await this.applyAll(session, PreferenceScope.Session);
+        if (session.length > 0) {
+            // Log keys only. Values may carry overrides for security-sensitive prefs
+            // (e.g. AI tool auto-approval) and should not leak into screenshots or support bundles.
+            console.info(`Applied ${session.length} --session-preference value(s):`,
+                session.map(([k]) => k).join(', '));
+        }
+
+        await this.applyAll(persistent, PreferenceScope.User);
+    }
+
+    /**
+     * 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
+     * remaining writes, and it is not left as an unhandled promise rejection.
+     */
+    protected async applyAll(entries: ReadonlyArray<[string, unknown]>, scope: PreferenceScope): Promise<void> {
+        for (const [key, value] of entries) {
+            try {
+                await this.preferenceService.set(key, value, scope);
+            } catch (e) {
+                console.warn(`Failed to apply CLI preference "${key}" to ${PreferenceScope[scope]} scope:`, e);
             }
-        });
+        }
     }
 }

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

@@ -32,6 +32,7 @@ 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 { SessionPreferenceStatusBarContribution } from './session-preference-status-bar-contribution';
 import { PreferenceLayoutProvider } from './util/preference-layout';
 import { PreferencesWidget } from './views/preference-widget';
 import { PreferenceStorageFactory } from '../common/abstract-resource-preference-provider';
@@ -70,6 +71,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(SessionPreferenceStatusBarContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(SessionPreferenceStatusBarContribution);
 
     bind(WidgetStatusBarContribution).toConstantValue(noopWidgetStatusBarContribution(PreferencesWidget));
 }

package/src/browser/session-preference-status-bar-contribution.ts

@@ -0,0 +1,157 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource 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, postConstruct } from '@theia/core/shared/inversify';
+import { CommonCommands, FrontendApplicationContribution, StatusBar, StatusBarAlignment } from '@theia/core/lib/browser';
+import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering/markdown-string';
+import { PreferenceProviderProvider, PreferenceScope, PreferenceService } from '@theia/core/lib/common/preferences';
+import { DisposableCollection, nls } from '@theia/core';
+
+export const SESSION_PREFERENCE_STATUS_BAR_ID = 'session-preference-status';
+
+/**
+ * Status bar item that reports preferences whose effective value comes from the
+ * in-memory session scope (typically set via `--session-preference`). Each active
+ * override is listed in the tooltip with a link that opens the Settings UI filtered
+ * to that preference, so the user can read its description there.
+ */
+@injectable()
+export class SessionPreferenceStatusBarContribution implements FrontendApplicationContribution {
+
+    @inject(StatusBar)
+    protected readonly statusBar: StatusBar;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(PreferenceProviderProvider)
+    protected readonly providerProvider: PreferenceProviderProvider;
+
+    protected readonly toDispose = new DisposableCollection();
+
+    @postConstruct()
+    protected init(): void {
+        this.toDispose.push(
+            this.preferenceService.onPreferenceChanged(e => {
+                // React to both additions and removals of session overrides.
+                // Filtering by `isInSessionScope(key)` would miss removals because by the time
+                // the event fires, the session value is already gone.
+                if (e.scope === PreferenceScope.Session) {
+                    this.refresh();
+                }
+            })
+        );
+    }
+
+    onStart(): void {
+        this.preferenceService.ready.then(() => this.refresh());
+    }
+
+    protected refresh(): void {
+        const entries = this.collectActive();
+        if (entries.length === 0) {
+            this.statusBar.removeElement(SESSION_PREFERENCE_STATUS_BAR_ID);
+            return;
+        }
+        const label = nls.localize('theia/preferences/sessionPreferences/statusBar',
+            'Session Preferences ({0})', entries.length);
+        this.statusBar.setElement(SESSION_PREFERENCE_STATUS_BAR_ID, {
+            alignment: StatusBarAlignment.LEFT,
+            text: `$(warning) ${label}`,
+            tooltip: this.buildTooltip(entries),
+            // Lower priority sits further right on the left area, so this entry stays
+            // to the right of higher-priority entries (workspace, git, problems).
+            priority: 1,
+            backgroundColor: 'var(--theia-statusBarItem-prominentBackground)',
+            color: 'var(--theia-statusBarItem-prominentForeground)'
+        });
+    }
+
+    protected collectActive(): ReadonlyArray<[string, unknown]> {
+        // Read directly from the session provider rather than walking schema properties,
+        // so overrides for keys that aren't registered as schema properties (e.g. a stray
+        // `--session-preference foo.bar=1`) still show up here and in the tooltip.
+        const sessionProvider = this.providerProvider(PreferenceScope.Session);
+        const preferences = sessionProvider?.getPreferences() ?? {};
+        const result: [string, unknown][] = Object.entries(preferences);
+        // Stable order: alphabetical by key.
+        result.sort(([a], [b]) => a.localeCompare(b));
+        return result;
+    }
+
+    protected buildTooltip(entries: ReadonlyArray<[string, unknown]>): MarkdownStringImpl {
+        // `isTrusted` is restricted to the single command we actually emit links for, so
+        // a stray `command:` link in any preference key (extremely unlikely) can't execute.
+        const md = new MarkdownStringImpl('', {
+            supportThemeIcons: true,
+            isTrusted: { enabledCommands: [CommonCommands.OPEN_PREFERENCES.id] }
+        });
+        md.appendMarkdown(`**${nls.localize('theia/preferences/sessionPreferences/tooltipHeader',
+            'These settings are overridden for this session')}**\n\n`);
+        md.appendMarkdown(nls.localize('theia/preferences/sessionPreferences/tooltipBody',
+            'They were passed in via --session-preference and only live in memory. Click a setting name to jump to it in the Settings view.'));
+        md.appendMarkdown('\n\n');
+        for (const [key, value] of entries) {
+            // The setting name is a plain markdown link to the Settings view; the value
+            // follows as plain text after a colon. No code-block styling on either side.
+            md.appendMarkdown(`[${this.escapeLinkText(key)}](${this.buildOpenSettingsUri(key)}): ${this.formatDisplayValue(value)}\n\n`);
+        }
+        md.appendMarkdown(nls.localize('theia/preferences/sessionPreferences/tooltipChangeNote',
+            'Editing any of these clears its session override for this run. To use the saved values from the next launch on, restart without the --session-preference arguments.'));
+        return md;
+    }
+
+    protected buildOpenSettingsUri(preferenceKey: string): string {
+        // The Settings UI uses its search term, so a plain key string filters the view
+        // to that single preference.
+        const args = encodeURIComponent(JSON.stringify([preferenceKey]));
+        return `command:${CommonCommands.OPEN_PREFERENCES.id}?${args}`;
+    }
+
+    /**
+     * Produces a readable, no-code-formatting representation of a preference value:
+     * strings without surrounding JSON quotes, booleans as on/off, primitives as-is,
+     * objects/arrays as compact JSON. The result is shown as plain text in the tooltip.
+     */
+    protected formatDisplayValue(value: unknown): string {
+        if (typeof value === 'string') {
+            return value.length === 0 ? '(empty)' : value;
+        }
+        if (typeof value === 'boolean') {
+            return value
+                ? nls.localize('theia/preferences/sessionPreferences/valueOn', 'on')
+                : nls.localize('theia/preferences/sessionPreferences/valueOff', 'off');
+        }
+        if (value === undefined) {
+            return '(unset)';
+        }
+        try {
+            return JSON.stringify(value);
+        } catch {
+            return String(value);
+        }
+    }
+
+    /** Escape `]` so it can't terminate the markdown link early. */
+    protected escapeLinkText(text: string): string {
+        return text.replace(/\]/g, '\\]');
+    }
+
+    onStop(): void {
+        this.toDispose.dispose();
+        this.statusBar.removeElement(SESSION_PREFERENCE_STATUS_BAR_ID);
+    }
+}

package/src/browser/views/components/preference-node-renderer.ts

@@ -349,12 +349,39 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
             headlineWrapper.removeChild(currentFirstChild);
         }
 
-        const currentLastChild = headlineWrapper.lastChild as HTMLElement;
-        if (currentLastChild.classList.contains('preference-leaf-headline-suffix')) {
-            this.compareOtherModifiedScopes(headlineWrapper, currentLastChild);
+        const existingModifiedScopes = headlineWrapper.querySelector('.preference-modified-scopes-suffix') as HTMLElement | null;
+        if (existingModifiedScopes) {
+            this.compareOtherModifiedScopes(headlineWrapper, existingModifiedScopes);
         } else {
             this.createOtherModifiedScopes(headlineWrapper);
         }
+        this.updateSessionOverrideState();
+    }
+
+    /**
+     * Adds (or removes) a subtle "Overridden by session" suffix in the headline when a
+     * session override (set via `--session-preference`) is active for this preference.
+     * Styled like the existing "Modified in:" suffix so it reads as a hint, not a warning.
+     * Editing remains enabled; writing a new value clears the session override via
+     * `PreferenceServiceImpl.evictSessionOverride`.
+     */
+    protected updateSessionOverrideState(): void {
+        const { headlineWrapper } = this;
+        // Defensive: remove any leftover marker from earlier prominent styling.
+        headlineWrapper.querySelector('.preference-session-override-marker')?.remove();
+
+        const hasSessionOverride = this.inspection?.sessionValue !== undefined;
+        const existingSuffix = headlineWrapper.querySelector('.preference-session-suffix') as HTMLElement | null;
+        if (hasSessionOverride && !existingSuffix) {
+            const suffix = document.createElement('i');
+            suffix.classList.add('preference-leaf-headline-suffix', 'preference-session-suffix');
+            suffix.textContent = nls.localize('theia/preferences/sessionOverride/suffix', 'Overridden by session');
+            suffix.title = nls.localize('theia/preferences/sessionOverride/suffixTooltip',
+                'This preference has a session value set via --session-preference. Editing it here clears the session override for the rest of this session.');
+            headlineWrapper.appendChild(suffix);
+        } else if (!hasSessionOverride && existingSuffix) {
+            existingSuffix.remove();
+        }
     }
 
     protected compareOtherModifiedScopes(headlineWrapper: HTMLDivElement, currentSuffix: HTMLElement): void {
@@ -389,8 +416,14 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
         const modifiedScopes = this.getModifiedScopesAsStrings();
         if (modifiedScopes.length !== 0) {
             const wrapper = document.createElement('i');
-            wrapper.classList.add('preference-leaf-headline-suffix');
-            headlineWrapper.appendChild(wrapper);
+            wrapper.classList.add('preference-leaf-headline-suffix', 'preference-modified-scopes-suffix');
+            // The session suffix, if present, is always inserted after the modified-scopes suffix.
+            const sessionSuffix = headlineWrapper.querySelector('.preference-session-suffix');
+            if (sessionSuffix) {
+                headlineWrapper.insertBefore(wrapper, sessionSuffix);
+            } else {
+                headlineWrapper.appendChild(wrapper);
+            }
 
             const messagePrefix = this.getModifiedMessagePrefix();
             const messageWrapper = document.createElement('span');

package/src/common/cli-preferences.ts

@@ -19,4 +19,5 @@ export const CliPreferencesPath = '/services/cli-preferences';
 
 export interface CliPreferences {
     getPreferences(): Promise<[string, unknown][]>;
+    getSessionPreferences(): Promise<[string, unknown][]>;
 }

package/src/node/preference-backend-module.ts

@@ -16,6 +16,7 @@
 
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { CliContribution } from '@theia/core/lib/node/cli';
+import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
 import { PreferenceCliContribution } from './preference-cli-contribution';
 import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
 import { CliPreferences, CliPreferencesPath } from '../common/cli-preferences';
@@ -35,6 +36,7 @@ export default new ContainerModule(bind => {
     bind(PreferenceCliContribution).toSelf().inSingletonScope();
     bind(CliPreferences).toService(PreferenceCliContribution);
     bind(CliContribution).toService(PreferenceCliContribution);
+    bind(RemoteCliContribution).toService(PreferenceCliContribution);
     bind(JSONCEditor).toSelf().inSingletonScope();
 
     bind(PreferenceStorageFactory).toFactory(({ container }) => (uri: URI, scope: PreferenceScope) => new BackendPreferenceStorage(