diff --git a/src/harness/tool_calling/mod.rs b/src/harness/tool_calling/mod.rs
index 70105007..dcf8f274 100644
--- a/src/harness/tool_calling/mod.rs
+++ b/src/harness/tool_calling/mod.rs
@@ -41,7 +41,15 @@
 pub(crate) mod parse;
 pub(crate) mod pformat;
 
-pub use parse::{ParsedToolCall, parse_tool_calls, parse_tool_calls_with_pformat};
+// The two entry points, plus the building blocks a host legitimately reaches
+// for on its own. `extract_json_values` in particular is not a test helper:
+// pulling the first JSON object out of model prose is how a host checks a
+// required-output contract, which has nothing to do with tool calls.
+pub use parse::{
+    ParsedToolCall, extract_json_values, parse_arguments_value, parse_glm_style_tool_calls,
+    parse_tool_call_value, parse_tool_calls, parse_tool_calls_from_json_value,
+    parse_tool_calls_with_pformat,
+};
 pub use pformat::{
     PFormatParamType, PFormatRegistry, PFormatToolParams, build_registry, parse_call,
     render_signature, render_signature_from_schema,
diff --git a/src/harness/tool_calling/parse.rs b/src/harness/tool_calling/parse.rs
index a74c8e08..ca3d7aac 100644
--- a/src/harness/tool_calling/parse.rs
+++ b/src/harness/tool_calling/parse.rs
@@ -42,7 +42,13 @@ fn first_args_by_keys(obj: &serde_json::Value) -> serde_json::Value {
     parse_arguments_value(None)
 }
 
-#[cfg(test)]
+/// Parse a single JSON value as a tool call, honouring the argument-key
+/// aliases.
+///
+/// The permissive entry point: callers reach a value through an explicit
+/// tool-call marker (a `tool_calls` array, a `<tool_call>` tag, a fenced
+/// block), which is what licenses the aliases. Do not use it on arbitrary
+/// model output — see the module docs.
 pub fn parse_tool_call_value(value: &serde_json::Value) -> Option<ParsedToolCall> {
     // Default to the permissive (tagged) behaviour: callers that reach a
     // value through an explicit tool-call marker (`tool_calls` array,
diff --git a/src/harness/tool_calling/pformat.rs b/src/harness/tool_calling/pformat.rs
index e7ccb5ff..dbd81fb5 100644
--- a/src/harness/tool_calling/pformat.rs
+++ b/src/harness/tool_calling/pformat.rs
@@ -150,14 +150,19 @@ pub type PFormatRegistry = HashMap<String, PFormatToolParams>;
 /// type is its own vocabulary, and requiring it here would make this module
 /// depend on the very thing it exists to stay independent of. Hosts keep a
 /// one-line adapter over their own tool slice.
-pub fn build_registry<'a, I, N>(tools: I) -> PFormatRegistry
+///
+/// The schema is `Borrow<Value>` rather than `&Value` so a host whose tool
+/// trait *returns* a schema by value — the common shape — can map straight
+/// into this without collecting into a temporary first.
+pub fn build_registry<I, N, S>(tools: I) -> PFormatRegistry
 where
-    I: IntoIterator<Item = (N, &'a Value)>,
+    I: IntoIterator<Item = (N, S)>,
     N: Into<String>,
+    S: std::borrow::Borrow<Value>,
 {
     tools
         .into_iter()
-        .map(|(name, schema)| (name.into(), PFormatToolParams::from_schema(schema)))
+        .map(|(name, schema)| (name.into(), PFormatToolParams::from_schema(schema.borrow())))
         .collect()
 }