Skip to content

fix(web,mcp): gracefully degrade when MCP loading fails in Web UI worker #1816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AI-fullcup wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(web,mcp): gracefully degrade when MCP loading fails in Web UI worker #1816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/kimi_cli/soul/kimisoul.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
from kimi_cli.soul.message import check_message, system, system_reminder, tool_result_to_message
from kimi_cli.soul.slash import registry as soul_slash_registry
from kimi_cli.soul.toolset import KimiToolset
from kimi_cli.exception import MCPRuntimeError
from kimi_cli.tools.dmail import NAME as SendDMail_NAME
from kimi_cli.tools.utils import ToolRejectedError
from kimi_cli.utils.logging import logger
Expand Down Expand Up @@ -683,6 +684,8 @@ async def _agent_loop(self) -> TurnOutcome:
wire_send(MCPLoadingBegin())
try:
await self.wait_for_background_mcp_loading()
except MCPRuntimeError as e:
logger.warning("MCP loading failed, continuing without MCP tools: {}", e)
finally:
if loading:
wire_send(StatusUpdate(mcp_status=self._mcp_status_snapshot()))
Expand Down
2 changes: 2 additions & 0 deletions src/kimi_cli/web/runner/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ async def _read_loop(self) -> None:
raise
except Exception as e:
logger.warning(f"Unexpected error in read loop: {e.__class__.__name__} {e}")
self._in_flight_prompt_ids.clear()
await self._emit_status("error", reason="read_loop_error", detail=str(e))

async def _handle_out_message(self, message: JSONRPCOutMessage) -> None:
"""Handle outbound message from worker."""
Expand Down
Loading