Logging fixes for pack installer & rel path

Author: data-douser

extensions/vscode/__mocks__/vscode.ts

@@ -82,6 +82,11 @@ export const workspace = {
   onDidCreateFiles: noopReturn({ dispose: noop }),
   onDidSaveTextDocument: noopReturn({ dispose: noop }),
   fs: { stat: noop, readFile: noop, readDirectory: noop },
+  asRelativePath: (pathOrUri: any) => {
+    const p = typeof pathOrUri === 'string' ? pathOrUri : pathOrUri?.fsPath ?? String(pathOrUri);
+    return p;
+  },
+  updateWorkspaceFolders: () => true,
 };
 
 export const window = {

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

@@ -61,15 +61,15 @@ export class DatabaseWatcher extends DisposableObject {
     const dbRoot = ymlPath.replace(/\/codeql-database\.yml$/, '');
     if (!this.knownDatabases.has(dbRoot)) {
       this.knownDatabases.add(dbRoot);
-      this.logger.info(`Database discovered: ${dbRoot}`);
+      this.logger.info(`Database discovered: ${vscode.workspace.asRelativePath(dbRoot)}`);
       this._onDidChange.fire();
     }
   }
 
   private handleDatabaseRemoved(ymlPath: string): void {
     const dbRoot = ymlPath.replace(/\/codeql-database\.yml$/, '');
     if (this.knownDatabases.delete(dbRoot)) {
-      this.logger.info(`Database removed: ${dbRoot}`);
+      this.logger.info(`Database removed: ${vscode.workspace.asRelativePath(dbRoot)}`);
       this._onDidChange.fire();
     }
   }

extensions/vscode/src/bridge/query-results-watcher.ts

@@ -26,7 +26,7 @@ export class QueryResultsWatcher extends DisposableObject {
     const bqrsWatcher = vscode.workspace.createFileSystemWatcher('**/*.bqrs');
     this.push(bqrsWatcher);
     bqrsWatcher.onDidCreate((uri) => {
-      this.logger.info(`Query result (BQRS) created: ${uri.fsPath}`);
+      this.logger.info(`Query result (BQRS) created: ${vscode.workspace.asRelativePath(uri)}`);
       this._onDidChange.fire();
     });
 
@@ -36,7 +36,7 @@ export class QueryResultsWatcher extends DisposableObject {
     );
     this.push(sarifWatcher);
     sarifWatcher.onDidCreate((uri) => {
-      this.logger.info(`Query result (SARIF) created: ${uri.fsPath}`);
+      this.logger.info(`Query result (SARIF) created: ${vscode.workspace.asRelativePath(uri)}`);
       this._onDidChange.fire();
     });
 

extensions/vscode/src/server/pack-installer.ts

@@ -176,7 +176,7 @@ export class PackInstaller extends DisposableObject {
         return;
       }
       this.logger.info(
-        'Pack install did not succeed for all languages — falling back to bundled pack install.',
+        'Pack download did not succeed for all languages — falling back to bundled pack install.',
       );
     } else if (actualCliVersion && actualCliVersion === targetCliVersion) {
       this.logger.info(
@@ -210,28 +210,28 @@ export class PackInstaller extends DisposableObject {
     }
 
     this.logger.info(
-      `Installing ql-mcp tool query packs v${packVersion} for CodeQL CLI ${cliVersion}...`,
+      `Downloading ql-mcp tool query packs v${packVersion} for CodeQL CLI ${cliVersion}...`,
     );
 
     let allSucceeded = true;
     let successCount = 0;
     for (const lang of languages) {
       const packRef =
         `${PackInstaller.PACK_SCOPE}/ql-mcp-${lang}-tools-src@${packVersion}`;
-      this.logger.info(`Installing ${packRef}...`);
+      this.logger.info(`Downloading ${packRef}...`);
       try {
         await this.runCodeqlPackDownload(codeqlPath, packRef);
-        this.logger.info(`Installed ${packRef}.`);
+        this.logger.info(`Downloaded ${packRef}.`);
         successCount++;
       } catch (err) {
         this.logger.error(
-          `Failed to install ${packRef}: ${err instanceof Error ? err.message : String(err)}`,
+          `Failed to download ${packRef}: ${err instanceof Error ? err.message : String(err)}`,
         );
         allSucceeded = false;
       }
     }
     this.logger.info(
-      `Pack install complete: ${successCount}/${languages.length} languages succeeded.`,
+      `Pack download complete: ${successCount}/${languages.length} languages succeeded.`,
     );
     return allSucceeded;
   }

extensions/vscode/test/server/pack-installer.test.ts

@@ -456,23 +456,23 @@ describe('PackInstaller', () => {
       );
     });
 
-    it('should use install terminology (not download) in pack download logs', async () => {
+    it('should use download terminology in pack download logs', async () => {
       cliResolver.getCliVersion.mockReturnValue('2.24.1');
       serverManager.getExtensionVersion.mockReturnValue('2.25.1-next.1');
 
       await installer.installAll({ languages: ['javascript'] });
 
-      // Should say "Installing" and "Installed", not "Downloading" / "Downloaded"
+      // Should say "Downloading" and "Downloaded", not "Installing" / "Installed"
       expect(logger.info).toHaveBeenCalledWith(
-        expect.stringContaining('Installing advanced-security/ql-mcp-javascript-tools-src@2.24.1'),
+        expect.stringContaining('Downloading advanced-security/ql-mcp-javascript-tools-src@2.24.1'),
       );
       expect(logger.info).toHaveBeenCalledWith(
-        expect.stringContaining('Installed advanced-security/ql-mcp-javascript-tools-src@2.24.1'),
+        expect.stringContaining('Downloaded advanced-security/ql-mcp-javascript-tools-src@2.24.1'),
       );
-      // Should NOT use "Downloading" or "Downloaded" for individual packs
+      // Should NOT use "Installing" or "Installed" for individual packs
       for (const call of logger.info.mock.calls) {
-        expect(String(call[0])).not.toMatch(/^Downloading advanced-security/);
-        expect(String(call[0])).not.toMatch(/^Downloaded advanced-security/);
+        expect(String(call[0])).not.toMatch(/^Installing advanced-security/);
+        expect(String(call[0])).not.toMatch(/^Installed advanced-security/);
       }
     });
 

server/test/src/prompts/workflow-prompts.test.ts

@@ -563,7 +563,7 @@ describe('Workflow Prompts', () => {
       expect(result.success).toBe(false);
     });
 
-    it('should accept missing language (auto-derivable from pack metadata)', () => {
+    it('should accept missing language (optional field)', () => {
       const result = explainCodeqlQuerySchema.safeParse({
         queryPath: '/q.ql',
       });
@@ -633,7 +633,7 @@ describe('Workflow Prompts', () => {
       expect(result.success).toBe(false);
     });
 
-    it('should accept missing language (auto-derivable from pack metadata)', () => {
+    it('should accept missing language (optional field)', () => {
       const result = documentCodeqlQuerySchema.safeParse({ queryPath: '/q.ql' });
       expect(result.success).toBe(true);
     });
@@ -698,7 +698,7 @@ describe('Workflow Prompts', () => {
       }
     });
 
-    it('should accept missing language (auto-derivable from pack metadata)', () => {
+    it('should accept missing language (optional field)', () => {
       const result = qlLspIterativeDevelopmentSchema.safeParse({ queryPath: '/q.ql' });
       expect(result.success).toBe(true);
     });