@cloudgrid-io/mcp 0.16.0 → 0.16.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgrid-io/mcp",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "description": "MCP server for CloudGrid. Three editions: a local stdio server (full toolset), a hosted web server (light, CLI-free toolset), and a public docs server (search_cloudgrid_documentation) over MCP Streamable HTTP.",
   "type": "module",
   "bin": {
@@ -39,7 +39,8 @@
     "smoke:docs": "node test/smoke-docs.mjs",
     "start:docs": "node src/docs.js",
     "snapshot:corpus": "node scripts/snapshot-corpus.mjs",
-    "build:mcpb": "node scripts/build-mcpb.mjs"
+    "build:mcpb": "node scripts/build-mcpb.mjs",
+    "test:widgets": "node test/apps-widgets.test.mjs"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",

package/src/tools.js

@@ -45,6 +45,14 @@ const AUTHED_HTML_MAX_BYTES = 25_000_000;
 const CONSOLE_URL = "https://console.cloudgrid.io/";
 
 // ── Widget resources (ChatGPT Apps SDK, web edition only) ────────────────────
+// The Apps-SDK UI widgets (openai/outputTemplate → a ui:// html resource) render
+// as a broken black frame in ChatGPT today, hiding the plain-text result. Gate
+// them behind an env flag, DEFAULT OFF, so the drop/plug result is text-first
+// (the live URL is already the first line of the text content) and the widget is
+// optional. Flip MCP_APPS_WIDGETS=1 in the platform manifest to re-enable once
+// the widget HTML is verified to render. The resources stay registered either
+// way (harmless when no tool references them via outputTemplate).
+const APPS_WIDGETS_ENABLED = process.env.MCP_APPS_WIDGETS === "1";
 const LIVE_RESULT_URI = "ui://cloudgrid/live-result.html";
 // URI/resource-name/filename stay `org-picker` — that's the stable contract the
 // web card is registered under; only the JS identifier moves toward grid.
@@ -753,7 +761,7 @@ export async function resolveGridOrAsk(ctx, { token, suppliedGrid, edition }, de
         // `needs_grid` is the new field; `needs_org`/`orgs` are kept as aliases
         // so the existing org-picker.html web widget (reads data.orgs) still works.
         structured: { needs_grid: true, needs_org: true, grids: annotated, orgs: annotated },
-        ...(edition === "web" ? { meta: { "openai/outputTemplate": GRID_PICKER_URI } } : {}),
+        ...(edition === "web" && APPS_WIDGETS_ENABLED ? { meta: { "openai/outputTemplate": GRID_PICKER_URI } } : {}),
       },
     };
   }
@@ -2322,11 +2330,66 @@ function isCloudgridHost(hostname) {
   return h === "cloudgrid.io" || h.endsWith(".cloudgrid.io");
 }
 
+// Shape an HTML string into the gridctl_source result (shared by the API-read
+// and the public-fetch paths). Caps the body at SOURCE_MAX_BYTES.
+function shapeSourceResult(sourceUrl, entityId, htmlStr) {
+  const buf = Buffer.from(htmlStr, "utf-8");
+  const totalBytes = buf.length;
+  const truncated = totalBytes > SOURCE_MAX_BYTES;
+  const html = truncated ? buf.subarray(0, SOURCE_MAX_BYTES).toString("utf-8") : htmlStr;
+  const lines = [
+    `Current source for ${sourceUrl} (${totalBytes} bytes) — edit this and re-plug with target_entity_id to update the same URL:`,
+  ];
+  if (truncated) {
+    lines.push(
+      "(too large to return in full; re-plug needs the complete document — consider that this drop may be multi-file)",
+    );
+  }
+  lines.push("", html);
+  return {
+    text: lines.join("\n"),
+    structured: { url: sourceUrl, entity_id: entityId ?? null, bytes: totalBytes, truncated, html },
+  };
+}
+
+// Read an inspiration's HTML via the API (server-side storage read) instead of
+// fetching the public *.cloudgrid.io URL. Critical on the hosted edition: the
+// MCP pod can reach the API (it POSTs /api/v2/plug) but CANNOT egress to the
+// public ingress ("fetch failed"). getInspirationSource resolves directly by
+// entity_id when the path segment is a UUID (no org context needed), else by
+// slug + the X-CloudGrid-Grid active-org header. Returns the html string, or
+// null if the API can't serve it (→ caller falls back to the direct fetch).
+async function readInspirationSourceViaApi(ctx, { entityId, slug, grid }) {
+  let token = null;
+  try { token = await ctx.getToken(); } catch { /* anonymous is fine for public */ }
+  const baseHeaders = token ? { Authorization: `Bearer ${token}` } : {};
+  const attempts = [];
+  if (entityId) attempts.push({ seg: entityId, grid: null });   // UUID → resolves by id, no org ctx
+  if (slug) attempts.push({ seg: slug, grid: grid || null });   // slug → needs org (grid) context
+  for (const a of attempts) {
+    try {
+      const headers = { ...baseHeaders };
+      if (a.grid) headers["X-CloudGrid-Grid"] = a.grid;
+      const res = await fetch(
+        `${API_BASE}/api/v2/inspirations/${encodeURIComponent(a.seg)}/source`,
+        { method: "GET", headers, signal: AbortSignal.timeout(15_000) },
+      );
+      if (!res.ok) continue;
+      const data = await res.json().catch(() => null);
+      if (data && typeof data.html === "string") return data.html;
+    } catch {
+      // try the next attempt, then the public-fetch fallback
+    }
+  }
+  return null;
+}
+
 // Fetch a drop's/inspiration's current deployed HTML inline as text so an agent
 // that lost the content can edit it and re-plug in place. Resolves the fetch URL
-// (explicit url → session lastDrop → composed grid+slug), enforces the
-// `*.cloudgrid.io` SSRF guard, caps the body at SOURCE_MAX_BYTES, and fails
-// gracefully on a non-200. Uses the global `fetch` seam so tests can mock it.
+// (explicit url → session lastDrop → composed grid+slug), then reads the HTML
+// via the API (reachable) BEFORE falling back to a direct `*.cloudgrid.io` fetch
+// (SSRF-guarded, capped at SOURCE_MAX_BYTES). Uses the global `fetch` seam so
+// tests can mock it.
 export async function runSource(ctx, { entity_id, url, grid, slug } = {}) {
   const last = ctx.state.lastDrop;
   // Resolution order: explicit url → session lastDrop.url (if entity_id matches
@@ -2359,6 +2422,23 @@ export async function runSource(ctx, { entity_id, url, grid, slug } = {}) {
   }
 
   const resolvedUrl = parsed.toString();
+  const eid = entity_id ?? (last && (!entity_id || last.entity_id === entity_id) ? last.entity_id : null);
+
+  // ── API-first (reachable) ────────────────────────────────────────────────
+  // Read the HTML from the API server-side rather than fetching the public URL.
+  // The hosted MCP pod can reach the API but NOT the public *.cloudgrid.io
+  // ingress ("fetch failed") — this is the fix for hosted edit-in-place. Derive
+  // the grid/slug hint from the inspiration path URL (`grid.cloudgrid.io/slug`).
+  const host = parsed.hostname;
+  const gridHint = grid ?? (host.endsWith(".cloudgrid.io") && !host.includes("--") && host.split(".").length === 3
+    ? host.split(".")[0] : null);
+  const slugHint = slug ?? (parsed.pathname.replace(/^\/+/, "").split("/")[0] || null);
+  const apiHtml = await readInspirationSourceViaApi(ctx, { entityId: eid, slug: slugHint, grid: gridHint });
+  if (apiHtml != null) return shapeSourceResult(resolvedUrl, eid, apiHtml);
+
+  // ── Fallback: direct public fetch ────────────────────────────────────────
+  // Local edition has normal egress; last resort on hosted (e.g. a runtime app
+  // whose source the inspiration route can't serve).
   let res;
   try {
     res = await fetch(resolvedUrl, {
@@ -2390,30 +2470,7 @@ export async function runSource(ctx, { entity_id, url, grid, slug } = {}) {
   }
 
   const buf = Buffer.from(await res.arrayBuffer());
-  const totalBytes = buf.length;
-  const truncated = totalBytes > SOURCE_MAX_BYTES;
-  const html = (truncated ? buf.subarray(0, SOURCE_MAX_BYTES) : buf).toString("utf-8");
-
-  const lines = [
-    `Current source for ${resolvedUrl} (${totalBytes} bytes) — edit this and re-plug with target_entity_id to update the same URL:`,
-  ];
-  if (truncated) {
-    lines.push(
-      "(too large to return in full; re-plug needs the complete document — consider that this drop may be multi-file)",
-    );
-  }
-  lines.push("", html);
-
-  return {
-    text: lines.join("\n"),
-    structured: {
-      url: resolvedUrl,
-      entity_id: entity_id ?? last?.entity_id ?? null,
-      bytes: totalBytes,
-      truncated,
-      html,
-    },
-  };
+  return shapeSourceResult(resolvedUrl, eid, buf.toString("utf-8"));
 }
 
 // ── Registration ───────────────────────────────────────────────────────────────
@@ -2531,7 +2588,7 @@ export function registerTools(server, ctx) {
         login_url: z.string().optional().describe("Sign-in URL when authentication is needed."),
       },
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
-      ...(ctx.edition === "web" ? {
+      ...(ctx.edition === "web" && APPS_WIDGETS_ENABLED ? {
         _meta: {
           ui: { resourceUri: LIVE_RESULT_URI, csp: WIDGET_CSP },
           "openai/outputTemplate": LIVE_RESULT_URI,