Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

fix(skills): follow empty pagination cursors when listing skills (#6473)

Luckfbaeb9dc1fee
diff --git a/fastmcp_slim/fastmcp/client/mixins/skills.py b/fastmcp_slim/fastmcp/client/mixins/skills.py
index f35129042..d41f6d03c 100644
--- a/fastmcp_slim/fastmcp/client/mixins/skills.py
+++ b/fastmcp_slim/fastmcp/client/mixins/skills.py
@@ -143,7 +143,7 @@ class ClientSkillsMixin:
for _ in range(max_pages):
result = await self.list_skills_mcp(cursor=cursor, cache_mode=cache_mode)
skills.extend(result.skills)
- if not result.next_cursor:
+ if result.next_cursor is None:
break
if result.next_cursor in seen_cursors:
logger.warning(
diff --git a/fastmcp_slim/fastmcp/skills/_proxy.py b/fastmcp_slim/fastmcp/skills/_proxy.py
index 6dc96d2a3..476daa56e 100644
--- a/fastmcp_slim/fastmcp/skills/_proxy.py
+++ b/fastmcp_slim/fastmcp/skills/_proxy.py
@@ -113,7 +113,7 @@ class _ProxiedSkills:
return []
raise
entries.extend(page.skills)
- if not page.next_cursor or page.next_cursor in seen:
+ if page.next_cursor is None or page.next_cursor in seen:
return entries
seen.add(page.next_cursor)
cursor = page.next_cursor
diff --git a/tests/server/providers/proxy/test_skills.py b/tests/server/providers/proxy/test_skills.py
index 87a760845..59b9214b1 100644
--- a/tests/server/providers/proxy/test_skills.py
+++ b/tests/server/providers/proxy/test_skills.py
@@ -142,6 +142,35 @@ async def test_follows_backend_pagination() -> None:
]
+class EmptyCursorSkillsExtension(SkillsExtension):
+ """Spells the first page's continuation cursor as the empty string."""
+
+ def __init__(self) -> None:
+ super().__init__()
+ self._first_cursor: str | None = None
+
+ async def _handle_list(self, context, params):
+ if params.cursor == "":
+ params = params.model_copy(update={"cursor": self._first_cursor})
+ result = await super()._handle_list(context, params)
+ if params.cursor is None and result.next_cursor is not None:
+ self._first_cursor = result.next_cursor
+ result = result.model_copy(update={"next_cursor": ""})
+ return result
+
+
+async def test_follows_empty_backend_cursor() -> None:
+ upstream = backend(REVIEW, DEPLOY, page_size=1)
+ upstream.add_extension(EmptyCursorSkillsExtension())
+
+ async with skills_client(gateway(upstream)) as client:
+ listed = await client.list_skills()
+ assert [skill.uri for skill in listed] == [
+ "skill://deploy/SKILL.md",
+ "skill://review/SKILL.md",
+ ]
+
+
class ListSkillsRequests(Middleware):
def __init__(self) -> None:
self.count = 0
diff --git a/tests/skills/test_extension.py b/tests/skills/test_extension.py
index bb85ae327..4452f2632 100644
--- a/tests/skills/test_extension.py
+++ b/tests/skills/test_extension.py
@@ -173,6 +173,29 @@ async def test_list_skills_enforces_page_limit() -> None:
await client.list_skills(max_pages=1)
+class EmptyCursorSkillsExtension(SkillsExtension):
+ """Serves two pages whose continuation cursor is the empty string."""
+
+ async def _handle_list(
+ self,
+ context: ServerRequestContext[Any, Any],
+ params: ListSkillsParams,
+ ) -> ListSkillsResult:
+ if params.cursor is None:
+ return ListSkillsResult(skills=[make_skill("alpha")], next_cursor="")
+ return ListSkillsResult(skills=[make_skill("beta")])
+
+
+async def test_list_skills_follows_empty_cursor() -> None:
+ server = FastMCP("skills")
+ server.add_extension(EmptyCursorSkillsExtension())
+
+ async with skills_client(server) as client:
+ all_skills = await client.list_skills()
+
+ assert [skill.frontmatter.name for skill in all_skills] == ["alpha", "beta"]
+
+
async def test_get_skill_is_authoritative_for_unlisted_skill() -> None:
hidden_from_list = make_skill("direct-only")
provider = MemorySkillProvider(listed=[], addressable=[hidden_from_list])