reroute-js 1.0.0-alpha.16 → 1.0.0-alpha.19

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.16
+ * reroute-js v1.0.0-alpha.19
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v1.0.0-alpha.16
+ * reroute-js v1.0.0-alpha.19
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -68,7 +68,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "1.0.0-alpha.16";
+    return "1.0.0-alpha.19";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -86,7 +86,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "44faab0";
+    return "2cc62d6";
   }
   return "dev";
 }
@@ -363,6 +363,31 @@ var init_init = __esm(() => {
   ];
 });
 
+// packages/core/src/app-paths.ts
+import { posix } from "node:path";
+function toPosix(p) {
+  return p.replace(/\\/g, "/");
+}
+function resolveAppPaths(config = {}) {
+  const src = config.app?.src ?? DEFAULT_APP_SRC;
+  const server = config.app?.server ?? DEFAULT_APP_SERVER;
+  const clientDir = toPosix(posix.dirname(src));
+  return {
+    src,
+    clientDir,
+    routesDir: toPosix(posix.join(clientDir, "routes")),
+    cssEntry: toPosix(posix.join(clientDir, "index.css")),
+    assetsDir: toPosix(posix.join(clientDir, "assets")),
+    server
+  };
+}
+function importFromReroute(relPath) {
+  const cleaned = toPosix(relPath).replace(/^\.\//, "").replace(/\.(tsx|ts|jsx|js)$/, "");
+  return `../${cleaned}`;
+}
+var DEFAULT_APP_SRC = "./src/client/App", DEFAULT_APP_SERVER = "./src/index.ts";
+var init_app_paths = () => {};
+
 // packages/core/src/bundler/hash.ts
 async function generateContentHash(content) {
   const data = new TextEncoder().encode(content);
@@ -3697,7 +3722,7 @@ function createI18nScript(i18n) {
   }
 }
 function createContentCaptureScript() {
-  return `<script>(function(){try{var w=window;w.__REROUTE_INITIAL_HYDRATION__=true;var h={};document.querySelectorAll('[data-reroute-key]').forEach(function(el){var k=el.getAttribute('data-reroute-key');if(k)h[k]=el.innerHTML;});w.__REROUTE_CONTENT_HTML__=h;var r=document.querySelector('[data-reroute-route="ssr"]');if(r)w.__REROUTE_ROUTE_HTML__=r.innerHTML;}catch(e){}})();</script>`;
+  return `<script>(function(){try{var w=window;w.__REROUTE_INITIAL_HYDRATION__=true;var h={};document.querySelectorAll('[data-reroute-key]').forEach(function(el){var k=el.getAttribute('data-reroute-key');if(k)h[k]=el.innerHTML;});w.__REROUTE_CONTENT_HTML__=h;var r=document.querySelector('[data-reroute-route="ssr"]');if(r){w.__REROUTE_ROUTE_HTML__=r.innerHTML;}else{var root=document.getElementById('root');if(root)w.__REROUTE_ROUTE_HTML__=root.innerHTML;}}catch(e){}})();</script>`;
 }
 function createSSRExportsScript(pathname) {
   try {
@@ -4274,9 +4299,18 @@ var init_render = __esm(() => {
 });
 
 // packages/core/src/llms/formatter.ts
+function leadingTitleLine(text) {
+  const first = text.trimStart().split(/\r?\n/, 1)[0]?.trim();
+  if (!first)
+    return;
+  return first.replace(/^#\s+/, "").trim();
+}
+function hasLeadingTitle(text, title) {
+  return leadingTitleLine(text) === title.trim();
+}
 function formatAsText(content) {
   const parts = [];
-  if (content.title) {
+  if (content.title && !hasLeadingTitle(content.body, content.title)) {
     parts.push(content.title);
     parts.push("");
   }
@@ -4286,7 +4320,7 @@ function formatAsText(content) {
 }
 function formatAsMarkdown(content) {
   const parts = [];
-  if (content.title) {
+  if (content.title && !hasLeadingTitle(content.markdown, content.title)) {
     parts.push(`# ${content.title}`);
     parts.push("");
   }
@@ -4573,23 +4607,15 @@ async function extractContentForLLMs(options) {
     throw new Error("Content not found");
   }
   if (format === "md") {
-    const parts2 = [];
-    if (content.title) {
-      parts2.push(`# ${content.title}`);
-      parts2.push("");
-    }
-    parts2.push(content.markdown);
-    return parts2.join(`
-`);
-  }
-  const parts = [];
-  if (content.title) {
-    parts.push(content.title);
-    parts.push("");
+    return formatAsMarkdown({
+      title: content.title,
+      markdown: content.markdown
+    });
   }
-  parts.push(content.body);
-  return parts.join(`
-`);
+  return formatAsText({
+    title: content.title,
+    body: content.body
+  });
 }
 var init_extractor = __esm(() => {
   init_render();
@@ -4819,7 +4845,7 @@ async function discoverCollectionRoutes(cwd, collections2, isWatchMode, llmsConf
 }
 async function loadRouteModule(cwd, routePath, isWatchMode) {
   try {
-    const abs = join2(cwd, "src", "client", "routes", routePath);
+    const abs = join2(cwd, resolveAppPaths(await loadConfig(cwd)).routesDir, routePath);
     const modUrl = `${pathToFileURL6(abs).href}${isWatchMode ? `?t=${Date.now()}` : ""}`;
     return await import(modUrl);
   } catch {
@@ -5056,6 +5082,8 @@ async function generateLLMsIndex(options) {
 `);
 }
 var init_index_generator = __esm(() => {
+  init_app_paths();
+  init_config();
   init_extractor();
 });
 
@@ -6063,7 +6091,7 @@ async function discoverCollectionFeedItems(cwd, collection, isWatchMode, baseUrl
 async function discoverSSRDataFeedItems(cwd, routePattern, routePath, isWatchMode, baseUrl, rssConfig) {
   const items = [];
   try {
-    const abs = join2(cwd, "src", "client", "routes", routePath);
+    const abs = join2(cwd, resolveAppPaths(await loadConfig(cwd)).routesDir, routePath);
     const mod = await import(pathToFileURL7(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
     const ssr = mod?.ssr;
     const dataFn = ssr?.data;
@@ -6272,7 +6300,10 @@ async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfi
     ssrDataFeeds
   };
 }
-var init_discovery6 = () => {};
+var init_discovery6 = __esm(() => {
+  init_app_paths();
+  init_config();
+});
 
 // packages/core/src/rss/generator.ts
 function generateRSSXML(feed, options = {}) {
@@ -6895,6 +6926,7 @@ var init_ssr = __esm(() => {
 
 // packages/core/src/index.ts
 var init_src = __esm(() => {
+  init_app_paths();
   init_bundler();
   init_config();
   init_content();
@@ -6911,6 +6943,8 @@ var init_src = __esm(() => {
 var exports_core = {};
 __export(exports_core, {
   AI_CRAWLERS: () => AI_CRAWLERS,
+  DEFAULT_APP_SERVER: () => DEFAULT_APP_SERVER,
+  DEFAULT_APP_SRC: () => DEFAULT_APP_SRC,
   DEFAULT_COOKIE: () => DEFAULT_COOKIE,
   DEFAULT_LOCALE: () => DEFAULT_LOCALE,
   DEFAULT_LOCALES_DIR: () => DEFAULT_LOCALES_DIR,
@@ -7006,6 +7040,7 @@ __export(exports_core, {
   hreflangTags: () => hreflangTags,
   htmlToMarkdown: () => htmlToMarkdown,
   importContentModuleForPath: () => importContentModuleForPath,
+  importFromReroute: () => importFromReroute,
   inlineThemeCSS: () => inlineThemeCSS,
   isCompressible: () => isCompressible,
   isThenable: () => isThenable,
@@ -7039,6 +7074,7 @@ __export(exports_core, {
   renderSSRDocumentStream: () => renderSSRDocumentStream,
   resetSSRAccessTracking: () => resetSSRAccessTracking,
   resetSSRContentResults: () => resetSSRContentResults,
+  resolveAppPaths: () => resolveAppPaths,
   resolveLocale: () => resolveLocale,
   seedSSRModuleForPath: () => seedSSRModuleForPath,
   setGlobalCollections: () => setGlobalCollections,
@@ -7703,7 +7739,7 @@ async function generateStreamingWrapper(options) {
   const { cwd, relativeFilePath, analysis, config: config2 } = options;
   const streamingModulePath = join9(cwd, ".reroute", "streaming", relativeFilePath).replace(/\.(tsx|ts)$/, ".tsx");
   const wrapperDir = dirname5(streamingModulePath);
-  const originalModuleWithoutExt = removeExtension(join9(cwd, "src", "client", "routes", relativeFilePath));
+  const originalModuleWithoutExt = removeExtension(join9(cwd, resolveAppPaths(config2).routesDir, relativeFilePath));
   const originalImportPath = toImportPath(wrapperDir, originalModuleWithoutExt);
   const skeletonImportBlock = await resolveSkeletonBlock({
     analysis,
@@ -7777,15 +7813,18 @@ var AUTO_HEADER = `// \uD83D\uDEA8 Auto-generated streaming wrapper by Reroute -
 /* eslint-disable */
 // @ts-nocheck
 `, warnedSkeletonType = false;
-var init_suspense = () => {};
+var init_suspense = __esm(() => {
+  init_core();
+});
 
 // packages/cli/src/commands/lib/theme.ts
 import { createHash as createHash2 } from "node:crypto";
 import { existsSync as existsSync5, readFileSync as readFileSync4 } from "node:fs";
 import { mkdir as mkdir2, readdir as readdir7, unlink as unlink2, writeFile } from "node:fs/promises";
 import { dirname as dirname6, isAbsolute, join as join10, resolve as resolve2 } from "node:path";
-function getCssPaths(cwd) {
-  const input = join10(cwd, "src/client/index.css");
+async function getCssPaths(cwd) {
+  const paths = resolveAppPaths(await loadConfig(cwd));
+  const input = join10(cwd, paths.cssEntry);
   const bundlesDir = join10(cwd, ".reroute/bundles");
   return { input, bundlesDir };
 }
@@ -7843,7 +7882,7 @@ async function pruneStaleThemeCss(bundlesDir, keep) {
   }
 }
 async function syncThemeCss(cwd) {
-  const { input, bundlesDir } = getCssPaths(cwd);
+  const { input, bundlesDir } = await getCssPaths(cwd);
   if (!existsSync5(input)) {
     return false;
   }
@@ -7867,6 +7906,7 @@ ${message}`);
 }
 var HASHED_THEME_RE2, IMPORT_RE;
 var init_theme = __esm(() => {
+  init_core();
   HASHED_THEME_RE2 = /^index\.[a-z0-9]{8,}\.css$/i;
   IMPORT_RE = /@import\s+(?:url\(\s*)?(?:'([^']+)'|"([^"]+)"|([^'")\s]+))\s*\)?\s*([^;]*);/g;
 });
@@ -7972,7 +8012,7 @@ async function ensureOutputDir(cwd, options = {}) {
     await mkdir3(join12(cwd, ".reroute/streaming"), { recursive: true });
   } catch {}
 }
-async function writeStubFiles(cwd) {
+async function writeStubFiles(cwd, serverImport) {
   const STUB_ROUTES = `// \uD83D\uDEA8 Auto-generated stub by Reroute - DO NOT EDIT \uD83D\uDEA8
 // This will be replaced by actual routes
 /* eslint-disable */
@@ -8038,14 +8078,14 @@ export const bundle = {
 
 export * from './artifacts';
 `;
-  const STUB_ENTRY = `// \uD83D\uDEA8 Auto-generated stub by Reroute - DO NOT EDIT \uD83D\uDEA8
+  const stubEntry = `// \uD83D\uDEA8 Auto-generated stub by Reroute - DO NOT EDIT \uD83D\uDEA8
 // Server entry wrapper for compiled binary builds
 /* eslint-disable */
 // @ts-nocheck
 
 import './artifacts';
 import './routes'; // Import routes (bundles all route components)
-import '../src/index';
+import '${serverImport}';
 `;
   await Bun.write(join12(cwd, OUTPUT_ROUTES), STUB_ROUTES);
   await Bun.write(join12(cwd, OUTPUT_ROUTES_CLIENT), STUB_ROUTES);
@@ -8054,7 +8094,7 @@ import '../src/index';
   await Bun.write(join12(cwd, OUTPUT_ARTIFACTS_CLIENT), STUB_ARTIFACTS_CLIENT);
   await Bun.write(join12(cwd, OUTPUT_ARTIFACTS_SERVER), STUB_ARTIFACTS_SERVER);
   await Bun.write(join12(cwd, OUTPUT_INDEX), STUB_INDEX);
-  await Bun.write(join12(cwd, ".reroute/entry.ts"), STUB_ENTRY);
+  await Bun.write(join12(cwd, ".reroute/entry.ts"), stubEntry);
   console.log("[reroute/gen] Initialized stub files");
 }
 function shouldSkipFile(relativePath, entryName) {
@@ -8188,7 +8228,7 @@ function generateRouteTree(files) {
     notFoundRoutes
   };
 }
-function getImportPath(filePath, streamingMap) {
+function getImportPath(filePath, streamingMap, routesImportBase) {
   const isMarkdown = /\.(md|mdx)$/.test(filePath);
   if (isMarkdown) {
     const pathWithoutExt2 = filePath.replace(/\.(md|mdx)$/, "");
@@ -8200,17 +8240,17 @@ function getImportPath(filePath, streamingMap) {
     return `./streaming/${pathWithoutExt2}`;
   }
   const pathWithoutExt = filePath.replace(/\.(tsx|ts)$/, "");
-  return `../src/client/routes/${pathWithoutExt}`;
+  return `${routesImportBase}/${pathWithoutExt}`;
 }
-function generateTypeScript(tree, streamingMap, client = false) {
+function generateTypeScript(tree, streamingMap, client, routesImportBase) {
   const helperImport = "import { createLazyRoute } from 'reroute-js/react';";
   const ssrHelper = "const _ssr = (m: any) => m.ssr;";
   const metaHelper = "const _meta = (m: any) => m.meta;";
   const metaImports = [
-    ...tree.routes.map((r, i) => `import * as Route${i}Module from '${getImportPath(r.filePath, streamingMap)}';
+    ...tree.routes.map((r, i) => `import * as Route${i}Module from '${getImportPath(r.filePath, streamingMap, routesImportBase)}';
 const Route${i}SSR = _ssr(Route${i}Module);
 const Route${i}Meta = _meta(Route${i}Module);`),
-    ...tree.layouts.map((l, i) => `import * as Layout${i}Module from '${getImportPath(l.filePath, streamingMap)}';
+    ...tree.layouts.map((l, i) => `import * as Layout${i}Module from '${getImportPath(l.filePath, streamingMap, routesImportBase)}';
 const Layout${i}SSR = _ssr(Layout${i}Module);
 const Layout${i}Meta = _meta(Layout${i}Module);`)
   ].join(`
@@ -8218,28 +8258,28 @@ const Layout${i}Meta = _meta(Layout${i}Module);`)
   const serverEagerImports = client ? "" : [
     ...tree.routes.map((_route, i) => `const Route${i}Eager = Route${i}Module.default;`),
     ...tree.layouts.map((_layout, i) => `const Layout${i}Eager = Layout${i}Module.default;`),
-    ...tree.notFoundRoutes.map((nf, i) => `import NotFound${i}Eager from '${getImportPath(nf.filePath, streamingMap)}';`)
+    ...tree.notFoundRoutes.map((nf, i) => `import NotFound${i}Eager from '${getImportPath(nf.filePath, streamingMap, routesImportBase)}';`)
   ].join(`
 `);
   const eagerImports = client ? metaImports : [metaImports, serverEagerImports].filter(Boolean).join(`
 `);
   const lazyWrappers = [
     ...tree.routes.map((r, i) => {
-      const importPath = getImportPath(r.filePath, streamingMap);
+      const importPath = getImportPath(r.filePath, streamingMap, routesImportBase);
       if (client) {
         return `const Route${i} = createLazyRoute(() => import('${importPath}'), "${r.pattern}");`;
       }
       return `const Route${i} = createLazyRoute(() => import('${importPath}'), "${r.pattern}", Route${i}Eager);`;
     }),
     ...tree.layouts.map((l, i) => {
-      const importPath = getImportPath(l.filePath, streamingMap);
+      const importPath = getImportPath(l.filePath, streamingMap, routesImportBase);
       if (client) {
         return `const Layout${i} = createLazyRoute(() => import('${importPath}'), "${l.pattern}");`;
       }
       return `const Layout${i} = createLazyRoute(() => import('${importPath}'), "${l.pattern}", Layout${i}Eager);`;
     }),
     ...tree.notFoundRoutes.map((nf, i) => {
-      const importPath = getImportPath(nf.filePath, streamingMap);
+      const importPath = getImportPath(nf.filePath, streamingMap, routesImportBase);
       if (client) {
         return `const NotFound${i} = createLazyRoute(() => import('${importPath}'), "${nf.notFoundBasePattern || "/"}");`;
       }
@@ -8619,8 +8659,8 @@ async function buildSingleContentChunk(cwd, collection, fileRef, contentDir, arg
     locale
   };
 }
-async function buildContentChunks(cwd, args = [], defaultLocale = "en-US") {
-  const routesRoot = join12(cwd, ROUTES_DIR);
+async function buildContentChunks(cwd, args = [], defaultLocale = "en-US", routesDir) {
+  const routesRoot = join12(cwd, routesDir);
   console.log(`[reroute/content] scan ${routesRoot}`);
   const collections2 = await readdir8(routesRoot, { withFileTypes: true });
   const results = [];
@@ -8738,7 +8778,7 @@ async function buildSearchIndex(cwd, config2, args = []) {
     minHeadingLevel = 1,
     maxHeadingLevel = 6
   } = searchConfig;
-  const routesRoot = join12(cwd, ROUTES_DIR);
+  const routesRoot = join12(cwd, resolveAppPaths(config2).routesDir);
   const collections2 = await readdir8(routesRoot, { withFileTypes: true });
   const i18n2 = await discoverI18n(cwd, config2.i18n);
   const defaultLocale = i18n2.defaultLocale;
@@ -8813,7 +8853,7 @@ async function buildSearchIndex(cwd, config2, args = []) {
 }
 async function preprocessMarkdownFiles(cwd, config2) {
   console.log("[reroute/markdown] Starting markdown preprocessing...");
-  const routesPath = join12(cwd, ROUTES_DIR);
+  const routesPath = join12(cwd, resolveAppPaths(config2).routesDir);
   const markdownDir = join12(cwd, ".reroute", "markdown");
   try {
     await rm(markdownDir, { force: true, recursive: true });
@@ -8874,7 +8914,7 @@ async function preprocessMarkdownFiles(cwd, config2) {
 }
 async function buildEntrypointBundle(cwd, args = []) {
   const buildStartTime = performance.now();
-  const clientDir = join12(cwd, "src", "client");
+  const clientDir = join12(cwd, resolveAppPaths(await loadConfig(cwd)).clientDir);
   const entrypoint = join12(clientDir, "index.tsx");
   const exists = await Bun.file(entrypoint).exists();
   if (!exists) {
@@ -9054,6 +9094,8 @@ async function generate(cwd, args = [], options = {}) {
     console.log("[reroute/gen] Starting generation...");
   }
   const config2 = await loadConfig(cwd);
+  const paths = resolveAppPaths(config2);
+  const routesImportBase = importFromReroute(paths.routesDir);
   const streamingEnabled = config2.streaming?.enabled ?? false;
   const perfTrack = async (name, fn) => {
     const stepStart = performance.now();
@@ -9067,10 +9109,10 @@ async function generate(cwd, args = [], options = {}) {
   };
   await ensureOutputDir(cwd, { clean });
   if (writeStubs) {
-    await writeStubFiles(cwd);
+    await writeStubFiles(cwd, importFromReroute(paths.server));
   }
   await perfTrack("Markdown preprocessing", () => preprocessMarkdownFiles(cwd, config2));
-  const routesPath = join12(cwd, ROUTES_DIR);
+  const routesPath = join12(cwd, paths.routesDir);
   try {
     await perfTrack("Routes generation", async () => {
       const files = await scanDirectory(routesPath);
@@ -9078,8 +9120,8 @@ async function generate(cwd, args = [], options = {}) {
       const all = Array.from(new Set([...files, ...nfFiles]));
       const tree = generateRouteTree(all.map((f) => f.replace(/\\/g, "/")));
       const streamingAnalyses = streamingEnabled ? await buildStreamingWrappersForTree(cwd, routesPath, tree, config2) : new Map;
-      const serverRoutes = generateTypeScript(tree, streamingAnalyses, false);
-      const clientRoutes = generateTypeScript(tree, streamingAnalyses, true);
+      const serverRoutes = generateTypeScript(tree, streamingAnalyses, false, routesImportBase);
+      const clientRoutes = generateTypeScript(tree, streamingAnalyses, true, routesImportBase);
       await Bun.write(join12(cwd, OUTPUT_ROUTES), serverRoutes);
       await Bun.write(join12(cwd, OUTPUT_ROUTES_CLIENT), clientRoutes);
     });
@@ -9108,7 +9150,7 @@ async function generate(cwd, args = [], options = {}) {
     console.warn("[reroute/gen] Failed to write i18n.json:", error);
   }
   try {
-    await perfTrack("Content building", () => buildContentChunks(cwd, args, defaultLocale));
+    await perfTrack("Content building", () => buildContentChunks(cwd, args, defaultLocale, paths.routesDir));
     if (!showPerformance) {
       console.log(`[reroute/gen] Generated content: ${join12(cwd, OUTPUT_CONTENT_TS)} + collections/*.js`);
     }
@@ -9200,12 +9242,12 @@ async function generate(cwd, args = [], options = {}) {
     const ogTemplatePath = config2.ogImage.defaultTemplate.startsWith(".") ? `../${config2.ogImage.defaultTemplate}` : config2.ogImage.defaultTemplate;
     indexLines.push(`import OGTemplate from '${ogTemplatePath}';`);
   }
-  const ogFiles = await scanOgFiles(join12(cwd, ROUTES_DIR));
+  const ogFiles = await scanOgFiles(join12(cwd, paths.routesDir));
   const ogImports = [];
   for (let i = 0;i < ogFiles.length; i++) {
     const ogFile = ogFiles[i];
     const importName = `OGRoute${i}`;
-    const importPath = `../src/client/routes/${ogFile.replace(/\.(tsx|ts)$/, "")}`;
+    const importPath = `${routesImportBase}/${ogFile.replace(/\.(tsx|ts)$/, "")}`;
     indexLines.push(`import ${importName} from '${importPath}';`);
     ogImports.push({ path: ogFile, name: importName });
   }
@@ -9246,7 +9288,7 @@ async function generate(cwd, args = [], options = {}) {
     }
     indexLines.push("};");
   }
-  const templatePath = join12(cwd, "src", "client", "index.html");
+  const templatePath = join12(cwd, paths.clientDir, "index.html");
   try {
     const templateContent = await Bun.file(templatePath).text();
     indexLines.push("");
@@ -9313,7 +9355,7 @@ async function generate(cwd, args = [], options = {}) {
     "",
     "import './artifacts.server'; // SSR bundle (eager routes)",
     "import './routes'; // Route metadata for compiled binary discovery",
-    "import '../src/index'; // Import user's server entry"
+    `import '${importFromReroute(paths.server)}'; // Import user's server entry`
   ];
   await Bun.write(join12(cwd, ".reroute/entry.ts"), entryLines.join(`
 `));
@@ -9526,7 +9568,8 @@ async function startGenWatch(cwd, args) {
       });
     });
   }
-  const routesPath = join12(cwd, ROUTES_DIR);
+  const watchPaths = resolveAppPaths(loadedConfig);
+  const routesPath = join12(cwd, watchPaths.routesDir);
   console.log(`[reroute/watch] \uD83D\uDCC1 Watching ${routesPath}...`);
   const routesWatcher = watch(routesPath, { recursive: true }, (_ev, filename) => {
     if (!filename)
@@ -9562,7 +9605,7 @@ async function startGenWatch(cwd, args) {
               redirectContentOnNegotiate: watchI18n.redirectContentOnNegotiate,
               catalogs: watchI18n.catalogs
             }, null, 2));
-            await buildContentChunks(cwd, args, watchI18n.defaultLocale);
+            await buildContentChunks(cwd, args, watchI18n.defaultLocale, watchPaths.routesDir);
             const contentTime = ((performance.now() - contentStart) / 1000).toFixed(2);
             console.log(`[reroute/watch]   └─ Content: ${contentTime}s`);
             if (loadedConfig.search?.enabled) {
@@ -9592,7 +9635,7 @@ async function startGenWatch(cwd, args) {
       });
     });
   });
-  const clientPath = join12(cwd, "src", "client");
+  const clientPath = join12(cwd, watchPaths.clientDir);
   console.log(`[reroute/watch] \uD83D\uDCE6 Watching ${clientPath}...`);
   async function rebuildWatchedClient(changed) {
     const label = changed.length === 1 ? changed[0] : `${changed.length} files`;
@@ -9685,7 +9728,7 @@ async function gen(args) {
   });
   process.exit(0);
 }
-var ROUTES_DIR = "src/client/routes", OUTPUT_DIR = ".reroute", OUTPUT_ROUTES = ".reroute/routes.ts", OUTPUT_ROUTES_CLIENT = ".reroute/routes.client.ts", OUTPUT_CONTENT_TS = ".reroute/content.ts", OUTPUT_COLLECTIONS_DIR = ".reroute/collections", OUTPUT_SEARCH_INDEX = ".reroute/search.json", OUTPUT_ARTIFACTS = ".reroute/artifacts.ts", OUTPUT_ARTIFACTS_SERVER = ".reroute/artifacts.server.ts", OUTPUT_ARTIFACTS_CLIENT = ".reroute/artifacts.client.ts", OUTPUT_INDEX = ".reroute/index.ts";
+var OUTPUT_DIR = ".reroute", OUTPUT_ROUTES = ".reroute/routes.ts", OUTPUT_ROUTES_CLIENT = ".reroute/routes.client.ts", OUTPUT_CONTENT_TS = ".reroute/content.ts", OUTPUT_COLLECTIONS_DIR = ".reroute/collections", OUTPUT_SEARCH_INDEX = ".reroute/search.json", OUTPUT_ARTIFACTS = ".reroute/artifacts.ts", OUTPUT_ARTIFACTS_SERVER = ".reroute/artifacts.server.ts", OUTPUT_ARTIFACTS_CLIENT = ".reroute/artifacts.client.ts", OUTPUT_INDEX = ".reroute/index.ts";
 var init_gen = __esm(() => {
   init_core();
   init_env();
@@ -104358,9 +104401,9 @@ function setupProcessOutput(box, process2, screen, colorizeLogPrefix2) {
     screen.render();
   });
 }
-function setupTerminalUIHandlers(screen, grid, genProcess, serverProcess, outputBuffer, blessed, colorizeLogPrefix2) {
+function setupTerminalUIHandlers(screen, grid, genProcess, serverProcess, outputBuffer, blessed, colorizeLogPrefix2, serverEntry = "src/index.ts") {
   const genBox = createLogBox(grid, blessed, 0, 0, " reroute gen --watch ", "cyan");
-  const serverBox = createLogBox(grid, blessed, 0, 1, " bun --watch src/index.ts ", "green");
+  const serverBox = createLogBox(grid, blessed, 0, 1, ` bun --watch ${serverEntry} `, "green");
   setupScrollingKeys(genBox, screen);
   setupScrollingKeys(serverBox, screen);
   setupMouseSupport(genBox, screen);
@@ -104457,7 +104500,8 @@ async function startTui(port) {
     genProcess.kill();
     process.exit(1);
   });
-  const serverProcess = spawn("bun", ["--watch", "src/index.ts"], {
+  const { server: server2 } = resolveAppPaths(await loadConfig(process.cwd()));
+  const serverProcess = spawn("bun", ["--watch", server2], {
     stdio: ["ignore", "pipe", "pipe"],
     env: {
       ...process.env,
@@ -104488,13 +104532,14 @@ async function startTui(port) {
     screen
   });
   const { setupTerminalUIHandlers: setupTerminalUIHandlers2 } = await Promise.resolve().then(() => exports_terminal_ui);
-  setupTerminalUIHandlers2(screen, grid, genProcess, serverProcess, outputBuffer, blessed, colorizeLogPrefix);
+  setupTerminalUIHandlers2(screen, grid, genProcess, serverProcess, outputBuffer, blessed, colorizeLogPrefix, server2);
 }
 async function startDefault(port) {
   process.env.PORT = String(port);
   process.env.REROUTE_DEV = "1";
   const session = await startGenWatch(process.cwd(), ["--watch"]);
-  const entry = join14(process.cwd(), "src/index.ts");
+  const { server: server2 } = resolveAppPaths(await loadConfig(process.cwd()));
+  const entry = join14(process.cwd(), server2);
   if (!existsSync7(entry)) {
     session.close();
     throw new Error(`[reroute/dev] Missing ${entry}`);
@@ -104548,6 +104593,7 @@ async function dev(args) {
   }
 }
 var init_dev = __esm(() => {
+  init_core();
   init_gen();
   init_command();
   init_log();
@@ -104634,7 +104680,8 @@ async function start(args) {
 `));
     process.stdout.write(`${colorizeLogPrefixAnsi("[reroute/start] Starting server...")}
 `);
-    const serverProcess = spawn2("bun", ["src/index.ts"], {
+    const { server: server2 } = resolveAppPaths(await loadConfig(process.cwd()));
+    const serverProcess = spawn2("bun", [server2], {
       stdio: ["ignore", "pipe", "pipe"],
       env: {
         ...process.env,
@@ -104690,6 +104737,7 @@ async function start(args) {
   }
 }
 var init_start = __esm(() => {
+  init_core();
   init_log();
 });
 
@@ -104850,10 +104898,8 @@ async function runGenCommand(rerouteCmd, useShell, noCompression) {
 }
 async function copyAssets(cwd) {
   const config2 = await loadConfig(cwd);
-  const appSrc = config2.app?.src ?? "./src/client/App";
-  const dirname8 = __require("node:path").dirname;
-  const assetsPath = dirname8(appSrc);
-  const sourceAssetsDir = join17(cwd, assetsPath, "assets");
+  const { assetsDir } = resolveAppPaths(config2);
+  const sourceAssetsDir = join17(cwd, assetsDir);
   const rerouteAssetsDir = join17(cwd, ".reroute", "assets");
   process.stdout.write(colorizeLogPrefixAnsi(`[reroute/build] Copying assets...
 `));
@@ -105049,7 +105095,7 @@ async function findBundles(cwd) {
 }
 async function findBrowserEntry(cwd) {
   try {
-    const clientDir = join18(cwd, "src", "client");
+    const clientDir = join18(cwd, resolveAppPaths(await loadConfig(cwd)).clientDir);
     const tsxEntry = join18(clientDir, "index.tsx");
     const tsEntry = join18(clientDir, "index.ts");
     let sourceEntry = null;
@@ -107065,7 +107111,7 @@ async function analyze(args) {
     let entry = null;
     let depTree = null;
     let mainInfo = null;
-    const srcEntry = join18(cwd, "src", "index.ts");
+    const srcEntry = join18(cwd, resolveAppPaths(await loadConfig(cwd)).server);
     if (existsSync11(srcEntry)) {
       console.log(colorizeLogPrefixAnsi(`[reroute/analyze] Building server binary for analysis...
 `));
@@ -107184,6 +107230,7 @@ async function analyze(args) {
 }
 var ASCII_TABLE_CHARS;
 var init_analyze = __esm(() => {
+  init_core();
   init_log();
   ASCII_TABLE_CHARS = {
     top: "-",
@@ -107340,7 +107387,7 @@ async function findRoutesWithOG(cwd) {
     }
   } catch {
     console.warn("⚠️  .reroute/manifest.json not found, scanning routes directory...");
-    const routesPath = join19(cwd, ROUTES_DIR2);
+    const routesPath = join19(cwd, resolveAppPaths(await loadConfig(cwd)).routesDir);
     await scanForOgTemplates(routesPath, "", routes);
     await addContentRoutes(routesPath, routes);
   }
@@ -107378,7 +107425,7 @@ ogImage: {
     console.error("❌ No routes found for OG image generation");
     console.log(`
 Make sure you have:`);
-    console.log("  1. Routes defined in src/client/routes/");
+    console.log(`  1. Routes defined in ${resolveAppPaths(config2).routesDir}/`);
     console.log("  2. Run `reroute dev` or `reroute build` first to generate .reroute/manifest.json");
     console.log(`
 Or create [og].tsx files in your routes for custom OG templates.`);
@@ -107483,7 +107530,6 @@ Or create [og].tsx files in your routes for custom OG templates.`);
   list.focus();
   screen.render();
 }
-var ROUTES_DIR2 = "src/client/routes";
 var init_og2 = __esm(() => {
   init_core();
 });
@@ -107592,7 +107638,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "1.0.0-alpha.16";
+    return "1.0.0-alpha.19";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -107609,10 +107655,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "44faab0";
+    return "2cc62d6";
   }
   return "dev";
 }
 main();
 
-//# debugId=04F6A76937DD767764756E2164756E21
+//# debugId=DAE9B5FCCE76ACB064756E2164756E21