Fixes for PR review comments

Author: data-douser

.codeql-version

@@ -1 +1 @@
-v2.24.1-prerelease
+v2.24.1

.github/workflows/release-npm.yml

@@ -101,6 +101,7 @@ jobs:
             server/dist/
             server/ql/
             server/package.json
+            server/scripts/setup-packs.sh
             README.md
             LICENSE
             docs/

.github/workflows/release.yml

@@ -181,6 +181,10 @@ jobs:
           cp -r server/ql dist-package/server/
           cp server/package.json dist-package/server/
 
+          # Copy scripts (setup-packs.sh is referenced by the bin field)
+          mkdir -p dist-package/server/scripts
+          cp server/scripts/setup-packs.sh dist-package/server/scripts/
+
           # Copy root files
           cp README.md dist-package/
           cp LICENSE dist-package/

docs/getting-started.md

@@ -22,6 +22,10 @@ npm install -g codeql-development-mcp-server
 codeql-development-mcp-server-setup-packs
 ```
 
+> **Note (Windows):** The `codeql-development-mcp-server-setup-packs` command
+> requires a Bash-compatible shell (e.g., Git Bash or WSL). On Windows without
+> Bash, run `setup-packs.sh` directly from the package's `scripts/` directory.
+
 Or use `npx` to run without a global install:
 
 ```bash

server/scripts/setup-packs.sh

@@ -85,7 +85,18 @@ fi
 ## Works from both:
 ##   npm layout:     <pkg>/scripts/setup-packs.sh  → <pkg>/ql/
 ##   monorepo layout: server/scripts/setup-packs.sh → server/ql/
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+## When invoked via npm bin shim/symlink, BASH_SOURCE[0] may point to the
+## .bin/ directory. Resolve the real path first to find the actual package root.
+SCRIPT_PATH="${BASH_SOURCE[0]}"
+if command -v realpath &> /dev/null; then
+  SCRIPT_PATH="$(realpath "${SCRIPT_PATH}")"
+elif command -v readlink &> /dev/null; then
+  # macOS readlink doesn't support -f, use a loop
+  while [ -L "${SCRIPT_PATH}" ]; do
+    SCRIPT_PATH="$(readlink "${SCRIPT_PATH}")"
+  done
+fi
+SCRIPT_DIR="$(cd "$(dirname "${SCRIPT_PATH}")" && pwd)"
 PACKAGE_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 QL_ROOT="${PACKAGE_ROOT}/ql"
 

server/scripts/update-release-version.sh

@@ -258,16 +258,20 @@ update_versions() {
 	echo "=== Updating Release Version to ${new_version} ==="
 	echo ""
 
-	## 1. Update .codeql-version (uses v prefix)
+	## 1. Update .codeql-version (uses v prefix, base version only)
+	## .codeql-version stores the CodeQL CLI version (X.Y.Z), NOT the project
+	## release version. For prerelease tags like 2.24.1-beta, we write v2.24.1.
+	local base_version
+	base_version=$(extract_base_version "${new_version}")
 	local codeql_version_file="${REPO_ROOT}/.codeql-version"
 	if [[ -f "${codeql_version_file}" ]]; then
 		local old_version
 		old_version=$(tr -d '[:space:]' < "${codeql_version_file}")
 		if [[ "${dry_run}" == true ]]; then
-			echo "  [DRY RUN] .codeql-version: ${old_version} -> v${new_version}"
+			echo "  [DRY RUN] .codeql-version: ${old_version} -> v${base_version}"
 		else
-			printf "v%s\n" "${new_version}" > "${codeql_version_file}"
-			echo "  ✅ .codeql-version: ${old_version} -> v${new_version}"
+			printf "v%s\n" "${base_version}" > "${codeql_version_file}"
+			echo "  ✅ .codeql-version: ${old_version} -> v${base_version}"
 		fi
 		updated_count=$((updated_count + 1))
 	fi