b33532c024
Closes #1910 `_meta` was typed `Record<string, string>` end to end in the Inspector — on disk as a `{ key, value }[]` pair array, in the Server Settings form as key/value rows, and in every request verb's per-call metadata parameter. Nothing in the MCP spec restricts a `_meta` value to a string, and the SDK models the field as a `z.looseObject`, so the restriction was ours alone. Widen the whole path to `RequestMetadata` (`Record<string, JsonValue>`): - Per-server default metadata is a JSON **object** on disk and in memory. The pre-#1910 pair array is still read (`normalizeStoredMetadata`) so an existing `mcp.json` keeps working; it is never written back, so a save migrates the entry. - The Server Settings → Request Metadata section is a JSON editor (`JsonObjectInput`) instead of key/value rows — rows cannot express an object value. It keeps the typed text as the display source and emits only parsed JSON, the same draft split `SchemaJsonField` uses, so the box stays typeable; invalid text is flagged inline and not applied. - The CLI stops flattening `--metadata` / `--tool-metadata` through `metaValueToString`. Those values were already JSON-parsed, so `trace={"id":"abc"}` used to reach the wire as the *string* `{"id":"abc"}` and now reaches it as an object. - `servers/show` redaction replaces a sensitive key's whole value rather than a string, so a structured value cannot leak through its members. - `progressTokenOf` narrows the reserved `progressToken` key back to `string | number` before it reaches the SDK; any other JSON still travels inside `_meta` but wires up no progress callback. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0177mPHAdECD18nLLCTwR5rh Signed-off-by: cliffhall <cliff@futurescale.com>
108 lines
2.6 KiB
TypeScript
108 lines
2.6 KiB
TypeScript
import type { InspectorServerSettings } from "@inspector/core/mcp/types.js";
|
|
import { AppShell } from "@mantine/core";
|
|
import type { Meta, StoryObj } from "@storybook/react-vite";
|
|
import { fn } from "storybook/test";
|
|
import { useArgs } from "storybook/preview-api";
|
|
import {
|
|
ServerSettingsModal,
|
|
type ServerSettingsModalProps,
|
|
} from "./ServerSettingsModal";
|
|
|
|
const initialSettings: InspectorServerSettings = {
|
|
headers: [
|
|
{ key: "Authorization", value: "Bearer token-abc-123" },
|
|
{ key: "X-Request-Id", value: "req-456" },
|
|
],
|
|
env: [],
|
|
metadata: { userId: "user-789", client: { name: "inspector" } },
|
|
connectionTimeout: 30000,
|
|
requestTimeout: 60000,
|
|
taskTtl: 60000,
|
|
maxFetchRequests: 5000,
|
|
oauthClientId: "my-client-id",
|
|
oauthClientSecret: "super-secret-value",
|
|
oauthScopes: "read write",
|
|
roots: [
|
|
{ uri: "file:///home/user/project", name: "Project" },
|
|
{ uri: "file:///tmp" },
|
|
],
|
|
};
|
|
|
|
function InteractiveRender(args: ServerSettingsModalProps) {
|
|
const [, updateArgs] = useArgs<ServerSettingsModalProps>();
|
|
|
|
return (
|
|
<AppShell>
|
|
<AppShell.Main>
|
|
<ServerSettingsModal
|
|
{...args}
|
|
onSettingsChange={(settings) => {
|
|
args.onSettingsChange(settings);
|
|
updateArgs({ settings });
|
|
}}
|
|
/>
|
|
</AppShell.Main>
|
|
</AppShell>
|
|
);
|
|
}
|
|
|
|
const meta: Meta<typeof ServerSettingsModal> = {
|
|
title: "Groups/ServerSettingsModal",
|
|
component: ServerSettingsModal,
|
|
parameters: { layout: "fullscreen" },
|
|
render: InteractiveRender,
|
|
args: {
|
|
opened: true,
|
|
serverType: "streamable-http",
|
|
isStdio: false,
|
|
onClose: fn(),
|
|
onSettingsChange: fn(),
|
|
},
|
|
};
|
|
|
|
export default meta;
|
|
type Story = StoryObj<typeof ServerSettingsModal>;
|
|
|
|
export const FullyConfigured: Story = {
|
|
args: {
|
|
settings: initialSettings,
|
|
},
|
|
};
|
|
|
|
export const EmptySettings: Story = {
|
|
args: {
|
|
settings: {
|
|
headers: [],
|
|
env: [],
|
|
metadata: {},
|
|
connectionTimeout: 30000,
|
|
requestTimeout: 60000,
|
|
taskTtl: 60000,
|
|
maxFetchRequests: 1000,
|
|
roots: [],
|
|
},
|
|
},
|
|
};
|
|
|
|
// A stdio server surfaces the Working Directory field (Options) and a dedicated
|
|
// Environment Variables section.
|
|
export const StdioServer: Story = {
|
|
args: {
|
|
serverType: "stdio",
|
|
isStdio: true,
|
|
settings: {
|
|
headers: [],
|
|
env: [
|
|
{ key: "API_KEY", value: "abc-123" },
|
|
{ key: "LOG_LEVEL", value: "debug" },
|
|
],
|
|
metadata: {},
|
|
connectionTimeout: 0,
|
|
requestTimeout: 0,
|
|
taskTtl: 60000,
|
|
maxFetchRequests: 1000,
|
|
cwd: "/srv/my-server",
|
|
roots: [],
|
|
},
|
|
},
|
|
};
|