diff --git a/package.json b/package.json index 28c7c3ee..de7dd139 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,9 @@ }, "config": { "vscode": { - "version": "1.109.2", - "ref": "1.109.2", - "commit": "591199df409fbf59b4b52d5ad4ee0470152a9b31" + "version": "1.109.3", + "ref": "b6a47e94e326b5c209d118cf0f994d6065585705", + "commit": "b6a47e94e326b5c209d118cf0f994d6065585705" }, "monaco": { "ref": "v0.55.1", diff --git a/src/extension.api.ts b/src/extension.api.ts index 84a7f1fc..e4ee3c78 100644 --- a/src/extension.api.ts +++ b/src/extension.api.ts @@ -377,7 +377,8 @@ const api: typeof vscode = { ChatQuestion: extHostTypes.ChatQuestion, ChatResponseQuestionCarouselPart: extHostTypes.ChatResponseQuestionCarouselPart, McpToolInvocationContentData: extHostTypes.McpToolInvocationContentData, - ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2 + ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2, + ChatResponseHookPart: extHostTypes.ChatResponseHookPart } // @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config diff --git a/src/missing-services.ts b/src/missing-services.ts index f233d45f..2c5bb0e3 100644 --- a/src/missing-services.ts +++ b/src/missing-services.ts @@ -436,9 +436,11 @@ import { IChatEditingExplanationModelManager } from 'vs/workbench/contrib/chat/b import { IChatStatusItemService } from 'vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service' import { IChatTipService } from 'vs/workbench/contrib/chat/browser/chatTipService.service.js' import { IChatContextService } from 'vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service' +import { ICodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service' import { IChatToolOutputStateCache } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service' import { IChatModeService } from 'vs/workbench/contrib/chat/common/chatModes.service' import { ILanguageModelsConfigurationService } from 'vs/workbench/contrib/chat/common/languageModelsConfiguration.service.js' +import { Target } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.js' import { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service' import { ToolDataSource, @@ -457,7 +459,6 @@ import { IInlineCompletionsUnificationService } from 'vs/workbench/services/inli import { DefaultWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.js' import { IWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.service.js' import { IUserAttentionService } from 'vs/workbench/services/userAttention/common/userAttentionService.service' -import { ICodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service' import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale @@ -3339,6 +3340,15 @@ class ChatService implements IChatService { Event.None @Unsupported notifyQuestionCarouselAnswer: IChatService['notifyQuestionCarouselAnswer'] = unsupported + + @Unsupported + setYieldRequested: IChatService['setYieldRequested'] = unsupported + @Unsupported + removePendingRequest: IChatService['removePendingRequest'] = unsupported + @Unsupported + setPendingRequests: IChatService['setPendingRequests'] = unsupported + @Unsupported + processPendingRequests: IChatService['processPendingRequests'] = unsupported } registerSingleton(IChatService, ChatService, InstantiationType.Delayed) class ChatMarkdownAnchorService implements IChatMarkdownAnchorService { @@ -3409,6 +3419,8 @@ class QuickChatAgentService implements IChatAgentService { getChatSummary: IChatAgentService['getChatSummary'] = async () => undefined @Unsupported setRequestTools: IChatAgentService['setRequestTools'] = unsupported + @Unsupported + setYieldRequested: IChatAgentService['setYieldRequested'] = unsupported } registerSingleton(IChatAgentService, QuickChatAgentService, InstantiationType.Delayed) class ChatAgentNameService implements IChatAgentNameService { @@ -5593,12 +5605,12 @@ class PromptsService implements IPromptsService { @Unsupported getPromptLocationLabel: IPromptsService['getPromptLocationLabel'] = unsupported - findAgentMDsInWorkspace: IPromptsService['findAgentMDsInWorkspace'] = async () => [] + getHooks: IPromptsService['getHooks'] = async () => undefined onDidChangeCustomAgents: IPromptsService['onDidChangeCustomAgents'] = Event.None getCustomAgents: IPromptsService['getCustomAgents'] = async () => [] - listAgentMDs: IPromptsService['listAgentMDs'] = async () => [] - listCopilotInstructionsMDs: IPromptsService['listCopilotInstructionsMDs'] = async () => [] + listNestedAgentMDs: IPromptsService['listNestedAgentMDs'] = async () => [] + listAgentInstructions: IPromptsService['listAgentInstructions'] = async () => [] getAgentFileURIFromModeFile: IPromptsService['getAgentFileURIFromModeFile'] = () => undefined getDisabledPromptFiles: IPromptsService['getDisabledPromptFiles'] = () => new ResourceSet() @Unsupported @@ -6090,7 +6102,7 @@ class ChatSessionsService implements IChatSessionsService { getChatSessionItems: IChatSessionsService['getChatSessionItems'] = async () => [] getCustomAgentTargetForSessionType: IChatSessionsService['getCustomAgentTargetForSessionType'] = - () => undefined + () => Target.Undefined onRequestNotifyExtension: IChatSessionsService['onRequestNotifyExtension'] = Event.None } registerSingleton(IChatSessionsService, ChatSessionsService, InstantiationType.Delayed) diff --git a/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch b/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch index 88e72838..eb45094c 100644 --- a/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch +++ b/vscode-patches/0005-feat-add-static-asset-url-mechanism.patch @@ -119,10 +119,10 @@ index 4cfaf6a58cb..b7f63a0d276 100644 class ExtensionHostProxy implements IExtensionHostProxy { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts -index 3ea06f3076a..4a47e80969d 100644 +index 7f7f3795aab..1d33ee29d44 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts -@@ -1694,6 +1694,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { +@@ -1695,6 +1695,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable { $onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void; $setPerformanceMarks(marks: performance.PerformanceMark[]): Promise; $asBrowserUri(uri: UriComponents): Promise; diff --git a/vscode-patches/0048-fix-extract-constants-into-separate-module.patch b/vscode-patches/0048-fix-extract-constants-into-separate-module.patch index 25a2f5f2..992fa791 100644 --- a/vscode-patches/0048-fix-extract-constants-into-separate-module.patch +++ b/vscode-patches/0048-fix-extract-constants-into-separate-module.patch @@ -17,7 +17,7 @@ so that only the constant is pulled from the root instead of the whole module gr create mode 100644 src/vs/workbench/contrib/chat/browser/widget/input/editor/chatDynamicVariablesConstant.ts diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts -index 9d81f730ba1..4069119c604 100644 +index cc26ee5bc09..8320b15ea44 100644 --- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts +++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts @@ -24,10 +24,10 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in @@ -40,7 +40,7 @@ index 9d81f730ba1..4069119c604 100644 interface AgentData { dispose: () => void; -@@ -413,7 +414,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA +@@ -416,7 +417,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA kind: CompletionItemKind.Text, detail: v.detail, documentation: v.documentation, diff --git a/vscode-patches/0061-feat-support-shadow-dom.patch b/vscode-patches/0061-feat-support-shadow-dom.patch index 74dd7d44..374be78b 100644 --- a/vscode-patches/0061-feat-support-shadow-dom.patch +++ b/vscode-patches/0061-feat-support-shadow-dom.patch @@ -827,10 +827,10 @@ index 7796aae8a15..1c304a11a9e 100644 private createPart(id: string, role: string, classes: string[]): HTMLElement { diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts -index bcf805169da..2447a3ba087 100644 +index 0a8dbaa2946..21d996c8f58 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts -@@ -2349,7 +2349,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge +@@ -2363,7 +2363,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge attachments.unshift(toolbar); diff --git a/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch b/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch index 429b79ef..1863fbec 100644 --- a/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch +++ b/vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch @@ -4023,7 +4023,7 @@ index 8d857959c86..796403f8821 100644 elements.editor.appendChild(titleEl); diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts -index eaa071c1b8d..c9bfe4d88ef 100644 +index 220ce16af33..e5a3d492cac 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts @@ -83,7 +83,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa @@ -4035,7 +4035,7 @@ index eaa071c1b8d..c9bfe4d88ef 100644 this.domNode.appendChild(subPartDomNode); const render = () => { -@@ -114,7 +114,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa +@@ -116,7 +116,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa return !!outcome && outcome.type !== ToolConfirmKind.Denied && outcome.type !== ToolConfirmKind.Skipped; }); @@ -4045,7 +4045,7 @@ index eaa071c1b8d..c9bfe4d88ef 100644 this._register(autorun(r => { diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts -index 9e35ac04658..0731d25a19c 100644 +index 96c8fd5f7c7..d6c18554182 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts @@ -45,14 +45,14 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart { @@ -4062,9 +4062,9 @@ index 9e35ac04658..0731d25a19c 100644 } else { - const container = document.createElement('div'); + const container = dom.createElement('div'); - const progressObservable = this.toolInvocation.kind === 'toolInvocation' ? this.toolInvocation.state.map((s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined) : undefined; this._register(autorun(reader => { - const progress = progressObservable?.read(reader); + let progressContent: IMarkdownString | string | undefined; + const key = this.getAnnouncementKey('progress'); diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.ts index 3e3e3cc12d0..e2b64b5c160 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.ts @@ -4101,10 +4101,10 @@ index fa166677003..6564efe8bcf 100644 this.updateOverlayStyles(overlay); overlayContainer.appendChild(overlay); diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts -index 6e746f80622..a07bc354e8b 100644 +index 31da6c398a7..25a67354235 100644 --- a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts -@@ -534,7 +534,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer