sunpeak 0.16.3 → 0.16.5

package/dist/mcp/index.js

@@ -15518,27 +15518,30 @@ function createAppServer(config, simulations, viteMode) {
     },
     { capabilities: { resources: {}, tools: {} } }
   );
-  const registeredResources = /* @__PURE__ */ new Set();
+  const registeredUriSet = /* @__PURE__ */ new Set();
+  const resourceHandles = /* @__PURE__ */ new Map();
+  const toolHandles = [];
   for (const simulation of simulations) {
     const resource = simulation.resource;
     const tool = simulation.tool;
     const toolResult = simulation.toolResult ?? { structuredContent: null };
     const uri2 = resource.uri ?? `ui://${resource.name}`;
+    const resourceName = resource.name;
     const resourceMeta = resource._meta ?? {};
     const toolMeta = tool._meta ?? {};
-    if (!registeredResources.has(uri2)) {
-      registeredResources.add(uri2);
+    if (!registeredUriSet.has(uri2)) {
+      registeredUriSet.add(uri2);
       const listMeta = viteMode ? injectViteCSP(resourceMeta) : resourceMeta;
       console.log(`[MCP] RegisterResource: ${uri2}`);
-      ak(
-        mcpServer,
-        resource.name,
+      const handle = mcpServer.registerResource(
+        resourceName,
         uri2,
         {
+          mimeType: EI,
           description: resource.description,
           _meta: listMeta
         },
-        async (_uri, extra) => {
+        async (readUri, extra) => {
           const prodBuild = needsProdBuild(
             extra?.requestInfo?.headers ?? {}
           );
@@ -15547,17 +15550,18 @@ function createAppServer(config, simulations, viteMode) {
           try {
             content = getResourceHtml(simulation, viteMode, prodBuild);
           } catch (error) {
-            console.error(`[MCP] ReadResource error for ${uri2}:`, error);
+            console.error(`[MCP] ReadResource error for ${readUri.href}:`, error);
             throw error;
           }
           const sizeKB = (content.length / 1024).toFixed(1);
           console.log(
-            `[MCP] ReadResource: ${uri2} → ${sizeKB}KB${prodBuild ? " (prod build)" : " (vite)"}`
+            `[MCP] ReadResource: ${readUri.href} → ${sizeKB}KB${prodBuild ? " (prod build)" : " (vite)"}`
           );
           return {
             contents: [
               {
-                uri: uri2,
+                // Use readUri (not closure variable) so the response URI matches after updates
+                uri: readUri.href,
                 mimeType: EI,
                 text: content,
                 _meta: readMeta
@@ -15566,20 +15570,22 @@ function createAppServer(config, simulations, viteMode) {
           };
         }
       );
+      resourceHandles.set(resourceName, handle);
     }
-    hk(
+    const fullToolMeta = {
+      ...toolMeta,
+      ui: {
+        resourceUri: uri2,
+        // Preserve tool visibility from simulation metadata if declared
+        ...toolMeta.ui?.visibility ? { visibility: toolMeta.ui.visibility } : {}
+      }
+    };
+    const toolHandle = hk(
       mcpServer,
       tool.name,
       {
         description: tool.description,
-        _meta: {
-          ...toolMeta,
-          ui: {
-            resourceUri: uri2,
-            // Preserve tool visibility from simulation metadata if declared
-            ...toolMeta.ui?.visibility ? { visibility: toolMeta.ui.visibility } : {}
-          }
-        }
+        _meta: fullToolMeta
       },
       async (extra) => {
         const args = extra.request?.params?.arguments ?? {};
@@ -15600,12 +15606,13 @@ function createAppServer(config, simulations, viteMode) {
         };
       }
     );
+    toolHandles.push({ handle: toolHandle, resourceName, toolMeta: fullToolMeta });
   }
-  const registeredUris = Array.from(registeredResources).join(", ");
+  const registeredUris = Array.from(registeredUriSet).join(", ");
   console.log(
     `[MCP] Registered ${simulations.length} tool(s) and resource(s)${viteMode ? " (vite mode)" : ""}: ${registeredUris}`
   );
-  return mcpServer;
+  return { server: mcpServer, resourceHandles, toolHandles };
 }
 const SESSION_IDLE_TIMEOUT_MS$1 = 5 * 60 * 1e3;
 function isLocalConnection(req) {
@@ -15624,10 +15631,8 @@ const cleanupInterval = setInterval(() => {
   const now = Date.now();
   for (const [id2, session] of sessions) {
     if (now - session.lastActivity > SESSION_IDLE_TIMEOUT_MS$1) {
-      sessions.delete(id2);
-      session.transport.close?.();
-      session.server.close();
-      console.log(`[MCP] Session expired: ${id2.substring(0, 8)}... (${sessions.size} active)`);
+      console.log(`[MCP] Session expired: ${id2.substring(0, 8)}...`);
+      void session.server.close();
     }
   }
 }, 6e4);
@@ -15674,11 +15679,18 @@ async function handleMcpRequest(req, res, config, simulations, viteMode) {
   }
   if (req.method === "POST") {
     const isLocal = isLocalConnection(req);
-    const server = createAppServer(config, simulations, viteMode);
+    const { server, resourceHandles, toolHandles } = createAppServer(config, simulations, viteMode);
     const transport = new StreamableHTTPServerTransport({
       sessionIdGenerator: () => randomUUID(),
       onsessioninitialized: (id2) => {
-        sessions.set(id2, { server, transport, isLocal, lastActivity: Date.now() });
+        sessions.set(id2, {
+          server,
+          transport,
+          isLocal,
+          lastActivity: Date.now(),
+          resourceHandles,
+          toolHandles
+        });
         const origin = isLocal ? "local" : "tunnel";
         console.log(
           `[MCP] Session started: ${id2.substring(0, 8)}... (${origin}, ${sessions.size} active)`
@@ -15693,13 +15705,12 @@ async function handleMcpRequest(req, res, config, simulations, viteMode) {
       const id2 = transport.sessionId;
       console.error(`[MCP] Transport error${id2 ? ` (${id2.substring(0, 8)}...)` : ""}:`, error);
     };
-    transport.onclose = async () => {
+    transport.onclose = () => {
       const id2 = transport.sessionId;
       if (id2 && sessions.has(id2)) {
         sessions.delete(id2);
         console.log(`[MCP] Session closed: ${id2.substring(0, 8)}... (${sessions.size} active)`);
       }
-      await server.close();
     };
     await server.connect(transport);
     await transport.handleRequest(req, res, parsedBody);
@@ -15794,16 +15805,24 @@ function runMCPServer(config) {
   process.on("SIGINT", () => void shutdown());
   return {
     invalidateResources() {
-      let notified = 0;
+      if (sessions.size === 0) return;
+      const timestamp = Date.now();
       for (const [, session] of sessions) {
-        if (!session.isLocal) {
-          session.server.sendResourceListChanged();
-          notified++;
+        for (const [name, handle] of session.resourceHandles) {
+          handle.update({ uri: `ui://${name}-${timestamp}` });
+        }
+        for (const { handle, resourceName, toolMeta } of session.toolHandles) {
+          const newUri = `ui://${resourceName}-${timestamp}`;
+          handle.update({
+            _meta: {
+              ...toolMeta,
+              ui: { ...toolMeta.ui, resourceUri: newUri },
+              "ui/resourceUri": newUri
+            }
+          });
         }
       }
-      if (notified > 0) {
-        console.log(`[MCP] Notified ${notified} session(s) of resource changes`);
-      }
+      console.log(`[MCP] Cache-busted ${sessions.size} session(s) with timestamp ${timestamp}`);
     }
   };
 }
@@ -15914,10 +15933,8 @@ function createMcpHandler(config) {
     const now = Date.now();
     for (const [id2, session] of sessions2) {
       if (now - session.lastActivity > SESSION_IDLE_TIMEOUT_MS) {
-        sessions2.delete(id2);
-        session.transport.close?.();
-        session.server.close();
-        console.log(`[MCP] Session expired: ${id2.substring(0, 8)}... (${sessions2.size} active)`);
+        console.log(`[MCP] Session expired: ${id2.substring(0, 8)}...`);
+        void session.server.close();
       }
     }
   }, 6e4);
@@ -15995,13 +16012,12 @@ function createMcpHandler(config) {
         const id2 = transport.sessionId;
         console.error(`[MCP] Transport error${id2 ? ` (${id2.substring(0, 8)}...)` : ""}:`, error);
       };
-      transport.onclose = async () => {
+      transport.onclose = () => {
         const id2 = transport.sessionId;
         if (id2 && sessions2.has(id2)) {
           sessions2.delete(id2);
           console.log(`[MCP] Session closed: ${id2.substring(0, 8)}... (${sessions2.size} active)`);
         }
-        await server.close();
       };
       await server.connect(transport);
       await transport.handleRequest(req, res, parsedBody);
@@ -16017,10 +16033,8 @@ function createHandler(config) {
     const now = Date.now();
     for (const [id2, session] of sessions2) {
       if (now - session.lastActivity > SESSION_IDLE_TIMEOUT_MS) {
-        sessions2.delete(id2);
-        session.transport.close?.();
-        session.server.close();
-        console.log(`[MCP] Session expired: ${id2.substring(0, 8)}... (${sessions2.size} active)`);
+        console.log(`[MCP] Session expired: ${id2.substring(0, 8)}...`);
+        void session.server.close();
       }
     }
   }, 6e4);
@@ -16075,12 +16089,11 @@ function createHandler(config) {
       transport.onerror = (error) => {
         console.error("[MCP] Transport error:", error);
       };
-      transport.onclose = async () => {
+      transport.onclose = () => {
         const id2 = transport.sessionId;
         if (id2 && sessions2.has(id2)) {
           sessions2.delete(id2);
         }
-        await server.close();
       };
       await server.connect(transport);
       const response = await transport.handleRequest(req, { parsedBody, authInfo });