orionfold-relay 0.22.1 → 0.24.0

package/README.md

@@ -104,7 +104,7 @@ The governance is *in* the workflow, not bolted on. A blueprint is a fixed step
 ## Why it stays trustworthy
 
 - **Local-first** — SQLite database, no cloud dependency, `npx orionfold-relay` and go
-- **Never phones home** — no telemetry, no update checks, no license server; the complete outbound-network inventory is documented and code-linked in [docs/trust/data-flow.md](docs/trust/data-flow.md)
+- **Relay never sends your data to Orionfold** — no telemetry, no update checks, no license server; the complete outbound-network inventory is documented and code-linked in [docs/trust/data-flow.md](docs/trust/data-flow.md)
 - **Your rules, enforced** — tool permissions, inbox approvals, and audit trails for every agent action
 - **Your AI team** — 21 specialist profiles ready to deploy, each with instructions, tool policies, and runtime tuning
 - **Know what you spend** — usage metering, budgets, and per-provider/per-model spend visibility on governed runs
@@ -134,8 +134,8 @@ relay license remove <license-id>                            # forget a license
 
 - **Verification is 100% offline** — an Ed25519 signature check against keys embedded in
   this repo ([`src/lib/licensing/verify.ts`](src/lib/licensing/verify.ts)). Relay never
-  phones home: no activation server, no telemetry, no network call of any kind. Works
-  air-gapped.
+  sends your data to Orionfold: no activation server, no telemetry, no network call of
+  any kind. Works air-gapped.
 - **Your packs are yours forever. Renewal gets you the year's new and updated packs +
   priority support.** An expired or removed license never re-locks content you already
   installed — it only gates new premium installs and updates.

package/dist/cli.js

@@ -464,7 +464,7 @@ function bootstrapAinativeDatabase(sqlite3) {
       sqlite3.exec(ddl);
     } catch (err2) {
       const msg = err2 instanceof Error ? err2.message : String(err2);
-      if (!msg.includes("duplicate column")) {
+      if (!msg.includes("duplicate column") && !msg.includes("no such table")) {
         console.error("[bootstrap] ALTER TABLE failed:", msg);
       }
     }
@@ -1186,7 +1186,7 @@ var CURRENT_PLUGIN_API_VERSION, CAPABILITY_VALUES, ORIGIN_VALUES, PrimitivesBund
 var init_types = __esm({
   "src/lib/plugins/sdk/types.ts"() {
     "use strict";
-    CURRENT_PLUGIN_API_VERSION = "0.22";
+    CURRENT_PLUGIN_API_VERSION = "0.24";
     CAPABILITY_VALUES = ["fs", "net", "child_process", "env"];
     ORIGIN_VALUES = ["ainative-internal", "third-party"];
     PrimitivesBundleManifestSchema = z.object({
@@ -3739,9 +3739,25 @@ var init_format = __esm({
       /**
        * Premium display copy (D6). Offline strings rendered on the locked
        * gallery card — the Website still owns actual pricing. Meaningful only
-       * alongside `entitlement`; harmless on a free pack.
+       * alongside `entitlement`; harmless on a free pack. Either a flat string
+       * ("$499/year") or a two-phase offer ({ list, intro?, note? }) so a
+       * founding/introductory price can render alongside the list price.
+       * Render sites consume `packPrice()` — never branch on the raw shape.
        */
-      price: z3.string().min(1).optional(),
+      price: z3.union([
+        z3.string().min(1),
+        z3.object({
+          list: z3.string().min(1),
+          intro: z3.string().min(1).optional(),
+          note: z3.string().min(1).optional()
+        }).strict()
+      ]).optional(),
+      /**
+       * Card identity token — a lucide icon name rendered on the gallery card
+       * (e.g. "briefcase"). Unknown tokens fall back to the default glyph;
+       * never a remote asset.
+       */
+      icon: z3.string().min(1).optional(),
       /** Get-license CTA target on the locked card. */
       purchaseUrl: z3.url().optional(),
       /**
@@ -5779,6 +5795,13 @@ __export(registry_exports3, {
 import fs11 from "fs";
 import path11 from "path";
 import yaml7 from "js-yaml";
+function userDirMtimeMs() {
+  try {
+    return fs11.statSync(USER_BLUEPRINTS_DIR).mtimeMs;
+  } catch {
+    return null;
+  }
+}
 function scanDirectory(dir, isBuiltin2) {
   const blueprints = /* @__PURE__ */ new Map();
   if (!fs11.existsSync(dir)) return blueprints;
@@ -5813,8 +5836,13 @@ function loadAll() {
   return all;
 }
 function ensureLoaded2() {
+  if (blueprintCache && userDirMtimeMs() !== cachedDirMtimeMs) {
+    blueprintCache = null;
+  }
   if (!blueprintCache) {
+    cachedDirMtimeMs = userDirMtimeMs();
     blueprintCache = loadAll();
+    applyPluginBlueprints(blueprintCache);
   }
   return blueprintCache;
 }
@@ -5862,30 +5890,35 @@ function deleteBlueprint(id) {
 function getUserBlueprintsDir() {
   return USER_BLUEPRINTS_DIR;
 }
+function applyPluginBlueprints(cache) {
+  for (const byId of pluginBlueprints.values()) {
+    for (const [id, bp] of byId) cache.set(id, bp);
+  }
+}
 function mergePluginBlueprints(entries) {
   const cache = ensureLoaded2();
   for (const entry of entries) {
     cache.set(entry.blueprint.id, entry.blueprint);
-    if (!pluginBlueprintIndex.has(entry.pluginId)) {
-      pluginBlueprintIndex.set(entry.pluginId, /* @__PURE__ */ new Set());
+    if (!pluginBlueprints.has(entry.pluginId)) {
+      pluginBlueprints.set(entry.pluginId, /* @__PURE__ */ new Map());
     }
-    pluginBlueprintIndex.get(entry.pluginId).add(entry.blueprint.id);
+    pluginBlueprints.get(entry.pluginId).set(entry.blueprint.id, entry.blueprint);
   }
 }
 function clearPluginBlueprints(pluginId) {
   const cache = blueprintCache;
-  const ids = pluginBlueprintIndex.get(pluginId);
-  if (!ids) return;
-  if (cache) for (const id of ids) cache.delete(id);
-  pluginBlueprintIndex.delete(pluginId);
+  const byId = pluginBlueprints.get(pluginId);
+  if (!byId) return;
+  if (cache) for (const id of byId.keys()) cache.delete(id);
+  pluginBlueprints.delete(pluginId);
 }
 function clearAllPluginBlueprints() {
-  for (const pluginId of Array.from(pluginBlueprintIndex.keys())) {
+  for (const pluginId of Array.from(pluginBlueprints.keys())) {
     clearPluginBlueprints(pluginId);
   }
 }
 function listPluginBlueprintIds(pluginId) {
-  return Array.from(pluginBlueprintIndex.get(pluginId) ?? []);
+  return Array.from(pluginBlueprints.get(pluginId)?.keys() ?? []);
 }
 function validateBlueprintRefs(bp, opts2) {
   for (const step of bp.steps ?? []) {
@@ -5907,7 +5940,7 @@ function validateBlueprintRefs(bp, opts2) {
   }
   return { ok: true };
 }
-var BUILTINS_DIR2, USER_BLUEPRINTS_DIR, blueprintCache, pluginBlueprintIndex;
+var BUILTINS_DIR2, USER_BLUEPRINTS_DIR, blueprintCache, cachedDirMtimeMs, pluginBlueprints;
 var init_registry3 = __esm({
   "src/lib/workflows/blueprints/registry.ts"() {
     "use strict";
@@ -5925,7 +5958,8 @@ var init_registry3 = __esm({
     );
     USER_BLUEPRINTS_DIR = getAinativeBlueprintsDir();
     blueprintCache = null;
-    pluginBlueprintIndex = /* @__PURE__ */ new Map();
+    cachedDirMtimeMs = null;
+    pluginBlueprints = /* @__PURE__ */ new Map();
   }
 });
 
@@ -12929,7 +12963,7 @@ var init_registry6 = __esm({
     init_registry5();
     init_installer();
     init_schedule_spec();
-    SUPPORTED_API_VERSIONS = /* @__PURE__ */ new Set([CURRENT_PLUGIN_API_VERSION, "0.21"]);
+    SUPPORTED_API_VERSIONS = /* @__PURE__ */ new Set([CURRENT_PLUGIN_API_VERSION, "0.23"]);
     pluginCache = null;
     lastLoadedPluginIds = /* @__PURE__ */ new Set();
     PluginTableSchema = z16.object({
@@ -17601,11 +17635,20 @@ var init_plugin_spec_tools = __esm({
   }
 });
 
+// src/lib/apps/apps-events.ts
+var APPS_CHANGED_EVENT;
+var init_apps_events = __esm({
+  "src/lib/apps/apps-events.ts"() {
+    "use strict";
+    APPS_CHANGED_EVENT = "relay-apps-changed";
+  }
+});
+
 // src/lib/chat/tools/app-view-tools.ts
 import { z as z28 } from "zod";
 function dispatchAppsChangedFromTool() {
   if (typeof window !== "undefined") {
-    window.dispatchEvent(new CustomEvent("ainative-apps-changed"));
+    window.dispatchEvent(new CustomEvent(APPS_CHANGED_EVENT));
   }
 }
 function loadManifestOrError(appId) {
@@ -17742,6 +17785,7 @@ var init_app_view_tools = __esm({
   "src/lib/chat/tools/app-view-tools.ts"() {
     "use strict";
     init_tool_registry();
+    init_apps_events();
     init_helpers2();
     init_registry();
     BindingsSchema = ViewSchema.shape.bindings;
@@ -20139,7 +20183,7 @@ async function handleServerRequest(client, taskId, request) {
         contentItems: [
           {
             type: "inputText",
-            text: "Dynamic tool calls are not supported by ainative's Codex runtime yet."
+            text: "Dynamic tool calls are not supported by Relay's Codex runtime yet."
           }
         ]
       });
@@ -20746,6 +20790,24 @@ async function withAnthropicDirectMcpServers(profileServers, browserServers, ext
     relay: relayServer
   };
 }
+function mcpServersToAnthropicConnectors(mergedServers) {
+  const connectors = [];
+  for (const [name, config] of Object.entries(mergedServers)) {
+    if (name === "relay") continue;
+    const cfg = config;
+    const url = cfg.url ?? cfg.server_url;
+    if (typeof url !== "string" || url.length === 0) {
+      continue;
+    }
+    const connector = { type: "url", url, name };
+    for (const [key, value] of Object.entries(cfg)) {
+      if (["url", "server_url", "command", "args", "env"].includes(key)) continue;
+      if (typeof value === "string") connector[key] = value;
+    }
+    connectors.push(connector);
+  }
+  return connectors;
+}
 async function getAnthropicSDK() {
   if (!_sdk) {
     _sdk = await import("@anthropic-ai/sdk");
@@ -20812,7 +20874,7 @@ async function callAnthropicModel(client, systemPrompt, messages, tools, signal,
       budget_tokens: options.extendedThinking.budgetTokens ?? 1e4
     };
   }
-  if (options.mcpServers && Object.keys(options.mcpServers).length > 0) {
+  if (options.mcpServers && options.mcpServers.length > 0) {
     params.mcp_servers = options.mcpServers;
   }
   const stream = client.messages.stream(params, { signal });
@@ -20917,6 +20979,7 @@ ${outputInstructions}`;
       pluginServers,
       task.projectId
     );
+    const mcpConnectors = mcpServersToAnthropicConnectors(mergedMcpServers);
     let initialMessages;
     if (isResume) {
       const snapshot = await loadSessionSnapshot(taskId);
@@ -20965,7 +21028,7 @@ ${outputInstructions}`;
             enableCaching: true,
             profileInstructions: profile?.skillMd,
             extendedThinking: capOverrides?.extendedThinking,
-            mcpServers: mergedMcpServers
+            mcpServers: mcpConnectors
           }
         );
         await saveSessionSnapshot(taskId, agentProfileId, [
@@ -25740,8 +25803,8 @@ import { execFileSync as execFileSync3 } from "child_process";
 import yaml12 from "js-yaml";
 import semver from "semver";
 function relayCoreVersion() {
-  if (semver.valid("0.22.1")) {
-    return "0.22.1";
+  if (semver.valid("0.24.0")) {
+    return "0.24.0";
   }
   try {
     const root = getAppRoot(import.meta.dirname, 3);
@@ -26984,6 +27047,10 @@ function hasSqliteHeader(path24) {
     return false;
   }
 }
+var MIGRATION_CHAIN = [
+  { fromDir: ".stagent", toDir: ".ainative", fromDb: "stagent.db", toDb: "ainative.db" },
+  { fromDir: ".ainative", toDir: ".relay", fromDb: "ainative.db", toDb: "relay.db" }
+];
 async function migrateLegacyData(options = {}) {
   const home = options.home ?? homedir2();
   const gitDir = options.gitDir ?? join6(process.cwd(), ".git");
@@ -26996,46 +27063,50 @@ async function migrateLegacyData(options = {}) {
     keychainMigrated: false,
     errors: []
   };
-  const oldDir = join6(home, ".stagent");
-  const newDir = join6(home, ".ainative");
-  if (existsSync4(oldDir) && !existsSync4(newDir)) {
-    try {
-      renameSync(oldDir, newDir);
-      report.dirMigrated = true;
-      log(`renamed ${oldDir} -> ${newDir}`);
-    } catch (err2) {
-      const e = err2;
-      if (e.code === "EXDEV") {
-        try {
-          cpSync(oldDir, newDir, { recursive: true });
-          rmSync2(oldDir, { recursive: true, force: true });
-          report.dirMigrated = true;
-          log(`copied ${oldDir} -> ${newDir} (cross-device fallback)`);
-        } catch (copyErr) {
-          report.errors.push(`dir copy failed: ${String(copyErr)}`);
+  const finalDir = join6(home, MIGRATION_CHAIN[MIGRATION_CHAIN.length - 1].toDir);
+  const finalDbName = MIGRATION_CHAIN[MIGRATION_CHAIN.length - 1].toDb;
+  for (const hop of MIGRATION_CHAIN) {
+    const oldDir = join6(home, hop.fromDir);
+    const newDir = join6(home, hop.toDir);
+    if (existsSync4(oldDir) && !existsSync4(newDir)) {
+      try {
+        renameSync(oldDir, newDir);
+        report.dirMigrated = true;
+        log(`renamed ${oldDir} -> ${newDir}`);
+      } catch (err2) {
+        const e = err2;
+        if (e.code === "EXDEV") {
+          try {
+            cpSync(oldDir, newDir, { recursive: true });
+            rmSync2(oldDir, { recursive: true, force: true });
+            report.dirMigrated = true;
+            log(`copied ${oldDir} -> ${newDir} (cross-device fallback)`);
+          } catch (copyErr) {
+            report.errors.push(`dir copy failed: ${String(copyErr)}`);
+            return report;
+          }
+        } else {
+          report.errors.push(`dir rename failed: ${String(err2)}`);
           return report;
         }
-      } else {
-        report.errors.push(`dir rename failed: ${String(err2)}`);
-        return report;
       }
     }
-  }
-  if (existsSync4(newDir)) {
-    for (const suffix of ["", "-shm", "-wal"]) {
-      const oldName = join6(newDir, `stagent.db${suffix}`);
-      const newName = join6(newDir, `ainative.db${suffix}`);
-      if (existsSync4(oldName) && !existsSync4(newName)) {
-        try {
-          renameSync(oldName, newName);
-          report.dbFilesRenamed++;
-        } catch (err2) {
-          report.errors.push(`db file rename failed (${suffix}): ${String(err2)}`);
+    if (existsSync4(newDir)) {
+      for (const suffix of ["", "-shm", "-wal"]) {
+        const oldName = join6(newDir, `${hop.fromDb}${suffix}`);
+        const newName = join6(newDir, `${hop.toDb}${suffix}`);
+        if (existsSync4(oldName) && !existsSync4(newName)) {
+          try {
+            renameSync(oldName, newName);
+            report.dbFilesRenamed++;
+          } catch (err2) {
+            report.errors.push(`db file rename failed (${suffix}): ${String(err2)}`);
+          }
         }
       }
     }
   }
-  const dbPath4 = join6(newDir, "ainative.db");
+  const dbPath4 = join6(finalDir, finalDbName);
   if (existsSync4(dbPath4) && !hasSqliteHeader(dbPath4)) {
     log(`skipping SQL migration \u2014 ${dbPath4} exists but lacks SQLite header`);
   }
@@ -27104,7 +27175,8 @@ var __dirname = dirname5(fileURLToPath4(import.meta.url));
 var appDir = join21(__dirname, "..");
 var launchCwd2 = process.cwd();
 var _envLocalPath = join21(launchCwd2, ".env.local");
-var _firstRunNeedsEnv = !existsSync13(_envLocalPath) && !process.env.RELAY_DATA_DIR && !isDevMode(launchCwd2);
+var _hasDataDirFlag = process.argv.slice(2).some((a) => a === "--data-dir" || a.startsWith("--data-dir="));
+var _firstRunNeedsEnv = !existsSync13(_envLocalPath) && !process.env.RELAY_DATA_DIR && !_hasDataDirFlag && !isDevMode(launchCwd2);
 if (_firstRunNeedsEnv) {
   const folderName = basename6(launchCwd2);
   const autoDataDir = join21(homedir8(), `.${folderName}`);
@@ -27144,6 +27216,18 @@ if (existsSync13(_envLocalPath)) {
     }
   }
 }
+function scanDataDirFlag(argv) {
+  for (let i = 0; i < argv.length; i++) {
+    const tok = argv[i];
+    if (tok === "--data-dir") return argv[i + 1];
+    if (tok.startsWith("--data-dir=")) return tok.slice("--data-dir=".length);
+  }
+  return void 0;
+}
+var _dataDirFlag = scanDataDirFlag(process.argv.slice(2));
+if (_dataDirFlag) {
+  process.env.RELAY_DATA_DIR = _dataDirFlag;
+}
 var pkg = JSON.parse(readFileSync9(join21(appDir, "package.json"), "utf-8"));
 function getHelpText() {
   const dir = getAinativeDataDir();

package/drizzle.config.ts

@@ -2,13 +2,13 @@ import { defineConfig } from "drizzle-kit";
 import { homedir } from "os";
 import { join } from "path";
 
-const dataDir = process.env.AINATIVE_DATA_DIR || join(homedir(), ".ainative");
+const dataDir = process.env.RELAY_DATA_DIR || join(homedir(), ".relay");
 
 export default defineConfig({
   schema: "./src/lib/db/schema.ts",
   out: "./src/lib/db/migrations",
   dialect: "sqlite",
   dbCredentials: {
-    url: join(dataDir, "ainative.db"),
+    url: join(dataDir, "relay.db"),
   },
 });

package/next.config.mjs

@@ -1,3 +1,9 @@
+import { readFileSync } from "node:fs";
+import {
+  PHASE_PRODUCTION_BUILD,
+  PHASE_DEVELOPMENT_SERVER,
+} from "next/constants.js";
+
 // When the operator opts into LAN binding (`--hostname` to a non-loopback host,
 // see bin/cli.ts), the CLI sets RELAY_ALLOW_LAN_ORIGINS=true. In dev mode Next
 // otherwise blocks cross-origin requests to /_next/* dev assets from the LAN
@@ -16,6 +22,26 @@ const RFC1918_DEV_ORIGINS = [
 ];
 const allowLanDevOrigins = process.env.RELAY_ALLOW_LAN_ORIGINS === "true";
 
+// Build-time core version, mirroring tsup's `define` (tsup.config.ts). tsup
+// only builds the CLI bundle (dist/cli.js), so WITHOUT this the Next.js server
+// leaves `__RELAY_CORE_VERSION__` undefined — relayCoreVersion() then falls to
+// its "0.0.0" default and every /packs UI install is rejected with
+// `requires relay-core >=X, but this install is 0.0.0` (fix-packs-ui-install-
+// core-version). We inject it via `compiler.defineServer` below, which Next
+// applies to BOTH bundlers (webpack for `next build`, Turbopack for `next dev`)
+// so the server resolves the real version exactly as the shipped CLI does.
+// `defineServer` (not `define`) because relayCoreVersion() is server-only —
+// keeps the value out of client bundles. Single source of truth: pkg.version.
+//
+// NOTE: pass the RAW version string, NOT `JSON.stringify(...)`. Next's
+// `compiler.define` takes literal values and quotes them itself, unlike tsup's
+// `define` which takes JS-source text. Stringifying here would inject the
+// double-quoted `"0.23.0"`, which fails `semver.valid()` and silently falls
+// back to the "0.0.0" default — reintroducing the exact bug this fixes.
+const CORE_VERSION_DEFINE = JSON.parse(
+  readFileSync(new URL("./package.json", import.meta.url), "utf-8")
+).version;
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   serverExternalPackages: ["better-sqlite3", "pdf-parse", "pdfjs-dist"],
@@ -41,4 +67,29 @@ const nextConfig = {
   },
 };
 
-export default nextConfig;
+// Phase-aware export. `compiler.defineServer` is a COMPILE-TIME directive — it
+// only does anything while a bundler runs (build + dev). At runtime `next start`
+// re-reads this config but never recompiles, so the define is inert there AND
+// Next's config validator emits a spurious "defineServer.__RELAY_CORE_VERSION__
+// is missing, expected boolean" warning (a false positive from its union-error
+// flattener — the string value is valid; see next/dist/shared/lib/zod.js). That
+// warning would land in every customer's prod server log. So we attach
+// defineServer ONLY in the build/dev phases, keeping the shipped `next start`
+// path warning-free while the version is already baked into `.next`.
+export default function config(phase) {
+  if (
+    phase === PHASE_PRODUCTION_BUILD ||
+    phase === PHASE_DEVELOPMENT_SERVER
+  ) {
+    return {
+      ...nextConfig,
+      compiler: {
+        ...nextConfig.compiler,
+        defineServer: {
+          __RELAY_CORE_VERSION__: CORE_VERSION_DEFINE,
+        },
+      },
+    };
+  }
+  return nextConfig;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionfold-relay",
-  "version": "0.22.1",
+  "version": "0.24.0",
   "description": "Orionfold Relay — a local-first, multi-agent orchestration runtime and builder scaffold for AI-native work.",
   "keywords": [
     "ai",
@@ -68,6 +68,7 @@
     "test:e2e": "vitest run --config vitest.config.e2e.ts",
     "test:ui": "vitest --ui",
     "validate:tokens": "npx tsx design-system/validate-tokens.ts",
+    "check:price-drift": "node scripts/check-price-drift.mjs",
     "sync-worktree": "bash bin/sync-worktree.sh",
     "prepublishOnly": "npm run build:cli"
   },

package/src/app/api/license/route.ts

@@ -14,7 +14,7 @@ import type { SignedLicense } from "@/lib/licensing/verify";
  * paste/upload activation path for UI-first users: the browser reads the
  * fulfilment file client-side and ships the `{ payload, signature }` envelope
  * as JSON. Verification is offline Ed25519 inside saveLicense; nothing here
- * phones home.
+ * sends user data to Orionfold.
  */
 
 const BodySchema = z.object({

package/src/app/apps/page.tsx

@@ -100,7 +100,7 @@ function EmptyHero({ starters }: { starters: ReturnType<typeof listStarters> })
           <Sparkles className="h-10 w-10 text-primary mb-4" aria-hidden="true" />
           <h2 className="text-lg font-semibold">Teach this instance a new job.</h2>
           <p className="mt-2 max-w-md text-sm text-muted-foreground">
-            Describe the thing you do every week. Orionfold Relay composes a profile, blueprint, schedule, and tables into a running app — no code, no deploys.
+            Describe the thing you do every week. Orionfold Relay composes a profile, blueprint, schedule, and tables into a running app. No code, no deploys.
           </p>
           <div className="mt-4 flex items-center gap-4">
             <Link

package/src/app/inbox/page.tsx

@@ -69,7 +69,7 @@ export default async function InboxPage() {
   return (
     <PageShell
       title="Inbox"
-      description="Governance command center — review approvals, questions, and agent activity."
+      description="Governance command center. Review approvals, questions, and agent activity."
     >
       <GovernanceStats
         pending={pendingCount}

package/src/app/layout.tsx

@@ -12,6 +12,7 @@ import { ChatSessionProvider } from "@/components/chat/chat-session-provider";
 import { RuntimePreferenceBootstrapper } from "@/components/onboarding/runtime-preference-bootstrapper";
 import {
   DEFAULT_THEME,
+  LEGACY_THEME_COOKIE,
   THEME_COOKIE,
   isResolvedTheme,
   type ResolvedTheme,
@@ -82,12 +83,16 @@ export default async function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  // Resolve theme server-side from the ainative-theme cookie. Every client-side
+  // Resolve theme server-side from the relay-theme cookie. Every client-side
   // theme toggle writes this cookie (see src/lib/theme.ts), so SSR stays in
   // sync with the user's preference and there is no FOUC — and no pre-hydration
-  // <script> tag, which is what React 19 warns about.
+  // <script> tag, which is what React 19 warns about. Fall back to the legacy
+  // ainative-theme cookie so a returning pre-rebrand user does not flash the
+  // default theme before the client re-writes the new cookie.
   const cookieStore = await cookies();
-  const cookieValue = cookieStore.get(THEME_COOKIE)?.value;
+  const cookieValue =
+    cookieStore.get(THEME_COOKIE)?.value ??
+    cookieStore.get(LEGACY_THEME_COOKIE)?.value;
   const theme: ResolvedTheme = isResolvedTheme(cookieValue)
     ? cookieValue
     : DEFAULT_THEME;