@cloudgrid-io/mcp 0.20.45 → 0.20.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgrid-io/mcp",
-  "version": "0.20.45",
+  "version": "0.20.46",
   "description": "MCP access to CloudGrid — the live runtime environment where the user's apps run WITH the infrastructure they need out of the box: managed MongoDB, Redis (cache/queues/pub-sub), a pgvector store, persistent disk, and built-in AI with no API keys, in any language or stack, no Docker or Kubernetes to manage. Brainstorm, build, plug, and improve apps, games, dashboards, and tools; instant single-page publishes and full runtime-app deploys with a live URL — for developers and non-technical users. Three editions: local stdio (full toolset), hosted web (light, CLI-free), and a public docs-search server.",
   "type": "module",
   "bin": {
@@ -43,6 +43,7 @@
     "smoke:redrop": "node test/smoke-redrop.mjs",
     "smoke:oauth": "node test/smoke-oauth.mjs",
     "test:auth": "node test/auth.test.mjs",
+    "test:auth-strictness": "node test/auth-strictness.test.mjs",
     "test:win-cli": "node test/windows-cli-resolution.test.mjs",
     "test:electron-env": "node test/electron-spawn-env.test.mjs",
     "smoke:docs": "node test/smoke-docs.mjs",

package/src/auth.js

@@ -94,14 +94,28 @@ export async function pollStatusOnce(code) {
   return res.json();
 }
 
-// Read the stored credentials, or null if absent/unreadable. Same file the CLI
-// writes, so an MCP can reuse a CLI login (and vice versa).
+// Read the stored credentials, or null if absent/unreadable/expired. Same file
+// the CLI writes, so an MCP can reuse a CLI login (and vice versa).
+// Returns { jwt, email, ... } when valid, null otherwise.
 export async function readCredentials() {
+  const result = await readCredentialsStatus();
+  if (result.expired || !result.creds) return null;
+  return result.creds;
+}
+
+// Like readCredentials, but distinguishes "expired" from "absent" so callers
+// (grid_start) can surface a targeted message.
+export async function readCredentialsStatus() {
   try {
     const creds = JSON.parse(await readFile(credentialsPath(), "utf8"));
-    return creds && creds.jwt ? creds : null;
+    if (!creds || !creds.jwt) return { creds: null, expired: false };
+    const claims = decodeJwt(creds.jwt);
+    if (claims.exp && claims.exp * 1000 <= Date.now()) {
+      return { creds: null, expired: true };
+    }
+    return { creds, expired: false };
   } catch {
-    return null;
+    return { creds: null, expired: false };
   }
 }
 

package/src/index.js

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

package/src/tools/cli.js

@@ -421,14 +421,15 @@ export async function runCloudgrid(args, opts = {}, deps = {}) {
   }
 }
 
-export function cliTool(buildArgs, { cwdParam = false } = {}) {
+export function cliTool(buildArgs, { cwdParam = false, excludeDirFromCwd = false } = {}) {
   return async (input) => {
     try {
       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;
+        opts.cwd = excludeDirFromCwd
+          ? (params.cwd ?? params.directory)
+          : (params.cwd ?? params.directory ?? params.dir);
       }
       return ok(await runCloudgrid(buildArgs(params), opts));
     } catch (err) {

package/src/tools/constants.js

@@ -95,7 +95,7 @@ export const CLI_TOOL_VERBS = {
   grid_info:     ["info"],
   grid_get:          ["get"],
   grid_describe_grid: ["describe"],
-  grid_edit_existing_app:        ["pickup"],
+  grid_edit_existing_app:        ["pull"],
   grid_rename:   ["rename"],
   grid_take_offline:   ["unplug"],
   grid_delete:   ["delete"],

package/src/tools/deploy.js

@@ -94,7 +94,7 @@ export async function resolveGridOrAsk(ctx, { token, suppliedGrid, edition }, de
     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.");
+      lines.push("Note: none of your grids are fully set up yet. Wait until provisioning completes (grid_start will show render_ready: true) before plugging.");
     }
     return {
       picker: {
@@ -205,7 +205,7 @@ export function secretBlockMessage(label, where) {
 
 // ── Direct-API tools (both editions) ───────────────────────────────────────────
 function looksLikeFullHtml(s) {
-  const head = s.replace(/^/, "").trimStart().slice(0, 256).toLowerCase();
+  const head = s.replace(/^\uFEFF/, "").trimStart().slice(0, 256).toLowerCase();
   return head.startsWith("<!doctype html") || head.startsWith("<html");
 }
 
@@ -774,10 +774,10 @@ function compileIgnorePattern(line) {
   if (pat.startsWith("/")) pat = pat.slice(1);
   const rx = pat
     .replace(/[.+^${}()|[\]\\]/g, "\\$&")
-    .replace(/\*\*/g, "")
+    .replace(/\*\*/g, "\uFFFF")
     .replace(/\*/g, "[^/]*")
     .replace(/\?/g, "[^/]")
-    .replace(//g, ".*");
+    .replace(/\uFFFF/g, ".*");
   const body = anchored ? `^${rx}` : `(^|/)${rx}`;
   const re = new RegExp(`${body}(/|$)`);
   return { re, dirOnly };
@@ -1093,7 +1093,7 @@ export function errorGuidance({ status, code, edition, isEdit, isAnon, signedIn
   if (status === 401) {
     return isEdit
       ? "That did not authorize this entity (wrong entity, expired, or already claimed). Sign in if you own it (grid_login), pass its owner_token for an anonymously-created drop, or omit target_entity_id to create a new entity."
-      : "Not signed in. Ask the user: sign in (grid_login) to publish to their grid, OR publish anonymously now (re-call grid_plug with anon: true) - it goes live immediately with a claim_url + owner_token to claim into their account later. Do not silently fail; offer both.";
+      : "Your sign-in is missing or expired. Run grid_login, then retry the same grid_plug. Do not offer anonymous publishing as a fix for a failed sign-in; anonymous is only for a user who explicitly asks to publish without attribution.";
   }
   if (status === 403) {
     // NO_ACTIVE_ORG is not a role problem — the account has no grid at all.
@@ -1354,6 +1354,18 @@ export async function runPlug(ctx, input, deps = {}) {
   }
 
   // ── Auth wire selection ─────────────────────────────────────────────────────
+  // Defence in depth: anon: true must only reach here after the explicit choice
+  // prompt was surfaced (register.js sets authChoiceOffered to true). The flag is
+  // undefined when runPlug is called directly (tests bypass the gate), so only
+  // assert when ctx.state has authChoiceOffered as an own property.
+  if (
+    anon === true &&
+    ctx.state &&
+    "authChoiceOffered" in ctx.state &&
+    ctx.state.authChoiceOffered !== true
+  ) {
+    throw new Error("anon: true reached runPlug without the auth choice being offered first. This is a bug.");
+  }
   const authToken = anon === true ? null : await ctx.getToken();
   let ownerToken = typeof owner_token === "string" && owner_token.length > 0 ? owner_token : null;
   if (isEdit && !ownerToken) {
@@ -1747,8 +1759,6 @@ export async function runPlug(ctx, input, deps = {}) {
   return { text: lines.join("\n"), structured };
 }
 
-// ── grid_copy_app / grid_download_source — direct-API verbs (spec v2 §5–6) ────────
-
 async function authedApiCall(ctx, { method, pathName, body, verb }) {
   const token = await ctx.getToken();
   if (!token) {

package/src/tools/register.js

@@ -3,7 +3,7 @@
 // Extracted verbatim from src/tools.js (refactor: split tools.js into modules).
 
 import { z } from "zod";
-import { newLoginCode, buildLoginUrl, pollStatusOnce, checkApiConnectivity } from "../auth.js";
+import { newLoginCode, buildLoginUrl, pollStatusOnce, checkApiConnectivity, decodeJwt as decodeJwtAuth } from "../auth.js";
 import { PLAYBOOK, fetchCorpus, listWorkflows } from "../playbook.js";
 import {
   APPS_WIDGETS_ENABLED,
@@ -227,9 +227,9 @@ export function registerTools(server, ctx) {
   // acknowledgement.
   regTool(
     "grid_note",
-    "Optionally leave a one-paragraph summary of what you built this session and why. Call it BEFORE a plug, or in a session that ends without one — a successful plug has already posted the QA log, so pass grid_plug's session_note instead. Recorded for CloudGrid QA. No side effects.",
+    "Optionally leave a one-paragraph summary of what you built this session and why. Call it BEFORE a plug, or in a session that ends without one — a successful plug has already posted the QA log, so pass grid_plug's session_note instead. The summary is recorded with the CloudGrid team for QA review.",
     { summary: z.string().describe("A short plain-language summary of what was built and why.") },
-    { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
+    { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
     async (input) => {
       try { ctx.logger?.setNarrative(input?.summary); } catch { /* never */ }
       // Honesty after flush: a successful deploy posts the QA log on that same
@@ -327,10 +327,6 @@ export function registerTools(server, ctx) {
     ),
   };
 
-  // grid_plug is the create/re-plug verb. `grid_deploy` is kept as a deprecated
-  // back-compat alias (registered right after the primary below); the canonical
-  // name is grid_plug, and "deploy" survives only as an intent keyword in this
-  // tool's description. MCP-tool name only — the CLI verb `grid plug` is unchanged.
   const plugConfig = {
       description:
         "Plug an app, website, game, or single HTML page into CloudGrid — the live runtime that runs it and provides its infrastructure — and get a live public URL. " +
@@ -454,17 +450,30 @@ export function registerTools(server, ctx) {
         }
         if (!isEdit) {
           const token = await ctx.getToken();
-          if (!token && (input?.anon !== true || ctx.state?.authChoiceOffered !== true)) {
-            // AUTH HARD GATE (create only): not signed in → do NOT silently
-            // ride the anonymous wire — EVEN when the model passed anon: true.
-            // Field bug (2026-07-26, Claude web): INSTRUCTIONS_WEB said "no
-            // account needed", the model self-served anon: true on the first
-            // call, and the user's page landed on the Guest Grid without ever
-            // being asked. anon: true is model-attestable, so it cannot be the
-            // gate; the session flag is. First unauthenticated create in a
-            // session ALWAYS returns the sign-in-vs-guest choice; a re-call
-            // with anon: true after the choice was surfaced proceeds. (Rule 17,
-            // enforced server-side.)
+          if (input?.anon === true && ctx.state?.authChoiceOffered !== true) {
+            if (ctx.state) ctx.state.authChoiceOffered = true;
+            if (token) {
+              const claims = decodeJwtAuth(token);
+              const who = claims.email ? ` as ${claims.email}` : "";
+              return okResult({
+                text:
+                  `You are signed in${who}. The user has not explicitly chosen anonymous publishing. Ask the user which they want — do not choose for them:\n` +
+                  `  1. Publish to your grid (re-call grid_plug without anon: true).\n` +
+                  `  2. Publish anonymously — a guest link that expires in 7 days unless claimed (re-call grid_plug with anon: true).\n` +
+                  `Relay this question to the user and STOP until they answer.`,
+                structured: { needs_auth: true },
+              });
+            }
+            return okResult({
+              text:
+                "This is a new publish and the user is not signed in. Ask the user which they want — do not choose for them:\n" +
+                "  1. Sign in and plug it to their grid — run grid_login (opens the browser), then re-call grid_plug.\n" +
+                "  2. Plug it as a guest — live immediately at a guest link that expires in 7 days unless claimed (re-call grid_plug with anon: true).\n" +
+                "Relay this question to the user and STOP until they answer.",
+              structured: { needs_auth: true },
+            });
+          }
+          if (!token && input?.anon !== true) {
             if (ctx.state) ctx.state.authChoiceOffered = true;
             return okResult({
               text:
@@ -752,7 +761,7 @@ export function registerTools(server, ctx) {
       });
       const readyCount = annotated.filter((o) => o.render_ready).length;
       if (readyCount === 0 && annotated.length > 0) {
-        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.");
+        lines.push("\nNone of your grids are fully set up yet. Wait until provisioning completes (grid_start will show render_ready: true) before plugging. Do not switch to anonymous unless the user asks for it.");
       }
       // Structured output stays `orgs` (its declared schema); user text says grid.
       return okResult({ text: lines.join("\n"), structured: { orgs: annotated } });
@@ -786,6 +795,9 @@ export function registerTools(server, ctx) {
           .object({
             active_grid: z.string().nullable().describe("The user's active grid/org slug, or null."),
             signed_in: z.boolean().describe("Whether the current session is signed in."),
+            email: z.string().optional().describe("The signed-in user's email, when available."),
+            session_expired: z.boolean().optional().describe("True when credentials exist but the JWT has expired. Run grid_login to sign in again."),
+            identity_changed: z.boolean().optional().describe("True when the session's identity changed via a different transport Bearer. Session state was reset."),
             update_available: z
               .object({
                 current: z.string().describe("This MCP's version."),
@@ -802,9 +814,26 @@ export function registerTools(server, ctx) {
     async () => {
       const workflows = listWorkflows();
       let signedIn = false;
+      let sessionExpired = false;
+      let signedInEmail = null;
       let activeGrid = null;
       try {
-        signedIn = Boolean(await ctx.getToken());
+        if (ctx.getCredentialsStatus) {
+          const status = await ctx.getCredentialsStatus();
+          sessionExpired = status.expired;
+          if (status.creds?.jwt) {
+            signedIn = true;
+            const claims = decodeJwtAuth(status.creds.jwt);
+            signedInEmail = claims.email ?? null;
+          }
+        } else {
+          const token = await ctx.getToken();
+          signedIn = Boolean(token);
+          if (token) {
+            const claims = decodeJwtAuth(token);
+            signedInEmail = claims.email ?? null;
+          }
+        }
       } catch {
         signedIn = false;
       }
@@ -813,28 +842,33 @@ export function registerTools(server, ctx) {
       } catch {
         activeGrid = null;
       }
-      // Staleness (local edition): populated fire-and-forget at boot. The
-      // .mcpb never auto-updates, so this is where silent rot becomes a
-      // one-line user action — the model relays the note in-session.
+      const identityChanged = ctx.state?.identityChanged === true;
+      if (identityChanged) ctx.state.identityChanged = false;
       const stale = stalenessNote(ctx.staleness);
-      const structured = {
-        playbook: PLAYBOOK,
-        workflows,
-        context: {
-          active_grid: activeGrid,
-          signed_in: signedIn,
-          ...(ctx.staleness?.behind
-            ? { update_available: { current: ctx.staleness.current, latest: ctx.staleness.latest } }
-            : {}),
-        },
+      const contextObj = {
+        active_grid: activeGrid,
+        signed_in: signedIn,
+        ...(signedInEmail ? { email: signedInEmail } : {}),
+        ...(sessionExpired ? { session_expired: true } : {}),
+        ...(identityChanged ? { identity_changed: true } : {}),
+        ...(ctx.staleness?.behind
+          ? { update_available: { current: ctx.staleness.current, latest: ctx.staleness.latest } }
+          : {}),
       };
+      const structured = { playbook: PLAYBOOK, workflows, context: contextObj };
       const wfLines = workflows.length
         ? workflows.map((w) => `  - ${w.name}: ${w.when || w.summary}`).join("\n")
         : "  (none available)";
-      const text =
+      let text =
         `${PLAYBOOK}\n\nAvailable workflows:\n${wfLines}\n\n` +
         `Next: match the intent to a workflow and call grid_get_template({kind:"workflow", name}).` +
         (stale ? `\n\n${stale}` : "");
+      if (sessionExpired) {
+        text += "\n\nYour CloudGrid sign-in has expired. Run grid_login to sign in again.";
+      }
+      if (identityChanged) {
+        text += "\n\nYour session identity changed (a different account connected via transport). Session state has been reset.";
+      }
       return okResult({ text, structured });
     },
   );
@@ -965,7 +999,7 @@ export function registerTools(server, ctx) {
       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((input) => buildCreateProjectArgs(input), { cwdParam: true }),
+    cliTool((input) => buildCreateProjectArgs(input), { cwdParam: true, excludeDirFromCwd: true }),
   );
 
   // NOTE: grid_plug is no longer CLI-wrapping — the unified direct-API verb

package/src/web.js

@@ -55,6 +55,12 @@ function bearerOf(req) {
   return h && /^Bearer\s+\S+/i.test(h) ? h.replace(/^Bearer\s+/i, "") : null;
 }
 
+function isTokenExpired(jwt) {
+  if (!jwt) return false;
+  const claims = decodeJwt(jwt);
+  return Boolean(claims.exp && claims.exp * 1000 <= Date.now());
+}
+
 // A web session: identity lives in memory for the session's lifetime only. The
 // session id doubles as the stable, opaque end-user id for the trusted-server cap.
 function makeWebContext(sessionId) {
@@ -63,10 +69,17 @@ function makeWebContext(sessionId) {
     edition: "web",
     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,
-    // No local config on a shared host. The user passes `grid`, or the API returns
-    // the list of grids to choose from.
+    getToken: async () => {
+      const jwt = sessionAuth[sessionId] ?? sessionToken;
+      if (jwt && isTokenExpired(jwt)) return null;
+      return jwt;
+    },
+    getCredentialsStatus: async () => {
+      const jwt = sessionAuth[sessionId] ?? sessionToken;
+      if (!jwt) return { creds: null, expired: false };
+      if (isTokenExpired(jwt)) return { creds: null, expired: true };
+      return { creds: { jwt }, expired: false };
+    },
     getActiveGrid: async () => null,
     saveToken: async (jwt) => {
       sessionToken = jwt;
@@ -89,6 +102,7 @@ mountOAuth(app, PUBLIC_BASE);
 
 // One transport per MCP session, keyed by the session id.
 const transports = Object.create(null);
+const sessionContexts = Object.create(null);
 
 app.post("/mcp", async (req, res) => {
   const sessionId = req.headers["mcp-session-id"];
@@ -106,7 +120,22 @@ app.post("/mcp", async (req, res) => {
   }
 
   if (transport) {
-    if (jwt) sessionAuth[sessionId] = jwt;
+    if (jwt) {
+      const prev = sessionAuth[sessionId];
+      if (prev) {
+        const prevSub = decodeJwt(prev).sub;
+        const newSub = decodeJwt(jwt).sub;
+        if (prevSub && newSub && prevSub !== newSub) {
+          const ctxForSession = sessionContexts[sessionId];
+          if (ctxForSession) {
+            ctxForSession.state.identityChanged = true;
+            ctxForSession.state.pendingLoginCode = null;
+            ctxForSession.state.authChoiceOffered = false;
+          }
+        }
+      }
+      sessionAuth[sessionId] = jwt;
+    }
     await transport.handleRequest(req, res, req.body);
     return;
   }
@@ -138,10 +167,12 @@ app.post("/mcp", async (req, res) => {
     if (transport.sessionId) {
       delete transports[transport.sessionId];
       delete sessionAuth[transport.sessionId];
+      delete sessionContexts[transport.sessionId];
     }
   };
   const server = new McpServer({ name: "cloudgrid-mcp-web", version }, { instructions: INSTRUCTIONS_WEB });
   const webCtx = makeWebContext(newSessionId);
+  sessionContexts[newSessionId] = webCtx;
   // QA session log for this MCP session (dark by default). Keyed by the session
   // id — the host connection boundary. No seed user_request here: current hosts
   // don't forward the first message. The model-as-courier path fills it instead —
@@ -178,7 +209,22 @@ async function handleSessionRequest(req, res) {
     return;
   }
   const jwt = bearerOf(req);
-  if (jwt) sessionAuth[sessionId] = jwt;
+  if (jwt) {
+    const prev = sessionAuth[sessionId];
+    if (prev) {
+      const prevSub = decodeJwt(prev).sub;
+      const newSub = decodeJwt(jwt).sub;
+      if (prevSub && newSub && prevSub !== newSub) {
+        const ctxForSession = sessionContexts[sessionId];
+        if (ctxForSession) {
+          ctxForSession.state.identityChanged = true;
+          ctxForSession.state.pendingLoginCode = null;
+          ctxForSession.state.authChoiceOffered = false;
+        }
+      }
+    }
+    sessionAuth[sessionId] = jwt;
+  }
   await transport.handleRequest(req, res);
 }