Skip to content

Commit d90a8a7

Browse files
DonJayamanneCopilot
DonJayamanne
and
Copilot
authored
Move files into Copilot CLI specific folders (#312266)
* Move files into Copilot CLI specific folders Co-authored-by: Copilot <copilot@github.com> * Fixes * Fixes * Fix tests --------- Co-authored-by: Copilot <copilot@github.com>
1 parent e2796aa commit d90a8a7

13 files changed

Lines changed: 109 additions & 109 deletions

extensions/copilot/src/extension/chatSessions/vscode-node/askUserQuestionHandler.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/askUserQuestionHandler.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { ChatParticipantToolToken, LanguageModelTextPart } from 'vscode';
7-
import { ILogService } from '../../../platform/log/common/logService';
8-
import { CancellationToken } from '../../../util/vs/base/common/cancellation';
9-
import { ToolName } from '../../tools/common/toolNames';
10-
import { IToolsService } from '../../tools/common/toolsService';
11-
import { IQuestion, IQuestionAnswer, IUserQuestionHandler } from '../copilotcli/node/userInputHelpers';
7+
import { ILogService } from '../../../../platform/log/common/logService';
8+
import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
9+
import { ToolName } from '../../../tools/common/toolNames';
10+
import { IToolsService } from '../../../tools/common/toolsService';
11+
import { IQuestion, IQuestionAnswer, IUserQuestionHandler } from '../../copilotcli/node/userInputHelpers';
1212

1313

1414
export interface IAskQuestionsParams {

extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionMetadataStoreImpl.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/chatSessionMetadataStoreImpl.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
import * as vscode from 'vscode';
77
import { Uri } from 'vscode';
8-
import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext';
9-
import { createDirectoryIfNotExists, IFileSystemService } from '../../../platform/filesystem/common/fileSystemService';
10-
import { ILogService } from '../../../platform/log/common/logService';
11-
import { findLast } from '../../../util/vs/base/common/arraysFind';
12-
import { SequencerByKey, ThrottledDelayer } from '../../../util/vs/base/common/async';
13-
import { Disposable } from '../../../util/vs/base/common/lifecycle';
14-
import { dirname } from '../../../util/vs/base/common/resources';
15-
import { ChatSessionMetadataFile, IChatSessionMetadataStore, RepositoryProperties, RequestDetails, WorkspaceFolderEntry } from '../common/chatSessionMetadataStore';
16-
import { ChatSessionWorktreeProperties } from '../common/chatSessionWorktreeService';
17-
import { isUntitledSessionId } from '../common/utils';
18-
import { IWorkspaceInfo } from '../common/workspaceInfo';
19-
import { getCopilotBulkMetadataFile, getCopilotCLISessionDir } from '../copilotcli/node/cliHelpers';
20-
import { ICopilotCLIAgents } from '../copilotcli/node/copilotCli';
8+
import { IVSCodeExtensionContext } from '../../../../platform/extContext/common/extensionContext';
9+
import { createDirectoryIfNotExists, IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService';
10+
import { ILogService } from '../../../../platform/log/common/logService';
11+
import { findLast } from '../../../../util/vs/base/common/arraysFind';
12+
import { SequencerByKey, ThrottledDelayer } from '../../../../util/vs/base/common/async';
13+
import { Disposable } from '../../../../util/vs/base/common/lifecycle';
14+
import { dirname } from '../../../../util/vs/base/common/resources';
15+
import { ChatSessionMetadataFile, IChatSessionMetadataStore, RepositoryProperties, RequestDetails, WorkspaceFolderEntry } from '../../common/chatSessionMetadataStore';
16+
import { ChatSessionWorktreeProperties } from '../../common/chatSessionWorktreeService';
17+
import { isUntitledSessionId } from '../../common/utils';
18+
import { IWorkspaceInfo } from '../../common/workspaceInfo';
19+
import { getCopilotBulkMetadataFile, getCopilotCLISessionDir } from '../../copilotcli/node/cliHelpers';
20+
import { ICopilotCLIAgents } from '../../copilotcli/node/copilotCli';
2121

2222
// const WORKSPACE_FOLDER_MEMENTO_KEY = 'github.copilot.cli.sessionWorkspaceFolders';
2323
// const WORKTREE_MEMENTO_KEY = 'github.copilot.cli.sessionWorktrees';

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionInitializer.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIChatSessionInitializer.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
import type { SweCustomAgent } from '@github/copilot/sdk';
77
import * as l10n from '@vscode/l10n';
88
import * as vscode from 'vscode';
9-
import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
10-
import { ILogService } from '../../../platform/log/common/logService';
11-
import { IPromptsService, ParsedPromptFile } from '../../../platform/promptFiles/common/promptsService';
12-
import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
13-
import { createServiceIdentifier } from '../../../util/common/services';
14-
import { DisposableStore, IReference } from '../../../util/vs/base/common/lifecycle';
15-
import { URI } from '../../../util/vs/base/common/uri';
16-
import { ChatVariablesCollection, extractDebugTargetSessionIds, isPromptFile } from '../../prompt/common/chatVariablesCollection';
17-
import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../common/folderRepositoryManager';
18-
import { emptyWorkspaceInfo, getWorkingDirectory, isIsolationEnabled, IWorkspaceInfo } from '../common/workspaceInfo';
19-
import { SessionIdForCLI } from '../copilotcli/common/utils';
20-
import { COPILOT_CLI_REASONING_EFFORT_PROPERTY, ICopilotCLIAgents, ICopilotCLIModels } from '../copilotcli/node/copilotCli';
21-
import { ICopilotCLISession } from '../copilotcli/node/copilotcliSession';
22-
import { ICopilotCLISessionService } from '../copilotcli/node/copilotcliSessionService';
23-
import { buildMcpServerMappings, McpServerMappings } from '../copilotcli/node/mcpHandler';
9+
import { ConfigKey, IConfigurationService } from '../../../../platform/configuration/common/configurationService';
10+
import { ILogService } from '../../../../platform/log/common/logService';
11+
import { IPromptsService, ParsedPromptFile } from '../../../../platform/promptFiles/common/promptsService';
12+
import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
13+
import { createServiceIdentifier } from '../../../../util/common/services';
14+
import { DisposableStore, IReference } from '../../../../util/vs/base/common/lifecycle';
15+
import { URI } from '../../../../util/vs/base/common/uri';
16+
import { ChatVariablesCollection, extractDebugTargetSessionIds, isPromptFile } from '../../../prompt/common/chatVariablesCollection';
17+
import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../../common/folderRepositoryManager';
18+
import { emptyWorkspaceInfo, getWorkingDirectory, isIsolationEnabled, IWorkspaceInfo } from '../../common/workspaceInfo';
19+
import { SessionIdForCLI } from '../../copilotcli/common/utils';
20+
import { COPILOT_CLI_REASONING_EFFORT_PROPERTY, ICopilotCLIAgents, ICopilotCLIModels } from '../../copilotcli/node/copilotCli';
21+
import { ICopilotCLISession } from '../../copilotcli/node/copilotcliSession';
22+
import { ICopilotCLISessionService } from '../../copilotcli/node/copilotcliSessionService';
23+
import { buildMcpServerMappings, McpServerMappings } from '../../copilotcli/node/mcpHandler';
2424

2525
function isReasoningEffortFeatureEnabled(configurationService: IConfigurationService): boolean {
2626
return configurationService.getConfig(ConfigKey.Advanced.CLIThinkingEffortEnabled);

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLICustomizationProvider.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
import * as l10n from '@vscode/l10n';
77
import * as vscode from 'vscode';
8-
import { ICustomInstructionsService } from '../../../platform/customInstructions/common/customInstructionsService';
9-
import { IFileSystemService } from '../../../platform/filesystem/common/fileSystemService';
10-
import { ILogService } from '../../../platform/log/common/logService';
11-
import { IPromptsService } from '../../../platform/promptFiles/common/promptsService';
12-
import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
13-
import { CancellationToken } from '../../../util/vs/base/common/cancellation';
14-
import { isCancellationError } from '../../../util/vs/base/common/errors';
15-
import { Emitter } from '../../../util/vs/base/common/event';
16-
import { Disposable } from '../../../util/vs/base/common/lifecycle';
17-
import { basename } from '../../../util/vs/base/common/resources';
18-
import { URI } from '../../../util/vs/base/common/uri';
19-
import { ICopilotCLIAgents, isEnabledForCopilotCLI } from '../copilotcli/node/copilotCli';
8+
import { ICustomInstructionsService } from '../../../../platform/customInstructions/common/customInstructionsService';
9+
import { IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService';
10+
import { ILogService } from '../../../../platform/log/common/logService';
11+
import { IPromptsService } from '../../../../platform/promptFiles/common/promptsService';
12+
import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
13+
import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
14+
import { isCancellationError } from '../../../../util/vs/base/common/errors';
15+
import { Emitter } from '../../../../util/vs/base/common/event';
16+
import { Disposable } from '../../../../util/vs/base/common/lifecycle';
17+
import { basename } from '../../../../util/vs/base/common/resources';
18+
import { URI } from '../../../../util/vs/base/common/uri';
19+
import { ICopilotCLIAgents, isEnabledForCopilotCLI } from '../../copilotcli/node/copilotCli';
2020

2121
export class CopilotCLICustomizationProvider extends Disposable implements vscode.ChatSessionCustomizationProvider {
2222

extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIPromptReferences.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIPromptReferences.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
import type { Attachment } from '@github/copilot/sdk';
77
import * as l10n from '@vscode/l10n';
88
import type { ChatPromptReference } from 'vscode';
9-
import { isLocation } from '../../../util/common/types';
10-
import { coalesce } from '../../../util/vs/base/common/arrays';
11-
import { Codicon } from '../../../util/vs/base/common/codicons';
12-
import { ResourceSet } from '../../../util/vs/base/common/map';
13-
import { basename } from '../../../util/vs/base/common/resources';
14-
import { isNumber, isString } from '../../../util/vs/base/common/types';
15-
import { URI } from '../../../util/vs/base/common/uri';
16-
import { Range as InternalRange } from '../../../util/vs/editor/common/core/range';
17-
import { SymbolKind } from '../../../util/vs/workbench/api/common/extHostTypes/symbolInformation';
18-
import { ChatReferenceDiagnostic, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, Range, Uri } from '../../../vscodeTypes';
19-
import { PromptFileIdPrefix } from '../../prompt/common/chatVariablesCollection';
9+
import { isLocation } from '../../../../util/common/types';
10+
import { coalesce } from '../../../../util/vs/base/common/arrays';
11+
import { Codicon } from '../../../../util/vs/base/common/codicons';
12+
import { ResourceSet } from '../../../../util/vs/base/common/map';
13+
import { basename } from '../../../../util/vs/base/common/resources';
14+
import { isNumber, isString } from '../../../../util/vs/base/common/types';
15+
import { URI } from '../../../../util/vs/base/common/uri';
16+
import { Range as InternalRange } from '../../../../util/vs/editor/common/core/range';
17+
import { SymbolKind } from '../../../../util/vs/workbench/api/common/extHostTypes/symbolInformation';
18+
import { ChatReferenceDiagnostic, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, Range, Uri } from '../../../../vscodeTypes';
19+
import { PromptFileIdPrefix } from '../../../prompt/common/chatVariablesCollection';
2020

2121
/**
2222
* Converts a ChatPromptReference into a PromptVariable entry that is used in VS code.

extensions/copilot/src/extension/chatSessions/vscode-node/test/askUserQuestionHandler.spec.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/askUserQuestionHandler.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
import { describe, expect, it, vi } from 'vitest';
77
import { LanguageModelToolInvocationOptions } from 'vscode';
8-
import { mock } from '../../../../util/common/test/simpleMock';
9-
import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
10-
import { LanguageModelTextPart, LanguageModelToolResult, LanguageModelToolResult2 } from '../../../../vscodeTypes';
11-
import { ICopilotTool } from '../../../tools/common/toolsRegistry';
12-
import { IToolsService } from '../../../tools/common/toolsService';
13-
import { IQuestion } from '../../copilotcli/node/userInputHelpers';
8+
import { mock } from '../../../../../util/common/test/simpleMock';
9+
import { CancellationToken } from '../../../../../util/vs/base/common/cancellation';
10+
import { LanguageModelTextPart, LanguageModelToolResult, LanguageModelToolResult2 } from '../../../../../vscodeTypes';
11+
import { ICopilotTool } from '../../../../tools/common/toolsRegistry';
12+
import { IToolsService } from '../../../../tools/common/toolsService';
13+
import { IQuestion } from '../../../copilotcli/node/userInputHelpers';
1414
import { IAnswerResult, UserQuestionHandler } from '../askUserQuestionHandler';
1515

1616
function makeAskQuestionsTool(invokeResult: LanguageModelToolResult | undefined, resolveInput?: unknown): ICopilotTool<unknown> {
@@ -28,7 +28,7 @@ function makeToolsService(tool: ICopilotTool<unknown> | undefined): IToolsServic
2828
}();
2929
}
3030

31-
const logService = new class extends mock<import('../../../../platform/log/common/logService').ILogService>() {
31+
const logService = new class extends mock<import('../../../../../platform/log/common/logService').ILogService>() {
3232
override trace = vi.fn();
3333
override warn = vi.fn();
3434
}();

extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionInitializer.spec.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionInitializer.spec.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
import type { SweCustomAgent } from '@github/copilot/sdk';
77
import { beforeEach, describe, expect, it, vi } from 'vitest';
88
import type * as vscode from 'vscode';
9-
import { IConfigurationService } from '../../../../platform/configuration/common/configurationService';
10-
import { ILogService } from '../../../../platform/log/common/logService';
11-
import { IPromptsService } from '../../../../platform/promptFiles/common/promptsService';
12-
import { IWorkspaceService, NullWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
13-
import { mock } from '../../../../util/common/test/simpleMock';
14-
import { CancellationToken } from '../../../../util/vs/base/common/cancellation';
15-
import { DisposableStore, IReference } from '../../../../util/vs/base/common/lifecycle';
16-
import { URI } from '../../../../util/vs/base/common/uri';
17-
import { IChatSessionMetadataStore } from '../../common/chatSessionMetadataStore';
18-
import { IChatSessionWorkspaceFolderService } from '../../common/chatSessionWorkspaceFolderService';
19-
import { IChatSessionWorktreeService } from '../../common/chatSessionWorktreeService';
20-
import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../../common/folderRepositoryManager';
21-
import { IWorkspaceInfo } from '../../common/workspaceInfo';
22-
import { ICopilotCLIAgents, ICopilotCLIModels } from '../../copilotcli/node/copilotCli';
23-
import { ICopilotCLISession } from '../../copilotcli/node/copilotcliSession';
24-
import { ICopilotCLISessionService } from '../../copilotcli/node/copilotcliSessionService';
9+
import { IConfigurationService } from '../../../../../platform/configuration/common/configurationService';
10+
import { ILogService } from '../../../../../platform/log/common/logService';
11+
import { IPromptsService } from '../../../../../platform/promptFiles/common/promptsService';
12+
import { IWorkspaceService, NullWorkspaceService } from '../../../../../platform/workspace/common/workspaceService';
13+
import { mock } from '../../../../../util/common/test/simpleMock';
14+
import { CancellationToken } from '../../../../../util/vs/base/common/cancellation';
15+
import { DisposableStore, IReference } from '../../../../../util/vs/base/common/lifecycle';
16+
import { URI } from '../../../../../util/vs/base/common/uri';
17+
import { IChatSessionMetadataStore } from '../../../common/chatSessionMetadataStore';
18+
import { IChatSessionWorkspaceFolderService } from '../../../common/chatSessionWorkspaceFolderService';
19+
import { IChatSessionWorktreeService } from '../../../common/chatSessionWorktreeService';
20+
import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../../../common/folderRepositoryManager';
21+
import { IWorkspaceInfo } from '../../../common/workspaceInfo';
22+
import { ICopilotCLIAgents, ICopilotCLIModels } from '../../../copilotcli/node/copilotCli';
23+
import { ICopilotCLISession } from '../../../copilotcli/node/copilotcliSession';
24+
import { ICopilotCLISessionService } from '../../../copilotcli/node/copilotcliSessionService';
2525
import { CopilotCLIChatSessionInitializer } from '../copilotCLIChatSessionInitializer';
2626

2727
// ─── Test Helpers ────────────────────────────────────────────────

extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts renamed to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
77
import * as vscode from 'vscode';
88
import { Uri } from 'vscode';
9-
import { IVSCodeExtensionContext } from '../../../../platform/extContext/common/extensionContext';
10-
import { MockFileSystemService } from '../../../../platform/filesystem/node/test/mockFileSystemService';
11-
import { ILogService } from '../../../../platform/log/common/logService';
12-
import { mock } from '../../../../util/common/test/simpleMock';
13-
import { Emitter } from '../../../../util/vs/base/common/event';
14-
import { URI } from '../../../../util/vs/base/common/uri';
15-
import { ChatSessionWorktreeProperties } from '../../common/chatSessionWorktreeService';
16-
import { IWorkspaceInfo } from '../../common/workspaceInfo';
17-
import { getCopilotCLISessionDir } from '../../copilotcli/node/cliHelpers';
18-
import { NullCopilotCLIAgents } from '../../copilotcli/node/test/testHelpers';
9+
import { IVSCodeExtensionContext } from '../../../../../platform/extContext/common/extensionContext';
10+
import { MockFileSystemService } from '../../../../../platform/filesystem/node/test/mockFileSystemService';
11+
import { ILogService } from '../../../../../platform/log/common/logService';
12+
import { mock } from '../../../../../util/common/test/simpleMock';
13+
import { Emitter } from '../../../../../util/vs/base/common/event';
14+
import { URI } from '../../../../../util/vs/base/common/uri';
15+
import { ChatSessionWorktreeProperties } from '../../../common/chatSessionWorktreeService';
16+
import { IWorkspaceInfo } from '../../../common/workspaceInfo';
17+
import { getCopilotCLISessionDir } from '../../../copilotcli/node/cliHelpers';
18+
import { NullCopilotCLIAgents } from '../../../copilotcli/node/test/testHelpers';
1919
import { ChatSessionMetadataStore } from '../chatSessionMetadataStoreImpl';
2020

2121
// Hoisted holder lets each test point the JSONL helper at its own mock path.
@@ -24,8 +24,8 @@ const jsonlPathHolder = vi.hoisted(() => {
2424
return { get: () => p };
2525
});
2626

27-
vi.mock('../../copilotcli/node/cliHelpers', async (importOriginal) => {
28-
const actual = await importOriginal<typeof import('../../copilotcli/node/cliHelpers')>();
27+
vi.mock('../../../copilotcli/node/cliHelpers', async (importOriginal) => {
28+
const actual = await importOriginal<typeof import('../../../copilotcli/node/cliHelpers')>();
2929
return {
3030
...actual,
3131
getCopilotCLISessionDir: (sessionId: string) => `/mock/session-state/${sessionId}`,

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import type { SweCustomAgent } from '@github/copilot/sdk';
77
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
88
import * as vscode from 'vscode';
9-
import { ILogService } from '../../../../platform/log/common/logService';
10-
import { MockCustomInstructionsService } from '../../../../platform/test/common/testCustomInstructionsService';
11-
import { mock } from '../../../../util/common/test/simpleMock';
12-
import { Emitter } from '../../../../util/vs/base/common/event';
13-
import { DisposableStore } from '../../../../util/vs/base/common/lifecycle';
14-
import { URI } from '../../../../util/vs/base/common/uri';
15-
import { CLIAgentInfo, ICopilotCLIAgents } from '../../copilotcli/node/copilotCli';
9+
import { ILogService } from '../../../../../platform/log/common/logService';
10+
import { MockCustomInstructionsService } from '../../../../../platform/test/common/testCustomInstructionsService';
11+
import { mock } from '../../../../../util/common/test/simpleMock';
12+
import { Emitter } from '../../../../../util/vs/base/common/event';
13+
import { DisposableStore } from '../../../../../util/vs/base/common/lifecycle';
14+
import { URI } from '../../../../../util/vs/base/common/uri';
15+
import { CLIAgentInfo, ICopilotCLIAgents } from '../../../copilotcli/node/copilotCli';
1616
import { CopilotCLICustomizationProvider } from '../copilotCLICustomizationProvider';
17-
import { MockPromptsService } from '../../../../platform/promptFiles/test/common/mockPromptsService';
17+
import { MockPromptsService } from '../../../../../platform/promptFiles/test/common/mockPromptsService';
1818

1919
class FakeChatSessionCustomizationType {
2020
static readonly Agent = new FakeChatSessionCustomizationType('agent');

0 commit comments

Comments
 (0)