Rename remote-queries directories to variant-analysis

extensions/ql-vscode/scripts/add-fields-to-scenarios.ts

@@ -20,8 +20,8 @@ import { throttling } from "@octokit/plugin-throttling";
 import { getFiles } from "./util/files";
 import type { GitHubApiRequest } from "../src/mocks/gh-api-request";
 import { isGetVariantAnalysisRequest } from "../src/mocks/gh-api-request";
-import { VariantAnalysis } from "../src/remote-queries/gh-api/variant-analysis";
-import { RepositoryWithMetadata } from "../src/remote-queries/gh-api/repository";
+import { VariantAnalysis } from "../src/variant-analysis/gh-api/variant-analysis";
+import { RepositoryWithMetadata } from "../src/variant-analysis/gh-api/repository";
 
 const extensionDirectory = resolve(__dirname, "..");
 const scenariosDirectory = resolve(extensionDirectory, "src/mocks/scenarios");

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -29,7 +29,7 @@ import { DbManager } from "../db-manager";
 import { DbTreeDataProvider } from "./db-tree-data-provider";
 import { DbTreeViewItem } from "./db-tree-view-item";
 import { getGitHubUrl } from "./db-tree-view-item-action";
-import { getControllerRepo } from "../../remote-queries/run-remote-query";
+import { getControllerRepo } from "../../variant-analysis/run-remote-query";
 import { getErrorMessage } from "../../pure/helpers-pure";
 import { Credentials } from "../../common/authentication";
 

extensions/ql-vscode/src/extension.ts

@@ -108,7 +108,7 @@ import { HistoryItemLabelProvider } from "./query-history/history-item-label-pro
 import {
   exportSelectedVariantAnalysisResults,
   exportVariantAnalysisResults,
-} from "./remote-queries/export-results";
+} from "./variant-analysis/export-results";
 import { EvalLogViewer } from "./eval-log-viewer";
 import { SummaryLanguageSupport } from "./log-insights/summary-language-support";
 import { JoinOrderScannerProvider } from "./log-insights/join-order";
@@ -117,16 +117,16 @@ import { createInitialQueryInfo } from "./run-queries-shared";
 import { LegacyQueryRunner } from "./legacy-query-server/legacyRunner";
 import { NewQueryRunner } from "./query-server/query-runner";
 import { QueryRunner } from "./queryRunner";
-import { VariantAnalysisView } from "./remote-queries/variant-analysis-view";
-import { VariantAnalysisViewSerializer } from "./remote-queries/variant-analysis-view-serializer";
+import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";
+import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
-} from "./remote-queries/shared/variant-analysis";
-import { VariantAnalysisManager } from "./remote-queries/variant-analysis-manager";
-import { createVariantAnalysisContentProvider } from "./remote-queries/variant-analysis-content-provider";
+} from "./variant-analysis/shared/variant-analysis";
+import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager";
+import { createVariantAnalysisContentProvider } from "./variant-analysis/variant-analysis-content-provider";
 import { VSCodeMockGitHubApiServer } from "./mocks/vscode-mock-gh-api-server";
-import { VariantAnalysisResultsManager } from "./remote-queries/variant-analysis-results-manager";
+import { VariantAnalysisResultsManager } from "./variant-analysis/variant-analysis-results-manager";
 import { ExtensionApp } from "./common/vscode/vscode-app";
 import { RepositoriesFilterSortStateWithIds } from "./pure/variant-analysis-filter-sort";
 import { DbModule } from "./databases/db-module";

extensions/ql-vscode/src/mocks/gh-api-request.ts

@@ -1,8 +1,8 @@
-import { Repository } from "../remote-queries/gh-api/repository";
+import { Repository } from "../variant-analysis/gh-api/repository";
 import {
   VariantAnalysis,
   VariantAnalysisRepoTask,
-} from "../remote-queries/gh-api/variant-analysis";
+} from "../variant-analysis/gh-api/variant-analysis";
 
 // Types that represent requests/responses from the GitHub API
 // that we need to mock.

extensions/ql-vscode/src/pure/interface-types.ts

@@ -10,7 +10,7 @@ import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
-} from "../remote-queries/shared/variant-analysis";
+} from "../variant-analysis/shared/variant-analysis";
 import { RepositoriesFilterSortStateWithIds } from "./variant-analysis-filter-sort";
 
 /**

extensions/ql-vscode/src/pure/location-link-utils.ts

@@ -1,4 +1,4 @@
-import { FileLink } from "../remote-queries/shared/analysis-result";
+import { FileLink } from "../variant-analysis/shared/analysis-result";
 
 export function createRemoteFileRef(
   fileLink: FileLink,

extensions/ql-vscode/src/pure/sarif-utils.ts

@@ -1,5 +1,5 @@
 import * as Sarif from "sarif";
-import type { HighlightedRegion } from "../remote-queries/shared/analysis-result";
+import type { HighlightedRegion } from "../variant-analysis/shared/analysis-result";
 import { ResolvableLocationValue } from "./bqrs-cli-types";
 
 export interface SarifLink {

extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts

@@ -1,7 +1,7 @@
 import {
   Repository,
   RepositoryWithMetadata,
-} from "../remote-queries/shared/repository";
+} from "../variant-analysis/shared/repository";
 import { parseDate } from "./date";
 
 export enum SortKey {

extensions/ql-vscode/src/query-history/query-history-info.ts

@@ -5,7 +5,7 @@ import { pluralize } from "../pure/word";
 import {
   hasRepoScanCompleted,
   getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl,
-} from "../remote-queries/shared/variant-analysis";
+} from "../variant-analysis/shared/variant-analysis";
 
 export type QueryHistoryInfo = LocalQueryInfo | VariantAnalysisHistoryItem;
 

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -60,9 +60,9 @@ import EvalLogTreeBuilder from "../eval-log-tree-builder";
 import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
 import { QueryWithResults } from "../run-queries-shared";
 import { QueryRunner } from "../queryRunner";
-import { VariantAnalysisManager } from "../remote-queries/variant-analysis-manager";
+import { VariantAnalysisManager } from "../variant-analysis/variant-analysis-manager";
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
-import { getTotalResultCount } from "../remote-queries/shared/variant-analysis";
+import { getTotalResultCount } from "../variant-analysis/shared/variant-analysis";
 import { HistoryTreeDataProvider } from "./history-tree-data-provider";
 import { redactableError } from "../pure/errors";
 

extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts

@@ -1,5 +1,5 @@
 import { QueryStatus } from "../query-status";
-import { VariantAnalysis } from "../remote-queries/shared/variant-analysis";
+import { VariantAnalysis } from "../variant-analysis/shared/variant-analysis";
 
 /**
  * Information about a variant analysis.

extensions/ql-vscode/src/query-status.ts

@@ -1,5 +1,5 @@
 import { assertNever } from "./pure/helpers-pure";
-import { VariantAnalysisStatus } from "./remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "./variant-analysis/shared/variant-analysis";
 
 export enum QueryStatus {
   InProgress = "InProgress",

extensions/ql-vscode/src/stories/common/CodePaths.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentStory, ComponentMeta } from "@storybook/react";
 import { ThemeProvider } from "@primer/react";
 
 import { CodePaths } from "../../view/common";
-import type { CodeFlow } from "../../remote-queries/shared/analysis-result";
+import type { CodeFlow } from "../../variant-analysis/shared/analysis-result";
 
 export default {
   title: "Code Paths",

extensions/ql-vscode/src/stories/variant-analysis/AnalysisAlertResult.stories.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 import { ComponentStory, ComponentMeta } from "@storybook/react";
 
 import AnalysisAlertResult from "../../view/variant-analysis/AnalysisAlertResult";
-import type { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
+import type { AnalysisAlert } from "../../variant-analysis/shared/analysis-result";
 
 export default {
   title: "Variant Analysis/Analysis Alert Result",

extensions/ql-vscode/src/stories/variant-analysis/FailureReasonAlert.stories.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 
 import { ComponentMeta, ComponentStory } from "@storybook/react";
-import { VariantAnalysisFailureReason } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisFailureReason } from "../../variant-analysis/shared/variant-analysis";
 import { FailureReasonAlert } from "../../view/variant-analysis/FailureReasonAlert";
 
 export default {

extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx

@@ -6,12 +6,12 @@ import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAna
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import {
   AnalysisAlert,
   AnalysisRawResults,
-} from "../../remote-queries/shared/analysis-result";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+} from "../../variant-analysis/shared/analysis-result";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 
 import * as analysesResults from "../data/analysesResultsMessage.json";
 import * as rawResults from "../data/rawResults.json";

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx

@@ -11,9 +11,9 @@ import {
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+} from "../../variant-analysis/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 
 export default {
   title: "Variant Analysis/Variant Analysis",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisActions.stories.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 import { ComponentMeta, ComponentStory } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 import { VariantAnalysisActions } from "../../view/variant-analysis/VariantAnalysisActions";
 
 export default {

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx

@@ -10,11 +10,11 @@ import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
-import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
+} from "../../variant-analysis/shared/variant-analysis";
+import { AnalysisAlert } from "../../variant-analysis/shared/analysis-result";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
+import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories";
 
 import * as analysesResults from "../data/analysesResultsMessage.json";
 

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx

@@ -7,9 +7,9 @@ import { VariantAnalysisHeader } from "../../view/variant-analysis/VariantAnalys
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
+} from "../../variant-analysis/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories";
 
 export default {
   title: "Variant Analysis/Variant Analysis Header",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx

@@ -8,10 +8,10 @@ import { VariantAnalysisOutcomePanels } from "../../view/variant-analysis/Varian
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+} from "../../variant-analysis/shared/variant-analysis";
+import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 import {
   defaultFilterSortState,
   RepositoriesFilterSortState,

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
 import { VariantAnalysisSkippedRepositoriesTab } from "../../view/variant-analysis/VariantAnalysisSkippedRepositoriesTab";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 
 export default {
   title: "Variant Analysis/Variant Analysis Skipped Repositories Tab",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisStats.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentStory, ComponentMeta } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
 import { VariantAnalysisStats } from "../../view/variant-analysis/VariantAnalysisStats";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 
 export default {
   title: "Variant Analysis/Variant Analysis Stats",

extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { ChangeEvent, SetStateAction, useCallback } from "react";
 import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react";
 
-import { CodeFlow } from "../../../remote-queries/shared/analysis-result";
+import { CodeFlow } from "../../../variant-analysis/shared/analysis-result";
 
 const getCodeFlowName = (codeFlow: CodeFlow) => {
   const filePath =

extensions/ql-vscode/src/view/common/CodePaths/CodePath.tsx

@@ -4,7 +4,7 @@ import {
   AnalysisMessage,
   CodeFlow,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { ThreadPath } from "./ThreadPath";
 
 type CodePathProps = {

extensions/ql-vscode/src/view/common/CodePaths/CodePaths.tsx

@@ -9,7 +9,7 @@ import {
   AnalysisMessage,
   CodeFlow,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { CodePathsOverlay } from "./CodePathsOverlay";
 import { useTelemetryOnChange } from "../telemetry";
 

extensions/ql-vscode/src/view/common/CodePaths/CodePathsOverlay.tsx

@@ -6,7 +6,7 @@ import {
   AnalysisMessage,
   CodeFlow,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { useTelemetryOnChange } from "../telemetry";
 import { SectionTitle } from "../SectionTitle";
 import { VerticalSpace } from "../VerticalSpace";

extensions/ql-vscode/src/view/common/CodePaths/ThreadPath.tsx

@@ -6,7 +6,7 @@ import {
   AnalysisMessage,
   ResultSeverity,
   ThreadFlow,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { SectionTitle } from "../SectionTitle";
 import { FileCodeSnippet } from "../FileCodeSnippet";
 

extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx

@@ -3,8 +3,8 @@ import { render as reactRender, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { CodePaths, CodePathsProps } from "../CodePaths";
 
-import { createMockCodeFlows } from "../../../../../test/factories/remote-queries/shared/CodeFlow";
-import { createMockAnalysisMessage } from "../../../../../test/factories/remote-queries/shared/AnalysisMessage";
+import { createMockCodeFlows } from "../../../../../test/factories/variant-analysis/shared/CodeFlow";
+import { createMockAnalysisMessage } from "../../../../../test/factories/variant-analysis/shared/AnalysisMessage";
 
 describe(CodePaths.name, () => {
   const render = (props?: CodePathsProps) =>

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import styled from "styled-components";
 
-import { HighlightedRegion } from "../../../remote-queries/shared/analysis-result";
+import { HighlightedRegion } from "../../../variant-analysis/shared/analysis-result";
 import {
   parseHighlightedLine,
   shouldHighlightLine,

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetLine.tsx

@@ -5,7 +5,7 @@ import {
   AnalysisMessage,
   HighlightedRegion,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { CodeSnippetCode } from "./CodeSnippetCode";
 import { CodeSnippetMessage } from "./CodeSnippetMessage";
 

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx

@@ -5,7 +5,7 @@ import { VSCodeLink } from "@vscode/webview-ui-toolkit/react";
 import {
   AnalysisMessage,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { createRemoteFileRef } from "../../../pure/location-link-utils";
 import { VerticalSpace } from "../VerticalSpace";
 import { sendTelemetry } from "../telemetry";

extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx

@@ -8,7 +8,7 @@ import {
   FileLink,
   HighlightedRegion,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { createRemoteFileRef } from "../../../pure/location-link-utils";
 import { CodeSnippetMessage } from "./CodeSnippetMessage";
 import { CodeSnippetLine } from "./CodeSnippetLine";

extensions/ql-vscode/src/view/variant-analysis/AnalysisAlertResult.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
+import { AnalysisAlert } from "../../variant-analysis/shared/analysis-result";
 import { CodePaths, FileCodeSnippet } from "../common";
 
 const AnalysisAlertResult = ({ alert }: { alert: AnalysisAlert }) => {

extensions/ql-vscode/src/view/variant-analysis/AnalyzedRepoItemContent.tsx

@@ -3,13 +3,13 @@ import styled from "styled-components";
 import {
   AnalysisAlert,
   AnalysisRawResults,
-} from "../../remote-queries/shared/analysis-result";
+} from "../../variant-analysis/shared/analysis-result";
 import AnalysisAlertResult from "./AnalysisAlertResult";
 import RawResultsTable from "./RawResultsTable";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import { Alert } from "../common";
 
 const ContentContainer = styled.div`

extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx

@@ -3,7 +3,7 @@ import { ReactNode } from "react";
 import { VSCodeLink } from "@vscode/webview-ui-toolkit/react";
 import { Alert } from "../common";
 import { vscode } from "../vscode-api";
-import { VariantAnalysisFailureReason } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisFailureReason } from "../../variant-analysis/shared/variant-analysis";
 
 type Props = {
   failureReason: VariantAnalysisFailureReason;

extensions/ql-vscode/src/view/variant-analysis/RepoRow.tsx

@@ -7,7 +7,7 @@ import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisScannedRepositoryState,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import { formatDecimal } from "../../pure/number";
 import {
   Codicon,
@@ -16,11 +16,11 @@ import {
   SuccessIcon,
   WarningIcon,
 } from "../common";
-import { RepositoryWithMetadata } from "../../remote-queries/shared/repository";
+import { RepositoryWithMetadata } from "../../variant-analysis/shared/repository";
 import {
   AnalysisAlert,
   AnalysisRawResults,
-} from "../../remote-queries/shared/analysis-result";
+} from "../../variant-analysis/shared/analysis-result";
 import { vscode } from "../vscode-api";
 import { AnalyzedRepoItemContent } from "./AnalyzedRepoItemContent";
 import StarCount from "../common/StarCount";

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx

@@ -6,7 +6,7 @@ import {
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import { VariantAnalysisHeader } from "./VariantAnalysisHeader";
 import { VariantAnalysisOutcomePanels } from "./VariantAnalysisOutcomePanels";
 import { VariantAnalysisLoading } from "./VariantAnalysisLoading";

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisActions.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import styled from "styled-components";
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 
 export type VariantAnalysisActionsProps = {
   variantAnalysisStatus: VariantAnalysisStatus;

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx

@@ -6,7 +6,7 @@ import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import {
   filterAndSortRepositoriesWithResultsByName,
   RepositoriesFilterSortState,

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx

@@ -8,7 +8,7 @@ import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisScannedRepositoryState,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import { QueryDetails } from "./QueryDetails";
 import { VariantAnalysisActions } from "./VariantAnalysisActions";
 import { VariantAnalysisStats } from "./VariantAnalysisStats";

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx

@@ -13,7 +13,7 @@ import {
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import { VariantAnalysisAnalyzedRepos } from "./VariantAnalysisAnalyzedRepos";
 import { Alert } from "../common";
 import { VariantAnalysisSkippedRepositoriesTab } from "./VariantAnalysisSkippedRepositoriesTab";

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisRepositoriesStats.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 import { formatDecimal } from "../../pure/number";
 import {
   ErrorIcon,

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useMemo } from "react";
 import styled from "styled-components";
-import { VariantAnalysisSkippedRepositoryGroup } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisSkippedRepositoryGroup } from "../../variant-analysis/shared/variant-analysis";
 import { Alert } from "../common";
 import { RepoRow } from "./RepoRow";
 import {

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStats.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useMemo } from "react";
 import styled from "styled-components";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 import { StatItem } from "./StatItem";
 import { formatDecimal } from "../../pure/number";
 import { humanizeUnit } from "../../pure/time";

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import styled from "styled-components";
 import { VSCodeLink } from "@vscode/webview-ui-toolkit/react";
 import { formatDate } from "../../pure/date";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 
 export type VariantAnalysisStatusStatsProps = {
   variantAnalysisStatus: VariantAnalysisStatus;

extensions/ql-vscode/src/view/variant-analysis/__tests__/AnalyzedRepoItemContent.spec.tsx

@@ -3,7 +3,7 @@ import { render as reactRender, screen } from "@testing-library/react";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../variant-analysis/shared/variant-analysis";
 import {
   AnalyzedRepoItemContent,
   AnalyzedRepoItemContentProps,

extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx

@@ -3,10 +3,10 @@ import { render as reactRender, screen, waitFor } from "@testing-library/react";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../variant-analysis/shared/variant-analysis";
 import userEvent from "@testing-library/user-event";
 import { RepoRow, RepoRowProps } from "../RepoRow";
-import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository";
 
 describe(RepoRow.name, () => {
   const render = (props: Partial<RepoRowProps> = {}) => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx

@@ -3,9 +3,9 @@ import { render as reactRender, screen } from "@testing-library/react";
 import {
   VariantAnalysisFailureReason,
   VariantAnalysisStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../variant-analysis/shared/variant-analysis";
 import { VariantAnalysis, VariantAnalysisProps } from "../VariantAnalysis";
-import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
 
 describe(VariantAnalysis.name, () => {
   const render = (props: Partial<VariantAnalysisProps> = {}) =>

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisActions.spec.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { render as reactRender, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../../variant-analysis/shared/variant-analysis";
 import {
   VariantAnalysisActions,
   VariantAnalysisActionsProps,

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx

@@ -5,14 +5,14 @@ import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../variant-analysis/shared/variant-analysis";
 import {
   VariantAnalysisAnalyzedRepos,
   VariantAnalysisAnalyzedReposProps,
 } from "../VariantAnalysisAnalyzedRepos";
-import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository";
-import { createMockScannedRepo } from "../../../../test/factories/remote-queries/shared/scanned-repositories";
+import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository";
+import { createMockScannedRepo } from "../../../../test/factories/variant-analysis/shared/scanned-repositories";
 import {
   defaultFilterSortState,
   SortKey,

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx

@@ -5,17 +5,17 @@ import {
   VariantAnalysisFailureReason,
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../variant-analysis/shared/variant-analysis";
 import {
   VariantAnalysisOutcomePanelProps,
   VariantAnalysisOutcomePanels,
 } from "../VariantAnalysisOutcomePanels";
-import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository";
+import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository";
 import {
   createMockScannedRepo,
   createMockScannedRepos,
-} from "../../../../test/factories/remote-queries/shared/scanned-repositories";
+} from "../../../../test/factories/variant-analysis/shared/scanned-repositories";
 import { defaultFilterSortState } from "../../../pure/variant-analysis-filter-sort";
 
 describe(VariantAnalysisOutcomePanels.name, () => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { render as reactRender, screen } from "@testing-library/react";
-import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../../variant-analysis/shared/variant-analysis";
 import {
   VariantAnalysisStats,
   VariantAnalysisStatsProps,

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { render as reactRender, screen } from "@testing-library/react";
-import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../../variant-analysis/shared/variant-analysis";
 import {
   VariantAnalysisStatusStats,
   VariantAnalysisStatusStatsProps,

extensions/ql-vscode/test/factories/query-history/variant-analysis-history-item.ts

@@ -3,8 +3,8 @@ import { QueryStatus } from "../../../src/query-status";
 import {
   VariantAnalysis,
   VariantAnalysisStatus,
-} from "../../../src/remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../remote-queries/shared/variant-analysis";
+} from "../../../src/variant-analysis/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../variant-analysis/shared/variant-analysis";
 
 export function createMockVariantAnalysisHistoryItem({
   historyItemStatus = QueryStatus.InProgress,

extensions/ql-vscode/test/factories/variant-analysis/gh-api/repository.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   Repository,
   RepositoryWithMetadata,
-} from "../../../../src/remote-queries/gh-api/repository";
+} from "../../../../src/variant-analysis/gh-api/repository";
 
 export function createMockRepository(name = faker.random.word()): Repository {
   return {

extensions/ql-vscode/test/factories/variant-analysis/gh-api/scanned-repositories.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepository,
-} from "../../../../src/remote-queries/gh-api/variant-analysis";
+} from "../../../../src/variant-analysis/gh-api/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockScannedRepo(

extensions/ql-vscode/test/factories/variant-analysis/gh-api/skipped-repositories.ts

@@ -3,7 +3,7 @@ import {
   VariantAnalysisNotFoundRepositoryGroup,
   VariantAnalysisSkippedRepositories,
   VariantAnalysisSkippedRepositoryGroup,
-} from "../../../../src/remote-queries/gh-api/variant-analysis";
+} from "../../../../src/variant-analysis/gh-api/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockSkippedRepos(): VariantAnalysisSkippedRepositories {

extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-api-response.ts

@@ -4,8 +4,8 @@ import {
   VariantAnalysisScannedRepository,
   VariantAnalysisSkippedRepositories,
   VariantAnalysisStatus,
-} from "../../../../src/remote-queries/gh-api/variant-analysis";
-import { VariantAnalysisQueryLanguage } from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/gh-api/variant-analysis";
+import { VariantAnalysisQueryLanguage } from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createMockScannedRepos } from "./scanned-repositories";
 import { createMockSkippedRepos } from "./skipped-repositories";
 import { createMockRepository } from "./repository";

extensions/ql-vscode/test/factories/variant-analysis/gh-api/variant-analysis-repo-task.ts

@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
-import { VariantAnalysisRepoTask } from "../../../../src/remote-queries/gh-api/variant-analysis";
-import { VariantAnalysisRepoStatus } from "../../../../src/remote-queries/shared/variant-analysis";
+import { VariantAnalysisRepoTask } from "../../../../src/variant-analysis/gh-api/variant-analysis";
+import { VariantAnalysisRepoStatus } from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createMockRepository } from "./repository";
 
 export function createMockVariantAnalysisRepoTask(): VariantAnalysisRepoTask {

extensions/ql-vscode/test/factories/variant-analysis/shared/AnalysisMessage.ts

@@ -1,4 +1,4 @@
-import { AnalysisMessage } from "../../../../src/remote-queries/shared/analysis-result";
+import { AnalysisMessage } from "../../../../src/variant-analysis/shared/analysis-result";
 
 export function createMockAnalysisMessage(): AnalysisMessage {
   return {

extensions/ql-vscode/test/factories/variant-analysis/shared/CodeFlow.ts

@@ -1,4 +1,4 @@
-import { CodeFlow } from "../../../../src/remote-queries/shared/analysis-result";
+import { CodeFlow } from "../../../../src/variant-analysis/shared/analysis-result";
 import { createMockAnalysisMessage } from "./AnalysisMessage";
 
 export function createMockCodeFlows(): CodeFlow[] {

extensions/ql-vscode/test/factories/variant-analysis/shared/repository.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   Repository,
   RepositoryWithMetadata,
-} from "../../../../src/remote-queries/shared/repository";
+} from "../../../../src/variant-analysis/shared/repository";
 
 export function createMockRepository(): Repository {
   return {

extensions/ql-vscode/test/factories/variant-analysis/shared/scanned-repositories.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepository,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockScannedRepo(

extensions/ql-vscode/test/factories/variant-analysis/shared/skipped-repositories.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisSkippedRepositories,
   VariantAnalysisSkippedRepositoryGroup,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockSkippedRepos(): VariantAnalysisSkippedRepositories {

extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-repo-tasks.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisRepoStatus,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockVariantAnalysisRepositoryTask(

extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-submission.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisQueryLanguage,
   VariantAnalysisSubmission,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 
 export function createMockSubmission(): VariantAnalysisSubmission {
   return {

extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis.ts

@@ -5,7 +5,7 @@ import {
   VariantAnalysisScannedRepository,
   VariantAnalysisSkippedRepositories,
   VariantAnalysisStatus,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createMockScannedRepos } from "./scanned-repositories";
 import { createMockSkippedRepos } from "./skipped-repositories";
 import { createMockRepository } from "./repository";

extensions/ql-vscode/test/unit-tests/sarif-processing.test.ts

@@ -3,11 +3,11 @@ import {
   extractAnalysisAlerts,
   tryGetRule,
   tryGetSeverity,
-} from "../../src/remote-queries/sarif-processing";
+} from "../../src/variant-analysis/sarif-processing";
 import {
   AnalysisMessage,
   AnalysisMessageLocationToken,
-} from "../../src/remote-queries/shared/analysis-result";
+} from "../../src/variant-analysis/shared/analysis-result";
 
 describe("SARIF processing", () => {
   describe("tryGetRule", () => {

extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts

@@ -6,9 +6,9 @@ import {
   isVariantAnalysisComplete,
   VariantAnalysisRepoStatus,
   getActionsWorkflowRunUrl,
-} from "../../src/remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../factories/remote-queries/shared/scanned-repositories";
-import { createMockVariantAnalysis } from "../factories/remote-queries/shared/variant-analysis";
+} from "../../src/variant-analysis/shared/variant-analysis";
+import { createMockScannedRepo } from "../factories/variant-analysis/shared/scanned-repositories";
+import { createMockVariantAnalysis } from "../factories/variant-analysis/shared/variant-analysis";
 
 describe("parseVariantAnalysisQueryLanguage", () => {
   it("parses a valid language", () => {

extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts

@@ -3,8 +3,8 @@ import {
   getVariantAnalysis,
   getVariantAnalysisRepo,
   submitVariantAnalysis,
-} from "../../../../src/remote-queries/gh-api/gh-api-client";
-import { createMockSubmission } from "../../../factories/remote-queries/shared/variant-analysis-submission";
+} from "../../../../src/variant-analysis/gh-api/gh-api-client";
+import { createMockSubmission } from "../../../factories/variant-analysis/shared/variant-analysis-submission";
 import { MockGitHubApiServer } from "../../../../src/mocks/mock-gh-api-server";
 
 import { response } from "../../../../src/mocks/scenarios/problem-query-success/0-getRepo.json";

extensions/ql-vscode/test/unit-tests/variant-analysis/markdown-generation.test.ts

@@ -4,17 +4,17 @@ import { readdir, readFile } from "fs-extra";
 import {
   generateVariantAnalysisMarkdown,
   MarkdownFile,
-} from "../../../src/remote-queries/markdown-generation";
+} from "../../../src/variant-analysis/markdown-generation";
 import {
   VariantAnalysisQueryLanguage,
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepository,
   VariantAnalysisScannedRepositoryResult,
-} from "../../../src/remote-queries/shared/variant-analysis";
+} from "../../../src/variant-analysis/shared/variant-analysis";
 import {
   AnalysisAlert,
   AnalysisRawResults,
-} from "../../../src/remote-queries/shared/analysis-result";
+} from "../../../src/variant-analysis/shared/analysis-result";
 
 import pathProblemAnalysesResults from "../data/markdown-generation/interpreted-results/path-problem/analyses-results.json";
 import problemAnalysesResults from "../data/markdown-generation/interpreted-results/problem/analyses-results.json";

extensions/ql-vscode/test/unit-tests/variant-analysis/variant-analysis-processor.test.ts

@@ -1,23 +1,23 @@
 import { faker } from "@faker-js/faker";
-import { VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository } from "../../../src/remote-queries/gh-api/variant-analysis";
+import { VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository } from "../../../src/variant-analysis/gh-api/variant-analysis";
 import {
   VariantAnalysisQueryLanguage,
   VariantAnalysisScannedRepository,
   VariantAnalysisRepoStatus,
-} from "../../../src/remote-queries/shared/variant-analysis";
+} from "../../../src/variant-analysis/shared/variant-analysis";
 import {
   processScannedRepository,
   processVariantAnalysis,
   processVariantAnalysisRepositoryTask,
-} from "../../../src/remote-queries/variant-analysis-processor";
+} from "../../../src/variant-analysis/variant-analysis-processor";
 import {
   createMockScannedRepo,
   createMockScannedRepos,
-} from "../../factories/remote-queries/gh-api/scanned-repositories";
-import { createMockSkippedRepos } from "../../factories/remote-queries/gh-api/skipped-repositories";
-import { createMockApiResponse } from "../../factories/remote-queries/gh-api/variant-analysis-api-response";
-import { createMockSubmission } from "../../factories/remote-queries/shared/variant-analysis-submission";
-import { createMockVariantAnalysisRepoTask } from "../../factories/remote-queries/gh-api/variant-analysis-repo-task";
+} from "../../factories/variant-analysis/gh-api/scanned-repositories";
+import { createMockSkippedRepos } from "../../factories/variant-analysis/gh-api/skipped-repositories";
+import { createMockApiResponse } from "../../factories/variant-analysis/gh-api/variant-analysis-api-response";
+import { createMockSubmission } from "../../factories/variant-analysis/shared/variant-analysis-submission";
+import { createMockVariantAnalysisRepoTask } from "../../factories/variant-analysis/gh-api/variant-analysis-repo-task";
 
 describe(processVariantAnalysis.name, () => {
   const scannedRepos = createMockScannedRepos();

extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts

@@ -17,44 +17,44 @@ import {
   setRemoteControllerRepo,
   setRemoteRepositoryLists,
 } from "../../../../src/config";
-import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client";
-import * as ghActionsApiClient from "../../../../src/remote-queries/gh-api/gh-actions-api-client";
+import * as ghApiClient from "../../../../src/variant-analysis/gh-api/gh-api-client";
+import * as ghActionsApiClient from "../../../../src/variant-analysis/gh-api/gh-actions-api-client";
 import * as fs from "fs-extra";
 import { join } from "path";
 import { Readable } from "stream";
 import { Response } from "node-fetch";
 import * as fetchModule from "node-fetch";
 
-import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager";
+import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
 import { CodeQLCliServer } from "../../../../src/cli";
 import {
   fixWorkspaceReferences,
   restoreWorkspaceReferences,
   storagePath,
 } from "../../global.helper";
-import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager";
-import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis";
-import * as VariantAnalysisModule from "../../../../src/remote-queries/shared/variant-analysis";
+import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager";
+import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis";
+import * as VariantAnalysisModule from "../../../../src/variant-analysis/shared/variant-analysis";
 import {
   createMockScannedRepo,
   createMockScannedRepos,
-} from "../../../factories/remote-queries/shared/scanned-repositories";
+} from "../../../factories/variant-analysis/shared/scanned-repositories";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 import { createTimestampFile } from "../../../../src/helpers";
-import { createMockVariantAnalysisRepoTask } from "../../../factories/remote-queries/gh-api/variant-analysis-repo-task";
+import { createMockVariantAnalysisRepoTask } from "../../../factories/variant-analysis/gh-api/variant-analysis-repo-task";
 import {
   VariantAnalysis as VariantAnalysisApiResponse,
   VariantAnalysisRepoTask,
-} from "../../../../src/remote-queries/gh-api/variant-analysis";
-import { createMockApiResponse } from "../../../factories/remote-queries/gh-api/variant-analysis-api-response";
+} from "../../../../src/variant-analysis/gh-api/variant-analysis";
+import { createMockApiResponse } from "../../../factories/variant-analysis/gh-api/variant-analysis-api-response";
 import { UserCancellationException } from "../../../../src/commandRunner";
-import { Repository } from "../../../../src/remote-queries/gh-api/repository";
+import { Repository } from "../../../../src/variant-analysis/gh-api/repository";
 import {
   defaultFilterSortState,
   SortKey,

extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-monitor.test.ts

@@ -1,29 +1,29 @@
 import { CancellationTokenSource, commands, extensions } from "vscode";
 import { CodeQLExtensionInterface } from "../../../../src/extension";
 
-import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client";
-import { VariantAnalysisMonitor } from "../../../../src/remote-queries/variant-analysis-monitor";
+import * as ghApiClient from "../../../../src/variant-analysis/gh-api/gh-api-client";
+import { VariantAnalysisMonitor } from "../../../../src/variant-analysis/variant-analysis-monitor";
 import {
   VariantAnalysis as VariantAnalysisApiResponse,
   VariantAnalysisFailureReason,
   VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository,
-} from "../../../../src/remote-queries/gh-api/variant-analysis";
+} from "../../../../src/variant-analysis/gh-api/variant-analysis";
 import {
   createFailedMockApiResponse,
   createMockApiResponse,
-} from "../../../factories/remote-queries/gh-api/variant-analysis-api-response";
+} from "../../../factories/variant-analysis/gh-api/variant-analysis-api-response";
 import {
   VariantAnalysis,
   VariantAnalysisStatus,
-} from "../../../../src/remote-queries/shared/variant-analysis";
-import { createMockScannedRepos } from "../../../factories/remote-queries/gh-api/scanned-repositories";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
+import { createMockScannedRepos } from "../../../factories/variant-analysis/gh-api/scanned-repositories";
 import {
   processFailureReason,
   processScannedRepository,
   processUpdatedVariantAnalysis,
-} from "../../../../src/remote-queries/variant-analysis-processor";
-import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis";
-import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager";
+} from "../../../../src/variant-analysis/variant-analysis-processor";
+import { createMockVariantAnalysis } from "../../../factories/variant-analysis/shared/variant-analysis";
+import { VariantAnalysisManager } from "../../../../src/variant-analysis/variant-analysis-manager";
 import { testCredentialsWithStub } from "../../../factories/authentication";
 
 jest.setTimeout(60_000);

extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-results-manager.test.ts

@@ -7,15 +7,15 @@ import { Readable } from "stream";
 import { Response, RequestInfo, RequestInit } from "node-fetch";
 import * as fetchModule from "node-fetch";
 
-import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager";
+import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager";
 import { CodeQLCliServer } from "../../../../src/cli";
 import { storagePath } from "../../global.helper";
 import { faker } from "@faker-js/faker";
-import { createMockVariantAnalysisRepositoryTask } from "../../../factories/remote-queries/shared/variant-analysis-repo-tasks";
+import { createMockVariantAnalysisRepositoryTask } from "../../../factories/variant-analysis/shared/variant-analysis-repo-tasks";
 import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisScannedRepositoryResult,
-} from "../../../../src/remote-queries/shared/variant-analysis";
+} from "../../../../src/variant-analysis/shared/variant-analysis";
 
 jest.setTimeout(10_000);
 

extensions/ql-vscode/test/vscode-tests/global.helper.ts

@@ -4,7 +4,7 @@ import { realpathSync, readFileSync, writeFileSync } from "fs-extra";
 import { commands } from "vscode";
 import { DatabaseManager } from "../../src/databases";
 import { CodeQLCliServer } from "../../src/cli";
-import { removeWorkspaceRefs } from "../../src/remote-queries/run-remote-query";
+import { removeWorkspaceRefs } from "../../src/variant-analysis/run-remote-query";
 
 // This file contains helpers shared between tests that work with an activated extension.