diff --git a/.gitignore b/.gitignore
index d347dbfb..af3591bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ packages/*/coverage/
 # Generated files
 packages/cli/src/generated/
 .integration-tests/
+packages/vscode-ide-companion/*.vsix
diff --git a/packages/vscode-ide-companion/gemini-cli-vscode-ide-companion-0.0.1.vsix b/packages/vscode-ide-companion/gemini-cli-vscode-ide-companion-0.0.1.vsix
deleted file mode 100644
index ec97a289..00000000
Binary files a/packages/vscode-ide-companion/gemini-cli-vscode-ide-companion-0.0.1.vsix and /dev/null differ
diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json
index 92621622..46c28123 100644
--- a/packages/vscode-ide-companion/package.json
+++ b/packages/vscode-ide-companion/package.json
@@ -29,7 +29,9 @@
     "watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
     "package": "vsce package --no-dependencies",
     "check-types": "tsc --noEmit",
-    "lint": "eslint src"
+    "lint": "eslint src",
+    "test": "echo \"vscode-ide-companion has no tests yet\"",
+    "test:ci": "echo \"vscode-ide-companion has no tests yet\""
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/scripts/build.js b/scripts/build.js
index 2555a750..edf0b3f8 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -33,6 +33,10 @@ if (!existsSync(join(root, 'node_modules'))) {
 // build all workspaces/packages
 execSync('npm run generate', { stdio: 'inherit', cwd: root });
 execSync('npm run build --workspaces', { stdio: 'inherit', cwd: root });
+execSync('npx --yes @vscode/vsce package --no-dependencies', {
+  stdio: 'inherit',
+  cwd: join(root, 'packages', 'vscode-ide-companion'),
+});
 
 // also build container image if sandboxing is enabled
 // skip (-s) npm install + build since we did that above
diff --git a/scripts/clean.js b/scripts/clean.js
index d53d097e..833f4842 100644
--- a/scripts/clean.js
+++ b/scripts/clean.js
@@ -45,3 +45,11 @@ for (const workspace of rootPackageJson.workspaces) {
     rmSync(join(pkgDir, 'dist'), RMRF_OPTIONS);
   }
 }
+
+// Clean up vsix files in vscode-ide-companion
+const vsixFiles = globSync('packages/vscode-ide-companion/*.vsix', {
+  cwd: root,
+});
+for (const vsixFile of vsixFiles) {
+  rmSync(join(root, vsixFile), RMRF_OPTIONS);
+}
diff --git a/scripts/copy_bundle_assets.js b/scripts/copy_bundle_assets.js
index 5a3af3e9..79d2a080 100644
--- a/scripts/copy_bundle_assets.js
+++ b/scripts/copy_bundle_assets.js
@@ -37,4 +37,12 @@ for (const file of sbFiles) {
   copyFileSync(join(root, file), join(bundleDir, basename(file)));
 }
 
+// Find and copy all .vsix files from packages to the root of the bundle directory
+const vsixFiles = glob.sync('packages/vscode-ide-companion/*.vsix', {
+  cwd: root,
+});
+for (const file of vsixFiles) {
+  copyFileSync(join(root, file), join(bundleDir, basename(file)));
+}
+
 console.log('Assets copied to bundle/');