Normalize Windows platform naming for npm packages

Standardize naming: 'win' for file/folder/npm names, 'win32' for platform checks.

Changes:
- Add releasePlatform field to PLATFORM_CONFIGS (win vs win32)
- Add getReleasePlatform() helper function
- Update npm package names: @socketbin/cli-win-{x64,arm64}
- Update external-tools-platforms.mjs keys to win-{x64,arm64}
- Update workflow to use releasePlatform for artifact names/paths
- Update paths.mjs to normalize win32 → win for directory names

This enables consistent naming across GitHub releases and npm packages.
Old packages (@socketbin/cli-win32-*) will need deprecation placeholders.

Author: jdalton

.github/workflows/provenance.yml

@@ -73,7 +73,7 @@ jobs:
   build-binaries:
     if: ${{ inputs.socket }}
     needs: [build-cli]
-    name: Build ${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.libc && '-musl' || '' }}
+    name: Build ${{ matrix.releasePlatform }}-${{ matrix.arch }}${{ matrix.libc && '-musl' || '' }}
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
@@ -116,8 +116,8 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: binary-${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.libc && '-musl' || '' }}
-          path: packages/package-builder/build/prod/out/socketbin-cli-${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.libc && '-musl' || '' }}/socket${{ matrix.platform == 'win32' && '.exe' || '' }}
+          name: binary-${{ matrix.releasePlatform }}-${{ matrix.arch }}${{ matrix.libc && '-musl' || '' }}
+          path: packages/package-builder/build/prod/out/socketbin-cli-${{ matrix.releasePlatform }}-${{ matrix.arch }}${{ matrix.libc && '-musl' || '' }}/socket${{ matrix.platform == 'win32' && '.exe' || '' }}
           retention-days: 1
 
   # Publish all packages.
@@ -190,7 +190,8 @@ jobs:
             mkdir -p "$PKG_DIR"
 
             # Copy binary from artifact.
-            if [ "$PLATFORM" = "win32" ]; then
+            # Check for 'win' (release naming, not win32).
+            if [ "$PLATFORM" = "win" ]; then
               cp "artifacts/binary-${target}/socket.exe" "$PKG_DIR/"
             else
               cp "artifacts/binary-${target}/socket" "$PKG_DIR/"

packages/build-infra/lib/platform-targets.mjs

@@ -2,13 +2,18 @@
  * @fileoverview Shared platform target utilities for SEA builds.
  * Provides constants and parsing functions for platform/arch/libc combinations.
  * This is the single source of truth for all platform definitions.
+ *
+ * Naming convention:
+ * - `platform`: Node.js process.platform value (darwin, linux, win32)
+ * - `releasePlatform`: Normalized for file/folder/npm names (darwin, linux, win)
  */
 
 /**
  * Complete platform configuration with all metadata.
  * This is the authoritative source for platform definitions.
  * @type {ReadonlyArray<{
  *   platform: string,
+ *   releasePlatform: string,
  *   arch: string,
  *   libc?: string,
  *   runner: string,
@@ -26,6 +31,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     description: 'macOS ARM64 (Apple Silicon)',
     os: 'darwin',
     platform: 'darwin',
+    releasePlatform: 'darwin',
     runner: 'macos-latest',
   },
   {
@@ -35,6 +41,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     description: 'macOS x64 (Intel)',
     os: 'darwin',
     platform: 'darwin',
+    releasePlatform: 'darwin',
     runner: 'macos-latest',
   },
   {
@@ -44,6 +51,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     description: 'Linux ARM64 (glibc)',
     os: 'linux',
     platform: 'linux',
+    releasePlatform: 'linux',
     runner: 'ubuntu-latest',
   },
   {
@@ -54,6 +62,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     libc: 'musl',
     os: 'linux',
     platform: 'linux',
+    releasePlatform: 'linux',
     runner: 'ubuntu-latest',
   },
   {
@@ -63,6 +72,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     description: 'Linux x64 (glibc)',
     os: 'linux',
     platform: 'linux',
+    releasePlatform: 'linux',
     runner: 'ubuntu-latest',
   },
   {
@@ -73,6 +83,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     libc: 'musl',
     os: 'linux',
     platform: 'linux',
+    releasePlatform: 'linux',
     runner: 'ubuntu-latest',
   },
   {
@@ -82,6 +93,7 @@ export const PLATFORM_CONFIGS = Object.freeze([
     description: 'Windows ARM64',
     os: 'win32',
     platform: 'win32',
+    releasePlatform: 'win',
     runner: 'windows-latest',
   },
   {
@@ -91,24 +103,41 @@ export const PLATFORM_CONFIGS = Object.freeze([
     description: 'Windows x64',
     os: 'win32',
     platform: 'win32',
+    releasePlatform: 'win',
     runner: 'windows-latest',
   },
 ])
 
 /**
- * Valid platform targets for SEA builds.
- * Format: <platform>-<arch>[-musl]
+ * Valid platform targets for SEA builds (using releasePlatform for naming).
+ * Format: <releasePlatform>-<arch>[-musl]
  * Derived from PLATFORM_CONFIGS.
  */
 export const PLATFORM_TARGETS = PLATFORM_CONFIGS.map(
-  c => `${c.platform}-${c.arch}${c.libc ? `-${c.libc}` : ''}`,
+  c => `${c.releasePlatform}-${c.arch}${c.libc ? `-${c.libc}` : ''}`,
 )
 
 /**
- * Valid platforms.
+ * Get the release platform name for file/folder/npm naming.
+ * Converts win32 → win, leaves others unchanged.
+ *
+ * @param {string} platform - Node.js platform (darwin, linux, win32).
+ * @returns {string} Release platform (darwin, linux, win).
+ */
+export function getReleasePlatform(platform) {
+  return platform === 'win32' ? 'win' : platform
+}
+
+/**
+ * Valid platforms (Node.js process.platform values).
  */
 export const VALID_PLATFORMS = ['darwin', 'linux', 'win32']
 
+/**
+ * Valid release platforms (for file/folder/npm naming).
+ */
+export const VALID_RELEASE_PLATFORMS = ['darwin', 'linux', 'win']
+
 /**
  * Valid architectures.
  */
@@ -124,7 +153,8 @@ export const VALID_ARCHS = ['arm64', 'x64']
 
 /**
  * Parse a platform target string into components.
- * Handles formats: darwin-arm64, linux-x64, linux-arm64-musl, win32-x64
+ * Handles formats: darwin-arm64, linux-x64, linux-arm64-musl, win-x64, win32-x64
+ * Accepts both 'win' (release naming) and 'win32' (Node.js naming) for Windows.
  *
  * @param {string} target - Target string (e.g., "darwin-arm64" or "linux-x64-musl").
  * @returns {PlatformTargetInfo | null} Parsed info or null if invalid.
@@ -136,6 +166,10 @@ export const VALID_ARCHS = ['arm64', 'x64']
  * @example
  * parsePlatformTarget('linux-x64-musl')
  * // { platform: 'linux', arch: 'x64', libc: 'musl' }
+ *
+ * @example
+ * parsePlatformTarget('win-x64')
+ * // { platform: 'win32', arch: 'x64' }
  */
 export function parsePlatformTarget(target) {
   if (!target || typeof target !== 'string') {
@@ -159,7 +193,11 @@ export function parsePlatformTarget(target) {
   // Handle standard platform-arch.
   const parts = target.split('-')
   if (parts.length === 2) {
-    const [platform, arch] = parts
+    let [platform, arch] = parts
+    // Normalize 'win' to 'win32' for internal use.
+    if (platform === 'win') {
+      platform = 'win32'
+    }
     if (VALID_PLATFORMS.includes(platform) && VALID_ARCHS.includes(arch)) {
       return { arch, platform }
     }
@@ -180,13 +218,16 @@ export function isPlatformTarget(target) {
 
 /**
  * Get the full platform config for a target string.
+ * Accepts both release naming (win-x64) and Node.js naming (win32-x64).
  *
- * @param {string} target - Target string (e.g., "darwin-arm64" or "linux-x64-musl").
+ * @param {string} target - Target string (e.g., "darwin-arm64", "win-x64", or "linux-x64-musl").
  * @returns {typeof PLATFORM_CONFIGS[number] | undefined} Full platform config or undefined.
  */
 export function getPlatformConfig(target) {
   return PLATFORM_CONFIGS.find(
-    c => `${c.platform}-${c.arch}${c.libc ? `-${c.libc}` : ''}` === target,
+    c =>
+      `${c.releasePlatform}-${c.arch}${c.libc ? `-${c.libc}` : ''}` === target ||
+      `${c.platform}-${c.arch}${c.libc ? `-${c.libc}` : ''}` === target,
   )
 }
 

packages/cli/scripts/constants/external-tools-platforms.mjs

@@ -29,8 +29,8 @@
  *   - socket-patch-x86_64-apple-darwin.tar.gz       (darwin-x64)
  *   - socket-patch-aarch64-unknown-linux-gnu.tar.gz (linux-arm64 glibc)
  *   - socket-patch-x86_64-unknown-linux-musl.tar.gz (linux-x64 musl)
- *   - socket-patch-aarch64-pc-windows-msvc.zip      (win32-arm64)
- *   - socket-patch-x86_64-pc-windows-msvc.zip       (win32-x64)
+ *   - socket-patch-aarch64-pc-windows-msvc.zip      (win-arm64)
+ *   - socket-patch-x86_64-pc-windows-msvc.zip       (win-x64)
  *
  * MISSING BUILDS (using fallbacks):
  *   - linux-x64 (glibc): Using musl build as fallback. Musl binaries are statically
@@ -130,7 +130,7 @@ export const PLATFORM_MAP_TOOLS = {
 
   // Windows ARM64 - Python, TruffleHog, and socket-patch are native arm64.
   // Trivy, OpenGrep, and sfw use x64 binaries (Windows 11 ARM64 emulates x64).
-  'win32-arm64': {
+  'win-arm64': {
     __proto__: null,
     opengrep: 'opengrep-core_windows_x86.zip', // x64 emulated.
     python:
@@ -142,7 +142,7 @@ export const PLATFORM_MAP_TOOLS = {
   },
 
   // Windows x86_64 - all native x86_64.
-  'win32-x64': {
+  'win-x64': {
     __proto__: null,
     opengrep: 'opengrep-core_windows_x86.zip',
     python:
@@ -153,3 +153,16 @@ export const PLATFORM_MAP_TOOLS = {
     trufflehog: 'trufflehog_3.93.1_windows_amd64.tar.gz',
   },
 }
+
+/**
+ * Get platform key for EXTERNAL_TOOLS_BY_PLATFORM lookup.
+ * Normalizes process.platform (win32) to release naming (win).
+ *
+ * @param {string} platform - process.platform value (darwin, linux, win32).
+ * @param {string} arch - process.arch value (arm64, x64).
+ * @returns {string} Normalized platform key (e.g., 'win-x64').
+ */
+export function getPlatformKey(platform, arch) {
+  const releasePlatform = platform === 'win32' ? 'win' : platform
+  return `${releasePlatform}-${arch}`
+}

packages/cli/scripts/test-download-external-tools.mjs

@@ -37,7 +37,7 @@ const PLATFORM_MAP = {
     trufflehog: 'trufflehog_3.93.1_linux_amd64.tar.gz',
     opengrep: 'opengrep-core_linux_x86.tar.gz',
   },
-  'win32-x64': {
+  'win-x64': {
     trivy: 'trivy_0.69.1_windows-64bit.zip',
     trufflehog: 'trufflehog_3.93.1_windows_amd64.tar.gz',
     opengrep: 'opengrep-core_windows_x86.zip',
@@ -56,10 +56,11 @@ const TOOL_REPOS = {
 }
 
 /**
- * Get current platform identifier.
+ * Get current platform identifier (normalized for release naming).
+ * Uses 'win' instead of 'win32' for Windows.
  */
 function getCurrentPlatform() {
-  const platform = process.platform
+  const platform = process.platform === 'win32' ? 'win' : process.platform
   const arch = process.arch
   return `${platform}-${arch}`
 }

packages/package-builder/scripts/generate-socketbin-packages.mjs

@@ -22,21 +22,22 @@ const logger = getDefaultLogger()
  * Generate a single socketbin package.
  */
 async function generatePackage(config) {
-  const { arch, binExt, cpu, description, libc, os, platform } = config
+  const { arch, binExt, cpu, description, libc, os, platform, releasePlatform } = config
   const muslSuffix = libc === 'musl' ? '-musl' : ''
-  const packageName = `socketbin-cli-${platform}-${arch}${muslSuffix}`
-  const packagePath = getSocketbinPackageDir(platform, arch, libc)
+  const packageName = `socketbin-cli-${releasePlatform}-${arch}${muslSuffix}`
+  const packagePath = getSocketbinPackageDir(releasePlatform, arch, libc)
   const templatePath = SOCKETBIN_TEMPLATE_DIR
 
   // Template context for Handlebars.
+  // Use releasePlatform for npm package naming (win, not win32).
   const context = {
     ARCH: arch,
     BIN_EXT: binExt,
     CPU: cpu,
     DESCRIPTION: description,
     LIBC_SUFFIX: muslSuffix,
     OS: os,
-    PLATFORM: platform,
+    PLATFORM: releasePlatform,
   }
 
   // Create package directory.

packages/package-builder/scripts/paths.mjs

@@ -70,29 +70,33 @@ export function getPackageOutDir(packageName, mode = getBuildMode()) {
 
 /**
  * Get the output path for a socketbin package.
+ * Uses release platform naming (win instead of win32).
  *
- * @param {string} platform - Platform identifier (darwin, linux, win32).
+ * @param {string} platform - Platform identifier (darwin, linux, win, or win32).
  * @param {string} arch - Architecture identifier (arm64, x64).
  * @param {string} [libc] - Linux libc variant ('musl' for Alpine).
  * @param {string} [mode] - Build mode (dev/prod), defaults to BUILD_MODE or CI detection.
  * @returns {string} Path to socketbin package directory.
  */
 export function getSocketbinPackageDir(platform, arch, libc, mode = getBuildMode()) {
+  // Normalize win32 → win for directory naming.
+  const releasePlatform = platform === 'win32' ? 'win' : platform
   const muslSuffix = libc === 'musl' ? '-musl' : ''
-  const packageName = `socketbin-cli-${platform}-${arch}${muslSuffix}`
+  const packageName = `socketbin-cli-${releasePlatform}-${arch}${muslSuffix}`
   return getPackageOutDir(packageName, mode)
 }
 
 /**
  * Get the binary path within a socketbin package.
  *
- * @param {string} platform - Platform identifier (darwin, linux, win32).
+ * @param {string} platform - Platform identifier (darwin, linux, win, or win32).
  * @param {string} arch - Architecture identifier (arm64, x64).
  * @param {string} [libc] - Linux libc variant ('musl' for Alpine).
  * @param {string} [mode] - Build mode (dev/prod), defaults to BUILD_MODE or CI detection.
  * @returns {string} Path to the socket binary.
  */
 export function getSocketbinBinaryPath(platform, arch, libc, mode = getBuildMode()) {
-  const binaryName = platform === 'win32' ? 'socket.exe' : 'socket'
+  // Accept both win and win32 for Windows detection.
+  const binaryName = platform === 'win32' || platform === 'win' ? 'socket.exe' : 'socket'
   return join(getSocketbinPackageDir(platform, arch, libc, mode), binaryName)
 }

packages/package-builder/templates/socket-package/package.json

@@ -21,8 +21,8 @@
     "@socketbin/cli-linux-arm64-musl": "0.0.0-replaced-by-publish",
     "@socketbin/cli-linux-x64": "0.0.0-replaced-by-publish",
     "@socketbin/cli-linux-x64-musl": "0.0.0-replaced-by-publish",
-    "@socketbin/cli-win32-arm64": "0.0.0-replaced-by-publish",
-    "@socketbin/cli-win32-x64": "0.0.0-replaced-by-publish"
+    "@socketbin/cli-win-arm64": "0.0.0-replaced-by-publish",
+    "@socketbin/cli-win-x64": "0.0.0-replaced-by-publish"
   },
   "engines": {
     "node": ">=18"

scripts/get-platform-matrix.mjs

@@ -14,7 +14,8 @@ const matrix = {
   include: PLATFORM_CONFIGS.map(c => ({
     arch: c.arch,
     libc: c.libc ?? null,
-    platform: c.platform,
+    platform: c.platform, // Node.js platform (win32 for Windows)
+    releasePlatform: c.releasePlatform, // Release naming (win for Windows)
     runner: c.runner,
   })),
 }