[cjlg-soloio]

---

🤖 written by Claude (start)

Changelog

MCP server tools are listed alphabetically, and an AgentTemplate opened from a chat now has a button back to that conversation.

/kind fix

Changes

Sorts each MCP server's tools by name, styles the chat panel's Template link with a hover state and tooltip, and gives the AgentTemplate page a "Back to conversation" button when opened from that link, via a small useBackLink hook in ui/src/router/backLink.ts that reads router state and only follows in-app paths.

Testing

1. In ui/, run KAGENT_UI_ENABLE_MOCK=true yarn dev, open /mcp and expand kagent-tool-server: tools read k8s_describe_resource, k8s_get_events, k8s_get_pods, and stay in that order when you search k8s_get.
2. Open an agent's chat at a wide window, hover the right panel's Template link (underline and tooltip), click it, and use "Back to conversation" to return to the same chat.
3. Open the same template from Agents → Templates: the button says "Back to templates".

---

🤖 written by Claude (end)

🤖 Generated with Claude Code

[cjlg-soloio]

This automated review is a first pass. A manual review will follow once the blockers are addressed.

---

Two issues block merge. The template page tells people it leads back to a conversation when they came from the agent's own page. And switching tabs on the template page loses the way back.

⚠️ What I checked

• MCP tool sort: numeric-aware localeCompare, applied inside ToolServerTools, so the MCP servers page and the app detail page both get it ✅
• backLink.ts: accepts only state whose from starts with / and not //, with a non-empty label, and falls back otherwise ✅
• Wrapping a react-router Link in an antd Tooltip: RR7's Link forwards its ref and the hover/focus handlers, and no wrapper element is added ✅
• Back-link label for every place the context panel renders: the chat and the agent page (AgentPage.tsx:611)
• Router state surviving in-page navigation on the template page: tabs, delete
• Keyboard access to the new tooltip
• Forbidden terms in the diff, title and body ✅

---

🤖 written by Claude

[cjlg-soloio]

Before (main) and after (this branch), recorded on a fresh kind cluster built from this branch, with a real k8s-helper agent, its AgentTemplate and a real conversation.

• MCP tools order: the expanded server lists its tools A–Z in the UI. This controller already reports kagent-tool-server's tools in name order, so on this data main looks the same; the sort makes the order independent of what the controller sends.
• Template link: the chat panel's link underlines on hover or focus, and a tooltip says it opens the AgentTemplate.
• Way back: opened from the chat, the template page says "Back to conversation", keeps it across tabs and returns to the same chat; main sends you to the template list.
• Direct visit: still "Back to templates".

verify-3644.mp4

Screenshots

Before: Template link on hover

After: underline and tooltip

Before: template opened from the chat

After: Back to conversation

Before: back lands on the template list

After: back in the same conversation

Before: direct visit

After: direct visit unchanged

Before: MCP tools, filtered to k8s_get

After: MCP tools, filtered to k8s_get

---

🤖 written by Claude