Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion src/extension.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 17 additions & 5 deletions src/missing-services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions vscode-patches/0005-feat-add-static-asset-url-mechanism.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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<void>;
$asBrowserUri(uri: UriComponents): Promise<UriComponents>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions vscode-patches/0061-feat-support-shadow-dom.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
});

Expand All @@ -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 {
Expand All @@ -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
Expand Down Expand Up @@ -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<Ch
@@ -547,7 +547,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
this.hoverService.hideHover();
}
}));
Expand All @@ -4114,10 +4114,10 @@ index 6e746f80622..a07bc354e8b 100644
const template: IChatListItemTemplate = { header, avatarContainer, requestHover, username, detail, value, rowContainer, elementDisposables, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover, titleToolbar, footerToolbar, footerDetailsContainer, disabledOverlay, checkpointToolbar, checkpointRestoreToolbar, checkpointContainer, checkpointRestoreContainer };

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

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

private createList(listContainer: HTMLElement, options: IChatListItemRendererOptions): void {
// Create a dom element to hold UI from editor widgets embedded in chat messages
Expand Down
4 changes: 2 additions & 2 deletions vscode-patches/0086-fix-make-product-field-optional.patch
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ index 0e1160d71e4..62bf1facfe7 100644
}
}));
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
index 8238a6a0278..7482298bba3 100644
index 58bda047774..b33b399ad86 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
@@ -816,8 +816,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
@@ -818,8 +818,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
const defaultAgent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind);
let additionalMessage: string | IMarkdownString | undefined;
if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ Subject: [PATCH] refactor: only import chat-related stuff from chat
2 files changed, 1 insertion(+), 1 deletion(-)

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

const toolReferenceNameEnumValues: string[] = [];
const toolReferenceNameEnumDescriptions: string[] = [];
Expand Down