pakrym-oai c4b434aae2 Preserve context annotations in merged messages (#40184) ...

## What changed

- Carry each contextual fragment's `ContentItemKind` through initial context assembly and world-state updates.
- Attach the classifications to merged response messages through `content_item_kinds`, preserving their order alongside the message content.
- Convert extension prompt fragments into annotated developer fragments and classify built-in developer and guardian instructions.

## Testing

- Add an integration test covering roles and content annotations in the first request.
- Update world-state and persisted-history tests to account for annotation metadata.

GitOrigin-RevId: 71c48dad5b17bffd47ba03263e3eb6d5e74fbf4b

2026-08-23 04:41:11 +00:00

..

snapshots

Include context window IDs in response metadata (#39847)

2026-08-21 03:31:56 +00:00

abort_tasks.rs

Add unfinished root turn suspension (#40038)

2026-08-22 00:42:19 +00:00

additional_context.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

agent_execution.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

agent_websocket.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

agents_md.rs

Ignore project instructions for untrusted projects (#39837)

2026-08-21 02:33:50 +00:00

apply_patch_cli.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

apply_patch_serialization.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

approvals.rs

Honor granular sandbox approvals in unified exec (#40024)

2026-08-21 21:54:40 +00:00

audio_truncation.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

auto_review.rs

Route escalated commands through synchronous Guardian review (#40005)

2026-08-21 20:45:42 +00:00

catalog_permission_messages.rs

Source Guardian v2 defaults from the model catalog (#38990)

2026-08-17 11:44:56 +00:00

cli_stream.rs

Update models.json (#31684)

2026-07-09 03:40:08 +00:00

client_websockets.rs

Keep credentials out of app-server logs (#39993)

2026-08-21 19:04:32 +00:00

client.rs

Keep credentials out of app-server logs (#39993)

2026-08-21 19:04:32 +00:00

cloud_config.rs

Preserve managed deny-read rules across permission updates (#40004)

2026-08-21 20:15:23 +00:00

code_mode_elicitation.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

code_mode.rs

Consolidate code mode output helper tests (#39969)

2026-08-21 16:50:34 +00:00

codex_delegate.rs

Harden unsandboxed patch filesystem access (#39659)

2026-08-20 08:10:08 +00:00

collaboration_instructions.rs

Refresh collaboration instructions when their content changes (#39163)

2026-08-18 07:32:03 +00:00

compact_remote_parity.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

compact_remote.rs

Include context window IDs in response metadata (#39847)

2026-08-21 03:31:56 +00:00

compact_resume_fork.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

compact.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

context_annotations.rs

Preserve context annotations in merged messages (#40184)

2026-08-23 04:41:11 +00:00

current_time_reminder.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

cyber_exec_policy.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

deprecation_notice.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

exec_policy.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

exec.rs

Add network environment ID plumbing (#28766)

2026-06-18 14:09:38 +02:00

extension_sandbox.rs

Preserve filesystem permission path conventions (#39084)

2026-08-17 21:49:30 +00:00

external_auth.rs

Keep credentials out of app-server logs (#39993)

2026-08-21 19:04:32 +00:00

fork_thread.rs

Separate thread settings from environment configuration (#39597)

2026-08-20 05:29:12 +00:00

git_enrichment.rs

Synchronize concurrent Git enrichment test explicitly (#40011)

2026-08-21 21:12:43 +00:00

guardian_mcp_elicitation.rs

Cancel Guardian reviews with their tool calls (#40021)

2026-08-21 21:51:12 +00:00

guardian_review_cancellation.rs

Cancel Guardian reviews with their tool calls (#40021)

2026-08-21 21:51:12 +00:00

guardian_review.rs

Route escalated commands through synchronous Guardian review (#40005)

2026-08-21 20:45:42 +00:00

guardian_subagent_authorization.rs

Reuse Guardian reviews in async risk scoring (#40013)

2026-08-21 21:22:35 +00:00

hooks_executor.rs

Add end-to-end tests for executor Stop hooks (#40020)

2026-08-21 21:45:26 +00:00

hooks_mcp.rs

Enable MCP tool hooks in Codex sessions (#39296)

2026-08-18 22:10:43 +00:00

hooks.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

image_rollout.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

injected_models_cache.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

items.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

json_result.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

live_cli.rs

[codex] Use expect in integration tests (#28441)

2026-06-15 21:53:47 -07:00

mcp_auth_elicitation.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

mcp_auth_refresh.rs

Preserve executor context for MCP stop hooks (#40012)

2026-08-21 21:17:42 +00:00

mcp_refresh_cleanup.rs

Negotiate MCP extensions per app-server session (#36910)

2026-08-04 15:23:43 +00:00

mcp_startup_refresh_http_proxy.rs

Harden unsandboxed patch filesystem access (#39659)

2026-08-20 08:10:08 +00:00

mcp_tool_cache.rs

Report runtime MCP connection status (#40068)

2026-08-22 05:54:43 +00:00

mcp_tool_exposure.rs

Enforce environment MCP policies (#39335)

2026-08-19 01:26:16 +00:00

mcp_turn_metadata.rs

Refresh bundled model definitions (#39770)

2026-08-20 18:17:28 +00:00

mod.rs

Preserve context annotations in merged messages (#40184)

2026-08-23 04:41:11 +00:00

model_overrides.rs

[5 of 7] Replace OverrideTurnContext with ThreadSettings (#22508)

2026-05-18 21:03:51 -07:00

model_runtime_selectors.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

model_switching.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

model_visible_layout.rs

Add a configurable skill catalog token budget (#38978)

2026-08-17 10:01:59 +00:00

models_cache_ttl.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

models_etag_responses.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

multi_agent_mode.rs

Source multi-agent instructions from the model catalog (#38619)

2026-08-14 18:26:20 +00:00

multi_agent_resume.rs

Wait for turn completion events in multi-agent resume tests (#39702)

2026-08-20 11:57:32 +00:00

multi_exec_server_sandbox.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

network_approval.rs

Enforce environment network policies for remote execution (#39980)

2026-08-21 17:29:41 +00:00

openai_file_mcp.rs

Harden unsandboxed patch filesystem access (#39659)

2026-08-20 08:10:08 +00:00

otel.rs

Make tool-result telemetry limits configurable (#39779)

2026-08-20 19:09:04 +00:00

override_updates.rs

Pair thread environment settings (#26687)

2026-06-08 13:55:15 -07:00

pending_input.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

permissions_messages.rs

Source Guardian v2 defaults from the model catalog (#38990)

2026-08-17 11:44:56 +00:00

personality.rs

Source Guardian v2 defaults from the model catalog (#38990)

2026-08-17 11:44:56 +00:00

plugins.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

prompt_cache_key.rs

Use session IDs for prompt cache keys (#33035)

2026-07-14 10:37:23 +00:00

prompt_caching.rs

Enable unified exec by default on Windows (#38625)

2026-08-14 19:07:15 +00:00

prompt_debug_tests.rs

Enable git attribution across Codex entry points (#34819)

2026-07-22 20:23:35 +00:00

quota_exceeded.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

realtime_conversation.rs

Support attaching to existing realtime calls (#39876)

2026-08-21 06:41:28 +00:00

realtime_initial_items.rs

Add a realtime delegation acknowledgement control (#36413)

2026-08-01 01:17:26 +00:00

remote_env.rs

Enforce environment network policies for remote execution (#39980)

2026-08-21 17:29:41 +00:00

remote_models.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

request_compression.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

request_permissions_tool.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

request_permissions.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

request_plugin_install.rs

Include suggestion IDs in plugin install metadata (#39765)

2026-08-20 17:54:42 +00:00

request_user_input.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

responses_api_proxy_headers.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

responses_lite.rs

Keep credentials out of app-server logs (#39993)

2026-08-21 19:04:32 +00:00

responses_system_proxy.rs

Migrate login HTTP construction to HttpClient (#34643)

2026-07-22 00:50:28 +00:00

resume_warning.rs

Persist active permission profiles in turn context (#39145)

2026-08-18 05:46:08 +00:00

resume.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

retry_after.rs

Add structured telemetry for response retries (#38452)

2026-08-13 23:13:37 +00:00

review.rs

Harden unsandboxed patch filesystem access (#39659)

2026-08-20 08:10:08 +00:00

rmcp_client.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

rollout_budget.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

rollout_list_find.rs

Honor the configured SQLite home across state consumers (#34994)

2026-07-23 19:19:35 +00:00

safety_buffering.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

safety_check_downgrade.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

search_tool.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

send_user_message_async.rs

Keep async user messages on the direct tool surface (#39601)

2026-08-20 05:42:20 +00:00

shell_snapshot.rs

Add in-memory shell snapshots to unified exec (#39957)

2026-08-21 15:24:56 +00:00

skill_approval.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

skills_extension.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

skills.rs

Harden unsandboxed patch filesystem access (#39659)

2026-08-20 08:10:08 +00:00

spawn_agent_description.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

sqlite_state.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

stream_error_allows_next_turn.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

stream_no_completed.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

subagent_notifications.rs

Sanitize developer context in full-history agent forks (#39641)

2026-08-20 07:29:43 +00:00

token_budget.rs

Include context window IDs in response metadata (#39847)

2026-08-21 03:31:56 +00:00

tool_harness.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

tool_lifecycle.rs

Support standalone named function call outputs (#39782)

2026-08-20 19:19:41 +00:00

tool_parallelism.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

tools.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

truncation.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

turn_input_submission.rs

Centralize thread environment selection state (#38423)

2026-08-13 19:25:05 +00:00

turn_state.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

unified_exec_process_events.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

unified_exec_zsh_fork_approvals.rs

Deduplicate zsh fork test setup (#39790)

2026-08-20 19:43:54 +00:00

unified_exec.rs

Bound unified exec output delta frames (#39937)

2026-08-21 14:04:33 +00:00

unstable_features_warning.rs

Extract persisted history types into a dedicated crate (#37871)

2026-08-10 19:26:52 +00:00

user_notification.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

user_shell_cmd.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

view_image.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

web_search.rs

Add an Amazon Bedrock Runtime provider (#38470)

2026-08-14 01:23:59 +00:00

websocket_fallback.rs

Unify turn input submission and routing (#38275)

2026-08-13 00:00:16 +00:00

window_headers.rs

Include context window IDs in response metadata (#39847)

2026-08-21 03:31:56 +00:00

windows_sandbox.rs

Standardize shell execution on unified exec (#39757)

2026-08-20 17:46:05 +00:00

workspace_roots.rs

Standardize shell execution on unified exec (#39772)

2026-08-20 18:29:35 +00:00

worktree_trust.rs

Validate linked worktrees before inheriting project trust (#39616)

2026-08-20 06:29:32 +00:00