@cloudgrid-io/mcp 0.7.2 → 0.8.0

package/README.md

@@ -15,11 +15,18 @@ drop, claim, and login tools.
 
 ## CLI compatibility
 
-MCP 0.5.2 is tested against CLI 0.10.1. The lazy-npx fallback pins
-`@cloudgrid-io/cli@~0.10.1` so a future CLI major with renamed verbs cannot
+MCP 0.8.0 is tested against CLI 0.12. The lazy-npx fallback pins
+`@cloudgrid-io/cli@~0.12` so a future CLI major with renamed verbs cannot
 silently break a released MCP. A CI drift guard (`npm run test:drift-guard`)
 asserts every wrapped verb exists in the CLI help.
 
+### `GRID_AUTH_STALE` is out of scope
+
+Strict-OIDC (org-owned) grids can return `GRID_AUTH_STALE` when the caller's
+session predates an SSO policy change. The MCP does not target such grids and
+does not handle this code: if a `GRID_AUTH_STALE` response is ever seen, point
+the user at Console SSO to re-authenticate — the MCP will not silently retry.
+
 ## Prerequisite
 
 Install and log in to the CLI:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgrid-io/mcp",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "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": {
@@ -18,6 +18,7 @@
     "smoke": "node test/smoke.mjs",
     "test:plug-wire": "node test/plug-wire.test.mjs",
     "test:self-healing": "node test/self-healing.test.mjs",
+    "test:grid-picker": "node test/grid-picker.test.mjs",
     "test:drift-guard": "node test/drift-guard.mjs",
     "smoke:drop": "node test/smoke-drop.mjs",
     "smoke:login": "node test/smoke-login.mjs",

package/src/auth.js

@@ -66,12 +66,16 @@ export async function readCredentials() {
   }
 }
 
-// The CLI's active org slug from ~/.cloudgrid/config.yaml, or null. A minimal
-// line parse — no YAML dependency for one field.
-export async function readActiveOrgSlug() {
+// The CLI's active grid slug from ~/.cloudgrid/config.yaml, or null. A minimal
+// line parse — no YAML dependency for one field. Accepts the grid-native
+// `active_grid_slug` key and falls back to the legacy `active_org_slug` (CLI 0.12
+// still writes the org key; this is forward-compatible with a future rename).
+export async function readActiveGridSlug() {
   try {
     const raw = await readFile(join(cloudgridHome(), "config.yaml"), "utf8");
-    const m = raw.match(/^\s*active_org_slug:\s*(\S+)\s*$/m);
+    const m =
+      raw.match(/^\s*active_grid_slug:\s*(\S+)\s*$/m) ||
+      raw.match(/^\s*active_org_slug:\s*(\S+)\s*$/m);
     return m ? m[1] : null;
   } catch {
     return null;

package/src/index.js

@@ -11,7 +11,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { registerTools } from "./tools.js";
 import {
   readCredentials,
-  readActiveOrgSlug,
+  readActiveGridSlug,
   writeCredentials,
   credentialsPath,
 } from "./auth.js";
@@ -23,7 +23,7 @@ const ctx = {
   state: { pendingLoginCode: null, lastAnonClaim: null, lastDrop: null, anonCookie: null },
   canOpenBrowser: true,
   getToken: async () => (await readCredentials())?.jwt ?? null,
-  getActiveOrg: async () => await readActiveOrgSlug(),
+  getActiveGrid: async () => await readActiveGridSlug(),
   saveToken: async (jwt) => await writeCredentials(jwt),
   savedLocationNote: () => `Credentials saved to ${credentialsPath()}.`,
 };

package/src/tools.js

@@ -30,9 +30,11 @@ const CONSOLE_URL = "https://console.cloudgrid.io/";
 
 // ── Widget resources (ChatGPT Apps SDK, web edition only) ────────────────────
 const LIVE_RESULT_URI = "ui://cloudgrid/live-result.html";
-const ORG_PICKER_URI = "ui://cloudgrid/org-picker.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.
+const GRID_PICKER_URI = "ui://cloudgrid/org-picker.html";
 const LIVE_RESULT_HTML = readFileSync(new URL("./widgets/live-result.html", import.meta.url), "utf-8");
-const ORG_PICKER_HTML = readFileSync(new URL("./widgets/org-picker.html", import.meta.url), "utf-8");
+const GRID_PICKER_HTML = readFileSync(new URL("./widgets/org-picker.html", import.meta.url), "utf-8");
 const WIDGET_CSP = {
   connectDomains: ["https://*.cloudgrid.io"],
   resourceDomains: ["https://*.cloudgrid.io"],
@@ -66,6 +68,7 @@ Operating rules:
 4. Always return the live share URL at the end — that is the deliverable.
 5. Minimize questions. Use sensible defaults and build; don't front-load setup questions.
 6. If a signed-in publish fails with a server error, do not fall back to anonymous publishing (it burns the anonymous quota and downgrades ownership); surface the error, use the CLI fallback if offered, or ask the user.
+7. When signed in and the user has more than one grid, do not assume a target — the publish tools will ask; relay the choice to the user and pass the chosen grid.
 
 Deploy is edition-dependent: on the hosted MCP call the drop tool with the HTML; on local MCP / CLI write the file and run the plug tool. An HTML page deploys synchronously, so you get a URL right away.`;
 
@@ -193,11 +196,11 @@ function resolveCwd(cwd) {
 }
 
 // Pin the CLI version for the lazy npx fallback so behaviour is reproducible.
-// MCP 0.5.2 is tested against CLI 0.10.1.
-const CLI_NPX_PKG = "@cloudgrid-io/cli@~0.10.1";
+// MCP 0.8.0 is tested against CLI 0.12.
+const CLI_NPX_PKG = "@cloudgrid-io/cli@~0.12";
 
 // Minimum CLI version that supports the verbs and flags the MCP passes.
-const MIN_CLI_VERSION = "0.10.1";
+const MIN_CLI_VERSION = "0.12.0";
 
 // Verb map for the drift guard: each CLI-wrapping tool's top-level verb(s).
 // The drift-guard test imports this and asserts every verb exists in `cloudgrid --help`.
@@ -655,8 +658,16 @@ async function fetchUserOrgs(token) {
     });
     if (!res.ok) return [];
     const data = await res.json();
-    const orgs = Array.isArray(data?.orgs) ? data.orgs : Array.isArray(data) ? data : [];
-    return orgs.map((o) => ({
+    // 0.8.0: read the grid-native `data.grids` (dual-emitted alongside the legacy
+    // `data.orgs`, same array/order). Fall back to `data.orgs`/bare-array during soak.
+    const grids = Array.isArray(data?.grids)
+      ? data.grids
+      : Array.isArray(data?.orgs)
+        ? data.orgs
+        : Array.isArray(data)
+          ? data
+          : [];
+    return grids.map((o) => ({
       slug: o.slug ?? "",
       name: o.name ?? o.slug ?? "",
       role: o.role ?? "member",
@@ -667,6 +678,67 @@ async function fetchUserOrgs(token) {
   }
 }
 
+// ── Shared grid disambiguation (gridctl_drop + gridctl_plug) ──────────────────
+// The stateless "which grid?" ask, used identically by both publish verbs so
+// they never drift. Given the caller's token and a supplied grid, it decides:
+//   - supplied grid matches a membership  → { proceed: true, grid }
+//   - >1 grid and none supplied           → { picker } (a ready-to-return result)
+//   - exactly one grid                    → { single: annotatedOrg } — the caller
+//         decides how to treat a not-ready single grid (drop blocks; plug warns)
+//   - no orgs / listing failed            → { proceed: true } (fall through)
+// User-facing text says "grid" (Gilad's org→grid rename); the structured payload
+// carries `needs_grid` AND the `needs_org`/`orgs`/`org`-slug fields the existing
+// org-picker web widget reads, so the web card keeps working. Stateless — no
+// dependence on prior-call state (ChatGPT Apps SDK reconnects every call).
+export async function resolveGridOrAsk(ctx, { token, suppliedGrid, edition }, deps = {}) {
+  const listGrids = deps.fetchUserOrgs || fetchUserOrgs;
+  const grids = await listGrids(token);
+  const activeGrid = await ctx.getActiveGrid();
+  const matched = suppliedGrid && grids.find((o) => o.slug === suppliedGrid);
+  if (matched) {
+    // Supplied grid matches — proceed. The agent should already have checked
+    // render_ready and warned the user; we don't block here.
+    return { proceed: true, grid: suppliedGrid };
+  }
+  if (grids.length > 1) {
+    // No valid grid supplied and multiple grids — ask once. Mark the active
+    // grid so the agent can offer it as the default.
+    const annotated = grids.map((o) => ({ ...o, is_active: o.slug === activeGrid }));
+    // Sort: active grid first, then ready grids, then not-ready grids.
+    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 grid should this be published to?"];
+    for (const o of annotated) {
+      const tags = [];
+      if (o.is_active) tags.push("your active grid");
+      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 grid slug in the `grid` parameter.");
+    const readyCount = annotated.filter((o) => o.render_ready).length;
+    if (readyCount === 0) {
+      lines.push("Note: none of your grids are fully set up yet. You can use anonymous: true as a fallback.");
+    }
+    return {
+      picker: {
+        text: lines.join("\n"),
+        // `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 } } : {}),
+      },
+    };
+  }
+  if (grids.length === 1) {
+    return { single: { ...grids[0], is_active: grids[0].slug === activeGrid } };
+  }
+  return { proceed: true };
+}
+
 // After an authenticated web drop, upgrade visibility to "link" so the artifact
 // is shareable and its preview renders without a sign-in wall. Best-effort — a
 // failure here does not fail the drop; the user can always call gridctl_visibility.
@@ -675,7 +747,12 @@ async function upgradeVisibilityToLink(ctx, entityId, orgSlug) {
   if (!token || !entityId) return false;
   try {
     const hdrs = { Authorization: `Bearer ${token}`, "Content-Type": "application/json" };
-    if (orgSlug) hdrs["X-CloudGrid-Org"] = orgSlug;
+    // Send the grid-native header; keep X-CloudGrid-Org in parallel (same value)
+    // during the org→grid soak. Never send conflicting values → 400 GRID_HEADER_CONFLICT.
+    if (orgSlug) {
+      hdrs["X-CloudGrid-Grid"] = orgSlug;
+      hdrs["X-CloudGrid-Org"] = orgSlug;
+    }
     const res = await fetch(`${API_BASE}/api/v2/inspirations/${encodeURIComponent(entityId)}`, {
       method: "PATCH",
       headers: hdrs,
@@ -733,9 +810,11 @@ export function resolvePlugUrl(data) {
 
 export async function runDrop(
   ctx,
-  { html, path: filePath, filename, anonymous, org, fresh, entity_id, owner_token },
+  { html, path: filePath, filename, anonymous, org, grid, fresh, entity_id, owner_token },
   deps = {},
 ) {
+  // `grid` is an accepted alias for `org` (Gilad's org→grid rename); `org` still works.
+  const targetGrid = org ?? grid;
   // Defensive: the web edition schema excludes `path`, but if a model still
   // passes one (e.g. from a cached tool description), reject early with a
   // clear explanation.
@@ -779,7 +858,7 @@ export async function runDrop(
   if (anonymous !== true) {
     authToken = await ctx.getToken();
     if (authToken) {
-      orgSlug = org || (await ctx.getActiveOrg());
+      orgSlug = targetGrid || (await ctx.getActiveGrid());
     }
   }
 
@@ -833,7 +912,11 @@ export async function runDrop(
   const headers = {};
   if (!isAnonymousWire) {
     headers["Authorization"] = `Bearer ${authToken}`;
-    if (orgSlug) headers["X-CloudGrid-Org"] = orgSlug;
+    // Grid-native header + X-CloudGrid-Org alias (same slug) during the soak.
+    if (orgSlug) {
+      headers["X-CloudGrid-Grid"] = orgSlug;
+      headers["X-CloudGrid-Org"] = orgSlug;
+    }
   }
 
   // Hosted server: attach the trusted-server credential on EVERY anonymous call
@@ -1097,8 +1180,12 @@ async function runClaim(ctx, { claim_token, claim_url, entity_id }) {
   // The claim re-homes the inspiration into the caller's grid; the platform
   // resolves the destination from the active-org context, so send the org
   // header (the same header every other authed write uses).
-  const orgSlug = await ctx.getActiveOrg();
-  if (orgSlug) headers["X-CloudGrid-Org"] = orgSlug;
+  const orgSlug = await ctx.getActiveGrid();
+  // Grid-native header + X-CloudGrid-Org alias (same slug) during the soak.
+  if (orgSlug) {
+    headers["X-CloudGrid-Grid"] = orgSlug;
+    headers["X-CloudGrid-Org"] = orgSlug;
+  }
   // Replay the anon-session cookie so a cookie-class caller can claim what it
   // dropped, even without a claim token.
   if (ctx.state.anonCookie) headers["Cookie"] = ctx.state.anonCookie;
@@ -1478,8 +1565,12 @@ export async function runPlug(ctx, input, deps = {}) {
     // the caller's membership from this header and requires it to MATCH the
     // entity's grid, so pass `grid` here too when the target lives outside the
     // active grid.
-    const orgSlug = grid || (await ctx.getActiveOrg());
-    if (orgSlug) headers["X-CloudGrid-Org"] = orgSlug;
+    const orgSlug = grid || (await ctx.getActiveGrid());
+    // Grid-native header + X-CloudGrid-Org alias (same slug) during the soak.
+    if (orgSlug) {
+      headers["X-CloudGrid-Grid"] = orgSlug;
+      headers["X-CloudGrid-Org"] = orgSlug;
+    }
   }
   if (useAnonWire && ctx.trustedServer?.secret && ctx.trustedServer?.endUserId) {
     headers["X-CloudGrid-Trusted-Server-Auth"] = ctx.trustedServer.secret;
@@ -1640,8 +1731,12 @@ async function authedApiCall(ctx, { method, pathName, body, verb }) {
     throw new Error(`${verb} requires sign-in. Run gridctl_login first.`);
   }
   const headers = { Authorization: `Bearer ${token}` };
-  const orgSlug = await ctx.getActiveOrg();
-  if (orgSlug) headers["X-CloudGrid-Org"] = orgSlug;
+  const orgSlug = await ctx.getActiveGrid();
+  // Grid-native header + X-CloudGrid-Org alias (same slug) during the soak.
+  if (orgSlug) {
+    headers["X-CloudGrid-Grid"] = orgSlug;
+    headers["X-CloudGrid-Org"] = orgSlug;
+  }
   if (body !== undefined) headers["Content-Type"] = "application/json";
   let res;
   try {
@@ -1736,8 +1831,12 @@ async function runVisibility(ctx, { target, visibility, org }) {
     throw new Error("No target. Pass the entity id, or drop something first in this session.");
   }
   const headers = { Authorization: `Bearer ${token}`, "Content-Type": "application/json" };
-  const orgSlug = org || (await ctx.getActiveOrg());
-  if (orgSlug) headers["X-CloudGrid-Org"] = orgSlug;
+  const orgSlug = org || (await ctx.getActiveGrid());
+  // Grid-native header + X-CloudGrid-Org alias (same slug) during the soak.
+  if (orgSlug) {
+    headers["X-CloudGrid-Grid"] = orgSlug;
+    headers["X-CloudGrid-Org"] = orgSlug;
+  }
   let res;
   try {
     res = await fetch(`${API_BASE}/api/v2/inspirations/${encodeURIComponent(id)}`, {
@@ -1815,14 +1914,14 @@ export function registerTools(server, ctx) {
       }],
     }));
 
-    server.registerResource("cloudgrid-org-picker", ORG_PICKER_URI, {
+    server.registerResource("cloudgrid-org-picker", GRID_PICKER_URI, {
       description: "Org picker card — lets the user choose which organization to publish into.",
       mimeType: "text/html;profile=mcp-app",
     }, async () => ({
       contents: [{
-        uri: ORG_PICKER_URI,
+        uri: GRID_PICKER_URI,
         mimeType: "text/html;profile=mcp-app",
-        text: ORG_PICKER_HTML,
+        text: GRID_PICKER_HTML,
         _meta: { ui: { csp: WIDGET_CSP } },
       }],
     }));
@@ -1847,7 +1946,8 @@ export function registerTools(server, ctx) {
         ),
         filename: z.string().optional().describe("Filename to present. Defaults to index.html for inline HTML."),
         anonymous: z.boolean().optional().describe("Force an anonymous drop even if the user is signed in."),
-        org: z.string().optional().describe("Leave unset; the tool will ask the user which org to publish into. Only set this after the user picks from the list the tool returns."),
+        grid: z.string().optional().describe("Leave unset; the tool will ask the user which grid to publish into. Only set this after the user picks from the list the tool returns."),
+        org: z.string().optional().describe("Deprecated alias for `grid` (kept for compatibility). Prefer `grid`."),
         ...dropReplugParams,
       }
     : {
@@ -1855,7 +1955,8 @@ export function registerTools(server, ctx) {
         path: z.string().optional().describe("Path to a local file to upload instead of inline HTML."),
         filename: z.string().optional().describe("Filename to present. Defaults to index.html for inline HTML."),
         anonymous: z.boolean().optional().describe("Force an anonymous drop even if the user is signed in."),
-        org: z.string().optional().describe("Leave unset; the tool will ask the user which org to publish into. Only set this after the user picks from the list the tool returns."),
+        grid: z.string().optional().describe("Leave unset; the tool will ask the user which grid to publish into. Only set this after the user picks from the list the tool returns."),
+        org: z.string().optional().describe("Deprecated alias for `grid` (kept for compatibility). Prefer `grid`."),
         ...dropReplugParams,
       };
 
@@ -1877,13 +1978,20 @@ export function registerTools(server, ctx) {
           value: z.string().describe("Visibility value to pass to gridctl_visibility."),
           label: z.string().describe("Human-readable label."),
         })).optional().describe("Available visibility levels."),
-        needs_org: z.boolean().optional().describe("True when the user must choose an org before dropping."),
+        needs_grid: z.boolean().optional().describe("True when the user must choose a grid before dropping."),
+        needs_org: z.boolean().optional().describe("Deprecated alias of needs_grid (kept so the org-picker widget keeps working)."),
+        grids: z.array(z.object({
+          slug: z.string().describe("Grid slug to pass as the grid parameter."),
+          name: z.string().describe("Human-readable grid name."),
+          role: z.string().describe("User's role in the grid."),
+          is_active: z.boolean().optional().describe("True if this is the user's currently active grid."),
+        })).optional().describe("The user's grids, when a grid choice is needed."),
         orgs: z.array(z.object({
-          slug: z.string().describe("Org slug to pass as the org parameter."),
-          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."),
-        })).optional().describe("The user's orgs, when org choice is needed."),
+          slug: z.string().describe("Grid slug to pass as the grid parameter."),
+          name: z.string().describe("Human-readable grid name."),
+          role: z.string().describe("User's role in the grid."),
+          is_active: z.boolean().optional().describe("True if this is the user's currently active grid."),
+        })).optional().describe("Deprecated alias of grids (kept so the org-picker widget keeps working)."),
         needs_sign_in: z.boolean().optional().describe("True when sign-in is needed before dropping."),
         login_url: z.string().optional().describe("Sign-in URL when authentication is needed."),
       },
@@ -1918,63 +2026,37 @@ export function registerTools(server, ctx) {
           }
         }
 
-        // Stateless org disambiguation — both editions, when authenticated.
+        // Stateless grid disambiguation — both editions, when authenticated.
         // No dependency on prior-call state so it works even when the client
-        // reconnects on every tool call (ChatGPT Apps SDK behaviour).
+        // reconnects on every tool call (ChatGPT Apps SDK behaviour). `grid` is
+        // accepted as an alias for `org` (Gilad's rename); `org` still works.
         if (input?.anonymous !== true) {
           const token = await ctx.getToken();
           if (token) {
-            const orgs = await fetchUserOrgs(token);
-            const activeOrg = await ctx.getActiveOrg();
-            const suppliedOrg = input?.org;
-            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 gridctl_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.
-              // Mark the active org so the agent can offer it as the default.
-              const annotated = orgs.map((o) => ({
-                ...o,
-                is_active: o.slug === activeOrg,
-              }));
-              // 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 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) {
-              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 }];
+            const suppliedGrid = input?.grid || input?.org;
+            const decision = await resolveGridOrAsk(ctx, {
+              token,
+              suppliedGrid,
+              edition: ctx.edition,
+            });
+            if (decision.picker) {
+              return okResult(decision.picker);
+            }
+            if (decision.single) {
+              if (!decision.single.render_ready) {
+                // Single grid but not set up — tell the agent so it can warn
+                // the user and offer anonymous drop as fallback. (drop-specific:
+                // drop blocks here; plug proceeds with a warning.)
+                const annotated = [{ ...decision.single, 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 },
+                  text: `Your only grid "${decision.single.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_grid: true, needs_org: true, grid_not_ready: true, org_not_ready: true, grids: annotated, orgs: annotated },
                 });
               }
-              input = { ...(input || {}), org: orgs[0].slug };
+              input = { ...(input || {}), org: decision.single.slug };
+            } else if (decision.grid) {
+              // Supplied grid matched — normalize onto `org` for runDrop.
+              input = { ...(input || {}), org: decision.grid };
             }
           }
         }
@@ -2090,6 +2172,42 @@ export function registerTools(server, ctx) {
     },
     async (input) => {
       try {
+        // Grid-picker parity with gridctl_drop: a signed-in user with >1 grid is
+        // ASKED which grid to publish to on every CREATE. Only for authed creates
+        // (no target_entity_id, not anon). Edits NEVER ask — the grid is fixed by
+        // the entity. Anon proceeds as a Guest-Grid drop. Explicit valid grid
+        // proceeds. A single grid proceeds (with a warning if it isn't set up yet).
+        const isEdit =
+          typeof input?.target_entity_id === "string" && input.target_entity_id.length > 0;
+        if (input?.anon !== true && !isEdit) {
+          const token = await ctx.getToken();
+          if (token) {
+            const decision = await resolveGridOrAsk(ctx, {
+              token,
+              suppliedGrid: input?.grid,
+              edition: ctx.edition,
+            });
+            if (decision.picker) {
+              // Do NOT silently default to the active grid — surface the ask.
+              return okResult(decision.picker);
+            }
+            if (decision.single) {
+              // Proceed into the single grid; warn (don't block) if not set up yet.
+              input = { ...(input || {}), grid: decision.single.slug };
+              if (decision.single.render_ready === false) {
+                const res = await runPlug(ctx, input || {});
+                return okResult({
+                  ...res,
+                  text:
+                    `Warning: your only grid "${decision.single.slug}" isn't fully set up yet — the page may not load until provisioning completes.\n` +
+                    res.text,
+                });
+              }
+            } else if (decision.grid) {
+              input = { ...(input || {}), grid: decision.grid };
+            }
+          }
+        }
         return okResult(await runPlug(ctx, input || {}));
       } catch (err) {
         return fail(err.message);
@@ -2283,16 +2401,17 @@ export function registerTools(server, ctx) {
       if (!token) {
         return fail("You are not signed in. Run gridctl_login first.");
       }
-      const orgs = await fetchUserOrgs(token);
-      if (orgs.length === 0) {
-        return okResult({ text: "No organizations found.", structured: { orgs: [] } });
+      const grids = await fetchUserOrgs(token);
+      if (grids.length === 0) {
+        // Structured output stays `orgs` (its declared schema); user text says grid.
+        return okResult({ text: "No grids found.", structured: { orgs: [] } });
       }
-      const activeOrg = await ctx.getActiveOrg();
-      const annotated = orgs.map((o) => ({
+      const activeGrid = await ctx.getActiveGrid();
+      const annotated = grids.map((o) => ({
         ...o,
-        is_active: o.slug === activeOrg,
+        is_active: o.slug === activeGrid,
       }));
-      // Sort: active org first, then ready orgs, then not-ready orgs.
+      // Sort: active grid first, then ready grids, then not-ready grids.
       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;
@@ -2300,15 +2419,16 @@ export function registerTools(server, ctx) {
       });
       const lines = annotated.map((o) => {
         const tags = [];
-        if (o.is_active) tags.push("your active org");
+        if (o.is_active) tags.push("your active grid");
         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.");
+        lines.push("\nNone of your grids are fully set up yet. You can use an anonymous drop as a fallback, or wait until provisioning completes.");
       }
+      // Structured output stays `orgs` (its declared schema); user text says grid.
       return okResult({ text: lines.join("\n"), structured: { orgs: annotated } });
     },
   );
@@ -2356,7 +2476,7 @@ export function registerTools(server, ctx) {
         signedIn = false;
       }
       try {
-        activeGrid = (await ctx.getActiveOrg()) ?? null;
+        activeGrid = (await ctx.getActiveGrid()) ?? null;
       } catch {
         activeGrid = null;
       }
@@ -2429,7 +2549,8 @@ export function registerTools(server, ctx) {
       if (type) args.push("--type", type);
       if (description) args.push("--description", description);
       if (dir) args.push("--dir", dir);
-      if (org) args.push("--org", org);
+      // CLI 0.12 dropped `--org` in favour of `--grid` (same slug).
+      if (org) args.push("--grid", org);
       return args;
     }, { cwdParam: true }),
   );
@@ -2480,7 +2601,8 @@ export function registerTools(server, ctx) {
       const args = ["feedback", "list"];
       if (since) args.push("--since", since);
       if (limit) args.push("--limit", String(limit));
-      if (org) args.push("--org", org);
+      // CLI 0.12 dropped `--org` in favour of `--grid` (same slug).
+      if (org) args.push("--grid", org);
       return args;
     }),
   );
@@ -2587,8 +2709,8 @@ export function registerTools(server, ctx) {
     cliTool(({ name, target_dir, grid, version, force, no_bind }) => {
       const args = ["pickup", name];
       if (target_dir) args.push(target_dir);
-      // The CLI's pickup --help exposes `--org <slug>` (legacy naming) for the grid.
-      if (grid) args.push("--org", grid);
+      // CLI 0.12's pickup exposes `--grid <slug>` (was legacy `--org`).
+      if (grid) args.push("--grid", grid);
       if (version) args.push("--version", version);
       if (force) args.push("--force");
       if (no_bind) args.push("--no-bind");

package/src/web.js

@@ -59,9 +59,9 @@ function makeWebContext(sessionId) {
     canOpenBrowser: false,
     // Transport OAuth wins; the in-tool login flow is the fallback.
     getToken: async () => sessionAuth[sessionId] ?? sessionToken,
-    // No local config on a shared host. The user passes `org`, or the API returns
-    // the list of orgs to choose from.
-    getActiveOrg: async () => null,
+    // No local config on a shared host. The user passes `grid`, or the API returns
+    // the list of grids to choose from.
+    getActiveGrid: async () => null,
     saveToken: async (jwt) => {
       sessionToken = jwt;
       return decodeJwt(jwt);

package/src/widgets/org-picker.html

@@ -34,18 +34,20 @@ body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;b
   }
 
   function render(data) {
-    if (!data || !data.orgs || data.orgs.length === 0) {
-      root.innerHTML = '<div class="card"><div class="title">No organizations found</div></div>';
+    // `grids` is the current field; fall back to `orgs` for older payloads.
+    var items = (data && (data.grids || data.orgs)) || null;
+    if (!items || items.length === 0) {
+      root.innerHTML = '<div class="card"><div class="title">No grids found</div></div>';
       return;
     }
 
     var html =
       '<div class="card">' +
-        '<div class="title">Choose an organization</div>' +
-        '<div class="subtitle">Which org should this be published to?</div>' +
+        '<div class="title">Choose a grid</div>' +
+        '<div class="subtitle">Which grid should this be published to?</div>' +
         '<div class="orgs">';
-    for (var i = 0; i < data.orgs.length; i++) {
-      var org = data.orgs[i];
+    for (var i = 0; i < items.length; i++) {
+      var org = items[i];
       var notReady = org.render_ready === false;
       html +=
         '<button class="org-btn' + (notReady ? ' not-ready' : '') + '" data-slug="' + esc(org.slug) + '">' +
@@ -71,7 +73,8 @@ body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;b
           if (input.html) args.html = input.html;
           if (input.filename) args.filename = input.filename;
           if (input.fresh !== undefined) args.fresh = input.fresh;
-          args.org = slug;
+          args.grid = slug;
+          args.org = slug; // alias kept for compatibility
           window.openai.callTool("cloudgrid_drop", args).then(function () {
             // The host will render the new result with the live-result card.
           }).catch(function () {