diff --git a/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__tools__tests__snapshots_description_truncation.snap b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__tools__tests__snapshots_description_truncation.snap
new file mode 100644
index 0000000000..8412689aec
--- /dev/null
+++ b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__tools__tests__snapshots_description_truncation.snap
@@ -0,0 +1,28 @@
+---
+source: core/src/context/world_state/tools_tests.rs
+expression: "render_section_cases(&[(PreviousSectionState::Absent,\nPreviousSectionState::Known(&tools),)])"
+---
+Absent -> {"project_00_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_01_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_02_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_03_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_04_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_05_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_06_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_07_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_08_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_09_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_10_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_11_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_12_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_13_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_14_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_15_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_16_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_17_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_18_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up.","project_19_documents":"Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their contents, and organize results into collections for follow-up."} (role - developer)
+
+Deferred tool namespaces:
+- project_00_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_01_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_02_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_03_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_04_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_05_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_06_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_07_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_08_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_09_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_10_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_11_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_12_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_13_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their cont...
+- project_14_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their con...
+- project_15_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their con...
+- project_16_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their con...
+- project_17_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their con...
+- project_18_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their con...
+- project_19_documents: Search project documents by title, owner, date, or status. Read matching documents with their summaries, source links, and recent activity. Create documents, update their con...
+
diff --git a/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__tools__tests__snapshots_namespace_omission.snap b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__tools__tests__snapshots_namespace_omission.snap
new file mode 100644
index 0000000000..4644f334a6
--- /dev/null
+++ b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__tools__tests__snapshots_namespace_omission.snap
@@ -0,0 +1,74 @@
+---
+source: core/src/context/world_state/tools_tests.rs
+expression: "render_section_cases(&[(PreviousSectionState::Absent,\nPreviousSectionState::Known(&tools),)])"
+---
+Absent -> {"mcp__codex_apps__workspace_00_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_01_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_02_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_03_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_04_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_05_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_06_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_07_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_08_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_09_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_10_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_11_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_12_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_13_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_14_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_15_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_16_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_17_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_18_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_19_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_20_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_21_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_22_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_23_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_24_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_25_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_26_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_27_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_28_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_29_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_30_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_31_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_32_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_33_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_34_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_35_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_36_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_37_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_38_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_39_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_40_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_41_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_42_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_43_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_44_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_45_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_46_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_47_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_48_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_49_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_50_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_51_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_52_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_53_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_54_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_55_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_56_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_57_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_58_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_59_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_60_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_61_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_62_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_63_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_64_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_65_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_66_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_67_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_68_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_69_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_70_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_71_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_72_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_73_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_74_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_75_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_76_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_77_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_78_project_documents_and_search":"Search project documents.","mcp__codex_apps__workspace_79_project_documents_and_search":"Search project documents."} (role - developer)
+
+Deferred tool namespaces:
+- mcp__codex_apps__workspace_00_project_documents_and_search
+- mcp__codex_apps__workspace_01_project_documents_and_search
+- mcp__codex_apps__workspace_02_project_documents_and_search
+- mcp__codex_apps__workspace_03_project_documents_and_search
+- mcp__codex_apps__workspace_04_project_documents_and_search
+- mcp__codex_apps__workspace_05_project_documents_and_search
+- mcp__codex_apps__workspace_06_project_documents_and_search
+- mcp__codex_apps__workspace_07_project_documents_and_search
+- mcp__codex_apps__workspace_08_project_documents_and_search
+- mcp__codex_apps__workspace_09_project_documents_and_search
+- mcp__codex_apps__workspace_10_project_documents_and_search
+- mcp__codex_apps__workspace_11_project_documents_and_search
+- mcp__codex_apps__workspace_12_project_documents_and_search
+- mcp__codex_apps__workspace_13_project_documents_and_search
+- mcp__codex_apps__workspace_14_project_documents_and_search
+- mcp__codex_apps__workspace_15_project_documents_and_search
+- mcp__codex_apps__workspace_16_project_documents_and_search
+- mcp__codex_apps__workspace_17_project_documents_and_search
+- mcp__codex_apps__workspace_18_project_documents_and_search
+- mcp__codex_apps__workspace_19_project_documents_and_search
+- mcp__codex_apps__workspace_20_project_documents_and_search
+- mcp__codex_apps__workspace_21_project_documents_and_search
+- mcp__codex_apps__workspace_22_project_documents_and_search
+- mcp__codex_apps__workspace_23_project_documents_and_search
+- mcp__codex_apps__workspace_24_project_documents_and_search
+- mcp__codex_apps__workspace_25_project_documents_and_search
+- mcp__codex_apps__workspace_26_project_documents_and_search
+- mcp__codex_apps__workspace_27_project_documents_and_search
+- mcp__codex_apps__workspace_28_project_documents_and_search
+- mcp__codex_apps__workspace_29_project_documents_and_search
+- mcp__codex_apps__workspace_30_project_documents_and_search
+- mcp__codex_apps__workspace_31_project_documents_and_search
+- mcp__codex_apps__workspace_32_project_documents_and_search
+- mcp__codex_apps__workspace_33_project_documents_and_search
+- mcp__codex_apps__workspace_34_project_documents_and_search
+- mcp__codex_apps__workspace_35_project_documents_and_search
+- mcp__codex_apps__workspace_36_project_documents_and_search
+- mcp__codex_apps__workspace_37_project_documents_and_search
+- mcp__codex_apps__workspace_38_project_documents_and_search
+- mcp__codex_apps__workspace_39_project_documents_and_search
+- mcp__codex_apps__workspace_40_project_documents_and_search
+- mcp__codex_apps__workspace_41_project_documents_and_search
+- mcp__codex_apps__workspace_42_project_documents_and_search
+- mcp__codex_apps__workspace_43_project_documents_and_search
+- mcp__codex_apps__workspace_44_project_documents_and_search
+- mcp__codex_apps__workspace_45_project_documents_and_search
+- mcp__codex_apps__workspace_46_project_documents_and_search
+- mcp__codex_apps__workspace_47_project_documents_and_search
+- mcp__codex_apps__workspace_48_project_documents_and_search
+- mcp__codex_apps__workspace_49_project_documents_and_search
+- mcp__codex_apps__workspace_50_project_documents_and_search
+- mcp__codex_apps__workspace_51_project_documents_and_search
+- mcp__codex_apps__workspace_52_project_documents_and_search
+- mcp__codex_apps__workspace_53_project_documents_and_search
+- mcp__codex_apps__workspace_54_project_documents_and_search
+- mcp__codex_apps__workspace_55_project_documents_and_search
+- mcp__codex_apps__workspace_56_project_documents_and_search
+- mcp__codex_apps__workspace_57_project_documents_and_search
+- mcp__codex_apps__workspace_58_project_documents_and_search
+- mcp__codex_apps__workspace_59_project_documents_and_search
+- mcp__codex_apps__workspace_60_project_documents_and_search
+- mcp__codex_apps__workspace_61_project_documents_and_search
+- mcp__codex_apps__workspace_62_project_documents_and_search
+- mcp__codex_apps__workspace_63_project_documents_and_search
+- mcp__codex_apps__workspace_64_project_documents_and_search
+... 15 additional namespaces omitted.
+
diff --git a/codex-rs/core/src/context/world_state/tools.rs b/codex-rs/core/src/context/world_state/tools.rs
index 2751d3fe1d..7d206b9a03 100644
--- a/codex-rs/core/src/context/world_state/tools.rs
+++ b/codex-rs/core/src/context/world_state/tools.rs
@@ -1,8 +1,12 @@
+//! Bounded deferred namespace summaries that reserve names before descriptions.
+//! Rendering allocations do not change the persisted namespace snapshot.
+
+use self::budget::DESCRIPTION_TRUNCATION_SUFFIX;
+use self::budget::truncate_namespace_rows;
use super::PreviousSectionState;
use super::WorldStateContextFragment;
use super::WorldStateSection;
use crate::context::ContextualUserFragment;
-use crate::context::environment_context::push_xml_escaped_text;
use codex_extension_api::ExtensionMetrics;
use codex_extension_api::RenderedWorldStateFragment;
use codex_otel::CONTEXT_FRAGMENT_BYTES_BUCKETS;
@@ -14,6 +18,9 @@ use codex_protocol::protocol::TOOLS_OPEN_TAG;
use std::collections::BTreeMap;
use std::sync::Arc;
+#[path = "tools_budget.rs"]
+mod budget;
+
const MAX_RENDERED_FRAGMENT_BYTES: usize = 4 * 1024;
const MAX_NAMESPACE_DESCRIPTION_CHARS: usize = 250;
const OMITTED_LINE_RESERVE_BYTES: usize = 64;
@@ -44,14 +51,27 @@ impl ToolsState {
deferred_namespaces: deferred_namespaces
.into_iter()
.map(|(namespace, description)| {
- let description = description
+ let mut characters = description
.lines()
.next()
.unwrap_or_default()
.trim()
- .chars()
+ .chars();
+ let mut description = characters
+ .by_ref()
.take(MAX_NAMESPACE_DESCRIPTION_CHARS)
- .collect();
+ .collect::();
+ if characters.next().is_some() {
+ let prefix_bytes = description
+ .char_indices()
+ .nth(
+ MAX_NAMESPACE_DESCRIPTION_CHARS
+ - DESCRIPTION_TRUNCATION_SUFFIX.len(),
+ )
+ .map_or(description.len(), |(index, _)| index);
+ description.truncate(prefix_bytes);
+ description.push_str(DESCRIPTION_TRUNCATION_SUFFIX);
+ }
(namespace, description)
})
.collect(),
@@ -141,10 +161,17 @@ fn render_namespace_groups(
+ groups
.iter()
.filter(|(_, namespaces)| !namespaces.is_empty())
- .map(|(label, _)| label.len() + ":\n".len() + OMITTED_LINE_RESERVE_BYTES)
+ .map(|(label, _)| label.len() + ":\n".len())
.sum::()
+ empty_state.map_or(0, str::len);
- let mut remaining_entry_bytes = body_budget.saturating_sub(fixed_bytes);
+ let entry_budget = body_budget.saturating_sub(fixed_bytes);
+ let omission_reserve_bytes = groups
+ .iter()
+ .filter(|(_, namespaces)| !namespaces.is_empty())
+ .count()
+ * OMITTED_LINE_RESERVE_BYTES;
+ let mut entries =
+ truncate_namespace_rows(groups, entry_budget, omission_reserve_bytes).into_iter();
let mut rendered = "\n".to_string();
let mut before = FragmentSize {
namespaces: 0,
@@ -161,11 +188,12 @@ fn render_namespace_groups(
before.namespaces += namespaces.len();
before.bytes += label.len() + ":\n".len();
let mut omitted = 0usize;
- for (namespace, description) in *namespaces {
- let entry = rendered_namespace(namespace, description);
- before.bytes += entry.len();
- if entry.len() <= remaining_entry_bytes {
- remaining_entry_bytes -= entry.len();
+ for ((namespace, description), entry) in namespaces.iter().zip(entries.by_ref()) {
+ before.bytes += "- ".len() + namespace.len() + "\n".len();
+ if !description.is_empty() {
+ before.bytes += ": ".len() + description.len();
+ }
+ if let Some(entry) = entry {
rendered.push_str(&entry);
} else {
omitted += 1;
@@ -191,17 +219,6 @@ fn render_namespace_groups(
}
}
-fn rendered_namespace(namespace: &str, description: &str) -> String {
- let mut rendered = "- ".to_string();
- push_xml_escaped_text(&mut rendered, namespace);
- if !description.is_empty() {
- rendered.push_str(": ");
- push_xml_escaped_text(&mut rendered, description);
- }
- rendered.push('\n');
- rendered
-}
-
// Measures the rendered namespace block before/after the byte cap, after description normalization.
fn record_fragment_metrics(
metrics: &dyn ExtensionMetrics,
diff --git a/codex-rs/core/src/context/world_state/tools_budget.rs b/codex-rs/core/src/context/world_state/tools_budget.rs
new file mode 100644
index 0000000000..f645406db9
--- /dev/null
+++ b/codex-rs/core/src/context/world_state/tools_budget.rs
@@ -0,0 +1,117 @@
+//! Truncates borrowed namespace text within a shared byte budget.
+//! Character iterators preserve UTF-8 boundaries and stable input order without
+//! per-character tables. Callers account for headings and format omission notices.
+
+use std::collections::BTreeMap;
+use std::collections::VecDeque;
+
+pub(super) const DESCRIPTION_TRUNCATION_SUFFIX: &str = "...";
+
+/// Returns complete rows in group order, with `None` for omitted names.
+/// The budget excludes headings; omission space is charged only when names overflow.
+pub(super) fn truncate_namespace_rows(
+ groups: &[(&str, &BTreeMap)],
+ byte_budget: usize,
+ omission_reserve_bytes: usize,
+) -> Vec