* Tools: x-mcp-header annotation tooling + -32602 unknown-tool rendering (#1632) Card 9/10 of the SDK-v2 + New Spec stack. Adds SEP-2243 `x-mcp-header` tooling to the Tools tab and adjusts result rendering for SDK v2's unknown-tool behavior, and bumps the SDK to 2.0.0-beta.5. - **`core/json/xMcpHeader.ts`**: a faithful port of the SDK's (non-public) `scanXMcpHeaderDeclarations` — validates every SEP-2243 constraint (primitive types incl. `number`, RFC 9110 token, case-insensitive uniqueness, statically-reachable `properties`-only chain) and derives the mirrored `Mcp-Param-{Name}` params for a kept tool. - **Excluded tools**: the SDK silently drops tools with invalid annotations from `tools/list`. InspectorClient now re-lists the RAW (unfiltered) list and scans it to recompute the excluded set with reasons — gated to the modern non-stdio era (matching the SDK's gate), recomputed on every aggregate refresh, surfaced via a new `excludedToolsChange` event + `getExcludedTools()` and `useInspectorClient().excludedTools`. The Tools sidebar lists them struck-through under an "Excluded (SEP-2243)" divider with the reason on hover. - **Mirrored args**: ToolDetailPanel shows a "Mirrored request headers" section listing each arg → `Mcp-Param-{Name}` (with the browser-omits note). - **-32602 rendering**: SDK v2 rejects an unknown-tool call with `-32602` instead of an `isError` result, which previously rendered nothing. New ToolCallErrorPanel renders a thrown tool-call error, with a targeted "Unknown Tool" hint for `-32602`. Adds unit + Storybook + integration coverage (a real modern server with an invalid-header tool fixture) for every path. `npm run ci`-equivalent checks green. Closes #1632 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * test-servers: x-mcp-header modern showcase config + preset (#1632) Register the `invalid_header_tool` fixture as a preset and add `xmcpheader-modern-http.json` — a modern HTTP showcase serving echo, a valid-header `get_weather`, and the invalid-header tool — so the Tools-tab x-mcp-header tooling (mirrored headers, excluded-tools surface, -32602 rendering) can be exercised manually. Documented in the README alongside the other per-SEP showcase configs. Smoke-tested end to end in the web client. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * docs: add #1632 proof screenshots to pr-screenshots End-to-end web-client verification of the x-mcp-header Tools tooling against the modern showcase server: excluded-tools surface + reason, mirrored-headers section, and the -32602 unknown-tool error panel. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * Respond to review: disambiguate -32602, doc/search nits (#1632) Addresses the review on PR #1735: 1. -32602 "Unknown Tool" mislabel: `-32602` is generic Invalid params, so a known tool called with bad arguments hit the same code and rendered under the definitive "Unknown Tool" heading. Replace `isUnknownToolError` with `classifyToolCallError(code, message)` → "unknown-tool" only when the message names it (not found / unknown tool / …), else "invalid-params" (new "Invalid Parameters" heading + schema hint), else "generic". 2. Double pagination walk: expand the `listAllTools` comment to document that the excluded-tools recompute is a deliberately un-cached second raw walk (doubles list round-trips on modern non-stdio, runs even on a cache-served aggregate) — accepted for a debugging tool, no-op on legacy/stdio. 3. Doc nit: `scanXMcpHeaderDeclarations` no longer claims to visit "$ref targets" — reworded to note `$ref` is never followed (refs resolve into the unreachable `$defs` body). 4. Search nit: the excluded-list filter now matches name AND title, matching the main tools filter. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * Tighten unknown-tool matcher to be tool-scoped (#1632 re-review nit) The re-review noted the -32602 disambiguation was symmetric: broad markers ("does not exist", "unrecognized") could inversely mislabel a genuine invalid-params message (e.g. "property 'region' does not exist") as "Unknown Tool". Scope the not-found/does-not-exist family to require the word "tool" in the same clause (matching the SDK's "Tool <name> not found"); keep "unknown tool" / "no such tool" as standalone unambiguous markers. Adds a tool-less-"does not exist" test asserting it classifies as invalid-params. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * Add trigger_invalid_params showcase tool + Invalid Parameters screenshot (#1632) Adds a `trigger_invalid_params` spec-error trigger to the modern showcase server: the injector answers its `tools/call` with a real `-32602 Invalid params` JSON-RPC error whose message does NOT name an unknown tool. This lets the "Invalid Parameters" branch of the tool-call error panel (added in the review response) be exercised live, distinct from the unknown-tool `-32602`. - `SPEC_ERROR_TRIGGERS` gains the `trigger_invalid_params` entry (HTTP 200, in-band -32602) + preset registration. - Enable `injectSpecErrors` on `xmcpheader-modern-http.json` and add the tool. - README + pr-screenshots README document it; adds the live "Invalid Parameters" proof screenshot. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cliff Hall
GitHub
parent
2259b1a3e1
commit
e70a11360c
2 changed files with 1610 additions and 86 deletions
|
|
@ -135,4 +135,52 @@ describe("ToolControls", () => {
|
|||
expect(screen.getByText("Tools")).toBeInTheDocument();
|
||||
expect(screen.queryByText("git_status")).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
const excludedFixture = [
|
||||
{
|
||||
tool: {
|
||||
name: "invalid_header_tool",
|
||||
inputSchema: { type: "object" as const },
|
||||
},
|
||||
reason:
|
||||
"value: x-mcp-header 'Bad Header' is not a valid RFC 9110 token (no spaces, control characters or HTTP delimiters)",
|
||||
},
|
||||
];
|
||||
|
||||
it("renders excluded tools with a header and the tool name (#1632)", () => {
|
||||
renderWithMantine(
|
||||
<ToolControls {...baseProps} excludedTools={excludedFixture} />,
|
||||
);
|
||||
expect(screen.getByText("Excluded (SEP-2243)")).toBeInTheDocument();
|
||||
expect(screen.getByText("invalid_header_tool")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("does not render the excluded section when there are none", () => {
|
||||
renderWithMantine(<ToolControls {...baseProps} excludedTools={[]} />);
|
||||
expect(screen.queryByText("Excluded (SEP-2243)")).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("filters excluded tools by the search text (#1632)", () => {
|
||||
renderWithMantine(
|
||||
<ToolControls
|
||||
{...baseProps}
|
||||
excludedTools={excludedFixture}
|
||||
searchText="git"
|
||||
/>,
|
||||
);
|
||||
// The search matches no excluded tool, so the section is hidden.
|
||||
expect(screen.queryByText("Excluded (SEP-2243)")).not.toBeInTheDocument();
|
||||
expect(screen.queryByText("invalid_header_tool")).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("keeps a matching excluded tool visible under search (#1632)", () => {
|
||||
renderWithMantine(
|
||||
<ToolControls
|
||||
{...baseProps}
|
||||
excludedTools={excludedFixture}
|
||||
searchText="invalid"
|
||||
/>,
|
||||
);
|
||||
expect(screen.getByText("invalid_header_tool")).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,18 @@
|
|||
import { Group, ScrollArea, Stack, TextInput, Title } from "@mantine/core";
|
||||
import {
|
||||
Divider,
|
||||
Group,
|
||||
ScrollArea,
|
||||
Stack,
|
||||
Text,
|
||||
TextInput,
|
||||
ThemeIcon,
|
||||
Title,
|
||||
Tooltip,
|
||||
} from "@mantine/core";
|
||||
import { RiErrorWarningLine } from "react-icons/ri";
|
||||
import { ClearButton } from "../../elements/ClearButton/ClearButton";
|
||||
import type { Tool } from "@modelcontextprotocol/client";
|
||||
import type { ExcludedTool } from "@inspector/core/mcp/types.js";
|
||||
import { ListChangedIndicator } from "../../elements/ListChangedIndicator/ListChangedIndicator";
|
||||
import {
|
||||
ListPaginationControls,
|
||||
|
|
@ -11,6 +23,9 @@ import { useScrollMemory } from "../../../hooks/useScrollMemory";
|
|||
|
||||
export interface ToolControlsProps {
|
||||
tools: Tool[];
|
||||
/** Tools the SDK excluded from `tools/list` for invalid `x-mcp-header`
|
||||
* annotations (SEP-2243), shown below the list with the reason (#1632). */
|
||||
excludedTools?: ExcludedTool[];
|
||||
selectedName?: string;
|
||||
// Search text is controlled by the parent (App, via ToolsScreen) so it
|
||||
// persists across tab navigation within a live session — see #1417.
|
||||
|
|
@ -23,8 +38,31 @@ export interface ToolControlsProps {
|
|||
onSelectTool: (name: string) => void;
|
||||
}
|
||||
|
||||
// One excluded tool: a warning icon, the tool name (struck through, since it is
|
||||
// not callable), and its reason on hover. `wrap: nowrap` keeps the icon pinned.
|
||||
const ExcludedRow = Group.withProps({
|
||||
gap: "xs",
|
||||
wrap: "nowrap",
|
||||
align: "center",
|
||||
});
|
||||
|
||||
const ExcludedWarningIcon = ThemeIcon.withProps({
|
||||
size: "sm",
|
||||
variant: "transparent",
|
||||
c: "var(--inspector-log-warning)",
|
||||
"aria-hidden": true,
|
||||
});
|
||||
|
||||
const ExcludedName = Text.withProps({
|
||||
size: "sm",
|
||||
td: "line-through",
|
||||
c: "var(--inspector-text-secondary)",
|
||||
truncate: "end",
|
||||
});
|
||||
|
||||
export function ToolControls({
|
||||
tools,
|
||||
excludedTools = [],
|
||||
selectedName,
|
||||
searchText = "",
|
||||
listChanged,
|
||||
|
|
@ -42,6 +80,15 @@ export function ToolControls({
|
|||
(tool.title?.toLowerCase().includes(query) ?? false),
|
||||
)
|
||||
: tools;
|
||||
// Excluded tools are searchable too, matching name AND title like the main
|
||||
// list above, so a filtered view stays consistent.
|
||||
const filteredExcluded = searchText
|
||||
? excludedTools.filter(
|
||||
({ tool }) =>
|
||||
tool.name.toLowerCase().includes(query) ||
|
||||
(tool.title?.toLowerCase().includes(query) ?? false),
|
||||
)
|
||||
: excludedTools;
|
||||
|
||||
return (
|
||||
// Fill the full-height `sidebar` Card (a flex column) so the scroll region
|
||||
|
|
@ -81,6 +128,32 @@ export function ToolControls({
|
|||
}}
|
||||
/>
|
||||
))}
|
||||
{filteredExcluded.length > 0 && (
|
||||
<>
|
||||
<Divider
|
||||
label="Excluded (SEP-2243)"
|
||||
labelPosition="left"
|
||||
mt="sm"
|
||||
/>
|
||||
{filteredExcluded.map(({ tool, reason }) => (
|
||||
<Tooltip
|
||||
key={tool.name}
|
||||
label={reason}
|
||||
multiline
|
||||
w={280}
|
||||
withArrow
|
||||
position="right"
|
||||
>
|
||||
<ExcludedRow>
|
||||
<ExcludedWarningIcon>
|
||||
<RiErrorWarningLine />
|
||||
</ExcludedWarningIcon>
|
||||
<ExcludedName>{tool.name}</ExcludedName>
|
||||
</ExcludedRow>
|
||||
</Tooltip>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
</Stack>
|
||||
</ScrollArea>
|
||||
</Stack>
|
||||
|
|
|
|||
Loading…
Reference in a new issue