@codingame/monaco-vscode-api 37.0.0 → 37.1.0

package/vscode/src/vs/platform/agentHost/common/state/legacyProtocolCompatibility.js

@@ -0,0 +1,95 @@
+
+import { hasKey } from '../../../../base/common/types.js';
+import { ActionType } from './protocol/common/actions.js';
+import './protocol/channels-root/state.js';
+import './protocol/channels-session/state.js';
+import { TurnState, ResponsePartKind } from './protocol/channels-chat/state.js';
+import './protocol/channels-terminal/state.js';
+import './protocol/channels-changeset/state.js';
+import './protocol/channels-resource-watch/state.js';
+import './protocol/channels-automation/state.js';
+import './protocol/channels-automation-run/state.js';
+
+function readLegacyTurnError(turn) {
+    if (!hasKey(turn, {
+        error: true
+    })) {
+        return undefined;
+    }
+    return turn.error;
+}
+function normalizeLegacyTurnError(turn) {
+    if (turn.state !== TurnState.Error || !hasKey(turn, {
+        error: true
+    })) {
+        return turn;
+    }
+    const {
+        error,
+        ...normalizedTurn
+    } = turn;
+    const finalPart = turn.responseParts[turn.responseParts.length - 1];
+    return {
+        ...normalizedTurn,
+        responseParts: finalPart?.kind === ResponsePartKind.Error ? turn.responseParts : [...turn.responseParts, {
+            kind: ResponsePartKind.Error,
+            error
+        }]
+    };
+}
+function normalizeLegacyChatStateErrors(state) {
+    const turns = ( state.turns.map(normalizeLegacyTurnError));
+    return ( turns.some((turn, index) => turn !== state.turns[index])) ? {
+        ...state,
+        turns
+    } : state;
+}
+function normalizeLegacyActionEnvelope(envelope) {
+    const action = envelope.action;
+    switch (action.type) {
+    case ActionType.ChatError:
+        if (hasKey(action, {
+            error: true
+        })) {
+            const {
+                error,
+                ...normalizedAction
+            } = action;
+            return {
+                ...envelope,
+                action: {
+                    ...normalizedAction,
+                    part: {
+                        kind: ResponsePartKind.Error,
+                        error
+                    }
+                }
+            };
+        }
+        return {
+            ...envelope,
+            action
+        };
+    case ActionType.ChatTurnsLoaded:
+        {
+            const turns = ( action.turns.map(normalizeLegacyTurnError));
+            return ( turns.some((turn, index) => turn !== action.turns[index])) ? {
+                ...envelope,
+                action: {
+                    ...action,
+                    turns
+                }
+            } : {
+                ...envelope,
+                action
+            };
+        }
+    default:
+        return {
+            ...envelope,
+            action
+        };
+    }
+}
+
+export { normalizeLegacyActionEnvelope, normalizeLegacyChatStateErrors, normalizeLegacyTurnError, readLegacyTurnError };

package/vscode/src/vs/platform/agentHost/common/state/sessionProtocol.js

@@ -6,6 +6,8 @@ import './protocol/channels-changeset/commands.js';
 export { ResourceChangeType } from './protocol/channels-resource-watch/state.js';
 
 const AHP_UNSUPPORTED_PROTOCOL_VERSION = -32005;
+const AHP_AUTH_REQUIRED = -32007;
+const AHP_NOT_FOUND = -32008;
 function isJsonRpcRequest(msg) {
     return 'method' in msg && 'id' in msg;
 }
@@ -23,4 +25,4 @@ class ProtocolError extends Error {
     }
 }
 
-export { AHP_UNSUPPORTED_PROTOCOL_VERSION, ProtocolError, isJsonRpcNotification, isJsonRpcRequest, isJsonRpcResponse };
+export { AHP_AUTH_REQUIRED, AHP_NOT_FOUND, AHP_UNSUPPORTED_PROTOCOL_VERSION, ProtocolError, isJsonRpcNotification, isJsonRpcRequest, isJsonRpcResponse };

package/vscode/src/vs/platform/agentHost/common/state/sessionState.js

@@ -3,11 +3,12 @@ import { distinct } from '../../../../base/common/arrays.js';
 import { encodeBase64, VSBuffer, decodeBase64 } from '../../../../base/common/buffer.js';
 import { hasKey } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import './protocol/common/actions.js';
+import { isAgentWorkspaceContinuationMessage } from '../meta/agentWorkspaceContinuationMeta.js';
+import { readLegacyTurnError } from './legacyProtocolCompatibility.js';
 export { PolicyState } from './protocol/channels-root/state.js';
 export { CustomizationLoadStatus, CustomizationType, SessionLifecycle, SessionStatus } from './protocol/channels-session/state.js';
-import { ToolResultContentType } from './protocol/channels-chat/state.js';
-export { ChatInputAnswerState, ChatInputAnswerValueKind, ChatInputQuestionKind, ChatInputResponseKind, ChatInteractivity, ChatOriginKind, MessageAttachmentKind, MessageKind, PendingMessageKind, ResponsePartKind, ToolCallCancellationReason, ToolCallConfirmationReason, ToolCallContributorKind, ToolCallRiskAssessmentKind, ToolCallRiskAssessmentStatus, ToolCallStatus, TurnState } from './protocol/channels-chat/state.js';
+import { ResponsePartKind, MessageKind, ToolResultContentType, ChatInteractivity, TurnState } from './protocol/channels-chat/state.js';
+export { ChatInputAnswerState, ChatInputAnswerValueKind, ChatInputQuestionKind, ChatInputResponseKind, ChatOriginKind, MessageAttachmentKind, PendingMessageKind, ToolCallCancellationReason, ToolCallConfirmationReason, ToolCallContributorKind, ToolCallRiskAssessmentKind, ToolCallRiskAssessmentStatus, ToolCallStatus } from './protocol/channels-chat/state.js';
 import './protocol/channels-terminal/state.js';
 export { ChangesetOperationScope, ChangesetOperationStatus, ChangesetStatus } from './protocol/channels-changeset/state.js';
 import './protocol/channels-resource-watch/state.js';
@@ -18,6 +19,13 @@ import './protocol/channels-session/commands.js';
 import './protocol/channels-chat/commands.js';
 export { ChangesetOperationTargetKind } from './protocol/channels-changeset/commands.js';
 
+function getErrorResponsePart(turn) {
+    if (!turn) {
+        return undefined;
+    }
+    const part = turn.responseParts.at(-1);
+    return part?.kind === ResponsePartKind.Error ? part : undefined;
+}
 const AHP_AUTOMATIONS_SCHEME = "ahp-automations";
 const AUTOMATION_CATALOG_URI = `${AHP_AUTOMATIONS_SCHEME}://`;
 function isAhpAutomationCatalogChannel(uri) {
@@ -37,6 +45,46 @@ function isAhpAutomationRunChannel(uri) {
         return false;
     }
 }
+const MESSAGE_HIDDEN_FROM_TRANSCRIPT_META_KEY = "vscode.chat.hiddenFromTranscript";
+const MESSAGE_HIDDEN_FROM_TRANSCRIPT_PREFIX = "<!-- vscode-hidden-from-transcript -->\n";
+const MESSAGE_REQUEST_HIDDEN_FROM_TRANSCRIPT_META_KEY = "vscode.chat.requestHiddenFromTranscript";
+const MESSAGE_REQUEST_HIDDEN_FROM_TRANSCRIPT_PREFIX = "<!-- vscode-request-hidden-from-transcript -->\n";
+const MESSAGE_SYSTEM_INITIATED_LABEL_META_KEY = "vscode.chat.systemInitiatedLabel";
+function readMessageMeta(message) {
+    const meta = message._meta;
+    const systemInitiatedLabel = meta?.[MESSAGE_SYSTEM_INITIATED_LABEL_META_KEY];
+    const hiddenFromTranscript = meta?.[MESSAGE_HIDDEN_FROM_TRANSCRIPT_META_KEY] === true || message.text.startsWith(MESSAGE_HIDDEN_FROM_TRANSCRIPT_PREFIX);
+    return {
+        hiddenFromTranscript,
+        requestHiddenFromTranscript: meta?.[MESSAGE_REQUEST_HIDDEN_FROM_TRANSCRIPT_META_KEY] === true || message.text.startsWith(MESSAGE_REQUEST_HIDDEN_FROM_TRANSCRIPT_PREFIX),
+        systemInitiatedLabel: typeof systemInitiatedLabel === "string" ? systemInitiatedLabel : undefined
+    };
+}
+function isMessageHiddenFromTranscript(message) {
+    return readMessageMeta(message).hiddenFromTranscript;
+}
+function isMessageRequestHiddenFromTranscript(message) {
+    return readMessageMeta(message).requestHiddenFromTranscript;
+}
+function readMessageSystemInitiatedLabel(message) {
+    return readMessageMeta(message).systemInitiatedLabel;
+}
+function withMessageHiddenFromTranscript(message, hidden) {
+    if (!hidden) {
+        return message;
+    }
+    return {
+        ...message,
+        text: message.text.startsWith(MESSAGE_HIDDEN_FROM_TRANSCRIPT_PREFIX) ? message.text : MESSAGE_HIDDEN_FROM_TRANSCRIPT_PREFIX + message.text,
+        _meta: {
+            ...message._meta,
+            [MESSAGE_HIDDEN_FROM_TRANSCRIPT_META_KEY]: true
+        }
+    };
+}
+function isHostNoticeTurn(turn) {
+    return turn.message.origin.kind === MessageKind.SystemNotification && (isMessageHiddenFromTranscript(turn.message) || isMessageRequestHiddenFromTranscript(turn.message)) && !isAgentWorkspaceContinuationMessage(turn.message);
+}
 function readAccountQuotaSnapshot(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return undefined;
@@ -153,6 +201,18 @@ function readTurnTokenTotals(value) {
 function isTokenCount(value) {
     return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
+function hasReportedUsage(usage) {
+    if (!usage) {
+        return false;
+    }
+    if (typeof usage.inputTokens === "number" || typeof usage.outputTokens === "number") {
+        return true;
+    }
+    const meta = readUsageInfoMeta(usage);
+    return (
+        (typeof meta.copilotUsage?.totalNanoAiu === "number" && meta.copilotUsage.totalNanoAiu >= 0) || (typeof meta.copilotUsage?.sessionTotalNanoAiu === "number" && meta.copilotUsage.sessionTotalNanoAiu >= 0) || (typeof meta.cost === "number" && meta.cost >= 0)
+    );
+}
 function readAutoModeResolvedInfo(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         return undefined;
@@ -260,6 +320,26 @@ function customizationId(uri, range) {
         return uri;
     }
 }
+function getToolOutputText(result) {
+    if (!result.content || result.content.length === 0) {
+        return undefined;
+    }
+    const textParts = [];
+    for (const c of result.content) {
+        if (hasKey(c, {
+            type: true
+        }) && c.type === ToolResultContentType.Text) {
+            textParts.push(c);
+        }
+    }
+    if (textParts.length === 0) {
+        return undefined;
+    }
+    return ( textParts.map(p => p.text)).join("\n");
+}
+function getInlineToolInput(toolInput) {
+    return typeof toolInput === "string" ? toolInput : undefined;
+}
 function getToolFileEdits(result) {
     if (!result.content || result.content.length === 0) {
         return [];
@@ -274,6 +354,38 @@ function getToolFileEdits(result) {
     }
     return edits;
 }
+function getToolSubagentContent(result) {
+    if (!result.content || result.content.length === 0) {
+        return undefined;
+    }
+    for (const c of result.content) {
+        if (hasKey(c, {
+            type: true
+        }) && c.type === ToolResultContentType.Subagent) {
+            return c;
+        }
+    }
+    return undefined;
+}
+function effectiveChatInteractivity(interactivity, sessionArchived) {
+    if (interactivity === ChatInteractivity.Hidden) {
+        return ChatInteractivity.Hidden;
+    }
+    if (sessionArchived) {
+        return ChatInteractivity.ReadOnly;
+    }
+    return interactivity ?? ChatInteractivity.Full;
+}
+function isChatReadOnly(interactivity, sessionArchived) {
+    return effectiveChatInteractivity(interactivity, sessionArchived) === ChatInteractivity.ReadOnly;
+}
+function getTurnError(turn) {
+    if (turn?.state !== TurnState.Error) {
+        return undefined;
+    }
+    const part = turn.responseParts[turn.responseParts.length - 1];
+    return part?.kind === ResponsePartKind.Error ? part.error : readLegacyTurnError(turn);
+}
 var StateComponents;
 (function(StateComponents) {
     StateComponents[StateComponents["Root"] = 0] = "Root";
@@ -362,7 +474,19 @@ function isAhpChatChannel(uri) {
         return false;
     }
 }
+function mergeSessionWithDefaultChat(session, chat) {
+    return {
+        ...session,
+        workingDirectories: chat?.workingDirectories ?? session.workingDirectories,
+        turns: chat?.turns ?? [],
+        activeTurn: chat?.activeTurn,
+        steeringMessage: chat?.steeringMessage,
+        queuedMessages: chat?.queuedMessages,
+        draft: chat?.draft
+    };
+}
 const SESSION_META_GITHUB_KEY = "github";
+const SESSION_META_PROMPT_CACHE_KEY = "vscode.promptCache";
 const SESSION_META_MULTI_ROOT_KEY = "multiRoot";
 const MAX_WORKSPACE_FILE_LENGTH = 4096;
 function readSessionMultiRootMetadata(meta) {
@@ -398,6 +522,17 @@ function validateSessionMultiRootMetadata(value) {
         workspaceFile: raw.workspaceFile
     };
 }
+function readSessionPromptCacheState(meta) {
+    const value = meta?.[SESSION_META_PROMPT_CACHE_KEY];
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return undefined;
+    }
+    const raw = value;
+    return typeof raw["modelId"] === "string" && typeof raw["cacheExpiresAt"] === "string" ? {
+        modelId: raw["modelId"],
+        cacheExpiresAt: raw["cacheExpiresAt"]
+    } : undefined;
+}
 const SESSION_META_FOLDER_PICKER_KEY = "vscode.folderPicker";
 function readSessionFolderPickerDecision(meta) {
     return validateSessionFolderPickerDecision(meta?.[SESSION_META_FOLDER_PICKER_KEY]);
@@ -505,5 +640,20 @@ function readSessionWorkspaceless(meta) {
     return meta?.[SESSION_META_WORKSPACELESS_KEY] === true;
 }
 const SESSION_META_EHCLI_ADOPTABLE_KEY = "ehcliAdoptable";
+function readSessionEhcliAdoptable(meta) {
+    return meta?.[SESSION_META_EHCLI_ADOPTABLE_KEY] === true;
+}
+const SESSION_META_EHCLI_ADOPTED_KEY = "ehcliAdopted";
+function readSessionEhcliAdopted(meta) {
+    return meta?.[SESSION_META_EHCLI_ADOPTED_KEY] === true;
+}
+const SESSION_META_EHCLI_LAST_TURN_KEY = "ehcliLastMigratedTurn";
+function readSessionEhcliLastMigratedTurn(meta) {
+    const value = meta?.[SESSION_META_EHCLI_LAST_TURN_KEY];
+    return typeof value === "string" && value ? value : undefined;
+}
+function readSessionMatchesByProjectRoot(meta) {
+    return readSessionEhcliAdoptable(meta) || readSessionEhcliAdopted(meta);
+}
 
-export { AHP_AUTOMATIONS_SCHEME, AHP_CHAT_SCHEME, AHP_ROOT_SCHEME, AUTOMATION_CATALOG_URI, DEFAULT_CHAT_ID, FileEditKind, MAX_SESSION_PULL_REQUEST_REFERENCES, ROOT_STATE_URI, SESSION_META_EHCLI_ADOPTABLE_KEY, SESSION_META_FOLDER_PICKER_KEY, SESSION_META_GITHUB_KEY, SESSION_META_MULTI_ROOT_KEY, SESSION_META_WORKSPACELESS_KEY, SessionSourceControlOutcome, StateComponents, ToolResultContentType, buildChatUri, buildDefaultChatUri, buildSubagentChatUri, customizationId, getSessionChatResource, getSessionPullRequestUrlKey, getSessionRelatedPullRequestUrls, getToolFileEdits, isAhpAutomationCatalogChannel, isAhpAutomationRunChannel, isAhpChatChannel, isAhpRootChannel, isDefaultChatUri, isSubagentChatUri, parseChatUri, parseDefaultChatUri, parseRequiredSessionUriFromChatUri, readSessionFolderPickerDecision, readSessionGitHubState, readSessionMultiRootMetadata, readSessionWorkspaceless, readUsageInfoMeta, withSessionFolderPickerDecision, withSessionMultiRootMetadata };
+export { AHP_AUTOMATIONS_SCHEME, AHP_CHAT_SCHEME, AHP_ROOT_SCHEME, AUTOMATION_CATALOG_URI, ChatInteractivity, DEFAULT_CHAT_ID, FileEditKind, MAX_SESSION_PULL_REQUEST_REFERENCES, MessageKind, ROOT_STATE_URI, ResponsePartKind, SESSION_META_EHCLI_ADOPTABLE_KEY, SESSION_META_EHCLI_ADOPTED_KEY, SESSION_META_EHCLI_LAST_TURN_KEY, SESSION_META_FOLDER_PICKER_KEY, SESSION_META_GITHUB_KEY, SESSION_META_MULTI_ROOT_KEY, SESSION_META_PROMPT_CACHE_KEY, SESSION_META_WORKSPACELESS_KEY, SessionSourceControlOutcome, StateComponents, ToolResultContentType, TurnState, buildChatUri, buildDefaultChatUri, buildSubagentChatUri, customizationId, effectiveChatInteractivity, getErrorResponsePart, getInlineToolInput, getSessionChatResource, getSessionPullRequestUrlKey, getSessionRelatedPullRequestUrls, getToolFileEdits, getToolOutputText, getToolSubagentContent, getTurnError, hasReportedUsage, isAhpAutomationCatalogChannel, isAhpAutomationRunChannel, isAhpChatChannel, isAhpRootChannel, isChatReadOnly, isDefaultChatUri, isHostNoticeTurn, isMessageHiddenFromTranscript, isMessageRequestHiddenFromTranscript, isSubagentChatUri, mergeSessionWithDefaultChat, parseChatUri, parseDefaultChatUri, parseRequiredSessionUriFromChatUri, readMessageSystemInitiatedLabel, readSessionEhcliAdoptable, readSessionEhcliAdopted, readSessionEhcliLastMigratedTurn, readSessionFolderPickerDecision, readSessionGitHubState, readSessionMatchesByProjectRoot, readSessionMultiRootMetadata, readSessionPromptCacheState, readSessionWorkspaceless, readUsageInfoMeta, withMessageHiddenFromTranscript, withSessionFolderPickerDecision, withSessionMultiRootMetadata };

package/vscode/src/vs/platform/browserView/common/browserPermissions.js

@@ -17,56 +17,56 @@ var PermissionCategory;
 const PERMISSION_CATEGORY_DESCRIPTORS = {
     [PermissionCategory.Location]: {
         category: PermissionCategory.Location,
-        label: ( localize(2093, "Location")),
-        description: ( localize(2094, "Access this device's geographic location")),
+        label: ( localize(2139, "Location")),
+        description: ( localize(2140, "Access this device's geographic location")),
         icon: Codicon.location,
         permissions: ["geolocation", "geolocation-approximate"],
         defaultState: "ask"
     },
     [PermissionCategory.Camera]: {
         category: PermissionCategory.Camera,
-        label: ( localize(2095, "Camera")),
-        description: ( localize(2096, "Capture video from cameras")),
+        label: ( localize(2141, "Camera")),
+        description: ( localize(2142, "Capture video from cameras")),
         icon: Codicon.deviceCamera,
         permissions: ["media"],
         defaultState: "ask"
     },
     [PermissionCategory.Microphone]: {
         category: PermissionCategory.Microphone,
-        label: ( localize(2097, "Microphone")),
-        description: ( localize(2098, "Capture audio from microphones")),
+        label: ( localize(2143, "Microphone")),
+        description: ( localize(2144, "Capture audio from microphones")),
         icon: Codicon.mic,
         permissions: ["media"],
         defaultState: "ask"
     },
     [PermissionCategory.Sensors]: {
         category: PermissionCategory.Sensors,
-        label: ( localize(2099, "Sensors")),
-        description: ( localize(2100, "Read motion and environmental sensors")),
+        label: ( localize(2145, "Sensors")),
+        description: ( localize(2146, "Read motion and environmental sensors")),
         icon: Codicon.pulse,
         permissions: ["sensors"],
         defaultState: "allow"
     },
     [PermissionCategory.Clipboard]: {
         category: PermissionCategory.Clipboard,
-        label: ( localize(2101, "Clipboard")),
-        description: ( localize(2102, "Read from and write to the system clipboard")),
+        label: ( localize(2147, "Clipboard")),
+        description: ( localize(2148, "Read from and write to the system clipboard")),
         icon: Codicon.clippy,
         permissions: ["clipboard-read"],
         defaultState: "ask"
     },
     [PermissionCategory.Notifications]: {
         category: PermissionCategory.Notifications,
-        label: ( localize(2103, "Notifications")),
-        description: ( localize(2104, "Display desktop notifications")),
+        label: ( localize(2149, "Notifications")),
+        description: ( localize(2150, "Display desktop notifications")),
         icon: Codicon.bell,
         permissions: ["notifications"],
         defaultState: "ask"
     },
     [PermissionCategory.Devices]: {
         category: PermissionCategory.Devices,
-        label: ( localize(2105, "Devices")),
-        description: ( localize(2106, "Request access to USB, serial, HID, and Bluetooth devices")),
+        label: ( localize(2151, "Devices")),
+        description: ( localize(2152, "Request access to USB, serial, HID, and Bluetooth devices")),
         icon: Codicon.plug,
         permissions: ["usb", "serial", "hid"],
         defaultState: "allow"

package/vscode/src/vs/platform/configuration/common/configurationRegistry.js

@@ -89,7 +89,7 @@ class ConfigurationRegistry extends Disposable {
         this.configurationDefaultsOverrides = ( new Map());
         this.defaultLanguageConfigurationOverridesNode = {
             id: "defaultOverrides",
-            title: ( localize(2117, "Default Language Configuration Overrides")),
+            title: ( localize(2163, "Default Language Configuration Overrides")),
             properties: {}
         };
         this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
@@ -292,7 +292,7 @@ class ConfigurationRegistry extends Disposable {
             type: "object",
             default: newDefaultOverride.value,
             description: ( localize(
-                2118,
+                2164,
                 "Configure settings to be overridden for {0}.",
                 getLanguageTagSettingPlainKey(key)
             )),
@@ -663,8 +663,8 @@ class ConfigurationRegistry extends Disposable {
             const overrideIdentifierProperty = `[${overrideIdentifier}]`;
             const resourceLanguagePropertiesSchema = {
                 type: "object",
-                description: ( localize(2119, "Configure editor settings to be overridden for a language.")),
-                errorMessage: ( localize(2120, "This setting does not support per-language configuration.")),
+                description: ( localize(2165, "Configure editor settings to be overridden for a language.")),
+                errorMessage: ( localize(2166, "This setting does not support per-language configuration.")),
                 $ref: resourceLanguageSettingsSchemaId
             };
             this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
@@ -680,8 +680,8 @@ class ConfigurationRegistry extends Disposable {
     registerOverridePropertyPatternKey() {
         const resourceLanguagePropertiesSchema = {
             type: "object",
-            description: ( localize(2119, "Configure editor settings to be overridden for a language.")),
-            errorMessage: ( localize(2120, "This setting does not support per-language configuration.")),
+            description: ( localize(2165, "Configure editor settings to be overridden for a language.")),
+            errorMessage: ( localize(2166, "This setting does not support per-language configuration.")),
             $ref: resourceLanguageSettingsSchemaId
         };
         allSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
@@ -756,32 +756,32 @@ const configurationRegistry = ( new ConfigurationRegistry());
 Registry.add(Extensions.Configuration, configurationRegistry);
 function validateProperty(property, schema, extensionId) {
     if (!property.trim()) {
-        return localize(2121, "Cannot register an empty property");
+        return localize(2167, "Cannot register an empty property");
     }
     if (OVERRIDE_PROPERTY_REGEX.test(property)) {
         return localize(
-            2122,
+            2168,
             "Cannot register '{0}'. This matches property pattern '\\\\[.*\\\\]$' for describing language specific editor settings. Use 'configurationDefaults' contribution.",
             property
         );
     }
     if (configurationRegistry.getConfigurationProperties()[property] !== undefined && (!extensionId || !( EXTENSION_UNIFICATION_EXTENSION_IDS.has(extensionId.toLowerCase())))) {
         return localize(
-            2123,
+            2169,
             "Cannot register '{0}'. This property is already registered.",
             property
         );
     }
     if (schema.policy && schema.policyReference) {
         return localize(
-            2124,
+            2170,
             "Cannot register '{0}'. A setting must not declare both 'policy' and 'policyReference'.",
             property
         );
     }
     if (schema.policy?.name && configurationRegistry.getPolicyConfigurations().get(schema.policy?.name) !== undefined) {
         return localize(
-            2125,
+            2171,
             "Cannot register '{0}'. The associated policy {1} is already registered with {2}. To attach another setting to the same policy, use 'policyReference'.",
             property,
             schema.policy?.name,
@@ -792,7 +792,7 @@ function validateProperty(property, schema, extensionId) {
         for (const [owner, sync] of configurationRegistry.getAgentHostSyncConfigurations()) {
             if (sync.key === schema.agentHost.key && owner !== property) {
                 return localize(
-                    2126,
+                    2172,
                     "Cannot register '{0}'. The agent host configuration key '{1}' is already mirrored from '{2}'.",
                     property,
                     schema.agentHost.key,

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js

@@ -533,7 +533,7 @@ CommandsRegistry.registerCommand({
         return [...RawContextKey.all()].sort((a, b) => a.key.localeCompare(b.key));
     },
     metadata: {
-        description: ( localize(2127, "A command that returns information about context keys")),
+        description: ( localize(2173, "A command that returns information about context keys")),
         args: []
     }
 });

package/vscode/src/vs/platform/contextkey/common/contextkey.js

@@ -48,17 +48,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(2128, "Empty context key expression"));
+const errorEmptyString = ( localize(2174, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    2129,
+    2175,
     "Did you forget to write an expression? You can also put 'false' or 'true' to always evaluate to false or true, respectively."
 ));
-const errorNoInAfterNot = ( localize(2130, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(2131, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(2132, "Unexpected token"));
-const hintUnexpectedToken = ( localize(2133, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(2134, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(2135, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(2176, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(2177, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(2178, "Unexpected token"));
+const hintUnexpectedToken = ( localize(2179, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(2180, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(2181, "Did you forget to put a context key?"));
 class Parser {
     static {
         this._parseError = ( new Error());
@@ -392,7 +392,7 @@ class Parser {
         throw this._errExpectedButGot(message, this._peek());
     }
     _errExpectedButGot(expected, got, additionalInfo) {
-        const message = ( localize(2136, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(2182, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
         const offset = got.offset;
         const lexeme = Scanner.getLexeme(got);
         this._parsingErrors.push({
@@ -480,7 +480,7 @@ function validateWhenClauses(whenClauses) {
         parser.parse(whenClause);
         if (parser.lexingErrors.length > 0) {
             return (parser.lexingErrors.map(se => ({
-                errorMessage: se.additionalInfo ? ( localize(2137, "Unexpected token. Hint: {0}", se.additionalInfo)) : ( localize(2138, "Unexpected token.")),
+                errorMessage: se.additionalInfo ? ( localize(2183, "Unexpected token. Hint: {0}", se.additionalInfo)) : ( localize(2184, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length
             })));

package/vscode/src/vs/platform/contextkey/common/contextkeys.js

@@ -3,17 +3,17 @@ import { isMacintosh, isLinux, isWindows, isChromeOS, isWeb, isIOS, isMobile } f
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey("isMac", isMacintosh, ( localize(2139, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey("isLinux", isLinux, ( localize(2140, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey("isWindows", isWindows, ( localize(2141, "Whether the operating system is Windows"))));
-const IsChromeOSContext = ( new RawContextKey("isChromeOS", isChromeOS, ( localize(2142, "Whether the operating system is ChromeOS"))));
-const IsWebContext = ( new RawContextKey("isWeb", isWeb, ( localize(2143, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey("isMacNative", isMacintosh && !isWeb, ( localize(2144, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey("isIOS", isIOS, ( localize(2145, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey("isMobile", isMobile, ( localize(2146, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey("isMac", isMacintosh, ( localize(2185, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey("isLinux", isLinux, ( localize(2186, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey("isWindows", isWindows, ( localize(2187, "Whether the operating system is Windows"))));
+const IsChromeOSContext = ( new RawContextKey("isChromeOS", isChromeOS, ( localize(2188, "Whether the operating system is ChromeOS"))));
+const IsWebContext = ( new RawContextKey("isWeb", isWeb, ( localize(2189, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey("isMacNative", isMacintosh && !isWeb, ( localize(2190, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey("isIOS", isIOS, ( localize(2191, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey("isMobile", isMobile, ( localize(2192, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey("isDevelopment", false, true));
-const ProductQualityContext = ( new RawContextKey("productQualityType", "", ( localize(2147, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey("productQualityType", "", ( localize(2193, "Quality type of VS Code"))));
 const InputFocusedContextKey = "inputFocus";
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(2148, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(2194, "Whether keyboard focus is inside an input box"))));
 
 export { InputFocusedContext, InputFocusedContextKey, IsChromeOSContext, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };

package/vscode/src/vs/platform/contextkey/common/scanner.js

@@ -30,18 +30,18 @@ var TokenType;
 function hintDidYouMean(...meant) {
     switch (meant.length) {
     case 1:
-        return localize(2149, "Did you mean {0}?", meant[0]);
+        return localize(2195, "Did you mean {0}?", meant[0]);
     case 2:
-        return localize(2150, "Did you mean {0} or {1}?", meant[0], meant[1]);
+        return localize(2196, "Did you mean {0} or {1}?", meant[0], meant[1]);
     case 3:
-        return localize(2151, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+        return localize(2197, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
     default:
         return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(2152, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(2198, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    2153,
+    2199,
     "Did you forget to escape the '/' (slash) character? Put two backslashes before it to escape, e.g., '\\\\/'."
 ));
 class Scanner {