Skip to content

Commit bdc3836

Browse files
committed
dispose MockPromptsService
1 parent 7276d3c commit bdc3836

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

extensions/copilot/src/extension/chatSessions/copilotcli/node/test/copilotCLISkills.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('CopilotCLISkills', () => {
6969
? new class extends NullNativeEnvService { override get userHome() { return options.userHome!; } }()
7070
: new NullNativeEnvService();
7171

72-
const promptsService = new MockPromptsService();
72+
const promptsService = disposables.add(new MockPromptsService());
7373
if (options?.skills) {
7474
promptsService.setSkills(options.skills);
7575
}
@@ -239,7 +239,7 @@ describe('CopilotCLISkills', () => {
239239
const configService = new InMemoryConfigurationService(baseConfigurationService);
240240
configService.setNonExtensionConfig(SKILLS_LOCATION_KEY, 'not-an-object');
241241

242-
const mockPromptsService = new MockPromptsService();
242+
const mockPromptsService = disposables.add(new MockPromptsService());
243243
const skillsService = new CopilotCLISkillsConstructor(
244244
logService,
245245
{} as unknown,

extensions/copilot/src/extension/chatSessions/copilotcli/node/test/copilotCliAgents.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ describe('CopilotCLIAgents', () => {
9898
}
9999

100100
function createAgents(options: { sdkAgentsByCall: ReadonlyArray<ReadonlyArray<SweCustomAgent>>; customAgents?: PromptFileInfo[] }): { agents: CopilotCLIAgents; promptsService: MockPromptsService; sdk: ICopilotCLISDK } {
101-
const promptsService = new MockPromptsService();
101+
const promptsService = disposables.add(new MockPromptsService());
102102
if (options.customAgents) {
103103
const customAgents = [];
104104
for (const ca of options.customAgents) {

extensions/copilot/src/extension/chatSessions/copilotcli/node/test/copilotCliSessionService.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ describe('CopilotCLISessionService', () => {
153153
const configurationService = accessor.get(IConfigurationService);
154154
const nullMcpServer = disposables.add(new NullMcpService());
155155
const titleService = new NullCustomSessionTitleService();
156-
service = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), cliAgents, workspaceService, titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
156+
service = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), cliAgents, workspaceService, titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
157157
manager = await service.getSessionManager() as unknown as MockCliSdkSessionManager;
158158
});
159159

@@ -356,7 +356,7 @@ describe('CopilotCLISessionService', () => {
356356
return undefined;
357357
}
358358
}();
359-
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
359+
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
360360

361361
await mkdir(sessionDir.fsPath, { recursive: true });
362362
await writeNodeFile(join(sessionDir.fsPath, 'events.jsonl'), [
@@ -391,7 +391,7 @@ describe('CopilotCLISessionService', () => {
391391
const delegationService = new class extends mock<IChatDelegationSummaryService>() {
392392
override extractPrompt(): { prompt: string; reference: never } | undefined { return undefined; }
393393
}();
394-
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
394+
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
395395

396396
await mkdir(sessionDir.fsPath, { recursive: true });
397397
const eventsFilePath = join(sessionDir.fsPath, 'events.jsonl');
@@ -460,7 +460,7 @@ describe('CopilotCLISessionService', () => {
460460
return undefined;
461461
}
462462
}();
463-
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
463+
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
464464
const partialManager = await partialService.getSessionManager() as unknown as MockCliSdkSessionManager;
465465

466466
const session = new MockCliSdkSession(sessionId, new Date('2024-01-01T00:00:00.000Z'));
@@ -502,7 +502,7 @@ describe('CopilotCLISessionService', () => {
502502
const delegationService = new class extends mock<IChatDelegationSummaryService>() {
503503
override extractPrompt(): { prompt: string; reference: never } | undefined { return undefined; }
504504
}();
505-
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
505+
const partialService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), titleService, configurationService, new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
506506
const partialManager = await partialService.getSessionManager() as unknown as MockCliSdkSessionManager;
507507

508508
// Session has a summary with '<' (which forces the session-load fallback path)
@@ -753,7 +753,7 @@ describe('CopilotCLISessionService', () => {
753753
const delegationService = new class extends mock<IChatDelegationSummaryService>() {
754754
override extractPrompt(): { prompt: string; reference: never } | undefined { return undefined; }
755755
}();
756-
const localService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), new NullCustomSessionTitleService(), configurationService, new MockSkillLocations(), delegationService, metadataStore, new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
756+
const localService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), new NullCustomSessionTitleService(), configurationService, new MockSkillLocations(), delegationService, metadataStore, new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
757757
const localManager = await localService.getSessionManager() as unknown as MockCliSdkSessionManager;
758758
localManager.sessions.set(sourceId, new MockCliSdkSession(sourceId, new Date()));
759759

@@ -797,7 +797,7 @@ describe('CopilotCLISessionService', () => {
797797
}();
798798
const metadataStore = new MockChatSessionMetadataStore();
799799
await metadataStore.updateRequestDetails(sourceId, [{ vscodeRequestId: 'vsc-req-1', copilotRequestId: 'sdk-event-1', toolIdEditMap: {} }]);
800-
const localService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), new NullCustomSessionTitleService(), configurationService, new MockSkillLocations(), delegationService, metadataStore, new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
800+
const localService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), new MockFileSystemService(), new CopilotCLIMCPHandler(logService, authService, configurationService, nullMcpServer), new NullCopilotCLIAgents(), new NullWorkspaceService(), new NullCustomSessionTitleService(), configurationService, new MockSkillLocations(), delegationService, metadataStore, new NullAgentSessionsWorkspace(), new NullChatSessionWorkspaceFolderService(), new NullChatSessionWorktreeService(), new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
801801
const localManager = await localService.getSessionManager() as unknown as MockCliSdkSessionManager;
802802
localManager.sessions.set(sourceId, sdkSession);
803803
const forkSpy = vi.spyOn(localManager, 'forkSession');

extensions/copilot/src/extension/chatSessions/vscode-node/test/claudeCustomizationProvider.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('ClaudeCustomizationProvider', () => {
9999
(vscode as Record<string, unknown>).ChatSessionCustomizationType = FakeChatSessionCustomizationType;
100100
disposables = new DisposableStore();
101101
mockRuntimeDataService = disposables.add(new MockRuntimeDataService());
102-
mockPromptsService = new MockPromptsService();
102+
mockPromptsService = disposables.add(new MockPromptsService());
103103
mockWorkspaceService = new MockWorkspaceService();
104104
mockFileSystemService = new MockFileSystemService();
105105
provider = disposables.add(new ClaudeCustomizationProvider(

extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLIChatSessionParticipant.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
398398
}
399399
} as unknown as IInstantiationService;
400400
customSessionTitleService = new CustomSessionTitleService(new MockExtensionContext() as unknown as IVSCodeExtensionContext, accessor.get(IInstantiationService), logService, new MockChatSessionMetadataStore());
401-
sessionService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, mcpHandler, new NullCopilotCLIAgents(), workspaceService, customSessionTitleService, accessor.get(IConfigurationService), new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), { _serviceBrand: undefined, isAgentSessionsWorkspace: false } as IAgentSessionsWorkspace, workspaceFolderService, worktree, new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), new MockPromptsService()));
401+
sessionService = disposables.add(new CopilotCLISessionService(logService, sdk, instantiationService, new NullNativeEnvService(), fileSystem, mcpHandler, new NullCopilotCLIAgents(), workspaceService, customSessionTitleService, accessor.get(IConfigurationService), new MockSkillLocations(), delegationService, new MockChatSessionMetadataStore(), { _serviceBrand: undefined, isAgentSessionsWorkspace: false } as IAgentSessionsWorkspace, workspaceFolderService, worktree, new NoopOTelService(resolveOTelConfig({ env: {}, extensionVersion: '0.0.0', sessionId: 'test' })), new NullPromptVariablesService(), new NullChatDebugFileLoggerService(), disposables.add(new MockPromptsService())));
402402

403403
manager = await sessionService.getSessionManager() as unknown as MockCliSdkSessionManager;
404404
contentProvider = new class extends mock<CopilotCLIChatSessionContentProvider>() {
@@ -436,7 +436,7 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
436436
workspaceFolderService,
437437
telemetry,
438438
logger,
439-
new MockPromptsService(),
439+
disposables.add(new MockPromptsService()),
440440
delegationService,
441441
folderRepositoryManager,
442442
configurationService,
@@ -794,7 +794,7 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
794794
workspaceFolderService,
795795
telemetry,
796796
logService,
797-
new MockPromptsService(),
797+
disposables.add(new MockPromptsService()),
798798
new class extends mock<IChatDelegationSummaryService>() {
799799
override async summarize(_context: vscode.ChatContext, _token: vscode.CancellationToken): Promise<string | undefined> {
800800
return undefined;
@@ -1907,7 +1907,7 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
19071907
workspaceFolderService,
19081908
telemetry,
19091909
logService,
1910-
new MockPromptsService(),
1910+
disposables.add(new MockPromptsService()),
19111911
nullDelegationService,
19121912
folderRepositoryManager,
19131913
configurationService,
@@ -2040,7 +2040,7 @@ describe('CopilotCLIChatSessionParticipant.handleRequest', () => {
20402040
workspaceFolderService,
20412041
telemetry,
20422042
logService,
2043-
new MockPromptsService(),
2043+
disposables.add(new MockPromptsService()),
20442044
new (mock<IChatDelegationSummaryService>())(),
20452045
folderRepositoryManager,
20462046
configurationService,

extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLICustomizationProvider.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ describe('CopilotCLICustomizationProvider', () => {
109109
originalChatSessionCustomizationType = (vscode as Record<string, unknown>).ChatSessionCustomizationType;
110110
(vscode as Record<string, unknown>).ChatSessionCustomizationType = FakeChatSessionCustomizationType;
111111
disposables = new DisposableStore();
112-
mockPromptsService = new MockPromptsService();
112+
mockPromptsService = disposables.add(new MockPromptsService());
113113
mockCopilotCLIAgents = disposables.add(new MockCopilotCLIAgents());
114114
mockCustomInstructionsService = new TestCustomInstructionsService();
115115
provider = disposables.add(new CopilotCLICustomizationProvider(

0 commit comments

Comments
 (0)