Skip to content

CubeLoop — a Pythonic, async-native agent harness core designed for high performance, readability, and production-grade persistence.

fix(deferred): restore expanded_schemas on cross-run replay

xf gong6630451c7b1b
diff --git a/cubepi/deferred/middleware.py b/cubepi/deferred/middleware.py
index f2d6e7f..7cc07a9 100644
--- a/cubepi/deferred/middleware.py
+++ b/cubepi/deferred/middleware.py
@@ -42,6 +42,7 @@ class ResumedState:
pre_loaded_tools: list[AgentTool]
remaining_groups: list[DeferredToolGroup]
+ expanded_schemas: list[tuple[str, list[ToolSchema]]]
class DeferredToolsMiddleware(Middleware):
@@ -57,6 +58,7 @@ class DeferredToolsMiddleware(Middleware):
groups: list[DeferredToolGroup],
extra_ref: Callable[[], dict[str, Any]],
catalog_header: str = DEFAULT_CATALOG_HEADER,
+ resumed_schemas: list[tuple[str, list[ToolSchema]]] | None = None,
) -> None:
self._groups: dict[str, DeferredToolGroup] = {
g.group_id: g for g in groups
@@ -67,7 +69,9 @@ class DeferredToolsMiddleware(Middleware):
# Loader called exactly once per group per run.
self._loader_cache: dict[str, list[AgentTool]] = {}
# Append-only, expansion order for cache stability.
- self._expanded_schemas: list[tuple[str, list[ToolSchema]]] = []
+ self._expanded_schemas: list[tuple[str, list[ToolSchema]]] = (
+ list(resumed_schemas) if resumed_schemas else []
+ )
# Staging area: expand_callback queues, after_tool_call drains.
self._pending_injection: list[AgentTool] = []
@@ -296,6 +300,7 @@ class DeferredToolsMiddleware(Middleware):
"""
pre_loaded: list[AgentTool] = []
remaining: list[DeferredToolGroup] = []
+ schemas: list[tuple[str, list[ToolSchema]]] = []
for group in groups:
exp = expanded.get(group.group_id)
@@ -308,14 +313,23 @@ class DeferredToolsMiddleware(Middleware):
if exp is None:
# Fully expanded (None sentinel) — load all, drop from remaining.
pre_loaded.extend(loaded)
+ schemas.append((
+ group.group_id,
+ [t.to_definition().model_dump() for t in loaded],
+ ))
else:
# Partially expanded — load selected, keep in remaining.
name_set = set(exp)
selected = [t for t in loaded if t.name in name_set]
pre_loaded.extend(selected)
+ schemas.append((
+ group.group_id,
+ [t.to_definition().model_dump() for t in selected],
+ ))
remaining.append(group)
return ResumedState(
pre_loaded_tools=pre_loaded,
remaining_groups=remaining,
+ expanded_schemas=schemas,
)
diff --git a/tests/deferred/test_middleware.py b/tests/deferred/test_middleware.py
index 1c5b331..faaa347 100644
--- a/tests/deferred/test_middleware.py
+++ b/tests/deferred/test_middleware.py
@@ -243,6 +243,9 @@ class TestPrepareResumedState:
)
assert len(resumed.pre_loaded_tools) == 2
assert len(resumed.remaining_groups) == 0
+ assert len(resumed.expanded_schemas) == 1
+ assert resumed.expanded_schemas[0][0] == "mcp:github"
+ assert len(resumed.expanded_schemas[0][1]) == 2
async def test_partially_expanded_group(self) -> None:
group = _make_group("mcp:github", ["t1", "t2", "t3"])
@@ -253,6 +256,8 @@ class TestPrepareResumedState:
assert len(resumed.pre_loaded_tools) == 1
assert resumed.pre_loaded_tools[0].name == "t1"
assert len(resumed.remaining_groups) == 1
+ assert len(resumed.expanded_schemas) == 1
+ assert len(resumed.expanded_schemas[0][1]) == 1
async def test_unexpanded_group_stays_deferred(self) -> None:
group = _make_group("mcp:github", ["t1"])
@@ -262,3 +267,31 @@ class TestPrepareResumedState:
)
assert len(resumed.pre_loaded_tools) == 0
assert len(resumed.remaining_groups) == 1
+ assert len(resumed.expanded_schemas) == 0
+
+ async def test_resumed_schemas_seed_middleware(self) -> None:
+ group_a = _make_group("mcp:github", ["t1", "t2"])
+ group_b = _make_group("mcp:slack", ["s1"])
+ expanded: dict[str, list[str] | None] = {
+ "mcp:github": None,
+ "mcp:slack": ["s1"],
+ }
+ resumed = await DeferredToolsMiddleware.prepare_resumed_state(
+ groups=[group_a, group_b], expanded=expanded,
+ )
+ extra: dict[str, object] = {"expanded_groups": dict(expanded)}
+ mw = DeferredToolsMiddleware(
+ groups=resumed.remaining_groups,
+ extra_ref=lambda: extra,
+ resumed_schemas=resumed.expanded_schemas,
+ )
+ ctx = AgentContext(
+ system_prompt="base",
+ messages=[],
+ tools=list(mw.tools) + resumed.pre_loaded_tools,
+ extra=extra,
+ )
+ prompt = await mw.transform_system_prompt("base", ctx=ctx)
+ assert "mcp:github" in prompt
+ assert "mcp:slack" in prompt
+ assert "t1" in prompt