@morphika/andami 0.1.5 → 0.1.6

package/app/(site)/[slug]/page.tsx

@@ -1,3 +1,4 @@
+import { cache } from "react";
 import { notFound } from "next/navigation";
 import type { Metadata } from "next";
 import { client } from "../../../lib/sanity/client";
@@ -16,14 +17,16 @@ interface PageProps {
   params: Promise<{ slug: string }>;
 }
 
-async function getPageBySlug(slug: string): Promise<Page | null> {
+// CPU Audit Fix 3: React cache() deduplicates this call within a single
+// render pass — generateMetadata() and the page component share one fetch.
+const getPageBySlug = cache(async (slug: string): Promise<Page | null> => {
   try {
     return await client.fetch<Page>(publishedPageBySlugQuery, { slug });
   } catch (error) {
     console.error(`[Page] Failed to fetch page "${slug}":`, error);
     return null;
   }
-}
+});
 
 export async function generateStaticParams() {
   try {

package/app/(site)/layout.tsx

@@ -1,3 +1,4 @@
+import { cache } from "react";
 import { client } from "../../lib/sanity/client";
 import { siteSettingsQuery } from "../../lib/sanity/queries";
 import type { SiteSettings } from "../../lib/sanity/types";
@@ -11,14 +12,15 @@ import CustomCursor from "../../components/ui/CustomCursor";
 import ScrollToTop from "../../components/ui/ScrollToTop";
 import PortfolioTracker from "../../components/ui/PortfolioTracker";
 
-async function getSiteSettings(): Promise<SiteSettings | null> {
+// CPU Audit Fix 3: React cache() deduplicates within a render pass.
+const getSiteSettings = cache(async (): Promise<SiteSettings | null> => {
   try {
     return await client.fetch<SiteSettings>(siteSettingsQuery);
   } catch (error) {
     console.error("[SiteLayout] Failed to fetch site settings:", error);
     return null;
   }
-}
+});
 
 export default async function SiteLayout({
   children,

package/app/(site)/work/[slug]/page.tsx

@@ -1,3 +1,4 @@
+import { cache } from "react";
 import { notFound } from "next/navigation";
 import type { Metadata } from "next";
 import { client } from "../../../../lib/sanity/client";
@@ -17,14 +18,16 @@ interface ProjectPageProps {
   params: Promise<{ slug: string }>;
 }
 
-async function getProjectPage(slug: string): Promise<Page | null> {
+// CPU Audit Fix 3: React cache() deduplicates this call within a single
+// render pass — generateMetadata() and the page component share one fetch.
+const getProjectPage = cache(async (slug: string): Promise<Page | null> => {
   try {
     return await client.fetch<Page>(publishedProjectBySlugQuery, { slug });
   } catch (error) {
     console.error(`[Project] Failed to fetch project "${slug}":`, error);
     return null;
   }
-}
+});
 
 export async function generateStaticParams() {
   try {

package/app/admin/layout.tsx

@@ -4,6 +4,7 @@ import { usePathname, useRouter } from "next/navigation";
 import Link from "next/link";
 import { useState, useEffect, useRef } from "react";
 import { getSiteConfig } from "../../lib/config";
+import { ANDAMI_VERSION } from "../../lib/version";
 
 // ============================================
 // Navigation Configuration — flat list, no sections
@@ -161,7 +162,7 @@ export default function AdminLayout({
         <div className="flex h-14 items-center justify-between px-4 border-b border-white/[0.06]">
           {sidebarOpen && (
             <span className="text-[10px] font-semibold tracking-widest uppercase text-white/90 leading-tight">
-              {getSiteConfig().adminTitle || "Morphika Andami"}<br />
+              Morphika Andami <span className="text-white/40 font-normal">v{ANDAMI_VERSION}</span><br />
               <span className="text-white/50 font-normal">{getSiteConfig().name}</span>
             </span>
           )}

package/app/api/admin/assets/health/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { logger } from "../../../../../lib/logger";

package/app/api/admin/assets/register/route.ts

@@ -3,7 +3,7 @@ import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { isBodyTooLarge, MAX_JSON_BODY_SIZE, jsonError, isValidAssetPath } from "../../../../../lib/security";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { isMediaFile, getMimeType } from "../../../../../lib/storage/types";
 import { auditLog } from "../../../../../lib/audit";
 import { logger } from "../../../../../lib/logger";

package/app/api/admin/assets/registry/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { assetRegistryQuery } from "../../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../../lib/auth";

package/app/api/admin/assets/relink/confirm/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../../lib/sanity/writeClient";
 import { isAdminAuthenticated } from "../../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../../lib/csrf";

package/app/api/admin/assets/relink/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { getStorageAdapter } from "../../../../../lib/storage";

package/app/api/admin/assets/scan/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";

package/app/api/admin/custom-sections/[slug]/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { revalidatePath } from "next/cache";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { customSectionBySlugQuery, pagesUsingCustomSectionQuery } from "../../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../../lib/auth";

package/app/api/admin/custom-sections/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 import { writeClient } from "../../../../lib/sanity/writeClient";
 import { allCustomSectionsQuery } from "../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../lib/auth";

package/app/api/admin/database/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import { isAdminAuthenticated } from "../../../../lib/auth";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 
 /**
  * GET /api/admin/database — Sanity connection status & stats

package/app/api/admin/pages/[slug]/duplicate/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { revalidatePath } from "next/cache";
-import { client } from "../../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../../lib/sanity/writeClient";
 import { pageBySlugQuery } from "../../../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../../../lib/auth";

package/app/api/admin/pages/[slug]/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { revalidatePath } from "next/cache";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { pageBySlugQuery } from "../../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../../lib/auth";

package/app/api/admin/pages/[slug]/set-home/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { revalidatePath } from "next/cache";
-import { client } from "../../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../../lib/sanity/writeClient";
 import { isAdminAuthenticated } from "../../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../../lib/csrf";

package/app/api/admin/pages/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 import { writeClient } from "../../../../lib/sanity/writeClient";
 import { allPagesQuery } from "../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../lib/auth";

package/app/api/admin/preview/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 import { pageBySlugQuery } from "../../../../lib/sanity/queries";
 import { isAdminAuthenticated } from "../../../../lib/auth";
 import { logger } from "../../../../lib/logger";

package/app/api/admin/r2/delete/route.ts

@@ -3,7 +3,7 @@ import { S3Client, DeleteObjectCommand, ListObjectsV2Command, DeleteObjectsComma
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { isBodyTooLarge, MAX_JSON_BODY_SIZE, jsonError, isValidAssetPath, checkRateLimit } from "../../../../../lib/security";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { decryptToken } from "../../../../../lib/security";
 import { auditLog } from "../../../../../lib/audit";

package/app/api/admin/r2/rename/route.ts

@@ -3,7 +3,7 @@ import { S3Client, CopyObjectCommand, DeleteObjectCommand, ListObjectsV2Command,
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { isBodyTooLarge, MAX_JSON_BODY_SIZE, jsonError, isValidAssetPath, checkRateLimit } from "../../../../../lib/security";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
 import { decryptToken } from "../../../../../lib/security";
 import { auditLog } from "../../../../../lib/audit";

package/app/api/admin/r2/status/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 import { S3Client, ListObjectsV2Command } from "@aws-sdk/client-s3";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { decryptToken } from "../../../../../lib/security";
 import { logger } from "../../../../../lib/logger";
 

package/app/api/admin/r2/upload-url/route.ts

@@ -4,7 +4,7 @@ import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { isBodyTooLarge, MAX_JSON_BODY_SIZE, jsonError, isValidAssetPath, checkRateLimit } from "../../../../../lib/security";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { decryptToken } from "../../../../../lib/security";
 import { getMimeType, isMediaFile } from "../../../../../lib/storage/types";
 import { logger } from "../../../../../lib/logger";

package/app/api/admin/settings/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { isAdminAuthenticated } from "../../../../lib/auth";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 import { writeClient } from "../../../../lib/sanity/writeClient";
 import { siteSettingsQuery } from "../../../../lib/sanity/queries";
 import { isSafeUrl, isBodyTooLarge, MAX_JSON_BODY_SIZE } from "../../../../lib/security";

package/app/api/admin/setup/complete/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { auditLog } from "../../../../../lib/audit";
 import { logger } from "../../../../../lib/logger";

package/app/api/admin/setup/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { isAdminAuthenticated } from "../../../../lib/auth";
 import { getSetupStatus } from "../../../../lib/setup/detect";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 import { writeClient } from "../../../../lib/sanity/writeClient";
 import { validateCsrf, csrfErrorResponse } from "../../../../lib/csrf";
 

package/app/api/admin/storage/switch/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
 import { revalidatePath } from "next/cache";
 import { isAdminAuthenticated } from "../../../../../lib/auth";
 import { writeClient } from "../../../../../lib/sanity/writeClient";
-import { client } from "../../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../../lib/sanity/client";
 import { validateCsrf, csrfErrorResponse } from "../../../../../lib/csrf";
 import { isBodyTooLarge, MAX_JSON_BODY_SIZE, jsonError } from "../../../../../lib/security";
 import { invalidateProviderConfigCache } from "../../../../../lib/storage";

package/app/api/admin/styles/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { isAdminAuthenticated } from "../../../../lib/auth";
-import { client } from "../../../../lib/sanity/client";
+import { adminClient as client } from "../../../../lib/sanity/client";
 import { writeClient } from "../../../../lib/sanity/writeClient";
 import { siteStylesQuery } from "../../../../lib/sanity/queries";
 import { validateCsrf, csrfErrorResponse } from "../../../../lib/csrf";

package/components/ui/Navbar.tsx

@@ -537,8 +537,10 @@ export default function Navbar({
         </div>
 
         {/* Mobile: simple flex layout with hamburger — uses independent mobile styles */}
+        {/* BG color and icon color only apply when menu is open (overlay visible). */}
+        {/* When closed, the bar inherits desktop navbar colors for visual continuity. */}
         <div
-          className={`flex lg:hidden items-center justify-between ${mobileBarColorClass}`}
+          className={`flex lg:hidden items-center justify-between ${isMenuOpen ? mobileBarColorClass : ""} transition-colors duration-300`}
           style={{
             maxWidth: "var(--grid-width, 1445px)",
             marginLeft: "auto",
@@ -547,16 +549,16 @@ export default function Navbar({
             paddingRight: `${mobilePaddingH}px`,
             paddingTop: `${mobilePaddingV}px`,
             paddingBottom: `${mobilePaddingV}px`,
-            ...mobileNavBgStyle,
-            ...mobileBarColorStyle,
+            ...(isMenuOpen ? mobileNavBgStyle : {}),
+            ...(isMenuOpen ? mobileBarColorStyle : {}),
           }}
         >
           <Link
             href="/"
-            className={`tracking-normal ${mobileBarColorClass} transition-colors duration-200 hover:opacity-80 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-current`}
+            className={`tracking-normal ${isMenuOpen && mobileBarColorClass ? mobileBarColorClass : ""} transition-colors duration-300 hover:opacity-80 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-current`}
             style={{
               ...linkStyle,
-              ...(mobileBarIsHex ? { color: "inherit" } : {}),
+              ...(isMenuOpen && mobileBarIsHex ? { color: "inherit" } : {}),
             }}
           >
             {logoLabel}
@@ -565,11 +567,11 @@ export default function Navbar({
           <button
             ref={hamburgerButtonRef}
             onClick={() => setIsMenuOpen(!isMenuOpen)}
-            className={`flex flex-col justify-center items-center gap-[5px] w-8 h-8 ${mobileBarColorClass} focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-current`}
+            className={`flex flex-col justify-center items-center gap-[5px] w-8 h-8 ${isMenuOpen ? mobileBarColorClass : ""} transition-colors duration-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-current`}
             aria-label={isMenuOpen ? "Close menu" : "Open menu"}
             aria-expanded={isMenuOpen}
             aria-controls="mobile-nav-menu"
-            style={mobileBarIsHex ? { color: mobileBarColor } : undefined}
+            style={isMenuOpen && mobileBarIsHex ? { color: mobileBarColor } : undefined}
           >
             <span
               className={`block w-5 h-[1.5px] bg-current transition-all duration-300 ${

package/lib/sanity/client.ts

@@ -1,6 +1,22 @@
 import { createClient } from "next-sanity";
 
+/**
+ * Public read client — uses Sanity CDN for fast edge-cached responses.
+ * Stale window: ~120s (acceptable since ISR revalidates every 1h).
+ * Used by: public pages, public API routes, asset proxy.
+ */
 export const client = createClient({
+  projectId: process.env.NEXT_PUBLIC_SANITY_PROJECT_ID,
+  dataset: process.env.NEXT_PUBLIC_SANITY_DATASET || "production",
+  apiVersion: "2024-01-01",
+  useCdn: true,
+});
+
+/**
+ * Admin read client — bypasses CDN for always-fresh data.
+ * Used by: admin API routes that read content for editing.
+ */
+export const adminClient = createClient({
   projectId: process.env.NEXT_PUBLIC_SANITY_PROJECT_ID,
   dataset: process.env.NEXT_PUBLIC_SANITY_DATASET || "production",
   apiVersion: "2024-01-01",

package/lib/storage/index.ts

@@ -14,7 +14,7 @@
  *   const url = await adapter.resolveUrl("projects/hero.jpg");
  */
 
-import { client } from "../../lib/sanity/client";
+import { adminClient as client } from "../../lib/sanity/client";
 import { R2Adapter } from "./r2-adapter";
 import { logger } from "../../lib/logger";
 import type { StorageAdapter, StorageProvider, StorageProviderConfig } from "./types";
@@ -120,7 +120,7 @@ export async function getAllProviderStatuses(): Promise<{
 /**
  * In-memory cache for the R2 public URL.
  * Used by the asset proxy routes to resolve R2 redirects without
- * hitting Sanity on every request. TTL: 5 minutes.
+ * hitting Sanity on every request. TTL: 30 minutes.
  */
 let r2ConfigCache: {
   provider: StorageProvider;
@@ -131,7 +131,9 @@ let r2ConfigCache: {
 // #4: In-flight promise deduplication — prevents cache stampede race condition
 let inFlightFetch: Promise<ProviderConfig> | null = null;
 
-const PROVIDER_CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
+// CPU Audit Fix 4: Increased from 5min to 30min — R2 bucket URL rarely changes,
+// and invalidateProviderConfigCache() handles immediate resets on config changes.
+const PROVIDER_CACHE_TTL_MS = 30 * 60 * 1000; // 30 minutes
 
 export interface ProviderConfig {
   provider: StorageProvider;
@@ -143,7 +145,11 @@ export interface ProviderConfig {
  *
  * Used by /api/assets and /api/admin/assets/file to decide
  * how to redirect asset requests.
- * Cached for 5 minutes to avoid hitting Sanity on every asset request.
+ *
+ * Resolution order (CPU Audit Fix 2):
+ *   1. In-memory cache (30-minute TTL)
+ *   2. NEXT_PUBLIC_R2_BUCKET_URL env var (zero-cost, no Sanity query)
+ *   3. Sanity assetRegistry query (fallback)
  *
  * #4: Uses promise chaining to deduplicate concurrent requests.
  * #23: Adds AbortController timeout on Sanity fetch.
@@ -154,6 +160,18 @@ export async function getCachedProviderConfig(): Promise<ProviderConfig> {
     return r2ConfigCache;
   }
 
+  // CPU Audit Fix 2: Check env var first — avoids Sanity query entirely.
+  // The R2 bucket URL almost never changes; env var is the fastest path.
+  const envBucketUrl = process.env.NEXT_PUBLIC_R2_BUCKET_URL;
+  if (envBucketUrl) {
+    const config: ProviderConfig = {
+      provider: "r2" as StorageProvider,
+      r2BucketUrl: envBucketUrl,
+    };
+    r2ConfigCache = { ...config, fetchedAt: Date.now() };
+    return config;
+  }
+
   // #4: If there's already an in-flight fetch, reuse it instead of starting a new one
   if (inFlightFetch) return inFlightFetch;
 

package/lib/version.ts

@@ -0,0 +1,6 @@
+/**
+ * Framework version — auto-read from package.json at build time.
+ * Kept as a simple constant so it can be imported without reading
+ * the full package.json at runtime.
+ */
+export const ANDAMI_VERSION = "0.1.5";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphika/andami",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Visual Page Builder — core library. A reusable website builder with visual editing, CMS integration, and asset management.",
   "type": "module",
   "license": "MIT",