mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
## Why
Extension contributors are registered behind `dyn Trait` objects, so
native `async fn`/RPITIT methods would make these traits
non-object-safe. Spell out the boxed, `Send` future contract directly so
`extension-api` no longer needs `async-trait` while retaining the
existing runtime model.
## What changed
- add a shared `ExtensionFuture` alias and use it for asynchronous
contributor methods
- migrate production and test implementations to return `Box::pin(async
move { ... })`
- remove `async-trait` dependencies where they are no longer used,
keeping it dev-only where unrelated test executors still require it
## Behavior
No behavior change is intended. Contributor futures remain boxed,
`Send`, dynamically dispatched, and lazily executed; cancellation and
callback ordering stay unchanged.
## Testing
- `just test -p codex-extension-api` (11 passed)
- affected extension crates (64 passed)
- targeted `codex-core` contributor tests (14 passed)
- `just fmt`
- `just bazel-lock-update`
- `just bazel-lock-check`
A broad local `codex-core` run compiled successfully but encountered
unrelated sandbox and missing test-binary fixture failures; CI will run
the full checks.
279 lines
10 KiB
Rust
279 lines
10 KiB
Rust
use std::sync::Arc;
|
|
|
|
use codex_core::config::Config;
|
|
use codex_core_skills::HostLoadedSkills;
|
|
use codex_core_skills::SkillInstructions;
|
|
use codex_core_skills::injection::InjectedHostSkillPrompts;
|
|
use codex_core_skills::injection::SkillInjection;
|
|
use codex_extension_api::ConfigContributor;
|
|
use codex_extension_api::ContextContributor;
|
|
use codex_extension_api::ContextualUserFragment;
|
|
use codex_extension_api::ExtensionData;
|
|
use codex_extension_api::ExtensionEventSink;
|
|
use codex_extension_api::ExtensionFuture;
|
|
use codex_extension_api::ExtensionRegistryBuilder;
|
|
use codex_extension_api::PromptFragment;
|
|
use codex_extension_api::ThreadLifecycleContributor;
|
|
use codex_extension_api::ThreadStartInput;
|
|
use codex_extension_api::TurnInputContext;
|
|
use codex_extension_api::TurnInputContributor;
|
|
use codex_protocol::capabilities::SelectedCapabilityRoot;
|
|
use codex_protocol::protocol::Event;
|
|
use codex_protocol::protocol::EventMsg;
|
|
use codex_protocol::protocol::WarningEvent;
|
|
|
|
use crate::catalog::SkillCatalogEntry;
|
|
use crate::catalog::SkillReadResult;
|
|
use crate::catalog::SkillSourceKind;
|
|
use crate::provider::HostSkillProvider;
|
|
use crate::provider::SkillListQuery;
|
|
use crate::provider::SkillReadRequest;
|
|
use crate::render::MAX_SKILL_NAME_BYTES;
|
|
use crate::render::MAX_SKILL_PATH_BYTES;
|
|
use crate::render::available_skills_fragment;
|
|
use crate::render::truncate_main_prompt_contents;
|
|
use crate::render::truncate_utf8_to_bytes;
|
|
use crate::selection::collect_explicit_skill_mentions;
|
|
use crate::sources::SkillProviders;
|
|
use crate::state::SkillsExtensionConfig;
|
|
use crate::state::SkillsThreadState;
|
|
use crate::state::SkillsTurnState;
|
|
|
|
#[derive(Clone)]
|
|
struct SkillsExtension {
|
|
providers: SkillProviders,
|
|
event_sink: Arc<dyn ExtensionEventSink>,
|
|
}
|
|
|
|
impl ThreadLifecycleContributor<Config> for SkillsExtension {
|
|
fn on_thread_start<'a>(
|
|
&'a self,
|
|
input: ThreadStartInput<'a, Config>,
|
|
) -> ExtensionFuture<'a, ()> {
|
|
Box::pin(async move {
|
|
let selected_roots = input
|
|
.thread_store
|
|
.get::<Vec<SelectedCapabilityRoot>>()
|
|
.map(|selected_roots| selected_roots.as_ref().clone())
|
|
.unwrap_or_default();
|
|
input.thread_store.insert(SkillsThreadState::new(
|
|
SkillsExtensionConfig::from_config(input.config),
|
|
selected_roots,
|
|
));
|
|
})
|
|
}
|
|
}
|
|
|
|
impl ConfigContributor<Config> for SkillsExtension {
|
|
fn on_config_changed(
|
|
&self,
|
|
_session_store: &ExtensionData,
|
|
thread_store: &ExtensionData,
|
|
_previous_config: &Config,
|
|
new_config: &Config,
|
|
) {
|
|
let next_config = SkillsExtensionConfig::from_config(new_config);
|
|
if let Some(state) = thread_store.get::<SkillsThreadState>() {
|
|
state.set_config(next_config);
|
|
} else {
|
|
thread_store.insert(SkillsThreadState::new(next_config, Vec::new()));
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ContextContributor for SkillsExtension {
|
|
fn contribute<'a>(
|
|
&'a self,
|
|
_session_store: &'a ExtensionData,
|
|
thread_store: &'a ExtensionData,
|
|
) -> std::pin::Pin<Box<dyn std::future::Future<Output = Vec<PromptFragment>> + Send + 'a>> {
|
|
Box::pin(async move {
|
|
let Some(thread_state) = thread_store.get::<SkillsThreadState>() else {
|
|
return Vec::new();
|
|
};
|
|
let config = thread_state.config();
|
|
if !config.include_instructions || thread_state.selected_roots().is_empty() {
|
|
return Vec::new();
|
|
}
|
|
let catalog = self
|
|
.providers
|
|
.list_for_turn(SkillListQuery {
|
|
turn_id: thread_store.level_id().to_string(),
|
|
executor_roots: thread_state.selected_roots().to_vec(),
|
|
host: None,
|
|
include_host_skills: false,
|
|
include_bundled_skills: config.bundled_skills_enabled,
|
|
include_remote_skills: false,
|
|
})
|
|
.await;
|
|
for warning in &catalog.warnings {
|
|
self.emit_warning(thread_store.level_id(), warning.clone());
|
|
}
|
|
available_skills_fragment(&catalog)
|
|
.map(|fragment| PromptFragment::developer_capability(fragment.render()))
|
|
.into_iter()
|
|
.collect()
|
|
})
|
|
}
|
|
}
|
|
|
|
impl TurnInputContributor for SkillsExtension {
|
|
fn contribute<'a>(
|
|
&'a self,
|
|
input: TurnInputContext,
|
|
_session_store: &'a ExtensionData,
|
|
thread_store: &'a ExtensionData,
|
|
turn_store: &'a ExtensionData,
|
|
) -> ExtensionFuture<'a, Vec<Box<dyn ContextualUserFragment + Send>>> {
|
|
Box::pin(async move {
|
|
let Some(thread_state) = thread_store.get::<SkillsThreadState>() else {
|
|
return Vec::new();
|
|
};
|
|
|
|
let config = thread_state.config();
|
|
let host_loaded_skills = turn_store.get::<HostLoadedSkills>();
|
|
let query = SkillListQuery {
|
|
turn_id: input.turn_id.clone(),
|
|
executor_roots: thread_state.selected_roots().to_vec(),
|
|
host: host_loaded_skills.clone(),
|
|
include_host_skills: true,
|
|
include_bundled_skills: config.bundled_skills_enabled,
|
|
include_remote_skills: true,
|
|
};
|
|
let catalog = self.providers.list_for_turn(query).await;
|
|
for warning in &catalog.warnings {
|
|
self.emit_warning(&input.turn_id, warning.clone());
|
|
}
|
|
|
|
let selected_entries = collect_explicit_skill_mentions(&input.user_input, &catalog);
|
|
let mut fragments: Vec<Box<dyn ContextualUserFragment + Send>> = Vec::new();
|
|
if config.include_instructions {
|
|
let mut turn_catalog = catalog.clone();
|
|
turn_catalog
|
|
.entries
|
|
.retain(|entry| entry.authority.kind != SkillSourceKind::Executor);
|
|
if let Some(fragment) = available_skills_fragment(&turn_catalog) {
|
|
fragments.push(Box::new(fragment));
|
|
}
|
|
}
|
|
|
|
let mut warnings = catalog.warnings.clone();
|
|
let mut main_prompts_injected = false;
|
|
let mut injected_host_skill_prompts = InjectedHostSkillPrompts::default();
|
|
for entry in &selected_entries {
|
|
match self
|
|
.read_main_prompt(entry, host_loaded_skills.clone())
|
|
.await
|
|
{
|
|
Ok(read_result) => {
|
|
let (contents, truncated) =
|
|
truncate_main_prompt_contents(read_result.contents.as_str());
|
|
if truncated {
|
|
let warning = format!(
|
|
"Skill `{}` exceeded the main prompt context limit and was truncated.",
|
|
entry.name
|
|
);
|
|
self.emit_warning(&input.turn_id, warning.clone());
|
|
warnings.push(warning);
|
|
}
|
|
let injection = SkillInjection {
|
|
name: truncate_utf8_to_bytes(&entry.name, MAX_SKILL_NAME_BYTES).0,
|
|
path: truncate_utf8_to_bytes(
|
|
entry.rendered_path(),
|
|
MAX_SKILL_PATH_BYTES,
|
|
)
|
|
.0,
|
|
contents,
|
|
};
|
|
fragments.push(Box::new(SkillInstructions::from(&injection)));
|
|
main_prompts_injected = true;
|
|
if entry.authority.kind == SkillSourceKind::Host {
|
|
injected_host_skill_prompts.insert_path(entry.main_prompt.as_str());
|
|
}
|
|
}
|
|
Err(message) => {
|
|
let warning = format!("Failed to load skill `{}`: {message}", entry.name);
|
|
self.emit_warning(&input.turn_id, warning.clone());
|
|
warnings.push(warning);
|
|
}
|
|
}
|
|
}
|
|
|
|
if let Some(host_loaded_skills) = &host_loaded_skills {
|
|
for entry in selected_entries
|
|
.iter()
|
|
.filter(|entry| entry.authority.kind != SkillSourceKind::Host)
|
|
{
|
|
for host_skill in host_loaded_skills
|
|
.outcome()
|
|
.skills
|
|
.iter()
|
|
.filter(|host_skill| host_skill.name == entry.name)
|
|
{
|
|
injected_host_skill_prompts
|
|
.insert_path(host_skill.path_to_skills_md.to_string_lossy());
|
|
}
|
|
}
|
|
}
|
|
|
|
turn_store.insert(SkillsTurnState {
|
|
catalog,
|
|
selected_entries,
|
|
warnings,
|
|
main_prompts_injected,
|
|
});
|
|
if !injected_host_skill_prompts.is_empty() {
|
|
turn_store.insert(injected_host_skill_prompts);
|
|
}
|
|
|
|
fragments
|
|
})
|
|
}
|
|
}
|
|
|
|
impl SkillsExtension {
|
|
async fn read_main_prompt(
|
|
&self,
|
|
entry: &SkillCatalogEntry,
|
|
host_loaded_skills: Option<Arc<HostLoadedSkills>>,
|
|
) -> Result<SkillReadResult, String> {
|
|
self.providers
|
|
.read(SkillReadRequest {
|
|
authority: entry.authority.clone(),
|
|
package: entry.id.clone(),
|
|
resource: entry.main_prompt.clone(),
|
|
host: host_loaded_skills,
|
|
})
|
|
.await
|
|
.map_err(|err| err.message)
|
|
}
|
|
|
|
fn emit_warning(&self, turn_id: &str, message: String) {
|
|
self.event_sink.emit(Event {
|
|
id: turn_id.to_string(),
|
|
msg: EventMsg::Warning(WarningEvent { message }),
|
|
});
|
|
}
|
|
}
|
|
|
|
pub fn install(registry: &mut ExtensionRegistryBuilder<Config>) {
|
|
install_with_providers(
|
|
registry,
|
|
SkillProviders::new().with_host_provider(Arc::new(HostSkillProvider::new())),
|
|
);
|
|
}
|
|
|
|
pub fn install_with_providers(
|
|
registry: &mut ExtensionRegistryBuilder<Config>,
|
|
providers: SkillProviders,
|
|
) {
|
|
let extension = Arc::new(SkillsExtension {
|
|
providers,
|
|
event_sink: registry.event_sink(),
|
|
});
|
|
registry.thread_lifecycle_contributor(extension.clone());
|
|
registry.config_contributor(extension.clone());
|
|
registry.prompt_contributor(extension.clone());
|
|
registry.turn_input_contributor(extension);
|
|
}
|