Address PR #1219 code review feedback

- Filter undefined model hint names in SamplingRequestPanel, matching
  the pattern already used in InlineSamplingRequest
- Narrow ElicitationFormPanel to accept ElicitRequestFormParams instead
  of the full ElicitRequest['params'] union; removes the 'requestedSchema
  in request' guard and renders the schema unconditionally
- Add isUrlMode type guard in InlineElicitationRequest to properly
  narrow the URL variant; eliminates the 'as { url: string }' cast

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
cliffhall 2026-04-20 20:05:39 -04:00
commit bb98914e19
3 changed files with 25 additions and 23 deletions

View file

@ -1,10 +1,10 @@
import { Alert, Button, Divider, Group, Stack, Text } from "@mantine/core";
import type { ElicitRequest } from "@modelcontextprotocol/sdk/types.js";
import type { ElicitRequestFormParams } from "@modelcontextprotocol/sdk/types.js";
import { SchemaForm } from "../SchemaForm/SchemaForm";
import type { JsonSchema } from "../SchemaForm/SchemaForm";
export interface ElicitationFormPanelProps {
request: ElicitRequest["params"];
request: ElicitRequestFormParams;
serverName: string;
values: Record<string, unknown>;
onChange: (values: Record<string, unknown>) => void;
@ -33,20 +33,15 @@ export function ElicitationFormPanel({
onSubmit,
onCancel,
}: ElicitationFormPanelProps) {
const schema =
"requestedSchema" in request ? request.requestedSchema : undefined;
return (
<Stack gap="md">
<QuotedMessage>{formatQuoted(request.message)}</QuotedMessage>
<Divider />
{schema && (
<SchemaForm
schema={schema as JsonSchema}
values={values}
onChange={onChange}
/>
)}
<SchemaForm
schema={request.requestedSchema as JsonSchema}
values={values}
onChange={onChange}
/>
<Alert color="yellow" title="Warning">
{formatWarning(serverName)}
</Alert>

View file

@ -8,7 +8,10 @@ import {
Stack,
Text,
} from "@mantine/core";
import type { ElicitRequest } from "@modelcontextprotocol/sdk/types.js";
import type {
ElicitRequest,
ElicitRequestFormParams,
} from "@modelcontextprotocol/sdk/types.js";
import { SchemaForm } from "../SchemaForm/SchemaForm";
import type { JsonSchema } from "../SchemaForm/SchemaForm";
@ -49,12 +52,16 @@ const CompactButton = Button.withProps({
function isFormMode(
request: ElicitRequest["params"],
): request is ElicitRequest["params"] & {
requestedSchema: Record<string, unknown>;
} {
): request is ElicitRequestFormParams {
return "requestedSchema" in request;
}
function isUrlMode(
request: ElicitRequest["params"],
): request is Extract<ElicitRequest["params"], { mode: "url" }> {
return "url" in request;
}
function getBadgeLabel(request: ElicitRequest["params"]): string {
return isFormMode(request)
? "elicitation/create (form)"
@ -70,8 +77,6 @@ export function InlineElicitationRequest({
onSubmit,
onCancel,
}: InlineElicitationRequestProps) {
const formMode = isFormMode(request);
return (
<RequestContainer>
<Stack gap="sm">
@ -82,7 +87,7 @@ export function InlineElicitationRequest({
<ItalicMessage>{request.message}</ItalicMessage>
{formMode && (
{isFormMode(request) && (
<SchemaForm
schema={request.requestedSchema as JsonSchema}
values={values ?? {}}
@ -90,9 +95,9 @@ export function InlineElicitationRequest({
/>
)}
{!formMode && "url" in request && (
{isUrlMode(request) && (
<>
<Code block>{(request as { url: string }).url}</Code>
<Code block>{request.url}</Code>
{isWaiting && (
<Group>
<Loader size="xs" />
@ -104,7 +109,7 @@ export function InlineElicitationRequest({
<ActionsRow>
<CompactButton onClick={onCancel}>Cancel</CompactButton>
{formMode && (
{isFormMode(request) && (
<Button size="xs" onClick={onSubmit}>
Submit
</Button>

View file

@ -72,7 +72,9 @@ export function SamplingRequestPanel({
includeContext,
} = request;
const hints = modelPreferences?.hints?.map((h) => h.name) ?? [];
const hints =
(modelPreferences?.hints?.map((h) => h.name).filter(Boolean) as string[]) ??
[];
return (
<Stack gap="md">