fimo 0.11.0-staging.4 → 0.11.0-staging.6

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

@@ -1,7 +1,7 @@
 export declare function resolveFimoLocaleForUrl(url: string): import("./index.js").FimoLocaleResolution;
 /**
  * Fetch route data for SEO meta resolution.
- * Only fetches data for detail pages (routes with `params` in fimo-config.json).
+ * Only fetches data for detail pages (routes with `params` in .fimo/config.json).
  */
 export declare function resolveMetaEntries(url: string): Promise<Record<string, unknown> | undefined>;
 //# sourceMappingURL=prefetch.d.ts.map

package/dist/runtime/app/prefetch.js

@@ -2,7 +2,7 @@
 import fimoConfig from 'virtual:fimo-config';
 import { resolveFimoLocale } from '../i18n/locale.js';
 /**
- * Match a concrete URL against the routes in fimo-config.json.
+ * Match a concrete URL against the routes in .fimo/config.json.
  * Returns the matching route config or null.
  */
 function matchRoute(url) {
@@ -51,7 +51,7 @@ export function resolveFimoLocaleForUrl(url) {
 }
 /**
  * Fetch route data for SEO meta resolution.
- * Only fetches data for detail pages (routes with `params` in fimo-config.json).
+ * Only fetches data for detail pages (routes with `params` in .fimo/config.json).
  */
 export async function resolveMetaEntries(url) {
     // @ts-ignore – import.meta.env is a Vite feature, replaced at build time for both client and SSR

package/dist/runtime/paths/get-fimo-paths.d.ts

@@ -1,6 +1,6 @@
 import type { FimoPath, GetFimoPathsOptions } from './types.js';
 /**
- * Resolve the full list of paths from `fimo-config.json` and dynamic-route
+ * Resolve the full list of paths from `.fimo/config.json` and dynamic-route
  * schema entries. Use as input to your framework's prerender list, sitemap,
  * robots.txt, or any per-route logic.
  *

package/dist/runtime/paths/get-fimo-paths.js

@@ -1,5 +1,5 @@
 // Resolve the list of paths a project should consider for prerender / sitemap /
-// robots / per-route SEO generation. Static paths come from fimo-config.json;
+// robots / per-route SEO generation. Static paths come from .fimo/config.json;
 // dynamic routes are expanded by fetching schema entries from the content API.
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
@@ -72,7 +72,7 @@ function matchesAny(routeKey, patterns) {
     return patterns.some((p) => compilePattern(p).test(routeKey));
 }
 /**
- * Resolve the full list of paths from `fimo-config.json` and dynamic-route
+ * Resolve the full list of paths from `.fimo/config.json` and dynamic-route
  * schema entries. Use as input to your framework's prerender list, sitemap,
  * robots.txt, or any per-route logic.
  *

package/dist/runtime/paths/types.d.ts

@@ -4,7 +4,7 @@ import type { RouteSEO } from '../shared/fimo-config.types.js';
  * sitemap / robots / per-route SEO generation. Returned by `getFimoPaths()`.
  */
 export interface FimoPath {
-    /** Route key from `fimo-config.json#routes` (e.g. `'home'`, `'blog/post'`). */
+    /** Route key from `.fimo/config.json#routes` (e.g. `'home'`, `'blog/post'`). */
     routeKey: string;
     /** The configured path pattern (e.g. `'/'`, `'/blog/:slug'`). */
     pathPattern: string;

package/dist/runtime/project-layout.d.ts

@@ -0,0 +1,14 @@
+export type ProjectLayout = 'current' | 'legacy';
+export interface ProjectLayoutPaths {
+    readonly project: string;
+    readonly config: string;
+    readonly agents: string;
+}
+export declare const CURRENT_PROJECT_LAYOUT: ProjectLayoutPaths;
+export declare const LEGACY_PROJECT_LAYOUT: ProjectLayoutPaths;
+export declare const LEGACY_AGENT_POLICY_PATH = "fimo.config.json";
+export declare function detectProjectLayout(paths: Iterable<string>): ProjectLayout | null;
+export declare function getProjectLayoutPaths(layout: ProjectLayout): ProjectLayoutPaths;
+export declare function selectProjectConfigPath(paths: Iterable<string>, layout?: ProjectLayout | null): string;
+export declare function selectProjectPolicyPath(paths: Iterable<string>, layout?: ProjectLayout | null): string;
+//# sourceMappingURL=project-layout.d.ts.map

package/dist/runtime/project-layout.js

@@ -0,0 +1,57 @@
+export const CURRENT_PROJECT_LAYOUT = {
+    project: '.fimo/project.json',
+    config: '.fimo/config.json',
+    agents: '.fimo/agents',
+};
+export const LEGACY_PROJECT_LAYOUT = {
+    project: '.fimo.settings.json',
+    config: 'fimo-config.json',
+    agents: 'agents',
+};
+export const LEGACY_AGENT_POLICY_PATH = 'fimo.config.json';
+export function detectProjectLayout(paths) {
+    let hasCurrentProject = false;
+    let hasLegacyProject = false;
+    let hasCurrentMarker = false;
+    let hasLegacyMarker = false;
+    for (const input of paths) {
+        const file = input.replace(/\\/g, '/').replace(/^\.\//, '').replace(/\/$/, '');
+        hasCurrentProject || (hasCurrentProject = file === CURRENT_PROJECT_LAYOUT.project);
+        hasLegacyProject || (hasLegacyProject = file === LEGACY_PROJECT_LAYOUT.project);
+        hasCurrentMarker || (hasCurrentMarker = file === CURRENT_PROJECT_LAYOUT.config ||
+            file === CURRENT_PROJECT_LAYOUT.agents ||
+            file.startsWith(`${CURRENT_PROJECT_LAYOUT.agents}/`));
+        hasLegacyMarker || (hasLegacyMarker = file === LEGACY_PROJECT_LAYOUT.config || file === LEGACY_AGENT_POLICY_PATH);
+    }
+    if (hasCurrentProject) {
+        return 'current';
+    }
+    if (hasLegacyProject) {
+        return 'legacy';
+    }
+    if (hasCurrentMarker) {
+        return 'current';
+    }
+    return hasLegacyMarker ? 'legacy' : null;
+}
+export function getProjectLayoutPaths(layout) {
+    return layout === 'current' ? CURRENT_PROJECT_LAYOUT : LEGACY_PROJECT_LAYOUT;
+}
+export function selectProjectConfigPath(paths, layout) {
+    const files = new Set(Array.from(paths, (file) => file.replace(/\\/g, '/').replace(/^\.\//, '')));
+    const resolvedLayout = layout ?? detectProjectLayout(files) ?? 'current';
+    if (resolvedLayout === 'current') {
+        return CURRENT_PROJECT_LAYOUT.config;
+    }
+    return files.has(LEGACY_AGENT_POLICY_PATH) && !files.has(LEGACY_PROJECT_LAYOUT.config)
+        ? LEGACY_AGENT_POLICY_PATH
+        : LEGACY_PROJECT_LAYOUT.config;
+}
+export function selectProjectPolicyPath(paths, layout) {
+    const files = new Set(Array.from(paths, (file) => file.replace(/\\/g, '/').replace(/^\.\//, '')));
+    const resolvedLayout = layout ?? detectProjectLayout(files) ?? 'current';
+    if (resolvedLayout === 'current') {
+        return CURRENT_PROJECT_LAYOUT.config;
+    }
+    return files.has(LEGACY_AGENT_POLICY_PATH) ? LEGACY_AGENT_POLICY_PATH : LEGACY_PROJECT_LAYOUT.config;
+}

package/dist/runtime/seo/resolver.d.ts

@@ -3,7 +3,7 @@ import type { FimoConfig, FimoRouteConfig, FimoSEO } from '../shared/fimo-config
  * Shared SEO resolver for the generated app.
  *
  * This module answers one question:
- * "Given a pathname and the project's fimo-config.json, what SEO values
+ * "Given a pathname and the project's .fimo/config.json, what SEO values
  * should apply to this route?"
  *
  * It centralizes the rule set that was previously duplicated in multiple places:

package/dist/runtime/seo/resolver.js

@@ -2,7 +2,7 @@
  * Shared SEO resolver for the generated app.
  *
  * This module answers one question:
- * "Given a pathname and the project's fimo-config.json, what SEO values
+ * "Given a pathname and the project's .fimo/config.json, what SEO values
  * should apply to this route?"
  *
  * It centralizes the rule set that was previously duplicated in multiple places:

package/dist/runtime/shared/fimo-config.server.d.ts

@@ -5,4 +5,6 @@ import type { FimoConfig } from './fimo-config.types.js';
  */
 export declare function getConfigServer(rootDir: string): FimoConfig;
 export declare function getConfigVersion(rootDir: string): number;
+/** Resolve the current config path while keeping legacy projects readable. */
+export declare function resolveFimoConfigPath(rootDir: string): string;
 //# sourceMappingURL=fimo-config.server.d.ts.map

package/dist/runtime/shared/fimo-config.server.js

@@ -1,6 +1,7 @@
-import { readFileSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-// Matches the template's fimo-config.json (`version: "4"`) and the agents
+import { CURRENT_PROJECT_LAYOUT, LEGACY_AGENT_POLICY_PATH, LEGACY_PROJECT_LAYOUT, selectProjectConfigPath, } from '../project-layout.js';
+// Matches the template's `.fimo/config.json` (`version: "4"`) and the agents
 // workspace default — the fallback when a config omits the field.
 const LATEST_TEMPLATE_VERSION = 4;
 const defaultConfig = {
@@ -12,7 +13,7 @@ const defaultConfig = {
  */
 export function getConfigServer(rootDir) {
     try {
-        const configPath = resolve(rootDir, 'fimo-config.json');
+        const configPath = resolveFimoConfigPath(rootDir);
         const content = readFileSync(configPath, 'utf-8');
         const raw = JSON.parse(content);
         return {
@@ -28,7 +29,7 @@ export function getConfigServer(rootDir) {
 }
 export function getConfigVersion(rootDir) {
     try {
-        const configPath = resolve(rootDir, 'fimo-config.json');
+        const configPath = resolveFimoConfigPath(rootDir);
         const content = readFileSync(configPath, 'utf-8');
         const raw = JSON.parse(content);
         const parsed = Number.parseInt(String(raw.version ?? LATEST_TEMPLATE_VERSION), 10);
@@ -38,3 +39,15 @@ export function getConfigVersion(rootDir) {
         return LATEST_TEMPLATE_VERSION;
     }
 }
+/** Resolve the current config path while keeping legacy projects readable. */
+export function resolveFimoConfigPath(rootDir) {
+    const candidates = [
+        CURRENT_PROJECT_LAYOUT.project,
+        LEGACY_PROJECT_LAYOUT.project,
+        CURRENT_PROJECT_LAYOUT.config,
+        LEGACY_PROJECT_LAYOUT.config,
+        LEGACY_AGENT_POLICY_PATH,
+    ];
+    const existing = candidates.filter((candidate) => existsSync(resolve(rootDir, candidate)));
+    return resolve(rootDir, selectProjectConfigPath(existing));
+}

package/dist/runtime/templates.d.ts

@@ -45,17 +45,17 @@ export declare function readCliSemver(): string | null;
 export declare function computeFimoPin(meta: ReleaseMeta, semver: string | null, options?: {
     devPackageRoot?: string | null;
 }): string | null;
-export declare function computeRemoteFimoPin(meta: ReleaseMeta, semver: string | null, options?: {
+export declare function computeRemoteFimoPin(meta: ReleaseMeta, semver: string | null, options: {
     devReleaseVersion?: string | null;
-    fallback?: string | null;
+    fallback: string | null;
 }): string | null;
 /** Filesystem-backed wrapper around computeFimoPin. */
 export declare function resolveFimoPin(options?: {
     devPackageRoot?: string | null;
 }): string | null;
-export declare function resolveRemoteFimoPin(options?: {
+export declare function resolveRemoteFimoPin(options: {
     devSearchStart?: string | null;
-    fallback?: string | null;
+    fallback: string | null;
 }): string | null;
 export declare function readDevReleaseVersion(startPath?: string): DevReleaseVersion;
 interface PkgWithDeps {

package/dist/runtime/templates.js

@@ -27,7 +27,6 @@ const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = path.resolve(MODULE_DIR, '..', '..');
 const RELEASE_FILE = path.join(PACKAGE_ROOT, 'release.json');
 const PACKAGE_JSON_FILE = path.join(PACKAGE_ROOT, 'package.json');
-const FALLBACK_REMOTE_FIMO_PIN = 'latest';
 export const TEMPLATE_FRAMEWORKS = ['react-router', 'astro', 'next', 'vite'];
 export const DEFAULT_TEMPLATE = 'react-router';
 /**
@@ -105,7 +104,7 @@ export function computeFimoPin(meta, semver, options = {}) {
     }
     return null;
 }
-export function computeRemoteFimoPin(meta, semver, options = {}) {
+export function computeRemoteFimoPin(meta, semver, options) {
     if (meta.source === 'npm') {
         if (semver) {
             return semver;
@@ -116,13 +115,13 @@ export function computeRemoteFimoPin(meta, semver, options = {}) {
     if (devReleaseVersion) {
         return devReleaseVersion;
     }
-    return options.fallback === undefined ? FALLBACK_REMOTE_FIMO_PIN : options.fallback;
+    return options.fallback;
 }
 /** Filesystem-backed wrapper around computeFimoPin. */
 export function resolveFimoPin(options = {}) {
     return computeFimoPin(readReleaseMeta(), readCliSemver(), options);
 }
-export function resolveRemoteFimoPin(options = {}) {
+export function resolveRemoteFimoPin(options) {
     const meta = readReleaseMeta();
     const semver = readCliSemver();
     const devRelease = meta.source === 'npm' ? { version: null } : readDevReleaseVersion(options.devSearchStart ?? PACKAGE_ROOT);
@@ -136,9 +135,15 @@ export function readDevReleaseVersion(startPath = PACKAGE_ROOT) {
     if (!devJsonPath) {
         return { devJsonPath: null, version: null };
     }
-    const parsed = JSON.parse(fs.readFileSync(devJsonPath, 'utf8'));
+    let parsed;
+    try {
+        parsed = JSON.parse(fs.readFileSync(devJsonPath, 'utf8'));
+    }
+    catch {
+        throw new Error(`Invalid JSON in ${devJsonPath}. Run \`pnpm -F fimo publish-cli -- --id <task-name>\` from that Fimo checkout, then retry.`);
+    }
     if (typeof parsed.version !== 'string' || parsed.version.trim().length === 0) {
-        throw new Error(`Missing "version" in ${devJsonPath}. Publish an experimental CLI build again.`);
+        throw new Error(`Missing "version" in ${devJsonPath}. Run \`pnpm -F fimo publish-cli -- --id <task-name>\` from that Fimo checkout, then retry.`);
     }
     return {
         devJsonPath,

package/dist/scripts/validate-route-metadata.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { resolveFimoConfigPath } from '../runtime/shared/fimo-config.server.js';
 import { parseRoutesSource } from './lib/parse-routes-file.js';
 function readJson(filePath) {
     try {
@@ -27,7 +28,8 @@ function loadConfigRoutes(config) {
 }
 export function validateRouteMetadata(options = {}) {
     const cwd = options.cwd ?? process.cwd();
-    const configFilePath = path.resolve(cwd, 'fimo-config.json');
+    const configFilePath = resolveFimoConfigPath(cwd);
+    const configDisplayPath = path.relative(cwd, configFilePath).replaceAll(path.sep, '/');
     const srcDir = path.resolve(cwd, 'src');
     const routesFilePath = path.resolve(srcDir, 'routes.ts');
     const errors = [];
@@ -47,7 +49,6 @@ export function validateRouteMetadata(options = {}) {
             pathToFile.set(fr.path, fr.file);
         }
     }
-    // Load route metadata from fimo-config.json
     const config = readJson(configFilePath);
     const i18n = validateI18nConfig(config);
     errors.push(...i18n.errors);
@@ -59,14 +60,14 @@ export function validateRouteMetadata(options = {}) {
             continue;
         }
         if (fileRoute.path && !configPaths.has(fileRoute.path)) {
-            errors.push(`Route with path "${fileRoute.path}" (file: "${fileRoute.file}") exists in src/routes.ts but has no matching entry in fimo-config.json.\nFix: add a route entry to fimo-config.json "routes" with a matching "path".`);
+            errors.push(`Route with path "${fileRoute.path}" (file: "${fileRoute.file}") exists in src/routes.ts but has no matching entry in ${configDisplayPath}.\nFix: add a route entry to ${configDisplayPath} "routes" with a matching "path".`);
         }
     }
     // Cross-validate: fimo-config routes should have matching routes.ts entries
     const filePaths = new Set(fileRoutes.filter((r) => !r.isLayout && r.path).map((r) => r.path));
     for (const route of configRoutes) {
         if (!filePaths.has(route.path)) {
-            errors.push(`Route "${route.id}" (${route.path}) exists in fimo-config.json but is not registered in src/routes.ts.\nFix: add the route to src/routes.ts. Example: route('${route.path.replace(/^\//, '')}', './pages/YourPage.tsx')`);
+            errors.push(`Route "${route.id}" (${route.path}) exists in ${configDisplayPath} but is not registered in src/routes.ts.\nFix: add the route to src/routes.ts. Example: route('${route.path.replace(/^\//, '')}', './pages/YourPage.tsx')`);
         }
     }
     if (i18n.routingStrategy === 'path-prefix' && i18n.locales.length > 1) {
@@ -74,6 +75,7 @@ export function validateRouteMetadata(options = {}) {
             configRoutes,
             fileRoutes,
             i18n,
+            configDisplayPath,
             routesSourceUsesFimoRoutes: sourceUsesFimoRoutes(fileRoutes, routesFilePath),
         }));
     }
@@ -99,7 +101,7 @@ export function validateRouteMetadata(options = {}) {
         }
         if (route.paramNames.length > 0) {
             if (!route.params) {
-                errors.push(`Dynamic route "${route.id}" (${route.path}) needs \`params\` metadata to generate prerender URLs.\nFix: add to the route in fimo-config.json: \`"params": { "${route.paramNames[0] || 'param'}": { "schema": "SchemaName", "queryField": "${route.paramNames[0] || 'slug'}", "displayField": "title" } }\``);
+                errors.push(`Dynamic route "${route.id}" (${route.path}) needs \`params\` metadata to generate prerender URLs.\nFix: add to the route in ${configDisplayPath}: \`"params": { "${route.paramNames[0] || 'param'}": { "schema": "SchemaName", "queryField": "${route.paramNames[0] || 'slug'}", "displayField": "title" } }\``);
             }
             else {
                 for (const paramName of route.paramNames) {
@@ -200,7 +202,7 @@ function validateLocaleRouteCollisions(args) {
     for (const route of args.configRoutes) {
         const first = firstPathSegment(route.path);
         if (first && reservedPrefixes.has(first.toLowerCase())) {
-            errors.push(`Route "${route.id}" (${route.path}) uses reserved locale prefix "${first}". Keep fimo-config.json routes canonical and unlocalized, for example "/pricing"; let fimoRoutes() or custom locale routing produce "/${first}/...".`);
+            errors.push(`Route "${route.id}" (${route.path}) uses reserved locale prefix "${first}". Keep ${args.configDisplayPath} routes canonical and unlocalized, for example "/pricing"; let fimoRoutes() or custom locale routing produce "/${first}/...".`);
         }
     }
     if (!args.routesSourceUsesFimoRoutes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.11.0-staging.4",
+  "version": "0.11.0-staging.6",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"
@@ -41,6 +41,10 @@
     "./templates": {
       "types": "./dist/runtime/templates.d.ts",
       "import": "./dist/runtime/templates.js"
+    },
+    "./project-layout": {
+      "types": "./dist/runtime/project-layout.d.ts",
+      "import": "./dist/runtime/project-layout.js"
     }
   },
   "publishConfig": {
@@ -76,7 +80,9 @@
     "@fimo/agents-bundle": "workspace:*",
     "@fimo/api-contracts": "workspace:*",
     "@fimo/cli-kit": "workspace:*",
+    "@fimo/mcp": "workspace:*",
     "@fimo/tsconfig": "workspace:*",
+    "@modelcontextprotocol/sdk": "1.27.1",
     "@tanstack/react-query": "^5.80.6",
     "@types/node": "^22.15.29",
     "@types/react": "^19.2.14",

package/templates/react-router/AGENTS.md

@@ -38,7 +38,7 @@ breaks that. Load `fimo-code` for the exact primitives, but the rule is:
 
 - **Deploy is on-demand**, not a save step. Batch related edits into one deploy.
 - Do not add a second deploy tool (Vercel, Netlify, etc.).
-- **Never edit `.fimo.settings.json`** — it links this folder to the remote project.
+- **Never edit `.fimo/project.json`** — it links this folder to the remote project.
 - The scaffolded homepage is disposable starter content. Replace it on the first real generation.
 - **Secrets live in the Fimo dashboard**, not in a committed `.env`.
 - When scripting, pass flags to `fimo` commands (`fimo deploy -m "…"`, `fimo delete -y`) — bare interactive forms hang in non-TTY shells.

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.11.0-staging.4",
+    "fimo": "0.11.0-staging.6",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",