Add curl installer scripts for standalone CLI distribution

.buildkite/commands/run-e2e-tests.sh

@@ -83,7 +83,7 @@ if [ "$PLATFORM" = "linux" ]; then
   # and Chromium aborts on the misconfigured helper. Removing the helper
   # makes Chromium skip the SUID path and fall through to the user-
   # namespace sandbox, which doesn't need setuid.
-  rm -f apps/studio/out/Studio-linux-x64/chrome-sandbox
+  rm -f "apps/studio/out/Studio-linux-${ARCH}/chrome-sandbox"
 
   # Grant cap_net_bind_service to the bundled node so the proxy daemon can
   # listen on privileged ports 80/443 without running as root — mirrors the

.gitignore

@@ -1,3 +1,6 @@
+# Standalone CLI bundles
+standalone-bundles/
+
 # Logs
 logs
 *.log

apps/studio/src/modules/cli/lib/linux-installation-manager.ts

@@ -44,6 +44,13 @@ export class LinuxCliInstallationManager implements StudioCliInstallationManager
 			return false;
 		}
 
+		// A standalone (curl) install is managed outside the app: report it as
+		// installed — matching the Windows manager — so the UI doesn't offer an
+		// install that would silently no-op. We never install over or uninstall it.
+		if ( await this.isExternallyManagedCli( cliSymlinkPath ) ) {
+			return true;
+		}
+
 		return await this.doesSymlinkLeadToPackagedCli( cliSymlinkPath );
 	}
 
@@ -155,6 +162,12 @@ export class LinuxCliInstallationManager implements StudioCliInstallationManager
 			}
 		}
 
+		// Never overwrite a CLI the app didn't install — e.g. a standalone curl
+		// install symlinking studio at <STUDIO_CLI_HOME>/bin/studio (any location).
+		if ( await this.isExternallyManagedCli( cliSymlinkPath ) ) {
+			return;
+		}
+
 		if ( await this.isCliInstalled() ) {
 			return;
 		}
@@ -188,6 +201,11 @@ export class LinuxCliInstallationManager implements StudioCliInstallationManager
 			throw error;
 		}
 
+		// Don't remove a CLI the app didn't install (e.g. a standalone curl install).
+		if ( await this.isExternallyManagedCli( cliSymlinkPath ) ) {
+			return;
+		}
+
 		await fs.promises.unlink( cliSymlinkPath );
 	}
 
@@ -226,6 +244,30 @@ export class LinuxCliInstallationManager implements StudioCliInstallationManager
 		}
 	}
 
+	private async isExternallyManagedCli( symlinkPath: string ): Promise< boolean > {
+		let isSymlink = false;
+		try {
+			isSymlink = ( await fs.promises.lstat( symlinkPath ) ).isSymbolicLink();
+		} catch {
+			return false;
+		}
+		if ( ! isSymlink ) {
+			return false;
+		}
+		// A dangling symlink (e.g. a standalone install that was deleted without
+		// removing the link) is broken, not externally managed — reclaim it so a
+		// reinstall can repair `studio` instead of refusing to touch it.
+		try {
+			await fs.promises.stat( symlinkPath );
+		} catch {
+			return false;
+		}
+		// A symlink that doesn't point at our packaged CLI is managed outside the
+		// app (e.g. a standalone curl install at <STUDIO_CLI_HOME>/bin/studio, any
+		// location). Treat it as installed and never overwrite it.
+		return ! ( await this.doesSymlinkLeadToPackagedCli( symlinkPath ) );
+	}
+
 	private async doesSymlinkLeadToPackagedCli( symlinkPath: string ): Promise< boolean > {
 		try {
 			const symlinkDestination = await fs.promises.readlink( symlinkPath );

apps/studio/src/modules/cli/lib/macos-installation-manager.ts

@@ -44,6 +44,13 @@ export class MacOSCliInstallationManager implements StudioCliInstallationManager
 			return false;
 		}
 
+		// A standalone (curl) install is managed outside the app: report it as
+		// installed — matching the Windows manager — so the UI doesn't offer an
+		// install that would silently no-op. We never install over or uninstall it.
+		if ( await this.isExternallyManagedCli( cliSymlinkPath ) ) {
+			return true;
+		}
+
 		return await this.doesSymlinkLeadToPackagedCli( cliSymlinkPath );
 	}
 
@@ -158,6 +165,12 @@ export class MacOSCliInstallationManager implements StudioCliInstallationManager
 			}
 		}
 
+		// Never overwrite a CLI the app didn't install — e.g. a standalone curl
+		// install symlinking studio at <STUDIO_CLI_HOME>/bin/studio (any location).
+		if ( await this.isExternallyManagedCli( cliSymlinkPath ) ) {
+			return;
+		}
+
 		if ( await this.isCliInstalled() ) {
 			return;
 		}
@@ -192,6 +205,11 @@ export class MacOSCliInstallationManager implements StudioCliInstallationManager
 			throw error;
 		}
 
+		// Don't remove a CLI the app didn't install (e.g. a standalone curl install).
+		if ( await this.isExternallyManagedCli( cliSymlinkPath ) ) {
+			return;
+		}
+
 		await fs.promises.unlink( cliSymlinkPath );
 	}
 
@@ -250,6 +268,30 @@ export class MacOSCliInstallationManager implements StudioCliInstallationManager
 		}
 	}
 
+	private async isExternallyManagedCli( symlinkPath: string ): Promise< boolean > {
+		let isSymlink = false;
+		try {
+			isSymlink = ( await fs.promises.lstat( symlinkPath ) ).isSymbolicLink();
+		} catch {
+			return false;
+		}
+		if ( ! isSymlink ) {
+			return false;
+		}
+		// A dangling symlink (e.g. a standalone install that was deleted without
+		// removing the link) is broken, not externally managed — reclaim it so a
+		// reinstall can repair `studio` instead of refusing to touch it.
+		try {
+			await fs.promises.stat( symlinkPath );
+		} catch {
+			return false;
+		}
+		// A symlink that doesn't point at our packaged CLI is managed outside the
+		// app (e.g. a standalone curl install at <STUDIO_CLI_HOME>/bin/studio, any
+		// location). Treat it as installed and never overwrite it.
+		return ! ( await this.doesSymlinkLeadToPackagedCli( symlinkPath ) );
+	}
+
 	private async doesSymlinkLeadToPackagedCli( symlinkPath: string ): Promise< boolean > {
 		try {
 			const symlinkDestination = await fs.promises.readlink( symlinkPath );

apps/studio/src/modules/cli/lib/windows-installation-manager.ts

@@ -11,6 +11,7 @@ import { loadUserData, updateAppdata } from 'src/storage/user-data';
 
 // `STABLE_BIN_DIR_PATH` resolves to C:\Users\<USERNAME>\AppData\Local\studio\bin
 export const STABLE_BIN_DIR_PATH = path.resolve( path.dirname( app.getPath( 'exe' ) ), '../bin' );
+
 const PATH_KEY = 'Path';
 
 const currentUserRegistry = new Registry( {
@@ -27,9 +28,13 @@ export class WindowsCliInstallationManager implements StudioCliInstallationManag
 
 	/**
 	 * Check if the stable bin directory has been created and if it's contained in the registry PATH.
+	 * Also detects standalone CLI installed via install.ps1.
 	 */
 	async isCliInstalled(): Promise< boolean > {
 		try {
+			if ( await this.isStandaloneCli() ) {
+				return true;
+			}
 			const isStudioCliDirInPath = await this.isStudioCliDirInPath();
 			return isStudioCliDirInPath && existsSync( STABLE_BIN_DIR_PATH );
 		} catch ( error ) {
@@ -207,7 +212,39 @@ export class WindowsCliInstallationManager implements StudioCliInstallationManag
 		}
 	}
 
+	/**
+	 * Check if a standalone CLI (installed via install.ps1) is present.
+	 * Detects the standalone launcher and its bundled Node binary in the
+	 * default or custom install path. Requiring both files means a broken
+	 * install (e.g. a launcher without its runtime) is not treated as
+	 * standalone, so the app can still install its own CLI.
+	 */
+	private async isStandaloneCli(): Promise< boolean > {
+		const currentPath = await this.getPathFromRegistry();
+		const pathDirs = currentPath
+			.split( ';' )
+			.map( ( item ) => item.trim() )
+			.filter( Boolean );
+
+		for ( const dir of pathDirs ) {
+			// Skip the app's own bin directory
+			if ( dir.toLowerCase() === STABLE_BIN_DIR_PATH.toLowerCase() ) {
+				continue;
+			}
+			const launcherPath = path.join( dir, 'studio.cmd' );
+			const bundledNodePath = path.join( dir, 'node.exe' );
+			if ( existsSync( launcherPath ) && existsSync( bundledNodePath ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private async installCli(): Promise< void > {
+		// Don't overwrite standalone CLI installed via install.ps1
+		if ( await this.isStandaloneCli() ) {
+			return;
+		}
 		await this.installPath();
 		await this.installProxyBatFile();
 	}

package.json

@@ -45,6 +45,7 @@
 		"cli:build:prod": "npm -w wp-studio run build:prod",
 		"cli:build:npm": "npm -w wp-studio run build:npm",
 		"cli:package": "npm -w wp-studio run package",
+		"cli:bundle": "tsx scripts/create-standalone-bundle.ts",
 		"cli:watch": "npm -w wp-studio run watch",
 		"app:install:bundle": "npm -w studio-app run install:bundle",
 		"compare:perf": "npm -w compare-perf run compare",