chore: wip

Author: chrisbbreuer

packages/launchpad/bin/cli.ts

@@ -519,44 +519,48 @@ async function setupDevelopmentEnvironment(
 }
 
 /**
- * Create symlinks for global binaries to ~/.local/bin
+ * Install specific packages globally
  */
-async function createGlobalBinarySymlinks(globalEnvDir: string): Promise<void> {
+async function installPackagesGlobally(packages: string[], options: { verbose?: boolean, quiet?: boolean }): Promise<void> {
   try {
-    const globalBinDir = path.join(globalEnvDir, 'bin')
-    const localBinDir = path.join(homedir(), '.local', 'bin')
+    const { install } = await import('../src/install-main')
 
-    // Ensure ~/.local/bin exists
-    await fs.promises.mkdir(localBinDir, { recursive: true })
+    // Install to global directory
+    const globalEnvDir = path.join(homedir(), '.local', 'share', 'launchpad', 'global')
 
-    if (!fs.existsSync(globalBinDir)) {
-      return // No global binaries to link
+    if (!options.quiet) {
+      console.log(`Installing ${packages.length} package${packages.length === 1 ? '' : 's'} globally...`)
     }
 
-    const binaries = await fs.promises.readdir(globalBinDir)
+    const results = await install(packages, globalEnvDir)
 
-    for (const binary of binaries) {
-      const sourcePath = path.join(globalBinDir, binary)
-      const targetPath = path.join(localBinDir, binary)
+    // Create global binary symlinks
+    const { createGlobalBinarySymlinks } = await import('../src/install-helpers')
+    await createGlobalBinarySymlinks(globalEnvDir)
 
-      // Skip if source is not a file or symlink
-      const stats = await fs.promises.lstat(sourcePath)
-      if (!stats.isFile() && !stats.isSymbolicLink()) {
-        continue
-      }
+    // Ensure shell integration is installed for current user
+    await ensureShellIntegrationInstalled()
+    // Ensure post-install hooks are present and signal shell to refresh
+    ensurePostInstallHooks()
+    triggerShellGlobalRefresh()
 
-      // Remove existing symlink if it exists
-      if (fs.existsSync(targetPath)) {
-        await fs.promises.unlink(targetPath)
+    if (!options.quiet) {
+      if (results.length > 0) {
+        console.log(`🎉 Successfully installed ${packages.join(', ')} globally (${results.length} ${results.length === 1 ? 'binary' : 'binaries'})`)
+        results.forEach((file) => {
+          console.log(`  ${file}`)
+        })
+      }
+      else {
+        console.log('✅ All specified packages were already installed globally')
       }
-
-      // Create new symlink
-      await fs.promises.symlink(sourcePath, targetPath)
     }
   }
   catch (error) {
-    // Don't fail the whole installation if symlink creation fails
-    console.warn('⚠️  Warning: Failed to create global binary symlinks:', error)
+    if (!options.quiet) {
+      console.error('❌ Failed to install packages globally:', error instanceof Error ? error.message : String(error))
+    }
+    process.exit(1)
   }
 }
 
@@ -905,7 +909,7 @@ cli
   .alias('add')
   .option('--verbose', 'Enable verbose output')
   .option('--path <path>', 'Custom installation path')
-  .option('-g, --global-deps', 'Install all global dependencies found across the machine')
+  .option('-g, --global', 'Install packages globally (or scan for all global dependencies if no packages specified)')
   .option('--deps-only', 'Install only the dependencies of packages, not the packages themselves')
   .option('--dry-run', 'Show packages that would be installed without installing them')
   .option('--quiet', 'Suppress non-error output')
@@ -915,12 +919,13 @@ cli
   .example('launchpad install php --deps-only')
   .example('launchpad install')
   .example('launchpad install ./my-project')
-  .example('launchpad install --global-deps')
+  .example('launchpad install -g')
+  .example('launchpad install starship -g')
   .example('launchpad add node python')
   .action(async (packages: string[], options: {
     verbose?: boolean
     path?: string
-    globalDeps?: boolean
+    global?: boolean
     depsOnly?: boolean
     dryRun?: boolean
     quiet?: boolean
@@ -934,10 +939,18 @@ cli
     const packageList = Array.isArray(packages) ? packages : [packages].filter(Boolean)
 
     try {
-      // Handle global dependencies installation
-      if (options.globalDeps) {
-        await installGlobalDependencies(options)
-        return
+      // Handle global installation
+      if (options.global) {
+        if (packageList.length === 0) {
+          // No packages specified - scan for all global dependencies (old behavior)
+          await installGlobalDependencies(options)
+          return
+        }
+        else {
+          // Packages specified - install them globally
+          await installPackagesGlobally(packageList, options)
+          return
+        }
       }
 
       // Handle dependencies-only installation

packages/launchpad/src/dev/shellcode.ts

@@ -30,6 +30,12 @@ if [[ "$LAUNCHPAD_DISABLE_SHELL_INTEGRATION" == "1"${testModeCheck} ]]; then
     return 0 2>/dev/null || exit 0
 fi
 
+# Skip shell integration during initial shell startup to avoid interfering with prompt initialization
+# This prevents conflicts with starship and other prompt systems during .zshrc loading
+if [[ "$LAUNCHPAD_SKIP_INITIAL_INTEGRATION" == "1" ]]; then
+    return 0 2>/dev/null || exit 0
+fi
+
 # Set up directory change hooks for zsh and bash (do this first, before any processing guards)
     if [[ -n "$ZSH_VERSION" ]]; then
     # zsh hook
@@ -79,9 +85,22 @@ fi
 
 # Environment switching function (called by hooks)
 __launchpad_switch_environment() {
+    # Start timer for performance tracking
+    local start_time=$(date +%s%3N 2>/dev/null || echo "0")
+
+    # Check if verbose mode is enabled
+    local verbose_mode="${verboseDefault}"
+    if [[ -n "$LAUNCHPAD_VERBOSE" ]]; then
+        verbose_mode="$LAUNCHPAD_VERBOSE"
+    fi
+
+    if [[ "$verbose_mode" == "true" ]]; then
+        printf "⏱️  [0ms] Shell integration started for PWD=%s\\n" "$PWD" >&2
+    fi
+
     # Step 1: Find project directory using our fast binary (with timeout)
     local project_dir=""
-    if timeout 0.5s ${launchpadBinary} dev:find-project-root "$PWD" 2>/dev/null; then
+    if timeout 0.5s ${launchpadBinary} dev:find-project-root "$PWD" >/dev/null 2>&1; then
         project_dir=$(LAUNCHPAD_DISABLE_SHELL_INTEGRATION=1 timeout 0.5s ${launchpadBinary} dev:find-project-root "$PWD" 2>/dev/null || echo "")
     fi
 
@@ -91,6 +110,39 @@ __launchpad_switch_environment() {
         export PATH="$global_bin:$PATH"
     fi
 
+    # Step 2.1: Check for global refresh marker and initialize newly available tools
+    local refresh_marker="$HOME/.cache/launchpad/shell_cache/global_refresh_needed"
+    if [[ -f "$refresh_marker" ]]; then
+        # Remove the marker file
+        rm -f "$refresh_marker" 2>/dev/null || true
+
+        # Re-initialize tools that may have just become available
+        # This mirrors the conditional checks typically found in shell configs
+
+        # Skip starship initialization - let user's shell config handle it
+        # This prevents conflicts with user's own starship configuration
+        # if command -v starship >/dev/null 2>&1 && [[ -z "$STARSHIP_SHELL" ]]; then
+        #     if [[ -n "$ZSH_VERSION" ]]; then
+        #         eval "$(starship init zsh 2>/dev/null || true)"
+        #     elif [[ -n "$BASH_VERSION" ]]; then
+        #         eval "$(starship init bash 2>/dev/null || true)"
+        #     fi
+        # fi
+
+        # Refresh command hash table to pick up new binaries
+        hash -r 2>/dev/null || true
+
+        # Rehash for zsh to pick up new commands
+        if [[ -n "$ZSH_VERSION" ]]; then
+            rehash 2>/dev/null || true
+        fi
+
+        # Show refresh message if verbose
+        if [[ "$verbose_mode" == "true" ]]; then
+            printf "🔄 Shell environment refreshed for newly installed tools\\n" >&2
+        fi
+    fi
+
     # If no project found, check if we need to deactivate current project
     if [[ -z "$project_dir" ]]; then
         # If we were in a project but now we're not, deactivate it
@@ -149,7 +201,7 @@ __launchpad_switch_environment() {
         # If environment exists, activate it
         if [[ -d "$env_dir/bin" ]]; then
             export LAUNCHPAD_CURRENT_PROJECT="$project_dir"
-            export LAUNCHPAD_ENV_BIN_PATH="$env_dir/bin"
+                    export LAUNCHPAD_ENV_BIN_PATH="$env_dir/bin"
             export PATH="$env_dir/bin:$PATH"
 
             # Show activation message if enabled
@@ -161,7 +213,7 @@ __launchpad_switch_environment() {
             # Use LAUNCHPAD_SHELL_INTEGRATION=1 to enable proper progress display
             if LAUNCHPAD_DISABLE_SHELL_INTEGRATION=1 LAUNCHPAD_SHELL_INTEGRATION=1 timeout 30s ${launchpadBinary} install "$project_dir"; then
                 # If install succeeded, try to activate the environment
-                if [[ -d "$env_dir/bin" ]]; then
+            if [[ -d "$env_dir/bin" ]]; then
                     export LAUNCHPAD_CURRENT_PROJECT="$project_dir"
                     export LAUNCHPAD_ENV_BIN_PATH="$env_dir/bin"
                     export PATH="$env_dir/bin:$PATH"
@@ -174,6 +226,15 @@ __launchpad_switch_environment() {
             fi
         fi
     fi
+
+    # Show completion time if verbose
+    if [[ "$verbose_mode" == "true" ]]; then
+        local end_time=$(date +%s%3N 2>/dev/null || echo "0")
+        local elapsed=$((end_time - start_time))
+        if [[ "$elapsed" -gt 0 ]]; then
+            printf "⏱️  [%sms] Shell integration completed\\n" "$elapsed" >&2
+        fi
+    fi
 }
 
 # CRITICAL: Prevent infinite loops - if we're already processing, exit immediately
@@ -186,17 +247,7 @@ export __LAUNCHPAD_PROCESSING=1
 trap 'unset __LAUNCHPAD_PROCESSING 2>/dev/null || true' EXIT
 
 # Basic shell integration with aggressive safeguards
-# Use verbose default if LAUNCHPAD_VERBOSE is not explicitly set
-local verbose_mode="${verboseDefault}"
-if [[ -n "$LAUNCHPAD_VERBOSE" ]]; then
-    verbose_mode="$LAUNCHPAD_VERBOSE"
-fi
-
-if [[ "$verbose_mode" == "true" ]]; then
-    printf "⏱️  [0s] Shell integration started for PWD=%s\\n" "$PWD" >&2
-fi
-
-# Run the environment switching logic
+# Run the environment switching logic (which handles its own timing)
 __launchpad_switch_environment
 
 # Clean up processing flag before exit