Skip to content

Commit 4bb3ad9

Browse files
Python: Forget prompt load state on remote identity change
Track prompts reused with the same remote name during refresh and clear progressive-load state for every other previously loaded prompt, so a replacement that normalizes to the same local name (a/b -> a-b) starts unloaded. Mirrors the tool refresh logic. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 05d0a0f commit 4bb3ad9

2 files changed

Lines changed: 30 additions & 3 deletions

File tree

‎python/packages/core/agent_framework/_mcp.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,6 +2457,7 @@ async def _load_prompts_locked(self) -> None:
24572457
else:
24582458
existing_names.add(func.name)
24592459
prompt_functions: list[FunctionTool] = []
2460+
reused_prompt_names: set[str] = set()
24602461
new_functions: list[FunctionTool] = []
24612462

24622463
params: types.PaginatedRequestParams | None = None
@@ -2531,6 +2532,7 @@ async def _load_prompts_locked(self) -> None:
25312532
):
25322533
# Keep the unchanged prompt function so local customizations survive a refresh.
25332534
prompt_functions.append(existing_prompt)
2535+
reused_prompt_names.add(local_name)
25342536
continue
25352537
prompt_functions.append(func)
25362538
new_functions.append(func)
@@ -2547,9 +2549,9 @@ async def _load_prompts_locked(self) -> None:
25472549
for function in new_functions:
25482550
self._function_load_callback(function, None)
25492551
self._functions[:] = current_functions
2550-
self._progressive_loaded_tool_names.difference_update(
2551-
existing_prompts.keys() - {func.name for func in prompt_functions}
2552-
)
2552+
# Only prompts reused with the same remote identity keep their progressive-load state; a
2553+
# different remote prompt that normalizes to the same local name must start unloaded.
2554+
self._progressive_loaded_tool_names.difference_update(existing_prompts.keys() - reused_prompt_names)
25532555

25542556
async def load_tools(self) -> None:
25552557
"""Load tools from the MCP server.

‎python/packages/core/tests/core/test_mcp.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,31 @@ async def test_load_prompts_refresh_replaces_prompt_catalog() -> None:
722722
assert tool._progressive_loaded_tool_names == {"keep"}
723723

724724

725+
async def test_load_prompts_refresh_forgets_progressive_state_on_normalized_name_collision() -> None:
726+
"""A different remote prompt that normalizes to the same local name must not inherit load state."""
727+
tool = MCPTool(name="docs") # type: ignore[abstract] # ty: ignore[call-non-callable]
728+
tool.session = AsyncMock()
729+
tool.session.list_prompts = AsyncMock(
730+
return_value=types.ListPromptsResult(prompts=[types.Prompt(name="a/b", description="Same")])
731+
)
732+
await tool.load_prompts()
733+
old_prompt = tool._functions[0]
734+
assert old_prompt.name == "a-b"
735+
tool._progressive_loaded_tool_names.add("a-b")
736+
737+
tool.session.list_prompts = AsyncMock(
738+
return_value=types.ListPromptsResult(prompts=[types.Prompt(name="a-b", description="Same")])
739+
)
740+
await tool.load_prompts()
741+
742+
assert len(tool._functions) == 1
743+
new_prompt = tool._functions[0]
744+
assert new_prompt is not old_prompt
745+
assert new_prompt.name == "a-b"
746+
assert (new_prompt.additional_properties or {})["_mcp_remote_name"] == "a-b"
747+
assert tool._progressive_loaded_tool_names == set()
748+
749+
725750
async def test_load_prompts_empty_snapshot_clears_prompts() -> None:
726751
"""A successful empty prompts/list snapshot clears previously loaded prompts."""
727752
tool = MCPTool(name="docs") # type: ignore[abstract] # ty: ignore[call-non-callable]

0 commit comments

Comments
 (0)