@codingame/monaco-vscode-xterm-common 33.0.9 → 34.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-xterm-common",
-  "version": "33.0.9",
+  "version": "34.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on xterm",
   "keywords": [],
@@ -15,9 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "33.0.9",
-    "@codingame/monaco-vscode-xterm-addons-common": "33.0.9",
-    "@xterm/xterm": "6.1.0-beta.219"
+    "@codingame/monaco-vscode-api": "34.0.1",
+    "@codingame/monaco-vscode-xterm-addons-common": "34.0.1",
+    "@xterm/xterm": "6.1.0-beta.285"
   },
   "exports": {
     ".": {

package/vscode/src/vs/platform/agentHost/common/state/protocol/common/notifications.d.ts

@@ -0,0 +1,51 @@
+import type { URI } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/state";
+/**
+ * Reason why authentication is required.
+ *
+ * @category Protocol Notifications
+ */
+export declare enum AuthRequiredReason {
+    /** The client has not yet authenticated for the resource */
+    Required = "required",
+    /** A previously valid token has expired or been revoked */
+    Expired = "expired"
+}
+/**
+ * Sent by the server when a protected resource requires (re-)authentication.
+ *
+ * This notification MAY be associated with any channel — for example, an
+ * agent advertised on the root channel, or a per-session resource. The
+ * `channel` field identifies the subscription the auth requirement belongs
+ * to; the `resource` field carries the OAuth-protected resource identifier
+ * (per RFC 9728).
+ *
+ * Clients should obtain a fresh token and push it via the `authenticate`
+ * command.
+ *
+ * @category Protocol Notifications
+ * @method auth/required
+ * @direction Server → Client
+ * @messageType Notification
+ * @version 1
+ * @see {@link /specification/authentication | Authentication}
+ * @example
+ * ```json
+ * {
+ *   "jsonrpc": "2.0",
+ *   "method": "auth/required",
+ *   "params": {
+ *     "channel": "ahp-root://",
+ *     "resource": "https://api.github.com",
+ *     "reason": "expired"
+ *   }
+ * }
+ * ```
+ */
+export interface AuthRequiredParams {
+    /** Channel URI this notification belongs to */
+    channel: URI;
+    /** The protected resource identifier that requires authentication */
+    resource: string;
+    /** Why authentication is required */
+    reason?: AuthRequiredReason;
+}

package/vscode/src/vs/platform/agentHost/common/state/protocol/common/notifications.js

@@ -0,0 +1,9 @@
+
+
+var AuthRequiredReason;
+(function (AuthRequiredReason) {
+    AuthRequiredReason["Required"] = "required";
+    AuthRequiredReason["Expired"] = "expired";
+})(AuthRequiredReason || (AuthRequiredReason = {}));
+
+export { AuthRequiredReason };

package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostPty.js

@@ -4,9 +4,13 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ProcessPropertyType } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { AGENT_HOST_SCHEME, fromAgentHostUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
-import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/actions';
-import '../../../../platform/agentHost/common/state/protocol/notifications.js';
-import { TerminalClaimKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state';
+import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
+import '../../../../platform/agentHost/common/state/protocol/common/notifications.js';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import { TerminalClaimKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
 import { StateComponents } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 import { BasePty } from '../common/basePty.js';
 
@@ -50,7 +54,7 @@ class AgentHostPty extends BasePty {
         try {
             if (!this._options?.attachOnly) {
                 await this._connection.createTerminal({
-                    terminal: ( this._terminalUri.toString()),
+                    channel: ( this._terminalUri.toString()),
                     claim: {
                         kind: TerminalClaimKind.Client,
                         clientId: this._connection.clientId
@@ -61,7 +65,7 @@ class AgentHostPty extends BasePty {
                     rows: this._lastDimensions.rows > 0 ? this._lastDimensions.rows : undefined
                 });
             }
-            this._subscriptionRef = this._connection.getSubscription(StateComponents.Terminal, this._terminalUri);
+            this._subscriptionRef = this._connection.getSubscription(StateComponents.Terminal, this._terminalUri, "AgentHostPty");
             const subscription = this._subscriptionRef.object;
             if (subscription.value === undefined) {
                 await ( new Promise(resolve => {
@@ -211,9 +215,8 @@ class AgentHostPty extends BasePty {
             return;
         }
         this._startBarrier.wait().then(() => {
-            this._connection.dispatch({
+            this._connection.dispatch(( this._terminalUri.toString()), {
                 type: ActionType.TerminalInput,
-                terminal: ( this._terminalUri.toString()),
                 data
             });
         });
@@ -225,9 +228,8 @@ class AgentHostPty extends BasePty {
         this._lastDimensions.cols = cols;
         this._lastDimensions.rows = rows;
         this._startBarrier.wait().then(() => {
-            this._connection.dispatch({
+            this._connection.dispatch(( this._terminalUri.toString()), {
                 type: ActionType.TerminalResized,
-                terminal: ( this._terminalUri.toString()),
                 cols,
                 rows
             });
@@ -251,9 +253,8 @@ class AgentHostPty extends BasePty {
         return this._properties.cwd || this._initialCwd;
     }
     async clearBuffer() {
-        this._connection.dispatch({
-            type: ActionType.TerminalCleared,
-            terminal: ( this._terminalUri.toString())
+        this._connection.dispatch(( this._terminalUri.toString()), {
+            type: ActionType.TerminalCleared
         });
     }
     acknowledgeDataEvent(_charCount) {}
@@ -272,7 +273,7 @@ class AgentHostPty extends BasePty {
         this._subscriptionRef = undefined;
         this._connection = newConnection;
         try {
-            this._subscriptionRef = this._connection.getSubscription(StateComponents.Terminal, this._terminalUri);
+            this._subscriptionRef = this._connection.getSubscription(StateComponents.Terminal, this._terminalUri, "AgentHostPty");
             const subscription = this._subscriptionRef.object;
             if (subscription.value === undefined) {
                 const RECONNECT_HYDRATE_TIMEOUT_MS = 10_000;

package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostTerminalService.js

@@ -83,7 +83,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                 }
             } else if (displaying < entries.length) {
                 desiredProfiles.set("__quickpick__", {
-                    name: ( localize(13907, "Agent Host…")),
+                    name: ( localize(14096, "Agent Host…")),
                     address: "__quickpick__",
                     getConnection: () => undefined
                 });
@@ -104,7 +104,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
             infos.push({
                 extensionIdentifier: AGENT_HOST_PROFILE_EXT_ID,
                 profileId: key,
-                title: key === "__quickpick__" ? ( localize(13907, "Agent Host…")) : ( localize(13908, "Agent Host ({0})", desiredProfiles.get(key).name)),
+                title: key === "__quickpick__" ? ( localize(14096, "Agent Host…")) : ( localize(14097, "Agent Host ({0})", desiredProfiles.get(key).name)),
                 address: key
             });
         }
@@ -119,12 +119,12 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                 let displayName = entry.name;
                 if (key === "__quickpick__") {
                     const picks = ( allEntries.map(e => ({
-                        label: ( localize(13908, "Agent Host ({0})", e.name)),
+                        label: ( localize(14097, "Agent Host ({0})", e.name)),
                         address: e.address,
                         hostName: e.name
                     })));
                     const pick = await this._quickInputService.pick(picks, {
-                        placeHolder: ( localize(13909, "Select an agent host to open a terminal on"))
+                        placeHolder: ( localize(14098, "Select an agent host to open a terminal on"))
                     });
                     if (!pick) {
                         return;
@@ -140,13 +140,13 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                     return;
                 }
                 await this.createTerminal(connection, {
-                    name: ( localize(13908, "Agent Host ({0})", displayName)),
+                    name: ( localize(14097, "Agent Host ({0})", displayName)),
                     cwd: options.cwd ? (typeof options.cwd === "string" ? URI.file(options.cwd) : options.cwd) : this._defaultCwd,
                     location: options.location
                 });
             }
         };
-        const title = key === "__quickpick__" ? ( localize(13907, "Agent Host…")) : ( localize(13908, "Agent Host ({0})", entry.name));
+        const title = key === "__quickpick__" ? ( localize(14096, "Agent Host…")) : ( localize(14097, "Agent Host ({0})", entry.name));
         const store = ( new DisposableStore());
         store.add(
             this._terminalProfileService.registerTerminalProfileProvider(AGENT_HOST_PROFILE_EXT_ID, key, provider)
@@ -175,7 +175,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
             scheme: "agenthost-terminal",
             path: `/${generateUuid()}`
         }));
-        const name = options?.name ?? ( localize(13910, "Agent Host Terminal"));
+        const name = options?.name ?? ( localize(14099, "Agent Host Terminal"));
         const key = ( terminalUri.toString());
         const instance = await this._terminalService.createTerminal({
             config: {
@@ -241,7 +241,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                     });
                     return pty;
                 },
-                name: ( localize(13911, "Agent Host Terminal")),
+                name: ( localize(14100, "Agent Host Terminal")),
                 isFeatureTerminal: true,
                 hideFromUser: true
             }

package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js

@@ -24,7 +24,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
         addExtensionIdentifiers(extSet, ( this._diff.removed.values()));
         addExtensionIdentifiers(extSet, ( this._diff.changed.values()));
         let message = ( localize(
-            13916,
+            14105,
             "The following extensions want to relaunch the terminal to contribute to its environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -32,7 +32,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
     }
     _getActions() {
         return [{
-            label: ( localize(13917, "Relaunch Terminal")),
+            label: ( localize(14106, "Relaunch Terminal")),
             run: () => this._terminalService.getInstanceFromId(this._terminalId)?.relaunch(),
             commandId: TerminalCommandId.Relaunch
         }];
@@ -59,7 +59,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
         const extSet = ( new Set());
         addExtensionIdentifiers(extSet, ( this._collection.getVariableMap(scope).values()));
         let message = ( localize(
-            13918,
+            14107,
             "The following extensions have contributed to this terminal's environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -67,7 +67,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
     }
     _getActions(scope) {
         return [{
-            label: ( localize(13919, "Show Environment Contributions")),
+            label: ( localize(14108, "Show Environment Contributions")),
             run: () => this._commandService.executeCommand(TerminalCommandId.ShowEnvironmentContributions, scope),
             commandId: TerminalCommandId.ShowEnvironmentContributions
         }];
@@ -95,7 +95,7 @@ function getMergedDescription(collection, scope, extensionService, extSet) {
         }
         const workspaceDescription = workspaceDescriptions.get(ext);
         if (workspaceDescription) {
-            const workspaceSuffix = globalDescription ? ` (${( localize(13920, "workspace"))})` : "";
+            const workspaceSuffix = globalDescription ? ` (${( localize(14109, "workspace"))})` : "";
             message.push(`\n- \`${getExtensionName(ext, extensionService)}${workspaceSuffix}\``);
             message.push(`: ${workspaceDescription}`);
         }