diff --git a/crates/eval/build.rs b/crates/eval/build.rs
new file mode 100644
index 0000000000..9ab40da0fb
--- /dev/null
+++ b/crates/eval/build.rs
@@ -0,0 +1,14 @@
+fn main() {
+    let cargo_toml =
+        std::fs::read_to_string("../zed/Cargo.toml").expect("Failed to read crates/zed/Cargo.toml");
+    let version = cargo_toml
+        .lines()
+        .find(|line| line.starts_with("version = "))
+        .expect("Version not found in crates/zed/Cargo.toml")
+        .split('=')
+        .nth(1)
+        .expect("Invalid version format")
+        .trim()
+        .trim_matches('"');
+    println!("cargo:rustc-env=ZED_PKG_VERSION={}", version);
+}
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
index d638ac171f..6558222d89 100644
--- a/crates/eval/src/eval.rs
+++ b/crates/eval/src/eval.rs
@@ -337,7 +337,7 @@ pub struct AgentAppState {
 }
 
 pub fn init(cx: &mut App) -> Arc<AgentAppState> {
-    let app_version = AppVersion::global(cx);
+    let app_version = AppVersion::load(env!("ZED_PKG_VERSION"));
     release_channel::init(app_version, cx);
     gpui_tokio::init(cx);
 
@@ -350,7 +350,7 @@ pub fn init(cx: &mut App) -> Arc<AgentAppState> {
 
     // Set User-Agent so we can download language servers from GitHub
     let user_agent = format!(
-        "Zed/{} ({}; {})",
+        "Zed Agent Eval/{} ({}; {})",
         app_version,
         std::env::consts::OS,
         std::env::consts::ARCH
diff --git a/crates/zeta_cli/build.rs b/crates/zeta_cli/build.rs
index ccbb54c5b4..9ab40da0fb 100644
--- a/crates/zeta_cli/build.rs
+++ b/crates/zeta_cli/build.rs
@@ -1,6 +1,6 @@
 fn main() {
     let cargo_toml =
-        std::fs::read_to_string("../zed/Cargo.toml").expect("Failed to read Cargo.toml");
+        std::fs::read_to_string("../zed/Cargo.toml").expect("Failed to read crates/zed/Cargo.toml");
     let version = cargo_toml
         .lines()
         .find(|line| line.starts_with("version = "))
diff --git a/crates/zeta_cli/src/headless.rs b/crates/zeta_cli/src/headless.rs
index 959bb91a8f..d6ee085d18 100644
--- a/crates/zeta_cli/src/headless.rs
+++ b/crates/zeta_cli/src/headless.rs
@@ -40,7 +40,7 @@ pub fn init(cx: &mut App) -> ZetaCliAppState {
 
     // Set User-Agent so we can download language servers from GitHub
     let user_agent = format!(
-        "Zed/{} ({}; {})",
+        "Zeta CLI/{} ({}; {})",
         app_version,
         std::env::consts::OS,
         std::env::consts::ARCH