From 48355e9cb2f14f5418267328044ab1ec21d22d68 Mon Sep 17 00:00:00 2001
From: Ashwin Bhat <ashwin@anthropic.com>
Date: Wed, 16 Oct 2024 14:44:21 -0700
Subject: [PATCH] receive and display server notifications

---
 client/src/App.css                         |   3 -
 client/src/App.tsx                         |  40 +++--
 client/src/components/History.tsx          | 183 ++++++++++++++-------
 client/src/components/NotificationsTab.tsx |  33 ----
 client/src/components/ToolsTab.tsx         |   4 +-
 client/tsconfig.node.tsbuildinfo           |   1 -
 6 files changed, 158 insertions(+), 106 deletions(-)
 delete mode 100644 client/src/components/NotificationsTab.tsx
 delete mode 100644 client/tsconfig.node.tsbuildinfo

diff --git a/client/src/App.css b/client/src/App.css
index b9d355d..5f47310 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -1,8 +1,5 @@
 #root {
-  max-width: 1280px;
   margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
 }
 
 .logo {
diff --git a/client/src/App.tsx b/client/src/App.tsx
index 5747b9d..b255ab5 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -10,8 +10,10 @@ import {
   Resource,
   Tool,
   ClientRequest,
+  ProgressNotificationSchema,
+  ServerNotification,
 } from "mcp-typescript/types.js";
-import { useState } from "react";
+import { useState, useRef } from "react";
 import {
   Send,
   Bell,
@@ -36,11 +38,11 @@ import ConsoleTab from "./components/ConsoleTab";
 import Sidebar from "./components/Sidebar";
 import RequestsTab from "./components/RequestsTabs";
 import ResourcesTab from "./components/ResourcesTab";
-import NotificationsTab from "./components/NotificationsTab";
 import PromptsTab, { Prompt } from "./components/PromptsTab";
 import ToolsTab from "./components/ToolsTab";
-import History from "./components/History";
 import { AnyZodObject } from "zod";
+import HistoryAndNotifications from "./components/History";
+import "./App.css";
 
 const App = () => {
   const [connectionStatus, setConnectionStatus] = useState<
@@ -57,7 +59,7 @@ const App = () => {
     "/Users/ashwin/.nvm/versions/node/v18.20.4/bin/node",
   );
   const [args, setArgs] = useState<string>(
-    "/Users/ashwin/code/example-servers/build/everything/stdio.js",
+    "/Users/ashwin/code/mcp/example-servers/build/everything/stdio.js",
   );
   const [url, setUrl] = useState<string>("http://localhost:3001/sse");
   const [transportType, setTransportType] = useState<"stdio" | "sse">("stdio");
@@ -65,12 +67,14 @@ const App = () => {
     { request: string; response: string }[]
   >([]);
   const [mcpClient, setMcpClient] = useState<Client | null>(null);
+  const [notifications, setNotifications] = useState<ServerNotification[]>([]);
 
   const [selectedResource, setSelectedResource] = useState<Resource | null>(
     null,
   );
   const [selectedPrompt, setSelectedPrompt] = useState<Prompt | null>(null);
   const [selectedTool, setSelectedTool] = useState<Tool | null>(null);
+  const progressTokenRef = useRef(0);
 
   const pushHistory = (request: object, response: object) => {
     setRequestHistory((prev) => [
@@ -155,7 +159,13 @@ const App = () => {
     const response = await makeRequest(
       {
         method: "tools/call" as const,
-        params: { name, arguments: params },
+        params: {
+          name,
+          arguments: params,
+          _meta: {
+            progressToken: progressTokenRef.current++,
+          },
+        },
       },
       CallToolResultSchema,
     );
@@ -182,6 +192,16 @@ const App = () => {
       const clientTransport = new SSEClientTransport(backendUrl);
       await client.connect(clientTransport);
 
+      client.setNotificationHandler(
+        ProgressNotificationSchema,
+        (notification) => {
+          setNotifications((prevNotifications) => [
+            ...prevNotifications,
+            notification,
+          ]);
+        },
+      );
+
       setMcpClient(client);
       setConnectionStatus("connected");
     } catch (e) {
@@ -255,10 +275,6 @@ const App = () => {
                     <Send className="w-4 h-4 mr-2" />
                     Requests
                   </TabsTrigger>
-                  <TabsTrigger value="notifications" disabled>
-                    <Bell className="w-4 h-4 mr-2" />
-                    Notifications
-                  </TabsTrigger>
                   <TabsTrigger value="tools">
                     <Hammer className="w-4 h-4 mr-2" />
                     Tools
@@ -279,7 +295,6 @@ const App = () => {
                     resourceContent={resourceContent}
                     error={error}
                   />
-                  <NotificationsTab />
                   <PromptsTab
                     prompts={prompts}
                     listPrompts={listPrompts}
@@ -315,7 +330,10 @@ const App = () => {
           </div>
         </div>
       </div>
-      <History requestHistory={requestHistory} />
+      <HistoryAndNotifications
+        requestHistory={requestHistory}
+        serverNotifications={notifications}
+      />
     </div>
   );
 };
diff --git a/client/src/components/History.tsx b/client/src/components/History.tsx
index c0ac2d1..066fbc1 100644
--- a/client/src/components/History.tsx
+++ b/client/src/components/History.tsx
@@ -1,94 +1,163 @@
 import { useState } from "react";
 import { Copy } from "lucide-react";
+import { ServerNotification } from "mcp-typescript/types.js";
 
-const History = ({
+const HistoryAndNotifications = ({
   requestHistory,
+  serverNotifications,
 }: {
   requestHistory: Array<{ request: string; response: string | null }>;
+  serverNotifications: ServerNotification[];
 }) => {
   const [expandedRequests, setExpandedRequests] = useState<{
     [key: number]: boolean;
   }>({});
+  const [expandedNotifications, setExpandedNotifications] = useState<{
+    [key: number]: boolean;
+  }>({});
 
   const toggleRequestExpansion = (index: number) => {
     setExpandedRequests((prev) => ({ ...prev, [index]: !prev[index] }));
   };
 
+  const toggleNotificationExpansion = (index: number) => {
+    setExpandedNotifications((prev) => ({ ...prev, [index]: !prev[index] }));
+  };
+
   const copyToClipboard = (text: string) => {
     navigator.clipboard.writeText(text);
   };
 
   return (
-    <div className="w-64 bg-white shadow-md p-4 overflow-y-auto">
-      <h2 className="text-lg font-semibold mb-4">History</h2>
-      <ul className="space-y-3">
-        {requestHistory
-          .slice()
-          .reverse()
-          .map((request, index) => (
-            <li
-              key={index}
-              className="text-sm text-gray-600 bg-gray-100 p-2 rounded"
-            >
-              <div
-                className="flex justify-between items-center cursor-pointer"
-                onClick={() =>
-                  toggleRequestExpansion(requestHistory.length - 1 - index)
-                }
-              >
-                <span className="font-mono">
-                  {requestHistory.length - index}.{" "}
-                  {JSON.parse(request.request).method}
-                </span>
-                <span>
-                  {expandedRequests[requestHistory.length - 1 - index]
-                    ? "▼"
-                    : "▶"}
-                </span>
-              </div>
-              {expandedRequests[requestHistory.length - 1 - index] && (
-                <>
-                  <div className="mt-2">
-                    <div className="flex justify-between items-center mb-1">
-                      <span className="font-semibold text-blue-600">
-                        Request:
-                      </span>
-                      <button
-                        onClick={() => copyToClipboard(request.request)}
-                        className="text-blue-500 hover:text-blue-700"
-                      >
-                        <Copy size={16} />
-                      </button>
-                    </div>
-                    <pre className="whitespace-pre-wrap break-words bg-blue-50 p-2 rounded">
-                      {JSON.stringify(JSON.parse(request.request), null, 2)}
-                    </pre>
+    <div className="w-64 bg-white shadow-md p-4 overflow-hidden flex flex-col h-full">
+      <div className="flex-1 overflow-y-auto mb-4 border-b pb-4">
+        <h2 className="text-lg font-semibold mb-4">History</h2>
+        {requestHistory.length === 0 ? (
+          <p className="text-sm text-gray-500 italic">No history yet</p>
+        ) : (
+          <ul className="space-y-3">
+            {requestHistory
+              .slice()
+              .reverse()
+              .map((request, index) => (
+                <li
+                  key={index}
+                  className="text-sm text-gray-600 bg-gray-100 p-2 rounded"
+                >
+                  <div
+                    className="flex justify-between items-center cursor-pointer"
+                    onClick={() =>
+                      toggleRequestExpansion(requestHistory.length - 1 - index)
+                    }
+                  >
+                    <span className="font-mono">
+                      {requestHistory.length - index}.{" "}
+                      {JSON.parse(request.request).method}
+                    </span>
+                    <span>
+                      {expandedRequests[requestHistory.length - 1 - index]
+                        ? "▼"
+                        : "▶"}
+                    </span>
                   </div>
-                  {request.response && (
+                  {expandedRequests[requestHistory.length - 1 - index] && (
+                    <>
+                      <div className="mt-2">
+                        <div className="flex justify-between items-center mb-1">
+                          <span className="font-semibold text-blue-600">
+                            Request:
+                          </span>
+                          <button
+                            onClick={() => copyToClipboard(request.request)}
+                            className="text-blue-500 hover:text-blue-700"
+                          >
+                            <Copy size={16} />
+                          </button>
+                        </div>
+                        <pre className="whitespace-pre-wrap break-words bg-blue-50 p-2 rounded">
+                          {JSON.stringify(JSON.parse(request.request), null, 2)}
+                        </pre>
+                      </div>
+                      {request.response && (
+                        <div className="mt-2">
+                          <div className="flex justify-between items-center mb-1">
+                            <span className="font-semibold text-green-600">
+                              Response:
+                            </span>
+                            <button
+                              onClick={() => copyToClipboard(request.response!)}
+                              className="text-blue-500 hover:text-blue-700"
+                            >
+                              <Copy size={16} />
+                            </button>
+                          </div>
+                          <pre className="whitespace-pre-wrap break-words bg-green-50 p-2 rounded">
+                            {JSON.stringify(
+                              JSON.parse(request.response),
+                              null,
+                              2,
+                            )}
+                          </pre>
+                        </div>
+                      )}
+                    </>
+                  )}
+                </li>
+              ))}
+          </ul>
+        )}
+      </div>
+      <div className="flex-1 overflow-y-auto">
+        <h2 className="text-lg font-semibold mb-4">Server Notifications</h2>
+        {serverNotifications.length === 0 ? (
+          <p className="text-sm text-gray-500 italic">No notifications yet</p>
+        ) : (
+          <ul className="space-y-3">
+            {serverNotifications
+              .slice()
+              .reverse()
+              .map((notification, index) => (
+                <li
+                  key={index}
+                  className="text-sm text-gray-600 bg-gray-100 p-2 rounded"
+                >
+                  <div
+                    className="flex justify-between items-center cursor-pointer"
+                    onClick={() => toggleNotificationExpansion(index)}
+                  >
+                    <span className="font-mono">
+                      {serverNotifications.length - index}.{" "}
+                      {notification.method}
+                    </span>
+                    <span>{expandedNotifications[index] ? "▼" : "▶"}</span>
+                  </div>
+                  {expandedNotifications[index] && (
                     <div className="mt-2">
                       <div className="flex justify-between items-center mb-1">
-                        <span className="font-semibold text-green-600">
-                          Response:
+                        <span className="font-semibold text-purple-600">
+                          Details:
                         </span>
                         <button
-                          onClick={() => copyToClipboard(request.response!)}
+                          onClick={() =>
+                            copyToClipboard(JSON.stringify(notification))
+                          }
                           className="text-blue-500 hover:text-blue-700"
                         >
                           <Copy size={16} />
                         </button>
                       </div>
-                      <pre className="whitespace-pre-wrap break-words bg-green-50 p-2 rounded">
-                        {JSON.stringify(JSON.parse(request.response), null, 2)}
+                      <pre className="whitespace-pre-wrap break-words bg-purple-50 p-2 rounded">
+                        {JSON.stringify(notification, null, 2)}
                       </pre>
                     </div>
                   )}
-                </>
-              )}
-            </li>
-          ))}
-      </ul>
+                </li>
+              ))}
+          </ul>
+        )}
+      </div>
     </div>
   );
 };
 
-export default History;
+export default HistoryAndNotifications;
diff --git a/client/src/components/NotificationsTab.tsx b/client/src/components/NotificationsTab.tsx
deleted file mode 100644
index 7e23b99..0000000
--- a/client/src/components/NotificationsTab.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Bell } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
-import { TabsContent } from "@/components/ui/tabs";
-
-const NotificationsTab = () => (
-  <TabsContent value="notifications" className="space-y-4">
-    <div className="grid grid-cols-2 gap-4">
-      <div className="space-y-4">
-        <div className="flex space-x-2">
-          <Input placeholder="Notification method" />
-          <Button>
-            <Bell className="w-4 h-4 mr-2" />
-            Send
-          </Button>
-        </div>
-        <Textarea
-          placeholder="Notification parameters (JSON)"
-          className="h-64 font-mono"
-        />
-      </div>
-      <div className="bg-white rounded-lg shadow p-4">
-        <h3 className="font-semibold mb-4">Recent Notifications</h3>
-        <div className="space-y-2">
-          {/* Notification history would go here */}
-        </div>
-      </div>
-    </div>
-  </TabsContent>
-);
-
-export default NotificationsTab;
diff --git a/client/src/components/ToolsTab.tsx b/client/src/components/ToolsTab.tsx
index 60f8381..c7efa33 100644
--- a/client/src/components/ToolsTab.tsx
+++ b/client/src/components/ToolsTab.tsx
@@ -36,7 +36,9 @@ const ToolsTab = ({
         renderItem={(tool) => (
           <>
             <span className="flex-1">{tool.name}</span>
-            <span className="text-sm text-gray-500">{tool.description}</span>
+            <span className="text-sm text-gray-500 text-right">
+              {tool.description}
+            </span>
           </>
         )}
         title="Tools"
diff --git a/client/tsconfig.node.tsbuildinfo b/client/tsconfig.node.tsbuildinfo
deleted file mode 100644
index 75ea001..0000000
--- a/client/tsconfig.node.tsbuildinfo
+++ /dev/null
@@ -1 +0,0 @@
-{"root":["./vite.config.ts"],"version":"5.6.3"}
\ No newline at end of file