Fix typo

Remove support for CodeQL CLI versions older than v2.16.6

.github/workflows/e2e-tests.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Start containers
         working-directory: extensions/ql-vscode/test/e2e
-        run: docker-compose -f "docker-compose.yml" up -d --build
+        run: docker compose -f "docker-compose.yml" up -d --build
 
       - name: Install Playwright Browsers
         working-directory: extensions/ql-vscode
@@ -43,4 +43,4 @@ jobs:
       - name: Stop containers
         working-directory: extensions/ql-vscode/test/e2e
         if: always()
-        run: docker-compose -f "docker-compose.yml" down -v
+        run: docker compose -f "docker-compose.yml" down -v

.github/workflows/main.yml

@@ -79,13 +79,6 @@ jobs:
         run: |
           npm run check-types
 
-      - name: Lint
-        working-directory: extensions/ql-vscode
-        env:
-          NODE_OPTIONS: '--max-old-space-size=4096'
-        run: |
-          npm run lint
-
       - name: Lint Markdown
         working-directory: extensions/ql-vscode
         run: |
@@ -101,6 +94,21 @@ jobs:
         run: |
           npm run find-deadcode
 
+      - name: Lint
+        if: "${{ !cancelled() }}"
+        working-directory: extensions/ql-vscode
+        env:
+          NODE_OPTIONS: '--max-old-space-size=4096'
+        run: |
+          npm run lint-ci
+
+      - name: Upload ESLint results to Code Scanning
+        if: "${{ !cancelled() && !startsWith(github.head_ref, 'dependabot/')}}"
+        uses: github/codeql-action/upload-sarif@main
+        with:
+          sarif_file: extensions/ql-vscode/build/eslint.sarif
+          category: eslint
+
   generated:
     name: Check generated code
     runs-on: ubuntu-latest

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 cd extensions/ql-vscode && npm run format-staged

.husky/pre-push

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 cd extensions/ql-vscode && ./scripts/forbid-test-only

extensions/ql-vscode/.eslintignore

@@ -3,5 +3,14 @@ node_modules/
 out/
 build/
 
+# Ignore js files
+.eslintrc.js
+jest.config.js
+test/vscode-tests/activated-extension/jest-runner-vscode.config.js
+test/vscode-tests/cli-integration/jest-runner-vscode.config.js
+test/vscode-tests/jest-runner-vscode.config.base.js
+test/vscode-tests/minimal-workspace/jest-runner-vscode.config.js
+test/vscode-tests/no-workspace/jest-runner-vscode.config.js
+
 # Include the Storybook config
 !.storybook

extensions/ql-vscode/.eslintrc.js

@@ -45,7 +45,7 @@ const baseConfig = {
     "@typescript-eslint/no-invalid-this": "off",
     "@typescript-eslint/no-shadow": "off",
     "prefer-const": ["warn", { destructuring: "all" }],
-    "@typescript-eslint/no-throw-literal": "error",
+    "@typescript-eslint/only-throw-error": "error",
     "@typescript-eslint/consistent-type-imports": "error",
     "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
     curly: ["error", "all"],
@@ -133,18 +133,7 @@ module.exports = {
         ...baseConfig.rules,
         // We want to allow mocking of functions in modules, so we need to allow namespace imports.
         "import/no-namespace": "off",
-        "@typescript-eslint/ban-types": [
+        "@typescript-eslint/no-unsafe-function-type": "off",
-          "error",
-          {
-            // For a full list of the default banned types, see:
-            // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/ban-types.md
-            extendDefaults: true,
-            types: {
-              // Don't complain about the `Function` type in test files. (Default is `true`.)
-              Function: false,
-            },
-          },
-        ],
       },
     },
     {

extensions/ql-vscode/.nvmrc

@@ -1 +1 @@
-v20.9.0
+v20.15.1

extensions/ql-vscode/.storybook/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "module": "esnext",
     "moduleResolution": "node",
-    "target": "es6",
+    "target": "es2021",
     "outDir": "out",
     "lib": ["ES2021", "dom"],
     "jsx": "react",

extensions/ql-vscode/.storybook/vscode-theme-addon/manager.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { addons } from "@storybook/manager-api";
-import { Addon_TypesEnum } from "@storybook/types";
+import { Addon_TypesEnum } from "storybook/internal/types";
 import { ThemeSelector } from "./ThemeSelector";
 
 const ADDON_ID = "vscode-theme-addon";

extensions/ql-vscode/CHANGELOG.md

@@ -1,6 +1,15 @@
 # CodeQL for Visual Studio Code: Changelog
 
-## [UNRELEASED]
+## 1.15.0 - 26 September 2024
+
+- Update results view to display the length of the shortest path for path queries. [#3687](https://github.com/github/vscode-codeql/pull/3687)
+- Remove support for CodeQL CLI versions older than 2.16.6. [#3728](https://github.com/github/vscode-codeql/pull/3728)
+
+## 1.14.0 - 7 August 2024
+
+- Add Python support to the CodeQL Model Editor. [#3676](https://github.com/github/vscode-codeql/pull/3676)
+- Update variant analysis view to display the length of the shortest path for path queries. [#3671](https://github.com/github/vscode-codeql/pull/3671)
+- Remove support for CodeQL CLI versions older than 2.15.5. [#3681](https://github.com/github/vscode-codeql/pull/3681)
 
 ## 1.13.1 - 29 May 2024
 

extensions/ql-vscode/gulpfile.ts/appInsights.ts

@@ -1,5 +1,5 @@
 import { src, dest } from "gulp";
-// eslint-disable-next-line @typescript-eslint/no-var-requires,import/no-commonjs
+// eslint-disable-next-line @typescript-eslint/no-require-imports,import/no-commonjs
 const replace = require("gulp-replace");
 
 /** Inject the application insights key into the telemetry file */

extensions/ql-vscode/gulpfile.ts/typescript.ts

@@ -77,5 +77,8 @@ export function copyWasmFiles() {
   // to configure the path to the WASM file. So, source-map will always load the file from `__dirname/mappings.wasm`.
   // In version 0.8.0, it may be possible to do this properly by calling SourceMapConsumer.initialize by
   // using the "browser" field in source-map's package.json to load the WASM file from a given file path.
-  return src("node_modules/source-map/lib/mappings.wasm").pipe(dest("out"));
+  return src("node_modules/source-map/lib/mappings.wasm", {
+    // WASM is a binary format, so don't try to re-encode it as text.
+    encoding: false,
+  }).pipe(dest("out"));
 }

extensions/ql-vscode/package.json

@@ -4,7 +4,7 @@
   "description": "CodeQL for Visual Studio Code",
   "author": "GitHub",
   "private": true,
-  "version": "1.13.2",
+  "version": "1.15.0",
   "publisher": "GitHub",
   "license": "MIT",
   "icon": "media/VS-marketplace-CodeQL-icon.png",
@@ -14,7 +14,7 @@
   },
   "engines": {
     "vscode": "^1.82.0",
-    "node": "^20.9.0",
+    "node": "^20.15.1",
     "npm": ">=7.20.6"
   },
   "categories": [
@@ -1790,8 +1790,7 @@
           "when": "false"
         },
         {
-          "command": "codeQL.trimCache",
+          "command": "codeQL.trimCache"
-          "when": "codeql.supportsTrimCache"
         }
       ],
       "editor/context": [
@@ -1954,6 +1953,7 @@
     "update-vscode": "node ./node_modules/vscode/bin/install",
     "format": "prettier --write **/*.{ts,tsx} && eslint . --ext .ts,.tsx --fix",
     "lint": "eslint . --ext .js,.ts,.tsx --max-warnings=0",
+    "lint-ci": "SARIF_ESLINT_IGNORE_SUPPRESSED=true eslint . --ext .js,.ts,.tsx --max-warnings=0 --format @microsoft/eslint-formatter-sarif --output-file=build/eslint.sarif",
     "lint:markdown": "markdownlint-cli2 \"../../**/*.{md,mdx}\" \"!**/node_modules/**\" \"!**/.vscode-test/**\" \"!**/build/cli/v*/**\"",
     "find-deadcode": "vite-node scripts/find-deadcode.ts",
     "format-staged": "lint-staged",
@@ -1969,10 +1969,10 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.26.12",
-    "@octokit/plugin-retry": "^6.0.1",
+    "@octokit/plugin-retry": "^7.1.2",
-    "@octokit/plugin-throttling": "^8.0.0",
+    "@octokit/plugin-throttling": "^9.3.1",
-    "@octokit/rest": "^20.0.2",
+    "@octokit/rest": "^21.0.2",
-    "@vscode/codicons": "^0.0.35",
+    "@vscode/codicons": "^0.0.36",
     "@vscode/debugadapter": "^1.59.0",
     "@vscode/debugprotocol": "^1.65.0",
     "@vscode/webview-ui-toolkit": "^1.0.1",
@@ -1985,7 +1985,7 @@
     "js-yaml": "^4.1.0",
     "msw": "^2.2.13",
     "nanoid": "^5.0.7",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^3.3.2",
     "p-queue": "^8.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -1998,36 +1998,37 @@
     "tmp-promise": "^3.0.2",
     "tree-kill": "^1.2.2",
     "vscode-extension-telemetry": "^0.1.6",
-    "vscode-jsonrpc": "^8.0.2",
+    "vscode-jsonrpc": "^8.2.1",
     "vscode-languageclient": "^8.0.2",
     "yauzl": "^2.10.0",
     "zip-a-folder": "^3.1.6"
   },
   "devDependencies": {
     "@babel/core": "^7.24.6",
-    "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+    "@babel/plugin-transform-modules-commonjs": "^7.24.7",
     "@babel/preset-env": "^7.24.4",
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.21.4",
     "@faker-js/faker": "^8.4.1",
     "@github/markdownlint-github": "^0.6.2",
+    "@microsoft/eslint-formatter-sarif": "^3.1.0",
     "@playwright/test": "^1.40.1",
-    "@storybook/addon-a11y": "^8.1.10",
+    "@storybook/addon-a11y": "^8.3.1",
-    "@storybook/addon-actions": "^8.1.10",
+    "@storybook/addon-actions": "^8.3.1",
-    "@storybook/addon-essentials": "^8.1.10",
+    "@storybook/addon-essentials": "^8.3.1",
-    "@storybook/addon-interactions": "^8.1.10",
+    "@storybook/addon-interactions": "^8.3.1",
-    "@storybook/addon-links": "^8.1.10",
+    "@storybook/addon-links": "^8.3.1",
     "@storybook/blocks": "^8.0.2",
-    "@storybook/components": "^8.0.2",
+    "@storybook/components": "^8.3.1",
-    "@storybook/csf": "^0.1.8",
+    "@storybook/csf": "^0.1.11",
-    "@storybook/icons": "^1.2.9",
+    "@storybook/icons": "^1.2.12",
-    "@storybook/manager-api": "^8.1.10",
+    "@storybook/manager-api": "^8.3.1",
-    "@storybook/react": "^8.1.10",
+    "@storybook/react": "^8.3.1",
-    "@storybook/react-vite": "^8.1.10",
+    "@storybook/react-vite": "^8.3.1",
-    "@storybook/theming": "^8.1.10",
+    "@storybook/theming": "^8.2.4",
-    "@testing-library/dom": "^10.1.0",
+    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.4.6",
+    "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/react": "^16.0.0",
+    "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
     "@types/child-process-promise": "^2.2.1",
     "@types/d3": "^7.4.0",
@@ -2039,8 +2040,7 @@
     "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4.0.6",
     "@types/nanoid": "^3.0.0",
-    "@types/node": "20.9.*",
+    "@types/node": "20.15.*",
-    "@types/node-fetch": "^2.5.2",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "@types/sarif": "^2.1.2",
@@ -2052,8 +2052,8 @@
     "@types/tmp": "^0.2.6",
     "@types/vscode": "^1.82.0",
     "@types/yauzl": "^2.10.3",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.6.0",
-    "@typescript-eslint/parser": "^7.5.0",
+    "@typescript-eslint/parser": "^8.6.0",
     "@vscode/test-electron": "^2.3.9",
     "@vscode/vsce": "^2.24.0",
     "ansi-colors": "^4.1.1",
@@ -2064,21 +2064,21 @@
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-deprecation": "^2.0.0",
+    "eslint-plugin-deprecation": "^3.0.0",
     "eslint-plugin-etc": "^2.0.2",
-    "eslint-plugin-github": "^4.10.2",
+    "eslint-plugin-github": "^5.0.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest-dom": "^5.2.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.34.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-storybook": "^0.8.0",
     "glob": "^10.0.0",
-    "gulp": "^4.0.2",
+    "gulp": "^5.0.0",
-    "gulp-esbuild": "^0.12.0",
+    "gulp-esbuild": "^0.12.1",
     "gulp-replace": "^1.1.3",
     "gulp-typescript": "^5.0.1",
-    "husky": "^9.0.11",
+    "husky": "^9.1.5",
     "jest": "^29.0.3",
     "jest-environment-jsdom": "^29.0.3",
     "jest-runner-vscode": "^3.0.1",
@@ -2088,16 +2088,16 @@
     "npm-run-all": "^4.1.5",
     "patch-package": "^8.0.0",
     "prettier": "^3.2.5",
-    "storybook": "^8.1.10",
+    "storybook": "^8.3.1",
     "tar-stream": "^3.1.7",
     "through2": "^4.0.2",
     "ts-jest": "^29.1.4",
     "ts-json-schema-generator": "^2.1.1",
     "ts-node": "^10.9.2",
     "ts-unused-exports": "^10.1.0",
-    "typescript": "^5.0.2",
+    "typescript": "^5.6.2",
-    "vite": "^5.2.11",
+    "vite": "^5.4.6",
-    "vite-node": "^1.5.3"
+    "vite-node": "^2.0.5"
   },
   "lint-staged": {
     "./**/*.{json,css,scss}": [

extensions/ql-vscode/src/codeql-cli/cli-version.ts

@@ -12,6 +12,7 @@ interface VersionResult {
 export interface CliFeatures {
   featuresInVersionResult?: boolean;
   mrvaPackCreate?: boolean;
+  generateSummarySymbolMap?: boolean;
 }
 
 export interface VersionAndFeatures {

extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -943,7 +943,7 @@ export class CodeQLCliServer implements Disposable {
           if (line.startsWith("Enter value for --github-auth-stdin")) {
             try {
               return await this.app.credentials.getAccessToken();
-            } catch (e) {
+            } catch {
               // If the user cancels the authentication prompt, we still need to give a value to the CLI.
               // By giving a potentially invalid value, the user will just get a 401/403 when they try to access a
               // private package and the access token is invalid.
@@ -1211,10 +1211,15 @@ export class CodeQLCliServer implements Disposable {
     outputPath: string,
     endSummaryPath: string,
   ): Promise<string> {
+    const supportsGenerateSummarySymbolMap =
+      await this.cliConstraints.supportsGenerateSummarySymbolMap();
     const subcommandArgs = [
       "--format=text",
       `--end-summary=${endSummaryPath}`,
       "--sourcemap",
+      ...(supportsGenerateSummarySymbolMap
+        ? ["--summary-symbol-map", "--minify-output"]
+        : []),
       inputPath,
       outputPath,
     ];
@@ -1750,14 +1755,6 @@ export class CodeQLCliServer implements Disposable {
         this._versionChangedListeners.forEach((listener) =>
           listener(newVersionAndFeatures),
         );
-        // this._version is only undefined upon config change, so we reset CLI-based context key only when necessary.
-        await this.app.commands.execute(
-          "setContext",
-          "codeql.supportsTrimCache",
-          newVersionAndFeatures.version.compare(
-            CliVersionConstraint.CLI_VERSION_WITH_TRIM_CACHE,
-          ) >= 0,
-        );
       } catch (e) {
         this._versionChangedListeners.forEach((listener) =>
           listener(undefined),
@@ -1912,45 +1909,17 @@ function shouldDebugCliServer() {
 export class CliVersionConstraint {
   // The oldest version of the CLI that we support. This is used to determine
   // whether to show a warning about the CLI being too old on startup.
-  public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.14.6");
+  public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.16.6");
-
-  /**
-   * CLI version where the query server supports the `evaluation/trimCache` method
-   * with `codeql database cleanup --mode=trim` semantics.
-   */
-  public static CLI_VERSION_WITH_TRIM_CACHE = new SemVer("2.15.1");
-
-  public static CLI_VERSION_WITHOUT_MRVA_EXTENSIBLE_PREDICATE_HACK = new SemVer(
-    "2.16.1",
-  );
-
-  /**
-   * CLI version where there is support for multiple queries on the pack create command.
-   */
-  public static CLI_VERSION_WITH_MULTI_QUERY_PACK_CREATE = new SemVer("2.16.1");
 
   constructor(private readonly cli: CodeQLCliServer) {
     /**/
   }
 
-  private async isVersionAtLeast(v: SemVer) {
-    return (await this.cli.getVersion()).compare(v) >= 0;
-  }
-
-  async preservesExtensiblePredicatesInMrvaPack() {
-    // Negated, because we _stopped_ preserving these in 2.16.1.
-    return !(await this.isVersionAtLeast(
-      CliVersionConstraint.CLI_VERSION_WITHOUT_MRVA_EXTENSIBLE_PREDICATE_HACK,
-    ));
-  }
-
-  async supportsPackCreateWithMultipleQueries() {
-    return this.isVersionAtLeast(
-      CliVersionConstraint.CLI_VERSION_WITH_MULTI_QUERY_PACK_CREATE,
-    );
-  }
-
   async supportsMrvaPackCreate(): Promise<boolean> {
     return (await this.cli.getFeatures()).mrvaPackCreate === true;
   }
+
+  async supportsGenerateSummarySymbolMap(): Promise<boolean> {
+    return (await this.cli.getFeatures()).generateSummarySymbolMap === true;
+  }
 }

extensions/ql-vscode/src/codeql-cli/distribution.ts

@@ -404,6 +404,11 @@ class ExtensionSpecificDistributionManager {
           signal,
         );
 
+      const body = assetStream.body;
+      if (!body) {
+        throw new Error("No body in asset stream");
+      }
+
       const archivePath = join(tmpDirectory, "distributionDownload.zip");
       archiveFile = createWriteStream(archivePath);
 
@@ -412,26 +417,23 @@ class ExtensionSpecificDistributionManager {
         ? parseInt(contentLength, 10)
         : undefined;
       reportStreamProgress(
-        assetStream.body,
+        body,
         `Downloading CodeQL CLI ${release.name}…`,
         totalNumBytes,
         progressCallback,
       );
 
-      assetStream.body.on("data", onData);
+      body.on("data", onData);
 
       await new Promise((resolve, reject) => {
         if (!archiveFile) {
           throw new Error("Invariant violation: archiveFile not set");
         }
 
-        assetStream.body
+        body.pipe(archiveFile).on("finish", resolve).on("error", reject);
-          .pipe(archiveFile)
-          .on("finish", resolve)
-          .on("error", reject);
 
         // If an error occurs on the body, we also want to reject the promise (e.g. during a timeout error).
-        assetStream.body.on("error", reject);
+        body.on("error", reject);
       });
 
       disposeTimeout();

extensions/ql-vscode/src/codeql-cli/distribution/releases-api-consumer.ts

@@ -34,9 +34,9 @@ export class ReleasesApiConsumer {
     additionalCompatibilityCheck?: (release: GithubRelease) => boolean,
   ): Promise<Release> {
     const apiPath = `/repos/${this.repositoryNwo}/releases`;
-    const allReleases: GithubRelease[] = await (
+    const allReleases = (await (
       await this.makeApiCall(apiPath)
-    ).json();
+    ).json()) as GithubRelease[];
     const compatibleReleases = allReleases.filter((release) => {
       if (release.prerelease && !includePrerelease) {
         return false;

extensions/ql-vscode/src/codeql-cli/query-language.ts

@@ -36,7 +36,7 @@ export async function findLanguage(
       void extLogger.log(
         "Query language is unsupported. Select language manually.",
       );
-    } catch (e) {
+    } catch {
       void extLogger.log(
         "Could not autodetect query language. Select language manually.",
       );

extensions/ql-vscode/src/common/github-url-identifier-helper.ts

@@ -78,7 +78,7 @@ function getNwoOrOwnerFromGitHubUrl(
     }
     const nwo = `${paths[0]}/${paths[1]}`;
     return paths[1] ? nwo : undefined;
-  } catch (e) {
+  } catch {
     // Ignore the error here, since we catch failures at a higher level.
     return;
   }

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

@@ -147,6 +147,21 @@ interface SetStateMsg {
   parsedResultSets: ParsedResultSets;
 }
 
+export interface UserSettings {
+  /** Whether to display links to the dataflow models that generated particular nodes in a flow path. */
+  shouldShowProvenance: boolean;
+}
+
+export const DEFAULT_USER_SETTINGS: UserSettings = {
+  shouldShowProvenance: false,
+};
+
+/** Message indicating that the user's configuration settings have changed. */
+interface SetUserSettingsMsg {
+  t: "setUserSettings";
+  userSettings: UserSettings;
+}
+
 /**
  * Message indicating that the results view should display interpreted
  * results.
@@ -191,6 +206,7 @@ interface UntoggleShowProblemsMsg {
 export type IntoResultsViewMsg =
   | ResultsUpdatingMsg
   | SetStateMsg
+  | SetUserSettingsMsg
   | ShowInterpretedPageMsg
   | NavigateMsg
   | UntoggleShowProblemsMsg;
@@ -208,13 +224,15 @@ export type FromResultsViewMsg =
   | OpenFileMsg;
 
 /**
- * Message from the results view to open a database source
+ * Message from the results view to open a source
  * file at the provided location.
  */
 interface ViewSourceFileMsg {
   t: "viewSourceFile";
   loc: UrlValueResolvable;
-  databaseUri: string;
+  /** URI of the database whose source archive contains the file, or `undefined` to open a file from
+   * the local disk. The latter case is used for opening links to data extension model files. */
+  databaseUri: string | undefined;
 }
 
 /**
@@ -341,7 +359,8 @@ interface ChangeCompareMessage {
 
 export type ToCompareViewMessage =
   | SetComparisonQueryInfoMessage
-  | SetComparisonsMessage;
+  | SetComparisonsMessage
+  | SetUserSettingsMsg;
 
 /**
  * Message to the compare view that sets the metadata of the compared queries.
@@ -541,16 +560,6 @@ interface SetModifiedMethodsMessage {
   methodSignatures: string[];
 }
 
-interface SetInProgressMethodsMessage {
-  t: "setInProgressMethods";
-  methods: string[];
-}
-
-interface SetProcessedByAutoModelMethodsMessage {
-  t: "setProcessedByAutoModelMethods";
-  methods: string[];
-}
-
 interface SwitchModeMessage {
   t: "switchMode";
   mode: Mode;
@@ -582,17 +591,6 @@ interface GenerateMethodMessage {
   t: "generateMethod";
 }
 
-interface GenerateMethodsFromLlmMessage {
-  t: "generateMethodsFromLlm";
-  packageName: string;
-  methodSignatures: string[];
-}
-
-interface StopGeneratingMethodsFromLlmMessage {
-  t: "stopGeneratingMethodsFromLlm";
-  packageName: string;
-}
-
 interface StartModelEvaluationMessage {
   t: "startModelEvaluation";
 }
@@ -630,16 +628,6 @@ interface SetInModelingModeMessage {
   inModelingMode: boolean;
 }
 
-interface SetInProgressMessage {
-  t: "setInProgress";
-  inProgress: boolean;
-}
-
-interface SetProcessedByAutoModelMessage {
-  t: "setProcessedByAutoModel";
-  processedByAutoModel: boolean;
-}
-
 interface RevealMethodMessage {
   t: "revealMethod";
   methodSignature: string;
@@ -660,8 +648,6 @@ export type ToModelEditorMessage =
   | SetMethodsMessage
   | SetModeledAndModifiedMethodsMessage
   | SetModifiedMethodsMessage
-  | SetInProgressMethodsMessage
-  | SetProcessedByAutoModelMethodsMessage
   | RevealMethodMessage
   | SetAccessPathSuggestionsMessage
   | SetModelEvaluationRunMessage;
@@ -675,8 +661,6 @@ export type FromModelEditorMessage =
   | JumpToMethodMessage
   | SaveModeledMethods
   | GenerateMethodMessage
-  | GenerateMethodsFromLlmMessage
-  | StopGeneratingMethodsFromLlmMessage
   | ModelDependencyMessage
   | HideModeledMethodsMessage
   | SetMultipleModeledMethodsMessage
@@ -719,8 +703,6 @@ interface SetSelectedMethodMessage {
   method: Method;
   modeledMethods: ModeledMethod[];
   isModified: boolean;
-  isInProgress: boolean;
-  processedByAutoModel: boolean;
 }
 
 export type ToMethodModelingMessage =
@@ -729,9 +711,7 @@ export type ToMethodModelingMessage =
   | SetMethodModifiedMessage
   | SetNoMethodSelectedMessage
   | SetSelectedMethodMessage
-  | SetInModelingModeMessage
+  | SetInModelingModeMessage;
-  | SetInProgressMessage
-  | SetProcessedByAutoModelMessage;
 
 interface SetModelAlertsViewStateMessage {
   t: "setModelAlertsViewState";

extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts

@@ -14,7 +14,6 @@ export enum RequestKind {
   GetVariantAnalysisRepo = "getVariantAnalysisRepo",
   GetVariantAnalysisRepoResult = "getVariantAnalysisRepoResult",
   CodeSearch = "codeSearch",
-  AutoModel = "autoModel",
 }
 
 export interface BasicErrorResponse {
@@ -69,7 +68,7 @@ export interface GetVariantAnalysisRepoResultRequest {
   };
   response: {
     status: number;
-    body?: Buffer | string;
+    body?: ArrayBuffer | string;
     contentType: string;
   };
 }
@@ -92,31 +91,13 @@ interface CodeSearchRequest {
   };
 }
 
-export interface AutoModelResponse {
-  models: string;
-}
-
-interface AutoModelRequest {
-  request: {
-    kind: RequestKind.AutoModel;
-    body?: {
-      candidates: string;
-    };
-  };
-  response: {
-    status: number;
-    body?: AutoModelResponse | BasicErrorResponse;
-  };
-}
-
 export type GitHubApiRequest =
   | GetRepoRequest
   | SubmitVariantAnalysisRequest
   | GetVariantAnalysisRequest
   | GetVariantAnalysisRepoRequest
   | GetVariantAnalysisRepoResultRequest
-  | CodeSearchRequest
+  | CodeSearchRequest;
-  | AutoModelRequest;
 
 export const isGetRepoRequest = (
   request: GitHubApiRequest,
@@ -146,8 +127,3 @@ export const isCodeSearchRequest = (
   request: GitHubApiRequest,
 ): request is CodeSearchRequest =>
   request.request.kind === RequestKind.CodeSearch;
-
-export const isAutoModelRequest = (
-  request: GitHubApiRequest,
-): request is AutoModelRequest =>
-  request.request.kind === RequestKind.AutoModel;

extensions/ql-vscode/src/common/mock-gh-api/recorder.ts

@@ -8,7 +8,6 @@ import { DisposableObject } from "../disposable-object";
 import { gzipDecode } from "../zlib";
 
 import type {
-  AutoModelResponse,
   BasicErrorResponse,
   CodeSearchResponse,
   GetVariantAnalysisRepoResultRequest,
@@ -91,7 +90,14 @@ export class Recorder extends DisposableObject {
 
         let bodyFileLink = undefined;
         if (writtenRequest.response.body) {
-          await writeFile(bodyFilePath, writtenRequest.response.body);
+          if (typeof writtenRequest.response.body === "string") {
+            await writeFile(bodyFilePath, writtenRequest.response.body);
+          } else {
+            await writeFile(
+              bodyFilePath,
+              Buffer.from(writtenRequest.response.body),
+            );
+          }
           bodyFileLink = `file:${bodyFileName}`;
         }
 
@@ -226,7 +232,7 @@ async function createGitHubApiRequest(
         "x-vscode-codeql-msw-bypass": "true",
       },
     });
-    const responseBuffer = await response.buffer();
+    const responseBuffer = await response.arrayBuffer();
 
     return {
       request: {
@@ -258,23 +264,6 @@ async function createGitHubApiRequest(
     };
   }
 
-  const autoModelMatch = url.match(
-    /\/repos\/github\/codeql\/code-scanning\/codeql\/auto-model/,
-  );
-  if (autoModelMatch) {
-    return {
-      request: {
-        kind: RequestKind.AutoModel,
-      },
-      response: {
-        status,
-        body: await jsonResponseBody<
-          BasicErrorResponse | AutoModelResponse | undefined
-        >(response),
-      },
-    };
-  }
-
   return undefined;
 }
 

extensions/ql-vscode/src/common/mock-gh-api/request-handlers.ts

@@ -4,7 +4,6 @@ import type { RequestHandler } from "msw";
 import { http } from "msw";
 import type { GitHubApiRequest } from "./gh-api-request";
 import {
-  isAutoModelRequest,
   isCodeSearchRequest,
   isGetRepoRequest,
   isGetVariantAnalysisRepoRequest,
@@ -41,7 +40,6 @@ export async function createRequestHandlers(
     createGetVariantAnalysisRepoRequestHandler(requests),
     createGetVariantAnalysisRepoResultRequestHandler(requests),
     createCodeSearchRequestHandler(requests),
-    createAutoModelRequestHandler(requests),
   ];
 
   return handlers;
@@ -230,29 +228,3 @@ function createCodeSearchRequestHandler(
     });
   });
 }
-
-function createAutoModelRequestHandler(
-  requests: GitHubApiRequest[],
-): RequestHandler {
-  const autoModelRequests = requests.filter(isAutoModelRequest);
-  let requestIndex = 0;
-
-  // During automodeling there can be multiple API requests for each batch
-  // of candidates we want to model. We need to return different responses for each request,
-  // so keep an index of the request and return the appropriate response.
-  return http.post(
-    `${baseUrl}/repos/github/codeql/code-scanning/codeql/auto-model`,
-    () => {
-      const request = autoModelRequests[requestIndex];
-
-      if (requestIndex < autoModelRequests.length - 1) {
-        // If there are more requests to come, increment the index.
-        requestIndex++;
-      }
-
-      return jsonResponse(request.response.body, {
-        status: request.response.status,
-      });
-    },
-  );
-}

extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/0-autoModel.json

@@ -1,11 +0,0 @@
-{
-  "request": {
-    "kind": "autoModel"
-  },
-  "response": {
-    "status": 200,
-    "body": {
-      "models": "extensions:\n- addsTo: {extensible: sinkModel, pack: codeql/java-all}\n  data:\n  - [javax.servlet.http, HttpServletResponse, true, sendRedirect, (String), '', 'Argument[this]',\n    request-forgery, ai-generated]\n  - [javax.servlet.http, HttpServletResponse, true, sendRedirect, (String), '', 'Argument[0]',\n    request-forgery, ai-generated]\n"
-    }
-  }
-}

extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/1-autoModel.json

@@ -1,11 +0,0 @@
-{
-  "request": {
-    "kind": "autoModel"
-  },
-  "response": {
-    "status": 200,
-    "body": {
-      "models": "extensions:\n- addsTo: {extensible: sinkModel, pack: codeql/java-all}\n  data:\n  - [javax.servlet, MultipartConfigElement, true, MultipartConfigElement, (String),\n    '', 'Argument[0]', request-forgery, ai-generated]\n"
-    }
-  }
-}

extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/README.md

@@ -1 +0,0 @@
-This scenario is best when modeling the `javax.servlet-api` package.

extensions/ql-vscode/src/common/readonly.ts

@@ -1,14 +1,14 @@
 export type DeepReadonly<T> =
   T extends Array<infer R>
     ? DeepReadonlyArray<R>
-    : // eslint-disable-next-line @typescript-eslint/ban-types
+    : // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
       T extends Function
       ? T
       : T extends object
         ? DeepReadonlyObject<T>
         : T;
 
-interface DeepReadonlyArray<T> extends ReadonlyArray<DeepReadonly<T>> {}
+type DeepReadonlyArray<T> = ReadonlyArray<DeepReadonly<T>>;
 
 type DeepReadonlyObject<T> = {
   readonly [P in keyof T]: DeepReadonly<T[P]>;

extensions/ql-vscode/src/common/sarif-parser.ts

@@ -1,18 +1,20 @@
-import type { Log, Tool } from "sarif";
+import type { Log } from "sarif";
 import { createReadStream } from "fs-extra";
 import { connectTo } from "stream-json/Assembler";
 import { getErrorMessage } from "./helpers-pure";
-import { withParser } from "stream-json/filters/Pick";
+import { withParser } from "stream-json/filters/Ignore";
-
-const DUMMY_TOOL: Tool = { driver: { name: "" } };
 
 export async function sarifParser(
   interpretedResultsPath: string,
 ): Promise<Log> {
   try {
-    // Parse the SARIF file into token streams, filtering out only the results array.
+    // Parse the SARIF file into token streams, filtering out some of the larger subtrees that we
+    // don't need.
     const pipeline = createReadStream(interpretedResultsPath).pipe(
-      withParser({ filter: "runs.0.results" }),
+      withParser({
+        // We don't need to run's `artifacts` property, nor the driver's `notifications` property.
+        filter: /^runs\.\d+\.(artifacts|tool\.driver\.notifications)/,
+      }),
     );
 
     // Creates JavaScript objects from the token stream
@@ -38,15 +40,17 @@ export async function sarifParser(
       });
 
       asm.on("done", (asm) => {
-        const log: Log = {
+        const log = asm.current;
-          version: "2.1.0",
+
-          runs: [
+        // Do some trivial validation. This isn't a full validation of the SARIF file, but it's at
-            {
+        // least enough to ensure that we're not trying to parse complete garbage later.
-              tool: DUMMY_TOOL,
+        if (log.runs === undefined || log.runs.length < 1) {
-              results: asm.current ?? [],
+          reject(
-            },
+            new Error(
-          ],
+              "Invalid SARIF file: expecting at least one run with result.",
-        };
+            ),
+          );
+        }
 
         resolve(log);
         alreadyDone = true;

extensions/ql-vscode/src/common/zlib.ts

@@ -1,10 +1,5 @@
 import { promisify } from "util";
-import { gzip, gunzip } from "zlib";
+import { gunzip } from "zlib";
-
-/**
- * Promisified version of zlib.gzip
- */
-export const gzipEncode = promisify(gzip);
 
 /**
  * Promisified version of zlib.gunzip

extensions/ql-vscode/src/compare/compare-view.ts

@@ -33,6 +33,7 @@ import {
   getResultSetNames,
 } from "./result-set-names";
 import { compareInterpretedResults } from "./interpreted-results";
+import { isCanary } from "../config";
 
 interface ComparePair {
   from: CompletedLocalQueryInfo;
@@ -116,6 +117,13 @@ export class CompareView extends AbstractWebview<
     panel.reveal(undefined, true);
     await this.waitForPanelLoaded();
 
+    await this.postMessage({
+      t: "setUserSettings",
+      userSettings: {
+        shouldShowProvenance: isCanary(),
+      },
+    });
+
     await this.postMessage({
       t: "setComparisonQueryInfo",
       stats: {

extensions/ql-vscode/src/config.ts

@@ -828,19 +828,9 @@ export async function setAutogenerateQlPacks(choice: AutogenerateQLPacks) {
 
 const MODEL_SETTING = new Setting("model", ROOT_SETTING);
 const FLOW_GENERATION = new Setting("flowGeneration", MODEL_SETTING);
-const LLM_GENERATION = new Setting("llmGeneration", MODEL_SETTING);
-const LLM_GENERATION_BATCH_SIZE = new Setting(
-  "llmGenerationBatchSize",
-  MODEL_SETTING,
-);
-const LLM_GENERATION_DEV_ENDPOINT = new Setting(
-  "llmGenerationDevEndpoint",
-  MODEL_SETTING,
-);
 const MODEL_EVALUATION = new Setting("evaluation", MODEL_SETTING);
 const MODEL_PACK_LOCATION = new Setting("packLocation", MODEL_SETTING);
 const MODEL_PACK_NAME = new Setting("packName", MODEL_SETTING);
-const ENABLE_PYTHON = new Setting("enablePython", MODEL_SETTING);
 
 export type ModelConfigPackVariables = {
   database: string;
@@ -851,13 +841,11 @@ export type ModelConfigPackVariables = {
 
 export interface ModelConfig {
   flowGeneration: boolean;
-  llmGeneration: boolean;
   getPackLocation(
     languageId: string,
     variables: ModelConfigPackVariables,
   ): string;
   getPackName(languageId: string, variables: ModelConfigPackVariables): string;
-  enablePython: boolean;
 }
 
 export class ModelConfigListener extends ConfigListener implements ModelConfig {
@@ -872,26 +860,6 @@ export class ModelConfigListener extends ConfigListener implements ModelConfig {
     return !!FLOW_GENERATION.getValue<boolean>();
   }
 
-  public get llmGeneration(): boolean {
-    return !!LLM_GENERATION.getValue<boolean>() && !hasEnterpriseUri();
-  }
-
-  /**
-   * Limits the number of candidates we send to the model in each request to avoid long requests.
-   * Note that the model may return fewer than this number of candidates.
-   */
-  public get llmGenerationBatchSize(): number {
-    return LLM_GENERATION_BATCH_SIZE.getValue<number | null>() || 5;
-  }
-
-  /**
-   * The URL of the endpoint to use for LLM generation. This should only be set
-   * if you want to test against a dev server.
-   */
-  public get llmGenerationDevEndpoint(): string | undefined {
-    return LLM_GENERATION_DEV_ENDPOINT.getValue<string | undefined>();
-  }
-
   public get modelEvaluation(): boolean {
     return !!MODEL_EVALUATION.getValue<boolean>();
   }
@@ -919,10 +887,6 @@ export class ModelConfigListener extends ConfigListener implements ModelConfig {
       variables,
     );
   }
-
-  public get enablePython(): boolean {
-    return !!ENABLE_PYTHON.getValue<boolean>();
-  }
 }
 
 const GITHUB_DATABASE_SETTING = new Setting("githubDatabase", ROOT_SETTING);

extensions/ql-vscode/src/databases/config/db-config-store.ts

@@ -298,7 +298,7 @@ export class DbConfigStore extends DisposableObject {
     let newConfig: DbConfig | undefined = undefined;
     try {
       newConfig = await readJSON(this.configPath);
-    } catch (e) {
+    } catch {
       this.configErrors = [
         {
           kind: DbConfigValidationErrorKind.InvalidJson,
@@ -332,7 +332,7 @@ export class DbConfigStore extends DisposableObject {
     let newConfig: DbConfig | undefined = undefined;
     try {
       newConfig = readJSONSync(this.configPath);
-    } catch (e) {
+    } catch {
       this.configErrors = [
         {
           kind: DbConfigValidationErrorKind.InvalidJson,

extensions/ql-vscode/src/databases/database-fetcher.ts

@@ -454,7 +454,7 @@ export class DatabaseFetcher {
     let uri;
     try {
       uri = Uri.parse(databaseUrl, true);
-    } catch (e) {
+    } catch {
       throw new Error(`Invalid url: ${databaseUrl}`);
     }
 
@@ -545,30 +545,27 @@ export class DatabaseFetcher {
       throw e;
     }
 
+    const body = response.body;
+    if (!body) {
+      throw new Error("No response body found");
+    }
+
     const archiveFileStream = createWriteStream(archivePath);
 
     const contentLength = response.headers.get("content-length");
     const totalNumBytes = contentLength
       ? parseInt(contentLength, 10)
       : undefined;
-    reportStreamProgress(
+    reportStreamProgress(body, "Downloading database", totalNumBytes, progress);
-      response.body,
-      "Downloading database",
-      totalNumBytes,
-      progress,
-    );
 
-    response.body.on("data", onData);
+    body.on("data", onData);
 
     try {
       await new Promise((resolve, reject) => {
-        response.body
+        body.pipe(archiveFileStream).on("finish", resolve).on("error", reject);
-          .pipe(archiveFileStream)
-          .on("finish", resolve)
-          .on("error", reject);
 
         // If an error occurs on the body, we also want to reject the promise (e.g. during a timeout error).
-        response.body.on("error", reject);
+        body.on("error", reject);
       });
     } catch (e) {
       // Close and remove the file if an error occurs
@@ -612,7 +609,7 @@ export class DatabaseFetcher {
       const obj = JSON.parse(text);
       msg =
         obj.error || obj.message || obj.reason || JSON.stringify(obj, null, 2);
-    } catch (e) {
+    } catch {
       msg = text;
     }
     throw new Error(`${errorMessage}.\n\nReason: ${msg}`);

extensions/ql-vscode/src/databases/local-databases/database-manager.ts

@@ -231,7 +231,7 @@ export class DatabaseManager extends DisposableObject {
     let originStat;
     try {
       originStat = await stat(originDbYml);
-    } catch (e) {
+    } catch {
       // if there is an error here, assume that the origin database
       // is no longer available. Safely ignore and do not try to re-import.
       return false;
@@ -240,7 +240,7 @@ export class DatabaseManager extends DisposableObject {
     try {
       const importedStat = await stat(importedDbYml);
       return originStat.mtimeMs > importedStat.mtimeMs;
-    } catch (e) {
+    } catch {
       // If either of the files does not exist, we assume the origin is newer.
       // This shouldn't happen unless the user manually deleted one of the files.
       return true;

extensions/ql-vscode/src/databases/local-databases/locations.ts

@@ -37,11 +37,12 @@ export const shownLocationLineDecoration =
 /**
  * Resolves the specified CodeQL location to a URI into the source archive.
  * @param loc CodeQL location to resolve. Must have a non-empty value for `loc.file`.
- * @param databaseItem Database in which to resolve the file location.
+ * @param databaseItem Database in which to resolve the file location, or `undefined` to resolve
+ *   from the local file system.
  */
 function resolveFivePartLocation(
   loc: UrlValueLineColumnLocation,
-  databaseItem: DatabaseItem,
+  databaseItem: DatabaseItem | undefined,
 ): Location {
   // `Range` is a half-open interval, and is zero-based. CodeQL locations are closed intervals, and
   // are one-based. Adjust accordingly.
@@ -52,7 +53,10 @@ function resolveFivePartLocation(
     Math.max(1, loc.endColumn),
   );
 
-  return new Location(databaseItem.resolveSourceFile(loc.uri), range);
+  return new Location(
+    databaseItem?.resolveSourceFile(loc.uri) ?? Uri.parse(loc.uri),
+    range,
+  );
 }
 
 /**
@@ -62,22 +66,26 @@ function resolveFivePartLocation(
  */
 function resolveWholeFileLocation(
   loc: UrlValueWholeFileLocation,
-  databaseItem: DatabaseItem,
+  databaseItem: DatabaseItem | undefined,
 ): Location {
   // A location corresponding to the start of the file.
   const range = new Range(0, 0, 0, 0);
-  return new Location(databaseItem.resolveSourceFile(loc.uri), range);
+  return new Location(
+    databaseItem?.resolveSourceFile(loc.uri) ?? Uri.parse(loc.uri),
+    range,
+  );
 }
 
 /**
  * Try to resolve the specified CodeQL location to a URI into the source archive. If no exact location
  * can be resolved, returns `undefined`.
  * @param loc CodeQL location to resolve
- * @param databaseItem Database in which to resolve the file location.
+ * @param databaseItem Database in which to resolve the file location, or `undefined` to resolve
+ *   from the local file system.
  */
 export function tryResolveLocation(
   loc: UrlValueResolvable | undefined,
-  databaseItem: DatabaseItem,
+  databaseItem: DatabaseItem | undefined,
 ): Location | undefined {
   if (!loc) {
     return;
@@ -95,7 +103,7 @@ export function tryResolveLocation(
 
 export async function showResolvableLocation(
   loc: UrlValueResolvable,
-  databaseItem: DatabaseItem,
+  databaseItem: DatabaseItem | undefined,
   logger: Logger,
 ): Promise<void> {
   try {
@@ -151,13 +159,14 @@ export async function showLocation(location?: Location) {
 }
 
 export async function jumpToLocation(
-  databaseUri: string,
+  databaseUri: string | undefined,
   loc: UrlValueResolvable,
   databaseManager: DatabaseManager,
   logger: Logger,
 ) {
-  const databaseItem = databaseManager.findDatabaseItem(Uri.parse(databaseUri));
+  const databaseItem =
-  if (databaseItem !== undefined) {
+    databaseUri !== undefined
-    await showResolvableLocation(loc, databaseItem, logger);
+      ? databaseManager.findDatabaseItem(Uri.parse(databaseUri))
-  }
+      : undefined;
+  await showResolvableLocation(loc, databaseItem, logger);
 }

extensions/ql-vscode/src/debugger/debug-protocol.ts

@@ -96,7 +96,7 @@ export type Response = DebugProtocol.Response & { type: "response" };
 export type InitializeResponse = DebugProtocol.InitializeResponse &
   Response & { command: "initialize" };
 
-export interface QuickEvalResponse extends Response {}
+export type QuickEvalResponse = Response;
 
 export type AnyResponse = InitializeResponse | QuickEvalResponse;
 

extensions/ql-vscode/src/extension.ts

@@ -300,12 +300,12 @@ const shouldUpdateOnNextActivationKey = "shouldUpdateOnNextActivation";
 
 const codeQlVersionRange = DEFAULT_DISTRIBUTION_VERSION_RANGE;
 
-// This is the minimum version of vscode that we _want_ to support. We want to update to Node 18, but that
+// This is the minimum version of vscode that we _want_ to support. We want to update to Node 20, but that
-// requires 1.82 or later. If we change the minimum version in the package.json, then anyone on an older version of vscode will
+// requires 1.90 or later. If we change the minimum version in the package.json, then anyone on an older version of vscode will
 // silently be unable to upgrade. So, the solution is to first bump the minimum version here and release. Then
 // bump the version in the package.json and release again. This way, anyone on an older version of vscode will get a warning
 // before silently being refused to upgrade.
-const MIN_VERSION = "1.82.0";
+const MIN_VERSION = "1.90.0";
 
 function sendConfigTelemetryData() {
   const config: Record<string, string> = {};

extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts

@@ -31,7 +31,7 @@ export function fileRangeFromURI(
         return new Location(db.resolveSourceFile(uri.uri), range);
       }
       return undefined;
-    } catch (e) {
+    } catch {
       return undefined;
     }
   }

extensions/ql-vscode/src/language-support/contextual/query-resolver.ts

@@ -28,7 +28,7 @@ export async function resolveContextualQlPacksForDatabase(
 ): Promise<QlPacksForLanguage> {
   try {
     return await qlpackOfDatabase(cli, databaseItem);
-  } catch (e) {
+  } catch {
     // If we can't find the qlpacks for the database, use the defaults instead
   }
 

extensions/ql-vscode/src/language-support/language-support.ts

@@ -12,7 +12,7 @@ import { languages, IndentAction } from "vscode";
  * See https://github.com/microsoft/vscode/blob/master/src/vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts
  */
 export function install() {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
   const langConfig = require("../../language-configuration.json");
   // setLanguageConfiguration requires a regexp for the wordpattern, not a string
   langConfig.wordPattern = new RegExp(langConfig.wordPattern);

extensions/ql-vscode/src/local-queries/results-view.ts

@@ -537,6 +537,14 @@ export class ResultsView extends AbstractWebview<
       resultSetNames,
     };
 
+    await this.postMessage({
+      t: "setUserSettings",
+      userSettings: {
+        // Only show provenance info in canary mode for now.
+        shouldShowProvenance: isCanary(),
+      },
+    });
+
     await this.postMessage({
       t: "setState",
       interpretation: interpretationPage,

extensions/ql-vscode/src/model-editor/auto-model-api.ts

@@ -1,65 +0,0 @@
-import type { Credentials } from "../common/authentication";
-import type { OctokitResponse } from "@octokit/types";
-import fetch from "node-fetch";
-import type { ModelConfigListener } from "../config";
-
-export enum AutomodelMode {
-  Unspecified = "AUTOMODEL_MODE_UNSPECIFIED",
-  Framework = "AUTOMODEL_MODE_FRAMEWORK",
-  Application = "AUTOMODEL_MODE_APPLICATION",
-}
-
-export interface ModelRequest {
-  mode: AutomodelMode;
-  // Base64-encoded GZIP-compressed SARIF log
-  candidates: string;
-}
-
-export interface ModelResponse {
-  models: string;
-}
-
-export async function autoModel(
-  credentials: Credentials,
-  request: ModelRequest,
-  modelingConfig: ModelConfigListener,
-): Promise<ModelResponse> {
-  const devEndpoint = modelingConfig.llmGenerationDevEndpoint;
-  if (devEndpoint) {
-    return callAutoModelDevEndpoint(devEndpoint, request);
-  } else {
-    const octokit = await credentials.getOctokit();
-
-    const response: OctokitResponse<ModelResponse> = await octokit.request(
-      "POST /repos/github/codeql/code-scanning/codeql/auto-model",
-      {
-        data: request,
-      },
-    );
-
-    return response.data;
-  }
-}
-
-async function callAutoModelDevEndpoint(
-  endpoint: string,
-  request: ModelRequest,
-): Promise<ModelResponse> {
-  const json = JSON.stringify(request);
-  const response = await fetch(endpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: json,
-  });
-
-  if (!response.ok) {
-    throw new Error(
-      `Error calling auto-model API: ${response.status} ${response.statusText}`,
-    );
-  }
-
-  const data = await response.json();
-  return data as ModelResponse;
-}

extensions/ql-vscode/src/model-editor/auto-model-codeml-queries.ts

@@ -1,233 +0,0 @@
-import type { CodeQLCliServer, SourceInfo } from "../codeql-cli/cli";
-import type { CoreCompletedQuery, QueryRunner } from "../query-server";
-import type { DatabaseItem } from "../databases/local-databases";
-import type { ProgressCallback } from "../common/vscode/progress";
-import type { Log } from "sarif";
-import type { Mode } from "./shared/mode";
-import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
-import { interpretResultsSarif } from "../query-results";
-import { join } from "path";
-import { dir } from "tmp-promise";
-import { writeFile, outputFile } from "fs-extra";
-import { dump as dumpYaml } from "js-yaml";
-import type { MethodSignature } from "./method";
-import { runQuery } from "../local-queries/run-query";
-import type { QueryMetadata } from "../common/interface-types";
-import type { CancellationTokenSource } from "vscode";
-import { resolveQueries } from "../local-queries";
-import { modeTag } from "./mode-tag";
-
-type AutoModelQueriesOptions = {
-  mode: Mode;
-  candidateMethods: MethodSignature[];
-  cliServer: CodeQLCliServer;
-  queryRunner: QueryRunner;
-  databaseItem: DatabaseItem;
-  queryStorageDir: string;
-
-  progress: ProgressCallback;
-  cancellationTokenSource: CancellationTokenSource;
-};
-
-export type AutoModelQueriesResult = {
-  candidates: Log;
-};
-
-export async function runAutoModelQueries({
-  mode,
-  candidateMethods,
-  cliServer,
-  queryRunner,
-  databaseItem,
-  queryStorageDir,
-  progress,
-  cancellationTokenSource,
-}: AutoModelQueriesOptions): Promise<AutoModelQueriesResult | undefined> {
-  // First, resolve the query that we want to run.
-  const queryPath = await resolveAutomodelQuery(
-    cliServer,
-    databaseItem,
-    "candidates",
-    mode,
-  );
-
-  // Generate a pack containing the candidate filters
-  const { packDir: filterPackDir, cleanup: cleanupFilterPack } =
-    await generateCandidateFilterPack(databaseItem.language, candidateMethods);
-
-  const additionalPacks = [...getOnDiskWorkspaceFolders(), filterPackDir];
-  const extensionPacks = Object.keys(
-    await cliServer.resolveQlpacks(additionalPacks, true),
-  );
-
-  // Run the actual query
-  const completedQuery = await runQuery({
-    queryRunner,
-    databaseItem,
-    queryPath,
-    queryStorageDir,
-    additionalPacks,
-    extensionPacks,
-    progress,
-    token: cancellationTokenSource.token,
-  });
-
-  await cleanupFilterPack();
-
-  if (!completedQuery) {
-    return undefined;
-  }
-
-  // Get metadata for the query. This is required to interpret the results. We already know the kind is problem
-  // (because of the constraint in resolveQueries), so we don't need any more checks on the metadata.
-  const metadata = await cliServer.resolveMetadata(queryPath);
-
-  // CodeQL needs to have access to the database to be able to retrieve the
-  // snippets from it. The source location prefix is used to determine the
-  // base path of the database.
-  const sourceLocationPrefix =
-    await databaseItem.getSourceLocationPrefix(cliServer);
-  const sourceArchiveUri = databaseItem.sourceArchive;
-  const sourceInfo =
-    sourceArchiveUri === undefined
-      ? undefined
-      : {
-          sourceArchive: sourceArchiveUri.fsPath,
-          sourceLocationPrefix,
-        };
-
-  const candidates = await interpretAutomodelResults(
-    cliServer,
-    completedQuery,
-    metadata,
-    sourceInfo,
-  );
-
-  return {
-    candidates,
-  };
-}
-
-async function resolveAutomodelQuery(
-  cliServer: CodeQLCliServer,
-  databaseItem: DatabaseItem,
-  queryTag: string,
-  mode: Mode,
-): Promise<string> {
-  const packsToSearch = [`codeql/${databaseItem.language}-automodel-queries`];
-
-  // First, resolve the query that we want to run.
-  // All queries are tagged like this:
-  // internal extract automodel <mode> <queryTag>
-  // Example: internal extract automodel framework-mode candidates
-  const queries = await resolveQueries(
-    cliServer,
-    packsToSearch,
-    `Extract automodel ${queryTag}`,
-    {
-      kind: "problem",
-      "tags contain all": ["automodel", modeTag(mode), ...queryTag.split(" ")],
-    },
-  );
-  if (queries.length > 1) {
-    throw new Error(
-      `Found multiple auto model queries for ${mode} ${queryTag}. Can't continue`,
-    );
-  }
-  if (queries.length === 0) {
-    throw new Error(
-      `Did not found any auto model queries for ${mode} ${queryTag}. Can't continue`,
-    );
-  }
-
-  return queries[0];
-}
-
-type CandidateFilterPackResult = {
-  packDir: string;
-  cleanup: () => Promise<void>;
-};
-
-/**
- * generateCandidateFilterPack will create a temporary extension pack.
- * This pack will contain a filter that will restrict the automodel queries
- * to the specified candidate methods only.
- * This is done using the `extensible` predicate "automodelCandidateFilter".
- * @param language
- * @param candidateMethods
- * @returns
- */
-export async function generateCandidateFilterPack(
-  language: string,
-  candidateMethods: MethodSignature[],
-): Promise<CandidateFilterPackResult> {
-  // Pack resides in a temporary directory, to not pollute the workspace.
-  const { path: packDir, cleanup } = await dir({ unsafeCleanup: true });
-
-  const syntheticConfigPack = {
-    name: "codeql/automodel-filter",
-    version: "0.0.0",
-    library: true,
-    extensionTargets: {
-      [`codeql/${language}-automodel-queries`]: "*",
-    },
-    dataExtensions: ["filter.yml"],
-  };
-
-  const qlpackFile = join(packDir, "codeql-pack.yml");
-  await outputFile(qlpackFile, dumpYaml(syntheticConfigPack), "utf8");
-
-  // The predicate has the following defintion:
-  // extensible predicate automodelCandidateFilter(string package, string type, string name, string signature)
-  const dataRows = candidateMethods.map((method) => [
-    method.packageName,
-    method.typeName,
-    method.methodName,
-    method.methodParameters,
-  ]);
-
-  const filter = {
-    extensions: [
-      {
-        addsTo: {
-          pack: `codeql/${language}-automodel-queries`,
-          extensible: "automodelCandidateFilter",
-        },
-        data: dataRows,
-      },
-    ],
-  };
-
-  const filterFile = join(packDir, "filter.yml");
-  await writeFile(filterFile, dumpYaml(filter), "utf8");
-
-  return {
-    packDir,
-    cleanup,
-  };
-}
-
-async function interpretAutomodelResults(
-  cliServer: CodeQLCliServer,
-  completedQuery: CoreCompletedQuery,
-  metadata: QueryMetadata,
-  sourceInfo: SourceInfo | undefined,
-): Promise<Log> {
-  const interpretedResultsPath = join(
-    completedQuery.outputDir.querySaveDir,
-    "results.sarif",
-  );
-
-  const { ...sarif } = await interpretResultsSarif(
-    cliServer,
-    metadata,
-    {
-      resultsPath: completedQuery.outputDir.bqrsPath,
-      interpretedResultsPath,
-    },
-    sourceInfo,
-    ["--sarif-add-snippets"],
-  );
-
-  return sarif;
-}

extensions/ql-vscode/src/model-editor/auto-model.ts

@@ -1,41 +0,0 @@
-import type { ModelRequest } from "./auto-model-api";
-import { AutomodelMode } from "./auto-model-api";
-import { Mode } from "./shared/mode";
-import type { AutoModelQueriesResult } from "./auto-model-codeml-queries";
-import { assertNever } from "../common/helpers-pure";
-import type { Log } from "sarif";
-import { gzipEncode } from "../common/zlib";
-
-/**
- * Encode a SARIF log to the format expected by the server: JSON, GZIP-compressed, base64-encoded
- * @param log SARIF log to encode
- * @returns base64-encoded GZIP-compressed SARIF log
- */
-export async function encodeSarif(log: Log): Promise<string> {
-  const json = JSON.stringify(log);
-  const buffer = Buffer.from(json, "utf-8");
-  const compressed = await gzipEncode(buffer);
-  return compressed.toString("base64");
-}
-
-export async function createAutoModelRequest(
-  mode: Mode,
-  result: AutoModelQueriesResult,
-): Promise<ModelRequest> {
-  let requestMode: AutomodelMode;
-  switch (mode) {
-    case Mode.Application:
-      requestMode = AutomodelMode.Application;
-      break;
-    case Mode.Framework:
-      requestMode = AutomodelMode.Framework;
-      break;
-    default:
-      assertNever(mode);
-  }
-
-  return {
-    mode: requestMode,
-    candidates: await encodeSarif(result.candidates),
-  };
-}

extensions/ql-vscode/src/model-editor/auto-modeler.ts

@@ -1,249 +0,0 @@
-import type { Method, MethodSignature } from "./method";
-import type { ModeledMethod } from "./modeled-method";
-import { load as loadYaml } from "js-yaml";
-import type { ProgressCallback } from "../common/vscode/progress";
-import { withProgress } from "../common/vscode/progress";
-import { createAutoModelRequest } from "./auto-model";
-import { getCandidates } from "./shared/auto-model-candidates";
-import { runAutoModelQueries } from "./auto-model-codeml-queries";
-import { loadDataExtensionYaml } from "./yaml";
-import type { ModelRequest, ModelResponse } from "./auto-model-api";
-import { autoModel } from "./auto-model-api";
-import { RequestError } from "@octokit/request-error";
-import { showAndLogExceptionWithTelemetry } from "../common/logging";
-import { redactableError } from "../common/errors";
-import type { App } from "../common/app";
-import type { CodeQLCliServer } from "../codeql-cli/cli";
-import type { QueryRunner } from "../query-server";
-import type { DatabaseItem } from "../databases/local-databases";
-import type { Mode } from "./shared/mode";
-import { CancellationTokenSource } from "vscode";
-import type { ModelingStore } from "./modeling-store";
-import type { ModelConfigListener } from "../config";
-import type { QueryLanguage } from "../common/query-language";
-
-/**
- * The auto-modeler holds state around auto-modeling jobs and allows
- * starting and stopping them.
- */
-export class AutoModeler {
-  // Keep track of auto-modeling jobs that are in progress
-  // so that we can stop them.
-  private readonly jobs: Map<string, CancellationTokenSource>;
-
-  constructor(
-    private readonly app: App,
-    private readonly cliServer: CodeQLCliServer,
-    private readonly queryRunner: QueryRunner,
-    private readonly modelConfig: ModelConfigListener,
-    private readonly modelingStore: ModelingStore,
-    private readonly queryStorageDir: string,
-    private readonly databaseItem: DatabaseItem,
-    private readonly language: QueryLanguage,
-    private readonly addModeledMethods: (
-      modeledMethods: Record<string, ModeledMethod[]>,
-    ) => Promise<void>,
-  ) {
-    this.jobs = new Map<string, CancellationTokenSource>();
-  }
-
-  /**
-   * Models the given package's external API usages, except
-   * the ones that are already modeled.
-   * @param packageName The name of the package to model.
-   * @param methods The methods.
-   * @param modeledMethods The currently modeled methods.
-   * @param mode The mode we are modeling in.
-   */
-  public async startModeling(
-    packageName: string,
-    methods: readonly Method[],
-    modeledMethods: Record<string, readonly ModeledMethod[]>,
-    processedByAutoModelMethods: Set<string>,
-    mode: Mode,
-  ): Promise<void> {
-    if (this.jobs.has(packageName)) {
-      return;
-    }
-
-    const cancellationTokenSource = new CancellationTokenSource();
-    this.jobs.set(packageName, cancellationTokenSource);
-
-    try {
-      await this.modelPackage(
-        packageName,
-        methods,
-        modeledMethods,
-        processedByAutoModelMethods,
-        mode,
-        cancellationTokenSource,
-      );
-    } finally {
-      this.jobs.delete(packageName);
-    }
-  }
-
-  /**
-   * Stops modeling the given package.
-   * @param packageName The name of the package to stop modeling.
-   */
-  public async stopModeling(packageName: string): Promise<void> {
-    void this.app.logger.log(`Stopping modeling for package ${packageName}`);
-    const cancellationTokenSource = this.jobs.get(packageName);
-    if (cancellationTokenSource) {
-      cancellationTokenSource.cancel();
-    }
-  }
-
-  /**
-   * Stops all in-progress modeling jobs.
-   */
-  public async stopAllModeling(): Promise<void> {
-    for (const cancellationTokenSource of this.jobs.values()) {
-      cancellationTokenSource.cancel();
-    }
-  }
-
-  private async modelPackage(
-    packageName: string,
-    methods: readonly Method[],
-    modeledMethods: Record<string, readonly ModeledMethod[]>,
-    processedByAutoModelMethods: Set<string>,
-    mode: Mode,
-    cancellationTokenSource: CancellationTokenSource,
-  ): Promise<void> {
-    void this.app.logger.log(`Modeling package ${packageName}`);
-
-    const candidateBatchSize = this.modelConfig.llmGenerationBatchSize;
-
-    await withProgress(async (progress) => {
-      // Fetch the candidates to send to the model
-      const allCandidateMethods = getCandidates(
-        mode,
-        methods,
-        modeledMethods,
-        processedByAutoModelMethods,
-      );
-
-      // If there are no candidates, there is nothing to model and we just return
-      if (allCandidateMethods.length === 0) {
-        void this.app.logger.log("No candidates to model. Stopping.");
-        return;
-      }
-
-      // Find number of slices to make
-      const batchNumber = Math.ceil(
-        allCandidateMethods.length / candidateBatchSize,
-      );
-      try {
-        for (let i = 0; i < batchNumber; i++) {
-          // Check if we should stop
-          if (cancellationTokenSource.token.isCancellationRequested) {
-            break;
-          }
-
-          const start = i * candidateBatchSize;
-          const end = start + candidateBatchSize;
-          const candidatesToProcess = allCandidateMethods.slice(start, end);
-          const candidateSignatures = candidatesToProcess.map(
-            (c) => c.signature,
-          );
-
-          // Let the UI know which candidates we are modeling
-          this.modelingStore.addInProgressMethods(
-            this.databaseItem,
-            candidateSignatures,
-          );
-
-          // Kick off the process to model the slice of candidates
-          await this.modelCandidates(
-            candidatesToProcess,
-            mode,
-            progress,
-            cancellationTokenSource,
-          );
-
-          // Let the UI know which candidates we are done modeling
-          this.modelingStore.removeInProgressMethods(
-            this.databaseItem,
-            candidateSignatures,
-          );
-
-          // Let the UI know which methods have been sent to the LLM
-          this.modelingStore.addProcessedByAutoModelMethods(
-            this.databaseItem,
-            candidateSignatures,
-          );
-        }
-      } finally {
-        // Clear out in progress methods in case anything went wrong
-        this.modelingStore.removeInProgressMethods(
-          this.databaseItem,
-          allCandidateMethods.map((c) => c.signature),
-        );
-      }
-    });
-  }
-
-  private async modelCandidates(
-    candidateMethods: MethodSignature[],
-    mode: Mode,
-    progress: ProgressCallback,
-    cancellationTokenSource: CancellationTokenSource,
-  ): Promise<void> {
-    void this.app.logger.log("Executing auto-model queries");
-
-    const usages = await runAutoModelQueries({
-      mode,
-      candidateMethods,
-      cliServer: this.cliServer,
-      queryRunner: this.queryRunner,
-      queryStorageDir: this.queryStorageDir,
-      databaseItem: this.databaseItem,
-      progress: (update) => progress({ ...update }),
-      cancellationTokenSource,
-    });
-    if (!usages) {
-      return;
-    }
-
-    const request = await createAutoModelRequest(mode, usages);
-
-    void this.app.logger.log("Calling auto-model API");
-
-    const response = await this.callAutoModelApi(request);
-    if (!response) {
-      return;
-    }
-
-    const models = loadYaml(response.models, {
-      filename: "auto-model.yml",
-    });
-
-    const loadedMethods = loadDataExtensionYaml(models, this.language);
-    if (!loadedMethods) {
-      return;
-    }
-
-    await this.addModeledMethods(loadedMethods);
-  }
-
-  private async callAutoModelApi(
-    request: ModelRequest,
-  ): Promise<ModelResponse | null> {
-    try {
-      return await autoModel(this.app.credentials, request, this.modelConfig);
-    } catch (e) {
-      if (e instanceof RequestError && e.status === 429) {
-        void showAndLogExceptionWithTelemetry(
-          this.app.logger,
-          this.app.telemetry,
-          redactableError`Rate limit hit, please try again soon.`,
-        );
-        return null;
-      } else {
-        throw e;
-      }
-    }
-  }
-}

extensions/ql-vscode/src/model-editor/bqrs.ts

@@ -33,6 +33,7 @@ export function decodeBqrsToMethods(
     let libraryVersion: string | undefined;
     let type: ModeledMethodType;
     let classification: CallClassification;
+    let endpointKindColumn: string | BqrsEntityValue | undefined;
     let endpointType: EndpointType | undefined = undefined;
 
     if (mode === Mode.Application) {
@@ -47,6 +48,7 @@ export function decodeBqrsToMethods(
         libraryVersion,
         type,
         classification,
+        endpointKindColumn,
       ] = tuple as ApplicationModeTuple;
     } else {
       [
@@ -58,6 +60,7 @@ export function decodeBqrsToMethods(
         supported,
         library,
         type,
+        endpointKindColumn,
       ] = tuple as FrameworkModeTuple;
 
       classification = CallClassification.Unknown;
@@ -68,13 +71,18 @@ export function decodeBqrsToMethods(
     }
 
     if (definition.endpointTypeForEndpoint) {
-      endpointType = definition.endpointTypeForEndpoint({
+      endpointType = definition.endpointTypeForEndpoint(
-        endpointType,
+        {
-        packageName,
+          endpointType,
-        typeName,
+          packageName,
-        methodName,
+          typeName,
-        methodParameters,
+          methodName,
-      });
+          methodParameters,
+        },
+        typeof endpointKindColumn === "object"
+          ? endpointKindColumn.label
+          : endpointKindColumn,
+      );
     }
 
     if (endpointType === undefined) {

extensions/ql-vscode/src/model-editor/extensions-workspace-folder.ts

@@ -133,7 +133,7 @@ async function findGitFolder(
             const stat = await workspace.fs.stat(gitFolder);
             // Check whether it's a directory
             return (stat.type & FileType.Directory) !== 0;
-          } catch (e) {
+          } catch {
             return false;
           }
         }),

extensions/ql-vscode/src/model-editor/languages/models-as-data.ts

@@ -174,11 +174,14 @@ export type ModelsAsDataLanguage = {
    * be determined by heuristics.
    * @param method The method to get the endpoint type for. The endpoint type can be undefined if the
    *               query does not return an endpoint type.
+   * @param endpointKind An optional column that may be provided by the query to help determine the
+   *                     endpoint type.
    */
   endpointTypeForEndpoint?: (
     method: Omit<MethodDefinition, "endpointType"> & {
       endpointType: EndpointType | undefined;
     },
+    endpointKind: string | undefined,
   ) => EndpointType | undefined;
   predicates: ModelsAsDataLanguagePredicates;
   modelGeneration?: ModelsAsDataLanguageModelGeneration;

extensions/ql-vscode/src/model-editor/languages/python/access-paths.ts

@@ -4,7 +4,26 @@ import { EndpointType } from "../../method";
 
 const memberTokenRegex = /^Member\[(.+)]$/;
 
-export function parsePythonAccessPath(path: string): {
+// In Python, the type can contain both the package name and the type name.
+export function parsePythonType(type: string) {
+  // The first part is always the package name. All remaining parts are the type
+  // name.
+
+  const parts = type.split(".");
+  const packageName = parts.shift() ?? "";
+
+  return {
+    packageName,
+    typeName: parts.join("."),
+  };
+}
+
+// The type name can also be specified in the type, so this will combine
+// the already parsed type name and the type name from the access path.
+export function parsePythonAccessPath(
+  path: string,
+  shortTypeName: string,
+): {
   typeName: string;
   methodName: string;
   endpointType: EndpointType;
@@ -13,8 +32,12 @@ export function parsePythonAccessPath(path: string): {
   const tokens = parseAccessPathTokens(path);
 
   if (tokens.length === 0) {
+    const typeName = shortTypeName.endsWith("!")
+      ? shortTypeName.slice(0, -1)
+      : shortTypeName;
+
     return {
-      typeName: "",
+      typeName,
       methodName: "",
       endpointType: EndpointType.Method,
       path: "",
@@ -23,6 +46,10 @@ export function parsePythonAccessPath(path: string): {
 
   const typeParts = [];
   let endpointType = EndpointType.Function;
+  // If a short type name was given and it doesn't end in a `!`, then this refers to a method.
+  if (shortTypeName !== "" && !shortTypeName.endsWith("!")) {
+    endpointType = EndpointType.Method;
+  }
 
   let remainingTokens: typeof tokens = [];
 
@@ -32,6 +59,7 @@ export function parsePythonAccessPath(path: string): {
     if (memberMatch) {
       typeParts.push(memberMatch[1]);
     } else if (token.text === "Instance") {
+      // Alternative way of specifying that this refers to a method.
       endpointType = EndpointType.Method;
     } else {
       remainingTokens = tokens.slice(i);
@@ -40,9 +68,22 @@ export function parsePythonAccessPath(path: string): {
   }
 
   const methodName = typeParts.pop() ?? "";
-  const typeName = typeParts.join(".");
+  let typeName = typeParts.join(".");
   const remainingPath = remainingTokens.map((token) => token.text).join(".");
 
+  if (shortTypeName !== "") {
+    if (shortTypeName.endsWith("!")) {
+      // The actual type name is the name without the `!`.
+      shortTypeName = shortTypeName.slice(0, -1);
+    }
+
+    if (typeName !== "") {
+      typeName = `${shortTypeName}.${typeName}`;
+    } else {
+      typeName = shortTypeName;
+    }
+  }
+
   return {
     methodName,
     typeName,
@@ -51,53 +92,59 @@ export function parsePythonAccessPath(path: string): {
   };
 }
 
+export function parsePythonTypeAndPath(
+  type: string,
+  path: string,
+): {
+  packageName: string;
+  typeName: string;
+  methodName: string;
+  endpointType: EndpointType;
+  path: string;
+} {
+  const { packageName, typeName: shortTypeName } = parsePythonType(type);
+  const {
+    typeName,
+    methodName,
+    endpointType,
+    path: remainingPath,
+  } = parsePythonAccessPath(path, shortTypeName);
+
+  return {
+    packageName,
+    typeName,
+    methodName,
+    endpointType,
+    path: remainingPath,
+  };
+}
+
 export function pythonMethodSignature(typeName: string, methodName: string) {
   return `${typeName}#${methodName}`;
 }
 
-function pythonTypePath(typeName: string) {
+export function pythonType(
-  if (typeName === "") {
+  packageName: string,
+  typeName: string,
+  endpointType: EndpointType,
+) {
+  if (typeName !== "" && packageName !== "") {
+    return `${packageName}.${typeName}${endpointType === EndpointType.Function ? "!" : ""}`;
+  }
+
+  return `${packageName}${typeName}`;
+}
+
+export function pythonMethodPath(methodName: string) {
+  if (methodName === "") {
     return "";
   }
 
-  return typeName
+  return `Member[${methodName}]`;
-    .split(".")
-    .map((part) => `Member[${part}]`)
-    .join(".");
 }
 
-export function pythonMethodPath(
+export function pythonPath(methodName: string, path: string) {
-  typeName: string,
+  const methodPath = pythonMethodPath(methodName);
-  methodName: string,
-  endpointType: EndpointType,
-) {
-  if (methodName === "") {
-    return pythonTypePath(typeName);
-  }
-
-  const typePath = pythonTypePath(typeName);
-
-  let result = typePath;
-  if (typePath !== "" && endpointType === EndpointType.Method) {
-    result += ".Instance";
-  }
-
-  if (result !== "") {
-    result += ".";
-  }
-
-  result += `Member[${methodName}]`;
-
-  return result;
-}
-
-export function pythonPath(
-  typeName: string,
-  methodName: string,
-  endpointType: EndpointType,
-  path: string,
-) {
-  const methodPath = pythonMethodPath(typeName, methodName, endpointType);
   if (methodPath === "") {
     return path;
   }
@@ -111,7 +158,24 @@ export function pythonPath(
 
 export function pythonEndpointType(
   method: Omit<MethodDefinition, "endpointType">,
+  endpointKind: string | undefined,
 ): EndpointType {
+  switch (endpointKind) {
+    case "Function":
+      return EndpointType.Function;
+    case "InstanceMethod":
+      return EndpointType.Method;
+    case "ClassMethod":
+      return EndpointType.ClassMethod;
+    case "StaticMethod":
+      return EndpointType.StaticMethod;
+    case "InitMethod":
+      return EndpointType.Constructor;
+    case "Class":
+      return EndpointType.Class;
+  }
+
+  // Legacy behavior for when the kind column is missing.
   if (
     method.methodParameters.startsWith("(self,") ||
     method.methodParameters === "(self)"
@@ -120,3 +184,12 @@ export function pythonEndpointType(
   }
   return EndpointType.Function;
 }
+
+export function hasPythonSelfArgument(endpointType: EndpointType): boolean {
+  // Instance methods and class methods both use `Argument[self]` for the first parameter. The first
+  // parameter after self is called `Argument[0]`.
+  return (
+    endpointType === EndpointType.Method ||
+    endpointType === EndpointType.ClassMethod
+  );
+}

extensions/ql-vscode/src/model-editor/languages/python/index.ts

@@ -4,44 +4,48 @@ import { Mode } from "../../shared/mode";
 import type { MethodArgument } from "../../method";
 import { EndpointType, getArgumentsList } from "../../method";
 import {
-  parsePythonAccessPath,
+  hasPythonSelfArgument,
+  parsePythonTypeAndPath,
   pythonEndpointType,
   pythonMethodPath,
   pythonMethodSignature,
   pythonPath,
+  pythonType,
 } from "./access-paths";
 
 export const python: ModelsAsDataLanguage = {
   availableModes: [Mode.Framework],
   createMethodSignature: ({ typeName, methodName }) =>
     `${typeName}#${methodName}`,
-  endpointTypeForEndpoint: (method) => pythonEndpointType(method),
+  endpointTypeForEndpoint: (method, endpointKind) =>
+    pythonEndpointType(method, endpointKind),
   predicates: {
     source: {
       extensiblePredicate: sharedExtensiblePredicates.source,
       supportedKinds: sharedKinds.source,
-      supportedEndpointTypes: [EndpointType.Method, EndpointType.Function],
+      supportedEndpointTypes: [
+        EndpointType.Method,
+        EndpointType.Function,
+        EndpointType.Constructor,
+        EndpointType.ClassMethod,
+        EndpointType.StaticMethod,
+      ],
       // extensible predicate sourceModel(
       //   string type, string path, string kind
       // );
       generateMethodDefinition: (method) => [
-        method.packageName,
+        pythonType(method.packageName, method.typeName, method.endpointType),
-        pythonPath(
+        pythonPath(method.methodName, method.output),
-          method.typeName,
-          method.methodName,
-          method.endpointType,
-          method.output,
-        ),
         method.kind,
       ],
       readModeledMethod: (row) => {
-        const packageName = row[0] as string;
         const {
+          packageName,
           typeName,
           methodName,
           endpointType,
           path: output,
-        } = parsePythonAccessPath(row[1] as string);
+        } = parsePythonTypeAndPath(row[0] as string, row[1] as string);
         return {
           type: "source",
           output,
@@ -59,30 +63,31 @@ export const python: ModelsAsDataLanguage = {
     sink: {
       extensiblePredicate: sharedExtensiblePredicates.sink,
       supportedKinds: sharedKinds.sink,
-      supportedEndpointTypes: [EndpointType.Method, EndpointType.Function],
+      supportedEndpointTypes: [
+        EndpointType.Method,
+        EndpointType.Function,
+        EndpointType.Constructor,
+        EndpointType.ClassMethod,
+        EndpointType.StaticMethod,
+      ],
       // extensible predicate sinkModel(
       //   string type, string path, string kind
       // );
       generateMethodDefinition: (method) => {
         return [
-          method.packageName,
+          pythonType(method.packageName, method.typeName, method.endpointType),
-          pythonPath(
+          pythonPath(method.methodName, method.input),
-            method.typeName,
-            method.methodName,
-            method.endpointType,
-            method.input,
-          ),
           method.kind,
         ];
       },
       readModeledMethod: (row) => {
-        const packageName = row[0] as string;
         const {
+          packageName,
           typeName,
           methodName,
           endpointType,
           path: input,
-        } = parsePythonAccessPath(row[1] as string);
+        } = parsePythonTypeAndPath(row[0] as string, row[1] as string);
         return {
           type: "sink",
           input,
@@ -100,25 +105,26 @@ export const python: ModelsAsDataLanguage = {
     summary: {
       extensiblePredicate: sharedExtensiblePredicates.summary,
       supportedKinds: sharedKinds.summary,
-      supportedEndpointTypes: [EndpointType.Method, EndpointType.Function],
+      supportedEndpointTypes: [
+        EndpointType.Method,
+        EndpointType.Function,
+        EndpointType.Constructor,
+        EndpointType.ClassMethod,
+        EndpointType.StaticMethod,
+      ],
       // extensible predicate summaryModel(
       //   string type, string path, string input, string output, string kind
       // );
       generateMethodDefinition: (method) => [
-        method.packageName,
+        pythonType(method.packageName, method.typeName, method.endpointType),
-        pythonMethodPath(
+        pythonMethodPath(method.methodName),
-          method.typeName,
-          method.methodName,
-          method.endpointType,
-        ),
         method.input,
         method.output,
         method.kind,
       ],
       readModeledMethod: (row) => {
-        const packageName = row[0] as string;
+        const { packageName, typeName, methodName, endpointType, path } =
-        const { typeName, methodName, endpointType, path } =
+          parsePythonTypeAndPath(row[0] as string, row[1] as string);
-          parsePythonAccessPath(row[1] as string);
         if (path !== "") {
           throw new Error("Summary path must be a method");
         }
@@ -144,18 +150,13 @@ export const python: ModelsAsDataLanguage = {
       //   string type, string path, string kind
       // );
       generateMethodDefinition: (method) => [
-        method.packageName,
+        pythonType(method.packageName, method.typeName, method.endpointType),
-        pythonMethodPath(
+        pythonMethodPath(method.methodName),
-          method.typeName,
-          method.methodName,
-          method.endpointType,
-        ),
         method.kind,
       ],
       readModeledMethod: (row) => {
-        const packageName = row[0] as string;
+        const { packageName, typeName, methodName, endpointType, path } =
-        const { typeName, methodName, endpointType, path } =
+          parsePythonTypeAndPath(row[0] as string, row[1] as string);
-          parsePythonAccessPath(row[1] as string);
         if (path !== "") {
           throw new Error("Neutral path must be a method");
         }
@@ -172,25 +173,46 @@ export const python: ModelsAsDataLanguage = {
         };
       },
     },
+    type: {
+      extensiblePredicate: "typeModel",
+      // extensible predicate typeModel(string type1, string type2, string path);
+      generateMethodDefinition: (method) => [
+        method.relatedTypeName,
+        pythonType(method.packageName, method.typeName, method.endpointType),
+        pythonPath(method.methodName, method.path),
+      ],
+      readModeledMethod: (row) => {
+        const { packageName, typeName, methodName, endpointType, path } =
+          parsePythonTypeAndPath(row[1] as string, row[2] as string);
+
+        return {
+          type: "type",
+          relatedTypeName: row[0] as string,
+          path,
+          signature: pythonMethodSignature(typeName, methodName),
+          endpointType,
+          packageName,
+          typeName,
+          methodName,
+          methodParameters: "",
+        };
+      },
+    },
   },
   getArgumentOptions: (method) => {
     // Argument and Parameter are equivalent in Python, but we'll use Argument in the model editor
     const argumentsList = getArgumentsList(method.methodParameters).map(
       (argument, index): MethodArgument => {
-        if (
+        if (hasPythonSelfArgument(method.endpointType) && index === 0) {
-          method.endpointType === EndpointType.Method &&
-          argument === "self" &&
-          index === 0
-        ) {
           return {
             path: "Argument[self]",
-            label: "Argument[self]: self",
+            label: `Argument[self]: ${argument}`,
           };
         }
 
-        // If this is a method, self does not count as an argument index, so we
+        // If this endpoint has a self argument, self does not count as an argument index so we
         // should start at 0 for the second argument
-        if (method.endpointType === EndpointType.Method) {
+        if (hasPythonSelfArgument(method.endpointType)) {
           index -= 1;
         }
 

extensions/ql-vscode/src/model-editor/method-modeling/method-modeling-view-provider.ts

@@ -70,8 +70,6 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
     method: Method,
     modeledMethods: readonly ModeledMethod[],
     isModified: boolean,
-    isInProgress: boolean,
-    processedByAutoModel: boolean,
   ): Promise<void> {
     this.method = method;
     this.databaseItem = databaseItem;
@@ -82,8 +80,6 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
       method,
       modeledMethods,
       isModified,
-      isInProgress,
-      processedByAutoModel,
     });
   }
 
@@ -104,8 +100,6 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
         selectedMethod.method,
         selectedMethod.modeledMethods,
         selectedMethod.isModified,
-        selectedMethod.isInProgress,
-        selectedMethod.processedByAutoModel,
       );
     }
   }
@@ -203,8 +197,6 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
             e.method,
             e.modeledMethods,
             e.isModified,
-            e.isInProgress,
-            e.processedByAutoModel,
           );
         }
       }),
@@ -232,36 +224,6 @@ export class MethodModelingViewProvider extends AbstractWebviewViewProvider<
         }
       }),
     );
-
-    this.push(
-      this.modelingEvents.onInProgressMethodsChanged(async (e) => {
-        if (this.method && this.databaseItem) {
-          const dbUri = this.databaseItem.databaseUri.toString();
-          if (e.dbUri === dbUri) {
-            const inProgress = e.methods.has(this.method.signature);
-            await this.postMessage({
-              t: "setInProgress",
-              inProgress,
-            });
-          }
-        }
-      }),
-    );
-
-    this.push(
-      this.modelingEvents.onProcessedByAutoModelMethodsChanged(async (e) => {
-        if (this.method && this.databaseItem) {
-          const dbUri = this.databaseItem.databaseUri.toString();
-          if (e.dbUri === dbUri) {
-            const processedByAutoModel = e.methods.has(this.method.signature);
-            await this.postMessage({
-              t: "setProcessedByAutoModel",
-              processedByAutoModel,
-            });
-          }
-        }
-      }),
-    );
   }
 
   private registerToModelConfigEvents(): void {

extensions/ql-vscode/src/model-editor/method.ts

@@ -29,6 +29,8 @@ export enum EndpointType {
   Method = "method",
   Constructor = "constructor",
   Function = "function",
+  StaticMethod = "staticMethod",
+  ClassMethod = "classMethod",
 }
 
 export interface MethodDefinition {

extensions/ql-vscode/src/model-editor/model-editor-module.ts

@@ -204,7 +204,6 @@ export class ModelEditorModule extends DisposableObject {
             this.app.logger,
             queryDir,
             language,
-            this.modelConfig,
             initialMode,
           );
           if (!success) {

extensions/ql-vscode/src/model-editor/model-editor-queries-setup.ts

@@ -8,7 +8,6 @@ import {
   syntheticQueryPackName,
 } from "./model-editor-queries";
 import type { CodeQLCliServer } from "../codeql-cli/cli";
-import type { ModelConfig } from "../config";
 import type { Mode } from "./shared/mode";
 import type { NotificationLogger } from "../common/logging";
 
@@ -30,7 +29,6 @@ import type { NotificationLogger } from "../common/logging";
  * @param logger The logger to use.
  * @param queryDir The directory to set up.
  * @param language The language to use for the queries.
- * @param modelConfig The model config to use.
  * @param initialMode The initial mode to use to check the existence of the queries.
  * @returns true if the setup was successful, false otherwise.
  */
@@ -39,7 +37,6 @@ export async function setUpPack(
   logger: NotificationLogger,
   queryDir: string,
   language: QueryLanguage,
-  modelConfig: ModelConfig,
   initialMode: Mode,
 ): Promise<boolean> {
   // Download the required query packs
@@ -91,10 +88,5 @@ export async function setUpPack(
     await cliServer.packInstall(queryDir);
   }
 
-  // Download any other required packs
-  if (language === "java" && modelConfig.llmGeneration) {
-    await cliServer.packDownload([`codeql/${language}-automodel-queries`]);
-  }
-
   return true;
 }

extensions/ql-vscode/src/model-editor/model-editor-view.ts

@@ -49,7 +49,6 @@ import {
 import { pickExtensionPack } from "./extension-pack-picker";
 import type { QueryLanguage } from "../common/query-language";
 import { getLanguageDisplayName } from "../common/query-language";
-import { AutoModeler } from "./auto-modeler";
 import { telemetryListener } from "../common/vscode/telemetry";
 import type { ModelingStore } from "./modeling-store";
 import type { ModelingEvents } from "./modeling-events";
@@ -77,7 +76,6 @@ export class ModelEditorView extends AbstractWebview<
   ToModelEditorMessage,
   FromModelEditorMessage
 > {
-  private readonly autoModeler: AutoModeler;
   private readonly modelEvaluator: ModelEvaluator;
   private readonly languageDefinition: ModelsAsDataLanguage;
   // Cancellation token source that can be used for passing into long-running operations. Should only
@@ -114,19 +112,6 @@ export class ModelEditorView extends AbstractWebview<
     this.registerToModelingEvents();
     this.registerToModelConfigEvents();
 
-    this.autoModeler = new AutoModeler(
-      app,
-      cliServer,
-      queryRunner,
-      this.modelConfig,
-      modelingStore,
-      queryStorageDir,
-      databaseItem,
-      language,
-      async (modeledMethods) => {
-        this.addModeledMethods(modeledMethods);
-      },
-    );
     this.languageDefinition = getModelsAsDataLanguage(language);
 
     this.modelEvaluator = new ModelEvaluator(
@@ -317,21 +302,6 @@ export class ModelEditorView extends AbstractWebview<
           "model-editor-generate-modeled-methods",
         );
 
-        break;
-      case "generateMethodsFromLlm":
-        await this.generateModeledMethodsFromLlm(
-          msg.packageName,
-          msg.methodSignatures,
-        );
-        void telemetryListener?.sendUIInteraction(
-          "model-editor-generate-methods-from-llm",
-        );
-        break;
-      case "stopGeneratingMethodsFromLlm":
-        await this.autoModeler.stopModeling(msg.packageName);
-        void telemetryListener?.sendUIInteraction(
-          "model-editor-stop-generating-methods-from-llm",
-        );
         break;
       case "modelDependency":
         await this.modelDependency();
@@ -438,9 +408,6 @@ export class ModelEditorView extends AbstractWebview<
         this.modelConfig.flowGeneration) &&
       !!modelsAsDataLanguage.modelGeneration;
 
-    const showLlmButton =
-      this.databaseItem.language === "java" && this.modelConfig.llmGeneration;
-
     const showEvaluationUi = this.modelConfig.modelEvaluation;
 
     const sourceArchiveAvailable =
@@ -456,7 +423,6 @@ export class ModelEditorView extends AbstractWebview<
         extensionPack: this.extensionPack,
         language: this.language,
         showGenerateButton,
-        showLlmButton,
         showEvaluationUi,
         mode: this.modelingStore.getMode(this.databaseItem),
         showModeSwitchButton,
@@ -805,33 +771,6 @@ export class ModelEditorView extends AbstractWebview<
     );
   }
 
-  private async generateModeledMethodsFromLlm(
-    packageName: string,
-    methodSignatures: string[],
-  ): Promise<void> {
-    const methods = this.modelingStore.getMethods(
-      this.databaseItem,
-      methodSignatures,
-    );
-    const modeledMethods = this.modelingStore.getModeledMethods(
-      this.databaseItem,
-      methodSignatures,
-    );
-    const processedByAutoModelMethods =
-      this.modelingStore.getProcessedByAutoModelMethods(
-        this.databaseItem,
-        methodSignatures,
-      );
-    const mode = this.modelingStore.getMode(this.databaseItem);
-    await this.autoModeler.startModeling(
-      packageName,
-      methods,
-      modeledMethods,
-      processedByAutoModelMethods,
-      mode,
-    );
-  }
-
   private async modelDependency(): Promise<void> {
     return withProgress(
       async (progress, token) => {
@@ -983,30 +922,6 @@ export class ModelEditorView extends AbstractWebview<
       }),
     );
 
-    this.push(
-      this.modelingEvents.onInProgressMethodsChanged(async (event) => {
-        if (event.dbUri === this.databaseItem.databaseUri.toString()) {
-          await this.postMessage({
-            t: "setInProgressMethods",
-            methods: Array.from(event.methods),
-          });
-        }
-      }),
-    );
-
-    this.push(
-      this.modelingEvents.onProcessedByAutoModelMethodsChanged(
-        async (event) => {
-          if (event.dbUri === this.databaseItem.databaseUri.toString()) {
-            await this.postMessage({
-              t: "setProcessedByAutoModelMethods",
-              methods: Array.from(event.methods),
-            });
-          }
-        },
-      ),
-    );
-
     this.push(
       this.modelingEvents.onRevealInModelEditor(async (event) => {
         if (event.dbUri === this.databaseItem.databaseUri.toString()) {

extensions/ql-vscode/src/model-editor/modeled-method.ts

@@ -1,6 +1,5 @@
 import { assertNever } from "../common/helpers-pure";
 import type { MethodSignature } from "./method";
-import type { ModelingStatus } from "./shared/modeling-status";
 
 export type ModeledMethodType =
   | "none"
@@ -15,10 +14,6 @@ export type Provenance =
   | "df-generated"
   // Generated by the dataflow model and manually edited
   | "df-manual"
-  // Generated by the auto-model
-  | "ai-generated"
-  // Generated by the auto-model and manually edited
-  | "ai-manual"
   // Entered by the user in the editor manually
   | "manual";
 
@@ -112,30 +107,6 @@ export function modeledMethodSupportsProvenance(
   );
 }
 
-export function isModelPending(
-  modeledMethod: ModeledMethod | undefined,
-  modelingStatus: ModelingStatus,
-  processedByAutoModel: boolean,
-): boolean {
-  if (
-    (!modeledMethod || modeledMethod.type === "none") &&
-    processedByAutoModel
-  ) {
-    return true;
-  }
-
-  if (!modeledMethod) {
-    return false;
-  }
-
-  return (
-    modelingStatus === "unsaved" &&
-    modeledMethod.type !== "none" &&
-    modeledMethodSupportsProvenance(modeledMethod) &&
-    modeledMethod.provenance === "ai-generated"
-  );
-}
-
 /**
  * Calculates the new provenance for a modeled method based on the current provenance.
  * @param modeledMethod The modeled method if there is one.
@@ -158,13 +129,6 @@ export function calculateNewProvenance(
     case "df-manual":
       // If the method has had manual edits, we want the provenance to stay the same.
       return "df-manual";
-    case "ai-generated":
-      // If the method has been generated and there has been a change, we assume
-      // that the user has manually edited it.
-      return "ai-manual";
-    case "ai-manual":
-      // If the method has had manual edits, we want the provenance to stay the same.
-      return "ai-manual";
     default:
       // The method has been modeled manually.
       return "manual";

extensions/ql-vscode/src/model-editor/modeling-events.ts

@@ -37,18 +37,6 @@ interface SelectedMethodChangedEvent {
   readonly usage: Usage;
   readonly modeledMethods: readonly ModeledMethod[];
   readonly isModified: boolean;
-  readonly isInProgress: boolean;
-  readonly processedByAutoModel: boolean;
-}
-
-interface InProgressMethodsChangedEvent {
-  readonly dbUri: string;
-  readonly methods: ReadonlySet<string>;
-}
-
-interface ProcessedByAutoModelMethodsChangedEvent {
-  readonly dbUri: string;
-  readonly methods: ReadonlySet<string>;
 }
 
 interface ModelEvaluationRunChangedEvent {
@@ -83,8 +71,6 @@ export class ModelingEvents extends DisposableObject {
   public readonly onModeChanged: AppEvent<ModeChangedEvent>;
   public readonly onModeledAndModifiedMethodsChanged: AppEvent<ModeledAndModifiedMethodsChangedEvent>;
   public readonly onSelectedMethodChanged: AppEvent<SelectedMethodChangedEvent>;
-  public readonly onInProgressMethodsChanged: AppEvent<InProgressMethodsChangedEvent>;
-  public readonly onProcessedByAutoModelMethodsChanged: AppEvent<ProcessedByAutoModelMethodsChangedEvent>;
   public readonly onModelEvaluationRunChanged: AppEvent<ModelEvaluationRunChangedEvent>;
   public readonly onRevealInModelEditor: AppEvent<RevealInModelEditorEvent>;
   public readonly onFocusModelEditor: AppEvent<FocusModelEditorEvent>;
@@ -99,8 +85,6 @@ export class ModelingEvents extends DisposableObject {
   private readonly onModeChangedEventEmitter: AppEventEmitter<ModeChangedEvent>;
   private readonly onModeledAndModifiedMethodsChangedEventEmitter: AppEventEmitter<ModeledAndModifiedMethodsChangedEvent>;
   private readonly onSelectedMethodChangedEventEmitter: AppEventEmitter<SelectedMethodChangedEvent>;
-  private readonly onInProgressMethodsChangedEventEmitter: AppEventEmitter<InProgressMethodsChangedEvent>;
-  private readonly onProcessedByAutoModelMethodsChangedEventEmitter: AppEventEmitter<ProcessedByAutoModelMethodsChangedEvent>;
   private readonly onModelEvaluationRunChangedEventEmitter: AppEventEmitter<ModelEvaluationRunChangedEvent>;
   private readonly onRevealInModelEditorEventEmitter: AppEventEmitter<RevealInModelEditorEvent>;
   private readonly onFocusModelEditorEventEmitter: AppEventEmitter<FocusModelEditorEvent>;
@@ -151,18 +135,6 @@ export class ModelingEvents extends DisposableObject {
     this.onSelectedMethodChanged =
       this.onSelectedMethodChangedEventEmitter.event;
 
-    this.onInProgressMethodsChangedEventEmitter = this.push(
-      app.createEventEmitter<InProgressMethodsChangedEvent>(),
-    );
-    this.onInProgressMethodsChanged =
-      this.onInProgressMethodsChangedEventEmitter.event;
-
-    this.onProcessedByAutoModelMethodsChangedEventEmitter = this.push(
-      app.createEventEmitter<ProcessedByAutoModelMethodsChangedEvent>(),
-    );
-    this.onProcessedByAutoModelMethodsChanged =
-      this.onProcessedByAutoModelMethodsChangedEventEmitter.event;
-
     this.onModelEvaluationRunChangedEventEmitter = this.push(
       app.createEventEmitter<ModelEvaluationRunChangedEvent>(),
     );
@@ -254,8 +226,6 @@ export class ModelingEvents extends DisposableObject {
     usage: Usage,
     modeledMethods: ModeledMethod[],
     isModified: boolean,
-    isInProgress: boolean,
-    processedByAutoModel: boolean,
   ) {
     this.onSelectedMethodChangedEventEmitter.fire({
       databaseItem,
@@ -263,28 +233,6 @@ export class ModelingEvents extends DisposableObject {
       usage,
       modeledMethods,
       isModified,
-      isInProgress,
-      processedByAutoModel,
-    });
-  }
-
-  public fireInProgressMethodsChangedEvent(
-    dbUri: string,
-    methods: ReadonlySet<string>,
-  ) {
-    this.onInProgressMethodsChangedEventEmitter.fire({
-      dbUri,
-      methods,
-    });
-  }
-
-  public fireProcessedByAutoModelMethodsChangedEvent(
-    dbUri: string,
-    methods: ReadonlySet<string>,
-  ) {
-    this.onProcessedByAutoModelMethodsChangedEventEmitter.fire({
-      dbUri,
-      methods,
     });
   }
 

extensions/ql-vscode/src/model-editor/modeling-store.ts

@@ -15,8 +15,6 @@ interface InternalDbModelingState {
   mode: Mode;
   modeledMethods: Record<string, ModeledMethod[]>;
   modifiedMethodSignatures: Set<string>;
-  inProgressMethods: Set<string>;
-  processedByAutoModelMethods: Set<string>;
   selectedMethod: Method | undefined;
   selectedUsage: Usage | undefined;
   modelEvaluationRun: ModelEvaluationRun | undefined;
@@ -30,8 +28,6 @@ export interface DbModelingState {
   readonly mode: Mode;
   readonly modeledMethods: Readonly<Record<string, readonly ModeledMethod[]>>;
   readonly modifiedMethodSignatures: ReadonlySet<string>;
-  readonly inProgressMethods: ReadonlySet<string>;
-  readonly processedByAutoModelMethods: ReadonlySet<string>;
   readonly selectedMethod: Method | undefined;
   readonly selectedUsage: Usage | undefined;
   readonly modelEvaluationRun: ModelEvaluationRun | undefined;
@@ -44,8 +40,6 @@ export interface SelectedMethodDetails {
   readonly usage: Usage | undefined;
   readonly modeledMethods: readonly ModeledMethod[];
   readonly isModified: boolean;
-  readonly isInProgress: boolean;
-  readonly processedByAutoModel: boolean;
 }
 
 export class ModelingStore extends DisposableObject {
@@ -68,10 +62,8 @@ export class ModelingStore extends DisposableObject {
       mode,
       modeledMethods: {},
       modifiedMethodSignatures: new Set(),
-      processedByAutoModelMethods: new Set(),
       selectedMethod: undefined,
       selectedUsage: undefined,
-      inProgressMethods: new Set(),
       modelEvaluationRun: undefined,
       isModelAlertsViewOpen: false,
     });
@@ -160,7 +152,6 @@ export class ModelingStore extends DisposableObject {
         methods,
         state.modeledMethods,
         state.modifiedMethodSignatures,
-        state.processedByAutoModelMethods,
       );
     });
   }
@@ -171,7 +162,6 @@ export class ModelingStore extends DisposableObject {
         state.methods,
         state.modeledMethods,
         state.modifiedMethodSignatures,
-        state.processedByAutoModelMethods,
       );
     });
   }
@@ -308,75 +298,15 @@ export class ModelingStore extends DisposableObject {
 
     const modeledMethods = dbState.modeledMethods[method.signature] ?? [];
     const isModified = dbState.modifiedMethodSignatures.has(method.signature);
-    const isInProgress = dbState.inProgressMethods.has(method.signature);
-    const processedByAutoModel = dbState.processedByAutoModelMethods.has(
-      method.signature,
-    );
     this.modelingEvents.fireSelectedMethodChangedEvent(
       dbItem,
       method,
       usage,
       modeledMethods,
       isModified,
-      isInProgress,
-      processedByAutoModel,
     );
   }
 
-  public addInProgressMethods(
-    dbItem: DatabaseItem,
-    inProgressMethods: string[],
-  ) {
-    this.changeInProgressMethods(dbItem, (state) => {
-      state.inProgressMethods = new Set([
-        ...state.inProgressMethods,
-        ...inProgressMethods,
-      ]);
-    });
-  }
-
-  public removeInProgressMethods(
-    dbItem: DatabaseItem,
-    methodSignatures: string[],
-  ) {
-    this.changeInProgressMethods(dbItem, (state) => {
-      state.inProgressMethods = new Set(
-        Array.from(state.inProgressMethods).filter(
-          (s) => !methodSignatures.includes(s),
-        ),
-      );
-    });
-  }
-
-  public getProcessedByAutoModelMethods(
-    dbItem: DatabaseItem,
-    methodSignatures?: string[],
-  ): Set<string> {
-    const processedByAutoModelMethods =
-      this.getState(dbItem).processedByAutoModelMethods;
-    if (!methodSignatures) {
-      return processedByAutoModelMethods;
-    }
-    return new Set(
-      Array.from(processedByAutoModelMethods).filter((x) =>
-        methodSignatures.includes(x),
-      ),
-    );
-  }
-
-  public addProcessedByAutoModelMethods(
-    dbItem: DatabaseItem,
-    processedByAutoModelMethods: string[],
-  ) {
-    this.changeProcessedByAutoModelMethods(dbItem, (state) => {
-      state.processedByAutoModelMethods = new Set([
-        ...state.processedByAutoModelMethods,
-        ...processedByAutoModelMethods,
-      ]);
-    });
-    this.updateMethodSorting(dbItem);
-  }
-
   public updateModelEvaluationRun(
     dbItem: DatabaseItem,
     evaluationRun: ModelEvaluationRun | undefined,
@@ -405,10 +335,6 @@ export class ModelingStore extends DisposableObject {
       isModified: dbState.modifiedMethodSignatures.has(
         selectedMethod.signature,
       ),
-      isInProgress: dbState.inProgressMethods.has(selectedMethod.signature),
-      processedByAutoModel: dbState.processedByAutoModelMethods.has(
-        selectedMethod.signature,
-      ),
     };
   }
 
@@ -460,34 +386,6 @@ export class ModelingStore extends DisposableObject {
     );
   }
 
-  private changeInProgressMethods(
-    dbItem: DatabaseItem,
-    updateState: (state: InternalDbModelingState) => void,
-  ) {
-    const state = this.getState(dbItem);
-
-    updateState(state);
-
-    this.modelingEvents.fireInProgressMethodsChangedEvent(
-      dbItem.databaseUri.toString(),
-      state.inProgressMethods,
-    );
-  }
-
-  private changeProcessedByAutoModelMethods(
-    dbItem: DatabaseItem,
-    updateState: (state: InternalDbModelingState) => void,
-  ) {
-    const state = this.getState(dbItem);
-
-    updateState(state);
-
-    this.modelingEvents.fireProcessedByAutoModelMethodsChangedEvent(
-      dbItem.databaseUri.toString(),
-      state.processedByAutoModelMethods,
-    );
-  }
-
   private changeModelEvaluationRun(
     dbItem: DatabaseItem,
     updateState: (state: InternalDbModelingState) => void,

extensions/ql-vscode/src/model-editor/queries/query.ts

@@ -17,6 +17,7 @@ export type Query = {
    * - libraryVersion: the version of the library that contains the external API. This is a string and can be empty if the version cannot be determined.
    * - type: the modeled kind of the method, either "sink", "source", "summary", or "neutral"
    * - classification: the classification of the use of the method, either "source", "test", "generated", or "unknown"
+   * - kind: the kind of the endpoint, language-specific, e.g. "method" or "function"
    */
   applicationModeQuery: string;
   /**
@@ -32,6 +33,7 @@ export type Query = {
    * - supported: whether this method is modeled. This should be a string representation of a boolean to satify the result pattern for a problem query.
    * - libraryName: the name of the file or library that contains the method. This is a string and usually the basename of a file.
    * - type: the modeled kind of the method, either "sink", "source", "summary", or "neutral"
+   * - kind: the kind of the endpoint, language-specific, e.g. "method" or "function"
    */
   frameworkModeQuery: string;
   dependencies?: {
@@ -50,6 +52,7 @@ export type ApplicationModeTuple = [
   string,
   ModeledMethodType,
   CallClassification,
+  string | BqrsEntityValue | undefined,
 ];
 
 export type FrameworkModeTuple = [
@@ -61,4 +64,5 @@ export type FrameworkModeTuple = [
   boolean,
   string,
   ModeledMethodType,
+  string | BqrsEntityValue | undefined,
 ];

extensions/ql-vscode/src/model-editor/shared/auto-model-candidates.ts

@@ -1,48 +0,0 @@
-import type { Method, MethodSignature } from "../method";
-import type { ModeledMethod } from "../modeled-method";
-import type { Mode } from "./mode";
-import { groupMethods, sortGroupNames } from "./sorting";
-
-/**
- * Return the candidates that the model should be run on. This includes limiting the number of
- * candidates to the candidate limit and filtering out anything that is already modeled and respecting
- * the order in the UI.
- * @param mode Whether it is application or framework mode.
- * @param methods all methods.
- * @param modeledMethodsBySignature the currently modeled methods.
- * @returns list of modeled methods that are candidates for modeling.
- */
-
-export function getCandidates(
-  mode: Mode,
-  methods: readonly Method[],
-  modeledMethodsBySignature: Record<string, readonly ModeledMethod[]>,
-  processedByAutoModelMethods: Set<string>,
-): MethodSignature[] {
-  const candidateMethods = methods.filter((method) => {
-    // Filter out any methods already processed by auto-model
-    if (processedByAutoModelMethods.has(method.signature)) {
-      return false;
-    }
-
-    const modeledMethods: ModeledMethod[] = [
-      ...(modeledMethodsBySignature[method.signature] ?? []),
-    ];
-
-    // Anything that is modeled is not a candidate
-    if (modeledMethods.some((m) => m.type !== "none")) {
-      return false;
-    }
-
-    // A method that is supported is modeled outside of the model file, so it is not a candidate.
-    if (method.supported) {
-      return false;
-    }
-
-    return true;
-  });
-
-  // Sort the same way as the UI so we send the first ones listed in the UI first
-  const grouped = groupMethods(candidateMethods, mode);
-  return sortGroupNames(grouped).flatMap((name) => grouped[name]);
-}

extensions/ql-vscode/src/model-editor/shared/sorting.ts

@@ -47,7 +47,6 @@ export function sortMethods(
   methods: readonly Method[],
   modeledMethodsMap: Record<string, readonly ModeledMethod[]>,
   modifiedSignatures: ReadonlySet<string>,
-  processedByAutoModelMethods: ReadonlySet<string>,
 ): Method[] {
   const sortedMethods = [...methods];
   sortedMethods.sort((a, b) => {
@@ -56,13 +55,11 @@ export function sortMethods(
       a,
       modeledMethodsMap[a.signature] ?? [],
       modifiedSignatures.has(a.signature),
-      processedByAutoModelMethods.has(a.signature),
     );
     const methodBPrimarySortOrdinal = getMethodPrimarySortOrdinal(
       b,
       modeledMethodsMap[b.signature] ?? [],
       modifiedSignatures.has(b.signature),
-      processedByAutoModelMethods.has(b.signature),
     );
     if (methodAPrimarySortOrdinal !== methodBPrimarySortOrdinal) {
       return methodAPrimarySortOrdinal - methodBPrimarySortOrdinal;
@@ -82,32 +79,25 @@ export function sortMethods(
 
 /**
  * Assigns numbers to the following classes of methods:
- * - Unsaved positive AutoModel predictions => 0
+ * - Unsaved manual models + unmodeled methods => 0
- * - Negative AutoModel predictions => 1
+ * - Saved models from this model pack (AutoModel and manual) => 1
- * - Unsaved manual models + unmodeled methods => 2
+ * - Methods not modelable in this model pack => 2
- * - Saved models from this model pack (AutoModel and manual) => 3
- * - Methods not modelable in this model pack => 4
  */
 function getMethodPrimarySortOrdinal(
   method: Method,
   modeledMethods: readonly ModeledMethod[],
   isUnsaved: boolean,
-  isProcessedByAutoModel: boolean,
 ): number {
   const canBeModeled = canMethodBeModeled(method, modeledMethods, isUnsaved);
   const isModeled = modeledMethods.length > 0;
   if (canBeModeled) {
-    if (isModeled && isUnsaved && isProcessedByAutoModel) {
+    if ((isModeled && isUnsaved) || !isModeled) {
       return 0;
-    } else if (!isModeled && isProcessedByAutoModel) {
-      return 1;
-    } else if ((isModeled && isUnsaved) || !isModeled) {
-      return 2;
     } else {
-      return 3;
+      return 1;
     }
   } else {
-    return 4;
+    return 2;
   }
 }
 

extensions/ql-vscode/src/model-editor/shared/view-state.ts

@@ -7,7 +7,6 @@ export interface ModelEditorViewState {
   extensionPack: ExtensionPack;
   language: QueryLanguage;
   showGenerateButton: boolean;
-  showLlmButton: boolean;
   showEvaluationUi: boolean;
   mode: Mode;
   showModeSwitchButton: boolean;

extensions/ql-vscode/src/model-editor/supported-languages.ts

@@ -9,20 +9,16 @@ export const SUPPORTED_LANGUAGES: QueryLanguage[] = [
   QueryLanguage.Java,
   QueryLanguage.CSharp,
   QueryLanguage.Ruby,
+  QueryLanguage.Python,
 ];
 
 export function isSupportedLanguage(
   language: QueryLanguage,
-  modelConfig: ModelConfig,
+  _modelConfig: ModelConfig,
 ) {
   if (SUPPORTED_LANGUAGES.includes(language)) {
     return true;
   }
 
-  if (language === QueryLanguage.Python) {
-    // Python is only enabled when the config setting is set
-    return modelConfig.enablePython;
-  }
-
   return false;
 }

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

@@ -845,7 +845,7 @@ export class QueryHistoryManager extends DisposableObject {
         evalLogData,
       );
       this.evalLogViewer.updateRoots(await evalLogTreeBuilder.getRoots());
-    } catch (e) {
+    } catch {
       throw new Error(
         `Could not read evaluator log summary JSON file to generate viewer data at ${item.jsonEvalLogSummaryLocation}.`,
       );

extensions/ql-vscode/src/query-testing/test-runner.ts

@@ -61,7 +61,7 @@ export class TestRunner extends DisposableObject {
       })) {
         await eventHandler(event);
       }
-    } catch (e) {
+    } catch {
       // CodeQL testing can throw exception even in normal scenarios. For example, if the test run
       // produces no output (which is normal), the testing command would throw an exception on
       // unexpected EOF during json parsing. So nothing needs to be done here - all the relevant

extensions/ql-vscode/src/run-queries-shared.ts

@@ -544,9 +544,16 @@ export async function generateEvalLogSummaries(
     await cliServer.generateJsonLogSummary(log, jsonSummary);
 
     if (humanReadableSummary !== undefined) {
-      progress(progressUpdate(3, 3, "Generating summary symbols file"));
       summarySymbols = outputDir.evalLogSummarySymbolsPath;
-      await generateSummarySymbolsFile(humanReadableSummary, summarySymbols);
+      if (
+        !(await cliServer.cliConstraints.supportsGenerateSummarySymbolMap())
+      ) {
+        // We're using an old CLI that cannot generate the summary symbols file while generating the
+        // human-readable log summary. As a fallback, create it by parsing the human-readable
+        // summary.
+        progress(progressUpdate(3, 3, "Generating summary symbols file"));
+        await generateSummarySymbolsFile(humanReadableSummary, summarySymbols);
+      }
     }
   }
 
@@ -600,7 +607,7 @@ export async function logEndSummary(
     const endSummaryContent = await readFile(endSummary, "utf-8");
     void logger.log(" --- Evaluator Log Summary --- ");
     void logger.log(endSummaryContent);
-  } catch (e) {
+  } catch {
     void showAndLogWarningMessage(
       extLogger,
       `Could not read structured evaluator log end of summary file at ${endSummary}.`,

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

@@ -7,7 +7,7 @@ export default {
   component: ResponsiveContainerComponent,
 } as Meta<typeof ResponsiveContainerComponent>;
 
-const Template: StoryFn<typeof ResponsiveContainerComponent> = (args) => (
+const Template: StoryFn<typeof ResponsiveContainerComponent> = () => (
   <ResponsiveContainerComponent>
     <span>Hello</span>
   </ResponsiveContainerComponent>

extensions/ql-vscode/src/stories/method-modeling/MethodModelingInputs.stories.tsx

@@ -53,20 +53,3 @@ FullyModeledMethod.args = {
   method,
   modeledMethod,
 };
-
-export const ModelingInProgress = Template.bind({});
-ModelingInProgress.args = {
-  method,
-  modeledMethod,
-  isModelingInProgress: true,
-};
-
-const generatedModeledMethod = createSinkModeledMethod({
-  provenance: "ai-generated",
-});
-export const ModelingNotAccepted = Template.bind({});
-ModelingNotAccepted.args = {
-  method,
-  modeledMethod: generatedModeledMethod,
-  modelPending: true,
-};

extensions/ql-vscode/src/stories/model-editor/InProgressDropdown.stories.tsx

@@ -1,14 +0,0 @@
-import type { Meta, StoryFn } from "@storybook/react";
-
-import { InProgressDropdown as InProgressDropdownComponent } from "../../view/model-editor/InProgressDropdown";
-
-export default {
-  title: "CodeQL Model Editor/In Progress Dropdown",
-  component: InProgressDropdownComponent,
-} as Meta<typeof InProgressDropdownComponent>;
-
-const Template: StoryFn<typeof InProgressDropdownComponent> = (args) => (
-  <InProgressDropdownComponent />
-);
-
-export const InProgressDropdown = Template.bind({});

extensions/ql-vscode/src/stories/model-editor/LibraryRow.stories.tsx

@@ -220,10 +220,8 @@ LibraryRow.args = {
     ],
   },
   modifiedSignatures: new Set(["org.sql2o.Sql2o#Sql2o(String)"]),
-  inProgressMethods: new Set(),
   viewState: createMockModelEditorViewState({
     showGenerateButton: true,
-    showLlmButton: true,
   }),
   hideModeledMethods: false,
 };

extensions/ql-vscode/src/stories/model-editor/MethodRow.stories.tsx

@@ -96,7 +96,6 @@ const modeledMethod: ModeledMethod = {
 
 const viewState = createMockModelEditorViewState({
   showGenerateButton: true,
-  showLlmButton: true,
 });
 
 export const Unmodeled = Template.bind({});
@@ -146,15 +145,6 @@ AlreadyModeled.args = {
   viewState,
 };
 
-export const ModelingInProgress = Template.bind({});
-ModelingInProgress.args = {
-  method,
-  modeledMethods: [modeledMethod],
-  modelingInProgress: true,
-  methodCanBeModeled: true,
-  viewState,
-};
-
 export const MultipleModelings = Template.bind({});
 MultipleModelings.args = {
   method,

extensions/ql-vscode/src/stories/model-editor/ModelEditor.stories.tsx

@@ -27,7 +27,6 @@ ModelEditor.args = {
       dataExtensions: [],
     },
     showGenerateButton: true,
-    showLlmButton: true,
   }),
   initialMethods: [
     {

extensions/ql-vscode/src/stories/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "module": "esnext",
     "moduleResolution": "node",
-    "target": "es6",
+    "target": "es2021",
     "outDir": "out",
     "lib": ["ES2021", "dom"],
     "jsx": "react-jsx",

extensions/ql-vscode/src/variant-analysis/repo-states-store/repo-states-store.ts

@@ -26,7 +26,7 @@ export async function readRepoStates(
     const repoStates = mapRepoStatesToDomainModel(repoStatesData);
 
     return repoStates;
-  } catch (e) {
+  } catch {
     // Ignore this error, we simply might not have downloaded anything yet
     return undefined;
   }

extensions/ql-vscode/src/variant-analysis/run-remote-query.ts

@@ -116,15 +116,6 @@ async function generateQueryPack(
 
   let precompilationOpts: string[];
   if (cliSupportsMrvaPackCreate) {
-    if (
-      qlPackDetails.queryFiles.length > 1 &&
-      !(await cliServer.cliConstraints.supportsPackCreateWithMultipleQueries())
-    ) {
-      throw new Error(
-        `Installed CLI version does not allow creating a MRVA pack with multiple queries`,
-      );
-    }
-
     const queryOpts = qlPackDetails.queryFiles.flatMap((q) => [
       "--query",
       join(targetPackPath, relative(qlPackDetails.qlPackRootPath, q)),

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -562,7 +562,7 @@ export class VariantAnalysisManager
       });
       const doc = await workspace.openTextDocument(uri);
       await Window.showTextDocument(doc, { preview: false });
-    } catch (error) {
+    } catch {
       void showAndLogWarningMessage(
         this.app.logger,
         "Could not open variant analysis query text. Failed to open text document.",
@@ -586,7 +586,7 @@ export class VariantAnalysisManager
         variantAnalysis.query.filePath,
       );
       await Window.showTextDocument(textDocument, ViewColumn.One);
-    } catch (error) {
+    } catch {
       void showAndLogWarningMessage(
         this.app.logger,
         `Could not open file: ${variantAnalysis.query.filePath}`,

extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts

@@ -99,6 +99,10 @@ export class VariantAnalysisResultsManager extends DisposableObject {
       responseSize = response.size;
     }
 
+    if (!response.body) {
+      throw new Error("No response body found");
+    }
+
     let amountDownloaded = 0;
     for await (const chunk of response.body) {
       await appendFile(zipFilePath, Buffer.from(chunk));

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

@@ -12,6 +12,18 @@ const ShowPathsLink = styled(VSCodeLink)`
   cursor: pointer;
 `;
 
+const Label = styled.span`
+  color: var(--vscode-descriptionForeground);
+  margin-left: 10px;
+`;
+
+function getShortestPathLength(codeFlows: CodeFlow[]): number {
+  const allPathLengths = codeFlows
+    .map((codeFlow) => codeFlow.threadFlows.length)
+    .flat();
+  return Math.min(...allPathLengths);
+}
+
 export type CodePathsProps = {
   codeFlows: CodeFlow[];
   ruleDescription: string;
@@ -40,6 +52,7 @@ export const CodePaths = ({
   return (
     <>
       <ShowPathsLink onClick={onShowPathsClick}>Show paths</ShowPathsLink>
+      <Label>(Shortest: {getShortestPathLength(codeFlows)})</Label>
     </>
   );
 };

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

@@ -24,6 +24,12 @@ describe(CodePaths.name, () => {
     expect(screen.getByText("Show paths")).toBeInTheDocument();
   });
 
+  it("renders shortest path for code flows", () => {
+    render();
+
+    expect(screen.getByText("(Shortest: 1)")).toBeInTheDocument();
+  });
+
   it("posts extension message when 'show paths' link clicked", async () => {
     render();
 

extensions/ql-vscode/src/view/common/SuggestBox/SuggestBoxItem.tsx

@@ -64,23 +64,35 @@ type Props = {
 export const SuggestBoxItem = forwardRef<
   HTMLDivElement,
   Props & HTMLProps<HTMLDivElement>
->(({ children, active, icon, labelText, details, ...props }, ref) => {
+>(
-  const id = useId();
+  (
-  return (
+    {
-    <Container
+      children,
-      ref={ref}
+      active,
-      role="option"
+      icon,
-      id={id}
+      labelText,
-      aria-selected={active}
+      details,
-      $active={active}
+      ...props
-      {...props}
+    }: Props & HTMLProps<HTMLDivElement>,
-    >
+    ref,
-      {icon}
+  ) => {
-      <LabelContainer>
+    const id = useId();
-        <Label>{labelText}</Label>
+    return (
-        {details && <DetailsLabel>{details}</DetailsLabel>}
+      <Container
-      </LabelContainer>
+        ref={ref}
-    </Container>
+        role="option"
-  );
+        id={id}
-});
+        aria-selected={active}
+        $active={active}
+        {...props}
+      >
+        {icon}
+        <LabelContainer>
+          <Label>{labelText}</Label>
+          {details && <DetailsLabel>{details}</DetailsLabel>}
+        </LabelContainer>
+      </Container>
+    );
+  },
+);
 SuggestBoxItem.displayName = "SuggestBoxItem";

extensions/ql-vscode/src/view/compare/Compare.tsx

@@ -5,7 +5,9 @@ import type {
   ToCompareViewMessage,
   SetComparisonsMessage,
   SetComparisonQueryInfoMessage,
+  UserSettings,
 } from "../../common/interface-types";
+import { DEFAULT_USER_SETTINGS } from "../../common/interface-types";
 import CompareSelector from "./CompareSelector";
 import { vscode } from "../vscode-api";
 import CompareTable from "./CompareTable";
@@ -31,6 +33,9 @@ export function Compare(_: Record<string, never>): React.JSX.Element {
   const [comparison, setComparison] = useState<SetComparisonsMessage | null>(
     null,
   );
+  const [userSettings, setUserSettings] = useState<UserSettings>(
+    DEFAULT_USER_SETTINGS,
+  );
 
   const message = comparison?.message || "Empty comparison";
   const hasRows =
@@ -48,6 +53,9 @@ export function Compare(_: Record<string, never>): React.JSX.Element {
           case "setComparisons":
             setComparison(msg);
             break;
+          case "setUserSettings":
+            setUserSettings(msg.userSettings);
+            break;
           default:
             assertNever(msg);
         }
@@ -85,6 +93,7 @@ export function Compare(_: Record<string, never>): React.JSX.Element {
           <CompareTable
             queryInfo={queryInfo}
             comparison={comparison}
+            userSettings={userSettings}
           ></CompareTable>
         ) : (
           <Message>{message}</Message>

extensions/ql-vscode/src/view/compare/CompareTable.tsx

@@ -1,6 +1,7 @@
 import type {
   SetComparisonQueryInfoMessage,
   SetComparisonsMessage,
+  UserSettings,
 } from "../../common/interface-types";
 import { className } from "../results/result-table-utils";
 import { vscode } from "../vscode-api";
@@ -12,6 +13,7 @@ import { InterpretedCompareResultTable } from "./InterpretedCompareResultTable";
 interface Props {
   queryInfo: SetComparisonQueryInfoMessage;
   comparison: SetComparisonsMessage;
+  userSettings: UserSettings;
 }
 
 const OpenButton = styled(TextButton)`
@@ -29,7 +31,11 @@ const Table = styled.table`
   }
 `;
 
-export default function CompareTable({ queryInfo, comparison }: Props) {
+export default function CompareTable({
+  queryInfo,
+  comparison,
+  userSettings,
+}: Props) {
   const result = comparison.result!;
 
   async function openQuery(kind: "from" | "to") {
@@ -78,6 +84,7 @@ export default function CompareTable({ queryInfo, comparison }: Props) {
             {result.kind === "interpreted" && (
               <InterpretedCompareResultTable
                 results={result.from}
+                userSettings={userSettings}
                 databaseUri={queryInfo.databaseUri}
                 sourceLocationPrefix={result.sourceLocationPrefix}
               />
@@ -96,6 +103,7 @@ export default function CompareTable({ queryInfo, comparison }: Props) {
             {result.kind === "interpreted" && (
               <InterpretedCompareResultTable
                 results={result.to}
+                userSettings={userSettings}
                 databaseUri={queryInfo.databaseUri}
                 sourceLocationPrefix={result.sourceLocationPrefix}
               />

extensions/ql-vscode/src/view/compare/InterpretedCompareResultTable.tsx

@@ -1,27 +1,32 @@
-import type { Result } from "sarif";
+import type { Result, Run } from "sarif";
 import { AlertTable } from "../results/AlertTable";
+import type { UserSettings } from "../../common/interface-types";
 
 type Props = {
   results: Result[];
   databaseUri: string;
   sourceLocationPrefix: string;
+  run?: Run;
+  userSettings: UserSettings;
 };
 
 export const InterpretedCompareResultTable = ({
   results,
   databaseUri,
   sourceLocationPrefix,
+  userSettings,
 }: Props) => {
   return (
     <AlertTable
       results={results}
+      userSettings={userSettings}
       databaseUri={databaseUri}
       sourceLocationPrefix={sourceLocationPrefix}
       header={
         <thead>
           <tr>
             <th colSpan={2}></th>
-            <th className={`vscode-codeql__alert-message-cell`} colSpan={3}>
+            <th className={`vscode-codeql__alert-message-cell`} colSpan={4}>
               Message
             </th>
           </tr>

extensions/ql-vscode/src/view/jest.config.ts

@@ -1,4 +1,5 @@
 import type { Config } from "jest";
+import { transformIgnorePatterns } from "../../test/jest-config";
 
 /*
  * For a detailed explanation regarding each configuration property and type check, visit:
@@ -184,10 +185,7 @@ const config: Config = {
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: [
+  transformIgnorePatterns,
-    // These use ES modules, so need to be transformed
-    "node_modules/(?!(?:@vscode/webview-ui-toolkit|@microsoft/.+|exenv-es6|d3|d3-(.*)|internmap|delaunator|robust-predicates)/.*)",
-  ],
 
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
   // unmockedModulePathPatterns: undefined,

extensions/ql-vscode/src/view/method-modeling/MethodModeling.tsx

@@ -55,8 +55,6 @@ export type MethodModelingProps = {
   modelingStatus: ModelingStatus;
   method: Method;
   modeledMethods: ModeledMethod[];
-  isModelingInProgress: boolean;
-  isProcessedByAutoModel: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
 
@@ -66,8 +64,6 @@ export const MethodModeling = ({
   modelingStatus,
   modeledMethods,
   method,
-  isModelingInProgress,
-  isProcessedByAutoModel,
   onChange,
 }: MethodModelingProps): React.JSX.Element => {
   return (
@@ -86,9 +82,6 @@ export const MethodModeling = ({
         modelConfig={modelConfig}
         method={method}
         modeledMethods={modeledMethods}
-        isModelingInProgress={isModelingInProgress}
-        isProcessedByAutoModel={isProcessedByAutoModel}
-        modelingStatus={modelingStatus}
         onChange={onChange}
       />
       <ReviewInEditorButton method={method} />

extensions/ql-vscode/src/view/method-modeling/MethodModelingInputs.tsx

@@ -5,7 +5,6 @@ import { ModelTypeDropdown } from "../model-editor/ModelTypeDropdown";
 import { ModelInputDropdown } from "../model-editor/ModelInputDropdown";
 import { ModelOutputDropdown } from "../model-editor/ModelOutputDropdown";
 import { ModelKindDropdown } from "../model-editor/ModelKindDropdown";
-import { InProgressDropdown } from "../model-editor/InProgressDropdown";
 import type { QueryLanguage } from "../../common/query-language";
 import type { ModelConfig } from "../../model-editor/languages";
 
@@ -28,8 +27,6 @@ export type MethodModelingInputsProps = {
   modelConfig: ModelConfig;
   method: Method;
   modeledMethod: ModeledMethod | undefined;
-  modelPending: boolean;
-  isModelingInProgress: boolean;
   onChange: (modeledMethod: ModeledMethod) => void;
 };
 
@@ -38,15 +35,12 @@ export const MethodModelingInputs = ({
   modelConfig,
   method,
   modeledMethod,
-  modelPending,
-  isModelingInProgress,
   onChange,
 }: MethodModelingInputsProps): React.JSX.Element => {
   const inputProps = {
     language,
     method,
     modeledMethod,
-    modelPending,
     onChange,
   };
 
@@ -55,41 +49,25 @@ export const MethodModelingInputs = ({
       <Container>
         <Input>
           <Name>Model Type</Name>
-          {isModelingInProgress ? (
+          <ModelTypeDropdown modelConfig={modelConfig} {...inputProps} />
-            <InProgressDropdown />
-          ) : (
-            <ModelTypeDropdown modelConfig={modelConfig} {...inputProps} />
-          )}
         </Input>
       </Container>
       <Container>
         <Input>
           <Name>Input</Name>
-          {isModelingInProgress ? (
+          <ModelInputDropdown {...inputProps} />
-            <InProgressDropdown />
-          ) : (
-            <ModelInputDropdown {...inputProps} />
-          )}
         </Input>
       </Container>
       <Container>
         <Input>
           <Name>Output</Name>
-          {isModelingInProgress ? (
+          <ModelOutputDropdown {...inputProps} />
-            <InProgressDropdown />
-          ) : (
-            <ModelOutputDropdown {...inputProps} />
-          )}
         </Input>
       </Container>
       <Container>
         <Input>
           <Name>Kind</Name>
-          {isModelingInProgress ? (
+          <ModelKindDropdown {...inputProps} />
-            <InProgressDropdown />
-          ) : (
-            <ModelKindDropdown {...inputProps} />
-          )}
         </Input>
       </Container>
     </>

extensions/ql-vscode/src/view/method-modeling/MethodModelingView.tsx

@@ -31,12 +31,6 @@ export function MethodModelingView({
 
   const [isMethodModified, setIsMethodModified] = useState<boolean>(false);
 
-  const [isModelingInProgress, setIsModelingInProgress] =
-    useState<boolean>(false);
-
-  const [isProcessedByAutoModel, setIsProcessedByAutoModel] =
-    useState<boolean>(false);
-
   const modelingStatus = useMemo(
     () => getModelingStatus(modeledMethods, isMethodModified),
     [modeledMethods, isMethodModified],
@@ -63,21 +57,11 @@ export function MethodModelingView({
             setMethod(undefined);
             setModeledMethods([]);
             setIsMethodModified(false);
-            setIsModelingInProgress(false);
-            setIsProcessedByAutoModel(false);
             break;
           case "setSelectedMethod":
             setMethod(msg.method);
             setModeledMethods(msg.modeledMethods);
             setIsMethodModified(msg.isModified);
-            setIsModelingInProgress(msg.isInProgress);
-            setIsProcessedByAutoModel(msg.processedByAutoModel);
-            break;
-          case "setInProgress":
-            setIsModelingInProgress(msg.inProgress);
-            break;
-          case "setProcessedByAutoModel":
-            setIsProcessedByAutoModel(msg.processedByAutoModel);
             break;
           default:
             assertNever(msg);
@@ -125,8 +109,6 @@ export function MethodModelingView({
       modelingStatus={modelingStatus}
       method={method}
       modeledMethods={modeledMethods}
-      isModelingInProgress={isModelingInProgress}
-      isProcessedByAutoModel={isProcessedByAutoModel}
       onChange={onChange}
     />
   );

extensions/ql-vscode/src/view/method-modeling/MultipleModeledMethodsPanel.tsx

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { Method } from "../../model-editor/method";
 import type { ModeledMethod } from "../../model-editor/modeled-method";
-import { isModelPending } from "../../model-editor/modeled-method";
 import {
   canAddNewModeledMethod,
   canRemoveModeledMethod,
@@ -15,7 +14,6 @@ import { ModeledMethodAlert } from "./ModeledMethodAlert";
 import type { QueryLanguage } from "../../common/query-language";
 import { createEmptyModeledMethod } from "../../model-editor/modeled-method-empty";
 import { sendTelemetry } from "../common/telemetry";
-import type { ModelingStatus } from "../../model-editor/shared/modeling-status";
 import type { ModelConfig } from "../../model-editor/languages";
 
 export type MultipleModeledMethodsPanelProps = {
@@ -23,9 +21,6 @@ export type MultipleModeledMethodsPanelProps = {
   modelConfig: ModelConfig;
   method: Method;
   modeledMethods: ModeledMethod[];
-  modelingStatus: ModelingStatus;
-  isModelingInProgress: boolean;
-  isProcessedByAutoModel: boolean;
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
 };
 
@@ -66,9 +61,6 @@ export const MultipleModeledMethodsPanel = ({
   modelConfig,
   method,
   modeledMethods,
-  modelingStatus,
-  isModelingInProgress,
-  isProcessedByAutoModel,
   onChange,
 }: MultipleModeledMethodsPanelProps) => {
   const [selectedIndex, setSelectedIndex] = useState<number>(0);
@@ -163,12 +155,6 @@ export const MultipleModeledMethodsPanel = ({
           modelConfig={modelConfig}
           method={method}
           modeledMethod={modeledMethods[selectedIndex]}
-          modelPending={isModelPending(
-            modeledMethods[selectedIndex],
-            modelingStatus,
-            isProcessedByAutoModel,
-          )}
-          isModelingInProgress={isModelingInProgress}
           onChange={handleChange}
         />
       ) : (
@@ -177,12 +163,6 @@ export const MultipleModeledMethodsPanel = ({
           modelConfig={modelConfig}
           method={method}
           modeledMethod={undefined}
-          modelPending={isModelPending(
-            modeledMethods[selectedIndex],
-            modelingStatus,
-            isProcessedByAutoModel,
-          )}
-          isModelingInProgress={isModelingInProgress}
           onChange={handleChange}
         />
       )}

extensions/ql-vscode/src/view/method-modeling/__tests__/MethodModeling.spec.tsx

@@ -13,8 +13,6 @@ describe(MethodModeling.name, () => {
   it("renders method modeling panel", () => {
     const method = createMethod();
     const modeledMethod = createSinkModeledMethod();
-    const isModelingInProgress = false;
-    const isProcessedByAutoModel = false;
     const onChange = jest.fn();
 
     render({
@@ -23,8 +21,6 @@ describe(MethodModeling.name, () => {
       modelingStatus: "saved",
       method,
       modeledMethods: [modeledMethod],
-      isModelingInProgress,
-      isProcessedByAutoModel,
       onChange,
     });
 

extensions/ql-vscode/src/view/method-modeling/__tests__/MethodModelingInputs.spec.tsx

@@ -18,8 +18,6 @@ describe(MethodModelingInputs.name, () => {
   const language = QueryLanguage.Java;
   const method = createMethod();
   const modeledMethod = createSinkModeledMethod();
-  const modelPending = false;
-  const isModelingInProgress = false;
   const modelConfig = defaultModelConfig;
   const onChange = jest.fn();
 
@@ -28,8 +26,6 @@ describe(MethodModelingInputs.name, () => {
       language,
       method,
       modeledMethod,
-      modelPending,
-      isModelingInProgress,
       modelConfig,
       onChange,
     });
@@ -56,8 +52,6 @@ describe(MethodModelingInputs.name, () => {
       language,
       method,
       modeledMethod,
-      modelPending,
-      isModelingInProgress,
       modelConfig,
       onChange,
     });
@@ -80,8 +74,6 @@ describe(MethodModelingInputs.name, () => {
       language,
       method,
       modeledMethod,
-      modelPending,
-      isModelingInProgress,
       modelConfig,
       onChange,
     });
@@ -96,8 +88,6 @@ describe(MethodModelingInputs.name, () => {
         language={language}
         method={method}
         modeledMethod={updatedModeledMethod}
-        modelPending={modelPending}
-        isModelingInProgress={isModelingInProgress}
         modelConfig={modelConfig}
         onChange={onChange}
       />,
@@ -121,32 +111,4 @@ describe(MethodModelingInputs.name, () => {
     expect(modelOutputDropdown).toHaveValue("ReturnValue");
     expect(modelKindDropdown).toHaveValue("local");
   });
-
-  it("sets in progress dropdowns when modeling is in progress", () => {
-    render({
-      language,
-      method,
-      modeledMethod,
-      modelPending,
-      isModelingInProgress: true,
-      modelConfig,
-      onChange,
-    });
-
-    // Check that all the labels are rendered.
-    expect(screen.getByText("Model Type")).toBeInTheDocument();
-    expect(screen.getByText("Input")).toBeInTheDocument();
-    expect(screen.getByText("Output")).toBeInTheDocument();
-    expect(screen.getByText("Kind")).toBeInTheDocument();
-
-    // Check that all the dropdowns are rendered.
-    const dropdowns = screen.getAllByRole("combobox");
-    expect(dropdowns.length).toBe(4);
-
-    // Check that all the dropdowns are disabled and indicate have the value "Thinking...".
-    dropdowns.forEach((dropdown) => {
-      expect(dropdown).toBeDisabled();
-      expect(dropdown).toHaveValue("Thinking...");
-    });
-  });
 });

extensions/ql-vscode/src/view/method-modeling/__tests__/MultipleModeledMethodsPanel.spec.tsx

@@ -10,25 +10,18 @@ import { MultipleModeledMethodsPanel } from "../MultipleModeledMethodsPanel";
 import { userEvent } from "@testing-library/user-event";
 import type { ModeledMethod } from "../../../model-editor/modeled-method";
 import { QueryLanguage } from "../../../common/query-language";
-import type { ModelingStatus } from "../../../model-editor/shared/modeling-status";
 import { defaultModelConfig } from "../../../model-editor/languages";
 
 describe(MultipleModeledMethodsPanel.name, () => {
   const language = QueryLanguage.Java;
   const method = createMethod();
-  const isModelingInProgress = false;
-  const isProcessedByAutoModel = false;
-  const modelingStatus: ModelingStatus = "unmodeled";
   const onChange = jest.fn<void, [string, ModeledMethod[]]>();
   const modelConfig = defaultModelConfig;
 
   const baseProps = {
     language,
     method,
-    modelingStatus,
-    isModelingInProgress,
     modelConfig,
-    isProcessedByAutoModel,
     onChange,
   };
 

extensions/ql-vscode/src/view/model-editor/InProgressDropdown.tsx

@@ -1,17 +0,0 @@
-import { styled } from "styled-components";
-import { Dropdown } from "../common/Dropdown";
-
-const StyledDropdown = styled(Dropdown)`
-  font-style: italic;
-`;
-
-export const InProgressDropdown = () => {
-  return (
-    <StyledDropdown
-      value="Thinking..."
-      options={[]}
-      disabled={true}
-      disabledPlaceholder="Thinking..."
-    />
-  );
-};

extensions/ql-vscode/src/view/model-editor/InputDropdown.tsx

@@ -1,6 +1,4 @@
 import { styled } from "styled-components";
 import { Dropdown } from "../common/Dropdown";
 
-export const InputDropdown = styled(Dropdown)<{ $pending: boolean }>`
+export const InputDropdown = styled(Dropdown)``;
-  font-style: ${(props) => (props.$pending ? "italic" : "normal")};
-`;

extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx

@@ -14,7 +14,6 @@ import {
 } from "@vscode/webview-ui-toolkit/react";
 import type { ModelEditorViewState } from "../../model-editor/shared/view-state";
 import type { AccessPathSuggestionOptions } from "../../model-editor/suggestions";
-import { getCandidates } from "../../model-editor/shared/auto-model-candidates";
 import type { ModelEvaluationRunState } from "../../model-editor/shared/model-evaluation-run-state";
 
 const LibraryContainer = styled.div`
@@ -75,8 +74,6 @@ export type LibraryRowProps = {
   modeledMethodsMap: Record<string, ModeledMethod[]>;
   modifiedSignatures: Set<string>;
   selectedSignatures: Set<string>;
-  inProgressMethods: Set<string>;
-  processedByAutoModelMethods: Set<string>;
   viewState: ModelEditorViewState;
   hideModeledMethods: boolean;
   revealedMethodSignature: string | null;
@@ -85,11 +82,6 @@ export type LibraryRowProps = {
   onChange: (methodSignature: string, modeledMethods: ModeledMethod[]) => void;
   onMethodClick: (methodSignature: string) => void;
   onSaveModelClick: (methodSignatures: string[]) => void;
-  onGenerateFromLlmClick: (
-    dependencyName: string,
-    methodSignatures: string[],
-  ) => void;
-  onStopGenerateFromLlmClick: (dependencyName: string) => void;
   onGenerateFromSourceClick: () => void;
   onModelDependencyClick: () => void;
 };
@@ -101,8 +93,6 @@ export const LibraryRow = ({
   modeledMethodsMap,
   modifiedSignatures,
   selectedSignatures,
-  inProgressMethods,
-  processedByAutoModelMethods,
   viewState,
   hideModeledMethods,
   revealedMethodSignature,
@@ -111,8 +101,6 @@ export const LibraryRow = ({
   onChange,
   onMethodClick,
   onSaveModelClick,
-  onGenerateFromLlmClick,
-  onStopGenerateFromLlmClick,
   onGenerateFromSourceClick,
   onModelDependencyClick,
 }: LibraryRowProps) => {
@@ -134,27 +122,6 @@ export const LibraryRow = ({
     }
   }, [methods, revealedMethodSignature]);
 
-  const handleModelWithAI = useCallback(
-    async (e: React.MouseEvent) => {
-      onGenerateFromLlmClick(
-        title,
-        methods.map((m) => m.signature),
-      );
-      e.stopPropagation();
-      e.preventDefault();
-    },
-    [title, methods, onGenerateFromLlmClick],
-  );
-
-  const handleStopModelWithAI = useCallback(
-    async (e: React.MouseEvent) => {
-      onStopGenerateFromLlmClick(title);
-      e.stopPropagation();
-      e.preventDefault();
-    },
-    [title, onStopGenerateFromLlmClick],
-  );
-
   const handleModelFromSource = useCallback(
     async (e: React.MouseEvent) => {
       onGenerateFromSourceClick();
@@ -186,21 +153,6 @@ export const LibraryRow = ({
     return methods.some((method) => modifiedSignatures.has(method.signature));
   }, [methods, modifiedSignatures]);
 
-  const canStopAutoModeling = useMemo(() => {
-    return methods.some((method) => inProgressMethods.has(method.signature));
-  }, [methods, inProgressMethods]);
-
-  const modelWithAIDisabled = useMemo(() => {
-    return (
-      getCandidates(
-        viewState.mode,
-        methods,
-        modeledMethodsMap,
-        processedByAutoModelMethods,
-      ).length === 0
-    );
-  }, [methods, modeledMethodsMap, processedByAutoModelMethods, viewState.mode]);
-
   return (
     <LibraryContainer>
       <TitleContainer onClick={toggleExpanded} aria-expanded={isExpanded}>
@@ -219,22 +171,6 @@ export const LibraryRow = ({
           </ModeledPercentage>
           {hasUnsavedChanges ? <VSCodeTag>UNSAVED</VSCodeTag> : null}
         </NameContainer>
-        {viewState.showLlmButton && !canStopAutoModeling && (
-          <VSCodeButton
-            appearance="icon"
-            disabled={modelWithAIDisabled}
-            onClick={handleModelWithAI}
-          >
-            <Codicon name="lightbulb-autofix" label="Model with AI" />
-            &nbsp;Model with AI
-          </VSCodeButton>
-        )}
-        {viewState.showLlmButton && canStopAutoModeling && (
-          <VSCodeButton appearance="icon" onClick={handleStopModelWithAI}>
-            <Codicon name="debug-stop" label="Stop model with AI" />
-            &nbsp;Stop
-          </VSCodeButton>
-        )}
         {viewState.showGenerateButton &&
           viewState.mode === Mode.Application && (
             <VSCodeButton appearance="icon" onClick={handleModelFromSource}>
@@ -257,8 +193,6 @@ export const LibraryRow = ({
             modeledMethodsMap={modeledMethodsMap}
             modifiedSignatures={modifiedSignatures}
             selectedSignatures={selectedSignatures}
-            inProgressMethods={inProgressMethods}
-            processedByAutoModelMethods={processedByAutoModelMethods}
             viewState={viewState}
             hideModeledMethods={hideModeledMethods}
             revealedMethodSignature={revealedMethodSignature}

extensions/ql-vscode/src/view/model-editor/MethodRow.tsx

@@ -2,7 +2,6 @@ import {
   VSCodeBadge,
   VSCodeButton,
   VSCodeLink,
-  VSCodeProgressRing,
 } from "@vscode/webview-ui-toolkit/react";
 import {
   forwardRef,
@@ -17,13 +16,11 @@ import { vscode } from "../vscode-api";
 
 import type { Method } from "../../model-editor/method";
 import type { ModeledMethod } from "../../model-editor/modeled-method";
-import { isModelPending } from "../../model-editor/modeled-method";
 import { ModelKindDropdown } from "./ModelKindDropdown";
 import { Mode } from "../../model-editor/shared/mode";
 import { MethodClassifications } from "./MethodClassifications";
 import { getModelingStatus } from "../../model-editor/shared/modeling-status";
 import { ModelingStatusIndicator } from "./ModelingStatusIndicator";
-import { InProgressDropdown } from "./InProgressDropdown";
 import { MethodName } from "./MethodName";
 import { ModelTypeDropdown } from "./ModelTypeDropdown";
 import { ModelInputDropdown } from "./ModelInputDropdown";
@@ -66,12 +63,6 @@ const ViewLink = styled(VSCodeLink)`
   white-space: nowrap;
 `;
 
-const ProgressRing = styled(VSCodeProgressRing)`
-  width: 16px;
-  height: 16px;
-  margin-left: auto;
-`;
-
 const CodiconRow = styled(VSCodeButton)`
   min-height: calc(var(--input-height) * 1px);
   align-items: center;
@@ -83,8 +74,6 @@ export type MethodRowProps = {
   modeledMethods: ModeledMethod[];
   methodIsUnsaved: boolean;
   methodIsSelected: boolean;
-  modelingInProgress: boolean;
-  processedByAutoModel: boolean;
   viewState: ModelEditorViewState;
   revealedMethodSignature: string | null;
   inputAccessPathSuggestions?: AccessPathOption[];
@@ -116,13 +105,12 @@ export const MethodRow = (props: MethodRowProps) => {
 };
 
 const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
-  (props, ref) => {
+  (props: MethodRowProps, ref) => {
     const {
       method,
       modeledMethods: modeledMethodsProp,
       methodIsUnsaved,
       methodIsSelected,
-      processedByAutoModel,
       viewState,
       revealedMethodSignature,
       inputAccessPathSuggestions,
@@ -269,140 +257,105 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
             >
               View
             </ViewLink>
-            {props.modelingInProgress && <ProgressRing />}
           </ApiOrMethodRow>
         </DataGridCell>
-        {props.modelingInProgress && (
-          <>
-            <DataGridCell>
-              <InProgressDropdown />
-            </DataGridCell>
-            <DataGridCell>
-              <InProgressDropdown />
-            </DataGridCell>
-            <DataGridCell>
-              <InProgressDropdown />
-            </DataGridCell>
-            <DataGridCell>
-              <InProgressDropdown />
-            </DataGridCell>
-            <DataGridCell>
-              <CodiconRow appearance="icon" disabled={true}>
-                <Codicon name="add" label="Add new model" />
-              </CodiconRow>
-            </DataGridCell>
-          </>
-        )}
-        {!props.modelingInProgress && (
-          <>
-            {shownModeledMethods.map((modeledMethod, index) => {
-              const modelPending = isModelPending(
-                modeledMethod,
-                modelingStatus,
-                processedByAutoModel,
-              );
 
-              return (
+        {shownModeledMethods.map((modeledMethod, index) => {
-                <DataGridRow key={index} focused={focusedIndex === index}>
+          return (
-                  <DataGridCell>
+            <DataGridRow key={index} focused={focusedIndex === index}>
-                    <ModelTypeDropdown
+              <DataGridCell>
-                      language={viewState.language}
+                <ModelTypeDropdown
-                      modelConfig={viewState.modelConfig}
+                  language={viewState.language}
-                      method={method}
+                  modelConfig={viewState.modelConfig}
-                      modeledMethod={modeledMethod}
+                  method={method}
-                      modelPending={modelPending}
+                  modeledMethod={modeledMethod}
-                      onChange={modeledMethodChangedHandlers[index]}
+                  onChange={modeledMethodChangedHandlers[index]}
-                    />
-                  </DataGridCell>
-                  <DataGridCell>
-                    {inputAccessPathSuggestions === undefined ? (
-                      <ModelInputDropdown
-                        language={viewState.language}
-                        method={method}
-                        modeledMethod={modeledMethod}
-                        modelPending={modelPending}
-                        onChange={modeledMethodChangedHandlers[index]}
-                      />
-                    ) : (
-                      <ModelInputSuggestBox
-                        modeledMethod={modeledMethod}
-                        suggestions={inputAccessPathSuggestions}
-                        typePathSuggestions={outputAccessPathSuggestions ?? []}
-                        onChange={modeledMethodChangedHandlers[index]}
-                      />
-                    )}
-                  </DataGridCell>
-                  <DataGridCell>
-                    {outputAccessPathSuggestions === undefined ? (
-                      <ModelOutputDropdown
-                        language={viewState.language}
-                        method={method}
-                        modeledMethod={modeledMethod}
-                        modelPending={modelPending}
-                        onChange={modeledMethodChangedHandlers[index]}
-                      />
-                    ) : (
-                      <ModelOutputSuggestBox
-                        modeledMethod={modeledMethod}
-                        suggestions={outputAccessPathSuggestions}
-                        onChange={modeledMethodChangedHandlers[index]}
-                      />
-                    )}
-                  </DataGridCell>
-                  <DataGridCell>
-                    <ModelKindDropdown
-                      language={viewState.language}
-                      modeledMethod={modeledMethod}
-                      modelPending={modelPending}
-                      onChange={modeledMethodChangedHandlers[index]}
-                    />
-                  </DataGridCell>
-                  <DataGridCell>
-                    <ModelButtonsContainer>
-                      <ModelAlertsIndicator
-                        viewState={viewState}
-                        modeledMethod={modeledMethod}
-                        evaluationRun={evaluationRun}
-                      ></ModelAlertsIndicator>
-                      {index === 0 ? (
-                        <CodiconRow
-                          appearance="icon"
-                          aria-label="Add new model"
-                          onClick={(event: React.MouseEvent) => {
-                            event.stopPropagation();
-                            handleAddModelClick();
-                          }}
-                          disabled={addModelButtonDisabled}
-                        >
-                          <Codicon name="add" />
-                        </CodiconRow>
-                      ) : (
-                        <CodiconRow
-                          appearance="icon"
-                          aria-label="Remove model"
-                          onClick={(event: React.MouseEvent) => {
-                            event.stopPropagation();
-                            removeModelClickedHandlers[index]();
-                          }}
-                        >
-                          <Codicon name="trash" />
-                        </CodiconRow>
-                      )}
-                    </ModelButtonsContainer>
-                  </DataGridCell>
-                </DataGridRow>
-              );
-            })}
-            {validationErrors.map((error, index) => (
-              <DataGridCell gridColumn="span 5" key={index}>
-                <ModeledMethodAlert
-                  error={error}
-                  setSelectedIndex={setFocusedIndex}
                 />
               </DataGridCell>
-            ))}
+              <DataGridCell>
-          </>
+                {inputAccessPathSuggestions === undefined ? (
-        )}
+                  <ModelInputDropdown
+                    language={viewState.language}
+                    method={method}
+                    modeledMethod={modeledMethod}
+                    onChange={modeledMethodChangedHandlers[index]}
+                  />
+                ) : (
+                  <ModelInputSuggestBox
+                    modeledMethod={modeledMethod}
+                    suggestions={inputAccessPathSuggestions}
+                    typePathSuggestions={outputAccessPathSuggestions ?? []}
+                    onChange={modeledMethodChangedHandlers[index]}
+                  />
+                )}
+              </DataGridCell>
+              <DataGridCell>
+                {outputAccessPathSuggestions === undefined ? (
+                  <ModelOutputDropdown
+                    language={viewState.language}
+                    method={method}
+                    modeledMethod={modeledMethod}
+                    onChange={modeledMethodChangedHandlers[index]}
+                  />
+                ) : (
+                  <ModelOutputSuggestBox
+                    modeledMethod={modeledMethod}
+                    suggestions={outputAccessPathSuggestions}
+                    onChange={modeledMethodChangedHandlers[index]}
+                  />
+                )}
+              </DataGridCell>
+              <DataGridCell>
+                <ModelKindDropdown
+                  language={viewState.language}
+                  modeledMethod={modeledMethod}
+                  onChange={modeledMethodChangedHandlers[index]}
+                />
+              </DataGridCell>
+              <DataGridCell>
+                <ModelButtonsContainer>
+                  <ModelAlertsIndicator
+                    viewState={viewState}
+                    modeledMethod={modeledMethod}
+                    evaluationRun={evaluationRun}
+                  ></ModelAlertsIndicator>
+                  {index === 0 ? (
+                    <CodiconRow
+                      appearance="icon"
+                      aria-label="Add new model"
+                      onClick={(event: React.MouseEvent) => {
+                        event.stopPropagation();
+                        handleAddModelClick();
+                      }}
+                      disabled={addModelButtonDisabled}
+                    >
+                      <Codicon name="add" />
+                    </CodiconRow>
+                  ) : (
+                    <CodiconRow
+                      appearance="icon"
+                      aria-label="Remove model"
+                      onClick={(event: React.MouseEvent) => {
+                        event.stopPropagation();
+                        removeModelClickedHandlers[index]();
+                      }}
+                    >
+                      <Codicon name="trash" />
+                    </CodiconRow>
+                  )}
+                </ModelButtonsContainer>
+              </DataGridCell>
+            </DataGridRow>
+          );
+        })}
+        {validationErrors.map((error, index) => (
+          <DataGridCell gridColumn="span 5" key={index}>
+            <ModeledMethodAlert
+              error={error}
+              setSelectedIndex={setFocusedIndex}
+            />
+          </DataGridCell>
+        ))}
       </DataGridRow>
     );
   },
@@ -412,7 +365,7 @@ ModelableMethodRow.displayName = "ModelableMethodRow";
 const UnmodelableMethodRow = forwardRef<
   HTMLElement | undefined,
   MethodRowProps
->((props, ref) => {
+>((props: MethodRowProps, ref) => {
   const { method, viewState, revealedMethodSignature } = props;
 
   const jumpToMethod = useCallback(

extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx

@@ -102,12 +102,6 @@ export function ModelEditor({
     new Set(),
   );
 
-  const [inProgressMethods, setInProgressMethods] = useState<Set<string>>(
-    new Set(),
-  );
-  const [processedByAutoModelMethods, setProcessedByAutoModelMethods] =
-    useState<Set<string>>(new Set());
-
   const [hideModeledMethods, setHideModeledMethods] = useState(
     initialHideModeledMethods,
   );
@@ -153,14 +147,6 @@ export function ModelEditor({
           case "setModifiedMethods":
             setModifiedSignatures(new Set(msg.methodSignatures));
             break;
-          case "setInProgressMethods": {
-            setInProgressMethods(new Set(msg.methods));
-            break;
-          }
-          case "setProcessedByAutoModelMethods": {
-            setProcessedByAutoModelMethods(new Set(msg.methods));
-            break;
-          }
           case "revealMethod":
             setRevealedMethodSignature(msg.methodSignature);
             break;
@@ -294,24 +280,6 @@ export function ModelEditor({
     });
   }, []);
 
-  const onGenerateFromLlmClick = useCallback(
-    (packageName: string, methodSignatures: string[]) => {
-      vscode.postMessage({
-        t: "generateMethodsFromLlm",
-        packageName,
-        methodSignatures,
-      });
-    },
-    [],
-  );
-
-  const onStopGenerateFromLlmClick = useCallback((packageName: string) => {
-    vscode.postMessage({
-      t: "stopGeneratingMethodsFromLlm",
-      packageName,
-    });
-  }, []);
-
   const onOpenDatabaseClick = useCallback(() => {
     vscode.postMessage({
       t: "openDatabase",
@@ -430,8 +398,6 @@ export function ModelEditor({
           modeledMethodsMap={modeledMethods}
           modifiedSignatures={modifiedSignatures}
           selectedSignatures={selectedSignatures}
-          inProgressMethods={inProgressMethods}
-          processedByAutoModelMethods={processedByAutoModelMethods}
           viewState={viewState}
           hideModeledMethods={hideModeledMethods}
           revealedMethodSignature={revealedMethodSignature}
@@ -440,8 +406,6 @@ export function ModelEditor({
           onChange={onChange}
           onMethodClick={onMethodClick}
           onSaveModelClick={onSaveModelClick}
-          onGenerateFromLlmClick={onGenerateFromLlmClick}
-          onStopGenerateFromLlmClick={onStopGenerateFromLlmClick}
           onGenerateFromSourceClick={onGenerateFromSourceClick}
           onModelDependencyClick={onModelDependencyClick}
         />

extensions/ql-vscode/src/view/model-editor/ModelInputDropdown.tsx

@@ -15,7 +15,6 @@ type Props = {
   language: QueryLanguage;
   method: Method;
   modeledMethod: ModeledMethod | undefined;
-  modelPending: boolean;
   onChange: (modeledMethod: ModeledMethod) => void;
 };
 
@@ -23,7 +22,6 @@ export const ModelInputDropdown = ({
   language,
   method,
   modeledMethod,
-  modelPending,
   onChange,
 }: Props): React.JSX.Element => {
   const options = useMemo(() => {
@@ -80,7 +78,6 @@ export const ModelInputDropdown = ({
       value={value}
       options={options}
       disabled={!enabled}
-      $pending={modelPending}
       onChange={handleChange}
       aria-label="Input"
     />

extensions/ql-vscode/src/view/model-editor/ModelKindDropdown.tsx

@@ -15,14 +15,12 @@ import { InputDropdown } from "./InputDropdown";
 type Props = {
   language: QueryLanguage;
   modeledMethod: ModeledMethod | undefined;
-  modelPending: boolean;
   onChange: (modeledMethod: ModeledMethod) => void;
 };
 
 export const ModelKindDropdown = ({
   language,
   modeledMethod,
-  modelPending,
   onChange,
 }: Props) => {
   const predicate = useMemo(() => {
@@ -92,7 +90,6 @@ export const ModelKindDropdown = ({
       value={value}
       options={options}
       disabled={disabled}
-      $pending={modelPending}
       onChange={handleChange}
       aria-label="Kind"
     />

extensions/ql-vscode/src/view/model-editor/ModelOutputDropdown.tsx

@@ -15,7 +15,6 @@ type Props = {
   language: QueryLanguage;
   method: Method;
   modeledMethod: ModeledMethod | undefined;
-  modelPending: boolean;
   onChange: (modeledMethod: ModeledMethod) => void;
 };
 
@@ -23,7 +22,6 @@ export const ModelOutputDropdown = ({
   language,
   method,
   modeledMethod,
-  modelPending,
   onChange,
 }: Props): React.JSX.Element => {
   const options = useMemo(() => {
@@ -81,7 +79,6 @@ export const ModelOutputDropdown = ({
       value={value}
       options={options}
       disabled={!enabled}
-      $pending={modelPending}
       onChange={handleChange}
       aria-label="Output"
     />