Address PR review comments & fix vsix archive

Author: data-douser

.github/workflows/build-extension.yml

@@ -57,14 +57,14 @@ jobs:
 
       - name: Build Extension - Verify VSIX packaging
         working-directory: extensions/vscode
-        run: npx @vscode/vsce package --out codeql-development-mcp-server.vsix
+        run: npx @vscode/vsce package --no-dependencies --out codeql-development-mcp-server.vsix
 
       - name: Build Extension - Verify VSIX contents
         working-directory: extensions/vscode
         run: |
           echo "## VSIX Contents" >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
-          npx @vscode/vsce ls 2>&1 | head -50 >> $GITHUB_STEP_SUMMARY
+          npx @vscode/vsce ls --no-dependencies --tree 2>&1 | head -50 >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
 
       - name: Build Extension - Check for uncommitted changes

.github/workflows/release-vsix.yml

@@ -86,15 +86,15 @@ jobs:
         working-directory: extensions/vscode
         run: |
           VSIX_NAME="codeql-development-mcp-server.vsix"
-          npx @vscode/vsce package --out "${VSIX_NAME}"
+          npx @vscode/vsce package --no-dependencies --out "${VSIX_NAME}"
           echo "vsix_name=${VSIX_NAME}" >> $GITHUB_OUTPUT
           echo "✅ Packaged ${VSIX_NAME}"
 
       - name: VSIX - Verify VSIX contents
         working-directory: extensions/vscode
         run: |
           echo "Verifying bundled server and tool query packs..."
-          npx @vscode/vsce ls 2>&1 | tee /tmp/vsix-contents.txt
+          npx @vscode/vsce ls --no-dependencies 2>&1 | tee /tmp/vsix-contents.txt
 
           # Verify critical files are included
           for required in \

extensions/vscode/.vscodeignore

@@ -1,19 +1,26 @@
+# Source and config (not needed at runtime)
 .vscode/**
 .vscode-test/**
 src/**
 test/**
 scripts/**
+__mocks__/**
 node_modules/**
 tsconfig.json
 test/tsconfig.json
 vitest.config.ts
 eslint.config.mjs
 esbuild.config.js
+.gitignore
+coverage/**
+
+# Build artifacts that shouldn't be in the VSIX
 **/*.test.ts
 **/*.test.js
+**/*.test.cjs
 **/*.map
-coverage/**
+dist/test/**
 
-# Include server/ bundle but exclude test/examples content
+# Bundled server: exclude test/examples content
 server/ql/*/tools/test/**
 server/ql/*/examples/**

extensions/vscode/package.json

@@ -7,8 +7,7 @@
   "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/advanced-security/codeql-development-mcp-server.git",
-    "directory": "extensions/vscode"
+    "url": "git+https://github.com/advanced-security/codeql-development-mcp-server.git"
   },
   "type": "module",
   "homepage": "https://github.com/advanced-security/codeql-development-mcp-server#readme",
@@ -132,7 +131,7 @@
     "clean": "rm -rf dist server *.vsix",
     "lint": "eslint src/ test/",
     "lint:fix": "eslint src/ test/ --fix",
-    "package": "vsce package --out codeql-development-mcp-server.vsix",
+    "package": "vsce package --no-dependencies --out codeql-development-mcp-server.vsix",
     "test": "vitest --run",
     "test:coverage": "vitest --run --coverage",
     "test:watch": "vitest --watch",

extensions/vscode/scripts/bundle-server.js

@@ -35,16 +35,19 @@ if (existsSync(targetServerDir)) {
   rmSync(targetServerDir, { recursive: true, force: true });
 }
 
-// --- Server dist ---
+// --- Server dist (JS only, no source maps) ---
 const serverDist = join(serverRoot, 'dist');
 const targetDist = join(targetServerDir, 'dist');
 if (!existsSync(serverDist)) {
   console.error('❌ Server dist/ not found. Run "npm run build -w server" first.');
   process.exit(1);
 }
 mkdirSync(targetDist, { recursive: true });
-cpSync(serverDist, targetDist, { recursive: true });
-console.log('✅ Copied server/dist/');
+// Copy only the JS bundle, not the source map (which contains ../../ paths
+// that cause vsce to traverse the entire monorepo)
+const serverJs = join(serverDist, 'codeql-development-mcp-server.js');
+cpSync(serverJs, join(targetDist, 'codeql-development-mcp-server.js'));
+console.log('✅ Copied server/dist/codeql-development-mcp-server.js');
 
 // --- Server package.json ---
 const serverPkg = join(serverRoot, 'package.json');

extensions/vscode/tsconfig.json

@@ -11,8 +11,7 @@
     "declaration": true,
     "outDir": "./dist",
     "rootDir": "./src",
-    "resolveJsonModule": true,
-    "composite": true
+    "resolveJsonModule": true
   },
   "include": [
     "src/**/*"

tsconfig.json

@@ -15,9 +15,6 @@
   "references": [
     {
       "path": "./server"
-    },
-    {
-      "path": "./extensions/vscode"
     }
   ]
 }