electrobun 0.0.19-beta.6 → 0.0.19-beta.61

package/src/cli/index.ts

@@ -7,6 +7,7 @@ import {
   mkdirSync,
   createWriteStream,
   unlinkSync,
+  readdirSync,
 } from "fs";
 import { execSync } from "child_process";
 import tar from "tar";
@@ -18,7 +19,8 @@ const MAX_CHUNK_SIZE = 1024 * 2;
 
 // TODO: dedup with built.ts
 const OS: 'win' | 'linux' | 'macos' = getPlatform();
-const ARCH: 'arm64' | 'x64' = getArch();
+// Always use x64 for Windows since we only build x64 Windows binaries
+const ARCH: 'arm64' | 'x64' = OS === 'win' ? 'x64' : getArch();
 
 function getPlatform() {
   switch (platform()) {
@@ -63,41 +65,81 @@ const ELECTROBUN_DEP_PATH = join(projectRoot, "node_modules", "electrobun");
 // When debugging electrobun with the example app use the builds (dev or release) right from the source folder
 // For developers using electrobun cli via npm use the release versions in /dist
 // This lets us not have to commit src build folders to git and provide pre-built binaries
-const PATHS = {
-  BUN_BINARY: join(ELECTROBUN_DEP_PATH, "dist", "bun") + binExt,
-  LAUNCHER_DEV: join(ELECTROBUN_DEP_PATH, "dist", "electrobun") + binExt,
-  LAUNCHER_RELEASE: join(ELECTROBUN_DEP_PATH, "dist", "launcher") + binExt,
-  MAIN_JS: join(ELECTROBUN_DEP_PATH, "dist", "main.js"),  
-  NATIVE_WRAPPER_MACOS: join(
-    ELECTROBUN_DEP_PATH,
-    "dist",
-    "libNativeWrapper.dylib"
-  ),
-  NATIVE_WRAPPER_WIN: join(ELECTROBUN_DEP_PATH, "dist", "libNativeWrapper.dll"),
-  NATIVE_WRAPPER_LINUX: join(ELECTROBUN_DEP_PATH, "dist", "libNativeWrapper.so"),
-  WEBVIEW2LOADER_WIN: join(ELECTROBUN_DEP_PATH, "dist", "WebView2Loader.dll"),
-  BSPATCH: join(ELECTROBUN_DEP_PATH, "dist", "bspatch") + binExt,
-  EXTRACTOR: join(ELECTROBUN_DEP_PATH, "dist", "extractor") + binExt,
-  BSDIFF: join(ELECTROBUN_DEP_PATH, "dist", "bsdiff") + binExt,
-  CEF_FRAMEWORK_MACOS: join(
-    ELECTROBUN_DEP_PATH,
-    "dist",
-    "cef",
-    "Chromium Embedded Framework.framework"
-  ),
-  CEF_HELPER_MACOS: join(ELECTROBUN_DEP_PATH, "dist", "cef", "process_helper"),
-  CEF_HELPER_WIN: join(ELECTROBUN_DEP_PATH, "dist", "cef", "process_helper.exe"),
-  CEF_HELPER_LINUX: join(ELECTROBUN_DEP_PATH, "dist", "cef", "process_helper"),
-  CEF_DIR: join(ELECTROBUN_DEP_PATH, "dist", "cef"),
-};
 
-async function ensureCoreDependencies() {
-  // Check if core dependencies already exist
-  if (existsSync(PATHS.BUN_BINARY) && existsSync(PATHS.LAUNCHER_RELEASE)) {
+// Function to get platform-specific paths
+function getPlatformPaths(targetOS: 'macos' | 'win' | 'linux', targetArch: 'arm64' | 'x64') {
+  const binExt = targetOS === 'win' ? '.exe' : '';
+  const platformDistDir = join(ELECTROBUN_DEP_PATH, `dist-${targetOS}-${targetArch}`);
+  const sharedDistDir = join(ELECTROBUN_DEP_PATH, "dist");
+  
+  return {
+    // Platform-specific binaries (from dist-OS-ARCH/)
+    BUN_BINARY: join(platformDistDir, "bun") + binExt,
+    LAUNCHER_DEV: join(platformDistDir, "electrobun") + binExt,
+    LAUNCHER_RELEASE: join(platformDistDir, "launcher") + binExt,
+    NATIVE_WRAPPER_MACOS: join(platformDistDir, "libNativeWrapper.dylib"),
+    NATIVE_WRAPPER_WIN: join(platformDistDir, "libNativeWrapper.dll"),
+    NATIVE_WRAPPER_LINUX: join(platformDistDir, "libNativeWrapper.so"),
+    NATIVE_WRAPPER_LINUX_CEF: join(platformDistDir, "libNativeWrapper_cef.so"),
+    WEBVIEW2LOADER_WIN: join(platformDistDir, "WebView2Loader.dll"),
+    BSPATCH: join(platformDistDir, "bspatch") + binExt,
+    EXTRACTOR: join(platformDistDir, "extractor") + binExt,
+    BSDIFF: join(platformDistDir, "bsdiff") + binExt,
+    CEF_FRAMEWORK_MACOS: join(platformDistDir, "cef", "Chromium Embedded Framework.framework"),
+    CEF_HELPER_MACOS: join(platformDistDir, "cef", "process_helper"),
+    CEF_HELPER_WIN: join(platformDistDir, "cef", "process_helper.exe"),
+    CEF_HELPER_LINUX: join(platformDistDir, "cef", "process_helper"),
+    CEF_DIR: join(platformDistDir, "cef"),
+    
+    // Shared platform-independent files (from dist/)
+    // These work with existing package.json and development workflow
+    MAIN_JS: join(sharedDistDir, "main.js"),
+    API_DIR: join(sharedDistDir, "api"),
+  };
+}
+
+// Default PATHS for host platform (backward compatibility)
+const PATHS = getPlatformPaths(OS, ARCH);
+
+async function ensureCoreDependencies(targetOS?: 'macos' | 'win' | 'linux', targetArch?: 'arm64' | 'x64') {
+  // Use provided target platform or default to host platform
+  const platformOS = targetOS || OS;
+  const platformArch = targetArch || ARCH;
+  
+  // Get platform-specific paths
+  const platformPaths = getPlatformPaths(platformOS, platformArch);
+  
+  // Check platform-specific binaries
+  const requiredBinaries = [
+    platformPaths.BUN_BINARY,
+    platformPaths.LAUNCHER_RELEASE,
+    // Platform-specific native wrapper
+    platformOS === 'macos' ? platformPaths.NATIVE_WRAPPER_MACOS :
+    platformOS === 'win' ? platformPaths.NATIVE_WRAPPER_WIN :
+    platformPaths.NATIVE_WRAPPER_LINUX
+  ];
+  
+  // Check shared files (main.js should be in shared dist/)
+  const requiredSharedFiles = [
+    platformPaths.MAIN_JS
+  ];
+  
+  const missingBinaries = requiredBinaries.filter(file => !existsSync(file));
+  const missingSharedFiles = requiredSharedFiles.filter(file => !existsSync(file));
+  
+  // If only shared files are missing, that's expected in production (they come via npm)
+  if (missingBinaries.length === 0 && missingSharedFiles.length > 0) {
+    console.log(`Shared files missing (expected in production): ${missingSharedFiles.map(f => f.replace(ELECTROBUN_DEP_PATH, '.')).join(', ')}`);
+  }
+  
+  // Only download if platform-specific binaries are missing
+  if (missingBinaries.length === 0) {
     return;
   }
 
-  console.log('Core dependencies not found, downloading...');
+  // Show which binaries are missing
+  console.log(`Core dependencies not found for ${platformOS}-${platformArch}. Missing files:`, missingBinaries.map(f => f.replace(ELECTROBUN_DEP_PATH, '.')).join(', '));
+  console.log(`Downloading core binaries for ${platformOS}-${platformArch}...`);
   
   // Get the current Electrobun version from package.json
   const packageJsonPath = join(ELECTROBUN_DEP_PATH, 'package.json');
@@ -112,21 +154,21 @@ async function ensureCoreDependencies() {
     }
   }
 
-  const platformName = OS === 'macos' ? 'darwin' : OS === 'win' ? 'win32' : 'linux';
-  const archName = ARCH;
-  const mainTarballUrl = `https://github.com/blackboardsh/electrobun/releases/download/${version}/electrobun-${platformName}-${archName}.tar.gz`;
+  const platformName = platformOS === 'macos' ? 'darwin' : platformOS === 'win' ? 'win' : 'linux';
+  const archName = platformArch;
+  const coreTarballUrl = `https://github.com/blackboardsh/electrobun/releases/download/${version}/electrobun-core-${platformName}-${archName}.tar.gz`;
   
-  console.log(`Downloading core binaries from: ${mainTarballUrl}`);
+  console.log(`Downloading core binaries from: ${coreTarballUrl}`);
   
   try {
-    // Download main tarball
-    const response = await fetch(mainTarballUrl);
+    // Download core binaries tarball
+    const response = await fetch(coreTarballUrl);
     if (!response.ok) {
       throw new Error(`Failed to download binaries: ${response.status} ${response.statusText}`);
     }
     
     // Create temp file
-    const tempFile = join(ELECTROBUN_DEP_PATH, 'main-temp.tar.gz');
+    const tempFile = join(ELECTROBUN_DEP_PATH, `core-${platformOS}-${platformArch}-temp.tar.gz`);
     const fileStream = createWriteStream(tempFile);
     
     // Write response to file
@@ -140,33 +182,102 @@ async function ensureCoreDependencies() {
     }
     fileStream.end();
     
-    // Extract to dist directory
-    console.log('Extracting core dependencies...');
-    await tar.x({
-      file: tempFile,
-      cwd: join(ELECTROBUN_DEP_PATH, 'dist'),
-    });
+    // Extract to platform-specific dist directory
+    console.log(`Extracting core dependencies for ${platformOS}-${platformArch}...`);
+    const platformDistPath = join(ELECTROBUN_DEP_PATH, `dist-${platformOS}-${platformArch}`);
+    mkdirSync(platformDistPath, { recursive: true });
+    
+    // Use Windows native tar.exe on Windows due to npm tar library issues
+    if (OS === 'win') {
+      console.log('Using Windows native tar.exe for reliable extraction...');
+      execSync(`tar -xf "${tempFile}" -C "${platformDistPath}"`, { 
+        stdio: 'inherit',
+        cwd: platformDistPath 
+      });
+    } else {
+      await tar.x({
+        file: tempFile,
+        cwd: platformDistPath,
+        preservePaths: false,
+        strip: 0,
+      });
+    }
+    
+    // NOTE: We no longer copy main.js from platform-specific downloads
+    // Platform-specific downloads should only contain native binaries
+    // main.js and api/ should be shipped via npm in the shared dist/ folder
     
     // Clean up temp file
     unlinkSync(tempFile);
     
-    console.log('Core dependencies downloaded and cached successfully');
+    // Debug: List what was actually extracted
+    try {
+      const extractedFiles = readdirSync(platformDistPath);
+      console.log(`Extracted files to ${platformDistPath}:`, extractedFiles);
+      
+      // Check if files are in subdirectories
+      for (const file of extractedFiles) {
+        const filePath = join(platformDistPath, file);
+        const stat = require('fs').statSync(filePath);
+        if (stat.isDirectory()) {
+          const subFiles = readdirSync(filePath);
+          console.log(`  ${file}/: ${subFiles.join(', ')}`);
+        }
+      }
+    } catch (e) {
+      console.error('Could not list extracted files:', e);
+    }
+    
+    // Verify extraction completed successfully - check platform-specific binaries only
+    const requiredBinaries = [
+      platformPaths.BUN_BINARY,
+      platformPaths.LAUNCHER_RELEASE,
+      platformOS === 'macos' ? platformPaths.NATIVE_WRAPPER_MACOS :
+      platformOS === 'win' ? platformPaths.NATIVE_WRAPPER_WIN :
+      platformPaths.NATIVE_WRAPPER_LINUX
+    ];
+    
+    const missingBinaries = requiredBinaries.filter(file => !existsSync(file));
+    if (missingBinaries.length > 0) {
+      console.error(`Missing binaries after extraction: ${missingBinaries.map(f => f.replace(ELECTROBUN_DEP_PATH, '.')).join(', ')}`);
+      console.error('This suggests the tarball structure is different than expected');
+    }
+    
+    // For development: if main.js doesn't exist in shared dist/, copy from platform-specific download as fallback
+    const sharedDistPath = join(ELECTROBUN_DEP_PATH, 'dist');
+    const extractedMainJs = join(platformDistPath, 'main.js');
+    const sharedMainJs = join(sharedDistPath, 'main.js');
     
-  } catch (error) {
-    console.error('Failed to download core dependencies:', error.message);
+    if (existsSync(extractedMainJs) && !existsSync(sharedMainJs)) {
+      console.log('Development fallback: copying main.js from platform-specific download to shared dist/');
+      mkdirSync(sharedDistPath, { recursive: true });
+      cpSync(extractedMainJs, sharedMainJs);
+    }
+    
+    console.log(`Core dependencies for ${platformOS}-${platformArch} downloaded and cached successfully`);
+    
+  } catch (error: any) {
+    console.error(`Failed to download core dependencies for ${platformOS}-${platformArch}:`, error.message);
     console.error('Please ensure you have an internet connection and the release exists.');
     process.exit(1);
   }
 }
 
-async function ensureCEFDependencies() {
+async function ensureCEFDependencies(targetOS?: 'macos' | 'win' | 'linux', targetArch?: 'arm64' | 'x64') {
+  // Use provided target platform or default to host platform
+  const platformOS = targetOS || OS;
+  const platformArch = targetArch || ARCH;
+  
+  // Get platform-specific paths
+  const platformPaths = getPlatformPaths(platformOS, platformArch);
+  
   // Check if CEF dependencies already exist
-  if (existsSync(PATHS.CEF_DIR)) {
-    console.log('CEF dependencies found, using cached version');
+  if (existsSync(platformPaths.CEF_DIR)) {
+    console.log(`CEF dependencies found for ${platformOS}-${platformArch}, using cached version`);
     return;
   }
 
-  console.log('CEF dependencies not found, downloading...');
+  console.log(`CEF dependencies not found for ${platformOS}-${platformArch}, downloading...`);
   
   // Get the current Electrobun version from package.json
   const packageJsonPath = join(ELECTROBUN_DEP_PATH, 'package.json');
@@ -181,8 +292,8 @@ async function ensureCEFDependencies() {
     }
   }
 
-  const platformName = OS === 'macos' ? 'darwin' : OS === 'win' ? 'win32' : 'linux';
-  const archName = ARCH;
+  const platformName = platformOS === 'macos' ? 'darwin' : platformOS === 'win' ? 'win' : 'linux';
+  const archName = platformArch;
   const cefTarballUrl = `https://github.com/blackboardsh/electrobun/releases/download/${version}/electrobun-cef-${platformName}-${archName}.tar.gz`;
   
   console.log(`Downloading CEF from: ${cefTarballUrl}`);
@@ -195,7 +306,7 @@ async function ensureCEFDependencies() {
     }
     
     // Create temp file
-    const tempFile = join(ELECTROBUN_DEP_PATH, 'cef-temp.tar.gz');
+    const tempFile = join(ELECTROBUN_DEP_PATH, `cef-${platformOS}-${platformArch}-temp.tar.gz`);
     const fileStream = createWriteStream(tempFile);
     
     // Write response to file
@@ -209,20 +320,49 @@ async function ensureCEFDependencies() {
     }
     fileStream.end();
     
-    // Extract to dist directory
-    console.log('Extracting CEF dependencies...');
-    await tar.x({
-      file: tempFile,
-      cwd: join(ELECTROBUN_DEP_PATH, 'dist'),
-    });
+    // Extract to platform-specific dist directory
+    console.log(`Extracting CEF dependencies for ${platformOS}-${platformArch}...`);
+    const platformDistPath = join(ELECTROBUN_DEP_PATH, `dist-${platformOS}-${platformArch}`);
+    mkdirSync(platformDistPath, { recursive: true });
+    
+    // Use Windows native tar.exe on Windows due to npm tar library issues
+    if (OS === 'win') {
+      console.log('Using Windows native tar.exe for reliable extraction...');
+      execSync(`tar -xf "${tempFile}" -C "${platformDistPath}"`, { 
+        stdio: 'inherit',
+        cwd: platformDistPath 
+      });
+    } else {
+      await tar.x({
+        file: tempFile,
+        cwd: platformDistPath,
+        preservePaths: false,
+        strip: 0,
+      });
+    }
     
     // Clean up temp file
     unlinkSync(tempFile);
     
-    console.log('CEF dependencies downloaded and cached successfully');
+    // Debug: List what was actually extracted for CEF
+    try {
+      const extractedFiles = readdirSync(platformDistPath);
+      console.log(`CEF extracted files to ${platformDistPath}:`, extractedFiles);
+      
+      // Check if CEF directory was created
+      const cefDir = join(platformDistPath, 'cef');
+      if (existsSync(cefDir)) {
+        const cefFiles = readdirSync(cefDir);
+        console.log(`CEF directory contents: ${cefFiles.slice(0, 10).join(', ')}${cefFiles.length > 10 ? '...' : ''}`);
+      }
+    } catch (e) {
+      console.error('Could not list CEF extracted files:', e);
+    }
+    
+    console.log(`CEF dependencies for ${platformOS}-${platformArch} downloaded and cached successfully`);
     
-  } catch (error) {
-    console.error('Failed to download CEF dependencies:', error.message);
+  } catch (error: any) {
+    console.error(`Failed to download CEF dependencies for ${platformOS}-${platformArch}:`, error.message);
     console.error('Please ensure you have an internet connection and the release exists.');
     process.exit(1);
   }
@@ -257,6 +397,7 @@ const defaultConfig = {
   build: {
     buildFolder: "build",
     artifactFolder: "artifacts",
+    targets: undefined, // Will default to current platform if not specified
     mac: {
       codesign: false,
       notarize: false,
@@ -267,6 +408,10 @@ const defaultConfig = {
       },
       icons: "icon.iconset",
     },
+    bun: {
+      entrypoint: "src/bun/index.ts",
+      external: [],
+    },
   },
   scripts: {
     postBuild: "",
@@ -286,7 +431,10 @@ if (!command) {
 const config = getConfig();
 
 const envArg =
-  process.argv.find((arg) => arg.startsWith("env="))?.split("=")[1] || "";
+  process.argv.find((arg) => arg.startsWith("--env="))?.split("=")[1] || "";
+
+const targetsArg =
+  process.argv.find((arg) => arg.startsWith("--targets="))?.split("=")[1] || "";
 
 const validEnvironments = ["dev", "canary", "stable"];
 
@@ -294,8 +442,175 @@ const validEnvironments = ["dev", "canary", "stable"];
 const buildEnvironment: "dev" | "canary" | "stable" =
   validEnvironments.includes(envArg) ? envArg : "dev";
 
+// Determine build targets
+type BuildTarget = { os: 'macos' | 'win' | 'linux', arch: 'arm64' | 'x64' };
+
+function parseBuildTargets(): BuildTarget[] {
+  // If explicit targets provided via CLI
+  if (targetsArg) {
+    if (targetsArg === 'current') {
+      return [{ os: OS, arch: ARCH }];
+    } else if (targetsArg === 'all') {
+      return parseConfigTargets();
+    } else {
+      // Parse comma-separated targets like "macos-arm64,win-x64"
+      return targetsArg.split(',').map(target => {
+        const [os, arch] = target.trim().split('-') as [string, string];
+        if (!['macos', 'win', 'linux'].includes(os) || !['arm64', 'x64'].includes(arch)) {
+          console.error(`Invalid target: ${target}. Format should be: os-arch (e.g., macos-arm64)`);
+          process.exit(1);
+        }
+        return { os, arch } as BuildTarget;
+      });
+    }
+  }
+
+  // Default behavior: always build for current platform only
+  // This ensures predictable, fast builds unless explicitly requesting multi-platform
+  return [{ os: OS, arch: ARCH }];
+}
+
+function parseConfigTargets(): BuildTarget[] {
+  // If config has targets, use them
+  if (config.build.targets && config.build.targets.length > 0) {
+    return config.build.targets.map(target => {
+      if (target === 'current') {
+        return { os: OS, arch: ARCH };
+      }
+      const [os, arch] = target.split('-') as [string, string];
+      if (!['macos', 'win', 'linux'].includes(os) || !['arm64', 'x64'].includes(arch)) {
+        console.error(`Invalid target in config: ${target}. Format should be: os-arch (e.g., macos-arm64)`);
+        process.exit(1);
+      }
+      return { os, arch } as BuildTarget;
+    });
+  }
+  
+  // If no config targets and --targets=all, use all available platforms
+  if (targetsArg === 'all') {
+    console.log('No targets specified in config, using all available platforms');
+    return [
+      { os: 'macos', arch: 'arm64' },
+      { os: 'macos', arch: 'x64' },
+      { os: 'win', arch: 'x64' },
+      { os: 'linux', arch: 'x64' },
+      { os: 'linux', arch: 'arm64' }
+    ];
+  }
+  
+  // Default to current platform
+  return [{ os: OS, arch: ARCH }];
+}
+
+const buildTargets = parseBuildTargets();
+
+// Show build targets to user
+if (buildTargets.length === 1) {
+  console.log(`Building for ${buildTargets[0].os}-${buildTargets[0].arch} (${buildEnvironment})`);
+} else {
+  const targetList = buildTargets.map(t => `${t.os}-${t.arch}`).join(', ');
+  console.log(`Building for multiple targets: ${targetList} (${buildEnvironment})`);
+  console.log(`Running ${buildTargets.length} parallel builds...`);
+  
+  // Spawn parallel build processes
+  const buildPromises = buildTargets.map(async (target) => {
+    const targetString = `${target.os}-${target.arch}`;
+    const prefix = `[${targetString}]`;
+    
+    try {
+      // Try to find the electrobun binary in node_modules/.bin or use bunx
+      const electrobunBin = join(projectRoot, 'node_modules', '.bin', 'electrobun');
+      let command: string[];
+      
+      if (existsSync(electrobunBin)) {
+        command = [electrobunBin, 'build', `--env=${buildEnvironment}`, `--targets=${targetString}`];
+      } else {
+        // Fallback to bunx which should resolve node_modules binaries
+        command = ['bunx', 'electrobun', 'build', `--env=${buildEnvironment}`, `--targets=${targetString}`];
+      }
+      
+      console.log(`${prefix} Running:`, command.join(' '));
+      
+      const result = await Bun.spawn(command, {
+        stdio: ['inherit', 'pipe', 'pipe'],
+        env: process.env,
+        cwd: projectRoot // Ensure we're in the right directory
+      });
+
+      // Pipe output with prefix
+      if (result.stdout) {
+        const reader = result.stdout.getReader();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          const text = new TextDecoder().decode(value);
+          // Add prefix to each line
+          const prefixedText = text.split('\n').map(line => 
+            line ? `${prefix} ${line}` : line
+          ).join('\n');
+          process.stdout.write(prefixedText);
+        }
+      }
+
+      if (result.stderr) {
+        const reader = result.stderr.getReader();
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          const text = new TextDecoder().decode(value);
+          const prefixedText = text.split('\n').map(line => 
+            line ? `${prefix} ${line}` : line
+          ).join('\n');
+          process.stderr.write(prefixedText);
+        }
+      }
+
+      const exitCode = await result.exited;
+      return { target, exitCode, success: exitCode === 0 };
+      
+    } catch (error) {
+      console.error(`${prefix} Failed to start build:`, error);
+      return { target, exitCode: 1, success: false, error };
+    }
+  });
+
+  // Wait for all builds to complete
+  const results = await Promise.allSettled(buildPromises);
+  
+  // Report final results
+  console.log('\n=== Build Results ===');
+  let allSucceeded = true;
+  
+  for (const result of results) {
+    if (result.status === 'fulfilled') {
+      const { target, success, exitCode } = result.value;
+      const status = success ? '✅ SUCCESS' : '❌ FAILED';
+      console.log(`${target.os}-${target.arch}: ${status} (exit code: ${exitCode})`);
+      if (!success) allSucceeded = false;
+    } else {
+      console.log(`Build rejected: ${result.reason}`);
+      allSucceeded = false;
+    }
+  }
+  
+  if (!allSucceeded) {
+    console.log('\nSome builds failed. Check the output above for details.');
+    process.exit(1);
+  } else {
+    console.log('\nAll builds completed successfully! 🎉');
+  }
+  
+  process.exit(0);
+}
+
 // todo (yoav): dev builds should include the branch name, and/or allow configuration via external config
-const buildSubFolder = `${buildEnvironment}`;
+// For now, assume single target build (we'll refactor for multi-target later)
+const currentTarget = buildTargets[0];
+const buildSubFolder = `${buildEnvironment}-${currentTarget.os}-${currentTarget.arch}`;
+
+// Use target OS/ARCH for build logic (instead of current machine's OS/ARCH)
+const targetOS = currentTarget.os;
+const targetARCH = currentTarget.arch;
 
 const buildFolder = join(projectRoot, config.build.buildFolder, buildSubFolder);
 
@@ -370,7 +685,7 @@ const appFileName = (
 )
   .replace(/\s/g, "")
   .replace(/\./g, "-");
-const bundleFileName = OS === 'macos' ? `${appFileName}.app` : appFileName;
+const bundleFileName = targetOS === 'macos' ? `${appFileName}.app` : appFileName;
 
 // const logPath = `/Library/Logs/Electrobun/ExampleApp/dev/out.log`;
 
@@ -380,6 +695,12 @@ if (commandArg === "init") {
   // todo (yoav): init a repo folder structure
   console.log("initializing electrobun project");
 } else if (commandArg === "build") {
+  // Ensure core binaries are available for the target platform before starting build
+  await ensureCoreDependencies(currentTarget.os, currentTarget.arch);
+  
+  // Get platform-specific paths for the current target
+  const targetPaths = getPlatformPaths(currentTarget.os, currentTarget.arch);
+  
   // refresh build folder  
   if (existsSync(buildFolder)) {
     rmdirSync(buildFolder, { recursive: true });
@@ -403,7 +724,7 @@ if (commandArg === "init") {
     appBundleMacOSPath,
     appBundleFolderResourcesPath,
     appBundleFolderFrameworksPath,
-  } = createAppBundle(appFileName, buildFolder);
+  } = createAppBundle(appFileName, buildFolder, targetOS);
 
   const appBundleAppCodePath = join(appBundleFolderResourcesPath, "app");
 
@@ -473,12 +794,28 @@ if (commandArg === "init") {
   //     mkdirSync(destLauncherFolder, {recursive: true});
   // }
   // cpSync(zigLauncherBinarySource, zigLauncherDestination, {recursive: true, dereference: true});
+  // For dev builds, use the actual CLI binary that's currently running
+  // It could be in .cache (npm install) or bin (local dev)
+  let devLauncherPath = targetPaths.LAUNCHER_DEV;
+  if (buildEnvironment === "dev" && !existsSync(devLauncherPath)) {
+    // Check .cache location (npm installed)
+    const cachePath = join(ELECTROBUN_DEP_PATH, ".cache", "electrobun") + binExt;
+    if (existsSync(cachePath)) {
+      devLauncherPath = cachePath;
+    } else {
+      // Check bin location (local dev)
+      const binPath = join(ELECTROBUN_DEP_PATH, "bin", "electrobun") + binExt;
+      if (existsSync(binPath)) {
+        devLauncherPath = binPath;
+      }
+    }
+  }
+  
   const bunCliLauncherBinarySource =
     buildEnvironment === "dev"
-      ? // Note: in dev use the cli as the launcher
-        PATHS.LAUNCHER_DEV
+      ? devLauncherPath
       : // Note: for release use the zig launcher optimized for smol size
-        PATHS.LAUNCHER_RELEASE;
+        targetPaths.LAUNCHER_RELEASE;
   const bunCliLauncherDestination = join(appBundleMacOSPath, "launcher") + binExt;
   const destLauncherFolder = dirname(bunCliLauncherDestination);
   if (!existsSync(destLauncherFolder)) {
@@ -491,11 +828,11 @@ if (commandArg === "init") {
     dereference: true,
   });
 
-  cpSync(PATHS.MAIN_JS, join(appBundleMacOSPath, 'main.js'));
+  cpSync(targetPaths.MAIN_JS, join(appBundleMacOSPath, 'main.js'));
 
   // Bun runtime binary
   // todo (yoav): this only works for the current architecture
-  const bunBinarySourcePath = PATHS.BUN_BINARY;
+  const bunBinarySourcePath = targetPaths.BUN_BINARY;
   // Note: .bin/bun binary in node_modules is a symlink to the versioned one in another place
   // in node_modules, so we have to dereference here to get the actual binary in the bundle.
   const bunBinaryDestInBundlePath = join(appBundleMacOSPath, "bun") + binExt;
@@ -507,8 +844,8 @@ if (commandArg === "init") {
   cpSync(bunBinarySourcePath, bunBinaryDestInBundlePath, { dereference: true });
 
   // copy native wrapper dynamic library
-  if (OS === 'macos') {
-  const nativeWrapperMacosSource = PATHS.NATIVE_WRAPPER_MACOS;
+  if (targetOS === 'macos') {
+  const nativeWrapperMacosSource = targetPaths.NATIVE_WRAPPER_MACOS;
   const nativeWrapperMacosDestination = join(
     appBundleMacOSPath,
     "libNativeWrapper.dylib"
@@ -516,8 +853,8 @@ if (commandArg === "init") {
   cpSync(nativeWrapperMacosSource, nativeWrapperMacosDestination, {
     dereference: true,
   });
-} else if (OS === 'win') {
-  const nativeWrapperMacosSource = PATHS.NATIVE_WRAPPER_WIN;
+} else if (targetOS === 'win') {
+  const nativeWrapperMacosSource = targetPaths.NATIVE_WRAPPER_WIN;
   const nativeWrapperMacosDestination = join(
     appBundleMacOSPath,
     "libNativeWrapper.dll"
@@ -526,7 +863,7 @@ if (commandArg === "init") {
     dereference: true,
   });
 
-  const webview2LibSource = PATHS.WEBVIEW2LOADER_WIN;
+  const webview2LibSource = targetPaths.WEBVIEW2LOADER_WIN;
   const webview2LibDestination = join(
     appBundleMacOSPath,
     "WebView2Loader.dll"
@@ -534,30 +871,34 @@ if (commandArg === "init") {
   // copy webview2 system webview library
   cpSync(webview2LibSource, webview2LibDestination);
   
-} else if (OS === 'linux') {
-  const nativeWrapperLinuxSource = PATHS.NATIVE_WRAPPER_LINUX;
+} else if (targetOS === 'linux') {
+  // Choose the appropriate native wrapper based on bundleCEF setting
+  const useCEF = config.build.linux?.bundleCEF;
+  const nativeWrapperLinuxSource = useCEF ? targetPaths.NATIVE_WRAPPER_LINUX_CEF : targetPaths.NATIVE_WRAPPER_LINUX;
   const nativeWrapperLinuxDestination = join(
     appBundleMacOSPath,
     "libNativeWrapper.so"
   );
+  
   if (existsSync(nativeWrapperLinuxSource)) {
     cpSync(nativeWrapperLinuxSource, nativeWrapperLinuxDestination, {
       dereference: true,
     });
+    console.log(`Using ${useCEF ? 'CEF' : 'GTK'} native wrapper for Linux`);
+  } else {
+    throw new Error(`Native wrapper not found: ${nativeWrapperLinuxSource}`);
   }
 }
   
-  // Ensure core binaries are available
-  await ensureCoreDependencies();
 
   // Download CEF binaries if needed when bundleCEF is enabled
-  if ((OS === 'macos' && config.build.mac?.bundleCEF) || 
-      (OS === 'win' && config.build.win?.bundleCEF) || 
-      (OS === 'linux' && config.build.linux?.bundleCEF)) {
+  if ((targetOS === 'macos' && config.build.mac?.bundleCEF) || 
+      (targetOS === 'win' && config.build.win?.bundleCEF) || 
+      (targetOS === 'linux' && config.build.linux?.bundleCEF)) {
     
-    await ensureCEFDependencies();    
-    if (OS === 'macos') {
-      const cefFrameworkSource = PATHS.CEF_FRAMEWORK_MACOS;
+    await ensureCEFDependencies(currentTarget.os, currentTarget.arch);    
+    if (targetOS === 'macos') {
+      const cefFrameworkSource = targetPaths.CEF_FRAMEWORK_MACOS;
       const cefFrameworkDestination = join(
         appBundleFolderFrameworksPath,
         "Chromium Embedded Framework.framework"
@@ -578,7 +919,7 @@ if (commandArg === "init") {
         "bun Helper (Renderer)",
       ];
 
-      const helperSourcePath = PATHS.CEF_HELPER_MACOS;
+      const helperSourcePath = targetPaths.CEF_HELPER_MACOS;
       cefHelperNames.forEach((helperName) => {
         const destinationPath = join(
           appBundleFolderFrameworksPath,
@@ -598,10 +939,9 @@ if (commandArg === "init") {
           dereference: true,
         });
       });
-    } else if (OS === 'win') {
-      // Copy CEF DLLs from dist/cef/ to the main executable directory
-      const electrobunDistPath = join(ELECTROBUN_DEP_PATH, "dist");
-      const cefSourcePath = join(electrobunDistPath, "cef");
+    } else if (targetOS === 'win') {
+      // Copy CEF DLLs from platform-specific dist/cef/ to the main executable directory
+      const cefSourcePath = targetPaths.CEF_DIR;
       const cefDllFiles = [
         'libcef.dll',
         'chrome_elf.dll', 
@@ -641,7 +981,7 @@ if (commandArg === "init") {
       });
       
       // Copy CEF resources to MacOS/cef/ subdirectory for other resources like locales
-      const cefResourcesSource = join(electrobunDistPath, 'cef');
+      const cefResourcesSource = targetPaths.CEF_DIR;
       const cefResourcesDestination = join(appBundleMacOSPath, 'cef');
       
       if (existsSync(cefResourcesSource)) {
@@ -660,7 +1000,7 @@ if (commandArg === "init") {
         "bun Helper (Renderer)",
       ];
 
-      const helperSourcePath = PATHS.CEF_HELPER_WIN;
+      const helperSourcePath = targetPaths.CEF_HELPER_WIN;
       if (existsSync(helperSourcePath)) {
         cefHelperNames.forEach((helperName) => {
           const destinationPath = join(appBundleMacOSPath, `${helperName}.exe`);
@@ -670,10 +1010,9 @@ if (commandArg === "init") {
       } else {
         console.log(`WARNING: Missing CEF helper: ${helperSourcePath}`);
       }
-    } else if (OS === 'linux') {
-      // Copy CEF shared libraries from dist/cef/ to the main executable directory
-      const electrobunDistPath = join(ELECTROBUN_DEP_PATH, "dist");
-      const cefSourcePath = join(electrobunDistPath, "cef");
+    } else if (targetOS === 'linux') {
+      // Copy CEF shared libraries from platform-specific dist/cef/ to the main executable directory
+      const cefSourcePath = targetPaths.CEF_DIR;
       
       if (existsSync(cefSourcePath)) {
         const cefSoFiles = [
@@ -759,12 +1098,12 @@ if (commandArg === "init") {
           "bun Helper (Renderer)",
         ];
 
-        const helperSourcePath = PATHS.CEF_HELPER_LINUX;
+        const helperSourcePath = targetPaths.CEF_HELPER_LINUX;
         if (existsSync(helperSourcePath)) {
           cefHelperNames.forEach((helperName) => {
             const destinationPath = join(appBundleMacOSPath, helperName);
             cpSync(helperSourcePath, destinationPath);
-            console.log(`Copied CEF helper: ${helperName}`);
+            // console.log(`Copied CEF helper: ${helperName}`);
           });
         } else {
           console.log(`WARNING: Missing CEF helper: ${helperSourcePath}`);
@@ -775,7 +1114,7 @@ if (commandArg === "init") {
 
 
   // copy native bindings
-  const bsPatchSource = PATHS.BSPATCH;
+  const bsPatchSource = targetPaths.BSPATCH;
   const bsPatchDestination = join(appBundleMacOSPath, "bspatch") + binExt;
   const bsPatchDestFolder = dirname(bsPatchDestination);
   if (!existsSync(bsPatchDestFolder)) {
@@ -871,12 +1210,21 @@ if (commandArg === "init") {
   
   // Run postBuild script
   if (config.scripts.postBuild) {
-
-    Bun.spawnSync([bunBinarySourcePath, config.scripts.postBuild], {
+    // Use host platform's bun binary for running scripts, not target platform's
+    const hostPaths = getPlatformPaths(OS, ARCH);
+    
+    Bun.spawnSync([hostPaths.BUN_BINARY, config.scripts.postBuild], {
       stdio: ["ignore", "inherit", "inherit"],
       env: {
         ...process.env,
         ELECTROBUN_BUILD_ENV: buildEnvironment,
+        ELECTROBUN_OS: targetOS, // Use target OS for environment variables
+        ELECTROBUN_ARCH: targetARCH, // Use target ARCH for environment variables
+        ELECTROBUN_BUILD_DIR: buildFolder,
+        ELECTROBUN_APP_NAME: appFileName,
+        ELECTROBUN_APP_VERSION: config.app.version,
+        ELECTROBUN_APP_IDENTIFIER: config.app.identifier,
+        ELECTROBUN_ARTIFACT_DIR: artifactFolder,
       },
     });
   }
@@ -920,8 +1268,9 @@ if (commandArg === "init") {
   );
 
   // todo (yoav): add these to config
+  // Only codesign/notarize when building macOS targets on macOS host
   const shouldCodesign =
-    buildEnvironment !== "dev" && config.build.mac.codesign;
+    buildEnvironment !== "dev" && targetOS === 'macos' && OS === 'macos' && config.build.mac.codesign;
   const shouldNotarize = shouldCodesign && config.build.mac.notarize;
 
   if (shouldCodesign) {
@@ -956,6 +1305,8 @@ if (commandArg === "init") {
     // 6.5. code sign and notarize the dmg
     // 7. copy artifacts to directory [self-extractor dmg, zstd app bundle, bsdiff patch, update.json]
 
+    // Add platform suffix for all artifacts
+    const platformSuffix = `-${targetOS}-${targetARCH}`;
     const tarPath = `${appBundleFolderPath}.tar`;
 
     // tar the signed and notarized app bundle
@@ -979,7 +1330,8 @@ if (commandArg === "init") {
     // than saving 1 more MB of space/bandwidth.
 
     const compressedTarPath = `${tarPath}.zst`;
-    artifactsToUpload.push(compressedTarPath);
+    const platformCompressedTarPath = compressedTarPath.replace('.tar.zst', `${platformSuffix}.tar.zst`);
+    artifactsToUpload.push(platformCompressedTarPath);
 
     // zstd compress tarball
     // todo (yoav): consider using c bindings for zstd for speed instead of wasm
@@ -988,23 +1340,28 @@ if (commandArg === "init") {
     await ZstdInit().then(async ({ ZstdSimple, ZstdStream }) => {
       // Note: Simple is much faster than stream, but stream is better for large files
       // todo (yoav): consider a file size cutoff to switch to stream instead of simple.
+      const useStream = tarball.size > 100 * 1024 * 1024;
+      
       if (tarball.size > 0) {
-        // Uint8 array filestream of the tar file
+       // Uint8 array filestream of the tar file
 
         const data = new Uint8Array(tarBuffer);
+        
         const compressionLevel = 22;
         const compressedData = ZstdSimple.compress(data, compressionLevel);
 
         console.log(
           "compressed",
-          compressedData.length,
+          data.length,
           "bytes",
           "from",
-          data.length,
+          tarBuffer.byteLength,
           "bytes"
         );
 
         await Bun.write(compressedTarPath, compressedData);
+        // Copy to platform-specific filename for upload
+        cpSync(compressedTarPath, platformCompressedTarPath);
       }
     });
 
@@ -1012,7 +1369,7 @@ if (commandArg === "init") {
     // now and it needs the same name as the original app bundle.
     rmdirSync(appBundleFolderPath, { recursive: true });
 
-    const selfExtractingBundle = createAppBundle(appFileName, buildFolder);
+    const selfExtractingBundle = createAppBundle(appFileName, buildFolder, targetOS);
     const compressedTarballInExtractingBundlePath = join(
       selfExtractingBundle.appBundleFolderResourcesPath,
       `${hash}.tar.zst`
@@ -1021,7 +1378,7 @@ if (commandArg === "init") {
     // copy the zstd tarball to the self-extracting app bundle
     cpSync(compressedTarPath, compressedTarballInExtractingBundlePath);
 
-    const selfExtractorBinSourcePath = PATHS.EXTRACTOR;
+    const selfExtractorBinSourcePath = targetPaths.EXTRACTOR;
     const selfExtractorBinDestinationPath = join(
       selfExtractingBundle.appBundleMacOSPath,
       "launcher"
@@ -1053,28 +1410,49 @@ if (commandArg === "init") {
       console.log("skipping notarization");
     }
 
-    console.log("creating dmg...");
-    // make a dmg
-    const dmgPath = join(buildFolder, `${appFileName}.dmg`);
-    artifactsToUpload.push(dmgPath);
-    // hdiutil create -volname "YourAppName" -srcfolder /path/to/YourApp.app -ov -format UDZO YourAppName.dmg
-    // Note: use UDBZ for better compression vs. UDZO
-    execSync(
-      `hdiutil create -volname "${appFileName}" -srcfolder ${escapePathForTerminal(
-        appBundleFolderPath
-      )} -ov -format UDBZ ${escapePathForTerminal(dmgPath)}`
-    );
+    // DMG creation for macOS only
+    if (targetOS === 'macos') {
+      console.log("creating dmg...");
+      // make a dmg
+      const dmgPath = join(buildFolder, `${appFileName}.dmg`);
+      const platformDmgPath = join(buildFolder, `${appFileName}${platformSuffix}.dmg`);
+      artifactsToUpload.push(platformDmgPath);
+      // hdiutil create -volname "YourAppName" -srcfolder /path/to/YourApp.app -ov -format UDZO YourAppName.dmg
+      // Note: use UDBZ for better compression vs. UDZO
+      execSync(
+        `hdiutil create -volname "${appFileName}" -srcfolder ${escapePathForTerminal(
+          appBundleFolderPath
+        )} -ov -format UDBZ ${escapePathForTerminal(dmgPath)}`
+      );
 
-    if (shouldCodesign) {
-      codesignAppBundle(dmgPath);
-    } else {
-      console.log("skipping codesign");
-    }
+      if (shouldCodesign) {
+        codesignAppBundle(dmgPath);
+      } else {
+        console.log("skipping codesign");
+      }
 
-    if (shouldNotarize) {
-      notarizeAndStaple(dmgPath);
+      if (shouldNotarize) {
+        notarizeAndStaple(dmgPath);
+      } else {
+        console.log("skipping notarization");
+      }
+      
+      // Copy to platform-specific filename
+      cpSync(dmgPath, platformDmgPath);
     } else {
-      console.log("skipping notarization");
+      // For Windows and Linux, add the self-extracting bundle directly
+      const platformBundlePath = join(buildFolder, `${appFileName}${platformSuffix}${targetOS === 'win' ? '.exe' : ''}`);
+      // Copy the self-extracting bundle to platform-specific filename
+      if (targetOS === 'win') {
+        // On Windows, create a self-extracting exe
+        // For now, just copy the bundle folder
+        artifactsToUpload.push(compressedTarPath.replace('.tar.zst', `${platformSuffix}.tar.zst`));
+      } else if (targetOS === 'linux') {
+        // On Linux, create a tar.gz of the bundle
+        const linuxTarPath = join(buildFolder, `${appFileName}${platformSuffix}.tar.gz`);
+        execSync(`tar -czf ${escapePathForTerminal(linuxTarPath)} -C ${escapePathForTerminal(buildFolder)} ${escapePathForTerminal(basename(appBundleFolderPath))}`);
+        artifactsToUpload.push(linuxTarPath);
+      }
     }
 
     // refresh artifacts folder
@@ -1093,11 +1471,15 @@ if (commandArg === "init") {
       // the download button or display on your marketing site or in the app.
       version: config.app.version,
       hash: hash.toString(),
+      platform: OS,
+      arch: ARCH,
       // channel: buildEnvironment,
       // bucketUrl: config.release.bucketUrl
     });
 
-    await Bun.write(join(artifactFolder, "update.json"), updateJsonContent);
+    // Platform-specific update.json
+    const platformUpdateJsonName = `update${platformSuffix}.json`;
+    await Bun.write(join(artifactFolder, platformUpdateJsonName), updateJsonContent);
 
     // generate bsdiff
     // https://storage.googleapis.com/eggbun-static/electrobun-playground/canary/ElectrobunPlayground-canary.app.tar.zst
@@ -1107,7 +1489,7 @@ if (commandArg === "init") {
     const urlToPrevUpdateJson = join(
       config.release.bucketUrl,
       buildEnvironment,
-      `update.json`
+      `update${platformSuffix}.json`
     );
     const cacheBuster = Math.random().toString(36).substring(7);
     const updateJsonResponse = await fetch(
@@ -1119,13 +1501,13 @@ if (commandArg === "init") {
     const urlToLatestTarball = join(
       config.release.bucketUrl,
       buildEnvironment,
-      `${appFileName}.app.tar.zst`
+      `${appFileName}.app${platformSuffix}.tar.zst`
     );
 
 
     // attempt to get the previous version to create a patch file
-    if (updateJsonResponse.ok) {
-      const prevUpdateJson = await updateJsonResponse.json();
+    if (updateJsonResponse && updateJsonResponse.ok) {
+      const prevUpdateJson = await updateJsonResponse!.json();
 
       const prevHash = prevUpdateJson.hash;
       console.log("PREVIOUS HASH", prevHash);
@@ -1164,9 +1546,10 @@ if (commandArg === "init") {
         console.log("diff previous and new tarballs...");
         // Run it as a separate process to leverage multi-threadedness
         // especially for creating multiple diffs in parallel
-        const bsdiffpath = PATHS.BSDIFF;
+        const bsdiffpath = targetPaths.BSDIFF;
         const patchFilePath = join(buildFolder, `${prevHash}.patch`);
-        artifactsToUpload.push(patchFilePath);
+        const platformPatchFilePath = join(buildFolder, `${prevHash}${platformSuffix}.patch`);
+        artifactsToUpload.push(platformPatchFilePath);
         const result = Bun.spawnSync(
           [bsdiffpath, prevTarballPath, tarPath, patchFilePath, "--use-zstd"],
           { cwd: buildFolder }
@@ -1176,6 +1559,8 @@ if (commandArg === "init") {
           result.stdout.toString(),
           result.stderr.toString()
         );
+        // Copy to platform-specific filename
+        cpSync(patchFilePath, platformPatchFilePath);
       }
     } else {
       console.log("prevoius version not found at: ", urlToLatestTarball);
@@ -1290,7 +1675,12 @@ function getConfig() {
   if (existsSync(configPath)) {
     const configFileContents = readFileSync(configPath, "utf8");
     // Note: we want this to hard fail if there's a syntax error
-    loadedConfig = JSON.parse(configFileContents);
+    try {
+      loadedConfig = JSON.parse(configFileContents);
+    } catch (error) {
+      console.error("Failed to parse config file:", error);
+      console.error("using default config instead");
+    }
   }
 
   // todo (yoav): write a deep clone fn
@@ -1312,6 +1702,18 @@ function getConfig() {
           ...(loadedConfig?.build?.mac?.entitlements || {}),
         },
       },
+      win: {
+        ...defaultConfig.build.win,
+        ...(loadedConfig?.build?.win || {}),
+      },
+      linux: {
+        ...defaultConfig.build.linux,
+        ...(loadedConfig?.build?.linux || {}),
+      },
+      bun: {
+        ...defaultConfig.build.bun,
+        ...(loadedConfig?.build?.bun || {}),
+      }
     },
     scripts: {
       ...defaultConfig.scripts,
@@ -1473,8 +1875,8 @@ function notarizeAndStaple(appOrDmgPath: string) {
 // have the same name but different subfolders in our build directory. or I guess delete the first one after tar/compression and then create the other one.
 // either way you can pass in the parent folder here for that flexibility.
 // for intel/arm builds on mac we'll probably have separate subfolders as well and build them in parallel.
-function createAppBundle(bundleName: string, parentFolder: string) {
-  if (OS === 'macos') {
+function createAppBundle(bundleName: string, parentFolder: string, targetOS: 'macos' | 'win' | 'linux') {
+  if (targetOS === 'macos') {
     // macOS bundle structure
     const bundleFileName = `${bundleName}.app`;
     const appBundleFolderPath = join(parentFolder, bundleFileName);
@@ -1501,7 +1903,7 @@ function createAppBundle(bundleName: string, parentFolder: string) {
       appBundleFolderResourcesPath,
       appBundleFolderFrameworksPath,
     };
-  } else if (OS === 'linux' || OS === 'win') {
+  } else if (targetOS === 'linux' || targetOS === 'win') {
     // Linux/Windows simpler structure
     const appBundleFolderPath = join(parentFolder, bundleName);
     const appBundleFolderContentsPath = appBundleFolderPath; // No Contents folder needed
@@ -1522,6 +1924,6 @@ function createAppBundle(bundleName: string, parentFolder: string) {
       appBundleFolderFrameworksPath,
     };
   } else {
-    throw new Error(`Unsupported OS: ${OS}`);
+    throw new Error(`Unsupported OS: ${targetOS}`);
   }
 }