Skip to content

Commit a3b51bd

Browse files
fix: preserve session trace parent during model compaction
2 parents d3b8333 + 7964d53 commit a3b51bd

4 files changed

Lines changed: 51 additions & 4 deletions

File tree

‎packages/codex/rust/lib.rs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,17 @@ impl NativeThread {
13771377

13781378
// Managed ingress: the SDK holds its single active owner until terminal
13791379
// settlement. Keep raw Compact blocked because it replaces active work.
1380-
fn _compact<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
1380+
#[pyo3(signature = (trace_json=None))]
1381+
fn _compact<'py>(
1382+
&self,
1383+
py: Python<'py>,
1384+
trace_json: Option<String>,
1385+
) -> PyResult<Bound<'py, PyAny>> {
1386+
let trace = trace_json
1387+
.as_deref()
1388+
.map(serde_json::from_str::<codex_protocol::protocol::W3cTraceContext>)
1389+
.transpose()
1390+
.map_err(|_| PyValueError::new_err("Invalid trace carrier"))?;
13811391
let inner = self.current()?;
13821392
async_bridge::future_into_py(py, async move {
13831393
let _context_operation = inner.engine.operation(false).map_err(py_error)?;
@@ -1395,7 +1405,7 @@ impl NativeThread {
13951405
} else {
13961406
let turn_id = inner
13971407
.thread
1398-
.submit(codex_protocol::protocol::Op::Compact)
1408+
.submit_with_trace(codex_protocol::protocol::Op::Compact, trace)
13991409
.await
14001410
.map_err(py_error)?;
14011411
serde_json::json!({"status": "started", "turn_id": turn_id})

‎src/agents/session.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4808,7 +4808,13 @@ async def _execute(
48084808
self._native_agents is not None and self._native_agents.before_step is not None,
48094809
)
48104810
if input is None:
4811-
receipt = json.loads(await self._native._compact())
4811+
receipt = json.loads(
4812+
await self._native._compact(
4813+
json.dumps(state.parent_trace.to_headers())
4814+
if state.parent_trace is not None
4815+
else None
4816+
)
4817+
)
48124818
else:
48134819
if self._environment_lease is not None and self._environment_lease.interrupted:
48144820
# Publication has settled; neither root nor continuation issued input.

‎tests/test_native_response_history.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ async def test_provider_completed_remains_visible_when_sdk_rejects_completion(
9696
with pytest.raises(NativeError, match="without complete supported output"):
9797
await handle.get_result()
9898
turns = [turn async for turn in session.turns()]
99-
assert turns[0]["status"] == "failed"
99+
# Early SDK failure may interrupt before Core delivers its error.
100+
assert turns[0]["status"] in {"failed", "cancelled"}
100101
assert turns[0]["responses"][0]["status"] == "completed"
101102
assert turns[0]["responses"][0]["usage_source"] == "received"
102103
assert len(responses.requests) == 1

‎tests/test_trace_context.py‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,17 @@ def test_native_graph_covers_queued_override_callback_and_cancellation(tmp_path:
215215
)
216216

217217

218+
def test_model_compaction_uses_session_parent_after_overridden_turn(tmp_path: Path) -> None:
219+
from examples.observability.trace_walkthrough import Collector
220+
221+
with Collector().serve() as collector:
222+
receipt = _run_case("compact", collector.url, tmp_path / "compact.json")
223+
spans = _spans(collector)
224+
_assert_parent(_dispatch(spans, receipt["first"]), OVERRIDE)
225+
_assert_parent(_dispatch(spans, receipt["compact"]), PARENT)
226+
_assert_parent(_dispatch(spans, receipt["after"]), PARENT)
227+
228+
218229
def test_fresh_process_manual_resume_uses_current_worker_parent(tmp_path: Path) -> None:
219230
from examples.observability.trace_walkthrough import Collector
220231

@@ -276,6 +287,8 @@ async def _native_case(case: str, collector: str, output: str) -> None:
276287
try:
277288
if case == "graph":
278289
receipt = await _graph_case()
290+
elif case == "compact":
291+
receipt = await _compact_case()
279292
elif case == "unsupported":
280293
receipt = await _unsupported_case()
281294
else:
@@ -285,6 +298,23 @@ async def _native_case(case: str, collector: str, output: str) -> None:
285298
Path(output).write_text(json.dumps(receipt))
286299

287300

301+
async def _compact_case() -> dict[str, Any]:
302+
async with ScriptedResponses(
303+
[text("before")], [text("Remember the synthetic label.")], [text("after")]
304+
) as peer:
305+
agent = Agent(instructions="Remember the synthetic label.", provider=peer.provider)
306+
async with agent.session(parent_trace={"traceparent": PARENT}) as session:
307+
first = await session.submit("before", parent_trace={"traceparent": OVERRIDE})
308+
assert (await first.get_result()).final_output == "before"
309+
assert await session.compact() is None
310+
after = await session.submit("after")
311+
assert (await after.get_result()).final_output == "after"
312+
turns = [turn async for turn in session.turns()]
313+
assert len(turns) == 3
314+
assert len(peer.requests) == 3
315+
return {"first": first.turn_id, "compact": turns[1]["id"], "after": after.turn_id}
316+
317+
288318
async def _unsupported_case() -> dict[str, Any]:
289319
from agents import Session
290320

0 commit comments

Comments
 (0)