openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-15 12:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

metadata timeout

Browse Source
This commit is contained in:
pash
2026-01-30 08:15:51 -08:00
parent 37a287a3f0
commit 9eff9b835e
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
codex-rs/core/src/codex.rs
View File

@@ -85,6 +85,8 @@ use serde_json::Value;
use tokio::sync::Mutex;
use tokio::sync::RwLock;
use tokio::sync::oneshot;
use tokio::time::Duration as TokioDuration;
use tokio::time::timeout;
use tokio_util::sync::CancellationToken;
use tracing::Instrument;
use tracing::debug;
@@ -729,22 +731,30 @@ impl Session {
}
get_git_repo_root(cwd)?;
let git_info = collect_git_info(cwd).await?;
let latest_git_commit_hash = git_info.commit_hash;
let associated_remote_urls = get_git_remote_urls(cwd).await;
if latest_git_commit_hash.is_none() && associated_remote_urls.is_none() {
return None;
}
// On some CI environments (notably Windows), git commands can hang
// until their timeout elapses. Cap the total time we spend gathering
// optional metadata so turn startup stays responsive.
timeout(TokioDuration::from_millis(750), async {
let git_info = collect_git_info(cwd).await?;
let latest_git_commit_hash = git_info.commit_hash;
let associated_remote_urls = get_git_remote_urls(cwd).await;
if latest_git_commit_hash.is_none() && associated_remote_urls.is_none() {
return None;
}
let mut workspaces = BTreeMap::new();
workspaces.insert(
cwd.to_string_lossy().into_owned(),
TurnMetadataWorkspace {
associated_remote_urls,
latest_git_commit_hash,
},
);
serde_json::to_string(&TurnMetadata { workspaces }).ok()
let mut workspaces = BTreeMap::new();
workspaces.insert(
cwd.to_string_lossy().into_owned(),
TurnMetadataWorkspace {
associated_remote_urls,
latest_git_commit_hash,
},
);
serde_json::to_string(&TurnMetadata { workspaces }).ok()
})
.await
.ok()
.flatten()
}
#[allow(clippy::too_many_arguments)]