@codingame/monaco-vscode-api 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js

@@ -16,7 +16,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "jsonValidation",
     defaultExtensionKind: ["workspace", "web"],
     jsonSchema: {
-        description: ( localize(2882, "Contributes json schema configuration.")),
+        description: ( localize(2958, "Contributes json schema configuration.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -36,7 +36,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 fileMatch: {
                     type: ["string", "array"],
                     description: ( localize(
-                        2883,
+                        2959,
                         "The file pattern (or an array of patterns) to match, for example \"package.json\" or \"*.launch\". Exclusion patterns start with '!'"
                     )),
                     items: {
@@ -45,7 +45,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 url: {
                     description: ( localize(
-                        2884,
+                        2960,
                         "A schema URL ('http:', 'https:') or relative path to the extension folder ('./')."
                     )),
                     type: "string"
@@ -62,20 +62,20 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(2885, "'configuration.jsonValidation' must be a array")));
+                    collector.error(( localize(2961, "'configuration.jsonValidation' must be a array")));
                     return;
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
                         collector.error(( localize(
-                            2886,
+                            2962,
                             "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
                         )));
                         return;
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( localize(2887, "'configuration.jsonValidation.url' must be a URL or relative path")));
+                        collector.error(( localize(2963, "'configuration.jsonValidation.url' must be a URL or relative path")));
                         return;
                     }
                     if (uri.startsWith("./")) {
@@ -83,7 +83,7 @@ class JSONValidationExtensionPoint {
                             const colorThemeLocation = joinPath(extensionLocation, uri);
                             if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
                                 collector.warn(( localize(
-                                    2888,
+                                    2964,
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                                     configurationExtPoint.name,
                                     (colorThemeLocation.toString()),
@@ -92,14 +92,14 @@ class JSONValidationExtensionPoint {
                             }
                         } catch (e) {
                             collector.error(( localize(
-                                2889,
+                                2965,
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
                                 e.message
                             )));
                         }
                     } else if (!/^[^:/?#]+:\/\//.test(uri)) {
                         collector.error(( localize(
-                            2890,
+                            2966,
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
                         )));
                         return;
@@ -128,7 +128,7 @@ class JSONValidationDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(2891, "File Match")), ( localize(2892, "Schema"))];
+        const headers = [( localize(2967, "File Match")), ( localize(2968, "Schema"))];
         const rows = ( contrib.map(v => {
             return [( new MarkdownString()).appendMarkdown(`\`${Array.isArray(v.fileMatch) ? v.fileMatch.join(", ") : v.fileMatch}\``), v.url];
         }));
@@ -143,7 +143,7 @@ class JSONValidationDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "jsonValidation",
-    label: ( localize(2893, "JSON Validation")),
+    label: ( localize(2969, "JSON Validation")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/browser/actions/developerActions.js

@@ -42,15 +42,21 @@ import { IDefaultAccountService } from '../../../platform/defaultAccount/common/
 import { IAuthenticationService } from '../../services/authentication/common/authentication.service.js';
 import { IAuthenticationAccessService } from '../../services/authentication/browser/authenticationAccessService.service.js';
 import { IPolicyService } from '../../../platform/policy/common/policy.service.js';
-import { APPROVED_ACCOUNT_ORGANIZATIONS_POLICY_NAME } from '../../services/policies/common/accountPolicyService.js';
+import { pickManagedSettings, projectManagedSettings, COPILOT_ENABLED_PLUGINS_KEY, COPILOT_STRICT_MARKETPLACES_KEY, COPILOT_EXTRA_MARKETPLACES_KEY, MANAGED_SETTINGS_CHANNELS } from '../../../platform/policy/common/copilotManagedSettings.js';
+import { INativeManagedSettingsService, IFileManagedSettingsService } from '../../../platform/policy/common/copilotManagedSettings.service.js';
+import { APPROVED_ACCOUNT_ORGANIZATIONS_POLICY_NAME, AccountPolicyGateState, AccountPolicyGateUnsatisfiedReason } from '../../services/policies/common/accountPolicyService.js';
 import { IAccountPolicyGateService } from '../../services/policies/common/accountPolicyService.service.js';
+import { adaptManagedSettings } from '../../services/accounts/browser/managedSettings.js';
+import { isObject } from '../../../base/common/types.js';
+import { parse } from '../../../base/common/json.js';
+import { getParseErrorMessage } from '../../../base/common/jsonErrorMessages.js';
 
 registerCss(actions);
 class InspectContextKeysAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.inspectContextKeys",
-            title: ( localize2(2894, "Inspect Context Keys")),
+            title: ( localize2(2970, "Inspect Context Keys")),
             category: Categories.Developer,
             f1: true
         });
@@ -96,7 +102,7 @@ class ToggleScreencastModeAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.toggleScreencastMode",
-            title: ( localize2(2895, "Toggle Screencast Mode")),
+            title: ( localize2(2971, "Toggle Screencast Mode")),
             category: Categories.Developer,
             f1: true
         });
@@ -341,7 +347,7 @@ class LogStorageAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.logStorage",
-            title: ( localize2(2896, "Log Storage Database Contents")),
+            title: ( localize2(2972, "Log Storage Database Contents")),
             category: Categories.Developer,
             f1: true
         });
@@ -351,16 +357,16 @@ class LogStorageAction extends Action2 {
         const dialogService = accessor.get(IDialogService);
         storageService.log();
         dialogService.info(( localize(
-            2897,
+            2973,
             "The storage database contents have been logged to the developer tools."
-        )), ( localize(2898, "Open developer tools from the menu and select the Console tab.")));
+        )), ( localize(2974, "Open developer tools from the menu and select the Console tab.")));
     }
 }
 class LogWorkingCopiesAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.logWorkingCopies",
-            title: ( localize2(2899, "Log Working Copies")),
+            title: ( localize2(2975, "Log Working Copies")),
             category: Categories.Developer,
             f1: true
         });
@@ -390,7 +396,7 @@ class RemoveLargeStorageEntriesAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.removeLargeStorageDatabaseEntries",
-            title: ( localize2(2900, "Remove Large Storage Database Entries...")),
+            title: ( localize2(2976, "Remove Large Storage Database Entries...")),
             category: Categories.Developer,
             f1: true
         });
@@ -418,10 +424,10 @@ class RemoveLargeStorageEntriesAction extends Action2 {
                             label: key,
                             description: ByteSize.formatSize(value.length),
                             detail: ( localize(
-                                2901,
+                                2977,
                                 "Scope: {0}, Target: {1}",
-                                scope === StorageScope.APPLICATION ? ( localize(2902, "Global")) : scope === StorageScope.PROFILE ? ( localize(2903, "Profile")) : ( localize(2904, "Workspace")),
-                                target === StorageTarget.MACHINE ? ( localize(2905, "Machine")) : ( localize(2906, "User"))
+                                scope === StorageScope.APPLICATION ? ( localize(2978, "Global")) : scope === StorageScope.PROFILE ? ( localize(2979, "Profile")) : ( localize(2980, "Workspace")),
+                                target === StorageTarget.MACHINE ? ( localize(2981, "Machine")) : ( localize(2982, "User"))
                             ))
                         });
                     }
@@ -437,10 +443,10 @@ class RemoveLargeStorageEntriesAction extends Action2 {
             picker.ok = false;
             picker.customButton = true;
             picker.hideCheckAll = true;
-            picker.customLabel = ( localize(2907, "Remove"));
-            picker.placeholder = ( localize(2908, "Select large entries to remove from storage"));
+            picker.customLabel = ( localize(2983, "Remove"));
+            picker.placeholder = ( localize(2984, "Select large entries to remove from storage"));
             if (items.length === 0) {
-                picker.description = ( localize(2909, "There are no large storage entries to remove."));
+                picker.description = ( localize(2985, "There are no large storage entries to remove."));
             }
             picker.show();
             disposables.add(picker.onDidCustom(() => {
@@ -457,15 +463,15 @@ class RemoveLargeStorageEntriesAction extends Action2 {
         } = await dialogService.confirm({
             type: "warning",
             message: ( localize(
-                2910,
+                2986,
                 "Do you want to remove the selected storage entries from the database?"
             )),
             detail: ( localize(
-                2911,
+                2987,
                 "{0}\n\nThis action is irreversible and may result in data loss!",
                 ( selectedItems.map(item => item.label)).join("\n")
             )),
-            primaryButton: ( localize(2912, "&&Remove"))
+            primaryButton: ( localize(2988, "&&Remove"))
         });
         if (!confirmed) {
             return;
@@ -487,7 +493,7 @@ class StartTrackDisposables extends Action2 {
     constructor() {
         super({
             id: "workbench.action.startTrackDisposables",
-            title: ( localize2(2913, "Start Tracking Disposables")),
+            title: ( localize2(2989, "Start Tracking Disposables")),
             category: Categories.Developer,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ( DisposablesSnapshotStateContext.isEqualTo("pending")).negate()), ( ( DisposablesSnapshotStateContext.isEqualTo("started")).negate())))
@@ -505,7 +511,7 @@ class SnapshotTrackedDisposables extends Action2 {
     constructor() {
         super({
             id: "workbench.action.snapshotTrackedDisposables",
-            title: ( localize2(2914, "Snapshot Tracked Disposables")),
+            title: ( localize2(2990, "Snapshot Tracked Disposables")),
             category: Categories.Developer,
             f1: true,
             precondition: ( DisposablesSnapshotStateContext.isEqualTo("started"))
@@ -523,7 +529,7 @@ class StopTrackDisposables extends Action2 {
     constructor() {
         super({
             id: "workbench.action.stopTrackDisposables",
-            title: ( localize2(2915, "Stop Tracking Disposables")),
+            title: ( localize2(2991, "Stop Tracking Disposables")),
             category: Categories.Developer,
             f1: true,
             precondition: ( DisposablesSnapshotStateContext.isEqualTo("pending"))
@@ -553,11 +559,45 @@ class StopTrackDisposables extends Action2 {
         trackedDisposables.clear();
     }
 }
+function managedSettingsSourceLabel(source) {
+    switch (source) {
+    case "server":
+        return "GitHub Server API";
+    case "nativeMdm":
+        return "Native MDM";
+    case "file":
+        return "File (managed-settings.json)";
+    case "none":
+        return "None (no managed settings active)";
+    }
+}
+function managedSettingsSourceShortLabel(source) {
+    switch (source) {
+    case "server":
+        return "Server";
+    case "nativeMdm":
+        return "Native MDM";
+    case "file":
+        return "File";
+    case "none":
+        return "None";
+    }
+}
+function jsonBlock(value) {
+    return "```json\n" + JSON.stringify(value ?? {}, null, 2) + "\n```\n\n";
+}
+function managedValueCell(value) {
+    if (value === undefined) {
+        return "—";
+    }
+    return `\`${JSON.stringify(value).replace(/\|/g, "\\|")}\``;
+}
+const PROPERTY_VALUE_TABLE_HEADER = "| Property | Value |\n|----------|-------|\n";
 class PolicyDiagnosticsAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.showPolicyDiagnostics",
-            title: ( localize2(2916, "Policy Diagnostics")),
+            title: ( localize2(2992, "Policy Diagnostics")),
             category: Categories.Developer,
             f1: true
         });
@@ -571,12 +611,19 @@ class PolicyDiagnosticsAction extends Action2 {
         const authenticationAccessService = accessor.get(IAuthenticationAccessService);
         const policyService = accessor.get(IPolicyService);
         const accountPolicyGateService = accessor.get(IAccountPolicyGateService);
+        let nativeManagedSettingsService;
+        try {
+            nativeManagedSettingsService = accessor.get(INativeManagedSettingsService);
+        } catch {}
+        let fileManagedSettingsService;
+        try {
+            fileManagedSettingsService = accessor.get(IFileManagedSettingsService);
+        } catch {}
         const configurationRegistry = ( Registry.as(Extensions.Configuration));
         let content = "# VS Code Policy Diagnostics\n\n";
         content += "*WARNING: This file may contain sensitive information.*\n\n";
         content += "## System Information\n\n";
-        content += "| Property | Value |\n";
-        content += "|----------|-------|\n";
+        content += PROPERTY_VALUE_TABLE_HEADER;
         content += `| Generated | ${( new Date()).toISOString()} |\n`;
         content += `| Product | ${productService.nameLong} ${productService.version} |\n`;
         content += `| Commit | ${productService.commit || "n/a"} |\n\n`;
@@ -603,8 +650,7 @@ class PolicyDiagnosticsAction extends Action2 {
                 content += `**Account ID/Username**: ${username}\n\n`;
                 content += `**Account Label**: ${accountLabel}\n\n`;
                 content += "### Detailed Account Properties\n\n";
-                content += "| Property | Value |\n";
-                content += "|----------|-------|\n";
+                content += PROPERTY_VALUE_TABLE_HEADER;
                 for (const [key, value] of Object.entries(account)) {
                     if (value !== undefined && value !== null) {
                         let displayValue;
@@ -631,8 +677,7 @@ class PolicyDiagnosticsAction extends Action2 {
         try {
             const gateInfo = accountPolicyGateService.gateInfo;
             const approvedOrgsRaw = policyService.getPolicyValue(APPROVED_ACCOUNT_ORGANIZATIONS_POLICY_NAME);
-            content += "| Property | Value |\n";
-            content += "|----------|-------|\n";
+            content += PROPERTY_VALUE_TABLE_HEADER;
             content += `| State | \`${gateInfo.state}\` |\n`;
             content += `| Reason | ${gateInfo.reason ? `\`${gateInfo.reason}\`` : "*n/a*"} |\n`;
             content += `| ${APPROVED_ACCOUNT_ORGANIZATIONS_POLICY_NAME} | ${approvedOrgsRaw !== undefined ? `\`${String(approvedOrgsRaw)}\`` : "*not set*"} |\n`;
@@ -649,35 +694,132 @@ class PolicyDiagnosticsAction extends Action2 {
             content += `*Error retrieving account policy gate info: ${error}*\n\n`;
         }
         content += "## Managed Settings\n\n";
+        const activeManagedSettingSources = ( new Map());
         try {
             const policyData = defaultAccountService.policyData;
-            content += "| Property | Value |\n";
-            content += "|----------|-------|\n";
+            const serverManagedSettings = policyData?.managedSettings;
+            const nativeManagedSettings = nativeManagedSettingsService?.managedSettings;
+            const fileManagedSettings = fileManagedSettingsService?.managedSettings;
+            const pick = pickManagedSettings(nativeManagedSettings, serverManagedSettings, fileManagedSettings);
+            content += `**Active sources** (in precedence order): ${pick.activeSources.length > 0 ? ( pick.activeSources.map(managedSettingsSourceLabel)).join(", ") : managedSettingsSourceLabel("none")}\n\n`;
+            content += "*Precedence is resolved per key: native MDM wins over the server endpoint, which wins over the file on disk. A key left unset by a higher channel is still filled in by a lower one.*\n\n";
+            const parseErrors = [];
+            const channelContributes = channel => pick.activeSources.includes(channel);
+            content += "### Native MDM\n\n";
+            content += PROPERTY_VALUE_TABLE_HEADER;
+            content += `| Available | ${nativeManagedSettingsService ? "yes" : "no"} |\n`;
+            content += `| Contributes winning keys | ${channelContributes("nativeMdm") ? "yes" : "no"} |\n\n`;
+            if (nativeManagedSettingsService) {
+                content += jsonBlock(nativeManagedSettings);
+            }
+            content += "### GitHub Server API\n\n";
+            content += PROPERTY_VALUE_TABLE_HEADER;
+            content += "| Endpoint | `/copilot_internal/managed_settings` |\n";
             const fetchStatus = defaultAccountService.managedSettingsFetchStatus;
-            const fetchStatusDisplay = fetchStatus === null ? "*not yet fetched*" : `\`${fetchStatus}\``;
-            content += `| Last fetch | ${fetchStatusDisplay} |\n`;
+            content += `| Last fetch | ${fetchStatus === null ? "*never*" : `\`${fetchStatus}\``} |\n`;
             const fetchedAt = defaultAccountService.managedSettingsFetchedAt;
-            content += `| Fetched at | ${fetchedAt ? ( new Date(fetchedAt)).toLocaleString() : "*n/a*"} |\n`;
-            content += "\n";
-            const managedSettingsData = {
-                enabledPlugins: policyData?.enabledPlugins,
-                extraKnownMarketplaces: policyData?.extraKnownMarketplaces,
-                strictKnownMarketplaces: policyData?.strictKnownMarketplaces
-            };
-            content += "```json\n";
-            content += JSON.stringify(managedSettingsData, null, 2);
-            content += "\n```\n\n";
+            content += `| Last successful fetch | ${fetchedAt ? ( new Date(fetchedAt)).toLocaleString() : "*n/a*"} |\n`;
+            content += `| Contributes winning keys | ${channelContributes("server") ? "yes" : "no"} |\n\n`;
+            const rawResponse = defaultAccountService.managedSettingsRawResponse;
+            if (isObject(rawResponse)) {
+                adaptManagedSettings(rawResponse, message => parseErrors.push({
+                    stage: "adapt",
+                    message
+                }));
+                content += "**Raw response** (last successful fetch)\n\n";
+                content += jsonBlock(rawResponse);
+            }
+            content += "**Normalized bag**\n\n";
+            content += jsonBlock(serverManagedSettings);
+            content += "### File (managed-settings.json)\n\n";
+            content += PROPERTY_VALUE_TABLE_HEADER;
+            content += `| Available | ${fileManagedSettingsService ? "yes" : "no"} |\n`;
+            content += `| Contributes winning keys | ${channelContributes("file") ? "yes" : "no"} |\n\n`;
+            if (fileManagedSettingsService) {
+                content += jsonBlock(fileManagedSettings);
+            }
+            content += "### Resolution (per key)\n\n";
+            if (pick.resolutions.size > 0) {
+                content += "| Key | Effective | Winning Source | Native MDM | Server | File |\n";
+                content += "|-----|-----------|----------------|------------|--------|------|\n";
+                const channelValue = (resolution, channel) => {
+                    const contribution = resolution.contributions.find(c => c.channel === channel);
+                    if (!contribution) {
+                        return "—";
+                    }
+                    const cell = managedValueCell(contribution.value);
+                    return channel === resolution.source ? cell : `~~${cell}~~`;
+                };
+                for (const key of [...( pick.resolutions.keys())].sort()) {
+                    const resolution = pick.resolutions.get(key);
+                    content += `| ${key} | ${managedValueCell(resolution.value)} | ${managedSettingsSourceShortLabel(resolution.source)} | ${channelValue(resolution, "nativeMdm")} | ${channelValue(resolution, "server")} | ${channelValue(resolution, "file")} |\n`;
+                }
+                content += "\n";
+                content += "*Struck-through values were supplied by a channel but overridden by a higher-precedence channel for that key.*\n\n";
+            } else {
+                content += "*No managed-settings keys are supplied by any channel.*\n\n";
+            }
+            const declaredDefinitions = {};
+            for (const property of [...( Object.values(configurationRegistry.getConfigurationProperties())), ...( Object.values(configurationRegistry.getExcludedConfigurationProperties()))]) {
+                const declared = property.policy?.managedSettings;
+                if (declared) {
+                    Object.assign(declaredDefinitions, declared);
+                }
+            }
+            const effective = projectManagedSettings(pick.values, declaredDefinitions, message => parseErrors.push({
+                stage: "project",
+                message
+            }));
+            for (const key of ( Object.keys(effective))) {
+                const resolution = pick.resolutions.get(key);
+                if (resolution) {
+                    activeManagedSettingSources.set(key, resolution.source);
+                }
+            }
+            for (const key of [
+                COPILOT_ENABLED_PLUGINS_KEY,
+                COPILOT_STRICT_MARKETPLACES_KEY,
+                COPILOT_EXTRA_MARKETPLACES_KEY
+            ]) {
+                const value = effective[key];
+                if (typeof value !== "string") {
+                    continue;
+                }
+                const jsonErrors = [];
+                parse(value, jsonErrors);
+                for (const e of jsonErrors) {
+                    parseErrors.push({
+                        stage: "parse",
+                        message: `${key} @ offset ${e.offset}: ${getParseErrorMessage(e.error)}`
+                    });
+                }
+            }
+            content += "### Effective\n\n";
+            content += jsonBlock(effective);
+            content += `### Parse Errors (${parseErrors.length})\n\n`;
+            if (parseErrors.length > 0) {
+                content += "| Stage | Message |\n";
+                content += "|-------|---------|\n";
+                for (const {
+                    stage,
+                    message
+                } of parseErrors) {
+                    content += `| ${stage} | ${message.replace(/\|/g, "\\|")} |\n`;
+                }
+                content += "\n";
+            }
         } catch (error) {
             content += `*Error rendering managed settings diagnostics: ${error}*\n\n`;
         }
         content += "## Policy-Controlled Settings\n\n";
         const policyConfigurations = configurationRegistry.getPolicyConfigurations();
+        const policyReferenceConfigurations = configurationRegistry.getPolicyReferenceConfigurations();
         const configurationProperties = configurationRegistry.getConfigurationProperties();
         const excludedProperties = configurationRegistry.getExcludedConfigurationProperties();
-        if (policyConfigurations.size > 0) {
+        if (policyConfigurations.size > 0 || policyReferenceConfigurations.size > 0) {
             const appliedPolicy = [];
             const notAppliedPolicy = [];
-            for (const [policyName, settingKey] of policyConfigurations) {
+            const collectPolicySetting = (policyName, settingKey) => {
                 const property = configurationProperties[settingKey] ?? excludedProperties[settingKey];
                 if (property) {
                     const inspectValue = configurationService.inspect(settingKey);
@@ -693,6 +835,14 @@ class PolicyDiagnosticsAction extends Action2 {
                         notAppliedPolicy.push(settingInfo);
                     }
                 }
+            };
+            for (const [policyName, settingKey] of policyConfigurations) {
+                collectPolicySetting(policyName, settingKey);
+            }
+            for (const [policyName, settingKeys] of policyReferenceConfigurations) {
+                for (const settingKey of settingKeys) {
+                    collectPolicySetting(policyName, settingKey);
+                }
             }
             const policySourceMemo = ( new Map());
             const getPolicySource = policyName => {
@@ -718,19 +868,39 @@ class PolicyDiagnosticsAction extends Action2 {
                     return "Unknown";
                 }
             };
+            const gateInfo = accountPolicyGateService.gateInfo;
+            const gateRestricted = gateInfo.state === AccountPolicyGateState.Restricted && gateInfo.reason !== AccountPolicyGateUnsatisfiedReason.PolicyNotResolved;
+            const getRefinedPolicySource = item => {
+                const declaredKeys = item.property.policy?.managedSettings ? ( Object.keys(item.property.policy.managedSettings)) : [];
+                if (!gateRestricted) {
+                    const winningSources = ( new Set());
+                    for (const key of declaredKeys) {
+                        const source = activeManagedSettingSources.get(key);
+                        if (source) {
+                            winningSources.add(source);
+                        }
+                    }
+                    if (winningSources.size > 0) {
+                        const ordered = MANAGED_SETTINGS_CHANNELS.filter(channel => ( winningSources.has(channel)));
+                        return `Managed Settings: ${( ordered.map(managedSettingsSourceShortLabel)).join(", ")}`;
+                    }
+                }
+                return getPolicySource(item.name);
+            };
             content += "### Applied Policy\n\n";
             appliedPolicy.sort(
-                (a, b) => getPolicySource(a.name).localeCompare(getPolicySource(b.name)) || a.name.localeCompare(b.name)
+                (a, b) => getRefinedPolicySource(a).localeCompare(getRefinedPolicySource(b)) || a.name.localeCompare(b.name)
             );
             if (appliedPolicy.length > 0) {
-                content += "| Setting Key | Policy Name | Policy Source | Default Value | Current Value | Policy Value |\n";
-                content += "|-------------|-------------|---------------|---------------|---------------|-------------|\n";
+                content += "| Setting Key | Policy Name | Policy Source | Managed Settings | Default Value | Current Value | Policy Value |\n";
+                content += "|-------------|-------------|---------------|------------------|---------------|---------------|-------------|\n";
                 for (const setting of appliedPolicy) {
                     const defaultValue = JSON.stringify(setting.property.default);
                     const currentValue = JSON.stringify(setting.inspection.value);
                     const policyValue = JSON.stringify(setting.inspection.policyValue);
-                    const policySource = getPolicySource(setting.name);
-                    content += `| ${setting.key} | ${setting.name} | ${policySource} | \`${defaultValue}\` | \`${currentValue}\` | \`${policyValue}\` |\n`;
+                    const policySource = getRefinedPolicySource(setting);
+                    const managedSettingsKeys = setting.property.policy?.managedSettings ? ( Object.keys(setting.property.policy.managedSettings)).join(", ") : "";
+                    content += `| ${setting.key} | ${setting.name} | ${policySource} | ${managedSettingsKeys || "*n/a*"} | \`${defaultValue}\` | \`${currentValue}\` | \`${policyValue}\` |\n`;
                 }
                 content += "\n";
             } else {
@@ -813,7 +983,7 @@ class SyncAccountPolicyAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.syncAccountPolicy",
-            title: ( localize2(2917, "Sync Account Policy")),
+            title: ( localize2(2993, "Sync Account Policy")),
             category: Categories.Developer,
             f1: true
         });
@@ -827,10 +997,10 @@ class SyncAccountPolicyAction extends Action2 {
             await defaultAccountService.refresh({
                 forceRefresh: true
             });
-            await dialogService.info(( localize(2918, "Account policy has been synced.")));
+            await dialogService.info(( localize(2994, "Account policy has been synced.")));
         } catch (error) {
             logService.error("[DefaultAccount] Failed to sync account policy", error);
-            await dialogService.error(( localize(2919, "Failed to sync account policy.")), error instanceof Error ? error.message : String(error));
+            await dialogService.error(( localize(2995, "Failed to sync account policy.")), error instanceof Error ? error.message : String(error));
         }
     }
 }
@@ -850,7 +1020,7 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: "screencastMode",
     order: 9,
-    title: ( localize(2920, "Screencast Mode")),
+    title: ( localize(2996, "Screencast Mode")),
     type: "object",
     properties: {
         "screencastMode.verticalOffset": {
@@ -859,7 +1029,7 @@ configurationRegistry.registerConfiguration({
             minimum: 0,
             maximum: 90,
             description: ( localize(
-                2921,
+                2997,
                 "Controls the vertical offset of the screencast mode overlay from the bottom as a percentage of the workbench height."
             ))
         },
@@ -869,38 +1039,38 @@ configurationRegistry.registerConfiguration({
             minimum: 20,
             maximum: 100,
             description: ( localize(
-                2922,
+                2998,
                 "Controls the font size (in pixels) of the screencast mode keyboard."
             ))
         },
         "screencastMode.keyboardOptions": {
             type: "object",
-            description: ( localize(2923, "Options for customizing the keyboard overlay in screencast mode.")),
+            description: ( localize(2999, "Options for customizing the keyboard overlay in screencast mode.")),
             properties: {
                 "showKeys": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2924, "Show raw keys."))
+                    description: ( localize(3000, "Show raw keys."))
                 },
                 "showKeybindings": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2925, "Show keyboard shortcuts."))
+                    description: ( localize(3001, "Show keyboard shortcuts."))
                 },
                 "showCommands": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2926, "Show command names."))
+                    description: ( localize(3002, "Show command names."))
                 },
                 "showCommandGroups": {
                     type: "boolean",
                     default: false,
-                    description: ( localize(2927, "Show command group names, when commands are also shown."))
+                    description: ( localize(3003, "Show command group names, when commands are also shown."))
                 },
                 "showSingleEditorCursorMoves": {
                     type: "boolean",
                     default: true,
-                    description: ( localize(2928, "Show single editor cursor move commands."))
+                    description: ( localize(3004, "Show single editor cursor move commands."))
                 }
             },
             default: {
@@ -918,7 +1088,7 @@ configurationRegistry.registerConfiguration({
             minimum: 500,
             maximum: 5000,
             description: ( localize(
-                2929,
+                3005,
                 "Controls how long (in milliseconds) the keyboard overlay is shown in screencast mode."
             ))
         },
@@ -927,7 +1097,7 @@ configurationRegistry.registerConfiguration({
             format: "color-hex",
             default: "#FF0000",
             description: ( localize(
-                2930,
+                3006,
                 "Controls the color in hex (#RGB, #RGBA, #RRGGBB or #RRGGBBAA) of the mouse indicator in screencast mode."
             ))
         },
@@ -937,7 +1107,7 @@ configurationRegistry.registerConfiguration({
             minimum: 20,
             maximum: 100,
             description: ( localize(
-                2931,
+                3007,
                 "Controls the size (in pixels) of the mouse indicator in screencast mode."
             ))
         }