fimo 0.21.0-staging.2 → 0.21.0-staging.3

package/dist/runtime/app/FimoProviders.js

@@ -14,6 +14,7 @@ import { getFimoTextDirection, resolveFimoLocale, toHtmlLang } from '../i18n/loc
 import { ScreenshotProvider } from '../iframe/ScreenshotProvider.js';
 import { getSafePreviewNavigationPath, isPreviewRuntimeEnabled } from '../preview/bridge.js';
 import { getPreviewLocationChange, getPreviewParentOrigin } from '../preview/location.js';
+import { ensurePreviewScript } from '../preview/script.js';
 import { getActiveRouterRoutes } from '../react-router/active-routes.js';
 import { matchFimoRoute } from '../routes/index.js';
 import { OptionalTracking } from '../t/OptionalTracking.js';
@@ -170,7 +171,8 @@ export function FimoProviders({ children, locale }) {
     const activeLocale = useMemo(() => locale ?? getRouteLocale(location.pathname), [locale, location.pathname]);
     const activeDir = getFimoTextDirection(activeLocale);
     // @ts-ignore - import.meta.env is provided by Vite and React Router.
-    const previewEnabled = isPreviewRuntimeEnabled(import.meta.env.VITE_PREVIEW_SCRIPT_URL);
+    const previewScriptUrl = import.meta.env.VITE_PREVIEW_SCRIPT_URL;
+    const previewEnabled = isPreviewRuntimeEnabled(previewScriptUrl);
     useEffect(() => {
         if (typeof document === 'undefined') {
             return;
@@ -178,6 +180,11 @@ export function FimoProviders({ children, locale }) {
         document.documentElement.lang = toHtmlLang(activeLocale);
         document.documentElement.dir = activeDir;
     }, [activeDir, activeLocale]);
+    useEffect(() => {
+        if (previewEnabled) {
+            ensurePreviewScript(previewScriptUrl);
+        }
+    }, [previewEnabled, previewScriptUrl]);
     return (_jsx(ErrorBoundary, { FallbackComponent: AppErrorBoundary, onError: onError, children: _jsx(EnsureQueryClient, { children: _jsx(FimoLocaleProvider, { value: {
                     ...localeResolution,
                     locale: activeLocale,

package/dist/runtime/app/FimoScripts.d.ts

@@ -3,7 +3,6 @@ import 'virtual:fimo-overlay-hmr';
  * Renders extra <script> tags in <head>:
  * - Dev overlay runtime (window.error / unhandledrejection bridge to parent)
  * - JSON-LD Schema.org Organization + WebSite (when seo.siteName + seo.url set)
- * - Preview script (when VITE_PREVIEW_SCRIPT_URL is set, e.g. iframe preview mode)
  *
  * The overlay runtime is embedded inline via the `virtual:fimo-overlay-runtime`
  * module (resolved by `overlayPlugin` in `fimo/vite`). The previous approach

package/dist/runtime/app/FimoScripts.js

@@ -33,7 +33,6 @@ function buildSiteSchemas() {
  * Renders extra <script> tags in <head>:
  * - Dev overlay runtime (window.error / unhandledrejection bridge to parent)
  * - JSON-LD Schema.org Organization + WebSite (when seo.siteName + seo.url set)
- * - Preview script (when VITE_PREVIEW_SCRIPT_URL is set, e.g. iframe preview mode)
  *
  * The overlay runtime is embedded inline via the `virtual:fimo-overlay-runtime`
  * module (resolved by `overlayPlugin` in `fimo/vite`). The previous approach
@@ -41,8 +40,6 @@ function buildSiteSchemas() {
  * since framework mode bypasses `index.html` entirely.
  */
 export function FimoScripts() {
-    // @ts-ignore - import.meta.env is a Vite feature
-    const previewScriptUrl = import.meta.env.VITE_PREVIEW_SCRIPT_URL;
     const siteSchemas = buildSiteSchemas();
-    return (_jsxs(_Fragment, { children: [runtime ? _jsx("script", { type: "module", dangerouslySetInnerHTML: { __html: runtime } }) : null, previewScriptUrl ? _jsx("script", { src: previewScriptUrl, defer: true }) : null, siteSchemas.map((schema, index) => (_jsx("script", { type: "application/ld+json", dangerouslySetInnerHTML: { __html: JSON.stringify(schema) } }, index)))] }));
+    return (_jsxs(_Fragment, { children: [runtime ? _jsx("script", { type: "module", dangerouslySetInnerHTML: { __html: runtime } }) : null, siteSchemas.map((schema, index) => (_jsx("script", { type: "application/ld+json", dangerouslySetInnerHTML: { __html: JSON.stringify(schema) } }, index)))] }));
 }

package/dist/runtime/next/client.d.ts

@@ -22,7 +22,7 @@ export { Text } from '../react/primitives/editable/Text.js';
 export { Video } from '../react/primitives/editable/Video.js';
 export type { BoolOps, DateOps, Field, Fields, FilterFor, FimoPart, FimoPolymorphicReference, FimoReference, FimoRichTextContent, FimoSource, NullOnlyOps, NumberOps, Populate, Populated, PopulatedResult, Projected, ProjectedWithPopulate, Query, ReferenceField, ReferenceMap, ScalarOps, Sort, SortField, StringOps, Where, WithReferences, } from '../content/index.js';
 export type { FimoRichTextComponents, FimoRichTextMarkProps, FimoRichTextNodeProps, } from '../react/primitives/contracts.js';
-export { FimoPreviewBridge, FimoProvider, useLabels } from './provider.js';
-export type { FimoPreviewBridgeProps, FimoProviderProps } from './provider.js';
+export { FimoProvider, useLabels } from './provider.js';
+export type { FimoProviderProps } from './provider.js';
 export type { Labels, LabelsSnapshot } from '../labels/core.js';
 //# sourceMappingURL=client.d.ts.map

package/dist/runtime/next/client.js

@@ -22,4 +22,4 @@ export { RichText } from '../react/primitives/editable/RichText.js';
 export { StaticImage } from '../react/primitives/renderers/StaticImage.js';
 export { Text } from '../react/primitives/editable/Text.js';
 export { Video } from '../react/primitives/editable/Video.js';
-export { FimoPreviewBridge, FimoProvider, useLabels } from './provider.js';
+export { FimoProvider, useLabels } from './provider.js';

package/dist/runtime/next/provider.d.ts

@@ -8,11 +8,6 @@ export interface FimoProviderProps {
     queryClient?: QueryClient;
 }
 export declare function FimoProvider({ children, labels, locale, queryClient }: FimoProviderProps): import("react/jsx-runtime").JSX.Element;
-export interface FimoPreviewBridgeProps {
-    readonly navigate: (to: string) => unknown;
-    readonly pathname: string;
-}
-export declare function FimoPreviewBridge({ navigate, pathname }: FimoPreviewBridgeProps): ReactNode;
 export declare function useNextContentLocale(requestedLocale: string | undefined, defaultLocale: string): string;
 export declare function useLabels(): Labels;
 //# sourceMappingURL=provider.d.ts.map

package/dist/runtime/next/provider.js

@@ -1,8 +1,11 @@
 'use client';
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { createContext, useContext, useEffect, useMemo, useState } from 'react';
+import { useRouter as usePagesRouter } from 'next/compat/router.js';
+import { usePathname } from 'next/navigation.js';
+import { createContext, Suspense, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { createLabels } from '../labels/core.js';
+import { ensurePreviewScript } from '../preview/script.js';
 import { connectNextPreview } from './preview.js';
 /**
  * Last resort when an application renders `FimoProvider` without a locale and
@@ -16,13 +19,25 @@ export function FimoProvider({ children, labels, locale, queryClient }) {
     const [client] = useState(() => queryClient ?? new QueryClient());
     const activeLocale = locale?.trim() || labels?.locale;
     const value = useMemo(() => ({ labels, locale: activeLocale }), [activeLocale, labels]);
-    return (_jsx(FimoNextContext.Provider, { value: value, children: _jsx(QueryClientProvider, { client: client, children: children }) }));
+    const previewScriptUrl = process.env.NEXT_PUBLIC_FIMO_PREVIEW_SCRIPT_URL;
+    return (_jsx(FimoNextContext.Provider, { value: value, children: _jsxs(QueryClientProvider, { client: client, children: [previewScriptUrl ? (_jsx(Suspense, { fallback: null, children: _jsx(FimoPreviewRuntime, { previewScriptUrl: previewScriptUrl }) })) : null, children] }) }));
 }
-export function FimoPreviewBridge({ navigate, pathname }) {
+function FimoPreviewRuntime({ previewScriptUrl }) {
     const context = useContext(FimoNextContext);
     const locale = context.locale ?? UNRESOLVED_LOCALE;
-    const previewScriptUrl = process.env.NEXT_PUBLIC_FIMO_PREVIEW_SCRIPT_URL;
-    useEffect(() => connectNextPreview({ locale, navigate, pathname, previewScriptUrl }), [locale, navigate, pathname, previewScriptUrl]);
+    const appPathname = usePathname();
+    const pagesRouter = usePagesRouter();
+    const pathname = appPathname ?? pagesRouter?.asPath.split(/[?#]/, 1)[0] ?? '/';
+    const navigate = useCallback((to) => {
+        if (pagesRouter) {
+            return pagesRouter.push(to);
+        }
+        window.history.pushState(null, '', to);
+    }, [pagesRouter]);
+    useEffect(() => {
+        ensurePreviewScript(previewScriptUrl);
+        return connectNextPreview({ locale, navigate, pathname, previewScriptUrl });
+    }, [locale, navigate, pathname, previewScriptUrl]);
     return null;
 }
 export function useNextContentLocale(requestedLocale, defaultLocale) {

package/dist/runtime/preview/script.d.ts

@@ -0,0 +1,3 @@
+/** Load the platform preview script once. Empty configuration keeps preview disabled. */
+export declare function ensurePreviewScript(src: string | undefined, target?: Document): boolean;
+//# sourceMappingURL=script.d.ts.map

package/dist/runtime/preview/script.js

@@ -0,0 +1,14 @@
+/** Load the platform preview script once. Empty configuration keeps preview disabled. */
+export function ensurePreviewScript(src, target = document) {
+    if (!src) {
+        return false;
+    }
+    const exists = Array.from(target.scripts).some((script) => script.getAttribute('src') === src);
+    if (!exists) {
+        const script = target.createElement('script');
+        script.src = src;
+        script.defer = true;
+        target.head.appendChild(script);
+    }
+    return true;
+}

package/dist/runtime/react/primitives/contracts.d.ts

@@ -66,7 +66,13 @@ export interface RichTextProps extends Omit<ComponentPropsWithoutRef<'div'>, 'ch
     value: FimoRichText | null | undefined;
     components?: FimoRichTextComponents;
 }
-export type StaticImageProps = Omit<ComponentPropsWithoutRef<'img'>, 'children'> & {
+export type StaticImageProps = Omit<ComponentPropsWithoutRef<'img'>, 'children' | 'src'> & {
+    /**
+     * Direct URL to the image. React's own `img` typings widened `src` to accept
+     * a Blob; this renderer resolves a URL through the optimizer, so it stays a
+     * string. Same reason `BaseVideoProps` omits `src`.
+     */
+    src?: string;
     /** Image quality (1-100). Defaults to 85. */
     quality?: number;
     /** Resize fit mode. Also maps to CSS object-fit. Defaults to 'scale-down'. */

package/dist/runtime/sveltekit/preview.d.ts

@@ -1,3 +1,4 @@
+export { ensurePreviewScript } from '../preview/script.js';
 export interface PreviewNavigation {
     /** SvelteKit `goto` — the app router stays in charge of the transition. */
     goto: (to: string) => unknown;
@@ -6,8 +7,6 @@ export interface PreviewNavigation {
     /** Optional app-owned locale resolver, evaluated for every bridge message. */
     locale?: () => string | undefined;
 }
-/** Load the platform preview script once. Empty configuration keeps preview disabled. */
-export declare function ensurePreviewScript(src: string | undefined): boolean;
 /**
  * Report where the app is now, and in which locale. Studio keeps its URL,
  * route selector and content locale in sync from this.

package/dist/runtime/sveltekit/preview.js

@@ -1,18 +1,5 @@
 import { getDocumentLocale, getPreviewLocationChange, getPreviewParentOrigin } from '../shared/preview-location.js';
-/** Load the platform preview script once. Empty configuration keeps preview disabled. */
-export function ensurePreviewScript(src) {
-    if (!src) {
-        return false;
-    }
-    const exists = Array.from(document.scripts).some((script) => script.getAttribute('src') === src);
-    if (!exists) {
-        const script = document.createElement('script');
-        script.src = src;
-        script.defer = true;
-        document.head.appendChild(script);
-    }
-    return true;
-}
+export { ensurePreviewScript } from '../preview/script.js';
 /**
  * Report where the app is now, and in which locale. Studio keeps its URL,
  * route selector and content locale in sync from this.

package/dist/scripts/sync-schemas.js

@@ -25,6 +25,23 @@ const SCHEMA_DEFINITION_SCHEMA = z.object({
     i18n: z.object({ enabled: z.boolean().optional() }).optional(),
     fields: z.record(z.string(), z.unknown()).optional(),
 });
+const RUNTIME_TYPE_IMPORT_ORDER = [
+    'Fields',
+    'FimoBoolean',
+    'FimoMedia',
+    'FimoPolymorphicReference',
+    'FimoReference',
+    'FimoRichText',
+    'FimoRichTextContent',
+    'FimoString',
+    'Populate',
+    'PopulatedResult',
+    'ProjectedWithPopulate',
+    'Query',
+    'Sort',
+    'Where',
+    'WithReferences',
+];
 const CONTENT_TEMPLATE_PATHS = {
     types: { current: 'shared/types.eta', legacy: 'types-template.eta' },
     sharedServer: { current: 'shared/server.eta' },
@@ -335,6 +352,69 @@ function referenceImportsFor(schema, fields) {
     }
     return [...imports.values()].sort((a, b) => a.pascal.localeCompare(b.pascal));
 }
+function collectFieldRuntimeTypeImports(field, imports) {
+    if (!field || typeof field !== 'object' || Array.isArray(field)) {
+        return;
+    }
+    const definition = field;
+    switch (definition.type) {
+        case 'boolean':
+            imports.add('FimoBoolean');
+            return;
+        case 'media':
+            imports.add('FimoMedia');
+            return;
+        case 'reference':
+            imports.add(Array.isArray(definition.targets) && definition.targets.length > 0
+                ? 'FimoPolymorphicReference'
+                : 'FimoReference');
+            return;
+        case 'richtext':
+            imports.add('FimoRichText');
+            imports.add('FimoRichTextContent');
+            return;
+        case 'blocks': {
+            const schema = definition.schema;
+            if (!schema || typeof schema !== 'object' || Array.isArray(schema)) {
+                return;
+            }
+            const blockSchema = schema;
+            const fieldGroups = Array.isArray(blockSchema.oneOf)
+                ? blockSchema.oneOf.map((variant) => variant && typeof variant === 'object' && !Array.isArray(variant)
+                    ? variant.fields
+                    : undefined)
+                : [blockSchema.fields];
+            for (const fields of fieldGroups) {
+                if (!fields || typeof fields !== 'object' || Array.isArray(fields)) {
+                    continue;
+                }
+                for (const nestedField of Object.values(fields)) {
+                    collectFieldRuntimeTypeImports(nestedField, imports);
+                }
+            }
+            return;
+        }
+        default:
+            return;
+    }
+}
+function runtimeTypeImportsFor(fields) {
+    const imports = new Set([
+        'Fields',
+        'FimoString',
+        'Populate',
+        'PopulatedResult',
+        'ProjectedWithPopulate',
+        'Query',
+        'Sort',
+        'Where',
+        'WithReferences',
+    ]);
+    for (const field of Object.values(fields)) {
+        collectFieldRuntimeTypeImports(field, imports);
+    }
+    return RUNTIME_TYPE_IMPORT_ORDER.filter((typeImport) => imports.has(typeImport));
+}
 function schemaToModel(schema, localizedByUid) {
     const fields = normalizeFields(schema.fields ?? {});
     return {
@@ -353,6 +433,7 @@ function schemaToModel(schema, localizedByUid) {
             .map(([fieldName]) => fieldName),
         fields,
         referenceImports: referenceImportsFor(schema, fields),
+        runtimeTypeImports: runtimeTypeImportsFor(fields),
     };
 }
 export function syncSchemas(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.21.0-staging.2",
+  "version": "0.21.0-staging.3",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"
@@ -168,6 +168,7 @@
     "better-auth": "1.6.25",
     "cheerio": "^1.0.0",
     "commander": "^13.1.0",
+    "next": "15.5.20",
     "open": "^10.1.2",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
@@ -183,6 +184,7 @@
     "@sveltejs/kit": "^2.0.0",
     "@tanstack/react-query": "^5.80.6",
     "astro": "^5.0.0 || ^6.0.0 || ^7.0.0",
+    "next": "^15.0.0 || ^16.0.0",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0",
     "react-router": "^7.0.0 || ^8.0.0",
@@ -199,6 +201,9 @@
     "astro": {
       "optional": true
     },
+    "next": {
+      "optional": true
+    },
     "react": {
       "optional": true
     },

package/templates/astro/AGENTS.md

@@ -27,7 +27,7 @@ a code-only task, or use `npx fimo@latest` for project-local code generation and
 ## Project rules
 
 - **Deploy is on-demand**, not a save step. Batch related edits into one deploy.
-- With pnpm, run `pnpm install --config.dangerouslyAllowAllBuilds=true`; a bare install can skip the build scripts required by Fimo and the framework toolchain.
+- Use the selected package manager's committed build-script policy. pnpm projects pin `pnpm@10.26.0` and approve `esbuild` and `fimo` through `pnpm-workspace.yaml#allowBuilds`; Bun projects trust the same packages through `package.json#trustedDependencies`. Run a plain install with the selected manager so local installation matches Preview and production publishing. Review new dependencies before extending the policy; all three paths stop on unreviewed scripts.
 - Treat the user's language request as part of setup. The first explicitly requested locale is the primary locale; put it first and set it as `i18n.defaultLocale` in `.fimo/config.json`. If no language is requested, keep `en` and state that choice. Astro reads this configuration directly, keeps the default locale unprefixed, and prefixes the others.
 - Preserve both the unprefixed default pages and the `[locale]` page tree. Astro has no optional single-segment file route, so the paired native pages keep one-locale URLs clean and allow another locale without changing the route shape. Use `Astro.currentLocale` for Fimo content reads, `getLabels`, and document language.
 - Keep `.fimo/config.json#routes` as Studio metadata aligned with Astro's page files. It does not configure Astro routing.

package/templates/astro/package.json

@@ -18,5 +18,6 @@
   },
   "engines": {
     "node": ">=22.22.0"
-  }
+  },
+  "packageManager": "pnpm@10.26.0"
 }

package/templates/astro/pnpm-workspace.yaml

@@ -1,4 +1,8 @@
-# Build approval is handled by Fimo-controlled install commands. Do not add a
-# package-level allowlist because Fimo installs with dangerouslyAllowAllBuilds.
+# Keep dependency-script decisions explicit across local, Preview, and production installs.
+
+strictDepBuilds: true
+allowBuilds:
+  esbuild: true
+  fimo: true
 
 packages: []

package/templates/nextjs/.fimo/config.json

@@ -7,8 +7,7 @@
   "routes": {
     "home": {
       "label": "Home",
-      "path": "/:locale",
-      "params": { "locale": { "type": "locale", "optional": true } }
+      "path": "/"
     }
   },
   "version": "4",

package/templates/nextjs/AGENTS.md

@@ -35,24 +35,14 @@ The scaffolded homepage is disposable. Replace it on the first real generation.
 ## Project rules
 
 - **Deploy is on-demand**, not a save step. Batch related edits into one deploy.
-- With pnpm, run `pnpm install --config.dangerouslyAllowAllBuilds=true`; a bare install can skip the build scripts required by Fimo and the framework toolchain.
-- Treat the user's language request as part of setup. The first explicitly requested locale is the primary locale; put it first and set it as `i18n.defaultLocale` in `.fimo/config.json`, with every requested locale in `i18n.locales`. If no language is requested, keep `en` and state that choice. That file is the only place to change: `src/locales.ts` reads it, so the served language, `<html lang>`, and the prefixed URLs follow. Never introduce a default-locale environment variable.
-- Preserve the unprefixed `app/(default)` route group and the native `app/[locale]` boundary. Each is its own root layout, so each renders `src/components/Document.tsx` with the locale that tree serves; that is what makes `<html lang>` and the Fimo locale context correct on both. Mirror new routes in both groups when they are localized. Next.js has no optional single-segment folder, so do not replace this small pattern with middleware, rewrites, or a catch-all locale router.
-- Keep the client-only `src/components/FimoPreviewBridge.tsx` inside `Document`. It reports the native Next pathname and settled locale to Studio and sends Studio navigation through Next's router; keep Next imports out of Fimo's shared runtime.
-- Keep `.fimo/config.json#routes` as Studio metadata, not as the Next.js router. In that metadata, `params.locale.optional: true` means omit the configured default locale from the URL; use `optional: false` only when every locale, including the default, must be prefixed.
+- Use the selected package manager's committed build-script policy. pnpm projects pin `pnpm@10.26.0` and approve `esbuild` and `fimo` through `pnpm-workspace.yaml#allowBuilds`; Bun projects trust the same packages through `package.json#trustedDependencies`. Run a plain install with the selected manager so local installation matches Preview and production publishing. Review new dependencies before extending the policy; all three paths stop on unreviewed scripts.
+- Treat the user's language request as part of setup. The first explicitly requested locale is the primary locale; put it first and set it as `i18n.defaultLocale` in `.fimo/config.json`, with every requested locale in `i18n.locales`. If no language is requested, keep `en` and state that choice. That file is the only place to change: `src/locales.ts` reads it, so the served language and `<html lang>` follow. It does not create locale URLs; implement a URL strategy only when the product asks for one. Never introduce a default-locale environment variable.
+- Next's `app` tree is the router and stays authoritative: the starter is one ordinary root layout plus `/` as the homepage, and unknown paths get Next's native 404. When a product requires locale URLs, implement the framework-native strategy (`[locale]` segments, middleware, cookies, domains, or an i18n library), pass the resolved locale into Fimo server reads and `FimoProvider`, and load `fimo skills get fimo-code --ref frameworks/next/locales` first. Do not impose locale-prefixed URLs on a default-only project.
+- `FimoProvider` owns the optional Studio preview runtime. Do not add a preview bridge component, read Fimo preview environment variables, or inject Fimo scripts in application code.
+- Keep `.fimo/config.json#routes` as Studio metadata, not as the Next.js router. Describe only URLs the application actually serves; add a `:locale` segment to a route's metadata only after the application implements that locale routing. There, `params.locale.optional: true` means omit the configured default locale from the URL; use `optional: false` only when every locale, including the default, must be prefixed.
 - The application owns routes, locale resolution, links, HTML language/direction, and SEO. Fimo connects to those decisions.
 - Do not add a second deployment platform.
 - Never edit `.fimo/project.json`; it links this directory to the remote project.
 - Keep `.fimo/config.json#runtime` true to the code: framework, `dev`/`build`/`install` commands, output directory. Update it when you rename a package script, move the build output, or change framework; the reference is `fimo skills get fimo-code --ref frameworks/hosting`.
 - Keep secrets in the Fimo dashboard, not in committed environment files.
 - Pass flags to interactive Fimo commands when scripting them.
-
-<!-- BEGIN:nextjs-agent-rules -->
-
-# This is NOT the Next.js you know
-
-This version has breaking changes — APIs, conventions, and file structure may all differ from your training data. Read the relevant guide in `node_modules/next/dist/docs/` (resolved from this file's directory; in monorepos the `next` package may not be visible from the repo root) before writing any code. Heed deprecation notices.
-
-This block is written and re-added by `next dev` — verify at `node_modules/next/dist/server/lib/generate-agent-files.js`. Removing it from a diff only re-creates the uncommitted change; committing it with your work keeps the tree clean.
-
-<!-- END:nextjs-agent-rules -->

package/templates/nextjs/next.config.ts

@@ -1,6 +1,8 @@
 import type { NextConfig } from 'next';
 import { withFimo } from 'fimo/next/config';
 
-const nextConfig: NextConfig = {};
+const nextConfig: NextConfig = {
+  agentRules: false,
+};
 
 export default withFimo(nextConfig);

package/templates/nextjs/package.json

@@ -26,5 +26,6 @@
   },
   "engines": {
     "node": ">=22.22.0"
-  }
+  },
+  "packageManager": "pnpm@10.26.0"
 }

package/templates/nextjs/pnpm-workspace.yaml

@@ -1,4 +1,8 @@
-# Build approval is handled by Fimo-controlled install commands. Do not add a
-# package-level allowlist because Fimo installs with dangerouslyAllowAllBuilds.
+# Keep dependency-script decisions explicit across local, Preview, and production installs.
+
+strictDepBuilds: true
+allowBuilds:
+  esbuild: true
+  fimo: true
 
 packages: []

package/templates/nextjs/src/app/layout.tsx

@@ -0,0 +1,16 @@
+import { FimoProvider } from 'fimo/next/client';
+import type { ReactNode } from 'react';
+
+import { defaultLocale } from '../locales';
+
+import './globals.css';
+
+export default function RootLayout({ children }: Readonly<{ children: ReactNode }>) {
+  return (
+    <html lang={defaultLocale}>
+      <body>
+        <FimoProvider locale={defaultLocale}>{children}</FimoProvider>
+      </body>
+    </html>
+  );
+}

package/templates/nextjs/src/locales.ts

@@ -3,11 +3,8 @@ import fimoConfig from '../.fimo/config.json';
 /**
  * Locale policy read from the same file Fimo and Studio read, so the site
  * language cannot drift from the project configuration. Change the locales in
- * `.fimo/config.json#i18n`; nothing here needs editing.
+ * `.fimo/config.json#i18n`; nothing here needs editing. Configured locales are
+ * content configuration only — URL locale routing is a separate application
+ * decision implemented in the `app` tree when the product asks for it.
  */
 export const defaultLocale: string = fimoConfig.i18n.defaultLocale;
-
-/** Only non-default locales carry a URL prefix; the default locale stays at the site root. */
-export const prefixedLocales: ReadonlySet<string> = new Set(
-  fimoConfig.i18n.locales.filter((locale) => locale !== defaultLocale)
-);

package/templates/react-router/AGENTS.md

@@ -40,7 +40,7 @@ breaks that. Load `fimo-code` for the exact primitives, but the rule is:
 ## Project rules
 
 - **Deploy is on-demand**, not a save step. Batch related edits into one deploy.
-- With pnpm, run `pnpm install --config.dangerouslyAllowAllBuilds=true`; a bare install can skip the build scripts required by Fimo and the framework toolchain.
+- Use the selected package manager's committed build-script policy. pnpm projects pin `pnpm@10.26.0` and approve `esbuild` and `fimo` through `pnpm-workspace.yaml#allowBuilds`; Bun projects trust the same packages through `package.json#trustedDependencies`. Run a plain install with the selected manager so local installation matches Preview and production publishing. Review new dependencies before extending the policy; all three paths stop on unreviewed scripts.
 - Treat the user's language request as part of setup. The first explicitly requested locale is the primary locale; put it first and set it as `i18n.defaultLocale` in `.fimo/config.json`. If no language is requested, keep `en` and state that choice.
 - Preserve the application-owned `:locale?` route boundary in `src/routes.ts` and pass its route parameter to `FimoProviders` in `LocaleLayout.tsx`. The missing parameter uses the configured default, so a one-locale site stays at `/`. Add locales in `.fimo/config.json` without rebuilding the route tree; use `:locale` without `?` only when every locale must be prefixed.
 - Keep `.fimo/config.json#routes` aligned as Studio metadata, not as the React Router source of truth. Do not add a global locale-routing strategy, a Fimo route helper, or a Fimo-owned route tree.

package/templates/react-router/package.json

@@ -21,7 +21,7 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
-    "fimo": "0.21.0-staging.2",
+    "fimo": "0.21.0-staging.3",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",
@@ -55,5 +55,6 @@
   },
   "engines": {
     "node": ">=22.22.0"
-  }
+  },
+  "packageManager": "pnpm@10.26.0"
 }

package/templates/react-router/pnpm-workspace.yaml

@@ -1,8 +1,8 @@
-# Build approval is handled by Fimo-controlled install commands (`fimo create
-# --install`, sandbox `fimopm install`, and E2E helpers) via scoped pnpm
-# allow-all-builds flags. Do NOT add `allowBuilds` / `onlyBuiltDependencies`
-# here: pnpm refuses to have both an allowlist and allow-all-builds
-# (ERR_PNPM_CONFIG_CONFLICT_BUILT_DEPENDENCIES), which makes sandbox installs
-# fail before the project's `fimo` dep is available.
+# Keep dependency-script decisions explicit across local, Preview, and production installs.
+
+strictDepBuilds: true
+allowBuilds:
+  esbuild: true
+  fimo: true
 
 packages: []

package/templates/react-router/src/vite-env.d.ts

@@ -3,7 +3,6 @@
 interface ImportMetaEnv {
   readonly VITE_API_URL?: string;
   readonly FIMO_ENV?: string;
-  readonly VITE_PREVIEW_SCRIPT_URL?: string;
 }
 
 interface ImportMeta {

package/templates/sveltekit/AGENTS.md

@@ -27,7 +27,7 @@ a code-only task, or use `npx fimo@latest` for project-local code generation and
 ## Project rules
 
 - **Deploy is on-demand**, not a save step. Batch related edits into one deploy.
-- With pnpm, run `pnpm install --config.dangerouslyAllowAllBuilds=true`; a bare install can skip the build scripts required by Fimo and the framework toolchain.
+- Use the selected package manager's committed build-script policy. pnpm projects pin `pnpm@10.26.0` and approve `esbuild` and `fimo` through `pnpm-workspace.yaml#allowBuilds`; Bun projects trust the same packages through `package.json#trustedDependencies`. Run a plain install with the selected manager so local installation matches Preview and production publishing. Review new dependencies before extending the policy; all three paths stop on unreviewed scripts.
 - Treat the user's language request as part of setup. The first explicitly requested locale is the primary locale; put it first and set it as `i18n.defaultLocale` in `.fimo/config.json`. If no language is requested, keep `en` and state that choice. `src/locales.ts` derives the default and prefixed locale set from that config.
 - Preserve the native `[[locale=locale]]` route boundary. The optional parameter keeps the default locale at `/`; the matcher prevents ordinary top-level routes from being mistaken for locales. The root server layout passes the tracked `event.params` through `resolveLocale`, then sends that locale to `getLabels` and `FimoProvider`. Remove the extra brackets only when every locale must be prefixed.
 - Keep the document language request-aware: `src/hooks.server.ts` renders the initial `<html lang>`, and the root layout updates it after client navigation.

package/templates/sveltekit/package.json

@@ -24,5 +24,6 @@
   },
   "engines": {
     "node": ">=22.22.0"
-  }
+  },
+  "packageManager": "pnpm@10.26.0"
 }

package/templates/sveltekit/pnpm-workspace.yaml

@@ -1,4 +1,8 @@
-# Build approval is handled by Fimo-controlled install commands. Do not add a
-# package-level allowlist because Fimo installs with dangerouslyAllowAllBuilds.
+# Keep dependency-script decisions explicit across local, Preview, and production installs.
+
+strictDepBuilds: true
+allowBuilds:
+  esbuild: true
+  fimo: true
 
 packages: []

package/templates/nextjs/src/app/(default)/layout.tsx

@@ -1,10 +0,0 @@
-import type { ReactNode } from 'react';
-
-import Document from '../../components/Document';
-import { defaultLocale } from '../../locales';
-
-import '../globals.css';
-
-export default function DefaultLocaleLayout({ children }: Readonly<{ children: ReactNode }>) {
-  return <Document locale={defaultLocale}>{children}</Document>;
-}

package/templates/nextjs/src/app/[locale]/layout.tsx

@@ -1,22 +0,0 @@
-import { notFound } from 'next/navigation';
-import type { ReactNode } from 'react';
-
-import Document from '../../components/Document';
-import { prefixedLocales } from '../../locales';
-
-import '../globals.css';
-
-export default async function LocaleLayout({
-  children,
-  params,
-}: Readonly<{ children: ReactNode; params: Promise<{ locale: string }> }>) {
-  const { locale } = await params;
-
-  // The default locale is served unprefixed by `app/(default)`, so its prefix
-  // is not a second URL for the same page.
-  if (!prefixedLocales.has(locale)) {
-    notFound();
-  }
-
-  return <Document locale={locale}>{children}</Document>;
-}

package/templates/nextjs/src/app/[locale]/page.tsx

@@ -1 +0,0 @@
-export { default } from '../(default)/page';