Skip to content

Commit c1f2a3b

Browse files
author
Loïc Mangeonjean
committed
lib: update to VSCode 1.109.3
1 parent 2a649f0 commit c1f2a3b

9 files changed

Lines changed: 45 additions & 32 deletions

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"config": {
3232
"vscode": {
33-
"version": "1.109.2",
34-
"ref": "1.109.2",
35-
"commit": "591199df409fbf59b4b52d5ad4ee0470152a9b31"
33+
"version": "1.109.3",
34+
"ref": "b6a47e94e326b5c209d118cf0f994d6065585705",
35+
"commit": "b6a47e94e326b5c209d118cf0f994d6065585705"
3636
},
3737
"monaco": {
3838
"ref": "v0.55.1",

‎src/extension.api.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,8 @@ const api: typeof vscode = {
377377
ChatQuestion: extHostTypes.ChatQuestion,
378378
ChatResponseQuestionCarouselPart: extHostTypes.ChatResponseQuestionCarouselPart,
379379
McpToolInvocationContentData: extHostTypes.McpToolInvocationContentData,
380-
ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2
380+
ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2,
381+
ChatResponseHookPart: extHostTypes.ChatResponseHookPart
381382
}
382383

383384
// @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config

‎src/missing-services.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,11 @@ import { IChatEditingExplanationModelManager } from 'vs/workbench/contrib/chat/b
436436
import { IChatStatusItemService } from 'vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service'
437437
import { IChatTipService } from 'vs/workbench/contrib/chat/browser/chatTipService.service.js'
438438
import { IChatContextService } from 'vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service'
439+
import { ICodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service'
439440
import { IChatToolOutputStateCache } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service'
440441
import { IChatModeService } from 'vs/workbench/contrib/chat/common/chatModes.service'
441442
import { ILanguageModelsConfigurationService } from 'vs/workbench/contrib/chat/common/languageModelsConfiguration.service.js'
443+
import { Target } from 'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.js'
442444
import { ILanguageModelToolsConfirmationService } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service'
443445
import {
444446
ToolDataSource,
@@ -457,7 +459,6 @@ import { IInlineCompletionsUnificationService } from 'vs/workbench/services/inli
457459
import { DefaultWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.js'
458460
import { IWorkbenchModeService } from 'vs/workbench/services/layout/common/workbenchModeService.service.js'
459461
import { IUserAttentionService } from 'vs/workbench/services/userAttention/common/userAttentionService.service'
460-
import { ICodeCompareModelService } from 'vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service'
461462
import {
462463
getBuiltInExtensionTranslationsUris,
463464
getExtensionIdProvidingCurrentLocale
@@ -3339,6 +3340,15 @@ class ChatService implements IChatService {
33393340
Event.None
33403341
@Unsupported
33413342
notifyQuestionCarouselAnswer: IChatService['notifyQuestionCarouselAnswer'] = unsupported
3343+
3344+
@Unsupported
3345+
setYieldRequested: IChatService['setYieldRequested'] = unsupported
3346+
@Unsupported
3347+
removePendingRequest: IChatService['removePendingRequest'] = unsupported
3348+
@Unsupported
3349+
setPendingRequests: IChatService['setPendingRequests'] = unsupported
3350+
@Unsupported
3351+
processPendingRequests: IChatService['processPendingRequests'] = unsupported
33423352
}
33433353
registerSingleton(IChatService, ChatService, InstantiationType.Delayed)
33443354
class ChatMarkdownAnchorService implements IChatMarkdownAnchorService {
@@ -3409,6 +3419,8 @@ class QuickChatAgentService implements IChatAgentService {
34093419
getChatSummary: IChatAgentService['getChatSummary'] = async () => undefined
34103420
@Unsupported
34113421
setRequestTools: IChatAgentService['setRequestTools'] = unsupported
3422+
@Unsupported
3423+
setYieldRequested: IChatAgentService['setYieldRequested'] = unsupported
34123424
}
34133425
registerSingleton(IChatAgentService, QuickChatAgentService, InstantiationType.Delayed)
34143426
class ChatAgentNameService implements IChatAgentNameService {
@@ -5593,12 +5605,12 @@ class PromptsService implements IPromptsService {
55935605
@Unsupported
55945606
getPromptLocationLabel: IPromptsService['getPromptLocationLabel'] = unsupported
55955607

5596-
findAgentMDsInWorkspace: IPromptsService['findAgentMDsInWorkspace'] = async () => []
5608+
getHooks: IPromptsService['getHooks'] = async () => undefined
55975609

55985610
onDidChangeCustomAgents: IPromptsService['onDidChangeCustomAgents'] = Event.None
55995611
getCustomAgents: IPromptsService['getCustomAgents'] = async () => []
5600-
listAgentMDs: IPromptsService['listAgentMDs'] = async () => []
5601-
listCopilotInstructionsMDs: IPromptsService['listCopilotInstructionsMDs'] = async () => []
5612+
listNestedAgentMDs: IPromptsService['listNestedAgentMDs'] = async () => []
5613+
listAgentInstructions: IPromptsService['listAgentInstructions'] = async () => []
56025614
getAgentFileURIFromModeFile: IPromptsService['getAgentFileURIFromModeFile'] = () => undefined
56035615
getDisabledPromptFiles: IPromptsService['getDisabledPromptFiles'] = () => new ResourceSet()
56045616
@Unsupported
@@ -6090,7 +6102,7 @@ class ChatSessionsService implements IChatSessionsService {
60906102

60916103
getChatSessionItems: IChatSessionsService['getChatSessionItems'] = async () => []
60926104
getCustomAgentTargetForSessionType: IChatSessionsService['getCustomAgentTargetForSessionType'] =
6093-
() => undefined
6105+
() => Target.Undefined
60946106
onRequestNotifyExtension: IChatSessionsService['onRequestNotifyExtension'] = Event.None
60956107
}
60966108
registerSingleton(IChatSessionsService, ChatSessionsService, InstantiationType.Delayed)

‎vscode-patches/0005-feat-add-static-asset-url-mechanism.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ index 4cfaf6a58cb..b7f63a0d276 100644
119119

120120
class ExtensionHostProxy implements IExtensionHostProxy {
121121
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
122-
index 3ea06f3076a..4a47e80969d 100644
122+
index 7f7f3795aab..1d33ee29d44 100644
123123
--- a/src/vs/workbench/api/common/extHost.protocol.ts
124124
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
125-
@@ -1694,6 +1694,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
125+
@@ -1695,6 +1695,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
126126
$onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void;
127127
$setPerformanceMarks(marks: performance.PerformanceMark[]): Promise<void>;
128128
$asBrowserUri(uri: UriComponents): Promise<UriComponents>;

‎vscode-patches/0048-fix-extract-constants-into-separate-module.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ so that only the constant is pulled from the root instead of the whole module gr
1717
create mode 100644 src/vs/workbench/contrib/chat/browser/widget/input/editor/chatDynamicVariablesConstant.ts
1818

1919
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
20-
index 9d81f730ba1..4069119c604 100644
20+
index cc26ee5bc09..8320b15ea44 100644
2121
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
2222
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
2323
@@ -24,10 +24,10 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in
@@ -40,7 +40,7 @@ index 9d81f730ba1..4069119c604 100644
4040

4141
interface AgentData {
4242
dispose: () => void;
43-
@@ -413,7 +414,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
43+
@@ -416,7 +417,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
4444
kind: CompletionItemKind.Text,
4545
detail: v.detail,
4646
documentation: v.documentation,

‎vscode-patches/0061-feat-support-shadow-dom.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,10 +827,10 @@ index 7796aae8a15..1c304a11a9e 100644
827827

828828
private createPart(id: string, role: string, classes: string[]): HTMLElement {
829829
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
830-
index bcf805169da..2447a3ba087 100644
830+
index 0a8dbaa2946..21d996c8f58 100644
831831
--- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
832832
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
833-
@@ -2349,7 +2349,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
833+
@@ -2363,7 +2363,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
834834

835835
attachments.unshift(toolbar);
836836

‎vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4023,7 +4023,7 @@ index 8d857959c86..796403f8821 100644
40234023
elements.editor.appendChild(titleEl);
40244024

40254025
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
4026-
index eaa071c1b8d..c9bfe4d88ef 100644
4026+
index 220ce16af33..e5a3d492cac 100644
40274027
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts
40284028
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts
40294029
@@ -83,7 +83,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
@@ -4035,7 +4035,7 @@ index eaa071c1b8d..c9bfe4d88ef 100644
40354035
this.domNode.appendChild(subPartDomNode);
40364036

40374037
const render = () => {
4038-
@@ -114,7 +114,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
4038+
@@ -116,7 +116,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
40394039
return !!outcome && outcome.type !== ToolConfirmKind.Denied && outcome.type !== ToolConfirmKind.Skipped;
40404040
});
40414041

@@ -4045,7 +4045,7 @@ index eaa071c1b8d..c9bfe4d88ef 100644
40454045

40464046
this._register(autorun(r => {
40474047
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
4048-
index 9e35ac04658..0731d25a19c 100644
4048+
index 96c8fd5f7c7..d6c18554182 100644
40494049
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
40504050
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
40514051
@@ -45,14 +45,14 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
@@ -4062,9 +4062,9 @@ index 9e35ac04658..0731d25a19c 100644
40624062
} else {
40634063
- const container = document.createElement('div');
40644064
+ const container = dom.createElement('div');
4065-
const progressObservable = this.toolInvocation.kind === 'toolInvocation' ? this.toolInvocation.state.map((s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined) : undefined;
40664065
this._register(autorun(reader => {
4067-
const progress = progressObservable?.read(reader);
4066+
let progressContent: IMarkdownString | string | undefined;
4067+
const key = this.getAnnouncementKey('progress');
40684068
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
40694069
index 3e3e3cc12d0..e2b64b5c160 100644
40704070
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.ts
@@ -4101,10 +4101,10 @@ index fa166677003..6564efe8bcf 100644
41014101
this.updateOverlayStyles(overlay);
41024102
overlayContainer.appendChild(overlay);
41034103
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
4104-
index 6e746f80622..a07bc354e8b 100644
4104+
index 31da6c398a7..25a67354235 100644
41054105
--- a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
41064106
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
4107-
@@ -534,7 +534,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
4107+
@@ -547,7 +547,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
41084108
this.hoverService.hideHover();
41094109
}
41104110
}));
@@ -4114,10 +4114,10 @@ index 6e746f80622..a07bc354e8b 100644
41144114
const template: IChatListItemTemplate = { header, avatarContainer, requestHover, username, detail, value, rowContainer, elementDisposables, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover, titleToolbar, footerToolbar, footerDetailsContainer, disabledOverlay, checkpointToolbar, checkpointRestoreToolbar, checkpointContainer, checkpointRestoreContainer };
41154115

41164116
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
4117-
index 11d2b3e74c7..e0f4c0d1c0a 100644
4117+
index 009d3708cf0..a99d8ca65da 100644
41184118
--- a/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
41194119
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
4120-
@@ -275,7 +275,7 @@ export class ChatListWidget extends Disposable {
4120+
@@ -276,7 +276,7 @@ export class ChatListWidget extends Disposable {
41214121
this._renderStyle = options.renderStyle;
41224122

41234123
// Create overflow widgets container
@@ -4127,10 +4127,10 @@ index 11d2b3e74c7..e0f4c0d1c0a 100644
41274127
overflowWidgetsContainer.classList.add('chat-overflow-widget-container', 'monaco-editor');
41284128
this._container.append(overflowWidgetsContainer);
41294129
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
4130-
index 583ccb00c61..8238a6a0278 100644
4130+
index 9ede2b135ef..58bda047774 100644
41314131
--- a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
41324132
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
4133-
@@ -1367,7 +1367,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
4133+
@@ -1359,7 +1359,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
41344134

41354135
private createList(listContainer: HTMLElement, options: IChatListItemRendererOptions): void {
41364136
// Create a dom element to hold UI from editor widgets embedded in chat messages

‎vscode-patches/0086-fix-make-product-field-optional.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ index 0e1160d71e4..62bf1facfe7 100644
107107
}
108108
}));
109109
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
110-
index 8238a6a0278..7482298bba3 100644
110+
index 58bda047774..b33b399ad86 100644
111111
--- a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
112112
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
113-
@@ -816,8 +816,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
113+
@@ -818,8 +818,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
114114
const defaultAgent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind);
115115
let additionalMessage: string | IMarkdownString | undefined;
116116
if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {

‎vscode-patches/0090-refactor-only-import-chat-related-stuff-from-chat-co.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ Subject: [PATCH] refactor: only import chat-related stuff from chat
1010
2 files changed, 1 insertion(+), 1 deletion(-)
1111

1212
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
13-
index d211a1d0929..6701ae6702e 100644
13+
index 87d0a4ebb32..e88ed04c231 100644
1414
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
1515
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
16-
@@ -137,6 +137,7 @@ import { ChatWindowNotifier } from './chatWindowNotifier.js';
17-
import { ChatRepoInfoContribution } from './chatRepoInfo.js';
16+
@@ -143,6 +143,7 @@ import { ChatRepoInfoContribution } from './chatRepoInfo.js';
1817
import { VALID_PROMPT_FOLDER_PATTERN } from '../common/promptSyntax/utils/promptFilesLocator.js';
1918
import { ChatTipService, IChatTipService } from './chatTipService.js';
20-
+import '../../notebook/browser/controller/chat/notebook.chat.contribution.js'
19+
import { ChatQueuePickerRendering } from './widget/input/chatQueuePickerActionItem.js';
20+
+import '../../notebook/browser/controller/chat/notebook.chat.contribution.js';
2121

2222
const toolReferenceNameEnumValues: string[] = [];
2323
const toolReferenceNameEnumDescriptions: string[] = [];

0 commit comments

Comments
 (0)