Breaks the two import cycles that forced Protocol stand-ins in the F821 sweep, so the two sites now name the real types. gateway/platforms/event.py (new leaf): MessageType, ProcessingOutcome, MessageEvent moved out of base.py verbatim. Their only dependency is gateway.session.SessionSource; base.py imported helpers.py at module level, so helpers could not name MessageEvent. Now TextBatchAggregator is typed by the real MessageEvent. 249 importers repointed (`from gateway.platforms.base import` -> `.event`, preserving each import's layout); gateway.platforms.__init__ re-exports from .event. The three revert-scheduled PLUGIN-COMPAT pointers that named these symbols (gateway.slash_commands → MessageType, dingtalk → MessageType, photon → ProcessingOutcome) and their COMPAT_MANIFEST rows now target gateway.platforms.event. Docs updated: ADDING_A_PLATFORM.md, adding-platform-adapters.md (en + zh-Hans). tools/mcp_tool_sampling.py: ElicitationHandler no longer holds a back-reference to its MCPServerTask (mcp_tool imports sampling, so the task type cannot be named there). It only ever read owner._pending_call_context, so it takes `call_context: Callable[[], Context | None]` and MCPServerTask passes `lambda: self._pending_call_context`. The consent call is one `functools.partial`, run directly or inside the captured Context. ty on the 11 touched production files vs origin/main: 0 new diagnostics, 14 resolved. (The one `source: SessionSource = None` diagnostic moves with the class; typing it Optional exposes ~60 unguarded call sites — separate follow-up.) Tests: tests/gateway + tests/plugins + tests/tools + touched files, 18,235 passed; the 31 failures reproduce identically on origin/main (macOS /private/tmp, systemd socket, long-path fixtures, live-service tests).
66 lines
1.8 KiB
Python
66 lines
1.8 KiB
Python
"""Gateway command help rendering tests."""
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
def _make_event(text: str, platform: Platform) -> MessageEvent:
|
|
return MessageEvent(
|
|
text=text,
|
|
source=SessionSource(
|
|
platform=platform,
|
|
chat_id="chat-1",
|
|
user_id="user-1",
|
|
user_name="tester",
|
|
chat_type="dm",
|
|
),
|
|
)
|
|
|
|
|
|
def _make_runner():
|
|
from gateway.run import GatewayRunner
|
|
|
|
return object.__new__(GatewayRunner)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_help_sanitizes_slash_command_mentions_for_telegram(monkeypatch):
|
|
"""Telegram help output must not expose invalid uppercase/hyphenated slashes."""
|
|
monkeypatch.setattr(
|
|
"agent.skill_commands.get_skill_commands",
|
|
lambda: {
|
|
"/Linear": {"description": "Open Linear"},
|
|
"/Custom-Thing": {"description": "Run a custom thing"},
|
|
},
|
|
)
|
|
|
|
result = await _make_runner()._handle_help_command(
|
|
_make_event("/help", Platform.TELEGRAM)
|
|
)
|
|
|
|
assert "`/linear`" in result
|
|
assert "`/custom_thing`" in result
|
|
assert "`/Linear`" not in result
|
|
assert "`/Custom-Thing`" not in result
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_commands_sanitizes_slash_command_mentions_for_telegram(monkeypatch):
|
|
"""Paginated Telegram /commands output uses Telegram-valid slash mentions."""
|
|
monkeypatch.setattr(
|
|
"agent.skill_commands.get_skill_commands",
|
|
lambda: {"/Linear": {"description": "Open Linear"}},
|
|
)
|
|
|
|
result = await _make_runner()._handle_commands_command(
|
|
_make_event("/commands 999", Platform.TELEGRAM)
|
|
)
|
|
|
|
assert "`/linear`" in result
|
|
assert "`/Linear`" not in result
|
|
|
|
|