clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jif-oai/macos-snapshots' into jif-oai/macos-snapshots

Browse Source
This commit is contained in:
jimmyfraiture
2025-09-04 14:46:52 -07:00
parent 63b52b159f 81451f4246
commit ea0ed2a4d8
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
codex-rs/core/src/shell.rs
View File

@@ -251,32 +251,26 @@ async fn ensure_zsh_snapshot(shell_path: &str, home: &Path, session_id: Uuid) ->
.join(format!("codex_shell_snapshot_{session_id}.zsh"));
// Check if an update in the profile requires to re-generate the snapshot.
let snapshot_is_stale = match tokio::fs::metadata(&snapshot_path).await {
Ok(metadata) => match metadata.modified() {
Ok(snapshot_modified) => {
let mut stale = false;
for profile in zsh_profile_paths(home) {
if let Ok(profile_metadata) = tokio::fs::metadata(&profile).await {
match profile_metadata.modified() {
Ok(profile_modified) => {
if profile_modified > snapshot_modified {
stale = true;
break;
}
}
Err(_) => {
stale = true;
break;
}
}
}
}
stale
}
Err(_) => true,
},
Err(_) => true,
};
let snapshot_is_stale = async {
let snapshot_metadata = tokio::fs::metadata(&snapshot_path).await.ok()?;
let snapshot_modified = snapshot_metadata.modified().ok()?;
for profile in zsh_profile_paths(home) {
let Ok(profile_metadata) = tokio::fs::metadata(&profile).await else {
continue;
};
let Ok(profile_modified) = profile_metadata.modified() else {
return Some(true);
};
if profile_modified > snapshot_modified {
return Some(true);
}
}
Some(false)
}.await.unwrap_or(true);
if !snapshot_is_stale {
return Some(snapshot_path);