@codingame/monaco-vscode-api 34.1.3 → 35.0.1

package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js

@@ -29,10 +29,10 @@ import '../../theme/common/colors/searchColors.js';
 import { IActionWidgetService } from './actionWidget.service.js';
 
 registerCss(actionWidget);
-registerColor("actionBar.toggledBackground", inputActiveOptionBackground, ( localize(1801, "Background color for toggled action items in action bar.")));
+registerColor("actionBar.toggledBackground", inputActiveOptionBackground, ( localize(1804, "Background color for toggled action items in action bar.")));
 const ActionWidgetContextKeys = {
-    Visible: ( new RawContextKey("codeActionMenuVisible", false, ( localize(1802, "Whether the action widget list is visible")))),
-    FilterFocused: ( new RawContextKey("codeActionMenuFilterFocused", false, ( localize(1803, "Whether the action widget filter input is focused"))))
+    Visible: ( new RawContextKey("codeActionMenuVisible", false, ( localize(1805, "Whether the action widget list is visible")))),
+    FilterFocused: ( new RawContextKey("codeActionMenuFilterFocused", false, ( localize(1806, "Whether the action widget filter input is focused"))))
 };
 let ActionWidgetService = class ActionWidgetService extends Disposable {
     get isVisible() {
@@ -85,6 +85,12 @@ let ActionWidgetService = class ActionWidgetService extends Disposable {
     acceptSelected(preview) {
         this._list.value?.acceptSelected(preview);
     }
+    updateItems(items, focusItemId) {
+        this._list.value?.updateItems(items, focusItemId);
+    }
+    focusItemById(itemId) {
+        this._list.value?.focusItemById(itemId);
+    }
     focusPrevious() {
         this._list?.value?.focusPrevious();
     }
@@ -116,6 +122,9 @@ let ActionWidgetService = class ActionWidgetService extends Disposable {
         element.appendChild(widget);
         this._list.value = list;
         if (this._list.value) {
+            if (this._list.value.headerContainer) {
+                widget.appendChild(this._list.value.headerContainer);
+            }
             if (this._list.value.filterContainer) {
                 widget.appendChild(this._list.value.filterContainer);
             }
@@ -127,6 +136,12 @@ let ActionWidgetService = class ActionWidgetService extends Disposable {
             throw ( new Error("List has no value"));
         }
         const renderDisposables = ( new DisposableStore());
+        const headerContainer = this._list.value.headerContainer;
+        if (headerContainer) {
+            renderDisposables.add(
+                addDisposableGenericMouseDownListener(headerContainer, e => e.preventDefault())
+            );
+        }
         const menuBlock = createElement("div");
         const block = element.appendChild(menuBlock);
         block.classList.add("context-view-block");
@@ -197,7 +212,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "hideCodeActionWidget",
-            title: ( localize2(1804, "Hide action widget")),
+            title: ( localize2(1807, "Hide action widget")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -214,7 +229,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "clearFilterCodeActionWidget",
-            title: ( localize2(1805, "Clear action widget filter")),
+            title: ( localize2(1808, "Clear action widget filter")),
             precondition: ( ContextKeyExpr.and(ActionWidgetContextKeys.Visible, ActionWidgetContextKeys.FilterFocused)),
             keybinding: {
                 weight: weight + 1,
@@ -235,7 +250,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "selectPrevCodeAction",
-            title: ( localize2(1806, "Select previous action")),
+            title: ( localize2(1809, "Select previous action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -259,7 +274,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "selectNextCodeAction",
-            title: ( localize2(1807, "Select next action")),
+            title: ( localize2(1810, "Select next action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -283,7 +298,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "collapseSectionCodeAction",
-            title: ( localize2(1808, "Collapse section")),
+            title: ( localize2(1811, "Collapse section")),
             precondition: ( ContextKeyExpr.and(ActionWidgetContextKeys.Visible, ( ActionWidgetContextKeys.FilterFocused.negate()))),
             keybinding: {
                 weight,
@@ -302,7 +317,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "expandSectionCodeAction",
-            title: ( localize2(1809, "Expand section")),
+            title: ( localize2(1812, "Expand section")),
             precondition: ( ContextKeyExpr.and(ActionWidgetContextKeys.Visible, ( ActionWidgetContextKeys.FilterFocused.negate()))),
             keybinding: {
                 weight,
@@ -321,7 +336,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "toggleSectionCodeAction",
-            title: ( localize2(1810, "Toggle section")),
+            title: ( localize2(1813, "Toggle section")),
             precondition: ( ContextKeyExpr.and(ActionWidgetContextKeys.Visible, ( ActionWidgetContextKeys.FilterFocused.negate()))),
             keybinding: {
                 weight,
@@ -342,7 +357,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: acceptSelectedActionCommand,
-            title: ( localize2(1811, "Accept selected action")),
+            title: ( localize2(1814, "Accept selected action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -362,7 +377,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: previewSelectedActionCommand,
-            title: ( localize2(1812, "Preview selected action")),
+            title: ( localize2(1815, "Preview selected action")),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,

package/vscode/src/vs/platform/actionWidget/browser/actionWidget.service.d.ts

@@ -7,6 +7,17 @@ export declare const IActionWidgetService: import("../../instantiation/common/in
 export interface IActionWidgetService {
     readonly _serviceBrand: undefined;
     show<T>(user: string, supportsPreview: boolean, items: readonly IActionListItem<T>[], delegate: IActionListDelegate<T>, anchor: HTMLElement | StandardMouseEvent | IAnchor, container: HTMLElement | undefined, actionBarActions?: readonly IAction[], accessibilityProvider?: Partial<IListAccessibilityProvider<IActionListItem<T>>>, listOptions?: IActionListOptions): void;
+    /**
+    * Replaces the items of the currently shown widget in place, without closing
+    * or repositioning it. Preserves the current filter. When `focusItemId` is
+    * provided, focuses that item; otherwise preserves the focused item.
+    */
+    updateItems<T>(items: readonly IActionListItem<T>[], focusItemId?: string): void;
+    /**
+    * Focuses the item with the given id in the currently shown widget, without
+    * rebuilding the list.
+    */
+    focusItemById(itemId: string): void;
     hide(didCancel?: boolean): void;
     readonly isVisible: boolean;
 }

package/vscode/src/vs/platform/actionWidget/browser/actionWidgetDropdown.d.ts

@@ -5,7 +5,7 @@ import { ResolvedKeybinding } from "../../../base/common/keybindings.js";
 import { ThemeIcon } from "../../../base/common/themables.js";
 import { IKeybindingService } from "../../keybinding/common/keybinding.service.js";
 import { ITelemetryService } from "../../telemetry/common/telemetry.service.js";
-import { IActionListItemHover, IActionListOptions } from "./actionList.js";
+import { IActionListItemHover, IActionListItemInlineToggle, IActionListOptions } from "./actionList.js";
 import { IActionWidgetService } from "./actionWidget.service.js";
 export interface IActionWidgetDropdownAction extends IAction {
     category?: {
@@ -27,6 +27,14 @@ export interface IActionWidgetDropdownAction extends IAction {
      * Optional toolbar actions shown when the item is focused or hovered.
      */
     toolbarActions?: IAction[];
+    /**
+     * Optional CSS class name applied to the action list row container.
+     */
+    className?: string;
+    /**
+     * Optional inline toggle switch rendered on its own row inside the item.
+     */
+    inlineToggle?: IActionListItemInlineToggle;
     /**
      * Optional keybinding to display next to the action. When provided, this overrides the
      * keybinding that would otherwise be looked up via {@link IKeybindingService.lookupKeybinding}.

package/vscode/src/vs/platform/actionWidget/browser/actionWidgetDropdown.js

@@ -72,6 +72,8 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
                     detail: action.detail,
                     hover: action.hover,
                     toolbarActions: action.toolbarActions,
+                    className: action.className,
+                    inlineToggle: action.inlineToggle,
                     kind: ActionListItemKind.Action,
                     canPreview: false,
                     group: {
@@ -138,10 +140,21 @@ let ActionWidgetDropdown = class ActionWidgetDropdown extends BaseDropdown {
                 });
             }
         }
+        const nonSeparatorItems = actionWidgetItems.filter(i => i.kind === ActionListItemKind.Action);
         const accessibilityProvider = {
             isChecked(element) {
                 return element.kind === ActionListItemKind.Action && !!element?.item?.checked;
             },
+            getSetSize: () => nonSeparatorItems.length,
+            getPosInSet: (_element, index) => {
+                let pos = 0;
+                for (let i = 0; i <= index && i < actionWidgetItems.length; i++) {
+                    if (actionWidgetItems[i].kind === ActionListItemKind.Action) {
+                        pos++;
+                    }
+                }
+                return Math.max(pos, 1);
+            },
             getRole: e => {
                 switch (e.kind) {
                 case ActionListItemKind.Action:

package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js

@@ -262,7 +262,7 @@ let MenuEntryActionViewItem = class MenuEntryActionViewItem extends ActionViewIt
             const altTooltip = this._menuItemAction.alt.tooltip || this._menuItemAction.alt.label;
             const altTitleSection = this._keybindingService.appendKeybinding(altTooltip, this._menuItemAction.alt.id, this._contextKeyService);
             title = ( localize(
-                1814,
+                1817,
                 "{0}\n[{1}] {2}",
                 title,
                 UILabelProvider.modifierLabels[OS].altKey,
@@ -330,9 +330,9 @@ class TextOnlyMenuEntryActionViewItem extends MenuEntryActionViewItem {
         if (this.label) {
             const kb2 = TextOnlyMenuEntryActionViewItem._symbolPrintEnter(kb);
             if (this._options?.conversational) {
-                this.label.textContent = ( localize(1815, "{1} to {0}", this._action.label, kb2));
+                this.label.textContent = ( localize(1818, "{1} to {0}", this._action.label, kb2));
             } else {
-                this.label.textContent = ( localize(1816, "{0} ({1})", this._action.label, kb2));
+                this.label.textContent = ( localize(1819, "{0} ({1})", this._action.label, kb2));
             }
         }
     }

package/vscode/src/vs/platform/actions/browser/toolbar.js

@@ -169,7 +169,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     } else {
                         primaryActions.push(toAction({
                             id: "label",
-                            label: ( localize(1817, "Hide")),
+                            label: ( localize(1820, "Hide")),
                             enabled: false,
                             run() {}
                         }));
@@ -183,7 +183,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     actions.push(( new Separator()));
                     actions.push(toAction({
                         id: "resetThisMenu",
-                        label: ( localize(1818, "Reset Menu")),
+                        label: ( localize(1821, "Reset Menu")),
                         run: () => this._menuService.resetHiddenStates(menuIds)
                     }));
                 }

package/vscode/src/vs/platform/actions/common/actions.d.ts

@@ -81,7 +81,13 @@ export declare class MenuId {
     static readonly EditorTitleContextShare: MenuId;
     static readonly EmptyEditorGroup: MenuId;
     static readonly EmptyEditorGroupContext: MenuId;
+    static readonly EditorGroupWatermarkToolbar: MenuId;
     static readonly EditorTabsBarContext: MenuId;
+    /**
+     * Menu whose actions populate the editor tab bar's "+" (Add Tab) dropdown.
+     * The button is rendered by core and is shown only when this menu has actions.
+     */
+    static readonly EditorTabsBarAddTab: MenuId;
     static readonly EditorTabsBarShowTabsSubmenu: MenuId;
     static readonly EditorTabsBarShowTabsZenModeSubmenu: MenuId;
     static readonly EditorActionsPositionSubmenu: MenuId;
@@ -240,12 +246,14 @@ export declare class MenuId {
     static readonly ChatMessageTitle: MenuId;
     static readonly ChatWelcomeContext: MenuId;
     static readonly ChatMessageFooter: MenuId;
+    static readonly ChatSubagentContent: MenuId;
     static readonly ChatExecute: MenuId;
     static readonly ChatExecuteQueue: MenuId;
     static readonly ChatInput: MenuId;
     static readonly ChatInputSecondary: MenuId;
     static readonly ChatInputStatus: MenuId;
     static readonly ChatInputSide: MenuId;
+    static readonly AutomationsDialogInput: MenuId;
     static readonly ChatModePicker: MenuId;
     static readonly ChatEditingWidgetToolbar: MenuId;
     static readonly ChatEditingSessionChangesToolbar: MenuId;

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

@@ -118,9 +118,15 @@ class MenuId {
     static {
         this.EmptyEditorGroupContext = ( new MenuId("EmptyEditorGroupContext"));
     }
+    static {
+        this.EditorGroupWatermarkToolbar = ( new MenuId("EditorGroupWatermarkToolbar"));
+    }
     static {
         this.EditorTabsBarContext = ( new MenuId("EditorTabsBarContext"));
     }
+    static {
+        this.EditorTabsBarAddTab = ( new MenuId("EditorTabsBarAddTab"));
+    }
     static {
         this.EditorTabsBarShowTabsSubmenu = ( new MenuId("EditorTabsBarShowTabsSubmenu"));
     }
@@ -595,6 +601,9 @@ class MenuId {
     static {
         this.ChatMessageFooter = ( new MenuId("ChatMessageFooter"));
     }
+    static {
+        this.ChatSubagentContent = ( new MenuId("ChatSubagentContent"));
+    }
     static {
         this.ChatExecute = ( new MenuId("ChatExecute"));
     }
@@ -613,6 +622,9 @@ class MenuId {
     static {
         this.ChatInputSide = ( new MenuId("ChatInputSide"));
     }
+    static {
+        this.AutomationsDialogInput = ( new MenuId("AutomationsDialogInput"));
+    }
     static {
         this.ChatModePicker = ( new MenuId("ChatModePicker"));
     }

package/vscode/src/vs/platform/actions/common/menuResetAction.js

@@ -9,7 +9,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: "menu.resetHiddenStates",
-            title: ( localize2(1819, "Reset All Menus")),
+            title: ( localize2(1822, "Reset All Menus")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/platform/actions/common/menuService.js

@@ -430,7 +430,7 @@ function createMenuHide(menu, command, states) {
     const title = typeof command.title === "string" ? command.title : command.title.value;
     const hide = toAction({
         id: `hide/${menu.id}/${id}`,
-        label: ( localize(1820, "Hide '{0}'", title)),
+        label: ( localize(1823, "Hide '{0}'", title)),
         run() {
             states.updateHidden(menu, id, true);
         }
@@ -462,7 +462,7 @@ function createConfigureKeybindingAction(
 ) {
     return toAction({
         id: `configureKeybinding/${commandId}`,
-        label: ( localize(1821, "Configure Keybinding")),
+        label: ( localize(1824, "Configure Keybinding")),
         enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);

package/vscode/src/vs/platform/agentHost/browser/nullAgentHostService.d.ts

@@ -7,7 +7,7 @@ import { IAgentHostService } from "../common/agentService.service.js";
 import type { IActiveSubscriptionInfo, IAgentSubscription } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/state/agentSubscription";
 import type { CompletionsParams, CompletionsResult, CreateTerminalParams, ResolveSessionConfigResult, SessionConfigCompletionsResult } from "../common/state/protocol/commands.js";
 import type { InvokeChangesetOperationParams, InvokeChangesetOperationResult } from "../common/state/protocol/channels-changeset/commands.js";
-import type { ActionEnvelope, INotification, IRootConfigChangedAction, SessionAction, TerminalAction } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/state/sessionActions";
+import type { ActionEnvelope, INotification, IRootConfigChangedAction, SessionAction, TerminalAction, ClientAnnotationsAction } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/state/sessionActions";
 import type { IRemoteWatchHandle } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/agentHostFileSystemProvider";
 import type { CreateResourceWatchParams, CreateResourceWatchResult, ResourceCopyParams, ResourceCopyResult, ResourceDeleteParams, ResourceDeleteResult, ResourceListResult, ResourceMkdirParams, ResourceMkdirResult, ResourceMoveParams, ResourceMoveResult, ResourceReadResult, ResourceResolveParams, ResourceResolveResult, ResourceWriteParams, ResourceWriteResult } from "../common/state/sessionProtocol.js";
 import type { ComponentToState, RootState, StateComponents } from "../common/state/sessionState.js";
@@ -22,13 +22,15 @@ export declare class NullAgentHostService implements IAgentHostService {
     readonly onAgentHostStart: Event<any>;
     readonly onDidNotification: Event<INotification>;
     readonly onDidAction: Event<ActionEnvelope>;
+    readonly onMcpNotification: Event<any>;
     readonly authenticationPending: IObservable<boolean>;
     setAuthenticationPending(_pending: boolean): void;
     get rootState(): IAgentSubscription<RootState>;
     getSubscription<T extends StateComponents>(_kind: T, _resource: URI, _owner: string): IReference<IAgentSubscription<ComponentToState[T]>>;
     getSubscriptionUnmanaged<T extends StateComponents>(_kind: T, _resource: URI): IAgentSubscription<ComponentToState[T]> | undefined;
+    getInflightSessionCreate(_resource: URI): Promise<unknown> | undefined;
     getActiveSubscriptions(): readonly IActiveSubscriptionInfo[];
-    dispatch(_channel: string, _action: SessionAction | TerminalAction | IRootConfigChangedAction): void;
+    dispatch(_channel: string, _action: SessionAction | TerminalAction | ClientAnnotationsAction | IRootConfigChangedAction): void;
     restartAgentHost(): Promise<void>;
     authenticate(_params: AuthenticateParams): Promise<AuthenticateResult>;
     listSessions(): Promise<IAgentSessionMetadata[]>;
@@ -40,9 +42,12 @@ export declare class NullAgentHostService implements IAgentHostService {
     startWebSocketServer(): Promise<IAgentHostSocketInfo>;
     getInspectInfo(_tryEnable: boolean): Promise<IAgentHostInspectInfo | undefined>;
     disposeSession(_session: URI): Promise<void>;
+    createChat(_session: URI, _chat: URI): Promise<void>;
+    disposeChat(_chat: URI): Promise<void>;
     createTerminal(_params: CreateTerminalParams): Promise<void>;
     disposeTerminal(_terminal: URI): Promise<void>;
     invokeChangesetOperation(_params: InvokeChangesetOperationParams): Promise<InvokeChangesetOperationResult>;
+    handleMcpRequest(_channel: string, _method: string, _params: Record<string, unknown> | undefined): Promise<unknown>;
     resourceList(_uri: URI): Promise<ResourceListResult>;
     resourceRead(_uri: URI): Promise<ResourceReadResult>;
     resourceWrite(_params: ResourceWriteParams): Promise<ResourceWriteResult>;

package/vscode/src/vs/platform/agentHost/browser/nullAgentHostService.js

@@ -13,6 +13,7 @@ class NullAgentHostService {
         this.onAgentHostStart = Event.None;
         this.onDidNotification = Event.None;
         this.onDidAction = Event.None;
+        this.onMcpNotification = Event.None;
         this.authenticationPending = constObservable(false);
     }
     setAuthenticationPending(_pending) {}
@@ -25,6 +26,9 @@ class NullAgentHostService {
     getSubscriptionUnmanaged(_kind, _resource) {
         return undefined;
     }
+    getInflightSessionCreate(_resource) {
+        return undefined;
+    }
     getActiveSubscriptions() {
         return [];
     }
@@ -64,6 +68,10 @@ class NullAgentHostService {
         return undefined;
     }
     async disposeSession(_session) {}
+    async createChat(_session, _chat) {
+        notSupported();
+    }
+    async disposeChat(_chat) {}
     async createTerminal(_params) {
         notSupported();
     }
@@ -71,6 +79,9 @@ class NullAgentHostService {
     async invokeChangesetOperation(_params) {
         return notSupported();
     }
+    async handleMcpRequest(_channel, _method, _params) {
+        return notSupported();
+    }
     async resourceList(_uri) {
         return notSupported();
     }

package/vscode/src/vs/platform/agentHost/common/agentHostConnectionsService.d.ts

@@ -0,0 +1,55 @@
+import type { URI } from "../../../base/common/uri.js";
+import type { IAgentConnection } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/agentService";
+/**
+ * Chat-session resource scheme prefix for the window's ambient/local agent
+ * host: `agent-host-<provider>`.
+ *
+ * Remote agent host session schemes (`remote-<authority>-<provider>`) are
+ * handled by `agentHostSessionType.ts` (`isRemoteAgentHostSessionType` and
+ * friends), which also owns the authority disambiguation.
+ */
+export declare const LOCAL_AGENT_HOST_SCHEME_PREFIX = "agent-host-";
+/**
+ * Reserved connection authority for the window's ambient/primary agent host.
+ *
+ * NOTE: "ambient" is not the same as "local". In a local window the ambient
+ * host is the in-process utility agent host; in a window attached to a remote
+ * authority the ambient host is itself remote (the `EditorRemoteAgentHostServiceClient`).
+ * The `'local'` string is reserved/canonical for this ambient connection — it
+ * is already used as the agent-host URI authority for in-window resources
+ * (see `toAgentHostUri` in `agentHostUri.ts`).
+ */
+export declare const AMBIENT_AGENT_HOST_AUTHORITY = "local";
+/**
+ * A descriptor for a single agent-host connection exposed by
+ * {@link IAgentHostConnectionsService}. Covers both the window's ambient host
+ * and every connected remote host with one uniform shape.
+ */
+export interface IAgentHostConnectionInfo {
+    /**
+     * Sanitized connection authority. The ambient host uses
+     * {@link AMBIENT_AGENT_HOST_AUTHORITY}; remotes use the authority derived
+     * from their address via `agentHostAuthority`.
+     */
+    readonly authority: string;
+    /** Raw remote address. `undefined` for the ambient host. */
+    readonly address: string | undefined;
+    /** Human-readable label for the connection. */
+    readonly name: string;
+    /**
+     * `true` for the window's ambient/primary host. Remember this host may
+     * itself be remote in a remote window — see {@link AMBIENT_AGENT_HOST_AUTHORITY}.
+     */
+    readonly isAmbient: boolean;
+    /** The live connection, or `undefined` when not currently connected. */
+    readonly connection: IAgentConnection | undefined;
+}
+/**
+ * The result of resolving a chat-session resource to its backing agent host:
+ * the owning {@link IAgentConnection} and the canonical backend agent-session
+ * URI (`<provider>:/<rawId>`) used for protocol operations on that connection.
+ */
+export interface IAgentHostSessionResolution {
+    readonly connection: IAgentConnection;
+    readonly backendSession: URI;
+}

package/vscode/src/vs/platform/agentHost/common/agentHostConnectionsService.js

@@ -0,0 +1,6 @@
+
+
+const LOCAL_AGENT_HOST_SCHEME_PREFIX = 'agent-host-';
+const AMBIENT_AGENT_HOST_AUTHORITY = 'local';
+
+export { AMBIENT_AGENT_HOST_AUTHORITY, LOCAL_AGENT_HOST_SCHEME_PREFIX };

package/vscode/src/vs/platform/agentHost/common/agentHostConnectionsService.service.d.ts

@@ -0,0 +1,56 @@
+import { Event } from "../../../base/common/event.js";
+import { URI } from "../../../base/common/uri.js";
+import { IAgentHostConnectionInfo, IAgentHostSessionResolution } from "./agentHostConnectionsService.js";
+import { IAgentConnection } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/agentService";
+export declare const IAgentHostConnectionsService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IAgentHostConnectionsService>;
+/**
+* A thin, read-only facade over the window's ambient agent host
+* (`IAgentHostService`) and the registry of remote agent hosts
+* (`IRemoteAgentHostService`), so consumers can enumerate and resolve
+* {@link IAgentConnection}s without branching on local-vs-remote or
+* fanning out over "1 ambient + N remote" themselves.
+*
+* This service deliberately does NOT expose lifecycle/management operations:
+* ambient-process concerns (restart, inspect, auth-pending) stay on
+* `IAgentHostService`, and remote-registry mutations (add/remove/reconnect/
+* upgrade) stay on `IRemoteAgentHostService`. This facade only answers
+* "which connections exist?" and "give me the connection for X".
+*/
+export interface IAgentHostConnectionsService {
+    readonly _serviceBrand: undefined;
+    /** Fires when the set of connections changes (ambient lifecycle or remotes added/removed). */
+    readonly onDidChangeConnections: Event<void>;
+    /**
+    * All known connections as `[ambient, ...remotes]`. The ambient entry is
+    * always present with a live `connection`; only remote entries may have
+    * `connection: undefined` (e.g. while connecting/disconnected). Remote
+    * entries reflect the current `IRemoteAgentHostService` registry.
+    */
+    readonly connections: readonly IAgentHostConnectionInfo[];
+    /** The window's ambient/primary connection (local, or the window-remote bridge). */
+    readonly ambientConnection: IAgentConnection;
+    /**
+    * Resolves a live connection by sanitized authority, including
+    * {@link AMBIENT_AGENT_HOST_AUTHORITY} for the ambient host. Returns
+    * `undefined` when no connected host matches.
+    */
+    getConnectionByAuthority(authority: string): IAgentConnection | undefined;
+    /**
+    * Resolves a live remote connection by raw address. The ambient host has no
+    * address and is never returned here — use {@link ambientConnection} or
+    * {@link getConnectionByAuthority} with {@link AMBIENT_AGENT_HOST_AUTHORITY}.
+    */
+    getConnectionByAddress(address: string): IAgentConnection | undefined;
+    /**
+    * Resolves an agent-host chat-session resource to its owning connection and
+    * backend session URI. Handles both local schemes
+    * (`agent-host-<provider>`) — backed by the ambient connection — and remote
+    * schemes (`remote-<authority>-<provider>`) — resolved against the live
+    * remote registry. Returns `undefined` when the resource is not an
+    * agent-host session, or when the matching remote host is not connected.
+    *
+    * NOTE: provisional/untitled sessions are a workbench concern and are NOT
+    * handled here — callers that support them should resolve those first.
+    */
+    resolveSessionResource(sessionResource: URI): IAgentHostSessionResolution | undefined;
+}

package/vscode/src/vs/platform/agentHost/common/agentHostConnectionsService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+const IAgentHostConnectionsService = ( createDecorator("agentHostConnectionsService"));
+
+export { IAgentHostConnectionsService };

package/vscode/src/vs/platform/agentHost/common/agentHostMcpServer.d.ts

@@ -0,0 +1,15 @@
+import { McpServerState, type McpServerStatus } from "./state/protocol/channels-session/state.js";
+/**
+ * A rich view of a single MCP server exposed by an agent host session.
+ * Encapsulates the dispatch plumbing so consumers can present and toggle
+ * servers without depending on the low-level protocol action surface.
+ */
+export interface IAgentHostMcpServer {
+    readonly id: string;
+    readonly name: string;
+    readonly enabled: boolean;
+    readonly status: McpServerStatus;
+    readonly state: McpServerState;
+    readonly logOutputChannelId?: string;
+    setEnabled(enabled: boolean): void;
+}

package/vscode/src/vs/platform/agentHost/common/agentHostSessionType.d.ts

@@ -0,0 +1,37 @@
+import { type AgentProvider } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/agentService";
+/**
+ * Builds the unique per-connection identifier for a remote agent host.
+ *
+ * This string is used as the resource URI scheme registered via
+ * `registerChatSessionContentProvider` and as the language model vendor /
+ * `targetChatSessionType` published by `AgentHostLanguageModelProvider`.
+ */
+export declare function remoteAgentHostSessionTypeId(connectionAuthority: string, agentProvider: AgentProvider): string;
+/**
+ * Builds the authority-specific prefix for remote agent host session types.
+ */
+export declare function remoteAgentHostSessionTypeAuthorityPrefix(connectionAuthority: string): string;
+/**
+ * Returns whether the given session type uses the remote agent host scheme.
+ */
+export declare function isRemoteAgentHostSessionType(sessionType: string): boolean;
+/**
+ * Finds the best matching remote agent host authority from a known candidate set.
+ *
+ * Remote session types are formatted as `remote-{authority}-{provider}` and
+ * authorities may contain `-`, so callers should match against the full set of
+ * known authorities instead of splitting the session type.
+ */
+export declare function findRemoteAgentHostSessionTypeAuthority(sessionType: string, connectionAuthorities: Iterable<string>): string | undefined;
+/**
+ * Extracts the harness/provider suffix from a remote agent host session type.
+ *
+ * Remote session types are formatted as `remote-{authority}-{provider}`. The
+ * authority may contain `-`, but provider names do not, so the harness is the
+ * final `-`-delimited segment. Returns `undefined` for non-remote session types.
+ */
+export declare function parseRemoteAgentHostHarness(sessionType: string): string | undefined;
+/**
+ * Extracts the connection authority from a remote agent host session type when the provider is known.
+ */
+export declare function parseRemoteAgentHostSessionTypeAuthority(sessionType: string, agentProvider: AgentProvider): string | undefined;

package/vscode/src/vs/platform/agentHost/common/agentHostSessionType.js

@@ -0,0 +1,45 @@
+
+
+const REMOTE_AGENT_HOST_SESSION_TYPE_PREFIX = 'remote-';
+function remoteAgentHostSessionTypeAuthorityPrefix(connectionAuthority) {
+    return `${REMOTE_AGENT_HOST_SESSION_TYPE_PREFIX}${connectionAuthority}-`;
+}
+function isRemoteAgentHostSessionType(sessionType) {
+    return sessionType.startsWith(REMOTE_AGENT_HOST_SESSION_TYPE_PREFIX);
+}
+function findRemoteAgentHostSessionTypeAuthority(sessionType, connectionAuthorities) {
+    if (!isRemoteAgentHostSessionType(sessionType)) {
+        return undefined;
+    }
+    let bestMatch;
+    for (const authority of connectionAuthorities) {
+        if (isRemoteAgentHostSessionTypeForAuthority(sessionType, authority) && (!bestMatch || authority.length > bestMatch.length)) {
+            bestMatch = authority;
+        }
+    }
+    return bestMatch;
+}
+function isRemoteAgentHostSessionTypeForAuthority(sessionType, connectionAuthority) {
+    return !!connectionAuthority && sessionType.startsWith(remoteAgentHostSessionTypeAuthorityPrefix(connectionAuthority));
+}
+function parseRemoteAgentHostHarness(sessionType) {
+    if (!isRemoteAgentHostSessionType(sessionType)) {
+        return undefined;
+    }
+    const lastDash = sessionType.lastIndexOf('-');
+    const harness = sessionType.slice(lastDash + 1);
+    return harness || undefined;
+}
+function parseRemoteAgentHostSessionTypeAuthority(sessionType, agentProvider) {
+    if (!isRemoteAgentHostSessionType(sessionType)) {
+        return undefined;
+    }
+    const providerSuffix = `-${agentProvider}`;
+    if (!sessionType.endsWith(providerSuffix)) {
+        return undefined;
+    }
+    const authority = sessionType.slice(REMOTE_AGENT_HOST_SESSION_TYPE_PREFIX.length, sessionType.length - providerSuffix.length);
+    return authority || undefined;
+}
+
+export { findRemoteAgentHostSessionTypeAuthority, isRemoteAgentHostSessionType, parseRemoteAgentHostHarness, parseRemoteAgentHostSessionTypeAuthority, remoteAgentHostSessionTypeAuthorityPrefix };