mirror of
https://github.com/openai/codex.git
synced 2026-11-21 07:09:23 +00:00
## What changed Show an older-service notice at startup and reconnect when both versions are official stable releases. Display it in conversation history or the agents overview, with wrapping and a compact fallback for small terminals. For the implicit local daemon, suggest `codex app-server daemon update` and warn that updating may interrupt active or queued work. Suppress repeated notices for the same service and version pair, and defer fresh-session notices until session attachment. ## Testing Add coverage for version notice eligibility, local-only update guidance, service identity, startup ordering, reconnect deduplication, and overview rendering at narrow and short sizes. GitOrigin-RevId: e0a5b306e0a4d405544c5f6eaa72f77df6d68e6d
123 lines
3.9 KiB
Rust
123 lines
3.9 KiB
Rust
#[cfg(any(not(debug_assertions), test))]
|
|
pub(crate) fn is_newer(latest: &str, current: &str) -> Option<bool> {
|
|
match (parse_version(latest), parse_version(current)) {
|
|
(Some(l), Some(c)) => Some(l > c),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
#[cfg(any(not(debug_assertions), test))]
|
|
pub(crate) fn extract_version_from_latest_tag(latest_tag_name: &str) -> anyhow::Result<String> {
|
|
latest_tag_name
|
|
.strip_prefix("rust-v")
|
|
.map(str::to_owned)
|
|
.ok_or_else(|| anyhow::anyhow!("Failed to parse latest tag name '{latest_tag_name}'"))
|
|
}
|
|
|
|
#[cfg(any(not(debug_assertions), test))]
|
|
pub(crate) fn is_source_build_version(version: &str) -> bool {
|
|
parse_version(version) == Some((0, 0, 0))
|
|
}
|
|
|
|
/// Whether an official stable TUI release is newer than the connected app server.
|
|
pub(crate) fn is_official_server_older(client: &str, server: &str) -> bool {
|
|
fn stable_version(version: &str) -> Option<(u64, u64, u64)> {
|
|
fn component(value: Option<&str>) -> Option<u64> {
|
|
let value = value?;
|
|
if value.is_empty()
|
|
|| !value.bytes().all(|byte| byte.is_ascii_digit())
|
|
|| (value.len() > 1 && value.starts_with('0'))
|
|
{
|
|
return None;
|
|
}
|
|
value.parse().ok()
|
|
}
|
|
|
|
let mut parts = version.split('.');
|
|
let version = (
|
|
component(parts.next())?,
|
|
component(parts.next())?,
|
|
component(parts.next())?,
|
|
);
|
|
(parts.next().is_none() && version != (0, 0, 0)).then_some(version)
|
|
}
|
|
|
|
matches!((stable_version(client), stable_version(server)), (Some(client), Some(server)) if client > server)
|
|
}
|
|
|
|
#[cfg(any(not(debug_assertions), test))]
|
|
fn parse_version(v: &str) -> Option<(u64, u64, u64)> {
|
|
let mut iter = v.trim().split('.');
|
|
let maj = iter.next()?.parse::<u64>().ok()?;
|
|
let min = iter.next()?.parse::<u64>().ok()?;
|
|
let pat = iter.next()?.parse::<u64>().ok()?;
|
|
Some((maj, min, pat))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn extracts_version_from_latest_tag() {
|
|
assert_eq!(
|
|
extract_version_from_latest_tag("rust-v1.5.0").expect("failed to parse version"),
|
|
"1.5.0"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn latest_tag_without_prefix_is_invalid() {
|
|
assert!(extract_version_from_latest_tag("v1.5.0").is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn prerelease_version_is_not_considered_newer() {
|
|
assert_eq!(is_newer("0.11.0-beta.1", "0.11.0"), None);
|
|
assert_eq!(is_newer("1.0.0-rc.1", "1.0.0"), None);
|
|
}
|
|
|
|
#[test]
|
|
fn plain_semver_comparisons_work() {
|
|
assert_eq!(is_newer("0.11.1", "0.11.0"), Some(true));
|
|
assert_eq!(is_newer("0.11.0", "0.11.1"), Some(false));
|
|
assert_eq!(is_newer("1.0.0", "0.9.9"), Some(true));
|
|
assert_eq!(is_newer("0.9.9", "1.0.0"), Some(false));
|
|
}
|
|
|
|
#[test]
|
|
fn source_build_version_is_not_checked() {
|
|
assert!(is_source_build_version("0.0.0"));
|
|
assert!(!is_source_build_version("0.1.0"));
|
|
}
|
|
|
|
#[test]
|
|
fn whitespace_is_ignored() {
|
|
assert_eq!(parse_version(" 1.2.3 \n"), Some((1, 2, 3)));
|
|
assert_eq!(is_newer(" 1.2.3 ", "1.2.2"), Some(true));
|
|
}
|
|
|
|
#[test]
|
|
fn official_server_version_comparison() {
|
|
assert!(is_official_server_older("0.152.1", "0.152.0"));
|
|
assert!(is_official_server_older("0.153.0", "0.152.1"));
|
|
assert!(!is_official_server_older("0.152.0", "0.152.0"));
|
|
assert!(!is_official_server_older("0.152.0", "0.153.0"));
|
|
for version in [
|
|
"0.0.0",
|
|
"0.0.0.0",
|
|
"0.153.0-alpha.1",
|
|
"unknown",
|
|
"0.153",
|
|
"0.153.0.1",
|
|
" 0.153.0",
|
|
"+0.153.0",
|
|
"0.0153.0",
|
|
] {
|
|
assert!(!is_official_server_older(version, "0.152.0"));
|
|
assert!(!is_official_server_older("0.153.0", version));
|
|
}
|
|
}
|
|
}
|