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

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

@@ -1,439 +0,0 @@
-
-import { Barrier, raceCancellation, DeferredPromise, disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { MutableDisposable, DisposableStore, toDisposable } 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/common/actions';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/notifications';
-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 '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/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 '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
-import { StateComponents } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
-import { BasePty } from '../common/basePty.js';
-
-var AhpCommandMarkKind;
-(function(AhpCommandMarkKind) {
-    AhpCommandMarkKind["Executed"] = "s";
-    AhpCommandMarkKind["End"] = "e";
-})(AhpCommandMarkKind || (AhpCommandMarkKind = {}));
-function getAhpCommandMarkId(commandId, kind) {
-    return `ahp-${commandId}-${kind}`;
-}
-function getAhpCommandMarkCode(commandId, kind) {
-    return `\x1b]633;SetMark;Id=${getAhpCommandMarkId(commandId, kind)};Hidden\x07`;
-}
-const COPILOT_SENTINEL_PREFIX = "<<<COPILOT_SENTINEL_";
-function isCopilotSentinelCommand(commandLine) {
-    return commandLine.includes(COPILOT_SENTINEL_PREFIX);
-}
-class AgentHostPty extends BasePty {
-    get supportsCommandDetection() {
-        return this._supportsCommandDetection;
-    }
-    constructor(id, _connection, _terminalUri, _options, _logService) {
-        super(id,  false);
-        this._connection = _connection;
-        this._terminalUri = _terminalUri;
-        this._options = _options;
-        this._logService = _logService;
-        this._startBarrier = ( new Barrier());
-        this._lifetime = this._register(( new CancellationTokenSource()));
-        this._subscription = this._register(( new MutableDisposable()));
-        this._initialCwd = "";
-        this._didSignalReady = false;
-        this._onCommandExecuted = this._register(( new Emitter()));
-        this.onCommandExecuted = this._onCommandExecuted.event;
-        this._onCommandFinished = this._register(( new Emitter()));
-        this.onCommandFinished = this._onCommandFinished.event;
-        this._onSupportsCommandDetection = this._register(( new Emitter()));
-        this.onSupportsCommandDetection = this._onSupportsCommandDetection.event;
-        this._supportsCommandDetection = false;
-        this._suppressedCommandIds = ( new Set());
-    }
-    async start() {
-        const connection = this._connection;
-        try {
-            if (this._lifetime.token.isCancellationRequested) {
-                return undefined;
-            }
-            if (!this._options?.attachOnly) {
-                const terminalCreation = connection.createTerminal({
-                    channel: ( this._terminalUri.toString()),
-                    claim: {
-                        kind: TerminalClaimKind.Client,
-                        clientId: connection.clientId
-                    },
-                    name: this._options?.name,
-                    cwd: this._resolveCwdForProtocol(this._options?.cwd),
-                    cols: this._lastDimensions.cols > 0 ? this._lastDimensions.cols : undefined,
-                    rows: this._lastDimensions.rows > 0 ? this._lastDimensions.rows : undefined
-                });
-                this._terminalCreation = terminalCreation;
-                terminalCreation.then(
-                    () => this._clearTerminalCreation(terminalCreation),
-                    () => this._clearTerminalCreation(terminalCreation)
-                );
-                const created = await raceCancellation(terminalCreation.then(() => true), this._lifetime.token, false);
-                if (!created) {
-                    return undefined;
-                }
-            }
-            if (this._lifetime.token.isCancellationRequested || this._connection !== connection) {
-                return undefined;
-            }
-            const {
-                subscription,
-                store
-            } = this._createSubscription(this._connection);
-            if (!(await this._waitForHydration(subscription, store))) {
-                return undefined;
-            }
-            if (this._lifetime.token.isCancellationRequested || this._subscription.value !== store) {
-                return undefined;
-            }
-            const state = subscription.value;
-            if (state.supportsCommandDetection) {
-                this._supportsCommandDetection = true;
-                this._onSupportsCommandDetection.fire();
-            }
-            this._replayContent(state.content);
-            this._initialCwd = state.cwd?.toString() ?? "";
-            this._properties.cwd = this._initialCwd;
-            this._properties.initialCwd = this._initialCwd;
-            if (state.title) {
-                this._properties.title = state.title;
-            }
-            this._signalReady();
-            store.add(subscription.onDidApplyAction(envelope => {
-                this._handleAction(envelope);
-            }));
-            return undefined;
-        } catch (err) {
-            if (this._lifetime.token.isCancellationRequested || this._connection !== connection) {
-                return undefined;
-            }
-            return {
-                message: err instanceof Error ? err.message : String(err)
-            };
-        } finally {
-            this._startBarrier.open();
-        }
-    }
-    _clearTerminalCreation(terminalCreation) {
-        if (this._terminalCreation === terminalCreation) {
-            this._terminalCreation = undefined;
-        }
-    }
-    _signalReady() {
-        if (this._didSignalReady || this._lifetime.token.isCancellationRequested) {
-            return;
-        }
-        this._didSignalReady = true;
-        this.handleReady({
-            pid: -1,
-            cwd: this._initialCwd,
-            windowsPty: undefined
-        });
-    }
-    _handleAction(envelope) {
-        if (this._lifetime.token.isCancellationRequested) {
-            return;
-        }
-        const action = envelope.action;
-        switch (action.type) {
-        case ActionType.TerminalData:
-            this.handleData(action.data);
-            break;
-        case ActionType.TerminalExited:
-            this._exitAndDispose(action.exitCode);
-            break;
-        case ActionType.TerminalCwdChanged:
-            this._properties.cwd = ( action.cwd.toString());
-            this.handleDidChangeProperty({
-                type: ProcessPropertyType.Cwd,
-                value: ( action.cwd.toString())
-            });
-            break;
-        case ActionType.TerminalTitleChanged:
-            this._properties.title = action.title;
-            this.handleDidChangeProperty({
-                type: ProcessPropertyType.Title,
-                value: action.title
-            });
-            break;
-        case ActionType.TerminalResized:
-            if (envelope.origin?.clientId !== this._connection.clientId) {
-                this.handleDidChangeProperty({
-                    type: ProcessPropertyType.OverrideDimensions,
-                    value: {
-                        cols: action.cols,
-                        rows: action.rows
-                    }
-                });
-            }
-            break;
-        case ActionType.TerminalCommandDetectionAvailable:
-            if (!this._supportsCommandDetection) {
-                this._supportsCommandDetection = true;
-                this._onSupportsCommandDetection.fire();
-            }
-            break;
-        case ActionType.TerminalCommandExecuted:
-            if (isCopilotSentinelCommand(action.commandLine)) {
-                this._suppressedCommandIds.add(action.commandId);
-                break;
-            }
-            this.handleData(getAhpCommandMarkCode(action.commandId, AhpCommandMarkKind.Executed));
-            this._onCommandExecuted.fire({
-                commandId: action.commandId,
-                commandLine: action.commandLine,
-                timestamp: action.timestamp
-            });
-            break;
-        case ActionType.TerminalCommandFinished:
-            if (this._suppressedCommandIds.delete(action.commandId)) {
-                break;
-            }
-            this.handleData(getAhpCommandMarkCode(action.commandId, AhpCommandMarkKind.End));
-            this._onCommandFinished.fire({
-                commandId: action.commandId,
-                exitCode: action.exitCode,
-                durationMs: action.durationMs
-            });
-            break;
-        }
-    }
-    _replayContent(content) {
-        for (const part of content) {
-            if (part.type === "unclassified") {
-                if (part.value) {
-                    this.handleData(part.value);
-                }
-            } else if (part.type === "command") {
-                if (isCopilotSentinelCommand(part.commandLine)) {
-                    continue;
-                }
-                this.handleData(getAhpCommandMarkCode(part.commandId, AhpCommandMarkKind.Executed));
-                this._onCommandExecuted.fire({
-                    commandId: part.commandId,
-                    commandLine: part.commandLine,
-                    timestamp: part.timestamp,
-                    storedOutput: part.output
-                });
-                if (part.output) {
-                    this.handleData(part.output);
-                }
-                if (part.isComplete) {
-                    this.handleData(getAhpCommandMarkCode(part.commandId, AhpCommandMarkKind.End));
-                    this._onCommandFinished.fire({
-                        commandId: part.commandId,
-                        exitCode: part.exitCode,
-                        durationMs: part.durationMs
-                    });
-                }
-            }
-        }
-    }
-    _resolveCwdForProtocol(cwd) {
-        if (!cwd) {
-            return undefined;
-        }
-        if (cwd.scheme === AGENT_HOST_SCHEME) {
-            return ( fromAgentHostUri(cwd).toString());
-        }
-        return ( cwd.toString());
-    }
-    _createSubscription(connection) {
-        const store = ( new DisposableStore());
-        try {
-            const subscription = store.add(
-                connection.getSubscription(StateComponents.Terminal, this._terminalUri, "AgentHostPty")
-            ).object;
-            this._subscription.value = store;
-            return {
-                subscription,
-                store
-            };
-        } catch (error) {
-            store.dispose();
-            throw error;
-        }
-    }
-    async _waitForHydration(subscription, store, timeoutMs) {
-        if (subscription.value !== undefined) {
-            return true;
-        }
-        const hydration = ( new DeferredPromise());
-        const timeout = timeoutMs === undefined ? undefined : disposableTimeout(() => hydration.error(( new Error("Reconnect hydration timed out"))), timeoutMs, store);
-        store.add(toDisposable(() => hydration.complete(false)));
-        store.add(Event.once(subscription.onDidChange)(() => {
-            timeout?.dispose();
-            hydration.complete(true);
-        }));
-        return raceCancellation(hydration.p, this._lifetime.token, false);
-    }
-    input(data) {
-        if (this._inReplay || this._lifetime.token.isCancellationRequested) {
-            return;
-        }
-        this._startBarrier.wait().then(() => {
-            if (this._lifetime.token.isCancellationRequested) {
-                return;
-            }
-            this._connection.dispatch(( this._terminalUri.toString()), {
-                type: ActionType.TerminalInput,
-                data
-            });
-        });
-    }
-    resize(cols, rows) {
-        if (this._lifetime.token.isCancellationRequested || this._inReplay || (this._lastDimensions.cols === cols && this._lastDimensions.rows === rows)) {
-            return;
-        }
-        this._lastDimensions.cols = cols;
-        this._lastDimensions.rows = rows;
-        this._startBarrier.wait().then(() => {
-            if (this._lifetime.token.isCancellationRequested) {
-                return;
-            }
-            this._connection.dispatch(( this._terminalUri.toString()), {
-                type: ActionType.TerminalResized,
-                cols,
-                rows
-            });
-        });
-    }
-    shutdown(_immediate) {
-        if (this._lifetime.token.isCancellationRequested) {
-            return;
-        }
-        this._requestHostTerminalDisposal();
-        this._exitAndDispose(undefined);
-    }
-    _requestHostTerminalDisposal() {
-        if (this._options?.attachOnly) {
-            return;
-        }
-        this._disposeHostTerminal();
-        if (this._terminalCreation) {
-            void this._terminalCreation.then(() => this._disposeHostTerminal(), () => this._disposeHostTerminal());
-        }
-    }
-    _disposeHostTerminal() {
-        try {
-            void this._connection.disposeTerminal(this._terminalUri).catch(err => this._logHostDisposalError(err));
-        } catch (err) {
-            this._logHostDisposalError(err);
-        }
-    }
-    _logHostDisposalError(err) {
-        this._logService.warn(
-            `[AgentHostPty] Failed to dispose host terminal: ${err instanceof Error ? err.message : String(err)}`
-        );
-    }
-    _exitAndDispose(exitCode) {
-        if (this._lifetime.token.isCancellationRequested) {
-            return;
-        }
-        this._lifetime.cancel();
-        this._subscription.clear();
-        this._startBarrier.open();
-        queueMicrotask(() => {
-            this.handleExit(exitCode);
-            this.dispose();
-        });
-    }
-    async getInitialCwd() {
-        return this._initialCwd;
-    }
-    async getCwd() {
-        return this._properties.cwd || this._initialCwd;
-    }
-    async clearBuffer() {
-        if (this._lifetime.token.isCancellationRequested) {
-            return;
-        }
-        this._connection.dispatch(( this._terminalUri.toString()), {
-            type: ActionType.TerminalCleared
-        });
-    }
-    acknowledgeDataEvent(_charCount) {}
-    async setUnicodeVersion(_version) {}
-    processBinary(_data) {
-        return Promise.resolve();
-    }
-    sendSignal(_signal) {}
-    async refreshProperty(type) {
-        return this._properties[type];
-    }
-    async updateProperty(_type, _value) {}
-    async reconnect(newConnection) {
-        if (this._lifetime.token.isCancellationRequested) {
-            return false;
-        }
-        this._subscription.clear();
-        this._connection = newConnection;
-        let subscriptionStore;
-        try {
-            const result = this._createSubscription(this._connection);
-            const subscription = result.subscription;
-            subscriptionStore = result.store;
-            const RECONNECT_HYDRATE_TIMEOUT_MS = 10_000;
-            if (!(await this._waitForHydration(subscription, subscriptionStore, RECONNECT_HYDRATE_TIMEOUT_MS))) {
-                return false;
-            }
-            if (this._lifetime.token.isCancellationRequested || this._subscription.value !== subscriptionStore) {
-                return false;
-            }
-            const state = subscription.value;
-            if (state.supportsCommandDetection && !this._supportsCommandDetection) {
-                this._supportsCommandDetection = true;
-                this._onSupportsCommandDetection.fire();
-            }
-            this.handleData("\u001b[2J\u001b[3J\u001b[H");
-            this._replayContent(state.content);
-            if (state.cwd) {
-                this._properties.cwd = ( state.cwd.toString());
-            }
-            if (state.title) {
-                this._properties.title = state.title;
-            }
-            this._signalReady();
-            subscriptionStore.add(subscription.onDidApplyAction(envelope => {
-                this._handleAction(envelope);
-            }));
-            return true;
-        } catch (err) {
-            if (!this._lifetime.token.isCancellationRequested) {
-                this._logService.warn(
-                    `[AgentHostPty] Reconnection failed: ${err instanceof Error ? err.message : String(err)}`
-                );
-            }
-            if (subscriptionStore && this._subscription.value === subscriptionStore) {
-                this._subscription.clear();
-            }
-            if (!this._didSignalReady && !this._lifetime.token.isCancellationRequested) {
-                this._requestHostTerminalDisposal();
-                this._exitAndDispose(undefined);
-            }
-            return false;
-        }
-    }
-    get terminalUri() {
-        return this._terminalUri;
-    }
-    dispose() {
-        this._lifetime.cancel();
-        this._subscription.clear();
-        super.dispose();
-    }
-}
-
-export { AgentHostPty, AhpCommandMarkKind, getAhpCommandMarkId };

package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostTerminalService.d.ts

@@ -1,77 +0,0 @@
-import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IAgentConnection } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService";
-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 { ITerminalInstance, ITerminalLocationOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
-import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
-import { ITerminalService } 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";
-import { IAgentHostTerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/agentHostTerminalService.service";
-export interface IAgentHostTerminalCreateOptions {
-    /** Human-readable terminal name. */
-    readonly name?: string;
-    /** Initial working directory. */
-    readonly cwd?: URI;
-    /** Terminal location (panel, editor, split, etc.). */
-    readonly location?: ITerminalLocationOptions;
-}
-export interface IAgentHostEntry {
-    /** Display name for the profile. */
-    readonly name: string;
-    /** Address or identifier for the host. */
-    readonly address: string;
-    /** Getter for the connection (may be lazily resolved). */
-    readonly getConnection: () => IAgentConnection | undefined;
-}
-export interface IAgentHostTerminalProfileInfo {
-    readonly extensionIdentifier: string;
-    readonly profileId: string;
-    readonly title: string;
-    readonly address: string;
-}
-export declare class AgentHostTerminalService extends Disposable implements IAgentHostTerminalService {
-    private readonly _terminalService;
-    private readonly _terminalChatService;
-    private readonly _terminalProfileService;
-    private readonly _quickInputService;
-    private readonly _logService;
-    readonly _serviceBrand: undefined;
-    private readonly _entries;
-    private readonly _usedHosts;
-    private readonly _profileRegistrations;
-    private readonly _profiles;
-    readonly profiles: IObservable<readonly IAgentHostTerminalProfileInfo[]>;
-    private _defaultCwd;
-    /** Revived terminal instances, keyed by terminal URI string. */
-    private readonly _revivedInstances;
-    /**
-     * Active AgentHostPty instances with their owning connection clientId,
-     * keyed by terminal URI string. Used for reconnection scoping.
-     */
-    private readonly _activePtys;
-    private readonly _pendingRevives;
-    constructor(_terminalService: ITerminalService, _terminalChatService: ITerminalChatService, _terminalProfileService: ITerminalProfileService, _quickInputService: IQuickInputService, _logService: ITerminalLogService);
-    registerEntry(entry: IAgentHostEntry): IDisposable;
-    getProfileForConnection(address: string): IAgentHostTerminalProfileInfo | undefined;
-    setDefaultCwd(cwd: URI | undefined): void;
-    private _reconcile;
-    private _registerProfile;
-    createTerminalForEntry(address: string, options?: IAgentHostTerminalCreateOptions): Promise<ITerminalInstance | undefined>;
-    createTerminal(connection: IAgentConnection, options?: IAgentHostTerminalCreateOptions): Promise<ITerminalInstance>;
-    reviveTerminal(connection: IAgentConnection, terminalUri: URI, terminalToolSessionId: string): Promise<ITerminalInstance>;
-    attachOutputTerminal(connection: IAgentConnection, terminalUri: URI, terminalToolSessionId: string): IDisposable;
-    private _doReviveTerminal;
-    /** Creates the registration that owns the pty produced for {@link key}. */
-    private _createPtyRegistration;
-    /**
-     * Ties the registration's lifetime to the terminal instance so the local
-     * pty is disposed even on paths that never call `shutdown()`.
-     */
-    private _registerInstancePtyCleanup;
-    reconnectTerminals(newConnection: IAgentConnection, oldClientId: string): Promise<{
-        recovered: number;
-        total: number;
-    }>;
-}