Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"preview": "vite preview"
},
"dependencies": {
"@modelcontextprotocol/sdk": "0.5.0",
"@modelcontextprotocol/sdk": "0.7.0",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-select": "^2.1.2",
Expand Down
29 changes: 26 additions & 3 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,26 @@ import {
ListPromptsResultSchema,
ListResourcesResultSchema,
ListResourceTemplatesResultSchema,
Request,
ListRootsRequestSchema,
ListToolsResultSchema,
ProgressNotificationSchema,
ReadResourceResultSchema,
Resource,
ResourceTemplate,
Result,
Root,
ServerNotification,
Tool,
} from "@modelcontextprotocol/sdk/types.js";
import { useCallback, useEffect, useRef, useState } from "react";

import {
StderrNotificationSchema,
StdErrNotification,
Notification,
} from "./lib/notificationTypes";

// Add dark mode class based on system preference
if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
document.documentElement.classList.add("dark");
Expand Down Expand Up @@ -87,6 +96,9 @@ const App = () => {
>([]);
const [mcpClient, setMcpClient] = useState<Client | null>(null);
const [notifications, setNotifications] = useState<ServerNotification[]>([]);
const [stdErrNotifications, setStdErrNotifications] = useState<
StdErrNotification[]
>([]);
const [roots, setRoots] = useState<Root[]>([]);
const [env, setEnv] = useState<Record<string, string>>({});

Expand Down Expand Up @@ -383,7 +395,7 @@ const App = () => {

const connectMcpServer = async () => {
try {
const client = new Client(
const client = new Client<Request, Notification, Result>(
{
name: "mcp-inspector",
version: "0.0.1",
Expand Down Expand Up @@ -411,8 +423,6 @@ const App = () => {
}

const clientTransport = new SSEClientTransport(backendUrl);
await client.connect(clientTransport);

client.setNotificationHandler(
ProgressNotificationSchema,
(notification) => {
Expand All @@ -423,6 +433,18 @@ const App = () => {
},
);

client.setNotificationHandler(
StderrNotificationSchema,
(notification) => {
setStdErrNotifications((prevErrorNotifications) => [
...prevErrorNotifications,
notification,
]);
},
);

await client.connect(clientTransport);

client.setRequestHandler(CreateMessageRequestSchema, (request) => {
return new Promise<CreateMessageResult>((resolve, reject) => {
setPendingSampleRequests((prev) => [
Expand Down Expand Up @@ -459,6 +481,7 @@ const App = () => {
env={env}
setEnv={setEnv}
onConnect={connectMcpServer}
stdErrNotifications={stdErrNotifications}
/>
<div className="flex-1 flex flex-col overflow-hidden">
<div className="flex-1 overflow-auto">
Expand Down
22 changes: 22 additions & 0 deletions client/src/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { StdErrNotification } from "@/lib/notificationTypes";

interface SidebarProps {
connectionStatus: "disconnected" | "connected" | "error";
Expand All @@ -24,6 +25,7 @@ interface SidebarProps {
env: Record<string, string>;
setEnv: (env: Record<string, string>) => void;
onConnect: () => void;
stdErrNotifications: StdErrNotification[];
}

const Sidebar = ({
Expand All @@ -39,6 +41,7 @@ const Sidebar = ({
env,
setEnv,
onConnect,
stdErrNotifications,
}: SidebarProps) => {
const [showEnvVars, setShowEnvVars] = useState(false);

Expand Down Expand Up @@ -187,6 +190,25 @@ const Sidebar = ({
: "Disconnected"}
</span>
</div>
{stdErrNotifications.length > 0 && (
<>
<div className="mt-4 border-t border-gray-200 pt-4">
<h3 className="text-sm font-medium">
Error output from MCP server
</h3>
<div className="mt-2 max-h-80 overflow-y-auto">
{stdErrNotifications.map((notification, index) => (
<div
key={index}
className="text-sm text-red-500 font-mono py-2 border-b border-gray-200 last:border-b-0"
>
{notification.params.content}
</div>
))}
</div>
</div>
</>
)}
</div>
</div>
</div>
Expand Down
19 changes: 19 additions & 0 deletions client/src/lib/notificationTypes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import {
ClientNotificationSchema,
NotificationSchema as BaseNotificationSchema,
} from "@modelcontextprotocol/sdk/types.js";
import { z } from "zod";

export const StderrNotificationSchema = BaseNotificationSchema.extend({
method: z.literal("notifications/stderr"),
params: z.object({
content: z.string(),
}),
});

export const NotificationSchema = ClientNotificationSchema.or(
StderrNotificationSchema,
);

export type StdErrNotification = z.infer<typeof StderrNotificationSchema>;
export type Notification = z.infer<typeof NotificationSchema>;
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"typescript": "^5.6.2"
},
"dependencies": {
"@modelcontextprotocol/sdk": "0.5.0",
"@modelcontextprotocol/sdk": "0.7.0",
"cors": "^2.8.5",
"eventsource": "^2.0.2",
"express": "^4.21.0",
Expand Down
19 changes: 18 additions & 1 deletion server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ const createTransport = async (query: express.Request["query"]) => {
console.log(
`Stdio transport: command=${command}, args=${args}, env=${JSON.stringify(env)}`,
);
const transport = new StdioClientTransport({ command, args, env });
const transport = new StdioClientTransport({
command,
args,
env,
stderr: "pipe",
});
await transport.start();
console.log("Spawned stdio transport");
return transport;
Expand Down Expand Up @@ -75,6 +80,18 @@ app.get("/sse", async (req, res) => {

await webAppTransport.start();

if (backingServerTransport.stderr) {
backingServerTransport.stderr.on("data", (chunk) => {
webAppTransport.send({
jsonrpc: "2.0",
method: "notifications/stderr",
params: {
content: chunk.toString(),
},
});
});
}

mcpProxy({
transportToClient: webAppTransport,
transportToServer: backingServerTransport,
Expand Down