@cloudgrid-io/mcp 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgrid-io/mcp",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "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": {

package/src/tools.js

@@ -11,8 +11,8 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { readFile } from "node:fs/promises";
-import { readFileSync } from "node:fs";
-import { basename } from "node:path";
+import { readFileSync, existsSync, statSync } from "node:fs";
+import { basename, resolve } from "node:path";
 import { z } from "zod";
 import { newLoginCode, buildLoginUrl, pollStatusOnce, decodeJwt } from "./auth.js";
 
@@ -59,11 +59,29 @@ function okResult({ text, structured, meta }) {
 }
 
 // ── CLI wrapping (local edition only) ──────────────────────────────────────────
-async function runCloudgrid(args) {
+
+// Resolve and validate a caller-supplied working directory. Returns the resolved
+// absolute path, or process.cwd() when omitted.
+function resolveCwd(cwd) {
+  if (cwd === undefined || cwd === null || cwd === "") return undefined; // let execFile default
+  const abs = resolve(cwd);
+  if (!existsSync(abs)) {
+    throw new Error(`Directory does not exist: ${abs}`);
+  }
+  if (!statSync(abs).isDirectory()) {
+    throw new Error(`Not a directory: ${abs}`);
+  }
+  return abs;
+}
+
+async function runCloudgrid(args, opts = {}) {
+  const cwd = resolveCwd(opts.cwd);
   try {
     const { stdout, stderr } = await execFileAsync("cloudgrid", args, {
       maxBuffer: 16 * 1024 * 1024,
       timeout: 10 * 60 * 1000,
+      stdio: ["ignore", "pipe", "pipe"],
+      ...(cwd ? { cwd } : {}),
     });
     return (stdout || stderr || "").trim() || "Done.";
   } catch (err) {
@@ -80,10 +98,16 @@ async function runCloudgrid(args) {
   }
 }
 
-function cliTool(buildArgs) {
+function cliTool(buildArgs, { cwdParam = false } = {}) {
   return async (input) => {
     try {
-      return ok(await runCloudgrid(buildArgs(input || {})));
+      const params = input || {};
+      const opts = {};
+      if (cwdParam) {
+        // Accept cwd, directory, or dir as the working-directory override.
+        opts.cwd = params.cwd ?? params.directory ?? params.dir;
+      }
+      return ok(await runCloudgrid(buildArgs(params), opts));
     } catch (err) {
       return fail(err.message);
     }
@@ -572,36 +596,28 @@ export function registerTools(server, ctx) {
               structured: { needs_sign_in: true, login_url: url },
             });
           }
-          // Org disambiguation with per-session pick gate: the first drop
-          // always shows the picker when >1 org (even if the model guessed an
-          // org). The flag ctx.state.awaitingOrgPick gates: only after the
-          // picker was shown and the re-call supplies a valid slug do we honor
-          // it. This prevents the model from silently guessing and skipping
-          // the user's choice.
+          // Stateless org disambiguation — no dependency on prior-call state
+          // so it works even when the client reconnects on every tool call
+          // (ChatGPT Apps SDK behaviour).
           {
             const orgs = await fetchUserOrgs(token);
-            if (orgs.length > 1) {
-              const suppliedOrg = input?.org;
-              const validOrg = suppliedOrg && orgs.some((o) => o.slug === suppliedOrg);
-              if (ctx.state.awaitingOrgPick && validOrg) {
-                // The picker was shown previously and the user (or widget)
-                // picked a valid org — honor it, clear the flag, and publish.
-                ctx.state.awaitingOrgPick = false;
-                input = { ...(input || {}), org: suppliedOrg };
-              } else {
-                // First drop (any model-guessed org is ignored) or the
-                // re-call supplied an invalid slug — show the picker.
-                ctx.state.awaitingOrgPick = true;
-                const lines = ["Which org should this be published to?"];
-                for (const o of orgs) lines.push(`  ${o.slug} — ${o.name} (${o.role})`);
-                lines.push("Pass the org slug in the org parameter to publish.");
-                return okResult({
-                  text: lines.join("\n"),
-                  structured: { needs_org: true, orgs },
-                  meta: { "openai/outputTemplate": ORG_PICKER_URI },
-                });
-              }
+            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.
+              input = { ...(input || {}), org: suppliedOrg };
+            } else if (orgs.length > 1) {
+              // No valid org supplied and multiple orgs — ask once.
+              const lines = ["Which org should this be published to?"];
+              for (const o of orgs) lines.push(`  ${o.slug} — ${o.name} (${o.role})`);
+              lines.push("Pass the org slug in the org parameter to publish.");
+              return okResult({
+                text: lines.join("\n"),
+                structured: { needs_org: true, orgs },
+                meta: { "openai/outputTemplate": ORG_PICKER_URI },
+              });
             } else if (orgs.length === 1) {
+              // Single org — publish to it silently.
               input = { ...(input || {}), org: orgs[0].slug };
             }
           }
@@ -782,6 +798,7 @@ export function registerTools(server, ctx) {
       description: z.string().optional().describe("Initial one-line description."),
       dir: z.string().optional().describe("Target directory. Defaults to ./<name>."),
       org: z.string().optional().describe("Override the active org for this init."),
+      cwd: z.string().optional().describe("Working directory. The CLI runs in this directory. Defaults to the MCP server's working directory."),
     },
     { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
     cliTool(({ kind, name, type, description, dir, org }) => {
@@ -791,7 +808,7 @@ export function registerTools(server, ctx) {
       if (dir) args.push("--dir", dir);
       if (org) args.push("--org", org);
       return args;
-    }),
+    }, { cwdParam: true }),
   );
 
   server.tool(
@@ -801,6 +818,7 @@ export function registerTools(server, ctx) {
       target: z.string().optional().describe("Path or URL. Omit to deploy the entity linked to the current directory."),
       org: z.string().optional().describe("Pick or override the org."),
       no_deploy: z.boolean().optional().describe("Register the entity but do not build or deploy."),
+      cwd: z.string().optional().describe("Working directory. The CLI runs in this directory. Defaults to the MCP server's working directory."),
     },
     { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
     cliTool(({ target, org, no_deploy }) => {
@@ -808,9 +826,9 @@ export function registerTools(server, ctx) {
       if (target) args.push(target);
       if (org) args.push("--org", org);
       if (no_deploy) args.push("--no-deploy");
-      args.push("--no-clipboard", "--no-notify");
+      args.push("--auto", "--no-clipboard", "--no-notify");
       return args;
-    }),
+    }, { cwdParam: true }),
   );
 
   server.tool(
@@ -966,7 +984,7 @@ export function registerTools(server, ctx) {
       confirm: z.literal(true).describe("Must be true to proceed."),
     },
     { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
-    cliTool(({ name }) => ["unplug", name]),
+    cliTool(({ name }) => ["unplug", name, "--skip-confirm"]),
   );
 
   server.tool(
@@ -977,7 +995,7 @@ export function registerTools(server, ctx) {
       confirm: z.literal(true).describe("Must be true to proceed."),
     },
     { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
-    cliTool(({ name }) => ["delete", name]),
+    cliTool(({ name }) => ["delete", name, "--yes"]),
   );
 
   server.tool(
@@ -1015,19 +1033,20 @@ export function registerTools(server, ctx) {
       name: z.string().describe("Entity slug."),
       key: z.string().optional().describe("Variable name. Required for get and set."),
       value: z.string().optional().describe("Variable value. Required for set."),
+      cwd: z.string().optional().describe("Working directory. The CLI runs in this directory. Defaults to the MCP server's working directory."),
     },
     { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
     cliTool(({ action, name, key, value }) => {
       if (action === "set") {
         if (!key || value === undefined) throw new Error("key and value are required for set");
-        return ["env", "set", name, key, value];
+        return ["env", "set", name, `${key}=${value}`];
       }
       if (action === "get") {
         if (!key) throw new Error("key is required for get");
-        return ["env", "get", name, key];
+        return ["env", "get", key, name];
       }
       return ["env", "list", name];
-    }),
+    }, { cwdParam: true }),
   );
 
   server.tool(
@@ -1038,6 +1057,7 @@ export function registerTools(server, ctx) {
       name: z.string().describe("Entity slug."),
       key: z.string().optional().describe("Secret name. Required for set."),
       value: z.string().optional().describe("Secret value. Required for set."),
+      cwd: z.string().optional().describe("Working directory. The CLI runs in this directory. Defaults to the MCP server's working directory."),
     },
     { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
     cliTool(({ action, name, key, value }) => {
@@ -1046,7 +1066,7 @@ export function registerTools(server, ctx) {
         return ["secrets", "set", name, key, value];
       }
       return ["secrets", "list", name];
-    }),
+    }, { cwdParam: true }),
   );
 
   server.tool(
@@ -1055,6 +1075,7 @@ export function registerTools(server, ctx) {
     {
       template: z.string().optional().describe("Template name."),
       dir: z.string().optional().describe("Target directory."),
+      cwd: z.string().optional().describe("Working directory. The CLI runs in this directory. Defaults to the MCP server's working directory."),
     },
     { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
     cliTool(({ template, dir }) => {
@@ -1062,7 +1083,7 @@ export function registerTools(server, ctx) {
       if (template) args.push(template);
       if (dir) args.push("--dir", dir);
       return args;
-    }),
+    }, { cwdParam: true }),
   );
 
   server.tool(

package/src/web.js

@@ -55,7 +55,7 @@ function makeWebContext(sessionId) {
   let sessionToken = null;
   return {
     edition: "web",
-    state: { pendingLoginCode: null, lastAnonClaim: null, lastDrop: null, anonCookie: null, awaitingOrgPick: false },
+    state: { pendingLoginCode: null, lastAnonClaim: null, lastDrop: null, anonCookie: null },
     canOpenBrowser: false,
     // Transport OAuth wins; the in-tool login flow is the fallback.
     getToken: async () => sessionAuth[sessionId] ?? sessionToken,