create-nextblock 0.15.2 → 0.15.4

package/templates/nextblock-template/app/cms/settings/cortex-ai/McpServerSettingsCard.tsx

@@ -21,7 +21,9 @@ import {
   AlertTriangle,
   Check,
   Copy,
+  Info,
   KeyRound,
+  Lock,
   Plug,
   Plus,
   Trash2,
@@ -43,6 +45,18 @@ type McpServerSettingsCardProps = {
   localMcpUrl: string;
   /** The publicly reachable endpoint, derived from NEXT_PUBLIC_URL. */
   mcpUrl: string;
+  /**
+   * Locks every control that writes (the toggles, minting, revoking) while leaving
+   * the endpoint, the client snippets, and the copy buttons fully usable.
+   *
+   * Used by the shared sandbox: a visitor must still be able to see that MCP access
+   * exists and what connecting looks like, but the settings row and the token table
+   * belong to every other visitor too. Hiding the card instead — which is what the
+   * sandbox did before this — taught evaluators that NextBlock had no MCP support.
+   */
+  readOnly?: boolean;
+  /** Explains the lock. Required in spirit whenever `readOnly` is set. */
+  readOnlyNotice?: string;
   tokens: McpAccessTokenSummary[];
 };
 
@@ -96,6 +110,8 @@ export function McpServerSettingsCard({
   enabled,
   localMcpUrl,
   mcpUrl,
+  readOnly = false,
+  readOnlyNotice,
   tokens,
 }: McpServerSettingsCardProps) {
   const router = useRouter();
@@ -213,7 +229,12 @@ export function McpServerSettingsCard({
     ? `claude mcp add --transport http nextblock ${url}`
     : `claude mcp add --transport http nextblock ${url} --header "Authorization: Bearer ${tokenForSnippet}"`;
 
+  // Belt-and-braces: the controls below are disabled in read-only mode, and the
+  // server actions refuse sandbox writes on their own. These early returns just
+  // mean a stray call from here can never even reach the network.
   function persistSettings(next: { allowLocalhostWithoutToken: boolean; enabled: boolean }) {
+    if (readOnly) return;
+
     setError(null);
     startTransition(async () => {
       const result = await saveMcpSettingsAction(next);
@@ -231,6 +252,8 @@ export function McpServerSettingsCard({
   }
 
   function handleCreateToken() {
+    if (readOnly) return;
+
     setError(null);
     setMintedToken(null);
 
@@ -255,6 +278,8 @@ export function McpServerSettingsCard({
   }
 
   function handleRevoke(id: string) {
+    if (readOnly) return;
+
     setError(null);
     startTransition(async () => {
       const result = await revokeMcpAccessTokenAction({ id });
@@ -283,6 +308,12 @@ export function McpServerSettingsCard({
                 {tokens.length} active {tokens.length === 1 ? 'token' : 'tokens'}
               </Badge>
             )}
+            {readOnly && (
+              <Badge variant="outline" className="gap-1 font-normal">
+                <Lock className="h-3 w-3" />
+                Read-only
+              </Badge>
+            )}
           </CardTitle>
           <CardDescription className="text-xs">
             Expose this CMS to external AI clients over the Model Context Protocol. Claude Code,
@@ -293,6 +324,14 @@ export function McpServerSettingsCard({
       </CardHeader>
 
       <CardContent className="space-y-4 pt-0">
+        {readOnly && readOnlyNotice && (
+          <Alert>
+            <Info className="h-4 w-4" />
+            <AlertTitle>Configured per install</AlertTitle>
+            <AlertDescription className="text-xs">{readOnlyNotice}</AlertDescription>
+          </Alert>
+        )}
+
         {error && (
           <Alert variant="destructive">
             <AlertTriangle className="h-4 w-4" />
@@ -307,7 +346,7 @@ export function McpServerSettingsCard({
             <Checkbox
               id="mcp_enabled"
               checked={isEnabled}
-              disabled={isPending}
+              disabled={isPending || readOnly}
               onCheckedChange={(checked) => {
                 const next = checked === true;
                 setIsEnabled(next);
@@ -329,7 +368,7 @@ export function McpServerSettingsCard({
             <Checkbox
               id="mcp_allow_localhost"
               checked={allowLocalhost}
-              disabled={isPending || !isEnabled}
+              disabled={isPending || !isEnabled || readOnly}
               onCheckedChange={(checked) => {
                 const next = checked === true;
                 setAllowLocalhost(next);
@@ -397,6 +436,7 @@ export function McpServerSettingsCard({
                 id="mcp_token_name"
                 value={tokenName}
                 maxLength={80}
+                disabled={readOnly}
                 placeholder="My laptop — Claude Code"
                 onChange={(event) => setTokenName(event.target.value)}
               />
@@ -411,6 +451,7 @@ export function McpServerSettingsCard({
                 min={1}
                 max={3650}
                 value={expiresInDays}
+                disabled={readOnly}
                 placeholder="Never"
                 onChange={(event) => setExpiresInDays(event.target.value)}
               />
@@ -419,6 +460,7 @@ export function McpServerSettingsCard({
               <Checkbox
                 id="mcp_token_write"
                 checked={allowWrites}
+                disabled={readOnly}
                 onCheckedChange={(checked) => setAllowWrites(checked === true)}
               />
               <Label htmlFor="mcp_token_write" className="text-xs">
@@ -428,7 +470,7 @@ export function McpServerSettingsCard({
             <Button
               type="button"
               size="sm"
-              disabled={isPending || !tokenName.trim()}
+              disabled={isPending || readOnly || !tokenName.trim()}
               onClick={handleCreateToken}
             >
               <Plus className="mr-1.5 h-3.5 w-3.5" />
@@ -481,7 +523,7 @@ export function McpServerSettingsCard({
                       type="button"
                       variant="ghost"
                       size="sm"
-                      disabled={isPending}
+                      disabled={isPending || readOnly}
                       className="h-7 shrink-0 text-destructive hover:text-destructive"
                       onClick={() => handleRevoke(token.id)}
                     >
@@ -504,7 +546,9 @@ export function McpServerSettingsCard({
                 ? 'No token needed: localhost trust covers this connection while the dev server runs. These snippets deliberately send no Authorization header — an invalid one would be rejected rather than falling back to localhost trust.'
                 : mintedToken
                   ? 'These snippets include the token you just created.'
-                  : `Create a token above and these snippets will fill it in; otherwise replace ${TOKEN_PLACEHOLDER}.`}
+                  : readOnly
+                    ? `This is the exact configuration you would paste on your own install, with ${TOKEN_PLACEHOLDER} standing in for the token you mint there.`
+                    : `Create a token above and these snippets will fill it in; otherwise replace ${TOKEN_PLACEHOLDER}.`}
             </p>
           </div>
 

package/templates/nextblock-template/app/cms/settings/cortex-ai/mcp-actions.ts

@@ -28,6 +28,22 @@ const CORTEX_AI_SETTINGS_PATH = '/cms/settings/cortex-ai';
 const MAX_TOKEN_NAME_LENGTH = 80;
 const MAX_TOKENS = 20;
 
+/**
+ * Sandbox writes are refused here, not just in the UI.
+ *
+ * The settings row and the token table are shared by every sandbox visitor, and the
+ * card is now rendered there (read-only) so people can see that MCP access exists —
+ * which means these actions are reachable from a sandbox page. A disabled checkbox is
+ * a suggestion; this is the actual boundary. Mirrors the guards in `actions.ts`.
+ */
+function sandboxRejection(what: string): { error: string; success: false } | null {
+  if (process.env.NEXT_PUBLIC_IS_SANDBOX !== 'true') {
+    return null;
+  }
+
+  return { error: `Sandbox environment cannot ${what}.`, success: false };
+}
+
 export type McpAccessTokenSummary = {
   createdAt: string;
   expiresAt: string | null;
@@ -90,6 +106,9 @@ export async function saveMcpSettingsAction(input: {
   allowLocalhostWithoutToken: boolean;
   enabled: boolean;
 }): Promise<{ error?: string; success: boolean }> {
+  const rejected = sandboxRejection('change MCP server settings');
+  if (rejected) return rejected;
+
   try {
     const { supabase } = await requireAdminSupabaseClient();
     const value = normalizeCortexAiMcpSettings(input);
@@ -117,6 +136,9 @@ export async function createMcpAccessTokenAction(input: {
   name: string;
   scopes: CortexAiMcpScope[];
 }): Promise<{ error?: string; success: boolean; token?: string; tokenPrefix?: string }> {
+  const rejected = sandboxRejection('mint MCP access tokens');
+  if (rejected) return rejected;
+
   try {
     const { supabase, userId } = await requireAdminSupabaseClient();
 
@@ -177,6 +199,9 @@ export async function createMcpAccessTokenAction(input: {
 export async function revokeMcpAccessTokenAction(input: {
   id: string;
 }): Promise<{ error?: string; success: boolean }> {
+  const rejected = sandboxRejection('revoke MCP access tokens');
+  if (rejected) return rejected;
+
   try {
     const { supabase } = await requireAdminSupabaseClient();
     const id = String(input.id || '').trim();

package/templates/nextblock-template/app/cms/settings/cortex-ai/page.tsx

@@ -2,10 +2,9 @@ import { headers } from 'next/headers';
 
 import { listCortexAiCompatibleOpenRouterModels } from '@nextblock-cms/cortex';
 import { getCortexAiSettingsStatus } from './actions';
-import { getMcpSettingsStatus } from './mcp-actions';
+import { CortexAiSettingsClient } from './CortexAiSettingsClient';
+import { getMcpSettingsStatus, type McpSettingsStatus } from './mcp-actions';
 import { McpServerSettingsCard } from './McpServerSettingsCard';
-import { SandboxCortexAiSettingsClient } from './SandboxCortexAiSettingsClient';
-import { StoredCortexAiSettingsClient } from './StoredCortexAiSettingsClient';
 import { redirect } from 'next/navigation';
 
 type CortexAiSettingsPageProps = {
@@ -15,16 +14,12 @@ type CortexAiSettingsPageProps = {
   }>;
 };
 
-function formatDate(value: string | null) {
-  if (!value) {
-    return null;
-  }
-
-  return new Intl.DateTimeFormat('en', {
-    dateStyle: 'medium',
-    timeStyle: 'short',
-  }).format(new Date(value));
-}
+const SANDBOX_MCP_NOTICE =
+  'This is a shared sandbox, so the switches and the token list are locked — enabling a remote ' +
+  'write surface or minting a token here would apply to every visitor at once. Everything else ' +
+  'works: the endpoint and the client snippets below are exactly what you get on your own ' +
+  'NextBlock install, where you flip the switch, mint a token, and paste the config into Claude ' +
+  'Code, Claude Desktop, Cursor, or VS Code.';
 
 /**
  * The origin an external MCP client should dial.
@@ -80,16 +75,15 @@ export default async function CortexAiSettingsPage({
     redirect('/cms/dashboard');
   }
 
+  const isSandbox = process.env.NEXT_PUBLIC_IS_SANDBOX === 'true';
   const params: { error?: string; success?: string } = searchParams
     ? await searchParams
     : {};
-  const storedKeyUpdatedAt = formatDate(status.storedOpenRouterKeyUpdatedAt);
-  const selectedModelUpdatedAt = formatDate(status.selectedModel?.updatedAt || null);
-  const stockKeysUpdatedAt = formatDate(status.stockKeysUpdatedAt);
+
   let compatibleModels: Awaited<ReturnType<typeof listCortexAiCompatibleOpenRouterModels>> = [];
   let modelCatalogError: string | null = null;
 
-  if (status.hasStoredOpenRouterKey || process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
+  if (status.hasStoredOpenRouterKey || isSandbox) {
     try {
       compatibleModels = await listCortexAiCompatibleOpenRouterModels();
     } catch (error) {
@@ -98,44 +92,30 @@ export default async function CortexAiSettingsPage({
     }
   }
 
-  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
-    return (
-      <SandboxCortexAiSettingsClient
-        compatibleModels={compatibleModels as any}
-        isPackageActive={status.isPackageActive}
-        hasEnvOpenRouterKey={status.hasEnvOpenRouterKey}
-        maskedEnvOpenRouterKey={status.maskedEnvOpenRouterKey}
-        modelCatalogError={modelCatalogError}
-        activeStockProvider={status.activeStockProvider}
-        hasStoredPexelsKey={status.hasStoredPexelsKey}
-        maskedStoredPexelsKey={status.maskedStoredPexelsKey}
-        hasStoredUnsplashKey={status.hasStoredUnsplashKey}
-        maskedStoredUnsplashKey={status.maskedStoredUnsplashKey}
-        hasEnvPexelsKey={status.hasEnvPexelsKey}
-        hasEnvUnsplashKey={status.hasEnvUnsplashKey}
-        unsplashAppName={status.unsplashAppName}
-        agentSettings={status.agentSettings}
-      />
-    );
-  }
-
   const [mcpStatus, siteOrigin, localOrigin] = await Promise.all([
     getMcpSettingsStatus(),
     resolveSiteOrigin(),
     resolveLocalOrigin(),
   ]);
 
+  // The sandbox sees the card, the endpoint, and the snippets — but never the token
+  // list. Those rows belong to whoever runs the sandbox, and every visitor here shares
+  // one admin login, so listing another visitor's token names would be a leak with no
+  // upside (the card is read-only anyway, so nothing in it is actionable).
+  const visibleMcpStatus: McpSettingsStatus = isSandbox
+    ? { settings: mcpStatus.settings, tokens: [] }
+    : mcpStatus;
+
   return (
-    <StoredCortexAiSettingsClient
-      compatibleModels={compatibleModels as any}
+    <CortexAiSettingsClient
+      isSandbox={isSandbox}
+      compatibleModels={compatibleModels}
       isPackageActive={status.isPackageActive}
       hasEnvOpenRouterKey={status.hasEnvOpenRouterKey}
       maskedEnvOpenRouterKey={status.maskedEnvOpenRouterKey}
       hasStoredOpenRouterKey={status.hasStoredOpenRouterKey}
       maskedStoredOpenRouterKey={status.maskedStoredOpenRouterKey}
-      storedKeyUpdatedAt={storedKeyUpdatedAt}
       selectedModel={status.selectedModel}
-      selectedModelUpdatedAt={selectedModelUpdatedAt}
       hasEncryptionKey={status.hasEncryptionKey}
       modelCatalogError={modelCatalogError}
       activeStockProvider={status.activeStockProvider}
@@ -145,19 +125,20 @@ export default async function CortexAiSettingsPage({
       maskedStoredUnsplashKey={status.maskedStoredUnsplashKey}
       hasEnvPexelsKey={status.hasEnvPexelsKey}
       hasEnvUnsplashKey={status.hasEnvUnsplashKey}
-      stockKeysUpdatedAt={stockKeysUpdatedAt}
       unsplashAppName={status.unsplashAppName}
       agentSettings={status.agentSettings}
       successMessage={params.success}
       errorMessage={params.error}
     >
       <McpServerSettingsCard
-        allowLocalhostWithoutToken={mcpStatus.settings.allowLocalhostWithoutToken}
-        enabled={mcpStatus.settings.enabled}
+        allowLocalhostWithoutToken={visibleMcpStatus.settings.allowLocalhostWithoutToken}
+        enabled={visibleMcpStatus.settings.enabled}
         localMcpUrl={`${localOrigin}/api/mcp`}
         mcpUrl={`${siteOrigin}/api/mcp`}
-        tokens={mcpStatus.tokens}
+        readOnly={isSandbox}
+        readOnlyNotice={isSandbox ? SANDBOX_MCP_NOTICE : undefined}
+        tokens={visibleMcpStatus.tokens}
       />
-    </StoredCortexAiSettingsClient>
+    </CortexAiSettingsClient>
   );
 }

package/templates/nextblock-template/docs/08-NEXTBLOCK-CORTEX-AI-ARCHITECTURE.md

@@ -125,11 +125,38 @@ Known incomplete or future work:
 | `apps/nextblock/app/cms/layout.tsx` | Server layout checks package activation for ecommerce and Cortex AI. |
 | `apps/nextblock/app/cms/CmsClientLayout.tsx` | Adds Cortex AI settings nav item, wraps CMS in the page-context provider, and conditionally renders global chat. |
 | `apps/nextblock/app/cms/settings/cortex-ai/page.tsx` | Settings page for activation/key status, BYOK forms, and compatible model selection. |
+| `apps/nextblock/app/cms/settings/cortex-ai/CortexAiSettingsClient.tsx` | The single settings UI. One component for production **and** sandbox — see below. |
 | `apps/nextblock/app/cms/settings/cortex-ai/actions.ts` | Server actions for reading, saving, and clearing BYOK keys and model selections. |
 | `apps/nextblock/app/cms/dashboard/actions.ts` | Dashboard package state; checks `cortex-ai` to hide/show AI premium CTA. |
 | `apps/nextblock/components/Header.tsx` and `apps/nextblock/components/ResponsiveNav.tsx` | Hydration-safe public header controls after Radix ID mismatch fixes. |
 | `apps/nextblock/app/cms/components/FeedbackModal.tsx` | Hydration-safe feedback dialog trigger. |
 
+### One settings UI, sandbox included
+
+`page.tsx` has **one** render path. There is no sandbox variant component, and adding
+one back would re-create a bug this repo hit twice: the page used to fork into
+`StoredCortexAiSettingsClient` / `SandboxCortexAiSettingsClient`, which shared a layout
+only by copy-paste, so every redesign landed on production and silently skipped the
+sandbox — and the MCP card, mounted only on the production branch, never appeared in the
+sandbox at all.
+
+`CortexAiSettingsClient` takes `isSandbox` and follows one rule for anything the shared
+sandbox cannot do: **disable it, never hide it.** A visitor evaluating NextBlock has to be
+able to see that stock-photo keys, agent tuning, and MCP access exist and what they look
+like; a hidden control teaches them the feature does not exist. Locked cards carry a
+`Read-only` badge and say what changes on a real install.
+
+Two settings stay writable in the sandbox because they have a per-visitor channel: the
+OpenRouter key and the model selection, which live in this browser's `localStorage` and
+travel to the AI routes as `x-sandbox-openrouter-*` headers. Everything else is
+server-backed and refused by the `NEXT_PUBLIC_IS_SANDBOX` guards in `actions.ts` and
+`mcp-actions.ts` — the disabled control is the hint, those guards are the boundary.
+
+The MCP card renders in the sandbox with `readOnly`: toggles, minting, and revoking are
+disabled, and the token list is passed in empty (those rows belong to the host, and every
+sandbox visitor shares one admin login). The endpoint URL, the client picker, and the
+copy-paste snippets stay fully live, since that is the part worth showing.
+
 ## Package Activation
 
 The package id is `cortex-ai`. Do not use the old id `ai`.

package/templates/nextblock-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/template",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "private": true,
   "nextblock": {
     "install": "standalone"

package/templates/nextblock-template/tools/update.mjs

@@ -1075,6 +1075,24 @@ async function updateSchema(install, core, flags) {
     fail(`Could not read the migration history: ${applied.error}`);
     return { ok: false, applied: 0 };
   }
+  // Versions recorded remotely that have no file here mean the two histories have diverged
+  // — most often an install that predates the July 2026 re-baseline, where the old 000–044
+  // numbering is still recorded. That matters because Supabase (and this applier) match
+  // history by VERSION ONLY, never by content: a local file whose number is already
+  // recorded is skipped in silence, with no error and no output. Warn rather than block —
+  // a hand-written migration of the operator's own is a perfectly legitimate cause.
+  const localVersions = new Set(files.map((f) => f.version));
+  const remoteOnly = [...applied.versions].filter((v) => !localVersions.has(v)).sort();
+  if (remoteOnly.length > 0) {
+    warn(`${remoteOnly.length} version(s) are recorded in the database with no matching file:`);
+    for (const v of remoteOnly.slice(0, 10)) info(C.dim(`  ${v}`));
+    if (remoteOnly.length > 10) info(C.dim(`  … and ${remoteOnly.length - 10} more`));
+    info('Migrations are matched by version, never by content, so a local file reusing one');
+    info('of those numbers would never run. If this install predates the migration');
+    info(`re-baseline, reconcile it once with ${C.cyan('npm run db:migrate:repair-history')}.`);
+    say();
+  }
+
   const pending = files.filter((f) => !applied.versions.has(f.version));
 
   if (pending.length === 0) {