mirror of
https://github.com/openai/codex.git
synced 2026-05-16 17:23:57 +00:00
## Why
Extensions that need thread-scoped state currently only get a start-time
callback. That is enough for seeding stores, but it leaves the host
without a shared extension seam for later thread rehydrate and flush
work as thread ownership evolves. This PR turns that start-only seam
into a host-owned thread lifecycle contributor contract so
extension-private state can stay behind the extension API instead of
leaking extra orchestration through core.
## What changed
- Replaced `ThreadStartContributor` with `ThreadLifecycleContributor`
and added typed lifecycle inputs for thread start, resume, and stop. The
contract lives in
[`contributors/thread_lifecycle.rs`](d0e9211f70/codex-rs/ext/extension-api/src/contributors/thread_lifecycle.rs (L1-L64)).
- Kept the existing start-time behavior intact by routing session
construction through `on_thread_start`.
- Invoked `on_thread_stop` during session shutdown before thread-scoped
extension state is dropped, while isolating contributor failures behind
warning logs.
- Migrated `git-attribution` and `guardian` onto the lifecycle
registration path.
- Renamed the extension registry plumbing from start-specific
contributors to lifecycle-specific contributors.
## Notes
`on_thread_resume` is introduced at the API boundary here so extensions
can target the final lifecycle shape; host resume dispatch can be wired
where that runtime path is finalized.
133 lines
4.5 KiB
Rust
133 lines
4.5 KiB
Rust
use std::sync::Arc;
|
|
|
|
use codex_core::config::Config;
|
|
use codex_extension_api::ContextContributor;
|
|
use codex_extension_api::ExtensionData;
|
|
use codex_extension_api::ExtensionRegistryBuilder;
|
|
use codex_extension_api::PromptFragment;
|
|
use codex_extension_api::ThreadLifecycleContributor;
|
|
use codex_extension_api::ThreadStartInput;
|
|
use codex_features::Feature;
|
|
|
|
const DEFAULT_ATTRIBUTION_VALUE: &str = "Codex <noreply@openai.com>";
|
|
|
|
/// Contributes the configured git-attribution instruction.
|
|
#[derive(Clone, Copy, Debug, Default)]
|
|
pub struct GitAttributionExtension;
|
|
|
|
impl ContextContributor for GitAttributionExtension {
|
|
fn contribute(
|
|
&self,
|
|
_session_store: &ExtensionData,
|
|
thread_store: &ExtensionData,
|
|
) -> Vec<PromptFragment> {
|
|
let Some(config_store) = thread_store.get::<GitAttributionConfig>() else {
|
|
return Vec::new();
|
|
};
|
|
if !config_store.enabled {
|
|
return Vec::new();
|
|
}
|
|
build_instruction(config_store.prompt.as_deref())
|
|
.map(PromptFragment::developer_policy)
|
|
.into_iter()
|
|
.collect()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Default)]
|
|
struct GitAttributionConfig {
|
|
enabled: bool,
|
|
prompt: Option<String>,
|
|
}
|
|
|
|
impl ThreadLifecycleContributor<Config> for GitAttributionExtension {
|
|
fn on_thread_start(&self, input: ThreadStartInput<'_, Config>) {
|
|
input.thread_store.insert(GitAttributionConfig {
|
|
enabled: input.config.features.enabled(Feature::CodexGitCommit),
|
|
prompt: input.config.commit_attribution.clone(),
|
|
});
|
|
}
|
|
}
|
|
|
|
/// Installs the git-attribution contributors into the extension registry.
|
|
pub fn install(registry: &mut ExtensionRegistryBuilder<Config>) {
|
|
let extension = Arc::new(GitAttributionExtension);
|
|
registry.thread_lifecycle_contributor(extension.clone());
|
|
registry.prompt_contributor(extension);
|
|
}
|
|
|
|
fn build_commit_message_trailer(config_attribution: Option<&str>) -> Option<String> {
|
|
let value = resolve_attribution_value(config_attribution)?;
|
|
Some(format!("Co-authored-by: {value}"))
|
|
}
|
|
|
|
fn build_instruction(config_attribution: Option<&str>) -> Option<String> {
|
|
let trailer = build_commit_message_trailer(config_attribution)?;
|
|
Some(format!(
|
|
"When you write or edit a git commit message, ensure the message ends with this trailer exactly once:\n{trailer}\n\nRules:\n- Keep existing trailers and append this trailer at the end if missing.\n- Do not duplicate this trailer if it already exists.\n- Keep one blank line between the commit body and trailer block."
|
|
))
|
|
}
|
|
|
|
fn resolve_attribution_value(config_attribution: Option<&str>) -> Option<String> {
|
|
match config_attribution {
|
|
Some(value) => {
|
|
let trimmed = value.trim();
|
|
if trimmed.is_empty() {
|
|
None
|
|
} else {
|
|
Some(trimmed.to_string())
|
|
}
|
|
}
|
|
None => Some(DEFAULT_ATTRIBUTION_VALUE.to_string()),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use pretty_assertions::assert_eq;
|
|
|
|
use super::build_commit_message_trailer;
|
|
use super::build_instruction;
|
|
use super::resolve_attribution_value;
|
|
|
|
#[test]
|
|
fn blank_attribution_disables_trailer_prompt() {
|
|
assert_eq!(build_commit_message_trailer(Some("")), None);
|
|
assert_eq!(build_instruction(Some(" ")), None);
|
|
}
|
|
|
|
#[test]
|
|
fn default_attribution_uses_codex_trailer() {
|
|
assert_eq!(
|
|
build_commit_message_trailer(/*config_attribution*/ None).as_deref(),
|
|
Some("Co-authored-by: Codex <noreply@openai.com>")
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn resolve_value_handles_default_custom_and_blank() {
|
|
assert_eq!(
|
|
resolve_attribution_value(/*config_attribution*/ None),
|
|
Some("Codex <noreply@openai.com>".to_string())
|
|
);
|
|
assert_eq!(
|
|
resolve_attribution_value(Some("MyAgent <me@example.com>")),
|
|
Some("MyAgent <me@example.com>".to_string())
|
|
);
|
|
assert_eq!(
|
|
resolve_attribution_value(Some("MyAgent")),
|
|
Some("MyAgent".to_string())
|
|
);
|
|
assert_eq!(resolve_attribution_value(Some(" ")), None);
|
|
}
|
|
|
|
#[test]
|
|
fn instruction_mentions_trailer_and_omits_generated_with() {
|
|
let instruction =
|
|
build_instruction(Some("AgentX <agent@example.com>")).expect("instruction expected");
|
|
assert!(instruction.contains("Co-authored-by: AgentX <agent@example.com>"));
|
|
assert!(instruction.contains("exactly once"));
|
|
assert!(!instruction.contains("Generated-with"));
|
|
}
|
|
}
|