chore: wip

Author: chrisbbreuer

packages/launchpad/src/commands/dev.ts

@@ -28,6 +28,11 @@ const cmd: Command = {
       skipGlobal: env.NODE_ENV === 'test' || env.LAUNCHPAD_SKIP_GLOBAL_AUTO_SCAN === 'true',
     })
 
+    // In shell mode, force exit to prevent hanging on async operations
+    if (isShellIntegration) {
+      process.exit(0)
+    }
+
     return 0
   },
 }

packages/launchpad/src/dev/dump.ts

@@ -1769,6 +1769,13 @@ function outputShellCode(dir: string, envBinPath: string, envSbinPath: string, p
     pathComponents.push(envSbinPath)
   }
 
+  // Add bun global bin directory for this environment (high priority for global installs)
+  const envRoot = fs.existsSync(envBinPath) ? path.dirname(envBinPath) : ''
+  const bunGlobalBinPath = path.join(envRoot, '.bun', 'bin')
+  if (envRoot && fs.existsSync(bunGlobalBinPath)) {
+    pathComponents.push(bunGlobalBinPath)
+  }
+
   // Add global paths second (fallback for tools not in project environment)
   if (globalBinPath && fs.existsSync(globalBinPath)) {
     pathComponents.push(globalBinPath)

packages/launchpad/src/dev/shellcode.ts

@@ -254,6 +254,12 @@ __launchpad_switch_environment() {
             # Remove project-specific paths from PATH if they exist
             if [[ -n "$LAUNCHPAD_ENV_BIN_PATH" ]]; then
                 export PATH=$(echo "$PATH" | sed "s|$LAUNCHPAD_ENV_BIN_PATH:||g" | sed "s|:$LAUNCHPAD_ENV_BIN_PATH||g" | sed "s|^$LAUNCHPAD_ENV_BIN_PATH$||g")
+                
+                # Also remove bun global bin directory (derive from env path)
+                local old_env_dir=$(dirname "$LAUNCHPAD_ENV_BIN_PATH")
+                if [[ -n "$old_env_dir" ]]; then
+                    export PATH=$(echo "$PATH" | sed "s|$old_env_dir/.bun/bin:||g" | sed "s|:$old_env_dir/.bun/bin||g" | sed "s|^$old_env_dir/.bun/bin$||g")
+                fi
             fi
 
             # Show deactivation message if enabled
@@ -313,6 +319,12 @@ __launchpad_switch_environment() {
             # Remove old project paths from PATH
             if [[ -n "$LAUNCHPAD_ENV_BIN_PATH" ]]; then
                 export PATH=$(echo "$PATH" | sed "s|$LAUNCHPAD_ENV_BIN_PATH:||g" | sed "s|:$LAUNCHPAD_ENV_BIN_PATH||g" | sed "s|^$LAUNCHPAD_ENV_BIN_PATH$||g")
+                
+                # Also remove old bun global bin directory (derive from old env path)
+                local old_env_dir=$(dirname "$LAUNCHPAD_ENV_BIN_PATH")
+                if [[ -n "$old_env_dir" ]]; then
+                    export PATH=$(echo "$PATH" | sed "s|$old_env_dir/.bun/bin:||g" | sed "s|:$old_env_dir/.bun/bin||g" | sed "s|^$old_env_dir/.bun/bin$||g")
+                fi
 
                 # Show deactivation message for old project if enabled
                 if [[ "${showMessages}" == "true" ]]; then
@@ -340,6 +352,14 @@ __launchpad_switch_environment() {
             # Add project-specific path first (highest priority)
             export PATH="$env_dir/bin:$PATH"
             
+            # Add bun global bin directory for this environment (high priority for global installs)
+            if [[ -d "$env_dir/.bun/bin" ]]; then
+                # Remove bun global bin path if it was already in PATH
+                export PATH=$(echo "$PATH" | sed "s|$env_dir/.bun/bin:||g" | sed "s|:$env_dir/.bun/bin||g" | sed "s|^$env_dir/.bun/bin$||g")
+                # Add it with high priority (after project bin but before system paths)
+                export PATH="$PATH:$env_dir/.bun/bin"
+            fi
+            
             # Now ensure global paths are available but with lower priority
             # Add ~/.local/bin to PATH if not already there (after project paths)
             if [[ -d "$local_bin" && ":$PATH:" != *":$local_bin:"* ]]; then

packages/launchpad/src/php/precompiler.ts

@@ -478,7 +478,10 @@ export class PhpPrecompiler {
     // Platform-specific library paths
     if (this.config.platform === 'darwin') {
       // macOS: Set up proper environment for Launchpad dependencies
-      const homeDir = process.env.HOME || '/Users/runner'
+      const homeDir = process.env.HOME
+      if (!homeDir) {
+        throw new Error('HOME environment variable must be set for macOS builds')
+      }
       const launchpadLibs = `${homeDir}/.local`
 
       // Use existing environment variables from Launchpad

packages/launchpad/test-envs/test-shell-integration.sh

@@ -11,8 +11,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 LAUNCHPAD_BIN=""
 if command -v launchpad >/dev/null 2>&1; then
     LAUNCHPAD_BIN="launchpad"
-elif [[ -f "/Users/chrisbreuer/.bun/bin/launchpad" ]]; then
-    LAUNCHPAD_BIN="/Users/chrisbreuer/.bun/bin/launchpad"
+elif [[ -f "$HOME/.bun/bin/launchpad" ]]; then
+    LAUNCHPAD_BIN="$HOME/.bun/bin/launchpad"
 elif [[ -f "/usr/local/bin/launchpad" ]]; then
     LAUNCHPAD_BIN="/usr/local/bin/launchpad"
 elif [[ -f "$SCRIPT_DIR/../bin/launchpad" ]]; then

scripts/build-php.ts

@@ -234,9 +234,6 @@ echo This is not a real PHP binary. The download of the Windows PHP binary faile
 }
 
 function generateConfigureArgs(config: BuildConfig, installPrefix: string): string[] {
-  const homeDir = process.env.HOME || process.env.USERPROFILE
-  const launchpadPath = `${homeDir}/.local`
-
   // Base configure arguments for all platforms
   const baseArgs = [
     `--prefix=${installPrefix}`,
@@ -271,23 +268,23 @@ function generateConfigureArgs(config: BuildConfig, installPrefix: string): stri
     '--without-gdbm'
   ]
 
-  // Add Launchpad dependency paths
+  // Use Launchpad libraries without hardcoded paths - rely on PKG_CONFIG_PATH and environment
   const dependencyArgs = [
-    `--with-curl=${launchpadPath}/curl.se/v8.15.0`,
-    `--with-ffi=${launchpadPath}/sourceware.org/libffi/v3.5.2`,
-    `--with-gettext=${launchpadPath}/gnu.org/gettext/v0.22.5`,
-    `--with-gmp=${launchpadPath}/gnu.org/gmp/v6.3.0`,
-    `--with-openssl=${launchpadPath}/openssl.org/v1.1.1w`,
-    `--with-sodium=${launchpadPath}/libsodium.org/v1.0.18`,
-    `--with-xsl=${launchpadPath}/gnome.org/libxslt/v1.1.43`,
-    `--with-zlib=${launchpadPath}/zlib.net/v1.3.1`,
-    `--with-bz2=${launchpadPath}/sourceware.org/bzip2/v1.0.8`
+    '--with-curl',      // Will use PKG_CONFIG_PATH to find curl
+    '--with-ffi',       // Will use PKG_CONFIG_PATH to find libffi
+    '--with-gettext',   // Will use PKG_CONFIG_PATH to find gettext
+    '--with-gmp',       // Will use PKG_CONFIG_PATH to find gmp
+    '--with-openssl',   // Will use PKG_CONFIG_PATH to find openssl
+    '--with-sodium',    // Will use PKG_CONFIG_PATH to find sodium
+    '--with-xsl',       // Will use PKG_CONFIG_PATH to find xsl
+    '--with-zlib',      // Will use PKG_CONFIG_PATH to find zlib
+    '--with-bz2'        // Will use PKG_CONFIG_PATH to find bz2
   ]
 
   // Platform-specific dependency paths
   const platformDependencyArgs = []
   if (config.platform === 'darwin') {
-    platformDependencyArgs.push(`--with-iconv=${launchpadPath}/gnu.org/libiconv/v1.18.0`)
+    platformDependencyArgs.push('--with-iconv')  // Will use PKG_CONFIG_PATH to find iconv
   }
 
   // Platform-specific arguments
@@ -796,7 +793,10 @@ async function buildPhp(config: BuildConfig): Promise<string> {
 
   // Set up build environment with selective Launchpad dependencies
   let buildEnv = { ...process.env }
-  const homeDir = process.env.HOME || process.env.USERPROFILE || '/Users/chrisbreuer'
+  const homeDir = process.env.HOME || process.env.USERPROFILE
+  if (!homeDir) {
+    throw new Error('HOME or USERPROFILE environment variable must be set')
+  }
   const launchpadRoot = `${homeDir}/.local`
 
   // Add essential Launchpad paths to PATH
@@ -825,7 +825,8 @@ async function buildPhp(config: BuildConfig): Promise<string> {
     `${launchpadRoot}/sourceware.org/libffi/v3.5.2/lib/pkgconfig`,
     `${launchpadRoot}/gnome.org/libxslt/v1.1.43/lib/pkgconfig`,
     `${launchpadRoot}/sqlite.org/v3.47.2/lib/pkgconfig`,
-    `${launchpadRoot}/libzip.org/v1.11.4/lib/pkgconfig`
+    `${launchpadRoot}/libzip.org/v1.11.4/lib/pkgconfig`,
+    `${launchpadRoot}/invisible-island.net/ncurses/v6.5.0/lib/pkgconfig`
   ]
 
   // Completely exclude libstdcxx and gcc paths on Linux
@@ -854,7 +855,8 @@ async function buildPhp(config: BuildConfig): Promise<string> {
     `${launchpadRoot}/sourceware.org/libffi/v3.5.2/lib`,
     `${launchpadRoot}/gnome.org/libxslt/v1.1.43/lib`,
     `${launchpadRoot}/sqlite.org/v3.47.2/lib`,
-    `${launchpadRoot}/libzip.org/v1.11.4/lib`
+    `${launchpadRoot}/libzip.org/v1.11.4/lib`,
+    `${launchpadRoot}/invisible-island.net/ncurses/v6.5.0/lib`
   ]
 
   // Completely exclude libstdcxx and gcc paths on Linux
@@ -880,7 +882,8 @@ async function buildPhp(config: BuildConfig): Promise<string> {
     `${launchpadRoot}/sourceware.org/libffi/v3.5.2/include`,
     `${launchpadRoot}/gnome.org/libxslt/v1.1.43/include`,
     `${launchpadRoot}/sqlite.org/v3.47.2/include`,
-    `${launchpadRoot}/libzip.org/v1.11.4/include`
+    `${launchpadRoot}/libzip.org/v1.11.4/include`,
+    `${launchpadRoot}/invisible-island.net/ncurses/v6.5.0/include`
   ]
 
   // Add iconv paths for macOS only (Linux uses system iconv)
@@ -895,14 +898,16 @@ async function buildPhp(config: BuildConfig): Promise<string> {
   buildEnv.LDFLAGS = libPaths.map(path => `-L${path}`).join(' ')
   buildEnv.CPPFLAGS = includePaths.map(path => `-I${path}`).join(' ')
 
-  // Add macOS-specific linker flags for DNS resolver functions
+  // Add platform-specific linker flags without hardcoded rpaths
   if (config.platform === 'darwin') {
-    buildEnv.LDFLAGS += ` -lresolv -Wl,-rpath,${launchpadRoot},-headerpad_max_install_names`
-    // Set up runtime library path for macOS
+    // macOS: Use standard system paths only, rely on shim scripts for dynamic library loading
+    buildEnv.LDFLAGS += ` -lresolv -Wl,-rpath,/usr/local/lib,-rpath,/opt/homebrew/lib,-headerpad_max_install_names`
+    // Set up runtime library path for macOS (build-time only)
     buildEnv.DYLD_LIBRARY_PATH = libPaths.join(':')
     buildEnv.LD = '/usr/bin/ld'
   } else {
-    buildEnv.LDFLAGS += ` -Wl,-rpath,${launchpadRoot}`
+    // Linux: Use standard system paths only, rely on shim scripts for dynamic library loading
+    buildEnv.LDFLAGS += ` -Wl,-rpath,/usr/local/lib,-rpath,/usr/lib`
   }
 
   log('✅ Configured targeted Launchpad dependencies')

test.sh

@@ -2,7 +2,7 @@
 
 echo "🧪 Testing PHP Build - Simplified Approach..."
 
-cd /Users/chrisbreuer/Code/launchpad
+cd "$(dirname "$0")"
 
 echo "1. Testing basic compilation with libintl..."
 mkdir -p /tmp/simple-test
@@ -12,10 +12,17 @@ echo '#include <libintl.h>' > test.c
 echo 'int main() { bindtextdomain("test", "."); return 0; }' >> test.c
 
 echo "2. Testing libintl compilation..."
-clang -I/Users/chrisbreuer/.local/gnu.org/gettext/v0.22.5/include \
-      -L/Users/chrisbreuer/.local/gnu.org/gettext/v0.22.5/lib \
-      -Wl,-rpath,/Users/chrisbreuer/.local/gnu.org/gettext/v0.22.5/lib \
-      -lintl test.c -o test
+# Use dynamic paths instead of hardcoded ones
+GETTEXT_DIR="$HOME/.local/gnu.org/gettext/v0.22.5"
+if [ ! -d "$GETTEXT_DIR" ]; then
+  echo "⚠️ Gettext not found at $GETTEXT_DIR, using system libraries"
+  clang -lintl test.c -o test
+else
+  clang -I"$GETTEXT_DIR/include" \
+        -L"$GETTEXT_DIR/lib" \
+        -Wl,-rpath,"$GETTEXT_DIR/lib" \
+        -lintl test.c -o test
+fi
 
 if [ $? -eq 0 ]; then
   echo "✅ libintl compilation successful"
@@ -29,7 +36,8 @@ mkdir -p /tmp/minimal-php
 cd /tmp/minimal-php
 
 echo "4. Downloading PHP source..."
-/Users/chrisbreuer/.local/gnu.org/wget/v1.25.0/bin/wget --no-check-certificate -O php-8.3.13.tar.gz https://www.php.net/distributions/php-8.3.13.tar.gz
+# Use curl instead of hardcoded wget path
+curl -L -k -o php-8.3.13.tar.gz https://www.php.net/distributions/php-8.3.13.tar.gz
 
 echo "5. Extracting and configuring..."
 tar -xzf php-8.3.13.tar.gz