comments and more deps

Author: connor4312

cli/Cargo.lock

@@ -43,14 +43,14 @@ http-body-util = "0.1"
 tokio-tungstenite = { version = "0.29", features = ["native-tls"] }
 indicatif = "0.17.4"
 tempfile = "3.5.0"
-clap_lex = "0.7.0"
+clap_lex = "1"
 url = "2.5.4"
 log = "0.4.18"
 const_format = "0.2.31"
 sha2 = "0.10.6"
-base64 = "0.21.2"
+base64 = "0.22"
 shell-escape = "0.1.5"
-thiserror = "1.0.40"
+thiserror = "2"
 cfg-if = "1.0.0"
 pin-project = "1.1.0"
 console = "0.15.7"
@@ -67,9 +67,9 @@ serde_json = "1.0.96"
 winresource = "0.1"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.50.0"
+winreg = "0.56"
 winapi = "0.3.9"
-windows-sys = { version = "0.59.0", features = ["Win32_System_Console", "Win32_UI_Input_KeyboardAndMouse"] }
+windows-sys = { version = "0.61", features = ["Win32_System_Console", "Win32_UI_Input_KeyboardAndMouse"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.3"

cli/Cargo.toml

@@ -39,7 +39,7 @@ use super::CommandContext;
 /// commands (e.g. `code agent ps`) can discover a running agent host.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AgentHostLockData {
-	/// WebSocket address the agent host is listening on (e.g. `ws://127.0.0.1:4567`).
+	/// WebSocket address the agent host is listening on (e.g. `ws://127.0.0.1:4567/`).
 	pub address: String,
 	/// PID of the CLI process running the agent host.
 	pub pid: u32,
@@ -125,10 +125,7 @@ pub async fn agent_host(ctx: CommandContext, mut args: AgentHostArgs) -> Result<
 		.local_addr()
 		.map_err(CodeError::CouldNotListenOnInterface)?;
 
-	let mut url = format!("ws://{bound_addr}");
-	if let Some(ct) = &args.connection_token {
-		url.push_str(&format!("?tkn={ct}"));
-	}
+	let local_agent_host_url = format!("ws://{bound_addr}/");
 
 	let product = constants::QUALITYLESS_PRODUCT_NAME;
 	let token_suffix = args
@@ -199,12 +196,12 @@ pub async fn agent_host(ctx: CommandContext, mut args: AgentHostArgs) -> Result<
 	// Write lockfile so `code agent ps` can discover this instance.
 	let lockfile_path = ctx.paths.agent_host_lockfile();
 	let lock_data = AgentHostLockData {
-		address: format!("ws://{bound_addr}/"),
+		address: local_agent_host_url,
 		pid: std::process::id(),
 		connection_token: args.connection_token.clone(),
 		tunnel_name: tunnel_name.clone(),
 	};
-	if let Err(e) = fs::write(&lockfile_path, serde_json::to_string(&lock_data).unwrap()) {
+	if let Err(e) = write_agent_host_lockfile(&lockfile_path, &lock_data) {
 		warning!(ctx.log, "Failed to write agent host lockfile: {}", e);
 	}
 
@@ -290,29 +287,45 @@ fn mint_connection_token(path: &Path, prefer_token: Option<String>) -> std::io::
 	#[cfg(not(windows))]
 	use std::os::unix::fs::OpenOptionsExt;
 
-	let mut f = fs::OpenOptions::new();
-	f.create(true);
-	f.write(true);
-	f.read(true);
+	let mut file_options = fs::OpenOptions::new();
+	file_options.create(true);
+	file_options.write(true);
+	file_options.read(true);
 	#[cfg(not(windows))]
-	f.mode(0o600);
-	let mut f = f.open(path)?;
+	file_options.mode(0o600);
+	let mut file = file_options.open(path)?;
 
 	if prefer_token.is_none() {
-		let mut t = String::new();
-		f.read_to_string(&mut t)?;
-		let t = t.trim();
-		if !t.is_empty() {
-			return Ok(t.to_string());
+		let mut token = String::new();
+		file.read_to_string(&mut token)?;
+		let token = token.trim();
+		if !token.is_empty() {
+			return Ok(token.to_string());
 		}
 	}
 
-	f.set_len(0)?;
+	file.set_len(0)?;
 	let prefer_token = prefer_token.unwrap_or_else(|| uuid::Uuid::new_v4().to_string());
-	f.write_all(prefer_token.as_bytes())?;
+	file.write_all(prefer_token.as_bytes())?;
 	Ok(prefer_token)
 }
 
+fn write_agent_host_lockfile(path: &Path, lock_data: &AgentHostLockData) -> std::io::Result<()> {
+	#[cfg(not(windows))]
+	use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
+
+	let mut file_options = fs::OpenOptions::new();
+	file_options.create(true);
+	file_options.write(true);
+	file_options.truncate(true);
+	#[cfg(not(windows))]
+	file_options.mode(0o600);
+	let mut file = file_options.open(path)?;
+	#[cfg(not(windows))]
+	file.set_permissions(fs::Permissions::from_mode(0o600))?;
+	file.write_all(serde_json::to_string(lock_data).unwrap().as_bytes())
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

cli/src/commands/agent_host.rs

@@ -68,7 +68,6 @@ where
 
 	Ok(bytes_so_far)
 }
-
 /// Helper used when converting Future interfaces to poll-based interfaces.
 /// Stores excess data that can be reused on future polls.
 #[derive(Default)]
@@ -221,7 +220,7 @@ pub fn tailf(file: File, n: usize) -> mpsc::UnboundedReceiver<TailEvent> {
 
 #[cfg(test)]
 mod tests {
-	use rand::Rng;
+	use rand::RngExt;
 	use std::{fs::OpenOptions, io::Write};
 
 	use super::*;
@@ -315,7 +314,11 @@ mod tests {
 		let mut written = vec![];
 		let base_line = "Elit ipsum cillum ex cillum. Adipisicing consequat cupidatat do proident ut in sunt Lorem ipsum tempor. Eiusmod ipsum Lorem labore exercitation sunt pariatur excepteur fugiat cillum velit cillum enim. Nisi Lorem cupidatat ad enim velit officia eiusmod esse tempor aliquip. Deserunt pariatur tempor in duis culpa esse sit nulla irure ullamco ipsum voluptate non laboris. Occaecat officia nulla officia mollit do aliquip reprehenderit ad incididunt.";
 		for i in 0..100 {
-			let line = format!("{}: {}", i, &base_line[..rng.gen_range(0..base_line.len())]);
+			let line = format!(
+				"{}: {}",
+				i,
+				&base_line[..rng.random_range(0..base_line.len())]
+			);
 			writeln!(&mut read_file, "{line}").unwrap();
 			written.push(line);
 		}