@cloudgrid-io/mcp 0.4.5 → 0.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgrid-io/mcp",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "MCP server for CloudGrid. Two editions: a local stdio server (full toolset) and a hosted web server (light, CLI-free toolset) over MCP Streamable HTTP.",
   "type": "module",
   "bin": {
@@ -26,7 +26,6 @@
     "build:mcpb": "node scripts/build-mcpb.mjs"
   },
   "dependencies": {
-    "@cloudgrid-io/cli": "^0.9.20",
     "@modelcontextprotocol/sdk": "^1.0.0",
     "express": "^4.22.2",
     "zod": "^3.23.0"

package/src/tools.js

@@ -90,6 +90,9 @@ function resolveBundledCli() {
   }
 }
 
+// Pin the CLI version for the lazy npx fallback so behaviour is reproducible.
+const CLI_NPX_PKG = "@cloudgrid-io/cli@^0.9.20";
+
 async function runCloudgrid(args, opts = {}) {
   const cwd = resolveCwd(opts.cwd);
   const execOpts = {
@@ -99,7 +102,15 @@ async function runCloudgrid(args, opts = {}) {
     ...(cwd ? { cwd } : {}),
   };
 
-  // 1. Try the bundled CLI (node <cliEntry> ...args)
+  const extract = (err) => {
+    const detail = [err && err.stdout, err && err.stderr, err && err.message]
+      .filter(Boolean)
+      .join("\n")
+      .trim();
+    return new Error(detail || "cloudgrid command failed");
+  };
+
+  // 1. Bundled CLI (the .mcpb ships it in its node_modules)
   const bundled = resolveBundledCli();
   if (bundled) {
     try {
@@ -110,29 +121,32 @@ async function runCloudgrid(args, opts = {}) {
       );
       return (stdout || stderr || "").trim() || "Done.";
     } catch (err) {
-      const detail = [err && err.stdout, err && err.stderr, err && err.message]
-        .filter(Boolean)
-        .join("\n")
-        .trim();
-      throw new Error(detail || "cloudgrid command failed");
+      throw extract(err);
     }
   }
 
-  // 2. Fallback: global `cloudgrid` on PATH
+  // 2. Global `cloudgrid` on PATH
   try {
     const { stdout, stderr } = await execFileAsync("cloudgrid", args, execOpts);
     return (stdout || stderr || "").trim() || "Done.";
   } catch (err) {
-    if (err && err.code === "ENOENT") {
-      throw new Error(
-        "The cloudgrid CLI is not installed. Install it with: npm install -g @cloudgrid-io/cli",
-      );
-    }
-    const detail = [err && err.stdout, err && err.stderr, err && err.message]
-      .filter(Boolean)
-      .join("\n")
-      .trim();
-    throw new Error(detail || "cloudgrid command failed");
+    if (!(err && err.code === "ENOENT")) throw extract(err);
+    // Not found — fall through to lazy npx fetch
+  }
+
+  // 3. Lazy fetch: npx -y @cloudgrid-io/cli@<pinned> <args>
+  //    One-time download; npx caches it for subsequent invocations.
+  console.error("cloudgrid-mcp: fetching the CloudGrid CLI (first use)…");
+  const npx = process.platform === "win32" ? "npx.cmd" : "npx";
+  try {
+    const { stdout, stderr } = await execFileAsync(
+      npx,
+      ["-y", CLI_NPX_PKG, ...args],
+      execOpts,
+    );
+    return (stdout || stderr || "").trim() || "Done.";
+  } catch (err) {
+    throw extract(err);
   }
 }
 
@@ -166,7 +180,7 @@ function tryOpenBrowser(url) {
 // ── Org listing (bearer-authed, web edition) ──────────────────────────────────
 // Fetches the signed-in user's orgs via GET /api/v2/orgs. The JWT does not
 // carry orgs (claims: sub, email, name, iat, exp), so the API is the canonical
-// source. Returns [{slug, name, role}].
+// source. Returns [{slug, name, role, render_ready}].
 async function fetchUserOrgs(token) {
   try {
     const res = await fetch(`${API_BASE}/api/v2/orgs`, {
@@ -179,6 +193,7 @@ async function fetchUserOrgs(token) {
       slug: o.slug ?? "",
       name: o.name ?? o.slug ?? "",
       role: o.role ?? "member",
+      render_ready: o.render_ready ?? true, // default true for older APIs
     }));
   } catch {
     return [];
@@ -646,9 +661,11 @@ export function registerTools(server, ctx) {
             const orgs = await fetchUserOrgs(token);
             const activeOrg = await ctx.getActiveOrg();
             const suppliedOrg = input?.org;
-            const validOrg = suppliedOrg && orgs.some((o) => o.slug === suppliedOrg);
-            if (validOrg) {
-              // Supplied org matches a real org slug — publish to it.
+            const matchedOrg = suppliedOrg && orgs.find((o) => o.slug === suppliedOrg);
+            if (matchedOrg) {
+              // Supplied org matches — proceed with it. The agent should have
+              // already checked render_ready via cloudgrid_orgs and warned the
+              // user if this org isn't set up yet. We don't block here.
               input = { ...(input || {}), org: suppliedOrg };
             } else if (orgs.length > 1) {
               // No valid org supplied and multiple orgs — ask once.
@@ -657,20 +674,40 @@ export function registerTools(server, ctx) {
                 ...o,
                 is_active: o.slug === activeOrg,
               }));
-              annotated.sort((a, b) => (b.is_active ? 1 : 0) - (a.is_active ? 1 : 0));
+              // Sort: active org first, then ready orgs, then not-ready orgs.
+              annotated.sort((a, b) => {
+                if (a.is_active !== b.is_active) return b.is_active ? 1 : -1;
+                if (a.render_ready !== b.render_ready) return b.render_ready ? 1 : -1;
+                return 0;
+              });
               const lines = ["Which org should this be published to?"];
               for (const o of annotated) {
-                const tag = o.is_active ? " (your active org)" : "";
-                lines.push(`  ${o.slug} — ${o.name} (${o.role})${tag}`);
+                const tags = [];
+                if (o.is_active) tags.push("your active org");
+                if (!o.render_ready) tags.push("not set up yet");
+                const suffix = tags.length ? ` (${tags.join(", ")})` : "";
+                lines.push(`  ${o.slug} — ${o.name} (${o.role})${suffix}`);
               }
               lines.push("Pass the org slug in the org parameter to publish.");
+              const readyCount = annotated.filter((o) => o.render_ready).length;
+              if (readyCount === 0) {
+                lines.push("Note: none of your orgs are fully set up yet. You can use anonymous: true as a fallback.");
+              }
               return okResult({
                 text: lines.join("\n"),
                 structured: { needs_org: true, orgs: annotated },
                 ...(ctx.edition === "web" ? { meta: { "openai/outputTemplate": ORG_PICKER_URI } } : {}),
               });
             } else if (orgs.length === 1) {
-              // Single org — publish to it silently.
+              if (!orgs[0].render_ready) {
+                // Single org but not set up — tell the agent so it can warn
+                // the user and offer anonymous drop as fallback.
+                const annotated = [{ ...orgs[0], is_active: orgs[0].slug === activeOrg, render_ready: false }];
+                return okResult({
+                  text: `Your only org "${orgs[0].slug}" isn't fully set up yet — pages published there may not load. You can drop anonymously (set anonymous: true) or wait until provisioning completes, then re-run.`,
+                  structured: { needs_org: true, org_not_ready: true, orgs: annotated },
+                });
+              }
               input = { ...(input || {}), org: orgs[0].slug };
             }
           }
@@ -810,7 +847,7 @@ export function registerTools(server, ctx) {
   server.registerTool(
     "cloudgrid_orgs",
     {
-      description: "List the signed-in user's organizations. Returns each org's slug, name, and the user's role. Use to discover which org to publish to. Requires sign-in.",
+      description: "List the signed-in user's organizations. Returns each org's slug, name, role, and render_ready status. Orgs where render_ready is false are still provisioning — pages published there may not load yet. Prefer a render_ready org; if the user insists on a not-ready one, warn them that pages may not load and suggest waiting or choosing a ready org instead. Requires sign-in.",
       inputSchema: {},
       outputSchema: {
         orgs: z.array(z.object({
@@ -818,6 +855,7 @@ export function registerTools(server, ctx) {
           name: z.string().describe("Human-readable org name."),
           role: z.string().describe("User's role in the org."),
           is_active: z.boolean().optional().describe("True if this is the user's currently active org."),
+          render_ready: z.boolean().describe("True if the org's DNS and TLS are provisioned and pages will load. False means the org is still being set up."),
         })).describe("The user's org memberships."),
       },
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: true },
@@ -836,11 +874,23 @@ export function registerTools(server, ctx) {
         ...o,
         is_active: o.slug === activeOrg,
       }));
-      annotated.sort((a, b) => (b.is_active ? 1 : 0) - (a.is_active ? 1 : 0));
+      // Sort: active org first, then ready orgs, then not-ready orgs.
+      annotated.sort((a, b) => {
+        if (a.is_active !== b.is_active) return b.is_active ? 1 : -1;
+        if (a.render_ready !== b.render_ready) return b.render_ready ? 1 : -1;
+        return 0;
+      });
       const lines = annotated.map((o) => {
-        const tag = o.is_active ? " (your active org)" : "";
-        return `${o.slug} — ${o.name} (${o.role})${tag}`;
+        const tags = [];
+        if (o.is_active) tags.push("your active org");
+        if (!o.render_ready) tags.push("not set up yet");
+        const suffix = tags.length ? ` (${tags.join(", ")})` : "";
+        return `${o.slug} — ${o.name} (${o.role})${suffix}`;
       });
+      const readyCount = annotated.filter((o) => o.render_ready).length;
+      if (readyCount === 0 && annotated.length > 0) {
+        lines.push("\nNone of your orgs are fully set up yet. You can use an anonymous drop as a fallback, or wait until provisioning completes.");
+      }
       return okResult({ text: lines.join("\n"), structured: { orgs: annotated } });
     },
   );

package/src/widgets/org-picker.html

@@ -13,8 +13,11 @@ body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;b
 .org-btn{display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-radius:8px;border:1px solid rgba(138,107,255,.3);background:transparent;color:#e0e0e0;cursor:pointer;transition:all .15s;font-size:13px;text-align:left}
 .org-btn:hover{border-color:#8a6bff;background:rgba(138,107,255,.1)}
 .org-btn.loading{opacity:.6;pointer-events:none}
+.org-btn.not-ready{opacity:.65;border-color:rgba(255,200,50,.3)}
+.org-btn.not-ready:hover{border-color:rgba(255,200,50,.6);background:rgba(255,200,50,.06)}
 .org-name{font-weight:500;color:#fff}
 .org-role{font-size:11px;color:#9ca3af}
+.org-warn{font-size:10px;color:#e2b340;margin-left:6px}
 .status{font-size:12px;color:#9ca3af;margin-top:12px}
 </style>
 </head>
@@ -43,9 +46,10 @@ body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;b
         '<div class="orgs">';
     for (var i = 0; i < data.orgs.length; i++) {
       var org = data.orgs[i];
+      var notReady = org.render_ready === false;
       html +=
-        '<button class="org-btn" data-slug="' + esc(org.slug) + '">' +
-          '<span class="org-name">' + esc(org.name) + '</span>' +
+        '<button class="org-btn' + (notReady ? ' not-ready' : '') + '" data-slug="' + esc(org.slug) + '">' +
+          '<span class="org-name">' + esc(org.name) + (notReady ? '<span class="org-warn">not set up yet</span>' : '') + '</span>' +
           '<span class="org-role">' + esc(org.role) + '</span>' +
         '</button>';
     }