mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Track source attribution for individual context parts (#52195)
## What changed - Add `ContentItemMetadata` to distinguish user input, developer instructions, `AGENTS.md`, skills, harness context, and tool-supplied context independently of message role and content classification. - Keep attribution attached to content through prompt assembly, history processing, and hook-output spilling. Distinguish command hooks from MCP hooks and retain tool namespaces when known. - Treat missing historical attribution as unknown and send per-content metadata only to Responses Lite. ## Testing Update request and history assertions to cover attribution persistence and Responses Lite metadata handling. GitOrigin-RevId: 24e56005f5bdb98bf82f2b3943f29c4c81f3d587
This commit is contained in:
@@ -43,7 +43,6 @@ use super::dispatcher::hook_handler_type_label;
|
||||
use super::dispatcher::hook_scope_label;
|
||||
use super::dispatcher::hook_source_label;
|
||||
use super::dispatcher::scope_for_event;
|
||||
use crate::output_spill::AdditionalContext;
|
||||
use crate::output_spill::HookOutputSpiller;
|
||||
use codex_protocol::ThreadId;
|
||||
use codex_protocol::protocol::HookCompletedEvent;
|
||||
@@ -141,21 +140,17 @@ impl CommandHookRuntime {
|
||||
for entry in std::mem::take(&mut hook_result.run.entries) {
|
||||
match entry.kind {
|
||||
HookOutputEntryKind::Context => {
|
||||
if let Some(text) = runtime
|
||||
let text = runtime
|
||||
.output_spiller
|
||||
.maybe_spill_additional_contexts(vec![AdditionalContext {
|
||||
text: entry.text,
|
||||
limit: handler.additional_context_limit,
|
||||
}])
|
||||
.await
|
||||
.into_iter()
|
||||
.next()
|
||||
{
|
||||
entries.push(HookOutputEntry {
|
||||
kind: HookOutputEntryKind::Context,
|
||||
text,
|
||||
});
|
||||
}
|
||||
.maybe_spill_text_with_limit(
|
||||
entry.text,
|
||||
handler.additional_context_limit,
|
||||
)
|
||||
.await;
|
||||
entries.push(HookOutputEntry {
|
||||
kind: HookOutputEntryKind::Context,
|
||||
text,
|
||||
});
|
||||
}
|
||||
HookOutputEntryKind::Warning => warnings.push(entry),
|
||||
HookOutputEntryKind::Error => entries.push(entry),
|
||||
@@ -371,6 +366,7 @@ fn finish_command_run(
|
||||
) -> HandlerRunResult {
|
||||
Span::current().record("hook.command_outcome", completion.outcome);
|
||||
HandlerRunResult {
|
||||
context_metadata: codex_protocol::models::ContentItemMetadata::command_hook(),
|
||||
started_at,
|
||||
completed_at: chrono::Utc::now().timestamp(),
|
||||
duration_ms: started.elapsed().as_millis().try_into().unwrap_or(i64::MAX),
|
||||
|
||||
Reference in New Issue
Block a user