@codingame/monaco-vscode-api 32.0.2 → 33.0.3

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

@@ -162,7 +162,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     } else {
                         primaryActions.push(toAction({
                             id: "label",
-                            label: ( localize(1814, "Hide")),
+                            label: ( localize(1815, "Hide")),
                             enabled: false,
                             run() {}
                         }));
@@ -176,7 +176,7 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     actions.push(( new Separator()));
                     actions.push(toAction({
                         id: "resetThisMenu",
-                        label: ( localize(1815, "Reset Menu")),
+                        label: ( localize(1816, "Reset Menu")),
                         run: () => this._menuService.resetHiddenStates(menuIds)
                     }));
                 }

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

@@ -9,7 +9,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: "menu.resetHiddenStates",
-            title: ( localize2(1816, "Reset All Menus")),
+            title: ( localize2(1817, "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(1817, "Hide '{0}'", title)),
+        label: ( localize(1818, "Hide '{0}'", title)),
         run() {
             states.updateHidden(menu, id, true);
         }
@@ -462,7 +462,7 @@ function createConfigureKeybindingAction(
 ) {
     return toAction({
         id: `configureKeybinding/${commandId}`,
-        label: ( localize(1818, "Configure Keybinding")),
+        label: ( localize(1819, "Configure Keybinding")),
         enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);

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

@@ -8,7 +8,7 @@ import type { IAgentSubscription } from "@codingame/monaco-vscode-chat-service-o
 import type { CompletionsParams, CompletionsResult, CreateTerminalParams, ResolveSessionConfigResult, SessionConfigCompletionsResult } from "../common/state/protocol/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 { ResourceCopyParams, ResourceCopyResult, ResourceDeleteParams, ResourceDeleteResult, ResourceListResult, ResourceMoveParams, ResourceMoveResult, ResourceReadResult, ResourceWriteParams, ResourceWriteResult } from "../common/state/sessionProtocol.js";
-import type { ComponentToState, RootState, StateComponents } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/sessionState";
+import type { ComponentToState, RootState, StateComponents } from "../common/state/sessionState.js";
 /**
  * Null implementation of {@link IAgentHostService} for browser contexts
  * where a local agent host process is not available.

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

@@ -16,6 +16,9 @@ function toAgentHostUri(originalUri, connectionAuthority) {
     }));
 }
 function fromAgentHostUri(agentHostUri) {
+    if (agentHostUri.scheme !== AGENT_HOST_SCHEME) {
+        return agentHostUri;
+    }
     const path = agentHostUri.path;
     const schemeEnd = path.indexOf("/", 1);
     if (schemeEnd === -1) {

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

@@ -1,5 +1,5 @@
 import { URI } from "../../../base/common/uri.js";
-import type { SessionCustomization } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/sessionState";
+import type { SessionCustomization } from "./state/sessionState.js";
 /**
  * A synced customization with its local plugin directory (when available).
  */

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

@@ -5,7 +5,7 @@ import { AuthenticateParams, AuthenticateResult, IAgentSessionMetadata, IAgentCr
 import { ResolveSessionConfigResult, SessionConfigCompletionsResult, CompletionsParams, CompletionsResult, CreateTerminalParams } from "./state/protocol/commands.js";
 import { ActionEnvelope, INotification, SessionAction, TerminalAction, IRootConfigChangedAction } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/state/sessionActions";
 import { ResourceListResult, ResourceReadResult, ResourceWriteParams, ResourceWriteResult, ResourceCopyParams, ResourceCopyResult, ResourceDeleteParams, ResourceDeleteResult, ResourceMoveParams, ResourceMoveResult } from "./state/sessionProtocol.js";
-import { Snapshot as IStateSnapshot } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/sessionState";
+import { Snapshot as IStateSnapshot } from "./state/sessionState.js";
 export declare const IAgentService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IAgentService>;
 /**
 * Service contract for communicating with the agent host process. Methods here

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

@@ -1,5 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import type { IAgentConnection } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/agentService";
+import type { IVscodeUpgradeResult } from "./state/protocolUpgrade.js";
 import { IRemoteAgentHostService } from "./remoteAgentHostService.service.js";
 /**
  * Connection status for a remote agent host.
@@ -22,6 +23,13 @@ export type RemoteAgentHostConnectionStatus = {
     readonly supportedByClient: readonly string[];
     /** Protocol versions the server reported it can speak, if available. */
     readonly offeredByServer?: readonly string[];
+    /**
+     * JSON-RPC method the server has advertised via `_meta` that the
+     * client may invoke to ask the hosting CLI to upgrade the server.
+     * Set only when the server was spawned by a VS Code CLI willing
+     * to receive upgrade signals.
+     */
+    readonly vscodeUpgradeMethod?: string;
 };
 export declare namespace RemoteAgentHostConnectionStatus {
     /** Singleton "connected" status. */
@@ -31,7 +39,7 @@ export declare namespace RemoteAgentHostConnectionStatus {
     /** Singleton "disconnected" status. */
     const disconnected: RemoteAgentHostConnectionStatus;
     /** Build an "incompatible" status from a host-supplied message and the versions involved. */
-    function incompatible(message: string, supportedByClient: readonly string[], offeredByServer?: readonly string[]): RemoteAgentHostConnectionStatus;
+    function incompatible(message: string, supportedByClient: readonly string[], offeredByServer?: readonly string[], vscodeUpgradeMethod?: string): RemoteAgentHostConnectionStatus;
     /** Whether the connection is fully established and ready for traffic. */
     function isConnected(status: RemoteAgentHostConnectionStatus | undefined): boolean;
     /** Whether the connection is mid-handshake. */
@@ -52,7 +60,7 @@ export declare namespace RemoteAgentHostConnectionStatus {
      */
     function fromConnectError(err: unknown, supportedByClient: readonly string[]): RemoteAgentHostConnectionStatus | undefined;
 }
-/** Configuration key for the list of remote agent host addresses. */
+/** Configuration key for the list of WebSocket remote agent host addresses. */
 export declare const RemoteAgentHostsSettingId = "chat.remoteAgentHosts";
 /** Configuration key to enable remote agent host connections. */
 export declare const RemoteAgentHostsEnabledSettingId = "chat.remoteAgentHostsEnabled";
@@ -114,7 +122,7 @@ export interface IRemoteAgentHostTunnelConnection {
     readonly authProvider?: "github" | "microsoft";
 }
 export type RemoteAgentHostConnection = IRemoteAgentHostWebSocketConnection | IRemoteAgentHostSSHConnection | IRemoteAgentHostTunnelConnection;
-/** An entry in the {@link RemoteAgentHostsSettingId} setting. */
+/** A configured remote agent host entry. WebSocket entries are persisted in {@link RemoteAgentHostsSettingId}; SSH entries are persisted in storage. */
 export interface IRemoteAgentHostEntry {
     readonly name: string;
     readonly connectionToken?: string;
@@ -156,9 +164,10 @@ export declare class NullRemoteAgentHostService implements IRemoteAgentHostServi
     reconnect(_address: string): void;
     addManagedConnection(): Promise<IRemoteAgentHostConnectionInfo>;
     getEntryByAddress(): IRemoteAgentHostEntry | undefined;
+    triggerServerUpgrade(): Promise<IVscodeUpgradeResult>;
 }
 export declare function parseRemoteAgentHostInput(input: string): RemoteAgentHostInputParseResult;
-/** Raw shape of entries persisted in the {@link RemoteAgentHostsSettingId} setting. */
+/** Raw shape of persisted remote agent host entries. */
 export interface IRawRemoteAgentHostEntry {
     readonly address: string;
     readonly name: string;

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

@@ -15,12 +15,13 @@ var RemoteAgentHostConnectionStatus;
     RemoteAgentHostConnectionStatus.disconnected = ( Object.freeze({
         kind: "disconnected"
     }));
-    function incompatible(message, supportedByClient, offeredByServer) {
+    function incompatible(message, supportedByClient, offeredByServer, vscodeUpgradeMethod) {
         return ( Object.freeze({
             kind: "incompatible",
             message,
             supportedByClient,
-            offeredByServer
+            offeredByServer,
+            vscodeUpgradeMethod
         }));
     }
     RemoteAgentHostConnectionStatus.incompatible = incompatible;
@@ -48,7 +49,8 @@ var RemoteAgentHostConnectionStatus;
         if (err instanceof ProtocolError && err.code === AHP_UNSUPPORTED_PROTOCOL_VERSION) {
             const data = err.data;
             const offeredByServer = Array.isArray(data?.supportedVersions) ? data.supportedVersions : undefined;
-            return incompatible(err.message, supportedByClient, offeredByServer);
+            const vscodeUpgradeMethod = typeof data?._meta?.vscodeUpgradeMethod === "string" ? data._meta.vscodeUpgradeMethod : undefined;
+            return incompatible(err.message, supportedByClient, offeredByServer, vscodeUpgradeMethod);
         }
         return undefined;
     }
@@ -98,6 +100,9 @@ class NullRemoteAgentHostService {
     getEntryByAddress() {
         return undefined;
     }
+    async triggerServerUpgrade() {
+        throw ( new Error("Remote agent host connections are not supported in this environment."));
+    }
 }
 function rawEntryToEntry(raw) {
     if (raw.sshConfigHost || raw.sshHostName || raw.sshUser || raw.sshPort) {

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

@@ -2,6 +2,7 @@ import { Event } from "../../../base/common/event.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import { IAgentConnection } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/agentHost/common/agentService";
 import { IRemoteAgentHostConnectionInfo, IRemoteAgentHostEntry } from "./remoteAgentHostService.js";
+import { IVscodeUpgradeResult } from "./state/protocolUpgrade.js";
 export declare const IRemoteAgentHostService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IRemoteAgentHostService>;
 /**
 * Manages connections to one or more remote agent host processes over
@@ -15,7 +16,7 @@ export interface IRemoteAgentHostService {
     readonly onDidChangeConnections: Event<void>;
     /** Currently connected remote addresses with metadata. */
     readonly connections: readonly IRemoteAgentHostConnectionInfo[];
-    /** All configured remote agent host entries from settings, regardless of connection status. */
+    /** All configured remote agent host entries, regardless of connection status. */
     readonly configuredEntries: readonly IRemoteAgentHostEntry[];
     /**
     * Get a per-connection {@link IAgentConnection} for subscribing to
@@ -62,4 +63,19 @@ export interface IRemoteAgentHostService {
     * registered entries (e.g. tunnel connections).
     */
     getEntryByAddress(address: string): IRemoteAgentHostEntry | undefined;
+    /**
+    * Ask the remote agent host to upgrade itself via its hosting CLI.
+    *
+    * Sends the host-advertised JSON-RPC method (typically
+    * `_vscodeUpgrade`) on the existing transport — even when the handshake
+    * has not completed (e.g. the host was just rejected for protocol
+    * incompatibility). The hosting CLI receives the signal, checks for a
+    * newer build, and kills+respawns the server on success. The caller
+    * SHOULD then reconnect to re-attempt the handshake.
+    *
+    * Resolves with the host's status payload describing what happened
+    * (whether an upgrade was needed, whether it was started); rejects on
+    * transport failure, timeout, or a JSON-RPC error response.
+    */
+    triggerServerUpgrade(address: string, method: string): Promise<IVscodeUpgradeResult>;
 }

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

@@ -79,6 +79,33 @@ export interface ISSHConnectProgress {
     readonly connectionKey: string;
     readonly message: string;
 }
+/**
+ * A single prompt within a keyboard-interactive authentication request.
+ * Mirrors the shape ssh2 hands us — `echo: false` means the user input
+ * should be hidden (typically a password).
+ */
+export interface ISSHKeyboardInteractivePrompt {
+    readonly prompt: string;
+    readonly echo: boolean;
+}
+/**
+ * Request from the main process for the renderer to gather responses to
+ * a keyboard-interactive auth challenge from the SSH server. The renderer
+ * is expected to respond with {@link ISSHRemoteAgentHostMainService.respondKeyboardInteractive}
+ * within a reasonable time, or the underlying SSH connect attempt will time out.
+ */
+export interface ISSHKeyboardInteractiveRequest {
+    readonly requestId: string;
+    readonly connectionKey: string;
+    /** Display-friendly host (e.g. SSH config alias or `user@host`). */
+    readonly displayHost: string;
+    readonly username: string;
+    /** Optional name field from the server (often empty). */
+    readonly name: string;
+    /** Optional instructions field from the server (often empty). */
+    readonly instructions: string;
+    readonly prompts: readonly ISSHKeyboardInteractivePrompt[];
+}
 /**
  * A message relayed from a remote agent host through the SSH tunnel.
  * The shared process acts as a WebSocket proxy, forwarding JSON messages

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

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { URI } from "../../../base/common/uri.js";
-import { ISSHConnectProgress, ISSHAgentHostConnection, ISSHAgentHostConfig, ISSHResolvedConfig, type ISSHConnectResult, type ISSHRelayMessage } from "./sshRemoteAgentHost.js";
+import { ISSHConnectProgress, ISSHAgentHostConnection, ISSHAgentHostConfig, ISSHResolvedConfig, type ISSHConnectResult, type ISSHKeyboardInteractiveRequest, type ISSHRelayMessage } from "./sshRemoteAgentHost.js";
 export declare const ISSHRemoteAgentHostService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ISSHRemoteAgentHostService>;
 /**
 * Manages SSH connections that bootstrap a remote agent host process.
@@ -77,6 +77,25 @@ export interface ISSHRemoteAgentHostMainService {
     /** Fires when a relay connection to a remote agent host closes. */
     readonly onDidRelayClose: Event<string>;
     /**
+    * Fires when the SSH server requests keyboard-interactive auth (typically
+    * a password prompt). The renderer must answer via {@link respondKeyboardInteractive}
+    * with the same `requestId`, otherwise the auth attempt will hang until the
+    * SSH `readyTimeout` elapses.
+    */
+    readonly onDidRequestKeyboardInteractive: Event<ISSHKeyboardInteractiveRequest>;
+    /**
+    * Fires when a previously requested keyboard-interactive prompt is no
+    * longer needed (e.g. the underlying SSH connect attempt failed or was
+    * aborted). The renderer should dismiss any UI it opened for `requestId`.
+    */
+    readonly onDidCancelKeyboardInteractive: Event<string>;
+    /**
+    * Provide responses for a previously fired keyboard-interactive request.
+    * Pass `undefined` when the user cancels the prompt; this aborts the
+    * owning SSH connection attempt.
+    */
+    respondKeyboardInteractive(requestId: string, responses: readonly string[] | undefined): Promise<void>;
+    /**
     * Bootstrap a remote agent host over SSH. Returns serializable
     * connection info for the renderer to register.
     */

package/vscode/src/vs/platform/agentHost/common/state/protocol/action-origin.generated.d.ts

@@ -1,4 +1,4 @@
-import { type StateAction, type RootAgentsChangedAction, type RootActiveSessionsChangedAction, type RootTerminalsChangedAction, type RootConfigChangedAction, type SessionReadyAction, type SessionCreationFailedAction, type SessionTurnStartedAction, type SessionDeltaAction, type SessionResponsePartAction, type SessionToolCallStartAction, type SessionToolCallDeltaAction, type SessionToolCallReadyAction, type SessionToolCallConfirmedAction, type SessionToolCallCompleteAction, type SessionToolCallResultConfirmedAction, type SessionToolCallContentChangedAction, type SessionTurnCompleteAction, type SessionTurnCancelledAction, type SessionErrorAction, type SessionTitleChangedAction, type SessionUsageAction, type SessionReasoningAction, type SessionModelChangedAction, type SessionServerToolsChangedAction, type SessionActiveClientChangedAction, type SessionActiveClientToolsChangedAction, type SessionPendingMessageSetAction, type SessionPendingMessageRemovedAction, type SessionQueuedMessagesReorderedAction, type SessionInputRequestedAction, type SessionInputAnswerChangedAction, type SessionInputCompletedAction, type SessionCustomizationsChangedAction, type SessionCustomizationToggledAction, type SessionTruncatedAction, type SessionIsReadChangedAction, type SessionIsArchivedChangedAction, type SessionActivityChangedAction, type SessionDiffsChangedAction, type SessionConfigChangedAction, type SessionMetaChangedAction, type TerminalDataAction, type TerminalInputAction, type TerminalResizedAction, type TerminalClaimedAction, type TerminalTitleChangedAction, type TerminalCwdChangedAction, type TerminalExitedAction, type TerminalClearedAction, type TerminalCommandDetectionAvailableAction, type TerminalCommandExecutedAction, type TerminalCommandFinishedAction } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/protocol/actions";
+import { type StateAction, type RootAgentsChangedAction, type RootActiveSessionsChangedAction, type RootTerminalsChangedAction, type RootConfigChangedAction, type SessionReadyAction, type SessionCreationFailedAction, type SessionTurnStartedAction, type SessionDeltaAction, type SessionResponsePartAction, type SessionToolCallStartAction, type SessionToolCallDeltaAction, type SessionToolCallReadyAction, type SessionToolCallConfirmedAction, type SessionToolCallCompleteAction, type SessionToolCallResultConfirmedAction, type SessionToolCallContentChangedAction, type SessionTurnCompleteAction, type SessionTurnCancelledAction, type SessionErrorAction, type SessionTitleChangedAction, type SessionUsageAction, type SessionReasoningAction, type SessionModelChangedAction, type SessionServerToolsChangedAction, type SessionActiveClientChangedAction, type SessionActiveClientToolsChangedAction, type SessionPendingMessageSetAction, type SessionPendingMessageRemovedAction, type SessionQueuedMessagesReorderedAction, type SessionInputRequestedAction, type SessionInputAnswerChangedAction, type SessionInputCompletedAction, type SessionCustomizationsChangedAction, type SessionCustomizationToggledAction, type SessionTruncatedAction, type SessionIsReadChangedAction, type SessionIsArchivedChangedAction, type SessionActivityChangedAction, type SessionDiffsChangedAction, type SessionConfigChangedAction, type SessionMetaChangedAction, type TerminalDataAction, type TerminalInputAction, type TerminalResizedAction, type TerminalClaimedAction, type TerminalTitleChangedAction, type TerminalCwdChangedAction, type TerminalExitedAction, type TerminalClearedAction, type TerminalCommandDetectionAvailableAction, type TerminalCommandExecutedAction, type TerminalCommandFinishedAction } from "./actions.js";
 /** Union of all root-scoped actions. */
 export type RootAction = RootAgentsChangedAction | RootActiveSessionsChangedAction | RootTerminalsChangedAction | RootConfigChangedAction;
 /** Union of root actions that clients may dispatch. */