@codingame/monaco-vscode-xterm-common 36.2.7 → 37.2.0

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

@@ -1,13 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Disposable, DisposableMap, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { AgentHostPty } from './agentHostPty.js';
+import { AgentHostOutputChannel } from './agentHostOutputChannel.js';
 import { AhpTerminalCommandSource } from './ahpTerminalCommandSource.js';
 import { ITerminalService, ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ITerminalProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
@@ -20,13 +21,15 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
         _terminalService,
         _terminalChatService,
         _terminalProfileService,
-        _quickInputService
+        _quickInputService,
+        _logService
     ) {
         super();
         this._terminalService = _terminalService;
         this._terminalChatService = _terminalChatService;
         this._terminalProfileService = _terminalProfileService;
         this._quickInputService = _quickInputService;
+        this._logService = _logService;
         this._entries = [];
         this._usedHosts = ( new Set());
         this._profileRegistrations = this._register(( new DisposableMap()));
@@ -34,7 +37,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
         this.profiles = this._profiles;
         this._revivedInstances = ( new Map());
         this._activePtys = ( new Map());
-        this._reviveSequencer = ( new SequencerByKey());
+        this._pendingRevives = ( new Map());
     }
     registerEntry(entry) {
         this._entries.push(entry);
@@ -83,7 +86,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                 }
             } else if (displaying < entries.length) {
                 desiredProfiles.set("__quickpick__", {
-                    name: ( localize(14740, "Agent Host…")),
+                    name: ( localize(16804, "Agent Host…")),
                     address: "__quickpick__",
                     getConnection: () => undefined
                 });
@@ -104,7 +107,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
             infos.push({
                 extensionIdentifier: AGENT_HOST_PROFILE_EXT_ID,
                 profileId: key,
-                title: key === "__quickpick__" ? ( localize(14740, "Agent Host…")) : ( localize(14741, "Agent Host ({0})", desiredProfiles.get(key).name)),
+                title: key === "__quickpick__" ? ( localize(16804, "Agent Host…")) : ( localize(16805, "Agent Host ({0})", desiredProfiles.get(key).name)),
                 address: key
             });
         }
@@ -119,12 +122,12 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                 let displayName = entry.name;
                 if (key === "__quickpick__") {
                     const picks = ( allEntries.map(e => ({
-                        label: ( localize(14741, "Agent Host ({0})", e.name)),
+                        label: ( localize(16805, "Agent Host ({0})", e.name)),
                         address: e.address,
                         hostName: e.name
                     })));
                     const pick = await this._quickInputService.pick(picks, {
-                        placeHolder: ( localize(14742, "Select an agent host to open a terminal on"))
+                        placeHolder: ( localize(16806, "Select an agent host to open a terminal on"))
                     });
                     if (!pick) {
                         return;
@@ -140,13 +143,13 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                     return;
                 }
                 await this.createTerminal(connection, {
-                    name: ( localize(14741, "Agent Host ({0})", displayName)),
+                    name: ( localize(16805, "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(14740, "Agent Host…")) : ( localize(14741, "Agent Host ({0})", entry.name));
+        const title = key === "__quickpick__" ? ( localize(16804, "Agent Host…")) : ( localize(16805, "Agent Host ({0})", entry.name));
         const store = ( new DisposableStore());
         store.add(
             this._terminalProfileService.registerTerminalProfileProvider(AGENT_HOST_PROFILE_EXT_ID, key, provider)
@@ -175,43 +178,60 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
             scheme: "agenthost-terminal",
             path: `/${generateUuid()}`
         }));
-        const name = options?.name ?? ( localize(14743, "Agent Host Terminal"));
+        const name = options?.name ?? ( localize(16807, "Agent Host Terminal"));
         const key = ( terminalUri.toString());
-        const instance = await this._terminalService.createTerminal({
-            config: {
-                customPtyImplementation: (id, cols, rows) => {
-                    const pty = ( new AgentHostPty(id, connection, terminalUri, {
-                        name,
-                        cwd: options?.cwd
-                    }));
-                    if (cols > 0 && rows > 0) {
-                        pty.resize(cols, rows);
-                    }
-                    this._activePtys.set(key, {
-                        pty,
-                        clientId: connection.clientId
-                    });
-                    return pty;
-                },
-                name,
-                icon: {
-                    id: "remote"
+        const ptyRegistration = this._createPtyRegistration(key, connection.clientId);
+        let instance;
+        try {
+            instance = await this._terminalService.createTerminal({
+                config: {
+                    customPtyImplementation: (id, cols, rows) => {
+                        const pty = ( new AgentHostPty(id, connection, terminalUri, {
+                            name,
+                            cwd: options?.cwd
+                        }, this._logService));
+                        if (cols > 0 && rows > 0) {
+                            pty.resize(cols, rows);
+                        }
+                        ptyRegistration.setPty(pty);
+                        return pty;
+                    },
+                    name,
+                    icon: {
+                        id: "remote"
+                    },
+                    isFeatureTerminal: false
                 },
-                isFeatureTerminal: false
-            },
-            location: options?.location
-        });
-        this._register(instance.onDisposed(() => {
-            this._activePtys.delete(key);
-        }));
+                location: options?.location
+            });
+        } catch (error) {
+            ptyRegistration.dispose();
+            throw error;
+        }
+        this._registerInstancePtyCleanup(instance, key, ptyRegistration);
         return instance;
     }
     async reviveTerminal(connection, terminalUri, terminalToolSessionId) {
         const key = ( terminalUri.toString());
-        return this._reviveSequencer.queue(
-            key,
-            () => this._doReviveTerminal(connection, terminalUri, terminalToolSessionId, key)
+        const pending = this._pendingRevives.get(key);
+        if (pending) {
+            return pending;
+        }
+        const revive = this._doReviveTerminal(connection, terminalUri, terminalToolSessionId, key).finally(() => {
+            if (this._pendingRevives.get(key) === revive) {
+                this._pendingRevives.delete(key);
+            }
+        });
+        this._pendingRevives.set(key, revive);
+        return revive;
+    }
+    attachOutputTerminal(connection, terminalUri, terminalToolSessionId) {
+        const store = ( new DisposableStore());
+        const source = store.add(( new AgentHostOutputChannel(connection, terminalUri)));
+        store.add(
+            this._terminalChatService.registerOutputSource(terminalToolSessionId, source)
         );
+        return store;
     }
     async _doReviveTerminal(connection, terminalUri, terminalToolSessionId, key) {
         const existing = this._revivedInstances.get(key);
@@ -220,41 +240,84 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
         }
         const store = ( new DisposableStore());
         const commandSource = store.add(( new AhpTerminalCommandSource()));
-        store.add(
-            this._terminalChatService.registerAhpCommandSource(terminalToolSessionId, commandSource)
-        );
-        const instance = await this._terminalService.createTerminal({
+        const ptyRegistration = this._createPtyRegistration(key, connection.clientId);
+        const instancePromise = Promise.resolve().then(() => this._terminalService.createTerminal({
             config: {
                 customPtyImplementation: (id, cols, rows) => {
                     const pty = ( new AgentHostPty(id, connection, terminalUri, {
                         attachOnly: true
-                    }));
+                    }, this._logService));
                     if (cols > 0 && rows > 0) {
                         pty.resize(cols, rows);
                     }
                     if (!store.isDisposed) {
                         commandSource.connect(instance, pty);
                     }
-                    this._activePtys.set(key, {
-                        pty,
-                        clientId: connection.clientId
-                    });
+                    ptyRegistration.setPty(pty);
                     return pty;
                 },
-                name: ( localize(14744, "Agent Host Terminal")),
+                name: ( localize(16808, "Agent Host Terminal")),
                 isFeatureTerminal: true,
                 hideFromUser: true
             }
-        });
+        }));
+        store.add(
+            this._terminalChatService.registerAhpCommandSource(terminalToolSessionId, commandSource, instancePromise)
+        );
+        let instance;
+        try {
+            instance = await instancePromise;
+        } catch (error) {
+            store.dispose();
+            ptyRegistration.dispose();
+            throw error;
+        }
         this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, instance);
         this._revivedInstances.set(key, instance);
         instance.store.add(store);
-        this._register(instance.onDisposed(() => {
-            this._revivedInstances.delete(key);
-            this._activePtys.delete(key);
-        }));
+        this._registerInstancePtyCleanup(instance, key, ptyRegistration);
         return instance;
     }
+    _createPtyRegistration(key, clientId) {
+        let pty;
+        let isDisposed = false;
+        return {
+            setPty: value => {
+                if (isDisposed) {
+                    value.dispose();
+                    return;
+                }
+                pty = value;
+                this._activePtys.set(key, {
+                    pty,
+                    clientId
+                });
+            },
+            dispose: () => {
+                if (isDisposed) {
+                    return;
+                }
+                isDisposed = true;
+                if (this._activePtys.get(key)?.pty === pty) {
+                    this._activePtys.delete(key);
+                }
+                pty?.dispose();
+            }
+        };
+    }
+    _registerInstancePtyCleanup(instance, key, ptyRegistration) {
+        const cleanup = () => {
+            if (this._revivedInstances.get(key) === instance) {
+                this._revivedInstances.delete(key);
+            }
+            ptyRegistration.dispose();
+        };
+        if (instance.isDisposed) {
+            cleanup();
+        } else {
+            instance.store.add(instance.onDisposed(cleanup));
+        }
+    }
     async reconnectTerminals(newConnection, oldClientId) {
         const entries = [...this._activePtys.entries()].filter(([, entry]) => entry.clientId === oldClientId);
         const total = entries.length;
@@ -266,7 +329,7 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
                     recovered++;
                     entry.clientId = newConnection.clientId;
                 } else {
-                    console.warn(`[AgentHostTerminalService] Failed to reconnect terminal: ${key}`);
+                    this._logService.warn(`[AgentHostTerminalService] Failed to reconnect terminal: ${key}`);
                 }
             }));
         }
@@ -277,6 +340,6 @@ let AgentHostTerminalService = class AgentHostTerminalService extends Disposable
         };
     }
 };
-AgentHostTerminalService = ( __decorate([( __param(0, ITerminalService)), ( __param(1, ITerminalChatService)), ( __param(2, ITerminalProfileService)), ( __param(3, IQuickInputService))], AgentHostTerminalService));
+AgentHostTerminalService = ( __decorate([( __param(0, ITerminalService)), ( __param(1, ITerminalChatService)), ( __param(2, ITerminalProfileService)), ( __param(3, IQuickInputService)), ( __param(4, ITerminalLogService))], AgentHostTerminalService));
 
 export { AgentHostTerminalService };

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(
-            14749,
+            16813,
             "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(14750, "Relaunch Terminal")),
+            label: ( localize(16814, "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(
-            14751,
+            16815,
             "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(14752, "Show Environment Contributions")),
+            label: ( localize(16816, "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(14753, "workspace"))})` : "";
+            const workspaceSuffix = globalDescription ? ` (${( localize(16817, "workspace"))})` : "";
             message.push(`\n- \`${getExtensionName(ext, extensionService)}${workspaceSuffix}\``);
             message.push(`: ${workspaceDescription}`);
         }