feat: add env selector

packages/cli/Cargo.toml

@@ -21,6 +21,7 @@ uuid = { version = "1.11.0", features = ["v4"] }
 url = { version = "2.5.3", features = ["serde"] }
 base64 = "0.22.1"
 kv-str = { version = "0.1.0", path = "../kv-str" }
+inquire = "0.7.5"
 
 [build-dependencies]
 anyhow = "1.0"

packages/cli/src/commands/actor/create.rs

@@ -28,8 +28,8 @@ struct Port {
 
 #[derive(Parser)]
 pub struct Opts {
-	#[clap(index = 1)]
-	environment: String,
+	#[clap(long, alias = "env", short = 'e')]
+	environment: Option<String>,
 
 	#[clap(long, short = 'r')]
 	region: Option<String>,
@@ -49,7 +49,7 @@ pub struct Opts {
 	#[clap(long, short = 'b')]
 	build_tags: Option<String>,
 
-	#[clap(long = "env")]
+	#[clap(long = "env-var")]
 	env_vars: Option<Vec<String>>,
 
 	#[clap(long, value_enum)]
@@ -98,6 +98,8 @@ impl Opts {
 	pub async fn execute_inner(&self) -> Result<ExitCode> {
 		let ctx = toolchain::toolchain_ctx::load().await?;
 
+		let env = crate::util::env::get_or_select(&ctx, self.environment.as_ref()).await?;
+
 		// Parse tags
 		let actor_tags = if let Some(t) = &self.actor_tags {
 			kv_str::from_str::<HashMap<String, String>>(t)?
@@ -179,7 +181,7 @@ impl Opts {
 
 			// Deploys erver
 			match crate::util::deploy::deploy(crate::util::deploy::DeployOpts {
-				environment: &self.environment,
+				environment: &env,
 				build_tags: Some(build_tags),
 			})
 			.await
@@ -218,7 +220,7 @@ impl Opts {
 			let regions = apis::actor_regions_api::actor_regions_list(
 				&ctx.openapi_config_cloud,
 				Some(&ctx.project.name_id.to_string()),
-				Some(&self.environment),
+				Some(&env),
 			)
 			.await?;
 
@@ -269,7 +271,7 @@ impl Opts {
 			&ctx.openapi_config_cloud,
 			request,
 			Some(&ctx.project.name_id),
-			Some(&self.environment),
+			Some(&env),
 		)
 		.await
 		{
@@ -288,7 +290,7 @@ impl Opts {
 			crate::util::actor::logs::tail(
 				&ctx,
 				crate::util::actor::logs::TailOpts {
-					environment: &self.environment,
+					environment: &env,
 					actor_id,
 					stream: self
 						.log_stream

packages/cli/src/commands/actor/destroy.rs

@@ -7,11 +7,11 @@ use uuid::Uuid;
 #[derive(Parser)]
 pub struct Opts {
 	#[clap(index = 1)]
-	environment: String,
-
-	#[clap(long)]
 	id: String,
 
+	#[clap(long, alias = "env", short = 'e')]
+	environment: Option<String>,
+
 	#[clap(long)]
 	override_kill_timeout: Option<i64>,
 }
@@ -30,13 +30,15 @@ impl Opts {
 	pub async fn execute_inner(&self) -> Result<ExitCode> {
 		let ctx = toolchain::toolchain_ctx::load().await?;
 
+		let env = crate::util::env::get_or_select(&ctx, self.environment.as_ref()).await?;
+
 		let actor_id = Uuid::parse_str(&self.id).context("invalid id uuid")?;
 
 		match apis::actor_api::actor_destroy(
 			&ctx.openapi_config_cloud,
 			&actor_id.to_string(),
 			Some(&ctx.project.name_id),
-			Some(&self.environment),
+			Some(&env),
 			self.override_kill_timeout,
 		)
 		.await

packages/cli/src/commands/actor/get.rs

@@ -7,10 +7,10 @@ use uuid::Uuid;
 #[derive(Parser)]
 pub struct Opts {
 	#[clap(index = 1)]
-	environment: String,
-
-	#[clap(long)]
 	id: String,
+
+	#[clap(long, alias = "env", short = 'e')]
+	environment: Option<String>,
 }
 
 impl Opts {
@@ -27,13 +27,15 @@ impl Opts {
 	pub async fn execute_inner(&self) -> Result<ExitCode> {
 		let ctx = toolchain::toolchain_ctx::load().await?;
 
+		let env = crate::util::env::get_or_select(&ctx, self.environment.as_ref()).await?;
+
 		let actor_id = Uuid::parse_str(&self.id).context("invalid id uuid")?;
 
 		match apis::actor_api::actor_get(
 			&ctx.openapi_config_cloud,
 			&actor_id.to_string(),
 			Some(&ctx.project.name_id),
-			Some(&self.environment),
+			Some(&env),
 		)
 		.await
 		{

packages/cli/src/commands/actor/list.rs

@@ -5,8 +5,8 @@ use toolchain::rivet_api::apis;
 
 #[derive(Parser)]
 pub struct Opts {
-	#[clap(index = 1)]
-	environment: String,
+	#[clap(long, alias = "env", short = 'e')]
+	environment: Option<String>,
 
 	#[clap(long)]
 	tags: Option<String>,
@@ -32,6 +32,8 @@ impl Opts {
 	pub async fn execute_inner(&self) -> Result<ExitCode> {
 		let ctx = toolchain::toolchain_ctx::load().await?;
 
+		let env = crate::util::env::get_or_select(&ctx, self.environment.as_ref()).await?;
+
 		// Parse tags
 		let tags = self
 			.tags
@@ -43,7 +45,7 @@ impl Opts {
 		match apis::actor_api::actor_list(
 			&ctx.openapi_config_cloud,
 			Some(&ctx.project.name_id),
-			Some(&self.environment),
+			Some(&env),
 			tags_json.as_deref(),
 			Some(self.include_destroyed),
 			self.cursor.as_deref(),

packages/cli/src/commands/actor/logs.rs

@@ -6,11 +6,11 @@ use uuid::Uuid;
 #[derive(Parser)]
 pub struct Opts {
 	#[clap(index = 1)]
-	environment: String,
-
-	#[clap(long)]
 	id: String,
 
+	#[clap(long, alias = "env", short = 'e')]
+	environment: Option<String>,
+
 	#[clap(long, short = 's')]
 	stream: Option<crate::util::actor::logs::LogStream>,
 
@@ -35,12 +35,14 @@ impl Opts {
 	pub async fn execute_inner(&self) -> Result<ExitCode> {
 		let ctx = toolchain::toolchain_ctx::load().await?;
 
+		let env = crate::util::env::get_or_select(&ctx, self.environment.as_ref()).await?;
+
 		let actor_id = Uuid::parse_str(&self.id).context("invalid id uuid")?;
 
 		crate::util::actor::logs::tail(
 			&ctx,
 			crate::util::actor::logs::TailOpts {
-				environment: &self.environment,
+				environment: &env,
 				actor_id,
 				stream: self
 					.stream