github · d10c · Jul 21, 2025 · Jul 23, 2025
@@ -2,6 +2,8 @@
 
 ## [UNRELEASED]
 
+- Add new command "CodeQL: Trim Overlay Base Cache" that returns a database to the state prior to overlay evaluation, leaving only base predicates and types that may later be referenced during overlay evaluation.
+
 ## 1.17.4 - 10 July 2025
 
 - Fix variant analysis pack creation on some Windows systems [#4068](https://github.com/github/vscode-codeql/pull/4068)

@@ -790,6 +790,10 @@
         "command": "codeQL.trimCache",
         "title": "CodeQL: Trim Cache"
       },
+      {
+        "command": "codeQL.trimOverlayBaseCache",
+        "title": "CodeQL: Trim Overlay Base Cache"
+      },
       {
         "command": "codeQL.installPackDependencies",
         "title": "CodeQL: Install Pack Dependencies"

@@ -221,6 +221,7 @@ export type LocalDatabasesCommands = {
   "codeQL.upgradeCurrentDatabase": () => Promise<void>;
   "codeQL.clearCache": () => Promise<void>;
   "codeQL.trimCache": () => Promise<void>;
+  "codeQL.trimOverlayBaseCache": () => Promise<void>;
 
   // Explorer context menu
   "codeQL.setCurrentDatabase": (uri: Uri) => Promise<void>;

@@ -284,6 +284,7 @@ export class DatabaseUI extends DisposableObject {
         this.handleUpgradeCurrentDatabase.bind(this),
       "codeQL.clearCache": this.handleClearCache.bind(this),
       "codeQL.trimCache": this.handleTrimCache.bind(this),
+      "codeQL.trimOverlayBaseCache": this.handleTrimOverlayBaseCache.bind(this),
       "codeQLDatabases.chooseDatabaseFolder":
         this.handleChooseDatabaseFolder.bind(this),
       "codeQLDatabases.chooseDatabaseArchive":
@@ -688,6 +689,24 @@ export class DatabaseUI extends DisposableObject {
     );
   }
 
+  private async handleTrimOverlayBaseCache(): Promise<void> {
+    return withProgress(
+      async () => {
+        if (
+          this.queryServer !== undefined &&
+          this.databaseManager.currentDatabaseItem !== undefined
+        ) {
+          await this.queryServer.trimOverlayBaseCacheInDatabase(
+            this.databaseManager.currentDatabaseItem,
+          );
+        }
+      },
+      {
+        title: "Removing all overlay-dependent data from cache",
+      },
+    );
+  }
+
   private async handleGetCurrentDatabase(): Promise<string | undefined> {
     const dbItem = await this.getDatabaseItemInternal(undefined);
     return dbItem?.databaseUri.fsPath;

@@ -193,6 +193,14 @@ export const trimCache = new RequestType<
   ClearCacheResult,
   void
 >("evaluation/trimCache");
+/**
+ * Trim overlay-dependent data from the cache of a dataset
+ */
+export const trimOverlayBaseCache = new RequestType<
+  WithProgressId<TrimCacheParams>,
+  ClearCacheResult,
+  void
+>("evaluation/trimOverlayBaseCache");
 
 /**
  * Clear the pack cache

@@ -17,6 +17,7 @@ import {
   deregisterDatabases,
   registerDatabases,
   trimCache,
+  trimOverlayBaseCache,
   upgradeDatabase,
 } from "./messages";
 import type { BaseLogger, Logger } from "../common/logging";
@@ -142,6 +143,20 @@ export class QueryRunner {
     await this.qs.sendRequest(trimCache, params);
   }
 
+  async trimOverlayBaseCacheInDatabase(dbItem: DatabaseItem): Promise<void> {
+    if (dbItem.contents === undefined) {
+      throw new Error(
+        "Can't trim the overlay base cache in an invalid database.",
+      );
+    }
+
+    const db = dbItem.databaseUri.fsPath;
+    const params: TrimCacheParams = {
+      db,
+    };
+    await this.qs.sendRequest(trimOverlayBaseCache, params);
+  }
+
   public async compileAndRunQueryAgainstDatabaseCore(
     dbPath: string,
     queries: CoreQueryTarget[],