Address more PR review comments

Author: data-douser

extensions/vscode/src/bridge/database-copier.ts

@@ -31,7 +31,14 @@ export class DatabaseCopier {
    *          are ready for use (absolute paths).
    */
   async syncAll(sourceDirs: string[]): Promise<string[]> {
-    await mkdir(this.destinationBase, { recursive: true });
+    try {
+      await mkdir(this.destinationBase, { recursive: true });
+    } catch (err) {
+      this.logger.error(
+        `Failed to create managed database directory ${this.destinationBase}: ${err instanceof Error ? err.message : String(err)}`,
+      );
+      return [];
+    }
 
     const copied: string[] = [];
 
@@ -76,8 +83,15 @@ export class DatabaseCopier {
     this.logger.info(`Copying database ${src} → ${dest}`);
     try {
       // Remove stale destination if present
-      if (existsSync(dest)) {
-        await rm(dest, { recursive: true, force: true });
+      try {
+        if (existsSync(dest)) {
+          await rm(dest, { recursive: true, force: true });
+        }
+      } catch (rmErr) {
+        this.logger.error(
+          `Failed to remove stale destination ${dest}: ${rmErr instanceof Error ? rmErr.message : String(rmErr)}`,
+        );
+        return;
       }
 
       await cp(src, dest, { recursive: true });

extensions/vscode/src/bridge/environment-builder.ts

@@ -104,8 +104,15 @@ export class EnvironmentBuilder extends DisposableObject {
     if (copyEnabled) {
       const managedDir = this.storagePaths.getManagedDatabaseStoragePath();
       const copier = this.copierFactory(managedDir, this.logger);
-      await copier.syncAll(sourceDirs);
-      dbDirs = [managedDir, ...userDbDirs];
+      try {
+        await copier.syncAll(sourceDirs);
+        dbDirs = [managedDir, ...userDbDirs];
+      } catch (err) {
+        this.logger.error(
+          `Database copy failed, falling back to source dirs: ${err instanceof Error ? err.message : String(err)}`,
+        );
+        dbDirs = [...sourceDirs, ...userDbDirs];
+      }
     } else {
       dbDirs = [...sourceDirs, ...userDbDirs];
     }

extensions/vscode/test/suite/workspace-scenario.integration.test.ts

@@ -109,8 +109,11 @@ suite('Workspace Scenario Tests', () => {
       // With copyDatabases enabled (default), CODEQL_DATABASES_BASE_DIRS points
       // to a managed databases/ directory under our globalStorage instead of the
       // original workspaceStorage paths. Accept either layout.
-      const hasManagedDir = dirs.includes('/databases');
-      const hasWorkspaceStorage = dirs.includes('workspaceStorage');
+      const dirList = String(dirs)
+        .split(path.delimiter)
+        .filter((p: string) => p);
+      const hasManagedDir = dirList.some((p: string) => path.basename(p) === 'databases');
+      const hasWorkspaceStorage = dirList.some((p: string) => p.includes('workspaceStorage'));
       assert.ok(
         hasManagedDir || hasWorkspaceStorage,
         `With workspace open, CODEQL_DATABASES_BASE_DIRS should include managed databases dir or workspaceStorage: ${dirs}`,

server/dist/codeql-development-mcp-server.js.map

@@ -33,7 +33,7 @@ function parsePathList(envValue: string | undefined): string[] {
  * Each directory is expected to contain one or more CodeQL database directories
  * (each with a `codeql-database.yml` file).
  *
- * Set via `CODEQL_DATABASES_BASE_DIRS` (colon-separated).
+ * Set via `CODEQL_DATABASES_BASE_DIRS` (platform-delimited).
  */
 export function getDatabaseBaseDirs(): string[] {
   return parsePathList(process.env.CODEQL_DATABASES_BASE_DIRS);
@@ -47,7 +47,7 @@ export function getDatabaseBaseDirs(): string[] {
  * subdirectories with `repo_task.json`, `results/results.sarif`, and
  * `results/results.bqrs`.
  *
- * Set via `CODEQL_MRVA_RUN_RESULTS_DIRS` (colon-separated).
+ * Set via `CODEQL_MRVA_RUN_RESULTS_DIRS` (platform-delimited).
  */
 export function getMrvaRunResultsDirs(): string[] {
   return parsePathList(process.env.CODEQL_MRVA_RUN_RESULTS_DIRS);
@@ -60,7 +60,7 @@ export function getMrvaRunResultsDirs(): string[] {
  * `<QueryName>.ql-<nanoid>/`, each holding artifacts such as
  * `evaluator-log.jsonl`, `results.bqrs`, and `results-interpreted.sarif`.
  *
- * Set via `CODEQL_QUERY_RUN_RESULTS_DIRS` (colon-separated).
+ * Set via `CODEQL_QUERY_RUN_RESULTS_DIRS` (platform-delimited).
  */
 export function getQueryRunResultsDirs(): string[] {
   return parsePathList(process.env.CODEQL_QUERY_RUN_RESULTS_DIRS);