diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/askUserQuestionHandler.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/askUserQuestionHandler.ts similarity index 85% rename from extensions/copilot/src/extension/chatSessions/vscode-node/askUserQuestionHandler.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/askUserQuestionHandler.ts index 9a4774ed5cf17..ac8e1d3fd3c32 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/askUserQuestionHandler.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/askUserQuestionHandler.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { ChatParticipantToolToken, LanguageModelTextPart } from 'vscode'; -import { ILogService } from '../../../platform/log/common/logService'; -import { CancellationToken } from '../../../util/vs/base/common/cancellation'; -import { ToolName } from '../../tools/common/toolNames'; -import { IToolsService } from '../../tools/common/toolsService'; -import { IQuestion, IQuestionAnswer, IUserQuestionHandler } from '../copilotcli/node/userInputHelpers'; +import { ILogService } from '../../../../platform/log/common/logService'; +import { CancellationToken } from '../../../../util/vs/base/common/cancellation'; +import { ToolName } from '../../../tools/common/toolNames'; +import { IToolsService } from '../../../tools/common/toolsService'; +import { IQuestion, IQuestionAnswer, IUserQuestionHandler } from '../../copilotcli/node/userInputHelpers'; export interface IAskQuestionsParams { diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionMetadataStoreImpl.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/chatSessionMetadataStoreImpl.ts similarity index 96% rename from extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionMetadataStoreImpl.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/chatSessionMetadataStoreImpl.ts index 5c3b1c02af21a..08c5d70db6e17 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/chatSessionMetadataStoreImpl.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/chatSessionMetadataStoreImpl.ts @@ -5,19 +5,19 @@ import * as vscode from 'vscode'; import { Uri } from 'vscode'; -import { IVSCodeExtensionContext } from '../../../platform/extContext/common/extensionContext'; -import { createDirectoryIfNotExists, IFileSystemService } from '../../../platform/filesystem/common/fileSystemService'; -import { ILogService } from '../../../platform/log/common/logService'; -import { findLast } from '../../../util/vs/base/common/arraysFind'; -import { SequencerByKey, ThrottledDelayer } from '../../../util/vs/base/common/async'; -import { Disposable } from '../../../util/vs/base/common/lifecycle'; -import { dirname } from '../../../util/vs/base/common/resources'; -import { ChatSessionMetadataFile, IChatSessionMetadataStore, RepositoryProperties, RequestDetails, WorkspaceFolderEntry } from '../common/chatSessionMetadataStore'; -import { ChatSessionWorktreeProperties } from '../common/chatSessionWorktreeService'; -import { isUntitledSessionId } from '../common/utils'; -import { IWorkspaceInfo } from '../common/workspaceInfo'; -import { getCopilotBulkMetadataFile, getCopilotCLISessionDir } from '../copilotcli/node/cliHelpers'; -import { ICopilotCLIAgents } from '../copilotcli/node/copilotCli'; +import { IVSCodeExtensionContext } from '../../../../platform/extContext/common/extensionContext'; +import { createDirectoryIfNotExists, IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService'; +import { ILogService } from '../../../../platform/log/common/logService'; +import { findLast } from '../../../../util/vs/base/common/arraysFind'; +import { SequencerByKey, ThrottledDelayer } from '../../../../util/vs/base/common/async'; +import { Disposable } from '../../../../util/vs/base/common/lifecycle'; +import { dirname } from '../../../../util/vs/base/common/resources'; +import { ChatSessionMetadataFile, IChatSessionMetadataStore, RepositoryProperties, RequestDetails, WorkspaceFolderEntry } from '../../common/chatSessionMetadataStore'; +import { ChatSessionWorktreeProperties } from '../../common/chatSessionWorktreeService'; +import { isUntitledSessionId } from '../../common/utils'; +import { IWorkspaceInfo } from '../../common/workspaceInfo'; +import { getCopilotBulkMetadataFile, getCopilotCLISessionDir } from '../../copilotcli/node/cliHelpers'; +import { ICopilotCLIAgents } from '../../copilotcli/node/copilotCli'; // const WORKSPACE_FOLDER_MEMENTO_KEY = 'github.copilot.cli.sessionWorkspaceFolders'; // const WORKTREE_MEMENTO_KEY = 'github.copilot.cli.sessionWorktrees'; diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionInitializer.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIChatSessionInitializer.ts similarity index 90% rename from extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionInitializer.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIChatSessionInitializer.ts index c1a589347c268..5847560e9f7ba 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionInitializer.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIChatSessionInitializer.ts @@ -6,21 +6,21 @@ import type { SweCustomAgent } from '@github/copilot/sdk'; import * as l10n from '@vscode/l10n'; import * as vscode from 'vscode'; -import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService'; -import { ILogService } from '../../../platform/log/common/logService'; -import { IPromptsService, ParsedPromptFile } from '../../../platform/promptFiles/common/promptsService'; -import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService'; -import { createServiceIdentifier } from '../../../util/common/services'; -import { DisposableStore, IReference } from '../../../util/vs/base/common/lifecycle'; -import { URI } from '../../../util/vs/base/common/uri'; -import { ChatVariablesCollection, extractDebugTargetSessionIds, isPromptFile } from '../../prompt/common/chatVariablesCollection'; -import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../common/folderRepositoryManager'; -import { emptyWorkspaceInfo, getWorkingDirectory, isIsolationEnabled, IWorkspaceInfo } from '../common/workspaceInfo'; -import { SessionIdForCLI } from '../copilotcli/common/utils'; -import { COPILOT_CLI_REASONING_EFFORT_PROPERTY, ICopilotCLIAgents, ICopilotCLIModels } from '../copilotcli/node/copilotCli'; -import { ICopilotCLISession } from '../copilotcli/node/copilotcliSession'; -import { ICopilotCLISessionService } from '../copilotcli/node/copilotcliSessionService'; -import { buildMcpServerMappings, McpServerMappings } from '../copilotcli/node/mcpHandler'; +import { ConfigKey, IConfigurationService } from '../../../../platform/configuration/common/configurationService'; +import { ILogService } from '../../../../platform/log/common/logService'; +import { IPromptsService, ParsedPromptFile } from '../../../../platform/promptFiles/common/promptsService'; +import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService'; +import { createServiceIdentifier } from '../../../../util/common/services'; +import { DisposableStore, IReference } from '../../../../util/vs/base/common/lifecycle'; +import { URI } from '../../../../util/vs/base/common/uri'; +import { ChatVariablesCollection, extractDebugTargetSessionIds, isPromptFile } from '../../../prompt/common/chatVariablesCollection'; +import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../../common/folderRepositoryManager'; +import { emptyWorkspaceInfo, getWorkingDirectory, isIsolationEnabled, IWorkspaceInfo } from '../../common/workspaceInfo'; +import { SessionIdForCLI } from '../../copilotcli/common/utils'; +import { COPILOT_CLI_REASONING_EFFORT_PROPERTY, ICopilotCLIAgents, ICopilotCLIModels } from '../../copilotcli/node/copilotCli'; +import { ICopilotCLISession } from '../../copilotcli/node/copilotcliSession'; +import { ICopilotCLISessionService } from '../../copilotcli/node/copilotcliSessionService'; +import { buildMcpServerMappings, McpServerMappings } from '../../copilotcli/node/mcpHandler'; function isReasoningEffortFeatureEnabled(configurationService: IConfigurationService): boolean { return configurationService.getConfig(ConfigKey.Advanced.CLIThinkingEffortEnabled); diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLICustomizationProvider.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts similarity index 89% rename from extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLICustomizationProvider.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts index fb9a238d52616..d0af1a6f79dc7 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLICustomizationProvider.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLICustomizationProvider.ts @@ -5,18 +5,18 @@ import * as l10n from '@vscode/l10n'; import * as vscode from 'vscode'; -import { ICustomInstructionsService } from '../../../platform/customInstructions/common/customInstructionsService'; -import { IFileSystemService } from '../../../platform/filesystem/common/fileSystemService'; -import { ILogService } from '../../../platform/log/common/logService'; -import { IPromptsService } from '../../../platform/promptFiles/common/promptsService'; -import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService'; -import { CancellationToken } from '../../../util/vs/base/common/cancellation'; -import { isCancellationError } from '../../../util/vs/base/common/errors'; -import { Emitter } from '../../../util/vs/base/common/event'; -import { Disposable } from '../../../util/vs/base/common/lifecycle'; -import { basename } from '../../../util/vs/base/common/resources'; -import { URI } from '../../../util/vs/base/common/uri'; -import { ICopilotCLIAgents, isEnabledForCopilotCLI } from '../copilotcli/node/copilotCli'; +import { ICustomInstructionsService } from '../../../../platform/customInstructions/common/customInstructionsService'; +import { IFileSystemService } from '../../../../platform/filesystem/common/fileSystemService'; +import { ILogService } from '../../../../platform/log/common/logService'; +import { IPromptsService } from '../../../../platform/promptFiles/common/promptsService'; +import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService'; +import { CancellationToken } from '../../../../util/vs/base/common/cancellation'; +import { isCancellationError } from '../../../../util/vs/base/common/errors'; +import { Emitter } from '../../../../util/vs/base/common/event'; +import { Disposable } from '../../../../util/vs/base/common/lifecycle'; +import { basename } from '../../../../util/vs/base/common/resources'; +import { URI } from '../../../../util/vs/base/common/uri'; +import { ICopilotCLIAgents, isEnabledForCopilotCLI } from '../../copilotcli/node/copilotCli'; export class CopilotCLICustomizationProvider extends Disposable implements vscode.ChatSessionCustomizationProvider { diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIPromptReferences.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIPromptReferences.ts similarity index 89% rename from extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIPromptReferences.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIPromptReferences.ts index cd7b6f8ac7017..d78c5ec5d3271 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIPromptReferences.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/copilotCLIPromptReferences.ts @@ -6,17 +6,17 @@ import type { Attachment } from '@github/copilot/sdk'; import * as l10n from '@vscode/l10n'; import type { ChatPromptReference } from 'vscode'; -import { isLocation } from '../../../util/common/types'; -import { coalesce } from '../../../util/vs/base/common/arrays'; -import { Codicon } from '../../../util/vs/base/common/codicons'; -import { ResourceSet } from '../../../util/vs/base/common/map'; -import { basename } from '../../../util/vs/base/common/resources'; -import { isNumber, isString } from '../../../util/vs/base/common/types'; -import { URI } from '../../../util/vs/base/common/uri'; -import { Range as InternalRange } from '../../../util/vs/editor/common/core/range'; -import { SymbolKind } from '../../../util/vs/workbench/api/common/extHostTypes/symbolInformation'; -import { ChatReferenceDiagnostic, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, Range, Uri } from '../../../vscodeTypes'; -import { PromptFileIdPrefix } from '../../prompt/common/chatVariablesCollection'; +import { isLocation } from '../../../../util/common/types'; +import { coalesce } from '../../../../util/vs/base/common/arrays'; +import { Codicon } from '../../../../util/vs/base/common/codicons'; +import { ResourceSet } from '../../../../util/vs/base/common/map'; +import { basename } from '../../../../util/vs/base/common/resources'; +import { isNumber, isString } from '../../../../util/vs/base/common/types'; +import { URI } from '../../../../util/vs/base/common/uri'; +import { Range as InternalRange } from '../../../../util/vs/editor/common/core/range'; +import { SymbolKind } from '../../../../util/vs/workbench/api/common/extHostTypes/symbolInformation'; +import { ChatReferenceDiagnostic, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, Range, Uri } from '../../../../vscodeTypes'; +import { PromptFileIdPrefix } from '../../../prompt/common/chatVariablesCollection'; /** * Converts a ChatPromptReference into a PromptVariable entry that is used in VS code. diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/test/askUserQuestionHandler.spec.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/askUserQuestionHandler.spec.ts similarity index 90% rename from extensions/copilot/src/extension/chatSessions/vscode-node/test/askUserQuestionHandler.spec.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/askUserQuestionHandler.spec.ts index 476bb5592b545..2b6c05193ca10 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/test/askUserQuestionHandler.spec.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/askUserQuestionHandler.spec.ts @@ -5,12 +5,12 @@ import { describe, expect, it, vi } from 'vitest'; import { LanguageModelToolInvocationOptions } from 'vscode'; -import { mock } from '../../../../util/common/test/simpleMock'; -import { CancellationToken } from '../../../../util/vs/base/common/cancellation'; -import { LanguageModelTextPart, LanguageModelToolResult, LanguageModelToolResult2 } from '../../../../vscodeTypes'; -import { ICopilotTool } from '../../../tools/common/toolsRegistry'; -import { IToolsService } from '../../../tools/common/toolsService'; -import { IQuestion } from '../../copilotcli/node/userInputHelpers'; +import { mock } from '../../../../../util/common/test/simpleMock'; +import { CancellationToken } from '../../../../../util/vs/base/common/cancellation'; +import { LanguageModelTextPart, LanguageModelToolResult, LanguageModelToolResult2 } from '../../../../../vscodeTypes'; +import { ICopilotTool } from '../../../../tools/common/toolsRegistry'; +import { IToolsService } from '../../../../tools/common/toolsService'; +import { IQuestion } from '../../../copilotcli/node/userInputHelpers'; import { IAnswerResult, UserQuestionHandler } from '../askUserQuestionHandler'; function makeAskQuestionsTool(invokeResult: LanguageModelToolResult | undefined, resolveInput?: unknown): ICopilotTool { @@ -28,7 +28,7 @@ function makeToolsService(tool: ICopilotTool | undefined): IToolsServic }(); } -const logService = new class extends mock() { +const logService = new class extends mock() { override trace = vi.fn(); override warn = vi.fn(); }(); diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionInitializer.spec.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionInitializer.spec.ts similarity index 94% rename from extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionInitializer.spec.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionInitializer.spec.ts index 794f4e893cf8c..89f134f9af6eb 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionInitializer.spec.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionInitializer.spec.ts @@ -6,22 +6,22 @@ import type { SweCustomAgent } from '@github/copilot/sdk'; import { beforeEach, describe, expect, it, vi } from 'vitest'; import type * as vscode from 'vscode'; -import { IConfigurationService } from '../../../../platform/configuration/common/configurationService'; -import { ILogService } from '../../../../platform/log/common/logService'; -import { IPromptsService } from '../../../../platform/promptFiles/common/promptsService'; -import { IWorkspaceService, NullWorkspaceService } from '../../../../platform/workspace/common/workspaceService'; -import { mock } from '../../../../util/common/test/simpleMock'; -import { CancellationToken } from '../../../../util/vs/base/common/cancellation'; -import { DisposableStore, IReference } from '../../../../util/vs/base/common/lifecycle'; -import { URI } from '../../../../util/vs/base/common/uri'; -import { IChatSessionMetadataStore } from '../../common/chatSessionMetadataStore'; -import { IChatSessionWorkspaceFolderService } from '../../common/chatSessionWorkspaceFolderService'; -import { IChatSessionWorktreeService } from '../../common/chatSessionWorktreeService'; -import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../../common/folderRepositoryManager'; -import { IWorkspaceInfo } from '../../common/workspaceInfo'; -import { ICopilotCLIAgents, ICopilotCLIModels } from '../../copilotcli/node/copilotCli'; -import { ICopilotCLISession } from '../../copilotcli/node/copilotcliSession'; -import { ICopilotCLISessionService } from '../../copilotcli/node/copilotcliSessionService'; +import { IConfigurationService } from '../../../../../platform/configuration/common/configurationService'; +import { ILogService } from '../../../../../platform/log/common/logService'; +import { IPromptsService } from '../../../../../platform/promptFiles/common/promptsService'; +import { IWorkspaceService, NullWorkspaceService } from '../../../../../platform/workspace/common/workspaceService'; +import { mock } from '../../../../../util/common/test/simpleMock'; +import { CancellationToken } from '../../../../../util/vs/base/common/cancellation'; +import { DisposableStore, IReference } from '../../../../../util/vs/base/common/lifecycle'; +import { URI } from '../../../../../util/vs/base/common/uri'; +import { IChatSessionMetadataStore } from '../../../common/chatSessionMetadataStore'; +import { IChatSessionWorkspaceFolderService } from '../../../common/chatSessionWorkspaceFolderService'; +import { IChatSessionWorktreeService } from '../../../common/chatSessionWorktreeService'; +import { FolderRepositoryInfo, IFolderRepositoryManager, IsolationMode } from '../../../common/folderRepositoryManager'; +import { IWorkspaceInfo } from '../../../common/workspaceInfo'; +import { ICopilotCLIAgents, ICopilotCLIModels } from '../../../copilotcli/node/copilotCli'; +import { ICopilotCLISession } from '../../../copilotcli/node/copilotcliSession'; +import { ICopilotCLISessionService } from '../../../copilotcli/node/copilotcliSessionService'; import { CopilotCLIChatSessionInitializer } from '../copilotCLIChatSessionInitializer'; // ─── Test Helpers ──────────────────────────────────────────────── diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts similarity index 98% rename from extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts index bd928872a6fa0..b70761cc49a83 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/chatSessionMetadataStoreImpl.spec.ts @@ -6,16 +6,16 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import * as vscode from 'vscode'; import { Uri } from 'vscode'; -import { IVSCodeExtensionContext } from '../../../../platform/extContext/common/extensionContext'; -import { MockFileSystemService } from '../../../../platform/filesystem/node/test/mockFileSystemService'; -import { ILogService } from '../../../../platform/log/common/logService'; -import { mock } from '../../../../util/common/test/simpleMock'; -import { Emitter } from '../../../../util/vs/base/common/event'; -import { URI } from '../../../../util/vs/base/common/uri'; -import { ChatSessionWorktreeProperties } from '../../common/chatSessionWorktreeService'; -import { IWorkspaceInfo } from '../../common/workspaceInfo'; -import { getCopilotCLISessionDir } from '../../copilotcli/node/cliHelpers'; -import { NullCopilotCLIAgents } from '../../copilotcli/node/test/testHelpers'; +import { IVSCodeExtensionContext } from '../../../../../platform/extContext/common/extensionContext'; +import { MockFileSystemService } from '../../../../../platform/filesystem/node/test/mockFileSystemService'; +import { ILogService } from '../../../../../platform/log/common/logService'; +import { mock } from '../../../../../util/common/test/simpleMock'; +import { Emitter } from '../../../../../util/vs/base/common/event'; +import { URI } from '../../../../../util/vs/base/common/uri'; +import { ChatSessionWorktreeProperties } from '../../../common/chatSessionWorktreeService'; +import { IWorkspaceInfo } from '../../../common/workspaceInfo'; +import { getCopilotCLISessionDir } from '../../../copilotcli/node/cliHelpers'; +import { NullCopilotCLIAgents } from '../../../copilotcli/node/test/testHelpers'; import { ChatSessionMetadataStore } from '../chatSessionMetadataStoreImpl'; // Hoisted holder lets each test point the JSONL helper at its own mock path. @@ -24,8 +24,8 @@ const jsonlPathHolder = vi.hoisted(() => { return { get: () => p }; }); -vi.mock('../../copilotcli/node/cliHelpers', async (importOriginal) => { - const actual = await importOriginal(); +vi.mock('../../../copilotcli/node/cliHelpers', async (importOriginal) => { + const actual = await importOriginal(); return { ...actual, getCopilotCLISessionDir: (sessionId: string) => `/mock/session-state/${sessionId}`, diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLICustomizationProvider.spec.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLICustomizationProvider.spec.ts similarity index 97% rename from extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLICustomizationProvider.spec.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLICustomizationProvider.spec.ts index 26b667dcbb9d9..a9f947bdfde35 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLICustomizationProvider.spec.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLICustomizationProvider.spec.ts @@ -6,15 +6,15 @@ import type { SweCustomAgent } from '@github/copilot/sdk'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import * as vscode from 'vscode'; -import { ILogService } from '../../../../platform/log/common/logService'; -import { MockCustomInstructionsService } from '../../../../platform/test/common/testCustomInstructionsService'; -import { mock } from '../../../../util/common/test/simpleMock'; -import { Emitter } from '../../../../util/vs/base/common/event'; -import { DisposableStore } from '../../../../util/vs/base/common/lifecycle'; -import { URI } from '../../../../util/vs/base/common/uri'; -import { CLIAgentInfo, ICopilotCLIAgents } from '../../copilotcli/node/copilotCli'; +import { ILogService } from '../../../../../platform/log/common/logService'; +import { MockCustomInstructionsService } from '../../../../../platform/test/common/testCustomInstructionsService'; +import { mock } from '../../../../../util/common/test/simpleMock'; +import { Emitter } from '../../../../../util/vs/base/common/event'; +import { DisposableStore } from '../../../../../util/vs/base/common/lifecycle'; +import { URI } from '../../../../../util/vs/base/common/uri'; +import { CLIAgentInfo, ICopilotCLIAgents } from '../../../copilotcli/node/copilotCli'; import { CopilotCLICustomizationProvider } from '../copilotCLICustomizationProvider'; -import { MockPromptsService } from '../../../../platform/promptFiles/test/common/mockPromptsService'; +import { MockPromptsService } from '../../../../../platform/promptFiles/test/common/mockPromptsService'; class FakeChatSessionCustomizationType { static readonly Agent = new FakeChatSessionCustomizationType('agent'); diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLISDKUpgrade.spec.ts b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLISDKUpgrade.spec.ts similarity index 97% rename from extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLISDKUpgrade.spec.ts rename to extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLISDKUpgrade.spec.ts index 98cf628b6610e..fdb1b71292315 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLISDKUpgrade.spec.ts +++ b/extensions/copilot/src/extension/chatSessions/copilotcli/vscode-node/test/copilotCLISDKUpgrade.spec.ts @@ -7,11 +7,11 @@ import { promises as fs } from 'fs'; import { isBinaryFile } from 'isbinaryfile'; import * as path from 'path'; import { beforeAll, describe, it } from 'vitest'; -import { TestLogService } from '../../../../platform/testing/common/testLogService'; -import { copyRipgrepShim } from '../../copilotcli/node/ripgrepShim'; +import { TestLogService } from '../../../../../platform/testing/common/testLogService'; +import { copyRipgrepShim } from '../../../copilotcli/node/ripgrepShim'; describe('CopilotCLI SDK Upgrade', function () { - const extensionPath = path.join(__dirname, '..', '..', '..', '..', '..'); + const extensionPath = path.join(__dirname, '..', '..', '..', '..', '..', '..'); const copilotSDKPath = path.join(extensionPath, 'node_modules', '@github', 'copilot'); beforeAll(async function () { await copyBinaries(extensionPath); diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/chatSessions.ts b/extensions/copilot/src/extension/chatSessions/vscode-node/chatSessions.ts index c011cf0bd8e81..cab3fac9c90f4 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/chatSessions.ts +++ b/extensions/copilot/src/extension/chatSessions/vscode-node/chatSessions.ts @@ -59,8 +59,8 @@ import { ICopilotCLISessionTracker } from '../copilotcli/vscode-node/copilotCLIS import { CustomSessionTitleService } from '../copilotcli/vscode-node/customSessionTitleServiceImpl'; import { GHPR_EXTENSION_ID } from '../vscode/chatSessionsUriHandler'; import { AgentSessionsWorkspace } from './agentSessionsWorkspace'; -import { UserQuestionHandler } from './askUserQuestionHandler'; -import { ChatSessionMetadataStore } from './chatSessionMetadataStoreImpl'; +import { UserQuestionHandler } from '../copilotcli/vscode-node/askUserQuestionHandler'; +import { ChatSessionMetadataStore } from '../copilotcli/vscode-node/chatSessionMetadataStoreImpl'; import { ChatSessionRepositoryTracker } from './chatSessionRepositoryTracker'; import { ChatSessionWorkspaceFolderService } from './chatSessionWorkspaceFolderServiceImpl'; import { ClaudeWorkspaceFolderService } from './claudeWorkspaceFolderServiceImpl'; @@ -68,10 +68,10 @@ import { ChatSessionWorktreeCheckpointService } from './chatSessionWorktreeCheck import { ChatSessionWorktreeService } from './chatSessionWorktreeServiceImpl'; import { ClaudeChatSessionContentProvider } from './claudeChatSessionContentProvider'; import { ClaudeCustomizationProvider } from './claudeCustomizationProvider'; -import { CopilotCLIChatSessionInitializer, ICopilotCLIChatSessionInitializer } from './copilotCLIChatSessionInitializer'; +import { CopilotCLIChatSessionInitializer, ICopilotCLIChatSessionInitializer } from '../copilotcli/vscode-node/copilotCLIChatSessionInitializer'; import { CopilotCLIChatSessionContentProvider, CopilotCLIChatSessionParticipant, registerCLIChatCommands } from './copilotCLIChatSessions'; import { CopilotCLIChatSessionContentProvider as CopilotCLIChatSessionContentProviderV1, CopilotCLIChatSessionItemProvider as CopilotCLIChatSessionItemProviderV1, CopilotCLIChatSessionParticipant as CopilotCLIChatSessionParticipantV1, registerCLIChatCommands as registerCLIChatCommandsV1 } from './copilotCLIChatSessionsContribution'; -import { CopilotCLICustomizationProvider } from './copilotCLICustomizationProvider'; +import { CopilotCLICustomizationProvider } from '../copilotcli/vscode-node/copilotCLICustomizationProvider'; import { CopilotCLITerminalIntegration, ICopilotCLITerminalIntegration } from './copilotCLITerminalIntegration'; import { CopilotCloudSessionsProvider } from './copilotCloudSessionsProvider'; import { ClaudeFolderRepositoryManager, CopilotCLIFolderRepositoryManager } from './folderRepositoryManagerImpl'; diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts index 08ed2b1fd1ffc..0705d8d8668c9 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts +++ b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessions.ts @@ -43,14 +43,14 @@ import { builtinSlashSCommands, CopilotCLICommand, copilotCLICommands, ICopilotC import { ICopilotCLISessionItem, ICopilotCLISessionService } from '../copilotcli/node/copilotcliSessionService'; import { buildMcpServerMappings } from '../copilotcli/node/mcpHandler'; import { ICopilotCLISessionTracker } from '../copilotcli/vscode-node/copilotCLISessionTracker'; -import { ICopilotCLIChatSessionInitializer, SessionInitOptions } from './copilotCLIChatSessionInitializer'; -import { convertReferenceToVariable } from './copilotCLIPromptReferences'; import { ICopilotCLITerminalIntegration, TerminalOpenLocation } from './copilotCLITerminalIntegration'; import { CopilotCloudSessionsProvider } from './copilotCloudSessionsProvider'; import { UNTRUSTED_FOLDER_MESSAGE } from './folderRepositoryManagerImpl'; import { IPullRequestDetectionService } from './pullRequestDetectionService'; import { getSelectedSessionOptions, ISessionOptionGroupBuilder, OPEN_REPOSITORY_COMMAND_ID, toRepositoryOptionItem, toWorkspaceFolderOptionItem } from './sessionOptionGroupBuilder'; import { ISessionRequestLifecycle } from './sessionRequestLifecycle'; +import { ICopilotCLIChatSessionInitializer, SessionInitOptions } from '../copilotcli/vscode-node/copilotCLIChatSessionInitializer'; +import { convertReferenceToVariable } from '../copilotcli/vscode-node/copilotCLIPromptReferences'; export interface ICopilotCLIChatSessionItemProvider extends IDisposable { diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts index b9bec5c4577b8..22dafd16900a9 100644 --- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts +++ b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts @@ -52,9 +52,9 @@ import { ICopilotCLISessionItem, ICopilotCLISessionService } from '../copilotcli import { buildMcpServerMappings } from '../copilotcli/node/mcpHandler'; import { ICopilotCLISessionTracker } from '../copilotcli/vscode-node/copilotCLISessionTracker'; import { ICopilotCLIChatSessionItemProvider } from './copilotCLIChatSessions'; -import { convertReferenceToVariable } from './copilotCLIPromptReferences'; import { ICopilotCLITerminalIntegration, TerminalOpenLocation } from './copilotCLITerminalIntegration'; import { CopilotCloudSessionsProvider } from './copilotCloudSessionsProvider'; +import { convertReferenceToVariable } from '../copilotcli/vscode-node/copilotCLIPromptReferences'; const REPOSITORY_OPTION_ID = 'repository';