# Conflicts: # apps/desktop/e2e/archived-hidden-session-recoverable.spec.ts # apps/desktop/e2e/bot-chat-message-agent-friendly-name.spec.ts # apps/desktop/e2e/bot-mailbox-unreadable-ticket.spec.ts # apps/desktop/e2e/bot-mode-roster-localized.spec.ts # apps/desktop/e2e/bot-mode-row-click-mirrors-registry.spec.ts # apps/desktop/e2e/bot-mode-tab-shows-bot-name.spec.ts # apps/desktop/e2e/bot-roster-group-row-organisation.spec.ts # apps/desktop/e2e/bot-roster-ignores-infra-dirs.spec.ts # apps/desktop/e2e/bot-roster-timestamp-meta.spec.ts # apps/desktop/e2e/bot-roster-user-sections.spec.ts # apps/desktop/e2e/bot-routines-pane-narrow.spec.ts # apps/desktop/e2e/bot-row-open-recent-session.spec.ts # apps/desktop/e2e/bot-tile-ignores-ambient-composer-model.spec.ts # apps/desktop/e2e/group-composer-auto-grow.spec.ts # apps/desktop/e2e/group-create-gate-remote-roster.spec.ts # apps/desktop/e2e/group-prompt-renamed-primary-handle.spec.ts # apps/desktop/e2e/hosted-room-backend-continuity.spec.ts # apps/desktop/e2e/hosted-room-legacy-store-migration.spec.ts # apps/desktop/e2e/settings-scope-chips-bot-title.spec.ts # apps/desktop/e2e/worktree-branch-status.spec.ts # apps/desktop/electron/backend-probes.test.ts # apps/desktop/electron/connection-apply.test.ts # apps/desktop/electron/desktop-electron-pin.test.ts # apps/desktop/electron/desktop-uninstall.test.ts # apps/desktop/electron/gateway-file-download-transport.test.ts # apps/desktop/electron/gateway-stop-before-update.test.ts # apps/desktop/electron/github-api-auth.test.ts # apps/desktop/electron/registry-primary-profile-scope.test.ts # apps/desktop/electron/update-api-check.test.ts # apps/desktop/electron/update-handoff-marker.test.ts # apps/desktop/electron/venv-blocker-scan.test.ts # apps/desktop/scripts/after-extract.test.mjs # apps/desktop/scripts/local-pack-publish.test.mjs # apps/desktop/scripts/tasks-scroll.test.mjs # apps/desktop/src/app/settings/model-settings.test.tsx # apps/desktop/src/app/updates-overlay.blockers.test.tsx # apps/desktop/src/components/desktop-install-overlay.test.tsx # apps/desktop/src/lib/update-copy.test.ts # scripts/ci/check_os_marker_fakes.py # tests-js/desktop-mac-usage-descriptions.test.ts # tests-js/node-engine-alignment.test.ts # tests/agent/lsp/test_install_and_lint_fixes.py # tests/agent/test_command_token_source.py # tests/agent/test_compression_boundary_hook.py # tests/agent/test_create_openai_client_ssl_verify.py # tests/agent/test_custom_provider_ca_probes.py # tests/agent/test_endpoint_blackhole.py # tests/agent/test_estimator_parity.py # tests/agent/test_in_place_compaction.py # tests/agent/test_moa_loop_mode.py # tests/agent/test_model_metadata.py # tests/agent/test_skill_session_platform_gate.py # tests/agent/test_skill_utils.py # tests/agent/test_ssl_ca_guard.py # tests/computer_use/test_doctor.py # tests/cron/test_codex_execution_paths.py # tests/cron/test_cron_bot_chat_delivery.py # tests/cron/test_cron_script.py # tests/cron/test_media_delivery_parity.py # tests/cron/test_misfire_catchup.py # tests/cron/test_parallel_pool.py # tests/cron/test_recurring_eagain_redispatch.py # tests/gateway/test_choice_picker.py # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_dingtalk.py # tests/gateway/test_feishu.py # tests/gateway/test_feishu_onboard.py # tests/gateway/test_gateway_shutdown.py # tests/gateway/test_matrix.py # tests/gateway/test_model_command_custom_providers.py # tests/gateway/test_reasoning_command.py # tests/gateway/test_runtime_footer.py # tests/gateway/test_session.py # tests/gateway/test_session_hygiene.py # tests/gateway/test_status.py # tests/gateway/test_teams.py # tests/gateway/test_turn_lease.py # tests/gateway/test_whatsapp_connect.py # tests/hermes_cli/test_approvals_command.py # tests/hermes_cli/test_auth_store_lock_concurrent.py # tests/hermes_cli/test_backup.py # tests/hermes_cli/test_banner_git_state.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_compat_manifest_targets.py # tests/hermes_cli/test_computer_use_cli.py # tests/hermes_cli/test_cpr_local_leak.py # tests/hermes_cli/test_dashboard_auth_gate.py # tests/hermes_cli/test_dashboard_procs_kill_grace.py # tests/hermes_cli/test_desktop_lifecycle_windows_live.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_command_install.py # tests/hermes_cli/test_fleet_config_migration_windows_live.py # tests/hermes_cli/test_gateway.py # tests/hermes_cli/test_gateway_platform_gating.py # tests/hermes_cli/test_gateway_restart_loop.py # tests/hermes_cli/test_gateway_task_probe.py # tests/hermes_cli/test_gateway_wsl.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_install_cua_driver.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_command_exports.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_linux_desktop_entry.py # tests/hermes_cli/test_local_runtime.py # tests/hermes_cli/test_local_runtime_updates.py # tests/hermes_cli/test_managed_uv.py # tests/hermes_cli/test_mcp_reload_confirm_gate.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_npm_engine.py # tests/hermes_cli/test_personality_none.py # tests/hermes_cli/test_pet_toggle.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_plugin_event_bus.py # tests/hermes_cli/test_plugin_manifest_v2.py # tests/hermes_cli/test_plugin_packs.py # tests/hermes_cli/test_plugins_cmd.py # tests/hermes_cli/test_plugins_cmd_enable_disable_nested.py # tests/hermes_cli/test_process_identity.py # tests/hermes_cli/test_profiles.py # tests/hermes_cli/test_profiles_sidebar_cache.py # tests/hermes_cli/test_pty_bridge.py # tests/hermes_cli/test_resolve_turn_limit.py # tests/hermes_cli/test_serve_runtime_inventory.py # tests/hermes_cli/test_session_vacuum_config.py # tests/hermes_cli/test_set_config_value.py # tests/hermes_cli/test_signal_handler_kanban_worker.py # tests/hermes_cli/test_slash_confirm_windows.py # tests/hermes_cli/test_stale_pid_guard.py # tests/hermes_cli/test_startup_fast_guards.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_telegram_managed_bot.py # tests/hermes_cli/test_tools_config.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_autostash.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_fetch_failure_classifier.py # tests/hermes_cli/test_update_fleet_probe_resume_token.py # tests/hermes_cli/test_update_handoff_backend_reap.py # tests/hermes_cli/test_update_handoff_desktop_rebuild.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_host_obligation.py # tests/hermes_cli/test_update_import_guard.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_update_inventory.py # tests/hermes_cli/test_update_launchd_unloaded_gateway.py # tests/hermes_cli/test_update_missing_configured_deps.py # tests/hermes_cli/test_update_modified_notice.py # tests/hermes_cli/test_update_multiplex_migration_hook.py # tests/hermes_cli/test_update_no_gateway_restart.py # tests/hermes_cli/test_update_orphan_backend_reap.py # tests/hermes_cli/test_update_parked_branch_guard.py # tests/hermes_cli/test_update_post_pull_syntax_guard.py # tests/hermes_cli/test_update_receipt.py # tests/hermes_cli/test_update_self_lock.py # tests/hermes_cli/test_update_shim_fail_closed.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_update_sqlite_remediation.py # tests/hermes_cli/test_update_stale_dashboard.py # tests/hermes_cli/test_update_stale_virtualenv.py # tests/hermes_cli/test_update_venv_health.py # tests/hermes_cli/test_update_venv_ownership_preflight.py # tests/hermes_cli/test_update_wedged_gateway.py # tests/hermes_cli/test_update_yes_flag.py # tests/hermes_cli/test_update_zip_two_phase.py # tests/hermes_cli/test_urllib_security.py # tests/hermes_cli/test_ux_messages_auth_config.py # tests/hermes_cli/test_ux_messages_startup.py # tests/hermes_cli/test_venv_holder_classifier.py # tests/hermes_cli/test_verify_console_scripts.py # tests/hermes_cli/test_verify_core_dependencies.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_server_console_ws.py # tests/hermes_cli/test_web_server_ws_ping.py # tests/hermes_cli/test_web_ui_build.py # tests/hermes_state/test_fts_rebuild_admission.py # tests/hermes_state/test_hermes_state.py # tests/plugins/memory/test_memory_lazy_install.py # tests/plugins/test_google_meet_plugin.py # tests/plugins/test_langfuse_plugin.py # tests/plugins/test_security_guidance_plugin.py # tests/plugins/test_transform_llm_output_hook.py # tests/scripts/desktop_update/test_desktop_update_windows_gateway_flag.py # tests/scripts/desktop_update/test_desktop_update_windows_python_handoff.py # tests/scripts/desktop_update/test_desktop_update_windows_timestamp.py # tests/scripts/install/test_install_clone_throttle_fallback.py # tests/scripts/install/test_install_lockfile_churn.py # tests/scripts/install/test_install_no_initial_commit.py # tests/scripts/install/test_install_sh_browser_install.py # tests/scripts/install/test_install_sh_node_prerelease.py # tests/scripts/install/test_install_sh_symlink_stomp.py # tests/scripts/install/test_install_sh_uv_lock_config.py # tests/scripts/install/test_install_unmerged_index.py # tests/scripts/test_contributor_map.py # tests/scripts/test_run_tests_parallel.py # tests/skills/test_competitor_news_monitor_skill.py # tests/skills/test_document_to_action_items_skill.py # tests/skills/test_google_workspace_setup.py # tests/skills/test_google_workspace_setup_deps.py # tests/skills/test_grounded_citations_skill.py # tests/skills/test_ip_as_logo_skill.py # tests/skills/test_live_dashboard_skill.py # tests/skills/test_mcp_oauth_remote_gateway_skill.py # tests/skills/test_office_document_skills.py # tests/skills/test_openclaw_migration.py # tests/skills/test_product_price_monitor_skill.py # tests/skills/test_scrollcraft_skill.py # tests/skills/test_setup_wizard_generator_skill.py # tests/skills/test_weekly_review_planning_skill.py # tests/test_engines_satisfiable.py # tests/test_fast_safe_load.py # tests/test_hermes_bootstrap.py # tests/test_hermes_constants.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/test_model_tools_async_bridge.py # tests/test_packaging_build_guard.py # tests/test_packaging_metadata.py # tests/test_yaml_indent_consistency.py # tests/tools/test_approval_timeout_overflow.py # tests/tools/test_base_environment.py # tests/tools/test_bot_mode_dm.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_hardening.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_use_cli.py # tests/tools/test_clipboard.py # tests/tools/test_code_execution.py # tests/tools/test_code_execution_modes.py # tests/tools/test_code_execution_windows_env.py # tests/tools/test_computer_use.py # tests/tools/test_delegate_liveness_timeout.py # tests/tools/test_execute_code_approval_cluster.py # tests/tools/test_execution_flag_detection.py # tests/tools/test_fal_common.py # tests/tools/test_file_operations.py # tests/tools/test_file_tools.py # tests/tools/test_file_tools_cwd_resolution.py # tests/tools/test_file_tools_live.py # tests/tools/test_lazy_deps.py # tests/tools/test_lazy_deps_durable_target.py # tests/tools/test_lazy_deps_managed.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_local_tempdir.py # tests/tools/test_macos_protected_search.py # tests/tools/test_mcp_npx_cached_bin.py # tests/tools/test_oneshot_completion_linger.py # tests/tools/test_process_registry.py # tests/tools/test_read_file_schema_gating.py # tests/tools/test_skill_improvements.py # tests/tools/test_skills_sync.py # tests/tools/test_termux_api_detection.py # tests/tools/test_tirith_security.py # tests/tools/test_transcription_tools.py # tests/tools/test_tts_streaming.py # tests/tools/test_wake_word.py # tests/tui_gateway/test_compute_host_borrowed_lease.py # tests/tui_gateway/test_compute_host_turn_protocol.py # tests/tui_gateway/test_isolated_orphan_activity.py # tests/tui_gateway/test_protocol.py # tests/tui_gateway/test_slash_worker_profile_home.py # tests/tui_gateway/test_subprocess_encoding.py # tests/tui_gateway/test_tui_gateway_server.py # ui-tui/src/__tests__/terminalParity.test.ts # ui-tui/src/__tests__/termuxComposerLayout.test.ts # ui-tui/src/__tests__/textInputFastEcho.test.ts
350 lines
15 KiB
Python
350 lines
15 KiB
Python
"""Tests for MCP tool structuredContent preservation."""
|
|
|
|
import asyncio
|
|
import json
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from tools import mcp_tool
|
|
from tools import mcp_tool_content as _mcp_content
|
|
from tools import mcp_tool_handlers as _mcp_handlers
|
|
|
|
class _FakeContentBlock:
|
|
"""Minimal content block with .text and .type attributes."""
|
|
|
|
def __init__(self, text: str, block_type: str = "text"):
|
|
self.text = text
|
|
self.type = block_type
|
|
|
|
class _FakeCallToolResult:
|
|
"""Minimal CallToolResult stand-in.
|
|
|
|
Uses camelCase ``structuredContent`` / ``isError`` to match the real
|
|
MCP SDK Pydantic model (``mcp.types.CallToolResult``).
|
|
"""
|
|
|
|
def __init__(self, content, is_error=False, structuredContent=None, meta=None):
|
|
self.content = content
|
|
self.isError = is_error
|
|
self.structuredContent = structuredContent
|
|
# Real SDK exposes the wire ``_meta`` field as ``.meta`` (Pydantic alias).
|
|
self.meta = meta
|
|
|
|
def _fake_run_on_mcp_loop(coro_or_factory, timeout=30):
|
|
coro = coro_or_factory() if callable(coro_or_factory) else coro_or_factory
|
|
"""Run an MCP coroutine directly in a fresh event loop."""
|
|
loop = asyncio.new_event_loop()
|
|
try:
|
|
# `_rpc_lock` must be created inside the loop that awaits it, or asyncio
|
|
# raises "attached to a different loop". Build it here and attach it to
|
|
# whatever fake server is currently registered under _servers.
|
|
async def _install_lock_and_run():
|
|
for srv in list(mcp_tool._servers.values()):
|
|
if getattr(srv, "_rpc_lock", None) is None:
|
|
srv._rpc_lock = asyncio.Lock()
|
|
return await coro
|
|
return loop.run_until_complete(_install_lock_and_run())
|
|
finally:
|
|
loop.close()
|
|
|
|
@pytest.fixture
|
|
def _patch_mcp_server():
|
|
"""Patch _servers and the MCP event loop so _make_tool_handler can run."""
|
|
fake_session = MagicMock()
|
|
# `_rpc_lock` is acquired by _make_tool_handler's call path (mcp_tool.py
|
|
# ~L2008) to serialize JSON-RPC against the server — build it inside the
|
|
# fresh loop that _fake_run_on_mcp_loop spins up, not at fixture import.
|
|
fake_server = SimpleNamespace(session=fake_session, _rpc_lock=None)
|
|
with patch.dict(mcp_tool._servers, {"test-server": fake_server}), \
|
|
patch("tools.mcp_tool_loop._run_on_mcp_loop", side_effect=_fake_run_on_mcp_loop):
|
|
yield fake_session
|
|
|
|
class TestStructuredContentPreservation:
|
|
"""Ensure structuredContent from CallToolResult is forwarded."""
|
|
|
|
def test_text_only_result(self, _patch_mcp_server):
|
|
"""When no structuredContent, result is text-only (existing behaviour)."""
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("hello")],
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
raw = handler({})
|
|
data = json.loads(raw)
|
|
assert data == {"result": "hello"}
|
|
|
|
def test_structured_content_none_falls_back_to_text(self, _patch_mcp_server):
|
|
"""When structuredContent is explicitly None, fall back to text."""
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("done")],
|
|
structuredContent=None,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
raw = handler({})
|
|
data = json.loads(raw)
|
|
assert data == {"result": "done"}
|
|
|
|
def test_empty_text_with_structured_content(self, _patch_mcp_server):
|
|
"""When content blocks are empty but structuredContent exists."""
|
|
session = _patch_mcp_server
|
|
payload = {"status": "ok", "data": [1, 2, 3]}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[],
|
|
structuredContent=payload,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
raw = handler({})
|
|
data = json.loads(raw)
|
|
assert data["result"] == payload
|
|
|
|
class TestMetaPassthrough:
|
|
"""Server ``_meta`` is surfaced, minus protocol-reserved keys.
|
|
|
|
Ported from MoonshotAI/kimi-code#2596/#2600.
|
|
"""
|
|
|
|
def test_vendor_meta_passes_through(self, _patch_mcp_server):
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("done")],
|
|
meta={"com.example/handoff": {"url": "https://x"}},
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data["result"] == "done"
|
|
assert data["_meta"] == {"com.example/handoff": {"url": "https://x"}}
|
|
|
|
def test_reserved_meta_keys_dropped(self, _patch_mcp_server):
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("done")],
|
|
meta={
|
|
"modelcontextprotocol.io/progress": 1,
|
|
"tools.mcp.com/trace": "x",
|
|
"com.example.mcp/vendor": "keep", # trailing mcp label = vendor ns
|
|
"unprefixed": "keep",
|
|
},
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data["_meta"] == {
|
|
"com.example.mcp/vendor": "keep",
|
|
"unprefixed": "keep",
|
|
}
|
|
|
|
def test_all_reserved_meta_omits_field(self, _patch_mcp_server):
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("done")],
|
|
meta={"mcp.io/internal": True},
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data == {"result": "done"}
|
|
|
|
def test_meta_with_structured_content(self, _patch_mcp_server):
|
|
"""Non-verbatim text keeps structuredContent; _meta still rides."""
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("txt")],
|
|
structuredContent={"ok": True},
|
|
meta={"com.example/k": "v"},
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data == {
|
|
"result": "txt",
|
|
"structuredContent": {"ok": True},
|
|
"_meta": {"com.example/k": "v"},
|
|
}
|
|
|
|
def test_non_serializable_meta_dropped(self, _patch_mcp_server):
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("done")],
|
|
meta={"com.example/obj": object()},
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data == {"result": "done"}
|
|
|
|
def test_non_dict_meta_ignored(self, _patch_mcp_server):
|
|
session = _patch_mcp_server
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("done")],
|
|
meta="not-a-dict",
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data == {"result": "done"}
|
|
|
|
class TestReservedMetaKeyPredicate:
|
|
def test_reserved_prefixes(self):
|
|
assert _mcp_content._is_reserved_mcp_meta_key("modelcontextprotocol.io/x")
|
|
assert _mcp_content._is_reserved_mcp_meta_key("mcp.dev/x")
|
|
assert _mcp_content._is_reserved_mcp_meta_key("tools.mcp.com/x")
|
|
|
|
def test_vendor_and_unprefixed_not_reserved(self):
|
|
assert not _mcp_content._is_reserved_mcp_meta_key("com.example.mcp/x") # trailing label
|
|
assert not _mcp_content._is_reserved_mcp_meta_key("com.example/x")
|
|
assert not _mcp_content._is_reserved_mcp_meta_key("plain-key")
|
|
assert not _mcp_content._is_reserved_mcp_meta_key("/leading-slash")
|
|
|
|
class TestContentStructuredArbitration:
|
|
"""Only the spec's verbatim dual-emit is deduplicated (kimi-code#3234, narrowed).
|
|
|
|
content being the serialized JSON of structuredContent is a deterministic
|
|
duplicate, so the structured copy is dropped. Any other usable text keeps
|
|
structuredContent alongside it (#115430): servers that return a status
|
|
summary in content were losing their only machine-readable result.
|
|
"""
|
|
|
|
def test_dual_emit_suppresses_structured(self, _patch_mcp_server):
|
|
"""Verbatim dual-emit servers: model receives content only."""
|
|
session = _patch_mcp_server
|
|
payload = {"items": [1, 2, 3]}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock(json.dumps(payload))],
|
|
structuredContent=payload,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data == {"result": json.dumps(payload)}
|
|
|
|
def test_dual_emit_forwards_one_copy(self, _patch_mcp_server):
|
|
"""The dual-emit check compares parsed JSON per text block: a re-ordered,
|
|
indented, ASCII-escaped copy next to a status line still dedupes. An over-cap
|
|
payload next to usable text is also dropped — forwarding its truncated
|
|
stand-in as well would double the #56059 ceiling."""
|
|
session = _patch_mcp_server
|
|
payload = {"a": "héllo", "b": 2}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock(json.dumps({"b": 2, "a": "héllo"}, indent=2)), _FakeContentBlock("done")],
|
|
structuredContent=payload,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert set(data) == {"result"} and data["result"].count('"b"') == 1
|
|
assert data["result"].endswith("done")
|
|
big = {"k": "z" * (_mcp_content._MCP_HARD_RESULT_CAP_CHARS + 10)}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(content=[_FakeContentBlock("done")], structuredContent=big)
|
|
)
|
|
assert json.loads(handler({})) == {"result": "done"}
|
|
|
|
def test_summary_plus_data_keeps_structured(self, _patch_mcp_server):
|
|
"""#115430 reproducer shape: a status summary in content with the real data
|
|
(the jid needed by follow-up calls) only in structuredContent. A text-only
|
|
result is unchanged (control)."""
|
|
session = _patch_mcp_server
|
|
structured = {
|
|
"data": [{"jid": "12345@s.whatsapp.net", "name": "Contact"}],
|
|
"pagination": {"offset": 0, "limit": 1},
|
|
}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock("Retrieved 1 chats (offset 0, limit 1)")],
|
|
structuredContent=structured,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data["result"] == "Retrieved 1 chats (offset 0, limit 1)"
|
|
assert data["structuredContent"] == structured
|
|
assert data["structuredContent"]["data"][0]["jid"] == "12345@s.whatsapp.net"
|
|
session.call_tool = AsyncMock(return_value=_FakeCallToolResult(content=[_FakeContentBlock("just text")]))
|
|
assert handler({}) == '{"result": "just text"}'
|
|
|
|
def test_whitespace_only_content_falls_back(self, _patch_mcp_server):
|
|
"""Whitespace-only text is not usable content — fallback fires."""
|
|
session = _patch_mcp_server
|
|
payload = {"status": "ok"}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[_FakeContentBlock(" \n")],
|
|
structuredContent=payload,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data["structuredContent"] == payload
|
|
|
|
def test_structured_only_still_surfaced(self, _patch_mcp_server):
|
|
"""structuredContent-only servers keep working (#2596 fix preserved)."""
|
|
session = _patch_mcp_server
|
|
payload = {"only": "structured"}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[],
|
|
structuredContent=payload,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data["result"] == payload
|
|
|
|
class TestDroppedBlockNotice:
|
|
"""Unsupported content blocks surface a drop notice to the model.
|
|
|
|
Ported from MoonshotAI/kimi-code#3227.
|
|
"""
|
|
|
|
def test_unsupported_block_renders_notice(self, _patch_mcp_server):
|
|
session = _patch_mcp_server
|
|
# NOTE: no `uri` — a uri'd block without .resource is rendered as a
|
|
# resource link by _render_mcp_resource_block, not dropped.
|
|
weird = SimpleNamespace(
|
|
type="hologram",
|
|
mimeType="application/x-hologram",
|
|
size=1234,
|
|
)
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(content=[weird])
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert "[MCP content dropped: unsupported block" in data["result"]
|
|
assert "type=hologram" in data["result"]
|
|
assert "mimeType=application/x-hologram" in data["result"]
|
|
assert "size=1234" in data["result"]
|
|
|
|
def test_drop_notice_does_not_suppress_structured(self, _patch_mcp_server):
|
|
"""A drop notice is not usable content — structured fallback fires."""
|
|
session = _patch_mcp_server
|
|
weird = SimpleNamespace(type="hologram")
|
|
payload = {"real": "data"}
|
|
session.call_tool = AsyncMock(
|
|
return_value=_FakeCallToolResult(
|
|
content=[weird], structuredContent=payload,
|
|
)
|
|
)
|
|
handler = _mcp_handlers._make_tool_handler("test-server", "my-tool", 30.0)
|
|
data = json.loads(handler({}))
|
|
assert data["structuredContent"] == payload
|
|
assert "[MCP content dropped" in data["result"]
|