@codingame/monaco-vscode-api 15.0.3 → 16.0.0

package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.js

@@ -94,7 +94,7 @@ class InternalTerminalShellIntegration extends Disposable {
         super();
         this._terminal = _terminal;
         this._onDidStartTerminalShellExecution = _onDidStartTerminalShellExecution;
-        this._ignoreNextExecution = false;
+        this._pendingExecutions = [];
         this.store = this._register(( new DisposableStore()));
         this._onDidRequestChangeShellIntegration = this._register(( new Emitter()));
         this.onDidRequestChangeShellIntegration = this._onDidRequestChangeShellIntegration.event;
@@ -102,13 +102,21 @@ class InternalTerminalShellIntegration extends Disposable {
         this.onDidRequestShellExecution = this._onDidRequestShellExecution.event;
         this._onDidRequestEndExecution = this._register(( new Emitter()));
         this.onDidRequestEndExecution = this._onDidRequestEndExecution.event;
+        this._onDidRequestNewExecution = this._register(( new Emitter()));
+        this.onDidRequestNewExecution = this._onDidRequestNewExecution.event;
         const that = this;
         this.value = {
             get cwd() {
                 return that._cwd;
             },
             get env() {
-                return that._env;
+                if (!that._env) {
+                    return undefined;
+                }
+                return ( Object.freeze({
+                    isTrusted: that._env.isTrusted,
+                    value: ( Object.freeze({ ...that._env.value }))
+                }));
             },
             executeCommand(commandLineOrExecutable, args) {
                 let commandLineValue = commandLineOrExecutable;
@@ -129,42 +137,96 @@ class InternalTerminalShellIntegration extends Disposable {
                     confidence: TerminalShellExecutionCommandLineConfidence.High,
                     isTrusted: true
                 };
-                const execution = that.startShellExecution(commandLine, that._cwd, true).value;
-                that._ignoreNextExecution = true;
+                const execution = that.requestNewShellExecution(commandLine, that._cwd).value;
                 return execution;
             }
         };
     }
-    startShellExecution(commandLine, cwd, fireEventInMicrotask) {
-        if (this._ignoreNextExecution && this._currentExecution) {
-            this._ignoreNextExecution = false;
+    requestNewShellExecution(commandLine, cwd) {
+        const execution = ( new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd));
+        const unresolvedCommandLines = splitAndSanitizeCommandLine(commandLine.value);
+        if (unresolvedCommandLines.length > 1) {
+            this._currentExecutionProperties = {
+                isMultiLine: true,
+                unresolvedCommandLines: splitAndSanitizeCommandLine(commandLine.value),
+            };
         }
-        else {
-            if (this._currentExecution) {
-                this._currentExecution.endExecution(undefined);
-                this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
-            }
-            const currentExecution = this._currentExecution = ( new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd));
-            if (fireEventInMicrotask) {
-                queueMicrotask(() => this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value }));
+        this._pendingExecutions.push(execution);
+        this._onDidRequestNewExecution.fire(commandLine.value);
+        return execution;
+    }
+    startShellExecution(commandLine, cwd) {
+        if (this._pendingEndingExecution) {
+            this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._pendingEndingExecution.value, exitCode: undefined });
+            this._pendingEndingExecution = undefined;
+        }
+        if (this._currentExecution) {
+            if (this._currentExecutionProperties?.isMultiLine && this._currentExecutionProperties.unresolvedCommandLines) {
+                const subExecutionResult = isSubExecution(this._currentExecutionProperties.unresolvedCommandLines, commandLine);
+                if (subExecutionResult) {
+                    this._currentExecutionProperties.unresolvedCommandLines = subExecutionResult.unresolvedCommandLines;
+                    return;
+                }
             }
-            else {
-                this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value });
+            this._currentExecution.endExecution(undefined);
+            this._currentExecution.flush();
+            this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
+        }
+        let currentExecution;
+        if (commandLine.confidence === TerminalShellExecutionCommandLineConfidence.High) {
+            for (const [i, execution] of this._pendingExecutions.entries()) {
+                if (execution.value.commandLine.value === commandLine.value) {
+                    currentExecution = execution;
+                    this._currentExecutionProperties = {
+                        isMultiLine: false,
+                        unresolvedCommandLines: undefined,
+                    };
+                    currentExecution = execution;
+                    this._pendingExecutions.splice(i, 1);
+                    break;
+                }
+                else {
+                    const subExecutionResult = isSubExecution(splitAndSanitizeCommandLine(execution.value.commandLine.value), commandLine);
+                    if (subExecutionResult) {
+                        this._currentExecutionProperties = {
+                            isMultiLine: true,
+                            unresolvedCommandLines: subExecutionResult.unresolvedCommandLines,
+                        };
+                        currentExecution = execution;
+                        this._pendingExecutions.splice(i, 1);
+                        break;
+                    }
+                }
             }
         }
-        return this._currentExecution;
+        else {
+            currentExecution = this._pendingExecutions.shift();
+        }
+        if (!currentExecution) {
+            currentExecution = ( new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd));
+        }
+        this._currentExecution = currentExecution;
+        this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value });
     }
     emitData(data) {
         this.currentExecution?.emitData(data);
     }
     endShellExecution(commandLine, exitCode) {
+        if (this._currentExecutionProperties?.isMultiLine) {
+            if (this._currentExecutionProperties.unresolvedCommandLines && this._currentExecutionProperties.unresolvedCommandLines.length > 0) {
+                return;
+            }
+        }
         if (this._currentExecution) {
-            this._currentExecution.endExecution(commandLine);
+            const commandLineForEvent = this._currentExecutionProperties?.isMultiLine ? this._currentExecution.value.commandLine : commandLine;
+            this._currentExecution.endExecution(commandLineForEvent);
             const currentExecution = this._currentExecution;
+            this._pendingEndingExecution = currentExecution;
+            this._currentExecution = undefined;
             currentExecution.flush().then(() => {
-                if (this._currentExecution === currentExecution) {
+                if (this._pendingEndingExecution === currentExecution) {
                     this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value, exitCode });
-                    this._currentExecution = undefined;
+                    this._pendingEndingExecution = undefined;
                 }
             });
         }
@@ -198,7 +260,7 @@ class InternalTerminalShellExecution {
     constructor(_commandLine, cwd) {
         this._commandLine = _commandLine;
         this.cwd = cwd;
-        this._ended = false;
+        this._isEnded = false;
         const that = this;
         this.value = {
             get commandLine() {
@@ -214,7 +276,7 @@ class InternalTerminalShellExecution {
     }
     _createDataStream() {
         if (!this._dataStream) {
-            if (this._ended) {
+            if (this._isEnded) {
                 return AsyncIterableObject.EMPTY;
             }
             this._dataStream = ( new ShellExecutionDataStream());
@@ -222,18 +284,23 @@ class InternalTerminalShellExecution {
         return this._dataStream.createIterable();
     }
     emitData(data) {
-        this._dataStream?.emitData(data);
+        if (!this._isEnded) {
+            this._dataStream?.emitData(data);
+        }
     }
     endExecution(commandLine) {
         if (commandLine) {
             this._commandLine = commandLine;
         }
         this._dataStream?.endExecution();
-        this._dataStream = undefined;
-        this._ended = true;
+        this._isEnded = true;
     }
     async flush() {
-        await this._dataStream?.flush();
+        if (this._dataStream) {
+            await this._dataStream.flush();
+            this._dataStream.dispose();
+            this._dataStream = undefined;
+        }
     }
 }
 class ShellExecutionDataStream extends Disposable {
@@ -261,11 +328,36 @@ class ShellExecutionDataStream extends Disposable {
     }
     endExecution() {
         this._barrier?.open();
-        this._barrier = undefined;
     }
     async flush() {
         await Promise.all(( this._iterables.map(e => e.toPromise())));
     }
 }
+function splitAndSanitizeCommandLine(commandLine) {
+    return ( commandLine
+        .split('\n')
+        .map(line => line.trim()))
+        .filter(line => line.length > 0);
+}
+function isSubExecution(unresolvedCommandLines, commandLine) {
+    if (unresolvedCommandLines.length === 0) {
+        return false;
+    }
+    const newUnresolvedCommandLines = [...unresolvedCommandLines];
+    const subExecutionLines = splitAndSanitizeCommandLine(commandLine.value);
+    if (newUnresolvedCommandLines && newUnresolvedCommandLines.length > 0) {
+        while (newUnresolvedCommandLines.length > 0) {
+            if (newUnresolvedCommandLines[0] !== subExecutionLines[0]) {
+                break;
+            }
+            newUnresolvedCommandLines.shift();
+            subExecutionLines.shift();
+        }
+        if (subExecutionLines.length === 0) {
+            return { unresolvedCommandLines: newUnresolvedCommandLines };
+        }
+    }
+    return false;
+}
 
-export { ExtHostTerminalShellIntegration, IExtHostTerminalShellIntegration };
+export { ExtHostTerminalShellIntegration, IExtHostTerminalShellIntegration, InternalTerminalShellIntegration };

package/vscode/src/vs/workbench/api/common/extHostTreeViews.js

@@ -670,7 +670,7 @@ class ExtHostTreeView extends Disposable {
     createAndRegisterTreeNode(element, extTreeItem, parentNode) {
         const node = this.createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this.elements.has(node.item.handle))) {
-            throw ( new Error(( localize(2512, 'Element with id {0} is already registered', extTreeItem.id))));
+            throw ( new Error(( localize(2552, 'Element with id {0} is already registered', extTreeItem.id))));
         }
         this.addNodeToCache(element, node);
         this.addNodeToParentCache(node, parentNode);

package/vscode/src/vs/workbench/api/common/extHostTunnelService.js

@@ -148,12 +148,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localize(2513, "Private")),
+                            label: ( localize(2553, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localize(2514, "Public")),
+                            label: ( localize(2554, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts

@@ -19,7 +19,7 @@ import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from "../
 import { ProgressLocation as MainProgressLocation } from "../../../platform/progress/common/progress.js";
 import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
-import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/chatAgents.js";
+import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRequestDraft } from "../../contrib/chat/common/chatEditingService.js";
 import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from "../../contrib/chat/common/chatService.js";
@@ -35,6 +35,7 @@ import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
 import * as extHostProtocol from "./extHost.protocol.js";
 import { CommandsConverter } from "./extHostCommands.js";
 import * as types from "./extHostTypes.js";
+import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 export declare namespace Command {
     interface ICommandsConverter {
         fromInternal(command: extHostProtocol.ICommandDto): vscode.Command | undefined;
@@ -441,6 +442,10 @@ export declare namespace LanguageModelChatMessage {
     function to(message: chatProvider.IChatMessage): vscode.LanguageModelChatMessage;
     function from(message: vscode.LanguageModelChatMessage): chatProvider.IChatMessage;
 }
+export declare namespace LanguageModelChatMessage2 {
+    function to(message: chatProvider.IChatMessage): vscode.LanguageModelChatMessage2;
+    function from(message: vscode.LanguageModelChatMessage2): chatProvider.IChatMessage;
+}
 export declare namespace ChatResponseMarkdownPart {
     function from(part: vscode.ChatResponseMarkdownPart): Dto<IChatMarkdownContent>;
     function to(part: Dto<IChatMarkdownContent>): vscode.ChatResponseMarkdownPart;
@@ -509,10 +514,10 @@ export declare namespace ChatResponsePart {
     function toContent(part: extHostProtocol.IChatContentProgressDto, commandsConverter: CommandsConverter): vscode.ChatResponseMarkdownPart | vscode.ChatResponseFileTreePart | vscode.ChatResponseAnchorPart | vscode.ChatResponseCommandButtonPart | undefined;
 }
 export declare namespace ChatAgentRequest {
-    function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, hasReadonlyProposal: boolean, diagnostics: readonly [
+    function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [
         vscode.Uri,
         readonly vscode.Diagnostic[]
-    ][]): vscode.ChatRequest;
+    ][], tools: vscode.LanguageModelToolInformation[] | undefined): vscode.ChatRequest;
 }
 export declare namespace ChatRequestDraft {
     function to(request: IChatRequestDraft): vscode.ChatRequestDraft;
@@ -522,7 +527,7 @@ export declare namespace ChatLocation {
     function from(loc: types.ChatLocation): ChatAgentLocation;
 }
 export declare namespace ChatPromptReference {
-    function to(variable: IChatRequestVariableEntry, hasReadonlyProposal: boolean, diagnostics: readonly [
+    function to(variable: IChatRequestVariableEntry, diagnostics: readonly [
         vscode.Uri,
         readonly vscode.Diagnostic[]
     ][]): vscode.ChatPromptReference;

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -25,7 +25,6 @@ import { TrackedRangeStickiness, EndOfLineSequence } from '../../../editor/commo
 import { MarkerTag, MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { ProgressLocation as ProgressLocation$2 } from '../../../platform/progress/common/progress.js';
 import { SaveReason, DEFAULT_EDITOR_ASSOCIATION } from '../../common/editor.js';
-import { ChatAgentLocation } from '../../contrib/chat/common/chatAgents.js';
 import { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState } from '../../contrib/debug/common/debug.js';
 import { CellEditType, NotebookCellExecutionState as NotebookCellExecutionState$1, CellKind, CellStatusbarAlignment } from '../../contrib/notebook/common/notebookCommon.js';
@@ -34,7 +33,8 @@ import { TestMessageType, namespaceTestTag, denamespaceTestTag, TestRunProfileBi
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Location as Location$1, StandardTokenType as StandardTokenType$1, DiagnosticTag as DiagnosticTag$1, Diagnostic as Diagnostic$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, DecorationRangeBehavior as DecorationRangeBehavior$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, EndOfLine as EndOfLine$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookCellKind as NotebookCellKind$1, NotebookCellData as NotebookCellData$1, NotebookData as NotebookData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Location as Location$1, StandardTokenType as StandardTokenType$1, DiagnosticTag as DiagnosticTag$1, Diagnostic as Diagnostic$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, DecorationRangeBehavior as DecorationRangeBehavior$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$2, SymbolTag as SymbolTag$1, SymbolInformation, DocumentSymbol as DocumentSymbol$1, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionTriggerKind as CompletionTriggerKind$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, InlayHintLabelPart as InlayHintLabelPart$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, SelectionRange as SelectionRange$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, EndOfLine as EndOfLine$1, ProgressLocation as ProgressLocation$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookRange as NotebookRange$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookCellKind as NotebookCellKind$1, NotebookCellData as NotebookCellData$1, NotebookData as NotebookData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, TestMessage as TestMessage$1, TestRunProfileKind as TestRunProfileKind$1, TestTag as TestTag$1, StatementCoverage, BranchCoverage, DeclarationCoverage, validateTestCoverageCount, FileCoverage, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, DataTransfer as DataTransfer$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, LanguageModelTextPart, LanguageModelPromptTsxPart, LanguageModelToolResultPart, LanguageModelToolCallPart, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelDataPart, LanguageModelChatMessage2 as LanguageModelChatMessage2$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseMovePart as ChatResponseMovePart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatLocation as ChatLocation$1, ChatReferenceBinaryData, ChatReferenceDiagnostic, LanguageModelToolResult as LanguageModelToolResult$1, ChatEditingSessionActionOutcome, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1 } from './extHostTypes.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 
 var Selection;
 (function (Selection) {
@@ -2167,10 +2167,13 @@ var LanguageModelChatMessage;
                 }));
                 return new LanguageModelToolResultPart(c.toolCallId, content, c.isError);
             }
+            else if (c.type === 'image_url') {
+                return undefined;
+            }
             else {
                 return new LanguageModelToolCallPart(c.toolCallId, c.name, c.parameters);
             }
-        }));
+        })).filter(c => c !== undefined);
         const role = LanguageModelChatMessageRole.to(message.role);
         const result = new LanguageModelChatMessage$1(role, content, message.name);
         return result;
@@ -2240,6 +2243,114 @@ var LanguageModelChatMessage;
     }
     LanguageModelChatMessage.from = from;
 })(LanguageModelChatMessage || (LanguageModelChatMessage = {}));
+var LanguageModelChatMessage2;
+(function (LanguageModelChatMessage2) {
+    function to(message) {
+        const content = ( message.content.map(c => {
+            if (c.type === 'text') {
+                return ( new LanguageModelTextPart(c.value));
+            }
+            else if (c.type === 'tool_result') {
+                const content = ( c.value.map(part => {
+                    if (part.type === 'text') {
+                        return new LanguageModelTextPart(part.value);
+                    }
+                    else {
+                        return new LanguageModelPromptTsxPart(part.value);
+                    }
+                }));
+                return new LanguageModelToolResultPart(c.toolCallId, content, c.isError);
+            }
+            else if (c.type === 'image_url') {
+                const value = {
+                    mimeType: c.value.mimeType,
+                    data: c.value.data.buffer,
+                };
+                return new LanguageModelDataPart(value);
+            }
+            else {
+                return new LanguageModelToolCallPart(c.toolCallId, c.name, c.parameters);
+            }
+        }));
+        const role = LanguageModelChatMessageRole.to(message.role);
+        const result = new LanguageModelChatMessage2$1(role, content, message.name);
+        return result;
+    }
+    LanguageModelChatMessage2.to = to;
+    function from(message) {
+        const role = LanguageModelChatMessageRole.from(message.role);
+        const name = message.name;
+        let messageContent = message.content;
+        if (typeof messageContent === 'string') {
+            messageContent = [new LanguageModelTextPart(messageContent)];
+        }
+        const content = ( messageContent.map((c) => {
+            if (c instanceof LanguageModelToolResultPart) {
+                return {
+                    type: 'tool_result',
+                    toolCallId: c.callId,
+                    value: coalesce(( c.content.map(part => {
+                        if (part instanceof LanguageModelTextPart) {
+                            return {
+                                type: 'text',
+                                value: part.value
+                            };
+                        }
+                        else if (part instanceof LanguageModelPromptTsxPart) {
+                            return {
+                                type: 'prompt_tsx',
+                                value: part.value,
+                            };
+                        }
+                        else {
+                            return undefined;
+                        }
+                    }))),
+                    isError: c.isError
+                };
+            }
+            else if (c instanceof LanguageModelDataPart) {
+                const value = {
+                    mimeType: c.value.mimeType,
+                    data: VSBuffer.wrap(c.value.data),
+                };
+                return {
+                    type: 'image_url',
+                    value: value
+                };
+            }
+            else if (c instanceof LanguageModelToolCallPart) {
+                return {
+                    type: 'tool_use',
+                    toolCallId: c.callId,
+                    name: c.name,
+                    parameters: c.input
+                };
+            }
+            else if (c instanceof LanguageModelTextPart) {
+                return {
+                    type: 'text',
+                    value: c.value
+                };
+            }
+            else {
+                if (typeof c !== 'string') {
+                    throw ( new Error('Unexpected chat message content type'));
+                }
+                return {
+                    type: 'text',
+                    value: c
+                };
+            }
+        }));
+        return {
+            role,
+            name,
+            content
+        };
+    }
+    LanguageModelChatMessage2.from = from;
+})(LanguageModelChatMessage2 || (LanguageModelChatMessage2 = {}));
 var ChatResponseMarkdownPart;
 (function (ChatResponseMarkdownPart) {
     function from(part) {
@@ -2260,11 +2371,12 @@ var ChatResponseCodeblockUriPart;
         return {
             kind: 'codeblockUri',
             uri: part.value,
+            isEdit: part.isEdit,
         };
     }
     ChatResponseCodeblockUriPart.from = from;
     function to(part) {
-        return new ChatResponseCodeblockUriPart$1(URI.revive(part.uri));
+        return new ChatResponseCodeblockUriPart$1(URI.revive(part.uri), part.isEdit);
     }
     ChatResponseCodeblockUriPart.to = to;
 })(ChatResponseCodeblockUriPart || (ChatResponseCodeblockUriPart = {}));
@@ -2630,24 +2742,32 @@ var ChatResponsePart;
 })(ChatResponsePart || (ChatResponsePart = {}));
 var ChatAgentRequest;
 (function (ChatAgentRequest) {
-    function to(request, location2, model, hasReadonlyProposal, diagnostics) {
+    function to(request, location2, model, diagnostics, tools) {
         const toolReferences = request.variables.variables.filter(v => v.isTool);
         const variableReferences = request.variables.variables.filter(v => !v.isTool);
-        return {
+        const requestWithoutId = {
             prompt: request.message,
             command: request.command,
             attempt: request.attempt ?? 0,
             enableCommandDetection: request.enableCommandDetection ?? true,
             isParticipantDetected: request.isParticipantDetected ?? false,
-            references: ( variableReferences.map(v => ChatPromptReference.to(v, hasReadonlyProposal, diagnostics))),
+            references: ( variableReferences.map(v => ChatPromptReference.to(v, diagnostics))),
             toolReferences: ( toolReferences.map(ChatLanguageModelToolReference.to)),
             location: ChatLocation.to(request.location),
             acceptedConfirmationData: request.acceptedConfirmationData,
             rejectedConfirmationData: request.rejectedConfirmationData,
             location2,
             toolInvocationToken: ( Object.freeze({ sessionId: request.sessionId })),
+            tools,
             model
         };
+        if (request.requestId) {
+            return {
+                ...requestWithoutId,
+                id: request.requestId
+            };
+        }
+        return requestWithoutId;
     }
     ChatAgentRequest.to = to;
 })(ChatAgentRequest || (ChatAgentRequest = {}));
@@ -2686,7 +2806,7 @@ var ChatLocation;
 })(ChatLocation || (ChatLocation = {}));
 var ChatPromptReference;
 (function (ChatPromptReference) {
-    function to(variable, hasReadonlyProposal, diagnostics) {
+    function to(variable, diagnostics) {
         let value = variable.value;
         if (!value) {
             throw ( new Error('Invalid value reference'));
@@ -2698,7 +2818,8 @@ var ChatPromptReference;
             value = Location.to(revive(value));
         }
         else if (variable.isImage) {
-            value = new ChatReferenceBinaryData(variable.mimeType ?? 'image/png', () => Promise.resolve(( new Uint8Array(( Object.values(variable.value))))), variable.references && URI.isUri(variable.references[0].reference) ? variable.references[0].reference : undefined);
+            const ref = variable.references?.[0]?.reference;
+            value = new ChatReferenceBinaryData(variable.mimeType ?? 'image/png', () => Promise.resolve(( new Uint8Array(( Object.values(variable.value))))), ref && URI.isUri(ref) ? ref : undefined);
         }
         else if (variable.kind === 'diagnostic') {
             const filterSeverity = variable.filterSeverity && DiagnosticSeverity.to(variable.filterSeverity);
@@ -2724,7 +2845,6 @@ var ChatPromptReference;
             range: variable.range && [variable.range.start, variable.range.endExclusive],
             value,
             modelDescription: variable.modelDescription,
-            isReadonly: hasReadonlyProposal ? variable.isMarkedReadonly : undefined,
         };
     }
     ChatPromptReference.to = to;
@@ -2986,4 +3106,4 @@ var IconPath;
     IconPath.fromThemeIcon = fromThemeIcon;
 })(IconPath || (IconPath = {}));
 
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestDraft, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageSelector, Location, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalQuickFix, TerminalResourceRequestConfig, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestDraft, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageModelToolResult, LanguageSelector, Location, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalQuickFix, TerminalResourceRequestConfig, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };