@codingame/monaco-vscode-katex-common 24.3.0 → 25.0.1

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

@@ -3,11 +3,10 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { DetachedProcessInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/detachedTerminal';
-import { TerminalCapabilityStore } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/terminalCapabilityStore';
 import { TERMINAL_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
 import { PANEL_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -19,7 +18,43 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
 
+function getChatTerminalBackgroundColor(theme, contextKeyService, storedBackground) {
+    if (storedBackground) {
+        const color = ( Color.fromHex(storedBackground));
+        if (color) {
+            return color;
+        }
+    }
+    const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
+    if (terminalBackground) {
+        return terminalBackground;
+    }
+    const isInEditor = ChatContextKeys.inChatEditor.getValue(contextKeyService);
+    return theme.getColor(isInEditor ? editorBackground : PANEL_BACKGROUND);
+}
+class DetachedTerminalMirror extends Disposable {
+    _setDetachedTerminal(detachedTerminal) {
+        this._detachedTerminal = detachedTerminal.then(terminal => this._register(terminal));
+    }
+    async _getTerminal() {
+        if (!this._detachedTerminal) {
+            throw ( new Error('Detached terminal not initialized'));
+        }
+        return this._detachedTerminal;
+    }
+    async _attachToContainer(container) {
+        const terminal = await this._getTerminal();
+        container.classList.add('chat-terminal-output-terminal');
+        const needsAttach = this._attachedContainer !== container || container.firstChild === null;
+        if (needsAttach) {
+            terminal.attachToElement(container, { enableGpu: false });
+            this._attachedContainer = container;
+        }
+        return terminal;
+    }
+}
 async function getCommandOutputSnapshot(xtermTerminal, command, log) {
     const executedMarker = command.executedMarker;
     const endMarker = command.endMarker;
@@ -79,23 +114,27 @@ async function getCommandOutputSnapshot(xtermTerminal, command, log) {
     }
     return { text, lineCount };
 }
-let DetachedTerminalCommandMirror = class DetachedTerminalCommandMirror extends Disposable {
+let DetachedTerminalCommandMirror = class DetachedTerminalCommandMirror extends DetachedTerminalMirror {
     constructor(_xtermTerminal, _command, _terminalService, _contextKeyService) {
         super();
         this._xtermTerminal = _xtermTerminal;
         this._command = _command;
         this._terminalService = _terminalService;
         this._contextKeyService = _contextKeyService;
-        this._detachedTerminal = this._createTerminal();
+        const processInfo = this._register(( new DetachedProcessInfo({ initialCwd: '' })));
+        this._setDetachedTerminal(this._terminalService.createDetachedTerminal({
+            cols: this._xtermTerminal.raw.cols,
+            rows: 10,
+            readonly: true,
+            processInfo,
+            disableOverviewRuler: true,
+            colorProvider: {
+                getBackgroundColor: theme => getChatTerminalBackgroundColor(theme, this._contextKeyService),
+            },
+        }));
     }
     async attach(container) {
-        const terminal = await this._detachedTerminal;
-        container.classList.add('chat-terminal-output-terminal');
-        const needsAttach = this._attachedContainer !== container || container.firstChild === null;
-        if (needsAttach) {
-            terminal.attachToElement(container);
-            this._attachedContainer = container;
-        }
+        await this._attachToContainer(container);
     }
     async renderCommand() {
         const vt = await getCommandOutputSnapshot(this._xtermTerminal, this._command);
@@ -105,41 +144,100 @@ let DetachedTerminalCommandMirror = class DetachedTerminalCommandMirror extends
         if (!vt.text) {
             return { lineCount: 0 };
         }
-        const detached = await this._detachedTerminal;
-        detached.xterm.clearBuffer();
-        detached.xterm.clearSearchDecorations?.();
+        const detached = await this._getTerminal();
         await ( new Promise(resolve => {
             detached.xterm.write(vt.text, () => resolve());
         }));
         return { lineCount: vt.lineCount };
     }
-    async _createTerminal() {
+};
+DetachedTerminalCommandMirror = ( __decorate([
+    ( __param(2, ITerminalService)),
+    ( __param(3, IContextKeyService))
+], DetachedTerminalCommandMirror));
+let DetachedTerminalSnapshotMirror = class DetachedTerminalSnapshotMirror extends DetachedTerminalMirror {
+    constructor(output, _getTheme, _terminalService, _contextKeyService) {
+        super();
+        this._getTheme = _getTheme;
+        this._terminalService = _terminalService;
+        this._contextKeyService = _contextKeyService;
+        this._dirty = true;
+        this._output = output;
         const processInfo = this._register(( new DetachedProcessInfo({ initialCwd: '' })));
-        const capabilities = this._register(( new TerminalCapabilityStore()));
-        const detached = await this._terminalService.createDetachedTerminal({
-            cols: this._xtermTerminal.raw.cols,
+        this._setDetachedTerminal(this._terminalService.createDetachedTerminal({
+            cols: 80,
             rows: 10,
             readonly: true,
             processInfo,
             disableOverviewRuler: true,
-            capabilities,
             colorProvider: {
                 getBackgroundColor: theme => {
-                    const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
-                    if (terminalBackground) {
-                        return terminalBackground;
-                    }
-                    const isInEditor = ChatContextKeys.inChatEditor.getValue(this._contextKeyService);
-                    return theme.getColor(isInEditor ? editorBackground : PANEL_BACKGROUND);
-                },
+                    const storedBackground = this._getTheme()?.background;
+                    return getChatTerminalBackgroundColor(theme, this._contextKeyService, storedBackground);
+                }
             }
-        });
-        return this._register(detached);
+        }));
+    }
+    setOutput(output) {
+        this._output = output;
+        this._dirty = true;
+    }
+    async attach(container) {
+        await this._attachToContainer(container);
+        this._container = container;
+        this._applyTheme(container);
+    }
+    async render() {
+        const output = this._output;
+        if (!output) {
+            return undefined;
+        }
+        if (!this._dirty) {
+            return { lineCount: this._lastRenderedLineCount ?? output.lineCount };
+        }
+        const terminal = await this._getTerminal();
+        if (this._container) {
+            this._applyTheme(this._container);
+        }
+        const text = output.text ?? '';
+        const lineCount = output.lineCount ?? this._estimateLineCount(text);
+        if (!text) {
+            this._dirty = false;
+            this._lastRenderedLineCount = lineCount;
+            return { lineCount: 0 };
+        }
+        await ( new Promise(resolve => terminal.xterm.write(text, resolve)));
+        this._dirty = false;
+        this._lastRenderedLineCount = lineCount;
+        return { lineCount };
+    }
+    _estimateLineCount(text) {
+        if (!text) {
+            return 0;
+        }
+        const sanitized = text.replace(/\r/g, '');
+        const segments = sanitized.split('\n');
+        const count = sanitized.endsWith('\n') ? segments.length - 1 : segments.length;
+        return Math.max(count, 1);
+    }
+    _applyTheme(container) {
+        const theme = this._getTheme();
+        if (!theme) {
+            container.style.removeProperty('background-color');
+            container.style.removeProperty('color');
+            return;
+        }
+        if (theme.background) {
+            container.style.backgroundColor = theme.background;
+        }
+        if (theme.foreground) {
+            container.style.color = theme.foreground;
+        }
     }
 };
-DetachedTerminalCommandMirror = ( __decorate([
+DetachedTerminalSnapshotMirror = ( __decorate([
     ( __param(2, ITerminalService)),
     ( __param(3, IContextKeyService))
-], DetachedTerminalCommandMirror));
+], DetachedTerminalSnapshotMirror));
 
-export { DetachedTerminalCommandMirror, getCommandOutputSnapshot };
+export { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror, getCommandOutputSnapshot };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/common.d.ts

@@ -1,19 +0,0 @@
-import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
-import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IChatSessionItem, IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
-import { ChatEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
-export declare const NEW_CHAT_SESSION_ACTION_ID = "workbench.action.chat.openNewSessionEditor";
-export type ChatSessionItemWithProvider = IChatSessionItem & {
-    readonly provider: IChatSessionItemProvider;
-    relativeTime?: string;
-    relativeTimeFullWord?: string;
-    hideRelativeTime?: boolean;
-};
-export declare function isChatSession(schemes: readonly string[], editor?: EditorInput): editor is ChatEditorInput;
-export declare function extractTimestamp(item: IChatSessionItem): number | undefined;
-export declare function processSessionsWithTimeGrouping(sessions: ChatSessionItemWithProvider[]): ChatSessionItemWithProvider[];
-export declare function getSessionItemContextOverlay(session: IChatSessionItem, provider?: IChatSessionItemProvider, chatService?: IChatService, editorGroupsService?: IEditorGroupsService): [
-    string,
-    any
-][];

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/common.js

@@ -1,76 +0,0 @@
-
-import { fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-
-const NEW_CHAT_SESSION_ACTION_ID = 'workbench.action.chat.openNewSessionEditor';
-function updateRelativeTime(item, lastRelativeTime) {
-    if (item.timing?.startTime) {
-        item.relativeTime = fromNow(item.timing.startTime);
-        item.relativeTimeFullWord = fromNow(item.timing.startTime, false, true);
-        if (lastRelativeTime === undefined || item.relativeTime !== lastRelativeTime) {
-            lastRelativeTime = item.relativeTime;
-            item.hideRelativeTime = false;
-        }
-        else {
-            item.hideRelativeTime = true;
-        }
-    }
-    else {
-        item.relativeTime = undefined;
-        item.relativeTimeFullWord = undefined;
-        item.hideRelativeTime = false;
-    }
-    return lastRelativeTime;
-}
-function extractTimestamp(item) {
-    if (item.timing?.startTime) {
-        return item.timing.startTime;
-    }
-    if ('timestamp' in item) {
-        return item.timestamp;
-    }
-    return undefined;
-}
-function sortSessionsByTimestamp(sessions) {
-    sessions.sort((a, b) => {
-        const aTime = a.timing?.startTime ?? 0;
-        const bTime = b.timing?.startTime ?? 0;
-        return bTime - aTime;
-    });
-}
-function applyTimeGrouping(sessions) {
-    let lastRelativeTime;
-    sessions.forEach(session => {
-        lastRelativeTime = updateRelativeTime(session, lastRelativeTime);
-    });
-}
-function processSessionsWithTimeGrouping(sessions) {
-    const sessionsTemp = [...sessions];
-    if (( sessions.some(session => session.timing?.startTime !== undefined))) {
-        sortSessionsByTimestamp(sessionsTemp);
-        applyTimeGrouping(sessionsTemp);
-    }
-    return sessionsTemp;
-}
-function getSessionItemContextOverlay(session, provider, chatService, editorGroupsService
-) {
-    const overlay = [];
-    if (provider) {
-        overlay.push([ChatContextKeys.agentSessionType.key, provider.chatSessionType]);
-    }
-    overlay.push([ChatContextKeys.isArchivedAgentSession.key, session.archived]);
-    let isActiveSession = false;
-    if (!session.archived && provider?.chatSessionType === localChatSessionType) {
-        isActiveSession = true;
-    }
-    else if (session.archived && chatService && editorGroupsService) {
-        isActiveSession = !!chatService.getSession(session.resource);
-    }
-    overlay.push([ChatContextKeys.isActiveAgentSession.key, isActiveSession]);
-    return overlay;
-}
-
-export { NEW_CHAT_SESSION_ACTION_ID, extractTimestamp, getSessionItemContextOverlay, processSessionsWithTimeGrouping };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.d.ts

@@ -1,48 +0,0 @@
-import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { ResourceSet } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { ChatRequestVariableSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
-import { IToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
-import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
-import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
-export type InstructionsCollectionEvent = {
-    applyingInstructionsCount: number;
-    referencedInstructionsCount: number;
-    agentInstructionsCount: number;
-    listedInstructionsCount: number;
-    totalInstructionsCount: number;
-};
-export declare function newInstructionsCollectionEvent(): InstructionsCollectionEvent;
-export declare class ComputeAutomaticInstructions {
-    private readonly _enabledTools;
-    private readonly _promptsService;
-    readonly _logService: ILogService;
-    private readonly _labelService;
-    private readonly _configurationService;
-    private readonly _workspaceService;
-    private readonly _fileService;
-    private readonly _telemetryService;
-    private readonly _languageModelToolsService;
-    private _parseResults;
-    constructor(_enabledTools: IToolAndToolSetEnablementMap | undefined, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService);
-    private _parseInstructionsFile;
-    collect(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void>;
-    private sendTelemetry;
-    /** public for testing */
-    addApplyingInstructions(instructionFiles: readonly IPromptPath[], context: {
-        files: ResourceSet;
-        instructions: ResourceSet;
-    }, variables: ChatRequestVariableSet, telemetryEvent: InstructionsCollectionEvent, token: CancellationToken): Promise<void>;
-    private _getContext;
-    private _addAgentInstructions;
-    private _matches;
-    private _getTool;
-    private _getInstructionsWithPatternsList;
-    private _addReferencedInstructions;
-}